« back to all changes in this revision
Viewing changes to po/ru.po
- browse files at revision 6462
- compare with another revision
- download diff
- download tarball
- view history from revision 6462
- Committer: Patch Queue Manager
- Date: 2012-02-03 10:59:42 UTC
- mfrom: (6461.1.1 trunk)
- Revision ID: pqm@pqm.ubuntu.com-20120203105942-zq9f2k9i5a2akbvu
(vila) Merge 2.5 branch (Vincent Ladeuil)
- files added:
- po/ast.po
- files modified:
- bzrlib/config.py
added
removed
po/ru.po
1
# Russian translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-01-16 15:18+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"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19
"X-Launchpad-Export-Date: 2012-01-17 05:17+0000\n"
20
"X-Generator: Launchpad (build 14676)\n"
21
22
#: bzrlib/add.py:95
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
24
msgstr "пропуск {0} (более, чем {1} из {2} байт)"
25
26
#: bzrlib/branch.py:872
27
msgid "Unstacking"
28
msgstr "Извлечение из стека"
29
30
#: bzrlib/branch.py:3183
31
#, python-format
32
msgid "Pushed up to revision %d."
33
msgstr "Отправлено до ревизии %d включительно."
34
35
#: bzrlib/branch.py:3185
36
#, python-format
37
msgid "%d tag updated."
38
msgid_plural "%d tags updated."
39
msgstr[0] "%d тег обновлён."
40
msgstr[1] "%d тега обновлено."
41
msgstr[2] "%d тегов обновлено."
42
43
#: bzrlib/branch.py:3188
44
msgid "No new revisions or tags to push."
45
msgstr "Нет новых ревизий или тегов для отправки."
46
47
#: bzrlib/branch.py:3190
48
msgid "No new revisions to push."
49
msgstr "Нет новых ревизий для отправки."
50
51
#: bzrlib/branch.py:3210
52
msgid "checked branch {0} format {1}"
53
msgstr "проверена ветвь {0} формата {1}"
54
55
#: bzrlib/branch.py:3213
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
61
#, python-format
62
msgid "Ignoring files outside view. View is %s"
63
msgstr "Игнорируются файлы вне окна просмотра. Окно просмотра: %s"
64
65
#: bzrlib/builtins.py:130
66
#, python-format
67
msgid "bzr %s --revision takes exactly one revision identifier"
68
msgstr "bzr %s --revision принимает ровно один идентификатор ревизии"
69
70
#: bzrlib/builtins.py:215
71
msgid "Display status summary."
72
msgstr "Отобразить краткое описание состояния."
73
74
#: bzrlib/builtins.py:217
75
msgid ""
76
"This reports on versioned and unknown files, reporting them\n"
77
"grouped by state. Possible states are:"
78
msgstr ""
79
"Эта команда сообщает о файлах с версиями и неизвестных файлах,\n"
80
"группируя их по состоянию. Возможные состояния:"
81
82
#: bzrlib/builtins.py:220
83
msgid ""
84
"added\n"
85
" Versioned in the working copy but not in the previous revision."
86
msgstr ""
87
"добавлены\n"
88
" Имеют версию в рабочей копии, но отсутствуют в предыдущей\n"
89
" ревизии."
90
91
#: bzrlib/builtins.py:223
92
msgid ""
93
"removed\n"
94
" Versioned in the previous revision but removed or deleted\n"
95
" in the working copy."
96
msgstr ""
97
"исключены\n"
98
" Имеют версию в предыдущей ревизии но исключены или удалены\n"
99
" в рабочей копии."
100
101
#: bzrlib/builtins.py:227
102
msgid ""
103
"renamed\n"
104
" Path of this file changed from the previous revision;\n"
105
" the text may also have changed. This includes files whose\n"
106
" parent directory was renamed."
107
msgstr ""
108
"переименованы\n"
109
" Путь к этим файлам изменился с предыдущей ревизии;\n"
110
" текст также мог измениться. Это состояние включает\n"
111
" файлы, родительская директория которых была переименована."
112
113
#: bzrlib/builtins.py:232
114
msgid ""
115
"modified\n"
116
" Text has changed since the previous revision."
117
msgstr ""
118
"изменены\n"
119
" Текст изменился с предыдущей ревизии."
120
121
#: bzrlib/builtins.py:235
122
msgid ""
123
"kind changed\n"
124
" File kind has been changed (e.g. from file to directory)."
125
msgstr ""
126
"изменили вид\n"
127
" Вид файла изменился (например, файл стал директорией)."
128
129
#: bzrlib/builtins.py:238
130
msgid ""
131
"unknown\n"
132
" Not versioned and not matching an ignore pattern."
133
msgstr ""
134
"неизвестны\n"
135
" Не имеют версии и не подходят под шаблон игнориируемых файлов."
136
137
#: bzrlib/builtins.py:241
138
msgid ""
139
"Additionally for directories, symlinks and files with a changed\n"
140
"executable bit, Bazaar indicates their type using a trailing\n"
141
"character: '/', '@' or '*' respectively. These decorations can be\n"
142
"disabled using the '--no-classify' option."
143
msgstr ""
144
"Кроме этого, для директорий, символьных ссылок и файлов, бит\n"
145
"выполнения которых изменился, Bazaar показывает их тип, добавляя\n"
146
"в конец имени символы: '/', '@' или '*' соответственно. Эти\n"
147
"декорации можно убрать, используя опцию '--no-classify'."
148
149
#: bzrlib/builtins.py:246
150
msgid ""
151
"To see ignored files use 'bzr ignored'. For details on the\n"
152
"changes to file texts, use 'bzr diff'."
153
msgstr ""
154
"Чтобы просмотреть игнорируемые файлы, используйте 'bzr ignored'.\n"
155
"Изменения текста файлов можно увидеть, используя 'bzr diff'."
156
157
#: bzrlib/builtins.py:249
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"
161
"use bzr status -SV."
162
msgstr ""
163
"Заметьте, что опция --short или -S даёт вывод статусных флагов,\n"
164
"подобный команде Subversion status. Чтобы получить вывод, похожий\n"
165
"на svn -q, используйте bzr status -SV."
166
167
#: bzrlib/builtins.py:253
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"
171
"files or directories is reported. If a directory is given, status\n"
172
"is reported for everything inside that directory."
173
msgstr ""
174
"Если не указано аргументов, выводится состояние всей рабочей директории.\n"
175
"Иначе, выводится только статус указанных файлов или директорий.\n"
176
"Если указана директория, то выводится состояние всех файлов внутри\n"
177
"этой директории."
178
179
#: bzrlib/builtins.py:258
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"
183
"To skip the display of pending merge information altogether, use\n"
184
"the no-pending option or specify a file/directory."
185
msgstr ""
186
"Перед закреплением слияний, отображаются необработанные ревизии.\n"
187
"Чтобы увидеть все ревизии слияния, используйте опцию -v.\n"
188
"Чтобы полностью пропустить отображение информации о слиянии,\n"
189
"используйте опцию no-pending либо укажите файл или директорию."
190
191
#: bzrlib/builtins.py:263
192
msgid ""
193
"To compare the working directory to a specific revision, pass a\n"
194
"single revision to the revision argument."
195
msgstr ""
196
"Чтобы сравнить рабочую копию с определённой ревизией, укажите\n"
197
"ревизию в соответствующем аргументе."
198
199
#: bzrlib/builtins.py:266
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"
203
"This will produce the same results as calling 'bzr diff --summarize'."
204
msgstr ""
205
"Чтобы увидеть, какие файлы изменились в определённой ревизии, или\n"
206
"между двумя ревизиями, укажите в аргументе ревизии интервал.\n"
207
"Это даёт такой же результат, как вызов 'bzr diff --summarize'."
208
209
#: bzrlib/builtins.py:275
210
msgid "Use short status indicators."
211
msgstr "Использовать короткие статусные пометки."
212
213
#: bzrlib/builtins.py:277
214
msgid "Only show versioned files."
215
msgstr "Показывать только файлы, имеющие версию."
216
217
#: bzrlib/builtins.py:279
218
msgid "Don't show pending merges."
219
msgstr "Не показывать необработанные слияния."
220
221
#: bzrlib/builtins.py:282
222
msgid "Do not mark object type using indicator."
223
msgstr "Не помечать типы объектов суффиксами."
224
225
#: bzrlib/builtins.py:297
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
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
235
msgid "You must supply either --revision or a revision_id"
236
msgstr "Вы должны предоставить --revision или revision_id"
237
238
#: bzrlib/builtins.py:351
239
#, python-format
240
msgid "Repository %r does not support access to raw revision texts"
241
msgstr "Репозиторий %r не поддерживает прямой доступ к текстам ревизий"
242
243
#: bzrlib/builtins.py:362
244
msgid "The repository {0} contains no revision {1}."
245
msgstr "Репозиторий {0} не содержит ревизии {1}."
246
247
#: bzrlib/builtins.py:369
248
msgid "You cannot specify a NULL revision."
249
msgstr "Вы не можете указать ревизию NULL."
250
251
#: bzrlib/builtins.py:461
252
msgid "Remove the working tree from a given branch/checkout."
253
msgstr "Удалить рабочее дерево из данной ветви или рабочей копии."
254
255
#: bzrlib/builtins.py:463
256
msgid ""
257
"Since a lightweight checkout is little more than a working tree\n"
258
"this will refuse to run against one."
259
msgstr ""
260
"Поскольку легковесная рабочая копия, это нечто большее, чем рабочее\n"
261
"дерево, эту команду нельзя выполнить внутри неё."
262
263
#: bzrlib/builtins.py:466
264
msgid "To re-create the working tree, use \"bzr checkout\"."
265
msgstr "Чтобы воссоздать рабочее дерево, используйте «bzr checkout»."
266
267
#: bzrlib/builtins.py:472
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
275
msgid "No working tree to remove"
276
msgstr "Нет рабочего дерева для удаления"
277
278
#: bzrlib/builtins.py:488
279
msgid "You cannot remove the working tree of a remote path"
280
msgstr "Вы не можете удалить внешнее рабочее дерево"
281
282
#: bzrlib/builtins.py:497
283
msgid "You cannot remove the working tree from a lightweight checkout"
284
msgstr "Вы не можете удалить рабочее дерево из легковесной рабочей копии"
285
286
#: bzrlib/builtins.py:537
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."
290
msgstr ""
291
"Дерево не повреждено. Возможно, вы хотели выполнить «bzr revert». "
292
"Используйте «--force», если вы уверены, что хотите использовать reset."
293
294
#: bzrlib/builtins.py:548
295
msgid ""
296
", the header appears corrupt, try passing -r -1 to set the state to the last "
297
"commit"
298
msgstr ""
299
", заголовок повреждён, попробуйте использовать аргумент -r -1, чтобы "
300
"сбросить состояние до предыдущего закрепления"
301
302
#: bzrlib/builtins.py:552
303
msgid "failed to reset the tree state{0}"
304
msgstr "не удалось сбросить состояние дерева {0}"
305
306
#: bzrlib/builtins.py:556
307
msgid "Show current revision number."
308
msgstr "Показать номер текущей ревизии."
309
310
#: bzrlib/builtins.py:558
311
msgid "This is equal to the number of revisions on this branch."
312
msgstr "Это эквивалентно числу ревизий в этой ветви."
313
314
#: bzrlib/builtins.py:571
315
msgid "--tree and --revision can not be used together"
316
msgstr "--tree и --revision не могут использоваться вместе"
317
318
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
319
msgid "Tags can only be placed on a single revision, not on a range"
320
msgstr "Тегом можно пометить только отдельную ревизию, не интервал"
321
322
#: bzrlib/builtins.py:612
323
msgid "Show revno of working tree."
324
msgstr ""
325
326
#: bzrlib/builtins.py:660
327
msgid "Add specified files or directories."
328
msgstr "Добавить указанные файлы или директории."
329
330
#: bzrlib/builtins.py:662
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"
334
"any of the named files are already versioned."
335
msgstr ""
336
"В нерекурсивном режиме, все указанные элементы добавляются, вне\n"
337
"зависимости от того, игнорировались ли они до этого. Выводится\n"
338
"предупреждение, если какие-либо из указанных элементов уже были\n"
339
"под контролем Bazaar."
340
341
#: bzrlib/builtins.py:666
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"
345
"are already versioned do not give a warning. All directories,\n"
346
"whether already versioned or not, are searched for files or\n"
347
"subdirectories that are neither versioned or ignored, and these\n"
348
"are added. This search proceeds recursively into versioned\n"
349
"directories. If no names are given '.' is assumed."
350
msgstr ""
351
"В рекурсивном режиме (по умолчанию), файлы обрабатываются точно\n"
352
"также, но для директорий применяется другой алгоритм. Для\n"
353
"директорий, которые уже имели версию, предупреждение не выводится.\n"
354
"Во всех директориях, независимо от того, находятся они под контролем\n"
355
"системы контроля версий или нет, производится поиск файлов, которые\n"
356
"не имеют версии и не игнорируются, и эти файлы добавляются.\n"
357
"Этот поиск входит рекурсивно в директории, имеющие версию.\n"
358
"Если не указано ни одного имени, предполагается '.'."
359
360
#: bzrlib/builtins.py:674
361
msgid ""
362
"A warning will be printed when nested trees are encountered,\n"
363
"unless they are explicitly ignored."
364
msgstr ""
365
"Предупреждение будет напечатано для каждого встреченного вложенного\n"
366
"дерева, если только оно не игнорируется явно."
367
368
#: bzrlib/builtins.py:677
369
msgid ""
370
"Therefore simply saying 'bzr add' will version all files that\n"
371
"are currently unknown."
372
msgstr ""
373
"Следовательно, просто вызов 'bzr add' добавит к системе контроля\n"
374
"версий все файлы, которые ей неизвестны."
375
376
#: bzrlib/builtins.py:680
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"
380
"you should never need to explicitly add a directory, they'll just\n"
381
"get added when you add a file in the directory."
382
msgstr ""
383
"Добавление файла, родительская директория которого не имеет версии\n"
384
"неявно добавляет родителя и так далее до корня. Это означает, что\n"
385
"вам никогда не нужно явно добавлять директорию, они добавляются\n"
386
"автоматически, когда вы добавляете файлы."
387
388
#: bzrlib/builtins.py:685
389
msgid ""
390
"--dry-run will show which files would be added, but not actually\n"
391
"add them."
392
msgstr ""
393
"--dry-run покажет, какие файлы будут добавлены, но не будет их\n"
394
"добавлять."
395
396
#: bzrlib/builtins.py:688
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"
400
"same filename, and then by pure path. This option is rarely needed\n"
401
"but can be useful when adding the same logical file into two\n"
402
"branches that will be merged later (without showing the two different\n"
403
"adds as a conflict). It is also useful when merging another project\n"
404
"into a subdirectory of this one."
405
msgstr ""
406
"--file-ids-from попытается использовать идентификаторы файлов из\n"
407
"предоставленного пути. С этой опцией просматриваются идентификаторы\n"
408
"в попытке найти соответствующую родительскую директорию с тем же\n"
409
"именем, а затем полный путь. Эта опция редко необходима, но может\n"
410
"быть полезна при добавлении одного и того же логического файла к\n"
411
"двум различным ветвям, которые затем будут совмещены (при этом\n"
412
"добавления в обе ветви не будут рассматриваться как конфликты).\n"
413
"Это также полезно при помещении другого проекта, как поддиректории\n"
414
"данного."
415
416
#: bzrlib/builtins.py:696
417
msgid ""
418
"Any files matching patterns in the ignore list will not be added\n"
419
"unless they are explicitly mentioned."
420
msgstr ""
421
"Любые файлы, удовлетворяющие шаблонам в списке ignore не будут\n"
422
"добавлены, если их не указать явно."
423
424
#: bzrlib/builtins.py:699
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"
428
"to file size."
429
msgstr ""
430
"В рекурсивном режиме, файлы больше, чем опция конфигурации\n"
431
"add.maximum_file_size, будут пропущены. Явно названные элементы\n"
432
"никогда не будут пропущены по этому критерию."
433
434
#: bzrlib/builtins.py:706
435
msgid "Don't recursively add the contents of directories."
436
msgstr "Не добавлять содержимое директорий рекурсивно."
437
438
#: bzrlib/builtins.py:712
439
msgid "Lookup file ids from this tree."
440
msgstr "Искать идентификаторы в этом дереве."
441
442
#: bzrlib/builtins.py:748
443
msgid "ignored {0} matching \"{1}\"\n"
444
msgstr "пропуск {0} из-за условия «{1}»\n"
445
446
#: bzrlib/builtins.py:753
447
msgid "Create a new versioned directory."
448
msgstr "Создать новую директорию в системе версий."
449
450
#: bzrlib/builtins.py:755
451
msgid "This is equivalent to creating the directory and then adding it."
452
msgstr "Это эквивалентно созданию директории и её добавлению."
453
454
#: bzrlib/builtins.py:762
455
msgid "No error if existing, make parent directories as needed."
456
msgstr ""
457
458
#: bzrlib/builtins.py:796
459
#, python-format
460
msgid "added %s\n"
461
msgstr "добавлен %s\n"
462
463
#: bzrlib/builtins.py:838
464
#, python-format
465
msgid "invalid kind %r specified"
466
msgstr "указан неизвестный вид %r"
467
468
#: bzrlib/builtins.py:875
469
msgid "Move or rename a file."
470
msgstr "Переместить или переименовать файл."
471
472
#: bzrlib/builtins.py:877
473
msgid " bzr mv SOURCE... DESTINATION"
474
msgstr " bzr mv ИСТОЧНИК... НАЗНАЧЕНИЕ"
475
476
#: bzrlib/builtins.py:879
477
msgid ""
478
"If the last argument is a versioned directory, all the other names\n"
479
"are moved into it. Otherwise, there must be exactly two arguments\n"
480
"and the file is changed to a new name."
481
msgstr ""
482
"Если последний аргумент является директорией под контролем Bazaar,\n"
483
"все остальные имена перемещаются в неё. Иначе, должно быть указано\n"
484
"ровно два аргумента, и файл переименовывается."
485
486
#: bzrlib/builtins.py:883
487
msgid ""
488
"If OLDNAME does not exist on the filesystem but is versioned and\n"
489
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
490
"assumes that the file has been manually moved and only updates\n"
491
"its internal inventory to reflect that change.\n"
492
"The same is valid when moving many SOURCE files to a DESTINATION."
493
msgstr ""
494
"Если СТАРОЕИМЯ не существует в файловой системе, но есть в системе\n"
495
"версий, а НОВОЕИМЯ существует, но отсутствует в системе версий, mv\n"
496
"предполагает, что файл был перемещён вручную и только обновляет\n"
497
"свои внутренние структуры, чтобы отразить это изменение.\n"
498
"Тоже верно и при перемещении многих ИСТОЧНИКов в НАЗНАЧЕНИЕ."
499
500
#: bzrlib/builtins.py:889
501
msgid "Files cannot be moved between branches."
502
msgstr "Файлы нельзя перемещать между ветвями."
503
504
#: bzrlib/builtins.py:896
505
msgid ""
506
"Move only the bzr identifier of the file, because the file has already been "
507
"moved."
508
msgstr ""
509
"Переместить только bzr-идентификатор файла, поскольку сам файл уже был "
510
"перемещён."
511
512
#: bzrlib/builtins.py:898
513
msgid "Automatically guess renames."
514
msgstr "Автоматически предполагать переименования."
515
516
#: bzrlib/builtins.py:899
517
msgid "Avoid making changes when guessing renames."
518
msgstr "Избегать изменений при угадывании переименований."
519
520
#: bzrlib/builtins.py:908
521
msgid "--dry-run requires --auto."
522
msgstr "--dry-run требует --auto."
523
524
#: bzrlib/builtins.py:912
525
msgid "missing file argument"
526
msgstr "отсутствует аргумент файл"
527
528
#: bzrlib/builtins.py:916
529
msgid "can not move root of branch"
530
msgstr "нельзя переместить корень ветви"
531
532
#: bzrlib/builtins.py:922
533
msgid "Only one path may be specified to --auto."
534
msgstr "Только один путь может быть указан, как аргумент --auto."
535
536
#: bzrlib/builtins.py:925
537
msgid "--after cannot be specified with --auto."
538
msgstr "--after не может использоваться вместе с --auto."
539
540
#: bzrlib/builtins.py:962
541
msgid "to mv multiple files the destination must be a versioned directory"
542
msgstr ""
543
"чтобы переместить несколько файлов, назначение должно быть директорией под "
544
"контролем системы версий"
545
546
#: bzrlib/builtins.py:1014
547
msgid "Turn this branch into a mirror of another branch."
548
msgstr "Преобразовать эту ветвь в зеркало другой ветви."
549
550
#: bzrlib/builtins.py:1016
551
msgid ""
552
"By default, this command only works on branches that have not diverged.\n"
553
"Branches are considered diverged if the destination branch's most recent \n"
554
"commit is one that has not been merged (directly or indirectly) into the \n"
555
"parent."
556
msgstr ""
557
"По умолчанию, эта команда работает только на ветвях, которые не являются\n"
558
"отклонениями. Ветвь считается отклонением, если последнее закрепление в\n"
559
"ветви назначения не было совмещено (явно или неявно) с родителем."
560
561
#: bzrlib/builtins.py:1021
562
msgid ""
563
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
564
"from one into the other. Once one branch has merged, the other should\n"
565
"be able to pull it again."
566
msgstr ""
567
"Если ветвь является отклонением, можно использовать 'bzr merge' для\n"
568
"возвращения изменений. После совмещения ветвей, можно снова принимать\n"
569
"изменения из одной в другую."
570
571
#: bzrlib/builtins.py:1025
572
msgid ""
573
"If you want to replace your local changes and just want your branch to\n"
574
"match the remote one, use pull --overwrite. This will work even if the two\n"
575
"branches have diverged."
576
msgstr ""
577
"Если вы хотите затереть ваши локальные изменения, чтобы ветвь совпадала\n"
578
"с удалённой, используйте pull --overwrite. Это будет работать, даже если\n"
579
"ветвь является отклонением."
580
581
#: bzrlib/builtins.py:1029
582
msgid ""
583
"If there is no default location set, the first pull will set it (use\n"
584
"--no-remember to avoid setting it). After that, you can omit the\n"
585
"location to use the default. To change the default, use --remember. The\n"
586
"value will only be saved if the remote location can be accessed."
587
msgstr ""
588
"Если местоположение по умолчанию не установлено, первый pull установит\n"
589
"его (используйте --no-remember, чтобы избежать этой установки). После\n"
590
"этого, вы можете опускать местоположение, чтобы использовать значение\n"
591
"по умолчанию. Чтобы изменить значение по умолчанию, используйте опцию\n"
592
"--remember. Значение будет сохранено, только если доступ к удалённому\n"
593
"местоположению будет успешен."
594
595
#: bzrlib/builtins.py:1034
596
msgid ""
597
"The --verbose option will display the revisions pulled using the log_format\n"
598
"configuration option. You can use a different format by overriding it with\n"
599
"-Olog_format=<other_format>."
600
msgstr ""
601
"Опция --verbose отобразит ревизии, загруженные с использованием опции\n"
602
"конфигурации log_format. Вы можете использовать другой формат, перегрузив\n"
603
"её опцией -Olog_format=<другой_формат>."
604
605
#: bzrlib/builtins.py:1038
606
msgid ""
607
"Note: The location can be specified either in the form of a branch,\n"
608
"or in the form of a path to a file containing a merge directive generated\n"
609
"with bzr send."
610
msgstr ""
611
"Замечание: Местоположение можно указывать как в форме ветви, так и в\n"
612
"форме пути к файлу, содержащему директиву слияния, созданному bzr send."
613
614
#: bzrlib/builtins.py:1046
615
msgid "Show logs of pulled revisions."
616
msgstr "Показать журналы принятых ревизий."
617
618
#: bzrlib/builtins.py:1048
619
msgid ""
620
"Branch to pull into, rather than the one containing the working directory."
621
msgstr ""
622
"Принимать изменения в эту ветвь, а не в содержащую рабочую директорию."
623
624
#: bzrlib/builtins.py:1051
625
msgid ""
626
"Perform a local pull in a bound branch. Local pulls are not applied to the "
627
"master branch."
628
msgstr ""
629
"Сделать локальный приём в связанную ветвь. Локальный приём не накладывается "
630
"на основную ветвь."
631
632
#: bzrlib/builtins.py:1080
633
msgid "Need working tree for --show-base."
634
msgstr "Для --show-base необходимо рабочее дерево."
635
636
#: bzrlib/builtins.py:1096
637
msgid "No pull location known or specified."
638
msgstr "Местоположение для приёма неизвестно и не указано."
639
640
#: bzrlib/builtins.py:1102
641
#, python-format
642
msgid "Using saved parent location: %s\n"
643
msgstr "Используется сохранённое местоположение родителя: %s\n"
644
645
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
646
msgid "Cannot use -r with merge directives or bundles"
647
msgstr "Нельзя использовать -r с директивами слияния или пакетами"
648
649
#: bzrlib/builtins.py:1150
650
msgid "Update a mirror of this branch."
651
msgstr "Обновить зеркало этой ветви."
652
653
#: bzrlib/builtins.py:1152
654
msgid ""
655
"The target branch will not have its working tree populated because this\n"
656
"is both expensive, and is not supported on remote file systems."
657
msgstr ""
658
"Целевая ветвь не будет иметь рабочего дерева, поскольку это накладно\n"
659
"и не поддерживается удалёнными файловыми системами."
660
661
#: bzrlib/builtins.py:1155
662
msgid ""
663
"Some smart servers or protocols *may* put the working tree in place in\n"
664
"the future."
665
msgstr ""
666
"Некоторые умные серверы или протоколы *может быть* будут размещать\n"
667
"рабочее дерево в месте назначения в будущем."
668
669
#: bzrlib/builtins.py:1158
670
msgid ""
671
"This command only works on branches that have not diverged. Branches are\n"
672
"considered diverged if the destination branch's most recent commit is one\n"
673
"that has not been merged (directly or indirectly) by the source branch."
674
msgstr ""
675
"Эта команда работает только на ветвях, которые не являются\n"
676
"отклонениями. Ветвь считается отклонением, если последнее\n"
677
"закрепление в ветви назначения не было совмещено (явно или\n"
678
"неявно) с родителем."
679
680
#: bzrlib/builtins.py:1162
681
msgid ""
682
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
683
"the other branch completely, discarding its unmerged changes."
684
msgstr ""
685
"Если ветвь была отклонена, вы можете использовать 'bzr push --overwrite',\n"
686
"чтобы полностью заменить другую ветвь, убирая все её несовмещённые\n"
687
"изменения."
688
689
#: bzrlib/builtins.py:1165
690
msgid ""
691
"If you want to ensure you have the different changes in the other branch,\n"
692
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
693
"After that you will be able to do a push without '--overwrite'."
694
msgstr ""
695
"Если вы хотите убедиться, что у вас иные изменения, чем в другой ветви,\n"
696
"сделайте слияние (см. bzr help merge) с другой ветвью, и закрепите эти\n"
697
"изменения. После этого вы сможете делать push без необходимости указывать\n"
698
"опцию '--overwrite'."
699
700
#: bzrlib/builtins.py:1169
701
msgid ""
702
"If there is no default push location set, the first push will set it (use\n"
703
"--no-remember to avoid setting it). After that, you can omit the\n"
704
"location to use the default. To change the default, use --remember. The\n"
705
"value will only be saved if the remote location can be accessed."
706
msgstr ""
707
"Если местоположение отправки по умолчанию не установлено, первый push\n"
708
"установит её (используйте --no-remember, чтобы не устанавливать).\n"
709
"После этого вы можете опускать местоположение, чтобы использовать\n"
710
"значение по умолчанию. Чтобы изменить значение по умолчанию,\n"
711
"используйте опцию --remember. Значение будет сохранено, только если\n"
712
"доступ к удалённой локации будет успешен."
713
714
#: bzrlib/builtins.py:1174
715
msgid ""
716
"The --verbose option will display the revisions pushed using the log_format\n"
717
"configuration option. You can use a different format by overriding it with\n"
718
"-Olog_format=<other_format>."
719
msgstr ""
720
"Опция --verbose отобразит ревизии, выгруженные с использованием опции\n"
721
"конфигурации log_format. Вы можете использовать другой формат, перегрузив\n"
722
"её опцией -Olog_format=<другой_формат>."
723
724
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
725
msgid ""
726
"Branch to push from, rather than the one containing the working directory."
727
msgstr "Отправлять из этой ветви, а не из содержащей рабочую директорию."
728
729
#: bzrlib/builtins.py:1188
730
msgid ""
731
"By default push will fail if the target directory exists, but does not "
732
"already have a control directory. This flag will allow push to proceed."
733
msgstr ""
734
"По умолчанию, push закончится неудачей, если директория назначения "
735
"существует, но не содержит управляющих метаданных. Этот флаг позволит "
736
"отправке изменений продолжаться."
737
738
#: bzrlib/builtins.py:1193
739
msgid ""
740
"Create a stacked branch that references the public location of the parent "
741
"branch."
742
msgstr ""
743
"Создать стековую ветвь, которая ссылается на публичное местоположение "
744
"родительской ветви."
745
746
#: bzrlib/builtins.py:1196
747
msgid ""
748
"Create a stacked branch that refers to another branch for the commit "
749
"history. Only the work not present in the referenced branch is included in "
750
"the branch created."
751
msgstr ""
752
"Создать стековую ветвь, которая ссылается на другую ветвь для хранения "
753
"истории фиксаций. В созданную ветвь помещается только работа, не "
754
"существующая в исходной ветви."
755
756
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
757
msgid ""
758
"Refuse to push if there are uncommitted changes in the working tree, --no-"
759
"strict disables the check."
760
msgstr ""
761
"Отказывать в отсылке изменений, если в рабочем дереве есть незакреплённые "
762
"изменения, --no-strict запрещает проверку."
763
764
#: bzrlib/builtins.py:1204
765
msgid "Don't populate the working tree, even for protocols that support it."
766
msgstr ""
767
"Не создавать рабочее дерево, даже для протоколов, которые поддерживают это."
768
769
#: bzrlib/builtins.py:1248
770
msgid "Could not determine branch to refer to."
771
msgstr "Не удалось определить ветвь, на которую нужно ссылаться."
772
773
#: bzrlib/builtins.py:1257
774
#, python-format
775
msgid ""
776
"No push location known or specified. To push to the parent branch (at %s), "
777
"use 'bzr push :parent'."
778
msgstr ""
779
780
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
781
msgid "No push location known or specified."
782
msgstr "Местоположение для отсылки изменений неизвестно и не указано."
783
784
#: bzrlib/builtins.py:1267
785
#, python-format
786
msgid "Using saved push location: %s"
787
msgstr "Используется сохранённое местоположение отсылки: %s"
788
789
#: bzrlib/builtins.py:1277
790
msgid "Create a new branch that is a copy of an existing branch."
791
msgstr "Создать новую ветвь, являющуюся копией существующей ветви."
792
793
#: bzrlib/builtins.py:1279
794
msgid ""
795
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
796
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
797
"./bar.\n"
798
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
799
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
800
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
801
"create ./foo-bar."
802
msgstr ""
803
"Если TO_LOCATION опущено, будет использована последняя компонента\n"
804
"FROM_LOCATION. Иными словами, «branch ../foo/bar» попытается создать ./bar.\n"
805
"Если FROM_LOCATION не содержит разделителя «/», то TO_LOCATION определется\n"
806
"из FROM_LOCATION удалением префикса. Например «branch lp:foo-bar»\n"
807
"попытается создать ./foo-bar."
808
809
#: bzrlib/builtins.py:1286
810
msgid ""
811
"To retrieve the branch as of a particular revision, supply the --revision\n"
812
"parameter, as in \"branch foo/bar -r 5\"."
813
msgstr ""
814
"Чтобы получить определённую ревизию ветви, передайте её в параметре\n"
815
"--revision, напр. «branch foo/bar -r 5»."
816
817
#: bzrlib/builtins.py:1289
818
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
819
msgstr "Синонимы 'clone' и 'get' для этой команды устарели."
820
821
#: bzrlib/builtins.py:1299
822
msgid "Create a branch without a working-tree."
823
msgstr "Создать ветвь без рабочего дерева."
824
825
#: bzrlib/builtins.py:1301
826
msgid "Switch the checkout in the current directory to the new branch."
827
msgstr "Заменить рабочую копию в текущей директории новой ветвью."
828
829
#: bzrlib/builtins.py:1304
830
msgid ""
831
"Create a stacked branch referring to the source branch. The new branch will "
832
"depend on the availability of the source branch for all operations."
833
msgstr ""
834
"Создать стековую ветвь, ссылающуюся на исходную ветвь. Все операции над "
835
"новой ветвью будут зависеть от доступности старой ветви."
836
837
#: bzrlib/builtins.py:1308
838
msgid "Do not use a shared repository, even if available."
839
msgstr "Не использовать общий репозиторий, даже если доступен."
840
841
#: bzrlib/builtins.py:1310
842
msgid ""
843
"By default branch will fail if the target directory exists, but does not "
844
"already have a control directory. This flag will allow branch to proceed."
845
msgstr ""
846
"По умолчанию branch завершится неудачей, если директория назначения "
847
"существует, но не содержит управляющих метаданных. Этот флаг позволит branch "
848
"продолжаться."
849
850
#: bzrlib/builtins.py:1315
851
msgid "Bind new branch to from location."
852
msgstr "Связать новую ветвь с FROM_LOCATION"
853
854
#: bzrlib/builtins.py:1362
855
#, python-format
856
msgid "Target directory \"%s\" already exists."
857
msgstr "Целевая директория «%s» уже существует."
858
859
#: bzrlib/builtins.py:1374
860
#, python-format
861
msgid "Parent of \"%s\" does not exist."
862
msgstr "Родитель «%s» не существует."
863
864
#: bzrlib/builtins.py:1393
865
msgid "The branch {0} has no revision {1}."
866
msgstr "В ветви {0} отсутствует ревизия {1}."
867
868
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
869
#, python-format
870
msgid "Created new stacked branch referring to %s."
871
msgstr "Создана новая стековая ветвь, ссылающаяся на %s."
872
873
#: bzrlib/builtins.py:1407
874
#, python-format
875
msgid "Branched %d revision."
876
msgid_plural "Branched %d revisions."
877
msgstr[0] "Ответвлена %d ревизия."
878
msgstr[1] "Ответвлены %d ревизии."
879
msgstr[2] "Ответвлены %d ревизий."
880
881
#: bzrlib/builtins.py:1412
882
#, python-format
883
msgid "New branch bound to %s"
884
msgstr "Новая ветвь, связанная с %s"
885
886
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
887
#, python-format
888
msgid "Switched to branch: %s"
889
msgstr "Переключение на ветвь: %s"
890
891
#: bzrlib/builtins.py:1422
892
msgid "List the branches available at the current location."
893
msgstr "Вывести список ветвей, доступных в текущем местоположении."
894
895
#: bzrlib/builtins.py:1424
896
msgid ""
897
"This command will print the names of all the branches at the current\n"
898
"location."
899
msgstr "Эта команда выведет имена всех ветвей в текущем местоположении."
900
901
#: bzrlib/builtins.py:1431
902
msgid ""
903
"Recursively scan for branches rather than just looking in the specified "
904
"location."
905
msgstr ""
906
"Рекурсивно сканировать ветви, а не смотреть в указанном местоположении."
907
908
#: bzrlib/builtins.py:1461
909
msgid "(default)"
910
msgstr ""
911
912
#: bzrlib/builtins.py:1473
913
msgid "Create a new checkout of an existing branch."
914
msgstr "Создать новую рабочую копию текущей ветви."
915
916
#: bzrlib/builtins.py:1475
917
msgid ""
918
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
919
"for\n"
920
"the branch found in '.'. This is useful if you have removed the working "
921
"tree\n"
922
"or if it was never created - i.e. if you pushed the branch to its current\n"
923
"location using SFTP."
924
msgstr ""
925
"Если аргумент BRANCH_LOCATION опущен, checkout воссоздаст рабочее дерево\n"
926
"для ветви, найденной в '.'. Это полезно, если вы удалили рабочее дерево,\n"
927
"или если вы никогда не создавали его."
928
929
#: bzrlib/builtins.py:1480
930
msgid ""
931
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
932
"will\n"
933
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
934
"./bar.\n"
935
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
936
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
937
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
938
"create ./foo-bar."
939
msgstr ""
940
"Если TO_LOCATION опущено, будет использована последняя компонента\n"
941
"BRANCH_LOCATION. Иными словами, «checkout ../foo/bar» попытается\n"
942
"создать ./bar. Если BRANCH_LOCATION не содержит разделителя «/»,\n"
943
"то TO_LOCATION определется из BRANCH_LOCATION удалением префикса.\n"
944
"Например «checkout lp:foo-bar» попытается создать ./foo-bar."
945
946
#: bzrlib/builtins.py:1487
947
msgid ""
948
"To retrieve the branch as of a particular revision, supply the --revision\n"
949
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
950
"immediately\n"
951
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
952
"old\n"
953
"code.)"
954
msgstr ""
955
"Чтобы получить определённую ревизию ветви, добавьте параметр --revision,\n"
956
"например «checkout foo/bar -r 5». Заметьте, что такое дерево будет сразу\n"
957
"просрочено [так что в не сможете закрепить изменения], но это может быть\n"
958
"полезно, к примеру, для просмотра старого кода."
959
960
#: bzrlib/builtins.py:1497
961
msgid ""
962
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
963
"the branch for every operation. Normal checkouts can perform common "
964
"operations like diff and status without such access, and also support local "
965
"commits."
966
msgstr ""
967
"Получить легковесную рабочую копию. Каждая операция над легковесной рабочей "
968
"копией зависит от доступности ветви. Обычные рабочие копии позволяют "
969
"производить стандартные операции, как diff и status, без такого доступа, а "
970
"также поддерживают локальные закрепления."
971
972
#: bzrlib/builtins.py:1504
973
msgid "Get file contents from this tree."
974
msgstr "Получить содержимое файла из этого дерева."
975
976
#: bzrlib/builtins.py:1506
977
msgid "Hard-link working tree files where possible."
978
msgstr "Использовать жёсткие ссылки в рабочем дереве, когда это возможно."
979
980
#: bzrlib/builtins.py:1547
981
msgid ""
982
"Show list of renamed files.\n"
983
" "
984
msgstr ""
985
"Показать список переименованных файлов.\n"
986
" "
987
988
#: bzrlib/builtins.py:1577
989
msgid "Update a working tree to a new revision."
990
msgstr "Обновить рабочее дерево до новой ревизии."
991
992
#: bzrlib/builtins.py:1579
993
msgid ""
994
"This will perform a merge of the destination revision (the tip of the\n"
995
"branch, or the specified revision) into the working tree, and then make\n"
996
"that revision the basis revision for the working tree. "
997
msgstr ""
998
999
#: bzrlib/builtins.py:1583
1000
msgid ""
1001
"You can use this to visit an older revision, or to update a working tree\n"
1002
"that is out of date from its branch."
1003
msgstr ""
1004
1005
#: bzrlib/builtins.py:1586
1006
msgid ""
1007
"If there are any uncommitted changes in the tree, they will be carried\n"
1008
"across and remain as uncommitted changes after the update. To discard\n"
1009
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
1010
"with the changes brought in by the change in basis revision."
1011
msgstr ""
1012
1013
#: bzrlib/builtins.py:1591
1014
msgid ""
1015
"If the tree's branch is bound to a master branch, bzr will also update\n"
1016
"the branch from the master."
1017
msgstr ""
1018
1019
#: bzrlib/builtins.py:1594
1020
msgid ""
1021
"You cannot update just a single file or directory, because each Bazaar\n"
1022
"working tree has just a single basis revision. If you want to restore a\n"
1023
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
1024
"update'. If you want to restore a file to its state in a previous\n"
1025
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
1026
"out the old content of that file to a new location."
1027
msgstr ""
1028
"Нельзя обновить только отдельный файл или директорию, поскольку каждое\n"
1029
"рабочее дерево Bazaar имеет только одну базовую ревизию. Если вы хотите\n"
1030
"восстановить файл, который был удалён на локальной машине, используйте\n"
1031
"'bzr revert', а не 'bzr update'. Если вы хотите восстановить файл до\n"
1032
"состояния в предыдущей ревизии, используйте 'bzr revert' с опцией '-r',\n"
1033
"или используйте 'bzr cat', чтобы записать старое содержимое этого файла\n"
1034
"в новое местоположение."
1035
1036
#: bzrlib/builtins.py:1601
1037
msgid ""
1038
"The 'dir' argument, if given, must be the location of the root of a\n"
1039
"working tree to update. By default, the working tree that contains the \n"
1040
"current working directory is used."
1041
msgstr ""
1042
1043
#: bzrlib/builtins.py:1617
1044
msgid "bzr update --revision takes exactly one revision"
1045
msgstr "bzr update --revision принимает ровно одну ревизию"
1046
1047
#: bzrlib/builtins.py:1625
1048
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1049
msgstr ""
1050
"bzr update может обновить только всё дерево, не файл или поддиректорию"
1051
1052
#: bzrlib/builtins.py:1656
1053
msgid "Tree is up to date at revision {0} of branch {1}"
1054
msgstr "Дерево в актуальной ревизии {0} ветви {1}"
1055
1056
#: bzrlib/builtins.py:1672
1057
#, python-format
1058
msgid ""
1059
"branch has no revision %s\n"
1060
"bzr update --revision only works for a revision in the branch history"
1061
msgstr ""
1062
"в ветви нет ревизии %s\n"
1063
"bzr update --revision работает только для ревизий в истории ветви"
1064
1065
#: bzrlib/builtins.py:1678
1066
msgid "Updated to revision {0} of branch {1}"
1067
msgstr "Обновлено до ревизии {0} ветви {1}"
1068
1069
#: bzrlib/builtins.py:1682
1070
msgid ""
1071
"Your local commits will now show as pending merges with 'bzr status', and "
1072
"can be committed with 'bzr commit'."
1073
msgstr ""
1074
"Ваши локальные закрепления теперь будут отображаться в 'bzr status' как "
1075
"незавершённые слияния, и их можно закрепить с помощью 'bzr commit'."
1076
1077
#: bzrlib/builtins.py:1691
1078
msgid "Show information about a working tree, branch or repository."
1079
msgstr "Показать информацию о рабочем дереве, ветви или репозитории."
1080
1081
#: bzrlib/builtins.py:1693
1082
msgid ""
1083
"This command will show all known locations and formats associated to the\n"
1084
"tree, branch or repository."
1085
msgstr ""
1086
"Эта команда выведет все известные местоположения и форматы, связанные\n"
1087
"с деревом, ветвью или репозиторием."
1088
1089
#: bzrlib/builtins.py:1696
1090
msgid ""
1091
"In verbose mode, statistical information is included with each report.\n"
1092
"To see extended statistic information, use a verbosity level of 2 or\n"
1093
"higher by specifying the verbose option multiple times, e.g. -vv."
1094
msgstr ""
1095
"В подробном режиме в каждый отчёт включается статистическая информация.\n"
1096
"Чтобы увидеть расширенную статистическую информацию, используйте уровень\n"
1097
"подробностей 2 или выше, указывая опцию -v несколько раз, например -vv."
1098
1099
#: bzrlib/builtins.py:1700
1100
msgid "Branches and working trees will also report any missing revisions."
1101
msgstr ""
1102
"Ветви и рабочие деревья также включают в отчёт отсутствующие ревизии."
1103
1104
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
1105
#: bzrlib/builtins.py:6389
1106
msgid ":Examples:"
1107
msgstr ""
1108
1109
#: bzrlib/builtins.py:1704
1110
msgid " Display information on the format and related locations:"
1111
msgstr " Вывести информацию о формате и связанных местоположениях:"
1112
1113
#: bzrlib/builtins.py:1706
1114
msgid " bzr info"
1115
msgstr " bzr info"
1116
1117
#: bzrlib/builtins.py:1708
1118
msgid ""
1119
" Display the above together with extended format information and\n"
1120
" basic statistics (like the number of files in the working tree and\n"
1121
" number of revisions in the branch and repository):"
1122
msgstr ""
1123
" Вывести то же, что и выше, а также расширенную информацию о формате\n"
1124
" и базовую статистику (как число файлов в рабочем дереве и число\n"
1125
" ревизий в ветви и репозитории):"
1126
1127
#: bzrlib/builtins.py:1712
1128
msgid " bzr info -v"
1129
msgstr " bzr info -v"
1130
1131
#: bzrlib/builtins.py:1714
1132
msgid " Display the above together with number of committers to the branch:"
1133
msgstr " Вывести то же, что и выше, а также число участников ветви:"
1134
1135
#: bzrlib/builtins.py:1716
1136
msgid " bzr info -vv"
1137
msgstr " bzr info -vv"
1138
1139
#: bzrlib/builtins.py:1735
1140
msgid "Remove files or directories."
1141
msgstr "Исключить файлы или директории."
1142
1143
#: bzrlib/builtins.py:1737
1144
msgid ""
1145
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1146
"delete them if they can easily be recovered using revert otherwise they\n"
1147
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1148
"parameters are given Bazaar will scan for files that are being tracked by\n"
1149
"Bazaar but missing in your tree and stop tracking them for you."
1150
msgstr ""
1151
"Прекращает отслеживание изменений в указанных файлах. Bazaar удалит их,\n"
1152
"если их можно легко восстановить с помощью revert, иначе будут созданы\n"
1153
"их резервные копии (с расширением вида .~#~). Если не указано ни опций,\n"
1154
"ни параметров, Bazaar найдёт файлы, которые отслеживаются, но отсутствуют\n"
1155
"в рабочем дереве и прекратит их отслеживать."
1156
1157
#: bzrlib/builtins.py:1745
1158
msgid "Only remove files that have never been committed."
1159
msgstr "Исключать только файлы, которые никогда не были закреплены."
1160
1161
#: bzrlib/builtins.py:1747
1162
msgid "The file deletion mode to be used."
1163
msgstr "Используемый способ удаления файлов."
1164
1165
#: bzrlib/builtins.py:1748
1166
msgid "Deletion Strategy"
1167
msgstr "Стратегия удаления"
1168
1169
#: bzrlib/builtins.py:1749
1170
msgid "Backup changed files (default)."
1171
msgstr ""
1172
1173
#: bzrlib/builtins.py:1750
1174
msgid "Delete from bzr but leave the working copy."
1175
msgstr ""
1176
1177
#: bzrlib/builtins.py:1751
1178
msgid "Don't backup changed files."
1179
msgstr ""
1180
1181
#: bzrlib/builtins.py:1752
1182
msgid ""
1183
"Delete all the specified files, even if they can not be recovered and even "
1184
"if they are non-empty directories. (deprecated, use no-backup)"
1185
msgstr ""
1186
1187
#: bzrlib/builtins.py:1761
1188
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1189
msgstr ""
1190
"(Опция --force устарела, в будущем следует использовать --no-backup.)"
1191
1192
#: bzrlib/builtins.py:1778
1193
msgid "No matching files."
1194
msgstr "Нет файлов, удовлетворяющих критерию."
1195
1196
#: bzrlib/builtins.py:1839
1197
msgid "Reconcile bzr metadata in a branch."
1198
msgstr "Согласовать метаданные bzr в ветви."
1199
1200
#: bzrlib/builtins.py:1841
1201
msgid ""
1202
"This can correct data mismatches that may have been caused by\n"
1203
"previous ghost operations or bzr upgrades. You should only\n"
1204
"need to run this command if 'bzr check' or a bzr developer\n"
1205
"advises you to run it."
1206
msgstr ""
1207
"Может исправить несовпадения данных, вызванные обновлениями bzr.\n"
1208
"Эту команду стоит запускать только, если 'bzr check' или разработчик\n"
1209
"bzr предложат вам сделать это."
1210
1211
#: bzrlib/builtins.py:1846
1212
msgid ""
1213
"If a second branch is provided, cross-branch reconciliation is\n"
1214
"also attempted, which will check that data like the tree root\n"
1215
"id which was not present in very early bzr versions is represented\n"
1216
"correctly in both branches."
1217
msgstr ""
1218
"Если предоставлена вторая ветвь, производится попытка согласования\n"
1219
"между ветвями, в ходе которой проверяется, что данные, не\n"
1220
"присутствовавшие в ранних версиях bzr, корректно представлены\n"
1221
"в обоих ветвях."
1222
1223
#: bzrlib/builtins.py:1851
1224
msgid ""
1225
"At the same time it is run it may recompress data resulting in\n"
1226
"a potential saving in disk space or performance gain."
1227
msgstr ""
1228
"В то же время, при запуске возможно пережатие данных, потенциально\n"
1229
"уменьшающее размер занимаемого пространства и повышающее\n"
1230
"производительность."
1231
1232
#: bzrlib/builtins.py:1854
1233
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1234
msgstr ""
1235
"Ветвь *ДОЛЖНА* быть на системе, поддерживающей список файлов, такой как\r\n"
1236
"локальный диск или SFTP."
1237
1238
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1239
msgid ""
1240
"Format for the bzr 2.0 series.\n"
1241
"Uses group-compress storage.\n"
1242
"Provides rich roots which are a one-way transition.\n"
1243
msgstr ""
1244
1245
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1246
msgid ""
1247
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1248
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1249
msgstr ""
1250
1251
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1252
msgid "The 2a format with experimental support for colocated branches.\n"
1253
msgstr ""
1254
1255
#: bzrlib/builtins.py:1922
1256
msgid "Make a directory into a versioned branch."
1257
msgstr "Преобразовать директорию в ветвь системы контроля версий."
1258
1259
#: bzrlib/builtins.py:1924
1260
msgid ""
1261
"Use this to create an empty branch, or before importing an\n"
1262
"existing project."
1263
msgstr ""
1264
"Используйте эту команду для создания пустой ветви или\n"
1265
"перед импортом существующего проекта."
1266
1267
#: bzrlib/builtins.py:1927
1268
msgid ""
1269
"If there is a repository in a parent directory of the location, then\n"
1270
"the history of the branch will be stored in the repository. Otherwise\n"
1271
"init creates a standalone branch which carries its own history\n"
1272
"in the .bzr directory."
1273
msgstr ""
1274
"Если в родительской директории находится репозиторий, история ветви\n"
1275
"будет сохранена в репозитории. Иначе, init создаёт одиночную ветвь,\n"
1276
"которая несёт историю с собой в директории .bzr."
1277
1278
#: bzrlib/builtins.py:1932
1279
msgid ""
1280
"If there is already a branch at the location but it has no working tree,\n"
1281
"the tree can be populated with 'bzr checkout'."
1282
msgstr ""
1283
"Если ветвь уже существует, но рабочее дерево отсутствует, то оно\n"
1284
"создаётся с помощью 'bzr checkout'."
1285
1286
#: bzrlib/builtins.py:1935
1287
msgid "Recipe for importing a tree of files::"
1288
msgstr "Рецепт для импорта дерева файлов::"
1289
1290
#: bzrlib/builtins.py:1937
1291
msgid ""
1292
" cd ~/project\n"
1293
" bzr init\n"
1294
" bzr add .\n"
1295
" bzr status\n"
1296
" bzr commit -m \"imported project\""
1297
msgstr ""
1298
" cd ~/project\n"
1299
" bzr init\n"
1300
" bzr add .\n"
1301
" bzr status\n"
1302
" bzr commit -m \"проект импортирован\""
1303
1304
#: bzrlib/builtins.py:1948
1305
msgid ""
1306
"Create the path leading up to the branch if it does not already exist."
1307
msgstr "Создать путь, ведущий к ветви, если он ещё не существует."
1308
1309
#: bzrlib/builtins.py:1951
1310
msgid "Specify a format for this branch. See \"help formats\"."
1311
msgstr "Указать формат данной ветви. См. «help formats»."
1312
1313
#: bzrlib/builtins.py:1959
1314
msgid ""
1315
"Never change revnos or the existing log. Append revisions to it only."
1316
msgstr ""
1317
"Никогда не изменять номера ревизий в существующем журнале. Только добавлять "
1318
"к нему ревизии."
1319
1320
#: bzrlib/builtins.py:1962
1321
msgid "Create a branch without a working tree."
1322
msgstr "Создать ветвь без рабочего дерева."
1323
1324
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1325
#, python-format
1326
msgid ""
1327
"Parent directory of %s does not exist.\n"
1328
"You may supply --create-prefix to create all leading parent directories."
1329
msgstr ""
1330
"Родительская директория для %s не существует.\n"
1331
"Вы может предоставить --create-prefix, чтобы создать все родительские "
1332
"директории."
1333
1334
#: bzrlib/builtins.py:2016
1335
msgid ""
1336
"This branch format cannot be set to append-revisions-only. Try --default."
1337
msgstr ""
1338
"Формат этой ветви не может быть установлен в append-revisions-only. "
1339
"Попробуйте --default."
1340
1341
#: bzrlib/builtins.py:2027
1342
msgid "Created a {0} (format: {1})\n"
1343
msgstr "Создана {0} в формате {1}\n"
1344
1345
#: bzrlib/builtins.py:2036
1346
#, python-format
1347
msgid "Using shared repository: %s\n"
1348
msgstr "Используется общий репозиторий: %s\n"
1349
1350
#: bzrlib/builtins.py:2040
1351
msgid "Create a shared repository for branches to share storage space."
1352
msgstr ""
1353
"Создать общий репозиторий для ветвей, которые разделяют общее пространство."
1354
1355
#: bzrlib/builtins.py:2042
1356
msgid ""
1357
"New branches created under the repository directory will store their\n"
1358
"revisions in the repository, not in the branch directory. For branches\n"
1359
"with shared history, this reduces the amount of storage needed and \n"
1360
"speeds up the creation of new branches."
1361
msgstr ""
1362
"Новые ветви, создаваемые в директории репозитория, будут хранить\n"
1363
"информацию о ревизиях в репозитории, а не в директории ветви.\n"
1364
"Для ветвей с общей историей это уменьшает размер необходимого\n"
1365
"пространства и ускоряет создание новых ветвей."
1366
1367
#: bzrlib/builtins.py:2047
1368
msgid ""
1369
"If the --no-trees option is given then the branches in the repository\n"
1370
"will not have working trees by default. They will still exist as \n"
1371
"directories on disk, but they will not have separate copies of the \n"
1372
"files at a certain revision. This can be useful for repositories that\n"
1373
"store branches which are interacted with through checkouts or remote\n"
1374
"branches, such as on a server."
1375
msgstr ""
1376
"Если дана опция --no-trees, то по умолчанию ветви в репозитории не\n"
1377
"будут иметь рабочих деревьев. Они по прежнему будут существовать,\n"
1378
"как директории на диске, но не будут иметь различных копий файлов\n"
1379
"определённой ревизии. Это может быть полезно для репозиториев,\n"
1380
"хранящих ветви, работа с которыми производится через рабочие копии\n"
1381
"или через удалённые ветви, например на сервере."
1382
1383
#: bzrlib/builtins.py:2054
1384
msgid ""
1385
":Examples:\n"
1386
" Create a shared repository holding just branches::"
1387
msgstr ""
1388
":Примеры:\n"
1389
" Создать общий репозиторий, хранящий только ветви::"
1390
1391
#: bzrlib/builtins.py:2057
1392
msgid ""
1393
" bzr init-repo --no-trees repo\n"
1394
" bzr init repo/trunk"
1395
msgstr ""
1396
" bzr init-repo --no-trees repo\n"
1397
" bzr init repo/trunk"
1398
1399
#: bzrlib/builtins.py:2060
1400
msgid " Make a lightweight checkout elsewhere::"
1401
msgstr " Создать легковесную рабочую копию где-нибудь ещё::"
1402
1403
#: bzrlib/builtins.py:2062
1404
msgid ""
1405
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1406
" cd trunk-checkout\n"
1407
" (add files here)"
1408
msgstr ""
1409
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1410
" cd trunk-checkout\n"
1411
" (здесь добавляйте файлы)"
1412
1413
#: bzrlib/builtins.py:2070
1414
msgid ""
1415
"Specify a format for this repository. See \"bzr help formats\" for details."
1416
msgstr ""
1417
"Указать формат для этого репозитория. Описание форматов см. в «bzr help "
1418
"formats»."
1419
1420
#: bzrlib/builtins.py:2074
1421
msgid "Repository format"
1422
msgstr "Формат репозитория"
1423
1424
#: bzrlib/builtins.py:2076
1425
msgid "Branches in the repository will default to not having a working tree."
1426
msgstr "Ветви в репозитории по умолчанию не будут иметь рабочего дерева."
1427
1428
#: bzrlib/builtins.py:2102
1429
msgid "Show differences in the working tree, between revisions or branches."
1430
msgstr "Показать изменения в рабочем дереве, между ревизиями или ветвями."
1431
1432
#: bzrlib/builtins.py:2104
1433
msgid ""
1434
"If no arguments are given, all changes for the current tree are listed.\n"
1435
"If files are given, only the changes in those files are listed.\n"
1436
"Remote and multiple branches can be compared by using the --old and\n"
1437
"--new options. If not provided, the default for both is derived from\n"
1438
"the first argument, if any, or the current tree if no arguments are\n"
1439
"given."
1440
msgstr ""
1441
"Если не дано аргументов, будут выведены все изменения текущего дерева.\n"
1442
"Если даны файлы, выводятся изменения только в этих файлах. Удалённые\n"
1443
"или множественные ветви можно сравнить, используя опции --old и --new.\n"
1444
"Если не указаны, значение по умолчанию для обоих извлекается из первого\n"
1445
"аргумента или из текущего дерева, если не дано аргументов."
1446
1447
#: bzrlib/builtins.py:2111
1448
msgid ""
1449
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1450
"produces patches suitable for \"patch -p1\"."
1451
msgstr ""
1452
"«bzr diff -p1» эквивалентно «bzr diff -prefix old/:new/», и\n"
1453
"создаёт патчи, подходящие для «patch -p1»."
1454
1455
#: bzrlib/builtins.py:2114
1456
msgid ""
1457
"Note that when using the -r argument with a range of revisions, the\n"
1458
"differences are computed between the two specified revisions. That\n"
1459
"is, the command does not show the changes introduced by the first \n"
1460
"revision in the range. This differs from the interpretation of \n"
1461
"revision ranges used by \"bzr log\" which includes the first revision\n"
1462
"in the range."
1463
msgstr ""
1464
"Заметьте, что при использовании аргумента -r с интервалом ревизий,\n"
1465
"различия вычисляются между указанными ревизиями. То есть, команда\n"
1466
"не показывает изменения, представленные в первой ревизии интервала.\n"
1467
"Это отличается от интерпретации интервалов ревизий командой «bzr log»,\n"
1468
"которая включает первую ревизию интервала."
1469
1470
#: bzrlib/builtins.py:2121
1471
msgid ""
1472
":Exit values:\n"
1473
" 1 - changed\n"
1474
" 2 - unrepresentable changes\n"
1475
" 3 - error\n"
1476
" 0 - no change"
1477
msgstr ""
1478
":Значения выхода:\n"
1479
" 1 - изменено\n"
1480
" 2 - непредставимые изменения\n"
1481
" 3 - ошибка\n"
1482
" 0 - нет изменений"
1483
1484
#: bzrlib/builtins.py:2127
1485
msgid ""
1486
":Examples:\n"
1487
" Shows the difference in the working tree versus the last commit::"
1488
msgstr ""
1489
":Примеры:\n"
1490
" Показывает отличия рабочего дерева от последнего закрепления::"
1491
1492
#: bzrlib/builtins.py:2130
1493
msgid " bzr diff"
1494
msgstr " bzr diff"
1495
1496
#: bzrlib/builtins.py:2132
1497
msgid " Difference between the working tree and revision 1::"
1498
msgstr " Различия между рабочим деревом и ревизией 1::"
1499
1500
#: bzrlib/builtins.py:2134
1501
msgid " bzr diff -r1"
1502
msgstr " bzr diff -r1"
1503
1504
#: bzrlib/builtins.py:2136
1505
msgid " Difference between revision 3 and revision 1::"
1506
msgstr " Различия между ревизией 3 и ревизией 1::"
1507
1508
#: bzrlib/builtins.py:2138
1509
msgid " bzr diff -r1..3"
1510
msgstr " bzr diff -r1..3"
1511
1512
#: bzrlib/builtins.py:2140
1513
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1514
msgstr " Различия между ревизией 3 и ревизией 1 для ветви xxx::"
1515
1516
#: bzrlib/builtins.py:2142
1517
msgid " bzr diff -r1..3 xxx"
1518
msgstr " bzr diff -r1..3 xxx"
1519
1520
#: bzrlib/builtins.py:2144
1521
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1522
msgstr " Изменения, представленные в ревизии 2 (эквивалентно -r1..2)::"
1523
1524
#: bzrlib/builtins.py:2146
1525
msgid " bzr diff -c2"
1526
msgstr " bzr diff -c2"
1527
1528
#: bzrlib/builtins.py:2148
1529
msgid ""
1530
" To see the changes introduced by revision X::\n"
1531
" \n"
1532
" bzr diff -cX"
1533
msgstr ""
1534
" Чтобы увидеть изменения, представленные в ревизии X::\n"
1535
" \n"
1536
" bzr diff -cX"
1537
1538
#: bzrlib/builtins.py:2152
1539
msgid ""
1540
" Note that in the case of a merge, the -c option shows the changes\n"
1541
" compared to the left hand parent. To see the changes against\n"
1542
" another parent, use::"
1543
msgstr ""
1544
" Заметьте, что в случае слияния, опция -c выведет только изменения\n"
1545
" относительно левого родителя. Чтобы увидеть изменения относительно\n"
1546
" правого родителя, используйте::"
1547
1548
#: bzrlib/builtins.py:2156
1549
msgid " bzr diff -r<chosen_parent>..X"
1550
msgstr " bzr diff -r<выбранный_родитель>..X"
1551
1552
#: bzrlib/builtins.py:2158
1553
msgid ""
1554
" The changes between the current revision and the previous revision\n"
1555
" (equivalent to -c-1 and -r-2..-1)"
1556
msgstr ""
1557
" Изменения между текущей ревизией и предыдущей\n"
1558
" (эквивалент -c-1 и -r-2..-1)"
1559
1560
#: bzrlib/builtins.py:2161
1561
msgid " bzr diff -r-2.."
1562
msgstr " bzr diff -r-2.."
1563
1564
#: bzrlib/builtins.py:2163
1565
msgid " Show just the differences for file NEWS::"
1566
msgstr " Показать изменения только для файла NEWS::"
1567
1568
#: bzrlib/builtins.py:2165
1569
msgid " bzr diff NEWS"
1570
msgstr " bzr diff NEWS"
1571
1572
#: bzrlib/builtins.py:2167
1573
msgid " Show the differences in working tree xxx for file NEWS::"
1574
msgstr " Показать изменения в рабочем дереве xxx для файла NEWS::"
1575
1576
#: bzrlib/builtins.py:2169
1577
msgid " bzr diff xxx/NEWS"
1578
msgstr " bzr diff xxx/NEWS"
1579
1580
#: bzrlib/builtins.py:2171
1581
msgid " Show the differences from branch xxx to this working tree:"
1582
msgstr " Показать изменения рабочего дерева относительно ветви xxx:"
1583
1584
#: bzrlib/builtins.py:2173
1585
msgid " bzr diff --old xxx"
1586
msgstr " bzr diff --old xxx"
1587
1588
#: bzrlib/builtins.py:2175
1589
msgid " Show the differences between two branches for file NEWS::"
1590
msgstr " Показать различия в файле NEWS между двумя ветвями::"
1591
1592
#: bzrlib/builtins.py:2177
1593
msgid " bzr diff --old xxx --new yyy NEWS"
1594
msgstr " bzr diff --old xxx --new yyy NEWS"
1595
1596
#: bzrlib/builtins.py:2179
1597
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1598
msgstr " Тоже, что и 'bzr diff', но начать пути с old/ и new/::"
1599
1600
#: bzrlib/builtins.py:2181
1601
msgid ""
1602
" bzr diff --prefix old/:new/\n"
1603
" \n"
1604
" Show the differences using a custom diff program with options::\n"
1605
" \n"
1606
" bzr diff --using /usr/bin/diff --diff-options -wu"
1607
msgstr ""
1608
" bzr diff --prefix old/:new/\n"
1609
" \n"
1610
" Показать изменения, используя пользовательскую программу diff с "
1611
"опциями::\n"
1612
" \n"
1613
" bzr diff --using /usr/bin/diff --diff-options -wu"
1614
1615
#: bzrlib/builtins.py:2191
1616
msgid "Pass these options to the external diff program."
1617
msgstr "Передать эти опции внешней программе diff."
1618
1619
#: bzrlib/builtins.py:2194
1620
msgid ""
1621
"Set prefixes added to old and new filenames, as two values separated by a "
1622
"colon. (eg \"old/:new/\")."
1623
msgstr ""
1624
"Установить префиксы, добавляемые к старым и новым именам файлов, как "
1625
"значения, разделённые двоеточием (напр. «old/:new/»)."
1626
1627
#: bzrlib/builtins.py:2197
1628
msgid "Branch/tree to compare from."
1629
msgstr "Ветвь или дерево, которое сравнивать."
1630
1631
#: bzrlib/builtins.py:2201
1632
msgid "Branch/tree to compare to."
1633
msgstr "Ветвь или дерево, с которым сравнивать."
1634
1635
#: bzrlib/builtins.py:2207
1636
msgid "Use this command to compare files."
1637
msgstr "Использовать эту команду для сравнения."
1638
1639
#: bzrlib/builtins.py:2212
1640
msgid "Diff format to use."
1641
msgstr "Используемый формат diff."
1642
1643
#: bzrlib/builtins.py:2214
1644
msgid "Diff format"
1645
msgstr "Формат diff"
1646
1647
#: bzrlib/builtins.py:2236
1648
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1649
msgstr ""
1650
"--prefix ожидает два значения, разделённые двоеточием (напр. «old/:new/»)"
1651
1652
#: bzrlib/builtins.py:2240
1653
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1654
msgstr "bzr diff --revision принимает ровно ожин или два аргумента"
1655
1656
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1657
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1658
msgid "{0} and {1} are mutually exclusive"
1659
msgstr "{0} и {1} взаимоисключающи"
1660
1661
#: bzrlib/builtins.py:2265
1662
msgid ""
1663
"List files deleted in the working tree.\n"
1664
" "
1665
msgstr ""
1666
"Вывести список файлов, удалённых в рабочем дереве.\n"
1667
" "
1668
1669
#: bzrlib/builtins.py:2343
1670
msgid "Show the tree root directory."
1671
msgstr "Показать корневую директорию дерева."
1672
1673
#: bzrlib/builtins.py:2345
1674
msgid ""
1675
"The root is the nearest enclosing directory with a .bzr control\n"
1676
"directory."
1677
msgstr ""
1678
"Корень это ближайшая родительская директория с управляющей\n"
1679
"директорией .bzr."
1680
1681
#: bzrlib/builtins.py:2360
1682
msgid "The limit argument must be an integer."
1683
msgstr "Аргумент предела должен быть целым числом."
1684
1685
#: bzrlib/builtins.py:2368
1686
msgid "The levels argument must be an integer."
1687
msgstr "Аргументы пределов должны быть целыми числами."
1688
1689
#: bzrlib/builtins.py:2373
1690
msgid "Show historical log for a branch or subset of a branch."
1691
msgstr "Показать журнал истории ветви или подмножества ветви."
1692
1693
#: bzrlib/builtins.py:2375
1694
msgid ""
1695
"log is bzr's default tool for exploring the history of a branch.\n"
1696
"The branch to use is taken from the first parameter. If no parameters\n"
1697
"are given, the branch containing the working directory is logged.\n"
1698
"Here are some simple examples::"
1699
msgstr ""
1700
"log — это утилита bzr по умолчанию для просмотра истории ветви.\n"
1701
"Используемая ветвь определяется первым параметром. Если не задано\n"
1702
"параметров, выводится журнал ветви, содержащей рабочюю директорию.\n"
1703
"Вот несколько простых примеров::"
1704
1705
#: bzrlib/builtins.py:2380
1706
msgid ""
1707
" bzr log log the current branch\n"
1708
" bzr log foo.py log a file in its branch\n"
1709
" bzr log http://server/branch log a branch on a server"
1710
msgstr ""
1711
" bzr log журнал текущей ветви\n"
1712
" bzr log foo.py журнал файла в его ветви\n"
1713
" bzr log http://server/branch журнал ветви на сервере"
1714
1715
#: bzrlib/builtins.py:2384
1716
msgid ""
1717
"The filtering, ordering and information shown for each revision can\n"
1718
"be controlled as explained below. By default, all revisions are\n"
1719
"shown sorted (topologically) so that newer revisions appear before\n"
1720
"older ones and descendants always appear before ancestors. If displayed,\n"
1721
"merged revisions are shown indented under the revision in which they\n"
1722
"were merged."
1723
msgstr ""
1724
"Фильтрация, сортировка и отображение информации для каждой ревизии\n"
1725
"могут управляться, как объяснено ниже. По умолчанию, выводятся все\n"
1726
"ревизии отсортированные так, что более новые ревизии находятся выше\n"
1727
"более старых и потомки находятся выше предков. Если ревизия слияния\n"
1728
"отображаются, то они отображаются с отступом, относительно ревизии,\n"
1729
"в которой происходило слияние."
1730
1731
#: bzrlib/builtins.py:2391
1732
msgid ":Output control:"
1733
msgstr ":Управление выводом:"
1734
1735
#: bzrlib/builtins.py:2393
1736
msgid ""
1737
" The log format controls how information about each revision is\n"
1738
" displayed. The standard log formats are called ``long``, ``short``\n"
1739
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1740
" for more details on log formats."
1741
msgstr ""
1742
" Формат журнала определяет, как отображается информация о каждой\n"
1743
" ревизии. Стандартные форматы журнала называются «long», «short»\n"
1744
" и «line». По умолчание используется long. Подробности о форматах\n"
1745
" смотрите в «bzr help log-formats»."
1746
1747
#: bzrlib/builtins.py:2398
1748
msgid ""
1749
" The following options can be used to control what information is\n"
1750
" displayed::"
1751
msgstr ""
1752
" Следующие опции могут использоваться для управления отображением\n"
1753
" информации::"
1754
1755
#: bzrlib/builtins.py:2401
1756
msgid ""
1757
" -l N display a maximum of N revisions\n"
1758
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1759
" -v display a status summary (delta) for each revision\n"
1760
" -p display a diff (patch) for each revision\n"
1761
" --show-ids display revision-ids (and file-ids), not just revnos"
1762
msgstr ""
1763
" -l N выводить не больше N ревизий\n"
1764
" -n N выводить N уровней ревизий (0 для всех, 1 для сжатого)\n"
1765
" -v выводить статусные сообщения (delta) для каждой ревизии\n"
1766
" -p выводить различия diff для каждой ревизии\n"
1767
" --show-ids выводить id ревизий (и id файлов), не только номера ревизий"
1768
1769
#: bzrlib/builtins.py:2407
1770
msgid ""
1771
" Note that the default number of levels to display is a function of the\n"
1772
" log format. If the -n option is not used, the standard log formats show\n"
1773
" just the top level (mainline)."
1774
msgstr ""
1775
" Число уровней отображения по умолчанию зависит от формата журнала.\n"
1776
" Если используется не опция -n, стандартные форматы журнала показывают\n"
1777
" верхний уровень (основную линию)."
1778
1779
#: bzrlib/builtins.py:2411
1780
msgid ""
1781
" Status summaries are shown using status flags like A, M, etc. To see\n"
1782
" the changes explained using words like ``added`` and ``modified``\n"
1783
" instead, use the -vv option."
1784
msgstr ""
1785
" Описания статусов отображаются с помощью флагов A, M, и т.д. Чтобы\n"
1786
" увидеть изменения, описанные словами вроде «добавлены» и «изменены»,\n"
1787
" используйте опцию -vv."
1788
1789
#: bzrlib/builtins.py:2415
1790
msgid ":Ordering control:"
1791
msgstr ":Управление порядком:"
1792
1793
#: bzrlib/builtins.py:2417
1794
msgid ""
1795
" To display revisions from oldest to newest, use the --forward option.\n"
1796
" In most cases, using this option will have little impact on the total\n"
1797
" time taken to produce a log, though --forward does not incrementally\n"
1798
" display revisions like --reverse does when it can."
1799
msgstr ""
1800
" Чтобы вывести ревизии от старой до новой, используйте опцию --forward.\n"
1801
" В большинстве случаев, при использовании этой опции на создание журнала\n"
1802
" расходуется мало времени, хотя --forward не выводит ревизии по порядку,\n"
1803
" как это делает --reverse."
1804
1805
#: bzrlib/builtins.py:2422
1806
msgid ":Revision filtering:"
1807
msgstr ":Фильтрация ревизий:"
1808
1809
#: bzrlib/builtins.py:2424
1810
msgid ""
1811
" The -r option can be used to specify what revision or range of revisions\n"
1812
" to filter against. The various forms are shown below::"
1813
msgstr ""
1814
" Опцию -r можно использовать для указания ревизии или интервала ревизий\n"
1815
" для фильтрации. Различные формы показаны ниже::"
1816
1817
#: bzrlib/builtins.py:2427
1818
msgid ""
1819
" -rX display revision X\n"
1820
" -rX.. display revision X and later\n"
1821
" -r..Y display up to and including revision Y\n"
1822
" -rX..Y display from X to Y inclusive"
1823
msgstr ""
1824
" -rX вывести ревизию X\n"
1825
" -rX.. вывести ревизию X и более поздние\n"
1826
" -r..Y вывести до и включая ревизию Y\n"
1827
" -rX..Y вывести от X до Y включительно"
1828
1829
#: bzrlib/builtins.py:2432
1830
msgid ""
1831
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1832
" Some common examples are given below::"
1833
msgstr ""
1834
" Чтобы узнать, как указывать X и Y, смотрите «bzr help revisionspec».\n"
1835
" Ниже приведеные некоторые распространённые примеры::"
1836
1837
#: bzrlib/builtins.py:2435
1838
msgid ""
1839
" -r-1 show just the tip\n"
1840
" -r-10.. show the last 10 mainline revisions\n"
1841
" -rsubmit:.. show what's new on this branch\n"
1842
" -rancestor:path.. show changes since the common ancestor of this\n"
1843
" branch and the one at location path\n"
1844
" -rdate:yesterday.. show changes since yesterday"
1845
msgstr ""
1846
" -r-1 показать только верхушку\n"
1847
" -r-10.. показать последние 10 ревизий основной линии\n"
1848
" -rsubmit:.. показать, что нового в этой ветви\n"
1849
" -rancestor:путь.. показать изменения, начиная с общего предка\n"
1850
" этой ветви и указанной в пути\n"
1851
" -rdate:yesterday.. показать изменения со вчерашнего дня"
1852
1853
#: bzrlib/builtins.py:2442
1854
msgid ""
1855
" When logging a range of revisions using -rX..Y, log starts at\n"
1856
" revision Y and searches back in history through the primary\n"
1857
" (\"left-hand\") parents until it finds X. When logging just the\n"
1858
" top level (using -n1), an error is reported if X is not found\n"
1859
" along the way. If multi-level logging is used (-n0), X may be\n"
1860
" a nested merge revision and the log will be truncated accordingly."
1861
msgstr ""
1862
1863
#: bzrlib/builtins.py:2449
1864
msgid ":Path filtering:"
1865
msgstr ":Фильтрация пути:"
1866
1867
#: bzrlib/builtins.py:2451
1868
msgid ""
1869
" If parameters are given and the first one is not a branch, the log\n"
1870
" will be filtered to show only those revisions that changed the\n"
1871
" nominated files or directories."
1872
msgstr ""
1873
" Если заданы параметры и первый не является ветвью, будут отображаться\n"
1874
" только те ревизии, которые изменяли указанные файлы или директории."
1875
1876
#: bzrlib/builtins.py:2455
1877
msgid ""
1878
" Filenames are interpreted within their historical context. To log a\n"
1879
" deleted file, specify a revision range so that the file existed at\n"
1880
" the end or start of the range."
1881
msgstr ""
1882
" Имена файлов интерпретируются в историческом контексте. Чтобы вывести\n"
1883
" журнал для удалённого файла, укажите такой интервал ревизий, что файл\n"
1884
" существует от начала до конца интервала."
1885
1886
#: bzrlib/builtins.py:2459
1887
msgid ""
1888
" Historical context is also important when interpreting pathnames of\n"
1889
" renamed files/directories. Consider the following example:"
1890
msgstr ""
1891
" Исторический контекст также важен при интерпретации путей\n"
1892
" переименованных файлов и директорий. Рассмотрим следующий пример:"
1893
1894
#: bzrlib/builtins.py:2462
1895
msgid ""
1896
" * revision 1: add tutorial.txt\n"
1897
" * revision 2: modify tutorial.txt\n"
1898
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1899
msgstr ""
1900
" * ревизия 1: добавлен tutorial.txt\n"
1901
" * ревизия 2: изменён tutorial.txt\n"
1902
" * ревизия 3: переименован tutorial.txt в guide.txt; добавлен tutorial.txt"
1903
1904
#: bzrlib/builtins.py:2466
1905
msgid " In this case:"
1906
msgstr " В этом случае:"
1907
1908
#: bzrlib/builtins.py:2468
1909
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1910
msgstr ""
1911
" * «bzr log guide.txt» выведет журнал файла, добавленного в ревизии 1"
1912
1913
#: bzrlib/builtins.py:2470
1914
msgid ""
1915
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1916
msgstr ""
1917
" * «bzr log tutorial.txt» выведет журнал нового файла, добавленного\r\n"
1918
" в ревизии 3"
1919
1920
#: bzrlib/builtins.py:2472
1921
msgid ""
1922
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1923
" the original file in revision 2."
1924
msgstr ""
1925
" * «bzr log -r2 -p tutorial.txt» выведет изменения оригинального\n"
1926
" файла в ревизии 2."
1927
1928
#: bzrlib/builtins.py:2475
1929
msgid ""
1930
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1931
" was no file called guide.txt in revision 2."
1932
msgstr ""
1933
" * «bzr log -r2 -p guide.txt» выведет сообщение об ошибке, так как\n"
1934
" в ревизии 2 нет файла guide.txt."
1935
1936
#: bzrlib/builtins.py:2478
1937
msgid ""
1938
" Renames are always followed by log. By design, there is no need to\n"
1939
" explicitly ask for this (and no way to stop logging a file back\n"
1940
" until it was last renamed)."
1941
msgstr ""
1942
1943
#: bzrlib/builtins.py:2482
1944
msgid ":Other filtering:"
1945
msgstr ":Другая фильтрация:"
1946
1947
#: bzrlib/builtins.py:2484
1948
msgid ""
1949
" The --match option can be used for finding revisions that match a\n"
1950
" regular expression in a commit message, committer, author or bug.\n"
1951
" Specifying the option several times will match any of the supplied\n"
1952
" expressions. --match-author, --match-bugs, --match-committer and\n"
1953
" --match-message can be used to only match a specific field."
1954
msgstr ""
1955
" Опцию --match можно использовать для нахождения ревизий, удовлетворяющих\n"
1956
" регулярному выражению в сообщении, закрепляющем, авторе или ошибке.\n"
1957
" Опцию можно указать несколько раз и в этом случае будут выведены только\n"
1958
" ревизии, удовлетворяющие всем критериям. Для поиска по определённым\n"
1959
" полям можно использовать опции --match-author, --match-bugs,\n"
1960
" --match-committer и --match-message."
1961
1962
#: bzrlib/builtins.py:2490
1963
msgid ":Tips & tricks:"
1964
msgstr ":Советы и трюки:"
1965
1966
#: bzrlib/builtins.py:2492
1967
msgid ""
1968
" GUI tools and IDEs are often better at exploring history than command\n"
1969
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1970
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1971
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1972
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1973
msgstr ""
1974
" Чаще лучше просматривать историю с помощью графических утилит и IDE,\n"
1975
" например qlog, viz из qbzr или bzr-gtk, оболочку bzr-explorer, или\n"
1976
" веб-интерфейс Loggerhead. Смотрите руководство по модулям\n"
1977
" <http://doc.bazaar.canonical.com/plugins/en/> и\n"
1978
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1979
1980
#: bzrlib/builtins.py:2498
1981
msgid ""
1982
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1983
msgstr ""
1984
" Возможно, вы захотите добавить следующие псевдонимы в «bazaar.conf»::"
1985
1986
#: bzrlib/builtins.py:2500
1987
msgid ""
1988
" [ALIASES]\n"
1989
" tip = log -r-1\n"
1990
" top = log -l10 --line\n"
1991
" show = log -v -p"
1992
msgstr ""
1993
" [ALIASES]\n"
1994
" tip = log -r-1\n"
1995
" top = log -l10 --line\n"
1996
" show = log -v -p"
1997
1998
#: bzrlib/builtins.py:2505
1999
msgid ""
2000
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
2001
" will show the last 10 mainline revisions. To see the details of a\n"
2002
" particular revision X, ``bzr show -rX``."
2003
msgstr ""
2004
" Тогда «bzr tip» выведет последнюю ревизию, а «bzr top» — последние\n"
2005
" 10 ревизий основной линии. Чтобы просмотреть журнал определённой\n"
2006
" ревизии X, используйте «bzr show -rX»."
2007
2008
#: bzrlib/builtins.py:2509
2009
msgid ""
2010
" If you are interested in looking deeper into a particular merge X,\n"
2011
" use ``bzr log -n0 -rX``."
2012
msgstr ""
2013
" Если вы хотите подробно рассмотреть определённое слияние X,\n"
2014
" используйте «bzr log -n0 -rX»."
2015
2016
#: bzrlib/builtins.py:2512
2017
msgid ""
2018
" ``bzr log -v`` on a branch with lots of history is currently\n"
2019
" very slow. A fix for this issue is currently under development.\n"
2020
" With or without that fix, it is recommended that a revision range\n"
2021
" be given when using the -v option."
2022
msgstr ""
2023
" «bzr log -v» на ветви с большой историей на данный момент работает\n"
2024
" очень медленно. Сейчас ведётся работа над исправлением этого\n"
2025
" недостатка. Независимо от того, будет это исправлено или нет,\n"
2026
" рекомендуется задавать интервал ревизий с помощью опции -v."
2027
2028
#: bzrlib/builtins.py:2517
2029
msgid ""
2030
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
2031
" used to find revisions matching user names, commit messages, etc.\n"
2032
" Among other features, this plugin can find all revisions containing\n"
2033
" a list of words but not others."
2034
msgstr ""
2035
2036
#: bzrlib/builtins.py:2522
2037
msgid ""
2038
" When exploring non-mainline history on large projects with deep\n"
2039
" history, the performance of log can be greatly improved by installing\n"
2040
" the historycache plugin. This plugin buffers historical information\n"
2041
" trading disk space for faster speed."
2042
msgstr ""
2043
2044
#: bzrlib/builtins.py:2531
2045
msgid "Show from oldest to newest."
2046
msgstr "Выводить от старых к новым."
2047
2048
#: bzrlib/builtins.py:2534
2049
msgid "Show files changed in each revision."
2050
msgstr "Показывать файлы, изменённые в каждой ревизии."
2051
2052
#: bzrlib/builtins.py:2540
2053
msgid "Show just the specified revision. See also \"help revisionspec\"."
2054
msgstr "Показать только указанную ревизию. См. также «help revisionspec»."
2055
2056
#: bzrlib/builtins.py:2544
2057
msgid "What names to list as authors - first, all or committer."
2058
msgstr "Какие имена выводить, как авторов — first, all или committer."
2059
2060
#: bzrlib/builtins.py:2545
2061
msgid "Authors"
2062
msgstr "Авторы"
2063
2064
#: bzrlib/builtins.py:2550
2065
msgid "Number of levels to display - 0 for all, 1 for flat."
2066
msgstr "Число уровней для вывода — 0 для всех, 1 для плоского вывода."
2067
2068
#: bzrlib/builtins.py:2560
2069
msgid "Limit the output to the first N revisions."
2070
msgstr "Ограничить вывод лишь первыми N ревизиями."
2071
2072
#: bzrlib/builtins.py:2565
2073
msgid "Show changes made in each revision as a patch."
2074
msgstr "Показать изменения, сделанные в каждой ревизии, в виде патча."
2075
2076
#: bzrlib/builtins.py:2567
2077
msgid "Show merged revisions like --levels 0 does."
2078
msgstr "Показывать слияния, как это делает --levels 0."
2079
2080
#: bzrlib/builtins.py:2571
2081
msgid "Do not report commits with more than one parent."
2082
msgstr "Не сообщать о закреплениях с более, чем одним родителем."
2083
2084
#: bzrlib/builtins.py:2573
2085
msgid ""
2086
"Display only the revisions that are not part of both ancestries (require -"
2087
"rX..Y)."
2088
msgstr ""
2089
2090
#: bzrlib/builtins.py:2577
2091
msgid "Show digital signature validity."
2092
msgstr ""
2093
2094
#: bzrlib/builtins.py:2580
2095
msgid "Show revisions whose properties match this expression."
2096
msgstr "Показывать ревизии, свойства которых удовлетворяют этому выражению."
2097
2098
#: bzrlib/builtins.py:2584
2099
msgid "Show revisions whose message matches this expression."
2100
msgstr ""
2101
"Показывать ревизии, комментарий которых удовлетворяет этому выражению."
2102
2103
#: bzrlib/builtins.py:2588
2104
msgid "Show revisions whose committer matches this expression."
2105
msgstr ""
2106
"Показывать ревизии, закрепитель которых удовлетворяет этому выражению."
2107
2108
#: bzrlib/builtins.py:2592
2109
msgid "Show revisions whose authors match this expression."
2110
msgstr "Показывать ревизии, авторы которых удовлетворяют этому выражению."
2111
2112
#: bzrlib/builtins.py:2596
2113
msgid "Show revisions whose bugs match this expression."
2114
msgstr "Показывать ревизии, ошибки которых удовлетворяют этому выражению."
2115
2116
#: bzrlib/builtins.py:2650
2117
msgid "--exclude-common-ancestry requires -r with two revisions"
2118
msgstr "--exclude-common-ancestry требует -r с двумя ревизиями"
2119
2120
#: bzrlib/builtins.py:2678
2121
#, python-format
2122
msgid "Path unknown at end or start of revision range: %s"
2123
msgstr "Неизвестный путь в начале или конце интервала ревизий: %s"
2124
2125
#: bzrlib/builtins.py:2795
2126
#, python-format
2127
msgid "bzr %s doesn't accept two revisions in different branches."
2128
msgstr "bzr %s не принимает две ревизии в различных ветвях."
2129
2130
#: bzrlib/builtins.py:2811
2131
#, python-format
2132
msgid "bzr %s --revision takes one or two values."
2133
msgstr "bzr %s --revision принимает одно или два значения."
2134
2135
#: bzrlib/builtins.py:2856
2136
msgid ""
2137
"List files in a tree.\n"
2138
" "
2139
msgstr ""
2140
"Вывести список файлов в дереве.\n"
2141
" "
2142
2143
#: bzrlib/builtins.py:2865
2144
msgid "Recurse into subdirectories."
2145
msgstr "Рекурсивно входить в поддиректории."
2146
2147
#: bzrlib/builtins.py:2867
2148
msgid "Print paths relative to the root of the branch."
2149
msgstr "Выводить пути относительно корня ветви."
2150
2151
#: bzrlib/builtins.py:2869
2152
msgid "Print unknown files."
2153
msgstr "Выводить неизвестные файлы."
2154
2155
#: bzrlib/builtins.py:2870
2156
msgid "Print versioned files."
2157
msgstr "Выводить файлы под контролем системы версий."
2158
2159
#: bzrlib/builtins.py:2873
2160
msgid "Print ignored files."
2161
msgstr "Выводить игнорируемые файлы."
2162
2163
#: bzrlib/builtins.py:2875
2164
msgid "List entries of a particular kind: file, directory, symlink."
2165
msgstr "Выводить файлы определённого типа: file, directory, symlink."
2166
2167
#: bzrlib/builtins.py:2888
2168
msgid "invalid kind specified"
2169
msgstr "указан неверный вид файла"
2170
2171
#: bzrlib/builtins.py:2891
2172
msgid "Cannot set both --verbose and --null"
2173
msgstr "Нельзя установить оба --verbose и --null"
2174
2175
#: bzrlib/builtins.py:2900
2176
msgid "cannot specify both --from-root and PATH"
2177
msgstr "нельзя указать оба --from-root и PATH"
2178
2179
#: bzrlib/builtins.py:2987
2180
msgid "Ignore specified files or patterns."
2181
msgstr "Игнорировать указанные файлы или шаблоны."
2182
2183
#: bzrlib/builtins.py:2989
2184
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2185
msgstr "Смотрите подробности о синтаксисе шаблонов в «bzr help patterns»."
2186
2187
#: bzrlib/builtins.py:2991
2188
msgid ""
2189
"If a .bzrignore file does not exist, the ignore command\n"
2190
"will create one and add the specified files or patterns to the newly\n"
2191
"created file. The ignore command will also automatically add the \n"
2192
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2193
"the use of the ignore command will require an explicit add command."
2194
msgstr ""
2195
"Если файл .bzrignore не существует, команда ignore создаст его\n"
2196
"и добавит указанные файлы или шаблоны к только что созданному\n"
2197
"файлу. Команда ignore также автоматически добавит файл .bzrignore\n"
2198
"к системе версий. Создание файла .bzrignore без использования\n"
2199
"команды ignore потребует явного добавления командой add."
2200
2201
#: bzrlib/builtins.py:2997
2202
msgid ""
2203
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2204
"After adding, editing or deleting that file either indirectly by\n"
2205
"using this command or directly by using an editor, be sure to commit\n"
2206
"it."
2207
msgstr ""
2208
"Чтобы удалить шаблоны из списка игнорируемых файлов, отредактируйте\n"
2209
"файл .bzrignore. После добавления, редактирования или удаления этого\n"
2210
"файла, как неявно с помощью этой команды, так и явно при помощи\n"
2211
"редактора, не забывайте закреплять его."
2212
2213
#: bzrlib/builtins.py:3002
2214
msgid ""
2215
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2216
"the global ignore file can be found in the application data directory as\n"
2217
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2218
"Global ignores are not touched by this command. The global ignore file\n"
2219
"can be edited directly using an editor."
2220
msgstr ""
2221
"Bazaar также поддерживает глобальный игнорирования по пути "
2222
"~/.bazaar/ignore.\n"
2223
"На Windows глобальный файл игнорирования может быть найден в директории\n"
2224
"данных приложений. Ищите пути вроде\n"
2225
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2226
"Эта команда не изменяет глобальный файл игнорирования. Он может быть\n"
2227
"отредактирован вручную с помощью текстового редактора."
2228
2229
#: bzrlib/builtins.py:3008
2230
msgid ""
2231
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2232
"precedence over regular ignores. Such exceptions are used to specify\n"
2233
"files that should be versioned which would otherwise be ignored."
2234
msgstr ""
2235
"Шаблоны, начинающиеся с '!', являются исключениями к шаблонам игнорирования\n"
2236
"и имеют приоритет над обычными шаблонами. Такие исключения используются для\n"
2237
"указания файлов, которые должны попасть под контроль системы версий, но\n"
2238
"по умолчанию игнорируются."
2239
2240
#: bzrlib/builtins.py:3012
2241
msgid ""
2242
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2243
"precedence over the '!' exception patterns."
2244
msgstr ""
2245
"Шаблоны, начинающиеся с '!!' ведут себя как обычные шаблоны, но имеют\n"
2246
"приоритет над шаблонами исключений '!'."
2247
2248
#: bzrlib/builtins.py:3015
2249
msgid ""
2250
":Notes: \n"
2251
" \n"
2252
"* Ignore patterns containing shell wildcards must be quoted from\n"
2253
" the shell on Unix."
2254
msgstr ""
2255
":Замечания: \n"
2256
" \n"
2257
"* Шаблоны игнорирования, содержащие специальные символы оболочки,\n"
2258
" должны быть заключены в кавычки при указании в командной строке."
2259
2260
#: bzrlib/builtins.py:3020
2261
msgid ""
2262
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2263
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2264
msgstr ""
2265
"* Шаблоны игнорирования, начинающиеся с \"#\", являются комментариями.\n"
2266
" Чтобы добавить шаблон, начинающийся с этого символа, используйте\n"
2267
" префикс \"RE:\"."
2268
2269
#: bzrlib/builtins.py:3023
2270
msgid ""
2271
":Examples:\n"
2272
" Ignore the top level Makefile::"
2273
msgstr ""
2274
":Примеры:\n"
2275
" Игнорировать файл Makefile на верхнем уровне::"
2276
2277
#: bzrlib/builtins.py:3026
2278
msgid " bzr ignore ./Makefile"
2279
msgstr " bzr ignore ./Makefile"
2280
2281
#: bzrlib/builtins.py:3028
2282
msgid " Ignore .class files in all directories...::"
2283
msgstr " Игнорировать файлы .class во всех директориях...::"
2284
2285
#: bzrlib/builtins.py:3030
2286
msgid " bzr ignore \"*.class\""
2287
msgstr " bzr ignore \"*.class\""
2288
2289
#: bzrlib/builtins.py:3032
2290
msgid " ...but do not ignore \"special.class\"::"
2291
msgstr " ...но не игнорировать \"special.class\"::"
2292
2293
#: bzrlib/builtins.py:3034
2294
msgid " bzr ignore \"!special.class\""
2295
msgstr " bzr ignore \"!special.class\""
2296
2297
#: bzrlib/builtins.py:3036
2298
msgid " Ignore files whose name begins with the \"#\" character::"
2299
msgstr " Игнорировать файлы, начинающиеся с символа \"#\"::"
2300
2301
#: bzrlib/builtins.py:3038
2302
msgid " bzr ignore \"RE:^#\""
2303
msgstr " bzr ignore \"RE:^#\""
2304
2305
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
2306
msgid " Ignore .o files under the lib directory::"
2307
msgstr " Игнорировать файлы .o в директории lib::"
2308
2309
#: bzrlib/builtins.py:3042
2310
msgid " bzr ignore \"lib/**/*.o\""
2311
msgstr " bzr ignore \"lib/**/*.o\""
2312
2313
#: bzrlib/builtins.py:3046
2314
msgid " bzr ignore \"RE:lib/.*\\.o\""
2315
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2316
2317
#: bzrlib/builtins.py:3048
2318
msgid " Ignore everything but the \"debian\" toplevel directory::"
2319
msgstr " Игнорировать всё, кроме верхней директории \"debian\"::"
2320
2321
#: bzrlib/builtins.py:3050
2322
msgid ""
2323
" bzr ignore \"RE:(?!debian/).*\"\n"
2324
" \n"
2325
" Ignore everything except the \"local\" toplevel directory,\n"
2326
" but always ignore autosave files ending in ~, even under local/::\n"
2327
" \n"
2328
" bzr ignore \"*\"\n"
2329
" bzr ignore \"!./local\"\n"
2330
" bzr ignore \"!!*~\""
2331
msgstr ""
2332
" bzr ignore \"RE:(?!debian/).*\"\n"
2333
" \n"
2334
" Игнорировать всё, кроме верхней директории \"local\",\n"
2335
" но всегда игнорировать файлы, заканчивающиеся на ~, даже в local/::\n"
2336
" \n"
2337
" bzr ignore \"*\"\n"
2338
" bzr ignore \"!./local\"\n"
2339
" bzr ignore \"!!*~\""
2340
2341
#: bzrlib/builtins.py:3064
2342
msgid "Display the default ignore rules that bzr uses."
2343
msgstr "Вывести правила игнорирования, которые bzr использует по умолчанию."
2344
2345
#: bzrlib/builtins.py:3076
2346
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2347
msgstr ""
2348
"Для ignore требуется как минимум одно из NAME_PATTERN или --default-rules."
2349
2350
#: bzrlib/builtins.py:3087
2351
#, python-format
2352
msgid "Invalid ignore pattern found. %s"
2353
msgid_plural "Invalid ignore patterns found. %s"
2354
msgstr[0] "Найден некорректный шаблон игнорирования. %s"
2355
msgstr[1] "Найдены некорректные шаблоны игнорирования. %s"
2356
msgstr[2] "Найдены некорректные шаблоны игнорирования. %s"
2357
2358
#: bzrlib/builtins.py:3096
2359
msgid "NAME_PATTERN should not be an absolute path"
2360
msgstr "NAME_PATTERN не должен быть абсолютным путём"
2361
2362
#: bzrlib/builtins.py:3109
2363
#, python-format
2364
msgid ""
2365
"Warning: the following files are version controlled and match your ignore "
2366
"pattern:\n"
2367
"%s\n"
2368
"These files will continue to be version controlled unless you 'bzr remove' "
2369
"them.\n"
2370
msgstr ""
2371
"Предупреждение: следующие файлы под контролем системы версий и удовлетворяют "
2372
"шаблонам игнорирования:\n"
2373
"%s\n"
2374
"Эти файлы будут продолжать под контролем системы версий, пока вы не "
2375
"выполните 'bzr remove'.\n"
2376
2377
#: bzrlib/builtins.py:3116
2378
msgid "List ignored files and the patterns that matched them."
2379
msgstr "Вывести игнорируемые файлы и шаблоны, которым они удовлетворяют."
2380
2381
#: bzrlib/builtins.py:3118
2382
msgid ""
2383
"List all the ignored files and the ignore pattern that caused the file to\n"
2384
"be ignored."
2385
msgstr ""
2386
"Вывести все игнорируемые файлы и шаблоны игнорирования, из-за которых эти\n"
2387
"файлы игнорируются."
2388
2389
#: bzrlib/builtins.py:3121
2390
msgid "Alternatively, to list just the files::"
2391
msgstr "Альтернативно, чтобы вывести только файлы::"
2392
2393
#: bzrlib/builtins.py:3123
2394
msgid " bzr ls --ignored"
2395
msgstr " bzr ls --ignored"
2396
2397
#: bzrlib/builtins.py:3157
2398
#, python-format
2399
msgid "not a valid revision-number: %r"
2400
msgstr "некорректный номер ревизии: %r"
2401
2402
#: bzrlib/builtins.py:3164
2403
msgid ""
2404
"Export current or past revision to a destination directory or archive."
2405
msgstr ""
2406
"Экспортировать текущую или прошлую ревизию в директорию назначения\r\n"
2407
"или архив."
2408
2409
#: bzrlib/builtins.py:3166
2410
msgid "If no revision is specified this exports the last committed revision."
2411
msgstr "Если ревизия не указана, экспортирует последнюю ревизию."
2412
2413
#: bzrlib/builtins.py:3168
2414
msgid ""
2415
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2416
"given, try to find the format with the extension. If no extension\n"
2417
"is found exports to a directory (equivalent to --format=dir)."
2418
msgstr ""
2419
"Формат может быть именем экспортируемого формата, как tar, tgz, tbz2.\n"
2420
"Если не указан, формат определяется по расширению. Если расширение\n"
2421
"отсутствует, экспортирует в директорию (эквивалентно --format=dir)."
2422
2423
#: bzrlib/builtins.py:3172
2424
msgid ""
2425
"If root is supplied, it will be used as the root directory inside\n"
2426
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2427
"to the exported filename. The root option has no effect for 'dir' format."
2428
msgstr ""
2429
"Если указан root, он будет использоваться как корневая директория\n"
2430
"внутри форматов-контейнеров (tar, zip, и т.д.). Если не указан, по\n"
2431
"умолчанию используется имя файла для эскпорта. Опция root не имеет\n"
2432
"эффекта для формата 'dir'."
2433
2434
#: bzrlib/builtins.py:3176
2435
msgid ""
2436
"If branch is omitted then the branch containing the current working\n"
2437
"directory will be used."
2438
msgstr ""
2439
"Если ветвь опущена, используется ветвь, содержащая текущую рабочую\n"
2440
"директорию."
2441
2442
#: bzrlib/builtins.py:3179
2443
msgid ""
2444
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2445
msgstr ""
2446
"Замечание: Экспорт в zip деревьев с именами файлов, содержащими не-ASCII\r\n"
2447
"символы, не поддерживается."
2448
2449
#: bzrlib/builtins.py:3181
2450
msgid ""
2451
" ================= =========================\n"
2452
" Supported formats Autodetected by extension\n"
2453
" ================= =========================\n"
2454
" dir (none)\n"
2455
" tar .tar\n"
2456
" tbz2 .tar.bz2, .tbz2\n"
2457
" tgz .tar.gz, .tgz\n"
2458
" zip .zip\n"
2459
" ================= ========================="
2460
msgstr ""
2461
" ====================== =============================\n"
2462
" Поддерживаемые форматы Автоопределение по расширению\n"
2463
" ====================== =============================\n"
2464
" dir (нет)\n"
2465
" tar .tar\n"
2466
" tbz2 .tar.bz2, .tbz2\n"
2467
" tgz .tar.gz, .tgz\n"
2468
" zip .zip\n"
2469
" ====================== ============================="
2470
2471
#: bzrlib/builtins.py:3195
2472
msgid "Type of file to export to."
2473
msgstr "Тип файла для экспорта."
2474
2475
#: bzrlib/builtins.py:3198
2476
msgid "Apply content filters to export the convenient form."
2477
msgstr ""
2478
2479
#: bzrlib/builtins.py:3202
2480
msgid "Name of the root directory inside the exported file."
2481
msgstr "Имя корневой директории внутри экспортируемого файла."
2482
2483
#: bzrlib/builtins.py:3204
2484
msgid ""
2485
"Set modification time of files to that of the last revision in which it was "
2486
"changed."
2487
msgstr ""
2488
"Установить время изменения файлов на время последней ревизии, в которой они "
2489
"были изменены."
2490
2491
#: bzrlib/builtins.py:3207
2492
msgid ""
2493
"Export the working tree contents rather than that of the last revision."
2494
msgstr ""
2495
2496
#: bzrlib/builtins.py:3226
2497
msgid "--uncommitted requires a working tree"
2498
msgstr ""
2499
2500
#: bzrlib/builtins.py:3235
2501
#, python-format
2502
msgid "Unsupported export format: %s"
2503
msgstr "Неподдерживаемый формат экспорта: %s"
2504
2505
#: bzrlib/builtins.py:3239
2506
msgid ""
2507
"Write the contents of a file as of a given revision to standard output."
2508
msgstr ""
2509
"Вывести содержимое файла из определённой ревизии на стандартный вывод."
2510
2511
#: bzrlib/builtins.py:3241
2512
msgid "If no revision is nominated, the last revision is used."
2513
msgstr "Если ревизия не указана, используется последняя."
2514
2515
#: bzrlib/builtins.py:3243
2516
msgid ""
2517
"Note: Take care to redirect standard output when using this command on a\n"
2518
"binary file."
2519
msgstr ""
2520
"Замечание: Не забывайте перенаправлять стандартный вывод при использовании\n"
2521
"этой команды на двоичном файле."
2522
2523
#: bzrlib/builtins.py:3249
2524
msgid "The path name in the old tree."
2525
msgstr ""
2526
2527
#: bzrlib/builtins.py:3250
2528
msgid "Apply content filters to display the convenience form."
2529
msgstr ""
2530
2531
#: bzrlib/builtins.py:3261
2532
msgid "bzr cat --revision takes exactly one revision specifier"
2533
msgstr "bzr cat --revision принимает ровно один спецификатор ревизии"
2534
2535
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2536
msgid "{0!r} is not present in revision {1}"
2537
msgstr "{0!r} не представлен в ревизии {1}"
2538
2539
#: bzrlib/builtins.py:3321
2540
msgid "Commit changes into a new revision."
2541
msgstr "Закрепить изменения в новой ревизии."
2542
2543
#: bzrlib/builtins.py:3323
2544
msgid ""
2545
"An explanatory message needs to be given for each commit. This is\n"
2546
"often done by using the --message option (getting the message from the\n"
2547
"command line) or by using the --file option (getting the message from\n"
2548
"a file). If neither of these options is given, an editor is opened for\n"
2549
"the user to enter the message. To see the changed files in the\n"
2550
"boilerplate text loaded into the editor, use the --show-diff option."
2551
msgstr ""
2552
2553
#: bzrlib/builtins.py:3330
2554
msgid ""
2555
"By default, the entire tree is committed and the person doing the\n"
2556
"commit is assumed to be the author. These defaults can be overridden\n"
2557
"as explained below."
2558
msgstr ""
2559
"По умолчанию, закрепляется всё дерево и закрепляющий считается автором.\n"
2560
"Эти умолчания могут быть перезаписаны, как объяснено ниже."
2561
2562
#: bzrlib/builtins.py:3334
2563
msgid ":Selective commits:"
2564
msgstr ":Выборочные закрепления:"
2565
2566
#: bzrlib/builtins.py:3336
2567
msgid ""
2568
" If selected files are specified, only changes to those files are\n"
2569
" committed. If a directory is specified then the directory and\n"
2570
" everything within it is committed."
2571
msgstr ""
2572
" Если указаны файлы, закрепить только изменения в этих файлах.\n"
2573
" Если указана директория, то закрепляется директория и всё её\n"
2574
" содержимое."
2575
2576
#: bzrlib/builtins.py:3340
2577
msgid ""
2578
" When excludes are given, they take precedence over selected files.\n"
2579
" For example, to commit only changes within foo, but not changes\n"
2580
" within foo/bar::"
2581
msgstr ""
2582
" Когда даны исключения, они имеют приоритет над выбранными файлами.\n"
2583
" Например, чтобы закрепить изменения внутри foo, но не изменения\n"
2584
" в foo/bar::"
2585
2586
#: bzrlib/builtins.py:3344
2587
msgid " bzr commit foo -x foo/bar"
2588
msgstr " bzr commit foo -x foo/bar"
2589
2590
#: bzrlib/builtins.py:3346
2591
msgid " A selective commit after a merge is not yet supported."
2592
msgstr " Выборочные закрепления после слияния пока не поддерживаются."
2593
2594
#: bzrlib/builtins.py:3348
2595
msgid ":Custom authors:"
2596
msgstr ":Выбор автора:"
2597
2598
#: bzrlib/builtins.py:3350
2599
msgid ""
2600
" If the author of the change is not the same person as the committer,\n"
2601
" you can specify the author's name using the --author option. The\n"
2602
" name should be in the same format as a committer-id, e.g.\n"
2603
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2604
" the change you can specify the option multiple times, once for each\n"
2605
" author."
2606
msgstr ""
2607
" Если автор изменения не тот же самый человек, что и закрепляющий,\n"
2608
" вы можете указать имя автора, используя опцию --author. Имя должно\n"
2609
" быть в том же формате, что и committer-id, например\n"
2610
" \"John Doe <jdoe@example.com>\". Если в изменении участвовал более,\n"
2611
" чем один автор, вы можете указать эту опцию несколько раз."
2612
2613
#: bzrlib/builtins.py:3357
2614
msgid ":Checks:"
2615
msgstr ":Проверки:"
2616
2617
#: bzrlib/builtins.py:3359
2618
msgid ""
2619
" A common mistake is to forget to add a new file or directory before\n"
2620
" running the commit command. The --strict option checks for unknown\n"
2621
" files and aborts the commit if any are found. More advanced pre-commit\n"
2622
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2623
" for details."
2624
msgstr ""
2625
" Распространённой ошибкой является забыть добавить новый файл перед\n"
2626
" запуском команды commit. Опция --strict прерывает закрепление, если\n"
2627
" присутствуют неизвестные файлы. Более продвинутые проверки могут\n"
2628
" быть реализованы определением обработчиков. Подробности можно найти,\n"
2629
" выполнив команду ``bzr help hooks''."
2630
2631
#: bzrlib/builtins.py:3365
2632
msgid ":Things to note:"
2633
msgstr ":На заметку:"
2634
2635
#: bzrlib/builtins.py:3367
2636
msgid ""
2637
" If you accidentially commit the wrong changes or make a spelling\n"
2638
" mistake in the commit message say, you can use the uncommit command\n"
2639
" to undo it. See ``bzr help uncommit`` for details."
2640
msgstr ""
2641
" Если вы случайно закрепили неверные изменения или допустили орфо-\n"
2642
" графическую ошибку в сообщении, вы можете использовать команду\n"
2643
" uncommit, чтобы отменить последнее закрепление. Подробности смотрите\n"
2644
" в «bzr help uncommit»."
2645
2646
#: bzrlib/builtins.py:3371
2647
msgid ""
2648
" Hooks can also be configured to run after a commit. This allows you\n"
2649
" to trigger updates to external systems like bug trackers. The --fixes\n"
2650
" option can be used to record the association between a revision and\n"
2651
" one or more bugs. See ``bzr help bugs`` for details."
2652
msgstr ""
2653
2654
#: bzrlib/builtins.py:3381
2655
msgid "Do not consider changes made to a given path."
2656
msgstr "Не рассматривать изменения, сделанные в заданном пути."
2657
2658
#: bzrlib/builtins.py:3384
2659
msgid "Description of the new revision."
2660
msgstr "Описание новой ревизии."
2661
2662
#: bzrlib/builtins.py:3387
2663
msgid "Commit even if nothing has changed."
2664
msgstr "Закрепить, даже если ничего не изменилось."
2665
2666
#: bzrlib/builtins.py:3391
2667
msgid "Take commit message from this file."
2668
msgstr "Взять сообщение о закреплении из этого файла."
2669
2670
#: bzrlib/builtins.py:3393
2671
msgid "Refuse to commit if there are unknown files in the working tree."
2672
msgstr ""
2673
"Отказываться закреплять, если в рабочем дереве есть неизвестные файлы."
2674
2675
#: bzrlib/builtins.py:3396
2676
msgid ""
2677
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2678
"08:00:00 +0100'."
2679
msgstr ""
2680
"Вручную установить время закрепления, используя формат даты закрепления, "
2681
"напр. '2009-10-10 08:00:00 +0100'."
2682
2683
#: bzrlib/builtins.py:3399
2684
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2685
msgstr ""
2686
"Отметить ошибку, как исправленную в этой ревизии (см. «bzr help bugs»)."
2687
2688
#: bzrlib/builtins.py:3402
2689
msgid "Set the author's name, if it's different from the committer."
2690
msgstr "Установить имя автора, если оно отличается от имени закрепляющего."
2691
2692
#: bzrlib/builtins.py:3405
2693
msgid ""
2694
"Perform a local commit in a bound branch. Local commits are not pushed to "
2695
"the master branch until a normal commit is performed."
2696
msgstr ""
2697
"Совершить локальное закрепление в связанную ветвь. Локальные закрепления не "
2698
"выгружаются в основную ветвь до тех пор, пока не совершено нормальное "
2699
"закрепление."
2700
2701
#: bzrlib/builtins.py:3411
2702
msgid ""
2703
"When no message is supplied, show the diff along with the status summary in "
2704
"the message editor."
2705
msgstr ""
2706
"Если не указано сообщение, показывать изменения формате diff вместе с "
2707
"обзором состояния в редакторе сообщения."
2708
2709
#: bzrlib/builtins.py:3414
2710
msgid ""
2711
"When committing to a foreign version control system do not push data that "
2712
"can not be natively represented."
2713
msgstr ""
2714
"При закреплении в иной системе контроля версий, не выгружать данные, которые "
2715
"нельзя в ней представить."
2716
2717
#: bzrlib/builtins.py:3432
2718
#, python-format
2719
msgid ""
2720
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2721
"default bug tracker using the `bugtracker` option.\n"
2722
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2723
msgstr ""
2724
"Для ошибки %s не указан трекер. Используйте форму 'tracker:id' или укажите "
2725
"систему трекинга ошибок по умолчанию, используя опцию `bugtracker`.\n"
2726
"Больше информации об этом можно узнать, выполнив «bzr help bugs». "
2727
"Закрепление отклонено."
2728
2729
#: bzrlib/builtins.py:3441
2730
#, python-format
2731
msgid ""
2732
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2733
"for more information on this feature.\n"
2734
"Commit refused."
2735
msgstr ""
2736
"Некорректная ошибка %s. Должна быть в формате 'tracker:id'. Больше "
2737
"информации об этом можно узнать, выполнив «bzr help bugs».\n"
2738
"Закрепление отклонено."
2739
2740
#: bzrlib/builtins.py:3450
2741
#, python-format
2742
msgid "Unrecognized bug %s. Commit refused."
2743
msgstr "Ошибка %s не распознана. Закрепление отклонено."
2744
2745
#: bzrlib/builtins.py:3453
2746
#, python-format
2747
msgid ""
2748
"%s\n"
2749
"Commit refused."
2750
msgstr ""
2751
"%s\n"
2752
"Закрепление отклонено."
2753
2754
#: bzrlib/builtins.py:3477
2755
msgid "Could not parse --commit-time: "
2756
msgstr "Не удалось разобрать --commit-time: "
2757
2758
#: bzrlib/builtins.py:3517
2759
msgid "please specify either --message or --file"
2760
msgstr "укажите либо --message, либо --file"
2761
2762
#: bzrlib/builtins.py:3546
2763
msgid "please specify a commit message with either --message or --file"
2764
msgstr "укажите сообщение о закреплении, используя --message либо --file"
2765
2766
#: bzrlib/builtins.py:3549
2767
msgid ""
2768
"Empty commit message specified. Please specify a commit message with either -"
2769
"-message or --file or leave a blank message with --message \"\"."
2770
msgstr ""
2771
"Указано пустое сообщение о закреплении. Пожалуйста, укажите сообщение опцией "
2772
"--message либо --file или оставьте пустым, указав --message \"\"."
2773
2774
#: bzrlib/builtins.py:3569
2775
msgid ""
2776
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2777
"-unchanged to force an empty commit."
2778
msgstr ""
2779
"Нет изменений для закрепления. Добавьте файлы, которые вы хотите закрепить, "
2780
"командой 'bzr add', или используйте --unchanged, чтобы принудительно сделать "
2781
"пустое закрепление."
2782
2783
#: bzrlib/builtins.py:3573
2784
msgid ""
2785
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2786
"resolve FILE\" to resolve."
2787
msgstr ""
2788
"В рабочем дереве обнаружены конфликты. Выполните «bzr conflicts», чтобы "
2789
"вывести список конфликтов и «bzr resolve ФАЙЛ» для исправления."
2790
2791
#: bzrlib/builtins.py:3577
2792
msgid "Commit refused because there are unknown files in the working tree."
2793
msgstr "Закрепление отклонено, поскольку в рабочем дереве неизвестные файлы."
2794
2795
#: bzrlib/builtins.py:3580
2796
msgid ""
2797
"\n"
2798
"To commit to master branch, run update and then commit.\n"
2799
"You can also pass --local to commit to continue working disconnected."
2800
msgstr ""
2801
2802
#: bzrlib/builtins.py:3588
2803
msgid ""
2804
"Validate working tree structure, branch consistency and repository history."
2805
msgstr ""
2806
2807
#: bzrlib/builtins.py:3590
2808
msgid ""
2809
"This command checks various invariants about branch and repository storage\n"
2810
"to detect data corruption or bzr bugs."
2811
msgstr ""
2812
2813
#: bzrlib/builtins.py:3593
2814
msgid ""
2815
"The working tree and branch checks will only give output if a problem is\n"
2816
"detected. The output fields of the repository check are:"
2817
msgstr ""
2818
2819
#: bzrlib/builtins.py:3596
2820
msgid ""
2821
"revisions\n"
2822
" This is just the number of revisions checked. It doesn't\n"
2823
" indicate a problem."
2824
msgstr ""
2825
2826
#: bzrlib/builtins.py:3600
2827
msgid ""
2828
"versionedfiles\n"
2829
" This is just the number of versionedfiles checked. It\n"
2830
" doesn't indicate a problem."
2831
msgstr ""
2832
2833
#: bzrlib/builtins.py:3604
2834
msgid ""
2835
"unreferenced ancestors\n"
2836
" Texts that are ancestors of other texts, but\n"
2837
" are not properly referenced by the revision ancestry. This is a\n"
2838
" subtle problem that Bazaar can work around."
2839
msgstr ""
2840
2841
#: bzrlib/builtins.py:3609
2842
msgid ""
2843
"unique file texts\n"
2844
" This is the total number of unique file contents\n"
2845
" seen in the checked revisions. It does not indicate a problem."
2846
msgstr ""
2847
2848
#: bzrlib/builtins.py:3613
2849
msgid ""
2850
"repeated file texts\n"
2851
" This is the total number of repeated texts seen\n"
2852
" in the checked revisions. Texts can be repeated when their file\n"
2853
" entries are modified, but the file contents are not. It does not\n"
2854
" indicate a problem."
2855
msgstr ""
2856
2857
#: bzrlib/builtins.py:3619
2858
msgid ""
2859
"If no restrictions are specified, all Bazaar data that is found at the "
2860
"given\n"
2861
"location will be checked."
2862
msgstr ""
2863
2864
#: bzrlib/builtins.py:3624
2865
msgid " Check the tree and branch at 'foo'::"
2866
msgstr ""
2867
2868
#: bzrlib/builtins.py:3626
2869
msgid " bzr check --tree --branch foo"
2870
msgstr ""
2871
2872
#: bzrlib/builtins.py:3628
2873
msgid " Check only the repository at 'bar'::"
2874
msgstr ""
2875
2876
#: bzrlib/builtins.py:3630
2877
msgid " bzr check --repo bar"
2878
msgstr ""
2879
2880
#: bzrlib/builtins.py:3632
2881
msgid " Check everything at 'baz'::"
2882
msgstr ""
2883
2884
#: bzrlib/builtins.py:3634
2885
msgid " bzr check baz"
2886
msgstr ""
2887
2888
#: bzrlib/builtins.py:3640
2889
msgid "Check the branch related to the current directory."
2890
msgstr ""
2891
2892
#: bzrlib/builtins.py:3642
2893
msgid "Check the repository related to the current directory."
2894
msgstr ""
2895
2896
#: bzrlib/builtins.py:3644
2897
msgid "Check the working tree related to the current directory."
2898
msgstr ""
2899
2900
#: bzrlib/builtins.py:3658
2901
msgid "Upgrade a repository, branch or working tree to a newer format."
2902
msgstr ""
2903
2904
#: bzrlib/builtins.py:3660
2905
msgid ""
2906
"When the default format has changed after a major new release of\n"
2907
"Bazaar, you may be informed during certain operations that you\n"
2908
"should upgrade. Upgrading to a newer format may improve performance\n"
2909
"or make new features available. It may however limit interoperability\n"
2910
"with older repositories or with older versions of Bazaar."
2911
msgstr ""
2912
2913
#: bzrlib/builtins.py:3666
2914
msgid ""
2915
"If you wish to upgrade to a particular format rather than the\n"
2916
"current default, that can be specified using the --format option.\n"
2917
"As a consequence, you can use the upgrade command this way to\n"
2918
"\"downgrade\" to an earlier format, though some conversions are\n"
2919
"a one way process (e.g. changing from the 1.x default to the\n"
2920
"2.x default) so downgrading is not always possible."
2921
msgstr ""
2922
2923
#: bzrlib/builtins.py:3673
2924
msgid ""
2925
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2926
"process (where # is a number). By default, this is left there on\n"
2927
"completion. If the conversion fails, delete the new .bzr directory\n"
2928
"and rename this one back in its place. Use the --clean option to ask\n"
2929
"for the backup.bzr directory to be removed on successful conversion.\n"
2930
"Alternatively, you can delete it by hand if everything looks good\n"
2931
"afterwards."
2932
msgstr ""
2933
2934
#: bzrlib/builtins.py:3681
2935
msgid ""
2936
"If the location given is a shared repository, dependent branches\n"
2937
"are also converted provided the repository converts successfully.\n"
2938
"If the conversion of a branch fails, remaining branches are still\n"
2939
"tried."
2940
msgstr ""
2941
2942
#: bzrlib/builtins.py:3686
2943
msgid ""
2944
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2945
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2946
msgstr ""
2947
2948
#: bzrlib/builtins.py:3694
2949
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2950
msgstr ""
2951
2952
#: bzrlib/builtins.py:3698
2953
msgid "Branch format"
2954
msgstr "Формат ветви"
2955
2956
#: bzrlib/builtins.py:3700
2957
msgid "Remove the backup.bzr directory if successful."
2958
msgstr ""
2959
2960
#: bzrlib/builtins.py:3702
2961
msgid "Show what would be done, but don't actually do anything."
2962
msgstr ""
2963
2964
#: bzrlib/builtins.py:3717
2965
msgid "Show or set bzr user id."
2966
msgstr ""
2967
2968
#: bzrlib/builtins.py:3719
2969
msgid ""
2970
":Examples:\n"
2971
" Show the email of the current user::"
2972
msgstr ""
2973
2974
#: bzrlib/builtins.py:3722
2975
msgid " bzr whoami --email"
2976
msgstr ""
2977
2978
#: bzrlib/builtins.py:3724
2979
msgid " Set the current user::"
2980
msgstr ""
2981
2982
#: bzrlib/builtins.py:3726
2983
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2984
msgstr ""
2985
2986
#: bzrlib/builtins.py:3730
2987
msgid "Display email address only."
2988
msgstr ""
2989
2990
#: bzrlib/builtins.py:3732
2991
msgid "Set identity for the current branch instead of globally."
2992
msgstr ""
2993
2994
#: bzrlib/builtins.py:3758
2995
msgid "--email can only be used to display existing identity"
2996
msgstr ""
2997
2998
#: bzrlib/builtins.py:3780
2999
msgid "Print or set the branch nickname."
3000
msgstr ""
3001
3002
#: bzrlib/builtins.py:3782
3003
msgid ""
3004
"If unset, the tree root directory name is used as the nickname.\n"
3005
"To print the current nickname, execute with no argument."
3006
msgstr ""
3007
3008
#: bzrlib/builtins.py:3785
3009
msgid ""
3010
"Bound branches use the nickname of its master branch unless it is set\n"
3011
"locally."
3012
msgstr ""
3013
3014
#: bzrlib/builtins.py:3805
3015
msgid "Set/unset and display aliases."
3016
msgstr ""
3017
3018
#: bzrlib/builtins.py:3807
3019
msgid ""
3020
":Examples:\n"
3021
" Show the current aliases::"
3022
msgstr ""
3023
3024
#: bzrlib/builtins.py:3810
3025
msgid " bzr alias"
3026
msgstr ""
3027
3028
#: bzrlib/builtins.py:3812
3029
msgid " Show the alias specified for 'll'::"
3030
msgstr ""
3031
3032
#: bzrlib/builtins.py:3814
3033
msgid " bzr alias ll"
3034
msgstr ""
3035
3036
#: bzrlib/builtins.py:3816
3037
msgid " Set an alias for 'll'::"
3038
msgstr ""
3039
3040
#: bzrlib/builtins.py:3818
3041
msgid " bzr alias ll=\"log --line -r-10..-1\""
3042
msgstr ""
3043
3044
#: bzrlib/builtins.py:3820
3045
msgid " To remove an alias for 'll'::"
3046
msgstr ""
3047
3048
#: bzrlib/builtins.py:3822
3049
msgid " bzr alias --remove ll"
3050
msgstr ""
3051
3052
#: bzrlib/builtins.py:3827
3053
msgid "Remove the alias."
3054
msgstr ""
3055
3056
#: bzrlib/builtins.py:3845
3057
msgid "bzr alias --remove expects an alias to remove."
3058
msgstr ""
3059
3060
#: bzrlib/builtins.py:4026
3061
msgid ""
3062
"subunit not available. subunit needs to be installed to use --subunit."
3063
msgstr ""
3064
3065
#: bzrlib/builtins.py:4043
3066
msgid ""
3067
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3068
msgstr ""
3069
3070
#: bzrlib/builtins.py:4090
3071
msgid "Show version of bzr."
3072
msgstr ""
3073
3074
#: bzrlib/builtins.py:4094
3075
msgid "Print just the version number."
3076
msgstr ""
3077
3078
#: bzrlib/builtins.py:4113
3079
msgid "It sure does!\n"
3080
msgstr ""
3081
3082
#: bzrlib/builtins.py:4137
3083
#, python-format
3084
msgid "merge base is revision %s\n"
3085
msgstr ""
3086
3087
#: bzrlib/builtins.py:4141
3088
msgid "Perform a three-way merge."
3089
msgstr ""
3090
3091
#: bzrlib/builtins.py:4143
3092
msgid ""
3093
"The source of the merge can be specified either in the form of a branch,\n"
3094
"or in the form of a path to a file containing a merge directive generated\n"
3095
"with bzr send. If neither is specified, the default is the upstream branch\n"
3096
"or the branch most recently merged using --remember. The source of the\n"
3097
"merge may also be specified in the form of a path to a file in another\n"
3098
"branch: in this case, only the modifications to that file are merged into\n"
3099
"the current working tree."
3100
msgstr ""
3101
3102
#: bzrlib/builtins.py:4151
3103
msgid ""
3104
"When merging from a branch, by default bzr will try to merge in all new\n"
3105
"work from the other branch, automatically determining an appropriate base\n"
3106
"revision. If this fails, you may need to give an explicit base."
3107
msgstr ""
3108
3109
#: bzrlib/builtins.py:4155
3110
msgid ""
3111
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3112
"try to merge in all new work up to and including revision OTHER."
3113
msgstr ""
3114
3115
#: bzrlib/builtins.py:4158
3116
msgid ""
3117
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3118
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3119
"causes some revisions to be skipped, i.e. if the destination branch does\n"
3120
"not already contain revision BASE, such a merge is commonly referred to as\n"
3121
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
3122
"cherrypicks. The changes look like a normal commit, and the history of the\n"
3123
"changes from the other branch is not stored in the commit."
3124
msgstr ""
3125
3126
#: bzrlib/builtins.py:4166
3127
msgid "Revision numbers are always relative to the source branch."
3128
msgstr ""
3129
3130
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3131
msgid ""
3132
"Merge will do its best to combine the changes in two branches, but there\n"
3133
"are some kinds of problems only a human can fix. When it encounters those,\n"
3134
"it will mark a conflict. A conflict means that you need to fix something,\n"
3135
"before you should commit."
3136
msgstr ""
3137
3138
#: bzrlib/builtins.py:4173
3139
msgid ""
3140
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3141
msgstr ""
3142
3143
#: bzrlib/builtins.py:4175
3144
msgid ""
3145
"If there is no default branch set, the first merge will set it (use\n"
3146
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3147
"to use the default. To change the default, use --remember. The value will\n"
3148
"only be saved if the remote location can be accessed."
3149
msgstr ""
3150
3151
#: bzrlib/builtins.py:4180
3152
msgid ""
3153
"The results of the merge are placed into the destination working\n"
3154
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3155
"committed to record the result of the merge."
3156
msgstr ""
3157
3158
#: bzrlib/builtins.py:4184
3159
msgid ""
3160
"merge refuses to run if there are any uncommitted changes, unless\n"
3161
"--force is given. If --force is given, then the changes from the source \n"
3162
"will be merged with the current working tree, including any uncommitted\n"
3163
"changes in the tree. The --force option can also be used to create a\n"
3164
"merge revision which has more than two parents."
3165
msgstr ""
3166
3167
#: bzrlib/builtins.py:4190
3168
msgid ""
3169
"If one would like to merge changes from the working tree of the other\n"
3170
"branch without merging any committed revisions, the --uncommitted option\n"
3171
"can be given."
3172
msgstr ""
3173
3174
#: bzrlib/builtins.py:4194
3175
msgid ""
3176
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3177
"you to apply each diff hunk and file change, similar to \"shelve\"."
3178
msgstr ""
3179
3180
#: bzrlib/builtins.py:4197
3181
msgid ""
3182
":Examples:\n"
3183
" To merge all new revisions from bzr.dev::"
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:4200
3187
msgid " bzr merge ../bzr.dev"
3188
msgstr ""
3189
3190
#: bzrlib/builtins.py:4202
3191
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3192
msgstr ""
3193
3194
#: bzrlib/builtins.py:4204
3195
msgid " bzr merge -r 82 ../bzr.dev"
3196
msgstr ""
3197
3198
#: bzrlib/builtins.py:4206
3199
msgid " To merge the changes introduced by 82, without previous changes::"
3200
msgstr ""
3201
3202
#: bzrlib/builtins.py:4208
3203
msgid " bzr merge -r 81..82 ../bzr.dev"
3204
msgstr ""
3205
3206
#: bzrlib/builtins.py:4210
3207
msgid " To apply a merge directive contained in /tmp/merge::"
3208
msgstr ""
3209
3210
#: bzrlib/builtins.py:4212
3211
msgid " bzr merge /tmp/merge"
3212
msgstr ""
3213
3214
#: bzrlib/builtins.py:4214
3215
msgid ""
3216
" To create a merge revision with three parents from two branches\n"
3217
" feature1a and feature1b:"
3218
msgstr ""
3219
3220
#: bzrlib/builtins.py:4217
3221
msgid ""
3222
" bzr merge ../feature1a\n"
3223
" bzr merge ../feature1b --force\n"
3224
" bzr commit -m 'revision with three parents'"
3225
msgstr ""
3226
3227
#: bzrlib/builtins.py:4229
3228
msgid "Merge even if the destination tree has uncommitted changes."
3229
msgstr ""
3230
3231
#: bzrlib/builtins.py:4235
3232
msgid ""
3233
"Apply uncommitted changes from a working copy, instead of branch changes."
3234
msgstr ""
3235
3236
#: bzrlib/builtins.py:4237
3237
msgid ""
3238
"If the destination is already completely merged into the source, pull from "
3239
"the source rather than merging. When this happens, you do not need to "
3240
"commit the result."
3241
msgstr ""
3242
3243
#: bzrlib/builtins.py:4242
3244
msgid ""
3245
"Branch to merge into, rather than the one containing the working directory."
3246
msgstr ""
3247
3248
#: bzrlib/builtins.py:4244
3249
msgid "Instead of merging, show a diff of the merge."
3250
msgstr ""
3251
3252
#: bzrlib/builtins.py:4246
3253
msgid "Select changes interactively."
3254
msgstr ""
3255
3256
#: bzrlib/builtins.py:4268
3257
msgid ""
3258
"Merging into empty branches not currently supported, "
3259
"https://bugs.launchpad.net/bzr/+bug/308562"
3260
msgstr ""
3261
3262
#: bzrlib/builtins.py:4295
3263
msgid "Cannot use --uncommitted with bundles or merge directives."
3264
msgstr ""
3265
3266
#: bzrlib/builtins.py:4306
3267
msgid "Cannot use --uncommitted and --revision at the same time."
3268
msgstr ""
3269
3270
#: bzrlib/builtins.py:4326
3271
msgid "merger: "
3272
msgstr ""
3273
3274
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
3275
msgid "Nothing to do."
3276
msgstr ""
3277
3278
#: bzrlib/builtins.py:4332
3279
msgid "Cannot pull individual files"
3280
msgstr ""
3281
3282
#: bzrlib/builtins.py:4340
3283
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3284
msgstr ""
3285
3286
#: bzrlib/builtins.py:4398
3287
#, python-format
3288
msgid "Show-base is not supported for this merge type. %s"
3289
msgstr ""
3290
3291
#: bzrlib/builtins.py:4407
3292
#, python-format
3293
msgid "Conflict reduction is not supported for merge type %s."
3294
msgstr ""
3295
3296
#: bzrlib/builtins.py:4411
3297
msgid "Cannot do conflict reduction and show base."
3298
msgstr ""
3299
3300
#: bzrlib/builtins.py:4522
3301
msgid "No location specified or remembered"
3302
msgstr ""
3303
3304
#: bzrlib/builtins.py:4524
3305
msgid "{0} remembered {1} location {2}"
3306
msgstr ""
3307
3308
#: bzrlib/builtins.py:4530
3309
msgid "Redo a merge."
3310
msgstr ""
3311
3312
#: bzrlib/builtins.py:4532
3313
msgid ""
3314
"Use this if you want to try a different merge technique while resolving\n"
3315
"conflicts. Some merge techniques are better than others, and remerge\n"
3316
"lets you try different ones on different files."
3317
msgstr ""
3318
3319
#: bzrlib/builtins.py:4536
3320
msgid ""
3321
"The options for remerge have the same meaning and defaults as the ones for\n"
3322
"merge. The difference is that remerge can (only) be run when there is a\n"
3323
"pending merge, and it lets you specify particular files."
3324
msgstr ""
3325
3326
#: bzrlib/builtins.py:4540
3327
msgid ""
3328
":Examples:\n"
3329
" Re-do the merge of all conflicted files, and show the base text in\n"
3330
" conflict regions, in addition to the usual THIS and OTHER texts::"
3331
msgstr ""
3332
3333
#: bzrlib/builtins.py:4544
3334
msgid " bzr remerge --show-base"
3335
msgstr ""
3336
3337
#: bzrlib/builtins.py:4546
3338
msgid ""
3339
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3340
" additional processing to reduce the size of conflict regions::"
3341
msgstr ""
3342
3343
#: bzrlib/builtins.py:4549
3344
msgid " bzr remerge --merge-type weave --reprocess foobar"
3345
msgstr ""
3346
3347
#: bzrlib/builtins.py:4556
3348
msgid "Show base revision text in conflicts."
3349
msgstr ""
3350
3351
#: bzrlib/builtins.py:4568
3352
msgid ""
3353
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3354
"merges."
3355
msgstr ""
3356
3357
#: bzrlib/builtins.py:4624
3358
msgid "Revert files to a previous revision."
3359
msgstr ""
3360
3361
#: bzrlib/builtins.py:4626
3362
msgid ""
3363
"Giving a list of files will revert only those files. Otherwise, all files\n"
3364
"will be reverted. If the revision is not specified with '--revision', the\n"
3365
"last committed revision is used."
3366
msgstr ""
3367
3368
#: bzrlib/builtins.py:4630
3369
msgid ""
3370
"To remove only some changes, without reverting to a prior version, use\n"
3371
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3372
"will remove the changes introduced by the second last commit (-2), without\n"
3373
"affecting the changes introduced by the last commit (-1). To remove\n"
3374
"certain changes on a hunk-by-hunk basis, see the shelve command."
3375
msgstr ""
3376
3377
#: bzrlib/builtins.py:4636
3378
msgid ""
3379
"By default, any files that have been manually changed will be backed up\n"
3380
"first. (Files changed only by merge are not backed up.) Backup files have\n"
3381
"'.~#~' appended to their name, where # is a number."
3382
msgstr ""
3383
3384
#: bzrlib/builtins.py:4640
3385
msgid ""
3386
"When you provide files, you can use their current pathname or the pathname\n"
3387
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3388
"name. If you name a directory, all the contents of that directory will be\n"
3389
"reverted."
3390
msgstr ""
3391
3392
#: bzrlib/builtins.py:4645
3393
msgid ""
3394
"If you have newly added files since the target revision, they will be\n"
3395
"removed. If the files to be removed have been changed, backups will be\n"
3396
"created as above. Directories containing unknown files will not be\n"
3397
"deleted."
3398
msgstr ""
3399
3400
#: bzrlib/builtins.py:4650
3401
msgid ""
3402
"The working tree contains a list of revisions that have been merged but\n"
3403
"not yet committed. These revisions will be included as additional parents\n"
3404
"of the next commit. Normally, using revert clears that list as well as\n"
3405
"reverting the files. If any files are specified, revert leaves the list\n"
3406
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3407
".`` in the tree root to revert all files but keep the recorded merges,\n"
3408
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3409
"reverting any files."
3410
msgstr ""
3411
3412
#: bzrlib/builtins.py:4659
3413
msgid ""
3414
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3415
"changes from a branch in a single revision. To do this, perform the merge\n"
3416
"as desired. Then doing revert with the \"--forget-merges\" option will "
3417
"keep\n"
3418
"the content of the tree as it was, but it will clear the list of pending\n"
3419
"merges. The next commit will then contain all of the changes that are\n"
3420
"present in the other branch, but without any other parent revisions.\n"
3421
"Because this technique forgets where these changes originated, it may\n"
3422
"cause additional conflicts on later merges involving the same source and\n"
3423
"target branches."
3424
msgstr ""
3425
3426
#: bzrlib/builtins.py:4673
3427
msgid "Do not save backups of reverted files."
3428
msgstr ""
3429
3430
#: bzrlib/builtins.py:4675
3431
msgid "Remove pending merge marker, without changing any files."
3432
msgstr ""
3433
3434
#: bzrlib/builtins.py:4706
3435
msgid ""
3436
"Show help on a command or other topic.\n"
3437
" "
3438
msgstr ""
3439
3440
#: bzrlib/builtins.py:4711
3441
msgid "Show help on all commands."
3442
msgstr ""
3443
3444
#: bzrlib/builtins.py:4740
3445
msgid "Show unmerged/unpulled revisions between two branches."
3446
msgstr ""
3447
3448
#: bzrlib/builtins.py:4742
3449
msgid "OTHER_BRANCH may be local or remote."
3450
msgstr ""
3451
3452
#: bzrlib/builtins.py:4744
3453
msgid ""
3454
"To filter on a range of revisions, you can use the command -r begin..end\n"
3455
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3456
"also valid.\n"
3457
" \n"
3458
":Exit values:\n"
3459
" 1 - some missing revisions\n"
3460
" 0 - no missing revisions"
3461
msgstr ""
3462
3463
#: bzrlib/builtins.py:4754
3464
msgid ""
3465
" Determine the missing revisions between this and the branch at the\n"
3466
" remembered pull location::"
3467
msgstr ""
3468
3469
#: bzrlib/builtins.py:4757
3470
msgid " bzr missing"
3471
msgstr ""
3472
3473
#: bzrlib/builtins.py:4759
3474
msgid " Determine the missing revisions between this and another branch::"
3475
msgstr ""
3476
3477
#: bzrlib/builtins.py:4761
3478
msgid " bzr missing http://server/branch"
3479
msgstr ""
3480
3481
#: bzrlib/builtins.py:4763
3482
msgid ""
3483
" Determine the missing revisions up to a specific revision on the other\n"
3484
" branch::"
3485
msgstr ""
3486
3487
#: bzrlib/builtins.py:4766
3488
msgid " bzr missing -r ..-10"
3489
msgstr ""
3490
3491
#: bzrlib/builtins.py:4768
3492
msgid ""
3493
" Determine the missing revisions up to a specific revision on this\n"
3494
" branch::"
3495
msgstr ""
3496
3497
#: bzrlib/builtins.py:4771
3498
msgid " bzr missing --my-revision ..-10"
3499
msgstr ""
3500
3501
#: bzrlib/builtins.py:4778
3502
msgid "Reverse the order of revisions."
3503
msgstr ""
3504
3505
#: bzrlib/builtins.py:4780
3506
msgid "Display changes in the local branch only."
3507
msgstr ""
3508
3509
#: bzrlib/builtins.py:4781
3510
msgid "Same as --mine-only."
3511
msgstr ""
3512
3513
#: bzrlib/builtins.py:4783
3514
msgid "Display changes in the remote branch only."
3515
msgstr ""
3516
3517
#: bzrlib/builtins.py:4784
3518
msgid "Same as --theirs-only."
3519
msgstr ""
3520
3521
#: bzrlib/builtins.py:4789
3522
msgid ""
3523
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3524
"details."
3525
msgstr ""
3526
3527
#: bzrlib/builtins.py:4793
3528
msgid ""
3529
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3530
"details."
3531
msgstr ""
3532
3533
#: bzrlib/builtins.py:4796
3534
msgid "Show all revisions in addition to the mainline ones."
3535
msgstr ""
3536
3537
#: bzrlib/builtins.py:4850
3538
msgid "No peer location known or specified."
3539
msgstr ""
3540
3541
#: bzrlib/builtins.py:4854
3542
msgid "Using saved parent location: {0}\n"
3543
msgstr ""
3544
3545
#: bzrlib/builtins.py:4887
3546
#, python-format
3547
msgid "You have %d extra revision:\n"
3548
msgid_plural "You have %d extra revisions:\n"
3549
msgstr[0] ""
3550
msgstr[1] ""
3551
3552
#: bzrlib/builtins.py:4903
3553
#, python-format
3554
msgid "You are missing %d revision:\n"
3555
msgid_plural "You are missing %d revisions:\n"
3556
msgstr[0] ""
3557
msgstr[1] ""
3558
3559
#: bzrlib/builtins.py:4915
3560
msgid "This branch has no new revisions.\n"
3561
msgstr ""
3562
3563
#: bzrlib/builtins.py:4918
3564
msgid "Other branch has no new revisions.\n"
3565
msgstr ""
3566
3567
#: bzrlib/builtins.py:4923
3568
msgid "Branches are up to date.\n"
3569
msgstr ""
3570
3571
#: bzrlib/builtins.py:4934
3572
msgid "Compress the data within a repository."
3573
msgstr ""
3574
3575
#: bzrlib/builtins.py:4936
3576
msgid ""
3577
"This operation compresses the data within a bazaar repository. As\n"
3578
"bazaar supports automatic packing of repository, this operation is\n"
3579
"normally not required to be done manually."
3580
msgstr ""
3581
3582
#: bzrlib/builtins.py:4940
3583
msgid ""
3584
"During the pack operation, bazaar takes a backup of existing repository\n"
3585
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3586
"automatically when it is safe to do so. To save disk space by removing\n"
3587
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3588
"used."
3589
msgstr ""
3590
3591
#: bzrlib/builtins.py:4946
3592
msgid ""
3593
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3594
"during or immediately after repacking, you may be left with a state\n"
3595
"where the deletion has been written to disk but the new packs have not\n"
3596
"been. In this case the repository may be unusable."
3597
msgstr ""
3598
3599
#: bzrlib/builtins.py:4955
3600
msgid "Delete obsolete packs to save disk space."
3601
msgstr ""
3602
3603
#: bzrlib/builtins.py:4969
3604
msgid "List the installed plugins."
3605
msgstr ""
3606
3607
#: bzrlib/builtins.py:4971
3608
msgid ""
3609
"This command displays the list of installed plugins including\n"
3610
"version of plugin and a short description of each."
3611
msgstr ""
3612
3613
#: bzrlib/builtins.py:4974
3614
msgid "--verbose shows the path where each plugin is located."
3615
msgstr ""
3616
3617
#: bzrlib/builtins.py:4976
3618
msgid ""
3619
"A plugin is an external component for Bazaar that extends the\n"
3620
"revision control system, by adding or replacing code in Bazaar.\n"
3621
"Plugins can do a variety of things, including overriding commands,\n"
3622
"adding new commands, providing additional network transports and\n"
3623
"customizing log output."
3624
msgstr ""
3625
3626
#: bzrlib/builtins.py:4982
3627
msgid ""
3628
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3629
"for further information on plugins including where to find them and how to\n"
3630
"install them. Instructions are also provided there on how to write new\n"
3631
"plugins using the Python programming language."
3632
msgstr ""
3633
3634
#: bzrlib/builtins.py:4998
3635
msgid "Show testament (signing-form) of a revision."
3636
msgstr ""
3637
3638
#: bzrlib/builtins.py:5001
3639
msgid "Produce long-format testament."
3640
msgstr ""
3641
3642
#: bzrlib/builtins.py:5003
3643
msgid "Produce a strict-format testament."
3644
msgstr ""
3645
3646
#: bzrlib/builtins.py:5029
3647
msgid "Show the origin of each line in a file."
3648
msgstr ""
3649
3650
#: bzrlib/builtins.py:5031
3651
msgid ""
3652
"This prints out the given file with an annotation on the left side\n"
3653
"indicating which revision, author and date introduced the change."
3654
msgstr ""
3655
3656
#: bzrlib/builtins.py:5034
3657
msgid ""
3658
"If the origin is the same for a run of consecutive lines, it is\n"
3659
"shown only at the top, unless the --all option is given."
3660
msgstr ""
3661
3662
#: bzrlib/builtins.py:5042
3663
msgid "Show annotations on all lines."
3664
msgstr ""
3665
3666
#: bzrlib/builtins.py:5043
3667
msgid "Show commit date in annotations."
3668
msgstr ""
3669
3670
#: bzrlib/builtins.py:5130
3671
msgid "Cannot sign a range of non-revision-history revisions"
3672
msgstr ""
3673
3674
#: bzrlib/builtins.py:5142
3675
msgid "Please supply either one revision, or a range."
3676
msgstr ""
3677
3678
#: bzrlib/builtins.py:5146
3679
msgid ""
3680
"Convert the current branch into a checkout of the supplied branch.\n"
3681
"If no branch is supplied, rebind to the last bound location."
3682
msgstr ""
3683
"Преобразовать текущую ветвь в рабочую копию указанной ветви.\n"
3684
"Если ветвь не указаны, перепривязать последнее расположение привязки."
3685
3686
#: bzrlib/builtins.py:5149
3687
msgid ""
3688
"Once converted into a checkout, commits must succeed on the master branch\n"
3689
"before they will be applied to the local branch."
3690
msgstr ""
3691
"После преобразования в рабочую копию, закрепления должны производиться\n"
3692
"над основной ветвью, прежде чем они могут быть применены к локальной."
3693
3694
#: bzrlib/builtins.py:5152
3695
msgid ""
3696
"Bound branches use the nickname of its master branch unless it is set\n"
3697
"locally, in which case binding will update the local nickname to be\n"
3698
"that of the master."
3699
msgstr ""
3700
3701
#: bzrlib/builtins.py:5167
3702
msgid "No location supplied. This format does not remember old locations."
3703
msgstr ""
3704
3705
#: bzrlib/builtins.py:5172
3706
msgid "Branch is already bound"
3707
msgstr ""
3708
3709
#: bzrlib/builtins.py:5174
3710
msgid "No location supplied and no previous location known"
3711
msgstr ""
3712
3713
#: bzrlib/builtins.py:5180
3714
msgid "These branches have diverged. Try merging, and then bind again."
3715
msgstr ""
3716
3717
#: bzrlib/builtins.py:5187
3718
msgid "Convert the current checkout into a regular branch."
3719
msgstr "Преобразовать текущую рабочую копию в обычную ветвь."
3720
3721
#: bzrlib/builtins.py:5189
3722
msgid ""
3723
"After unbinding, the local branch is considered independent and subsequent\n"
3724
"commits will be local only."
3725
msgstr ""
3726
3727
#: bzrlib/builtins.py:5200
3728
msgid "Local branch is not bound"
3729
msgstr ""
3730
3731
#: bzrlib/builtins.py:5204
3732
msgid "Remove the last committed revision."
3733
msgstr ""
3734
3735
#: bzrlib/builtins.py:5206
3736
msgid ""
3737
"--verbose will print out what is being removed.\n"
3738
"--dry-run will go through all the motions, but not actually\n"
3739
"remove anything."
3740
msgstr ""
3741
3742
#: bzrlib/builtins.py:5210
3743
msgid ""
3744
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3745
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3746
"branch at revision 15."
3747
msgstr ""
3748
3749
#: bzrlib/builtins.py:5214
3750
msgid ""
3751
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3752
"it may make is to restore any pending merges that were present before\n"
3753
"the commit."
3754
msgstr ""
3755
3756
#: bzrlib/builtins.py:5225
3757
msgid "Don't actually make changes."
3758
msgstr ""
3759
3760
#: bzrlib/builtins.py:5226
3761
msgid "Say yes to all questions."
3762
msgstr ""
3763
3764
#: bzrlib/builtins.py:5228
3765
msgid "Keep tags that point to removed revisions."
3766
msgstr ""
3767
3768
#: bzrlib/builtins.py:5230
3769
msgid "Only remove the commits from the local branch when in a checkout."
3770
msgstr "Удалить закрепления из локальной ветви только в рабочей копии."
3771
3772
#: bzrlib/builtins.py:5279
3773
msgid "No revisions to uncommit.\n"
3774
msgstr ""
3775
3776
#: bzrlib/builtins.py:5294
3777
msgid "Dry-run, pretending to remove the above revisions.\n"
3778
msgstr ""
3779
3780
#: bzrlib/builtins.py:5297
3781
msgid "The above revision(s) will be removed.\n"
3782
msgstr ""
3783
3784
#: bzrlib/builtins.py:5301
3785
msgid "Uncommit these revisions"
3786
msgstr ""
3787
3788
#: bzrlib/builtins.py:5304
3789
msgid "Canceled\n"
3790
msgstr ""
3791
3792
#: bzrlib/builtins.py:5311
3793
#, python-format
3794
msgid ""
3795
"You can restore the old tip by running:\n"
3796
" bzr pull . -r revid:%s\n"
3797
msgstr ""
3798
3799
#: bzrlib/builtins.py:5316
3800
msgid "Break a dead lock."
3801
msgstr ""
3802
3803
#: bzrlib/builtins.py:5318
3804
msgid ""
3805
"This command breaks a lock on a repository, branch, working directory or\n"
3806
"config file."
3807
msgstr ""
3808
3809
#: bzrlib/builtins.py:5321
3810
msgid ""
3811
"CAUTION: Locks should only be broken when you are sure that the process\n"
3812
"holding the lock has been stopped."
3813
msgstr ""
3814
3815
#: bzrlib/builtins.py:5324
3816
msgid ""
3817
"You can get information on what locks are open via the 'bzr info\n"
3818
"[location]' command."
3819
msgstr ""
3820
3821
#: bzrlib/builtins.py:5327
3822
msgid ""
3823
":Examples:\n"
3824
" bzr break-lock\n"
3825
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3826
" bzr break-lock --conf ~/.bazaar"
3827
msgstr ""
3828
3829
#: bzrlib/builtins.py:5336
3830
msgid "LOCATION is the directory where the config lock is."
3831
msgstr ""
3832
3833
#: bzrlib/builtins.py:5338
3834
msgid "Do not ask for confirmation before breaking the lock."
3835
msgstr ""
3836
3837
#: bzrlib/builtins.py:5373
3838
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3839
msgstr ""
3840
3841
#: bzrlib/builtins.py:5374
3842
msgid "Run the bzr server."
3843
msgstr ""
3844
3845
#: bzrlib/builtins.py:5380
3846
msgid "Serve on stdin/out for use from inetd or sshd."
3847
msgstr ""
3848
3849
#: bzrlib/builtins.py:5381
3850
msgid "protocol"
3851
msgstr ""
3852
3853
#: bzrlib/builtins.py:5382
3854
msgid "Protocol to serve."
3855
msgstr ""
3856
3857
#: bzrlib/builtins.py:5386
3858
msgid ""
3859
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3860
"Passing 0 as the port number will result in a dynamically allocated port. "
3861
"The default port depends on the protocol."
3862
msgstr ""
3863
3864
#: bzrlib/builtins.py:5392
3865
msgid "Serve contents of this directory."
3866
msgstr ""
3867
3868
#: bzrlib/builtins.py:5394
3869
msgid ""
3870
"By default the server is a readonly server. Supplying --allow-writes "
3871
"enables write access to the contents of the served directory and below. "
3872
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3873
"of external authentication is arranged supplying this option leads to global "
3874
"uncontrolled write access to your file system."
3875
msgstr ""
3876
3877
#: bzrlib/builtins.py:5403
3878
msgid "Override the default idle client timeout (5min)."
3879
msgstr ""
3880
3881
#: bzrlib/builtins.py:5453
3882
msgid "Combine a tree into its containing tree."
3883
msgstr ""
3884
3885
#: bzrlib/builtins.py:5455
3886
msgid "This command requires the target tree to be in a rich-root format."
3887
msgstr ""
3888
3889
#: bzrlib/builtins.py:5457
3890
msgid ""
3891
"The TREE argument should be an independent tree, inside another tree, but\n"
3892
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3893
"running \"bzr branch\" with the target inside a tree.)"
3894
msgstr ""
3895
3896
#: bzrlib/builtins.py:5461
3897
msgid ""
3898
"The result is a combined tree, with the subtree no longer an independent\n"
3899
"part. This is marked as a merge of the subtree into the containing tree,\n"
3900
"and all history is preserved."
3901
msgstr ""
3902
3903
#: bzrlib/builtins.py:5479
3904
#, python-format
3905
msgid ""
3906
"Can't join trees because %s doesn't support rich root data.\n"
3907
"You can use bzr upgrade on the repository."
3908
msgstr ""
3909
3910
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3911
msgid "Cannot join {0}. {1}"
3912
msgstr ""
3913
3914
#: bzrlib/builtins.py:5499
3915
msgid "Split a subdirectory of a tree into a separate tree."
3916
msgstr ""
3917
3918
#: bzrlib/builtins.py:5501
3919
msgid ""
3920
"This command will produce a target tree in a format that supports\n"
3921
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3922
"converted into earlier formats like 'dirstate-tags'."
3923
msgstr ""
3924
3925
#: bzrlib/builtins.py:5505
3926
msgid ""
3927
"The TREE argument should be a subdirectory of a working tree. That\n"
3928
"subdirectory will be converted into an independent tree, with its own\n"
3929
"branch. Commits in the top-level tree will not apply to the new subtree."
3930
msgstr ""
3931
3932
#: bzrlib/builtins.py:5585
3933
msgid "No submit branch specified or known"
3934
msgstr ""
3935
3936
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3937
msgid "No public branch specified or known"
3938
msgstr ""
3939
3940
#: bzrlib/builtins.py:5598
3941
msgid "bzr merge-directive takes at most two one revision identifiers"
3942
msgstr ""
3943
3944
#: bzrlib/builtins.py:5607
3945
msgid "No revisions to bundle."
3946
msgstr ""
3947
3948
#: bzrlib/builtins.py:5626
3949
msgid "Mail or create a merge-directive for submitting changes."
3950
msgstr ""
3951
3952
#: bzrlib/builtins.py:5628
3953
msgid "A merge directive provides many things needed for requesting merges:"
3954
msgstr ""
3955
3956
#: bzrlib/builtins.py:5630
3957
msgid "* A machine-readable description of the merge to perform"
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:5632
3961
msgid "* An optional patch that is a preview of the changes requested"
3962
msgstr ""
3963
3964
#: bzrlib/builtins.py:5634
3965
msgid ""
3966
"* An optional bundle of revision data, so that the changes can be applied\n"
3967
" directly from the merge directive, without retrieving data from a\n"
3968
" branch."
3969
msgstr ""
3970
3971
#: bzrlib/builtins.py:5638
3972
msgid ""
3973
"`bzr send` creates a compact data set that, when applied using bzr\n"
3974
"merge, has the same effect as merging from the source branch. "
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:5641
3978
msgid ""
3979
"By default the merge directive is self-contained and can be applied to any\n"
3980
"branch containing submit_branch in its ancestory without needing access to\n"
3981
"the source branch."
3982
msgstr ""
3983
3984
#: bzrlib/builtins.py:5645
3985
msgid ""
3986
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3987
"revisions, but only a structured request to merge from the\n"
3988
"public_location. In that case the public_branch is needed and it must be\n"
3989
"up-to-date and accessible to the recipient. The public_branch is always\n"
3990
"included if known, so that people can check it later."
3991
msgstr ""
3992
3993
#: bzrlib/builtins.py:5651
3994
msgid ""
3995
"The submit branch defaults to the parent of the source branch, but can be\n"
3996
"overridden. Both submit branch and public branch will be remembered in\n"
3997
"branch.conf the first time they are used for a particular branch. The\n"
3998
"source branch defaults to that containing the working directory, but can\n"
3999
"be changed using --from."
4000
msgstr ""
4001
4002
#: bzrlib/builtins.py:5657
4003
msgid ""
4004
"Both the submit branch and the public branch follow the usual behavior with\n"
4005
"respect to --remember: If there is no default location set, the first send\n"
4006
"will set it (use --no-remember to avoid setting it). After that, you can\n"
4007
"omit the location to use the default. To change the default, use\n"
4008
"--remember. The value will only be saved if the location can be accessed."
4009
msgstr ""
4010
4011
#: bzrlib/builtins.py:5663
4012
msgid ""
4013
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4014
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4015
"If a public location is known for the submit_branch, that location is used\n"
4016
"in the merge directive."
4017
msgstr ""
4018
4019
#: bzrlib/builtins.py:5668
4020
msgid ""
4021
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4022
"given, in which case it is sent to a file."
4023
msgstr ""
4024
4025
#: bzrlib/builtins.py:5671
4026
msgid ""
4027
"Mail is sent using your preferred mail program. This should be transparent\n"
4028
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4029
"If the preferred client can't be found (or used), your editor will be used."
4030
msgstr ""
4031
4032
#: bzrlib/builtins.py:5675
4033
msgid ""
4034
"To use a specific mail program, set the mail_client configuration option.\n"
4035
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4036
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
4037
"(MacOS X's\n"
4038
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
4039
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
4040
"add\n"
4041
"supported clients."
4042
msgstr ""
4043
4044
#: bzrlib/builtins.py:5682
4045
msgid ""
4046
"If mail is being sent, a to address is required. This can be supplied\n"
4047
"either on the commandline, by setting the submit_to configuration\n"
4048
"option in the branch itself or the child_submit_to configuration option\n"
4049
"in the submit branch."
4050
msgstr ""
4051
4052
#: bzrlib/builtins.py:5687
4053
msgid ""
4054
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4055
"and\n"
4056
"merge directive format 2. It is significantly faster and smaller than\n"
4057
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
4058
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
4059
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4060
msgstr ""
4061
4062
#: bzrlib/builtins.py:5693
4063
msgid ""
4064
"The merge directives created by bzr send may be applied using bzr merge or\n"
4065
"bzr pull by specifying a file containing a merge directive as the location."
4066
msgstr ""
4067
4068
#: bzrlib/builtins.py:5696
4069
msgid ""
4070
"bzr send makes extensive use of public locations to map local locations "
4071
"into\n"
4072
"URLs that can be used by other people. See `bzr help configuration` to\n"
4073
"set them, and use `bzr info` to display them."
4074
msgstr ""
4075
4076
#: bzrlib/builtins.py:5720
4077
msgid "Write merge directive to this file or directory; use - for stdout."
4078
msgstr ""
4079
4080
#: bzrlib/builtins.py:5724
4081
msgid ""
4082
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4083
"strict disables the check."
4084
msgstr ""
4085
4086
#: bzrlib/builtins.py:5726
4087
msgid "Mail the request to this address."
4088
msgstr ""
4089
4090
#: bzrlib/builtins.py:5730
4091
msgid "Body for the email."
4092
msgstr ""
4093
4094
#: bzrlib/builtins.py:5783
4095
msgid "Do not include a bundle in the merge directive."
4096
msgstr ""
4097
4098
#: bzrlib/builtins.py:5784
4099
msgid "Do not include a preview patch in the merge directive."
4100
msgstr ""
4101
4102
#: bzrlib/builtins.py:5787
4103
msgid "Remember submit and public branch."
4104
msgstr ""
4105
4106
#: bzrlib/builtins.py:5789
4107
msgid ""
4108
"Branch to generate the submission from, rather than the one containing the "
4109
"working directory."
4110
msgstr ""
4111
4112
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
4113
msgid "format"
4114
msgstr ""
4115
4116
#: bzrlib/builtins.py:5800
4117
msgid "Use the specified output format."
4118
msgstr ""
4119
4120
#: bzrlib/builtins.py:5822
4121
msgid "Create, remove or modify a tag naming a revision."
4122
msgstr ""
4123
4124
#: bzrlib/builtins.py:5824
4125
msgid ""
4126
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4127
"(--revision) option can be given -rtag:X, where X is any previously\n"
4128
"created tag."
4129
msgstr ""
4130
4131
#: bzrlib/builtins.py:5828
4132
msgid ""
4133
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4134
"along when you branch, push, pull or merge."
4135
msgstr ""
4136
4137
#: bzrlib/builtins.py:5831
4138
msgid ""
4139
"It is an error to give a tag name that already exists unless you pass\n"
4140
"--force, in which case the tag is moved to point to the new revision."
4141
msgstr ""
4142
4143
#: bzrlib/builtins.py:5834
4144
msgid ""
4145
"To rename a tag (change the name but keep it on the same revsion), run "
4146
"``bzr\n"
4147
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4148
msgstr ""
4149
4150
#: bzrlib/builtins.py:5837
4151
msgid ""
4152
"If no tag name is specified it will be determined through the \n"
4153
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4154
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4155
"details."
4156
msgstr ""
4157
4158
#: bzrlib/builtins.py:5847
4159
msgid "Delete this tag rather than placing it."
4160
msgstr ""
4161
4162
#: bzrlib/builtins.py:5850
4163
msgid "Branch in which to place the tag."
4164
msgstr ""
4165
4166
#: bzrlib/builtins.py:5852
4167
msgid "Replace existing tags."
4168
msgstr ""
4169
4170
#: bzrlib/builtins.py:5867
4171
msgid "No tag specified to delete."
4172
msgstr ""
4173
4174
#: bzrlib/builtins.py:5869
4175
#, python-format
4176
msgid "Deleted tag %s."
4177
msgstr ""
4178
4179
#: bzrlib/builtins.py:5883
4180
msgid "Please specify a tag name."
4181
msgstr ""
4182
4183
#: bzrlib/builtins.py:5891
4184
#, python-format
4185
msgid "Tag %s already exists for that revision."
4186
msgstr ""
4187
4188
#: bzrlib/builtins.py:5895
4189
#, python-format
4190
msgid "Created tag %s."
4191
msgstr ""
4192
4193
#: bzrlib/builtins.py:5897
4194
#, python-format
4195
msgid "Updated tag %s."
4196
msgstr ""
4197
4198
#: bzrlib/builtins.py:5901
4199
msgid "List tags."
4200
msgstr ""
4201
4202
#: bzrlib/builtins.py:5903
4203
msgid ""
4204
"This command shows a table of tag names and the revisions they reference."
4205
msgstr ""
4206
4207
#: bzrlib/builtins.py:5909
4208
msgid "Branch whose tags should be displayed."
4209
msgstr ""
4210
4211
#: bzrlib/builtins.py:5911
4212
msgid "Sort tags by different criteria."
4213
msgstr ""
4214
4215
#: bzrlib/builtins.py:5911
4216
msgid "Sorting"
4217
msgstr ""
4218
4219
#: bzrlib/builtins.py:5980
4220
msgid "Reconfigure the type of a bzr directory."
4221
msgstr ""
4222
4223
#: bzrlib/builtins.py:5982
4224
msgid "A target configuration must be specified."
4225
msgstr ""
4226
4227
#: bzrlib/builtins.py:5984
4228
msgid ""
4229
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4230
"The order of preference is\n"
4231
"1. For a lightweight checkout, the current bound location.\n"
4232
"2. For branches that used to be checkouts, the previously-bound location.\n"
4233
"3. The push location.\n"
4234
"4. The parent location.\n"
4235
"If none of these is available, --bind-to must be specified."
4236
msgstr ""
4237
4238
#: bzrlib/builtins.py:5998
4239
msgid "Tree type"
4240
msgstr ""
4241
4242
#: bzrlib/builtins.py:5999
4243
msgid "The relation between branch and tree."
4244
msgstr ""
4245
4246
#: bzrlib/builtins.py:6001
4247
msgid "Reconfigure to be an unbound branch with no working tree."
4248
msgstr ""
4249
4250
#: bzrlib/builtins.py:6002
4251
msgid "Reconfigure to be an unbound branch with a working tree."
4252
msgstr ""
4253
4254
#: bzrlib/builtins.py:6003
4255
msgid "Reconfigure to be a bound branch with a working tree."
4256
msgstr ""
4257
4258
#: bzrlib/builtins.py:6004
4259
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4260
msgstr ""
4261
4262
#: bzrlib/builtins.py:6009
4263
msgid "Repository type"
4264
msgstr ""
4265
4266
#: bzrlib/builtins.py:6010
4267
msgid "Location fo the repository."
4268
msgstr ""
4269
4270
#: bzrlib/builtins.py:6012
4271
msgid ""
4272
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4273
msgstr ""
4274
4275
#: bzrlib/builtins.py:6014
4276
msgid "Reconfigure to use a shared repository."
4277
msgstr ""
4278
4279
#: bzrlib/builtins.py:6018
4280
msgid "Trees in Repository"
4281
msgstr ""
4282
4283
#: bzrlib/builtins.py:6019
4284
msgid "Whether new branches in the repository have trees."
4285
msgstr ""
4286
4287
#: bzrlib/builtins.py:6021
4288
msgid ""
4289
"Reconfigure repository to create working trees on branches by default."
4290
msgstr ""
4291
4292
#: bzrlib/builtins.py:6023
4293
msgid ""
4294
"Reconfigure repository to not create working trees on branches by default."
4295
msgstr ""
4296
4297
#: bzrlib/builtins.py:6026
4298
msgid "Branch to bind checkout to."
4299
msgstr "Ветвь, с которой связать рабочую копию."
4300
4301
#: bzrlib/builtins.py:6028
4302
msgid "Perform reconfiguration even if local changes will be lost."
4303
msgstr ""
4304
4305
#: bzrlib/builtins.py:6031
4306
msgid "Reconfigure a branch to be stacked on another branch."
4307
msgstr ""
4308
4309
#: bzrlib/builtins.py:6035
4310
msgid ""
4311
"Reconfigure a branch to be unstacked. This may require copying substantial "
4312
"data into it."
4313
msgstr ""
4314
4315
#: bzrlib/builtins.py:6045
4316
msgid "Can't use both --stacked-on and --unstacked"
4317
msgstr ""
4318
4319
#: bzrlib/builtins.py:6059
4320
msgid "No target configuration specified"
4321
msgstr ""
4322
4323
#: bzrlib/builtins.py:6094
4324
msgid "Set the branch of a checkout and update."
4325
msgstr "Выбрать ветвь рабочей копии и обновить."
4326
4327
#: bzrlib/builtins.py:6096
4328
msgid ""
4329
"For lightweight checkouts, this changes the branch being referenced.\n"
4330
"For heavyweight checkouts, this checks that there are no local commits\n"
4331
"versus the current bound branch, then it makes the local branch a mirror\n"
4332
"of the new location and binds to it."
4333
msgstr ""
4334
4335
#: bzrlib/builtins.py:6101
4336
msgid ""
4337
"In both cases, the working tree is updated and uncommitted changes\n"
4338
"are merged. The user can commit or revert these as they desire."
4339
msgstr ""
4340
4341
#: bzrlib/builtins.py:6104
4342
msgid "Pending merges need to be committed or reverted before using switch."
4343
msgstr ""
4344
4345
#: bzrlib/builtins.py:6106
4346
msgid ""
4347
"The path to the branch to switch to can be specified relative to the parent\n"
4348
"directory of the current branch. For example, if you are currently in a\n"
4349
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4350
"/path/to/newbranch."
4351
msgstr ""
4352
4353
#: bzrlib/builtins.py:6111
4354
msgid ""
4355
"Bound branches use the nickname of its master branch unless it is set\n"
4356
"locally, in which case switching will update the local nickname to be\n"
4357
"that of the master."
4358
msgstr ""
4359
4360
#: bzrlib/builtins.py:6119
4361
msgid "Switch even if local commits will be lost."
4362
msgstr ""
4363
4364
#: bzrlib/builtins.py:6122
4365
msgid "Create the target branch from this one before switching to it."
4366
msgstr ""
4367
4368
#: bzrlib/builtins.py:6134
4369
msgid "You must supply either a revision or a location"
4370
msgstr ""
4371
4372
#: bzrlib/builtins.py:6145
4373
msgid "cannot create branch without source branch"
4374
msgstr ""
4375
4376
#: bzrlib/builtins.py:6209
4377
msgid "Manage filtered views."
4378
msgstr ""
4379
4380
#: bzrlib/builtins.py:6211
4381
msgid ""
4382
"Views provide a mask over the tree so that users can focus on\n"
4383
"a subset of a tree when doing their work. After creating a view,\n"
4384
"commands that support a list of files - status, diff, commit, etc -\n"
4385
"effectively have that list of files implicitly given each time.\n"
4386
"An explicit list of files can still be given but those files\n"
4387
"must be within the current view."
4388
msgstr ""
4389
4390
#: bzrlib/builtins.py:6218
4391
msgid ""
4392
"In most cases, a view has a short life-span: it is created to make\n"
4393
"a selected change and is deleted once that change is committed.\n"
4394
"At other times, you may wish to create one or more named views\n"
4395
"and switch between them."
4396
msgstr ""
4397
4398
#: bzrlib/builtins.py:6223
4399
msgid ""
4400
"To disable the current view without deleting it, you can switch to\n"
4401
"the pseudo view called ``off``. This can be useful when you need\n"
4402
"to see the whole tree for an operation or two (e.g. merge) but\n"
4403
"want to switch back to your view after that."
4404
msgstr ""
4405
4406
#: bzrlib/builtins.py:6228
4407
msgid ""
4408
":Examples:\n"
4409
" To define the current view::"
4410
msgstr ""
4411
4412
#: bzrlib/builtins.py:6231
4413
msgid " bzr view file1 dir1 ..."
4414
msgstr ""
4415
4416
#: bzrlib/builtins.py:6233
4417
msgid " To list the current view::"
4418
msgstr ""
4419
4420
#: bzrlib/builtins.py:6235
4421
msgid " bzr view"
4422
msgstr ""
4423
4424
#: bzrlib/builtins.py:6237
4425
msgid " To delete the current view::"
4426
msgstr ""
4427
4428
#: bzrlib/builtins.py:6239
4429
msgid " bzr view --delete"
4430
msgstr ""
4431
4432
#: bzrlib/builtins.py:6241
4433
msgid " To disable the current view without deleting it::"
4434
msgstr ""
4435
4436
#: bzrlib/builtins.py:6243
4437
msgid " bzr view --switch off"
4438
msgstr ""
4439
4440
#: bzrlib/builtins.py:6245
4441
msgid " To define a named view and switch to it::"
4442
msgstr ""
4443
4444
#: bzrlib/builtins.py:6247
4445
msgid " bzr view --name view-name file1 dir1 ..."
4446
msgstr ""
4447
4448
#: bzrlib/builtins.py:6249
4449
msgid " To list a named view::"
4450
msgstr ""
4451
4452
#: bzrlib/builtins.py:6251
4453
msgid " bzr view --name view-name"
4454
msgstr ""
4455
4456
#: bzrlib/builtins.py:6253
4457
msgid " To delete a named view::"
4458
msgstr ""
4459
4460
#: bzrlib/builtins.py:6255
4461
msgid " bzr view --name view-name --delete"
4462
msgstr ""
4463
4464
#: bzrlib/builtins.py:6257
4465
msgid " To switch to a named view::"
4466
msgstr ""
4467
4468
#: bzrlib/builtins.py:6259
4469
msgid " bzr view --switch view-name"
4470
msgstr ""
4471
4472
#: bzrlib/builtins.py:6261
4473
msgid " To list all views defined::"
4474
msgstr ""
4475
4476
#: bzrlib/builtins.py:6263
4477
msgid " bzr view --all"
4478
msgstr ""
4479
4480
#: bzrlib/builtins.py:6265
4481
msgid " To delete all views::"
4482
msgstr ""
4483
4484
#: bzrlib/builtins.py:6267
4485
msgid " bzr view --delete --all"
4486
msgstr ""
4487
4488
#: bzrlib/builtins.py:6274
4489
msgid "Apply list or delete action to all views."
4490
msgstr ""
4491
4492
#: bzrlib/builtins.py:6277
4493
msgid "Delete the view."
4494
msgstr ""
4495
4496
#: bzrlib/builtins.py:6280
4497
msgid "Name of the view to define, list or delete."
4498
msgstr ""
4499
4500
#: bzrlib/builtins.py:6284
4501
msgid "Name of the view to switch to."
4502
msgstr ""
4503
4504
#: bzrlib/builtins.py:6303
4505
msgid "Both --delete and a file list specified"
4506
msgstr ""
4507
4508
#: bzrlib/builtins.py:6306
4509
msgid "Both --delete and --switch specified"
4510
msgstr ""
4511
4512
#: bzrlib/builtins.py:6309
4513
msgid "Deleted all views.\n"
4514
msgstr ""
4515
4516
#: bzrlib/builtins.py:6311
4517
msgid "No current view to delete"
4518
msgstr ""
4519
4520
#: bzrlib/builtins.py:6314
4521
#, python-format
4522
msgid "Deleted '%s' view.\n"
4523
msgstr ""
4524
4525
#: bzrlib/builtins.py:6318
4526
msgid "Both --switch and a file list specified"
4527
msgstr ""
4528
4529
#: bzrlib/builtins.py:6321
4530
msgid "Both --switch and --all specified"
4531
msgstr ""
4532
4533
#: bzrlib/builtins.py:6324
4534
msgid "No current view to disable"
4535
msgstr ""
4536
4537
#: bzrlib/builtins.py:6326
4538
#, python-format
4539
msgid "Disabled '%s' view.\n"
4540
msgstr ""
4541
4542
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4543
msgid "Using '{0}' view: {1}\n"
4544
msgstr ""
4545
4546
#: bzrlib/builtins.py:6333
4547
msgid "Views defined:\n"
4548
msgstr ""
4549
4550
#: bzrlib/builtins.py:6342
4551
msgid "No views defined.\n"
4552
msgstr ""
4553
4554
#: bzrlib/builtins.py:6349
4555
msgid "Cannot change the 'off' pseudo view"
4556
msgstr ""
4557
4558
#: bzrlib/builtins.py:6357
4559
msgid "No current view.\n"
4560
msgstr ""
4561
4562
#: bzrlib/builtins.py:6360
4563
msgid "'{0}' view is: {1}\n"
4564
msgstr ""
4565
4566
#: bzrlib/builtins.py:6380
4567
msgid " <no hooks installed>\n"
4568
msgstr ""
4569
4570
#: bzrlib/builtins.py:6384
4571
msgid "Remove a branch."
4572
msgstr ""
4573
4574
#: bzrlib/builtins.py:6386
4575
msgid ""
4576
"This will remove the branch from the specified location but \n"
4577
"will keep any working tree or repository in place."
4578
msgstr ""
4579
4580
#: bzrlib/builtins.py:6391
4581
msgid " Remove the branch at repo/trunk::"
4582
msgstr ""
4583
4584
#: bzrlib/builtins.py:6393
4585
msgid " bzr remove-branch repo/trunk"
4586
msgstr ""
4587
4588
#: bzrlib/builtins.py:6408
4589
msgid "Plaintext diff output."
4590
msgstr ""
4591
4592
#: bzrlib/builtins.py:6409
4593
msgid "Temporarily set aside some changes from the current tree."
4594
msgstr ""
4595
4596
#: bzrlib/builtins.py:6411
4597
msgid ""
4598
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4599
"ie. out of the way, until a later time when you can bring them back from\n"
4600
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4601
"your working tree, and so they aren't propagated along with your branch nor\n"
4602
"will they survive its deletion."
4603
msgstr ""
4604
4605
#: bzrlib/builtins.py:6417
4606
msgid "If shelve --list is specified, previously-shelved changes are listed."
4607
msgstr ""
4608
4609
#: bzrlib/builtins.py:6419
4610
msgid ""
4611
"Shelve is intended to help separate several sets of changes that have\n"
4612
"been inappropriately mingled. If you just want to get rid of all changes\n"
4613
"and you don't need to restore them later, use revert. If you want to\n"
4614
"shelve all text changes at once, use shelve --all."
4615
msgstr ""
4616
4617
#: bzrlib/builtins.py:6424
4618
msgid ""
4619
"If filenames are specified, only the changes to those files will be\n"
4620
"shelved. Other files will be left untouched."
4621
msgstr ""
4622
4623
#: bzrlib/builtins.py:6427
4624
msgid ""
4625
"If a revision is specified, changes since that revision will be shelved."
4626
msgstr ""
4627
4628
#: bzrlib/builtins.py:6429
4629
msgid ""
4630
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4631
"restore the most recently shelved changes."
4632
msgstr ""
4633
4634
#: bzrlib/builtins.py:6432
4635
msgid ""
4636
"For complicated changes, it is possible to edit the changes in a separate\n"
4637
"editor program to decide what the file remaining in the working copy\n"
4638
"should look like. To do this, add the configuration option"
4639
msgstr ""
4640
4641
#: bzrlib/builtins.py:6436
4642
msgid " change_editor = PROGRAM @new_path @old_path"
4643
msgstr ""
4644
4645
#: bzrlib/builtins.py:6438
4646
msgid ""
4647
"where @new_path is replaced with the path of the new version of the \n"
4648
"file and @old_path is replaced with the path of the old version of \n"
4649
"the file. The PROGRAM should save the new file with the desired \n"
4650
"contents of the file in the working tree.\n"
4651
" "
4652
msgstr ""
4653
4654
#: bzrlib/builtins.py:6450
4655
msgid "Shelve all changes."
4656
msgstr ""
4657
4658
#: bzrlib/builtins.py:6452
4659
msgid "Method to use for writing diffs."
4660
msgstr ""
4661
4662
#: bzrlib/builtins.py:6452
4663
msgid "writer"
4664
msgstr ""
4665
4666
#: bzrlib/builtins.py:6456
4667
msgid "List shelved changes."
4668
msgstr ""
4669
4670
#: bzrlib/builtins.py:6458
4671
msgid "Destroy removed changes instead of shelving them."
4672
msgstr ""
4673
4674
#: bzrlib/builtins.py:6487
4675
msgid "No shelved changes."
4676
msgstr ""
4677
4678
#: bzrlib/builtins.py:6498
4679
msgid "Restore shelved changes."
4680
msgstr ""
4681
4682
#: bzrlib/builtins.py:6500
4683
msgid ""
4684
"By default, the most recently shelved changes are restored. However if you\n"
4685
"specify a shelf by id those changes will be restored instead. This works\n"
4686
"best when the changes don't depend on each other."
4687
msgstr ""
4688
4689
#: bzrlib/builtins.py:6509
4690
msgid "The action to perform."
4691
msgstr ""
4692
4693
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4694
msgid "action"
4695
msgstr ""
4696
4697
#: bzrlib/builtins.py:6511
4698
msgid "Apply changes and remove from the shelf."
4699
msgstr ""
4700
4701
#: bzrlib/builtins.py:6512
4702
msgid "Show changes, but do not apply or remove them."
4703
msgstr ""
4704
4705
#: bzrlib/builtins.py:6513
4706
msgid ""
4707
"Instead of unshelving the changes, show the diff that would result from "
4708
"unshelving."
4709
msgstr ""
4710
4711
#: bzrlib/builtins.py:6515
4712
msgid "Delete changes without applying them."
4713
msgstr ""
4714
4715
#: bzrlib/builtins.py:6516
4716
msgid "Apply changes but don't delete them."
4717
msgstr ""
4718
4719
#: bzrlib/builtins.py:6531
4720
msgid "Remove unwanted files from working tree."
4721
msgstr ""
4722
4723
#: bzrlib/builtins.py:6533
4724
msgid ""
4725
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4726
"files are never deleted."
4727
msgstr ""
4728
4729
#: bzrlib/builtins.py:6536
4730
msgid ""
4731
"Another class is 'detritus', which includes files emitted by bzr during\n"
4732
"normal operations and selftests. (The value of these files decreases with\n"
4733
"time.)"
4734
msgstr ""
4735
4736
#: bzrlib/builtins.py:6540
4737
msgid ""
4738
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4739
"flags are respected, and may be combined."
4740
msgstr ""
4741
4742
#: bzrlib/builtins.py:6543
4743
msgid "To check what clean-tree will do, use --dry-run."
4744
msgstr ""
4745
4746
#: bzrlib/builtins.py:6546
4747
msgid "Delete all ignored files."
4748
msgstr ""
4749
4750
#: bzrlib/builtins.py:6547
4751
msgid ""
4752
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4753
msgstr ""
4754
4755
#: bzrlib/builtins.py:6550
4756
msgid "Delete files unknown to bzr (default)."
4757
msgstr ""
4758
4759
#: bzrlib/builtins.py:6551
4760
msgid "Show files to delete instead of deleting them."
4761
msgstr ""
4762
4763
#: bzrlib/builtins.py:6553
4764
msgid "Do not prompt before deleting."
4765
msgstr ""
4766
4767
#: bzrlib/bundle/__init__.py:59
4768
msgid "A directory cannot be a bundle"
4769
msgstr ""
4770
4771
#: bzrlib/bundle/apply_bundle.py:40
4772
msgid "Install revisions"
4773
msgstr ""
4774
4775
#: bzrlib/bundle/commands.py:64
4776
msgid "--verbose requires a merge directive"
4777
msgstr ""
4778
4779
#: bzrlib/bundle/commands.py:67
4780
msgid "Bundle format not supported"
4781
msgstr ""
4782
4783
#: bzrlib/bundle/commands.py:77
4784
msgid "Records\n"
4785
msgstr ""
4786
4787
#: bzrlib/bundle/commands.py:81
4788
msgid "{0}: {1} ({2} multiparent)\n"
4789
msgstr ""
4790
4791
#: bzrlib/bundle/commands.py:83
4792
#, python-format
4793
msgid "unique files: %d\n"
4794
msgstr ""
4795
4796
#: bzrlib/bundle/commands.py:92
4797
msgid "Revisions\n"
4798
msgstr ""
4799
4800
#: bzrlib/bundle/commands.py:93
4801
#, python-format
4802
msgid "nicks: %s\n"
4803
msgstr ""
4804
4805
#: bzrlib/bundle/commands.py:95
4806
#, python-format
4807
msgid ""
4808
"committers: \n"
4809
"%s\n"
4810
msgstr ""
4811
4812
#: bzrlib/bundle/commands.py:103
4813
msgid "Decoded contents\n"
4814
msgstr ""
4815
4816
#: bzrlib/bundle/serializer/v4.py:327
4817
#, python-format
4818
msgid "Bundling %d revision."
4819
msgid_plural "Bundling %d revisions."
4820
msgstr[0] ""
4821
msgstr[1] ""
4822
4823
#: bzrlib/bzrdir.py:489
4824
msgid ""
4825
"making backup of {0}\n"
4826
" to {1}"
4827
msgstr ""
4828
4829
#: bzrlib/bzrdir.py:512
4830
msgid "renamed {0} to {1}"
4831
msgstr ""
4832
4833
#: bzrlib/bzrdir.py:1663
4834
#, python-format
4835
msgid ""
4836
"Source repository format does not support stacking, using format:\n"
4837
" %s"
4838
msgstr ""
4839
4840
#: bzrlib/bzrdir.py:1683
4841
#, python-format
4842
msgid ""
4843
"Source branch format does not support stacking, using format:\n"
4844
" %s"
4845
msgstr ""
4846
4847
#: bzrlib/bzrdir.py:1829
4848
msgid "starting repository conversion"
4849
msgstr ""
4850
4851
#: bzrlib/bzrdir.py:2058
4852
msgid "Using default stacking branch {0} at {1}"
4853
msgstr ""
4854
4855
#: bzrlib/check.py:108
4856
msgid "check"
4857
msgstr ""
4858
4859
#: bzrlib/check.py:110
4860
msgid "checking revisions"
4861
msgstr ""
4862
4863
#: bzrlib/check.py:112
4864
msgid "checking commit contents"
4865
msgstr ""
4866
4867
#: bzrlib/check.py:114
4868
msgid "checking file graphs"
4869
msgstr ""
4870
4871
#: bzrlib/check.py:118
4872
msgid "checking branches and trees"
4873
msgstr ""
4874
4875
#: bzrlib/check.py:205
4876
msgid "checked repository {0} format {1}"
4877
msgstr ""
4878
4879
#: bzrlib/check.py:208
4880
#, python-format
4881
msgid "%6d revisions"
4882
msgstr ""
4883
4884
#: bzrlib/check.py:209
4885
#, python-format
4886
msgid "%6d file-ids"
4887
msgstr ""
4888
4889
#: bzrlib/check.py:211
4890
#, python-format
4891
msgid "%6d unreferenced text versions"
4892
msgstr ""
4893
4894
#: bzrlib/check.py:215
4895
msgid "unreferenced version: {{{0}}} in {1}"
4896
msgstr ""
4897
4898
#: bzrlib/check.py:218
4899
#, python-format
4900
msgid "%6d revisions are missing inventory_sha1"
4901
msgstr ""
4902
4903
#: bzrlib/check.py:221
4904
#, python-format
4905
msgid "%6d revisions are mentioned but not present"
4906
msgstr ""
4907
4908
#: bzrlib/check.py:224
4909
#, python-format
4910
msgid "%6d ghost revisions"
4911
msgstr ""
4912
4913
#: bzrlib/check.py:229
4914
#, python-format
4915
msgid "%6d revisions missing parents in ancestry"
4916
msgstr ""
4917
4918
#: bzrlib/check.py:233
4919
#, python-format
4920
msgid " %s should be in the ancestry for:"
4921
msgstr ""
4922
4923
#: bzrlib/check.py:237
4924
#, python-format
4925
msgid "%6d inconsistent parents"
4926
msgstr ""
4927
4928
#: bzrlib/check.py:241
4929
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4930
msgstr ""
4931
4932
#: bzrlib/check.py:247
4933
#, python-format
4934
msgid "%6d revisions have incorrect parents in the revision index"
4935
msgstr ""
4936
4937
#: bzrlib/check.py:253
4938
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4939
msgstr ""
4940
4941
#: bzrlib/check.py:267
4942
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4943
msgstr ""
4944
4945
#: bzrlib/check.py:296
4946
msgid ""
4947
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4948
"{{{4}}}"
4949
msgstr ""
4950
4951
#: bzrlib/check.py:354
4952
#, python-format
4953
msgid "Checking branch at '%s'."
4954
msgstr ""
4955
4956
#: bzrlib/check.py:374
4957
#, python-format
4958
msgid "Checking working tree at '%s'."
4959
msgstr ""
4960
4961
#: bzrlib/check.py:427 bzrlib/check.py:441
4962
msgid "No branch found at specified location."
4963
msgstr ""
4964
4965
#: bzrlib/check.py:429 bzrlib/check.py:439
4966
msgid "No working tree found at specified location."
4967
msgstr ""
4968
4969
#: bzrlib/check.py:432
4970
#, python-format
4971
msgid "Checking repository at '%s'."
4972
msgstr ""
4973
4974
#: bzrlib/check.py:443
4975
msgid "No repository found at specified location."
4976
msgstr ""
4977
4978
#: bzrlib/clean_tree.py:63
4979
msgid "Nothing to delete."
4980
msgstr ""
4981
4982
#: bzrlib/clean_tree.py:68
4983
msgid "Are you sure you wish to delete these"
4984
msgstr ""
4985
4986
#: bzrlib/clean_tree.py:70
4987
msgid "Canceled"
4988
msgstr ""
4989
4990
#: bzrlib/clean_tree.py:107
4991
#, python-format
4992
msgid "unable to remove %s"
4993
msgstr ""
4994
4995
#: bzrlib/clean_tree.py:111
4996
msgid "deleting paths:"
4997
msgstr ""
4998
4999
#: bzrlib/clean_tree.py:125
5000
msgid "unable to remove \"{0}\": {1}."
5001
msgstr ""
5002
5003
#: bzrlib/clean_tree.py:130
5004
msgid "No files deleted."
5005
msgstr ""
5006
5007
#: bzrlib/cmd_version_info.py:47
5008
msgid "No known version info format {0}. Supported types are: {1}"
5009
msgstr ""
5010
5011
#: bzrlib/cmd_version_info.py:52
5012
msgid "Version info in Custom template-based format."
5013
msgstr ""
5014
5015
#: bzrlib/cmd_version_info.py:52
5016
msgid "Version info in Python format."
5017
msgstr ""
5018
5019
#: bzrlib/cmd_version_info.py:52
5020
msgid "Version info in RIO (simple text) format (default)."
5021
msgstr ""
5022
5023
#: bzrlib/cmd_version_info.py:53
5024
msgid "Show version information about this tree."
5025
msgstr ""
5026
5027
#: bzrlib/cmd_version_info.py:55
5028
msgid ""
5029
"You can use this command to add information about version into\n"
5030
"source code of an application. The output can be in one of the\n"
5031
"supported formats or in a custom format based on a template."
5032
msgstr ""
5033
5034
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
5035
#: en/help_topics/configuration.txt:710
5036
msgid "For example::"
5037
msgstr ""
5038
5039
#: bzrlib/cmd_version_info.py:61
5040
msgid ""
5041
" bzr version-info --custom \\\n"
5042
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
5043
msgstr ""
5044
5045
#: bzrlib/cmd_version_info.py:64
5046
msgid ""
5047
"will produce a C header file with formatted string containing the\n"
5048
"current revision number. Other supported variables in templates are:"
5049
msgstr ""
5050
5051
#: bzrlib/cmd_version_info.py:67
5052
msgid ""
5053
" * {date} - date of the last revision\n"
5054
" * {build_date} - current date\n"
5055
" * {revno} - revision number\n"
5056
" * {revision_id} - revision id\n"
5057
" * {branch_nick} - branch nickname\n"
5058
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
5059
" otherwise 1"
5060
msgstr ""
5061
5062
#: bzrlib/cmd_version_info.py:77
5063
msgid "Select the output format."
5064
msgstr ""
5065
5066
#: bzrlib/cmd_version_info.py:81
5067
msgid "Include all possible information."
5068
msgstr ""
5069
5070
#: bzrlib/cmd_version_info.py:82
5071
msgid "Check if tree is clean."
5072
msgstr ""
5073
5074
#: bzrlib/cmd_version_info.py:84
5075
msgid "Include the revision-history."
5076
msgstr ""
5077
5078
#: bzrlib/cmd_version_info.py:86
5079
msgid "Include the last revision for each file."
5080
msgstr ""
5081
5082
#: bzrlib/cmd_version_info.py:87
5083
msgid "Template for the output."
5084
msgstr ""
5085
5086
#: bzrlib/cmd_version_info.py:101
5087
msgid "bzr version-info --revision takes exactly one revision specifier"
5088
msgstr ""
5089
5090
#: bzrlib/commands.py:228
5091
#, python-format
5092
msgid "unknown command \"%s\""
5093
msgstr "неизвестная команда «%s»"
5094
5095
#: bzrlib/commands.py:475
5096
msgid "No help for this command."
5097
msgstr "Нет справки для этой команды."
5098
5099
#: bzrlib/commands.py:488
5100
#, python-format
5101
msgid ":Purpose: %s\n"
5102
msgstr ":Назначение: %s\n"
5103
5104
#: bzrlib/commands.py:490
5105
#, python-format
5106
msgid ""
5107
":Usage:\n"
5108
"%s\n"
5109
msgstr ""
5110
":Синтаксис:\n"
5111
"%s\n"
5112
5113
#: bzrlib/commands.py:492
5114
#, python-format
5115
msgid ":Usage: %s\n"
5116
msgstr ":Синтаксис: %s\n"
5117
5118
#: bzrlib/commands.py:511
5119
#, python-format
5120
msgid ":Options:%s"
5121
msgstr ":Опции:%s"
5122
5123
#: bzrlib/commands.py:522
5124
#, python-format
5125
msgid ""
5126
":Description:\n"
5127
" %s\n"
5128
"\n"
5129
msgstr ""
5130
":Описание:\n"
5131
" %s\n"
5132
"\n"
5133
5134
#: bzrlib/commands.py:532
5135
#, python-format
5136
msgid ""
5137
"See bzr help %s for more details and examples.\n"
5138
"\n"
5139
msgstr ""
5140
"Смотрите bzr help %s, чтобы получить подробности и примеры.\n"
5141
"\n"
5142
5143
#: bzrlib/commands.py:537
5144
msgid ":Aliases: "
5145
msgstr ":Псевдонимы: "
5146
5147
#: bzrlib/commands.py:541
5148
#, python-format
5149
msgid ":From: plugin \"%s\"\n"
5150
msgstr ":Из: модуль «%s»\n"
5151
5152
#: bzrlib/commands.py:553
5153
msgid ":doc:`{0} <{1}-help>`"
5154
msgstr ""
5155
5156
#: bzrlib/commands.py:557
5157
#, python-format
5158
msgid ":See also: %s"
5159
msgstr ":Смотрите также: %s"
5160
5161
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
5162
msgid "Only ASCII permitted in option names"
5163
msgstr "В именах опций разрешены только символы ASCII"
5164
5165
#: bzrlib/commands.py:840 bzrlib/commands.py:848
5166
msgid "command {0!r} needs one or more {1}"
5167
msgstr "команде {0!r} требуется один или больше {1}"
5168
5169
#: bzrlib/commands.py:857
5170
msgid "command {0!r} requires argument {1}"
5171
msgstr "команде {0!r} требуется аргумент {1}"
5172
5173
#: bzrlib/commands.py:864
5174
msgid "extra argument to command {0}: {1}"
5175
msgstr "лишний аргумент к команде {0}: {1}"
5176
5177
#: bzrlib/commands.py:961
5178
#, python-format
5179
msgid "Profile data written to \"%s\"."
5180
msgstr "Данные профиля записаны в «%s»."
5181
5182
#: bzrlib/commit.py:117 bzrlib/commit.py:740
5183
msgid "added"
5184
msgstr "добавлены"
5185
5186
#: bzrlib/commit.py:117 bzrlib/commit.py:748
5187
msgid "modified"
5188
msgstr "изменены"
5189
5190
#: bzrlib/commit.py:131
5191
#, python-format
5192
msgid "Committing%s"
5193
msgstr "Закрепление%s"
5194
5195
#: bzrlib/commit.py:134
5196
#, python-format
5197
msgid "Committed revision %d."
5198
msgstr "Закреплена ревизия %d."
5199
5200
#: bzrlib/commit.py:143
5201
#, python-format
5202
msgid "deleted %s"
5203
msgstr "удалён %s"
5204
5205
#: bzrlib/commit.py:146
5206
#, python-format
5207
msgid "missing %s"
5208
msgstr "отсутствует %s"
5209
5210
#: bzrlib/commit.py:511
5211
msgid ""
5212
"Conflicting tags in bound branch:\n"
5213
"{0}"
5214
msgstr ""
5215
5216
#: bzrlib/commit.py:742
5217
msgid "renamed"
5218
msgstr "переименованы"
5219
5220
#: bzrlib/commit.py:977
5221
msgid "unchanged"
5222
msgstr "без изменений"
5223
5224
#: bzrlib/commit.py:999
5225
msgid "{0} [{1}] - Stage"
5226
msgstr ""
5227
5228
#: bzrlib/commit.py:1002
5229
#, python-format
5230
msgid "%s - Stage"
5231
msgstr ""
5232
5233
#: bzrlib/commit_signature_commands.py:36
5234
msgid "Sign all commits by a given committer."
5235
msgstr ""
5236
5237
#: bzrlib/commit_signature_commands.py:38
5238
msgid ""
5239
"If location is not specified the local tree is used.\n"
5240
"If committer is not specified the default committer is used."
5241
msgstr ""
5242
5243
#: bzrlib/commit_signature_commands.py:41
5244
msgid "This does not sign commits that already have signatures."
5245
msgstr ""
5246
5247
#: bzrlib/commit_signature_commands.py:49
5248
msgid ""
5249
"Don't actually sign anything, just print the revisions that would be signed."
5250
msgstr ""
5251
5252
#: bzrlib/commit_signature_commands.py:103
5253
msgid "Verify all commit signatures."
5254
msgstr ""
5255
5256
#: bzrlib/commit_signature_commands.py:105
5257
msgid ""
5258
"Verifies that all commits in the branch are signed by known GnuPG keys."
5259
msgstr ""
5260
5261
#: bzrlib/commit_signature_commands.py:110
5262
msgid ""
5263
"Comma separated list of GPG key patterns which are acceptable for "
5264
"verification."
5265
msgstr ""
5266
5267
#: bzrlib/commit_signature_commands.py:147
5268
msgid "Cannot verify a range of non-revision-history revisions"
5269
msgstr ""
5270
5271
#: bzrlib/commit_signature_commands.py:168
5272
msgid "All commits signed with verifiable keys"
5273
msgstr ""
5274
5275
#: bzrlib/config.py:475
5276
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5277
msgstr ""
5278
5279
#: bzrlib/config.py:2499
5280
msgid "{0} is not an SI unit."
5281
msgstr ""
5282
5283
#: bzrlib/config.py:2956
5284
msgid ""
5285
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5286
"will be saved."
5287
msgstr ""
5288
5289
#: bzrlib/config.py:3100
5290
#, python-format
5291
msgid "Invalid '%s', should be of the form 'name=value'"
5292
msgstr ""
5293
5294
#: bzrlib/config.py:3969
5295
msgid "Display, set or remove a configuration option."
5296
msgstr ""
5297
5298
#: bzrlib/config.py:3971
5299
msgid "Display the active value for a given option."
5300
msgstr ""
5301
5302
#: bzrlib/config.py:3973
5303
msgid ""
5304
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5305
"matching options are displayed mentioning their scope. The active value\n"
5306
"that bzr will take into account is the first one displayed for each option."
5307
msgstr ""
5308
5309
#: bzrlib/config.py:3977
5310
msgid "If no NAME is given, --all .* is implied."
5311
msgstr ""
5312
5313
#: bzrlib/config.py:3979
5314
msgid ""
5315
"Setting a value is achieved by using name=value without spaces. The value\n"
5316
"is set in the most relevant scope and can be checked by displaying the\n"
5317
"option again."
5318
msgstr ""
5319
5320
#: bzrlib/config.py:3991
5321
msgid "Reduce the scope to the specified configuration file."
5322
msgstr ""
5323
5324
#: bzrlib/config.py:3995
5325
msgid "Display all the defined values for the matching options."
5326
msgstr ""
5327
5328
#: bzrlib/config.py:3997
5329
msgid "Remove the option from the configuration file."
5330
msgstr ""
5331
5332
#: bzrlib/conflicts.py:50
5333
msgid "List files with conflicts."
5334
msgstr ""
5335
5336
#: bzrlib/conflicts.py:57
5337
msgid ""
5338
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5339
"is supplied, the pathnames of files with text conflicts are listed,\n"
5340
"instead. (This is useful for editing all files with text conflicts.)"
5341
msgstr ""
5342
5343
#: bzrlib/conflicts.py:61
5344
msgid "Use bzr resolve when you have fixed a problem."
5345
msgstr ""
5346
5347
#: bzrlib/conflicts.py:66
5348
msgid "List paths of files with text conflicts."
5349
msgstr ""
5350
5351
#: bzrlib/conflicts.py:85
5352
msgid "Marks the conflict as resolved."
5353
msgstr ""
5354
5355
#: bzrlib/conflicts.py:88
5356
msgid "Resolve the conflict preserving the version in the working tree."
5357
msgstr ""
5358
5359
#: bzrlib/conflicts.py:91
5360
msgid "Resolve the conflict taking the merged version into account."
5361
msgstr ""
5362
5363
#: bzrlib/conflicts.py:98
5364
msgid "How to resolve the conflict."
5365
msgstr ""
5366
5367
#: bzrlib/conflicts.py:104
5368
msgid "Mark a conflict as resolved."
5369
msgstr ""
5370
5371
#: bzrlib/conflicts.py:111
5372
msgid ""
5373
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5374
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5375
"as\n"
5376
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5377
msgstr ""
5378
5379
#: bzrlib/conflicts.py:119
5380
msgid "Resolve all conflicts in this tree."
5381
msgstr ""
5382
5383
#: bzrlib/conflicts.py:126
5384
msgid "If --all is specified, no FILE may be provided"
5385
msgstr ""
5386
5387
#: bzrlib/conflicts.py:151
5388
#, python-format
5389
msgid "%d conflict auto-resolved."
5390
msgid_plural "%d conflicts auto-resolved."
5391
msgstr[0] ""
5392
msgstr[1] ""
5393
5394
#: bzrlib/conflicts.py:154
5395
msgid "Remaining conflicts:"
5396
msgstr ""
5397
5398
#: bzrlib/conflicts.py:159
5399
msgid "All conflicts resolved."
5400
msgstr ""
5401
5402
#: bzrlib/conflicts.py:168
5403
msgid "{0} conflict resolved, {1} remaining"
5404
msgid_plural "{0} conflicts resolved, {1} remaining"
5405
msgstr[0] ""
5406
msgstr[1] ""
5407
5408
#: bzrlib/controldir.py:698
5409
msgid "{0} is{1} redirected to {2}"
5410
msgstr ""
5411
5412
#: bzrlib/diff.py:399
5413
#, python-format
5414
msgid "*** Ignoring files outside view. View is %s"
5415
msgstr ""
5416
5417
#: bzrlib/errors.py:157
5418
msgid "The tree builder is already building a tree."
5419
msgstr ""
5420
5421
#: bzrlib/errors.py:178
5422
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5423
msgstr ""
5424
5425
#: bzrlib/errors.py:197
5426
msgid ""
5427
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5428
"versions \"%(minimum)s\" to \"%(current)s\"."
5429
msgstr ""
5430
5431
#: bzrlib/errors.py:209
5432
msgid "The transport '%(transport)s' is only accessible within this process."
5433
msgstr ""
5434
5435
#: bzrlib/errors.py:227
5436
msgid "Invalid revision number %(revno)s"
5437
msgstr ""
5438
5439
#: bzrlib/errors.py:236
5440
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5441
msgstr ""
5442
5443
#: bzrlib/errors.py:247
5444
msgid "Reserved revision-id {%(revision_id)s}"
5445
msgstr ""
5446
5447
#: bzrlib/errors.py:261
5448
msgid "There is no public branch set for \"%(branch_url)s\"."
5449
msgstr ""
5450
5451
#: bzrlib/errors.py:271
5452
msgid ""
5453
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5454
"obtain a list of topics."
5455
msgstr ""
5456
5457
#: bzrlib/errors.py:280
5458
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:290
5462
msgid ""
5463
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5464
msgstr ""
5465
5466
#: bzrlib/errors.py:299
5467
msgid "The branch '%(branch)s' is not stacked."
5468
msgstr ""
5469
5470
#: bzrlib/errors.py:313
5471
msgid "No WorkingTree exists for \"%(base)s\"."
5472
msgstr ""
5473
5474
#: bzrlib/errors.py:322
5475
msgid "Not currently building a tree."
5476
msgstr ""
5477
5478
#: bzrlib/errors.py:327
5479
msgid "%(url)s is not a local path."
5480
msgstr ""
5481
5482
#: bzrlib/errors.py:355
5483
msgid "%(not_locked)r is not write locked but needs to be."
5484
msgstr ""
5485
5486
#: bzrlib/errors.py:363
5487
msgid "Error in command line options"
5488
msgstr ""
5489
5490
#: bzrlib/errors.py:368
5491
msgid "%(value)s is not an index of type %(_type)s."
5492
msgstr ""
5493
5494
#: bzrlib/errors.py:378
5495
msgid "Error in data for index %(value)s."
5496
msgstr ""
5497
5498
#: bzrlib/errors.py:387
5499
msgid "The key '%(key)s' is already in index '%(index)s'."
5500
msgstr ""
5501
5502
#: bzrlib/errors.py:397
5503
msgid "The key '%(key)s' is not a valid key."
5504
msgstr ""
5505
5506
#: bzrlib/errors.py:406
5507
msgid "Could not parse options for index %(value)s."
5508
msgstr ""
5509
5510
#: bzrlib/errors.py:415
5511
msgid "The value '%(value)s' is not a valid value."
5512
msgstr ""
5513
5514
#: bzrlib/errors.py:443
5515
msgid "Generic path error: %(path)r%(extra)s)"
5516
msgstr ""
5517
5518
#: bzrlib/errors.py:456
5519
msgid "No such file: %(path)r%(extra)s"
5520
msgstr ""
5521
5522
#: bzrlib/errors.py:461
5523
msgid "File exists: %(path)r%(extra)s"
5524
msgstr ""
5525
5526
#: bzrlib/errors.py:467
5527
msgid ""
5528
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5529
"after to tell bzr about a rename that has already happened)%(extra)s"
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:483
5533
msgid "\"%(path)s\" is not a directory %(extra)s"
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:488
5537
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5538
msgstr ""
5539
5540
#: bzrlib/errors.py:493
5541
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5542
msgstr ""
5543
5544
#: bzrlib/errors.py:498
5545
msgid "Hard-linking \"%(path)s\" is not supported"
5546
msgstr ""
5547
5548
#: bzrlib/errors.py:513
5549
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5550
msgstr ""
5551
5552
#: bzrlib/errors.py:518
5553
msgid "Permission denied: \"%(path)s\"%(extra)s"
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:523
5557
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5558
msgstr ""
5559
5560
#: bzrlib/errors.py:528
5561
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5562
msgstr ""
5563
5564
#: bzrlib/errors.py:539
5565
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5566
msgstr ""
5567
5568
#: bzrlib/errors.py:561
5569
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5570
msgstr ""
5571
5572
#: bzrlib/errors.py:571
5573
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5574
msgstr ""
5575
5576
#: bzrlib/errors.py:579
5577
msgid ""
5578
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5579
"upgrade the branch to permit branch stacking."
5580
msgstr ""
5581
5582
#: bzrlib/errors.py:590
5583
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5584
msgstr ""
5585
5586
#: bzrlib/errors.py:600
5587
msgid ""
5588
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5589
"need to upgrade the repository to permit branch stacking."
5590
msgstr ""
5591
5592
#: bzrlib/errors.py:611
5593
msgid "Error reading from %(path)r."
5594
msgstr ""
5595
5596
#: bzrlib/errors.py:630
5597
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5598
msgstr ""
5599
5600
#: bzrlib/errors.py:646
5601
msgid "Path \"%(path)s\" is not unicode normalized"
5602
msgstr ""
5603
5604
#: bzrlib/errors.py:654
5605
msgid "Not a branch: \"%(path)s\"%(detail)s."
5606
msgstr ""
5607
5608
#: bzrlib/errors.py:696
5609
msgid "No submit branch available for branch \"%(path)s\""
5610
msgstr ""
5611
5612
#: bzrlib/errors.py:705
5613
msgid "Already a branch: \"%(path)s\"."
5614
msgstr ""
5615
5616
#: bzrlib/errors.py:711
5617
msgid ""
5618
"Directory contains a branch, but no working tree (use bzr checkout if you "
5619
"wish to build a working tree): \"%(path)s\""
5620
msgstr ""
5621
5622
#: bzrlib/errors.py:716
5623
msgid ""
5624
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5625
msgstr ""
5626
5627
#: bzrlib/errors.py:726
5628
msgid ""
5629
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5630
msgstr ""
5631
5632
#: bzrlib/errors.py:736
5633
msgid "No repository present: \"%(path)s\""
5634
msgstr ""
5635
5636
#: bzrlib/errors.py:743
5637
msgid ""
5638
"Unsupported branch format: %(format)s\n"
5639
"Please run 'bzr upgrade'"
5640
msgstr ""
5641
5642
#: bzrlib/errors.py:749
5643
msgid "Unknown %(kind)s format: %(format)r"
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:758
5647
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:768
5651
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5652
msgstr ""
5653
5654
#: bzrlib/errors.py:783
5655
msgid ""
5656
"%(target)s\n"
5657
"is not compatible with\n"
5658
"%(source)s\n"
5659
"%(details)s"
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:799
5663
msgid "Revision is not compatible with %(repo_format)s"
5664
msgstr ""
5665
5666
#: bzrlib/errors.py:809
5667
msgid "%(context_info)s%(path)s is already versioned."
5668
msgstr ""
5669
5670
#: bzrlib/errors.py:830
5671
msgid "%(context_info)s%(path)s is not versioned."
5672
msgstr ""
5673
5674
#: bzrlib/errors.py:851
5675
msgid "Path(s) are not versioned: %(paths_as_string)s"
5676
msgstr ""
5677
5678
#: bzrlib/errors.py:862
5679
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5680
msgstr ""
5681
5682
#: bzrlib/errors.py:881
5683
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5684
msgstr ""
5685
5686
#: bzrlib/errors.py:889
5687
msgid ""
5688
"Filename %(filename)r is not valid in your current filesystem encoding "
5689
"%(fs_encoding)s"
5690
msgstr ""
5691
5692
#: bzrlib/errors.py:900
5693
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5694
msgstr ""
5695
5696
#: bzrlib/errors.py:918
5697
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:957
5701
msgid "Cannot lock %(lock)s: %(why)s"
5702
msgstr ""
5703
5704
#: bzrlib/errors.py:967
5705
msgid ""
5706
"A transaction related operation was attempted after the transaction finished."
5707
msgstr ""
5708
5709
#: bzrlib/errors.py:994
5710
msgid "Cannot lock: transport is read only: %(transport)s"
5711
msgstr ""
5712
5713
#: bzrlib/errors.py:1002
5714
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5715
msgstr ""
5716
5717
#: bzrlib/errors.py:1013
5718
msgid ""
5719
"Lock was broken while still open: %(lock)s - check storage consistency!"
5720
msgstr ""
5721
5722
#: bzrlib/errors.py:1024
5723
msgid ""
5724
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5725
"%(holder)r, wanted to break %(target)r"
5726
msgstr ""
5727
5728
#: bzrlib/errors.py:1036
5729
msgid ""
5730
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5731
"Use 'bzr break-lock' to clear it"
5732
msgstr ""
5733
5734
#: bzrlib/errors.py:1049
5735
msgid "Lock not held: %(lock)s"
5736
msgstr ""
5737
5738
#: bzrlib/errors.py:1078
5739
msgid "No changes to commit"
5740
msgstr ""
5741
5742
#: bzrlib/errors.py:1083
5743
msgid ""
5744
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5745
msgstr ""
5746
5747
#: bzrlib/errors.py:1093
5748
msgid ""
5749
"Excluding paths during commit is not supported by repository at "
5750
"%(repository)r."
5751
msgstr ""
5752
5753
#: bzrlib/errors.py:1102
5754
msgid ""
5755
"The specified commit message contains characters unsupported by the current "
5756
"encoding."
5757
msgstr ""
5758
5759
#: bzrlib/errors.py:1108
5760
msgid "Upgrade URL cannot work with readonly URLs."
5761
msgstr ""
5762
5763
#: bzrlib/errors.py:1113
5764
msgid "The branch format %(format)s is already at the most recent format."
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:1136
5768
msgid "Option --change does not accept revision ranges"
5769
msgstr ""
5770
5771
#: bzrlib/errors.py:1141
5772
msgid "No namespace registered for string: %(spec)r"
5773
msgstr ""
5774
5775
#: bzrlib/errors.py:1160
5776
msgid ""
5777
"Requested revision: '%(spec)s' does not exist in branch: "
5778
"%(branch_url)s%(extra)s"
5779
msgstr ""
5780
5781
#: bzrlib/errors.py:1174
5782
msgid ""
5783
"Operation denied because it would change the main history, which is not "
5784
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5785
msgstr ""
5786
5787
#: bzrlib/errors.py:1185
5788
msgid ""
5789
"These branches have diverged. Use the missing command to see how.\n"
5790
"Use the merge command to reconcile them."
5791
msgstr ""
5792
5793
#: bzrlib/errors.py:1205
5794
msgid ""
5795
"Branches have no common ancestor, and no merge base revision was specified."
5796
msgstr ""
5797
5798
#: bzrlib/errors.py:1211
5799
msgid ""
5800
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5801
msgstr ""
5802
5803
#: bzrlib/errors.py:1217
5804
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5805
msgstr ""
5806
5807
#: bzrlib/errors.py:1226
5808
msgid ""
5809
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5810
msgstr ""
5811
5812
#: bzrlib/errors.py:1235
5813
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5814
msgstr ""
5815
5816
#: bzrlib/errors.py:1244
5817
msgid "Branch %(branch)s has no commits."
5818
msgstr ""
5819
5820
#: bzrlib/errors.py:1262
5821
msgid ""
5822
"Bound branch %(branch)s is out of date with master branch "
5823
"%(master)s.%(extra_help)s"
5824
msgstr ""
5825
5826
#: bzrlib/errors.py:1274
5827
msgid ""
5828
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5829
"bound to %(remote)s."
5830
msgstr ""
5831
5832
#: bzrlib/errors.py:1286
5833
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5834
msgstr ""
5835
5836
#: bzrlib/errors.py:1295
5837
msgid ""
5838
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5839
"%(error)s"
5840
msgstr ""
5841
5842
#: bzrlib/errors.py:1307
5843
msgid "Error in processing weave: %(msg)s"
5844
msgstr ""
5845
5846
#: bzrlib/errors.py:1316
5847
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5848
msgstr ""
5849
5850
#: bzrlib/errors.py:1327
5851
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5852
msgstr ""
5853
5854
#: bzrlib/errors.py:1337
5855
msgid "Weave invariant violated: %(what)s"
5856
msgstr ""
5857
5858
#: bzrlib/errors.py:1346
5859
msgid "Parents are mismatched between two revisions. %(msg)s"
5860
msgstr ""
5861
5862
#: bzrlib/errors.py:1368
5863
msgid ""
5864
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5865
"%(weave_b)s"
5866
msgstr ""
5867
5868
#: bzrlib/errors.py:1380
5869
msgid "Versioned file error"
5870
msgstr ""
5871
5872
#: bzrlib/errors.py:1385
5873
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5874
msgstr ""
5875
5876
#: bzrlib/errors.py:1395
5877
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5878
msgstr ""
5879
5880
#: bzrlib/errors.py:1405
5881
msgid "Text did not match its checksum: %(msg)s"
5882
msgstr ""
5883
5884
#: bzrlib/errors.py:1531
5885
msgid "Export format %(format)r not supported"
5886
msgstr ""
5887
5888
#: bzrlib/errors.py:1540
5889
msgid "Transport error: %(msg)s %(orig_error)s"
5890
msgstr ""
5891
5892
#: bzrlib/errors.py:1566
5893
msgid "Generic bzr smart protocol error: %(details)s"
5894
msgstr ""
5895
5896
#: bzrlib/errors.py:1574
5897
msgid "Received bad protocol version marker: %(marker)r"
5898
msgstr ""
5899
5900
#: bzrlib/errors.py:1606
5901
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5902
msgstr ""
5903
5904
#: bzrlib/errors.py:1611
5905
msgid "Connection error: %(msg)s %(orig_error)s"
5906
msgstr ""
5907
5908
#: bzrlib/errors.py:1616
5909
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5910
msgstr ""
5911
5912
#: bzrlib/errors.py:1637
5913
msgid "Connection closed: %(msg)s %(orig_error)s"
5914
msgstr ""
5915
5916
#: bzrlib/errors.py:1642
5917
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5918
msgstr ""
5919
5920
#: bzrlib/errors.py:1647
5921
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5922
msgstr ""
5923
5924
#: bzrlib/errors.py:1657
5925
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5926
msgstr ""
5927
5928
#: bzrlib/errors.py:1672
5929
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:1686
5933
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5934
msgstr ""
5935
5936
#: bzrlib/errors.py:1694
5937
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5938
msgstr ""
5939
5940
#: bzrlib/errors.py:1703
5941
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5942
msgstr ""
5943
5944
#: bzrlib/errors.py:1717
5945
msgid "Too many redirections"
5946
msgstr ""
5947
5948
#: bzrlib/errors.py:1722
5949
msgid "Working tree has conflicts."
5950
msgstr ""
5951
5952
#: bzrlib/errors.py:1726
5953
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5954
msgstr ""
5955
5956
#: bzrlib/errors.py:1735
5957
msgid ""
5958
"Error(s) parsing config file %(filename)s:\n"
5959
"%(errors)s"
5960
msgstr ""
5961
5962
#: bzrlib/errors.py:1746
5963
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5964
msgstr ""
5965
5966
#: bzrlib/errors.py:1754
5967
msgid "%(username)r does not seem to contain a reasonable email address"
5968
msgstr ""
5969
5970
#: bzrlib/errors.py:1763
5971
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:1771
5975
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5976
msgstr "Не удалось верифицировать подпись GPG с ошибкой «%(error)s»"
5977
5978
#: bzrlib/errors.py:1779
5979
msgid "Unable to import library \"%(library)s\": %(error)s"
5980
msgstr "Не удалось импортировать библиотеку «%(library)s»: %(error)s"
5981
5982
#: bzrlib/errors.py:1787
5983
msgid "python-gpgme is not installed, it is needed to verify signatures"
5984
msgstr "python-gpgme не устонвлен, он нужен для верификации подписей"
5985
5986
#: bzrlib/errors.py:1795
5987
msgid ""
5988
"The working tree for %(basedir)s has changed since the last commit, but "
5989
"weave merge requires that it be unchanged"
5990
msgstr ""
5991
"Рабочее дерево для %(basedir)s изменилось с последнего закрепления, но merge "
5992
"требует, чтобы оно не содержало изменений"
5993
5994
#: bzrlib/errors.py:1805
5995
msgid ""
5996
"Can't reprocess and show base, because reprocessing obscures the "
5997
"relationship of conflicting lines to the base"
5998
msgstr ""
5999
6000
#: bzrlib/errors.py:1811
6001
msgid "Cycle in graph %(graph)r"
6002
msgstr "Цикл в графе %(graph)r"
6003
6004
#: bzrlib/errors.py:1839
6005
msgid "File %(filename)s is not conflicted."
6006
msgstr "Файл %(filename)s не содержит конфликтов."
6007
6008
#: bzrlib/errors.py:1861
6009
msgid "No bundle was found in \"%(filename)s\"."
6010
msgstr "В файле «%(filename)s» нет пакета."
6011
6012
#: bzrlib/errors.py:1870
6013
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6014
msgstr "Не удалось обработать версию пакета %(version)s: %(msg)s"
6015
6016
#: bzrlib/errors.py:1880
6017
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6018
msgstr ""
6019
"В ветви %(base)s отсутствует ревизия %(text_revision)s файла %(file_id)s"
6020
6021
#: bzrlib/errors.py:1893
6022
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6023
msgstr ""
6024
"Идентификатор файла {%(file_id)s} уже присутствует в инвентаре как %(entry)s"
6025
6026
#: bzrlib/errors.py:1903
6027
msgid "Key %(key)s is already present in map"
6028
msgstr ""
6029
6030
#: bzrlib/errors.py:1908
6031
msgid "The prefix %(prefix)s is in the help search path twice."
6032
msgstr ""
6033
6034
#: bzrlib/errors.py:1918
6035
msgid ""
6036
"No final name for trans_id %(trans_id)r\n"
6037
"file-id: %(file_id)r\n"
6038
"root trans-id: %(root_trans_id)r\n"
6039
msgstr ""
6040
6041
#: bzrlib/errors.py:1950
6042
msgid "Attempt to reuse a transform that has already been applied."
6043
msgstr ""
6044
6045
#: bzrlib/errors.py:1955
6046
msgid "Moving the root directory is not supported at this time"
6047
msgstr "Перемещение в корневую директорию пока не поддерживается"
6048
6049
#: bzrlib/errors.py:1960
6050
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6051
msgstr "Не удалось переименовать %(from_path)s в %(to_path)s: %(why)s"
6052
6053
#: bzrlib/errors.py:1971
6054
msgid ""
6055
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6056
msgstr ""
6057
"Не удалось переместить %(from_path)s%(operator)s "
6058
"%(to_path)s%(_has_extra)s%(extra)s"
6059
6060
#: bzrlib/errors.py:2007
6061
msgid ""
6062
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6063
msgstr ""
6064
"Не удалось переименовать %(from_path)s%(operator)s "
6065
"%(to_path)s%(_has_extra)s%(extra)s"
6066
6067
#: bzrlib/errors.py:2037
6068
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6069
msgstr ""
6070
6071
#: bzrlib/errors.py:2045
6072
msgid "Nothing to merge."
6073
msgstr "Нечего совмещать."
6074
6075
#: bzrlib/errors.py:2050
6076
msgid "Format %(format)s cannot be initialised by this version of bzr."
6077
msgstr ""
6078
6079
#: bzrlib/errors.py:2059
6080
msgid ""
6081
"Cannot convert from format %(from_format)s to format %(format)s. "
6082
"%(problem)s"
6083
msgstr ""
6084
6085
#: bzrlib/errors.py:2071
6086
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6087
msgstr ""
6088
6089
#: bzrlib/errors.py:2079
6090
msgid "%(exe_name)s could not be found on this machine"
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:2087
6094
msgid "Diff is not installed on this machine: %(msg)s"
6095
msgstr ""
6096
6097
#: bzrlib/errors.py:2095
6098
msgid "Diff3 is not installed on this machine."
6099
msgstr "Diff3 не установлен на этой машине."
6100
6101
#: bzrlib/errors.py:2101
6102
msgid "The content being inserted is already present."
6103
msgstr ""
6104
6105
#: bzrlib/errors.py:2106
6106
msgid ""
6107
"This tree contains left-over files from a failed operation.\n"
6108
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6109
"to\n"
6110
" keep, and delete it when you are done."
6111
msgstr ""
6112
6113
#: bzrlib/errors.py:2117
6114
msgid ""
6115
"This tree contains left-over files from a failed operation.\n"
6116
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6117
" wish to keep, and delete it when you are done."
6118
msgstr ""
6119
6120
#: bzrlib/errors.py:2127
6121
msgid ""
6122
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6123
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6124
"to\n"
6125
" keep, and delete it when you are done."
6126
msgstr ""
6127
6128
#: bzrlib/errors.py:2138
6129
msgid ""
6130
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6131
"examine %(pending_deletion)s to see if it contains any files you wish to "
6132
"keep, and delete it when you are done."
6133
msgstr ""
6134
6135
#: bzrlib/errors.py:2148
6136
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6137
msgstr ""
6138
6139
#: bzrlib/errors.py:2162
6140
msgid ""
6141
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6142
msgstr ""
6143
6144
#: bzrlib/errors.py:2175
6145
msgid "Error in merge modified format"
6146
msgstr ""
6147
6148
#: bzrlib/errors.py:2180
6149
msgid "Format error in conflict listings"
6150
msgstr ""
6151
6152
#: bzrlib/errors.py:2184
6153
msgid ""
6154
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6155
"Error: %(description)s"
6156
msgstr ""
6157
6158
#: bzrlib/errors.py:2195
6159
msgid ""
6160
"An error has been detected in the repository %(repo_path)s.\n"
6161
"Please run bzr reconcile on this repository."
6162
msgstr ""
6163
6164
#: bzrlib/errors.py:2206
6165
msgid ""
6166
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6167
"reason: %(reason)s"
6168
msgstr ""
6169
6170
#: bzrlib/errors.py:2219
6171
msgid ""
6172
"An inconsistent delta was supplied: %(delta)r\n"
6173
"reason: %(reason)s"
6174
msgstr ""
6175
6176
#: bzrlib/errors.py:2231
6177
msgid "To use this feature you must upgrade your branch at %(path)s."
6178
msgstr ""
6179
6180
#: bzrlib/errors.py:2240
6181
msgid "To use this feature you must upgrade your repository at %(path)s."
6182
msgstr ""
6183
6184
#: bzrlib/errors.py:2245
6185
msgid ""
6186
"To use this feature you must upgrade your branch at %(path)s to a format "
6187
"which supports rich roots."
6188
msgstr ""
6189
6190
#: bzrlib/errors.py:2251
6191
msgid "Cannot perform local-only commits on unbound branches."
6192
msgstr ""
6193
6194
#: bzrlib/errors.py:2256
6195
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6196
msgstr ""
6197
6198
#: bzrlib/errors.py:2277
6199
msgid "Ghost tags not supported by format %(format)r."
6200
msgstr ""
6201
6202
#: bzrlib/errors.py:2285
6203
msgid "File is binary but should be text."
6204
msgstr ""
6205
6206
#: bzrlib/errors.py:2290
6207
msgid "The path %(path)s is not permitted on this platform"
6208
msgstr ""
6209
6210
#: bzrlib/errors.py:2299
6211
msgid ""
6212
"Testament did not match expected value.\n"
6213
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6214
" {%(measured)s}"
6215
msgstr ""
6216
6217
#: bzrlib/errors.py:2311
6218
msgid "Not a bzr revision-bundle: %(text)r"
6219
msgstr ""
6220
6221
#: bzrlib/errors.py:2320
6222
msgid "Bad bzr revision-bundle: %(text)r"
6223
msgstr ""
6224
6225
#: bzrlib/errors.py:2329
6226
msgid "Malformed bzr revision-bundle header: %(text)r"
6227
msgstr ""
6228
6229
#: bzrlib/errors.py:2334
6230
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6231
msgstr ""
6232
6233
#: bzrlib/errors.py:2339
6234
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6235
msgstr ""
6236
6237
#: bzrlib/errors.py:2344
6238
msgid "End of line marker was not \\n in bzr revision-bundle"
6239
msgstr ""
6240
6241
#: bzrlib/errors.py:2354
6242
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6243
msgstr ""
6244
6245
#: bzrlib/errors.py:2364
6246
msgid "Root class for inventory serialization errors"
6247
msgstr ""
6248
6249
#: bzrlib/errors.py:2368
6250
msgid ""
6251
"The inventory was not in the expected format:\n"
6252
" %(msg)s"
6253
msgstr ""
6254
6255
#: bzrlib/errors.py:2377
6256
msgid "This operation requires rich root data storage"
6257
msgstr ""
6258
6259
#: bzrlib/errors.py:2390
6260
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6261
msgstr ""
6262
6263
#: bzrlib/errors.py:2399
6264
msgid ""
6265
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6266
"variable."
6267
msgstr ""
6268
6269
#: bzrlib/errors.py:2406
6270
msgid ""
6271
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6272
"ghost at {%(ghost_revision_id)s}"
6273
msgstr ""
6274
6275
#: bzrlib/errors.py:2416
6276
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6277
msgstr ""
6278
6279
#: bzrlib/errors.py:2467
6280
msgid ""
6281
"A merge directive must provide either a bundle or a public branch location."
6282
msgstr ""
6283
6284
#: bzrlib/errors.py:2474
6285
msgid "Bad merge directive payload %(start)r"
6286
msgstr ""
6287
6288
#: bzrlib/errors.py:2484
6289
msgid "Preview patch does not match requested changes."
6290
msgstr ""
6291
6292
#: bzrlib/errors.py:2490
6293
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6294
msgstr ""
6295
6296
#: bzrlib/errors.py:2500
6297
msgid ""
6298
"Your branch does not have all of the revisions required in order to merge "
6299
"this merge directive and the target location specified in the merge "
6300
"directive is not a branch: %(location)s."
6301
msgstr ""
6302
6303
#: bzrlib/errors.py:2512
6304
msgid "Unsupported entry kind %(kind)s"
6305
msgstr ""
6306
6307
#: bzrlib/errors.py:2520
6308
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6309
msgstr ""
6310
6311
#: bzrlib/errors.py:2530
6312
msgid "Subsume target %(other_tree)s needs to be upgraded."
6313
msgstr ""
6314
6315
#: bzrlib/errors.py:2549
6316
msgid "No such tag: %(tag_name)s"
6317
msgstr ""
6318
6319
#: bzrlib/errors.py:2557
6320
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6321
msgstr ""
6322
6323
#: bzrlib/errors.py:2566
6324
msgid "Tag %(tag_name)s already exists."
6325
msgstr ""
6326
6327
#: bzrlib/errors.py:2574
6328
msgid ""
6329
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6330
"bugs\" for more information on this feature."
6331
msgstr ""
6332
6333
#: bzrlib/errors.py:2584
6334
msgid ""
6335
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6336
msgstr ""
6337
6338
#: bzrlib/errors.py:2594
6339
msgid ""
6340
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6341
msgstr ""
6342
6343
#: bzrlib/errors.py:2604
6344
msgid "Invalid line in bugs property: '%(line)s'"
6345
msgstr ""
6346
6347
#: bzrlib/errors.py:2612
6348
msgid "Invalid bug status: '%(status)s'"
6349
msgstr ""
6350
6351
#: bzrlib/errors.py:2620
6352
msgid "Could not understand response from smart server: %(response_tuple)r"
6353
msgstr ""
6354
6355
#: bzrlib/errors.py:2659
6356
msgid "Server sent an unexpected error: %(error_tuple)r"
6357
msgstr ""
6358
6359
#: bzrlib/errors.py:2678
6360
msgid "Unrecognised container format: %(container_format)r"
6361
msgstr ""
6362
6363
#: bzrlib/errors.py:2686
6364
msgid "Unexpected end of container stream"
6365
msgstr ""
6366
6367
#: bzrlib/errors.py:2691
6368
msgid "Unknown record type: %(record_type)r"
6369
msgstr ""
6370
6371
#: bzrlib/errors.py:2699
6372
msgid "Invalid record: %(reason)s"
6373
msgstr ""
6374
6375
#: bzrlib/errors.py:2707
6376
msgid "Container has data after end marker: %(excess)r"
6377
msgstr ""
6378
6379
#: bzrlib/errors.py:2715
6380
msgid "Container has multiple records with the same name: %(name)s"
6381
msgstr ""
6382
6383
#: bzrlib/errors.py:2728
6384
msgid "Corrupt or incompatible data stream: %(reason)s"
6385
msgstr ""
6386
6387
#: bzrlib/errors.py:2736
6388
msgid "SMTP error: %(error)s"
6389
msgstr ""
6390
6391
#: bzrlib/errors.py:2744
6392
msgid "No message supplied."
6393
msgstr ""
6394
6395
#: bzrlib/errors.py:2749
6396
msgid "No mail-to address (--mail-to) or output (-o) specified."
6397
msgstr ""
6398
6399
#: bzrlib/errors.py:2754
6400
msgid "Unknown mail client: %(mail_client)s"
6401
msgstr ""
6402
6403
#: bzrlib/errors.py:2762
6404
msgid ""
6405
"Unable to find mail client with the following names: "
6406
"%(mail_command_list_string)s"
6407
msgstr ""
6408
6409
#: bzrlib/errors.py:2772
6410
msgid "SMTP connection to %(host)s refused"
6411
msgstr ""
6412
6413
#: bzrlib/errors.py:2781
6414
msgid "Please specify smtp_server. No server at default %(host)s."
6415
msgstr ""
6416
6417
#: bzrlib/errors.py:2795
6418
msgid ""
6419
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6420
"reconfigure."
6421
msgstr ""
6422
6423
#: bzrlib/errors.py:2807
6424
msgid "'%(display_url)s' is already a branch."
6425
msgstr ""
6426
6427
#: bzrlib/errors.py:2812
6428
msgid "'%(display_url)s' is already a tree."
6429
msgstr ""
6430
6431
#: bzrlib/errors.py:2817
6432
msgid "'%(display_url)s' is already a checkout."
6433
msgstr ""
6434
6435
#: bzrlib/errors.py:2822
6436
msgid "'%(display_url)s' is already a lightweight checkout."
6437
msgstr ""
6438
6439
#: bzrlib/errors.py:2827
6440
msgid "'%(display_url)s' is already using a shared repository."
6441
msgstr ""
6442
6443
#: bzrlib/errors.py:2832
6444
msgid "'%(display_url)s' is already standalone."
6445
msgstr ""
6446
6447
#: bzrlib/errors.py:2837
6448
msgid "Shared repository '%(display_url)s' already creates working trees."
6449
msgstr ""
6450
6451
#: bzrlib/errors.py:2843
6452
msgid ""
6453
"Shared repository '%(display_url)s' already doesn't create working trees."
6454
msgstr ""
6455
6456
#: bzrlib/errors.py:2849
6457
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6458
msgstr ""
6459
6460
#: bzrlib/errors.py:2854
6461
msgid "No location could be found to bind to at %(display_url)s."
6462
msgstr ""
6463
6464
#: bzrlib/errors.py:2859
6465
msgid ""
6466
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6467
"status).%(more)s"
6468
msgstr ""
6469
6470
#: bzrlib/errors.py:2878
6471
msgid ""
6472
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6473
"list).%(more)s"
6474
msgstr ""
6475
6476
#: bzrlib/errors.py:2884
6477
msgid "Variable {%(name)s} is not available."
6478
msgstr ""
6479
6480
#: bzrlib/errors.py:2892
6481
msgid "No template specified."
6482
msgstr ""
6483
6484
#: bzrlib/errors.py:2897
6485
msgid "Unable to create symlink %(path_str)son this platform"
6486
msgstr ""
6487
6488
#: bzrlib/errors.py:2912
6489
msgid ""
6490
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6491
"\"original\", \"local\"."
6492
msgstr ""
6493
6494
#: bzrlib/errors.py:2946
6495
msgid ""
6496
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6497
msgstr ""
6498
6499
#: bzrlib/errors.py:2958
6500
msgid "The \"%(config_id)s\" configuration does not exist."
6501
msgstr ""
6502
6503
#: bzrlib/errors.py:2966
6504
msgid "The \"%(option_name)s\" configuration option does not exist."
6505
msgstr ""
6506
6507
#: bzrlib/errors.py:2974
6508
msgid "The alias \"%(alias_name)s\" does not exist."
6509
msgstr ""
6510
6511
#: bzrlib/errors.py:2988
6512
msgid "\"%(alias_name)s\" is not a valid location alias."
6513
msgstr ""
6514
6515
#: bzrlib/errors.py:2996
6516
msgid "No %(alias_name)s location assigned."
6517
msgstr ""
6518
6519
#: bzrlib/errors.py:3004
6520
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6521
msgstr ""
6522
6523
#: bzrlib/errors.py:3014
6524
msgid "Unknown rules detected: %(unknowns_str)s."
6525
msgstr ""
6526
6527
#: bzrlib/errors.py:3025
6528
msgid "Tip change rejected: %(msg)s"
6529
msgstr ""
6530
6531
#: bzrlib/errors.py:3033
6532
msgid "Shelf corrupt."
6533
msgstr ""
6534
6535
#: bzrlib/errors.py:3038
6536
msgid "Corruption while decompressing repository file%(orig_error)s"
6537
msgstr ""
6538
6539
#: bzrlib/errors.py:3050
6540
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6541
msgstr ""
6542
6543
#: bzrlib/errors.py:3058
6544
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6545
msgstr ""
6546
6547
#: bzrlib/errors.py:3066
6548
msgid ""
6549
"An attempt to access a url outside the server jail was made: '%(url)s'."
6550
msgstr ""
6551
6552
#: bzrlib/errors.py:3074
6553
msgid "The user aborted the operation."
6554
msgstr ""
6555
6556
#: bzrlib/errors.py:3079
6557
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6558
msgstr ""
6559
6560
#: bzrlib/errors.py:3089
6561
msgid "No such view: %(view_name)s."
6562
msgstr ""
6563
6564
#: bzrlib/errors.py:3099
6565
msgid ""
6566
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6567
"to a later format."
6568
msgstr ""
6569
6570
#: bzrlib/errors.py:3108
6571
msgid ""
6572
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6573
msgstr ""
6574
6575
#: bzrlib/errors.py:3175
6576
msgid "%(bzrdir)r does not support co-located branches."
6577
msgstr ""
6578
6579
#: bzrlib/errors.py:3181
6580
msgid ""
6581
"Unable to determine your name.\n"
6582
"Please, set your name with the 'whoami' command.\n"
6583
"E.g. bzr whoami \"Your Name <name@example.com>\""
6584
msgstr ""
6585
6586
#: bzrlib/errors.py:3190
6587
msgid "Invalid pattern(s) found. %(msg)s"
6588
msgstr ""
6589
6590
#: bzrlib/errors.py:3198
6591
msgid ""
6592
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6593
"unbind` to fix."
6594
msgstr ""
6595
6596
#: bzrlib/errors.py:3209
6597
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6598
msgstr ""
6599
6600
#: bzrlib/errors.py:3218
6601
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6602
msgstr ""
6603
6604
#: bzrlib/errors.py:3227
6605
msgid ""
6606
"No compatible object available for operations from %(source)r to %(target)r."
6607
msgstr ""
6608
6609
#: bzrlib/errors.py:3237
6610
msgid ""
6611
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6612
"%(arguments)s."
6613
msgstr ""
6614
6615
#: bzrlib/errors.py:3247
6616
msgid ""
6617
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6618
"format %(format)r"
6619
msgstr ""
6620
6621
#: bzrlib/errors.py:3259
6622
msgid ""
6623
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6624
"plugin."
6625
msgstr ""
6626
6627
#: bzrlib/errors.py:3272
6628
msgid "Binary files section encountered."
6629
msgstr ""
6630
6631
#: bzrlib/errors.py:3280
6632
msgid ""
6633
"Malformed patch header. %(desc)s\n"
6634
"%(line)r"
6635
msgstr ""
6636
6637
#: bzrlib/errors.py:3289
6638
msgid ""
6639
"Malformed hunk header. %(desc)s\n"
6640
"%(line)r"
6641
msgstr ""
6642
6643
#: bzrlib/errors.py:3298
6644
msgid ""
6645
"Malformed line. %(desc)s\n"
6646
"%(line)r"
6647
msgstr ""
6648
6649
#: bzrlib/errors.py:3308
6650
msgid ""
6651
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6652
"but patch says it should be \"%(patch_line)s\""
6653
msgstr ""
6654
6655
#: bzrlib/errors.py:3319
6656
msgid "The feature %(feature)s has already been registered."
6657
msgstr ""
6658
6659
#: bzrlib/export_pot.py:252
6660
#, python-format
6661
msgid "Exporting messages from builtin command: %s"
6662
msgstr ""
6663
6664
#: bzrlib/export_pot.py:271
6665
msgid "Exporting messages from plugin command: {0} in {1}"
6666
msgstr ""
6667
6668
#: bzrlib/export_pot.py:292
6669
#, python-format
6670
msgid "Exporting message from error: %s"
6671
msgstr ""
6672
6673
#: bzrlib/fetch.py:98
6674
msgid "Finding revisions"
6675
msgstr ""
6676
6677
#: bzrlib/fetch.py:103
6678
msgid "Fetching revisions"
6679
msgstr ""
6680
6681
#: bzrlib/foreign.py:262
6682
msgid "Push into a different VCS without any custom bzr metadata."
6683
msgstr ""
6684
6685
#: bzrlib/foreign.py:264
6686
msgid ""
6687
"This will afterwards rebase the local branch on the remote\n"
6688
"branch unless the --no-rebase option is used, in which case \n"
6689
"the two branches will be out of sync after the push. "
6690
msgstr ""
6691
6692
#: bzrlib/foreign.py:277
6693
msgid "Do not rebase after push."
6694
msgstr ""
6695
6696
#: bzrlib/foreign.py:311
6697
#, python-format
6698
msgid "Using saved location: %s\n"
6699
msgstr ""
6700
6701
#: bzrlib/foreign.py:321
6702
msgid ""
6703
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6704
"regular push."
6705
msgstr ""
6706
6707
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6708
msgid "{0} commits with valid signatures"
6709
msgstr ""
6710
6711
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6712
msgid "{0} commit with unknown key"
6713
msgid_plural "{0} commits with unknown keys"
6714
msgstr[0] "{0} закрепление с неизвестным ключом"
6715
msgstr[1] "{0} закрепления с неизвестным ключом"
6716
msgstr[2] "{0} закреплений с неизвестным ключом"
6717
6718
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6719
msgid "{0} commit not valid"
6720
msgid_plural "{0} commits not valid"
6721
msgstr[0] ""
6722
msgstr[1] ""
6723
6724
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6725
msgid "{0} commit not signed"
6726
msgid_plural "{0} commits not signed"
6727
msgstr[0] ""
6728
msgstr[1] ""
6729
6730
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6731
msgid "{0} commit with key now expired"
6732
msgid_plural "{0} commits with key now expired"
6733
msgstr[0] ""
6734
msgstr[1] ""
6735
6736
#: bzrlib/gpg.py:343
6737
msgid "No GnuPG key results for pattern: {0}"
6738
msgstr ""
6739
6740
#: bzrlib/gpg.py:386
6741
msgid "{0} signed {1} commit"
6742
msgid_plural "{0} signed {1} commits"
6743
msgstr[0] ""
6744
msgstr[1] ""
6745
6746
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6747
msgid "{0} commit by author {1}"
6748
msgid_plural "{0} commits by author {1}"
6749
msgstr[0] ""
6750
msgstr[1] ""
6751
6752
#: bzrlib/gpg.py:433
6753
msgid "Unknown key {0} signed {1} commit"
6754
msgid_plural "Unknown key {0} signed {1} commits"
6755
msgstr[0] "Неизвестным ключом {0} подписано {1} закрепление"
6756
msgstr[1] "Неизвестным ключом {0} подписаны {1} закрепления"
6757
msgstr[2] "Неизвестным ключом {0} подписаны {1} закреплений"
6758
6759
#: bzrlib/gpg.py:452
6760
msgid "{0} commit by author {1} with key {2} now expired"
6761
msgid_plural "{0} commits by author {1} with key {2} now expired"
6762
msgstr[0] ""
6763
msgstr[1] ""
6764
6765
#: bzrlib/groupcompress.py:1739
6766
#, python-format
6767
msgid "Insert claimed random_id=True, but then inserted %r two times"
6768
msgstr ""
6769
6770
#: bzrlib/hooks.py:331
6771
#, python-format
6772
msgid "Introduced in: %s"
6773
msgstr ""
6774
6775
#: bzrlib/hooks.py:334
6776
#, python-format
6777
msgid "Deprecated in: %s"
6778
msgstr ""
6779
6780
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6781
msgid "Walking content"
6782
msgstr ""
6783
6784
#: bzrlib/knit.py:3330
6785
msgid "annotating"
6786
msgstr ""
6787
6788
#: bzrlib/lock.py:548
6789
msgid "{0!r} was {1} locked again"
6790
msgstr ""
6791
6792
#: bzrlib/lockdir.py:321
6793
#, python-format
6794
msgid "error removing pending lock: %s"
6795
msgstr ""
6796
6797
#: bzrlib/lockdir.py:616
6798
msgid "Unable to obtain"
6799
msgstr ""
6800
6801
#: bzrlib/lockdir.py:618
6802
msgid "Lock owner changed for"
6803
msgstr ""
6804
6805
#: bzrlib/lockdir.py:620
6806
msgid "{0} lock {1} {2}."
6807
msgstr ""
6808
6809
#: bzrlib/lockdir.py:627
6810
#, python-format
6811
msgid "Will continue to try until %s, unless you press Ctrl-C."
6812
msgstr ""
6813
6814
#: bzrlib/lockdir.py:629
6815
msgid "See \"bzr help break-lock\" for more."
6816
msgstr ""
6817
6818
#: bzrlib/lockdir.py:739
6819
#, python-format
6820
msgid ""
6821
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6822
msgstr ""
6823
6824
#: bzrlib/log.py:572
6825
msgid "--exclude-common-ancestry requires two different revisions"
6826
msgstr ""
6827
6828
#: bzrlib/log.py:574
6829
#, python-format
6830
msgid "invalid direction %r"
6831
msgstr ""
6832
6833
#: bzrlib/log.py:662
6834
msgid "Start revision not found in history of end revision."
6835
msgstr ""
6836
6837
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6838
msgid "Logging revision 0 is invalid."
6839
msgstr ""
6840
6841
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6842
msgid "Start revision must be older than the end revision."
6843
msgstr ""
6844
6845
#: bzrlib/log.py:1827
6846
#, python-format
6847
msgid "unknown log formatter: %r"
6848
msgstr ""
6849
6850
#: bzrlib/log.py:2123
6851
msgid "fixes bug"
6852
msgid_plural "fixes bugs"
6853
msgstr[0] ""
6854
msgstr[1] ""
6855
6856
#: bzrlib/merge.py:689
6857
msgid "All changes applied successfully."
6858
msgstr ""
6859
6860
#: bzrlib/merge.py:691
6861
#, python-format
6862
msgid "%d conflicts encountered."
6863
msgstr ""
6864
6865
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6866
msgid "Preparing file merge"
6867
msgstr ""
6868
6869
#: bzrlib/multiparent.py:426
6870
msgid "Importing revisions"
6871
msgstr ""
6872
6873
#: bzrlib/option.py:526
6874
msgid "Show help message."
6875
msgstr ""
6876
6877
#: bzrlib/option.py:528
6878
msgid "Only display errors and warnings."
6879
msgstr ""
6880
6881
#: bzrlib/option.py:531
6882
msgid "Show usage message and options."
6883
msgstr ""
6884
6885
#: bzrlib/option.py:533
6886
msgid "Display more information."
6887
msgstr ""
6888
6889
#: bzrlib/option.py:541
6890
msgid ""
6891
"Select changes introduced by the specified revision. See also \"help "
6892
"revisionspec\"."
6893
msgstr ""
6894
6895
#: bzrlib/option.py:543
6896
msgid "Branch to operate on, instead of working directory."
6897
msgstr ""
6898
6899
#: bzrlib/option.py:545
6900
msgid "Detailed log format."
6901
msgstr ""
6902
6903
#: bzrlib/option.py:545
6904
msgid "Format used by GNU ChangeLog files."
6905
msgstr ""
6906
6907
#: bzrlib/option.py:545
6908
msgid "Log format with one line per revision."
6909
msgstr ""
6910
6911
#: bzrlib/option.py:545
6912
msgid "Moderately short log format."
6913
msgstr ""
6914
6915
#: bzrlib/option.py:545
6916
msgid "Use specified log format."
6917
msgstr ""
6918
6919
#: bzrlib/option.py:547
6920
msgid "Log format"
6921
msgstr ""
6922
6923
#: bzrlib/option.py:549
6924
msgid "LCA-newness merge."
6925
msgstr ""
6926
6927
#: bzrlib/option.py:549
6928
msgid "Merge using external diff3."
6929
msgstr ""
6930
6931
#: bzrlib/option.py:549
6932
msgid "Native diff3-style merge."
6933
msgstr ""
6934
6935
#: bzrlib/option.py:549
6936
msgid "Select a particular merge algorithm."
6937
msgstr ""
6938
6939
#: bzrlib/option.py:549
6940
msgid "Weave-based merge."
6941
msgstr ""
6942
6943
#: bzrlib/option.py:551
6944
msgid "Merge algorithm"
6945
msgstr ""
6946
6947
#: bzrlib/option.py:554
6948
msgid "Message string."
6949
msgstr ""
6950
6951
#: bzrlib/option.py:556
6952
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6953
msgstr ""
6954
6955
#: bzrlib/option.py:558
6956
msgid "Ignore differences between branches and overwrite unconditionally."
6957
msgstr ""
6958
6959
#: bzrlib/option.py:560
6960
msgid "Remember the specified location as a default."
6961
msgstr ""
6962
6963
#: bzrlib/option.py:562
6964
msgid "Reprocess to reduce spurious conflicts."
6965
msgstr ""
6966
6967
#: bzrlib/option.py:566
6968
msgid "See \"help revisionspec\" for details."
6969
msgstr ""
6970
6971
#: bzrlib/option.py:568
6972
msgid "Show internal object ids."
6973
msgstr ""
6974
6975
#: bzrlib/option.py:571
6976
msgid "Display timezone as local, original, or utc."
6977
msgstr ""
6978
6979
#: bzrlib/osutils.py:100
6980
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6981
msgstr ""
6982
6983
#: bzrlib/osutils.py:220
6984
msgid "lstat/stat of ({0!r}): {1!r}"
6985
msgstr ""
6986
6987
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6988
#, python-format
6989
msgid "sorry, %r not allowed in path"
6990
msgstr ""
6991
6992
#: bzrlib/osutils.py:1226
6993
#, python-format
6994
msgid "%r is too short to calculate a relative path"
6995
msgstr ""
6996
6997
#: bzrlib/plugin.py:143
6998
#, python-format
6999
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
7000
msgstr ""
7001
7002
#: bzrlib/plugins/bash_completion/bashcomp.py:411
7003
msgid "Enable completions for the selected plugin (default: all plugins)"
7004
msgstr ""
7005
7006
#: bzrlib/plugins/bash_completion/bashcomp.py:412
7007
msgid "Generate a shell function for bash command line completion."
7008
msgstr ""
7009
7010
#: bzrlib/plugins/bash_completion/bashcomp.py:414
7011
msgid ""
7012
"This command generates a shell function which can be used by bash to\n"
7013
"automatically complete the currently typed command when the user presses\n"
7014
"the completion key (usually tab)."
7015
msgstr ""
7016
7017
#: bzrlib/plugins/bash_completion/bashcomp.py:418
7018
msgid ""
7019
"Commonly used like this:\n"
7020
" eval \"`bzr bash-completion`\""
7021
msgstr ""
7022
7023
#: bzrlib/plugins/bash_completion/bashcomp.py:424
7024
msgid "Name of the generated function (default: _bzr)"
7025
msgstr ""
7026
7027
#: bzrlib/plugins/bash_completion/bashcomp.py:426
7028
msgid "Generate only the shell function, don't enable it"
7029
msgstr ""
7030
7031
#: bzrlib/plugins/launchpad/__init__.py:81
7032
msgid "Register a branch with launchpad.net."
7033
msgstr ""
7034
7035
#: bzrlib/plugins/launchpad/__init__.py:83
7036
msgid ""
7037
"This command lists a bzr branch in the directory of branches on\n"
7038
"launchpad.net. Registration allows the branch to be associated with\n"
7039
"bugs or specifications."
7040
msgstr ""
7041
7042
#: bzrlib/plugins/launchpad/__init__.py:87
7043
msgid ""
7044
"Before using this command you must register the project to which the\n"
7045
"branch belongs, and create an account for yourself on launchpad.net."
7046
msgstr ""
7047
7048
#: bzrlib/plugins/launchpad/__init__.py:90
7049
msgid ""
7050
"arguments:\n"
7051
" public_url: The publicly visible url for the branch to register.\n"
7052
" This must be an http or https url (which Launchpad can read\n"
7053
" from to access the branch). Local file urls, SFTP urls, and\n"
7054
" bzr+ssh urls will not work.\n"
7055
" If no public_url is provided, bzr will use the configured\n"
7056
" public_url if there is one for the current branch, and\n"
7057
" otherwise error."
7058
msgstr ""
7059
7060
#: bzrlib/plugins/launchpad/__init__.py:99
7061
msgid ""
7062
"example:\n"
7063
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7064
" --project fooproject"
7065
msgstr ""
7066
7067
#: bzrlib/plugins/launchpad/__init__.py:106
7068
msgid "Launchpad project short name to associate with the branch."
7069
msgstr ""
7070
7071
#: bzrlib/plugins/launchpad/__init__.py:113
7072
msgid ""
7073
"Short name for the branch; by default taken from the last component of the "
7074
"url."
7075
msgstr ""
7076
7077
#: bzrlib/plugins/launchpad/__init__.py:117
7078
msgid "One-sentence description of the branch."
7079
msgstr ""
7080
7081
#: bzrlib/plugins/launchpad/__init__.py:120
7082
msgid "Longer description of the purpose or contents of the branch."
7083
msgstr ""
7084
7085
#: bzrlib/plugins/launchpad/__init__.py:123
7086
msgid "Branch author's email address, if not yourself."
7087
msgstr ""
7088
7089
#: bzrlib/plugins/launchpad/__init__.py:126
7090
msgid "The bug this branch fixes."
7091
msgstr ""
7092
7093
#: bzrlib/plugins/launchpad/__init__.py:129
7094
msgid "Prepare the request but don't actually send it."
7095
msgstr ""
7096
7097
#: bzrlib/plugins/launchpad/__init__.py:151
7098
msgid ""
7099
"register-branch requires a public branch url - see bzr help register-branch."
7100
msgstr ""
7101
7102
#: bzrlib/plugins/launchpad/__init__.py:159
7103
msgid "--product is deprecated; please use --project."
7104
msgstr ""
7105
7106
#: bzrlib/plugins/launchpad/__init__.py:191
7107
msgid "Open a Launchpad branch page in your web browser."
7108
msgstr ""
7109
7110
#: bzrlib/plugins/launchpad/__init__.py:196
7111
msgid "Do not actually open the browser. Just say the URL we would use."
7112
msgstr ""
7113
7114
#: bzrlib/plugins/launchpad/__init__.py:231
7115
#, python-format
7116
msgid "Opening %s in web browser"
7117
msgstr ""
7118
7119
#: bzrlib/plugins/launchpad/__init__.py:241
7120
msgid "Show or set the Launchpad user ID."
7121
msgstr ""
7122
7123
#: bzrlib/plugins/launchpad/__init__.py:243
7124
msgid ""
7125
"When communicating with Launchpad, some commands need to know your\n"
7126
"Launchpad user ID. This command can be used to set or show the\n"
7127
"user ID that Bazaar will use for such communication."
7128
msgstr ""
7129
7130
#: bzrlib/plugins/launchpad/__init__.py:247
7131
msgid ""
7132
":Examples:\n"
7133
" Show the Launchpad ID of the current user::"
7134
msgstr ""
7135
7136
#: bzrlib/plugins/launchpad/__init__.py:250
7137
msgid " bzr launchpad-login"
7138
msgstr ""
7139
7140
#: bzrlib/plugins/launchpad/__init__.py:252
7141
msgid " Set the Launchpad ID of the current user to 'bob'::"
7142
msgstr ""
7143
7144
#: bzrlib/plugins/launchpad/__init__.py:254
7145
msgid " bzr launchpad-login bob"
7146
msgstr ""
7147
7148
#: bzrlib/plugins/launchpad/__init__.py:261
7149
msgid "Don't check that the user name is valid."
7150
msgstr ""
7151
7152
#: bzrlib/plugins/launchpad/__init__.py:276
7153
#: bzrlib/plugins/launchpad/__init__.py:287
7154
msgid "Launchpad user ID exists and has SSH keys.\n"
7155
msgstr ""
7156
7157
#: bzrlib/plugins/launchpad/__init__.py:279
7158
msgid "No Launchpad user ID configured.\n"
7159
msgstr ""
7160
7161
#: bzrlib/plugins/launchpad/__init__.py:290
7162
#, python-format
7163
msgid "Launchpad user ID set to '%s'.\n"
7164
msgstr ""
7165
7166
#: bzrlib/plugins/launchpad/__init__.py:298
7167
msgid "Ask Launchpad to mirror a branch now."
7168
msgstr ""
7169
7170
#: bzrlib/plugins/launchpad/__init__.py:318
7171
msgid "Propose merging a branch on Launchpad."
7172
msgstr ""
7173
7174
#: bzrlib/plugins/launchpad/__init__.py:320
7175
msgid ""
7176
"This will open your usual editor to provide the initial comment. When it\n"
7177
"has created the proposal, it will open it in your default web browser."
7178
msgstr ""
7179
7180
#: bzrlib/plugins/launchpad/__init__.py:323
7181
msgid ""
7182
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7183
"is not supplied, the remembered submit branch will be used. If no submit\n"
7184
"branch is remembered, the development focus will be used."
7185
msgstr ""
7186
7187
#: bzrlib/plugins/launchpad/__init__.py:327
7188
msgid ""
7189
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7190
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7191
"The parameter the launchpad account name of the desired reviewer. This\n"
7192
"may optionally be followed by '=' and the review type. For example:"
7193
msgstr ""
7194
7195
#: bzrlib/plugins/launchpad/__init__.py:332
7196
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7197
msgstr ""
7198
7199
#: bzrlib/plugins/launchpad/__init__.py:334
7200
msgid ""
7201
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7202
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7203
msgstr ""
7204
7205
#: bzrlib/plugins/launchpad/__init__.py:339
7206
msgid "Propose the merge on staging."
7207
msgstr ""
7208
7209
#: bzrlib/plugins/launchpad/__init__.py:341
7210
msgid "Commit message."
7211
msgstr ""
7212
7213
#: bzrlib/plugins/launchpad/__init__.py:343
7214
msgid "Mark the proposal as approved immediately."
7215
msgstr ""
7216
7217
#: bzrlib/plugins/launchpad/__init__.py:345
7218
msgid "Requested reviewer and optional type."
7219
msgstr ""
7220
7221
#: bzrlib/plugins/launchpad/__init__.py:382
7222
msgid "Find the proposal to merge this revision."
7223
msgstr ""
7224
7225
#: bzrlib/plugins/launchpad/__init__.py:384
7226
msgid ""
7227
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7228
"This works only if the selected branch was the merge proposal target, and\n"
7229
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7230
"are opened in a web browser."
7231
msgstr ""
7232
7233
#: bzrlib/plugins/launchpad/__init__.py:389
7234
msgid ""
7235
"Any revision involved in the merge may be specified-- the revision in\n"
7236
"which the merge was performed, or one of the revisions that was merged."
7237
msgstr ""
7238
7239
#: bzrlib/plugins/launchpad/__init__.py:392
7240
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7241
msgstr ""
7242
7243
#: bzrlib/plugins/launchpad/__init__.py:394
7244
msgid " bzr lp-find-proposal -r annotate:README:1"
7245
msgstr ""
7246
7247
#: bzrlib/plugins/launchpad/__init__.py:409
7248
msgid "No review found."
7249
msgstr ""
7250
7251
#: bzrlib/plugins/launchpad/__init__.py:410
7252
#, python-format
7253
msgid "%d proposals(s) found."
7254
msgstr ""
7255
7256
#: bzrlib/plugins/launchpad/__init__.py:420
7257
msgid "Finding revision-id"
7258
msgstr ""
7259
7260
#: bzrlib/plugins/launchpad/__init__.py:427
7261
msgid "Finding merge"
7262
msgstr ""
7263
7264
#: bzrlib/plugins/launchpad/__init__.py:432
7265
msgid "Finding revno"
7266
msgstr ""
7267
7268
#: bzrlib/plugins/launchpad/__init__.py:437
7269
msgid "Finding Launchpad branch"
7270
msgstr ""
7271
7272
#: bzrlib/plugins/launchpad/__init__.py:440
7273
msgid "Finding proposals"
7274
msgstr ""
7275
7276
#: bzrlib/plugins/launchpad/account.py:66
7277
msgid "Setting ssh/sftp usernames for launchpad.net."
7278
msgstr ""
7279
7280
#: bzrlib/plugins/launchpad/lp_api.py:241
7281
#: bzrlib/plugins/launchpad/lp_api.py:246
7282
#, python-format
7283
msgid "%s is not registered on Launchpad"
7284
msgstr ""
7285
7286
#: bzrlib/plugins/launchpad/lp_api.py:256
7287
#, python-format
7288
msgid "%s has no development focus."
7289
msgstr ""
7290
7291
#: bzrlib/plugins/launchpad/lp_api.py:261
7292
#, python-format
7293
msgid "development focus %s has no branch."
7294
msgstr ""
7295
7296
#: bzrlib/plugins/launchpad/lp_api.py:266
7297
#, python-format
7298
msgid "source package %s has no branch."
7299
msgstr ""
7300
7301
#: bzrlib/plugins/launchpad/lp_api.py:270
7302
#, python-format
7303
msgid "%s has no associated product or source package."
7304
msgstr ""
7305
7306
#: bzrlib/plugins/launchpad/lp_api.py:282
7307
#, python-format
7308
msgid "%s is already up-to-date."
7309
msgstr ""
7310
7311
#: bzrlib/plugins/launchpad/lp_api.py:289
7312
#, python-format
7313
msgid "Pushing to %s"
7314
msgstr ""
7315
7316
#: bzrlib/plugins/launchpad/lp_directory.py:170
7317
msgid ""
7318
"resolution for {0}\n"
7319
" local: {1}\n"
7320
" remote: {2}"
7321
msgstr ""
7322
7323
#: bzrlib/plugins/launchpad/lp_propose.py:149
7324
#, python-format
7325
msgid "There is already a branch merge proposal: %s"
7326
msgstr ""
7327
7328
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7329
msgid "pb parameter to convert() is deprecated"
7330
msgstr ""
7331
7332
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7333
msgid "starting upgrade from format 4 to 5"
7334
msgstr ""
7335
7336
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7337
msgid "note: upgrade may be faster if all store files are ungzipped first"
7338
msgstr ""
7339
7340
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7341
msgid "converting revision"
7342
msgstr ""
7343
7344
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7345
msgid "upgraded to weaves:"
7346
msgstr ""
7347
7348
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7349
#, python-format
7350
msgid "%6d revisions and inventories"
7351
msgstr ""
7352
7353
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7354
#, python-format
7355
msgid "%6d revisions not present"
7356
msgstr ""
7357
7358
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7359
#, python-format
7360
msgid "%6d texts"
7361
msgstr ""
7362
7363
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7364
msgid "writing weave"
7365
msgstr ""
7366
7367
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7368
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7369
msgid "inventory"
7370
msgstr ""
7371
7372
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7373
msgid "write revision"
7374
msgstr ""
7375
7376
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7377
msgid "loading revision"
7378
msgstr ""
7379
7380
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7381
#, python-format
7382
msgid "revision {%s} not present in branch; will be converted as a ghost"
7383
msgstr ""
7384
7385
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7386
msgid "starting upgrade from format 5 to 6"
7387
msgstr ""
7388
7389
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7390
#, python-format
7391
msgid "adding prefixes to %s"
7392
msgstr ""
7393
7394
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7395
msgid "starting upgrade from format 6 to metadir"
7396
msgstr ""
7397
7398
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7399
msgid "Removing ancestry.weave"
7400
msgstr ""
7401
7402
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7403
msgid "Finding branch files"
7404
msgstr ""
7405
7406
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7407
msgid "Upgrading repository"
7408
msgstr ""
7409
7410
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7411
msgid "Upgrading branch"
7412
msgstr ""
7413
7414
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7415
msgid "No working tree."
7416
msgstr ""
7417
7418
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7419
msgid "Upgrading working tree"
7420
msgstr ""
7421
7422
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7423
#, python-format
7424
msgid "Make %s lock"
7425
msgstr ""
7426
7427
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7428
#, python-format
7429
msgid "Moving %s"
7430
msgstr ""
7431
7432
#: bzrlib/push.py:56
7433
msgid "Created new branch."
7434
msgstr ""
7435
7436
#: bzrlib/push.py:98
7437
#, python-format
7438
msgid ""
7439
"Target directory %s already contains a .bzr directory, but it is not valid."
7440
msgstr ""
7441
7442
#: bzrlib/push.py:101
7443
#, python-format
7444
msgid ""
7445
"Target directory %s already exists, but does not have a .bzr directory. "
7446
"Supply --use-existing-dir to push there anyway."
7447
msgstr ""
7448
7449
#: bzrlib/push.py:122
7450
#, python-format
7451
msgid "Too many redirections trying to make %s."
7452
msgstr ""
7453
7454
#: bzrlib/push.py:147
7455
msgid ""
7456
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7457
"information."
7458
msgstr ""
7459
7460
#: bzrlib/push.py:151
7461
#, python-format
7462
msgid ""
7463
"It is not possible to losslessly push to %s. You may want to use dpush "
7464
"instead."
7465
msgstr ""
7466
7467
#: bzrlib/push.py:157
7468
#, python-format
7469
msgid ""
7470
"At %s you have a valid .bzr control directory, but not a branch or "
7471
"repository. This is an unsupported configuration. Please move the target "
7472
"directory out of the way and try again."
7473
msgstr ""
7474
7475
#: bzrlib/reconcile.py:97
7476
#, python-format
7477
msgid "Reconciling branch %s"
7478
msgstr ""
7479
7480
#: bzrlib/reconcile.py:103
7481
#, python-format
7482
msgid "Reconciling repository %s"
7483
msgstr ""
7484
7485
#: bzrlib/reconcile.py:105
7486
msgid "Reconciling repository"
7487
msgstr ""
7488
7489
#: bzrlib/reconcile.py:111
7490
#, python-format
7491
msgid "%s cannot canonicalize CHKs."
7492
msgstr ""
7493
7494
#: bzrlib/reconcile.py:119
7495
msgid "Reconcile aborted: revision index has inconsistent parents."
7496
msgstr ""
7497
7498
#: bzrlib/reconcile.py:121
7499
msgid "Run \"bzr check\" for more details."
7500
msgstr "Для подробностей запустите «bzr check»."
7501
7502
#: bzrlib/reconcile.py:123
7503
msgid "Reconciliation complete."
7504
msgstr ""
7505
7506
#: bzrlib/reconcile.py:166
7507
msgid "Fixing last revision info {0} => {1}"
7508
msgstr "Исправление информации последней ревизии {0} => {1}"
7509
7510
#: bzrlib/reconcile.py:173
7511
msgid "revision_history ok."
7512
msgstr ""
7513
7514
#: bzrlib/reconcile.py:234
7515
msgid "Reading inventory data"
7516
msgstr "Чтение данных инвентаря"
7517
7518
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7519
msgid "Inventory ok."
7520
msgstr ""
7521
7522
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7523
msgid "Backing up inventory"
7524
msgstr "Создание резервного инвентаря"
7525
7526
#: bzrlib/reconcile.py:258
7527
msgid "Backup inventory created."
7528
msgstr "Резервный инвентарь создан."
7529
7530
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7531
msgid "Writing weave"
7532
msgstr ""
7533
7534
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7535
msgid "Inventory regenerated."
7536
msgstr "Инвентарь восстановлен."
7537
7538
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7539
msgid "Reading indexes"
7540
msgstr "Чтение индексов"
7541
7542
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7543
msgid "Checking unused inventories"
7544
msgstr "Проверка неиспользуемых инвентарей"
7545
7546
#: bzrlib/reconcile.py:388
7547
msgid "Backup Inventory created"
7548
msgstr "Резервный инвентарь создан"
7549
7550
#: bzrlib/reconcile.py:446
7551
msgid "Fixing text parents"
7552
msgstr ""
7553
7554
#: bzrlib/reconfigure.py:54
7555
msgid "{0} is now stacked on {1}\n"
7556
msgstr "{0}теперь на стеке {1}\n"
7557
7558
#: bzrlib/reconfigure.py:69
7559
#, python-format
7560
msgid "%s is now not stacked\n"
7561
msgstr "%s теперь не на стеке\n"
7562
7563
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7564
#, python-format
7565
msgid "bzr: ERROR (ignored): %s"
7566
msgstr "bzr: ОШИБКА (игнорирована): %s"
7567
7568
#: bzrlib/remote.py:2493
7569
msgid "Copying repository content as tarball..."
7570
msgstr "Копирование содержимого репозитория в тарбол..."
7571
7572
#: bzrlib/rename_map.py:69
7573
msgid "Calculating hashes"
7574
msgstr "Вычисление хешей"
7575
7576
#: bzrlib/rename_map.py:107
7577
msgid "Determining hash hits"
7578
msgstr "Определение столкновений хешей"
7579
7580
#: bzrlib/rename_map.py:242
7581
msgid "{0} => {1}"
7582
msgstr "{0} => {1}"
7583
7584
#: bzrlib/repository.py:1787
7585
msgid "Moving repository to repository.backup"
7586
msgstr "Перемещение репозитория в repository.backup"
7587
7588
#: bzrlib/repository.py:1794
7589
msgid "Creating new repository"
7590
msgstr "Создание нового репозитория"
7591
7592
#: bzrlib/repository.py:1799
7593
msgid "Copying content"
7594
msgstr "Копирование содержимого"
7595
7596
#: bzrlib/repository.py:1803
7597
msgid "Deleting old repository content"
7598
msgstr "Удаление старого содержимого репозитория"
7599
7600
#: bzrlib/repository.py:1805
7601
msgid "repository converted"
7602
msgstr "репозиторий преобразован"
7603
7604
#: bzrlib/revisionspec.py:903
7605
msgid "Using {0} {1}"
7606
msgstr "Используется {0} {1}"
7607
7608
#: bzrlib/send.py:58
7609
#, python-format
7610
msgid "Mail client \"%s\" does not support specifying body"
7611
msgstr "Почтовый клиент «%s» не поддерживает определение тела"
7612
7613
#: bzrlib/send.py:62
7614
msgid "--remember requires a branch to be specified."
7615
msgstr "--remember требует указания ветви."
7616
7617
#: bzrlib/send.py:77
7618
msgid "No submit branch known or specified"
7619
msgstr "Ветвь для отсылки неизвестна и не задана"
7620
7621
#: bzrlib/send.py:80
7622
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7623
msgstr ""
7624
"Используется сохранённое {0} местоположение «{1}» для определения изменений, "
7625
"которые необходимо отправить."
7626
7627
#: bzrlib/send.py:98
7628
#, python-format
7629
msgid "No such send format '%s'."
7630
msgstr "Нет такого формата отправки '%s'."
7631
7632
#: bzrlib/send.py:114
7633
msgid "bzr send takes at most two one revision identifiers"
7634
msgstr "bzr send принимает не более двух идентификаторов ревизии"
7635
7636
#: bzrlib/send.py:127
7637
msgid "No revisions to submit."
7638
msgstr "Нет ревизий для отправки."
7639
7640
#: bzrlib/send.py:139
7641
msgid ""
7642
"- not supported for merge directives that use more than one output file."
7643
msgstr ""
7644
"- не поддерживается для директив merge, которые используют более, чем один "
7645
"файл вывода."
7646
7647
#: bzrlib/send.py:185
7648
msgid "Format 0.9 does not permit bundle with no patch"
7649
msgstr "Формат 0.9 не разрешает пакеты без патчей"
7650
7651
#: bzrlib/shelf_ui.py:46
7652
#, python-format
7653
msgid "Shelve adding file \"%(path)s\"?"
7654
msgstr "Отложить добавление файла «%(path)s»?"
7655
7656
#: bzrlib/shelf_ui.py:47
7657
msgid "Shelve binary changes?"
7658
msgstr "Отложить двоичные изменения?"
7659
7660
#: bzrlib/shelf_ui.py:48
7661
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7662
msgstr "Отложить изменение «%s» из %(other)s в %(this)s?"
7663
7664
#: bzrlib/shelf_ui.py:50
7665
#, python-format
7666
msgid "Shelve removing file \"%(path)s\"?"
7667
msgstr "Отложить удаление файла «%(path)s»?"
7668
7669
#: bzrlib/shelf_ui.py:51
7670
#, python-format
7671
msgid "Shelve %d change(s)?"
7672
msgstr "Отложить %d изменений?"
7673
7674
#: bzrlib/shelf_ui.py:52
7675
msgid "Shelve?"
7676
msgstr "Отложить?"
7677
7678
#: bzrlib/shelf_ui.py:53
7679
#, python-format
7680
msgid ""
7681
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7682
msgstr "Отложить изменение цели «%(path)s» из «%(other)s» в «%(this)s»?"
7683
7684
#: bzrlib/shelf_ui.py:55
7685
#, python-format
7686
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7687
msgstr "Отложить переименование «%(other)s» => «%(this)s»?"
7688
7689
#: bzrlib/shelf_ui.py:70
7690
#, python-format
7691
msgid "Changes shelved with id \"%d\"."
7692
msgstr "Изменения отложены с id «%d»."
7693
7694
#: bzrlib/shelf_ui.py:74
7695
msgid "Selected changes destroyed."
7696
msgstr "Выбранные изменения уничтожены."
7697
7698
#: bzrlib/shelf_ui.py:78
7699
msgid "Selected changes:"
7700
msgstr "Выбранные изменения:"
7701
7702
#: bzrlib/shelf_ui.py:98
7703
#, python-format
7704
msgid "Delete file \"%(path)s\"?"
7705
msgstr "Удалить файл «%(path)s»?"
7706
7707
#: bzrlib/shelf_ui.py:99
7708
msgid "Apply binary changes?"
7709
msgstr "Применить двоичные изменения?"
7710
7711
#: bzrlib/shelf_ui.py:100
7712
#, python-format
7713
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7714
msgstr "Изменить «%(path)s» с %(this)s на %(other)s?"
7715
7716
#: bzrlib/shelf_ui.py:102
7717
#, python-format
7718
msgid "Add file \"%(path)s\"?"
7719
msgstr "Добавить файл «%(path)s»?"
7720
7721
#: bzrlib/shelf_ui.py:103
7722
#, python-format
7723
msgid "Apply %d change(s)?"
7724
msgstr "Применить %d изменений?"
7725
7726
#: bzrlib/shelf_ui.py:104
7727
msgid "Apply change?"
7728
msgstr "Применить изменение?"
7729
7730
#: bzrlib/shelf_ui.py:105
7731
#, python-format
7732
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7733
msgstr "Изменить цель «%(path)s» с «%(this)s» на «%(other)s»?"
7734
7735
#: bzrlib/shelf_ui.py:107
7736
#, python-format
7737
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7738
msgstr "Переименовать «%(this)s» => «%(other)s»?"
7739
7740
#: bzrlib/shelf_ui.py:402
7741
msgid "No changes are shelved."
7742
msgstr "Нет отложенных изменений."
7743
7744
#: bzrlib/shelf_ui.py:460
7745
#, python-format
7746
msgid "Using changes with id \"%d\"."
7747
msgstr "Используются изменения с id «%d»."
7748
7749
#: bzrlib/shelf_ui.py:464
7750
#, python-format
7751
msgid "Message: %s"
7752
msgstr "Сообщение: %s"
7753
7754
#: bzrlib/shelf_ui.py:476
7755
#, python-format
7756
msgid "Deleted changes with id \"%d\"."
7757
msgstr "Удалены изменения с id «%d»."
7758
7759
#: bzrlib/smart/medium.py:714
7760
msgid "HPSS calls: {0} ({1} vfs) {2}"
7761
msgstr "Вызовы HPSS: {0} ({1} vfs) {2}"
7762
7763
#: bzrlib/smart/server.py:169
7764
msgid "Requested to stop gracefully"
7765
msgstr ""
7766
7767
#: bzrlib/smart/server.py:179
7768
#, python-format
7769
msgid "Waiting for %d client(s) to finish"
7770
msgstr ""
7771
7772
#: bzrlib/smart/server.py:185
7773
#, python-format
7774
msgid "Still waiting for %d client(s) to finish"
7775
msgstr ""
7776
7777
#: bzrlib/smart/server.py:219
7778
#, python-format
7779
msgid "listening socket error: %s"
7780
msgstr ""
7781
7782
#: bzrlib/smart/server.py:452
7783
#, python-format
7784
msgid "listening on port: %s"
7785
msgstr "слушаю на порту: %s"
7786
7787
#: bzrlib/switch.py:69
7788
msgid "Pending merges must be committed or reverted before using switch."
7789
msgstr ""
7790
7791
#: bzrlib/switch.py:96
7792
msgid ""
7793
"Cannot switch as local commits found in the checkout. Commit these to the "
7794
"bound branch or use --force to throw them away."
7795
msgstr ""
7796
7797
#: bzrlib/switch.py:101
7798
#, python-format
7799
msgid ""
7800
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7801
"anyway, use --force."
7802
msgstr ""
7803
"Не удалось соединиться с текущей основной ветвью %(target)s: %(error)s Для "
7804
"принудительного переключения используйте --force."
7805
7806
#: bzrlib/switch.py:110
7807
msgid "Cannot switch a branch, only a checkout."
7808
msgstr ""
7809
7810
#: bzrlib/switch.py:146
7811
#, python-format
7812
msgid "Tree is up to date at revision %d."
7813
msgstr "Дерево в актуальной ревизии %d."
7814
7815
#: bzrlib/switch.py:152
7816
#, python-format
7817
msgid "Updated to revision %d."
7818
msgstr "Обновлено до ревизии %d."
7819
7820
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7821
msgid "Apply phase"
7822
msgstr "Применить фазу"
7823
7824
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7825
msgid "removing file"
7826
msgstr "удаление файла"
7827
7828
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7829
msgid "adding file"
7830
msgstr "добавление файла"
7831
7832
#: bzrlib/transform.py:2587
7833
msgid "Building tree"
7834
msgstr "Построение дерева"
7835
7836
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7837
msgid "Adding file contents"
7838
msgstr "Добавление содержимого файлй"
7839
7840
#: bzrlib/transform.py:3024
7841
msgid "Resolution pass"
7842
msgstr ""
7843
7844
#: bzrlib/transport/ftp/_gssapi.py:88
7845
#, python-format
7846
msgid "Authenticated as %s"
7847
msgstr ""
7848
7849
#: bzrlib/tree.py:634
7850
msgid "*** {0} content-filter: {1} => {2!r}"
7851
msgstr "*** {0} content-filter: {1} => {2!r}"
7852
7853
#: bzrlib/upgrade.py:77
7854
#, python-format
7855
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7856
msgstr "Это рабочая копия. Ветвь (%s) необходимо обновлять отдельно."
7857
7858
#: bzrlib/upgrade.py:100
7859
#, python-format
7860
msgid "cannot upgrade from bzrdir format %s"
7861
msgstr "нельзя обновить из формата bzrdir %s"
7862
7863
#: bzrlib/upgrade.py:103
7864
#, python-format
7865
msgid "starting upgrade of %s"
7866
msgstr "начинается обновление %s"
7867
7868
#: bzrlib/upgrade.py:110
7869
msgid "finished"
7870
msgstr "завершено"
7871
7872
#: bzrlib/upgrade.py:120
7873
msgid "Deleting backup.bzr"
7874
msgstr "Удаление backup.bzr"
7875
7876
#: bzrlib/upgrade.py:151
7877
msgid ""
7878
"\n"
7879
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7880
msgstr ""
7881
"\n"
7882
"СВОДКА: произведено {0} обновлений, {1} успешно, {2} неуспешно"
7883
7884
#: bzrlib/upgrade.py:208
7885
#, python-format
7886
msgid "Found %d dependent branches - upgrading ..."
7887
msgstr "Найдено %d зависящих ветвей - обновление ..."
7888
7889
#: bzrlib/upgrade.py:276
7890
msgid "Upgrading bzrdirs"
7891
msgstr "Обновление bzrdirs"
7892
7893
#: bzrlib/upgrade.py:282
7894
#, python-format
7895
msgid "Upgrading %s"
7896
msgstr "Обновление %s"
7897
7898
#: bzrlib/upgrade.py:283
7899
msgid "Upgrading {0} {1} ..."
7900
msgstr "Обновление {0} {1} ..."
7901
7902
#: bzrlib/upgrade.py:301
7903
msgid "Removing backup ..."
7904
msgstr "Удаление резервной копии ..."
7905
7906
#: bzrlib/upgrade.py:305
7907
msgid "failed to clean-up {0}: {1}"
7908
msgstr "не удалось очистить {0}: {1}"
7909
7910
#: bzrlib/vf_repository.py:1090
7911
msgid "inventories"
7912
msgstr ""
7913
7914
#: bzrlib/vf_repository.py:1116
7915
msgid "texts"
7916
msgstr ""
7917
7918
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7919
msgid "Calculating text parents"
7920
msgstr ""
7921
7922
#: bzrlib/vf_repository.py:1706
7923
msgid "Fetch texts"
7924
msgstr ""
7925
7926
#: bzrlib/vf_repository.py:2535
7927
msgid "loading text store"
7928
msgstr ""
7929
7930
#: bzrlib/vf_repository.py:2541
7931
msgid "checking text graph"
7932
msgstr ""
7933
7934
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7935
#: bzrlib/vf_repository.py:3124
7936
msgid "Transferring revisions"
7937
msgstr ""
7938
7939
#: bzrlib/win32utils.py:146
7940
msgid "Failed to GetProcessMemoryInfo()"
7941
msgstr "Не удалось выполнить GetProcessMemoryInfo()"
7942
7943
#: bzrlib/win32utils.py:167
7944
msgid "Cannot debug memory on win32 without ctypes or win32process"
7945
msgstr ""
7946
"Невозможно производить отладку памяти на win32 без ctypes или win32process"
7947
7948
#: bzrlib/win32utils.py:172
7949
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7950
msgstr "WorkingSize {0:>7}КиБ\tPeakWorking {1:>7}КиБ\t{2}"
7951
7952
#: bzrlib/win32utils.py:180
7953
#, python-format
7954
msgid "WorkingSize %8d KiB"
7955
msgstr "WorkingSize %8d КиБ"
7956
7957
#: bzrlib/win32utils.py:181
7958
#, python-format
7959
msgid "PeakWorking %8d KiB"
7960
msgstr "PeakWorking %8d КиБ"
7961
7962
#: bzrlib/win32utils.py:182
7963
#, python-format
7964
msgid "PagefileUsage %8d KiB"
7965
msgstr "PagefileUsage %8d КиБ"
7966
7967
#: bzrlib/win32utils.py:183
7968
#, python-format
7969
msgid "PeakPagefileUsage %8d KiB"
7970
msgstr "PeakPagefileUsage %8d КиБ"
7971
7972
#: bzrlib/win32utils.py:185
7973
#, python-format
7974
msgid "PrivateUsage %8d KiB"
7975
msgstr "PrivateUsage %8d КиБ"
7976
7977
#: bzrlib/win32utils.py:186
7978
#, python-format
7979
msgid "PageFaultCount %8d"
7980
msgstr "PageFaultCount %8d"
7981
7982
#: bzrlib/workingtree.py:1478
7983
msgid "Rerun update after fixing the conflicts."
7984
msgstr "Снова запустите обновление после исправления конфликтов."
7985
7986
#: dummy/help_topics/authentication/summary.txt:1
7987
msgid "Information on configuring authentication"
7988
msgstr "Информация по настройке аутентификации"
7989
7990
#: dummy/help_topics/basic/detail.txt:1
7991
msgid ""
7992
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7993
"http://bazaar.canonical.com/"
7994
msgstr ""
7995
7996
#: dummy/help_topics/basic/detail.txt:4
7997
msgid ""
7998
"Basic commands:\n"
7999
" bzr init makes this directory a versioned branch\n"
8000
" bzr branch make a copy of another branch"
8001
msgstr ""
8002
"Базовые команды:\n"
8003
" bzr init превратить директорию в ветвь системы версий\n"
8004
" bzr branch создать копию другой ветви"
8005
8006
#: dummy/help_topics/basic/detail.txt:8
8007
msgid ""
8008
" bzr add make files or directories versioned\n"
8009
" bzr ignore ignore a file or pattern\n"
8010
" bzr mv move or rename a versioned file"
8011
msgstr ""
8012
" bzr add добавить файлы или директории к системе контроля "
8013
"версий\n"
8014
" bzr ignore игнорировать файл или шаблон\n"
8015
" bzr mv переместить или переименовать файл в системе контроля "
8016
"версий"
8017
8018
#: dummy/help_topics/basic/detail.txt:12
8019
msgid ""
8020
" bzr status summarize changes in working copy\n"
8021
" bzr diff show detailed diffs"
8022
msgstr ""
8023
" bzr status вывести краткие изменения в рабочей копии\n"
8024
" bzr diff вывести подробные различия"
8025
8026
#: dummy/help_topics/basic/detail.txt:15
8027
msgid ""
8028
" bzr merge pull in changes from another branch\n"
8029
" bzr commit save some or all changes\n"
8030
" bzr send send changes via email"
8031
msgstr ""
8032
" bzr merge принять изменения из другой ветви\n"
8033
" bzr commit сохранить некоторые или все изменения\n"
8034
" bzr send переслать изменения по электронной почте"
8035
8036
#: dummy/help_topics/basic/detail.txt:19
8037
msgid ""
8038
" bzr log show history of changes\n"
8039
" bzr check validate storage"
8040
msgstr ""
8041
" bzr log показать историю изменений\n"
8042
" bzr check проверить целостность"
8043
8044
#: dummy/help_topics/basic/detail.txt:22
8045
msgid ""
8046
" bzr help init more help on e.g. init command\n"
8047
" bzr help commands list all commands\n"
8048
" bzr help topics list all help topics\n"
8049
msgstr ""
8050
" bzr help init подробные сведения например по команде init\n"
8051
" bzr help commands вывести список всех команд\n"
8052
" bzr help topics вывести список всех разделов справки\n"
8053
8054
#: dummy/help_topics/basic/summary.txt:1
8055
msgid "Basic commands"
8056
msgstr "Базовые команды"
8057
8058
#: dummy/help_topics/branches/detail.txt:1
8059
msgid "Branches"
8060
msgstr "Ветви"
8061
8062
#: dummy/help_topics/branches/detail.txt:3
8063
msgid ""
8064
"A branch consists of the state of a project, including all of its\n"
8065
"history. All branches have a repository associated (which is where the\n"
8066
"branch history is stored), but multiple branches may share the same\n"
8067
"repository (a shared repository). Branches can be copied and merged."
8068
msgstr ""
8069
8070
#: dummy/help_topics/branches/detail.txt:8
8071
msgid ""
8072
"In addition, one branch may be bound to another one. Binding to another\n"
8073
"branch indicates that commits which happen in this branch must also \n"
8074
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
8075
"commits when the two branches are out of date. In order for a commit \n"
8076
"to succeed, it may be necessary to update the current branch using \n"
8077
"``bzr update``."
8078
msgstr ""
8079
8080
#: dummy/help_topics/branches/detail.txt:15
8081
#: dummy/help_topics/checkouts/detail.txt:66
8082
#: dummy/help_topics/repositories/detail.txt:36
8083
msgid "Related commands::"
8084
msgstr "Связанные команды::"
8085
8086
#: dummy/help_topics/branches/detail.txt:17
8087
msgid ""
8088
" init Change a directory into a versioned branch.\n"
8089
" branch Create a new branch that is a copy of an existing branch.\n"
8090
" merge Perform a three-way merge.\n"
8091
" bind Bind a branch to another one.\n"
8092
msgstr ""
8093
8094
#: dummy/help_topics/branches/summary.txt:1
8095
msgid "Information on what a branch is"
8096
msgstr "Информация о том, что такое ветвь"
8097
8098
#: dummy/help_topics/bugs/summary.txt:1
8099
msgid "Bug tracker settings"
8100
msgstr "Установки трекера ошибок"
8101
8102
#: dummy/help_topics/checkouts/detail.txt:1
8103
msgid "Checkouts"
8104
msgstr "Рабочие копии"
8105
8106
#: dummy/help_topics/checkouts/detail.txt:3
8107
msgid ""
8108
"Checkouts are source trees that are connected to a branch, so that when\n"
8109
"you commit in the source tree, the commit goes into that branch. They\n"
8110
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
8111
"Bazaar's decentralized features until you want them. Using checkouts\n"
8112
"with shared repositories is very similar to working with SVN or CVS, but\n"
8113
"doesn't have the same restrictions. And using checkouts still allows\n"
8114
"others working on the project to use whatever workflow they like."
8115
msgstr ""
8116
8117
#: dummy/help_topics/checkouts/detail.txt:11
8118
msgid ""
8119
"A checkout is created with the bzr checkout command (see \"help "
8120
"checkout\").\n"
8121
"You pass it a reference to another branch, and it will create a local copy\n"
8122
"for you that still contains a reference to the branch you created the\n"
8123
"checkout from (the master branch). Then if you make any commits they will "
8124
"be\n"
8125
"made on the other branch first. This creates an instant mirror of your work, "
8126
"or\n"
8127
"facilitates lockstep development, where each developer is working together,\n"
8128
"continuously integrating the changes of others."
8129
msgstr ""
8130
8131
#: dummy/help_topics/checkouts/detail.txt:19
8132
msgid ""
8133
"However the checkout is still a first class branch in Bazaar terms, so that\n"
8134
"you have the full history locally. As you have a first class branch you "
8135
"can\n"
8136
"also commit locally if you want, for instance due to the temporary loss af "
8137
"a\n"
8138
"network connection. Use the --local option to commit to do this. All the "
8139
"local\n"
8140
"commits will then be made on the master branch the next time you do a non-"
8141
"local\n"
8142
"commit."
8143
msgstr ""
8144
8145
#: dummy/help_topics/checkouts/detail.txt:26
8146
msgid ""
8147
"If you are using a checkout from a shared branch you will periodically want "
8148
"to\n"
8149
"pull in all the changes made by others. This is done using the \"update\"\n"
8150
"command. The changes need to be applied before any non-local commit, but\n"
8151
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8152
"command when needed."
8153
msgstr ""
8154
8155
#: dummy/help_topics/checkouts/detail.txt:32
8156
msgid ""
8157
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8158
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8159
"SVN checkout in that it is not a first class branch, it mainly consists of "
8160
"the\n"
8161
"working tree. This means that any history operations must query the master\n"
8162
"branch, which could be slow if a network connection is involved. Also, as "
8163
"you\n"
8164
"don't have a local branch, then you cannot commit locally."
8165
msgstr ""
8166
8167
#: dummy/help_topics/checkouts/detail.txt:39
8168
msgid ""
8169
"Lightweight checkouts work best when you have fast reliable access to the\n"
8170
"master branch. This means that if the master branch is on the same disk or "
8171
"LAN\n"
8172
"a lightweight checkout will be faster than a heavyweight one for any "
8173
"commands\n"
8174
"that modify the revision history (as only one copy of the branch needs to\n"
8175
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8176
"that uses the history but does not change it, but if the master branch is "
8177
"on\n"
8178
"the same disk then there won't be a noticeable difference."
8179
msgstr ""
8180
8181
#: dummy/help_topics/checkouts/detail.txt:47
8182
msgid ""
8183
"Another possible use for a checkout is to use it with a treeless repository\n"
8184
"containing your branches, where you maintain only one working tree by\n"
8185
"switching the master branch that the checkout points to when you want to\n"
8186
"work on a different branch."
8187
msgstr ""
8188
8189
#: dummy/help_topics/checkouts/detail.txt:52
8190
msgid ""
8191
"Obviously to commit on a checkout you need to be able to write to the "
8192
"master\n"
8193
"branch. This means that the master branch must be accessible over a "
8194
"writeable\n"
8195
"protocol , such as sftp://, and that you have write permissions at the "
8196
"other\n"
8197
"end. Checkouts also work on the local file system, so that all that matters "
8198
"is\n"
8199
"file permissions."
8200
msgstr ""
8201
8202
#: dummy/help_topics/checkouts/detail.txt:58
8203
msgid ""
8204
"You can change the master of a checkout by using the \"switch\" command "
8205
"(see\n"
8206
"\"help switch\"). This will change the location that the commits are sent "
8207
"to.\n"
8208
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8209
"checkout. If you would like to convert your heavy checkout into a normal\n"
8210
"branch so that every commit is local, you can use the \"unbind\" command. To "
8211
"see\n"
8212
"whether or not a branch is bound or not you can use the \"info\" command. If "
8213
"the\n"
8214
"branch is bound it will tell you the location of the bound branch."
8215
msgstr ""
8216
8217
#: dummy/help_topics/checkouts/detail.txt:68
8218
msgid ""
8219
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
8220
" checkout\n"
8221
" update Pull any changes in the master branch in to your checkout\n"
8222
" commit Make a commit that is sent to the master branch. If you have\n"
8223
" a heavy checkout then the --local option will commit to the\n"
8224
" checkout without sending the commit to the master\n"
8225
" switch Change the master branch that the commits in the checkout "
8226
"will\n"
8227
" be sent to\n"
8228
" bind Turn a standalone branch into a heavy checkout so that any\n"
8229
" commits will be sent to the master branch\n"
8230
" unbind Turn a heavy checkout into a standalone branch so that any\n"
8231
" commits are only made locally\n"
8232
" info Displays whether a branch is bound or unbound. If the branch "
8233
"is\n"
8234
" bound, then it will also display the location of the bound "
8235
"branch\n"
8236
msgstr ""
8237
8238
#: dummy/help_topics/checkouts/summary.txt:1
8239
msgid "Information on what a checkout is"
8240
msgstr "Информация о том, что такое рабочая копия"
8241
8242
#: dummy/help_topics/commands/summary.txt:1
8243
msgid "Basic help for all commands"
8244
msgstr "Базовая справка по всем командам"
8245
8246
#: dummy/help_topics/configuration/summary.txt:1
8247
msgid "Details on the configuration settings available"
8248
msgstr ""
8249
8250
#: dummy/help_topics/conflict-types/summary.txt:1
8251
msgid "Types of conflicts and what to do about them"
8252
msgstr ""
8253
8254
#: dummy/help_topics/content-filters/summary.txt:1
8255
msgid "Conversion of content into/from working trees"
8256
msgstr ""
8257
8258
#: dummy/help_topics/criss-cross/detail.txt:1
8259
msgid "Criss-Cross"
8260
msgstr ""
8261
8262
#: dummy/help_topics/criss-cross/detail.txt:3
8263
msgid ""
8264
"A criss-cross in the branch history can cause the default merge technique\n"
8265
"to emit more conflicts than would normally be expected."
8266
msgstr ""
8267
8268
#: dummy/help_topics/criss-cross/detail.txt:6
8269
msgid ""
8270
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
8271
"give\n"
8272
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
8273
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
8274
msgstr ""
8275
8276
#: dummy/help_topics/criss-cross/detail.txt:10
8277
msgid ""
8278
"Criss-crosses occur in a branch's history if two branches merge the same "
8279
"thing\n"
8280
"and then merge one another, or if two branches merge one another at the "
8281
"same\n"
8282
"time. They can be avoided by having each branch only merge from or into a\n"
8283
"designated central branch (a \"star topology\")."
8284
msgstr ""
8285
8286
#: dummy/help_topics/criss-cross/detail.txt:15
8287
msgid ""
8288
"Criss-crosses cause problems because of the way merge works. Bazaar's "
8289
"default\n"
8290
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8291
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
8292
"differences between THIS and OTHER are due to one side adding lines, or\n"
8293
"from another side removing lines."
8294
msgstr ""
8295
8296
#: dummy/help_topics/criss-cross/detail.txt:21
8297
msgid ""
8298
"Criss-crosses mean there is no good choice for a base. Selecting the "
8299
"recent\n"
8300
"merge points could cause one side's changes to be silently discarded.\n"
8301
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8302
"are emitted."
8303
msgstr ""
8304
8305
#: dummy/help_topics/criss-cross/detail.txt:26
8306
msgid ""
8307
"The ``weave`` merge type is not affected by this problem because it uses\n"
8308
"line-origin detection instead of a basis revision to determine the cause of\n"
8309
"differences.\n"
8310
msgstr ""
8311
8312
#: dummy/help_topics/criss-cross/summary.txt:1
8313
msgid "Information on criss-cross merging"
8314
msgstr ""
8315
8316
#: dummy/help_topics/current-formats/summary.txt:1
8317
msgid "Current storage formats"
8318
msgstr ""
8319
8320
#: dummy/help_topics/debug-flags/summary.txt:1
8321
msgid "Options to show or record debug information"
8322
msgstr ""
8323
8324
#: dummy/help_topics/diverged-branches/summary.txt:1
8325
msgid "How to fix diverged branches"
8326
msgstr "Как исправлять отклонения ветвей"
8327
8328
#: dummy/help_topics/env-variables/detail.txt:1
8329
msgid "Environment Variables"
8330
msgstr "Переменные окружения"
8331
8332
#: dummy/help_topics/env-variables/detail.txt:3
8333
msgid ""
8334
"=================== "
8335
"===========================================================\n"
8336
"BZRPATH Path where bzr is to look for shell plugin external\n"
8337
" commands.\n"
8338
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8339
"EMAIL E-Mail address of the user.\n"
8340
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8341
"EDITOR Editor for editing commit messages.\n"
8342
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8343
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8344
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8345
"BZR_PLUGIN_PATH.\n"
8346
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8347
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8348
"and\n"
8349
" HOME.\n"
8350
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8351
"URLs).\n"
8352
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8353
"sshcorp,\n"
8354
" plink or lsh.\n"
8355
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8356
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8357
"BZR_COLUMNS Override implicit terminal width.\n"
8358
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8359
"(selftest)\n"
8360
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8361
"'text'.\n"
8362
"BZR_PDB Control whether to launch a debugger on error.\n"
8363
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8364
" breakin debugger.\n"
8365
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8366
"(instead\n"
8367
" of char-based).\n"
8368
"=================== "
8369
"===========================================================\n"
8370
msgstr ""
8371
8372
#: dummy/help_topics/env-variables/summary.txt:1
8373
msgid "Environment variable names and values"
8374
msgstr "Имена и значения переменных окружения"
8375
8376
#: dummy/help_topics/eol/summary.txt:1
8377
msgid "Information on end-of-line handling"
8378
msgstr "Информация по обработке конца строки"
8379
8380
#: dummy/help_topics/files/detail.txt:1
8381
msgid "Files"
8382
msgstr "Файлы"
8383
8384
#: dummy/help_topics/files/detail.txt:3
8385
msgid ""
8386
":On Unix: ~/.bazaar/bazaar.conf\n"
8387
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8388
"bazaar\\\\2.0\\\\bazaar.conf"
8389
msgstr ""
8390
":В Unix: ~/.bazaar/bazaar.conf\n"
8391
":В Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8392
"bazaar\\\\2.0\\\\bazaar.conf"
8393
8394
#: dummy/help_topics/files/detail.txt:6
8395
msgid ""
8396
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8397
"used to define general configuration that will be applied everywhere.\n"
8398
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8399
"commonly used options."
8400
msgstr ""
8401
8402
#: dummy/help_topics/files/detail.txt:11
8403
msgid "A typical config file might look something like::"
8404
msgstr "Типичный файл конфигурации может выглядеть как::"
8405
8406
#: dummy/help_topics/files/detail.txt:13
8407
msgid ""
8408
" [DEFAULT]\n"
8409
" email=John Doe <jdoe@isp.com>"
8410
msgstr ""
8411
" [DEFAULT]\n"
8412
" email=John Doe <jdoe@isp.com>"
8413
8414
#: dummy/help_topics/files/detail.txt:16
8415
msgid ""
8416
" [ALIASES]\n"
8417
" commit = commit --strict\n"
8418
" log10 = log --short -r -10..-1\n"
8419
msgstr ""
8420
" [ALIASES]\n"
8421
" commit = commit --strict\n"
8422
" log10 = log --short -r -10..-1\n"
8423
8424
#: dummy/help_topics/files/summary.txt:1
8425
msgid "Information on configuration and log files"
8426
msgstr "Информация по файлам конфигурации и журналам"
8427
8428
#: dummy/help_topics/formats/detail.txt:1
8429
msgid "Storage Formats"
8430
msgstr ""
8431
8432
#: dummy/help_topics/formats/detail.txt:3
8433
msgid ""
8434
"To ensure that older clients do not access data incorrectly,\n"
8435
"Bazaar's policy is to introduce a new storage format whenever\n"
8436
"new features requiring new metadata are added. New storage\n"
8437
"formats may also be introduced to improve performance and\n"
8438
"scalability."
8439
msgstr ""
8440
8441
#: dummy/help_topics/formats/detail.txt:9
8442
msgid ""
8443
"The newest format, 2a, is highly recommended. If your\n"
8444
"project is not using 2a, then you should suggest to the\n"
8445
"project owner to upgrade."
8446
msgstr ""
8447
8448
#: dummy/help_topics/formats/detail.txt:13
8449
msgid ""
8450
"\n"
8451
".. note::"
8452
msgstr ""
8453
"\n"
8454
".. замечание::"
8455
8456
#: dummy/help_topics/formats/detail.txt:16
8457
msgid ""
8458
" Some of the older formats have two variants:\n"
8459
" a plain one and a rich-root one. The latter include an additional\n"
8460
" field about the root of the tree. There is no performance cost\n"
8461
" for using a rich-root format but you cannot easily merge changes\n"
8462
" from a rich-root format into a plain format. As a consequence,\n"
8463
" moving a project to a rich-root format takes some co-ordination\n"
8464
" in that all contributors need to upgrade their repositories\n"
8465
" around the same time. 2a and all future formats will be\n"
8466
" implicitly rich-root."
8467
msgstr ""
8468
8469
#: dummy/help_topics/formats/detail.txt:26
8470
msgid ""
8471
"See :doc:`current-formats-help` for the complete list of\n"
8472
"currently supported formats. See :doc:`other-formats-help` for\n"
8473
"descriptions of any available experimental and deprecated formats.\n"
8474
msgstr ""
8475
8476
#: dummy/help_topics/formats/summary.txt:1
8477
msgid "Information on choosing a storage format"
8478
msgstr ""
8479
8480
#: dummy/help_topics/global-options/detail.txt:1
8481
msgid "Global Options"
8482
msgstr "Общие настройки"
8483
8484
#: dummy/help_topics/global-options/detail.txt:3
8485
msgid ""
8486
"These options may be used with any command, and may appear in front of any\n"
8487
"command. (e.g. ``bzr --profile help``)."
8488
msgstr ""
8489
8490
#: dummy/help_topics/global-options/detail.txt:6
8491
msgid ""
8492
"--version Print the version number. Must be supplied before the "
8493
"command.\n"
8494
"--no-aliases Do not process command aliases when running this command.\n"
8495
"--builtin Use the built-in version of a command, not the plugin "
8496
"version.\n"
8497
" This does not suppress other plugin effects.\n"
8498
"--no-plugins Do not process any plugins.\n"
8499
"--no-l10n Do not translate messages.\n"
8500
"--concurrency Number of processes that can be run concurrently (selftest)."
8501
msgstr ""
8502
8503
#: dummy/help_topics/global-options/detail.txt:14
8504
msgid ""
8505
"--profile Profile execution using the hotshot profiler.\n"
8506
"--lsprof Profile execution using the lsprof profiler.\n"
8507
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8508
" results to a specified file. If the filename ends with "
8509
"\".txt\",\n"
8510
" text format will be used. If the filename either starts "
8511
"with\n"
8512
" \"callgrind.out\" or end with \".callgrind\", the output will "
8513
"be\n"
8514
" formatted for use with KCacheGrind. Otherwise, the output\n"
8515
" will be a pickle.\n"
8516
"--coverage Generate line coverage report in the specified directory."
8517
msgstr ""
8518
8519
#: dummy/help_topics/global-options/detail.txt:24
8520
msgid ""
8521
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8522
"for\n"
8523
" the duration of the command. This can be used multiple times "
8524
"if\n"
8525
" several options need to be overridden."
8526
msgstr ""
8527
8528
#: dummy/help_topics/global-options/detail.txt:28
8529
msgid ""
8530
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8531
"information on profiling."
8532
msgstr ""
8533
8534
#: dummy/help_topics/global-options/detail.txt:31
8535
msgid ""
8536
"A number of debug flags are also available to assist troubleshooting and\n"
8537
"development. See :doc:`debug-flags-help`.\n"
8538
msgstr ""
8539
8540
#: dummy/help_topics/global-options/summary.txt:1
8541
msgid "Options that control how Bazaar runs"
8542
msgstr "Настройки, управляющие запуском Bazaar"
8543
8544
#: dummy/help_topics/hidden-commands/summary.txt:1
8545
msgid "All hidden commands"
8546
msgstr "Все скрытые команды"
8547
8548
#: dummy/help_topics/hooks/summary.txt:1
8549
msgid "Points at which custom processing can be added"
8550
msgstr ""
8551
8552
#: dummy/help_topics/launchpad/detail.txt:1
8553
msgid "Integration with Launchpad.net"
8554
msgstr "Интеграция с Launchpad.net"
8555
8556
#: dummy/help_topics/launchpad/detail.txt:3
8557
msgid ""
8558
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8559
"specification tracking."
8560
msgstr ""
8561
8562
#: dummy/help_topics/launchpad/detail.txt:6
8563
msgid ""
8564
"The bzr client (through the plugin called 'launchpad') has special\n"
8565
"features to communicate with Launchpad:"
8566
msgstr ""
8567
8568
#: dummy/help_topics/launchpad/detail.txt:9
8569
msgid ""
8570
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8571
"This\n"
8572
" is then used by the 'lp:' transport to download your branches using\n"
8573
" bzr+ssh://."
8574
msgstr ""
8575
8576
#: dummy/help_topics/launchpad/detail.txt:13
8577
msgid ""
8578
" * The 'lp:' transport uses Launchpad as a directory service: for "
8579
"example\n"
8580
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8581
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8582
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8583
msgstr ""
8584
8585
#: dummy/help_topics/launchpad/detail.txt:18
8586
msgid ""
8587
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8588
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8589
"lp:12345'\n"
8590
" will record a revision property that marks that revision as fixing\n"
8591
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8592
" automatically be linked to the bug report."
8593
msgstr ""
8594
8595
#: dummy/help_topics/launchpad/detail.txt:24
8596
msgid ""
8597
" * The register-branch command tells Launchpad about the url of a\n"
8598
" public branch. Launchpad will then mirror the branch, display\n"
8599
" its contents and allow it to be attached to bugs and other\n"
8600
" objects."
8601
msgstr ""
8602
8603
#: dummy/help_topics/launchpad/detail.txt:29
8604
msgid "For more information see http://help.launchpad.net/\n"
8605
msgstr "Больше информации можно найти на http://help.launchpad.net/\n"
8606
8607
#: dummy/help_topics/launchpad/summary.txt:1
8608
msgid "Using Bazaar with Launchpad.net"
8609
msgstr "Использование Bazaar с Launchpad.net"
8610
8611
#: dummy/help_topics/location-alias/summary.txt:1
8612
msgid "Aliases for remembered locations"
8613
msgstr ""
8614
8615
#: dummy/help_topics/log-formats/summary.txt:1
8616
msgid "Details on the logging formats available"
8617
msgstr ""
8618
8619
#: dummy/help_topics/other-formats/summary.txt:1
8620
msgid "Experimental and deprecated storage formats"
8621
msgstr ""
8622
8623
#: dummy/help_topics/patterns/summary.txt:1
8624
msgid "Information on the pattern syntax"
8625
msgstr ""
8626
8627
#: dummy/help_topics/repositories/detail.txt:1
8628
msgid "Repositories"
8629
msgstr ""
8630
8631
#: dummy/help_topics/repositories/detail.txt:3
8632
msgid ""
8633
"Repositories in Bazaar are where committed information is stored. There is\n"
8634
"a repository associated with every branch."
8635
msgstr ""
8636
8637
#: dummy/help_topics/repositories/detail.txt:6
8638
msgid ""
8639
"Repositories are a form of database. Bzr will usually maintain this for\n"
8640
"good performance automatically, but in some situations (e.g. when doing\n"
8641
"very many commits in a short time period) you may want to ask bzr to\n"
8642
"optimise the database indices. This can be done by the 'bzr pack' command."
8643
msgstr ""
8644
8645
#: dummy/help_topics/repositories/detail.txt:11
8646
msgid ""
8647
"By default just running 'bzr init' will create a repository within the new\n"
8648
"branch but it is possible to create a shared repository which allows "
8649
"multiple\n"
8650
"branches to share their information in the same location. When a new branch "
8651
"is\n"
8652
"created it will first look to see if there is a containing shared repository "
8653
"it\n"
8654
"can use."
8655
msgstr ""
8656
8657
#: dummy/help_topics/repositories/detail.txt:17
8658
msgid ""
8659
"When two branches of the same project share a repository, there is\n"
8660
"generally a large space saving. For some operations (e.g. branching\n"
8661
"within the repository) this translates in to a large time saving."
8662
msgstr ""
8663
8664
#: dummy/help_topics/repositories/detail.txt:21
8665
msgid ""
8666
"To create a shared repository use the init-repository command (or the alias\n"
8667
"init-repo). This command takes the location of the repository to create. "
8668
"This\n"
8669
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8670
"which contains a shared repository. Any new branches that are created in "
8671
"this\n"
8672
"directory will then use it for storage."
8673
msgstr ""
8674
8675
#: dummy/help_topics/repositories/detail.txt:27
8676
msgid ""
8677
"It is a good idea to create a repository whenever you might create more\n"
8678
"than one branch of a project. This is true for both working areas where you\n"
8679
"are doing the development, and any server areas that you use for hosting\n"
8680
"projects. In the latter case, it is common to want branches without working\n"
8681
"trees. Since the files in the branch will not be edited directly there is "
8682
"no\n"
8683
"need to use up disk space for a working tree. To create a repository in "
8684
"which\n"
8685
"the branches will not have working trees pass the '--no-trees' option to\n"
8686
"'init-repository'."
8687
msgstr ""
8688
8689
#: dummy/help_topics/repositories/detail.txt:38
8690
msgid ""
8691
" init-repository Create a shared repository. Use --no-trees to create "
8692
"one\n"
8693
" in which new branches won't get a working tree.\n"
8694
msgstr ""
8695
8696
#: dummy/help_topics/repositories/summary.txt:1
8697
msgid "Basic information on shared repositories."
8698
msgstr "Базовая информация об общих репозиториях."
8699
8700
#: dummy/help_topics/revisionspec/summary.txt:1
8701
msgid "Explain how to use --revision"
8702
msgstr ""
8703
8704
#: dummy/help_topics/rules/summary.txt:1
8705
msgid "Information on defining rule-based preferences"
8706
msgstr ""
8707
8708
#: dummy/help_topics/standalone-trees/detail.txt:1
8709
msgid "Standalone Trees"
8710
msgstr ""
8711
8712
#: dummy/help_topics/standalone-trees/detail.txt:3
8713
msgid ""
8714
"A standalone tree is a working tree with an associated repository. It\n"
8715
"is an independently usable branch, with no dependencies on any other.\n"
8716
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8717
"an existing project under version control."
8718
msgstr ""
8719
8720
#: dummy/help_topics/standalone-trees/detail.txt:8
8721
msgid "Related Commands::"
8722
msgstr ""
8723
8724
#: dummy/help_topics/standalone-trees/detail.txt:10
8725
msgid " init Make a directory into a versioned branch.\n"
8726
msgstr ""
8727
8728
#: dummy/help_topics/standalone-trees/summary.txt:1
8729
msgid "Information on what a standalone tree is"
8730
msgstr ""
8731
8732
#: dummy/help_topics/standard-options/detail.txt:1
8733
msgid "Standard Options"
8734
msgstr ""
8735
8736
#: dummy/help_topics/standard-options/detail.txt:3
8737
msgid "Standard options are legal for all commands."
8738
msgstr ""
8739
8740
#: dummy/help_topics/standard-options/detail.txt:5
8741
msgid ""
8742
"--help, -h Show help message.\n"
8743
"--verbose, -v Display more information.\n"
8744
"--quiet, -q Only display errors and warnings."
8745
msgstr ""
8746
8747
#: dummy/help_topics/standard-options/detail.txt:9
8748
msgid "Unlike global options, standard options can be used in aliases.\n"
8749
msgstr ""
8750
8751
#: dummy/help_topics/standard-options/summary.txt:1
8752
msgid "Options that can be used with any command"
8753
msgstr ""
8754
8755
#: dummy/help_topics/status-flags/detail.txt:1
8756
msgid "Status Flags"
8757
msgstr ""
8758
8759
#: dummy/help_topics/status-flags/detail.txt:3
8760
msgid ""
8761
"Status flags are used to summarise changes to the working tree in a concise\n"
8762
"manner. They are in the form::"
8763
msgstr ""
8764
8765
#: dummy/help_topics/status-flags/detail.txt:6
8766
msgid " xxx <filename>"
8767
msgstr ""
8768
8769
#: dummy/help_topics/status-flags/detail.txt:8
8770
msgid "where the columns' meanings are as follows."
8771
msgstr ""
8772
8773
#: dummy/help_topics/status-flags/detail.txt:10
8774
msgid "Column 1 - versioning/renames::"
8775
msgstr ""
8776
8777
#: dummy/help_topics/status-flags/detail.txt:12
8778
msgid ""
8779
" + File versioned\n"
8780
" - File unversioned\n"
8781
" R File renamed\n"
8782
" ? File unknown\n"
8783
" X File nonexistent (and unknown to bzr)\n"
8784
" C File has conflicts\n"
8785
" P Entry for a pending merge (not a file)"
8786
msgstr ""
8787
8788
#: dummy/help_topics/status-flags/detail.txt:20
8789
msgid "Column 2 - contents::"
8790
msgstr ""
8791
8792
#: dummy/help_topics/status-flags/detail.txt:22
8793
msgid ""
8794
" N File created\n"
8795
" D File deleted\n"
8796
" K File kind changed\n"
8797
" M File modified"
8798
msgstr ""
8799
" N Файл создан\n"
8800
" D Файл удалён\n"
8801
" K Тип файла изменился\n"
8802
" M Файл изменён"
8803
8804
#: dummy/help_topics/status-flags/detail.txt:27
8805
msgid "Column 3 - execute::"
8806
msgstr ""
8807
8808
#: dummy/help_topics/status-flags/detail.txt:29
8809
msgid " * The execute bit was changed\n"
8810
msgstr ""
8811
8812
#: dummy/help_topics/status-flags/summary.txt:1
8813
msgid "Help on status flags"
8814
msgstr ""
8815
8816
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8817
msgid "Branches Out of Sync"
8818
msgstr ""
8819
8820
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8821
msgid ""
8822
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8823
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8824
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8825
"have the same last revision as the new reference branch for the lightweight\n"
8826
"checkout, data could be lost, so Bazaar refuses."
8827
msgstr ""
8828
8829
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8830
msgid "How you deal with this depends on *why* the branches are out of sync."
8831
msgstr ""
8832
8833
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8834
msgid ""
8835
"If you have a checkout and have done local commits, you can get back in "
8836
"sync\n"
8837
"by running \"bzr update\" (and possibly \"bzr commit\")."
8838
msgstr ""
8839
8840
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8841
msgid ""
8842
"If you have a branch and the remote branch is out-of-date, you can push\n"
8843
"the local changes using \"bzr push\". If the local branch is out of date, "
8844
"you\n"
8845
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8846
"commit\n"
8847
"and then push your changes. If you decide that some of the changes aren't\n"
8848
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8849
msgstr ""
8850
8851
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8852
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8853
msgstr ""
8854
8855
#: dummy/help_topics/topics/summary.txt:1
8856
msgid "Topics list"
8857
msgstr ""
8858
8859
#: dummy/help_topics/url-special-chars/summary.txt:1
8860
msgid "Special character handling in URLs"
8861
msgstr ""
8862
8863
#: dummy/help_topics/urlspec/summary.txt:1
8864
msgid "Supported transport protocols"
8865
msgstr ""
8866
8867
#: dummy/help_topics/working-trees/detail.txt:1
8868
msgid "Working Trees"
8869
msgstr ""
8870
8871
#: dummy/help_topics/working-trees/detail.txt:3
8872
msgid ""
8873
"A working tree is the contents of a branch placed on disk so that you can\n"
8874
"see the files and edit them. The working tree is where you make changes to "
8875
"a\n"
8876
"branch, and when you commit the current state of the working tree is the\n"
8877
"snapshot that is recorded in the commit."
8878
msgstr ""
8879
8880
#: dummy/help_topics/working-trees/detail.txt:8
8881
msgid ""
8882
"When you push a branch to a remote system, a working tree will not be\n"
8883
"created. If one is already present the files will not be updated. The\n"
8884
"branch information will be updated and the working tree will be marked\n"
8885
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8886
"may be uncommitted changes or the update may cause content conflicts that "
8887
"are\n"
8888
"difficult to deal with remotely."
8889
msgstr ""
8890
8891
#: dummy/help_topics/working-trees/detail.txt:15
8892
msgid ""
8893
"If you have a branch with no working tree you can use the 'checkout' "
8894
"command\n"
8895
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8896
"will\n"
8897
"create the working tree. If the branch is updated remotely, you can update "
8898
"the\n"
8899
"working tree by running 'bzr update' in that directory."
8900
msgstr ""
8901
8902
#: dummy/help_topics/working-trees/detail.txt:20
8903
msgid ""
8904
"If you have a branch with a working tree that you do not want the 'remove-"
8905
"tree'\n"
8906
"command will remove the tree if it is safe. This can be done to avoid the\n"
8907
"warning about the remote working tree not being updated when pushing to the\n"
8908
"branch. It can also be useful when working with a '--no-trees' repository\n"
8909
"(see 'bzr help repositories')."
8910
msgstr ""
8911
8912
#: dummy/help_topics/working-trees/detail.txt:26
8913
msgid ""
8914
"If you want to have a working tree on a remote machine that you push to you\n"
8915
"can either run 'bzr update' in the remote branch after each push, or use "
8916
"some\n"
8917
"other method to update the tree during the push. There is an 'rspush' "
8918
"plugin\n"
8919
"that will update the working tree using rsync as well as doing a push. "
8920
"There\n"
8921
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8922
"SSH\n"
8923
"after each push."
8924
msgstr ""
8925
8926
#: dummy/help_topics/working-trees/detail.txt:33
8927
msgid "Useful commands::"
8928
msgstr ""
8929
8930
#: dummy/help_topics/working-trees/detail.txt:35
8931
msgid ""
8932
" checkout Create a working tree when a branch does not have one.\n"
8933
" remove-tree Removes the working tree from a branch when it is safe to do "
8934
"so.\n"
8935
" update When a working tree is out of sync with its associated "
8936
"branch\n"
8937
" this will update the tree to match the branch.\n"
8938
msgstr ""
8939
8940
#: dummy/help_topics/working-trees/summary.txt:1
8941
msgid "Information on working trees"
8942
msgstr ""
8943
8944
#: en/help_topics/authentication.txt:1
8945
msgid ""
8946
"Authentication Settings\n"
8947
"======================="
8948
msgstr ""
8949
8950
#: en/help_topics/authentication.txt:4
8951
msgid ""
8952
"\n"
8953
"Intent\n"
8954
"------"
8955
msgstr ""
8956
8957
#: en/help_topics/authentication.txt:8
8958
msgid ""
8959
"Many different authentication policies can be described in the\n"
8960
"``authentication.conf`` file but a particular user should need only a few\n"
8961
"definitions to cover his needs without having to specify a user and a "
8962
"password\n"
8963
"for every branch he uses."
8964
msgstr ""
8965
8966
#: en/help_topics/authentication.txt:13
8967
msgid ""
8968
"The definitions found in this file are used to find the credentials to use "
8969
"for\n"
8970
"a given url. The same credentials can generally be used for as many branches "
8971
"as\n"
8972
"possible by grouping their declaration around the remote servers that need\n"
8973
"them. It's even possible to declare credentials that will be used by "
8974
"different\n"
8975
"servers."
8976
msgstr ""
8977
8978
#: en/help_topics/authentication.txt:19
8979
msgid ""
8980
"The intent is to make this file as small as possible to minimize maintenance."
8981
msgstr ""
8982
8983
#: en/help_topics/authentication.txt:21
8984
msgid ""
8985
"Once the relevant credentials are declared in this file you may use branch "
8986
"urls\n"
8987
"without embedding passwords (security hazard) or even users (enabling "
8988
"sharing\n"
8989
"of your urls with others)."
8990
msgstr ""
8991
8992
#: en/help_topics/authentication.txt:25
8993
msgid "Instead of using::"
8994
msgstr "Вместо использования::"
8995
8996
#: en/help_topics/authentication.txt:27
8997
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8998
msgstr " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8999
9000
#: en/help_topics/authentication.txt:29
9001
msgid "you simply use::"
9002
msgstr "можно просто использовать::"
9003
9004
#: en/help_topics/authentication.txt:31
9005
msgid " bzr branch ftp://host.com/path/to/my/branch"
9006
msgstr " bzr branch ftp://host.com/path/to/my/branch"
9007
9008
#: en/help_topics/authentication.txt:33
9009
msgid ""
9010
"provided you have created the following ``authentication.conf`` file::"
9011
msgstr ""
9012
9013
#: en/help_topics/authentication.txt:35
9014
msgid ""
9015
" [myprojects]\n"
9016
" scheme=ftp\n"
9017
" host=host.com\n"
9018
" user=joe\n"
9019
" password=secret\n"
9020
" "
9021
msgstr ""
9022
" [myprojects]\n"
9023
" scheme=ftp\n"
9024
" host=host.com\n"
9025
" user=joe\n"
9026
" password=secret\n"
9027
" "
9028
9029
#: en/help_topics/authentication.txt:42
9030
msgid ""
9031
"Authentication definitions\n"
9032
"--------------------------"
9033
msgstr ""
9034
9035
#: en/help_topics/authentication.txt:45
9036
msgid ""
9037
"There are two kinds of authentication used by the various schemes supported "
9038
"by\n"
9039
"bzr:"
9040
msgstr ""
9041
9042
#: en/help_topics/authentication.txt:48
9043
msgid "1. user and password"
9044
msgstr ""
9045
9046
#: en/help_topics/authentication.txt:50
9047
msgid ""
9048
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
9049
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
9050
"ssh agents are a better, more secure solution. So we have chosen to not "
9051
"provide\n"
9052
"our own less secure method."
9053
msgstr ""
9054
9055
#: en/help_topics/authentication.txt:55
9056
msgid "2. user, realm and password"
9057
msgstr ""
9058
9059
#: en/help_topics/authentication.txt:57
9060
msgid ""
9061
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
9062
"against a host. But, by using ``.htaccess`` files, for example, it is "
9063
"possible\n"
9064
"to define several (``user, realm, password``) for a given ``host``. So what "
9065
"is\n"
9066
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
9067
"is\n"
9068
"not taken into account in the definitions, but will displayed if bzr "
9069
"prompts\n"
9070
"you for a password."
9071
msgstr ""
9072
9073
#: en/help_topics/authentication.txt:64
9074
msgid ""
9075
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
9076
"specifying the appropriate port."
9077
msgstr ""
9078
9079
#: en/help_topics/authentication.txt:67
9080
msgid ""
9081
"To take all schemes into account, the password will be deduced from a set "
9082
"of\n"
9083
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
9084
"``user``,\n"
9085
"``password``)."
9086
msgstr ""
9087
9088
#: en/help_topics/authentication.txt:71
9089
msgid ""
9090
" * ``scheme``: can be empty (meaning the rest of the definition can be "
9091
"used\n"
9092
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
9093
"``ssh``\n"
9094
" should be used instead since this is the real scheme regarding\n"
9095
" authentication,"
9096
msgstr ""
9097
9098
#: en/help_topics/authentication.txt:76
9099
msgid " * ``host``: can be empty (to act as a default for any host),"
9100
msgstr ""
9101
9102
#: en/help_topics/authentication.txt:78
9103
msgid ""
9104
" * ``port`` can be empty (useful when an host provides several servers for "
9105
"the\n"
9106
" same scheme), only numerical values are allowed, this should be used "
9107
"only\n"
9108
" when the server uses a port different than the scheme standard port,"
9109
msgstr ""
9110
9111
#: en/help_topics/authentication.txt:82
9112
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
9113
msgstr ""
9114
9115
#: en/help_topics/authentication.txt:84
9116
msgid ""
9117
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
9118
" ``getpass.get_user()``),"
9119
msgstr ""
9120
9121
#: en/help_topics/authentication.txt:87
9122
msgid ""
9123
" * ``password``: can be empty if you prefer to always be prompted for your\n"
9124
" password."
9125
msgstr ""
9126
9127
#: en/help_topics/authentication.txt:90
9128
msgid ""
9129
"Multiple definitions can be provided and, for a given URL, bzr will select "
9130
"a\n"
9131
"(``user`` [, ``password``]) based on the following rules :"
9132
msgstr ""
9133
9134
#: en/help_topics/authentication.txt:93
9135
msgid " 1. the first match wins,"
9136
msgstr ""
9137
9138
#: en/help_topics/authentication.txt:95
9139
msgid " 2. empty fields match everything,"
9140
msgstr ""
9141
9142
#: en/help_topics/authentication.txt:97
9143
msgid ""
9144
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
9145
msgstr ""
9146
9147
#: en/help_topics/authentication.txt:99
9148
msgid ""
9149
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
9150
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
9151
"``projectbzr.sf.net``\n"
9152
" will not match ``bzr.sf.net``)."
9153
msgstr ""
9154
9155
#: en/help_topics/authentication.txt:103
9156
msgid ""
9157
" 5. ``port`` matches if included in the requested URL (exact matches only)"
9158
msgstr ""
9159
9160
#: en/help_topics/authentication.txt:105
9161
msgid ""
9162
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
9163
"above,\n"
9164
" empty paths will match any provided path)."
9165
msgstr ""
9166
9167
#: en/help_topics/authentication.txt:110
9168
msgid ""
9169
"File format\n"
9170
"-----------"
9171
msgstr ""
9172
9173
#: en/help_topics/authentication.txt:113
9174
msgid ""
9175
"The general rules for :doc:`configuration files <configuration-help>`\n"
9176
"apply except for the variable policies."
9177
msgstr ""
9178
9179
#: en/help_topics/authentication.txt:116
9180
msgid "Each section describes an authentication definition."
9181
msgstr ""
9182
9183
#: en/help_topics/authentication.txt:118
9184
msgid ""
9185
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9186
"reserved\n"
9187
"and should appear as the *last* section."
9188
msgstr ""
9189
9190
#: en/help_topics/authentication.txt:121
9191
msgid "Each section should define:"
9192
msgstr ""
9193
9194
#: en/help_topics/authentication.txt:123
9195
msgid "* ``user``: the login to be used,"
9196
msgstr ""
9197
9198
#: en/help_topics/authentication.txt:125
9199
msgid "Each section could define:"
9200
msgstr ""
9201
9202
#: en/help_topics/authentication.txt:127
9203
msgid "* ``host``: the remote server,"
9204
msgstr ""
9205
9206
#: en/help_topics/authentication.txt:129
9207
msgid "* ``port``: the port the server is listening,"
9208
msgstr ""
9209
9210
#: en/help_topics/authentication.txt:131
9211
msgid "* ``path``: the branch location,"
9212
msgstr ""
9213
9214
#: en/help_topics/authentication.txt:133
9215
msgid "* ``password``: the password."
9216
msgstr ""
9217
9218
#: en/help_topics/authentication.txt:135
9219
msgid ""
9220
"\n"
9221
"Examples\n"
9222
"--------"
9223
msgstr ""
9224
9225
#: en/help_topics/authentication.txt:139
9226
msgid ""
9227
"\n"
9228
"Personal projects hosted outside\n"
9229
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9230
msgstr ""
9231
9232
#: en/help_topics/authentication.txt:143
9233
msgid ""
9234
"All connections are done with the same ``user`` (the remote one for which "
9235
"the\n"
9236
"default bzr one is not appropriate) and the password is always prompted "
9237
"with\n"
9238
"some exceptions::"
9239
msgstr ""
9240
9241
#: en/help_topics/authentication.txt:147
9242
msgid ""
9243
" # Pet projects on hobby.net\n"
9244
" [hobby]\n"
9245
" host=r.hobby.net\n"
9246
" user=jim\n"
9247
" password=obvious1234\n"
9248
" \n"
9249
" # Home server\n"
9250
" [home]\n"
9251
" scheme=https\n"
9252
" host=home.net\n"
9253
" user=joe\n"
9254
" password=1essobV10us\n"
9255
" \n"
9256
" [DEFAULT]\n"
9257
" # Our local user is barbaz, on all remote sites we're known as "
9258
"foobar\n"
9259
" user=foobar"
9260
msgstr ""
9261
9262
#: en/help_topics/authentication.txt:164
9263
msgid ""
9264
"\n"
9265
"Source hosting provider\n"
9266
"~~~~~~~~~~~~~~~~~~~~~~~"
9267
msgstr ""
9268
9269
#: en/help_topics/authentication.txt:168
9270
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9271
msgstr ""
9272
9273
#: en/help_topics/authentication.txt:170
9274
msgid ""
9275
" [shpnet domain]\n"
9276
" # we use sftp, but ssh is the scheme used for authentication\n"
9277
" scheme=ssh\n"
9278
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9279
" host=.shp.net\n"
9280
" user=joe\n"
9281
" # bzr don't support supplying a password for sftp,\n"
9282
" # consider using an ssh agent if you don't want to supply\n"
9283
" # a password interactively. (pageant, ssh-agent, etc)"
9284
msgstr ""
9285
9286
#: en/help_topics/authentication.txt:180
9287
msgid ""
9288
"HTTPS, SFTP servers and their proxy\n"
9289
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9290
msgstr ""
9291
9292
#: en/help_topics/authentication.txt:183
9293
msgid ""
9294
"At company.com, the server hosting release and integration branches is "
9295
"behind a\n"
9296
"proxy, and the two branches use different authentication policies::"
9297
msgstr ""
9298
9299
#: en/help_topics/authentication.txt:186
9300
msgid ""
9301
" [reference code]\n"
9302
" scheme=https\n"
9303
" host=dev.company.com\n"
9304
" path=/dev\n"
9305
" user=user1\n"
9306
" password=pass1"
9307
msgstr ""
9308
9309
#: en/help_topics/authentication.txt:193
9310
msgid ""
9311
" # development branches on dev server\n"
9312
" [dev]\n"
9313
" scheme=ssh # bzr+ssh and sftp are available here\n"
9314
" host=dev.company.com\n"
9315
" path=/dev/integration\n"
9316
" user=user2\n"
9317
" \n"
9318
" # proxy\n"
9319
" [proxy]\n"
9320
" scheme=http\n"
9321
" host=proxy.company.com\n"
9322
" port=3128\n"
9323
" user=proxyuser1\n"
9324
" password=proxypass1"
9325
msgstr ""
9326
9327
#: en/help_topics/authentication.txt:208
9328
msgid ""
9329
"\n"
9330
"Planned enhancements\n"
9331
"--------------------"
9332
msgstr ""
9333
9334
#: en/help_topics/authentication.txt:212
9335
msgid ""
9336
"The following are not yet implemented but planned as parts of a work in\n"
9337
"progress:"
9338
msgstr ""
9339
9340
#: en/help_topics/authentication.txt:215
9341
msgid "* add a ``password_encoding`` field allowing:"
9342
msgstr ""
9343
9344
#: en/help_topics/authentication.txt:217
9345
msgid ""
9346
" - storing the passwords in various obfuscating encodings (base64 for one),"
9347
msgstr ""
9348
9349
#: en/help_topics/authentication.txt:219
9350
msgid " - delegate password storage to plugins (.netrc for example)."
9351
msgstr ""
9352
9353
#: en/help_topics/authentication.txt:221
9354
msgid ""
9355
"* update the credentials when the user is prompted for user or password,"
9356
msgstr ""
9357
9358
#: en/help_topics/authentication.txt:223
9359
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9360
msgstr ""
9361
9362
#: en/help_topics/authentication.txt:225
9363
msgid ""
9364
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9365
"but\n"
9366
"ignored in the actual implementation.\n"
9367
msgstr ""
9368
9369
#: en/help_topics/bugs.txt:1
9370
msgid "Bug Tracker Settings"
9371
msgstr ""
9372
9373
#: en/help_topics/bugs.txt:3
9374
msgid ""
9375
"When making a commit, metadata about bugs fixed by that change can be\n"
9376
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9377
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9378
"(The only ``status`` value currently supported is ``fixed.``)"
9379
msgstr ""
9380
9381
#: en/help_topics/bugs.txt:8
9382
msgid ""
9383
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9384
"identifier\n"
9385
"rather than a full URL. This looks like::"
9386
msgstr ""
9387
9388
#: en/help_topics/bugs.txt:11
9389
msgid " bzr commit --fixes <tracker>:<id>"
9390
msgstr ""
9391
9392
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9393
msgid "or::"
9394
msgstr ""
9395
9396
#: en/help_topics/bugs.txt:15
9397
msgid " bzr commit --fixes <id>"
9398
msgstr ""
9399
9400
#: en/help_topics/bugs.txt:17
9401
msgid ""
9402
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9403
"the\n"
9404
"identifier for that bug within the bugtracker, usually the bug number.\n"
9405
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9406
"or global configuration is used."
9407
msgstr ""
9408
9409
#: en/help_topics/bugs.txt:22
9410
msgid ""
9411
"Bazaar knows about a few bug trackers that have many users. If\n"
9412
"you use one of these bug trackers then there is no setup required to\n"
9413
"use this feature, you just need to know the tracker identifier to use.\n"
9414
"These are the bugtrackers that are built in:"
9415
msgstr ""
9416
9417
#: en/help_topics/bugs.txt:27
9418
msgid ""
9419
" ============================ ============ ============\n"
9420
" URL Abbreviation Example\n"
9421
" ============================ ============ ============\n"
9422
" https://bugs.launchpad.net/ lp lp:12345\n"
9423
" http://bugs.debian.org/ deb deb:12345\n"
9424
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9425
" ============================ ============ ============"
9426
msgstr ""
9427
9428
#: en/help_topics/bugs.txt:35
9429
msgid ""
9430
"For the bug trackers not listed above configuration is required.\n"
9431
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9432
"is built in, along with a template mechanism for other bugtrackers with\n"
9433
"simple URL schemes. If your bug tracker can't be described by one\n"
9434
"of the schemes described below then you can write a plugin to support\n"
9435
"it."
9436
msgstr ""
9437
9438
#: en/help_topics/bugs.txt:42
9439
msgid ""
9440
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9441
"variable which contains the base URL of the bug tracker. These options\n"
9442
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9443
"configuration section in ``locations.conf``. You can set up these values\n"
9444
"for each of the projects you work on."
9445
msgstr ""
9446
9447
#: en/help_topics/bugs.txt:48
9448
msgid ""
9449
"Note: As you provide a short name for each tracker, you can specify one or\n"
9450
"more bugs in one or more trackers at commit time if you wish."
9451
msgstr ""
9452
9453
#: en/help_topics/bugs.txt:51
9454
msgid ""
9455
"Launchpad\n"
9456
"---------"
9457
msgstr ""
9458
9459
#: en/help_topics/bugs.txt:54
9460
msgid ""
9461
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9462
msgstr ""
9463
9464
#: en/help_topics/bugs.txt:56
9465
msgid ""
9466
"bugzilla_<tracker>_url\n"
9467
"----------------------"
9468
msgstr ""
9469
9470
#: en/help_topics/bugs.txt:59
9471
msgid ""
9472
"If present, the location of the Bugzilla bug tracker referred to by\n"
9473
"<tracker>. This option can then be used together with ``bzr commit\n"
9474
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9475
"example::"
9476
msgstr ""
9477
9478
#: en/help_topics/bugs.txt:64
9479
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9480
msgstr ""
9481
9482
#: en/help_topics/bugs.txt:66
9483
msgid ""
9484
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9485
"fixed."
9486
msgstr ""
9487
9488
#: en/help_topics/bugs.txt:69
9489
msgid ""
9490
"trac_<tracker>_url\n"
9491
"------------------"
9492
msgstr ""
9493
9494
#: en/help_topics/bugs.txt:72
9495
msgid ""
9496
"If present, the location of the Trac instance referred to by\n"
9497
"<tracker>. This option can then be used together with ``bzr commit\n"
9498
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9499
"example::"
9500
msgstr ""
9501
9502
#: en/help_topics/bugs.txt:77
9503
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9504
msgstr ""
9505
9506
#: en/help_topics/bugs.txt:79
9507
msgid ""
9508
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9509
"as\n"
9510
"fixed."
9511
msgstr ""
9512
9513
#: en/help_topics/bugs.txt:82
9514
msgid ""
9515
"bugtracker_<tracker>_url\n"
9516
"------------------------"
9517
msgstr ""
9518
9519
#: en/help_topics/bugs.txt:85
9520
msgid ""
9521
"If present, the location of a generic bug tracker instance referred to by\n"
9522
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9523
"which will be replaced by a specific bug ID. This option can then be used\n"
9524
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9525
"fixed by that commit. For example::"
9526
msgstr ""
9527
9528
#: en/help_topics/bugs.txt:91
9529
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9530
msgstr ""
9531
9532
#: en/help_topics/bugs.txt:93
9533
msgid ""
9534
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9535
"Roundup bug tracker as fixed, or::"
9536
msgstr ""
9537
9538
#: en/help_topics/bugs.txt:96
9539
msgid ""
9540
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9541
msgstr ""
9542
9543
#: en/help_topics/bugs.txt:98
9544
msgid ""
9545
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9546
"RT bug tracker as fixed, or::"
9547
msgstr ""
9548
9549
#: en/help_topics/bugs.txt:101
9550
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9551
msgstr ""
9552
9553
#: en/help_topics/bugs.txt:103
9554
msgid ""
9555
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9556
"1234\n"
9557
"in Hudson's JIRA bug tracker as fixed.\n"
9558
msgstr ""
9559
9560
#: en/help_topics/commands.txt:1
9561
msgid ""
9562
"add Add specified files or directories.\n"
9563
"alias Set/unset and display aliases.\n"
9564
"annotate Show the origin of each line in a file.\n"
9565
"bash-completion Generate a shell function for bash command line "
9566
"completion.\n"
9567
" [bash_completion]\n"
9568
"bind Convert the current branch into a checkout of the "
9569
"supplied\n"
9570
" branch.\n"
9571
"branch Create a new branch that is a copy of an existing branch.\n"
9572
"branches List the branches available at the current location.\n"
9573
"break-lock Break a dead lock.\n"
9574
"cat Write the contents of a file as of a given revision to\n"
9575
" standard output.\n"
9576
"check Validate working tree structure, branch consistency and\n"
9577
" repository history.\n"
9578
"checkout Create a new checkout of an existing branch.\n"
9579
"clean-tree Remove unwanted files from working tree.\n"
9580
"commit Commit changes into a new revision.\n"
9581
"config Display, set or remove a configuration option.\n"
9582
"conflicts List files with conflicts.\n"
9583
"deleted List files deleted in the working tree.\n"
9584
"diff Show differences in the working tree, between revisions "
9585
"or\n"
9586
" branches.\n"
9587
"dpush Push into a different VCS without any custom bzr "
9588
"metadata.\n"
9589
"export Export current or past revision to a destination directory "
9590
"or\n"
9591
" archive.\n"
9592
"help Show help on a command or other topic.\n"
9593
"ignore Ignore specified files or patterns.\n"
9594
"ignored List ignored files and the patterns that matched them.\n"
9595
"info Show information about a working tree, branch or "
9596
"repository.\n"
9597
"init Make a directory into a versioned branch.\n"
9598
"init-repository Create a shared repository for branches to share storage\n"
9599
" space.\n"
9600
"join Combine a tree into its containing tree.\n"
9601
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9602
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9603
"launchpad-open Open a Launchpad branch page in your web browser. "
9604
"[launchpad]\n"
9605
"log Show historical log for a branch or subset of a branch.\n"
9606
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9607
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9608
"ls List files in a tree.\n"
9609
"merge Perform a three-way merge.\n"
9610
"missing Show unmerged/unpulled revisions between two branches.\n"
9611
"mkdir Create a new versioned directory.\n"
9612
"mv Move or rename a file.\n"
9613
"nick Print or set the branch nickname.\n"
9614
"pack Compress the data within a repository.\n"
9615
"plugins List the installed plugins.\n"
9616
"pull Turn this branch into a mirror of another branch.\n"
9617
"push Update a mirror of this branch.\n"
9618
"reconcile Reconcile bzr metadata in a branch.\n"
9619
"reconfigure Reconfigure the type of a bzr directory.\n"
9620
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9621
"remerge Redo a merge.\n"
9622
"remove Remove files or directories.\n"
9623
"remove-branch Remove a branch.\n"
9624
"remove-tree Remove the working tree from a given branch/checkout.\n"
9625
"renames Show list of renamed files.\n"
9626
"resolve Mark a conflict as resolved.\n"
9627
"revert Revert files to a previous revision.\n"
9628
"revno Show current revision number.\n"
9629
"root Show the tree root directory.\n"
9630
"send Mail or create a merge-directive for submitting changes.\n"
9631
"serve Run the bzr server.\n"
9632
"shelve Temporarily set aside some changes from the current tree.\n"
9633
"sign-my-commits Sign all commits by a given committer.\n"
9634
"split Split a subdirectory of a tree into a separate tree.\n"
9635
"status Display status summary.\n"
9636
"switch Set the branch of a checkout and update.\n"
9637
"tag Create, remove or modify a tag naming a revision.\n"
9638
"tags List tags.\n"
9639
"testament Show testament (signing-form) of a revision.\n"
9640
"unbind Convert the current checkout into a regular branch.\n"
9641
"uncommit Remove the last committed revision.\n"
9642
"unshelve Restore shelved changes.\n"
9643
"update Update a working tree to a new revision.\n"
9644
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9645
" format.\n"
9646
"verify-signatures Verify all commit signatures.\n"
9647
"version Show version of bzr.\n"
9648
"version-info Show version information about this tree.\n"
9649
"view Manage filtered views.\n"
9650
"whoami Show or set bzr user id.\n"
9651
msgstr ""
9652
9653
#: en/help_topics/configuration.txt:1
9654
msgid ""
9655
"Configuration Settings\n"
9656
"======================="
9657
msgstr ""
9658
9659
#: en/help_topics/configuration.txt:4
9660
msgid ""
9661
"Environment settings\n"
9662
"---------------------"
9663
msgstr ""
9664
9665
#: en/help_topics/configuration.txt:7
9666
msgid ""
9667
"While most configuration is handled by configuration files, some options\n"
9668
"which may be semi-permanent can also be controlled through the environment."
9669
msgstr ""
9670
9671
#: en/help_topics/configuration.txt:10
9672
msgid ""
9673
"BZR_EMAIL\n"
9674
"~~~~~~~~~"
9675
msgstr ""
9676
9677
#: en/help_topics/configuration.txt:13
9678
msgid "Override the email id used by Bazaar. Typical format::"
9679
msgstr ""
9680
9681
#: en/help_topics/configuration.txt:15
9682
msgid " \"John Doe <jdoe@example.com>\""
9683
msgstr ""
9684
9685
#: en/help_topics/configuration.txt:17
9686
msgid "See also the ``email`` configuration option."
9687
msgstr ""
9688
9689
#: en/help_topics/configuration.txt:19
9690
msgid ""
9691
"BZR_PROGRESS_BAR\n"
9692
"~~~~~~~~~~~~~~~~"
9693
msgstr ""
9694
9695
#: en/help_topics/configuration.txt:22
9696
msgid ""
9697
"Override the progress display. Possible values are \"none\" or \"text\". "
9698
"If\n"
9699
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9700
"draws\n"
9701
"the ordinary command line progress bar."
9702
msgstr ""
9703
9704
#: en/help_topics/configuration.txt:26
9705
msgid ""
9706
"BZR_SIGQUIT_PDB\n"
9707
"~~~~~~~~~~~~~~~"
9708
msgstr ""
9709
9710
#: en/help_topics/configuration.txt:29
9711
msgid ""
9712
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9713
msgstr ""
9714
9715
#: en/help_topics/configuration.txt:31
9716
msgid ""
9717
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9718
"* 1 = Invoke breakin debugger (default)"
9719
msgstr ""
9720
9721
#: en/help_topics/configuration.txt:34
9722
msgid ""
9723
"BZR_HOME\n"
9724
"~~~~~~~~"
9725
msgstr ""
9726
9727
#: en/help_topics/configuration.txt:37
9728
msgid "Override the home directory used by Bazaar."
9729
msgstr ""
9730
9731
#: en/help_topics/configuration.txt:39
9732
msgid ""
9733
"BZR_SSH\n"
9734
"~~~~~~~"
9735
msgstr ""
9736
9737
#: en/help_topics/configuration.txt:42
9738
msgid "Select a different SSH implementation."
9739
msgstr ""
9740
9741
#: en/help_topics/configuration.txt:44
9742
msgid ""
9743
"BZR_PDB\n"
9744
"~~~~~~~"
9745
msgstr ""
9746
9747
#: en/help_topics/configuration.txt:47
9748
msgid "Control whether to launch a debugger on error."
9749
msgstr ""
9750
9751
#: en/help_topics/configuration.txt:49
9752
msgid ""
9753
"* 0 = Standard behavior\n"
9754
"* 1 = Launch debugger"
9755
msgstr ""
9756
9757
#: en/help_topics/configuration.txt:52
9758
msgid ""
9759
"BZR_REMOTE_PATH\n"
9760
"~~~~~~~~~~~~~~~"
9761
msgstr ""
9762
9763
#: en/help_topics/configuration.txt:55
9764
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9765
msgstr ""
9766
9767
#: en/help_topics/configuration.txt:57
9768
msgid "See also the ``bzr_remote_path`` configuration option."
9769
msgstr ""
9770
9771
#: en/help_topics/configuration.txt:59
9772
msgid ""
9773
"BZR_EDITOR\n"
9774
"~~~~~~~~~~"
9775
msgstr ""
9776
9777
#: en/help_topics/configuration.txt:62
9778
msgid "Path to the editor Bazaar should use for commit messages, etc."
9779
msgstr ""
9780
9781
#: en/help_topics/configuration.txt:64
9782
msgid ""
9783
"BZR_LOG\n"
9784
"~~~~~~~"
9785
msgstr ""
9786
9787
#: en/help_topics/configuration.txt:67
9788
msgid ""
9789
"Location of the Bazaar log file. You can check the current location by\n"
9790
"running ``bzr version``."
9791
msgstr ""
9792
9793
#: en/help_topics/configuration.txt:70
9794
msgid ""
9795
"The log file contains debug information that is useful for diagnosing or\n"
9796
"reporting problems with Bazaar."
9797
msgstr ""
9798
9799
#: en/help_topics/configuration.txt:73
9800
msgid ""
9801
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9802
"will disable logging."
9803
msgstr ""
9804
9805
#: en/help_topics/configuration.txt:76
9806
msgid ""
9807
"\n"
9808
"BZR_PLUGIN_PATH\n"
9809
"~~~~~~~~~~~~~~~"
9810
msgstr ""
9811
9812
#: en/help_topics/configuration.txt:80
9813
msgid ""
9814
"The path to the plugins directory that Bazaar should use.\n"
9815
"If not set, Bazaar will search for plugins in:"
9816
msgstr ""
9817
9818
#: en/help_topics/configuration.txt:83
9819
msgid ""
9820
"* the user specific plugin directory (containing the ``user`` plugins),"
9821
msgstr ""
9822
9823
#: en/help_topics/configuration.txt:85
9824
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9825
msgstr ""
9826
9827
#: en/help_topics/configuration.txt:87
9828
msgid ""
9829
"* the site specific plugin directory if applicable (containing\n"
9830
" the ``site`` plugins)."
9831
msgstr ""
9832
9833
#: en/help_topics/configuration.txt:90
9834
msgid ""
9835
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9836
"the way the plugin are searched. "
9837
msgstr ""
9838
9839
#: en/help_topics/configuration.txt:93
9840
msgid ""
9841
"As for the ``PATH`` variables, if multiple directories are\n"
9842
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9843
"platform specific appropriate character (':' on Unix,\n"
9844
"';' on windows)"
9845
msgstr ""
9846
9847
#: en/help_topics/configuration.txt:98
9848
msgid ""
9849
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9850
"in ``user``. However it will continue to search in ``core`` and\n"
9851
"``site`` unless they are explicitly removed."
9852
msgstr ""
9853
9854
#: en/help_topics/configuration.txt:102
9855
msgid ""
9856
"If you need to change the order or remove one of these\n"
9857
"directories, you should use special values:"
9858
msgstr ""
9859
9860
#: en/help_topics/configuration.txt:105
9861
msgid ""
9862
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9863
" path from the default values,"
9864
msgstr ""
9865
9866
#: en/help_topics/configuration.txt:108
9867
msgid ""
9868
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9869
" before the remaining default values (and also remove it from\n"
9870
" the default values)."
9871
msgstr ""
9872
9873
#: en/help_topics/configuration.txt:112
9874
msgid ""
9875
"Note that the special values 'user', 'core' and 'site' should be\n"
9876
"used literally, they will be substituted by the corresponding,\n"
9877
"platform specific, values."
9878
msgstr ""
9879
9880
#: en/help_topics/configuration.txt:116
9881
msgid ""
9882
"The examples below use ':' as the separator, windows users\n"
9883
"should use ';'."
9884
msgstr ""
9885
9886
#: en/help_topics/configuration.txt:119
9887
msgid "Overriding the default user plugin directory::"
9888
msgstr ""
9889
9890
#: en/help_topics/configuration.txt:121
9891
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9892
msgstr ""
9893
9894
#: en/help_topics/configuration.txt:123
9895
msgid "Disabling the site directory while retaining the user directory::"
9896
msgstr ""
9897
9898
#: en/help_topics/configuration.txt:125
9899
msgid " BZR_PLUGIN_PATH='-site:+user'"
9900
msgstr ""
9901
9902
#: en/help_topics/configuration.txt:127
9903
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9904
msgstr ""
9905
9906
#: en/help_topics/configuration.txt:129
9907
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9908
msgstr ""
9909
9910
#: en/help_topics/configuration.txt:131
9911
msgid "Overriding the default site plugin directory::"
9912
msgstr ""
9913
9914
#: en/help_topics/configuration.txt:133
9915
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9916
msgstr ""
9917
9918
#: en/help_topics/configuration.txt:135
9919
msgid ""
9920
"BZR_DISABLE_PLUGINS\n"
9921
"~~~~~~~~~~~~~~~~~~~"
9922
msgstr ""
9923
9924
#: en/help_topics/configuration.txt:138
9925
msgid ""
9926
"Under special circumstances (mostly when trying to diagnose a\n"
9927
"bug), it's better to disable a plugin (or several) rather than\n"
9928
"uninstalling them completely. Such plugins can be specified in\n"
9929
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9930
msgstr ""
9931
9932
#: en/help_topics/configuration.txt:143
9933
msgid ""
9934
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9935
"will raise an import error if they are explicitly imported (by\n"
9936
"another plugin that depends on them for example)."
9937
msgstr ""
9938
9939
#: en/help_topics/configuration.txt:147
9940
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9941
msgstr ""
9942
9943
#: en/help_topics/configuration.txt:149
9944
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9945
msgstr ""
9946
9947
#: en/help_topics/configuration.txt:151
9948
msgid ""
9949
"BZR_PLUGINS_AT\n"
9950
"~~~~~~~~~~~~~~"
9951
msgstr ""
9952
9953
#: en/help_topics/configuration.txt:154
9954
msgid ""
9955
"When adding a new feature or working on a bug in a plugin,\n"
9956
"developers often need to use a specific version of a given\n"
9957
"plugin. Since python requires that the directory containing the\n"
9958
"code is named like the plugin itself this make it impossible to\n"
9959
"use arbitrary directory names (using a two-level directory scheme\n"
9960
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9961
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9962
msgstr ""
9963
9964
#: en/help_topics/configuration.txt:162
9965
msgid ""
9966
"Plugins specified in this environment variable takes precedence\n"
9967
"over the ones in ``BZR_PLUGIN_PATH``."
9968
msgstr ""
9969
9970
#: en/help_topics/configuration.txt:165
9971
msgid ""
9972
"The variable specified a list of ``plugin_name@plugin path``,\n"
9973
"``plugin_name`` being the name of the plugin as it appears in\n"
9974
"python module paths, ``plugin_path`` being the path to the\n"
9975
"directory containing the plugin code itself\n"
9976
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9977
"separator, use ';' on windows."
9978
msgstr ""
9979
9980
#: en/help_topics/configuration.txt:172
9981
msgid ""
9982
"Example:\n"
9983
"~~~~~~~~"
9984
msgstr ""
9985
9986
#: en/help_topics/configuration.txt:175
9987
msgid ""
9988
"Using a specific version of ``myplugin``:\n"
9989
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9990
msgstr ""
9991
9992
#: en/help_topics/configuration.txt:178
9993
msgid ""
9994
"BZRPATH\n"
9995
"~~~~~~~"
9996
msgstr ""
9997
9998
#: en/help_topics/configuration.txt:181
9999
msgid "The path where Bazaar should look for shell plugin external commands."
10000
msgstr ""
10001
10002
#: en/help_topics/configuration.txt:183
10003
msgid ""
10004
"\n"
10005
"http_proxy, https_proxy\n"
10006
"~~~~~~~~~~~~~~~~~~~~~~~"
10007
msgstr ""
10008
10009
#: en/help_topics/configuration.txt:187
10010
msgid "Specifies the network proxy for outgoing connections, for example::"
10011
msgstr ""
10012
10013
#: en/help_topics/configuration.txt:189
10014
msgid ""
10015
" http_proxy=http://proxy.example.com:3128/ \n"
10016
" https_proxy=http://proxy.example.com:3128/"
10017
msgstr ""
10018
10019
#: en/help_topics/configuration.txt:192
10020
msgid ""
10021
"\n"
10022
"Configuration files\n"
10023
"-------------------"
10024
msgstr ""
10025
10026
#: en/help_topics/configuration.txt:196
10027
msgid ""
10028
"Location\n"
10029
"~~~~~~~~"
10030
msgstr ""
10031
10032
#: en/help_topics/configuration.txt:199
10033
msgid ""
10034
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
10035
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
10036
"on\n"
10037
"Windows. (You can check the location for your system by using\n"
10038
"``bzr version``.)"
10039
msgstr ""
10040
10041
#: en/help_topics/configuration.txt:204
10042
msgid "There are three primary configuration files in this location:"
10043
msgstr ""
10044
10045
#: en/help_topics/configuration.txt:206
10046
msgid "* ``bazaar.conf`` describes default configuration options,"
10047
msgstr ""
10048
10049
#: en/help_topics/configuration.txt:208
10050
msgid ""
10051
"* ``locations.conf`` describes configuration information for\n"
10052
" specific branch locations,"
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:211
10056
msgid ""
10057
"* ``authentication.conf`` describes credential information for\n"
10058
" remote servers."
10059
msgstr ""
10060
10061
#: en/help_topics/configuration.txt:214
10062
msgid ""
10063
"Each branch can also contain a configuration file that sets values specific\n"
10064
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
10065
"the\n"
10066
"branch. This file is visible to all users of a branch, if you wish to "
10067
"override\n"
10068
"one of the values for a branch with a setting that is specific to you then "
10069
"you\n"
10070
"can do so in ``locations.conf``."
10071
msgstr ""
10072
10073
#: en/help_topics/configuration.txt:220
10074
msgid ""
10075
"General format\n"
10076
"~~~~~~~~~~~~~~"
10077
msgstr ""
10078
10079
#: en/help_topics/configuration.txt:223
10080
msgid ""
10081
"An ini file has three types of contructs: section headers, section\n"
10082
"options and comments."
10083
msgstr ""
10084
10085
#: en/help_topics/configuration.txt:226
10086
msgid ""
10087
"Comments\n"
10088
"^^^^^^^^"
10089
msgstr ""
10090
10091
#: en/help_topics/configuration.txt:229
10092
msgid ""
10093
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
10094
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
10095
"Bazaar when parsing ini files."
10096
msgstr ""
10097
10098
#: en/help_topics/configuration.txt:233
10099
msgid ""
10100
"Section headers\n"
10101
"^^^^^^^^^^^^^^^"
10102
msgstr ""
10103
10104
#: en/help_topics/configuration.txt:236
10105
msgid ""
10106
"A section header is a word enclosed in brackets that starts at the begining\n"
10107
"of a line. A typical section header looks like this::"
10108
msgstr ""
10109
10110
#: en/help_topics/configuration.txt:239
10111
msgid " [DEFAULT]"
10112
msgstr ""
10113
10114
#: en/help_topics/configuration.txt:241
10115
msgid ""
10116
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
10117
"[ALIASES]. Section headers are case sensitive. The default section provides "
10118
"for\n"
10119
"setting options which can be overridden with the branch config file."
10120
msgstr ""
10121
10122
#: en/help_topics/configuration.txt:245
10123
msgid ""
10124
"For ``locations.conf``, the options from the section with the\n"
10125
"longest matching section header are used to the exclusion of other\n"
10126
"potentially valid section headers. A section header uses the path for\n"
10127
"the branch as the section header. Some examples include::"
10128
msgstr ""
10129
10130
#: en/help_topics/configuration.txt:250
10131
msgid ""
10132
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
10133
" [/home/jdoe/branches/]"
10134
msgstr ""
10135
10136
#: en/help_topics/configuration.txt:253
10137
msgid ""
10138
"\n"
10139
"Section options\n"
10140
"^^^^^^^^^^^^^^^"
10141
msgstr ""
10142
10143
#: en/help_topics/configuration.txt:257
10144
msgid ""
10145
"A section option resides within a section. A section option contains an\n"
10146
"option name, an equals sign and a value. For example::"
10147
msgstr ""
10148
10149
#: en/help_topics/configuration.txt:260
10150
msgid ""
10151
" email = John Doe <jdoe@isp.com>\n"
10152
" gpg_signing_key = Amy Pond <amy@example.com>"
10153
msgstr ""
10154
10155
#: en/help_topics/configuration.txt:263
10156
msgid ""
10157
"A option can reference other options by enclosing them in curly brackets::"
10158
msgstr ""
10159
10160
#: en/help_topics/configuration.txt:265
10161
msgid ""
10162
" my_branch_name = feature_x\n"
10163
" my_server = bzr+ssh://example.com\n"
10164
" push_location = {my_server}/project/{my_branch_name}"
10165
msgstr ""
10166
10167
#: en/help_topics/configuration.txt:269
10168
msgid ""
10169
"Option policies\n"
10170
"^^^^^^^^^^^^^^^"
10171
msgstr ""
10172
10173
#: en/help_topics/configuration.txt:272
10174
msgid ""
10175
"Options defined in a section affect the named directory or URL plus\n"
10176
"any locations they contain. Policies can be used to change how an\n"
10177
"option value is interpreted for contained locations. Currently\n"
10178
"there are three policies available:"
10179
msgstr ""
10180
10181
#: en/help_topics/configuration.txt:277
10182
msgid ""
10183
" none:\n"
10184
" the value is interpreted the same for contained locations. This is\n"
10185
" the default behaviour.\n"
10186
" norecurse:\n"
10187
" the value is only used for the exact location specified by the\n"
10188
" section name.\n"
10189
" appendpath:\n"
10190
" for contained locations, any additional path components are\n"
10191
" appended to the value."
10192
msgstr ""
10193
10194
#: en/help_topics/configuration.txt:287
10195
msgid ""
10196
"Policies are specified by keys with names of the form "
10197
"\"<option_name>:policy\".\n"
10198
"For example, to define the push location for a tree of branches, the\n"
10199
"following could be used::"
10200
msgstr ""
10201
10202
#: en/help_topics/configuration.txt:291
10203
msgid ""
10204
" [/top/location]\n"
10205
" push_location = sftp://example.com/location\n"
10206
" push_location:policy = appendpath"
10207
msgstr ""
10208
10209
#: en/help_topics/configuration.txt:295
10210
msgid ""
10211
"With this configuration, the push location for ``/top/location/branch1``\n"
10212
"would be ``sftp://example.com/location/branch1``."
10213
msgstr ""
10214
10215
#: en/help_topics/configuration.txt:298
10216
msgid ""
10217
"Section local options\n"
10218
"^^^^^^^^^^^^^^^^^^^^^"
10219
msgstr ""
10220
10221
#: en/help_topics/configuration.txt:301
10222
msgid ""
10223
"Some options are defined automatically inside a given section and can be\n"
10224
"refered to in this section only. "
10225
msgstr ""
10226
10227
#: en/help_topics/configuration.txt:304
10228
msgid "For example, the ``appendpath`` policy can be used like this::"
10229
msgstr ""
10230
10231
#: en/help_topics/configuration.txt:306
10232
msgid ""
10233
" [/home/vila/src/bzr/bugs]\n"
10234
" mypush = lp:~vila/bzr\n"
10235
" mypush:policy=appendpath"
10236
msgstr ""
10237
10238
#: en/help_topics/configuration.txt:310
10239
msgid "Using ``relpath`` to achieve the same result is done like this::"
10240
msgstr ""
10241
10242
#: en/help_topics/configuration.txt:312
10243
msgid ""
10244
" [/home/vila/src/bzr/bugs]\n"
10245
" mypush = lp:~vila/bzr/{relpath}"
10246
msgstr ""
10247
10248
#: en/help_topics/configuration.txt:315
10249
msgid ""
10250
"In both cases, when used in a directory like\n"
10251
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10252
msgstr ""
10253
10254
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
10255
msgid ""
10256
" $ bzr config mypush\n"
10257
" lp:~vila/bzr/832013-expand-in-stack"
10258
msgstr ""
10259
10260
#: en/help_topics/configuration.txt:321
10261
msgid "Another such option is ``basename`` which can be used like this::"
10262
msgstr ""
10263
10264
#: en/help_topics/configuration.txt:323
10265
msgid ""
10266
" [/home/vila/src/bzr]\n"
10267
" mypush = lp:~vila/bzr/{basename}"
10268
msgstr ""
10269
10270
#: en/help_topics/configuration.txt:326
10271
msgid ""
10272
"When used in a directory like\n"
10273
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10274
msgstr ""
10275
10276
#: en/help_topics/configuration.txt:332
10277
msgid ""
10278
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10279
"itself is defined as the relative path between the section name and the\n"
10280
"location it matches."
10281
msgstr ""
10282
10283
#: en/help_topics/configuration.txt:336
10284
msgid ""
10285
"When an option is local to a Section, it cannot be referred to from option\n"
10286
"values in any other section from the same ``Store`` nor from any other\n"
10287
"``Store``."
10288
msgstr ""
10289
10290
#: en/help_topics/configuration.txt:340
10291
msgid ""
10292
"\n"
10293
"The main configuration file, bazaar.conf\n"
10294
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10295
msgstr ""
10296
10297
#: en/help_topics/configuration.txt:344
10298
msgid ""
10299
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10300
"The default section contains the default\n"
10301
"configuration options for all branches. The default section can be\n"
10302
"overriden by providing a branch-specific section in ``locations.conf``."
10303
msgstr ""
10304
10305
#: en/help_topics/configuration.txt:349
10306
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10307
msgstr ""
10308
10309
#: en/help_topics/configuration.txt:351
10310
msgid ""
10311
" [DEFAULT]\n"
10312
" email = John Doe <jdoe@isp.com>\n"
10313
" editor = /usr/bin/vim\n"
10314
" create_signatures = when-required"
10315
msgstr ""
10316
10317
#: en/help_topics/configuration.txt:356
10318
msgid ""
10319
"\n"
10320
"The branch location configuration file, locations.conf\n"
10321
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10322
msgstr ""
10323
10324
#: en/help_topics/configuration.txt:360
10325
msgid ""
10326
"``locations.conf`` allows one to specify overriding settings for\n"
10327
"a specific branch. The format is almost identical to the default section in\n"
10328
"bazaar.conf with one significant change: The section header, instead of "
10329
"saying\n"
10330
"default, will be the path to a branch that you wish to override a value\n"
10331
"for. The '?' and '*' wildcards are supported::"
10332
msgstr ""
10333
10334
#: en/help_topics/configuration.txt:366
10335
msgid ""
10336
" [/home/jdoe/branches/nethack]\n"
10337
" email = Nethack Admin <nethack@nethack.com>"
10338
msgstr ""
10339
10340
#: en/help_topics/configuration.txt:369
10341
msgid ""
10342
" [http://hypothetical.site.com/branches/devel-branch]\n"
10343
" create_signatures = always"
10344
msgstr ""
10345
10346
#: en/help_topics/configuration.txt:372
10347
msgid ""
10348
"The authentication configuration file, authentication.conf\n"
10349
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10350
msgstr ""
10351
10352
#: en/help_topics/configuration.txt:375
10353
msgid ""
10354
"``authentication.conf`` allows one to specify credentials for\n"
10355
"remote servers. This can be used for all the supported transports and any "
10356
"part\n"
10357
"of bzr that requires authentication (smtp for example)."
10358
msgstr ""
10359
10360
#: en/help_topics/configuration.txt:379
10361
msgid ""
10362
"The syntax of the file obeys the same rules as the others except for the\n"
10363
"option policies which don't apply."
10364
msgstr ""
10365
10366
#: en/help_topics/configuration.txt:382
10367
msgid ""
10368
"For more information on the possible uses of the authentication "
10369
"configuration\n"
10370
"file see :doc:`authentication-help`."
10371
msgstr ""
10372
10373
#: en/help_topics/configuration.txt:385
10374
msgid ""
10375
"\n"
10376
"Common options\n"
10377
"--------------"
10378
msgstr ""
10379
10380
#: en/help_topics/configuration.txt:389
10381
msgid ""
10382
"debug_flags\n"
10383
"~~~~~~~~~~~"
10384
msgstr ""
10385
10386
#: en/help_topics/configuration.txt:392
10387
msgid ""
10388
"A comma-separated list of debugging options to turn on. The same values\n"
10389
"can be used as with the -D command-line option (see `help global-options`).\n"
10390
"For example::"
10391
msgstr ""
10392
10393
#: en/help_topics/configuration.txt:396
10394
msgid " debug_flags = hpss"
10395
msgstr ""
10396
10397
#: en/help_topics/configuration.txt:400
10398
msgid " debug_flags = hpss,evil"
10399
msgstr ""
10400
10401
#: en/help_topics/configuration.txt:402
10402
msgid ""
10403
"email\n"
10404
"~~~~~"
10405
msgstr ""
10406
10407
#: en/help_topics/configuration.txt:405
10408
msgid ""
10409
"The email address to use when committing a branch. Typically takes the form\n"
10410
"of::"
10411
msgstr ""
10412
10413
#: en/help_topics/configuration.txt:408
10414
msgid " email = Full Name <account@hostname.tld>"
10415
msgstr ""
10416
10417
#: en/help_topics/configuration.txt:410
10418
msgid ""
10419
"editor\n"
10420
"~~~~~~"
10421
msgstr ""
10422
10423
#: en/help_topics/configuration.txt:413
10424
msgid ""
10425
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10426
"a commit message. This setting is trumped by the environment variable\n"
10427
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10428
"variables."
10429
msgstr ""
10430
10431
#: en/help_topics/configuration.txt:418
10432
msgid ""
10433
"log_format\n"
10434
"~~~~~~~~~~"
10435
msgstr ""
10436
10437
#: en/help_topics/configuration.txt:421
10438
msgid ""
10439
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10440
"and ``line``. Additional formats may be provided by plugins. The default\n"
10441
"value is ``long``."
10442
msgstr ""
10443
10444
#: en/help_topics/configuration.txt:425
10445
msgid ""
10446
"check_signatures\n"
10447
"~~~~~~~~~~~~~~~~"
10448
msgstr ""
10449
10450
#: en/help_topics/configuration.txt:428
10451
msgid ""
10452
"Reserved for future use. These options will allow a policy for branches to\n"
10453
"require signatures."
10454
msgstr ""
10455
10456
#: en/help_topics/configuration.txt:431
10457
msgid ""
10458
"require\n"
10459
" The gnupg signature for revisions must be present and must be valid."
10460
msgstr ""
10461
10462
#: en/help_topics/configuration.txt:434
10463
msgid ""
10464
"ignore\n"
10465
" Do not check gnupg signatures of revisions."
10466
msgstr ""
10467
10468
#: en/help_topics/configuration.txt:437
10469
msgid ""
10470
"check-available\n"
10471
" (default) If gnupg signatures for revisions are present, check them.\n"
10472
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10473
" no signature is present."
10474
msgstr ""
10475
10476
#: en/help_topics/configuration.txt:442
10477
msgid ""
10478
"create_signatures\n"
10479
"~~~~~~~~~~~~~~~~~"
10480
msgstr ""
10481
10482
#: en/help_topics/configuration.txt:445
10483
msgid ""
10484
"Defines the behaviour of signing revisions on commits. By default bzr will "
10485
"not\n"
10486
"sign new commits."
10487
msgstr ""
10488
10489
#: en/help_topics/configuration.txt:448
10490
msgid ""
10491
"always\n"
10492
" Sign every new revision that is committed. If the signing fails then "
10493
"the\n"
10494
" commit will not be made."
10495
msgstr ""
10496
10497
#: en/help_topics/configuration.txt:452
10498
msgid ""
10499
"when-required\n"
10500
" Reserved for future use."
10501
msgstr ""
10502
10503
#: en/help_topics/configuration.txt:455
10504
msgid ""
10505
"never\n"
10506
" Reserved for future use."
10507
msgstr ""
10508
10509
#: en/help_topics/configuration.txt:458
10510
msgid ""
10511
"In future it is planned that ``when-required`` will sign newly\n"
10512
"committed revisions only when the branch requires them. ``never`` will "
10513
"refuse\n"
10514
"to sign newly committed revisions, even if the branch requires signatures."
10515
msgstr ""
10516
10517
#: en/help_topics/configuration.txt:462
10518
msgid ""
10519
"dirstate.fdatasync\n"
10520
"~~~~~~~~~~~~~~~~~~"
10521
msgstr ""
10522
10523
#: en/help_topics/configuration.txt:465
10524
msgid ""
10525
"If true (default), working tree metadata changes are flushed through the\n"
10526
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10527
"should not be lost if the machine crashes. See also repository.fdatasync."
10528
msgstr ""
10529
10530
#: en/help_topics/configuration.txt:469
10531
msgid ""
10532
"gpg_signing_key\n"
10533
"~~~~~~~~~~~~~~~"
10534
msgstr ""
10535
10536
#: en/help_topics/configuration.txt:472
10537
msgid ""
10538
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10539
"address, key fingerprint or full key ID. When unset or when set to\n"
10540
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10541
msgstr ""
10542
10543
#: en/help_topics/configuration.txt:476
10544
msgid ""
10545
"recurse\n"
10546
"~~~~~~~"
10547
msgstr ""
10548
10549
#: en/help_topics/configuration.txt:479
10550
msgid ""
10551
"Only useful in ``locations.conf``. Defines whether or not the\n"
10552
"configuration for this section applies to subdirectories:"
10553
msgstr ""
10554
10555
#: en/help_topics/configuration.txt:482
10556
msgid ""
10557
"true\n"
10558
" (default) This section applies to subdirectories as well."
10559
msgstr ""
10560
10561
#: en/help_topics/configuration.txt:485
10562
msgid ""
10563
"false\n"
10564
" This section only applies to the branch at this directory and not\n"
10565
" branches below it."
10566
msgstr ""
10567
10568
#: en/help_topics/configuration.txt:489
10569
msgid ""
10570
"gpg_signing_command\n"
10571
"~~~~~~~~~~~~~~~~~~~"
10572
msgstr ""
10573
10574
#: en/help_topics/configuration.txt:492
10575
msgid ""
10576
"(Default: \"gpg\"). Which program should be used to sign and check "
10577
"revisions.\n"
10578
"For example::"
10579
msgstr ""
10580
10581
#: en/help_topics/configuration.txt:495
10582
msgid " gpg_signing_command = /usr/bin/gnpg"
10583
msgstr ""
10584
10585
#: en/help_topics/configuration.txt:497
10586
msgid ""
10587
"The specified command must accept the options \"--clearsign\" and \"-u "
10588
"<email>\"."
10589
msgstr ""
10590
10591
#: en/help_topics/configuration.txt:499
10592
msgid ""
10593
"bzr_remote_path\n"
10594
"~~~~~~~~~~~~~~~"
10595
msgstr ""
10596
10597
#: en/help_topics/configuration.txt:502
10598
msgid ""
10599
"(Default: \"bzr\"). The path to the command that should be used to run the "
10600
"smart\n"
10601
"server for bzr. This value may only be specified in locations.conf, because:"
10602
msgstr ""
10603
10604
#: en/help_topics/configuration.txt:505
10605
msgid ""
10606
"- it's needed before branch.conf is accessible\n"
10607
"- allowing remote branch.conf files to specify commands would be a security\n"
10608
" risk"
10609
msgstr ""
10610
10611
#: en/help_topics/configuration.txt:509
10612
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10613
msgstr ""
10614
10615
#: en/help_topics/configuration.txt:511
10616
msgid ""
10617
"smtp_server\n"
10618
"~~~~~~~~~~~"
10619
msgstr ""
10620
10621
#: en/help_topics/configuration.txt:514
10622
msgid ""
10623
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10624
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10625
msgstr ""
10626
10627
#: en/help_topics/configuration.txt:517
10628
msgid ""
10629
"smtp_username, smtp_password\n"
10630
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10631
msgstr ""
10632
10633
#: en/help_topics/configuration.txt:520
10634
msgid ""
10635
"User and password to authenticate to the SMTP server. If smtp_username\n"
10636
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10637
"These settings are only needed if the SMTP server requires authentication\n"
10638
"to send mail."
10639
msgstr ""
10640
10641
#: en/help_topics/configuration.txt:525
10642
msgid ""
10643
"locks.steal_dead\n"
10644
"~~~~~~~~~~~~~~~~"
10645
msgstr ""
10646
10647
#: en/help_topics/configuration.txt:528
10648
msgid ""
10649
"If set to true, bzr will automatically break locks held by processes from\n"
10650
"the same machine and user that are no longer alive. Otherwise, it will\n"
10651
"print a message and you can break the lock manually, if you are satisfied\n"
10652
"the object is no longer in use."
10653
msgstr ""
10654
10655
#: en/help_topics/configuration.txt:533
10656
msgid ""
10657
"mail_client\n"
10658
"~~~~~~~~~~~"
10659
msgstr ""
10660
10661
#: en/help_topics/configuration.txt:536
10662
msgid ""
10663
"A mail client to use for sending merge requests.\n"
10664
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10665
"it\n"
10666
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10667
"``editor``."
10668
msgstr ""
10669
10670
#: en/help_topics/configuration.txt:541
10671
msgid "Supported values for specific clients:"
10672
msgstr ""
10673
10674
#: en/help_topics/configuration.txt:543
10675
msgid ""
10676
":claws: Use Claws. This skips a dialog for attaching files.\n"
10677
":evolution: Use Evolution.\n"
10678
":kmail: Use KMail.\n"
10679
":mutt: Use Mutt.\n"
10680
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10681
"1.5,\n"
10682
" this works around some bugs that xdg-email doesn't handle."
10683
msgstr ""
10684
10685
#: en/help_topics/configuration.txt:550
10686
msgid "Supported generic values are:"
10687
msgstr ""
10688
10689
#: en/help_topics/configuration.txt:552
10690
msgid ""
10691
":default: See above.\n"
10692
":editor: Use your editor to compose the merge request. This also uses\n"
10693
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10694
" smtp_username and smtp_password.\n"
10695
":mapi: Use your preferred e-mail client on Windows.\n"
10696
":xdg-email: Use xdg-email to run your preferred mail program"
10697
msgstr ""
10698
10699
#: en/help_topics/configuration.txt:559
10700
msgid ""
10701
"repository.fdatasync\n"
10702
"~~~~~~~~~~~~~~~~~~~~"
10703
msgstr ""
10704
10705
#: en/help_topics/configuration.txt:562
10706
msgid ""
10707
"If true (default), repository changes are flushed through the OS buffers\n"
10708
"to physical disk. This is somewhat slower, but means data should not be\n"
10709
"lost if the machine crashes. See also dirstate.fdatasync."
10710
msgstr ""
10711
10712
#: en/help_topics/configuration.txt:566
10713
msgid ""
10714
"submit_branch\n"
10715
"~~~~~~~~~~~~~"
10716
msgstr ""
10717
10718
#: en/help_topics/configuration.txt:569
10719
msgid ""
10720
"The branch you intend to submit your current work to. This is "
10721
"automatically\n"
10722
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10723
"This\n"
10724
"should usually be set on a per-branch or per-location basis."
10725
msgstr ""
10726
10727
#: en/help_topics/configuration.txt:573
10728
msgid ""
10729
"public_branch\n"
10730
"~~~~~~~~~~~~~"
10731
msgstr ""
10732
10733
#: en/help_topics/configuration.txt:576
10734
msgid ""
10735
"A publically-accessible version of this branch (implying that this version "
10736
"is\n"
10737
"not publically-accessible). Used (and set) by ``bzr send``."
10738
msgstr ""
10739
10740
#: en/help_topics/configuration.txt:579
10741
msgid ""
10742
"suppress_warnings\n"
10743
"~~~~~~~~~~~~~~~~~"
10744
msgstr ""
10745
10746
#: en/help_topics/configuration.txt:582
10747
msgid ""
10748
"A list of strings, each string represent a warning that can be emitted by\n"
10749
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10750
msgstr ""
10751
10752
#: en/help_topics/configuration.txt:585
10753
msgid "Valid values:"
10754
msgstr ""
10755
10756
#: en/help_topics/configuration.txt:587
10757
msgid ""
10758
"* ``format_deprecation``:\n"
10759
" whether the format deprecation warning is shown on repositories that "
10760
"are\n"
10761
" using deprecated formats."
10762
msgstr ""
10763
10764
#: en/help_topics/configuration.txt:591
10765
msgid ""
10766
"default_format\n"
10767
"~~~~~~~~~~~~~~"
10768
msgstr ""
10769
10770
#: en/help_topics/configuration.txt:594
10771
msgid ""
10772
"A format name for the default format used when creating branches. See "
10773
"``bzr\n"
10774
"help formats`` for possible values."
10775
msgstr ""
10776
10777
#: en/help_topics/configuration.txt:597
10778
msgid ""
10779
"\n"
10780
"Unicode options\n"
10781
"---------------"
10782
msgstr ""
10783
10784
#: en/help_topics/configuration.txt:601
10785
msgid ""
10786
"output_encoding\n"
10787
"~~~~~~~~~~~~~~~"
10788
msgstr ""
10789
10790
#: en/help_topics/configuration.txt:604
10791
msgid ""
10792
"A Python unicode encoding name for text output from bzr, such as log\n"
10793
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10794
"is the terminal encoding prefered by the operating system."
10795
msgstr ""
10796
10797
#: en/help_topics/configuration.txt:608
10798
msgid ""
10799
"\n"
10800
"Branch type specific options\n"
10801
"----------------------------"
10802
msgstr ""
10803
10804
#: en/help_topics/configuration.txt:612
10805
msgid ""
10806
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10807
"later format. They\n"
10808
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10809
"manually set in ``locations.conf`` or ``bazaar.conf``."
10810
msgstr ""
10811
10812
#: en/help_topics/configuration.txt:617
10813
msgid ""
10814
"append_revisions_only\n"
10815
"~~~~~~~~~~~~~~~~~~~~~"
10816
msgstr ""
10817
10818
#: en/help_topics/configuration.txt:620
10819
msgid ""
10820
"If set to \"True\" then revisions can only be appended to the log, not\n"
10821
"removed. A branch with this setting enabled can only pull from another\n"
10822
"branch if the other branch's log is a longer version of its own. This is\n"
10823
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10824
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10825
"compatibility with previous bzr versions (older than 2.2)."
10826
msgstr ""
10827
10828
#: en/help_topics/configuration.txt:627
10829
msgid ""
10830
"parent_location\n"
10831
"~~~~~~~~~~~~~~~"
10832
msgstr ""
10833
10834
#: en/help_topics/configuration.txt:630
10835
msgid ""
10836
"If present, the location of the default branch for pull or merge. This "
10837
"option\n"
10838
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10839
"--remember``."
10840
msgstr ""
10841
10842
#: en/help_topics/configuration.txt:634
10843
msgid ""
10844
"push_location\n"
10845
"~~~~~~~~~~~~~"
10846
msgstr ""
10847
10848
#: en/help_topics/configuration.txt:637
10849
msgid ""
10850
"If present, the location of the default branch for push. This option\n"
10851
"is normally set by the first ``push`` or ``push --remember``."
10852
msgstr ""
10853
10854
#: en/help_topics/configuration.txt:640
10855
msgid ""
10856
"push_strict\n"
10857
"~~~~~~~~~~~"
10858
msgstr ""
10859
10860
#: en/help_topics/configuration.txt:643
10861
msgid ""
10862
"If present, defines the ``--strict`` option default value for checking\n"
10863
"uncommitted changes before pushing."
10864
msgstr ""
10865
10866
#: en/help_topics/configuration.txt:646
10867
msgid ""
10868
"dpush_strict\n"
10869
"~~~~~~~~~~~~"
10870
msgstr ""
10871
10872
#: en/help_topics/configuration.txt:649
10873
msgid ""
10874
"If present, defines the ``--strict`` option default value for checking\n"
10875
"uncommitted changes before pushing into a different VCS without any\n"
10876
"custom bzr metadata."
10877
msgstr ""
10878
10879
#: en/help_topics/configuration.txt:653
10880
msgid ""
10881
"bound_location\n"
10882
"~~~~~~~~~~~~~~"
10883
msgstr ""
10884
10885
#: en/help_topics/configuration.txt:656
10886
msgid ""
10887
"The location that commits should go to when acting as a checkout.\n"
10888
"This option is normally set by ``bind``."
10889
msgstr ""
10890
10891
#: en/help_topics/configuration.txt:659
10892
msgid ""
10893
"bound\n"
10894
"~~~~~"
10895
msgstr ""
10896
10897
#: en/help_topics/configuration.txt:662
10898
msgid ""
10899
"If set to \"True\", the branch should act as a checkout, and push each "
10900
"commit to\n"
10901
"the bound_location. This option is normally set by ``bind``/``unbind``."
10902
msgstr ""
10903
10904
#: en/help_topics/configuration.txt:665
10905
msgid ""
10906
"send_strict\n"
10907
"~~~~~~~~~~~"
10908
msgstr ""
10909
10910
#: en/help_topics/configuration.txt:668
10911
msgid ""
10912
"If present, defines the ``--strict`` option default value for checking\n"
10913
"uncommitted changes before sending a merge directive."
10914
msgstr ""
10915
10916
#: en/help_topics/configuration.txt:671
10917
msgid ""
10918
"add.maximum_file_size\n"
10919
"~~~~~~~~~~~~~~~~~~~~~"
10920
msgstr ""
10921
10922
#: en/help_topics/configuration.txt:674
10923
msgid ""
10924
"Defines the maximum file size the command line \"add\" operation will allow\n"
10925
"in recursive mode, with files larger than this value being skipped. You may "
10926
"\n"
10927
"specify this value as an integer (in which case it is interpreted as bytes), "
10928
"\n"
10929
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10930
"0 \n"
10931
"will disable skipping."
10932
msgstr ""
10933
10934
#: en/help_topics/configuration.txt:680
10935
msgid ""
10936
"External Merge Tools\n"
10937
"--------------------"
10938
msgstr ""
10939
10940
#: en/help_topics/configuration.txt:683
10941
msgid ""
10942
"bzr.mergetool.<name>\n"
10943
"~~~~~~~~~~~~~~~~~~~~"
10944
msgstr ""
10945
10946
#: en/help_topics/configuration.txt:686
10947
msgid ""
10948
"Defines an external merge tool called <name> with the given command-line.\n"
10949
"Arguments containing spaces should be quoted using single or double quotes. "
10950
"The\n"
10951
"executable may omit its path if it can be found on the PATH."
10952
msgstr ""
10953
10954
#: en/help_topics/configuration.txt:690
10955
msgid ""
10956
"The following markers can be used in the command-line to substitute "
10957
"filenames\n"
10958
"involved in the merge conflict::"
10959
msgstr ""
10960
10961
#: en/help_topics/configuration.txt:693
10962
msgid ""
10963
" {base} file.BASE\n"
10964
" {this} file.THIS\n"
10965
" {other} file.OTHER\n"
10966
" {result} output file\n"
10967
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10968
"merge\n"
10969
" succeeds."
10970
msgstr ""
10971
10972
#: en/help_topics/configuration.txt:702
10973
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10974
msgstr ""
10975
10976
#: en/help_topics/configuration.txt:704
10977
msgid ""
10978
"bzr.default_mergetool\n"
10979
"~~~~~~~~~~~~~~~~~~~~~"
10980
msgstr ""
10981
10982
#: en/help_topics/configuration.txt:707
10983
msgid ""
10984
"Specifies which external merge tool (as defined above) should be selected "
10985
"by\n"
10986
"default in tools such as ``bzr qconflicts``."
10987
msgstr ""
10988
10989
#: en/help_topics/configuration.txt:712
10990
msgid " bzr.default_mergetool = kdiff3\n"
10991
msgstr ""
10992
10993
#: en/help_topics/conflict-types.txt:1
10994
msgid ""
10995
"Conflict Types\n"
10996
"=============="
10997
msgstr ""
10998
10999
#: en/help_topics/conflict-types.txt:4
11000
msgid ""
11001
"Some operations, like merge, revert and pull, modify the contents of your\n"
11002
"working tree. These modifications are programmatically generated, and so "
11003
"they\n"
11004
"may conflict with the current state of your working tree. "
11005
msgstr ""
11006
11007
#: en/help_topics/conflict-types.txt:8
11008
msgid ""
11009
"When conflicts are present in your working tree (as shown by ``bzr\n"
11010
"conflicts``), you should resolve them and then inform bzr that the "
11011
"conflicts\n"
11012
"have been resolved."
11013
msgstr ""
11014
11015
#: en/help_topics/conflict-types.txt:12
11016
msgid ""
11017
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
11018
"should resolve them is not the one responsible for their occurrence, as is "
11019
"the\n"
11020
"case when merging other people's work or because some conflicts are "
11021
"presented\n"
11022
"in a way that is not easy to understand."
11023
msgstr ""
11024
11025
#: en/help_topics/conflict-types.txt:17
11026
msgid ""
11027
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
11028
"conflict if and only if there's an actual conceptual conflict in the source\n"
11029
"tree. Because Bazaar doesn't understand the real meaning of the files "
11030
"being\n"
11031
"versioned, it can, when faced with ambiguities, fall short in either "
11032
"direction\n"
11033
"trying to resolve the conflict itself. Many kinds of changes can be "
11034
"combined\n"
11035
"programmatically, but sometimes only a human can determine the right thing "
11036
"to\n"
11037
"do."
11038
msgstr ""
11039
11040
#: en/help_topics/conflict-types.txt:25
11041
msgid ""
11042
"When Bazaar generates a conflict, it adds information into the working tree "
11043
"to\n"
11044
"present the conflicting versions, and it's up to you to find the correct\n"
11045
"resolution."
11046
msgstr ""
11047
11048
#: en/help_topics/conflict-types.txt:29
11049
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
11050
msgstr ""
11051
11052
#: en/help_topics/conflict-types.txt:31
11053
msgid ""
11054
"1. Modify the working tree content so that the conflicted item is now in "
11055
"the\n"
11056
" state you want to keep, then"
11057
msgstr ""
11058
11059
#: en/help_topics/conflict-types.txt:34
11060
msgid ""
11061
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
11062
" remaining generated information (``bzr resolve <item>``)."
11063
msgstr ""
11064
11065
#: en/help_topics/conflict-types.txt:37
11066
msgid ""
11067
"For most conflict types, there are some obvious ways to modify the working\n"
11068
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
11069
"itself already made a choice, when possible."
11070
msgstr ""
11071
11072
#: en/help_topics/conflict-types.txt:41
11073
msgid ""
11074
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
11075
"different ways to resolve the conflict."
11076
msgstr ""
11077
11078
#: en/help_topics/conflict-types.txt:44
11079
msgid ""
11080
"Each type of conflict is explained below, and the action which must be done "
11081
"to\n"
11082
"resolve the conflict is outlined."
11083
msgstr ""
11084
11085
#: en/help_topics/conflict-types.txt:47
11086
msgid ""
11087
"Various actions are available depending on the kind of conflict, for some "
11088
"of\n"
11089
"these actions, Bazaar can provide some help. In the end you should at least\n"
11090
"inform Bazaar that you're done with the conflict with::"
11091
msgstr ""
11092
11093
#: en/help_topics/conflict-types.txt:51
11094
msgid " ``bzr resolve FILE --action=done'"
11095
msgstr ""
11096
11097
#: en/help_topics/conflict-types.txt:53
11098
msgid ""
11099
"Note that this is the default action when a single file is involved so you "
11100
"can\n"
11101
"simply use::"
11102
msgstr ""
11103
11104
#: en/help_topics/conflict-types.txt:56
11105
msgid " ``bzr resolve FILE``"
11106
msgstr ""
11107
11108
#: en/help_topics/conflict-types.txt:58
11109
msgid "See ``bzr help resolve`` for more details."
11110
msgstr ""
11111
11112
#: en/help_topics/conflict-types.txt:60
11113
msgid ""
11114
"Text conflicts\n"
11115
"--------------"
11116
msgstr ""
11117
11118
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
11119
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
11120
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11121
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11122
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
11123
msgid "Typical message::"
11124
msgstr ""
11125
11126
#: en/help_topics/conflict-types.txt:65
11127
msgid " Text conflict in FILE"
11128
msgstr ""
11129
11130
#: en/help_topics/conflict-types.txt:67
11131
msgid ""
11132
"These are produced when a text merge cannot completely reconcile two sets "
11133
"of\n"
11134
"text changes. Bazaar will emit files for each version with the extensions\n"
11135
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
11136
"tree,\n"
11137
"i.e. the tree that you are merging changes into. OTHER is the version that "
11138
"you\n"
11139
"are merging into the target. BASE is an older version that is used as a "
11140
"basis\n"
11141
"for comparison."
11142
msgstr ""
11143
11144
#: en/help_topics/conflict-types.txt:74
11145
msgid ""
11146
"In the main copy of the file, Bazaar will include all the changes that it\n"
11147
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11148
"\"herringbone\" markers like ``<<<<<<<``."
11149
msgstr ""
11150
11151
#: en/help_topics/conflict-types.txt:78
11152
msgid ""
11153
"Say the initial text is \"The project leader released it.\", and THIS "
11154
"modifies it\n"
11155
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11156
"leader\n"
11157
"released Bazaar.\" A conflict would look like this::"
11158
msgstr ""
11159
11160
#: en/help_topics/conflict-types.txt:82
11161
msgid ""
11162
" <<<<<<< TREE\n"
11163
" Martin Pool released it.\n"
11164
" =======\n"
11165
" The project leader released Bazaar.\n"
11166
" >>>>>>> MERGE-SOURCE"
11167
msgstr ""
11168
11169
#: en/help_topics/conflict-types.txt:88
11170
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11171
msgstr ""
11172
11173
#: en/help_topics/conflict-types.txt:90
11174
msgid ""
11175
"You can handle text conflicts either by editing the main copy of the file,\n"
11176
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
11177
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11178
"set of changes over the other (but see below when you encounter these\n"
11179
"cases). More often, the two sets of changes must be intelligently combined."
11180
msgstr ""
11181
11182
#: en/help_topics/conflict-types.txt:96
11183
msgid ""
11184
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
11185
"you are done editing, the file should look like it never had a conflict, and "
11186
"be\n"
11187
"ready to commit."
11188
msgstr ""
11189
11190
#: en/help_topics/conflict-types.txt:100
11191
msgid ""
11192
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
11193
"Bazaar will auto-detect which conflicts you have resolved."
11194
msgstr ""
11195
11196
#: en/help_topics/conflict-types.txt:103
11197
msgid ""
11198
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11199
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11200
"working tree."
11201
msgstr ""
11202
11203
#: en/help_topics/conflict-types.txt:107
11204
msgid ""
11205
"\n"
11206
"When you want to pick one set of changes over the other, you can use ``bzr\n"
11207
"resolve`` with one of the following actions:"
11208
msgstr ""
11209
11210
#: en/help_topics/conflict-types.txt:111
11211
msgid ""
11212
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11213
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11214
msgstr ""
11215
11216
#: en/help_topics/conflict-types.txt:114
11217
msgid ""
11218
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11219
"modifications will be taken into account."
11220
msgstr ""
11221
11222
#: en/help_topics/conflict-types.txt:117
11223
msgid ""
11224
"Content conflicts\n"
11225
"-----------------"
11226
msgstr ""
11227
11228
#: en/help_topics/conflict-types.txt:122
11229
msgid " Contents conflict in FILE"
11230
msgstr ""
11231
11232
#: en/help_topics/conflict-types.txt:124
11233
msgid ""
11234
"This conflict happens when there are conflicting changes in the working "
11235
"tree\n"
11236
"and the merge source, but the conflicted items are not text files. They "
11237
"may\n"
11238
"be binary files, or symlinks, or directories. It can even happen with "
11239
"files\n"
11240
"that are deleted on one side, and modified on the other."
11241
msgstr ""
11242
11243
#: en/help_topics/conflict-types.txt:129
11244
msgid ""
11245
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
11246
"be\n"
11247
"regular files, symlinks or directories). But it will not include a \"main "
11248
"copy\"\n"
11249
"of the file with herringbone conflict markers. It will appear that the "
11250
"\"main\n"
11251
"copy\" has been renamed to THIS or OTHER."
11252
msgstr ""
11253
11254
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11255
msgid ""
11256
"To resolve that kind of conflict, you should rebuild FILE from either "
11257
"version\n"
11258
"or a combination of both."
11259
msgstr ""
11260
11261
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11262
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11263
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11264
#: en/help_topics/conflict-types.txt:361
11265
msgid "``bzr resolve`` recognizes the following actions:"
11266
msgstr ""
11267
11268
#: en/help_topics/conflict-types.txt:139
11269
msgid ""
11270
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
11271
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11272
"* ``--action=done`` will just mark the conflict as resolved."
11273
msgstr ""
11274
11275
#: en/help_topics/conflict-types.txt:143
11276
msgid ""
11277
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11278
"and\n"
11279
"``.OTHER`` files if they are still present in the working tree."
11280
msgstr ""
11281
11282
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11283
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11284
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11285
#: en/help_topics/conflict-types.txt:369
11286
msgid ""
11287
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11288
msgstr ""
11289
11290
#: en/help_topics/conflict-types.txt:148
11291
msgid ""
11292
"Tag conflicts\n"
11293
"-------------"
11294
msgstr ""
11295
11296
#: en/help_topics/conflict-types.txt:153
11297
msgid ""
11298
" Conflicting tags:\n"
11299
" version-0.1"
11300
msgstr ""
11301
11302
#: en/help_topics/conflict-types.txt:156
11303
msgid ""
11304
"When pulling from or pushing to another branch, Bazaar informs you about "
11305
"tags\n"
11306
"that conflict between the two branches; that is the same tag points to two\n"
11307
"different revisions. You need not resolve these conflicts, but subsequent\n"
11308
"uses of pull or push will result in the same message."
11309
msgstr ""
11310
11311
#: en/help_topics/conflict-types.txt:161
11312
msgid ""
11313
"To resolve the conflict, you must apply the correct tags to either the "
11314
"target\n"
11315
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11316
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11317
"target branch's tags match the source branch, then in the target branch do\n"
11318
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11319
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11320
"source\n"
11321
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11322
"favor of the target branch, you need to similarly use ``tag --force`` in "
11323
"the\n"
11324
"source branch. (Note that pulling or pushing using --overwrite will "
11325
"overwrite\n"
11326
"all tags as well.)"
11327
msgstr ""
11328
11329
#: en/help_topics/conflict-types.txt:172
11330
msgid ""
11331
"Duplicate paths\n"
11332
"---------------"
11333
msgstr ""
11334
11335
#: en/help_topics/conflict-types.txt:177
11336
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11337
msgstr ""
11338
11339
#: en/help_topics/conflict-types.txt:179
11340
msgid ""
11341
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11342
"already been used. The existing file will be renamed to \"FILE.moved\". "
11343
msgstr ""
11344
11345
#: en/help_topics/conflict-types.txt:187
11346
msgid ""
11347
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11348
"FILE``,\n"
11349
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11350
"* ``--action=done`` will just mark the conflict as resolved."
11351
msgstr ""
11352
11353
#: en/help_topics/conflict-types.txt:191
11354
msgid ""
11355
"Note that you must get rid of FILE.moved before using ``--action=done``."
11356
msgstr ""
11357
11358
#: en/help_topics/conflict-types.txt:195
11359
msgid ""
11360
"Unversioned parent\n"
11361
"------------------"
11362
msgstr ""
11363
11364
#: en/help_topics/conflict-types.txt:200
11365
msgid ""
11366
" Conflict because FILE is not versioned, but has versioned children."
11367
msgstr ""
11368
11369
#: en/help_topics/conflict-types.txt:202
11370
msgid ""
11371
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11372
"not\n"
11373
"versioned. This happens when the directory has been deleted in the target,\n"
11374
"but has a new child in the source, or vice versa. In this situation, "
11375
"Bazaar\n"
11376
"will version the parent directory as well. Resolving this issue depends\n"
11377
"very much on the particular scenario. You may wish to rename or delete "
11378
"either\n"
11379
"the file or the directory. When you are satisfied, you can run \"bzr "
11380
"resolve\n"
11381
"FILE\" to mark the conflict as resolved."
11382
msgstr ""
11383
11384
#: en/help_topics/conflict-types.txt:210
11385
msgid ""
11386
"Missing parent\n"
11387
"--------------"
11388
msgstr ""
11389
11390
#: en/help_topics/conflict-types.txt:215
11391
msgid " Conflict adding files to FILE. Created directory."
11392
msgstr ""
11393
11394
#: en/help_topics/conflict-types.txt:217
11395
msgid ""
11396
"This happens when a directory has been deleted in the target, but has new\n"
11397
"children in the source. This is similar to the \"unversioned parent\" "
11398
"conflict,\n"
11399
"except that the parent directory does not *exist*, instead of just being\n"
11400
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11401
"Resolving this issue depends very much on the particular scenario."
11402
msgstr ""
11403
11404
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11405
msgid ""
11406
"To resolve that kind of conflict, you should either remove or rename the\n"
11407
"children or the directory or a combination of both."
11408
msgstr ""
11409
11410
#: en/help_topics/conflict-types.txt:228
11411
msgid ""
11412
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11413
" children,\n"
11414
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11415
"children\n"
11416
" and restoring the directory,\n"
11417
"* ``--action=done`` will just mark the conflict as resolved."
11418
msgstr ""
11419
11420
#: en/help_topics/conflict-types.txt:236
11421
msgid ""
11422
"Deleting parent\n"
11423
"---------------"
11424
msgstr ""
11425
11426
#: en/help_topics/conflict-types.txt:241
11427
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11428
msgstr ""
11429
11430
#: en/help_topics/conflict-types.txt:243
11431
msgid ""
11432
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11433
"source, but has new children in the target (either because a directory\n"
11434
"deletion is merged or because the merge introduce new children). Bazaar\n"
11435
"will retain the directory. Resolving this issue depends very much on the\n"
11436
"particular scenario."
11437
msgstr ""
11438
11439
#: en/help_topics/conflict-types.txt:254
11440
msgid ""
11441
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11442
"directory,"
11443
msgstr ""
11444
11445
#: en/help_topics/conflict-types.txt:256
11446
msgid ""
11447
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11448
" children,"
11449
msgstr ""
11450
11451
#: en/help_topics/conflict-types.txt:259
11452
msgid "* ``--action=done`` will just mark the conflict as resolved."
11453
msgstr ""
11454
11455
#: en/help_topics/conflict-types.txt:261
11456
msgid ""
11457
"Note that when merging a directory deletion, if unversioned files are\n"
11458
"present, they become potential orphans has they don't have a directory\n"
11459
"parent anymore."
11460
msgstr ""
11461
11462
#: en/help_topics/conflict-types.txt:265
11463
msgid ""
11464
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11465
"setting the ``bzr.transform.orphan_policy`` configuration option."
11466
msgstr ""
11467
11468
#: en/help_topics/conflict-types.txt:268
11469
msgid "There are two possible values for this option:"
11470
msgstr ""
11471
11472
#: en/help_topics/conflict-types.txt:270
11473
msgid ""
11474
"* ``conflict`` (the default): will leave the orphans in place and\n"
11475
" generate a conflicts,"
11476
msgstr ""
11477
11478
#: en/help_topics/conflict-types.txt:273
11479
msgid ""
11480
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11481
"root\n"
11482
" of the working tree with names like ``<file>.~#~``."
11483
msgstr ""
11484
11485
#: en/help_topics/conflict-types.txt:278
11486
msgid ""
11487
"Path conflict\n"
11488
"-------------"
11489
msgstr ""
11490
11491
#: en/help_topics/conflict-types.txt:283
11492
msgid " Path conflict: PATH1 / PATH2"
11493
msgstr ""
11494
11495
#: en/help_topics/conflict-types.txt:285
11496
msgid ""
11497
"This happens when the source and target have each modified the name or "
11498
"parent\n"
11499
"directory of a file. Bazaar will use the path elements from the source."
11500
msgstr ""
11501
11502
#: en/help_topics/conflict-types.txt:288
11503
msgid ""
11504
"To resolve that kind of conflict, you just have to decide what name should "
11505
"be\n"
11506
"retained for the file involved."
11507
msgstr ""
11508
11509
#: en/help_topics/conflict-types.txt:293
11510
msgid ""
11511
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11512
" issuing ``bzr mv PATH2 PATH1``,\n"
11513
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11514
"``PATH2``,\n"
11515
"* ``--action=done`` will just mark the conflict as resolved."
11516
msgstr ""
11517
11518
#: en/help_topics/conflict-types.txt:300
11519
msgid ""
11520
"Parent loop\n"
11521
"-----------"
11522
msgstr ""
11523
11524
#: en/help_topics/conflict-types.txt:305
11525
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11526
msgstr ""
11527
11528
#: en/help_topics/conflict-types.txt:307
11529
msgid ""
11530
"This happens when the source and the target have each moved directories, so\n"
11531
"that, if the change could be applied, a directory would be contained by "
11532
"itself.\n"
11533
"For example::"
11534
msgstr ""
11535
11536
#: en/help_topics/conflict-types.txt:311
11537
msgid ""
11538
" $ bzr init\n"
11539
" $ bzr mkdir white\n"
11540
" $ bzr mkdir black\n"
11541
" $ bzr commit -m \"BASE\"\n"
11542
" $ bzr branch . ../other\n"
11543
" $ bzr mv white black\n"
11544
" $ bzr commit -m \"THIS\"\n"
11545
" $ bzr mv ../other/black ../other/white\n"
11546
" $ bzr commit ../other -m \"OTHER\"\n"
11547
" $ bzr merge ../other"
11548
msgstr ""
11549
11550
#: en/help_topics/conflict-types.txt:322
11551
msgid ""
11552
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11553
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11554
"name should be retained for the directories involved."
11555
msgstr ""
11556
11557
#: en/help_topics/conflict-types.txt:328
11558
msgid ""
11559
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11560
"\n"
11561
" in ``black``,\n"
11562
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11563
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11564
"* ``--action=done`` will just mark the conflict as resolved."
11565
msgstr ""
11566
11567
#: en/help_topics/conflict-types.txt:336
11568
msgid ""
11569
"Non-directory parent\n"
11570
"--------------------"
11571
msgstr ""
11572
11573
#: en/help_topics/conflict-types.txt:341
11574
msgid ""
11575
" Conflict: foo.new is not a directory, but has files in it.\n"
11576
" Created directory."
11577
msgstr ""
11578
11579
#: en/help_topics/conflict-types.txt:344
11580
msgid ""
11581
"This happens when one side has added files to a directory, and the other "
11582
"side\n"
11583
"has changed the directory into a file or symlink. For example::"
11584
msgstr ""
11585
11586
#: en/help_topics/conflict-types.txt:347
11587
msgid ""
11588
" $ bzr init\n"
11589
" $ bzr mkdir foo\n"
11590
" $ bzr commit -m \"BASE\"\n"
11591
" $ bzr branch . ../other\n"
11592
" $ rmdir foo\n"
11593
" $ touch foo\n"
11594
" $ bzr commit -m \"THIS\"\n"
11595
" $ bzr mkdir ../other/foo/bar\n"
11596
" $ bzr commit ../other -m \"OTHER\"\n"
11597
" $ bzr merge ../other"
11598
msgstr ""
11599
11600
#: en/help_topics/conflict-types.txt:358
11601
msgid ""
11602
"To resolve that kind of conflict, you have to decide what name should be\n"
11603
"retained for the file, directory or symlink involved."
11604
msgstr ""
11605
11606
#: en/help_topics/conflict-types.txt:363
11607
msgid ""
11608
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11609
" ``bzr add foo``,\n"
11610
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11611
" ``bzr mv foo.new foo``,\n"
11612
"* ``--action=done`` will just mark the conflict as resolved."
11613
msgstr ""
11614
11615
#: en/help_topics/conflict-types.txt:371
11616
msgid ""
11617
"MalformedTransform\n"
11618
"------------------"
11619
msgstr ""
11620
11621
#: en/help_topics/conflict-types.txt:374
11622
msgid ""
11623
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11624
"exception. This means that Bazaar encountered a filesystem conflict that it "
11625
"was\n"
11626
"unable to resolve. This usually indicates a bug. Please let us know if "
11627
"you\n"
11628
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11629
msgstr ""
11630
11631
#: en/help_topics/content-filters.txt:1
11632
msgid ""
11633
"Content Filters\n"
11634
"==============="
11635
msgstr ""
11636
11637
#: en/help_topics/content-filters.txt:4
11638
msgid ""
11639
"Content formats\n"
11640
"---------------"
11641
msgstr ""
11642
11643
#: en/help_topics/content-filters.txt:7
11644
msgid ""
11645
"Bazaar's content filtering allows you to store files in a different\n"
11646
"format from the copy in your working tree. This lets you, or your\n"
11647
"co-developers, use Windows development tools that expect CRLF files\n"
11648
"on projects that use other line-ending conventions. Among other things,\n"
11649
"content filters also let Unix developers more easily work on projects\n"
11650
"using Windows line-ending conventions, keyword expansion/compression,\n"
11651
"and trailing spaces on lines in text files to be implicitly stripped\n"
11652
"when committed."
11653
msgstr ""
11654
11655
#: en/help_topics/content-filters.txt:16
11656
msgid "To generalize, there are two content formats supported by Bazaar:"
11657
msgstr ""
11658
11659
#: en/help_topics/content-filters.txt:18
11660
msgid ""
11661
"* a canonical format - how files are stored internally\n"
11662
"* a convenience format - how files are created in a working tree."
11663
msgstr ""
11664
11665
#: en/help_topics/content-filters.txt:21
11666
msgid ""
11667
"\n"
11668
"Format conversion\n"
11669
"-----------------"
11670
msgstr ""
11671
11672
#: en/help_topics/content-filters.txt:25
11673
msgid ""
11674
"The conversion between these formats is done by content filters.\n"
11675
"A content filter has two parts:"
11676
msgstr ""
11677
11678
#: en/help_topics/content-filters.txt:28
11679
msgid ""
11680
"* a read converter - converts from convenience to canonical format\n"
11681
"* a write converter - converts from canonical to convenience format."
11682
msgstr ""
11683
11684
#: en/help_topics/content-filters.txt:31
11685
msgid ""
11686
"Many of these converters will provide *round-trip* conversion,\n"
11687
"i.e. applying the read converter followed by the write converter\n"
11688
"gives back the original content. However, others may provide an\n"
11689
"asymmetric conversion. For example, a read converter might strip\n"
11690
"trailing whitespace off lines in source code while the matching\n"
11691
"write converter might pass content through unchanged."
11692
msgstr ""
11693
11694
#: en/help_topics/content-filters.txt:38
11695
msgid ""
11696
"\n"
11697
"Enabling content filters\n"
11698
"------------------------"
11699
msgstr ""
11700
11701
#: en/help_topics/content-filters.txt:42
11702
msgid ""
11703
"Content filters are typically provided by plugins, so the first step\n"
11704
"in using them is to install the relevant plugins and read their\n"
11705
"documentation. Some plugins may be very specific about which files\n"
11706
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11707
"In other cases, the plugin may leave it in the user's hands to\n"
11708
"define which files are to be filtered. This is typically done\n"
11709
"using rule-based preferences. See ``bzr help rules`` for general\n"
11710
"information about defining these."
11711
msgstr ""
11712
11713
#: en/help_topics/content-filters.txt:51
11714
msgid ""
11715
"\n"
11716
"Impact on commands\n"
11717
"------------------"
11718
msgstr ""
11719
11720
#: en/help_topics/content-filters.txt:55
11721
msgid ""
11722
"Read converters are only applied to commands that read content from\n"
11723
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11724
"will apply read converters to files in the working tree, then compare\n"
11725
"the results to the content last committed."
11726
msgstr ""
11727
11728
#: en/help_topics/content-filters.txt:60
11729
msgid ""
11730
"Write converters are only applied by commands that **create files in a\n"
11731
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11732
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11733
"respectively."
11734
msgstr ""
11735
11736
#: en/help_topics/content-filters.txt:65
11737
msgid ""
11738
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11739
"comitting files. If this makes sense for a given plugin providing\n"
11740
"a content filter, the plugin can usually achieve this effect by using a\n"
11741
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11742
"for more information on hooks."
11743
msgstr ""
11744
11745
#: en/help_topics/content-filters.txt:71
11746
msgid ""
11747
"\n"
11748
"Refreshing your working tree\n"
11749
"----------------------------"
11750
msgstr ""
11751
11752
#: en/help_topics/content-filters.txt:75
11753
msgid ""
11754
"For performance reasons, Bazaar caches the timestamps of files in\n"
11755
"a working tree, and assumes files are unchanged if their timestamps\n"
11756
"match the cached values. As a consequence, there are times when\n"
11757
"you may need to explicitly ask for content filtering to be reapplied\n"
11758
"in one or both directions, e.g. after installing or reconfiguring\n"
11759
"plugins providing it."
11760
msgstr ""
11761
11762
#: en/help_topics/content-filters.txt:82
11763
msgid "Here are some general guidelines for doing this:"
11764
msgstr ""
11765
11766
#: en/help_topics/content-filters.txt:84
11767
msgid ""
11768
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11769
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11770
" relevant read converters and compare the end result with the\n"
11771
" canonical format."
11772
msgstr ""
11773
11774
#: en/help_topics/content-filters.txt:89
11775
msgid ""
11776
" * To reapply write converters, ensure there are no local changes,\n"
11777
" delete the relevant files and run ``bzr revert`` on those files."
11778
msgstr ""
11779
11780
#: en/help_topics/content-filters.txt:92
11781
msgid ""
11782
"Note: In the future, it is likely that additional options will be added\n"
11783
"to commands to make this refreshing process faster and safer.\n"
11784
msgstr ""
11785
11786
#: en/help_topics/current-formats.txt:1
11787
msgid "Current Storage Formats"
11788
msgstr ""
11789
11790
#: en/help_topics/current-formats.txt:3
11791
msgid ""
11792
":2a:\n"
11793
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11794
" compress storage. Provides rich roots which are a one-way\n"
11795
" transition."
11796
msgstr ""
11797
11798
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11799
msgid ""
11800
"\n"
11801
"See :doc:`formats-help` for more about storage formats."
11802
msgstr ""
11803
11804
#: en/help_topics/debug-flags.txt:1
11805
msgid ""
11806
"Debug Flags\n"
11807
"==========="
11808
msgstr ""
11809
11810
#: en/help_topics/debug-flags.txt:4
11811
msgid ""
11812
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11813
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11814
msgstr ""
11815
11816
#: en/help_topics/debug-flags.txt:7
11817
msgid ""
11818
"-Dauth Trace authentication sections used.\n"
11819
"-Dbytes Print out how many bytes were transferred\n"
11820
"-Ddirstate Trace dirstate activity (verbose!)\n"
11821
"-Derror Instead of normal error handling, always print a "
11822
"traceback\n"
11823
" on error.\n"
11824
"-Devil Capture call sites that do expensive or badly-scaling\n"
11825
" operations.\n"
11826
"-Dfetch Trace history copying between repositories.\n"
11827
"-Dfilters Emit information for debugging content filtering.\n"
11828
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11829
"fetch.\n"
11830
"-Dgraph Trace graph traversal.\n"
11831
"-Dhashcache Log every time a working file is read to determine its "
11832
"hash.\n"
11833
"-Dhooks Trace hook execution.\n"
11834
"-Dhpss Trace smart protocol requests and responses.\n"
11835
"-Dhpssdetail More hpss details.\n"
11836
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11837
"-Dhttp Trace http connections, requests and responses.\n"
11838
"-Dindex Trace major index operations.\n"
11839
"-Dknit Trace knit operations.\n"
11840
"-Dlock Trace when lockdir locks are taken or released.\n"
11841
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11842
" retrying the request.\n"
11843
"-Dprogress Trace progress bar operations.\n"
11844
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11845
"-Dmerge Emit information for debugging merges.\n"
11846
"-Dno_apport Don't use apport to report crashes.\n"
11847
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11848
"-Dpack Emit information about pack operations.\n"
11849
"-Drelock Emit a message every time a branch or repository object "
11850
"is\n"
11851
" unlocked then relocked the same way.\n"
11852
"-Dsftp Trace SFTP internals.\n"
11853
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11854
"expected\n"
11855
"-Dstream Trace fetch streams.\n"
11856
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11857
"portable\n"
11858
" manner.\n"
11859
"-Dunlock Some errors during unlock are treated as warnings.\n"
11860
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11861
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11862
"appropriate\n"
11863
" for the format, even for non-local fetches.\n"
11864
msgstr ""
11865
11866
#: en/help_topics/diverged-branches.txt:1
11867
msgid ""
11868
"Diverged Branches\n"
11869
"================="
11870
msgstr ""
11871
11872
#: en/help_topics/diverged-branches.txt:4
11873
msgid ""
11874
"When Bazaar tries to push one branch onto another, it requires that the\n"
11875
"destination branch must be ready to receive the source branch. If this "
11876
"isn't\n"
11877
"the case, then we say that the branches have ``diverged``. Branches are\n"
11878
"considered diverged if the destination branch's most recent commit is one "
11879
"that\n"
11880
"has not been merged (directly or indirectly) by the source branch. To "
11881
"recover\n"
11882
"from diverged branches, one must merge the missing revisions into the "
11883
"source\n"
11884
"branch."
11885
msgstr ""
11886
11887
#: en/help_topics/diverged-branches.txt:12
11888
msgid ""
11889
"This situation commonly arises when using a centralized workflow with local\n"
11890
"commits. If someone else has committed new work to the mainline since your\n"
11891
"last pull and you have local commits that have not yet been pushed to the\n"
11892
"mainline, then your local branch and the mainline have diverged."
11893
msgstr ""
11894
11895
#: en/help_topics/diverged-branches.txt:17
11896
msgid ""
11897
"Discovering What Has Diverged\n"
11898
"-----------------------------"
11899
msgstr ""
11900
11901
#: en/help_topics/diverged-branches.txt:20
11902
msgid ""
11903
"The ``bzr missing`` command is used to find out what revisions are in "
11904
"another\n"
11905
"branch that are not present in the current branch, and vice-versa. It shows "
11906
"a\n"
11907
"summary of which extra revisions exist in each branch. If you want to see "
11908
"the\n"
11909
"precise effects of those revisions, you can use ``bzr diff --"
11910
"old=other_branch``\n"
11911
"to show the differences between other_branch and your current branch."
11912
msgstr ""
11913
11914
#: en/help_topics/diverged-branches.txt:26
11915
msgid ""
11916
"A Solution\n"
11917
"----------"
11918
msgstr ""
11919
11920
#: en/help_topics/diverged-branches.txt:29
11921
msgid ""
11922
"The solution is to merge the revisions from the mainline into your local\n"
11923
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11924
"mainline. This merge may result in conflicts if the other developer's "
11925
"changes\n"
11926
"overlap with your changes. These conflicts should be resolved before\n"
11927
"continuing. After any conflicts have been resolved, or even if there were "
11928
"no\n"
11929
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11930
"to your local branch. This requirement gives you an opportunity to test "
11931
"the\n"
11932
"resulting working tree for correctness, since the merged revisions could "
11933
"have\n"
11934
"made arbitrary changes. After testing, you should commit the merge using\n"
11935
"``bzr commit``. This clears up the diverged branches situation. Your "
11936
"local\n"
11937
"branch can now be pushed to the mainline.\n"
11938
msgstr ""
11939
11940
#: en/help_topics/eol.txt:1
11941
msgid ""
11942
"End of Line Conversion\n"
11943
"======================"
11944
msgstr ""
11945
11946
#: en/help_topics/eol.txt:4
11947
msgid ""
11948
"EOL conversion is provided as a content filter where Bazaar internally\n"
11949
"stores a canonical format but outputs a convenience format. See\n"
11950
"``bzr help content-filters`` for general information about using these."
11951
msgstr ""
11952
11953
#: en/help_topics/eol.txt:8
11954
msgid ""
11955
"Note: Content filtering is only supported in recently added formats,\n"
11956
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11957
"in a recent format. (Just setting the format on the repository\n"
11958
"is not enough.) If content filtering does not appear to be working, use\n"
11959
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11960
"or later."
11961
msgstr ""
11962
11963
#: en/help_topics/eol.txt:15
11964
msgid ""
11965
"EOL conversion needs to be enabled for selected file patterns using\n"
11966
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11967
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11968
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11969
"supported in a future verison of Bazaar."
11970
msgstr ""
11971
11972
#: en/help_topics/eol.txt:21
11973
msgid ""
11974
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11975
"(If a value is not set, ``exact`` is the default.)"
11976
msgstr ""
11977
11978
#: en/help_topics/eol.txt:24
11979
msgid ""
11980
" ========== ===================================== ======================\n"
11981
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11982
" ========== ===================================== ======================\n"
11983
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11984
" ---------- ------------------------------------- ----------------------\n"
11985
" ``lf`` ``lf`` ``lf``\n"
11986
" ---------- ------------------------------------- ----------------------\n"
11987
" ``crlf`` ``crlf`` ``lf``\n"
11988
" ---------- ------------------------------------- ----------------------\n"
11989
" ``exact`` No conversion Exactly as in file\n"
11990
" ========== ===================================== ======================"
11991
msgstr ""
11992
11993
#: en/help_topics/eol.txt:36
11994
msgid ""
11995
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11996
"byte is detected in the file."
11997
msgstr ""
11998
11999
#: en/help_topics/eol.txt:39
12000
msgid ""
12001
"For users working on a cross-platform project, here is a suggested rule\n"
12002
"to use as a starting point::"
12003
msgstr ""
12004
12005
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
12006
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
12007
msgid ""
12008
" [name *]\n"
12009
" eol = native"
12010
msgstr ""
12011
12012
#: en/help_topics/eol.txt:45
12013
msgid ""
12014
"If you have binary files that do not contain a null byte though, be\n"
12015
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
12016
"by giving more explicit patterns earlier in the rules file. For example::"
12017
msgstr ""
12018
12019
#: en/help_topics/eol.txt:49
12020
msgid ""
12021
" [name *.png]\n"
12022
" eol = exact"
12023
msgstr ""
12024
12025
#: en/help_topics/eol.txt:55
12026
msgid ""
12027
"If your working tree is on a network drive shared by users on different\n"
12028
"operating systems, you typically want to force certain conventions for\n"
12029
"certain files. In that way, if a file is created with the wrong line\n"
12030
"endings or line endings get mixed during editing, it gets committed\n"
12031
"correctly and gets checked out correctly. For example::"
12032
msgstr ""
12033
12034
#: en/help_topics/eol.txt:61
12035
msgid ""
12036
" [name *.bat]\n"
12037
" eol = crlf"
12038
msgstr ""
12039
12040
#: en/help_topics/eol.txt:64
12041
msgid ""
12042
" [name *.sh]\n"
12043
" eol = lf"
12044
msgstr ""
12045
12046
#: en/help_topics/eol.txt:70
12047
msgid ""
12048
"If you take the care to create files with their required endings, you can\n"
12049
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
12050
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
12051
"introducing mixed line endings will be corrected during commit for files\n"
12052
"with those settings."
12053
msgstr ""
12054
12055
#: en/help_topics/eol.txt:76
12056
msgid ""
12057
"If you have sample test data that deliberately has text files with mixed\n"
12058
"newline conventions, you can ask for those to be left alone like this::"
12059
msgstr ""
12060
12061
#: en/help_topics/eol.txt:79
12062
msgid ""
12063
" [name test_data/]\n"
12064
" eol = exact"
12065
msgstr ""
12066
12067
#: en/help_topics/eol.txt:85
12068
msgid ""
12069
"Note that ``exact`` does not imply the file is binary but it does mean\n"
12070
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
12071
"of content analysis to detect binary files for commands like ``diff``.\n"
12072
"In the future, a ``binary = true`` rule may be added but it is not\n"
12073
"supported yet.)"
12074
msgstr ""
12075
12076
#: en/help_topics/eol.txt:91
12077
msgid ""
12078
"If you have an existing repository with text files already stored using\n"
12079
"Windows newline conventions (``crlf``), then you may want to keep using "
12080
"that\n"
12081
"convention in the repository. Forcing certain files to this convention\n"
12082
"may also help users who do not have rules configured. To do this, set\n"
12083
"``eol`` to one of the values below."
12084
msgstr ""
12085
12086
#: en/help_topics/eol.txt:97
12087
msgid ""
12088
" ============================ ======================== "
12089
"======================\n"
12090
" Value Checkout end-of-lines as Commit end-of-lines "
12091
"as\n"
12092
" ============================ ======================== "
12093
"======================\n"
12094
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
12095
" ``lf`` otherwise\n"
12096
" ---------------------------- ------------------------ ----------------------"
12097
"\n"
12098
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
12099
" ---------------------------- ------------------------ ----------------------"
12100
"\n"
12101
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
12102
" ============================ ======================== ======================"
12103
msgstr ""
12104
12105
#: en/help_topics/eol.txt:108
12106
msgid ""
12107
"For users working on an existing project that uses Windows newline\n"
12108
"conventions in their Bazaar repository, this rule is suggested as a\n"
12109
"starting point::"
12110
msgstr ""
12111
12112
#: en/help_topics/eol.txt:112
12113
msgid ""
12114
" [name *]\n"
12115
" eol = native-with-crlf-in-repo"
12116
msgstr ""
12117
12118
#: en/help_topics/eol.txt:115
12119
msgid ""
12120
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12121
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12122
"``crlf`` and ``exact``."
12123
msgstr ""
12124
12125
#: en/help_topics/eol.txt:119
12126
msgid ""
12127
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12128
"never reject files because a given line ending or mixed line endings\n"
12129
"are found. A precommit hook should be used if you wish to validate\n"
12130
"(and not just convert) content before committing.\n"
12131
msgstr ""
12132
12133
#: en/help_topics/hidden-commands.txt:1
12134
msgid ""
12135
"added List files added in working tree.\n"
12136
"ancestry List all revisions merged into this branch.\n"
12137
"assert-fail Test reporting of assertion failures\n"
12138
"bundle-info Output interesting stats about a bundle\n"
12139
"bundle-revisions Create a merge-directive for submitting changes.\n"
12140
"cat-revision Write out metadata for a revision.\n"
12141
"dump-btree Dump the contents of a btree index file to stdout.\n"
12142
"export-pot Export command helps and error messages in po format.\n"
12143
"file-id Print file_id of a particular file or directory.\n"
12144
"file-path Print path of file_ids to a file or directory.\n"
12145
"find-merge-base Find and print a base revision for merging two "
12146
"branches.\n"
12147
"hooks Show hooks.\n"
12148
"inventory Show inventory of the current working copy or a "
12149
"revision.\n"
12150
"local-time-offset Show the offset in seconds from GMT to local time.\n"
12151
"lookup-revision Lookup the revision-id from a revision-number\n"
12152
"merge-directive Generate a merge directive for auto-merge tools.\n"
12153
"modified List files modified in working tree.\n"
12154
"re-sign Create a digital signature for an existing revision.\n"
12155
"reference list, view and set branch locations for nested trees.\n"
12156
"relpath Show path of a file relative to root\n"
12157
"repair-workingtree Reset the working tree state file.\n"
12158
"revision-history Display the list of revision ids on a branch.\n"
12159
"revision-info Show revision number and revision id for a given "
12160
"revision\n"
12161
" identifier.\n"
12162
"rocks Statement of optimism.\n"
12163
"selftest Run internal test suite.\n"
12164
"shell-complete Show appropriate completions for context.\n"
12165
"test-script Run a shell-like test from a file.\n"
12166
"touching-revisions Return revision-ids which affected a particular file.\n"
12167
"unknowns List unknown files.\n"
12168
"wait-until-signalled Test helper for\n"
12169
" test_start_and_stop_bzr_subprocess_send_signal.\n"
12170
msgstr ""
12171
12172
#: en/help_topics/hooks.txt:1
12173
msgid ""
12174
"\n"
12175
"Hooks\n"
12176
"====="
12177
msgstr ""
12178
12179
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
12180
msgid ""
12181
"Introduction\n"
12182
"------------"
12183
msgstr ""
12184
12185
#: en/help_topics/hooks.txt:8
12186
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12187
msgstr ""
12188
12189
#: en/help_topics/hooks.txt:10
12190
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
12191
msgstr ""
12192
12193
#: en/help_topics/hooks.txt:12
12194
msgid ""
12195
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12196
msgstr ""
12197
12198
#: en/help_topics/hooks.txt:14
12199
msgid ""
12200
"The class that contains each hook is given before the hooks it supplies. "
12201
"For\n"
12202
"instance, BranchHooks as the class is the hooks class for\n"
12203
"`bzrlib.branch.Branch.hooks`."
12204
msgstr ""
12205
12206
#: en/help_topics/hooks.txt:18
12207
msgid ""
12208
"Each description also indicates whether the hook runs on the client (the\n"
12209
"machine where bzr was invoked) or the server (the machine addressed by\n"
12210
"the branch URL). These may be, but are not necessarily, the same machine."
12211
msgstr ""
12212
12213
#: en/help_topics/hooks.txt:22
12214
msgid ""
12215
"Plugins (including hooks) are run on the server if all of these is true:"
12216
msgstr ""
12217
12218
#: en/help_topics/hooks.txt:24
12219
msgid ""
12220
" * The connection is via a smart server (accessed with a URL starting with\n"
12221
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12222
"\"http://\"\n"
12223
" URL when a smart server is available via HTTP)."
12224
msgstr ""
12225
12226
#: en/help_topics/hooks.txt:28
12227
msgid ""
12228
" * The hook is either server specific or part of general infrastructure "
12229
"rather\n"
12230
" than client specific code (such as commit)."
12231
msgstr ""
12232
12233
#: en/help_topics/hooks.txt:31
12234
msgid ""
12235
"\n"
12236
"BranchHooks\n"
12237
"-----------"
12238
msgstr ""
12239
12240
#: en/help_topics/hooks.txt:35
12241
msgid ""
12242
"automatic_tag_name\n"
12243
"~~~~~~~~~~~~~~~~~~"
12244
msgstr ""
12245
12246
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12247
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
12248
msgid "Introduced in: 2.2"
12249
msgstr ""
12250
12251
#: en/help_topics/hooks.txt:40
12252
msgid ""
12253
"Called to determine an automatic tag name for a revision.\n"
12254
"automatic_tag_name is called with (branch, revision_id) and should\n"
12255
"return a tag name or None if no tag name could be determined. The\n"
12256
"first non-None tag name returned will be used."
12257
msgstr ""
12258
12259
#: en/help_topics/hooks.txt:45
12260
msgid ""
12261
"open\n"
12262
"~~~~"
12263
msgstr ""
12264
12265
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
12266
#: en/help_topics/hooks.txt:304
12267
msgid "Introduced in: 1.8"
12268
msgstr ""
12269
12270
#: en/help_topics/hooks.txt:50
12271
msgid ""
12272
"Called with the Branch object that has been opened after a branch is\n"
12273
"opened."
12274
msgstr ""
12275
12276
#: en/help_topics/hooks.txt:53
12277
msgid ""
12278
"post_branch_init\n"
12279
"~~~~~~~~~~~~~~~~"
12280
msgstr ""
12281
12282
#: en/help_topics/hooks.txt:58
12283
msgid ""
12284
"Called after new branch initialization completes. post_branch_init is\n"
12285
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12286
"branch and checkout (both heavyweight and lightweight) will all\n"
12287
"trigger this hook."
12288
msgstr ""
12289
12290
#: en/help_topics/hooks.txt:63
12291
msgid ""
12292
"post_change_branch_tip\n"
12293
"~~~~~~~~~~~~~~~~~~~~~~"
12294
msgstr ""
12295
12296
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
12297
msgid "Introduced in: 1.4"
12298
msgstr ""
12299
12300
#: en/help_topics/hooks.txt:68
12301
msgid ""
12302
"Called in bzr client and server after a change to the tip of a branch\n"
12303
"is made. post_change_branch_tip is called with a\n"
12304
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12305
"uncommit will all trigger this hook."
12306
msgstr ""
12307
12308
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12309
msgid ""
12310
"post_commit\n"
12311
"~~~~~~~~~~~"
12312
msgstr ""
12313
12314
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12315
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12316
#: en/help_topics/hooks.txt:145
12317
msgid "Introduced in: 0.15"
12318
msgstr ""
12319
12320
#: en/help_topics/hooks.txt:78
12321
msgid ""
12322
"Called in the bzr client after a commit has completed. post_commit is\n"
12323
"called with (local, master, old_revno, old_revid, new_revno,\n"
12324
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12325
"branch."
12326
msgstr ""
12327
12328
#: en/help_topics/hooks.txt:83
12329
msgid ""
12330
"post_pull\n"
12331
"~~~~~~~~~"
12332
msgstr ""
12333
12334
#: en/help_topics/hooks.txt:88
12335
msgid ""
12336
"Called after a pull operation completes. post_pull is called with a\n"
12337
"bzrlib.branch.PullResult object and only runs in the bzr client."
12338
msgstr ""
12339
12340
#: en/help_topics/hooks.txt:91
12341
msgid ""
12342
"post_push\n"
12343
"~~~~~~~~~"
12344
msgstr ""
12345
12346
#: en/help_topics/hooks.txt:96
12347
msgid ""
12348
"Called after a push operation completes. post_push is called with a\n"
12349
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12350
msgstr ""
12351
12352
#: en/help_topics/hooks.txt:99
12353
msgid ""
12354
"post_switch\n"
12355
"~~~~~~~~~~~"
12356
msgstr ""
12357
12358
#: en/help_topics/hooks.txt:104
12359
msgid ""
12360
"Called after a checkout switches branch. post_switch is called with a\n"
12361
"bzrlib.branch.SwitchHookParams."
12362
msgstr ""
12363
12364
#: en/help_topics/hooks.txt:107
12365
msgid ""
12366
"post_uncommit\n"
12367
"~~~~~~~~~~~~~"
12368
msgstr ""
12369
12370
#: en/help_topics/hooks.txt:112
12371
msgid ""
12372
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12373
"called with (local, master, old_revno, old_revid, new_revno,\n"
12374
"new_revid) where local is the local branch or None, master is the\n"
12375
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12376
"of None."
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:118
12380
msgid ""
12381
"pre_change_branch_tip\n"
12382
"~~~~~~~~~~~~~~~~~~~~~"
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:121
12386
msgid "Introduced in: 1.6"
12387
msgstr ""
12388
12389
#: en/help_topics/hooks.txt:123
12390
msgid ""
12391
"Called in bzr client and server before a change to the tip of a branch\n"
12392
"is made. pre_change_branch_tip is called with a\n"
12393
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12394
"uncommit will all trigger this hook."
12395
msgstr ""
12396
12397
#: en/help_topics/hooks.txt:128
12398
msgid ""
12399
"pre_commit\n"
12400
"~~~~~~~~~~"
12401
msgstr ""
12402
12403
#: en/help_topics/hooks.txt:131
12404
msgid "Introduced in: 0.91"
12405
msgstr ""
12406
12407
#: en/help_topics/hooks.txt:133
12408
msgid ""
12409
"Called after a commit is calculated but before it is completed.\n"
12410
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12411
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12412
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12413
"TreeDelta object describing changes from the basis revision. hooks\n"
12414
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12415
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12416
"tree."
12417
msgstr ""
12418
12419
#: en/help_topics/hooks.txt:142
12420
msgid ""
12421
"set_rh\n"
12422
"~~~~~~"
12423
msgstr ""
12424
12425
#: en/help_topics/hooks.txt:147
12426
msgid ""
12427
"Invoked whenever the revision history has been set via\n"
12428
"set_revision_history. The api signature is (branch, revision_history),\n"
12429
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12430
"for bzr to trigger, a better hook to use is\n"
12431
"Branch.post_change_branch_tip."
12432
msgstr ""
12433
12434
#: en/help_topics/hooks.txt:153
12435
msgid ""
12436
"transform_fallback_location\n"
12437
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12438
msgstr ""
12439
12440
#: en/help_topics/hooks.txt:156
12441
msgid "Introduced in: 1.9"
12442
msgstr ""
12443
12444
#: en/help_topics/hooks.txt:158
12445
msgid ""
12446
"Called when a stacked branch is activating its fallback locations.\n"
12447
"transform_fallback_location is called with (branch, url), and should\n"
12448
"return a new url. Returning the same url allows it to be used as-is,\n"
12449
"returning a different one can be used to cause the branch to stack on\n"
12450
"a closer copy of that fallback_location. Note that the branch cannot\n"
12451
"have history accessing methods called on it during this hook because\n"
12452
"the fallback locations have not been activated. When there are\n"
12453
"multiple hooks installed for transform_fallback_location, all are\n"
12454
"called with the url returned from the previous hook.The order is\n"
12455
"however undefined."
12456
msgstr ""
12457
12458
#: en/help_topics/hooks.txt:169
12459
msgid ""
12460
"CommandHooks\n"
12461
"------------"
12462
msgstr ""
12463
12464
#: en/help_topics/hooks.txt:172
12465
msgid ""
12466
"extend_command\n"
12467
"~~~~~~~~~~~~~~"
12468
msgstr ""
12469
12470
#: en/help_topics/hooks.txt:175
12471
msgid "Introduced in: 1.13"
12472
msgstr ""
12473
12474
#: en/help_topics/hooks.txt:177
12475
msgid ""
12476
"Called after creating a command object to allow modifications such as\n"
12477
"adding or removing options, docs etc. Called with the new\n"
12478
"bzrlib.commands.Command object."
12479
msgstr ""
12480
12481
#: en/help_topics/hooks.txt:181
12482
msgid ""
12483
"get_command\n"
12484
"~~~~~~~~~~~"
12485
msgstr ""
12486
12487
#: 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
12489
msgid "Introduced in: 1.17"
12490
msgstr ""
12491
12492
#: en/help_topics/hooks.txt:186
12493
msgid ""
12494
"Called when creating a single command. Called with (cmd_or_None,\n"
12495
"command_name). get_command should either return the cmd_or_None\n"
12496
"parameter, or a replacement Command object that should be used for the\n"
12497
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12498
"Many users will prefer to use bzrlib.commands.register_command or\n"
12499
"plugin_cmds.register_lazy."
12500
msgstr ""
12501
12502
#: en/help_topics/hooks.txt:193
12503
msgid ""
12504
"get_missing_command\n"
12505
"~~~~~~~~~~~~~~~~~~~"
12506
msgstr ""
12507
12508
#: en/help_topics/hooks.txt:198
12509
msgid ""
12510
"Called when creating a single command if no command could be found.\n"
12511
"Called with (command_name). get_missing_command should either return\n"
12512
"None, or a Command object to be used for the command."
12513
msgstr ""
12514
12515
#: en/help_topics/hooks.txt:202
12516
msgid ""
12517
"list_commands\n"
12518
"~~~~~~~~~~~~~"
12519
msgstr ""
12520
12521
#: en/help_topics/hooks.txt:207
12522
msgid ""
12523
"Called when enumerating commands. Called with a set of cmd_name\n"
12524
"strings for all the commands found so far. This set is safe to mutate\n"
12525
"- e.g. to remove a command. list_commands should return the updated\n"
12526
"set of command names."
12527
msgstr ""
12528
12529
#: en/help_topics/hooks.txt:212
12530
msgid ""
12531
"_ConfigHooks\n"
12532
"------------"
12533
msgstr ""
12534
12535
#: en/help_topics/hooks.txt:215
12536
msgid ""
12537
"get\n"
12538
"~~~"
12539
msgstr ""
12540
12541
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12542
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12543
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12544
#: en/help_topics/hooks.txt:427
12545
msgid "Introduced in: 2.4"
12546
msgstr ""
12547
12548
#: en/help_topics/hooks.txt:220
12549
msgid ""
12550
"Invoked when a config option is read. The signature is (stack, name,\n"
12551
"value)."
12552
msgstr ""
12553
12554
#: en/help_topics/hooks.txt:223
12555
msgid ""
12556
"load\n"
12557
"~~~~"
12558
msgstr ""
12559
12560
#: en/help_topics/hooks.txt:228
12561
msgid "Invoked when a config store is loaded. The signature is (store)."
12562
msgstr ""
12563
12564
#: en/help_topics/hooks.txt:230
12565
msgid ""
12566
"remove\n"
12567
"~~~~~~"
12568
msgstr ""
12569
12570
#: en/help_topics/hooks.txt:235
12571
msgid ""
12572
"Invoked when a config option is removed. The signature is (stack,\n"
12573
"name)."
12574
msgstr ""
12575
12576
#: en/help_topics/hooks.txt:238
12577
msgid ""
12578
"save\n"
12579
"~~~~"
12580
msgstr ""
12581
12582
#: en/help_topics/hooks.txt:243
12583
msgid "Invoked when a config store is saved. The signature is (store)."
12584
msgstr ""
12585
12586
#: en/help_topics/hooks.txt:245
12587
msgid ""
12588
"set\n"
12589
"~~~"
12590
msgstr ""
12591
12592
#: en/help_topics/hooks.txt:250
12593
msgid ""
12594
"Invoked when a config option is set. The signature is (stack, name,\n"
12595
"value)."
12596
msgstr ""
12597
12598
#: en/help_topics/hooks.txt:253
12599
msgid ""
12600
"ControlDirHooks\n"
12601
"---------------"
12602
msgstr ""
12603
12604
#: en/help_topics/hooks.txt:256
12605
msgid ""
12606
"post_repo_init\n"
12607
"~~~~~~~~~~~~~~"
12608
msgstr ""
12609
12610
#: en/help_topics/hooks.txt:261
12611
msgid ""
12612
"Invoked after a repository has been initialized. post_repo_init is\n"
12613
"called with a bzrlib.controldir.RepoInitHookParams."
12614
msgstr ""
12615
12616
#: en/help_topics/hooks.txt:264
12617
msgid ""
12618
"pre_open\n"
12619
"~~~~~~~~"
12620
msgstr ""
12621
12622
#: en/help_topics/hooks.txt:267
12623
msgid "Introduced in: 1.14"
12624
msgstr ""
12625
12626
#: en/help_topics/hooks.txt:269
12627
msgid ""
12628
"Invoked before attempting to open a ControlDir with the transport that\n"
12629
"the open will use."
12630
msgstr ""
12631
12632
#: en/help_topics/hooks.txt:272
12633
msgid ""
12634
"InfoHooks\n"
12635
"---------"
12636
msgstr ""
12637
12638
#: en/help_topics/hooks.txt:275
12639
msgid ""
12640
"repository\n"
12641
"~~~~~~~~~~"
12642
msgstr ""
12643
12644
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12645
#: en/help_topics/hooks.txt:505
12646
msgid "Introduced in: 1.15"
12647
msgstr ""
12648
12649
#: en/help_topics/hooks.txt:280
12650
msgid ""
12651
"Invoked when displaying the statistics for a repository. repository is\n"
12652
"called with a statistics dictionary as returned by the repository and\n"
12653
"a file-like object to write to."
12654
msgstr ""
12655
12656
#: en/help_topics/hooks.txt:284
12657
msgid ""
12658
"LockHooks\n"
12659
"---------"
12660
msgstr ""
12661
12662
#: en/help_topics/hooks.txt:287
12663
msgid ""
12664
"lock_acquired\n"
12665
"~~~~~~~~~~~~~"
12666
msgstr ""
12667
12668
#: en/help_topics/hooks.txt:292
12669
msgid ""
12670
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12671
msgstr ""
12672
12673
#: en/help_topics/hooks.txt:294
12674
msgid ""
12675
"lock_broken\n"
12676
"~~~~~~~~~~~"
12677
msgstr ""
12678
12679
#: en/help_topics/hooks.txt:299
12680
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12681
msgstr ""
12682
12683
#: en/help_topics/hooks.txt:301
12684
msgid ""
12685
"lock_released\n"
12686
"~~~~~~~~~~~~~"
12687
msgstr ""
12688
12689
#: en/help_topics/hooks.txt:306
12690
msgid ""
12691
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12692
msgstr ""
12693
12694
#: en/help_topics/hooks.txt:308
12695
msgid ""
12696
"MergeHooks\n"
12697
"----------"
12698
msgstr ""
12699
12700
#: en/help_topics/hooks.txt:311
12701
msgid ""
12702
"merge_file_content\n"
12703
"~~~~~~~~~~~~~~~~~~"
12704
msgstr ""
12705
12706
#: en/help_topics/hooks.txt:314
12707
msgid "Introduced in: 2.1"
12708
msgstr ""
12709
12710
#: en/help_topics/hooks.txt:316
12711
msgid ""
12712
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12713
"object when starting a merge. Should return either None or a subclass\n"
12714
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12715
"called per file that needs to be merged (including when one side has\n"
12716
"deleted the file and the other has changed it). See the\n"
12717
"AbstractPerFileMerger API docs for details on how it is used by merge."
12718
msgstr ""
12719
12720
#: en/help_topics/hooks.txt:323
12721
msgid ""
12722
"post_merge\n"
12723
"~~~~~~~~~~"
12724
msgstr ""
12725
12726
#: 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
12728
msgid "Introduced in: 2.5"
12729
msgstr ""
12730
12731
#: en/help_topics/hooks.txt:328
12732
msgid ""
12733
"Called after a merge. Receives a Merger object as the single argument.\n"
12734
"The return value is ignored."
12735
msgstr ""
12736
12737
#: en/help_topics/hooks.txt:331
12738
msgid ""
12739
"pre_merge\n"
12740
"~~~~~~~~~"
12741
msgstr ""
12742
12743
#: en/help_topics/hooks.txt:336
12744
msgid ""
12745
"Called before a merge. Receives a Merger object as the single\n"
12746
"argument."
12747
msgstr ""
12748
12749
#: en/help_topics/hooks.txt:339
12750
msgid ""
12751
"MergeDirectiveHooks\n"
12752
"-------------------"
12753
msgstr ""
12754
12755
#: en/help_topics/hooks.txt:342
12756
msgid ""
12757
"merge_request_body\n"
12758
"~~~~~~~~~~~~~~~~~~"
12759
msgstr ""
12760
12761
#: en/help_topics/hooks.txt:345
12762
msgid "Introduced in: 1.15.0"
12763
msgstr ""
12764
12765
#: en/help_topics/hooks.txt:347
12766
msgid ""
12767
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12768
"request. Callbacks must return a body. If more than one callback is\n"
12769
"registered, the output of one callback is provided to the next."
12770
msgstr ""
12771
12772
#: en/help_topics/hooks.txt:351
12773
msgid ""
12774
"MessageEditorHooks\n"
12775
"------------------"
12776
msgstr ""
12777
12778
#: en/help_topics/hooks.txt:354
12779
msgid ""
12780
"commit_message_template\n"
12781
"~~~~~~~~~~~~~~~~~~~~~~~"
12782
msgstr ""
12783
12784
#: en/help_topics/hooks.txt:357
12785
msgid "Introduced in: 1.10"
12786
msgstr ""
12787
12788
#: en/help_topics/hooks.txt:359
12789
msgid ""
12790
"Called when a commit message is being generated.\n"
12791
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12792
"and the message that is known so far. commit_message_template must\n"
12793
"return a new message to use (which could be the same as it was given).\n"
12794
"When there are multiple hooks registered for commit_message_template,\n"
12795
"they are chained with the result from the first passed into the\n"
12796
"second, and so on."
12797
msgstr ""
12798
12799
#: en/help_topics/hooks.txt:367
12800
msgid ""
12801
"set_commit_message\n"
12802
"~~~~~~~~~~~~~~~~~~"
12803
msgstr ""
12804
12805
#: en/help_topics/hooks.txt:372
12806
msgid ""
12807
"Set a fixed commit message. set_commit_message is called with the\n"
12808
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12809
"properties by editing commit.builder._revprops) and the message so\n"
12810
"far. set_commit_message must return the message to use or None if it\n"
12811
"should use the message editor as normal."
12812
msgstr ""
12813
12814
#: en/help_topics/hooks.txt:378
12815
msgid ""
12816
"MutableTreeHooks\n"
12817
"----------------"
12818
msgstr ""
12819
12820
#: en/help_topics/hooks.txt:381
12821
msgid ""
12822
"post_build_tree\n"
12823
"~~~~~~~~~~~~~~~"
12824
msgstr ""
12825
12826
#: en/help_topics/hooks.txt:386
12827
msgid ""
12828
"Called after a completely new tree is built. The hook is called with\n"
12829
"the tree as its only argument."
12830
msgstr ""
12831
12832
#: en/help_topics/hooks.txt:392
12833
msgid "Introduced in: 2.0"
12834
msgstr ""
12835
12836
#: en/help_topics/hooks.txt:394
12837
msgid ""
12838
"Called after a commit is performed on a tree. The hook is called with\n"
12839
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12840
"commit was performed on is available via the mutable_tree attribute of\n"
12841
"that object."
12842
msgstr ""
12843
12844
#: en/help_topics/hooks.txt:399
12845
msgid ""
12846
"start_commit\n"
12847
"~~~~~~~~~~~~"
12848
msgstr ""
12849
12850
#: en/help_topics/hooks.txt:404
12851
msgid ""
12852
"Called before a commit is performed on a tree. The start commit hook\n"
12853
"is able to change the tree before the commit takes place. start_commit\n"
12854
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12855
"being performed on."
12856
msgstr ""
12857
12858
#: en/help_topics/hooks.txt:409
12859
msgid ""
12860
"SmartClientHooks\n"
12861
"----------------"
12862
msgstr ""
12863
12864
#: en/help_topics/hooks.txt:412
12865
msgid ""
12866
"call\n"
12867
"~~~~"
12868
msgstr ""
12869
12870
#: en/help_topics/hooks.txt:415
12871
msgid "Introduced in: unknown"
12872
msgstr ""
12873
12874
#: en/help_topics/hooks.txt:417
12875
msgid ""
12876
"Called when the smart client is submitting a request to the smart\n"
12877
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12878
"Streaming request bodies, and responses, are not accessible."
12879
msgstr ""
12880
12881
#: en/help_topics/hooks.txt:421
12882
msgid ""
12883
"SmartServerHooks\n"
12884
"----------------"
12885
msgstr ""
12886
12887
#: en/help_topics/hooks.txt:424
12888
msgid ""
12889
"server_exception\n"
12890
"~~~~~~~~~~~~~~~~"
12891
msgstr ""
12892
12893
#: en/help_topics/hooks.txt:429
12894
msgid ""
12895
"Called by the bzr server when an exception occurs. server_exception is\n"
12896
"called with the sys.exc_info() tuple return true for the hook if the\n"
12897
"exception has been handled, in which case the server will exit\n"
12898
"normally."
12899
msgstr ""
12900
12901
#: en/help_topics/hooks.txt:434
12902
msgid ""
12903
"server_started\n"
12904
"~~~~~~~~~~~~~~"
12905
msgstr ""
12906
12907
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12908
msgid "Introduced in: 0.16"
12909
msgstr ""
12910
12911
#: en/help_topics/hooks.txt:439
12912
msgid ""
12913
"Called by the bzr server when it starts serving a directory.\n"
12914
"server_started is called with (backing urls, public url), where\n"
12915
"backing_url is a list of URLs giving the server-specific directory\n"
12916
"locations, and public_url is the public URL for the directory being\n"
12917
"served."
12918
msgstr ""
12919
12920
#: en/help_topics/hooks.txt:445
12921
msgid ""
12922
"server_started_ex\n"
12923
"~~~~~~~~~~~~~~~~~"
12924
msgstr ""
12925
12926
#: en/help_topics/hooks.txt:450
12927
msgid ""
12928
"Called by the bzr server when it starts serving a directory.\n"
12929
"server_started is called with (backing_urls, server_obj)."
12930
msgstr ""
12931
12932
#: en/help_topics/hooks.txt:453
12933
msgid ""
12934
"server_stopped\n"
12935
"~~~~~~~~~~~~~~"
12936
msgstr ""
12937
12938
#: en/help_topics/hooks.txt:458
12939
msgid ""
12940
"Called by the bzr server when it stops serving a directory.\n"
12941
"server_stopped is called with the same parameters as the\n"
12942
"server_started hook: (backing_urls, public_url)."
12943
msgstr ""
12944
12945
#: en/help_topics/hooks.txt:462
12946
msgid ""
12947
"StatusHooks\n"
12948
"-----------"
12949
msgstr ""
12950
12951
#: en/help_topics/hooks.txt:465
12952
msgid ""
12953
"post_status\n"
12954
"~~~~~~~~~~~"
12955
msgstr ""
12956
12957
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
12958
msgid "Introduced in: 2.3"
12959
msgstr ""
12960
12961
#: en/help_topics/hooks.txt:470
12962
msgid ""
12963
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12964
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12965
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12966
"correspond to the command line options specified by the user for the\n"
12967
"status command. to_file is the output stream for writing."
12968
msgstr ""
12969
12970
#: en/help_topics/hooks.txt:476
12971
msgid ""
12972
"pre_status\n"
12973
"~~~~~~~~~~"
12974
msgstr ""
12975
12976
#: en/help_topics/hooks.txt:481
12977
msgid ""
12978
"Called with argument StatusHookParams before Bazaar displays the\n"
12979
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12980
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12981
"correspond to the command line options specified by the user for the\n"
12982
"status command. to_file is the output stream for writing."
12983
msgstr ""
12984
12985
#: en/help_topics/hooks.txt:487
12986
msgid ""
12987
"TransportHooks\n"
12988
"--------------"
12989
msgstr ""
12990
12991
#: en/help_topics/hooks.txt:490
12992
msgid ""
12993
"post_connect\n"
12994
"~~~~~~~~~~~~"
12995
msgstr ""
12996
12997
#: en/help_topics/hooks.txt:495
12998
msgid ""
12999
"Called after a new connection is established or a reconnect occurs.\n"
13000
"The sole argument passed is either the connected transport or smart\n"
13001
"medium instance."
13002
msgstr ""
13003
13004
#: en/help_topics/hooks.txt:499
13005
msgid ""
13006
"RioVersionInfoBuilderHooks\n"
13007
"--------------------------"
13008
msgstr ""
13009
13010
#: en/help_topics/hooks.txt:502
13011
msgid ""
13012
"revision\n"
13013
"~~~~~~~~"
13014
msgstr ""
13015
13016
#: en/help_topics/hooks.txt:507
13017
msgid ""
13018
"Invoked when adding information about a revision to the RIO stanza\n"
13019
"that is printed. revision is called with a revision object and a RIO\n"
13020
"stanza.\n"
13021
msgstr ""
13022
13023
#: en/help_topics/location-alias.txt:1
13024
msgid ""
13025
"Location aliases\n"
13026
"================"
13027
msgstr ""
13028
13029
#: en/help_topics/location-alias.txt:4
13030
msgid ""
13031
"Bazaar defines several aliases for locations associated with a branch. "
13032
"These\n"
13033
"can be used with most commands that expect a location, such as `bzr push`."
13034
msgstr ""
13035
13036
#: en/help_topics/location-alias.txt:7
13037
msgid "The aliases are::"
13038
msgstr ""
13039
13040
#: en/help_topics/location-alias.txt:9
13041
msgid ""
13042
" :bound The branch this branch is bound to, for bound branches.\n"
13043
" :parent The parent of this branch.\n"
13044
" :public The public location of this branch.\n"
13045
" :push The saved location used for `bzr push` with no arguments.\n"
13046
" :submit The submit branch for this branch.\n"
13047
" :this This branch."
13048
msgstr ""
13049
13050
#: en/help_topics/location-alias.txt:16
13051
msgid "For example, to push to the parent location::"
13052
msgstr ""
13053
13054
#: en/help_topics/location-alias.txt:18
13055
msgid " bzr push :parent\n"
13056
msgstr ""
13057
13058
#: en/help_topics/log-formats.txt:1
13059
msgid ""
13060
"Log Formats\n"
13061
"==========="
13062
msgstr ""
13063
13064
#: en/help_topics/log-formats.txt:4
13065
msgid ""
13066
"A log format controls how information about each revision is displayed.\n"
13067
"The standard log formats are compared below::"
13068
msgstr ""
13069
13070
#: en/help_topics/log-formats.txt:7
13071
msgid ""
13072
" Feature long short line\n"
13073
" ---------------------- ------------- ------------ -------------------\n"
13074
" design goal detailed view concise view 1 revision per line\n"
13075
" committer name+email name only name only\n"
13076
" author name+email - -\n"
13077
" date-time format full date only date only\n"
13078
" commit message full full top line\n"
13079
" tags yes yes yes\n"
13080
" merges indicator - yes -\n"
13081
" status/delta optional optional -\n"
13082
" diff/patch optional optional -\n"
13083
" revision-id optional optional -\n"
13084
" branch nick yes - -\n"
13085
" foreign vcs properties yes yes -\n"
13086
" preferred levels all 1 1\n"
13087
" digital signature optional - -"
13088
msgstr ""
13089
13090
#: en/help_topics/log-formats.txt:24
13091
msgid ""
13092
"The default format is ``long``. To change this, define the ``log_format``\n"
13093
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
13094
msgstr ""
13095
13096
#: en/help_topics/log-formats.txt:27
13097
msgid ""
13098
" [DEFAULT]\n"
13099
" log_format = short"
13100
msgstr ""
13101
13102
#: en/help_topics/log-formats.txt:30
13103
msgid ""
13104
"Alternatively, to change the log format used for a given query, use the\n"
13105
"--long, --short or --line options."
13106
msgstr ""
13107
13108
#: en/help_topics/log-formats.txt:33
13109
msgid ""
13110
"If one of the standard log formats does not meet your needs, additional\n"
13111
"formats can be provided by plugins.\n"
13112
msgstr ""
13113
13114
#: en/help_topics/other-formats.txt:1
13115
msgid "Other Storage Formats"
13116
msgstr ""
13117
13118
#: en/help_topics/other-formats.txt:3
13119
msgid "Experimental formats are shown below."
13120
msgstr ""
13121
13122
#: en/help_topics/other-formats.txt:5
13123
msgid ""
13124
":development-colo:\n"
13125
" (native) The 2a format with experimental support for colocated\n"
13126
" branches."
13127
msgstr ""
13128
13129
#: en/help_topics/other-formats.txt:9
13130
msgid ""
13131
"\n"
13132
"Deprecated formats are shown below."
13133
msgstr ""
13134
13135
#: en/help_topics/other-formats.txt:12
13136
msgid ""
13137
":pack-0.92:\n"
13138
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
13139
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
13140
" by bzr < 0.92."
13141
msgstr ""
13142
13143
#: en/help_topics/patterns.txt:1
13144
msgid ""
13145
"Patterns\n"
13146
"========"
13147
msgstr ""
13148
13149
#: en/help_topics/patterns.txt:4
13150
msgid ""
13151
"Bazaar uses patterns to match files at various times. For example,\n"
13152
"the ``add`` command skips over files that match ignore patterns\n"
13153
"and preferences can be associated with files using rule patterns.\n"
13154
"The pattern syntax is described below."
13155
msgstr ""
13156
13157
#: en/help_topics/patterns.txt:9
13158
msgid ""
13159
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13160
"slash or is a regular expression, it is compared to the whole path\n"
13161
"from the branch root. Otherwise, it is compared to only the last\n"
13162
"component of the path. To match a file only in the root directory,\n"
13163
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13164
msgstr ""
13165
13166
#: en/help_topics/patterns.txt:15
13167
msgid "Patterns may include globbing wildcards such as::"
13168
msgstr ""
13169
13170
#: en/help_topics/patterns.txt:17
13171
msgid ""
13172
" ? - Matches any single character except '/'\n"
13173
" * - Matches 0 or more characters except '/'\n"
13174
" /**/ - Matches 0 or more directories in a path\n"
13175
" [a-z] - Matches a single character from within a group of characters"
13176
msgstr ""
13177
13178
#: en/help_topics/patterns.txt:22
13179
msgid ""
13180
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13181
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13182
"expression. Regular expression patterns may not include named or\n"
13183
"numbered groups."
13184
msgstr ""
13185
13186
#: en/help_topics/patterns.txt:27
13187
msgid ""
13188
"Case insensitive ignore patterns can be specified with regular expressions\n"
13189
"by using the ``i`` (for ignore case) flag in the pattern."
13190
msgstr ""
13191
13192
#: en/help_topics/patterns.txt:30
13193
msgid ""
13194
"For example, a case insensitive match for ``foo`` may be specified as::"
13195
msgstr ""
13196
13197
#: en/help_topics/patterns.txt:32
13198
msgid " RE:(?i)foo"
13199
msgstr ""
13200
13201
#: en/help_topics/patterns.txt:34
13202
msgid ""
13203
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13204
"matched by that pattern will not be ignored."
13205
msgstr ""
13206
13207
#: en/help_topics/patterns.txt:37
13208
msgid ""
13209
".. _Python regular expressions: http://docs.python.org/library/re.html"
13210
msgstr ""
13211
13212
#: en/help_topics/revisionspec.txt:1
13213
msgid "Revision Identifiers"
13214
msgstr ""
13215
13216
#: en/help_topics/revisionspec.txt:3
13217
msgid ""
13218
"A revision identifier refers to a specific state of a branch's history. It\n"
13219
"can be expressed in several ways. It can begin with a keyword to\n"
13220
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13221
"'before:yesterday' and 'submit:'."
13222
msgstr ""
13223
13224
#: en/help_topics/revisionspec.txt:8
13225
msgid ""
13226
"Alternately, it can be given without a keyword, in which case it will be\n"
13227
"checked as a revision number, a tag, a revision id, a date specification, or "
13228
"a\n"
13229
"branch specification, in that order. For example, 'date:today' could be\n"
13230
"written as simply 'today', though if you have a tag called 'today' that "
13231
"will\n"
13232
"be found first."
13233
msgstr ""
13234
13235
#: en/help_topics/revisionspec.txt:14
13236
msgid ""
13237
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13238
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13239
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13240
"or\n"
13241
"spaces around the '..')."
13242
msgstr ""
13243
13244
#: en/help_topics/revisionspec.txt:19
13245
msgid ""
13246
"Ranges are interpreted differently by different commands. To the \"log\" "
13247
"command,\n"
13248
"a range is a sequence of log messages, but to the \"diff\" command, the "
13249
"range\n"
13250
"denotes a change between revisions (and not a sequence of changes). In\n"
13251
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13252
"consider it\n"
13253
"to be open-ended, that is, they include one end but not the other. For "
13254
"example:\n"
13255
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13256
"3649,\n"
13257
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13258
"and\n"
13259
"3649, but not 3647."
13260
msgstr ""
13261
13262
#: en/help_topics/revisionspec.txt:28
13263
msgid "The keywords used as revision selection methods are the following:"
13264
msgstr ""
13265
13266
#: en/help_topics/revisionspec.txt:30
13267
msgid ""
13268
":revid:\n"
13269
"\tSelects a revision using the revision id.\n"
13270
":submit:\n"
13271
"\tSelects a common ancestor with the submit branch.\n"
13272
":ancestor:\n"
13273
"\tSelects a common ancestor with a second branch.\n"
13274
":date:\n"
13275
"\tSelects a revision on the basis of a datestamp.\n"
13276
":branch:\n"
13277
"\tSelects the last revision of a specified branch.\n"
13278
":tag:\n"
13279
"\tSelects a revision identified by a tag name.\n"
13280
":revno:\n"
13281
"\tSelects a revision using a number.\n"
13282
":before:\n"
13283
"\tSelects the parent of the revision specified.\n"
13284
":annotate:\n"
13285
"\tSelect the revision that last modified the specified line.\n"
13286
":mainline:\n"
13287
"\tSelect mainline revision that merged the specified revision.\n"
13288
":last:\n"
13289
"\tSelects the nth revision from the end."
13290
msgstr ""
13291
13292
#: en/help_topics/revisionspec.txt:53
13293
msgid "In addition, plugins can provide other keywords."
13294
msgstr ""
13295
13296
#: en/help_topics/revisionspec.txt:55
13297
msgid "A detailed description of each keyword is given below."
13298
msgstr ""
13299
13300
#: en/help_topics/revisionspec.txt:57
13301
msgid ":revid:"
13302
msgstr ""
13303
13304
#: en/help_topics/revisionspec.txt:59
13305
msgid ""
13306
" Supply a specific revision id, that can be used to specify any\n"
13307
" revision id in the ancestry of the branch.\n"
13308
" Including merges, and pending merges.\n"
13309
" Examples::"
13310
msgstr ""
13311
13312
#: en/help_topics/revisionspec.txt:64
13313
msgid ""
13314
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13315
msgstr ""
13316
13317
#: en/help_topics/revisionspec.txt:66
13318
msgid ":submit:"
13319
msgstr ""
13320
13321
#: en/help_topics/revisionspec.txt:68
13322
msgid ""
13323
" Diffing against this shows all the changes that were made in this "
13324
"branch,\n"
13325
" and is a good predictor of what merge will do. The submit branch is\n"
13326
" used by the bundle and merge directive commands. If no submit branch\n"
13327
" is specified, the parent branch is used instead."
13328
msgstr ""
13329
13330
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13331
msgid ""
13332
" The common ancestor is the last revision that existed in both\n"
13333
" branches. Usually this is the branch point, but it could also be\n"
13334
" a revision that was merged."
13335
msgstr ""
13336
13337
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13338
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13339
#: en/help_topics/revisionspec.txt:153
13340
msgid " Examples::"
13341
msgstr ""
13342
13343
#: en/help_topics/revisionspec.txt:79
13344
msgid " $ bzr diff -r submit:"
13345
msgstr ""
13346
13347
#: en/help_topics/revisionspec.txt:81
13348
msgid ":ancestor:"
13349
msgstr ""
13350
13351
#: en/help_topics/revisionspec.txt:83
13352
msgid " Supply the path to a branch to select the common ancestor."
13353
msgstr ""
13354
13355
#: en/help_topics/revisionspec.txt:89
13356
msgid ""
13357
" This is frequently used with 'diff' to return all of the changes\n"
13358
" that your branch introduces, while excluding the changes that you\n"
13359
" have not merged from the remote branch."
13360
msgstr ""
13361
13362
#: en/help_topics/revisionspec.txt:95
13363
msgid ""
13364
" ancestor:/path/to/branch\n"
13365
" $ bzr diff -r ancestor:../../mainline/branch"
13366
msgstr ""
13367
13368
#: en/help_topics/revisionspec.txt:98
13369
msgid ":date:"
13370
msgstr ""
13371
13372
#: en/help_topics/revisionspec.txt:100
13373
msgid ""
13374
" Supply a datestamp to select the first revision that matches the date.\n"
13375
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13376
" Matches the first entry after a given date (either at midnight or\n"
13377
" at a specified time)."
13378
msgstr ""
13379
13380
#: en/help_topics/revisionspec.txt:105
13381
msgid " One way to display all the changes since yesterday would be::"
13382
msgstr ""
13383
13384
#: en/help_topics/revisionspec.txt:107
13385
msgid " bzr log -r date:yesterday.."
13386
msgstr ""
13387
13388
#: en/help_topics/revisionspec.txt:111
13389
msgid ""
13390
" date:yesterday -> select the first revision since "
13391
"yesterday\n"
13392
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13393
" August 14th, 2006 at 5:10pm."
13394
msgstr ""
13395
13396
#: en/help_topics/revisionspec.txt:115
13397
msgid ":branch:"
13398
msgstr ""
13399
13400
#: en/help_topics/revisionspec.txt:117
13401
msgid " Supply the path to a branch to select its last revision."
13402
msgstr ""
13403
13404
#: en/help_topics/revisionspec.txt:121
13405
msgid " branch:/path/to/branch"
13406
msgstr ""
13407
13408
#: en/help_topics/revisionspec.txt:123
13409
msgid ":tag:"
13410
msgstr ""
13411
13412
#: en/help_topics/revisionspec.txt:125
13413
msgid " Tags are stored in the branch and created by the 'tag' command."
13414
msgstr ""
13415
13416
#: en/help_topics/revisionspec.txt:127
13417
msgid ":revno:"
13418
msgstr ""
13419
13420
#: en/help_topics/revisionspec.txt:129
13421
msgid ""
13422
" Use an integer to specify a revision in the history of the branch.\n"
13423
" Optionally a branch can be specified. A negative number will count\n"
13424
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13425
" one). If the negative number is larger than the branch's history, the\n"
13426
" first revision is returned.\n"
13427
" Examples::"
13428
msgstr ""
13429
13430
#: en/help_topics/revisionspec.txt:136
13431
msgid ""
13432
" revno:1 -> return the first revision of this branch\n"
13433
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13434
" the branch '/path/to/branch'\n"
13435
" revno:-1 -> The last revision in a branch.\n"
13436
" -2:http://other/branch -> The second to last revision in the\n"
13437
" remote branch.\n"
13438
" -1000000 -> Most likely the first revision, unless\n"
13439
" your history is very long."
13440
msgstr ""
13441
13442
#: en/help_topics/revisionspec.txt:145
13443
msgid ":before:"
13444
msgstr ""
13445
13446
#: en/help_topics/revisionspec.txt:147
13447
msgid ""
13448
" Supply any revision spec to return the parent of that revision. This "
13449
"is\n"
13450
" mostly useful when inspecting revisions that are not in the revision "
13451
"history\n"
13452
" of a branch."
13453
msgstr ""
13454
13455
#: en/help_topics/revisionspec.txt:151
13456
msgid ""
13457
" It is an error to request the parent of the null revision (before:0)."
13458
msgstr ""
13459
13460
#: en/help_topics/revisionspec.txt:155
13461
msgid ""
13462
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13463
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13464
" aaaa@bbbb-1234567890\n"
13465
" bzr diff -r before:1913..1913\n"
13466
" -> Find the changes between revision 1913 and its parent "
13467
"(1912).\n"
13468
" (What changes did revision 1913 introduce).\n"
13469
" This is equivalent to: bzr diff -c 1913"
13470
msgstr ""
13471
13472
#: en/help_topics/revisionspec.txt:163
13473
msgid ":annotate:"
13474
msgstr ""
13475
13476
#: en/help_topics/revisionspec.txt:165
13477
msgid ""
13478
" Select the revision that last modified the specified line. Line is\n"
13479
" specified as path:number. Path is a relative path to the file. "
13480
"Numbers\n"
13481
" start at 1, and are relative to the current version, not the last-\n"
13482
" committed version of the file."
13483
msgstr ""
13484
13485
#: en/help_topics/revisionspec.txt:170
13486
msgid ":mainline:"
13487
msgstr ""
13488
13489
#: en/help_topics/revisionspec.txt:172
13490
msgid ""
13491
" Select the revision that merged the specified revision into mainline."
13492
msgstr ""
13493
13494
#: en/help_topics/revisionspec.txt:174
13495
msgid ":last:"
13496
msgstr ""
13497
13498
#: en/help_topics/revisionspec.txt:176
13499
msgid ""
13500
" Supply a positive number to get the nth revision from the end.\n"
13501
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13502
" Examples::"
13503
msgstr ""
13504
13505
#: en/help_topics/revisionspec.txt:180
13506
msgid ""
13507
" last:1 -> return the last revision\n"
13508
" last:3 -> return the revision 2 before the end.\n"
13509
msgstr ""
13510
13511
#: en/help_topics/rules.txt:1
13512
msgid ""
13513
"Rules\n"
13514
"====="
13515
msgstr ""
13516
13517
#: en/help_topics/rules.txt:7
13518
msgid ""
13519
"Rules are defined in ini file format where the sections are file glob\n"
13520
"patterns and the contents of each section are the preferences for files\n"
13521
"matching that pattern(s). For example::"
13522
msgstr ""
13523
13524
#: en/help_topics/rules.txt:11
13525
msgid ""
13526
" [name *.bat]\n"
13527
" eol = native"
13528
msgstr ""
13529
13530
#: en/help_topics/rules.txt:14
13531
msgid ""
13532
" [name *.html *.xml]\n"
13533
" keywords = xml_escape"
13534
msgstr ""
13535
13536
#: en/help_topics/rules.txt:17
13537
msgid ""
13538
"Preferences like these are useful for commands and plugins wishing to\n"
13539
"provide custom behaviour for selected files. For more information on \n"
13540
"end of line conversion see :doc:`eol-help`.\n"
13541
"Keyword support is provided by the `keywords plugin\n"
13542
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13543
msgstr ""
13544
13545
#: en/help_topics/rules.txt:23
13546
msgid ""
13547
"Files\n"
13548
"-----"
13549
msgstr ""
13550
13551
#: en/help_topics/rules.txt:26
13552
msgid ""
13553
"Default rules for all branches are defined in the optional file\n"
13554
"``BZR_HOME/rules``. "
13555
msgstr ""
13556
13557
#: en/help_topics/rules.txt:29
13558
msgid ""
13559
"Rule Patterns\n"
13560
"-------------"
13561
msgstr ""
13562
13563
#: en/help_topics/rules.txt:32
13564
msgid ""
13565
"Patterns are ordered and searching stops as soon as one matches.\n"
13566
"As a consequence, more explicit patterns should be placed towards\n"
13567
"the top of the file. Rule patterns use exactly the same conventions\n"
13568
"as ignore patterns. See :doc:`patterns-help` for details."
13569
msgstr ""
13570
13571
#: en/help_topics/rules.txt:37
13572
msgid ".. note::"
13573
msgstr ""
13574
13575
#: en/help_topics/rules.txt:39
13576
msgid ""
13577
" Patterns containing square brackets or spaces should be\n"
13578
" surrounded in quotes to ensure they are correctly parsed.\n"
13579
msgstr ""
13580
13581
#: en/help_topics/topics.txt:1
13582
msgid ""
13583
"authentication Information on configuring authentication\n"
13584
"basic Basic commands\n"
13585
"branches Information on what a branch is\n"
13586
"bugs Bug tracker settings\n"
13587
"checkouts Information on what a checkout is\n"
13588
"commands Basic help for all commands\n"
13589
"configuration Details on the configuration settings available\n"
13590
"conflict-types Types of conflicts and what to do about them\n"
13591
"content-filters Conversion of content into/from working trees\n"
13592
"criss-cross Information on criss-cross merging\n"
13593
"current-formats Current storage formats\n"
13594
"debug-flags Options to show or record debug information\n"
13595
"diverged-branches How to fix diverged branches\n"
13596
"env-variables Environment variable names and values\n"
13597
"eol Information on end-of-line handling\n"
13598
"files Information on configuration and log files\n"
13599
"formats Information on choosing a storage format\n"
13600
"global-options Options that control how Bazaar runs\n"
13601
"hidden-commands All hidden commands\n"
13602
"hooks Points at which custom processing can be added\n"
13603
"launchpad Using Bazaar with Launchpad.net\n"
13604
"location-alias Aliases for remembered locations\n"
13605
"log-formats Details on the logging formats available\n"
13606
"other-formats Experimental and deprecated storage formats\n"
13607
"patterns Information on the pattern syntax\n"
13608
"repositories Basic information on shared repositories.\n"
13609
"revisionspec Explain how to use --revision\n"
13610
"rules Information on defining rule-based preferences\n"
13611
"standalone-trees Information on what a standalone tree is\n"
13612
"standard-options Options that can be used with any command\n"
13613
"status-flags Help on status flags\n"
13614
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13615
"topics Topics list\n"
13616
"url-special-chars Special character handling in URLs\n"
13617
"urlspec Supported transport protocols\n"
13618
"working-trees Information on working trees\n"
13619
msgstr ""
13620
13621
#: en/help_topics/url-special-chars.txt:1
13622
msgid ""
13623
"Special character handling in URLs\n"
13624
"=================================="
13625
msgstr ""
13626
13627
#: en/help_topics/url-special-chars.txt:4
13628
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13629
msgstr ""
13630
13631
#: en/help_topics/url-special-chars.txt:6
13632
msgid " * Fully qualified URLs"
13633
msgstr ""
13634
13635
#: en/help_topics/url-special-chars.txt:8
13636
msgid " * File system paths, relative or absolute"
13637
msgstr ""
13638
13639
#: en/help_topics/url-special-chars.txt:10
13640
msgid ""
13641
"Internally bzr treats all locations as URLs. For any file system paths\n"
13642
"that are specified it will automatically determine the appropriate URL\n"
13643
"representation, and escape special characters where necessary."
13644
msgstr ""
13645
13646
#: en/help_topics/url-special-chars.txt:14
13647
msgid ""
13648
"There are a few characters which have special meaning in URLs and need "
13649
"careful\n"
13650
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13651
"value in URLs. Any non-ASCII characters in a file path will automatically "
13652
"be\n"
13653
"urlencoded when the path is converted to a URL."
13654
msgstr ""
13655
13656
#: en/help_topics/url-special-chars.txt:19
13657
msgid ""
13658
"URLs represent non-ASCII characters in an encoding defined by the server, "
13659
"but\n"
13660
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13661
"be\n"
13662
"generous in what it accepts as a URL and to print them in a way that\n"
13663
"will be readable."
13664
msgstr ""
13665
13666
#: en/help_topics/url-special-chars.txt:24
13667
msgid ""
13668
"For example, if you have a directory named '/tmp/%2False' these are all "
13669
"valid\n"
13670
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13671
"slash)::"
13672
msgstr ""
13673
13674
#: en/help_topics/url-special-chars.txt:27
13675
msgid ""
13676
" cd /tmp\n"
13677
" bzr log /tmp/%2False\n"
13678
" bzr log %2False\n"
13679
" bzr log file:///tmp/%252False\n"
13680
" bzr log file://localhost/tmp/%252False\n"
13681
" bzr log file:%252False"
13682
msgstr ""
13683
13684
#: en/help_topics/url-special-chars.txt:34
13685
msgid "These are valid but do not refer to the same file::"
13686
msgstr ""
13687
13688
#: en/help_topics/url-special-chars.txt:36
13689
msgid ""
13690
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13691
" bzr log %252False (refers to a file called /tmp/%252False)"
13692
msgstr ""
13693
13694
#: en/help_topics/url-special-chars.txt:39
13695
msgid ""
13696
"Comma also has special meaning in URLs, because it denotes `segment "
13697
"parameters`_"
13698
msgstr ""
13699
13700
#: en/help_topics/url-special-chars.txt:41
13701
msgid ""
13702
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13703
msgstr ""
13704
13705
#: en/help_topics/url-special-chars.txt:43
13706
msgid ""
13707
"Comma is also special in any file system paths that are specified. To use a "
13708
"literal\n"
13709
"comma in a file system path, specify a URL and URL encode the comma::"
13710
msgstr ""
13711
13712
#: en/help_topics/url-special-chars.txt:46
13713
msgid ""
13714
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13715
"\"branch\" set to \"bla\"\n"
13716
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13717
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13718
"\"branch\" set to \"bla\"\n"
13719
msgstr ""
13720
13721
#: en/help_topics/urlspec.txt:1
13722
msgid "URL Identifiers"
13723
msgstr ""
13724
13725
#: en/help_topics/urlspec.txt:3
13726
msgid "Supported URL prefixes::"
13727
msgstr ""
13728
13729
#: en/help_topics/urlspec.txt:5
13730
msgid ""
13731
" aftp:// Access using active FTP.\n"
13732
" bzr:// Fast access using the Bazaar smart server.\n"
13733
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13734
" file:// Access using the standard filesystem (default)\n"
13735
" ftp:// Access using passive FTP.\n"
13736
" http:// Read-only access of branches exported on the web.\n"
13737
" https:// Read-only access of branches exported on the web using "
13738
"SSL.\n"
13739
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13740
msgstr ""
13741
13742
#: en/help_topics/urlspec.txt:14
13743
msgid "Supported modifiers::"
13744
msgstr ""
13745
13746
#: en/help_topics/urlspec.txt:16
13747
msgid " gio+ Access using any GIO supported protocols."
13748
msgstr ""
13749
13750
#: en/help_topics/urlspec.txt:18
13751
msgid "Bazaar supports all of the standard parts within the URL::"
13752
msgstr ""
13753
13754
#: en/help_topics/urlspec.txt:20
13755
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13756
msgstr ""
13757
13758
#: en/help_topics/urlspec.txt:22
13759
msgid "allowing URLs such as::"
13760
msgstr ""
13761
13762
#: en/help_topics/urlspec.txt:24
13763
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13764
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13765
13766
#: en/help_topics/urlspec.txt:26
13767
msgid ""
13768
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13769
"with '~' as meaning that the rest of the path should be interpreted\n"
13770
"relative to the remote user's home directory. For example if the user\n"
13771
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13772
"shell.example.com, then::"
13773
msgstr ""
13774
13775
#: en/help_topics/urlspec.txt:32
13776
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13777
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13778
13779
#: en/help_topics/urlspec.txt:34
13780
msgid "would refer to ``/home/remote/myproject/trunk``."
13781
msgstr ""
13782
13783
#: en/help_topics/urlspec.txt:36
13784
msgid ""
13785
"Many commands that accept URLs also accept location aliases too.\n"
13786
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13787
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1