« back to all changes in this revision
Viewing changes to po/ru.po
- browse files at revision 4634.39.44
- compare with another revision
- download diff
- download tarball
- view history from revision 4634.39.44
- Committer: Ian Clatworthy
- Date: 2009-09-09 15:30:59 UTC
- mto: (4634.37.2 prepare-2.0)
- mto: This revision was merged to the branch mainline in revision 4689.
- Revision ID: ian.clatworthy@canonical.com-20090909153059-sb038agvd38ci2q8
more link fixes in the User Guide
- files added:
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files removed:
- .testr.conf
- apport
- bzrlib/branchfmt
- bzrlib/help_topics/es
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/grep
- bzrlib/plugins/news_merge
- bzrlib/plugins/news_merge/tests
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_bzrdir
- bzrlib/tests/per_controldir_colo
- bzrlib/tests/per_foreign_vcs
- bzrlib/tests/per_repository_vf
- bzrlib/tests/per_uifactory
- contrib/debian
- doc/en/whats-new
- doc/ja
- doc/ja/_static
- doc/ja/_templates
- doc/ja/mini-tutorial
- doc/ja/tutorials
- doc/ja/upgrade-guide
- doc/ja/user-guide
- doc/ja/user-guide/images
- doc/ja/user-reference
- po
- files renamed:
- doc/en/release-notes/bzr-2.3.txt => NEWS
- bzrlib/doc_generate/conf.py => bzrlib/doc_generate/sphinx_conf.py
- bzrlib/help_topics/en/conflict-types.txt => bzrlib/help_topics/en/conflicts.txt
- bzrlib/plugins/weave_fmt/repository.py => bzrlib/repofmt/weaverepo.py
- bzrlib/commit_signature_commands.py => bzrlib/sign_my_commits.py
- bzrlib/tests/per_controldir/ => bzrlib/tests/per_bzrdir/
- bzrlib/tests/per_controldir/test_controldir.py => bzrlib/tests/per_bzrdir/test_bzrdir.py
- bzrlib/tests/per_repository_vf/helpers.py => bzrlib/tests/per_repository/helpers.py
- bzrlib/tests/per_repository_vf/test__generate_text_key_index.py => bzrlib/tests/per_repository/test__generate_text_key_index.py
- bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py => bzrlib/tests/per_repository/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository_vf/test_check_reconcile.py => bzrlib/tests/per_repository/test_check_reconcile.py
- bzrlib/tests/per_repository_vf/test_find_text_key_references.py => bzrlib/tests/per_repository/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_locking.py => bzrlib/tests/per_repository/test_is_write_locked.py
- bzrlib/tests/per_repository_vf/test_merge_directive.py => bzrlib/tests/per_repository/test_merge_directive.py
- bzrlib/tests/test__bencode.py => bzrlib/tests/test_bencode.py
- bzrlib/plugins/weave_fmt/xml4.py => bzrlib/xml4.py
- bzrlib/help_topics/es/conflict-types.txt => doc/es/user-guide/resolving_conflicts.txt
- files modified:
- .bzrignore
added
removed
po/ru.po
1
# Russian translation for bzr
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2013-04-08 07:57+0000\n"
12
"Last-Translator: Артём Воротников <Unknown>\n"
13
"Language-Team: Russian <ru@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19
"X-Launchpad-Export-Date: 2013-04-09 04:32+0000\n"
20
"X-Generator: Launchpad (build 16550)\n"
21
22
#: bzrlib/add.py:93
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
24
msgstr "пропуск {0} (более, чем {1} из {2} байт)"
25
26
#: bzrlib/branch.py:854
27
msgid "Unstacking"
28
msgstr "Извлечение из стека"
29
30
#: bzrlib/branch.py:2955
31
#, python-format
32
msgid "Pushed up to revision %d."
33
msgstr "Отправлено до ревизии %d включительно."
34
35
#: bzrlib/branch.py:2957
36
#, python-format
37
msgid "%d tag updated."
38
msgid_plural "%d tags updated."
39
msgstr[0] "%d тег обновлён."
40
msgstr[1] "%d тега обновлено."
41
msgstr[2] "%d тегов обновлено."
42
43
#: bzrlib/branch.py:2960
44
msgid "No new revisions or tags to push."
45
msgstr "Нет новых ревизий или тегов для отправки."
46
47
#: bzrlib/branch.py:2962
48
msgid "No new revisions to push."
49
msgstr "Нет новых ревизий для отправки."
50
51
#: bzrlib/branch.py:2982
52
msgid "checked branch {0} format {1}"
53
msgstr "проверена ветвь {0} формата {1}"
54
55
#: bzrlib/branch.py:2985
56
#, python-format
57
msgid "found error:%s"
58
msgstr "обнаружена ошибка:%s"
59
60
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
61
#, python-format
62
msgid "Ignoring files outside view. View is %s"
63
msgstr "Игнорируются файлы вне окна просмотра. Окно просмотра: %s"
64
65
#: bzrlib/builtins.py:260
66
#, python-format
67
msgid "bzr %s --revision takes exactly one revision identifier"
68
msgstr "bzr %s --revision принимает ровно один идентификатор ревизии"
69
70
#: bzrlib/builtins.py:315
71
msgid "Display status summary."
72
msgstr "Отобразить краткое описание состояния."
73
74
#: bzrlib/builtins.py:317
75
msgid ""
76
"This reports on versioned and unknown files, reporting them\n"
77
"grouped by state. Possible states are:"
78
msgstr ""
79
"Эта команда сообщает о файлах с версиями и неизвестных файлах,\n"
80
"группируя их по состоянию. Возможные состояния:"
81
82
#: bzrlib/builtins.py:320
83
msgid ""
84
"added\n"
85
" Versioned in the working copy but not in the previous revision."
86
msgstr ""
87
"добавлены\n"
88
" Имеют версию в рабочей копии, но отсутствуют в предыдущей\n"
89
" ревизии."
90
91
#: bzrlib/builtins.py:323
92
msgid ""
93
"removed\n"
94
" Versioned in the previous revision but removed or deleted\n"
95
" in the working copy."
96
msgstr ""
97
"исключены\n"
98
" Имеют версию в предыдущей ревизии но исключены или удалены\n"
99
" в рабочей копии."
100
101
#: bzrlib/builtins.py:327
102
msgid ""
103
"renamed\n"
104
" Path of this file changed from the previous revision;\n"
105
" the text may also have changed. This includes files whose\n"
106
" parent directory was renamed."
107
msgstr ""
108
"переименованы\n"
109
" Путь к этим файлам изменился с предыдущей ревизии;\n"
110
" текст также мог измениться. Это состояние включает\n"
111
" файлы, родительская директория которых была переименована."
112
113
#: bzrlib/builtins.py:332
114
msgid ""
115
"modified\n"
116
" Text has changed since the previous revision."
117
msgstr ""
118
"изменены\n"
119
" Текст изменился с предыдущей ревизии."
120
121
#: bzrlib/builtins.py:335
122
msgid ""
123
"kind changed\n"
124
" File kind has been changed (e.g. from file to directory)."
125
msgstr ""
126
"изменили вид\n"
127
" Вид файла изменился (например, файл стал директорией)."
128
129
#: bzrlib/builtins.py:338
130
msgid ""
131
"unknown\n"
132
" Not versioned and not matching an ignore pattern."
133
msgstr ""
134
"неизвестны\n"
135
" Не имеют версии и не подходят под шаблон игнориируемых файлов."
136
137
#: bzrlib/builtins.py:341
138
msgid ""
139
"Additionally for directories, symlinks and files with a changed\n"
140
"executable bit, Bazaar indicates their type using a trailing\n"
141
"character: '/', '@' or '*' respectively. These decorations can be\n"
142
"disabled using the '--no-classify' option."
143
msgstr ""
144
"Кроме этого, для директорий, символьных ссылок и файлов, бит\n"
145
"выполнения которых изменился, Bazaar показывает их тип, добавляя\n"
146
"в конец имени символы: '/', '@' или '*' соответственно. Эти\n"
147
"декорации можно убрать, используя опцию '--no-classify'."
148
149
#: bzrlib/builtins.py:346
150
msgid ""
151
"To see ignored files use 'bzr ignored'. For details on the\n"
152
"changes to file texts, use 'bzr diff'."
153
msgstr ""
154
"Чтобы просмотреть игнорируемые файлы, используйте 'bzr ignored'.\n"
155
"Изменения текста файлов можно увидеть, используя 'bzr diff'."
156
157
#: bzrlib/builtins.py:349
158
msgid ""
159
"Note that --short or -S gives status flags for each item, similar\n"
160
"to Subversion's status command. To get output similar to svn -q,\n"
161
"use bzr status -SV."
162
msgstr ""
163
"Заметьте, что опция --short или -S даёт вывод статусных флагов,\n"
164
"подобный команде Subversion status. Чтобы получить вывод, похожий\n"
165
"на svn -q, используйте bzr status -SV."
166
167
#: bzrlib/builtins.py:353
168
msgid ""
169
"If no arguments are specified, the status of the entire working\n"
170
"directory is shown. Otherwise, only the status of the specified\n"
171
"files or directories is reported. If a directory is given, status\n"
172
"is reported for everything inside that directory."
173
msgstr ""
174
"Если не указано аргументов, выводится состояние всей рабочей директории.\n"
175
"Иначе, выводится только статус указанных файлов или директорий.\n"
176
"Если указана директория, то выводится состояние всех файлов внутри\n"
177
"этой директории."
178
179
#: bzrlib/builtins.py:358
180
msgid ""
181
"Before merges are committed, the pending merge tip revisions are\n"
182
"shown. To see all pending merge revisions, use the -v option.\n"
183
"To skip the display of pending merge information altogether, use\n"
184
"the no-pending option or specify a file/directory."
185
msgstr ""
186
"Перед закреплением слияний, отображаются необработанные ревизии.\n"
187
"Чтобы увидеть все ревизии слияния, используйте опцию -v.\n"
188
"Чтобы полностью пропустить отображение информации о слиянии,\n"
189
"используйте опцию no-pending либо укажите файл или директорию."
190
191
#: bzrlib/builtins.py:363
192
msgid ""
193
"To compare the working directory to a specific revision, pass a\n"
194
"single revision to the revision argument."
195
msgstr ""
196
"Чтобы сравнить рабочую копию с определённой ревизией, укажите\n"
197
"ревизию в соответствующем аргументе."
198
199
#: bzrlib/builtins.py:366
200
msgid ""
201
"To see which files have changed in a specific revision, or between\n"
202
"two revisions, pass a revision range to the revision argument.\n"
203
"This will produce the same results as calling 'bzr diff --summarize'."
204
msgstr ""
205
"Чтобы увидеть, какие файлы изменились в определённой ревизии, или\n"
206
"между двумя ревизиями, укажите в аргументе ревизии интервал.\n"
207
"Это даёт такой же результат, как вызов 'bzr diff --summarize'."
208
209
#: bzrlib/builtins.py:375
210
msgid "Use short status indicators."
211
msgstr "Использовать короткие статусные пометки."
212
213
#: bzrlib/builtins.py:377
214
msgid "Only show versioned files."
215
msgstr "Показывать только файлы, имеющие версию."
216
217
#: bzrlib/builtins.py:379
218
msgid "Don't show pending merges."
219
msgstr "Не показывать необработанные слияния."
220
221
#: bzrlib/builtins.py:382
222
msgid "Do not mark object type using indicator."
223
msgstr "Не помечать типы объектов суффиксами."
224
225
#: bzrlib/builtins.py:397
226
msgid "bzr status --revision takes exactly one or two revision specifiers"
227
msgstr ""
228
"bzr status --revision принимает ровно один или два идентификатора ревизии"
229
230
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
231
msgid "You can only supply one of revision_id or --revision"
232
msgstr "Вы можете указать только одно из revision_id или --revision"
233
234
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
235
msgid "You must supply either --revision or a revision_id"
236
msgstr "Вы должны предоставить --revision или revision_id"
237
238
#: bzrlib/builtins.py:451
239
#, python-format
240
msgid "Repository %r does not support access to raw revision texts"
241
msgstr "Репозиторий %r не поддерживает прямой доступ к текстам ревизий"
242
243
#: bzrlib/builtins.py:462
244
msgid "The repository {0} contains no revision {1}."
245
msgstr "Репозиторий {0} не содержит ревизии {1}."
246
247
#: bzrlib/builtins.py:469
248
msgid "You cannot specify a NULL revision."
249
msgstr "Вы не можете указать ревизию NULL."
250
251
#: bzrlib/builtins.py:561
252
msgid "Remove the working tree from a given branch/checkout."
253
msgstr "Удалить рабочее дерево из данной ветви или рабочей копии."
254
255
#: bzrlib/builtins.py:563
256
msgid ""
257
"Since a lightweight checkout is little more than a working tree\n"
258
"this will refuse to run against one."
259
msgstr ""
260
"Поскольку легковесная рабочая копия, это нечто большее, чем рабочее\n"
261
"дерево, эту команду нельзя выполнить внутри неё."
262
263
#: bzrlib/builtins.py:566
264
msgid "To re-create the working tree, use \"bzr checkout\"."
265
msgstr "Чтобы воссоздать рабочее дерево, используйте «bzr checkout»."
266
267
#: bzrlib/builtins.py:572
268
msgid ""
269
"Remove the working tree even if it has uncommitted or shelved changes."
270
msgstr ""
271
"Удалить рабочее дерево даже, если оно содержит незакреплённые или отложенные "
272
"изменения."
273
274
#: bzrlib/builtins.py:586
275
msgid "No working tree to remove"
276
msgstr "Нет рабочего дерева для удаления"
277
278
#: bzrlib/builtins.py:588
279
msgid "You cannot remove the working tree of a remote path"
280
msgstr "Вы не можете удалить внешнее рабочее дерево"
281
282
#: bzrlib/builtins.py:597
283
msgid "You cannot remove the working tree from a lightweight checkout"
284
msgstr "Вы не можете удалить рабочее дерево из легковесной рабочей копии"
285
286
#: bzrlib/builtins.py:637
287
msgid ""
288
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
289
"instead. Use \"--force\" if you are sure you want to reset the working tree."
290
msgstr ""
291
"Дерево не повреждено. Возможно, вы хотели выполнить «bzr revert». "
292
"Используйте «--force», если вы уверены, что хотите использовать reset."
293
294
#: bzrlib/builtins.py:648
295
msgid ""
296
", the header appears corrupt, try passing -r -1 to set the state to the last "
297
"commit"
298
msgstr ""
299
", заголовок повреждён, попробуйте использовать аргумент -r -1, чтобы "
300
"сбросить состояние до предыдущего закрепления"
301
302
#: bzrlib/builtins.py:652
303
msgid "failed to reset the tree state{0}"
304
msgstr "не удалось сбросить состояние дерева {0}"
305
306
#: bzrlib/builtins.py:656
307
msgid "Show current revision number."
308
msgstr "Показать номер текущей ревизии."
309
310
#: bzrlib/builtins.py:658
311
msgid "This is equal to the number of revisions on this branch."
312
msgstr "Это эквивалентно числу ревизий в этой ветви."
313
314
#: bzrlib/builtins.py:671
315
msgid "--tree and --revision can not be used together"
316
msgstr "--tree и --revision не могут использоваться вместе"
317
318
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
319
msgid "Tags can only be placed on a single revision, not on a range"
320
msgstr "Тегом можно пометить только отдельную ревизию, не интервал"
321
322
#: bzrlib/builtins.py:712
323
msgid "Show revno of working tree."
324
msgstr "Показать номер ревизии рабочего дерева."
325
326
#: bzrlib/builtins.py:760
327
msgid "Add specified files or directories."
328
msgstr "Добавить указанные файлы или директории."
329
330
#: bzrlib/builtins.py:762
331
msgid ""
332
"In non-recursive mode, all the named items are added, regardless\n"
333
"of whether they were previously ignored. A warning is given if\n"
334
"any of the named files are already versioned."
335
msgstr ""
336
"В нерекурсивном режиме, все указанные элементы добавляются, вне\n"
337
"зависимости от того, игнорировались ли они до этого. Выводится\n"
338
"предупреждение, если какие-либо из указанных элементов уже были\n"
339
"под контролем Bazaar."
340
341
#: bzrlib/builtins.py:766
342
msgid ""
343
"In recursive mode (the default), files are treated the same way\n"
344
"but the behaviour for directories is different. Directories that\n"
345
"are already versioned do not give a warning. All directories,\n"
346
"whether already versioned or not, are searched for files or\n"
347
"subdirectories that are neither versioned or ignored, and these\n"
348
"are added. This search proceeds recursively into versioned\n"
349
"directories. If no names are given '.' is assumed."
350
msgstr ""
351
"В рекурсивном режиме (по умолчанию), файлы обрабатываются точно\n"
352
"также, но для директорий применяется другой алгоритм. Для\n"
353
"директорий, которые уже имели версию, предупреждение не выводится.\n"
354
"Во всех директориях, независимо от того, находятся они под контролем\n"
355
"системы контроля версий или нет, производится поиск файлов, которые\n"
356
"не имеют версии и не игнорируются, и эти файлы добавляются.\n"
357
"Этот поиск входит рекурсивно в директории, имеющие версию.\n"
358
"Если не указано ни одного имени, предполагается '.'."
359
360
#: bzrlib/builtins.py:774
361
msgid ""
362
"A warning will be printed when nested trees are encountered,\n"
363
"unless they are explicitly ignored."
364
msgstr ""
365
"Предупреждение будет напечатано для каждого встреченного вложенного\n"
366
"дерева, если только оно не игнорируется явно."
367
368
#: bzrlib/builtins.py:777
369
msgid ""
370
"Therefore simply saying 'bzr add' will version all files that\n"
371
"are currently unknown."
372
msgstr ""
373
"Следовательно, просто вызов 'bzr add' добавит к системе контроля\n"
374
"версий все файлы, которые ей неизвестны."
375
376
#: bzrlib/builtins.py:780
377
msgid ""
378
"Adding a file whose parent directory is not versioned will\n"
379
"implicitly add the parent, and so on up to the root. This means\n"
380
"you should never need to explicitly add a directory, they'll just\n"
381
"get added when you add a file in the directory."
382
msgstr ""
383
"Добавление файла, родительская директория которого не имеет версии\n"
384
"неявно добавляет родителя и так далее до корня. Это означает, что\n"
385
"вам никогда не нужно явно добавлять директорию, они добавляются\n"
386
"автоматически, когда вы добавляете файлы."
387
388
#: bzrlib/builtins.py:785
389
msgid ""
390
"--dry-run will show which files would be added, but not actually\n"
391
"add them."
392
msgstr ""
393
"--dry-run покажет, какие файлы будут добавлены, но не будет их\n"
394
"добавлять."
395
396
#: bzrlib/builtins.py:788
397
msgid ""
398
"--file-ids-from will try to use the file ids from the supplied path.\n"
399
"It looks up ids trying to find a matching parent directory with the\n"
400
"same filename, and then by pure path. This option is rarely needed\n"
401
"but can be useful when adding the same logical file into two\n"
402
"branches that will be merged later (without showing the two different\n"
403
"adds as a conflict). It is also useful when merging another project\n"
404
"into a subdirectory of this one."
405
msgstr ""
406
"--file-ids-from попытается использовать идентификаторы файлов из\n"
407
"предоставленного пути. С этой опцией просматриваются идентификаторы\n"
408
"в попытке найти соответствующую родительскую директорию с тем же\n"
409
"именем, а затем полный путь. Эта опция редко необходима, но может\n"
410
"быть полезна при добавлении одного и того же логического файла к\n"
411
"двум различным ветвям, которые затем будут совмещены (при этом\n"
412
"добавления в обе ветви не будут рассматриваться как конфликты).\n"
413
"Это также полезно при помещении другого проекта, как поддиректории\n"
414
"данного."
415
416
#: bzrlib/builtins.py:796
417
msgid ""
418
"Any files matching patterns in the ignore list will not be added\n"
419
"unless they are explicitly mentioned."
420
msgstr ""
421
"Любые файлы, удовлетворяющие шаблонам в списке ignore не будут\n"
422
"добавлены, если их не указать явно."
423
424
#: bzrlib/builtins.py:799
425
msgid ""
426
"In recursive mode, files larger than the configuration option \n"
427
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
428
"to file size."
429
msgstr ""
430
"В рекурсивном режиме, файлы больше, чем опция конфигурации\n"
431
"add.maximum_file_size, будут пропущены. Явно названные элементы\n"
432
"никогда не будут пропущены по этому критерию."
433
434
#: bzrlib/builtins.py:806
435
msgid "Don't recursively add the contents of directories."
436
msgstr "Не добавлять содержимое директорий рекурсивно."
437
438
#: bzrlib/builtins.py:813
439
msgid "Lookup file ids from this tree."
440
msgstr "Искать идентификаторы в этом дереве."
441
442
#: bzrlib/builtins.py:849
443
msgid "ignored {0} matching \"{1}\"\n"
444
msgstr "пропуск {0} из-за условия «{1}»\n"
445
446
#: bzrlib/builtins.py:854
447
msgid "Create a new versioned directory."
448
msgstr "Создать новую директорию в системе версий."
449
450
#: bzrlib/builtins.py:856
451
msgid "This is equivalent to creating the directory and then adding it."
452
msgstr "Это эквивалентно созданию директории и её добавлению."
453
454
#: bzrlib/builtins.py:863
455
msgid "No error if existing, make parent directories as needed."
456
msgstr ""
457
"Не выводить ошибку, если существует, создавать родительские директории при "
458
"необходимости."
459
460
#: bzrlib/builtins.py:897
461
#, python-format
462
msgid "added %s\n"
463
msgstr "добавлен %s\n"
464
465
#: bzrlib/builtins.py:939
466
#, python-format
467
msgid "invalid kind %r specified"
468
msgstr "указан неизвестный вид %r"
469
470
#: bzrlib/builtins.py:976
471
msgid "Move or rename a file."
472
msgstr "Переместить или переименовать файл."
473
474
#: bzrlib/builtins.py:978
475
msgid " bzr mv SOURCE... DESTINATION"
476
msgstr " bzr mv ИСТОЧНИК... НАЗНАЧЕНИЕ"
477
478
#: bzrlib/builtins.py:980
479
msgid ""
480
"If the last argument is a versioned directory, all the other names\n"
481
"are moved into it. Otherwise, there must be exactly two arguments\n"
482
"and the file is changed to a new name."
483
msgstr ""
484
"Если последний аргумент является директорией под контролем Bazaar,\n"
485
"все остальные имена перемещаются в неё. Иначе, должно быть указано\n"
486
"ровно два аргумента, и файл переименовывается."
487
488
#: bzrlib/builtins.py:984
489
msgid ""
490
"If OLDNAME does not exist on the filesystem but is versioned and\n"
491
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
492
"assumes that the file has been manually moved and only updates\n"
493
"its internal inventory to reflect that change.\n"
494
"The same is valid when moving many SOURCE files to a DESTINATION."
495
msgstr ""
496
"Если СТАРОЕИМЯ не существует в файловой системе, но есть в системе\n"
497
"версий, а НОВОЕИМЯ существует, но отсутствует в системе версий, mv\n"
498
"предполагает, что файл был перемещён вручную и только обновляет\n"
499
"свои внутренние структуры, чтобы отразить это изменение.\n"
500
"Тоже верно и при перемещении многих ИСТОЧНИКов в НАЗНАЧЕНИЕ."
501
502
#: bzrlib/builtins.py:990
503
msgid "Files cannot be moved between branches."
504
msgstr "Файлы нельзя перемещать между ветвями."
505
506
#: bzrlib/builtins.py:997
507
msgid ""
508
"Move only the bzr identifier of the file, because the file has already been "
509
"moved."
510
msgstr ""
511
"Переместить только bzr-идентификатор файла, поскольку сам файл уже был "
512
"перемещён."
513
514
#: bzrlib/builtins.py:999
515
msgid "Automatically guess renames."
516
msgstr "Автоматически предполагать переименования."
517
518
#: bzrlib/builtins.py:1000
519
msgid "Avoid making changes when guessing renames."
520
msgstr "Избегать изменений при угадывании переименований."
521
522
#: bzrlib/builtins.py:1009
523
msgid "--dry-run requires --auto."
524
msgstr "--dry-run требует --auto."
525
526
#: bzrlib/builtins.py:1013
527
msgid "missing file argument"
528
msgstr "отсутствует аргумент файл"
529
530
#: bzrlib/builtins.py:1017
531
msgid "can not move root of branch"
532
msgstr "нельзя переместить корень ветви"
533
534
#: bzrlib/builtins.py:1023
535
msgid "Only one path may be specified to --auto."
536
msgstr "Только один путь может быть указан, как аргумент --auto."
537
538
#: bzrlib/builtins.py:1026
539
msgid "--after cannot be specified with --auto."
540
msgstr "--after не может использоваться вместе с --auto."
541
542
#: bzrlib/builtins.py:1062
543
msgid "to mv multiple files the destination must be a versioned directory"
544
msgstr ""
545
"чтобы переместить несколько файлов, назначение должно быть директорией под "
546
"контролем системы версий"
547
548
#: bzrlib/builtins.py:1114
549
msgid "Turn this branch into a mirror of another branch."
550
msgstr "Преобразовать эту ветвь в зеркало другой ветви."
551
552
#: bzrlib/builtins.py:1116
553
msgid ""
554
"By default, this command only works on branches that have not diverged.\n"
555
"Branches are considered diverged if the destination branch's most recent \n"
556
"commit is one that has not been merged (directly or indirectly) into the \n"
557
"parent."
558
msgstr ""
559
"По умолчанию, эта команда работает только на ветвях, которые не являются\n"
560
"отклонениями. Ветвь считается отклонением, если последнее закрепление в\n"
561
"ветви назначения не было совмещено (явно или неявно) с родителем."
562
563
#: bzrlib/builtins.py:1121
564
msgid ""
565
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
566
"from one into the other. Once one branch has merged, the other should\n"
567
"be able to pull it again."
568
msgstr ""
569
"Если ветвь является отклонением, можно использовать 'bzr merge' для\n"
570
"возвращения изменений. После совмещения ветвей, можно снова принимать\n"
571
"изменения из одной в другую."
572
573
#: bzrlib/builtins.py:1125
574
msgid ""
575
"If you want to replace your local changes and just want your branch to\n"
576
"match the remote one, use pull --overwrite. This will work even if the two\n"
577
"branches have diverged."
578
msgstr ""
579
"Если вы хотите затереть ваши локальные изменения, чтобы ветвь совпадала\n"
580
"с удалённой, используйте pull --overwrite. Это будет работать, даже если\n"
581
"ветвь является отклонением."
582
583
#: bzrlib/builtins.py:1129
584
msgid ""
585
"If there is no default location set, the first pull will set it (use\n"
586
"--no-remember to avoid setting it). After that, you can omit the\n"
587
"location to use the default. To change the default, use --remember. The\n"
588
"value will only be saved if the remote location can be accessed."
589
msgstr ""
590
"Если местоположение по умолчанию не установлено, первый pull установит\n"
591
"его (используйте --no-remember, чтобы избежать этой установки). После\n"
592
"этого, вы можете опускать местоположение, чтобы использовать значение\n"
593
"по умолчанию. Чтобы изменить значение по умолчанию, используйте опцию\n"
594
"--remember. Значение будет сохранено, только если доступ к удалённому\n"
595
"местоположению будет успешен."
596
597
#: bzrlib/builtins.py:1134
598
msgid ""
599
"The --verbose option will display the revisions pulled using the log_format\n"
600
"configuration option. You can use a different format by overriding it with\n"
601
"-Olog_format=<other_format>."
602
msgstr ""
603
"Опция --verbose отобразит ревизии, загруженные с использованием опции\n"
604
"конфигурации log_format. Вы можете использовать другой формат, перегрузив\n"
605
"её опцией -Olog_format=<другой_формат>."
606
607
#: bzrlib/builtins.py:1138
608
msgid ""
609
"Note: The location can be specified either in the form of a branch,\n"
610
"or in the form of a path to a file containing a merge directive generated\n"
611
"with bzr send."
612
msgstr ""
613
"Замечание: Местоположение можно указывать как в форме ветви, так и в\n"
614
"форме пути к файлу, содержащему директиву слияния, созданному bzr send."
615
616
#: bzrlib/builtins.py:1146
617
msgid "Show logs of pulled revisions."
618
msgstr "Показать журналы принятых ревизий."
619
620
#: bzrlib/builtins.py:1148
621
msgid ""
622
"Branch to pull into, rather than the one containing the working directory."
623
msgstr ""
624
"Принимать изменения в эту ветвь, а не в содержащую рабочую директорию."
625
626
#: bzrlib/builtins.py:1151
627
msgid ""
628
"Perform a local pull in a bound branch. Local pulls are not applied to the "
629
"master branch."
630
msgstr ""
631
"Сделать локальный приём в связанную ветвь. Локальный приём не накладывается "
632
"на основную ветвь."
633
634
#: bzrlib/builtins.py:1189
635
msgid "Need working tree for --show-base."
636
msgstr "Для --show-base необходимо рабочее дерево."
637
638
#: bzrlib/builtins.py:1205
639
msgid "No pull location known or specified."
640
msgstr "Местоположение для приёма неизвестно и не указано."
641
642
#: bzrlib/builtins.py:1211
643
#, python-format
644
msgid "Using saved parent location: %s\n"
645
msgstr "Используется сохранённое местоположение родителя: %s\n"
646
647
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
648
msgid "Cannot use -r with merge directives or bundles"
649
msgstr "Нельзя использовать -r с директивами слияния или пакетами"
650
651
#: bzrlib/builtins.py:1261
652
msgid "Update a mirror of this branch."
653
msgstr "Обновить зеркало этой ветви."
654
655
#: bzrlib/builtins.py:1263
656
msgid ""
657
"The target branch will not have its working tree populated because this\n"
658
"is both expensive, and is not supported on remote file systems."
659
msgstr ""
660
"Целевая ветвь не будет иметь рабочего дерева, поскольку это накладно\n"
661
"и не поддерживается удалёнными файловыми системами."
662
663
#: bzrlib/builtins.py:1266
664
msgid ""
665
"Some smart servers or protocols *may* put the working tree in place in\n"
666
"the future."
667
msgstr ""
668
"Некоторые умные серверы или протоколы *может быть* будут размещать\n"
669
"рабочее дерево в месте назначения в будущем."
670
671
#: bzrlib/builtins.py:1269
672
msgid ""
673
"This command only works on branches that have not diverged. Branches are\n"
674
"considered diverged if the destination branch's most recent commit is one\n"
675
"that has not been merged (directly or indirectly) by the source branch."
676
msgstr ""
677
"Эта команда работает только на ветвях, которые не являются\n"
678
"отклонениями. Ветвь считается отклонением, если последнее\n"
679
"закрепление в ветви назначения не было совмещено (явно или\n"
680
"неявно) с родителем."
681
682
#: bzrlib/builtins.py:1273
683
msgid ""
684
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
685
"the other branch completely, discarding its unmerged changes."
686
msgstr ""
687
"Если ветвь была отклонена, вы можете использовать 'bzr push --overwrite',\n"
688
"чтобы полностью заменить другую ветвь, убирая все её несовмещённые\n"
689
"изменения."
690
691
#: bzrlib/builtins.py:1276
692
msgid ""
693
"If you want to ensure you have the different changes in the other branch,\n"
694
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
695
"After that you will be able to do a push without '--overwrite'."
696
msgstr ""
697
"Если вы хотите убедиться, что у вас иные изменения, чем в другой ветви,\n"
698
"сделайте слияние (см. bzr help merge) с другой ветвью, и закрепите эти\n"
699
"изменения. После этого вы сможете делать push без необходимости указывать\n"
700
"опцию '--overwrite'."
701
702
#: bzrlib/builtins.py:1280
703
msgid ""
704
"If there is no default push location set, the first push will set it (use\n"
705
"--no-remember to avoid setting it). After that, you can omit the\n"
706
"location to use the default. To change the default, use --remember. The\n"
707
"value will only be saved if the remote location can be accessed."
708
msgstr ""
709
"Если местоположение отправки по умолчанию не установлено, первый push\n"
710
"установит её (используйте --no-remember, чтобы не устанавливать).\n"
711
"После этого вы можете опускать местоположение, чтобы использовать\n"
712
"значение по умолчанию. Чтобы изменить значение по умолчанию,\n"
713
"используйте опцию --remember. Значение будет сохранено, только если\n"
714
"доступ к удалённой локации будет успешен."
715
716
#: bzrlib/builtins.py:1285
717
msgid ""
718
"The --verbose option will display the revisions pushed using the log_format\n"
719
"configuration option. You can use a different format by overriding it with\n"
720
"-Olog_format=<other_format>."
721
msgstr ""
722
"Опция --verbose отобразит ревизии, выгруженные с использованием опции\n"
723
"конфигурации log_format. Вы можете использовать другой формат, перегрузив\n"
724
"её опцией -Olog_format=<другой_формат>."
725
726
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
727
msgid ""
728
"Branch to push from, rather than the one containing the working directory."
729
msgstr "Отправлять из этой ветви, а не из содержащей рабочую директорию."
730
731
#: bzrlib/builtins.py:1299
732
msgid ""
733
"By default push will fail if the target directory exists, but does not "
734
"already have a control directory. This flag will allow push to proceed."
735
msgstr ""
736
"По умолчанию, push закончится неудачей, если директория назначения "
737
"существует, но не содержит управляющих метаданных. Этот флаг позволит "
738
"отправке изменений продолжаться."
739
740
#: bzrlib/builtins.py:1304
741
msgid ""
742
"Create a stacked branch that references the public location of the parent "
743
"branch."
744
msgstr ""
745
"Создать стековую ветвь, которая ссылается на публичное местоположение "
746
"родительской ветви."
747
748
#: bzrlib/builtins.py:1307
749
msgid ""
750
"Create a stacked branch that refers to another branch for the commit "
751
"history. Only the work not present in the referenced branch is included in "
752
"the branch created."
753
msgstr ""
754
"Создать стековую ветвь, которая ссылается на другую ветвь для хранения "
755
"истории фиксаций. В созданную ветвь помещается только работа, не "
756
"существующая в исходной ветви."
757
758
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
759
msgid ""
760
"Refuse to push if there are uncommitted changes in the working tree, --no-"
761
"strict disables the check."
762
msgstr ""
763
"Отказывать в отсылке изменений, если в рабочем дереве есть незакреплённые "
764
"изменения, --no-strict запрещает проверку."
765
766
#: bzrlib/builtins.py:1315
767
msgid "Don't populate the working tree, even for protocols that support it."
768
msgstr ""
769
"Не создавать рабочее дерево, даже для протоколов, которые поддерживают это."
770
771
#: bzrlib/builtins.py:1318
772
msgid "Overwrite tags only."
773
msgstr "Переписать только теги."
774
775
#: bzrlib/builtins.py:1369
776
msgid "Could not determine branch to refer to."
777
msgstr "Не удалось определить ветвь, на которую нужно ссылаться."
778
779
#: bzrlib/builtins.py:1378
780
#, python-format
781
msgid ""
782
"No push location known or specified. To push to the parent branch (at %s), "
783
"use 'bzr push :parent'."
784
msgstr ""
785
"Не указано местоположение отправки. Чтобы отправить в родительскую ветвь (на "
786
"%s) используйте 'bzr push :parent'."
787
788
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
789
msgid "No push location known or specified."
790
msgstr "Местоположение для отсылки изменений неизвестно и не указано."
791
792
#: bzrlib/builtins.py:1388
793
#, python-format
794
msgid "Using saved push location: %s"
795
msgstr "Используется сохранённое местоположение отсылки: %s"
796
797
#: bzrlib/builtins.py:1398
798
msgid "Create a new branch that is a copy of an existing branch."
799
msgstr "Создать новую ветвь, являющуюся копией существующей ветви."
800
801
#: bzrlib/builtins.py:1400
802
msgid ""
803
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
804
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
805
"./bar.\n"
806
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
807
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
808
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
809
"create ./foo-bar."
810
msgstr ""
811
"Если TO_LOCATION опущено, будет использована последняя компонента\n"
812
"FROM_LOCATION. Иными словами, «branch ../foo/bar» попытается создать ./bar.\n"
813
"Если FROM_LOCATION не содержит разделителя «/», то TO_LOCATION определется\n"
814
"из FROM_LOCATION удалением префикса. Например «branch lp:foo-bar»\n"
815
"попытается создать ./foo-bar."
816
817
#: bzrlib/builtins.py:1407
818
msgid ""
819
"To retrieve the branch as of a particular revision, supply the --revision\n"
820
"parameter, as in \"branch foo/bar -r 5\"."
821
msgstr ""
822
"Чтобы получить определённую ревизию ветви, передайте её в параметре\n"
823
"--revision, напр. «branch foo/bar -r 5»."
824
825
#: bzrlib/builtins.py:1410
826
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
827
msgstr "Синонимы 'clone' и 'get' для этой команды устарели."
828
829
#: bzrlib/builtins.py:1420
830
msgid "Create a branch without a working-tree."
831
msgstr "Создать ветвь без рабочего дерева."
832
833
#: bzrlib/builtins.py:1422
834
msgid "Switch the checkout in the current directory to the new branch."
835
msgstr "Заменить рабочую копию в текущей директории новой ветвью."
836
837
#: bzrlib/builtins.py:1425
838
msgid ""
839
"Create a stacked branch referring to the source branch. The new branch will "
840
"depend on the availability of the source branch for all operations."
841
msgstr ""
842
"Создать стековую ветвь, ссылающуюся на исходную ветвь. Все операции над "
843
"новой ветвью будут зависеть от доступности старой ветви."
844
845
#: bzrlib/builtins.py:1429
846
msgid "Do not use a shared repository, even if available."
847
msgstr "Не использовать общий репозиторий, даже если доступен."
848
849
#: bzrlib/builtins.py:1431
850
msgid ""
851
"By default branch will fail if the target directory exists, but does not "
852
"already have a control directory. This flag will allow branch to proceed."
853
msgstr ""
854
"По умолчанию branch завершится неудачей, если директория назначения "
855
"существует, но не содержит управляющих метаданных. Этот флаг позволит branch "
856
"продолжаться."
857
858
#: bzrlib/builtins.py:1436
859
msgid "Bind new branch to from location."
860
msgstr "Связать новую ветвь с FROM_LOCATION"
861
862
#: bzrlib/builtins.py:1483
863
#, python-format
864
msgid "Target directory \"%s\" already exists."
865
msgstr "Целевая директория «%s» уже существует."
866
867
#: bzrlib/builtins.py:1495
868
#, python-format
869
msgid "Parent of \"%s\" does not exist."
870
msgstr "Родитель «%s» не существует."
871
872
#: bzrlib/builtins.py:1514
873
msgid "The branch {0} has no revision {1}."
874
msgstr "В ветви {0} отсутствует ревизия {1}."
875
876
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
877
#, python-format
878
msgid "Created new stacked branch referring to %s."
879
msgstr "Создана новая стековая ветвь, ссылающаяся на %s."
880
881
#: bzrlib/builtins.py:1533
882
#, python-format
883
msgid "Branched %d revision."
884
msgid_plural "Branched %d revisions."
885
msgstr[0] "Ответвлена %d ревизия."
886
msgstr[1] "Ответвлены %d ревизии."
887
msgstr[2] "Ответвлены %d ревизий."
888
889
#: bzrlib/builtins.py:1538
890
#, python-format
891
msgid "New branch bound to %s"
892
msgstr "Новая ветвь, связанная с %s"
893
894
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
895
#, python-format
896
msgid "Switched to branch: %s"
897
msgstr "Переключение на ветвь: %s"
898
899
#: bzrlib/builtins.py:1548
900
msgid "List the branches available at the current location."
901
msgstr "Вывести список ветвей, доступных в текущем местоположении."
902
903
#: bzrlib/builtins.py:1550
904
msgid ""
905
"This command will print the names of all the branches at the current\n"
906
"location."
907
msgstr "Эта команда выведет имена всех ветвей в текущем местоположении."
908
909
#: bzrlib/builtins.py:1557
910
msgid ""
911
"Recursively scan for branches rather than just looking in the specified "
912
"location."
913
msgstr ""
914
"Рекурсивно сканировать ветви, а не смотреть в указанном местоположении."
915
916
#: bzrlib/builtins.py:1586
917
msgid "(default)"
918
msgstr "(по умолчанию)"
919
920
#: bzrlib/builtins.py:1598
921
msgid "Create a new checkout of an existing branch."
922
msgstr "Создать новую рабочую копию текущей ветви."
923
924
#: bzrlib/builtins.py:1600
925
msgid ""
926
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
927
"for\n"
928
"the branch found in '.'. This is useful if you have removed the working "
929
"tree\n"
930
"or if it was never created - i.e. if you pushed the branch to its current\n"
931
"location using SFTP."
932
msgstr ""
933
"Если аргумент BRANCH_LOCATION опущен, checkout воссоздаст рабочее дерево\n"
934
"для ветви, найденной в '.'. Это полезно, если вы удалили рабочее дерево,\n"
935
"или если вы никогда не создавали его."
936
937
#: bzrlib/builtins.py:1605
938
msgid ""
939
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
940
"will\n"
941
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
942
"./bar.\n"
943
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
944
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
945
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
946
"create ./foo-bar."
947
msgstr ""
948
"Если TO_LOCATION опущено, будет использована последняя компонента\n"
949
"BRANCH_LOCATION. Иными словами, «checkout ../foo/bar» попытается\n"
950
"создать ./bar. Если BRANCH_LOCATION не содержит разделителя «/»,\n"
951
"то TO_LOCATION определется из BRANCH_LOCATION удалением префикса.\n"
952
"Например «checkout lp:foo-bar» попытается создать ./foo-bar."
953
954
#: bzrlib/builtins.py:1612
955
msgid ""
956
"To retrieve the branch as of a particular revision, supply the --revision\n"
957
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
958
"immediately\n"
959
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
960
"old\n"
961
"code.)"
962
msgstr ""
963
"Чтобы получить определённую ревизию ветви, добавьте параметр --revision,\n"
964
"например «checkout foo/bar -r 5». Заметьте, что такое дерево будет сразу\n"
965
"просрочено [так что в не сможете закрепить изменения], но это может быть\n"
966
"полезно, к примеру, для просмотра старого кода."
967
968
#: bzrlib/builtins.py:1622
969
msgid ""
970
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
971
"the branch for every operation. Normal checkouts can perform common "
972
"operations like diff and status without such access, and also support local "
973
"commits."
974
msgstr ""
975
"Получить легковесную рабочую копию. Каждая операция над легковесной рабочей "
976
"копией зависит от доступности ветви. Обычные рабочие копии позволяют "
977
"производить стандартные операции, как diff и status, без такого доступа, а "
978
"также поддерживают локальные закрепления."
979
980
#: bzrlib/builtins.py:1629
981
msgid "Get file contents from this tree."
982
msgstr "Получить содержимое файла из этого дерева."
983
984
#: bzrlib/builtins.py:1631
985
msgid "Hard-link working tree files where possible."
986
msgstr "Использовать жёсткие ссылки в рабочем дереве, когда это возможно."
987
988
#: bzrlib/builtins.py:1672
989
msgid ""
990
"Show list of renamed files.\n"
991
" "
992
msgstr ""
993
"Показать список переименованных файлов.\n"
994
" "
995
996
#: bzrlib/builtins.py:1700
997
msgid "Update a working tree to a new revision."
998
msgstr "Обновить рабочее дерево до новой ревизии."
999
1000
#: bzrlib/builtins.py:1702
1001
msgid ""
1002
"This will perform a merge of the destination revision (the tip of the\n"
1003
"branch, or the specified revision) into the working tree, and then make\n"
1004
"that revision the basis revision for the working tree. "
1005
msgstr ""
1006
1007
#: bzrlib/builtins.py:1706
1008
msgid ""
1009
"You can use this to visit an older revision, or to update a working tree\n"
1010
"that is out of date from its branch."
1011
msgstr ""
1012
"Вы можете использовать это для того, чтобы увидеть старые ревизии или "
1013
"обновить рабочее дерево, которое устарело по отношению к своей ветке."
1014
1015
#: bzrlib/builtins.py:1709
1016
msgid ""
1017
"If there are any uncommitted changes in the tree, they will be carried\n"
1018
"across and remain as uncommitted changes after the update. To discard\n"
1019
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
1020
"with the changes brought in by the change in basis revision."
1021
msgstr ""
1022
"При наличии не подтверждённых изменений в рабочем дереве,они будут "
1023
"осуществлены и оставлены как неподтвержденные после обновления. Чтобы "
1024
"отменить эти изменения используйте 'bzr revert'. Не подтверждённые изменения "
1025
"могут конфликтовать с изменениями, вызванными обновлением."
1026
1027
#: bzrlib/builtins.py:1714
1028
msgid ""
1029
"If the tree's branch is bound to a master branch, bzr will also update\n"
1030
"the branch from the master."
1031
msgstr ""
1032
1033
#: bzrlib/builtins.py:1717
1034
msgid ""
1035
"You cannot update just a single file or directory, because each Bazaar\n"
1036
"working tree has just a single basis revision. If you want to restore a\n"
1037
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
1038
"update'. If you want to restore a file to its state in a previous\n"
1039
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
1040
"out the old content of that file to a new location."
1041
msgstr ""
1042
"Нельзя обновить только отдельный файл или директорию, поскольку каждое\n"
1043
"рабочее дерево Bazaar имеет только одну базовую ревизию. Если вы хотите\n"
1044
"восстановить файл, который был удалён на локальной машине, используйте\n"
1045
"'bzr revert', а не 'bzr update'. Если вы хотите восстановить файл до\n"
1046
"состояния в предыдущей ревизии, используйте 'bzr revert' с опцией '-r',\n"
1047
"или используйте 'bzr cat', чтобы записать старое содержимое этого файла\n"
1048
"в новое местоположение."
1049
1050
#: bzrlib/builtins.py:1724
1051
msgid ""
1052
"The 'dir' argument, if given, must be the location of the root of a\n"
1053
"working tree to update. By default, the working tree that contains the \n"
1054
"current working directory is used."
1055
msgstr ""
1056
1057
#: bzrlib/builtins.py:1740
1058
msgid "bzr update --revision takes exactly one revision"
1059
msgstr "bzr update --revision принимает ровно одну ревизию"
1060
1061
#: bzrlib/builtins.py:1748
1062
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1063
msgstr ""
1064
"bzr update может обновить только всё дерево, не файл или поддиректорию"
1065
1066
#: bzrlib/builtins.py:1779
1067
msgid "Tree is up to date at revision {0} of branch {1}"
1068
msgstr "Дерево в актуальной ревизии {0} ветви {1}"
1069
1070
#: bzrlib/builtins.py:1795
1071
#, python-format
1072
msgid ""
1073
"branch has no revision %s\n"
1074
"bzr update --revision only works for a revision in the branch history"
1075
msgstr ""
1076
"в ветви нет ревизии %s\n"
1077
"bzr update --revision работает только для ревизий в истории ветви"
1078
1079
#: bzrlib/builtins.py:1801
1080
msgid "Updated to revision {0} of branch {1}"
1081
msgstr "Обновлено до ревизии {0} ветви {1}"
1082
1083
#: bzrlib/builtins.py:1805
1084
msgid ""
1085
"Your local commits will now show as pending merges with 'bzr status', and "
1086
"can be committed with 'bzr commit'."
1087
msgstr ""
1088
"Ваши локальные закрепления теперь будут отображаться в 'bzr status' как "
1089
"незавершённые слияния, и их можно закрепить с помощью 'bzr commit'."
1090
1091
#: bzrlib/builtins.py:1814
1092
msgid "Show information about a working tree, branch or repository."
1093
msgstr "Показать информацию о рабочем дереве, ветви или репозитории."
1094
1095
#: bzrlib/builtins.py:1816
1096
msgid ""
1097
"This command will show all known locations and formats associated to the\n"
1098
"tree, branch or repository."
1099
msgstr ""
1100
"Эта команда выведет все известные местоположения и форматы, связанные\n"
1101
"с деревом, ветвью или репозиторием."
1102
1103
#: bzrlib/builtins.py:1819
1104
msgid ""
1105
"In verbose mode, statistical information is included with each report.\n"
1106
"To see extended statistic information, use a verbosity level of 2 or\n"
1107
"higher by specifying the verbose option multiple times, e.g. -vv."
1108
msgstr ""
1109
"В подробном режиме в каждый отчёт включается статистическая информация.\n"
1110
"Чтобы увидеть расширенную статистическую информацию, используйте уровень\n"
1111
"подробностей 2 или выше, указывая опцию -v несколько раз, например -vv."
1112
1113
#: bzrlib/builtins.py:1823
1114
msgid "Branches and working trees will also report any missing revisions."
1115
msgstr ""
1116
"Ветви и рабочие деревья также включают в отчёт отсутствующие ревизии."
1117
1118
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1119
#: bzrlib/builtins.py:6466
1120
msgid ":Examples:"
1121
msgstr ":Примеры:"
1122
1123
#: bzrlib/builtins.py:1827
1124
msgid " Display information on the format and related locations:"
1125
msgstr " Вывести информацию о формате и связанных местоположениях:"
1126
1127
#: bzrlib/builtins.py:1829
1128
msgid " bzr info"
1129
msgstr " bzr info"
1130
1131
#: bzrlib/builtins.py:1831
1132
msgid ""
1133
" Display the above together with extended format information and\n"
1134
" basic statistics (like the number of files in the working tree and\n"
1135
" number of revisions in the branch and repository):"
1136
msgstr ""
1137
" Вывести то же, что и выше, а также расширенную информацию о формате\n"
1138
" и базовую статистику (как число файлов в рабочем дереве и число\n"
1139
" ревизий в ветви и репозитории):"
1140
1141
#: bzrlib/builtins.py:1835
1142
msgid " bzr info -v"
1143
msgstr " bzr info -v"
1144
1145
#: bzrlib/builtins.py:1837
1146
msgid " Display the above together with number of committers to the branch:"
1147
msgstr " Вывести то же, что и выше, а также число участников ветви:"
1148
1149
#: bzrlib/builtins.py:1839
1150
msgid " bzr info -vv"
1151
msgstr " bzr info -vv"
1152
1153
#: bzrlib/builtins.py:1858
1154
msgid "Remove files or directories."
1155
msgstr "Исключить файлы или директории."
1156
1157
#: bzrlib/builtins.py:1860
1158
msgid ""
1159
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1160
"delete them if they can easily be recovered using revert otherwise they\n"
1161
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1162
"parameters are given Bazaar will scan for files that are being tracked by\n"
1163
"Bazaar but missing in your tree and stop tracking them for you."
1164
msgstr ""
1165
1166
#: bzrlib/builtins.py:1868
1167
msgid "Only remove files that have never been committed."
1168
msgstr "Исключать только файлы, которые никогда не были закреплены."
1169
1170
#: bzrlib/builtins.py:1870
1171
msgid "The file deletion mode to be used."
1172
msgstr "Используемый способ удаления файлов."
1173
1174
#: bzrlib/builtins.py:1871
1175
msgid "Deletion Strategy"
1176
msgstr "Стратегия удаления"
1177
1178
#: bzrlib/builtins.py:1872
1179
msgid "Backup changed files (default)."
1180
msgstr "Создать резервную копию изменённых файлов (по умолчанию)."
1181
1182
#: bzrlib/builtins.py:1873
1183
msgid "Delete from bzr but leave the working copy."
1184
msgstr "Удалить из bzr, но оставить рабочую копию."
1185
1186
#: bzrlib/builtins.py:1874
1187
msgid "Don't backup changed files."
1188
msgstr "Не создавать резервные копии изменённых файлов."
1189
1190
#: bzrlib/builtins.py:1875
1191
msgid ""
1192
"Delete all the specified files, even if they can not be recovered and even "
1193
"if they are non-empty directories. (deprecated, use no-backup)"
1194
msgstr ""
1195
"Удалить все указанные файлы, даже если их нельзя восстановить или они "
1196
"являются непустыми директориями. (устарело, используйте no-backup)"
1197
1198
#: bzrlib/builtins.py:1884
1199
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1200
msgstr ""
1201
"(Опция --force устарела, в будущем следует использовать --no-backup.)"
1202
1203
#: bzrlib/builtins.py:1901
1204
msgid "No matching files."
1205
msgstr "Нет файлов, удовлетворяющих критерию."
1206
1207
#: bzrlib/builtins.py:1962
1208
msgid "Reconcile bzr metadata in a branch."
1209
msgstr "Согласовать метаданные bzr в ветви."
1210
1211
#: bzrlib/builtins.py:1964
1212
msgid ""
1213
"This can correct data mismatches that may have been caused by\n"
1214
"previous ghost operations or bzr upgrades. You should only\n"
1215
"need to run this command if 'bzr check' or a bzr developer\n"
1216
"advises you to run it."
1217
msgstr ""
1218
"Может исправить несовпадения данных, вызванные обновлениями bzr.\n"
1219
"Эту команду стоит запускать только, если 'bzr check' или разработчик\n"
1220
"bzr предложат вам сделать это."
1221
1222
#: bzrlib/builtins.py:1969
1223
msgid ""
1224
"If a second branch is provided, cross-branch reconciliation is\n"
1225
"also attempted, which will check that data like the tree root\n"
1226
"id which was not present in very early bzr versions is represented\n"
1227
"correctly in both branches."
1228
msgstr ""
1229
"Если предоставлена вторая ветвь, производится попытка согласования\n"
1230
"между ветвями, в ходе которой проверяется, что данные, не\n"
1231
"присутствовавшие в ранних версиях bzr, корректно представлены\n"
1232
"в обоих ветвях."
1233
1234
#: bzrlib/builtins.py:1974
1235
msgid ""
1236
"At the same time it is run it may recompress data resulting in\n"
1237
"a potential saving in disk space or performance gain."
1238
msgstr ""
1239
"В то же время, при запуске возможно пережатие данных, потенциально\n"
1240
"уменьшающее размер занимаемого пространства и повышающее\n"
1241
"производительность."
1242
1243
#: bzrlib/builtins.py:1977
1244
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1245
msgstr ""
1246
"Ветвь *ДОЛЖНА* быть на системе, поддерживающей список файлов, такой как\r\n"
1247
"локальный диск или SFTP."
1248
1249
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1250
msgid ""
1251
"Format for the bzr 2.0 series.\n"
1252
"Uses group-compress storage.\n"
1253
"Provides rich roots which are a one-way transition.\n"
1254
msgstr ""
1255
1256
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1257
msgid ""
1258
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1259
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1260
msgstr ""
1261
"Пакетный формат, используемый в версиях 1.х. Представлен в 0.92. "
1262
"Взаимодействует с хранилищами bzr 0.92 и ниже, но не читается bzr ниже 0.92. "
1263
1264
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1265
msgid "The 2a format with experimental support for colocated branches.\n"
1266
msgstr ""
1267
1268
#: bzrlib/builtins.py:2045
1269
msgid "Make a directory into a versioned branch."
1270
msgstr "Преобразовать директорию в ветвь системы контроля версий."
1271
1272
#: bzrlib/builtins.py:2047
1273
msgid ""
1274
"Use this to create an empty branch, or before importing an\n"
1275
"existing project."
1276
msgstr ""
1277
"Используйте эту команду для создания пустой ветви или\n"
1278
"перед импортом существующего проекта."
1279
1280
#: bzrlib/builtins.py:2050
1281
msgid ""
1282
"If there is a repository in a parent directory of the location, then\n"
1283
"the history of the branch will be stored in the repository. Otherwise\n"
1284
"init creates a standalone branch which carries its own history\n"
1285
"in the .bzr directory."
1286
msgstr ""
1287
"Если в родительской директории находится репозиторий, история ветви\n"
1288
"будет сохранена в репозитории. Иначе, init создаёт одиночную ветвь,\n"
1289
"которая несёт историю с собой в директории .bzr."
1290
1291
#: bzrlib/builtins.py:2055
1292
msgid ""
1293
"If there is already a branch at the location but it has no working tree,\n"
1294
"the tree can be populated with 'bzr checkout'."
1295
msgstr ""
1296
"Если ветвь уже существует, но рабочее дерево отсутствует, то оно\n"
1297
"создаётся с помощью 'bzr checkout'."
1298
1299
#: bzrlib/builtins.py:2058
1300
msgid "Recipe for importing a tree of files::"
1301
msgstr "Рецепт для импорта дерева файлов::"
1302
1303
#: bzrlib/builtins.py:2060
1304
msgid ""
1305
" cd ~/project\n"
1306
" bzr init\n"
1307
" bzr add .\n"
1308
" bzr status\n"
1309
" bzr commit -m \"imported project\""
1310
msgstr ""
1311
" cd ~/project\n"
1312
" bzr init\n"
1313
" bzr add .\n"
1314
" bzr status\n"
1315
" bzr commit -m \"проект импортирован\""
1316
1317
#: bzrlib/builtins.py:2071
1318
msgid ""
1319
"Create the path leading up to the branch if it does not already exist."
1320
msgstr "Создать путь, ведущий к ветви, если он ещё не существует."
1321
1322
#: bzrlib/builtins.py:2074
1323
msgid "Specify a format for this branch. See \"help formats\"."
1324
msgstr "Указать формат данной ветви. См. «help formats»."
1325
1326
#: bzrlib/builtins.py:2082
1327
msgid ""
1328
"Never change revnos or the existing log. Append revisions to it only."
1329
msgstr ""
1330
"Никогда не изменять номера ревизий в существующем журнале. Только добавлять "
1331
"к нему ревизии."
1332
1333
#: bzrlib/builtins.py:2085
1334
msgid "Create a branch without a working tree."
1335
msgstr "Создать ветвь без рабочего дерева."
1336
1337
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1338
#, python-format
1339
msgid ""
1340
"Parent directory of %s does not exist.\n"
1341
"You may supply --create-prefix to create all leading parent directories."
1342
msgstr ""
1343
"Родительская директория для %s не существует.\n"
1344
"Вы может предоставить --create-prefix, чтобы создать все родительские "
1345
"директории."
1346
1347
#: bzrlib/builtins.py:2139
1348
msgid ""
1349
"This branch format cannot be set to append-revisions-only. Try --default."
1350
msgstr ""
1351
"Формат этой ветви не может быть установлен в append-revisions-only. "
1352
"Попробуйте --default."
1353
1354
#: bzrlib/builtins.py:2150
1355
msgid "Created a {0} (format: {1})\n"
1356
msgstr "Создана {0} в формате {1}\n"
1357
1358
#: bzrlib/builtins.py:2159
1359
#, python-format
1360
msgid "Using shared repository: %s\n"
1361
msgstr "Используется общий репозиторий: %s\n"
1362
1363
#: bzrlib/builtins.py:2163
1364
msgid "Create a shared repository for branches to share storage space."
1365
msgstr ""
1366
"Создать общий репозиторий для ветвей, которые разделяют общее пространство."
1367
1368
#: bzrlib/builtins.py:2165
1369
msgid ""
1370
"New branches created under the repository directory will store their\n"
1371
"revisions in the repository, not in the branch directory. For branches\n"
1372
"with shared history, this reduces the amount of storage needed and \n"
1373
"speeds up the creation of new branches."
1374
msgstr ""
1375
"Новые ветви, создаваемые в директории репозитория, будут хранить\n"
1376
"информацию о ревизиях в репозитории, а не в директории ветви.\n"
1377
"Для ветвей с общей историей это уменьшает размер необходимого\n"
1378
"пространства и ускоряет создание новых ветвей."
1379
1380
#: bzrlib/builtins.py:2170
1381
msgid ""
1382
"If the --no-trees option is given then the branches in the repository\n"
1383
"will not have working trees by default. They will still exist as \n"
1384
"directories on disk, but they will not have separate copies of the \n"
1385
"files at a certain revision. This can be useful for repositories that\n"
1386
"store branches which are interacted with through checkouts or remote\n"
1387
"branches, such as on a server."
1388
msgstr ""
1389
"Если дана опция --no-trees, то по умолчанию ветви в репозитории не\n"
1390
"будут иметь рабочих деревьев. Они по прежнему будут существовать,\n"
1391
"как директории на диске, но не будут иметь различных копий файлов\n"
1392
"определённой ревизии. Это может быть полезно для репозиториев,\n"
1393
"хранящих ветви, работа с которыми производится через рабочие копии\n"
1394
"или через удалённые ветви, например на сервере."
1395
1396
#: bzrlib/builtins.py:2177
1397
msgid ""
1398
":Examples:\n"
1399
" Create a shared repository holding just branches::"
1400
msgstr ""
1401
":Примеры:\n"
1402
" Создать общий репозиторий, хранящий только ветви::"
1403
1404
#: bzrlib/builtins.py:2180
1405
msgid ""
1406
" bzr init-repo --no-trees repo\n"
1407
" bzr init repo/trunk"
1408
msgstr ""
1409
" bzr init-repo --no-trees repo\n"
1410
" bzr init repo/trunk"
1411
1412
#: bzrlib/builtins.py:2183
1413
msgid " Make a lightweight checkout elsewhere::"
1414
msgstr " Создать легковесную рабочую копию где-нибудь ещё::"
1415
1416
#: bzrlib/builtins.py:2185
1417
msgid ""
1418
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1419
" cd trunk-checkout\n"
1420
" (add files here)"
1421
msgstr ""
1422
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1423
" cd trunk-checkout\n"
1424
" (здесь добавляйте файлы)"
1425
1426
#: bzrlib/builtins.py:2193
1427
msgid ""
1428
"Specify a format for this repository. See \"bzr help formats\" for details."
1429
msgstr ""
1430
"Указать формат для этого репозитория. Описание форматов см. в «bzr help "
1431
"formats»."
1432
1433
#: bzrlib/builtins.py:2197
1434
msgid "Repository format"
1435
msgstr "Формат репозитория"
1436
1437
#: bzrlib/builtins.py:2199
1438
msgid "Branches in the repository will default to not having a working tree."
1439
msgstr "Ветви в репозитории по умолчанию не будут иметь рабочего дерева."
1440
1441
#: bzrlib/builtins.py:2225
1442
msgid "Show differences in the working tree, between revisions or branches."
1443
msgstr "Показать изменения в рабочем дереве, между ревизиями или ветвями."
1444
1445
#: bzrlib/builtins.py:2227
1446
msgid ""
1447
"If no arguments are given, all changes for the current tree are listed.\n"
1448
"If files are given, only the changes in those files are listed.\n"
1449
"Remote and multiple branches can be compared by using the --old and\n"
1450
"--new options. If not provided, the default for both is derived from\n"
1451
"the first argument, if any, or the current tree if no arguments are\n"
1452
"given."
1453
msgstr ""
1454
"Если не дано аргументов, будут выведены все изменения текущего дерева.\n"
1455
"Если даны файлы, выводятся изменения только в этих файлах. Удалённые\n"
1456
"или множественные ветви можно сравнить, используя опции --old и --new.\n"
1457
"Если не указаны, значение по умолчанию для обоих извлекается из первого\n"
1458
"аргумента или из текущего дерева, если не дано аргументов."
1459
1460
#: bzrlib/builtins.py:2234
1461
msgid ""
1462
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1463
"produces patches suitable for \"patch -p1\"."
1464
msgstr ""
1465
"«bzr diff -p1» эквивалентно «bzr diff -prefix old/:new/», и\n"
1466
"создаёт патчи, подходящие для «patch -p1»."
1467
1468
#: bzrlib/builtins.py:2237
1469
msgid ""
1470
"Note that when using the -r argument with a range of revisions, the\n"
1471
"differences are computed between the two specified revisions. That\n"
1472
"is, the command does not show the changes introduced by the first \n"
1473
"revision in the range. This differs from the interpretation of \n"
1474
"revision ranges used by \"bzr log\" which includes the first revision\n"
1475
"in the range."
1476
msgstr ""
1477
"Заметьте, что при использовании аргумента -r с интервалом ревизий,\n"
1478
"различия вычисляются между указанными ревизиями. То есть, команда\n"
1479
"не показывает изменения, представленные в первой ревизии интервала.\n"
1480
"Это отличается от интерпретации интервалов ревизий командой «bzr log»,\n"
1481
"которая включает первую ревизию интервала."
1482
1483
#: bzrlib/builtins.py:2244
1484
msgid ""
1485
":Exit values:\n"
1486
" 1 - changed\n"
1487
" 2 - unrepresentable changes\n"
1488
" 3 - error\n"
1489
" 0 - no change"
1490
msgstr ""
1491
":Значения выхода:\n"
1492
" 1 - изменено\n"
1493
" 2 - непредставимые изменения\n"
1494
" 3 - ошибка\n"
1495
" 0 - нет изменений"
1496
1497
#: bzrlib/builtins.py:2250
1498
msgid ""
1499
":Examples:\n"
1500
" Shows the difference in the working tree versus the last commit::"
1501
msgstr ""
1502
":Примеры:\n"
1503
" Показывает отличия рабочего дерева от последнего закрепления::"
1504
1505
#: bzrlib/builtins.py:2253
1506
msgid " bzr diff"
1507
msgstr " bzr diff"
1508
1509
#: bzrlib/builtins.py:2255
1510
msgid " Difference between the working tree and revision 1::"
1511
msgstr " Различия между рабочим деревом и ревизией 1::"
1512
1513
#: bzrlib/builtins.py:2257
1514
msgid " bzr diff -r1"
1515
msgstr " bzr diff -r1"
1516
1517
#: bzrlib/builtins.py:2259
1518
msgid " Difference between revision 3 and revision 1::"
1519
msgstr " Различия между ревизией 3 и ревизией 1::"
1520
1521
#: bzrlib/builtins.py:2261
1522
msgid " bzr diff -r1..3"
1523
msgstr " bzr diff -r1..3"
1524
1525
#: bzrlib/builtins.py:2263
1526
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1527
msgstr " Различия между ревизией 3 и ревизией 1 для ветви xxx::"
1528
1529
#: bzrlib/builtins.py:2265
1530
msgid " bzr diff -r1..3 xxx"
1531
msgstr " bzr diff -r1..3 xxx"
1532
1533
#: bzrlib/builtins.py:2267
1534
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1535
msgstr " Изменения, представленные в ревизии 2 (эквивалентно -r1..2)::"
1536
1537
#: bzrlib/builtins.py:2269
1538
msgid " bzr diff -c2"
1539
msgstr " bzr diff -c2"
1540
1541
#: bzrlib/builtins.py:2271
1542
msgid ""
1543
" To see the changes introduced by revision X::\n"
1544
" \n"
1545
" bzr diff -cX"
1546
msgstr ""
1547
" Чтобы увидеть изменения, представленные в ревизии X::\n"
1548
" \n"
1549
" bzr diff -cX"
1550
1551
#: bzrlib/builtins.py:2275
1552
msgid ""
1553
" Note that in the case of a merge, the -c option shows the changes\n"
1554
" compared to the left hand parent. To see the changes against\n"
1555
" another parent, use::"
1556
msgstr ""
1557
" Заметьте, что в случае слияния, опция -c выведет только изменения\n"
1558
" относительно левого родителя. Чтобы увидеть изменения относительно\n"
1559
" правого родителя, используйте::"
1560
1561
#: bzrlib/builtins.py:2279
1562
msgid " bzr diff -r<chosen_parent>..X"
1563
msgstr " bzr diff -r<выбранный_родитель>..X"
1564
1565
#: bzrlib/builtins.py:2281
1566
msgid ""
1567
" The changes between the current revision and the previous revision\n"
1568
" (equivalent to -c-1 and -r-2..-1)"
1569
msgstr ""
1570
" Изменения между текущей ревизией и предыдущей\n"
1571
" (эквивалент -c-1 и -r-2..-1)"
1572
1573
#: bzrlib/builtins.py:2284
1574
msgid " bzr diff -r-2.."
1575
msgstr " bzr diff -r-2.."
1576
1577
#: bzrlib/builtins.py:2286
1578
msgid " Show just the differences for file NEWS::"
1579
msgstr " Показать изменения только для файла NEWS::"
1580
1581
#: bzrlib/builtins.py:2288
1582
msgid " bzr diff NEWS"
1583
msgstr " bzr diff NEWS"
1584
1585
#: bzrlib/builtins.py:2290
1586
msgid " Show the differences in working tree xxx for file NEWS::"
1587
msgstr " Показать изменения в рабочем дереве xxx для файла NEWS::"
1588
1589
#: bzrlib/builtins.py:2292
1590
msgid " bzr diff xxx/NEWS"
1591
msgstr " bzr diff xxx/NEWS"
1592
1593
#: bzrlib/builtins.py:2294
1594
msgid " Show the differences from branch xxx to this working tree:"
1595
msgstr " Показать изменения рабочего дерева относительно ветви xxx:"
1596
1597
#: bzrlib/builtins.py:2296
1598
msgid " bzr diff --old xxx"
1599
msgstr " bzr diff --old xxx"
1600
1601
#: bzrlib/builtins.py:2298
1602
msgid " Show the differences between two branches for file NEWS::"
1603
msgstr " Показать различия в файле NEWS между двумя ветвями::"
1604
1605
#: bzrlib/builtins.py:2300
1606
msgid " bzr diff --old xxx --new yyy NEWS"
1607
msgstr " bzr diff --old xxx --new yyy NEWS"
1608
1609
#: bzrlib/builtins.py:2302
1610
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1611
msgstr " Тоже, что и 'bzr diff', но начать пути с old/ и new/::"
1612
1613
#: bzrlib/builtins.py:2304
1614
msgid ""
1615
" bzr diff --prefix old/:new/\n"
1616
" \n"
1617
" Show the differences using a custom diff program with options::\n"
1618
" \n"
1619
" bzr diff --using /usr/bin/diff --diff-options -wu"
1620
msgstr ""
1621
" bzr diff --prefix old/:new/\n"
1622
" \n"
1623
" Показать изменения, используя пользовательскую программу diff с "
1624
"опциями::\n"
1625
" \n"
1626
" bzr diff --using /usr/bin/diff --diff-options -wu"
1627
1628
#: bzrlib/builtins.py:2314
1629
msgid "Pass these options to the external diff program."
1630
msgstr "Передать эти опции внешней программе diff."
1631
1632
#: bzrlib/builtins.py:2317
1633
msgid ""
1634
"Set prefixes added to old and new filenames, as two values separated by a "
1635
"colon. (eg \"old/:new/\")."
1636
msgstr ""
1637
"Установить префиксы, добавляемые к старым и новым именам файлов, как "
1638
"значения, разделённые двоеточием (напр. «old/:new/»)."
1639
1640
#: bzrlib/builtins.py:2320
1641
msgid "Branch/tree to compare from."
1642
msgstr "Ветвь или дерево, которое сравнивать."
1643
1644
#: bzrlib/builtins.py:2324
1645
msgid "Branch/tree to compare to."
1646
msgstr "Ветвь или дерево, с которым сравнивать."
1647
1648
#: bzrlib/builtins.py:2330
1649
msgid "Use this command to compare files."
1650
msgstr "Использовать эту команду для сравнения."
1651
1652
#: bzrlib/builtins.py:2335
1653
msgid "Diff format to use."
1654
msgstr "Используемый формат diff."
1655
1656
#: bzrlib/builtins.py:2337
1657
msgid "Diff format"
1658
msgstr "Формат diff"
1659
1660
#: bzrlib/builtins.py:2359
1661
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1662
msgstr ""
1663
"--prefix ожидает два значения, разделённые двоеточием (напр. «old/:new/»)"
1664
1665
#: bzrlib/builtins.py:2363
1666
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1667
msgstr "bzr diff --revision принимает ровно ожин или два аргумента"
1668
1669
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1670
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1671
msgid "{0} and {1} are mutually exclusive"
1672
msgstr "{0} и {1} взаимоисключающи"
1673
1674
#: bzrlib/builtins.py:2388
1675
msgid ""
1676
"List files deleted in the working tree.\n"
1677
" "
1678
msgstr ""
1679
"Вывести список файлов, удалённых в рабочем дереве.\n"
1680
" "
1681
1682
#: bzrlib/builtins.py:2465
1683
msgid "Show the tree root directory."
1684
msgstr "Показать корневую директорию дерева."
1685
1686
#: bzrlib/builtins.py:2467
1687
msgid ""
1688
"The root is the nearest enclosing directory with a .bzr control\n"
1689
"directory."
1690
msgstr ""
1691
"Корень это ближайшая родительская директория с управляющей\n"
1692
"директорией .bzr."
1693
1694
#: bzrlib/builtins.py:2482
1695
msgid "The limit argument must be an integer."
1696
msgstr "Аргумент предела должен быть целым числом."
1697
1698
#: bzrlib/builtins.py:2490
1699
msgid "The levels argument must be an integer."
1700
msgstr "Аргументы пределов должны быть целыми числами."
1701
1702
#: bzrlib/builtins.py:2495
1703
msgid "Show historical log for a branch or subset of a branch."
1704
msgstr "Показать журнал истории ветви или подмножества ветви."
1705
1706
#: bzrlib/builtins.py:2497
1707
msgid ""
1708
"log is bzr's default tool for exploring the history of a branch.\n"
1709
"The branch to use is taken from the first parameter. If no parameters\n"
1710
"are given, the branch containing the working directory is logged.\n"
1711
"Here are some simple examples::"
1712
msgstr ""
1713
"log — это утилита bzr по умолчанию для просмотра истории ветви.\n"
1714
"Используемая ветвь определяется первым параметром. Если не задано\n"
1715
"параметров, выводится журнал ветви, содержащей рабочюю директорию.\n"
1716
"Вот несколько простых примеров::"
1717
1718
#: bzrlib/builtins.py:2502
1719
msgid ""
1720
" bzr log log the current branch\n"
1721
" bzr log foo.py log a file in its branch\n"
1722
" bzr log http://server/branch log a branch on a server"
1723
msgstr ""
1724
" bzr log журнал текущей ветви\n"
1725
" bzr log foo.py журнал файла в его ветви\n"
1726
" bzr log http://server/branch журнал ветви на сервере"
1727
1728
#: bzrlib/builtins.py:2506
1729
msgid ""
1730
"The filtering, ordering and information shown for each revision can\n"
1731
"be controlled as explained below. By default, all revisions are\n"
1732
"shown sorted (topologically) so that newer revisions appear before\n"
1733
"older ones and descendants always appear before ancestors. If displayed,\n"
1734
"merged revisions are shown indented under the revision in which they\n"
1735
"were merged."
1736
msgstr ""
1737
"Фильтрация, сортировка и отображение информации для каждой ревизии\n"
1738
"могут управляться, как объяснено ниже. По умолчанию, выводятся все\n"
1739
"ревизии отсортированные так, что более новые ревизии находятся выше\n"
1740
"более старых и потомки находятся выше предков. Если ревизия слияния\n"
1741
"отображаются, то они отображаются с отступом, относительно ревизии,\n"
1742
"в которой происходило слияние."
1743
1744
#: bzrlib/builtins.py:2513
1745
msgid ":Output control:"
1746
msgstr ":Управление выводом:"
1747
1748
#: bzrlib/builtins.py:2515
1749
msgid ""
1750
" The log format controls how information about each revision is\n"
1751
" displayed. The standard log formats are called ``long``, ``short``\n"
1752
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1753
" for more details on log formats."
1754
msgstr ""
1755
" Формат журнала определяет, как отображается информация о каждой\n"
1756
" ревизии. Стандартные форматы журнала называются «long», «short»\n"
1757
" и «line». По умолчание используется long. Подробности о форматах\n"
1758
" смотрите в «bzr help log-formats»."
1759
1760
#: bzrlib/builtins.py:2520
1761
msgid ""
1762
" The following options can be used to control what information is\n"
1763
" displayed::"
1764
msgstr ""
1765
" Следующие опции могут использоваться для управления отображением\n"
1766
" информации::"
1767
1768
#: bzrlib/builtins.py:2523
1769
msgid ""
1770
" -l N display a maximum of N revisions\n"
1771
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1772
" -v display a status summary (delta) for each revision\n"
1773
" -p display a diff (patch) for each revision\n"
1774
" --show-ids display revision-ids (and file-ids), not just revnos"
1775
msgstr ""
1776
" -l N выводить не больше N ревизий\n"
1777
" -n N выводить N уровней ревизий (0 для всех, 1 для сжатого)\n"
1778
" -v выводить статусные сообщения (delta) для каждой ревизии\n"
1779
" -p выводить различия diff для каждой ревизии\n"
1780
" --show-ids выводить id ревизий (и id файлов), не только номера ревизий"
1781
1782
#: bzrlib/builtins.py:2529
1783
msgid ""
1784
" Note that the default number of levels to display is a function of the\n"
1785
" log format. If the -n option is not used, the standard log formats show\n"
1786
" just the top level (mainline)."
1787
msgstr ""
1788
" Число уровней отображения по умолчанию зависит от формата журнала.\n"
1789
" Если используется не опция -n, стандартные форматы журнала показывают\n"
1790
" верхний уровень (основную линию)."
1791
1792
#: bzrlib/builtins.py:2533
1793
msgid ""
1794
" Status summaries are shown using status flags like A, M, etc. To see\n"
1795
" the changes explained using words like ``added`` and ``modified``\n"
1796
" instead, use the -vv option."
1797
msgstr ""
1798
" Описания статусов отображаются с помощью флагов A, M, и т.д. Чтобы\n"
1799
" увидеть изменения, описанные словами вроде «добавлены» и «изменены»,\n"
1800
" используйте опцию -vv."
1801
1802
#: bzrlib/builtins.py:2537
1803
msgid ":Ordering control:"
1804
msgstr ":Управление порядком:"
1805
1806
#: bzrlib/builtins.py:2539
1807
msgid ""
1808
" To display revisions from oldest to newest, use the --forward option.\n"
1809
" In most cases, using this option will have little impact on the total\n"
1810
" time taken to produce a log, though --forward does not incrementally\n"
1811
" display revisions like --reverse does when it can."
1812
msgstr ""
1813
" Чтобы вывести ревизии от старой до новой, используйте опцию --forward.\n"
1814
" В большинстве случаев, при использовании этой опции на создание журнала\n"
1815
" расходуется мало времени, хотя --forward не выводит ревизии по порядку,\n"
1816
" как это делает --reverse."
1817
1818
#: bzrlib/builtins.py:2544
1819
msgid ":Revision filtering:"
1820
msgstr ":Фильтрация ревизий:"
1821
1822
#: bzrlib/builtins.py:2546
1823
msgid ""
1824
" The -r option can be used to specify what revision or range of revisions\n"
1825
" to filter against. The various forms are shown below::"
1826
msgstr ""
1827
" Опцию -r можно использовать для указания ревизии или интервала ревизий\n"
1828
" для фильтрации. Различные формы показаны ниже::"
1829
1830
#: bzrlib/builtins.py:2549
1831
msgid ""
1832
" -rX display revision X\n"
1833
" -rX.. display revision X and later\n"
1834
" -r..Y display up to and including revision Y\n"
1835
" -rX..Y display from X to Y inclusive"
1836
msgstr ""
1837
" -rX вывести ревизию X\n"
1838
" -rX.. вывести ревизию X и более поздние\n"
1839
" -r..Y вывести до и включая ревизию Y\n"
1840
" -rX..Y вывести от X до Y включительно"
1841
1842
#: bzrlib/builtins.py:2554
1843
msgid ""
1844
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1845
" Some common examples are given below::"
1846
msgstr ""
1847
" Чтобы узнать, как указывать X и Y, смотрите «bzr help revisionspec».\n"
1848
" Ниже приведеные некоторые распространённые примеры::"
1849
1850
#: bzrlib/builtins.py:2557
1851
msgid ""
1852
" -r-1 show just the tip\n"
1853
" -r-10.. show the last 10 mainline revisions\n"
1854
" -rsubmit:.. show what's new on this branch\n"
1855
" -rancestor:path.. show changes since the common ancestor of this\n"
1856
" branch and the one at location path\n"
1857
" -rdate:yesterday.. show changes since yesterday"
1858
msgstr ""
1859
" -r-1 показать только верхушку\n"
1860
" -r-10.. показать последние 10 ревизий основной линии\n"
1861
" -rsubmit:.. показать, что нового в этой ветви\n"
1862
" -rancestor:путь.. показать изменения, начиная с общего предка\n"
1863
" этой ветви и указанной в пути\n"
1864
" -rdate:yesterday.. показать изменения со вчерашнего дня"
1865
1866
#: bzrlib/builtins.py:2564
1867
msgid ""
1868
" When logging a range of revisions using -rX..Y, log starts at\n"
1869
" revision Y and searches back in history through the primary\n"
1870
" (\"left-hand\") parents until it finds X. When logging just the\n"
1871
" top level (using -n1), an error is reported if X is not found\n"
1872
" along the way. If multi-level logging is used (-n0), X may be\n"
1873
" a nested merge revision and the log will be truncated accordingly."
1874
msgstr ""
1875
1876
#: bzrlib/builtins.py:2571
1877
msgid ":Path filtering:"
1878
msgstr ":Фильтрация пути:"
1879
1880
#: bzrlib/builtins.py:2573
1881
msgid ""
1882
" If parameters are given and the first one is not a branch, the log\n"
1883
" will be filtered to show only those revisions that changed the\n"
1884
" nominated files or directories."
1885
msgstr ""
1886
" Если заданы параметры и первый не является ветвью, будут отображаться\n"
1887
" только те ревизии, которые изменяли указанные файлы или директории."
1888
1889
#: bzrlib/builtins.py:2577
1890
msgid ""
1891
" Filenames are interpreted within their historical context. To log a\n"
1892
" deleted file, specify a revision range so that the file existed at\n"
1893
" the end or start of the range."
1894
msgstr ""
1895
" Имена файлов интерпретируются в историческом контексте. Чтобы вывести\n"
1896
" журнал для удалённого файла, укажите такой интервал ревизий, что файл\n"
1897
" существует от начала до конца интервала."
1898
1899
#: bzrlib/builtins.py:2581
1900
msgid ""
1901
" Historical context is also important when interpreting pathnames of\n"
1902
" renamed files/directories. Consider the following example:"
1903
msgstr ""
1904
" Исторический контекст также важен при интерпретации путей\n"
1905
" переименованных файлов и директорий. Рассмотрим следующий пример:"
1906
1907
#: bzrlib/builtins.py:2584
1908
msgid ""
1909
" * revision 1: add tutorial.txt\n"
1910
" * revision 2: modify tutorial.txt\n"
1911
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1912
msgstr ""
1913
" * ревизия 1: добавлен tutorial.txt\n"
1914
" * ревизия 2: изменён tutorial.txt\n"
1915
" * ревизия 3: переименован tutorial.txt в guide.txt; добавлен tutorial.txt"
1916
1917
#: bzrlib/builtins.py:2588
1918
msgid " In this case:"
1919
msgstr " В этом случае:"
1920
1921
#: bzrlib/builtins.py:2590
1922
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1923
msgstr ""
1924
" * «bzr log guide.txt» выведет журнал файла, добавленного в ревизии 1"
1925
1926
#: bzrlib/builtins.py:2592
1927
msgid ""
1928
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1929
msgstr ""
1930
" * «bzr log tutorial.txt» выведет журнал нового файла, добавленного\r\n"
1931
" в ревизии 3"
1932
1933
#: bzrlib/builtins.py:2594
1934
msgid ""
1935
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1936
" the original file in revision 2."
1937
msgstr ""
1938
" * «bzr log -r2 -p tutorial.txt» выведет изменения оригинального\n"
1939
" файла в ревизии 2."
1940
1941
#: bzrlib/builtins.py:2597
1942
msgid ""
1943
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1944
" was no file called guide.txt in revision 2."
1945
msgstr ""
1946
" * «bzr log -r2 -p guide.txt» выведет сообщение об ошибке, так как\n"
1947
" в ревизии 2 нет файла guide.txt."
1948
1949
#: bzrlib/builtins.py:2600
1950
msgid ""
1951
" Renames are always followed by log. By design, there is no need to\n"
1952
" explicitly ask for this (and no way to stop logging a file back\n"
1953
" until it was last renamed)."
1954
msgstr ""
1955
1956
#: bzrlib/builtins.py:2604
1957
msgid ":Other filtering:"
1958
msgstr ":Другая фильтрация:"
1959
1960
#: bzrlib/builtins.py:2606
1961
msgid ""
1962
" The --match option can be used for finding revisions that match a\n"
1963
" regular expression in a commit message, committer, author or bug.\n"
1964
" Specifying the option several times will match any of the supplied\n"
1965
" expressions. --match-author, --match-bugs, --match-committer and\n"
1966
" --match-message can be used to only match a specific field."
1967
msgstr ""
1968
" Опцию --match можно использовать для нахождения ревизий, удовлетворяющих\n"
1969
" регулярному выражению в сообщении, закрепляющем, авторе или ошибке.\n"
1970
" Опцию можно указать несколько раз и в этом случае будут выведены только\n"
1971
" ревизии, удовлетворяющие всем критериям. Для поиска по определённым\n"
1972
" полям можно использовать опции --match-author, --match-bugs,\n"
1973
" --match-committer и --match-message."
1974
1975
#: bzrlib/builtins.py:2612
1976
msgid ":Tips & tricks:"
1977
msgstr ":Советы и трюки:"
1978
1979
#: bzrlib/builtins.py:2614
1980
msgid ""
1981
" GUI tools and IDEs are often better at exploring history than command\n"
1982
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1983
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1984
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1985
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1986
msgstr ""
1987
" Чаще лучше просматривать историю с помощью графических утилит и IDE,\n"
1988
" например qlog, viz из qbzr или bzr-gtk, оболочку bzr-explorer, или\n"
1989
" веб-интерфейс Loggerhead. Смотрите руководство по модулям\n"
1990
" <http://doc.bazaar.canonical.com/plugins/en/> и\n"
1991
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1992
1993
#: bzrlib/builtins.py:2620
1994
msgid ""
1995
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1996
msgstr ""
1997
" Возможно, вы захотите добавить следующие псевдонимы в «bazaar.conf»::"
1998
1999
#: bzrlib/builtins.py:2622
2000
msgid ""
2001
" [ALIASES]\n"
2002
" tip = log -r-1\n"
2003
" top = log -l10 --line\n"
2004
" show = log -v -p"
2005
msgstr ""
2006
" [ALIASES]\n"
2007
" tip = log -r-1\n"
2008
" top = log -l10 --line\n"
2009
" show = log -v -p"
2010
2011
#: bzrlib/builtins.py:2627
2012
msgid ""
2013
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
2014
" will show the last 10 mainline revisions. To see the details of a\n"
2015
" particular revision X, ``bzr show -rX``."
2016
msgstr ""
2017
" Тогда «bzr tip» выведет последнюю ревизию, а «bzr top» — последние\n"
2018
" 10 ревизий основной линии. Чтобы просмотреть журнал определённой\n"
2019
" ревизии X, используйте «bzr show -rX»."
2020
2021
#: bzrlib/builtins.py:2631
2022
msgid ""
2023
" If you are interested in looking deeper into a particular merge X,\n"
2024
" use ``bzr log -n0 -rX``."
2025
msgstr ""
2026
" Если вы хотите подробно рассмотреть определённое слияние X,\n"
2027
" используйте «bzr log -n0 -rX»."
2028
2029
#: bzrlib/builtins.py:2634
2030
msgid ""
2031
" ``bzr log -v`` on a branch with lots of history is currently\n"
2032
" very slow. A fix for this issue is currently under development.\n"
2033
" With or without that fix, it is recommended that a revision range\n"
2034
" be given when using the -v option."
2035
msgstr ""
2036
" «bzr log -v» на ветви с большой историей на данный момент работает\n"
2037
" очень медленно. Сейчас ведётся работа над исправлением этого\n"
2038
" недостатка. Независимо от того, будет это исправлено или нет,\n"
2039
" рекомендуется задавать интервал ревизий с помощью опции -v."
2040
2041
#: bzrlib/builtins.py:2639
2042
msgid ""
2043
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
2044
" used to find revisions matching user names, commit messages, etc.\n"
2045
" Among other features, this plugin can find all revisions containing\n"
2046
" a list of words but not others."
2047
msgstr ""
2048
2049
#: bzrlib/builtins.py:2644
2050
msgid ""
2051
" When exploring non-mainline history on large projects with deep\n"
2052
" history, the performance of log can be greatly improved by installing\n"
2053
" the historycache plugin. This plugin buffers historical information\n"
2054
" trading disk space for faster speed."
2055
msgstr ""
2056
2057
#: bzrlib/builtins.py:2653
2058
msgid "Show from oldest to newest."
2059
msgstr "Выводить от старых к новым."
2060
2061
#: bzrlib/builtins.py:2656
2062
msgid "Show files changed in each revision."
2063
msgstr "Показывать файлы, изменённые в каждой ревизии."
2064
2065
#: bzrlib/builtins.py:2662
2066
msgid "Show just the specified revision. See also \"help revisionspec\"."
2067
msgstr "Показать только указанную ревизию. См. также «help revisionspec»."
2068
2069
#: bzrlib/builtins.py:2666
2070
msgid "What names to list as authors - first, all or committer."
2071
msgstr "Какие имена выводить, как авторов — first, all или committer."
2072
2073
#: bzrlib/builtins.py:2667
2074
msgid "Authors"
2075
msgstr "Авторы"
2076
2077
#: bzrlib/builtins.py:2672
2078
msgid "Number of levels to display - 0 for all, 1 for flat."
2079
msgstr "Число уровней для вывода — 0 для всех, 1 для плоского вывода."
2080
2081
#: bzrlib/builtins.py:2682
2082
msgid "Limit the output to the first N revisions."
2083
msgstr "Ограничить вывод лишь первыми N ревизиями."
2084
2085
#: bzrlib/builtins.py:2687
2086
msgid "Show changes made in each revision as a patch."
2087
msgstr "Показать изменения, сделанные в каждой ревизии, в виде патча."
2088
2089
#: bzrlib/builtins.py:2689
2090
msgid "Show merged revisions like --levels 0 does."
2091
msgstr "Показывать слияния, как это делает --levels 0."
2092
2093
#: bzrlib/builtins.py:2693
2094
msgid "Do not report commits with more than one parent."
2095
msgstr "Не сообщать о закреплениях с более, чем одним родителем."
2096
2097
#: bzrlib/builtins.py:2695
2098
msgid ""
2099
"Display only the revisions that are not part of both ancestries (require -"
2100
"rX..Y)."
2101
msgstr ""
2102
"Показать только ревизии, которые не являются частью обоих предков (требует -"
2103
"rX..Y)."
2104
2105
#: bzrlib/builtins.py:2699
2106
msgid "Show digital signature validity."
2107
msgstr "Показать корректность цифровой подписи."
2108
2109
#: bzrlib/builtins.py:2702
2110
msgid "Show revisions whose properties match this expression."
2111
msgstr "Показывать ревизии, свойства которых удовлетворяют этому выражению."
2112
2113
#: bzrlib/builtins.py:2706
2114
msgid "Show revisions whose message matches this expression."
2115
msgstr ""
2116
"Показывать ревизии, комментарий которых удовлетворяет этому выражению."
2117
2118
#: bzrlib/builtins.py:2710
2119
msgid "Show revisions whose committer matches this expression."
2120
msgstr ""
2121
"Показывать ревизии, закрепитель которых удовлетворяет этому выражению."
2122
2123
#: bzrlib/builtins.py:2714
2124
msgid "Show revisions whose authors match this expression."
2125
msgstr "Показывать ревизии, авторы которых удовлетворяют этому выражению."
2126
2127
#: bzrlib/builtins.py:2718
2128
msgid "Show revisions whose bugs match this expression."
2129
msgstr "Показывать ревизии, ошибки которых удовлетворяют этому выражению."
2130
2131
#: bzrlib/builtins.py:2772
2132
msgid "--exclude-common-ancestry requires -r with two revisions"
2133
msgstr "--exclude-common-ancestry требует -r с двумя ревизиями"
2134
2135
#: bzrlib/builtins.py:2800
2136
#, python-format
2137
msgid "Path unknown at end or start of revision range: %s"
2138
msgstr "Неизвестный путь в начале или конце интервала ревизий: %s"
2139
2140
#: bzrlib/builtins.py:2917
2141
#, python-format
2142
msgid "bzr %s doesn't accept two revisions in different branches."
2143
msgstr "bzr %s не принимает две ревизии в различных ветвях."
2144
2145
#: bzrlib/builtins.py:2933
2146
#, python-format
2147
msgid "bzr %s --revision takes one or two values."
2148
msgstr "bzr %s --revision принимает одно или два значения."
2149
2150
#: bzrlib/builtins.py:2978
2151
msgid ""
2152
"List files in a tree.\n"
2153
" "
2154
msgstr ""
2155
"Вывести список файлов в дереве.\n"
2156
" "
2157
2158
#: bzrlib/builtins.py:2987
2159
msgid "Recurse into subdirectories."
2160
msgstr "Рекурсивно входить в поддиректории."
2161
2162
#: bzrlib/builtins.py:2989
2163
msgid "Print paths relative to the root of the branch."
2164
msgstr "Выводить пути относительно корня ветви."
2165
2166
#: bzrlib/builtins.py:2991
2167
msgid "Print unknown files."
2168
msgstr "Выводить неизвестные файлы."
2169
2170
#: bzrlib/builtins.py:2992
2171
msgid "Print versioned files."
2172
msgstr "Выводить файлы под контролем системы версий."
2173
2174
#: bzrlib/builtins.py:2995
2175
msgid "Print ignored files."
2176
msgstr "Выводить игнорируемые файлы."
2177
2178
#: bzrlib/builtins.py:2997
2179
msgid "List entries of a particular kind: file, directory, symlink."
2180
msgstr "Выводить файлы определённого типа: file, directory, symlink."
2181
2182
#: bzrlib/builtins.py:3010
2183
msgid "invalid kind specified"
2184
msgstr "указан неверный вид файла"
2185
2186
#: bzrlib/builtins.py:3013
2187
msgid "Cannot set both --verbose and --null"
2188
msgstr "Нельзя установить оба --verbose и --null"
2189
2190
#: bzrlib/builtins.py:3022
2191
msgid "cannot specify both --from-root and PATH"
2192
msgstr "нельзя указать оба --from-root и PATH"
2193
2194
#: bzrlib/builtins.py:3109
2195
msgid "Ignore specified files or patterns."
2196
msgstr "Игнорировать указанные файлы или шаблоны."
2197
2198
#: bzrlib/builtins.py:3111
2199
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2200
msgstr "Смотрите подробности о синтаксисе шаблонов в «bzr help patterns»."
2201
2202
#: bzrlib/builtins.py:3113
2203
msgid ""
2204
"If a .bzrignore file does not exist, the ignore command\n"
2205
"will create one and add the specified files or patterns to the newly\n"
2206
"created file. The ignore command will also automatically add the \n"
2207
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2208
"the use of the ignore command will require an explicit add command."
2209
msgstr ""
2210
"Если файл .bzrignore не существует, команда ignore создаст его\n"
2211
"и добавит указанные файлы или шаблоны к только что созданному\n"
2212
"файлу. Команда ignore также автоматически добавит файл .bzrignore\n"
2213
"к системе версий. Создание файла .bzrignore без использования\n"
2214
"команды ignore потребует явного добавления командой add."
2215
2216
#: bzrlib/builtins.py:3119
2217
msgid ""
2218
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2219
"After adding, editing or deleting that file either indirectly by\n"
2220
"using this command or directly by using an editor, be sure to commit\n"
2221
"it."
2222
msgstr ""
2223
"Чтобы удалить шаблоны из списка игнорируемых файлов, отредактируйте\n"
2224
"файл .bzrignore. После добавления, редактирования или удаления этого\n"
2225
"файла, как неявно с помощью этой команды, так и явно при помощи\n"
2226
"редактора, не забывайте закреплять его."
2227
2228
#: bzrlib/builtins.py:3124
2229
msgid ""
2230
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2231
"the global ignore file can be found in the application data directory as\n"
2232
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2233
"Global ignores are not touched by this command. The global ignore file\n"
2234
"can be edited directly using an editor."
2235
msgstr ""
2236
"Bazaar также поддерживает глобальный игнорирования по пути "
2237
"~/.bazaar/ignore.\n"
2238
"На Windows глобальный файл игнорирования может быть найден в директории\n"
2239
"данных приложений. Ищите пути вроде\n"
2240
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2241
"Эта команда не изменяет глобальный файл игнорирования. Он может быть\n"
2242
"отредактирован вручную с помощью текстового редактора."
2243
2244
#: bzrlib/builtins.py:3130
2245
msgid ""
2246
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2247
"precedence over regular ignores. Such exceptions are used to specify\n"
2248
"files that should be versioned which would otherwise be ignored."
2249
msgstr ""
2250
"Шаблоны, начинающиеся с '!', являются исключениями к шаблонам игнорирования\n"
2251
"и имеют приоритет над обычными шаблонами. Такие исключения используются для\n"
2252
"указания файлов, которые должны попасть под контроль системы версий, но\n"
2253
"по умолчанию игнорируются."
2254
2255
#: bzrlib/builtins.py:3134
2256
msgid ""
2257
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2258
"precedence over the '!' exception patterns."
2259
msgstr ""
2260
"Шаблоны, начинающиеся с '!!' ведут себя как обычные шаблоны, но имеют\n"
2261
"приоритет над шаблонами исключений '!'."
2262
2263
#: bzrlib/builtins.py:3137
2264
msgid ""
2265
":Notes: \n"
2266
" \n"
2267
"* Ignore patterns containing shell wildcards must be quoted from\n"
2268
" the shell on Unix."
2269
msgstr ""
2270
":Замечания: \n"
2271
" \n"
2272
"* Шаблоны игнорирования, содержащие специальные символы оболочки,\n"
2273
" должны быть заключены в кавычки при указании в командной строке."
2274
2275
#: bzrlib/builtins.py:3142
2276
msgid ""
2277
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2278
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2279
msgstr ""
2280
"* Шаблоны игнорирования, начинающиеся с \"#\", являются комментариями.\n"
2281
" Чтобы добавить шаблон, начинающийся с этого символа, используйте\n"
2282
" префикс \"RE:\"."
2283
2284
#: bzrlib/builtins.py:3145
2285
msgid ""
2286
":Examples:\n"
2287
" Ignore the top level Makefile::"
2288
msgstr ""
2289
":Примеры:\n"
2290
" Игнорировать файл Makefile на верхнем уровне::"
2291
2292
#: bzrlib/builtins.py:3148
2293
msgid " bzr ignore ./Makefile"
2294
msgstr " bzr ignore ./Makefile"
2295
2296
#: bzrlib/builtins.py:3150
2297
msgid " Ignore .class files in all directories...::"
2298
msgstr " Игнорировать файлы .class во всех директориях...::"
2299
2300
#: bzrlib/builtins.py:3152
2301
msgid " bzr ignore \"*.class\""
2302
msgstr " bzr ignore \"*.class\""
2303
2304
#: bzrlib/builtins.py:3154
2305
msgid " ...but do not ignore \"special.class\"::"
2306
msgstr " ...но не игнорировать \"special.class\"::"
2307
2308
#: bzrlib/builtins.py:3156
2309
msgid " bzr ignore \"!special.class\""
2310
msgstr " bzr ignore \"!special.class\""
2311
2312
#: bzrlib/builtins.py:3158
2313
msgid " Ignore files whose name begins with the \"#\" character::"
2314
msgstr " Игнорировать файлы, начинающиеся с символа \"#\"::"
2315
2316
#: bzrlib/builtins.py:3160
2317
msgid " bzr ignore \"RE:^#\""
2318
msgstr " bzr ignore \"RE:^#\""
2319
2320
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2321
msgid " Ignore .o files under the lib directory::"
2322
msgstr " Игнорировать файлы .o в директории lib::"
2323
2324
#: bzrlib/builtins.py:3164
2325
msgid " bzr ignore \"lib/**/*.o\""
2326
msgstr " bzr ignore \"lib/**/*.o\""
2327
2328
#: bzrlib/builtins.py:3168
2329
msgid " bzr ignore \"RE:lib/.*\\.o\""
2330
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2331
2332
#: bzrlib/builtins.py:3170
2333
msgid " Ignore everything but the \"debian\" toplevel directory::"
2334
msgstr " Игнорировать всё, кроме верхней директории \"debian\"::"
2335
2336
#: bzrlib/builtins.py:3172
2337
msgid ""
2338
" bzr ignore \"RE:(?!debian/).*\"\n"
2339
" \n"
2340
" Ignore everything except the \"local\" toplevel directory,\n"
2341
" but always ignore autosave files ending in ~, even under local/::\n"
2342
" \n"
2343
" bzr ignore \"*\"\n"
2344
" bzr ignore \"!./local\"\n"
2345
" bzr ignore \"!!*~\""
2346
msgstr ""
2347
" bzr ignore \"RE:(?!debian/).*\"\n"
2348
" \n"
2349
" Игнорировать всё, кроме верхней директории \"local\",\n"
2350
" но всегда игнорировать файлы, заканчивающиеся на ~, даже в local/::\n"
2351
" \n"
2352
" bzr ignore \"*\"\n"
2353
" bzr ignore \"!./local\"\n"
2354
" bzr ignore \"!!*~\""
2355
2356
#: bzrlib/builtins.py:3186
2357
msgid "Display the default ignore rules that bzr uses."
2358
msgstr "Вывести правила игнорирования, которые bzr использует по умолчанию."
2359
2360
#: bzrlib/builtins.py:3198
2361
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2362
msgstr ""
2363
"Для ignore требуется как минимум одно из NAME_PATTERN или --default-rules."
2364
2365
#: bzrlib/builtins.py:3209
2366
#, python-format
2367
msgid "Invalid ignore pattern found. %s"
2368
msgid_plural "Invalid ignore patterns found. %s"
2369
msgstr[0] "Найден некорректный шаблон игнорирования. %s"
2370
msgstr[1] "Найдены некорректные шаблоны игнорирования. %s"
2371
msgstr[2] "Найдены некорректные шаблоны игнорирования. %s"
2372
2373
#: bzrlib/builtins.py:3218
2374
msgid "NAME_PATTERN should not be an absolute path"
2375
msgstr "NAME_PATTERN не должен быть абсолютным путём"
2376
2377
#: bzrlib/builtins.py:3231
2378
#, python-format
2379
msgid ""
2380
"Warning: the following files are version controlled and match your ignore "
2381
"pattern:\n"
2382
"%s\n"
2383
"These files will continue to be version controlled unless you 'bzr remove' "
2384
"them.\n"
2385
msgstr ""
2386
"Предупреждение: следующие файлы под контролем системы версий и удовлетворяют "
2387
"шаблонам игнорирования:\n"
2388
"%s\n"
2389
"Эти файлы будут продолжать под контролем системы версий, пока вы не "
2390
"выполните 'bzr remove'.\n"
2391
2392
#: bzrlib/builtins.py:3238
2393
msgid "List ignored files and the patterns that matched them."
2394
msgstr "Вывести игнорируемые файлы и шаблоны, которым они удовлетворяют."
2395
2396
#: bzrlib/builtins.py:3240
2397
msgid ""
2398
"List all the ignored files and the ignore pattern that caused the file to\n"
2399
"be ignored."
2400
msgstr ""
2401
"Вывести все игнорируемые файлы и шаблоны игнорирования, из-за которых эти\n"
2402
"файлы игнорируются."
2403
2404
#: bzrlib/builtins.py:3243
2405
msgid "Alternatively, to list just the files::"
2406
msgstr "Альтернативно, чтобы вывести только файлы::"
2407
2408
#: bzrlib/builtins.py:3245
2409
msgid " bzr ls --ignored"
2410
msgstr " bzr ls --ignored"
2411
2412
#: bzrlib/builtins.py:3279
2413
#, python-format
2414
msgid "not a valid revision-number: %r"
2415
msgstr "некорректный номер ревизии: %r"
2416
2417
#: bzrlib/builtins.py:3286
2418
msgid ""
2419
"Export current or past revision to a destination directory or archive."
2420
msgstr ""
2421
"Экспортировать текущую или прошлую ревизию в директорию назначения\r\n"
2422
"или архив."
2423
2424
#: bzrlib/builtins.py:3288
2425
msgid "If no revision is specified this exports the last committed revision."
2426
msgstr "Если ревизия не указана, экспортирует последнюю ревизию."
2427
2428
#: bzrlib/builtins.py:3290
2429
msgid ""
2430
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2431
"given, try to find the format with the extension. If no extension\n"
2432
"is found exports to a directory (equivalent to --format=dir)."
2433
msgstr ""
2434
"Формат может быть именем экспортируемого формата, как tar, tgz, tbz2.\n"
2435
"Если не указан, формат определяется по расширению. Если расширение\n"
2436
"отсутствует, экспортирует в директорию (эквивалентно --format=dir)."
2437
2438
#: bzrlib/builtins.py:3294
2439
msgid ""
2440
"If root is supplied, it will be used as the root directory inside\n"
2441
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2442
"to the exported filename. The root option has no effect for 'dir' format."
2443
msgstr ""
2444
"Если указан root, он будет использоваться как корневая директория\n"
2445
"внутри форматов-контейнеров (tar, zip, и т.д.). Если не указан, по\n"
2446
"умолчанию используется имя файла для эскпорта. Опция root не имеет\n"
2447
"эффекта для формата 'dir'."
2448
2449
#: bzrlib/builtins.py:3298
2450
msgid ""
2451
"If branch is omitted then the branch containing the current working\n"
2452
"directory will be used."
2453
msgstr ""
2454
"Если ветвь опущена, используется ветвь, содержащая текущую рабочую\n"
2455
"директорию."
2456
2457
#: bzrlib/builtins.py:3301
2458
msgid ""
2459
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2460
msgstr ""
2461
"Замечание: Экспорт в zip деревьев с именами файлов, содержащими не-ASCII\r\n"
2462
"символы, не поддерживается."
2463
2464
#: bzrlib/builtins.py:3303
2465
msgid ""
2466
" ================= =========================\n"
2467
" Supported formats Autodetected by extension\n"
2468
" ================= =========================\n"
2469
" dir (none)\n"
2470
" tar .tar\n"
2471
" tbz2 .tar.bz2, .tbz2\n"
2472
" tgz .tar.gz, .tgz\n"
2473
" zip .zip\n"
2474
" ================= ========================="
2475
msgstr ""
2476
" ====================== =============================\n"
2477
" Поддерживаемые форматы Автоопределение по расширению\n"
2478
" ====================== =============================\n"
2479
" dir (нет)\n"
2480
" tar .tar\n"
2481
" tbz2 .tar.bz2, .tbz2\n"
2482
" tgz .tar.gz, .tgz\n"
2483
" zip .zip\n"
2484
" ====================== ============================="
2485
2486
#: bzrlib/builtins.py:3317
2487
msgid "Type of file to export to."
2488
msgstr "Тип файла для экспорта."
2489
2490
#: bzrlib/builtins.py:3320
2491
msgid "Apply content filters to export the convenient form."
2492
msgstr "Применить фильтры содержимого для экспорта в удобной форме."
2493
2494
#: bzrlib/builtins.py:3324
2495
msgid "Name of the root directory inside the exported file."
2496
msgstr "Имя корневой директории внутри экспортируемого файла."
2497
2498
#: bzrlib/builtins.py:3326
2499
msgid ""
2500
"Set modification time of files to that of the last revision in which it was "
2501
"changed."
2502
msgstr ""
2503
"Установить время изменения файлов на время последней ревизии, в которой они "
2504
"были изменены."
2505
2506
#: bzrlib/builtins.py:3329
2507
msgid ""
2508
"Export the working tree contents rather than that of the last revision."
2509
msgstr "Экспортировать содержимое рабочего дерева вместо последней ревизии."
2510
2511
#: bzrlib/builtins.py:3348
2512
msgid "--uncommitted requires a working tree"
2513
msgstr "--uncommitted требует рабочее дерево"
2514
2515
#: bzrlib/builtins.py:3357
2516
#, python-format
2517
msgid "Unsupported export format: %s"
2518
msgstr "Неподдерживаемый формат экспорта: %s"
2519
2520
#: bzrlib/builtins.py:3361
2521
msgid ""
2522
"Write the contents of a file as of a given revision to standard output."
2523
msgstr ""
2524
"Вывести содержимое файла из определённой ревизии на стандартный вывод."
2525
2526
#: bzrlib/builtins.py:3363
2527
msgid "If no revision is nominated, the last revision is used."
2528
msgstr "Если ревизия не указана, используется последняя."
2529
2530
#: bzrlib/builtins.py:3365
2531
msgid ""
2532
"Note: Take care to redirect standard output when using this command on a\n"
2533
"binary file."
2534
msgstr ""
2535
"Замечание: Не забывайте перенаправлять стандартный вывод при использовании\n"
2536
"этой команды на двоичном файле."
2537
2538
#: bzrlib/builtins.py:3371
2539
msgid "The path name in the old tree."
2540
msgstr "Имя пути в старом дереве."
2541
2542
#: bzrlib/builtins.py:3372
2543
msgid "Apply content filters to display the convenience form."
2544
msgstr "Применить фильтры содержимого для отображения в удобной форме."
2545
2546
#: bzrlib/builtins.py:3383
2547
msgid "bzr cat --revision takes exactly one revision specifier"
2548
msgstr "bzr cat --revision принимает ровно один спецификатор ревизии"
2549
2550
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2551
msgid "{0!r} is not present in revision {1}"
2552
msgstr "{0!r} не представлен в ревизии {1}"
2553
2554
#: bzrlib/builtins.py:3443
2555
msgid "Commit changes into a new revision."
2556
msgstr "Закрепить изменения в новой ревизии."
2557
2558
#: bzrlib/builtins.py:3445
2559
msgid ""
2560
"An explanatory message needs to be given for each commit. This is\n"
2561
"often done by using the --message option (getting the message from the\n"
2562
"command line) or by using the --file option (getting the message from\n"
2563
"a file). If neither of these options is given, an editor is opened for\n"
2564
"the user to enter the message. To see the changed files in the\n"
2565
"boilerplate text loaded into the editor, use the --show-diff option."
2566
msgstr ""
2567
2568
#: bzrlib/builtins.py:3452
2569
msgid ""
2570
"By default, the entire tree is committed and the person doing the\n"
2571
"commit is assumed to be the author. These defaults can be overridden\n"
2572
"as explained below."
2573
msgstr ""
2574
"По умолчанию, закрепляется всё дерево и закрепляющий считается автором.\n"
2575
"Эти умолчания могут быть перезаписаны, как объяснено ниже."
2576
2577
#: bzrlib/builtins.py:3456
2578
msgid ":Selective commits:"
2579
msgstr ":Выборочные закрепления:"
2580
2581
#: bzrlib/builtins.py:3458
2582
msgid ""
2583
" If selected files are specified, only changes to those files are\n"
2584
" committed. If a directory is specified then the directory and\n"
2585
" everything within it is committed."
2586
msgstr ""
2587
" Если указаны файлы, закрепить только изменения в этих файлах.\n"
2588
" Если указана директория, то закрепляется директория и всё её\n"
2589
" содержимое."
2590
2591
#: bzrlib/builtins.py:3462
2592
msgid ""
2593
" When excludes are given, they take precedence over selected files.\n"
2594
" For example, to commit only changes within foo, but not changes\n"
2595
" within foo/bar::"
2596
msgstr ""
2597
" Когда даны исключения, они имеют приоритет над выбранными файлами.\n"
2598
" Например, чтобы закрепить изменения внутри foo, но не изменения\n"
2599
" в foo/bar::"
2600
2601
#: bzrlib/builtins.py:3466
2602
msgid " bzr commit foo -x foo/bar"
2603
msgstr " bzr commit foo -x foo/bar"
2604
2605
#: bzrlib/builtins.py:3468
2606
msgid " A selective commit after a merge is not yet supported."
2607
msgstr " Выборочные закрепления после слияния пока не поддерживаются."
2608
2609
#: bzrlib/builtins.py:3470
2610
msgid ":Custom authors:"
2611
msgstr ":Выбор автора:"
2612
2613
#: bzrlib/builtins.py:3472
2614
msgid ""
2615
" If the author of the change is not the same person as the committer,\n"
2616
" you can specify the author's name using the --author option. The\n"
2617
" name should be in the same format as a committer-id, e.g.\n"
2618
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2619
" the change you can specify the option multiple times, once for each\n"
2620
" author."
2621
msgstr ""
2622
" Если автор изменения не тот же самый человек, что и закрепляющий,\n"
2623
" вы можете указать имя автора, используя опцию --author. Имя должно\n"
2624
" быть в том же формате, что и committer-id, например\n"
2625
" \"John Doe <jdoe@example.com>\". Если в изменении участвовал более,\n"
2626
" чем один автор, вы можете указать эту опцию несколько раз."
2627
2628
#: bzrlib/builtins.py:3479
2629
msgid ":Checks:"
2630
msgstr ":Проверки:"
2631
2632
#: bzrlib/builtins.py:3481
2633
msgid ""
2634
" A common mistake is to forget to add a new file or directory before\n"
2635
" running the commit command. The --strict option checks for unknown\n"
2636
" files and aborts the commit if any are found. More advanced pre-commit\n"
2637
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2638
" for details."
2639
msgstr ""
2640
" Распространённой ошибкой является забыть добавить новый файл перед\n"
2641
" запуском команды commit. Опция --strict прерывает закрепление, если\n"
2642
" присутствуют неизвестные файлы. Более продвинутые проверки могут\n"
2643
" быть реализованы определением обработчиков. Подробности можно найти,\n"
2644
" выполнив команду ``bzr help hooks''."
2645
2646
#: bzrlib/builtins.py:3487
2647
msgid ":Things to note:"
2648
msgstr ":На заметку:"
2649
2650
#: bzrlib/builtins.py:3489
2651
msgid ""
2652
" If you accidentially commit the wrong changes or make a spelling\n"
2653
" mistake in the commit message say, you can use the uncommit command\n"
2654
" to undo it. See ``bzr help uncommit`` for details."
2655
msgstr ""
2656
" Если вы случайно закрепили неверные изменения или допустили орфо-\n"
2657
" графическую ошибку в сообщении, вы можете использовать команду\n"
2658
" uncommit, чтобы отменить последнее закрепление. Подробности смотрите\n"
2659
" в «bzr help uncommit»."
2660
2661
#: bzrlib/builtins.py:3493
2662
msgid ""
2663
" Hooks can also be configured to run after a commit. This allows you\n"
2664
" to trigger updates to external systems like bug trackers. The --fixes\n"
2665
" option can be used to record the association between a revision and\n"
2666
" one or more bugs. See ``bzr help bugs`` for details."
2667
msgstr ""
2668
2669
#: bzrlib/builtins.py:3503
2670
msgid "Do not consider changes made to a given path."
2671
msgstr "Не рассматривать изменения, сделанные в заданном пути."
2672
2673
#: bzrlib/builtins.py:3506
2674
msgid "Description of the new revision."
2675
msgstr "Описание новой ревизии."
2676
2677
#: bzrlib/builtins.py:3509
2678
msgid "Commit even if nothing has changed."
2679
msgstr "Закрепить, даже если ничего не изменилось."
2680
2681
#: bzrlib/builtins.py:3513
2682
msgid "Take commit message from this file."
2683
msgstr "Взять сообщение о закреплении из этого файла."
2684
2685
#: bzrlib/builtins.py:3515
2686
msgid "Refuse to commit if there are unknown files in the working tree."
2687
msgstr ""
2688
"Отказываться закреплять, если в рабочем дереве есть неизвестные файлы."
2689
2690
#: bzrlib/builtins.py:3518
2691
msgid ""
2692
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2693
"08:00:00 +0100'."
2694
msgstr ""
2695
"Вручную установить время закрепления, используя формат даты закрепления, "
2696
"напр. '2009-10-10 08:00:00 +0100'."
2697
2698
#: bzrlib/builtins.py:3521
2699
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2700
msgstr ""
2701
"Отметить ошибку, как исправленную в этой ревизии (см. «bzr help bugs»)."
2702
2703
#: bzrlib/builtins.py:3524
2704
msgid "Set the author's name, if it's different from the committer."
2705
msgstr "Установить имя автора, если оно отличается от имени закрепляющего."
2706
2707
#: bzrlib/builtins.py:3527
2708
msgid ""
2709
"Perform a local commit in a bound branch. Local commits are not pushed to "
2710
"the master branch until a normal commit is performed."
2711
msgstr ""
2712
"Совершить локальное закрепление в связанную ветвь. Локальные закрепления не "
2713
"выгружаются в основную ветвь до тех пор, пока не совершено нормальное "
2714
"закрепление."
2715
2716
#: bzrlib/builtins.py:3533
2717
msgid ""
2718
"When no message is supplied, show the diff along with the status summary in "
2719
"the message editor."
2720
msgstr ""
2721
"Если не указано сообщение, показывать изменения формате diff вместе с "
2722
"обзором состояния в редакторе сообщения."
2723
2724
#: bzrlib/builtins.py:3536
2725
msgid ""
2726
"When committing to a foreign version control system do not push data that "
2727
"can not be natively represented."
2728
msgstr ""
2729
"При закреплении в иной системе контроля версий, не выгружать данные, которые "
2730
"нельзя в ней представить."
2731
2732
#: bzrlib/builtins.py:3554
2733
#, python-format
2734
msgid ""
2735
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2736
"default bug tracker using the `bugtracker` option.\n"
2737
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2738
msgstr ""
2739
"Для ошибки %s не указан трекер. Используйте форму 'tracker:id' или укажите "
2740
"систему трекинга ошибок по умолчанию, используя опцию `bugtracker`.\n"
2741
"Больше информации об этом можно узнать, выполнив «bzr help bugs». "
2742
"Закрепление отклонено."
2743
2744
#: bzrlib/builtins.py:3563
2745
#, python-format
2746
msgid ""
2747
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2748
"for more information on this feature.\n"
2749
"Commit refused."
2750
msgstr ""
2751
"Некорректная ошибка %s. Должна быть в формате 'tracker:id'. Больше "
2752
"информации об этом можно узнать, выполнив «bzr help bugs».\n"
2753
"Закрепление отклонено."
2754
2755
#: bzrlib/builtins.py:3572
2756
#, python-format
2757
msgid "Unrecognized bug %s. Commit refused."
2758
msgstr "Ошибка %s не распознана. Закрепление отклонено."
2759
2760
#: bzrlib/builtins.py:3575
2761
#, python-format
2762
msgid ""
2763
"%s\n"
2764
"Commit refused."
2765
msgstr ""
2766
"%s\n"
2767
"Закрепление отклонено."
2768
2769
#: bzrlib/builtins.py:3599
2770
msgid "Could not parse --commit-time: "
2771
msgstr "Не удалось разобрать --commit-time: "
2772
2773
#: bzrlib/builtins.py:3639
2774
msgid "please specify either --message or --file"
2775
msgstr "укажите либо --message, либо --file"
2776
2777
#: bzrlib/builtins.py:3668
2778
msgid "please specify a commit message with either --message or --file"
2779
msgstr "укажите сообщение о закреплении, используя --message либо --file"
2780
2781
#: bzrlib/builtins.py:3671
2782
msgid ""
2783
"Empty commit message specified. Please specify a commit message with either -"
2784
"-message or --file or leave a blank message with --message \"\"."
2785
msgstr ""
2786
"Указано пустое сообщение о закреплении. Пожалуйста, укажите сообщение опцией "
2787
"--message либо --file или оставьте пустым, указав --message \"\"."
2788
2789
#: bzrlib/builtins.py:3691
2790
msgid ""
2791
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2792
"-unchanged to force an empty commit."
2793
msgstr ""
2794
"Нет изменений для закрепления. Добавьте файлы, которые вы хотите закрепить, "
2795
"командой 'bzr add', или используйте --unchanged, чтобы принудительно сделать "
2796
"пустое закрепление."
2797
2798
#: bzrlib/builtins.py:3695
2799
msgid ""
2800
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2801
"resolve FILE\" to resolve."
2802
msgstr ""
2803
"В рабочем дереве обнаружены конфликты. Выполните «bzr conflicts», чтобы "
2804
"вывести список конфликтов и «bzr resolve ФАЙЛ» для исправления."
2805
2806
#: bzrlib/builtins.py:3699
2807
msgid "Commit refused because there are unknown files in the working tree."
2808
msgstr "Закрепление отклонено, поскольку в рабочем дереве неизвестные файлы."
2809
2810
#: bzrlib/builtins.py:3702
2811
msgid ""
2812
"\n"
2813
"To commit to master branch, run update and then commit.\n"
2814
"You can also pass --local to commit to continue working disconnected."
2815
msgstr ""
2816
2817
#: bzrlib/builtins.py:3710
2818
msgid ""
2819
"Validate working tree structure, branch consistency and repository history."
2820
msgstr ""
2821
2822
#: bzrlib/builtins.py:3712
2823
msgid ""
2824
"This command checks various invariants about branch and repository storage\n"
2825
"to detect data corruption or bzr bugs."
2826
msgstr ""
2827
2828
#: bzrlib/builtins.py:3715
2829
msgid ""
2830
"The working tree and branch checks will only give output if a problem is\n"
2831
"detected. The output fields of the repository check are:"
2832
msgstr ""
2833
"Проверки рабочего дерева и ветви выведут что-либо только в случае\n"
2834
"обнаружения проблемы. Поля вывода проверки репозитория следующие:"
2835
2836
#: bzrlib/builtins.py:3718
2837
msgid ""
2838
"revisions\n"
2839
" This is just the number of revisions checked. It doesn't\n"
2840
" indicate a problem."
2841
msgstr ""
2842
"ревизии\n"
2843
" Это просто число проверенных ревизий. Оно не указывает\n"
2844
" на проблему."
2845
2846
#: bzrlib/builtins.py:3722
2847
msgid ""
2848
"versionedfiles\n"
2849
" This is just the number of versionedfiles checked. It\n"
2850
" doesn't indicate a problem."
2851
msgstr ""
2852
"версифицированные файлы\n"
2853
" Это просто число проверенных файлов под контролем системы\n"
2854
" версий. Оно не указывает на проблему."
2855
2856
#: bzrlib/builtins.py:3726
2857
msgid ""
2858
"unreferenced ancestors\n"
2859
" Texts that are ancestors of other texts, but\n"
2860
" are not properly referenced by the revision ancestry. This is a\n"
2861
" subtle problem that Bazaar can work around."
2862
msgstr ""
2863
"предки без ссылок\n"
2864
" Тексты, являющиеся предками других текстов, но не имеющие\n"
2865
" корректных ссылок в истории ревизии. Это небольшая\n"
2866
" проблема, с которой Bazaar может разобраться."
2867
2868
#: bzrlib/builtins.py:3731
2869
msgid ""
2870
"unique file texts\n"
2871
" This is the total number of unique file contents\n"
2872
" seen in the checked revisions. It does not indicate a problem."
2873
msgstr ""
2874
"уникальные тексты файлов\n"
2875
" Это общее число уникального содержимого файлов, встреченного\n"
2876
" в проверенных ревизиях. Оно не указывает на проблему."
2877
2878
#: bzrlib/builtins.py:3735
2879
msgid ""
2880
"repeated file texts\n"
2881
" This is the total number of repeated texts seen\n"
2882
" in the checked revisions. Texts can be repeated when their file\n"
2883
" entries are modified, but the file contents are not. It does not\n"
2884
" indicate a problem."
2885
msgstr ""
2886
"повторяемые тексты файлов\n"
2887
" Это общее число повторяемых текстов, встреченных\n"
2888
" в проверенных ревизиях. Тексты могут повторяться, если записи\n"
2889
" файлов изменились, но их содержимое осталось прежним. Оно не\n"
2890
" указывает на проблему."
2891
2892
#: bzrlib/builtins.py:3741
2893
msgid ""
2894
"If no restrictions are specified, all Bazaar data that is found at the "
2895
"given\n"
2896
"location will be checked."
2897
msgstr ""
2898
2899
#: bzrlib/builtins.py:3746
2900
msgid " Check the tree and branch at 'foo'::"
2901
msgstr " Проверить рабочее дерево и ветвь в 'foo'::"
2902
2903
#: bzrlib/builtins.py:3748
2904
msgid " bzr check --tree --branch foo"
2905
msgstr " bzr check --tree --branch foo"
2906
2907
#: bzrlib/builtins.py:3750
2908
msgid " Check only the repository at 'bar'::"
2909
msgstr " Проверить только репозиторий в 'bar'::"
2910
2911
#: bzrlib/builtins.py:3752
2912
msgid " bzr check --repo bar"
2913
msgstr " bzr check --repo bar"
2914
2915
#: bzrlib/builtins.py:3754
2916
msgid " Check everything at 'baz'::"
2917
msgstr " Проверить всё в 'baz'::"
2918
2919
#: bzrlib/builtins.py:3756
2920
msgid " bzr check baz"
2921
msgstr " bzr check baz"
2922
2923
#: bzrlib/builtins.py:3762
2924
msgid "Check the branch related to the current directory."
2925
msgstr "Проверить ветвь, относящуюся к текущей директории."
2926
2927
#: bzrlib/builtins.py:3764
2928
msgid "Check the repository related to the current directory."
2929
msgstr "Проверить репозиторий, относящийся к текущей директории."
2930
2931
#: bzrlib/builtins.py:3766
2932
msgid "Check the working tree related to the current directory."
2933
msgstr "Проверить рабочее дерево, относящееся к текущей директории."
2934
2935
#: bzrlib/builtins.py:3780
2936
msgid "Upgrade a repository, branch or working tree to a newer format."
2937
msgstr "Обновить репозиторий, ветвь или рабочее дерево до нового формата."
2938
2939
#: bzrlib/builtins.py:3782
2940
msgid ""
2941
"When the default format has changed after a major new release of\n"
2942
"Bazaar, you may be informed during certain operations that you\n"
2943
"should upgrade. Upgrading to a newer format may improve performance\n"
2944
"or make new features available. It may however limit interoperability\n"
2945
"with older repositories or with older versions of Bazaar."
2946
msgstr ""
2947
2948
#: bzrlib/builtins.py:3788
2949
msgid ""
2950
"If you wish to upgrade to a particular format rather than the\n"
2951
"current default, that can be specified using the --format option.\n"
2952
"As a consequence, you can use the upgrade command this way to\n"
2953
"\"downgrade\" to an earlier format, though some conversions are\n"
2954
"a one way process (e.g. changing from the 1.x default to the\n"
2955
"2.x default) so downgrading is not always possible."
2956
msgstr ""
2957
2958
#: bzrlib/builtins.py:3795
2959
msgid ""
2960
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2961
"process (where # is a number). By default, this is left there on\n"
2962
"completion. If the conversion fails, delete the new .bzr directory\n"
2963
"and rename this one back in its place. Use the --clean option to ask\n"
2964
"for the backup.bzr directory to be removed on successful conversion.\n"
2965
"Alternatively, you can delete it by hand if everything looks good\n"
2966
"afterwards."
2967
msgstr ""
2968
2969
#: bzrlib/builtins.py:3803
2970
msgid ""
2971
"If the location given is a shared repository, dependent branches\n"
2972
"are also converted provided the repository converts successfully.\n"
2973
"If the conversion of a branch fails, remaining branches are still\n"
2974
"tried."
2975
msgstr ""
2976
2977
#: bzrlib/builtins.py:3808
2978
msgid ""
2979
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2980
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2981
msgstr ""
2982
2983
#: bzrlib/builtins.py:3816
2984
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2985
msgstr ""
2986
"Обновить до определённого формата. Подробности см. в «bzr help formats»."
2987
2988
#: bzrlib/builtins.py:3820
2989
msgid "Branch format"
2990
msgstr "Формат ветви"
2991
2992
#: bzrlib/builtins.py:3822
2993
msgid "Remove the backup.bzr directory if successful."
2994
msgstr "Удалить директорию backup.bzr при успешном завершении."
2995
2996
#: bzrlib/builtins.py:3824
2997
msgid "Show what would be done, but don't actually do anything."
2998
msgstr ""
2999
3000
#: bzrlib/builtins.py:3839
3001
msgid "Show or set bzr user id."
3002
msgstr ""
3003
3004
#: bzrlib/builtins.py:3841
3005
msgid ""
3006
":Examples:\n"
3007
" Show the email of the current user::"
3008
msgstr ""
3009
":Примеры:\n"
3010
" Показать email текущего пользователя::"
3011
3012
#: bzrlib/builtins.py:3844
3013
msgid " bzr whoami --email"
3014
msgstr " bzr whoami --email"
3015
3016
#: bzrlib/builtins.py:3846
3017
msgid " Set the current user::"
3018
msgstr " Установить текущего пользователя::"
3019
3020
#: bzrlib/builtins.py:3848
3021
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
3022
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
3023
3024
#: bzrlib/builtins.py:3852
3025
msgid "Display email address only."
3026
msgstr "Показать только адрес email."
3027
3028
#: bzrlib/builtins.py:3854
3029
msgid "Set identity for the current branch instead of globally."
3030
msgstr ""
3031
3032
#: bzrlib/builtins.py:3880
3033
msgid "--email can only be used to display existing identity"
3034
msgstr ""
3035
3036
#: bzrlib/builtins.py:3904
3037
msgid "Print or set the branch nickname."
3038
msgstr "Вывести или установить имя ветви."
3039
3040
#: bzrlib/builtins.py:3906
3041
msgid ""
3042
"If unset, the colocated branch name is used for colocated branches, and\n"
3043
"the branch directory name is used for other branches. To print the\n"
3044
"current nickname, execute with no argument."
3045
msgstr ""
3046
3047
#: bzrlib/builtins.py:3910
3048
msgid ""
3049
"Bound branches use the nickname of its master branch unless it is set\n"
3050
"locally."
3051
msgstr ""
3052
3053
#: bzrlib/builtins.py:3930
3054
msgid "Set/unset and display aliases."
3055
msgstr "Установить, удалить или отобразить псевдонимы."
3056
3057
#: bzrlib/builtins.py:3932
3058
msgid ""
3059
":Examples:\n"
3060
" Show the current aliases::"
3061
msgstr ""
3062
":Примеры:\n"
3063
" Показать текущие псевдонимы::"
3064
3065
#: bzrlib/builtins.py:3935
3066
msgid " bzr alias"
3067
msgstr " bzr alias"
3068
3069
#: bzrlib/builtins.py:3937
3070
msgid " Show the alias specified for 'll'::"
3071
msgstr " Показать псевдоним для 'll'::"
3072
3073
#: bzrlib/builtins.py:3939
3074
msgid " bzr alias ll"
3075
msgstr " bzr alias ll"
3076
3077
#: bzrlib/builtins.py:3941
3078
msgid " Set an alias for 'll'::"
3079
msgstr " Установить псевдоним для 'll'::"
3080
3081
#: bzrlib/builtins.py:3943
3082
msgid " bzr alias ll=\"log --line -r-10..-1\""
3083
msgstr " bzr alias ll=\"log --line -r-10..-1\""
3084
3085
#: bzrlib/builtins.py:3945
3086
msgid " To remove an alias for 'll'::"
3087
msgstr " Удалить псевдоним для 'll'::"
3088
3089
#: bzrlib/builtins.py:3947
3090
msgid " bzr alias --remove ll"
3091
msgstr " bzr alias --remove ll"
3092
3093
#: bzrlib/builtins.py:3952
3094
msgid "Remove the alias."
3095
msgstr "Удалить псевдоним."
3096
3097
#: bzrlib/builtins.py:3970
3098
msgid "bzr alias --remove expects an alias to remove."
3099
msgstr "bzr alias --remove требуется псевдоним для удаления."
3100
3101
#: bzrlib/builtins.py:4151
3102
msgid ""
3103
"subunit not available. subunit needs to be installed to use --subunit."
3104
msgstr ""
3105
"subunit не доступен. Нужно установить subunit, чтобы использовать --subunit."
3106
3107
#: bzrlib/builtins.py:4168
3108
msgid ""
3109
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3110
msgstr ""
3111
"--benchmark не поддерживается начиная с версии bzr 2.2; вместо этого "
3112
"используйте bzr-usertest"
3113
3114
#: bzrlib/builtins.py:4215
3115
msgid "Show version of bzr."
3116
msgstr "Вывести версию bzr."
3117
3118
#: bzrlib/builtins.py:4219
3119
msgid "Print just the version number."
3120
msgstr "Вывести только номер версии."
3121
3122
#: bzrlib/builtins.py:4238
3123
msgid "It sure does!\n"
3124
msgstr "Да, он крут!\n"
3125
3126
#: bzrlib/builtins.py:4262
3127
#, python-format
3128
msgid "merge base is revision %s\n"
3129
msgstr ""
3130
3131
#: bzrlib/builtins.py:4266
3132
msgid "Perform a three-way merge."
3133
msgstr ""
3134
3135
#: bzrlib/builtins.py:4268
3136
msgid ""
3137
"The source of the merge can be specified either in the form of a branch,\n"
3138
"or in the form of a path to a file containing a merge directive generated\n"
3139
"with bzr send. If neither is specified, the default is the upstream branch\n"
3140
"or the branch most recently merged using --remember. The source of the\n"
3141
"merge may also be specified in the form of a path to a file in another\n"
3142
"branch: in this case, only the modifications to that file are merged into\n"
3143
"the current working tree."
3144
msgstr ""
3145
3146
#: bzrlib/builtins.py:4276
3147
msgid ""
3148
"When merging from a branch, by default bzr will try to merge in all new\n"
3149
"work from the other branch, automatically determining an appropriate base\n"
3150
"revision. If this fails, you may need to give an explicit base."
3151
msgstr ""
3152
3153
#: bzrlib/builtins.py:4280
3154
msgid ""
3155
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3156
"try to merge in all new work up to and including revision OTHER."
3157
msgstr ""
3158
3159
#: bzrlib/builtins.py:4283
3160
msgid ""
3161
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3162
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3163
"causes some revisions to be skipped, i.e. if the destination branch does\n"
3164
"not already contain revision BASE, such a merge is commonly referred to as\n"
3165
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
3166
"cherrypicks. The changes look like a normal commit, and the history of the\n"
3167
"changes from the other branch is not stored in the commit."
3168
msgstr ""
3169
3170
#: bzrlib/builtins.py:4291
3171
msgid "Revision numbers are always relative to the source branch."
3172
msgstr ""
3173
3174
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3175
msgid ""
3176
"Merge will do its best to combine the changes in two branches, but there\n"
3177
"are some kinds of problems only a human can fix. When it encounters those,\n"
3178
"it will mark a conflict. A conflict means that you need to fix something,\n"
3179
"before you can commit."
3180
msgstr ""
3181
3182
#: bzrlib/builtins.py:4298
3183
msgid ""
3184
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3185
msgstr ""
3186
3187
#: bzrlib/builtins.py:4300
3188
msgid ""
3189
"If there is no default branch set, the first merge will set it (use\n"
3190
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3191
"to use the default. To change the default, use --remember. The value will\n"
3192
"only be saved if the remote location can be accessed."
3193
msgstr ""
3194
3195
#: bzrlib/builtins.py:4305
3196
msgid ""
3197
"The results of the merge are placed into the destination working\n"
3198
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3199
"committed to record the result of the merge."
3200
msgstr ""
3201
3202
#: bzrlib/builtins.py:4309
3203
msgid ""
3204
"merge refuses to run if there are any uncommitted changes, unless\n"
3205
"--force is given. If --force is given, then the changes from the source \n"
3206
"will be merged with the current working tree, including any uncommitted\n"
3207
"changes in the tree. The --force option can also be used to create a\n"
3208
"merge revision which has more than two parents."
3209
msgstr ""
3210
3211
#: bzrlib/builtins.py:4315
3212
msgid ""
3213
"If one would like to merge changes from the working tree of the other\n"
3214
"branch without merging any committed revisions, the --uncommitted option\n"
3215
"can be given."
3216
msgstr ""
3217
3218
#: bzrlib/builtins.py:4319
3219
msgid ""
3220
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3221
"you to apply each diff hunk and file change, similar to \"shelve\"."
3222
msgstr ""
3223
3224
#: bzrlib/builtins.py:4322
3225
msgid ""
3226
":Examples:\n"
3227
" To merge all new revisions from bzr.dev::"
3228
msgstr ""
3229
3230
#: bzrlib/builtins.py:4325
3231
msgid " bzr merge ../bzr.dev"
3232
msgstr ""
3233
3234
#: bzrlib/builtins.py:4327
3235
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3236
msgstr ""
3237
3238
#: bzrlib/builtins.py:4329
3239
msgid " bzr merge -r 82 ../bzr.dev"
3240
msgstr ""
3241
3242
#: bzrlib/builtins.py:4331
3243
msgid " To merge the changes introduced by 82, without previous changes::"
3244
msgstr ""
3245
3246
#: bzrlib/builtins.py:4333
3247
msgid " bzr merge -r 81..82 ../bzr.dev"
3248
msgstr ""
3249
3250
#: bzrlib/builtins.py:4335
3251
msgid " To apply a merge directive contained in /tmp/merge::"
3252
msgstr ""
3253
3254
#: bzrlib/builtins.py:4337
3255
msgid " bzr merge /tmp/merge"
3256
msgstr ""
3257
3258
#: bzrlib/builtins.py:4339
3259
msgid ""
3260
" To create a merge revision with three parents from two branches\n"
3261
" feature1a and feature1b:"
3262
msgstr ""
3263
3264
#: bzrlib/builtins.py:4342
3265
msgid ""
3266
" bzr merge ../feature1a\n"
3267
" bzr merge ../feature1b --force\n"
3268
" bzr commit -m 'revision with three parents'"
3269
msgstr ""
3270
3271
#: bzrlib/builtins.py:4354
3272
msgid "Merge even if the destination tree has uncommitted changes."
3273
msgstr ""
3274
3275
#: bzrlib/builtins.py:4360
3276
msgid ""
3277
"Apply uncommitted changes from a working copy, instead of branch changes."
3278
msgstr ""
3279
3280
#: bzrlib/builtins.py:4362
3281
msgid ""
3282
"If the destination is already completely merged into the source, pull from "
3283
"the source rather than merging. When this happens, you do not need to "
3284
"commit the result."
3285
msgstr ""
3286
3287
#: bzrlib/builtins.py:4367
3288
msgid ""
3289
"Branch to merge into, rather than the one containing the working directory."
3290
msgstr ""
3291
3292
#: bzrlib/builtins.py:4369
3293
msgid "Instead of merging, show a diff of the merge."
3294
msgstr ""
3295
3296
#: bzrlib/builtins.py:4371
3297
msgid "Select changes interactively."
3298
msgstr ""
3299
3300
#: bzrlib/builtins.py:4393
3301
msgid ""
3302
"Merging into empty branches not currently supported, "
3303
"https://bugs.launchpad.net/bzr/+bug/308562"
3304
msgstr ""
3305
3306
#: bzrlib/builtins.py:4420
3307
msgid "Cannot use --uncommitted with bundles or merge directives."
3308
msgstr ""
3309
3310
#: bzrlib/builtins.py:4431
3311
msgid "Cannot use --uncommitted and --revision at the same time."
3312
msgstr ""
3313
3314
#: bzrlib/builtins.py:4451
3315
msgid "merger: "
3316
msgstr ""
3317
3318
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
3319
msgid "Nothing to do."
3320
msgstr ""
3321
3322
#: bzrlib/builtins.py:4457
3323
msgid "Cannot pull individual files"
3324
msgstr ""
3325
3326
#: bzrlib/builtins.py:4465
3327
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3328
msgstr ""
3329
3330
#: bzrlib/builtins.py:4523
3331
#, python-format
3332
msgid "Show-base is not supported for this merge type. %s"
3333
msgstr ""
3334
3335
#: bzrlib/builtins.py:4532
3336
#, python-format
3337
msgid "Conflict reduction is not supported for merge type %s."
3338
msgstr ""
3339
3340
#: bzrlib/builtins.py:4536
3341
msgid "Cannot do conflict reduction and show base."
3342
msgstr ""
3343
3344
#: bzrlib/builtins.py:4647
3345
msgid "No location specified or remembered"
3346
msgstr ""
3347
3348
#: bzrlib/builtins.py:4649
3349
msgid "{0} remembered {1} location {2}"
3350
msgstr ""
3351
3352
#: bzrlib/builtins.py:4655
3353
msgid "Redo a merge."
3354
msgstr ""
3355
3356
#: bzrlib/builtins.py:4657
3357
msgid ""
3358
"Use this if you want to try a different merge technique while resolving\n"
3359
"conflicts. Some merge techniques are better than others, and remerge\n"
3360
"lets you try different ones on different files."
3361
msgstr ""
3362
3363
#: bzrlib/builtins.py:4661
3364
msgid ""
3365
"The options for remerge have the same meaning and defaults as the ones for\n"
3366
"merge. The difference is that remerge can (only) be run when there is a\n"
3367
"pending merge, and it lets you specify particular files."
3368
msgstr ""
3369
3370
#: bzrlib/builtins.py:4665
3371
msgid ""
3372
":Examples:\n"
3373
" Re-do the merge of all conflicted files, and show the base text in\n"
3374
" conflict regions, in addition to the usual THIS and OTHER texts::"
3375
msgstr ""
3376
3377
#: bzrlib/builtins.py:4669
3378
msgid " bzr remerge --show-base"
3379
msgstr ""
3380
3381
#: bzrlib/builtins.py:4671
3382
msgid ""
3383
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3384
" additional processing to reduce the size of conflict regions::"
3385
msgstr ""
3386
3387
#: bzrlib/builtins.py:4674
3388
msgid " bzr remerge --merge-type weave --reprocess foobar"
3389
msgstr ""
3390
3391
#: bzrlib/builtins.py:4681
3392
msgid "Show base revision text in conflicts."
3393
msgstr ""
3394
3395
#: bzrlib/builtins.py:4693
3396
msgid ""
3397
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3398
"merges."
3399
msgstr ""
3400
3401
#: bzrlib/builtins.py:4751
3402
msgid ""
3403
"Set files in the working tree back to the contents of a previous revision."
3404
msgstr ""
3405
3406
#: bzrlib/builtins.py:4753
3407
msgid ""
3408
"Giving a list of files will revert only those files. Otherwise, all files\n"
3409
"will be reverted. If the revision is not specified with '--revision', the\n"
3410
"working tree basis revision is used. A revert operation affects only the\n"
3411
"working tree, not any revision history like the branch and repository or\n"
3412
"the working tree basis revision."
3413
msgstr ""
3414
3415
#: bzrlib/builtins.py:4759
3416
msgid ""
3417
"To remove only some changes, without reverting to a prior version, use\n"
3418
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3419
"will remove the changes introduced by the second last commit (-2), without\n"
3420
"affecting the changes introduced by the last commit (-1). To remove\n"
3421
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3422
"To update the branch to a specific revision or the latest revision and\n"
3423
"update the working tree accordingly while preserving local changes, see the\n"
3424
"update command."
3425
msgstr ""
3426
3427
#: bzrlib/builtins.py:4768
3428
msgid ""
3429
"Uncommitted changes to files that are reverted will be discarded.\n"
3430
"Howver, by default, any files that have been manually changed will be\n"
3431
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3432
"files have '.~#~' appended to their name, where # is a number."
3433
msgstr ""
3434
3435
#: bzrlib/builtins.py:4773
3436
msgid ""
3437
"When you provide files, you can use their current pathname or the pathname\n"
3438
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3439
"name. If you name a directory, all the contents of that directory will be\n"
3440
"reverted."
3441
msgstr ""
3442
3443
#: bzrlib/builtins.py:4778
3444
msgid ""
3445
"If you have newly added files since the target revision, they will be\n"
3446
"removed. If the files to be removed have been changed, backups will be\n"
3447
"created as above. Directories containing unknown files will not be\n"
3448
"deleted."
3449
msgstr ""
3450
3451
#: bzrlib/builtins.py:4783
3452
msgid ""
3453
"The working tree contains a list of revisions that have been merged but\n"
3454
"not yet committed. These revisions will be included as additional parents\n"
3455
"of the next commit. Normally, using revert clears that list as well as\n"
3456
"reverting the files. If any files are specified, revert leaves the list\n"
3457
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3458
".`` in the tree root to revert all files but keep the recorded merges,\n"
3459
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3460
"reverting any files."
3461
msgstr ""
3462
3463
#: bzrlib/builtins.py:4792
3464
msgid ""
3465
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3466
"changes from a branch in a single revision. To do this, perform the merge\n"
3467
"as desired. Then doing revert with the \"--forget-merges\" option will "
3468
"keep\n"
3469
"the content of the tree as it was, but it will clear the list of pending\n"
3470
"merges. The next commit will then contain all of the changes that are\n"
3471
"present in the other branch, but without any other parent revisions.\n"
3472
"Because this technique forgets where these changes originated, it may\n"
3473
"cause additional conflicts on later merges involving the same source and\n"
3474
"target branches."
3475
msgstr ""
3476
3477
#: bzrlib/builtins.py:4806
3478
msgid "Do not save backups of reverted files."
3479
msgstr ""
3480
3481
#: bzrlib/builtins.py:4808
3482
msgid "Remove pending merge marker, without changing any files."
3483
msgstr ""
3484
3485
#: bzrlib/builtins.py:4839
3486
msgid ""
3487
"Show help on a command or other topic.\n"
3488
" "
3489
msgstr ""
3490
3491
#: bzrlib/builtins.py:4844
3492
msgid "Show help on all commands."
3493
msgstr ""
3494
3495
#: bzrlib/builtins.py:4873
3496
msgid "Show unmerged/unpulled revisions between two branches."
3497
msgstr ""
3498
3499
#: bzrlib/builtins.py:4875
3500
msgid "OTHER_BRANCH may be local or remote."
3501
msgstr ""
3502
3503
#: bzrlib/builtins.py:4877
3504
msgid ""
3505
"To filter on a range of revisions, you can use the command -r begin..end\n"
3506
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3507
"also valid.\n"
3508
" \n"
3509
":Exit values:\n"
3510
" 1 - some missing revisions\n"
3511
" 0 - no missing revisions"
3512
msgstr ""
3513
3514
#: bzrlib/builtins.py:4887
3515
msgid ""
3516
" Determine the missing revisions between this and the branch at the\n"
3517
" remembered pull location::"
3518
msgstr ""
3519
3520
#: bzrlib/builtins.py:4890
3521
msgid " bzr missing"
3522
msgstr ""
3523
3524
#: bzrlib/builtins.py:4892
3525
msgid " Determine the missing revisions between this and another branch::"
3526
msgstr ""
3527
3528
#: bzrlib/builtins.py:4894
3529
msgid " bzr missing http://server/branch"
3530
msgstr ""
3531
3532
#: bzrlib/builtins.py:4896
3533
msgid ""
3534
" Determine the missing revisions up to a specific revision on the other\n"
3535
" branch::"
3536
msgstr ""
3537
3538
#: bzrlib/builtins.py:4899
3539
msgid " bzr missing -r ..-10"
3540
msgstr ""
3541
3542
#: bzrlib/builtins.py:4901
3543
msgid ""
3544
" Determine the missing revisions up to a specific revision on this\n"
3545
" branch::"
3546
msgstr ""
3547
3548
#: bzrlib/builtins.py:4904
3549
msgid " bzr missing --my-revision ..-10"
3550
msgstr ""
3551
3552
#: bzrlib/builtins.py:4911
3553
msgid "Reverse the order of revisions."
3554
msgstr ""
3555
3556
#: bzrlib/builtins.py:4913
3557
msgid "Display changes in the local branch only."
3558
msgstr ""
3559
3560
#: bzrlib/builtins.py:4914
3561
msgid "Same as --mine-only."
3562
msgstr ""
3563
3564
#: bzrlib/builtins.py:4916
3565
msgid "Display changes in the remote branch only."
3566
msgstr ""
3567
3568
#: bzrlib/builtins.py:4917
3569
msgid "Same as --theirs-only."
3570
msgstr ""
3571
3572
#: bzrlib/builtins.py:4922
3573
msgid ""
3574
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3575
"details."
3576
msgstr ""
3577
3578
#: bzrlib/builtins.py:4926
3579
msgid ""
3580
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3581
"details."
3582
msgstr ""
3583
3584
#: bzrlib/builtins.py:4929
3585
msgid "Show all revisions in addition to the mainline ones."
3586
msgstr ""
3587
3588
#: bzrlib/builtins.py:4983
3589
msgid "No peer location known or specified."
3590
msgstr ""
3591
3592
#: bzrlib/builtins.py:4987
3593
msgid "Using saved parent location: {0}\n"
3594
msgstr ""
3595
3596
#: bzrlib/builtins.py:5020
3597
#, python-format
3598
msgid "You have %d extra revision:\n"
3599
msgid_plural "You have %d extra revisions:\n"
3600
msgstr[0] ""
3601
msgstr[1] ""
3602
3603
#: bzrlib/builtins.py:5040
3604
#, python-format
3605
msgid "You are missing %d revision:\n"
3606
msgid_plural "You are missing %d revisions:\n"
3607
msgstr[0] ""
3608
msgstr[1] ""
3609
3610
#: bzrlib/builtins.py:5055
3611
msgid "This branch has no new revisions.\n"
3612
msgstr ""
3613
3614
#: bzrlib/builtins.py:5058
3615
msgid "Other branch has no new revisions.\n"
3616
msgstr ""
3617
3618
#: bzrlib/builtins.py:5063
3619
msgid "Branches are up to date.\n"
3620
msgstr ""
3621
3622
#: bzrlib/builtins.py:5074
3623
msgid "Compress the data within a repository."
3624
msgstr ""
3625
3626
#: bzrlib/builtins.py:5076
3627
msgid ""
3628
"This operation compresses the data within a bazaar repository. As\n"
3629
"bazaar supports automatic packing of repository, this operation is\n"
3630
"normally not required to be done manually."
3631
msgstr ""
3632
3633
#: bzrlib/builtins.py:5080
3634
msgid ""
3635
"During the pack operation, bazaar takes a backup of existing repository\n"
3636
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3637
"automatically when it is safe to do so. To save disk space by removing\n"
3638
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3639
"used."
3640
msgstr ""
3641
3642
#: bzrlib/builtins.py:5086
3643
msgid ""
3644
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3645
"during or immediately after repacking, you may be left with a state\n"
3646
"where the deletion has been written to disk but the new packs have not\n"
3647
"been. In this case the repository may be unusable."
3648
msgstr ""
3649
3650
#: bzrlib/builtins.py:5095
3651
msgid "Delete obsolete packs to save disk space."
3652
msgstr ""
3653
3654
#: bzrlib/builtins.py:5109
3655
msgid "List the installed plugins."
3656
msgstr ""
3657
3658
#: bzrlib/builtins.py:5111
3659
msgid ""
3660
"This command displays the list of installed plugins including\n"
3661
"version of plugin and a short description of each."
3662
msgstr ""
3663
3664
#: bzrlib/builtins.py:5114
3665
msgid "--verbose shows the path where each plugin is located."
3666
msgstr ""
3667
3668
#: bzrlib/builtins.py:5116
3669
msgid ""
3670
"A plugin is an external component for Bazaar that extends the\n"
3671
"revision control system, by adding or replacing code in Bazaar.\n"
3672
"Plugins can do a variety of things, including overriding commands,\n"
3673
"adding new commands, providing additional network transports and\n"
3674
"customizing log output."
3675
msgstr ""
3676
3677
#: bzrlib/builtins.py:5122
3678
msgid ""
3679
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3680
"for further information on plugins including where to find them and how to\n"
3681
"install them. Instructions are also provided there on how to write new\n"
3682
"plugins using the Python programming language."
3683
msgstr ""
3684
3685
#: bzrlib/builtins.py:5138
3686
msgid "Show testament (signing-form) of a revision."
3687
msgstr ""
3688
3689
#: bzrlib/builtins.py:5141
3690
msgid "Produce long-format testament."
3691
msgstr ""
3692
3693
#: bzrlib/builtins.py:5143
3694
msgid "Produce a strict-format testament."
3695
msgstr ""
3696
3697
#: bzrlib/builtins.py:5169
3698
msgid "Show the origin of each line in a file."
3699
msgstr ""
3700
3701
#: bzrlib/builtins.py:5171
3702
msgid ""
3703
"This prints out the given file with an annotation on the left side\n"
3704
"indicating which revision, author and date introduced the change."
3705
msgstr ""
3706
3707
#: bzrlib/builtins.py:5174
3708
msgid ""
3709
"If the origin is the same for a run of consecutive lines, it is\n"
3710
"shown only at the top, unless the --all option is given."
3711
msgstr ""
3712
3713
#: bzrlib/builtins.py:5182
3714
msgid "Show annotations on all lines."
3715
msgstr ""
3716
3717
#: bzrlib/builtins.py:5183
3718
msgid "Show commit date in annotations."
3719
msgstr ""
3720
3721
#: bzrlib/builtins.py:5270
3722
msgid "Cannot sign a range of non-revision-history revisions"
3723
msgstr ""
3724
3725
#: bzrlib/builtins.py:5282
3726
msgid "Please supply either one revision, or a range."
3727
msgstr ""
3728
3729
#: bzrlib/builtins.py:5286
3730
msgid ""
3731
"Convert the current branch into a checkout of the supplied branch.\n"
3732
"If no branch is supplied, rebind to the last bound location."
3733
msgstr ""
3734
"Преобразовать текущую ветвь в рабочую копию указанной ветви.\n"
3735
"Если ветвь не указаны, перепривязать последнее расположение привязки."
3736
3737
#: bzrlib/builtins.py:5289
3738
msgid ""
3739
"Once converted into a checkout, commits must succeed on the master branch\n"
3740
"before they will be applied to the local branch."
3741
msgstr ""
3742
"После преобразования в рабочую копию, закрепления должны производиться\n"
3743
"над основной ветвью, прежде чем они могут быть применены к локальной."
3744
3745
#: bzrlib/builtins.py:5292
3746
msgid ""
3747
"Bound branches use the nickname of its master branch unless it is set\n"
3748
"locally, in which case binding will update the local nickname to be\n"
3749
"that of the master."
3750
msgstr ""
3751
3752
#: bzrlib/builtins.py:5307
3753
msgid "No location supplied. This format does not remember old locations."
3754
msgstr ""
3755
3756
#: bzrlib/builtins.py:5313
3757
msgid "Branch is already bound"
3758
msgstr ""
3759
3760
#: bzrlib/builtins.py:5316
3761
msgid "No location supplied and no previous location known"
3762
msgstr ""
3763
3764
#: bzrlib/builtins.py:5322
3765
msgid "These branches have diverged. Try merging, and then bind again."
3766
msgstr ""
3767
3768
#: bzrlib/builtins.py:5329
3769
msgid "Convert the current checkout into a regular branch."
3770
msgstr "Преобразовать текущую рабочую копию в обычную ветвь."
3771
3772
#: bzrlib/builtins.py:5331
3773
msgid ""
3774
"After unbinding, the local branch is considered independent and subsequent\n"
3775
"commits will be local only."
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:5342
3779
msgid "Local branch is not bound"
3780
msgstr ""
3781
3782
#: bzrlib/builtins.py:5346
3783
msgid "Remove the last committed revision."
3784
msgstr ""
3785
3786
#: bzrlib/builtins.py:5348
3787
msgid ""
3788
"--verbose will print out what is being removed.\n"
3789
"--dry-run will go through all the motions, but not actually\n"
3790
"remove anything."
3791
msgstr ""
3792
3793
#: bzrlib/builtins.py:5352
3794
msgid ""
3795
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3796
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3797
"branch at revision 15."
3798
msgstr ""
3799
3800
#: bzrlib/builtins.py:5356
3801
msgid ""
3802
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3803
"it may make is to restore any pending merges that were present before\n"
3804
"the commit."
3805
msgstr ""
3806
3807
#: bzrlib/builtins.py:5367
3808
msgid "Don't actually make changes."
3809
msgstr ""
3810
3811
#: bzrlib/builtins.py:5368
3812
msgid "Say yes to all questions."
3813
msgstr ""
3814
3815
#: bzrlib/builtins.py:5370
3816
msgid "Keep tags that point to removed revisions."
3817
msgstr ""
3818
3819
#: bzrlib/builtins.py:5372
3820
msgid "Only remove the commits from the local branch when in a checkout."
3821
msgstr "Удалить закрепления из локальной ветви только в рабочей копии."
3822
3823
#: bzrlib/builtins.py:5421
3824
msgid "No revisions to uncommit.\n"
3825
msgstr ""
3826
3827
#: bzrlib/builtins.py:5436
3828
msgid "Dry-run, pretending to remove the above revisions.\n"
3829
msgstr ""
3830
3831
#: bzrlib/builtins.py:5439
3832
msgid "The above revision(s) will be removed.\n"
3833
msgstr ""
3834
3835
#: bzrlib/builtins.py:5443
3836
msgid "Uncommit these revisions"
3837
msgstr ""
3838
3839
#: bzrlib/builtins.py:5446
3840
msgid "Canceled\n"
3841
msgstr ""
3842
3843
#: bzrlib/builtins.py:5453
3844
#, python-format
3845
msgid ""
3846
"You can restore the old tip by running:\n"
3847
" bzr pull . -r revid:%s\n"
3848
msgstr ""
3849
3850
#: bzrlib/builtins.py:5458
3851
msgid "Break a dead lock."
3852
msgstr ""
3853
3854
#: bzrlib/builtins.py:5460
3855
msgid ""
3856
"This command breaks a lock on a repository, branch, working directory or\n"
3857
"config file."
3858
msgstr ""
3859
3860
#: bzrlib/builtins.py:5463
3861
msgid ""
3862
"CAUTION: Locks should only be broken when you are sure that the process\n"
3863
"holding the lock has been stopped."
3864
msgstr ""
3865
3866
#: bzrlib/builtins.py:5466
3867
msgid ""
3868
"You can get information on what locks are open via the 'bzr info\n"
3869
"[location]' command."
3870
msgstr ""
3871
3872
#: bzrlib/builtins.py:5469
3873
msgid ""
3874
":Examples:\n"
3875
" bzr break-lock\n"
3876
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3877
" bzr break-lock --conf ~/.bazaar"
3878
msgstr ""
3879
3880
#: bzrlib/builtins.py:5478
3881
msgid "LOCATION is the directory where the config lock is."
3882
msgstr ""
3883
3884
#: bzrlib/builtins.py:5480
3885
msgid "Do not ask for confirmation before breaking the lock."
3886
msgstr ""
3887
3888
#: bzrlib/builtins.py:5515
3889
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3890
msgstr ""
3891
3892
#: bzrlib/builtins.py:5516
3893
msgid "Run the bzr server."
3894
msgstr ""
3895
3896
#: bzrlib/builtins.py:5522
3897
msgid "Serve on stdin/out for use from inetd or sshd."
3898
msgstr ""
3899
3900
#: bzrlib/builtins.py:5523
3901
msgid "protocol"
3902
msgstr ""
3903
3904
#: bzrlib/builtins.py:5524
3905
msgid "Protocol to serve."
3906
msgstr ""
3907
3908
#: bzrlib/builtins.py:5528
3909
msgid "Listen for connections on nominated address."
3910
msgstr ""
3911
3912
#: bzrlib/builtins.py:5530
3913
msgid ""
3914
"Listen for connections on nominated port. Passing 0 as the port number will "
3915
"result in a dynamically allocated port. The default port depends on the "
3916
"protocol."
3917
msgstr ""
3918
3919
#: bzrlib/builtins.py:5535
3920
msgid "Serve contents of this directory."
3921
msgstr ""
3922
3923
#: bzrlib/builtins.py:5537
3924
msgid ""
3925
"By default the server is a readonly server. Supplying --allow-writes "
3926
"enables write access to the contents of the served directory and below. "
3927
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3928
"of external authentication is arranged supplying this option leads to global "
3929
"uncontrolled write access to your file system."
3930
msgstr ""
3931
3932
#: bzrlib/builtins.py:5546
3933
msgid "Override the default idle client timeout (5min)."
3934
msgstr ""
3935
3936
#: bzrlib/builtins.py:5564
3937
msgid "Combine a tree into its containing tree."
3938
msgstr ""
3939
3940
#: bzrlib/builtins.py:5566
3941
msgid "This command requires the target tree to be in a rich-root format."
3942
msgstr ""
3943
3944
#: bzrlib/builtins.py:5568
3945
msgid ""
3946
"The TREE argument should be an independent tree, inside another tree, but\n"
3947
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3948
"running \"bzr branch\" with the target inside a tree.)"
3949
msgstr ""
3950
3951
#: bzrlib/builtins.py:5572
3952
msgid ""
3953
"The result is a combined tree, with the subtree no longer an independent\n"
3954
"part. This is marked as a merge of the subtree into the containing tree,\n"
3955
"and all history is preserved."
3956
msgstr ""
3957
3958
#: bzrlib/builtins.py:5590
3959
#, python-format
3960
msgid ""
3961
"Can't join trees because %s doesn't support rich root data.\n"
3962
"You can use bzr upgrade on the repository."
3963
msgstr ""
3964
3965
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3966
msgid "Cannot join {0}. {1}"
3967
msgstr ""
3968
3969
#: bzrlib/builtins.py:5610
3970
msgid "Split a subdirectory of a tree into a separate tree."
3971
msgstr ""
3972
3973
#: bzrlib/builtins.py:5612
3974
msgid ""
3975
"This command will produce a target tree in a format that supports\n"
3976
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3977
"converted into earlier formats like 'dirstate-tags'."
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:5616
3981
msgid ""
3982
"The TREE argument should be a subdirectory of a working tree. That\n"
3983
"subdirectory will be converted into an independent tree, with its own\n"
3984
"branch. Commits in the top-level tree will not apply to the new subtree."
3985
msgstr ""
3986
3987
#: bzrlib/builtins.py:5696
3988
msgid "No submit branch specified or known"
3989
msgstr ""
3990
3991
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3992
msgid "No public branch specified or known"
3993
msgstr ""
3994
3995
#: bzrlib/builtins.py:5710
3996
msgid "bzr merge-directive takes at most two one revision identifiers"
3997
msgstr ""
3998
3999
#: bzrlib/builtins.py:5719
4000
msgid "No revisions to bundle."
4001
msgstr ""
4002
4003
#: bzrlib/builtins.py:5738
4004
msgid "Mail or create a merge-directive for submitting changes."
4005
msgstr ""
4006
4007
#: bzrlib/builtins.py:5740
4008
msgid "A merge directive provides many things needed for requesting merges:"
4009
msgstr ""
4010
4011
#: bzrlib/builtins.py:5742
4012
msgid "* A machine-readable description of the merge to perform"
4013
msgstr ""
4014
4015
#: bzrlib/builtins.py:5744
4016
msgid "* An optional patch that is a preview of the changes requested"
4017
msgstr ""
4018
4019
#: bzrlib/builtins.py:5746
4020
msgid ""
4021
"* An optional bundle of revision data, so that the changes can be applied\n"
4022
" directly from the merge directive, without retrieving data from a\n"
4023
" branch."
4024
msgstr ""
4025
4026
#: bzrlib/builtins.py:5750
4027
msgid ""
4028
"`bzr send` creates a compact data set that, when applied using bzr\n"
4029
"merge, has the same effect as merging from the source branch. "
4030
msgstr ""
4031
4032
#: bzrlib/builtins.py:5753
4033
msgid ""
4034
"By default the merge directive is self-contained and can be applied to any\n"
4035
"branch containing submit_branch in its ancestory without needing access to\n"
4036
"the source branch."
4037
msgstr ""
4038
4039
#: bzrlib/builtins.py:5757
4040
msgid ""
4041
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4042
"revisions, but only a structured request to merge from the\n"
4043
"public_location. In that case the public_branch is needed and it must be\n"
4044
"up-to-date and accessible to the recipient. The public_branch is always\n"
4045
"included if known, so that people can check it later."
4046
msgstr ""
4047
4048
#: bzrlib/builtins.py:5763
4049
msgid ""
4050
"The submit branch defaults to the parent of the source branch, but can be\n"
4051
"overridden. Both submit branch and public branch will be remembered in\n"
4052
"branch.conf the first time they are used for a particular branch. The\n"
4053
"source branch defaults to that containing the working directory, but can\n"
4054
"be changed using --from."
4055
msgstr ""
4056
4057
#: bzrlib/builtins.py:5769
4058
msgid ""
4059
"Both the submit branch and the public branch follow the usual behavior with\n"
4060
"respect to --remember: If there is no default location set, the first send\n"
4061
"will set it (use --no-remember to avoid setting it). After that, you can\n"
4062
"omit the location to use the default. To change the default, use\n"
4063
"--remember. The value will only be saved if the location can be accessed."
4064
msgstr ""
4065
4066
#: bzrlib/builtins.py:5775
4067
msgid ""
4068
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4069
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4070
"If a public location is known for the submit_branch, that location is used\n"
4071
"in the merge directive."
4072
msgstr ""
4073
4074
#: bzrlib/builtins.py:5780
4075
msgid ""
4076
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4077
"given, in which case it is sent to a file."
4078
msgstr ""
4079
4080
#: bzrlib/builtins.py:5783
4081
msgid ""
4082
"Mail is sent using your preferred mail program. This should be transparent\n"
4083
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4084
"If the preferred client can't be found (or used), your editor will be used."
4085
msgstr ""
4086
4087
#: bzrlib/builtins.py:5787
4088
msgid ""
4089
"To use a specific mail program, set the mail_client configuration option.\n"
4090
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4091
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
4092
"(MacOS X's\n"
4093
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
4094
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
4095
"add\n"
4096
"supported clients."
4097
msgstr ""
4098
4099
#: bzrlib/builtins.py:5794
4100
msgid ""
4101
"If mail is being sent, a to address is required. This can be supplied\n"
4102
"either on the commandline, by setting the submit_to configuration\n"
4103
"option in the branch itself or the child_submit_to configuration option\n"
4104
"in the submit branch."
4105
msgstr ""
4106
4107
#: bzrlib/builtins.py:5799
4108
msgid ""
4109
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4110
"and\n"
4111
"merge directive format 2. It is significantly faster and smaller than\n"
4112
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
4113
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
4114
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4115
msgstr ""
4116
4117
#: bzrlib/builtins.py:5805
4118
msgid ""
4119
"The merge directives created by bzr send may be applied using bzr merge or\n"
4120
"bzr pull by specifying a file containing a merge directive as the location."
4121
msgstr ""
4122
4123
#: bzrlib/builtins.py:5808
4124
msgid ""
4125
"bzr send makes extensive use of public locations to map local locations "
4126
"into\n"
4127
"URLs that can be used by other people. See `bzr help configuration` to\n"
4128
"set them, and use `bzr info` to display them."
4129
msgstr ""
4130
4131
#: bzrlib/builtins.py:5832
4132
msgid "Write merge directive to this file or directory; use - for stdout."
4133
msgstr ""
4134
4135
#: bzrlib/builtins.py:5836
4136
msgid ""
4137
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4138
"strict disables the check."
4139
msgstr ""
4140
4141
#: bzrlib/builtins.py:5838
4142
msgid "Mail the request to this address."
4143
msgstr ""
4144
4145
#: bzrlib/builtins.py:5842
4146
msgid "Body for the email."
4147
msgstr ""
4148
4149
#: bzrlib/builtins.py:5895
4150
msgid "Do not include a bundle in the merge directive."
4151
msgstr ""
4152
4153
#: bzrlib/builtins.py:5896
4154
msgid "Do not include a preview patch in the merge directive."
4155
msgstr ""
4156
4157
#: bzrlib/builtins.py:5899
4158
msgid "Remember submit and public branch."
4159
msgstr ""
4160
4161
#: bzrlib/builtins.py:5901
4162
msgid ""
4163
"Branch to generate the submission from, rather than the one containing the "
4164
"working directory."
4165
msgstr ""
4166
4167
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
4168
msgid "format"
4169
msgstr ""
4170
4171
#: bzrlib/builtins.py:5912
4172
msgid "Use the specified output format."
4173
msgstr ""
4174
4175
#: bzrlib/builtins.py:5934
4176
msgid "Create, remove or modify a tag naming a revision."
4177
msgstr ""
4178
4179
#: bzrlib/builtins.py:5936
4180
msgid ""
4181
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4182
"(--revision) option can be given -rtag:X, where X is any previously\n"
4183
"created tag."
4184
msgstr ""
4185
4186
#: bzrlib/builtins.py:5940
4187
msgid ""
4188
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4189
"along when you branch, push, pull or merge."
4190
msgstr ""
4191
4192
#: bzrlib/builtins.py:5943
4193
msgid ""
4194
"It is an error to give a tag name that already exists unless you pass\n"
4195
"--force, in which case the tag is moved to point to the new revision."
4196
msgstr ""
4197
4198
#: bzrlib/builtins.py:5946
4199
msgid ""
4200
"To rename a tag (change the name but keep it on the same revsion), run "
4201
"``bzr\n"
4202
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4203
msgstr ""
4204
4205
#: bzrlib/builtins.py:5949
4206
msgid ""
4207
"If no tag name is specified it will be determined through the \n"
4208
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4209
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4210
"details."
4211
msgstr ""
4212
4213
#: bzrlib/builtins.py:5959
4214
msgid "Delete this tag rather than placing it."
4215
msgstr ""
4216
4217
#: bzrlib/builtins.py:5962
4218
msgid "Branch in which to place the tag."
4219
msgstr ""
4220
4221
#: bzrlib/builtins.py:5964
4222
msgid "Replace existing tags."
4223
msgstr ""
4224
4225
#: bzrlib/builtins.py:5979
4226
msgid "No tag specified to delete."
4227
msgstr ""
4228
4229
#: bzrlib/builtins.py:5981
4230
#, python-format
4231
msgid "Deleted tag %s."
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:5995
4235
msgid "Please specify a tag name."
4236
msgstr ""
4237
4238
#: bzrlib/builtins.py:6003
4239
#, python-format
4240
msgid "Tag %s already exists for that revision."
4241
msgstr ""
4242
4243
#: bzrlib/builtins.py:6007
4244
#, python-format
4245
msgid "Created tag %s."
4246
msgstr ""
4247
4248
#: bzrlib/builtins.py:6009
4249
#, python-format
4250
msgid "Updated tag %s."
4251
msgstr ""
4252
4253
#: bzrlib/builtins.py:6013
4254
msgid "List tags."
4255
msgstr ""
4256
4257
#: bzrlib/builtins.py:6015
4258
msgid ""
4259
"This command shows a table of tag names and the revisions they reference."
4260
msgstr ""
4261
4262
#: bzrlib/builtins.py:6021
4263
msgid "Branch whose tags should be displayed."
4264
msgstr ""
4265
4266
#: bzrlib/builtins.py:6023
4267
msgid "Sort tags by different criteria."
4268
msgstr ""
4269
4270
#: bzrlib/builtins.py:6023
4271
msgid "Sorting"
4272
msgstr ""
4273
4274
#: bzrlib/builtins.py:6092
4275
msgid "Reconfigure the type of a bzr directory."
4276
msgstr ""
4277
4278
#: bzrlib/builtins.py:6094
4279
msgid "A target configuration must be specified."
4280
msgstr ""
4281
4282
#: bzrlib/builtins.py:6096
4283
msgid ""
4284
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4285
"The order of preference is\n"
4286
"1. For a lightweight checkout, the current bound location.\n"
4287
"2. For branches that used to be checkouts, the previously-bound location.\n"
4288
"3. The push location.\n"
4289
"4. The parent location.\n"
4290
"If none of these is available, --bind-to must be specified."
4291
msgstr ""
4292
4293
#: bzrlib/builtins.py:6110
4294
msgid "Tree type"
4295
msgstr ""
4296
4297
#: bzrlib/builtins.py:6111
4298
msgid "The relation between branch and tree."
4299
msgstr ""
4300
4301
#: bzrlib/builtins.py:6113
4302
msgid "Reconfigure to be an unbound branch with no working tree."
4303
msgstr ""
4304
4305
#: bzrlib/builtins.py:6114
4306
msgid "Reconfigure to be an unbound branch with a working tree."
4307
msgstr ""
4308
4309
#: bzrlib/builtins.py:6115
4310
msgid "Reconfigure to be a bound branch with a working tree."
4311
msgstr ""
4312
4313
#: bzrlib/builtins.py:6116
4314
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4315
msgstr ""
4316
4317
#: bzrlib/builtins.py:6121
4318
msgid "Repository type"
4319
msgstr ""
4320
4321
#: bzrlib/builtins.py:6122
4322
msgid "Location fo the repository."
4323
msgstr ""
4324
4325
#: bzrlib/builtins.py:6124
4326
msgid ""
4327
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4328
msgstr ""
4329
4330
#: bzrlib/builtins.py:6126
4331
msgid "Reconfigure to use a shared repository."
4332
msgstr ""
4333
4334
#: bzrlib/builtins.py:6130
4335
msgid "Trees in Repository"
4336
msgstr ""
4337
4338
#: bzrlib/builtins.py:6131
4339
msgid "Whether new branches in the repository have trees."
4340
msgstr ""
4341
4342
#: bzrlib/builtins.py:6133
4343
msgid ""
4344
"Reconfigure repository to create working trees on branches by default."
4345
msgstr ""
4346
4347
#: bzrlib/builtins.py:6135
4348
msgid ""
4349
"Reconfigure repository to not create working trees on branches by default."
4350
msgstr ""
4351
4352
#: bzrlib/builtins.py:6138
4353
msgid "Branch to bind checkout to."
4354
msgstr "Ветвь, с которой связать рабочую копию."
4355
4356
#: bzrlib/builtins.py:6140
4357
msgid "Perform reconfiguration even if local changes will be lost."
4358
msgstr ""
4359
4360
#: bzrlib/builtins.py:6143
4361
msgid "Reconfigure a branch to be stacked on another branch."
4362
msgstr ""
4363
4364
#: bzrlib/builtins.py:6147
4365
msgid ""
4366
"Reconfigure a branch to be unstacked. This may require copying substantial "
4367
"data into it."
4368
msgstr ""
4369
4370
#: bzrlib/builtins.py:6157
4371
msgid "Can't use both --stacked-on and --unstacked"
4372
msgstr ""
4373
4374
#: bzrlib/builtins.py:6171
4375
msgid "No target configuration specified"
4376
msgstr ""
4377
4378
#: bzrlib/builtins.py:6206
4379
msgid "Set the branch of a checkout and update."
4380
msgstr "Выбрать ветвь рабочей копии и обновить."
4381
4382
#: bzrlib/builtins.py:6208
4383
msgid ""
4384
"For lightweight checkouts, this changes the branch being referenced.\n"
4385
"For heavyweight checkouts, this checks that there are no local commits\n"
4386
"versus the current bound branch, then it makes the local branch a mirror\n"
4387
"of the new location and binds to it."
4388
msgstr ""
4389
4390
#: bzrlib/builtins.py:6213
4391
msgid ""
4392
"In both cases, the working tree is updated and uncommitted changes\n"
4393
"are merged. The user can commit or revert these as they desire."
4394
msgstr ""
4395
4396
#: bzrlib/builtins.py:6216
4397
msgid "Pending merges need to be committed or reverted before using switch."
4398
msgstr ""
4399
4400
#: bzrlib/builtins.py:6218
4401
msgid ""
4402
"The path to the branch to switch to can be specified relative to the parent\n"
4403
"directory of the current branch. For example, if you are currently in a\n"
4404
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4405
"/path/to/newbranch."
4406
msgstr ""
4407
4408
#: bzrlib/builtins.py:6223
4409
msgid ""
4410
"Bound branches use the nickname of its master branch unless it is set\n"
4411
"locally, in which case switching will update the local nickname to be\n"
4412
"that of the master."
4413
msgstr ""
4414
4415
#: bzrlib/builtins.py:6231
4416
msgid "Switch even if local commits will be lost."
4417
msgstr ""
4418
4419
#: bzrlib/builtins.py:6234
4420
msgid "Create the target branch from this one before switching to it."
4421
msgstr ""
4422
4423
#: bzrlib/builtins.py:6248
4424
msgid "You must supply either a revision or a location"
4425
msgstr ""
4426
4427
#: bzrlib/builtins.py:6261
4428
msgid "cannot create branch without source branch"
4429
msgstr ""
4430
4431
#: bzrlib/builtins.py:6286
4432
msgid "Manage filtered views."
4433
msgstr ""
4434
4435
#: bzrlib/builtins.py:6288
4436
msgid ""
4437
"Views provide a mask over the tree so that users can focus on\n"
4438
"a subset of a tree when doing their work. After creating a view,\n"
4439
"commands that support a list of files - status, diff, commit, etc -\n"
4440
"effectively have that list of files implicitly given each time.\n"
4441
"An explicit list of files can still be given but those files\n"
4442
"must be within the current view."
4443
msgstr ""
4444
4445
#: bzrlib/builtins.py:6295
4446
msgid ""
4447
"In most cases, a view has a short life-span: it is created to make\n"
4448
"a selected change and is deleted once that change is committed.\n"
4449
"At other times, you may wish to create one or more named views\n"
4450
"and switch between them."
4451
msgstr ""
4452
4453
#: bzrlib/builtins.py:6300
4454
msgid ""
4455
"To disable the current view without deleting it, you can switch to\n"
4456
"the pseudo view called ``off``. This can be useful when you need\n"
4457
"to see the whole tree for an operation or two (e.g. merge) but\n"
4458
"want to switch back to your view after that."
4459
msgstr ""
4460
4461
#: bzrlib/builtins.py:6305
4462
msgid ""
4463
":Examples:\n"
4464
" To define the current view::"
4465
msgstr ""
4466
4467
#: bzrlib/builtins.py:6308
4468
msgid " bzr view file1 dir1 ..."
4469
msgstr ""
4470
4471
#: bzrlib/builtins.py:6310
4472
msgid " To list the current view::"
4473
msgstr ""
4474
4475
#: bzrlib/builtins.py:6312
4476
msgid " bzr view"
4477
msgstr ""
4478
4479
#: bzrlib/builtins.py:6314
4480
msgid " To delete the current view::"
4481
msgstr ""
4482
4483
#: bzrlib/builtins.py:6316
4484
msgid " bzr view --delete"
4485
msgstr ""
4486
4487
#: bzrlib/builtins.py:6318
4488
msgid " To disable the current view without deleting it::"
4489
msgstr ""
4490
4491
#: bzrlib/builtins.py:6320
4492
msgid " bzr view --switch off"
4493
msgstr ""
4494
4495
#: bzrlib/builtins.py:6322
4496
msgid " To define a named view and switch to it::"
4497
msgstr ""
4498
4499
#: bzrlib/builtins.py:6324
4500
msgid " bzr view --name view-name file1 dir1 ..."
4501
msgstr ""
4502
4503
#: bzrlib/builtins.py:6326
4504
msgid " To list a named view::"
4505
msgstr ""
4506
4507
#: bzrlib/builtins.py:6328
4508
msgid " bzr view --name view-name"
4509
msgstr ""
4510
4511
#: bzrlib/builtins.py:6330
4512
msgid " To delete a named view::"
4513
msgstr ""
4514
4515
#: bzrlib/builtins.py:6332
4516
msgid " bzr view --name view-name --delete"
4517
msgstr ""
4518
4519
#: bzrlib/builtins.py:6334
4520
msgid " To switch to a named view::"
4521
msgstr ""
4522
4523
#: bzrlib/builtins.py:6336
4524
msgid " bzr view --switch view-name"
4525
msgstr ""
4526
4527
#: bzrlib/builtins.py:6338
4528
msgid " To list all views defined::"
4529
msgstr ""
4530
4531
#: bzrlib/builtins.py:6340
4532
msgid " bzr view --all"
4533
msgstr ""
4534
4535
#: bzrlib/builtins.py:6342
4536
msgid " To delete all views::"
4537
msgstr ""
4538
4539
#: bzrlib/builtins.py:6344
4540
msgid " bzr view --delete --all"
4541
msgstr ""
4542
4543
#: bzrlib/builtins.py:6351
4544
msgid "Apply list or delete action to all views."
4545
msgstr ""
4546
4547
#: bzrlib/builtins.py:6354
4548
msgid "Delete the view."
4549
msgstr ""
4550
4551
#: bzrlib/builtins.py:6357
4552
msgid "Name of the view to define, list or delete."
4553
msgstr ""
4554
4555
#: bzrlib/builtins.py:6361
4556
msgid "Name of the view to switch to."
4557
msgstr ""
4558
4559
#: bzrlib/builtins.py:6380
4560
msgid "Both --delete and a file list specified"
4561
msgstr ""
4562
4563
#: bzrlib/builtins.py:6383
4564
msgid "Both --delete and --switch specified"
4565
msgstr ""
4566
4567
#: bzrlib/builtins.py:6386
4568
msgid "Deleted all views.\n"
4569
msgstr ""
4570
4571
#: bzrlib/builtins.py:6388
4572
msgid "No current view to delete"
4573
msgstr ""
4574
4575
#: bzrlib/builtins.py:6391
4576
#, python-format
4577
msgid "Deleted '%s' view.\n"
4578
msgstr ""
4579
4580
#: bzrlib/builtins.py:6395
4581
msgid "Both --switch and a file list specified"
4582
msgstr ""
4583
4584
#: bzrlib/builtins.py:6398
4585
msgid "Both --switch and --all specified"
4586
msgstr ""
4587
4588
#: bzrlib/builtins.py:6401
4589
msgid "No current view to disable"
4590
msgstr ""
4591
4592
#: bzrlib/builtins.py:6403
4593
#, python-format
4594
msgid "Disabled '%s' view.\n"
4595
msgstr ""
4596
4597
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4598
msgid "Using '{0}' view: {1}\n"
4599
msgstr ""
4600
4601
#: bzrlib/builtins.py:6410
4602
msgid "Views defined:\n"
4603
msgstr ""
4604
4605
#: bzrlib/builtins.py:6419
4606
msgid "No views defined.\n"
4607
msgstr ""
4608
4609
#: bzrlib/builtins.py:6426
4610
msgid "Cannot change the 'off' pseudo view"
4611
msgstr ""
4612
4613
#: bzrlib/builtins.py:6434
4614
msgid "No current view.\n"
4615
msgstr ""
4616
4617
#: bzrlib/builtins.py:6437
4618
msgid "'{0}' view is: {1}\n"
4619
msgstr ""
4620
4621
#: bzrlib/builtins.py:6457
4622
msgid " <no hooks installed>\n"
4623
msgstr ""
4624
4625
#: bzrlib/builtins.py:6461
4626
msgid "Remove a branch."
4627
msgstr ""
4628
4629
#: bzrlib/builtins.py:6463
4630
msgid ""
4631
"This will remove the branch from the specified location but \n"
4632
"will keep any working tree or repository in place."
4633
msgstr ""
4634
4635
#: bzrlib/builtins.py:6468
4636
msgid " Remove the branch at repo/trunk::"
4637
msgstr ""
4638
4639
#: bzrlib/builtins.py:6470
4640
msgid " bzr remove-branch repo/trunk"
4641
msgstr ""
4642
4643
#: bzrlib/builtins.py:6477
4644
msgid "Remove branch even if it is the active branch."
4645
msgstr ""
4646
4647
#: bzrlib/builtins.py:6491
4648
msgid "Branch is active. Use --force to remove it."
4649
msgstr ""
4650
4651
#: bzrlib/builtins.py:6495
4652
msgid "Plaintext diff output."
4653
msgstr ""
4654
4655
#: bzrlib/builtins.py:6496
4656
msgid "Temporarily set aside some changes from the current tree."
4657
msgstr ""
4658
4659
#: bzrlib/builtins.py:6498
4660
msgid ""
4661
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4662
"ie. out of the way, until a later time when you can bring them back from\n"
4663
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4664
"your working tree, and so they aren't propagated along with your branch nor\n"
4665
"will they survive its deletion."
4666
msgstr ""
4667
4668
#: bzrlib/builtins.py:6504
4669
msgid "If shelve --list is specified, previously-shelved changes are listed."
4670
msgstr ""
4671
4672
#: bzrlib/builtins.py:6506
4673
msgid ""
4674
"Shelve is intended to help separate several sets of changes that have\n"
4675
"been inappropriately mingled. If you just want to get rid of all changes\n"
4676
"and you don't need to restore them later, use revert. If you want to\n"
4677
"shelve all text changes at once, use shelve --all."
4678
msgstr ""
4679
4680
#: bzrlib/builtins.py:6511
4681
msgid ""
4682
"If filenames are specified, only the changes to those files will be\n"
4683
"shelved. Other files will be left untouched."
4684
msgstr ""
4685
4686
#: bzrlib/builtins.py:6514
4687
msgid ""
4688
"If a revision is specified, changes since that revision will be shelved."
4689
msgstr ""
4690
4691
#: bzrlib/builtins.py:6516
4692
msgid ""
4693
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4694
"restore the most recently shelved changes."
4695
msgstr ""
4696
4697
#: bzrlib/builtins.py:6519
4698
msgid ""
4699
"For complicated changes, it is possible to edit the changes in a separate\n"
4700
"editor program to decide what the file remaining in the working copy\n"
4701
"should look like. To do this, add the configuration option"
4702
msgstr ""
4703
4704
#: bzrlib/builtins.py:6523
4705
msgid " change_editor = PROGRAM @new_path @old_path"
4706
msgstr ""
4707
4708
#: bzrlib/builtins.py:6525
4709
msgid ""
4710
"where @new_path is replaced with the path of the new version of the \n"
4711
"file and @old_path is replaced with the path of the old version of \n"
4712
"the file. The PROGRAM should save the new file with the desired \n"
4713
"contents of the file in the working tree.\n"
4714
" "
4715
msgstr ""
4716
4717
#: bzrlib/builtins.py:6537
4718
msgid "Shelve all changes."
4719
msgstr ""
4720
4721
#: bzrlib/builtins.py:6539
4722
msgid "Method to use for writing diffs."
4723
msgstr ""
4724
4725
#: bzrlib/builtins.py:6539
4726
msgid "writer"
4727
msgstr ""
4728
4729
#: bzrlib/builtins.py:6543
4730
msgid "List shelved changes."
4731
msgstr ""
4732
4733
#: bzrlib/builtins.py:6545
4734
msgid "Destroy removed changes instead of shelving them."
4735
msgstr ""
4736
4737
#: bzrlib/builtins.py:6574
4738
msgid "No shelved changes."
4739
msgstr ""
4740
4741
#: bzrlib/builtins.py:6585
4742
msgid "Restore shelved changes."
4743
msgstr ""
4744
4745
#: bzrlib/builtins.py:6587
4746
msgid ""
4747
"By default, the most recently shelved changes are restored. However if you\n"
4748
"specify a shelf by id those changes will be restored instead. This works\n"
4749
"best when the changes don't depend on each other."
4750
msgstr ""
4751
4752
#: bzrlib/builtins.py:6596
4753
msgid "The action to perform."
4754
msgstr ""
4755
4756
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4757
msgid "action"
4758
msgstr ""
4759
4760
#: bzrlib/builtins.py:6598
4761
msgid "Apply changes and remove from the shelf."
4762
msgstr ""
4763
4764
#: bzrlib/builtins.py:6599
4765
msgid "Show changes, but do not apply or remove them."
4766
msgstr ""
4767
4768
#: bzrlib/builtins.py:6600
4769
msgid ""
4770
"Instead of unshelving the changes, show the diff that would result from "
4771
"unshelving."
4772
msgstr ""
4773
4774
#: bzrlib/builtins.py:6602
4775
msgid "Delete changes without applying them."
4776
msgstr ""
4777
4778
#: bzrlib/builtins.py:6603
4779
msgid "Apply changes but don't delete them."
4780
msgstr ""
4781
4782
#: bzrlib/builtins.py:6618
4783
msgid "Remove unwanted files from working tree."
4784
msgstr ""
4785
4786
#: bzrlib/builtins.py:6620
4787
msgid ""
4788
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4789
"files are never deleted."
4790
msgstr ""
4791
4792
#: bzrlib/builtins.py:6623
4793
msgid ""
4794
"Another class is 'detritus', which includes files emitted by bzr during\n"
4795
"normal operations and selftests. (The value of these files decreases with\n"
4796
"time.)"
4797
msgstr ""
4798
4799
#: bzrlib/builtins.py:6627
4800
msgid ""
4801
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4802
"flags are respected, and may be combined."
4803
msgstr ""
4804
4805
#: bzrlib/builtins.py:6630
4806
msgid "To check what clean-tree will do, use --dry-run."
4807
msgstr ""
4808
4809
#: bzrlib/builtins.py:6633
4810
msgid "Delete all ignored files."
4811
msgstr ""
4812
4813
#: bzrlib/builtins.py:6634
4814
msgid ""
4815
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4816
msgstr ""
4817
4818
#: bzrlib/builtins.py:6637
4819
msgid "Delete files unknown to bzr (default)."
4820
msgstr ""
4821
4822
#: bzrlib/builtins.py:6638
4823
msgid "Show files to delete instead of deleting them."
4824
msgstr ""
4825
4826
#: bzrlib/builtins.py:6640
4827
msgid "Do not prompt before deleting."
4828
msgstr ""
4829
4830
#: bzrlib/bundle/__init__.py:59
4831
msgid "A directory cannot be a bundle"
4832
msgstr ""
4833
4834
#: bzrlib/bundle/apply_bundle.py:40
4835
msgid "Install revisions"
4836
msgstr ""
4837
4838
#: bzrlib/bundle/commands.py:64
4839
msgid "--verbose requires a merge directive"
4840
msgstr ""
4841
4842
#: bzrlib/bundle/commands.py:67
4843
msgid "Bundle format not supported"
4844
msgstr ""
4845
4846
#: bzrlib/bundle/commands.py:77
4847
msgid "Records\n"
4848
msgstr ""
4849
4850
#: bzrlib/bundle/commands.py:81
4851
msgid "{0}: {1} ({2} multiparent)\n"
4852
msgstr ""
4853
4854
#: bzrlib/bundle/commands.py:83
4855
#, python-format
4856
msgid "unique files: %d\n"
4857
msgstr ""
4858
4859
#: bzrlib/bundle/commands.py:92
4860
msgid "Revisions\n"
4861
msgstr ""
4862
4863
#: bzrlib/bundle/commands.py:93
4864
#, python-format
4865
msgid "nicks: %s\n"
4866
msgstr ""
4867
4868
#: bzrlib/bundle/commands.py:95
4869
#, python-format
4870
msgid ""
4871
"committers: \n"
4872
"%s\n"
4873
msgstr ""
4874
4875
#: bzrlib/bundle/commands.py:103
4876
msgid "Decoded contents\n"
4877
msgstr ""
4878
4879
#: bzrlib/bundle/serializer/v4.py:327
4880
#, python-format
4881
msgid "Bundling %d revision."
4882
msgid_plural "Bundling %d revisions."
4883
msgstr[0] ""
4884
msgstr[1] ""
4885
4886
#: bzrlib/bzrdir.py:487
4887
msgid ""
4888
"making backup of {0}\n"
4889
" to {1}"
4890
msgstr ""
4891
4892
#: bzrlib/bzrdir.py:510
4893
msgid "renamed {0} to {1}"
4894
msgstr ""
4895
4896
#: bzrlib/bzrdir.py:1639
4897
#, python-format
4898
msgid ""
4899
"Source repository format does not support stacking, using format:\n"
4900
" %s"
4901
msgstr ""
4902
4903
#: bzrlib/bzrdir.py:1659
4904
#, python-format
4905
msgid ""
4906
"Source branch format does not support stacking, using format:\n"
4907
" %s"
4908
msgstr ""
4909
4910
#: bzrlib/bzrdir.py:1805
4911
msgid "starting repository conversion"
4912
msgstr ""
4913
4914
#: bzrlib/bzrdir.py:2026
4915
msgid "Using default stacking branch {0} at {1}"
4916
msgstr ""
4917
4918
#: bzrlib/check.py:108
4919
msgid "check"
4920
msgstr ""
4921
4922
#: bzrlib/check.py:110
4923
msgid "checking revisions"
4924
msgstr ""
4925
4926
#: bzrlib/check.py:112
4927
msgid "checking commit contents"
4928
msgstr ""
4929
4930
#: bzrlib/check.py:114
4931
msgid "checking file graphs"
4932
msgstr ""
4933
4934
#: bzrlib/check.py:118
4935
msgid "checking branches and trees"
4936
msgstr ""
4937
4938
#: bzrlib/check.py:205
4939
msgid "checked repository {0} format {1}"
4940
msgstr ""
4941
4942
#: bzrlib/check.py:208
4943
#, python-format
4944
msgid "%6d revisions"
4945
msgstr ""
4946
4947
#: bzrlib/check.py:209
4948
#, python-format
4949
msgid "%6d file-ids"
4950
msgstr ""
4951
4952
#: bzrlib/check.py:211
4953
#, python-format
4954
msgid "%6d unreferenced text versions"
4955
msgstr ""
4956
4957
#: bzrlib/check.py:215
4958
msgid "unreferenced version: {{{0}}} in {1}"
4959
msgstr ""
4960
4961
#: bzrlib/check.py:218
4962
#, python-format
4963
msgid "%6d revisions are missing inventory_sha1"
4964
msgstr ""
4965
4966
#: bzrlib/check.py:221
4967
#, python-format
4968
msgid "%6d revisions are mentioned but not present"
4969
msgstr ""
4970
4971
#: bzrlib/check.py:224
4972
#, python-format
4973
msgid "%6d ghost revisions"
4974
msgstr ""
4975
4976
#: bzrlib/check.py:229
4977
#, python-format
4978
msgid "%6d revisions missing parents in ancestry"
4979
msgstr ""
4980
4981
#: bzrlib/check.py:233
4982
#, python-format
4983
msgid " %s should be in the ancestry for:"
4984
msgstr ""
4985
4986
#: bzrlib/check.py:237
4987
#, python-format
4988
msgid "%6d inconsistent parents"
4989
msgstr ""
4990
4991
#: bzrlib/check.py:241
4992
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4993
msgstr ""
4994
4995
#: bzrlib/check.py:247
4996
#, python-format
4997
msgid "%6d revisions have incorrect parents in the revision index"
4998
msgstr ""
4999
5000
#: bzrlib/check.py:253
5001
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
5002
msgstr ""
5003
5004
#: bzrlib/check.py:267
5005
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
5006
msgstr ""
5007
5008
#: bzrlib/check.py:296
5009
msgid ""
5010
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
5011
"{{{4}}}"
5012
msgstr ""
5013
5014
#: bzrlib/check.py:354
5015
#, python-format
5016
msgid "Checking branch at '%s'."
5017
msgstr ""
5018
5019
#: bzrlib/check.py:374
5020
#, python-format
5021
msgid "Checking working tree at '%s'."
5022
msgstr ""
5023
5024
#: bzrlib/check.py:427 bzrlib/check.py:441
5025
msgid "No branch found at specified location."
5026
msgstr ""
5027
5028
#: bzrlib/check.py:429 bzrlib/check.py:439
5029
msgid "No working tree found at specified location."
5030
msgstr ""
5031
5032
#: bzrlib/check.py:432
5033
#, python-format
5034
msgid "Checking repository at '%s'."
5035
msgstr ""
5036
5037
#: bzrlib/check.py:443
5038
msgid "No repository found at specified location."
5039
msgstr ""
5040
5041
#: bzrlib/clean_tree.py:63
5042
msgid "Nothing to delete."
5043
msgstr ""
5044
5045
#: bzrlib/clean_tree.py:68
5046
msgid "Are you sure you wish to delete these"
5047
msgstr ""
5048
5049
#: bzrlib/clean_tree.py:70
5050
msgid "Canceled"
5051
msgstr ""
5052
5053
#: bzrlib/clean_tree.py:107
5054
#, python-format
5055
msgid "unable to remove %s"
5056
msgstr ""
5057
5058
#: bzrlib/clean_tree.py:111
5059
msgid "deleting paths:"
5060
msgstr ""
5061
5062
#: bzrlib/clean_tree.py:125
5063
msgid "unable to remove \"{0}\": {1}."
5064
msgstr ""
5065
5066
#: bzrlib/clean_tree.py:130
5067
msgid "No files deleted."
5068
msgstr ""
5069
5070
#: bzrlib/cmd_version_info.py:47
5071
msgid "No known version info format {0}. Supported types are: {1}"
5072
msgstr ""
5073
5074
#: bzrlib/cmd_version_info.py:52
5075
msgid "Version info in Custom template-based format."
5076
msgstr ""
5077
5078
#: bzrlib/cmd_version_info.py:52
5079
msgid "Version info in Python format."
5080
msgstr ""
5081
5082
#: bzrlib/cmd_version_info.py:52
5083
msgid "Version info in RIO (simple text) format (default)."
5084
msgstr ""
5085
5086
#: bzrlib/cmd_version_info.py:53
5087
msgid "Show version information about this tree."
5088
msgstr ""
5089
5090
#: bzrlib/cmd_version_info.py:55
5091
msgid ""
5092
"You can use this command to add information about version into\n"
5093
"source code of an application. The output can be in one of the\n"
5094
"supported formats or in a custom format based on a template."
5095
msgstr ""
5096
5097
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
5098
#: en/help_topics/configuration.txt:722
5099
msgid "For example::"
5100
msgstr ""
5101
5102
#: bzrlib/cmd_version_info.py:61
5103
msgid ""
5104
" bzr version-info --custom \\\n"
5105
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
5106
msgstr ""
5107
5108
#: bzrlib/cmd_version_info.py:64
5109
msgid ""
5110
"will produce a C header file with formatted string containing the\n"
5111
"current revision number. Other supported variables in templates are:"
5112
msgstr ""
5113
5114
#: bzrlib/cmd_version_info.py:67
5115
msgid ""
5116
" * {date} - date of the last revision\n"
5117
" * {build_date} - current date\n"
5118
" * {revno} - revision number\n"
5119
" * {revision_id} - revision id\n"
5120
" * {branch_nick} - branch nickname\n"
5121
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
5122
" otherwise 1"
5123
msgstr ""
5124
5125
#: bzrlib/cmd_version_info.py:77
5126
msgid "Select the output format."
5127
msgstr ""
5128
5129
#: bzrlib/cmd_version_info.py:81
5130
msgid "Include all possible information."
5131
msgstr ""
5132
5133
#: bzrlib/cmd_version_info.py:82
5134
msgid "Check if tree is clean."
5135
msgstr ""
5136
5137
#: bzrlib/cmd_version_info.py:84
5138
msgid "Include the revision-history."
5139
msgstr ""
5140
5141
#: bzrlib/cmd_version_info.py:86
5142
msgid "Include the last revision for each file."
5143
msgstr ""
5144
5145
#: bzrlib/cmd_version_info.py:87
5146
msgid "Template for the output."
5147
msgstr ""
5148
5149
#: bzrlib/cmd_version_info.py:101
5150
msgid "bzr version-info --revision takes exactly one revision specifier"
5151
msgstr ""
5152
5153
#: bzrlib/commands.py:229
5154
#, python-format
5155
msgid "unknown command \"%s\""
5156
msgstr "неизвестная команда «%s»"
5157
5158
#: bzrlib/commands.py:476
5159
msgid "No help for this command."
5160
msgstr "Нет справки для этой команды."
5161
5162
#: bzrlib/commands.py:489
5163
#, python-format
5164
msgid ":Purpose: %s\n"
5165
msgstr ":Назначение: %s\n"
5166
5167
#: bzrlib/commands.py:491
5168
#, python-format
5169
msgid ""
5170
":Usage:\n"
5171
"%s\n"
5172
msgstr ""
5173
":Синтаксис:\n"
5174
"%s\n"
5175
5176
#: bzrlib/commands.py:493
5177
#, python-format
5178
msgid ":Usage: %s\n"
5179
msgstr ":Синтаксис: %s\n"
5180
5181
#: bzrlib/commands.py:512
5182
#, python-format
5183
msgid ":Options:%s"
5184
msgstr ":Опции:%s"
5185
5186
#: bzrlib/commands.py:523
5187
#, python-format
5188
msgid ""
5189
":Description:\n"
5190
" %s\n"
5191
"\n"
5192
msgstr ""
5193
":Описание:\n"
5194
" %s\n"
5195
"\n"
5196
5197
#: bzrlib/commands.py:533
5198
#, python-format
5199
msgid ""
5200
"See bzr help %s for more details and examples.\n"
5201
"\n"
5202
msgstr ""
5203
"Смотрите bzr help %s, чтобы получить подробности и примеры.\n"
5204
"\n"
5205
5206
#: bzrlib/commands.py:538
5207
msgid ":Aliases: "
5208
msgstr ":Псевдонимы: "
5209
5210
#: bzrlib/commands.py:542
5211
#, python-format
5212
msgid ":From: plugin \"%s\"\n"
5213
msgstr ":Из: модуль «%s»\n"
5214
5215
#: bzrlib/commands.py:554
5216
msgid ":doc:`{0} <{1}-help>`"
5217
msgstr ""
5218
5219
#: bzrlib/commands.py:558
5220
#, python-format
5221
msgid ":See also: %s"
5222
msgstr ":Смотрите также: %s"
5223
5224
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
5225
msgid "Only ASCII permitted in option names"
5226
msgstr "В именах опций разрешены только символы ASCII"
5227
5228
#: bzrlib/commands.py:851 bzrlib/commands.py:859
5229
msgid "command {0!r} needs one or more {1}"
5230
msgstr "команде {0!r} требуется один или больше {1}"
5231
5232
#: bzrlib/commands.py:868
5233
msgid "command {0!r} requires argument {1}"
5234
msgstr "команде {0!r} требуется аргумент {1}"
5235
5236
#: bzrlib/commands.py:875
5237
msgid "extra argument to command {0}: {1}"
5238
msgstr "лишний аргумент к команде {0}: {1}"
5239
5240
#: bzrlib/commands.py:972
5241
#, python-format
5242
msgid "Profile data written to \"%s\"."
5243
msgstr "Данные профиля записаны в «%s»."
5244
5245
#: bzrlib/commit.py:117 bzrlib/commit.py:740
5246
msgid "added"
5247
msgstr "добавлены"
5248
5249
#: bzrlib/commit.py:117 bzrlib/commit.py:748
5250
msgid "modified"
5251
msgstr "изменены"
5252
5253
#: bzrlib/commit.py:131
5254
#, python-format
5255
msgid "Committing%s"
5256
msgstr "Закрепление%s"
5257
5258
#: bzrlib/commit.py:134
5259
#, python-format
5260
msgid "Committed revision %d."
5261
msgstr "Закреплена ревизия %d."
5262
5263
#: bzrlib/commit.py:143
5264
#, python-format
5265
msgid "deleted %s"
5266
msgstr "удалён %s"
5267
5268
#: bzrlib/commit.py:146
5269
#, python-format
5270
msgid "missing %s"
5271
msgstr "отсутствует %s"
5272
5273
#: bzrlib/commit.py:511
5274
msgid ""
5275
"Conflicting tags in bound branch:\n"
5276
"{0}"
5277
msgstr ""
5278
5279
#: bzrlib/commit.py:742
5280
msgid "renamed"
5281
msgstr "переименованы"
5282
5283
#: bzrlib/commit.py:976
5284
msgid "unchanged"
5285
msgstr "без изменений"
5286
5287
#: bzrlib/commit.py:998
5288
msgid "{0} [{1}] - Stage"
5289
msgstr ""
5290
5291
#: bzrlib/commit.py:1001
5292
#, python-format
5293
msgid "%s - Stage"
5294
msgstr ""
5295
5296
#: bzrlib/commit_signature_commands.py:34
5297
msgid "Sign all commits by a given committer."
5298
msgstr ""
5299
5300
#: bzrlib/commit_signature_commands.py:36
5301
msgid ""
5302
"If location is not specified the local tree is used.\n"
5303
"If committer is not specified the default committer is used."
5304
msgstr ""
5305
5306
#: bzrlib/commit_signature_commands.py:39
5307
msgid "This does not sign commits that already have signatures."
5308
msgstr ""
5309
5310
#: bzrlib/commit_signature_commands.py:47
5311
msgid ""
5312
"Don't actually sign anything, just print the revisions that would be signed."
5313
msgstr ""
5314
5315
#: bzrlib/commit_signature_commands.py:98
5316
#, python-format
5317
msgid "Signed %d revision.\n"
5318
msgid_plural "Signed %d revisions.\n"
5319
msgstr[0] ""
5320
msgstr[1] ""
5321
5322
#: bzrlib/commit_signature_commands.py:103
5323
msgid "Verify all commit signatures."
5324
msgstr ""
5325
5326
#: bzrlib/commit_signature_commands.py:105
5327
msgid ""
5328
"Verifies that all commits in the branch are signed by known GnuPG keys."
5329
msgstr ""
5330
5331
#: bzrlib/commit_signature_commands.py:110
5332
msgid ""
5333
"Comma separated list of GPG key patterns which are acceptable for "
5334
"verification."
5335
msgstr ""
5336
5337
#: bzrlib/commit_signature_commands.py:148
5338
msgid "Cannot verify a range of non-revision-history revisions"
5339
msgstr ""
5340
5341
#: bzrlib/commit_signature_commands.py:166
5342
msgid "All commits signed with verifiable keys"
5343
msgstr ""
5344
5345
#: bzrlib/config.py:436
5346
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5347
msgstr ""
5348
5349
#: bzrlib/config.py:2452
5350
msgid "{0} is not an SI unit."
5351
msgstr ""
5352
5353
#: bzrlib/config.py:2971
5354
msgid ""
5355
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5356
"will be saved."
5357
msgstr ""
5358
5359
#: bzrlib/config.py:3116
5360
#, python-format
5361
msgid "Invalid '%s', should be of the form 'name=value'"
5362
msgstr ""
5363
5364
#: bzrlib/config.py:4018
5365
msgid "Display, set or remove a configuration option."
5366
msgstr ""
5367
5368
#: bzrlib/config.py:4020
5369
msgid "Display the active value for a given option."
5370
msgstr ""
5371
5372
#: bzrlib/config.py:4022
5373
msgid ""
5374
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5375
"matching options are displayed mentioning their scope. The active value\n"
5376
"that bzr will take into account is the first one displayed for each option."
5377
msgstr ""
5378
5379
#: bzrlib/config.py:4026
5380
msgid "If no NAME is given, --all .* is implied."
5381
msgstr ""
5382
5383
#: bzrlib/config.py:4028
5384
msgid ""
5385
"Setting a value is achieved by using name=value without spaces. The value\n"
5386
"is set in the most relevant scope and can be checked by displaying the\n"
5387
"option again."
5388
msgstr ""
5389
5390
#: bzrlib/config.py:4040
5391
msgid "Reduce the scope to the specified configuration file."
5392
msgstr ""
5393
5394
#: bzrlib/config.py:4044
5395
msgid "Display all the defined values for the matching options."
5396
msgstr ""
5397
5398
#: bzrlib/config.py:4046
5399
msgid "Remove the option from the configuration file."
5400
msgstr ""
5401
5402
#: bzrlib/conflicts.py:50
5403
msgid "List files with conflicts."
5404
msgstr ""
5405
5406
#: bzrlib/conflicts.py:57
5407
msgid ""
5408
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5409
"is supplied, the pathnames of files with text conflicts are listed,\n"
5410
"instead. (This is useful for editing all files with text conflicts.)"
5411
msgstr ""
5412
5413
#: bzrlib/conflicts.py:61
5414
msgid "Use bzr resolve when you have fixed a problem."
5415
msgstr ""
5416
5417
#: bzrlib/conflicts.py:66
5418
msgid "List paths of files with text conflicts."
5419
msgstr ""
5420
5421
#: bzrlib/conflicts.py:85
5422
msgid "Marks the conflict as resolved."
5423
msgstr ""
5424
5425
#: bzrlib/conflicts.py:88
5426
msgid "Resolve the conflict preserving the version in the working tree."
5427
msgstr ""
5428
5429
#: bzrlib/conflicts.py:91
5430
msgid "Resolve the conflict taking the merged version into account."
5431
msgstr ""
5432
5433
#: bzrlib/conflicts.py:98
5434
msgid "How to resolve the conflict."
5435
msgstr ""
5436
5437
#: bzrlib/conflicts.py:104
5438
msgid "Mark a conflict as resolved."
5439
msgstr ""
5440
5441
#: bzrlib/conflicts.py:111
5442
msgid ""
5443
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5444
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5445
"as\n"
5446
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5447
msgstr ""
5448
5449
#: bzrlib/conflicts.py:119
5450
msgid "Resolve all conflicts in this tree."
5451
msgstr ""
5452
5453
#: bzrlib/conflicts.py:126
5454
msgid "If --all is specified, no FILE may be provided"
5455
msgstr ""
5456
5457
#: bzrlib/conflicts.py:151
5458
#, python-format
5459
msgid "%d conflict auto-resolved."
5460
msgid_plural "%d conflicts auto-resolved."
5461
msgstr[0] ""
5462
msgstr[1] ""
5463
5464
#: bzrlib/conflicts.py:154
5465
msgid "Remaining conflicts:"
5466
msgstr ""
5467
5468
#: bzrlib/conflicts.py:159
5469
msgid "All conflicts resolved."
5470
msgstr ""
5471
5472
#: bzrlib/conflicts.py:168
5473
msgid "{0} conflict resolved, {1} remaining"
5474
msgid_plural "{0} conflicts resolved, {1} remaining"
5475
msgstr[0] ""
5476
msgstr[1] ""
5477
5478
#: bzrlib/controldir.py:712
5479
msgid "{0} is{1} redirected to {2}"
5480
msgstr ""
5481
5482
#: bzrlib/diff.py:399
5483
#, python-format
5484
msgid "*** Ignoring files outside view. View is %s"
5485
msgstr ""
5486
5487
#: bzrlib/errors.py:157
5488
msgid "The tree builder is already building a tree."
5489
msgstr ""
5490
5491
#: bzrlib/errors.py:178
5492
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:197
5496
msgid ""
5497
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5498
"versions \"%(minimum)s\" to \"%(current)s\"."
5499
msgstr ""
5500
5501
#: bzrlib/errors.py:209
5502
msgid "The transport '%(transport)s' is only accessible within this process."
5503
msgstr ""
5504
5505
#: bzrlib/errors.py:227
5506
msgid "Invalid revision number %(revno)s"
5507
msgstr ""
5508
5509
#: bzrlib/errors.py:236
5510
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5511
msgstr ""
5512
5513
#: bzrlib/errors.py:247
5514
msgid "Reserved revision-id {%(revision_id)s}"
5515
msgstr ""
5516
5517
#: bzrlib/errors.py:261
5518
msgid "There is no public branch set for \"%(branch_url)s\"."
5519
msgstr ""
5520
5521
#: bzrlib/errors.py:271
5522
msgid ""
5523
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5524
"obtain a list of topics."
5525
msgstr ""
5526
5527
#: bzrlib/errors.py:280
5528
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5529
msgstr ""
5530
5531
#: bzrlib/errors.py:290
5532
msgid ""
5533
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:299
5537
msgid "The branch '%(branch)s' is not stacked."
5538
msgstr ""
5539
5540
#: bzrlib/errors.py:313
5541
msgid "No WorkingTree exists for \"%(base)s\"."
5542
msgstr ""
5543
5544
#: bzrlib/errors.py:322
5545
msgid "Not currently building a tree."
5546
msgstr ""
5547
5548
#: bzrlib/errors.py:327
5549
msgid "%(url)s is not a local path."
5550
msgstr ""
5551
5552
#: bzrlib/errors.py:355
5553
msgid "%(not_locked)r is not write locked but needs to be."
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:363
5557
msgid "Error in command line options"
5558
msgstr ""
5559
5560
#: bzrlib/errors.py:368
5561
msgid "%(value)s is not an index of type %(_type)s."
5562
msgstr ""
5563
5564
#: bzrlib/errors.py:378
5565
msgid "Error in data for index %(value)s."
5566
msgstr ""
5567
5568
#: bzrlib/errors.py:387
5569
msgid "The key '%(key)s' is already in index '%(index)s'."
5570
msgstr ""
5571
5572
#: bzrlib/errors.py:397
5573
msgid "The key '%(key)s' is not a valid key."
5574
msgstr ""
5575
5576
#: bzrlib/errors.py:406
5577
msgid "Could not parse options for index %(value)s."
5578
msgstr ""
5579
5580
#: bzrlib/errors.py:415
5581
msgid "The value '%(value)s' is not a valid value."
5582
msgstr ""
5583
5584
#: bzrlib/errors.py:424
5585
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5586
msgstr ""
5587
5588
#: bzrlib/errors.py:443
5589
msgid "Generic path error: %(path)r%(extra)s)"
5590
msgstr ""
5591
5592
#: bzrlib/errors.py:456
5593
msgid "No such file: %(path)r%(extra)s"
5594
msgstr ""
5595
5596
#: bzrlib/errors.py:461
5597
msgid "File exists: %(path)r%(extra)s"
5598
msgstr ""
5599
5600
#: bzrlib/errors.py:467
5601
msgid ""
5602
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5603
"after to tell bzr about a rename that has already happened)%(extra)s"
5604
msgstr ""
5605
5606
#: bzrlib/errors.py:483
5607
msgid "\"%(path)s\" is not a directory %(extra)s"
5608
msgstr ""
5609
5610
#: bzrlib/errors.py:488
5611
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5612
msgstr ""
5613
5614
#: bzrlib/errors.py:493
5615
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5616
msgstr ""
5617
5618
#: bzrlib/errors.py:498
5619
msgid "Hard-linking \"%(path)s\" is not supported"
5620
msgstr ""
5621
5622
#: bzrlib/errors.py:513
5623
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5624
msgstr ""
5625
5626
#: bzrlib/errors.py:518
5627
msgid "Permission denied: \"%(path)s\"%(extra)s"
5628
msgstr ""
5629
5630
#: bzrlib/errors.py:523
5631
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5632
msgstr ""
5633
5634
#: bzrlib/errors.py:528
5635
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5636
msgstr ""
5637
5638
#: bzrlib/errors.py:539
5639
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5640
msgstr ""
5641
5642
#: bzrlib/errors.py:561
5643
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:571
5647
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:579
5651
msgid ""
5652
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5653
"upgrade the branch to permit branch stacking."
5654
msgstr ""
5655
5656
#: bzrlib/errors.py:590
5657
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5658
msgstr ""
5659
5660
#: bzrlib/errors.py:600
5661
msgid ""
5662
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5663
"need to upgrade the repository to permit branch stacking."
5664
msgstr ""
5665
5666
#: bzrlib/errors.py:611
5667
msgid "Error reading from %(path)r."
5668
msgstr ""
5669
5670
#: bzrlib/errors.py:630
5671
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5672
msgstr ""
5673
5674
#: bzrlib/errors.py:646
5675
msgid "Path \"%(path)s\" is not unicode normalized"
5676
msgstr ""
5677
5678
#: bzrlib/errors.py:654
5679
msgid "Not a branch: \"%(path)s\"%(detail)s."
5680
msgstr ""
5681
5682
#: bzrlib/errors.py:696
5683
msgid "No submit branch available for branch \"%(path)s\""
5684
msgstr ""
5685
5686
#: bzrlib/errors.py:705
5687
msgid "A control directory already exists: \"%(path)s\"."
5688
msgstr ""
5689
5690
#: bzrlib/errors.py:710
5691
msgid "Already a branch: \"%(path)s\"."
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:715
5695
msgid "Invalid branch name: %(name)s"
5696
msgstr ""
5697
5698
#: bzrlib/errors.py:724
5699
msgid "Parent branch already exists: \"%(path)s\"."
5700
msgstr ""
5701
5702
#: bzrlib/errors.py:730
5703
msgid ""
5704
"Directory contains a branch, but no working tree (use bzr checkout if you "
5705
"wish to build a working tree): \"%(path)s\""
5706
msgstr ""
5707
5708
#: bzrlib/errors.py:735
5709
msgid ""
5710
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5711
msgstr ""
5712
5713
#: bzrlib/errors.py:745
5714
msgid ""
5715
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5716
msgstr ""
5717
5718
#: bzrlib/errors.py:755
5719
msgid "No repository present: \"%(path)s\""
5720
msgstr ""
5721
5722
#: bzrlib/errors.py:762
5723
msgid ""
5724
"Unsupported branch format: %(format)s\n"
5725
"Please run 'bzr upgrade'"
5726
msgstr ""
5727
5728
#: bzrlib/errors.py:768
5729
msgid "Unknown %(kind)s format: %(format)r"
5730
msgstr ""
5731
5732
#: bzrlib/errors.py:777
5733
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5734
msgstr ""
5735
5736
#: bzrlib/errors.py:787
5737
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5738
msgstr ""
5739
5740
#: bzrlib/errors.py:802
5741
msgid ""
5742
"%(target)s\n"
5743
"is not compatible with\n"
5744
"%(source)s\n"
5745
"%(details)s"
5746
msgstr ""
5747
5748
#: bzrlib/errors.py:818
5749
msgid "Revision is not compatible with %(repo_format)s"
5750
msgstr ""
5751
5752
#: bzrlib/errors.py:828
5753
msgid "%(context_info)s%(path)s is already versioned."
5754
msgstr ""
5755
5756
#: bzrlib/errors.py:849
5757
msgid "%(context_info)s%(path)s is not versioned."
5758
msgstr ""
5759
5760
#: bzrlib/errors.py:870
5761
msgid "Path(s) are not versioned: %(paths_as_string)s"
5762
msgstr ""
5763
5764
#: bzrlib/errors.py:881
5765
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5766
msgstr ""
5767
5768
#: bzrlib/errors.py:900
5769
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5770
msgstr ""
5771
5772
#: bzrlib/errors.py:908
5773
msgid ""
5774
"Filename %(filename)r is not valid in your current filesystem encoding "
5775
"%(fs_encoding)s"
5776
msgstr ""
5777
5778
#: bzrlib/errors.py:919
5779
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5780
msgstr ""
5781
5782
#: bzrlib/errors.py:937
5783
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5784
msgstr ""
5785
5786
#: bzrlib/errors.py:976
5787
msgid "Cannot lock %(lock)s: %(why)s"
5788
msgstr ""
5789
5790
#: bzrlib/errors.py:986
5791
msgid ""
5792
"A transaction related operation was attempted after the transaction finished."
5793
msgstr ""
5794
5795
#: bzrlib/errors.py:1013
5796
msgid "Cannot lock: transport is read only: %(transport)s"
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:1021
5800
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5801
msgstr ""
5802
5803
#: bzrlib/errors.py:1032
5804
msgid ""
5805
"Lock was broken while still open: %(lock)s - check storage consistency!"
5806
msgstr ""
5807
5808
#: bzrlib/errors.py:1043
5809
msgid ""
5810
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5811
"%(holder)r, wanted to break %(target)r"
5812
msgstr ""
5813
5814
#: bzrlib/errors.py:1055
5815
msgid ""
5816
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5817
"Use 'bzr break-lock' to clear it"
5818
msgstr ""
5819
5820
#: bzrlib/errors.py:1068
5821
msgid "Lock not held: %(lock)s"
5822
msgstr ""
5823
5824
#: bzrlib/errors.py:1097
5825
msgid "No changes to commit"
5826
msgstr ""
5827
5828
#: bzrlib/errors.py:1102
5829
msgid ""
5830
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5831
msgstr ""
5832
5833
#: bzrlib/errors.py:1112
5834
msgid ""
5835
"Excluding paths during commit is not supported by repository at "
5836
"%(repository)r."
5837
msgstr ""
5838
5839
#: bzrlib/errors.py:1121
5840
msgid ""
5841
"The specified commit message contains characters unsupported by the current "
5842
"encoding."
5843
msgstr ""
5844
5845
#: bzrlib/errors.py:1127
5846
msgid "Upgrade URL cannot work with readonly URLs."
5847
msgstr ""
5848
5849
#: bzrlib/errors.py:1132
5850
msgid "The branch format %(format)s is already at the most recent format."
5851
msgstr ""
5852
5853
#: bzrlib/errors.py:1155
5854
msgid "Option --change does not accept revision ranges"
5855
msgstr ""
5856
5857
#: bzrlib/errors.py:1160
5858
msgid "No namespace registered for string: %(spec)r"
5859
msgstr ""
5860
5861
#: bzrlib/errors.py:1179
5862
msgid ""
5863
"Requested revision: '%(spec)s' does not exist in branch: "
5864
"%(branch_url)s%(extra)s"
5865
msgstr ""
5866
5867
#: bzrlib/errors.py:1193
5868
msgid ""
5869
"Operation denied because it would change the main history, which is not "
5870
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5871
msgstr ""
5872
5873
#: bzrlib/errors.py:1204
5874
msgid ""
5875
"These branches have diverged. Use the missing command to see how.\n"
5876
"Use the merge command to reconcile them."
5877
msgstr ""
5878
5879
#: bzrlib/errors.py:1224
5880
msgid ""
5881
"Branches have no common ancestor, and no merge base revision was specified."
5882
msgstr ""
5883
5884
#: bzrlib/errors.py:1230
5885
msgid ""
5886
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5887
msgstr ""
5888
5889
#: bzrlib/errors.py:1236
5890
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:1245
5894
msgid ""
5895
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5896
msgstr ""
5897
5898
#: bzrlib/errors.py:1254
5899
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:1263
5903
msgid "Branch %(branch)s has no commits."
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:1281
5907
msgid ""
5908
"Bound branch %(branch)s is out of date with master branch "
5909
"%(master)s.%(extra_help)s"
5910
msgstr ""
5911
5912
#: bzrlib/errors.py:1293
5913
msgid ""
5914
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5915
"bound to %(remote)s."
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:1305
5919
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5920
msgstr ""
5921
5922
#: bzrlib/errors.py:1314
5923
msgid ""
5924
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5925
"%(error)s"
5926
msgstr ""
5927
5928
#: bzrlib/errors.py:1326
5929
msgid "Error in processing weave: %(msg)s"
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:1335
5933
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5934
msgstr ""
5935
5936
#: bzrlib/errors.py:1346
5937
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5938
msgstr ""
5939
5940
#: bzrlib/errors.py:1356
5941
msgid "Weave invariant violated: %(what)s"
5942
msgstr ""
5943
5944
#: bzrlib/errors.py:1365
5945
msgid "Parents are mismatched between two revisions. %(msg)s"
5946
msgstr ""
5947
5948
#: bzrlib/errors.py:1387
5949
msgid ""
5950
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5951
"%(weave_b)s"
5952
msgstr ""
5953
5954
#: bzrlib/errors.py:1399
5955
msgid "Versioned file error"
5956
msgstr ""
5957
5958
#: bzrlib/errors.py:1404
5959
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5960
msgstr ""
5961
5962
#: bzrlib/errors.py:1414
5963
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5964
msgstr ""
5965
5966
#: bzrlib/errors.py:1424
5967
msgid "Text did not match its checksum: %(msg)s"
5968
msgstr ""
5969
5970
#: bzrlib/errors.py:1550
5971
msgid "Export format %(format)r not supported"
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:1559
5975
msgid "Transport error: %(msg)s %(orig_error)s"
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:1585
5979
msgid "Generic bzr smart protocol error: %(details)s"
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:1593
5983
msgid "Received bad protocol version marker: %(marker)r"
5984
msgstr ""
5985
5986
#: bzrlib/errors.py:1625
5987
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:1630
5991
msgid "Connection error: %(msg)s %(orig_error)s"
5992
msgstr ""
5993
5994
#: bzrlib/errors.py:1635
5995
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5996
msgstr ""
5997
5998
#: bzrlib/errors.py:1656
5999
msgid "Connection closed: %(msg)s %(orig_error)s"
6000
msgstr ""
6001
6002
#: bzrlib/errors.py:1661
6003
msgid "Connection Timeout: %(msg)s%(orig_error)s"
6004
msgstr ""
6005
6006
#: bzrlib/errors.py:1666
6007
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
6008
msgstr ""
6009
6010
#: bzrlib/errors.py:1676
6011
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:1691
6015
msgid "Certificate error: %(error)s"
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:1699
6019
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
6020
msgstr ""
6021
6022
#: bzrlib/errors.py:1713
6023
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
6024
msgstr ""
6025
6026
#: bzrlib/errors.py:1721
6027
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
6028
msgstr ""
6029
6030
#: bzrlib/errors.py:1730
6031
msgid "%(source)s is%(permanently)s redirected to %(target)s"
6032
msgstr ""
6033
6034
#: bzrlib/errors.py:1744
6035
msgid "Too many redirections"
6036
msgstr ""
6037
6038
#: bzrlib/errors.py:1749
6039
msgid "Working tree has conflicts."
6040
msgstr ""
6041
6042
#: bzrlib/errors.py:1753
6043
msgid "Config file %(filename)s is not UTF-8 encoded\n"
6044
msgstr ""
6045
6046
#: bzrlib/errors.py:1762
6047
msgid ""
6048
"Error(s) parsing config file %(filename)s:\n"
6049
"%(errors)s"
6050
msgstr ""
6051
6052
#: bzrlib/errors.py:1772
6053
msgid ""
6054
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6055
"See ``bzr help %(name)s``"
6056
msgstr ""
6057
6058
#: bzrlib/errors.py:1782
6059
msgid "%(username)r does not seem to contain a reasonable email address"
6060
msgstr ""
6061
6062
#: bzrlib/errors.py:1791
6063
msgid "Failed to GPG sign data with command \"%(command_line)s\""
6064
msgstr ""
6065
6066
#: bzrlib/errors.py:1799
6067
msgid "Failed to verify GPG signature data with error \"%(error)s\""
6068
msgstr "Не удалось верифицировать подпись GPG с ошибкой «%(error)s»"
6069
6070
#: bzrlib/errors.py:1807
6071
msgid "Unable to import library \"%(library)s\": %(error)s"
6072
msgstr "Не удалось импортировать библиотеку «%(library)s»: %(error)s"
6073
6074
#: bzrlib/errors.py:1815
6075
msgid "python-gpgme is not installed, it is needed to verify signatures"
6076
msgstr "python-gpgme не устонвлен, он нужен для верификации подписей"
6077
6078
#: bzrlib/errors.py:1823
6079
msgid ""
6080
"The working tree for %(basedir)s has changed since the last commit, but "
6081
"weave merge requires that it be unchanged"
6082
msgstr ""
6083
"Рабочее дерево для %(basedir)s изменилось с последнего закрепления, но merge "
6084
"требует, чтобы оно не содержало изменений"
6085
6086
#: bzrlib/errors.py:1833
6087
msgid ""
6088
"Can't reprocess and show base, because reprocessing obscures the "
6089
"relationship of conflicting lines to the base"
6090
msgstr ""
6091
6092
#: bzrlib/errors.py:1839
6093
msgid "Cycle in graph %(graph)r"
6094
msgstr "Цикл в графе %(graph)r"
6095
6096
#: bzrlib/errors.py:1867
6097
msgid "File %(filename)s is not conflicted."
6098
msgstr "Файл %(filename)s не содержит конфликтов."
6099
6100
#: bzrlib/errors.py:1889
6101
msgid "No bundle was found in \"%(filename)s\"."
6102
msgstr "В файле «%(filename)s» нет пакета."
6103
6104
#: bzrlib/errors.py:1898
6105
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6106
msgstr "Не удалось обработать версию пакета %(version)s: %(msg)s"
6107
6108
#: bzrlib/errors.py:1908
6109
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6110
msgstr ""
6111
"В ветви %(base)s отсутствует ревизия %(text_revision)s файла %(file_id)s"
6112
6113
#: bzrlib/errors.py:1921
6114
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6115
msgstr ""
6116
"Идентификатор файла {%(file_id)s} уже присутствует в инвентаре как %(entry)s"
6117
6118
#: bzrlib/errors.py:1931
6119
msgid "Key %(key)s is already present in map"
6120
msgstr ""
6121
6122
#: bzrlib/errors.py:1936
6123
msgid "The prefix %(prefix)s is in the help search path twice."
6124
msgstr ""
6125
6126
#: bzrlib/errors.py:1946
6127
msgid ""
6128
"No final name for trans_id %(trans_id)r\n"
6129
"file-id: %(file_id)r\n"
6130
"root trans-id: %(root_trans_id)r\n"
6131
msgstr ""
6132
6133
#: bzrlib/errors.py:1978
6134
msgid "Attempt to reuse a transform that has already been applied."
6135
msgstr ""
6136
6137
#: bzrlib/errors.py:1983
6138
msgid "Moving the root directory is not supported at this time"
6139
msgstr "Перемещение в корневую директорию пока не поддерживается"
6140
6141
#: bzrlib/errors.py:1988
6142
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6143
msgstr "Не удалось переименовать %(from_path)s в %(to_path)s: %(why)s"
6144
6145
#: bzrlib/errors.py:1999
6146
msgid ""
6147
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6148
msgstr ""
6149
"Не удалось переместить %(from_path)s%(operator)s "
6150
"%(to_path)s%(_has_extra)s%(extra)s"
6151
6152
#: bzrlib/errors.py:2035
6153
msgid ""
6154
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6155
msgstr ""
6156
"Не удалось переименовать %(from_path)s%(operator)s "
6157
"%(to_path)s%(_has_extra)s%(extra)s"
6158
6159
#: bzrlib/errors.py:2065
6160
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6161
msgstr ""
6162
6163
#: bzrlib/errors.py:2073
6164
msgid "Nothing to merge."
6165
msgstr "Нечего совмещать."
6166
6167
#: bzrlib/errors.py:2078
6168
msgid "Format %(format)s cannot be initialised by this version of bzr."
6169
msgstr ""
6170
6171
#: bzrlib/errors.py:2087
6172
msgid ""
6173
"Cannot convert from format %(from_format)s to format %(format)s. "
6174
"%(problem)s"
6175
msgstr ""
6176
6177
#: bzrlib/errors.py:2099
6178
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6179
msgstr ""
6180
6181
#: bzrlib/errors.py:2107
6182
msgid "%(exe_name)s could not be found on this machine"
6183
msgstr ""
6184
6185
#: bzrlib/errors.py:2115
6186
msgid "Diff is not installed on this machine: %(msg)s"
6187
msgstr ""
6188
6189
#: bzrlib/errors.py:2123
6190
msgid "Diff3 is not installed on this machine."
6191
msgstr "Diff3 не установлен на этой машине."
6192
6193
#: bzrlib/errors.py:2129
6194
msgid "The content being inserted is already present."
6195
msgstr ""
6196
6197
#: bzrlib/errors.py:2134
6198
msgid ""
6199
"This tree contains left-over files from a failed operation.\n"
6200
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6201
"to\n"
6202
" keep, and delete it when you are done."
6203
msgstr ""
6204
6205
#: bzrlib/errors.py:2145
6206
msgid ""
6207
"This tree contains left-over files from a failed operation.\n"
6208
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6209
" wish to keep, and delete it when you are done."
6210
msgstr ""
6211
6212
#: bzrlib/errors.py:2155
6213
msgid ""
6214
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6215
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6216
"to\n"
6217
" keep, and delete it when you are done."
6218
msgstr ""
6219
6220
#: bzrlib/errors.py:2166
6221
msgid ""
6222
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6223
"examine %(pending_deletion)s to see if it contains any files you wish to "
6224
"keep, and delete it when you are done."
6225
msgstr ""
6226
6227
#: bzrlib/errors.py:2176
6228
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6229
msgstr ""
6230
6231
#: bzrlib/errors.py:2190
6232
msgid ""
6233
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6234
msgstr ""
6235
6236
#: bzrlib/errors.py:2203
6237
msgid "Error in merge modified format"
6238
msgstr ""
6239
6240
#: bzrlib/errors.py:2208
6241
msgid "Format error in conflict listings"
6242
msgstr ""
6243
6244
#: bzrlib/errors.py:2212
6245
msgid ""
6246
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6247
"Error: %(description)s"
6248
msgstr ""
6249
6250
#: bzrlib/errors.py:2223
6251
msgid ""
6252
"An error has been detected in the repository %(repo_path)s.\n"
6253
"Please run bzr reconcile on this repository."
6254
msgstr ""
6255
6256
#: bzrlib/errors.py:2234
6257
msgid ""
6258
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6259
"reason: %(reason)s"
6260
msgstr ""
6261
6262
#: bzrlib/errors.py:2247
6263
msgid ""
6264
"An inconsistent delta was supplied: %(delta)r\n"
6265
"reason: %(reason)s"
6266
msgstr ""
6267
6268
#: bzrlib/errors.py:2259
6269
msgid "To use this feature you must upgrade your branch at %(path)s."
6270
msgstr ""
6271
6272
#: bzrlib/errors.py:2268
6273
msgid "To use this feature you must upgrade your repository at %(path)s."
6274
msgstr ""
6275
6276
#: bzrlib/errors.py:2273
6277
msgid ""
6278
"To use this feature you must upgrade your branch at %(path)s to a format "
6279
"which supports rich roots."
6280
msgstr ""
6281
6282
#: bzrlib/errors.py:2279
6283
msgid "Cannot perform local-only commits on unbound branches."
6284
msgstr ""
6285
6286
#: bzrlib/errors.py:2284
6287
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6288
msgstr ""
6289
6290
#: bzrlib/errors.py:2305
6291
msgid "Ghost tags not supported by format %(format)r."
6292
msgstr ""
6293
6294
#: bzrlib/errors.py:2313
6295
msgid "File is binary but should be text."
6296
msgstr ""
6297
6298
#: bzrlib/errors.py:2318
6299
msgid "The path %(path)s is not permitted on this platform"
6300
msgstr ""
6301
6302
#: bzrlib/errors.py:2327
6303
msgid ""
6304
"Testament did not match expected value.\n"
6305
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6306
" {%(measured)s}"
6307
msgstr ""
6308
6309
#: bzrlib/errors.py:2339
6310
msgid "Not a bzr revision-bundle: %(text)r"
6311
msgstr ""
6312
6313
#: bzrlib/errors.py:2348
6314
msgid "Bad bzr revision-bundle: %(text)r"
6315
msgstr ""
6316
6317
#: bzrlib/errors.py:2357
6318
msgid "Malformed bzr revision-bundle header: %(text)r"
6319
msgstr ""
6320
6321
#: bzrlib/errors.py:2362
6322
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6323
msgstr ""
6324
6325
#: bzrlib/errors.py:2367
6326
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6327
msgstr ""
6328
6329
#: bzrlib/errors.py:2372
6330
msgid "End of line marker was not \\n in bzr revision-bundle"
6331
msgstr ""
6332
6333
#: bzrlib/errors.py:2382
6334
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6335
msgstr ""
6336
6337
#: bzrlib/errors.py:2392
6338
msgid "Root class for inventory serialization errors"
6339
msgstr ""
6340
6341
#: bzrlib/errors.py:2396
6342
msgid ""
6343
"The inventory was not in the expected format:\n"
6344
" %(msg)s"
6345
msgstr ""
6346
6347
#: bzrlib/errors.py:2405
6348
msgid "This operation requires rich root data storage"
6349
msgstr ""
6350
6351
#: bzrlib/errors.py:2418
6352
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6353
msgstr ""
6354
6355
#: bzrlib/errors.py:2427
6356
msgid ""
6357
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6358
"variable."
6359
msgstr ""
6360
6361
#: bzrlib/errors.py:2434
6362
msgid ""
6363
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6364
"ghost at {%(ghost_revision_id)s}"
6365
msgstr ""
6366
6367
#: bzrlib/errors.py:2444
6368
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6369
msgstr ""
6370
6371
#: bzrlib/errors.py:2495
6372
msgid ""
6373
"A merge directive must provide either a bundle or a public branch location."
6374
msgstr ""
6375
6376
#: bzrlib/errors.py:2502
6377
msgid "Bad merge directive payload %(start)r"
6378
msgstr ""
6379
6380
#: bzrlib/errors.py:2512
6381
msgid "Preview patch does not match requested changes."
6382
msgstr ""
6383
6384
#: bzrlib/errors.py:2518
6385
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6386
msgstr ""
6387
6388
#: bzrlib/errors.py:2528
6389
msgid ""
6390
"Your branch does not have all of the revisions required in order to merge "
6391
"this merge directive and the target location specified in the merge "
6392
"directive is not a branch: %(location)s."
6393
msgstr ""
6394
6395
#: bzrlib/errors.py:2540
6396
msgid "Unsupported entry kind %(kind)s"
6397
msgstr ""
6398
6399
#: bzrlib/errors.py:2548
6400
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6401
msgstr ""
6402
6403
#: bzrlib/errors.py:2558
6404
msgid "Subsume target %(other_tree)s needs to be upgraded."
6405
msgstr ""
6406
6407
#: bzrlib/errors.py:2577
6408
msgid "No such tag: %(tag_name)s"
6409
msgstr ""
6410
6411
#: bzrlib/errors.py:2585
6412
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6413
msgstr ""
6414
6415
#: bzrlib/errors.py:2594
6416
msgid "Tag %(tag_name)s already exists."
6417
msgstr ""
6418
6419
#: bzrlib/errors.py:2602
6420
msgid ""
6421
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6422
"bugs\" for more information on this feature."
6423
msgstr ""
6424
6425
#: bzrlib/errors.py:2612
6426
msgid ""
6427
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6428
msgstr ""
6429
6430
#: bzrlib/errors.py:2622
6431
msgid ""
6432
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6433
msgstr ""
6434
6435
#: bzrlib/errors.py:2632
6436
msgid "Invalid line in bugs property: '%(line)s'"
6437
msgstr ""
6438
6439
#: bzrlib/errors.py:2640
6440
msgid "Invalid bug status: '%(status)s'"
6441
msgstr ""
6442
6443
#: bzrlib/errors.py:2648
6444
msgid "Could not understand response from smart server: %(response_tuple)r"
6445
msgstr ""
6446
6447
#: bzrlib/errors.py:2687
6448
msgid "Server sent an unexpected error: %(error_tuple)r"
6449
msgstr ""
6450
6451
#: bzrlib/errors.py:2706
6452
msgid "Unrecognised container format: %(container_format)r"
6453
msgstr ""
6454
6455
#: bzrlib/errors.py:2714
6456
msgid "Unexpected end of container stream"
6457
msgstr ""
6458
6459
#: bzrlib/errors.py:2719
6460
msgid "Unknown record type: %(record_type)r"
6461
msgstr ""
6462
6463
#: bzrlib/errors.py:2727
6464
msgid "Invalid record: %(reason)s"
6465
msgstr ""
6466
6467
#: bzrlib/errors.py:2735
6468
msgid "Container has data after end marker: %(excess)r"
6469
msgstr ""
6470
6471
#: bzrlib/errors.py:2743
6472
msgid "Container has multiple records with the same name: %(name)s"
6473
msgstr ""
6474
6475
#: bzrlib/errors.py:2756
6476
msgid "Corrupt or incompatible data stream: %(reason)s"
6477
msgstr ""
6478
6479
#: bzrlib/errors.py:2764
6480
msgid "SMTP error: %(error)s"
6481
msgstr ""
6482
6483
#: bzrlib/errors.py:2772
6484
msgid "No message supplied."
6485
msgstr ""
6486
6487
#: bzrlib/errors.py:2777
6488
msgid "No mail-to address (--mail-to) or output (-o) specified."
6489
msgstr ""
6490
6491
#: bzrlib/errors.py:2782
6492
msgid ""
6493
"Unable to find mail client with the following names: "
6494
"%(mail_command_list_string)s"
6495
msgstr ""
6496
6497
#: bzrlib/errors.py:2792
6498
msgid "SMTP connection to %(host)s refused"
6499
msgstr ""
6500
6501
#: bzrlib/errors.py:2801
6502
msgid "Please specify smtp_server. No server at default %(host)s."
6503
msgstr ""
6504
6505
#: bzrlib/errors.py:2815
6506
msgid ""
6507
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6508
"reconfigure."
6509
msgstr ""
6510
6511
#: bzrlib/errors.py:2827
6512
msgid "'%(display_url)s' is already a branch."
6513
msgstr ""
6514
6515
#: bzrlib/errors.py:2832
6516
msgid "'%(display_url)s' is already a tree."
6517
msgstr ""
6518
6519
#: bzrlib/errors.py:2837
6520
msgid "'%(display_url)s' is already a checkout."
6521
msgstr ""
6522
6523
#: bzrlib/errors.py:2842
6524
msgid "'%(display_url)s' is already a lightweight checkout."
6525
msgstr ""
6526
6527
#: bzrlib/errors.py:2847
6528
msgid "'%(display_url)s' is already using a shared repository."
6529
msgstr ""
6530
6531
#: bzrlib/errors.py:2852
6532
msgid "'%(display_url)s' is already standalone."
6533
msgstr ""
6534
6535
#: bzrlib/errors.py:2857
6536
msgid "Shared repository '%(display_url)s' already creates working trees."
6537
msgstr ""
6538
6539
#: bzrlib/errors.py:2863
6540
msgid ""
6541
"Shared repository '%(display_url)s' already doesn't create working trees."
6542
msgstr ""
6543
6544
#: bzrlib/errors.py:2869
6545
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6546
msgstr ""
6547
6548
#: bzrlib/errors.py:2874
6549
msgid "No location could be found to bind to at %(display_url)s."
6550
msgstr ""
6551
6552
#: bzrlib/errors.py:2879
6553
msgid ""
6554
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6555
"status).%(more)s"
6556
msgstr ""
6557
6558
#: bzrlib/errors.py:2898
6559
msgid ""
6560
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6561
"list).%(more)s"
6562
msgstr ""
6563
6564
#: bzrlib/errors.py:2904
6565
msgid "Variable {%(name)s} is not available."
6566
msgstr ""
6567
6568
#: bzrlib/errors.py:2912
6569
msgid "No template specified."
6570
msgstr ""
6571
6572
#: bzrlib/errors.py:2917
6573
msgid "Unable to create symlink %(path_str)son this platform"
6574
msgstr ""
6575
6576
#: bzrlib/errors.py:2932
6577
msgid ""
6578
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6579
"\"original\", \"local\"."
6580
msgstr ""
6581
6582
#: bzrlib/errors.py:2966
6583
msgid ""
6584
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6585
msgstr ""
6586
6587
#: bzrlib/errors.py:2978
6588
msgid "The \"%(config_id)s\" configuration does not exist."
6589
msgstr ""
6590
6591
#: bzrlib/errors.py:2986
6592
msgid "The \"%(option_name)s\" configuration option does not exist."
6593
msgstr ""
6594
6595
#: bzrlib/errors.py:2994
6596
msgid "The alias \"%(alias_name)s\" does not exist."
6597
msgstr ""
6598
6599
#: bzrlib/errors.py:3008
6600
msgid "\"%(alias_name)s\" is not a valid location alias."
6601
msgstr ""
6602
6603
#: bzrlib/errors.py:3016
6604
msgid "No %(alias_name)s location assigned."
6605
msgstr ""
6606
6607
#: bzrlib/errors.py:3024
6608
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6609
msgstr ""
6610
6611
#: bzrlib/errors.py:3034
6612
msgid "Unknown rules detected: %(unknowns_str)s."
6613
msgstr ""
6614
6615
#: bzrlib/errors.py:3045
6616
msgid "Tip change rejected: %(msg)s"
6617
msgstr ""
6618
6619
#: bzrlib/errors.py:3053
6620
msgid "Shelf corrupt."
6621
msgstr ""
6622
6623
#: bzrlib/errors.py:3058
6624
msgid "Corruption while decompressing repository file%(orig_error)s"
6625
msgstr ""
6626
6627
#: bzrlib/errors.py:3070
6628
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6629
msgstr ""
6630
6631
#: bzrlib/errors.py:3078
6632
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6633
msgstr ""
6634
6635
#: bzrlib/errors.py:3086
6636
msgid ""
6637
"An attempt to access a url outside the server jail was made: '%(url)s'."
6638
msgstr ""
6639
6640
#: bzrlib/errors.py:3094
6641
msgid "The user aborted the operation."
6642
msgstr ""
6643
6644
#: bzrlib/errors.py:3099
6645
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6646
msgstr ""
6647
6648
#: bzrlib/errors.py:3109
6649
msgid "No such view: %(view_name)s."
6650
msgstr ""
6651
6652
#: bzrlib/errors.py:3119
6653
msgid ""
6654
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6655
"to a later format."
6656
msgstr ""
6657
6658
#: bzrlib/errors.py:3128
6659
msgid ""
6660
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6661
msgstr ""
6662
6663
#: bzrlib/errors.py:3195
6664
msgid "%(bzrdir)r does not support co-located branches."
6665
msgstr ""
6666
6667
#: bzrlib/errors.py:3201
6668
msgid ""
6669
"Unable to determine your name.\n"
6670
"Please, set your name with the 'whoami' command.\n"
6671
"E.g. bzr whoami \"Your Name <name@example.com>\""
6672
msgstr ""
6673
6674
#: bzrlib/errors.py:3210
6675
msgid "Invalid pattern(s) found. %(msg)s"
6676
msgstr ""
6677
6678
#: bzrlib/errors.py:3218
6679
msgid ""
6680
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6681
"unbind` to fix."
6682
msgstr ""
6683
6684
#: bzrlib/errors.py:3229
6685
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6686
msgstr ""
6687
6688
#: bzrlib/errors.py:3238
6689
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6690
msgstr ""
6691
6692
#: bzrlib/errors.py:3247
6693
msgid ""
6694
"No compatible object available for operations from %(source)r to %(target)r."
6695
msgstr ""
6696
6697
#: bzrlib/errors.py:3257
6698
msgid ""
6699
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6700
"%(arguments)s."
6701
msgstr ""
6702
6703
#: bzrlib/errors.py:3267
6704
msgid ""
6705
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6706
"format %(format)r"
6707
msgstr ""
6708
6709
#: bzrlib/errors.py:3279
6710
msgid ""
6711
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6712
"plugin."
6713
msgstr ""
6714
6715
#: bzrlib/errors.py:3292
6716
msgid "Binary files section encountered."
6717
msgstr ""
6718
6719
#: bzrlib/errors.py:3300
6720
msgid ""
6721
"Malformed patch header. %(desc)s\n"
6722
"%(line)r"
6723
msgstr ""
6724
6725
#: bzrlib/errors.py:3309
6726
msgid ""
6727
"Malformed hunk header. %(desc)s\n"
6728
"%(line)r"
6729
msgstr ""
6730
6731
#: bzrlib/errors.py:3318
6732
msgid ""
6733
"Malformed line. %(desc)s\n"
6734
"%(line)r"
6735
msgstr ""
6736
6737
#: bzrlib/errors.py:3328
6738
msgid ""
6739
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6740
"but patch says it should be \"%(patch_line)s\""
6741
msgstr ""
6742
6743
#: bzrlib/errors.py:3339
6744
msgid "The feature %(feature)s has already been registered."
6745
msgstr ""
6746
6747
#: bzrlib/export_pot.py:252
6748
#, python-format
6749
msgid "Exporting messages from builtin command: %s"
6750
msgstr ""
6751
6752
#: bzrlib/export_pot.py:271
6753
msgid "Exporting messages from plugin command: {0} in {1}"
6754
msgstr ""
6755
6756
#: bzrlib/export_pot.py:292
6757
#, python-format
6758
msgid "Exporting message from error: %s"
6759
msgstr ""
6760
6761
#: bzrlib/fetch.py:98
6762
msgid "Finding revisions"
6763
msgstr ""
6764
6765
#: bzrlib/fetch.py:103
6766
msgid "Fetching revisions"
6767
msgstr ""
6768
6769
#: bzrlib/foreign.py:262
6770
msgid "Push into a different VCS without any custom bzr metadata."
6771
msgstr ""
6772
6773
#: bzrlib/foreign.py:264
6774
msgid ""
6775
"This will afterwards rebase the local branch on the remote\n"
6776
"branch unless the --no-rebase option is used, in which case \n"
6777
"the two branches will be out of sync after the push. "
6778
msgstr ""
6779
6780
#: bzrlib/foreign.py:277
6781
msgid "Do not rebase after push."
6782
msgstr ""
6783
6784
#: bzrlib/foreign.py:311
6785
#, python-format
6786
msgid "Using saved location: %s\n"
6787
msgstr ""
6788
6789
#: bzrlib/foreign.py:321
6790
msgid ""
6791
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6792
"regular push."
6793
msgstr ""
6794
6795
#: bzrlib/gpg.py:366
6796
msgid "No GnuPG key results for pattern: {0}"
6797
msgstr ""
6798
6799
#: bzrlib/gpg.py:439
6800
msgid "{0} commits with valid signatures"
6801
msgstr ""
6802
6803
#: bzrlib/gpg.py:445
6804
msgid "{0} commit with unknown key"
6805
msgid_plural "{0} commits with unknown keys"
6806
msgstr[0] "{0} закрепление с неизвестным ключом"
6807
msgstr[1] "{0} закрепления с неизвестным ключом"
6808
msgstr[2] "{0} закреплений с неизвестным ключом"
6809
6810
#: bzrlib/gpg.py:453
6811
msgid "{0} commit not valid"
6812
msgid_plural "{0} commits not valid"
6813
msgstr[0] ""
6814
msgstr[1] ""
6815
6816
#: bzrlib/gpg.py:461
6817
msgid "{0} commit not signed"
6818
msgid_plural "{0} commits not signed"
6819
msgstr[0] ""
6820
msgstr[1] ""
6821
6822
#: bzrlib/gpg.py:469
6823
msgid "{0} commit with key now expired"
6824
msgid_plural "{0} commits with key now expired"
6825
msgstr[0] ""
6826
msgstr[1] ""
6827
6828
#: bzrlib/gpg.py:489
6829
msgid "{0} commit by author {1} with key {2} now expired"
6830
msgid_plural "{0} commits by author {1} with key {2} now expired"
6831
msgstr[0] ""
6832
msgstr[1] ""
6833
6834
#: bzrlib/gpg.py:505
6835
msgid "{0} signed {1} commit"
6836
msgid_plural "{0} signed {1} commits"
6837
msgstr[0] ""
6838
msgstr[1] ""
6839
6840
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6841
msgid "{0} commit by author {1}"
6842
msgid_plural "{0} commits by author {1}"
6843
msgstr[0] ""
6844
msgstr[1] ""
6845
6846
#: bzrlib/gpg.py:554
6847
msgid "Unknown key {0} signed {1} commit"
6848
msgid_plural "Unknown key {0} signed {1} commits"
6849
msgstr[0] "Неизвестным ключом {0} подписано {1} закрепление"
6850
msgstr[1] "Неизвестным ключом {0} подписаны {1} закрепления"
6851
msgstr[2] "Неизвестным ключом {0} подписаны {1} закреплений"
6852
6853
#: bzrlib/groupcompress.py:1739
6854
#, python-format
6855
msgid "Insert claimed random_id=True, but then inserted %r two times"
6856
msgstr ""
6857
6858
#: bzrlib/hooks.py:313
6859
#, python-format
6860
msgid "Introduced in: %s"
6861
msgstr ""
6862
6863
#: bzrlib/hooks.py:316
6864
#, python-format
6865
msgid "Deprecated in: %s"
6866
msgstr ""
6867
6868
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6869
msgid "Walking content"
6870
msgstr ""
6871
6872
#: bzrlib/knit.py:3330
6873
msgid "annotating"
6874
msgstr ""
6875
6876
#: bzrlib/lock.py:548
6877
msgid "{0!r} was {1} locked again"
6878
msgstr ""
6879
6880
#: bzrlib/lockdir.py:321
6881
#, python-format
6882
msgid "error removing pending lock: %s"
6883
msgstr ""
6884
6885
#: bzrlib/lockdir.py:616
6886
msgid "Unable to obtain"
6887
msgstr ""
6888
6889
#: bzrlib/lockdir.py:618
6890
msgid "Lock owner changed for"
6891
msgstr ""
6892
6893
#: bzrlib/lockdir.py:620
6894
msgid "{0} lock {1} {2}."
6895
msgstr ""
6896
6897
#: bzrlib/lockdir.py:627
6898
#, python-format
6899
msgid "Will continue to try until %s, unless you press Ctrl-C."
6900
msgstr ""
6901
6902
#: bzrlib/lockdir.py:629
6903
msgid "See \"bzr help break-lock\" for more."
6904
msgstr ""
6905
6906
#: bzrlib/lockdir.py:739
6907
#, python-format
6908
msgid ""
6909
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6910
msgstr ""
6911
6912
#: bzrlib/log.py:563
6913
msgid "--exclude-common-ancestry requires two different revisions"
6914
msgstr ""
6915
6916
#: bzrlib/log.py:565
6917
#, python-format
6918
msgid "invalid direction %r"
6919
msgstr ""
6920
6921
#: bzrlib/log.py:653
6922
msgid "Start revision not found in history of end revision."
6923
msgstr ""
6924
6925
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6926
msgid "Logging revision 0 is invalid."
6927
msgstr ""
6928
6929
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6930
msgid "Start revision must be older than the end revision."
6931
msgstr ""
6932
6933
#: bzrlib/log.py:1818
6934
#, python-format
6935
msgid "unknown log formatter: %r"
6936
msgstr ""
6937
6938
#: bzrlib/log.py:2114
6939
msgid "fixes bug"
6940
msgid_plural "fixes bugs"
6941
msgstr[0] ""
6942
msgstr[1] ""
6943
6944
#: bzrlib/merge.py:689
6945
msgid "All changes applied successfully."
6946
msgstr ""
6947
6948
#: bzrlib/merge.py:691
6949
#, python-format
6950
msgid "%d conflicts encountered."
6951
msgstr ""
6952
6953
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6954
msgid "Preparing file merge"
6955
msgstr ""
6956
6957
#: bzrlib/multiparent.py:426
6958
msgid "Importing revisions"
6959
msgstr ""
6960
6961
#: bzrlib/option.py:526
6962
msgid "Show help message."
6963
msgstr ""
6964
6965
#: bzrlib/option.py:528
6966
msgid "Only display errors and warnings."
6967
msgstr ""
6968
6969
#: bzrlib/option.py:531
6970
msgid "Show usage message and options."
6971
msgstr ""
6972
6973
#: bzrlib/option.py:533
6974
msgid "Display more information."
6975
msgstr ""
6976
6977
#: bzrlib/option.py:541
6978
msgid ""
6979
"Select changes introduced by the specified revision. See also \"help "
6980
"revisionspec\"."
6981
msgstr ""
6982
6983
#: bzrlib/option.py:543
6984
msgid "Branch to operate on, instead of working directory."
6985
msgstr ""
6986
6987
#: bzrlib/option.py:545
6988
msgid "Detailed log format."
6989
msgstr ""
6990
6991
#: bzrlib/option.py:545
6992
msgid "Format used by GNU ChangeLog files."
6993
msgstr ""
6994
6995
#: bzrlib/option.py:545
6996
msgid "Log format with one line per revision."
6997
msgstr ""
6998
6999
#: bzrlib/option.py:545
7000
msgid "Moderately short log format."
7001
msgstr ""
7002
7003
#: bzrlib/option.py:545
7004
msgid "Use specified log format."
7005
msgstr ""
7006
7007
#: bzrlib/option.py:547
7008
msgid "Log format"
7009
msgstr ""
7010
7011
#: bzrlib/option.py:549
7012
msgid "LCA-newness merge."
7013
msgstr ""
7014
7015
#: bzrlib/option.py:549
7016
msgid "Merge using external diff3."
7017
msgstr ""
7018
7019
#: bzrlib/option.py:549
7020
msgid "Native diff3-style merge."
7021
msgstr ""
7022
7023
#: bzrlib/option.py:549
7024
msgid "Select a particular merge algorithm."
7025
msgstr ""
7026
7027
#: bzrlib/option.py:549
7028
msgid "Weave-based merge."
7029
msgstr ""
7030
7031
#: bzrlib/option.py:551
7032
msgid "Merge algorithm"
7033
msgstr ""
7034
7035
#: bzrlib/option.py:554
7036
msgid "Message string."
7037
msgstr ""
7038
7039
#: bzrlib/option.py:556
7040
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
7041
msgstr ""
7042
7043
#: bzrlib/option.py:558
7044
msgid "Ignore differences between branches and overwrite unconditionally."
7045
msgstr ""
7046
7047
#: bzrlib/option.py:560
7048
msgid "Remember the specified location as a default."
7049
msgstr ""
7050
7051
#: bzrlib/option.py:562
7052
msgid "Reprocess to reduce spurious conflicts."
7053
msgstr ""
7054
7055
#: bzrlib/option.py:566
7056
msgid "See \"help revisionspec\" for details."
7057
msgstr ""
7058
7059
#: bzrlib/option.py:568
7060
msgid "Show internal object ids."
7061
msgstr ""
7062
7063
#: bzrlib/option.py:571
7064
msgid "Display timezone as local, original, or utc."
7065
msgstr ""
7066
7067
#: bzrlib/osutils.py:100
7068
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
7069
msgstr ""
7070
7071
#: bzrlib/osutils.py:220
7072
msgid "lstat/stat of ({0!r}): {1!r}"
7073
msgstr ""
7074
7075
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
7076
#, python-format
7077
msgid "sorry, %r not allowed in path"
7078
msgstr ""
7079
7080
#: bzrlib/osutils.py:1259
7081
#, python-format
7082
msgid "%r is too short to calculate a relative path"
7083
msgstr ""
7084
7085
#: bzrlib/plugin.py:143
7086
#, python-format
7087
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
7088
msgstr ""
7089
7090
#: bzrlib/plugins/bash_completion/bashcomp.py:411
7091
msgid "Enable completions for the selected plugin (default: all plugins)"
7092
msgstr ""
7093
7094
#: bzrlib/plugins/bash_completion/bashcomp.py:412
7095
msgid "Generate a shell function for bash command line completion."
7096
msgstr ""
7097
7098
#: bzrlib/plugins/bash_completion/bashcomp.py:414
7099
msgid ""
7100
"This command generates a shell function which can be used by bash to\n"
7101
"automatically complete the currently typed command when the user presses\n"
7102
"the completion key (usually tab)."
7103
msgstr ""
7104
7105
#: bzrlib/plugins/bash_completion/bashcomp.py:418
7106
msgid ""
7107
"Commonly used like this:\n"
7108
" eval \"`bzr bash-completion`\""
7109
msgstr ""
7110
7111
#: bzrlib/plugins/bash_completion/bashcomp.py:424
7112
msgid "Name of the generated function (default: _bzr)"
7113
msgstr ""
7114
7115
#: bzrlib/plugins/bash_completion/bashcomp.py:426
7116
msgid "Generate only the shell function, don't enable it"
7117
msgstr ""
7118
7119
#: bzrlib/plugins/launchpad/account.py:66
7120
msgid "Setting ssh/sftp usernames for launchpad.net."
7121
msgstr ""
7122
7123
#: bzrlib/plugins/launchpad/cmds.py:44
7124
msgid "Register a branch with launchpad.net."
7125
msgstr ""
7126
7127
#: bzrlib/plugins/launchpad/cmds.py:46
7128
msgid ""
7129
"This command lists a bzr branch in the directory of branches on\n"
7130
"launchpad.net. Registration allows the branch to be associated with\n"
7131
"bugs or specifications."
7132
msgstr ""
7133
7134
#: bzrlib/plugins/launchpad/cmds.py:50
7135
msgid ""
7136
"Before using this command you must register the project to which the\n"
7137
"branch belongs, and create an account for yourself on launchpad.net."
7138
msgstr ""
7139
7140
#: bzrlib/plugins/launchpad/cmds.py:53
7141
msgid ""
7142
"arguments:\n"
7143
" public_url: The publicly visible url for the branch to register.\n"
7144
" This must be an http or https url (which Launchpad can read\n"
7145
" from to access the branch). Local file urls, SFTP urls, and\n"
7146
" bzr+ssh urls will not work.\n"
7147
" If no public_url is provided, bzr will use the configured\n"
7148
" public_url if there is one for the current branch, and\n"
7149
" otherwise error."
7150
msgstr ""
7151
7152
#: bzrlib/plugins/launchpad/cmds.py:62
7153
msgid ""
7154
"example:\n"
7155
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7156
" --project fooproject"
7157
msgstr ""
7158
7159
#: bzrlib/plugins/launchpad/cmds.py:69
7160
msgid "Launchpad project short name to associate with the branch."
7161
msgstr ""
7162
7163
#: bzrlib/plugins/launchpad/cmds.py:76
7164
msgid ""
7165
"Short name for the branch; by default taken from the last component of the "
7166
"url."
7167
msgstr ""
7168
7169
#: bzrlib/plugins/launchpad/cmds.py:80
7170
msgid "One-sentence description of the branch."
7171
msgstr ""
7172
7173
#: bzrlib/plugins/launchpad/cmds.py:83
7174
msgid "Longer description of the purpose or contents of the branch."
7175
msgstr ""
7176
7177
#: bzrlib/plugins/launchpad/cmds.py:86
7178
msgid "Branch author's email address, if not yourself."
7179
msgstr ""
7180
7181
#: bzrlib/plugins/launchpad/cmds.py:89
7182
msgid "The bug this branch fixes."
7183
msgstr ""
7184
7185
#: bzrlib/plugins/launchpad/cmds.py:92
7186
msgid "Prepare the request but don't actually send it."
7187
msgstr ""
7188
7189
#: bzrlib/plugins/launchpad/cmds.py:114
7190
msgid ""
7191
"register-branch requires a public branch url - see bzr help register-branch."
7192
msgstr ""
7193
7194
#: bzrlib/plugins/launchpad/cmds.py:122
7195
msgid "--product is deprecated; please use --project."
7196
msgstr ""
7197
7198
#: bzrlib/plugins/launchpad/cmds.py:152
7199
msgid "Open a Launchpad branch page in your web browser."
7200
msgstr ""
7201
7202
#: bzrlib/plugins/launchpad/cmds.py:157
7203
msgid "Do not actually open the browser. Just say the URL we would use."
7204
msgstr ""
7205
7206
#: bzrlib/plugins/launchpad/cmds.py:192
7207
#, python-format
7208
msgid "Opening %s in web browser"
7209
msgstr ""
7210
7211
#: bzrlib/plugins/launchpad/cmds.py:200
7212
msgid "Show or set the Launchpad user ID."
7213
msgstr ""
7214
7215
#: bzrlib/plugins/launchpad/cmds.py:202
7216
msgid ""
7217
"When communicating with Launchpad, some commands need to know your\n"
7218
"Launchpad user ID. This command can be used to set or show the\n"
7219
"user ID that Bazaar will use for such communication."
7220
msgstr ""
7221
7222
#: bzrlib/plugins/launchpad/cmds.py:206
7223
msgid ""
7224
":Examples:\n"
7225
" Show the Launchpad ID of the current user::"
7226
msgstr ""
7227
7228
#: bzrlib/plugins/launchpad/cmds.py:209
7229
msgid " bzr launchpad-login"
7230
msgstr ""
7231
7232
#: bzrlib/plugins/launchpad/cmds.py:211
7233
msgid " Set the Launchpad ID of the current user to 'bob'::"
7234
msgstr ""
7235
7236
#: bzrlib/plugins/launchpad/cmds.py:213
7237
msgid " bzr launchpad-login bob"
7238
msgstr ""
7239
7240
#: bzrlib/plugins/launchpad/cmds.py:220
7241
msgid "Don't check that the user name is valid."
7242
msgstr ""
7243
7244
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
7245
msgid "Launchpad user ID exists and has SSH keys.\n"
7246
msgstr ""
7247
7248
#: bzrlib/plugins/launchpad/cmds.py:238
7249
msgid "No Launchpad user ID configured.\n"
7250
msgstr ""
7251
7252
#: bzrlib/plugins/launchpad/cmds.py:249
7253
#, python-format
7254
msgid "Launchpad user ID set to '%s'.\n"
7255
msgstr ""
7256
7257
#: bzrlib/plugins/launchpad/cmds.py:255
7258
msgid "Ask Launchpad to mirror a branch now."
7259
msgstr ""
7260
7261
#: bzrlib/plugins/launchpad/cmds.py:272
7262
msgid "Propose merging a branch on Launchpad."
7263
msgstr ""
7264
7265
#: bzrlib/plugins/launchpad/cmds.py:274
7266
msgid ""
7267
"This will open your usual editor to provide the initial comment. When it\n"
7268
"has created the proposal, it will open it in your default web browser."
7269
msgstr ""
7270
7271
#: bzrlib/plugins/launchpad/cmds.py:277
7272
msgid ""
7273
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7274
"is not supplied, the remembered submit branch will be used. If no submit\n"
7275
"branch is remembered, the development focus will be used."
7276
msgstr ""
7277
7278
#: bzrlib/plugins/launchpad/cmds.py:281
7279
msgid ""
7280
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7281
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7282
"The parameter the launchpad account name of the desired reviewer. This\n"
7283
"may optionally be followed by '=' and the review type. For example:"
7284
msgstr ""
7285
7286
#: bzrlib/plugins/launchpad/cmds.py:286
7287
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7288
msgstr ""
7289
7290
#: bzrlib/plugins/launchpad/cmds.py:288
7291
msgid ""
7292
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7293
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7294
msgstr ""
7295
7296
#: bzrlib/plugins/launchpad/cmds.py:293
7297
msgid "Propose the merge on staging."
7298
msgstr ""
7299
7300
#: bzrlib/plugins/launchpad/cmds.py:295
7301
msgid "Commit message."
7302
msgstr ""
7303
7304
#: bzrlib/plugins/launchpad/cmds.py:297
7305
msgid "Mark the proposal as approved immediately."
7306
msgstr ""
7307
7308
#: bzrlib/plugins/launchpad/cmds.py:298
7309
msgid "The bug this proposal fixes."
7310
msgstr ""
7311
7312
#: bzrlib/plugins/launchpad/cmds.py:300
7313
msgid "Requested reviewer and optional type."
7314
msgstr ""
7315
7316
#: bzrlib/plugins/launchpad/cmds.py:335
7317
msgid "Find the proposal to merge this revision."
7318
msgstr ""
7319
7320
#: bzrlib/plugins/launchpad/cmds.py:337
7321
msgid ""
7322
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7323
"This works only if the selected branch was the merge proposal target, and\n"
7324
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7325
"are opened in a web browser."
7326
msgstr ""
7327
7328
#: bzrlib/plugins/launchpad/cmds.py:342
7329
msgid ""
7330
"Any revision involved in the merge may be specified-- the revision in\n"
7331
"which the merge was performed, or one of the revisions that was merged."
7332
msgstr ""
7333
7334
#: bzrlib/plugins/launchpad/cmds.py:345
7335
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7336
msgstr ""
7337
7338
#: bzrlib/plugins/launchpad/cmds.py:347
7339
msgid " bzr lp-find-proposal -r annotate:README:1"
7340
msgstr ""
7341
7342
#: bzrlib/plugins/launchpad/cmds.py:363
7343
msgid "No review found."
7344
msgstr ""
7345
7346
#: bzrlib/plugins/launchpad/cmds.py:364
7347
#, python-format
7348
msgid "%d proposals(s) found."
7349
msgstr ""
7350
7351
#: bzrlib/plugins/launchpad/cmds.py:374
7352
msgid "Finding revision-id"
7353
msgstr ""
7354
7355
#: bzrlib/plugins/launchpad/cmds.py:381
7356
msgid "Finding merge"
7357
msgstr ""
7358
7359
#: bzrlib/plugins/launchpad/cmds.py:386
7360
msgid "Finding revno"
7361
msgstr ""
7362
7363
#: bzrlib/plugins/launchpad/cmds.py:392
7364
msgid "Finding Launchpad branch"
7365
msgstr ""
7366
7367
#: bzrlib/plugins/launchpad/cmds.py:395
7368
msgid "Finding proposals"
7369
msgstr ""
7370
7371
#: bzrlib/plugins/launchpad/lp_api.py:241
7372
#: bzrlib/plugins/launchpad/lp_api.py:246
7373
#, python-format
7374
msgid "%s is not registered on Launchpad"
7375
msgstr ""
7376
7377
#: bzrlib/plugins/launchpad/lp_api.py:256
7378
#, python-format
7379
msgid "%s has no development focus."
7380
msgstr ""
7381
7382
#: bzrlib/plugins/launchpad/lp_api.py:261
7383
#, python-format
7384
msgid "development focus %s has no branch."
7385
msgstr ""
7386
7387
#: bzrlib/plugins/launchpad/lp_api.py:266
7388
#, python-format
7389
msgid "source package %s has no branch."
7390
msgstr ""
7391
7392
#: bzrlib/plugins/launchpad/lp_api.py:270
7393
#, python-format
7394
msgid "%s has no associated product or source package."
7395
msgstr ""
7396
7397
#: bzrlib/plugins/launchpad/lp_api.py:282
7398
#, python-format
7399
msgid "%s is already up-to-date."
7400
msgstr ""
7401
7402
#: bzrlib/plugins/launchpad/lp_api.py:289
7403
#, python-format
7404
msgid "Pushing to %s"
7405
msgstr ""
7406
7407
#: bzrlib/plugins/launchpad/lp_directory.py:170
7408
msgid ""
7409
"resolution for {0}\n"
7410
" local: {1}\n"
7411
" remote: {2}"
7412
msgstr ""
7413
7414
#: bzrlib/plugins/launchpad/lp_propose.py:150
7415
#, python-format
7416
msgid "There is already a branch merge proposal: %s"
7417
msgstr ""
7418
7419
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7420
msgid "pb parameter to convert() is deprecated"
7421
msgstr ""
7422
7423
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7424
msgid "starting upgrade from format 4 to 5"
7425
msgstr ""
7426
7427
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7428
msgid "note: upgrade may be faster if all store files are ungzipped first"
7429
msgstr ""
7430
7431
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7432
msgid "converting revision"
7433
msgstr ""
7434
7435
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7436
msgid "upgraded to weaves:"
7437
msgstr ""
7438
7439
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7440
#, python-format
7441
msgid "%6d revisions and inventories"
7442
msgstr ""
7443
7444
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7445
#, python-format
7446
msgid "%6d revisions not present"
7447
msgstr ""
7448
7449
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7450
#, python-format
7451
msgid "%6d texts"
7452
msgstr ""
7453
7454
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7455
msgid "writing weave"
7456
msgstr ""
7457
7458
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7459
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7460
msgid "inventory"
7461
msgstr ""
7462
7463
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7464
msgid "write revision"
7465
msgstr ""
7466
7467
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7468
msgid "loading revision"
7469
msgstr ""
7470
7471
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7472
#, python-format
7473
msgid "revision {%s} not present in branch; will be converted as a ghost"
7474
msgstr ""
7475
7476
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7477
msgid "starting upgrade from format 5 to 6"
7478
msgstr ""
7479
7480
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7481
#, python-format
7482
msgid "adding prefixes to %s"
7483
msgstr ""
7484
7485
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7486
msgid "starting upgrade from format 6 to metadir"
7487
msgstr ""
7488
7489
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7490
msgid "Removing ancestry.weave"
7491
msgstr ""
7492
7493
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7494
msgid "Finding branch files"
7495
msgstr ""
7496
7497
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7498
msgid "Upgrading repository"
7499
msgstr ""
7500
7501
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7502
msgid "Upgrading branch"
7503
msgstr ""
7504
7505
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7506
msgid "No working tree."
7507
msgstr ""
7508
7509
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7510
msgid "Upgrading working tree"
7511
msgstr ""
7512
7513
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7514
#, python-format
7515
msgid "Make %s lock"
7516
msgstr ""
7517
7518
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7519
#, python-format
7520
msgid "Moving %s"
7521
msgstr ""
7522
7523
#: bzrlib/push.py:56
7524
msgid "Created new branch."
7525
msgstr ""
7526
7527
#: bzrlib/push.py:97
7528
#, python-format
7529
msgid ""
7530
"Target directory %s already contains a .bzr directory, but it is not valid."
7531
msgstr ""
7532
7533
#: bzrlib/push.py:101
7534
#, python-format
7535
msgid ""
7536
"Target directory %s already exists, but does not have a .bzr directory. "
7537
"Supply --use-existing-dir to push there anyway."
7538
msgstr ""
7539
7540
#: bzrlib/push.py:122
7541
#, python-format
7542
msgid "Too many redirections trying to make %s."
7543
msgstr ""
7544
7545
#: bzrlib/push.py:148
7546
msgid ""
7547
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7548
"information."
7549
msgstr ""
7550
7551
#: bzrlib/push.py:152
7552
#, python-format
7553
msgid ""
7554
"It is not possible to losslessly push to %s. You may want to use dpush "
7555
"instead."
7556
msgstr ""
7557
7558
#: bzrlib/push.py:158
7559
#, python-format
7560
msgid ""
7561
"At %s you have a valid .bzr control directory, but not a branch or "
7562
"repository. This is an unsupported configuration. Please move the target "
7563
"directory out of the way and try again."
7564
msgstr ""
7565
7566
#: bzrlib/reconcile.py:97
7567
#, python-format
7568
msgid "Reconciling branch %s"
7569
msgstr ""
7570
7571
#: bzrlib/reconcile.py:103
7572
#, python-format
7573
msgid "Reconciling repository %s"
7574
msgstr ""
7575
7576
#: bzrlib/reconcile.py:105
7577
msgid "Reconciling repository"
7578
msgstr ""
7579
7580
#: bzrlib/reconcile.py:111
7581
#, python-format
7582
msgid "%s cannot canonicalize CHKs."
7583
msgstr ""
7584
7585
#: bzrlib/reconcile.py:119
7586
msgid "Reconcile aborted: revision index has inconsistent parents."
7587
msgstr ""
7588
7589
#: bzrlib/reconcile.py:121
7590
msgid "Run \"bzr check\" for more details."
7591
msgstr "Для подробностей запустите «bzr check»."
7592
7593
#: bzrlib/reconcile.py:123
7594
msgid "Reconciliation complete."
7595
msgstr ""
7596
7597
#: bzrlib/reconcile.py:166
7598
msgid "Fixing last revision info {0} => {1}"
7599
msgstr "Исправление информации последней ревизии {0} => {1}"
7600
7601
#: bzrlib/reconcile.py:173
7602
msgid "revision_history ok."
7603
msgstr ""
7604
7605
#: bzrlib/reconcile.py:234
7606
msgid "Reading inventory data"
7607
msgstr "Чтение данных инвентаря"
7608
7609
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7610
msgid "Inventory ok."
7611
msgstr ""
7612
7613
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7614
msgid "Backing up inventory"
7615
msgstr "Создание резервного инвентаря"
7616
7617
#: bzrlib/reconcile.py:258
7618
msgid "Backup inventory created."
7619
msgstr "Резервный инвентарь создан."
7620
7621
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7622
msgid "Writing weave"
7623
msgstr ""
7624
7625
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7626
msgid "Inventory regenerated."
7627
msgstr "Инвентарь восстановлен."
7628
7629
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7630
msgid "Reading indexes"
7631
msgstr "Чтение индексов"
7632
7633
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7634
msgid "Checking unused inventories"
7635
msgstr "Проверка неиспользуемых инвентарей"
7636
7637
#: bzrlib/reconcile.py:388
7638
msgid "Backup Inventory created"
7639
msgstr "Резервный инвентарь создан"
7640
7641
#: bzrlib/reconcile.py:446
7642
msgid "Fixing text parents"
7643
msgstr ""
7644
7645
#: bzrlib/reconfigure.py:54
7646
msgid "{0} is now stacked on {1}\n"
7647
msgstr "{0}теперь на стеке {1}\n"
7648
7649
#: bzrlib/reconfigure.py:69
7650
#, python-format
7651
msgid "%s is now not stacked\n"
7652
msgstr "%s теперь не на стеке\n"
7653
7654
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7655
#, python-format
7656
msgid "bzr: ERROR (ignored): %s"
7657
msgstr "bzr: ОШИБКА (игнорирована): %s"
7658
7659
#: bzrlib/remote.py:2534
7660
msgid "Copying repository content as tarball..."
7661
msgstr "Копирование содержимого репозитория в тарбол..."
7662
7663
#: bzrlib/rename_map.py:69
7664
msgid "Calculating hashes"
7665
msgstr "Вычисление хешей"
7666
7667
#: bzrlib/rename_map.py:107
7668
msgid "Determining hash hits"
7669
msgstr "Определение столкновений хешей"
7670
7671
#: bzrlib/rename_map.py:242
7672
msgid "{0} => {1}"
7673
msgstr "{0} => {1}"
7674
7675
#: bzrlib/repository.py:1738
7676
msgid "Moving repository to repository.backup"
7677
msgstr "Перемещение репозитория в repository.backup"
7678
7679
#: bzrlib/repository.py:1745
7680
msgid "Creating new repository"
7681
msgstr "Создание нового репозитория"
7682
7683
#: bzrlib/repository.py:1750
7684
msgid "Copying content"
7685
msgstr "Копирование содержимого"
7686
7687
#: bzrlib/repository.py:1754
7688
msgid "Deleting old repository content"
7689
msgstr "Удаление старого содержимого репозитория"
7690
7691
#: bzrlib/repository.py:1756
7692
msgid "repository converted"
7693
msgstr "репозиторий преобразован"
7694
7695
#: bzrlib/revisionspec.py:903
7696
msgid "Using {0} {1}"
7697
msgstr "Используется {0} {1}"
7698
7699
#: bzrlib/send.py:59
7700
#, python-format
7701
msgid "Mail client \"%s\" does not support specifying body"
7702
msgstr "Почтовый клиент «%s» не поддерживает определение тела"
7703
7704
#: bzrlib/send.py:63
7705
msgid "--remember requires a branch to be specified."
7706
msgstr "--remember требует указания ветви."
7707
7708
#: bzrlib/send.py:78
7709
msgid "No submit branch known or specified"
7710
msgstr "Ветвь для отсылки неизвестна и не задана"
7711
7712
#: bzrlib/send.py:81
7713
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7714
msgstr ""
7715
"Используется сохранённое {0} местоположение «{1}» для определения изменений, "
7716
"которые необходимо отправить."
7717
7718
#: bzrlib/send.py:99
7719
#, python-format
7720
msgid "No such send format '%s'."
7721
msgstr "Нет такого формата отправки '%s'."
7722
7723
#: bzrlib/send.py:115
7724
msgid "bzr send takes at most two one revision identifiers"
7725
msgstr "bzr send принимает не более двух идентификаторов ревизии"
7726
7727
#: bzrlib/send.py:128
7728
msgid "No revisions to submit."
7729
msgstr "Нет ревизий для отправки."
7730
7731
#: bzrlib/send.py:140
7732
msgid ""
7733
"- not supported for merge directives that use more than one output file."
7734
msgstr ""
7735
"- не поддерживается для директив merge, которые используют более, чем один "
7736
"файл вывода."
7737
7738
#: bzrlib/send.py:186
7739
msgid "Format 0.9 does not permit bundle with no patch"
7740
msgstr "Формат 0.9 не разрешает пакеты без патчей"
7741
7742
#: bzrlib/shelf_ui.py:46
7743
#, python-format
7744
msgid "Shelve adding file \"%(path)s\"?"
7745
msgstr "Отложить добавление файла «%(path)s»?"
7746
7747
#: bzrlib/shelf_ui.py:47
7748
msgid "Shelve binary changes?"
7749
msgstr "Отложить двоичные изменения?"
7750
7751
#: bzrlib/shelf_ui.py:48
7752
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7753
msgstr "Отложить изменение «%s» из %(other)s в %(this)s?"
7754
7755
#: bzrlib/shelf_ui.py:50
7756
#, python-format
7757
msgid "Shelve removing file \"%(path)s\"?"
7758
msgstr "Отложить удаление файла «%(path)s»?"
7759
7760
#: bzrlib/shelf_ui.py:51
7761
#, python-format
7762
msgid "Shelve %d change(s)?"
7763
msgstr "Отложить %d изменений?"
7764
7765
#: bzrlib/shelf_ui.py:52
7766
msgid "Shelve?"
7767
msgstr "Отложить?"
7768
7769
#: bzrlib/shelf_ui.py:53
7770
#, python-format
7771
msgid ""
7772
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7773
msgstr "Отложить изменение цели «%(path)s» из «%(other)s» в «%(this)s»?"
7774
7775
#: bzrlib/shelf_ui.py:55
7776
#, python-format
7777
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7778
msgstr "Отложить переименование «%(other)s» => «%(this)s»?"
7779
7780
#: bzrlib/shelf_ui.py:70
7781
#, python-format
7782
msgid "Changes shelved with id \"%d\"."
7783
msgstr "Изменения отложены с id «%d»."
7784
7785
#: bzrlib/shelf_ui.py:74
7786
msgid "Selected changes destroyed."
7787
msgstr "Выбранные изменения уничтожены."
7788
7789
#: bzrlib/shelf_ui.py:78
7790
msgid "Selected changes:"
7791
msgstr "Выбранные изменения:"
7792
7793
#: bzrlib/shelf_ui.py:98
7794
#, python-format
7795
msgid "Delete file \"%(path)s\"?"
7796
msgstr "Удалить файл «%(path)s»?"
7797
7798
#: bzrlib/shelf_ui.py:99
7799
msgid "Apply binary changes?"
7800
msgstr "Применить двоичные изменения?"
7801
7802
#: bzrlib/shelf_ui.py:100
7803
#, python-format
7804
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7805
msgstr "Изменить «%(path)s» с %(this)s на %(other)s?"
7806
7807
#: bzrlib/shelf_ui.py:102
7808
#, python-format
7809
msgid "Add file \"%(path)s\"?"
7810
msgstr "Добавить файл «%(path)s»?"
7811
7812
#: bzrlib/shelf_ui.py:103
7813
#, python-format
7814
msgid "Apply %d change(s)?"
7815
msgstr "Применить %d изменений?"
7816
7817
#: bzrlib/shelf_ui.py:104
7818
msgid "Apply change?"
7819
msgstr "Применить изменение?"
7820
7821
#: bzrlib/shelf_ui.py:105
7822
#, python-format
7823
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7824
msgstr "Изменить цель «%(path)s» с «%(this)s» на «%(other)s»?"
7825
7826
#: bzrlib/shelf_ui.py:107
7827
#, python-format
7828
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7829
msgstr "Переименовать «%(this)s» => «%(other)s»?"
7830
7831
#: bzrlib/shelf_ui.py:402
7832
msgid "No changes are shelved."
7833
msgstr "Нет отложенных изменений."
7834
7835
#: bzrlib/shelf_ui.py:460
7836
#, python-format
7837
msgid "Using changes with id \"%d\"."
7838
msgstr "Используются изменения с id «%d»."
7839
7840
#: bzrlib/shelf_ui.py:464
7841
#, python-format
7842
msgid "Message: %s"
7843
msgstr "Сообщение: %s"
7844
7845
#: bzrlib/shelf_ui.py:476
7846
#, python-format
7847
msgid "Deleted changes with id \"%d\"."
7848
msgstr "Удалены изменения с id «%d»."
7849
7850
#: bzrlib/smart/medium.py:714
7851
msgid "HPSS calls: {0} ({1} vfs) {2}"
7852
msgstr "Вызовы HPSS: {0} ({1} vfs) {2}"
7853
7854
#: bzrlib/smart/server.py:169
7855
msgid "Requested to stop gracefully"
7856
msgstr ""
7857
7858
#: bzrlib/smart/server.py:179
7859
#, python-format
7860
msgid "Waiting for %d client(s) to finish"
7861
msgstr ""
7862
7863
#: bzrlib/smart/server.py:185
7864
#, python-format
7865
msgid "Still waiting for %d client(s) to finish"
7866
msgstr ""
7867
7868
#: bzrlib/smart/server.py:219
7869
#, python-format
7870
msgid "listening socket error: %s"
7871
msgstr ""
7872
7873
#: bzrlib/smart/server.py:452
7874
#, python-format
7875
msgid "listening on port: %s"
7876
msgstr "слушаю на порту: %s"
7877
7878
#: bzrlib/switch.py:73
7879
msgid "Pending merges must be committed or reverted before using switch."
7880
msgstr ""
7881
7882
#: bzrlib/switch.py:100
7883
msgid ""
7884
"Cannot switch as local commits found in the checkout. Commit these to the "
7885
"bound branch or use --force to throw them away."
7886
msgstr ""
7887
7888
#: bzrlib/switch.py:105
7889
#, python-format
7890
msgid ""
7891
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7892
"anyway, use --force."
7893
msgstr ""
7894
"Не удалось соединиться с текущей основной ветвью %(target)s: %(error)s Для "
7895
"принудительного переключения используйте --force."
7896
7897
#: bzrlib/switch.py:129
7898
msgid "Cannot switch a branch, only a checkout."
7899
msgstr ""
7900
7901
#: bzrlib/switch.py:167
7902
#, python-format
7903
msgid "Tree is up to date at revision %d."
7904
msgstr "Дерево в актуальной ревизии %d."
7905
7906
#: bzrlib/switch.py:173
7907
#, python-format
7908
msgid "Updated to revision %d."
7909
msgstr "Обновлено до ревизии %d."
7910
7911
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7912
msgid "Apply phase"
7913
msgstr "Применить фазу"
7914
7915
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7916
msgid "removing file"
7917
msgstr "удаление файла"
7918
7919
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7920
msgid "adding file"
7921
msgstr "добавление файла"
7922
7923
#: bzrlib/transform.py:2598
7924
msgid "Building tree"
7925
msgstr "Построение дерева"
7926
7927
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7928
msgid "Adding file contents"
7929
msgstr "Добавление содержимого файлй"
7930
7931
#: bzrlib/transform.py:3017
7932
msgid "Resolution pass"
7933
msgstr ""
7934
7935
#: bzrlib/transport/ftp/_gssapi.py:88
7936
#, python-format
7937
msgid "Authenticated as %s"
7938
msgstr ""
7939
7940
#: bzrlib/tree.py:647
7941
msgid "*** {0} content-filter: {1} => {2!r}"
7942
msgstr "*** {0} content-filter: {1} => {2!r}"
7943
7944
#: bzrlib/upgrade.py:77
7945
#, python-format
7946
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7947
msgstr "Это рабочая копия. Ветвь (%s) необходимо обновлять отдельно."
7948
7949
#: bzrlib/upgrade.py:100
7950
#, python-format
7951
msgid "cannot upgrade from bzrdir format %s"
7952
msgstr "нельзя обновить из формата bzrdir %s"
7953
7954
#: bzrlib/upgrade.py:103
7955
#, python-format
7956
msgid "starting upgrade of %s"
7957
msgstr "начинается обновление %s"
7958
7959
#: bzrlib/upgrade.py:110
7960
msgid "finished"
7961
msgstr "завершено"
7962
7963
#: bzrlib/upgrade.py:120
7964
msgid "Deleting backup.bzr"
7965
msgstr "Удаление backup.bzr"
7966
7967
#: bzrlib/upgrade.py:151
7968
msgid ""
7969
"\n"
7970
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7971
msgstr ""
7972
"\n"
7973
"СВОДКА: произведено {0} обновлений, {1} успешно, {2} неуспешно"
7974
7975
#: bzrlib/upgrade.py:208
7976
#, python-format
7977
msgid "Found %d dependent branches - upgrading ..."
7978
msgstr "Найдено %d зависящих ветвей - обновление ..."
7979
7980
#: bzrlib/upgrade.py:276
7981
msgid "Upgrading bzrdirs"
7982
msgstr "Обновление bzrdirs"
7983
7984
#: bzrlib/upgrade.py:282
7985
#, python-format
7986
msgid "Upgrading %s"
7987
msgstr "Обновление %s"
7988
7989
#: bzrlib/upgrade.py:283
7990
msgid "Upgrading {0} {1} ..."
7991
msgstr "Обновление {0} {1} ..."
7992
7993
#: bzrlib/upgrade.py:301
7994
msgid "Removing backup ..."
7995
msgstr "Удаление резервной копии ..."
7996
7997
#: bzrlib/upgrade.py:305
7998
msgid "failed to clean-up {0}: {1}"
7999
msgstr "не удалось очистить {0}: {1}"
8000
8001
#: bzrlib/vf_repository.py:1091
8002
msgid "inventories"
8003
msgstr ""
8004
8005
#: bzrlib/vf_repository.py:1117
8006
msgid "texts"
8007
msgstr ""
8008
8009
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
8010
msgid "Calculating text parents"
8011
msgstr ""
8012
8013
#: bzrlib/vf_repository.py:1707
8014
msgid "Fetch texts"
8015
msgstr ""
8016
8017
#: bzrlib/vf_repository.py:2536
8018
msgid "loading text store"
8019
msgstr ""
8020
8021
#: bzrlib/vf_repository.py:2542
8022
msgid "checking text graph"
8023
msgstr ""
8024
8025
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
8026
#: bzrlib/vf_repository.py:3127
8027
msgid "Transferring revisions"
8028
msgstr ""
8029
8030
#: bzrlib/win32utils.py:146
8031
msgid "Failed to GetProcessMemoryInfo()"
8032
msgstr "Не удалось выполнить GetProcessMemoryInfo()"
8033
8034
#: bzrlib/win32utils.py:167
8035
msgid "Cannot debug memory on win32 without ctypes or win32process"
8036
msgstr ""
8037
"Невозможно производить отладку памяти на win32 без ctypes или win32process"
8038
8039
#: bzrlib/win32utils.py:172
8040
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
8041
msgstr "WorkingSize {0:>7}КиБ\tPeakWorking {1:>7}КиБ\t{2}"
8042
8043
#: bzrlib/win32utils.py:180
8044
#, python-format
8045
msgid "WorkingSize %8d KiB"
8046
msgstr "WorkingSize %8d КиБ"
8047
8048
#: bzrlib/win32utils.py:181
8049
#, python-format
8050
msgid "PeakWorking %8d KiB"
8051
msgstr "PeakWorking %8d КиБ"
8052
8053
#: bzrlib/win32utils.py:182
8054
#, python-format
8055
msgid "PagefileUsage %8d KiB"
8056
msgstr "PagefileUsage %8d КиБ"
8057
8058
#: bzrlib/win32utils.py:183
8059
#, python-format
8060
msgid "PeakPagefileUsage %8d KiB"
8061
msgstr "PeakPagefileUsage %8d КиБ"
8062
8063
#: bzrlib/win32utils.py:185
8064
#, python-format
8065
msgid "PrivateUsage %8d KiB"
8066
msgstr "PrivateUsage %8d КиБ"
8067
8068
#: bzrlib/win32utils.py:186
8069
#, python-format
8070
msgid "PageFaultCount %8d"
8071
msgstr "PageFaultCount %8d"
8072
8073
#: bzrlib/workingtree.py:1482
8074
msgid "Rerun update after fixing the conflicts."
8075
msgstr "Снова запустите обновление после исправления конфликтов."
8076
8077
#: dummy/help_topics/authentication/summary.txt:1
8078
msgid "Information on configuring authentication"
8079
msgstr "Информация по настройке аутентификации"
8080
8081
#: dummy/help_topics/basic/detail.txt:1
8082
msgid ""
8083
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
8084
"http://bazaar.canonical.com/"
8085
msgstr ""
8086
8087
#: dummy/help_topics/basic/detail.txt:4
8088
msgid ""
8089
"Basic commands:\n"
8090
" bzr init makes this directory a versioned branch\n"
8091
" bzr branch make a copy of another branch"
8092
msgstr ""
8093
"Базовые команды:\n"
8094
" bzr init превратить директорию в ветвь системы версий\n"
8095
" bzr branch создать копию другой ветви"
8096
8097
#: dummy/help_topics/basic/detail.txt:8
8098
msgid ""
8099
" bzr add make files or directories versioned\n"
8100
" bzr ignore ignore a file or pattern\n"
8101
" bzr mv move or rename a versioned file"
8102
msgstr ""
8103
" bzr add добавить файлы или директории к системе контроля "
8104
"версий\n"
8105
" bzr ignore игнорировать файл или шаблон\n"
8106
" bzr mv переместить или переименовать файл в системе контроля "
8107
"версий"
8108
8109
#: dummy/help_topics/basic/detail.txt:12
8110
msgid ""
8111
" bzr status summarize changes in working copy\n"
8112
" bzr diff show detailed diffs"
8113
msgstr ""
8114
" bzr status вывести краткие изменения в рабочей копии\n"
8115
" bzr diff вывести подробные различия"
8116
8117
#: dummy/help_topics/basic/detail.txt:15
8118
msgid ""
8119
" bzr merge pull in changes from another branch\n"
8120
" bzr commit save some or all changes\n"
8121
" bzr send send changes via email"
8122
msgstr ""
8123
" bzr merge принять изменения из другой ветви\n"
8124
" bzr commit сохранить некоторые или все изменения\n"
8125
" bzr send переслать изменения по электронной почте"
8126
8127
#: dummy/help_topics/basic/detail.txt:19
8128
msgid ""
8129
" bzr log show history of changes\n"
8130
" bzr check validate storage"
8131
msgstr ""
8132
" bzr log показать историю изменений\n"
8133
" bzr check проверить целостность"
8134
8135
#: dummy/help_topics/basic/detail.txt:22
8136
msgid ""
8137
" bzr help init more help on e.g. init command\n"
8138
" bzr help commands list all commands\n"
8139
" bzr help topics list all help topics\n"
8140
msgstr ""
8141
" bzr help init подробные сведения например по команде init\n"
8142
" bzr help commands вывести список всех команд\n"
8143
" bzr help topics вывести список всех разделов справки\n"
8144
8145
#: dummy/help_topics/basic/summary.txt:1
8146
msgid "Basic commands"
8147
msgstr "Базовые команды"
8148
8149
#: dummy/help_topics/branches/detail.txt:1
8150
msgid "Branches"
8151
msgstr "Ветви"
8152
8153
#: dummy/help_topics/branches/detail.txt:3
8154
msgid ""
8155
"A branch consists of the state of a project, including all of its\n"
8156
"history. All branches have a repository associated (which is where the\n"
8157
"branch history is stored), but multiple branches may share the same\n"
8158
"repository (a shared repository). Branches can be copied and merged."
8159
msgstr ""
8160
8161
#: dummy/help_topics/branches/detail.txt:8
8162
msgid ""
8163
"In addition, one branch may be bound to another one. Binding to another\n"
8164
"branch indicates that commits which happen in this branch must also \n"
8165
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
8166
"commits when the two branches are out of date. In order for a commit \n"
8167
"to succeed, it may be necessary to update the current branch using \n"
8168
"``bzr update``."
8169
msgstr ""
8170
8171
#: dummy/help_topics/branches/detail.txt:15
8172
#: dummy/help_topics/checkouts/detail.txt:66
8173
#: dummy/help_topics/repositories/detail.txt:36
8174
msgid "Related commands::"
8175
msgstr "Связанные команды::"
8176
8177
#: dummy/help_topics/branches/detail.txt:17
8178
msgid ""
8179
" init Change a directory into a versioned branch.\n"
8180
" branch Create a new branch that is a copy of an existing branch.\n"
8181
" merge Perform a three-way merge.\n"
8182
" bind Bind a branch to another one.\n"
8183
msgstr ""
8184
8185
#: dummy/help_topics/branches/summary.txt:1
8186
msgid "Information on what a branch is"
8187
msgstr "Информация о том, что такое ветвь"
8188
8189
#: dummy/help_topics/bugs/summary.txt:1
8190
msgid "Bug tracker settings"
8191
msgstr "Установки трекера ошибок"
8192
8193
#: dummy/help_topics/checkouts/detail.txt:1
8194
msgid "Checkouts"
8195
msgstr "Рабочие копии"
8196
8197
#: dummy/help_topics/checkouts/detail.txt:3
8198
msgid ""
8199
"Checkouts are source trees that are connected to a branch, so that when\n"
8200
"you commit in the source tree, the commit goes into that branch. They\n"
8201
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
8202
"Bazaar's decentralized features until you want them. Using checkouts\n"
8203
"with shared repositories is very similar to working with SVN or CVS, but\n"
8204
"doesn't have the same restrictions. And using checkouts still allows\n"
8205
"others working on the project to use whatever workflow they like."
8206
msgstr ""
8207
8208
#: dummy/help_topics/checkouts/detail.txt:11
8209
msgid ""
8210
"A checkout is created with the bzr checkout command (see \"help "
8211
"checkout\").\n"
8212
"You pass it a reference to another branch, and it will create a local copy\n"
8213
"for you that still contains a reference to the branch you created the\n"
8214
"checkout from (the master branch). Then if you make any commits they will "
8215
"be\n"
8216
"made on the other branch first. This creates an instant mirror of your work, "
8217
"or\n"
8218
"facilitates lockstep development, where each developer is working together,\n"
8219
"continuously integrating the changes of others."
8220
msgstr ""
8221
8222
#: dummy/help_topics/checkouts/detail.txt:19
8223
msgid ""
8224
"However the checkout is still a first class branch in Bazaar terms, so that\n"
8225
"you have the full history locally. As you have a first class branch you "
8226
"can\n"
8227
"also commit locally if you want, for instance due to the temporary loss af "
8228
"a\n"
8229
"network connection. Use the --local option to commit to do this. All the "
8230
"local\n"
8231
"commits will then be made on the master branch the next time you do a non-"
8232
"local\n"
8233
"commit."
8234
msgstr ""
8235
8236
#: dummy/help_topics/checkouts/detail.txt:26
8237
msgid ""
8238
"If you are using a checkout from a shared branch you will periodically want "
8239
"to\n"
8240
"pull in all the changes made by others. This is done using the \"update\"\n"
8241
"command. The changes need to be applied before any non-local commit, but\n"
8242
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8243
"command when needed."
8244
msgstr ""
8245
8246
#: dummy/help_topics/checkouts/detail.txt:32
8247
msgid ""
8248
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8249
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8250
"SVN checkout in that it is not a first class branch, it mainly consists of "
8251
"the\n"
8252
"working tree. This means that any history operations must query the master\n"
8253
"branch, which could be slow if a network connection is involved. Also, as "
8254
"you\n"
8255
"don't have a local branch, then you cannot commit locally."
8256
msgstr ""
8257
8258
#: dummy/help_topics/checkouts/detail.txt:39
8259
msgid ""
8260
"Lightweight checkouts work best when you have fast reliable access to the\n"
8261
"master branch. This means that if the master branch is on the same disk or "
8262
"LAN\n"
8263
"a lightweight checkout will be faster than a heavyweight one for any "
8264
"commands\n"
8265
"that modify the revision history (as only one copy of the branch needs to\n"
8266
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8267
"that uses the history but does not change it, but if the master branch is "
8268
"on\n"
8269
"the same disk then there won't be a noticeable difference."
8270
msgstr ""
8271
8272
#: dummy/help_topics/checkouts/detail.txt:47
8273
msgid ""
8274
"Another possible use for a checkout is to use it with a treeless repository\n"
8275
"containing your branches, where you maintain only one working tree by\n"
8276
"switching the master branch that the checkout points to when you want to\n"
8277
"work on a different branch."
8278
msgstr ""
8279
8280
#: dummy/help_topics/checkouts/detail.txt:52
8281
msgid ""
8282
"Obviously to commit on a checkout you need to be able to write to the "
8283
"master\n"
8284
"branch. This means that the master branch must be accessible over a "
8285
"writeable\n"
8286
"protocol , such as sftp://, and that you have write permissions at the "
8287
"other\n"
8288
"end. Checkouts also work on the local file system, so that all that matters "
8289
"is\n"
8290
"file permissions."
8291
msgstr ""
8292
8293
#: dummy/help_topics/checkouts/detail.txt:58
8294
msgid ""
8295
"You can change the master of a checkout by using the \"switch\" command "
8296
"(see\n"
8297
"\"help switch\"). This will change the location that the commits are sent "
8298
"to.\n"
8299
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8300
"checkout. If you would like to convert your heavy checkout into a normal\n"
8301
"branch so that every commit is local, you can use the \"unbind\" command. To "
8302
"see\n"
8303
"whether or not a branch is bound or not you can use the \"info\" command. If "
8304
"the\n"
8305
"branch is bound it will tell you the location of the bound branch."
8306
msgstr ""
8307
8308
#: dummy/help_topics/checkouts/detail.txt:68
8309
msgid ""
8310
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
8311
" checkout\n"
8312
" update Pull any changes in the master branch in to your checkout\n"
8313
" commit Make a commit that is sent to the master branch. If you have\n"
8314
" a heavy checkout then the --local option will commit to the\n"
8315
" checkout without sending the commit to the master\n"
8316
" switch Change the master branch that the commits in the checkout "
8317
"will\n"
8318
" be sent to\n"
8319
" bind Turn a standalone branch into a heavy checkout so that any\n"
8320
" commits will be sent to the master branch\n"
8321
" unbind Turn a heavy checkout into a standalone branch so that any\n"
8322
" commits are only made locally\n"
8323
" info Displays whether a branch is bound or unbound. If the branch "
8324
"is\n"
8325
" bound, then it will also display the location of the bound "
8326
"branch\n"
8327
msgstr ""
8328
8329
#: dummy/help_topics/checkouts/summary.txt:1
8330
msgid "Information on what a checkout is"
8331
msgstr "Информация о том, что такое рабочая копия"
8332
8333
#: dummy/help_topics/commands/summary.txt:1
8334
msgid "Basic help for all commands"
8335
msgstr "Базовая справка по всем командам"
8336
8337
#: dummy/help_topics/configuration/summary.txt:1
8338
msgid "Details on the configuration settings available"
8339
msgstr ""
8340
8341
#: dummy/help_topics/conflict-types/summary.txt:1
8342
msgid "Types of conflicts and what to do about them"
8343
msgstr ""
8344
8345
#: dummy/help_topics/content-filters/summary.txt:1
8346
msgid "Conversion of content into/from working trees"
8347
msgstr ""
8348
8349
#: dummy/help_topics/criss-cross/detail.txt:1
8350
msgid "Criss-Cross"
8351
msgstr ""
8352
8353
#: dummy/help_topics/criss-cross/detail.txt:3
8354
msgid ""
8355
"A criss-cross in the branch history can cause the default merge technique\n"
8356
"to emit more conflicts than would normally be expected."
8357
msgstr ""
8358
8359
#: dummy/help_topics/criss-cross/detail.txt:6
8360
msgid ""
8361
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
8362
"give\n"
8363
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
8364
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
8365
msgstr ""
8366
8367
#: dummy/help_topics/criss-cross/detail.txt:10
8368
msgid ""
8369
"Criss-crosses occur in a branch's history if two branches merge the same "
8370
"thing\n"
8371
"and then merge one another, or if two branches merge one another at the "
8372
"same\n"
8373
"time. They can be avoided by having each branch only merge from or into a\n"
8374
"designated central branch (a \"star topology\")."
8375
msgstr ""
8376
8377
#: dummy/help_topics/criss-cross/detail.txt:15
8378
msgid ""
8379
"Criss-crosses cause problems because of the way merge works. Bazaar's "
8380
"default\n"
8381
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8382
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
8383
"differences between THIS and OTHER are due to one side adding lines, or\n"
8384
"from another side removing lines."
8385
msgstr ""
8386
8387
#: dummy/help_topics/criss-cross/detail.txt:21
8388
msgid ""
8389
"Criss-crosses mean there is no good choice for a base. Selecting the "
8390
"recent\n"
8391
"merge points could cause one side's changes to be silently discarded.\n"
8392
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8393
"are emitted."
8394
msgstr ""
8395
8396
#: dummy/help_topics/criss-cross/detail.txt:26
8397
msgid ""
8398
"The ``weave`` merge type is not affected by this problem because it uses\n"
8399
"line-origin detection instead of a basis revision to determine the cause of\n"
8400
"differences.\n"
8401
msgstr ""
8402
8403
#: dummy/help_topics/criss-cross/summary.txt:1
8404
msgid "Information on criss-cross merging"
8405
msgstr ""
8406
8407
#: dummy/help_topics/current-formats/summary.txt:1
8408
msgid "Current storage formats"
8409
msgstr ""
8410
8411
#: dummy/help_topics/debug-flags/summary.txt:1
8412
msgid "Options to show or record debug information"
8413
msgstr ""
8414
8415
#: dummy/help_topics/diverged-branches/summary.txt:1
8416
msgid "How to fix diverged branches"
8417
msgstr "Как исправлять отклонения ветвей"
8418
8419
#: dummy/help_topics/env-variables/summary.txt:1
8420
msgid "Environment variable names and values"
8421
msgstr "Имена и значения переменных окружения"
8422
8423
#: dummy/help_topics/eol/summary.txt:1
8424
msgid "Information on end-of-line handling"
8425
msgstr "Информация по обработке конца строки"
8426
8427
#: dummy/help_topics/files/detail.txt:1
8428
msgid "Files"
8429
msgstr "Файлы"
8430
8431
#: dummy/help_topics/files/detail.txt:3
8432
msgid ""
8433
":On Unix: ~/.bazaar/bazaar.conf\n"
8434
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8435
"bazaar\\\\2.0\\\\bazaar.conf"
8436
msgstr ""
8437
":В Unix: ~/.bazaar/bazaar.conf\n"
8438
":В Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8439
"bazaar\\\\2.0\\\\bazaar.conf"
8440
8441
#: dummy/help_topics/files/detail.txt:6
8442
msgid ""
8443
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8444
"used to define general configuration that will be applied everywhere.\n"
8445
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8446
"commonly used options."
8447
msgstr ""
8448
8449
#: dummy/help_topics/files/detail.txt:11
8450
msgid "A typical config file might look something like::"
8451
msgstr "Типичный файл конфигурации может выглядеть как::"
8452
8453
#: dummy/help_topics/files/detail.txt:13
8454
msgid ""
8455
" [DEFAULT]\n"
8456
" email=John Doe <jdoe@isp.com>"
8457
msgstr ""
8458
" [DEFAULT]\n"
8459
" email=John Doe <jdoe@isp.com>"
8460
8461
#: dummy/help_topics/files/detail.txt:16
8462
msgid ""
8463
" [ALIASES]\n"
8464
" commit = commit --strict\n"
8465
" log10 = log --short -r -10..-1\n"
8466
msgstr ""
8467
" [ALIASES]\n"
8468
" commit = commit --strict\n"
8469
" log10 = log --short -r -10..-1\n"
8470
8471
#: dummy/help_topics/files/summary.txt:1
8472
msgid "Information on configuration and log files"
8473
msgstr "Информация по файлам конфигурации и журналам"
8474
8475
#: dummy/help_topics/formats/detail.txt:1
8476
msgid "Storage Formats"
8477
msgstr ""
8478
8479
#: dummy/help_topics/formats/detail.txt:3
8480
msgid ""
8481
"To ensure that older clients do not access data incorrectly,\n"
8482
"Bazaar's policy is to introduce a new storage format whenever\n"
8483
"new features requiring new metadata are added. New storage\n"
8484
"formats may also be introduced to improve performance and\n"
8485
"scalability."
8486
msgstr ""
8487
8488
#: dummy/help_topics/formats/detail.txt:9
8489
msgid ""
8490
"The newest format, 2a, is highly recommended. If your\n"
8491
"project is not using 2a, then you should suggest to the\n"
8492
"project owner to upgrade."
8493
msgstr ""
8494
8495
#: dummy/help_topics/formats/detail.txt:13
8496
msgid ""
8497
"\n"
8498
".. note::"
8499
msgstr ""
8500
"\n"
8501
".. замечание::"
8502
8503
#: dummy/help_topics/formats/detail.txt:16
8504
msgid ""
8505
" Some of the older formats have two variants:\n"
8506
" a plain one and a rich-root one. The latter include an additional\n"
8507
" field about the root of the tree. There is no performance cost\n"
8508
" for using a rich-root format but you cannot easily merge changes\n"
8509
" from a rich-root format into a plain format. As a consequence,\n"
8510
" moving a project to a rich-root format takes some co-ordination\n"
8511
" in that all contributors need to upgrade their repositories\n"
8512
" around the same time. 2a and all future formats will be\n"
8513
" implicitly rich-root."
8514
msgstr ""
8515
8516
#: dummy/help_topics/formats/detail.txt:26
8517
msgid ""
8518
"See :doc:`current-formats-help` for the complete list of\n"
8519
"currently supported formats. See :doc:`other-formats-help` for\n"
8520
"descriptions of any available experimental and deprecated formats.\n"
8521
msgstr ""
8522
8523
#: dummy/help_topics/formats/summary.txt:1
8524
msgid "Information on choosing a storage format"
8525
msgstr ""
8526
8527
#: dummy/help_topics/global-options/detail.txt:1
8528
msgid "Global Options"
8529
msgstr "Общие настройки"
8530
8531
#: dummy/help_topics/global-options/detail.txt:3
8532
msgid ""
8533
"These options may be used with any command, and may appear in front of any\n"
8534
"command. (e.g. ``bzr --profile help``)."
8535
msgstr ""
8536
8537
#: dummy/help_topics/global-options/detail.txt:6
8538
msgid ""
8539
"--version Print the version number. Must be supplied before the "
8540
"command.\n"
8541
"--no-aliases Do not process command aliases when running this command.\n"
8542
"--builtin Use the built-in version of a command, not the plugin "
8543
"version.\n"
8544
" This does not suppress other plugin effects.\n"
8545
"--no-plugins Do not process any plugins.\n"
8546
"--no-l10n Do not translate messages.\n"
8547
"--concurrency Number of processes that can be run concurrently (selftest)."
8548
msgstr ""
8549
8550
#: dummy/help_topics/global-options/detail.txt:14
8551
msgid ""
8552
"--profile Profile execution using the hotshot profiler.\n"
8553
"--lsprof Profile execution using the lsprof profiler.\n"
8554
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8555
" results to a specified file. If the filename ends with "
8556
"\".txt\",\n"
8557
" text format will be used. If the filename either starts "
8558
"with\n"
8559
" \"callgrind.out\" or end with \".callgrind\", the output will "
8560
"be\n"
8561
" formatted for use with KCacheGrind. Otherwise, the output\n"
8562
" will be a pickle.\n"
8563
"--coverage Generate line coverage report in the specified directory."
8564
msgstr ""
8565
8566
#: dummy/help_topics/global-options/detail.txt:24
8567
msgid ""
8568
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8569
"for\n"
8570
" the duration of the command. This can be used multiple times "
8571
"if\n"
8572
" several options need to be overridden."
8573
msgstr ""
8574
8575
#: dummy/help_topics/global-options/detail.txt:28
8576
msgid ""
8577
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8578
"information on profiling."
8579
msgstr ""
8580
8581
#: dummy/help_topics/global-options/detail.txt:31
8582
msgid ""
8583
"A number of debug flags are also available to assist troubleshooting and\n"
8584
"development. See :doc:`debug-flags-help`.\n"
8585
msgstr ""
8586
8587
#: dummy/help_topics/global-options/summary.txt:1
8588
msgid "Options that control how Bazaar runs"
8589
msgstr "Настройки, управляющие запуском Bazaar"
8590
8591
#: dummy/help_topics/hidden-commands/summary.txt:1
8592
msgid "All hidden commands"
8593
msgstr "Все скрытые команды"
8594
8595
#: dummy/help_topics/hooks/summary.txt:1
8596
msgid "Points at which custom processing can be added"
8597
msgstr ""
8598
8599
#: dummy/help_topics/launchpad/detail.txt:1
8600
msgid "Integration with Launchpad.net"
8601
msgstr "Интеграция с Launchpad.net"
8602
8603
#: dummy/help_topics/launchpad/detail.txt:3
8604
msgid ""
8605
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8606
"specification tracking."
8607
msgstr ""
8608
8609
#: dummy/help_topics/launchpad/detail.txt:6
8610
msgid ""
8611
"The bzr client (through the plugin called 'launchpad') has special\n"
8612
"features to communicate with Launchpad:"
8613
msgstr ""
8614
8615
#: dummy/help_topics/launchpad/detail.txt:9
8616
msgid ""
8617
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8618
"This\n"
8619
" is then used by the 'lp:' transport to download your branches using\n"
8620
" bzr+ssh://."
8621
msgstr ""
8622
8623
#: dummy/help_topics/launchpad/detail.txt:13
8624
msgid ""
8625
" * The 'lp:' transport uses Launchpad as a directory service: for "
8626
"example\n"
8627
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8628
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8629
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8630
msgstr ""
8631
8632
#: dummy/help_topics/launchpad/detail.txt:18
8633
msgid ""
8634
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8635
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8636
"lp:12345'\n"
8637
" will record a revision property that marks that revision as fixing\n"
8638
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8639
" automatically be linked to the bug report."
8640
msgstr ""
8641
8642
#: dummy/help_topics/launchpad/detail.txt:24
8643
msgid ""
8644
" * The register-branch command tells Launchpad about the url of a\n"
8645
" public branch. Launchpad will then mirror the branch, display\n"
8646
" its contents and allow it to be attached to bugs and other\n"
8647
" objects."
8648
msgstr ""
8649
8650
#: dummy/help_topics/launchpad/detail.txt:29
8651
msgid "For more information see http://help.launchpad.net/\n"
8652
msgstr "Больше информации можно найти на http://help.launchpad.net/\n"
8653
8654
#: dummy/help_topics/launchpad/summary.txt:1
8655
msgid "Using Bazaar with Launchpad.net"
8656
msgstr "Использование Bazaar с Launchpad.net"
8657
8658
#: dummy/help_topics/location-alias/summary.txt:1
8659
msgid "Aliases for remembered locations"
8660
msgstr ""
8661
8662
#: dummy/help_topics/log-formats/summary.txt:1
8663
msgid "Details on the logging formats available"
8664
msgstr ""
8665
8666
#: dummy/help_topics/other-formats/summary.txt:1
8667
msgid "Experimental and deprecated storage formats"
8668
msgstr ""
8669
8670
#: dummy/help_topics/patterns/summary.txt:1
8671
msgid "Information on the pattern syntax"
8672
msgstr ""
8673
8674
#: dummy/help_topics/repositories/detail.txt:1
8675
msgid "Repositories"
8676
msgstr ""
8677
8678
#: dummy/help_topics/repositories/detail.txt:3
8679
msgid ""
8680
"Repositories in Bazaar are where committed information is stored. There is\n"
8681
"a repository associated with every branch."
8682
msgstr ""
8683
8684
#: dummy/help_topics/repositories/detail.txt:6
8685
msgid ""
8686
"Repositories are a form of database. Bzr will usually maintain this for\n"
8687
"good performance automatically, but in some situations (e.g. when doing\n"
8688
"very many commits in a short time period) you may want to ask bzr to\n"
8689
"optimise the database indices. This can be done by the 'bzr pack' command."
8690
msgstr ""
8691
8692
#: dummy/help_topics/repositories/detail.txt:11
8693
msgid ""
8694
"By default just running 'bzr init' will create a repository within the new\n"
8695
"branch but it is possible to create a shared repository which allows "
8696
"multiple\n"
8697
"branches to share their information in the same location. When a new branch "
8698
"is\n"
8699
"created it will first look to see if there is a containing shared repository "
8700
"it\n"
8701
"can use."
8702
msgstr ""
8703
8704
#: dummy/help_topics/repositories/detail.txt:17
8705
msgid ""
8706
"When two branches of the same project share a repository, there is\n"
8707
"generally a large space saving. For some operations (e.g. branching\n"
8708
"within the repository) this translates in to a large time saving."
8709
msgstr ""
8710
8711
#: dummy/help_topics/repositories/detail.txt:21
8712
msgid ""
8713
"To create a shared repository use the init-repository command (or the alias\n"
8714
"init-repo). This command takes the location of the repository to create. "
8715
"This\n"
8716
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8717
"which contains a shared repository. Any new branches that are created in "
8718
"this\n"
8719
"directory will then use it for storage."
8720
msgstr ""
8721
8722
#: dummy/help_topics/repositories/detail.txt:27
8723
msgid ""
8724
"It is a good idea to create a repository whenever you might create more\n"
8725
"than one branch of a project. This is true for both working areas where you\n"
8726
"are doing the development, and any server areas that you use for hosting\n"
8727
"projects. In the latter case, it is common to want branches without working\n"
8728
"trees. Since the files in the branch will not be edited directly there is "
8729
"no\n"
8730
"need to use up disk space for a working tree. To create a repository in "
8731
"which\n"
8732
"the branches will not have working trees pass the '--no-trees' option to\n"
8733
"'init-repository'."
8734
msgstr ""
8735
8736
#: dummy/help_topics/repositories/detail.txt:38
8737
msgid ""
8738
" init-repository Create a shared repository. Use --no-trees to create "
8739
"one\n"
8740
" in which new branches won't get a working tree.\n"
8741
msgstr ""
8742
8743
#: dummy/help_topics/repositories/summary.txt:1
8744
msgid "Basic information on shared repositories."
8745
msgstr "Базовая информация об общих репозиториях."
8746
8747
#: dummy/help_topics/revisionspec/summary.txt:1
8748
msgid "Explain how to use --revision"
8749
msgstr ""
8750
8751
#: dummy/help_topics/rules/summary.txt:1
8752
msgid "Information on defining rule-based preferences"
8753
msgstr ""
8754
8755
#: dummy/help_topics/standalone-trees/detail.txt:1
8756
msgid "Standalone Trees"
8757
msgstr ""
8758
8759
#: dummy/help_topics/standalone-trees/detail.txt:3
8760
msgid ""
8761
"A standalone tree is a working tree with an associated repository. It\n"
8762
"is an independently usable branch, with no dependencies on any other.\n"
8763
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8764
"an existing project under version control."
8765
msgstr ""
8766
8767
#: dummy/help_topics/standalone-trees/detail.txt:8
8768
msgid "Related Commands::"
8769
msgstr ""
8770
8771
#: dummy/help_topics/standalone-trees/detail.txt:10
8772
msgid " init Make a directory into a versioned branch.\n"
8773
msgstr ""
8774
8775
#: dummy/help_topics/standalone-trees/summary.txt:1
8776
msgid "Information on what a standalone tree is"
8777
msgstr ""
8778
8779
#: dummy/help_topics/standard-options/detail.txt:1
8780
msgid "Standard Options"
8781
msgstr ""
8782
8783
#: dummy/help_topics/standard-options/detail.txt:3
8784
msgid "Standard options are legal for all commands."
8785
msgstr ""
8786
8787
#: dummy/help_topics/standard-options/detail.txt:5
8788
msgid ""
8789
"--help, -h Show help message.\n"
8790
"--verbose, -v Display more information.\n"
8791
"--quiet, -q Only display errors and warnings."
8792
msgstr ""
8793
8794
#: dummy/help_topics/standard-options/detail.txt:9
8795
msgid "Unlike global options, standard options can be used in aliases.\n"
8796
msgstr ""
8797
8798
#: dummy/help_topics/standard-options/summary.txt:1
8799
msgid "Options that can be used with any command"
8800
msgstr ""
8801
8802
#: dummy/help_topics/status-flags/detail.txt:1
8803
msgid "Status Flags"
8804
msgstr ""
8805
8806
#: dummy/help_topics/status-flags/detail.txt:3
8807
msgid ""
8808
"Status flags are used to summarise changes to the working tree in a concise\n"
8809
"manner. They are in the form::"
8810
msgstr ""
8811
8812
#: dummy/help_topics/status-flags/detail.txt:6
8813
msgid " xxx <filename>"
8814
msgstr ""
8815
8816
#: dummy/help_topics/status-flags/detail.txt:8
8817
msgid "where the columns' meanings are as follows."
8818
msgstr ""
8819
8820
#: dummy/help_topics/status-flags/detail.txt:10
8821
msgid "Column 1 - versioning/renames::"
8822
msgstr ""
8823
8824
#: dummy/help_topics/status-flags/detail.txt:12
8825
msgid ""
8826
" + File versioned\n"
8827
" - File unversioned\n"
8828
" R File renamed\n"
8829
" ? File unknown\n"
8830
" X File nonexistent (and unknown to bzr)\n"
8831
" C File has conflicts\n"
8832
" P Entry for a pending merge (not a file)"
8833
msgstr ""
8834
8835
#: dummy/help_topics/status-flags/detail.txt:20
8836
msgid "Column 2 - contents::"
8837
msgstr ""
8838
8839
#: dummy/help_topics/status-flags/detail.txt:22
8840
msgid ""
8841
" N File created\n"
8842
" D File deleted\n"
8843
" K File kind changed\n"
8844
" M File modified"
8845
msgstr ""
8846
" N Файл создан\n"
8847
" D Файл удалён\n"
8848
" K Тип файла изменился\n"
8849
" M Файл изменён"
8850
8851
#: dummy/help_topics/status-flags/detail.txt:27
8852
msgid "Column 3 - execute::"
8853
msgstr ""
8854
8855
#: dummy/help_topics/status-flags/detail.txt:29
8856
msgid " * The execute bit was changed\n"
8857
msgstr ""
8858
8859
#: dummy/help_topics/status-flags/summary.txt:1
8860
msgid "Help on status flags"
8861
msgstr ""
8862
8863
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8864
msgid "Branches Out of Sync"
8865
msgstr ""
8866
8867
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8868
msgid ""
8869
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8870
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8871
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8872
"have the same last revision as the new reference branch for the lightweight\n"
8873
"checkout, data could be lost, so Bazaar refuses."
8874
msgstr ""
8875
8876
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8877
msgid "How you deal with this depends on *why* the branches are out of sync."
8878
msgstr ""
8879
8880
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8881
msgid ""
8882
"If you have a checkout and have done local commits, you can get back in "
8883
"sync\n"
8884
"by running \"bzr update\" (and possibly \"bzr commit\")."
8885
msgstr ""
8886
8887
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8888
msgid ""
8889
"If you have a branch and the remote branch is out-of-date, you can push\n"
8890
"the local changes using \"bzr push\". If the local branch is out of date, "
8891
"you\n"
8892
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8893
"commit\n"
8894
"and then push your changes. If you decide that some of the changes aren't\n"
8895
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8896
msgstr ""
8897
8898
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8899
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8900
msgstr ""
8901
8902
#: dummy/help_topics/topics/summary.txt:1
8903
msgid "Topics list"
8904
msgstr ""
8905
8906
#: dummy/help_topics/url-special-chars/summary.txt:1
8907
msgid "Special character handling in URLs"
8908
msgstr ""
8909
8910
#: dummy/help_topics/urlspec/summary.txt:1
8911
msgid "Supported transport protocols"
8912
msgstr ""
8913
8914
#: dummy/help_topics/working-trees/detail.txt:1
8915
msgid "Working Trees"
8916
msgstr ""
8917
8918
#: dummy/help_topics/working-trees/detail.txt:3
8919
msgid ""
8920
"A working tree is the contents of a branch placed on disk so that you can\n"
8921
"see the files and edit them. The working tree is where you make changes to "
8922
"a\n"
8923
"branch, and when you commit the current state of the working tree is the\n"
8924
"snapshot that is recorded in the commit."
8925
msgstr ""
8926
8927
#: dummy/help_topics/working-trees/detail.txt:8
8928
msgid ""
8929
"When you push a branch to a remote system, a working tree will not be\n"
8930
"created. If one is already present the files will not be updated. The\n"
8931
"branch information will be updated and the working tree will be marked\n"
8932
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8933
"may be uncommitted changes or the update may cause content conflicts that "
8934
"are\n"
8935
"difficult to deal with remotely."
8936
msgstr ""
8937
8938
#: dummy/help_topics/working-trees/detail.txt:15
8939
msgid ""
8940
"If you have a branch with no working tree you can use the 'checkout' "
8941
"command\n"
8942
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8943
"will\n"
8944
"create the working tree. If the branch is updated remotely, you can update "
8945
"the\n"
8946
"working tree by running 'bzr update' in that directory."
8947
msgstr ""
8948
8949
#: dummy/help_topics/working-trees/detail.txt:20
8950
msgid ""
8951
"If you have a branch with a working tree that you do not want the 'remove-"
8952
"tree'\n"
8953
"command will remove the tree if it is safe. This can be done to avoid the\n"
8954
"warning about the remote working tree not being updated when pushing to the\n"
8955
"branch. It can also be useful when working with a '--no-trees' repository\n"
8956
"(see 'bzr help repositories')."
8957
msgstr ""
8958
8959
#: dummy/help_topics/working-trees/detail.txt:26
8960
msgid ""
8961
"If you want to have a working tree on a remote machine that you push to you\n"
8962
"can either run 'bzr update' in the remote branch after each push, or use "
8963
"some\n"
8964
"other method to update the tree during the push. There is an 'rspush' "
8965
"plugin\n"
8966
"that will update the working tree using rsync as well as doing a push. "
8967
"There\n"
8968
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8969
"SSH\n"
8970
"after each push."
8971
msgstr ""
8972
8973
#: dummy/help_topics/working-trees/detail.txt:33
8974
msgid "Useful commands::"
8975
msgstr ""
8976
8977
#: dummy/help_topics/working-trees/detail.txt:35
8978
msgid ""
8979
" checkout Create a working tree when a branch does not have one.\n"
8980
" remove-tree Removes the working tree from a branch when it is safe to do "
8981
"so.\n"
8982
" update When a working tree is out of sync with its associated "
8983
"branch\n"
8984
" this will update the tree to match the branch.\n"
8985
msgstr ""
8986
8987
#: dummy/help_topics/working-trees/summary.txt:1
8988
msgid "Information on working trees"
8989
msgstr ""
8990
8991
#: en/help_topics/authentication.txt:1
8992
msgid ""
8993
"Authentication Settings\n"
8994
"======================="
8995
msgstr ""
8996
8997
#: en/help_topics/authentication.txt:4
8998
msgid ""
8999
"\n"
9000
"Intent\n"
9001
"------"
9002
msgstr ""
9003
9004
#: en/help_topics/authentication.txt:8
9005
msgid ""
9006
"Many different authentication policies can be described in the\n"
9007
"``authentication.conf`` file but a particular user should need only a few\n"
9008
"definitions to cover his needs without having to specify a user and a "
9009
"password\n"
9010
"for every branch he uses."
9011
msgstr ""
9012
9013
#: en/help_topics/authentication.txt:13
9014
msgid ""
9015
"The definitions found in this file are used to find the credentials to use "
9016
"for\n"
9017
"a given url. The same credentials can generally be used for as many branches "
9018
"as\n"
9019
"possible by grouping their declaration around the remote servers that need\n"
9020
"them. It's even possible to declare credentials that will be used by "
9021
"different\n"
9022
"servers."
9023
msgstr ""
9024
9025
#: en/help_topics/authentication.txt:19
9026
msgid ""
9027
"The intent is to make this file as small as possible to minimize maintenance."
9028
msgstr ""
9029
9030
#: en/help_topics/authentication.txt:21
9031
msgid ""
9032
"Once the relevant credentials are declared in this file you may use branch "
9033
"urls\n"
9034
"without embedding passwords (security hazard) or even users (enabling "
9035
"sharing\n"
9036
"of your urls with others)."
9037
msgstr ""
9038
9039
#: en/help_topics/authentication.txt:25
9040
msgid "Instead of using::"
9041
msgstr "Вместо использования::"
9042
9043
#: en/help_topics/authentication.txt:27
9044
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
9045
msgstr " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
9046
9047
#: en/help_topics/authentication.txt:29
9048
msgid "you simply use::"
9049
msgstr "можно просто использовать::"
9050
9051
#: en/help_topics/authentication.txt:31
9052
msgid " bzr branch ftp://host.com/path/to/my/branch"
9053
msgstr " bzr branch ftp://host.com/path/to/my/branch"
9054
9055
#: en/help_topics/authentication.txt:33
9056
msgid ""
9057
"provided you have created the following ``authentication.conf`` file::"
9058
msgstr ""
9059
9060
#: en/help_topics/authentication.txt:35
9061
msgid ""
9062
" [myprojects]\n"
9063
" scheme=ftp\n"
9064
" host=host.com\n"
9065
" user=joe\n"
9066
" password=secret\n"
9067
" "
9068
msgstr ""
9069
" [myprojects]\n"
9070
" scheme=ftp\n"
9071
" host=host.com\n"
9072
" user=joe\n"
9073
" password=secret\n"
9074
" "
9075
9076
#: en/help_topics/authentication.txt:42
9077
msgid ""
9078
"Authentication definitions\n"
9079
"--------------------------"
9080
msgstr ""
9081
9082
#: en/help_topics/authentication.txt:45
9083
msgid ""
9084
"There are two kinds of authentication used by the various schemes supported "
9085
"by\n"
9086
"bzr:"
9087
msgstr ""
9088
9089
#: en/help_topics/authentication.txt:48
9090
msgid "1. user and password"
9091
msgstr ""
9092
9093
#: en/help_topics/authentication.txt:50
9094
msgid ""
9095
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
9096
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
9097
"ssh agents are a better, more secure solution. So we have chosen to not "
9098
"provide\n"
9099
"our own less secure method."
9100
msgstr ""
9101
9102
#: en/help_topics/authentication.txt:55
9103
msgid "2. user, realm and password"
9104
msgstr ""
9105
9106
#: en/help_topics/authentication.txt:57
9107
msgid ""
9108
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
9109
"against a host. But, by using ``.htaccess`` files, for example, it is "
9110
"possible\n"
9111
"to define several (``user, realm, password``) for a given ``host``. So what "
9112
"is\n"
9113
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
9114
"is\n"
9115
"not taken into account in the definitions, but will displayed if bzr "
9116
"prompts\n"
9117
"you for a password."
9118
msgstr ""
9119
9120
#: en/help_topics/authentication.txt:64
9121
msgid ""
9122
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
9123
"specifying the appropriate port."
9124
msgstr ""
9125
9126
#: en/help_topics/authentication.txt:67
9127
msgid ""
9128
"To take all schemes into account, the password will be deduced from a set "
9129
"of\n"
9130
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
9131
"``user``,\n"
9132
"``password``)."
9133
msgstr ""
9134
9135
#: en/help_topics/authentication.txt:71
9136
msgid ""
9137
" * ``scheme``: can be empty (meaning the rest of the definition can be "
9138
"used\n"
9139
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
9140
"``ssh``\n"
9141
" should be used instead since this is the real scheme regarding\n"
9142
" authentication,"
9143
msgstr ""
9144
9145
#: en/help_topics/authentication.txt:76
9146
msgid " * ``host``: can be empty (to act as a default for any host),"
9147
msgstr ""
9148
9149
#: en/help_topics/authentication.txt:78
9150
msgid ""
9151
" * ``port`` can be empty (useful when an host provides several servers for "
9152
"the\n"
9153
" same scheme), only numerical values are allowed, this should be used "
9154
"only\n"
9155
" when the server uses a port different than the scheme standard port,"
9156
msgstr ""
9157
9158
#: en/help_topics/authentication.txt:82
9159
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
9160
msgstr ""
9161
9162
#: en/help_topics/authentication.txt:84
9163
msgid ""
9164
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
9165
" ``getpass.get_user()``),"
9166
msgstr ""
9167
9168
#: en/help_topics/authentication.txt:87
9169
msgid ""
9170
" * ``password``: can be empty if you prefer to always be prompted for your\n"
9171
" password."
9172
msgstr ""
9173
9174
#: en/help_topics/authentication.txt:90
9175
msgid ""
9176
"Multiple definitions can be provided and, for a given URL, bzr will select "
9177
"a\n"
9178
"(``user`` [, ``password``]) based on the following rules :"
9179
msgstr ""
9180
9181
#: en/help_topics/authentication.txt:93
9182
msgid " 1. the first match wins,"
9183
msgstr ""
9184
9185
#: en/help_topics/authentication.txt:95
9186
msgid " 2. empty fields match everything,"
9187
msgstr ""
9188
9189
#: en/help_topics/authentication.txt:97
9190
msgid ""
9191
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
9192
msgstr ""
9193
9194
#: en/help_topics/authentication.txt:99
9195
msgid ""
9196
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
9197
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
9198
"``projectbzr.sf.net``\n"
9199
" will not match ``bzr.sf.net``)."
9200
msgstr ""
9201
9202
#: en/help_topics/authentication.txt:103
9203
msgid ""
9204
" 5. ``port`` matches if included in the requested URL (exact matches only)"
9205
msgstr ""
9206
9207
#: en/help_topics/authentication.txt:105
9208
msgid ""
9209
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
9210
"above,\n"
9211
" empty paths will match any provided path)."
9212
msgstr ""
9213
9214
#: en/help_topics/authentication.txt:110
9215
msgid ""
9216
"File format\n"
9217
"-----------"
9218
msgstr ""
9219
9220
#: en/help_topics/authentication.txt:113
9221
msgid ""
9222
"The general rules for :doc:`configuration files <configuration-help>`\n"
9223
"apply except for the variable policies."
9224
msgstr ""
9225
9226
#: en/help_topics/authentication.txt:116
9227
msgid "Each section describes an authentication definition."
9228
msgstr ""
9229
9230
#: en/help_topics/authentication.txt:118
9231
msgid ""
9232
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9233
"reserved\n"
9234
"and should appear as the *last* section."
9235
msgstr ""
9236
9237
#: en/help_topics/authentication.txt:121
9238
msgid "Each section should define:"
9239
msgstr ""
9240
9241
#: en/help_topics/authentication.txt:123
9242
msgid "* ``user``: the login to be used,"
9243
msgstr ""
9244
9245
#: en/help_topics/authentication.txt:125
9246
msgid "Each section could define:"
9247
msgstr ""
9248
9249
#: en/help_topics/authentication.txt:127
9250
msgid "* ``host``: the remote server,"
9251
msgstr ""
9252
9253
#: en/help_topics/authentication.txt:129
9254
msgid "* ``port``: the port the server is listening,"
9255
msgstr ""
9256
9257
#: en/help_topics/authentication.txt:131
9258
msgid "* ``path``: the branch location,"
9259
msgstr ""
9260
9261
#: en/help_topics/authentication.txt:133
9262
msgid "* ``password``: the password."
9263
msgstr ""
9264
9265
#: en/help_topics/authentication.txt:135
9266
msgid ""
9267
"\n"
9268
"Examples\n"
9269
"--------"
9270
msgstr ""
9271
9272
#: en/help_topics/authentication.txt:139
9273
msgid ""
9274
"\n"
9275
"Personal projects hosted outside\n"
9276
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9277
msgstr ""
9278
9279
#: en/help_topics/authentication.txt:143
9280
msgid ""
9281
"All connections are done with the same ``user`` (the remote one for which "
9282
"the\n"
9283
"default bzr one is not appropriate) and the password is always prompted "
9284
"with\n"
9285
"some exceptions::"
9286
msgstr ""
9287
9288
#: en/help_topics/authentication.txt:147
9289
msgid ""
9290
" # Pet projects on hobby.net\n"
9291
" [hobby]\n"
9292
" host=r.hobby.net\n"
9293
" user=jim\n"
9294
" password=obvious1234\n"
9295
" \n"
9296
" # Home server\n"
9297
" [home]\n"
9298
" scheme=https\n"
9299
" host=home.net\n"
9300
" user=joe\n"
9301
" password=1essobV10us\n"
9302
" \n"
9303
" [DEFAULT]\n"
9304
" # Our local user is barbaz, on all remote sites we're known as "
9305
"foobar\n"
9306
" user=foobar"
9307
msgstr ""
9308
9309
#: en/help_topics/authentication.txt:164
9310
msgid ""
9311
"\n"
9312
"Source hosting provider\n"
9313
"~~~~~~~~~~~~~~~~~~~~~~~"
9314
msgstr ""
9315
9316
#: en/help_topics/authentication.txt:168
9317
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9318
msgstr ""
9319
9320
#: en/help_topics/authentication.txt:170
9321
msgid ""
9322
" [shpnet domain]\n"
9323
" # we use sftp, but ssh is the scheme used for authentication\n"
9324
" scheme=ssh\n"
9325
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9326
" host=.shp.net\n"
9327
" user=joe\n"
9328
" # bzr don't support supplying a password for sftp,\n"
9329
" # consider using an ssh agent if you don't want to supply\n"
9330
" # a password interactively. (pageant, ssh-agent, etc)"
9331
msgstr ""
9332
9333
#: en/help_topics/authentication.txt:180
9334
msgid ""
9335
"HTTPS, SFTP servers and their proxy\n"
9336
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9337
msgstr ""
9338
9339
#: en/help_topics/authentication.txt:183
9340
msgid ""
9341
"At company.com, the server hosting release and integration branches is "
9342
"behind a\n"
9343
"proxy, and the two branches use different authentication policies::"
9344
msgstr ""
9345
9346
#: en/help_topics/authentication.txt:186
9347
msgid ""
9348
" [reference code]\n"
9349
" scheme=https\n"
9350
" host=dev.company.com\n"
9351
" path=/dev\n"
9352
" user=user1\n"
9353
" password=pass1"
9354
msgstr ""
9355
9356
#: en/help_topics/authentication.txt:193
9357
msgid ""
9358
" # development branches on dev server\n"
9359
" [dev]\n"
9360
" scheme=ssh # bzr+ssh and sftp are available here\n"
9361
" host=dev.company.com\n"
9362
" path=/dev/integration\n"
9363
" user=user2\n"
9364
" \n"
9365
" # proxy\n"
9366
" [proxy]\n"
9367
" scheme=http\n"
9368
" host=proxy.company.com\n"
9369
" port=3128\n"
9370
" user=proxyuser1\n"
9371
" password=proxypass1"
9372
msgstr ""
9373
9374
#: en/help_topics/authentication.txt:208
9375
msgid ""
9376
"\n"
9377
"Planned enhancements\n"
9378
"--------------------"
9379
msgstr ""
9380
9381
#: en/help_topics/authentication.txt:212
9382
msgid ""
9383
"The following are not yet implemented but planned as parts of a work in\n"
9384
"progress:"
9385
msgstr ""
9386
9387
#: en/help_topics/authentication.txt:215
9388
msgid "* add a ``password_encoding`` field allowing:"
9389
msgstr ""
9390
9391
#: en/help_topics/authentication.txt:217
9392
msgid ""
9393
" - storing the passwords in various obfuscating encodings (base64 for one),"
9394
msgstr ""
9395
9396
#: en/help_topics/authentication.txt:219
9397
msgid " - delegate password storage to plugins (.netrc for example)."
9398
msgstr ""
9399
9400
#: en/help_topics/authentication.txt:221
9401
msgid ""
9402
"* update the credentials when the user is prompted for user or password,"
9403
msgstr ""
9404
9405
#: en/help_topics/authentication.txt:223
9406
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9407
msgstr ""
9408
9409
#: en/help_topics/authentication.txt:225
9410
msgid ""
9411
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9412
"but\n"
9413
"ignored in the actual implementation.\n"
9414
msgstr ""
9415
9416
#: en/help_topics/bugs.txt:1
9417
msgid "Bug Tracker Settings"
9418
msgstr ""
9419
9420
#: en/help_topics/bugs.txt:3
9421
msgid ""
9422
"When making a commit, metadata about bugs fixed by that change can be\n"
9423
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9424
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9425
"(The only ``status`` value currently supported is ``fixed.``)"
9426
msgstr ""
9427
9428
#: en/help_topics/bugs.txt:8
9429
msgid ""
9430
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9431
"identifier\n"
9432
"rather than a full URL. This looks like::"
9433
msgstr ""
9434
9435
#: en/help_topics/bugs.txt:11
9436
msgid " bzr commit --fixes <tracker>:<id>"
9437
msgstr ""
9438
9439
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9440
msgid "or::"
9441
msgstr ""
9442
9443
#: en/help_topics/bugs.txt:15
9444
msgid " bzr commit --fixes <id>"
9445
msgstr ""
9446
9447
#: en/help_topics/bugs.txt:17
9448
msgid ""
9449
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9450
"the\n"
9451
"identifier for that bug within the bugtracker, usually the bug number.\n"
9452
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9453
"or global configuration is used."
9454
msgstr ""
9455
9456
#: en/help_topics/bugs.txt:22
9457
msgid ""
9458
"Bazaar knows about a few bug trackers that have many users. If\n"
9459
"you use one of these bug trackers then there is no setup required to\n"
9460
"use this feature, you just need to know the tracker identifier to use.\n"
9461
"These are the bugtrackers that are built in:"
9462
msgstr ""
9463
9464
#: en/help_topics/bugs.txt:27
9465
msgid ""
9466
" ============================ ============ ============\n"
9467
" URL Abbreviation Example\n"
9468
" ============================ ============ ============\n"
9469
" https://bugs.launchpad.net/ lp lp:12345\n"
9470
" http://bugs.debian.org/ deb deb:12345\n"
9471
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9472
" ============================ ============ ============"
9473
msgstr ""
9474
9475
#: en/help_topics/bugs.txt:35
9476
msgid ""
9477
"For the bug trackers not listed above configuration is required.\n"
9478
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9479
"is built in, along with a template mechanism for other bugtrackers with\n"
9480
"simple URL schemes. If your bug tracker can't be described by one\n"
9481
"of the schemes described below then you can write a plugin to support\n"
9482
"it."
9483
msgstr ""
9484
9485
#: en/help_topics/bugs.txt:42
9486
msgid ""
9487
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9488
"variable which contains the base URL of the bug tracker. These options\n"
9489
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9490
"configuration section in ``locations.conf``. You can set up these values\n"
9491
"for each of the projects you work on."
9492
msgstr ""
9493
9494
#: en/help_topics/bugs.txt:48
9495
msgid ""
9496
"Note: As you provide a short name for each tracker, you can specify one or\n"
9497
"more bugs in one or more trackers at commit time if you wish."
9498
msgstr ""
9499
9500
#: en/help_topics/bugs.txt:51
9501
msgid ""
9502
"Launchpad\n"
9503
"---------"
9504
msgstr ""
9505
9506
#: en/help_topics/bugs.txt:54
9507
msgid ""
9508
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9509
msgstr ""
9510
9511
#: en/help_topics/bugs.txt:56
9512
msgid ""
9513
"bugzilla_<tracker>_url\n"
9514
"----------------------"
9515
msgstr ""
9516
9517
#: en/help_topics/bugs.txt:59
9518
msgid ""
9519
"If present, the location of the Bugzilla bug tracker referred to by\n"
9520
"<tracker>. This option can then be used together with ``bzr commit\n"
9521
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9522
"example::"
9523
msgstr ""
9524
9525
#: en/help_topics/bugs.txt:64
9526
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9527
msgstr ""
9528
9529
#: en/help_topics/bugs.txt:66
9530
msgid ""
9531
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9532
"fixed."
9533
msgstr ""
9534
9535
#: en/help_topics/bugs.txt:69
9536
msgid ""
9537
"trac_<tracker>_url\n"
9538
"------------------"
9539
msgstr ""
9540
9541
#: en/help_topics/bugs.txt:72
9542
msgid ""
9543
"If present, the location of the Trac instance referred to by\n"
9544
"<tracker>. This option can then be used together with ``bzr commit\n"
9545
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9546
"example::"
9547
msgstr ""
9548
9549
#: en/help_topics/bugs.txt:77
9550
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9551
msgstr ""
9552
9553
#: en/help_topics/bugs.txt:79
9554
msgid ""
9555
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9556
"as\n"
9557
"fixed."
9558
msgstr ""
9559
9560
#: en/help_topics/bugs.txt:82
9561
msgid ""
9562
"bugtracker_<tracker>_url\n"
9563
"------------------------"
9564
msgstr ""
9565
9566
#: en/help_topics/bugs.txt:85
9567
msgid ""
9568
"If present, the location of a generic bug tracker instance referred to by\n"
9569
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9570
"which will be replaced by a specific bug ID. This option can then be used\n"
9571
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9572
"fixed by that commit. For example::"
9573
msgstr ""
9574
9575
#: en/help_topics/bugs.txt:91
9576
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9577
msgstr ""
9578
9579
#: en/help_topics/bugs.txt:93
9580
msgid ""
9581
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9582
"Roundup bug tracker as fixed, or::"
9583
msgstr ""
9584
9585
#: en/help_topics/bugs.txt:96
9586
msgid ""
9587
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9588
msgstr ""
9589
9590
#: en/help_topics/bugs.txt:98
9591
msgid ""
9592
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9593
"RT bug tracker as fixed, or::"
9594
msgstr ""
9595
9596
#: en/help_topics/bugs.txt:101
9597
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9598
msgstr ""
9599
9600
#: en/help_topics/bugs.txt:103
9601
msgid ""
9602
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9603
"1234\n"
9604
"in Hudson's JIRA bug tracker as fixed.\n"
9605
msgstr ""
9606
9607
#: en/help_topics/commands.txt:1
9608
msgid ""
9609
"add Add specified files or directories.\n"
9610
"alias Set/unset and display aliases.\n"
9611
"annotate Show the origin of each line in a file.\n"
9612
"bash-completion Generate a shell function for bash command line "
9613
"completion.\n"
9614
" [bash_completion]\n"
9615
"bind Convert the current branch into a checkout of the "
9616
"supplied\n"
9617
" branch.\n"
9618
"branch Create a new branch that is a copy of an existing branch.\n"
9619
"branches List the branches available at the current location.\n"
9620
"break-lock Break a dead lock.\n"
9621
"cat Write the contents of a file as of a given revision to\n"
9622
" standard output.\n"
9623
"check Validate working tree structure, branch consistency and\n"
9624
" repository history.\n"
9625
"checkout Create a new checkout of an existing branch.\n"
9626
"clean-tree Remove unwanted files from working tree.\n"
9627
"commit Commit changes into a new revision.\n"
9628
"config Display, set or remove a configuration option.\n"
9629
"conflicts List files with conflicts.\n"
9630
"deleted List files deleted in the working tree.\n"
9631
"diff Show differences in the working tree, between revisions "
9632
"or\n"
9633
" branches.\n"
9634
"dpush Push into a different VCS without any custom bzr "
9635
"metadata.\n"
9636
"export Export current or past revision to a destination directory "
9637
"or\n"
9638
" archive.\n"
9639
"help Show help on a command or other topic.\n"
9640
"ignore Ignore specified files or patterns.\n"
9641
"ignored List ignored files and the patterns that matched them.\n"
9642
"info Show information about a working tree, branch or "
9643
"repository.\n"
9644
"init Make a directory into a versioned branch.\n"
9645
"init-repository Create a shared repository for branches to share storage\n"
9646
" space.\n"
9647
"join Combine a tree into its containing tree.\n"
9648
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9649
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9650
"launchpad-open Open a Launchpad branch page in your web browser. "
9651
"[launchpad]\n"
9652
"log Show historical log for a branch or subset of a branch.\n"
9653
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9654
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9655
"ls List files in a tree.\n"
9656
"merge Perform a three-way merge.\n"
9657
"missing Show unmerged/unpulled revisions between two branches.\n"
9658
"mkdir Create a new versioned directory.\n"
9659
"mv Move or rename a file.\n"
9660
"nick Print or set the branch nickname.\n"
9661
"pack Compress the data within a repository.\n"
9662
"plugins List the installed plugins.\n"
9663
"pull Turn this branch into a mirror of another branch.\n"
9664
"push Update a mirror of this branch.\n"
9665
"reconcile Reconcile bzr metadata in a branch.\n"
9666
"reconfigure Reconfigure the type of a bzr directory.\n"
9667
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9668
"remerge Redo a merge.\n"
9669
"remove Remove files or directories.\n"
9670
"remove-branch Remove a branch.\n"
9671
"remove-tree Remove the working tree from a given branch/checkout.\n"
9672
"renames Show list of renamed files.\n"
9673
"resolve Mark a conflict as resolved.\n"
9674
"revert Set files in the working tree back to the contents of a\n"
9675
" previous revision.\n"
9676
"revno Show current revision number.\n"
9677
"root Show the tree root directory.\n"
9678
"send Mail or create a merge-directive for submitting changes.\n"
9679
"serve Run the bzr server.\n"
9680
"shelve Temporarily set aside some changes from the current tree.\n"
9681
"sign-my-commits Sign all commits by a given committer.\n"
9682
"split Split a subdirectory of a tree into a separate tree.\n"
9683
"status Display status summary.\n"
9684
"switch Set the branch of a checkout and update.\n"
9685
"tag Create, remove or modify a tag naming a revision.\n"
9686
"tags List tags.\n"
9687
"testament Show testament (signing-form) of a revision.\n"
9688
"unbind Convert the current checkout into a regular branch.\n"
9689
"uncommit Remove the last committed revision.\n"
9690
"unshelve Restore shelved changes.\n"
9691
"update Update a working tree to a new revision.\n"
9692
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9693
" format.\n"
9694
"verify-signatures Verify all commit signatures.\n"
9695
"version Show version of bzr.\n"
9696
"version-info Show version information about this tree.\n"
9697
"view Manage filtered views.\n"
9698
"whoami Show or set bzr user id.\n"
9699
msgstr ""
9700
9701
#: en/help_topics/configuration.txt:1
9702
msgid ""
9703
"Configuration Settings\n"
9704
"======================="
9705
msgstr ""
9706
9707
#: en/help_topics/configuration.txt:4
9708
msgid ""
9709
"Environment settings\n"
9710
"---------------------"
9711
msgstr ""
9712
9713
#: en/help_topics/configuration.txt:7
9714
msgid ""
9715
"While most configuration is handled by configuration files, some options\n"
9716
"which may be semi-permanent can also be controlled through the environment."
9717
msgstr ""
9718
9719
#: en/help_topics/configuration.txt:10
9720
msgid ""
9721
"BZR_EMAIL\n"
9722
"~~~~~~~~~"
9723
msgstr ""
9724
9725
#: en/help_topics/configuration.txt:13
9726
msgid "Override the email id used by Bazaar. Typical format::"
9727
msgstr ""
9728
9729
#: en/help_topics/configuration.txt:15
9730
msgid " \"John Doe <jdoe@example.com>\""
9731
msgstr ""
9732
9733
#: en/help_topics/configuration.txt:17
9734
msgid "See also the ``email`` configuration option."
9735
msgstr ""
9736
9737
#: en/help_topics/configuration.txt:19
9738
msgid ""
9739
"BZR_PROGRESS_BAR\n"
9740
"~~~~~~~~~~~~~~~~"
9741
msgstr ""
9742
9743
#: en/help_topics/configuration.txt:22
9744
msgid ""
9745
"Override the progress display. Possible values are \"none\" or \"text\". "
9746
"If\n"
9747
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9748
"draws\n"
9749
"the ordinary command line progress bar."
9750
msgstr ""
9751
9752
#: en/help_topics/configuration.txt:26
9753
msgid ""
9754
"BZR_SIGQUIT_PDB\n"
9755
"~~~~~~~~~~~~~~~"
9756
msgstr ""
9757
9758
#: en/help_topics/configuration.txt:29
9759
msgid ""
9760
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9761
msgstr ""
9762
9763
#: en/help_topics/configuration.txt:31
9764
msgid ""
9765
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9766
"* 1 = Invoke breakin debugger (default)"
9767
msgstr ""
9768
9769
#: en/help_topics/configuration.txt:34
9770
msgid ""
9771
"BZR_HOME\n"
9772
"~~~~~~~~"
9773
msgstr ""
9774
9775
#: en/help_topics/configuration.txt:37
9776
msgid "Override the home directory used by Bazaar."
9777
msgstr ""
9778
9779
#: en/help_topics/configuration.txt:39
9780
msgid ""
9781
"BZR_SSH\n"
9782
"~~~~~~~"
9783
msgstr ""
9784
9785
#: en/help_topics/configuration.txt:42
9786
msgid "Select a different SSH implementation."
9787
msgstr ""
9788
9789
#: en/help_topics/configuration.txt:44
9790
msgid ""
9791
"BZR_PDB\n"
9792
"~~~~~~~"
9793
msgstr ""
9794
9795
#: en/help_topics/configuration.txt:47
9796
msgid "Control whether to launch a debugger on error."
9797
msgstr ""
9798
9799
#: en/help_topics/configuration.txt:49
9800
msgid ""
9801
"* 0 = Standard behavior\n"
9802
"* 1 = Launch debugger"
9803
msgstr ""
9804
9805
#: en/help_topics/configuration.txt:52
9806
msgid ""
9807
"BZR_REMOTE_PATH\n"
9808
"~~~~~~~~~~~~~~~"
9809
msgstr ""
9810
9811
#: en/help_topics/configuration.txt:55
9812
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9813
msgstr ""
9814
9815
#: en/help_topics/configuration.txt:57
9816
msgid "See also the ``bzr_remote_path`` configuration option."
9817
msgstr ""
9818
9819
#: en/help_topics/configuration.txt:59
9820
msgid ""
9821
"BZR_EDITOR\n"
9822
"~~~~~~~~~~"
9823
msgstr ""
9824
9825
#: en/help_topics/configuration.txt:62
9826
msgid "Path to the editor Bazaar should use for commit messages, etc."
9827
msgstr ""
9828
9829
#: en/help_topics/configuration.txt:64
9830
msgid ""
9831
"BZR_LOG\n"
9832
"~~~~~~~"
9833
msgstr ""
9834
9835
#: en/help_topics/configuration.txt:67
9836
msgid ""
9837
"Location of the Bazaar log file. You can check the current location by\n"
9838
"running ``bzr version``."
9839
msgstr ""
9840
9841
#: en/help_topics/configuration.txt:70
9842
msgid ""
9843
"The log file contains debug information that is useful for diagnosing or\n"
9844
"reporting problems with Bazaar."
9845
msgstr ""
9846
9847
#: en/help_topics/configuration.txt:73
9848
msgid ""
9849
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9850
"will disable logging."
9851
msgstr ""
9852
9853
#: en/help_topics/configuration.txt:76
9854
msgid ""
9855
"\n"
9856
"BZR_PLUGIN_PATH\n"
9857
"~~~~~~~~~~~~~~~"
9858
msgstr ""
9859
9860
#: en/help_topics/configuration.txt:80
9861
msgid ""
9862
"The path to the plugins directory that Bazaar should use.\n"
9863
"If not set, Bazaar will search for plugins in:"
9864
msgstr ""
9865
9866
#: en/help_topics/configuration.txt:83
9867
msgid ""
9868
"* the user specific plugin directory (containing the ``user`` plugins),"
9869
msgstr ""
9870
9871
#: en/help_topics/configuration.txt:85
9872
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9873
msgstr ""
9874
9875
#: en/help_topics/configuration.txt:87
9876
msgid ""
9877
"* the site specific plugin directory if applicable (containing\n"
9878
" the ``site`` plugins)."
9879
msgstr ""
9880
9881
#: en/help_topics/configuration.txt:90
9882
msgid ""
9883
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9884
"the way the plugin are searched. "
9885
msgstr ""
9886
9887
#: en/help_topics/configuration.txt:93
9888
msgid ""
9889
"As for the ``PATH`` variables, if multiple directories are\n"
9890
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9891
"platform specific appropriate character (':' on Unix,\n"
9892
"';' on windows)"
9893
msgstr ""
9894
9895
#: en/help_topics/configuration.txt:98
9896
msgid ""
9897
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9898
"in ``user``. However it will continue to search in ``core`` and\n"
9899
"``site`` unless they are explicitly removed."
9900
msgstr ""
9901
9902
#: en/help_topics/configuration.txt:102
9903
msgid ""
9904
"If you need to change the order or remove one of these\n"
9905
"directories, you should use special values:"
9906
msgstr ""
9907
9908
#: en/help_topics/configuration.txt:105
9909
msgid ""
9910
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9911
" path from the default values,"
9912
msgstr ""
9913
9914
#: en/help_topics/configuration.txt:108
9915
msgid ""
9916
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9917
" before the remaining default values (and also remove it from\n"
9918
" the default values)."
9919
msgstr ""
9920
9921
#: en/help_topics/configuration.txt:112
9922
msgid ""
9923
"Note that the special values 'user', 'core' and 'site' should be\n"
9924
"used literally, they will be substituted by the corresponding,\n"
9925
"platform specific, values."
9926
msgstr ""
9927
9928
#: en/help_topics/configuration.txt:116
9929
msgid ""
9930
"The examples below use ':' as the separator, windows users\n"
9931
"should use ';'."
9932
msgstr ""
9933
9934
#: en/help_topics/configuration.txt:119
9935
msgid "Overriding the default user plugin directory::"
9936
msgstr ""
9937
9938
#: en/help_topics/configuration.txt:121
9939
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9940
msgstr ""
9941
9942
#: en/help_topics/configuration.txt:123
9943
msgid "Disabling the site directory while retaining the user directory::"
9944
msgstr ""
9945
9946
#: en/help_topics/configuration.txt:125
9947
msgid " BZR_PLUGIN_PATH='-site:+user'"
9948
msgstr ""
9949
9950
#: en/help_topics/configuration.txt:127
9951
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9952
msgstr ""
9953
9954
#: en/help_topics/configuration.txt:129
9955
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9956
msgstr ""
9957
9958
#: en/help_topics/configuration.txt:131
9959
msgid "Overriding the default site plugin directory::"
9960
msgstr ""
9961
9962
#: en/help_topics/configuration.txt:133
9963
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9964
msgstr ""
9965
9966
#: en/help_topics/configuration.txt:135
9967
msgid ""
9968
"BZR_DISABLE_PLUGINS\n"
9969
"~~~~~~~~~~~~~~~~~~~"
9970
msgstr ""
9971
9972
#: en/help_topics/configuration.txt:138
9973
msgid ""
9974
"Under special circumstances (mostly when trying to diagnose a\n"
9975
"bug), it's better to disable a plugin (or several) rather than\n"
9976
"uninstalling them completely. Such plugins can be specified in\n"
9977
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9978
msgstr ""
9979
9980
#: en/help_topics/configuration.txt:143
9981
msgid ""
9982
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9983
"will raise an import error if they are explicitly imported (by\n"
9984
"another plugin that depends on them for example)."
9985
msgstr ""
9986
9987
#: en/help_topics/configuration.txt:147
9988
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9989
msgstr ""
9990
9991
#: en/help_topics/configuration.txt:149
9992
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9993
msgstr ""
9994
9995
#: en/help_topics/configuration.txt:151
9996
msgid ""
9997
"BZR_PLUGINS_AT\n"
9998
"~~~~~~~~~~~~~~"
9999
msgstr ""
10000
10001
#: en/help_topics/configuration.txt:154
10002
msgid ""
10003
"When adding a new feature or working on a bug in a plugin,\n"
10004
"developers often need to use a specific version of a given\n"
10005
"plugin. Since python requires that the directory containing the\n"
10006
"code is named like the plugin itself this make it impossible to\n"
10007
"use arbitrary directory names (using a two-level directory scheme\n"
10008
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
10009
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
10010
msgstr ""
10011
10012
#: en/help_topics/configuration.txt:162
10013
msgid ""
10014
"Plugins specified in this environment variable takes precedence\n"
10015
"over the ones in ``BZR_PLUGIN_PATH``."
10016
msgstr ""
10017
10018
#: en/help_topics/configuration.txt:165
10019
msgid ""
10020
"The variable specified a list of ``plugin_name@plugin path``,\n"
10021
"``plugin_name`` being the name of the plugin as it appears in\n"
10022
"python module paths, ``plugin_path`` being the path to the\n"
10023
"directory containing the plugin code itself\n"
10024
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
10025
"separator, use ';' on windows."
10026
msgstr ""
10027
10028
#: en/help_topics/configuration.txt:172
10029
msgid ""
10030
"Example:\n"
10031
"~~~~~~~~"
10032
msgstr ""
10033
10034
#: en/help_topics/configuration.txt:175
10035
msgid ""
10036
"Using a specific version of ``myplugin``:\n"
10037
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:178
10041
msgid ""
10042
"BZRPATH\n"
10043
"~~~~~~~"
10044
msgstr ""
10045
10046
#: en/help_topics/configuration.txt:181
10047
msgid "The path where Bazaar should look for shell plugin external commands."
10048
msgstr ""
10049
10050
#: en/help_topics/configuration.txt:183
10051
msgid ""
10052
"\n"
10053
"http_proxy, https_proxy\n"
10054
"~~~~~~~~~~~~~~~~~~~~~~~"
10055
msgstr ""
10056
10057
#: en/help_topics/configuration.txt:187
10058
msgid "Specifies the network proxy for outgoing connections, for example::"
10059
msgstr ""
10060
10061
#: en/help_topics/configuration.txt:189
10062
msgid ""
10063
" http_proxy=http://proxy.example.com:3128/ \n"
10064
" https_proxy=http://proxy.example.com:3128/"
10065
msgstr ""
10066
10067
#: en/help_topics/configuration.txt:192
10068
msgid ""
10069
"\n"
10070
"Configuration files\n"
10071
"-------------------"
10072
msgstr ""
10073
10074
#: en/help_topics/configuration.txt:196
10075
msgid ""
10076
"Location\n"
10077
"~~~~~~~~"
10078
msgstr ""
10079
10080
#: en/help_topics/configuration.txt:199
10081
msgid ""
10082
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
10083
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
10084
"on\n"
10085
"Windows. (You can check the location for your system by using\n"
10086
"``bzr version``.)"
10087
msgstr ""
10088
10089
#: en/help_topics/configuration.txt:204
10090
msgid "There are three primary configuration files in this location:"
10091
msgstr ""
10092
10093
#: en/help_topics/configuration.txt:206
10094
msgid "* ``bazaar.conf`` describes default configuration options,"
10095
msgstr ""
10096
10097
#: en/help_topics/configuration.txt:208
10098
msgid ""
10099
"* ``locations.conf`` describes configuration information for\n"
10100
" specific branch locations,"
10101
msgstr ""
10102
10103
#: en/help_topics/configuration.txt:211
10104
msgid ""
10105
"* ``authentication.conf`` describes credential information for\n"
10106
" remote servers."
10107
msgstr ""
10108
10109
#: en/help_topics/configuration.txt:214
10110
msgid ""
10111
"Each branch can also contain a configuration file that sets values specific\n"
10112
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
10113
"the\n"
10114
"branch. This file is visible to all users of a branch, if you wish to "
10115
"override\n"
10116
"one of the values for a branch with a setting that is specific to you then "
10117
"you\n"
10118
"can do so in ``locations.conf``."
10119
msgstr ""
10120
10121
#: en/help_topics/configuration.txt:220
10122
msgid ""
10123
"General format\n"
10124
"~~~~~~~~~~~~~~"
10125
msgstr ""
10126
10127
#: en/help_topics/configuration.txt:223
10128
msgid ""
10129
"An ini file has three types of contructs: section headers, section\n"
10130
"options and comments."
10131
msgstr ""
10132
10133
#: en/help_topics/configuration.txt:226
10134
msgid ""
10135
"Comments\n"
10136
"^^^^^^^^"
10137
msgstr ""
10138
10139
#: en/help_topics/configuration.txt:229
10140
msgid ""
10141
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
10142
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
10143
"Bazaar when parsing ini files."
10144
msgstr ""
10145
10146
#: en/help_topics/configuration.txt:233
10147
msgid ""
10148
"Section headers\n"
10149
"^^^^^^^^^^^^^^^"
10150
msgstr ""
10151
10152
#: en/help_topics/configuration.txt:236
10153
msgid ""
10154
"A section header is a word enclosed in brackets that starts at the begining\n"
10155
"of a line. A typical section header looks like this::"
10156
msgstr ""
10157
10158
#: en/help_topics/configuration.txt:239
10159
msgid " [DEFAULT]"
10160
msgstr ""
10161
10162
#: en/help_topics/configuration.txt:241
10163
msgid ""
10164
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
10165
"[ALIASES]. Section headers are case sensitive. The default section provides "
10166
"for\n"
10167
"setting options which can be overridden with the branch config file."
10168
msgstr ""
10169
10170
#: en/help_topics/configuration.txt:245
10171
msgid ""
10172
"For ``locations.conf``, the options from the section with the\n"
10173
"longest matching section header are used to the exclusion of other\n"
10174
"potentially valid section headers. A section header uses the path for\n"
10175
"the branch as the section header. Some examples include::"
10176
msgstr ""
10177
10178
#: en/help_topics/configuration.txt:250
10179
msgid ""
10180
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
10181
" [/home/jdoe/branches/]"
10182
msgstr ""
10183
10184
#: en/help_topics/configuration.txt:253
10185
msgid ""
10186
"\n"
10187
"Section options\n"
10188
"^^^^^^^^^^^^^^^"
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:257
10192
msgid ""
10193
"A section option resides within a section. A section option contains an\n"
10194
"option name, an equals sign and a value. For example::"
10195
msgstr ""
10196
10197
#: en/help_topics/configuration.txt:260
10198
msgid ""
10199
" email = John Doe <jdoe@isp.com>\n"
10200
" gpg_signing_key = Amy Pond <amy@example.com>"
10201
msgstr ""
10202
10203
#: en/help_topics/configuration.txt:263
10204
msgid ""
10205
"A option can reference other options by enclosing them in curly brackets::"
10206
msgstr ""
10207
10208
#: en/help_topics/configuration.txt:265
10209
msgid ""
10210
" my_branch_name = feature_x\n"
10211
" my_server = bzr+ssh://example.com\n"
10212
" push_location = {my_server}/project/{my_branch_name}"
10213
msgstr ""
10214
10215
#: en/help_topics/configuration.txt:269
10216
msgid ""
10217
"Option policies\n"
10218
"^^^^^^^^^^^^^^^"
10219
msgstr ""
10220
10221
#: en/help_topics/configuration.txt:272
10222
msgid ""
10223
"Options defined in a section affect the named directory or URL plus\n"
10224
"any locations they contain. Policies can be used to change how an\n"
10225
"option value is interpreted for contained locations. Currently\n"
10226
"there are three policies available:"
10227
msgstr ""
10228
10229
#: en/help_topics/configuration.txt:277
10230
msgid ""
10231
" none:\n"
10232
" the value is interpreted the same for contained locations. This is\n"
10233
" the default behaviour.\n"
10234
" norecurse:\n"
10235
" the value is only used for the exact location specified by the\n"
10236
" section name.\n"
10237
" appendpath:\n"
10238
" for contained locations, any additional path components are\n"
10239
" appended to the value."
10240
msgstr ""
10241
10242
#: en/help_topics/configuration.txt:287
10243
msgid ""
10244
"Policies are specified by keys with names of the form "
10245
"\"<option_name>:policy\".\n"
10246
"For example, to define the push location for a tree of branches, the\n"
10247
"following could be used::"
10248
msgstr ""
10249
10250
#: en/help_topics/configuration.txt:291
10251
msgid ""
10252
" [/top/location]\n"
10253
" push_location = sftp://example.com/location\n"
10254
" push_location:policy = appendpath"
10255
msgstr ""
10256
10257
#: en/help_topics/configuration.txt:295
10258
msgid ""
10259
"With this configuration, the push location for ``/top/location/branch1``\n"
10260
"would be ``sftp://example.com/location/branch1``."
10261
msgstr ""
10262
10263
#: en/help_topics/configuration.txt:298
10264
msgid ""
10265
"Section local options\n"
10266
"^^^^^^^^^^^^^^^^^^^^^"
10267
msgstr ""
10268
10269
#: en/help_topics/configuration.txt:301
10270
msgid ""
10271
"Some options are defined automatically inside a given section and can be\n"
10272
"refered to in this section only. "
10273
msgstr ""
10274
10275
#: en/help_topics/configuration.txt:304
10276
msgid "For example, the ``appendpath`` policy can be used like this::"
10277
msgstr ""
10278
10279
#: en/help_topics/configuration.txt:306
10280
msgid ""
10281
" [/home/vila/src/bzr/bugs]\n"
10282
" mypush = lp:~vila/bzr\n"
10283
" mypush:policy=appendpath"
10284
msgstr ""
10285
10286
#: en/help_topics/configuration.txt:310
10287
msgid "Using ``relpath`` to achieve the same result is done like this::"
10288
msgstr ""
10289
10290
#: en/help_topics/configuration.txt:312
10291
msgid ""
10292
" [/home/vila/src/bzr/bugs]\n"
10293
" mypush = lp:~vila/bzr/{relpath}"
10294
msgstr ""
10295
10296
#: en/help_topics/configuration.txt:315
10297
msgid ""
10298
"In both cases, when used in a directory like\n"
10299
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10300
msgstr ""
10301
10302
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
10303
msgid ""
10304
" $ bzr config mypush\n"
10305
" lp:~vila/bzr/832013-expand-in-stack"
10306
msgstr ""
10307
10308
#: en/help_topics/configuration.txt:321
10309
msgid "Another such option is ``basename`` which can be used like this::"
10310
msgstr ""
10311
10312
#: en/help_topics/configuration.txt:323
10313
msgid ""
10314
" [/home/vila/src/bzr]\n"
10315
" mypush = lp:~vila/bzr/{basename}"
10316
msgstr ""
10317
10318
#: en/help_topics/configuration.txt:326
10319
msgid ""
10320
"When used in a directory like\n"
10321
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10322
msgstr ""
10323
10324
#: en/help_topics/configuration.txt:332
10325
msgid ""
10326
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10327
"itself is defined as the relative path between the section name and the\n"
10328
"location it matches."
10329
msgstr ""
10330
10331
#: en/help_topics/configuration.txt:336
10332
msgid ""
10333
"Another such option is ``branchname``, which refers to the name of a "
10334
"colocated\n"
10335
"branch. For non-colocated branches, it behaves like basename. It can be "
10336
"used\n"
10337
"like this::"
10338
msgstr ""
10339
10340
#: en/help_topics/configuration.txt:340
10341
msgid ""
10342
" [/home/vila/src/bzr/bugs]\n"
10343
" mypush = lp:~vila/bzr/{branchname}"
10344
msgstr ""
10345
10346
#: en/help_topics/configuration.txt:343
10347
msgid ""
10348
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10349
"get::"
10350
msgstr ""
10351
10352
#: en/help_topics/configuration.txt:345
10353
msgid ""
10354
" bzr config mypush\n"
10355
" lp:~vila/bzr/832013-expand-in-stack"
10356
msgstr ""
10357
10358
#: en/help_topics/configuration.txt:348
10359
msgid ""
10360
"When an option is local to a Section, it cannot be referred to from option\n"
10361
"values in any other section from the same ``Store`` nor from any other\n"
10362
"``Store``."
10363
msgstr ""
10364
10365
#: en/help_topics/configuration.txt:352
10366
msgid ""
10367
"\n"
10368
"The main configuration file, bazaar.conf\n"
10369
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10370
msgstr ""
10371
10372
#: en/help_topics/configuration.txt:356
10373
msgid ""
10374
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10375
"The default section contains the default\n"
10376
"configuration options for all branches. The default section can be\n"
10377
"overriden by providing a branch-specific section in ``locations.conf``."
10378
msgstr ""
10379
10380
#: en/help_topics/configuration.txt:361
10381
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10382
msgstr ""
10383
10384
#: en/help_topics/configuration.txt:363
10385
msgid ""
10386
" [DEFAULT]\n"
10387
" email = John Doe <jdoe@isp.com>\n"
10388
" editor = /usr/bin/vim\n"
10389
" create_signatures = when-required"
10390
msgstr ""
10391
10392
#: en/help_topics/configuration.txt:368
10393
msgid ""
10394
"\n"
10395
"The branch location configuration file, locations.conf\n"
10396
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10397
msgstr ""
10398
10399
#: en/help_topics/configuration.txt:372
10400
msgid ""
10401
"``locations.conf`` allows one to specify overriding settings for\n"
10402
"a specific branch. The format is almost identical to the default section in\n"
10403
"bazaar.conf with one significant change: The section header, instead of "
10404
"saying\n"
10405
"default, will be the path to a branch that you wish to override a value\n"
10406
"for. The '?' and '*' wildcards are supported::"
10407
msgstr ""
10408
10409
#: en/help_topics/configuration.txt:378
10410
msgid ""
10411
" [/home/jdoe/branches/nethack]\n"
10412
" email = Nethack Admin <nethack@nethack.com>"
10413
msgstr ""
10414
10415
#: en/help_topics/configuration.txt:381
10416
msgid ""
10417
" [http://hypothetical.site.com/branches/devel-branch]\n"
10418
" create_signatures = always"
10419
msgstr ""
10420
10421
#: en/help_topics/configuration.txt:384
10422
msgid ""
10423
"The authentication configuration file, authentication.conf\n"
10424
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10425
msgstr ""
10426
10427
#: en/help_topics/configuration.txt:387
10428
msgid ""
10429
"``authentication.conf`` allows one to specify credentials for\n"
10430
"remote servers. This can be used for all the supported transports and any "
10431
"part\n"
10432
"of bzr that requires authentication (smtp for example)."
10433
msgstr ""
10434
10435
#: en/help_topics/configuration.txt:391
10436
msgid ""
10437
"The syntax of the file obeys the same rules as the others except for the\n"
10438
"option policies which don't apply."
10439
msgstr ""
10440
10441
#: en/help_topics/configuration.txt:394
10442
msgid ""
10443
"For more information on the possible uses of the authentication "
10444
"configuration\n"
10445
"file see :doc:`authentication-help`."
10446
msgstr ""
10447
10448
#: en/help_topics/configuration.txt:397
10449
msgid ""
10450
"\n"
10451
"Common options\n"
10452
"--------------"
10453
msgstr ""
10454
10455
#: en/help_topics/configuration.txt:401
10456
msgid ""
10457
"debug_flags\n"
10458
"~~~~~~~~~~~"
10459
msgstr ""
10460
10461
#: en/help_topics/configuration.txt:404
10462
msgid ""
10463
"A comma-separated list of debugging options to turn on. The same values\n"
10464
"can be used as with the -D command-line option (see `help global-options`).\n"
10465
"For example::"
10466
msgstr ""
10467
10468
#: en/help_topics/configuration.txt:408
10469
msgid " debug_flags = hpss"
10470
msgstr ""
10471
10472
#: en/help_topics/configuration.txt:412
10473
msgid " debug_flags = hpss,evil"
10474
msgstr ""
10475
10476
#: en/help_topics/configuration.txt:414
10477
msgid ""
10478
"email\n"
10479
"~~~~~"
10480
msgstr ""
10481
10482
#: en/help_topics/configuration.txt:417
10483
msgid ""
10484
"The email address to use when committing a branch. Typically takes the form\n"
10485
"of::"
10486
msgstr ""
10487
10488
#: en/help_topics/configuration.txt:420
10489
msgid " email = Full Name <account@hostname.tld>"
10490
msgstr ""
10491
10492
#: en/help_topics/configuration.txt:422
10493
msgid ""
10494
"editor\n"
10495
"~~~~~~"
10496
msgstr ""
10497
10498
#: en/help_topics/configuration.txt:425
10499
msgid ""
10500
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10501
"a commit message. This setting is trumped by the environment variable\n"
10502
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10503
"variables."
10504
msgstr ""
10505
10506
#: en/help_topics/configuration.txt:430
10507
msgid ""
10508
"log_format\n"
10509
"~~~~~~~~~~"
10510
msgstr ""
10511
10512
#: en/help_topics/configuration.txt:433
10513
msgid ""
10514
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10515
"and ``line``. Additional formats may be provided by plugins. The default\n"
10516
"value is ``long``."
10517
msgstr ""
10518
10519
#: en/help_topics/configuration.txt:437
10520
msgid ""
10521
"check_signatures\n"
10522
"~~~~~~~~~~~~~~~~"
10523
msgstr ""
10524
10525
#: en/help_topics/configuration.txt:440
10526
msgid ""
10527
"Reserved for future use. These options will allow a policy for branches to\n"
10528
"require signatures."
10529
msgstr ""
10530
10531
#: en/help_topics/configuration.txt:443
10532
msgid ""
10533
"require\n"
10534
" The gnupg signature for revisions must be present and must be valid."
10535
msgstr ""
10536
10537
#: en/help_topics/configuration.txt:446
10538
msgid ""
10539
"ignore\n"
10540
" Do not check gnupg signatures of revisions."
10541
msgstr ""
10542
10543
#: en/help_topics/configuration.txt:449
10544
msgid ""
10545
"check-available\n"
10546
" (default) If gnupg signatures for revisions are present, check them.\n"
10547
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10548
" no signature is present."
10549
msgstr ""
10550
10551
#: en/help_topics/configuration.txt:454
10552
msgid ""
10553
"create_signatures\n"
10554
"~~~~~~~~~~~~~~~~~"
10555
msgstr ""
10556
10557
#: en/help_topics/configuration.txt:457
10558
msgid ""
10559
"Defines the behaviour of signing revisions on commits. By default bzr will "
10560
"not\n"
10561
"sign new commits."
10562
msgstr ""
10563
10564
#: en/help_topics/configuration.txt:460
10565
msgid ""
10566
"always\n"
10567
" Sign every new revision that is committed. If the signing fails then "
10568
"the\n"
10569
" commit will not be made."
10570
msgstr ""
10571
10572
#: en/help_topics/configuration.txt:464
10573
msgid ""
10574
"when-required\n"
10575
" Reserved for future use."
10576
msgstr ""
10577
10578
#: en/help_topics/configuration.txt:467
10579
msgid ""
10580
"never\n"
10581
" Reserved for future use."
10582
msgstr ""
10583
10584
#: en/help_topics/configuration.txt:470
10585
msgid ""
10586
"In future it is planned that ``when-required`` will sign newly\n"
10587
"committed revisions only when the branch requires them. ``never`` will "
10588
"refuse\n"
10589
"to sign newly committed revisions, even if the branch requires signatures."
10590
msgstr ""
10591
10592
#: en/help_topics/configuration.txt:474
10593
msgid ""
10594
"dirstate.fdatasync\n"
10595
"~~~~~~~~~~~~~~~~~~"
10596
msgstr ""
10597
10598
#: en/help_topics/configuration.txt:477
10599
msgid ""
10600
"If true (default), working tree metadata changes are flushed through the\n"
10601
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10602
"should not be lost if the machine crashes. See also repository.fdatasync."
10603
msgstr ""
10604
10605
#: en/help_topics/configuration.txt:481
10606
msgid ""
10607
"gpg_signing_key\n"
10608
"~~~~~~~~~~~~~~~"
10609
msgstr ""
10610
10611
#: en/help_topics/configuration.txt:484
10612
msgid ""
10613
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10614
"address, key fingerprint or full key ID. When unset or when set to\n"
10615
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10616
msgstr ""
10617
10618
#: en/help_topics/configuration.txt:488
10619
msgid ""
10620
"recurse\n"
10621
"~~~~~~~"
10622
msgstr ""
10623
10624
#: en/help_topics/configuration.txt:491
10625
msgid ""
10626
"Only useful in ``locations.conf``. Defines whether or not the\n"
10627
"configuration for this section applies to subdirectories:"
10628
msgstr ""
10629
10630
#: en/help_topics/configuration.txt:494
10631
msgid ""
10632
"true\n"
10633
" (default) This section applies to subdirectories as well."
10634
msgstr ""
10635
10636
#: en/help_topics/configuration.txt:497
10637
msgid ""
10638
"false\n"
10639
" This section only applies to the branch at this directory and not\n"
10640
" branches below it."
10641
msgstr ""
10642
10643
#: en/help_topics/configuration.txt:501
10644
msgid ""
10645
"gpg_signing_command\n"
10646
"~~~~~~~~~~~~~~~~~~~"
10647
msgstr ""
10648
10649
#: en/help_topics/configuration.txt:504
10650
msgid ""
10651
"(Default: \"gpg\"). Which program should be used to sign and check "
10652
"revisions.\n"
10653
"For example::"
10654
msgstr ""
10655
10656
#: en/help_topics/configuration.txt:507
10657
msgid " gpg_signing_command = /usr/bin/gnpg"
10658
msgstr ""
10659
10660
#: en/help_topics/configuration.txt:509
10661
msgid ""
10662
"The specified command must accept the options \"--clearsign\" and \"-u "
10663
"<email>\"."
10664
msgstr ""
10665
10666
#: en/help_topics/configuration.txt:511
10667
msgid ""
10668
"bzr_remote_path\n"
10669
"~~~~~~~~~~~~~~~"
10670
msgstr ""
10671
10672
#: en/help_topics/configuration.txt:514
10673
msgid ""
10674
"(Default: \"bzr\"). The path to the command that should be used to run the "
10675
"smart\n"
10676
"server for bzr. This value may only be specified in locations.conf, because:"
10677
msgstr ""
10678
10679
#: en/help_topics/configuration.txt:517
10680
msgid ""
10681
"- it's needed before branch.conf is accessible\n"
10682
"- allowing remote branch.conf files to specify commands would be a security\n"
10683
" risk"
10684
msgstr ""
10685
10686
#: en/help_topics/configuration.txt:521
10687
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10688
msgstr ""
10689
10690
#: en/help_topics/configuration.txt:523
10691
msgid ""
10692
"smtp_server\n"
10693
"~~~~~~~~~~~"
10694
msgstr ""
10695
10696
#: en/help_topics/configuration.txt:526
10697
msgid ""
10698
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10699
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10700
msgstr ""
10701
10702
#: en/help_topics/configuration.txt:529
10703
msgid ""
10704
"smtp_username, smtp_password\n"
10705
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10706
msgstr ""
10707
10708
#: en/help_topics/configuration.txt:532
10709
msgid ""
10710
"User and password to authenticate to the SMTP server. If smtp_username\n"
10711
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10712
"These settings are only needed if the SMTP server requires authentication\n"
10713
"to send mail."
10714
msgstr ""
10715
10716
#: en/help_topics/configuration.txt:537
10717
msgid ""
10718
"locks.steal_dead\n"
10719
"~~~~~~~~~~~~~~~~"
10720
msgstr ""
10721
10722
#: en/help_topics/configuration.txt:540
10723
msgid ""
10724
"If set to true, bzr will automatically break locks held by processes from\n"
10725
"the same machine and user that are no longer alive. Otherwise, it will\n"
10726
"print a message and you can break the lock manually, if you are satisfied\n"
10727
"the object is no longer in use."
10728
msgstr ""
10729
10730
#: en/help_topics/configuration.txt:545
10731
msgid ""
10732
"mail_client\n"
10733
"~~~~~~~~~~~"
10734
msgstr ""
10735
10736
#: en/help_topics/configuration.txt:548
10737
msgid ""
10738
"A mail client to use for sending merge requests.\n"
10739
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10740
"it\n"
10741
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10742
"``editor``."
10743
msgstr ""
10744
10745
#: en/help_topics/configuration.txt:553
10746
msgid "Supported values for specific clients:"
10747
msgstr ""
10748
10749
#: en/help_topics/configuration.txt:555
10750
msgid ""
10751
":claws: Use Claws. This skips a dialog for attaching files.\n"
10752
":evolution: Use Evolution.\n"
10753
":kmail: Use KMail.\n"
10754
":mutt: Use Mutt.\n"
10755
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10756
"1.5,\n"
10757
" this works around some bugs that xdg-email doesn't handle."
10758
msgstr ""
10759
10760
#: en/help_topics/configuration.txt:562
10761
msgid "Supported generic values are:"
10762
msgstr ""
10763
10764
#: en/help_topics/configuration.txt:564
10765
msgid ""
10766
":default: See above.\n"
10767
":editor: Use your editor to compose the merge request. This also uses\n"
10768
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10769
" smtp_username and smtp_password.\n"
10770
":mapi: Use your preferred e-mail client on Windows.\n"
10771
":xdg-email: Use xdg-email to run your preferred mail program"
10772
msgstr ""
10773
10774
#: en/help_topics/configuration.txt:571
10775
msgid ""
10776
"repository.fdatasync\n"
10777
"~~~~~~~~~~~~~~~~~~~~"
10778
msgstr ""
10779
10780
#: en/help_topics/configuration.txt:574
10781
msgid ""
10782
"If true (default), repository changes are flushed through the OS buffers\n"
10783
"to physical disk. This is somewhat slower, but means data should not be\n"
10784
"lost if the machine crashes. See also dirstate.fdatasync."
10785
msgstr ""
10786
10787
#: en/help_topics/configuration.txt:578
10788
msgid ""
10789
"submit_branch\n"
10790
"~~~~~~~~~~~~~"
10791
msgstr ""
10792
10793
#: en/help_topics/configuration.txt:581
10794
msgid ""
10795
"The branch you intend to submit your current work to. This is "
10796
"automatically\n"
10797
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10798
"This\n"
10799
"should usually be set on a per-branch or per-location basis."
10800
msgstr ""
10801
10802
#: en/help_topics/configuration.txt:585
10803
msgid ""
10804
"public_branch\n"
10805
"~~~~~~~~~~~~~"
10806
msgstr ""
10807
10808
#: en/help_topics/configuration.txt:588
10809
msgid ""
10810
"A publically-accessible version of this branch (implying that this version "
10811
"is\n"
10812
"not publically-accessible). Used (and set) by ``bzr send``."
10813
msgstr ""
10814
10815
#: en/help_topics/configuration.txt:591
10816
msgid ""
10817
"suppress_warnings\n"
10818
"~~~~~~~~~~~~~~~~~"
10819
msgstr ""
10820
10821
#: en/help_topics/configuration.txt:594
10822
msgid ""
10823
"A list of strings, each string represent a warning that can be emitted by\n"
10824
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10825
msgstr ""
10826
10827
#: en/help_topics/configuration.txt:597
10828
msgid "Valid values:"
10829
msgstr ""
10830
10831
#: en/help_topics/configuration.txt:599
10832
msgid ""
10833
"* ``format_deprecation``:\n"
10834
" whether the format deprecation warning is shown on repositories that "
10835
"are\n"
10836
" using deprecated formats."
10837
msgstr ""
10838
10839
#: en/help_topics/configuration.txt:603
10840
msgid ""
10841
"default_format\n"
10842
"~~~~~~~~~~~~~~"
10843
msgstr ""
10844
10845
#: en/help_topics/configuration.txt:606
10846
msgid ""
10847
"A format name for the default format used when creating branches. See "
10848
"``bzr\n"
10849
"help formats`` for possible values."
10850
msgstr ""
10851
10852
#: en/help_topics/configuration.txt:609
10853
msgid ""
10854
"\n"
10855
"Unicode options\n"
10856
"---------------"
10857
msgstr ""
10858
10859
#: en/help_topics/configuration.txt:613
10860
msgid ""
10861
"output_encoding\n"
10862
"~~~~~~~~~~~~~~~"
10863
msgstr ""
10864
10865
#: en/help_topics/configuration.txt:616
10866
msgid ""
10867
"A Python unicode encoding name for text output from bzr, such as log\n"
10868
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10869
"is the terminal encoding prefered by the operating system."
10870
msgstr ""
10871
10872
#: en/help_topics/configuration.txt:620
10873
msgid ""
10874
"\n"
10875
"Branch type specific options\n"
10876
"----------------------------"
10877
msgstr ""
10878
10879
#: en/help_topics/configuration.txt:624
10880
msgid ""
10881
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10882
"later format. They\n"
10883
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10884
"manually set in ``locations.conf`` or ``bazaar.conf``."
10885
msgstr ""
10886
10887
#: en/help_topics/configuration.txt:629
10888
msgid ""
10889
"append_revisions_only\n"
10890
"~~~~~~~~~~~~~~~~~~~~~"
10891
msgstr ""
10892
10893
#: en/help_topics/configuration.txt:632
10894
msgid ""
10895
"If set to \"True\" then revisions can only be appended to the log, not\n"
10896
"removed. A branch with this setting enabled can only pull from another\n"
10897
"branch if the other branch's log is a longer version of its own. This is\n"
10898
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10899
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10900
"compatibility with previous bzr versions (older than 2.2)."
10901
msgstr ""
10902
10903
#: en/help_topics/configuration.txt:639
10904
msgid ""
10905
"parent_location\n"
10906
"~~~~~~~~~~~~~~~"
10907
msgstr ""
10908
10909
#: en/help_topics/configuration.txt:642
10910
msgid ""
10911
"If present, the location of the default branch for pull or merge. This "
10912
"option\n"
10913
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10914
"--remember``."
10915
msgstr ""
10916
10917
#: en/help_topics/configuration.txt:646
10918
msgid ""
10919
"push_location\n"
10920
"~~~~~~~~~~~~~"
10921
msgstr ""
10922
10923
#: en/help_topics/configuration.txt:649
10924
msgid ""
10925
"If present, the location of the default branch for push. This option\n"
10926
"is normally set by the first ``push`` or ``push --remember``."
10927
msgstr ""
10928
10929
#: en/help_topics/configuration.txt:652
10930
msgid ""
10931
"push_strict\n"
10932
"~~~~~~~~~~~"
10933
msgstr ""
10934
10935
#: en/help_topics/configuration.txt:655
10936
msgid ""
10937
"If present, defines the ``--strict`` option default value for checking\n"
10938
"uncommitted changes before pushing."
10939
msgstr ""
10940
10941
#: en/help_topics/configuration.txt:658
10942
msgid ""
10943
"dpush_strict\n"
10944
"~~~~~~~~~~~~"
10945
msgstr ""
10946
10947
#: en/help_topics/configuration.txt:661
10948
msgid ""
10949
"If present, defines the ``--strict`` option default value for checking\n"
10950
"uncommitted changes before pushing into a different VCS without any\n"
10951
"custom bzr metadata."
10952
msgstr ""
10953
10954
#: en/help_topics/configuration.txt:665
10955
msgid ""
10956
"bound_location\n"
10957
"~~~~~~~~~~~~~~"
10958
msgstr ""
10959
10960
#: en/help_topics/configuration.txt:668
10961
msgid ""
10962
"The location that commits should go to when acting as a checkout.\n"
10963
"This option is normally set by ``bind``."
10964
msgstr ""
10965
10966
#: en/help_topics/configuration.txt:671
10967
msgid ""
10968
"bound\n"
10969
"~~~~~"
10970
msgstr ""
10971
10972
#: en/help_topics/configuration.txt:674
10973
msgid ""
10974
"If set to \"True\", the branch should act as a checkout, and push each "
10975
"commit to\n"
10976
"the bound_location. This option is normally set by ``bind``/``unbind``."
10977
msgstr ""
10978
10979
#: en/help_topics/configuration.txt:677
10980
msgid ""
10981
"send_strict\n"
10982
"~~~~~~~~~~~"
10983
msgstr ""
10984
10985
#: en/help_topics/configuration.txt:680
10986
msgid ""
10987
"If present, defines the ``--strict`` option default value for checking\n"
10988
"uncommitted changes before sending a merge directive."
10989
msgstr ""
10990
10991
#: en/help_topics/configuration.txt:683
10992
msgid ""
10993
"add.maximum_file_size\n"
10994
"~~~~~~~~~~~~~~~~~~~~~"
10995
msgstr ""
10996
10997
#: en/help_topics/configuration.txt:686
10998
msgid ""
10999
"Defines the maximum file size the command line \"add\" operation will allow\n"
11000
"in recursive mode, with files larger than this value being skipped. You may "
11001
"\n"
11002
"specify this value as an integer (in which case it is interpreted as bytes), "
11003
"\n"
11004
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
11005
"0 \n"
11006
"will disable skipping."
11007
msgstr ""
11008
11009
#: en/help_topics/configuration.txt:692
11010
msgid ""
11011
"External Merge Tools\n"
11012
"--------------------"
11013
msgstr ""
11014
11015
#: en/help_topics/configuration.txt:695
11016
msgid ""
11017
"bzr.mergetool.<name>\n"
11018
"~~~~~~~~~~~~~~~~~~~~"
11019
msgstr ""
11020
11021
#: en/help_topics/configuration.txt:698
11022
msgid ""
11023
"Defines an external merge tool called <name> with the given command-line.\n"
11024
"Arguments containing spaces should be quoted using single or double quotes. "
11025
"The\n"
11026
"executable may omit its path if it can be found on the PATH."
11027
msgstr ""
11028
11029
#: en/help_topics/configuration.txt:702
11030
msgid ""
11031
"The following markers can be used in the command-line to substitute "
11032
"filenames\n"
11033
"involved in the merge conflict::"
11034
msgstr ""
11035
11036
#: en/help_topics/configuration.txt:705
11037
msgid ""
11038
" {base} file.BASE\n"
11039
" {this} file.THIS\n"
11040
" {other} file.OTHER\n"
11041
" {result} output file\n"
11042
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
11043
"merge\n"
11044
" succeeds."
11045
msgstr ""
11046
11047
#: en/help_topics/configuration.txt:714
11048
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11049
msgstr ""
11050
11051
#: en/help_topics/configuration.txt:716
11052
msgid ""
11053
"bzr.default_mergetool\n"
11054
"~~~~~~~~~~~~~~~~~~~~~"
11055
msgstr ""
11056
11057
#: en/help_topics/configuration.txt:719
11058
msgid ""
11059
"Specifies which external merge tool (as defined above) should be selected "
11060
"by\n"
11061
"default in tools such as ``bzr qconflicts``."
11062
msgstr ""
11063
11064
#: en/help_topics/configuration.txt:724
11065
msgid " bzr.default_mergetool = kdiff3\n"
11066
msgstr ""
11067
11068
#: en/help_topics/conflict-types.txt:1
11069
msgid ""
11070
"Conflict Types\n"
11071
"=============="
11072
msgstr ""
11073
11074
#: en/help_topics/conflict-types.txt:4
11075
msgid ""
11076
"Some operations, like merge, revert and pull, modify the contents of your\n"
11077
"working tree. These modifications are programmatically generated, and so "
11078
"they\n"
11079
"may conflict with the current state of your working tree. "
11080
msgstr ""
11081
11082
#: en/help_topics/conflict-types.txt:8
11083
msgid ""
11084
"When conflicts are present in your working tree (as shown by ``bzr\n"
11085
"conflicts``), you should resolve them and then inform bzr that the "
11086
"conflicts\n"
11087
"have been resolved."
11088
msgstr ""
11089
11090
#: en/help_topics/conflict-types.txt:12
11091
msgid ""
11092
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
11093
"should resolve them is not the one responsible for their occurrence, as is "
11094
"the\n"
11095
"case when merging other people's work or because some conflicts are "
11096
"presented\n"
11097
"in a way that is not easy to understand."
11098
msgstr ""
11099
11100
#: en/help_topics/conflict-types.txt:17
11101
msgid ""
11102
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
11103
"conflict if and only if there's an actual conceptual conflict in the source\n"
11104
"tree. Because Bazaar doesn't understand the real meaning of the files "
11105
"being\n"
11106
"versioned, it can, when faced with ambiguities, fall short in either "
11107
"direction\n"
11108
"trying to resolve the conflict itself. Many kinds of changes can be "
11109
"combined\n"
11110
"programmatically, but sometimes only a human can determine the right thing "
11111
"to\n"
11112
"do."
11113
msgstr ""
11114
11115
#: en/help_topics/conflict-types.txt:25
11116
msgid ""
11117
"When Bazaar generates a conflict, it adds information into the working tree "
11118
"to\n"
11119
"present the conflicting versions, and it's up to you to find the correct\n"
11120
"resolution."
11121
msgstr ""
11122
11123
#: en/help_topics/conflict-types.txt:29
11124
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
11125
msgstr ""
11126
11127
#: en/help_topics/conflict-types.txt:31
11128
msgid ""
11129
"1. Modify the working tree content so that the conflicted item is now in "
11130
"the\n"
11131
" state you want to keep, then"
11132
msgstr ""
11133
11134
#: en/help_topics/conflict-types.txt:34
11135
msgid ""
11136
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
11137
" remaining generated information (``bzr resolve <item>``)."
11138
msgstr ""
11139
11140
#: en/help_topics/conflict-types.txt:37
11141
msgid ""
11142
"For most conflict types, there are some obvious ways to modify the working\n"
11143
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
11144
"itself already made a choice, when possible."
11145
msgstr ""
11146
11147
#: en/help_topics/conflict-types.txt:41
11148
msgid ""
11149
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
11150
"different ways to resolve the conflict."
11151
msgstr ""
11152
11153
#: en/help_topics/conflict-types.txt:44
11154
msgid ""
11155
"Each type of conflict is explained below, and the action which must be done "
11156
"to\n"
11157
"resolve the conflict is outlined."
11158
msgstr ""
11159
11160
#: en/help_topics/conflict-types.txt:47
11161
msgid ""
11162
"Various actions are available depending on the kind of conflict, for some "
11163
"of\n"
11164
"these actions, Bazaar can provide some help. In the end you should at least\n"
11165
"inform Bazaar that you're done with the conflict with::"
11166
msgstr ""
11167
11168
#: en/help_topics/conflict-types.txt:51
11169
msgid " ``bzr resolve FILE --action=done'"
11170
msgstr ""
11171
11172
#: en/help_topics/conflict-types.txt:53
11173
msgid ""
11174
"Note that this is the default action when a single file is involved so you "
11175
"can\n"
11176
"simply use::"
11177
msgstr ""
11178
11179
#: en/help_topics/conflict-types.txt:56
11180
msgid " ``bzr resolve FILE``"
11181
msgstr ""
11182
11183
#: en/help_topics/conflict-types.txt:58
11184
msgid "See ``bzr help resolve`` for more details."
11185
msgstr ""
11186
11187
#: en/help_topics/conflict-types.txt:60
11188
msgid ""
11189
"Text conflicts\n"
11190
"--------------"
11191
msgstr ""
11192
11193
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
11194
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
11195
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11196
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11197
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
11198
msgid "Typical message::"
11199
msgstr ""
11200
11201
#: en/help_topics/conflict-types.txt:65
11202
msgid " Text conflict in FILE"
11203
msgstr ""
11204
11205
#: en/help_topics/conflict-types.txt:67
11206
msgid ""
11207
"These are produced when a text merge cannot completely reconcile two sets "
11208
"of\n"
11209
"text changes. Bazaar will emit files for each version with the extensions\n"
11210
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
11211
"tree,\n"
11212
"i.e. the tree that you are merging changes into. OTHER is the version that "
11213
"you\n"
11214
"are merging into the target. BASE is an older version that is used as a "
11215
"basis\n"
11216
"for comparison."
11217
msgstr ""
11218
11219
#: en/help_topics/conflict-types.txt:74
11220
msgid ""
11221
"In the main copy of the file, Bazaar will include all the changes that it\n"
11222
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11223
"\"herringbone\" markers like ``<<<<<<<``."
11224
msgstr ""
11225
11226
#: en/help_topics/conflict-types.txt:78
11227
msgid ""
11228
"Say the initial text is \"The project leader released it.\", and THIS "
11229
"modifies it\n"
11230
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11231
"leader\n"
11232
"released Bazaar.\" A conflict would look like this::"
11233
msgstr ""
11234
11235
#: en/help_topics/conflict-types.txt:82
11236
msgid ""
11237
" <<<<<<< TREE\n"
11238
" Martin Pool released it.\n"
11239
" =======\n"
11240
" The project leader released Bazaar.\n"
11241
" >>>>>>> MERGE-SOURCE"
11242
msgstr ""
11243
11244
#: en/help_topics/conflict-types.txt:88
11245
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11246
msgstr ""
11247
11248
#: en/help_topics/conflict-types.txt:90
11249
msgid ""
11250
"You can handle text conflicts either by editing the main copy of the file,\n"
11251
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
11252
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11253
"set of changes over the other (but see below when you encounter these\n"
11254
"cases). More often, the two sets of changes must be intelligently combined."
11255
msgstr ""
11256
11257
#: en/help_topics/conflict-types.txt:96
11258
msgid ""
11259
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
11260
"you are done editing, the file should look like it never had a conflict, and "
11261
"be\n"
11262
"ready to commit."
11263
msgstr ""
11264
11265
#: en/help_topics/conflict-types.txt:100
11266
msgid ""
11267
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
11268
"Bazaar will auto-detect which conflicts you have resolved."
11269
msgstr ""
11270
11271
#: en/help_topics/conflict-types.txt:103
11272
msgid ""
11273
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11274
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11275
"working tree."
11276
msgstr ""
11277
11278
#: en/help_topics/conflict-types.txt:107
11279
msgid ""
11280
"\n"
11281
"When you want to pick one set of changes over the other, you can use ``bzr\n"
11282
"resolve`` with one of the following actions:"
11283
msgstr ""
11284
11285
#: en/help_topics/conflict-types.txt:111
11286
msgid ""
11287
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11288
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11289
msgstr ""
11290
11291
#: en/help_topics/conflict-types.txt:114
11292
msgid ""
11293
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11294
"modifications will be taken into account."
11295
msgstr ""
11296
11297
#: en/help_topics/conflict-types.txt:117
11298
msgid ""
11299
"Content conflicts\n"
11300
"-----------------"
11301
msgstr ""
11302
11303
#: en/help_topics/conflict-types.txt:122
11304
msgid " Contents conflict in FILE"
11305
msgstr ""
11306
11307
#: en/help_topics/conflict-types.txt:124
11308
msgid ""
11309
"This conflict happens when there are conflicting changes in the working "
11310
"tree\n"
11311
"and the merge source, but the conflicted items are not text files. They "
11312
"may\n"
11313
"be binary files, or symlinks, or directories. It can even happen with "
11314
"files\n"
11315
"that are deleted on one side, and modified on the other."
11316
msgstr ""
11317
11318
#: en/help_topics/conflict-types.txt:129
11319
msgid ""
11320
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
11321
"be\n"
11322
"regular files, symlinks or directories). But it will not include a \"main "
11323
"copy\"\n"
11324
"of the file with herringbone conflict markers. It will appear that the "
11325
"\"main\n"
11326
"copy\" has been renamed to THIS or OTHER."
11327
msgstr ""
11328
11329
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11330
msgid ""
11331
"To resolve that kind of conflict, you should rebuild FILE from either "
11332
"version\n"
11333
"or a combination of both."
11334
msgstr ""
11335
11336
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11337
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11338
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11339
#: en/help_topics/conflict-types.txt:361
11340
msgid "``bzr resolve`` recognizes the following actions:"
11341
msgstr ""
11342
11343
#: en/help_topics/conflict-types.txt:139
11344
msgid ""
11345
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
11346
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11347
"* ``--action=done`` will just mark the conflict as resolved."
11348
msgstr ""
11349
11350
#: en/help_topics/conflict-types.txt:143
11351
msgid ""
11352
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11353
"and\n"
11354
"``.OTHER`` files if they are still present in the working tree."
11355
msgstr ""
11356
11357
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11358
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11359
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11360
#: en/help_topics/conflict-types.txt:369
11361
msgid ""
11362
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11363
msgstr ""
11364
11365
#: en/help_topics/conflict-types.txt:148
11366
msgid ""
11367
"Tag conflicts\n"
11368
"-------------"
11369
msgstr ""
11370
11371
#: en/help_topics/conflict-types.txt:153
11372
msgid ""
11373
" Conflicting tags:\n"
11374
" version-0.1"
11375
msgstr ""
11376
11377
#: en/help_topics/conflict-types.txt:156
11378
msgid ""
11379
"When pulling from or pushing to another branch, Bazaar informs you about "
11380
"tags\n"
11381
"that conflict between the two branches; that is the same tag points to two\n"
11382
"different revisions. You need not resolve these conflicts, but subsequent\n"
11383
"uses of pull or push will result in the same message."
11384
msgstr ""
11385
11386
#: en/help_topics/conflict-types.txt:161
11387
msgid ""
11388
"To resolve the conflict, you must apply the correct tags to either the "
11389
"target\n"
11390
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11391
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11392
"target branch's tags match the source branch, then in the target branch do\n"
11393
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11394
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11395
"source\n"
11396
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11397
"favor of the target branch, you need to similarly use ``tag --force`` in "
11398
"the\n"
11399
"source branch. (Note that pulling or pushing using --overwrite will "
11400
"overwrite\n"
11401
"all tags as well.)"
11402
msgstr ""
11403
11404
#: en/help_topics/conflict-types.txt:172
11405
msgid ""
11406
"Duplicate paths\n"
11407
"---------------"
11408
msgstr ""
11409
11410
#: en/help_topics/conflict-types.txt:177
11411
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11412
msgstr ""
11413
11414
#: en/help_topics/conflict-types.txt:179
11415
msgid ""
11416
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11417
"already been used. The existing file will be renamed to \"FILE.moved\". "
11418
msgstr ""
11419
11420
#: en/help_topics/conflict-types.txt:187
11421
msgid ""
11422
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11423
"FILE``,\n"
11424
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11425
"* ``--action=done`` will just mark the conflict as resolved."
11426
msgstr ""
11427
11428
#: en/help_topics/conflict-types.txt:191
11429
msgid ""
11430
"Note that you must get rid of FILE.moved before using ``--action=done``."
11431
msgstr ""
11432
11433
#: en/help_topics/conflict-types.txt:195
11434
msgid ""
11435
"Unversioned parent\n"
11436
"------------------"
11437
msgstr ""
11438
11439
#: en/help_topics/conflict-types.txt:200
11440
msgid ""
11441
" Conflict because FILE is not versioned, but has versioned children."
11442
msgstr ""
11443
11444
#: en/help_topics/conflict-types.txt:202
11445
msgid ""
11446
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11447
"not\n"
11448
"versioned. This happens when the directory has been deleted in the target,\n"
11449
"but has a new child in the source, or vice versa. In this situation, "
11450
"Bazaar\n"
11451
"will version the parent directory as well. Resolving this issue depends\n"
11452
"very much on the particular scenario. You may wish to rename or delete "
11453
"either\n"
11454
"the file or the directory. When you are satisfied, you can run \"bzr "
11455
"resolve\n"
11456
"FILE\" to mark the conflict as resolved."
11457
msgstr ""
11458
11459
#: en/help_topics/conflict-types.txt:210
11460
msgid ""
11461
"Missing parent\n"
11462
"--------------"
11463
msgstr ""
11464
11465
#: en/help_topics/conflict-types.txt:215
11466
msgid " Conflict adding files to FILE. Created directory."
11467
msgstr ""
11468
11469
#: en/help_topics/conflict-types.txt:217
11470
msgid ""
11471
"This happens when a directory has been deleted in the target, but has new\n"
11472
"children in the source. This is similar to the \"unversioned parent\" "
11473
"conflict,\n"
11474
"except that the parent directory does not *exist*, instead of just being\n"
11475
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11476
"Resolving this issue depends very much on the particular scenario."
11477
msgstr ""
11478
11479
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11480
msgid ""
11481
"To resolve that kind of conflict, you should either remove or rename the\n"
11482
"children or the directory or a combination of both."
11483
msgstr ""
11484
11485
#: en/help_topics/conflict-types.txt:228
11486
msgid ""
11487
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11488
" children,\n"
11489
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11490
"children\n"
11491
" and restoring the directory,\n"
11492
"* ``--action=done`` will just mark the conflict as resolved."
11493
msgstr ""
11494
11495
#: en/help_topics/conflict-types.txt:236
11496
msgid ""
11497
"Deleting parent\n"
11498
"---------------"
11499
msgstr ""
11500
11501
#: en/help_topics/conflict-types.txt:241
11502
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11503
msgstr ""
11504
11505
#: en/help_topics/conflict-types.txt:243
11506
msgid ""
11507
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11508
"source, but has new children in the target (either because a directory\n"
11509
"deletion is merged or because the merge introduce new children). Bazaar\n"
11510
"will retain the directory. Resolving this issue depends very much on the\n"
11511
"particular scenario."
11512
msgstr ""
11513
11514
#: en/help_topics/conflict-types.txt:254
11515
msgid ""
11516
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11517
"directory,"
11518
msgstr ""
11519
11520
#: en/help_topics/conflict-types.txt:256
11521
msgid ""
11522
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11523
" children,"
11524
msgstr ""
11525
11526
#: en/help_topics/conflict-types.txt:259
11527
msgid "* ``--action=done`` will just mark the conflict as resolved."
11528
msgstr ""
11529
11530
#: en/help_topics/conflict-types.txt:261
11531
msgid ""
11532
"Note that when merging a directory deletion, if unversioned files are\n"
11533
"present, they become potential orphans has they don't have a directory\n"
11534
"parent anymore."
11535
msgstr ""
11536
11537
#: en/help_topics/conflict-types.txt:265
11538
msgid ""
11539
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11540
"setting the ``bzr.transform.orphan_policy`` configuration option."
11541
msgstr ""
11542
11543
#: en/help_topics/conflict-types.txt:268
11544
msgid "There are two possible values for this option:"
11545
msgstr ""
11546
11547
#: en/help_topics/conflict-types.txt:270
11548
msgid ""
11549
"* ``conflict`` (the default): will leave the orphans in place and\n"
11550
" generate a conflicts,"
11551
msgstr ""
11552
11553
#: en/help_topics/conflict-types.txt:273
11554
msgid ""
11555
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11556
"root\n"
11557
" of the working tree with names like ``<file>.~#~``."
11558
msgstr ""
11559
11560
#: en/help_topics/conflict-types.txt:278
11561
msgid ""
11562
"Path conflict\n"
11563
"-------------"
11564
msgstr ""
11565
11566
#: en/help_topics/conflict-types.txt:283
11567
msgid " Path conflict: PATH1 / PATH2"
11568
msgstr ""
11569
11570
#: en/help_topics/conflict-types.txt:285
11571
msgid ""
11572
"This happens when the source and target have each modified the name or "
11573
"parent\n"
11574
"directory of a file. Bazaar will use the path elements from the source."
11575
msgstr ""
11576
11577
#: en/help_topics/conflict-types.txt:288
11578
msgid ""
11579
"To resolve that kind of conflict, you just have to decide what name should "
11580
"be\n"
11581
"retained for the file involved."
11582
msgstr ""
11583
11584
#: en/help_topics/conflict-types.txt:293
11585
msgid ""
11586
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11587
" issuing ``bzr mv PATH2 PATH1``,\n"
11588
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11589
"``PATH2``,\n"
11590
"* ``--action=done`` will just mark the conflict as resolved."
11591
msgstr ""
11592
11593
#: en/help_topics/conflict-types.txt:300
11594
msgid ""
11595
"Parent loop\n"
11596
"-----------"
11597
msgstr ""
11598
11599
#: en/help_topics/conflict-types.txt:305
11600
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11601
msgstr ""
11602
11603
#: en/help_topics/conflict-types.txt:307
11604
msgid ""
11605
"This happens when the source and the target have each moved directories, so\n"
11606
"that, if the change could be applied, a directory would be contained by "
11607
"itself.\n"
11608
"For example::"
11609
msgstr ""
11610
11611
#: en/help_topics/conflict-types.txt:311
11612
msgid ""
11613
" $ bzr init\n"
11614
" $ bzr mkdir white\n"
11615
" $ bzr mkdir black\n"
11616
" $ bzr commit -m \"BASE\"\n"
11617
" $ bzr branch . ../other\n"
11618
" $ bzr mv white black\n"
11619
" $ bzr commit -m \"THIS\"\n"
11620
" $ bzr mv ../other/black ../other/white\n"
11621
" $ bzr commit ../other -m \"OTHER\"\n"
11622
" $ bzr merge ../other"
11623
msgstr ""
11624
11625
#: en/help_topics/conflict-types.txt:322
11626
msgid ""
11627
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11628
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11629
"name should be retained for the directories involved."
11630
msgstr ""
11631
11632
#: en/help_topics/conflict-types.txt:328
11633
msgid ""
11634
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11635
"\n"
11636
" in ``black``,\n"
11637
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11638
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11639
"* ``--action=done`` will just mark the conflict as resolved."
11640
msgstr ""
11641
11642
#: en/help_topics/conflict-types.txt:336
11643
msgid ""
11644
"Non-directory parent\n"
11645
"--------------------"
11646
msgstr ""
11647
11648
#: en/help_topics/conflict-types.txt:341
11649
msgid ""
11650
" Conflict: foo.new is not a directory, but has files in it.\n"
11651
" Created directory."
11652
msgstr ""
11653
11654
#: en/help_topics/conflict-types.txt:344
11655
msgid ""
11656
"This happens when one side has added files to a directory, and the other "
11657
"side\n"
11658
"has changed the directory into a file or symlink. For example::"
11659
msgstr ""
11660
11661
#: en/help_topics/conflict-types.txt:347
11662
msgid ""
11663
" $ bzr init\n"
11664
" $ bzr mkdir foo\n"
11665
" $ bzr commit -m \"BASE\"\n"
11666
" $ bzr branch . ../other\n"
11667
" $ rmdir foo\n"
11668
" $ touch foo\n"
11669
" $ bzr commit -m \"THIS\"\n"
11670
" $ bzr mkdir ../other/foo/bar\n"
11671
" $ bzr commit ../other -m \"OTHER\"\n"
11672
" $ bzr merge ../other"
11673
msgstr ""
11674
11675
#: en/help_topics/conflict-types.txt:358
11676
msgid ""
11677
"To resolve that kind of conflict, you have to decide what name should be\n"
11678
"retained for the file, directory or symlink involved."
11679
msgstr ""
11680
11681
#: en/help_topics/conflict-types.txt:363
11682
msgid ""
11683
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11684
" ``bzr add foo``,\n"
11685
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11686
" ``bzr mv foo.new foo``,\n"
11687
"* ``--action=done`` will just mark the conflict as resolved."
11688
msgstr ""
11689
11690
#: en/help_topics/conflict-types.txt:371
11691
msgid ""
11692
"MalformedTransform\n"
11693
"------------------"
11694
msgstr ""
11695
11696
#: en/help_topics/conflict-types.txt:374
11697
msgid ""
11698
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11699
"exception. This means that Bazaar encountered a filesystem conflict that it "
11700
"was\n"
11701
"unable to resolve. This usually indicates a bug. Please let us know if "
11702
"you\n"
11703
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11704
msgstr ""
11705
11706
#: en/help_topics/content-filters.txt:1
11707
msgid ""
11708
"Content Filters\n"
11709
"==============="
11710
msgstr ""
11711
11712
#: en/help_topics/content-filters.txt:4
11713
msgid ""
11714
"Content formats\n"
11715
"---------------"
11716
msgstr ""
11717
11718
#: en/help_topics/content-filters.txt:7
11719
msgid ""
11720
"Bazaar's content filtering allows you to store files in a different\n"
11721
"format from the copy in your working tree. This lets you, or your\n"
11722
"co-developers, use Windows development tools that expect CRLF files\n"
11723
"on projects that use other line-ending conventions. Among other things,\n"
11724
"content filters also let Unix developers more easily work on projects\n"
11725
"using Windows line-ending conventions, keyword expansion/compression,\n"
11726
"and trailing spaces on lines in text files to be implicitly stripped\n"
11727
"when committed."
11728
msgstr ""
11729
11730
#: en/help_topics/content-filters.txt:16
11731
msgid "To generalize, there are two content formats supported by Bazaar:"
11732
msgstr ""
11733
11734
#: en/help_topics/content-filters.txt:18
11735
msgid ""
11736
"* a canonical format - how files are stored internally\n"
11737
"* a convenience format - how files are created in a working tree."
11738
msgstr ""
11739
11740
#: en/help_topics/content-filters.txt:21
11741
msgid ""
11742
"\n"
11743
"Format conversion\n"
11744
"-----------------"
11745
msgstr ""
11746
11747
#: en/help_topics/content-filters.txt:25
11748
msgid ""
11749
"The conversion between these formats is done by content filters.\n"
11750
"A content filter has two parts:"
11751
msgstr ""
11752
11753
#: en/help_topics/content-filters.txt:28
11754
msgid ""
11755
"* a read converter - converts from convenience to canonical format\n"
11756
"* a write converter - converts from canonical to convenience format."
11757
msgstr ""
11758
11759
#: en/help_topics/content-filters.txt:31
11760
msgid ""
11761
"Many of these converters will provide *round-trip* conversion,\n"
11762
"i.e. applying the read converter followed by the write converter\n"
11763
"gives back the original content. However, others may provide an\n"
11764
"asymmetric conversion. For example, a read converter might strip\n"
11765
"trailing whitespace off lines in source code while the matching\n"
11766
"write converter might pass content through unchanged."
11767
msgstr ""
11768
11769
#: en/help_topics/content-filters.txt:38
11770
msgid ""
11771
"\n"
11772
"Enabling content filters\n"
11773
"------------------------"
11774
msgstr ""
11775
11776
#: en/help_topics/content-filters.txt:42
11777
msgid ""
11778
"Content filters are typically provided by plugins, so the first step\n"
11779
"in using them is to install the relevant plugins and read their\n"
11780
"documentation. Some plugins may be very specific about which files\n"
11781
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11782
"In other cases, the plugin may leave it in the user's hands to\n"
11783
"define which files are to be filtered. This is typically done\n"
11784
"using rule-based preferences. See ``bzr help rules`` for general\n"
11785
"information about defining these."
11786
msgstr ""
11787
11788
#: en/help_topics/content-filters.txt:51
11789
msgid ""
11790
"\n"
11791
"Impact on commands\n"
11792
"------------------"
11793
msgstr ""
11794
11795
#: en/help_topics/content-filters.txt:55
11796
msgid ""
11797
"Read converters are only applied to commands that read content from\n"
11798
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11799
"will apply read converters to files in the working tree, then compare\n"
11800
"the results to the content last committed."
11801
msgstr ""
11802
11803
#: en/help_topics/content-filters.txt:60
11804
msgid ""
11805
"Write converters are only applied by commands that **create files in a\n"
11806
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11807
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11808
"respectively."
11809
msgstr ""
11810
11811
#: en/help_topics/content-filters.txt:65
11812
msgid ""
11813
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11814
"comitting files. If this makes sense for a given plugin providing\n"
11815
"a content filter, the plugin can usually achieve this effect by using a\n"
11816
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11817
"for more information on hooks."
11818
msgstr ""
11819
11820
#: en/help_topics/content-filters.txt:71
11821
msgid ""
11822
"\n"
11823
"Refreshing your working tree\n"
11824
"----------------------------"
11825
msgstr ""
11826
11827
#: en/help_topics/content-filters.txt:75
11828
msgid ""
11829
"For performance reasons, Bazaar caches the timestamps of files in\n"
11830
"a working tree, and assumes files are unchanged if their timestamps\n"
11831
"match the cached values. As a consequence, there are times when\n"
11832
"you may need to explicitly ask for content filtering to be reapplied\n"
11833
"in one or both directions, e.g. after installing or reconfiguring\n"
11834
"plugins providing it."
11835
msgstr ""
11836
11837
#: en/help_topics/content-filters.txt:82
11838
msgid "Here are some general guidelines for doing this:"
11839
msgstr ""
11840
11841
#: en/help_topics/content-filters.txt:84
11842
msgid ""
11843
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11844
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11845
" relevant read converters and compare the end result with the\n"
11846
" canonical format."
11847
msgstr ""
11848
11849
#: en/help_topics/content-filters.txt:89
11850
msgid ""
11851
" * To reapply write converters, ensure there are no local changes,\n"
11852
" delete the relevant files and run ``bzr revert`` on those files."
11853
msgstr ""
11854
11855
#: en/help_topics/content-filters.txt:92
11856
msgid ""
11857
"Note: In the future, it is likely that additional options will be added\n"
11858
"to commands to make this refreshing process faster and safer.\n"
11859
msgstr ""
11860
11861
#: en/help_topics/current-formats.txt:1
11862
msgid "Current Storage Formats"
11863
msgstr ""
11864
11865
#: en/help_topics/current-formats.txt:3
11866
msgid ""
11867
":2a:\n"
11868
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11869
" compress storage. Provides rich roots which are a one-way\n"
11870
" transition."
11871
msgstr ""
11872
11873
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11874
msgid ""
11875
"\n"
11876
"See :doc:`formats-help` for more about storage formats."
11877
msgstr ""
11878
11879
#: en/help_topics/debug-flags.txt:1
11880
msgid ""
11881
"Debug Flags\n"
11882
"==========="
11883
msgstr ""
11884
11885
#: en/help_topics/debug-flags.txt:4
11886
msgid ""
11887
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11888
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11889
msgstr ""
11890
11891
#: en/help_topics/debug-flags.txt:7
11892
msgid ""
11893
"-Dauth Trace authentication sections used.\n"
11894
"-Dbytes Print out how many bytes were transferred\n"
11895
"-Ddirstate Trace dirstate activity (verbose!)\n"
11896
"-Derror Instead of normal error handling, always print a "
11897
"traceback\n"
11898
" on error.\n"
11899
"-Devil Capture call sites that do expensive or badly-scaling\n"
11900
" operations.\n"
11901
"-Dfetch Trace history copying between repositories.\n"
11902
"-Dfilters Emit information for debugging content filtering.\n"
11903
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11904
"fetch.\n"
11905
"-Dgraph Trace graph traversal.\n"
11906
"-Dhashcache Log every time a working file is read to determine its "
11907
"hash.\n"
11908
"-Dhooks Trace hook execution.\n"
11909
"-Dhpss Trace smart protocol requests and responses.\n"
11910
"-Dhpssdetail More hpss details.\n"
11911
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11912
"-Dhttp Trace http connections, requests and responses.\n"
11913
"-Dindex Trace major index operations.\n"
11914
"-Dknit Trace knit operations.\n"
11915
"-Dlock Trace when lockdir locks are taken or released.\n"
11916
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11917
" retrying the request.\n"
11918
"-Dprogress Trace progress bar operations.\n"
11919
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11920
"-Dmerge Emit information for debugging merges.\n"
11921
"-Dno_apport Don't use apport to report crashes.\n"
11922
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11923
"-Dpack Emit information about pack operations.\n"
11924
"-Drelock Emit a message every time a branch or repository object "
11925
"is\n"
11926
" unlocked then relocked the same way.\n"
11927
"-Dsftp Trace SFTP internals.\n"
11928
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11929
"expected\n"
11930
"-Dstream Trace fetch streams.\n"
11931
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11932
"portable\n"
11933
" manner.\n"
11934
"-Dunlock Some errors during unlock are treated as warnings.\n"
11935
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11936
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11937
"appropriate\n"
11938
" for the format, even for non-local fetches.\n"
11939
msgstr ""
11940
11941
#: en/help_topics/diverged-branches.txt:1
11942
msgid ""
11943
"Diverged Branches\n"
11944
"================="
11945
msgstr ""
11946
11947
#: en/help_topics/diverged-branches.txt:4
11948
msgid ""
11949
"When Bazaar tries to push one branch onto another, it requires that the\n"
11950
"destination branch must be ready to receive the source branch. If this "
11951
"isn't\n"
11952
"the case, then we say that the branches have ``diverged``. Branches are\n"
11953
"considered diverged if the destination branch's most recent commit is one "
11954
"that\n"
11955
"has not been merged (directly or indirectly) by the source branch. To "
11956
"recover\n"
11957
"from diverged branches, one must merge the missing revisions into the "
11958
"source\n"
11959
"branch."
11960
msgstr ""
11961
11962
#: en/help_topics/diverged-branches.txt:12
11963
msgid ""
11964
"This situation commonly arises when using a centralized workflow with local\n"
11965
"commits. If someone else has committed new work to the mainline since your\n"
11966
"last pull and you have local commits that have not yet been pushed to the\n"
11967
"mainline, then your local branch and the mainline have diverged."
11968
msgstr ""
11969
11970
#: en/help_topics/diverged-branches.txt:17
11971
msgid ""
11972
"Discovering What Has Diverged\n"
11973
"-----------------------------"
11974
msgstr ""
11975
11976
#: en/help_topics/diverged-branches.txt:20
11977
msgid ""
11978
"The ``bzr missing`` command is used to find out what revisions are in "
11979
"another\n"
11980
"branch that are not present in the current branch, and vice-versa. It shows "
11981
"a\n"
11982
"summary of which extra revisions exist in each branch. If you want to see "
11983
"the\n"
11984
"precise effects of those revisions, you can use ``bzr diff --"
11985
"old=other_branch``\n"
11986
"to show the differences between other_branch and your current branch."
11987
msgstr ""
11988
11989
#: en/help_topics/diverged-branches.txt:26
11990
msgid ""
11991
"A Solution\n"
11992
"----------"
11993
msgstr ""
11994
11995
#: en/help_topics/diverged-branches.txt:29
11996
msgid ""
11997
"The solution is to merge the revisions from the mainline into your local\n"
11998
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11999
"mainline. This merge may result in conflicts if the other developer's "
12000
"changes\n"
12001
"overlap with your changes. These conflicts should be resolved before\n"
12002
"continuing. After any conflicts have been resolved, or even if there were "
12003
"no\n"
12004
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
12005
"to your local branch. This requirement gives you an opportunity to test "
12006
"the\n"
12007
"resulting working tree for correctness, since the merged revisions could "
12008
"have\n"
12009
"made arbitrary changes. After testing, you should commit the merge using\n"
12010
"``bzr commit``. This clears up the diverged branches situation. Your "
12011
"local\n"
12012
"branch can now be pushed to the mainline.\n"
12013
msgstr ""
12014
12015
#: en/help_topics/env-variables.txt:1
12016
msgid "Environment Variables"
12017
msgstr "Переменные окружения"
12018
12019
#: en/help_topics/env-variables.txt:3
12020
msgid ""
12021
"=================== "
12022
"===========================================================\n"
12023
"BZRPATH Path where bzr is to look for shell plugin external\n"
12024
" commands.\n"
12025
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
12026
"EMAIL E-Mail address of the user.\n"
12027
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
12028
"EDITOR Editor for editing commit messages.\n"
12029
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
12030
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
12031
"BZR_PLUGINS_AT Plugins to load from a directory not in "
12032
"BZR_PLUGIN_PATH.\n"
12033
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
12034
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
12035
"and\n"
12036
" HOME.\n"
12037
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
12038
"URLs).\n"
12039
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
12040
"sshcorp,\n"
12041
" plink or lsh.\n"
12042
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
12043
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
12044
"BZR_COLUMNS Override implicit terminal width.\n"
12045
"BZR_CONCURRENCY Number of processes that can be run concurrently "
12046
"(selftest)\n"
12047
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
12048
"'text'.\n"
12049
"BZR_PDB Control whether to launch a debugger on error.\n"
12050
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
12051
" breakin debugger.\n"
12052
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
12053
"(instead\n"
12054
" of char-based).\n"
12055
"=================== "
12056
"===========================================================\n"
12057
msgstr ""
12058
12059
#: en/help_topics/eol.txt:1
12060
msgid ""
12061
"End of Line Conversion\n"
12062
"======================"
12063
msgstr ""
12064
12065
#: en/help_topics/eol.txt:4
12066
msgid ""
12067
"EOL conversion is provided as a content filter where Bazaar internally\n"
12068
"stores a canonical format but outputs a convenience format. See\n"
12069
"``bzr help content-filters`` for general information about using these."
12070
msgstr ""
12071
12072
#: en/help_topics/eol.txt:8
12073
msgid ""
12074
"Note: Content filtering is only supported in recently added formats,\n"
12075
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
12076
"in a recent format. (Just setting the format on the repository\n"
12077
"is not enough.) If content filtering does not appear to be working, use\n"
12078
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
12079
"or later."
12080
msgstr ""
12081
12082
#: en/help_topics/eol.txt:15
12083
msgid ""
12084
"EOL conversion needs to be enabled for selected file patterns using\n"
12085
"rules. See ``bzr help rules`` for general information on defining rules.\n"
12086
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
12087
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
12088
"supported in a future verison of Bazaar."
12089
msgstr ""
12090
12091
#: en/help_topics/eol.txt:21
12092
msgid ""
12093
"To configure which files to filter, set ``eol`` to one of the values below.\n"
12094
"(If a value is not set, ``exact`` is the default.)"
12095
msgstr ""
12096
12097
#: en/help_topics/eol.txt:24
12098
msgid ""
12099
" ========== ===================================== ======================\n"
12100
" Value Checkout end-of-lines as Commit end-of-lines as\n"
12101
" ========== ===================================== ======================\n"
12102
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
12103
" ---------- ------------------------------------- ----------------------\n"
12104
" ``lf`` ``lf`` ``lf``\n"
12105
" ---------- ------------------------------------- ----------------------\n"
12106
" ``crlf`` ``crlf`` ``lf``\n"
12107
" ---------- ------------------------------------- ----------------------\n"
12108
" ``exact`` No conversion Exactly as in file\n"
12109
" ========== ===================================== ======================"
12110
msgstr ""
12111
12112
#: en/help_topics/eol.txt:36
12113
msgid ""
12114
"Note: For safety reasons, no conversion is applied to any file where a null\n"
12115
"byte is detected in the file."
12116
msgstr ""
12117
12118
#: en/help_topics/eol.txt:39
12119
msgid ""
12120
"For users working on a cross-platform project, here is a suggested rule\n"
12121
"to use as a starting point::"
12122
msgstr ""
12123
12124
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
12125
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
12126
msgid ""
12127
" [name *]\n"
12128
" eol = native"
12129
msgstr ""
12130
12131
#: en/help_topics/eol.txt:45
12132
msgid ""
12133
"If you have binary files that do not contain a null byte though, be\n"
12134
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
12135
"by giving more explicit patterns earlier in the rules file. For example::"
12136
msgstr ""
12137
12138
#: en/help_topics/eol.txt:49
12139
msgid ""
12140
" [name *.png]\n"
12141
" eol = exact"
12142
msgstr ""
12143
12144
#: en/help_topics/eol.txt:55
12145
msgid ""
12146
"If your working tree is on a network drive shared by users on different\n"
12147
"operating systems, you typically want to force certain conventions for\n"
12148
"certain files. In that way, if a file is created with the wrong line\n"
12149
"endings or line endings get mixed during editing, it gets committed\n"
12150
"correctly and gets checked out correctly. For example::"
12151
msgstr ""
12152
12153
#: en/help_topics/eol.txt:61
12154
msgid ""
12155
" [name *.bat]\n"
12156
" eol = crlf"
12157
msgstr ""
12158
12159
#: en/help_topics/eol.txt:64
12160
msgid ""
12161
" [name *.sh]\n"
12162
" eol = lf"
12163
msgstr ""
12164
12165
#: en/help_topics/eol.txt:70
12166
msgid ""
12167
"If you take the care to create files with their required endings, you can\n"
12168
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
12169
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
12170
"introducing mixed line endings will be corrected during commit for files\n"
12171
"with those settings."
12172
msgstr ""
12173
12174
#: en/help_topics/eol.txt:76
12175
msgid ""
12176
"If you have sample test data that deliberately has text files with mixed\n"
12177
"newline conventions, you can ask for those to be left alone like this::"
12178
msgstr ""
12179
12180
#: en/help_topics/eol.txt:79
12181
msgid ""
12182
" [name test_data/]\n"
12183
" eol = exact"
12184
msgstr ""
12185
12186
#: en/help_topics/eol.txt:85
12187
msgid ""
12188
"Note that ``exact`` does not imply the file is binary but it does mean\n"
12189
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
12190
"of content analysis to detect binary files for commands like ``diff``.\n"
12191
"In the future, a ``binary = true`` rule may be added but it is not\n"
12192
"supported yet.)"
12193
msgstr ""
12194
12195
#: en/help_topics/eol.txt:91
12196
msgid ""
12197
"If you have an existing repository with text files already stored using\n"
12198
"Windows newline conventions (``crlf``), then you may want to keep using "
12199
"that\n"
12200
"convention in the repository. Forcing certain files to this convention\n"
12201
"may also help users who do not have rules configured. To do this, set\n"
12202
"``eol`` to one of the values below."
12203
msgstr ""
12204
12205
#: en/help_topics/eol.txt:97
12206
msgid ""
12207
" ============================ ======================== "
12208
"======================\n"
12209
" Value Checkout end-of-lines as Commit end-of-lines "
12210
"as\n"
12211
" ============================ ======================== "
12212
"======================\n"
12213
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
12214
" ``lf`` otherwise\n"
12215
" ---------------------------- ------------------------ ----------------------"
12216
"\n"
12217
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
12218
" ---------------------------- ------------------------ ----------------------"
12219
"\n"
12220
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
12221
" ============================ ======================== ======================"
12222
msgstr ""
12223
12224
#: en/help_topics/eol.txt:108
12225
msgid ""
12226
"For users working on an existing project that uses Windows newline\n"
12227
"conventions in their Bazaar repository, this rule is suggested as a\n"
12228
"starting point::"
12229
msgstr ""
12230
12231
#: en/help_topics/eol.txt:112
12232
msgid ""
12233
" [name *]\n"
12234
" eol = native-with-crlf-in-repo"
12235
msgstr ""
12236
12237
#: en/help_topics/eol.txt:115
12238
msgid ""
12239
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12240
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12241
"``crlf`` and ``exact``."
12242
msgstr ""
12243
12244
#: en/help_topics/eol.txt:119
12245
msgid ""
12246
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12247
"never reject files because a given line ending or mixed line endings\n"
12248
"are found. A precommit hook should be used if you wish to validate\n"
12249
"(and not just convert) content before committing.\n"
12250
msgstr ""
12251
12252
#: en/help_topics/hidden-commands.txt:1
12253
msgid ""
12254
"added List files added in working tree.\n"
12255
"ancestry List all revisions merged into this branch.\n"
12256
"assert-fail Test reporting of assertion failures\n"
12257
"bundle-info Output interesting stats about a bundle\n"
12258
"bundle-revisions Create a merge-directive for submitting changes.\n"
12259
"cat-revision Write out metadata for a revision.\n"
12260
"dump-btree Dump the contents of a btree index file to stdout.\n"
12261
"export-pot Export command helps and error messages in po format.\n"
12262
"file-id Print file_id of a particular file or directory.\n"
12263
"file-path Print path of file_ids to a file or directory.\n"
12264
"find-merge-base Find and print a base revision for merging two "
12265
"branches.\n"
12266
"hooks Show hooks.\n"
12267
"inventory Show inventory of the current working copy or a "
12268
"revision.\n"
12269
"local-time-offset Show the offset in seconds from GMT to local time.\n"
12270
"lookup-revision Lookup the revision-id from a revision-number\n"
12271
"merge-directive Generate a merge directive for auto-merge tools.\n"
12272
"modified List files modified in working tree.\n"
12273
"re-sign Create a digital signature for an existing revision.\n"
12274
"reference list, view and set branch locations for nested trees.\n"
12275
"relpath Show path of a file relative to root\n"
12276
"repair-workingtree Reset the working tree state file.\n"
12277
"revision-history Display the list of revision ids on a branch.\n"
12278
"revision-info Show revision number and revision id for a given "
12279
"revision\n"
12280
" identifier.\n"
12281
"rocks Statement of optimism.\n"
12282
"selftest Run internal test suite.\n"
12283
"shell-complete Show appropriate completions for context.\n"
12284
"test-script Run a shell-like test from a file.\n"
12285
"touching-revisions Return revision-ids which affected a particular file.\n"
12286
"unknowns List unknown files.\n"
12287
"wait-until-signalled Test helper for\n"
12288
" test_start_and_stop_bzr_subprocess_send_signal.\n"
12289
msgstr ""
12290
12291
#: en/help_topics/hooks.txt:1
12292
msgid ""
12293
"\n"
12294
"Hooks\n"
12295
"====="
12296
msgstr ""
12297
12298
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
12299
msgid ""
12300
"Introduction\n"
12301
"------------"
12302
msgstr ""
12303
12304
#: en/help_topics/hooks.txt:8
12305
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12306
msgstr ""
12307
12308
#: en/help_topics/hooks.txt:10
12309
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
12310
msgstr ""
12311
12312
#: en/help_topics/hooks.txt:12
12313
msgid ""
12314
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12315
msgstr ""
12316
12317
#: en/help_topics/hooks.txt:14
12318
msgid ""
12319
"The class that contains each hook is given before the hooks it supplies. "
12320
"For\n"
12321
"instance, BranchHooks as the class is the hooks class for\n"
12322
"`bzrlib.branch.Branch.hooks`."
12323
msgstr ""
12324
12325
#: en/help_topics/hooks.txt:18
12326
msgid ""
12327
"Each description also indicates whether the hook runs on the client (the\n"
12328
"machine where bzr was invoked) or the server (the machine addressed by\n"
12329
"the branch URL). These may be, but are not necessarily, the same machine."
12330
msgstr ""
12331
12332
#: en/help_topics/hooks.txt:22
12333
msgid ""
12334
"Plugins (including hooks) are run on the server if all of these is true:"
12335
msgstr ""
12336
12337
#: en/help_topics/hooks.txt:24
12338
msgid ""
12339
" * The connection is via a smart server (accessed with a URL starting with\n"
12340
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12341
"\"http://\"\n"
12342
" URL when a smart server is available via HTTP)."
12343
msgstr ""
12344
12345
#: en/help_topics/hooks.txt:28
12346
msgid ""
12347
" * The hook is either server specific or part of general infrastructure "
12348
"rather\n"
12349
" than client specific code (such as commit)."
12350
msgstr ""
12351
12352
#: en/help_topics/hooks.txt:31
12353
msgid ""
12354
"\n"
12355
"BranchHooks\n"
12356
"-----------"
12357
msgstr ""
12358
12359
#: en/help_topics/hooks.txt:35
12360
msgid ""
12361
"automatic_tag_name\n"
12362
"~~~~~~~~~~~~~~~~~~"
12363
msgstr ""
12364
12365
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12366
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
12367
msgid "Introduced in: 2.2"
12368
msgstr ""
12369
12370
#: en/help_topics/hooks.txt:40
12371
msgid ""
12372
"Called to determine an automatic tag name for a revision.\n"
12373
"automatic_tag_name is called with (branch, revision_id) and should\n"
12374
"return a tag name or None if no tag name could be determined. The\n"
12375
"first non-None tag name returned will be used."
12376
msgstr ""
12377
12378
#: en/help_topics/hooks.txt:45
12379
msgid ""
12380
"open\n"
12381
"~~~~"
12382
msgstr ""
12383
12384
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12385
#: en/help_topics/hooks.txt:307
12386
msgid "Introduced in: 1.8"
12387
msgstr ""
12388
12389
#: en/help_topics/hooks.txt:50
12390
msgid ""
12391
"Called with the Branch object that has been opened after a branch is\n"
12392
"opened."
12393
msgstr ""
12394
12395
#: en/help_topics/hooks.txt:53
12396
msgid ""
12397
"post_branch_init\n"
12398
"~~~~~~~~~~~~~~~~"
12399
msgstr ""
12400
12401
#: en/help_topics/hooks.txt:58
12402
msgid ""
12403
"Called after new branch initialization completes. post_branch_init is\n"
12404
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12405
"branch and checkout (both heavyweight and lightweight) will all\n"
12406
"trigger this hook."
12407
msgstr ""
12408
12409
#: en/help_topics/hooks.txt:63
12410
msgid ""
12411
"post_change_branch_tip\n"
12412
"~~~~~~~~~~~~~~~~~~~~~~"
12413
msgstr ""
12414
12415
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
12416
msgid "Introduced in: 1.4"
12417
msgstr ""
12418
12419
#: en/help_topics/hooks.txt:68
12420
msgid ""
12421
"Called in bzr client and server after a change to the tip of a branch\n"
12422
"is made. post_change_branch_tip is called with a\n"
12423
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12424
"uncommit will all trigger this hook."
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
12428
msgid ""
12429
"post_commit\n"
12430
"~~~~~~~~~~~"
12431
msgstr ""
12432
12433
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12434
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12435
msgid "Introduced in: 0.15"
12436
msgstr ""
12437
12438
#: en/help_topics/hooks.txt:78
12439
msgid ""
12440
"Called in the bzr client after a commit has completed. post_commit is\n"
12441
"called with (local, master, old_revno, old_revid, new_revno,\n"
12442
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12443
"branch."
12444
msgstr ""
12445
12446
#: en/help_topics/hooks.txt:83
12447
msgid ""
12448
"post_pull\n"
12449
"~~~~~~~~~"
12450
msgstr ""
12451
12452
#: en/help_topics/hooks.txt:88
12453
msgid ""
12454
"Called after a pull operation completes. post_pull is called with a\n"
12455
"bzrlib.branch.PullResult object and only runs in the bzr client."
12456
msgstr ""
12457
12458
#: en/help_topics/hooks.txt:91
12459
msgid ""
12460
"post_push\n"
12461
"~~~~~~~~~"
12462
msgstr ""
12463
12464
#: en/help_topics/hooks.txt:96
12465
msgid ""
12466
"Called after a push operation completes. post_push is called with a\n"
12467
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12468
msgstr ""
12469
12470
#: en/help_topics/hooks.txt:99
12471
msgid ""
12472
"post_switch\n"
12473
"~~~~~~~~~~~"
12474
msgstr ""
12475
12476
#: en/help_topics/hooks.txt:104
12477
msgid ""
12478
"Called after a checkout switches branch. post_switch is called with a\n"
12479
"bzrlib.branch.SwitchHookParams."
12480
msgstr ""
12481
12482
#: en/help_topics/hooks.txt:107
12483
msgid ""
12484
"post_uncommit\n"
12485
"~~~~~~~~~~~~~"
12486
msgstr ""
12487
12488
#: en/help_topics/hooks.txt:112
12489
msgid ""
12490
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12491
"called with (local, master, old_revno, old_revid, new_revno,\n"
12492
"new_revid) where local is the local branch or None, master is the\n"
12493
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12494
"of None."
12495
msgstr ""
12496
12497
#: en/help_topics/hooks.txt:118
12498
msgid ""
12499
"pre_change_branch_tip\n"
12500
"~~~~~~~~~~~~~~~~~~~~~"
12501
msgstr ""
12502
12503
#: en/help_topics/hooks.txt:121
12504
msgid "Introduced in: 1.6"
12505
msgstr ""
12506
12507
#: en/help_topics/hooks.txt:123
12508
msgid ""
12509
"Called in bzr client and server before a change to the tip of a branch\n"
12510
"is made. pre_change_branch_tip is called with a\n"
12511
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12512
"uncommit will all trigger this hook."
12513
msgstr ""
12514
12515
#: en/help_topics/hooks.txt:128
12516
msgid ""
12517
"pre_commit\n"
12518
"~~~~~~~~~~"
12519
msgstr ""
12520
12521
#: en/help_topics/hooks.txt:131
12522
msgid "Introduced in: 0.91"
12523
msgstr ""
12524
12525
#: en/help_topics/hooks.txt:133
12526
msgid ""
12527
"Called after a commit is calculated but before it is completed.\n"
12528
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12529
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12530
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12531
"TreeDelta object describing changes from the basis revision. hooks\n"
12532
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12533
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12534
"tree."
12535
msgstr ""
12536
12537
#: en/help_topics/hooks.txt:142
12538
msgid ""
12539
"transform_fallback_location\n"
12540
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12541
msgstr ""
12542
12543
#: en/help_topics/hooks.txt:145
12544
msgid "Introduced in: 1.9"
12545
msgstr ""
12546
12547
#: en/help_topics/hooks.txt:147
12548
msgid ""
12549
"Called when a stacked branch is activating its fallback locations.\n"
12550
"transform_fallback_location is called with (branch, url), and should\n"
12551
"return a new url. Returning the same url allows it to be used as-is,\n"
12552
"returning a different one can be used to cause the branch to stack on\n"
12553
"a closer copy of that fallback_location. Note that the branch cannot\n"
12554
"have history accessing methods called on it during this hook because\n"
12555
"the fallback locations have not been activated. When there are\n"
12556
"multiple hooks installed for transform_fallback_location, all are\n"
12557
"called with the url returned from the previous hook.The order is\n"
12558
"however undefined."
12559
msgstr ""
12560
12561
#: en/help_topics/hooks.txt:158
12562
msgid ""
12563
"CommandHooks\n"
12564
"------------"
12565
msgstr ""
12566
12567
#: en/help_topics/hooks.txt:161
12568
msgid ""
12569
"extend_command\n"
12570
"~~~~~~~~~~~~~~"
12571
msgstr ""
12572
12573
#: en/help_topics/hooks.txt:164
12574
msgid "Introduced in: 1.13"
12575
msgstr ""
12576
12577
#: en/help_topics/hooks.txt:166
12578
msgid ""
12579
"Called after creating a command object to allow modifications such as\n"
12580
"adding or removing options, docs etc. Called with the new\n"
12581
"bzrlib.commands.Command object."
12582
msgstr ""
12583
12584
#: en/help_topics/hooks.txt:170
12585
msgid ""
12586
"get_command\n"
12587
"~~~~~~~~~~~"
12588
msgstr ""
12589
12590
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12591
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12592
msgid "Introduced in: 1.17"
12593
msgstr ""
12594
12595
#: en/help_topics/hooks.txt:175
12596
msgid ""
12597
"Called when creating a single command. Called with (cmd_or_None,\n"
12598
"command_name). get_command should either return the cmd_or_None\n"
12599
"parameter, or a replacement Command object that should be used for the\n"
12600
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12601
"Many users will prefer to use bzrlib.commands.register_command or\n"
12602
"plugin_cmds.register_lazy."
12603
msgstr ""
12604
12605
#: en/help_topics/hooks.txt:182
12606
msgid ""
12607
"get_missing_command\n"
12608
"~~~~~~~~~~~~~~~~~~~"
12609
msgstr ""
12610
12611
#: en/help_topics/hooks.txt:187
12612
msgid ""
12613
"Called when creating a single command if no command could be found.\n"
12614
"Called with (command_name). get_missing_command should either return\n"
12615
"None, or a Command object to be used for the command."
12616
msgstr ""
12617
12618
#: en/help_topics/hooks.txt:191
12619
msgid ""
12620
"list_commands\n"
12621
"~~~~~~~~~~~~~"
12622
msgstr ""
12623
12624
#: en/help_topics/hooks.txt:196
12625
msgid ""
12626
"Called when enumerating commands. Called with a set of cmd_name\n"
12627
"strings for all the commands found so far. This set is safe to mutate\n"
12628
"- e.g. to remove a command. list_commands should return the updated\n"
12629
"set of command names."
12630
msgstr ""
12631
12632
#: en/help_topics/hooks.txt:201
12633
msgid ""
12634
"post_command\n"
12635
"~~~~~~~~~~~~"
12636
msgstr ""
12637
12638
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12639
msgid "Introduced in: 2.6"
12640
msgstr ""
12641
12642
#: en/help_topics/hooks.txt:206
12643
msgid "Called after executing a command. Called with the command object."
12644
msgstr ""
12645
12646
#: en/help_topics/hooks.txt:208
12647
msgid ""
12648
"pre_command\n"
12649
"~~~~~~~~~~~"
12650
msgstr ""
12651
12652
#: en/help_topics/hooks.txt:213
12653
msgid "Called prior to executing a command. Called with the command object."
12654
msgstr ""
12655
12656
#: en/help_topics/hooks.txt:215
12657
msgid ""
12658
"_ConfigHooks\n"
12659
"------------"
12660
msgstr ""
12661
12662
#: en/help_topics/hooks.txt:218
12663
msgid ""
12664
"get\n"
12665
"~~~"
12666
msgstr ""
12667
12668
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12669
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12670
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12671
#: en/help_topics/hooks.txt:446
12672
msgid "Introduced in: 2.4"
12673
msgstr ""
12674
12675
#: en/help_topics/hooks.txt:223
12676
msgid ""
12677
"Invoked when a config option is read. The signature is (stack, name,\n"
12678
"value)."
12679
msgstr ""
12680
12681
#: en/help_topics/hooks.txt:226
12682
msgid ""
12683
"load\n"
12684
"~~~~"
12685
msgstr ""
12686
12687
#: en/help_topics/hooks.txt:231
12688
msgid "Invoked when a config store is loaded. The signature is (store)."
12689
msgstr ""
12690
12691
#: en/help_topics/hooks.txt:233
12692
msgid ""
12693
"remove\n"
12694
"~~~~~~"
12695
msgstr ""
12696
12697
#: en/help_topics/hooks.txt:238
12698
msgid ""
12699
"Invoked when a config option is removed. The signature is (stack,\n"
12700
"name)."
12701
msgstr ""
12702
12703
#: en/help_topics/hooks.txt:241
12704
msgid ""
12705
"save\n"
12706
"~~~~"
12707
msgstr ""
12708
12709
#: en/help_topics/hooks.txt:246
12710
msgid "Invoked when a config store is saved. The signature is (store)."
12711
msgstr ""
12712
12713
#: en/help_topics/hooks.txt:248
12714
msgid ""
12715
"set\n"
12716
"~~~"
12717
msgstr ""
12718
12719
#: en/help_topics/hooks.txt:253
12720
msgid ""
12721
"Invoked when a config option is set. The signature is (stack, name,\n"
12722
"value)."
12723
msgstr ""
12724
12725
#: en/help_topics/hooks.txt:256
12726
msgid ""
12727
"ControlDirHooks\n"
12728
"---------------"
12729
msgstr ""
12730
12731
#: en/help_topics/hooks.txt:259
12732
msgid ""
12733
"post_repo_init\n"
12734
"~~~~~~~~~~~~~~"
12735
msgstr ""
12736
12737
#: en/help_topics/hooks.txt:264
12738
msgid ""
12739
"Invoked after a repository has been initialized. post_repo_init is\n"
12740
"called with a bzrlib.controldir.RepoInitHookParams."
12741
msgstr ""
12742
12743
#: en/help_topics/hooks.txt:267
12744
msgid ""
12745
"pre_open\n"
12746
"~~~~~~~~"
12747
msgstr ""
12748
12749
#: en/help_topics/hooks.txt:270
12750
msgid "Introduced in: 1.14"
12751
msgstr ""
12752
12753
#: en/help_topics/hooks.txt:272
12754
msgid ""
12755
"Invoked before attempting to open a ControlDir with the transport that\n"
12756
"the open will use."
12757
msgstr ""
12758
12759
#: en/help_topics/hooks.txt:275
12760
msgid ""
12761
"InfoHooks\n"
12762
"---------"
12763
msgstr ""
12764
12765
#: en/help_topics/hooks.txt:278
12766
msgid ""
12767
"repository\n"
12768
"~~~~~~~~~~"
12769
msgstr ""
12770
12771
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12772
#: en/help_topics/hooks.txt:524
12773
msgid "Introduced in: 1.15"
12774
msgstr ""
12775
12776
#: en/help_topics/hooks.txt:283
12777
msgid ""
12778
"Invoked when displaying the statistics for a repository. repository is\n"
12779
"called with a statistics dictionary as returned by the repository and\n"
12780
"a file-like object to write to."
12781
msgstr ""
12782
12783
#: en/help_topics/hooks.txt:287
12784
msgid ""
12785
"LockHooks\n"
12786
"---------"
12787
msgstr ""
12788
12789
#: en/help_topics/hooks.txt:290
12790
msgid ""
12791
"lock_acquired\n"
12792
"~~~~~~~~~~~~~"
12793
msgstr ""
12794
12795
#: en/help_topics/hooks.txt:295
12796
msgid ""
12797
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12798
msgstr ""
12799
12800
#: en/help_topics/hooks.txt:297
12801
msgid ""
12802
"lock_broken\n"
12803
"~~~~~~~~~~~"
12804
msgstr ""
12805
12806
#: en/help_topics/hooks.txt:302
12807
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12808
msgstr ""
12809
12810
#: en/help_topics/hooks.txt:304
12811
msgid ""
12812
"lock_released\n"
12813
"~~~~~~~~~~~~~"
12814
msgstr ""
12815
12816
#: en/help_topics/hooks.txt:309
12817
msgid ""
12818
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12819
msgstr ""
12820
12821
#: en/help_topics/hooks.txt:311
12822
msgid ""
12823
"MergeHooks\n"
12824
"----------"
12825
msgstr ""
12826
12827
#: en/help_topics/hooks.txt:314
12828
msgid ""
12829
"merge_file_content\n"
12830
"~~~~~~~~~~~~~~~~~~"
12831
msgstr ""
12832
12833
#: en/help_topics/hooks.txt:317
12834
msgid "Introduced in: 2.1"
12835
msgstr ""
12836
12837
#: en/help_topics/hooks.txt:319
12838
msgid ""
12839
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12840
"object when starting a merge. Should return either None or a subclass\n"
12841
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12842
"called per file that needs to be merged (including when one side has\n"
12843
"deleted the file and the other has changed it). See the\n"
12844
"AbstractPerFileMerger API docs for details on how it is used by merge."
12845
msgstr ""
12846
12847
#: en/help_topics/hooks.txt:326
12848
msgid ""
12849
"post_merge\n"
12850
"~~~~~~~~~~"
12851
msgstr ""
12852
12853
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12854
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12855
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12856
msgid "Introduced in: 2.5"
12857
msgstr ""
12858
12859
#: en/help_topics/hooks.txt:331
12860
msgid ""
12861
"Called after a merge. Receives a Merger object as the single argument.\n"
12862
"The return value is ignored."
12863
msgstr ""
12864
12865
#: en/help_topics/hooks.txt:334
12866
msgid ""
12867
"pre_merge\n"
12868
"~~~~~~~~~"
12869
msgstr ""
12870
12871
#: en/help_topics/hooks.txt:339
12872
msgid ""
12873
"Called before a merge. Receives a Merger object as the single\n"
12874
"argument."
12875
msgstr ""
12876
12877
#: en/help_topics/hooks.txt:342
12878
msgid ""
12879
"MergeDirectiveHooks\n"
12880
"-------------------"
12881
msgstr ""
12882
12883
#: en/help_topics/hooks.txt:345
12884
msgid ""
12885
"merge_request_body\n"
12886
"~~~~~~~~~~~~~~~~~~"
12887
msgstr ""
12888
12889
#: en/help_topics/hooks.txt:348
12890
msgid "Introduced in: 1.15.0"
12891
msgstr ""
12892
12893
#: en/help_topics/hooks.txt:350
12894
msgid ""
12895
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12896
"request. Callbacks must return a body. If more than one callback is\n"
12897
"registered, the output of one callback is provided to the next."
12898
msgstr ""
12899
12900
#: en/help_topics/hooks.txt:354
12901
msgid ""
12902
"MessageEditorHooks\n"
12903
"------------------"
12904
msgstr ""
12905
12906
#: en/help_topics/hooks.txt:357
12907
msgid ""
12908
"commit_message_template\n"
12909
"~~~~~~~~~~~~~~~~~~~~~~~"
12910
msgstr ""
12911
12912
#: en/help_topics/hooks.txt:360
12913
msgid "Introduced in: 1.10"
12914
msgstr ""
12915
12916
#: en/help_topics/hooks.txt:362
12917
msgid ""
12918
"Called when a commit message is being generated.\n"
12919
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12920
"and the message that is known so far. commit_message_template must\n"
12921
"return a new message to use (which could be the same as it was given).\n"
12922
"When there are multiple hooks registered for commit_message_template,\n"
12923
"they are chained with the result from the first passed into the\n"
12924
"second, and so on."
12925
msgstr ""
12926
12927
#: en/help_topics/hooks.txt:370
12928
msgid ""
12929
"set_commit_message\n"
12930
"~~~~~~~~~~~~~~~~~~"
12931
msgstr ""
12932
12933
#: en/help_topics/hooks.txt:375
12934
msgid ""
12935
"Set a fixed commit message. set_commit_message is called with the\n"
12936
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12937
"properties by editing commit.builder._revprops) and the message so\n"
12938
"far. set_commit_message must return the message to use or None if it\n"
12939
"should use the message editor as normal."
12940
msgstr ""
12941
12942
#: en/help_topics/hooks.txt:381
12943
msgid ""
12944
"MutableTreeHooks\n"
12945
"----------------"
12946
msgstr ""
12947
12948
#: en/help_topics/hooks.txt:384
12949
msgid ""
12950
"post_build_tree\n"
12951
"~~~~~~~~~~~~~~~"
12952
msgstr ""
12953
12954
#: en/help_topics/hooks.txt:389
12955
msgid ""
12956
"Called after a completely new tree is built. The hook is called with\n"
12957
"the tree as its only argument."
12958
msgstr ""
12959
12960
#: en/help_topics/hooks.txt:395
12961
msgid "Introduced in: 2.0"
12962
msgstr ""
12963
12964
#: en/help_topics/hooks.txt:397
12965
msgid ""
12966
"Called after a commit is performed on a tree. The hook is called with\n"
12967
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12968
"commit was performed on is available via the mutable_tree attribute of\n"
12969
"that object."
12970
msgstr ""
12971
12972
#: en/help_topics/hooks.txt:402
12973
msgid ""
12974
"post_transform\n"
12975
"~~~~~~~~~~~~~~"
12976
msgstr ""
12977
12978
#: en/help_topics/hooks.txt:407
12979
msgid ""
12980
"Called after a tree transform has been performed on a tree. The hook\n"
12981
"is called with the tree that is being transformed and the transform."
12982
msgstr ""
12983
12984
#: en/help_topics/hooks.txt:410
12985
msgid ""
12986
"pre_transform\n"
12987
"~~~~~~~~~~~~~"
12988
msgstr ""
12989
12990
#: en/help_topics/hooks.txt:415
12991
msgid ""
12992
"Called before a tree transform on this tree. The hook is called with\n"
12993
"the tree that is being transformed and the transform."
12994
msgstr ""
12995
12996
#: en/help_topics/hooks.txt:418
12997
msgid ""
12998
"start_commit\n"
12999
"~~~~~~~~~~~~"
13000
msgstr ""
13001
13002
#: en/help_topics/hooks.txt:423
13003
msgid ""
13004
"Called before a commit is performed on a tree. The start commit hook\n"
13005
"is able to change the tree before the commit takes place. start_commit\n"
13006
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
13007
"being performed on."
13008
msgstr ""
13009
13010
#: en/help_topics/hooks.txt:428
13011
msgid ""
13012
"SmartClientHooks\n"
13013
"----------------"
13014
msgstr ""
13015
13016
#: en/help_topics/hooks.txt:431
13017
msgid ""
13018
"call\n"
13019
"~~~~"
13020
msgstr ""
13021
13022
#: en/help_topics/hooks.txt:434
13023
msgid "Introduced in: unknown"
13024
msgstr ""
13025
13026
#: en/help_topics/hooks.txt:436
13027
msgid ""
13028
"Called when the smart client is submitting a request to the smart\n"
13029
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
13030
"Streaming request bodies, and responses, are not accessible."
13031
msgstr ""
13032
13033
#: en/help_topics/hooks.txt:440
13034
msgid ""
13035
"SmartServerHooks\n"
13036
"----------------"
13037
msgstr ""
13038
13039
#: en/help_topics/hooks.txt:443
13040
msgid ""
13041
"server_exception\n"
13042
"~~~~~~~~~~~~~~~~"
13043
msgstr ""
13044
13045
#: en/help_topics/hooks.txt:448
13046
msgid ""
13047
"Called by the bzr server when an exception occurs. server_exception is\n"
13048
"called with the sys.exc_info() tuple return true for the hook if the\n"
13049
"exception has been handled, in which case the server will exit\n"
13050
"normally."
13051
msgstr ""
13052
13053
#: en/help_topics/hooks.txt:453
13054
msgid ""
13055
"server_started\n"
13056
"~~~~~~~~~~~~~~"
13057
msgstr ""
13058
13059
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
13060
msgid "Introduced in: 0.16"
13061
msgstr ""
13062
13063
#: en/help_topics/hooks.txt:458
13064
msgid ""
13065
"Called by the bzr server when it starts serving a directory.\n"
13066
"server_started is called with (backing urls, public url), where\n"
13067
"backing_url is a list of URLs giving the server-specific directory\n"
13068
"locations, and public_url is the public URL for the directory being\n"
13069
"served."
13070
msgstr ""
13071
13072
#: en/help_topics/hooks.txt:464
13073
msgid ""
13074
"server_started_ex\n"
13075
"~~~~~~~~~~~~~~~~~"
13076
msgstr ""
13077
13078
#: en/help_topics/hooks.txt:469
13079
msgid ""
13080
"Called by the bzr server when it starts serving a directory.\n"
13081
"server_started is called with (backing_urls, server_obj)."
13082
msgstr ""
13083
13084
#: en/help_topics/hooks.txt:472
13085
msgid ""
13086
"server_stopped\n"
13087
"~~~~~~~~~~~~~~"
13088
msgstr ""
13089
13090
#: en/help_topics/hooks.txt:477
13091
msgid ""
13092
"Called by the bzr server when it stops serving a directory.\n"
13093
"server_stopped is called with the same parameters as the\n"
13094
"server_started hook: (backing_urls, public_url)."
13095
msgstr ""
13096
13097
#: en/help_topics/hooks.txt:481
13098
msgid ""
13099
"StatusHooks\n"
13100
"-----------"
13101
msgstr ""
13102
13103
#: en/help_topics/hooks.txt:484
13104
msgid ""
13105
"post_status\n"
13106
"~~~~~~~~~~~"
13107
msgstr ""
13108
13109
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
13110
msgid "Introduced in: 2.3"
13111
msgstr ""
13112
13113
#: en/help_topics/hooks.txt:489
13114
msgid ""
13115
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13116
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13117
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13118
"correspond to the command line options specified by the user for the\n"
13119
"status command. to_file is the output stream for writing."
13120
msgstr ""
13121
13122
#: en/help_topics/hooks.txt:495
13123
msgid ""
13124
"pre_status\n"
13125
"~~~~~~~~~~"
13126
msgstr ""
13127
13128
#: en/help_topics/hooks.txt:500
13129
msgid ""
13130
"Called with argument StatusHookParams before Bazaar displays the\n"
13131
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13132
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13133
"correspond to the command line options specified by the user for the\n"
13134
"status command. to_file is the output stream for writing."
13135
msgstr ""
13136
13137
#: en/help_topics/hooks.txt:506
13138
msgid ""
13139
"TransportHooks\n"
13140
"--------------"
13141
msgstr ""
13142
13143
#: en/help_topics/hooks.txt:509
13144
msgid ""
13145
"post_connect\n"
13146
"~~~~~~~~~~~~"
13147
msgstr ""
13148
13149
#: en/help_topics/hooks.txt:514
13150
msgid ""
13151
"Called after a new connection is established or a reconnect occurs.\n"
13152
"The sole argument passed is either the connected transport or smart\n"
13153
"medium instance."
13154
msgstr ""
13155
13156
#: en/help_topics/hooks.txt:518
13157
msgid ""
13158
"RioVersionInfoBuilderHooks\n"
13159
"--------------------------"
13160
msgstr ""
13161
13162
#: en/help_topics/hooks.txt:521
13163
msgid ""
13164
"revision\n"
13165
"~~~~~~~~"
13166
msgstr ""
13167
13168
#: en/help_topics/hooks.txt:526
13169
msgid ""
13170
"Invoked when adding information about a revision to the RIO stanza\n"
13171
"that is printed. revision is called with a revision object and a RIO\n"
13172
"stanza.\n"
13173
msgstr ""
13174
13175
#: en/help_topics/location-alias.txt:1
13176
msgid ""
13177
"Location aliases\n"
13178
"================"
13179
msgstr ""
13180
13181
#: en/help_topics/location-alias.txt:4
13182
msgid ""
13183
"Bazaar defines several aliases for locations associated with a branch. "
13184
"These\n"
13185
"can be used with most commands that expect a location, such as `bzr push`."
13186
msgstr ""
13187
13188
#: en/help_topics/location-alias.txt:7
13189
msgid "The aliases are::"
13190
msgstr ""
13191
13192
#: en/help_topics/location-alias.txt:9
13193
msgid ""
13194
" :bound The branch this branch is bound to, for bound branches.\n"
13195
" :parent The parent of this branch.\n"
13196
" :public The public location of this branch.\n"
13197
" :push The saved location used for `bzr push` with no arguments.\n"
13198
" :submit The submit branch for this branch.\n"
13199
" :this This branch."
13200
msgstr ""
13201
13202
#: en/help_topics/location-alias.txt:16
13203
msgid "For example, to push to the parent location::"
13204
msgstr ""
13205
13206
#: en/help_topics/location-alias.txt:18
13207
msgid " bzr push :parent\n"
13208
msgstr ""
13209
13210
#: en/help_topics/log-formats.txt:1
13211
msgid ""
13212
"Log Formats\n"
13213
"==========="
13214
msgstr ""
13215
13216
#: en/help_topics/log-formats.txt:4
13217
msgid ""
13218
"A log format controls how information about each revision is displayed.\n"
13219
"The standard log formats are compared below::"
13220
msgstr ""
13221
13222
#: en/help_topics/log-formats.txt:7
13223
msgid ""
13224
" Feature long short line\n"
13225
" ---------------------- ------------- ------------ -------------------\n"
13226
" design goal detailed view concise view 1 revision per line\n"
13227
" committer name+email name only name only\n"
13228
" author name+email - -\n"
13229
" date-time format full date only date only\n"
13230
" commit message full full top line\n"
13231
" tags yes yes yes\n"
13232
" merges indicator - yes -\n"
13233
" status/delta optional optional -\n"
13234
" diff/patch optional optional -\n"
13235
" revision-id optional optional -\n"
13236
" branch nick yes - -\n"
13237
" foreign vcs properties yes yes -\n"
13238
" preferred levels all 1 1\n"
13239
" digital signature optional - -"
13240
msgstr ""
13241
13242
#: en/help_topics/log-formats.txt:24
13243
msgid ""
13244
"The default format is ``long``. To change this, define the ``log_format``\n"
13245
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
13246
msgstr ""
13247
13248
#: en/help_topics/log-formats.txt:27
13249
msgid ""
13250
" [DEFAULT]\n"
13251
" log_format = short"
13252
msgstr ""
13253
13254
#: en/help_topics/log-formats.txt:30
13255
msgid ""
13256
"Alternatively, to change the log format used for a given query, use the\n"
13257
"--long, --short or --line options."
13258
msgstr ""
13259
13260
#: en/help_topics/log-formats.txt:33
13261
msgid ""
13262
"If one of the standard log formats does not meet your needs, additional\n"
13263
"formats can be provided by plugins.\n"
13264
msgstr ""
13265
13266
#: en/help_topics/other-formats.txt:1
13267
msgid "Other Storage Formats"
13268
msgstr ""
13269
13270
#: en/help_topics/other-formats.txt:3
13271
msgid "Experimental formats are shown below."
13272
msgstr ""
13273
13274
#: en/help_topics/other-formats.txt:5
13275
msgid ""
13276
":development-colo:\n"
13277
" (native) The 2a format with experimental support for colocated\n"
13278
" branches."
13279
msgstr ""
13280
13281
#: en/help_topics/other-formats.txt:9
13282
msgid ""
13283
"\n"
13284
"Deprecated formats are shown below."
13285
msgstr ""
13286
13287
#: en/help_topics/other-formats.txt:12
13288
msgid ""
13289
":pack-0.92:\n"
13290
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
13291
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
13292
" by bzr < 0.92."
13293
msgstr ""
13294
13295
#: en/help_topics/patterns.txt:1
13296
msgid ""
13297
"Patterns\n"
13298
"========"
13299
msgstr ""
13300
13301
#: en/help_topics/patterns.txt:4
13302
msgid ""
13303
"Bazaar uses patterns to match files at various times. For example,\n"
13304
"the ``add`` command skips over files that match ignore patterns\n"
13305
"and preferences can be associated with files using rule patterns.\n"
13306
"The pattern syntax is described below."
13307
msgstr ""
13308
13309
#: en/help_topics/patterns.txt:9
13310
msgid ""
13311
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13312
"slash or is a regular expression, it is compared to the whole path\n"
13313
"from the branch root. Otherwise, it is compared to only the last\n"
13314
"component of the path. To match a file only in the root directory,\n"
13315
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13316
msgstr ""
13317
13318
#: en/help_topics/patterns.txt:15
13319
msgid "Patterns may include globbing wildcards such as::"
13320
msgstr ""
13321
13322
#: en/help_topics/patterns.txt:17
13323
msgid ""
13324
" ? - Matches any single character except '/'\n"
13325
" * - Matches 0 or more characters except '/'\n"
13326
" /**/ - Matches 0 or more directories in a path\n"
13327
" [a-z] - Matches a single character from within a group of characters"
13328
msgstr ""
13329
13330
#: en/help_topics/patterns.txt:22
13331
msgid ""
13332
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13333
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13334
"expression. Regular expression patterns may not include named or\n"
13335
"numbered groups."
13336
msgstr ""
13337
13338
#: en/help_topics/patterns.txt:27
13339
msgid ""
13340
"Case insensitive ignore patterns can be specified with regular expressions\n"
13341
"by using the ``i`` (for ignore case) flag in the pattern."
13342
msgstr ""
13343
13344
#: en/help_topics/patterns.txt:30
13345
msgid ""
13346
"For example, a case insensitive match for ``foo`` may be specified as::"
13347
msgstr ""
13348
13349
#: en/help_topics/patterns.txt:32
13350
msgid " RE:(?i)foo"
13351
msgstr ""
13352
13353
#: en/help_topics/patterns.txt:34
13354
msgid ""
13355
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13356
"matched by that pattern will not be ignored."
13357
msgstr ""
13358
13359
#: en/help_topics/patterns.txt:37
13360
msgid ""
13361
".. _Python regular expressions: http://docs.python.org/library/re.html"
13362
msgstr ""
13363
13364
#: en/help_topics/revisionspec.txt:1
13365
msgid "Revision Identifiers"
13366
msgstr ""
13367
13368
#: en/help_topics/revisionspec.txt:3
13369
msgid ""
13370
"A revision identifier refers to a specific state of a branch's history. It\n"
13371
"can be expressed in several ways. It can begin with a keyword to\n"
13372
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13373
"'before:yesterday' and 'submit:'."
13374
msgstr ""
13375
13376
#: en/help_topics/revisionspec.txt:8
13377
msgid ""
13378
"Alternately, it can be given without a keyword, in which case it will be\n"
13379
"checked as a revision number, a tag, a revision id, a date specification, or "
13380
"a\n"
13381
"branch specification, in that order. For example, 'date:today' could be\n"
13382
"written as simply 'today', though if you have a tag called 'today' that "
13383
"will\n"
13384
"be found first."
13385
msgstr ""
13386
13387
#: en/help_topics/revisionspec.txt:14
13388
msgid ""
13389
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13390
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13391
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13392
"or\n"
13393
"spaces around the '..')."
13394
msgstr ""
13395
13396
#: en/help_topics/revisionspec.txt:19
13397
msgid ""
13398
"Ranges are interpreted differently by different commands. To the \"log\" "
13399
"command,\n"
13400
"a range is a sequence of log messages, but to the \"diff\" command, the "
13401
"range\n"
13402
"denotes a change between revisions (and not a sequence of changes). In\n"
13403
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13404
"consider it\n"
13405
"to be open-ended, that is, they include one end but not the other. For "
13406
"example:\n"
13407
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13408
"3649,\n"
13409
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13410
"and\n"
13411
"3649, but not 3647."
13412
msgstr ""
13413
13414
#: en/help_topics/revisionspec.txt:28
13415
msgid "The keywords used as revision selection methods are the following:"
13416
msgstr ""
13417
13418
#: en/help_topics/revisionspec.txt:30
13419
msgid ""
13420
":revid:\n"
13421
"\tSelects a revision using the revision id.\n"
13422
":submit:\n"
13423
"\tSelects a common ancestor with the submit branch.\n"
13424
":ancestor:\n"
13425
"\tSelects a common ancestor with a second branch.\n"
13426
":date:\n"
13427
"\tSelects a revision on the basis of a datestamp.\n"
13428
":branch:\n"
13429
"\tSelects the last revision of a specified branch.\n"
13430
":tag:\n"
13431
"\tSelects a revision identified by a tag name.\n"
13432
":revno:\n"
13433
"\tSelects a revision using a number.\n"
13434
":before:\n"
13435
"\tSelects the parent of the revision specified.\n"
13436
":annotate:\n"
13437
"\tSelect the revision that last modified the specified line.\n"
13438
":mainline:\n"
13439
"\tSelect mainline revision that merged the specified revision.\n"
13440
":last:\n"
13441
"\tSelects the nth revision from the end."
13442
msgstr ""
13443
13444
#: en/help_topics/revisionspec.txt:53
13445
msgid "In addition, plugins can provide other keywords."
13446
msgstr ""
13447
13448
#: en/help_topics/revisionspec.txt:55
13449
msgid "A detailed description of each keyword is given below."
13450
msgstr ""
13451
13452
#: en/help_topics/revisionspec.txt:57
13453
msgid ":revid:"
13454
msgstr ""
13455
13456
#: en/help_topics/revisionspec.txt:59
13457
msgid ""
13458
" Supply a specific revision id, that can be used to specify any\n"
13459
" revision id in the ancestry of the branch.\n"
13460
" Including merges, and pending merges.\n"
13461
" Examples::"
13462
msgstr ""
13463
13464
#: en/help_topics/revisionspec.txt:64
13465
msgid ""
13466
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13467
msgstr ""
13468
13469
#: en/help_topics/revisionspec.txt:66
13470
msgid ":submit:"
13471
msgstr ""
13472
13473
#: en/help_topics/revisionspec.txt:68
13474
msgid ""
13475
" Diffing against this shows all the changes that were made in this "
13476
"branch,\n"
13477
" and is a good predictor of what merge will do. The submit branch is\n"
13478
" used by the bundle and merge directive commands. If no submit branch\n"
13479
" is specified, the parent branch is used instead."
13480
msgstr ""
13481
13482
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13483
msgid ""
13484
" The common ancestor is the last revision that existed in both\n"
13485
" branches. Usually this is the branch point, but it could also be\n"
13486
" a revision that was merged."
13487
msgstr ""
13488
13489
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13490
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13491
#: en/help_topics/revisionspec.txt:153
13492
msgid " Examples::"
13493
msgstr ""
13494
13495
#: en/help_topics/revisionspec.txt:79
13496
msgid " $ bzr diff -r submit:"
13497
msgstr ""
13498
13499
#: en/help_topics/revisionspec.txt:81
13500
msgid ":ancestor:"
13501
msgstr ""
13502
13503
#: en/help_topics/revisionspec.txt:83
13504
msgid " Supply the path to a branch to select the common ancestor."
13505
msgstr ""
13506
13507
#: en/help_topics/revisionspec.txt:89
13508
msgid ""
13509
" This is frequently used with 'diff' to return all of the changes\n"
13510
" that your branch introduces, while excluding the changes that you\n"
13511
" have not merged from the remote branch."
13512
msgstr ""
13513
13514
#: en/help_topics/revisionspec.txt:95
13515
msgid ""
13516
" ancestor:/path/to/branch\n"
13517
" $ bzr diff -r ancestor:../../mainline/branch"
13518
msgstr ""
13519
13520
#: en/help_topics/revisionspec.txt:98
13521
msgid ":date:"
13522
msgstr ""
13523
13524
#: en/help_topics/revisionspec.txt:100
13525
msgid ""
13526
" Supply a datestamp to select the first revision that matches the date.\n"
13527
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13528
" Matches the first entry after a given date (either at midnight or\n"
13529
" at a specified time)."
13530
msgstr ""
13531
13532
#: en/help_topics/revisionspec.txt:105
13533
msgid " One way to display all the changes since yesterday would be::"
13534
msgstr ""
13535
13536
#: en/help_topics/revisionspec.txt:107
13537
msgid " bzr log -r date:yesterday.."
13538
msgstr ""
13539
13540
#: en/help_topics/revisionspec.txt:111
13541
msgid ""
13542
" date:yesterday -> select the first revision since "
13543
"yesterday\n"
13544
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13545
" August 14th, 2006 at 5:10pm."
13546
msgstr ""
13547
13548
#: en/help_topics/revisionspec.txt:115
13549
msgid ":branch:"
13550
msgstr ""
13551
13552
#: en/help_topics/revisionspec.txt:117
13553
msgid " Supply the path to a branch to select its last revision."
13554
msgstr ""
13555
13556
#: en/help_topics/revisionspec.txt:121
13557
msgid " branch:/path/to/branch"
13558
msgstr ""
13559
13560
#: en/help_topics/revisionspec.txt:123
13561
msgid ":tag:"
13562
msgstr ""
13563
13564
#: en/help_topics/revisionspec.txt:125
13565
msgid " Tags are stored in the branch and created by the 'tag' command."
13566
msgstr ""
13567
13568
#: en/help_topics/revisionspec.txt:127
13569
msgid ":revno:"
13570
msgstr ""
13571
13572
#: en/help_topics/revisionspec.txt:129
13573
msgid ""
13574
" Use an integer to specify a revision in the history of the branch.\n"
13575
" Optionally a branch can be specified. A negative number will count\n"
13576
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13577
" one). If the negative number is larger than the branch's history, the\n"
13578
" first revision is returned.\n"
13579
" Examples::"
13580
msgstr ""
13581
13582
#: en/help_topics/revisionspec.txt:136
13583
msgid ""
13584
" revno:1 -> return the first revision of this branch\n"
13585
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13586
" the branch '/path/to/branch'\n"
13587
" revno:-1 -> The last revision in a branch.\n"
13588
" -2:http://other/branch -> The second to last revision in the\n"
13589
" remote branch.\n"
13590
" -1000000 -> Most likely the first revision, unless\n"
13591
" your history is very long."
13592
msgstr ""
13593
13594
#: en/help_topics/revisionspec.txt:145
13595
msgid ":before:"
13596
msgstr ""
13597
13598
#: en/help_topics/revisionspec.txt:147
13599
msgid ""
13600
" Supply any revision spec to return the parent of that revision. This "
13601
"is\n"
13602
" mostly useful when inspecting revisions that are not in the revision "
13603
"history\n"
13604
" of a branch."
13605
msgstr ""
13606
13607
#: en/help_topics/revisionspec.txt:151
13608
msgid ""
13609
" It is an error to request the parent of the null revision (before:0)."
13610
msgstr ""
13611
13612
#: en/help_topics/revisionspec.txt:155
13613
msgid ""
13614
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13615
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13616
" aaaa@bbbb-1234567890\n"
13617
" bzr diff -r before:1913..1913\n"
13618
" -> Find the changes between revision 1913 and its parent "
13619
"(1912).\n"
13620
" (What changes did revision 1913 introduce).\n"
13621
" This is equivalent to: bzr diff -c 1913"
13622
msgstr ""
13623
13624
#: en/help_topics/revisionspec.txt:163
13625
msgid ":annotate:"
13626
msgstr ""
13627
13628
#: en/help_topics/revisionspec.txt:165
13629
msgid ""
13630
" Select the revision that last modified the specified line. Line is\n"
13631
" specified as path:number. Path is a relative path to the file. "
13632
"Numbers\n"
13633
" start at 1, and are relative to the current version, not the last-\n"
13634
" committed version of the file."
13635
msgstr ""
13636
13637
#: en/help_topics/revisionspec.txt:170
13638
msgid ":mainline:"
13639
msgstr ""
13640
13641
#: en/help_topics/revisionspec.txt:172
13642
msgid ""
13643
" Select the revision that merged the specified revision into mainline."
13644
msgstr ""
13645
13646
#: en/help_topics/revisionspec.txt:174
13647
msgid ":last:"
13648
msgstr ""
13649
13650
#: en/help_topics/revisionspec.txt:176
13651
msgid ""
13652
" Supply a positive number to get the nth revision from the end.\n"
13653
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13654
" Examples::"
13655
msgstr ""
13656
13657
#: en/help_topics/revisionspec.txt:180
13658
msgid ""
13659
" last:1 -> return the last revision\n"
13660
" last:3 -> return the revision 2 before the end.\n"
13661
msgstr ""
13662
13663
#: en/help_topics/rules.txt:1
13664
msgid ""
13665
"Rules\n"
13666
"====="
13667
msgstr ""
13668
13669
#: en/help_topics/rules.txt:7
13670
msgid ""
13671
"Rules are defined in ini file format where the sections are file glob\n"
13672
"patterns and the contents of each section are the preferences for files\n"
13673
"matching that pattern(s). For example::"
13674
msgstr ""
13675
13676
#: en/help_topics/rules.txt:11
13677
msgid ""
13678
" [name *.bat]\n"
13679
" eol = native"
13680
msgstr ""
13681
13682
#: en/help_topics/rules.txt:14
13683
msgid ""
13684
" [name *.html *.xml]\n"
13685
" keywords = xml_escape"
13686
msgstr ""
13687
13688
#: en/help_topics/rules.txt:17
13689
msgid ""
13690
"Preferences like these are useful for commands and plugins wishing to\n"
13691
"provide custom behaviour for selected files. For more information on \n"
13692
"end of line conversion see :doc:`eol-help`.\n"
13693
"Keyword support is provided by the `keywords plugin\n"
13694
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13695
msgstr ""
13696
13697
#: en/help_topics/rules.txt:23
13698
msgid ""
13699
"Files\n"
13700
"-----"
13701
msgstr ""
13702
13703
#: en/help_topics/rules.txt:26
13704
msgid ""
13705
"Default rules for all branches are defined in the optional file\n"
13706
"``BZR_HOME/rules``. "
13707
msgstr ""
13708
13709
#: en/help_topics/rules.txt:29
13710
msgid ""
13711
"Rule Patterns\n"
13712
"-------------"
13713
msgstr ""
13714
13715
#: en/help_topics/rules.txt:32
13716
msgid ""
13717
"Patterns are ordered and searching stops as soon as one matches.\n"
13718
"As a consequence, more explicit patterns should be placed towards\n"
13719
"the top of the file. Rule patterns use exactly the same conventions\n"
13720
"as ignore patterns. See :doc:`patterns-help` for details."
13721
msgstr ""
13722
13723
#: en/help_topics/rules.txt:37
13724
msgid ".. note::"
13725
msgstr ""
13726
13727
#: en/help_topics/rules.txt:39
13728
msgid ""
13729
" Patterns containing square brackets or spaces should be\n"
13730
" surrounded in quotes to ensure they are correctly parsed.\n"
13731
msgstr ""
13732
13733
#: en/help_topics/topics.txt:1
13734
msgid ""
13735
"authentication Information on configuring authentication\n"
13736
"basic Basic commands\n"
13737
"branches Information on what a branch is\n"
13738
"bugs Bug tracker settings\n"
13739
"checkouts Information on what a checkout is\n"
13740
"commands Basic help for all commands\n"
13741
"configuration Details on the configuration settings available\n"
13742
"conflict-types Types of conflicts and what to do about them\n"
13743
"content-filters Conversion of content into/from working trees\n"
13744
"criss-cross Information on criss-cross merging\n"
13745
"current-formats Current storage formats\n"
13746
"debug-flags Options to show or record debug information\n"
13747
"diverged-branches How to fix diverged branches\n"
13748
"env-variables Environment variable names and values\n"
13749
"eol Information on end-of-line handling\n"
13750
"files Information on configuration and log files\n"
13751
"formats Information on choosing a storage format\n"
13752
"global-options Options that control how Bazaar runs\n"
13753
"hidden-commands All hidden commands\n"
13754
"hooks Points at which custom processing can be added\n"
13755
"launchpad Using Bazaar with Launchpad.net\n"
13756
"location-alias Aliases for remembered locations\n"
13757
"log-formats Details on the logging formats available\n"
13758
"other-formats Experimental and deprecated storage formats\n"
13759
"patterns Information on the pattern syntax\n"
13760
"repositories Basic information on shared repositories.\n"
13761
"revisionspec Explain how to use --revision\n"
13762
"rules Information on defining rule-based preferences\n"
13763
"standalone-trees Information on what a standalone tree is\n"
13764
"standard-options Options that can be used with any command\n"
13765
"status-flags Help on status flags\n"
13766
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13767
"topics Topics list\n"
13768
"url-special-chars Special character handling in URLs\n"
13769
"urlspec Supported transport protocols\n"
13770
"working-trees Information on working trees\n"
13771
msgstr ""
13772
13773
#: en/help_topics/url-special-chars.txt:1
13774
msgid ""
13775
"Special character handling in URLs\n"
13776
"=================================="
13777
msgstr ""
13778
13779
#: en/help_topics/url-special-chars.txt:4
13780
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13781
msgstr ""
13782
13783
#: en/help_topics/url-special-chars.txt:6
13784
msgid " * Fully qualified URLs"
13785
msgstr ""
13786
13787
#: en/help_topics/url-special-chars.txt:8
13788
msgid " * File system paths, relative or absolute"
13789
msgstr ""
13790
13791
#: en/help_topics/url-special-chars.txt:10
13792
msgid ""
13793
"Internally bzr treats all locations as URLs. For any file system paths\n"
13794
"that are specified it will automatically determine the appropriate URL\n"
13795
"representation, and escape special characters where necessary."
13796
msgstr ""
13797
13798
#: en/help_topics/url-special-chars.txt:14
13799
msgid ""
13800
"There are a few characters which have special meaning in URLs and need "
13801
"careful\n"
13802
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13803
"value in URLs. Any non-ASCII characters in a file path will automatically "
13804
"be\n"
13805
"urlencoded when the path is converted to a URL."
13806
msgstr ""
13807
13808
#: en/help_topics/url-special-chars.txt:19
13809
msgid ""
13810
"URLs represent non-ASCII characters in an encoding defined by the server, "
13811
"but\n"
13812
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13813
"be\n"
13814
"generous in what it accepts as a URL and to print them in a way that\n"
13815
"will be readable."
13816
msgstr ""
13817
13818
#: en/help_topics/url-special-chars.txt:24
13819
msgid ""
13820
"For example, if you have a directory named '/tmp/%2False' these are all "
13821
"valid\n"
13822
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13823
"slash)::"
13824
msgstr ""
13825
13826
#: en/help_topics/url-special-chars.txt:27
13827
msgid ""
13828
" cd /tmp\n"
13829
" bzr log /tmp/%2False\n"
13830
" bzr log %2False\n"
13831
" bzr log file:///tmp/%252False\n"
13832
" bzr log file://localhost/tmp/%252False\n"
13833
" bzr log file:%252False"
13834
msgstr ""
13835
13836
#: en/help_topics/url-special-chars.txt:34
13837
msgid "These are valid but do not refer to the same file::"
13838
msgstr ""
13839
13840
#: en/help_topics/url-special-chars.txt:36
13841
msgid ""
13842
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13843
" bzr log %252False (refers to a file called /tmp/%252False)"
13844
msgstr ""
13845
13846
#: en/help_topics/url-special-chars.txt:39
13847
msgid ""
13848
"Comma also has special meaning in URLs, because it denotes `segment "
13849
"parameters`_"
13850
msgstr ""
13851
13852
#: en/help_topics/url-special-chars.txt:41
13853
msgid ""
13854
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13855
msgstr ""
13856
13857
#: en/help_topics/url-special-chars.txt:43
13858
msgid ""
13859
"Comma is also special in any file system paths that are specified. To use a "
13860
"literal\n"
13861
"comma in a file system path, specify a URL and URL encode the comma::"
13862
msgstr ""
13863
13864
#: en/help_topics/url-special-chars.txt:46
13865
msgid ""
13866
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13867
"\"branch\" set to \"bla\"\n"
13868
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13869
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13870
"\"branch\" set to \"bla\"\n"
13871
msgstr ""
13872
13873
#: en/help_topics/urlspec.txt:1
13874
msgid "URL Identifiers"
13875
msgstr ""
13876
13877
#: en/help_topics/urlspec.txt:3
13878
msgid "Supported URL prefixes::"
13879
msgstr ""
13880
13881
#: en/help_topics/urlspec.txt:5
13882
msgid ""
13883
" aftp:// Access using active FTP.\n"
13884
" bzr:// Fast access using the Bazaar smart server.\n"
13885
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13886
" file:// Access using the standard filesystem (default)\n"
13887
" ftp:// Access using passive FTP.\n"
13888
" http:// Read-only access of branches exported on the web.\n"
13889
" https:// Read-only access of branches exported on the web using "
13890
"SSL.\n"
13891
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13892
msgstr ""
13893
13894
#: en/help_topics/urlspec.txt:14
13895
msgid "Supported modifiers::"
13896
msgstr ""
13897
13898
#: en/help_topics/urlspec.txt:16
13899
msgid " gio+ Access using any GIO supported protocols."
13900
msgstr ""
13901
13902
#: en/help_topics/urlspec.txt:18
13903
msgid "Bazaar supports all of the standard parts within the URL::"
13904
msgstr ""
13905
13906
#: en/help_topics/urlspec.txt:20
13907
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13908
msgstr ""
13909
13910
#: en/help_topics/urlspec.txt:22
13911
msgid "allowing URLs such as::"
13912
msgstr ""
13913
13914
#: en/help_topics/urlspec.txt:24
13915
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13916
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13917
13918
#: en/help_topics/urlspec.txt:26
13919
msgid ""
13920
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13921
"with '~' as meaning that the rest of the path should be interpreted\n"
13922
"relative to the remote user's home directory. For example if the user\n"
13923
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13924
"shell.example.com, then::"
13925
msgstr ""
13926
13927
#: en/help_topics/urlspec.txt:32
13928
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13929
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13930
13931
#: en/help_topics/urlspec.txt:34
13932
msgid "would refer to ``/home/remote/myproject/trunk``."
13933
msgstr ""
13934
13935
#: en/help_topics/urlspec.txt:36
13936
msgid ""
13937
"Many commands that accept URLs also accept location aliases too.\n"
13938
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13939
msgstr ""
13940
13941
#~ msgid ""
13942
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
13943
#~ "delete them if they can easily be recovered using revert otherwise they\n"
13944
#~ "will be backed up (adding an extention of the form .~#~). If no options or\n"
13945
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
13946
#~ "Bazaar but missing in your tree and stop tracking them for you."
13947
#~ msgstr ""
13948
#~ "Прекращает отслеживание изменений в указанных файлах. Bazaar удалит их,\n"
13949
#~ "если их можно легко восстановить с помощью revert, иначе будут созданы\n"
13950
#~ "их резервные копии (с расширением вида .~#~). Если не указано ни опций,\n"
13951
#~ "ни параметров, Bazaar найдёт файлы, которые отслеживаются, но отсутствуют\n"
13952
#~ "в рабочем дереве и прекратит их отслеживать."
Loggerhead is a web-based interface for Breezy
Version: 2.0.1