« back to all changes in this revision
Viewing changes to po/ru.po
- browse files at revision 6351.2.2
- compare with another revision
- download diff
- download tarball
- view history from revision 6351.2.2
- Committer: Martin Packman
- Date: 2011-12-08 19:00:14 UTC
- mto: This revision was merged to the branch mainline in revision 6359.
- Revision ID: martin.packman@canonical.com-20111208190014-mi8jm6v7jygmhb0r
Use --include-duplicates for make update-pot which already combines multiple msgid strings prettily
- files added:
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files removed:
- bzrlib/tests/blackbox/test_mkdir.py
- files modified:
- bzr
added
removed
po/ru.po
1
# Russian translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: Russian <ru@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19
"X-Launchpad-Export-Date: 2012-02-04 06:20+0000\n"
20
"X-Generator: Launchpad (build 14738)\n"
21
22
#: bzrlib/add.py:95
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
24
msgstr "пропуск {0} (более, чем {1} из {2} байт)"
25
26
#: bzrlib/branch.py:872
27
msgid "Unstacking"
28
msgstr "Извлечение из стека"
29
30
#: bzrlib/branch.py:3205
31
#, python-format
32
msgid "Pushed up to revision %d."
33
msgstr "Отправлено до ревизии %d включительно."
34
35
#: bzrlib/branch.py:3207
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:3210
44
msgid "No new revisions or tags to push."
45
msgstr "Нет новых ревизий или тегов для отправки."
46
47
#: bzrlib/branch.py:3212
48
msgid "No new revisions to push."
49
msgstr "Нет новых ревизий для отправки."
50
51
#: bzrlib/branch.py:3232
52
msgid "checked branch {0} format {1}"
53
msgstr "проверена ветвь {0} формата {1}"
54
55
#: bzrlib/branch.py:3235
56
#, python-format
57
msgid "found error:%s"
58
msgstr "обнаружена ошибка:%s"
59
60
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
61
#, python-format
62
msgid "Ignoring files outside view. View is %s"
63
msgstr "Игнорируются файлы вне окна просмотра. Окно просмотра: %s"
64
65
#: bzrlib/builtins.py:218
66
#, python-format
67
msgid "bzr %s --revision takes exactly one revision identifier"
68
msgstr "bzr %s --revision принимает ровно один идентификатор ревизии"
69
70
#: bzrlib/builtins.py:303
71
msgid "Display status summary."
72
msgstr "Отобразить краткое описание состояния."
73
74
#: bzrlib/builtins.py:305
75
msgid ""
76
"This reports on versioned and unknown files, reporting them\n"
77
"grouped by state. Possible states are:"
78
msgstr ""
79
"Эта команда сообщает о файлах с версиями и неизвестных файлах,\n"
80
"группируя их по состоянию. Возможные состояния:"
81
82
#: bzrlib/builtins.py:308
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:311
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:315
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:320
114
msgid ""
115
"modified\n"
116
" Text has changed since the previous revision."
117
msgstr ""
118
"изменены\n"
119
" Текст изменился с предыдущей ревизии."
120
121
#: bzrlib/builtins.py:323
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:326
130
msgid ""
131
"unknown\n"
132
" Not versioned and not matching an ignore pattern."
133
msgstr ""
134
"неизвестны\n"
135
" Не имеют версии и не подходят под шаблон игнориируемых файлов."
136
137
#: bzrlib/builtins.py:329
138
msgid ""
139
"Additionally for directories, symlinks and files with a changed\n"
140
"executable bit, Bazaar indicates their type using a trailing\n"
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:334
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:337
158
msgid ""
159
"Note that --short or -S gives status flags for each item, similar\n"
160
"to Subversion's status command. To get output similar to svn -q,\n"
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:341
168
msgid ""
169
"If no arguments are specified, the status of the entire working\n"
170
"directory is shown. Otherwise, only the status of the specified\n"
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:346
180
msgid ""
181
"Before merges are committed, the pending merge tip revisions are\n"
182
"shown. To see all pending merge revisions, use the -v option.\n"
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:351
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:354
200
msgid ""
201
"To see which files have changed in a specific revision, or between\n"
202
"two revisions, pass a revision range to the revision argument.\n"
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:363
210
msgid "Use short status indicators."
211
msgstr "Использовать короткие статусные пометки."
212
213
#: bzrlib/builtins.py:365
214
msgid "Only show versioned files."
215
msgstr "Показывать только файлы, имеющие версию."
216
217
#: bzrlib/builtins.py:367
218
msgid "Don't show pending merges."
219
msgstr "Не показывать необработанные слияния."
220
221
#: bzrlib/builtins.py:370
222
msgid "Do not mark object type using indicator."
223
msgstr "Не помечать типы объектов суффиксами."
224
225
#: bzrlib/builtins.py:385
226
msgid "bzr status --revision takes exactly one or two revision specifiers"
227
msgstr ""
228
"bzr status --revision принимает ровно один или два идентификатора ревизии"
229
230
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
231
msgid "You can only supply one of revision_id or --revision"
232
msgstr "Вы можете указать только одно из revision_id или --revision"
233
234
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
235
msgid "You must supply either --revision or a revision_id"
236
msgstr "Вы должны предоставить --revision или revision_id"
237
238
#: bzrlib/builtins.py:439
239
#, python-format
240
msgid "Repository %r does not support access to raw revision texts"
241
msgstr "Репозиторий %r не поддерживает прямой доступ к текстам ревизий"
242
243
#: bzrlib/builtins.py:450
244
msgid "The repository {0} contains no revision {1}."
245
msgstr "Репозиторий {0} не содержит ревизии {1}."
246
247
#: bzrlib/builtins.py:457
248
msgid "You cannot specify a NULL revision."
249
msgstr "Вы не можете указать ревизию NULL."
250
251
#: bzrlib/builtins.py:549
252
msgid "Remove the working tree from a given branch/checkout."
253
msgstr "Удалить рабочее дерево из данной ветви или рабочей копии."
254
255
#: bzrlib/builtins.py:551
256
msgid ""
257
"Since a lightweight checkout is little more than a working tree\n"
258
"this will refuse to run against one."
259
msgstr ""
260
"Поскольку легковесная рабочая копия, это нечто большее, чем рабочее\n"
261
"дерево, эту команду нельзя выполнить внутри неё."
262
263
#: bzrlib/builtins.py:554
264
msgid "To re-create the working tree, use \"bzr checkout\"."
265
msgstr "Чтобы воссоздать рабочее дерево, используйте «bzr checkout»."
266
267
#: bzrlib/builtins.py:560
268
msgid ""
269
"Remove the working tree even if it has uncommitted or shelved changes."
270
msgstr ""
271
"Удалить рабочее дерево даже, если оно содержит незакреплённые или отложенные "
272
"изменения."
273
274
#: bzrlib/builtins.py:574
275
msgid "No working tree to remove"
276
msgstr "Нет рабочего дерева для удаления"
277
278
#: bzrlib/builtins.py:576
279
msgid "You cannot remove the working tree of a remote path"
280
msgstr "Вы не можете удалить внешнее рабочее дерево"
281
282
#: bzrlib/builtins.py:585
283
msgid "You cannot remove the working tree from a lightweight checkout"
284
msgstr "Вы не можете удалить рабочее дерево из легковесной рабочей копии"
285
286
#: bzrlib/builtins.py:625
287
msgid ""
288
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
289
"instead. Use \"--force\" if you are sure you want to reset the working tree."
290
msgstr ""
291
"Дерево не повреждено. Возможно, вы хотели выполнить «bzr revert». "
292
"Используйте «--force», если вы уверены, что хотите использовать reset."
293
294
#: bzrlib/builtins.py:636
295
msgid ""
296
", the header appears corrupt, try passing -r -1 to set the state to the last "
297
"commit"
298
msgstr ""
299
", заголовок повреждён, попробуйте использовать аргумент -r -1, чтобы "
300
"сбросить состояние до предыдущего закрепления"
301
302
#: bzrlib/builtins.py:640
303
msgid "failed to reset the tree state{0}"
304
msgstr "не удалось сбросить состояние дерева {0}"
305
306
#: bzrlib/builtins.py:644
307
msgid "Show current revision number."
308
msgstr "Показать номер текущей ревизии."
309
310
#: bzrlib/builtins.py:646
311
msgid "This is equal to the number of revisions on this branch."
312
msgstr "Это эквивалентно числу ревизий в этой ветви."
313
314
#: bzrlib/builtins.py:659
315
msgid "--tree and --revision can not be used together"
316
msgstr "--tree и --revision не могут использоваться вместе"
317
318
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
319
msgid "Tags can only be placed on a single revision, not on a range"
320
msgstr "Тегом можно пометить только отдельную ревизию, не интервал"
321
322
#: bzrlib/builtins.py:700
323
msgid "Show revno of working tree."
324
msgstr "Показать номер ревизии рабочего дерева."
325
326
#: bzrlib/builtins.py:748
327
msgid "Add specified files or directories."
328
msgstr "Добавить указанные файлы или директории."
329
330
#: bzrlib/builtins.py:750
331
msgid ""
332
"In non-recursive mode, all the named items are added, regardless\n"
333
"of whether they were previously ignored. A warning is given if\n"
334
"any of the named files are already versioned."
335
msgstr ""
336
"В нерекурсивном режиме, все указанные элементы добавляются, вне\n"
337
"зависимости от того, игнорировались ли они до этого. Выводится\n"
338
"предупреждение, если какие-либо из указанных элементов уже были\n"
339
"под контролем Bazaar."
340
341
#: bzrlib/builtins.py:754
342
msgid ""
343
"In recursive mode (the default), files are treated the same way\n"
344
"but the behaviour for directories is different. Directories that\n"
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:762
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:765
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:768
377
msgid ""
378
"Adding a file whose parent directory is not versioned will\n"
379
"implicitly add the parent, and so on up to the root. This means\n"
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:773
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:776
397
msgid ""
398
"--file-ids-from will try to use the file ids from the supplied path.\n"
399
"It looks up ids trying to find a matching parent directory with the\n"
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:784
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:787
425
msgid ""
426
"In recursive mode, files larger than the configuration option \n"
427
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
428
"to file size."
429
msgstr ""
430
"В рекурсивном режиме, файлы больше, чем опция конфигурации\n"
431
"add.maximum_file_size, будут пропущены. Явно названные элементы\n"
432
"никогда не будут пропущены по этому критерию."
433
434
#: bzrlib/builtins.py:794
435
msgid "Don't recursively add the contents of directories."
436
msgstr "Не добавлять содержимое директорий рекурсивно."
437
438
#: bzrlib/builtins.py:800
439
msgid "Lookup file ids from this tree."
440
msgstr "Искать идентификаторы в этом дереве."
441
442
#: bzrlib/builtins.py:836
443
msgid "ignored {0} matching \"{1}\"\n"
444
msgstr "пропуск {0} из-за условия «{1}»\n"
445
446
#: bzrlib/builtins.py:841
447
msgid "Create a new versioned directory."
448
msgstr "Создать новую директорию в системе версий."
449
450
#: bzrlib/builtins.py:843
451
msgid "This is equivalent to creating the directory and then adding it."
452
msgstr "Это эквивалентно созданию директории и её добавлению."
453
454
#: bzrlib/builtins.py:850
455
msgid "No error if existing, make parent directories as needed."
456
msgstr ""
457
"Не выводить ошибку, если существует, создавать родительские директории при "
458
"необходимости."
459
460
#: bzrlib/builtins.py:884
461
#, python-format
462
msgid "added %s\n"
463
msgstr "добавлен %s\n"
464
465
#: bzrlib/builtins.py:926
466
#, python-format
467
msgid "invalid kind %r specified"
468
msgstr "указан неизвестный вид %r"
469
470
#: bzrlib/builtins.py:963
471
msgid "Move or rename a file."
472
msgstr "Переместить или переименовать файл."
473
474
#: bzrlib/builtins.py:965
475
msgid " bzr mv SOURCE... DESTINATION"
476
msgstr " bzr mv ИСТОЧНИК... НАЗНАЧЕНИЕ"
477
478
#: bzrlib/builtins.py:967
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:971
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:977
503
msgid "Files cannot be moved between branches."
504
msgstr "Файлы нельзя перемещать между ветвями."
505
506
#: bzrlib/builtins.py:984
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:986
515
msgid "Automatically guess renames."
516
msgstr "Автоматически предполагать переименования."
517
518
#: bzrlib/builtins.py:987
519
msgid "Avoid making changes when guessing renames."
520
msgstr "Избегать изменений при угадывании переименований."
521
522
#: bzrlib/builtins.py:996
523
msgid "--dry-run requires --auto."
524
msgstr "--dry-run требует --auto."
525
526
#: bzrlib/builtins.py:1000
527
msgid "missing file argument"
528
msgstr "отсутствует аргумент файл"
529
530
#: bzrlib/builtins.py:1004
531
msgid "can not move root of branch"
532
msgstr "нельзя переместить корень ветви"
533
534
#: bzrlib/builtins.py:1010
535
msgid "Only one path may be specified to --auto."
536
msgstr "Только один путь может быть указан, как аргумент --auto."
537
538
#: bzrlib/builtins.py:1013
539
msgid "--after cannot be specified with --auto."
540
msgstr "--after не может использоваться вместе с --auto."
541
542
#: bzrlib/builtins.py:1050
543
msgid "to mv multiple files the destination must be a versioned directory"
544
msgstr ""
545
"чтобы переместить несколько файлов, назначение должно быть директорией под "
546
"контролем системы версий"
547
548
#: bzrlib/builtins.py:1102
549
msgid "Turn this branch into a mirror of another branch."
550
msgstr "Преобразовать эту ветвь в зеркало другой ветви."
551
552
#: bzrlib/builtins.py:1104
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:1109
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:1113
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:1117
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:1122
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:1126
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:1134
617
msgid "Show logs of pulled revisions."
618
msgstr "Показать журналы принятых ревизий."
619
620
#: bzrlib/builtins.py:1136
621
msgid ""
622
"Branch to pull into, rather than the one containing the working directory."
623
msgstr ""
624
"Принимать изменения в эту ветвь, а не в содержащую рабочую директорию."
625
626
#: bzrlib/builtins.py:1139
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:1168
635
msgid "Need working tree for --show-base."
636
msgstr "Для --show-base необходимо рабочее дерево."
637
638
#: bzrlib/builtins.py:1184
639
msgid "No pull location known or specified."
640
msgstr "Местоположение для приёма неизвестно и не указано."
641
642
#: bzrlib/builtins.py:1190
643
#, python-format
644
msgid "Using saved parent location: %s\n"
645
msgstr "Используется сохранённое местоположение родителя: %s\n"
646
647
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
648
msgid "Cannot use -r with merge directives or bundles"
649
msgstr "Нельзя использовать -r с директивами слияния или пакетами"
650
651
#: bzrlib/builtins.py:1238
652
msgid "Update a mirror of this branch."
653
msgstr "Обновить зеркало этой ветви."
654
655
#: bzrlib/builtins.py:1240
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:1243
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:1246
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:1250
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:1253
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:1257
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:1262
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:1273 bzrlib/foreign.py:272
727
msgid ""
728
"Branch to push from, rather than the one containing the working directory."
729
msgstr "Отправлять из этой ветви, а не из содержащей рабочую директорию."
730
731
#: bzrlib/builtins.py:1276
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:1281
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:1284
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:1289 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:1292
767
msgid "Don't populate the working tree, even for protocols that support it."
768
msgstr ""
769
"Не создавать рабочее дерево, даже для протоколов, которые поддерживают это."
770
771
#: bzrlib/builtins.py:1336
772
msgid "Could not determine branch to refer to."
773
msgstr "Не удалось определить ветвь, на которую нужно ссылаться."
774
775
#: bzrlib/builtins.py:1345
776
#, python-format
777
msgid ""
778
"No push location known or specified. To push to the parent branch (at %s), "
779
"use 'bzr push :parent'."
780
msgstr ""
781
782
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
783
msgid "No push location known or specified."
784
msgstr "Местоположение для отсылки изменений неизвестно и не указано."
785
786
#: bzrlib/builtins.py:1355
787
#, python-format
788
msgid "Using saved push location: %s"
789
msgstr "Используется сохранённое местоположение отсылки: %s"
790
791
#: bzrlib/builtins.py:1365
792
msgid "Create a new branch that is a copy of an existing branch."
793
msgstr "Создать новую ветвь, являющуюся копией существующей ветви."
794
795
#: bzrlib/builtins.py:1367
796
msgid ""
797
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
798
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
799
"./bar.\n"
800
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
801
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
802
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
803
"create ./foo-bar."
804
msgstr ""
805
"Если TO_LOCATION опущено, будет использована последняя компонента\n"
806
"FROM_LOCATION. Иными словами, «branch ../foo/bar» попытается создать ./bar.\n"
807
"Если FROM_LOCATION не содержит разделителя «/», то TO_LOCATION определется\n"
808
"из FROM_LOCATION удалением префикса. Например «branch lp:foo-bar»\n"
809
"попытается создать ./foo-bar."
810
811
#: bzrlib/builtins.py:1374
812
msgid ""
813
"To retrieve the branch as of a particular revision, supply the --revision\n"
814
"parameter, as in \"branch foo/bar -r 5\"."
815
msgstr ""
816
"Чтобы получить определённую ревизию ветви, передайте её в параметре\n"
817
"--revision, напр. «branch foo/bar -r 5»."
818
819
#: bzrlib/builtins.py:1377
820
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
821
msgstr "Синонимы 'clone' и 'get' для этой команды устарели."
822
823
#: bzrlib/builtins.py:1387
824
msgid "Create a branch without a working-tree."
825
msgstr "Создать ветвь без рабочего дерева."
826
827
#: bzrlib/builtins.py:1389
828
msgid "Switch the checkout in the current directory to the new branch."
829
msgstr "Заменить рабочую копию в текущей директории новой ветвью."
830
831
#: bzrlib/builtins.py:1392
832
msgid ""
833
"Create a stacked branch referring to the source branch. The new branch will "
834
"depend on the availability of the source branch for all operations."
835
msgstr ""
836
"Создать стековую ветвь, ссылающуюся на исходную ветвь. Все операции над "
837
"новой ветвью будут зависеть от доступности старой ветви."
838
839
#: bzrlib/builtins.py:1396
840
msgid "Do not use a shared repository, even if available."
841
msgstr "Не использовать общий репозиторий, даже если доступен."
842
843
#: bzrlib/builtins.py:1398
844
msgid ""
845
"By default branch will fail if the target directory exists, but does not "
846
"already have a control directory. This flag will allow branch to proceed."
847
msgstr ""
848
"По умолчанию branch завершится неудачей, если директория назначения "
849
"существует, но не содержит управляющих метаданных. Этот флаг позволит branch "
850
"продолжаться."
851
852
#: bzrlib/builtins.py:1403
853
msgid "Bind new branch to from location."
854
msgstr "Связать новую ветвь с FROM_LOCATION"
855
856
#: bzrlib/builtins.py:1450
857
#, python-format
858
msgid "Target directory \"%s\" already exists."
859
msgstr "Целевая директория «%s» уже существует."
860
861
#: bzrlib/builtins.py:1462
862
#, python-format
863
msgid "Parent of \"%s\" does not exist."
864
msgstr "Родитель «%s» не существует."
865
866
#: bzrlib/builtins.py:1481
867
msgid "The branch {0} has no revision {1}."
868
msgstr "В ветви {0} отсутствует ревизия {1}."
869
870
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
871
#, python-format
872
msgid "Created new stacked branch referring to %s."
873
msgstr "Создана новая стековая ветвь, ссылающаяся на %s."
874
875
#: bzrlib/builtins.py:1500
876
#, python-format
877
msgid "Branched %d revision."
878
msgid_plural "Branched %d revisions."
879
msgstr[0] "Ответвлена %d ревизия."
880
msgstr[1] "Ответвлены %d ревизии."
881
msgstr[2] "Ответвлены %d ревизий."
882
883
#: bzrlib/builtins.py:1505
884
#, python-format
885
msgid "New branch bound to %s"
886
msgstr "Новая ветвь, связанная с %s"
887
888
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
889
#, python-format
890
msgid "Switched to branch: %s"
891
msgstr "Переключение на ветвь: %s"
892
893
#: bzrlib/builtins.py:1515
894
msgid "List the branches available at the current location."
895
msgstr "Вывести список ветвей, доступных в текущем местоположении."
896
897
#: bzrlib/builtins.py:1517
898
msgid ""
899
"This command will print the names of all the branches at the current\n"
900
"location."
901
msgstr "Эта команда выведет имена всех ветвей в текущем местоположении."
902
903
#: bzrlib/builtins.py:1524
904
msgid ""
905
"Recursively scan for branches rather than just looking in the specified "
906
"location."
907
msgstr ""
908
"Рекурсивно сканировать ветви, а не смотреть в указанном местоположении."
909
910
#: bzrlib/builtins.py:1554
911
msgid "(default)"
912
msgstr "(по умолчанию)"
913
914
#: bzrlib/builtins.py:1566
915
msgid "Create a new checkout of an existing branch."
916
msgstr "Создать новую рабочую копию текущей ветви."
917
918
#: bzrlib/builtins.py:1568
919
msgid ""
920
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
921
"for\n"
922
"the branch found in '.'. This is useful if you have removed the working "
923
"tree\n"
924
"or if it was never created - i.e. if you pushed the branch to its current\n"
925
"location using SFTP."
926
msgstr ""
927
"Если аргумент BRANCH_LOCATION опущен, checkout воссоздаст рабочее дерево\n"
928
"для ветви, найденной в '.'. Это полезно, если вы удалили рабочее дерево,\n"
929
"или если вы никогда не создавали его."
930
931
#: bzrlib/builtins.py:1573
932
msgid ""
933
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
934
"will\n"
935
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
936
"./bar.\n"
937
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
938
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
939
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
940
"create ./foo-bar."
941
msgstr ""
942
"Если TO_LOCATION опущено, будет использована последняя компонента\n"
943
"BRANCH_LOCATION. Иными словами, «checkout ../foo/bar» попытается\n"
944
"создать ./bar. Если BRANCH_LOCATION не содержит разделителя «/»,\n"
945
"то TO_LOCATION определется из BRANCH_LOCATION удалением префикса.\n"
946
"Например «checkout lp:foo-bar» попытается создать ./foo-bar."
947
948
#: bzrlib/builtins.py:1580
949
msgid ""
950
"To retrieve the branch as of a particular revision, supply the --revision\n"
951
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
952
"immediately\n"
953
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
954
"old\n"
955
"code.)"
956
msgstr ""
957
"Чтобы получить определённую ревизию ветви, добавьте параметр --revision,\n"
958
"например «checkout foo/bar -r 5». Заметьте, что такое дерево будет сразу\n"
959
"просрочено [так что в не сможете закрепить изменения], но это может быть\n"
960
"полезно, к примеру, для просмотра старого кода."
961
962
#: bzrlib/builtins.py:1590
963
msgid ""
964
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
965
"the branch for every operation. Normal checkouts can perform common "
966
"operations like diff and status without such access, and also support local "
967
"commits."
968
msgstr ""
969
"Получить легковесную рабочую копию. Каждая операция над легковесной рабочей "
970
"копией зависит от доступности ветви. Обычные рабочие копии позволяют "
971
"производить стандартные операции, как diff и status, без такого доступа, а "
972
"также поддерживают локальные закрепления."
973
974
#: bzrlib/builtins.py:1597
975
msgid "Get file contents from this tree."
976
msgstr "Получить содержимое файла из этого дерева."
977
978
#: bzrlib/builtins.py:1599
979
msgid "Hard-link working tree files where possible."
980
msgstr "Использовать жёсткие ссылки в рабочем дереве, когда это возможно."
981
982
#: bzrlib/builtins.py:1640
983
msgid ""
984
"Show list of renamed files.\n"
985
" "
986
msgstr ""
987
"Показать список переименованных файлов.\n"
988
" "
989
990
#: bzrlib/builtins.py:1670
991
msgid "Update a working tree to a new revision."
992
msgstr "Обновить рабочее дерево до новой ревизии."
993
994
#: bzrlib/builtins.py:1672
995
msgid ""
996
"This will perform a merge of the destination revision (the tip of the\n"
997
"branch, or the specified revision) into the working tree, and then make\n"
998
"that revision the basis revision for the working tree. "
999
msgstr ""
1000
1001
#: bzrlib/builtins.py:1676
1002
msgid ""
1003
"You can use this to visit an older revision, or to update a working tree\n"
1004
"that is out of date from its branch."
1005
msgstr ""
1006
1007
#: bzrlib/builtins.py:1679
1008
msgid ""
1009
"If there are any uncommitted changes in the tree, they will be carried\n"
1010
"across and remain as uncommitted changes after the update. To discard\n"
1011
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
1012
"with the changes brought in by the change in basis revision."
1013
msgstr ""
1014
1015
#: bzrlib/builtins.py:1684
1016
msgid ""
1017
"If the tree's branch is bound to a master branch, bzr will also update\n"
1018
"the branch from the master."
1019
msgstr ""
1020
1021
#: bzrlib/builtins.py:1687
1022
msgid ""
1023
"You cannot update just a single file or directory, because each Bazaar\n"
1024
"working tree has just a single basis revision. If you want to restore a\n"
1025
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
1026
"update'. If you want to restore a file to its state in a previous\n"
1027
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
1028
"out the old content of that file to a new location."
1029
msgstr ""
1030
"Нельзя обновить только отдельный файл или директорию, поскольку каждое\n"
1031
"рабочее дерево Bazaar имеет только одну базовую ревизию. Если вы хотите\n"
1032
"восстановить файл, который был удалён на локальной машине, используйте\n"
1033
"'bzr revert', а не 'bzr update'. Если вы хотите восстановить файл до\n"
1034
"состояния в предыдущей ревизии, используйте 'bzr revert' с опцией '-r',\n"
1035
"или используйте 'bzr cat', чтобы записать старое содержимое этого файла\n"
1036
"в новое местоположение."
1037
1038
#: bzrlib/builtins.py:1694
1039
msgid ""
1040
"The 'dir' argument, if given, must be the location of the root of a\n"
1041
"working tree to update. By default, the working tree that contains the \n"
1042
"current working directory is used."
1043
msgstr ""
1044
1045
#: bzrlib/builtins.py:1710
1046
msgid "bzr update --revision takes exactly one revision"
1047
msgstr "bzr update --revision принимает ровно одну ревизию"
1048
1049
#: bzrlib/builtins.py:1718
1050
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1051
msgstr ""
1052
"bzr update может обновить только всё дерево, не файл или поддиректорию"
1053
1054
#: bzrlib/builtins.py:1749
1055
msgid "Tree is up to date at revision {0} of branch {1}"
1056
msgstr "Дерево в актуальной ревизии {0} ветви {1}"
1057
1058
#: bzrlib/builtins.py:1765
1059
#, python-format
1060
msgid ""
1061
"branch has no revision %s\n"
1062
"bzr update --revision only works for a revision in the branch history"
1063
msgstr ""
1064
"в ветви нет ревизии %s\n"
1065
"bzr update --revision работает только для ревизий в истории ветви"
1066
1067
#: bzrlib/builtins.py:1771
1068
msgid "Updated to revision {0} of branch {1}"
1069
msgstr "Обновлено до ревизии {0} ветви {1}"
1070
1071
#: bzrlib/builtins.py:1775
1072
msgid ""
1073
"Your local commits will now show as pending merges with 'bzr status', and "
1074
"can be committed with 'bzr commit'."
1075
msgstr ""
1076
"Ваши локальные закрепления теперь будут отображаться в 'bzr status' как "
1077
"незавершённые слияния, и их можно закрепить с помощью 'bzr commit'."
1078
1079
#: bzrlib/builtins.py:1784
1080
msgid "Show information about a working tree, branch or repository."
1081
msgstr "Показать информацию о рабочем дереве, ветви или репозитории."
1082
1083
#: bzrlib/builtins.py:1786
1084
msgid ""
1085
"This command will show all known locations and formats associated to the\n"
1086
"tree, branch or repository."
1087
msgstr ""
1088
"Эта команда выведет все известные местоположения и форматы, связанные\n"
1089
"с деревом, ветвью или репозиторием."
1090
1091
#: bzrlib/builtins.py:1789
1092
msgid ""
1093
"In verbose mode, statistical information is included with each report.\n"
1094
"To see extended statistic information, use a verbosity level of 2 or\n"
1095
"higher by specifying the verbose option multiple times, e.g. -vv."
1096
msgstr ""
1097
"В подробном режиме в каждый отчёт включается статистическая информация.\n"
1098
"Чтобы увидеть расширенную статистическую информацию, используйте уровень\n"
1099
"подробностей 2 или выше, указывая опцию -v несколько раз, например -vv."
1100
1101
#: bzrlib/builtins.py:1793
1102
msgid "Branches and working trees will also report any missing revisions."
1103
msgstr ""
1104
"Ветви и рабочие деревья также включают в отчёт отсутствующие ревизии."
1105
1106
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1107
#: bzrlib/builtins.py:6442
1108
msgid ":Examples:"
1109
msgstr ":Примеры:"
1110
1111
#: bzrlib/builtins.py:1797
1112
msgid " Display information on the format and related locations:"
1113
msgstr " Вывести информацию о формате и связанных местоположениях:"
1114
1115
#: bzrlib/builtins.py:1799
1116
msgid " bzr info"
1117
msgstr " bzr info"
1118
1119
#: bzrlib/builtins.py:1801
1120
msgid ""
1121
" Display the above together with extended format information and\n"
1122
" basic statistics (like the number of files in the working tree and\n"
1123
" number of revisions in the branch and repository):"
1124
msgstr ""
1125
" Вывести то же, что и выше, а также расширенную информацию о формате\n"
1126
" и базовую статистику (как число файлов в рабочем дереве и число\n"
1127
" ревизий в ветви и репозитории):"
1128
1129
#: bzrlib/builtins.py:1805
1130
msgid " bzr info -v"
1131
msgstr " bzr info -v"
1132
1133
#: bzrlib/builtins.py:1807
1134
msgid " Display the above together with number of committers to the branch:"
1135
msgstr " Вывести то же, что и выше, а также число участников ветви:"
1136
1137
#: bzrlib/builtins.py:1809
1138
msgid " bzr info -vv"
1139
msgstr " bzr info -vv"
1140
1141
#: bzrlib/builtins.py:1828
1142
msgid "Remove files or directories."
1143
msgstr "Исключить файлы или директории."
1144
1145
#: bzrlib/builtins.py:1830
1146
msgid ""
1147
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1148
"delete them if they can easily be recovered using revert otherwise they\n"
1149
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1150
"parameters are given Bazaar will scan for files that are being tracked by\n"
1151
"Bazaar but missing in your tree and stop tracking them for you."
1152
msgstr ""
1153
"Прекращает отслеживание изменений в указанных файлах. Bazaar удалит их,\n"
1154
"если их можно легко восстановить с помощью revert, иначе будут созданы\n"
1155
"их резервные копии (с расширением вида .~#~). Если не указано ни опций,\n"
1156
"ни параметров, Bazaar найдёт файлы, которые отслеживаются, но отсутствуют\n"
1157
"в рабочем дереве и прекратит их отслеживать."
1158
1159
#: bzrlib/builtins.py:1838
1160
msgid "Only remove files that have never been committed."
1161
msgstr "Исключать только файлы, которые никогда не были закреплены."
1162
1163
#: bzrlib/builtins.py:1840
1164
msgid "The file deletion mode to be used."
1165
msgstr "Используемый способ удаления файлов."
1166
1167
#: bzrlib/builtins.py:1841
1168
msgid "Deletion Strategy"
1169
msgstr "Стратегия удаления"
1170
1171
#: bzrlib/builtins.py:1842
1172
msgid "Backup changed files (default)."
1173
msgstr ""
1174
1175
#: bzrlib/builtins.py:1843
1176
msgid "Delete from bzr but leave the working copy."
1177
msgstr "Удалить из bzr, но оставить рабочую копию."
1178
1179
#: bzrlib/builtins.py:1844
1180
msgid "Don't backup changed files."
1181
msgstr "Не создавать резервные копии изменённых файлов."
1182
1183
#: bzrlib/builtins.py:1845
1184
msgid ""
1185
"Delete all the specified files, even if they can not be recovered and even "
1186
"if they are non-empty directories. (deprecated, use no-backup)"
1187
msgstr ""
1188
"Удалить все указанные файлы, даже если их нельзя восстановить или они "
1189
"являются непустыми директориями. (устарело, используйте no-backup)"
1190
1191
#: bzrlib/builtins.py:1854
1192
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1193
msgstr ""
1194
"(Опция --force устарела, в будущем следует использовать --no-backup.)"
1195
1196
#: bzrlib/builtins.py:1871
1197
msgid "No matching files."
1198
msgstr "Нет файлов, удовлетворяющих критерию."
1199
1200
#: bzrlib/builtins.py:1932
1201
msgid "Reconcile bzr metadata in a branch."
1202
msgstr "Согласовать метаданные bzr в ветви."
1203
1204
#: bzrlib/builtins.py:1934
1205
msgid ""
1206
"This can correct data mismatches that may have been caused by\n"
1207
"previous ghost operations or bzr upgrades. You should only\n"
1208
"need to run this command if 'bzr check' or a bzr developer\n"
1209
"advises you to run it."
1210
msgstr ""
1211
"Может исправить несовпадения данных, вызванные обновлениями bzr.\n"
1212
"Эту команду стоит запускать только, если 'bzr check' или разработчик\n"
1213
"bzr предложат вам сделать это."
1214
1215
#: bzrlib/builtins.py:1939
1216
msgid ""
1217
"If a second branch is provided, cross-branch reconciliation is\n"
1218
"also attempted, which will check that data like the tree root\n"
1219
"id which was not present in very early bzr versions is represented\n"
1220
"correctly in both branches."
1221
msgstr ""
1222
"Если предоставлена вторая ветвь, производится попытка согласования\n"
1223
"между ветвями, в ходе которой проверяется, что данные, не\n"
1224
"присутствовавшие в ранних версиях bzr, корректно представлены\n"
1225
"в обоих ветвях."
1226
1227
#: bzrlib/builtins.py:1944
1228
msgid ""
1229
"At the same time it is run it may recompress data resulting in\n"
1230
"a potential saving in disk space or performance gain."
1231
msgstr ""
1232
"В то же время, при запуске возможно пережатие данных, потенциально\n"
1233
"уменьшающее размер занимаемого пространства и повышающее\n"
1234
"производительность."
1235
1236
#: bzrlib/builtins.py:1947
1237
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1238
msgstr ""
1239
"Ветвь *ДОЛЖНА* быть на системе, поддерживающей список файлов, такой как\r\n"
1240
"локальный диск или SFTP."
1241
1242
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1243
msgid ""
1244
"Format for the bzr 2.0 series.\n"
1245
"Uses group-compress storage.\n"
1246
"Provides rich roots which are a one-way transition.\n"
1247
msgstr ""
1248
1249
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1250
msgid ""
1251
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1252
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1253
msgstr ""
1254
1255
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1256
msgid "The 2a format with experimental support for colocated branches.\n"
1257
msgstr ""
1258
1259
#: bzrlib/builtins.py:2015
1260
msgid "Make a directory into a versioned branch."
1261
msgstr "Преобразовать директорию в ветвь системы контроля версий."
1262
1263
#: bzrlib/builtins.py:2017
1264
msgid ""
1265
"Use this to create an empty branch, or before importing an\n"
1266
"existing project."
1267
msgstr ""
1268
"Используйте эту команду для создания пустой ветви или\n"
1269
"перед импортом существующего проекта."
1270
1271
#: bzrlib/builtins.py:2020
1272
msgid ""
1273
"If there is a repository in a parent directory of the location, then\n"
1274
"the history of the branch will be stored in the repository. Otherwise\n"
1275
"init creates a standalone branch which carries its own history\n"
1276
"in the .bzr directory."
1277
msgstr ""
1278
"Если в родительской директории находится репозиторий, история ветви\n"
1279
"будет сохранена в репозитории. Иначе, init создаёт одиночную ветвь,\n"
1280
"которая несёт историю с собой в директории .bzr."
1281
1282
#: bzrlib/builtins.py:2025
1283
msgid ""
1284
"If there is already a branch at the location but it has no working tree,\n"
1285
"the tree can be populated with 'bzr checkout'."
1286
msgstr ""
1287
"Если ветвь уже существует, но рабочее дерево отсутствует, то оно\n"
1288
"создаётся с помощью 'bzr checkout'."
1289
1290
#: bzrlib/builtins.py:2028
1291
msgid "Recipe for importing a tree of files::"
1292
msgstr "Рецепт для импорта дерева файлов::"
1293
1294
#: bzrlib/builtins.py:2030
1295
msgid ""
1296
" cd ~/project\n"
1297
" bzr init\n"
1298
" bzr add .\n"
1299
" bzr status\n"
1300
" bzr commit -m \"imported project\""
1301
msgstr ""
1302
" cd ~/project\n"
1303
" bzr init\n"
1304
" bzr add .\n"
1305
" bzr status\n"
1306
" bzr commit -m \"проект импортирован\""
1307
1308
#: bzrlib/builtins.py:2041
1309
msgid ""
1310
"Create the path leading up to the branch if it does not already exist."
1311
msgstr "Создать путь, ведущий к ветви, если он ещё не существует."
1312
1313
#: bzrlib/builtins.py:2044
1314
msgid "Specify a format for this branch. See \"help formats\"."
1315
msgstr "Указать формат данной ветви. См. «help formats»."
1316
1317
#: bzrlib/builtins.py:2052
1318
msgid ""
1319
"Never change revnos or the existing log. Append revisions to it only."
1320
msgstr ""
1321
"Никогда не изменять номера ревизий в существующем журнале. Только добавлять "
1322
"к нему ревизии."
1323
1324
#: bzrlib/builtins.py:2055
1325
msgid "Create a branch without a working tree."
1326
msgstr "Создать ветвь без рабочего дерева."
1327
1328
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1329
#, python-format
1330
msgid ""
1331
"Parent directory of %s does not exist.\n"
1332
"You may supply --create-prefix to create all leading parent directories."
1333
msgstr ""
1334
"Родительская директория для %s не существует.\n"
1335
"Вы может предоставить --create-prefix, чтобы создать все родительские "
1336
"директории."
1337
1338
#: bzrlib/builtins.py:2109
1339
msgid ""
1340
"This branch format cannot be set to append-revisions-only. Try --default."
1341
msgstr ""
1342
"Формат этой ветви не может быть установлен в append-revisions-only. "
1343
"Попробуйте --default."
1344
1345
#: bzrlib/builtins.py:2120
1346
msgid "Created a {0} (format: {1})\n"
1347
msgstr "Создана {0} в формате {1}\n"
1348
1349
#: bzrlib/builtins.py:2129
1350
#, python-format
1351
msgid "Using shared repository: %s\n"
1352
msgstr "Используется общий репозиторий: %s\n"
1353
1354
#: bzrlib/builtins.py:2133
1355
msgid "Create a shared repository for branches to share storage space."
1356
msgstr ""
1357
"Создать общий репозиторий для ветвей, которые разделяют общее пространство."
1358
1359
#: bzrlib/builtins.py:2135
1360
msgid ""
1361
"New branches created under the repository directory will store their\n"
1362
"revisions in the repository, not in the branch directory. For branches\n"
1363
"with shared history, this reduces the amount of storage needed and \n"
1364
"speeds up the creation of new branches."
1365
msgstr ""
1366
"Новые ветви, создаваемые в директории репозитория, будут хранить\n"
1367
"информацию о ревизиях в репозитории, а не в директории ветви.\n"
1368
"Для ветвей с общей историей это уменьшает размер необходимого\n"
1369
"пространства и ускоряет создание новых ветвей."
1370
1371
#: bzrlib/builtins.py:2140
1372
msgid ""
1373
"If the --no-trees option is given then the branches in the repository\n"
1374
"will not have working trees by default. They will still exist as \n"
1375
"directories on disk, but they will not have separate copies of the \n"
1376
"files at a certain revision. This can be useful for repositories that\n"
1377
"store branches which are interacted with through checkouts or remote\n"
1378
"branches, such as on a server."
1379
msgstr ""
1380
"Если дана опция --no-trees, то по умолчанию ветви в репозитории не\n"
1381
"будут иметь рабочих деревьев. Они по прежнему будут существовать,\n"
1382
"как директории на диске, но не будут иметь различных копий файлов\n"
1383
"определённой ревизии. Это может быть полезно для репозиториев,\n"
1384
"хранящих ветви, работа с которыми производится через рабочие копии\n"
1385
"или через удалённые ветви, например на сервере."
1386
1387
#: bzrlib/builtins.py:2147
1388
msgid ""
1389
":Examples:\n"
1390
" Create a shared repository holding just branches::"
1391
msgstr ""
1392
":Примеры:\n"
1393
" Создать общий репозиторий, хранящий только ветви::"
1394
1395
#: bzrlib/builtins.py:2150
1396
msgid ""
1397
" bzr init-repo --no-trees repo\n"
1398
" bzr init repo/trunk"
1399
msgstr ""
1400
" bzr init-repo --no-trees repo\n"
1401
" bzr init repo/trunk"
1402
1403
#: bzrlib/builtins.py:2153
1404
msgid " Make a lightweight checkout elsewhere::"
1405
msgstr " Создать легковесную рабочую копию где-нибудь ещё::"
1406
1407
#: bzrlib/builtins.py:2155
1408
msgid ""
1409
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1410
" cd trunk-checkout\n"
1411
" (add files here)"
1412
msgstr ""
1413
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1414
" cd trunk-checkout\n"
1415
" (здесь добавляйте файлы)"
1416
1417
#: bzrlib/builtins.py:2163
1418
msgid ""
1419
"Specify a format for this repository. See \"bzr help formats\" for details."
1420
msgstr ""
1421
"Указать формат для этого репозитория. Описание форматов см. в «bzr help "
1422
"formats»."
1423
1424
#: bzrlib/builtins.py:2167
1425
msgid "Repository format"
1426
msgstr "Формат репозитория"
1427
1428
#: bzrlib/builtins.py:2169
1429
msgid "Branches in the repository will default to not having a working tree."
1430
msgstr "Ветви в репозитории по умолчанию не будут иметь рабочего дерева."
1431
1432
#: bzrlib/builtins.py:2195
1433
msgid "Show differences in the working tree, between revisions or branches."
1434
msgstr "Показать изменения в рабочем дереве, между ревизиями или ветвями."
1435
1436
#: bzrlib/builtins.py:2197
1437
msgid ""
1438
"If no arguments are given, all changes for the current tree are listed.\n"
1439
"If files are given, only the changes in those files are listed.\n"
1440
"Remote and multiple branches can be compared by using the --old and\n"
1441
"--new options. If not provided, the default for both is derived from\n"
1442
"the first argument, if any, or the current tree if no arguments are\n"
1443
"given."
1444
msgstr ""
1445
"Если не дано аргументов, будут выведены все изменения текущего дерева.\n"
1446
"Если даны файлы, выводятся изменения только в этих файлах. Удалённые\n"
1447
"или множественные ветви можно сравнить, используя опции --old и --new.\n"
1448
"Если не указаны, значение по умолчанию для обоих извлекается из первого\n"
1449
"аргумента или из текущего дерева, если не дано аргументов."
1450
1451
#: bzrlib/builtins.py:2204
1452
msgid ""
1453
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1454
"produces patches suitable for \"patch -p1\"."
1455
msgstr ""
1456
"«bzr diff -p1» эквивалентно «bzr diff -prefix old/:new/», и\n"
1457
"создаёт патчи, подходящие для «patch -p1»."
1458
1459
#: bzrlib/builtins.py:2207
1460
msgid ""
1461
"Note that when using the -r argument with a range of revisions, the\n"
1462
"differences are computed between the two specified revisions. That\n"
1463
"is, the command does not show the changes introduced by the first \n"
1464
"revision in the range. This differs from the interpretation of \n"
1465
"revision ranges used by \"bzr log\" which includes the first revision\n"
1466
"in the range."
1467
msgstr ""
1468
"Заметьте, что при использовании аргумента -r с интервалом ревизий,\n"
1469
"различия вычисляются между указанными ревизиями. То есть, команда\n"
1470
"не показывает изменения, представленные в первой ревизии интервала.\n"
1471
"Это отличается от интерпретации интервалов ревизий командой «bzr log»,\n"
1472
"которая включает первую ревизию интервала."
1473
1474
#: bzrlib/builtins.py:2214
1475
msgid ""
1476
":Exit values:\n"
1477
" 1 - changed\n"
1478
" 2 - unrepresentable changes\n"
1479
" 3 - error\n"
1480
" 0 - no change"
1481
msgstr ""
1482
":Значения выхода:\n"
1483
" 1 - изменено\n"
1484
" 2 - непредставимые изменения\n"
1485
" 3 - ошибка\n"
1486
" 0 - нет изменений"
1487
1488
#: bzrlib/builtins.py:2220
1489
msgid ""
1490
":Examples:\n"
1491
" Shows the difference in the working tree versus the last commit::"
1492
msgstr ""
1493
":Примеры:\n"
1494
" Показывает отличия рабочего дерева от последнего закрепления::"
1495
1496
#: bzrlib/builtins.py:2223
1497
msgid " bzr diff"
1498
msgstr " bzr diff"
1499
1500
#: bzrlib/builtins.py:2225
1501
msgid " Difference between the working tree and revision 1::"
1502
msgstr " Различия между рабочим деревом и ревизией 1::"
1503
1504
#: bzrlib/builtins.py:2227
1505
msgid " bzr diff -r1"
1506
msgstr " bzr diff -r1"
1507
1508
#: bzrlib/builtins.py:2229
1509
msgid " Difference between revision 3 and revision 1::"
1510
msgstr " Различия между ревизией 3 и ревизией 1::"
1511
1512
#: bzrlib/builtins.py:2231
1513
msgid " bzr diff -r1..3"
1514
msgstr " bzr diff -r1..3"
1515
1516
#: bzrlib/builtins.py:2233
1517
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1518
msgstr " Различия между ревизией 3 и ревизией 1 для ветви xxx::"
1519
1520
#: bzrlib/builtins.py:2235
1521
msgid " bzr diff -r1..3 xxx"
1522
msgstr " bzr diff -r1..3 xxx"
1523
1524
#: bzrlib/builtins.py:2237
1525
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1526
msgstr " Изменения, представленные в ревизии 2 (эквивалентно -r1..2)::"
1527
1528
#: bzrlib/builtins.py:2239
1529
msgid " bzr diff -c2"
1530
msgstr " bzr diff -c2"
1531
1532
#: bzrlib/builtins.py:2241
1533
msgid ""
1534
" To see the changes introduced by revision X::\n"
1535
" \n"
1536
" bzr diff -cX"
1537
msgstr ""
1538
" Чтобы увидеть изменения, представленные в ревизии X::\n"
1539
" \n"
1540
" bzr diff -cX"
1541
1542
#: bzrlib/builtins.py:2245
1543
msgid ""
1544
" Note that in the case of a merge, the -c option shows the changes\n"
1545
" compared to the left hand parent. To see the changes against\n"
1546
" another parent, use::"
1547
msgstr ""
1548
" Заметьте, что в случае слияния, опция -c выведет только изменения\n"
1549
" относительно левого родителя. Чтобы увидеть изменения относительно\n"
1550
" правого родителя, используйте::"
1551
1552
#: bzrlib/builtins.py:2249
1553
msgid " bzr diff -r<chosen_parent>..X"
1554
msgstr " bzr diff -r<выбранный_родитель>..X"
1555
1556
#: bzrlib/builtins.py:2251
1557
msgid ""
1558
" The changes between the current revision and the previous revision\n"
1559
" (equivalent to -c-1 and -r-2..-1)"
1560
msgstr ""
1561
" Изменения между текущей ревизией и предыдущей\n"
1562
" (эквивалент -c-1 и -r-2..-1)"
1563
1564
#: bzrlib/builtins.py:2254
1565
msgid " bzr diff -r-2.."
1566
msgstr " bzr diff -r-2.."
1567
1568
#: bzrlib/builtins.py:2256
1569
msgid " Show just the differences for file NEWS::"
1570
msgstr " Показать изменения только для файла NEWS::"
1571
1572
#: bzrlib/builtins.py:2258
1573
msgid " bzr diff NEWS"
1574
msgstr " bzr diff NEWS"
1575
1576
#: bzrlib/builtins.py:2260
1577
msgid " Show the differences in working tree xxx for file NEWS::"
1578
msgstr " Показать изменения в рабочем дереве xxx для файла NEWS::"
1579
1580
#: bzrlib/builtins.py:2262
1581
msgid " bzr diff xxx/NEWS"
1582
msgstr " bzr diff xxx/NEWS"
1583
1584
#: bzrlib/builtins.py:2264
1585
msgid " Show the differences from branch xxx to this working tree:"
1586
msgstr " Показать изменения рабочего дерева относительно ветви xxx:"
1587
1588
#: bzrlib/builtins.py:2266
1589
msgid " bzr diff --old xxx"
1590
msgstr " bzr diff --old xxx"
1591
1592
#: bzrlib/builtins.py:2268
1593
msgid " Show the differences between two branches for file NEWS::"
1594
msgstr " Показать различия в файле NEWS между двумя ветвями::"
1595
1596
#: bzrlib/builtins.py:2270
1597
msgid " bzr diff --old xxx --new yyy NEWS"
1598
msgstr " bzr diff --old xxx --new yyy NEWS"
1599
1600
#: bzrlib/builtins.py:2272
1601
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1602
msgstr " Тоже, что и 'bzr diff', но начать пути с old/ и new/::"
1603
1604
#: bzrlib/builtins.py:2274
1605
msgid ""
1606
" bzr diff --prefix old/:new/\n"
1607
" \n"
1608
" Show the differences using a custom diff program with options::\n"
1609
" \n"
1610
" bzr diff --using /usr/bin/diff --diff-options -wu"
1611
msgstr ""
1612
" bzr diff --prefix old/:new/\n"
1613
" \n"
1614
" Показать изменения, используя пользовательскую программу diff с "
1615
"опциями::\n"
1616
" \n"
1617
" bzr diff --using /usr/bin/diff --diff-options -wu"
1618
1619
#: bzrlib/builtins.py:2284
1620
msgid "Pass these options to the external diff program."
1621
msgstr "Передать эти опции внешней программе diff."
1622
1623
#: bzrlib/builtins.py:2287
1624
msgid ""
1625
"Set prefixes added to old and new filenames, as two values separated by a "
1626
"colon. (eg \"old/:new/\")."
1627
msgstr ""
1628
"Установить префиксы, добавляемые к старым и новым именам файлов, как "
1629
"значения, разделённые двоеточием (напр. «old/:new/»)."
1630
1631
#: bzrlib/builtins.py:2290
1632
msgid "Branch/tree to compare from."
1633
msgstr "Ветвь или дерево, которое сравнивать."
1634
1635
#: bzrlib/builtins.py:2294
1636
msgid "Branch/tree to compare to."
1637
msgstr "Ветвь или дерево, с которым сравнивать."
1638
1639
#: bzrlib/builtins.py:2300
1640
msgid "Use this command to compare files."
1641
msgstr "Использовать эту команду для сравнения."
1642
1643
#: bzrlib/builtins.py:2305
1644
msgid "Diff format to use."
1645
msgstr "Используемый формат diff."
1646
1647
#: bzrlib/builtins.py:2307
1648
msgid "Diff format"
1649
msgstr "Формат diff"
1650
1651
#: bzrlib/builtins.py:2329
1652
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1653
msgstr ""
1654
"--prefix ожидает два значения, разделённые двоеточием (напр. «old/:new/»)"
1655
1656
#: bzrlib/builtins.py:2333
1657
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1658
msgstr "bzr diff --revision принимает ровно ожин или два аргумента"
1659
1660
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1661
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1662
msgid "{0} and {1} are mutually exclusive"
1663
msgstr "{0} и {1} взаимоисключающи"
1664
1665
#: bzrlib/builtins.py:2358
1666
msgid ""
1667
"List files deleted in the working tree.\n"
1668
" "
1669
msgstr ""
1670
"Вывести список файлов, удалённых в рабочем дереве.\n"
1671
" "
1672
1673
#: bzrlib/builtins.py:2436
1674
msgid "Show the tree root directory."
1675
msgstr "Показать корневую директорию дерева."
1676
1677
#: bzrlib/builtins.py:2438
1678
msgid ""
1679
"The root is the nearest enclosing directory with a .bzr control\n"
1680
"directory."
1681
msgstr ""
1682
"Корень это ближайшая родительская директория с управляющей\n"
1683
"директорией .bzr."
1684
1685
#: bzrlib/builtins.py:2453
1686
msgid "The limit argument must be an integer."
1687
msgstr "Аргумент предела должен быть целым числом."
1688
1689
#: bzrlib/builtins.py:2461
1690
msgid "The levels argument must be an integer."
1691
msgstr "Аргументы пределов должны быть целыми числами."
1692
1693
#: bzrlib/builtins.py:2466
1694
msgid "Show historical log for a branch or subset of a branch."
1695
msgstr "Показать журнал истории ветви или подмножества ветви."
1696
1697
#: bzrlib/builtins.py:2468
1698
msgid ""
1699
"log is bzr's default tool for exploring the history of a branch.\n"
1700
"The branch to use is taken from the first parameter. If no parameters\n"
1701
"are given, the branch containing the working directory is logged.\n"
1702
"Here are some simple examples::"
1703
msgstr ""
1704
"log — это утилита bzr по умолчанию для просмотра истории ветви.\n"
1705
"Используемая ветвь определяется первым параметром. Если не задано\n"
1706
"параметров, выводится журнал ветви, содержащей рабочюю директорию.\n"
1707
"Вот несколько простых примеров::"
1708
1709
#: bzrlib/builtins.py:2473
1710
msgid ""
1711
" bzr log log the current branch\n"
1712
" bzr log foo.py log a file in its branch\n"
1713
" bzr log http://server/branch log a branch on a server"
1714
msgstr ""
1715
" bzr log журнал текущей ветви\n"
1716
" bzr log foo.py журнал файла в его ветви\n"
1717
" bzr log http://server/branch журнал ветви на сервере"
1718
1719
#: bzrlib/builtins.py:2477
1720
msgid ""
1721
"The filtering, ordering and information shown for each revision can\n"
1722
"be controlled as explained below. By default, all revisions are\n"
1723
"shown sorted (topologically) so that newer revisions appear before\n"
1724
"older ones and descendants always appear before ancestors. If displayed,\n"
1725
"merged revisions are shown indented under the revision in which they\n"
1726
"were merged."
1727
msgstr ""
1728
"Фильтрация, сортировка и отображение информации для каждой ревизии\n"
1729
"могут управляться, как объяснено ниже. По умолчанию, выводятся все\n"
1730
"ревизии отсортированные так, что более новые ревизии находятся выше\n"
1731
"более старых и потомки находятся выше предков. Если ревизия слияния\n"
1732
"отображаются, то они отображаются с отступом, относительно ревизии,\n"
1733
"в которой происходило слияние."
1734
1735
#: bzrlib/builtins.py:2484
1736
msgid ":Output control:"
1737
msgstr ":Управление выводом:"
1738
1739
#: bzrlib/builtins.py:2486
1740
msgid ""
1741
" The log format controls how information about each revision is\n"
1742
" displayed. The standard log formats are called ``long``, ``short``\n"
1743
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1744
" for more details on log formats."
1745
msgstr ""
1746
" Формат журнала определяет, как отображается информация о каждой\n"
1747
" ревизии. Стандартные форматы журнала называются «long», «short»\n"
1748
" и «line». По умолчание используется long. Подробности о форматах\n"
1749
" смотрите в «bzr help log-formats»."
1750
1751
#: bzrlib/builtins.py:2491
1752
msgid ""
1753
" The following options can be used to control what information is\n"
1754
" displayed::"
1755
msgstr ""
1756
" Следующие опции могут использоваться для управления отображением\n"
1757
" информации::"
1758
1759
#: bzrlib/builtins.py:2494
1760
msgid ""
1761
" -l N display a maximum of N revisions\n"
1762
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1763
" -v display a status summary (delta) for each revision\n"
1764
" -p display a diff (patch) for each revision\n"
1765
" --show-ids display revision-ids (and file-ids), not just revnos"
1766
msgstr ""
1767
" -l N выводить не больше N ревизий\n"
1768
" -n N выводить N уровней ревизий (0 для всех, 1 для сжатого)\n"
1769
" -v выводить статусные сообщения (delta) для каждой ревизии\n"
1770
" -p выводить различия diff для каждой ревизии\n"
1771
" --show-ids выводить id ревизий (и id файлов), не только номера ревизий"
1772
1773
#: bzrlib/builtins.py:2500
1774
msgid ""
1775
" Note that the default number of levels to display is a function of the\n"
1776
" log format. If the -n option is not used, the standard log formats show\n"
1777
" just the top level (mainline)."
1778
msgstr ""
1779
" Число уровней отображения по умолчанию зависит от формата журнала.\n"
1780
" Если используется не опция -n, стандартные форматы журнала показывают\n"
1781
" верхний уровень (основную линию)."
1782
1783
#: bzrlib/builtins.py:2504
1784
msgid ""
1785
" Status summaries are shown using status flags like A, M, etc. To see\n"
1786
" the changes explained using words like ``added`` and ``modified``\n"
1787
" instead, use the -vv option."
1788
msgstr ""
1789
" Описания статусов отображаются с помощью флагов A, M, и т.д. Чтобы\n"
1790
" увидеть изменения, описанные словами вроде «добавлены» и «изменены»,\n"
1791
" используйте опцию -vv."
1792
1793
#: bzrlib/builtins.py:2508
1794
msgid ":Ordering control:"
1795
msgstr ":Управление порядком:"
1796
1797
#: bzrlib/builtins.py:2510
1798
msgid ""
1799
" To display revisions from oldest to newest, use the --forward option.\n"
1800
" In most cases, using this option will have little impact on the total\n"
1801
" time taken to produce a log, though --forward does not incrementally\n"
1802
" display revisions like --reverse does when it can."
1803
msgstr ""
1804
" Чтобы вывести ревизии от старой до новой, используйте опцию --forward.\n"
1805
" В большинстве случаев, при использовании этой опции на создание журнала\n"
1806
" расходуется мало времени, хотя --forward не выводит ревизии по порядку,\n"
1807
" как это делает --reverse."
1808
1809
#: bzrlib/builtins.py:2515
1810
msgid ":Revision filtering:"
1811
msgstr ":Фильтрация ревизий:"
1812
1813
#: bzrlib/builtins.py:2517
1814
msgid ""
1815
" The -r option can be used to specify what revision or range of revisions\n"
1816
" to filter against. The various forms are shown below::"
1817
msgstr ""
1818
" Опцию -r можно использовать для указания ревизии или интервала ревизий\n"
1819
" для фильтрации. Различные формы показаны ниже::"
1820
1821
#: bzrlib/builtins.py:2520
1822
msgid ""
1823
" -rX display revision X\n"
1824
" -rX.. display revision X and later\n"
1825
" -r..Y display up to and including revision Y\n"
1826
" -rX..Y display from X to Y inclusive"
1827
msgstr ""
1828
" -rX вывести ревизию X\n"
1829
" -rX.. вывести ревизию X и более поздние\n"
1830
" -r..Y вывести до и включая ревизию Y\n"
1831
" -rX..Y вывести от X до Y включительно"
1832
1833
#: bzrlib/builtins.py:2525
1834
msgid ""
1835
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1836
" Some common examples are given below::"
1837
msgstr ""
1838
" Чтобы узнать, как указывать X и Y, смотрите «bzr help revisionspec».\n"
1839
" Ниже приведеные некоторые распространённые примеры::"
1840
1841
#: bzrlib/builtins.py:2528
1842
msgid ""
1843
" -r-1 show just the tip\n"
1844
" -r-10.. show the last 10 mainline revisions\n"
1845
" -rsubmit:.. show what's new on this branch\n"
1846
" -rancestor:path.. show changes since the common ancestor of this\n"
1847
" branch and the one at location path\n"
1848
" -rdate:yesterday.. show changes since yesterday"
1849
msgstr ""
1850
" -r-1 показать только верхушку\n"
1851
" -r-10.. показать последние 10 ревизий основной линии\n"
1852
" -rsubmit:.. показать, что нового в этой ветви\n"
1853
" -rancestor:путь.. показать изменения, начиная с общего предка\n"
1854
" этой ветви и указанной в пути\n"
1855
" -rdate:yesterday.. показать изменения со вчерашнего дня"
1856
1857
#: bzrlib/builtins.py:2535
1858
msgid ""
1859
" When logging a range of revisions using -rX..Y, log starts at\n"
1860
" revision Y and searches back in history through the primary\n"
1861
" (\"left-hand\") parents until it finds X. When logging just the\n"
1862
" top level (using -n1), an error is reported if X is not found\n"
1863
" along the way. If multi-level logging is used (-n0), X may be\n"
1864
" a nested merge revision and the log will be truncated accordingly."
1865
msgstr ""
1866
1867
#: bzrlib/builtins.py:2542
1868
msgid ":Path filtering:"
1869
msgstr ":Фильтрация пути:"
1870
1871
#: bzrlib/builtins.py:2544
1872
msgid ""
1873
" If parameters are given and the first one is not a branch, the log\n"
1874
" will be filtered to show only those revisions that changed the\n"
1875
" nominated files or directories."
1876
msgstr ""
1877
" Если заданы параметры и первый не является ветвью, будут отображаться\n"
1878
" только те ревизии, которые изменяли указанные файлы или директории."
1879
1880
#: bzrlib/builtins.py:2548
1881
msgid ""
1882
" Filenames are interpreted within their historical context. To log a\n"
1883
" deleted file, specify a revision range so that the file existed at\n"
1884
" the end or start of the range."
1885
msgstr ""
1886
" Имена файлов интерпретируются в историческом контексте. Чтобы вывести\n"
1887
" журнал для удалённого файла, укажите такой интервал ревизий, что файл\n"
1888
" существует от начала до конца интервала."
1889
1890
#: bzrlib/builtins.py:2552
1891
msgid ""
1892
" Historical context is also important when interpreting pathnames of\n"
1893
" renamed files/directories. Consider the following example:"
1894
msgstr ""
1895
" Исторический контекст также важен при интерпретации путей\n"
1896
" переименованных файлов и директорий. Рассмотрим следующий пример:"
1897
1898
#: bzrlib/builtins.py:2555
1899
msgid ""
1900
" * revision 1: add tutorial.txt\n"
1901
" * revision 2: modify tutorial.txt\n"
1902
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1903
msgstr ""
1904
" * ревизия 1: добавлен tutorial.txt\n"
1905
" * ревизия 2: изменён tutorial.txt\n"
1906
" * ревизия 3: переименован tutorial.txt в guide.txt; добавлен tutorial.txt"
1907
1908
#: bzrlib/builtins.py:2559
1909
msgid " In this case:"
1910
msgstr " В этом случае:"
1911
1912
#: bzrlib/builtins.py:2561
1913
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1914
msgstr ""
1915
" * «bzr log guide.txt» выведет журнал файла, добавленного в ревизии 1"
1916
1917
#: bzrlib/builtins.py:2563
1918
msgid ""
1919
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1920
msgstr ""
1921
" * «bzr log tutorial.txt» выведет журнал нового файла, добавленного\r\n"
1922
" в ревизии 3"
1923
1924
#: bzrlib/builtins.py:2565
1925
msgid ""
1926
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1927
" the original file in revision 2."
1928
msgstr ""
1929
" * «bzr log -r2 -p tutorial.txt» выведет изменения оригинального\n"
1930
" файла в ревизии 2."
1931
1932
#: bzrlib/builtins.py:2568
1933
msgid ""
1934
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1935
" was no file called guide.txt in revision 2."
1936
msgstr ""
1937
" * «bzr log -r2 -p guide.txt» выведет сообщение об ошибке, так как\n"
1938
" в ревизии 2 нет файла guide.txt."
1939
1940
#: bzrlib/builtins.py:2571
1941
msgid ""
1942
" Renames are always followed by log. By design, there is no need to\n"
1943
" explicitly ask for this (and no way to stop logging a file back\n"
1944
" until it was last renamed)."
1945
msgstr ""
1946
1947
#: bzrlib/builtins.py:2575
1948
msgid ":Other filtering:"
1949
msgstr ":Другая фильтрация:"
1950
1951
#: bzrlib/builtins.py:2577
1952
msgid ""
1953
" The --match option can be used for finding revisions that match a\n"
1954
" regular expression in a commit message, committer, author or bug.\n"
1955
" Specifying the option several times will match any of the supplied\n"
1956
" expressions. --match-author, --match-bugs, --match-committer and\n"
1957
" --match-message can be used to only match a specific field."
1958
msgstr ""
1959
" Опцию --match можно использовать для нахождения ревизий, удовлетворяющих\n"
1960
" регулярному выражению в сообщении, закрепляющем, авторе или ошибке.\n"
1961
" Опцию можно указать несколько раз и в этом случае будут выведены только\n"
1962
" ревизии, удовлетворяющие всем критериям. Для поиска по определённым\n"
1963
" полям можно использовать опции --match-author, --match-bugs,\n"
1964
" --match-committer и --match-message."
1965
1966
#: bzrlib/builtins.py:2583
1967
msgid ":Tips & tricks:"
1968
msgstr ":Советы и трюки:"
1969
1970
#: bzrlib/builtins.py:2585
1971
msgid ""
1972
" GUI tools and IDEs are often better at exploring history than command\n"
1973
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1974
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1975
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1976
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1977
msgstr ""
1978
" Чаще лучше просматривать историю с помощью графических утилит и IDE,\n"
1979
" например qlog, viz из qbzr или bzr-gtk, оболочку bzr-explorer, или\n"
1980
" веб-интерфейс Loggerhead. Смотрите руководство по модулям\n"
1981
" <http://doc.bazaar.canonical.com/plugins/en/> и\n"
1982
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1983
1984
#: bzrlib/builtins.py:2591
1985
msgid ""
1986
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1987
msgstr ""
1988
" Возможно, вы захотите добавить следующие псевдонимы в «bazaar.conf»::"
1989
1990
#: bzrlib/builtins.py:2593
1991
msgid ""
1992
" [ALIASES]\n"
1993
" tip = log -r-1\n"
1994
" top = log -l10 --line\n"
1995
" show = log -v -p"
1996
msgstr ""
1997
" [ALIASES]\n"
1998
" tip = log -r-1\n"
1999
" top = log -l10 --line\n"
2000
" show = log -v -p"
2001
2002
#: bzrlib/builtins.py:2598
2003
msgid ""
2004
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
2005
" will show the last 10 mainline revisions. To see the details of a\n"
2006
" particular revision X, ``bzr show -rX``."
2007
msgstr ""
2008
" Тогда «bzr tip» выведет последнюю ревизию, а «bzr top» — последние\n"
2009
" 10 ревизий основной линии. Чтобы просмотреть журнал определённой\n"
2010
" ревизии X, используйте «bzr show -rX»."
2011
2012
#: bzrlib/builtins.py:2602
2013
msgid ""
2014
" If you are interested in looking deeper into a particular merge X,\n"
2015
" use ``bzr log -n0 -rX``."
2016
msgstr ""
2017
" Если вы хотите подробно рассмотреть определённое слияние X,\n"
2018
" используйте «bzr log -n0 -rX»."
2019
2020
#: bzrlib/builtins.py:2605
2021
msgid ""
2022
" ``bzr log -v`` on a branch with lots of history is currently\n"
2023
" very slow. A fix for this issue is currently under development.\n"
2024
" With or without that fix, it is recommended that a revision range\n"
2025
" be given when using the -v option."
2026
msgstr ""
2027
" «bzr log -v» на ветви с большой историей на данный момент работает\n"
2028
" очень медленно. Сейчас ведётся работа над исправлением этого\n"
2029
" недостатка. Независимо от того, будет это исправлено или нет,\n"
2030
" рекомендуется задавать интервал ревизий с помощью опции -v."
2031
2032
#: bzrlib/builtins.py:2610
2033
msgid ""
2034
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
2035
" used to find revisions matching user names, commit messages, etc.\n"
2036
" Among other features, this plugin can find all revisions containing\n"
2037
" a list of words but not others."
2038
msgstr ""
2039
2040
#: bzrlib/builtins.py:2615
2041
msgid ""
2042
" When exploring non-mainline history on large projects with deep\n"
2043
" history, the performance of log can be greatly improved by installing\n"
2044
" the historycache plugin. This plugin buffers historical information\n"
2045
" trading disk space for faster speed."
2046
msgstr ""
2047
2048
#: bzrlib/builtins.py:2624
2049
msgid "Show from oldest to newest."
2050
msgstr "Выводить от старых к новым."
2051
2052
#: bzrlib/builtins.py:2627
2053
msgid "Show files changed in each revision."
2054
msgstr "Показывать файлы, изменённые в каждой ревизии."
2055
2056
#: bzrlib/builtins.py:2633
2057
msgid "Show just the specified revision. See also \"help revisionspec\"."
2058
msgstr "Показать только указанную ревизию. См. также «help revisionspec»."
2059
2060
#: bzrlib/builtins.py:2637
2061
msgid "What names to list as authors - first, all or committer."
2062
msgstr "Какие имена выводить, как авторов — first, all или committer."
2063
2064
#: bzrlib/builtins.py:2638
2065
msgid "Authors"
2066
msgstr "Авторы"
2067
2068
#: bzrlib/builtins.py:2643
2069
msgid "Number of levels to display - 0 for all, 1 for flat."
2070
msgstr "Число уровней для вывода — 0 для всех, 1 для плоского вывода."
2071
2072
#: bzrlib/builtins.py:2653
2073
msgid "Limit the output to the first N revisions."
2074
msgstr "Ограничить вывод лишь первыми N ревизиями."
2075
2076
#: bzrlib/builtins.py:2658
2077
msgid "Show changes made in each revision as a patch."
2078
msgstr "Показать изменения, сделанные в каждой ревизии, в виде патча."
2079
2080
#: bzrlib/builtins.py:2660
2081
msgid "Show merged revisions like --levels 0 does."
2082
msgstr "Показывать слияния, как это делает --levels 0."
2083
2084
#: bzrlib/builtins.py:2664
2085
msgid "Do not report commits with more than one parent."
2086
msgstr "Не сообщать о закреплениях с более, чем одним родителем."
2087
2088
#: bzrlib/builtins.py:2666
2089
msgid ""
2090
"Display only the revisions that are not part of both ancestries (require -"
2091
"rX..Y)."
2092
msgstr ""
2093
"Показать только ревизии, которые не являются частью обоих предков (требует -"
2094
"rX..Y)."
2095
2096
#: bzrlib/builtins.py:2670
2097
msgid "Show digital signature validity."
2098
msgstr ""
2099
2100
#: bzrlib/builtins.py:2673
2101
msgid "Show revisions whose properties match this expression."
2102
msgstr "Показывать ревизии, свойства которых удовлетворяют этому выражению."
2103
2104
#: bzrlib/builtins.py:2677
2105
msgid "Show revisions whose message matches this expression."
2106
msgstr ""
2107
"Показывать ревизии, комментарий которых удовлетворяет этому выражению."
2108
2109
#: bzrlib/builtins.py:2681
2110
msgid "Show revisions whose committer matches this expression."
2111
msgstr ""
2112
"Показывать ревизии, закрепитель которых удовлетворяет этому выражению."
2113
2114
#: bzrlib/builtins.py:2685
2115
msgid "Show revisions whose authors match this expression."
2116
msgstr "Показывать ревизии, авторы которых удовлетворяют этому выражению."
2117
2118
#: bzrlib/builtins.py:2689
2119
msgid "Show revisions whose bugs match this expression."
2120
msgstr "Показывать ревизии, ошибки которых удовлетворяют этому выражению."
2121
2122
#: bzrlib/builtins.py:2743
2123
msgid "--exclude-common-ancestry requires -r with two revisions"
2124
msgstr "--exclude-common-ancestry требует -r с двумя ревизиями"
2125
2126
#: bzrlib/builtins.py:2771
2127
#, python-format
2128
msgid "Path unknown at end or start of revision range: %s"
2129
msgstr "Неизвестный путь в начале или конце интервала ревизий: %s"
2130
2131
#: bzrlib/builtins.py:2888
2132
#, python-format
2133
msgid "bzr %s doesn't accept two revisions in different branches."
2134
msgstr "bzr %s не принимает две ревизии в различных ветвях."
2135
2136
#: bzrlib/builtins.py:2904
2137
#, python-format
2138
msgid "bzr %s --revision takes one or two values."
2139
msgstr "bzr %s --revision принимает одно или два значения."
2140
2141
#: bzrlib/builtins.py:2949
2142
msgid ""
2143
"List files in a tree.\n"
2144
" "
2145
msgstr ""
2146
"Вывести список файлов в дереве.\n"
2147
" "
2148
2149
#: bzrlib/builtins.py:2958
2150
msgid "Recurse into subdirectories."
2151
msgstr "Рекурсивно входить в поддиректории."
2152
2153
#: bzrlib/builtins.py:2960
2154
msgid "Print paths relative to the root of the branch."
2155
msgstr "Выводить пути относительно корня ветви."
2156
2157
#: bzrlib/builtins.py:2962
2158
msgid "Print unknown files."
2159
msgstr "Выводить неизвестные файлы."
2160
2161
#: bzrlib/builtins.py:2963
2162
msgid "Print versioned files."
2163
msgstr "Выводить файлы под контролем системы версий."
2164
2165
#: bzrlib/builtins.py:2966
2166
msgid "Print ignored files."
2167
msgstr "Выводить игнорируемые файлы."
2168
2169
#: bzrlib/builtins.py:2968
2170
msgid "List entries of a particular kind: file, directory, symlink."
2171
msgstr "Выводить файлы определённого типа: file, directory, symlink."
2172
2173
#: bzrlib/builtins.py:2981
2174
msgid "invalid kind specified"
2175
msgstr "указан неверный вид файла"
2176
2177
#: bzrlib/builtins.py:2984
2178
msgid "Cannot set both --verbose and --null"
2179
msgstr "Нельзя установить оба --verbose и --null"
2180
2181
#: bzrlib/builtins.py:2993
2182
msgid "cannot specify both --from-root and PATH"
2183
msgstr "нельзя указать оба --from-root и PATH"
2184
2185
#: bzrlib/builtins.py:3080
2186
msgid "Ignore specified files or patterns."
2187
msgstr "Игнорировать указанные файлы или шаблоны."
2188
2189
#: bzrlib/builtins.py:3082
2190
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2191
msgstr "Смотрите подробности о синтаксисе шаблонов в «bzr help patterns»."
2192
2193
#: bzrlib/builtins.py:3084
2194
msgid ""
2195
"If a .bzrignore file does not exist, the ignore command\n"
2196
"will create one and add the specified files or patterns to the newly\n"
2197
"created file. The ignore command will also automatically add the \n"
2198
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2199
"the use of the ignore command will require an explicit add command."
2200
msgstr ""
2201
"Если файл .bzrignore не существует, команда ignore создаст его\n"
2202
"и добавит указанные файлы или шаблоны к только что созданному\n"
2203
"файлу. Команда ignore также автоматически добавит файл .bzrignore\n"
2204
"к системе версий. Создание файла .bzrignore без использования\n"
2205
"команды ignore потребует явного добавления командой add."
2206
2207
#: bzrlib/builtins.py:3090
2208
msgid ""
2209
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2210
"After adding, editing or deleting that file either indirectly by\n"
2211
"using this command or directly by using an editor, be sure to commit\n"
2212
"it."
2213
msgstr ""
2214
"Чтобы удалить шаблоны из списка игнорируемых файлов, отредактируйте\n"
2215
"файл .bzrignore. После добавления, редактирования или удаления этого\n"
2216
"файла, как неявно с помощью этой команды, так и явно при помощи\n"
2217
"редактора, не забывайте закреплять его."
2218
2219
#: bzrlib/builtins.py:3095
2220
msgid ""
2221
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2222
"the global ignore file can be found in the application data directory as\n"
2223
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2224
"Global ignores are not touched by this command. The global ignore file\n"
2225
"can be edited directly using an editor."
2226
msgstr ""
2227
"Bazaar также поддерживает глобальный игнорирования по пути "
2228
"~/.bazaar/ignore.\n"
2229
"На Windows глобальный файл игнорирования может быть найден в директории\n"
2230
"данных приложений. Ищите пути вроде\n"
2231
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2232
"Эта команда не изменяет глобальный файл игнорирования. Он может быть\n"
2233
"отредактирован вручную с помощью текстового редактора."
2234
2235
#: bzrlib/builtins.py:3101
2236
msgid ""
2237
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2238
"precedence over regular ignores. Such exceptions are used to specify\n"
2239
"files that should be versioned which would otherwise be ignored."
2240
msgstr ""
2241
"Шаблоны, начинающиеся с '!', являются исключениями к шаблонам игнорирования\n"
2242
"и имеют приоритет над обычными шаблонами. Такие исключения используются для\n"
2243
"указания файлов, которые должны попасть под контроль системы версий, но\n"
2244
"по умолчанию игнорируются."
2245
2246
#: bzrlib/builtins.py:3105
2247
msgid ""
2248
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2249
"precedence over the '!' exception patterns."
2250
msgstr ""
2251
"Шаблоны, начинающиеся с '!!' ведут себя как обычные шаблоны, но имеют\n"
2252
"приоритет над шаблонами исключений '!'."
2253
2254
#: bzrlib/builtins.py:3108
2255
msgid ""
2256
":Notes: \n"
2257
" \n"
2258
"* Ignore patterns containing shell wildcards must be quoted from\n"
2259
" the shell on Unix."
2260
msgstr ""
2261
":Замечания: \n"
2262
" \n"
2263
"* Шаблоны игнорирования, содержащие специальные символы оболочки,\n"
2264
" должны быть заключены в кавычки при указании в командной строке."
2265
2266
#: bzrlib/builtins.py:3113
2267
msgid ""
2268
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2269
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2270
msgstr ""
2271
"* Шаблоны игнорирования, начинающиеся с \"#\", являются комментариями.\n"
2272
" Чтобы добавить шаблон, начинающийся с этого символа, используйте\n"
2273
" префикс \"RE:\"."
2274
2275
#: bzrlib/builtins.py:3116
2276
msgid ""
2277
":Examples:\n"
2278
" Ignore the top level Makefile::"
2279
msgstr ""
2280
":Примеры:\n"
2281
" Игнорировать файл Makefile на верхнем уровне::"
2282
2283
#: bzrlib/builtins.py:3119
2284
msgid " bzr ignore ./Makefile"
2285
msgstr " bzr ignore ./Makefile"
2286
2287
#: bzrlib/builtins.py:3121
2288
msgid " Ignore .class files in all directories...::"
2289
msgstr " Игнорировать файлы .class во всех директориях...::"
2290
2291
#: bzrlib/builtins.py:3123
2292
msgid " bzr ignore \"*.class\""
2293
msgstr " bzr ignore \"*.class\""
2294
2295
#: bzrlib/builtins.py:3125
2296
msgid " ...but do not ignore \"special.class\"::"
2297
msgstr " ...но не игнорировать \"special.class\"::"
2298
2299
#: bzrlib/builtins.py:3127
2300
msgid " bzr ignore \"!special.class\""
2301
msgstr " bzr ignore \"!special.class\""
2302
2303
#: bzrlib/builtins.py:3129
2304
msgid " Ignore files whose name begins with the \"#\" character::"
2305
msgstr " Игнорировать файлы, начинающиеся с символа \"#\"::"
2306
2307
#: bzrlib/builtins.py:3131
2308
msgid " bzr ignore \"RE:^#\""
2309
msgstr " bzr ignore \"RE:^#\""
2310
2311
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2312
msgid " Ignore .o files under the lib directory::"
2313
msgstr " Игнорировать файлы .o в директории lib::"
2314
2315
#: bzrlib/builtins.py:3135
2316
msgid " bzr ignore \"lib/**/*.o\""
2317
msgstr " bzr ignore \"lib/**/*.o\""
2318
2319
#: bzrlib/builtins.py:3139
2320
msgid " bzr ignore \"RE:lib/.*\\.o\""
2321
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2322
2323
#: bzrlib/builtins.py:3141
2324
msgid " Ignore everything but the \"debian\" toplevel directory::"
2325
msgstr " Игнорировать всё, кроме верхней директории \"debian\"::"
2326
2327
#: bzrlib/builtins.py:3143
2328
msgid ""
2329
" bzr ignore \"RE:(?!debian/).*\"\n"
2330
" \n"
2331
" Ignore everything except the \"local\" toplevel directory,\n"
2332
" but always ignore autosave files ending in ~, even under local/::\n"
2333
" \n"
2334
" bzr ignore \"*\"\n"
2335
" bzr ignore \"!./local\"\n"
2336
" bzr ignore \"!!*~\""
2337
msgstr ""
2338
" bzr ignore \"RE:(?!debian/).*\"\n"
2339
" \n"
2340
" Игнорировать всё, кроме верхней директории \"local\",\n"
2341
" но всегда игнорировать файлы, заканчивающиеся на ~, даже в local/::\n"
2342
" \n"
2343
" bzr ignore \"*\"\n"
2344
" bzr ignore \"!./local\"\n"
2345
" bzr ignore \"!!*~\""
2346
2347
#: bzrlib/builtins.py:3157
2348
msgid "Display the default ignore rules that bzr uses."
2349
msgstr "Вывести правила игнорирования, которые bzr использует по умолчанию."
2350
2351
#: bzrlib/builtins.py:3169
2352
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2353
msgstr ""
2354
"Для ignore требуется как минимум одно из NAME_PATTERN или --default-rules."
2355
2356
#: bzrlib/builtins.py:3180
2357
#, python-format
2358
msgid "Invalid ignore pattern found. %s"
2359
msgid_plural "Invalid ignore patterns found. %s"
2360
msgstr[0] "Найден некорректный шаблон игнорирования. %s"
2361
msgstr[1] "Найдены некорректные шаблоны игнорирования. %s"
2362
msgstr[2] "Найдены некорректные шаблоны игнорирования. %s"
2363
2364
#: bzrlib/builtins.py:3189
2365
msgid "NAME_PATTERN should not be an absolute path"
2366
msgstr "NAME_PATTERN не должен быть абсолютным путём"
2367
2368
#: bzrlib/builtins.py:3202
2369
#, python-format
2370
msgid ""
2371
"Warning: the following files are version controlled and match your ignore "
2372
"pattern:\n"
2373
"%s\n"
2374
"These files will continue to be version controlled unless you 'bzr remove' "
2375
"them.\n"
2376
msgstr ""
2377
"Предупреждение: следующие файлы под контролем системы версий и удовлетворяют "
2378
"шаблонам игнорирования:\n"
2379
"%s\n"
2380
"Эти файлы будут продолжать под контролем системы версий, пока вы не "
2381
"выполните 'bzr remove'.\n"
2382
2383
#: bzrlib/builtins.py:3209
2384
msgid "List ignored files and the patterns that matched them."
2385
msgstr "Вывести игнорируемые файлы и шаблоны, которым они удовлетворяют."
2386
2387
#: bzrlib/builtins.py:3211
2388
msgid ""
2389
"List all the ignored files and the ignore pattern that caused the file to\n"
2390
"be ignored."
2391
msgstr ""
2392
"Вывести все игнорируемые файлы и шаблоны игнорирования, из-за которых эти\n"
2393
"файлы игнорируются."
2394
2395
#: bzrlib/builtins.py:3214
2396
msgid "Alternatively, to list just the files::"
2397
msgstr "Альтернативно, чтобы вывести только файлы::"
2398
2399
#: bzrlib/builtins.py:3216
2400
msgid " bzr ls --ignored"
2401
msgstr " bzr ls --ignored"
2402
2403
#: bzrlib/builtins.py:3250
2404
#, python-format
2405
msgid "not a valid revision-number: %r"
2406
msgstr "некорректный номер ревизии: %r"
2407
2408
#: bzrlib/builtins.py:3257
2409
msgid ""
2410
"Export current or past revision to a destination directory or archive."
2411
msgstr ""
2412
"Экспортировать текущую или прошлую ревизию в директорию назначения\r\n"
2413
"или архив."
2414
2415
#: bzrlib/builtins.py:3259
2416
msgid "If no revision is specified this exports the last committed revision."
2417
msgstr "Если ревизия не указана, экспортирует последнюю ревизию."
2418
2419
#: bzrlib/builtins.py:3261
2420
msgid ""
2421
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2422
"given, try to find the format with the extension. If no extension\n"
2423
"is found exports to a directory (equivalent to --format=dir)."
2424
msgstr ""
2425
"Формат может быть именем экспортируемого формата, как tar, tgz, tbz2.\n"
2426
"Если не указан, формат определяется по расширению. Если расширение\n"
2427
"отсутствует, экспортирует в директорию (эквивалентно --format=dir)."
2428
2429
#: bzrlib/builtins.py:3265
2430
msgid ""
2431
"If root is supplied, it will be used as the root directory inside\n"
2432
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2433
"to the exported filename. The root option has no effect for 'dir' format."
2434
msgstr ""
2435
"Если указан root, он будет использоваться как корневая директория\n"
2436
"внутри форматов-контейнеров (tar, zip, и т.д.). Если не указан, по\n"
2437
"умолчанию используется имя файла для эскпорта. Опция root не имеет\n"
2438
"эффекта для формата 'dir'."
2439
2440
#: bzrlib/builtins.py:3269
2441
msgid ""
2442
"If branch is omitted then the branch containing the current working\n"
2443
"directory will be used."
2444
msgstr ""
2445
"Если ветвь опущена, используется ветвь, содержащая текущую рабочую\n"
2446
"директорию."
2447
2448
#: bzrlib/builtins.py:3272
2449
msgid ""
2450
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2451
msgstr ""
2452
"Замечание: Экспорт в zip деревьев с именами файлов, содержащими не-ASCII\r\n"
2453
"символы, не поддерживается."
2454
2455
#: bzrlib/builtins.py:3274
2456
msgid ""
2457
" ================= =========================\n"
2458
" Supported formats Autodetected by extension\n"
2459
" ================= =========================\n"
2460
" dir (none)\n"
2461
" tar .tar\n"
2462
" tbz2 .tar.bz2, .tbz2\n"
2463
" tgz .tar.gz, .tgz\n"
2464
" zip .zip\n"
2465
" ================= ========================="
2466
msgstr ""
2467
" ====================== =============================\n"
2468
" Поддерживаемые форматы Автоопределение по расширению\n"
2469
" ====================== =============================\n"
2470
" dir (нет)\n"
2471
" tar .tar\n"
2472
" tbz2 .tar.bz2, .tbz2\n"
2473
" tgz .tar.gz, .tgz\n"
2474
" zip .zip\n"
2475
" ====================== ============================="
2476
2477
#: bzrlib/builtins.py:3288
2478
msgid "Type of file to export to."
2479
msgstr "Тип файла для экспорта."
2480
2481
#: bzrlib/builtins.py:3291
2482
msgid "Apply content filters to export the convenient form."
2483
msgstr ""
2484
2485
#: bzrlib/builtins.py:3295
2486
msgid "Name of the root directory inside the exported file."
2487
msgstr "Имя корневой директории внутри экспортируемого файла."
2488
2489
#: bzrlib/builtins.py:3297
2490
msgid ""
2491
"Set modification time of files to that of the last revision in which it was "
2492
"changed."
2493
msgstr ""
2494
"Установить время изменения файлов на время последней ревизии, в которой они "
2495
"были изменены."
2496
2497
#: bzrlib/builtins.py:3300
2498
msgid ""
2499
"Export the working tree contents rather than that of the last revision."
2500
msgstr ""
2501
2502
#: bzrlib/builtins.py:3319
2503
msgid "--uncommitted requires a working tree"
2504
msgstr "--uncommitted требует рабочее дерево"
2505
2506
#: bzrlib/builtins.py:3328
2507
#, python-format
2508
msgid "Unsupported export format: %s"
2509
msgstr "Неподдерживаемый формат экспорта: %s"
2510
2511
#: bzrlib/builtins.py:3332
2512
msgid ""
2513
"Write the contents of a file as of a given revision to standard output."
2514
msgstr ""
2515
"Вывести содержимое файла из определённой ревизии на стандартный вывод."
2516
2517
#: bzrlib/builtins.py:3334
2518
msgid "If no revision is nominated, the last revision is used."
2519
msgstr "Если ревизия не указана, используется последняя."
2520
2521
#: bzrlib/builtins.py:3336
2522
msgid ""
2523
"Note: Take care to redirect standard output when using this command on a\n"
2524
"binary file."
2525
msgstr ""
2526
"Замечание: Не забывайте перенаправлять стандартный вывод при использовании\n"
2527
"этой команды на двоичном файле."
2528
2529
#: bzrlib/builtins.py:3342
2530
msgid "The path name in the old tree."
2531
msgstr "Имя пути в старом дереве."
2532
2533
#: bzrlib/builtins.py:3343
2534
msgid "Apply content filters to display the convenience form."
2535
msgstr "Применить фильтры содержимого для отображения в удобной форме."
2536
2537
#: bzrlib/builtins.py:3354
2538
msgid "bzr cat --revision takes exactly one revision specifier"
2539
msgstr "bzr cat --revision принимает ровно один спецификатор ревизии"
2540
2541
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2542
msgid "{0!r} is not present in revision {1}"
2543
msgstr "{0!r} не представлен в ревизии {1}"
2544
2545
#: bzrlib/builtins.py:3414
2546
msgid "Commit changes into a new revision."
2547
msgstr "Закрепить изменения в новой ревизии."
2548
2549
#: bzrlib/builtins.py:3416
2550
msgid ""
2551
"An explanatory message needs to be given for each commit. This is\n"
2552
"often done by using the --message option (getting the message from the\n"
2553
"command line) or by using the --file option (getting the message from\n"
2554
"a file). If neither of these options is given, an editor is opened for\n"
2555
"the user to enter the message. To see the changed files in the\n"
2556
"boilerplate text loaded into the editor, use the --show-diff option."
2557
msgstr ""
2558
2559
#: bzrlib/builtins.py:3423
2560
msgid ""
2561
"By default, the entire tree is committed and the person doing the\n"
2562
"commit is assumed to be the author. These defaults can be overridden\n"
2563
"as explained below."
2564
msgstr ""
2565
"По умолчанию, закрепляется всё дерево и закрепляющий считается автором.\n"
2566
"Эти умолчания могут быть перезаписаны, как объяснено ниже."
2567
2568
#: bzrlib/builtins.py:3427
2569
msgid ":Selective commits:"
2570
msgstr ":Выборочные закрепления:"
2571
2572
#: bzrlib/builtins.py:3429
2573
msgid ""
2574
" If selected files are specified, only changes to those files are\n"
2575
" committed. If a directory is specified then the directory and\n"
2576
" everything within it is committed."
2577
msgstr ""
2578
" Если указаны файлы, закрепить только изменения в этих файлах.\n"
2579
" Если указана директория, то закрепляется директория и всё её\n"
2580
" содержимое."
2581
2582
#: bzrlib/builtins.py:3433
2583
msgid ""
2584
" When excludes are given, they take precedence over selected files.\n"
2585
" For example, to commit only changes within foo, but not changes\n"
2586
" within foo/bar::"
2587
msgstr ""
2588
" Когда даны исключения, они имеют приоритет над выбранными файлами.\n"
2589
" Например, чтобы закрепить изменения внутри foo, но не изменения\n"
2590
" в foo/bar::"
2591
2592
#: bzrlib/builtins.py:3437
2593
msgid " bzr commit foo -x foo/bar"
2594
msgstr " bzr commit foo -x foo/bar"
2595
2596
#: bzrlib/builtins.py:3439
2597
msgid " A selective commit after a merge is not yet supported."
2598
msgstr " Выборочные закрепления после слияния пока не поддерживаются."
2599
2600
#: bzrlib/builtins.py:3441
2601
msgid ":Custom authors:"
2602
msgstr ":Выбор автора:"
2603
2604
#: bzrlib/builtins.py:3443
2605
msgid ""
2606
" If the author of the change is not the same person as the committer,\n"
2607
" you can specify the author's name using the --author option. The\n"
2608
" name should be in the same format as a committer-id, e.g.\n"
2609
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2610
" the change you can specify the option multiple times, once for each\n"
2611
" author."
2612
msgstr ""
2613
" Если автор изменения не тот же самый человек, что и закрепляющий,\n"
2614
" вы можете указать имя автора, используя опцию --author. Имя должно\n"
2615
" быть в том же формате, что и committer-id, например\n"
2616
" \"John Doe <jdoe@example.com>\". Если в изменении участвовал более,\n"
2617
" чем один автор, вы можете указать эту опцию несколько раз."
2618
2619
#: bzrlib/builtins.py:3450
2620
msgid ":Checks:"
2621
msgstr ":Проверки:"
2622
2623
#: bzrlib/builtins.py:3452
2624
msgid ""
2625
" A common mistake is to forget to add a new file or directory before\n"
2626
" running the commit command. The --strict option checks for unknown\n"
2627
" files and aborts the commit if any are found. More advanced pre-commit\n"
2628
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2629
" for details."
2630
msgstr ""
2631
" Распространённой ошибкой является забыть добавить новый файл перед\n"
2632
" запуском команды commit. Опция --strict прерывает закрепление, если\n"
2633
" присутствуют неизвестные файлы. Более продвинутые проверки могут\n"
2634
" быть реализованы определением обработчиков. Подробности можно найти,\n"
2635
" выполнив команду ``bzr help hooks''."
2636
2637
#: bzrlib/builtins.py:3458
2638
msgid ":Things to note:"
2639
msgstr ":На заметку:"
2640
2641
#: bzrlib/builtins.py:3460
2642
msgid ""
2643
" If you accidentially commit the wrong changes or make a spelling\n"
2644
" mistake in the commit message say, you can use the uncommit command\n"
2645
" to undo it. See ``bzr help uncommit`` for details."
2646
msgstr ""
2647
" Если вы случайно закрепили неверные изменения или допустили орфо-\n"
2648
" графическую ошибку в сообщении, вы можете использовать команду\n"
2649
" uncommit, чтобы отменить последнее закрепление. Подробности смотрите\n"
2650
" в «bzr help uncommit»."
2651
2652
#: bzrlib/builtins.py:3464
2653
msgid ""
2654
" Hooks can also be configured to run after a commit. This allows you\n"
2655
" to trigger updates to external systems like bug trackers. The --fixes\n"
2656
" option can be used to record the association between a revision and\n"
2657
" one or more bugs. See ``bzr help bugs`` for details."
2658
msgstr ""
2659
2660
#: bzrlib/builtins.py:3474
2661
msgid "Do not consider changes made to a given path."
2662
msgstr "Не рассматривать изменения, сделанные в заданном пути."
2663
2664
#: bzrlib/builtins.py:3477
2665
msgid "Description of the new revision."
2666
msgstr "Описание новой ревизии."
2667
2668
#: bzrlib/builtins.py:3480
2669
msgid "Commit even if nothing has changed."
2670
msgstr "Закрепить, даже если ничего не изменилось."
2671
2672
#: bzrlib/builtins.py:3484
2673
msgid "Take commit message from this file."
2674
msgstr "Взять сообщение о закреплении из этого файла."
2675
2676
#: bzrlib/builtins.py:3486
2677
msgid "Refuse to commit if there are unknown files in the working tree."
2678
msgstr ""
2679
"Отказываться закреплять, если в рабочем дереве есть неизвестные файлы."
2680
2681
#: bzrlib/builtins.py:3489
2682
msgid ""
2683
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2684
"08:00:00 +0100'."
2685
msgstr ""
2686
"Вручную установить время закрепления, используя формат даты закрепления, "
2687
"напр. '2009-10-10 08:00:00 +0100'."
2688
2689
#: bzrlib/builtins.py:3492
2690
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2691
msgstr ""
2692
"Отметить ошибку, как исправленную в этой ревизии (см. «bzr help bugs»)."
2693
2694
#: bzrlib/builtins.py:3495
2695
msgid "Set the author's name, if it's different from the committer."
2696
msgstr "Установить имя автора, если оно отличается от имени закрепляющего."
2697
2698
#: bzrlib/builtins.py:3498
2699
msgid ""
2700
"Perform a local commit in a bound branch. Local commits are not pushed to "
2701
"the master branch until a normal commit is performed."
2702
msgstr ""
2703
"Совершить локальное закрепление в связанную ветвь. Локальные закрепления не "
2704
"выгружаются в основную ветвь до тех пор, пока не совершено нормальное "
2705
"закрепление."
2706
2707
#: bzrlib/builtins.py:3504
2708
msgid ""
2709
"When no message is supplied, show the diff along with the status summary in "
2710
"the message editor."
2711
msgstr ""
2712
"Если не указано сообщение, показывать изменения формате diff вместе с "
2713
"обзором состояния в редакторе сообщения."
2714
2715
#: bzrlib/builtins.py:3507
2716
msgid ""
2717
"When committing to a foreign version control system do not push data that "
2718
"can not be natively represented."
2719
msgstr ""
2720
"При закреплении в иной системе контроля версий, не выгружать данные, которые "
2721
"нельзя в ней представить."
2722
2723
#: bzrlib/builtins.py:3525
2724
#, python-format
2725
msgid ""
2726
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2727
"default bug tracker using the `bugtracker` option.\n"
2728
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2729
msgstr ""
2730
"Для ошибки %s не указан трекер. Используйте форму 'tracker:id' или укажите "
2731
"систему трекинга ошибок по умолчанию, используя опцию `bugtracker`.\n"
2732
"Больше информации об этом можно узнать, выполнив «bzr help bugs». "
2733
"Закрепление отклонено."
2734
2735
#: bzrlib/builtins.py:3534
2736
#, python-format
2737
msgid ""
2738
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2739
"for more information on this feature.\n"
2740
"Commit refused."
2741
msgstr ""
2742
"Некорректная ошибка %s. Должна быть в формате 'tracker:id'. Больше "
2743
"информации об этом можно узнать, выполнив «bzr help bugs».\n"
2744
"Закрепление отклонено."
2745
2746
#: bzrlib/builtins.py:3543
2747
#, python-format
2748
msgid "Unrecognized bug %s. Commit refused."
2749
msgstr "Ошибка %s не распознана. Закрепление отклонено."
2750
2751
#: bzrlib/builtins.py:3546
2752
#, python-format
2753
msgid ""
2754
"%s\n"
2755
"Commit refused."
2756
msgstr ""
2757
"%s\n"
2758
"Закрепление отклонено."
2759
2760
#: bzrlib/builtins.py:3570
2761
msgid "Could not parse --commit-time: "
2762
msgstr "Не удалось разобрать --commit-time: "
2763
2764
#: bzrlib/builtins.py:3610
2765
msgid "please specify either --message or --file"
2766
msgstr "укажите либо --message, либо --file"
2767
2768
#: bzrlib/builtins.py:3639
2769
msgid "please specify a commit message with either --message or --file"
2770
msgstr "укажите сообщение о закреплении, используя --message либо --file"
2771
2772
#: bzrlib/builtins.py:3642
2773
msgid ""
2774
"Empty commit message specified. Please specify a commit message with either -"
2775
"-message or --file or leave a blank message with --message \"\"."
2776
msgstr ""
2777
"Указано пустое сообщение о закреплении. Пожалуйста, укажите сообщение опцией "
2778
"--message либо --file или оставьте пустым, указав --message \"\"."
2779
2780
#: bzrlib/builtins.py:3662
2781
msgid ""
2782
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2783
"-unchanged to force an empty commit."
2784
msgstr ""
2785
"Нет изменений для закрепления. Добавьте файлы, которые вы хотите закрепить, "
2786
"командой 'bzr add', или используйте --unchanged, чтобы принудительно сделать "
2787
"пустое закрепление."
2788
2789
#: bzrlib/builtins.py:3666
2790
msgid ""
2791
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2792
"resolve FILE\" to resolve."
2793
msgstr ""
2794
"В рабочем дереве обнаружены конфликты. Выполните «bzr conflicts», чтобы "
2795
"вывести список конфликтов и «bzr resolve ФАЙЛ» для исправления."
2796
2797
#: bzrlib/builtins.py:3670
2798
msgid "Commit refused because there are unknown files in the working tree."
2799
msgstr "Закрепление отклонено, поскольку в рабочем дереве неизвестные файлы."
2800
2801
#: bzrlib/builtins.py:3673
2802
msgid ""
2803
"\n"
2804
"To commit to master branch, run update and then commit.\n"
2805
"You can also pass --local to commit to continue working disconnected."
2806
msgstr ""
2807
2808
#: bzrlib/builtins.py:3681
2809
msgid ""
2810
"Validate working tree structure, branch consistency and repository history."
2811
msgstr ""
2812
2813
#: bzrlib/builtins.py:3683
2814
msgid ""
2815
"This command checks various invariants about branch and repository storage\n"
2816
"to detect data corruption or bzr bugs."
2817
msgstr ""
2818
2819
#: bzrlib/builtins.py:3686
2820
msgid ""
2821
"The working tree and branch checks will only give output if a problem is\n"
2822
"detected. The output fields of the repository check are:"
2823
msgstr ""
2824
"Проверки рабочего дерева и ветви выведут что-либо только в случае\n"
2825
"обнаружения проблемы. Поля вывода проверки репозитория следующие:"
2826
2827
#: bzrlib/builtins.py:3689
2828
msgid ""
2829
"revisions\n"
2830
" This is just the number of revisions checked. It doesn't\n"
2831
" indicate a problem."
2832
msgstr ""
2833
"ревизии\n"
2834
" Это просто число проверенных ревизий. Оно не указывает\n"
2835
" на проблему."
2836
2837
#: bzrlib/builtins.py:3693
2838
msgid ""
2839
"versionedfiles\n"
2840
" This is just the number of versionedfiles checked. It\n"
2841
" doesn't indicate a problem."
2842
msgstr ""
2843
"версифицированные файлы\n"
2844
" Это просто число проверенных файлов под контролем системы\n"
2845
" версий. Оно не указывает на проблему."
2846
2847
#: bzrlib/builtins.py:3697
2848
msgid ""
2849
"unreferenced ancestors\n"
2850
" Texts that are ancestors of other texts, but\n"
2851
" are not properly referenced by the revision ancestry. This is a\n"
2852
" subtle problem that Bazaar can work around."
2853
msgstr ""
2854
"предки без ссылок\n"
2855
" Тексты, являющиеся предками других текстов, но не имеющие\n"
2856
" корректных ссылок в истории ревизии. Это небольшая\n"
2857
" проблема, с которой Bazaar может разобраться."
2858
2859
#: bzrlib/builtins.py:3702
2860
msgid ""
2861
"unique file texts\n"
2862
" This is the total number of unique file contents\n"
2863
" seen in the checked revisions. It does not indicate a problem."
2864
msgstr ""
2865
"уникальные тексты файлов\n"
2866
" Это общее число уникального содержимого файлов, встреченного\n"
2867
" в проверенных ревизиях. Оно не указывает на проблему."
2868
2869
#: bzrlib/builtins.py:3706
2870
msgid ""
2871
"repeated file texts\n"
2872
" This is the total number of repeated texts seen\n"
2873
" in the checked revisions. Texts can be repeated when their file\n"
2874
" entries are modified, but the file contents are not. It does not\n"
2875
" indicate a problem."
2876
msgstr ""
2877
"повторяемые тексты файлов\n"
2878
" Это общее число повторяемых текстов, встреченных\n"
2879
" в проверенных ревизиях. Тексты могут повторяться, если записи\n"
2880
" файлов изменились, но их содержимое осталось прежним. Оно не\n"
2881
" указывает на проблему."
2882
2883
#: bzrlib/builtins.py:3712
2884
msgid ""
2885
"If no restrictions are specified, all Bazaar data that is found at the "
2886
"given\n"
2887
"location will be checked."
2888
msgstr ""
2889
2890
#: bzrlib/builtins.py:3717
2891
msgid " Check the tree and branch at 'foo'::"
2892
msgstr " Проверить рабочее дерево и ветвь в 'foo'::"
2893
2894
#: bzrlib/builtins.py:3719
2895
msgid " bzr check --tree --branch foo"
2896
msgstr " bzr check --tree --branch foo"
2897
2898
#: bzrlib/builtins.py:3721
2899
msgid " Check only the repository at 'bar'::"
2900
msgstr " Проверить только репозиторий в 'bar'::"
2901
2902
#: bzrlib/builtins.py:3723
2903
msgid " bzr check --repo bar"
2904
msgstr " bzr check --repo bar"
2905
2906
#: bzrlib/builtins.py:3725
2907
msgid " Check everything at 'baz'::"
2908
msgstr " Проверить всё в 'baz'::"
2909
2910
#: bzrlib/builtins.py:3727
2911
msgid " bzr check baz"
2912
msgstr " bzr check baz"
2913
2914
#: bzrlib/builtins.py:3733
2915
msgid "Check the branch related to the current directory."
2916
msgstr "Проверить ветвь, относящуюся к текущей директории."
2917
2918
#: bzrlib/builtins.py:3735
2919
msgid "Check the repository related to the current directory."
2920
msgstr "Проверить репозиторий, относящийся к текущей директории."
2921
2922
#: bzrlib/builtins.py:3737
2923
msgid "Check the working tree related to the current directory."
2924
msgstr "Проверить рабочее дерево, относящееся к текущей директории."
2925
2926
#: bzrlib/builtins.py:3751
2927
msgid "Upgrade a repository, branch or working tree to a newer format."
2928
msgstr "Обновить репозиторий, ветвь или рабочее дерево до нового формата."
2929
2930
#: bzrlib/builtins.py:3753
2931
msgid ""
2932
"When the default format has changed after a major new release of\n"
2933
"Bazaar, you may be informed during certain operations that you\n"
2934
"should upgrade. Upgrading to a newer format may improve performance\n"
2935
"or make new features available. It may however limit interoperability\n"
2936
"with older repositories or with older versions of Bazaar."
2937
msgstr ""
2938
2939
#: bzrlib/builtins.py:3759
2940
msgid ""
2941
"If you wish to upgrade to a particular format rather than the\n"
2942
"current default, that can be specified using the --format option.\n"
2943
"As a consequence, you can use the upgrade command this way to\n"
2944
"\"downgrade\" to an earlier format, though some conversions are\n"
2945
"a one way process (e.g. changing from the 1.x default to the\n"
2946
"2.x default) so downgrading is not always possible."
2947
msgstr ""
2948
2949
#: bzrlib/builtins.py:3766
2950
msgid ""
2951
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2952
"process (where # is a number). By default, this is left there on\n"
2953
"completion. If the conversion fails, delete the new .bzr directory\n"
2954
"and rename this one back in its place. Use the --clean option to ask\n"
2955
"for the backup.bzr directory to be removed on successful conversion.\n"
2956
"Alternatively, you can delete it by hand if everything looks good\n"
2957
"afterwards."
2958
msgstr ""
2959
2960
#: bzrlib/builtins.py:3774
2961
msgid ""
2962
"If the location given is a shared repository, dependent branches\n"
2963
"are also converted provided the repository converts successfully.\n"
2964
"If the conversion of a branch fails, remaining branches are still\n"
2965
"tried."
2966
msgstr ""
2967
2968
#: bzrlib/builtins.py:3779
2969
msgid ""
2970
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2971
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2972
msgstr ""
2973
2974
#: bzrlib/builtins.py:3787
2975
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2976
msgstr ""
2977
"Обновить до определённого формата. Подробности см. в «bzr help formats»."
2978
2979
#: bzrlib/builtins.py:3791
2980
msgid "Branch format"
2981
msgstr "Формат ветви"
2982
2983
#: bzrlib/builtins.py:3793
2984
msgid "Remove the backup.bzr directory if successful."
2985
msgstr "Удалить директорию backup.bzr при успешном завершении."
2986
2987
#: bzrlib/builtins.py:3795
2988
msgid "Show what would be done, but don't actually do anything."
2989
msgstr ""
2990
2991
#: bzrlib/builtins.py:3810
2992
msgid "Show or set bzr user id."
2993
msgstr ""
2994
2995
#: bzrlib/builtins.py:3812
2996
msgid ""
2997
":Examples:\n"
2998
" Show the email of the current user::"
2999
msgstr ""
3000
":Примеры:\n"
3001
" Показать email текущего пользователя::"
3002
3003
#: bzrlib/builtins.py:3815
3004
msgid " bzr whoami --email"
3005
msgstr " bzr whoami --email"
3006
3007
#: bzrlib/builtins.py:3817
3008
msgid " Set the current user::"
3009
msgstr " Установить текущего пользователя::"
3010
3011
#: bzrlib/builtins.py:3819
3012
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
3013
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
3014
3015
#: bzrlib/builtins.py:3823
3016
msgid "Display email address only."
3017
msgstr "Показать только адрес email."
3018
3019
#: bzrlib/builtins.py:3825
3020
msgid "Set identity for the current branch instead of globally."
3021
msgstr ""
3022
3023
#: bzrlib/builtins.py:3851
3024
msgid "--email can only be used to display existing identity"
3025
msgstr ""
3026
3027
#: bzrlib/builtins.py:3873
3028
msgid "Print or set the branch nickname."
3029
msgstr "Вывести или установить имя ветви."
3030
3031
#: bzrlib/builtins.py:3875
3032
msgid ""
3033
"If unset, the tree root directory name is used as the nickname.\n"
3034
"To print the current nickname, execute with no argument."
3035
msgstr ""
3036
3037
#: bzrlib/builtins.py:3878
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:3898
3044
msgid "Set/unset and display aliases."
3045
msgstr "Установить, удалить или отобразить псевдонимы."
3046
3047
#: bzrlib/builtins.py:3900
3048
msgid ""
3049
":Examples:\n"
3050
" Show the current aliases::"
3051
msgstr ""
3052
":Примеры:\n"
3053
" Показать текущие псевдонимы::"
3054
3055
#: bzrlib/builtins.py:3903
3056
msgid " bzr alias"
3057
msgstr " bzr alias"
3058
3059
#: bzrlib/builtins.py:3905
3060
msgid " Show the alias specified for 'll'::"
3061
msgstr " Показать псевдоним для 'll'::"
3062
3063
#: bzrlib/builtins.py:3907
3064
msgid " bzr alias ll"
3065
msgstr " bzr alias ll"
3066
3067
#: bzrlib/builtins.py:3909
3068
msgid " Set an alias for 'll'::"
3069
msgstr " Установить псевдоним для 'll'::"
3070
3071
#: bzrlib/builtins.py:3911
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:3913
3076
msgid " To remove an alias for 'll'::"
3077
msgstr " Удалить псевдоним для 'll'::"
3078
3079
#: bzrlib/builtins.py:3915
3080
msgid " bzr alias --remove ll"
3081
msgstr " bzr alias --remove ll"
3082
3083
#: bzrlib/builtins.py:3920
3084
msgid "Remove the alias."
3085
msgstr "Удалить псевдоним."
3086
3087
#: bzrlib/builtins.py:3938
3088
msgid "bzr alias --remove expects an alias to remove."
3089
msgstr "bzr alias --remove требуется псевдоним для удаления."
3090
3091
#: bzrlib/builtins.py:4119
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:4136
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:4183
3105
msgid "Show version of bzr."
3106
msgstr "Вывести версию bzr."
3107
3108
#: bzrlib/builtins.py:4187
3109
msgid "Print just the version number."
3110
msgstr "Вывести только номер версии."
3111
3112
#: bzrlib/builtins.py:4206
3113
msgid "It sure does!\n"
3114
msgstr "Да, он крут!\n"
3115
3116
#: bzrlib/builtins.py:4230
3117
#, python-format
3118
msgid "merge base is revision %s\n"
3119
msgstr ""
3120
3121
#: bzrlib/builtins.py:4234
3122
msgid "Perform a three-way merge."
3123
msgstr ""
3124
3125
#: bzrlib/builtins.py:4236
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:4244
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:4248
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:4251
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:4259
3161
msgid "Revision numbers are always relative to the source branch."
3162
msgstr ""
3163
3164
#: bzrlib/builtins.py:4261 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:4266
3173
msgid ""
3174
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3175
msgstr ""
3176
3177
#: bzrlib/builtins.py:4268
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:4273
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:4277
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:4283
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:4287
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:4290
3215
msgid ""
3216
":Examples:\n"
3217
" To merge all new revisions from bzr.dev::"
3218
msgstr ""
3219
3220
#: bzrlib/builtins.py:4293
3221
msgid " bzr merge ../bzr.dev"
3222
msgstr ""
3223
3224
#: bzrlib/builtins.py:4295
3225
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3226
msgstr ""
3227
3228
#: bzrlib/builtins.py:4297
3229
msgid " bzr merge -r 82 ../bzr.dev"
3230
msgstr ""
3231
3232
#: bzrlib/builtins.py:4299
3233
msgid " To merge the changes introduced by 82, without previous changes::"
3234
msgstr ""
3235
3236
#: bzrlib/builtins.py:4301
3237
msgid " bzr merge -r 81..82 ../bzr.dev"
3238
msgstr ""
3239
3240
#: bzrlib/builtins.py:4303
3241
msgid " To apply a merge directive contained in /tmp/merge::"
3242
msgstr ""
3243
3244
#: bzrlib/builtins.py:4305
3245
msgid " bzr merge /tmp/merge"
3246
msgstr ""
3247
3248
#: bzrlib/builtins.py:4307
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:4310
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:4322
3262
msgid "Merge even if the destination tree has uncommitted changes."
3263
msgstr ""
3264
3265
#: bzrlib/builtins.py:4328
3266
msgid ""
3267
"Apply uncommitted changes from a working copy, instead of branch changes."
3268
msgstr ""
3269
3270
#: bzrlib/builtins.py:4330
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:4335
3278
msgid ""
3279
"Branch to merge into, rather than the one containing the working directory."
3280
msgstr ""
3281
3282
#: bzrlib/builtins.py:4337
3283
msgid "Instead of merging, show a diff of the merge."
3284
msgstr ""
3285
3286
#: bzrlib/builtins.py:4339
3287
msgid "Select changes interactively."
3288
msgstr ""
3289
3290
#: bzrlib/builtins.py:4361
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:4388
3297
msgid "Cannot use --uncommitted with bundles or merge directives."
3298
msgstr ""
3299
3300
#: bzrlib/builtins.py:4399
3301
msgid "Cannot use --uncommitted and --revision at the same time."
3302
msgstr ""
3303
3304
#: bzrlib/builtins.py:4419
3305
msgid "merger: "
3306
msgstr ""
3307
3308
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
3309
msgid "Nothing to do."
3310
msgstr ""
3311
3312
#: bzrlib/builtins.py:4425
3313
msgid "Cannot pull individual files"
3314
msgstr ""
3315
3316
#: bzrlib/builtins.py:4433
3317
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3318
msgstr ""
3319
3320
#: bzrlib/builtins.py:4491
3321
#, python-format
3322
msgid "Show-base is not supported for this merge type. %s"
3323
msgstr ""
3324
3325
#: bzrlib/builtins.py:4500
3326
#, python-format
3327
msgid "Conflict reduction is not supported for merge type %s."
3328
msgstr ""
3329
3330
#: bzrlib/builtins.py:4504
3331
msgid "Cannot do conflict reduction and show base."
3332
msgstr ""
3333
3334
#: bzrlib/builtins.py:4615
3335
msgid "No location specified or remembered"
3336
msgstr ""
3337
3338
#: bzrlib/builtins.py:4617
3339
msgid "{0} remembered {1} location {2}"
3340
msgstr ""
3341
3342
#: bzrlib/builtins.py:4623
3343
msgid "Redo a merge."
3344
msgstr ""
3345
3346
#: bzrlib/builtins.py:4625
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:4629
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:4633
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:4637
3368
msgid " bzr remerge --show-base"
3369
msgstr ""
3370
3371
#: bzrlib/builtins.py:4639
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:4642
3378
msgid " bzr remerge --merge-type weave --reprocess foobar"
3379
msgstr ""
3380
3381
#: bzrlib/builtins.py:4649
3382
msgid "Show base revision text in conflicts."
3383
msgstr ""
3384
3385
#: bzrlib/builtins.py:4661
3386
msgid ""
3387
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3388
"merges."
3389
msgstr ""
3390
3391
#: bzrlib/builtins.py:4717
3392
msgid "Revert files to a previous revision."
3393
msgstr ""
3394
3395
#: bzrlib/builtins.py:4719
3396
msgid ""
3397
"Giving a list of files will revert only those files. Otherwise, all files\n"
3398
"will be reverted. If the revision is not specified with '--revision', the\n"
3399
"last committed revision is used."
3400
msgstr ""
3401
3402
#: bzrlib/builtins.py:4723
3403
msgid ""
3404
"To remove only some changes, without reverting to a prior version, use\n"
3405
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3406
"will remove the changes introduced by the second last commit (-2), without\n"
3407
"affecting the changes introduced by the last commit (-1). To remove\n"
3408
"certain changes on a hunk-by-hunk basis, see the shelve command."
3409
msgstr ""
3410
3411
#: bzrlib/builtins.py:4729
3412
msgid ""
3413
"By default, any files that have been manually changed will be backed up\n"
3414
"first. (Files changed only by merge are not backed up.) Backup files have\n"
3415
"'.~#~' appended to their name, where # is a number."
3416
msgstr ""
3417
3418
#: bzrlib/builtins.py:4733
3419
msgid ""
3420
"When you provide files, you can use their current pathname or the pathname\n"
3421
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3422
"name. If you name a directory, all the contents of that directory will be\n"
3423
"reverted."
3424
msgstr ""
3425
3426
#: bzrlib/builtins.py:4738
3427
msgid ""
3428
"If you have newly added files since the target revision, they will be\n"
3429
"removed. If the files to be removed have been changed, backups will be\n"
3430
"created as above. Directories containing unknown files will not be\n"
3431
"deleted."
3432
msgstr ""
3433
3434
#: bzrlib/builtins.py:4743
3435
msgid ""
3436
"The working tree contains a list of revisions that have been merged but\n"
3437
"not yet committed. These revisions will be included as additional parents\n"
3438
"of the next commit. Normally, using revert clears that list as well as\n"
3439
"reverting the files. If any files are specified, revert leaves the list\n"
3440
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3441
".`` in the tree root to revert all files but keep the recorded merges,\n"
3442
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3443
"reverting any files."
3444
msgstr ""
3445
3446
#: bzrlib/builtins.py:4752
3447
msgid ""
3448
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3449
"changes from a branch in a single revision. To do this, perform the merge\n"
3450
"as desired. Then doing revert with the \"--forget-merges\" option will "
3451
"keep\n"
3452
"the content of the tree as it was, but it will clear the list of pending\n"
3453
"merges. The next commit will then contain all of the changes that are\n"
3454
"present in the other branch, but without any other parent revisions.\n"
3455
"Because this technique forgets where these changes originated, it may\n"
3456
"cause additional conflicts on later merges involving the same source and\n"
3457
"target branches."
3458
msgstr ""
3459
3460
#: bzrlib/builtins.py:4766
3461
msgid "Do not save backups of reverted files."
3462
msgstr ""
3463
3464
#: bzrlib/builtins.py:4768
3465
msgid "Remove pending merge marker, without changing any files."
3466
msgstr ""
3467
3468
#: bzrlib/builtins.py:4799
3469
msgid ""
3470
"Show help on a command or other topic.\n"
3471
" "
3472
msgstr ""
3473
3474
#: bzrlib/builtins.py:4804
3475
msgid "Show help on all commands."
3476
msgstr ""
3477
3478
#: bzrlib/builtins.py:4833
3479
msgid "Show unmerged/unpulled revisions between two branches."
3480
msgstr ""
3481
3482
#: bzrlib/builtins.py:4835
3483
msgid "OTHER_BRANCH may be local or remote."
3484
msgstr ""
3485
3486
#: bzrlib/builtins.py:4837
3487
msgid ""
3488
"To filter on a range of revisions, you can use the command -r begin..end\n"
3489
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3490
"also valid.\n"
3491
" \n"
3492
":Exit values:\n"
3493
" 1 - some missing revisions\n"
3494
" 0 - no missing revisions"
3495
msgstr ""
3496
3497
#: bzrlib/builtins.py:4847
3498
msgid ""
3499
" Determine the missing revisions between this and the branch at the\n"
3500
" remembered pull location::"
3501
msgstr ""
3502
3503
#: bzrlib/builtins.py:4850
3504
msgid " bzr missing"
3505
msgstr ""
3506
3507
#: bzrlib/builtins.py:4852
3508
msgid " Determine the missing revisions between this and another branch::"
3509
msgstr ""
3510
3511
#: bzrlib/builtins.py:4854
3512
msgid " bzr missing http://server/branch"
3513
msgstr ""
3514
3515
#: bzrlib/builtins.py:4856
3516
msgid ""
3517
" Determine the missing revisions up to a specific revision on the other\n"
3518
" branch::"
3519
msgstr ""
3520
3521
#: bzrlib/builtins.py:4859
3522
msgid " bzr missing -r ..-10"
3523
msgstr ""
3524
3525
#: bzrlib/builtins.py:4861
3526
msgid ""
3527
" Determine the missing revisions up to a specific revision on this\n"
3528
" branch::"
3529
msgstr ""
3530
3531
#: bzrlib/builtins.py:4864
3532
msgid " bzr missing --my-revision ..-10"
3533
msgstr ""
3534
3535
#: bzrlib/builtins.py:4871
3536
msgid "Reverse the order of revisions."
3537
msgstr ""
3538
3539
#: bzrlib/builtins.py:4873
3540
msgid "Display changes in the local branch only."
3541
msgstr ""
3542
3543
#: bzrlib/builtins.py:4874
3544
msgid "Same as --mine-only."
3545
msgstr ""
3546
3547
#: bzrlib/builtins.py:4876
3548
msgid "Display changes in the remote branch only."
3549
msgstr ""
3550
3551
#: bzrlib/builtins.py:4877
3552
msgid "Same as --theirs-only."
3553
msgstr ""
3554
3555
#: bzrlib/builtins.py:4882
3556
msgid ""
3557
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3558
"details."
3559
msgstr ""
3560
3561
#: bzrlib/builtins.py:4886
3562
msgid ""
3563
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3564
"details."
3565
msgstr ""
3566
3567
#: bzrlib/builtins.py:4889
3568
msgid "Show all revisions in addition to the mainline ones."
3569
msgstr ""
3570
3571
#: bzrlib/builtins.py:4943
3572
msgid "No peer location known or specified."
3573
msgstr ""
3574
3575
#: bzrlib/builtins.py:4947
3576
msgid "Using saved parent location: {0}\n"
3577
msgstr ""
3578
3579
#: bzrlib/builtins.py:4980
3580
#, python-format
3581
msgid "You have %d extra revision:\n"
3582
msgid_plural "You have %d extra revisions:\n"
3583
msgstr[0] ""
3584
msgstr[1] ""
3585
3586
#: bzrlib/builtins.py:4996
3587
#, python-format
3588
msgid "You are missing %d revision:\n"
3589
msgid_plural "You are missing %d revisions:\n"
3590
msgstr[0] ""
3591
msgstr[1] ""
3592
3593
#: bzrlib/builtins.py:5008
3594
msgid "This branch has no new revisions.\n"
3595
msgstr ""
3596
3597
#: bzrlib/builtins.py:5011
3598
msgid "Other branch has no new revisions.\n"
3599
msgstr ""
3600
3601
#: bzrlib/builtins.py:5016
3602
msgid "Branches are up to date.\n"
3603
msgstr ""
3604
3605
#: bzrlib/builtins.py:5027
3606
msgid "Compress the data within a repository."
3607
msgstr ""
3608
3609
#: bzrlib/builtins.py:5029
3610
msgid ""
3611
"This operation compresses the data within a bazaar repository. As\n"
3612
"bazaar supports automatic packing of repository, this operation is\n"
3613
"normally not required to be done manually."
3614
msgstr ""
3615
3616
#: bzrlib/builtins.py:5033
3617
msgid ""
3618
"During the pack operation, bazaar takes a backup of existing repository\n"
3619
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3620
"automatically when it is safe to do so. To save disk space by removing\n"
3621
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3622
"used."
3623
msgstr ""
3624
3625
#: bzrlib/builtins.py:5039
3626
msgid ""
3627
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3628
"during or immediately after repacking, you may be left with a state\n"
3629
"where the deletion has been written to disk but the new packs have not\n"
3630
"been. In this case the repository may be unusable."
3631
msgstr ""
3632
3633
#: bzrlib/builtins.py:5048
3634
msgid "Delete obsolete packs to save disk space."
3635
msgstr ""
3636
3637
#: bzrlib/builtins.py:5062
3638
msgid "List the installed plugins."
3639
msgstr ""
3640
3641
#: bzrlib/builtins.py:5064
3642
msgid ""
3643
"This command displays the list of installed plugins including\n"
3644
"version of plugin and a short description of each."
3645
msgstr ""
3646
3647
#: bzrlib/builtins.py:5067
3648
msgid "--verbose shows the path where each plugin is located."
3649
msgstr ""
3650
3651
#: bzrlib/builtins.py:5069
3652
msgid ""
3653
"A plugin is an external component for Bazaar that extends the\n"
3654
"revision control system, by adding or replacing code in Bazaar.\n"
3655
"Plugins can do a variety of things, including overriding commands,\n"
3656
"adding new commands, providing additional network transports and\n"
3657
"customizing log output."
3658
msgstr ""
3659
3660
#: bzrlib/builtins.py:5075
3661
msgid ""
3662
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3663
"for further information on plugins including where to find them and how to\n"
3664
"install them. Instructions are also provided there on how to write new\n"
3665
"plugins using the Python programming language."
3666
msgstr ""
3667
3668
#: bzrlib/builtins.py:5091
3669
msgid "Show testament (signing-form) of a revision."
3670
msgstr ""
3671
3672
#: bzrlib/builtins.py:5094
3673
msgid "Produce long-format testament."
3674
msgstr ""
3675
3676
#: bzrlib/builtins.py:5096
3677
msgid "Produce a strict-format testament."
3678
msgstr ""
3679
3680
#: bzrlib/builtins.py:5122
3681
msgid "Show the origin of each line in a file."
3682
msgstr ""
3683
3684
#: bzrlib/builtins.py:5124
3685
msgid ""
3686
"This prints out the given file with an annotation on the left side\n"
3687
"indicating which revision, author and date introduced the change."
3688
msgstr ""
3689
3690
#: bzrlib/builtins.py:5127
3691
msgid ""
3692
"If the origin is the same for a run of consecutive lines, it is\n"
3693
"shown only at the top, unless the --all option is given."
3694
msgstr ""
3695
3696
#: bzrlib/builtins.py:5135
3697
msgid "Show annotations on all lines."
3698
msgstr ""
3699
3700
#: bzrlib/builtins.py:5136
3701
msgid "Show commit date in annotations."
3702
msgstr ""
3703
3704
#: bzrlib/builtins.py:5223
3705
msgid "Cannot sign a range of non-revision-history revisions"
3706
msgstr ""
3707
3708
#: bzrlib/builtins.py:5235
3709
msgid "Please supply either one revision, or a range."
3710
msgstr ""
3711
3712
#: bzrlib/builtins.py:5239
3713
msgid ""
3714
"Convert the current branch into a checkout of the supplied branch.\n"
3715
"If no branch is supplied, rebind to the last bound location."
3716
msgstr ""
3717
"Преобразовать текущую ветвь в рабочую копию указанной ветви.\n"
3718
"Если ветвь не указаны, перепривязать последнее расположение привязки."
3719
3720
#: bzrlib/builtins.py:5242
3721
msgid ""
3722
"Once converted into a checkout, commits must succeed on the master branch\n"
3723
"before they will be applied to the local branch."
3724
msgstr ""
3725
"После преобразования в рабочую копию, закрепления должны производиться\n"
3726
"над основной ветвью, прежде чем они могут быть применены к локальной."
3727
3728
#: bzrlib/builtins.py:5245
3729
msgid ""
3730
"Bound branches use the nickname of its master branch unless it is set\n"
3731
"locally, in which case binding will update the local nickname to be\n"
3732
"that of the master."
3733
msgstr ""
3734
3735
#: bzrlib/builtins.py:5260
3736
msgid "No location supplied. This format does not remember old locations."
3737
msgstr ""
3738
3739
#: bzrlib/builtins.py:5265
3740
msgid "Branch is already bound"
3741
msgstr ""
3742
3743
#: bzrlib/builtins.py:5267
3744
msgid "No location supplied and no previous location known"
3745
msgstr ""
3746
3747
#: bzrlib/builtins.py:5273
3748
msgid "These branches have diverged. Try merging, and then bind again."
3749
msgstr ""
3750
3751
#: bzrlib/builtins.py:5280
3752
msgid "Convert the current checkout into a regular branch."
3753
msgstr "Преобразовать текущую рабочую копию в обычную ветвь."
3754
3755
#: bzrlib/builtins.py:5282
3756
msgid ""
3757
"After unbinding, the local branch is considered independent and subsequent\n"
3758
"commits will be local only."
3759
msgstr ""
3760
3761
#: bzrlib/builtins.py:5293
3762
msgid "Local branch is not bound"
3763
msgstr ""
3764
3765
#: bzrlib/builtins.py:5297
3766
msgid "Remove the last committed revision."
3767
msgstr ""
3768
3769
#: bzrlib/builtins.py:5299
3770
msgid ""
3771
"--verbose will print out what is being removed.\n"
3772
"--dry-run will go through all the motions, but not actually\n"
3773
"remove anything."
3774
msgstr ""
3775
3776
#: bzrlib/builtins.py:5303
3777
msgid ""
3778
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3779
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3780
"branch at revision 15."
3781
msgstr ""
3782
3783
#: bzrlib/builtins.py:5307
3784
msgid ""
3785
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3786
"it may make is to restore any pending merges that were present before\n"
3787
"the commit."
3788
msgstr ""
3789
3790
#: bzrlib/builtins.py:5318
3791
msgid "Don't actually make changes."
3792
msgstr ""
3793
3794
#: bzrlib/builtins.py:5319
3795
msgid "Say yes to all questions."
3796
msgstr ""
3797
3798
#: bzrlib/builtins.py:5321
3799
msgid "Keep tags that point to removed revisions."
3800
msgstr ""
3801
3802
#: bzrlib/builtins.py:5323
3803
msgid "Only remove the commits from the local branch when in a checkout."
3804
msgstr "Удалить закрепления из локальной ветви только в рабочей копии."
3805
3806
#: bzrlib/builtins.py:5372
3807
msgid "No revisions to uncommit.\n"
3808
msgstr ""
3809
3810
#: bzrlib/builtins.py:5387
3811
msgid "Dry-run, pretending to remove the above revisions.\n"
3812
msgstr ""
3813
3814
#: bzrlib/builtins.py:5390
3815
msgid "The above revision(s) will be removed.\n"
3816
msgstr ""
3817
3818
#: bzrlib/builtins.py:5394
3819
msgid "Uncommit these revisions"
3820
msgstr ""
3821
3822
#: bzrlib/builtins.py:5397
3823
msgid "Canceled\n"
3824
msgstr ""
3825
3826
#: bzrlib/builtins.py:5404
3827
#, python-format
3828
msgid ""
3829
"You can restore the old tip by running:\n"
3830
" bzr pull . -r revid:%s\n"
3831
msgstr ""
3832
3833
#: bzrlib/builtins.py:5409
3834
msgid "Break a dead lock."
3835
msgstr ""
3836
3837
#: bzrlib/builtins.py:5411
3838
msgid ""
3839
"This command breaks a lock on a repository, branch, working directory or\n"
3840
"config file."
3841
msgstr ""
3842
3843
#: bzrlib/builtins.py:5414
3844
msgid ""
3845
"CAUTION: Locks should only be broken when you are sure that the process\n"
3846
"holding the lock has been stopped."
3847
msgstr ""
3848
3849
#: bzrlib/builtins.py:5417
3850
msgid ""
3851
"You can get information on what locks are open via the 'bzr info\n"
3852
"[location]' command."
3853
msgstr ""
3854
3855
#: bzrlib/builtins.py:5420
3856
msgid ""
3857
":Examples:\n"
3858
" bzr break-lock\n"
3859
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3860
" bzr break-lock --conf ~/.bazaar"
3861
msgstr ""
3862
3863
#: bzrlib/builtins.py:5429
3864
msgid "LOCATION is the directory where the config lock is."
3865
msgstr ""
3866
3867
#: bzrlib/builtins.py:5431
3868
msgid "Do not ask for confirmation before breaking the lock."
3869
msgstr ""
3870
3871
#: bzrlib/builtins.py:5466
3872
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3873
msgstr ""
3874
3875
#: bzrlib/builtins.py:5467
3876
msgid "Run the bzr server."
3877
msgstr ""
3878
3879
#: bzrlib/builtins.py:5473
3880
msgid "Serve on stdin/out for use from inetd or sshd."
3881
msgstr ""
3882
3883
#: bzrlib/builtins.py:5474
3884
msgid "protocol"
3885
msgstr ""
3886
3887
#: bzrlib/builtins.py:5475
3888
msgid "Protocol to serve."
3889
msgstr ""
3890
3891
#: bzrlib/builtins.py:5479
3892
msgid ""
3893
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3894
"Passing 0 as the port number will result in a dynamically allocated port. "
3895
"The default port depends on the protocol."
3896
msgstr ""
3897
3898
#: bzrlib/builtins.py:5485
3899
msgid "Serve contents of this directory."
3900
msgstr ""
3901
3902
#: bzrlib/builtins.py:5487
3903
msgid ""
3904
"By default the server is a readonly server. Supplying --allow-writes "
3905
"enables write access to the contents of the served directory and below. "
3906
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3907
"of external authentication is arranged supplying this option leads to global "
3908
"uncontrolled write access to your file system."
3909
msgstr ""
3910
3911
#: bzrlib/builtins.py:5496
3912
msgid "Override the default idle client timeout (5min)."
3913
msgstr ""
3914
3915
#: bzrlib/builtins.py:5546
3916
msgid "Combine a tree into its containing tree."
3917
msgstr ""
3918
3919
#: bzrlib/builtins.py:5548
3920
msgid "This command requires the target tree to be in a rich-root format."
3921
msgstr ""
3922
3923
#: bzrlib/builtins.py:5550
3924
msgid ""
3925
"The TREE argument should be an independent tree, inside another tree, but\n"
3926
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3927
"running \"bzr branch\" with the target inside a tree.)"
3928
msgstr ""
3929
3930
#: bzrlib/builtins.py:5554
3931
msgid ""
3932
"The result is a combined tree, with the subtree no longer an independent\n"
3933
"part. This is marked as a merge of the subtree into the containing tree,\n"
3934
"and all history is preserved."
3935
msgstr ""
3936
3937
#: bzrlib/builtins.py:5572
3938
#, python-format
3939
msgid ""
3940
"Can't join trees because %s doesn't support rich root data.\n"
3941
"You can use bzr upgrade on the repository."
3942
msgstr ""
3943
3944
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3945
msgid "Cannot join {0}. {1}"
3946
msgstr ""
3947
3948
#: bzrlib/builtins.py:5592
3949
msgid "Split a subdirectory of a tree into a separate tree."
3950
msgstr ""
3951
3952
#: bzrlib/builtins.py:5594
3953
msgid ""
3954
"This command will produce a target tree in a format that supports\n"
3955
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3956
"converted into earlier formats like 'dirstate-tags'."
3957
msgstr ""
3958
3959
#: bzrlib/builtins.py:5598
3960
msgid ""
3961
"The TREE argument should be a subdirectory of a working tree. That\n"
3962
"subdirectory will be converted into an independent tree, with its own\n"
3963
"branch. Commits in the top-level tree will not apply to the new subtree."
3964
msgstr ""
3965
3966
#: bzrlib/builtins.py:5678
3967
msgid "No submit branch specified or known"
3968
msgstr ""
3969
3970
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3971
msgid "No public branch specified or known"
3972
msgstr ""
3973
3974
#: bzrlib/builtins.py:5691
3975
msgid "bzr merge-directive takes at most two one revision identifiers"
3976
msgstr ""
3977
3978
#: bzrlib/builtins.py:5700
3979
msgid "No revisions to bundle."
3980
msgstr ""
3981
3982
#: bzrlib/builtins.py:5719
3983
msgid "Mail or create a merge-directive for submitting changes."
3984
msgstr ""
3985
3986
#: bzrlib/builtins.py:5721
3987
msgid "A merge directive provides many things needed for requesting merges:"
3988
msgstr ""
3989
3990
#: bzrlib/builtins.py:5723
3991
msgid "* A machine-readable description of the merge to perform"
3992
msgstr ""
3993
3994
#: bzrlib/builtins.py:5725
3995
msgid "* An optional patch that is a preview of the changes requested"
3996
msgstr ""
3997
3998
#: bzrlib/builtins.py:5727
3999
msgid ""
4000
"* An optional bundle of revision data, so that the changes can be applied\n"
4001
" directly from the merge directive, without retrieving data from a\n"
4002
" branch."
4003
msgstr ""
4004
4005
#: bzrlib/builtins.py:5731
4006
msgid ""
4007
"`bzr send` creates a compact data set that, when applied using bzr\n"
4008
"merge, has the same effect as merging from the source branch. "
4009
msgstr ""
4010
4011
#: bzrlib/builtins.py:5734
4012
msgid ""
4013
"By default the merge directive is self-contained and can be applied to any\n"
4014
"branch containing submit_branch in its ancestory without needing access to\n"
4015
"the source branch."
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:5738
4019
msgid ""
4020
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4021
"revisions, but only a structured request to merge from the\n"
4022
"public_location. In that case the public_branch is needed and it must be\n"
4023
"up-to-date and accessible to the recipient. The public_branch is always\n"
4024
"included if known, so that people can check it later."
4025
msgstr ""
4026
4027
#: bzrlib/builtins.py:5744
4028
msgid ""
4029
"The submit branch defaults to the parent of the source branch, but can be\n"
4030
"overridden. Both submit branch and public branch will be remembered in\n"
4031
"branch.conf the first time they are used for a particular branch. The\n"
4032
"source branch defaults to that containing the working directory, but can\n"
4033
"be changed using --from."
4034
msgstr ""
4035
4036
#: bzrlib/builtins.py:5750
4037
msgid ""
4038
"Both the submit branch and the public branch follow the usual behavior with\n"
4039
"respect to --remember: If there is no default location set, the first send\n"
4040
"will set it (use --no-remember to avoid setting it). After that, you can\n"
4041
"omit the location to use the default. To change the default, use\n"
4042
"--remember. The value will only be saved if the location can be accessed."
4043
msgstr ""
4044
4045
#: bzrlib/builtins.py:5756
4046
msgid ""
4047
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4048
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4049
"If a public location is known for the submit_branch, that location is used\n"
4050
"in the merge directive."
4051
msgstr ""
4052
4053
#: bzrlib/builtins.py:5761
4054
msgid ""
4055
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4056
"given, in which case it is sent to a file."
4057
msgstr ""
4058
4059
#: bzrlib/builtins.py:5764
4060
msgid ""
4061
"Mail is sent using your preferred mail program. This should be transparent\n"
4062
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4063
"If the preferred client can't be found (or used), your editor will be used."
4064
msgstr ""
4065
4066
#: bzrlib/builtins.py:5768
4067
msgid ""
4068
"To use a specific mail program, set the mail_client configuration option.\n"
4069
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4070
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
4071
"(MacOS X's\n"
4072
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
4073
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
4074
"add\n"
4075
"supported clients."
4076
msgstr ""
4077
4078
#: bzrlib/builtins.py:5775
4079
msgid ""
4080
"If mail is being sent, a to address is required. This can be supplied\n"
4081
"either on the commandline, by setting the submit_to configuration\n"
4082
"option in the branch itself or the child_submit_to configuration option\n"
4083
"in the submit branch."
4084
msgstr ""
4085
4086
#: bzrlib/builtins.py:5780
4087
msgid ""
4088
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4089
"and\n"
4090
"merge directive format 2. It is significantly faster and smaller than\n"
4091
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
4092
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
4093
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4094
msgstr ""
4095
4096
#: bzrlib/builtins.py:5786
4097
msgid ""
4098
"The merge directives created by bzr send may be applied using bzr merge or\n"
4099
"bzr pull by specifying a file containing a merge directive as the location."
4100
msgstr ""
4101
4102
#: bzrlib/builtins.py:5789
4103
msgid ""
4104
"bzr send makes extensive use of public locations to map local locations "
4105
"into\n"
4106
"URLs that can be used by other people. See `bzr help configuration` to\n"
4107
"set them, and use `bzr info` to display them."
4108
msgstr ""
4109
4110
#: bzrlib/builtins.py:5813
4111
msgid "Write merge directive to this file or directory; use - for stdout."
4112
msgstr ""
4113
4114
#: bzrlib/builtins.py:5817
4115
msgid ""
4116
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4117
"strict disables the check."
4118
msgstr ""
4119
4120
#: bzrlib/builtins.py:5819
4121
msgid "Mail the request to this address."
4122
msgstr ""
4123
4124
#: bzrlib/builtins.py:5823
4125
msgid "Body for the email."
4126
msgstr ""
4127
4128
#: bzrlib/builtins.py:5876
4129
msgid "Do not include a bundle in the merge directive."
4130
msgstr ""
4131
4132
#: bzrlib/builtins.py:5877
4133
msgid "Do not include a preview patch in the merge directive."
4134
msgstr ""
4135
4136
#: bzrlib/builtins.py:5880
4137
msgid "Remember submit and public branch."
4138
msgstr ""
4139
4140
#: bzrlib/builtins.py:5882
4141
msgid ""
4142
"Branch to generate the submission from, rather than the one containing the "
4143
"working directory."
4144
msgstr ""
4145
4146
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
4147
msgid "format"
4148
msgstr ""
4149
4150
#: bzrlib/builtins.py:5893
4151
msgid "Use the specified output format."
4152
msgstr ""
4153
4154
#: bzrlib/builtins.py:5915
4155
msgid "Create, remove or modify a tag naming a revision."
4156
msgstr ""
4157
4158
#: bzrlib/builtins.py:5917
4159
msgid ""
4160
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4161
"(--revision) option can be given -rtag:X, where X is any previously\n"
4162
"created tag."
4163
msgstr ""
4164
4165
#: bzrlib/builtins.py:5921
4166
msgid ""
4167
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4168
"along when you branch, push, pull or merge."
4169
msgstr ""
4170
4171
#: bzrlib/builtins.py:5924
4172
msgid ""
4173
"It is an error to give a tag name that already exists unless you pass\n"
4174
"--force, in which case the tag is moved to point to the new revision."
4175
msgstr ""
4176
4177
#: bzrlib/builtins.py:5927
4178
msgid ""
4179
"To rename a tag (change the name but keep it on the same revsion), run "
4180
"``bzr\n"
4181
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4182
msgstr ""
4183
4184
#: bzrlib/builtins.py:5930
4185
msgid ""
4186
"If no tag name is specified it will be determined through the \n"
4187
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4188
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4189
"details."
4190
msgstr ""
4191
4192
#: bzrlib/builtins.py:5940
4193
msgid "Delete this tag rather than placing it."
4194
msgstr ""
4195
4196
#: bzrlib/builtins.py:5943
4197
msgid "Branch in which to place the tag."
4198
msgstr ""
4199
4200
#: bzrlib/builtins.py:5945
4201
msgid "Replace existing tags."
4202
msgstr ""
4203
4204
#: bzrlib/builtins.py:5960
4205
msgid "No tag specified to delete."
4206
msgstr ""
4207
4208
#: bzrlib/builtins.py:5962
4209
#, python-format
4210
msgid "Deleted tag %s."
4211
msgstr ""
4212
4213
#: bzrlib/builtins.py:5976
4214
msgid "Please specify a tag name."
4215
msgstr ""
4216
4217
#: bzrlib/builtins.py:5984
4218
#, python-format
4219
msgid "Tag %s already exists for that revision."
4220
msgstr ""
4221
4222
#: bzrlib/builtins.py:5988
4223
#, python-format
4224
msgid "Created tag %s."
4225
msgstr ""
4226
4227
#: bzrlib/builtins.py:5990
4228
#, python-format
4229
msgid "Updated tag %s."
4230
msgstr ""
4231
4232
#: bzrlib/builtins.py:5994
4233
msgid "List tags."
4234
msgstr ""
4235
4236
#: bzrlib/builtins.py:5996
4237
msgid ""
4238
"This command shows a table of tag names and the revisions they reference."
4239
msgstr ""
4240
4241
#: bzrlib/builtins.py:6002
4242
msgid "Branch whose tags should be displayed."
4243
msgstr ""
4244
4245
#: bzrlib/builtins.py:6004
4246
msgid "Sort tags by different criteria."
4247
msgstr ""
4248
4249
#: bzrlib/builtins.py:6004
4250
msgid "Sorting"
4251
msgstr ""
4252
4253
#: bzrlib/builtins.py:6073
4254
msgid "Reconfigure the type of a bzr directory."
4255
msgstr ""
4256
4257
#: bzrlib/builtins.py:6075
4258
msgid "A target configuration must be specified."
4259
msgstr ""
4260
4261
#: bzrlib/builtins.py:6077
4262
msgid ""
4263
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4264
"The order of preference is\n"
4265
"1. For a lightweight checkout, the current bound location.\n"
4266
"2. For branches that used to be checkouts, the previously-bound location.\n"
4267
"3. The push location.\n"
4268
"4. The parent location.\n"
4269
"If none of these is available, --bind-to must be specified."
4270
msgstr ""
4271
4272
#: bzrlib/builtins.py:6091
4273
msgid "Tree type"
4274
msgstr ""
4275
4276
#: bzrlib/builtins.py:6092
4277
msgid "The relation between branch and tree."
4278
msgstr ""
4279
4280
#: bzrlib/builtins.py:6094
4281
msgid "Reconfigure to be an unbound branch with no working tree."
4282
msgstr ""
4283
4284
#: bzrlib/builtins.py:6095
4285
msgid "Reconfigure to be an unbound branch with a working tree."
4286
msgstr ""
4287
4288
#: bzrlib/builtins.py:6096
4289
msgid "Reconfigure to be a bound branch with a working tree."
4290
msgstr ""
4291
4292
#: bzrlib/builtins.py:6097
4293
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4294
msgstr ""
4295
4296
#: bzrlib/builtins.py:6102
4297
msgid "Repository type"
4298
msgstr ""
4299
4300
#: bzrlib/builtins.py:6103
4301
msgid "Location fo the repository."
4302
msgstr ""
4303
4304
#: bzrlib/builtins.py:6105
4305
msgid ""
4306
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4307
msgstr ""
4308
4309
#: bzrlib/builtins.py:6107
4310
msgid "Reconfigure to use a shared repository."
4311
msgstr ""
4312
4313
#: bzrlib/builtins.py:6111
4314
msgid "Trees in Repository"
4315
msgstr ""
4316
4317
#: bzrlib/builtins.py:6112
4318
msgid "Whether new branches in the repository have trees."
4319
msgstr ""
4320
4321
#: bzrlib/builtins.py:6114
4322
msgid ""
4323
"Reconfigure repository to create working trees on branches by default."
4324
msgstr ""
4325
4326
#: bzrlib/builtins.py:6116
4327
msgid ""
4328
"Reconfigure repository to not create working trees on branches by default."
4329
msgstr ""
4330
4331
#: bzrlib/builtins.py:6119
4332
msgid "Branch to bind checkout to."
4333
msgstr "Ветвь, с которой связать рабочую копию."
4334
4335
#: bzrlib/builtins.py:6121
4336
msgid "Perform reconfiguration even if local changes will be lost."
4337
msgstr ""
4338
4339
#: bzrlib/builtins.py:6124
4340
msgid "Reconfigure a branch to be stacked on another branch."
4341
msgstr ""
4342
4343
#: bzrlib/builtins.py:6128
4344
msgid ""
4345
"Reconfigure a branch to be unstacked. This may require copying substantial "
4346
"data into it."
4347
msgstr ""
4348
4349
#: bzrlib/builtins.py:6138
4350
msgid "Can't use both --stacked-on and --unstacked"
4351
msgstr ""
4352
4353
#: bzrlib/builtins.py:6152
4354
msgid "No target configuration specified"
4355
msgstr ""
4356
4357
#: bzrlib/builtins.py:6187
4358
msgid "Set the branch of a checkout and update."
4359
msgstr "Выбрать ветвь рабочей копии и обновить."
4360
4361
#: bzrlib/builtins.py:6189
4362
msgid ""
4363
"For lightweight checkouts, this changes the branch being referenced.\n"
4364
"For heavyweight checkouts, this checks that there are no local commits\n"
4365
"versus the current bound branch, then it makes the local branch a mirror\n"
4366
"of the new location and binds to it."
4367
msgstr ""
4368
4369
#: bzrlib/builtins.py:6194
4370
msgid ""
4371
"In both cases, the working tree is updated and uncommitted changes\n"
4372
"are merged. The user can commit or revert these as they desire."
4373
msgstr ""
4374
4375
#: bzrlib/builtins.py:6197
4376
msgid "Pending merges need to be committed or reverted before using switch."
4377
msgstr ""
4378
4379
#: bzrlib/builtins.py:6199
4380
msgid ""
4381
"The path to the branch to switch to can be specified relative to the parent\n"
4382
"directory of the current branch. For example, if you are currently in a\n"
4383
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4384
"/path/to/newbranch."
4385
msgstr ""
4386
4387
#: bzrlib/builtins.py:6204
4388
msgid ""
4389
"Bound branches use the nickname of its master branch unless it is set\n"
4390
"locally, in which case switching will update the local nickname to be\n"
4391
"that of the master."
4392
msgstr ""
4393
4394
#: bzrlib/builtins.py:6212
4395
msgid "Switch even if local commits will be lost."
4396
msgstr ""
4397
4398
#: bzrlib/builtins.py:6215
4399
msgid "Create the target branch from this one before switching to it."
4400
msgstr ""
4401
4402
#: bzrlib/builtins.py:6229
4403
msgid "You must supply either a revision or a location"
4404
msgstr ""
4405
4406
#: bzrlib/builtins.py:6242
4407
msgid "cannot create branch without source branch"
4408
msgstr ""
4409
4410
#: bzrlib/builtins.py:6262
4411
msgid "Manage filtered views."
4412
msgstr ""
4413
4414
#: bzrlib/builtins.py:6264
4415
msgid ""
4416
"Views provide a mask over the tree so that users can focus on\n"
4417
"a subset of a tree when doing their work. After creating a view,\n"
4418
"commands that support a list of files - status, diff, commit, etc -\n"
4419
"effectively have that list of files implicitly given each time.\n"
4420
"An explicit list of files can still be given but those files\n"
4421
"must be within the current view."
4422
msgstr ""
4423
4424
#: bzrlib/builtins.py:6271
4425
msgid ""
4426
"In most cases, a view has a short life-span: it is created to make\n"
4427
"a selected change and is deleted once that change is committed.\n"
4428
"At other times, you may wish to create one or more named views\n"
4429
"and switch between them."
4430
msgstr ""
4431
4432
#: bzrlib/builtins.py:6276
4433
msgid ""
4434
"To disable the current view without deleting it, you can switch to\n"
4435
"the pseudo view called ``off``. This can be useful when you need\n"
4436
"to see the whole tree for an operation or two (e.g. merge) but\n"
4437
"want to switch back to your view after that."
4438
msgstr ""
4439
4440
#: bzrlib/builtins.py:6281
4441
msgid ""
4442
":Examples:\n"
4443
" To define the current view::"
4444
msgstr ""
4445
4446
#: bzrlib/builtins.py:6284
4447
msgid " bzr view file1 dir1 ..."
4448
msgstr ""
4449
4450
#: bzrlib/builtins.py:6286
4451
msgid " To list the current view::"
4452
msgstr ""
4453
4454
#: bzrlib/builtins.py:6288
4455
msgid " bzr view"
4456
msgstr ""
4457
4458
#: bzrlib/builtins.py:6290
4459
msgid " To delete the current view::"
4460
msgstr ""
4461
4462
#: bzrlib/builtins.py:6292
4463
msgid " bzr view --delete"
4464
msgstr ""
4465
4466
#: bzrlib/builtins.py:6294
4467
msgid " To disable the current view without deleting it::"
4468
msgstr ""
4469
4470
#: bzrlib/builtins.py:6296
4471
msgid " bzr view --switch off"
4472
msgstr ""
4473
4474
#: bzrlib/builtins.py:6298
4475
msgid " To define a named view and switch to it::"
4476
msgstr ""
4477
4478
#: bzrlib/builtins.py:6300
4479
msgid " bzr view --name view-name file1 dir1 ..."
4480
msgstr ""
4481
4482
#: bzrlib/builtins.py:6302
4483
msgid " To list a named view::"
4484
msgstr ""
4485
4486
#: bzrlib/builtins.py:6304
4487
msgid " bzr view --name view-name"
4488
msgstr ""
4489
4490
#: bzrlib/builtins.py:6306
4491
msgid " To delete a named view::"
4492
msgstr ""
4493
4494
#: bzrlib/builtins.py:6308
4495
msgid " bzr view --name view-name --delete"
4496
msgstr ""
4497
4498
#: bzrlib/builtins.py:6310
4499
msgid " To switch to a named view::"
4500
msgstr ""
4501
4502
#: bzrlib/builtins.py:6312
4503
msgid " bzr view --switch view-name"
4504
msgstr ""
4505
4506
#: bzrlib/builtins.py:6314
4507
msgid " To list all views defined::"
4508
msgstr ""
4509
4510
#: bzrlib/builtins.py:6316
4511
msgid " bzr view --all"
4512
msgstr ""
4513
4514
#: bzrlib/builtins.py:6318
4515
msgid " To delete all views::"
4516
msgstr ""
4517
4518
#: bzrlib/builtins.py:6320
4519
msgid " bzr view --delete --all"
4520
msgstr ""
4521
4522
#: bzrlib/builtins.py:6327
4523
msgid "Apply list or delete action to all views."
4524
msgstr ""
4525
4526
#: bzrlib/builtins.py:6330
4527
msgid "Delete the view."
4528
msgstr ""
4529
4530
#: bzrlib/builtins.py:6333
4531
msgid "Name of the view to define, list or delete."
4532
msgstr ""
4533
4534
#: bzrlib/builtins.py:6337
4535
msgid "Name of the view to switch to."
4536
msgstr ""
4537
4538
#: bzrlib/builtins.py:6356
4539
msgid "Both --delete and a file list specified"
4540
msgstr ""
4541
4542
#: bzrlib/builtins.py:6359
4543
msgid "Both --delete and --switch specified"
4544
msgstr ""
4545
4546
#: bzrlib/builtins.py:6362
4547
msgid "Deleted all views.\n"
4548
msgstr ""
4549
4550
#: bzrlib/builtins.py:6364
4551
msgid "No current view to delete"
4552
msgstr ""
4553
4554
#: bzrlib/builtins.py:6367
4555
#, python-format
4556
msgid "Deleted '%s' view.\n"
4557
msgstr ""
4558
4559
#: bzrlib/builtins.py:6371
4560
msgid "Both --switch and a file list specified"
4561
msgstr ""
4562
4563
#: bzrlib/builtins.py:6374
4564
msgid "Both --switch and --all specified"
4565
msgstr ""
4566
4567
#: bzrlib/builtins.py:6377
4568
msgid "No current view to disable"
4569
msgstr ""
4570
4571
#: bzrlib/builtins.py:6379
4572
#, python-format
4573
msgid "Disabled '%s' view.\n"
4574
msgstr ""
4575
4576
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4577
msgid "Using '{0}' view: {1}\n"
4578
msgstr ""
4579
4580
#: bzrlib/builtins.py:6386
4581
msgid "Views defined:\n"
4582
msgstr ""
4583
4584
#: bzrlib/builtins.py:6395
4585
msgid "No views defined.\n"
4586
msgstr ""
4587
4588
#: bzrlib/builtins.py:6402
4589
msgid "Cannot change the 'off' pseudo view"
4590
msgstr ""
4591
4592
#: bzrlib/builtins.py:6410
4593
msgid "No current view.\n"
4594
msgstr ""
4595
4596
#: bzrlib/builtins.py:6413
4597
msgid "'{0}' view is: {1}\n"
4598
msgstr ""
4599
4600
#: bzrlib/builtins.py:6433
4601
msgid " <no hooks installed>\n"
4602
msgstr ""
4603
4604
#: bzrlib/builtins.py:6437
4605
msgid "Remove a branch."
4606
msgstr ""
4607
4608
#: bzrlib/builtins.py:6439
4609
msgid ""
4610
"This will remove the branch from the specified location but \n"
4611
"will keep any working tree or repository in place."
4612
msgstr ""
4613
4614
#: bzrlib/builtins.py:6444
4615
msgid " Remove the branch at repo/trunk::"
4616
msgstr ""
4617
4618
#: bzrlib/builtins.py:6446
4619
msgid " bzr remove-branch repo/trunk"
4620
msgstr ""
4621
4622
#: bzrlib/builtins.py:6461
4623
msgid "Plaintext diff output."
4624
msgstr ""
4625
4626
#: bzrlib/builtins.py:6462
4627
msgid "Temporarily set aside some changes from the current tree."
4628
msgstr ""
4629
4630
#: bzrlib/builtins.py:6464
4631
msgid ""
4632
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4633
"ie. out of the way, until a later time when you can bring them back from\n"
4634
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4635
"your working tree, and so they aren't propagated along with your branch nor\n"
4636
"will they survive its deletion."
4637
msgstr ""
4638
4639
#: bzrlib/builtins.py:6470
4640
msgid "If shelve --list is specified, previously-shelved changes are listed."
4641
msgstr ""
4642
4643
#: bzrlib/builtins.py:6472
4644
msgid ""
4645
"Shelve is intended to help separate several sets of changes that have\n"
4646
"been inappropriately mingled. If you just want to get rid of all changes\n"
4647
"and you don't need to restore them later, use revert. If you want to\n"
4648
"shelve all text changes at once, use shelve --all."
4649
msgstr ""
4650
4651
#: bzrlib/builtins.py:6477
4652
msgid ""
4653
"If filenames are specified, only the changes to those files will be\n"
4654
"shelved. Other files will be left untouched."
4655
msgstr ""
4656
4657
#: bzrlib/builtins.py:6480
4658
msgid ""
4659
"If a revision is specified, changes since that revision will be shelved."
4660
msgstr ""
4661
4662
#: bzrlib/builtins.py:6482
4663
msgid ""
4664
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4665
"restore the most recently shelved changes."
4666
msgstr ""
4667
4668
#: bzrlib/builtins.py:6485
4669
msgid ""
4670
"For complicated changes, it is possible to edit the changes in a separate\n"
4671
"editor program to decide what the file remaining in the working copy\n"
4672
"should look like. To do this, add the configuration option"
4673
msgstr ""
4674
4675
#: bzrlib/builtins.py:6489
4676
msgid " change_editor = PROGRAM @new_path @old_path"
4677
msgstr ""
4678
4679
#: bzrlib/builtins.py:6491
4680
msgid ""
4681
"where @new_path is replaced with the path of the new version of the \n"
4682
"file and @old_path is replaced with the path of the old version of \n"
4683
"the file. The PROGRAM should save the new file with the desired \n"
4684
"contents of the file in the working tree.\n"
4685
" "
4686
msgstr ""
4687
4688
#: bzrlib/builtins.py:6503
4689
msgid "Shelve all changes."
4690
msgstr ""
4691
4692
#: bzrlib/builtins.py:6505
4693
msgid "Method to use for writing diffs."
4694
msgstr ""
4695
4696
#: bzrlib/builtins.py:6505
4697
msgid "writer"
4698
msgstr ""
4699
4700
#: bzrlib/builtins.py:6509
4701
msgid "List shelved changes."
4702
msgstr ""
4703
4704
#: bzrlib/builtins.py:6511
4705
msgid "Destroy removed changes instead of shelving them."
4706
msgstr ""
4707
4708
#: bzrlib/builtins.py:6540
4709
msgid "No shelved changes."
4710
msgstr ""
4711
4712
#: bzrlib/builtins.py:6551
4713
msgid "Restore shelved changes."
4714
msgstr ""
4715
4716
#: bzrlib/builtins.py:6553
4717
msgid ""
4718
"By default, the most recently shelved changes are restored. However if you\n"
4719
"specify a shelf by id those changes will be restored instead. This works\n"
4720
"best when the changes don't depend on each other."
4721
msgstr ""
4722
4723
#: bzrlib/builtins.py:6562
4724
msgid "The action to perform."
4725
msgstr ""
4726
4727
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4728
msgid "action"
4729
msgstr ""
4730
4731
#: bzrlib/builtins.py:6564
4732
msgid "Apply changes and remove from the shelf."
4733
msgstr ""
4734
4735
#: bzrlib/builtins.py:6565
4736
msgid "Show changes, but do not apply or remove them."
4737
msgstr ""
4738
4739
#: bzrlib/builtins.py:6566
4740
msgid ""
4741
"Instead of unshelving the changes, show the diff that would result from "
4742
"unshelving."
4743
msgstr ""
4744
4745
#: bzrlib/builtins.py:6568
4746
msgid "Delete changes without applying them."
4747
msgstr ""
4748
4749
#: bzrlib/builtins.py:6569
4750
msgid "Apply changes but don't delete them."
4751
msgstr ""
4752
4753
#: bzrlib/builtins.py:6584
4754
msgid "Remove unwanted files from working tree."
4755
msgstr ""
4756
4757
#: bzrlib/builtins.py:6586
4758
msgid ""
4759
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4760
"files are never deleted."
4761
msgstr ""
4762
4763
#: bzrlib/builtins.py:6589
4764
msgid ""
4765
"Another class is 'detritus', which includes files emitted by bzr during\n"
4766
"normal operations and selftests. (The value of these files decreases with\n"
4767
"time.)"
4768
msgstr ""
4769
4770
#: bzrlib/builtins.py:6593
4771
msgid ""
4772
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4773
"flags are respected, and may be combined."
4774
msgstr ""
4775
4776
#: bzrlib/builtins.py:6596
4777
msgid "To check what clean-tree will do, use --dry-run."
4778
msgstr ""
4779
4780
#: bzrlib/builtins.py:6599
4781
msgid "Delete all ignored files."
4782
msgstr ""
4783
4784
#: bzrlib/builtins.py:6600
4785
msgid ""
4786
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4787
msgstr ""
4788
4789
#: bzrlib/builtins.py:6603
4790
msgid "Delete files unknown to bzr (default)."
4791
msgstr ""
4792
4793
#: bzrlib/builtins.py:6604
4794
msgid "Show files to delete instead of deleting them."
4795
msgstr ""
4796
4797
#: bzrlib/builtins.py:6606
4798
msgid "Do not prompt before deleting."
4799
msgstr ""
4800
4801
#: bzrlib/bundle/__init__.py:59
4802
msgid "A directory cannot be a bundle"
4803
msgstr ""
4804
4805
#: bzrlib/bundle/apply_bundle.py:40
4806
msgid "Install revisions"
4807
msgstr ""
4808
4809
#: bzrlib/bundle/commands.py:64
4810
msgid "--verbose requires a merge directive"
4811
msgstr ""
4812
4813
#: bzrlib/bundle/commands.py:67
4814
msgid "Bundle format not supported"
4815
msgstr ""
4816
4817
#: bzrlib/bundle/commands.py:77
4818
msgid "Records\n"
4819
msgstr ""
4820
4821
#: bzrlib/bundle/commands.py:81
4822
msgid "{0}: {1} ({2} multiparent)\n"
4823
msgstr ""
4824
4825
#: bzrlib/bundle/commands.py:83
4826
#, python-format
4827
msgid "unique files: %d\n"
4828
msgstr ""
4829
4830
#: bzrlib/bundle/commands.py:92
4831
msgid "Revisions\n"
4832
msgstr ""
4833
4834
#: bzrlib/bundle/commands.py:93
4835
#, python-format
4836
msgid "nicks: %s\n"
4837
msgstr ""
4838
4839
#: bzrlib/bundle/commands.py:95
4840
#, python-format
4841
msgid ""
4842
"committers: \n"
4843
"%s\n"
4844
msgstr ""
4845
4846
#: bzrlib/bundle/commands.py:103
4847
msgid "Decoded contents\n"
4848
msgstr ""
4849
4850
#: bzrlib/bundle/serializer/v4.py:327
4851
#, python-format
4852
msgid "Bundling %d revision."
4853
msgid_plural "Bundling %d revisions."
4854
msgstr[0] ""
4855
msgstr[1] ""
4856
4857
#: bzrlib/bzrdir.py:490
4858
msgid ""
4859
"making backup of {0}\n"
4860
" to {1}"
4861
msgstr ""
4862
4863
#: bzrlib/bzrdir.py:513
4864
msgid "renamed {0} to {1}"
4865
msgstr ""
4866
4867
#: bzrlib/bzrdir.py:1652
4868
#, python-format
4869
msgid ""
4870
"Source repository format does not support stacking, using format:\n"
4871
" %s"
4872
msgstr ""
4873
4874
#: bzrlib/bzrdir.py:1672
4875
#, python-format
4876
msgid ""
4877
"Source branch format does not support stacking, using format:\n"
4878
" %s"
4879
msgstr ""
4880
4881
#: bzrlib/bzrdir.py:1818
4882
msgid "starting repository conversion"
4883
msgstr ""
4884
4885
#: bzrlib/bzrdir.py:2039
4886
msgid "Using default stacking branch {0} at {1}"
4887
msgstr ""
4888
4889
#: bzrlib/check.py:108
4890
msgid "check"
4891
msgstr ""
4892
4893
#: bzrlib/check.py:110
4894
msgid "checking revisions"
4895
msgstr ""
4896
4897
#: bzrlib/check.py:112
4898
msgid "checking commit contents"
4899
msgstr ""
4900
4901
#: bzrlib/check.py:114
4902
msgid "checking file graphs"
4903
msgstr ""
4904
4905
#: bzrlib/check.py:118
4906
msgid "checking branches and trees"
4907
msgstr ""
4908
4909
#: bzrlib/check.py:205
4910
msgid "checked repository {0} format {1}"
4911
msgstr ""
4912
4913
#: bzrlib/check.py:208
4914
#, python-format
4915
msgid "%6d revisions"
4916
msgstr ""
4917
4918
#: bzrlib/check.py:209
4919
#, python-format
4920
msgid "%6d file-ids"
4921
msgstr ""
4922
4923
#: bzrlib/check.py:211
4924
#, python-format
4925
msgid "%6d unreferenced text versions"
4926
msgstr ""
4927
4928
#: bzrlib/check.py:215
4929
msgid "unreferenced version: {{{0}}} in {1}"
4930
msgstr ""
4931
4932
#: bzrlib/check.py:218
4933
#, python-format
4934
msgid "%6d revisions are missing inventory_sha1"
4935
msgstr ""
4936
4937
#: bzrlib/check.py:221
4938
#, python-format
4939
msgid "%6d revisions are mentioned but not present"
4940
msgstr ""
4941
4942
#: bzrlib/check.py:224
4943
#, python-format
4944
msgid "%6d ghost revisions"
4945
msgstr ""
4946
4947
#: bzrlib/check.py:229
4948
#, python-format
4949
msgid "%6d revisions missing parents in ancestry"
4950
msgstr ""
4951
4952
#: bzrlib/check.py:233
4953
#, python-format
4954
msgid " %s should be in the ancestry for:"
4955
msgstr ""
4956
4957
#: bzrlib/check.py:237
4958
#, python-format
4959
msgid "%6d inconsistent parents"
4960
msgstr ""
4961
4962
#: bzrlib/check.py:241
4963
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4964
msgstr ""
4965
4966
#: bzrlib/check.py:247
4967
#, python-format
4968
msgid "%6d revisions have incorrect parents in the revision index"
4969
msgstr ""
4970
4971
#: bzrlib/check.py:253
4972
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4973
msgstr ""
4974
4975
#: bzrlib/check.py:267
4976
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4977
msgstr ""
4978
4979
#: bzrlib/check.py:296
4980
msgid ""
4981
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4982
"{{{4}}}"
4983
msgstr ""
4984
4985
#: bzrlib/check.py:354
4986
#, python-format
4987
msgid "Checking branch at '%s'."
4988
msgstr ""
4989
4990
#: bzrlib/check.py:374
4991
#, python-format
4992
msgid "Checking working tree at '%s'."
4993
msgstr ""
4994
4995
#: bzrlib/check.py:427 bzrlib/check.py:441
4996
msgid "No branch found at specified location."
4997
msgstr ""
4998
4999
#: bzrlib/check.py:429 bzrlib/check.py:439
5000
msgid "No working tree found at specified location."
5001
msgstr ""
5002
5003
#: bzrlib/check.py:432
5004
#, python-format
5005
msgid "Checking repository at '%s'."
5006
msgstr ""
5007
5008
#: bzrlib/check.py:443
5009
msgid "No repository found at specified location."
5010
msgstr ""
5011
5012
#: bzrlib/clean_tree.py:63
5013
msgid "Nothing to delete."
5014
msgstr ""
5015
5016
#: bzrlib/clean_tree.py:68
5017
msgid "Are you sure you wish to delete these"
5018
msgstr ""
5019
5020
#: bzrlib/clean_tree.py:70
5021
msgid "Canceled"
5022
msgstr ""
5023
5024
#: bzrlib/clean_tree.py:107
5025
#, python-format
5026
msgid "unable to remove %s"
5027
msgstr ""
5028
5029
#: bzrlib/clean_tree.py:111
5030
msgid "deleting paths:"
5031
msgstr ""
5032
5033
#: bzrlib/clean_tree.py:125
5034
msgid "unable to remove \"{0}\": {1}."
5035
msgstr ""
5036
5037
#: bzrlib/clean_tree.py:130
5038
msgid "No files deleted."
5039
msgstr ""
5040
5041
#: bzrlib/cmd_version_info.py:47
5042
msgid "No known version info format {0}. Supported types are: {1}"
5043
msgstr ""
5044
5045
#: bzrlib/cmd_version_info.py:52
5046
msgid "Version info in Custom template-based format."
5047
msgstr ""
5048
5049
#: bzrlib/cmd_version_info.py:52
5050
msgid "Version info in Python format."
5051
msgstr ""
5052
5053
#: bzrlib/cmd_version_info.py:52
5054
msgid "Version info in RIO (simple text) format (default)."
5055
msgstr ""
5056
5057
#: bzrlib/cmd_version_info.py:53
5058
msgid "Show version information about this tree."
5059
msgstr ""
5060
5061
#: bzrlib/cmd_version_info.py:55
5062
msgid ""
5063
"You can use this command to add information about version into\n"
5064
"source code of an application. The output can be in one of the\n"
5065
"supported formats or in a custom format based on a template."
5066
msgstr ""
5067
5068
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
5069
#: en/help_topics/configuration.txt:710
5070
msgid "For example::"
5071
msgstr ""
5072
5073
#: bzrlib/cmd_version_info.py:61
5074
msgid ""
5075
" bzr version-info --custom \\\n"
5076
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
5077
msgstr ""
5078
5079
#: bzrlib/cmd_version_info.py:64
5080
msgid ""
5081
"will produce a C header file with formatted string containing the\n"
5082
"current revision number. Other supported variables in templates are:"
5083
msgstr ""
5084
5085
#: bzrlib/cmd_version_info.py:67
5086
msgid ""
5087
" * {date} - date of the last revision\n"
5088
" * {build_date} - current date\n"
5089
" * {revno} - revision number\n"
5090
" * {revision_id} - revision id\n"
5091
" * {branch_nick} - branch nickname\n"
5092
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
5093
" otherwise 1"
5094
msgstr ""
5095
5096
#: bzrlib/cmd_version_info.py:77
5097
msgid "Select the output format."
5098
msgstr ""
5099
5100
#: bzrlib/cmd_version_info.py:81
5101
msgid "Include all possible information."
5102
msgstr ""
5103
5104
#: bzrlib/cmd_version_info.py:82
5105
msgid "Check if tree is clean."
5106
msgstr ""
5107
5108
#: bzrlib/cmd_version_info.py:84
5109
msgid "Include the revision-history."
5110
msgstr ""
5111
5112
#: bzrlib/cmd_version_info.py:86
5113
msgid "Include the last revision for each file."
5114
msgstr ""
5115
5116
#: bzrlib/cmd_version_info.py:87
5117
msgid "Template for the output."
5118
msgstr ""
5119
5120
#: bzrlib/cmd_version_info.py:101
5121
msgid "bzr version-info --revision takes exactly one revision specifier"
5122
msgstr ""
5123
5124
#: bzrlib/commands.py:229
5125
#, python-format
5126
msgid "unknown command \"%s\""
5127
msgstr "неизвестная команда «%s»"
5128
5129
#: bzrlib/commands.py:476
5130
msgid "No help for this command."
5131
msgstr "Нет справки для этой команды."
5132
5133
#: bzrlib/commands.py:489
5134
#, python-format
5135
msgid ":Purpose: %s\n"
5136
msgstr ":Назначение: %s\n"
5137
5138
#: bzrlib/commands.py:491
5139
#, python-format
5140
msgid ""
5141
":Usage:\n"
5142
"%s\n"
5143
msgstr ""
5144
":Синтаксис:\n"
5145
"%s\n"
5146
5147
#: bzrlib/commands.py:493
5148
#, python-format
5149
msgid ":Usage: %s\n"
5150
msgstr ":Синтаксис: %s\n"
5151
5152
#: bzrlib/commands.py:512
5153
#, python-format
5154
msgid ":Options:%s"
5155
msgstr ":Опции:%s"
5156
5157
#: bzrlib/commands.py:523
5158
#, python-format
5159
msgid ""
5160
":Description:\n"
5161
" %s\n"
5162
"\n"
5163
msgstr ""
5164
":Описание:\n"
5165
" %s\n"
5166
"\n"
5167
5168
#: bzrlib/commands.py:533
5169
#, python-format
5170
msgid ""
5171
"See bzr help %s for more details and examples.\n"
5172
"\n"
5173
msgstr ""
5174
"Смотрите bzr help %s, чтобы получить подробности и примеры.\n"
5175
"\n"
5176
5177
#: bzrlib/commands.py:538
5178
msgid ":Aliases: "
5179
msgstr ":Псевдонимы: "
5180
5181
#: bzrlib/commands.py:542
5182
#, python-format
5183
msgid ":From: plugin \"%s\"\n"
5184
msgstr ":Из: модуль «%s»\n"
5185
5186
#: bzrlib/commands.py:554
5187
msgid ":doc:`{0} <{1}-help>`"
5188
msgstr ""
5189
5190
#: bzrlib/commands.py:558
5191
#, python-format
5192
msgid ":See also: %s"
5193
msgstr ":Смотрите также: %s"
5194
5195
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
5196
msgid "Only ASCII permitted in option names"
5197
msgstr "В именах опций разрешены только символы ASCII"
5198
5199
#: bzrlib/commands.py:841 bzrlib/commands.py:849
5200
msgid "command {0!r} needs one or more {1}"
5201
msgstr "команде {0!r} требуется один или больше {1}"
5202
5203
#: bzrlib/commands.py:858
5204
msgid "command {0!r} requires argument {1}"
5205
msgstr "команде {0!r} требуется аргумент {1}"
5206
5207
#: bzrlib/commands.py:865
5208
msgid "extra argument to command {0}: {1}"
5209
msgstr "лишний аргумент к команде {0}: {1}"
5210
5211
#: bzrlib/commands.py:962
5212
#, python-format
5213
msgid "Profile data written to \"%s\"."
5214
msgstr "Данные профиля записаны в «%s»."
5215
5216
#: bzrlib/commit.py:117 bzrlib/commit.py:740
5217
msgid "added"
5218
msgstr "добавлены"
5219
5220
#: bzrlib/commit.py:117 bzrlib/commit.py:748
5221
msgid "modified"
5222
msgstr "изменены"
5223
5224
#: bzrlib/commit.py:131
5225
#, python-format
5226
msgid "Committing%s"
5227
msgstr "Закрепление%s"
5228
5229
#: bzrlib/commit.py:134
5230
#, python-format
5231
msgid "Committed revision %d."
5232
msgstr "Закреплена ревизия %d."
5233
5234
#: bzrlib/commit.py:143
5235
#, python-format
5236
msgid "deleted %s"
5237
msgstr "удалён %s"
5238
5239
#: bzrlib/commit.py:146
5240
#, python-format
5241
msgid "missing %s"
5242
msgstr "отсутствует %s"
5243
5244
#: bzrlib/commit.py:511
5245
msgid ""
5246
"Conflicting tags in bound branch:\n"
5247
"{0}"
5248
msgstr ""
5249
5250
#: bzrlib/commit.py:742
5251
msgid "renamed"
5252
msgstr "переименованы"
5253
5254
#: bzrlib/commit.py:977
5255
msgid "unchanged"
5256
msgstr "без изменений"
5257
5258
#: bzrlib/commit.py:999
5259
msgid "{0} [{1}] - Stage"
5260
msgstr ""
5261
5262
#: bzrlib/commit.py:1002
5263
#, python-format
5264
msgid "%s - Stage"
5265
msgstr ""
5266
5267
#: bzrlib/commit_signature_commands.py:36
5268
msgid "Sign all commits by a given committer."
5269
msgstr ""
5270
5271
#: bzrlib/commit_signature_commands.py:38
5272
msgid ""
5273
"If location is not specified the local tree is used.\n"
5274
"If committer is not specified the default committer is used."
5275
msgstr ""
5276
5277
#: bzrlib/commit_signature_commands.py:41
5278
msgid "This does not sign commits that already have signatures."
5279
msgstr ""
5280
5281
#: bzrlib/commit_signature_commands.py:49
5282
msgid ""
5283
"Don't actually sign anything, just print the revisions that would be signed."
5284
msgstr ""
5285
5286
#: bzrlib/commit_signature_commands.py:103
5287
msgid "Verify all commit signatures."
5288
msgstr ""
5289
5290
#: bzrlib/commit_signature_commands.py:105
5291
msgid ""
5292
"Verifies that all commits in the branch are signed by known GnuPG keys."
5293
msgstr ""
5294
5295
#: bzrlib/commit_signature_commands.py:110
5296
msgid ""
5297
"Comma separated list of GPG key patterns which are acceptable for "
5298
"verification."
5299
msgstr ""
5300
5301
#: bzrlib/commit_signature_commands.py:147
5302
msgid "Cannot verify a range of non-revision-history revisions"
5303
msgstr ""
5304
5305
#: bzrlib/commit_signature_commands.py:168
5306
msgid "All commits signed with verifiable keys"
5307
msgstr ""
5308
5309
#: bzrlib/config.py:475
5310
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5311
msgstr ""
5312
5313
#: bzrlib/config.py:2485
5314
msgid "{0} is not an SI unit."
5315
msgstr ""
5316
5317
#: bzrlib/config.py:2949
5318
msgid ""
5319
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5320
"will be saved."
5321
msgstr ""
5322
5323
#: bzrlib/config.py:3093
5324
#, python-format
5325
msgid "Invalid '%s', should be of the form 'name=value'"
5326
msgstr ""
5327
5328
#: bzrlib/config.py:3962
5329
msgid "Display, set or remove a configuration option."
5330
msgstr ""
5331
5332
#: bzrlib/config.py:3964
5333
msgid "Display the active value for a given option."
5334
msgstr ""
5335
5336
#: bzrlib/config.py:3966
5337
msgid ""
5338
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5339
"matching options are displayed mentioning their scope. The active value\n"
5340
"that bzr will take into account is the first one displayed for each option."
5341
msgstr ""
5342
5343
#: bzrlib/config.py:3970
5344
msgid "If no NAME is given, --all .* is implied."
5345
msgstr ""
5346
5347
#: bzrlib/config.py:3972
5348
msgid ""
5349
"Setting a value is achieved by using name=value without spaces. The value\n"
5350
"is set in the most relevant scope and can be checked by displaying the\n"
5351
"option again."
5352
msgstr ""
5353
5354
#: bzrlib/config.py:3984
5355
msgid "Reduce the scope to the specified configuration file."
5356
msgstr ""
5357
5358
#: bzrlib/config.py:3988
5359
msgid "Display all the defined values for the matching options."
5360
msgstr ""
5361
5362
#: bzrlib/config.py:3990
5363
msgid "Remove the option from the configuration file."
5364
msgstr ""
5365
5366
#: bzrlib/conflicts.py:50
5367
msgid "List files with conflicts."
5368
msgstr ""
5369
5370
#: bzrlib/conflicts.py:57
5371
msgid ""
5372
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5373
"is supplied, the pathnames of files with text conflicts are listed,\n"
5374
"instead. (This is useful for editing all files with text conflicts.)"
5375
msgstr ""
5376
5377
#: bzrlib/conflicts.py:61
5378
msgid "Use bzr resolve when you have fixed a problem."
5379
msgstr ""
5380
5381
#: bzrlib/conflicts.py:66
5382
msgid "List paths of files with text conflicts."
5383
msgstr ""
5384
5385
#: bzrlib/conflicts.py:85
5386
msgid "Marks the conflict as resolved."
5387
msgstr ""
5388
5389
#: bzrlib/conflicts.py:88
5390
msgid "Resolve the conflict preserving the version in the working tree."
5391
msgstr ""
5392
5393
#: bzrlib/conflicts.py:91
5394
msgid "Resolve the conflict taking the merged version into account."
5395
msgstr ""
5396
5397
#: bzrlib/conflicts.py:98
5398
msgid "How to resolve the conflict."
5399
msgstr ""
5400
5401
#: bzrlib/conflicts.py:104
5402
msgid "Mark a conflict as resolved."
5403
msgstr ""
5404
5405
#: bzrlib/conflicts.py:111
5406
msgid ""
5407
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5408
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5409
"as\n"
5410
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5411
msgstr ""
5412
5413
#: bzrlib/conflicts.py:119
5414
msgid "Resolve all conflicts in this tree."
5415
msgstr ""
5416
5417
#: bzrlib/conflicts.py:126
5418
msgid "If --all is specified, no FILE may be provided"
5419
msgstr ""
5420
5421
#: bzrlib/conflicts.py:151
5422
#, python-format
5423
msgid "%d conflict auto-resolved."
5424
msgid_plural "%d conflicts auto-resolved."
5425
msgstr[0] ""
5426
msgstr[1] ""
5427
5428
#: bzrlib/conflicts.py:154
5429
msgid "Remaining conflicts:"
5430
msgstr ""
5431
5432
#: bzrlib/conflicts.py:159
5433
msgid "All conflicts resolved."
5434
msgstr ""
5435
5436
#: bzrlib/conflicts.py:168
5437
msgid "{0} conflict resolved, {1} remaining"
5438
msgid_plural "{0} conflicts resolved, {1} remaining"
5439
msgstr[0] ""
5440
msgstr[1] ""
5441
5442
#: bzrlib/controldir.py:710
5443
msgid "{0} is{1} redirected to {2}"
5444
msgstr ""
5445
5446
#: bzrlib/diff.py:399
5447
#, python-format
5448
msgid "*** Ignoring files outside view. View is %s"
5449
msgstr ""
5450
5451
#: bzrlib/errors.py:157
5452
msgid "The tree builder is already building a tree."
5453
msgstr ""
5454
5455
#: bzrlib/errors.py:178
5456
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5457
msgstr ""
5458
5459
#: bzrlib/errors.py:197
5460
msgid ""
5461
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5462
"versions \"%(minimum)s\" to \"%(current)s\"."
5463
msgstr ""
5464
5465
#: bzrlib/errors.py:209
5466
msgid "The transport '%(transport)s' is only accessible within this process."
5467
msgstr ""
5468
5469
#: bzrlib/errors.py:227
5470
msgid "Invalid revision number %(revno)s"
5471
msgstr ""
5472
5473
#: bzrlib/errors.py:236
5474
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5475
msgstr ""
5476
5477
#: bzrlib/errors.py:247
5478
msgid "Reserved revision-id {%(revision_id)s}"
5479
msgstr ""
5480
5481
#: bzrlib/errors.py:261
5482
msgid "There is no public branch set for \"%(branch_url)s\"."
5483
msgstr ""
5484
5485
#: bzrlib/errors.py:271
5486
msgid ""
5487
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5488
"obtain a list of topics."
5489
msgstr ""
5490
5491
#: bzrlib/errors.py:280
5492
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:290
5496
msgid ""
5497
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5498
msgstr ""
5499
5500
#: bzrlib/errors.py:299
5501
msgid "The branch '%(branch)s' is not stacked."
5502
msgstr ""
5503
5504
#: bzrlib/errors.py:313
5505
msgid "No WorkingTree exists for \"%(base)s\"."
5506
msgstr ""
5507
5508
#: bzrlib/errors.py:322
5509
msgid "Not currently building a tree."
5510
msgstr ""
5511
5512
#: bzrlib/errors.py:327
5513
msgid "%(url)s is not a local path."
5514
msgstr ""
5515
5516
#: bzrlib/errors.py:355
5517
msgid "%(not_locked)r is not write locked but needs to be."
5518
msgstr ""
5519
5520
#: bzrlib/errors.py:363
5521
msgid "Error in command line options"
5522
msgstr ""
5523
5524
#: bzrlib/errors.py:368
5525
msgid "%(value)s is not an index of type %(_type)s."
5526
msgstr ""
5527
5528
#: bzrlib/errors.py:378
5529
msgid "Error in data for index %(value)s."
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:387
5533
msgid "The key '%(key)s' is already in index '%(index)s'."
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:397
5537
msgid "The key '%(key)s' is not a valid key."
5538
msgstr ""
5539
5540
#: bzrlib/errors.py:406
5541
msgid "Could not parse options for index %(value)s."
5542
msgstr ""
5543
5544
#: bzrlib/errors.py:415
5545
msgid "The value '%(value)s' is not a valid value."
5546
msgstr ""
5547
5548
#: bzrlib/errors.py:424
5549
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5550
msgstr ""
5551
5552
#: bzrlib/errors.py:443
5553
msgid "Generic path error: %(path)r%(extra)s)"
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:456
5557
msgid "No such file: %(path)r%(extra)s"
5558
msgstr ""
5559
5560
#: bzrlib/errors.py:461
5561
msgid "File exists: %(path)r%(extra)s"
5562
msgstr ""
5563
5564
#: bzrlib/errors.py:467
5565
msgid ""
5566
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5567
"after to tell bzr about a rename that has already happened)%(extra)s"
5568
msgstr ""
5569
5570
#: bzrlib/errors.py:483
5571
msgid "\"%(path)s\" is not a directory %(extra)s"
5572
msgstr ""
5573
5574
#: bzrlib/errors.py:488
5575
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5576
msgstr ""
5577
5578
#: bzrlib/errors.py:493
5579
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5580
msgstr ""
5581
5582
#: bzrlib/errors.py:498
5583
msgid "Hard-linking \"%(path)s\" is not supported"
5584
msgstr ""
5585
5586
#: bzrlib/errors.py:513
5587
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5588
msgstr ""
5589
5590
#: bzrlib/errors.py:518
5591
msgid "Permission denied: \"%(path)s\"%(extra)s"
5592
msgstr ""
5593
5594
#: bzrlib/errors.py:523
5595
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5596
msgstr ""
5597
5598
#: bzrlib/errors.py:528
5599
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5600
msgstr ""
5601
5602
#: bzrlib/errors.py:539
5603
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5604
msgstr ""
5605
5606
#: bzrlib/errors.py:561
5607
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5608
msgstr ""
5609
5610
#: bzrlib/errors.py:571
5611
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5612
msgstr ""
5613
5614
#: bzrlib/errors.py:579
5615
msgid ""
5616
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5617
"upgrade the branch to permit branch stacking."
5618
msgstr ""
5619
5620
#: bzrlib/errors.py:590
5621
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5622
msgstr ""
5623
5624
#: bzrlib/errors.py:600
5625
msgid ""
5626
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5627
"need to upgrade the repository to permit branch stacking."
5628
msgstr ""
5629
5630
#: bzrlib/errors.py:611
5631
msgid "Error reading from %(path)r."
5632
msgstr ""
5633
5634
#: bzrlib/errors.py:630
5635
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5636
msgstr ""
5637
5638
#: bzrlib/errors.py:646
5639
msgid "Path \"%(path)s\" is not unicode normalized"
5640
msgstr ""
5641
5642
#: bzrlib/errors.py:654
5643
msgid "Not a branch: \"%(path)s\"%(detail)s."
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:696
5647
msgid "No submit branch available for branch \"%(path)s\""
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:705
5651
msgid "A control directory already exists: \"%(path)s\"."
5652
msgstr ""
5653
5654
#: bzrlib/errors.py:710
5655
msgid "Already a branch: \"%(path)s\"."
5656
msgstr ""
5657
5658
#: bzrlib/errors.py:715
5659
msgid "Parent branch already exists: \"%(path)s\"."
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:721
5663
msgid ""
5664
"Directory contains a branch, but no working tree (use bzr checkout if you "
5665
"wish to build a working tree): \"%(path)s\""
5666
msgstr ""
5667
5668
#: bzrlib/errors.py:726
5669
msgid ""
5670
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5671
msgstr ""
5672
5673
#: bzrlib/errors.py:736
5674
msgid ""
5675
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5676
msgstr ""
5677
5678
#: bzrlib/errors.py:746
5679
msgid "No repository present: \"%(path)s\""
5680
msgstr ""
5681
5682
#: bzrlib/errors.py:753
5683
msgid ""
5684
"Unsupported branch format: %(format)s\n"
5685
"Please run 'bzr upgrade'"
5686
msgstr ""
5687
5688
#: bzrlib/errors.py:759
5689
msgid "Unknown %(kind)s format: %(format)r"
5690
msgstr ""
5691
5692
#: bzrlib/errors.py:768
5693
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5694
msgstr ""
5695
5696
#: bzrlib/errors.py:778
5697
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:793
5701
msgid ""
5702
"%(target)s\n"
5703
"is not compatible with\n"
5704
"%(source)s\n"
5705
"%(details)s"
5706
msgstr ""
5707
5708
#: bzrlib/errors.py:809
5709
msgid "Revision is not compatible with %(repo_format)s"
5710
msgstr ""
5711
5712
#: bzrlib/errors.py:819
5713
msgid "%(context_info)s%(path)s is already versioned."
5714
msgstr ""
5715
5716
#: bzrlib/errors.py:840
5717
msgid "%(context_info)s%(path)s is not versioned."
5718
msgstr ""
5719
5720
#: bzrlib/errors.py:861
5721
msgid "Path(s) are not versioned: %(paths_as_string)s"
5722
msgstr ""
5723
5724
#: bzrlib/errors.py:872
5725
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5726
msgstr ""
5727
5728
#: bzrlib/errors.py:891
5729
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5730
msgstr ""
5731
5732
#: bzrlib/errors.py:899
5733
msgid ""
5734
"Filename %(filename)r is not valid in your current filesystem encoding "
5735
"%(fs_encoding)s"
5736
msgstr ""
5737
5738
#: bzrlib/errors.py:910
5739
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5740
msgstr ""
5741
5742
#: bzrlib/errors.py:928
5743
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5744
msgstr ""
5745
5746
#: bzrlib/errors.py:967
5747
msgid "Cannot lock %(lock)s: %(why)s"
5748
msgstr ""
5749
5750
#: bzrlib/errors.py:977
5751
msgid ""
5752
"A transaction related operation was attempted after the transaction finished."
5753
msgstr ""
5754
5755
#: bzrlib/errors.py:1004
5756
msgid "Cannot lock: transport is read only: %(transport)s"
5757
msgstr ""
5758
5759
#: bzrlib/errors.py:1012
5760
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5761
msgstr ""
5762
5763
#: bzrlib/errors.py:1023
5764
msgid ""
5765
"Lock was broken while still open: %(lock)s - check storage consistency!"
5766
msgstr ""
5767
5768
#: bzrlib/errors.py:1034
5769
msgid ""
5770
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5771
"%(holder)r, wanted to break %(target)r"
5772
msgstr ""
5773
5774
#: bzrlib/errors.py:1046
5775
msgid ""
5776
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5777
"Use 'bzr break-lock' to clear it"
5778
msgstr ""
5779
5780
#: bzrlib/errors.py:1059
5781
msgid "Lock not held: %(lock)s"
5782
msgstr ""
5783
5784
#: bzrlib/errors.py:1088
5785
msgid "No changes to commit"
5786
msgstr ""
5787
5788
#: bzrlib/errors.py:1093
5789
msgid ""
5790
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5791
msgstr ""
5792
5793
#: bzrlib/errors.py:1103
5794
msgid ""
5795
"Excluding paths during commit is not supported by repository at "
5796
"%(repository)r."
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:1112
5800
msgid ""
5801
"The specified commit message contains characters unsupported by the current "
5802
"encoding."
5803
msgstr ""
5804
5805
#: bzrlib/errors.py:1118
5806
msgid "Upgrade URL cannot work with readonly URLs."
5807
msgstr ""
5808
5809
#: bzrlib/errors.py:1123
5810
msgid "The branch format %(format)s is already at the most recent format."
5811
msgstr ""
5812
5813
#: bzrlib/errors.py:1146
5814
msgid "Option --change does not accept revision ranges"
5815
msgstr ""
5816
5817
#: bzrlib/errors.py:1151
5818
msgid "No namespace registered for string: %(spec)r"
5819
msgstr ""
5820
5821
#: bzrlib/errors.py:1170
5822
msgid ""
5823
"Requested revision: '%(spec)s' does not exist in branch: "
5824
"%(branch_url)s%(extra)s"
5825
msgstr ""
5826
5827
#: bzrlib/errors.py:1184
5828
msgid ""
5829
"Operation denied because it would change the main history, which is not "
5830
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5831
msgstr ""
5832
5833
#: bzrlib/errors.py:1195
5834
msgid ""
5835
"These branches have diverged. Use the missing command to see how.\n"
5836
"Use the merge command to reconcile them."
5837
msgstr ""
5838
5839
#: bzrlib/errors.py:1215
5840
msgid ""
5841
"Branches have no common ancestor, and no merge base revision was specified."
5842
msgstr ""
5843
5844
#: bzrlib/errors.py:1221
5845
msgid ""
5846
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5847
msgstr ""
5848
5849
#: bzrlib/errors.py:1227
5850
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5851
msgstr ""
5852
5853
#: bzrlib/errors.py:1236
5854
msgid ""
5855
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5856
msgstr ""
5857
5858
#: bzrlib/errors.py:1245
5859
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5860
msgstr ""
5861
5862
#: bzrlib/errors.py:1254
5863
msgid "Branch %(branch)s has no commits."
5864
msgstr ""
5865
5866
#: bzrlib/errors.py:1272
5867
msgid ""
5868
"Bound branch %(branch)s is out of date with master branch "
5869
"%(master)s.%(extra_help)s"
5870
msgstr ""
5871
5872
#: bzrlib/errors.py:1284
5873
msgid ""
5874
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5875
"bound to %(remote)s."
5876
msgstr ""
5877
5878
#: bzrlib/errors.py:1296
5879
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5880
msgstr ""
5881
5882
#: bzrlib/errors.py:1305
5883
msgid ""
5884
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5885
"%(error)s"
5886
msgstr ""
5887
5888
#: bzrlib/errors.py:1317
5889
msgid "Error in processing weave: %(msg)s"
5890
msgstr ""
5891
5892
#: bzrlib/errors.py:1326
5893
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5894
msgstr ""
5895
5896
#: bzrlib/errors.py:1337
5897
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5898
msgstr ""
5899
5900
#: bzrlib/errors.py:1347
5901
msgid "Weave invariant violated: %(what)s"
5902
msgstr ""
5903
5904
#: bzrlib/errors.py:1356
5905
msgid "Parents are mismatched between two revisions. %(msg)s"
5906
msgstr ""
5907
5908
#: bzrlib/errors.py:1378
5909
msgid ""
5910
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5911
"%(weave_b)s"
5912
msgstr ""
5913
5914
#: bzrlib/errors.py:1390
5915
msgid "Versioned file error"
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:1395
5919
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5920
msgstr ""
5921
5922
#: bzrlib/errors.py:1405
5923
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5924
msgstr ""
5925
5926
#: bzrlib/errors.py:1415
5927
msgid "Text did not match its checksum: %(msg)s"
5928
msgstr ""
5929
5930
#: bzrlib/errors.py:1541
5931
msgid "Export format %(format)r not supported"
5932
msgstr ""
5933
5934
#: bzrlib/errors.py:1550
5935
msgid "Transport error: %(msg)s %(orig_error)s"
5936
msgstr ""
5937
5938
#: bzrlib/errors.py:1576
5939
msgid "Generic bzr smart protocol error: %(details)s"
5940
msgstr ""
5941
5942
#: bzrlib/errors.py:1584
5943
msgid "Received bad protocol version marker: %(marker)r"
5944
msgstr ""
5945
5946
#: bzrlib/errors.py:1616
5947
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5948
msgstr ""
5949
5950
#: bzrlib/errors.py:1621
5951
msgid "Connection error: %(msg)s %(orig_error)s"
5952
msgstr ""
5953
5954
#: bzrlib/errors.py:1626
5955
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5956
msgstr ""
5957
5958
#: bzrlib/errors.py:1647
5959
msgid "Connection closed: %(msg)s %(orig_error)s"
5960
msgstr ""
5961
5962
#: bzrlib/errors.py:1652
5963
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5964
msgstr ""
5965
5966
#: bzrlib/errors.py:1657
5967
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5968
msgstr ""
5969
5970
#: bzrlib/errors.py:1667
5971
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:1682
5975
msgid "Certificate error: %(error)s"
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:1690
5979
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:1704
5983
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5984
msgstr ""
5985
5986
#: bzrlib/errors.py:1712
5987
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:1721
5991
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5992
msgstr ""
5993
5994
#: bzrlib/errors.py:1735
5995
msgid "Too many redirections"
5996
msgstr ""
5997
5998
#: bzrlib/errors.py:1740
5999
msgid "Working tree has conflicts."
6000
msgstr ""
6001
6002
#: bzrlib/errors.py:1744
6003
msgid "Config file %(filename)s is not UTF-8 encoded\n"
6004
msgstr ""
6005
6006
#: bzrlib/errors.py:1753
6007
msgid ""
6008
"Error(s) parsing config file %(filename)s:\n"
6009
"%(errors)s"
6010
msgstr ""
6011
6012
#: bzrlib/errors.py:1763
6013
msgid ""
6014
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6015
"See ``bzr help %(name)s``"
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:1773
6019
msgid "%(username)r does not seem to contain a reasonable email address"
6020
msgstr ""
6021
6022
#: bzrlib/errors.py:1782
6023
msgid "Failed to GPG sign data with command \"%(command_line)s\""
6024
msgstr ""
6025
6026
#: bzrlib/errors.py:1790
6027
msgid "Failed to verify GPG signature data with error \"%(error)s\""
6028
msgstr "Не удалось верифицировать подпись GPG с ошибкой «%(error)s»"
6029
6030
#: bzrlib/errors.py:1798
6031
msgid "Unable to import library \"%(library)s\": %(error)s"
6032
msgstr "Не удалось импортировать библиотеку «%(library)s»: %(error)s"
6033
6034
#: bzrlib/errors.py:1806
6035
msgid "python-gpgme is not installed, it is needed to verify signatures"
6036
msgstr "python-gpgme не устонвлен, он нужен для верификации подписей"
6037
6038
#: bzrlib/errors.py:1814
6039
msgid ""
6040
"The working tree for %(basedir)s has changed since the last commit, but "
6041
"weave merge requires that it be unchanged"
6042
msgstr ""
6043
"Рабочее дерево для %(basedir)s изменилось с последнего закрепления, но merge "
6044
"требует, чтобы оно не содержало изменений"
6045
6046
#: bzrlib/errors.py:1824
6047
msgid ""
6048
"Can't reprocess and show base, because reprocessing obscures the "
6049
"relationship of conflicting lines to the base"
6050
msgstr ""
6051
6052
#: bzrlib/errors.py:1830
6053
msgid "Cycle in graph %(graph)r"
6054
msgstr "Цикл в графе %(graph)r"
6055
6056
#: bzrlib/errors.py:1858
6057
msgid "File %(filename)s is not conflicted."
6058
msgstr "Файл %(filename)s не содержит конфликтов."
6059
6060
#: bzrlib/errors.py:1880
6061
msgid "No bundle was found in \"%(filename)s\"."
6062
msgstr "В файле «%(filename)s» нет пакета."
6063
6064
#: bzrlib/errors.py:1889
6065
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6066
msgstr "Не удалось обработать версию пакета %(version)s: %(msg)s"
6067
6068
#: bzrlib/errors.py:1899
6069
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6070
msgstr ""
6071
"В ветви %(base)s отсутствует ревизия %(text_revision)s файла %(file_id)s"
6072
6073
#: bzrlib/errors.py:1912
6074
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6075
msgstr ""
6076
"Идентификатор файла {%(file_id)s} уже присутствует в инвентаре как %(entry)s"
6077
6078
#: bzrlib/errors.py:1922
6079
msgid "Key %(key)s is already present in map"
6080
msgstr ""
6081
6082
#: bzrlib/errors.py:1927
6083
msgid "The prefix %(prefix)s is in the help search path twice."
6084
msgstr ""
6085
6086
#: bzrlib/errors.py:1937
6087
msgid ""
6088
"No final name for trans_id %(trans_id)r\n"
6089
"file-id: %(file_id)r\n"
6090
"root trans-id: %(root_trans_id)r\n"
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:1969
6094
msgid "Attempt to reuse a transform that has already been applied."
6095
msgstr ""
6096
6097
#: bzrlib/errors.py:1974
6098
msgid "Moving the root directory is not supported at this time"
6099
msgstr "Перемещение в корневую директорию пока не поддерживается"
6100
6101
#: bzrlib/errors.py:1979
6102
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6103
msgstr "Не удалось переименовать %(from_path)s в %(to_path)s: %(why)s"
6104
6105
#: bzrlib/errors.py:1990
6106
msgid ""
6107
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6108
msgstr ""
6109
"Не удалось переместить %(from_path)s%(operator)s "
6110
"%(to_path)s%(_has_extra)s%(extra)s"
6111
6112
#: bzrlib/errors.py:2026
6113
msgid ""
6114
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6115
msgstr ""
6116
"Не удалось переименовать %(from_path)s%(operator)s "
6117
"%(to_path)s%(_has_extra)s%(extra)s"
6118
6119
#: bzrlib/errors.py:2056
6120
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6121
msgstr ""
6122
6123
#: bzrlib/errors.py:2064
6124
msgid "Nothing to merge."
6125
msgstr "Нечего совмещать."
6126
6127
#: bzrlib/errors.py:2069
6128
msgid "Format %(format)s cannot be initialised by this version of bzr."
6129
msgstr ""
6130
6131
#: bzrlib/errors.py:2078
6132
msgid ""
6133
"Cannot convert from format %(from_format)s to format %(format)s. "
6134
"%(problem)s"
6135
msgstr ""
6136
6137
#: bzrlib/errors.py:2090
6138
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6139
msgstr ""
6140
6141
#: bzrlib/errors.py:2098
6142
msgid "%(exe_name)s could not be found on this machine"
6143
msgstr ""
6144
6145
#: bzrlib/errors.py:2106
6146
msgid "Diff is not installed on this machine: %(msg)s"
6147
msgstr ""
6148
6149
#: bzrlib/errors.py:2114
6150
msgid "Diff3 is not installed on this machine."
6151
msgstr "Diff3 не установлен на этой машине."
6152
6153
#: bzrlib/errors.py:2120
6154
msgid "The content being inserted is already present."
6155
msgstr ""
6156
6157
#: bzrlib/errors.py:2125
6158
msgid ""
6159
"This tree contains left-over files from a failed operation.\n"
6160
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6161
"to\n"
6162
" keep, and delete it when you are done."
6163
msgstr ""
6164
6165
#: bzrlib/errors.py:2136
6166
msgid ""
6167
"This tree contains left-over files from a failed operation.\n"
6168
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6169
" wish to keep, and delete it when you are done."
6170
msgstr ""
6171
6172
#: bzrlib/errors.py:2146
6173
msgid ""
6174
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6175
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6176
"to\n"
6177
" keep, and delete it when you are done."
6178
msgstr ""
6179
6180
#: bzrlib/errors.py:2157
6181
msgid ""
6182
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6183
"examine %(pending_deletion)s to see if it contains any files you wish to "
6184
"keep, and delete it when you are done."
6185
msgstr ""
6186
6187
#: bzrlib/errors.py:2167
6188
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6189
msgstr ""
6190
6191
#: bzrlib/errors.py:2181
6192
msgid ""
6193
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6194
msgstr ""
6195
6196
#: bzrlib/errors.py:2194
6197
msgid "Error in merge modified format"
6198
msgstr ""
6199
6200
#: bzrlib/errors.py:2199
6201
msgid "Format error in conflict listings"
6202
msgstr ""
6203
6204
#: bzrlib/errors.py:2203
6205
msgid ""
6206
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6207
"Error: %(description)s"
6208
msgstr ""
6209
6210
#: bzrlib/errors.py:2214
6211
msgid ""
6212
"An error has been detected in the repository %(repo_path)s.\n"
6213
"Please run bzr reconcile on this repository."
6214
msgstr ""
6215
6216
#: bzrlib/errors.py:2225
6217
msgid ""
6218
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6219
"reason: %(reason)s"
6220
msgstr ""
6221
6222
#: bzrlib/errors.py:2238
6223
msgid ""
6224
"An inconsistent delta was supplied: %(delta)r\n"
6225
"reason: %(reason)s"
6226
msgstr ""
6227
6228
#: bzrlib/errors.py:2250
6229
msgid "To use this feature you must upgrade your branch at %(path)s."
6230
msgstr ""
6231
6232
#: bzrlib/errors.py:2259
6233
msgid "To use this feature you must upgrade your repository at %(path)s."
6234
msgstr ""
6235
6236
#: bzrlib/errors.py:2264
6237
msgid ""
6238
"To use this feature you must upgrade your branch at %(path)s to a format "
6239
"which supports rich roots."
6240
msgstr ""
6241
6242
#: bzrlib/errors.py:2270
6243
msgid "Cannot perform local-only commits on unbound branches."
6244
msgstr ""
6245
6246
#: bzrlib/errors.py:2275
6247
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6248
msgstr ""
6249
6250
#: bzrlib/errors.py:2296
6251
msgid "Ghost tags not supported by format %(format)r."
6252
msgstr ""
6253
6254
#: bzrlib/errors.py:2304
6255
msgid "File is binary but should be text."
6256
msgstr ""
6257
6258
#: bzrlib/errors.py:2309
6259
msgid "The path %(path)s is not permitted on this platform"
6260
msgstr ""
6261
6262
#: bzrlib/errors.py:2318
6263
msgid ""
6264
"Testament did not match expected value.\n"
6265
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6266
" {%(measured)s}"
6267
msgstr ""
6268
6269
#: bzrlib/errors.py:2330
6270
msgid "Not a bzr revision-bundle: %(text)r"
6271
msgstr ""
6272
6273
#: bzrlib/errors.py:2339
6274
msgid "Bad bzr revision-bundle: %(text)r"
6275
msgstr ""
6276
6277
#: bzrlib/errors.py:2348
6278
msgid "Malformed bzr revision-bundle header: %(text)r"
6279
msgstr ""
6280
6281
#: bzrlib/errors.py:2353
6282
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6283
msgstr ""
6284
6285
#: bzrlib/errors.py:2358
6286
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6287
msgstr ""
6288
6289
#: bzrlib/errors.py:2363
6290
msgid "End of line marker was not \\n in bzr revision-bundle"
6291
msgstr ""
6292
6293
#: bzrlib/errors.py:2373
6294
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6295
msgstr ""
6296
6297
#: bzrlib/errors.py:2383
6298
msgid "Root class for inventory serialization errors"
6299
msgstr ""
6300
6301
#: bzrlib/errors.py:2387
6302
msgid ""
6303
"The inventory was not in the expected format:\n"
6304
" %(msg)s"
6305
msgstr ""
6306
6307
#: bzrlib/errors.py:2396
6308
msgid "This operation requires rich root data storage"
6309
msgstr ""
6310
6311
#: bzrlib/errors.py:2409
6312
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6313
msgstr ""
6314
6315
#: bzrlib/errors.py:2418
6316
msgid ""
6317
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6318
"variable."
6319
msgstr ""
6320
6321
#: bzrlib/errors.py:2425
6322
msgid ""
6323
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6324
"ghost at {%(ghost_revision_id)s}"
6325
msgstr ""
6326
6327
#: bzrlib/errors.py:2435
6328
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6329
msgstr ""
6330
6331
#: bzrlib/errors.py:2486
6332
msgid ""
6333
"A merge directive must provide either a bundle or a public branch location."
6334
msgstr ""
6335
6336
#: bzrlib/errors.py:2493
6337
msgid "Bad merge directive payload %(start)r"
6338
msgstr ""
6339
6340
#: bzrlib/errors.py:2503
6341
msgid "Preview patch does not match requested changes."
6342
msgstr ""
6343
6344
#: bzrlib/errors.py:2509
6345
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6346
msgstr ""
6347
6348
#: bzrlib/errors.py:2519
6349
msgid ""
6350
"Your branch does not have all of the revisions required in order to merge "
6351
"this merge directive and the target location specified in the merge "
6352
"directive is not a branch: %(location)s."
6353
msgstr ""
6354
6355
#: bzrlib/errors.py:2531
6356
msgid "Unsupported entry kind %(kind)s"
6357
msgstr ""
6358
6359
#: bzrlib/errors.py:2539
6360
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6361
msgstr ""
6362
6363
#: bzrlib/errors.py:2549
6364
msgid "Subsume target %(other_tree)s needs to be upgraded."
6365
msgstr ""
6366
6367
#: bzrlib/errors.py:2568
6368
msgid "No such tag: %(tag_name)s"
6369
msgstr ""
6370
6371
#: bzrlib/errors.py:2576
6372
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6373
msgstr ""
6374
6375
#: bzrlib/errors.py:2585
6376
msgid "Tag %(tag_name)s already exists."
6377
msgstr ""
6378
6379
#: bzrlib/errors.py:2593
6380
msgid ""
6381
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6382
"bugs\" for more information on this feature."
6383
msgstr ""
6384
6385
#: bzrlib/errors.py:2603
6386
msgid ""
6387
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6388
msgstr ""
6389
6390
#: bzrlib/errors.py:2613
6391
msgid ""
6392
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6393
msgstr ""
6394
6395
#: bzrlib/errors.py:2623
6396
msgid "Invalid line in bugs property: '%(line)s'"
6397
msgstr ""
6398
6399
#: bzrlib/errors.py:2631
6400
msgid "Invalid bug status: '%(status)s'"
6401
msgstr ""
6402
6403
#: bzrlib/errors.py:2639
6404
msgid "Could not understand response from smart server: %(response_tuple)r"
6405
msgstr ""
6406
6407
#: bzrlib/errors.py:2678
6408
msgid "Server sent an unexpected error: %(error_tuple)r"
6409
msgstr ""
6410
6411
#: bzrlib/errors.py:2697
6412
msgid "Unrecognised container format: %(container_format)r"
6413
msgstr ""
6414
6415
#: bzrlib/errors.py:2705
6416
msgid "Unexpected end of container stream"
6417
msgstr ""
6418
6419
#: bzrlib/errors.py:2710
6420
msgid "Unknown record type: %(record_type)r"
6421
msgstr ""
6422
6423
#: bzrlib/errors.py:2718
6424
msgid "Invalid record: %(reason)s"
6425
msgstr ""
6426
6427
#: bzrlib/errors.py:2726
6428
msgid "Container has data after end marker: %(excess)r"
6429
msgstr ""
6430
6431
#: bzrlib/errors.py:2734
6432
msgid "Container has multiple records with the same name: %(name)s"
6433
msgstr ""
6434
6435
#: bzrlib/errors.py:2747
6436
msgid "Corrupt or incompatible data stream: %(reason)s"
6437
msgstr ""
6438
6439
#: bzrlib/errors.py:2755
6440
msgid "SMTP error: %(error)s"
6441
msgstr ""
6442
6443
#: bzrlib/errors.py:2763
6444
msgid "No message supplied."
6445
msgstr ""
6446
6447
#: bzrlib/errors.py:2768
6448
msgid "No mail-to address (--mail-to) or output (-o) specified."
6449
msgstr ""
6450
6451
#: bzrlib/errors.py:2773
6452
msgid "Unknown mail client: %(mail_client)s"
6453
msgstr ""
6454
6455
#: bzrlib/errors.py:2781
6456
msgid ""
6457
"Unable to find mail client with the following names: "
6458
"%(mail_command_list_string)s"
6459
msgstr ""
6460
6461
#: bzrlib/errors.py:2791
6462
msgid "SMTP connection to %(host)s refused"
6463
msgstr ""
6464
6465
#: bzrlib/errors.py:2800
6466
msgid "Please specify smtp_server. No server at default %(host)s."
6467
msgstr ""
6468
6469
#: bzrlib/errors.py:2814
6470
msgid ""
6471
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6472
"reconfigure."
6473
msgstr ""
6474
6475
#: bzrlib/errors.py:2826
6476
msgid "'%(display_url)s' is already a branch."
6477
msgstr ""
6478
6479
#: bzrlib/errors.py:2831
6480
msgid "'%(display_url)s' is already a tree."
6481
msgstr ""
6482
6483
#: bzrlib/errors.py:2836
6484
msgid "'%(display_url)s' is already a checkout."
6485
msgstr ""
6486
6487
#: bzrlib/errors.py:2841
6488
msgid "'%(display_url)s' is already a lightweight checkout."
6489
msgstr ""
6490
6491
#: bzrlib/errors.py:2846
6492
msgid "'%(display_url)s' is already using a shared repository."
6493
msgstr ""
6494
6495
#: bzrlib/errors.py:2851
6496
msgid "'%(display_url)s' is already standalone."
6497
msgstr ""
6498
6499
#: bzrlib/errors.py:2856
6500
msgid "Shared repository '%(display_url)s' already creates working trees."
6501
msgstr ""
6502
6503
#: bzrlib/errors.py:2862
6504
msgid ""
6505
"Shared repository '%(display_url)s' already doesn't create working trees."
6506
msgstr ""
6507
6508
#: bzrlib/errors.py:2868
6509
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6510
msgstr ""
6511
6512
#: bzrlib/errors.py:2873
6513
msgid "No location could be found to bind to at %(display_url)s."
6514
msgstr ""
6515
6516
#: bzrlib/errors.py:2878
6517
msgid ""
6518
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6519
"status).%(more)s"
6520
msgstr ""
6521
6522
#: bzrlib/errors.py:2897
6523
msgid ""
6524
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6525
"list).%(more)s"
6526
msgstr ""
6527
6528
#: bzrlib/errors.py:2903
6529
msgid "Variable {%(name)s} is not available."
6530
msgstr ""
6531
6532
#: bzrlib/errors.py:2911
6533
msgid "No template specified."
6534
msgstr ""
6535
6536
#: bzrlib/errors.py:2916
6537
msgid "Unable to create symlink %(path_str)son this platform"
6538
msgstr ""
6539
6540
#: bzrlib/errors.py:2931
6541
msgid ""
6542
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6543
"\"original\", \"local\"."
6544
msgstr ""
6545
6546
#: bzrlib/errors.py:2965
6547
msgid ""
6548
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6549
msgstr ""
6550
6551
#: bzrlib/errors.py:2977
6552
msgid "The \"%(config_id)s\" configuration does not exist."
6553
msgstr ""
6554
6555
#: bzrlib/errors.py:2985
6556
msgid "The \"%(option_name)s\" configuration option does not exist."
6557
msgstr ""
6558
6559
#: bzrlib/errors.py:2993
6560
msgid "The alias \"%(alias_name)s\" does not exist."
6561
msgstr ""
6562
6563
#: bzrlib/errors.py:3007
6564
msgid "\"%(alias_name)s\" is not a valid location alias."
6565
msgstr ""
6566
6567
#: bzrlib/errors.py:3015
6568
msgid "No %(alias_name)s location assigned."
6569
msgstr ""
6570
6571
#: bzrlib/errors.py:3023
6572
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6573
msgstr ""
6574
6575
#: bzrlib/errors.py:3033
6576
msgid "Unknown rules detected: %(unknowns_str)s."
6577
msgstr ""
6578
6579
#: bzrlib/errors.py:3044
6580
msgid "Tip change rejected: %(msg)s"
6581
msgstr ""
6582
6583
#: bzrlib/errors.py:3052
6584
msgid "Shelf corrupt."
6585
msgstr ""
6586
6587
#: bzrlib/errors.py:3057
6588
msgid "Corruption while decompressing repository file%(orig_error)s"
6589
msgstr ""
6590
6591
#: bzrlib/errors.py:3069
6592
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6593
msgstr ""
6594
6595
#: bzrlib/errors.py:3077
6596
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6597
msgstr ""
6598
6599
#: bzrlib/errors.py:3085
6600
msgid ""
6601
"An attempt to access a url outside the server jail was made: '%(url)s'."
6602
msgstr ""
6603
6604
#: bzrlib/errors.py:3093
6605
msgid "The user aborted the operation."
6606
msgstr ""
6607
6608
#: bzrlib/errors.py:3098
6609
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6610
msgstr ""
6611
6612
#: bzrlib/errors.py:3108
6613
msgid "No such view: %(view_name)s."
6614
msgstr ""
6615
6616
#: bzrlib/errors.py:3118
6617
msgid ""
6618
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6619
"to a later format."
6620
msgstr ""
6621
6622
#: bzrlib/errors.py:3127
6623
msgid ""
6624
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6625
msgstr ""
6626
6627
#: bzrlib/errors.py:3194
6628
msgid "%(bzrdir)r does not support co-located branches."
6629
msgstr ""
6630
6631
#: bzrlib/errors.py:3200
6632
msgid ""
6633
"Unable to determine your name.\n"
6634
"Please, set your name with the 'whoami' command.\n"
6635
"E.g. bzr whoami \"Your Name <name@example.com>\""
6636
msgstr ""
6637
6638
#: bzrlib/errors.py:3209
6639
msgid "Invalid pattern(s) found. %(msg)s"
6640
msgstr ""
6641
6642
#: bzrlib/errors.py:3217
6643
msgid ""
6644
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6645
"unbind` to fix."
6646
msgstr ""
6647
6648
#: bzrlib/errors.py:3228
6649
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6650
msgstr ""
6651
6652
#: bzrlib/errors.py:3237
6653
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6654
msgstr ""
6655
6656
#: bzrlib/errors.py:3246
6657
msgid ""
6658
"No compatible object available for operations from %(source)r to %(target)r."
6659
msgstr ""
6660
6661
#: bzrlib/errors.py:3256
6662
msgid ""
6663
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6664
"%(arguments)s."
6665
msgstr ""
6666
6667
#: bzrlib/errors.py:3266
6668
msgid ""
6669
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6670
"format %(format)r"
6671
msgstr ""
6672
6673
#: bzrlib/errors.py:3278
6674
msgid ""
6675
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6676
"plugin."
6677
msgstr ""
6678
6679
#: bzrlib/errors.py:3291
6680
msgid "Binary files section encountered."
6681
msgstr ""
6682
6683
#: bzrlib/errors.py:3299
6684
msgid ""
6685
"Malformed patch header. %(desc)s\n"
6686
"%(line)r"
6687
msgstr ""
6688
6689
#: bzrlib/errors.py:3308
6690
msgid ""
6691
"Malformed hunk header. %(desc)s\n"
6692
"%(line)r"
6693
msgstr ""
6694
6695
#: bzrlib/errors.py:3317
6696
msgid ""
6697
"Malformed line. %(desc)s\n"
6698
"%(line)r"
6699
msgstr ""
6700
6701
#: bzrlib/errors.py:3327
6702
msgid ""
6703
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6704
"but patch says it should be \"%(patch_line)s\""
6705
msgstr ""
6706
6707
#: bzrlib/errors.py:3338
6708
msgid "The feature %(feature)s has already been registered."
6709
msgstr ""
6710
6711
#: bzrlib/export_pot.py:252
6712
#, python-format
6713
msgid "Exporting messages from builtin command: %s"
6714
msgstr ""
6715
6716
#: bzrlib/export_pot.py:271
6717
msgid "Exporting messages from plugin command: {0} in {1}"
6718
msgstr ""
6719
6720
#: bzrlib/export_pot.py:292
6721
#, python-format
6722
msgid "Exporting message from error: %s"
6723
msgstr ""
6724
6725
#: bzrlib/fetch.py:98
6726
msgid "Finding revisions"
6727
msgstr ""
6728
6729
#: bzrlib/fetch.py:103
6730
msgid "Fetching revisions"
6731
msgstr ""
6732
6733
#: bzrlib/foreign.py:262
6734
msgid "Push into a different VCS without any custom bzr metadata."
6735
msgstr ""
6736
6737
#: bzrlib/foreign.py:264
6738
msgid ""
6739
"This will afterwards rebase the local branch on the remote\n"
6740
"branch unless the --no-rebase option is used, in which case \n"
6741
"the two branches will be out of sync after the push. "
6742
msgstr ""
6743
6744
#: bzrlib/foreign.py:277
6745
msgid "Do not rebase after push."
6746
msgstr ""
6747
6748
#: bzrlib/foreign.py:311
6749
#, python-format
6750
msgid "Using saved location: %s\n"
6751
msgstr ""
6752
6753
#: bzrlib/foreign.py:321
6754
msgid ""
6755
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6756
"regular push."
6757
msgstr ""
6758
6759
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6760
msgid "{0} commits with valid signatures"
6761
msgstr ""
6762
6763
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6764
msgid "{0} commit with unknown key"
6765
msgid_plural "{0} commits with unknown keys"
6766
msgstr[0] "{0} закрепление с неизвестным ключом"
6767
msgstr[1] "{0} закрепления с неизвестным ключом"
6768
msgstr[2] "{0} закреплений с неизвестным ключом"
6769
6770
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6771
msgid "{0} commit not valid"
6772
msgid_plural "{0} commits not valid"
6773
msgstr[0] ""
6774
msgstr[1] ""
6775
6776
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6777
msgid "{0} commit not signed"
6778
msgid_plural "{0} commits not signed"
6779
msgstr[0] ""
6780
msgstr[1] ""
6781
6782
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6783
msgid "{0} commit with key now expired"
6784
msgid_plural "{0} commits with key now expired"
6785
msgstr[0] ""
6786
msgstr[1] ""
6787
6788
#: bzrlib/gpg.py:343
6789
msgid "No GnuPG key results for pattern: {0}"
6790
msgstr ""
6791
6792
#: bzrlib/gpg.py:386
6793
msgid "{0} signed {1} commit"
6794
msgid_plural "{0} signed {1} commits"
6795
msgstr[0] ""
6796
msgstr[1] ""
6797
6798
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6799
msgid "{0} commit by author {1}"
6800
msgid_plural "{0} commits by author {1}"
6801
msgstr[0] ""
6802
msgstr[1] ""
6803
6804
#: bzrlib/gpg.py:433
6805
msgid "Unknown key {0} signed {1} commit"
6806
msgid_plural "Unknown key {0} signed {1} commits"
6807
msgstr[0] "Неизвестным ключом {0} подписано {1} закрепление"
6808
msgstr[1] "Неизвестным ключом {0} подписаны {1} закрепления"
6809
msgstr[2] "Неизвестным ключом {0} подписаны {1} закреплений"
6810
6811
#: bzrlib/gpg.py:452
6812
msgid "{0} commit by author {1} with key {2} now expired"
6813
msgid_plural "{0} commits by author {1} with key {2} now expired"
6814
msgstr[0] ""
6815
msgstr[1] ""
6816
6817
#: bzrlib/groupcompress.py:1739
6818
#, python-format
6819
msgid "Insert claimed random_id=True, but then inserted %r two times"
6820
msgstr ""
6821
6822
#: bzrlib/hooks.py:331
6823
#, python-format
6824
msgid "Introduced in: %s"
6825
msgstr ""
6826
6827
#: bzrlib/hooks.py:334
6828
#, python-format
6829
msgid "Deprecated in: %s"
6830
msgstr ""
6831
6832
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6833
msgid "Walking content"
6834
msgstr ""
6835
6836
#: bzrlib/knit.py:3330
6837
msgid "annotating"
6838
msgstr ""
6839
6840
#: bzrlib/lock.py:548
6841
msgid "{0!r} was {1} locked again"
6842
msgstr ""
6843
6844
#: bzrlib/lockdir.py:321
6845
#, python-format
6846
msgid "error removing pending lock: %s"
6847
msgstr ""
6848
6849
#: bzrlib/lockdir.py:616
6850
msgid "Unable to obtain"
6851
msgstr ""
6852
6853
#: bzrlib/lockdir.py:618
6854
msgid "Lock owner changed for"
6855
msgstr ""
6856
6857
#: bzrlib/lockdir.py:620
6858
msgid "{0} lock {1} {2}."
6859
msgstr ""
6860
6861
#: bzrlib/lockdir.py:627
6862
#, python-format
6863
msgid "Will continue to try until %s, unless you press Ctrl-C."
6864
msgstr ""
6865
6866
#: bzrlib/lockdir.py:629
6867
msgid "See \"bzr help break-lock\" for more."
6868
msgstr ""
6869
6870
#: bzrlib/lockdir.py:739
6871
#, python-format
6872
msgid ""
6873
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6874
msgstr ""
6875
6876
#: bzrlib/log.py:572
6877
msgid "--exclude-common-ancestry requires two different revisions"
6878
msgstr ""
6879
6880
#: bzrlib/log.py:574
6881
#, python-format
6882
msgid "invalid direction %r"
6883
msgstr ""
6884
6885
#: bzrlib/log.py:662
6886
msgid "Start revision not found in history of end revision."
6887
msgstr ""
6888
6889
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6890
msgid "Logging revision 0 is invalid."
6891
msgstr ""
6892
6893
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6894
msgid "Start revision must be older than the end revision."
6895
msgstr ""
6896
6897
#: bzrlib/log.py:1827
6898
#, python-format
6899
msgid "unknown log formatter: %r"
6900
msgstr ""
6901
6902
#: bzrlib/log.py:2123
6903
msgid "fixes bug"
6904
msgid_plural "fixes bugs"
6905
msgstr[0] ""
6906
msgstr[1] ""
6907
6908
#: bzrlib/merge.py:689
6909
msgid "All changes applied successfully."
6910
msgstr ""
6911
6912
#: bzrlib/merge.py:691
6913
#, python-format
6914
msgid "%d conflicts encountered."
6915
msgstr ""
6916
6917
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6918
msgid "Preparing file merge"
6919
msgstr ""
6920
6921
#: bzrlib/multiparent.py:426
6922
msgid "Importing revisions"
6923
msgstr ""
6924
6925
#: bzrlib/option.py:526
6926
msgid "Show help message."
6927
msgstr ""
6928
6929
#: bzrlib/option.py:528
6930
msgid "Only display errors and warnings."
6931
msgstr ""
6932
6933
#: bzrlib/option.py:531
6934
msgid "Show usage message and options."
6935
msgstr ""
6936
6937
#: bzrlib/option.py:533
6938
msgid "Display more information."
6939
msgstr ""
6940
6941
#: bzrlib/option.py:541
6942
msgid ""
6943
"Select changes introduced by the specified revision. See also \"help "
6944
"revisionspec\"."
6945
msgstr ""
6946
6947
#: bzrlib/option.py:543
6948
msgid "Branch to operate on, instead of working directory."
6949
msgstr ""
6950
6951
#: bzrlib/option.py:545
6952
msgid "Detailed log format."
6953
msgstr ""
6954
6955
#: bzrlib/option.py:545
6956
msgid "Format used by GNU ChangeLog files."
6957
msgstr ""
6958
6959
#: bzrlib/option.py:545
6960
msgid "Log format with one line per revision."
6961
msgstr ""
6962
6963
#: bzrlib/option.py:545
6964
msgid "Moderately short log format."
6965
msgstr ""
6966
6967
#: bzrlib/option.py:545
6968
msgid "Use specified log format."
6969
msgstr ""
6970
6971
#: bzrlib/option.py:547
6972
msgid "Log format"
6973
msgstr ""
6974
6975
#: bzrlib/option.py:549
6976
msgid "LCA-newness merge."
6977
msgstr ""
6978
6979
#: bzrlib/option.py:549
6980
msgid "Merge using external diff3."
6981
msgstr ""
6982
6983
#: bzrlib/option.py:549
6984
msgid "Native diff3-style merge."
6985
msgstr ""
6986
6987
#: bzrlib/option.py:549
6988
msgid "Select a particular merge algorithm."
6989
msgstr ""
6990
6991
#: bzrlib/option.py:549
6992
msgid "Weave-based merge."
6993
msgstr ""
6994
6995
#: bzrlib/option.py:551
6996
msgid "Merge algorithm"
6997
msgstr ""
6998
6999
#: bzrlib/option.py:554
7000
msgid "Message string."
7001
msgstr ""
7002
7003
#: bzrlib/option.py:556
7004
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
7005
msgstr ""
7006
7007
#: bzrlib/option.py:558
7008
msgid "Ignore differences between branches and overwrite unconditionally."
7009
msgstr ""
7010
7011
#: bzrlib/option.py:560
7012
msgid "Remember the specified location as a default."
7013
msgstr ""
7014
7015
#: bzrlib/option.py:562
7016
msgid "Reprocess to reduce spurious conflicts."
7017
msgstr ""
7018
7019
#: bzrlib/option.py:566
7020
msgid "See \"help revisionspec\" for details."
7021
msgstr ""
7022
7023
#: bzrlib/option.py:568
7024
msgid "Show internal object ids."
7025
msgstr ""
7026
7027
#: bzrlib/option.py:571
7028
msgid "Display timezone as local, original, or utc."
7029
msgstr ""
7030
7031
#: bzrlib/osutils.py:100
7032
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
7033
msgstr ""
7034
7035
#: bzrlib/osutils.py:220
7036
msgid "lstat/stat of ({0!r}): {1!r}"
7037
msgstr ""
7038
7039
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
7040
#, python-format
7041
msgid "sorry, %r not allowed in path"
7042
msgstr ""
7043
7044
#: bzrlib/osutils.py:1237
7045
#, python-format
7046
msgid "%r is too short to calculate a relative path"
7047
msgstr ""
7048
7049
#: bzrlib/plugin.py:143
7050
#, python-format
7051
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
7052
msgstr ""
7053
7054
#: bzrlib/plugins/bash_completion/bashcomp.py:411
7055
msgid "Enable completions for the selected plugin (default: all plugins)"
7056
msgstr ""
7057
7058
#: bzrlib/plugins/bash_completion/bashcomp.py:412
7059
msgid "Generate a shell function for bash command line completion."
7060
msgstr ""
7061
7062
#: bzrlib/plugins/bash_completion/bashcomp.py:414
7063
msgid ""
7064
"This command generates a shell function which can be used by bash to\n"
7065
"automatically complete the currently typed command when the user presses\n"
7066
"the completion key (usually tab)."
7067
msgstr ""
7068
7069
#: bzrlib/plugins/bash_completion/bashcomp.py:418
7070
msgid ""
7071
"Commonly used like this:\n"
7072
" eval \"`bzr bash-completion`\""
7073
msgstr ""
7074
7075
#: bzrlib/plugins/bash_completion/bashcomp.py:424
7076
msgid "Name of the generated function (default: _bzr)"
7077
msgstr ""
7078
7079
#: bzrlib/plugins/bash_completion/bashcomp.py:426
7080
msgid "Generate only the shell function, don't enable it"
7081
msgstr ""
7082
7083
#: bzrlib/plugins/launchpad/__init__.py:81
7084
msgid "Register a branch with launchpad.net."
7085
msgstr ""
7086
7087
#: bzrlib/plugins/launchpad/__init__.py:83
7088
msgid ""
7089
"This command lists a bzr branch in the directory of branches on\n"
7090
"launchpad.net. Registration allows the branch to be associated with\n"
7091
"bugs or specifications."
7092
msgstr ""
7093
7094
#: bzrlib/plugins/launchpad/__init__.py:87
7095
msgid ""
7096
"Before using this command you must register the project to which the\n"
7097
"branch belongs, and create an account for yourself on launchpad.net."
7098
msgstr ""
7099
7100
#: bzrlib/plugins/launchpad/__init__.py:90
7101
msgid ""
7102
"arguments:\n"
7103
" public_url: The publicly visible url for the branch to register.\n"
7104
" This must be an http or https url (which Launchpad can read\n"
7105
" from to access the branch). Local file urls, SFTP urls, and\n"
7106
" bzr+ssh urls will not work.\n"
7107
" If no public_url is provided, bzr will use the configured\n"
7108
" public_url if there is one for the current branch, and\n"
7109
" otherwise error."
7110
msgstr ""
7111
7112
#: bzrlib/plugins/launchpad/__init__.py:99
7113
msgid ""
7114
"example:\n"
7115
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7116
" --project fooproject"
7117
msgstr ""
7118
7119
#: bzrlib/plugins/launchpad/__init__.py:106
7120
msgid "Launchpad project short name to associate with the branch."
7121
msgstr ""
7122
7123
#: bzrlib/plugins/launchpad/__init__.py:113
7124
msgid ""
7125
"Short name for the branch; by default taken from the last component of the "
7126
"url."
7127
msgstr ""
7128
7129
#: bzrlib/plugins/launchpad/__init__.py:117
7130
msgid "One-sentence description of the branch."
7131
msgstr ""
7132
7133
#: bzrlib/plugins/launchpad/__init__.py:120
7134
msgid "Longer description of the purpose or contents of the branch."
7135
msgstr ""
7136
7137
#: bzrlib/plugins/launchpad/__init__.py:123
7138
msgid "Branch author's email address, if not yourself."
7139
msgstr ""
7140
7141
#: bzrlib/plugins/launchpad/__init__.py:126
7142
msgid "The bug this branch fixes."
7143
msgstr ""
7144
7145
#: bzrlib/plugins/launchpad/__init__.py:129
7146
msgid "Prepare the request but don't actually send it."
7147
msgstr ""
7148
7149
#: bzrlib/plugins/launchpad/__init__.py:151
7150
msgid ""
7151
"register-branch requires a public branch url - see bzr help register-branch."
7152
msgstr ""
7153
7154
#: bzrlib/plugins/launchpad/__init__.py:159
7155
msgid "--product is deprecated; please use --project."
7156
msgstr ""
7157
7158
#: bzrlib/plugins/launchpad/__init__.py:191
7159
msgid "Open a Launchpad branch page in your web browser."
7160
msgstr ""
7161
7162
#: bzrlib/plugins/launchpad/__init__.py:196
7163
msgid "Do not actually open the browser. Just say the URL we would use."
7164
msgstr ""
7165
7166
#: bzrlib/plugins/launchpad/__init__.py:231
7167
#, python-format
7168
msgid "Opening %s in web browser"
7169
msgstr ""
7170
7171
#: bzrlib/plugins/launchpad/__init__.py:241
7172
msgid "Show or set the Launchpad user ID."
7173
msgstr ""
7174
7175
#: bzrlib/plugins/launchpad/__init__.py:243
7176
msgid ""
7177
"When communicating with Launchpad, some commands need to know your\n"
7178
"Launchpad user ID. This command can be used to set or show the\n"
7179
"user ID that Bazaar will use for such communication."
7180
msgstr ""
7181
7182
#: bzrlib/plugins/launchpad/__init__.py:247
7183
msgid ""
7184
":Examples:\n"
7185
" Show the Launchpad ID of the current user::"
7186
msgstr ""
7187
7188
#: bzrlib/plugins/launchpad/__init__.py:250
7189
msgid " bzr launchpad-login"
7190
msgstr ""
7191
7192
#: bzrlib/plugins/launchpad/__init__.py:252
7193
msgid " Set the Launchpad ID of the current user to 'bob'::"
7194
msgstr ""
7195
7196
#: bzrlib/plugins/launchpad/__init__.py:254
7197
msgid " bzr launchpad-login bob"
7198
msgstr ""
7199
7200
#: bzrlib/plugins/launchpad/__init__.py:261
7201
msgid "Don't check that the user name is valid."
7202
msgstr ""
7203
7204
#: bzrlib/plugins/launchpad/__init__.py:276
7205
#: bzrlib/plugins/launchpad/__init__.py:287
7206
msgid "Launchpad user ID exists and has SSH keys.\n"
7207
msgstr ""
7208
7209
#: bzrlib/plugins/launchpad/__init__.py:279
7210
msgid "No Launchpad user ID configured.\n"
7211
msgstr ""
7212
7213
#: bzrlib/plugins/launchpad/__init__.py:290
7214
#, python-format
7215
msgid "Launchpad user ID set to '%s'.\n"
7216
msgstr ""
7217
7218
#: bzrlib/plugins/launchpad/__init__.py:298
7219
msgid "Ask Launchpad to mirror a branch now."
7220
msgstr ""
7221
7222
#: bzrlib/plugins/launchpad/__init__.py:318
7223
msgid "Propose merging a branch on Launchpad."
7224
msgstr ""
7225
7226
#: bzrlib/plugins/launchpad/__init__.py:320
7227
msgid ""
7228
"This will open your usual editor to provide the initial comment. When it\n"
7229
"has created the proposal, it will open it in your default web browser."
7230
msgstr ""
7231
7232
#: bzrlib/plugins/launchpad/__init__.py:323
7233
msgid ""
7234
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7235
"is not supplied, the remembered submit branch will be used. If no submit\n"
7236
"branch is remembered, the development focus will be used."
7237
msgstr ""
7238
7239
#: bzrlib/plugins/launchpad/__init__.py:327
7240
msgid ""
7241
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7242
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7243
"The parameter the launchpad account name of the desired reviewer. This\n"
7244
"may optionally be followed by '=' and the review type. For example:"
7245
msgstr ""
7246
7247
#: bzrlib/plugins/launchpad/__init__.py:332
7248
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7249
msgstr ""
7250
7251
#: bzrlib/plugins/launchpad/__init__.py:334
7252
msgid ""
7253
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7254
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7255
msgstr ""
7256
7257
#: bzrlib/plugins/launchpad/__init__.py:339
7258
msgid "Propose the merge on staging."
7259
msgstr ""
7260
7261
#: bzrlib/plugins/launchpad/__init__.py:341
7262
msgid "Commit message."
7263
msgstr ""
7264
7265
#: bzrlib/plugins/launchpad/__init__.py:343
7266
msgid "Mark the proposal as approved immediately."
7267
msgstr ""
7268
7269
#: bzrlib/plugins/launchpad/__init__.py:345
7270
msgid "Requested reviewer and optional type."
7271
msgstr ""
7272
7273
#: bzrlib/plugins/launchpad/__init__.py:382
7274
msgid "Find the proposal to merge this revision."
7275
msgstr ""
7276
7277
#: bzrlib/plugins/launchpad/__init__.py:384
7278
msgid ""
7279
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7280
"This works only if the selected branch was the merge proposal target, and\n"
7281
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7282
"are opened in a web browser."
7283
msgstr ""
7284
7285
#: bzrlib/plugins/launchpad/__init__.py:389
7286
msgid ""
7287
"Any revision involved in the merge may be specified-- the revision in\n"
7288
"which the merge was performed, or one of the revisions that was merged."
7289
msgstr ""
7290
7291
#: bzrlib/plugins/launchpad/__init__.py:392
7292
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7293
msgstr ""
7294
7295
#: bzrlib/plugins/launchpad/__init__.py:394
7296
msgid " bzr lp-find-proposal -r annotate:README:1"
7297
msgstr ""
7298
7299
#: bzrlib/plugins/launchpad/__init__.py:409
7300
msgid "No review found."
7301
msgstr ""
7302
7303
#: bzrlib/plugins/launchpad/__init__.py:410
7304
#, python-format
7305
msgid "%d proposals(s) found."
7306
msgstr ""
7307
7308
#: bzrlib/plugins/launchpad/__init__.py:420
7309
msgid "Finding revision-id"
7310
msgstr ""
7311
7312
#: bzrlib/plugins/launchpad/__init__.py:427
7313
msgid "Finding merge"
7314
msgstr ""
7315
7316
#: bzrlib/plugins/launchpad/__init__.py:432
7317
msgid "Finding revno"
7318
msgstr ""
7319
7320
#: bzrlib/plugins/launchpad/__init__.py:437
7321
msgid "Finding Launchpad branch"
7322
msgstr ""
7323
7324
#: bzrlib/plugins/launchpad/__init__.py:440
7325
msgid "Finding proposals"
7326
msgstr ""
7327
7328
#: bzrlib/plugins/launchpad/account.py:66
7329
msgid "Setting ssh/sftp usernames for launchpad.net."
7330
msgstr ""
7331
7332
#: bzrlib/plugins/launchpad/lp_api.py:241
7333
#: bzrlib/plugins/launchpad/lp_api.py:246
7334
#, python-format
7335
msgid "%s is not registered on Launchpad"
7336
msgstr ""
7337
7338
#: bzrlib/plugins/launchpad/lp_api.py:256
7339
#, python-format
7340
msgid "%s has no development focus."
7341
msgstr ""
7342
7343
#: bzrlib/plugins/launchpad/lp_api.py:261
7344
#, python-format
7345
msgid "development focus %s has no branch."
7346
msgstr ""
7347
7348
#: bzrlib/plugins/launchpad/lp_api.py:266
7349
#, python-format
7350
msgid "source package %s has no branch."
7351
msgstr ""
7352
7353
#: bzrlib/plugins/launchpad/lp_api.py:270
7354
#, python-format
7355
msgid "%s has no associated product or source package."
7356
msgstr ""
7357
7358
#: bzrlib/plugins/launchpad/lp_api.py:282
7359
#, python-format
7360
msgid "%s is already up-to-date."
7361
msgstr ""
7362
7363
#: bzrlib/plugins/launchpad/lp_api.py:289
7364
#, python-format
7365
msgid "Pushing to %s"
7366
msgstr ""
7367
7368
#: bzrlib/plugins/launchpad/lp_directory.py:170
7369
msgid ""
7370
"resolution for {0}\n"
7371
" local: {1}\n"
7372
" remote: {2}"
7373
msgstr ""
7374
7375
#: bzrlib/plugins/launchpad/lp_propose.py:149
7376
#, python-format
7377
msgid "There is already a branch merge proposal: %s"
7378
msgstr ""
7379
7380
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7381
msgid "pb parameter to convert() is deprecated"
7382
msgstr ""
7383
7384
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7385
msgid "starting upgrade from format 4 to 5"
7386
msgstr ""
7387
7388
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7389
msgid "note: upgrade may be faster if all store files are ungzipped first"
7390
msgstr ""
7391
7392
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7393
msgid "converting revision"
7394
msgstr ""
7395
7396
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7397
msgid "upgraded to weaves:"
7398
msgstr ""
7399
7400
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7401
#, python-format
7402
msgid "%6d revisions and inventories"
7403
msgstr ""
7404
7405
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7406
#, python-format
7407
msgid "%6d revisions not present"
7408
msgstr ""
7409
7410
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7411
#, python-format
7412
msgid "%6d texts"
7413
msgstr ""
7414
7415
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7416
msgid "writing weave"
7417
msgstr ""
7418
7419
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7420
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7421
msgid "inventory"
7422
msgstr ""
7423
7424
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7425
msgid "write revision"
7426
msgstr ""
7427
7428
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7429
msgid "loading revision"
7430
msgstr ""
7431
7432
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7433
#, python-format
7434
msgid "revision {%s} not present in branch; will be converted as a ghost"
7435
msgstr ""
7436
7437
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7438
msgid "starting upgrade from format 5 to 6"
7439
msgstr ""
7440
7441
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7442
#, python-format
7443
msgid "adding prefixes to %s"
7444
msgstr ""
7445
7446
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7447
msgid "starting upgrade from format 6 to metadir"
7448
msgstr ""
7449
7450
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7451
msgid "Removing ancestry.weave"
7452
msgstr ""
7453
7454
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7455
msgid "Finding branch files"
7456
msgstr ""
7457
7458
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7459
msgid "Upgrading repository"
7460
msgstr ""
7461
7462
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7463
msgid "Upgrading branch"
7464
msgstr ""
7465
7466
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7467
msgid "No working tree."
7468
msgstr ""
7469
7470
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7471
msgid "Upgrading working tree"
7472
msgstr ""
7473
7474
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7475
#, python-format
7476
msgid "Make %s lock"
7477
msgstr ""
7478
7479
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7480
#, python-format
7481
msgid "Moving %s"
7482
msgstr ""
7483
7484
#: bzrlib/push.py:56
7485
msgid "Created new branch."
7486
msgstr ""
7487
7488
#: bzrlib/push.py:97
7489
#, python-format
7490
msgid ""
7491
"Target directory %s already contains a .bzr directory, but it is not valid."
7492
msgstr ""
7493
7494
#: bzrlib/push.py:101
7495
#, python-format
7496
msgid ""
7497
"Target directory %s already exists, but does not have a .bzr directory. "
7498
"Supply --use-existing-dir to push there anyway."
7499
msgstr ""
7500
7501
#: bzrlib/push.py:122
7502
#, python-format
7503
msgid "Too many redirections trying to make %s."
7504
msgstr ""
7505
7506
#: bzrlib/push.py:147
7507
msgid ""
7508
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7509
"information."
7510
msgstr ""
7511
7512
#: bzrlib/push.py:151
7513
#, python-format
7514
msgid ""
7515
"It is not possible to losslessly push to %s. You may want to use dpush "
7516
"instead."
7517
msgstr ""
7518
7519
#: bzrlib/push.py:157
7520
#, python-format
7521
msgid ""
7522
"At %s you have a valid .bzr control directory, but not a branch or "
7523
"repository. This is an unsupported configuration. Please move the target "
7524
"directory out of the way and try again."
7525
msgstr ""
7526
7527
#: bzrlib/reconcile.py:97
7528
#, python-format
7529
msgid "Reconciling branch %s"
7530
msgstr ""
7531
7532
#: bzrlib/reconcile.py:103
7533
#, python-format
7534
msgid "Reconciling repository %s"
7535
msgstr ""
7536
7537
#: bzrlib/reconcile.py:105
7538
msgid "Reconciling repository"
7539
msgstr ""
7540
7541
#: bzrlib/reconcile.py:111
7542
#, python-format
7543
msgid "%s cannot canonicalize CHKs."
7544
msgstr ""
7545
7546
#: bzrlib/reconcile.py:119
7547
msgid "Reconcile aborted: revision index has inconsistent parents."
7548
msgstr ""
7549
7550
#: bzrlib/reconcile.py:121
7551
msgid "Run \"bzr check\" for more details."
7552
msgstr "Для подробностей запустите «bzr check»."
7553
7554
#: bzrlib/reconcile.py:123
7555
msgid "Reconciliation complete."
7556
msgstr ""
7557
7558
#: bzrlib/reconcile.py:166
7559
msgid "Fixing last revision info {0} => {1}"
7560
msgstr "Исправление информации последней ревизии {0} => {1}"
7561
7562
#: bzrlib/reconcile.py:173
7563
msgid "revision_history ok."
7564
msgstr ""
7565
7566
#: bzrlib/reconcile.py:234
7567
msgid "Reading inventory data"
7568
msgstr "Чтение данных инвентаря"
7569
7570
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7571
msgid "Inventory ok."
7572
msgstr ""
7573
7574
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7575
msgid "Backing up inventory"
7576
msgstr "Создание резервного инвентаря"
7577
7578
#: bzrlib/reconcile.py:258
7579
msgid "Backup inventory created."
7580
msgstr "Резервный инвентарь создан."
7581
7582
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7583
msgid "Writing weave"
7584
msgstr ""
7585
7586
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7587
msgid "Inventory regenerated."
7588
msgstr "Инвентарь восстановлен."
7589
7590
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7591
msgid "Reading indexes"
7592
msgstr "Чтение индексов"
7593
7594
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7595
msgid "Checking unused inventories"
7596
msgstr "Проверка неиспользуемых инвентарей"
7597
7598
#: bzrlib/reconcile.py:388
7599
msgid "Backup Inventory created"
7600
msgstr "Резервный инвентарь создан"
7601
7602
#: bzrlib/reconcile.py:446
7603
msgid "Fixing text parents"
7604
msgstr ""
7605
7606
#: bzrlib/reconfigure.py:54
7607
msgid "{0} is now stacked on {1}\n"
7608
msgstr "{0}теперь на стеке {1}\n"
7609
7610
#: bzrlib/reconfigure.py:69
7611
#, python-format
7612
msgid "%s is now not stacked\n"
7613
msgstr "%s теперь не на стеке\n"
7614
7615
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7616
#, python-format
7617
msgid "bzr: ERROR (ignored): %s"
7618
msgstr "bzr: ОШИБКА (игнорирована): %s"
7619
7620
#: bzrlib/remote.py:2541
7621
msgid "Copying repository content as tarball..."
7622
msgstr "Копирование содержимого репозитория в тарбол..."
7623
7624
#: bzrlib/rename_map.py:69
7625
msgid "Calculating hashes"
7626
msgstr "Вычисление хешей"
7627
7628
#: bzrlib/rename_map.py:107
7629
msgid "Determining hash hits"
7630
msgstr "Определение столкновений хешей"
7631
7632
#: bzrlib/rename_map.py:242
7633
msgid "{0} => {1}"
7634
msgstr "{0} => {1}"
7635
7636
#: bzrlib/repository.py:1787
7637
msgid "Moving repository to repository.backup"
7638
msgstr "Перемещение репозитория в repository.backup"
7639
7640
#: bzrlib/repository.py:1794
7641
msgid "Creating new repository"
7642
msgstr "Создание нового репозитория"
7643
7644
#: bzrlib/repository.py:1799
7645
msgid "Copying content"
7646
msgstr "Копирование содержимого"
7647
7648
#: bzrlib/repository.py:1803
7649
msgid "Deleting old repository content"
7650
msgstr "Удаление старого содержимого репозитория"
7651
7652
#: bzrlib/repository.py:1805
7653
msgid "repository converted"
7654
msgstr "репозиторий преобразован"
7655
7656
#: bzrlib/revisionspec.py:903
7657
msgid "Using {0} {1}"
7658
msgstr "Используется {0} {1}"
7659
7660
#: bzrlib/send.py:58
7661
#, python-format
7662
msgid "Mail client \"%s\" does not support specifying body"
7663
msgstr "Почтовый клиент «%s» не поддерживает определение тела"
7664
7665
#: bzrlib/send.py:62
7666
msgid "--remember requires a branch to be specified."
7667
msgstr "--remember требует указания ветви."
7668
7669
#: bzrlib/send.py:77
7670
msgid "No submit branch known or specified"
7671
msgstr "Ветвь для отсылки неизвестна и не задана"
7672
7673
#: bzrlib/send.py:80
7674
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7675
msgstr ""
7676
"Используется сохранённое {0} местоположение «{1}» для определения изменений, "
7677
"которые необходимо отправить."
7678
7679
#: bzrlib/send.py:98
7680
#, python-format
7681
msgid "No such send format '%s'."
7682
msgstr "Нет такого формата отправки '%s'."
7683
7684
#: bzrlib/send.py:114
7685
msgid "bzr send takes at most two one revision identifiers"
7686
msgstr "bzr send принимает не более двух идентификаторов ревизии"
7687
7688
#: bzrlib/send.py:127
7689
msgid "No revisions to submit."
7690
msgstr "Нет ревизий для отправки."
7691
7692
#: bzrlib/send.py:139
7693
msgid ""
7694
"- not supported for merge directives that use more than one output file."
7695
msgstr ""
7696
"- не поддерживается для директив merge, которые используют более, чем один "
7697
"файл вывода."
7698
7699
#: bzrlib/send.py:185
7700
msgid "Format 0.9 does not permit bundle with no patch"
7701
msgstr "Формат 0.9 не разрешает пакеты без патчей"
7702
7703
#: bzrlib/shelf_ui.py:46
7704
#, python-format
7705
msgid "Shelve adding file \"%(path)s\"?"
7706
msgstr "Отложить добавление файла «%(path)s»?"
7707
7708
#: bzrlib/shelf_ui.py:47
7709
msgid "Shelve binary changes?"
7710
msgstr "Отложить двоичные изменения?"
7711
7712
#: bzrlib/shelf_ui.py:48
7713
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7714
msgstr "Отложить изменение «%s» из %(other)s в %(this)s?"
7715
7716
#: bzrlib/shelf_ui.py:50
7717
#, python-format
7718
msgid "Shelve removing file \"%(path)s\"?"
7719
msgstr "Отложить удаление файла «%(path)s»?"
7720
7721
#: bzrlib/shelf_ui.py:51
7722
#, python-format
7723
msgid "Shelve %d change(s)?"
7724
msgstr "Отложить %d изменений?"
7725
7726
#: bzrlib/shelf_ui.py:52
7727
msgid "Shelve?"
7728
msgstr "Отложить?"
7729
7730
#: bzrlib/shelf_ui.py:53
7731
#, python-format
7732
msgid ""
7733
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7734
msgstr "Отложить изменение цели «%(path)s» из «%(other)s» в «%(this)s»?"
7735
7736
#: bzrlib/shelf_ui.py:55
7737
#, python-format
7738
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7739
msgstr "Отложить переименование «%(other)s» => «%(this)s»?"
7740
7741
#: bzrlib/shelf_ui.py:70
7742
#, python-format
7743
msgid "Changes shelved with id \"%d\"."
7744
msgstr "Изменения отложены с id «%d»."
7745
7746
#: bzrlib/shelf_ui.py:74
7747
msgid "Selected changes destroyed."
7748
msgstr "Выбранные изменения уничтожены."
7749
7750
#: bzrlib/shelf_ui.py:78
7751
msgid "Selected changes:"
7752
msgstr "Выбранные изменения:"
7753
7754
#: bzrlib/shelf_ui.py:98
7755
#, python-format
7756
msgid "Delete file \"%(path)s\"?"
7757
msgstr "Удалить файл «%(path)s»?"
7758
7759
#: bzrlib/shelf_ui.py:99
7760
msgid "Apply binary changes?"
7761
msgstr "Применить двоичные изменения?"
7762
7763
#: bzrlib/shelf_ui.py:100
7764
#, python-format
7765
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7766
msgstr "Изменить «%(path)s» с %(this)s на %(other)s?"
7767
7768
#: bzrlib/shelf_ui.py:102
7769
#, python-format
7770
msgid "Add file \"%(path)s\"?"
7771
msgstr "Добавить файл «%(path)s»?"
7772
7773
#: bzrlib/shelf_ui.py:103
7774
#, python-format
7775
msgid "Apply %d change(s)?"
7776
msgstr "Применить %d изменений?"
7777
7778
#: bzrlib/shelf_ui.py:104
7779
msgid "Apply change?"
7780
msgstr "Применить изменение?"
7781
7782
#: bzrlib/shelf_ui.py:105
7783
#, python-format
7784
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7785
msgstr "Изменить цель «%(path)s» с «%(this)s» на «%(other)s»?"
7786
7787
#: bzrlib/shelf_ui.py:107
7788
#, python-format
7789
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7790
msgstr "Переименовать «%(this)s» => «%(other)s»?"
7791
7792
#: bzrlib/shelf_ui.py:402
7793
msgid "No changes are shelved."
7794
msgstr "Нет отложенных изменений."
7795
7796
#: bzrlib/shelf_ui.py:460
7797
#, python-format
7798
msgid "Using changes with id \"%d\"."
7799
msgstr "Используются изменения с id «%d»."
7800
7801
#: bzrlib/shelf_ui.py:464
7802
#, python-format
7803
msgid "Message: %s"
7804
msgstr "Сообщение: %s"
7805
7806
#: bzrlib/shelf_ui.py:476
7807
#, python-format
7808
msgid "Deleted changes with id \"%d\"."
7809
msgstr "Удалены изменения с id «%d»."
7810
7811
#: bzrlib/smart/medium.py:714
7812
msgid "HPSS calls: {0} ({1} vfs) {2}"
7813
msgstr "Вызовы HPSS: {0} ({1} vfs) {2}"
7814
7815
#: bzrlib/smart/server.py:169
7816
msgid "Requested to stop gracefully"
7817
msgstr ""
7818
7819
#: bzrlib/smart/server.py:179
7820
#, python-format
7821
msgid "Waiting for %d client(s) to finish"
7822
msgstr ""
7823
7824
#: bzrlib/smart/server.py:185
7825
#, python-format
7826
msgid "Still waiting for %d client(s) to finish"
7827
msgstr ""
7828
7829
#: bzrlib/smart/server.py:219
7830
#, python-format
7831
msgid "listening socket error: %s"
7832
msgstr ""
7833
7834
#: bzrlib/smart/server.py:452
7835
#, python-format
7836
msgid "listening on port: %s"
7837
msgstr "слушаю на порту: %s"
7838
7839
#: bzrlib/switch.py:73
7840
msgid "Pending merges must be committed or reverted before using switch."
7841
msgstr ""
7842
7843
#: bzrlib/switch.py:100
7844
msgid ""
7845
"Cannot switch as local commits found in the checkout. Commit these to the "
7846
"bound branch or use --force to throw them away."
7847
msgstr ""
7848
7849
#: bzrlib/switch.py:105
7850
#, python-format
7851
msgid ""
7852
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7853
"anyway, use --force."
7854
msgstr ""
7855
"Не удалось соединиться с текущей основной ветвью %(target)s: %(error)s Для "
7856
"принудительного переключения используйте --force."
7857
7858
#: bzrlib/switch.py:125
7859
msgid "Cannot switch a branch, only a checkout."
7860
msgstr ""
7861
7862
#: bzrlib/switch.py:163
7863
#, python-format
7864
msgid "Tree is up to date at revision %d."
7865
msgstr "Дерево в актуальной ревизии %d."
7866
7867
#: bzrlib/switch.py:169
7868
#, python-format
7869
msgid "Updated to revision %d."
7870
msgstr "Обновлено до ревизии %d."
7871
7872
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7873
msgid "Apply phase"
7874
msgstr "Применить фазу"
7875
7876
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7877
msgid "removing file"
7878
msgstr "удаление файла"
7879
7880
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7881
msgid "adding file"
7882
msgstr "добавление файла"
7883
7884
#: bzrlib/transform.py:2591
7885
msgid "Building tree"
7886
msgstr "Построение дерева"
7887
7888
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7889
msgid "Adding file contents"
7890
msgstr "Добавление содержимого файлй"
7891
7892
#: bzrlib/transform.py:3028
7893
msgid "Resolution pass"
7894
msgstr ""
7895
7896
#: bzrlib/transport/ftp/_gssapi.py:88
7897
#, python-format
7898
msgid "Authenticated as %s"
7899
msgstr ""
7900
7901
#: bzrlib/tree.py:634
7902
msgid "*** {0} content-filter: {1} => {2!r}"
7903
msgstr "*** {0} content-filter: {1} => {2!r}"
7904
7905
#: bzrlib/upgrade.py:77
7906
#, python-format
7907
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7908
msgstr "Это рабочая копия. Ветвь (%s) необходимо обновлять отдельно."
7909
7910
#: bzrlib/upgrade.py:100
7911
#, python-format
7912
msgid "cannot upgrade from bzrdir format %s"
7913
msgstr "нельзя обновить из формата bzrdir %s"
7914
7915
#: bzrlib/upgrade.py:103
7916
#, python-format
7917
msgid "starting upgrade of %s"
7918
msgstr "начинается обновление %s"
7919
7920
#: bzrlib/upgrade.py:110
7921
msgid "finished"
7922
msgstr "завершено"
7923
7924
#: bzrlib/upgrade.py:120
7925
msgid "Deleting backup.bzr"
7926
msgstr "Удаление backup.bzr"
7927
7928
#: bzrlib/upgrade.py:151
7929
msgid ""
7930
"\n"
7931
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7932
msgstr ""
7933
"\n"
7934
"СВОДКА: произведено {0} обновлений, {1} успешно, {2} неуспешно"
7935
7936
#: bzrlib/upgrade.py:208
7937
#, python-format
7938
msgid "Found %d dependent branches - upgrading ..."
7939
msgstr "Найдено %d зависящих ветвей - обновление ..."
7940
7941
#: bzrlib/upgrade.py:276
7942
msgid "Upgrading bzrdirs"
7943
msgstr "Обновление bzrdirs"
7944
7945
#: bzrlib/upgrade.py:282
7946
#, python-format
7947
msgid "Upgrading %s"
7948
msgstr "Обновление %s"
7949
7950
#: bzrlib/upgrade.py:283
7951
msgid "Upgrading {0} {1} ..."
7952
msgstr "Обновление {0} {1} ..."
7953
7954
#: bzrlib/upgrade.py:301
7955
msgid "Removing backup ..."
7956
msgstr "Удаление резервной копии ..."
7957
7958
#: bzrlib/upgrade.py:305
7959
msgid "failed to clean-up {0}: {1}"
7960
msgstr "не удалось очистить {0}: {1}"
7961
7962
#: bzrlib/vf_repository.py:1090
7963
msgid "inventories"
7964
msgstr ""
7965
7966
#: bzrlib/vf_repository.py:1116
7967
msgid "texts"
7968
msgstr ""
7969
7970
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7971
msgid "Calculating text parents"
7972
msgstr ""
7973
7974
#: bzrlib/vf_repository.py:1706
7975
msgid "Fetch texts"
7976
msgstr ""
7977
7978
#: bzrlib/vf_repository.py:2535
7979
msgid "loading text store"
7980
msgstr ""
7981
7982
#: bzrlib/vf_repository.py:2541
7983
msgid "checking text graph"
7984
msgstr ""
7985
7986
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7987
#: bzrlib/vf_repository.py:3124
7988
msgid "Transferring revisions"
7989
msgstr ""
7990
7991
#: bzrlib/win32utils.py:146
7992
msgid "Failed to GetProcessMemoryInfo()"
7993
msgstr "Не удалось выполнить GetProcessMemoryInfo()"
7994
7995
#: bzrlib/win32utils.py:167
7996
msgid "Cannot debug memory on win32 without ctypes or win32process"
7997
msgstr ""
7998
"Невозможно производить отладку памяти на win32 без ctypes или win32process"
7999
8000
#: bzrlib/win32utils.py:172
8001
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
8002
msgstr "WorkingSize {0:>7}КиБ\tPeakWorking {1:>7}КиБ\t{2}"
8003
8004
#: bzrlib/win32utils.py:180
8005
#, python-format
8006
msgid "WorkingSize %8d KiB"
8007
msgstr "WorkingSize %8d КиБ"
8008
8009
#: bzrlib/win32utils.py:181
8010
#, python-format
8011
msgid "PeakWorking %8d KiB"
8012
msgstr "PeakWorking %8d КиБ"
8013
8014
#: bzrlib/win32utils.py:182
8015
#, python-format
8016
msgid "PagefileUsage %8d KiB"
8017
msgstr "PagefileUsage %8d КиБ"
8018
8019
#: bzrlib/win32utils.py:183
8020
#, python-format
8021
msgid "PeakPagefileUsage %8d KiB"
8022
msgstr "PeakPagefileUsage %8d КиБ"
8023
8024
#: bzrlib/win32utils.py:185
8025
#, python-format
8026
msgid "PrivateUsage %8d KiB"
8027
msgstr "PrivateUsage %8d КиБ"
8028
8029
#: bzrlib/win32utils.py:186
8030
#, python-format
8031
msgid "PageFaultCount %8d"
8032
msgstr "PageFaultCount %8d"
8033
8034
#: bzrlib/workingtree.py:1478
8035
msgid "Rerun update after fixing the conflicts."
8036
msgstr "Снова запустите обновление после исправления конфликтов."
8037
8038
#: dummy/help_topics/authentication/summary.txt:1
8039
msgid "Information on configuring authentication"
8040
msgstr "Информация по настройке аутентификации"
8041
8042
#: dummy/help_topics/basic/detail.txt:1
8043
msgid ""
8044
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
8045
"http://bazaar.canonical.com/"
8046
msgstr ""
8047
8048
#: dummy/help_topics/basic/detail.txt:4
8049
msgid ""
8050
"Basic commands:\n"
8051
" bzr init makes this directory a versioned branch\n"
8052
" bzr branch make a copy of another branch"
8053
msgstr ""
8054
"Базовые команды:\n"
8055
" bzr init превратить директорию в ветвь системы версий\n"
8056
" bzr branch создать копию другой ветви"
8057
8058
#: dummy/help_topics/basic/detail.txt:8
8059
msgid ""
8060
" bzr add make files or directories versioned\n"
8061
" bzr ignore ignore a file or pattern\n"
8062
" bzr mv move or rename a versioned file"
8063
msgstr ""
8064
" bzr add добавить файлы или директории к системе контроля "
8065
"версий\n"
8066
" bzr ignore игнорировать файл или шаблон\n"
8067
" bzr mv переместить или переименовать файл в системе контроля "
8068
"версий"
8069
8070
#: dummy/help_topics/basic/detail.txt:12
8071
msgid ""
8072
" bzr status summarize changes in working copy\n"
8073
" bzr diff show detailed diffs"
8074
msgstr ""
8075
" bzr status вывести краткие изменения в рабочей копии\n"
8076
" bzr diff вывести подробные различия"
8077
8078
#: dummy/help_topics/basic/detail.txt:15
8079
msgid ""
8080
" bzr merge pull in changes from another branch\n"
8081
" bzr commit save some or all changes\n"
8082
" bzr send send changes via email"
8083
msgstr ""
8084
" bzr merge принять изменения из другой ветви\n"
8085
" bzr commit сохранить некоторые или все изменения\n"
8086
" bzr send переслать изменения по электронной почте"
8087
8088
#: dummy/help_topics/basic/detail.txt:19
8089
msgid ""
8090
" bzr log show history of changes\n"
8091
" bzr check validate storage"
8092
msgstr ""
8093
" bzr log показать историю изменений\n"
8094
" bzr check проверить целостность"
8095
8096
#: dummy/help_topics/basic/detail.txt:22
8097
msgid ""
8098
" bzr help init more help on e.g. init command\n"
8099
" bzr help commands list all commands\n"
8100
" bzr help topics list all help topics\n"
8101
msgstr ""
8102
" bzr help init подробные сведения например по команде init\n"
8103
" bzr help commands вывести список всех команд\n"
8104
" bzr help topics вывести список всех разделов справки\n"
8105
8106
#: dummy/help_topics/basic/summary.txt:1
8107
msgid "Basic commands"
8108
msgstr "Базовые команды"
8109
8110
#: dummy/help_topics/branches/detail.txt:1
8111
msgid "Branches"
8112
msgstr "Ветви"
8113
8114
#: dummy/help_topics/branches/detail.txt:3
8115
msgid ""
8116
"A branch consists of the state of a project, including all of its\n"
8117
"history. All branches have a repository associated (which is where the\n"
8118
"branch history is stored), but multiple branches may share the same\n"
8119
"repository (a shared repository). Branches can be copied and merged."
8120
msgstr ""
8121
8122
#: dummy/help_topics/branches/detail.txt:8
8123
msgid ""
8124
"In addition, one branch may be bound to another one. Binding to another\n"
8125
"branch indicates that commits which happen in this branch must also \n"
8126
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
8127
"commits when the two branches are out of date. In order for a commit \n"
8128
"to succeed, it may be necessary to update the current branch using \n"
8129
"``bzr update``."
8130
msgstr ""
8131
8132
#: dummy/help_topics/branches/detail.txt:15
8133
#: dummy/help_topics/checkouts/detail.txt:66
8134
#: dummy/help_topics/repositories/detail.txt:36
8135
msgid "Related commands::"
8136
msgstr "Связанные команды::"
8137
8138
#: dummy/help_topics/branches/detail.txt:17
8139
msgid ""
8140
" init Change a directory into a versioned branch.\n"
8141
" branch Create a new branch that is a copy of an existing branch.\n"
8142
" merge Perform a three-way merge.\n"
8143
" bind Bind a branch to another one.\n"
8144
msgstr ""
8145
8146
#: dummy/help_topics/branches/summary.txt:1
8147
msgid "Information on what a branch is"
8148
msgstr "Информация о том, что такое ветвь"
8149
8150
#: dummy/help_topics/bugs/summary.txt:1
8151
msgid "Bug tracker settings"
8152
msgstr "Установки трекера ошибок"
8153
8154
#: dummy/help_topics/checkouts/detail.txt:1
8155
msgid "Checkouts"
8156
msgstr "Рабочие копии"
8157
8158
#: dummy/help_topics/checkouts/detail.txt:3
8159
msgid ""
8160
"Checkouts are source trees that are connected to a branch, so that when\n"
8161
"you commit in the source tree, the commit goes into that branch. They\n"
8162
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
8163
"Bazaar's decentralized features until you want them. Using checkouts\n"
8164
"with shared repositories is very similar to working with SVN or CVS, but\n"
8165
"doesn't have the same restrictions. And using checkouts still allows\n"
8166
"others working on the project to use whatever workflow they like."
8167
msgstr ""
8168
8169
#: dummy/help_topics/checkouts/detail.txt:11
8170
msgid ""
8171
"A checkout is created with the bzr checkout command (see \"help "
8172
"checkout\").\n"
8173
"You pass it a reference to another branch, and it will create a local copy\n"
8174
"for you that still contains a reference to the branch you created the\n"
8175
"checkout from (the master branch). Then if you make any commits they will "
8176
"be\n"
8177
"made on the other branch first. This creates an instant mirror of your work, "
8178
"or\n"
8179
"facilitates lockstep development, where each developer is working together,\n"
8180
"continuously integrating the changes of others."
8181
msgstr ""
8182
8183
#: dummy/help_topics/checkouts/detail.txt:19
8184
msgid ""
8185
"However the checkout is still a first class branch in Bazaar terms, so that\n"
8186
"you have the full history locally. As you have a first class branch you "
8187
"can\n"
8188
"also commit locally if you want, for instance due to the temporary loss af "
8189
"a\n"
8190
"network connection. Use the --local option to commit to do this. All the "
8191
"local\n"
8192
"commits will then be made on the master branch the next time you do a non-"
8193
"local\n"
8194
"commit."
8195
msgstr ""
8196
8197
#: dummy/help_topics/checkouts/detail.txt:26
8198
msgid ""
8199
"If you are using a checkout from a shared branch you will periodically want "
8200
"to\n"
8201
"pull in all the changes made by others. This is done using the \"update\"\n"
8202
"command. The changes need to be applied before any non-local commit, but\n"
8203
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8204
"command when needed."
8205
msgstr ""
8206
8207
#: dummy/help_topics/checkouts/detail.txt:32
8208
msgid ""
8209
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8210
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8211
"SVN checkout in that it is not a first class branch, it mainly consists of "
8212
"the\n"
8213
"working tree. This means that any history operations must query the master\n"
8214
"branch, which could be slow if a network connection is involved. Also, as "
8215
"you\n"
8216
"don't have a local branch, then you cannot commit locally."
8217
msgstr ""
8218
8219
#: dummy/help_topics/checkouts/detail.txt:39
8220
msgid ""
8221
"Lightweight checkouts work best when you have fast reliable access to the\n"
8222
"master branch. This means that if the master branch is on the same disk or "
8223
"LAN\n"
8224
"a lightweight checkout will be faster than a heavyweight one for any "
8225
"commands\n"
8226
"that modify the revision history (as only one copy of the branch needs to\n"
8227
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8228
"that uses the history but does not change it, but if the master branch is "
8229
"on\n"
8230
"the same disk then there won't be a noticeable difference."
8231
msgstr ""
8232
8233
#: dummy/help_topics/checkouts/detail.txt:47
8234
msgid ""
8235
"Another possible use for a checkout is to use it with a treeless repository\n"
8236
"containing your branches, where you maintain only one working tree by\n"
8237
"switching the master branch that the checkout points to when you want to\n"
8238
"work on a different branch."
8239
msgstr ""
8240
8241
#: dummy/help_topics/checkouts/detail.txt:52
8242
msgid ""
8243
"Obviously to commit on a checkout you need to be able to write to the "
8244
"master\n"
8245
"branch. This means that the master branch must be accessible over a "
8246
"writeable\n"
8247
"protocol , such as sftp://, and that you have write permissions at the "
8248
"other\n"
8249
"end. Checkouts also work on the local file system, so that all that matters "
8250
"is\n"
8251
"file permissions."
8252
msgstr ""
8253
8254
#: dummy/help_topics/checkouts/detail.txt:58
8255
msgid ""
8256
"You can change the master of a checkout by using the \"switch\" command "
8257
"(see\n"
8258
"\"help switch\"). This will change the location that the commits are sent "
8259
"to.\n"
8260
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8261
"checkout. If you would like to convert your heavy checkout into a normal\n"
8262
"branch so that every commit is local, you can use the \"unbind\" command. To "
8263
"see\n"
8264
"whether or not a branch is bound or not you can use the \"info\" command. If "
8265
"the\n"
8266
"branch is bound it will tell you the location of the bound branch."
8267
msgstr ""
8268
8269
#: dummy/help_topics/checkouts/detail.txt:68
8270
msgid ""
8271
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
8272
" checkout\n"
8273
" update Pull any changes in the master branch in to your checkout\n"
8274
" commit Make a commit that is sent to the master branch. If you have\n"
8275
" a heavy checkout then the --local option will commit to the\n"
8276
" checkout without sending the commit to the master\n"
8277
" switch Change the master branch that the commits in the checkout "
8278
"will\n"
8279
" be sent to\n"
8280
" bind Turn a standalone branch into a heavy checkout so that any\n"
8281
" commits will be sent to the master branch\n"
8282
" unbind Turn a heavy checkout into a standalone branch so that any\n"
8283
" commits are only made locally\n"
8284
" info Displays whether a branch is bound or unbound. If the branch "
8285
"is\n"
8286
" bound, then it will also display the location of the bound "
8287
"branch\n"
8288
msgstr ""
8289
8290
#: dummy/help_topics/checkouts/summary.txt:1
8291
msgid "Information on what a checkout is"
8292
msgstr "Информация о том, что такое рабочая копия"
8293
8294
#: dummy/help_topics/commands/summary.txt:1
8295
msgid "Basic help for all commands"
8296
msgstr "Базовая справка по всем командам"
8297
8298
#: dummy/help_topics/configuration/summary.txt:1
8299
msgid "Details on the configuration settings available"
8300
msgstr ""
8301
8302
#: dummy/help_topics/conflict-types/summary.txt:1
8303
msgid "Types of conflicts and what to do about them"
8304
msgstr ""
8305
8306
#: dummy/help_topics/content-filters/summary.txt:1
8307
msgid "Conversion of content into/from working trees"
8308
msgstr ""
8309
8310
#: dummy/help_topics/criss-cross/detail.txt:1
8311
msgid "Criss-Cross"
8312
msgstr ""
8313
8314
#: dummy/help_topics/criss-cross/detail.txt:3
8315
msgid ""
8316
"A criss-cross in the branch history can cause the default merge technique\n"
8317
"to emit more conflicts than would normally be expected."
8318
msgstr ""
8319
8320
#: dummy/help_topics/criss-cross/detail.txt:6
8321
msgid ""
8322
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
8323
"give\n"
8324
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
8325
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
8326
msgstr ""
8327
8328
#: dummy/help_topics/criss-cross/detail.txt:10
8329
msgid ""
8330
"Criss-crosses occur in a branch's history if two branches merge the same "
8331
"thing\n"
8332
"and then merge one another, or if two branches merge one another at the "
8333
"same\n"
8334
"time. They can be avoided by having each branch only merge from or into a\n"
8335
"designated central branch (a \"star topology\")."
8336
msgstr ""
8337
8338
#: dummy/help_topics/criss-cross/detail.txt:15
8339
msgid ""
8340
"Criss-crosses cause problems because of the way merge works. Bazaar's "
8341
"default\n"
8342
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8343
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
8344
"differences between THIS and OTHER are due to one side adding lines, or\n"
8345
"from another side removing lines."
8346
msgstr ""
8347
8348
#: dummy/help_topics/criss-cross/detail.txt:21
8349
msgid ""
8350
"Criss-crosses mean there is no good choice for a base. Selecting the "
8351
"recent\n"
8352
"merge points could cause one side's changes to be silently discarded.\n"
8353
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8354
"are emitted."
8355
msgstr ""
8356
8357
#: dummy/help_topics/criss-cross/detail.txt:26
8358
msgid ""
8359
"The ``weave`` merge type is not affected by this problem because it uses\n"
8360
"line-origin detection instead of a basis revision to determine the cause of\n"
8361
"differences.\n"
8362
msgstr ""
8363
8364
#: dummy/help_topics/criss-cross/summary.txt:1
8365
msgid "Information on criss-cross merging"
8366
msgstr ""
8367
8368
#: dummy/help_topics/current-formats/summary.txt:1
8369
msgid "Current storage formats"
8370
msgstr ""
8371
8372
#: dummy/help_topics/debug-flags/summary.txt:1
8373
msgid "Options to show or record debug information"
8374
msgstr ""
8375
8376
#: dummy/help_topics/diverged-branches/summary.txt:1
8377
msgid "How to fix diverged branches"
8378
msgstr "Как исправлять отклонения ветвей"
8379
8380
#: dummy/help_topics/env-variables/detail.txt:1
8381
msgid "Environment Variables"
8382
msgstr "Переменные окружения"
8383
8384
#: dummy/help_topics/env-variables/detail.txt:3
8385
msgid ""
8386
"=================== "
8387
"===========================================================\n"
8388
"BZRPATH Path where bzr is to look for shell plugin external\n"
8389
" commands.\n"
8390
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8391
"EMAIL E-Mail address of the user.\n"
8392
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8393
"EDITOR Editor for editing commit messages.\n"
8394
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8395
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8396
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8397
"BZR_PLUGIN_PATH.\n"
8398
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8399
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8400
"and\n"
8401
" HOME.\n"
8402
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8403
"URLs).\n"
8404
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8405
"sshcorp,\n"
8406
" plink or lsh.\n"
8407
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8408
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8409
"BZR_COLUMNS Override implicit terminal width.\n"
8410
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8411
"(selftest)\n"
8412
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8413
"'text'.\n"
8414
"BZR_PDB Control whether to launch a debugger on error.\n"
8415
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8416
" breakin debugger.\n"
8417
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8418
"(instead\n"
8419
" of char-based).\n"
8420
"=================== "
8421
"===========================================================\n"
8422
msgstr ""
8423
8424
#: dummy/help_topics/env-variables/summary.txt:1
8425
msgid "Environment variable names and values"
8426
msgstr "Имена и значения переменных окружения"
8427
8428
#: dummy/help_topics/eol/summary.txt:1
8429
msgid "Information on end-of-line handling"
8430
msgstr "Информация по обработке конца строки"
8431
8432
#: dummy/help_topics/files/detail.txt:1
8433
msgid "Files"
8434
msgstr "Файлы"
8435
8436
#: dummy/help_topics/files/detail.txt:3
8437
msgid ""
8438
":On Unix: ~/.bazaar/bazaar.conf\n"
8439
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8440
"bazaar\\\\2.0\\\\bazaar.conf"
8441
msgstr ""
8442
":В Unix: ~/.bazaar/bazaar.conf\n"
8443
":В Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8444
"bazaar\\\\2.0\\\\bazaar.conf"
8445
8446
#: dummy/help_topics/files/detail.txt:6
8447
msgid ""
8448
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8449
"used to define general configuration that will be applied everywhere.\n"
8450
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8451
"commonly used options."
8452
msgstr ""
8453
8454
#: dummy/help_topics/files/detail.txt:11
8455
msgid "A typical config file might look something like::"
8456
msgstr "Типичный файл конфигурации может выглядеть как::"
8457
8458
#: dummy/help_topics/files/detail.txt:13
8459
msgid ""
8460
" [DEFAULT]\n"
8461
" email=John Doe <jdoe@isp.com>"
8462
msgstr ""
8463
" [DEFAULT]\n"
8464
" email=John Doe <jdoe@isp.com>"
8465
8466
#: dummy/help_topics/files/detail.txt:16
8467
msgid ""
8468
" [ALIASES]\n"
8469
" commit = commit --strict\n"
8470
" log10 = log --short -r -10..-1\n"
8471
msgstr ""
8472
" [ALIASES]\n"
8473
" commit = commit --strict\n"
8474
" log10 = log --short -r -10..-1\n"
8475
8476
#: dummy/help_topics/files/summary.txt:1
8477
msgid "Information on configuration and log files"
8478
msgstr "Информация по файлам конфигурации и журналам"
8479
8480
#: dummy/help_topics/formats/detail.txt:1
8481
msgid "Storage Formats"
8482
msgstr ""
8483
8484
#: dummy/help_topics/formats/detail.txt:3
8485
msgid ""
8486
"To ensure that older clients do not access data incorrectly,\n"
8487
"Bazaar's policy is to introduce a new storage format whenever\n"
8488
"new features requiring new metadata are added. New storage\n"
8489
"formats may also be introduced to improve performance and\n"
8490
"scalability."
8491
msgstr ""
8492
8493
#: dummy/help_topics/formats/detail.txt:9
8494
msgid ""
8495
"The newest format, 2a, is highly recommended. If your\n"
8496
"project is not using 2a, then you should suggest to the\n"
8497
"project owner to upgrade."
8498
msgstr ""
8499
8500
#: dummy/help_topics/formats/detail.txt:13
8501
msgid ""
8502
"\n"
8503
".. note::"
8504
msgstr ""
8505
"\n"
8506
".. замечание::"
8507
8508
#: dummy/help_topics/formats/detail.txt:16
8509
msgid ""
8510
" Some of the older formats have two variants:\n"
8511
" a plain one and a rich-root one. The latter include an additional\n"
8512
" field about the root of the tree. There is no performance cost\n"
8513
" for using a rich-root format but you cannot easily merge changes\n"
8514
" from a rich-root format into a plain format. As a consequence,\n"
8515
" moving a project to a rich-root format takes some co-ordination\n"
8516
" in that all contributors need to upgrade their repositories\n"
8517
" around the same time. 2a and all future formats will be\n"
8518
" implicitly rich-root."
8519
msgstr ""
8520
8521
#: dummy/help_topics/formats/detail.txt:26
8522
msgid ""
8523
"See :doc:`current-formats-help` for the complete list of\n"
8524
"currently supported formats. See :doc:`other-formats-help` for\n"
8525
"descriptions of any available experimental and deprecated formats.\n"
8526
msgstr ""
8527
8528
#: dummy/help_topics/formats/summary.txt:1
8529
msgid "Information on choosing a storage format"
8530
msgstr ""
8531
8532
#: dummy/help_topics/global-options/detail.txt:1
8533
msgid "Global Options"
8534
msgstr "Общие настройки"
8535
8536
#: dummy/help_topics/global-options/detail.txt:3
8537
msgid ""
8538
"These options may be used with any command, and may appear in front of any\n"
8539
"command. (e.g. ``bzr --profile help``)."
8540
msgstr ""
8541
8542
#: dummy/help_topics/global-options/detail.txt:6
8543
msgid ""
8544
"--version Print the version number. Must be supplied before the "
8545
"command.\n"
8546
"--no-aliases Do not process command aliases when running this command.\n"
8547
"--builtin Use the built-in version of a command, not the plugin "
8548
"version.\n"
8549
" This does not suppress other plugin effects.\n"
8550
"--no-plugins Do not process any plugins.\n"
8551
"--no-l10n Do not translate messages.\n"
8552
"--concurrency Number of processes that can be run concurrently (selftest)."
8553
msgstr ""
8554
8555
#: dummy/help_topics/global-options/detail.txt:14
8556
msgid ""
8557
"--profile Profile execution using the hotshot profiler.\n"
8558
"--lsprof Profile execution using the lsprof profiler.\n"
8559
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8560
" results to a specified file. If the filename ends with "
8561
"\".txt\",\n"
8562
" text format will be used. If the filename either starts "
8563
"with\n"
8564
" \"callgrind.out\" or end with \".callgrind\", the output will "
8565
"be\n"
8566
" formatted for use with KCacheGrind. Otherwise, the output\n"
8567
" will be a pickle.\n"
8568
"--coverage Generate line coverage report in the specified directory."
8569
msgstr ""
8570
8571
#: dummy/help_topics/global-options/detail.txt:24
8572
msgid ""
8573
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8574
"for\n"
8575
" the duration of the command. This can be used multiple times "
8576
"if\n"
8577
" several options need to be overridden."
8578
msgstr ""
8579
8580
#: dummy/help_topics/global-options/detail.txt:28
8581
msgid ""
8582
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8583
"information on profiling."
8584
msgstr ""
8585
8586
#: dummy/help_topics/global-options/detail.txt:31
8587
msgid ""
8588
"A number of debug flags are also available to assist troubleshooting and\n"
8589
"development. See :doc:`debug-flags-help`.\n"
8590
msgstr ""
8591
8592
#: dummy/help_topics/global-options/summary.txt:1
8593
msgid "Options that control how Bazaar runs"
8594
msgstr "Настройки, управляющие запуском Bazaar"
8595
8596
#: dummy/help_topics/hidden-commands/summary.txt:1
8597
msgid "All hidden commands"
8598
msgstr "Все скрытые команды"
8599
8600
#: dummy/help_topics/hooks/summary.txt:1
8601
msgid "Points at which custom processing can be added"
8602
msgstr ""
8603
8604
#: dummy/help_topics/launchpad/detail.txt:1
8605
msgid "Integration with Launchpad.net"
8606
msgstr "Интеграция с Launchpad.net"
8607
8608
#: dummy/help_topics/launchpad/detail.txt:3
8609
msgid ""
8610
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8611
"specification tracking."
8612
msgstr ""
8613
8614
#: dummy/help_topics/launchpad/detail.txt:6
8615
msgid ""
8616
"The bzr client (through the plugin called 'launchpad') has special\n"
8617
"features to communicate with Launchpad:"
8618
msgstr ""
8619
8620
#: dummy/help_topics/launchpad/detail.txt:9
8621
msgid ""
8622
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8623
"This\n"
8624
" is then used by the 'lp:' transport to download your branches using\n"
8625
" bzr+ssh://."
8626
msgstr ""
8627
8628
#: dummy/help_topics/launchpad/detail.txt:13
8629
msgid ""
8630
" * The 'lp:' transport uses Launchpad as a directory service: for "
8631
"example\n"
8632
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8633
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8634
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8635
msgstr ""
8636
8637
#: dummy/help_topics/launchpad/detail.txt:18
8638
msgid ""
8639
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8640
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8641
"lp:12345'\n"
8642
" will record a revision property that marks that revision as fixing\n"
8643
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8644
" automatically be linked to the bug report."
8645
msgstr ""
8646
8647
#: dummy/help_topics/launchpad/detail.txt:24
8648
msgid ""
8649
" * The register-branch command tells Launchpad about the url of a\n"
8650
" public branch. Launchpad will then mirror the branch, display\n"
8651
" its contents and allow it to be attached to bugs and other\n"
8652
" objects."
8653
msgstr ""
8654
8655
#: dummy/help_topics/launchpad/detail.txt:29
8656
msgid "For more information see http://help.launchpad.net/\n"
8657
msgstr "Больше информации можно найти на http://help.launchpad.net/\n"
8658
8659
#: dummy/help_topics/launchpad/summary.txt:1
8660
msgid "Using Bazaar with Launchpad.net"
8661
msgstr "Использование Bazaar с Launchpad.net"
8662
8663
#: dummy/help_topics/location-alias/summary.txt:1
8664
msgid "Aliases for remembered locations"
8665
msgstr ""
8666
8667
#: dummy/help_topics/log-formats/summary.txt:1
8668
msgid "Details on the logging formats available"
8669
msgstr ""
8670
8671
#: dummy/help_topics/other-formats/summary.txt:1
8672
msgid "Experimental and deprecated storage formats"
8673
msgstr ""
8674
8675
#: dummy/help_topics/patterns/summary.txt:1
8676
msgid "Information on the pattern syntax"
8677
msgstr ""
8678
8679
#: dummy/help_topics/repositories/detail.txt:1
8680
msgid "Repositories"
8681
msgstr ""
8682
8683
#: dummy/help_topics/repositories/detail.txt:3
8684
msgid ""
8685
"Repositories in Bazaar are where committed information is stored. There is\n"
8686
"a repository associated with every branch."
8687
msgstr ""
8688
8689
#: dummy/help_topics/repositories/detail.txt:6
8690
msgid ""
8691
"Repositories are a form of database. Bzr will usually maintain this for\n"
8692
"good performance automatically, but in some situations (e.g. when doing\n"
8693
"very many commits in a short time period) you may want to ask bzr to\n"
8694
"optimise the database indices. This can be done by the 'bzr pack' command."
8695
msgstr ""
8696
8697
#: dummy/help_topics/repositories/detail.txt:11
8698
msgid ""
8699
"By default just running 'bzr init' will create a repository within the new\n"
8700
"branch but it is possible to create a shared repository which allows "
8701
"multiple\n"
8702
"branches to share their information in the same location. When a new branch "
8703
"is\n"
8704
"created it will first look to see if there is a containing shared repository "
8705
"it\n"
8706
"can use."
8707
msgstr ""
8708
8709
#: dummy/help_topics/repositories/detail.txt:17
8710
msgid ""
8711
"When two branches of the same project share a repository, there is\n"
8712
"generally a large space saving. For some operations (e.g. branching\n"
8713
"within the repository) this translates in to a large time saving."
8714
msgstr ""
8715
8716
#: dummy/help_topics/repositories/detail.txt:21
8717
msgid ""
8718
"To create a shared repository use the init-repository command (or the alias\n"
8719
"init-repo). This command takes the location of the repository to create. "
8720
"This\n"
8721
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8722
"which contains a shared repository. Any new branches that are created in "
8723
"this\n"
8724
"directory will then use it for storage."
8725
msgstr ""
8726
8727
#: dummy/help_topics/repositories/detail.txt:27
8728
msgid ""
8729
"It is a good idea to create a repository whenever you might create more\n"
8730
"than one branch of a project. This is true for both working areas where you\n"
8731
"are doing the development, and any server areas that you use for hosting\n"
8732
"projects. In the latter case, it is common to want branches without working\n"
8733
"trees. Since the files in the branch will not be edited directly there is "
8734
"no\n"
8735
"need to use up disk space for a working tree. To create a repository in "
8736
"which\n"
8737
"the branches will not have working trees pass the '--no-trees' option to\n"
8738
"'init-repository'."
8739
msgstr ""
8740
8741
#: dummy/help_topics/repositories/detail.txt:38
8742
msgid ""
8743
" init-repository Create a shared repository. Use --no-trees to create "
8744
"one\n"
8745
" in which new branches won't get a working tree.\n"
8746
msgstr ""
8747
8748
#: dummy/help_topics/repositories/summary.txt:1
8749
msgid "Basic information on shared repositories."
8750
msgstr "Базовая информация об общих репозиториях."
8751
8752
#: dummy/help_topics/revisionspec/summary.txt:1
8753
msgid "Explain how to use --revision"
8754
msgstr ""
8755
8756
#: dummy/help_topics/rules/summary.txt:1
8757
msgid "Information on defining rule-based preferences"
8758
msgstr ""
8759
8760
#: dummy/help_topics/standalone-trees/detail.txt:1
8761
msgid "Standalone Trees"
8762
msgstr ""
8763
8764
#: dummy/help_topics/standalone-trees/detail.txt:3
8765
msgid ""
8766
"A standalone tree is a working tree with an associated repository. It\n"
8767
"is an independently usable branch, with no dependencies on any other.\n"
8768
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8769
"an existing project under version control."
8770
msgstr ""
8771
8772
#: dummy/help_topics/standalone-trees/detail.txt:8
8773
msgid "Related Commands::"
8774
msgstr ""
8775
8776
#: dummy/help_topics/standalone-trees/detail.txt:10
8777
msgid " init Make a directory into a versioned branch.\n"
8778
msgstr ""
8779
8780
#: dummy/help_topics/standalone-trees/summary.txt:1
8781
msgid "Information on what a standalone tree is"
8782
msgstr ""
8783
8784
#: dummy/help_topics/standard-options/detail.txt:1
8785
msgid "Standard Options"
8786
msgstr ""
8787
8788
#: dummy/help_topics/standard-options/detail.txt:3
8789
msgid "Standard options are legal for all commands."
8790
msgstr ""
8791
8792
#: dummy/help_topics/standard-options/detail.txt:5
8793
msgid ""
8794
"--help, -h Show help message.\n"
8795
"--verbose, -v Display more information.\n"
8796
"--quiet, -q Only display errors and warnings."
8797
msgstr ""
8798
8799
#: dummy/help_topics/standard-options/detail.txt:9
8800
msgid "Unlike global options, standard options can be used in aliases.\n"
8801
msgstr ""
8802
8803
#: dummy/help_topics/standard-options/summary.txt:1
8804
msgid "Options that can be used with any command"
8805
msgstr ""
8806
8807
#: dummy/help_topics/status-flags/detail.txt:1
8808
msgid "Status Flags"
8809
msgstr ""
8810
8811
#: dummy/help_topics/status-flags/detail.txt:3
8812
msgid ""
8813
"Status flags are used to summarise changes to the working tree in a concise\n"
8814
"manner. They are in the form::"
8815
msgstr ""
8816
8817
#: dummy/help_topics/status-flags/detail.txt:6
8818
msgid " xxx <filename>"
8819
msgstr ""
8820
8821
#: dummy/help_topics/status-flags/detail.txt:8
8822
msgid "where the columns' meanings are as follows."
8823
msgstr ""
8824
8825
#: dummy/help_topics/status-flags/detail.txt:10
8826
msgid "Column 1 - versioning/renames::"
8827
msgstr ""
8828
8829
#: dummy/help_topics/status-flags/detail.txt:12
8830
msgid ""
8831
" + File versioned\n"
8832
" - File unversioned\n"
8833
" R File renamed\n"
8834
" ? File unknown\n"
8835
" X File nonexistent (and unknown to bzr)\n"
8836
" C File has conflicts\n"
8837
" P Entry for a pending merge (not a file)"
8838
msgstr ""
8839
8840
#: dummy/help_topics/status-flags/detail.txt:20
8841
msgid "Column 2 - contents::"
8842
msgstr ""
8843
8844
#: dummy/help_topics/status-flags/detail.txt:22
8845
msgid ""
8846
" N File created\n"
8847
" D File deleted\n"
8848
" K File kind changed\n"
8849
" M File modified"
8850
msgstr ""
8851
" N Файл создан\n"
8852
" D Файл удалён\n"
8853
" K Тип файла изменился\n"
8854
" M Файл изменён"
8855
8856
#: dummy/help_topics/status-flags/detail.txt:27
8857
msgid "Column 3 - execute::"
8858
msgstr ""
8859
8860
#: dummy/help_topics/status-flags/detail.txt:29
8861
msgid " * The execute bit was changed\n"
8862
msgstr ""
8863
8864
#: dummy/help_topics/status-flags/summary.txt:1
8865
msgid "Help on status flags"
8866
msgstr ""
8867
8868
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8869
msgid "Branches Out of Sync"
8870
msgstr ""
8871
8872
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8873
msgid ""
8874
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8875
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8876
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8877
"have the same last revision as the new reference branch for the lightweight\n"
8878
"checkout, data could be lost, so Bazaar refuses."
8879
msgstr ""
8880
8881
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8882
msgid "How you deal with this depends on *why* the branches are out of sync."
8883
msgstr ""
8884
8885
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8886
msgid ""
8887
"If you have a checkout and have done local commits, you can get back in "
8888
"sync\n"
8889
"by running \"bzr update\" (and possibly \"bzr commit\")."
8890
msgstr ""
8891
8892
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8893
msgid ""
8894
"If you have a branch and the remote branch is out-of-date, you can push\n"
8895
"the local changes using \"bzr push\". If the local branch is out of date, "
8896
"you\n"
8897
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8898
"commit\n"
8899
"and then push your changes. If you decide that some of the changes aren't\n"
8900
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8901
msgstr ""
8902
8903
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8904
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8905
msgstr ""
8906
8907
#: dummy/help_topics/topics/summary.txt:1
8908
msgid "Topics list"
8909
msgstr ""
8910
8911
#: dummy/help_topics/url-special-chars/summary.txt:1
8912
msgid "Special character handling in URLs"
8913
msgstr ""
8914
8915
#: dummy/help_topics/urlspec/summary.txt:1
8916
msgid "Supported transport protocols"
8917
msgstr ""
8918
8919
#: dummy/help_topics/working-trees/detail.txt:1
8920
msgid "Working Trees"
8921
msgstr ""
8922
8923
#: dummy/help_topics/working-trees/detail.txt:3
8924
msgid ""
8925
"A working tree is the contents of a branch placed on disk so that you can\n"
8926
"see the files and edit them. The working tree is where you make changes to "
8927
"a\n"
8928
"branch, and when you commit the current state of the working tree is the\n"
8929
"snapshot that is recorded in the commit."
8930
msgstr ""
8931
8932
#: dummy/help_topics/working-trees/detail.txt:8
8933
msgid ""
8934
"When you push a branch to a remote system, a working tree will not be\n"
8935
"created. If one is already present the files will not be updated. The\n"
8936
"branch information will be updated and the working tree will be marked\n"
8937
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8938
"may be uncommitted changes or the update may cause content conflicts that "
8939
"are\n"
8940
"difficult to deal with remotely."
8941
msgstr ""
8942
8943
#: dummy/help_topics/working-trees/detail.txt:15
8944
msgid ""
8945
"If you have a branch with no working tree you can use the 'checkout' "
8946
"command\n"
8947
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8948
"will\n"
8949
"create the working tree. If the branch is updated remotely, you can update "
8950
"the\n"
8951
"working tree by running 'bzr update' in that directory."
8952
msgstr ""
8953
8954
#: dummy/help_topics/working-trees/detail.txt:20
8955
msgid ""
8956
"If you have a branch with a working tree that you do not want the 'remove-"
8957
"tree'\n"
8958
"command will remove the tree if it is safe. This can be done to avoid the\n"
8959
"warning about the remote working tree not being updated when pushing to the\n"
8960
"branch. It can also be useful when working with a '--no-trees' repository\n"
8961
"(see 'bzr help repositories')."
8962
msgstr ""
8963
8964
#: dummy/help_topics/working-trees/detail.txt:26
8965
msgid ""
8966
"If you want to have a working tree on a remote machine that you push to you\n"
8967
"can either run 'bzr update' in the remote branch after each push, or use "
8968
"some\n"
8969
"other method to update the tree during the push. There is an 'rspush' "
8970
"plugin\n"
8971
"that will update the working tree using rsync as well as doing a push. "
8972
"There\n"
8973
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8974
"SSH\n"
8975
"after each push."
8976
msgstr ""
8977
8978
#: dummy/help_topics/working-trees/detail.txt:33
8979
msgid "Useful commands::"
8980
msgstr ""
8981
8982
#: dummy/help_topics/working-trees/detail.txt:35
8983
msgid ""
8984
" checkout Create a working tree when a branch does not have one.\n"
8985
" remove-tree Removes the working tree from a branch when it is safe to do "
8986
"so.\n"
8987
" update When a working tree is out of sync with its associated "
8988
"branch\n"
8989
" this will update the tree to match the branch.\n"
8990
msgstr ""
8991
8992
#: dummy/help_topics/working-trees/summary.txt:1
8993
msgid "Information on working trees"
8994
msgstr ""
8995
8996
#: en/help_topics/authentication.txt:1
8997
msgid ""
8998
"Authentication Settings\n"
8999
"======================="
9000
msgstr ""
9001
9002
#: en/help_topics/authentication.txt:4
9003
msgid ""
9004
"\n"
9005
"Intent\n"
9006
"------"
9007
msgstr ""
9008
9009
#: en/help_topics/authentication.txt:8
9010
msgid ""
9011
"Many different authentication policies can be described in the\n"
9012
"``authentication.conf`` file but a particular user should need only a few\n"
9013
"definitions to cover his needs without having to specify a user and a "
9014
"password\n"
9015
"for every branch he uses."
9016
msgstr ""
9017
9018
#: en/help_topics/authentication.txt:13
9019
msgid ""
9020
"The definitions found in this file are used to find the credentials to use "
9021
"for\n"
9022
"a given url. The same credentials can generally be used for as many branches "
9023
"as\n"
9024
"possible by grouping their declaration around the remote servers that need\n"
9025
"them. It's even possible to declare credentials that will be used by "
9026
"different\n"
9027
"servers."
9028
msgstr ""
9029
9030
#: en/help_topics/authentication.txt:19
9031
msgid ""
9032
"The intent is to make this file as small as possible to minimize maintenance."
9033
msgstr ""
9034
9035
#: en/help_topics/authentication.txt:21
9036
msgid ""
9037
"Once the relevant credentials are declared in this file you may use branch "
9038
"urls\n"
9039
"without embedding passwords (security hazard) or even users (enabling "
9040
"sharing\n"
9041
"of your urls with others)."
9042
msgstr ""
9043
9044
#: en/help_topics/authentication.txt:25
9045
msgid "Instead of using::"
9046
msgstr "Вместо использования::"
9047
9048
#: en/help_topics/authentication.txt:27
9049
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
9050
msgstr " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
9051
9052
#: en/help_topics/authentication.txt:29
9053
msgid "you simply use::"
9054
msgstr "можно просто использовать::"
9055
9056
#: en/help_topics/authentication.txt:31
9057
msgid " bzr branch ftp://host.com/path/to/my/branch"
9058
msgstr " bzr branch ftp://host.com/path/to/my/branch"
9059
9060
#: en/help_topics/authentication.txt:33
9061
msgid ""
9062
"provided you have created the following ``authentication.conf`` file::"
9063
msgstr ""
9064
9065
#: en/help_topics/authentication.txt:35
9066
msgid ""
9067
" [myprojects]\n"
9068
" scheme=ftp\n"
9069
" host=host.com\n"
9070
" user=joe\n"
9071
" password=secret\n"
9072
" "
9073
msgstr ""
9074
" [myprojects]\n"
9075
" scheme=ftp\n"
9076
" host=host.com\n"
9077
" user=joe\n"
9078
" password=secret\n"
9079
" "
9080
9081
#: en/help_topics/authentication.txt:42
9082
msgid ""
9083
"Authentication definitions\n"
9084
"--------------------------"
9085
msgstr ""
9086
9087
#: en/help_topics/authentication.txt:45
9088
msgid ""
9089
"There are two kinds of authentication used by the various schemes supported "
9090
"by\n"
9091
"bzr:"
9092
msgstr ""
9093
9094
#: en/help_topics/authentication.txt:48
9095
msgid "1. user and password"
9096
msgstr ""
9097
9098
#: en/help_topics/authentication.txt:50
9099
msgid ""
9100
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
9101
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
9102
"ssh agents are a better, more secure solution. So we have chosen to not "
9103
"provide\n"
9104
"our own less secure method."
9105
msgstr ""
9106
9107
#: en/help_topics/authentication.txt:55
9108
msgid "2. user, realm and password"
9109
msgstr ""
9110
9111
#: en/help_topics/authentication.txt:57
9112
msgid ""
9113
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
9114
"against a host. But, by using ``.htaccess`` files, for example, it is "
9115
"possible\n"
9116
"to define several (``user, realm, password``) for a given ``host``. So what "
9117
"is\n"
9118
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
9119
"is\n"
9120
"not taken into account in the definitions, but will displayed if bzr "
9121
"prompts\n"
9122
"you for a password."
9123
msgstr ""
9124
9125
#: en/help_topics/authentication.txt:64
9126
msgid ""
9127
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
9128
"specifying the appropriate port."
9129
msgstr ""
9130
9131
#: en/help_topics/authentication.txt:67
9132
msgid ""
9133
"To take all schemes into account, the password will be deduced from a set "
9134
"of\n"
9135
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
9136
"``user``,\n"
9137
"``password``)."
9138
msgstr ""
9139
9140
#: en/help_topics/authentication.txt:71
9141
msgid ""
9142
" * ``scheme``: can be empty (meaning the rest of the definition can be "
9143
"used\n"
9144
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
9145
"``ssh``\n"
9146
" should be used instead since this is the real scheme regarding\n"
9147
" authentication,"
9148
msgstr ""
9149
9150
#: en/help_topics/authentication.txt:76
9151
msgid " * ``host``: can be empty (to act as a default for any host),"
9152
msgstr ""
9153
9154
#: en/help_topics/authentication.txt:78
9155
msgid ""
9156
" * ``port`` can be empty (useful when an host provides several servers for "
9157
"the\n"
9158
" same scheme), only numerical values are allowed, this should be used "
9159
"only\n"
9160
" when the server uses a port different than the scheme standard port,"
9161
msgstr ""
9162
9163
#: en/help_topics/authentication.txt:82
9164
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
9165
msgstr ""
9166
9167
#: en/help_topics/authentication.txt:84
9168
msgid ""
9169
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
9170
" ``getpass.get_user()``),"
9171
msgstr ""
9172
9173
#: en/help_topics/authentication.txt:87
9174
msgid ""
9175
" * ``password``: can be empty if you prefer to always be prompted for your\n"
9176
" password."
9177
msgstr ""
9178
9179
#: en/help_topics/authentication.txt:90
9180
msgid ""
9181
"Multiple definitions can be provided and, for a given URL, bzr will select "
9182
"a\n"
9183
"(``user`` [, ``password``]) based on the following rules :"
9184
msgstr ""
9185
9186
#: en/help_topics/authentication.txt:93
9187
msgid " 1. the first match wins,"
9188
msgstr ""
9189
9190
#: en/help_topics/authentication.txt:95
9191
msgid " 2. empty fields match everything,"
9192
msgstr ""
9193
9194
#: en/help_topics/authentication.txt:97
9195
msgid ""
9196
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
9197
msgstr ""
9198
9199
#: en/help_topics/authentication.txt:99
9200
msgid ""
9201
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
9202
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
9203
"``projectbzr.sf.net``\n"
9204
" will not match ``bzr.sf.net``)."
9205
msgstr ""
9206
9207
#: en/help_topics/authentication.txt:103
9208
msgid ""
9209
" 5. ``port`` matches if included in the requested URL (exact matches only)"
9210
msgstr ""
9211
9212
#: en/help_topics/authentication.txt:105
9213
msgid ""
9214
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
9215
"above,\n"
9216
" empty paths will match any provided path)."
9217
msgstr ""
9218
9219
#: en/help_topics/authentication.txt:110
9220
msgid ""
9221
"File format\n"
9222
"-----------"
9223
msgstr ""
9224
9225
#: en/help_topics/authentication.txt:113
9226
msgid ""
9227
"The general rules for :doc:`configuration files <configuration-help>`\n"
9228
"apply except for the variable policies."
9229
msgstr ""
9230
9231
#: en/help_topics/authentication.txt:116
9232
msgid "Each section describes an authentication definition."
9233
msgstr ""
9234
9235
#: en/help_topics/authentication.txt:118
9236
msgid ""
9237
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9238
"reserved\n"
9239
"and should appear as the *last* section."
9240
msgstr ""
9241
9242
#: en/help_topics/authentication.txt:121
9243
msgid "Each section should define:"
9244
msgstr ""
9245
9246
#: en/help_topics/authentication.txt:123
9247
msgid "* ``user``: the login to be used,"
9248
msgstr ""
9249
9250
#: en/help_topics/authentication.txt:125
9251
msgid "Each section could define:"
9252
msgstr ""
9253
9254
#: en/help_topics/authentication.txt:127
9255
msgid "* ``host``: the remote server,"
9256
msgstr ""
9257
9258
#: en/help_topics/authentication.txt:129
9259
msgid "* ``port``: the port the server is listening,"
9260
msgstr ""
9261
9262
#: en/help_topics/authentication.txt:131
9263
msgid "* ``path``: the branch location,"
9264
msgstr ""
9265
9266
#: en/help_topics/authentication.txt:133
9267
msgid "* ``password``: the password."
9268
msgstr ""
9269
9270
#: en/help_topics/authentication.txt:135
9271
msgid ""
9272
"\n"
9273
"Examples\n"
9274
"--------"
9275
msgstr ""
9276
9277
#: en/help_topics/authentication.txt:139
9278
msgid ""
9279
"\n"
9280
"Personal projects hosted outside\n"
9281
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9282
msgstr ""
9283
9284
#: en/help_topics/authentication.txt:143
9285
msgid ""
9286
"All connections are done with the same ``user`` (the remote one for which "
9287
"the\n"
9288
"default bzr one is not appropriate) and the password is always prompted "
9289
"with\n"
9290
"some exceptions::"
9291
msgstr ""
9292
9293
#: en/help_topics/authentication.txt:147
9294
msgid ""
9295
" # Pet projects on hobby.net\n"
9296
" [hobby]\n"
9297
" host=r.hobby.net\n"
9298
" user=jim\n"
9299
" password=obvious1234\n"
9300
" \n"
9301
" # Home server\n"
9302
" [home]\n"
9303
" scheme=https\n"
9304
" host=home.net\n"
9305
" user=joe\n"
9306
" password=1essobV10us\n"
9307
" \n"
9308
" [DEFAULT]\n"
9309
" # Our local user is barbaz, on all remote sites we're known as "
9310
"foobar\n"
9311
" user=foobar"
9312
msgstr ""
9313
9314
#: en/help_topics/authentication.txt:164
9315
msgid ""
9316
"\n"
9317
"Source hosting provider\n"
9318
"~~~~~~~~~~~~~~~~~~~~~~~"
9319
msgstr ""
9320
9321
#: en/help_topics/authentication.txt:168
9322
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9323
msgstr ""
9324
9325
#: en/help_topics/authentication.txt:170
9326
msgid ""
9327
" [shpnet domain]\n"
9328
" # we use sftp, but ssh is the scheme used for authentication\n"
9329
" scheme=ssh\n"
9330
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9331
" host=.shp.net\n"
9332
" user=joe\n"
9333
" # bzr don't support supplying a password for sftp,\n"
9334
" # consider using an ssh agent if you don't want to supply\n"
9335
" # a password interactively. (pageant, ssh-agent, etc)"
9336
msgstr ""
9337
9338
#: en/help_topics/authentication.txt:180
9339
msgid ""
9340
"HTTPS, SFTP servers and their proxy\n"
9341
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9342
msgstr ""
9343
9344
#: en/help_topics/authentication.txt:183
9345
msgid ""
9346
"At company.com, the server hosting release and integration branches is "
9347
"behind a\n"
9348
"proxy, and the two branches use different authentication policies::"
9349
msgstr ""
9350
9351
#: en/help_topics/authentication.txt:186
9352
msgid ""
9353
" [reference code]\n"
9354
" scheme=https\n"
9355
" host=dev.company.com\n"
9356
" path=/dev\n"
9357
" user=user1\n"
9358
" password=pass1"
9359
msgstr ""
9360
9361
#: en/help_topics/authentication.txt:193
9362
msgid ""
9363
" # development branches on dev server\n"
9364
" [dev]\n"
9365
" scheme=ssh # bzr+ssh and sftp are available here\n"
9366
" host=dev.company.com\n"
9367
" path=/dev/integration\n"
9368
" user=user2\n"
9369
" \n"
9370
" # proxy\n"
9371
" [proxy]\n"
9372
" scheme=http\n"
9373
" host=proxy.company.com\n"
9374
" port=3128\n"
9375
" user=proxyuser1\n"
9376
" password=proxypass1"
9377
msgstr ""
9378
9379
#: en/help_topics/authentication.txt:208
9380
msgid ""
9381
"\n"
9382
"Planned enhancements\n"
9383
"--------------------"
9384
msgstr ""
9385
9386
#: en/help_topics/authentication.txt:212
9387
msgid ""
9388
"The following are not yet implemented but planned as parts of a work in\n"
9389
"progress:"
9390
msgstr ""
9391
9392
#: en/help_topics/authentication.txt:215
9393
msgid "* add a ``password_encoding`` field allowing:"
9394
msgstr ""
9395
9396
#: en/help_topics/authentication.txt:217
9397
msgid ""
9398
" - storing the passwords in various obfuscating encodings (base64 for one),"
9399
msgstr ""
9400
9401
#: en/help_topics/authentication.txt:219
9402
msgid " - delegate password storage to plugins (.netrc for example)."
9403
msgstr ""
9404
9405
#: en/help_topics/authentication.txt:221
9406
msgid ""
9407
"* update the credentials when the user is prompted for user or password,"
9408
msgstr ""
9409
9410
#: en/help_topics/authentication.txt:223
9411
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9412
msgstr ""
9413
9414
#: en/help_topics/authentication.txt:225
9415
msgid ""
9416
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9417
"but\n"
9418
"ignored in the actual implementation.\n"
9419
msgstr ""
9420
9421
#: en/help_topics/bugs.txt:1
9422
msgid "Bug Tracker Settings"
9423
msgstr ""
9424
9425
#: en/help_topics/bugs.txt:3
9426
msgid ""
9427
"When making a commit, metadata about bugs fixed by that change can be\n"
9428
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9429
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9430
"(The only ``status`` value currently supported is ``fixed.``)"
9431
msgstr ""
9432
9433
#: en/help_topics/bugs.txt:8
9434
msgid ""
9435
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9436
"identifier\n"
9437
"rather than a full URL. This looks like::"
9438
msgstr ""
9439
9440
#: en/help_topics/bugs.txt:11
9441
msgid " bzr commit --fixes <tracker>:<id>"
9442
msgstr ""
9443
9444
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9445
msgid "or::"
9446
msgstr ""
9447
9448
#: en/help_topics/bugs.txt:15
9449
msgid " bzr commit --fixes <id>"
9450
msgstr ""
9451
9452
#: en/help_topics/bugs.txt:17
9453
msgid ""
9454
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9455
"the\n"
9456
"identifier for that bug within the bugtracker, usually the bug number.\n"
9457
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9458
"or global configuration is used."
9459
msgstr ""
9460
9461
#: en/help_topics/bugs.txt:22
9462
msgid ""
9463
"Bazaar knows about a few bug trackers that have many users. If\n"
9464
"you use one of these bug trackers then there is no setup required to\n"
9465
"use this feature, you just need to know the tracker identifier to use.\n"
9466
"These are the bugtrackers that are built in:"
9467
msgstr ""
9468
9469
#: en/help_topics/bugs.txt:27
9470
msgid ""
9471
" ============================ ============ ============\n"
9472
" URL Abbreviation Example\n"
9473
" ============================ ============ ============\n"
9474
" https://bugs.launchpad.net/ lp lp:12345\n"
9475
" http://bugs.debian.org/ deb deb:12345\n"
9476
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9477
" ============================ ============ ============"
9478
msgstr ""
9479
9480
#: en/help_topics/bugs.txt:35
9481
msgid ""
9482
"For the bug trackers not listed above configuration is required.\n"
9483
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9484
"is built in, along with a template mechanism for other bugtrackers with\n"
9485
"simple URL schemes. If your bug tracker can't be described by one\n"
9486
"of the schemes described below then you can write a plugin to support\n"
9487
"it."
9488
msgstr ""
9489
9490
#: en/help_topics/bugs.txt:42
9491
msgid ""
9492
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9493
"variable which contains the base URL of the bug tracker. These options\n"
9494
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9495
"configuration section in ``locations.conf``. You can set up these values\n"
9496
"for each of the projects you work on."
9497
msgstr ""
9498
9499
#: en/help_topics/bugs.txt:48
9500
msgid ""
9501
"Note: As you provide a short name for each tracker, you can specify one or\n"
9502
"more bugs in one or more trackers at commit time if you wish."
9503
msgstr ""
9504
9505
#: en/help_topics/bugs.txt:51
9506
msgid ""
9507
"Launchpad\n"
9508
"---------"
9509
msgstr ""
9510
9511
#: en/help_topics/bugs.txt:54
9512
msgid ""
9513
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9514
msgstr ""
9515
9516
#: en/help_topics/bugs.txt:56
9517
msgid ""
9518
"bugzilla_<tracker>_url\n"
9519
"----------------------"
9520
msgstr ""
9521
9522
#: en/help_topics/bugs.txt:59
9523
msgid ""
9524
"If present, the location of the Bugzilla bug tracker referred to by\n"
9525
"<tracker>. This option can then be used together with ``bzr commit\n"
9526
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9527
"example::"
9528
msgstr ""
9529
9530
#: en/help_topics/bugs.txt:64
9531
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9532
msgstr ""
9533
9534
#: en/help_topics/bugs.txt:66
9535
msgid ""
9536
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9537
"fixed."
9538
msgstr ""
9539
9540
#: en/help_topics/bugs.txt:69
9541
msgid ""
9542
"trac_<tracker>_url\n"
9543
"------------------"
9544
msgstr ""
9545
9546
#: en/help_topics/bugs.txt:72
9547
msgid ""
9548
"If present, the location of the Trac instance referred to by\n"
9549
"<tracker>. This option can then be used together with ``bzr commit\n"
9550
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9551
"example::"
9552
msgstr ""
9553
9554
#: en/help_topics/bugs.txt:77
9555
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9556
msgstr ""
9557
9558
#: en/help_topics/bugs.txt:79
9559
msgid ""
9560
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9561
"as\n"
9562
"fixed."
9563
msgstr ""
9564
9565
#: en/help_topics/bugs.txt:82
9566
msgid ""
9567
"bugtracker_<tracker>_url\n"
9568
"------------------------"
9569
msgstr ""
9570
9571
#: en/help_topics/bugs.txt:85
9572
msgid ""
9573
"If present, the location of a generic bug tracker instance referred to by\n"
9574
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9575
"which will be replaced by a specific bug ID. This option can then be used\n"
9576
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9577
"fixed by that commit. For example::"
9578
msgstr ""
9579
9580
#: en/help_topics/bugs.txt:91
9581
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9582
msgstr ""
9583
9584
#: en/help_topics/bugs.txt:93
9585
msgid ""
9586
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9587
"Roundup bug tracker as fixed, or::"
9588
msgstr ""
9589
9590
#: en/help_topics/bugs.txt:96
9591
msgid ""
9592
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9593
msgstr ""
9594
9595
#: en/help_topics/bugs.txt:98
9596
msgid ""
9597
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9598
"RT bug tracker as fixed, or::"
9599
msgstr ""
9600
9601
#: en/help_topics/bugs.txt:101
9602
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9603
msgstr ""
9604
9605
#: en/help_topics/bugs.txt:103
9606
msgid ""
9607
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9608
"1234\n"
9609
"in Hudson's JIRA bug tracker as fixed.\n"
9610
msgstr ""
9611
9612
#: en/help_topics/commands.txt:1
9613
msgid ""
9614
"add Add specified files or directories.\n"
9615
"alias Set/unset and display aliases.\n"
9616
"annotate Show the origin of each line in a file.\n"
9617
"bash-completion Generate a shell function for bash command line "
9618
"completion.\n"
9619
" [bash_completion]\n"
9620
"bind Convert the current branch into a checkout of the "
9621
"supplied\n"
9622
" branch.\n"
9623
"branch Create a new branch that is a copy of an existing branch.\n"
9624
"branches List the branches available at the current location.\n"
9625
"break-lock Break a dead lock.\n"
9626
"cat Write the contents of a file as of a given revision to\n"
9627
" standard output.\n"
9628
"check Validate working tree structure, branch consistency and\n"
9629
" repository history.\n"
9630
"checkout Create a new checkout of an existing branch.\n"
9631
"clean-tree Remove unwanted files from working tree.\n"
9632
"commit Commit changes into a new revision.\n"
9633
"config Display, set or remove a configuration option.\n"
9634
"conflicts List files with conflicts.\n"
9635
"deleted List files deleted in the working tree.\n"
9636
"diff Show differences in the working tree, between revisions "
9637
"or\n"
9638
" branches.\n"
9639
"dpush Push into a different VCS without any custom bzr "
9640
"metadata.\n"
9641
"export Export current or past revision to a destination directory "
9642
"or\n"
9643
" archive.\n"
9644
"help Show help on a command or other topic.\n"
9645
"ignore Ignore specified files or patterns.\n"
9646
"ignored List ignored files and the patterns that matched them.\n"
9647
"info Show information about a working tree, branch or "
9648
"repository.\n"
9649
"init Make a directory into a versioned branch.\n"
9650
"init-repository Create a shared repository for branches to share storage\n"
9651
" space.\n"
9652
"join Combine a tree into its containing tree.\n"
9653
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9654
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9655
"launchpad-open Open a Launchpad branch page in your web browser. "
9656
"[launchpad]\n"
9657
"log Show historical log for a branch or subset of a branch.\n"
9658
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9659
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9660
"ls List files in a tree.\n"
9661
"merge Perform a three-way merge.\n"
9662
"missing Show unmerged/unpulled revisions between two branches.\n"
9663
"mkdir Create a new versioned directory.\n"
9664
"mv Move or rename a file.\n"
9665
"nick Print or set the branch nickname.\n"
9666
"pack Compress the data within a repository.\n"
9667
"plugins List the installed plugins.\n"
9668
"pull Turn this branch into a mirror of another branch.\n"
9669
"push Update a mirror of this branch.\n"
9670
"reconcile Reconcile bzr metadata in a branch.\n"
9671
"reconfigure Reconfigure the type of a bzr directory.\n"
9672
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9673
"remerge Redo a merge.\n"
9674
"remove Remove files or directories.\n"
9675
"remove-branch Remove a branch.\n"
9676
"remove-tree Remove the working tree from a given branch/checkout.\n"
9677
"renames Show list of renamed files.\n"
9678
"resolve Mark a conflict as resolved.\n"
9679
"revert Revert files to a previous revision.\n"
9680
"revno Show current revision number.\n"
9681
"root Show the tree root directory.\n"
9682
"send Mail or create a merge-directive for submitting changes.\n"
9683
"serve Run the bzr server.\n"
9684
"shelve Temporarily set aside some changes from the current tree.\n"
9685
"sign-my-commits Sign all commits by a given committer.\n"
9686
"split Split a subdirectory of a tree into a separate tree.\n"
9687
"status Display status summary.\n"
9688
"switch Set the branch of a checkout and update.\n"
9689
"tag Create, remove or modify a tag naming a revision.\n"
9690
"tags List tags.\n"
9691
"testament Show testament (signing-form) of a revision.\n"
9692
"unbind Convert the current checkout into a regular branch.\n"
9693
"uncommit Remove the last committed revision.\n"
9694
"unshelve Restore shelved changes.\n"
9695
"update Update a working tree to a new revision.\n"
9696
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9697
" format.\n"
9698
"verify-signatures Verify all commit signatures.\n"
9699
"version Show version of bzr.\n"
9700
"version-info Show version information about this tree.\n"
9701
"view Manage filtered views.\n"
9702
"whoami Show or set bzr user id.\n"
9703
msgstr ""
9704
9705
#: en/help_topics/configuration.txt:1
9706
msgid ""
9707
"Configuration Settings\n"
9708
"======================="
9709
msgstr ""
9710
9711
#: en/help_topics/configuration.txt:4
9712
msgid ""
9713
"Environment settings\n"
9714
"---------------------"
9715
msgstr ""
9716
9717
#: en/help_topics/configuration.txt:7
9718
msgid ""
9719
"While most configuration is handled by configuration files, some options\n"
9720
"which may be semi-permanent can also be controlled through the environment."
9721
msgstr ""
9722
9723
#: en/help_topics/configuration.txt:10
9724
msgid ""
9725
"BZR_EMAIL\n"
9726
"~~~~~~~~~"
9727
msgstr ""
9728
9729
#: en/help_topics/configuration.txt:13
9730
msgid "Override the email id used by Bazaar. Typical format::"
9731
msgstr ""
9732
9733
#: en/help_topics/configuration.txt:15
9734
msgid " \"John Doe <jdoe@example.com>\""
9735
msgstr ""
9736
9737
#: en/help_topics/configuration.txt:17
9738
msgid "See also the ``email`` configuration option."
9739
msgstr ""
9740
9741
#: en/help_topics/configuration.txt:19
9742
msgid ""
9743
"BZR_PROGRESS_BAR\n"
9744
"~~~~~~~~~~~~~~~~"
9745
msgstr ""
9746
9747
#: en/help_topics/configuration.txt:22
9748
msgid ""
9749
"Override the progress display. Possible values are \"none\" or \"text\". "
9750
"If\n"
9751
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9752
"draws\n"
9753
"the ordinary command line progress bar."
9754
msgstr ""
9755
9756
#: en/help_topics/configuration.txt:26
9757
msgid ""
9758
"BZR_SIGQUIT_PDB\n"
9759
"~~~~~~~~~~~~~~~"
9760
msgstr ""
9761
9762
#: en/help_topics/configuration.txt:29
9763
msgid ""
9764
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9765
msgstr ""
9766
9767
#: en/help_topics/configuration.txt:31
9768
msgid ""
9769
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9770
"* 1 = Invoke breakin debugger (default)"
9771
msgstr ""
9772
9773
#: en/help_topics/configuration.txt:34
9774
msgid ""
9775
"BZR_HOME\n"
9776
"~~~~~~~~"
9777
msgstr ""
9778
9779
#: en/help_topics/configuration.txt:37
9780
msgid "Override the home directory used by Bazaar."
9781
msgstr ""
9782
9783
#: en/help_topics/configuration.txt:39
9784
msgid ""
9785
"BZR_SSH\n"
9786
"~~~~~~~"
9787
msgstr ""
9788
9789
#: en/help_topics/configuration.txt:42
9790
msgid "Select a different SSH implementation."
9791
msgstr ""
9792
9793
#: en/help_topics/configuration.txt:44
9794
msgid ""
9795
"BZR_PDB\n"
9796
"~~~~~~~"
9797
msgstr ""
9798
9799
#: en/help_topics/configuration.txt:47
9800
msgid "Control whether to launch a debugger on error."
9801
msgstr ""
9802
9803
#: en/help_topics/configuration.txt:49
9804
msgid ""
9805
"* 0 = Standard behavior\n"
9806
"* 1 = Launch debugger"
9807
msgstr ""
9808
9809
#: en/help_topics/configuration.txt:52
9810
msgid ""
9811
"BZR_REMOTE_PATH\n"
9812
"~~~~~~~~~~~~~~~"
9813
msgstr ""
9814
9815
#: en/help_topics/configuration.txt:55
9816
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9817
msgstr ""
9818
9819
#: en/help_topics/configuration.txt:57
9820
msgid "See also the ``bzr_remote_path`` configuration option."
9821
msgstr ""
9822
9823
#: en/help_topics/configuration.txt:59
9824
msgid ""
9825
"BZR_EDITOR\n"
9826
"~~~~~~~~~~"
9827
msgstr ""
9828
9829
#: en/help_topics/configuration.txt:62
9830
msgid "Path to the editor Bazaar should use for commit messages, etc."
9831
msgstr ""
9832
9833
#: en/help_topics/configuration.txt:64
9834
msgid ""
9835
"BZR_LOG\n"
9836
"~~~~~~~"
9837
msgstr ""
9838
9839
#: en/help_topics/configuration.txt:67
9840
msgid ""
9841
"Location of the Bazaar log file. You can check the current location by\n"
9842
"running ``bzr version``."
9843
msgstr ""
9844
9845
#: en/help_topics/configuration.txt:70
9846
msgid ""
9847
"The log file contains debug information that is useful for diagnosing or\n"
9848
"reporting problems with Bazaar."
9849
msgstr ""
9850
9851
#: en/help_topics/configuration.txt:73
9852
msgid ""
9853
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9854
"will disable logging."
9855
msgstr ""
9856
9857
#: en/help_topics/configuration.txt:76
9858
msgid ""
9859
"\n"
9860
"BZR_PLUGIN_PATH\n"
9861
"~~~~~~~~~~~~~~~"
9862
msgstr ""
9863
9864
#: en/help_topics/configuration.txt:80
9865
msgid ""
9866
"The path to the plugins directory that Bazaar should use.\n"
9867
"If not set, Bazaar will search for plugins in:"
9868
msgstr ""
9869
9870
#: en/help_topics/configuration.txt:83
9871
msgid ""
9872
"* the user specific plugin directory (containing the ``user`` plugins),"
9873
msgstr ""
9874
9875
#: en/help_topics/configuration.txt:85
9876
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9877
msgstr ""
9878
9879
#: en/help_topics/configuration.txt:87
9880
msgid ""
9881
"* the site specific plugin directory if applicable (containing\n"
9882
" the ``site`` plugins)."
9883
msgstr ""
9884
9885
#: en/help_topics/configuration.txt:90
9886
msgid ""
9887
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9888
"the way the plugin are searched. "
9889
msgstr ""
9890
9891
#: en/help_topics/configuration.txt:93
9892
msgid ""
9893
"As for the ``PATH`` variables, if multiple directories are\n"
9894
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9895
"platform specific appropriate character (':' on Unix,\n"
9896
"';' on windows)"
9897
msgstr ""
9898
9899
#: en/help_topics/configuration.txt:98
9900
msgid ""
9901
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9902
"in ``user``. However it will continue to search in ``core`` and\n"
9903
"``site`` unless they are explicitly removed."
9904
msgstr ""
9905
9906
#: en/help_topics/configuration.txt:102
9907
msgid ""
9908
"If you need to change the order or remove one of these\n"
9909
"directories, you should use special values:"
9910
msgstr ""
9911
9912
#: en/help_topics/configuration.txt:105
9913
msgid ""
9914
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9915
" path from the default values,"
9916
msgstr ""
9917
9918
#: en/help_topics/configuration.txt:108
9919
msgid ""
9920
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9921
" before the remaining default values (and also remove it from\n"
9922
" the default values)."
9923
msgstr ""
9924
9925
#: en/help_topics/configuration.txt:112
9926
msgid ""
9927
"Note that the special values 'user', 'core' and 'site' should be\n"
9928
"used literally, they will be substituted by the corresponding,\n"
9929
"platform specific, values."
9930
msgstr ""
9931
9932
#: en/help_topics/configuration.txt:116
9933
msgid ""
9934
"The examples below use ':' as the separator, windows users\n"
9935
"should use ';'."
9936
msgstr ""
9937
9938
#: en/help_topics/configuration.txt:119
9939
msgid "Overriding the default user plugin directory::"
9940
msgstr ""
9941
9942
#: en/help_topics/configuration.txt:121
9943
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9944
msgstr ""
9945
9946
#: en/help_topics/configuration.txt:123
9947
msgid "Disabling the site directory while retaining the user directory::"
9948
msgstr ""
9949
9950
#: en/help_topics/configuration.txt:125
9951
msgid " BZR_PLUGIN_PATH='-site:+user'"
9952
msgstr ""
9953
9954
#: en/help_topics/configuration.txt:127
9955
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9956
msgstr ""
9957
9958
#: en/help_topics/configuration.txt:129
9959
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9960
msgstr ""
9961
9962
#: en/help_topics/configuration.txt:131
9963
msgid "Overriding the default site plugin directory::"
9964
msgstr ""
9965
9966
#: en/help_topics/configuration.txt:133
9967
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9968
msgstr ""
9969
9970
#: en/help_topics/configuration.txt:135
9971
msgid ""
9972
"BZR_DISABLE_PLUGINS\n"
9973
"~~~~~~~~~~~~~~~~~~~"
9974
msgstr ""
9975
9976
#: en/help_topics/configuration.txt:138
9977
msgid ""
9978
"Under special circumstances (mostly when trying to diagnose a\n"
9979
"bug), it's better to disable a plugin (or several) rather than\n"
9980
"uninstalling them completely. Such plugins can be specified in\n"
9981
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9982
msgstr ""
9983
9984
#: en/help_topics/configuration.txt:143
9985
msgid ""
9986
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9987
"will raise an import error if they are explicitly imported (by\n"
9988
"another plugin that depends on them for example)."
9989
msgstr ""
9990
9991
#: en/help_topics/configuration.txt:147
9992
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9993
msgstr ""
9994
9995
#: en/help_topics/configuration.txt:149
9996
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9997
msgstr ""
9998
9999
#: en/help_topics/configuration.txt:151
10000
msgid ""
10001
"BZR_PLUGINS_AT\n"
10002
"~~~~~~~~~~~~~~"
10003
msgstr ""
10004
10005
#: en/help_topics/configuration.txt:154
10006
msgid ""
10007
"When adding a new feature or working on a bug in a plugin,\n"
10008
"developers often need to use a specific version of a given\n"
10009
"plugin. Since python requires that the directory containing the\n"
10010
"code is named like the plugin itself this make it impossible to\n"
10011
"use arbitrary directory names (using a two-level directory scheme\n"
10012
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
10013
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
10014
msgstr ""
10015
10016
#: en/help_topics/configuration.txt:162
10017
msgid ""
10018
"Plugins specified in this environment variable takes precedence\n"
10019
"over the ones in ``BZR_PLUGIN_PATH``."
10020
msgstr ""
10021
10022
#: en/help_topics/configuration.txt:165
10023
msgid ""
10024
"The variable specified a list of ``plugin_name@plugin path``,\n"
10025
"``plugin_name`` being the name of the plugin as it appears in\n"
10026
"python module paths, ``plugin_path`` being the path to the\n"
10027
"directory containing the plugin code itself\n"
10028
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
10029
"separator, use ';' on windows."
10030
msgstr ""
10031
10032
#: en/help_topics/configuration.txt:172
10033
msgid ""
10034
"Example:\n"
10035
"~~~~~~~~"
10036
msgstr ""
10037
10038
#: en/help_topics/configuration.txt:175
10039
msgid ""
10040
"Using a specific version of ``myplugin``:\n"
10041
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
10042
msgstr ""
10043
10044
#: en/help_topics/configuration.txt:178
10045
msgid ""
10046
"BZRPATH\n"
10047
"~~~~~~~"
10048
msgstr ""
10049
10050
#: en/help_topics/configuration.txt:181
10051
msgid "The path where Bazaar should look for shell plugin external commands."
10052
msgstr ""
10053
10054
#: en/help_topics/configuration.txt:183
10055
msgid ""
10056
"\n"
10057
"http_proxy, https_proxy\n"
10058
"~~~~~~~~~~~~~~~~~~~~~~~"
10059
msgstr ""
10060
10061
#: en/help_topics/configuration.txt:187
10062
msgid "Specifies the network proxy for outgoing connections, for example::"
10063
msgstr ""
10064
10065
#: en/help_topics/configuration.txt:189
10066
msgid ""
10067
" http_proxy=http://proxy.example.com:3128/ \n"
10068
" https_proxy=http://proxy.example.com:3128/"
10069
msgstr ""
10070
10071
#: en/help_topics/configuration.txt:192
10072
msgid ""
10073
"\n"
10074
"Configuration files\n"
10075
"-------------------"
10076
msgstr ""
10077
10078
#: en/help_topics/configuration.txt:196
10079
msgid ""
10080
"Location\n"
10081
"~~~~~~~~"
10082
msgstr ""
10083
10084
#: en/help_topics/configuration.txt:199
10085
msgid ""
10086
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
10087
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
10088
"on\n"
10089
"Windows. (You can check the location for your system by using\n"
10090
"``bzr version``.)"
10091
msgstr ""
10092
10093
#: en/help_topics/configuration.txt:204
10094
msgid "There are three primary configuration files in this location:"
10095
msgstr ""
10096
10097
#: en/help_topics/configuration.txt:206
10098
msgid "* ``bazaar.conf`` describes default configuration options,"
10099
msgstr ""
10100
10101
#: en/help_topics/configuration.txt:208
10102
msgid ""
10103
"* ``locations.conf`` describes configuration information for\n"
10104
" specific branch locations,"
10105
msgstr ""
10106
10107
#: en/help_topics/configuration.txt:211
10108
msgid ""
10109
"* ``authentication.conf`` describes credential information for\n"
10110
" remote servers."
10111
msgstr ""
10112
10113
#: en/help_topics/configuration.txt:214
10114
msgid ""
10115
"Each branch can also contain a configuration file that sets values specific\n"
10116
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
10117
"the\n"
10118
"branch. This file is visible to all users of a branch, if you wish to "
10119
"override\n"
10120
"one of the values for a branch with a setting that is specific to you then "
10121
"you\n"
10122
"can do so in ``locations.conf``."
10123
msgstr ""
10124
10125
#: en/help_topics/configuration.txt:220
10126
msgid ""
10127
"General format\n"
10128
"~~~~~~~~~~~~~~"
10129
msgstr ""
10130
10131
#: en/help_topics/configuration.txt:223
10132
msgid ""
10133
"An ini file has three types of contructs: section headers, section\n"
10134
"options and comments."
10135
msgstr ""
10136
10137
#: en/help_topics/configuration.txt:226
10138
msgid ""
10139
"Comments\n"
10140
"^^^^^^^^"
10141
msgstr ""
10142
10143
#: en/help_topics/configuration.txt:229
10144
msgid ""
10145
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
10146
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
10147
"Bazaar when parsing ini files."
10148
msgstr ""
10149
10150
#: en/help_topics/configuration.txt:233
10151
msgid ""
10152
"Section headers\n"
10153
"^^^^^^^^^^^^^^^"
10154
msgstr ""
10155
10156
#: en/help_topics/configuration.txt:236
10157
msgid ""
10158
"A section header is a word enclosed in brackets that starts at the begining\n"
10159
"of a line. A typical section header looks like this::"
10160
msgstr ""
10161
10162
#: en/help_topics/configuration.txt:239
10163
msgid " [DEFAULT]"
10164
msgstr ""
10165
10166
#: en/help_topics/configuration.txt:241
10167
msgid ""
10168
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
10169
"[ALIASES]. Section headers are case sensitive. The default section provides "
10170
"for\n"
10171
"setting options which can be overridden with the branch config file."
10172
msgstr ""
10173
10174
#: en/help_topics/configuration.txt:245
10175
msgid ""
10176
"For ``locations.conf``, the options from the section with the\n"
10177
"longest matching section header are used to the exclusion of other\n"
10178
"potentially valid section headers. A section header uses the path for\n"
10179
"the branch as the section header. Some examples include::"
10180
msgstr ""
10181
10182
#: en/help_topics/configuration.txt:250
10183
msgid ""
10184
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
10185
" [/home/jdoe/branches/]"
10186
msgstr ""
10187
10188
#: en/help_topics/configuration.txt:253
10189
msgid ""
10190
"\n"
10191
"Section options\n"
10192
"^^^^^^^^^^^^^^^"
10193
msgstr ""
10194
10195
#: en/help_topics/configuration.txt:257
10196
msgid ""
10197
"A section option resides within a section. A section option contains an\n"
10198
"option name, an equals sign and a value. For example::"
10199
msgstr ""
10200
10201
#: en/help_topics/configuration.txt:260
10202
msgid ""
10203
" email = John Doe <jdoe@isp.com>\n"
10204
" gpg_signing_key = Amy Pond <amy@example.com>"
10205
msgstr ""
10206
10207
#: en/help_topics/configuration.txt:263
10208
msgid ""
10209
"A option can reference other options by enclosing them in curly brackets::"
10210
msgstr ""
10211
10212
#: en/help_topics/configuration.txt:265
10213
msgid ""
10214
" my_branch_name = feature_x\n"
10215
" my_server = bzr+ssh://example.com\n"
10216
" push_location = {my_server}/project/{my_branch_name}"
10217
msgstr ""
10218
10219
#: en/help_topics/configuration.txt:269
10220
msgid ""
10221
"Option policies\n"
10222
"^^^^^^^^^^^^^^^"
10223
msgstr ""
10224
10225
#: en/help_topics/configuration.txt:272
10226
msgid ""
10227
"Options defined in a section affect the named directory or URL plus\n"
10228
"any locations they contain. Policies can be used to change how an\n"
10229
"option value is interpreted for contained locations. Currently\n"
10230
"there are three policies available:"
10231
msgstr ""
10232
10233
#: en/help_topics/configuration.txt:277
10234
msgid ""
10235
" none:\n"
10236
" the value is interpreted the same for contained locations. This is\n"
10237
" the default behaviour.\n"
10238
" norecurse:\n"
10239
" the value is only used for the exact location specified by the\n"
10240
" section name.\n"
10241
" appendpath:\n"
10242
" for contained locations, any additional path components are\n"
10243
" appended to the value."
10244
msgstr ""
10245
10246
#: en/help_topics/configuration.txt:287
10247
msgid ""
10248
"Policies are specified by keys with names of the form "
10249
"\"<option_name>:policy\".\n"
10250
"For example, to define the push location for a tree of branches, the\n"
10251
"following could be used::"
10252
msgstr ""
10253
10254
#: en/help_topics/configuration.txt:291
10255
msgid ""
10256
" [/top/location]\n"
10257
" push_location = sftp://example.com/location\n"
10258
" push_location:policy = appendpath"
10259
msgstr ""
10260
10261
#: en/help_topics/configuration.txt:295
10262
msgid ""
10263
"With this configuration, the push location for ``/top/location/branch1``\n"
10264
"would be ``sftp://example.com/location/branch1``."
10265
msgstr ""
10266
10267
#: en/help_topics/configuration.txt:298
10268
msgid ""
10269
"Section local options\n"
10270
"^^^^^^^^^^^^^^^^^^^^^"
10271
msgstr ""
10272
10273
#: en/help_topics/configuration.txt:301
10274
msgid ""
10275
"Some options are defined automatically inside a given section and can be\n"
10276
"refered to in this section only. "
10277
msgstr ""
10278
10279
#: en/help_topics/configuration.txt:304
10280
msgid "For example, the ``appendpath`` policy can be used like this::"
10281
msgstr ""
10282
10283
#: en/help_topics/configuration.txt:306
10284
msgid ""
10285
" [/home/vila/src/bzr/bugs]\n"
10286
" mypush = lp:~vila/bzr\n"
10287
" mypush:policy=appendpath"
10288
msgstr ""
10289
10290
#: en/help_topics/configuration.txt:310
10291
msgid "Using ``relpath`` to achieve the same result is done like this::"
10292
msgstr ""
10293
10294
#: en/help_topics/configuration.txt:312
10295
msgid ""
10296
" [/home/vila/src/bzr/bugs]\n"
10297
" mypush = lp:~vila/bzr/{relpath}"
10298
msgstr ""
10299
10300
#: en/help_topics/configuration.txt:315
10301
msgid ""
10302
"In both cases, when used in a directory like\n"
10303
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10304
msgstr ""
10305
10306
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
10307
msgid ""
10308
" $ bzr config mypush\n"
10309
" lp:~vila/bzr/832013-expand-in-stack"
10310
msgstr ""
10311
10312
#: en/help_topics/configuration.txt:321
10313
msgid "Another such option is ``basename`` which can be used like this::"
10314
msgstr ""
10315
10316
#: en/help_topics/configuration.txt:323
10317
msgid ""
10318
" [/home/vila/src/bzr]\n"
10319
" mypush = lp:~vila/bzr/{basename}"
10320
msgstr ""
10321
10322
#: en/help_topics/configuration.txt:326
10323
msgid ""
10324
"When used in a directory like\n"
10325
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10326
msgstr ""
10327
10328
#: en/help_topics/configuration.txt:332
10329
msgid ""
10330
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10331
"itself is defined as the relative path between the section name and the\n"
10332
"location it matches."
10333
msgstr ""
10334
10335
#: en/help_topics/configuration.txt:336
10336
msgid ""
10337
"When an option is local to a Section, it cannot be referred to from option\n"
10338
"values in any other section from the same ``Store`` nor from any other\n"
10339
"``Store``."
10340
msgstr ""
10341
10342
#: en/help_topics/configuration.txt:340
10343
msgid ""
10344
"\n"
10345
"The main configuration file, bazaar.conf\n"
10346
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10347
msgstr ""
10348
10349
#: en/help_topics/configuration.txt:344
10350
msgid ""
10351
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10352
"The default section contains the default\n"
10353
"configuration options for all branches. The default section can be\n"
10354
"overriden by providing a branch-specific section in ``locations.conf``."
10355
msgstr ""
10356
10357
#: en/help_topics/configuration.txt:349
10358
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10359
msgstr ""
10360
10361
#: en/help_topics/configuration.txt:351
10362
msgid ""
10363
" [DEFAULT]\n"
10364
" email = John Doe <jdoe@isp.com>\n"
10365
" editor = /usr/bin/vim\n"
10366
" create_signatures = when-required"
10367
msgstr ""
10368
10369
#: en/help_topics/configuration.txt:356
10370
msgid ""
10371
"\n"
10372
"The branch location configuration file, locations.conf\n"
10373
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10374
msgstr ""
10375
10376
#: en/help_topics/configuration.txt:360
10377
msgid ""
10378
"``locations.conf`` allows one to specify overriding settings for\n"
10379
"a specific branch. The format is almost identical to the default section in\n"
10380
"bazaar.conf with one significant change: The section header, instead of "
10381
"saying\n"
10382
"default, will be the path to a branch that you wish to override a value\n"
10383
"for. The '?' and '*' wildcards are supported::"
10384
msgstr ""
10385
10386
#: en/help_topics/configuration.txt:366
10387
msgid ""
10388
" [/home/jdoe/branches/nethack]\n"
10389
" email = Nethack Admin <nethack@nethack.com>"
10390
msgstr ""
10391
10392
#: en/help_topics/configuration.txt:369
10393
msgid ""
10394
" [http://hypothetical.site.com/branches/devel-branch]\n"
10395
" create_signatures = always"
10396
msgstr ""
10397
10398
#: en/help_topics/configuration.txt:372
10399
msgid ""
10400
"The authentication configuration file, authentication.conf\n"
10401
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10402
msgstr ""
10403
10404
#: en/help_topics/configuration.txt:375
10405
msgid ""
10406
"``authentication.conf`` allows one to specify credentials for\n"
10407
"remote servers. This can be used for all the supported transports and any "
10408
"part\n"
10409
"of bzr that requires authentication (smtp for example)."
10410
msgstr ""
10411
10412
#: en/help_topics/configuration.txt:379
10413
msgid ""
10414
"The syntax of the file obeys the same rules as the others except for the\n"
10415
"option policies which don't apply."
10416
msgstr ""
10417
10418
#: en/help_topics/configuration.txt:382
10419
msgid ""
10420
"For more information on the possible uses of the authentication "
10421
"configuration\n"
10422
"file see :doc:`authentication-help`."
10423
msgstr ""
10424
10425
#: en/help_topics/configuration.txt:385
10426
msgid ""
10427
"\n"
10428
"Common options\n"
10429
"--------------"
10430
msgstr ""
10431
10432
#: en/help_topics/configuration.txt:389
10433
msgid ""
10434
"debug_flags\n"
10435
"~~~~~~~~~~~"
10436
msgstr ""
10437
10438
#: en/help_topics/configuration.txt:392
10439
msgid ""
10440
"A comma-separated list of debugging options to turn on. The same values\n"
10441
"can be used as with the -D command-line option (see `help global-options`).\n"
10442
"For example::"
10443
msgstr ""
10444
10445
#: en/help_topics/configuration.txt:396
10446
msgid " debug_flags = hpss"
10447
msgstr ""
10448
10449
#: en/help_topics/configuration.txt:400
10450
msgid " debug_flags = hpss,evil"
10451
msgstr ""
10452
10453
#: en/help_topics/configuration.txt:402
10454
msgid ""
10455
"email\n"
10456
"~~~~~"
10457
msgstr ""
10458
10459
#: en/help_topics/configuration.txt:405
10460
msgid ""
10461
"The email address to use when committing a branch. Typically takes the form\n"
10462
"of::"
10463
msgstr ""
10464
10465
#: en/help_topics/configuration.txt:408
10466
msgid " email = Full Name <account@hostname.tld>"
10467
msgstr ""
10468
10469
#: en/help_topics/configuration.txt:410
10470
msgid ""
10471
"editor\n"
10472
"~~~~~~"
10473
msgstr ""
10474
10475
#: en/help_topics/configuration.txt:413
10476
msgid ""
10477
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10478
"a commit message. This setting is trumped by the environment variable\n"
10479
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10480
"variables."
10481
msgstr ""
10482
10483
#: en/help_topics/configuration.txt:418
10484
msgid ""
10485
"log_format\n"
10486
"~~~~~~~~~~"
10487
msgstr ""
10488
10489
#: en/help_topics/configuration.txt:421
10490
msgid ""
10491
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10492
"and ``line``. Additional formats may be provided by plugins. The default\n"
10493
"value is ``long``."
10494
msgstr ""
10495
10496
#: en/help_topics/configuration.txt:425
10497
msgid ""
10498
"check_signatures\n"
10499
"~~~~~~~~~~~~~~~~"
10500
msgstr ""
10501
10502
#: en/help_topics/configuration.txt:428
10503
msgid ""
10504
"Reserved for future use. These options will allow a policy for branches to\n"
10505
"require signatures."
10506
msgstr ""
10507
10508
#: en/help_topics/configuration.txt:431
10509
msgid ""
10510
"require\n"
10511
" The gnupg signature for revisions must be present and must be valid."
10512
msgstr ""
10513
10514
#: en/help_topics/configuration.txt:434
10515
msgid ""
10516
"ignore\n"
10517
" Do not check gnupg signatures of revisions."
10518
msgstr ""
10519
10520
#: en/help_topics/configuration.txt:437
10521
msgid ""
10522
"check-available\n"
10523
" (default) If gnupg signatures for revisions are present, check them.\n"
10524
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10525
" no signature is present."
10526
msgstr ""
10527
10528
#: en/help_topics/configuration.txt:442
10529
msgid ""
10530
"create_signatures\n"
10531
"~~~~~~~~~~~~~~~~~"
10532
msgstr ""
10533
10534
#: en/help_topics/configuration.txt:445
10535
msgid ""
10536
"Defines the behaviour of signing revisions on commits. By default bzr will "
10537
"not\n"
10538
"sign new commits."
10539
msgstr ""
10540
10541
#: en/help_topics/configuration.txt:448
10542
msgid ""
10543
"always\n"
10544
" Sign every new revision that is committed. If the signing fails then "
10545
"the\n"
10546
" commit will not be made."
10547
msgstr ""
10548
10549
#: en/help_topics/configuration.txt:452
10550
msgid ""
10551
"when-required\n"
10552
" Reserved for future use."
10553
msgstr ""
10554
10555
#: en/help_topics/configuration.txt:455
10556
msgid ""
10557
"never\n"
10558
" Reserved for future use."
10559
msgstr ""
10560
10561
#: en/help_topics/configuration.txt:458
10562
msgid ""
10563
"In future it is planned that ``when-required`` will sign newly\n"
10564
"committed revisions only when the branch requires them. ``never`` will "
10565
"refuse\n"
10566
"to sign newly committed revisions, even if the branch requires signatures."
10567
msgstr ""
10568
10569
#: en/help_topics/configuration.txt:462
10570
msgid ""
10571
"dirstate.fdatasync\n"
10572
"~~~~~~~~~~~~~~~~~~"
10573
msgstr ""
10574
10575
#: en/help_topics/configuration.txt:465
10576
msgid ""
10577
"If true (default), working tree metadata changes are flushed through the\n"
10578
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10579
"should not be lost if the machine crashes. See also repository.fdatasync."
10580
msgstr ""
10581
10582
#: en/help_topics/configuration.txt:469
10583
msgid ""
10584
"gpg_signing_key\n"
10585
"~~~~~~~~~~~~~~~"
10586
msgstr ""
10587
10588
#: en/help_topics/configuration.txt:472
10589
msgid ""
10590
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10591
"address, key fingerprint or full key ID. When unset or when set to\n"
10592
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10593
msgstr ""
10594
10595
#: en/help_topics/configuration.txt:476
10596
msgid ""
10597
"recurse\n"
10598
"~~~~~~~"
10599
msgstr ""
10600
10601
#: en/help_topics/configuration.txt:479
10602
msgid ""
10603
"Only useful in ``locations.conf``. Defines whether or not the\n"
10604
"configuration for this section applies to subdirectories:"
10605
msgstr ""
10606
10607
#: en/help_topics/configuration.txt:482
10608
msgid ""
10609
"true\n"
10610
" (default) This section applies to subdirectories as well."
10611
msgstr ""
10612
10613
#: en/help_topics/configuration.txt:485
10614
msgid ""
10615
"false\n"
10616
" This section only applies to the branch at this directory and not\n"
10617
" branches below it."
10618
msgstr ""
10619
10620
#: en/help_topics/configuration.txt:489
10621
msgid ""
10622
"gpg_signing_command\n"
10623
"~~~~~~~~~~~~~~~~~~~"
10624
msgstr ""
10625
10626
#: en/help_topics/configuration.txt:492
10627
msgid ""
10628
"(Default: \"gpg\"). Which program should be used to sign and check "
10629
"revisions.\n"
10630
"For example::"
10631
msgstr ""
10632
10633
#: en/help_topics/configuration.txt:495
10634
msgid " gpg_signing_command = /usr/bin/gnpg"
10635
msgstr ""
10636
10637
#: en/help_topics/configuration.txt:497
10638
msgid ""
10639
"The specified command must accept the options \"--clearsign\" and \"-u "
10640
"<email>\"."
10641
msgstr ""
10642
10643
#: en/help_topics/configuration.txt:499
10644
msgid ""
10645
"bzr_remote_path\n"
10646
"~~~~~~~~~~~~~~~"
10647
msgstr ""
10648
10649
#: en/help_topics/configuration.txt:502
10650
msgid ""
10651
"(Default: \"bzr\"). The path to the command that should be used to run the "
10652
"smart\n"
10653
"server for bzr. This value may only be specified in locations.conf, because:"
10654
msgstr ""
10655
10656
#: en/help_topics/configuration.txt:505
10657
msgid ""
10658
"- it's needed before branch.conf is accessible\n"
10659
"- allowing remote branch.conf files to specify commands would be a security\n"
10660
" risk"
10661
msgstr ""
10662
10663
#: en/help_topics/configuration.txt:509
10664
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10665
msgstr ""
10666
10667
#: en/help_topics/configuration.txt:511
10668
msgid ""
10669
"smtp_server\n"
10670
"~~~~~~~~~~~"
10671
msgstr ""
10672
10673
#: en/help_topics/configuration.txt:514
10674
msgid ""
10675
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10676
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10677
msgstr ""
10678
10679
#: en/help_topics/configuration.txt:517
10680
msgid ""
10681
"smtp_username, smtp_password\n"
10682
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10683
msgstr ""
10684
10685
#: en/help_topics/configuration.txt:520
10686
msgid ""
10687
"User and password to authenticate to the SMTP server. If smtp_username\n"
10688
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10689
"These settings are only needed if the SMTP server requires authentication\n"
10690
"to send mail."
10691
msgstr ""
10692
10693
#: en/help_topics/configuration.txt:525
10694
msgid ""
10695
"locks.steal_dead\n"
10696
"~~~~~~~~~~~~~~~~"
10697
msgstr ""
10698
10699
#: en/help_topics/configuration.txt:528
10700
msgid ""
10701
"If set to true, bzr will automatically break locks held by processes from\n"
10702
"the same machine and user that are no longer alive. Otherwise, it will\n"
10703
"print a message and you can break the lock manually, if you are satisfied\n"
10704
"the object is no longer in use."
10705
msgstr ""
10706
10707
#: en/help_topics/configuration.txt:533
10708
msgid ""
10709
"mail_client\n"
10710
"~~~~~~~~~~~"
10711
msgstr ""
10712
10713
#: en/help_topics/configuration.txt:536
10714
msgid ""
10715
"A mail client to use for sending merge requests.\n"
10716
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10717
"it\n"
10718
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10719
"``editor``."
10720
msgstr ""
10721
10722
#: en/help_topics/configuration.txt:541
10723
msgid "Supported values for specific clients:"
10724
msgstr ""
10725
10726
#: en/help_topics/configuration.txt:543
10727
msgid ""
10728
":claws: Use Claws. This skips a dialog for attaching files.\n"
10729
":evolution: Use Evolution.\n"
10730
":kmail: Use KMail.\n"
10731
":mutt: Use Mutt.\n"
10732
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10733
"1.5,\n"
10734
" this works around some bugs that xdg-email doesn't handle."
10735
msgstr ""
10736
10737
#: en/help_topics/configuration.txt:550
10738
msgid "Supported generic values are:"
10739
msgstr ""
10740
10741
#: en/help_topics/configuration.txt:552
10742
msgid ""
10743
":default: See above.\n"
10744
":editor: Use your editor to compose the merge request. This also uses\n"
10745
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10746
" smtp_username and smtp_password.\n"
10747
":mapi: Use your preferred e-mail client on Windows.\n"
10748
":xdg-email: Use xdg-email to run your preferred mail program"
10749
msgstr ""
10750
10751
#: en/help_topics/configuration.txt:559
10752
msgid ""
10753
"repository.fdatasync\n"
10754
"~~~~~~~~~~~~~~~~~~~~"
10755
msgstr ""
10756
10757
#: en/help_topics/configuration.txt:562
10758
msgid ""
10759
"If true (default), repository changes are flushed through the OS buffers\n"
10760
"to physical disk. This is somewhat slower, but means data should not be\n"
10761
"lost if the machine crashes. See also dirstate.fdatasync."
10762
msgstr ""
10763
10764
#: en/help_topics/configuration.txt:566
10765
msgid ""
10766
"submit_branch\n"
10767
"~~~~~~~~~~~~~"
10768
msgstr ""
10769
10770
#: en/help_topics/configuration.txt:569
10771
msgid ""
10772
"The branch you intend to submit your current work to. This is "
10773
"automatically\n"
10774
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10775
"This\n"
10776
"should usually be set on a per-branch or per-location basis."
10777
msgstr ""
10778
10779
#: en/help_topics/configuration.txt:573
10780
msgid ""
10781
"public_branch\n"
10782
"~~~~~~~~~~~~~"
10783
msgstr ""
10784
10785
#: en/help_topics/configuration.txt:576
10786
msgid ""
10787
"A publically-accessible version of this branch (implying that this version "
10788
"is\n"
10789
"not publically-accessible). Used (and set) by ``bzr send``."
10790
msgstr ""
10791
10792
#: en/help_topics/configuration.txt:579
10793
msgid ""
10794
"suppress_warnings\n"
10795
"~~~~~~~~~~~~~~~~~"
10796
msgstr ""
10797
10798
#: en/help_topics/configuration.txt:582
10799
msgid ""
10800
"A list of strings, each string represent a warning that can be emitted by\n"
10801
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10802
msgstr ""
10803
10804
#: en/help_topics/configuration.txt:585
10805
msgid "Valid values:"
10806
msgstr ""
10807
10808
#: en/help_topics/configuration.txt:587
10809
msgid ""
10810
"* ``format_deprecation``:\n"
10811
" whether the format deprecation warning is shown on repositories that "
10812
"are\n"
10813
" using deprecated formats."
10814
msgstr ""
10815
10816
#: en/help_topics/configuration.txt:591
10817
msgid ""
10818
"default_format\n"
10819
"~~~~~~~~~~~~~~"
10820
msgstr ""
10821
10822
#: en/help_topics/configuration.txt:594
10823
msgid ""
10824
"A format name for the default format used when creating branches. See "
10825
"``bzr\n"
10826
"help formats`` for possible values."
10827
msgstr ""
10828
10829
#: en/help_topics/configuration.txt:597
10830
msgid ""
10831
"\n"
10832
"Unicode options\n"
10833
"---------------"
10834
msgstr ""
10835
10836
#: en/help_topics/configuration.txt:601
10837
msgid ""
10838
"output_encoding\n"
10839
"~~~~~~~~~~~~~~~"
10840
msgstr ""
10841
10842
#: en/help_topics/configuration.txt:604
10843
msgid ""
10844
"A Python unicode encoding name for text output from bzr, such as log\n"
10845
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10846
"is the terminal encoding prefered by the operating system."
10847
msgstr ""
10848
10849
#: en/help_topics/configuration.txt:608
10850
msgid ""
10851
"\n"
10852
"Branch type specific options\n"
10853
"----------------------------"
10854
msgstr ""
10855
10856
#: en/help_topics/configuration.txt:612
10857
msgid ""
10858
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10859
"later format. They\n"
10860
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10861
"manually set in ``locations.conf`` or ``bazaar.conf``."
10862
msgstr ""
10863
10864
#: en/help_topics/configuration.txt:617
10865
msgid ""
10866
"append_revisions_only\n"
10867
"~~~~~~~~~~~~~~~~~~~~~"
10868
msgstr ""
10869
10870
#: en/help_topics/configuration.txt:620
10871
msgid ""
10872
"If set to \"True\" then revisions can only be appended to the log, not\n"
10873
"removed. A branch with this setting enabled can only pull from another\n"
10874
"branch if the other branch's log is a longer version of its own. This is\n"
10875
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10876
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10877
"compatibility with previous bzr versions (older than 2.2)."
10878
msgstr ""
10879
10880
#: en/help_topics/configuration.txt:627
10881
msgid ""
10882
"parent_location\n"
10883
"~~~~~~~~~~~~~~~"
10884
msgstr ""
10885
10886
#: en/help_topics/configuration.txt:630
10887
msgid ""
10888
"If present, the location of the default branch for pull or merge. This "
10889
"option\n"
10890
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10891
"--remember``."
10892
msgstr ""
10893
10894
#: en/help_topics/configuration.txt:634
10895
msgid ""
10896
"push_location\n"
10897
"~~~~~~~~~~~~~"
10898
msgstr ""
10899
10900
#: en/help_topics/configuration.txt:637
10901
msgid ""
10902
"If present, the location of the default branch for push. This option\n"
10903
"is normally set by the first ``push`` or ``push --remember``."
10904
msgstr ""
10905
10906
#: en/help_topics/configuration.txt:640
10907
msgid ""
10908
"push_strict\n"
10909
"~~~~~~~~~~~"
10910
msgstr ""
10911
10912
#: en/help_topics/configuration.txt:643
10913
msgid ""
10914
"If present, defines the ``--strict`` option default value for checking\n"
10915
"uncommitted changes before pushing."
10916
msgstr ""
10917
10918
#: en/help_topics/configuration.txt:646
10919
msgid ""
10920
"dpush_strict\n"
10921
"~~~~~~~~~~~~"
10922
msgstr ""
10923
10924
#: en/help_topics/configuration.txt:649
10925
msgid ""
10926
"If present, defines the ``--strict`` option default value for checking\n"
10927
"uncommitted changes before pushing into a different VCS without any\n"
10928
"custom bzr metadata."
10929
msgstr ""
10930
10931
#: en/help_topics/configuration.txt:653
10932
msgid ""
10933
"bound_location\n"
10934
"~~~~~~~~~~~~~~"
10935
msgstr ""
10936
10937
#: en/help_topics/configuration.txt:656
10938
msgid ""
10939
"The location that commits should go to when acting as a checkout.\n"
10940
"This option is normally set by ``bind``."
10941
msgstr ""
10942
10943
#: en/help_topics/configuration.txt:659
10944
msgid ""
10945
"bound\n"
10946
"~~~~~"
10947
msgstr ""
10948
10949
#: en/help_topics/configuration.txt:662
10950
msgid ""
10951
"If set to \"True\", the branch should act as a checkout, and push each "
10952
"commit to\n"
10953
"the bound_location. This option is normally set by ``bind``/``unbind``."
10954
msgstr ""
10955
10956
#: en/help_topics/configuration.txt:665
10957
msgid ""
10958
"send_strict\n"
10959
"~~~~~~~~~~~"
10960
msgstr ""
10961
10962
#: en/help_topics/configuration.txt:668
10963
msgid ""
10964
"If present, defines the ``--strict`` option default value for checking\n"
10965
"uncommitted changes before sending a merge directive."
10966
msgstr ""
10967
10968
#: en/help_topics/configuration.txt:671
10969
msgid ""
10970
"add.maximum_file_size\n"
10971
"~~~~~~~~~~~~~~~~~~~~~"
10972
msgstr ""
10973
10974
#: en/help_topics/configuration.txt:674
10975
msgid ""
10976
"Defines the maximum file size the command line \"add\" operation will allow\n"
10977
"in recursive mode, with files larger than this value being skipped. You may "
10978
"\n"
10979
"specify this value as an integer (in which case it is interpreted as bytes), "
10980
"\n"
10981
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10982
"0 \n"
10983
"will disable skipping."
10984
msgstr ""
10985
10986
#: en/help_topics/configuration.txt:680
10987
msgid ""
10988
"External Merge Tools\n"
10989
"--------------------"
10990
msgstr ""
10991
10992
#: en/help_topics/configuration.txt:683
10993
msgid ""
10994
"bzr.mergetool.<name>\n"
10995
"~~~~~~~~~~~~~~~~~~~~"
10996
msgstr ""
10997
10998
#: en/help_topics/configuration.txt:686
10999
msgid ""
11000
"Defines an external merge tool called <name> with the given command-line.\n"
11001
"Arguments containing spaces should be quoted using single or double quotes. "
11002
"The\n"
11003
"executable may omit its path if it can be found on the PATH."
11004
msgstr ""
11005
11006
#: en/help_topics/configuration.txt:690
11007
msgid ""
11008
"The following markers can be used in the command-line to substitute "
11009
"filenames\n"
11010
"involved in the merge conflict::"
11011
msgstr ""
11012
11013
#: en/help_topics/configuration.txt:693
11014
msgid ""
11015
" {base} file.BASE\n"
11016
" {this} file.THIS\n"
11017
" {other} file.OTHER\n"
11018
" {result} output file\n"
11019
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
11020
"merge\n"
11021
" succeeds."
11022
msgstr ""
11023
11024
#: en/help_topics/configuration.txt:702
11025
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11026
msgstr ""
11027
11028
#: en/help_topics/configuration.txt:704
11029
msgid ""
11030
"bzr.default_mergetool\n"
11031
"~~~~~~~~~~~~~~~~~~~~~"
11032
msgstr ""
11033
11034
#: en/help_topics/configuration.txt:707
11035
msgid ""
11036
"Specifies which external merge tool (as defined above) should be selected "
11037
"by\n"
11038
"default in tools such as ``bzr qconflicts``."
11039
msgstr ""
11040
11041
#: en/help_topics/configuration.txt:712
11042
msgid " bzr.default_mergetool = kdiff3\n"
11043
msgstr ""
11044
11045
#: en/help_topics/conflict-types.txt:1
11046
msgid ""
11047
"Conflict Types\n"
11048
"=============="
11049
msgstr ""
11050
11051
#: en/help_topics/conflict-types.txt:4
11052
msgid ""
11053
"Some operations, like merge, revert and pull, modify the contents of your\n"
11054
"working tree. These modifications are programmatically generated, and so "
11055
"they\n"
11056
"may conflict with the current state of your working tree. "
11057
msgstr ""
11058
11059
#: en/help_topics/conflict-types.txt:8
11060
msgid ""
11061
"When conflicts are present in your working tree (as shown by ``bzr\n"
11062
"conflicts``), you should resolve them and then inform bzr that the "
11063
"conflicts\n"
11064
"have been resolved."
11065
msgstr ""
11066
11067
#: en/help_topics/conflict-types.txt:12
11068
msgid ""
11069
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
11070
"should resolve them is not the one responsible for their occurrence, as is "
11071
"the\n"
11072
"case when merging other people's work or because some conflicts are "
11073
"presented\n"
11074
"in a way that is not easy to understand."
11075
msgstr ""
11076
11077
#: en/help_topics/conflict-types.txt:17
11078
msgid ""
11079
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
11080
"conflict if and only if there's an actual conceptual conflict in the source\n"
11081
"tree. Because Bazaar doesn't understand the real meaning of the files "
11082
"being\n"
11083
"versioned, it can, when faced with ambiguities, fall short in either "
11084
"direction\n"
11085
"trying to resolve the conflict itself. Many kinds of changes can be "
11086
"combined\n"
11087
"programmatically, but sometimes only a human can determine the right thing "
11088
"to\n"
11089
"do."
11090
msgstr ""
11091
11092
#: en/help_topics/conflict-types.txt:25
11093
msgid ""
11094
"When Bazaar generates a conflict, it adds information into the working tree "
11095
"to\n"
11096
"present the conflicting versions, and it's up to you to find the correct\n"
11097
"resolution."
11098
msgstr ""
11099
11100
#: en/help_topics/conflict-types.txt:29
11101
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
11102
msgstr ""
11103
11104
#: en/help_topics/conflict-types.txt:31
11105
msgid ""
11106
"1. Modify the working tree content so that the conflicted item is now in "
11107
"the\n"
11108
" state you want to keep, then"
11109
msgstr ""
11110
11111
#: en/help_topics/conflict-types.txt:34
11112
msgid ""
11113
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
11114
" remaining generated information (``bzr resolve <item>``)."
11115
msgstr ""
11116
11117
#: en/help_topics/conflict-types.txt:37
11118
msgid ""
11119
"For most conflict types, there are some obvious ways to modify the working\n"
11120
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
11121
"itself already made a choice, when possible."
11122
msgstr ""
11123
11124
#: en/help_topics/conflict-types.txt:41
11125
msgid ""
11126
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
11127
"different ways to resolve the conflict."
11128
msgstr ""
11129
11130
#: en/help_topics/conflict-types.txt:44
11131
msgid ""
11132
"Each type of conflict is explained below, and the action which must be done "
11133
"to\n"
11134
"resolve the conflict is outlined."
11135
msgstr ""
11136
11137
#: en/help_topics/conflict-types.txt:47
11138
msgid ""
11139
"Various actions are available depending on the kind of conflict, for some "
11140
"of\n"
11141
"these actions, Bazaar can provide some help. In the end you should at least\n"
11142
"inform Bazaar that you're done with the conflict with::"
11143
msgstr ""
11144
11145
#: en/help_topics/conflict-types.txt:51
11146
msgid " ``bzr resolve FILE --action=done'"
11147
msgstr ""
11148
11149
#: en/help_topics/conflict-types.txt:53
11150
msgid ""
11151
"Note that this is the default action when a single file is involved so you "
11152
"can\n"
11153
"simply use::"
11154
msgstr ""
11155
11156
#: en/help_topics/conflict-types.txt:56
11157
msgid " ``bzr resolve FILE``"
11158
msgstr ""
11159
11160
#: en/help_topics/conflict-types.txt:58
11161
msgid "See ``bzr help resolve`` for more details."
11162
msgstr ""
11163
11164
#: en/help_topics/conflict-types.txt:60
11165
msgid ""
11166
"Text conflicts\n"
11167
"--------------"
11168
msgstr ""
11169
11170
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
11171
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
11172
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11173
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11174
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
11175
msgid "Typical message::"
11176
msgstr ""
11177
11178
#: en/help_topics/conflict-types.txt:65
11179
msgid " Text conflict in FILE"
11180
msgstr ""
11181
11182
#: en/help_topics/conflict-types.txt:67
11183
msgid ""
11184
"These are produced when a text merge cannot completely reconcile two sets "
11185
"of\n"
11186
"text changes. Bazaar will emit files for each version with the extensions\n"
11187
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
11188
"tree,\n"
11189
"i.e. the tree that you are merging changes into. OTHER is the version that "
11190
"you\n"
11191
"are merging into the target. BASE is an older version that is used as a "
11192
"basis\n"
11193
"for comparison."
11194
msgstr ""
11195
11196
#: en/help_topics/conflict-types.txt:74
11197
msgid ""
11198
"In the main copy of the file, Bazaar will include all the changes that it\n"
11199
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11200
"\"herringbone\" markers like ``<<<<<<<``."
11201
msgstr ""
11202
11203
#: en/help_topics/conflict-types.txt:78
11204
msgid ""
11205
"Say the initial text is \"The project leader released it.\", and THIS "
11206
"modifies it\n"
11207
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11208
"leader\n"
11209
"released Bazaar.\" A conflict would look like this::"
11210
msgstr ""
11211
11212
#: en/help_topics/conflict-types.txt:82
11213
msgid ""
11214
" <<<<<<< TREE\n"
11215
" Martin Pool released it.\n"
11216
" =======\n"
11217
" The project leader released Bazaar.\n"
11218
" >>>>>>> MERGE-SOURCE"
11219
msgstr ""
11220
11221
#: en/help_topics/conflict-types.txt:88
11222
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11223
msgstr ""
11224
11225
#: en/help_topics/conflict-types.txt:90
11226
msgid ""
11227
"You can handle text conflicts either by editing the main copy of the file,\n"
11228
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
11229
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11230
"set of changes over the other (but see below when you encounter these\n"
11231
"cases). More often, the two sets of changes must be intelligently combined."
11232
msgstr ""
11233
11234
#: en/help_topics/conflict-types.txt:96
11235
msgid ""
11236
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
11237
"you are done editing, the file should look like it never had a conflict, and "
11238
"be\n"
11239
"ready to commit."
11240
msgstr ""
11241
11242
#: en/help_topics/conflict-types.txt:100
11243
msgid ""
11244
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
11245
"Bazaar will auto-detect which conflicts you have resolved."
11246
msgstr ""
11247
11248
#: en/help_topics/conflict-types.txt:103
11249
msgid ""
11250
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11251
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11252
"working tree."
11253
msgstr ""
11254
11255
#: en/help_topics/conflict-types.txt:107
11256
msgid ""
11257
"\n"
11258
"When you want to pick one set of changes over the other, you can use ``bzr\n"
11259
"resolve`` with one of the following actions:"
11260
msgstr ""
11261
11262
#: en/help_topics/conflict-types.txt:111
11263
msgid ""
11264
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11265
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11266
msgstr ""
11267
11268
#: en/help_topics/conflict-types.txt:114
11269
msgid ""
11270
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11271
"modifications will be taken into account."
11272
msgstr ""
11273
11274
#: en/help_topics/conflict-types.txt:117
11275
msgid ""
11276
"Content conflicts\n"
11277
"-----------------"
11278
msgstr ""
11279
11280
#: en/help_topics/conflict-types.txt:122
11281
msgid " Contents conflict in FILE"
11282
msgstr ""
11283
11284
#: en/help_topics/conflict-types.txt:124
11285
msgid ""
11286
"This conflict happens when there are conflicting changes in the working "
11287
"tree\n"
11288
"and the merge source, but the conflicted items are not text files. They "
11289
"may\n"
11290
"be binary files, or symlinks, or directories. It can even happen with "
11291
"files\n"
11292
"that are deleted on one side, and modified on the other."
11293
msgstr ""
11294
11295
#: en/help_topics/conflict-types.txt:129
11296
msgid ""
11297
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
11298
"be\n"
11299
"regular files, symlinks or directories). But it will not include a \"main "
11300
"copy\"\n"
11301
"of the file with herringbone conflict markers. It will appear that the "
11302
"\"main\n"
11303
"copy\" has been renamed to THIS or OTHER."
11304
msgstr ""
11305
11306
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11307
msgid ""
11308
"To resolve that kind of conflict, you should rebuild FILE from either "
11309
"version\n"
11310
"or a combination of both."
11311
msgstr ""
11312
11313
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11314
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11315
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11316
#: en/help_topics/conflict-types.txt:361
11317
msgid "``bzr resolve`` recognizes the following actions:"
11318
msgstr ""
11319
11320
#: en/help_topics/conflict-types.txt:139
11321
msgid ""
11322
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
11323
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11324
"* ``--action=done`` will just mark the conflict as resolved."
11325
msgstr ""
11326
11327
#: en/help_topics/conflict-types.txt:143
11328
msgid ""
11329
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11330
"and\n"
11331
"``.OTHER`` files if they are still present in the working tree."
11332
msgstr ""
11333
11334
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11335
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11336
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11337
#: en/help_topics/conflict-types.txt:369
11338
msgid ""
11339
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11340
msgstr ""
11341
11342
#: en/help_topics/conflict-types.txt:148
11343
msgid ""
11344
"Tag conflicts\n"
11345
"-------------"
11346
msgstr ""
11347
11348
#: en/help_topics/conflict-types.txt:153
11349
msgid ""
11350
" Conflicting tags:\n"
11351
" version-0.1"
11352
msgstr ""
11353
11354
#: en/help_topics/conflict-types.txt:156
11355
msgid ""
11356
"When pulling from or pushing to another branch, Bazaar informs you about "
11357
"tags\n"
11358
"that conflict between the two branches; that is the same tag points to two\n"
11359
"different revisions. You need not resolve these conflicts, but subsequent\n"
11360
"uses of pull or push will result in the same message."
11361
msgstr ""
11362
11363
#: en/help_topics/conflict-types.txt:161
11364
msgid ""
11365
"To resolve the conflict, you must apply the correct tags to either the "
11366
"target\n"
11367
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11368
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11369
"target branch's tags match the source branch, then in the target branch do\n"
11370
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11371
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11372
"source\n"
11373
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11374
"favor of the target branch, you need to similarly use ``tag --force`` in "
11375
"the\n"
11376
"source branch. (Note that pulling or pushing using --overwrite will "
11377
"overwrite\n"
11378
"all tags as well.)"
11379
msgstr ""
11380
11381
#: en/help_topics/conflict-types.txt:172
11382
msgid ""
11383
"Duplicate paths\n"
11384
"---------------"
11385
msgstr ""
11386
11387
#: en/help_topics/conflict-types.txt:177
11388
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11389
msgstr ""
11390
11391
#: en/help_topics/conflict-types.txt:179
11392
msgid ""
11393
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11394
"already been used. The existing file will be renamed to \"FILE.moved\". "
11395
msgstr ""
11396
11397
#: en/help_topics/conflict-types.txt:187
11398
msgid ""
11399
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11400
"FILE``,\n"
11401
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11402
"* ``--action=done`` will just mark the conflict as resolved."
11403
msgstr ""
11404
11405
#: en/help_topics/conflict-types.txt:191
11406
msgid ""
11407
"Note that you must get rid of FILE.moved before using ``--action=done``."
11408
msgstr ""
11409
11410
#: en/help_topics/conflict-types.txt:195
11411
msgid ""
11412
"Unversioned parent\n"
11413
"------------------"
11414
msgstr ""
11415
11416
#: en/help_topics/conflict-types.txt:200
11417
msgid ""
11418
" Conflict because FILE is not versioned, but has versioned children."
11419
msgstr ""
11420
11421
#: en/help_topics/conflict-types.txt:202
11422
msgid ""
11423
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11424
"not\n"
11425
"versioned. This happens when the directory has been deleted in the target,\n"
11426
"but has a new child in the source, or vice versa. In this situation, "
11427
"Bazaar\n"
11428
"will version the parent directory as well. Resolving this issue depends\n"
11429
"very much on the particular scenario. You may wish to rename or delete "
11430
"either\n"
11431
"the file or the directory. When you are satisfied, you can run \"bzr "
11432
"resolve\n"
11433
"FILE\" to mark the conflict as resolved."
11434
msgstr ""
11435
11436
#: en/help_topics/conflict-types.txt:210
11437
msgid ""
11438
"Missing parent\n"
11439
"--------------"
11440
msgstr ""
11441
11442
#: en/help_topics/conflict-types.txt:215
11443
msgid " Conflict adding files to FILE. Created directory."
11444
msgstr ""
11445
11446
#: en/help_topics/conflict-types.txt:217
11447
msgid ""
11448
"This happens when a directory has been deleted in the target, but has new\n"
11449
"children in the source. This is similar to the \"unversioned parent\" "
11450
"conflict,\n"
11451
"except that the parent directory does not *exist*, instead of just being\n"
11452
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11453
"Resolving this issue depends very much on the particular scenario."
11454
msgstr ""
11455
11456
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11457
msgid ""
11458
"To resolve that kind of conflict, you should either remove or rename the\n"
11459
"children or the directory or a combination of both."
11460
msgstr ""
11461
11462
#: en/help_topics/conflict-types.txt:228
11463
msgid ""
11464
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11465
" children,\n"
11466
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11467
"children\n"
11468
" and restoring the directory,\n"
11469
"* ``--action=done`` will just mark the conflict as resolved."
11470
msgstr ""
11471
11472
#: en/help_topics/conflict-types.txt:236
11473
msgid ""
11474
"Deleting parent\n"
11475
"---------------"
11476
msgstr ""
11477
11478
#: en/help_topics/conflict-types.txt:241
11479
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11480
msgstr ""
11481
11482
#: en/help_topics/conflict-types.txt:243
11483
msgid ""
11484
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11485
"source, but has new children in the target (either because a directory\n"
11486
"deletion is merged or because the merge introduce new children). Bazaar\n"
11487
"will retain the directory. Resolving this issue depends very much on the\n"
11488
"particular scenario."
11489
msgstr ""
11490
11491
#: en/help_topics/conflict-types.txt:254
11492
msgid ""
11493
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11494
"directory,"
11495
msgstr ""
11496
11497
#: en/help_topics/conflict-types.txt:256
11498
msgid ""
11499
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11500
" children,"
11501
msgstr ""
11502
11503
#: en/help_topics/conflict-types.txt:259
11504
msgid "* ``--action=done`` will just mark the conflict as resolved."
11505
msgstr ""
11506
11507
#: en/help_topics/conflict-types.txt:261
11508
msgid ""
11509
"Note that when merging a directory deletion, if unversioned files are\n"
11510
"present, they become potential orphans has they don't have a directory\n"
11511
"parent anymore."
11512
msgstr ""
11513
11514
#: en/help_topics/conflict-types.txt:265
11515
msgid ""
11516
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11517
"setting the ``bzr.transform.orphan_policy`` configuration option."
11518
msgstr ""
11519
11520
#: en/help_topics/conflict-types.txt:268
11521
msgid "There are two possible values for this option:"
11522
msgstr ""
11523
11524
#: en/help_topics/conflict-types.txt:270
11525
msgid ""
11526
"* ``conflict`` (the default): will leave the orphans in place and\n"
11527
" generate a conflicts,"
11528
msgstr ""
11529
11530
#: en/help_topics/conflict-types.txt:273
11531
msgid ""
11532
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11533
"root\n"
11534
" of the working tree with names like ``<file>.~#~``."
11535
msgstr ""
11536
11537
#: en/help_topics/conflict-types.txt:278
11538
msgid ""
11539
"Path conflict\n"
11540
"-------------"
11541
msgstr ""
11542
11543
#: en/help_topics/conflict-types.txt:283
11544
msgid " Path conflict: PATH1 / PATH2"
11545
msgstr ""
11546
11547
#: en/help_topics/conflict-types.txt:285
11548
msgid ""
11549
"This happens when the source and target have each modified the name or "
11550
"parent\n"
11551
"directory of a file. Bazaar will use the path elements from the source."
11552
msgstr ""
11553
11554
#: en/help_topics/conflict-types.txt:288
11555
msgid ""
11556
"To resolve that kind of conflict, you just have to decide what name should "
11557
"be\n"
11558
"retained for the file involved."
11559
msgstr ""
11560
11561
#: en/help_topics/conflict-types.txt:293
11562
msgid ""
11563
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11564
" issuing ``bzr mv PATH2 PATH1``,\n"
11565
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11566
"``PATH2``,\n"
11567
"* ``--action=done`` will just mark the conflict as resolved."
11568
msgstr ""
11569
11570
#: en/help_topics/conflict-types.txt:300
11571
msgid ""
11572
"Parent loop\n"
11573
"-----------"
11574
msgstr ""
11575
11576
#: en/help_topics/conflict-types.txt:305
11577
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11578
msgstr ""
11579
11580
#: en/help_topics/conflict-types.txt:307
11581
msgid ""
11582
"This happens when the source and the target have each moved directories, so\n"
11583
"that, if the change could be applied, a directory would be contained by "
11584
"itself.\n"
11585
"For example::"
11586
msgstr ""
11587
11588
#: en/help_topics/conflict-types.txt:311
11589
msgid ""
11590
" $ bzr init\n"
11591
" $ bzr mkdir white\n"
11592
" $ bzr mkdir black\n"
11593
" $ bzr commit -m \"BASE\"\n"
11594
" $ bzr branch . ../other\n"
11595
" $ bzr mv white black\n"
11596
" $ bzr commit -m \"THIS\"\n"
11597
" $ bzr mv ../other/black ../other/white\n"
11598
" $ bzr commit ../other -m \"OTHER\"\n"
11599
" $ bzr merge ../other"
11600
msgstr ""
11601
11602
#: en/help_topics/conflict-types.txt:322
11603
msgid ""
11604
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11605
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11606
"name should be retained for the directories involved."
11607
msgstr ""
11608
11609
#: en/help_topics/conflict-types.txt:328
11610
msgid ""
11611
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11612
"\n"
11613
" in ``black``,\n"
11614
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11615
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11616
"* ``--action=done`` will just mark the conflict as resolved."
11617
msgstr ""
11618
11619
#: en/help_topics/conflict-types.txt:336
11620
msgid ""
11621
"Non-directory parent\n"
11622
"--------------------"
11623
msgstr ""
11624
11625
#: en/help_topics/conflict-types.txt:341
11626
msgid ""
11627
" Conflict: foo.new is not a directory, but has files in it.\n"
11628
" Created directory."
11629
msgstr ""
11630
11631
#: en/help_topics/conflict-types.txt:344
11632
msgid ""
11633
"This happens when one side has added files to a directory, and the other "
11634
"side\n"
11635
"has changed the directory into a file or symlink. For example::"
11636
msgstr ""
11637
11638
#: en/help_topics/conflict-types.txt:347
11639
msgid ""
11640
" $ bzr init\n"
11641
" $ bzr mkdir foo\n"
11642
" $ bzr commit -m \"BASE\"\n"
11643
" $ bzr branch . ../other\n"
11644
" $ rmdir foo\n"
11645
" $ touch foo\n"
11646
" $ bzr commit -m \"THIS\"\n"
11647
" $ bzr mkdir ../other/foo/bar\n"
11648
" $ bzr commit ../other -m \"OTHER\"\n"
11649
" $ bzr merge ../other"
11650
msgstr ""
11651
11652
#: en/help_topics/conflict-types.txt:358
11653
msgid ""
11654
"To resolve that kind of conflict, you have to decide what name should be\n"
11655
"retained for the file, directory or symlink involved."
11656
msgstr ""
11657
11658
#: en/help_topics/conflict-types.txt:363
11659
msgid ""
11660
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11661
" ``bzr add foo``,\n"
11662
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11663
" ``bzr mv foo.new foo``,\n"
11664
"* ``--action=done`` will just mark the conflict as resolved."
11665
msgstr ""
11666
11667
#: en/help_topics/conflict-types.txt:371
11668
msgid ""
11669
"MalformedTransform\n"
11670
"------------------"
11671
msgstr ""
11672
11673
#: en/help_topics/conflict-types.txt:374
11674
msgid ""
11675
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11676
"exception. This means that Bazaar encountered a filesystem conflict that it "
11677
"was\n"
11678
"unable to resolve. This usually indicates a bug. Please let us know if "
11679
"you\n"
11680
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11681
msgstr ""
11682
11683
#: en/help_topics/content-filters.txt:1
11684
msgid ""
11685
"Content Filters\n"
11686
"==============="
11687
msgstr ""
11688
11689
#: en/help_topics/content-filters.txt:4
11690
msgid ""
11691
"Content formats\n"
11692
"---------------"
11693
msgstr ""
11694
11695
#: en/help_topics/content-filters.txt:7
11696
msgid ""
11697
"Bazaar's content filtering allows you to store files in a different\n"
11698
"format from the copy in your working tree. This lets you, or your\n"
11699
"co-developers, use Windows development tools that expect CRLF files\n"
11700
"on projects that use other line-ending conventions. Among other things,\n"
11701
"content filters also let Unix developers more easily work on projects\n"
11702
"using Windows line-ending conventions, keyword expansion/compression,\n"
11703
"and trailing spaces on lines in text files to be implicitly stripped\n"
11704
"when committed."
11705
msgstr ""
11706
11707
#: en/help_topics/content-filters.txt:16
11708
msgid "To generalize, there are two content formats supported by Bazaar:"
11709
msgstr ""
11710
11711
#: en/help_topics/content-filters.txt:18
11712
msgid ""
11713
"* a canonical format - how files are stored internally\n"
11714
"* a convenience format - how files are created in a working tree."
11715
msgstr ""
11716
11717
#: en/help_topics/content-filters.txt:21
11718
msgid ""
11719
"\n"
11720
"Format conversion\n"
11721
"-----------------"
11722
msgstr ""
11723
11724
#: en/help_topics/content-filters.txt:25
11725
msgid ""
11726
"The conversion between these formats is done by content filters.\n"
11727
"A content filter has two parts:"
11728
msgstr ""
11729
11730
#: en/help_topics/content-filters.txt:28
11731
msgid ""
11732
"* a read converter - converts from convenience to canonical format\n"
11733
"* a write converter - converts from canonical to convenience format."
11734
msgstr ""
11735
11736
#: en/help_topics/content-filters.txt:31
11737
msgid ""
11738
"Many of these converters will provide *round-trip* conversion,\n"
11739
"i.e. applying the read converter followed by the write converter\n"
11740
"gives back the original content. However, others may provide an\n"
11741
"asymmetric conversion. For example, a read converter might strip\n"
11742
"trailing whitespace off lines in source code while the matching\n"
11743
"write converter might pass content through unchanged."
11744
msgstr ""
11745
11746
#: en/help_topics/content-filters.txt:38
11747
msgid ""
11748
"\n"
11749
"Enabling content filters\n"
11750
"------------------------"
11751
msgstr ""
11752
11753
#: en/help_topics/content-filters.txt:42
11754
msgid ""
11755
"Content filters are typically provided by plugins, so the first step\n"
11756
"in using them is to install the relevant plugins and read their\n"
11757
"documentation. Some plugins may be very specific about which files\n"
11758
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11759
"In other cases, the plugin may leave it in the user's hands to\n"
11760
"define which files are to be filtered. This is typically done\n"
11761
"using rule-based preferences. See ``bzr help rules`` for general\n"
11762
"information about defining these."
11763
msgstr ""
11764
11765
#: en/help_topics/content-filters.txt:51
11766
msgid ""
11767
"\n"
11768
"Impact on commands\n"
11769
"------------------"
11770
msgstr ""
11771
11772
#: en/help_topics/content-filters.txt:55
11773
msgid ""
11774
"Read converters are only applied to commands that read content from\n"
11775
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11776
"will apply read converters to files in the working tree, then compare\n"
11777
"the results to the content last committed."
11778
msgstr ""
11779
11780
#: en/help_topics/content-filters.txt:60
11781
msgid ""
11782
"Write converters are only applied by commands that **create files in a\n"
11783
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11784
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11785
"respectively."
11786
msgstr ""
11787
11788
#: en/help_topics/content-filters.txt:65
11789
msgid ""
11790
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11791
"comitting files. If this makes sense for a given plugin providing\n"
11792
"a content filter, the plugin can usually achieve this effect by using a\n"
11793
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11794
"for more information on hooks."
11795
msgstr ""
11796
11797
#: en/help_topics/content-filters.txt:71
11798
msgid ""
11799
"\n"
11800
"Refreshing your working tree\n"
11801
"----------------------------"
11802
msgstr ""
11803
11804
#: en/help_topics/content-filters.txt:75
11805
msgid ""
11806
"For performance reasons, Bazaar caches the timestamps of files in\n"
11807
"a working tree, and assumes files are unchanged if their timestamps\n"
11808
"match the cached values. As a consequence, there are times when\n"
11809
"you may need to explicitly ask for content filtering to be reapplied\n"
11810
"in one or both directions, e.g. after installing or reconfiguring\n"
11811
"plugins providing it."
11812
msgstr ""
11813
11814
#: en/help_topics/content-filters.txt:82
11815
msgid "Here are some general guidelines for doing this:"
11816
msgstr ""
11817
11818
#: en/help_topics/content-filters.txt:84
11819
msgid ""
11820
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11821
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11822
" relevant read converters and compare the end result with the\n"
11823
" canonical format."
11824
msgstr ""
11825
11826
#: en/help_topics/content-filters.txt:89
11827
msgid ""
11828
" * To reapply write converters, ensure there are no local changes,\n"
11829
" delete the relevant files and run ``bzr revert`` on those files."
11830
msgstr ""
11831
11832
#: en/help_topics/content-filters.txt:92
11833
msgid ""
11834
"Note: In the future, it is likely that additional options will be added\n"
11835
"to commands to make this refreshing process faster and safer.\n"
11836
msgstr ""
11837
11838
#: en/help_topics/current-formats.txt:1
11839
msgid "Current Storage Formats"
11840
msgstr ""
11841
11842
#: en/help_topics/current-formats.txt:3
11843
msgid ""
11844
":2a:\n"
11845
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11846
" compress storage. Provides rich roots which are a one-way\n"
11847
" transition."
11848
msgstr ""
11849
11850
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11851
msgid ""
11852
"\n"
11853
"See :doc:`formats-help` for more about storage formats."
11854
msgstr ""
11855
11856
#: en/help_topics/debug-flags.txt:1
11857
msgid ""
11858
"Debug Flags\n"
11859
"==========="
11860
msgstr ""
11861
11862
#: en/help_topics/debug-flags.txt:4
11863
msgid ""
11864
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11865
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11866
msgstr ""
11867
11868
#: en/help_topics/debug-flags.txt:7
11869
msgid ""
11870
"-Dauth Trace authentication sections used.\n"
11871
"-Dbytes Print out how many bytes were transferred\n"
11872
"-Ddirstate Trace dirstate activity (verbose!)\n"
11873
"-Derror Instead of normal error handling, always print a "
11874
"traceback\n"
11875
" on error.\n"
11876
"-Devil Capture call sites that do expensive or badly-scaling\n"
11877
" operations.\n"
11878
"-Dfetch Trace history copying between repositories.\n"
11879
"-Dfilters Emit information for debugging content filtering.\n"
11880
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11881
"fetch.\n"
11882
"-Dgraph Trace graph traversal.\n"
11883
"-Dhashcache Log every time a working file is read to determine its "
11884
"hash.\n"
11885
"-Dhooks Trace hook execution.\n"
11886
"-Dhpss Trace smart protocol requests and responses.\n"
11887
"-Dhpssdetail More hpss details.\n"
11888
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11889
"-Dhttp Trace http connections, requests and responses.\n"
11890
"-Dindex Trace major index operations.\n"
11891
"-Dknit Trace knit operations.\n"
11892
"-Dlock Trace when lockdir locks are taken or released.\n"
11893
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11894
" retrying the request.\n"
11895
"-Dprogress Trace progress bar operations.\n"
11896
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11897
"-Dmerge Emit information for debugging merges.\n"
11898
"-Dno_apport Don't use apport to report crashes.\n"
11899
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11900
"-Dpack Emit information about pack operations.\n"
11901
"-Drelock Emit a message every time a branch or repository object "
11902
"is\n"
11903
" unlocked then relocked the same way.\n"
11904
"-Dsftp Trace SFTP internals.\n"
11905
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11906
"expected\n"
11907
"-Dstream Trace fetch streams.\n"
11908
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11909
"portable\n"
11910
" manner.\n"
11911
"-Dunlock Some errors during unlock are treated as warnings.\n"
11912
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11913
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11914
"appropriate\n"
11915
" for the format, even for non-local fetches.\n"
11916
msgstr ""
11917
11918
#: en/help_topics/diverged-branches.txt:1
11919
msgid ""
11920
"Diverged Branches\n"
11921
"================="
11922
msgstr ""
11923
11924
#: en/help_topics/diverged-branches.txt:4
11925
msgid ""
11926
"When Bazaar tries to push one branch onto another, it requires that the\n"
11927
"destination branch must be ready to receive the source branch. If this "
11928
"isn't\n"
11929
"the case, then we say that the branches have ``diverged``. Branches are\n"
11930
"considered diverged if the destination branch's most recent commit is one "
11931
"that\n"
11932
"has not been merged (directly or indirectly) by the source branch. To "
11933
"recover\n"
11934
"from diverged branches, one must merge the missing revisions into the "
11935
"source\n"
11936
"branch."
11937
msgstr ""
11938
11939
#: en/help_topics/diverged-branches.txt:12
11940
msgid ""
11941
"This situation commonly arises when using a centralized workflow with local\n"
11942
"commits. If someone else has committed new work to the mainline since your\n"
11943
"last pull and you have local commits that have not yet been pushed to the\n"
11944
"mainline, then your local branch and the mainline have diverged."
11945
msgstr ""
11946
11947
#: en/help_topics/diverged-branches.txt:17
11948
msgid ""
11949
"Discovering What Has Diverged\n"
11950
"-----------------------------"
11951
msgstr ""
11952
11953
#: en/help_topics/diverged-branches.txt:20
11954
msgid ""
11955
"The ``bzr missing`` command is used to find out what revisions are in "
11956
"another\n"
11957
"branch that are not present in the current branch, and vice-versa. It shows "
11958
"a\n"
11959
"summary of which extra revisions exist in each branch. If you want to see "
11960
"the\n"
11961
"precise effects of those revisions, you can use ``bzr diff --"
11962
"old=other_branch``\n"
11963
"to show the differences between other_branch and your current branch."
11964
msgstr ""
11965
11966
#: en/help_topics/diverged-branches.txt:26
11967
msgid ""
11968
"A Solution\n"
11969
"----------"
11970
msgstr ""
11971
11972
#: en/help_topics/diverged-branches.txt:29
11973
msgid ""
11974
"The solution is to merge the revisions from the mainline into your local\n"
11975
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11976
"mainline. This merge may result in conflicts if the other developer's "
11977
"changes\n"
11978
"overlap with your changes. These conflicts should be resolved before\n"
11979
"continuing. After any conflicts have been resolved, or even if there were "
11980
"no\n"
11981
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11982
"to your local branch. This requirement gives you an opportunity to test "
11983
"the\n"
11984
"resulting working tree for correctness, since the merged revisions could "
11985
"have\n"
11986
"made arbitrary changes. After testing, you should commit the merge using\n"
11987
"``bzr commit``. This clears up the diverged branches situation. Your "
11988
"local\n"
11989
"branch can now be pushed to the mainline.\n"
11990
msgstr ""
11991
11992
#: en/help_topics/eol.txt:1
11993
msgid ""
11994
"End of Line Conversion\n"
11995
"======================"
11996
msgstr ""
11997
11998
#: en/help_topics/eol.txt:4
11999
msgid ""
12000
"EOL conversion is provided as a content filter where Bazaar internally\n"
12001
"stores a canonical format but outputs a convenience format. See\n"
12002
"``bzr help content-filters`` for general information about using these."
12003
msgstr ""
12004
12005
#: en/help_topics/eol.txt:8
12006
msgid ""
12007
"Note: Content filtering is only supported in recently added formats,\n"
12008
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
12009
"in a recent format. (Just setting the format on the repository\n"
12010
"is not enough.) If content filtering does not appear to be working, use\n"
12011
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
12012
"or later."
12013
msgstr ""
12014
12015
#: en/help_topics/eol.txt:15
12016
msgid ""
12017
"EOL conversion needs to be enabled for selected file patterns using\n"
12018
"rules. See ``bzr help rules`` for general information on defining rules.\n"
12019
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
12020
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
12021
"supported in a future verison of Bazaar."
12022
msgstr ""
12023
12024
#: en/help_topics/eol.txt:21
12025
msgid ""
12026
"To configure which files to filter, set ``eol`` to one of the values below.\n"
12027
"(If a value is not set, ``exact`` is the default.)"
12028
msgstr ""
12029
12030
#: en/help_topics/eol.txt:24
12031
msgid ""
12032
" ========== ===================================== ======================\n"
12033
" Value Checkout end-of-lines as Commit end-of-lines as\n"
12034
" ========== ===================================== ======================\n"
12035
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
12036
" ---------- ------------------------------------- ----------------------\n"
12037
" ``lf`` ``lf`` ``lf``\n"
12038
" ---------- ------------------------------------- ----------------------\n"
12039
" ``crlf`` ``crlf`` ``lf``\n"
12040
" ---------- ------------------------------------- ----------------------\n"
12041
" ``exact`` No conversion Exactly as in file\n"
12042
" ========== ===================================== ======================"
12043
msgstr ""
12044
12045
#: en/help_topics/eol.txt:36
12046
msgid ""
12047
"Note: For safety reasons, no conversion is applied to any file where a null\n"
12048
"byte is detected in the file."
12049
msgstr ""
12050
12051
#: en/help_topics/eol.txt:39
12052
msgid ""
12053
"For users working on a cross-platform project, here is a suggested rule\n"
12054
"to use as a starting point::"
12055
msgstr ""
12056
12057
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
12058
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
12059
msgid ""
12060
" [name *]\n"
12061
" eol = native"
12062
msgstr ""
12063
12064
#: en/help_topics/eol.txt:45
12065
msgid ""
12066
"If you have binary files that do not contain a null byte though, be\n"
12067
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
12068
"by giving more explicit patterns earlier in the rules file. For example::"
12069
msgstr ""
12070
12071
#: en/help_topics/eol.txt:49
12072
msgid ""
12073
" [name *.png]\n"
12074
" eol = exact"
12075
msgstr ""
12076
12077
#: en/help_topics/eol.txt:55
12078
msgid ""
12079
"If your working tree is on a network drive shared by users on different\n"
12080
"operating systems, you typically want to force certain conventions for\n"
12081
"certain files. In that way, if a file is created with the wrong line\n"
12082
"endings or line endings get mixed during editing, it gets committed\n"
12083
"correctly and gets checked out correctly. For example::"
12084
msgstr ""
12085
12086
#: en/help_topics/eol.txt:61
12087
msgid ""
12088
" [name *.bat]\n"
12089
" eol = crlf"
12090
msgstr ""
12091
12092
#: en/help_topics/eol.txt:64
12093
msgid ""
12094
" [name *.sh]\n"
12095
" eol = lf"
12096
msgstr ""
12097
12098
#: en/help_topics/eol.txt:70
12099
msgid ""
12100
"If you take the care to create files with their required endings, you can\n"
12101
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
12102
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
12103
"introducing mixed line endings will be corrected during commit for files\n"
12104
"with those settings."
12105
msgstr ""
12106
12107
#: en/help_topics/eol.txt:76
12108
msgid ""
12109
"If you have sample test data that deliberately has text files with mixed\n"
12110
"newline conventions, you can ask for those to be left alone like this::"
12111
msgstr ""
12112
12113
#: en/help_topics/eol.txt:79
12114
msgid ""
12115
" [name test_data/]\n"
12116
" eol = exact"
12117
msgstr ""
12118
12119
#: en/help_topics/eol.txt:85
12120
msgid ""
12121
"Note that ``exact`` does not imply the file is binary but it does mean\n"
12122
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
12123
"of content analysis to detect binary files for commands like ``diff``.\n"
12124
"In the future, a ``binary = true`` rule may be added but it is not\n"
12125
"supported yet.)"
12126
msgstr ""
12127
12128
#: en/help_topics/eol.txt:91
12129
msgid ""
12130
"If you have an existing repository with text files already stored using\n"
12131
"Windows newline conventions (``crlf``), then you may want to keep using "
12132
"that\n"
12133
"convention in the repository. Forcing certain files to this convention\n"
12134
"may also help users who do not have rules configured. To do this, set\n"
12135
"``eol`` to one of the values below."
12136
msgstr ""
12137
12138
#: en/help_topics/eol.txt:97
12139
msgid ""
12140
" ============================ ======================== "
12141
"======================\n"
12142
" Value Checkout end-of-lines as Commit end-of-lines "
12143
"as\n"
12144
" ============================ ======================== "
12145
"======================\n"
12146
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
12147
" ``lf`` otherwise\n"
12148
" ---------------------------- ------------------------ ----------------------"
12149
"\n"
12150
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
12151
" ---------------------------- ------------------------ ----------------------"
12152
"\n"
12153
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
12154
" ============================ ======================== ======================"
12155
msgstr ""
12156
12157
#: en/help_topics/eol.txt:108
12158
msgid ""
12159
"For users working on an existing project that uses Windows newline\n"
12160
"conventions in their Bazaar repository, this rule is suggested as a\n"
12161
"starting point::"
12162
msgstr ""
12163
12164
#: en/help_topics/eol.txt:112
12165
msgid ""
12166
" [name *]\n"
12167
" eol = native-with-crlf-in-repo"
12168
msgstr ""
12169
12170
#: en/help_topics/eol.txt:115
12171
msgid ""
12172
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12173
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12174
"``crlf`` and ``exact``."
12175
msgstr ""
12176
12177
#: en/help_topics/eol.txt:119
12178
msgid ""
12179
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12180
"never reject files because a given line ending or mixed line endings\n"
12181
"are found. A precommit hook should be used if you wish to validate\n"
12182
"(and not just convert) content before committing.\n"
12183
msgstr ""
12184
12185
#: en/help_topics/hidden-commands.txt:1
12186
msgid ""
12187
"added List files added in working tree.\n"
12188
"ancestry List all revisions merged into this branch.\n"
12189
"assert-fail Test reporting of assertion failures\n"
12190
"bundle-info Output interesting stats about a bundle\n"
12191
"bundle-revisions Create a merge-directive for submitting changes.\n"
12192
"cat-revision Write out metadata for a revision.\n"
12193
"dump-btree Dump the contents of a btree index file to stdout.\n"
12194
"export-pot Export command helps and error messages in po format.\n"
12195
"file-id Print file_id of a particular file or directory.\n"
12196
"file-path Print path of file_ids to a file or directory.\n"
12197
"find-merge-base Find and print a base revision for merging two "
12198
"branches.\n"
12199
"hooks Show hooks.\n"
12200
"inventory Show inventory of the current working copy or a "
12201
"revision.\n"
12202
"local-time-offset Show the offset in seconds from GMT to local time.\n"
12203
"lookup-revision Lookup the revision-id from a revision-number\n"
12204
"merge-directive Generate a merge directive for auto-merge tools.\n"
12205
"modified List files modified in working tree.\n"
12206
"re-sign Create a digital signature for an existing revision.\n"
12207
"reference list, view and set branch locations for nested trees.\n"
12208
"relpath Show path of a file relative to root\n"
12209
"repair-workingtree Reset the working tree state file.\n"
12210
"revision-history Display the list of revision ids on a branch.\n"
12211
"revision-info Show revision number and revision id for a given "
12212
"revision\n"
12213
" identifier.\n"
12214
"rocks Statement of optimism.\n"
12215
"selftest Run internal test suite.\n"
12216
"shell-complete Show appropriate completions for context.\n"
12217
"test-script Run a shell-like test from a file.\n"
12218
"touching-revisions Return revision-ids which affected a particular file.\n"
12219
"unknowns List unknown files.\n"
12220
"wait-until-signalled Test helper for\n"
12221
" test_start_and_stop_bzr_subprocess_send_signal.\n"
12222
msgstr ""
12223
12224
#: en/help_topics/hooks.txt:1
12225
msgid ""
12226
"\n"
12227
"Hooks\n"
12228
"====="
12229
msgstr ""
12230
12231
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
12232
msgid ""
12233
"Introduction\n"
12234
"------------"
12235
msgstr ""
12236
12237
#: en/help_topics/hooks.txt:8
12238
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12239
msgstr ""
12240
12241
#: en/help_topics/hooks.txt:10
12242
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
12243
msgstr ""
12244
12245
#: en/help_topics/hooks.txt:12
12246
msgid ""
12247
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12248
msgstr ""
12249
12250
#: en/help_topics/hooks.txt:14
12251
msgid ""
12252
"The class that contains each hook is given before the hooks it supplies. "
12253
"For\n"
12254
"instance, BranchHooks as the class is the hooks class for\n"
12255
"`bzrlib.branch.Branch.hooks`."
12256
msgstr ""
12257
12258
#: en/help_topics/hooks.txt:18
12259
msgid ""
12260
"Each description also indicates whether the hook runs on the client (the\n"
12261
"machine where bzr was invoked) or the server (the machine addressed by\n"
12262
"the branch URL). These may be, but are not necessarily, the same machine."
12263
msgstr ""
12264
12265
#: en/help_topics/hooks.txt:22
12266
msgid ""
12267
"Plugins (including hooks) are run on the server if all of these is true:"
12268
msgstr ""
12269
12270
#: en/help_topics/hooks.txt:24
12271
msgid ""
12272
" * The connection is via a smart server (accessed with a URL starting with\n"
12273
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12274
"\"http://\"\n"
12275
" URL when a smart server is available via HTTP)."
12276
msgstr ""
12277
12278
#: en/help_topics/hooks.txt:28
12279
msgid ""
12280
" * The hook is either server specific or part of general infrastructure "
12281
"rather\n"
12282
" than client specific code (such as commit)."
12283
msgstr ""
12284
12285
#: en/help_topics/hooks.txt:31
12286
msgid ""
12287
"\n"
12288
"BranchHooks\n"
12289
"-----------"
12290
msgstr ""
12291
12292
#: en/help_topics/hooks.txt:35
12293
msgid ""
12294
"automatic_tag_name\n"
12295
"~~~~~~~~~~~~~~~~~~"
12296
msgstr ""
12297
12298
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12299
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
12300
msgid "Introduced in: 2.2"
12301
msgstr ""
12302
12303
#: en/help_topics/hooks.txt:40
12304
msgid ""
12305
"Called to determine an automatic tag name for a revision.\n"
12306
"automatic_tag_name is called with (branch, revision_id) and should\n"
12307
"return a tag name or None if no tag name could be determined. The\n"
12308
"first non-None tag name returned will be used."
12309
msgstr ""
12310
12311
#: en/help_topics/hooks.txt:45
12312
msgid ""
12313
"open\n"
12314
"~~~~"
12315
msgstr ""
12316
12317
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
12318
#: en/help_topics/hooks.txt:304
12319
msgid "Introduced in: 1.8"
12320
msgstr ""
12321
12322
#: en/help_topics/hooks.txt:50
12323
msgid ""
12324
"Called with the Branch object that has been opened after a branch is\n"
12325
"opened."
12326
msgstr ""
12327
12328
#: en/help_topics/hooks.txt:53
12329
msgid ""
12330
"post_branch_init\n"
12331
"~~~~~~~~~~~~~~~~"
12332
msgstr ""
12333
12334
#: en/help_topics/hooks.txt:58
12335
msgid ""
12336
"Called after new branch initialization completes. post_branch_init is\n"
12337
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12338
"branch and checkout (both heavyweight and lightweight) will all\n"
12339
"trigger this hook."
12340
msgstr ""
12341
12342
#: en/help_topics/hooks.txt:63
12343
msgid ""
12344
"post_change_branch_tip\n"
12345
"~~~~~~~~~~~~~~~~~~~~~~"
12346
msgstr ""
12347
12348
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
12349
msgid "Introduced in: 1.4"
12350
msgstr ""
12351
12352
#: en/help_topics/hooks.txt:68
12353
msgid ""
12354
"Called in bzr client and server after a change to the tip of a branch\n"
12355
"is made. post_change_branch_tip is called with a\n"
12356
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12357
"uncommit will all trigger this hook."
12358
msgstr ""
12359
12360
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12361
msgid ""
12362
"post_commit\n"
12363
"~~~~~~~~~~~"
12364
msgstr ""
12365
12366
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12367
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12368
#: en/help_topics/hooks.txt:145
12369
msgid "Introduced in: 0.15"
12370
msgstr ""
12371
12372
#: en/help_topics/hooks.txt:78
12373
msgid ""
12374
"Called in the bzr client after a commit has completed. post_commit is\n"
12375
"called with (local, master, old_revno, old_revid, new_revno,\n"
12376
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12377
"branch."
12378
msgstr ""
12379
12380
#: en/help_topics/hooks.txt:83
12381
msgid ""
12382
"post_pull\n"
12383
"~~~~~~~~~"
12384
msgstr ""
12385
12386
#: en/help_topics/hooks.txt:88
12387
msgid ""
12388
"Called after a pull operation completes. post_pull is called with a\n"
12389
"bzrlib.branch.PullResult object and only runs in the bzr client."
12390
msgstr ""
12391
12392
#: en/help_topics/hooks.txt:91
12393
msgid ""
12394
"post_push\n"
12395
"~~~~~~~~~"
12396
msgstr ""
12397
12398
#: en/help_topics/hooks.txt:96
12399
msgid ""
12400
"Called after a push operation completes. post_push is called with a\n"
12401
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12402
msgstr ""
12403
12404
#: en/help_topics/hooks.txt:99
12405
msgid ""
12406
"post_switch\n"
12407
"~~~~~~~~~~~"
12408
msgstr ""
12409
12410
#: en/help_topics/hooks.txt:104
12411
msgid ""
12412
"Called after a checkout switches branch. post_switch is called with a\n"
12413
"bzrlib.branch.SwitchHookParams."
12414
msgstr ""
12415
12416
#: en/help_topics/hooks.txt:107
12417
msgid ""
12418
"post_uncommit\n"
12419
"~~~~~~~~~~~~~"
12420
msgstr ""
12421
12422
#: en/help_topics/hooks.txt:112
12423
msgid ""
12424
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12425
"called with (local, master, old_revno, old_revid, new_revno,\n"
12426
"new_revid) where local is the local branch or None, master is the\n"
12427
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12428
"of None."
12429
msgstr ""
12430
12431
#: en/help_topics/hooks.txt:118
12432
msgid ""
12433
"pre_change_branch_tip\n"
12434
"~~~~~~~~~~~~~~~~~~~~~"
12435
msgstr ""
12436
12437
#: en/help_topics/hooks.txt:121
12438
msgid "Introduced in: 1.6"
12439
msgstr ""
12440
12441
#: en/help_topics/hooks.txt:123
12442
msgid ""
12443
"Called in bzr client and server before a change to the tip of a branch\n"
12444
"is made. pre_change_branch_tip is called with a\n"
12445
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12446
"uncommit will all trigger this hook."
12447
msgstr ""
12448
12449
#: en/help_topics/hooks.txt:128
12450
msgid ""
12451
"pre_commit\n"
12452
"~~~~~~~~~~"
12453
msgstr ""
12454
12455
#: en/help_topics/hooks.txt:131
12456
msgid "Introduced in: 0.91"
12457
msgstr ""
12458
12459
#: en/help_topics/hooks.txt:133
12460
msgid ""
12461
"Called after a commit is calculated but before it is completed.\n"
12462
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12463
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12464
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12465
"TreeDelta object describing changes from the basis revision. hooks\n"
12466
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12467
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12468
"tree."
12469
msgstr ""
12470
12471
#: en/help_topics/hooks.txt:142
12472
msgid ""
12473
"set_rh\n"
12474
"~~~~~~"
12475
msgstr ""
12476
12477
#: en/help_topics/hooks.txt:147
12478
msgid ""
12479
"Invoked whenever the revision history has been set via\n"
12480
"set_revision_history. The api signature is (branch, revision_history),\n"
12481
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12482
"for bzr to trigger, a better hook to use is\n"
12483
"Branch.post_change_branch_tip."
12484
msgstr ""
12485
12486
#: en/help_topics/hooks.txt:153
12487
msgid ""
12488
"transform_fallback_location\n"
12489
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12490
msgstr ""
12491
12492
#: en/help_topics/hooks.txt:156
12493
msgid "Introduced in: 1.9"
12494
msgstr ""
12495
12496
#: en/help_topics/hooks.txt:158
12497
msgid ""
12498
"Called when a stacked branch is activating its fallback locations.\n"
12499
"transform_fallback_location is called with (branch, url), and should\n"
12500
"return a new url. Returning the same url allows it to be used as-is,\n"
12501
"returning a different one can be used to cause the branch to stack on\n"
12502
"a closer copy of that fallback_location. Note that the branch cannot\n"
12503
"have history accessing methods called on it during this hook because\n"
12504
"the fallback locations have not been activated. When there are\n"
12505
"multiple hooks installed for transform_fallback_location, all are\n"
12506
"called with the url returned from the previous hook.The order is\n"
12507
"however undefined."
12508
msgstr ""
12509
12510
#: en/help_topics/hooks.txt:169
12511
msgid ""
12512
"CommandHooks\n"
12513
"------------"
12514
msgstr ""
12515
12516
#: en/help_topics/hooks.txt:172
12517
msgid ""
12518
"extend_command\n"
12519
"~~~~~~~~~~~~~~"
12520
msgstr ""
12521
12522
#: en/help_topics/hooks.txt:175
12523
msgid "Introduced in: 1.13"
12524
msgstr ""
12525
12526
#: en/help_topics/hooks.txt:177
12527
msgid ""
12528
"Called after creating a command object to allow modifications such as\n"
12529
"adding or removing options, docs etc. Called with the new\n"
12530
"bzrlib.commands.Command object."
12531
msgstr ""
12532
12533
#: en/help_topics/hooks.txt:181
12534
msgid ""
12535
"get_command\n"
12536
"~~~~~~~~~~~"
12537
msgstr ""
12538
12539
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12540
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12541
msgid "Introduced in: 1.17"
12542
msgstr ""
12543
12544
#: en/help_topics/hooks.txt:186
12545
msgid ""
12546
"Called when creating a single command. Called with (cmd_or_None,\n"
12547
"command_name). get_command should either return the cmd_or_None\n"
12548
"parameter, or a replacement Command object that should be used for the\n"
12549
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12550
"Many users will prefer to use bzrlib.commands.register_command or\n"
12551
"plugin_cmds.register_lazy."
12552
msgstr ""
12553
12554
#: en/help_topics/hooks.txt:193
12555
msgid ""
12556
"get_missing_command\n"
12557
"~~~~~~~~~~~~~~~~~~~"
12558
msgstr ""
12559
12560
#: en/help_topics/hooks.txt:198
12561
msgid ""
12562
"Called when creating a single command if no command could be found.\n"
12563
"Called with (command_name). get_missing_command should either return\n"
12564
"None, or a Command object to be used for the command."
12565
msgstr ""
12566
12567
#: en/help_topics/hooks.txt:202
12568
msgid ""
12569
"list_commands\n"
12570
"~~~~~~~~~~~~~"
12571
msgstr ""
12572
12573
#: en/help_topics/hooks.txt:207
12574
msgid ""
12575
"Called when enumerating commands. Called with a set of cmd_name\n"
12576
"strings for all the commands found so far. This set is safe to mutate\n"
12577
"- e.g. to remove a command. list_commands should return the updated\n"
12578
"set of command names."
12579
msgstr ""
12580
12581
#: en/help_topics/hooks.txt:212
12582
msgid ""
12583
"_ConfigHooks\n"
12584
"------------"
12585
msgstr ""
12586
12587
#: en/help_topics/hooks.txt:215
12588
msgid ""
12589
"get\n"
12590
"~~~"
12591
msgstr ""
12592
12593
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12594
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12595
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12596
#: en/help_topics/hooks.txt:443
12597
msgid "Introduced in: 2.4"
12598
msgstr ""
12599
12600
#: en/help_topics/hooks.txt:220
12601
msgid ""
12602
"Invoked when a config option is read. The signature is (stack, name,\n"
12603
"value)."
12604
msgstr ""
12605
12606
#: en/help_topics/hooks.txt:223
12607
msgid ""
12608
"load\n"
12609
"~~~~"
12610
msgstr ""
12611
12612
#: en/help_topics/hooks.txt:228
12613
msgid "Invoked when a config store is loaded. The signature is (store)."
12614
msgstr ""
12615
12616
#: en/help_topics/hooks.txt:230
12617
msgid ""
12618
"remove\n"
12619
"~~~~~~"
12620
msgstr ""
12621
12622
#: en/help_topics/hooks.txt:235
12623
msgid ""
12624
"Invoked when a config option is removed. The signature is (stack,\n"
12625
"name)."
12626
msgstr ""
12627
12628
#: en/help_topics/hooks.txt:238
12629
msgid ""
12630
"save\n"
12631
"~~~~"
12632
msgstr ""
12633
12634
#: en/help_topics/hooks.txt:243
12635
msgid "Invoked when a config store is saved. The signature is (store)."
12636
msgstr ""
12637
12638
#: en/help_topics/hooks.txt:245
12639
msgid ""
12640
"set\n"
12641
"~~~"
12642
msgstr ""
12643
12644
#: en/help_topics/hooks.txt:250
12645
msgid ""
12646
"Invoked when a config option is set. The signature is (stack, name,\n"
12647
"value)."
12648
msgstr ""
12649
12650
#: en/help_topics/hooks.txt:253
12651
msgid ""
12652
"ControlDirHooks\n"
12653
"---------------"
12654
msgstr ""
12655
12656
#: en/help_topics/hooks.txt:256
12657
msgid ""
12658
"post_repo_init\n"
12659
"~~~~~~~~~~~~~~"
12660
msgstr ""
12661
12662
#: en/help_topics/hooks.txt:261
12663
msgid ""
12664
"Invoked after a repository has been initialized. post_repo_init is\n"
12665
"called with a bzrlib.controldir.RepoInitHookParams."
12666
msgstr ""
12667
12668
#: en/help_topics/hooks.txt:264
12669
msgid ""
12670
"pre_open\n"
12671
"~~~~~~~~"
12672
msgstr ""
12673
12674
#: en/help_topics/hooks.txt:267
12675
msgid "Introduced in: 1.14"
12676
msgstr ""
12677
12678
#: en/help_topics/hooks.txt:269
12679
msgid ""
12680
"Invoked before attempting to open a ControlDir with the transport that\n"
12681
"the open will use."
12682
msgstr ""
12683
12684
#: en/help_topics/hooks.txt:272
12685
msgid ""
12686
"InfoHooks\n"
12687
"---------"
12688
msgstr ""
12689
12690
#: en/help_topics/hooks.txt:275
12691
msgid ""
12692
"repository\n"
12693
"~~~~~~~~~~"
12694
msgstr ""
12695
12696
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12697
#: en/help_topics/hooks.txt:521
12698
msgid "Introduced in: 1.15"
12699
msgstr ""
12700
12701
#: en/help_topics/hooks.txt:280
12702
msgid ""
12703
"Invoked when displaying the statistics for a repository. repository is\n"
12704
"called with a statistics dictionary as returned by the repository and\n"
12705
"a file-like object to write to."
12706
msgstr ""
12707
12708
#: en/help_topics/hooks.txt:284
12709
msgid ""
12710
"LockHooks\n"
12711
"---------"
12712
msgstr ""
12713
12714
#: en/help_topics/hooks.txt:287
12715
msgid ""
12716
"lock_acquired\n"
12717
"~~~~~~~~~~~~~"
12718
msgstr ""
12719
12720
#: en/help_topics/hooks.txt:292
12721
msgid ""
12722
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12723
msgstr ""
12724
12725
#: en/help_topics/hooks.txt:294
12726
msgid ""
12727
"lock_broken\n"
12728
"~~~~~~~~~~~"
12729
msgstr ""
12730
12731
#: en/help_topics/hooks.txt:299
12732
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12733
msgstr ""
12734
12735
#: en/help_topics/hooks.txt:301
12736
msgid ""
12737
"lock_released\n"
12738
"~~~~~~~~~~~~~"
12739
msgstr ""
12740
12741
#: en/help_topics/hooks.txt:306
12742
msgid ""
12743
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12744
msgstr ""
12745
12746
#: en/help_topics/hooks.txt:308
12747
msgid ""
12748
"MergeHooks\n"
12749
"----------"
12750
msgstr ""
12751
12752
#: en/help_topics/hooks.txt:311
12753
msgid ""
12754
"merge_file_content\n"
12755
"~~~~~~~~~~~~~~~~~~"
12756
msgstr ""
12757
12758
#: en/help_topics/hooks.txt:314
12759
msgid "Introduced in: 2.1"
12760
msgstr ""
12761
12762
#: en/help_topics/hooks.txt:316
12763
msgid ""
12764
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12765
"object when starting a merge. Should return either None or a subclass\n"
12766
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12767
"called per file that needs to be merged (including when one side has\n"
12768
"deleted the file and the other has changed it). See the\n"
12769
"AbstractPerFileMerger API docs for details on how it is used by merge."
12770
msgstr ""
12771
12772
#: en/help_topics/hooks.txt:323
12773
msgid ""
12774
"post_merge\n"
12775
"~~~~~~~~~~"
12776
msgstr ""
12777
12778
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12779
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12780
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12781
msgid "Introduced in: 2.5"
12782
msgstr ""
12783
12784
#: en/help_topics/hooks.txt:328
12785
msgid ""
12786
"Called after a merge. Receives a Merger object as the single argument.\n"
12787
"The return value is ignored."
12788
msgstr ""
12789
12790
#: en/help_topics/hooks.txt:331
12791
msgid ""
12792
"pre_merge\n"
12793
"~~~~~~~~~"
12794
msgstr ""
12795
12796
#: en/help_topics/hooks.txt:336
12797
msgid ""
12798
"Called before a merge. Receives a Merger object as the single\n"
12799
"argument."
12800
msgstr ""
12801
12802
#: en/help_topics/hooks.txt:339
12803
msgid ""
12804
"MergeDirectiveHooks\n"
12805
"-------------------"
12806
msgstr ""
12807
12808
#: en/help_topics/hooks.txt:342
12809
msgid ""
12810
"merge_request_body\n"
12811
"~~~~~~~~~~~~~~~~~~"
12812
msgstr ""
12813
12814
#: en/help_topics/hooks.txt:345
12815
msgid "Introduced in: 1.15.0"
12816
msgstr ""
12817
12818
#: en/help_topics/hooks.txt:347
12819
msgid ""
12820
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12821
"request. Callbacks must return a body. If more than one callback is\n"
12822
"registered, the output of one callback is provided to the next."
12823
msgstr ""
12824
12825
#: en/help_topics/hooks.txt:351
12826
msgid ""
12827
"MessageEditorHooks\n"
12828
"------------------"
12829
msgstr ""
12830
12831
#: en/help_topics/hooks.txt:354
12832
msgid ""
12833
"commit_message_template\n"
12834
"~~~~~~~~~~~~~~~~~~~~~~~"
12835
msgstr ""
12836
12837
#: en/help_topics/hooks.txt:357
12838
msgid "Introduced in: 1.10"
12839
msgstr ""
12840
12841
#: en/help_topics/hooks.txt:359
12842
msgid ""
12843
"Called when a commit message is being generated.\n"
12844
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12845
"and the message that is known so far. commit_message_template must\n"
12846
"return a new message to use (which could be the same as it was given).\n"
12847
"When there are multiple hooks registered for commit_message_template,\n"
12848
"they are chained with the result from the first passed into the\n"
12849
"second, and so on."
12850
msgstr ""
12851
12852
#: en/help_topics/hooks.txt:367
12853
msgid ""
12854
"set_commit_message\n"
12855
"~~~~~~~~~~~~~~~~~~"
12856
msgstr ""
12857
12858
#: en/help_topics/hooks.txt:372
12859
msgid ""
12860
"Set a fixed commit message. set_commit_message is called with the\n"
12861
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12862
"properties by editing commit.builder._revprops) and the message so\n"
12863
"far. set_commit_message must return the message to use or None if it\n"
12864
"should use the message editor as normal."
12865
msgstr ""
12866
12867
#: en/help_topics/hooks.txt:378
12868
msgid ""
12869
"MutableTreeHooks\n"
12870
"----------------"
12871
msgstr ""
12872
12873
#: en/help_topics/hooks.txt:381
12874
msgid ""
12875
"post_build_tree\n"
12876
"~~~~~~~~~~~~~~~"
12877
msgstr ""
12878
12879
#: en/help_topics/hooks.txt:386
12880
msgid ""
12881
"Called after a completely new tree is built. The hook is called with\n"
12882
"the tree as its only argument."
12883
msgstr ""
12884
12885
#: en/help_topics/hooks.txt:392
12886
msgid "Introduced in: 2.0"
12887
msgstr ""
12888
12889
#: en/help_topics/hooks.txt:394
12890
msgid ""
12891
"Called after a commit is performed on a tree. The hook is called with\n"
12892
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12893
"commit was performed on is available via the mutable_tree attribute of\n"
12894
"that object."
12895
msgstr ""
12896
12897
#: en/help_topics/hooks.txt:399
12898
msgid ""
12899
"post_transform\n"
12900
"~~~~~~~~~~~~~~"
12901
msgstr ""
12902
12903
#: en/help_topics/hooks.txt:404
12904
msgid ""
12905
"Called after a tree transform has been performed on a tree. The hook\n"
12906
"is called with the tree that is being transformed and the transform."
12907
msgstr ""
12908
12909
#: en/help_topics/hooks.txt:407
12910
msgid ""
12911
"pre_transform\n"
12912
"~~~~~~~~~~~~~"
12913
msgstr ""
12914
12915
#: en/help_topics/hooks.txt:412
12916
msgid ""
12917
"Called before a tree transform on this tree. The hook is called with\n"
12918
"the tree that is being transformed and the transform."
12919
msgstr ""
12920
12921
#: en/help_topics/hooks.txt:415
12922
msgid ""
12923
"start_commit\n"
12924
"~~~~~~~~~~~~"
12925
msgstr ""
12926
12927
#: en/help_topics/hooks.txt:420
12928
msgid ""
12929
"Called before a commit is performed on a tree. The start commit hook\n"
12930
"is able to change the tree before the commit takes place. start_commit\n"
12931
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12932
"being performed on."
12933
msgstr ""
12934
12935
#: en/help_topics/hooks.txt:425
12936
msgid ""
12937
"SmartClientHooks\n"
12938
"----------------"
12939
msgstr ""
12940
12941
#: en/help_topics/hooks.txt:428
12942
msgid ""
12943
"call\n"
12944
"~~~~"
12945
msgstr ""
12946
12947
#: en/help_topics/hooks.txt:431
12948
msgid "Introduced in: unknown"
12949
msgstr ""
12950
12951
#: en/help_topics/hooks.txt:433
12952
msgid ""
12953
"Called when the smart client is submitting a request to the smart\n"
12954
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12955
"Streaming request bodies, and responses, are not accessible."
12956
msgstr ""
12957
12958
#: en/help_topics/hooks.txt:437
12959
msgid ""
12960
"SmartServerHooks\n"
12961
"----------------"
12962
msgstr ""
12963
12964
#: en/help_topics/hooks.txt:440
12965
msgid ""
12966
"server_exception\n"
12967
"~~~~~~~~~~~~~~~~"
12968
msgstr ""
12969
12970
#: en/help_topics/hooks.txt:445
12971
msgid ""
12972
"Called by the bzr server when an exception occurs. server_exception is\n"
12973
"called with the sys.exc_info() tuple return true for the hook if the\n"
12974
"exception has been handled, in which case the server will exit\n"
12975
"normally."
12976
msgstr ""
12977
12978
#: en/help_topics/hooks.txt:450
12979
msgid ""
12980
"server_started\n"
12981
"~~~~~~~~~~~~~~"
12982
msgstr ""
12983
12984
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12985
msgid "Introduced in: 0.16"
12986
msgstr ""
12987
12988
#: en/help_topics/hooks.txt:455
12989
msgid ""
12990
"Called by the bzr server when it starts serving a directory.\n"
12991
"server_started is called with (backing urls, public url), where\n"
12992
"backing_url is a list of URLs giving the server-specific directory\n"
12993
"locations, and public_url is the public URL for the directory being\n"
12994
"served."
12995
msgstr ""
12996
12997
#: en/help_topics/hooks.txt:461
12998
msgid ""
12999
"server_started_ex\n"
13000
"~~~~~~~~~~~~~~~~~"
13001
msgstr ""
13002
13003
#: en/help_topics/hooks.txt:466
13004
msgid ""
13005
"Called by the bzr server when it starts serving a directory.\n"
13006
"server_started is called with (backing_urls, server_obj)."
13007
msgstr ""
13008
13009
#: en/help_topics/hooks.txt:469
13010
msgid ""
13011
"server_stopped\n"
13012
"~~~~~~~~~~~~~~"
13013
msgstr ""
13014
13015
#: en/help_topics/hooks.txt:474
13016
msgid ""
13017
"Called by the bzr server when it stops serving a directory.\n"
13018
"server_stopped is called with the same parameters as the\n"
13019
"server_started hook: (backing_urls, public_url)."
13020
msgstr ""
13021
13022
#: en/help_topics/hooks.txt:478
13023
msgid ""
13024
"StatusHooks\n"
13025
"-----------"
13026
msgstr ""
13027
13028
#: en/help_topics/hooks.txt:481
13029
msgid ""
13030
"post_status\n"
13031
"~~~~~~~~~~~"
13032
msgstr ""
13033
13034
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
13035
msgid "Introduced in: 2.3"
13036
msgstr ""
13037
13038
#: en/help_topics/hooks.txt:486
13039
msgid ""
13040
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13041
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13042
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13043
"correspond to the command line options specified by the user for the\n"
13044
"status command. to_file is the output stream for writing."
13045
msgstr ""
13046
13047
#: en/help_topics/hooks.txt:492
13048
msgid ""
13049
"pre_status\n"
13050
"~~~~~~~~~~"
13051
msgstr ""
13052
13053
#: en/help_topics/hooks.txt:497
13054
msgid ""
13055
"Called with argument StatusHookParams before Bazaar displays the\n"
13056
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13057
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13058
"correspond to the command line options specified by the user for the\n"
13059
"status command. to_file is the output stream for writing."
13060
msgstr ""
13061
13062
#: en/help_topics/hooks.txt:503
13063
msgid ""
13064
"TransportHooks\n"
13065
"--------------"
13066
msgstr ""
13067
13068
#: en/help_topics/hooks.txt:506
13069
msgid ""
13070
"post_connect\n"
13071
"~~~~~~~~~~~~"
13072
msgstr ""
13073
13074
#: en/help_topics/hooks.txt:511
13075
msgid ""
13076
"Called after a new connection is established or a reconnect occurs.\n"
13077
"The sole argument passed is either the connected transport or smart\n"
13078
"medium instance."
13079
msgstr ""
13080
13081
#: en/help_topics/hooks.txt:515
13082
msgid ""
13083
"RioVersionInfoBuilderHooks\n"
13084
"--------------------------"
13085
msgstr ""
13086
13087
#: en/help_topics/hooks.txt:518
13088
msgid ""
13089
"revision\n"
13090
"~~~~~~~~"
13091
msgstr ""
13092
13093
#: en/help_topics/hooks.txt:523
13094
msgid ""
13095
"Invoked when adding information about a revision to the RIO stanza\n"
13096
"that is printed. revision is called with a revision object and a RIO\n"
13097
"stanza.\n"
13098
msgstr ""
13099
13100
#: en/help_topics/location-alias.txt:1
13101
msgid ""
13102
"Location aliases\n"
13103
"================"
13104
msgstr ""
13105
13106
#: en/help_topics/location-alias.txt:4
13107
msgid ""
13108
"Bazaar defines several aliases for locations associated with a branch. "
13109
"These\n"
13110
"can be used with most commands that expect a location, such as `bzr push`."
13111
msgstr ""
13112
13113
#: en/help_topics/location-alias.txt:7
13114
msgid "The aliases are::"
13115
msgstr ""
13116
13117
#: en/help_topics/location-alias.txt:9
13118
msgid ""
13119
" :bound The branch this branch is bound to, for bound branches.\n"
13120
" :parent The parent of this branch.\n"
13121
" :public The public location of this branch.\n"
13122
" :push The saved location used for `bzr push` with no arguments.\n"
13123
" :submit The submit branch for this branch.\n"
13124
" :this This branch."
13125
msgstr ""
13126
13127
#: en/help_topics/location-alias.txt:16
13128
msgid "For example, to push to the parent location::"
13129
msgstr ""
13130
13131
#: en/help_topics/location-alias.txt:18
13132
msgid " bzr push :parent\n"
13133
msgstr ""
13134
13135
#: en/help_topics/log-formats.txt:1
13136
msgid ""
13137
"Log Formats\n"
13138
"==========="
13139
msgstr ""
13140
13141
#: en/help_topics/log-formats.txt:4
13142
msgid ""
13143
"A log format controls how information about each revision is displayed.\n"
13144
"The standard log formats are compared below::"
13145
msgstr ""
13146
13147
#: en/help_topics/log-formats.txt:7
13148
msgid ""
13149
" Feature long short line\n"
13150
" ---------------------- ------------- ------------ -------------------\n"
13151
" design goal detailed view concise view 1 revision per line\n"
13152
" committer name+email name only name only\n"
13153
" author name+email - -\n"
13154
" date-time format full date only date only\n"
13155
" commit message full full top line\n"
13156
" tags yes yes yes\n"
13157
" merges indicator - yes -\n"
13158
" status/delta optional optional -\n"
13159
" diff/patch optional optional -\n"
13160
" revision-id optional optional -\n"
13161
" branch nick yes - -\n"
13162
" foreign vcs properties yes yes -\n"
13163
" preferred levels all 1 1\n"
13164
" digital signature optional - -"
13165
msgstr ""
13166
13167
#: en/help_topics/log-formats.txt:24
13168
msgid ""
13169
"The default format is ``long``. To change this, define the ``log_format``\n"
13170
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
13171
msgstr ""
13172
13173
#: en/help_topics/log-formats.txt:27
13174
msgid ""
13175
" [DEFAULT]\n"
13176
" log_format = short"
13177
msgstr ""
13178
13179
#: en/help_topics/log-formats.txt:30
13180
msgid ""
13181
"Alternatively, to change the log format used for a given query, use the\n"
13182
"--long, --short or --line options."
13183
msgstr ""
13184
13185
#: en/help_topics/log-formats.txt:33
13186
msgid ""
13187
"If one of the standard log formats does not meet your needs, additional\n"
13188
"formats can be provided by plugins.\n"
13189
msgstr ""
13190
13191
#: en/help_topics/other-formats.txt:1
13192
msgid "Other Storage Formats"
13193
msgstr ""
13194
13195
#: en/help_topics/other-formats.txt:3
13196
msgid "Experimental formats are shown below."
13197
msgstr ""
13198
13199
#: en/help_topics/other-formats.txt:5
13200
msgid ""
13201
":development-colo:\n"
13202
" (native) The 2a format with experimental support for colocated\n"
13203
" branches."
13204
msgstr ""
13205
13206
#: en/help_topics/other-formats.txt:9
13207
msgid ""
13208
"\n"
13209
"Deprecated formats are shown below."
13210
msgstr ""
13211
13212
#: en/help_topics/other-formats.txt:12
13213
msgid ""
13214
":pack-0.92:\n"
13215
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
13216
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
13217
" by bzr < 0.92."
13218
msgstr ""
13219
13220
#: en/help_topics/patterns.txt:1
13221
msgid ""
13222
"Patterns\n"
13223
"========"
13224
msgstr ""
13225
13226
#: en/help_topics/patterns.txt:4
13227
msgid ""
13228
"Bazaar uses patterns to match files at various times. For example,\n"
13229
"the ``add`` command skips over files that match ignore patterns\n"
13230
"and preferences can be associated with files using rule patterns.\n"
13231
"The pattern syntax is described below."
13232
msgstr ""
13233
13234
#: en/help_topics/patterns.txt:9
13235
msgid ""
13236
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13237
"slash or is a regular expression, it is compared to the whole path\n"
13238
"from the branch root. Otherwise, it is compared to only the last\n"
13239
"component of the path. To match a file only in the root directory,\n"
13240
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13241
msgstr ""
13242
13243
#: en/help_topics/patterns.txt:15
13244
msgid "Patterns may include globbing wildcards such as::"
13245
msgstr ""
13246
13247
#: en/help_topics/patterns.txt:17
13248
msgid ""
13249
" ? - Matches any single character except '/'\n"
13250
" * - Matches 0 or more characters except '/'\n"
13251
" /**/ - Matches 0 or more directories in a path\n"
13252
" [a-z] - Matches a single character from within a group of characters"
13253
msgstr ""
13254
13255
#: en/help_topics/patterns.txt:22
13256
msgid ""
13257
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13258
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13259
"expression. Regular expression patterns may not include named or\n"
13260
"numbered groups."
13261
msgstr ""
13262
13263
#: en/help_topics/patterns.txt:27
13264
msgid ""
13265
"Case insensitive ignore patterns can be specified with regular expressions\n"
13266
"by using the ``i`` (for ignore case) flag in the pattern."
13267
msgstr ""
13268
13269
#: en/help_topics/patterns.txt:30
13270
msgid ""
13271
"For example, a case insensitive match for ``foo`` may be specified as::"
13272
msgstr ""
13273
13274
#: en/help_topics/patterns.txt:32
13275
msgid " RE:(?i)foo"
13276
msgstr ""
13277
13278
#: en/help_topics/patterns.txt:34
13279
msgid ""
13280
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13281
"matched by that pattern will not be ignored."
13282
msgstr ""
13283
13284
#: en/help_topics/patterns.txt:37
13285
msgid ""
13286
".. _Python regular expressions: http://docs.python.org/library/re.html"
13287
msgstr ""
13288
13289
#: en/help_topics/revisionspec.txt:1
13290
msgid "Revision Identifiers"
13291
msgstr ""
13292
13293
#: en/help_topics/revisionspec.txt:3
13294
msgid ""
13295
"A revision identifier refers to a specific state of a branch's history. It\n"
13296
"can be expressed in several ways. It can begin with a keyword to\n"
13297
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13298
"'before:yesterday' and 'submit:'."
13299
msgstr ""
13300
13301
#: en/help_topics/revisionspec.txt:8
13302
msgid ""
13303
"Alternately, it can be given without a keyword, in which case it will be\n"
13304
"checked as a revision number, a tag, a revision id, a date specification, or "
13305
"a\n"
13306
"branch specification, in that order. For example, 'date:today' could be\n"
13307
"written as simply 'today', though if you have a tag called 'today' that "
13308
"will\n"
13309
"be found first."
13310
msgstr ""
13311
13312
#: en/help_topics/revisionspec.txt:14
13313
msgid ""
13314
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13315
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13316
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13317
"or\n"
13318
"spaces around the '..')."
13319
msgstr ""
13320
13321
#: en/help_topics/revisionspec.txt:19
13322
msgid ""
13323
"Ranges are interpreted differently by different commands. To the \"log\" "
13324
"command,\n"
13325
"a range is a sequence of log messages, but to the \"diff\" command, the "
13326
"range\n"
13327
"denotes a change between revisions (and not a sequence of changes). In\n"
13328
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13329
"consider it\n"
13330
"to be open-ended, that is, they include one end but not the other. For "
13331
"example:\n"
13332
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13333
"3649,\n"
13334
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13335
"and\n"
13336
"3649, but not 3647."
13337
msgstr ""
13338
13339
#: en/help_topics/revisionspec.txt:28
13340
msgid "The keywords used as revision selection methods are the following:"
13341
msgstr ""
13342
13343
#: en/help_topics/revisionspec.txt:30
13344
msgid ""
13345
":revid:\n"
13346
"\tSelects a revision using the revision id.\n"
13347
":submit:\n"
13348
"\tSelects a common ancestor with the submit branch.\n"
13349
":ancestor:\n"
13350
"\tSelects a common ancestor with a second branch.\n"
13351
":date:\n"
13352
"\tSelects a revision on the basis of a datestamp.\n"
13353
":branch:\n"
13354
"\tSelects the last revision of a specified branch.\n"
13355
":tag:\n"
13356
"\tSelects a revision identified by a tag name.\n"
13357
":revno:\n"
13358
"\tSelects a revision using a number.\n"
13359
":before:\n"
13360
"\tSelects the parent of the revision specified.\n"
13361
":annotate:\n"
13362
"\tSelect the revision that last modified the specified line.\n"
13363
":mainline:\n"
13364
"\tSelect mainline revision that merged the specified revision.\n"
13365
":last:\n"
13366
"\tSelects the nth revision from the end."
13367
msgstr ""
13368
13369
#: en/help_topics/revisionspec.txt:53
13370
msgid "In addition, plugins can provide other keywords."
13371
msgstr ""
13372
13373
#: en/help_topics/revisionspec.txt:55
13374
msgid "A detailed description of each keyword is given below."
13375
msgstr ""
13376
13377
#: en/help_topics/revisionspec.txt:57
13378
msgid ":revid:"
13379
msgstr ""
13380
13381
#: en/help_topics/revisionspec.txt:59
13382
msgid ""
13383
" Supply a specific revision id, that can be used to specify any\n"
13384
" revision id in the ancestry of the branch.\n"
13385
" Including merges, and pending merges.\n"
13386
" Examples::"
13387
msgstr ""
13388
13389
#: en/help_topics/revisionspec.txt:64
13390
msgid ""
13391
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13392
msgstr ""
13393
13394
#: en/help_topics/revisionspec.txt:66
13395
msgid ":submit:"
13396
msgstr ""
13397
13398
#: en/help_topics/revisionspec.txt:68
13399
msgid ""
13400
" Diffing against this shows all the changes that were made in this "
13401
"branch,\n"
13402
" and is a good predictor of what merge will do. The submit branch is\n"
13403
" used by the bundle and merge directive commands. If no submit branch\n"
13404
" is specified, the parent branch is used instead."
13405
msgstr ""
13406
13407
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13408
msgid ""
13409
" The common ancestor is the last revision that existed in both\n"
13410
" branches. Usually this is the branch point, but it could also be\n"
13411
" a revision that was merged."
13412
msgstr ""
13413
13414
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13415
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13416
#: en/help_topics/revisionspec.txt:153
13417
msgid " Examples::"
13418
msgstr ""
13419
13420
#: en/help_topics/revisionspec.txt:79
13421
msgid " $ bzr diff -r submit:"
13422
msgstr ""
13423
13424
#: en/help_topics/revisionspec.txt:81
13425
msgid ":ancestor:"
13426
msgstr ""
13427
13428
#: en/help_topics/revisionspec.txt:83
13429
msgid " Supply the path to a branch to select the common ancestor."
13430
msgstr ""
13431
13432
#: en/help_topics/revisionspec.txt:89
13433
msgid ""
13434
" This is frequently used with 'diff' to return all of the changes\n"
13435
" that your branch introduces, while excluding the changes that you\n"
13436
" have not merged from the remote branch."
13437
msgstr ""
13438
13439
#: en/help_topics/revisionspec.txt:95
13440
msgid ""
13441
" ancestor:/path/to/branch\n"
13442
" $ bzr diff -r ancestor:../../mainline/branch"
13443
msgstr ""
13444
13445
#: en/help_topics/revisionspec.txt:98
13446
msgid ":date:"
13447
msgstr ""
13448
13449
#: en/help_topics/revisionspec.txt:100
13450
msgid ""
13451
" Supply a datestamp to select the first revision that matches the date.\n"
13452
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13453
" Matches the first entry after a given date (either at midnight or\n"
13454
" at a specified time)."
13455
msgstr ""
13456
13457
#: en/help_topics/revisionspec.txt:105
13458
msgid " One way to display all the changes since yesterday would be::"
13459
msgstr ""
13460
13461
#: en/help_topics/revisionspec.txt:107
13462
msgid " bzr log -r date:yesterday.."
13463
msgstr ""
13464
13465
#: en/help_topics/revisionspec.txt:111
13466
msgid ""
13467
" date:yesterday -> select the first revision since "
13468
"yesterday\n"
13469
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13470
" August 14th, 2006 at 5:10pm."
13471
msgstr ""
13472
13473
#: en/help_topics/revisionspec.txt:115
13474
msgid ":branch:"
13475
msgstr ""
13476
13477
#: en/help_topics/revisionspec.txt:117
13478
msgid " Supply the path to a branch to select its last revision."
13479
msgstr ""
13480
13481
#: en/help_topics/revisionspec.txt:121
13482
msgid " branch:/path/to/branch"
13483
msgstr ""
13484
13485
#: en/help_topics/revisionspec.txt:123
13486
msgid ":tag:"
13487
msgstr ""
13488
13489
#: en/help_topics/revisionspec.txt:125
13490
msgid " Tags are stored in the branch and created by the 'tag' command."
13491
msgstr ""
13492
13493
#: en/help_topics/revisionspec.txt:127
13494
msgid ":revno:"
13495
msgstr ""
13496
13497
#: en/help_topics/revisionspec.txt:129
13498
msgid ""
13499
" Use an integer to specify a revision in the history of the branch.\n"
13500
" Optionally a branch can be specified. A negative number will count\n"
13501
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13502
" one). If the negative number is larger than the branch's history, the\n"
13503
" first revision is returned.\n"
13504
" Examples::"
13505
msgstr ""
13506
13507
#: en/help_topics/revisionspec.txt:136
13508
msgid ""
13509
" revno:1 -> return the first revision of this branch\n"
13510
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13511
" the branch '/path/to/branch'\n"
13512
" revno:-1 -> The last revision in a branch.\n"
13513
" -2:http://other/branch -> The second to last revision in the\n"
13514
" remote branch.\n"
13515
" -1000000 -> Most likely the first revision, unless\n"
13516
" your history is very long."
13517
msgstr ""
13518
13519
#: en/help_topics/revisionspec.txt:145
13520
msgid ":before:"
13521
msgstr ""
13522
13523
#: en/help_topics/revisionspec.txt:147
13524
msgid ""
13525
" Supply any revision spec to return the parent of that revision. This "
13526
"is\n"
13527
" mostly useful when inspecting revisions that are not in the revision "
13528
"history\n"
13529
" of a branch."
13530
msgstr ""
13531
13532
#: en/help_topics/revisionspec.txt:151
13533
msgid ""
13534
" It is an error to request the parent of the null revision (before:0)."
13535
msgstr ""
13536
13537
#: en/help_topics/revisionspec.txt:155
13538
msgid ""
13539
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13540
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13541
" aaaa@bbbb-1234567890\n"
13542
" bzr diff -r before:1913..1913\n"
13543
" -> Find the changes between revision 1913 and its parent "
13544
"(1912).\n"
13545
" (What changes did revision 1913 introduce).\n"
13546
" This is equivalent to: bzr diff -c 1913"
13547
msgstr ""
13548
13549
#: en/help_topics/revisionspec.txt:163
13550
msgid ":annotate:"
13551
msgstr ""
13552
13553
#: en/help_topics/revisionspec.txt:165
13554
msgid ""
13555
" Select the revision that last modified the specified line. Line is\n"
13556
" specified as path:number. Path is a relative path to the file. "
13557
"Numbers\n"
13558
" start at 1, and are relative to the current version, not the last-\n"
13559
" committed version of the file."
13560
msgstr ""
13561
13562
#: en/help_topics/revisionspec.txt:170
13563
msgid ":mainline:"
13564
msgstr ""
13565
13566
#: en/help_topics/revisionspec.txt:172
13567
msgid ""
13568
" Select the revision that merged the specified revision into mainline."
13569
msgstr ""
13570
13571
#: en/help_topics/revisionspec.txt:174
13572
msgid ":last:"
13573
msgstr ""
13574
13575
#: en/help_topics/revisionspec.txt:176
13576
msgid ""
13577
" Supply a positive number to get the nth revision from the end.\n"
13578
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13579
" Examples::"
13580
msgstr ""
13581
13582
#: en/help_topics/revisionspec.txt:180
13583
msgid ""
13584
" last:1 -> return the last revision\n"
13585
" last:3 -> return the revision 2 before the end.\n"
13586
msgstr ""
13587
13588
#: en/help_topics/rules.txt:1
13589
msgid ""
13590
"Rules\n"
13591
"====="
13592
msgstr ""
13593
13594
#: en/help_topics/rules.txt:7
13595
msgid ""
13596
"Rules are defined in ini file format where the sections are file glob\n"
13597
"patterns and the contents of each section are the preferences for files\n"
13598
"matching that pattern(s). For example::"
13599
msgstr ""
13600
13601
#: en/help_topics/rules.txt:11
13602
msgid ""
13603
" [name *.bat]\n"
13604
" eol = native"
13605
msgstr ""
13606
13607
#: en/help_topics/rules.txt:14
13608
msgid ""
13609
" [name *.html *.xml]\n"
13610
" keywords = xml_escape"
13611
msgstr ""
13612
13613
#: en/help_topics/rules.txt:17
13614
msgid ""
13615
"Preferences like these are useful for commands and plugins wishing to\n"
13616
"provide custom behaviour for selected files. For more information on \n"
13617
"end of line conversion see :doc:`eol-help`.\n"
13618
"Keyword support is provided by the `keywords plugin\n"
13619
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13620
msgstr ""
13621
13622
#: en/help_topics/rules.txt:23
13623
msgid ""
13624
"Files\n"
13625
"-----"
13626
msgstr ""
13627
13628
#: en/help_topics/rules.txt:26
13629
msgid ""
13630
"Default rules for all branches are defined in the optional file\n"
13631
"``BZR_HOME/rules``. "
13632
msgstr ""
13633
13634
#: en/help_topics/rules.txt:29
13635
msgid ""
13636
"Rule Patterns\n"
13637
"-------------"
13638
msgstr ""
13639
13640
#: en/help_topics/rules.txt:32
13641
msgid ""
13642
"Patterns are ordered and searching stops as soon as one matches.\n"
13643
"As a consequence, more explicit patterns should be placed towards\n"
13644
"the top of the file. Rule patterns use exactly the same conventions\n"
13645
"as ignore patterns. See :doc:`patterns-help` for details."
13646
msgstr ""
13647
13648
#: en/help_topics/rules.txt:37
13649
msgid ".. note::"
13650
msgstr ""
13651
13652
#: en/help_topics/rules.txt:39
13653
msgid ""
13654
" Patterns containing square brackets or spaces should be\n"
13655
" surrounded in quotes to ensure they are correctly parsed.\n"
13656
msgstr ""
13657
13658
#: en/help_topics/topics.txt:1
13659
msgid ""
13660
"authentication Information on configuring authentication\n"
13661
"basic Basic commands\n"
13662
"branches Information on what a branch is\n"
13663
"bugs Bug tracker settings\n"
13664
"checkouts Information on what a checkout is\n"
13665
"commands Basic help for all commands\n"
13666
"configuration Details on the configuration settings available\n"
13667
"conflict-types Types of conflicts and what to do about them\n"
13668
"content-filters Conversion of content into/from working trees\n"
13669
"criss-cross Information on criss-cross merging\n"
13670
"current-formats Current storage formats\n"
13671
"debug-flags Options to show or record debug information\n"
13672
"diverged-branches How to fix diverged branches\n"
13673
"env-variables Environment variable names and values\n"
13674
"eol Information on end-of-line handling\n"
13675
"files Information on configuration and log files\n"
13676
"formats Information on choosing a storage format\n"
13677
"global-options Options that control how Bazaar runs\n"
13678
"hidden-commands All hidden commands\n"
13679
"hooks Points at which custom processing can be added\n"
13680
"launchpad Using Bazaar with Launchpad.net\n"
13681
"location-alias Aliases for remembered locations\n"
13682
"log-formats Details on the logging formats available\n"
13683
"other-formats Experimental and deprecated storage formats\n"
13684
"patterns Information on the pattern syntax\n"
13685
"repositories Basic information on shared repositories.\n"
13686
"revisionspec Explain how to use --revision\n"
13687
"rules Information on defining rule-based preferences\n"
13688
"standalone-trees Information on what a standalone tree is\n"
13689
"standard-options Options that can be used with any command\n"
13690
"status-flags Help on status flags\n"
13691
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13692
"topics Topics list\n"
13693
"url-special-chars Special character handling in URLs\n"
13694
"urlspec Supported transport protocols\n"
13695
"working-trees Information on working trees\n"
13696
msgstr ""
13697
13698
#: en/help_topics/url-special-chars.txt:1
13699
msgid ""
13700
"Special character handling in URLs\n"
13701
"=================================="
13702
msgstr ""
13703
13704
#: en/help_topics/url-special-chars.txt:4
13705
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13706
msgstr ""
13707
13708
#: en/help_topics/url-special-chars.txt:6
13709
msgid " * Fully qualified URLs"
13710
msgstr ""
13711
13712
#: en/help_topics/url-special-chars.txt:8
13713
msgid " * File system paths, relative or absolute"
13714
msgstr ""
13715
13716
#: en/help_topics/url-special-chars.txt:10
13717
msgid ""
13718
"Internally bzr treats all locations as URLs. For any file system paths\n"
13719
"that are specified it will automatically determine the appropriate URL\n"
13720
"representation, and escape special characters where necessary."
13721
msgstr ""
13722
13723
#: en/help_topics/url-special-chars.txt:14
13724
msgid ""
13725
"There are a few characters which have special meaning in URLs and need "
13726
"careful\n"
13727
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13728
"value in URLs. Any non-ASCII characters in a file path will automatically "
13729
"be\n"
13730
"urlencoded when the path is converted to a URL."
13731
msgstr ""
13732
13733
#: en/help_topics/url-special-chars.txt:19
13734
msgid ""
13735
"URLs represent non-ASCII characters in an encoding defined by the server, "
13736
"but\n"
13737
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13738
"be\n"
13739
"generous in what it accepts as a URL and to print them in a way that\n"
13740
"will be readable."
13741
msgstr ""
13742
13743
#: en/help_topics/url-special-chars.txt:24
13744
msgid ""
13745
"For example, if you have a directory named '/tmp/%2False' these are all "
13746
"valid\n"
13747
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13748
"slash)::"
13749
msgstr ""
13750
13751
#: en/help_topics/url-special-chars.txt:27
13752
msgid ""
13753
" cd /tmp\n"
13754
" bzr log /tmp/%2False\n"
13755
" bzr log %2False\n"
13756
" bzr log file:///tmp/%252False\n"
13757
" bzr log file://localhost/tmp/%252False\n"
13758
" bzr log file:%252False"
13759
msgstr ""
13760
13761
#: en/help_topics/url-special-chars.txt:34
13762
msgid "These are valid but do not refer to the same file::"
13763
msgstr ""
13764
13765
#: en/help_topics/url-special-chars.txt:36
13766
msgid ""
13767
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13768
" bzr log %252False (refers to a file called /tmp/%252False)"
13769
msgstr ""
13770
13771
#: en/help_topics/url-special-chars.txt:39
13772
msgid ""
13773
"Comma also has special meaning in URLs, because it denotes `segment "
13774
"parameters`_"
13775
msgstr ""
13776
13777
#: en/help_topics/url-special-chars.txt:41
13778
msgid ""
13779
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13780
msgstr ""
13781
13782
#: en/help_topics/url-special-chars.txt:43
13783
msgid ""
13784
"Comma is also special in any file system paths that are specified. To use a "
13785
"literal\n"
13786
"comma in a file system path, specify a URL and URL encode the comma::"
13787
msgstr ""
13788
13789
#: en/help_topics/url-special-chars.txt:46
13790
msgid ""
13791
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13792
"\"branch\" set to \"bla\"\n"
13793
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13794
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13795
"\"branch\" set to \"bla\"\n"
13796
msgstr ""
13797
13798
#: en/help_topics/urlspec.txt:1
13799
msgid "URL Identifiers"
13800
msgstr ""
13801
13802
#: en/help_topics/urlspec.txt:3
13803
msgid "Supported URL prefixes::"
13804
msgstr ""
13805
13806
#: en/help_topics/urlspec.txt:5
13807
msgid ""
13808
" aftp:// Access using active FTP.\n"
13809
" bzr:// Fast access using the Bazaar smart server.\n"
13810
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13811
" file:// Access using the standard filesystem (default)\n"
13812
" ftp:// Access using passive FTP.\n"
13813
" http:// Read-only access of branches exported on the web.\n"
13814
" https:// Read-only access of branches exported on the web using "
13815
"SSL.\n"
13816
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13817
msgstr ""
13818
13819
#: en/help_topics/urlspec.txt:14
13820
msgid "Supported modifiers::"
13821
msgstr ""
13822
13823
#: en/help_topics/urlspec.txt:16
13824
msgid " gio+ Access using any GIO supported protocols."
13825
msgstr ""
13826
13827
#: en/help_topics/urlspec.txt:18
13828
msgid "Bazaar supports all of the standard parts within the URL::"
13829
msgstr ""
13830
13831
#: en/help_topics/urlspec.txt:20
13832
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13833
msgstr ""
13834
13835
#: en/help_topics/urlspec.txt:22
13836
msgid "allowing URLs such as::"
13837
msgstr ""
13838
13839
#: en/help_topics/urlspec.txt:24
13840
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13841
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13842
13843
#: en/help_topics/urlspec.txt:26
13844
msgid ""
13845
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13846
"with '~' as meaning that the rest of the path should be interpreted\n"
13847
"relative to the remote user's home directory. For example if the user\n"
13848
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13849
"shell.example.com, then::"
13850
msgstr ""
13851
13852
#: en/help_topics/urlspec.txt:32
13853
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13854
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13855
13856
#: en/help_topics/urlspec.txt:34
13857
msgid "would refer to ``/home/remote/myproject/trunk``."
13858
msgstr ""
13859
13860
#: en/help_topics/urlspec.txt:36
13861
msgid ""
13862
"Many commands that accept URLs also accept location aliases too.\n"
13863
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13864
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1