« back to all changes in this revision
Viewing changes to po/ru.po
- browse files at revision 6093.4.149
- compare with another revision
- download diff
- download tarball
- view history from revision 6093.4.149
- Committer: Launchpad Translations on behalf of bzr-core
- Date: 2012-07-11 04:34:44 UTC
- mto: (6581.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: launchpad_translations_on_behalf_of_bzr-core-20120711043444-s6bhpt1r22h4fpi1
Launchpad automatic translations update.
- files added:
- bzrlib/estimate_compressed_size.py
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files removed:
- bzrlib/help_topics/en/location-alias.txt
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- tools/build_mo.py => bzrlib/bzr_distutils.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- files modified:
- Makefile
added
removed
po/ru.po
1
# Russian translation for bzr
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2012-01-21 16:45+0000\n"
12
"Last-Translator: Sergey Basalaev <SBasalaev@gmail.com>\n"
13
"Language-Team: Russian <ru@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19
"X-Launchpad-Export-Date: 2012-07-11 04:33+0000\n"
20
"X-Generator: Launchpad (build 15593)\n"
21
22
#: bzrlib/add.py:93
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
24
msgstr "пропуск {0} (более, чем {1} из {2} байт)"
25
26
#: bzrlib/branch.py:854
27
msgid "Unstacking"
28
msgstr "Извлечение из стека"
29
30
#: bzrlib/branch.py:2955
31
#, python-format
32
msgid "Pushed up to revision %d."
33
msgstr "Отправлено до ревизии %d включительно."
34
35
#: bzrlib/branch.py:2957
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:2960
44
msgid "No new revisions or tags to push."
45
msgstr "Нет новых ревизий или тегов для отправки."
46
47
#: bzrlib/branch.py:2962
48
msgid "No new revisions to push."
49
msgstr "Нет новых ревизий для отправки."
50
51
#: bzrlib/branch.py:2982
52
msgid "checked branch {0} format {1}"
53
msgstr "проверена ветвь {0} формата {1}"
54
55
#: bzrlib/branch.py:2985
56
#, python-format
57
msgid "found error:%s"
58
msgstr "обнаружена ошибка:%s"
59
60
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
61
#, python-format
62
msgid "Ignoring files outside view. View is %s"
63
msgstr "Игнорируются файлы вне окна просмотра. Окно просмотра: %s"
64
65
#: bzrlib/builtins.py:260
66
#, python-format
67
msgid "bzr %s --revision takes exactly one revision identifier"
68
msgstr "bzr %s --revision принимает ровно один идентификатор ревизии"
69
70
#: bzrlib/builtins.py:315
71
msgid "Display status summary."
72
msgstr "Отобразить краткое описание состояния."
73
74
#: bzrlib/builtins.py:317
75
msgid ""
76
"This reports on versioned and unknown files, reporting them\n"
77
"grouped by state. Possible states are:"
78
msgstr ""
79
"Эта команда сообщает о файлах с версиями и неизвестных файлах,\n"
80
"группируя их по состоянию. Возможные состояния:"
81
82
#: bzrlib/builtins.py:320
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:323
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:327
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:332
114
msgid ""
115
"modified\n"
116
" Text has changed since the previous revision."
117
msgstr ""
118
"изменены\n"
119
" Текст изменился с предыдущей ревизии."
120
121
#: bzrlib/builtins.py:335
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:338
130
msgid ""
131
"unknown\n"
132
" Not versioned and not matching an ignore pattern."
133
msgstr ""
134
"неизвестны\n"
135
" Не имеют версии и не подходят под шаблон игнориируемых файлов."
136
137
#: bzrlib/builtins.py:341
138
msgid ""
139
"Additionally for directories, symlinks and files with a changed\n"
140
"executable bit, Bazaar indicates their type using a trailing\n"
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:346
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:349
158
msgid ""
159
"Note that --short or -S gives status flags for each item, similar\n"
160
"to Subversion's status command. To get output similar to svn -q,\n"
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:353
168
msgid ""
169
"If no arguments are specified, the status of the entire working\n"
170
"directory is shown. Otherwise, only the status of the specified\n"
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:358
180
msgid ""
181
"Before merges are committed, the pending merge tip revisions are\n"
182
"shown. To see all pending merge revisions, use the -v option.\n"
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:363
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:366
200
msgid ""
201
"To see which files have changed in a specific revision, or between\n"
202
"two revisions, pass a revision range to the revision argument.\n"
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:375
210
msgid "Use short status indicators."
211
msgstr "Использовать короткие статусные пометки."
212
213
#: bzrlib/builtins.py:377
214
msgid "Only show versioned files."
215
msgstr "Показывать только файлы, имеющие версию."
216
217
#: bzrlib/builtins.py:379
218
msgid "Don't show pending merges."
219
msgstr "Не показывать необработанные слияния."
220
221
#: bzrlib/builtins.py:382
222
msgid "Do not mark object type using indicator."
223
msgstr "Не помечать типы объектов суффиксами."
224
225
#: bzrlib/builtins.py:397
226
msgid "bzr status --revision takes exactly one or two revision specifiers"
227
msgstr ""
228
"bzr status --revision принимает ровно один или два идентификатора ревизии"
229
230
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
231
msgid "You can only supply one of revision_id or --revision"
232
msgstr "Вы можете указать только одно из revision_id или --revision"
233
234
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
235
msgid "You must supply either --revision or a revision_id"
236
msgstr "Вы должны предоставить --revision или revision_id"
237
238
#: bzrlib/builtins.py:451
239
#, python-format
240
msgid "Repository %r does not support access to raw revision texts"
241
msgstr "Репозиторий %r не поддерживает прямой доступ к текстам ревизий"
242
243
#: bzrlib/builtins.py:462
244
msgid "The repository {0} contains no revision {1}."
245
msgstr "Репозиторий {0} не содержит ревизии {1}."
246
247
#: bzrlib/builtins.py:469
248
msgid "You cannot specify a NULL revision."
249
msgstr "Вы не можете указать ревизию NULL."
250
251
#: bzrlib/builtins.py:561
252
msgid "Remove the working tree from a given branch/checkout."
253
msgstr "Удалить рабочее дерево из данной ветви или рабочей копии."
254
255
#: bzrlib/builtins.py:563
256
msgid ""
257
"Since a lightweight checkout is little more than a working tree\n"
258
"this will refuse to run against one."
259
msgstr ""
260
"Поскольку легковесная рабочая копия, это нечто большее, чем рабочее\n"
261
"дерево, эту команду нельзя выполнить внутри неё."
262
263
#: bzrlib/builtins.py:566
264
msgid "To re-create the working tree, use \"bzr checkout\"."
265
msgstr "Чтобы воссоздать рабочее дерево, используйте «bzr checkout»."
266
267
#: bzrlib/builtins.py:572
268
msgid ""
269
"Remove the working tree even if it has uncommitted or shelved changes."
270
msgstr ""
271
"Удалить рабочее дерево даже, если оно содержит незакреплённые или отложенные "
272
"изменения."
273
274
#: bzrlib/builtins.py:586
275
msgid "No working tree to remove"
276
msgstr "Нет рабочего дерева для удаления"
277
278
#: bzrlib/builtins.py:588
279
msgid "You cannot remove the working tree of a remote path"
280
msgstr "Вы не можете удалить внешнее рабочее дерево"
281
282
#: bzrlib/builtins.py:597
283
msgid "You cannot remove the working tree from a lightweight checkout"
284
msgstr "Вы не можете удалить рабочее дерево из легковесной рабочей копии"
285
286
#: bzrlib/builtins.py:637
287
msgid ""
288
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
289
"instead. Use \"--force\" if you are sure you want to reset the working tree."
290
msgstr ""
291
"Дерево не повреждено. Возможно, вы хотели выполнить «bzr revert». "
292
"Используйте «--force», если вы уверены, что хотите использовать reset."
293
294
#: bzrlib/builtins.py:648
295
msgid ""
296
", the header appears corrupt, try passing -r -1 to set the state to the last "
297
"commit"
298
msgstr ""
299
", заголовок повреждён, попробуйте использовать аргумент -r -1, чтобы "
300
"сбросить состояние до предыдущего закрепления"
301
302
#: bzrlib/builtins.py:652
303
msgid "failed to reset the tree state{0}"
304
msgstr "не удалось сбросить состояние дерева {0}"
305
306
#: bzrlib/builtins.py:656
307
msgid "Show current revision number."
308
msgstr "Показать номер текущей ревизии."
309
310
#: bzrlib/builtins.py:658
311
msgid "This is equal to the number of revisions on this branch."
312
msgstr "Это эквивалентно числу ревизий в этой ветви."
313
314
#: bzrlib/builtins.py:671
315
msgid "--tree and --revision can not be used together"
316
msgstr "--tree и --revision не могут использоваться вместе"
317
318
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
319
msgid "Tags can only be placed on a single revision, not on a range"
320
msgstr "Тегом можно пометить только отдельную ревизию, не интервал"
321
322
#: bzrlib/builtins.py:712
323
msgid "Show revno of working tree."
324
msgstr "Показать номер ревизии рабочего дерева."
325
326
#: bzrlib/builtins.py:760
327
msgid "Add specified files or directories."
328
msgstr "Добавить указанные файлы или директории."
329
330
#: bzrlib/builtins.py:762
331
msgid ""
332
"In non-recursive mode, all the named items are added, regardless\n"
333
"of whether they were previously ignored. A warning is given if\n"
334
"any of the named files are already versioned."
335
msgstr ""
336
"В нерекурсивном режиме, все указанные элементы добавляются, вне\n"
337
"зависимости от того, игнорировались ли они до этого. Выводится\n"
338
"предупреждение, если какие-либо из указанных элементов уже были\n"
339
"под контролем Bazaar."
340
341
#: bzrlib/builtins.py:766
342
msgid ""
343
"In recursive mode (the default), files are treated the same way\n"
344
"but the behaviour for directories is different. Directories that\n"
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:774
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:777
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:780
377
msgid ""
378
"Adding a file whose parent directory is not versioned will\n"
379
"implicitly add the parent, and so on up to the root. This means\n"
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:785
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:788
397
msgid ""
398
"--file-ids-from will try to use the file ids from the supplied path.\n"
399
"It looks up ids trying to find a matching parent directory with the\n"
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:796
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:799
425
msgid ""
426
"In recursive mode, files larger than the configuration option \n"
427
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
428
"to file size."
429
msgstr ""
430
"В рекурсивном режиме, файлы больше, чем опция конфигурации\n"
431
"add.maximum_file_size, будут пропущены. Явно названные элементы\n"
432
"никогда не будут пропущены по этому критерию."
433
434
#: bzrlib/builtins.py:806
435
msgid "Don't recursively add the contents of directories."
436
msgstr "Не добавлять содержимое директорий рекурсивно."
437
438
#: bzrlib/builtins.py:813
439
msgid "Lookup file ids from this tree."
440
msgstr "Искать идентификаторы в этом дереве."
441
442
#: bzrlib/builtins.py:849
443
msgid "ignored {0} matching \"{1}\"\n"
444
msgstr "пропуск {0} из-за условия «{1}»\n"
445
446
#: bzrlib/builtins.py:854
447
msgid "Create a new versioned directory."
448
msgstr "Создать новую директорию в системе версий."
449
450
#: bzrlib/builtins.py:856
451
msgid "This is equivalent to creating the directory and then adding it."
452
msgstr "Это эквивалентно созданию директории и её добавлению."
453
454
#: bzrlib/builtins.py:863
455
msgid "No error if existing, make parent directories as needed."
456
msgstr ""
457
"Не выводить ошибку, если существует, создавать родительские директории при "
458
"необходимости."
459
460
#: bzrlib/builtins.py:897
461
#, python-format
462
msgid "added %s\n"
463
msgstr "добавлен %s\n"
464
465
#: bzrlib/builtins.py:939
466
#, python-format
467
msgid "invalid kind %r specified"
468
msgstr "указан неизвестный вид %r"
469
470
#: bzrlib/builtins.py:976
471
msgid "Move or rename a file."
472
msgstr "Переместить или переименовать файл."
473
474
#: bzrlib/builtins.py:978
475
msgid " bzr mv SOURCE... DESTINATION"
476
msgstr " bzr mv ИСТОЧНИК... НАЗНАЧЕНИЕ"
477
478
#: bzrlib/builtins.py:980
479
msgid ""
480
"If the last argument is a versioned directory, all the other names\n"
481
"are moved into it. Otherwise, there must be exactly two arguments\n"
482
"and the file is changed to a new name."
483
msgstr ""
484
"Если последний аргумент является директорией под контролем Bazaar,\n"
485
"все остальные имена перемещаются в неё. Иначе, должно быть указано\n"
486
"ровно два аргумента, и файл переименовывается."
487
488
#: bzrlib/builtins.py:984
489
msgid ""
490
"If OLDNAME does not exist on the filesystem but is versioned and\n"
491
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
492
"assumes that the file has been manually moved and only updates\n"
493
"its internal inventory to reflect that change.\n"
494
"The same is valid when moving many SOURCE files to a DESTINATION."
495
msgstr ""
496
"Если СТАРОЕИМЯ не существует в файловой системе, но есть в системе\n"
497
"версий, а НОВОЕИМЯ существует, но отсутствует в системе версий, mv\n"
498
"предполагает, что файл был перемещён вручную и только обновляет\n"
499
"свои внутренние структуры, чтобы отразить это изменение.\n"
500
"Тоже верно и при перемещении многих ИСТОЧНИКов в НАЗНАЧЕНИЕ."
501
502
#: bzrlib/builtins.py:990
503
msgid "Files cannot be moved between branches."
504
msgstr "Файлы нельзя перемещать между ветвями."
505
506
#: bzrlib/builtins.py:997
507
msgid ""
508
"Move only the bzr identifier of the file, because the file has already been "
509
"moved."
510
msgstr ""
511
"Переместить только bzr-идентификатор файла, поскольку сам файл уже был "
512
"перемещён."
513
514
#: bzrlib/builtins.py:999
515
msgid "Automatically guess renames."
516
msgstr "Автоматически предполагать переименования."
517
518
#: bzrlib/builtins.py:1000
519
msgid "Avoid making changes when guessing renames."
520
msgstr "Избегать изменений при угадывании переименований."
521
522
#: bzrlib/builtins.py:1009
523
msgid "--dry-run requires --auto."
524
msgstr "--dry-run требует --auto."
525
526
#: bzrlib/builtins.py:1013
527
msgid "missing file argument"
528
msgstr "отсутствует аргумент файл"
529
530
#: bzrlib/builtins.py:1017
531
msgid "can not move root of branch"
532
msgstr "нельзя переместить корень ветви"
533
534
#: bzrlib/builtins.py:1023
535
msgid "Only one path may be specified to --auto."
536
msgstr "Только один путь может быть указан, как аргумент --auto."
537
538
#: bzrlib/builtins.py:1026
539
msgid "--after cannot be specified with --auto."
540
msgstr "--after не может использоваться вместе с --auto."
541
542
#: bzrlib/builtins.py:1062
543
msgid "to mv multiple files the destination must be a versioned directory"
544
msgstr ""
545
"чтобы переместить несколько файлов, назначение должно быть директорией под "
546
"контролем системы версий"
547
548
#: bzrlib/builtins.py:1114
549
msgid "Turn this branch into a mirror of another branch."
550
msgstr "Преобразовать эту ветвь в зеркало другой ветви."
551
552
#: bzrlib/builtins.py:1116
553
msgid ""
554
"By default, this command only works on branches that have not diverged.\n"
555
"Branches are considered diverged if the destination branch's most recent \n"
556
"commit is one that has not been merged (directly or indirectly) into the \n"
557
"parent."
558
msgstr ""
559
"По умолчанию, эта команда работает только на ветвях, которые не являются\n"
560
"отклонениями. Ветвь считается отклонением, если последнее закрепление в\n"
561
"ветви назначения не было совмещено (явно или неявно) с родителем."
562
563
#: bzrlib/builtins.py:1121
564
msgid ""
565
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
566
"from one into the other. Once one branch has merged, the other should\n"
567
"be able to pull it again."
568
msgstr ""
569
"Если ветвь является отклонением, можно использовать 'bzr merge' для\n"
570
"возвращения изменений. После совмещения ветвей, можно снова принимать\n"
571
"изменения из одной в другую."
572
573
#: bzrlib/builtins.py:1125
574
msgid ""
575
"If you want to replace your local changes and just want your branch to\n"
576
"match the remote one, use pull --overwrite. This will work even if the two\n"
577
"branches have diverged."
578
msgstr ""
579
"Если вы хотите затереть ваши локальные изменения, чтобы ветвь совпадала\n"
580
"с удалённой, используйте pull --overwrite. Это будет работать, даже если\n"
581
"ветвь является отклонением."
582
583
#: bzrlib/builtins.py:1129
584
msgid ""
585
"If there is no default location set, the first pull will set it (use\n"
586
"--no-remember to avoid setting it). After that, you can omit the\n"
587
"location to use the default. To change the default, use --remember. The\n"
588
"value will only be saved if the remote location can be accessed."
589
msgstr ""
590
"Если местоположение по умолчанию не установлено, первый pull установит\n"
591
"его (используйте --no-remember, чтобы избежать этой установки). После\n"
592
"этого, вы можете опускать местоположение, чтобы использовать значение\n"
593
"по умолчанию. Чтобы изменить значение по умолчанию, используйте опцию\n"
594
"--remember. Значение будет сохранено, только если доступ к удалённому\n"
595
"местоположению будет успешен."
596
597
#: bzrlib/builtins.py:1134
598
msgid ""
599
"The --verbose option will display the revisions pulled using the log_format\n"
600
"configuration option. You can use a different format by overriding it with\n"
601
"-Olog_format=<other_format>."
602
msgstr ""
603
"Опция --verbose отобразит ревизии, загруженные с использованием опции\n"
604
"конфигурации log_format. Вы можете использовать другой формат, перегрузив\n"
605
"её опцией -Olog_format=<другой_формат>."
606
607
#: bzrlib/builtins.py:1138
608
msgid ""
609
"Note: The location can be specified either in the form of a branch,\n"
610
"or in the form of a path to a file containing a merge directive generated\n"
611
"with bzr send."
612
msgstr ""
613
"Замечание: Местоположение можно указывать как в форме ветви, так и в\n"
614
"форме пути к файлу, содержащему директиву слияния, созданному bzr send."
615
616
#: bzrlib/builtins.py:1146
617
msgid "Show logs of pulled revisions."
618
msgstr "Показать журналы принятых ревизий."
619
620
#: bzrlib/builtins.py:1148
621
msgid ""
622
"Branch to pull into, rather than the one containing the working directory."
623
msgstr ""
624
"Принимать изменения в эту ветвь, а не в содержащую рабочую директорию."
625
626
#: bzrlib/builtins.py:1151
627
msgid ""
628
"Perform a local pull in a bound branch. Local pulls are not applied to the "
629
"master branch."
630
msgstr ""
631
"Сделать локальный приём в связанную ветвь. Локальный приём не накладывается "
632
"на основную ветвь."
633
634
#: bzrlib/builtins.py:1189
635
msgid "Need working tree for --show-base."
636
msgstr "Для --show-base необходимо рабочее дерево."
637
638
#: bzrlib/builtins.py:1205
639
msgid "No pull location known or specified."
640
msgstr "Местоположение для приёма неизвестно и не указано."
641
642
#: bzrlib/builtins.py:1211
643
#, python-format
644
msgid "Using saved parent location: %s\n"
645
msgstr "Используется сохранённое местоположение родителя: %s\n"
646
647
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
648
msgid "Cannot use -r with merge directives or bundles"
649
msgstr "Нельзя использовать -r с директивами слияния или пакетами"
650
651
#: bzrlib/builtins.py:1261
652
msgid "Update a mirror of this branch."
653
msgstr "Обновить зеркало этой ветви."
654
655
#: bzrlib/builtins.py:1263
656
msgid ""
657
"The target branch will not have its working tree populated because this\n"
658
"is both expensive, and is not supported on remote file systems."
659
msgstr ""
660
"Целевая ветвь не будет иметь рабочего дерева, поскольку это накладно\n"
661
"и не поддерживается удалёнными файловыми системами."
662
663
#: bzrlib/builtins.py:1266
664
msgid ""
665
"Some smart servers or protocols *may* put the working tree in place in\n"
666
"the future."
667
msgstr ""
668
"Некоторые умные серверы или протоколы *может быть* будут размещать\n"
669
"рабочее дерево в месте назначения в будущем."
670
671
#: bzrlib/builtins.py:1269
672
msgid ""
673
"This command only works on branches that have not diverged. Branches are\n"
674
"considered diverged if the destination branch's most recent commit is one\n"
675
"that has not been merged (directly or indirectly) by the source branch."
676
msgstr ""
677
"Эта команда работает только на ветвях, которые не являются\n"
678
"отклонениями. Ветвь считается отклонением, если последнее\n"
679
"закрепление в ветви назначения не было совмещено (явно или\n"
680
"неявно) с родителем."
681
682
#: bzrlib/builtins.py:1273
683
msgid ""
684
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
685
"the other branch completely, discarding its unmerged changes."
686
msgstr ""
687
"Если ветвь была отклонена, вы можете использовать 'bzr push --overwrite',\n"
688
"чтобы полностью заменить другую ветвь, убирая все её несовмещённые\n"
689
"изменения."
690
691
#: bzrlib/builtins.py:1276
692
msgid ""
693
"If you want to ensure you have the different changes in the other branch,\n"
694
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
695
"After that you will be able to do a push without '--overwrite'."
696
msgstr ""
697
"Если вы хотите убедиться, что у вас иные изменения, чем в другой ветви,\n"
698
"сделайте слияние (см. bzr help merge) с другой ветвью, и закрепите эти\n"
699
"изменения. После этого вы сможете делать push без необходимости указывать\n"
700
"опцию '--overwrite'."
701
702
#: bzrlib/builtins.py:1280
703
msgid ""
704
"If there is no default push location set, the first push will set it (use\n"
705
"--no-remember to avoid setting it). After that, you can omit the\n"
706
"location to use the default. To change the default, use --remember. The\n"
707
"value will only be saved if the remote location can be accessed."
708
msgstr ""
709
"Если местоположение отправки по умолчанию не установлено, первый push\n"
710
"установит её (используйте --no-remember, чтобы не устанавливать).\n"
711
"После этого вы можете опускать местоположение, чтобы использовать\n"
712
"значение по умолчанию. Чтобы изменить значение по умолчанию,\n"
713
"используйте опцию --remember. Значение будет сохранено, только если\n"
714
"доступ к удалённой локации будет успешен."
715
716
#: bzrlib/builtins.py:1285
717
msgid ""
718
"The --verbose option will display the revisions pushed using the log_format\n"
719
"configuration option. You can use a different format by overriding it with\n"
720
"-Olog_format=<other_format>."
721
msgstr ""
722
"Опция --verbose отобразит ревизии, выгруженные с использованием опции\n"
723
"конфигурации log_format. Вы можете использовать другой формат, перегрузив\n"
724
"её опцией -Olog_format=<другой_формат>."
725
726
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
727
msgid ""
728
"Branch to push from, rather than the one containing the working directory."
729
msgstr "Отправлять из этой ветви, а не из содержащей рабочую директорию."
730
731
#: bzrlib/builtins.py:1299
732
msgid ""
733
"By default push will fail if the target directory exists, but does not "
734
"already have a control directory. This flag will allow push to proceed."
735
msgstr ""
736
"По умолчанию, push закончится неудачей, если директория назначения "
737
"существует, но не содержит управляющих метаданных. Этот флаг позволит "
738
"отправке изменений продолжаться."
739
740
#: bzrlib/builtins.py:1304
741
msgid ""
742
"Create a stacked branch that references the public location of the parent "
743
"branch."
744
msgstr ""
745
"Создать стековую ветвь, которая ссылается на публичное местоположение "
746
"родительской ветви."
747
748
#: bzrlib/builtins.py:1307
749
msgid ""
750
"Create a stacked branch that refers to another branch for the commit "
751
"history. Only the work not present in the referenced branch is included in "
752
"the branch created."
753
msgstr ""
754
"Создать стековую ветвь, которая ссылается на другую ветвь для хранения "
755
"истории фиксаций. В созданную ветвь помещается только работа, не "
756
"существующая в исходной ветви."
757
758
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
759
msgid ""
760
"Refuse to push if there are uncommitted changes in the working tree, --no-"
761
"strict disables the check."
762
msgstr ""
763
"Отказывать в отсылке изменений, если в рабочем дереве есть незакреплённые "
764
"изменения, --no-strict запрещает проверку."
765
766
#: bzrlib/builtins.py:1315
767
msgid "Don't populate the working tree, even for protocols that support it."
768
msgstr ""
769
"Не создавать рабочее дерево, даже для протоколов, которые поддерживают это."
770
771
#: bzrlib/builtins.py:1318
772
msgid "Overwrite tags only."
773
msgstr ""
774
775
#: bzrlib/builtins.py:1369
776
msgid "Could not determine branch to refer to."
777
msgstr "Не удалось определить ветвь, на которую нужно ссылаться."
778
779
#: bzrlib/builtins.py:1378
780
#, python-format
781
msgid ""
782
"No push location known or specified. To push to the parent branch (at %s), "
783
"use 'bzr push :parent'."
784
msgstr ""
785
786
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
787
msgid "No push location known or specified."
788
msgstr "Местоположение для отсылки изменений неизвестно и не указано."
789
790
#: bzrlib/builtins.py:1388
791
#, python-format
792
msgid "Using saved push location: %s"
793
msgstr "Используется сохранённое местоположение отсылки: %s"
794
795
#: bzrlib/builtins.py:1398
796
msgid "Create a new branch that is a copy of an existing branch."
797
msgstr "Создать новую ветвь, являющуюся копией существующей ветви."
798
799
#: bzrlib/builtins.py:1400
800
msgid ""
801
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
802
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
803
"./bar.\n"
804
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
805
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
806
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
807
"create ./foo-bar."
808
msgstr ""
809
"Если TO_LOCATION опущено, будет использована последняя компонента\n"
810
"FROM_LOCATION. Иными словами, «branch ../foo/bar» попытается создать ./bar.\n"
811
"Если FROM_LOCATION не содержит разделителя «/», то TO_LOCATION определется\n"
812
"из FROM_LOCATION удалением префикса. Например «branch lp:foo-bar»\n"
813
"попытается создать ./foo-bar."
814
815
#: bzrlib/builtins.py:1407
816
msgid ""
817
"To retrieve the branch as of a particular revision, supply the --revision\n"
818
"parameter, as in \"branch foo/bar -r 5\"."
819
msgstr ""
820
"Чтобы получить определённую ревизию ветви, передайте её в параметре\n"
821
"--revision, напр. «branch foo/bar -r 5»."
822
823
#: bzrlib/builtins.py:1410
824
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
825
msgstr "Синонимы 'clone' и 'get' для этой команды устарели."
826
827
#: bzrlib/builtins.py:1420
828
msgid "Create a branch without a working-tree."
829
msgstr "Создать ветвь без рабочего дерева."
830
831
#: bzrlib/builtins.py:1422
832
msgid "Switch the checkout in the current directory to the new branch."
833
msgstr "Заменить рабочую копию в текущей директории новой ветвью."
834
835
#: bzrlib/builtins.py:1425
836
msgid ""
837
"Create a stacked branch referring to the source branch. The new branch will "
838
"depend on the availability of the source branch for all operations."
839
msgstr ""
840
"Создать стековую ветвь, ссылающуюся на исходную ветвь. Все операции над "
841
"новой ветвью будут зависеть от доступности старой ветви."
842
843
#: bzrlib/builtins.py:1429
844
msgid "Do not use a shared repository, even if available."
845
msgstr "Не использовать общий репозиторий, даже если доступен."
846
847
#: bzrlib/builtins.py:1431
848
msgid ""
849
"By default branch will fail if the target directory exists, but does not "
850
"already have a control directory. This flag will allow branch to proceed."
851
msgstr ""
852
"По умолчанию branch завершится неудачей, если директория назначения "
853
"существует, но не содержит управляющих метаданных. Этот флаг позволит branch "
854
"продолжаться."
855
856
#: bzrlib/builtins.py:1436
857
msgid "Bind new branch to from location."
858
msgstr "Связать новую ветвь с FROM_LOCATION"
859
860
#: bzrlib/builtins.py:1483
861
#, python-format
862
msgid "Target directory \"%s\" already exists."
863
msgstr "Целевая директория «%s» уже существует."
864
865
#: bzrlib/builtins.py:1495
866
#, python-format
867
msgid "Parent of \"%s\" does not exist."
868
msgstr "Родитель «%s» не существует."
869
870
#: bzrlib/builtins.py:1514
871
msgid "The branch {0} has no revision {1}."
872
msgstr "В ветви {0} отсутствует ревизия {1}."
873
874
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
875
#, python-format
876
msgid "Created new stacked branch referring to %s."
877
msgstr "Создана новая стековая ветвь, ссылающаяся на %s."
878
879
#: bzrlib/builtins.py:1533
880
#, python-format
881
msgid "Branched %d revision."
882
msgid_plural "Branched %d revisions."
883
msgstr[0] "Ответвлена %d ревизия."
884
msgstr[1] "Ответвлены %d ревизии."
885
msgstr[2] "Ответвлены %d ревизий."
886
887
#: bzrlib/builtins.py:1538
888
#, python-format
889
msgid "New branch bound to %s"
890
msgstr "Новая ветвь, связанная с %s"
891
892
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
893
#, python-format
894
msgid "Switched to branch: %s"
895
msgstr "Переключение на ветвь: %s"
896
897
#: bzrlib/builtins.py:1548
898
msgid "List the branches available at the current location."
899
msgstr "Вывести список ветвей, доступных в текущем местоположении."
900
901
#: bzrlib/builtins.py:1550
902
msgid ""
903
"This command will print the names of all the branches at the current\n"
904
"location."
905
msgstr "Эта команда выведет имена всех ветвей в текущем местоположении."
906
907
#: bzrlib/builtins.py:1557
908
msgid ""
909
"Recursively scan for branches rather than just looking in the specified "
910
"location."
911
msgstr ""
912
"Рекурсивно сканировать ветви, а не смотреть в указанном местоположении."
913
914
#: bzrlib/builtins.py:1586
915
msgid "(default)"
916
msgstr "(по умолчанию)"
917
918
#: bzrlib/builtins.py:1598
919
msgid "Create a new checkout of an existing branch."
920
msgstr "Создать новую рабочую копию текущей ветви."
921
922
#: bzrlib/builtins.py:1600
923
msgid ""
924
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
925
"for\n"
926
"the branch found in '.'. This is useful if you have removed the working "
927
"tree\n"
928
"or if it was never created - i.e. if you pushed the branch to its current\n"
929
"location using SFTP."
930
msgstr ""
931
"Если аргумент BRANCH_LOCATION опущен, checkout воссоздаст рабочее дерево\n"
932
"для ветви, найденной в '.'. Это полезно, если вы удалили рабочее дерево,\n"
933
"или если вы никогда не создавали его."
934
935
#: bzrlib/builtins.py:1605
936
msgid ""
937
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
938
"will\n"
939
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
940
"./bar.\n"
941
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
942
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
943
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
944
"create ./foo-bar."
945
msgstr ""
946
"Если TO_LOCATION опущено, будет использована последняя компонента\n"
947
"BRANCH_LOCATION. Иными словами, «checkout ../foo/bar» попытается\n"
948
"создать ./bar. Если BRANCH_LOCATION не содержит разделителя «/»,\n"
949
"то TO_LOCATION определется из BRANCH_LOCATION удалением префикса.\n"
950
"Например «checkout lp:foo-bar» попытается создать ./foo-bar."
951
952
#: bzrlib/builtins.py:1612
953
msgid ""
954
"To retrieve the branch as of a particular revision, supply the --revision\n"
955
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
956
"immediately\n"
957
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
958
"old\n"
959
"code.)"
960
msgstr ""
961
"Чтобы получить определённую ревизию ветви, добавьте параметр --revision,\n"
962
"например «checkout foo/bar -r 5». Заметьте, что такое дерево будет сразу\n"
963
"просрочено [так что в не сможете закрепить изменения], но это может быть\n"
964
"полезно, к примеру, для просмотра старого кода."
965
966
#: bzrlib/builtins.py:1622
967
msgid ""
968
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
969
"the branch for every operation. Normal checkouts can perform common "
970
"operations like diff and status without such access, and also support local "
971
"commits."
972
msgstr ""
973
"Получить легковесную рабочую копию. Каждая операция над легковесной рабочей "
974
"копией зависит от доступности ветви. Обычные рабочие копии позволяют "
975
"производить стандартные операции, как diff и status, без такого доступа, а "
976
"также поддерживают локальные закрепления."
977
978
#: bzrlib/builtins.py:1629
979
msgid "Get file contents from this tree."
980
msgstr "Получить содержимое файла из этого дерева."
981
982
#: bzrlib/builtins.py:1631
983
msgid "Hard-link working tree files where possible."
984
msgstr "Использовать жёсткие ссылки в рабочем дереве, когда это возможно."
985
986
#: bzrlib/builtins.py:1672
987
msgid ""
988
"Show list of renamed files.\n"
989
" "
990
msgstr ""
991
"Показать список переименованных файлов.\n"
992
" "
993
994
#: bzrlib/builtins.py:1700
995
msgid "Update a working tree to a new revision."
996
msgstr "Обновить рабочее дерево до новой ревизии."
997
998
#: bzrlib/builtins.py:1702
999
msgid ""
1000
"This will perform a merge of the destination revision (the tip of the\n"
1001
"branch, or the specified revision) into the working tree, and then make\n"
1002
"that revision the basis revision for the working tree. "
1003
msgstr ""
1004
1005
#: bzrlib/builtins.py:1706
1006
msgid ""
1007
"You can use this to visit an older revision, or to update a working tree\n"
1008
"that is out of date from its branch."
1009
msgstr ""
1010
1011
#: bzrlib/builtins.py:1709
1012
msgid ""
1013
"If there are any uncommitted changes in the tree, they will be carried\n"
1014
"across and remain as uncommitted changes after the update. To discard\n"
1015
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
1016
"with the changes brought in by the change in basis revision."
1017
msgstr ""
1018
1019
#: bzrlib/builtins.py:1714
1020
msgid ""
1021
"If the tree's branch is bound to a master branch, bzr will also update\n"
1022
"the branch from the master."
1023
msgstr ""
1024
1025
#: bzrlib/builtins.py:1717
1026
msgid ""
1027
"You cannot update just a single file or directory, because each Bazaar\n"
1028
"working tree has just a single basis revision. If you want to restore a\n"
1029
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
1030
"update'. If you want to restore a file to its state in a previous\n"
1031
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
1032
"out the old content of that file to a new location."
1033
msgstr ""
1034
"Нельзя обновить только отдельный файл или директорию, поскольку каждое\n"
1035
"рабочее дерево Bazaar имеет только одну базовую ревизию. Если вы хотите\n"
1036
"восстановить файл, который был удалён на локальной машине, используйте\n"
1037
"'bzr revert', а не 'bzr update'. Если вы хотите восстановить файл до\n"
1038
"состояния в предыдущей ревизии, используйте 'bzr revert' с опцией '-r',\n"
1039
"или используйте 'bzr cat', чтобы записать старое содержимое этого файла\n"
1040
"в новое местоположение."
1041
1042
#: bzrlib/builtins.py:1724
1043
msgid ""
1044
"The 'dir' argument, if given, must be the location of the root of a\n"
1045
"working tree to update. By default, the working tree that contains the \n"
1046
"current working directory is used."
1047
msgstr ""
1048
1049
#: bzrlib/builtins.py:1740
1050
msgid "bzr update --revision takes exactly one revision"
1051
msgstr "bzr update --revision принимает ровно одну ревизию"
1052
1053
#: bzrlib/builtins.py:1748
1054
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1055
msgstr ""
1056
"bzr update может обновить только всё дерево, не файл или поддиректорию"
1057
1058
#: bzrlib/builtins.py:1779
1059
msgid "Tree is up to date at revision {0} of branch {1}"
1060
msgstr "Дерево в актуальной ревизии {0} ветви {1}"
1061
1062
#: bzrlib/builtins.py:1795
1063
#, python-format
1064
msgid ""
1065
"branch has no revision %s\n"
1066
"bzr update --revision only works for a revision in the branch history"
1067
msgstr ""
1068
"в ветви нет ревизии %s\n"
1069
"bzr update --revision работает только для ревизий в истории ветви"
1070
1071
#: bzrlib/builtins.py:1801
1072
msgid "Updated to revision {0} of branch {1}"
1073
msgstr "Обновлено до ревизии {0} ветви {1}"
1074
1075
#: bzrlib/builtins.py:1805
1076
msgid ""
1077
"Your local commits will now show as pending merges with 'bzr status', and "
1078
"can be committed with 'bzr commit'."
1079
msgstr ""
1080
"Ваши локальные закрепления теперь будут отображаться в 'bzr status' как "
1081
"незавершённые слияния, и их можно закрепить с помощью 'bzr commit'."
1082
1083
#: bzrlib/builtins.py:1814
1084
msgid "Show information about a working tree, branch or repository."
1085
msgstr "Показать информацию о рабочем дереве, ветви или репозитории."
1086
1087
#: bzrlib/builtins.py:1816
1088
msgid ""
1089
"This command will show all known locations and formats associated to the\n"
1090
"tree, branch or repository."
1091
msgstr ""
1092
"Эта команда выведет все известные местоположения и форматы, связанные\n"
1093
"с деревом, ветвью или репозиторием."
1094
1095
#: bzrlib/builtins.py:1819
1096
msgid ""
1097
"In verbose mode, statistical information is included with each report.\n"
1098
"To see extended statistic information, use a verbosity level of 2 or\n"
1099
"higher by specifying the verbose option multiple times, e.g. -vv."
1100
msgstr ""
1101
"В подробном режиме в каждый отчёт включается статистическая информация.\n"
1102
"Чтобы увидеть расширенную статистическую информацию, используйте уровень\n"
1103
"подробностей 2 или выше, указывая опцию -v несколько раз, например -vv."
1104
1105
#: bzrlib/builtins.py:1823
1106
msgid "Branches and working trees will also report any missing revisions."
1107
msgstr ""
1108
"Ветви и рабочие деревья также включают в отчёт отсутствующие ревизии."
1109
1110
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1111
#: bzrlib/builtins.py:6466
1112
msgid ":Examples:"
1113
msgstr ":Примеры:"
1114
1115
#: bzrlib/builtins.py:1827
1116
msgid " Display information on the format and related locations:"
1117
msgstr " Вывести информацию о формате и связанных местоположениях:"
1118
1119
#: bzrlib/builtins.py:1829
1120
msgid " bzr info"
1121
msgstr " bzr info"
1122
1123
#: bzrlib/builtins.py:1831
1124
msgid ""
1125
" Display the above together with extended format information and\n"
1126
" basic statistics (like the number of files in the working tree and\n"
1127
" number of revisions in the branch and repository):"
1128
msgstr ""
1129
" Вывести то же, что и выше, а также расширенную информацию о формате\n"
1130
" и базовую статистику (как число файлов в рабочем дереве и число\n"
1131
" ревизий в ветви и репозитории):"
1132
1133
#: bzrlib/builtins.py:1835
1134
msgid " bzr info -v"
1135
msgstr " bzr info -v"
1136
1137
#: bzrlib/builtins.py:1837
1138
msgid " Display the above together with number of committers to the branch:"
1139
msgstr " Вывести то же, что и выше, а также число участников ветви:"
1140
1141
#: bzrlib/builtins.py:1839
1142
msgid " bzr info -vv"
1143
msgstr " bzr info -vv"
1144
1145
#: bzrlib/builtins.py:1858
1146
msgid "Remove files or directories."
1147
msgstr "Исключить файлы или директории."
1148
1149
#: bzrlib/builtins.py:1860
1150
msgid ""
1151
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1152
"delete them if they can easily be recovered using revert otherwise they\n"
1153
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1154
"parameters are given Bazaar will scan for files that are being tracked by\n"
1155
"Bazaar but missing in your tree and stop tracking them for you."
1156
msgstr ""
1157
1158
#: bzrlib/builtins.py:1868
1159
msgid "Only remove files that have never been committed."
1160
msgstr "Исключать только файлы, которые никогда не были закреплены."
1161
1162
#: bzrlib/builtins.py:1870
1163
msgid "The file deletion mode to be used."
1164
msgstr "Используемый способ удаления файлов."
1165
1166
#: bzrlib/builtins.py:1871
1167
msgid "Deletion Strategy"
1168
msgstr "Стратегия удаления"
1169
1170
#: bzrlib/builtins.py:1872
1171
msgid "Backup changed files (default)."
1172
msgstr ""
1173
1174
#: bzrlib/builtins.py:1873
1175
msgid "Delete from bzr but leave the working copy."
1176
msgstr "Удалить из bzr, но оставить рабочую копию."
1177
1178
#: bzrlib/builtins.py:1874
1179
msgid "Don't backup changed files."
1180
msgstr "Не создавать резервные копии изменённых файлов."
1181
1182
#: bzrlib/builtins.py:1875
1183
msgid ""
1184
"Delete all the specified files, even if they can not be recovered and even "
1185
"if they are non-empty directories. (deprecated, use no-backup)"
1186
msgstr ""
1187
"Удалить все указанные файлы, даже если их нельзя восстановить или они "
1188
"являются непустыми директориями. (устарело, используйте no-backup)"
1189
1190
#: bzrlib/builtins.py:1884
1191
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1192
msgstr ""
1193
"(Опция --force устарела, в будущем следует использовать --no-backup.)"
1194
1195
#: bzrlib/builtins.py:1901
1196
msgid "No matching files."
1197
msgstr "Нет файлов, удовлетворяющих критерию."
1198
1199
#: bzrlib/builtins.py:1962
1200
msgid "Reconcile bzr metadata in a branch."
1201
msgstr "Согласовать метаданные bzr в ветви."
1202
1203
#: bzrlib/builtins.py:1964
1204
msgid ""
1205
"This can correct data mismatches that may have been caused by\n"
1206
"previous ghost operations or bzr upgrades. You should only\n"
1207
"need to run this command if 'bzr check' or a bzr developer\n"
1208
"advises you to run it."
1209
msgstr ""
1210
"Может исправить несовпадения данных, вызванные обновлениями bzr.\n"
1211
"Эту команду стоит запускать только, если 'bzr check' или разработчик\n"
1212
"bzr предложат вам сделать это."
1213
1214
#: bzrlib/builtins.py:1969
1215
msgid ""
1216
"If a second branch is provided, cross-branch reconciliation is\n"
1217
"also attempted, which will check that data like the tree root\n"
1218
"id which was not present in very early bzr versions is represented\n"
1219
"correctly in both branches."
1220
msgstr ""
1221
"Если предоставлена вторая ветвь, производится попытка согласования\n"
1222
"между ветвями, в ходе которой проверяется, что данные, не\n"
1223
"присутствовавшие в ранних версиях bzr, корректно представлены\n"
1224
"в обоих ветвях."
1225
1226
#: bzrlib/builtins.py:1974
1227
msgid ""
1228
"At the same time it is run it may recompress data resulting in\n"
1229
"a potential saving in disk space or performance gain."
1230
msgstr ""
1231
"В то же время, при запуске возможно пережатие данных, потенциально\n"
1232
"уменьшающее размер занимаемого пространства и повышающее\n"
1233
"производительность."
1234
1235
#: bzrlib/builtins.py:1977
1236
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1237
msgstr ""
1238
"Ветвь *ДОЛЖНА* быть на системе, поддерживающей список файлов, такой как\r\n"
1239
"локальный диск или SFTP."
1240
1241
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1242
msgid ""
1243
"Format for the bzr 2.0 series.\n"
1244
"Uses group-compress storage.\n"
1245
"Provides rich roots which are a one-way transition.\n"
1246
msgstr ""
1247
1248
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1249
msgid ""
1250
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1251
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1252
msgstr ""
1253
1254
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1255
msgid "The 2a format with experimental support for colocated branches.\n"
1256
msgstr ""
1257
1258
#: bzrlib/builtins.py:2045
1259
msgid "Make a directory into a versioned branch."
1260
msgstr "Преобразовать директорию в ветвь системы контроля версий."
1261
1262
#: bzrlib/builtins.py:2047
1263
msgid ""
1264
"Use this to create an empty branch, or before importing an\n"
1265
"existing project."
1266
msgstr ""
1267
"Используйте эту команду для создания пустой ветви или\n"
1268
"перед импортом существующего проекта."
1269
1270
#: bzrlib/builtins.py:2050
1271
msgid ""
1272
"If there is a repository in a parent directory of the location, then\n"
1273
"the history of the branch will be stored in the repository. Otherwise\n"
1274
"init creates a standalone branch which carries its own history\n"
1275
"in the .bzr directory."
1276
msgstr ""
1277
"Если в родительской директории находится репозиторий, история ветви\n"
1278
"будет сохранена в репозитории. Иначе, init создаёт одиночную ветвь,\n"
1279
"которая несёт историю с собой в директории .bzr."
1280
1281
#: bzrlib/builtins.py:2055
1282
msgid ""
1283
"If there is already a branch at the location but it has no working tree,\n"
1284
"the tree can be populated with 'bzr checkout'."
1285
msgstr ""
1286
"Если ветвь уже существует, но рабочее дерево отсутствует, то оно\n"
1287
"создаётся с помощью 'bzr checkout'."
1288
1289
#: bzrlib/builtins.py:2058
1290
msgid "Recipe for importing a tree of files::"
1291
msgstr "Рецепт для импорта дерева файлов::"
1292
1293
#: bzrlib/builtins.py:2060
1294
msgid ""
1295
" cd ~/project\n"
1296
" bzr init\n"
1297
" bzr add .\n"
1298
" bzr status\n"
1299
" bzr commit -m \"imported project\""
1300
msgstr ""
1301
" cd ~/project\n"
1302
" bzr init\n"
1303
" bzr add .\n"
1304
" bzr status\n"
1305
" bzr commit -m \"проект импортирован\""
1306
1307
#: bzrlib/builtins.py:2071
1308
msgid ""
1309
"Create the path leading up to the branch if it does not already exist."
1310
msgstr "Создать путь, ведущий к ветви, если он ещё не существует."
1311
1312
#: bzrlib/builtins.py:2074
1313
msgid "Specify a format for this branch. See \"help formats\"."
1314
msgstr "Указать формат данной ветви. См. «help formats»."
1315
1316
#: bzrlib/builtins.py:2082
1317
msgid ""
1318
"Never change revnos or the existing log. Append revisions to it only."
1319
msgstr ""
1320
"Никогда не изменять номера ревизий в существующем журнале. Только добавлять "
1321
"к нему ревизии."
1322
1323
#: bzrlib/builtins.py:2085
1324
msgid "Create a branch without a working tree."
1325
msgstr "Создать ветвь без рабочего дерева."
1326
1327
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1328
#, python-format
1329
msgid ""
1330
"Parent directory of %s does not exist.\n"
1331
"You may supply --create-prefix to create all leading parent directories."
1332
msgstr ""
1333
"Родительская директория для %s не существует.\n"
1334
"Вы может предоставить --create-prefix, чтобы создать все родительские "
1335
"директории."
1336
1337
#: bzrlib/builtins.py:2139
1338
msgid ""
1339
"This branch format cannot be set to append-revisions-only. Try --default."
1340
msgstr ""
1341
"Формат этой ветви не может быть установлен в append-revisions-only. "
1342
"Попробуйте --default."
1343
1344
#: bzrlib/builtins.py:2150
1345
msgid "Created a {0} (format: {1})\n"
1346
msgstr "Создана {0} в формате {1}\n"
1347
1348
#: bzrlib/builtins.py:2159
1349
#, python-format
1350
msgid "Using shared repository: %s\n"
1351
msgstr "Используется общий репозиторий: %s\n"
1352
1353
#: bzrlib/builtins.py:2163
1354
msgid "Create a shared repository for branches to share storage space."
1355
msgstr ""
1356
"Создать общий репозиторий для ветвей, которые разделяют общее пространство."
1357
1358
#: bzrlib/builtins.py:2165
1359
msgid ""
1360
"New branches created under the repository directory will store their\n"
1361
"revisions in the repository, not in the branch directory. For branches\n"
1362
"with shared history, this reduces the amount of storage needed and \n"
1363
"speeds up the creation of new branches."
1364
msgstr ""
1365
"Новые ветви, создаваемые в директории репозитория, будут хранить\n"
1366
"информацию о ревизиях в репозитории, а не в директории ветви.\n"
1367
"Для ветвей с общей историей это уменьшает размер необходимого\n"
1368
"пространства и ускоряет создание новых ветвей."
1369
1370
#: bzrlib/builtins.py:2170
1371
msgid ""
1372
"If the --no-trees option is given then the branches in the repository\n"
1373
"will not have working trees by default. They will still exist as \n"
1374
"directories on disk, but they will not have separate copies of the \n"
1375
"files at a certain revision. This can be useful for repositories that\n"
1376
"store branches which are interacted with through checkouts or remote\n"
1377
"branches, such as on a server."
1378
msgstr ""
1379
"Если дана опция --no-trees, то по умолчанию ветви в репозитории не\n"
1380
"будут иметь рабочих деревьев. Они по прежнему будут существовать,\n"
1381
"как директории на диске, но не будут иметь различных копий файлов\n"
1382
"определённой ревизии. Это может быть полезно для репозиториев,\n"
1383
"хранящих ветви, работа с которыми производится через рабочие копии\n"
1384
"или через удалённые ветви, например на сервере."
1385
1386
#: bzrlib/builtins.py:2177
1387
msgid ""
1388
":Examples:\n"
1389
" Create a shared repository holding just branches::"
1390
msgstr ""
1391
":Примеры:\n"
1392
" Создать общий репозиторий, хранящий только ветви::"
1393
1394
#: bzrlib/builtins.py:2180
1395
msgid ""
1396
" bzr init-repo --no-trees repo\n"
1397
" bzr init repo/trunk"
1398
msgstr ""
1399
" bzr init-repo --no-trees repo\n"
1400
" bzr init repo/trunk"
1401
1402
#: bzrlib/builtins.py:2183
1403
msgid " Make a lightweight checkout elsewhere::"
1404
msgstr " Создать легковесную рабочую копию где-нибудь ещё::"
1405
1406
#: bzrlib/builtins.py:2185
1407
msgid ""
1408
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1409
" cd trunk-checkout\n"
1410
" (add files here)"
1411
msgstr ""
1412
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1413
" cd trunk-checkout\n"
1414
" (здесь добавляйте файлы)"
1415
1416
#: bzrlib/builtins.py:2193
1417
msgid ""
1418
"Specify a format for this repository. See \"bzr help formats\" for details."
1419
msgstr ""
1420
"Указать формат для этого репозитория. Описание форматов см. в «bzr help "
1421
"formats»."
1422
1423
#: bzrlib/builtins.py:2197
1424
msgid "Repository format"
1425
msgstr "Формат репозитория"
1426
1427
#: bzrlib/builtins.py:2199
1428
msgid "Branches in the repository will default to not having a working tree."
1429
msgstr "Ветви в репозитории по умолчанию не будут иметь рабочего дерева."
1430
1431
#: bzrlib/builtins.py:2225
1432
msgid "Show differences in the working tree, between revisions or branches."
1433
msgstr "Показать изменения в рабочем дереве, между ревизиями или ветвями."
1434
1435
#: bzrlib/builtins.py:2227
1436
msgid ""
1437
"If no arguments are given, all changes for the current tree are listed.\n"
1438
"If files are given, only the changes in those files are listed.\n"
1439
"Remote and multiple branches can be compared by using the --old and\n"
1440
"--new options. If not provided, the default for both is derived from\n"
1441
"the first argument, if any, or the current tree if no arguments are\n"
1442
"given."
1443
msgstr ""
1444
"Если не дано аргументов, будут выведены все изменения текущего дерева.\n"
1445
"Если даны файлы, выводятся изменения только в этих файлах. Удалённые\n"
1446
"или множественные ветви можно сравнить, используя опции --old и --new.\n"
1447
"Если не указаны, значение по умолчанию для обоих извлекается из первого\n"
1448
"аргумента или из текущего дерева, если не дано аргументов."
1449
1450
#: bzrlib/builtins.py:2234
1451
msgid ""
1452
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1453
"produces patches suitable for \"patch -p1\"."
1454
msgstr ""
1455
"«bzr diff -p1» эквивалентно «bzr diff -prefix old/:new/», и\n"
1456
"создаёт патчи, подходящие для «patch -p1»."
1457
1458
#: bzrlib/builtins.py:2237
1459
msgid ""
1460
"Note that when using the -r argument with a range of revisions, the\n"
1461
"differences are computed between the two specified revisions. That\n"
1462
"is, the command does not show the changes introduced by the first \n"
1463
"revision in the range. This differs from the interpretation of \n"
1464
"revision ranges used by \"bzr log\" which includes the first revision\n"
1465
"in the range."
1466
msgstr ""
1467
"Заметьте, что при использовании аргумента -r с интервалом ревизий,\n"
1468
"различия вычисляются между указанными ревизиями. То есть, команда\n"
1469
"не показывает изменения, представленные в первой ревизии интервала.\n"
1470
"Это отличается от интерпретации интервалов ревизий командой «bzr log»,\n"
1471
"которая включает первую ревизию интервала."
1472
1473
#: bzrlib/builtins.py:2244
1474
msgid ""
1475
":Exit values:\n"
1476
" 1 - changed\n"
1477
" 2 - unrepresentable changes\n"
1478
" 3 - error\n"
1479
" 0 - no change"
1480
msgstr ""
1481
":Значения выхода:\n"
1482
" 1 - изменено\n"
1483
" 2 - непредставимые изменения\n"
1484
" 3 - ошибка\n"
1485
" 0 - нет изменений"
1486
1487
#: bzrlib/builtins.py:2250
1488
msgid ""
1489
":Examples:\n"
1490
" Shows the difference in the working tree versus the last commit::"
1491
msgstr ""
1492
":Примеры:\n"
1493
" Показывает отличия рабочего дерева от последнего закрепления::"
1494
1495
#: bzrlib/builtins.py:2253
1496
msgid " bzr diff"
1497
msgstr " bzr diff"
1498
1499
#: bzrlib/builtins.py:2255
1500
msgid " Difference between the working tree and revision 1::"
1501
msgstr " Различия между рабочим деревом и ревизией 1::"
1502
1503
#: bzrlib/builtins.py:2257
1504
msgid " bzr diff -r1"
1505
msgstr " bzr diff -r1"
1506
1507
#: bzrlib/builtins.py:2259
1508
msgid " Difference between revision 3 and revision 1::"
1509
msgstr " Различия между ревизией 3 и ревизией 1::"
1510
1511
#: bzrlib/builtins.py:2261
1512
msgid " bzr diff -r1..3"
1513
msgstr " bzr diff -r1..3"
1514
1515
#: bzrlib/builtins.py:2263
1516
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1517
msgstr " Различия между ревизией 3 и ревизией 1 для ветви xxx::"
1518
1519
#: bzrlib/builtins.py:2265
1520
msgid " bzr diff -r1..3 xxx"
1521
msgstr " bzr diff -r1..3 xxx"
1522
1523
#: bzrlib/builtins.py:2267
1524
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1525
msgstr " Изменения, представленные в ревизии 2 (эквивалентно -r1..2)::"
1526
1527
#: bzrlib/builtins.py:2269
1528
msgid " bzr diff -c2"
1529
msgstr " bzr diff -c2"
1530
1531
#: bzrlib/builtins.py:2271
1532
msgid ""
1533
" To see the changes introduced by revision X::\n"
1534
" \n"
1535
" bzr diff -cX"
1536
msgstr ""
1537
" Чтобы увидеть изменения, представленные в ревизии X::\n"
1538
" \n"
1539
" bzr diff -cX"
1540
1541
#: bzrlib/builtins.py:2275
1542
msgid ""
1543
" Note that in the case of a merge, the -c option shows the changes\n"
1544
" compared to the left hand parent. To see the changes against\n"
1545
" another parent, use::"
1546
msgstr ""
1547
" Заметьте, что в случае слияния, опция -c выведет только изменения\n"
1548
" относительно левого родителя. Чтобы увидеть изменения относительно\n"
1549
" правого родителя, используйте::"
1550
1551
#: bzrlib/builtins.py:2279
1552
msgid " bzr diff -r<chosen_parent>..X"
1553
msgstr " bzr diff -r<выбранный_родитель>..X"
1554
1555
#: bzrlib/builtins.py:2281
1556
msgid ""
1557
" The changes between the current revision and the previous revision\n"
1558
" (equivalent to -c-1 and -r-2..-1)"
1559
msgstr ""
1560
" Изменения между текущей ревизией и предыдущей\n"
1561
" (эквивалент -c-1 и -r-2..-1)"
1562
1563
#: bzrlib/builtins.py:2284
1564
msgid " bzr diff -r-2.."
1565
msgstr " bzr diff -r-2.."
1566
1567
#: bzrlib/builtins.py:2286
1568
msgid " Show just the differences for file NEWS::"
1569
msgstr " Показать изменения только для файла NEWS::"
1570
1571
#: bzrlib/builtins.py:2288
1572
msgid " bzr diff NEWS"
1573
msgstr " bzr diff NEWS"
1574
1575
#: bzrlib/builtins.py:2290
1576
msgid " Show the differences in working tree xxx for file NEWS::"
1577
msgstr " Показать изменения в рабочем дереве xxx для файла NEWS::"
1578
1579
#: bzrlib/builtins.py:2292
1580
msgid " bzr diff xxx/NEWS"
1581
msgstr " bzr diff xxx/NEWS"
1582
1583
#: bzrlib/builtins.py:2294
1584
msgid " Show the differences from branch xxx to this working tree:"
1585
msgstr " Показать изменения рабочего дерева относительно ветви xxx:"
1586
1587
#: bzrlib/builtins.py:2296
1588
msgid " bzr diff --old xxx"
1589
msgstr " bzr diff --old xxx"
1590
1591
#: bzrlib/builtins.py:2298
1592
msgid " Show the differences between two branches for file NEWS::"
1593
msgstr " Показать различия в файле NEWS между двумя ветвями::"
1594
1595
#: bzrlib/builtins.py:2300
1596
msgid " bzr diff --old xxx --new yyy NEWS"
1597
msgstr " bzr diff --old xxx --new yyy NEWS"
1598
1599
#: bzrlib/builtins.py:2302
1600
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1601
msgstr " Тоже, что и 'bzr diff', но начать пути с old/ и new/::"
1602
1603
#: bzrlib/builtins.py:2304
1604
msgid ""
1605
" bzr diff --prefix old/:new/\n"
1606
" \n"
1607
" Show the differences using a custom diff program with options::\n"
1608
" \n"
1609
" bzr diff --using /usr/bin/diff --diff-options -wu"
1610
msgstr ""
1611
" bzr diff --prefix old/:new/\n"
1612
" \n"
1613
" Показать изменения, используя пользовательскую программу diff с "
1614
"опциями::\n"
1615
" \n"
1616
" bzr diff --using /usr/bin/diff --diff-options -wu"
1617
1618
#: bzrlib/builtins.py:2314
1619
msgid "Pass these options to the external diff program."
1620
msgstr "Передать эти опции внешней программе diff."
1621
1622
#: bzrlib/builtins.py:2317
1623
msgid ""
1624
"Set prefixes added to old and new filenames, as two values separated by a "
1625
"colon. (eg \"old/:new/\")."
1626
msgstr ""
1627
"Установить префиксы, добавляемые к старым и новым именам файлов, как "
1628
"значения, разделённые двоеточием (напр. «old/:new/»)."
1629
1630
#: bzrlib/builtins.py:2320
1631
msgid "Branch/tree to compare from."
1632
msgstr "Ветвь или дерево, которое сравнивать."
1633
1634
#: bzrlib/builtins.py:2324
1635
msgid "Branch/tree to compare to."
1636
msgstr "Ветвь или дерево, с которым сравнивать."
1637
1638
#: bzrlib/builtins.py:2330
1639
msgid "Use this command to compare files."
1640
msgstr "Использовать эту команду для сравнения."
1641
1642
#: bzrlib/builtins.py:2335
1643
msgid "Diff format to use."
1644
msgstr "Используемый формат diff."
1645
1646
#: bzrlib/builtins.py:2337
1647
msgid "Diff format"
1648
msgstr "Формат diff"
1649
1650
#: bzrlib/builtins.py:2359
1651
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1652
msgstr ""
1653
"--prefix ожидает два значения, разделённые двоеточием (напр. «old/:new/»)"
1654
1655
#: bzrlib/builtins.py:2363
1656
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1657
msgstr "bzr diff --revision принимает ровно ожин или два аргумента"
1658
1659
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1660
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1661
msgid "{0} and {1} are mutually exclusive"
1662
msgstr "{0} и {1} взаимоисключающи"
1663
1664
#: bzrlib/builtins.py:2388
1665
msgid ""
1666
"List files deleted in the working tree.\n"
1667
" "
1668
msgstr ""
1669
"Вывести список файлов, удалённых в рабочем дереве.\n"
1670
" "
1671
1672
#: bzrlib/builtins.py:2465
1673
msgid "Show the tree root directory."
1674
msgstr "Показать корневую директорию дерева."
1675
1676
#: bzrlib/builtins.py:2467
1677
msgid ""
1678
"The root is the nearest enclosing directory with a .bzr control\n"
1679
"directory."
1680
msgstr ""
1681
"Корень это ближайшая родительская директория с управляющей\n"
1682
"директорией .bzr."
1683
1684
#: bzrlib/builtins.py:2482
1685
msgid "The limit argument must be an integer."
1686
msgstr "Аргумент предела должен быть целым числом."
1687
1688
#: bzrlib/builtins.py:2490
1689
msgid "The levels argument must be an integer."
1690
msgstr "Аргументы пределов должны быть целыми числами."
1691
1692
#: bzrlib/builtins.py:2495
1693
msgid "Show historical log for a branch or subset of a branch."
1694
msgstr "Показать журнал истории ветви или подмножества ветви."
1695
1696
#: bzrlib/builtins.py:2497
1697
msgid ""
1698
"log is bzr's default tool for exploring the history of a branch.\n"
1699
"The branch to use is taken from the first parameter. If no parameters\n"
1700
"are given, the branch containing the working directory is logged.\n"
1701
"Here are some simple examples::"
1702
msgstr ""
1703
"log — это утилита bzr по умолчанию для просмотра истории ветви.\n"
1704
"Используемая ветвь определяется первым параметром. Если не задано\n"
1705
"параметров, выводится журнал ветви, содержащей рабочюю директорию.\n"
1706
"Вот несколько простых примеров::"
1707
1708
#: bzrlib/builtins.py:2502
1709
msgid ""
1710
" bzr log log the current branch\n"
1711
" bzr log foo.py log a file in its branch\n"
1712
" bzr log http://server/branch log a branch on a server"
1713
msgstr ""
1714
" bzr log журнал текущей ветви\n"
1715
" bzr log foo.py журнал файла в его ветви\n"
1716
" bzr log http://server/branch журнал ветви на сервере"
1717
1718
#: bzrlib/builtins.py:2506
1719
msgid ""
1720
"The filtering, ordering and information shown for each revision can\n"
1721
"be controlled as explained below. By default, all revisions are\n"
1722
"shown sorted (topologically) so that newer revisions appear before\n"
1723
"older ones and descendants always appear before ancestors. If displayed,\n"
1724
"merged revisions are shown indented under the revision in which they\n"
1725
"were merged."
1726
msgstr ""
1727
"Фильтрация, сортировка и отображение информации для каждой ревизии\n"
1728
"могут управляться, как объяснено ниже. По умолчанию, выводятся все\n"
1729
"ревизии отсортированные так, что более новые ревизии находятся выше\n"
1730
"более старых и потомки находятся выше предков. Если ревизия слияния\n"
1731
"отображаются, то они отображаются с отступом, относительно ревизии,\n"
1732
"в которой происходило слияние."
1733
1734
#: bzrlib/builtins.py:2513
1735
msgid ":Output control:"
1736
msgstr ":Управление выводом:"
1737
1738
#: bzrlib/builtins.py:2515
1739
msgid ""
1740
" The log format controls how information about each revision is\n"
1741
" displayed. The standard log formats are called ``long``, ``short``\n"
1742
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1743
" for more details on log formats."
1744
msgstr ""
1745
" Формат журнала определяет, как отображается информация о каждой\n"
1746
" ревизии. Стандартные форматы журнала называются «long», «short»\n"
1747
" и «line». По умолчание используется long. Подробности о форматах\n"
1748
" смотрите в «bzr help log-formats»."
1749
1750
#: bzrlib/builtins.py:2520
1751
msgid ""
1752
" The following options can be used to control what information is\n"
1753
" displayed::"
1754
msgstr ""
1755
" Следующие опции могут использоваться для управления отображением\n"
1756
" информации::"
1757
1758
#: bzrlib/builtins.py:2523
1759
msgid ""
1760
" -l N display a maximum of N revisions\n"
1761
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1762
" -v display a status summary (delta) for each revision\n"
1763
" -p display a diff (patch) for each revision\n"
1764
" --show-ids display revision-ids (and file-ids), not just revnos"
1765
msgstr ""
1766
" -l N выводить не больше N ревизий\n"
1767
" -n N выводить N уровней ревизий (0 для всех, 1 для сжатого)\n"
1768
" -v выводить статусные сообщения (delta) для каждой ревизии\n"
1769
" -p выводить различия diff для каждой ревизии\n"
1770
" --show-ids выводить id ревизий (и id файлов), не только номера ревизий"
1771
1772
#: bzrlib/builtins.py:2529
1773
msgid ""
1774
" Note that the default number of levels to display is a function of the\n"
1775
" log format. If the -n option is not used, the standard log formats show\n"
1776
" just the top level (mainline)."
1777
msgstr ""
1778
" Число уровней отображения по умолчанию зависит от формата журнала.\n"
1779
" Если используется не опция -n, стандартные форматы журнала показывают\n"
1780
" верхний уровень (основную линию)."
1781
1782
#: bzrlib/builtins.py:2533
1783
msgid ""
1784
" Status summaries are shown using status flags like A, M, etc. To see\n"
1785
" the changes explained using words like ``added`` and ``modified``\n"
1786
" instead, use the -vv option."
1787
msgstr ""
1788
" Описания статусов отображаются с помощью флагов A, M, и т.д. Чтобы\n"
1789
" увидеть изменения, описанные словами вроде «добавлены» и «изменены»,\n"
1790
" используйте опцию -vv."
1791
1792
#: bzrlib/builtins.py:2537
1793
msgid ":Ordering control:"
1794
msgstr ":Управление порядком:"
1795
1796
#: bzrlib/builtins.py:2539
1797
msgid ""
1798
" To display revisions from oldest to newest, use the --forward option.\n"
1799
" In most cases, using this option will have little impact on the total\n"
1800
" time taken to produce a log, though --forward does not incrementally\n"
1801
" display revisions like --reverse does when it can."
1802
msgstr ""
1803
" Чтобы вывести ревизии от старой до новой, используйте опцию --forward.\n"
1804
" В большинстве случаев, при использовании этой опции на создание журнала\n"
1805
" расходуется мало времени, хотя --forward не выводит ревизии по порядку,\n"
1806
" как это делает --reverse."
1807
1808
#: bzrlib/builtins.py:2544
1809
msgid ":Revision filtering:"
1810
msgstr ":Фильтрация ревизий:"
1811
1812
#: bzrlib/builtins.py:2546
1813
msgid ""
1814
" The -r option can be used to specify what revision or range of revisions\n"
1815
" to filter against. The various forms are shown below::"
1816
msgstr ""
1817
" Опцию -r можно использовать для указания ревизии или интервала ревизий\n"
1818
" для фильтрации. Различные формы показаны ниже::"
1819
1820
#: bzrlib/builtins.py:2549
1821
msgid ""
1822
" -rX display revision X\n"
1823
" -rX.. display revision X and later\n"
1824
" -r..Y display up to and including revision Y\n"
1825
" -rX..Y display from X to Y inclusive"
1826
msgstr ""
1827
" -rX вывести ревизию X\n"
1828
" -rX.. вывести ревизию X и более поздние\n"
1829
" -r..Y вывести до и включая ревизию Y\n"
1830
" -rX..Y вывести от X до Y включительно"
1831
1832
#: bzrlib/builtins.py:2554
1833
msgid ""
1834
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1835
" Some common examples are given below::"
1836
msgstr ""
1837
" Чтобы узнать, как указывать X и Y, смотрите «bzr help revisionspec».\n"
1838
" Ниже приведеные некоторые распространённые примеры::"
1839
1840
#: bzrlib/builtins.py:2557
1841
msgid ""
1842
" -r-1 show just the tip\n"
1843
" -r-10.. show the last 10 mainline revisions\n"
1844
" -rsubmit:.. show what's new on this branch\n"
1845
" -rancestor:path.. show changes since the common ancestor of this\n"
1846
" branch and the one at location path\n"
1847
" -rdate:yesterday.. show changes since yesterday"
1848
msgstr ""
1849
" -r-1 показать только верхушку\n"
1850
" -r-10.. показать последние 10 ревизий основной линии\n"
1851
" -rsubmit:.. показать, что нового в этой ветви\n"
1852
" -rancestor:путь.. показать изменения, начиная с общего предка\n"
1853
" этой ветви и указанной в пути\n"
1854
" -rdate:yesterday.. показать изменения со вчерашнего дня"
1855
1856
#: bzrlib/builtins.py:2564
1857
msgid ""
1858
" When logging a range of revisions using -rX..Y, log starts at\n"
1859
" revision Y and searches back in history through the primary\n"
1860
" (\"left-hand\") parents until it finds X. When logging just the\n"
1861
" top level (using -n1), an error is reported if X is not found\n"
1862
" along the way. If multi-level logging is used (-n0), X may be\n"
1863
" a nested merge revision and the log will be truncated accordingly."
1864
msgstr ""
1865
1866
#: bzrlib/builtins.py:2571
1867
msgid ":Path filtering:"
1868
msgstr ":Фильтрация пути:"
1869
1870
#: bzrlib/builtins.py:2573
1871
msgid ""
1872
" If parameters are given and the first one is not a branch, the log\n"
1873
" will be filtered to show only those revisions that changed the\n"
1874
" nominated files or directories."
1875
msgstr ""
1876
" Если заданы параметры и первый не является ветвью, будут отображаться\n"
1877
" только те ревизии, которые изменяли указанные файлы или директории."
1878
1879
#: bzrlib/builtins.py:2577
1880
msgid ""
1881
" Filenames are interpreted within their historical context. To log a\n"
1882
" deleted file, specify a revision range so that the file existed at\n"
1883
" the end or start of the range."
1884
msgstr ""
1885
" Имена файлов интерпретируются в историческом контексте. Чтобы вывести\n"
1886
" журнал для удалённого файла, укажите такой интервал ревизий, что файл\n"
1887
" существует от начала до конца интервала."
1888
1889
#: bzrlib/builtins.py:2581
1890
msgid ""
1891
" Historical context is also important when interpreting pathnames of\n"
1892
" renamed files/directories. Consider the following example:"
1893
msgstr ""
1894
" Исторический контекст также важен при интерпретации путей\n"
1895
" переименованных файлов и директорий. Рассмотрим следующий пример:"
1896
1897
#: bzrlib/builtins.py:2584
1898
msgid ""
1899
" * revision 1: add tutorial.txt\n"
1900
" * revision 2: modify tutorial.txt\n"
1901
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1902
msgstr ""
1903
" * ревизия 1: добавлен tutorial.txt\n"
1904
" * ревизия 2: изменён tutorial.txt\n"
1905
" * ревизия 3: переименован tutorial.txt в guide.txt; добавлен tutorial.txt"
1906
1907
#: bzrlib/builtins.py:2588
1908
msgid " In this case:"
1909
msgstr " В этом случае:"
1910
1911
#: bzrlib/builtins.py:2590
1912
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1913
msgstr ""
1914
" * «bzr log guide.txt» выведет журнал файла, добавленного в ревизии 1"
1915
1916
#: bzrlib/builtins.py:2592
1917
msgid ""
1918
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1919
msgstr ""
1920
" * «bzr log tutorial.txt» выведет журнал нового файла, добавленного\r\n"
1921
" в ревизии 3"
1922
1923
#: bzrlib/builtins.py:2594
1924
msgid ""
1925
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1926
" the original file in revision 2."
1927
msgstr ""
1928
" * «bzr log -r2 -p tutorial.txt» выведет изменения оригинального\n"
1929
" файла в ревизии 2."
1930
1931
#: bzrlib/builtins.py:2597
1932
msgid ""
1933
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1934
" was no file called guide.txt in revision 2."
1935
msgstr ""
1936
" * «bzr log -r2 -p guide.txt» выведет сообщение об ошибке, так как\n"
1937
" в ревизии 2 нет файла guide.txt."
1938
1939
#: bzrlib/builtins.py:2600
1940
msgid ""
1941
" Renames are always followed by log. By design, there is no need to\n"
1942
" explicitly ask for this (and no way to stop logging a file back\n"
1943
" until it was last renamed)."
1944
msgstr ""
1945
1946
#: bzrlib/builtins.py:2604
1947
msgid ":Other filtering:"
1948
msgstr ":Другая фильтрация:"
1949
1950
#: bzrlib/builtins.py:2606
1951
msgid ""
1952
" The --match option can be used for finding revisions that match a\n"
1953
" regular expression in a commit message, committer, author or bug.\n"
1954
" Specifying the option several times will match any of the supplied\n"
1955
" expressions. --match-author, --match-bugs, --match-committer and\n"
1956
" --match-message can be used to only match a specific field."
1957
msgstr ""
1958
" Опцию --match можно использовать для нахождения ревизий, удовлетворяющих\n"
1959
" регулярному выражению в сообщении, закрепляющем, авторе или ошибке.\n"
1960
" Опцию можно указать несколько раз и в этом случае будут выведены только\n"
1961
" ревизии, удовлетворяющие всем критериям. Для поиска по определённым\n"
1962
" полям можно использовать опции --match-author, --match-bugs,\n"
1963
" --match-committer и --match-message."
1964
1965
#: bzrlib/builtins.py:2612
1966
msgid ":Tips & tricks:"
1967
msgstr ":Советы и трюки:"
1968
1969
#: bzrlib/builtins.py:2614
1970
msgid ""
1971
" GUI tools and IDEs are often better at exploring history than command\n"
1972
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1973
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1974
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1975
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1976
msgstr ""
1977
" Чаще лучше просматривать историю с помощью графических утилит и IDE,\n"
1978
" например qlog, viz из qbzr или bzr-gtk, оболочку bzr-explorer, или\n"
1979
" веб-интерфейс Loggerhead. Смотрите руководство по модулям\n"
1980
" <http://doc.bazaar.canonical.com/plugins/en/> и\n"
1981
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1982
1983
#: bzrlib/builtins.py:2620
1984
msgid ""
1985
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1986
msgstr ""
1987
" Возможно, вы захотите добавить следующие псевдонимы в «bazaar.conf»::"
1988
1989
#: bzrlib/builtins.py:2622
1990
msgid ""
1991
" [ALIASES]\n"
1992
" tip = log -r-1\n"
1993
" top = log -l10 --line\n"
1994
" show = log -v -p"
1995
msgstr ""
1996
" [ALIASES]\n"
1997
" tip = log -r-1\n"
1998
" top = log -l10 --line\n"
1999
" show = log -v -p"
2000
2001
#: bzrlib/builtins.py:2627
2002
msgid ""
2003
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
2004
" will show the last 10 mainline revisions. To see the details of a\n"
2005
" particular revision X, ``bzr show -rX``."
2006
msgstr ""
2007
" Тогда «bzr tip» выведет последнюю ревизию, а «bzr top» — последние\n"
2008
" 10 ревизий основной линии. Чтобы просмотреть журнал определённой\n"
2009
" ревизии X, используйте «bzr show -rX»."
2010
2011
#: bzrlib/builtins.py:2631
2012
msgid ""
2013
" If you are interested in looking deeper into a particular merge X,\n"
2014
" use ``bzr log -n0 -rX``."
2015
msgstr ""
2016
" Если вы хотите подробно рассмотреть определённое слияние X,\n"
2017
" используйте «bzr log -n0 -rX»."
2018
2019
#: bzrlib/builtins.py:2634
2020
msgid ""
2021
" ``bzr log -v`` on a branch with lots of history is currently\n"
2022
" very slow. A fix for this issue is currently under development.\n"
2023
" With or without that fix, it is recommended that a revision range\n"
2024
" be given when using the -v option."
2025
msgstr ""
2026
" «bzr log -v» на ветви с большой историей на данный момент работает\n"
2027
" очень медленно. Сейчас ведётся работа над исправлением этого\n"
2028
" недостатка. Независимо от того, будет это исправлено или нет,\n"
2029
" рекомендуется задавать интервал ревизий с помощью опции -v."
2030
2031
#: bzrlib/builtins.py:2639
2032
msgid ""
2033
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
2034
" used to find revisions matching user names, commit messages, etc.\n"
2035
" Among other features, this plugin can find all revisions containing\n"
2036
" a list of words but not others."
2037
msgstr ""
2038
2039
#: bzrlib/builtins.py:2644
2040
msgid ""
2041
" When exploring non-mainline history on large projects with deep\n"
2042
" history, the performance of log can be greatly improved by installing\n"
2043
" the historycache plugin. This plugin buffers historical information\n"
2044
" trading disk space for faster speed."
2045
msgstr ""
2046
2047
#: bzrlib/builtins.py:2653
2048
msgid "Show from oldest to newest."
2049
msgstr "Выводить от старых к новым."
2050
2051
#: bzrlib/builtins.py:2656
2052
msgid "Show files changed in each revision."
2053
msgstr "Показывать файлы, изменённые в каждой ревизии."
2054
2055
#: bzrlib/builtins.py:2662
2056
msgid "Show just the specified revision. See also \"help revisionspec\"."
2057
msgstr "Показать только указанную ревизию. См. также «help revisionspec»."
2058
2059
#: bzrlib/builtins.py:2666
2060
msgid "What names to list as authors - first, all or committer."
2061
msgstr "Какие имена выводить, как авторов — first, all или committer."
2062
2063
#: bzrlib/builtins.py:2667
2064
msgid "Authors"
2065
msgstr "Авторы"
2066
2067
#: bzrlib/builtins.py:2672
2068
msgid "Number of levels to display - 0 for all, 1 for flat."
2069
msgstr "Число уровней для вывода — 0 для всех, 1 для плоского вывода."
2070
2071
#: bzrlib/builtins.py:2682
2072
msgid "Limit the output to the first N revisions."
2073
msgstr "Ограничить вывод лишь первыми N ревизиями."
2074
2075
#: bzrlib/builtins.py:2687
2076
msgid "Show changes made in each revision as a patch."
2077
msgstr "Показать изменения, сделанные в каждой ревизии, в виде патча."
2078
2079
#: bzrlib/builtins.py:2689
2080
msgid "Show merged revisions like --levels 0 does."
2081
msgstr "Показывать слияния, как это делает --levels 0."
2082
2083
#: bzrlib/builtins.py:2693
2084
msgid "Do not report commits with more than one parent."
2085
msgstr "Не сообщать о закреплениях с более, чем одним родителем."
2086
2087
#: bzrlib/builtins.py:2695
2088
msgid ""
2089
"Display only the revisions that are not part of both ancestries (require -"
2090
"rX..Y)."
2091
msgstr ""
2092
"Показать только ревизии, которые не являются частью обоих предков (требует -"
2093
"rX..Y)."
2094
2095
#: bzrlib/builtins.py:2699
2096
msgid "Show digital signature validity."
2097
msgstr ""
2098
2099
#: bzrlib/builtins.py:2702
2100
msgid "Show revisions whose properties match this expression."
2101
msgstr "Показывать ревизии, свойства которых удовлетворяют этому выражению."
2102
2103
#: bzrlib/builtins.py:2706
2104
msgid "Show revisions whose message matches this expression."
2105
msgstr ""
2106
"Показывать ревизии, комментарий которых удовлетворяет этому выражению."
2107
2108
#: bzrlib/builtins.py:2710
2109
msgid "Show revisions whose committer matches this expression."
2110
msgstr ""
2111
"Показывать ревизии, закрепитель которых удовлетворяет этому выражению."
2112
2113
#: bzrlib/builtins.py:2714
2114
msgid "Show revisions whose authors match this expression."
2115
msgstr "Показывать ревизии, авторы которых удовлетворяют этому выражению."
2116
2117
#: bzrlib/builtins.py:2718
2118
msgid "Show revisions whose bugs match this expression."
2119
msgstr "Показывать ревизии, ошибки которых удовлетворяют этому выражению."
2120
2121
#: bzrlib/builtins.py:2772
2122
msgid "--exclude-common-ancestry requires -r with two revisions"
2123
msgstr "--exclude-common-ancestry требует -r с двумя ревизиями"
2124
2125
#: bzrlib/builtins.py:2800
2126
#, python-format
2127
msgid "Path unknown at end or start of revision range: %s"
2128
msgstr "Неизвестный путь в начале или конце интервала ревизий: %s"
2129
2130
#: bzrlib/builtins.py:2917
2131
#, python-format
2132
msgid "bzr %s doesn't accept two revisions in different branches."
2133
msgstr "bzr %s не принимает две ревизии в различных ветвях."
2134
2135
#: bzrlib/builtins.py:2933
2136
#, python-format
2137
msgid "bzr %s --revision takes one or two values."
2138
msgstr "bzr %s --revision принимает одно или два значения."
2139
2140
#: bzrlib/builtins.py:2978
2141
msgid ""
2142
"List files in a tree.\n"
2143
" "
2144
msgstr ""
2145
"Вывести список файлов в дереве.\n"
2146
" "
2147
2148
#: bzrlib/builtins.py:2987
2149
msgid "Recurse into subdirectories."
2150
msgstr "Рекурсивно входить в поддиректории."
2151
2152
#: bzrlib/builtins.py:2989
2153
msgid "Print paths relative to the root of the branch."
2154
msgstr "Выводить пути относительно корня ветви."
2155
2156
#: bzrlib/builtins.py:2991
2157
msgid "Print unknown files."
2158
msgstr "Выводить неизвестные файлы."
2159
2160
#: bzrlib/builtins.py:2992
2161
msgid "Print versioned files."
2162
msgstr "Выводить файлы под контролем системы версий."
2163
2164
#: bzrlib/builtins.py:2995
2165
msgid "Print ignored files."
2166
msgstr "Выводить игнорируемые файлы."
2167
2168
#: bzrlib/builtins.py:2997
2169
msgid "List entries of a particular kind: file, directory, symlink."
2170
msgstr "Выводить файлы определённого типа: file, directory, symlink."
2171
2172
#: bzrlib/builtins.py:3010
2173
msgid "invalid kind specified"
2174
msgstr "указан неверный вид файла"
2175
2176
#: bzrlib/builtins.py:3013
2177
msgid "Cannot set both --verbose and --null"
2178
msgstr "Нельзя установить оба --verbose и --null"
2179
2180
#: bzrlib/builtins.py:3022
2181
msgid "cannot specify both --from-root and PATH"
2182
msgstr "нельзя указать оба --from-root и PATH"
2183
2184
#: bzrlib/builtins.py:3109
2185
msgid "Ignore specified files or patterns."
2186
msgstr "Игнорировать указанные файлы или шаблоны."
2187
2188
#: bzrlib/builtins.py:3111
2189
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2190
msgstr "Смотрите подробности о синтаксисе шаблонов в «bzr help patterns»."
2191
2192
#: bzrlib/builtins.py:3113
2193
msgid ""
2194
"If a .bzrignore file does not exist, the ignore command\n"
2195
"will create one and add the specified files or patterns to the newly\n"
2196
"created file. The ignore command will also automatically add the \n"
2197
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2198
"the use of the ignore command will require an explicit add command."
2199
msgstr ""
2200
"Если файл .bzrignore не существует, команда ignore создаст его\n"
2201
"и добавит указанные файлы или шаблоны к только что созданному\n"
2202
"файлу. Команда ignore также автоматически добавит файл .bzrignore\n"
2203
"к системе версий. Создание файла .bzrignore без использования\n"
2204
"команды ignore потребует явного добавления командой add."
2205
2206
#: bzrlib/builtins.py:3119
2207
msgid ""
2208
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2209
"After adding, editing or deleting that file either indirectly by\n"
2210
"using this command or directly by using an editor, be sure to commit\n"
2211
"it."
2212
msgstr ""
2213
"Чтобы удалить шаблоны из списка игнорируемых файлов, отредактируйте\n"
2214
"файл .bzrignore. После добавления, редактирования или удаления этого\n"
2215
"файла, как неявно с помощью этой команды, так и явно при помощи\n"
2216
"редактора, не забывайте закреплять его."
2217
2218
#: bzrlib/builtins.py:3124
2219
msgid ""
2220
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2221
"the global ignore file can be found in the application data directory as\n"
2222
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2223
"Global ignores are not touched by this command. The global ignore file\n"
2224
"can be edited directly using an editor."
2225
msgstr ""
2226
"Bazaar также поддерживает глобальный игнорирования по пути "
2227
"~/.bazaar/ignore.\n"
2228
"На Windows глобальный файл игнорирования может быть найден в директории\n"
2229
"данных приложений. Ищите пути вроде\n"
2230
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2231
"Эта команда не изменяет глобальный файл игнорирования. Он может быть\n"
2232
"отредактирован вручную с помощью текстового редактора."
2233
2234
#: bzrlib/builtins.py:3130
2235
msgid ""
2236
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2237
"precedence over regular ignores. Such exceptions are used to specify\n"
2238
"files that should be versioned which would otherwise be ignored."
2239
msgstr ""
2240
"Шаблоны, начинающиеся с '!', являются исключениями к шаблонам игнорирования\n"
2241
"и имеют приоритет над обычными шаблонами. Такие исключения используются для\n"
2242
"указания файлов, которые должны попасть под контроль системы версий, но\n"
2243
"по умолчанию игнорируются."
2244
2245
#: bzrlib/builtins.py:3134
2246
msgid ""
2247
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2248
"precedence over the '!' exception patterns."
2249
msgstr ""
2250
"Шаблоны, начинающиеся с '!!' ведут себя как обычные шаблоны, но имеют\n"
2251
"приоритет над шаблонами исключений '!'."
2252
2253
#: bzrlib/builtins.py:3137
2254
msgid ""
2255
":Notes: \n"
2256
" \n"
2257
"* Ignore patterns containing shell wildcards must be quoted from\n"
2258
" the shell on Unix."
2259
msgstr ""
2260
":Замечания: \n"
2261
" \n"
2262
"* Шаблоны игнорирования, содержащие специальные символы оболочки,\n"
2263
" должны быть заключены в кавычки при указании в командной строке."
2264
2265
#: bzrlib/builtins.py:3142
2266
msgid ""
2267
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2268
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2269
msgstr ""
2270
"* Шаблоны игнорирования, начинающиеся с \"#\", являются комментариями.\n"
2271
" Чтобы добавить шаблон, начинающийся с этого символа, используйте\n"
2272
" префикс \"RE:\"."
2273
2274
#: bzrlib/builtins.py:3145
2275
msgid ""
2276
":Examples:\n"
2277
" Ignore the top level Makefile::"
2278
msgstr ""
2279
":Примеры:\n"
2280
" Игнорировать файл Makefile на верхнем уровне::"
2281
2282
#: bzrlib/builtins.py:3148
2283
msgid " bzr ignore ./Makefile"
2284
msgstr " bzr ignore ./Makefile"
2285
2286
#: bzrlib/builtins.py:3150
2287
msgid " Ignore .class files in all directories...::"
2288
msgstr " Игнорировать файлы .class во всех директориях...::"
2289
2290
#: bzrlib/builtins.py:3152
2291
msgid " bzr ignore \"*.class\""
2292
msgstr " bzr ignore \"*.class\""
2293
2294
#: bzrlib/builtins.py:3154
2295
msgid " ...but do not ignore \"special.class\"::"
2296
msgstr " ...но не игнорировать \"special.class\"::"
2297
2298
#: bzrlib/builtins.py:3156
2299
msgid " bzr ignore \"!special.class\""
2300
msgstr " bzr ignore \"!special.class\""
2301
2302
#: bzrlib/builtins.py:3158
2303
msgid " Ignore files whose name begins with the \"#\" character::"
2304
msgstr " Игнорировать файлы, начинающиеся с символа \"#\"::"
2305
2306
#: bzrlib/builtins.py:3160
2307
msgid " bzr ignore \"RE:^#\""
2308
msgstr " bzr ignore \"RE:^#\""
2309
2310
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2311
msgid " Ignore .o files under the lib directory::"
2312
msgstr " Игнорировать файлы .o в директории lib::"
2313
2314
#: bzrlib/builtins.py:3164
2315
msgid " bzr ignore \"lib/**/*.o\""
2316
msgstr " bzr ignore \"lib/**/*.o\""
2317
2318
#: bzrlib/builtins.py:3168
2319
msgid " bzr ignore \"RE:lib/.*\\.o\""
2320
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2321
2322
#: bzrlib/builtins.py:3170
2323
msgid " Ignore everything but the \"debian\" toplevel directory::"
2324
msgstr " Игнорировать всё, кроме верхней директории \"debian\"::"
2325
2326
#: bzrlib/builtins.py:3172
2327
msgid ""
2328
" bzr ignore \"RE:(?!debian/).*\"\n"
2329
" \n"
2330
" Ignore everything except the \"local\" toplevel directory,\n"
2331
" but always ignore autosave files ending in ~, even under local/::\n"
2332
" \n"
2333
" bzr ignore \"*\"\n"
2334
" bzr ignore \"!./local\"\n"
2335
" bzr ignore \"!!*~\""
2336
msgstr ""
2337
" bzr ignore \"RE:(?!debian/).*\"\n"
2338
" \n"
2339
" Игнорировать всё, кроме верхней директории \"local\",\n"
2340
" но всегда игнорировать файлы, заканчивающиеся на ~, даже в local/::\n"
2341
" \n"
2342
" bzr ignore \"*\"\n"
2343
" bzr ignore \"!./local\"\n"
2344
" bzr ignore \"!!*~\""
2345
2346
#: bzrlib/builtins.py:3186
2347
msgid "Display the default ignore rules that bzr uses."
2348
msgstr "Вывести правила игнорирования, которые bzr использует по умолчанию."
2349
2350
#: bzrlib/builtins.py:3198
2351
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2352
msgstr ""
2353
"Для ignore требуется как минимум одно из NAME_PATTERN или --default-rules."
2354
2355
#: bzrlib/builtins.py:3209
2356
#, python-format
2357
msgid "Invalid ignore pattern found. %s"
2358
msgid_plural "Invalid ignore patterns found. %s"
2359
msgstr[0] "Найден некорректный шаблон игнорирования. %s"
2360
msgstr[1] "Найдены некорректные шаблоны игнорирования. %s"
2361
msgstr[2] "Найдены некорректные шаблоны игнорирования. %s"
2362
2363
#: bzrlib/builtins.py:3218
2364
msgid "NAME_PATTERN should not be an absolute path"
2365
msgstr "NAME_PATTERN не должен быть абсолютным путём"
2366
2367
#: bzrlib/builtins.py:3231
2368
#, python-format
2369
msgid ""
2370
"Warning: the following files are version controlled and match your ignore "
2371
"pattern:\n"
2372
"%s\n"
2373
"These files will continue to be version controlled unless you 'bzr remove' "
2374
"them.\n"
2375
msgstr ""
2376
"Предупреждение: следующие файлы под контролем системы версий и удовлетворяют "
2377
"шаблонам игнорирования:\n"
2378
"%s\n"
2379
"Эти файлы будут продолжать под контролем системы версий, пока вы не "
2380
"выполните 'bzr remove'.\n"
2381
2382
#: bzrlib/builtins.py:3238
2383
msgid "List ignored files and the patterns that matched them."
2384
msgstr "Вывести игнорируемые файлы и шаблоны, которым они удовлетворяют."
2385
2386
#: bzrlib/builtins.py:3240
2387
msgid ""
2388
"List all the ignored files and the ignore pattern that caused the file to\n"
2389
"be ignored."
2390
msgstr ""
2391
"Вывести все игнорируемые файлы и шаблоны игнорирования, из-за которых эти\n"
2392
"файлы игнорируются."
2393
2394
#: bzrlib/builtins.py:3243
2395
msgid "Alternatively, to list just the files::"
2396
msgstr "Альтернативно, чтобы вывести только файлы::"
2397
2398
#: bzrlib/builtins.py:3245
2399
msgid " bzr ls --ignored"
2400
msgstr " bzr ls --ignored"
2401
2402
#: bzrlib/builtins.py:3279
2403
#, python-format
2404
msgid "not a valid revision-number: %r"
2405
msgstr "некорректный номер ревизии: %r"
2406
2407
#: bzrlib/builtins.py:3286
2408
msgid ""
2409
"Export current or past revision to a destination directory or archive."
2410
msgstr ""
2411
"Экспортировать текущую или прошлую ревизию в директорию назначения\r\n"
2412
"или архив."
2413
2414
#: bzrlib/builtins.py:3288
2415
msgid "If no revision is specified this exports the last committed revision."
2416
msgstr "Если ревизия не указана, экспортирует последнюю ревизию."
2417
2418
#: bzrlib/builtins.py:3290
2419
msgid ""
2420
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2421
"given, try to find the format with the extension. If no extension\n"
2422
"is found exports to a directory (equivalent to --format=dir)."
2423
msgstr ""
2424
"Формат может быть именем экспортируемого формата, как tar, tgz, tbz2.\n"
2425
"Если не указан, формат определяется по расширению. Если расширение\n"
2426
"отсутствует, экспортирует в директорию (эквивалентно --format=dir)."
2427
2428
#: bzrlib/builtins.py:3294
2429
msgid ""
2430
"If root is supplied, it will be used as the root directory inside\n"
2431
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2432
"to the exported filename. The root option has no effect for 'dir' format."
2433
msgstr ""
2434
"Если указан root, он будет использоваться как корневая директория\n"
2435
"внутри форматов-контейнеров (tar, zip, и т.д.). Если не указан, по\n"
2436
"умолчанию используется имя файла для эскпорта. Опция root не имеет\n"
2437
"эффекта для формата 'dir'."
2438
2439
#: bzrlib/builtins.py:3298
2440
msgid ""
2441
"If branch is omitted then the branch containing the current working\n"
2442
"directory will be used."
2443
msgstr ""
2444
"Если ветвь опущена, используется ветвь, содержащая текущую рабочую\n"
2445
"директорию."
2446
2447
#: bzrlib/builtins.py:3301
2448
msgid ""
2449
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2450
msgstr ""
2451
"Замечание: Экспорт в zip деревьев с именами файлов, содержащими не-ASCII\r\n"
2452
"символы, не поддерживается."
2453
2454
#: bzrlib/builtins.py:3303
2455
msgid ""
2456
" ================= =========================\n"
2457
" Supported formats Autodetected by extension\n"
2458
" ================= =========================\n"
2459
" dir (none)\n"
2460
" tar .tar\n"
2461
" tbz2 .tar.bz2, .tbz2\n"
2462
" tgz .tar.gz, .tgz\n"
2463
" zip .zip\n"
2464
" ================= ========================="
2465
msgstr ""
2466
" ====================== =============================\n"
2467
" Поддерживаемые форматы Автоопределение по расширению\n"
2468
" ====================== =============================\n"
2469
" dir (нет)\n"
2470
" tar .tar\n"
2471
" tbz2 .tar.bz2, .tbz2\n"
2472
" tgz .tar.gz, .tgz\n"
2473
" zip .zip\n"
2474
" ====================== ============================="
2475
2476
#: bzrlib/builtins.py:3317
2477
msgid "Type of file to export to."
2478
msgstr "Тип файла для экспорта."
2479
2480
#: bzrlib/builtins.py:3320
2481
msgid "Apply content filters to export the convenient form."
2482
msgstr ""
2483
2484
#: bzrlib/builtins.py:3324
2485
msgid "Name of the root directory inside the exported file."
2486
msgstr "Имя корневой директории внутри экспортируемого файла."
2487
2488
#: bzrlib/builtins.py:3326
2489
msgid ""
2490
"Set modification time of files to that of the last revision in which it was "
2491
"changed."
2492
msgstr ""
2493
"Установить время изменения файлов на время последней ревизии, в которой они "
2494
"были изменены."
2495
2496
#: bzrlib/builtins.py:3329
2497
msgid ""
2498
"Export the working tree contents rather than that of the last revision."
2499
msgstr ""
2500
2501
#: bzrlib/builtins.py:3348
2502
msgid "--uncommitted requires a working tree"
2503
msgstr "--uncommitted требует рабочее дерево"
2504
2505
#: bzrlib/builtins.py:3357
2506
#, python-format
2507
msgid "Unsupported export format: %s"
2508
msgstr "Неподдерживаемый формат экспорта: %s"
2509
2510
#: bzrlib/builtins.py:3361
2511
msgid ""
2512
"Write the contents of a file as of a given revision to standard output."
2513
msgstr ""
2514
"Вывести содержимое файла из определённой ревизии на стандартный вывод."
2515
2516
#: bzrlib/builtins.py:3363
2517
msgid "If no revision is nominated, the last revision is used."
2518
msgstr "Если ревизия не указана, используется последняя."
2519
2520
#: bzrlib/builtins.py:3365
2521
msgid ""
2522
"Note: Take care to redirect standard output when using this command on a\n"
2523
"binary file."
2524
msgstr ""
2525
"Замечание: Не забывайте перенаправлять стандартный вывод при использовании\n"
2526
"этой команды на двоичном файле."
2527
2528
#: bzrlib/builtins.py:3371
2529
msgid "The path name in the old tree."
2530
msgstr "Имя пути в старом дереве."
2531
2532
#: bzrlib/builtins.py:3372
2533
msgid "Apply content filters to display the convenience form."
2534
msgstr "Применить фильтры содержимого для отображения в удобной форме."
2535
2536
#: bzrlib/builtins.py:3383
2537
msgid "bzr cat --revision takes exactly one revision specifier"
2538
msgstr "bzr cat --revision принимает ровно один спецификатор ревизии"
2539
2540
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2541
msgid "{0!r} is not present in revision {1}"
2542
msgstr "{0!r} не представлен в ревизии {1}"
2543
2544
#: bzrlib/builtins.py:3443
2545
msgid "Commit changes into a new revision."
2546
msgstr "Закрепить изменения в новой ревизии."
2547
2548
#: bzrlib/builtins.py:3445
2549
msgid ""
2550
"An explanatory message needs to be given for each commit. This is\n"
2551
"often done by using the --message option (getting the message from the\n"
2552
"command line) or by using the --file option (getting the message from\n"
2553
"a file). If neither of these options is given, an editor is opened for\n"
2554
"the user to enter the message. To see the changed files in the\n"
2555
"boilerplate text loaded into the editor, use the --show-diff option."
2556
msgstr ""
2557
2558
#: bzrlib/builtins.py:3452
2559
msgid ""
2560
"By default, the entire tree is committed and the person doing the\n"
2561
"commit is assumed to be the author. These defaults can be overridden\n"
2562
"as explained below."
2563
msgstr ""
2564
"По умолчанию, закрепляется всё дерево и закрепляющий считается автором.\n"
2565
"Эти умолчания могут быть перезаписаны, как объяснено ниже."
2566
2567
#: bzrlib/builtins.py:3456
2568
msgid ":Selective commits:"
2569
msgstr ":Выборочные закрепления:"
2570
2571
#: bzrlib/builtins.py:3458
2572
msgid ""
2573
" If selected files are specified, only changes to those files are\n"
2574
" committed. If a directory is specified then the directory and\n"
2575
" everything within it is committed."
2576
msgstr ""
2577
" Если указаны файлы, закрепить только изменения в этих файлах.\n"
2578
" Если указана директория, то закрепляется директория и всё её\n"
2579
" содержимое."
2580
2581
#: bzrlib/builtins.py:3462
2582
msgid ""
2583
" When excludes are given, they take precedence over selected files.\n"
2584
" For example, to commit only changes within foo, but not changes\n"
2585
" within foo/bar::"
2586
msgstr ""
2587
" Когда даны исключения, они имеют приоритет над выбранными файлами.\n"
2588
" Например, чтобы закрепить изменения внутри foo, но не изменения\n"
2589
" в foo/bar::"
2590
2591
#: bzrlib/builtins.py:3466
2592
msgid " bzr commit foo -x foo/bar"
2593
msgstr " bzr commit foo -x foo/bar"
2594
2595
#: bzrlib/builtins.py:3468
2596
msgid " A selective commit after a merge is not yet supported."
2597
msgstr " Выборочные закрепления после слияния пока не поддерживаются."
2598
2599
#: bzrlib/builtins.py:3470
2600
msgid ":Custom authors:"
2601
msgstr ":Выбор автора:"
2602
2603
#: bzrlib/builtins.py:3472
2604
msgid ""
2605
" If the author of the change is not the same person as the committer,\n"
2606
" you can specify the author's name using the --author option. The\n"
2607
" name should be in the same format as a committer-id, e.g.\n"
2608
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2609
" the change you can specify the option multiple times, once for each\n"
2610
" author."
2611
msgstr ""
2612
" Если автор изменения не тот же самый человек, что и закрепляющий,\n"
2613
" вы можете указать имя автора, используя опцию --author. Имя должно\n"
2614
" быть в том же формате, что и committer-id, например\n"
2615
" \"John Doe <jdoe@example.com>\". Если в изменении участвовал более,\n"
2616
" чем один автор, вы можете указать эту опцию несколько раз."
2617
2618
#: bzrlib/builtins.py:3479
2619
msgid ":Checks:"
2620
msgstr ":Проверки:"
2621
2622
#: bzrlib/builtins.py:3481
2623
msgid ""
2624
" A common mistake is to forget to add a new file or directory before\n"
2625
" running the commit command. The --strict option checks for unknown\n"
2626
" files and aborts the commit if any are found. More advanced pre-commit\n"
2627
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2628
" for details."
2629
msgstr ""
2630
" Распространённой ошибкой является забыть добавить новый файл перед\n"
2631
" запуском команды commit. Опция --strict прерывает закрепление, если\n"
2632
" присутствуют неизвестные файлы. Более продвинутые проверки могут\n"
2633
" быть реализованы определением обработчиков. Подробности можно найти,\n"
2634
" выполнив команду ``bzr help hooks''."
2635
2636
#: bzrlib/builtins.py:3487
2637
msgid ":Things to note:"
2638
msgstr ":На заметку:"
2639
2640
#: bzrlib/builtins.py:3489
2641
msgid ""
2642
" If you accidentially commit the wrong changes or make a spelling\n"
2643
" mistake in the commit message say, you can use the uncommit command\n"
2644
" to undo it. See ``bzr help uncommit`` for details."
2645
msgstr ""
2646
" Если вы случайно закрепили неверные изменения или допустили орфо-\n"
2647
" графическую ошибку в сообщении, вы можете использовать команду\n"
2648
" uncommit, чтобы отменить последнее закрепление. Подробности смотрите\n"
2649
" в «bzr help uncommit»."
2650
2651
#: bzrlib/builtins.py:3493
2652
msgid ""
2653
" Hooks can also be configured to run after a commit. This allows you\n"
2654
" to trigger updates to external systems like bug trackers. The --fixes\n"
2655
" option can be used to record the association between a revision and\n"
2656
" one or more bugs. See ``bzr help bugs`` for details."
2657
msgstr ""
2658
2659
#: bzrlib/builtins.py:3503
2660
msgid "Do not consider changes made to a given path."
2661
msgstr "Не рассматривать изменения, сделанные в заданном пути."
2662
2663
#: bzrlib/builtins.py:3506
2664
msgid "Description of the new revision."
2665
msgstr "Описание новой ревизии."
2666
2667
#: bzrlib/builtins.py:3509
2668
msgid "Commit even if nothing has changed."
2669
msgstr "Закрепить, даже если ничего не изменилось."
2670
2671
#: bzrlib/builtins.py:3513
2672
msgid "Take commit message from this file."
2673
msgstr "Взять сообщение о закреплении из этого файла."
2674
2675
#: bzrlib/builtins.py:3515
2676
msgid "Refuse to commit if there are unknown files in the working tree."
2677
msgstr ""
2678
"Отказываться закреплять, если в рабочем дереве есть неизвестные файлы."
2679
2680
#: bzrlib/builtins.py:3518
2681
msgid ""
2682
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2683
"08:00:00 +0100'."
2684
msgstr ""
2685
"Вручную установить время закрепления, используя формат даты закрепления, "
2686
"напр. '2009-10-10 08:00:00 +0100'."
2687
2688
#: bzrlib/builtins.py:3521
2689
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2690
msgstr ""
2691
"Отметить ошибку, как исправленную в этой ревизии (см. «bzr help bugs»)."
2692
2693
#: bzrlib/builtins.py:3524
2694
msgid "Set the author's name, if it's different from the committer."
2695
msgstr "Установить имя автора, если оно отличается от имени закрепляющего."
2696
2697
#: bzrlib/builtins.py:3527
2698
msgid ""
2699
"Perform a local commit in a bound branch. Local commits are not pushed to "
2700
"the master branch until a normal commit is performed."
2701
msgstr ""
2702
"Совершить локальное закрепление в связанную ветвь. Локальные закрепления не "
2703
"выгружаются в основную ветвь до тех пор, пока не совершено нормальное "
2704
"закрепление."
2705
2706
#: bzrlib/builtins.py:3533
2707
msgid ""
2708
"When no message is supplied, show the diff along with the status summary in "
2709
"the message editor."
2710
msgstr ""
2711
"Если не указано сообщение, показывать изменения формате diff вместе с "
2712
"обзором состояния в редакторе сообщения."
2713
2714
#: bzrlib/builtins.py:3536
2715
msgid ""
2716
"When committing to a foreign version control system do not push data that "
2717
"can not be natively represented."
2718
msgstr ""
2719
"При закреплении в иной системе контроля версий, не выгружать данные, которые "
2720
"нельзя в ней представить."
2721
2722
#: bzrlib/builtins.py:3554
2723
#, python-format
2724
msgid ""
2725
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2726
"default bug tracker using the `bugtracker` option.\n"
2727
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2728
msgstr ""
2729
"Для ошибки %s не указан трекер. Используйте форму 'tracker:id' или укажите "
2730
"систему трекинга ошибок по умолчанию, используя опцию `bugtracker`.\n"
2731
"Больше информации об этом можно узнать, выполнив «bzr help bugs». "
2732
"Закрепление отклонено."
2733
2734
#: bzrlib/builtins.py:3563
2735
#, python-format
2736
msgid ""
2737
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2738
"for more information on this feature.\n"
2739
"Commit refused."
2740
msgstr ""
2741
"Некорректная ошибка %s. Должна быть в формате 'tracker:id'. Больше "
2742
"информации об этом можно узнать, выполнив «bzr help bugs».\n"
2743
"Закрепление отклонено."
2744
2745
#: bzrlib/builtins.py:3572
2746
#, python-format
2747
msgid "Unrecognized bug %s. Commit refused."
2748
msgstr "Ошибка %s не распознана. Закрепление отклонено."
2749
2750
#: bzrlib/builtins.py:3575
2751
#, python-format
2752
msgid ""
2753
"%s\n"
2754
"Commit refused."
2755
msgstr ""
2756
"%s\n"
2757
"Закрепление отклонено."
2758
2759
#: bzrlib/builtins.py:3599
2760
msgid "Could not parse --commit-time: "
2761
msgstr "Не удалось разобрать --commit-time: "
2762
2763
#: bzrlib/builtins.py:3639
2764
msgid "please specify either --message or --file"
2765
msgstr "укажите либо --message, либо --file"
2766
2767
#: bzrlib/builtins.py:3668
2768
msgid "please specify a commit message with either --message or --file"
2769
msgstr "укажите сообщение о закреплении, используя --message либо --file"
2770
2771
#: bzrlib/builtins.py:3671
2772
msgid ""
2773
"Empty commit message specified. Please specify a commit message with either -"
2774
"-message or --file or leave a blank message with --message \"\"."
2775
msgstr ""
2776
"Указано пустое сообщение о закреплении. Пожалуйста, укажите сообщение опцией "
2777
"--message либо --file или оставьте пустым, указав --message \"\"."
2778
2779
#: bzrlib/builtins.py:3691
2780
msgid ""
2781
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2782
"-unchanged to force an empty commit."
2783
msgstr ""
2784
"Нет изменений для закрепления. Добавьте файлы, которые вы хотите закрепить, "
2785
"командой 'bzr add', или используйте --unchanged, чтобы принудительно сделать "
2786
"пустое закрепление."
2787
2788
#: bzrlib/builtins.py:3695
2789
msgid ""
2790
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2791
"resolve FILE\" to resolve."
2792
msgstr ""
2793
"В рабочем дереве обнаружены конфликты. Выполните «bzr conflicts», чтобы "
2794
"вывести список конфликтов и «bzr resolve ФАЙЛ» для исправления."
2795
2796
#: bzrlib/builtins.py:3699
2797
msgid "Commit refused because there are unknown files in the working tree."
2798
msgstr "Закрепление отклонено, поскольку в рабочем дереве неизвестные файлы."
2799
2800
#: bzrlib/builtins.py:3702
2801
msgid ""
2802
"\n"
2803
"To commit to master branch, run update and then commit.\n"
2804
"You can also pass --local to commit to continue working disconnected."
2805
msgstr ""
2806
2807
#: bzrlib/builtins.py:3710
2808
msgid ""
2809
"Validate working tree structure, branch consistency and repository history."
2810
msgstr ""
2811
2812
#: bzrlib/builtins.py:3712
2813
msgid ""
2814
"This command checks various invariants about branch and repository storage\n"
2815
"to detect data corruption or bzr bugs."
2816
msgstr ""
2817
2818
#: bzrlib/builtins.py:3715
2819
msgid ""
2820
"The working tree and branch checks will only give output if a problem is\n"
2821
"detected. The output fields of the repository check are:"
2822
msgstr ""
2823
"Проверки рабочего дерева и ветви выведут что-либо только в случае\n"
2824
"обнаружения проблемы. Поля вывода проверки репозитория следующие:"
2825
2826
#: bzrlib/builtins.py:3718
2827
msgid ""
2828
"revisions\n"
2829
" This is just the number of revisions checked. It doesn't\n"
2830
" indicate a problem."
2831
msgstr ""
2832
"ревизии\n"
2833
" Это просто число проверенных ревизий. Оно не указывает\n"
2834
" на проблему."
2835
2836
#: bzrlib/builtins.py:3722
2837
msgid ""
2838
"versionedfiles\n"
2839
" This is just the number of versionedfiles checked. It\n"
2840
" doesn't indicate a problem."
2841
msgstr ""
2842
"версифицированные файлы\n"
2843
" Это просто число проверенных файлов под контролем системы\n"
2844
" версий. Оно не указывает на проблему."
2845
2846
#: bzrlib/builtins.py:3726
2847
msgid ""
2848
"unreferenced ancestors\n"
2849
" Texts that are ancestors of other texts, but\n"
2850
" are not properly referenced by the revision ancestry. This is a\n"
2851
" subtle problem that Bazaar can work around."
2852
msgstr ""
2853
"предки без ссылок\n"
2854
" Тексты, являющиеся предками других текстов, но не имеющие\n"
2855
" корректных ссылок в истории ревизии. Это небольшая\n"
2856
" проблема, с которой Bazaar может разобраться."
2857
2858
#: bzrlib/builtins.py:3731
2859
msgid ""
2860
"unique file texts\n"
2861
" This is the total number of unique file contents\n"
2862
" seen in the checked revisions. It does not indicate a problem."
2863
msgstr ""
2864
"уникальные тексты файлов\n"
2865
" Это общее число уникального содержимого файлов, встреченного\n"
2866
" в проверенных ревизиях. Оно не указывает на проблему."
2867
2868
#: bzrlib/builtins.py:3735
2869
msgid ""
2870
"repeated file texts\n"
2871
" This is the total number of repeated texts seen\n"
2872
" in the checked revisions. Texts can be repeated when their file\n"
2873
" entries are modified, but the file contents are not. It does not\n"
2874
" indicate a problem."
2875
msgstr ""
2876
"повторяемые тексты файлов\n"
2877
" Это общее число повторяемых текстов, встреченных\n"
2878
" в проверенных ревизиях. Тексты могут повторяться, если записи\n"
2879
" файлов изменились, но их содержимое осталось прежним. Оно не\n"
2880
" указывает на проблему."
2881
2882
#: bzrlib/builtins.py:3741
2883
msgid ""
2884
"If no restrictions are specified, all Bazaar data that is found at the "
2885
"given\n"
2886
"location will be checked."
2887
msgstr ""
2888
2889
#: bzrlib/builtins.py:3746
2890
msgid " Check the tree and branch at 'foo'::"
2891
msgstr " Проверить рабочее дерево и ветвь в 'foo'::"
2892
2893
#: bzrlib/builtins.py:3748
2894
msgid " bzr check --tree --branch foo"
2895
msgstr " bzr check --tree --branch foo"
2896
2897
#: bzrlib/builtins.py:3750
2898
msgid " Check only the repository at 'bar'::"
2899
msgstr " Проверить только репозиторий в 'bar'::"
2900
2901
#: bzrlib/builtins.py:3752
2902
msgid " bzr check --repo bar"
2903
msgstr " bzr check --repo bar"
2904
2905
#: bzrlib/builtins.py:3754
2906
msgid " Check everything at 'baz'::"
2907
msgstr " Проверить всё в 'baz'::"
2908
2909
#: bzrlib/builtins.py:3756
2910
msgid " bzr check baz"
2911
msgstr " bzr check baz"
2912
2913
#: bzrlib/builtins.py:3762
2914
msgid "Check the branch related to the current directory."
2915
msgstr "Проверить ветвь, относящуюся к текущей директории."
2916
2917
#: bzrlib/builtins.py:3764
2918
msgid "Check the repository related to the current directory."
2919
msgstr "Проверить репозиторий, относящийся к текущей директории."
2920
2921
#: bzrlib/builtins.py:3766
2922
msgid "Check the working tree related to the current directory."
2923
msgstr "Проверить рабочее дерево, относящееся к текущей директории."
2924
2925
#: bzrlib/builtins.py:3780
2926
msgid "Upgrade a repository, branch or working tree to a newer format."
2927
msgstr "Обновить репозиторий, ветвь или рабочее дерево до нового формата."
2928
2929
#: bzrlib/builtins.py:3782
2930
msgid ""
2931
"When the default format has changed after a major new release of\n"
2932
"Bazaar, you may be informed during certain operations that you\n"
2933
"should upgrade. Upgrading to a newer format may improve performance\n"
2934
"or make new features available. It may however limit interoperability\n"
2935
"with older repositories or with older versions of Bazaar."
2936
msgstr ""
2937
2938
#: bzrlib/builtins.py:3788
2939
msgid ""
2940
"If you wish to upgrade to a particular format rather than the\n"
2941
"current default, that can be specified using the --format option.\n"
2942
"As a consequence, you can use the upgrade command this way to\n"
2943
"\"downgrade\" to an earlier format, though some conversions are\n"
2944
"a one way process (e.g. changing from the 1.x default to the\n"
2945
"2.x default) so downgrading is not always possible."
2946
msgstr ""
2947
2948
#: bzrlib/builtins.py:3795
2949
msgid ""
2950
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2951
"process (where # is a number). By default, this is left there on\n"
2952
"completion. If the conversion fails, delete the new .bzr directory\n"
2953
"and rename this one back in its place. Use the --clean option to ask\n"
2954
"for the backup.bzr directory to be removed on successful conversion.\n"
2955
"Alternatively, you can delete it by hand if everything looks good\n"
2956
"afterwards."
2957
msgstr ""
2958
2959
#: bzrlib/builtins.py:3803
2960
msgid ""
2961
"If the location given is a shared repository, dependent branches\n"
2962
"are also converted provided the repository converts successfully.\n"
2963
"If the conversion of a branch fails, remaining branches are still\n"
2964
"tried."
2965
msgstr ""
2966
2967
#: bzrlib/builtins.py:3808
2968
msgid ""
2969
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2970
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2971
msgstr ""
2972
2973
#: bzrlib/builtins.py:3816
2974
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2975
msgstr ""
2976
"Обновить до определённого формата. Подробности см. в «bzr help formats»."
2977
2978
#: bzrlib/builtins.py:3820
2979
msgid "Branch format"
2980
msgstr "Формат ветви"
2981
2982
#: bzrlib/builtins.py:3822
2983
msgid "Remove the backup.bzr directory if successful."
2984
msgstr "Удалить директорию backup.bzr при успешном завершении."
2985
2986
#: bzrlib/builtins.py:3824
2987
msgid "Show what would be done, but don't actually do anything."
2988
msgstr ""
2989
2990
#: bzrlib/builtins.py:3839
2991
msgid "Show or set bzr user id."
2992
msgstr ""
2993
2994
#: bzrlib/builtins.py:3841
2995
msgid ""
2996
":Examples:\n"
2997
" Show the email of the current user::"
2998
msgstr ""
2999
":Примеры:\n"
3000
" Показать email текущего пользователя::"
3001
3002
#: bzrlib/builtins.py:3844
3003
msgid " bzr whoami --email"
3004
msgstr " bzr whoami --email"
3005
3006
#: bzrlib/builtins.py:3846
3007
msgid " Set the current user::"
3008
msgstr " Установить текущего пользователя::"
3009
3010
#: bzrlib/builtins.py:3848
3011
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
3012
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
3013
3014
#: bzrlib/builtins.py:3852
3015
msgid "Display email address only."
3016
msgstr "Показать только адрес email."
3017
3018
#: bzrlib/builtins.py:3854
3019
msgid "Set identity for the current branch instead of globally."
3020
msgstr ""
3021
3022
#: bzrlib/builtins.py:3880
3023
msgid "--email can only be used to display existing identity"
3024
msgstr ""
3025
3026
#: bzrlib/builtins.py:3904
3027
msgid "Print or set the branch nickname."
3028
msgstr "Вывести или установить имя ветви."
3029
3030
#: bzrlib/builtins.py:3906
3031
msgid ""
3032
"If unset, the colocated branch name is used for colocated branches, and\n"
3033
"the branch directory name is used for other branches. To print the\n"
3034
"current nickname, execute with no argument."
3035
msgstr ""
3036
3037
#: bzrlib/builtins.py:3910
3038
msgid ""
3039
"Bound branches use the nickname of its master branch unless it is set\n"
3040
"locally."
3041
msgstr ""
3042
3043
#: bzrlib/builtins.py:3930
3044
msgid "Set/unset and display aliases."
3045
msgstr "Установить, удалить или отобразить псевдонимы."
3046
3047
#: bzrlib/builtins.py:3932
3048
msgid ""
3049
":Examples:\n"
3050
" Show the current aliases::"
3051
msgstr ""
3052
":Примеры:\n"
3053
" Показать текущие псевдонимы::"
3054
3055
#: bzrlib/builtins.py:3935
3056
msgid " bzr alias"
3057
msgstr " bzr alias"
3058
3059
#: bzrlib/builtins.py:3937
3060
msgid " Show the alias specified for 'll'::"
3061
msgstr " Показать псевдоним для 'll'::"
3062
3063
#: bzrlib/builtins.py:3939
3064
msgid " bzr alias ll"
3065
msgstr " bzr alias ll"
3066
3067
#: bzrlib/builtins.py:3941
3068
msgid " Set an alias for 'll'::"
3069
msgstr " Установить псевдоним для 'll'::"
3070
3071
#: bzrlib/builtins.py:3943
3072
msgid " bzr alias ll=\"log --line -r-10..-1\""
3073
msgstr " bzr alias ll=\"log --line -r-10..-1\""
3074
3075
#: bzrlib/builtins.py:3945
3076
msgid " To remove an alias for 'll'::"
3077
msgstr " Удалить псевдоним для 'll'::"
3078
3079
#: bzrlib/builtins.py:3947
3080
msgid " bzr alias --remove ll"
3081
msgstr " bzr alias --remove ll"
3082
3083
#: bzrlib/builtins.py:3952
3084
msgid "Remove the alias."
3085
msgstr "Удалить псевдоним."
3086
3087
#: bzrlib/builtins.py:3970
3088
msgid "bzr alias --remove expects an alias to remove."
3089
msgstr "bzr alias --remove требуется псевдоним для удаления."
3090
3091
#: bzrlib/builtins.py:4151
3092
msgid ""
3093
"subunit not available. subunit needs to be installed to use --subunit."
3094
msgstr ""
3095
"subunit не доступен. Нужно установить subunit, чтобы использовать --subunit."
3096
3097
#: bzrlib/builtins.py:4168
3098
msgid ""
3099
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3100
msgstr ""
3101
"--benchmark не поддерживается начиная с версии bzr 2.2; вместо этого "
3102
"используйте bzr-usertest"
3103
3104
#: bzrlib/builtins.py:4215
3105
msgid "Show version of bzr."
3106
msgstr "Вывести версию bzr."
3107
3108
#: bzrlib/builtins.py:4219
3109
msgid "Print just the version number."
3110
msgstr "Вывести только номер версии."
3111
3112
#: bzrlib/builtins.py:4238
3113
msgid "It sure does!\n"
3114
msgstr "Да, он крут!\n"
3115
3116
#: bzrlib/builtins.py:4262
3117
#, python-format
3118
msgid "merge base is revision %s\n"
3119
msgstr ""
3120
3121
#: bzrlib/builtins.py:4266
3122
msgid "Perform a three-way merge."
3123
msgstr ""
3124
3125
#: bzrlib/builtins.py:4268
3126
msgid ""
3127
"The source of the merge can be specified either in the form of a branch,\n"
3128
"or in the form of a path to a file containing a merge directive generated\n"
3129
"with bzr send. If neither is specified, the default is the upstream branch\n"
3130
"or the branch most recently merged using --remember. The source of the\n"
3131
"merge may also be specified in the form of a path to a file in another\n"
3132
"branch: in this case, only the modifications to that file are merged into\n"
3133
"the current working tree."
3134
msgstr ""
3135
3136
#: bzrlib/builtins.py:4276
3137
msgid ""
3138
"When merging from a branch, by default bzr will try to merge in all new\n"
3139
"work from the other branch, automatically determining an appropriate base\n"
3140
"revision. If this fails, you may need to give an explicit base."
3141
msgstr ""
3142
3143
#: bzrlib/builtins.py:4280
3144
msgid ""
3145
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3146
"try to merge in all new work up to and including revision OTHER."
3147
msgstr ""
3148
3149
#: bzrlib/builtins.py:4283
3150
msgid ""
3151
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3152
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3153
"causes some revisions to be skipped, i.e. if the destination branch does\n"
3154
"not already contain revision BASE, such a merge is commonly referred to as\n"
3155
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
3156
"cherrypicks. The changes look like a normal commit, and the history of the\n"
3157
"changes from the other branch is not stored in the commit."
3158
msgstr ""
3159
3160
#: bzrlib/builtins.py:4291
3161
msgid "Revision numbers are always relative to the source branch."
3162
msgstr ""
3163
3164
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3165
msgid ""
3166
"Merge will do its best to combine the changes in two branches, but there\n"
3167
"are some kinds of problems only a human can fix. When it encounters those,\n"
3168
"it will mark a conflict. A conflict means that you need to fix something,\n"
3169
"before you can commit."
3170
msgstr ""
3171
3172
#: bzrlib/builtins.py:4298
3173
msgid ""
3174
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3175
msgstr ""
3176
3177
#: bzrlib/builtins.py:4300
3178
msgid ""
3179
"If there is no default branch set, the first merge will set it (use\n"
3180
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3181
"to use the default. To change the default, use --remember. The value will\n"
3182
"only be saved if the remote location can be accessed."
3183
msgstr ""
3184
3185
#: bzrlib/builtins.py:4305
3186
msgid ""
3187
"The results of the merge are placed into the destination working\n"
3188
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3189
"committed to record the result of the merge."
3190
msgstr ""
3191
3192
#: bzrlib/builtins.py:4309
3193
msgid ""
3194
"merge refuses to run if there are any uncommitted changes, unless\n"
3195
"--force is given. If --force is given, then the changes from the source \n"
3196
"will be merged with the current working tree, including any uncommitted\n"
3197
"changes in the tree. The --force option can also be used to create a\n"
3198
"merge revision which has more than two parents."
3199
msgstr ""
3200
3201
#: bzrlib/builtins.py:4315
3202
msgid ""
3203
"If one would like to merge changes from the working tree of the other\n"
3204
"branch without merging any committed revisions, the --uncommitted option\n"
3205
"can be given."
3206
msgstr ""
3207
3208
#: bzrlib/builtins.py:4319
3209
msgid ""
3210
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3211
"you to apply each diff hunk and file change, similar to \"shelve\"."
3212
msgstr ""
3213
3214
#: bzrlib/builtins.py:4322
3215
msgid ""
3216
":Examples:\n"
3217
" To merge all new revisions from bzr.dev::"
3218
msgstr ""
3219
3220
#: bzrlib/builtins.py:4325
3221
msgid " bzr merge ../bzr.dev"
3222
msgstr ""
3223
3224
#: bzrlib/builtins.py:4327
3225
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3226
msgstr ""
3227
3228
#: bzrlib/builtins.py:4329
3229
msgid " bzr merge -r 82 ../bzr.dev"
3230
msgstr ""
3231
3232
#: bzrlib/builtins.py:4331
3233
msgid " To merge the changes introduced by 82, without previous changes::"
3234
msgstr ""
3235
3236
#: bzrlib/builtins.py:4333
3237
msgid " bzr merge -r 81..82 ../bzr.dev"
3238
msgstr ""
3239
3240
#: bzrlib/builtins.py:4335
3241
msgid " To apply a merge directive contained in /tmp/merge::"
3242
msgstr ""
3243
3244
#: bzrlib/builtins.py:4337
3245
msgid " bzr merge /tmp/merge"
3246
msgstr ""
3247
3248
#: bzrlib/builtins.py:4339
3249
msgid ""
3250
" To create a merge revision with three parents from two branches\n"
3251
" feature1a and feature1b:"
3252
msgstr ""
3253
3254
#: bzrlib/builtins.py:4342
3255
msgid ""
3256
" bzr merge ../feature1a\n"
3257
" bzr merge ../feature1b --force\n"
3258
" bzr commit -m 'revision with three parents'"
3259
msgstr ""
3260
3261
#: bzrlib/builtins.py:4354
3262
msgid "Merge even if the destination tree has uncommitted changes."
3263
msgstr ""
3264
3265
#: bzrlib/builtins.py:4360
3266
msgid ""
3267
"Apply uncommitted changes from a working copy, instead of branch changes."
3268
msgstr ""
3269
3270
#: bzrlib/builtins.py:4362
3271
msgid ""
3272
"If the destination is already completely merged into the source, pull from "
3273
"the source rather than merging. When this happens, you do not need to "
3274
"commit the result."
3275
msgstr ""
3276
3277
#: bzrlib/builtins.py:4367
3278
msgid ""
3279
"Branch to merge into, rather than the one containing the working directory."
3280
msgstr ""
3281
3282
#: bzrlib/builtins.py:4369
3283
msgid "Instead of merging, show a diff of the merge."
3284
msgstr ""
3285
3286
#: bzrlib/builtins.py:4371
3287
msgid "Select changes interactively."
3288
msgstr ""
3289
3290
#: bzrlib/builtins.py:4393
3291
msgid ""
3292
"Merging into empty branches not currently supported, "
3293
"https://bugs.launchpad.net/bzr/+bug/308562"
3294
msgstr ""
3295
3296
#: bzrlib/builtins.py:4420
3297
msgid "Cannot use --uncommitted with bundles or merge directives."
3298
msgstr ""
3299
3300
#: bzrlib/builtins.py:4431
3301
msgid "Cannot use --uncommitted and --revision at the same time."
3302
msgstr ""
3303
3304
#: bzrlib/builtins.py:4451
3305
msgid "merger: "
3306
msgstr ""
3307
3308
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
3309
msgid "Nothing to do."
3310
msgstr ""
3311
3312
#: bzrlib/builtins.py:4457
3313
msgid "Cannot pull individual files"
3314
msgstr ""
3315
3316
#: bzrlib/builtins.py:4465
3317
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3318
msgstr ""
3319
3320
#: bzrlib/builtins.py:4523
3321
#, python-format
3322
msgid "Show-base is not supported for this merge type. %s"
3323
msgstr ""
3324
3325
#: bzrlib/builtins.py:4532
3326
#, python-format
3327
msgid "Conflict reduction is not supported for merge type %s."
3328
msgstr ""
3329
3330
#: bzrlib/builtins.py:4536
3331
msgid "Cannot do conflict reduction and show base."
3332
msgstr ""
3333
3334
#: bzrlib/builtins.py:4647
3335
msgid "No location specified or remembered"
3336
msgstr ""
3337
3338
#: bzrlib/builtins.py:4649
3339
msgid "{0} remembered {1} location {2}"
3340
msgstr ""
3341
3342
#: bzrlib/builtins.py:4655
3343
msgid "Redo a merge."
3344
msgstr ""
3345
3346
#: bzrlib/builtins.py:4657
3347
msgid ""
3348
"Use this if you want to try a different merge technique while resolving\n"
3349
"conflicts. Some merge techniques are better than others, and remerge\n"
3350
"lets you try different ones on different files."
3351
msgstr ""
3352
3353
#: bzrlib/builtins.py:4661
3354
msgid ""
3355
"The options for remerge have the same meaning and defaults as the ones for\n"
3356
"merge. The difference is that remerge can (only) be run when there is a\n"
3357
"pending merge, and it lets you specify particular files."
3358
msgstr ""
3359
3360
#: bzrlib/builtins.py:4665
3361
msgid ""
3362
":Examples:\n"
3363
" Re-do the merge of all conflicted files, and show the base text in\n"
3364
" conflict regions, in addition to the usual THIS and OTHER texts::"
3365
msgstr ""
3366
3367
#: bzrlib/builtins.py:4669
3368
msgid " bzr remerge --show-base"
3369
msgstr ""
3370
3371
#: bzrlib/builtins.py:4671
3372
msgid ""
3373
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3374
" additional processing to reduce the size of conflict regions::"
3375
msgstr ""
3376
3377
#: bzrlib/builtins.py:4674
3378
msgid " bzr remerge --merge-type weave --reprocess foobar"
3379
msgstr ""
3380
3381
#: bzrlib/builtins.py:4681
3382
msgid "Show base revision text in conflicts."
3383
msgstr ""
3384
3385
#: bzrlib/builtins.py:4693
3386
msgid ""
3387
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3388
"merges."
3389
msgstr ""
3390
3391
#: bzrlib/builtins.py:4751
3392
msgid ""
3393
"Set files in the working tree back to the contents of a previous revision."
3394
msgstr ""
3395
3396
#: bzrlib/builtins.py:4753
3397
msgid ""
3398
"Giving a list of files will revert only those files. Otherwise, all files\n"
3399
"will be reverted. If the revision is not specified with '--revision', the\n"
3400
"working tree basis revision is used. A revert operation affects only the\n"
3401
"working tree, not any revision history like the branch and repository or\n"
3402
"the working tree basis revision."
3403
msgstr ""
3404
3405
#: bzrlib/builtins.py:4759
3406
msgid ""
3407
"To remove only some changes, without reverting to a prior version, use\n"
3408
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3409
"will remove the changes introduced by the second last commit (-2), without\n"
3410
"affecting the changes introduced by the last commit (-1). To remove\n"
3411
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3412
"To update the branch to a specific revision or the latest revision and\n"
3413
"update the working tree accordingly while preserving local changes, see the\n"
3414
"update command."
3415
msgstr ""
3416
3417
#: bzrlib/builtins.py:4768
3418
msgid ""
3419
"Uncommitted changes to files that are reverted will be discarded.\n"
3420
"Howver, by default, any files that have been manually changed will be\n"
3421
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3422
"files have '.~#~' appended to their name, where # is a number."
3423
msgstr ""
3424
3425
#: bzrlib/builtins.py:4773
3426
msgid ""
3427
"When you provide files, you can use their current pathname or the pathname\n"
3428
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3429
"name. If you name a directory, all the contents of that directory will be\n"
3430
"reverted."
3431
msgstr ""
3432
3433
#: bzrlib/builtins.py:4778
3434
msgid ""
3435
"If you have newly added files since the target revision, they will be\n"
3436
"removed. If the files to be removed have been changed, backups will be\n"
3437
"created as above. Directories containing unknown files will not be\n"
3438
"deleted."
3439
msgstr ""
3440
3441
#: bzrlib/builtins.py:4783
3442
msgid ""
3443
"The working tree contains a list of revisions that have been merged but\n"
3444
"not yet committed. These revisions will be included as additional parents\n"
3445
"of the next commit. Normally, using revert clears that list as well as\n"
3446
"reverting the files. If any files are specified, revert leaves the list\n"
3447
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3448
".`` in the tree root to revert all files but keep the recorded merges,\n"
3449
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3450
"reverting any files."
3451
msgstr ""
3452
3453
#: bzrlib/builtins.py:4792
3454
msgid ""
3455
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3456
"changes from a branch in a single revision. To do this, perform the merge\n"
3457
"as desired. Then doing revert with the \"--forget-merges\" option will "
3458
"keep\n"
3459
"the content of the tree as it was, but it will clear the list of pending\n"
3460
"merges. The next commit will then contain all of the changes that are\n"
3461
"present in the other branch, but without any other parent revisions.\n"
3462
"Because this technique forgets where these changes originated, it may\n"
3463
"cause additional conflicts on later merges involving the same source and\n"
3464
"target branches."
3465
msgstr ""
3466
3467
#: bzrlib/builtins.py:4806
3468
msgid "Do not save backups of reverted files."
3469
msgstr ""
3470
3471
#: bzrlib/builtins.py:4808
3472
msgid "Remove pending merge marker, without changing any files."
3473
msgstr ""
3474
3475
#: bzrlib/builtins.py:4839
3476
msgid ""
3477
"Show help on a command or other topic.\n"
3478
" "
3479
msgstr ""
3480
3481
#: bzrlib/builtins.py:4844
3482
msgid "Show help on all commands."
3483
msgstr ""
3484
3485
#: bzrlib/builtins.py:4873
3486
msgid "Show unmerged/unpulled revisions between two branches."
3487
msgstr ""
3488
3489
#: bzrlib/builtins.py:4875
3490
msgid "OTHER_BRANCH may be local or remote."
3491
msgstr ""
3492
3493
#: bzrlib/builtins.py:4877
3494
msgid ""
3495
"To filter on a range of revisions, you can use the command -r begin..end\n"
3496
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3497
"also valid.\n"
3498
" \n"
3499
":Exit values:\n"
3500
" 1 - some missing revisions\n"
3501
" 0 - no missing revisions"
3502
msgstr ""
3503
3504
#: bzrlib/builtins.py:4887
3505
msgid ""
3506
" Determine the missing revisions between this and the branch at the\n"
3507
" remembered pull location::"
3508
msgstr ""
3509
3510
#: bzrlib/builtins.py:4890
3511
msgid " bzr missing"
3512
msgstr ""
3513
3514
#: bzrlib/builtins.py:4892
3515
msgid " Determine the missing revisions between this and another branch::"
3516
msgstr ""
3517
3518
#: bzrlib/builtins.py:4894
3519
msgid " bzr missing http://server/branch"
3520
msgstr ""
3521
3522
#: bzrlib/builtins.py:4896
3523
msgid ""
3524
" Determine the missing revisions up to a specific revision on the other\n"
3525
" branch::"
3526
msgstr ""
3527
3528
#: bzrlib/builtins.py:4899
3529
msgid " bzr missing -r ..-10"
3530
msgstr ""
3531
3532
#: bzrlib/builtins.py:4901
3533
msgid ""
3534
" Determine the missing revisions up to a specific revision on this\n"
3535
" branch::"
3536
msgstr ""
3537
3538
#: bzrlib/builtins.py:4904
3539
msgid " bzr missing --my-revision ..-10"
3540
msgstr ""
3541
3542
#: bzrlib/builtins.py:4911
3543
msgid "Reverse the order of revisions."
3544
msgstr ""
3545
3546
#: bzrlib/builtins.py:4913
3547
msgid "Display changes in the local branch only."
3548
msgstr ""
3549
3550
#: bzrlib/builtins.py:4914
3551
msgid "Same as --mine-only."
3552
msgstr ""
3553
3554
#: bzrlib/builtins.py:4916
3555
msgid "Display changes in the remote branch only."
3556
msgstr ""
3557
3558
#: bzrlib/builtins.py:4917
3559
msgid "Same as --theirs-only."
3560
msgstr ""
3561
3562
#: bzrlib/builtins.py:4922
3563
msgid ""
3564
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3565
"details."
3566
msgstr ""
3567
3568
#: bzrlib/builtins.py:4926
3569
msgid ""
3570
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3571
"details."
3572
msgstr ""
3573
3574
#: bzrlib/builtins.py:4929
3575
msgid "Show all revisions in addition to the mainline ones."
3576
msgstr ""
3577
3578
#: bzrlib/builtins.py:4983
3579
msgid "No peer location known or specified."
3580
msgstr ""
3581
3582
#: bzrlib/builtins.py:4987
3583
msgid "Using saved parent location: {0}\n"
3584
msgstr ""
3585
3586
#: bzrlib/builtins.py:5020
3587
#, python-format
3588
msgid "You have %d extra revision:\n"
3589
msgid_plural "You have %d extra revisions:\n"
3590
msgstr[0] ""
3591
msgstr[1] ""
3592
3593
#: bzrlib/builtins.py:5040
3594
#, python-format
3595
msgid "You are missing %d revision:\n"
3596
msgid_plural "You are missing %d revisions:\n"
3597
msgstr[0] ""
3598
msgstr[1] ""
3599
3600
#: bzrlib/builtins.py:5055
3601
msgid "This branch has no new revisions.\n"
3602
msgstr ""
3603
3604
#: bzrlib/builtins.py:5058
3605
msgid "Other branch has no new revisions.\n"
3606
msgstr ""
3607
3608
#: bzrlib/builtins.py:5063
3609
msgid "Branches are up to date.\n"
3610
msgstr ""
3611
3612
#: bzrlib/builtins.py:5074
3613
msgid "Compress the data within a repository."
3614
msgstr ""
3615
3616
#: bzrlib/builtins.py:5076
3617
msgid ""
3618
"This operation compresses the data within a bazaar repository. As\n"
3619
"bazaar supports automatic packing of repository, this operation is\n"
3620
"normally not required to be done manually."
3621
msgstr ""
3622
3623
#: bzrlib/builtins.py:5080
3624
msgid ""
3625
"During the pack operation, bazaar takes a backup of existing repository\n"
3626
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3627
"automatically when it is safe to do so. To save disk space by removing\n"
3628
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3629
"used."
3630
msgstr ""
3631
3632
#: bzrlib/builtins.py:5086
3633
msgid ""
3634
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3635
"during or immediately after repacking, you may be left with a state\n"
3636
"where the deletion has been written to disk but the new packs have not\n"
3637
"been. In this case the repository may be unusable."
3638
msgstr ""
3639
3640
#: bzrlib/builtins.py:5095
3641
msgid "Delete obsolete packs to save disk space."
3642
msgstr ""
3643
3644
#: bzrlib/builtins.py:5109
3645
msgid "List the installed plugins."
3646
msgstr ""
3647
3648
#: bzrlib/builtins.py:5111
3649
msgid ""
3650
"This command displays the list of installed plugins including\n"
3651
"version of plugin and a short description of each."
3652
msgstr ""
3653
3654
#: bzrlib/builtins.py:5114
3655
msgid "--verbose shows the path where each plugin is located."
3656
msgstr ""
3657
3658
#: bzrlib/builtins.py:5116
3659
msgid ""
3660
"A plugin is an external component for Bazaar that extends the\n"
3661
"revision control system, by adding or replacing code in Bazaar.\n"
3662
"Plugins can do a variety of things, including overriding commands,\n"
3663
"adding new commands, providing additional network transports and\n"
3664
"customizing log output."
3665
msgstr ""
3666
3667
#: bzrlib/builtins.py:5122
3668
msgid ""
3669
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3670
"for further information on plugins including where to find them and how to\n"
3671
"install them. Instructions are also provided there on how to write new\n"
3672
"plugins using the Python programming language."
3673
msgstr ""
3674
3675
#: bzrlib/builtins.py:5138
3676
msgid "Show testament (signing-form) of a revision."
3677
msgstr ""
3678
3679
#: bzrlib/builtins.py:5141
3680
msgid "Produce long-format testament."
3681
msgstr ""
3682
3683
#: bzrlib/builtins.py:5143
3684
msgid "Produce a strict-format testament."
3685
msgstr ""
3686
3687
#: bzrlib/builtins.py:5169
3688
msgid "Show the origin of each line in a file."
3689
msgstr ""
3690
3691
#: bzrlib/builtins.py:5171
3692
msgid ""
3693
"This prints out the given file with an annotation on the left side\n"
3694
"indicating which revision, author and date introduced the change."
3695
msgstr ""
3696
3697
#: bzrlib/builtins.py:5174
3698
msgid ""
3699
"If the origin is the same for a run of consecutive lines, it is\n"
3700
"shown only at the top, unless the --all option is given."
3701
msgstr ""
3702
3703
#: bzrlib/builtins.py:5182
3704
msgid "Show annotations on all lines."
3705
msgstr ""
3706
3707
#: bzrlib/builtins.py:5183
3708
msgid "Show commit date in annotations."
3709
msgstr ""
3710
3711
#: bzrlib/builtins.py:5270
3712
msgid "Cannot sign a range of non-revision-history revisions"
3713
msgstr ""
3714
3715
#: bzrlib/builtins.py:5282
3716
msgid "Please supply either one revision, or a range."
3717
msgstr ""
3718
3719
#: bzrlib/builtins.py:5286
3720
msgid ""
3721
"Convert the current branch into a checkout of the supplied branch.\n"
3722
"If no branch is supplied, rebind to the last bound location."
3723
msgstr ""
3724
"Преобразовать текущую ветвь в рабочую копию указанной ветви.\n"
3725
"Если ветвь не указаны, перепривязать последнее расположение привязки."
3726
3727
#: bzrlib/builtins.py:5289
3728
msgid ""
3729
"Once converted into a checkout, commits must succeed on the master branch\n"
3730
"before they will be applied to the local branch."
3731
msgstr ""
3732
"После преобразования в рабочую копию, закрепления должны производиться\n"
3733
"над основной ветвью, прежде чем они могут быть применены к локальной."
3734
3735
#: bzrlib/builtins.py:5292
3736
msgid ""
3737
"Bound branches use the nickname of its master branch unless it is set\n"
3738
"locally, in which case binding will update the local nickname to be\n"
3739
"that of the master."
3740
msgstr ""
3741
3742
#: bzrlib/builtins.py:5307
3743
msgid "No location supplied. This format does not remember old locations."
3744
msgstr ""
3745
3746
#: bzrlib/builtins.py:5313
3747
msgid "Branch is already bound"
3748
msgstr ""
3749
3750
#: bzrlib/builtins.py:5316
3751
msgid "No location supplied and no previous location known"
3752
msgstr ""
3753
3754
#: bzrlib/builtins.py:5322
3755
msgid "These branches have diverged. Try merging, and then bind again."
3756
msgstr ""
3757
3758
#: bzrlib/builtins.py:5329
3759
msgid "Convert the current checkout into a regular branch."
3760
msgstr "Преобразовать текущую рабочую копию в обычную ветвь."
3761
3762
#: bzrlib/builtins.py:5331
3763
msgid ""
3764
"After unbinding, the local branch is considered independent and subsequent\n"
3765
"commits will be local only."
3766
msgstr ""
3767
3768
#: bzrlib/builtins.py:5342
3769
msgid "Local branch is not bound"
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:5346
3773
msgid "Remove the last committed revision."
3774
msgstr ""
3775
3776
#: bzrlib/builtins.py:5348
3777
msgid ""
3778
"--verbose will print out what is being removed.\n"
3779
"--dry-run will go through all the motions, but not actually\n"
3780
"remove anything."
3781
msgstr ""
3782
3783
#: bzrlib/builtins.py:5352
3784
msgid ""
3785
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3786
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3787
"branch at revision 15."
3788
msgstr ""
3789
3790
#: bzrlib/builtins.py:5356
3791
msgid ""
3792
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3793
"it may make is to restore any pending merges that were present before\n"
3794
"the commit."
3795
msgstr ""
3796
3797
#: bzrlib/builtins.py:5367
3798
msgid "Don't actually make changes."
3799
msgstr ""
3800
3801
#: bzrlib/builtins.py:5368
3802
msgid "Say yes to all questions."
3803
msgstr ""
3804
3805
#: bzrlib/builtins.py:5370
3806
msgid "Keep tags that point to removed revisions."
3807
msgstr ""
3808
3809
#: bzrlib/builtins.py:5372
3810
msgid "Only remove the commits from the local branch when in a checkout."
3811
msgstr "Удалить закрепления из локальной ветви только в рабочей копии."
3812
3813
#: bzrlib/builtins.py:5421
3814
msgid "No revisions to uncommit.\n"
3815
msgstr ""
3816
3817
#: bzrlib/builtins.py:5436
3818
msgid "Dry-run, pretending to remove the above revisions.\n"
3819
msgstr ""
3820
3821
#: bzrlib/builtins.py:5439
3822
msgid "The above revision(s) will be removed.\n"
3823
msgstr ""
3824
3825
#: bzrlib/builtins.py:5443
3826
msgid "Uncommit these revisions"
3827
msgstr ""
3828
3829
#: bzrlib/builtins.py:5446
3830
msgid "Canceled\n"
3831
msgstr ""
3832
3833
#: bzrlib/builtins.py:5453
3834
#, python-format
3835
msgid ""
3836
"You can restore the old tip by running:\n"
3837
" bzr pull . -r revid:%s\n"
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:5458
3841
msgid "Break a dead lock."
3842
msgstr ""
3843
3844
#: bzrlib/builtins.py:5460
3845
msgid ""
3846
"This command breaks a lock on a repository, branch, working directory or\n"
3847
"config file."
3848
msgstr ""
3849
3850
#: bzrlib/builtins.py:5463
3851
msgid ""
3852
"CAUTION: Locks should only be broken when you are sure that the process\n"
3853
"holding the lock has been stopped."
3854
msgstr ""
3855
3856
#: bzrlib/builtins.py:5466
3857
msgid ""
3858
"You can get information on what locks are open via the 'bzr info\n"
3859
"[location]' command."
3860
msgstr ""
3861
3862
#: bzrlib/builtins.py:5469
3863
msgid ""
3864
":Examples:\n"
3865
" bzr break-lock\n"
3866
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3867
" bzr break-lock --conf ~/.bazaar"
3868
msgstr ""
3869
3870
#: bzrlib/builtins.py:5478
3871
msgid "LOCATION is the directory where the config lock is."
3872
msgstr ""
3873
3874
#: bzrlib/builtins.py:5480
3875
msgid "Do not ask for confirmation before breaking the lock."
3876
msgstr ""
3877
3878
#: bzrlib/builtins.py:5515
3879
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3880
msgstr ""
3881
3882
#: bzrlib/builtins.py:5516
3883
msgid "Run the bzr server."
3884
msgstr ""
3885
3886
#: bzrlib/builtins.py:5522
3887
msgid "Serve on stdin/out for use from inetd or sshd."
3888
msgstr ""
3889
3890
#: bzrlib/builtins.py:5523
3891
msgid "protocol"
3892
msgstr ""
3893
3894
#: bzrlib/builtins.py:5524
3895
msgid "Protocol to serve."
3896
msgstr ""
3897
3898
#: bzrlib/builtins.py:5528
3899
msgid "Listen for connections on nominated address."
3900
msgstr ""
3901
3902
#: bzrlib/builtins.py:5530
3903
msgid ""
3904
"Listen for connections on nominated port. Passing 0 as the port number will "
3905
"result in a dynamically allocated port. The default port depends on the "
3906
"protocol."
3907
msgstr ""
3908
3909
#: bzrlib/builtins.py:5535
3910
msgid "Serve contents of this directory."
3911
msgstr ""
3912
3913
#: bzrlib/builtins.py:5537
3914
msgid ""
3915
"By default the server is a readonly server. Supplying --allow-writes "
3916
"enables write access to the contents of the served directory and below. "
3917
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3918
"of external authentication is arranged supplying this option leads to global "
3919
"uncontrolled write access to your file system."
3920
msgstr ""
3921
3922
#: bzrlib/builtins.py:5546
3923
msgid "Override the default idle client timeout (5min)."
3924
msgstr ""
3925
3926
#: bzrlib/builtins.py:5564
3927
msgid "Combine a tree into its containing tree."
3928
msgstr ""
3929
3930
#: bzrlib/builtins.py:5566
3931
msgid "This command requires the target tree to be in a rich-root format."
3932
msgstr ""
3933
3934
#: bzrlib/builtins.py:5568
3935
msgid ""
3936
"The TREE argument should be an independent tree, inside another tree, but\n"
3937
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3938
"running \"bzr branch\" with the target inside a tree.)"
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:5572
3942
msgid ""
3943
"The result is a combined tree, with the subtree no longer an independent\n"
3944
"part. This is marked as a merge of the subtree into the containing tree,\n"
3945
"and all history is preserved."
3946
msgstr ""
3947
3948
#: bzrlib/builtins.py:5590
3949
#, python-format
3950
msgid ""
3951
"Can't join trees because %s doesn't support rich root data.\n"
3952
"You can use bzr upgrade on the repository."
3953
msgstr ""
3954
3955
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3956
msgid "Cannot join {0}. {1}"
3957
msgstr ""
3958
3959
#: bzrlib/builtins.py:5610
3960
msgid "Split a subdirectory of a tree into a separate tree."
3961
msgstr ""
3962
3963
#: bzrlib/builtins.py:5612
3964
msgid ""
3965
"This command will produce a target tree in a format that supports\n"
3966
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3967
"converted into earlier formats like 'dirstate-tags'."
3968
msgstr ""
3969
3970
#: bzrlib/builtins.py:5616
3971
msgid ""
3972
"The TREE argument should be a subdirectory of a working tree. That\n"
3973
"subdirectory will be converted into an independent tree, with its own\n"
3974
"branch. Commits in the top-level tree will not apply to the new subtree."
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:5696
3978
msgid "No submit branch specified or known"
3979
msgstr ""
3980
3981
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3982
msgid "No public branch specified or known"
3983
msgstr ""
3984
3985
#: bzrlib/builtins.py:5710
3986
msgid "bzr merge-directive takes at most two one revision identifiers"
3987
msgstr ""
3988
3989
#: bzrlib/builtins.py:5719
3990
msgid "No revisions to bundle."
3991
msgstr ""
3992
3993
#: bzrlib/builtins.py:5738
3994
msgid "Mail or create a merge-directive for submitting changes."
3995
msgstr ""
3996
3997
#: bzrlib/builtins.py:5740
3998
msgid "A merge directive provides many things needed for requesting merges:"
3999
msgstr ""
4000
4001
#: bzrlib/builtins.py:5742
4002
msgid "* A machine-readable description of the merge to perform"
4003
msgstr ""
4004
4005
#: bzrlib/builtins.py:5744
4006
msgid "* An optional patch that is a preview of the changes requested"
4007
msgstr ""
4008
4009
#: bzrlib/builtins.py:5746
4010
msgid ""
4011
"* An optional bundle of revision data, so that the changes can be applied\n"
4012
" directly from the merge directive, without retrieving data from a\n"
4013
" branch."
4014
msgstr ""
4015
4016
#: bzrlib/builtins.py:5750
4017
msgid ""
4018
"`bzr send` creates a compact data set that, when applied using bzr\n"
4019
"merge, has the same effect as merging from the source branch. "
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:5753
4023
msgid ""
4024
"By default the merge directive is self-contained and can be applied to any\n"
4025
"branch containing submit_branch in its ancestory without needing access to\n"
4026
"the source branch."
4027
msgstr ""
4028
4029
#: bzrlib/builtins.py:5757
4030
msgid ""
4031
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4032
"revisions, but only a structured request to merge from the\n"
4033
"public_location. In that case the public_branch is needed and it must be\n"
4034
"up-to-date and accessible to the recipient. The public_branch is always\n"
4035
"included if known, so that people can check it later."
4036
msgstr ""
4037
4038
#: bzrlib/builtins.py:5763
4039
msgid ""
4040
"The submit branch defaults to the parent of the source branch, but can be\n"
4041
"overridden. Both submit branch and public branch will be remembered in\n"
4042
"branch.conf the first time they are used for a particular branch. The\n"
4043
"source branch defaults to that containing the working directory, but can\n"
4044
"be changed using --from."
4045
msgstr ""
4046
4047
#: bzrlib/builtins.py:5769
4048
msgid ""
4049
"Both the submit branch and the public branch follow the usual behavior with\n"
4050
"respect to --remember: If there is no default location set, the first send\n"
4051
"will set it (use --no-remember to avoid setting it). After that, you can\n"
4052
"omit the location to use the default. To change the default, use\n"
4053
"--remember. The value will only be saved if the location can be accessed."
4054
msgstr ""
4055
4056
#: bzrlib/builtins.py:5775
4057
msgid ""
4058
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4059
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4060
"If a public location is known for the submit_branch, that location is used\n"
4061
"in the merge directive."
4062
msgstr ""
4063
4064
#: bzrlib/builtins.py:5780
4065
msgid ""
4066
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4067
"given, in which case it is sent to a file."
4068
msgstr ""
4069
4070
#: bzrlib/builtins.py:5783
4071
msgid ""
4072
"Mail is sent using your preferred mail program. This should be transparent\n"
4073
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4074
"If the preferred client can't be found (or used), your editor will be used."
4075
msgstr ""
4076
4077
#: bzrlib/builtins.py:5787
4078
msgid ""
4079
"To use a specific mail program, set the mail_client configuration option.\n"
4080
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4081
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
4082
"(MacOS X's\n"
4083
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
4084
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
4085
"add\n"
4086
"supported clients."
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:5794
4090
msgid ""
4091
"If mail is being sent, a to address is required. This can be supplied\n"
4092
"either on the commandline, by setting the submit_to configuration\n"
4093
"option in the branch itself or the child_submit_to configuration option\n"
4094
"in the submit branch."
4095
msgstr ""
4096
4097
#: bzrlib/builtins.py:5799
4098
msgid ""
4099
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4100
"and\n"
4101
"merge directive format 2. It is significantly faster and smaller than\n"
4102
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
4103
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
4104
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4105
msgstr ""
4106
4107
#: bzrlib/builtins.py:5805
4108
msgid ""
4109
"The merge directives created by bzr send may be applied using bzr merge or\n"
4110
"bzr pull by specifying a file containing a merge directive as the location."
4111
msgstr ""
4112
4113
#: bzrlib/builtins.py:5808
4114
msgid ""
4115
"bzr send makes extensive use of public locations to map local locations "
4116
"into\n"
4117
"URLs that can be used by other people. See `bzr help configuration` to\n"
4118
"set them, and use `bzr info` to display them."
4119
msgstr ""
4120
4121
#: bzrlib/builtins.py:5832
4122
msgid "Write merge directive to this file or directory; use - for stdout."
4123
msgstr ""
4124
4125
#: bzrlib/builtins.py:5836
4126
msgid ""
4127
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4128
"strict disables the check."
4129
msgstr ""
4130
4131
#: bzrlib/builtins.py:5838
4132
msgid "Mail the request to this address."
4133
msgstr ""
4134
4135
#: bzrlib/builtins.py:5842
4136
msgid "Body for the email."
4137
msgstr ""
4138
4139
#: bzrlib/builtins.py:5895
4140
msgid "Do not include a bundle in the merge directive."
4141
msgstr ""
4142
4143
#: bzrlib/builtins.py:5896
4144
msgid "Do not include a preview patch in the merge directive."
4145
msgstr ""
4146
4147
#: bzrlib/builtins.py:5899
4148
msgid "Remember submit and public branch."
4149
msgstr ""
4150
4151
#: bzrlib/builtins.py:5901
4152
msgid ""
4153
"Branch to generate the submission from, rather than the one containing the "
4154
"working directory."
4155
msgstr ""
4156
4157
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
4158
msgid "format"
4159
msgstr ""
4160
4161
#: bzrlib/builtins.py:5912
4162
msgid "Use the specified output format."
4163
msgstr ""
4164
4165
#: bzrlib/builtins.py:5934
4166
msgid "Create, remove or modify a tag naming a revision."
4167
msgstr ""
4168
4169
#: bzrlib/builtins.py:5936
4170
msgid ""
4171
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4172
"(--revision) option can be given -rtag:X, where X is any previously\n"
4173
"created tag."
4174
msgstr ""
4175
4176
#: bzrlib/builtins.py:5940
4177
msgid ""
4178
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4179
"along when you branch, push, pull or merge."
4180
msgstr ""
4181
4182
#: bzrlib/builtins.py:5943
4183
msgid ""
4184
"It is an error to give a tag name that already exists unless you pass\n"
4185
"--force, in which case the tag is moved to point to the new revision."
4186
msgstr ""
4187
4188
#: bzrlib/builtins.py:5946
4189
msgid ""
4190
"To rename a tag (change the name but keep it on the same revsion), run "
4191
"``bzr\n"
4192
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4193
msgstr ""
4194
4195
#: bzrlib/builtins.py:5949
4196
msgid ""
4197
"If no tag name is specified it will be determined through the \n"
4198
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4199
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4200
"details."
4201
msgstr ""
4202
4203
#: bzrlib/builtins.py:5959
4204
msgid "Delete this tag rather than placing it."
4205
msgstr ""
4206
4207
#: bzrlib/builtins.py:5962
4208
msgid "Branch in which to place the tag."
4209
msgstr ""
4210
4211
#: bzrlib/builtins.py:5964
4212
msgid "Replace existing tags."
4213
msgstr ""
4214
4215
#: bzrlib/builtins.py:5979
4216
msgid "No tag specified to delete."
4217
msgstr ""
4218
4219
#: bzrlib/builtins.py:5981
4220
#, python-format
4221
msgid "Deleted tag %s."
4222
msgstr ""
4223
4224
#: bzrlib/builtins.py:5995
4225
msgid "Please specify a tag name."
4226
msgstr ""
4227
4228
#: bzrlib/builtins.py:6003
4229
#, python-format
4230
msgid "Tag %s already exists for that revision."
4231
msgstr ""
4232
4233
#: bzrlib/builtins.py:6007
4234
#, python-format
4235
msgid "Created tag %s."
4236
msgstr ""
4237
4238
#: bzrlib/builtins.py:6009
4239
#, python-format
4240
msgid "Updated tag %s."
4241
msgstr ""
4242
4243
#: bzrlib/builtins.py:6013
4244
msgid "List tags."
4245
msgstr ""
4246
4247
#: bzrlib/builtins.py:6015
4248
msgid ""
4249
"This command shows a table of tag names and the revisions they reference."
4250
msgstr ""
4251
4252
#: bzrlib/builtins.py:6021
4253
msgid "Branch whose tags should be displayed."
4254
msgstr ""
4255
4256
#: bzrlib/builtins.py:6023
4257
msgid "Sort tags by different criteria."
4258
msgstr ""
4259
4260
#: bzrlib/builtins.py:6023
4261
msgid "Sorting"
4262
msgstr ""
4263
4264
#: bzrlib/builtins.py:6092
4265
msgid "Reconfigure the type of a bzr directory."
4266
msgstr ""
4267
4268
#: bzrlib/builtins.py:6094
4269
msgid "A target configuration must be specified."
4270
msgstr ""
4271
4272
#: bzrlib/builtins.py:6096
4273
msgid ""
4274
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4275
"The order of preference is\n"
4276
"1. For a lightweight checkout, the current bound location.\n"
4277
"2. For branches that used to be checkouts, the previously-bound location.\n"
4278
"3. The push location.\n"
4279
"4. The parent location.\n"
4280
"If none of these is available, --bind-to must be specified."
4281
msgstr ""
4282
4283
#: bzrlib/builtins.py:6110
4284
msgid "Tree type"
4285
msgstr ""
4286
4287
#: bzrlib/builtins.py:6111
4288
msgid "The relation between branch and tree."
4289
msgstr ""
4290
4291
#: bzrlib/builtins.py:6113
4292
msgid "Reconfigure to be an unbound branch with no working tree."
4293
msgstr ""
4294
4295
#: bzrlib/builtins.py:6114
4296
msgid "Reconfigure to be an unbound branch with a working tree."
4297
msgstr ""
4298
4299
#: bzrlib/builtins.py:6115
4300
msgid "Reconfigure to be a bound branch with a working tree."
4301
msgstr ""
4302
4303
#: bzrlib/builtins.py:6116
4304
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4305
msgstr ""
4306
4307
#: bzrlib/builtins.py:6121
4308
msgid "Repository type"
4309
msgstr ""
4310
4311
#: bzrlib/builtins.py:6122
4312
msgid "Location fo the repository."
4313
msgstr ""
4314
4315
#: bzrlib/builtins.py:6124
4316
msgid ""
4317
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4318
msgstr ""
4319
4320
#: bzrlib/builtins.py:6126
4321
msgid "Reconfigure to use a shared repository."
4322
msgstr ""
4323
4324
#: bzrlib/builtins.py:6130
4325
msgid "Trees in Repository"
4326
msgstr ""
4327
4328
#: bzrlib/builtins.py:6131
4329
msgid "Whether new branches in the repository have trees."
4330
msgstr ""
4331
4332
#: bzrlib/builtins.py:6133
4333
msgid ""
4334
"Reconfigure repository to create working trees on branches by default."
4335
msgstr ""
4336
4337
#: bzrlib/builtins.py:6135
4338
msgid ""
4339
"Reconfigure repository to not create working trees on branches by default."
4340
msgstr ""
4341
4342
#: bzrlib/builtins.py:6138
4343
msgid "Branch to bind checkout to."
4344
msgstr "Ветвь, с которой связать рабочую копию."
4345
4346
#: bzrlib/builtins.py:6140
4347
msgid "Perform reconfiguration even if local changes will be lost."
4348
msgstr ""
4349
4350
#: bzrlib/builtins.py:6143
4351
msgid "Reconfigure a branch to be stacked on another branch."
4352
msgstr ""
4353
4354
#: bzrlib/builtins.py:6147
4355
msgid ""
4356
"Reconfigure a branch to be unstacked. This may require copying substantial "
4357
"data into it."
4358
msgstr ""
4359
4360
#: bzrlib/builtins.py:6157
4361
msgid "Can't use both --stacked-on and --unstacked"
4362
msgstr ""
4363
4364
#: bzrlib/builtins.py:6171
4365
msgid "No target configuration specified"
4366
msgstr ""
4367
4368
#: bzrlib/builtins.py:6206
4369
msgid "Set the branch of a checkout and update."
4370
msgstr "Выбрать ветвь рабочей копии и обновить."
4371
4372
#: bzrlib/builtins.py:6208
4373
msgid ""
4374
"For lightweight checkouts, this changes the branch being referenced.\n"
4375
"For heavyweight checkouts, this checks that there are no local commits\n"
4376
"versus the current bound branch, then it makes the local branch a mirror\n"
4377
"of the new location and binds to it."
4378
msgstr ""
4379
4380
#: bzrlib/builtins.py:6213
4381
msgid ""
4382
"In both cases, the working tree is updated and uncommitted changes\n"
4383
"are merged. The user can commit or revert these as they desire."
4384
msgstr ""
4385
4386
#: bzrlib/builtins.py:6216
4387
msgid "Pending merges need to be committed or reverted before using switch."
4388
msgstr ""
4389
4390
#: bzrlib/builtins.py:6218
4391
msgid ""
4392
"The path to the branch to switch to can be specified relative to the parent\n"
4393
"directory of the current branch. For example, if you are currently in a\n"
4394
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4395
"/path/to/newbranch."
4396
msgstr ""
4397
4398
#: bzrlib/builtins.py:6223
4399
msgid ""
4400
"Bound branches use the nickname of its master branch unless it is set\n"
4401
"locally, in which case switching will update the local nickname to be\n"
4402
"that of the master."
4403
msgstr ""
4404
4405
#: bzrlib/builtins.py:6231
4406
msgid "Switch even if local commits will be lost."
4407
msgstr ""
4408
4409
#: bzrlib/builtins.py:6234
4410
msgid "Create the target branch from this one before switching to it."
4411
msgstr ""
4412
4413
#: bzrlib/builtins.py:6248
4414
msgid "You must supply either a revision or a location"
4415
msgstr ""
4416
4417
#: bzrlib/builtins.py:6261
4418
msgid "cannot create branch without source branch"
4419
msgstr ""
4420
4421
#: bzrlib/builtins.py:6286
4422
msgid "Manage filtered views."
4423
msgstr ""
4424
4425
#: bzrlib/builtins.py:6288
4426
msgid ""
4427
"Views provide a mask over the tree so that users can focus on\n"
4428
"a subset of a tree when doing their work. After creating a view,\n"
4429
"commands that support a list of files - status, diff, commit, etc -\n"
4430
"effectively have that list of files implicitly given each time.\n"
4431
"An explicit list of files can still be given but those files\n"
4432
"must be within the current view."
4433
msgstr ""
4434
4435
#: bzrlib/builtins.py:6295
4436
msgid ""
4437
"In most cases, a view has a short life-span: it is created to make\n"
4438
"a selected change and is deleted once that change is committed.\n"
4439
"At other times, you may wish to create one or more named views\n"
4440
"and switch between them."
4441
msgstr ""
4442
4443
#: bzrlib/builtins.py:6300
4444
msgid ""
4445
"To disable the current view without deleting it, you can switch to\n"
4446
"the pseudo view called ``off``. This can be useful when you need\n"
4447
"to see the whole tree for an operation or two (e.g. merge) but\n"
4448
"want to switch back to your view after that."
4449
msgstr ""
4450
4451
#: bzrlib/builtins.py:6305
4452
msgid ""
4453
":Examples:\n"
4454
" To define the current view::"
4455
msgstr ""
4456
4457
#: bzrlib/builtins.py:6308
4458
msgid " bzr view file1 dir1 ..."
4459
msgstr ""
4460
4461
#: bzrlib/builtins.py:6310
4462
msgid " To list the current view::"
4463
msgstr ""
4464
4465
#: bzrlib/builtins.py:6312
4466
msgid " bzr view"
4467
msgstr ""
4468
4469
#: bzrlib/builtins.py:6314
4470
msgid " To delete the current view::"
4471
msgstr ""
4472
4473
#: bzrlib/builtins.py:6316
4474
msgid " bzr view --delete"
4475
msgstr ""
4476
4477
#: bzrlib/builtins.py:6318
4478
msgid " To disable the current view without deleting it::"
4479
msgstr ""
4480
4481
#: bzrlib/builtins.py:6320
4482
msgid " bzr view --switch off"
4483
msgstr ""
4484
4485
#: bzrlib/builtins.py:6322
4486
msgid " To define a named view and switch to it::"
4487
msgstr ""
4488
4489
#: bzrlib/builtins.py:6324
4490
msgid " bzr view --name view-name file1 dir1 ..."
4491
msgstr ""
4492
4493
#: bzrlib/builtins.py:6326
4494
msgid " To list a named view::"
4495
msgstr ""
4496
4497
#: bzrlib/builtins.py:6328
4498
msgid " bzr view --name view-name"
4499
msgstr ""
4500
4501
#: bzrlib/builtins.py:6330
4502
msgid " To delete a named view::"
4503
msgstr ""
4504
4505
#: bzrlib/builtins.py:6332
4506
msgid " bzr view --name view-name --delete"
4507
msgstr ""
4508
4509
#: bzrlib/builtins.py:6334
4510
msgid " To switch to a named view::"
4511
msgstr ""
4512
4513
#: bzrlib/builtins.py:6336
4514
msgid " bzr view --switch view-name"
4515
msgstr ""
4516
4517
#: bzrlib/builtins.py:6338
4518
msgid " To list all views defined::"
4519
msgstr ""
4520
4521
#: bzrlib/builtins.py:6340
4522
msgid " bzr view --all"
4523
msgstr ""
4524
4525
#: bzrlib/builtins.py:6342
4526
msgid " To delete all views::"
4527
msgstr ""
4528
4529
#: bzrlib/builtins.py:6344
4530
msgid " bzr view --delete --all"
4531
msgstr ""
4532
4533
#: bzrlib/builtins.py:6351
4534
msgid "Apply list or delete action to all views."
4535
msgstr ""
4536
4537
#: bzrlib/builtins.py:6354
4538
msgid "Delete the view."
4539
msgstr ""
4540
4541
#: bzrlib/builtins.py:6357
4542
msgid "Name of the view to define, list or delete."
4543
msgstr ""
4544
4545
#: bzrlib/builtins.py:6361
4546
msgid "Name of the view to switch to."
4547
msgstr ""
4548
4549
#: bzrlib/builtins.py:6380
4550
msgid "Both --delete and a file list specified"
4551
msgstr ""
4552
4553
#: bzrlib/builtins.py:6383
4554
msgid "Both --delete and --switch specified"
4555
msgstr ""
4556
4557
#: bzrlib/builtins.py:6386
4558
msgid "Deleted all views.\n"
4559
msgstr ""
4560
4561
#: bzrlib/builtins.py:6388
4562
msgid "No current view to delete"
4563
msgstr ""
4564
4565
#: bzrlib/builtins.py:6391
4566
#, python-format
4567
msgid "Deleted '%s' view.\n"
4568
msgstr ""
4569
4570
#: bzrlib/builtins.py:6395
4571
msgid "Both --switch and a file list specified"
4572
msgstr ""
4573
4574
#: bzrlib/builtins.py:6398
4575
msgid "Both --switch and --all specified"
4576
msgstr ""
4577
4578
#: bzrlib/builtins.py:6401
4579
msgid "No current view to disable"
4580
msgstr ""
4581
4582
#: bzrlib/builtins.py:6403
4583
#, python-format
4584
msgid "Disabled '%s' view.\n"
4585
msgstr ""
4586
4587
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4588
msgid "Using '{0}' view: {1}\n"
4589
msgstr ""
4590
4591
#: bzrlib/builtins.py:6410
4592
msgid "Views defined:\n"
4593
msgstr ""
4594
4595
#: bzrlib/builtins.py:6419
4596
msgid "No views defined.\n"
4597
msgstr ""
4598
4599
#: bzrlib/builtins.py:6426
4600
msgid "Cannot change the 'off' pseudo view"
4601
msgstr ""
4602
4603
#: bzrlib/builtins.py:6434
4604
msgid "No current view.\n"
4605
msgstr ""
4606
4607
#: bzrlib/builtins.py:6437
4608
msgid "'{0}' view is: {1}\n"
4609
msgstr ""
4610
4611
#: bzrlib/builtins.py:6457
4612
msgid " <no hooks installed>\n"
4613
msgstr ""
4614
4615
#: bzrlib/builtins.py:6461
4616
msgid "Remove a branch."
4617
msgstr ""
4618
4619
#: bzrlib/builtins.py:6463
4620
msgid ""
4621
"This will remove the branch from the specified location but \n"
4622
"will keep any working tree or repository in place."
4623
msgstr ""
4624
4625
#: bzrlib/builtins.py:6468
4626
msgid " Remove the branch at repo/trunk::"
4627
msgstr ""
4628
4629
#: bzrlib/builtins.py:6470
4630
msgid " bzr remove-branch repo/trunk"
4631
msgstr ""
4632
4633
#: bzrlib/builtins.py:6477
4634
msgid "Remove branch even if it is the active branch."
4635
msgstr ""
4636
4637
#: bzrlib/builtins.py:6491
4638
msgid "Branch is active. Use --force to remove it."
4639
msgstr ""
4640
4641
#: bzrlib/builtins.py:6495
4642
msgid "Plaintext diff output."
4643
msgstr ""
4644
4645
#: bzrlib/builtins.py:6496
4646
msgid "Temporarily set aside some changes from the current tree."
4647
msgstr ""
4648
4649
#: bzrlib/builtins.py:6498
4650
msgid ""
4651
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4652
"ie. out of the way, until a later time when you can bring them back from\n"
4653
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4654
"your working tree, and so they aren't propagated along with your branch nor\n"
4655
"will they survive its deletion."
4656
msgstr ""
4657
4658
#: bzrlib/builtins.py:6504
4659
msgid "If shelve --list is specified, previously-shelved changes are listed."
4660
msgstr ""
4661
4662
#: bzrlib/builtins.py:6506
4663
msgid ""
4664
"Shelve is intended to help separate several sets of changes that have\n"
4665
"been inappropriately mingled. If you just want to get rid of all changes\n"
4666
"and you don't need to restore them later, use revert. If you want to\n"
4667
"shelve all text changes at once, use shelve --all."
4668
msgstr ""
4669
4670
#: bzrlib/builtins.py:6511
4671
msgid ""
4672
"If filenames are specified, only the changes to those files will be\n"
4673
"shelved. Other files will be left untouched."
4674
msgstr ""
4675
4676
#: bzrlib/builtins.py:6514
4677
msgid ""
4678
"If a revision is specified, changes since that revision will be shelved."
4679
msgstr ""
4680
4681
#: bzrlib/builtins.py:6516
4682
msgid ""
4683
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4684
"restore the most recently shelved changes."
4685
msgstr ""
4686
4687
#: bzrlib/builtins.py:6519
4688
msgid ""
4689
"For complicated changes, it is possible to edit the changes in a separate\n"
4690
"editor program to decide what the file remaining in the working copy\n"
4691
"should look like. To do this, add the configuration option"
4692
msgstr ""
4693
4694
#: bzrlib/builtins.py:6523
4695
msgid " change_editor = PROGRAM @new_path @old_path"
4696
msgstr ""
4697
4698
#: bzrlib/builtins.py:6525
4699
msgid ""
4700
"where @new_path is replaced with the path of the new version of the \n"
4701
"file and @old_path is replaced with the path of the old version of \n"
4702
"the file. The PROGRAM should save the new file with the desired \n"
4703
"contents of the file in the working tree.\n"
4704
" "
4705
msgstr ""
4706
4707
#: bzrlib/builtins.py:6537
4708
msgid "Shelve all changes."
4709
msgstr ""
4710
4711
#: bzrlib/builtins.py:6539
4712
msgid "Method to use for writing diffs."
4713
msgstr ""
4714
4715
#: bzrlib/builtins.py:6539
4716
msgid "writer"
4717
msgstr ""
4718
4719
#: bzrlib/builtins.py:6543
4720
msgid "List shelved changes."
4721
msgstr ""
4722
4723
#: bzrlib/builtins.py:6545
4724
msgid "Destroy removed changes instead of shelving them."
4725
msgstr ""
4726
4727
#: bzrlib/builtins.py:6574
4728
msgid "No shelved changes."
4729
msgstr ""
4730
4731
#: bzrlib/builtins.py:6585
4732
msgid "Restore shelved changes."
4733
msgstr ""
4734
4735
#: bzrlib/builtins.py:6587
4736
msgid ""
4737
"By default, the most recently shelved changes are restored. However if you\n"
4738
"specify a shelf by id those changes will be restored instead. This works\n"
4739
"best when the changes don't depend on each other."
4740
msgstr ""
4741
4742
#: bzrlib/builtins.py:6596
4743
msgid "The action to perform."
4744
msgstr ""
4745
4746
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4747
msgid "action"
4748
msgstr ""
4749
4750
#: bzrlib/builtins.py:6598
4751
msgid "Apply changes and remove from the shelf."
4752
msgstr ""
4753
4754
#: bzrlib/builtins.py:6599
4755
msgid "Show changes, but do not apply or remove them."
4756
msgstr ""
4757
4758
#: bzrlib/builtins.py:6600
4759
msgid ""
4760
"Instead of unshelving the changes, show the diff that would result from "
4761
"unshelving."
4762
msgstr ""
4763
4764
#: bzrlib/builtins.py:6602
4765
msgid "Delete changes without applying them."
4766
msgstr ""
4767
4768
#: bzrlib/builtins.py:6603
4769
msgid "Apply changes but don't delete them."
4770
msgstr ""
4771
4772
#: bzrlib/builtins.py:6618
4773
msgid "Remove unwanted files from working tree."
4774
msgstr ""
4775
4776
#: bzrlib/builtins.py:6620
4777
msgid ""
4778
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4779
"files are never deleted."
4780
msgstr ""
4781
4782
#: bzrlib/builtins.py:6623
4783
msgid ""
4784
"Another class is 'detritus', which includes files emitted by bzr during\n"
4785
"normal operations and selftests. (The value of these files decreases with\n"
4786
"time.)"
4787
msgstr ""
4788
4789
#: bzrlib/builtins.py:6627
4790
msgid ""
4791
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4792
"flags are respected, and may be combined."
4793
msgstr ""
4794
4795
#: bzrlib/builtins.py:6630
4796
msgid "To check what clean-tree will do, use --dry-run."
4797
msgstr ""
4798
4799
#: bzrlib/builtins.py:6633
4800
msgid "Delete all ignored files."
4801
msgstr ""
4802
4803
#: bzrlib/builtins.py:6634
4804
msgid ""
4805
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4806
msgstr ""
4807
4808
#: bzrlib/builtins.py:6637
4809
msgid "Delete files unknown to bzr (default)."
4810
msgstr ""
4811
4812
#: bzrlib/builtins.py:6638
4813
msgid "Show files to delete instead of deleting them."
4814
msgstr ""
4815
4816
#: bzrlib/builtins.py:6640
4817
msgid "Do not prompt before deleting."
4818
msgstr ""
4819
4820
#: bzrlib/bundle/__init__.py:59
4821
msgid "A directory cannot be a bundle"
4822
msgstr ""
4823
4824
#: bzrlib/bundle/apply_bundle.py:40
4825
msgid "Install revisions"
4826
msgstr ""
4827
4828
#: bzrlib/bundle/commands.py:64
4829
msgid "--verbose requires a merge directive"
4830
msgstr ""
4831
4832
#: bzrlib/bundle/commands.py:67
4833
msgid "Bundle format not supported"
4834
msgstr ""
4835
4836
#: bzrlib/bundle/commands.py:77
4837
msgid "Records\n"
4838
msgstr ""
4839
4840
#: bzrlib/bundle/commands.py:81
4841
msgid "{0}: {1} ({2} multiparent)\n"
4842
msgstr ""
4843
4844
#: bzrlib/bundle/commands.py:83
4845
#, python-format
4846
msgid "unique files: %d\n"
4847
msgstr ""
4848
4849
#: bzrlib/bundle/commands.py:92
4850
msgid "Revisions\n"
4851
msgstr ""
4852
4853
#: bzrlib/bundle/commands.py:93
4854
#, python-format
4855
msgid "nicks: %s\n"
4856
msgstr ""
4857
4858
#: bzrlib/bundle/commands.py:95
4859
#, python-format
4860
msgid ""
4861
"committers: \n"
4862
"%s\n"
4863
msgstr ""
4864
4865
#: bzrlib/bundle/commands.py:103
4866
msgid "Decoded contents\n"
4867
msgstr ""
4868
4869
#: bzrlib/bundle/serializer/v4.py:327
4870
#, python-format
4871
msgid "Bundling %d revision."
4872
msgid_plural "Bundling %d revisions."
4873
msgstr[0] ""
4874
msgstr[1] ""
4875
4876
#: bzrlib/bzrdir.py:487
4877
msgid ""
4878
"making backup of {0}\n"
4879
" to {1}"
4880
msgstr ""
4881
4882
#: bzrlib/bzrdir.py:510
4883
msgid "renamed {0} to {1}"
4884
msgstr ""
4885
4886
#: bzrlib/bzrdir.py:1639
4887
#, python-format
4888
msgid ""
4889
"Source repository format does not support stacking, using format:\n"
4890
" %s"
4891
msgstr ""
4892
4893
#: bzrlib/bzrdir.py:1659
4894
#, python-format
4895
msgid ""
4896
"Source branch format does not support stacking, using format:\n"
4897
" %s"
4898
msgstr ""
4899
4900
#: bzrlib/bzrdir.py:1805
4901
msgid "starting repository conversion"
4902
msgstr ""
4903
4904
#: bzrlib/bzrdir.py:2026
4905
msgid "Using default stacking branch {0} at {1}"
4906
msgstr ""
4907
4908
#: bzrlib/check.py:108
4909
msgid "check"
4910
msgstr ""
4911
4912
#: bzrlib/check.py:110
4913
msgid "checking revisions"
4914
msgstr ""
4915
4916
#: bzrlib/check.py:112
4917
msgid "checking commit contents"
4918
msgstr ""
4919
4920
#: bzrlib/check.py:114
4921
msgid "checking file graphs"
4922
msgstr ""
4923
4924
#: bzrlib/check.py:118
4925
msgid "checking branches and trees"
4926
msgstr ""
4927
4928
#: bzrlib/check.py:205
4929
msgid "checked repository {0} format {1}"
4930
msgstr ""
4931
4932
#: bzrlib/check.py:208
4933
#, python-format
4934
msgid "%6d revisions"
4935
msgstr ""
4936
4937
#: bzrlib/check.py:209
4938
#, python-format
4939
msgid "%6d file-ids"
4940
msgstr ""
4941
4942
#: bzrlib/check.py:211
4943
#, python-format
4944
msgid "%6d unreferenced text versions"
4945
msgstr ""
4946
4947
#: bzrlib/check.py:215
4948
msgid "unreferenced version: {{{0}}} in {1}"
4949
msgstr ""
4950
4951
#: bzrlib/check.py:218
4952
#, python-format
4953
msgid "%6d revisions are missing inventory_sha1"
4954
msgstr ""
4955
4956
#: bzrlib/check.py:221
4957
#, python-format
4958
msgid "%6d revisions are mentioned but not present"
4959
msgstr ""
4960
4961
#: bzrlib/check.py:224
4962
#, python-format
4963
msgid "%6d ghost revisions"
4964
msgstr ""
4965
4966
#: bzrlib/check.py:229
4967
#, python-format
4968
msgid "%6d revisions missing parents in ancestry"
4969
msgstr ""
4970
4971
#: bzrlib/check.py:233
4972
#, python-format
4973
msgid " %s should be in the ancestry for:"
4974
msgstr ""
4975
4976
#: bzrlib/check.py:237
4977
#, python-format
4978
msgid "%6d inconsistent parents"
4979
msgstr ""
4980
4981
#: bzrlib/check.py:241
4982
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4983
msgstr ""
4984
4985
#: bzrlib/check.py:247
4986
#, python-format
4987
msgid "%6d revisions have incorrect parents in the revision index"
4988
msgstr ""
4989
4990
#: bzrlib/check.py:253
4991
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4992
msgstr ""
4993
4994
#: bzrlib/check.py:267
4995
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4996
msgstr ""
4997
4998
#: bzrlib/check.py:296
4999
msgid ""
5000
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
5001
"{{{4}}}"
5002
msgstr ""
5003
5004
#: bzrlib/check.py:354
5005
#, python-format
5006
msgid "Checking branch at '%s'."
5007
msgstr ""
5008
5009
#: bzrlib/check.py:374
5010
#, python-format
5011
msgid "Checking working tree at '%s'."
5012
msgstr ""
5013
5014
#: bzrlib/check.py:427 bzrlib/check.py:441
5015
msgid "No branch found at specified location."
5016
msgstr ""
5017
5018
#: bzrlib/check.py:429 bzrlib/check.py:439
5019
msgid "No working tree found at specified location."
5020
msgstr ""
5021
5022
#: bzrlib/check.py:432
5023
#, python-format
5024
msgid "Checking repository at '%s'."
5025
msgstr ""
5026
5027
#: bzrlib/check.py:443
5028
msgid "No repository found at specified location."
5029
msgstr ""
5030
5031
#: bzrlib/clean_tree.py:63
5032
msgid "Nothing to delete."
5033
msgstr ""
5034
5035
#: bzrlib/clean_tree.py:68
5036
msgid "Are you sure you wish to delete these"
5037
msgstr ""
5038
5039
#: bzrlib/clean_tree.py:70
5040
msgid "Canceled"
5041
msgstr ""
5042
5043
#: bzrlib/clean_tree.py:107
5044
#, python-format
5045
msgid "unable to remove %s"
5046
msgstr ""
5047
5048
#: bzrlib/clean_tree.py:111
5049
msgid "deleting paths:"
5050
msgstr ""
5051
5052
#: bzrlib/clean_tree.py:125
5053
msgid "unable to remove \"{0}\": {1}."
5054
msgstr ""
5055
5056
#: bzrlib/clean_tree.py:130
5057
msgid "No files deleted."
5058
msgstr ""
5059
5060
#: bzrlib/cmd_version_info.py:47
5061
msgid "No known version info format {0}. Supported types are: {1}"
5062
msgstr ""
5063
5064
#: bzrlib/cmd_version_info.py:52
5065
msgid "Version info in Custom template-based format."
5066
msgstr ""
5067
5068
#: bzrlib/cmd_version_info.py:52
5069
msgid "Version info in Python format."
5070
msgstr ""
5071
5072
#: bzrlib/cmd_version_info.py:52
5073
msgid "Version info in RIO (simple text) format (default)."
5074
msgstr ""
5075
5076
#: bzrlib/cmd_version_info.py:53
5077
msgid "Show version information about this tree."
5078
msgstr ""
5079
5080
#: bzrlib/cmd_version_info.py:55
5081
msgid ""
5082
"You can use this command to add information about version into\n"
5083
"source code of an application. The output can be in one of the\n"
5084
"supported formats or in a custom format based on a template."
5085
msgstr ""
5086
5087
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
5088
#: en/help_topics/configuration.txt:722
5089
msgid "For example::"
5090
msgstr ""
5091
5092
#: bzrlib/cmd_version_info.py:61
5093
msgid ""
5094
" bzr version-info --custom \\\n"
5095
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
5096
msgstr ""
5097
5098
#: bzrlib/cmd_version_info.py:64
5099
msgid ""
5100
"will produce a C header file with formatted string containing the\n"
5101
"current revision number. Other supported variables in templates are:"
5102
msgstr ""
5103
5104
#: bzrlib/cmd_version_info.py:67
5105
msgid ""
5106
" * {date} - date of the last revision\n"
5107
" * {build_date} - current date\n"
5108
" * {revno} - revision number\n"
5109
" * {revision_id} - revision id\n"
5110
" * {branch_nick} - branch nickname\n"
5111
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
5112
" otherwise 1"
5113
msgstr ""
5114
5115
#: bzrlib/cmd_version_info.py:77
5116
msgid "Select the output format."
5117
msgstr ""
5118
5119
#: bzrlib/cmd_version_info.py:81
5120
msgid "Include all possible information."
5121
msgstr ""
5122
5123
#: bzrlib/cmd_version_info.py:82
5124
msgid "Check if tree is clean."
5125
msgstr ""
5126
5127
#: bzrlib/cmd_version_info.py:84
5128
msgid "Include the revision-history."
5129
msgstr ""
5130
5131
#: bzrlib/cmd_version_info.py:86
5132
msgid "Include the last revision for each file."
5133
msgstr ""
5134
5135
#: bzrlib/cmd_version_info.py:87
5136
msgid "Template for the output."
5137
msgstr ""
5138
5139
#: bzrlib/cmd_version_info.py:101
5140
msgid "bzr version-info --revision takes exactly one revision specifier"
5141
msgstr ""
5142
5143
#: bzrlib/commands.py:229
5144
#, python-format
5145
msgid "unknown command \"%s\""
5146
msgstr "неизвестная команда «%s»"
5147
5148
#: bzrlib/commands.py:476
5149
msgid "No help for this command."
5150
msgstr "Нет справки для этой команды."
5151
5152
#: bzrlib/commands.py:489
5153
#, python-format
5154
msgid ":Purpose: %s\n"
5155
msgstr ":Назначение: %s\n"
5156
5157
#: bzrlib/commands.py:491
5158
#, python-format
5159
msgid ""
5160
":Usage:\n"
5161
"%s\n"
5162
msgstr ""
5163
":Синтаксис:\n"
5164
"%s\n"
5165
5166
#: bzrlib/commands.py:493
5167
#, python-format
5168
msgid ":Usage: %s\n"
5169
msgstr ":Синтаксис: %s\n"
5170
5171
#: bzrlib/commands.py:512
5172
#, python-format
5173
msgid ":Options:%s"
5174
msgstr ":Опции:%s"
5175
5176
#: bzrlib/commands.py:523
5177
#, python-format
5178
msgid ""
5179
":Description:\n"
5180
" %s\n"
5181
"\n"
5182
msgstr ""
5183
":Описание:\n"
5184
" %s\n"
5185
"\n"
5186
5187
#: bzrlib/commands.py:533
5188
#, python-format
5189
msgid ""
5190
"See bzr help %s for more details and examples.\n"
5191
"\n"
5192
msgstr ""
5193
"Смотрите bzr help %s, чтобы получить подробности и примеры.\n"
5194
"\n"
5195
5196
#: bzrlib/commands.py:538
5197
msgid ":Aliases: "
5198
msgstr ":Псевдонимы: "
5199
5200
#: bzrlib/commands.py:542
5201
#, python-format
5202
msgid ":From: plugin \"%s\"\n"
5203
msgstr ":Из: модуль «%s»\n"
5204
5205
#: bzrlib/commands.py:554
5206
msgid ":doc:`{0} <{1}-help>`"
5207
msgstr ""
5208
5209
#: bzrlib/commands.py:558
5210
#, python-format
5211
msgid ":See also: %s"
5212
msgstr ":Смотрите также: %s"
5213
5214
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
5215
msgid "Only ASCII permitted in option names"
5216
msgstr "В именах опций разрешены только символы ASCII"
5217
5218
#: bzrlib/commands.py:851 bzrlib/commands.py:859
5219
msgid "command {0!r} needs one or more {1}"
5220
msgstr "команде {0!r} требуется один или больше {1}"
5221
5222
#: bzrlib/commands.py:868
5223
msgid "command {0!r} requires argument {1}"
5224
msgstr "команде {0!r} требуется аргумент {1}"
5225
5226
#: bzrlib/commands.py:875
5227
msgid "extra argument to command {0}: {1}"
5228
msgstr "лишний аргумент к команде {0}: {1}"
5229
5230
#: bzrlib/commands.py:972
5231
#, python-format
5232
msgid "Profile data written to \"%s\"."
5233
msgstr "Данные профиля записаны в «%s»."
5234
5235
#: bzrlib/commit.py:117 bzrlib/commit.py:740
5236
msgid "added"
5237
msgstr "добавлены"
5238
5239
#: bzrlib/commit.py:117 bzrlib/commit.py:748
5240
msgid "modified"
5241
msgstr "изменены"
5242
5243
#: bzrlib/commit.py:131
5244
#, python-format
5245
msgid "Committing%s"
5246
msgstr "Закрепление%s"
5247
5248
#: bzrlib/commit.py:134
5249
#, python-format
5250
msgid "Committed revision %d."
5251
msgstr "Закреплена ревизия %d."
5252
5253
#: bzrlib/commit.py:143
5254
#, python-format
5255
msgid "deleted %s"
5256
msgstr "удалён %s"
5257
5258
#: bzrlib/commit.py:146
5259
#, python-format
5260
msgid "missing %s"
5261
msgstr "отсутствует %s"
5262
5263
#: bzrlib/commit.py:511
5264
msgid ""
5265
"Conflicting tags in bound branch:\n"
5266
"{0}"
5267
msgstr ""
5268
5269
#: bzrlib/commit.py:742
5270
msgid "renamed"
5271
msgstr "переименованы"
5272
5273
#: bzrlib/commit.py:976
5274
msgid "unchanged"
5275
msgstr "без изменений"
5276
5277
#: bzrlib/commit.py:998
5278
msgid "{0} [{1}] - Stage"
5279
msgstr ""
5280
5281
#: bzrlib/commit.py:1001
5282
#, python-format
5283
msgid "%s - Stage"
5284
msgstr ""
5285
5286
#: bzrlib/commit_signature_commands.py:34
5287
msgid "Sign all commits by a given committer."
5288
msgstr ""
5289
5290
#: bzrlib/commit_signature_commands.py:36
5291
msgid ""
5292
"If location is not specified the local tree is used.\n"
5293
"If committer is not specified the default committer is used."
5294
msgstr ""
5295
5296
#: bzrlib/commit_signature_commands.py:39
5297
msgid "This does not sign commits that already have signatures."
5298
msgstr ""
5299
5300
#: bzrlib/commit_signature_commands.py:47
5301
msgid ""
5302
"Don't actually sign anything, just print the revisions that would be signed."
5303
msgstr ""
5304
5305
#: bzrlib/commit_signature_commands.py:98
5306
#, python-format
5307
msgid "Signed %d revision.\n"
5308
msgid_plural "Signed %d revisions.\n"
5309
msgstr[0] ""
5310
msgstr[1] ""
5311
5312
#: bzrlib/commit_signature_commands.py:103
5313
msgid "Verify all commit signatures."
5314
msgstr ""
5315
5316
#: bzrlib/commit_signature_commands.py:105
5317
msgid ""
5318
"Verifies that all commits in the branch are signed by known GnuPG keys."
5319
msgstr ""
5320
5321
#: bzrlib/commit_signature_commands.py:110
5322
msgid ""
5323
"Comma separated list of GPG key patterns which are acceptable for "
5324
"verification."
5325
msgstr ""
5326
5327
#: bzrlib/commit_signature_commands.py:148
5328
msgid "Cannot verify a range of non-revision-history revisions"
5329
msgstr ""
5330
5331
#: bzrlib/commit_signature_commands.py:166
5332
msgid "All commits signed with verifiable keys"
5333
msgstr ""
5334
5335
#: bzrlib/config.py:436
5336
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5337
msgstr ""
5338
5339
#: bzrlib/config.py:2452
5340
msgid "{0} is not an SI unit."
5341
msgstr ""
5342
5343
#: bzrlib/config.py:2971
5344
msgid ""
5345
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5346
"will be saved."
5347
msgstr ""
5348
5349
#: bzrlib/config.py:3116
5350
#, python-format
5351
msgid "Invalid '%s', should be of the form 'name=value'"
5352
msgstr ""
5353
5354
#: bzrlib/config.py:4018
5355
msgid "Display, set or remove a configuration option."
5356
msgstr ""
5357
5358
#: bzrlib/config.py:4020
5359
msgid "Display the active value for a given option."
5360
msgstr ""
5361
5362
#: bzrlib/config.py:4022
5363
msgid ""
5364
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5365
"matching options are displayed mentioning their scope. The active value\n"
5366
"that bzr will take into account is the first one displayed for each option."
5367
msgstr ""
5368
5369
#: bzrlib/config.py:4026
5370
msgid "If no NAME is given, --all .* is implied."
5371
msgstr ""
5372
5373
#: bzrlib/config.py:4028
5374
msgid ""
5375
"Setting a value is achieved by using name=value without spaces. The value\n"
5376
"is set in the most relevant scope and can be checked by displaying the\n"
5377
"option again."
5378
msgstr ""
5379
5380
#: bzrlib/config.py:4040
5381
msgid "Reduce the scope to the specified configuration file."
5382
msgstr ""
5383
5384
#: bzrlib/config.py:4044
5385
msgid "Display all the defined values for the matching options."
5386
msgstr ""
5387
5388
#: bzrlib/config.py:4046
5389
msgid "Remove the option from the configuration file."
5390
msgstr ""
5391
5392
#: bzrlib/conflicts.py:50
5393
msgid "List files with conflicts."
5394
msgstr ""
5395
5396
#: bzrlib/conflicts.py:57
5397
msgid ""
5398
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5399
"is supplied, the pathnames of files with text conflicts are listed,\n"
5400
"instead. (This is useful for editing all files with text conflicts.)"
5401
msgstr ""
5402
5403
#: bzrlib/conflicts.py:61
5404
msgid "Use bzr resolve when you have fixed a problem."
5405
msgstr ""
5406
5407
#: bzrlib/conflicts.py:66
5408
msgid "List paths of files with text conflicts."
5409
msgstr ""
5410
5411
#: bzrlib/conflicts.py:85
5412
msgid "Marks the conflict as resolved."
5413
msgstr ""
5414
5415
#: bzrlib/conflicts.py:88
5416
msgid "Resolve the conflict preserving the version in the working tree."
5417
msgstr ""
5418
5419
#: bzrlib/conflicts.py:91
5420
msgid "Resolve the conflict taking the merged version into account."
5421
msgstr ""
5422
5423
#: bzrlib/conflicts.py:98
5424
msgid "How to resolve the conflict."
5425
msgstr ""
5426
5427
#: bzrlib/conflicts.py:104
5428
msgid "Mark a conflict as resolved."
5429
msgstr ""
5430
5431
#: bzrlib/conflicts.py:111
5432
msgid ""
5433
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5434
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5435
"as\n"
5436
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5437
msgstr ""
5438
5439
#: bzrlib/conflicts.py:119
5440
msgid "Resolve all conflicts in this tree."
5441
msgstr ""
5442
5443
#: bzrlib/conflicts.py:126
5444
msgid "If --all is specified, no FILE may be provided"
5445
msgstr ""
5446
5447
#: bzrlib/conflicts.py:151
5448
#, python-format
5449
msgid "%d conflict auto-resolved."
5450
msgid_plural "%d conflicts auto-resolved."
5451
msgstr[0] ""
5452
msgstr[1] ""
5453
5454
#: bzrlib/conflicts.py:154
5455
msgid "Remaining conflicts:"
5456
msgstr ""
5457
5458
#: bzrlib/conflicts.py:159
5459
msgid "All conflicts resolved."
5460
msgstr ""
5461
5462
#: bzrlib/conflicts.py:168
5463
msgid "{0} conflict resolved, {1} remaining"
5464
msgid_plural "{0} conflicts resolved, {1} remaining"
5465
msgstr[0] ""
5466
msgstr[1] ""
5467
5468
#: bzrlib/controldir.py:712
5469
msgid "{0} is{1} redirected to {2}"
5470
msgstr ""
5471
5472
#: bzrlib/diff.py:399
5473
#, python-format
5474
msgid "*** Ignoring files outside view. View is %s"
5475
msgstr ""
5476
5477
#: bzrlib/errors.py:157
5478
msgid "The tree builder is already building a tree."
5479
msgstr ""
5480
5481
#: bzrlib/errors.py:178
5482
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5483
msgstr ""
5484
5485
#: bzrlib/errors.py:197
5486
msgid ""
5487
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5488
"versions \"%(minimum)s\" to \"%(current)s\"."
5489
msgstr ""
5490
5491
#: bzrlib/errors.py:209
5492
msgid "The transport '%(transport)s' is only accessible within this process."
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:227
5496
msgid "Invalid revision number %(revno)s"
5497
msgstr ""
5498
5499
#: bzrlib/errors.py:236
5500
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5501
msgstr ""
5502
5503
#: bzrlib/errors.py:247
5504
msgid "Reserved revision-id {%(revision_id)s}"
5505
msgstr ""
5506
5507
#: bzrlib/errors.py:261
5508
msgid "There is no public branch set for \"%(branch_url)s\"."
5509
msgstr ""
5510
5511
#: bzrlib/errors.py:271
5512
msgid ""
5513
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5514
"obtain a list of topics."
5515
msgstr ""
5516
5517
#: bzrlib/errors.py:280
5518
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5519
msgstr ""
5520
5521
#: bzrlib/errors.py:290
5522
msgid ""
5523
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5524
msgstr ""
5525
5526
#: bzrlib/errors.py:299
5527
msgid "The branch '%(branch)s' is not stacked."
5528
msgstr ""
5529
5530
#: bzrlib/errors.py:313
5531
msgid "No WorkingTree exists for \"%(base)s\"."
5532
msgstr ""
5533
5534
#: bzrlib/errors.py:322
5535
msgid "Not currently building a tree."
5536
msgstr ""
5537
5538
#: bzrlib/errors.py:327
5539
msgid "%(url)s is not a local path."
5540
msgstr ""
5541
5542
#: bzrlib/errors.py:355
5543
msgid "%(not_locked)r is not write locked but needs to be."
5544
msgstr ""
5545
5546
#: bzrlib/errors.py:363
5547
msgid "Error in command line options"
5548
msgstr ""
5549
5550
#: bzrlib/errors.py:368
5551
msgid "%(value)s is not an index of type %(_type)s."
5552
msgstr ""
5553
5554
#: bzrlib/errors.py:378
5555
msgid "Error in data for index %(value)s."
5556
msgstr ""
5557
5558
#: bzrlib/errors.py:387
5559
msgid "The key '%(key)s' is already in index '%(index)s'."
5560
msgstr ""
5561
5562
#: bzrlib/errors.py:397
5563
msgid "The key '%(key)s' is not a valid key."
5564
msgstr ""
5565
5566
#: bzrlib/errors.py:406
5567
msgid "Could not parse options for index %(value)s."
5568
msgstr ""
5569
5570
#: bzrlib/errors.py:415
5571
msgid "The value '%(value)s' is not a valid value."
5572
msgstr ""
5573
5574
#: bzrlib/errors.py:424
5575
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5576
msgstr ""
5577
5578
#: bzrlib/errors.py:443
5579
msgid "Generic path error: %(path)r%(extra)s)"
5580
msgstr ""
5581
5582
#: bzrlib/errors.py:456
5583
msgid "No such file: %(path)r%(extra)s"
5584
msgstr ""
5585
5586
#: bzrlib/errors.py:461
5587
msgid "File exists: %(path)r%(extra)s"
5588
msgstr ""
5589
5590
#: bzrlib/errors.py:467
5591
msgid ""
5592
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5593
"after to tell bzr about a rename that has already happened)%(extra)s"
5594
msgstr ""
5595
5596
#: bzrlib/errors.py:483
5597
msgid "\"%(path)s\" is not a directory %(extra)s"
5598
msgstr ""
5599
5600
#: bzrlib/errors.py:488
5601
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5602
msgstr ""
5603
5604
#: bzrlib/errors.py:493
5605
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5606
msgstr ""
5607
5608
#: bzrlib/errors.py:498
5609
msgid "Hard-linking \"%(path)s\" is not supported"
5610
msgstr ""
5611
5612
#: bzrlib/errors.py:513
5613
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5614
msgstr ""
5615
5616
#: bzrlib/errors.py:518
5617
msgid "Permission denied: \"%(path)s\"%(extra)s"
5618
msgstr ""
5619
5620
#: bzrlib/errors.py:523
5621
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5622
msgstr ""
5623
5624
#: bzrlib/errors.py:528
5625
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5626
msgstr ""
5627
5628
#: bzrlib/errors.py:539
5629
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5630
msgstr ""
5631
5632
#: bzrlib/errors.py:561
5633
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5634
msgstr ""
5635
5636
#: bzrlib/errors.py:571
5637
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5638
msgstr ""
5639
5640
#: bzrlib/errors.py:579
5641
msgid ""
5642
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5643
"upgrade the branch to permit branch stacking."
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:590
5647
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:600
5651
msgid ""
5652
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5653
"need to upgrade the repository to permit branch stacking."
5654
msgstr ""
5655
5656
#: bzrlib/errors.py:611
5657
msgid "Error reading from %(path)r."
5658
msgstr ""
5659
5660
#: bzrlib/errors.py:630
5661
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5662
msgstr ""
5663
5664
#: bzrlib/errors.py:646
5665
msgid "Path \"%(path)s\" is not unicode normalized"
5666
msgstr ""
5667
5668
#: bzrlib/errors.py:654
5669
msgid "Not a branch: \"%(path)s\"%(detail)s."
5670
msgstr ""
5671
5672
#: bzrlib/errors.py:696
5673
msgid "No submit branch available for branch \"%(path)s\""
5674
msgstr ""
5675
5676
#: bzrlib/errors.py:705
5677
msgid "A control directory already exists: \"%(path)s\"."
5678
msgstr ""
5679
5680
#: bzrlib/errors.py:710
5681
msgid "Already a branch: \"%(path)s\"."
5682
msgstr ""
5683
5684
#: bzrlib/errors.py:715
5685
msgid "Invalid branch name: %(name)s"
5686
msgstr ""
5687
5688
#: bzrlib/errors.py:724
5689
msgid "Parent branch already exists: \"%(path)s\"."
5690
msgstr ""
5691
5692
#: bzrlib/errors.py:730
5693
msgid ""
5694
"Directory contains a branch, but no working tree (use bzr checkout if you "
5695
"wish to build a working tree): \"%(path)s\""
5696
msgstr ""
5697
5698
#: bzrlib/errors.py:735
5699
msgid ""
5700
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5701
msgstr ""
5702
5703
#: bzrlib/errors.py:745
5704
msgid ""
5705
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5706
msgstr ""
5707
5708
#: bzrlib/errors.py:755
5709
msgid "No repository present: \"%(path)s\""
5710
msgstr ""
5711
5712
#: bzrlib/errors.py:762
5713
msgid ""
5714
"Unsupported branch format: %(format)s\n"
5715
"Please run 'bzr upgrade'"
5716
msgstr ""
5717
5718
#: bzrlib/errors.py:768
5719
msgid "Unknown %(kind)s format: %(format)r"
5720
msgstr ""
5721
5722
#: bzrlib/errors.py:777
5723
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5724
msgstr ""
5725
5726
#: bzrlib/errors.py:787
5727
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5728
msgstr ""
5729
5730
#: bzrlib/errors.py:802
5731
msgid ""
5732
"%(target)s\n"
5733
"is not compatible with\n"
5734
"%(source)s\n"
5735
"%(details)s"
5736
msgstr ""
5737
5738
#: bzrlib/errors.py:818
5739
msgid "Revision is not compatible with %(repo_format)s"
5740
msgstr ""
5741
5742
#: bzrlib/errors.py:828
5743
msgid "%(context_info)s%(path)s is already versioned."
5744
msgstr ""
5745
5746
#: bzrlib/errors.py:849
5747
msgid "%(context_info)s%(path)s is not versioned."
5748
msgstr ""
5749
5750
#: bzrlib/errors.py:870
5751
msgid "Path(s) are not versioned: %(paths_as_string)s"
5752
msgstr ""
5753
5754
#: bzrlib/errors.py:881
5755
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5756
msgstr ""
5757
5758
#: bzrlib/errors.py:900
5759
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5760
msgstr ""
5761
5762
#: bzrlib/errors.py:908
5763
msgid ""
5764
"Filename %(filename)r is not valid in your current filesystem encoding "
5765
"%(fs_encoding)s"
5766
msgstr ""
5767
5768
#: bzrlib/errors.py:919
5769
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5770
msgstr ""
5771
5772
#: bzrlib/errors.py:937
5773
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5774
msgstr ""
5775
5776
#: bzrlib/errors.py:976
5777
msgid "Cannot lock %(lock)s: %(why)s"
5778
msgstr ""
5779
5780
#: bzrlib/errors.py:986
5781
msgid ""
5782
"A transaction related operation was attempted after the transaction finished."
5783
msgstr ""
5784
5785
#: bzrlib/errors.py:1013
5786
msgid "Cannot lock: transport is read only: %(transport)s"
5787
msgstr ""
5788
5789
#: bzrlib/errors.py:1021
5790
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5791
msgstr ""
5792
5793
#: bzrlib/errors.py:1032
5794
msgid ""
5795
"Lock was broken while still open: %(lock)s - check storage consistency!"
5796
msgstr ""
5797
5798
#: bzrlib/errors.py:1043
5799
msgid ""
5800
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5801
"%(holder)r, wanted to break %(target)r"
5802
msgstr ""
5803
5804
#: bzrlib/errors.py:1055
5805
msgid ""
5806
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5807
"Use 'bzr break-lock' to clear it"
5808
msgstr ""
5809
5810
#: bzrlib/errors.py:1068
5811
msgid "Lock not held: %(lock)s"
5812
msgstr ""
5813
5814
#: bzrlib/errors.py:1097
5815
msgid "No changes to commit"
5816
msgstr ""
5817
5818
#: bzrlib/errors.py:1102
5819
msgid ""
5820
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5821
msgstr ""
5822
5823
#: bzrlib/errors.py:1112
5824
msgid ""
5825
"Excluding paths during commit is not supported by repository at "
5826
"%(repository)r."
5827
msgstr ""
5828
5829
#: bzrlib/errors.py:1121
5830
msgid ""
5831
"The specified commit message contains characters unsupported by the current "
5832
"encoding."
5833
msgstr ""
5834
5835
#: bzrlib/errors.py:1127
5836
msgid "Upgrade URL cannot work with readonly URLs."
5837
msgstr ""
5838
5839
#: bzrlib/errors.py:1132
5840
msgid "The branch format %(format)s is already at the most recent format."
5841
msgstr ""
5842
5843
#: bzrlib/errors.py:1155
5844
msgid "Option --change does not accept revision ranges"
5845
msgstr ""
5846
5847
#: bzrlib/errors.py:1160
5848
msgid "No namespace registered for string: %(spec)r"
5849
msgstr ""
5850
5851
#: bzrlib/errors.py:1179
5852
msgid ""
5853
"Requested revision: '%(spec)s' does not exist in branch: "
5854
"%(branch_url)s%(extra)s"
5855
msgstr ""
5856
5857
#: bzrlib/errors.py:1193
5858
msgid ""
5859
"Operation denied because it would change the main history, which is not "
5860
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5861
msgstr ""
5862
5863
#: bzrlib/errors.py:1204
5864
msgid ""
5865
"These branches have diverged. Use the missing command to see how.\n"
5866
"Use the merge command to reconcile them."
5867
msgstr ""
5868
5869
#: bzrlib/errors.py:1224
5870
msgid ""
5871
"Branches have no common ancestor, and no merge base revision was specified."
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:1230
5875
msgid ""
5876
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5877
msgstr ""
5878
5879
#: bzrlib/errors.py:1236
5880
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5881
msgstr ""
5882
5883
#: bzrlib/errors.py:1245
5884
msgid ""
5885
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5886
msgstr ""
5887
5888
#: bzrlib/errors.py:1254
5889
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5890
msgstr ""
5891
5892
#: bzrlib/errors.py:1263
5893
msgid "Branch %(branch)s has no commits."
5894
msgstr ""
5895
5896
#: bzrlib/errors.py:1281
5897
msgid ""
5898
"Bound branch %(branch)s is out of date with master branch "
5899
"%(master)s.%(extra_help)s"
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:1293
5903
msgid ""
5904
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5905
"bound to %(remote)s."
5906
msgstr ""
5907
5908
#: bzrlib/errors.py:1305
5909
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5910
msgstr ""
5911
5912
#: bzrlib/errors.py:1314
5913
msgid ""
5914
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5915
"%(error)s"
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:1326
5919
msgid "Error in processing weave: %(msg)s"
5920
msgstr ""
5921
5922
#: bzrlib/errors.py:1335
5923
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5924
msgstr ""
5925
5926
#: bzrlib/errors.py:1346
5927
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5928
msgstr ""
5929
5930
#: bzrlib/errors.py:1356
5931
msgid "Weave invariant violated: %(what)s"
5932
msgstr ""
5933
5934
#: bzrlib/errors.py:1365
5935
msgid "Parents are mismatched between two revisions. %(msg)s"
5936
msgstr ""
5937
5938
#: bzrlib/errors.py:1387
5939
msgid ""
5940
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5941
"%(weave_b)s"
5942
msgstr ""
5943
5944
#: bzrlib/errors.py:1399
5945
msgid "Versioned file error"
5946
msgstr ""
5947
5948
#: bzrlib/errors.py:1404
5949
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5950
msgstr ""
5951
5952
#: bzrlib/errors.py:1414
5953
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5954
msgstr ""
5955
5956
#: bzrlib/errors.py:1424
5957
msgid "Text did not match its checksum: %(msg)s"
5958
msgstr ""
5959
5960
#: bzrlib/errors.py:1550
5961
msgid "Export format %(format)r not supported"
5962
msgstr ""
5963
5964
#: bzrlib/errors.py:1559
5965
msgid "Transport error: %(msg)s %(orig_error)s"
5966
msgstr ""
5967
5968
#: bzrlib/errors.py:1585
5969
msgid "Generic bzr smart protocol error: %(details)s"
5970
msgstr ""
5971
5972
#: bzrlib/errors.py:1593
5973
msgid "Received bad protocol version marker: %(marker)r"
5974
msgstr ""
5975
5976
#: bzrlib/errors.py:1625
5977
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5978
msgstr ""
5979
5980
#: bzrlib/errors.py:1630
5981
msgid "Connection error: %(msg)s %(orig_error)s"
5982
msgstr ""
5983
5984
#: bzrlib/errors.py:1635
5985
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5986
msgstr ""
5987
5988
#: bzrlib/errors.py:1656
5989
msgid "Connection closed: %(msg)s %(orig_error)s"
5990
msgstr ""
5991
5992
#: bzrlib/errors.py:1661
5993
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5994
msgstr ""
5995
5996
#: bzrlib/errors.py:1666
5997
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5998
msgstr ""
5999
6000
#: bzrlib/errors.py:1676
6001
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
6002
msgstr ""
6003
6004
#: bzrlib/errors.py:1691
6005
msgid "Certificate error: %(error)s"
6006
msgstr ""
6007
6008
#: bzrlib/errors.py:1699
6009
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
6010
msgstr ""
6011
6012
#: bzrlib/errors.py:1713
6013
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
6014
msgstr ""
6015
6016
#: bzrlib/errors.py:1721
6017
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
6018
msgstr ""
6019
6020
#: bzrlib/errors.py:1730
6021
msgid "%(source)s is%(permanently)s redirected to %(target)s"
6022
msgstr ""
6023
6024
#: bzrlib/errors.py:1744
6025
msgid "Too many redirections"
6026
msgstr ""
6027
6028
#: bzrlib/errors.py:1749
6029
msgid "Working tree has conflicts."
6030
msgstr ""
6031
6032
#: bzrlib/errors.py:1753
6033
msgid "Config file %(filename)s is not UTF-8 encoded\n"
6034
msgstr ""
6035
6036
#: bzrlib/errors.py:1762
6037
msgid ""
6038
"Error(s) parsing config file %(filename)s:\n"
6039
"%(errors)s"
6040
msgstr ""
6041
6042
#: bzrlib/errors.py:1772
6043
msgid ""
6044
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6045
"See ``bzr help %(name)s``"
6046
msgstr ""
6047
6048
#: bzrlib/errors.py:1782
6049
msgid "%(username)r does not seem to contain a reasonable email address"
6050
msgstr ""
6051
6052
#: bzrlib/errors.py:1791
6053
msgid "Failed to GPG sign data with command \"%(command_line)s\""
6054
msgstr ""
6055
6056
#: bzrlib/errors.py:1799
6057
msgid "Failed to verify GPG signature data with error \"%(error)s\""
6058
msgstr "Не удалось верифицировать подпись GPG с ошибкой «%(error)s»"
6059
6060
#: bzrlib/errors.py:1807
6061
msgid "Unable to import library \"%(library)s\": %(error)s"
6062
msgstr "Не удалось импортировать библиотеку «%(library)s»: %(error)s"
6063
6064
#: bzrlib/errors.py:1815
6065
msgid "python-gpgme is not installed, it is needed to verify signatures"
6066
msgstr "python-gpgme не устонвлен, он нужен для верификации подписей"
6067
6068
#: bzrlib/errors.py:1823
6069
msgid ""
6070
"The working tree for %(basedir)s has changed since the last commit, but "
6071
"weave merge requires that it be unchanged"
6072
msgstr ""
6073
"Рабочее дерево для %(basedir)s изменилось с последнего закрепления, но merge "
6074
"требует, чтобы оно не содержало изменений"
6075
6076
#: bzrlib/errors.py:1833
6077
msgid ""
6078
"Can't reprocess and show base, because reprocessing obscures the "
6079
"relationship of conflicting lines to the base"
6080
msgstr ""
6081
6082
#: bzrlib/errors.py:1839
6083
msgid "Cycle in graph %(graph)r"
6084
msgstr "Цикл в графе %(graph)r"
6085
6086
#: bzrlib/errors.py:1867
6087
msgid "File %(filename)s is not conflicted."
6088
msgstr "Файл %(filename)s не содержит конфликтов."
6089
6090
#: bzrlib/errors.py:1889
6091
msgid "No bundle was found in \"%(filename)s\"."
6092
msgstr "В файле «%(filename)s» нет пакета."
6093
6094
#: bzrlib/errors.py:1898
6095
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6096
msgstr "Не удалось обработать версию пакета %(version)s: %(msg)s"
6097
6098
#: bzrlib/errors.py:1908
6099
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6100
msgstr ""
6101
"В ветви %(base)s отсутствует ревизия %(text_revision)s файла %(file_id)s"
6102
6103
#: bzrlib/errors.py:1921
6104
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6105
msgstr ""
6106
"Идентификатор файла {%(file_id)s} уже присутствует в инвентаре как %(entry)s"
6107
6108
#: bzrlib/errors.py:1931
6109
msgid "Key %(key)s is already present in map"
6110
msgstr ""
6111
6112
#: bzrlib/errors.py:1936
6113
msgid "The prefix %(prefix)s is in the help search path twice."
6114
msgstr ""
6115
6116
#: bzrlib/errors.py:1946
6117
msgid ""
6118
"No final name for trans_id %(trans_id)r\n"
6119
"file-id: %(file_id)r\n"
6120
"root trans-id: %(root_trans_id)r\n"
6121
msgstr ""
6122
6123
#: bzrlib/errors.py:1978
6124
msgid "Attempt to reuse a transform that has already been applied."
6125
msgstr ""
6126
6127
#: bzrlib/errors.py:1983
6128
msgid "Moving the root directory is not supported at this time"
6129
msgstr "Перемещение в корневую директорию пока не поддерживается"
6130
6131
#: bzrlib/errors.py:1988
6132
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6133
msgstr "Не удалось переименовать %(from_path)s в %(to_path)s: %(why)s"
6134
6135
#: bzrlib/errors.py:1999
6136
msgid ""
6137
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6138
msgstr ""
6139
"Не удалось переместить %(from_path)s%(operator)s "
6140
"%(to_path)s%(_has_extra)s%(extra)s"
6141
6142
#: bzrlib/errors.py:2035
6143
msgid ""
6144
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6145
msgstr ""
6146
"Не удалось переименовать %(from_path)s%(operator)s "
6147
"%(to_path)s%(_has_extra)s%(extra)s"
6148
6149
#: bzrlib/errors.py:2065
6150
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6151
msgstr ""
6152
6153
#: bzrlib/errors.py:2073
6154
msgid "Nothing to merge."
6155
msgstr "Нечего совмещать."
6156
6157
#: bzrlib/errors.py:2078
6158
msgid "Format %(format)s cannot be initialised by this version of bzr."
6159
msgstr ""
6160
6161
#: bzrlib/errors.py:2087
6162
msgid ""
6163
"Cannot convert from format %(from_format)s to format %(format)s. "
6164
"%(problem)s"
6165
msgstr ""
6166
6167
#: bzrlib/errors.py:2099
6168
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6169
msgstr ""
6170
6171
#: bzrlib/errors.py:2107
6172
msgid "%(exe_name)s could not be found on this machine"
6173
msgstr ""
6174
6175
#: bzrlib/errors.py:2115
6176
msgid "Diff is not installed on this machine: %(msg)s"
6177
msgstr ""
6178
6179
#: bzrlib/errors.py:2123
6180
msgid "Diff3 is not installed on this machine."
6181
msgstr "Diff3 не установлен на этой машине."
6182
6183
#: bzrlib/errors.py:2129
6184
msgid "The content being inserted is already present."
6185
msgstr ""
6186
6187
#: bzrlib/errors.py:2134
6188
msgid ""
6189
"This tree contains left-over files from a failed operation.\n"
6190
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6191
"to\n"
6192
" keep, and delete it when you are done."
6193
msgstr ""
6194
6195
#: bzrlib/errors.py:2145
6196
msgid ""
6197
"This tree contains left-over files from a failed operation.\n"
6198
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6199
" wish to keep, and delete it when you are done."
6200
msgstr ""
6201
6202
#: bzrlib/errors.py:2155
6203
msgid ""
6204
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6205
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6206
"to\n"
6207
" keep, and delete it when you are done."
6208
msgstr ""
6209
6210
#: bzrlib/errors.py:2166
6211
msgid ""
6212
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6213
"examine %(pending_deletion)s to see if it contains any files you wish to "
6214
"keep, and delete it when you are done."
6215
msgstr ""
6216
6217
#: bzrlib/errors.py:2176
6218
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6219
msgstr ""
6220
6221
#: bzrlib/errors.py:2190
6222
msgid ""
6223
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6224
msgstr ""
6225
6226
#: bzrlib/errors.py:2203
6227
msgid "Error in merge modified format"
6228
msgstr ""
6229
6230
#: bzrlib/errors.py:2208
6231
msgid "Format error in conflict listings"
6232
msgstr ""
6233
6234
#: bzrlib/errors.py:2212
6235
msgid ""
6236
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6237
"Error: %(description)s"
6238
msgstr ""
6239
6240
#: bzrlib/errors.py:2223
6241
msgid ""
6242
"An error has been detected in the repository %(repo_path)s.\n"
6243
"Please run bzr reconcile on this repository."
6244
msgstr ""
6245
6246
#: bzrlib/errors.py:2234
6247
msgid ""
6248
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6249
"reason: %(reason)s"
6250
msgstr ""
6251
6252
#: bzrlib/errors.py:2247
6253
msgid ""
6254
"An inconsistent delta was supplied: %(delta)r\n"
6255
"reason: %(reason)s"
6256
msgstr ""
6257
6258
#: bzrlib/errors.py:2259
6259
msgid "To use this feature you must upgrade your branch at %(path)s."
6260
msgstr ""
6261
6262
#: bzrlib/errors.py:2268
6263
msgid "To use this feature you must upgrade your repository at %(path)s."
6264
msgstr ""
6265
6266
#: bzrlib/errors.py:2273
6267
msgid ""
6268
"To use this feature you must upgrade your branch at %(path)s to a format "
6269
"which supports rich roots."
6270
msgstr ""
6271
6272
#: bzrlib/errors.py:2279
6273
msgid "Cannot perform local-only commits on unbound branches."
6274
msgstr ""
6275
6276
#: bzrlib/errors.py:2284
6277
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6278
msgstr ""
6279
6280
#: bzrlib/errors.py:2305
6281
msgid "Ghost tags not supported by format %(format)r."
6282
msgstr ""
6283
6284
#: bzrlib/errors.py:2313
6285
msgid "File is binary but should be text."
6286
msgstr ""
6287
6288
#: bzrlib/errors.py:2318
6289
msgid "The path %(path)s is not permitted on this platform"
6290
msgstr ""
6291
6292
#: bzrlib/errors.py:2327
6293
msgid ""
6294
"Testament did not match expected value.\n"
6295
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6296
" {%(measured)s}"
6297
msgstr ""
6298
6299
#: bzrlib/errors.py:2339
6300
msgid "Not a bzr revision-bundle: %(text)r"
6301
msgstr ""
6302
6303
#: bzrlib/errors.py:2348
6304
msgid "Bad bzr revision-bundle: %(text)r"
6305
msgstr ""
6306
6307
#: bzrlib/errors.py:2357
6308
msgid "Malformed bzr revision-bundle header: %(text)r"
6309
msgstr ""
6310
6311
#: bzrlib/errors.py:2362
6312
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6313
msgstr ""
6314
6315
#: bzrlib/errors.py:2367
6316
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6317
msgstr ""
6318
6319
#: bzrlib/errors.py:2372
6320
msgid "End of line marker was not \\n in bzr revision-bundle"
6321
msgstr ""
6322
6323
#: bzrlib/errors.py:2382
6324
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6325
msgstr ""
6326
6327
#: bzrlib/errors.py:2392
6328
msgid "Root class for inventory serialization errors"
6329
msgstr ""
6330
6331
#: bzrlib/errors.py:2396
6332
msgid ""
6333
"The inventory was not in the expected format:\n"
6334
" %(msg)s"
6335
msgstr ""
6336
6337
#: bzrlib/errors.py:2405
6338
msgid "This operation requires rich root data storage"
6339
msgstr ""
6340
6341
#: bzrlib/errors.py:2418
6342
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6343
msgstr ""
6344
6345
#: bzrlib/errors.py:2427
6346
msgid ""
6347
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6348
"variable."
6349
msgstr ""
6350
6351
#: bzrlib/errors.py:2434
6352
msgid ""
6353
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6354
"ghost at {%(ghost_revision_id)s}"
6355
msgstr ""
6356
6357
#: bzrlib/errors.py:2444
6358
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6359
msgstr ""
6360
6361
#: bzrlib/errors.py:2495
6362
msgid ""
6363
"A merge directive must provide either a bundle or a public branch location."
6364
msgstr ""
6365
6366
#: bzrlib/errors.py:2502
6367
msgid "Bad merge directive payload %(start)r"
6368
msgstr ""
6369
6370
#: bzrlib/errors.py:2512
6371
msgid "Preview patch does not match requested changes."
6372
msgstr ""
6373
6374
#: bzrlib/errors.py:2518
6375
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6376
msgstr ""
6377
6378
#: bzrlib/errors.py:2528
6379
msgid ""
6380
"Your branch does not have all of the revisions required in order to merge "
6381
"this merge directive and the target location specified in the merge "
6382
"directive is not a branch: %(location)s."
6383
msgstr ""
6384
6385
#: bzrlib/errors.py:2540
6386
msgid "Unsupported entry kind %(kind)s"
6387
msgstr ""
6388
6389
#: bzrlib/errors.py:2548
6390
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6391
msgstr ""
6392
6393
#: bzrlib/errors.py:2558
6394
msgid "Subsume target %(other_tree)s needs to be upgraded."
6395
msgstr ""
6396
6397
#: bzrlib/errors.py:2577
6398
msgid "No such tag: %(tag_name)s"
6399
msgstr ""
6400
6401
#: bzrlib/errors.py:2585
6402
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6403
msgstr ""
6404
6405
#: bzrlib/errors.py:2594
6406
msgid "Tag %(tag_name)s already exists."
6407
msgstr ""
6408
6409
#: bzrlib/errors.py:2602
6410
msgid ""
6411
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6412
"bugs\" for more information on this feature."
6413
msgstr ""
6414
6415
#: bzrlib/errors.py:2612
6416
msgid ""
6417
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6418
msgstr ""
6419
6420
#: bzrlib/errors.py:2622
6421
msgid ""
6422
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6423
msgstr ""
6424
6425
#: bzrlib/errors.py:2632
6426
msgid "Invalid line in bugs property: '%(line)s'"
6427
msgstr ""
6428
6429
#: bzrlib/errors.py:2640
6430
msgid "Invalid bug status: '%(status)s'"
6431
msgstr ""
6432
6433
#: bzrlib/errors.py:2648
6434
msgid "Could not understand response from smart server: %(response_tuple)r"
6435
msgstr ""
6436
6437
#: bzrlib/errors.py:2687
6438
msgid "Server sent an unexpected error: %(error_tuple)r"
6439
msgstr ""
6440
6441
#: bzrlib/errors.py:2706
6442
msgid "Unrecognised container format: %(container_format)r"
6443
msgstr ""
6444
6445
#: bzrlib/errors.py:2714
6446
msgid "Unexpected end of container stream"
6447
msgstr ""
6448
6449
#: bzrlib/errors.py:2719
6450
msgid "Unknown record type: %(record_type)r"
6451
msgstr ""
6452
6453
#: bzrlib/errors.py:2727
6454
msgid "Invalid record: %(reason)s"
6455
msgstr ""
6456
6457
#: bzrlib/errors.py:2735
6458
msgid "Container has data after end marker: %(excess)r"
6459
msgstr ""
6460
6461
#: bzrlib/errors.py:2743
6462
msgid "Container has multiple records with the same name: %(name)s"
6463
msgstr ""
6464
6465
#: bzrlib/errors.py:2756
6466
msgid "Corrupt or incompatible data stream: %(reason)s"
6467
msgstr ""
6468
6469
#: bzrlib/errors.py:2764
6470
msgid "SMTP error: %(error)s"
6471
msgstr ""
6472
6473
#: bzrlib/errors.py:2772
6474
msgid "No message supplied."
6475
msgstr ""
6476
6477
#: bzrlib/errors.py:2777
6478
msgid "No mail-to address (--mail-to) or output (-o) specified."
6479
msgstr ""
6480
6481
#: bzrlib/errors.py:2782
6482
msgid ""
6483
"Unable to find mail client with the following names: "
6484
"%(mail_command_list_string)s"
6485
msgstr ""
6486
6487
#: bzrlib/errors.py:2792
6488
msgid "SMTP connection to %(host)s refused"
6489
msgstr ""
6490
6491
#: bzrlib/errors.py:2801
6492
msgid "Please specify smtp_server. No server at default %(host)s."
6493
msgstr ""
6494
6495
#: bzrlib/errors.py:2815
6496
msgid ""
6497
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6498
"reconfigure."
6499
msgstr ""
6500
6501
#: bzrlib/errors.py:2827
6502
msgid "'%(display_url)s' is already a branch."
6503
msgstr ""
6504
6505
#: bzrlib/errors.py:2832
6506
msgid "'%(display_url)s' is already a tree."
6507
msgstr ""
6508
6509
#: bzrlib/errors.py:2837
6510
msgid "'%(display_url)s' is already a checkout."
6511
msgstr ""
6512
6513
#: bzrlib/errors.py:2842
6514
msgid "'%(display_url)s' is already a lightweight checkout."
6515
msgstr ""
6516
6517
#: bzrlib/errors.py:2847
6518
msgid "'%(display_url)s' is already using a shared repository."
6519
msgstr ""
6520
6521
#: bzrlib/errors.py:2852
6522
msgid "'%(display_url)s' is already standalone."
6523
msgstr ""
6524
6525
#: bzrlib/errors.py:2857
6526
msgid "Shared repository '%(display_url)s' already creates working trees."
6527
msgstr ""
6528
6529
#: bzrlib/errors.py:2863
6530
msgid ""
6531
"Shared repository '%(display_url)s' already doesn't create working trees."
6532
msgstr ""
6533
6534
#: bzrlib/errors.py:2869
6535
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6536
msgstr ""
6537
6538
#: bzrlib/errors.py:2874
6539
msgid "No location could be found to bind to at %(display_url)s."
6540
msgstr ""
6541
6542
#: bzrlib/errors.py:2879
6543
msgid ""
6544
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6545
"status).%(more)s"
6546
msgstr ""
6547
6548
#: bzrlib/errors.py:2898
6549
msgid ""
6550
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6551
"list).%(more)s"
6552
msgstr ""
6553
6554
#: bzrlib/errors.py:2904
6555
msgid "Variable {%(name)s} is not available."
6556
msgstr ""
6557
6558
#: bzrlib/errors.py:2912
6559
msgid "No template specified."
6560
msgstr ""
6561
6562
#: bzrlib/errors.py:2917
6563
msgid "Unable to create symlink %(path_str)son this platform"
6564
msgstr ""
6565
6566
#: bzrlib/errors.py:2932
6567
msgid ""
6568
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6569
"\"original\", \"local\"."
6570
msgstr ""
6571
6572
#: bzrlib/errors.py:2966
6573
msgid ""
6574
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6575
msgstr ""
6576
6577
#: bzrlib/errors.py:2978
6578
msgid "The \"%(config_id)s\" configuration does not exist."
6579
msgstr ""
6580
6581
#: bzrlib/errors.py:2986
6582
msgid "The \"%(option_name)s\" configuration option does not exist."
6583
msgstr ""
6584
6585
#: bzrlib/errors.py:2994
6586
msgid "The alias \"%(alias_name)s\" does not exist."
6587
msgstr ""
6588
6589
#: bzrlib/errors.py:3008
6590
msgid "\"%(alias_name)s\" is not a valid location alias."
6591
msgstr ""
6592
6593
#: bzrlib/errors.py:3016
6594
msgid "No %(alias_name)s location assigned."
6595
msgstr ""
6596
6597
#: bzrlib/errors.py:3024
6598
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6599
msgstr ""
6600
6601
#: bzrlib/errors.py:3034
6602
msgid "Unknown rules detected: %(unknowns_str)s."
6603
msgstr ""
6604
6605
#: bzrlib/errors.py:3045
6606
msgid "Tip change rejected: %(msg)s"
6607
msgstr ""
6608
6609
#: bzrlib/errors.py:3053
6610
msgid "Shelf corrupt."
6611
msgstr ""
6612
6613
#: bzrlib/errors.py:3058
6614
msgid "Corruption while decompressing repository file%(orig_error)s"
6615
msgstr ""
6616
6617
#: bzrlib/errors.py:3070
6618
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6619
msgstr ""
6620
6621
#: bzrlib/errors.py:3078
6622
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6623
msgstr ""
6624
6625
#: bzrlib/errors.py:3086
6626
msgid ""
6627
"An attempt to access a url outside the server jail was made: '%(url)s'."
6628
msgstr ""
6629
6630
#: bzrlib/errors.py:3094
6631
msgid "The user aborted the operation."
6632
msgstr ""
6633
6634
#: bzrlib/errors.py:3099
6635
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6636
msgstr ""
6637
6638
#: bzrlib/errors.py:3109
6639
msgid "No such view: %(view_name)s."
6640
msgstr ""
6641
6642
#: bzrlib/errors.py:3119
6643
msgid ""
6644
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6645
"to a later format."
6646
msgstr ""
6647
6648
#: bzrlib/errors.py:3128
6649
msgid ""
6650
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6651
msgstr ""
6652
6653
#: bzrlib/errors.py:3195
6654
msgid "%(bzrdir)r does not support co-located branches."
6655
msgstr ""
6656
6657
#: bzrlib/errors.py:3201
6658
msgid ""
6659
"Unable to determine your name.\n"
6660
"Please, set your name with the 'whoami' command.\n"
6661
"E.g. bzr whoami \"Your Name <name@example.com>\""
6662
msgstr ""
6663
6664
#: bzrlib/errors.py:3210
6665
msgid "Invalid pattern(s) found. %(msg)s"
6666
msgstr ""
6667
6668
#: bzrlib/errors.py:3218
6669
msgid ""
6670
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6671
"unbind` to fix."
6672
msgstr ""
6673
6674
#: bzrlib/errors.py:3229
6675
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6676
msgstr ""
6677
6678
#: bzrlib/errors.py:3238
6679
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6680
msgstr ""
6681
6682
#: bzrlib/errors.py:3247
6683
msgid ""
6684
"No compatible object available for operations from %(source)r to %(target)r."
6685
msgstr ""
6686
6687
#: bzrlib/errors.py:3257
6688
msgid ""
6689
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6690
"%(arguments)s."
6691
msgstr ""
6692
6693
#: bzrlib/errors.py:3267
6694
msgid ""
6695
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6696
"format %(format)r"
6697
msgstr ""
6698
6699
#: bzrlib/errors.py:3279
6700
msgid ""
6701
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6702
"plugin."
6703
msgstr ""
6704
6705
#: bzrlib/errors.py:3292
6706
msgid "Binary files section encountered."
6707
msgstr ""
6708
6709
#: bzrlib/errors.py:3300
6710
msgid ""
6711
"Malformed patch header. %(desc)s\n"
6712
"%(line)r"
6713
msgstr ""
6714
6715
#: bzrlib/errors.py:3309
6716
msgid ""
6717
"Malformed hunk header. %(desc)s\n"
6718
"%(line)r"
6719
msgstr ""
6720
6721
#: bzrlib/errors.py:3318
6722
msgid ""
6723
"Malformed line. %(desc)s\n"
6724
"%(line)r"
6725
msgstr ""
6726
6727
#: bzrlib/errors.py:3328
6728
msgid ""
6729
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6730
"but patch says it should be \"%(patch_line)s\""
6731
msgstr ""
6732
6733
#: bzrlib/errors.py:3339
6734
msgid "The feature %(feature)s has already been registered."
6735
msgstr ""
6736
6737
#: bzrlib/export_pot.py:252
6738
#, python-format
6739
msgid "Exporting messages from builtin command: %s"
6740
msgstr ""
6741
6742
#: bzrlib/export_pot.py:271
6743
msgid "Exporting messages from plugin command: {0} in {1}"
6744
msgstr ""
6745
6746
#: bzrlib/export_pot.py:292
6747
#, python-format
6748
msgid "Exporting message from error: %s"
6749
msgstr ""
6750
6751
#: bzrlib/fetch.py:98
6752
msgid "Finding revisions"
6753
msgstr ""
6754
6755
#: bzrlib/fetch.py:103
6756
msgid "Fetching revisions"
6757
msgstr ""
6758
6759
#: bzrlib/foreign.py:262
6760
msgid "Push into a different VCS without any custom bzr metadata."
6761
msgstr ""
6762
6763
#: bzrlib/foreign.py:264
6764
msgid ""
6765
"This will afterwards rebase the local branch on the remote\n"
6766
"branch unless the --no-rebase option is used, in which case \n"
6767
"the two branches will be out of sync after the push. "
6768
msgstr ""
6769
6770
#: bzrlib/foreign.py:277
6771
msgid "Do not rebase after push."
6772
msgstr ""
6773
6774
#: bzrlib/foreign.py:311
6775
#, python-format
6776
msgid "Using saved location: %s\n"
6777
msgstr ""
6778
6779
#: bzrlib/foreign.py:321
6780
msgid ""
6781
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6782
"regular push."
6783
msgstr ""
6784
6785
#: bzrlib/gpg.py:366
6786
msgid "No GnuPG key results for pattern: {0}"
6787
msgstr ""
6788
6789
#: bzrlib/gpg.py:439
6790
msgid "{0} commits with valid signatures"
6791
msgstr ""
6792
6793
#: bzrlib/gpg.py:445
6794
msgid "{0} commit with unknown key"
6795
msgid_plural "{0} commits with unknown keys"
6796
msgstr[0] "{0} закрепление с неизвестным ключом"
6797
msgstr[1] "{0} закрепления с неизвестным ключом"
6798
msgstr[2] "{0} закреплений с неизвестным ключом"
6799
6800
#: bzrlib/gpg.py:453
6801
msgid "{0} commit not valid"
6802
msgid_plural "{0} commits not valid"
6803
msgstr[0] ""
6804
msgstr[1] ""
6805
6806
#: bzrlib/gpg.py:461
6807
msgid "{0} commit not signed"
6808
msgid_plural "{0} commits not signed"
6809
msgstr[0] ""
6810
msgstr[1] ""
6811
6812
#: bzrlib/gpg.py:469
6813
msgid "{0} commit with key now expired"
6814
msgid_plural "{0} commits with key now expired"
6815
msgstr[0] ""
6816
msgstr[1] ""
6817
6818
#: bzrlib/gpg.py:489
6819
msgid "{0} commit by author {1} with key {2} now expired"
6820
msgid_plural "{0} commits by author {1} with key {2} now expired"
6821
msgstr[0] ""
6822
msgstr[1] ""
6823
6824
#: bzrlib/gpg.py:505
6825
msgid "{0} signed {1} commit"
6826
msgid_plural "{0} signed {1} commits"
6827
msgstr[0] ""
6828
msgstr[1] ""
6829
6830
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6831
msgid "{0} commit by author {1}"
6832
msgid_plural "{0} commits by author {1}"
6833
msgstr[0] ""
6834
msgstr[1] ""
6835
6836
#: bzrlib/gpg.py:554
6837
msgid "Unknown key {0} signed {1} commit"
6838
msgid_plural "Unknown key {0} signed {1} commits"
6839
msgstr[0] "Неизвестным ключом {0} подписано {1} закрепление"
6840
msgstr[1] "Неизвестным ключом {0} подписаны {1} закрепления"
6841
msgstr[2] "Неизвестным ключом {0} подписаны {1} закреплений"
6842
6843
#: bzrlib/groupcompress.py:1739
6844
#, python-format
6845
msgid "Insert claimed random_id=True, but then inserted %r two times"
6846
msgstr ""
6847
6848
#: bzrlib/hooks.py:313
6849
#, python-format
6850
msgid "Introduced in: %s"
6851
msgstr ""
6852
6853
#: bzrlib/hooks.py:316
6854
#, python-format
6855
msgid "Deprecated in: %s"
6856
msgstr ""
6857
6858
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6859
msgid "Walking content"
6860
msgstr ""
6861
6862
#: bzrlib/knit.py:3330
6863
msgid "annotating"
6864
msgstr ""
6865
6866
#: bzrlib/lock.py:548
6867
msgid "{0!r} was {1} locked again"
6868
msgstr ""
6869
6870
#: bzrlib/lockdir.py:321
6871
#, python-format
6872
msgid "error removing pending lock: %s"
6873
msgstr ""
6874
6875
#: bzrlib/lockdir.py:616
6876
msgid "Unable to obtain"
6877
msgstr ""
6878
6879
#: bzrlib/lockdir.py:618
6880
msgid "Lock owner changed for"
6881
msgstr ""
6882
6883
#: bzrlib/lockdir.py:620
6884
msgid "{0} lock {1} {2}."
6885
msgstr ""
6886
6887
#: bzrlib/lockdir.py:627
6888
#, python-format
6889
msgid "Will continue to try until %s, unless you press Ctrl-C."
6890
msgstr ""
6891
6892
#: bzrlib/lockdir.py:629
6893
msgid "See \"bzr help break-lock\" for more."
6894
msgstr ""
6895
6896
#: bzrlib/lockdir.py:739
6897
#, python-format
6898
msgid ""
6899
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6900
msgstr ""
6901
6902
#: bzrlib/log.py:563
6903
msgid "--exclude-common-ancestry requires two different revisions"
6904
msgstr ""
6905
6906
#: bzrlib/log.py:565
6907
#, python-format
6908
msgid "invalid direction %r"
6909
msgstr ""
6910
6911
#: bzrlib/log.py:653
6912
msgid "Start revision not found in history of end revision."
6913
msgstr ""
6914
6915
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6916
msgid "Logging revision 0 is invalid."
6917
msgstr ""
6918
6919
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6920
msgid "Start revision must be older than the end revision."
6921
msgstr ""
6922
6923
#: bzrlib/log.py:1818
6924
#, python-format
6925
msgid "unknown log formatter: %r"
6926
msgstr ""
6927
6928
#: bzrlib/log.py:2114
6929
msgid "fixes bug"
6930
msgid_plural "fixes bugs"
6931
msgstr[0] ""
6932
msgstr[1] ""
6933
6934
#: bzrlib/merge.py:689
6935
msgid "All changes applied successfully."
6936
msgstr ""
6937
6938
#: bzrlib/merge.py:691
6939
#, python-format
6940
msgid "%d conflicts encountered."
6941
msgstr ""
6942
6943
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6944
msgid "Preparing file merge"
6945
msgstr ""
6946
6947
#: bzrlib/multiparent.py:426
6948
msgid "Importing revisions"
6949
msgstr ""
6950
6951
#: bzrlib/option.py:526
6952
msgid "Show help message."
6953
msgstr ""
6954
6955
#: bzrlib/option.py:528
6956
msgid "Only display errors and warnings."
6957
msgstr ""
6958
6959
#: bzrlib/option.py:531
6960
msgid "Show usage message and options."
6961
msgstr ""
6962
6963
#: bzrlib/option.py:533
6964
msgid "Display more information."
6965
msgstr ""
6966
6967
#: bzrlib/option.py:541
6968
msgid ""
6969
"Select changes introduced by the specified revision. See also \"help "
6970
"revisionspec\"."
6971
msgstr ""
6972
6973
#: bzrlib/option.py:543
6974
msgid "Branch to operate on, instead of working directory."
6975
msgstr ""
6976
6977
#: bzrlib/option.py:545
6978
msgid "Detailed log format."
6979
msgstr ""
6980
6981
#: bzrlib/option.py:545
6982
msgid "Format used by GNU ChangeLog files."
6983
msgstr ""
6984
6985
#: bzrlib/option.py:545
6986
msgid "Log format with one line per revision."
6987
msgstr ""
6988
6989
#: bzrlib/option.py:545
6990
msgid "Moderately short log format."
6991
msgstr ""
6992
6993
#: bzrlib/option.py:545
6994
msgid "Use specified log format."
6995
msgstr ""
6996
6997
#: bzrlib/option.py:547
6998
msgid "Log format"
6999
msgstr ""
7000
7001
#: bzrlib/option.py:549
7002
msgid "LCA-newness merge."
7003
msgstr ""
7004
7005
#: bzrlib/option.py:549
7006
msgid "Merge using external diff3."
7007
msgstr ""
7008
7009
#: bzrlib/option.py:549
7010
msgid "Native diff3-style merge."
7011
msgstr ""
7012
7013
#: bzrlib/option.py:549
7014
msgid "Select a particular merge algorithm."
7015
msgstr ""
7016
7017
#: bzrlib/option.py:549
7018
msgid "Weave-based merge."
7019
msgstr ""
7020
7021
#: bzrlib/option.py:551
7022
msgid "Merge algorithm"
7023
msgstr ""
7024
7025
#: bzrlib/option.py:554
7026
msgid "Message string."
7027
msgstr ""
7028
7029
#: bzrlib/option.py:556
7030
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
7031
msgstr ""
7032
7033
#: bzrlib/option.py:558
7034
msgid "Ignore differences between branches and overwrite unconditionally."
7035
msgstr ""
7036
7037
#: bzrlib/option.py:560
7038
msgid "Remember the specified location as a default."
7039
msgstr ""
7040
7041
#: bzrlib/option.py:562
7042
msgid "Reprocess to reduce spurious conflicts."
7043
msgstr ""
7044
7045
#: bzrlib/option.py:566
7046
msgid "See \"help revisionspec\" for details."
7047
msgstr ""
7048
7049
#: bzrlib/option.py:568
7050
msgid "Show internal object ids."
7051
msgstr ""
7052
7053
#: bzrlib/option.py:571
7054
msgid "Display timezone as local, original, or utc."
7055
msgstr ""
7056
7057
#: bzrlib/osutils.py:100
7058
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
7059
msgstr ""
7060
7061
#: bzrlib/osutils.py:220
7062
msgid "lstat/stat of ({0!r}): {1!r}"
7063
msgstr ""
7064
7065
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
7066
#, python-format
7067
msgid "sorry, %r not allowed in path"
7068
msgstr ""
7069
7070
#: bzrlib/osutils.py:1259
7071
#, python-format
7072
msgid "%r is too short to calculate a relative path"
7073
msgstr ""
7074
7075
#: bzrlib/plugin.py:143
7076
#, python-format
7077
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
7078
msgstr ""
7079
7080
#: bzrlib/plugins/bash_completion/bashcomp.py:411
7081
msgid "Enable completions for the selected plugin (default: all plugins)"
7082
msgstr ""
7083
7084
#: bzrlib/plugins/bash_completion/bashcomp.py:412
7085
msgid "Generate a shell function for bash command line completion."
7086
msgstr ""
7087
7088
#: bzrlib/plugins/bash_completion/bashcomp.py:414
7089
msgid ""
7090
"This command generates a shell function which can be used by bash to\n"
7091
"automatically complete the currently typed command when the user presses\n"
7092
"the completion key (usually tab)."
7093
msgstr ""
7094
7095
#: bzrlib/plugins/bash_completion/bashcomp.py:418
7096
msgid ""
7097
"Commonly used like this:\n"
7098
" eval \"`bzr bash-completion`\""
7099
msgstr ""
7100
7101
#: bzrlib/plugins/bash_completion/bashcomp.py:424
7102
msgid "Name of the generated function (default: _bzr)"
7103
msgstr ""
7104
7105
#: bzrlib/plugins/bash_completion/bashcomp.py:426
7106
msgid "Generate only the shell function, don't enable it"
7107
msgstr ""
7108
7109
#: bzrlib/plugins/launchpad/account.py:66
7110
msgid "Setting ssh/sftp usernames for launchpad.net."
7111
msgstr ""
7112
7113
#: bzrlib/plugins/launchpad/cmds.py:44
7114
msgid "Register a branch with launchpad.net."
7115
msgstr ""
7116
7117
#: bzrlib/plugins/launchpad/cmds.py:46
7118
msgid ""
7119
"This command lists a bzr branch in the directory of branches on\n"
7120
"launchpad.net. Registration allows the branch to be associated with\n"
7121
"bugs or specifications."
7122
msgstr ""
7123
7124
#: bzrlib/plugins/launchpad/cmds.py:50
7125
msgid ""
7126
"Before using this command you must register the project to which the\n"
7127
"branch belongs, and create an account for yourself on launchpad.net."
7128
msgstr ""
7129
7130
#: bzrlib/plugins/launchpad/cmds.py:53
7131
msgid ""
7132
"arguments:\n"
7133
" public_url: The publicly visible url for the branch to register.\n"
7134
" This must be an http or https url (which Launchpad can read\n"
7135
" from to access the branch). Local file urls, SFTP urls, and\n"
7136
" bzr+ssh urls will not work.\n"
7137
" If no public_url is provided, bzr will use the configured\n"
7138
" public_url if there is one for the current branch, and\n"
7139
" otherwise error."
7140
msgstr ""
7141
7142
#: bzrlib/plugins/launchpad/cmds.py:62
7143
msgid ""
7144
"example:\n"
7145
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7146
" --project fooproject"
7147
msgstr ""
7148
7149
#: bzrlib/plugins/launchpad/cmds.py:69
7150
msgid "Launchpad project short name to associate with the branch."
7151
msgstr ""
7152
7153
#: bzrlib/plugins/launchpad/cmds.py:76
7154
msgid ""
7155
"Short name for the branch; by default taken from the last component of the "
7156
"url."
7157
msgstr ""
7158
7159
#: bzrlib/plugins/launchpad/cmds.py:80
7160
msgid "One-sentence description of the branch."
7161
msgstr ""
7162
7163
#: bzrlib/plugins/launchpad/cmds.py:83
7164
msgid "Longer description of the purpose or contents of the branch."
7165
msgstr ""
7166
7167
#: bzrlib/plugins/launchpad/cmds.py:86
7168
msgid "Branch author's email address, if not yourself."
7169
msgstr ""
7170
7171
#: bzrlib/plugins/launchpad/cmds.py:89
7172
msgid "The bug this branch fixes."
7173
msgstr ""
7174
7175
#: bzrlib/plugins/launchpad/cmds.py:92
7176
msgid "Prepare the request but don't actually send it."
7177
msgstr ""
7178
7179
#: bzrlib/plugins/launchpad/cmds.py:114
7180
msgid ""
7181
"register-branch requires a public branch url - see bzr help register-branch."
7182
msgstr ""
7183
7184
#: bzrlib/plugins/launchpad/cmds.py:122
7185
msgid "--product is deprecated; please use --project."
7186
msgstr ""
7187
7188
#: bzrlib/plugins/launchpad/cmds.py:152
7189
msgid "Open a Launchpad branch page in your web browser."
7190
msgstr ""
7191
7192
#: bzrlib/plugins/launchpad/cmds.py:157
7193
msgid "Do not actually open the browser. Just say the URL we would use."
7194
msgstr ""
7195
7196
#: bzrlib/plugins/launchpad/cmds.py:192
7197
#, python-format
7198
msgid "Opening %s in web browser"
7199
msgstr ""
7200
7201
#: bzrlib/plugins/launchpad/cmds.py:200
7202
msgid "Show or set the Launchpad user ID."
7203
msgstr ""
7204
7205
#: bzrlib/plugins/launchpad/cmds.py:202
7206
msgid ""
7207
"When communicating with Launchpad, some commands need to know your\n"
7208
"Launchpad user ID. This command can be used to set or show the\n"
7209
"user ID that Bazaar will use for such communication."
7210
msgstr ""
7211
7212
#: bzrlib/plugins/launchpad/cmds.py:206
7213
msgid ""
7214
":Examples:\n"
7215
" Show the Launchpad ID of the current user::"
7216
msgstr ""
7217
7218
#: bzrlib/plugins/launchpad/cmds.py:209
7219
msgid " bzr launchpad-login"
7220
msgstr ""
7221
7222
#: bzrlib/plugins/launchpad/cmds.py:211
7223
msgid " Set the Launchpad ID of the current user to 'bob'::"
7224
msgstr ""
7225
7226
#: bzrlib/plugins/launchpad/cmds.py:213
7227
msgid " bzr launchpad-login bob"
7228
msgstr ""
7229
7230
#: bzrlib/plugins/launchpad/cmds.py:220
7231
msgid "Don't check that the user name is valid."
7232
msgstr ""
7233
7234
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
7235
msgid "Launchpad user ID exists and has SSH keys.\n"
7236
msgstr ""
7237
7238
#: bzrlib/plugins/launchpad/cmds.py:238
7239
msgid "No Launchpad user ID configured.\n"
7240
msgstr ""
7241
7242
#: bzrlib/plugins/launchpad/cmds.py:249
7243
#, python-format
7244
msgid "Launchpad user ID set to '%s'.\n"
7245
msgstr ""
7246
7247
#: bzrlib/plugins/launchpad/cmds.py:255
7248
msgid "Ask Launchpad to mirror a branch now."
7249
msgstr ""
7250
7251
#: bzrlib/plugins/launchpad/cmds.py:272
7252
msgid "Propose merging a branch on Launchpad."
7253
msgstr ""
7254
7255
#: bzrlib/plugins/launchpad/cmds.py:274
7256
msgid ""
7257
"This will open your usual editor to provide the initial comment. When it\n"
7258
"has created the proposal, it will open it in your default web browser."
7259
msgstr ""
7260
7261
#: bzrlib/plugins/launchpad/cmds.py:277
7262
msgid ""
7263
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7264
"is not supplied, the remembered submit branch will be used. If no submit\n"
7265
"branch is remembered, the development focus will be used."
7266
msgstr ""
7267
7268
#: bzrlib/plugins/launchpad/cmds.py:281
7269
msgid ""
7270
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7271
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7272
"The parameter the launchpad account name of the desired reviewer. This\n"
7273
"may optionally be followed by '=' and the review type. For example:"
7274
msgstr ""
7275
7276
#: bzrlib/plugins/launchpad/cmds.py:286
7277
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7278
msgstr ""
7279
7280
#: bzrlib/plugins/launchpad/cmds.py:288
7281
msgid ""
7282
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7283
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7284
msgstr ""
7285
7286
#: bzrlib/plugins/launchpad/cmds.py:293
7287
msgid "Propose the merge on staging."
7288
msgstr ""
7289
7290
#: bzrlib/plugins/launchpad/cmds.py:295
7291
msgid "Commit message."
7292
msgstr ""
7293
7294
#: bzrlib/plugins/launchpad/cmds.py:297
7295
msgid "Mark the proposal as approved immediately."
7296
msgstr ""
7297
7298
#: bzrlib/plugins/launchpad/cmds.py:298
7299
msgid "The bug this proposal fixes."
7300
msgstr ""
7301
7302
#: bzrlib/plugins/launchpad/cmds.py:300
7303
msgid "Requested reviewer and optional type."
7304
msgstr ""
7305
7306
#: bzrlib/plugins/launchpad/cmds.py:335
7307
msgid "Find the proposal to merge this revision."
7308
msgstr ""
7309
7310
#: bzrlib/plugins/launchpad/cmds.py:337
7311
msgid ""
7312
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7313
"This works only if the selected branch was the merge proposal target, and\n"
7314
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7315
"are opened in a web browser."
7316
msgstr ""
7317
7318
#: bzrlib/plugins/launchpad/cmds.py:342
7319
msgid ""
7320
"Any revision involved in the merge may be specified-- the revision in\n"
7321
"which the merge was performed, or one of the revisions that was merged."
7322
msgstr ""
7323
7324
#: bzrlib/plugins/launchpad/cmds.py:345
7325
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7326
msgstr ""
7327
7328
#: bzrlib/plugins/launchpad/cmds.py:347
7329
msgid " bzr lp-find-proposal -r annotate:README:1"
7330
msgstr ""
7331
7332
#: bzrlib/plugins/launchpad/cmds.py:363
7333
msgid "No review found."
7334
msgstr ""
7335
7336
#: bzrlib/plugins/launchpad/cmds.py:364
7337
#, python-format
7338
msgid "%d proposals(s) found."
7339
msgstr ""
7340
7341
#: bzrlib/plugins/launchpad/cmds.py:374
7342
msgid "Finding revision-id"
7343
msgstr ""
7344
7345
#: bzrlib/plugins/launchpad/cmds.py:381
7346
msgid "Finding merge"
7347
msgstr ""
7348
7349
#: bzrlib/plugins/launchpad/cmds.py:386
7350
msgid "Finding revno"
7351
msgstr ""
7352
7353
#: bzrlib/plugins/launchpad/cmds.py:392
7354
msgid "Finding Launchpad branch"
7355
msgstr ""
7356
7357
#: bzrlib/plugins/launchpad/cmds.py:395
7358
msgid "Finding proposals"
7359
msgstr ""
7360
7361
#: bzrlib/plugins/launchpad/lp_api.py:241
7362
#: bzrlib/plugins/launchpad/lp_api.py:246
7363
#, python-format
7364
msgid "%s is not registered on Launchpad"
7365
msgstr ""
7366
7367
#: bzrlib/plugins/launchpad/lp_api.py:256
7368
#, python-format
7369
msgid "%s has no development focus."
7370
msgstr ""
7371
7372
#: bzrlib/plugins/launchpad/lp_api.py:261
7373
#, python-format
7374
msgid "development focus %s has no branch."
7375
msgstr ""
7376
7377
#: bzrlib/plugins/launchpad/lp_api.py:266
7378
#, python-format
7379
msgid "source package %s has no branch."
7380
msgstr ""
7381
7382
#: bzrlib/plugins/launchpad/lp_api.py:270
7383
#, python-format
7384
msgid "%s has no associated product or source package."
7385
msgstr ""
7386
7387
#: bzrlib/plugins/launchpad/lp_api.py:282
7388
#, python-format
7389
msgid "%s is already up-to-date."
7390
msgstr ""
7391
7392
#: bzrlib/plugins/launchpad/lp_api.py:289
7393
#, python-format
7394
msgid "Pushing to %s"
7395
msgstr ""
7396
7397
#: bzrlib/plugins/launchpad/lp_directory.py:170
7398
msgid ""
7399
"resolution for {0}\n"
7400
" local: {1}\n"
7401
" remote: {2}"
7402
msgstr ""
7403
7404
#: bzrlib/plugins/launchpad/lp_propose.py:150
7405
#, python-format
7406
msgid "There is already a branch merge proposal: %s"
7407
msgstr ""
7408
7409
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7410
msgid "pb parameter to convert() is deprecated"
7411
msgstr ""
7412
7413
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7414
msgid "starting upgrade from format 4 to 5"
7415
msgstr ""
7416
7417
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7418
msgid "note: upgrade may be faster if all store files are ungzipped first"
7419
msgstr ""
7420
7421
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7422
msgid "converting revision"
7423
msgstr ""
7424
7425
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7426
msgid "upgraded to weaves:"
7427
msgstr ""
7428
7429
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7430
#, python-format
7431
msgid "%6d revisions and inventories"
7432
msgstr ""
7433
7434
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7435
#, python-format
7436
msgid "%6d revisions not present"
7437
msgstr ""
7438
7439
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7440
#, python-format
7441
msgid "%6d texts"
7442
msgstr ""
7443
7444
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7445
msgid "writing weave"
7446
msgstr ""
7447
7448
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7449
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7450
msgid "inventory"
7451
msgstr ""
7452
7453
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7454
msgid "write revision"
7455
msgstr ""
7456
7457
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7458
msgid "loading revision"
7459
msgstr ""
7460
7461
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7462
#, python-format
7463
msgid "revision {%s} not present in branch; will be converted as a ghost"
7464
msgstr ""
7465
7466
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7467
msgid "starting upgrade from format 5 to 6"
7468
msgstr ""
7469
7470
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7471
#, python-format
7472
msgid "adding prefixes to %s"
7473
msgstr ""
7474
7475
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7476
msgid "starting upgrade from format 6 to metadir"
7477
msgstr ""
7478
7479
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7480
msgid "Removing ancestry.weave"
7481
msgstr ""
7482
7483
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7484
msgid "Finding branch files"
7485
msgstr ""
7486
7487
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7488
msgid "Upgrading repository"
7489
msgstr ""
7490
7491
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7492
msgid "Upgrading branch"
7493
msgstr ""
7494
7495
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7496
msgid "No working tree."
7497
msgstr ""
7498
7499
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7500
msgid "Upgrading working tree"
7501
msgstr ""
7502
7503
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7504
#, python-format
7505
msgid "Make %s lock"
7506
msgstr ""
7507
7508
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7509
#, python-format
7510
msgid "Moving %s"
7511
msgstr ""
7512
7513
#: bzrlib/push.py:56
7514
msgid "Created new branch."
7515
msgstr ""
7516
7517
#: bzrlib/push.py:97
7518
#, python-format
7519
msgid ""
7520
"Target directory %s already contains a .bzr directory, but it is not valid."
7521
msgstr ""
7522
7523
#: bzrlib/push.py:101
7524
#, python-format
7525
msgid ""
7526
"Target directory %s already exists, but does not have a .bzr directory. "
7527
"Supply --use-existing-dir to push there anyway."
7528
msgstr ""
7529
7530
#: bzrlib/push.py:122
7531
#, python-format
7532
msgid "Too many redirections trying to make %s."
7533
msgstr ""
7534
7535
#: bzrlib/push.py:148
7536
msgid ""
7537
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7538
"information."
7539
msgstr ""
7540
7541
#: bzrlib/push.py:152
7542
#, python-format
7543
msgid ""
7544
"It is not possible to losslessly push to %s. You may want to use dpush "
7545
"instead."
7546
msgstr ""
7547
7548
#: bzrlib/push.py:158
7549
#, python-format
7550
msgid ""
7551
"At %s you have a valid .bzr control directory, but not a branch or "
7552
"repository. This is an unsupported configuration. Please move the target "
7553
"directory out of the way and try again."
7554
msgstr ""
7555
7556
#: bzrlib/reconcile.py:97
7557
#, python-format
7558
msgid "Reconciling branch %s"
7559
msgstr ""
7560
7561
#: bzrlib/reconcile.py:103
7562
#, python-format
7563
msgid "Reconciling repository %s"
7564
msgstr ""
7565
7566
#: bzrlib/reconcile.py:105
7567
msgid "Reconciling repository"
7568
msgstr ""
7569
7570
#: bzrlib/reconcile.py:111
7571
#, python-format
7572
msgid "%s cannot canonicalize CHKs."
7573
msgstr ""
7574
7575
#: bzrlib/reconcile.py:119
7576
msgid "Reconcile aborted: revision index has inconsistent parents."
7577
msgstr ""
7578
7579
#: bzrlib/reconcile.py:121
7580
msgid "Run \"bzr check\" for more details."
7581
msgstr "Для подробностей запустите «bzr check»."
7582
7583
#: bzrlib/reconcile.py:123
7584
msgid "Reconciliation complete."
7585
msgstr ""
7586
7587
#: bzrlib/reconcile.py:166
7588
msgid "Fixing last revision info {0} => {1}"
7589
msgstr "Исправление информации последней ревизии {0} => {1}"
7590
7591
#: bzrlib/reconcile.py:173
7592
msgid "revision_history ok."
7593
msgstr ""
7594
7595
#: bzrlib/reconcile.py:234
7596
msgid "Reading inventory data"
7597
msgstr "Чтение данных инвентаря"
7598
7599
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7600
msgid "Inventory ok."
7601
msgstr ""
7602
7603
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7604
msgid "Backing up inventory"
7605
msgstr "Создание резервного инвентаря"
7606
7607
#: bzrlib/reconcile.py:258
7608
msgid "Backup inventory created."
7609
msgstr "Резервный инвентарь создан."
7610
7611
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7612
msgid "Writing weave"
7613
msgstr ""
7614
7615
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7616
msgid "Inventory regenerated."
7617
msgstr "Инвентарь восстановлен."
7618
7619
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7620
msgid "Reading indexes"
7621
msgstr "Чтение индексов"
7622
7623
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7624
msgid "Checking unused inventories"
7625
msgstr "Проверка неиспользуемых инвентарей"
7626
7627
#: bzrlib/reconcile.py:388
7628
msgid "Backup Inventory created"
7629
msgstr "Резервный инвентарь создан"
7630
7631
#: bzrlib/reconcile.py:446
7632
msgid "Fixing text parents"
7633
msgstr ""
7634
7635
#: bzrlib/reconfigure.py:54
7636
msgid "{0} is now stacked on {1}\n"
7637
msgstr "{0}теперь на стеке {1}\n"
7638
7639
#: bzrlib/reconfigure.py:69
7640
#, python-format
7641
msgid "%s is now not stacked\n"
7642
msgstr "%s теперь не на стеке\n"
7643
7644
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7645
#, python-format
7646
msgid "bzr: ERROR (ignored): %s"
7647
msgstr "bzr: ОШИБКА (игнорирована): %s"
7648
7649
#: bzrlib/remote.py:2534
7650
msgid "Copying repository content as tarball..."
7651
msgstr "Копирование содержимого репозитория в тарбол..."
7652
7653
#: bzrlib/rename_map.py:69
7654
msgid "Calculating hashes"
7655
msgstr "Вычисление хешей"
7656
7657
#: bzrlib/rename_map.py:107
7658
msgid "Determining hash hits"
7659
msgstr "Определение столкновений хешей"
7660
7661
#: bzrlib/rename_map.py:242
7662
msgid "{0} => {1}"
7663
msgstr "{0} => {1}"
7664
7665
#: bzrlib/repository.py:1738
7666
msgid "Moving repository to repository.backup"
7667
msgstr "Перемещение репозитория в repository.backup"
7668
7669
#: bzrlib/repository.py:1745
7670
msgid "Creating new repository"
7671
msgstr "Создание нового репозитория"
7672
7673
#: bzrlib/repository.py:1750
7674
msgid "Copying content"
7675
msgstr "Копирование содержимого"
7676
7677
#: bzrlib/repository.py:1754
7678
msgid "Deleting old repository content"
7679
msgstr "Удаление старого содержимого репозитория"
7680
7681
#: bzrlib/repository.py:1756
7682
msgid "repository converted"
7683
msgstr "репозиторий преобразован"
7684
7685
#: bzrlib/revisionspec.py:903
7686
msgid "Using {0} {1}"
7687
msgstr "Используется {0} {1}"
7688
7689
#: bzrlib/send.py:59
7690
#, python-format
7691
msgid "Mail client \"%s\" does not support specifying body"
7692
msgstr "Почтовый клиент «%s» не поддерживает определение тела"
7693
7694
#: bzrlib/send.py:63
7695
msgid "--remember requires a branch to be specified."
7696
msgstr "--remember требует указания ветви."
7697
7698
#: bzrlib/send.py:78
7699
msgid "No submit branch known or specified"
7700
msgstr "Ветвь для отсылки неизвестна и не задана"
7701
7702
#: bzrlib/send.py:81
7703
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7704
msgstr ""
7705
"Используется сохранённое {0} местоположение «{1}» для определения изменений, "
7706
"которые необходимо отправить."
7707
7708
#: bzrlib/send.py:99
7709
#, python-format
7710
msgid "No such send format '%s'."
7711
msgstr "Нет такого формата отправки '%s'."
7712
7713
#: bzrlib/send.py:115
7714
msgid "bzr send takes at most two one revision identifiers"
7715
msgstr "bzr send принимает не более двух идентификаторов ревизии"
7716
7717
#: bzrlib/send.py:128
7718
msgid "No revisions to submit."
7719
msgstr "Нет ревизий для отправки."
7720
7721
#: bzrlib/send.py:140
7722
msgid ""
7723
"- not supported for merge directives that use more than one output file."
7724
msgstr ""
7725
"- не поддерживается для директив merge, которые используют более, чем один "
7726
"файл вывода."
7727
7728
#: bzrlib/send.py:186
7729
msgid "Format 0.9 does not permit bundle with no patch"
7730
msgstr "Формат 0.9 не разрешает пакеты без патчей"
7731
7732
#: bzrlib/shelf_ui.py:46
7733
#, python-format
7734
msgid "Shelve adding file \"%(path)s\"?"
7735
msgstr "Отложить добавление файла «%(path)s»?"
7736
7737
#: bzrlib/shelf_ui.py:47
7738
msgid "Shelve binary changes?"
7739
msgstr "Отложить двоичные изменения?"
7740
7741
#: bzrlib/shelf_ui.py:48
7742
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7743
msgstr "Отложить изменение «%s» из %(other)s в %(this)s?"
7744
7745
#: bzrlib/shelf_ui.py:50
7746
#, python-format
7747
msgid "Shelve removing file \"%(path)s\"?"
7748
msgstr "Отложить удаление файла «%(path)s»?"
7749
7750
#: bzrlib/shelf_ui.py:51
7751
#, python-format
7752
msgid "Shelve %d change(s)?"
7753
msgstr "Отложить %d изменений?"
7754
7755
#: bzrlib/shelf_ui.py:52
7756
msgid "Shelve?"
7757
msgstr "Отложить?"
7758
7759
#: bzrlib/shelf_ui.py:53
7760
#, python-format
7761
msgid ""
7762
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7763
msgstr "Отложить изменение цели «%(path)s» из «%(other)s» в «%(this)s»?"
7764
7765
#: bzrlib/shelf_ui.py:55
7766
#, python-format
7767
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7768
msgstr "Отложить переименование «%(other)s» => «%(this)s»?"
7769
7770
#: bzrlib/shelf_ui.py:70
7771
#, python-format
7772
msgid "Changes shelved with id \"%d\"."
7773
msgstr "Изменения отложены с id «%d»."
7774
7775
#: bzrlib/shelf_ui.py:74
7776
msgid "Selected changes destroyed."
7777
msgstr "Выбранные изменения уничтожены."
7778
7779
#: bzrlib/shelf_ui.py:78
7780
msgid "Selected changes:"
7781
msgstr "Выбранные изменения:"
7782
7783
#: bzrlib/shelf_ui.py:98
7784
#, python-format
7785
msgid "Delete file \"%(path)s\"?"
7786
msgstr "Удалить файл «%(path)s»?"
7787
7788
#: bzrlib/shelf_ui.py:99
7789
msgid "Apply binary changes?"
7790
msgstr "Применить двоичные изменения?"
7791
7792
#: bzrlib/shelf_ui.py:100
7793
#, python-format
7794
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7795
msgstr "Изменить «%(path)s» с %(this)s на %(other)s?"
7796
7797
#: bzrlib/shelf_ui.py:102
7798
#, python-format
7799
msgid "Add file \"%(path)s\"?"
7800
msgstr "Добавить файл «%(path)s»?"
7801
7802
#: bzrlib/shelf_ui.py:103
7803
#, python-format
7804
msgid "Apply %d change(s)?"
7805
msgstr "Применить %d изменений?"
7806
7807
#: bzrlib/shelf_ui.py:104
7808
msgid "Apply change?"
7809
msgstr "Применить изменение?"
7810
7811
#: bzrlib/shelf_ui.py:105
7812
#, python-format
7813
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7814
msgstr "Изменить цель «%(path)s» с «%(this)s» на «%(other)s»?"
7815
7816
#: bzrlib/shelf_ui.py:107
7817
#, python-format
7818
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7819
msgstr "Переименовать «%(this)s» => «%(other)s»?"
7820
7821
#: bzrlib/shelf_ui.py:402
7822
msgid "No changes are shelved."
7823
msgstr "Нет отложенных изменений."
7824
7825
#: bzrlib/shelf_ui.py:460
7826
#, python-format
7827
msgid "Using changes with id \"%d\"."
7828
msgstr "Используются изменения с id «%d»."
7829
7830
#: bzrlib/shelf_ui.py:464
7831
#, python-format
7832
msgid "Message: %s"
7833
msgstr "Сообщение: %s"
7834
7835
#: bzrlib/shelf_ui.py:476
7836
#, python-format
7837
msgid "Deleted changes with id \"%d\"."
7838
msgstr "Удалены изменения с id «%d»."
7839
7840
#: bzrlib/smart/medium.py:714
7841
msgid "HPSS calls: {0} ({1} vfs) {2}"
7842
msgstr "Вызовы HPSS: {0} ({1} vfs) {2}"
7843
7844
#: bzrlib/smart/server.py:169
7845
msgid "Requested to stop gracefully"
7846
msgstr ""
7847
7848
#: bzrlib/smart/server.py:179
7849
#, python-format
7850
msgid "Waiting for %d client(s) to finish"
7851
msgstr ""
7852
7853
#: bzrlib/smart/server.py:185
7854
#, python-format
7855
msgid "Still waiting for %d client(s) to finish"
7856
msgstr ""
7857
7858
#: bzrlib/smart/server.py:219
7859
#, python-format
7860
msgid "listening socket error: %s"
7861
msgstr ""
7862
7863
#: bzrlib/smart/server.py:452
7864
#, python-format
7865
msgid "listening on port: %s"
7866
msgstr "слушаю на порту: %s"
7867
7868
#: bzrlib/switch.py:73
7869
msgid "Pending merges must be committed or reverted before using switch."
7870
msgstr ""
7871
7872
#: bzrlib/switch.py:100
7873
msgid ""
7874
"Cannot switch as local commits found in the checkout. Commit these to the "
7875
"bound branch or use --force to throw them away."
7876
msgstr ""
7877
7878
#: bzrlib/switch.py:105
7879
#, python-format
7880
msgid ""
7881
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7882
"anyway, use --force."
7883
msgstr ""
7884
"Не удалось соединиться с текущей основной ветвью %(target)s: %(error)s Для "
7885
"принудительного переключения используйте --force."
7886
7887
#: bzrlib/switch.py:129
7888
msgid "Cannot switch a branch, only a checkout."
7889
msgstr ""
7890
7891
#: bzrlib/switch.py:167
7892
#, python-format
7893
msgid "Tree is up to date at revision %d."
7894
msgstr "Дерево в актуальной ревизии %d."
7895
7896
#: bzrlib/switch.py:173
7897
#, python-format
7898
msgid "Updated to revision %d."
7899
msgstr "Обновлено до ревизии %d."
7900
7901
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7902
msgid "Apply phase"
7903
msgstr "Применить фазу"
7904
7905
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7906
msgid "removing file"
7907
msgstr "удаление файла"
7908
7909
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7910
msgid "adding file"
7911
msgstr "добавление файла"
7912
7913
#: bzrlib/transform.py:2598
7914
msgid "Building tree"
7915
msgstr "Построение дерева"
7916
7917
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7918
msgid "Adding file contents"
7919
msgstr "Добавление содержимого файлй"
7920
7921
#: bzrlib/transform.py:3017
7922
msgid "Resolution pass"
7923
msgstr ""
7924
7925
#: bzrlib/transport/ftp/_gssapi.py:88
7926
#, python-format
7927
msgid "Authenticated as %s"
7928
msgstr ""
7929
7930
#: bzrlib/tree.py:647
7931
msgid "*** {0} content-filter: {1} => {2!r}"
7932
msgstr "*** {0} content-filter: {1} => {2!r}"
7933
7934
#: bzrlib/upgrade.py:77
7935
#, python-format
7936
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7937
msgstr "Это рабочая копия. Ветвь (%s) необходимо обновлять отдельно."
7938
7939
#: bzrlib/upgrade.py:100
7940
#, python-format
7941
msgid "cannot upgrade from bzrdir format %s"
7942
msgstr "нельзя обновить из формата bzrdir %s"
7943
7944
#: bzrlib/upgrade.py:103
7945
#, python-format
7946
msgid "starting upgrade of %s"
7947
msgstr "начинается обновление %s"
7948
7949
#: bzrlib/upgrade.py:110
7950
msgid "finished"
7951
msgstr "завершено"
7952
7953
#: bzrlib/upgrade.py:120
7954
msgid "Deleting backup.bzr"
7955
msgstr "Удаление backup.bzr"
7956
7957
#: bzrlib/upgrade.py:151
7958
msgid ""
7959
"\n"
7960
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7961
msgstr ""
7962
"\n"
7963
"СВОДКА: произведено {0} обновлений, {1} успешно, {2} неуспешно"
7964
7965
#: bzrlib/upgrade.py:208
7966
#, python-format
7967
msgid "Found %d dependent branches - upgrading ..."
7968
msgstr "Найдено %d зависящих ветвей - обновление ..."
7969
7970
#: bzrlib/upgrade.py:276
7971
msgid "Upgrading bzrdirs"
7972
msgstr "Обновление bzrdirs"
7973
7974
#: bzrlib/upgrade.py:282
7975
#, python-format
7976
msgid "Upgrading %s"
7977
msgstr "Обновление %s"
7978
7979
#: bzrlib/upgrade.py:283
7980
msgid "Upgrading {0} {1} ..."
7981
msgstr "Обновление {0} {1} ..."
7982
7983
#: bzrlib/upgrade.py:301
7984
msgid "Removing backup ..."
7985
msgstr "Удаление резервной копии ..."
7986
7987
#: bzrlib/upgrade.py:305
7988
msgid "failed to clean-up {0}: {1}"
7989
msgstr "не удалось очистить {0}: {1}"
7990
7991
#: bzrlib/vf_repository.py:1091
7992
msgid "inventories"
7993
msgstr ""
7994
7995
#: bzrlib/vf_repository.py:1117
7996
msgid "texts"
7997
msgstr ""
7998
7999
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
8000
msgid "Calculating text parents"
8001
msgstr ""
8002
8003
#: bzrlib/vf_repository.py:1707
8004
msgid "Fetch texts"
8005
msgstr ""
8006
8007
#: bzrlib/vf_repository.py:2536
8008
msgid "loading text store"
8009
msgstr ""
8010
8011
#: bzrlib/vf_repository.py:2542
8012
msgid "checking text graph"
8013
msgstr ""
8014
8015
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
8016
#: bzrlib/vf_repository.py:3127
8017
msgid "Transferring revisions"
8018
msgstr ""
8019
8020
#: bzrlib/win32utils.py:146
8021
msgid "Failed to GetProcessMemoryInfo()"
8022
msgstr "Не удалось выполнить GetProcessMemoryInfo()"
8023
8024
#: bzrlib/win32utils.py:167
8025
msgid "Cannot debug memory on win32 without ctypes or win32process"
8026
msgstr ""
8027
"Невозможно производить отладку памяти на win32 без ctypes или win32process"
8028
8029
#: bzrlib/win32utils.py:172
8030
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
8031
msgstr "WorkingSize {0:>7}КиБ\tPeakWorking {1:>7}КиБ\t{2}"
8032
8033
#: bzrlib/win32utils.py:180
8034
#, python-format
8035
msgid "WorkingSize %8d KiB"
8036
msgstr "WorkingSize %8d КиБ"
8037
8038
#: bzrlib/win32utils.py:181
8039
#, python-format
8040
msgid "PeakWorking %8d KiB"
8041
msgstr "PeakWorking %8d КиБ"
8042
8043
#: bzrlib/win32utils.py:182
8044
#, python-format
8045
msgid "PagefileUsage %8d KiB"
8046
msgstr "PagefileUsage %8d КиБ"
8047
8048
#: bzrlib/win32utils.py:183
8049
#, python-format
8050
msgid "PeakPagefileUsage %8d KiB"
8051
msgstr "PeakPagefileUsage %8d КиБ"
8052
8053
#: bzrlib/win32utils.py:185
8054
#, python-format
8055
msgid "PrivateUsage %8d KiB"
8056
msgstr "PrivateUsage %8d КиБ"
8057
8058
#: bzrlib/win32utils.py:186
8059
#, python-format
8060
msgid "PageFaultCount %8d"
8061
msgstr "PageFaultCount %8d"
8062
8063
#: bzrlib/workingtree.py:1482
8064
msgid "Rerun update after fixing the conflicts."
8065
msgstr "Снова запустите обновление после исправления конфликтов."
8066
8067
#: dummy/help_topics/authentication/summary.txt:1
8068
msgid "Information on configuring authentication"
8069
msgstr "Информация по настройке аутентификации"
8070
8071
#: dummy/help_topics/basic/detail.txt:1
8072
msgid ""
8073
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
8074
"http://bazaar.canonical.com/"
8075
msgstr ""
8076
8077
#: dummy/help_topics/basic/detail.txt:4
8078
msgid ""
8079
"Basic commands:\n"
8080
" bzr init makes this directory a versioned branch\n"
8081
" bzr branch make a copy of another branch"
8082
msgstr ""
8083
"Базовые команды:\n"
8084
" bzr init превратить директорию в ветвь системы версий\n"
8085
" bzr branch создать копию другой ветви"
8086
8087
#: dummy/help_topics/basic/detail.txt:8
8088
msgid ""
8089
" bzr add make files or directories versioned\n"
8090
" bzr ignore ignore a file or pattern\n"
8091
" bzr mv move or rename a versioned file"
8092
msgstr ""
8093
" bzr add добавить файлы или директории к системе контроля "
8094
"версий\n"
8095
" bzr ignore игнорировать файл или шаблон\n"
8096
" bzr mv переместить или переименовать файл в системе контроля "
8097
"версий"
8098
8099
#: dummy/help_topics/basic/detail.txt:12
8100
msgid ""
8101
" bzr status summarize changes in working copy\n"
8102
" bzr diff show detailed diffs"
8103
msgstr ""
8104
" bzr status вывести краткие изменения в рабочей копии\n"
8105
" bzr diff вывести подробные различия"
8106
8107
#: dummy/help_topics/basic/detail.txt:15
8108
msgid ""
8109
" bzr merge pull in changes from another branch\n"
8110
" bzr commit save some or all changes\n"
8111
" bzr send send changes via email"
8112
msgstr ""
8113
" bzr merge принять изменения из другой ветви\n"
8114
" bzr commit сохранить некоторые или все изменения\n"
8115
" bzr send переслать изменения по электронной почте"
8116
8117
#: dummy/help_topics/basic/detail.txt:19
8118
msgid ""
8119
" bzr log show history of changes\n"
8120
" bzr check validate storage"
8121
msgstr ""
8122
" bzr log показать историю изменений\n"
8123
" bzr check проверить целостность"
8124
8125
#: dummy/help_topics/basic/detail.txt:22
8126
msgid ""
8127
" bzr help init more help on e.g. init command\n"
8128
" bzr help commands list all commands\n"
8129
" bzr help topics list all help topics\n"
8130
msgstr ""
8131
" bzr help init подробные сведения например по команде init\n"
8132
" bzr help commands вывести список всех команд\n"
8133
" bzr help topics вывести список всех разделов справки\n"
8134
8135
#: dummy/help_topics/basic/summary.txt:1
8136
msgid "Basic commands"
8137
msgstr "Базовые команды"
8138
8139
#: dummy/help_topics/branches/detail.txt:1
8140
msgid "Branches"
8141
msgstr "Ветви"
8142
8143
#: dummy/help_topics/branches/detail.txt:3
8144
msgid ""
8145
"A branch consists of the state of a project, including all of its\n"
8146
"history. All branches have a repository associated (which is where the\n"
8147
"branch history is stored), but multiple branches may share the same\n"
8148
"repository (a shared repository). Branches can be copied and merged."
8149
msgstr ""
8150
8151
#: dummy/help_topics/branches/detail.txt:8
8152
msgid ""
8153
"In addition, one branch may be bound to another one. Binding to another\n"
8154
"branch indicates that commits which happen in this branch must also \n"
8155
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
8156
"commits when the two branches are out of date. In order for a commit \n"
8157
"to succeed, it may be necessary to update the current branch using \n"
8158
"``bzr update``."
8159
msgstr ""
8160
8161
#: dummy/help_topics/branches/detail.txt:15
8162
#: dummy/help_topics/checkouts/detail.txt:66
8163
#: dummy/help_topics/repositories/detail.txt:36
8164
msgid "Related commands::"
8165
msgstr "Связанные команды::"
8166
8167
#: dummy/help_topics/branches/detail.txt:17
8168
msgid ""
8169
" init Change a directory into a versioned branch.\n"
8170
" branch Create a new branch that is a copy of an existing branch.\n"
8171
" merge Perform a three-way merge.\n"
8172
" bind Bind a branch to another one.\n"
8173
msgstr ""
8174
8175
#: dummy/help_topics/branches/summary.txt:1
8176
msgid "Information on what a branch is"
8177
msgstr "Информация о том, что такое ветвь"
8178
8179
#: dummy/help_topics/bugs/summary.txt:1
8180
msgid "Bug tracker settings"
8181
msgstr "Установки трекера ошибок"
8182
8183
#: dummy/help_topics/checkouts/detail.txt:1
8184
msgid "Checkouts"
8185
msgstr "Рабочие копии"
8186
8187
#: dummy/help_topics/checkouts/detail.txt:3
8188
msgid ""
8189
"Checkouts are source trees that are connected to a branch, so that when\n"
8190
"you commit in the source tree, the commit goes into that branch. They\n"
8191
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
8192
"Bazaar's decentralized features until you want them. Using checkouts\n"
8193
"with shared repositories is very similar to working with SVN or CVS, but\n"
8194
"doesn't have the same restrictions. And using checkouts still allows\n"
8195
"others working on the project to use whatever workflow they like."
8196
msgstr ""
8197
8198
#: dummy/help_topics/checkouts/detail.txt:11
8199
msgid ""
8200
"A checkout is created with the bzr checkout command (see \"help "
8201
"checkout\").\n"
8202
"You pass it a reference to another branch, and it will create a local copy\n"
8203
"for you that still contains a reference to the branch you created the\n"
8204
"checkout from (the master branch). Then if you make any commits they will "
8205
"be\n"
8206
"made on the other branch first. This creates an instant mirror of your work, "
8207
"or\n"
8208
"facilitates lockstep development, where each developer is working together,\n"
8209
"continuously integrating the changes of others."
8210
msgstr ""
8211
8212
#: dummy/help_topics/checkouts/detail.txt:19
8213
msgid ""
8214
"However the checkout is still a first class branch in Bazaar terms, so that\n"
8215
"you have the full history locally. As you have a first class branch you "
8216
"can\n"
8217
"also commit locally if you want, for instance due to the temporary loss af "
8218
"a\n"
8219
"network connection. Use the --local option to commit to do this. All the "
8220
"local\n"
8221
"commits will then be made on the master branch the next time you do a non-"
8222
"local\n"
8223
"commit."
8224
msgstr ""
8225
8226
#: dummy/help_topics/checkouts/detail.txt:26
8227
msgid ""
8228
"If you are using a checkout from a shared branch you will periodically want "
8229
"to\n"
8230
"pull in all the changes made by others. This is done using the \"update\"\n"
8231
"command. The changes need to be applied before any non-local commit, but\n"
8232
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8233
"command when needed."
8234
msgstr ""
8235
8236
#: dummy/help_topics/checkouts/detail.txt:32
8237
msgid ""
8238
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8239
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8240
"SVN checkout in that it is not a first class branch, it mainly consists of "
8241
"the\n"
8242
"working tree. This means that any history operations must query the master\n"
8243
"branch, which could be slow if a network connection is involved. Also, as "
8244
"you\n"
8245
"don't have a local branch, then you cannot commit locally."
8246
msgstr ""
8247
8248
#: dummy/help_topics/checkouts/detail.txt:39
8249
msgid ""
8250
"Lightweight checkouts work best when you have fast reliable access to the\n"
8251
"master branch. This means that if the master branch is on the same disk or "
8252
"LAN\n"
8253
"a lightweight checkout will be faster than a heavyweight one for any "
8254
"commands\n"
8255
"that modify the revision history (as only one copy of the branch needs to\n"
8256
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8257
"that uses the history but does not change it, but if the master branch is "
8258
"on\n"
8259
"the same disk then there won't be a noticeable difference."
8260
msgstr ""
8261
8262
#: dummy/help_topics/checkouts/detail.txt:47
8263
msgid ""
8264
"Another possible use for a checkout is to use it with a treeless repository\n"
8265
"containing your branches, where you maintain only one working tree by\n"
8266
"switching the master branch that the checkout points to when you want to\n"
8267
"work on a different branch."
8268
msgstr ""
8269
8270
#: dummy/help_topics/checkouts/detail.txt:52
8271
msgid ""
8272
"Obviously to commit on a checkout you need to be able to write to the "
8273
"master\n"
8274
"branch. This means that the master branch must be accessible over a "
8275
"writeable\n"
8276
"protocol , such as sftp://, and that you have write permissions at the "
8277
"other\n"
8278
"end. Checkouts also work on the local file system, so that all that matters "
8279
"is\n"
8280
"file permissions."
8281
msgstr ""
8282
8283
#: dummy/help_topics/checkouts/detail.txt:58
8284
msgid ""
8285
"You can change the master of a checkout by using the \"switch\" command "
8286
"(see\n"
8287
"\"help switch\"). This will change the location that the commits are sent "
8288
"to.\n"
8289
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8290
"checkout. If you would like to convert your heavy checkout into a normal\n"
8291
"branch so that every commit is local, you can use the \"unbind\" command. To "
8292
"see\n"
8293
"whether or not a branch is bound or not you can use the \"info\" command. If "
8294
"the\n"
8295
"branch is bound it will tell you the location of the bound branch."
8296
msgstr ""
8297
8298
#: dummy/help_topics/checkouts/detail.txt:68
8299
msgid ""
8300
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
8301
" checkout\n"
8302
" update Pull any changes in the master branch in to your checkout\n"
8303
" commit Make a commit that is sent to the master branch. If you have\n"
8304
" a heavy checkout then the --local option will commit to the\n"
8305
" checkout without sending the commit to the master\n"
8306
" switch Change the master branch that the commits in the checkout "
8307
"will\n"
8308
" be sent to\n"
8309
" bind Turn a standalone branch into a heavy checkout so that any\n"
8310
" commits will be sent to the master branch\n"
8311
" unbind Turn a heavy checkout into a standalone branch so that any\n"
8312
" commits are only made locally\n"
8313
" info Displays whether a branch is bound or unbound. If the branch "
8314
"is\n"
8315
" bound, then it will also display the location of the bound "
8316
"branch\n"
8317
msgstr ""
8318
8319
#: dummy/help_topics/checkouts/summary.txt:1
8320
msgid "Information on what a checkout is"
8321
msgstr "Информация о том, что такое рабочая копия"
8322
8323
#: dummy/help_topics/commands/summary.txt:1
8324
msgid "Basic help for all commands"
8325
msgstr "Базовая справка по всем командам"
8326
8327
#: dummy/help_topics/configuration/summary.txt:1
8328
msgid "Details on the configuration settings available"
8329
msgstr ""
8330
8331
#: dummy/help_topics/conflict-types/summary.txt:1
8332
msgid "Types of conflicts and what to do about them"
8333
msgstr ""
8334
8335
#: dummy/help_topics/content-filters/summary.txt:1
8336
msgid "Conversion of content into/from working trees"
8337
msgstr ""
8338
8339
#: dummy/help_topics/criss-cross/detail.txt:1
8340
msgid "Criss-Cross"
8341
msgstr ""
8342
8343
#: dummy/help_topics/criss-cross/detail.txt:3
8344
msgid ""
8345
"A criss-cross in the branch history can cause the default merge technique\n"
8346
"to emit more conflicts than would normally be expected."
8347
msgstr ""
8348
8349
#: dummy/help_topics/criss-cross/detail.txt:6
8350
msgid ""
8351
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
8352
"give\n"
8353
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
8354
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
8355
msgstr ""
8356
8357
#: dummy/help_topics/criss-cross/detail.txt:10
8358
msgid ""
8359
"Criss-crosses occur in a branch's history if two branches merge the same "
8360
"thing\n"
8361
"and then merge one another, or if two branches merge one another at the "
8362
"same\n"
8363
"time. They can be avoided by having each branch only merge from or into a\n"
8364
"designated central branch (a \"star topology\")."
8365
msgstr ""
8366
8367
#: dummy/help_topics/criss-cross/detail.txt:15
8368
msgid ""
8369
"Criss-crosses cause problems because of the way merge works. Bazaar's "
8370
"default\n"
8371
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8372
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
8373
"differences between THIS and OTHER are due to one side adding lines, or\n"
8374
"from another side removing lines."
8375
msgstr ""
8376
8377
#: dummy/help_topics/criss-cross/detail.txt:21
8378
msgid ""
8379
"Criss-crosses mean there is no good choice for a base. Selecting the "
8380
"recent\n"
8381
"merge points could cause one side's changes to be silently discarded.\n"
8382
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8383
"are emitted."
8384
msgstr ""
8385
8386
#: dummy/help_topics/criss-cross/detail.txt:26
8387
msgid ""
8388
"The ``weave`` merge type is not affected by this problem because it uses\n"
8389
"line-origin detection instead of a basis revision to determine the cause of\n"
8390
"differences.\n"
8391
msgstr ""
8392
8393
#: dummy/help_topics/criss-cross/summary.txt:1
8394
msgid "Information on criss-cross merging"
8395
msgstr ""
8396
8397
#: dummy/help_topics/current-formats/summary.txt:1
8398
msgid "Current storage formats"
8399
msgstr ""
8400
8401
#: dummy/help_topics/debug-flags/summary.txt:1
8402
msgid "Options to show or record debug information"
8403
msgstr ""
8404
8405
#: dummy/help_topics/diverged-branches/summary.txt:1
8406
msgid "How to fix diverged branches"
8407
msgstr "Как исправлять отклонения ветвей"
8408
8409
#: dummy/help_topics/env-variables/summary.txt:1
8410
msgid "Environment variable names and values"
8411
msgstr "Имена и значения переменных окружения"
8412
8413
#: dummy/help_topics/eol/summary.txt:1
8414
msgid "Information on end-of-line handling"
8415
msgstr "Информация по обработке конца строки"
8416
8417
#: dummy/help_topics/files/detail.txt:1
8418
msgid "Files"
8419
msgstr "Файлы"
8420
8421
#: dummy/help_topics/files/detail.txt:3
8422
msgid ""
8423
":On Unix: ~/.bazaar/bazaar.conf\n"
8424
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8425
"bazaar\\\\2.0\\\\bazaar.conf"
8426
msgstr ""
8427
":В Unix: ~/.bazaar/bazaar.conf\n"
8428
":В Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8429
"bazaar\\\\2.0\\\\bazaar.conf"
8430
8431
#: dummy/help_topics/files/detail.txt:6
8432
msgid ""
8433
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8434
"used to define general configuration that will be applied everywhere.\n"
8435
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8436
"commonly used options."
8437
msgstr ""
8438
8439
#: dummy/help_topics/files/detail.txt:11
8440
msgid "A typical config file might look something like::"
8441
msgstr "Типичный файл конфигурации может выглядеть как::"
8442
8443
#: dummy/help_topics/files/detail.txt:13
8444
msgid ""
8445
" [DEFAULT]\n"
8446
" email=John Doe <jdoe@isp.com>"
8447
msgstr ""
8448
" [DEFAULT]\n"
8449
" email=John Doe <jdoe@isp.com>"
8450
8451
#: dummy/help_topics/files/detail.txt:16
8452
msgid ""
8453
" [ALIASES]\n"
8454
" commit = commit --strict\n"
8455
" log10 = log --short -r -10..-1\n"
8456
msgstr ""
8457
" [ALIASES]\n"
8458
" commit = commit --strict\n"
8459
" log10 = log --short -r -10..-1\n"
8460
8461
#: dummy/help_topics/files/summary.txt:1
8462
msgid "Information on configuration and log files"
8463
msgstr "Информация по файлам конфигурации и журналам"
8464
8465
#: dummy/help_topics/formats/detail.txt:1
8466
msgid "Storage Formats"
8467
msgstr ""
8468
8469
#: dummy/help_topics/formats/detail.txt:3
8470
msgid ""
8471
"To ensure that older clients do not access data incorrectly,\n"
8472
"Bazaar's policy is to introduce a new storage format whenever\n"
8473
"new features requiring new metadata are added. New storage\n"
8474
"formats may also be introduced to improve performance and\n"
8475
"scalability."
8476
msgstr ""
8477
8478
#: dummy/help_topics/formats/detail.txt:9
8479
msgid ""
8480
"The newest format, 2a, is highly recommended. If your\n"
8481
"project is not using 2a, then you should suggest to the\n"
8482
"project owner to upgrade."
8483
msgstr ""
8484
8485
#: dummy/help_topics/formats/detail.txt:13
8486
msgid ""
8487
"\n"
8488
".. note::"
8489
msgstr ""
8490
"\n"
8491
".. замечание::"
8492
8493
#: dummy/help_topics/formats/detail.txt:16
8494
msgid ""
8495
" Some of the older formats have two variants:\n"
8496
" a plain one and a rich-root one. The latter include an additional\n"
8497
" field about the root of the tree. There is no performance cost\n"
8498
" for using a rich-root format but you cannot easily merge changes\n"
8499
" from a rich-root format into a plain format. As a consequence,\n"
8500
" moving a project to a rich-root format takes some co-ordination\n"
8501
" in that all contributors need to upgrade their repositories\n"
8502
" around the same time. 2a and all future formats will be\n"
8503
" implicitly rich-root."
8504
msgstr ""
8505
8506
#: dummy/help_topics/formats/detail.txt:26
8507
msgid ""
8508
"See :doc:`current-formats-help` for the complete list of\n"
8509
"currently supported formats. See :doc:`other-formats-help` for\n"
8510
"descriptions of any available experimental and deprecated formats.\n"
8511
msgstr ""
8512
8513
#: dummy/help_topics/formats/summary.txt:1
8514
msgid "Information on choosing a storage format"
8515
msgstr ""
8516
8517
#: dummy/help_topics/global-options/detail.txt:1
8518
msgid "Global Options"
8519
msgstr "Общие настройки"
8520
8521
#: dummy/help_topics/global-options/detail.txt:3
8522
msgid ""
8523
"These options may be used with any command, and may appear in front of any\n"
8524
"command. (e.g. ``bzr --profile help``)."
8525
msgstr ""
8526
8527
#: dummy/help_topics/global-options/detail.txt:6
8528
msgid ""
8529
"--version Print the version number. Must be supplied before the "
8530
"command.\n"
8531
"--no-aliases Do not process command aliases when running this command.\n"
8532
"--builtin Use the built-in version of a command, not the plugin "
8533
"version.\n"
8534
" This does not suppress other plugin effects.\n"
8535
"--no-plugins Do not process any plugins.\n"
8536
"--no-l10n Do not translate messages.\n"
8537
"--concurrency Number of processes that can be run concurrently (selftest)."
8538
msgstr ""
8539
8540
#: dummy/help_topics/global-options/detail.txt:14
8541
msgid ""
8542
"--profile Profile execution using the hotshot profiler.\n"
8543
"--lsprof Profile execution using the lsprof profiler.\n"
8544
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8545
" results to a specified file. If the filename ends with "
8546
"\".txt\",\n"
8547
" text format will be used. If the filename either starts "
8548
"with\n"
8549
" \"callgrind.out\" or end with \".callgrind\", the output will "
8550
"be\n"
8551
" formatted for use with KCacheGrind. Otherwise, the output\n"
8552
" will be a pickle.\n"
8553
"--coverage Generate line coverage report in the specified directory."
8554
msgstr ""
8555
8556
#: dummy/help_topics/global-options/detail.txt:24
8557
msgid ""
8558
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8559
"for\n"
8560
" the duration of the command. This can be used multiple times "
8561
"if\n"
8562
" several options need to be overridden."
8563
msgstr ""
8564
8565
#: dummy/help_topics/global-options/detail.txt:28
8566
msgid ""
8567
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8568
"information on profiling."
8569
msgstr ""
8570
8571
#: dummy/help_topics/global-options/detail.txt:31
8572
msgid ""
8573
"A number of debug flags are also available to assist troubleshooting and\n"
8574
"development. See :doc:`debug-flags-help`.\n"
8575
msgstr ""
8576
8577
#: dummy/help_topics/global-options/summary.txt:1
8578
msgid "Options that control how Bazaar runs"
8579
msgstr "Настройки, управляющие запуском Bazaar"
8580
8581
#: dummy/help_topics/hidden-commands/summary.txt:1
8582
msgid "All hidden commands"
8583
msgstr "Все скрытые команды"
8584
8585
#: dummy/help_topics/hooks/summary.txt:1
8586
msgid "Points at which custom processing can be added"
8587
msgstr ""
8588
8589
#: dummy/help_topics/launchpad/detail.txt:1
8590
msgid "Integration with Launchpad.net"
8591
msgstr "Интеграция с Launchpad.net"
8592
8593
#: dummy/help_topics/launchpad/detail.txt:3
8594
msgid ""
8595
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8596
"specification tracking."
8597
msgstr ""
8598
8599
#: dummy/help_topics/launchpad/detail.txt:6
8600
msgid ""
8601
"The bzr client (through the plugin called 'launchpad') has special\n"
8602
"features to communicate with Launchpad:"
8603
msgstr ""
8604
8605
#: dummy/help_topics/launchpad/detail.txt:9
8606
msgid ""
8607
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8608
"This\n"
8609
" is then used by the 'lp:' transport to download your branches using\n"
8610
" bzr+ssh://."
8611
msgstr ""
8612
8613
#: dummy/help_topics/launchpad/detail.txt:13
8614
msgid ""
8615
" * The 'lp:' transport uses Launchpad as a directory service: for "
8616
"example\n"
8617
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8618
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8619
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8620
msgstr ""
8621
8622
#: dummy/help_topics/launchpad/detail.txt:18
8623
msgid ""
8624
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8625
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8626
"lp:12345'\n"
8627
" will record a revision property that marks that revision as fixing\n"
8628
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8629
" automatically be linked to the bug report."
8630
msgstr ""
8631
8632
#: dummy/help_topics/launchpad/detail.txt:24
8633
msgid ""
8634
" * The register-branch command tells Launchpad about the url of a\n"
8635
" public branch. Launchpad will then mirror the branch, display\n"
8636
" its contents and allow it to be attached to bugs and other\n"
8637
" objects."
8638
msgstr ""
8639
8640
#: dummy/help_topics/launchpad/detail.txt:29
8641
msgid "For more information see http://help.launchpad.net/\n"
8642
msgstr "Больше информации можно найти на http://help.launchpad.net/\n"
8643
8644
#: dummy/help_topics/launchpad/summary.txt:1
8645
msgid "Using Bazaar with Launchpad.net"
8646
msgstr "Использование Bazaar с Launchpad.net"
8647
8648
#: dummy/help_topics/location-alias/summary.txt:1
8649
msgid "Aliases for remembered locations"
8650
msgstr ""
8651
8652
#: dummy/help_topics/log-formats/summary.txt:1
8653
msgid "Details on the logging formats available"
8654
msgstr ""
8655
8656
#: dummy/help_topics/other-formats/summary.txt:1
8657
msgid "Experimental and deprecated storage formats"
8658
msgstr ""
8659
8660
#: dummy/help_topics/patterns/summary.txt:1
8661
msgid "Information on the pattern syntax"
8662
msgstr ""
8663
8664
#: dummy/help_topics/repositories/detail.txt:1
8665
msgid "Repositories"
8666
msgstr ""
8667
8668
#: dummy/help_topics/repositories/detail.txt:3
8669
msgid ""
8670
"Repositories in Bazaar are where committed information is stored. There is\n"
8671
"a repository associated with every branch."
8672
msgstr ""
8673
8674
#: dummy/help_topics/repositories/detail.txt:6
8675
msgid ""
8676
"Repositories are a form of database. Bzr will usually maintain this for\n"
8677
"good performance automatically, but in some situations (e.g. when doing\n"
8678
"very many commits in a short time period) you may want to ask bzr to\n"
8679
"optimise the database indices. This can be done by the 'bzr pack' command."
8680
msgstr ""
8681
8682
#: dummy/help_topics/repositories/detail.txt:11
8683
msgid ""
8684
"By default just running 'bzr init' will create a repository within the new\n"
8685
"branch but it is possible to create a shared repository which allows "
8686
"multiple\n"
8687
"branches to share their information in the same location. When a new branch "
8688
"is\n"
8689
"created it will first look to see if there is a containing shared repository "
8690
"it\n"
8691
"can use."
8692
msgstr ""
8693
8694
#: dummy/help_topics/repositories/detail.txt:17
8695
msgid ""
8696
"When two branches of the same project share a repository, there is\n"
8697
"generally a large space saving. For some operations (e.g. branching\n"
8698
"within the repository) this translates in to a large time saving."
8699
msgstr ""
8700
8701
#: dummy/help_topics/repositories/detail.txt:21
8702
msgid ""
8703
"To create a shared repository use the init-repository command (or the alias\n"
8704
"init-repo). This command takes the location of the repository to create. "
8705
"This\n"
8706
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8707
"which contains a shared repository. Any new branches that are created in "
8708
"this\n"
8709
"directory will then use it for storage."
8710
msgstr ""
8711
8712
#: dummy/help_topics/repositories/detail.txt:27
8713
msgid ""
8714
"It is a good idea to create a repository whenever you might create more\n"
8715
"than one branch of a project. This is true for both working areas where you\n"
8716
"are doing the development, and any server areas that you use for hosting\n"
8717
"projects. In the latter case, it is common to want branches without working\n"
8718
"trees. Since the files in the branch will not be edited directly there is "
8719
"no\n"
8720
"need to use up disk space for a working tree. To create a repository in "
8721
"which\n"
8722
"the branches will not have working trees pass the '--no-trees' option to\n"
8723
"'init-repository'."
8724
msgstr ""
8725
8726
#: dummy/help_topics/repositories/detail.txt:38
8727
msgid ""
8728
" init-repository Create a shared repository. Use --no-trees to create "
8729
"one\n"
8730
" in which new branches won't get a working tree.\n"
8731
msgstr ""
8732
8733
#: dummy/help_topics/repositories/summary.txt:1
8734
msgid "Basic information on shared repositories."
8735
msgstr "Базовая информация об общих репозиториях."
8736
8737
#: dummy/help_topics/revisionspec/summary.txt:1
8738
msgid "Explain how to use --revision"
8739
msgstr ""
8740
8741
#: dummy/help_topics/rules/summary.txt:1
8742
msgid "Information on defining rule-based preferences"
8743
msgstr ""
8744
8745
#: dummy/help_topics/standalone-trees/detail.txt:1
8746
msgid "Standalone Trees"
8747
msgstr ""
8748
8749
#: dummy/help_topics/standalone-trees/detail.txt:3
8750
msgid ""
8751
"A standalone tree is a working tree with an associated repository. It\n"
8752
"is an independently usable branch, with no dependencies on any other.\n"
8753
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8754
"an existing project under version control."
8755
msgstr ""
8756
8757
#: dummy/help_topics/standalone-trees/detail.txt:8
8758
msgid "Related Commands::"
8759
msgstr ""
8760
8761
#: dummy/help_topics/standalone-trees/detail.txt:10
8762
msgid " init Make a directory into a versioned branch.\n"
8763
msgstr ""
8764
8765
#: dummy/help_topics/standalone-trees/summary.txt:1
8766
msgid "Information on what a standalone tree is"
8767
msgstr ""
8768
8769
#: dummy/help_topics/standard-options/detail.txt:1
8770
msgid "Standard Options"
8771
msgstr ""
8772
8773
#: dummy/help_topics/standard-options/detail.txt:3
8774
msgid "Standard options are legal for all commands."
8775
msgstr ""
8776
8777
#: dummy/help_topics/standard-options/detail.txt:5
8778
msgid ""
8779
"--help, -h Show help message.\n"
8780
"--verbose, -v Display more information.\n"
8781
"--quiet, -q Only display errors and warnings."
8782
msgstr ""
8783
8784
#: dummy/help_topics/standard-options/detail.txt:9
8785
msgid "Unlike global options, standard options can be used in aliases.\n"
8786
msgstr ""
8787
8788
#: dummy/help_topics/standard-options/summary.txt:1
8789
msgid "Options that can be used with any command"
8790
msgstr ""
8791
8792
#: dummy/help_topics/status-flags/detail.txt:1
8793
msgid "Status Flags"
8794
msgstr ""
8795
8796
#: dummy/help_topics/status-flags/detail.txt:3
8797
msgid ""
8798
"Status flags are used to summarise changes to the working tree in a concise\n"
8799
"manner. They are in the form::"
8800
msgstr ""
8801
8802
#: dummy/help_topics/status-flags/detail.txt:6
8803
msgid " xxx <filename>"
8804
msgstr ""
8805
8806
#: dummy/help_topics/status-flags/detail.txt:8
8807
msgid "where the columns' meanings are as follows."
8808
msgstr ""
8809
8810
#: dummy/help_topics/status-flags/detail.txt:10
8811
msgid "Column 1 - versioning/renames::"
8812
msgstr ""
8813
8814
#: dummy/help_topics/status-flags/detail.txt:12
8815
msgid ""
8816
" + File versioned\n"
8817
" - File unversioned\n"
8818
" R File renamed\n"
8819
" ? File unknown\n"
8820
" X File nonexistent (and unknown to bzr)\n"
8821
" C File has conflicts\n"
8822
" P Entry for a pending merge (not a file)"
8823
msgstr ""
8824
8825
#: dummy/help_topics/status-flags/detail.txt:20
8826
msgid "Column 2 - contents::"
8827
msgstr ""
8828
8829
#: dummy/help_topics/status-flags/detail.txt:22
8830
msgid ""
8831
" N File created\n"
8832
" D File deleted\n"
8833
" K File kind changed\n"
8834
" M File modified"
8835
msgstr ""
8836
" N Файл создан\n"
8837
" D Файл удалён\n"
8838
" K Тип файла изменился\n"
8839
" M Файл изменён"
8840
8841
#: dummy/help_topics/status-flags/detail.txt:27
8842
msgid "Column 3 - execute::"
8843
msgstr ""
8844
8845
#: dummy/help_topics/status-flags/detail.txt:29
8846
msgid " * The execute bit was changed\n"
8847
msgstr ""
8848
8849
#: dummy/help_topics/status-flags/summary.txt:1
8850
msgid "Help on status flags"
8851
msgstr ""
8852
8853
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8854
msgid "Branches Out of Sync"
8855
msgstr ""
8856
8857
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8858
msgid ""
8859
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8860
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8861
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8862
"have the same last revision as the new reference branch for the lightweight\n"
8863
"checkout, data could be lost, so Bazaar refuses."
8864
msgstr ""
8865
8866
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8867
msgid "How you deal with this depends on *why* the branches are out of sync."
8868
msgstr ""
8869
8870
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8871
msgid ""
8872
"If you have a checkout and have done local commits, you can get back in "
8873
"sync\n"
8874
"by running \"bzr update\" (and possibly \"bzr commit\")."
8875
msgstr ""
8876
8877
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8878
msgid ""
8879
"If you have a branch and the remote branch is out-of-date, you can push\n"
8880
"the local changes using \"bzr push\". If the local branch is out of date, "
8881
"you\n"
8882
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8883
"commit\n"
8884
"and then push your changes. If you decide that some of the changes aren't\n"
8885
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8886
msgstr ""
8887
8888
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8889
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8890
msgstr ""
8891
8892
#: dummy/help_topics/topics/summary.txt:1
8893
msgid "Topics list"
8894
msgstr ""
8895
8896
#: dummy/help_topics/url-special-chars/summary.txt:1
8897
msgid "Special character handling in URLs"
8898
msgstr ""
8899
8900
#: dummy/help_topics/urlspec/summary.txt:1
8901
msgid "Supported transport protocols"
8902
msgstr ""
8903
8904
#: dummy/help_topics/working-trees/detail.txt:1
8905
msgid "Working Trees"
8906
msgstr ""
8907
8908
#: dummy/help_topics/working-trees/detail.txt:3
8909
msgid ""
8910
"A working tree is the contents of a branch placed on disk so that you can\n"
8911
"see the files and edit them. The working tree is where you make changes to "
8912
"a\n"
8913
"branch, and when you commit the current state of the working tree is the\n"
8914
"snapshot that is recorded in the commit."
8915
msgstr ""
8916
8917
#: dummy/help_topics/working-trees/detail.txt:8
8918
msgid ""
8919
"When you push a branch to a remote system, a working tree will not be\n"
8920
"created. If one is already present the files will not be updated. The\n"
8921
"branch information will be updated and the working tree will be marked\n"
8922
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8923
"may be uncommitted changes or the update may cause content conflicts that "
8924
"are\n"
8925
"difficult to deal with remotely."
8926
msgstr ""
8927
8928
#: dummy/help_topics/working-trees/detail.txt:15
8929
msgid ""
8930
"If you have a branch with no working tree you can use the 'checkout' "
8931
"command\n"
8932
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8933
"will\n"
8934
"create the working tree. If the branch is updated remotely, you can update "
8935
"the\n"
8936
"working tree by running 'bzr update' in that directory."
8937
msgstr ""
8938
8939
#: dummy/help_topics/working-trees/detail.txt:20
8940
msgid ""
8941
"If you have a branch with a working tree that you do not want the 'remove-"
8942
"tree'\n"
8943
"command will remove the tree if it is safe. This can be done to avoid the\n"
8944
"warning about the remote working tree not being updated when pushing to the\n"
8945
"branch. It can also be useful when working with a '--no-trees' repository\n"
8946
"(see 'bzr help repositories')."
8947
msgstr ""
8948
8949
#: dummy/help_topics/working-trees/detail.txt:26
8950
msgid ""
8951
"If you want to have a working tree on a remote machine that you push to you\n"
8952
"can either run 'bzr update' in the remote branch after each push, or use "
8953
"some\n"
8954
"other method to update the tree during the push. There is an 'rspush' "
8955
"plugin\n"
8956
"that will update the working tree using rsync as well as doing a push. "
8957
"There\n"
8958
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8959
"SSH\n"
8960
"after each push."
8961
msgstr ""
8962
8963
#: dummy/help_topics/working-trees/detail.txt:33
8964
msgid "Useful commands::"
8965
msgstr ""
8966
8967
#: dummy/help_topics/working-trees/detail.txt:35
8968
msgid ""
8969
" checkout Create a working tree when a branch does not have one.\n"
8970
" remove-tree Removes the working tree from a branch when it is safe to do "
8971
"so.\n"
8972
" update When a working tree is out of sync with its associated "
8973
"branch\n"
8974
" this will update the tree to match the branch.\n"
8975
msgstr ""
8976
8977
#: dummy/help_topics/working-trees/summary.txt:1
8978
msgid "Information on working trees"
8979
msgstr ""
8980
8981
#: en/help_topics/authentication.txt:1
8982
msgid ""
8983
"Authentication Settings\n"
8984
"======================="
8985
msgstr ""
8986
8987
#: en/help_topics/authentication.txt:4
8988
msgid ""
8989
"\n"
8990
"Intent\n"
8991
"------"
8992
msgstr ""
8993
8994
#: en/help_topics/authentication.txt:8
8995
msgid ""
8996
"Many different authentication policies can be described in the\n"
8997
"``authentication.conf`` file but a particular user should need only a few\n"
8998
"definitions to cover his needs without having to specify a user and a "
8999
"password\n"
9000
"for every branch he uses."
9001
msgstr ""
9002
9003
#: en/help_topics/authentication.txt:13
9004
msgid ""
9005
"The definitions found in this file are used to find the credentials to use "
9006
"for\n"
9007
"a given url. The same credentials can generally be used for as many branches "
9008
"as\n"
9009
"possible by grouping their declaration around the remote servers that need\n"
9010
"them. It's even possible to declare credentials that will be used by "
9011
"different\n"
9012
"servers."
9013
msgstr ""
9014
9015
#: en/help_topics/authentication.txt:19
9016
msgid ""
9017
"The intent is to make this file as small as possible to minimize maintenance."
9018
msgstr ""
9019
9020
#: en/help_topics/authentication.txt:21
9021
msgid ""
9022
"Once the relevant credentials are declared in this file you may use branch "
9023
"urls\n"
9024
"without embedding passwords (security hazard) or even users (enabling "
9025
"sharing\n"
9026
"of your urls with others)."
9027
msgstr ""
9028
9029
#: en/help_topics/authentication.txt:25
9030
msgid "Instead of using::"
9031
msgstr "Вместо использования::"
9032
9033
#: en/help_topics/authentication.txt:27
9034
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
9035
msgstr " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
9036
9037
#: en/help_topics/authentication.txt:29
9038
msgid "you simply use::"
9039
msgstr "можно просто использовать::"
9040
9041
#: en/help_topics/authentication.txt:31
9042
msgid " bzr branch ftp://host.com/path/to/my/branch"
9043
msgstr " bzr branch ftp://host.com/path/to/my/branch"
9044
9045
#: en/help_topics/authentication.txt:33
9046
msgid ""
9047
"provided you have created the following ``authentication.conf`` file::"
9048
msgstr ""
9049
9050
#: en/help_topics/authentication.txt:35
9051
msgid ""
9052
" [myprojects]\n"
9053
" scheme=ftp\n"
9054
" host=host.com\n"
9055
" user=joe\n"
9056
" password=secret\n"
9057
" "
9058
msgstr ""
9059
" [myprojects]\n"
9060
" scheme=ftp\n"
9061
" host=host.com\n"
9062
" user=joe\n"
9063
" password=secret\n"
9064
" "
9065
9066
#: en/help_topics/authentication.txt:42
9067
msgid ""
9068
"Authentication definitions\n"
9069
"--------------------------"
9070
msgstr ""
9071
9072
#: en/help_topics/authentication.txt:45
9073
msgid ""
9074
"There are two kinds of authentication used by the various schemes supported "
9075
"by\n"
9076
"bzr:"
9077
msgstr ""
9078
9079
#: en/help_topics/authentication.txt:48
9080
msgid "1. user and password"
9081
msgstr ""
9082
9083
#: en/help_topics/authentication.txt:50
9084
msgid ""
9085
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
9086
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
9087
"ssh agents are a better, more secure solution. So we have chosen to not "
9088
"provide\n"
9089
"our own less secure method."
9090
msgstr ""
9091
9092
#: en/help_topics/authentication.txt:55
9093
msgid "2. user, realm and password"
9094
msgstr ""
9095
9096
#: en/help_topics/authentication.txt:57
9097
msgid ""
9098
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
9099
"against a host. But, by using ``.htaccess`` files, for example, it is "
9100
"possible\n"
9101
"to define several (``user, realm, password``) for a given ``host``. So what "
9102
"is\n"
9103
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
9104
"is\n"
9105
"not taken into account in the definitions, but will displayed if bzr "
9106
"prompts\n"
9107
"you for a password."
9108
msgstr ""
9109
9110
#: en/help_topics/authentication.txt:64
9111
msgid ""
9112
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
9113
"specifying the appropriate port."
9114
msgstr ""
9115
9116
#: en/help_topics/authentication.txt:67
9117
msgid ""
9118
"To take all schemes into account, the password will be deduced from a set "
9119
"of\n"
9120
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
9121
"``user``,\n"
9122
"``password``)."
9123
msgstr ""
9124
9125
#: en/help_topics/authentication.txt:71
9126
msgid ""
9127
" * ``scheme``: can be empty (meaning the rest of the definition can be "
9128
"used\n"
9129
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
9130
"``ssh``\n"
9131
" should be used instead since this is the real scheme regarding\n"
9132
" authentication,"
9133
msgstr ""
9134
9135
#: en/help_topics/authentication.txt:76
9136
msgid " * ``host``: can be empty (to act as a default for any host),"
9137
msgstr ""
9138
9139
#: en/help_topics/authentication.txt:78
9140
msgid ""
9141
" * ``port`` can be empty (useful when an host provides several servers for "
9142
"the\n"
9143
" same scheme), only numerical values are allowed, this should be used "
9144
"only\n"
9145
" when the server uses a port different than the scheme standard port,"
9146
msgstr ""
9147
9148
#: en/help_topics/authentication.txt:82
9149
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
9150
msgstr ""
9151
9152
#: en/help_topics/authentication.txt:84
9153
msgid ""
9154
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
9155
" ``getpass.get_user()``),"
9156
msgstr ""
9157
9158
#: en/help_topics/authentication.txt:87
9159
msgid ""
9160
" * ``password``: can be empty if you prefer to always be prompted for your\n"
9161
" password."
9162
msgstr ""
9163
9164
#: en/help_topics/authentication.txt:90
9165
msgid ""
9166
"Multiple definitions can be provided and, for a given URL, bzr will select "
9167
"a\n"
9168
"(``user`` [, ``password``]) based on the following rules :"
9169
msgstr ""
9170
9171
#: en/help_topics/authentication.txt:93
9172
msgid " 1. the first match wins,"
9173
msgstr ""
9174
9175
#: en/help_topics/authentication.txt:95
9176
msgid " 2. empty fields match everything,"
9177
msgstr ""
9178
9179
#: en/help_topics/authentication.txt:97
9180
msgid ""
9181
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
9182
msgstr ""
9183
9184
#: en/help_topics/authentication.txt:99
9185
msgid ""
9186
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
9187
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
9188
"``projectbzr.sf.net``\n"
9189
" will not match ``bzr.sf.net``)."
9190
msgstr ""
9191
9192
#: en/help_topics/authentication.txt:103
9193
msgid ""
9194
" 5. ``port`` matches if included in the requested URL (exact matches only)"
9195
msgstr ""
9196
9197
#: en/help_topics/authentication.txt:105
9198
msgid ""
9199
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
9200
"above,\n"
9201
" empty paths will match any provided path)."
9202
msgstr ""
9203
9204
#: en/help_topics/authentication.txt:110
9205
msgid ""
9206
"File format\n"
9207
"-----------"
9208
msgstr ""
9209
9210
#: en/help_topics/authentication.txt:113
9211
msgid ""
9212
"The general rules for :doc:`configuration files <configuration-help>`\n"
9213
"apply except for the variable policies."
9214
msgstr ""
9215
9216
#: en/help_topics/authentication.txt:116
9217
msgid "Each section describes an authentication definition."
9218
msgstr ""
9219
9220
#: en/help_topics/authentication.txt:118
9221
msgid ""
9222
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9223
"reserved\n"
9224
"and should appear as the *last* section."
9225
msgstr ""
9226
9227
#: en/help_topics/authentication.txt:121
9228
msgid "Each section should define:"
9229
msgstr ""
9230
9231
#: en/help_topics/authentication.txt:123
9232
msgid "* ``user``: the login to be used,"
9233
msgstr ""
9234
9235
#: en/help_topics/authentication.txt:125
9236
msgid "Each section could define:"
9237
msgstr ""
9238
9239
#: en/help_topics/authentication.txt:127
9240
msgid "* ``host``: the remote server,"
9241
msgstr ""
9242
9243
#: en/help_topics/authentication.txt:129
9244
msgid "* ``port``: the port the server is listening,"
9245
msgstr ""
9246
9247
#: en/help_topics/authentication.txt:131
9248
msgid "* ``path``: the branch location,"
9249
msgstr ""
9250
9251
#: en/help_topics/authentication.txt:133
9252
msgid "* ``password``: the password."
9253
msgstr ""
9254
9255
#: en/help_topics/authentication.txt:135
9256
msgid ""
9257
"\n"
9258
"Examples\n"
9259
"--------"
9260
msgstr ""
9261
9262
#: en/help_topics/authentication.txt:139
9263
msgid ""
9264
"\n"
9265
"Personal projects hosted outside\n"
9266
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9267
msgstr ""
9268
9269
#: en/help_topics/authentication.txt:143
9270
msgid ""
9271
"All connections are done with the same ``user`` (the remote one for which "
9272
"the\n"
9273
"default bzr one is not appropriate) and the password is always prompted "
9274
"with\n"
9275
"some exceptions::"
9276
msgstr ""
9277
9278
#: en/help_topics/authentication.txt:147
9279
msgid ""
9280
" # Pet projects on hobby.net\n"
9281
" [hobby]\n"
9282
" host=r.hobby.net\n"
9283
" user=jim\n"
9284
" password=obvious1234\n"
9285
" \n"
9286
" # Home server\n"
9287
" [home]\n"
9288
" scheme=https\n"
9289
" host=home.net\n"
9290
" user=joe\n"
9291
" password=1essobV10us\n"
9292
" \n"
9293
" [DEFAULT]\n"
9294
" # Our local user is barbaz, on all remote sites we're known as "
9295
"foobar\n"
9296
" user=foobar"
9297
msgstr ""
9298
9299
#: en/help_topics/authentication.txt:164
9300
msgid ""
9301
"\n"
9302
"Source hosting provider\n"
9303
"~~~~~~~~~~~~~~~~~~~~~~~"
9304
msgstr ""
9305
9306
#: en/help_topics/authentication.txt:168
9307
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9308
msgstr ""
9309
9310
#: en/help_topics/authentication.txt:170
9311
msgid ""
9312
" [shpnet domain]\n"
9313
" # we use sftp, but ssh is the scheme used for authentication\n"
9314
" scheme=ssh\n"
9315
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9316
" host=.shp.net\n"
9317
" user=joe\n"
9318
" # bzr don't support supplying a password for sftp,\n"
9319
" # consider using an ssh agent if you don't want to supply\n"
9320
" # a password interactively. (pageant, ssh-agent, etc)"
9321
msgstr ""
9322
9323
#: en/help_topics/authentication.txt:180
9324
msgid ""
9325
"HTTPS, SFTP servers and their proxy\n"
9326
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9327
msgstr ""
9328
9329
#: en/help_topics/authentication.txt:183
9330
msgid ""
9331
"At company.com, the server hosting release and integration branches is "
9332
"behind a\n"
9333
"proxy, and the two branches use different authentication policies::"
9334
msgstr ""
9335
9336
#: en/help_topics/authentication.txt:186
9337
msgid ""
9338
" [reference code]\n"
9339
" scheme=https\n"
9340
" host=dev.company.com\n"
9341
" path=/dev\n"
9342
" user=user1\n"
9343
" password=pass1"
9344
msgstr ""
9345
9346
#: en/help_topics/authentication.txt:193
9347
msgid ""
9348
" # development branches on dev server\n"
9349
" [dev]\n"
9350
" scheme=ssh # bzr+ssh and sftp are available here\n"
9351
" host=dev.company.com\n"
9352
" path=/dev/integration\n"
9353
" user=user2\n"
9354
" \n"
9355
" # proxy\n"
9356
" [proxy]\n"
9357
" scheme=http\n"
9358
" host=proxy.company.com\n"
9359
" port=3128\n"
9360
" user=proxyuser1\n"
9361
" password=proxypass1"
9362
msgstr ""
9363
9364
#: en/help_topics/authentication.txt:208
9365
msgid ""
9366
"\n"
9367
"Planned enhancements\n"
9368
"--------------------"
9369
msgstr ""
9370
9371
#: en/help_topics/authentication.txt:212
9372
msgid ""
9373
"The following are not yet implemented but planned as parts of a work in\n"
9374
"progress:"
9375
msgstr ""
9376
9377
#: en/help_topics/authentication.txt:215
9378
msgid "* add a ``password_encoding`` field allowing:"
9379
msgstr ""
9380
9381
#: en/help_topics/authentication.txt:217
9382
msgid ""
9383
" - storing the passwords in various obfuscating encodings (base64 for one),"
9384
msgstr ""
9385
9386
#: en/help_topics/authentication.txt:219
9387
msgid " - delegate password storage to plugins (.netrc for example)."
9388
msgstr ""
9389
9390
#: en/help_topics/authentication.txt:221
9391
msgid ""
9392
"* update the credentials when the user is prompted for user or password,"
9393
msgstr ""
9394
9395
#: en/help_topics/authentication.txt:223
9396
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9397
msgstr ""
9398
9399
#: en/help_topics/authentication.txt:225
9400
msgid ""
9401
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9402
"but\n"
9403
"ignored in the actual implementation.\n"
9404
msgstr ""
9405
9406
#: en/help_topics/bugs.txt:1
9407
msgid "Bug Tracker Settings"
9408
msgstr ""
9409
9410
#: en/help_topics/bugs.txt:3
9411
msgid ""
9412
"When making a commit, metadata about bugs fixed by that change can be\n"
9413
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9414
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9415
"(The only ``status`` value currently supported is ``fixed.``)"
9416
msgstr ""
9417
9418
#: en/help_topics/bugs.txt:8
9419
msgid ""
9420
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9421
"identifier\n"
9422
"rather than a full URL. This looks like::"
9423
msgstr ""
9424
9425
#: en/help_topics/bugs.txt:11
9426
msgid " bzr commit --fixes <tracker>:<id>"
9427
msgstr ""
9428
9429
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9430
msgid "or::"
9431
msgstr ""
9432
9433
#: en/help_topics/bugs.txt:15
9434
msgid " bzr commit --fixes <id>"
9435
msgstr ""
9436
9437
#: en/help_topics/bugs.txt:17
9438
msgid ""
9439
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9440
"the\n"
9441
"identifier for that bug within the bugtracker, usually the bug number.\n"
9442
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9443
"or global configuration is used."
9444
msgstr ""
9445
9446
#: en/help_topics/bugs.txt:22
9447
msgid ""
9448
"Bazaar knows about a few bug trackers that have many users. If\n"
9449
"you use one of these bug trackers then there is no setup required to\n"
9450
"use this feature, you just need to know the tracker identifier to use.\n"
9451
"These are the bugtrackers that are built in:"
9452
msgstr ""
9453
9454
#: en/help_topics/bugs.txt:27
9455
msgid ""
9456
" ============================ ============ ============\n"
9457
" URL Abbreviation Example\n"
9458
" ============================ ============ ============\n"
9459
" https://bugs.launchpad.net/ lp lp:12345\n"
9460
" http://bugs.debian.org/ deb deb:12345\n"
9461
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9462
" ============================ ============ ============"
9463
msgstr ""
9464
9465
#: en/help_topics/bugs.txt:35
9466
msgid ""
9467
"For the bug trackers not listed above configuration is required.\n"
9468
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9469
"is built in, along with a template mechanism for other bugtrackers with\n"
9470
"simple URL schemes. If your bug tracker can't be described by one\n"
9471
"of the schemes described below then you can write a plugin to support\n"
9472
"it."
9473
msgstr ""
9474
9475
#: en/help_topics/bugs.txt:42
9476
msgid ""
9477
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9478
"variable which contains the base URL of the bug tracker. These options\n"
9479
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9480
"configuration section in ``locations.conf``. You can set up these values\n"
9481
"for each of the projects you work on."
9482
msgstr ""
9483
9484
#: en/help_topics/bugs.txt:48
9485
msgid ""
9486
"Note: As you provide a short name for each tracker, you can specify one or\n"
9487
"more bugs in one or more trackers at commit time if you wish."
9488
msgstr ""
9489
9490
#: en/help_topics/bugs.txt:51
9491
msgid ""
9492
"Launchpad\n"
9493
"---------"
9494
msgstr ""
9495
9496
#: en/help_topics/bugs.txt:54
9497
msgid ""
9498
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9499
msgstr ""
9500
9501
#: en/help_topics/bugs.txt:56
9502
msgid ""
9503
"bugzilla_<tracker>_url\n"
9504
"----------------------"
9505
msgstr ""
9506
9507
#: en/help_topics/bugs.txt:59
9508
msgid ""
9509
"If present, the location of the Bugzilla bug tracker referred to by\n"
9510
"<tracker>. This option can then be used together with ``bzr commit\n"
9511
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9512
"example::"
9513
msgstr ""
9514
9515
#: en/help_topics/bugs.txt:64
9516
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9517
msgstr ""
9518
9519
#: en/help_topics/bugs.txt:66
9520
msgid ""
9521
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9522
"fixed."
9523
msgstr ""
9524
9525
#: en/help_topics/bugs.txt:69
9526
msgid ""
9527
"trac_<tracker>_url\n"
9528
"------------------"
9529
msgstr ""
9530
9531
#: en/help_topics/bugs.txt:72
9532
msgid ""
9533
"If present, the location of the Trac instance referred to by\n"
9534
"<tracker>. This option can then be used together with ``bzr commit\n"
9535
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9536
"example::"
9537
msgstr ""
9538
9539
#: en/help_topics/bugs.txt:77
9540
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9541
msgstr ""
9542
9543
#: en/help_topics/bugs.txt:79
9544
msgid ""
9545
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9546
"as\n"
9547
"fixed."
9548
msgstr ""
9549
9550
#: en/help_topics/bugs.txt:82
9551
msgid ""
9552
"bugtracker_<tracker>_url\n"
9553
"------------------------"
9554
msgstr ""
9555
9556
#: en/help_topics/bugs.txt:85
9557
msgid ""
9558
"If present, the location of a generic bug tracker instance referred to by\n"
9559
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9560
"which will be replaced by a specific bug ID. This option can then be used\n"
9561
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9562
"fixed by that commit. For example::"
9563
msgstr ""
9564
9565
#: en/help_topics/bugs.txt:91
9566
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9567
msgstr ""
9568
9569
#: en/help_topics/bugs.txt:93
9570
msgid ""
9571
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9572
"Roundup bug tracker as fixed, or::"
9573
msgstr ""
9574
9575
#: en/help_topics/bugs.txt:96
9576
msgid ""
9577
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9578
msgstr ""
9579
9580
#: en/help_topics/bugs.txt:98
9581
msgid ""
9582
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9583
"RT bug tracker as fixed, or::"
9584
msgstr ""
9585
9586
#: en/help_topics/bugs.txt:101
9587
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9588
msgstr ""
9589
9590
#: en/help_topics/bugs.txt:103
9591
msgid ""
9592
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9593
"1234\n"
9594
"in Hudson's JIRA bug tracker as fixed.\n"
9595
msgstr ""
9596
9597
#: en/help_topics/commands.txt:1
9598
msgid ""
9599
"add Add specified files or directories.\n"
9600
"alias Set/unset and display aliases.\n"
9601
"annotate Show the origin of each line in a file.\n"
9602
"bash-completion Generate a shell function for bash command line "
9603
"completion.\n"
9604
" [bash_completion]\n"
9605
"bind Convert the current branch into a checkout of the "
9606
"supplied\n"
9607
" branch.\n"
9608
"branch Create a new branch that is a copy of an existing branch.\n"
9609
"branches List the branches available at the current location.\n"
9610
"break-lock Break a dead lock.\n"
9611
"cat Write the contents of a file as of a given revision to\n"
9612
" standard output.\n"
9613
"check Validate working tree structure, branch consistency and\n"
9614
" repository history.\n"
9615
"checkout Create a new checkout of an existing branch.\n"
9616
"clean-tree Remove unwanted files from working tree.\n"
9617
"commit Commit changes into a new revision.\n"
9618
"config Display, set or remove a configuration option.\n"
9619
"conflicts List files with conflicts.\n"
9620
"deleted List files deleted in the working tree.\n"
9621
"diff Show differences in the working tree, between revisions "
9622
"or\n"
9623
" branches.\n"
9624
"dpush Push into a different VCS without any custom bzr "
9625
"metadata.\n"
9626
"export Export current or past revision to a destination directory "
9627
"or\n"
9628
" archive.\n"
9629
"help Show help on a command or other topic.\n"
9630
"ignore Ignore specified files or patterns.\n"
9631
"ignored List ignored files and the patterns that matched them.\n"
9632
"info Show information about a working tree, branch or "
9633
"repository.\n"
9634
"init Make a directory into a versioned branch.\n"
9635
"init-repository Create a shared repository for branches to share storage\n"
9636
" space.\n"
9637
"join Combine a tree into its containing tree.\n"
9638
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9639
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9640
"launchpad-open Open a Launchpad branch page in your web browser. "
9641
"[launchpad]\n"
9642
"log Show historical log for a branch or subset of a branch.\n"
9643
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9644
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9645
"ls List files in a tree.\n"
9646
"merge Perform a three-way merge.\n"
9647
"missing Show unmerged/unpulled revisions between two branches.\n"
9648
"mkdir Create a new versioned directory.\n"
9649
"mv Move or rename a file.\n"
9650
"nick Print or set the branch nickname.\n"
9651
"pack Compress the data within a repository.\n"
9652
"plugins List the installed plugins.\n"
9653
"pull Turn this branch into a mirror of another branch.\n"
9654
"push Update a mirror of this branch.\n"
9655
"reconcile Reconcile bzr metadata in a branch.\n"
9656
"reconfigure Reconfigure the type of a bzr directory.\n"
9657
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9658
"remerge Redo a merge.\n"
9659
"remove Remove files or directories.\n"
9660
"remove-branch Remove a branch.\n"
9661
"remove-tree Remove the working tree from a given branch/checkout.\n"
9662
"renames Show list of renamed files.\n"
9663
"resolve Mark a conflict as resolved.\n"
9664
"revert Set files in the working tree back to the contents of a\n"
9665
" previous revision.\n"
9666
"revno Show current revision number.\n"
9667
"root Show the tree root directory.\n"
9668
"send Mail or create a merge-directive for submitting changes.\n"
9669
"serve Run the bzr server.\n"
9670
"shelve Temporarily set aside some changes from the current tree.\n"
9671
"sign-my-commits Sign all commits by a given committer.\n"
9672
"split Split a subdirectory of a tree into a separate tree.\n"
9673
"status Display status summary.\n"
9674
"switch Set the branch of a checkout and update.\n"
9675
"tag Create, remove or modify a tag naming a revision.\n"
9676
"tags List tags.\n"
9677
"testament Show testament (signing-form) of a revision.\n"
9678
"unbind Convert the current checkout into a regular branch.\n"
9679
"uncommit Remove the last committed revision.\n"
9680
"unshelve Restore shelved changes.\n"
9681
"update Update a working tree to a new revision.\n"
9682
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9683
" format.\n"
9684
"verify-signatures Verify all commit signatures.\n"
9685
"version Show version of bzr.\n"
9686
"version-info Show version information about this tree.\n"
9687
"view Manage filtered views.\n"
9688
"whoami Show or set bzr user id.\n"
9689
msgstr ""
9690
9691
#: en/help_topics/configuration.txt:1
9692
msgid ""
9693
"Configuration Settings\n"
9694
"======================="
9695
msgstr ""
9696
9697
#: en/help_topics/configuration.txt:4
9698
msgid ""
9699
"Environment settings\n"
9700
"---------------------"
9701
msgstr ""
9702
9703
#: en/help_topics/configuration.txt:7
9704
msgid ""
9705
"While most configuration is handled by configuration files, some options\n"
9706
"which may be semi-permanent can also be controlled through the environment."
9707
msgstr ""
9708
9709
#: en/help_topics/configuration.txt:10
9710
msgid ""
9711
"BZR_EMAIL\n"
9712
"~~~~~~~~~"
9713
msgstr ""
9714
9715
#: en/help_topics/configuration.txt:13
9716
msgid "Override the email id used by Bazaar. Typical format::"
9717
msgstr ""
9718
9719
#: en/help_topics/configuration.txt:15
9720
msgid " \"John Doe <jdoe@example.com>\""
9721
msgstr ""
9722
9723
#: en/help_topics/configuration.txt:17
9724
msgid "See also the ``email`` configuration option."
9725
msgstr ""
9726
9727
#: en/help_topics/configuration.txt:19
9728
msgid ""
9729
"BZR_PROGRESS_BAR\n"
9730
"~~~~~~~~~~~~~~~~"
9731
msgstr ""
9732
9733
#: en/help_topics/configuration.txt:22
9734
msgid ""
9735
"Override the progress display. Possible values are \"none\" or \"text\". "
9736
"If\n"
9737
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9738
"draws\n"
9739
"the ordinary command line progress bar."
9740
msgstr ""
9741
9742
#: en/help_topics/configuration.txt:26
9743
msgid ""
9744
"BZR_SIGQUIT_PDB\n"
9745
"~~~~~~~~~~~~~~~"
9746
msgstr ""
9747
9748
#: en/help_topics/configuration.txt:29
9749
msgid ""
9750
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9751
msgstr ""
9752
9753
#: en/help_topics/configuration.txt:31
9754
msgid ""
9755
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9756
"* 1 = Invoke breakin debugger (default)"
9757
msgstr ""
9758
9759
#: en/help_topics/configuration.txt:34
9760
msgid ""
9761
"BZR_HOME\n"
9762
"~~~~~~~~"
9763
msgstr ""
9764
9765
#: en/help_topics/configuration.txt:37
9766
msgid "Override the home directory used by Bazaar."
9767
msgstr ""
9768
9769
#: en/help_topics/configuration.txt:39
9770
msgid ""
9771
"BZR_SSH\n"
9772
"~~~~~~~"
9773
msgstr ""
9774
9775
#: en/help_topics/configuration.txt:42
9776
msgid "Select a different SSH implementation."
9777
msgstr ""
9778
9779
#: en/help_topics/configuration.txt:44
9780
msgid ""
9781
"BZR_PDB\n"
9782
"~~~~~~~"
9783
msgstr ""
9784
9785
#: en/help_topics/configuration.txt:47
9786
msgid "Control whether to launch a debugger on error."
9787
msgstr ""
9788
9789
#: en/help_topics/configuration.txt:49
9790
msgid ""
9791
"* 0 = Standard behavior\n"
9792
"* 1 = Launch debugger"
9793
msgstr ""
9794
9795
#: en/help_topics/configuration.txt:52
9796
msgid ""
9797
"BZR_REMOTE_PATH\n"
9798
"~~~~~~~~~~~~~~~"
9799
msgstr ""
9800
9801
#: en/help_topics/configuration.txt:55
9802
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9803
msgstr ""
9804
9805
#: en/help_topics/configuration.txt:57
9806
msgid "See also the ``bzr_remote_path`` configuration option."
9807
msgstr ""
9808
9809
#: en/help_topics/configuration.txt:59
9810
msgid ""
9811
"BZR_EDITOR\n"
9812
"~~~~~~~~~~"
9813
msgstr ""
9814
9815
#: en/help_topics/configuration.txt:62
9816
msgid "Path to the editor Bazaar should use for commit messages, etc."
9817
msgstr ""
9818
9819
#: en/help_topics/configuration.txt:64
9820
msgid ""
9821
"BZR_LOG\n"
9822
"~~~~~~~"
9823
msgstr ""
9824
9825
#: en/help_topics/configuration.txt:67
9826
msgid ""
9827
"Location of the Bazaar log file. You can check the current location by\n"
9828
"running ``bzr version``."
9829
msgstr ""
9830
9831
#: en/help_topics/configuration.txt:70
9832
msgid ""
9833
"The log file contains debug information that is useful for diagnosing or\n"
9834
"reporting problems with Bazaar."
9835
msgstr ""
9836
9837
#: en/help_topics/configuration.txt:73
9838
msgid ""
9839
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9840
"will disable logging."
9841
msgstr ""
9842
9843
#: en/help_topics/configuration.txt:76
9844
msgid ""
9845
"\n"
9846
"BZR_PLUGIN_PATH\n"
9847
"~~~~~~~~~~~~~~~"
9848
msgstr ""
9849
9850
#: en/help_topics/configuration.txt:80
9851
msgid ""
9852
"The path to the plugins directory that Bazaar should use.\n"
9853
"If not set, Bazaar will search for plugins in:"
9854
msgstr ""
9855
9856
#: en/help_topics/configuration.txt:83
9857
msgid ""
9858
"* the user specific plugin directory (containing the ``user`` plugins),"
9859
msgstr ""
9860
9861
#: en/help_topics/configuration.txt:85
9862
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9863
msgstr ""
9864
9865
#: en/help_topics/configuration.txt:87
9866
msgid ""
9867
"* the site specific plugin directory if applicable (containing\n"
9868
" the ``site`` plugins)."
9869
msgstr ""
9870
9871
#: en/help_topics/configuration.txt:90
9872
msgid ""
9873
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9874
"the way the plugin are searched. "
9875
msgstr ""
9876
9877
#: en/help_topics/configuration.txt:93
9878
msgid ""
9879
"As for the ``PATH`` variables, if multiple directories are\n"
9880
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9881
"platform specific appropriate character (':' on Unix,\n"
9882
"';' on windows)"
9883
msgstr ""
9884
9885
#: en/help_topics/configuration.txt:98
9886
msgid ""
9887
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9888
"in ``user``. However it will continue to search in ``core`` and\n"
9889
"``site`` unless they are explicitly removed."
9890
msgstr ""
9891
9892
#: en/help_topics/configuration.txt:102
9893
msgid ""
9894
"If you need to change the order or remove one of these\n"
9895
"directories, you should use special values:"
9896
msgstr ""
9897
9898
#: en/help_topics/configuration.txt:105
9899
msgid ""
9900
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9901
" path from the default values,"
9902
msgstr ""
9903
9904
#: en/help_topics/configuration.txt:108
9905
msgid ""
9906
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9907
" before the remaining default values (and also remove it from\n"
9908
" the default values)."
9909
msgstr ""
9910
9911
#: en/help_topics/configuration.txt:112
9912
msgid ""
9913
"Note that the special values 'user', 'core' and 'site' should be\n"
9914
"used literally, they will be substituted by the corresponding,\n"
9915
"platform specific, values."
9916
msgstr ""
9917
9918
#: en/help_topics/configuration.txt:116
9919
msgid ""
9920
"The examples below use ':' as the separator, windows users\n"
9921
"should use ';'."
9922
msgstr ""
9923
9924
#: en/help_topics/configuration.txt:119
9925
msgid "Overriding the default user plugin directory::"
9926
msgstr ""
9927
9928
#: en/help_topics/configuration.txt:121
9929
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9930
msgstr ""
9931
9932
#: en/help_topics/configuration.txt:123
9933
msgid "Disabling the site directory while retaining the user directory::"
9934
msgstr ""
9935
9936
#: en/help_topics/configuration.txt:125
9937
msgid " BZR_PLUGIN_PATH='-site:+user'"
9938
msgstr ""
9939
9940
#: en/help_topics/configuration.txt:127
9941
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9942
msgstr ""
9943
9944
#: en/help_topics/configuration.txt:129
9945
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9946
msgstr ""
9947
9948
#: en/help_topics/configuration.txt:131
9949
msgid "Overriding the default site plugin directory::"
9950
msgstr ""
9951
9952
#: en/help_topics/configuration.txt:133
9953
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9954
msgstr ""
9955
9956
#: en/help_topics/configuration.txt:135
9957
msgid ""
9958
"BZR_DISABLE_PLUGINS\n"
9959
"~~~~~~~~~~~~~~~~~~~"
9960
msgstr ""
9961
9962
#: en/help_topics/configuration.txt:138
9963
msgid ""
9964
"Under special circumstances (mostly when trying to diagnose a\n"
9965
"bug), it's better to disable a plugin (or several) rather than\n"
9966
"uninstalling them completely. Such plugins can be specified in\n"
9967
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9968
msgstr ""
9969
9970
#: en/help_topics/configuration.txt:143
9971
msgid ""
9972
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9973
"will raise an import error if they are explicitly imported (by\n"
9974
"another plugin that depends on them for example)."
9975
msgstr ""
9976
9977
#: en/help_topics/configuration.txt:147
9978
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9979
msgstr ""
9980
9981
#: en/help_topics/configuration.txt:149
9982
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9983
msgstr ""
9984
9985
#: en/help_topics/configuration.txt:151
9986
msgid ""
9987
"BZR_PLUGINS_AT\n"
9988
"~~~~~~~~~~~~~~"
9989
msgstr ""
9990
9991
#: en/help_topics/configuration.txt:154
9992
msgid ""
9993
"When adding a new feature or working on a bug in a plugin,\n"
9994
"developers often need to use a specific version of a given\n"
9995
"plugin. Since python requires that the directory containing the\n"
9996
"code is named like the plugin itself this make it impossible to\n"
9997
"use arbitrary directory names (using a two-level directory scheme\n"
9998
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9999
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
10000
msgstr ""
10001
10002
#: en/help_topics/configuration.txt:162
10003
msgid ""
10004
"Plugins specified in this environment variable takes precedence\n"
10005
"over the ones in ``BZR_PLUGIN_PATH``."
10006
msgstr ""
10007
10008
#: en/help_topics/configuration.txt:165
10009
msgid ""
10010
"The variable specified a list of ``plugin_name@plugin path``,\n"
10011
"``plugin_name`` being the name of the plugin as it appears in\n"
10012
"python module paths, ``plugin_path`` being the path to the\n"
10013
"directory containing the plugin code itself\n"
10014
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
10015
"separator, use ';' on windows."
10016
msgstr ""
10017
10018
#: en/help_topics/configuration.txt:172
10019
msgid ""
10020
"Example:\n"
10021
"~~~~~~~~"
10022
msgstr ""
10023
10024
#: en/help_topics/configuration.txt:175
10025
msgid ""
10026
"Using a specific version of ``myplugin``:\n"
10027
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
10028
msgstr ""
10029
10030
#: en/help_topics/configuration.txt:178
10031
msgid ""
10032
"BZRPATH\n"
10033
"~~~~~~~"
10034
msgstr ""
10035
10036
#: en/help_topics/configuration.txt:181
10037
msgid "The path where Bazaar should look for shell plugin external commands."
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:183
10041
msgid ""
10042
"\n"
10043
"http_proxy, https_proxy\n"
10044
"~~~~~~~~~~~~~~~~~~~~~~~"
10045
msgstr ""
10046
10047
#: en/help_topics/configuration.txt:187
10048
msgid "Specifies the network proxy for outgoing connections, for example::"
10049
msgstr ""
10050
10051
#: en/help_topics/configuration.txt:189
10052
msgid ""
10053
" http_proxy=http://proxy.example.com:3128/ \n"
10054
" https_proxy=http://proxy.example.com:3128/"
10055
msgstr ""
10056
10057
#: en/help_topics/configuration.txt:192
10058
msgid ""
10059
"\n"
10060
"Configuration files\n"
10061
"-------------------"
10062
msgstr ""
10063
10064
#: en/help_topics/configuration.txt:196
10065
msgid ""
10066
"Location\n"
10067
"~~~~~~~~"
10068
msgstr ""
10069
10070
#: en/help_topics/configuration.txt:199
10071
msgid ""
10072
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
10073
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
10074
"on\n"
10075
"Windows. (You can check the location for your system by using\n"
10076
"``bzr version``.)"
10077
msgstr ""
10078
10079
#: en/help_topics/configuration.txt:204
10080
msgid "There are three primary configuration files in this location:"
10081
msgstr ""
10082
10083
#: en/help_topics/configuration.txt:206
10084
msgid "* ``bazaar.conf`` describes default configuration options,"
10085
msgstr ""
10086
10087
#: en/help_topics/configuration.txt:208
10088
msgid ""
10089
"* ``locations.conf`` describes configuration information for\n"
10090
" specific branch locations,"
10091
msgstr ""
10092
10093
#: en/help_topics/configuration.txt:211
10094
msgid ""
10095
"* ``authentication.conf`` describes credential information for\n"
10096
" remote servers."
10097
msgstr ""
10098
10099
#: en/help_topics/configuration.txt:214
10100
msgid ""
10101
"Each branch can also contain a configuration file that sets values specific\n"
10102
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
10103
"the\n"
10104
"branch. This file is visible to all users of a branch, if you wish to "
10105
"override\n"
10106
"one of the values for a branch with a setting that is specific to you then "
10107
"you\n"
10108
"can do so in ``locations.conf``."
10109
msgstr ""
10110
10111
#: en/help_topics/configuration.txt:220
10112
msgid ""
10113
"General format\n"
10114
"~~~~~~~~~~~~~~"
10115
msgstr ""
10116
10117
#: en/help_topics/configuration.txt:223
10118
msgid ""
10119
"An ini file has three types of contructs: section headers, section\n"
10120
"options and comments."
10121
msgstr ""
10122
10123
#: en/help_topics/configuration.txt:226
10124
msgid ""
10125
"Comments\n"
10126
"^^^^^^^^"
10127
msgstr ""
10128
10129
#: en/help_topics/configuration.txt:229
10130
msgid ""
10131
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
10132
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
10133
"Bazaar when parsing ini files."
10134
msgstr ""
10135
10136
#: en/help_topics/configuration.txt:233
10137
msgid ""
10138
"Section headers\n"
10139
"^^^^^^^^^^^^^^^"
10140
msgstr ""
10141
10142
#: en/help_topics/configuration.txt:236
10143
msgid ""
10144
"A section header is a word enclosed in brackets that starts at the begining\n"
10145
"of a line. A typical section header looks like this::"
10146
msgstr ""
10147
10148
#: en/help_topics/configuration.txt:239
10149
msgid " [DEFAULT]"
10150
msgstr ""
10151
10152
#: en/help_topics/configuration.txt:241
10153
msgid ""
10154
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
10155
"[ALIASES]. Section headers are case sensitive. The default section provides "
10156
"for\n"
10157
"setting options which can be overridden with the branch config file."
10158
msgstr ""
10159
10160
#: en/help_topics/configuration.txt:245
10161
msgid ""
10162
"For ``locations.conf``, the options from the section with the\n"
10163
"longest matching section header are used to the exclusion of other\n"
10164
"potentially valid section headers. A section header uses the path for\n"
10165
"the branch as the section header. Some examples include::"
10166
msgstr ""
10167
10168
#: en/help_topics/configuration.txt:250
10169
msgid ""
10170
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
10171
" [/home/jdoe/branches/]"
10172
msgstr ""
10173
10174
#: en/help_topics/configuration.txt:253
10175
msgid ""
10176
"\n"
10177
"Section options\n"
10178
"^^^^^^^^^^^^^^^"
10179
msgstr ""
10180
10181
#: en/help_topics/configuration.txt:257
10182
msgid ""
10183
"A section option resides within a section. A section option contains an\n"
10184
"option name, an equals sign and a value. For example::"
10185
msgstr ""
10186
10187
#: en/help_topics/configuration.txt:260
10188
msgid ""
10189
" email = John Doe <jdoe@isp.com>\n"
10190
" gpg_signing_key = Amy Pond <amy@example.com>"
10191
msgstr ""
10192
10193
#: en/help_topics/configuration.txt:263
10194
msgid ""
10195
"A option can reference other options by enclosing them in curly brackets::"
10196
msgstr ""
10197
10198
#: en/help_topics/configuration.txt:265
10199
msgid ""
10200
" my_branch_name = feature_x\n"
10201
" my_server = bzr+ssh://example.com\n"
10202
" push_location = {my_server}/project/{my_branch_name}"
10203
msgstr ""
10204
10205
#: en/help_topics/configuration.txt:269
10206
msgid ""
10207
"Option policies\n"
10208
"^^^^^^^^^^^^^^^"
10209
msgstr ""
10210
10211
#: en/help_topics/configuration.txt:272
10212
msgid ""
10213
"Options defined in a section affect the named directory or URL plus\n"
10214
"any locations they contain. Policies can be used to change how an\n"
10215
"option value is interpreted for contained locations. Currently\n"
10216
"there are three policies available:"
10217
msgstr ""
10218
10219
#: en/help_topics/configuration.txt:277
10220
msgid ""
10221
" none:\n"
10222
" the value is interpreted the same for contained locations. This is\n"
10223
" the default behaviour.\n"
10224
" norecurse:\n"
10225
" the value is only used for the exact location specified by the\n"
10226
" section name.\n"
10227
" appendpath:\n"
10228
" for contained locations, any additional path components are\n"
10229
" appended to the value."
10230
msgstr ""
10231
10232
#: en/help_topics/configuration.txt:287
10233
msgid ""
10234
"Policies are specified by keys with names of the form "
10235
"\"<option_name>:policy\".\n"
10236
"For example, to define the push location for a tree of branches, the\n"
10237
"following could be used::"
10238
msgstr ""
10239
10240
#: en/help_topics/configuration.txt:291
10241
msgid ""
10242
" [/top/location]\n"
10243
" push_location = sftp://example.com/location\n"
10244
" push_location:policy = appendpath"
10245
msgstr ""
10246
10247
#: en/help_topics/configuration.txt:295
10248
msgid ""
10249
"With this configuration, the push location for ``/top/location/branch1``\n"
10250
"would be ``sftp://example.com/location/branch1``."
10251
msgstr ""
10252
10253
#: en/help_topics/configuration.txt:298
10254
msgid ""
10255
"Section local options\n"
10256
"^^^^^^^^^^^^^^^^^^^^^"
10257
msgstr ""
10258
10259
#: en/help_topics/configuration.txt:301
10260
msgid ""
10261
"Some options are defined automatically inside a given section and can be\n"
10262
"refered to in this section only. "
10263
msgstr ""
10264
10265
#: en/help_topics/configuration.txt:304
10266
msgid "For example, the ``appendpath`` policy can be used like this::"
10267
msgstr ""
10268
10269
#: en/help_topics/configuration.txt:306
10270
msgid ""
10271
" [/home/vila/src/bzr/bugs]\n"
10272
" mypush = lp:~vila/bzr\n"
10273
" mypush:policy=appendpath"
10274
msgstr ""
10275
10276
#: en/help_topics/configuration.txt:310
10277
msgid "Using ``relpath`` to achieve the same result is done like this::"
10278
msgstr ""
10279
10280
#: en/help_topics/configuration.txt:312
10281
msgid ""
10282
" [/home/vila/src/bzr/bugs]\n"
10283
" mypush = lp:~vila/bzr/{relpath}"
10284
msgstr ""
10285
10286
#: en/help_topics/configuration.txt:315
10287
msgid ""
10288
"In both cases, when used in a directory like\n"
10289
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10290
msgstr ""
10291
10292
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
10293
msgid ""
10294
" $ bzr config mypush\n"
10295
" lp:~vila/bzr/832013-expand-in-stack"
10296
msgstr ""
10297
10298
#: en/help_topics/configuration.txt:321
10299
msgid "Another such option is ``basename`` which can be used like this::"
10300
msgstr ""
10301
10302
#: en/help_topics/configuration.txt:323
10303
msgid ""
10304
" [/home/vila/src/bzr]\n"
10305
" mypush = lp:~vila/bzr/{basename}"
10306
msgstr ""
10307
10308
#: en/help_topics/configuration.txt:326
10309
msgid ""
10310
"When used in a directory like\n"
10311
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10312
msgstr ""
10313
10314
#: en/help_topics/configuration.txt:332
10315
msgid ""
10316
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10317
"itself is defined as the relative path between the section name and the\n"
10318
"location it matches."
10319
msgstr ""
10320
10321
#: en/help_topics/configuration.txt:336
10322
msgid ""
10323
"Another such option is ``branchname``, which refers to the name of a "
10324
"colocated\n"
10325
"branch. For non-colocated branches, it behaves like basename. It can be "
10326
"used\n"
10327
"like this::"
10328
msgstr ""
10329
10330
#: en/help_topics/configuration.txt:340
10331
msgid ""
10332
" [/home/vila/src/bzr/bugs]\n"
10333
" mypush = lp:~vila/bzr/{branchname}"
10334
msgstr ""
10335
10336
#: en/help_topics/configuration.txt:343
10337
msgid ""
10338
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10339
"get::"
10340
msgstr ""
10341
10342
#: en/help_topics/configuration.txt:345
10343
msgid ""
10344
" bzr config mypush\n"
10345
" lp:~vila/bzr/832013-expand-in-stack"
10346
msgstr ""
10347
10348
#: en/help_topics/configuration.txt:348
10349
msgid ""
10350
"When an option is local to a Section, it cannot be referred to from option\n"
10351
"values in any other section from the same ``Store`` nor from any other\n"
10352
"``Store``."
10353
msgstr ""
10354
10355
#: en/help_topics/configuration.txt:352
10356
msgid ""
10357
"\n"
10358
"The main configuration file, bazaar.conf\n"
10359
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10360
msgstr ""
10361
10362
#: en/help_topics/configuration.txt:356
10363
msgid ""
10364
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10365
"The default section contains the default\n"
10366
"configuration options for all branches. The default section can be\n"
10367
"overriden by providing a branch-specific section in ``locations.conf``."
10368
msgstr ""
10369
10370
#: en/help_topics/configuration.txt:361
10371
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10372
msgstr ""
10373
10374
#: en/help_topics/configuration.txt:363
10375
msgid ""
10376
" [DEFAULT]\n"
10377
" email = John Doe <jdoe@isp.com>\n"
10378
" editor = /usr/bin/vim\n"
10379
" create_signatures = when-required"
10380
msgstr ""
10381
10382
#: en/help_topics/configuration.txt:368
10383
msgid ""
10384
"\n"
10385
"The branch location configuration file, locations.conf\n"
10386
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10387
msgstr ""
10388
10389
#: en/help_topics/configuration.txt:372
10390
msgid ""
10391
"``locations.conf`` allows one to specify overriding settings for\n"
10392
"a specific branch. The format is almost identical to the default section in\n"
10393
"bazaar.conf with one significant change: The section header, instead of "
10394
"saying\n"
10395
"default, will be the path to a branch that you wish to override a value\n"
10396
"for. The '?' and '*' wildcards are supported::"
10397
msgstr ""
10398
10399
#: en/help_topics/configuration.txt:378
10400
msgid ""
10401
" [/home/jdoe/branches/nethack]\n"
10402
" email = Nethack Admin <nethack@nethack.com>"
10403
msgstr ""
10404
10405
#: en/help_topics/configuration.txt:381
10406
msgid ""
10407
" [http://hypothetical.site.com/branches/devel-branch]\n"
10408
" create_signatures = always"
10409
msgstr ""
10410
10411
#: en/help_topics/configuration.txt:384
10412
msgid ""
10413
"The authentication configuration file, authentication.conf\n"
10414
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10415
msgstr ""
10416
10417
#: en/help_topics/configuration.txt:387
10418
msgid ""
10419
"``authentication.conf`` allows one to specify credentials for\n"
10420
"remote servers. This can be used for all the supported transports and any "
10421
"part\n"
10422
"of bzr that requires authentication (smtp for example)."
10423
msgstr ""
10424
10425
#: en/help_topics/configuration.txt:391
10426
msgid ""
10427
"The syntax of the file obeys the same rules as the others except for the\n"
10428
"option policies which don't apply."
10429
msgstr ""
10430
10431
#: en/help_topics/configuration.txt:394
10432
msgid ""
10433
"For more information on the possible uses of the authentication "
10434
"configuration\n"
10435
"file see :doc:`authentication-help`."
10436
msgstr ""
10437
10438
#: en/help_topics/configuration.txt:397
10439
msgid ""
10440
"\n"
10441
"Common options\n"
10442
"--------------"
10443
msgstr ""
10444
10445
#: en/help_topics/configuration.txt:401
10446
msgid ""
10447
"debug_flags\n"
10448
"~~~~~~~~~~~"
10449
msgstr ""
10450
10451
#: en/help_topics/configuration.txt:404
10452
msgid ""
10453
"A comma-separated list of debugging options to turn on. The same values\n"
10454
"can be used as with the -D command-line option (see `help global-options`).\n"
10455
"For example::"
10456
msgstr ""
10457
10458
#: en/help_topics/configuration.txt:408
10459
msgid " debug_flags = hpss"
10460
msgstr ""
10461
10462
#: en/help_topics/configuration.txt:412
10463
msgid " debug_flags = hpss,evil"
10464
msgstr ""
10465
10466
#: en/help_topics/configuration.txt:414
10467
msgid ""
10468
"email\n"
10469
"~~~~~"
10470
msgstr ""
10471
10472
#: en/help_topics/configuration.txt:417
10473
msgid ""
10474
"The email address to use when committing a branch. Typically takes the form\n"
10475
"of::"
10476
msgstr ""
10477
10478
#: en/help_topics/configuration.txt:420
10479
msgid " email = Full Name <account@hostname.tld>"
10480
msgstr ""
10481
10482
#: en/help_topics/configuration.txt:422
10483
msgid ""
10484
"editor\n"
10485
"~~~~~~"
10486
msgstr ""
10487
10488
#: en/help_topics/configuration.txt:425
10489
msgid ""
10490
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10491
"a commit message. This setting is trumped by the environment variable\n"
10492
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10493
"variables."
10494
msgstr ""
10495
10496
#: en/help_topics/configuration.txt:430
10497
msgid ""
10498
"log_format\n"
10499
"~~~~~~~~~~"
10500
msgstr ""
10501
10502
#: en/help_topics/configuration.txt:433
10503
msgid ""
10504
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10505
"and ``line``. Additional formats may be provided by plugins. The default\n"
10506
"value is ``long``."
10507
msgstr ""
10508
10509
#: en/help_topics/configuration.txt:437
10510
msgid ""
10511
"check_signatures\n"
10512
"~~~~~~~~~~~~~~~~"
10513
msgstr ""
10514
10515
#: en/help_topics/configuration.txt:440
10516
msgid ""
10517
"Reserved for future use. These options will allow a policy for branches to\n"
10518
"require signatures."
10519
msgstr ""
10520
10521
#: en/help_topics/configuration.txt:443
10522
msgid ""
10523
"require\n"
10524
" The gnupg signature for revisions must be present and must be valid."
10525
msgstr ""
10526
10527
#: en/help_topics/configuration.txt:446
10528
msgid ""
10529
"ignore\n"
10530
" Do not check gnupg signatures of revisions."
10531
msgstr ""
10532
10533
#: en/help_topics/configuration.txt:449
10534
msgid ""
10535
"check-available\n"
10536
" (default) If gnupg signatures for revisions are present, check them.\n"
10537
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10538
" no signature is present."
10539
msgstr ""
10540
10541
#: en/help_topics/configuration.txt:454
10542
msgid ""
10543
"create_signatures\n"
10544
"~~~~~~~~~~~~~~~~~"
10545
msgstr ""
10546
10547
#: en/help_topics/configuration.txt:457
10548
msgid ""
10549
"Defines the behaviour of signing revisions on commits. By default bzr will "
10550
"not\n"
10551
"sign new commits."
10552
msgstr ""
10553
10554
#: en/help_topics/configuration.txt:460
10555
msgid ""
10556
"always\n"
10557
" Sign every new revision that is committed. If the signing fails then "
10558
"the\n"
10559
" commit will not be made."
10560
msgstr ""
10561
10562
#: en/help_topics/configuration.txt:464
10563
msgid ""
10564
"when-required\n"
10565
" Reserved for future use."
10566
msgstr ""
10567
10568
#: en/help_topics/configuration.txt:467
10569
msgid ""
10570
"never\n"
10571
" Reserved for future use."
10572
msgstr ""
10573
10574
#: en/help_topics/configuration.txt:470
10575
msgid ""
10576
"In future it is planned that ``when-required`` will sign newly\n"
10577
"committed revisions only when the branch requires them. ``never`` will "
10578
"refuse\n"
10579
"to sign newly committed revisions, even if the branch requires signatures."
10580
msgstr ""
10581
10582
#: en/help_topics/configuration.txt:474
10583
msgid ""
10584
"dirstate.fdatasync\n"
10585
"~~~~~~~~~~~~~~~~~~"
10586
msgstr ""
10587
10588
#: en/help_topics/configuration.txt:477
10589
msgid ""
10590
"If true (default), working tree metadata changes are flushed through the\n"
10591
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10592
"should not be lost if the machine crashes. See also repository.fdatasync."
10593
msgstr ""
10594
10595
#: en/help_topics/configuration.txt:481
10596
msgid ""
10597
"gpg_signing_key\n"
10598
"~~~~~~~~~~~~~~~"
10599
msgstr ""
10600
10601
#: en/help_topics/configuration.txt:484
10602
msgid ""
10603
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10604
"address, key fingerprint or full key ID. When unset or when set to\n"
10605
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10606
msgstr ""
10607
10608
#: en/help_topics/configuration.txt:488
10609
msgid ""
10610
"recurse\n"
10611
"~~~~~~~"
10612
msgstr ""
10613
10614
#: en/help_topics/configuration.txt:491
10615
msgid ""
10616
"Only useful in ``locations.conf``. Defines whether or not the\n"
10617
"configuration for this section applies to subdirectories:"
10618
msgstr ""
10619
10620
#: en/help_topics/configuration.txt:494
10621
msgid ""
10622
"true\n"
10623
" (default) This section applies to subdirectories as well."
10624
msgstr ""
10625
10626
#: en/help_topics/configuration.txt:497
10627
msgid ""
10628
"false\n"
10629
" This section only applies to the branch at this directory and not\n"
10630
" branches below it."
10631
msgstr ""
10632
10633
#: en/help_topics/configuration.txt:501
10634
msgid ""
10635
"gpg_signing_command\n"
10636
"~~~~~~~~~~~~~~~~~~~"
10637
msgstr ""
10638
10639
#: en/help_topics/configuration.txt:504
10640
msgid ""
10641
"(Default: \"gpg\"). Which program should be used to sign and check "
10642
"revisions.\n"
10643
"For example::"
10644
msgstr ""
10645
10646
#: en/help_topics/configuration.txt:507
10647
msgid " gpg_signing_command = /usr/bin/gnpg"
10648
msgstr ""
10649
10650
#: en/help_topics/configuration.txt:509
10651
msgid ""
10652
"The specified command must accept the options \"--clearsign\" and \"-u "
10653
"<email>\"."
10654
msgstr ""
10655
10656
#: en/help_topics/configuration.txt:511
10657
msgid ""
10658
"bzr_remote_path\n"
10659
"~~~~~~~~~~~~~~~"
10660
msgstr ""
10661
10662
#: en/help_topics/configuration.txt:514
10663
msgid ""
10664
"(Default: \"bzr\"). The path to the command that should be used to run the "
10665
"smart\n"
10666
"server for bzr. This value may only be specified in locations.conf, because:"
10667
msgstr ""
10668
10669
#: en/help_topics/configuration.txt:517
10670
msgid ""
10671
"- it's needed before branch.conf is accessible\n"
10672
"- allowing remote branch.conf files to specify commands would be a security\n"
10673
" risk"
10674
msgstr ""
10675
10676
#: en/help_topics/configuration.txt:521
10677
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10678
msgstr ""
10679
10680
#: en/help_topics/configuration.txt:523
10681
msgid ""
10682
"smtp_server\n"
10683
"~~~~~~~~~~~"
10684
msgstr ""
10685
10686
#: en/help_topics/configuration.txt:526
10687
msgid ""
10688
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10689
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10690
msgstr ""
10691
10692
#: en/help_topics/configuration.txt:529
10693
msgid ""
10694
"smtp_username, smtp_password\n"
10695
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10696
msgstr ""
10697
10698
#: en/help_topics/configuration.txt:532
10699
msgid ""
10700
"User and password to authenticate to the SMTP server. If smtp_username\n"
10701
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10702
"These settings are only needed if the SMTP server requires authentication\n"
10703
"to send mail."
10704
msgstr ""
10705
10706
#: en/help_topics/configuration.txt:537
10707
msgid ""
10708
"locks.steal_dead\n"
10709
"~~~~~~~~~~~~~~~~"
10710
msgstr ""
10711
10712
#: en/help_topics/configuration.txt:540
10713
msgid ""
10714
"If set to true, bzr will automatically break locks held by processes from\n"
10715
"the same machine and user that are no longer alive. Otherwise, it will\n"
10716
"print a message and you can break the lock manually, if you are satisfied\n"
10717
"the object is no longer in use."
10718
msgstr ""
10719
10720
#: en/help_topics/configuration.txt:545
10721
msgid ""
10722
"mail_client\n"
10723
"~~~~~~~~~~~"
10724
msgstr ""
10725
10726
#: en/help_topics/configuration.txt:548
10727
msgid ""
10728
"A mail client to use for sending merge requests.\n"
10729
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10730
"it\n"
10731
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10732
"``editor``."
10733
msgstr ""
10734
10735
#: en/help_topics/configuration.txt:553
10736
msgid "Supported values for specific clients:"
10737
msgstr ""
10738
10739
#: en/help_topics/configuration.txt:555
10740
msgid ""
10741
":claws: Use Claws. This skips a dialog for attaching files.\n"
10742
":evolution: Use Evolution.\n"
10743
":kmail: Use KMail.\n"
10744
":mutt: Use Mutt.\n"
10745
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10746
"1.5,\n"
10747
" this works around some bugs that xdg-email doesn't handle."
10748
msgstr ""
10749
10750
#: en/help_topics/configuration.txt:562
10751
msgid "Supported generic values are:"
10752
msgstr ""
10753
10754
#: en/help_topics/configuration.txt:564
10755
msgid ""
10756
":default: See above.\n"
10757
":editor: Use your editor to compose the merge request. This also uses\n"
10758
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10759
" smtp_username and smtp_password.\n"
10760
":mapi: Use your preferred e-mail client on Windows.\n"
10761
":xdg-email: Use xdg-email to run your preferred mail program"
10762
msgstr ""
10763
10764
#: en/help_topics/configuration.txt:571
10765
msgid ""
10766
"repository.fdatasync\n"
10767
"~~~~~~~~~~~~~~~~~~~~"
10768
msgstr ""
10769
10770
#: en/help_topics/configuration.txt:574
10771
msgid ""
10772
"If true (default), repository changes are flushed through the OS buffers\n"
10773
"to physical disk. This is somewhat slower, but means data should not be\n"
10774
"lost if the machine crashes. See also dirstate.fdatasync."
10775
msgstr ""
10776
10777
#: en/help_topics/configuration.txt:578
10778
msgid ""
10779
"submit_branch\n"
10780
"~~~~~~~~~~~~~"
10781
msgstr ""
10782
10783
#: en/help_topics/configuration.txt:581
10784
msgid ""
10785
"The branch you intend to submit your current work to. This is "
10786
"automatically\n"
10787
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10788
"This\n"
10789
"should usually be set on a per-branch or per-location basis."
10790
msgstr ""
10791
10792
#: en/help_topics/configuration.txt:585
10793
msgid ""
10794
"public_branch\n"
10795
"~~~~~~~~~~~~~"
10796
msgstr ""
10797
10798
#: en/help_topics/configuration.txt:588
10799
msgid ""
10800
"A publically-accessible version of this branch (implying that this version "
10801
"is\n"
10802
"not publically-accessible). Used (and set) by ``bzr send``."
10803
msgstr ""
10804
10805
#: en/help_topics/configuration.txt:591
10806
msgid ""
10807
"suppress_warnings\n"
10808
"~~~~~~~~~~~~~~~~~"
10809
msgstr ""
10810
10811
#: en/help_topics/configuration.txt:594
10812
msgid ""
10813
"A list of strings, each string represent a warning that can be emitted by\n"
10814
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10815
msgstr ""
10816
10817
#: en/help_topics/configuration.txt:597
10818
msgid "Valid values:"
10819
msgstr ""
10820
10821
#: en/help_topics/configuration.txt:599
10822
msgid ""
10823
"* ``format_deprecation``:\n"
10824
" whether the format deprecation warning is shown on repositories that "
10825
"are\n"
10826
" using deprecated formats."
10827
msgstr ""
10828
10829
#: en/help_topics/configuration.txt:603
10830
msgid ""
10831
"default_format\n"
10832
"~~~~~~~~~~~~~~"
10833
msgstr ""
10834
10835
#: en/help_topics/configuration.txt:606
10836
msgid ""
10837
"A format name for the default format used when creating branches. See "
10838
"``bzr\n"
10839
"help formats`` for possible values."
10840
msgstr ""
10841
10842
#: en/help_topics/configuration.txt:609
10843
msgid ""
10844
"\n"
10845
"Unicode options\n"
10846
"---------------"
10847
msgstr ""
10848
10849
#: en/help_topics/configuration.txt:613
10850
msgid ""
10851
"output_encoding\n"
10852
"~~~~~~~~~~~~~~~"
10853
msgstr ""
10854
10855
#: en/help_topics/configuration.txt:616
10856
msgid ""
10857
"A Python unicode encoding name for text output from bzr, such as log\n"
10858
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10859
"is the terminal encoding prefered by the operating system."
10860
msgstr ""
10861
10862
#: en/help_topics/configuration.txt:620
10863
msgid ""
10864
"\n"
10865
"Branch type specific options\n"
10866
"----------------------------"
10867
msgstr ""
10868
10869
#: en/help_topics/configuration.txt:624
10870
msgid ""
10871
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10872
"later format. They\n"
10873
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10874
"manually set in ``locations.conf`` or ``bazaar.conf``."
10875
msgstr ""
10876
10877
#: en/help_topics/configuration.txt:629
10878
msgid ""
10879
"append_revisions_only\n"
10880
"~~~~~~~~~~~~~~~~~~~~~"
10881
msgstr ""
10882
10883
#: en/help_topics/configuration.txt:632
10884
msgid ""
10885
"If set to \"True\" then revisions can only be appended to the log, not\n"
10886
"removed. A branch with this setting enabled can only pull from another\n"
10887
"branch if the other branch's log is a longer version of its own. This is\n"
10888
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10889
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10890
"compatibility with previous bzr versions (older than 2.2)."
10891
msgstr ""
10892
10893
#: en/help_topics/configuration.txt:639
10894
msgid ""
10895
"parent_location\n"
10896
"~~~~~~~~~~~~~~~"
10897
msgstr ""
10898
10899
#: en/help_topics/configuration.txt:642
10900
msgid ""
10901
"If present, the location of the default branch for pull or merge. This "
10902
"option\n"
10903
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10904
"--remember``."
10905
msgstr ""
10906
10907
#: en/help_topics/configuration.txt:646
10908
msgid ""
10909
"push_location\n"
10910
"~~~~~~~~~~~~~"
10911
msgstr ""
10912
10913
#: en/help_topics/configuration.txt:649
10914
msgid ""
10915
"If present, the location of the default branch for push. This option\n"
10916
"is normally set by the first ``push`` or ``push --remember``."
10917
msgstr ""
10918
10919
#: en/help_topics/configuration.txt:652
10920
msgid ""
10921
"push_strict\n"
10922
"~~~~~~~~~~~"
10923
msgstr ""
10924
10925
#: en/help_topics/configuration.txt:655
10926
msgid ""
10927
"If present, defines the ``--strict`` option default value for checking\n"
10928
"uncommitted changes before pushing."
10929
msgstr ""
10930
10931
#: en/help_topics/configuration.txt:658
10932
msgid ""
10933
"dpush_strict\n"
10934
"~~~~~~~~~~~~"
10935
msgstr ""
10936
10937
#: en/help_topics/configuration.txt:661
10938
msgid ""
10939
"If present, defines the ``--strict`` option default value for checking\n"
10940
"uncommitted changes before pushing into a different VCS without any\n"
10941
"custom bzr metadata."
10942
msgstr ""
10943
10944
#: en/help_topics/configuration.txt:665
10945
msgid ""
10946
"bound_location\n"
10947
"~~~~~~~~~~~~~~"
10948
msgstr ""
10949
10950
#: en/help_topics/configuration.txt:668
10951
msgid ""
10952
"The location that commits should go to when acting as a checkout.\n"
10953
"This option is normally set by ``bind``."
10954
msgstr ""
10955
10956
#: en/help_topics/configuration.txt:671
10957
msgid ""
10958
"bound\n"
10959
"~~~~~"
10960
msgstr ""
10961
10962
#: en/help_topics/configuration.txt:674
10963
msgid ""
10964
"If set to \"True\", the branch should act as a checkout, and push each "
10965
"commit to\n"
10966
"the bound_location. This option is normally set by ``bind``/``unbind``."
10967
msgstr ""
10968
10969
#: en/help_topics/configuration.txt:677
10970
msgid ""
10971
"send_strict\n"
10972
"~~~~~~~~~~~"
10973
msgstr ""
10974
10975
#: en/help_topics/configuration.txt:680
10976
msgid ""
10977
"If present, defines the ``--strict`` option default value for checking\n"
10978
"uncommitted changes before sending a merge directive."
10979
msgstr ""
10980
10981
#: en/help_topics/configuration.txt:683
10982
msgid ""
10983
"add.maximum_file_size\n"
10984
"~~~~~~~~~~~~~~~~~~~~~"
10985
msgstr ""
10986
10987
#: en/help_topics/configuration.txt:686
10988
msgid ""
10989
"Defines the maximum file size the command line \"add\" operation will allow\n"
10990
"in recursive mode, with files larger than this value being skipped. You may "
10991
"\n"
10992
"specify this value as an integer (in which case it is interpreted as bytes), "
10993
"\n"
10994
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10995
"0 \n"
10996
"will disable skipping."
10997
msgstr ""
10998
10999
#: en/help_topics/configuration.txt:692
11000
msgid ""
11001
"External Merge Tools\n"
11002
"--------------------"
11003
msgstr ""
11004
11005
#: en/help_topics/configuration.txt:695
11006
msgid ""
11007
"bzr.mergetool.<name>\n"
11008
"~~~~~~~~~~~~~~~~~~~~"
11009
msgstr ""
11010
11011
#: en/help_topics/configuration.txt:698
11012
msgid ""
11013
"Defines an external merge tool called <name> with the given command-line.\n"
11014
"Arguments containing spaces should be quoted using single or double quotes. "
11015
"The\n"
11016
"executable may omit its path if it can be found on the PATH."
11017
msgstr ""
11018
11019
#: en/help_topics/configuration.txt:702
11020
msgid ""
11021
"The following markers can be used in the command-line to substitute "
11022
"filenames\n"
11023
"involved in the merge conflict::"
11024
msgstr ""
11025
11026
#: en/help_topics/configuration.txt:705
11027
msgid ""
11028
" {base} file.BASE\n"
11029
" {this} file.THIS\n"
11030
" {other} file.OTHER\n"
11031
" {result} output file\n"
11032
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
11033
"merge\n"
11034
" succeeds."
11035
msgstr ""
11036
11037
#: en/help_topics/configuration.txt:714
11038
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11039
msgstr ""
11040
11041
#: en/help_topics/configuration.txt:716
11042
msgid ""
11043
"bzr.default_mergetool\n"
11044
"~~~~~~~~~~~~~~~~~~~~~"
11045
msgstr ""
11046
11047
#: en/help_topics/configuration.txt:719
11048
msgid ""
11049
"Specifies which external merge tool (as defined above) should be selected "
11050
"by\n"
11051
"default in tools such as ``bzr qconflicts``."
11052
msgstr ""
11053
11054
#: en/help_topics/configuration.txt:724
11055
msgid " bzr.default_mergetool = kdiff3\n"
11056
msgstr ""
11057
11058
#: en/help_topics/conflict-types.txt:1
11059
msgid ""
11060
"Conflict Types\n"
11061
"=============="
11062
msgstr ""
11063
11064
#: en/help_topics/conflict-types.txt:4
11065
msgid ""
11066
"Some operations, like merge, revert and pull, modify the contents of your\n"
11067
"working tree. These modifications are programmatically generated, and so "
11068
"they\n"
11069
"may conflict with the current state of your working tree. "
11070
msgstr ""
11071
11072
#: en/help_topics/conflict-types.txt:8
11073
msgid ""
11074
"When conflicts are present in your working tree (as shown by ``bzr\n"
11075
"conflicts``), you should resolve them and then inform bzr that the "
11076
"conflicts\n"
11077
"have been resolved."
11078
msgstr ""
11079
11080
#: en/help_topics/conflict-types.txt:12
11081
msgid ""
11082
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
11083
"should resolve them is not the one responsible for their occurrence, as is "
11084
"the\n"
11085
"case when merging other people's work or because some conflicts are "
11086
"presented\n"
11087
"in a way that is not easy to understand."
11088
msgstr ""
11089
11090
#: en/help_topics/conflict-types.txt:17
11091
msgid ""
11092
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
11093
"conflict if and only if there's an actual conceptual conflict in the source\n"
11094
"tree. Because Bazaar doesn't understand the real meaning of the files "
11095
"being\n"
11096
"versioned, it can, when faced with ambiguities, fall short in either "
11097
"direction\n"
11098
"trying to resolve the conflict itself. Many kinds of changes can be "
11099
"combined\n"
11100
"programmatically, but sometimes only a human can determine the right thing "
11101
"to\n"
11102
"do."
11103
msgstr ""
11104
11105
#: en/help_topics/conflict-types.txt:25
11106
msgid ""
11107
"When Bazaar generates a conflict, it adds information into the working tree "
11108
"to\n"
11109
"present the conflicting versions, and it's up to you to find the correct\n"
11110
"resolution."
11111
msgstr ""
11112
11113
#: en/help_topics/conflict-types.txt:29
11114
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
11115
msgstr ""
11116
11117
#: en/help_topics/conflict-types.txt:31
11118
msgid ""
11119
"1. Modify the working tree content so that the conflicted item is now in "
11120
"the\n"
11121
" state you want to keep, then"
11122
msgstr ""
11123
11124
#: en/help_topics/conflict-types.txt:34
11125
msgid ""
11126
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
11127
" remaining generated information (``bzr resolve <item>``)."
11128
msgstr ""
11129
11130
#: en/help_topics/conflict-types.txt:37
11131
msgid ""
11132
"For most conflict types, there are some obvious ways to modify the working\n"
11133
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
11134
"itself already made a choice, when possible."
11135
msgstr ""
11136
11137
#: en/help_topics/conflict-types.txt:41
11138
msgid ""
11139
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
11140
"different ways to resolve the conflict."
11141
msgstr ""
11142
11143
#: en/help_topics/conflict-types.txt:44
11144
msgid ""
11145
"Each type of conflict is explained below, and the action which must be done "
11146
"to\n"
11147
"resolve the conflict is outlined."
11148
msgstr ""
11149
11150
#: en/help_topics/conflict-types.txt:47
11151
msgid ""
11152
"Various actions are available depending on the kind of conflict, for some "
11153
"of\n"
11154
"these actions, Bazaar can provide some help. In the end you should at least\n"
11155
"inform Bazaar that you're done with the conflict with::"
11156
msgstr ""
11157
11158
#: en/help_topics/conflict-types.txt:51
11159
msgid " ``bzr resolve FILE --action=done'"
11160
msgstr ""
11161
11162
#: en/help_topics/conflict-types.txt:53
11163
msgid ""
11164
"Note that this is the default action when a single file is involved so you "
11165
"can\n"
11166
"simply use::"
11167
msgstr ""
11168
11169
#: en/help_topics/conflict-types.txt:56
11170
msgid " ``bzr resolve FILE``"
11171
msgstr ""
11172
11173
#: en/help_topics/conflict-types.txt:58
11174
msgid "See ``bzr help resolve`` for more details."
11175
msgstr ""
11176
11177
#: en/help_topics/conflict-types.txt:60
11178
msgid ""
11179
"Text conflicts\n"
11180
"--------------"
11181
msgstr ""
11182
11183
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
11184
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
11185
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11186
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11187
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
11188
msgid "Typical message::"
11189
msgstr ""
11190
11191
#: en/help_topics/conflict-types.txt:65
11192
msgid " Text conflict in FILE"
11193
msgstr ""
11194
11195
#: en/help_topics/conflict-types.txt:67
11196
msgid ""
11197
"These are produced when a text merge cannot completely reconcile two sets "
11198
"of\n"
11199
"text changes. Bazaar will emit files for each version with the extensions\n"
11200
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
11201
"tree,\n"
11202
"i.e. the tree that you are merging changes into. OTHER is the version that "
11203
"you\n"
11204
"are merging into the target. BASE is an older version that is used as a "
11205
"basis\n"
11206
"for comparison."
11207
msgstr ""
11208
11209
#: en/help_topics/conflict-types.txt:74
11210
msgid ""
11211
"In the main copy of the file, Bazaar will include all the changes that it\n"
11212
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11213
"\"herringbone\" markers like ``<<<<<<<``."
11214
msgstr ""
11215
11216
#: en/help_topics/conflict-types.txt:78
11217
msgid ""
11218
"Say the initial text is \"The project leader released it.\", and THIS "
11219
"modifies it\n"
11220
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11221
"leader\n"
11222
"released Bazaar.\" A conflict would look like this::"
11223
msgstr ""
11224
11225
#: en/help_topics/conflict-types.txt:82
11226
msgid ""
11227
" <<<<<<< TREE\n"
11228
" Martin Pool released it.\n"
11229
" =======\n"
11230
" The project leader released Bazaar.\n"
11231
" >>>>>>> MERGE-SOURCE"
11232
msgstr ""
11233
11234
#: en/help_topics/conflict-types.txt:88
11235
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11236
msgstr ""
11237
11238
#: en/help_topics/conflict-types.txt:90
11239
msgid ""
11240
"You can handle text conflicts either by editing the main copy of the file,\n"
11241
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
11242
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11243
"set of changes over the other (but see below when you encounter these\n"
11244
"cases). More often, the two sets of changes must be intelligently combined."
11245
msgstr ""
11246
11247
#: en/help_topics/conflict-types.txt:96
11248
msgid ""
11249
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
11250
"you are done editing, the file should look like it never had a conflict, and "
11251
"be\n"
11252
"ready to commit."
11253
msgstr ""
11254
11255
#: en/help_topics/conflict-types.txt:100
11256
msgid ""
11257
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
11258
"Bazaar will auto-detect which conflicts you have resolved."
11259
msgstr ""
11260
11261
#: en/help_topics/conflict-types.txt:103
11262
msgid ""
11263
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11264
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11265
"working tree."
11266
msgstr ""
11267
11268
#: en/help_topics/conflict-types.txt:107
11269
msgid ""
11270
"\n"
11271
"When you want to pick one set of changes over the other, you can use ``bzr\n"
11272
"resolve`` with one of the following actions:"
11273
msgstr ""
11274
11275
#: en/help_topics/conflict-types.txt:111
11276
msgid ""
11277
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11278
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11279
msgstr ""
11280
11281
#: en/help_topics/conflict-types.txt:114
11282
msgid ""
11283
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11284
"modifications will be taken into account."
11285
msgstr ""
11286
11287
#: en/help_topics/conflict-types.txt:117
11288
msgid ""
11289
"Content conflicts\n"
11290
"-----------------"
11291
msgstr ""
11292
11293
#: en/help_topics/conflict-types.txt:122
11294
msgid " Contents conflict in FILE"
11295
msgstr ""
11296
11297
#: en/help_topics/conflict-types.txt:124
11298
msgid ""
11299
"This conflict happens when there are conflicting changes in the working "
11300
"tree\n"
11301
"and the merge source, but the conflicted items are not text files. They "
11302
"may\n"
11303
"be binary files, or symlinks, or directories. It can even happen with "
11304
"files\n"
11305
"that are deleted on one side, and modified on the other."
11306
msgstr ""
11307
11308
#: en/help_topics/conflict-types.txt:129
11309
msgid ""
11310
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
11311
"be\n"
11312
"regular files, symlinks or directories). But it will not include a \"main "
11313
"copy\"\n"
11314
"of the file with herringbone conflict markers. It will appear that the "
11315
"\"main\n"
11316
"copy\" has been renamed to THIS or OTHER."
11317
msgstr ""
11318
11319
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11320
msgid ""
11321
"To resolve that kind of conflict, you should rebuild FILE from either "
11322
"version\n"
11323
"or a combination of both."
11324
msgstr ""
11325
11326
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11327
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11328
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11329
#: en/help_topics/conflict-types.txt:361
11330
msgid "``bzr resolve`` recognizes the following actions:"
11331
msgstr ""
11332
11333
#: en/help_topics/conflict-types.txt:139
11334
msgid ""
11335
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
11336
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11337
"* ``--action=done`` will just mark the conflict as resolved."
11338
msgstr ""
11339
11340
#: en/help_topics/conflict-types.txt:143
11341
msgid ""
11342
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11343
"and\n"
11344
"``.OTHER`` files if they are still present in the working tree."
11345
msgstr ""
11346
11347
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11348
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11349
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11350
#: en/help_topics/conflict-types.txt:369
11351
msgid ""
11352
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11353
msgstr ""
11354
11355
#: en/help_topics/conflict-types.txt:148
11356
msgid ""
11357
"Tag conflicts\n"
11358
"-------------"
11359
msgstr ""
11360
11361
#: en/help_topics/conflict-types.txt:153
11362
msgid ""
11363
" Conflicting tags:\n"
11364
" version-0.1"
11365
msgstr ""
11366
11367
#: en/help_topics/conflict-types.txt:156
11368
msgid ""
11369
"When pulling from or pushing to another branch, Bazaar informs you about "
11370
"tags\n"
11371
"that conflict between the two branches; that is the same tag points to two\n"
11372
"different revisions. You need not resolve these conflicts, but subsequent\n"
11373
"uses of pull or push will result in the same message."
11374
msgstr ""
11375
11376
#: en/help_topics/conflict-types.txt:161
11377
msgid ""
11378
"To resolve the conflict, you must apply the correct tags to either the "
11379
"target\n"
11380
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11381
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11382
"target branch's tags match the source branch, then in the target branch do\n"
11383
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11384
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11385
"source\n"
11386
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11387
"favor of the target branch, you need to similarly use ``tag --force`` in "
11388
"the\n"
11389
"source branch. (Note that pulling or pushing using --overwrite will "
11390
"overwrite\n"
11391
"all tags as well.)"
11392
msgstr ""
11393
11394
#: en/help_topics/conflict-types.txt:172
11395
msgid ""
11396
"Duplicate paths\n"
11397
"---------------"
11398
msgstr ""
11399
11400
#: en/help_topics/conflict-types.txt:177
11401
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11402
msgstr ""
11403
11404
#: en/help_topics/conflict-types.txt:179
11405
msgid ""
11406
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11407
"already been used. The existing file will be renamed to \"FILE.moved\". "
11408
msgstr ""
11409
11410
#: en/help_topics/conflict-types.txt:187
11411
msgid ""
11412
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11413
"FILE``,\n"
11414
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11415
"* ``--action=done`` will just mark the conflict as resolved."
11416
msgstr ""
11417
11418
#: en/help_topics/conflict-types.txt:191
11419
msgid ""
11420
"Note that you must get rid of FILE.moved before using ``--action=done``."
11421
msgstr ""
11422
11423
#: en/help_topics/conflict-types.txt:195
11424
msgid ""
11425
"Unversioned parent\n"
11426
"------------------"
11427
msgstr ""
11428
11429
#: en/help_topics/conflict-types.txt:200
11430
msgid ""
11431
" Conflict because FILE is not versioned, but has versioned children."
11432
msgstr ""
11433
11434
#: en/help_topics/conflict-types.txt:202
11435
msgid ""
11436
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11437
"not\n"
11438
"versioned. This happens when the directory has been deleted in the target,\n"
11439
"but has a new child in the source, or vice versa. In this situation, "
11440
"Bazaar\n"
11441
"will version the parent directory as well. Resolving this issue depends\n"
11442
"very much on the particular scenario. You may wish to rename or delete "
11443
"either\n"
11444
"the file or the directory. When you are satisfied, you can run \"bzr "
11445
"resolve\n"
11446
"FILE\" to mark the conflict as resolved."
11447
msgstr ""
11448
11449
#: en/help_topics/conflict-types.txt:210
11450
msgid ""
11451
"Missing parent\n"
11452
"--------------"
11453
msgstr ""
11454
11455
#: en/help_topics/conflict-types.txt:215
11456
msgid " Conflict adding files to FILE. Created directory."
11457
msgstr ""
11458
11459
#: en/help_topics/conflict-types.txt:217
11460
msgid ""
11461
"This happens when a directory has been deleted in the target, but has new\n"
11462
"children in the source. This is similar to the \"unversioned parent\" "
11463
"conflict,\n"
11464
"except that the parent directory does not *exist*, instead of just being\n"
11465
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11466
"Resolving this issue depends very much on the particular scenario."
11467
msgstr ""
11468
11469
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11470
msgid ""
11471
"To resolve that kind of conflict, you should either remove or rename the\n"
11472
"children or the directory or a combination of both."
11473
msgstr ""
11474
11475
#: en/help_topics/conflict-types.txt:228
11476
msgid ""
11477
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11478
" children,\n"
11479
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11480
"children\n"
11481
" and restoring the directory,\n"
11482
"* ``--action=done`` will just mark the conflict as resolved."
11483
msgstr ""
11484
11485
#: en/help_topics/conflict-types.txt:236
11486
msgid ""
11487
"Deleting parent\n"
11488
"---------------"
11489
msgstr ""
11490
11491
#: en/help_topics/conflict-types.txt:241
11492
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11493
msgstr ""
11494
11495
#: en/help_topics/conflict-types.txt:243
11496
msgid ""
11497
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11498
"source, but has new children in the target (either because a directory\n"
11499
"deletion is merged or because the merge introduce new children). Bazaar\n"
11500
"will retain the directory. Resolving this issue depends very much on the\n"
11501
"particular scenario."
11502
msgstr ""
11503
11504
#: en/help_topics/conflict-types.txt:254
11505
msgid ""
11506
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11507
"directory,"
11508
msgstr ""
11509
11510
#: en/help_topics/conflict-types.txt:256
11511
msgid ""
11512
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11513
" children,"
11514
msgstr ""
11515
11516
#: en/help_topics/conflict-types.txt:259
11517
msgid "* ``--action=done`` will just mark the conflict as resolved."
11518
msgstr ""
11519
11520
#: en/help_topics/conflict-types.txt:261
11521
msgid ""
11522
"Note that when merging a directory deletion, if unversioned files are\n"
11523
"present, they become potential orphans has they don't have a directory\n"
11524
"parent anymore."
11525
msgstr ""
11526
11527
#: en/help_topics/conflict-types.txt:265
11528
msgid ""
11529
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11530
"setting the ``bzr.transform.orphan_policy`` configuration option."
11531
msgstr ""
11532
11533
#: en/help_topics/conflict-types.txt:268
11534
msgid "There are two possible values for this option:"
11535
msgstr ""
11536
11537
#: en/help_topics/conflict-types.txt:270
11538
msgid ""
11539
"* ``conflict`` (the default): will leave the orphans in place and\n"
11540
" generate a conflicts,"
11541
msgstr ""
11542
11543
#: en/help_topics/conflict-types.txt:273
11544
msgid ""
11545
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11546
"root\n"
11547
" of the working tree with names like ``<file>.~#~``."
11548
msgstr ""
11549
11550
#: en/help_topics/conflict-types.txt:278
11551
msgid ""
11552
"Path conflict\n"
11553
"-------------"
11554
msgstr ""
11555
11556
#: en/help_topics/conflict-types.txt:283
11557
msgid " Path conflict: PATH1 / PATH2"
11558
msgstr ""
11559
11560
#: en/help_topics/conflict-types.txt:285
11561
msgid ""
11562
"This happens when the source and target have each modified the name or "
11563
"parent\n"
11564
"directory of a file. Bazaar will use the path elements from the source."
11565
msgstr ""
11566
11567
#: en/help_topics/conflict-types.txt:288
11568
msgid ""
11569
"To resolve that kind of conflict, you just have to decide what name should "
11570
"be\n"
11571
"retained for the file involved."
11572
msgstr ""
11573
11574
#: en/help_topics/conflict-types.txt:293
11575
msgid ""
11576
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11577
" issuing ``bzr mv PATH2 PATH1``,\n"
11578
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11579
"``PATH2``,\n"
11580
"* ``--action=done`` will just mark the conflict as resolved."
11581
msgstr ""
11582
11583
#: en/help_topics/conflict-types.txt:300
11584
msgid ""
11585
"Parent loop\n"
11586
"-----------"
11587
msgstr ""
11588
11589
#: en/help_topics/conflict-types.txt:305
11590
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11591
msgstr ""
11592
11593
#: en/help_topics/conflict-types.txt:307
11594
msgid ""
11595
"This happens when the source and the target have each moved directories, so\n"
11596
"that, if the change could be applied, a directory would be contained by "
11597
"itself.\n"
11598
"For example::"
11599
msgstr ""
11600
11601
#: en/help_topics/conflict-types.txt:311
11602
msgid ""
11603
" $ bzr init\n"
11604
" $ bzr mkdir white\n"
11605
" $ bzr mkdir black\n"
11606
" $ bzr commit -m \"BASE\"\n"
11607
" $ bzr branch . ../other\n"
11608
" $ bzr mv white black\n"
11609
" $ bzr commit -m \"THIS\"\n"
11610
" $ bzr mv ../other/black ../other/white\n"
11611
" $ bzr commit ../other -m \"OTHER\"\n"
11612
" $ bzr merge ../other"
11613
msgstr ""
11614
11615
#: en/help_topics/conflict-types.txt:322
11616
msgid ""
11617
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11618
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11619
"name should be retained for the directories involved."
11620
msgstr ""
11621
11622
#: en/help_topics/conflict-types.txt:328
11623
msgid ""
11624
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11625
"\n"
11626
" in ``black``,\n"
11627
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11628
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11629
"* ``--action=done`` will just mark the conflict as resolved."
11630
msgstr ""
11631
11632
#: en/help_topics/conflict-types.txt:336
11633
msgid ""
11634
"Non-directory parent\n"
11635
"--------------------"
11636
msgstr ""
11637
11638
#: en/help_topics/conflict-types.txt:341
11639
msgid ""
11640
" Conflict: foo.new is not a directory, but has files in it.\n"
11641
" Created directory."
11642
msgstr ""
11643
11644
#: en/help_topics/conflict-types.txt:344
11645
msgid ""
11646
"This happens when one side has added files to a directory, and the other "
11647
"side\n"
11648
"has changed the directory into a file or symlink. For example::"
11649
msgstr ""
11650
11651
#: en/help_topics/conflict-types.txt:347
11652
msgid ""
11653
" $ bzr init\n"
11654
" $ bzr mkdir foo\n"
11655
" $ bzr commit -m \"BASE\"\n"
11656
" $ bzr branch . ../other\n"
11657
" $ rmdir foo\n"
11658
" $ touch foo\n"
11659
" $ bzr commit -m \"THIS\"\n"
11660
" $ bzr mkdir ../other/foo/bar\n"
11661
" $ bzr commit ../other -m \"OTHER\"\n"
11662
" $ bzr merge ../other"
11663
msgstr ""
11664
11665
#: en/help_topics/conflict-types.txt:358
11666
msgid ""
11667
"To resolve that kind of conflict, you have to decide what name should be\n"
11668
"retained for the file, directory or symlink involved."
11669
msgstr ""
11670
11671
#: en/help_topics/conflict-types.txt:363
11672
msgid ""
11673
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11674
" ``bzr add foo``,\n"
11675
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11676
" ``bzr mv foo.new foo``,\n"
11677
"* ``--action=done`` will just mark the conflict as resolved."
11678
msgstr ""
11679
11680
#: en/help_topics/conflict-types.txt:371
11681
msgid ""
11682
"MalformedTransform\n"
11683
"------------------"
11684
msgstr ""
11685
11686
#: en/help_topics/conflict-types.txt:374
11687
msgid ""
11688
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11689
"exception. This means that Bazaar encountered a filesystem conflict that it "
11690
"was\n"
11691
"unable to resolve. This usually indicates a bug. Please let us know if "
11692
"you\n"
11693
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11694
msgstr ""
11695
11696
#: en/help_topics/content-filters.txt:1
11697
msgid ""
11698
"Content Filters\n"
11699
"==============="
11700
msgstr ""
11701
11702
#: en/help_topics/content-filters.txt:4
11703
msgid ""
11704
"Content formats\n"
11705
"---------------"
11706
msgstr ""
11707
11708
#: en/help_topics/content-filters.txt:7
11709
msgid ""
11710
"Bazaar's content filtering allows you to store files in a different\n"
11711
"format from the copy in your working tree. This lets you, or your\n"
11712
"co-developers, use Windows development tools that expect CRLF files\n"
11713
"on projects that use other line-ending conventions. Among other things,\n"
11714
"content filters also let Unix developers more easily work on projects\n"
11715
"using Windows line-ending conventions, keyword expansion/compression,\n"
11716
"and trailing spaces on lines in text files to be implicitly stripped\n"
11717
"when committed."
11718
msgstr ""
11719
11720
#: en/help_topics/content-filters.txt:16
11721
msgid "To generalize, there are two content formats supported by Bazaar:"
11722
msgstr ""
11723
11724
#: en/help_topics/content-filters.txt:18
11725
msgid ""
11726
"* a canonical format - how files are stored internally\n"
11727
"* a convenience format - how files are created in a working tree."
11728
msgstr ""
11729
11730
#: en/help_topics/content-filters.txt:21
11731
msgid ""
11732
"\n"
11733
"Format conversion\n"
11734
"-----------------"
11735
msgstr ""
11736
11737
#: en/help_topics/content-filters.txt:25
11738
msgid ""
11739
"The conversion between these formats is done by content filters.\n"
11740
"A content filter has two parts:"
11741
msgstr ""
11742
11743
#: en/help_topics/content-filters.txt:28
11744
msgid ""
11745
"* a read converter - converts from convenience to canonical format\n"
11746
"* a write converter - converts from canonical to convenience format."
11747
msgstr ""
11748
11749
#: en/help_topics/content-filters.txt:31
11750
msgid ""
11751
"Many of these converters will provide *round-trip* conversion,\n"
11752
"i.e. applying the read converter followed by the write converter\n"
11753
"gives back the original content. However, others may provide an\n"
11754
"asymmetric conversion. For example, a read converter might strip\n"
11755
"trailing whitespace off lines in source code while the matching\n"
11756
"write converter might pass content through unchanged."
11757
msgstr ""
11758
11759
#: en/help_topics/content-filters.txt:38
11760
msgid ""
11761
"\n"
11762
"Enabling content filters\n"
11763
"------------------------"
11764
msgstr ""
11765
11766
#: en/help_topics/content-filters.txt:42
11767
msgid ""
11768
"Content filters are typically provided by plugins, so the first step\n"
11769
"in using them is to install the relevant plugins and read their\n"
11770
"documentation. Some plugins may be very specific about which files\n"
11771
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11772
"In other cases, the plugin may leave it in the user's hands to\n"
11773
"define which files are to be filtered. This is typically done\n"
11774
"using rule-based preferences. See ``bzr help rules`` for general\n"
11775
"information about defining these."
11776
msgstr ""
11777
11778
#: en/help_topics/content-filters.txt:51
11779
msgid ""
11780
"\n"
11781
"Impact on commands\n"
11782
"------------------"
11783
msgstr ""
11784
11785
#: en/help_topics/content-filters.txt:55
11786
msgid ""
11787
"Read converters are only applied to commands that read content from\n"
11788
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11789
"will apply read converters to files in the working tree, then compare\n"
11790
"the results to the content last committed."
11791
msgstr ""
11792
11793
#: en/help_topics/content-filters.txt:60
11794
msgid ""
11795
"Write converters are only applied by commands that **create files in a\n"
11796
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11797
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11798
"respectively."
11799
msgstr ""
11800
11801
#: en/help_topics/content-filters.txt:65
11802
msgid ""
11803
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11804
"comitting files. If this makes sense for a given plugin providing\n"
11805
"a content filter, the plugin can usually achieve this effect by using a\n"
11806
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11807
"for more information on hooks."
11808
msgstr ""
11809
11810
#: en/help_topics/content-filters.txt:71
11811
msgid ""
11812
"\n"
11813
"Refreshing your working tree\n"
11814
"----------------------------"
11815
msgstr ""
11816
11817
#: en/help_topics/content-filters.txt:75
11818
msgid ""
11819
"For performance reasons, Bazaar caches the timestamps of files in\n"
11820
"a working tree, and assumes files are unchanged if their timestamps\n"
11821
"match the cached values. As a consequence, there are times when\n"
11822
"you may need to explicitly ask for content filtering to be reapplied\n"
11823
"in one or both directions, e.g. after installing or reconfiguring\n"
11824
"plugins providing it."
11825
msgstr ""
11826
11827
#: en/help_topics/content-filters.txt:82
11828
msgid "Here are some general guidelines for doing this:"
11829
msgstr ""
11830
11831
#: en/help_topics/content-filters.txt:84
11832
msgid ""
11833
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11834
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11835
" relevant read converters and compare the end result with the\n"
11836
" canonical format."
11837
msgstr ""
11838
11839
#: en/help_topics/content-filters.txt:89
11840
msgid ""
11841
" * To reapply write converters, ensure there are no local changes,\n"
11842
" delete the relevant files and run ``bzr revert`` on those files."
11843
msgstr ""
11844
11845
#: en/help_topics/content-filters.txt:92
11846
msgid ""
11847
"Note: In the future, it is likely that additional options will be added\n"
11848
"to commands to make this refreshing process faster and safer.\n"
11849
msgstr ""
11850
11851
#: en/help_topics/current-formats.txt:1
11852
msgid "Current Storage Formats"
11853
msgstr ""
11854
11855
#: en/help_topics/current-formats.txt:3
11856
msgid ""
11857
":2a:\n"
11858
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11859
" compress storage. Provides rich roots which are a one-way\n"
11860
" transition."
11861
msgstr ""
11862
11863
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11864
msgid ""
11865
"\n"
11866
"See :doc:`formats-help` for more about storage formats."
11867
msgstr ""
11868
11869
#: en/help_topics/debug-flags.txt:1
11870
msgid ""
11871
"Debug Flags\n"
11872
"==========="
11873
msgstr ""
11874
11875
#: en/help_topics/debug-flags.txt:4
11876
msgid ""
11877
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11878
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11879
msgstr ""
11880
11881
#: en/help_topics/debug-flags.txt:7
11882
msgid ""
11883
"-Dauth Trace authentication sections used.\n"
11884
"-Dbytes Print out how many bytes were transferred\n"
11885
"-Ddirstate Trace dirstate activity (verbose!)\n"
11886
"-Derror Instead of normal error handling, always print a "
11887
"traceback\n"
11888
" on error.\n"
11889
"-Devil Capture call sites that do expensive or badly-scaling\n"
11890
" operations.\n"
11891
"-Dfetch Trace history copying between repositories.\n"
11892
"-Dfilters Emit information for debugging content filtering.\n"
11893
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11894
"fetch.\n"
11895
"-Dgraph Trace graph traversal.\n"
11896
"-Dhashcache Log every time a working file is read to determine its "
11897
"hash.\n"
11898
"-Dhooks Trace hook execution.\n"
11899
"-Dhpss Trace smart protocol requests and responses.\n"
11900
"-Dhpssdetail More hpss details.\n"
11901
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11902
"-Dhttp Trace http connections, requests and responses.\n"
11903
"-Dindex Trace major index operations.\n"
11904
"-Dknit Trace knit operations.\n"
11905
"-Dlock Trace when lockdir locks are taken or released.\n"
11906
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11907
" retrying the request.\n"
11908
"-Dprogress Trace progress bar operations.\n"
11909
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11910
"-Dmerge Emit information for debugging merges.\n"
11911
"-Dno_apport Don't use apport to report crashes.\n"
11912
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11913
"-Dpack Emit information about pack operations.\n"
11914
"-Drelock Emit a message every time a branch or repository object "
11915
"is\n"
11916
" unlocked then relocked the same way.\n"
11917
"-Dsftp Trace SFTP internals.\n"
11918
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11919
"expected\n"
11920
"-Dstream Trace fetch streams.\n"
11921
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11922
"portable\n"
11923
" manner.\n"
11924
"-Dunlock Some errors during unlock are treated as warnings.\n"
11925
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11926
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11927
"appropriate\n"
11928
" for the format, even for non-local fetches.\n"
11929
msgstr ""
11930
11931
#: en/help_topics/diverged-branches.txt:1
11932
msgid ""
11933
"Diverged Branches\n"
11934
"================="
11935
msgstr ""
11936
11937
#: en/help_topics/diverged-branches.txt:4
11938
msgid ""
11939
"When Bazaar tries to push one branch onto another, it requires that the\n"
11940
"destination branch must be ready to receive the source branch. If this "
11941
"isn't\n"
11942
"the case, then we say that the branches have ``diverged``. Branches are\n"
11943
"considered diverged if the destination branch's most recent commit is one "
11944
"that\n"
11945
"has not been merged (directly or indirectly) by the source branch. To "
11946
"recover\n"
11947
"from diverged branches, one must merge the missing revisions into the "
11948
"source\n"
11949
"branch."
11950
msgstr ""
11951
11952
#: en/help_topics/diverged-branches.txt:12
11953
msgid ""
11954
"This situation commonly arises when using a centralized workflow with local\n"
11955
"commits. If someone else has committed new work to the mainline since your\n"
11956
"last pull and you have local commits that have not yet been pushed to the\n"
11957
"mainline, then your local branch and the mainline have diverged."
11958
msgstr ""
11959
11960
#: en/help_topics/diverged-branches.txt:17
11961
msgid ""
11962
"Discovering What Has Diverged\n"
11963
"-----------------------------"
11964
msgstr ""
11965
11966
#: en/help_topics/diverged-branches.txt:20
11967
msgid ""
11968
"The ``bzr missing`` command is used to find out what revisions are in "
11969
"another\n"
11970
"branch that are not present in the current branch, and vice-versa. It shows "
11971
"a\n"
11972
"summary of which extra revisions exist in each branch. If you want to see "
11973
"the\n"
11974
"precise effects of those revisions, you can use ``bzr diff --"
11975
"old=other_branch``\n"
11976
"to show the differences between other_branch and your current branch."
11977
msgstr ""
11978
11979
#: en/help_topics/diverged-branches.txt:26
11980
msgid ""
11981
"A Solution\n"
11982
"----------"
11983
msgstr ""
11984
11985
#: en/help_topics/diverged-branches.txt:29
11986
msgid ""
11987
"The solution is to merge the revisions from the mainline into your local\n"
11988
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11989
"mainline. This merge may result in conflicts if the other developer's "
11990
"changes\n"
11991
"overlap with your changes. These conflicts should be resolved before\n"
11992
"continuing. After any conflicts have been resolved, or even if there were "
11993
"no\n"
11994
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11995
"to your local branch. This requirement gives you an opportunity to test "
11996
"the\n"
11997
"resulting working tree for correctness, since the merged revisions could "
11998
"have\n"
11999
"made arbitrary changes. After testing, you should commit the merge using\n"
12000
"``bzr commit``. This clears up the diverged branches situation. Your "
12001
"local\n"
12002
"branch can now be pushed to the mainline.\n"
12003
msgstr ""
12004
12005
#: en/help_topics/env-variables.txt:1
12006
msgid "Environment Variables"
12007
msgstr "Переменные окружения"
12008
12009
#: en/help_topics/env-variables.txt:3
12010
msgid ""
12011
"=================== "
12012
"===========================================================\n"
12013
"BZRPATH Path where bzr is to look for shell plugin external\n"
12014
" commands.\n"
12015
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
12016
"EMAIL E-Mail address of the user.\n"
12017
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
12018
"EDITOR Editor for editing commit messages.\n"
12019
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
12020
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
12021
"BZR_PLUGINS_AT Plugins to load from a directory not in "
12022
"BZR_PLUGIN_PATH.\n"
12023
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
12024
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
12025
"and\n"
12026
" HOME.\n"
12027
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
12028
"URLs).\n"
12029
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
12030
"sshcorp,\n"
12031
" plink or lsh.\n"
12032
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
12033
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
12034
"BZR_COLUMNS Override implicit terminal width.\n"
12035
"BZR_CONCURRENCY Number of processes that can be run concurrently "
12036
"(selftest)\n"
12037
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
12038
"'text'.\n"
12039
"BZR_PDB Control whether to launch a debugger on error.\n"
12040
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
12041
" breakin debugger.\n"
12042
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
12043
"(instead\n"
12044
" of char-based).\n"
12045
"=================== "
12046
"===========================================================\n"
12047
msgstr ""
12048
12049
#: en/help_topics/eol.txt:1
12050
msgid ""
12051
"End of Line Conversion\n"
12052
"======================"
12053
msgstr ""
12054
12055
#: en/help_topics/eol.txt:4
12056
msgid ""
12057
"EOL conversion is provided as a content filter where Bazaar internally\n"
12058
"stores a canonical format but outputs a convenience format. See\n"
12059
"``bzr help content-filters`` for general information about using these."
12060
msgstr ""
12061
12062
#: en/help_topics/eol.txt:8
12063
msgid ""
12064
"Note: Content filtering is only supported in recently added formats,\n"
12065
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
12066
"in a recent format. (Just setting the format on the repository\n"
12067
"is not enough.) If content filtering does not appear to be working, use\n"
12068
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
12069
"or later."
12070
msgstr ""
12071
12072
#: en/help_topics/eol.txt:15
12073
msgid ""
12074
"EOL conversion needs to be enabled for selected file patterns using\n"
12075
"rules. See ``bzr help rules`` for general information on defining rules.\n"
12076
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
12077
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
12078
"supported in a future verison of Bazaar."
12079
msgstr ""
12080
12081
#: en/help_topics/eol.txt:21
12082
msgid ""
12083
"To configure which files to filter, set ``eol`` to one of the values below.\n"
12084
"(If a value is not set, ``exact`` is the default.)"
12085
msgstr ""
12086
12087
#: en/help_topics/eol.txt:24
12088
msgid ""
12089
" ========== ===================================== ======================\n"
12090
" Value Checkout end-of-lines as Commit end-of-lines as\n"
12091
" ========== ===================================== ======================\n"
12092
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
12093
" ---------- ------------------------------------- ----------------------\n"
12094
" ``lf`` ``lf`` ``lf``\n"
12095
" ---------- ------------------------------------- ----------------------\n"
12096
" ``crlf`` ``crlf`` ``lf``\n"
12097
" ---------- ------------------------------------- ----------------------\n"
12098
" ``exact`` No conversion Exactly as in file\n"
12099
" ========== ===================================== ======================"
12100
msgstr ""
12101
12102
#: en/help_topics/eol.txt:36
12103
msgid ""
12104
"Note: For safety reasons, no conversion is applied to any file where a null\n"
12105
"byte is detected in the file."
12106
msgstr ""
12107
12108
#: en/help_topics/eol.txt:39
12109
msgid ""
12110
"For users working on a cross-platform project, here is a suggested rule\n"
12111
"to use as a starting point::"
12112
msgstr ""
12113
12114
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
12115
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
12116
msgid ""
12117
" [name *]\n"
12118
" eol = native"
12119
msgstr ""
12120
12121
#: en/help_topics/eol.txt:45
12122
msgid ""
12123
"If you have binary files that do not contain a null byte though, be\n"
12124
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
12125
"by giving more explicit patterns earlier in the rules file. For example::"
12126
msgstr ""
12127
12128
#: en/help_topics/eol.txt:49
12129
msgid ""
12130
" [name *.png]\n"
12131
" eol = exact"
12132
msgstr ""
12133
12134
#: en/help_topics/eol.txt:55
12135
msgid ""
12136
"If your working tree is on a network drive shared by users on different\n"
12137
"operating systems, you typically want to force certain conventions for\n"
12138
"certain files. In that way, if a file is created with the wrong line\n"
12139
"endings or line endings get mixed during editing, it gets committed\n"
12140
"correctly and gets checked out correctly. For example::"
12141
msgstr ""
12142
12143
#: en/help_topics/eol.txt:61
12144
msgid ""
12145
" [name *.bat]\n"
12146
" eol = crlf"
12147
msgstr ""
12148
12149
#: en/help_topics/eol.txt:64
12150
msgid ""
12151
" [name *.sh]\n"
12152
" eol = lf"
12153
msgstr ""
12154
12155
#: en/help_topics/eol.txt:70
12156
msgid ""
12157
"If you take the care to create files with their required endings, you can\n"
12158
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
12159
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
12160
"introducing mixed line endings will be corrected during commit for files\n"
12161
"with those settings."
12162
msgstr ""
12163
12164
#: en/help_topics/eol.txt:76
12165
msgid ""
12166
"If you have sample test data that deliberately has text files with mixed\n"
12167
"newline conventions, you can ask for those to be left alone like this::"
12168
msgstr ""
12169
12170
#: en/help_topics/eol.txt:79
12171
msgid ""
12172
" [name test_data/]\n"
12173
" eol = exact"
12174
msgstr ""
12175
12176
#: en/help_topics/eol.txt:85
12177
msgid ""
12178
"Note that ``exact`` does not imply the file is binary but it does mean\n"
12179
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
12180
"of content analysis to detect binary files for commands like ``diff``.\n"
12181
"In the future, a ``binary = true`` rule may be added but it is not\n"
12182
"supported yet.)"
12183
msgstr ""
12184
12185
#: en/help_topics/eol.txt:91
12186
msgid ""
12187
"If you have an existing repository with text files already stored using\n"
12188
"Windows newline conventions (``crlf``), then you may want to keep using "
12189
"that\n"
12190
"convention in the repository. Forcing certain files to this convention\n"
12191
"may also help users who do not have rules configured. To do this, set\n"
12192
"``eol`` to one of the values below."
12193
msgstr ""
12194
12195
#: en/help_topics/eol.txt:97
12196
msgid ""
12197
" ============================ ======================== "
12198
"======================\n"
12199
" Value Checkout end-of-lines as Commit end-of-lines "
12200
"as\n"
12201
" ============================ ======================== "
12202
"======================\n"
12203
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
12204
" ``lf`` otherwise\n"
12205
" ---------------------------- ------------------------ ----------------------"
12206
"\n"
12207
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
12208
" ---------------------------- ------------------------ ----------------------"
12209
"\n"
12210
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
12211
" ============================ ======================== ======================"
12212
msgstr ""
12213
12214
#: en/help_topics/eol.txt:108
12215
msgid ""
12216
"For users working on an existing project that uses Windows newline\n"
12217
"conventions in their Bazaar repository, this rule is suggested as a\n"
12218
"starting point::"
12219
msgstr ""
12220
12221
#: en/help_topics/eol.txt:112
12222
msgid ""
12223
" [name *]\n"
12224
" eol = native-with-crlf-in-repo"
12225
msgstr ""
12226
12227
#: en/help_topics/eol.txt:115
12228
msgid ""
12229
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12230
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12231
"``crlf`` and ``exact``."
12232
msgstr ""
12233
12234
#: en/help_topics/eol.txt:119
12235
msgid ""
12236
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12237
"never reject files because a given line ending or mixed line endings\n"
12238
"are found. A precommit hook should be used if you wish to validate\n"
12239
"(and not just convert) content before committing.\n"
12240
msgstr ""
12241
12242
#: en/help_topics/hidden-commands.txt:1
12243
msgid ""
12244
"added List files added in working tree.\n"
12245
"ancestry List all revisions merged into this branch.\n"
12246
"assert-fail Test reporting of assertion failures\n"
12247
"bundle-info Output interesting stats about a bundle\n"
12248
"bundle-revisions Create a merge-directive for submitting changes.\n"
12249
"cat-revision Write out metadata for a revision.\n"
12250
"dump-btree Dump the contents of a btree index file to stdout.\n"
12251
"export-pot Export command helps and error messages in po format.\n"
12252
"file-id Print file_id of a particular file or directory.\n"
12253
"file-path Print path of file_ids to a file or directory.\n"
12254
"find-merge-base Find and print a base revision for merging two "
12255
"branches.\n"
12256
"hooks Show hooks.\n"
12257
"inventory Show inventory of the current working copy or a "
12258
"revision.\n"
12259
"local-time-offset Show the offset in seconds from GMT to local time.\n"
12260
"lookup-revision Lookup the revision-id from a revision-number\n"
12261
"merge-directive Generate a merge directive for auto-merge tools.\n"
12262
"modified List files modified in working tree.\n"
12263
"re-sign Create a digital signature for an existing revision.\n"
12264
"reference list, view and set branch locations for nested trees.\n"
12265
"relpath Show path of a file relative to root\n"
12266
"repair-workingtree Reset the working tree state file.\n"
12267
"revision-history Display the list of revision ids on a branch.\n"
12268
"revision-info Show revision number and revision id for a given "
12269
"revision\n"
12270
" identifier.\n"
12271
"rocks Statement of optimism.\n"
12272
"selftest Run internal test suite.\n"
12273
"shell-complete Show appropriate completions for context.\n"
12274
"test-script Run a shell-like test from a file.\n"
12275
"touching-revisions Return revision-ids which affected a particular file.\n"
12276
"unknowns List unknown files.\n"
12277
"wait-until-signalled Test helper for\n"
12278
" test_start_and_stop_bzr_subprocess_send_signal.\n"
12279
msgstr ""
12280
12281
#: en/help_topics/hooks.txt:1
12282
msgid ""
12283
"\n"
12284
"Hooks\n"
12285
"====="
12286
msgstr ""
12287
12288
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
12289
msgid ""
12290
"Introduction\n"
12291
"------------"
12292
msgstr ""
12293
12294
#: en/help_topics/hooks.txt:8
12295
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12296
msgstr ""
12297
12298
#: en/help_topics/hooks.txt:10
12299
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
12300
msgstr ""
12301
12302
#: en/help_topics/hooks.txt:12
12303
msgid ""
12304
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12305
msgstr ""
12306
12307
#: en/help_topics/hooks.txt:14
12308
msgid ""
12309
"The class that contains each hook is given before the hooks it supplies. "
12310
"For\n"
12311
"instance, BranchHooks as the class is the hooks class for\n"
12312
"`bzrlib.branch.Branch.hooks`."
12313
msgstr ""
12314
12315
#: en/help_topics/hooks.txt:18
12316
msgid ""
12317
"Each description also indicates whether the hook runs on the client (the\n"
12318
"machine where bzr was invoked) or the server (the machine addressed by\n"
12319
"the branch URL). These may be, but are not necessarily, the same machine."
12320
msgstr ""
12321
12322
#: en/help_topics/hooks.txt:22
12323
msgid ""
12324
"Plugins (including hooks) are run on the server if all of these is true:"
12325
msgstr ""
12326
12327
#: en/help_topics/hooks.txt:24
12328
msgid ""
12329
" * The connection is via a smart server (accessed with a URL starting with\n"
12330
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12331
"\"http://\"\n"
12332
" URL when a smart server is available via HTTP)."
12333
msgstr ""
12334
12335
#: en/help_topics/hooks.txt:28
12336
msgid ""
12337
" * The hook is either server specific or part of general infrastructure "
12338
"rather\n"
12339
" than client specific code (such as commit)."
12340
msgstr ""
12341
12342
#: en/help_topics/hooks.txt:31
12343
msgid ""
12344
"\n"
12345
"BranchHooks\n"
12346
"-----------"
12347
msgstr ""
12348
12349
#: en/help_topics/hooks.txt:35
12350
msgid ""
12351
"automatic_tag_name\n"
12352
"~~~~~~~~~~~~~~~~~~"
12353
msgstr ""
12354
12355
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12356
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
12357
msgid "Introduced in: 2.2"
12358
msgstr ""
12359
12360
#: en/help_topics/hooks.txt:40
12361
msgid ""
12362
"Called to determine an automatic tag name for a revision.\n"
12363
"automatic_tag_name is called with (branch, revision_id) and should\n"
12364
"return a tag name or None if no tag name could be determined. The\n"
12365
"first non-None tag name returned will be used."
12366
msgstr ""
12367
12368
#: en/help_topics/hooks.txt:45
12369
msgid ""
12370
"open\n"
12371
"~~~~"
12372
msgstr ""
12373
12374
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12375
#: en/help_topics/hooks.txt:307
12376
msgid "Introduced in: 1.8"
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:50
12380
msgid ""
12381
"Called with the Branch object that has been opened after a branch is\n"
12382
"opened."
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:53
12386
msgid ""
12387
"post_branch_init\n"
12388
"~~~~~~~~~~~~~~~~"
12389
msgstr ""
12390
12391
#: en/help_topics/hooks.txt:58
12392
msgid ""
12393
"Called after new branch initialization completes. post_branch_init is\n"
12394
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12395
"branch and checkout (both heavyweight and lightweight) will all\n"
12396
"trigger this hook."
12397
msgstr ""
12398
12399
#: en/help_topics/hooks.txt:63
12400
msgid ""
12401
"post_change_branch_tip\n"
12402
"~~~~~~~~~~~~~~~~~~~~~~"
12403
msgstr ""
12404
12405
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
12406
msgid "Introduced in: 1.4"
12407
msgstr ""
12408
12409
#: en/help_topics/hooks.txt:68
12410
msgid ""
12411
"Called in bzr client and server after a change to the tip of a branch\n"
12412
"is made. post_change_branch_tip is called with a\n"
12413
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12414
"uncommit will all trigger this hook."
12415
msgstr ""
12416
12417
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
12418
msgid ""
12419
"post_commit\n"
12420
"~~~~~~~~~~~"
12421
msgstr ""
12422
12423
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12424
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12425
msgid "Introduced in: 0.15"
12426
msgstr ""
12427
12428
#: en/help_topics/hooks.txt:78
12429
msgid ""
12430
"Called in the bzr client after a commit has completed. post_commit is\n"
12431
"called with (local, master, old_revno, old_revid, new_revno,\n"
12432
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12433
"branch."
12434
msgstr ""
12435
12436
#: en/help_topics/hooks.txt:83
12437
msgid ""
12438
"post_pull\n"
12439
"~~~~~~~~~"
12440
msgstr ""
12441
12442
#: en/help_topics/hooks.txt:88
12443
msgid ""
12444
"Called after a pull operation completes. post_pull is called with a\n"
12445
"bzrlib.branch.PullResult object and only runs in the bzr client."
12446
msgstr ""
12447
12448
#: en/help_topics/hooks.txt:91
12449
msgid ""
12450
"post_push\n"
12451
"~~~~~~~~~"
12452
msgstr ""
12453
12454
#: en/help_topics/hooks.txt:96
12455
msgid ""
12456
"Called after a push operation completes. post_push is called with a\n"
12457
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12458
msgstr ""
12459
12460
#: en/help_topics/hooks.txt:99
12461
msgid ""
12462
"post_switch\n"
12463
"~~~~~~~~~~~"
12464
msgstr ""
12465
12466
#: en/help_topics/hooks.txt:104
12467
msgid ""
12468
"Called after a checkout switches branch. post_switch is called with a\n"
12469
"bzrlib.branch.SwitchHookParams."
12470
msgstr ""
12471
12472
#: en/help_topics/hooks.txt:107
12473
msgid ""
12474
"post_uncommit\n"
12475
"~~~~~~~~~~~~~"
12476
msgstr ""
12477
12478
#: en/help_topics/hooks.txt:112
12479
msgid ""
12480
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12481
"called with (local, master, old_revno, old_revid, new_revno,\n"
12482
"new_revid) where local is the local branch or None, master is the\n"
12483
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12484
"of None."
12485
msgstr ""
12486
12487
#: en/help_topics/hooks.txt:118
12488
msgid ""
12489
"pre_change_branch_tip\n"
12490
"~~~~~~~~~~~~~~~~~~~~~"
12491
msgstr ""
12492
12493
#: en/help_topics/hooks.txt:121
12494
msgid "Introduced in: 1.6"
12495
msgstr ""
12496
12497
#: en/help_topics/hooks.txt:123
12498
msgid ""
12499
"Called in bzr client and server before a change to the tip of a branch\n"
12500
"is made. pre_change_branch_tip is called with a\n"
12501
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12502
"uncommit will all trigger this hook."
12503
msgstr ""
12504
12505
#: en/help_topics/hooks.txt:128
12506
msgid ""
12507
"pre_commit\n"
12508
"~~~~~~~~~~"
12509
msgstr ""
12510
12511
#: en/help_topics/hooks.txt:131
12512
msgid "Introduced in: 0.91"
12513
msgstr ""
12514
12515
#: en/help_topics/hooks.txt:133
12516
msgid ""
12517
"Called after a commit is calculated but before it is completed.\n"
12518
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12519
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12520
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12521
"TreeDelta object describing changes from the basis revision. hooks\n"
12522
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12523
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12524
"tree."
12525
msgstr ""
12526
12527
#: en/help_topics/hooks.txt:142
12528
msgid ""
12529
"transform_fallback_location\n"
12530
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12531
msgstr ""
12532
12533
#: en/help_topics/hooks.txt:145
12534
msgid "Introduced in: 1.9"
12535
msgstr ""
12536
12537
#: en/help_topics/hooks.txt:147
12538
msgid ""
12539
"Called when a stacked branch is activating its fallback locations.\n"
12540
"transform_fallback_location is called with (branch, url), and should\n"
12541
"return a new url. Returning the same url allows it to be used as-is,\n"
12542
"returning a different one can be used to cause the branch to stack on\n"
12543
"a closer copy of that fallback_location. Note that the branch cannot\n"
12544
"have history accessing methods called on it during this hook because\n"
12545
"the fallback locations have not been activated. When there are\n"
12546
"multiple hooks installed for transform_fallback_location, all are\n"
12547
"called with the url returned from the previous hook.The order is\n"
12548
"however undefined."
12549
msgstr ""
12550
12551
#: en/help_topics/hooks.txt:158
12552
msgid ""
12553
"CommandHooks\n"
12554
"------------"
12555
msgstr ""
12556
12557
#: en/help_topics/hooks.txt:161
12558
msgid ""
12559
"extend_command\n"
12560
"~~~~~~~~~~~~~~"
12561
msgstr ""
12562
12563
#: en/help_topics/hooks.txt:164
12564
msgid "Introduced in: 1.13"
12565
msgstr ""
12566
12567
#: en/help_topics/hooks.txt:166
12568
msgid ""
12569
"Called after creating a command object to allow modifications such as\n"
12570
"adding or removing options, docs etc. Called with the new\n"
12571
"bzrlib.commands.Command object."
12572
msgstr ""
12573
12574
#: en/help_topics/hooks.txt:170
12575
msgid ""
12576
"get_command\n"
12577
"~~~~~~~~~~~"
12578
msgstr ""
12579
12580
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12581
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12582
msgid "Introduced in: 1.17"
12583
msgstr ""
12584
12585
#: en/help_topics/hooks.txt:175
12586
msgid ""
12587
"Called when creating a single command. Called with (cmd_or_None,\n"
12588
"command_name). get_command should either return the cmd_or_None\n"
12589
"parameter, or a replacement Command object that should be used for the\n"
12590
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12591
"Many users will prefer to use bzrlib.commands.register_command or\n"
12592
"plugin_cmds.register_lazy."
12593
msgstr ""
12594
12595
#: en/help_topics/hooks.txt:182
12596
msgid ""
12597
"get_missing_command\n"
12598
"~~~~~~~~~~~~~~~~~~~"
12599
msgstr ""
12600
12601
#: en/help_topics/hooks.txt:187
12602
msgid ""
12603
"Called when creating a single command if no command could be found.\n"
12604
"Called with (command_name). get_missing_command should either return\n"
12605
"None, or a Command object to be used for the command."
12606
msgstr ""
12607
12608
#: en/help_topics/hooks.txt:191
12609
msgid ""
12610
"list_commands\n"
12611
"~~~~~~~~~~~~~"
12612
msgstr ""
12613
12614
#: en/help_topics/hooks.txt:196
12615
msgid ""
12616
"Called when enumerating commands. Called with a set of cmd_name\n"
12617
"strings for all the commands found so far. This set is safe to mutate\n"
12618
"- e.g. to remove a command. list_commands should return the updated\n"
12619
"set of command names."
12620
msgstr ""
12621
12622
#: en/help_topics/hooks.txt:201
12623
msgid ""
12624
"post_command\n"
12625
"~~~~~~~~~~~~"
12626
msgstr ""
12627
12628
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12629
msgid "Introduced in: 2.6"
12630
msgstr ""
12631
12632
#: en/help_topics/hooks.txt:206
12633
msgid "Called after executing a command. Called with the command object."
12634
msgstr ""
12635
12636
#: en/help_topics/hooks.txt:208
12637
msgid ""
12638
"pre_command\n"
12639
"~~~~~~~~~~~"
12640
msgstr ""
12641
12642
#: en/help_topics/hooks.txt:213
12643
msgid "Called prior to executing a command. Called with the command object."
12644
msgstr ""
12645
12646
#: en/help_topics/hooks.txt:215
12647
msgid ""
12648
"_ConfigHooks\n"
12649
"------------"
12650
msgstr ""
12651
12652
#: en/help_topics/hooks.txt:218
12653
msgid ""
12654
"get\n"
12655
"~~~"
12656
msgstr ""
12657
12658
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12659
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12660
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12661
#: en/help_topics/hooks.txt:446
12662
msgid "Introduced in: 2.4"
12663
msgstr ""
12664
12665
#: en/help_topics/hooks.txt:223
12666
msgid ""
12667
"Invoked when a config option is read. The signature is (stack, name,\n"
12668
"value)."
12669
msgstr ""
12670
12671
#: en/help_topics/hooks.txt:226
12672
msgid ""
12673
"load\n"
12674
"~~~~"
12675
msgstr ""
12676
12677
#: en/help_topics/hooks.txt:231
12678
msgid "Invoked when a config store is loaded. The signature is (store)."
12679
msgstr ""
12680
12681
#: en/help_topics/hooks.txt:233
12682
msgid ""
12683
"remove\n"
12684
"~~~~~~"
12685
msgstr ""
12686
12687
#: en/help_topics/hooks.txt:238
12688
msgid ""
12689
"Invoked when a config option is removed. The signature is (stack,\n"
12690
"name)."
12691
msgstr ""
12692
12693
#: en/help_topics/hooks.txt:241
12694
msgid ""
12695
"save\n"
12696
"~~~~"
12697
msgstr ""
12698
12699
#: en/help_topics/hooks.txt:246
12700
msgid "Invoked when a config store is saved. The signature is (store)."
12701
msgstr ""
12702
12703
#: en/help_topics/hooks.txt:248
12704
msgid ""
12705
"set\n"
12706
"~~~"
12707
msgstr ""
12708
12709
#: en/help_topics/hooks.txt:253
12710
msgid ""
12711
"Invoked when a config option is set. The signature is (stack, name,\n"
12712
"value)."
12713
msgstr ""
12714
12715
#: en/help_topics/hooks.txt:256
12716
msgid ""
12717
"ControlDirHooks\n"
12718
"---------------"
12719
msgstr ""
12720
12721
#: en/help_topics/hooks.txt:259
12722
msgid ""
12723
"post_repo_init\n"
12724
"~~~~~~~~~~~~~~"
12725
msgstr ""
12726
12727
#: en/help_topics/hooks.txt:264
12728
msgid ""
12729
"Invoked after a repository has been initialized. post_repo_init is\n"
12730
"called with a bzrlib.controldir.RepoInitHookParams."
12731
msgstr ""
12732
12733
#: en/help_topics/hooks.txt:267
12734
msgid ""
12735
"pre_open\n"
12736
"~~~~~~~~"
12737
msgstr ""
12738
12739
#: en/help_topics/hooks.txt:270
12740
msgid "Introduced in: 1.14"
12741
msgstr ""
12742
12743
#: en/help_topics/hooks.txt:272
12744
msgid ""
12745
"Invoked before attempting to open a ControlDir with the transport that\n"
12746
"the open will use."
12747
msgstr ""
12748
12749
#: en/help_topics/hooks.txt:275
12750
msgid ""
12751
"InfoHooks\n"
12752
"---------"
12753
msgstr ""
12754
12755
#: en/help_topics/hooks.txt:278
12756
msgid ""
12757
"repository\n"
12758
"~~~~~~~~~~"
12759
msgstr ""
12760
12761
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12762
#: en/help_topics/hooks.txt:524
12763
msgid "Introduced in: 1.15"
12764
msgstr ""
12765
12766
#: en/help_topics/hooks.txt:283
12767
msgid ""
12768
"Invoked when displaying the statistics for a repository. repository is\n"
12769
"called with a statistics dictionary as returned by the repository and\n"
12770
"a file-like object to write to."
12771
msgstr ""
12772
12773
#: en/help_topics/hooks.txt:287
12774
msgid ""
12775
"LockHooks\n"
12776
"---------"
12777
msgstr ""
12778
12779
#: en/help_topics/hooks.txt:290
12780
msgid ""
12781
"lock_acquired\n"
12782
"~~~~~~~~~~~~~"
12783
msgstr ""
12784
12785
#: en/help_topics/hooks.txt:295
12786
msgid ""
12787
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12788
msgstr ""
12789
12790
#: en/help_topics/hooks.txt:297
12791
msgid ""
12792
"lock_broken\n"
12793
"~~~~~~~~~~~"
12794
msgstr ""
12795
12796
#: en/help_topics/hooks.txt:302
12797
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12798
msgstr ""
12799
12800
#: en/help_topics/hooks.txt:304
12801
msgid ""
12802
"lock_released\n"
12803
"~~~~~~~~~~~~~"
12804
msgstr ""
12805
12806
#: en/help_topics/hooks.txt:309
12807
msgid ""
12808
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12809
msgstr ""
12810
12811
#: en/help_topics/hooks.txt:311
12812
msgid ""
12813
"MergeHooks\n"
12814
"----------"
12815
msgstr ""
12816
12817
#: en/help_topics/hooks.txt:314
12818
msgid ""
12819
"merge_file_content\n"
12820
"~~~~~~~~~~~~~~~~~~"
12821
msgstr ""
12822
12823
#: en/help_topics/hooks.txt:317
12824
msgid "Introduced in: 2.1"
12825
msgstr ""
12826
12827
#: en/help_topics/hooks.txt:319
12828
msgid ""
12829
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12830
"object when starting a merge. Should return either None or a subclass\n"
12831
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12832
"called per file that needs to be merged (including when one side has\n"
12833
"deleted the file and the other has changed it). See the\n"
12834
"AbstractPerFileMerger API docs for details on how it is used by merge."
12835
msgstr ""
12836
12837
#: en/help_topics/hooks.txt:326
12838
msgid ""
12839
"post_merge\n"
12840
"~~~~~~~~~~"
12841
msgstr ""
12842
12843
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12844
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12845
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12846
msgid "Introduced in: 2.5"
12847
msgstr ""
12848
12849
#: en/help_topics/hooks.txt:331
12850
msgid ""
12851
"Called after a merge. Receives a Merger object as the single argument.\n"
12852
"The return value is ignored."
12853
msgstr ""
12854
12855
#: en/help_topics/hooks.txt:334
12856
msgid ""
12857
"pre_merge\n"
12858
"~~~~~~~~~"
12859
msgstr ""
12860
12861
#: en/help_topics/hooks.txt:339
12862
msgid ""
12863
"Called before a merge. Receives a Merger object as the single\n"
12864
"argument."
12865
msgstr ""
12866
12867
#: en/help_topics/hooks.txt:342
12868
msgid ""
12869
"MergeDirectiveHooks\n"
12870
"-------------------"
12871
msgstr ""
12872
12873
#: en/help_topics/hooks.txt:345
12874
msgid ""
12875
"merge_request_body\n"
12876
"~~~~~~~~~~~~~~~~~~"
12877
msgstr ""
12878
12879
#: en/help_topics/hooks.txt:348
12880
msgid "Introduced in: 1.15.0"
12881
msgstr ""
12882
12883
#: en/help_topics/hooks.txt:350
12884
msgid ""
12885
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12886
"request. Callbacks must return a body. If more than one callback is\n"
12887
"registered, the output of one callback is provided to the next."
12888
msgstr ""
12889
12890
#: en/help_topics/hooks.txt:354
12891
msgid ""
12892
"MessageEditorHooks\n"
12893
"------------------"
12894
msgstr ""
12895
12896
#: en/help_topics/hooks.txt:357
12897
msgid ""
12898
"commit_message_template\n"
12899
"~~~~~~~~~~~~~~~~~~~~~~~"
12900
msgstr ""
12901
12902
#: en/help_topics/hooks.txt:360
12903
msgid "Introduced in: 1.10"
12904
msgstr ""
12905
12906
#: en/help_topics/hooks.txt:362
12907
msgid ""
12908
"Called when a commit message is being generated.\n"
12909
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12910
"and the message that is known so far. commit_message_template must\n"
12911
"return a new message to use (which could be the same as it was given).\n"
12912
"When there are multiple hooks registered for commit_message_template,\n"
12913
"they are chained with the result from the first passed into the\n"
12914
"second, and so on."
12915
msgstr ""
12916
12917
#: en/help_topics/hooks.txt:370
12918
msgid ""
12919
"set_commit_message\n"
12920
"~~~~~~~~~~~~~~~~~~"
12921
msgstr ""
12922
12923
#: en/help_topics/hooks.txt:375
12924
msgid ""
12925
"Set a fixed commit message. set_commit_message is called with the\n"
12926
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12927
"properties by editing commit.builder._revprops) and the message so\n"
12928
"far. set_commit_message must return the message to use or None if it\n"
12929
"should use the message editor as normal."
12930
msgstr ""
12931
12932
#: en/help_topics/hooks.txt:381
12933
msgid ""
12934
"MutableTreeHooks\n"
12935
"----------------"
12936
msgstr ""
12937
12938
#: en/help_topics/hooks.txt:384
12939
msgid ""
12940
"post_build_tree\n"
12941
"~~~~~~~~~~~~~~~"
12942
msgstr ""
12943
12944
#: en/help_topics/hooks.txt:389
12945
msgid ""
12946
"Called after a completely new tree is built. The hook is called with\n"
12947
"the tree as its only argument."
12948
msgstr ""
12949
12950
#: en/help_topics/hooks.txt:395
12951
msgid "Introduced in: 2.0"
12952
msgstr ""
12953
12954
#: en/help_topics/hooks.txt:397
12955
msgid ""
12956
"Called after a commit is performed on a tree. The hook is called with\n"
12957
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12958
"commit was performed on is available via the mutable_tree attribute of\n"
12959
"that object."
12960
msgstr ""
12961
12962
#: en/help_topics/hooks.txt:402
12963
msgid ""
12964
"post_transform\n"
12965
"~~~~~~~~~~~~~~"
12966
msgstr ""
12967
12968
#: en/help_topics/hooks.txt:407
12969
msgid ""
12970
"Called after a tree transform has been performed on a tree. The hook\n"
12971
"is called with the tree that is being transformed and the transform."
12972
msgstr ""
12973
12974
#: en/help_topics/hooks.txt:410
12975
msgid ""
12976
"pre_transform\n"
12977
"~~~~~~~~~~~~~"
12978
msgstr ""
12979
12980
#: en/help_topics/hooks.txt:415
12981
msgid ""
12982
"Called before a tree transform on this tree. The hook is called with\n"
12983
"the tree that is being transformed and the transform."
12984
msgstr ""
12985
12986
#: en/help_topics/hooks.txt:418
12987
msgid ""
12988
"start_commit\n"
12989
"~~~~~~~~~~~~"
12990
msgstr ""
12991
12992
#: en/help_topics/hooks.txt:423
12993
msgid ""
12994
"Called before a commit is performed on a tree. The start commit hook\n"
12995
"is able to change the tree before the commit takes place. start_commit\n"
12996
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12997
"being performed on."
12998
msgstr ""
12999
13000
#: en/help_topics/hooks.txt:428
13001
msgid ""
13002
"SmartClientHooks\n"
13003
"----------------"
13004
msgstr ""
13005
13006
#: en/help_topics/hooks.txt:431
13007
msgid ""
13008
"call\n"
13009
"~~~~"
13010
msgstr ""
13011
13012
#: en/help_topics/hooks.txt:434
13013
msgid "Introduced in: unknown"
13014
msgstr ""
13015
13016
#: en/help_topics/hooks.txt:436
13017
msgid ""
13018
"Called when the smart client is submitting a request to the smart\n"
13019
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
13020
"Streaming request bodies, and responses, are not accessible."
13021
msgstr ""
13022
13023
#: en/help_topics/hooks.txt:440
13024
msgid ""
13025
"SmartServerHooks\n"
13026
"----------------"
13027
msgstr ""
13028
13029
#: en/help_topics/hooks.txt:443
13030
msgid ""
13031
"server_exception\n"
13032
"~~~~~~~~~~~~~~~~"
13033
msgstr ""
13034
13035
#: en/help_topics/hooks.txt:448
13036
msgid ""
13037
"Called by the bzr server when an exception occurs. server_exception is\n"
13038
"called with the sys.exc_info() tuple return true for the hook if the\n"
13039
"exception has been handled, in which case the server will exit\n"
13040
"normally."
13041
msgstr ""
13042
13043
#: en/help_topics/hooks.txt:453
13044
msgid ""
13045
"server_started\n"
13046
"~~~~~~~~~~~~~~"
13047
msgstr ""
13048
13049
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
13050
msgid "Introduced in: 0.16"
13051
msgstr ""
13052
13053
#: en/help_topics/hooks.txt:458
13054
msgid ""
13055
"Called by the bzr server when it starts serving a directory.\n"
13056
"server_started is called with (backing urls, public url), where\n"
13057
"backing_url is a list of URLs giving the server-specific directory\n"
13058
"locations, and public_url is the public URL for the directory being\n"
13059
"served."
13060
msgstr ""
13061
13062
#: en/help_topics/hooks.txt:464
13063
msgid ""
13064
"server_started_ex\n"
13065
"~~~~~~~~~~~~~~~~~"
13066
msgstr ""
13067
13068
#: en/help_topics/hooks.txt:469
13069
msgid ""
13070
"Called by the bzr server when it starts serving a directory.\n"
13071
"server_started is called with (backing_urls, server_obj)."
13072
msgstr ""
13073
13074
#: en/help_topics/hooks.txt:472
13075
msgid ""
13076
"server_stopped\n"
13077
"~~~~~~~~~~~~~~"
13078
msgstr ""
13079
13080
#: en/help_topics/hooks.txt:477
13081
msgid ""
13082
"Called by the bzr server when it stops serving a directory.\n"
13083
"server_stopped is called with the same parameters as the\n"
13084
"server_started hook: (backing_urls, public_url)."
13085
msgstr ""
13086
13087
#: en/help_topics/hooks.txt:481
13088
msgid ""
13089
"StatusHooks\n"
13090
"-----------"
13091
msgstr ""
13092
13093
#: en/help_topics/hooks.txt:484
13094
msgid ""
13095
"post_status\n"
13096
"~~~~~~~~~~~"
13097
msgstr ""
13098
13099
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
13100
msgid "Introduced in: 2.3"
13101
msgstr ""
13102
13103
#: en/help_topics/hooks.txt:489
13104
msgid ""
13105
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13106
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13107
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13108
"correspond to the command line options specified by the user for the\n"
13109
"status command. to_file is the output stream for writing."
13110
msgstr ""
13111
13112
#: en/help_topics/hooks.txt:495
13113
msgid ""
13114
"pre_status\n"
13115
"~~~~~~~~~~"
13116
msgstr ""
13117
13118
#: en/help_topics/hooks.txt:500
13119
msgid ""
13120
"Called with argument StatusHookParams before Bazaar displays the\n"
13121
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13122
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13123
"correspond to the command line options specified by the user for the\n"
13124
"status command. to_file is the output stream for writing."
13125
msgstr ""
13126
13127
#: en/help_topics/hooks.txt:506
13128
msgid ""
13129
"TransportHooks\n"
13130
"--------------"
13131
msgstr ""
13132
13133
#: en/help_topics/hooks.txt:509
13134
msgid ""
13135
"post_connect\n"
13136
"~~~~~~~~~~~~"
13137
msgstr ""
13138
13139
#: en/help_topics/hooks.txt:514
13140
msgid ""
13141
"Called after a new connection is established or a reconnect occurs.\n"
13142
"The sole argument passed is either the connected transport or smart\n"
13143
"medium instance."
13144
msgstr ""
13145
13146
#: en/help_topics/hooks.txt:518
13147
msgid ""
13148
"RioVersionInfoBuilderHooks\n"
13149
"--------------------------"
13150
msgstr ""
13151
13152
#: en/help_topics/hooks.txt:521
13153
msgid ""
13154
"revision\n"
13155
"~~~~~~~~"
13156
msgstr ""
13157
13158
#: en/help_topics/hooks.txt:526
13159
msgid ""
13160
"Invoked when adding information about a revision to the RIO stanza\n"
13161
"that is printed. revision is called with a revision object and a RIO\n"
13162
"stanza.\n"
13163
msgstr ""
13164
13165
#: en/help_topics/location-alias.txt:1
13166
msgid ""
13167
"Location aliases\n"
13168
"================"
13169
msgstr ""
13170
13171
#: en/help_topics/location-alias.txt:4
13172
msgid ""
13173
"Bazaar defines several aliases for locations associated with a branch. "
13174
"These\n"
13175
"can be used with most commands that expect a location, such as `bzr push`."
13176
msgstr ""
13177
13178
#: en/help_topics/location-alias.txt:7
13179
msgid "The aliases are::"
13180
msgstr ""
13181
13182
#: en/help_topics/location-alias.txt:9
13183
msgid ""
13184
" :bound The branch this branch is bound to, for bound branches.\n"
13185
" :parent The parent of this branch.\n"
13186
" :public The public location of this branch.\n"
13187
" :push The saved location used for `bzr push` with no arguments.\n"
13188
" :submit The submit branch for this branch.\n"
13189
" :this This branch."
13190
msgstr ""
13191
13192
#: en/help_topics/location-alias.txt:16
13193
msgid "For example, to push to the parent location::"
13194
msgstr ""
13195
13196
#: en/help_topics/location-alias.txt:18
13197
msgid " bzr push :parent\n"
13198
msgstr ""
13199
13200
#: en/help_topics/log-formats.txt:1
13201
msgid ""
13202
"Log Formats\n"
13203
"==========="
13204
msgstr ""
13205
13206
#: en/help_topics/log-formats.txt:4
13207
msgid ""
13208
"A log format controls how information about each revision is displayed.\n"
13209
"The standard log formats are compared below::"
13210
msgstr ""
13211
13212
#: en/help_topics/log-formats.txt:7
13213
msgid ""
13214
" Feature long short line\n"
13215
" ---------------------- ------------- ------------ -------------------\n"
13216
" design goal detailed view concise view 1 revision per line\n"
13217
" committer name+email name only name only\n"
13218
" author name+email - -\n"
13219
" date-time format full date only date only\n"
13220
" commit message full full top line\n"
13221
" tags yes yes yes\n"
13222
" merges indicator - yes -\n"
13223
" status/delta optional optional -\n"
13224
" diff/patch optional optional -\n"
13225
" revision-id optional optional -\n"
13226
" branch nick yes - -\n"
13227
" foreign vcs properties yes yes -\n"
13228
" preferred levels all 1 1\n"
13229
" digital signature optional - -"
13230
msgstr ""
13231
13232
#: en/help_topics/log-formats.txt:24
13233
msgid ""
13234
"The default format is ``long``. To change this, define the ``log_format``\n"
13235
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
13236
msgstr ""
13237
13238
#: en/help_topics/log-formats.txt:27
13239
msgid ""
13240
" [DEFAULT]\n"
13241
" log_format = short"
13242
msgstr ""
13243
13244
#: en/help_topics/log-formats.txt:30
13245
msgid ""
13246
"Alternatively, to change the log format used for a given query, use the\n"
13247
"--long, --short or --line options."
13248
msgstr ""
13249
13250
#: en/help_topics/log-formats.txt:33
13251
msgid ""
13252
"If one of the standard log formats does not meet your needs, additional\n"
13253
"formats can be provided by plugins.\n"
13254
msgstr ""
13255
13256
#: en/help_topics/other-formats.txt:1
13257
msgid "Other Storage Formats"
13258
msgstr ""
13259
13260
#: en/help_topics/other-formats.txt:3
13261
msgid "Experimental formats are shown below."
13262
msgstr ""
13263
13264
#: en/help_topics/other-formats.txt:5
13265
msgid ""
13266
":development-colo:\n"
13267
" (native) The 2a format with experimental support for colocated\n"
13268
" branches."
13269
msgstr ""
13270
13271
#: en/help_topics/other-formats.txt:9
13272
msgid ""
13273
"\n"
13274
"Deprecated formats are shown below."
13275
msgstr ""
13276
13277
#: en/help_topics/other-formats.txt:12
13278
msgid ""
13279
":pack-0.92:\n"
13280
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
13281
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
13282
" by bzr < 0.92."
13283
msgstr ""
13284
13285
#: en/help_topics/patterns.txt:1
13286
msgid ""
13287
"Patterns\n"
13288
"========"
13289
msgstr ""
13290
13291
#: en/help_topics/patterns.txt:4
13292
msgid ""
13293
"Bazaar uses patterns to match files at various times. For example,\n"
13294
"the ``add`` command skips over files that match ignore patterns\n"
13295
"and preferences can be associated with files using rule patterns.\n"
13296
"The pattern syntax is described below."
13297
msgstr ""
13298
13299
#: en/help_topics/patterns.txt:9
13300
msgid ""
13301
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13302
"slash or is a regular expression, it is compared to the whole path\n"
13303
"from the branch root. Otherwise, it is compared to only the last\n"
13304
"component of the path. To match a file only in the root directory,\n"
13305
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13306
msgstr ""
13307
13308
#: en/help_topics/patterns.txt:15
13309
msgid "Patterns may include globbing wildcards such as::"
13310
msgstr ""
13311
13312
#: en/help_topics/patterns.txt:17
13313
msgid ""
13314
" ? - Matches any single character except '/'\n"
13315
" * - Matches 0 or more characters except '/'\n"
13316
" /**/ - Matches 0 or more directories in a path\n"
13317
" [a-z] - Matches a single character from within a group of characters"
13318
msgstr ""
13319
13320
#: en/help_topics/patterns.txt:22
13321
msgid ""
13322
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13323
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13324
"expression. Regular expression patterns may not include named or\n"
13325
"numbered groups."
13326
msgstr ""
13327
13328
#: en/help_topics/patterns.txt:27
13329
msgid ""
13330
"Case insensitive ignore patterns can be specified with regular expressions\n"
13331
"by using the ``i`` (for ignore case) flag in the pattern."
13332
msgstr ""
13333
13334
#: en/help_topics/patterns.txt:30
13335
msgid ""
13336
"For example, a case insensitive match for ``foo`` may be specified as::"
13337
msgstr ""
13338
13339
#: en/help_topics/patterns.txt:32
13340
msgid " RE:(?i)foo"
13341
msgstr ""
13342
13343
#: en/help_topics/patterns.txt:34
13344
msgid ""
13345
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13346
"matched by that pattern will not be ignored."
13347
msgstr ""
13348
13349
#: en/help_topics/patterns.txt:37
13350
msgid ""
13351
".. _Python regular expressions: http://docs.python.org/library/re.html"
13352
msgstr ""
13353
13354
#: en/help_topics/revisionspec.txt:1
13355
msgid "Revision Identifiers"
13356
msgstr ""
13357
13358
#: en/help_topics/revisionspec.txt:3
13359
msgid ""
13360
"A revision identifier refers to a specific state of a branch's history. It\n"
13361
"can be expressed in several ways. It can begin with a keyword to\n"
13362
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13363
"'before:yesterday' and 'submit:'."
13364
msgstr ""
13365
13366
#: en/help_topics/revisionspec.txt:8
13367
msgid ""
13368
"Alternately, it can be given without a keyword, in which case it will be\n"
13369
"checked as a revision number, a tag, a revision id, a date specification, or "
13370
"a\n"
13371
"branch specification, in that order. For example, 'date:today' could be\n"
13372
"written as simply 'today', though if you have a tag called 'today' that "
13373
"will\n"
13374
"be found first."
13375
msgstr ""
13376
13377
#: en/help_topics/revisionspec.txt:14
13378
msgid ""
13379
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13380
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13381
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13382
"or\n"
13383
"spaces around the '..')."
13384
msgstr ""
13385
13386
#: en/help_topics/revisionspec.txt:19
13387
msgid ""
13388
"Ranges are interpreted differently by different commands. To the \"log\" "
13389
"command,\n"
13390
"a range is a sequence of log messages, but to the \"diff\" command, the "
13391
"range\n"
13392
"denotes a change between revisions (and not a sequence of changes). In\n"
13393
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13394
"consider it\n"
13395
"to be open-ended, that is, they include one end but not the other. For "
13396
"example:\n"
13397
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13398
"3649,\n"
13399
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13400
"and\n"
13401
"3649, but not 3647."
13402
msgstr ""
13403
13404
#: en/help_topics/revisionspec.txt:28
13405
msgid "The keywords used as revision selection methods are the following:"
13406
msgstr ""
13407
13408
#: en/help_topics/revisionspec.txt:30
13409
msgid ""
13410
":revid:\n"
13411
"\tSelects a revision using the revision id.\n"
13412
":submit:\n"
13413
"\tSelects a common ancestor with the submit branch.\n"
13414
":ancestor:\n"
13415
"\tSelects a common ancestor with a second branch.\n"
13416
":date:\n"
13417
"\tSelects a revision on the basis of a datestamp.\n"
13418
":branch:\n"
13419
"\tSelects the last revision of a specified branch.\n"
13420
":tag:\n"
13421
"\tSelects a revision identified by a tag name.\n"
13422
":revno:\n"
13423
"\tSelects a revision using a number.\n"
13424
":before:\n"
13425
"\tSelects the parent of the revision specified.\n"
13426
":annotate:\n"
13427
"\tSelect the revision that last modified the specified line.\n"
13428
":mainline:\n"
13429
"\tSelect mainline revision that merged the specified revision.\n"
13430
":last:\n"
13431
"\tSelects the nth revision from the end."
13432
msgstr ""
13433
13434
#: en/help_topics/revisionspec.txt:53
13435
msgid "In addition, plugins can provide other keywords."
13436
msgstr ""
13437
13438
#: en/help_topics/revisionspec.txt:55
13439
msgid "A detailed description of each keyword is given below."
13440
msgstr ""
13441
13442
#: en/help_topics/revisionspec.txt:57
13443
msgid ":revid:"
13444
msgstr ""
13445
13446
#: en/help_topics/revisionspec.txt:59
13447
msgid ""
13448
" Supply a specific revision id, that can be used to specify any\n"
13449
" revision id in the ancestry of the branch.\n"
13450
" Including merges, and pending merges.\n"
13451
" Examples::"
13452
msgstr ""
13453
13454
#: en/help_topics/revisionspec.txt:64
13455
msgid ""
13456
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13457
msgstr ""
13458
13459
#: en/help_topics/revisionspec.txt:66
13460
msgid ":submit:"
13461
msgstr ""
13462
13463
#: en/help_topics/revisionspec.txt:68
13464
msgid ""
13465
" Diffing against this shows all the changes that were made in this "
13466
"branch,\n"
13467
" and is a good predictor of what merge will do. The submit branch is\n"
13468
" used by the bundle and merge directive commands. If no submit branch\n"
13469
" is specified, the parent branch is used instead."
13470
msgstr ""
13471
13472
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13473
msgid ""
13474
" The common ancestor is the last revision that existed in both\n"
13475
" branches. Usually this is the branch point, but it could also be\n"
13476
" a revision that was merged."
13477
msgstr ""
13478
13479
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13480
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13481
#: en/help_topics/revisionspec.txt:153
13482
msgid " Examples::"
13483
msgstr ""
13484
13485
#: en/help_topics/revisionspec.txt:79
13486
msgid " $ bzr diff -r submit:"
13487
msgstr ""
13488
13489
#: en/help_topics/revisionspec.txt:81
13490
msgid ":ancestor:"
13491
msgstr ""
13492
13493
#: en/help_topics/revisionspec.txt:83
13494
msgid " Supply the path to a branch to select the common ancestor."
13495
msgstr ""
13496
13497
#: en/help_topics/revisionspec.txt:89
13498
msgid ""
13499
" This is frequently used with 'diff' to return all of the changes\n"
13500
" that your branch introduces, while excluding the changes that you\n"
13501
" have not merged from the remote branch."
13502
msgstr ""
13503
13504
#: en/help_topics/revisionspec.txt:95
13505
msgid ""
13506
" ancestor:/path/to/branch\n"
13507
" $ bzr diff -r ancestor:../../mainline/branch"
13508
msgstr ""
13509
13510
#: en/help_topics/revisionspec.txt:98
13511
msgid ":date:"
13512
msgstr ""
13513
13514
#: en/help_topics/revisionspec.txt:100
13515
msgid ""
13516
" Supply a datestamp to select the first revision that matches the date.\n"
13517
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13518
" Matches the first entry after a given date (either at midnight or\n"
13519
" at a specified time)."
13520
msgstr ""
13521
13522
#: en/help_topics/revisionspec.txt:105
13523
msgid " One way to display all the changes since yesterday would be::"
13524
msgstr ""
13525
13526
#: en/help_topics/revisionspec.txt:107
13527
msgid " bzr log -r date:yesterday.."
13528
msgstr ""
13529
13530
#: en/help_topics/revisionspec.txt:111
13531
msgid ""
13532
" date:yesterday -> select the first revision since "
13533
"yesterday\n"
13534
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13535
" August 14th, 2006 at 5:10pm."
13536
msgstr ""
13537
13538
#: en/help_topics/revisionspec.txt:115
13539
msgid ":branch:"
13540
msgstr ""
13541
13542
#: en/help_topics/revisionspec.txt:117
13543
msgid " Supply the path to a branch to select its last revision."
13544
msgstr ""
13545
13546
#: en/help_topics/revisionspec.txt:121
13547
msgid " branch:/path/to/branch"
13548
msgstr ""
13549
13550
#: en/help_topics/revisionspec.txt:123
13551
msgid ":tag:"
13552
msgstr ""
13553
13554
#: en/help_topics/revisionspec.txt:125
13555
msgid " Tags are stored in the branch and created by the 'tag' command."
13556
msgstr ""
13557
13558
#: en/help_topics/revisionspec.txt:127
13559
msgid ":revno:"
13560
msgstr ""
13561
13562
#: en/help_topics/revisionspec.txt:129
13563
msgid ""
13564
" Use an integer to specify a revision in the history of the branch.\n"
13565
" Optionally a branch can be specified. A negative number will count\n"
13566
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13567
" one). If the negative number is larger than the branch's history, the\n"
13568
" first revision is returned.\n"
13569
" Examples::"
13570
msgstr ""
13571
13572
#: en/help_topics/revisionspec.txt:136
13573
msgid ""
13574
" revno:1 -> return the first revision of this branch\n"
13575
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13576
" the branch '/path/to/branch'\n"
13577
" revno:-1 -> The last revision in a branch.\n"
13578
" -2:http://other/branch -> The second to last revision in the\n"
13579
" remote branch.\n"
13580
" -1000000 -> Most likely the first revision, unless\n"
13581
" your history is very long."
13582
msgstr ""
13583
13584
#: en/help_topics/revisionspec.txt:145
13585
msgid ":before:"
13586
msgstr ""
13587
13588
#: en/help_topics/revisionspec.txt:147
13589
msgid ""
13590
" Supply any revision spec to return the parent of that revision. This "
13591
"is\n"
13592
" mostly useful when inspecting revisions that are not in the revision "
13593
"history\n"
13594
" of a branch."
13595
msgstr ""
13596
13597
#: en/help_topics/revisionspec.txt:151
13598
msgid ""
13599
" It is an error to request the parent of the null revision (before:0)."
13600
msgstr ""
13601
13602
#: en/help_topics/revisionspec.txt:155
13603
msgid ""
13604
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13605
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13606
" aaaa@bbbb-1234567890\n"
13607
" bzr diff -r before:1913..1913\n"
13608
" -> Find the changes between revision 1913 and its parent "
13609
"(1912).\n"
13610
" (What changes did revision 1913 introduce).\n"
13611
" This is equivalent to: bzr diff -c 1913"
13612
msgstr ""
13613
13614
#: en/help_topics/revisionspec.txt:163
13615
msgid ":annotate:"
13616
msgstr ""
13617
13618
#: en/help_topics/revisionspec.txt:165
13619
msgid ""
13620
" Select the revision that last modified the specified line. Line is\n"
13621
" specified as path:number. Path is a relative path to the file. "
13622
"Numbers\n"
13623
" start at 1, and are relative to the current version, not the last-\n"
13624
" committed version of the file."
13625
msgstr ""
13626
13627
#: en/help_topics/revisionspec.txt:170
13628
msgid ":mainline:"
13629
msgstr ""
13630
13631
#: en/help_topics/revisionspec.txt:172
13632
msgid ""
13633
" Select the revision that merged the specified revision into mainline."
13634
msgstr ""
13635
13636
#: en/help_topics/revisionspec.txt:174
13637
msgid ":last:"
13638
msgstr ""
13639
13640
#: en/help_topics/revisionspec.txt:176
13641
msgid ""
13642
" Supply a positive number to get the nth revision from the end.\n"
13643
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13644
" Examples::"
13645
msgstr ""
13646
13647
#: en/help_topics/revisionspec.txt:180
13648
msgid ""
13649
" last:1 -> return the last revision\n"
13650
" last:3 -> return the revision 2 before the end.\n"
13651
msgstr ""
13652
13653
#: en/help_topics/rules.txt:1
13654
msgid ""
13655
"Rules\n"
13656
"====="
13657
msgstr ""
13658
13659
#: en/help_topics/rules.txt:7
13660
msgid ""
13661
"Rules are defined in ini file format where the sections are file glob\n"
13662
"patterns and the contents of each section are the preferences for files\n"
13663
"matching that pattern(s). For example::"
13664
msgstr ""
13665
13666
#: en/help_topics/rules.txt:11
13667
msgid ""
13668
" [name *.bat]\n"
13669
" eol = native"
13670
msgstr ""
13671
13672
#: en/help_topics/rules.txt:14
13673
msgid ""
13674
" [name *.html *.xml]\n"
13675
" keywords = xml_escape"
13676
msgstr ""
13677
13678
#: en/help_topics/rules.txt:17
13679
msgid ""
13680
"Preferences like these are useful for commands and plugins wishing to\n"
13681
"provide custom behaviour for selected files. For more information on \n"
13682
"end of line conversion see :doc:`eol-help`.\n"
13683
"Keyword support is provided by the `keywords plugin\n"
13684
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13685
msgstr ""
13686
13687
#: en/help_topics/rules.txt:23
13688
msgid ""
13689
"Files\n"
13690
"-----"
13691
msgstr ""
13692
13693
#: en/help_topics/rules.txt:26
13694
msgid ""
13695
"Default rules for all branches are defined in the optional file\n"
13696
"``BZR_HOME/rules``. "
13697
msgstr ""
13698
13699
#: en/help_topics/rules.txt:29
13700
msgid ""
13701
"Rule Patterns\n"
13702
"-------------"
13703
msgstr ""
13704
13705
#: en/help_topics/rules.txt:32
13706
msgid ""
13707
"Patterns are ordered and searching stops as soon as one matches.\n"
13708
"As a consequence, more explicit patterns should be placed towards\n"
13709
"the top of the file. Rule patterns use exactly the same conventions\n"
13710
"as ignore patterns. See :doc:`patterns-help` for details."
13711
msgstr ""
13712
13713
#: en/help_topics/rules.txt:37
13714
msgid ".. note::"
13715
msgstr ""
13716
13717
#: en/help_topics/rules.txt:39
13718
msgid ""
13719
" Patterns containing square brackets or spaces should be\n"
13720
" surrounded in quotes to ensure they are correctly parsed.\n"
13721
msgstr ""
13722
13723
#: en/help_topics/topics.txt:1
13724
msgid ""
13725
"authentication Information on configuring authentication\n"
13726
"basic Basic commands\n"
13727
"branches Information on what a branch is\n"
13728
"bugs Bug tracker settings\n"
13729
"checkouts Information on what a checkout is\n"
13730
"commands Basic help for all commands\n"
13731
"configuration Details on the configuration settings available\n"
13732
"conflict-types Types of conflicts and what to do about them\n"
13733
"content-filters Conversion of content into/from working trees\n"
13734
"criss-cross Information on criss-cross merging\n"
13735
"current-formats Current storage formats\n"
13736
"debug-flags Options to show or record debug information\n"
13737
"diverged-branches How to fix diverged branches\n"
13738
"env-variables Environment variable names and values\n"
13739
"eol Information on end-of-line handling\n"
13740
"files Information on configuration and log files\n"
13741
"formats Information on choosing a storage format\n"
13742
"global-options Options that control how Bazaar runs\n"
13743
"hidden-commands All hidden commands\n"
13744
"hooks Points at which custom processing can be added\n"
13745
"launchpad Using Bazaar with Launchpad.net\n"
13746
"location-alias Aliases for remembered locations\n"
13747
"log-formats Details on the logging formats available\n"
13748
"other-formats Experimental and deprecated storage formats\n"
13749
"patterns Information on the pattern syntax\n"
13750
"repositories Basic information on shared repositories.\n"
13751
"revisionspec Explain how to use --revision\n"
13752
"rules Information on defining rule-based preferences\n"
13753
"standalone-trees Information on what a standalone tree is\n"
13754
"standard-options Options that can be used with any command\n"
13755
"status-flags Help on status flags\n"
13756
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13757
"topics Topics list\n"
13758
"url-special-chars Special character handling in URLs\n"
13759
"urlspec Supported transport protocols\n"
13760
"working-trees Information on working trees\n"
13761
msgstr ""
13762
13763
#: en/help_topics/url-special-chars.txt:1
13764
msgid ""
13765
"Special character handling in URLs\n"
13766
"=================================="
13767
msgstr ""
13768
13769
#: en/help_topics/url-special-chars.txt:4
13770
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13771
msgstr ""
13772
13773
#: en/help_topics/url-special-chars.txt:6
13774
msgid " * Fully qualified URLs"
13775
msgstr ""
13776
13777
#: en/help_topics/url-special-chars.txt:8
13778
msgid " * File system paths, relative or absolute"
13779
msgstr ""
13780
13781
#: en/help_topics/url-special-chars.txt:10
13782
msgid ""
13783
"Internally bzr treats all locations as URLs. For any file system paths\n"
13784
"that are specified it will automatically determine the appropriate URL\n"
13785
"representation, and escape special characters where necessary."
13786
msgstr ""
13787
13788
#: en/help_topics/url-special-chars.txt:14
13789
msgid ""
13790
"There are a few characters which have special meaning in URLs and need "
13791
"careful\n"
13792
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13793
"value in URLs. Any non-ASCII characters in a file path will automatically "
13794
"be\n"
13795
"urlencoded when the path is converted to a URL."
13796
msgstr ""
13797
13798
#: en/help_topics/url-special-chars.txt:19
13799
msgid ""
13800
"URLs represent non-ASCII characters in an encoding defined by the server, "
13801
"but\n"
13802
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13803
"be\n"
13804
"generous in what it accepts as a URL and to print them in a way that\n"
13805
"will be readable."
13806
msgstr ""
13807
13808
#: en/help_topics/url-special-chars.txt:24
13809
msgid ""
13810
"For example, if you have a directory named '/tmp/%2False' these are all "
13811
"valid\n"
13812
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13813
"slash)::"
13814
msgstr ""
13815
13816
#: en/help_topics/url-special-chars.txt:27
13817
msgid ""
13818
" cd /tmp\n"
13819
" bzr log /tmp/%2False\n"
13820
" bzr log %2False\n"
13821
" bzr log file:///tmp/%252False\n"
13822
" bzr log file://localhost/tmp/%252False\n"
13823
" bzr log file:%252False"
13824
msgstr ""
13825
13826
#: en/help_topics/url-special-chars.txt:34
13827
msgid "These are valid but do not refer to the same file::"
13828
msgstr ""
13829
13830
#: en/help_topics/url-special-chars.txt:36
13831
msgid ""
13832
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13833
" bzr log %252False (refers to a file called /tmp/%252False)"
13834
msgstr ""
13835
13836
#: en/help_topics/url-special-chars.txt:39
13837
msgid ""
13838
"Comma also has special meaning in URLs, because it denotes `segment "
13839
"parameters`_"
13840
msgstr ""
13841
13842
#: en/help_topics/url-special-chars.txt:41
13843
msgid ""
13844
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13845
msgstr ""
13846
13847
#: en/help_topics/url-special-chars.txt:43
13848
msgid ""
13849
"Comma is also special in any file system paths that are specified. To use a "
13850
"literal\n"
13851
"comma in a file system path, specify a URL and URL encode the comma::"
13852
msgstr ""
13853
13854
#: en/help_topics/url-special-chars.txt:46
13855
msgid ""
13856
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13857
"\"branch\" set to \"bla\"\n"
13858
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13859
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13860
"\"branch\" set to \"bla\"\n"
13861
msgstr ""
13862
13863
#: en/help_topics/urlspec.txt:1
13864
msgid "URL Identifiers"
13865
msgstr ""
13866
13867
#: en/help_topics/urlspec.txt:3
13868
msgid "Supported URL prefixes::"
13869
msgstr ""
13870
13871
#: en/help_topics/urlspec.txt:5
13872
msgid ""
13873
" aftp:// Access using active FTP.\n"
13874
" bzr:// Fast access using the Bazaar smart server.\n"
13875
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13876
" file:// Access using the standard filesystem (default)\n"
13877
" ftp:// Access using passive FTP.\n"
13878
" http:// Read-only access of branches exported on the web.\n"
13879
" https:// Read-only access of branches exported on the web using "
13880
"SSL.\n"
13881
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13882
msgstr ""
13883
13884
#: en/help_topics/urlspec.txt:14
13885
msgid "Supported modifiers::"
13886
msgstr ""
13887
13888
#: en/help_topics/urlspec.txt:16
13889
msgid " gio+ Access using any GIO supported protocols."
13890
msgstr ""
13891
13892
#: en/help_topics/urlspec.txt:18
13893
msgid "Bazaar supports all of the standard parts within the URL::"
13894
msgstr ""
13895
13896
#: en/help_topics/urlspec.txt:20
13897
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13898
msgstr ""
13899
13900
#: en/help_topics/urlspec.txt:22
13901
msgid "allowing URLs such as::"
13902
msgstr ""
13903
13904
#: en/help_topics/urlspec.txt:24
13905
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13906
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13907
13908
#: en/help_topics/urlspec.txt:26
13909
msgid ""
13910
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13911
"with '~' as meaning that the rest of the path should be interpreted\n"
13912
"relative to the remote user's home directory. For example if the user\n"
13913
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13914
"shell.example.com, then::"
13915
msgstr ""
13916
13917
#: en/help_topics/urlspec.txt:32
13918
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13919
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13920
13921
#: en/help_topics/urlspec.txt:34
13922
msgid "would refer to ``/home/remote/myproject/trunk``."
13923
msgstr ""
13924
13925
#: en/help_topics/urlspec.txt:36
13926
msgid ""
13927
"Many commands that accept URLs also accept location aliases too.\n"
13928
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13929
msgstr ""
13930
13931
#~ msgid ""
13932
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
13933
#~ "delete them if they can easily be recovered using revert otherwise they\n"
13934
#~ "will be backed up (adding an extention of the form .~#~). If no options or\n"
13935
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
13936
#~ "Bazaar but missing in your tree and stop tracking them for you."
13937
#~ msgstr ""
13938
#~ "Прекращает отслеживание изменений в указанных файлах. Bazaar удалит их,\n"
13939
#~ "если их можно легко восстановить с помощью revert, иначе будут созданы\n"
13940
#~ "их резервные копии (с расширением вида .~#~). Если не указано ни опций,\n"
13941
#~ "ни параметров, Bazaar найдёт файлы, которые отслеживаются, но отсутствуют\n"
13942
#~ "в рабочем дереве и прекратит их отслеживать."
Loggerhead is a web-based interface for Breezy
Version: 2.0.1