« back to all changes in this revision
Viewing changes to po/ru.po
- browse files at revision 6093.4.177
- compare with another revision
- download diff
- download tarball
- view history from revision 6093.4.177
- Committer: Launchpad Translations on behalf of bzr-core
- Date: 2012-12-17 04:30:37 UTC
- mto: (6581.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: launchpad_translations_on_behalf_of_bzr-core-20121217043037-gdkzkow6s9fsa4o0
Launchpad automatic translations update.
- files added:
- po/el.po
- files removed:
- bzrlib/_termcolor.py
- bzrlib/plugins/grep
- files modified:
- .bzrignore
added
removed
po/ru.po
1
1
# Russian translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5
5
#
6
6
msgid ""
7
7
msgstr ""
8
8
"Project-Id-Version: bzr\n"
9
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2012-01-21 16:45+0000\n"
12
"Last-Translator: Sergey Basalaev <SBasalaev@gmail.com>\n"
13
13
"Language-Team: Russian <ru@li.org>\n"
14
14
"MIME-Version: 1.0\n"
15
15
"Content-Type: text/plain; charset=UTF-8\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
17
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18
18
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19
"X-Launchpad-Export-Date: 2012-02-04 06:20+0000\n"
20
"X-Generator: Launchpad (build 14738)\n"
19
"X-Launchpad-Export-Date: 2012-07-11 04:33+0000\n"
20
"X-Generator: Launchpad (build 15593)\n"
21
21
22
#: bzrlib/add.py:95
22
#: bzrlib/add.py:93
23
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
24
24
msgstr "пропуск {0} (более, чем {1} из {2} байт)"
25
25
26
#: bzrlib/branch.py:872
26
#: bzrlib/branch.py:854
27
27
msgid "Unstacking"
28
28
msgstr "Извлечение из стека"
29
29
30
#: bzrlib/branch.py:3205
30
#: bzrlib/branch.py:2955
31
31
#, python-format
32
32
msgid "Pushed up to revision %d."
33
33
msgstr "Отправлено до ревизии %d включительно."
34
34
35
#: bzrlib/branch.py:3207
35
#: bzrlib/branch.py:2957
36
36
#, python-format
37
37
msgid "%d tag updated."
38
38
msgid_plural "%d tags updated."
40
40
msgstr[1] "%d тега обновлено."
41
41
msgstr[2] "%d тегов обновлено."
42
42
43
#: bzrlib/branch.py:3210
43
#: bzrlib/branch.py:2960
44
44
msgid "No new revisions or tags to push."
45
45
msgstr "Нет новых ревизий или тегов для отправки."
46
46
47
#: bzrlib/branch.py:3212
47
#: bzrlib/branch.py:2962
48
48
msgid "No new revisions to push."
49
49
msgstr "Нет новых ревизий для отправки."
50
50
51
#: bzrlib/branch.py:3232
51
#: bzrlib/branch.py:2982
52
52
msgid "checked branch {0} format {1}"
53
53
msgstr "проверена ветвь {0} формата {1}"
54
54
55
#: bzrlib/branch.py:3235
55
#: bzrlib/branch.py:2985
56
56
#, python-format
57
57
msgid "found error:%s"
58
58
msgstr "обнаружена ошибка:%s"
59
59
60
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
60
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
61
61
#, python-format
62
62
msgid "Ignoring files outside view. View is %s"
63
63
msgstr "Игнорируются файлы вне окна просмотра. Окно просмотра: %s"
64
64
65
#: bzrlib/builtins.py:218
65
#: bzrlib/builtins.py:260
66
66
#, python-format
67
67
msgid "bzr %s --revision takes exactly one revision identifier"
68
68
msgstr "bzr %s --revision принимает ровно один идентификатор ревизии"
69
69
70
#: bzrlib/builtins.py:303
70
#: bzrlib/builtins.py:315
71
71
msgid "Display status summary."
72
72
msgstr "Отобразить краткое описание состояния."
73
73
74
#: bzrlib/builtins.py:305
74
#: bzrlib/builtins.py:317
75
75
msgid ""
76
76
"This reports on versioned and unknown files, reporting them\n"
77
77
"grouped by state. Possible states are:"
79
79
"Эта команда сообщает о файлах с версиями и неизвестных файлах,\n"
80
80
"группируя их по состоянию. Возможные состояния:"
81
81
82
#: bzrlib/builtins.py:308
82
#: bzrlib/builtins.py:320
83
83
msgid ""
84
84
"added\n"
85
85
" Versioned in the working copy but not in the previous revision."
88
88
" Имеют версию в рабочей копии, но отсутствуют в предыдущей\n"
89
89
" ревизии."
90
90
91
#: bzrlib/builtins.py:311
91
#: bzrlib/builtins.py:323
92
92
msgid ""
93
93
"removed\n"
94
94
" Versioned in the previous revision but removed or deleted\n"
98
98
" Имеют версию в предыдущей ревизии но исключены или удалены\n"
99
99
" в рабочей копии."
100
100
101
#: bzrlib/builtins.py:315
101
#: bzrlib/builtins.py:327
102
102
msgid ""
103
103
"renamed\n"
104
104
" Path of this file changed from the previous revision;\n"
110
110
" текст также мог измениться. Это состояние включает\n"
111
111
" файлы, родительская директория которых была переименована."
112
112
113
#: bzrlib/builtins.py:320
113
#: bzrlib/builtins.py:332
114
114
msgid ""
115
115
"modified\n"
116
116
" Text has changed since the previous revision."
118
118
"изменены\n"
119
119
" Текст изменился с предыдущей ревизии."
120
120
121
#: bzrlib/builtins.py:323
121
#: bzrlib/builtins.py:335
122
122
msgid ""
123
123
"kind changed\n"
124
124
" File kind has been changed (e.g. from file to directory)."
126
126
"изменили вид\n"
127
127
" Вид файла изменился (например, файл стал директорией)."
128
128
129
#: bzrlib/builtins.py:326
129
#: bzrlib/builtins.py:338
130
130
msgid ""
131
131
"unknown\n"
132
132
" Not versioned and not matching an ignore pattern."
134
134
"неизвестны\n"
135
135
" Не имеют версии и не подходят под шаблон игнориируемых файлов."
136
136
137
#: bzrlib/builtins.py:329
137
#: bzrlib/builtins.py:341
138
138
msgid ""
139
139
"Additionally for directories, symlinks and files with a changed\n"
140
140
"executable bit, Bazaar indicates their type using a trailing\n"
146
146
"в конец имени символы: '/', '@' или '*' соответственно. Эти\n"
147
147
"декорации можно убрать, используя опцию '--no-classify'."
148
148
149
#: bzrlib/builtins.py:334
149
#: bzrlib/builtins.py:346
150
150
msgid ""
151
151
"To see ignored files use 'bzr ignored'. For details on the\n"
152
152
"changes to file texts, use 'bzr diff'."
154
154
"Чтобы просмотреть игнорируемые файлы, используйте 'bzr ignored'.\n"
155
155
"Изменения текста файлов можно увидеть, используя 'bzr diff'."
156
156
157
#: bzrlib/builtins.py:337
157
#: bzrlib/builtins.py:349
158
158
msgid ""
159
159
"Note that --short or -S gives status flags for each item, similar\n"
160
160
"to Subversion's status command. To get output similar to svn -q,\n"
164
164
"подобный команде Subversion status. Чтобы получить вывод, похожий\n"
165
165
"на svn -q, используйте bzr status -SV."
166
166
167
#: bzrlib/builtins.py:341
167
#: bzrlib/builtins.py:353
168
168
msgid ""
169
169
"If no arguments are specified, the status of the entire working\n"
170
170
"directory is shown. Otherwise, only the status of the specified\n"
176
176
"Если указана директория, то выводится состояние всех файлов внутри\n"
177
177
"этой директории."
178
178
179
#: bzrlib/builtins.py:346
179
#: bzrlib/builtins.py:358
180
180
msgid ""
181
181
"Before merges are committed, the pending merge tip revisions are\n"
182
182
"shown. To see all pending merge revisions, use the -v option.\n"
188
188
"Чтобы полностью пропустить отображение информации о слиянии,\n"
189
189
"используйте опцию no-pending либо укажите файл или директорию."
190
190
191
#: bzrlib/builtins.py:351
191
#: bzrlib/builtins.py:363
192
192
msgid ""
193
193
"To compare the working directory to a specific revision, pass a\n"
194
194
"single revision to the revision argument."
196
196
"Чтобы сравнить рабочую копию с определённой ревизией, укажите\n"
197
197
"ревизию в соответствующем аргументе."
198
198
199
#: bzrlib/builtins.py:354
199
#: bzrlib/builtins.py:366
200
200
msgid ""
201
201
"To see which files have changed in a specific revision, or between\n"
202
202
"two revisions, pass a revision range to the revision argument.\n"
206
206
"между двумя ревизиями, укажите в аргументе ревизии интервал.\n"
207
207
"Это даёт такой же результат, как вызов 'bzr diff --summarize'."
208
208
209
#: bzrlib/builtins.py:363
209
#: bzrlib/builtins.py:375
210
210
msgid "Use short status indicators."
211
211
msgstr "Использовать короткие статусные пометки."
212
212
213
#: bzrlib/builtins.py:365
213
#: bzrlib/builtins.py:377
214
214
msgid "Only show versioned files."
215
215
msgstr "Показывать только файлы, имеющие версию."
216
216
217
#: bzrlib/builtins.py:367
217
#: bzrlib/builtins.py:379
218
218
msgid "Don't show pending merges."
219
219
msgstr "Не показывать необработанные слияния."
220
220
221
#: bzrlib/builtins.py:370
221
#: bzrlib/builtins.py:382
222
222
msgid "Do not mark object type using indicator."
223
223
msgstr "Не помечать типы объектов суффиксами."
224
224
225
#: bzrlib/builtins.py:385
225
#: bzrlib/builtins.py:397
226
226
msgid "bzr status --revision takes exactly one or two revision specifiers"
227
227
msgstr ""
228
228
"bzr status --revision принимает ровно один или два идентификатора ревизии"
229
229
230
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
230
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
231
231
msgid "You can only supply one of revision_id or --revision"
232
232
msgstr "Вы можете указать только одно из revision_id или --revision"
233
233
234
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
234
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
235
235
msgid "You must supply either --revision or a revision_id"
236
236
msgstr "Вы должны предоставить --revision или revision_id"
237
237
238
#: bzrlib/builtins.py:439
238
#: bzrlib/builtins.py:451
239
239
#, python-format
240
240
msgid "Repository %r does not support access to raw revision texts"
241
241
msgstr "Репозиторий %r не поддерживает прямой доступ к текстам ревизий"
242
242
243
#: bzrlib/builtins.py:450
243
#: bzrlib/builtins.py:462
244
244
msgid "The repository {0} contains no revision {1}."
245
245
msgstr "Репозиторий {0} не содержит ревизии {1}."
246
246
247
#: bzrlib/builtins.py:457
247
#: bzrlib/builtins.py:469
248
248
msgid "You cannot specify a NULL revision."
249
249
msgstr "Вы не можете указать ревизию NULL."
250
250
251
#: bzrlib/builtins.py:549
251
#: bzrlib/builtins.py:561
252
252
msgid "Remove the working tree from a given branch/checkout."
253
253
msgstr "Удалить рабочее дерево из данной ветви или рабочей копии."
254
254
255
#: bzrlib/builtins.py:551
255
#: bzrlib/builtins.py:563
256
256
msgid ""
257
257
"Since a lightweight checkout is little more than a working tree\n"
258
258
"this will refuse to run against one."
260
260
"Поскольку легковесная рабочая копия, это нечто большее, чем рабочее\n"
261
261
"дерево, эту команду нельзя выполнить внутри неё."
262
262
263
#: bzrlib/builtins.py:554
263
#: bzrlib/builtins.py:566
264
264
msgid "To re-create the working tree, use \"bzr checkout\"."
265
265
msgstr "Чтобы воссоздать рабочее дерево, используйте «bzr checkout»."
266
266
267
#: bzrlib/builtins.py:560
267
#: bzrlib/builtins.py:572
268
268
msgid ""
269
269
"Remove the working tree even if it has uncommitted or shelved changes."
270
270
msgstr ""
271
271
"Удалить рабочее дерево даже, если оно содержит незакреплённые или отложенные "
272
272
"изменения."
273
273
274
#: bzrlib/builtins.py:574
274
#: bzrlib/builtins.py:586
275
275
msgid "No working tree to remove"
276
276
msgstr "Нет рабочего дерева для удаления"
277
277
278
#: bzrlib/builtins.py:576
278
#: bzrlib/builtins.py:588
279
279
msgid "You cannot remove the working tree of a remote path"
280
280
msgstr "Вы не можете удалить внешнее рабочее дерево"
281
281
282
#: bzrlib/builtins.py:585
282
#: bzrlib/builtins.py:597
283
283
msgid "You cannot remove the working tree from a lightweight checkout"
284
284
msgstr "Вы не можете удалить рабочее дерево из легковесной рабочей копии"
285
285
286
#: bzrlib/builtins.py:625
286
#: bzrlib/builtins.py:637
287
287
msgid ""
288
288
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
289
289
"instead. Use \"--force\" if you are sure you want to reset the working tree."
291
291
"Дерево не повреждено. Возможно, вы хотели выполнить «bzr revert». "
292
292
"Используйте «--force», если вы уверены, что хотите использовать reset."
293
293
294
#: bzrlib/builtins.py:636
294
#: bzrlib/builtins.py:648
295
295
msgid ""
296
296
", the header appears corrupt, try passing -r -1 to set the state to the last "
297
297
"commit"
299
299
", заголовок повреждён, попробуйте использовать аргумент -r -1, чтобы "
300
300
"сбросить состояние до предыдущего закрепления"
301
301
302
#: bzrlib/builtins.py:640
302
#: bzrlib/builtins.py:652
303
303
msgid "failed to reset the tree state{0}"
304
304
msgstr "не удалось сбросить состояние дерева {0}"
305
305
306
#: bzrlib/builtins.py:644
306
#: bzrlib/builtins.py:656
307
307
msgid "Show current revision number."
308
308
msgstr "Показать номер текущей ревизии."
309
309
310
#: bzrlib/builtins.py:646
310
#: bzrlib/builtins.py:658
311
311
msgid "This is equal to the number of revisions on this branch."
312
312
msgstr "Это эквивалентно числу ревизий в этой ветви."
313
313
314
#: bzrlib/builtins.py:659
314
#: bzrlib/builtins.py:671
315
315
msgid "--tree and --revision can not be used together"
316
316
msgstr "--tree и --revision не могут использоваться вместе"
317
317
318
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
318
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
319
319
msgid "Tags can only be placed on a single revision, not on a range"
320
320
msgstr "Тегом можно пометить только отдельную ревизию, не интервал"
321
321
322
#: bzrlib/builtins.py:700
322
#: bzrlib/builtins.py:712
323
323
msgid "Show revno of working tree."
324
324
msgstr "Показать номер ревизии рабочего дерева."
325
325
326
#: bzrlib/builtins.py:748
326
#: bzrlib/builtins.py:760
327
327
msgid "Add specified files or directories."
328
328
msgstr "Добавить указанные файлы или директории."
329
329
330
#: bzrlib/builtins.py:750
330
#: bzrlib/builtins.py:762
331
331
msgid ""
332
332
"In non-recursive mode, all the named items are added, regardless\n"
333
333
"of whether they were previously ignored. A warning is given if\n"
338
338
"предупреждение, если какие-либо из указанных элементов уже были\n"
339
339
"под контролем Bazaar."
340
340
341
#: bzrlib/builtins.py:754
341
#: bzrlib/builtins.py:766
342
342
msgid ""
343
343
"In recursive mode (the default), files are treated the same way\n"
344
344
"but the behaviour for directories is different. Directories that\n"
357
357
"Этот поиск входит рекурсивно в директории, имеющие версию.\n"
358
358
"Если не указано ни одного имени, предполагается '.'."
359
359
360
#: bzrlib/builtins.py:762
360
#: bzrlib/builtins.py:774
361
361
msgid ""
362
362
"A warning will be printed when nested trees are encountered,\n"
363
363
"unless they are explicitly ignored."
365
365
"Предупреждение будет напечатано для каждого встреченного вложенного\n"
366
366
"дерева, если только оно не игнорируется явно."
367
367
368
#: bzrlib/builtins.py:765
368
#: bzrlib/builtins.py:777
369
369
msgid ""
370
370
"Therefore simply saying 'bzr add' will version all files that\n"
371
371
"are currently unknown."
373
373
"Следовательно, просто вызов 'bzr add' добавит к системе контроля\n"
374
374
"версий все файлы, которые ей неизвестны."
375
375
376
#: bzrlib/builtins.py:768
376
#: bzrlib/builtins.py:780
377
377
msgid ""
378
378
"Adding a file whose parent directory is not versioned will\n"
379
379
"implicitly add the parent, and so on up to the root. This means\n"
385
385
"вам никогда не нужно явно добавлять директорию, они добавляются\n"
386
386
"автоматически, когда вы добавляете файлы."
387
387
388
#: bzrlib/builtins.py:773
388
#: bzrlib/builtins.py:785
389
389
msgid ""
390
390
"--dry-run will show which files would be added, but not actually\n"
391
391
"add them."
393
393
"--dry-run покажет, какие файлы будут добавлены, но не будет их\n"
394
394
"добавлять."
395
395
396
#: bzrlib/builtins.py:776
396
#: bzrlib/builtins.py:788
397
397
msgid ""
398
398
"--file-ids-from will try to use the file ids from the supplied path.\n"
399
399
"It looks up ids trying to find a matching parent directory with the\n"
413
413
"Это также полезно при помещении другого проекта, как поддиректории\n"
414
414
"данного."
415
415
416
#: bzrlib/builtins.py:784
416
#: bzrlib/builtins.py:796
417
417
msgid ""
418
418
"Any files matching patterns in the ignore list will not be added\n"
419
419
"unless they are explicitly mentioned."
421
421
"Любые файлы, удовлетворяющие шаблонам в списке ignore не будут\n"
422
422
"добавлены, если их не указать явно."
423
423
424
#: bzrlib/builtins.py:787
424
#: bzrlib/builtins.py:799
425
425
msgid ""
426
426
"In recursive mode, files larger than the configuration option \n"
427
427
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
431
431
"add.maximum_file_size, будут пропущены. Явно названные элементы\n"
432
432
"никогда не будут пропущены по этому критерию."
433
433
434
#: bzrlib/builtins.py:794
434
#: bzrlib/builtins.py:806
435
435
msgid "Don't recursively add the contents of directories."
436
436
msgstr "Не добавлять содержимое директорий рекурсивно."
437
437
438
#: bzrlib/builtins.py:800
438
#: bzrlib/builtins.py:813
439
439
msgid "Lookup file ids from this tree."
440
440
msgstr "Искать идентификаторы в этом дереве."
441
441
442
#: bzrlib/builtins.py:836
442
#: bzrlib/builtins.py:849
443
443
msgid "ignored {0} matching \"{1}\"\n"
444
444
msgstr "пропуск {0} из-за условия «{1}»\n"
445
445
446
#: bzrlib/builtins.py:841
446
#: bzrlib/builtins.py:854
447
447
msgid "Create a new versioned directory."
448
448
msgstr "Создать новую директорию в системе версий."
449
449
450
#: bzrlib/builtins.py:843
450
#: bzrlib/builtins.py:856
451
451
msgid "This is equivalent to creating the directory and then adding it."
452
452
msgstr "Это эквивалентно созданию директории и её добавлению."
453
453
454
#: bzrlib/builtins.py:850
454
#: bzrlib/builtins.py:863
455
455
msgid "No error if existing, make parent directories as needed."
456
456
msgstr ""
457
457
"Не выводить ошибку, если существует, создавать родительские директории при "
458
458
"необходимости."
459
459
460
#: bzrlib/builtins.py:884
460
#: bzrlib/builtins.py:897
461
461
#, python-format
462
462
msgid "added %s\n"
463
463
msgstr "добавлен %s\n"
464
464
465
#: bzrlib/builtins.py:926
465
#: bzrlib/builtins.py:939
466
466
#, python-format
467
467
msgid "invalid kind %r specified"
468
468
msgstr "указан неизвестный вид %r"
469
469
470
#: bzrlib/builtins.py:963
470
#: bzrlib/builtins.py:976
471
471
msgid "Move or rename a file."
472
472
msgstr "Переместить или переименовать файл."
473
473
474
#: bzrlib/builtins.py:965
474
#: bzrlib/builtins.py:978
475
475
msgid " bzr mv SOURCE... DESTINATION"
476
476
msgstr " bzr mv ИСТОЧНИК... НАЗНАЧЕНИЕ"
477
477
478
#: bzrlib/builtins.py:967
478
#: bzrlib/builtins.py:980
479
479
msgid ""
480
480
"If the last argument is a versioned directory, all the other names\n"
481
481
"are moved into it. Otherwise, there must be exactly two arguments\n"
485
485
"все остальные имена перемещаются в неё. Иначе, должно быть указано\n"
486
486
"ровно два аргумента, и файл переименовывается."
487
487
488
#: bzrlib/builtins.py:971
488
#: bzrlib/builtins.py:984
489
489
msgid ""
490
490
"If OLDNAME does not exist on the filesystem but is versioned and\n"
491
491
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
499
499
"свои внутренние структуры, чтобы отразить это изменение.\n"
500
500
"Тоже верно и при перемещении многих ИСТОЧНИКов в НАЗНАЧЕНИЕ."
501
501
502
#: bzrlib/builtins.py:977
502
#: bzrlib/builtins.py:990
503
503
msgid "Files cannot be moved between branches."
504
504
msgstr "Файлы нельзя перемещать между ветвями."
505
505
506
#: bzrlib/builtins.py:984
506
#: bzrlib/builtins.py:997
507
507
msgid ""
508
508
"Move only the bzr identifier of the file, because the file has already been "
509
509
"moved."
511
511
"Переместить только bzr-идентификатор файла, поскольку сам файл уже был "
512
512
"перемещён."
513
513
514
#: bzrlib/builtins.py:986
514
#: bzrlib/builtins.py:999
515
515
msgid "Automatically guess renames."
516
516
msgstr "Автоматически предполагать переименования."
517
517
518
#: bzrlib/builtins.py:987
518
#: bzrlib/builtins.py:1000
519
519
msgid "Avoid making changes when guessing renames."
520
520
msgstr "Избегать изменений при угадывании переименований."
521
521
522
#: bzrlib/builtins.py:996
522
#: bzrlib/builtins.py:1009
523
523
msgid "--dry-run requires --auto."
524
524
msgstr "--dry-run требует --auto."
525
525
526
#: bzrlib/builtins.py:1000
526
#: bzrlib/builtins.py:1013
527
527
msgid "missing file argument"
528
528
msgstr "отсутствует аргумент файл"
529
529
530
#: bzrlib/builtins.py:1004
530
#: bzrlib/builtins.py:1017
531
531
msgid "can not move root of branch"
532
532
msgstr "нельзя переместить корень ветви"
533
533
534
#: bzrlib/builtins.py:1010
534
#: bzrlib/builtins.py:1023
535
535
msgid "Only one path may be specified to --auto."
536
536
msgstr "Только один путь может быть указан, как аргумент --auto."
537
537
538
#: bzrlib/builtins.py:1013
538
#: bzrlib/builtins.py:1026
539
539
msgid "--after cannot be specified with --auto."
540
540
msgstr "--after не может использоваться вместе с --auto."
541
541
542
#: bzrlib/builtins.py:1050
542
#: bzrlib/builtins.py:1062
543
543
msgid "to mv multiple files the destination must be a versioned directory"
544
544
msgstr ""
545
545
"чтобы переместить несколько файлов, назначение должно быть директорией под "
546
546
"контролем системы версий"
547
547
548
#: bzrlib/builtins.py:1102
548
#: bzrlib/builtins.py:1114
549
549
msgid "Turn this branch into a mirror of another branch."
550
550
msgstr "Преобразовать эту ветвь в зеркало другой ветви."
551
551
552
#: bzrlib/builtins.py:1104
552
#: bzrlib/builtins.py:1116
553
553
msgid ""
554
554
"By default, this command only works on branches that have not diverged.\n"
555
555
"Branches are considered diverged if the destination branch's most recent \n"
560
560
"отклонениями. Ветвь считается отклонением, если последнее закрепление в\n"
561
561
"ветви назначения не было совмещено (явно или неявно) с родителем."
562
562
563
#: bzrlib/builtins.py:1109
563
#: bzrlib/builtins.py:1121
564
564
msgid ""
565
565
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
566
566
"from one into the other. Once one branch has merged, the other should\n"
570
570
"возвращения изменений. После совмещения ветвей, можно снова принимать\n"
571
571
"изменения из одной в другую."
572
572
573
#: bzrlib/builtins.py:1113
573
#: bzrlib/builtins.py:1125
574
574
msgid ""
575
575
"If you want to replace your local changes and just want your branch to\n"
576
576
"match the remote one, use pull --overwrite. This will work even if the two\n"
580
580
"с удалённой, используйте pull --overwrite. Это будет работать, даже если\n"
581
581
"ветвь является отклонением."
582
582
583
#: bzrlib/builtins.py:1117
583
#: bzrlib/builtins.py:1129
584
584
msgid ""
585
585
"If there is no default location set, the first pull will set it (use\n"
586
586
"--no-remember to avoid setting it). After that, you can omit the\n"
594
594
"--remember. Значение будет сохранено, только если доступ к удалённому\n"
595
595
"местоположению будет успешен."
596
596
597
#: bzrlib/builtins.py:1122
597
#: bzrlib/builtins.py:1134
598
598
msgid ""
599
599
"The --verbose option will display the revisions pulled using the log_format\n"
600
600
"configuration option. You can use a different format by overriding it with\n"
604
604
"конфигурации log_format. Вы можете использовать другой формат, перегрузив\n"
605
605
"её опцией -Olog_format=<другой_формат>."
606
606
607
#: bzrlib/builtins.py:1126
607
#: bzrlib/builtins.py:1138
608
608
msgid ""
609
609
"Note: The location can be specified either in the form of a branch,\n"
610
610
"or in the form of a path to a file containing a merge directive generated\n"
613
613
"Замечание: Местоположение можно указывать как в форме ветви, так и в\n"
614
614
"форме пути к файлу, содержащему директиву слияния, созданному bzr send."
615
615
616
#: bzrlib/builtins.py:1134
616
#: bzrlib/builtins.py:1146
617
617
msgid "Show logs of pulled revisions."
618
618
msgstr "Показать журналы принятых ревизий."
619
619
620
#: bzrlib/builtins.py:1136
620
#: bzrlib/builtins.py:1148
621
621
msgid ""
622
622
"Branch to pull into, rather than the one containing the working directory."
623
623
msgstr ""
624
624
"Принимать изменения в эту ветвь, а не в содержащую рабочую директорию."
625
625
626
#: bzrlib/builtins.py:1139
626
#: bzrlib/builtins.py:1151
627
627
msgid ""
628
628
"Perform a local pull in a bound branch. Local pulls are not applied to the "
629
629
"master branch."
631
631
"Сделать локальный приём в связанную ветвь. Локальный приём не накладывается "
632
632
"на основную ветвь."
633
633
634
#: bzrlib/builtins.py:1168
634
#: bzrlib/builtins.py:1189
635
635
msgid "Need working tree for --show-base."
636
636
msgstr "Для --show-base необходимо рабочее дерево."
637
637
638
#: bzrlib/builtins.py:1184
638
#: bzrlib/builtins.py:1205
639
639
msgid "No pull location known or specified."
640
640
msgstr "Местоположение для приёма неизвестно и не указано."
641
641
642
#: bzrlib/builtins.py:1190
642
#: bzrlib/builtins.py:1211
643
643
#, python-format
644
644
msgid "Using saved parent location: %s\n"
645
645
msgstr "Используется сохранённое местоположение родителя: %s\n"
646
646
647
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
647
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
648
648
msgid "Cannot use -r with merge directives or bundles"
649
649
msgstr "Нельзя использовать -r с директивами слияния или пакетами"
650
650
651
#: bzrlib/builtins.py:1238
651
#: bzrlib/builtins.py:1261
652
652
msgid "Update a mirror of this branch."
653
653
msgstr "Обновить зеркало этой ветви."
654
654
655
#: bzrlib/builtins.py:1240
655
#: bzrlib/builtins.py:1263
656
656
msgid ""
657
657
"The target branch will not have its working tree populated because this\n"
658
658
"is both expensive, and is not supported on remote file systems."
660
660
"Целевая ветвь не будет иметь рабочего дерева, поскольку это накладно\n"
661
661
"и не поддерживается удалёнными файловыми системами."
662
662
663
#: bzrlib/builtins.py:1243
663
#: bzrlib/builtins.py:1266
664
664
msgid ""
665
665
"Some smart servers or protocols *may* put the working tree in place in\n"
666
666
"the future."
668
668
"Некоторые умные серверы или протоколы *может быть* будут размещать\n"
669
669
"рабочее дерево в месте назначения в будущем."
670
670
671
#: bzrlib/builtins.py:1246
671
#: bzrlib/builtins.py:1269
672
672
msgid ""
673
673
"This command only works on branches that have not diverged. Branches are\n"
674
674
"considered diverged if the destination branch's most recent commit is one\n"
679
679
"закрепление в ветви назначения не было совмещено (явно или\n"
680
680
"неявно) с родителем."
681
681
682
#: bzrlib/builtins.py:1250
682
#: bzrlib/builtins.py:1273
683
683
msgid ""
684
684
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
685
685
"the other branch completely, discarding its unmerged changes."
688
688
"чтобы полностью заменить другую ветвь, убирая все её несовмещённые\n"
689
689
"изменения."
690
690
691
#: bzrlib/builtins.py:1253
691
#: bzrlib/builtins.py:1276
692
692
msgid ""
693
693
"If you want to ensure you have the different changes in the other branch,\n"
694
694
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
699
699
"изменения. После этого вы сможете делать push без необходимости указывать\n"
700
700
"опцию '--overwrite'."
701
701
702
#: bzrlib/builtins.py:1257
702
#: bzrlib/builtins.py:1280
703
703
msgid ""
704
704
"If there is no default push location set, the first push will set it (use\n"
705
705
"--no-remember to avoid setting it). After that, you can omit the\n"
713
713
"используйте опцию --remember. Значение будет сохранено, только если\n"
714
714
"доступ к удалённой локации будет успешен."
715
715
716
#: bzrlib/builtins.py:1262
716
#: bzrlib/builtins.py:1285
717
717
msgid ""
718
718
"The --verbose option will display the revisions pushed using the log_format\n"
719
719
"configuration option. You can use a different format by overriding it with\n"
723
723
"конфигурации log_format. Вы можете использовать другой формат, перегрузив\n"
724
724
"её опцией -Olog_format=<другой_формат>."
725
725
726
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
726
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
727
727
msgid ""
728
728
"Branch to push from, rather than the one containing the working directory."
729
729
msgstr "Отправлять из этой ветви, а не из содержащей рабочую директорию."
730
730
731
#: bzrlib/builtins.py:1276
731
#: bzrlib/builtins.py:1299
732
732
msgid ""
733
733
"By default push will fail if the target directory exists, but does not "
734
734
"already have a control directory. This flag will allow push to proceed."
737
737
"существует, но не содержит управляющих метаданных. Этот флаг позволит "
738
738
"отправке изменений продолжаться."
739
739
740
#: bzrlib/builtins.py:1281
740
#: bzrlib/builtins.py:1304
741
741
msgid ""
742
742
"Create a stacked branch that references the public location of the parent "
743
743
"branch."
745
745
"Создать стековую ветвь, которая ссылается на публичное местоположение "
746
746
"родительской ветви."
747
747
748
#: bzrlib/builtins.py:1284
748
#: bzrlib/builtins.py:1307
749
749
msgid ""
750
750
"Create a stacked branch that refers to another branch for the commit "
751
751
"history. Only the work not present in the referenced branch is included in "
755
755
"истории фиксаций. В созданную ветвь помещается только работа, не "
756
756
"существующая в исходной ветви."
757
757
758
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
758
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
759
759
msgid ""
760
760
"Refuse to push if there are uncommitted changes in the working tree, --no-"
761
761
"strict disables the check."
763
763
"Отказывать в отсылке изменений, если в рабочем дереве есть незакреплённые "
764
764
"изменения, --no-strict запрещает проверку."
765
765
766
#: bzrlib/builtins.py:1292
766
#: bzrlib/builtins.py:1315
767
767
msgid "Don't populate the working tree, even for protocols that support it."
768
768
msgstr ""
769
769
"Не создавать рабочее дерево, даже для протоколов, которые поддерживают это."
770
770
771
#: bzrlib/builtins.py:1336
771
#: bzrlib/builtins.py:1318
772
msgid "Overwrite tags only."
773
msgstr ""
774
775
#: bzrlib/builtins.py:1369
772
776
msgid "Could not determine branch to refer to."
773
777
msgstr "Не удалось определить ветвь, на которую нужно ссылаться."
774
778
775
#: bzrlib/builtins.py:1345
779
#: bzrlib/builtins.py:1378
776
780
#, python-format
777
781
msgid ""
778
782
"No push location known or specified. To push to the parent branch (at %s), "
779
783
"use 'bzr push :parent'."
780
784
msgstr ""
781
785
782
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
786
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
783
787
msgid "No push location known or specified."
784
788
msgstr "Местоположение для отсылки изменений неизвестно и не указано."
785
789
786
#: bzrlib/builtins.py:1355
790
#: bzrlib/builtins.py:1388
787
791
#, python-format
788
792
msgid "Using saved push location: %s"
789
793
msgstr "Используется сохранённое местоположение отсылки: %s"
790
794
791
#: bzrlib/builtins.py:1365
795
#: bzrlib/builtins.py:1398
792
796
msgid "Create a new branch that is a copy of an existing branch."
793
797
msgstr "Создать новую ветвь, являющуюся копией существующей ветви."
794
798
795
#: bzrlib/builtins.py:1367
799
#: bzrlib/builtins.py:1400
796
800
msgid ""
797
801
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
798
802
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
808
812
"из FROM_LOCATION удалением префикса. Например «branch lp:foo-bar»\n"
809
813
"попытается создать ./foo-bar."
810
814
811
#: bzrlib/builtins.py:1374
815
#: bzrlib/builtins.py:1407
812
816
msgid ""
813
817
"To retrieve the branch as of a particular revision, supply the --revision\n"
814
818
"parameter, as in \"branch foo/bar -r 5\"."
816
820
"Чтобы получить определённую ревизию ветви, передайте её в параметре\n"
817
821
"--revision, напр. «branch foo/bar -r 5»."
818
822
819
#: bzrlib/builtins.py:1377
823
#: bzrlib/builtins.py:1410
820
824
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
821
825
msgstr "Синонимы 'clone' и 'get' для этой команды устарели."
822
826
823
#: bzrlib/builtins.py:1387
827
#: bzrlib/builtins.py:1420
824
828
msgid "Create a branch without a working-tree."
825
829
msgstr "Создать ветвь без рабочего дерева."
826
830
827
#: bzrlib/builtins.py:1389
831
#: bzrlib/builtins.py:1422
828
832
msgid "Switch the checkout in the current directory to the new branch."
829
833
msgstr "Заменить рабочую копию в текущей директории новой ветвью."
830
834
831
#: bzrlib/builtins.py:1392
835
#: bzrlib/builtins.py:1425
832
836
msgid ""
833
837
"Create a stacked branch referring to the source branch. The new branch will "
834
838
"depend on the availability of the source branch for all operations."
836
840
"Создать стековую ветвь, ссылающуюся на исходную ветвь. Все операции над "
837
841
"новой ветвью будут зависеть от доступности старой ветви."
838
842
839
#: bzrlib/builtins.py:1396
843
#: bzrlib/builtins.py:1429
840
844
msgid "Do not use a shared repository, even if available."
841
845
msgstr "Не использовать общий репозиторий, даже если доступен."
842
846
843
#: bzrlib/builtins.py:1398
847
#: bzrlib/builtins.py:1431
844
848
msgid ""
845
849
"By default branch will fail if the target directory exists, but does not "
846
850
"already have a control directory. This flag will allow branch to proceed."
849
853
"существует, но не содержит управляющих метаданных. Этот флаг позволит branch "
850
854
"продолжаться."
851
855
852
#: bzrlib/builtins.py:1403
856
#: bzrlib/builtins.py:1436
853
857
msgid "Bind new branch to from location."
854
858
msgstr "Связать новую ветвь с FROM_LOCATION"
855
859
856
#: bzrlib/builtins.py:1450
860
#: bzrlib/builtins.py:1483
857
861
#, python-format
858
862
msgid "Target directory \"%s\" already exists."
859
863
msgstr "Целевая директория «%s» уже существует."
860
864
861
#: bzrlib/builtins.py:1462
865
#: bzrlib/builtins.py:1495
862
866
#, python-format
863
867
msgid "Parent of \"%s\" does not exist."
864
868
msgstr "Родитель «%s» не существует."
865
869
866
#: bzrlib/builtins.py:1481
870
#: bzrlib/builtins.py:1514
867
871
msgid "The branch {0} has no revision {1}."
868
872
msgstr "В ветви {0} отсутствует ревизия {1}."
869
873
870
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
874
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
871
875
#, python-format
872
876
msgid "Created new stacked branch referring to %s."
873
877
msgstr "Создана новая стековая ветвь, ссылающаяся на %s."
874
878
875
#: bzrlib/builtins.py:1500
879
#: bzrlib/builtins.py:1533
876
880
#, python-format
877
881
msgid "Branched %d revision."
878
882
msgid_plural "Branched %d revisions."
880
884
msgstr[1] "Ответвлены %d ревизии."
881
885
msgstr[2] "Ответвлены %d ревизий."
882
886
883
#: bzrlib/builtins.py:1505
887
#: bzrlib/builtins.py:1538
884
888
#, python-format
885
889
msgid "New branch bound to %s"
886
890
msgstr "Новая ветвь, связанная с %s"
887
891
888
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
892
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
889
893
#, python-format
890
894
msgid "Switched to branch: %s"
891
895
msgstr "Переключение на ветвь: %s"
892
896
893
#: bzrlib/builtins.py:1515
897
#: bzrlib/builtins.py:1548
894
898
msgid "List the branches available at the current location."
895
899
msgstr "Вывести список ветвей, доступных в текущем местоположении."
896
900
897
#: bzrlib/builtins.py:1517
901
#: bzrlib/builtins.py:1550
898
902
msgid ""
899
903
"This command will print the names of all the branches at the current\n"
900
904
"location."
901
905
msgstr "Эта команда выведет имена всех ветвей в текущем местоположении."
902
906
903
#: bzrlib/builtins.py:1524
907
#: bzrlib/builtins.py:1557
904
908
msgid ""
905
909
"Recursively scan for branches rather than just looking in the specified "
906
910
"location."
907
911
msgstr ""
908
912
"Рекурсивно сканировать ветви, а не смотреть в указанном местоположении."
909
913
910
#: bzrlib/builtins.py:1554
914
#: bzrlib/builtins.py:1586
911
915
msgid "(default)"
912
916
msgstr "(по умолчанию)"
913
917
914
#: bzrlib/builtins.py:1566
918
#: bzrlib/builtins.py:1598
915
919
msgid "Create a new checkout of an existing branch."
916
920
msgstr "Создать новую рабочую копию текущей ветви."
917
921
918
#: bzrlib/builtins.py:1568
922
#: bzrlib/builtins.py:1600
919
923
msgid ""
920
924
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
921
925
"for\n"
928
932
"для ветви, найденной в '.'. Это полезно, если вы удалили рабочее дерево,\n"
929
933
"или если вы никогда не создавали его."
930
934
931
#: bzrlib/builtins.py:1573
935
#: bzrlib/builtins.py:1605
932
936
msgid ""
933
937
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
934
938
"will\n"
945
949
"то TO_LOCATION определется из BRANCH_LOCATION удалением префикса.\n"
946
950
"Например «checkout lp:foo-bar» попытается создать ./foo-bar."
947
951
948
#: bzrlib/builtins.py:1580
952
#: bzrlib/builtins.py:1612
949
953
msgid ""
950
954
"To retrieve the branch as of a particular revision, supply the --revision\n"
951
955
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
959
963
"просрочено [так что в не сможете закрепить изменения], но это может быть\n"
960
964
"полезно, к примеру, для просмотра старого кода."
961
965
962
#: bzrlib/builtins.py:1590
966
#: bzrlib/builtins.py:1622
963
967
msgid ""
964
968
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
965
969
"the branch for every operation. Normal checkouts can perform common "
971
975
"производить стандартные операции, как diff и status, без такого доступа, а "
972
976
"также поддерживают локальные закрепления."
973
977
974
#: bzrlib/builtins.py:1597
978
#: bzrlib/builtins.py:1629
975
979
msgid "Get file contents from this tree."
976
980
msgstr "Получить содержимое файла из этого дерева."
977
981
978
#: bzrlib/builtins.py:1599
982
#: bzrlib/builtins.py:1631
979
983
msgid "Hard-link working tree files where possible."
980
984
msgstr "Использовать жёсткие ссылки в рабочем дереве, когда это возможно."
981
985
982
#: bzrlib/builtins.py:1640
986
#: bzrlib/builtins.py:1672
983
987
msgid ""
984
988
"Show list of renamed files.\n"
985
989
" "
987
991
"Показать список переименованных файлов.\n"
988
992
" "
989
993
990
#: bzrlib/builtins.py:1670
994
#: bzrlib/builtins.py:1700
991
995
msgid "Update a working tree to a new revision."
992
996
msgstr "Обновить рабочее дерево до новой ревизии."
993
997
994
#: bzrlib/builtins.py:1672
998
#: bzrlib/builtins.py:1702
995
999
msgid ""
996
1000
"This will perform a merge of the destination revision (the tip of the\n"
997
1001
"branch, or the specified revision) into the working tree, and then make\n"
998
1002
"that revision the basis revision for the working tree. "
999
1003
msgstr ""
1000
1004
1001
#: bzrlib/builtins.py:1676
1005
#: bzrlib/builtins.py:1706
1002
1006
msgid ""
1003
1007
"You can use this to visit an older revision, or to update a working tree\n"
1004
1008
"that is out of date from its branch."
1005
1009
msgstr ""
1006
1010
1007
#: bzrlib/builtins.py:1679
1011
#: bzrlib/builtins.py:1709
1008
1012
msgid ""
1009
1013
"If there are any uncommitted changes in the tree, they will be carried\n"
1010
1014
"across and remain as uncommitted changes after the update. To discard\n"
1012
1016
"with the changes brought in by the change in basis revision."
1013
1017
msgstr ""
1014
1018
1015
#: bzrlib/builtins.py:1684
1019
#: bzrlib/builtins.py:1714
1016
1020
msgid ""
1017
1021
"If the tree's branch is bound to a master branch, bzr will also update\n"
1018
1022
"the branch from the master."
1019
1023
msgstr ""
1020
1024
1021
#: bzrlib/builtins.py:1687
1025
#: bzrlib/builtins.py:1717
1022
1026
msgid ""
1023
1027
"You cannot update just a single file or directory, because each Bazaar\n"
1024
1028
"working tree has just a single basis revision. If you want to restore a\n"
1035
1039
"или используйте 'bzr cat', чтобы записать старое содержимое этого файла\n"
1036
1040
"в новое местоположение."
1037
1041
1038
#: bzrlib/builtins.py:1694
1042
#: bzrlib/builtins.py:1724
1039
1043
msgid ""
1040
1044
"The 'dir' argument, if given, must be the location of the root of a\n"
1041
1045
"working tree to update. By default, the working tree that contains the \n"
1042
1046
"current working directory is used."
1043
1047
msgstr ""
1044
1048
1045
#: bzrlib/builtins.py:1710
1049
#: bzrlib/builtins.py:1740
1046
1050
msgid "bzr update --revision takes exactly one revision"
1047
1051
msgstr "bzr update --revision принимает ровно одну ревизию"
1048
1052
1049
#: bzrlib/builtins.py:1718
1053
#: bzrlib/builtins.py:1748
1050
1054
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1051
1055
msgstr ""
1052
1056
"bzr update может обновить только всё дерево, не файл или поддиректорию"
1053
1057
1054
#: bzrlib/builtins.py:1749
1058
#: bzrlib/builtins.py:1779
1055
1059
msgid "Tree is up to date at revision {0} of branch {1}"
1056
1060
msgstr "Дерево в актуальной ревизии {0} ветви {1}"
1057
1061
1058
#: bzrlib/builtins.py:1765
1062
#: bzrlib/builtins.py:1795
1059
1063
#, python-format
1060
1064
msgid ""
1061
1065
"branch has no revision %s\n"
1064
1068
"в ветви нет ревизии %s\n"
1065
1069
"bzr update --revision работает только для ревизий в истории ветви"
1066
1070
1067
#: bzrlib/builtins.py:1771
1071
#: bzrlib/builtins.py:1801
1068
1072
msgid "Updated to revision {0} of branch {1}"
1069
1073
msgstr "Обновлено до ревизии {0} ветви {1}"
1070
1074
1071
#: bzrlib/builtins.py:1775
1075
#: bzrlib/builtins.py:1805
1072
1076
msgid ""
1073
1077
"Your local commits will now show as pending merges with 'bzr status', and "
1074
1078
"can be committed with 'bzr commit'."
1076
1080
"Ваши локальные закрепления теперь будут отображаться в 'bzr status' как "
1077
1081
"незавершённые слияния, и их можно закрепить с помощью 'bzr commit'."
1078
1082
1079
#: bzrlib/builtins.py:1784
1083
#: bzrlib/builtins.py:1814
1080
1084
msgid "Show information about a working tree, branch or repository."
1081
1085
msgstr "Показать информацию о рабочем дереве, ветви или репозитории."
1082
1086
1083
#: bzrlib/builtins.py:1786
1087
#: bzrlib/builtins.py:1816
1084
1088
msgid ""
1085
1089
"This command will show all known locations and formats associated to the\n"
1086
1090
"tree, branch or repository."
1088
1092
"Эта команда выведет все известные местоположения и форматы, связанные\n"
1089
1093
"с деревом, ветвью или репозиторием."
1090
1094
1091
#: bzrlib/builtins.py:1789
1095
#: bzrlib/builtins.py:1819
1092
1096
msgid ""
1093
1097
"In verbose mode, statistical information is included with each report.\n"
1094
1098
"To see extended statistic information, use a verbosity level of 2 or\n"
1098
1102
"Чтобы увидеть расширенную статистическую информацию, используйте уровень\n"
1099
1103
"подробностей 2 или выше, указывая опцию -v несколько раз, например -vv."
1100
1104
1101
#: bzrlib/builtins.py:1793
1105
#: bzrlib/builtins.py:1823
1102
1106
msgid "Branches and working trees will also report any missing revisions."
1103
1107
msgstr ""
1104
1108
"Ветви и рабочие деревья также включают в отчёт отсутствующие ревизии."
1105
1109
1106
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1107
#: bzrlib/builtins.py:6442
1110
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1111
#: bzrlib/builtins.py:6466
1108
1112
msgid ":Examples:"
1109
1113
msgstr ":Примеры:"
1110
1114
1111
#: bzrlib/builtins.py:1797
1115
#: bzrlib/builtins.py:1827
1112
1116
msgid " Display information on the format and related locations:"
1113
1117
msgstr " Вывести информацию о формате и связанных местоположениях:"
1114
1118
1115
#: bzrlib/builtins.py:1799
1119
#: bzrlib/builtins.py:1829
1116
1120
msgid " bzr info"
1117
1121
msgstr " bzr info"
1118
1122
1119
#: bzrlib/builtins.py:1801
1123
#: bzrlib/builtins.py:1831
1120
1124
msgid ""
1121
1125
" Display the above together with extended format information and\n"
1122
1126
" basic statistics (like the number of files in the working tree and\n"
1126
1130
" и базовую статистику (как число файлов в рабочем дереве и число\n"
1127
1131
" ревизий в ветви и репозитории):"
1128
1132
1129
#: bzrlib/builtins.py:1805
1133
#: bzrlib/builtins.py:1835
1130
1134
msgid " bzr info -v"
1131
1135
msgstr " bzr info -v"
1132
1136
1133
#: bzrlib/builtins.py:1807
1137
#: bzrlib/builtins.py:1837
1134
1138
msgid " Display the above together with number of committers to the branch:"
1135
1139
msgstr " Вывести то же, что и выше, а также число участников ветви:"
1136
1140
1137
#: bzrlib/builtins.py:1809
1141
#: bzrlib/builtins.py:1839
1138
1142
msgid " bzr info -vv"
1139
1143
msgstr " bzr info -vv"
1140
1144
1141
#: bzrlib/builtins.py:1828
1145
#: bzrlib/builtins.py:1858
1142
1146
msgid "Remove files or directories."
1143
1147
msgstr "Исключить файлы или директории."
1144
1148
1145
#: bzrlib/builtins.py:1830
1149
#: bzrlib/builtins.py:1860
1146
1150
msgid ""
1147
1151
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1148
1152
"delete them if they can easily be recovered using revert otherwise they\n"
1149
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1153
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1150
1154
"parameters are given Bazaar will scan for files that are being tracked by\n"
1151
1155
"Bazaar but missing in your tree and stop tracking them for you."
1152
1156
msgstr ""
1153
"Прекращает отслеживание изменений в указанных файлах. Bazaar удалит их,\n"
1154
"если их можно легко восстановить с помощью revert, иначе будут созданы\n"
1155
"их резервные копии (с расширением вида .~#~). Если не указано ни опций,\n"
1156
"ни параметров, Bazaar найдёт файлы, которые отслеживаются, но отсутствуют\n"
1157
"в рабочем дереве и прекратит их отслеживать."
1158
1157
1159
#: bzrlib/builtins.py:1838
1158
#: bzrlib/builtins.py:1868
1160
1159
msgid "Only remove files that have never been committed."
1161
1160
msgstr "Исключать только файлы, которые никогда не были закреплены."
1162
1161
1163
#: bzrlib/builtins.py:1840
1162
#: bzrlib/builtins.py:1870
1164
1163
msgid "The file deletion mode to be used."
1165
1164
msgstr "Используемый способ удаления файлов."
1166
1165
1167
#: bzrlib/builtins.py:1841
1166
#: bzrlib/builtins.py:1871
1168
1167
msgid "Deletion Strategy"
1169
1168
msgstr "Стратегия удаления"
1170
1169
1171
#: bzrlib/builtins.py:1842
1170
#: bzrlib/builtins.py:1872
1172
1171
msgid "Backup changed files (default)."
1173
1172
msgstr ""
1174
1173
1175
#: bzrlib/builtins.py:1843
1174
#: bzrlib/builtins.py:1873
1176
1175
msgid "Delete from bzr but leave the working copy."
1177
1176
msgstr "Удалить из bzr, но оставить рабочую копию."
1178
1177
1179
#: bzrlib/builtins.py:1844
1178
#: bzrlib/builtins.py:1874
1180
1179
msgid "Don't backup changed files."
1181
1180
msgstr "Не создавать резервные копии изменённых файлов."
1182
1181
1183
#: bzrlib/builtins.py:1845
1182
#: bzrlib/builtins.py:1875
1184
1183
msgid ""
1185
1184
"Delete all the specified files, even if they can not be recovered and even "
1186
1185
"if they are non-empty directories. (deprecated, use no-backup)"
1188
1187
"Удалить все указанные файлы, даже если их нельзя восстановить или они "
1189
1188
"являются непустыми директориями. (устарело, используйте no-backup)"
1190
1189
1191
#: bzrlib/builtins.py:1854
1190
#: bzrlib/builtins.py:1884
1192
1191
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1193
1192
msgstr ""
1194
1193
"(Опция --force устарела, в будущем следует использовать --no-backup.)"
1195
1194
1196
#: bzrlib/builtins.py:1871
1195
#: bzrlib/builtins.py:1901
1197
1196
msgid "No matching files."
1198
1197
msgstr "Нет файлов, удовлетворяющих критерию."
1199
1198
1200
#: bzrlib/builtins.py:1932
1199
#: bzrlib/builtins.py:1962
1201
1200
msgid "Reconcile bzr metadata in a branch."
1202
1201
msgstr "Согласовать метаданные bzr в ветви."
1203
1202
1204
#: bzrlib/builtins.py:1934
1203
#: bzrlib/builtins.py:1964
1205
1204
msgid ""
1206
1205
"This can correct data mismatches that may have been caused by\n"
1207
1206
"previous ghost operations or bzr upgrades. You should only\n"
1212
1211
"Эту команду стоит запускать только, если 'bzr check' или разработчик\n"
1213
1212
"bzr предложат вам сделать это."
1214
1213
1215
#: bzrlib/builtins.py:1939
1214
#: bzrlib/builtins.py:1969
1216
1215
msgid ""
1217
1216
"If a second branch is provided, cross-branch reconciliation is\n"
1218
1217
"also attempted, which will check that data like the tree root\n"
1224
1223
"присутствовавшие в ранних версиях bzr, корректно представлены\n"
1225
1224
"в обоих ветвях."
1226
1225
1227
#: bzrlib/builtins.py:1944
1226
#: bzrlib/builtins.py:1974
1228
1227
msgid ""
1229
1228
"At the same time it is run it may recompress data resulting in\n"
1230
1229
"a potential saving in disk space or performance gain."
1233
1232
"уменьшающее размер занимаемого пространства и повышающее\n"
1234
1233
"производительность."
1235
1234
1236
#: bzrlib/builtins.py:1947
1235
#: bzrlib/builtins.py:1977
1237
1236
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1238
1237
msgstr ""
1239
1238
"Ветвь *ДОЛЖНА* быть на системе, поддерживающей список файлов, такой как\r\n"
1240
1239
"локальный диск или SFTP."
1241
1240
1242
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1241
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1243
1242
msgid ""
1244
1243
"Format for the bzr 2.0 series.\n"
1245
1244
"Uses group-compress storage.\n"
1246
1245
"Provides rich roots which are a one-way transition.\n"
1247
1246
msgstr ""
1248
1247
1249
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1248
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1250
1249
msgid ""
1251
1250
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1252
1251
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1253
1252
msgstr ""
1254
1253
1255
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1254
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1256
1255
msgid "The 2a format with experimental support for colocated branches.\n"
1257
1256
msgstr ""
1258
1257
1259
#: bzrlib/builtins.py:2015
1258
#: bzrlib/builtins.py:2045
1260
1259
msgid "Make a directory into a versioned branch."
1261
1260
msgstr "Преобразовать директорию в ветвь системы контроля версий."
1262
1261
1263
#: bzrlib/builtins.py:2017
1262
#: bzrlib/builtins.py:2047
1264
1263
msgid ""
1265
1264
"Use this to create an empty branch, or before importing an\n"
1266
1265
"existing project."
1268
1267
"Используйте эту команду для создания пустой ветви или\n"
1269
1268
"перед импортом существующего проекта."
1270
1269
1271
#: bzrlib/builtins.py:2020
1270
#: bzrlib/builtins.py:2050
1272
1271
msgid ""
1273
1272
"If there is a repository in a parent directory of the location, then\n"
1274
1273
"the history of the branch will be stored in the repository. Otherwise\n"
1279
1278
"будет сохранена в репозитории. Иначе, init создаёт одиночную ветвь,\n"
1280
1279
"которая несёт историю с собой в директории .bzr."
1281
1280
1282
#: bzrlib/builtins.py:2025
1281
#: bzrlib/builtins.py:2055
1283
1282
msgid ""
1284
1283
"If there is already a branch at the location but it has no working tree,\n"
1285
1284
"the tree can be populated with 'bzr checkout'."
1287
1286
"Если ветвь уже существует, но рабочее дерево отсутствует, то оно\n"
1288
1287
"создаётся с помощью 'bzr checkout'."
1289
1288
1290
#: bzrlib/builtins.py:2028
1289
#: bzrlib/builtins.py:2058
1291
1290
msgid "Recipe for importing a tree of files::"
1292
1291
msgstr "Рецепт для импорта дерева файлов::"
1293
1292
1294
#: bzrlib/builtins.py:2030
1293
#: bzrlib/builtins.py:2060
1295
1294
msgid ""
1296
1295
" cd ~/project\n"
1297
1296
" bzr init\n"
1305
1304
" bzr status\n"
1306
1305
" bzr commit -m \"проект импортирован\""
1307
1306
1308
#: bzrlib/builtins.py:2041
1307
#: bzrlib/builtins.py:2071
1309
1308
msgid ""
1310
1309
"Create the path leading up to the branch if it does not already exist."
1311
1310
msgstr "Создать путь, ведущий к ветви, если он ещё не существует."
1312
1311
1313
#: bzrlib/builtins.py:2044
1312
#: bzrlib/builtins.py:2074
1314
1313
msgid "Specify a format for this branch. See \"help formats\"."
1315
1314
msgstr "Указать формат данной ветви. См. «help formats»."
1316
1315
1317
#: bzrlib/builtins.py:2052
1316
#: bzrlib/builtins.py:2082
1318
1317
msgid ""
1319
1318
"Never change revnos or the existing log. Append revisions to it only."
1320
1319
msgstr ""
1321
1320
"Никогда не изменять номера ревизий в существующем журнале. Только добавлять "
1322
1321
"к нему ревизии."
1323
1322
1324
#: bzrlib/builtins.py:2055
1323
#: bzrlib/builtins.py:2085
1325
1324
msgid "Create a branch without a working tree."
1326
1325
msgstr "Создать ветвь без рабочего дерева."
1327
1326
1328
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1327
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1329
1328
#, python-format
1330
1329
msgid ""
1331
1330
"Parent directory of %s does not exist.\n"
1335
1334
"Вы может предоставить --create-prefix, чтобы создать все родительские "
1336
1335
"директории."
1337
1336
1338
#: bzrlib/builtins.py:2109
1337
#: bzrlib/builtins.py:2139
1339
1338
msgid ""
1340
1339
"This branch format cannot be set to append-revisions-only. Try --default."
1341
1340
msgstr ""
1342
1341
"Формат этой ветви не может быть установлен в append-revisions-only. "
1343
1342
"Попробуйте --default."
1344
1343
1345
#: bzrlib/builtins.py:2120
1344
#: bzrlib/builtins.py:2150
1346
1345
msgid "Created a {0} (format: {1})\n"
1347
1346
msgstr "Создана {0} в формате {1}\n"
1348
1347
1349
#: bzrlib/builtins.py:2129
1348
#: bzrlib/builtins.py:2159
1350
1349
#, python-format
1351
1350
msgid "Using shared repository: %s\n"
1352
1351
msgstr "Используется общий репозиторий: %s\n"
1353
1352
1354
#: bzrlib/builtins.py:2133
1353
#: bzrlib/builtins.py:2163
1355
1354
msgid "Create a shared repository for branches to share storage space."
1356
1355
msgstr ""
1357
1356
"Создать общий репозиторий для ветвей, которые разделяют общее пространство."
1358
1357
1359
#: bzrlib/builtins.py:2135
1358
#: bzrlib/builtins.py:2165
1360
1359
msgid ""
1361
1360
"New branches created under the repository directory will store their\n"
1362
1361
"revisions in the repository, not in the branch directory. For branches\n"
1368
1367
"Для ветвей с общей историей это уменьшает размер необходимого\n"
1369
1368
"пространства и ускоряет создание новых ветвей."
1370
1369
1371
#: bzrlib/builtins.py:2140
1370
#: bzrlib/builtins.py:2170
1372
1371
msgid ""
1373
1372
"If the --no-trees option is given then the branches in the repository\n"
1374
1373
"will not have working trees by default. They will still exist as \n"
1384
1383
"хранящих ветви, работа с которыми производится через рабочие копии\n"
1385
1384
"или через удалённые ветви, например на сервере."
1386
1385
1387
#: bzrlib/builtins.py:2147
1386
#: bzrlib/builtins.py:2177
1388
1387
msgid ""
1389
1388
":Examples:\n"
1390
1389
" Create a shared repository holding just branches::"
1392
1391
":Примеры:\n"
1393
1392
" Создать общий репозиторий, хранящий только ветви::"
1394
1393
1395
#: bzrlib/builtins.py:2150
1394
#: bzrlib/builtins.py:2180
1396
1395
msgid ""
1397
1396
" bzr init-repo --no-trees repo\n"
1398
1397
" bzr init repo/trunk"
1400
1399
" bzr init-repo --no-trees repo\n"
1401
1400
" bzr init repo/trunk"
1402
1401
1403
#: bzrlib/builtins.py:2153
1402
#: bzrlib/builtins.py:2183
1404
1403
msgid " Make a lightweight checkout elsewhere::"
1405
1404
msgstr " Создать легковесную рабочую копию где-нибудь ещё::"
1406
1405
1407
#: bzrlib/builtins.py:2155
1406
#: bzrlib/builtins.py:2185
1408
1407
msgid ""
1409
1408
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1410
1409
" cd trunk-checkout\n"
1414
1413
" cd trunk-checkout\n"
1415
1414
" (здесь добавляйте файлы)"
1416
1415
1417
#: bzrlib/builtins.py:2163
1416
#: bzrlib/builtins.py:2193
1418
1417
msgid ""
1419
1418
"Specify a format for this repository. See \"bzr help formats\" for details."
1420
1419
msgstr ""
1421
1420
"Указать формат для этого репозитория. Описание форматов см. в «bzr help "
1422
1421
"formats»."
1423
1422
1424
#: bzrlib/builtins.py:2167
1423
#: bzrlib/builtins.py:2197
1425
1424
msgid "Repository format"
1426
1425
msgstr "Формат репозитория"
1427
1426
1428
#: bzrlib/builtins.py:2169
1427
#: bzrlib/builtins.py:2199
1429
1428
msgid "Branches in the repository will default to not having a working tree."
1430
1429
msgstr "Ветви в репозитории по умолчанию не будут иметь рабочего дерева."
1431
1430
1432
#: bzrlib/builtins.py:2195
1431
#: bzrlib/builtins.py:2225
1433
1432
msgid "Show differences in the working tree, between revisions or branches."
1434
1433
msgstr "Показать изменения в рабочем дереве, между ревизиями или ветвями."
1435
1434
1436
#: bzrlib/builtins.py:2197
1435
#: bzrlib/builtins.py:2227
1437
1436
msgid ""
1438
1437
"If no arguments are given, all changes for the current tree are listed.\n"
1439
1438
"If files are given, only the changes in those files are listed.\n"
1448
1447
"Если не указаны, значение по умолчанию для обоих извлекается из первого\n"
1449
1448
"аргумента или из текущего дерева, если не дано аргументов."
1450
1449
1451
#: bzrlib/builtins.py:2204
1450
#: bzrlib/builtins.py:2234
1452
1451
msgid ""
1453
1452
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1454
1453
"produces patches suitable for \"patch -p1\"."
1456
1455
"«bzr diff -p1» эквивалентно «bzr diff -prefix old/:new/», и\n"
1457
1456
"создаёт патчи, подходящие для «patch -p1»."
1458
1457
1459
#: bzrlib/builtins.py:2207
1458
#: bzrlib/builtins.py:2237
1460
1459
msgid ""
1461
1460
"Note that when using the -r argument with a range of revisions, the\n"
1462
1461
"differences are computed between the two specified revisions. That\n"
1471
1470
"Это отличается от интерпретации интервалов ревизий командой «bzr log»,\n"
1472
1471
"которая включает первую ревизию интервала."
1473
1472
1474
#: bzrlib/builtins.py:2214
1473
#: bzrlib/builtins.py:2244
1475
1474
msgid ""
1476
1475
":Exit values:\n"
1477
1476
" 1 - changed\n"
1485
1484
" 3 - ошибка\n"
1486
1485
" 0 - нет изменений"
1487
1486
1488
#: bzrlib/builtins.py:2220
1487
#: bzrlib/builtins.py:2250
1489
1488
msgid ""
1490
1489
":Examples:\n"
1491
1490
" Shows the difference in the working tree versus the last commit::"
1493
1492
":Примеры:\n"
1494
1493
" Показывает отличия рабочего дерева от последнего закрепления::"
1495
1494
1496
#: bzrlib/builtins.py:2223
1495
#: bzrlib/builtins.py:2253
1497
1496
msgid " bzr diff"
1498
1497
msgstr " bzr diff"
1499
1498
1500
#: bzrlib/builtins.py:2225
1499
#: bzrlib/builtins.py:2255
1501
1500
msgid " Difference between the working tree and revision 1::"
1502
1501
msgstr " Различия между рабочим деревом и ревизией 1::"
1503
1502
1504
#: bzrlib/builtins.py:2227
1503
#: bzrlib/builtins.py:2257
1505
1504
msgid " bzr diff -r1"
1506
1505
msgstr " bzr diff -r1"
1507
1506
1508
#: bzrlib/builtins.py:2229
1507
#: bzrlib/builtins.py:2259
1509
1508
msgid " Difference between revision 3 and revision 1::"
1510
1509
msgstr " Различия между ревизией 3 и ревизией 1::"
1511
1510
1512
#: bzrlib/builtins.py:2231
1511
#: bzrlib/builtins.py:2261
1513
1512
msgid " bzr diff -r1..3"
1514
1513
msgstr " bzr diff -r1..3"
1515
1514
1516
#: bzrlib/builtins.py:2233
1515
#: bzrlib/builtins.py:2263
1517
1516
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1518
1517
msgstr " Различия между ревизией 3 и ревизией 1 для ветви xxx::"
1519
1518
1520
#: bzrlib/builtins.py:2235
1519
#: bzrlib/builtins.py:2265
1521
1520
msgid " bzr diff -r1..3 xxx"
1522
1521
msgstr " bzr diff -r1..3 xxx"
1523
1522
1524
#: bzrlib/builtins.py:2237
1523
#: bzrlib/builtins.py:2267
1525
1524
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1526
1525
msgstr " Изменения, представленные в ревизии 2 (эквивалентно -r1..2)::"
1527
1526
1528
#: bzrlib/builtins.py:2239
1527
#: bzrlib/builtins.py:2269
1529
1528
msgid " bzr diff -c2"
1530
1529
msgstr " bzr diff -c2"
1531
1530
1532
#: bzrlib/builtins.py:2241
1531
#: bzrlib/builtins.py:2271
1533
1532
msgid ""
1534
1533
" To see the changes introduced by revision X::\n"
1535
1534
" \n"
1539
1538
" \n"
1540
1539
" bzr diff -cX"
1541
1540
1542
#: bzrlib/builtins.py:2245
1541
#: bzrlib/builtins.py:2275
1543
1542
msgid ""
1544
1543
" Note that in the case of a merge, the -c option shows the changes\n"
1545
1544
" compared to the left hand parent. To see the changes against\n"
1549
1548
" относительно левого родителя. Чтобы увидеть изменения относительно\n"
1550
1549
" правого родителя, используйте::"
1551
1550
1552
#: bzrlib/builtins.py:2249
1551
#: bzrlib/builtins.py:2279
1553
1552
msgid " bzr diff -r<chosen_parent>..X"
1554
1553
msgstr " bzr diff -r<выбранный_родитель>..X"
1555
1554
1556
#: bzrlib/builtins.py:2251
1555
#: bzrlib/builtins.py:2281
1557
1556
msgid ""
1558
1557
" The changes between the current revision and the previous revision\n"
1559
1558
" (equivalent to -c-1 and -r-2..-1)"
1561
1560
" Изменения между текущей ревизией и предыдущей\n"
1562
1561
" (эквивалент -c-1 и -r-2..-1)"
1563
1562
1564
#: bzrlib/builtins.py:2254
1563
#: bzrlib/builtins.py:2284
1565
1564
msgid " bzr diff -r-2.."
1566
1565
msgstr " bzr diff -r-2.."
1567
1566
1568
#: bzrlib/builtins.py:2256
1567
#: bzrlib/builtins.py:2286
1569
1568
msgid " Show just the differences for file NEWS::"
1570
1569
msgstr " Показать изменения только для файла NEWS::"
1571
1570
1572
#: bzrlib/builtins.py:2258
1571
#: bzrlib/builtins.py:2288
1573
1572
msgid " bzr diff NEWS"
1574
1573
msgstr " bzr diff NEWS"
1575
1574
1576
#: bzrlib/builtins.py:2260
1575
#: bzrlib/builtins.py:2290
1577
1576
msgid " Show the differences in working tree xxx for file NEWS::"
1578
1577
msgstr " Показать изменения в рабочем дереве xxx для файла NEWS::"
1579
1578
1580
#: bzrlib/builtins.py:2262
1579
#: bzrlib/builtins.py:2292
1581
1580
msgid " bzr diff xxx/NEWS"
1582
1581
msgstr " bzr diff xxx/NEWS"
1583
1582
1584
#: bzrlib/builtins.py:2264
1583
#: bzrlib/builtins.py:2294
1585
1584
msgid " Show the differences from branch xxx to this working tree:"
1586
1585
msgstr " Показать изменения рабочего дерева относительно ветви xxx:"
1587
1586
1588
#: bzrlib/builtins.py:2266
1587
#: bzrlib/builtins.py:2296
1589
1588
msgid " bzr diff --old xxx"
1590
1589
msgstr " bzr diff --old xxx"
1591
1590
1592
#: bzrlib/builtins.py:2268
1591
#: bzrlib/builtins.py:2298
1593
1592
msgid " Show the differences between two branches for file NEWS::"
1594
1593
msgstr " Показать различия в файле NEWS между двумя ветвями::"
1595
1594
1596
#: bzrlib/builtins.py:2270
1595
#: bzrlib/builtins.py:2300
1597
1596
msgid " bzr diff --old xxx --new yyy NEWS"
1598
1597
msgstr " bzr diff --old xxx --new yyy NEWS"
1599
1598
1600
#: bzrlib/builtins.py:2272
1599
#: bzrlib/builtins.py:2302
1601
1600
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1602
1601
msgstr " Тоже, что и 'bzr diff', но начать пути с old/ и new/::"
1603
1602
1604
#: bzrlib/builtins.py:2274
1603
#: bzrlib/builtins.py:2304
1605
1604
msgid ""
1606
1605
" bzr diff --prefix old/:new/\n"
1607
1606
" \n"
1616
1615
" \n"
1617
1616
" bzr diff --using /usr/bin/diff --diff-options -wu"
1618
1617
1619
#: bzrlib/builtins.py:2284
1618
#: bzrlib/builtins.py:2314
1620
1619
msgid "Pass these options to the external diff program."
1621
1620
msgstr "Передать эти опции внешней программе diff."
1622
1621
1623
#: bzrlib/builtins.py:2287
1622
#: bzrlib/builtins.py:2317
1624
1623
msgid ""
1625
1624
"Set prefixes added to old and new filenames, as two values separated by a "
1626
1625
"colon. (eg \"old/:new/\")."
1628
1627
"Установить префиксы, добавляемые к старым и новым именам файлов, как "
1629
1628
"значения, разделённые двоеточием (напр. «old/:new/»)."
1630
1629
1631
#: bzrlib/builtins.py:2290
1630
#: bzrlib/builtins.py:2320
1632
1631
msgid "Branch/tree to compare from."
1633
1632
msgstr "Ветвь или дерево, которое сравнивать."
1634
1633
1635
#: bzrlib/builtins.py:2294
1634
#: bzrlib/builtins.py:2324
1636
1635
msgid "Branch/tree to compare to."
1637
1636
msgstr "Ветвь или дерево, с которым сравнивать."
1638
1637
1639
#: bzrlib/builtins.py:2300
1638
#: bzrlib/builtins.py:2330
1640
1639
msgid "Use this command to compare files."
1641
1640
msgstr "Использовать эту команду для сравнения."
1642
1641
1643
#: bzrlib/builtins.py:2305
1642
#: bzrlib/builtins.py:2335
1644
1643
msgid "Diff format to use."
1645
1644
msgstr "Используемый формат diff."
1646
1645
1647
#: bzrlib/builtins.py:2307
1646
#: bzrlib/builtins.py:2337
1648
1647
msgid "Diff format"
1649
1648
msgstr "Формат diff"
1650
1649
1651
#: bzrlib/builtins.py:2329
1650
#: bzrlib/builtins.py:2359
1652
1651
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1653
1652
msgstr ""
1654
1653
"--prefix ожидает два значения, разделённые двоеточием (напр. «old/:new/»)"
1655
1654
1656
#: bzrlib/builtins.py:2333
1655
#: bzrlib/builtins.py:2363
1657
1656
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1658
1657
msgstr "bzr diff --revision принимает ровно ожин или два аргумента"
1659
1658
1660
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1661
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1659
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1660
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1662
1661
msgid "{0} and {1} are mutually exclusive"
1663
1662
msgstr "{0} и {1} взаимоисключающи"
1664
1663
1665
#: bzrlib/builtins.py:2358
1664
#: bzrlib/builtins.py:2388
1666
1665
msgid ""
1667
1666
"List files deleted in the working tree.\n"
1668
1667
" "
1670
1669
"Вывести список файлов, удалённых в рабочем дереве.\n"
1671
1670
" "
1672
1671
1673
#: bzrlib/builtins.py:2436
1672
#: bzrlib/builtins.py:2465
1674
1673
msgid "Show the tree root directory."
1675
1674
msgstr "Показать корневую директорию дерева."
1676
1675
1677
#: bzrlib/builtins.py:2438
1676
#: bzrlib/builtins.py:2467
1678
1677
msgid ""
1679
1678
"The root is the nearest enclosing directory with a .bzr control\n"
1680
1679
"directory."
1682
1681
"Корень это ближайшая родительская директория с управляющей\n"
1683
1682
"директорией .bzr."
1684
1683
1685
#: bzrlib/builtins.py:2453
1684
#: bzrlib/builtins.py:2482
1686
1685
msgid "The limit argument must be an integer."
1687
1686
msgstr "Аргумент предела должен быть целым числом."
1688
1687
1689
#: bzrlib/builtins.py:2461
1688
#: bzrlib/builtins.py:2490
1690
1689
msgid "The levels argument must be an integer."
1691
1690
msgstr "Аргументы пределов должны быть целыми числами."
1692
1691
1693
#: bzrlib/builtins.py:2466
1692
#: bzrlib/builtins.py:2495
1694
1693
msgid "Show historical log for a branch or subset of a branch."
1695
1694
msgstr "Показать журнал истории ветви или подмножества ветви."
1696
1695
1697
#: bzrlib/builtins.py:2468
1696
#: bzrlib/builtins.py:2497
1698
1697
msgid ""
1699
1698
"log is bzr's default tool for exploring the history of a branch.\n"
1700
1699
"The branch to use is taken from the first parameter. If no parameters\n"
1706
1705
"параметров, выводится журнал ветви, содержащей рабочюю директорию.\n"
1707
1706
"Вот несколько простых примеров::"
1708
1707
1709
#: bzrlib/builtins.py:2473
1708
#: bzrlib/builtins.py:2502
1710
1709
msgid ""
1711
1710
" bzr log log the current branch\n"
1712
1711
" bzr log foo.py log a file in its branch\n"
1716
1715
" bzr log foo.py журнал файла в его ветви\n"
1717
1716
" bzr log http://server/branch журнал ветви на сервере"
1718
1717
1719
#: bzrlib/builtins.py:2477
1718
#: bzrlib/builtins.py:2506
1720
1719
msgid ""
1721
1720
"The filtering, ordering and information shown for each revision can\n"
1722
1721
"be controlled as explained below. By default, all revisions are\n"
1732
1731
"отображаются, то они отображаются с отступом, относительно ревизии,\n"
1733
1732
"в которой происходило слияние."
1734
1733
1735
#: bzrlib/builtins.py:2484
1734
#: bzrlib/builtins.py:2513
1736
1735
msgid ":Output control:"
1737
1736
msgstr ":Управление выводом:"
1738
1737
1739
#: bzrlib/builtins.py:2486
1738
#: bzrlib/builtins.py:2515
1740
1739
msgid ""
1741
1740
" The log format controls how information about each revision is\n"
1742
1741
" displayed. The standard log formats are called ``long``, ``short``\n"
1748
1747
" и «line». По умолчание используется long. Подробности о форматах\n"
1749
1748
" смотрите в «bzr help log-formats»."
1750
1749
1751
#: bzrlib/builtins.py:2491
1750
#: bzrlib/builtins.py:2520
1752
1751
msgid ""
1753
1752
" The following options can be used to control what information is\n"
1754
1753
" displayed::"
1756
1755
" Следующие опции могут использоваться для управления отображением\n"
1757
1756
" информации::"
1758
1757
1759
#: bzrlib/builtins.py:2494
1758
#: bzrlib/builtins.py:2523
1760
1759
msgid ""
1761
1760
" -l N display a maximum of N revisions\n"
1762
1761
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1770
1769
" -p выводить различия diff для каждой ревизии\n"
1771
1770
" --show-ids выводить id ревизий (и id файлов), не только номера ревизий"
1772
1771
1773
#: bzrlib/builtins.py:2500
1772
#: bzrlib/builtins.py:2529
1774
1773
msgid ""
1775
1774
" Note that the default number of levels to display is a function of the\n"
1776
1775
" log format. If the -n option is not used, the standard log formats show\n"
1780
1779
" Если используется не опция -n, стандартные форматы журнала показывают\n"
1781
1780
" верхний уровень (основную линию)."
1782
1781
1783
#: bzrlib/builtins.py:2504
1782
#: bzrlib/builtins.py:2533
1784
1783
msgid ""
1785
1784
" Status summaries are shown using status flags like A, M, etc. To see\n"
1786
1785
" the changes explained using words like ``added`` and ``modified``\n"
1790
1789
" увидеть изменения, описанные словами вроде «добавлены» и «изменены»,\n"
1791
1790
" используйте опцию -vv."
1792
1791
1793
#: bzrlib/builtins.py:2508
1792
#: bzrlib/builtins.py:2537
1794
1793
msgid ":Ordering control:"
1795
1794
msgstr ":Управление порядком:"
1796
1795
1797
#: bzrlib/builtins.py:2510
1796
#: bzrlib/builtins.py:2539
1798
1797
msgid ""
1799
1798
" To display revisions from oldest to newest, use the --forward option.\n"
1800
1799
" In most cases, using this option will have little impact on the total\n"
1806
1805
" расходуется мало времени, хотя --forward не выводит ревизии по порядку,\n"
1807
1806
" как это делает --reverse."
1808
1807
1809
#: bzrlib/builtins.py:2515
1808
#: bzrlib/builtins.py:2544
1810
1809
msgid ":Revision filtering:"
1811
1810
msgstr ":Фильтрация ревизий:"
1812
1811
1813
#: bzrlib/builtins.py:2517
1812
#: bzrlib/builtins.py:2546
1814
1813
msgid ""
1815
1814
" The -r option can be used to specify what revision or range of revisions\n"
1816
1815
" to filter against. The various forms are shown below::"
1818
1817
" Опцию -r можно использовать для указания ревизии или интервала ревизий\n"
1819
1818
" для фильтрации. Различные формы показаны ниже::"
1820
1819
1821
#: bzrlib/builtins.py:2520
1820
#: bzrlib/builtins.py:2549
1822
1821
msgid ""
1823
1822
" -rX display revision X\n"
1824
1823
" -rX.. display revision X and later\n"
1830
1829
" -r..Y вывести до и включая ревизию Y\n"
1831
1830
" -rX..Y вывести от X до Y включительно"
1832
1831
1833
#: bzrlib/builtins.py:2525
1832
#: bzrlib/builtins.py:2554
1834
1833
msgid ""
1835
1834
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1836
1835
" Some common examples are given below::"
1838
1837
" Чтобы узнать, как указывать X и Y, смотрите «bzr help revisionspec».\n"
1839
1838
" Ниже приведеные некоторые распространённые примеры::"
1840
1839
1841
#: bzrlib/builtins.py:2528
1840
#: bzrlib/builtins.py:2557
1842
1841
msgid ""
1843
1842
" -r-1 show just the tip\n"
1844
1843
" -r-10.. show the last 10 mainline revisions\n"
1854
1853
" этой ветви и указанной в пути\n"
1855
1854
" -rdate:yesterday.. показать изменения со вчерашнего дня"
1856
1855
1857
#: bzrlib/builtins.py:2535
1856
#: bzrlib/builtins.py:2564
1858
1857
msgid ""
1859
1858
" When logging a range of revisions using -rX..Y, log starts at\n"
1860
1859
" revision Y and searches back in history through the primary\n"
1864
1863
" a nested merge revision and the log will be truncated accordingly."
1865
1864
msgstr ""
1866
1865
1867
#: bzrlib/builtins.py:2542
1866
#: bzrlib/builtins.py:2571
1868
1867
msgid ":Path filtering:"
1869
1868
msgstr ":Фильтрация пути:"
1870
1869
1871
#: bzrlib/builtins.py:2544
1870
#: bzrlib/builtins.py:2573
1872
1871
msgid ""
1873
1872
" If parameters are given and the first one is not a branch, the log\n"
1874
1873
" will be filtered to show only those revisions that changed the\n"
1877
1876
" Если заданы параметры и первый не является ветвью, будут отображаться\n"
1878
1877
" только те ревизии, которые изменяли указанные файлы или директории."
1879
1878
1880
#: bzrlib/builtins.py:2548
1879
#: bzrlib/builtins.py:2577
1881
1880
msgid ""
1882
1881
" Filenames are interpreted within their historical context. To log a\n"
1883
1882
" deleted file, specify a revision range so that the file existed at\n"
1887
1886
" журнал для удалённого файла, укажите такой интервал ревизий, что файл\n"
1888
1887
" существует от начала до конца интервала."
1889
1888
1890
#: bzrlib/builtins.py:2552
1889
#: bzrlib/builtins.py:2581
1891
1890
msgid ""
1892
1891
" Historical context is also important when interpreting pathnames of\n"
1893
1892
" renamed files/directories. Consider the following example:"
1895
1894
" Исторический контекст также важен при интерпретации путей\n"
1896
1895
" переименованных файлов и директорий. Рассмотрим следующий пример:"
1897
1896
1898
#: bzrlib/builtins.py:2555
1897
#: bzrlib/builtins.py:2584
1899
1898
msgid ""
1900
1899
" * revision 1: add tutorial.txt\n"
1901
1900
" * revision 2: modify tutorial.txt\n"
1905
1904
" * ревизия 2: изменён tutorial.txt\n"
1906
1905
" * ревизия 3: переименован tutorial.txt в guide.txt; добавлен tutorial.txt"
1907
1906
1908
#: bzrlib/builtins.py:2559
1907
#: bzrlib/builtins.py:2588
1909
1908
msgid " In this case:"
1910
1909
msgstr " В этом случае:"
1911
1910
1912
#: bzrlib/builtins.py:2561
1911
#: bzrlib/builtins.py:2590
1913
1912
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1914
1913
msgstr ""
1915
1914
" * «bzr log guide.txt» выведет журнал файла, добавленного в ревизии 1"
1916
1915
1917
#: bzrlib/builtins.py:2563
1916
#: bzrlib/builtins.py:2592
1918
1917
msgid ""
1919
1918
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1920
1919
msgstr ""
1921
1920
" * «bzr log tutorial.txt» выведет журнал нового файла, добавленного\r\n"
1922
1921
" в ревизии 3"
1923
1922
1924
#: bzrlib/builtins.py:2565
1923
#: bzrlib/builtins.py:2594
1925
1924
msgid ""
1926
1925
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1927
1926
" the original file in revision 2."
1929
1928
" * «bzr log -r2 -p tutorial.txt» выведет изменения оригинального\n"
1930
1929
" файла в ревизии 2."
1931
1930
1932
#: bzrlib/builtins.py:2568
1931
#: bzrlib/builtins.py:2597
1933
1932
msgid ""
1934
1933
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1935
1934
" was no file called guide.txt in revision 2."
1937
1936
" * «bzr log -r2 -p guide.txt» выведет сообщение об ошибке, так как\n"
1938
1937
" в ревизии 2 нет файла guide.txt."
1939
1938
1940
#: bzrlib/builtins.py:2571
1939
#: bzrlib/builtins.py:2600
1941
1940
msgid ""
1942
1941
" Renames are always followed by log. By design, there is no need to\n"
1943
1942
" explicitly ask for this (and no way to stop logging a file back\n"
1944
1943
" until it was last renamed)."
1945
1944
msgstr ""
1946
1945
1947
#: bzrlib/builtins.py:2575
1946
#: bzrlib/builtins.py:2604
1948
1947
msgid ":Other filtering:"
1949
1948
msgstr ":Другая фильтрация:"
1950
1949
1951
#: bzrlib/builtins.py:2577
1950
#: bzrlib/builtins.py:2606
1952
1951
msgid ""
1953
1952
" The --match option can be used for finding revisions that match a\n"
1954
1953
" regular expression in a commit message, committer, author or bug.\n"
1963
1962
" полям можно использовать опции --match-author, --match-bugs,\n"
1964
1963
" --match-committer и --match-message."
1965
1964
1966
#: bzrlib/builtins.py:2583
1965
#: bzrlib/builtins.py:2612
1967
1966
msgid ":Tips & tricks:"
1968
1967
msgstr ":Советы и трюки:"
1969
1968
1970
#: bzrlib/builtins.py:2585
1969
#: bzrlib/builtins.py:2614
1971
1970
msgid ""
1972
1971
" GUI tools and IDEs are often better at exploring history than command\n"
1973
1972
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1981
1980
" <http://doc.bazaar.canonical.com/plugins/en/> и\n"
1982
1981
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1983
1982
1984
#: bzrlib/builtins.py:2591
1983
#: bzrlib/builtins.py:2620
1985
1984
msgid ""
1986
1985
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1987
1986
msgstr ""
1988
1987
" Возможно, вы захотите добавить следующие псевдонимы в «bazaar.conf»::"
1989
1988
1990
#: bzrlib/builtins.py:2593
1989
#: bzrlib/builtins.py:2622
1991
1990
msgid ""
1992
1991
" [ALIASES]\n"
1993
1992
" tip = log -r-1\n"
1999
1998
" top = log -l10 --line\n"
2000
1999
" show = log -v -p"
2001
2000
2002
#: bzrlib/builtins.py:2598
2001
#: bzrlib/builtins.py:2627
2003
2002
msgid ""
2004
2003
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
2005
2004
" will show the last 10 mainline revisions. To see the details of a\n"
2009
2008
" 10 ревизий основной линии. Чтобы просмотреть журнал определённой\n"
2010
2009
" ревизии X, используйте «bzr show -rX»."
2011
2010
2012
#: bzrlib/builtins.py:2602
2011
#: bzrlib/builtins.py:2631
2013
2012
msgid ""
2014
2013
" If you are interested in looking deeper into a particular merge X,\n"
2015
2014
" use ``bzr log -n0 -rX``."
2017
2016
" Если вы хотите подробно рассмотреть определённое слияние X,\n"
2018
2017
" используйте «bzr log -n0 -rX»."
2019
2018
2020
#: bzrlib/builtins.py:2605
2019
#: bzrlib/builtins.py:2634
2021
2020
msgid ""
2022
2021
" ``bzr log -v`` on a branch with lots of history is currently\n"
2023
2022
" very slow. A fix for this issue is currently under development.\n"
2029
2028
" недостатка. Независимо от того, будет это исправлено или нет,\n"
2030
2029
" рекомендуется задавать интервал ревизий с помощью опции -v."
2031
2030
2032
#: bzrlib/builtins.py:2610
2031
#: bzrlib/builtins.py:2639
2033
2032
msgid ""
2034
2033
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
2035
2034
" used to find revisions matching user names, commit messages, etc.\n"
2037
2036
" a list of words but not others."
2038
2037
msgstr ""
2039
2038
2040
#: bzrlib/builtins.py:2615
2039
#: bzrlib/builtins.py:2644
2041
2040
msgid ""
2042
2041
" When exploring non-mainline history on large projects with deep\n"
2043
2042
" history, the performance of log can be greatly improved by installing\n"
2045
2044
" trading disk space for faster speed."
2046
2045
msgstr ""
2047
2046
2048
#: bzrlib/builtins.py:2624
2047
#: bzrlib/builtins.py:2653
2049
2048
msgid "Show from oldest to newest."
2050
2049
msgstr "Выводить от старых к новым."
2051
2050
2052
#: bzrlib/builtins.py:2627
2051
#: bzrlib/builtins.py:2656
2053
2052
msgid "Show files changed in each revision."
2054
2053
msgstr "Показывать файлы, изменённые в каждой ревизии."
2055
2054
2056
#: bzrlib/builtins.py:2633
2055
#: bzrlib/builtins.py:2662
2057
2056
msgid "Show just the specified revision. See also \"help revisionspec\"."
2058
2057
msgstr "Показать только указанную ревизию. См. также «help revisionspec»."
2059
2058
2060
#: bzrlib/builtins.py:2637
2059
#: bzrlib/builtins.py:2666
2061
2060
msgid "What names to list as authors - first, all or committer."
2062
2061
msgstr "Какие имена выводить, как авторов — first, all или committer."
2063
2062
2064
#: bzrlib/builtins.py:2638
2063
#: bzrlib/builtins.py:2667
2065
2064
msgid "Authors"
2066
2065
msgstr "Авторы"
2067
2066
2068
#: bzrlib/builtins.py:2643
2067
#: bzrlib/builtins.py:2672
2069
2068
msgid "Number of levels to display - 0 for all, 1 for flat."
2070
2069
msgstr "Число уровней для вывода — 0 для всех, 1 для плоского вывода."
2071
2070
2072
#: bzrlib/builtins.py:2653
2071
#: bzrlib/builtins.py:2682
2073
2072
msgid "Limit the output to the first N revisions."
2074
2073
msgstr "Ограничить вывод лишь первыми N ревизиями."
2075
2074
2076
#: bzrlib/builtins.py:2658
2075
#: bzrlib/builtins.py:2687
2077
2076
msgid "Show changes made in each revision as a patch."
2078
2077
msgstr "Показать изменения, сделанные в каждой ревизии, в виде патча."
2079
2078
2080
#: bzrlib/builtins.py:2660
2079
#: bzrlib/builtins.py:2689
2081
2080
msgid "Show merged revisions like --levels 0 does."
2082
2081
msgstr "Показывать слияния, как это делает --levels 0."
2083
2082
2084
#: bzrlib/builtins.py:2664
2083
#: bzrlib/builtins.py:2693
2085
2084
msgid "Do not report commits with more than one parent."
2086
2085
msgstr "Не сообщать о закреплениях с более, чем одним родителем."
2087
2086
2088
#: bzrlib/builtins.py:2666
2087
#: bzrlib/builtins.py:2695
2089
2088
msgid ""
2090
2089
"Display only the revisions that are not part of both ancestries (require -"
2091
2090
"rX..Y)."
2093
2092
"Показать только ревизии, которые не являются частью обоих предков (требует -"
2094
2093
"rX..Y)."
2095
2094
2096
#: bzrlib/builtins.py:2670
2095
#: bzrlib/builtins.py:2699
2097
2096
msgid "Show digital signature validity."
2098
2097
msgstr ""
2099
2098
2100
#: bzrlib/builtins.py:2673
2099
#: bzrlib/builtins.py:2702
2101
2100
msgid "Show revisions whose properties match this expression."
2102
2101
msgstr "Показывать ревизии, свойства которых удовлетворяют этому выражению."
2103
2102
2104
#: bzrlib/builtins.py:2677
2103
#: bzrlib/builtins.py:2706
2105
2104
msgid "Show revisions whose message matches this expression."
2106
2105
msgstr ""
2107
2106
"Показывать ревизии, комментарий которых удовлетворяет этому выражению."
2108
2107
2109
#: bzrlib/builtins.py:2681
2108
#: bzrlib/builtins.py:2710
2110
2109
msgid "Show revisions whose committer matches this expression."
2111
2110
msgstr ""
2112
2111
"Показывать ревизии, закрепитель которых удовлетворяет этому выражению."
2113
2112
2114
#: bzrlib/builtins.py:2685
2113
#: bzrlib/builtins.py:2714
2115
2114
msgid "Show revisions whose authors match this expression."
2116
2115
msgstr "Показывать ревизии, авторы которых удовлетворяют этому выражению."
2117
2116
2118
#: bzrlib/builtins.py:2689
2117
#: bzrlib/builtins.py:2718
2119
2118
msgid "Show revisions whose bugs match this expression."
2120
2119
msgstr "Показывать ревизии, ошибки которых удовлетворяют этому выражению."
2121
2120
2122
#: bzrlib/builtins.py:2743
2121
#: bzrlib/builtins.py:2772
2123
2122
msgid "--exclude-common-ancestry requires -r with two revisions"
2124
2123
msgstr "--exclude-common-ancestry требует -r с двумя ревизиями"
2125
2124
2126
#: bzrlib/builtins.py:2771
2125
#: bzrlib/builtins.py:2800
2127
2126
#, python-format
2128
2127
msgid "Path unknown at end or start of revision range: %s"
2129
2128
msgstr "Неизвестный путь в начале или конце интервала ревизий: %s"
2130
2129
2131
#: bzrlib/builtins.py:2888
2130
#: bzrlib/builtins.py:2917
2132
2131
#, python-format
2133
2132
msgid "bzr %s doesn't accept two revisions in different branches."
2134
2133
msgstr "bzr %s не принимает две ревизии в различных ветвях."
2135
2134
2136
#: bzrlib/builtins.py:2904
2135
#: bzrlib/builtins.py:2933
2137
2136
#, python-format
2138
2137
msgid "bzr %s --revision takes one or two values."
2139
2138
msgstr "bzr %s --revision принимает одно или два значения."
2140
2139
2141
#: bzrlib/builtins.py:2949
2140
#: bzrlib/builtins.py:2978
2142
2141
msgid ""
2143
2142
"List files in a tree.\n"
2144
2143
" "
2146
2145
"Вывести список файлов в дереве.\n"
2147
2146
" "
2148
2147
2149
#: bzrlib/builtins.py:2958
2148
#: bzrlib/builtins.py:2987
2150
2149
msgid "Recurse into subdirectories."
2151
2150
msgstr "Рекурсивно входить в поддиректории."
2152
2151
2153
#: bzrlib/builtins.py:2960
2152
#: bzrlib/builtins.py:2989
2154
2153
msgid "Print paths relative to the root of the branch."
2155
2154
msgstr "Выводить пути относительно корня ветви."
2156
2155
2157
#: bzrlib/builtins.py:2962
2156
#: bzrlib/builtins.py:2991
2158
2157
msgid "Print unknown files."
2159
2158
msgstr "Выводить неизвестные файлы."
2160
2159
2161
#: bzrlib/builtins.py:2963
2160
#: bzrlib/builtins.py:2992
2162
2161
msgid "Print versioned files."
2163
2162
msgstr "Выводить файлы под контролем системы версий."
2164
2163
2165
#: bzrlib/builtins.py:2966
2164
#: bzrlib/builtins.py:2995
2166
2165
msgid "Print ignored files."
2167
2166
msgstr "Выводить игнорируемые файлы."
2168
2167
2169
#: bzrlib/builtins.py:2968
2168
#: bzrlib/builtins.py:2997
2170
2169
msgid "List entries of a particular kind: file, directory, symlink."
2171
2170
msgstr "Выводить файлы определённого типа: file, directory, symlink."
2172
2171
2173
#: bzrlib/builtins.py:2981
2172
#: bzrlib/builtins.py:3010
2174
2173
msgid "invalid kind specified"
2175
2174
msgstr "указан неверный вид файла"
2176
2175
2177
#: bzrlib/builtins.py:2984
2176
#: bzrlib/builtins.py:3013
2178
2177
msgid "Cannot set both --verbose and --null"
2179
2178
msgstr "Нельзя установить оба --verbose и --null"
2180
2179
2181
#: bzrlib/builtins.py:2993
2180
#: bzrlib/builtins.py:3022
2182
2181
msgid "cannot specify both --from-root and PATH"
2183
2182
msgstr "нельзя указать оба --from-root и PATH"
2184
2183
2185
#: bzrlib/builtins.py:3080
2184
#: bzrlib/builtins.py:3109
2186
2185
msgid "Ignore specified files or patterns."
2187
2186
msgstr "Игнорировать указанные файлы или шаблоны."
2188
2187
2189
#: bzrlib/builtins.py:3082
2188
#: bzrlib/builtins.py:3111
2190
2189
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2191
2190
msgstr "Смотрите подробности о синтаксисе шаблонов в «bzr help patterns»."
2192
2191
2193
#: bzrlib/builtins.py:3084
2192
#: bzrlib/builtins.py:3113
2194
2193
msgid ""
2195
2194
"If a .bzrignore file does not exist, the ignore command\n"
2196
2195
"will create one and add the specified files or patterns to the newly\n"
2204
2203
"к системе версий. Создание файла .bzrignore без использования\n"
2205
2204
"команды ignore потребует явного добавления командой add."
2206
2205
2207
#: bzrlib/builtins.py:3090
2206
#: bzrlib/builtins.py:3119
2208
2207
msgid ""
2209
2208
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2210
2209
"After adding, editing or deleting that file either indirectly by\n"
2216
2215
"файла, как неявно с помощью этой команды, так и явно при помощи\n"
2217
2216
"редактора, не забывайте закреплять его."
2218
2217
2219
#: bzrlib/builtins.py:3095
2218
#: bzrlib/builtins.py:3124
2220
2219
msgid ""
2221
2220
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2222
2221
"the global ignore file can be found in the application data directory as\n"
2232
2231
"Эта команда не изменяет глобальный файл игнорирования. Он может быть\n"
2233
2232
"отредактирован вручную с помощью текстового редактора."
2234
2233
2235
#: bzrlib/builtins.py:3101
2234
#: bzrlib/builtins.py:3130
2236
2235
msgid ""
2237
2236
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2238
2237
"precedence over regular ignores. Such exceptions are used to specify\n"
2243
2242
"указания файлов, которые должны попасть под контроль системы версий, но\n"
2244
2243
"по умолчанию игнорируются."
2245
2244
2246
#: bzrlib/builtins.py:3105
2245
#: bzrlib/builtins.py:3134
2247
2246
msgid ""
2248
2247
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2249
2248
"precedence over the '!' exception patterns."
2251
2250
"Шаблоны, начинающиеся с '!!' ведут себя как обычные шаблоны, но имеют\n"
2252
2251
"приоритет над шаблонами исключений '!'."
2253
2252
2254
#: bzrlib/builtins.py:3108
2253
#: bzrlib/builtins.py:3137
2255
2254
msgid ""
2256
2255
":Notes: \n"
2257
2256
" \n"
2263
2262
"* Шаблоны игнорирования, содержащие специальные символы оболочки,\n"
2264
2263
" должны быть заключены в кавычки при указании в командной строке."
2265
2264
2266
#: bzrlib/builtins.py:3113
2265
#: bzrlib/builtins.py:3142
2267
2266
msgid ""
2268
2267
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2269
2268
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2272
2271
" Чтобы добавить шаблон, начинающийся с этого символа, используйте\n"
2273
2272
" префикс \"RE:\"."
2274
2273
2275
#: bzrlib/builtins.py:3116
2274
#: bzrlib/builtins.py:3145
2276
2275
msgid ""
2277
2276
":Examples:\n"
2278
2277
" Ignore the top level Makefile::"
2280
2279
":Примеры:\n"
2281
2280
" Игнорировать файл Makefile на верхнем уровне::"
2282
2281
2283
#: bzrlib/builtins.py:3119
2282
#: bzrlib/builtins.py:3148
2284
2283
msgid " bzr ignore ./Makefile"
2285
2284
msgstr " bzr ignore ./Makefile"
2286
2285
2287
#: bzrlib/builtins.py:3121
2286
#: bzrlib/builtins.py:3150
2288
2287
msgid " Ignore .class files in all directories...::"
2289
2288
msgstr " Игнорировать файлы .class во всех директориях...::"
2290
2289
2291
#: bzrlib/builtins.py:3123
2290
#: bzrlib/builtins.py:3152
2292
2291
msgid " bzr ignore \"*.class\""
2293
2292
msgstr " bzr ignore \"*.class\""
2294
2293
2295
#: bzrlib/builtins.py:3125
2294
#: bzrlib/builtins.py:3154
2296
2295
msgid " ...but do not ignore \"special.class\"::"
2297
2296
msgstr " ...но не игнорировать \"special.class\"::"
2298
2297
2299
#: bzrlib/builtins.py:3127
2298
#: bzrlib/builtins.py:3156
2300
2299
msgid " bzr ignore \"!special.class\""
2301
2300
msgstr " bzr ignore \"!special.class\""
2302
2301
2303
#: bzrlib/builtins.py:3129
2302
#: bzrlib/builtins.py:3158
2304
2303
msgid " Ignore files whose name begins with the \"#\" character::"
2305
2304
msgstr " Игнорировать файлы, начинающиеся с символа \"#\"::"
2306
2305
2307
#: bzrlib/builtins.py:3131
2306
#: bzrlib/builtins.py:3160
2308
2307
msgid " bzr ignore \"RE:^#\""
2309
2308
msgstr " bzr ignore \"RE:^#\""
2310
2309
2311
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2310
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2312
2311
msgid " Ignore .o files under the lib directory::"
2313
2312
msgstr " Игнорировать файлы .o в директории lib::"
2314
2313
2315
#: bzrlib/builtins.py:3135
2314
#: bzrlib/builtins.py:3164
2316
2315
msgid " bzr ignore \"lib/**/*.o\""
2317
2316
msgstr " bzr ignore \"lib/**/*.o\""
2318
2317
2319
#: bzrlib/builtins.py:3139
2318
#: bzrlib/builtins.py:3168
2320
2319
msgid " bzr ignore \"RE:lib/.*\\.o\""
2321
2320
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2322
2321
2323
#: bzrlib/builtins.py:3141
2322
#: bzrlib/builtins.py:3170
2324
2323
msgid " Ignore everything but the \"debian\" toplevel directory::"
2325
2324
msgstr " Игнорировать всё, кроме верхней директории \"debian\"::"
2326
2325
2327
#: bzrlib/builtins.py:3143
2326
#: bzrlib/builtins.py:3172
2328
2327
msgid ""
2329
2328
" bzr ignore \"RE:(?!debian/).*\"\n"
2330
2329
" \n"
2344
2343
" bzr ignore \"!./local\"\n"
2345
2344
" bzr ignore \"!!*~\""
2346
2345
2347
#: bzrlib/builtins.py:3157
2346
#: bzrlib/builtins.py:3186
2348
2347
msgid "Display the default ignore rules that bzr uses."
2349
2348
msgstr "Вывести правила игнорирования, которые bzr использует по умолчанию."
2350
2349
2351
#: bzrlib/builtins.py:3169
2350
#: bzrlib/builtins.py:3198
2352
2351
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2353
2352
msgstr ""
2354
2353
"Для ignore требуется как минимум одно из NAME_PATTERN или --default-rules."
2355
2354
2356
#: bzrlib/builtins.py:3180
2355
#: bzrlib/builtins.py:3209
2357
2356
#, python-format
2358
2357
msgid "Invalid ignore pattern found. %s"
2359
2358
msgid_plural "Invalid ignore patterns found. %s"
2361
2360
msgstr[1] "Найдены некорректные шаблоны игнорирования. %s"
2362
2361
msgstr[2] "Найдены некорректные шаблоны игнорирования. %s"
2363
2362
2364
#: bzrlib/builtins.py:3189
2363
#: bzrlib/builtins.py:3218
2365
2364
msgid "NAME_PATTERN should not be an absolute path"
2366
2365
msgstr "NAME_PATTERN не должен быть абсолютным путём"
2367
2366
2368
#: bzrlib/builtins.py:3202
2367
#: bzrlib/builtins.py:3231
2369
2368
#, python-format
2370
2369
msgid ""
2371
2370
"Warning: the following files are version controlled and match your ignore "
2380
2379
"Эти файлы будут продолжать под контролем системы версий, пока вы не "
2381
2380
"выполните 'bzr remove'.\n"
2382
2381
2383
#: bzrlib/builtins.py:3209
2382
#: bzrlib/builtins.py:3238
2384
2383
msgid "List ignored files and the patterns that matched them."
2385
2384
msgstr "Вывести игнорируемые файлы и шаблоны, которым они удовлетворяют."
2386
2385
2387
#: bzrlib/builtins.py:3211
2386
#: bzrlib/builtins.py:3240
2388
2387
msgid ""
2389
2388
"List all the ignored files and the ignore pattern that caused the file to\n"
2390
2389
"be ignored."
2392
2391
"Вывести все игнорируемые файлы и шаблоны игнорирования, из-за которых эти\n"
2393
2392
"файлы игнорируются."
2394
2393
2395
#: bzrlib/builtins.py:3214
2394
#: bzrlib/builtins.py:3243
2396
2395
msgid "Alternatively, to list just the files::"
2397
2396
msgstr "Альтернативно, чтобы вывести только файлы::"
2398
2397
2399
#: bzrlib/builtins.py:3216
2398
#: bzrlib/builtins.py:3245
2400
2399
msgid " bzr ls --ignored"
2401
2400
msgstr " bzr ls --ignored"
2402
2401
2403
#: bzrlib/builtins.py:3250
2402
#: bzrlib/builtins.py:3279
2404
2403
#, python-format
2405
2404
msgid "not a valid revision-number: %r"
2406
2405
msgstr "некорректный номер ревизии: %r"
2407
2406
2408
#: bzrlib/builtins.py:3257
2407
#: bzrlib/builtins.py:3286
2409
2408
msgid ""
2410
2409
"Export current or past revision to a destination directory or archive."
2411
2410
msgstr ""
2412
2411
"Экспортировать текущую или прошлую ревизию в директорию назначения\r\n"
2413
2412
"или архив."
2414
2413
2415
#: bzrlib/builtins.py:3259
2414
#: bzrlib/builtins.py:3288
2416
2415
msgid "If no revision is specified this exports the last committed revision."
2417
2416
msgstr "Если ревизия не указана, экспортирует последнюю ревизию."
2418
2417
2419
#: bzrlib/builtins.py:3261
2418
#: bzrlib/builtins.py:3290
2420
2419
msgid ""
2421
2420
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2422
2421
"given, try to find the format with the extension. If no extension\n"
2426
2425
"Если не указан, формат определяется по расширению. Если расширение\n"
2427
2426
"отсутствует, экспортирует в директорию (эквивалентно --format=dir)."
2428
2427
2429
#: bzrlib/builtins.py:3265
2428
#: bzrlib/builtins.py:3294
2430
2429
msgid ""
2431
2430
"If root is supplied, it will be used as the root directory inside\n"
2432
2431
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2437
2436
"умолчанию используется имя файла для эскпорта. Опция root не имеет\n"
2438
2437
"эффекта для формата 'dir'."
2439
2438
2440
#: bzrlib/builtins.py:3269
2439
#: bzrlib/builtins.py:3298
2441
2440
msgid ""
2442
2441
"If branch is omitted then the branch containing the current working\n"
2443
2442
"directory will be used."
2445
2444
"Если ветвь опущена, используется ветвь, содержащая текущую рабочую\n"
2446
2445
"директорию."
2447
2446
2448
#: bzrlib/builtins.py:3272
2447
#: bzrlib/builtins.py:3301
2449
2448
msgid ""
2450
2449
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2451
2450
msgstr ""
2452
2451
"Замечание: Экспорт в zip деревьев с именами файлов, содержащими не-ASCII\r\n"
2453
2452
"символы, не поддерживается."
2454
2453
2455
#: bzrlib/builtins.py:3274
2454
#: bzrlib/builtins.py:3303
2456
2455
msgid ""
2457
2456
" ================= =========================\n"
2458
2457
" Supported formats Autodetected by extension\n"
2474
2473
" zip .zip\n"
2475
2474
" ====================== ============================="
2476
2475
2477
#: bzrlib/builtins.py:3288
2476
#: bzrlib/builtins.py:3317
2478
2477
msgid "Type of file to export to."
2479
2478
msgstr "Тип файла для экспорта."
2480
2479
2481
#: bzrlib/builtins.py:3291
2480
#: bzrlib/builtins.py:3320
2482
2481
msgid "Apply content filters to export the convenient form."
2483
2482
msgstr ""
2484
2483
2485
#: bzrlib/builtins.py:3295
2484
#: bzrlib/builtins.py:3324
2486
2485
msgid "Name of the root directory inside the exported file."
2487
2486
msgstr "Имя корневой директории внутри экспортируемого файла."
2488
2487
2489
#: bzrlib/builtins.py:3297
2488
#: bzrlib/builtins.py:3326
2490
2489
msgid ""
2491
2490
"Set modification time of files to that of the last revision in which it was "
2492
2491
"changed."
2494
2493
"Установить время изменения файлов на время последней ревизии, в которой они "
2495
2494
"были изменены."
2496
2495
2497
#: bzrlib/builtins.py:3300
2496
#: bzrlib/builtins.py:3329
2498
2497
msgid ""
2499
2498
"Export the working tree contents rather than that of the last revision."
2500
2499
msgstr ""
2501
2500
2502
#: bzrlib/builtins.py:3319
2501
#: bzrlib/builtins.py:3348
2503
2502
msgid "--uncommitted requires a working tree"
2504
2503
msgstr "--uncommitted требует рабочее дерево"
2505
2504
2506
#: bzrlib/builtins.py:3328
2505
#: bzrlib/builtins.py:3357
2507
2506
#, python-format
2508
2507
msgid "Unsupported export format: %s"
2509
2508
msgstr "Неподдерживаемый формат экспорта: %s"
2510
2509
2511
#: bzrlib/builtins.py:3332
2510
#: bzrlib/builtins.py:3361
2512
2511
msgid ""
2513
2512
"Write the contents of a file as of a given revision to standard output."
2514
2513
msgstr ""
2515
2514
"Вывести содержимое файла из определённой ревизии на стандартный вывод."
2516
2515
2517
#: bzrlib/builtins.py:3334
2516
#: bzrlib/builtins.py:3363
2518
2517
msgid "If no revision is nominated, the last revision is used."
2519
2518
msgstr "Если ревизия не указана, используется последняя."
2520
2519
2521
#: bzrlib/builtins.py:3336
2520
#: bzrlib/builtins.py:3365
2522
2521
msgid ""
2523
2522
"Note: Take care to redirect standard output when using this command on a\n"
2524
2523
"binary file."
2526
2525
"Замечание: Не забывайте перенаправлять стандартный вывод при использовании\n"
2527
2526
"этой команды на двоичном файле."
2528
2527
2529
#: bzrlib/builtins.py:3342
2528
#: bzrlib/builtins.py:3371
2530
2529
msgid "The path name in the old tree."
2531
2530
msgstr "Имя пути в старом дереве."
2532
2531
2533
#: bzrlib/builtins.py:3343
2532
#: bzrlib/builtins.py:3372
2534
2533
msgid "Apply content filters to display the convenience form."
2535
2534
msgstr "Применить фильтры содержимого для отображения в удобной форме."
2536
2535
2537
#: bzrlib/builtins.py:3354
2536
#: bzrlib/builtins.py:3383
2538
2537
msgid "bzr cat --revision takes exactly one revision specifier"
2539
2538
msgstr "bzr cat --revision принимает ровно один спецификатор ревизии"
2540
2539
2541
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2540
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2542
2541
msgid "{0!r} is not present in revision {1}"
2543
2542
msgstr "{0!r} не представлен в ревизии {1}"
2544
2543
2545
#: bzrlib/builtins.py:3414
2544
#: bzrlib/builtins.py:3443
2546
2545
msgid "Commit changes into a new revision."
2547
2546
msgstr "Закрепить изменения в новой ревизии."
2548
2547
2549
#: bzrlib/builtins.py:3416
2548
#: bzrlib/builtins.py:3445
2550
2549
msgid ""
2551
2550
"An explanatory message needs to be given for each commit. This is\n"
2552
2551
"often done by using the --message option (getting the message from the\n"
2556
2555
"boilerplate text loaded into the editor, use the --show-diff option."
2557
2556
msgstr ""
2558
2557
2559
#: bzrlib/builtins.py:3423
2558
#: bzrlib/builtins.py:3452
2560
2559
msgid ""
2561
2560
"By default, the entire tree is committed and the person doing the\n"
2562
2561
"commit is assumed to be the author. These defaults can be overridden\n"
2565
2564
"По умолчанию, закрепляется всё дерево и закрепляющий считается автором.\n"
2566
2565
"Эти умолчания могут быть перезаписаны, как объяснено ниже."
2567
2566
2568
#: bzrlib/builtins.py:3427
2567
#: bzrlib/builtins.py:3456
2569
2568
msgid ":Selective commits:"
2570
2569
msgstr ":Выборочные закрепления:"
2571
2570
2572
#: bzrlib/builtins.py:3429
2571
#: bzrlib/builtins.py:3458
2573
2572
msgid ""
2574
2573
" If selected files are specified, only changes to those files are\n"
2575
2574
" committed. If a directory is specified then the directory and\n"
2579
2578
" Если указана директория, то закрепляется директория и всё её\n"
2580
2579
" содержимое."
2581
2580
2582
#: bzrlib/builtins.py:3433
2581
#: bzrlib/builtins.py:3462
2583
2582
msgid ""
2584
2583
" When excludes are given, they take precedence over selected files.\n"
2585
2584
" For example, to commit only changes within foo, but not changes\n"
2589
2588
" Например, чтобы закрепить изменения внутри foo, но не изменения\n"
2590
2589
" в foo/bar::"
2591
2590
2592
#: bzrlib/builtins.py:3437
2591
#: bzrlib/builtins.py:3466
2593
2592
msgid " bzr commit foo -x foo/bar"
2594
2593
msgstr " bzr commit foo -x foo/bar"
2595
2594
2596
#: bzrlib/builtins.py:3439
2595
#: bzrlib/builtins.py:3468
2597
2596
msgid " A selective commit after a merge is not yet supported."
2598
2597
msgstr " Выборочные закрепления после слияния пока не поддерживаются."
2599
2598
2600
#: bzrlib/builtins.py:3441
2599
#: bzrlib/builtins.py:3470
2601
2600
msgid ":Custom authors:"
2602
2601
msgstr ":Выбор автора:"
2603
2602
2604
#: bzrlib/builtins.py:3443
2603
#: bzrlib/builtins.py:3472
2605
2604
msgid ""
2606
2605
" If the author of the change is not the same person as the committer,\n"
2607
2606
" you can specify the author's name using the --author option. The\n"
2616
2615
" \"John Doe <jdoe@example.com>\". Если в изменении участвовал более,\n"
2617
2616
" чем один автор, вы можете указать эту опцию несколько раз."
2618
2617
2619
#: bzrlib/builtins.py:3450
2618
#: bzrlib/builtins.py:3479
2620
2619
msgid ":Checks:"
2621
2620
msgstr ":Проверки:"
2622
2621
2623
#: bzrlib/builtins.py:3452
2622
#: bzrlib/builtins.py:3481
2624
2623
msgid ""
2625
2624
" A common mistake is to forget to add a new file or directory before\n"
2626
2625
" running the commit command. The --strict option checks for unknown\n"
2634
2633
" быть реализованы определением обработчиков. Подробности можно найти,\n"
2635
2634
" выполнив команду ``bzr help hooks''."
2636
2635
2637
#: bzrlib/builtins.py:3458
2636
#: bzrlib/builtins.py:3487
2638
2637
msgid ":Things to note:"
2639
2638
msgstr ":На заметку:"
2640
2639
2641
#: bzrlib/builtins.py:3460
2640
#: bzrlib/builtins.py:3489
2642
2641
msgid ""
2643
2642
" If you accidentially commit the wrong changes or make a spelling\n"
2644
2643
" mistake in the commit message say, you can use the uncommit command\n"
2649
2648
" uncommit, чтобы отменить последнее закрепление. Подробности смотрите\n"
2650
2649
" в «bzr help uncommit»."
2651
2650
2652
#: bzrlib/builtins.py:3464
2651
#: bzrlib/builtins.py:3493
2653
2652
msgid ""
2654
2653
" Hooks can also be configured to run after a commit. This allows you\n"
2655
2654
" to trigger updates to external systems like bug trackers. The --fixes\n"
2657
2656
" one or more bugs. See ``bzr help bugs`` for details."
2658
2657
msgstr ""
2659
2658
2660
#: bzrlib/builtins.py:3474
2659
#: bzrlib/builtins.py:3503
2661
2660
msgid "Do not consider changes made to a given path."
2662
2661
msgstr "Не рассматривать изменения, сделанные в заданном пути."
2663
2662
2664
#: bzrlib/builtins.py:3477
2663
#: bzrlib/builtins.py:3506
2665
2664
msgid "Description of the new revision."
2666
2665
msgstr "Описание новой ревизии."
2667
2666
2668
#: bzrlib/builtins.py:3480
2667
#: bzrlib/builtins.py:3509
2669
2668
msgid "Commit even if nothing has changed."
2670
2669
msgstr "Закрепить, даже если ничего не изменилось."
2671
2670
2672
#: bzrlib/builtins.py:3484
2671
#: bzrlib/builtins.py:3513
2673
2672
msgid "Take commit message from this file."
2674
2673
msgstr "Взять сообщение о закреплении из этого файла."
2675
2674
2676
#: bzrlib/builtins.py:3486
2675
#: bzrlib/builtins.py:3515
2677
2676
msgid "Refuse to commit if there are unknown files in the working tree."
2678
2677
msgstr ""
2679
2678
"Отказываться закреплять, если в рабочем дереве есть неизвестные файлы."
2680
2679
2681
#: bzrlib/builtins.py:3489
2680
#: bzrlib/builtins.py:3518
2682
2681
msgid ""
2683
2682
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2684
2683
"08:00:00 +0100'."
2686
2685
"Вручную установить время закрепления, используя формат даты закрепления, "
2687
2686
"напр. '2009-10-10 08:00:00 +0100'."
2688
2687
2689
#: bzrlib/builtins.py:3492
2688
#: bzrlib/builtins.py:3521
2690
2689
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2691
2690
msgstr ""
2692
2691
"Отметить ошибку, как исправленную в этой ревизии (см. «bzr help bugs»)."
2693
2692
2694
#: bzrlib/builtins.py:3495
2693
#: bzrlib/builtins.py:3524
2695
2694
msgid "Set the author's name, if it's different from the committer."
2696
2695
msgstr "Установить имя автора, если оно отличается от имени закрепляющего."
2697
2696
2698
#: bzrlib/builtins.py:3498
2697
#: bzrlib/builtins.py:3527
2699
2698
msgid ""
2700
2699
"Perform a local commit in a bound branch. Local commits are not pushed to "
2701
2700
"the master branch until a normal commit is performed."
2704
2703
"выгружаются в основную ветвь до тех пор, пока не совершено нормальное "
2705
2704
"закрепление."
2706
2705
2707
#: bzrlib/builtins.py:3504
2706
#: bzrlib/builtins.py:3533
2708
2707
msgid ""
2709
2708
"When no message is supplied, show the diff along with the status summary in "
2710
2709
"the message editor."
2712
2711
"Если не указано сообщение, показывать изменения формате diff вместе с "
2713
2712
"обзором состояния в редакторе сообщения."
2714
2713
2715
#: bzrlib/builtins.py:3507
2714
#: bzrlib/builtins.py:3536
2716
2715
msgid ""
2717
2716
"When committing to a foreign version control system do not push data that "
2718
2717
"can not be natively represented."
2720
2719
"При закреплении в иной системе контроля версий, не выгружать данные, которые "
2721
2720
"нельзя в ней представить."
2722
2721
2723
#: bzrlib/builtins.py:3525
2722
#: bzrlib/builtins.py:3554
2724
2723
#, python-format
2725
2724
msgid ""
2726
2725
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2732
2731
"Больше информации об этом можно узнать, выполнив «bzr help bugs». "
2733
2732
"Закрепление отклонено."
2734
2733
2735
#: bzrlib/builtins.py:3534
2734
#: bzrlib/builtins.py:3563
2736
2735
#, python-format
2737
2736
msgid ""
2738
2737
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2743
2742
"информации об этом можно узнать, выполнив «bzr help bugs».\n"
2744
2743
"Закрепление отклонено."
2745
2744
2746
#: bzrlib/builtins.py:3543
2745
#: bzrlib/builtins.py:3572
2747
2746
#, python-format
2748
2747
msgid "Unrecognized bug %s. Commit refused."
2749
2748
msgstr "Ошибка %s не распознана. Закрепление отклонено."
2750
2749
2751
#: bzrlib/builtins.py:3546
2750
#: bzrlib/builtins.py:3575
2752
2751
#, python-format
2753
2752
msgid ""
2754
2753
"%s\n"
2757
2756
"%s\n"
2758
2757
"Закрепление отклонено."
2759
2758
2760
#: bzrlib/builtins.py:3570
2759
#: bzrlib/builtins.py:3599
2761
2760
msgid "Could not parse --commit-time: "
2762
2761
msgstr "Не удалось разобрать --commit-time: "
2763
2762
2764
#: bzrlib/builtins.py:3610
2763
#: bzrlib/builtins.py:3639
2765
2764
msgid "please specify either --message or --file"
2766
2765
msgstr "укажите либо --message, либо --file"
2767
2766
2768
#: bzrlib/builtins.py:3639
2767
#: bzrlib/builtins.py:3668
2769
2768
msgid "please specify a commit message with either --message or --file"
2770
2769
msgstr "укажите сообщение о закреплении, используя --message либо --file"
2771
2770
2772
#: bzrlib/builtins.py:3642
2771
#: bzrlib/builtins.py:3671
2773
2772
msgid ""
2774
2773
"Empty commit message specified. Please specify a commit message with either -"
2775
2774
"-message or --file or leave a blank message with --message \"\"."
2777
2776
"Указано пустое сообщение о закреплении. Пожалуйста, укажите сообщение опцией "
2778
2777
"--message либо --file или оставьте пустым, указав --message \"\"."
2779
2778
2780
#: bzrlib/builtins.py:3662
2779
#: bzrlib/builtins.py:3691
2781
2780
msgid ""
2782
2781
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2783
2782
"-unchanged to force an empty commit."
2786
2785
"командой 'bzr add', или используйте --unchanged, чтобы принудительно сделать "
2787
2786
"пустое закрепление."
2788
2787
2789
#: bzrlib/builtins.py:3666
2788
#: bzrlib/builtins.py:3695
2790
2789
msgid ""
2791
2790
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2792
2791
"resolve FILE\" to resolve."
2794
2793
"В рабочем дереве обнаружены конфликты. Выполните «bzr conflicts», чтобы "
2795
2794
"вывести список конфликтов и «bzr resolve ФАЙЛ» для исправления."
2796
2795
2797
#: bzrlib/builtins.py:3670
2796
#: bzrlib/builtins.py:3699
2798
2797
msgid "Commit refused because there are unknown files in the working tree."
2799
2798
msgstr "Закрепление отклонено, поскольку в рабочем дереве неизвестные файлы."
2800
2799
2801
#: bzrlib/builtins.py:3673
2800
#: bzrlib/builtins.py:3702
2802
2801
msgid ""
2803
2802
"\n"
2804
2803
"To commit to master branch, run update and then commit.\n"
2805
2804
"You can also pass --local to commit to continue working disconnected."
2806
2805
msgstr ""
2807
2806
2808
#: bzrlib/builtins.py:3681
2807
#: bzrlib/builtins.py:3710
2809
2808
msgid ""
2810
2809
"Validate working tree structure, branch consistency and repository history."
2811
2810
msgstr ""
2812
2811
2813
#: bzrlib/builtins.py:3683
2812
#: bzrlib/builtins.py:3712
2814
2813
msgid ""
2815
2814
"This command checks various invariants about branch and repository storage\n"
2816
2815
"to detect data corruption or bzr bugs."
2817
2816
msgstr ""
2818
2817
2819
#: bzrlib/builtins.py:3686
2818
#: bzrlib/builtins.py:3715
2820
2819
msgid ""
2821
2820
"The working tree and branch checks will only give output if a problem is\n"
2822
2821
"detected. The output fields of the repository check are:"
2824
2823
"Проверки рабочего дерева и ветви выведут что-либо только в случае\n"
2825
2824
"обнаружения проблемы. Поля вывода проверки репозитория следующие:"
2826
2825
2827
#: bzrlib/builtins.py:3689
2826
#: bzrlib/builtins.py:3718
2828
2827
msgid ""
2829
2828
"revisions\n"
2830
2829
" This is just the number of revisions checked. It doesn't\n"
2834
2833
" Это просто число проверенных ревизий. Оно не указывает\n"
2835
2834
" на проблему."
2836
2835
2837
#: bzrlib/builtins.py:3693
2836
#: bzrlib/builtins.py:3722
2838
2837
msgid ""
2839
2838
"versionedfiles\n"
2840
2839
" This is just the number of versionedfiles checked. It\n"
2844
2843
" Это просто число проверенных файлов под контролем системы\n"
2845
2844
" версий. Оно не указывает на проблему."
2846
2845
2847
#: bzrlib/builtins.py:3697
2846
#: bzrlib/builtins.py:3726
2848
2847
msgid ""
2849
2848
"unreferenced ancestors\n"
2850
2849
" Texts that are ancestors of other texts, but\n"
2856
2855
" корректных ссылок в истории ревизии. Это небольшая\n"
2857
2856
" проблема, с которой Bazaar может разобраться."
2858
2857
2859
#: bzrlib/builtins.py:3702
2858
#: bzrlib/builtins.py:3731
2860
2859
msgid ""
2861
2860
"unique file texts\n"
2862
2861
" This is the total number of unique file contents\n"
2866
2865
" Это общее число уникального содержимого файлов, встреченного\n"
2867
2866
" в проверенных ревизиях. Оно не указывает на проблему."
2868
2867
2869
#: bzrlib/builtins.py:3706
2868
#: bzrlib/builtins.py:3735
2870
2869
msgid ""
2871
2870
"repeated file texts\n"
2872
2871
" This is the total number of repeated texts seen\n"
2880
2879
" файлов изменились, но их содержимое осталось прежним. Оно не\n"
2881
2880
" указывает на проблему."
2882
2881
2883
#: bzrlib/builtins.py:3712
2882
#: bzrlib/builtins.py:3741
2884
2883
msgid ""
2885
2884
"If no restrictions are specified, all Bazaar data that is found at the "
2886
2885
"given\n"
2887
2886
"location will be checked."
2888
2887
msgstr ""
2889
2888
2890
#: bzrlib/builtins.py:3717
2889
#: bzrlib/builtins.py:3746
2891
2890
msgid " Check the tree and branch at 'foo'::"
2892
2891
msgstr " Проверить рабочее дерево и ветвь в 'foo'::"
2893
2892
2894
#: bzrlib/builtins.py:3719
2893
#: bzrlib/builtins.py:3748
2895
2894
msgid " bzr check --tree --branch foo"
2896
2895
msgstr " bzr check --tree --branch foo"
2897
2896
2898
#: bzrlib/builtins.py:3721
2897
#: bzrlib/builtins.py:3750
2899
2898
msgid " Check only the repository at 'bar'::"
2900
2899
msgstr " Проверить только репозиторий в 'bar'::"
2901
2900
2902
#: bzrlib/builtins.py:3723
2901
#: bzrlib/builtins.py:3752
2903
2902
msgid " bzr check --repo bar"
2904
2903
msgstr " bzr check --repo bar"
2905
2904
2906
#: bzrlib/builtins.py:3725
2905
#: bzrlib/builtins.py:3754
2907
2906
msgid " Check everything at 'baz'::"
2908
2907
msgstr " Проверить всё в 'baz'::"
2909
2908
2910
#: bzrlib/builtins.py:3727
2909
#: bzrlib/builtins.py:3756
2911
2910
msgid " bzr check baz"
2912
2911
msgstr " bzr check baz"
2913
2912
2914
#: bzrlib/builtins.py:3733
2913
#: bzrlib/builtins.py:3762
2915
2914
msgid "Check the branch related to the current directory."
2916
2915
msgstr "Проверить ветвь, относящуюся к текущей директории."
2917
2916
2918
#: bzrlib/builtins.py:3735
2917
#: bzrlib/builtins.py:3764
2919
2918
msgid "Check the repository related to the current directory."
2920
2919
msgstr "Проверить репозиторий, относящийся к текущей директории."
2921
2920
2922
#: bzrlib/builtins.py:3737
2921
#: bzrlib/builtins.py:3766
2923
2922
msgid "Check the working tree related to the current directory."
2924
2923
msgstr "Проверить рабочее дерево, относящееся к текущей директории."
2925
2924
2926
#: bzrlib/builtins.py:3751
2925
#: bzrlib/builtins.py:3780
2927
2926
msgid "Upgrade a repository, branch or working tree to a newer format."
2928
2927
msgstr "Обновить репозиторий, ветвь или рабочее дерево до нового формата."
2929
2928
2930
#: bzrlib/builtins.py:3753
2929
#: bzrlib/builtins.py:3782
2931
2930
msgid ""
2932
2931
"When the default format has changed after a major new release of\n"
2933
2932
"Bazaar, you may be informed during certain operations that you\n"
2936
2935
"with older repositories or with older versions of Bazaar."
2937
2936
msgstr ""
2938
2937
2939
#: bzrlib/builtins.py:3759
2938
#: bzrlib/builtins.py:3788
2940
2939
msgid ""
2941
2940
"If you wish to upgrade to a particular format rather than the\n"
2942
2941
"current default, that can be specified using the --format option.\n"
2946
2945
"2.x default) so downgrading is not always possible."
2947
2946
msgstr ""
2948
2947
2949
#: bzrlib/builtins.py:3766
2948
#: bzrlib/builtins.py:3795
2950
2949
msgid ""
2951
2950
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2952
2951
"process (where # is a number). By default, this is left there on\n"
2957
2956
"afterwards."
2958
2957
msgstr ""
2959
2958
2960
#: bzrlib/builtins.py:3774
2959
#: bzrlib/builtins.py:3803
2961
2960
msgid ""
2962
2961
"If the location given is a shared repository, dependent branches\n"
2963
2962
"are also converted provided the repository converts successfully.\n"
2965
2964
"tried."
2966
2965
msgstr ""
2967
2966
2968
#: bzrlib/builtins.py:3779
2967
#: bzrlib/builtins.py:3808
2969
2968
msgid ""
2970
2969
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2971
2970
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2972
2971
msgstr ""
2973
2972
2974
#: bzrlib/builtins.py:3787
2973
#: bzrlib/builtins.py:3816
2975
2974
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2976
2975
msgstr ""
2977
2976
"Обновить до определённого формата. Подробности см. в «bzr help formats»."
2978
2977
2979
#: bzrlib/builtins.py:3791
2978
#: bzrlib/builtins.py:3820
2980
2979
msgid "Branch format"
2981
2980
msgstr "Формат ветви"
2982
2981
2983
#: bzrlib/builtins.py:3793
2982
#: bzrlib/builtins.py:3822
2984
2983
msgid "Remove the backup.bzr directory if successful."
2985
2984
msgstr "Удалить директорию backup.bzr при успешном завершении."
2986
2985
2987
#: bzrlib/builtins.py:3795
2986
#: bzrlib/builtins.py:3824
2988
2987
msgid "Show what would be done, but don't actually do anything."
2989
2988
msgstr ""
2990
2989
2991
#: bzrlib/builtins.py:3810
2990
#: bzrlib/builtins.py:3839
2992
2991
msgid "Show or set bzr user id."
2993
2992
msgstr ""
2994
2993
2995
#: bzrlib/builtins.py:3812
2994
#: bzrlib/builtins.py:3841
2996
2995
msgid ""
2997
2996
":Examples:\n"
2998
2997
" Show the email of the current user::"
3000
2999
":Примеры:\n"
3001
3000
" Показать email текущего пользователя::"
3002
3001
3003
#: bzrlib/builtins.py:3815
3002
#: bzrlib/builtins.py:3844
3004
3003
msgid " bzr whoami --email"
3005
3004
msgstr " bzr whoami --email"
3006
3005
3007
#: bzrlib/builtins.py:3817
3006
#: bzrlib/builtins.py:3846
3008
3007
msgid " Set the current user::"
3009
3008
msgstr " Установить текущего пользователя::"
3010
3009
3011
#: bzrlib/builtins.py:3819
3010
#: bzrlib/builtins.py:3848
3012
3011
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
3013
3012
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
3014
3013
3015
#: bzrlib/builtins.py:3823
3014
#: bzrlib/builtins.py:3852
3016
3015
msgid "Display email address only."
3017
3016
msgstr "Показать только адрес email."
3018
3017
3019
#: bzrlib/builtins.py:3825
3018
#: bzrlib/builtins.py:3854
3020
3019
msgid "Set identity for the current branch instead of globally."
3021
3020
msgstr ""
3022
3021
3023
#: bzrlib/builtins.py:3851
3022
#: bzrlib/builtins.py:3880
3024
3023
msgid "--email can only be used to display existing identity"
3025
3024
msgstr ""
3026
3025
3027
#: bzrlib/builtins.py:3873
3026
#: bzrlib/builtins.py:3904
3028
3027
msgid "Print or set the branch nickname."
3029
3028
msgstr "Вывести или установить имя ветви."
3030
3029
3031
#: bzrlib/builtins.py:3875
3030
#: bzrlib/builtins.py:3906
3032
3031
msgid ""
3033
"If unset, the tree root directory name is used as the nickname.\n"
3034
"To print the current nickname, execute with no argument."
3032
"If unset, the colocated branch name is used for colocated branches, and\n"
3033
"the branch directory name is used for other branches. To print the\n"
3034
"current nickname, execute with no argument."
3035
3035
msgstr ""
3036
3036
3037
#: bzrlib/builtins.py:3878
3037
#: bzrlib/builtins.py:3910
3038
3038
msgid ""
3039
3039
"Bound branches use the nickname of its master branch unless it is set\n"
3040
3040
"locally."
3041
3041
msgstr ""
3042
3042
3043
#: bzrlib/builtins.py:3898
3043
#: bzrlib/builtins.py:3930
3044
3044
msgid "Set/unset and display aliases."
3045
3045
msgstr "Установить, удалить или отобразить псевдонимы."
3046
3046
3047
#: bzrlib/builtins.py:3900
3047
#: bzrlib/builtins.py:3932
3048
3048
msgid ""
3049
3049
":Examples:\n"
3050
3050
" Show the current aliases::"
3052
3052
":Примеры:\n"
3053
3053
" Показать текущие псевдонимы::"
3054
3054
3055
#: bzrlib/builtins.py:3903
3055
#: bzrlib/builtins.py:3935
3056
3056
msgid " bzr alias"
3057
3057
msgstr " bzr alias"
3058
3058
3059
#: bzrlib/builtins.py:3905
3059
#: bzrlib/builtins.py:3937
3060
3060
msgid " Show the alias specified for 'll'::"
3061
3061
msgstr " Показать псевдоним для 'll'::"
3062
3062
3063
#: bzrlib/builtins.py:3907
3063
#: bzrlib/builtins.py:3939
3064
3064
msgid " bzr alias ll"
3065
3065
msgstr " bzr alias ll"
3066
3066
3067
#: bzrlib/builtins.py:3909
3067
#: bzrlib/builtins.py:3941
3068
3068
msgid " Set an alias for 'll'::"
3069
3069
msgstr " Установить псевдоним для 'll'::"
3070
3070
3071
#: bzrlib/builtins.py:3911
3071
#: bzrlib/builtins.py:3943
3072
3072
msgid " bzr alias ll=\"log --line -r-10..-1\""
3073
3073
msgstr " bzr alias ll=\"log --line -r-10..-1\""
3074
3074
3075
#: bzrlib/builtins.py:3913
3075
#: bzrlib/builtins.py:3945
3076
3076
msgid " To remove an alias for 'll'::"
3077
3077
msgstr " Удалить псевдоним для 'll'::"
3078
3078
3079
#: bzrlib/builtins.py:3915
3079
#: bzrlib/builtins.py:3947
3080
3080
msgid " bzr alias --remove ll"
3081
3081
msgstr " bzr alias --remove ll"
3082
3082
3083
#: bzrlib/builtins.py:3920
3083
#: bzrlib/builtins.py:3952
3084
3084
msgid "Remove the alias."
3085
3085
msgstr "Удалить псевдоним."
3086
3086
3087
#: bzrlib/builtins.py:3938
3087
#: bzrlib/builtins.py:3970
3088
3088
msgid "bzr alias --remove expects an alias to remove."
3089
3089
msgstr "bzr alias --remove требуется псевдоним для удаления."
3090
3090
3091
#: bzrlib/builtins.py:4119
3091
#: bzrlib/builtins.py:4151
3092
3092
msgid ""
3093
3093
"subunit not available. subunit needs to be installed to use --subunit."
3094
3094
msgstr ""
3095
3095
"subunit не доступен. Нужно установить subunit, чтобы использовать --subunit."
3096
3096
3097
#: bzrlib/builtins.py:4136
3097
#: bzrlib/builtins.py:4168
3098
3098
msgid ""
3099
3099
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3100
3100
msgstr ""
3101
3101
"--benchmark не поддерживается начиная с версии bzr 2.2; вместо этого "
3102
3102
"используйте bzr-usertest"
3103
3103
3104
#: bzrlib/builtins.py:4183
3104
#: bzrlib/builtins.py:4215
3105
3105
msgid "Show version of bzr."
3106
3106
msgstr "Вывести версию bzr."
3107
3107
3108
#: bzrlib/builtins.py:4187
3108
#: bzrlib/builtins.py:4219
3109
3109
msgid "Print just the version number."
3110
3110
msgstr "Вывести только номер версии."
3111
3111
3112
#: bzrlib/builtins.py:4206
3112
#: bzrlib/builtins.py:4238
3113
3113
msgid "It sure does!\n"
3114
3114
msgstr "Да, он крут!\n"
3115
3115
3116
#: bzrlib/builtins.py:4230
3116
#: bzrlib/builtins.py:4262
3117
3117
#, python-format
3118
3118
msgid "merge base is revision %s\n"
3119
3119
msgstr ""
3120
3120
3121
#: bzrlib/builtins.py:4234
3121
#: bzrlib/builtins.py:4266
3122
3122
msgid "Perform a three-way merge."
3123
3123
msgstr ""
3124
3124
3125
#: bzrlib/builtins.py:4236
3125
#: bzrlib/builtins.py:4268
3126
3126
msgid ""
3127
3127
"The source of the merge can be specified either in the form of a branch,\n"
3128
3128
"or in the form of a path to a file containing a merge directive generated\n"
3133
3133
"the current working tree."
3134
3134
msgstr ""
3135
3135
3136
#: bzrlib/builtins.py:4244
3136
#: bzrlib/builtins.py:4276
3137
3137
msgid ""
3138
3138
"When merging from a branch, by default bzr will try to merge in all new\n"
3139
3139
"work from the other branch, automatically determining an appropriate base\n"
3140
3140
"revision. If this fails, you may need to give an explicit base."
3141
3141
msgstr ""
3142
3142
3143
#: bzrlib/builtins.py:4248
3143
#: bzrlib/builtins.py:4280
3144
3144
msgid ""
3145
3145
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3146
3146
"try to merge in all new work up to and including revision OTHER."
3147
3147
msgstr ""
3148
3148
3149
#: bzrlib/builtins.py:4251
3149
#: bzrlib/builtins.py:4283
3150
3150
msgid ""
3151
3151
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3152
3152
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3157
3157
"changes from the other branch is not stored in the commit."
3158
3158
msgstr ""
3159
3159
3160
#: bzrlib/builtins.py:4259
3160
#: bzrlib/builtins.py:4291
3161
3161
msgid "Revision numbers are always relative to the source branch."
3162
3162
msgstr ""
3163
3163
3164
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3164
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3165
3165
msgid ""
3166
3166
"Merge will do its best to combine the changes in two branches, but there\n"
3167
3167
"are some kinds of problems only a human can fix. When it encounters those,\n"
3169
3169
"before you can commit."
3170
3170
msgstr ""
3171
3171
3172
#: bzrlib/builtins.py:4266
3172
#: bzrlib/builtins.py:4298
3173
3173
msgid ""
3174
3174
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3175
3175
msgstr ""
3176
3176
3177
#: bzrlib/builtins.py:4268
3177
#: bzrlib/builtins.py:4300
3178
3178
msgid ""
3179
3179
"If there is no default branch set, the first merge will set it (use\n"
3180
3180
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3182
3182
"only be saved if the remote location can be accessed."
3183
3183
msgstr ""
3184
3184
3185
#: bzrlib/builtins.py:4273
3185
#: bzrlib/builtins.py:4305
3186
3186
msgid ""
3187
3187
"The results of the merge are placed into the destination working\n"
3188
3188
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3189
3189
"committed to record the result of the merge."
3190
3190
msgstr ""
3191
3191
3192
#: bzrlib/builtins.py:4277
3192
#: bzrlib/builtins.py:4309
3193
3193
msgid ""
3194
3194
"merge refuses to run if there are any uncommitted changes, unless\n"
3195
3195
"--force is given. If --force is given, then the changes from the source \n"
3198
3198
"merge revision which has more than two parents."
3199
3199
msgstr ""
3200
3200
3201
#: bzrlib/builtins.py:4283
3201
#: bzrlib/builtins.py:4315
3202
3202
msgid ""
3203
3203
"If one would like to merge changes from the working tree of the other\n"
3204
3204
"branch without merging any committed revisions, the --uncommitted option\n"
3205
3205
"can be given."
3206
3206
msgstr ""
3207
3207
3208
#: bzrlib/builtins.py:4287
3208
#: bzrlib/builtins.py:4319
3209
3209
msgid ""
3210
3210
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3211
3211
"you to apply each diff hunk and file change, similar to \"shelve\"."
3212
3212
msgstr ""
3213
3213
3214
#: bzrlib/builtins.py:4290
3214
#: bzrlib/builtins.py:4322
3215
3215
msgid ""
3216
3216
":Examples:\n"
3217
3217
" To merge all new revisions from bzr.dev::"
3218
3218
msgstr ""
3219
3219
3220
#: bzrlib/builtins.py:4293
3220
#: bzrlib/builtins.py:4325
3221
3221
msgid " bzr merge ../bzr.dev"
3222
3222
msgstr ""
3223
3223
3224
#: bzrlib/builtins.py:4295
3224
#: bzrlib/builtins.py:4327
3225
3225
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3226
3226
msgstr ""
3227
3227
3228
#: bzrlib/builtins.py:4297
3228
#: bzrlib/builtins.py:4329
3229
3229
msgid " bzr merge -r 82 ../bzr.dev"
3230
3230
msgstr ""
3231
3231
3232
#: bzrlib/builtins.py:4299
3232
#: bzrlib/builtins.py:4331
3233
3233
msgid " To merge the changes introduced by 82, without previous changes::"
3234
3234
msgstr ""
3235
3235
3236
#: bzrlib/builtins.py:4301
3236
#: bzrlib/builtins.py:4333
3237
3237
msgid " bzr merge -r 81..82 ../bzr.dev"
3238
3238
msgstr ""
3239
3239
3240
#: bzrlib/builtins.py:4303
3240
#: bzrlib/builtins.py:4335
3241
3241
msgid " To apply a merge directive contained in /tmp/merge::"
3242
3242
msgstr ""
3243
3243
3244
#: bzrlib/builtins.py:4305
3244
#: bzrlib/builtins.py:4337
3245
3245
msgid " bzr merge /tmp/merge"
3246
3246
msgstr ""
3247
3247
3248
#: bzrlib/builtins.py:4307
3248
#: bzrlib/builtins.py:4339
3249
3249
msgid ""
3250
3250
" To create a merge revision with three parents from two branches\n"
3251
3251
" feature1a and feature1b:"
3252
3252
msgstr ""
3253
3253
3254
#: bzrlib/builtins.py:4310
3254
#: bzrlib/builtins.py:4342
3255
3255
msgid ""
3256
3256
" bzr merge ../feature1a\n"
3257
3257
" bzr merge ../feature1b --force\n"
3258
3258
" bzr commit -m 'revision with three parents'"
3259
3259
msgstr ""
3260
3260
3261
#: bzrlib/builtins.py:4322
3261
#: bzrlib/builtins.py:4354
3262
3262
msgid "Merge even if the destination tree has uncommitted changes."
3263
3263
msgstr ""
3264
3264
3265
#: bzrlib/builtins.py:4328
3265
#: bzrlib/builtins.py:4360
3266
3266
msgid ""
3267
3267
"Apply uncommitted changes from a working copy, instead of branch changes."
3268
3268
msgstr ""
3269
3269
3270
#: bzrlib/builtins.py:4330
3270
#: bzrlib/builtins.py:4362
3271
3271
msgid ""
3272
3272
"If the destination is already completely merged into the source, pull from "
3273
3273
"the source rather than merging. When this happens, you do not need to "
3274
3274
"commit the result."
3275
3275
msgstr ""
3276
3276
3277
#: bzrlib/builtins.py:4335
3277
#: bzrlib/builtins.py:4367
3278
3278
msgid ""
3279
3279
"Branch to merge into, rather than the one containing the working directory."
3280
3280
msgstr ""
3281
3281
3282
#: bzrlib/builtins.py:4337
3282
#: bzrlib/builtins.py:4369
3283
3283
msgid "Instead of merging, show a diff of the merge."
3284
3284
msgstr ""
3285
3285
3286
#: bzrlib/builtins.py:4339
3286
#: bzrlib/builtins.py:4371
3287
3287
msgid "Select changes interactively."
3288
3288
msgstr ""
3289
3289
3290
#: bzrlib/builtins.py:4361
3290
#: bzrlib/builtins.py:4393
3291
3291
msgid ""
3292
3292
"Merging into empty branches not currently supported, "
3293
3293
"https://bugs.launchpad.net/bzr/+bug/308562"
3294
3294
msgstr ""
3295
3295
3296
#: bzrlib/builtins.py:4388
3296
#: bzrlib/builtins.py:4420
3297
3297
msgid "Cannot use --uncommitted with bundles or merge directives."
3298
3298
msgstr ""
3299
3299
3300
#: bzrlib/builtins.py:4399
3300
#: bzrlib/builtins.py:4431
3301
3301
msgid "Cannot use --uncommitted and --revision at the same time."
3302
3302
msgstr ""
3303
3303
3304
#: bzrlib/builtins.py:4419
3304
#: bzrlib/builtins.py:4451
3305
3305
msgid "merger: "
3306
3306
msgstr ""
3307
3307
3308
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
3308
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
3309
3309
msgid "Nothing to do."
3310
3310
msgstr ""
3311
3311
3312
#: bzrlib/builtins.py:4425
3312
#: bzrlib/builtins.py:4457
3313
3313
msgid "Cannot pull individual files"
3314
3314
msgstr ""
3315
3315
3316
#: bzrlib/builtins.py:4433
3316
#: bzrlib/builtins.py:4465
3317
3317
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3318
3318
msgstr ""
3319
3319
3320
#: bzrlib/builtins.py:4491
3320
#: bzrlib/builtins.py:4523
3321
3321
#, python-format
3322
3322
msgid "Show-base is not supported for this merge type. %s"
3323
3323
msgstr ""
3324
3324
3325
#: bzrlib/builtins.py:4500
3325
#: bzrlib/builtins.py:4532
3326
3326
#, python-format
3327
3327
msgid "Conflict reduction is not supported for merge type %s."
3328
3328
msgstr ""
3329
3329
3330
#: bzrlib/builtins.py:4504
3330
#: bzrlib/builtins.py:4536
3331
3331
msgid "Cannot do conflict reduction and show base."
3332
3332
msgstr ""
3333
3333
3334
#: bzrlib/builtins.py:4615
3334
#: bzrlib/builtins.py:4647
3335
3335
msgid "No location specified or remembered"
3336
3336
msgstr ""
3337
3337
3338
#: bzrlib/builtins.py:4617
3338
#: bzrlib/builtins.py:4649
3339
3339
msgid "{0} remembered {1} location {2}"
3340
3340
msgstr ""
3341
3341
3342
#: bzrlib/builtins.py:4623
3342
#: bzrlib/builtins.py:4655
3343
3343
msgid "Redo a merge."
3344
3344
msgstr ""
3345
3345
3346
#: bzrlib/builtins.py:4625
3346
#: bzrlib/builtins.py:4657
3347
3347
msgid ""
3348
3348
"Use this if you want to try a different merge technique while resolving\n"
3349
3349
"conflicts. Some merge techniques are better than others, and remerge\n"
3350
3350
"lets you try different ones on different files."
3351
3351
msgstr ""
3352
3352
3353
#: bzrlib/builtins.py:4629
3353
#: bzrlib/builtins.py:4661
3354
3354
msgid ""
3355
3355
"The options for remerge have the same meaning and defaults as the ones for\n"
3356
3356
"merge. The difference is that remerge can (only) be run when there is a\n"
3357
3357
"pending merge, and it lets you specify particular files."
3358
3358
msgstr ""
3359
3359
3360
#: bzrlib/builtins.py:4633
3360
#: bzrlib/builtins.py:4665
3361
3361
msgid ""
3362
3362
":Examples:\n"
3363
3363
" Re-do the merge of all conflicted files, and show the base text in\n"
3364
3364
" conflict regions, in addition to the usual THIS and OTHER texts::"
3365
3365
msgstr ""
3366
3366
3367
#: bzrlib/builtins.py:4637
3367
#: bzrlib/builtins.py:4669
3368
3368
msgid " bzr remerge --show-base"
3369
3369
msgstr ""
3370
3370
3371
#: bzrlib/builtins.py:4639
3371
#: bzrlib/builtins.py:4671
3372
3372
msgid ""
3373
3373
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3374
3374
" additional processing to reduce the size of conflict regions::"
3375
3375
msgstr ""
3376
3376
3377
#: bzrlib/builtins.py:4642
3377
#: bzrlib/builtins.py:4674
3378
3378
msgid " bzr remerge --merge-type weave --reprocess foobar"
3379
3379
msgstr ""
3380
3380
3381
#: bzrlib/builtins.py:4649
3381
#: bzrlib/builtins.py:4681
3382
3382
msgid "Show base revision text in conflicts."
3383
3383
msgstr ""
3384
3384
3385
#: bzrlib/builtins.py:4661
3385
#: bzrlib/builtins.py:4693
3386
3386
msgid ""
3387
3387
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3388
3388
"merges."
3389
3389
msgstr ""
3390
3390
3391
#: bzrlib/builtins.py:4717
3392
msgid "Revert files to a previous revision."
3391
#: bzrlib/builtins.py:4751
3392
msgid ""
3393
"Set files in the working tree back to the contents of a previous revision."
3393
3394
msgstr ""
3394
3395
3395
#: bzrlib/builtins.py:4719
3396
#: bzrlib/builtins.py:4753
3396
3397
msgid ""
3397
3398
"Giving a list of files will revert only those files. Otherwise, all files\n"
3398
3399
"will be reverted. If the revision is not specified with '--revision', the\n"
3399
"last committed revision is used."
3400
"working tree basis revision is used. A revert operation affects only the\n"
3401
"working tree, not any revision history like the branch and repository or\n"
3402
"the working tree basis revision."
3400
3403
msgstr ""
3401
3404
3402
#: bzrlib/builtins.py:4723
3405
#: bzrlib/builtins.py:4759
3403
3406
msgid ""
3404
3407
"To remove only some changes, without reverting to a prior version, use\n"
3405
3408
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3406
3409
"will remove the changes introduced by the second last commit (-2), without\n"
3407
3410
"affecting the changes introduced by the last commit (-1). To remove\n"
3408
"certain changes on a hunk-by-hunk basis, see the shelve command."
3411
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3412
"To update the branch to a specific revision or the latest revision and\n"
3413
"update the working tree accordingly while preserving local changes, see the\n"
3414
"update command."
3409
3415
msgstr ""
3410
3416
3411
#: bzrlib/builtins.py:4729
3417
#: bzrlib/builtins.py:4768
3412
3418
msgid ""
3413
"By default, any files that have been manually changed will be backed up\n"
3414
"first. (Files changed only by merge are not backed up.) Backup files have\n"
3415
"'.~#~' appended to their name, where # is a number."
3419
"Uncommitted changes to files that are reverted will be discarded.\n"
3420
"Howver, by default, any files that have been manually changed will be\n"
3421
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3422
"files have '.~#~' appended to their name, where # is a number."
3416
3423
msgstr ""
3417
3424
3418
#: bzrlib/builtins.py:4733
3425
#: bzrlib/builtins.py:4773
3419
3426
msgid ""
3420
3427
"When you provide files, you can use their current pathname or the pathname\n"
3421
3428
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3423
3430
"reverted."
3424
3431
msgstr ""
3425
3432
3426
#: bzrlib/builtins.py:4738
3433
#: bzrlib/builtins.py:4778
3427
3434
msgid ""
3428
3435
"If you have newly added files since the target revision, they will be\n"
3429
3436
"removed. If the files to be removed have been changed, backups will be\n"
3431
3438
"deleted."
3432
3439
msgstr ""
3433
3440
3434
#: bzrlib/builtins.py:4743
3441
#: bzrlib/builtins.py:4783
3435
3442
msgid ""
3436
3443
"The working tree contains a list of revisions that have been merged but\n"
3437
3444
"not yet committed. These revisions will be included as additional parents\n"
3443
3450
"reverting any files."
3444
3451
msgstr ""
3445
3452
3446
#: bzrlib/builtins.py:4752
3453
#: bzrlib/builtins.py:4792
3447
3454
msgid ""
3448
3455
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3449
3456
"changes from a branch in a single revision. To do this, perform the merge\n"
3457
3464
"target branches."
3458
3465
msgstr ""
3459
3466
3460
#: bzrlib/builtins.py:4766
3467
#: bzrlib/builtins.py:4806
3461
3468
msgid "Do not save backups of reverted files."
3462
3469
msgstr ""
3463
3470
3464
#: bzrlib/builtins.py:4768
3471
#: bzrlib/builtins.py:4808
3465
3472
msgid "Remove pending merge marker, without changing any files."
3466
3473
msgstr ""
3467
3474
3468
#: bzrlib/builtins.py:4799
3475
#: bzrlib/builtins.py:4839
3469
3476
msgid ""
3470
3477
"Show help on a command or other topic.\n"
3471
3478
" "
3472
3479
msgstr ""
3473
3480
3474
#: bzrlib/builtins.py:4804
3481
#: bzrlib/builtins.py:4844
3475
3482
msgid "Show help on all commands."
3476
3483
msgstr ""
3477
3484
3478
#: bzrlib/builtins.py:4833
3485
#: bzrlib/builtins.py:4873
3479
3486
msgid "Show unmerged/unpulled revisions between two branches."
3480
3487
msgstr ""
3481
3488
3482
#: bzrlib/builtins.py:4835
3489
#: bzrlib/builtins.py:4875
3483
3490
msgid "OTHER_BRANCH may be local or remote."
3484
3491
msgstr ""
3485
3492
3486
#: bzrlib/builtins.py:4837
3493
#: bzrlib/builtins.py:4877
3487
3494
msgid ""
3488
3495
"To filter on a range of revisions, you can use the command -r begin..end\n"
3489
3496
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3494
3501
" 0 - no missing revisions"
3495
3502
msgstr ""
3496
3503
3497
#: bzrlib/builtins.py:4847
3504
#: bzrlib/builtins.py:4887
3498
3505
msgid ""
3499
3506
" Determine the missing revisions between this and the branch at the\n"
3500
3507
" remembered pull location::"
3501
3508
msgstr ""
3502
3509
3503
#: bzrlib/builtins.py:4850
3510
#: bzrlib/builtins.py:4890
3504
3511
msgid " bzr missing"
3505
3512
msgstr ""
3506
3513
3507
#: bzrlib/builtins.py:4852
3514
#: bzrlib/builtins.py:4892
3508
3515
msgid " Determine the missing revisions between this and another branch::"
3509
3516
msgstr ""
3510
3517
3511
#: bzrlib/builtins.py:4854
3518
#: bzrlib/builtins.py:4894
3512
3519
msgid " bzr missing http://server/branch"
3513
3520
msgstr ""
3514
3521
3515
#: bzrlib/builtins.py:4856
3522
#: bzrlib/builtins.py:4896
3516
3523
msgid ""
3517
3524
" Determine the missing revisions up to a specific revision on the other\n"
3518
3525
" branch::"
3519
3526
msgstr ""
3520
3527
3521
#: bzrlib/builtins.py:4859
3528
#: bzrlib/builtins.py:4899
3522
3529
msgid " bzr missing -r ..-10"
3523
3530
msgstr ""
3524
3531
3525
#: bzrlib/builtins.py:4861
3532
#: bzrlib/builtins.py:4901
3526
3533
msgid ""
3527
3534
" Determine the missing revisions up to a specific revision on this\n"
3528
3535
" branch::"
3529
3536
msgstr ""
3530
3537
3531
#: bzrlib/builtins.py:4864
3538
#: bzrlib/builtins.py:4904
3532
3539
msgid " bzr missing --my-revision ..-10"
3533
3540
msgstr ""
3534
3541
3535
#: bzrlib/builtins.py:4871
3542
#: bzrlib/builtins.py:4911
3536
3543
msgid "Reverse the order of revisions."
3537
3544
msgstr ""
3538
3545
3539
#: bzrlib/builtins.py:4873
3546
#: bzrlib/builtins.py:4913
3540
3547
msgid "Display changes in the local branch only."
3541
3548
msgstr ""
3542
3549
3543
#: bzrlib/builtins.py:4874
3550
#: bzrlib/builtins.py:4914
3544
3551
msgid "Same as --mine-only."
3545
3552
msgstr ""
3546
3553
3547
#: bzrlib/builtins.py:4876
3554
#: bzrlib/builtins.py:4916
3548
3555
msgid "Display changes in the remote branch only."
3549
3556
msgstr ""
3550
3557
3551
#: bzrlib/builtins.py:4877
3558
#: bzrlib/builtins.py:4917
3552
3559
msgid "Same as --theirs-only."
3553
3560
msgstr ""
3554
3561
3555
#: bzrlib/builtins.py:4882
3562
#: bzrlib/builtins.py:4922
3556
3563
msgid ""
3557
3564
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3558
3565
"details."
3559
3566
msgstr ""
3560
3567
3561
#: bzrlib/builtins.py:4886
3568
#: bzrlib/builtins.py:4926
3562
3569
msgid ""
3563
3570
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3564
3571
"details."
3565
3572
msgstr ""
3566
3573
3567
#: bzrlib/builtins.py:4889
3574
#: bzrlib/builtins.py:4929
3568
3575
msgid "Show all revisions in addition to the mainline ones."
3569
3576
msgstr ""
3570
3577
3571
#: bzrlib/builtins.py:4943
3578
#: bzrlib/builtins.py:4983
3572
3579
msgid "No peer location known or specified."
3573
3580
msgstr ""
3574
3581
3575
#: bzrlib/builtins.py:4947
3582
#: bzrlib/builtins.py:4987
3576
3583
msgid "Using saved parent location: {0}\n"
3577
3584
msgstr ""
3578
3585
3579
#: bzrlib/builtins.py:4980
3586
#: bzrlib/builtins.py:5020
3580
3587
#, python-format
3581
3588
msgid "You have %d extra revision:\n"
3582
3589
msgid_plural "You have %d extra revisions:\n"
3583
3590
msgstr[0] ""
3584
3591
msgstr[1] ""
3585
3592
3586
#: bzrlib/builtins.py:4996
3593
#: bzrlib/builtins.py:5040
3587
3594
#, python-format
3588
3595
msgid "You are missing %d revision:\n"
3589
3596
msgid_plural "You are missing %d revisions:\n"
3590
3597
msgstr[0] ""
3591
3598
msgstr[1] ""
3592
3599
3593
#: bzrlib/builtins.py:5008
3600
#: bzrlib/builtins.py:5055
3594
3601
msgid "This branch has no new revisions.\n"
3595
3602
msgstr ""
3596
3603
3597
#: bzrlib/builtins.py:5011
3604
#: bzrlib/builtins.py:5058
3598
3605
msgid "Other branch has no new revisions.\n"
3599
3606
msgstr ""
3600
3607
3601
#: bzrlib/builtins.py:5016
3608
#: bzrlib/builtins.py:5063
3602
3609
msgid "Branches are up to date.\n"
3603
3610
msgstr ""
3604
3611
3605
#: bzrlib/builtins.py:5027
3612
#: bzrlib/builtins.py:5074
3606
3613
msgid "Compress the data within a repository."
3607
3614
msgstr ""
3608
3615
3609
#: bzrlib/builtins.py:5029
3616
#: bzrlib/builtins.py:5076
3610
3617
msgid ""
3611
3618
"This operation compresses the data within a bazaar repository. As\n"
3612
3619
"bazaar supports automatic packing of repository, this operation is\n"
3613
3620
"normally not required to be done manually."
3614
3621
msgstr ""
3615
3622
3616
#: bzrlib/builtins.py:5033
3623
#: bzrlib/builtins.py:5080
3617
3624
msgid ""
3618
3625
"During the pack operation, bazaar takes a backup of existing repository\n"
3619
3626
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3622
3629
"used."
3623
3630
msgstr ""
3624
3631
3625
#: bzrlib/builtins.py:5039
3632
#: bzrlib/builtins.py:5086
3626
3633
msgid ""
3627
3634
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3628
3635
"during or immediately after repacking, you may be left with a state\n"
3630
3637
"been. In this case the repository may be unusable."
3631
3638
msgstr ""
3632
3639
3633
#: bzrlib/builtins.py:5048
3640
#: bzrlib/builtins.py:5095
3634
3641
msgid "Delete obsolete packs to save disk space."
3635
3642
msgstr ""
3636
3643
3637
#: bzrlib/builtins.py:5062
3644
#: bzrlib/builtins.py:5109
3638
3645
msgid "List the installed plugins."
3639
3646
msgstr ""
3640
3647
3641
#: bzrlib/builtins.py:5064
3648
#: bzrlib/builtins.py:5111
3642
3649
msgid ""
3643
3650
"This command displays the list of installed plugins including\n"
3644
3651
"version of plugin and a short description of each."
3645
3652
msgstr ""
3646
3653
3647
#: bzrlib/builtins.py:5067
3654
#: bzrlib/builtins.py:5114
3648
3655
msgid "--verbose shows the path where each plugin is located."
3649
3656
msgstr ""
3650
3657
3651
#: bzrlib/builtins.py:5069
3658
#: bzrlib/builtins.py:5116
3652
3659
msgid ""
3653
3660
"A plugin is an external component for Bazaar that extends the\n"
3654
3661
"revision control system, by adding or replacing code in Bazaar.\n"
3657
3664
"customizing log output."
3658
3665
msgstr ""
3659
3666
3660
#: bzrlib/builtins.py:5075
3667
#: bzrlib/builtins.py:5122
3661
3668
msgid ""
3662
3669
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3663
3670
"for further information on plugins including where to find them and how to\n"
3665
3672
"plugins using the Python programming language."
3666
3673
msgstr ""
3667
3674
3668
#: bzrlib/builtins.py:5091
3675
#: bzrlib/builtins.py:5138
3669
3676
msgid "Show testament (signing-form) of a revision."
3670
3677
msgstr ""
3671
3678
3672
#: bzrlib/builtins.py:5094
3679
#: bzrlib/builtins.py:5141
3673
3680
msgid "Produce long-format testament."
3674
3681
msgstr ""
3675
3682
3676
#: bzrlib/builtins.py:5096
3683
#: bzrlib/builtins.py:5143
3677
3684
msgid "Produce a strict-format testament."
3678
3685
msgstr ""
3679
3686
3680
#: bzrlib/builtins.py:5122
3687
#: bzrlib/builtins.py:5169
3681
3688
msgid "Show the origin of each line in a file."
3682
3689
msgstr ""
3683
3690
3684
#: bzrlib/builtins.py:5124
3691
#: bzrlib/builtins.py:5171
3685
3692
msgid ""
3686
3693
"This prints out the given file with an annotation on the left side\n"
3687
3694
"indicating which revision, author and date introduced the change."
3688
3695
msgstr ""
3689
3696
3690
#: bzrlib/builtins.py:5127
3697
#: bzrlib/builtins.py:5174
3691
3698
msgid ""
3692
3699
"If the origin is the same for a run of consecutive lines, it is\n"
3693
3700
"shown only at the top, unless the --all option is given."
3694
3701
msgstr ""
3695
3702
3696
#: bzrlib/builtins.py:5135
3703
#: bzrlib/builtins.py:5182
3697
3704
msgid "Show annotations on all lines."
3698
3705
msgstr ""
3699
3706
3700
#: bzrlib/builtins.py:5136
3707
#: bzrlib/builtins.py:5183
3701
3708
msgid "Show commit date in annotations."
3702
3709
msgstr ""
3703
3710
3704
#: bzrlib/builtins.py:5223
3711
#: bzrlib/builtins.py:5270
3705
3712
msgid "Cannot sign a range of non-revision-history revisions"
3706
3713
msgstr ""
3707
3714
3708
#: bzrlib/builtins.py:5235
3715
#: bzrlib/builtins.py:5282
3709
3716
msgid "Please supply either one revision, or a range."
3710
3717
msgstr ""
3711
3718
3712
#: bzrlib/builtins.py:5239
3719
#: bzrlib/builtins.py:5286
3713
3720
msgid ""
3714
3721
"Convert the current branch into a checkout of the supplied branch.\n"
3715
3722
"If no branch is supplied, rebind to the last bound location."
3717
3724
"Преобразовать текущую ветвь в рабочую копию указанной ветви.\n"
3718
3725
"Если ветвь не указаны, перепривязать последнее расположение привязки."
3719
3726
3720
#: bzrlib/builtins.py:5242
3727
#: bzrlib/builtins.py:5289
3721
3728
msgid ""
3722
3729
"Once converted into a checkout, commits must succeed on the master branch\n"
3723
3730
"before they will be applied to the local branch."
3725
3732
"После преобразования в рабочую копию, закрепления должны производиться\n"
3726
3733
"над основной ветвью, прежде чем они могут быть применены к локальной."
3727
3734
3728
#: bzrlib/builtins.py:5245
3735
#: bzrlib/builtins.py:5292
3729
3736
msgid ""
3730
3737
"Bound branches use the nickname of its master branch unless it is set\n"
3731
3738
"locally, in which case binding will update the local nickname to be\n"
3732
3739
"that of the master."
3733
3740
msgstr ""
3734
3741
3735
#: bzrlib/builtins.py:5260
3742
#: bzrlib/builtins.py:5307
3736
3743
msgid "No location supplied. This format does not remember old locations."
3737
3744
msgstr ""
3738
3745
3739
#: bzrlib/builtins.py:5265
3746
#: bzrlib/builtins.py:5313
3740
3747
msgid "Branch is already bound"
3741
3748
msgstr ""
3742
3749
3743
#: bzrlib/builtins.py:5267
3750
#: bzrlib/builtins.py:5316
3744
3751
msgid "No location supplied and no previous location known"
3745
3752
msgstr ""
3746
3753
3747
#: bzrlib/builtins.py:5273
3754
#: bzrlib/builtins.py:5322
3748
3755
msgid "These branches have diverged. Try merging, and then bind again."
3749
3756
msgstr ""
3750
3757
3751
#: bzrlib/builtins.py:5280
3758
#: bzrlib/builtins.py:5329
3752
3759
msgid "Convert the current checkout into a regular branch."
3753
3760
msgstr "Преобразовать текущую рабочую копию в обычную ветвь."
3754
3761
3755
#: bzrlib/builtins.py:5282
3762
#: bzrlib/builtins.py:5331
3756
3763
msgid ""
3757
3764
"After unbinding, the local branch is considered independent and subsequent\n"
3758
3765
"commits will be local only."
3759
3766
msgstr ""
3760
3767
3761
#: bzrlib/builtins.py:5293
3768
#: bzrlib/builtins.py:5342
3762
3769
msgid "Local branch is not bound"
3763
3770
msgstr ""
3764
3771
3765
#: bzrlib/builtins.py:5297
3772
#: bzrlib/builtins.py:5346
3766
3773
msgid "Remove the last committed revision."
3767
3774
msgstr ""
3768
3775
3769
#: bzrlib/builtins.py:5299
3776
#: bzrlib/builtins.py:5348
3770
3777
msgid ""
3771
3778
"--verbose will print out what is being removed.\n"
3772
3779
"--dry-run will go through all the motions, but not actually\n"
3773
3780
"remove anything."
3774
3781
msgstr ""
3775
3782
3776
#: bzrlib/builtins.py:5303
3783
#: bzrlib/builtins.py:5352
3777
3784
msgid ""
3778
3785
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3779
3786
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3780
3787
"branch at revision 15."
3781
3788
msgstr ""
3782
3789
3783
#: bzrlib/builtins.py:5307
3790
#: bzrlib/builtins.py:5356
3784
3791
msgid ""
3785
3792
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3786
3793
"it may make is to restore any pending merges that were present before\n"
3787
3794
"the commit."
3788
3795
msgstr ""
3789
3796
3790
#: bzrlib/builtins.py:5318
3797
#: bzrlib/builtins.py:5367
3791
3798
msgid "Don't actually make changes."
3792
3799
msgstr ""
3793
3800
3794
#: bzrlib/builtins.py:5319
3801
#: bzrlib/builtins.py:5368
3795
3802
msgid "Say yes to all questions."
3796
3803
msgstr ""
3797
3804
3798
#: bzrlib/builtins.py:5321
3805
#: bzrlib/builtins.py:5370
3799
3806
msgid "Keep tags that point to removed revisions."
3800
3807
msgstr ""
3801
3808
3802
#: bzrlib/builtins.py:5323
3809
#: bzrlib/builtins.py:5372
3803
3810
msgid "Only remove the commits from the local branch when in a checkout."
3804
3811
msgstr "Удалить закрепления из локальной ветви только в рабочей копии."
3805
3812
3806
#: bzrlib/builtins.py:5372
3813
#: bzrlib/builtins.py:5421
3807
3814
msgid "No revisions to uncommit.\n"
3808
3815
msgstr ""
3809
3816
3810
#: bzrlib/builtins.py:5387
3817
#: bzrlib/builtins.py:5436
3811
3818
msgid "Dry-run, pretending to remove the above revisions.\n"
3812
3819
msgstr ""
3813
3820
3814
#: bzrlib/builtins.py:5390
3821
#: bzrlib/builtins.py:5439
3815
3822
msgid "The above revision(s) will be removed.\n"
3816
3823
msgstr ""
3817
3824
3818
#: bzrlib/builtins.py:5394
3825
#: bzrlib/builtins.py:5443
3819
3826
msgid "Uncommit these revisions"
3820
3827
msgstr ""
3821
3828
3822
#: bzrlib/builtins.py:5397
3829
#: bzrlib/builtins.py:5446
3823
3830
msgid "Canceled\n"
3824
3831
msgstr ""
3825
3832
3826
#: bzrlib/builtins.py:5404
3833
#: bzrlib/builtins.py:5453
3827
3834
#, python-format
3828
3835
msgid ""
3829
3836
"You can restore the old tip by running:\n"
3830
3837
" bzr pull . -r revid:%s\n"
3831
3838
msgstr ""
3832
3839
3833
#: bzrlib/builtins.py:5409
3840
#: bzrlib/builtins.py:5458
3834
3841
msgid "Break a dead lock."
3835
3842
msgstr ""
3836
3843
3837
#: bzrlib/builtins.py:5411
3844
#: bzrlib/builtins.py:5460
3838
3845
msgid ""
3839
3846
"This command breaks a lock on a repository, branch, working directory or\n"
3840
3847
"config file."
3841
3848
msgstr ""
3842
3849
3843
#: bzrlib/builtins.py:5414
3850
#: bzrlib/builtins.py:5463
3844
3851
msgid ""
3845
3852
"CAUTION: Locks should only be broken when you are sure that the process\n"
3846
3853
"holding the lock has been stopped."
3847
3854
msgstr ""
3848
3855
3849
#: bzrlib/builtins.py:5417
3856
#: bzrlib/builtins.py:5466
3850
3857
msgid ""
3851
3858
"You can get information on what locks are open via the 'bzr info\n"
3852
3859
"[location]' command."
3853
3860
msgstr ""
3854
3861
3855
#: bzrlib/builtins.py:5420
3862
#: bzrlib/builtins.py:5469
3856
3863
msgid ""
3857
3864
":Examples:\n"
3858
3865
" bzr break-lock\n"
3860
3867
" bzr break-lock --conf ~/.bazaar"
3861
3868
msgstr ""
3862
3869
3863
#: bzrlib/builtins.py:5429
3870
#: bzrlib/builtins.py:5478
3864
3871
msgid "LOCATION is the directory where the config lock is."
3865
3872
msgstr ""
3866
3873
3867
#: bzrlib/builtins.py:5431
3874
#: bzrlib/builtins.py:5480
3868
3875
msgid "Do not ask for confirmation before breaking the lock."
3869
3876
msgstr ""
3870
3877
3871
#: bzrlib/builtins.py:5466
3878
#: bzrlib/builtins.py:5515
3872
3879
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3873
3880
msgstr ""
3874
3881
3875
#: bzrlib/builtins.py:5467
3882
#: bzrlib/builtins.py:5516
3876
3883
msgid "Run the bzr server."
3877
3884
msgstr ""
3878
3885
3879
#: bzrlib/builtins.py:5473
3886
#: bzrlib/builtins.py:5522
3880
3887
msgid "Serve on stdin/out for use from inetd or sshd."
3881
3888
msgstr ""
3882
3889
3883
#: bzrlib/builtins.py:5474
3890
#: bzrlib/builtins.py:5523
3884
3891
msgid "protocol"
3885
3892
msgstr ""
3886
3893
3887
#: bzrlib/builtins.py:5475
3894
#: bzrlib/builtins.py:5524
3888
3895
msgid "Protocol to serve."
3889
3896
msgstr ""
3890
3897
3891
#: bzrlib/builtins.py:5479
3898
#: bzrlib/builtins.py:5528
3899
msgid "Listen for connections on nominated address."
3900
msgstr ""
3901
3902
#: bzrlib/builtins.py:5530
3892
3903
msgid ""
3893
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3894
"Passing 0 as the port number will result in a dynamically allocated port. "
3895
"The default port depends on the protocol."
3904
"Listen for connections on nominated port. Passing 0 as the port number will "
3905
"result in a dynamically allocated port. The default port depends on the "
3906
"protocol."
3896
3907
msgstr ""
3897
3908
3898
#: bzrlib/builtins.py:5485
3909
#: bzrlib/builtins.py:5535
3899
3910
msgid "Serve contents of this directory."
3900
3911
msgstr ""
3901
3912
3902
#: bzrlib/builtins.py:5487
3913
#: bzrlib/builtins.py:5537
3903
3914
msgid ""
3904
3915
"By default the server is a readonly server. Supplying --allow-writes "
3905
3916
"enables write access to the contents of the served directory and below. "
3908
3919
"uncontrolled write access to your file system."
3909
3920
msgstr ""
3910
3921
3911
#: bzrlib/builtins.py:5496
3922
#: bzrlib/builtins.py:5546
3912
3923
msgid "Override the default idle client timeout (5min)."
3913
3924
msgstr ""
3914
3925
3915
#: bzrlib/builtins.py:5546
3926
#: bzrlib/builtins.py:5564
3916
3927
msgid "Combine a tree into its containing tree."
3917
3928
msgstr ""
3918
3929
3919
#: bzrlib/builtins.py:5548
3930
#: bzrlib/builtins.py:5566
3920
3931
msgid "This command requires the target tree to be in a rich-root format."
3921
3932
msgstr ""
3922
3933
3923
#: bzrlib/builtins.py:5550
3934
#: bzrlib/builtins.py:5568
3924
3935
msgid ""
3925
3936
"The TREE argument should be an independent tree, inside another tree, but\n"
3926
3937
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3927
3938
"running \"bzr branch\" with the target inside a tree.)"
3928
3939
msgstr ""
3929
3940
3930
#: bzrlib/builtins.py:5554
3941
#: bzrlib/builtins.py:5572
3931
3942
msgid ""
3932
3943
"The result is a combined tree, with the subtree no longer an independent\n"
3933
3944
"part. This is marked as a merge of the subtree into the containing tree,\n"
3934
3945
"and all history is preserved."
3935
3946
msgstr ""
3936
3947
3937
#: bzrlib/builtins.py:5572
3948
#: bzrlib/builtins.py:5590
3938
3949
#, python-format
3939
3950
msgid ""
3940
3951
"Can't join trees because %s doesn't support rich root data.\n"
3941
3952
"You can use bzr upgrade on the repository."
3942
3953
msgstr ""
3943
3954
3944
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3955
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3945
3956
msgid "Cannot join {0}. {1}"
3946
3957
msgstr ""
3947
3958
3948
#: bzrlib/builtins.py:5592
3959
#: bzrlib/builtins.py:5610
3949
3960
msgid "Split a subdirectory of a tree into a separate tree."
3950
3961
msgstr ""
3951
3962
3952
#: bzrlib/builtins.py:5594
3963
#: bzrlib/builtins.py:5612
3953
3964
msgid ""
3954
3965
"This command will produce a target tree in a format that supports\n"
3955
3966
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3956
3967
"converted into earlier formats like 'dirstate-tags'."
3957
3968
msgstr ""
3958
3969
3959
#: bzrlib/builtins.py:5598
3970
#: bzrlib/builtins.py:5616
3960
3971
msgid ""
3961
3972
"The TREE argument should be a subdirectory of a working tree. That\n"
3962
3973
"subdirectory will be converted into an independent tree, with its own\n"
3963
3974
"branch. Commits in the top-level tree will not apply to the new subtree."
3964
3975
msgstr ""
3965
3976
3966
#: bzrlib/builtins.py:5678
3977
#: bzrlib/builtins.py:5696
3967
3978
msgid "No submit branch specified or known"
3968
3979
msgstr ""
3969
3980
3970
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3981
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3971
3982
msgid "No public branch specified or known"
3972
3983
msgstr ""
3973
3984
3974
#: bzrlib/builtins.py:5691
3985
#: bzrlib/builtins.py:5710
3975
3986
msgid "bzr merge-directive takes at most two one revision identifiers"
3976
3987
msgstr ""
3977
3988
3978
#: bzrlib/builtins.py:5700
3989
#: bzrlib/builtins.py:5719
3979
3990
msgid "No revisions to bundle."
3980
3991
msgstr ""
3981
3992
3982
#: bzrlib/builtins.py:5719
3993
#: bzrlib/builtins.py:5738
3983
3994
msgid "Mail or create a merge-directive for submitting changes."
3984
3995
msgstr ""
3985
3996
3986
#: bzrlib/builtins.py:5721
3997
#: bzrlib/builtins.py:5740
3987
3998
msgid "A merge directive provides many things needed for requesting merges:"
3988
3999
msgstr ""
3989
4000
3990
#: bzrlib/builtins.py:5723
4001
#: bzrlib/builtins.py:5742
3991
4002
msgid "* A machine-readable description of the merge to perform"
3992
4003
msgstr ""
3993
4004
3994
#: bzrlib/builtins.py:5725
4005
#: bzrlib/builtins.py:5744
3995
4006
msgid "* An optional patch that is a preview of the changes requested"
3996
4007
msgstr ""
3997
4008
3998
#: bzrlib/builtins.py:5727
4009
#: bzrlib/builtins.py:5746
3999
4010
msgid ""
4000
4011
"* An optional bundle of revision data, so that the changes can be applied\n"
4001
4012
" directly from the merge directive, without retrieving data from a\n"
4002
4013
" branch."
4003
4014
msgstr ""
4004
4015
4005
#: bzrlib/builtins.py:5731
4016
#: bzrlib/builtins.py:5750
4006
4017
msgid ""
4007
4018
"`bzr send` creates a compact data set that, when applied using bzr\n"
4008
4019
"merge, has the same effect as merging from the source branch. "
4009
4020
msgstr ""
4010
4021
4011
#: bzrlib/builtins.py:5734
4022
#: bzrlib/builtins.py:5753
4012
4023
msgid ""
4013
4024
"By default the merge directive is self-contained and can be applied to any\n"
4014
4025
"branch containing submit_branch in its ancestory without needing access to\n"
4015
4026
"the source branch."
4016
4027
msgstr ""
4017
4028
4018
#: bzrlib/builtins.py:5738
4029
#: bzrlib/builtins.py:5757
4019
4030
msgid ""
4020
4031
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4021
4032
"revisions, but only a structured request to merge from the\n"
4024
4035
"included if known, so that people can check it later."
4025
4036
msgstr ""
4026
4037
4027
#: bzrlib/builtins.py:5744
4038
#: bzrlib/builtins.py:5763
4028
4039
msgid ""
4029
4040
"The submit branch defaults to the parent of the source branch, but can be\n"
4030
4041
"overridden. Both submit branch and public branch will be remembered in\n"
4033
4044
"be changed using --from."
4034
4045
msgstr ""
4035
4046
4036
#: bzrlib/builtins.py:5750
4047
#: bzrlib/builtins.py:5769
4037
4048
msgid ""
4038
4049
"Both the submit branch and the public branch follow the usual behavior with\n"
4039
4050
"respect to --remember: If there is no default location set, the first send\n"
4042
4053
"--remember. The value will only be saved if the location can be accessed."
4043
4054
msgstr ""
4044
4055
4045
#: bzrlib/builtins.py:5756
4056
#: bzrlib/builtins.py:5775
4046
4057
msgid ""
4047
4058
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4048
4059
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4050
4061
"in the merge directive."
4051
4062
msgstr ""
4052
4063
4053
#: bzrlib/builtins.py:5761
4064
#: bzrlib/builtins.py:5780
4054
4065
msgid ""
4055
4066
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4056
4067
"given, in which case it is sent to a file."
4057
4068
msgstr ""
4058
4069
4059
#: bzrlib/builtins.py:5764
4070
#: bzrlib/builtins.py:5783
4060
4071
msgid ""
4061
4072
"Mail is sent using your preferred mail program. This should be transparent\n"
4062
4073
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4063
4074
"If the preferred client can't be found (or used), your editor will be used."
4064
4075
msgstr ""
4065
4076
4066
#: bzrlib/builtins.py:5768
4077
#: bzrlib/builtins.py:5787
4067
4078
msgid ""
4068
4079
"To use a specific mail program, set the mail_client configuration option.\n"
4069
4080
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4075
4086
"supported clients."
4076
4087
msgstr ""
4077
4088
4078
#: bzrlib/builtins.py:5775
4089
#: bzrlib/builtins.py:5794
4079
4090
msgid ""
4080
4091
"If mail is being sent, a to address is required. This can be supplied\n"
4081
4092
"either on the commandline, by setting the submit_to configuration\n"
4083
4094
"in the submit branch."
4084
4095
msgstr ""
4085
4096
4086
#: bzrlib/builtins.py:5780
4097
#: bzrlib/builtins.py:5799
4087
4098
msgid ""
4088
4099
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4089
4100
"and\n"
4093
4104
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4094
4105
msgstr ""
4095
4106
4096
#: bzrlib/builtins.py:5786
4107
#: bzrlib/builtins.py:5805
4097
4108
msgid ""
4098
4109
"The merge directives created by bzr send may be applied using bzr merge or\n"
4099
4110
"bzr pull by specifying a file containing a merge directive as the location."
4100
4111
msgstr ""
4101
4112
4102
#: bzrlib/builtins.py:5789
4113
#: bzrlib/builtins.py:5808
4103
4114
msgid ""
4104
4115
"bzr send makes extensive use of public locations to map local locations "
4105
4116
"into\n"
4107
4118
"set them, and use `bzr info` to display them."
4108
4119
msgstr ""
4109
4120
4110
#: bzrlib/builtins.py:5813
4121
#: bzrlib/builtins.py:5832
4111
4122
msgid "Write merge directive to this file or directory; use - for stdout."
4112
4123
msgstr ""
4113
4124
4114
#: bzrlib/builtins.py:5817
4125
#: bzrlib/builtins.py:5836
4115
4126
msgid ""
4116
4127
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4117
4128
"strict disables the check."
4118
4129
msgstr ""
4119
4130
4120
#: bzrlib/builtins.py:5819
4131
#: bzrlib/builtins.py:5838
4121
4132
msgid "Mail the request to this address."
4122
4133
msgstr ""
4123
4134
4124
#: bzrlib/builtins.py:5823
4135
#: bzrlib/builtins.py:5842
4125
4136
msgid "Body for the email."
4126
4137
msgstr ""
4127
4138
4128
#: bzrlib/builtins.py:5876
4139
#: bzrlib/builtins.py:5895
4129
4140
msgid "Do not include a bundle in the merge directive."
4130
4141
msgstr ""
4131
4142
4132
#: bzrlib/builtins.py:5877
4143
#: bzrlib/builtins.py:5896
4133
4144
msgid "Do not include a preview patch in the merge directive."
4134
4145
msgstr ""
4135
4146
4136
#: bzrlib/builtins.py:5880
4147
#: bzrlib/builtins.py:5899
4137
4148
msgid "Remember submit and public branch."
4138
4149
msgstr ""
4139
4150
4140
#: bzrlib/builtins.py:5882
4151
#: bzrlib/builtins.py:5901
4141
4152
msgid ""
4142
4153
"Branch to generate the submission from, rather than the one containing the "
4143
4154
"working directory."
4144
4155
msgstr ""
4145
4156
4146
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
4157
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
4147
4158
msgid "format"
4148
4159
msgstr ""
4149
4160
4150
#: bzrlib/builtins.py:5893
4161
#: bzrlib/builtins.py:5912
4151
4162
msgid "Use the specified output format."
4152
4163
msgstr ""
4153
4164
4154
#: bzrlib/builtins.py:5915
4165
#: bzrlib/builtins.py:5934
4155
4166
msgid "Create, remove or modify a tag naming a revision."
4156
4167
msgstr ""
4157
4168
4158
#: bzrlib/builtins.py:5917
4169
#: bzrlib/builtins.py:5936
4159
4170
msgid ""
4160
4171
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4161
4172
"(--revision) option can be given -rtag:X, where X is any previously\n"
4162
4173
"created tag."
4163
4174
msgstr ""
4164
4175
4165
#: bzrlib/builtins.py:5921
4176
#: bzrlib/builtins.py:5940
4166
4177
msgid ""
4167
4178
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4168
4179
"along when you branch, push, pull or merge."
4169
4180
msgstr ""
4170
4181
4171
#: bzrlib/builtins.py:5924
4182
#: bzrlib/builtins.py:5943
4172
4183
msgid ""
4173
4184
"It is an error to give a tag name that already exists unless you pass\n"
4174
4185
"--force, in which case the tag is moved to point to the new revision."
4175
4186
msgstr ""
4176
4187
4177
#: bzrlib/builtins.py:5927
4188
#: bzrlib/builtins.py:5946
4178
4189
msgid ""
4179
4190
"To rename a tag (change the name but keep it on the same revsion), run "
4180
4191
"``bzr\n"
4181
4192
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4182
4193
msgstr ""
4183
4194
4184
#: bzrlib/builtins.py:5930
4195
#: bzrlib/builtins.py:5949
4185
4196
msgid ""
4186
4197
"If no tag name is specified it will be determined through the \n"
4187
4198
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4189
4200
"details."
4190
4201
msgstr ""
4191
4202
4192
#: bzrlib/builtins.py:5940
4203
#: bzrlib/builtins.py:5959
4193
4204
msgid "Delete this tag rather than placing it."
4194
4205
msgstr ""
4195
4206
4196
#: bzrlib/builtins.py:5943
4207
#: bzrlib/builtins.py:5962
4197
4208
msgid "Branch in which to place the tag."
4198
4209
msgstr ""
4199
4210
4200
#: bzrlib/builtins.py:5945
4211
#: bzrlib/builtins.py:5964
4201
4212
msgid "Replace existing tags."
4202
4213
msgstr ""
4203
4214
4204
#: bzrlib/builtins.py:5960
4215
#: bzrlib/builtins.py:5979
4205
4216
msgid "No tag specified to delete."
4206
4217
msgstr ""
4207
4218
4208
#: bzrlib/builtins.py:5962
4219
#: bzrlib/builtins.py:5981
4209
4220
#, python-format
4210
4221
msgid "Deleted tag %s."
4211
4222
msgstr ""
4212
4223
4213
#: bzrlib/builtins.py:5976
4224
#: bzrlib/builtins.py:5995
4214
4225
msgid "Please specify a tag name."
4215
4226
msgstr ""
4216
4227
4217
#: bzrlib/builtins.py:5984
4228
#: bzrlib/builtins.py:6003
4218
4229
#, python-format
4219
4230
msgid "Tag %s already exists for that revision."
4220
4231
msgstr ""
4221
4232
4222
#: bzrlib/builtins.py:5988
4233
#: bzrlib/builtins.py:6007
4223
4234
#, python-format
4224
4235
msgid "Created tag %s."
4225
4236
msgstr ""
4226
4237
4227
#: bzrlib/builtins.py:5990
4238
#: bzrlib/builtins.py:6009
4228
4239
#, python-format
4229
4240
msgid "Updated tag %s."
4230
4241
msgstr ""
4231
4242
4232
#: bzrlib/builtins.py:5994
4243
#: bzrlib/builtins.py:6013
4233
4244
msgid "List tags."
4234
4245
msgstr ""
4235
4246
4236
#: bzrlib/builtins.py:5996
4247
#: bzrlib/builtins.py:6015
4237
4248
msgid ""
4238
4249
"This command shows a table of tag names and the revisions they reference."
4239
4250
msgstr ""
4240
4251
4241
#: bzrlib/builtins.py:6002
4252
#: bzrlib/builtins.py:6021
4242
4253
msgid "Branch whose tags should be displayed."
4243
4254
msgstr ""
4244
4255
4245
#: bzrlib/builtins.py:6004
4256
#: bzrlib/builtins.py:6023
4246
4257
msgid "Sort tags by different criteria."
4247
4258
msgstr ""
4248
4259
4249
#: bzrlib/builtins.py:6004
4260
#: bzrlib/builtins.py:6023
4250
4261
msgid "Sorting"
4251
4262
msgstr ""
4252
4263
4253
#: bzrlib/builtins.py:6073
4264
#: bzrlib/builtins.py:6092
4254
4265
msgid "Reconfigure the type of a bzr directory."
4255
4266
msgstr ""
4256
4267
4257
#: bzrlib/builtins.py:6075
4268
#: bzrlib/builtins.py:6094
4258
4269
msgid "A target configuration must be specified."
4259
4270
msgstr ""
4260
4271
4261
#: bzrlib/builtins.py:6077
4272
#: bzrlib/builtins.py:6096
4262
4273
msgid ""
4263
4274
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4264
4275
"The order of preference is\n"
4269
4280
"If none of these is available, --bind-to must be specified."
4270
4281
msgstr ""
4271
4282
4272
#: bzrlib/builtins.py:6091
4283
#: bzrlib/builtins.py:6110
4273
4284
msgid "Tree type"
4274
4285
msgstr ""
4275
4286
4276
#: bzrlib/builtins.py:6092
4287
#: bzrlib/builtins.py:6111
4277
4288
msgid "The relation between branch and tree."
4278
4289
msgstr ""
4279
4290
4280
#: bzrlib/builtins.py:6094
4291
#: bzrlib/builtins.py:6113
4281
4292
msgid "Reconfigure to be an unbound branch with no working tree."
4282
4293
msgstr ""
4283
4294
4284
#: bzrlib/builtins.py:6095
4295
#: bzrlib/builtins.py:6114
4285
4296
msgid "Reconfigure to be an unbound branch with a working tree."
4286
4297
msgstr ""
4287
4298
4288
#: bzrlib/builtins.py:6096
4299
#: bzrlib/builtins.py:6115
4289
4300
msgid "Reconfigure to be a bound branch with a working tree."
4290
4301
msgstr ""
4291
4302
4292
#: bzrlib/builtins.py:6097
4303
#: bzrlib/builtins.py:6116
4293
4304
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4294
4305
msgstr ""
4295
4306
4296
#: bzrlib/builtins.py:6102
4307
#: bzrlib/builtins.py:6121
4297
4308
msgid "Repository type"
4298
4309
msgstr ""
4299
4310
4300
#: bzrlib/builtins.py:6103
4311
#: bzrlib/builtins.py:6122
4301
4312
msgid "Location fo the repository."
4302
4313
msgstr ""
4303
4314
4304
#: bzrlib/builtins.py:6105
4315
#: bzrlib/builtins.py:6124
4305
4316
msgid ""
4306
4317
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4307
4318
msgstr ""
4308
4319
4309
#: bzrlib/builtins.py:6107
4320
#: bzrlib/builtins.py:6126
4310
4321
msgid "Reconfigure to use a shared repository."
4311
4322
msgstr ""
4312
4323
4313
#: bzrlib/builtins.py:6111
4324
#: bzrlib/builtins.py:6130
4314
4325
msgid "Trees in Repository"
4315
4326
msgstr ""
4316
4327
4317
#: bzrlib/builtins.py:6112
4328
#: bzrlib/builtins.py:6131
4318
4329
msgid "Whether new branches in the repository have trees."
4319
4330
msgstr ""
4320
4331
4321
#: bzrlib/builtins.py:6114
4332
#: bzrlib/builtins.py:6133
4322
4333
msgid ""
4323
4334
"Reconfigure repository to create working trees on branches by default."
4324
4335
msgstr ""
4325
4336
4326
#: bzrlib/builtins.py:6116
4337
#: bzrlib/builtins.py:6135
4327
4338
msgid ""
4328
4339
"Reconfigure repository to not create working trees on branches by default."
4329
4340
msgstr ""
4330
4341
4331
#: bzrlib/builtins.py:6119
4342
#: bzrlib/builtins.py:6138
4332
4343
msgid "Branch to bind checkout to."
4333
4344
msgstr "Ветвь, с которой связать рабочую копию."
4334
4345
4335
#: bzrlib/builtins.py:6121
4346
#: bzrlib/builtins.py:6140
4336
4347
msgid "Perform reconfiguration even if local changes will be lost."
4337
4348
msgstr ""
4338
4349
4339
#: bzrlib/builtins.py:6124
4350
#: bzrlib/builtins.py:6143
4340
4351
msgid "Reconfigure a branch to be stacked on another branch."
4341
4352
msgstr ""
4342
4353
4343
#: bzrlib/builtins.py:6128
4354
#: bzrlib/builtins.py:6147
4344
4355
msgid ""
4345
4356
"Reconfigure a branch to be unstacked. This may require copying substantial "
4346
4357
"data into it."
4347
4358
msgstr ""
4348
4359
4349
#: bzrlib/builtins.py:6138
4360
#: bzrlib/builtins.py:6157
4350
4361
msgid "Can't use both --stacked-on and --unstacked"
4351
4362
msgstr ""
4352
4363
4353
#: bzrlib/builtins.py:6152
4364
#: bzrlib/builtins.py:6171
4354
4365
msgid "No target configuration specified"
4355
4366
msgstr ""
4356
4367
4357
#: bzrlib/builtins.py:6187
4368
#: bzrlib/builtins.py:6206
4358
4369
msgid "Set the branch of a checkout and update."
4359
4370
msgstr "Выбрать ветвь рабочей копии и обновить."
4360
4371
4361
#: bzrlib/builtins.py:6189
4372
#: bzrlib/builtins.py:6208
4362
4373
msgid ""
4363
4374
"For lightweight checkouts, this changes the branch being referenced.\n"
4364
4375
"For heavyweight checkouts, this checks that there are no local commits\n"
4366
4377
"of the new location and binds to it."
4367
4378
msgstr ""
4368
4379
4369
#: bzrlib/builtins.py:6194
4380
#: bzrlib/builtins.py:6213
4370
4381
msgid ""
4371
4382
"In both cases, the working tree is updated and uncommitted changes\n"
4372
4383
"are merged. The user can commit or revert these as they desire."
4373
4384
msgstr ""
4374
4385
4375
#: bzrlib/builtins.py:6197
4386
#: bzrlib/builtins.py:6216
4376
4387
msgid "Pending merges need to be committed or reverted before using switch."
4377
4388
msgstr ""
4378
4389
4379
#: bzrlib/builtins.py:6199
4390
#: bzrlib/builtins.py:6218
4380
4391
msgid ""
4381
4392
"The path to the branch to switch to can be specified relative to the parent\n"
4382
4393
"directory of the current branch. For example, if you are currently in a\n"
4384
4395
"/path/to/newbranch."
4385
4396
msgstr ""
4386
4397
4387
#: bzrlib/builtins.py:6204
4398
#: bzrlib/builtins.py:6223
4388
4399
msgid ""
4389
4400
"Bound branches use the nickname of its master branch unless it is set\n"
4390
4401
"locally, in which case switching will update the local nickname to be\n"
4391
4402
"that of the master."
4392
4403
msgstr ""
4393
4404
4394
#: bzrlib/builtins.py:6212
4405
#: bzrlib/builtins.py:6231
4395
4406
msgid "Switch even if local commits will be lost."
4396
4407
msgstr ""
4397
4408
4398
#: bzrlib/builtins.py:6215
4409
#: bzrlib/builtins.py:6234
4399
4410
msgid "Create the target branch from this one before switching to it."
4400
4411
msgstr ""
4401
4412
4402
#: bzrlib/builtins.py:6229
4413
#: bzrlib/builtins.py:6248
4403
4414
msgid "You must supply either a revision or a location"
4404
4415
msgstr ""
4405
4416
4406
#: bzrlib/builtins.py:6242
4417
#: bzrlib/builtins.py:6261
4407
4418
msgid "cannot create branch without source branch"
4408
4419
msgstr ""
4409
4420
4410
#: bzrlib/builtins.py:6262
4421
#: bzrlib/builtins.py:6286
4411
4422
msgid "Manage filtered views."
4412
4423
msgstr ""
4413
4424
4414
#: bzrlib/builtins.py:6264
4425
#: bzrlib/builtins.py:6288
4415
4426
msgid ""
4416
4427
"Views provide a mask over the tree so that users can focus on\n"
4417
4428
"a subset of a tree when doing their work. After creating a view,\n"
4421
4432
"must be within the current view."
4422
4433
msgstr ""
4423
4434
4424
#: bzrlib/builtins.py:6271
4435
#: bzrlib/builtins.py:6295
4425
4436
msgid ""
4426
4437
"In most cases, a view has a short life-span: it is created to make\n"
4427
4438
"a selected change and is deleted once that change is committed.\n"
4429
4440
"and switch between them."
4430
4441
msgstr ""
4431
4442
4432
#: bzrlib/builtins.py:6276
4443
#: bzrlib/builtins.py:6300
4433
4444
msgid ""
4434
4445
"To disable the current view without deleting it, you can switch to\n"
4435
4446
"the pseudo view called ``off``. This can be useful when you need\n"
4437
4448
"want to switch back to your view after that."
4438
4449
msgstr ""
4439
4450
4440
#: bzrlib/builtins.py:6281
4451
#: bzrlib/builtins.py:6305
4441
4452
msgid ""
4442
4453
":Examples:\n"
4443
4454
" To define the current view::"
4444
4455
msgstr ""
4445
4456
4446
#: bzrlib/builtins.py:6284
4457
#: bzrlib/builtins.py:6308
4447
4458
msgid " bzr view file1 dir1 ..."
4448
4459
msgstr ""
4449
4460
4450
#: bzrlib/builtins.py:6286
4461
#: bzrlib/builtins.py:6310
4451
4462
msgid " To list the current view::"
4452
4463
msgstr ""
4453
4464
4454
#: bzrlib/builtins.py:6288
4465
#: bzrlib/builtins.py:6312
4455
4466
msgid " bzr view"
4456
4467
msgstr ""
4457
4468
4458
#: bzrlib/builtins.py:6290
4469
#: bzrlib/builtins.py:6314
4459
4470
msgid " To delete the current view::"
4460
4471
msgstr ""
4461
4472
4462
#: bzrlib/builtins.py:6292
4473
#: bzrlib/builtins.py:6316
4463
4474
msgid " bzr view --delete"
4464
4475
msgstr ""
4465
4476
4466
#: bzrlib/builtins.py:6294
4477
#: bzrlib/builtins.py:6318
4467
4478
msgid " To disable the current view without deleting it::"
4468
4479
msgstr ""
4469
4480
4470
#: bzrlib/builtins.py:6296
4481
#: bzrlib/builtins.py:6320
4471
4482
msgid " bzr view --switch off"
4472
4483
msgstr ""
4473
4484
4474
#: bzrlib/builtins.py:6298
4485
#: bzrlib/builtins.py:6322
4475
4486
msgid " To define a named view and switch to it::"
4476
4487
msgstr ""
4477
4488
4478
#: bzrlib/builtins.py:6300
4489
#: bzrlib/builtins.py:6324
4479
4490
msgid " bzr view --name view-name file1 dir1 ..."
4480
4491
msgstr ""
4481
4492
4482
#: bzrlib/builtins.py:6302
4493
#: bzrlib/builtins.py:6326
4483
4494
msgid " To list a named view::"
4484
4495
msgstr ""
4485
4496
4486
#: bzrlib/builtins.py:6304
4497
#: bzrlib/builtins.py:6328
4487
4498
msgid " bzr view --name view-name"
4488
4499
msgstr ""
4489
4500
4490
#: bzrlib/builtins.py:6306
4501
#: bzrlib/builtins.py:6330
4491
4502
msgid " To delete a named view::"
4492
4503
msgstr ""
4493
4504
4494
#: bzrlib/builtins.py:6308
4505
#: bzrlib/builtins.py:6332
4495
4506
msgid " bzr view --name view-name --delete"
4496
4507
msgstr ""
4497
4508
4498
#: bzrlib/builtins.py:6310
4509
#: bzrlib/builtins.py:6334
4499
4510
msgid " To switch to a named view::"
4500
4511
msgstr ""
4501
4512
4502
#: bzrlib/builtins.py:6312
4513
#: bzrlib/builtins.py:6336
4503
4514
msgid " bzr view --switch view-name"
4504
4515
msgstr ""
4505
4516
4506
#: bzrlib/builtins.py:6314
4517
#: bzrlib/builtins.py:6338
4507
4518
msgid " To list all views defined::"
4508
4519
msgstr ""
4509
4520
4510
#: bzrlib/builtins.py:6316
4521
#: bzrlib/builtins.py:6340
4511
4522
msgid " bzr view --all"
4512
4523
msgstr ""
4513
4524
4514
#: bzrlib/builtins.py:6318
4525
#: bzrlib/builtins.py:6342
4515
4526
msgid " To delete all views::"
4516
4527
msgstr ""
4517
4528
4518
#: bzrlib/builtins.py:6320
4529
#: bzrlib/builtins.py:6344
4519
4530
msgid " bzr view --delete --all"
4520
4531
msgstr ""
4521
4532
4522
#: bzrlib/builtins.py:6327
4533
#: bzrlib/builtins.py:6351
4523
4534
msgid "Apply list or delete action to all views."
4524
4535
msgstr ""
4525
4536
4526
#: bzrlib/builtins.py:6330
4537
#: bzrlib/builtins.py:6354
4527
4538
msgid "Delete the view."
4528
4539
msgstr ""
4529
4540
4530
#: bzrlib/builtins.py:6333
4541
#: bzrlib/builtins.py:6357
4531
4542
msgid "Name of the view to define, list or delete."
4532
4543
msgstr ""
4533
4544
4534
#: bzrlib/builtins.py:6337
4545
#: bzrlib/builtins.py:6361
4535
4546
msgid "Name of the view to switch to."
4536
4547
msgstr ""
4537
4548
4538
#: bzrlib/builtins.py:6356
4549
#: bzrlib/builtins.py:6380
4539
4550
msgid "Both --delete and a file list specified"
4540
4551
msgstr ""
4541
4552
4542
#: bzrlib/builtins.py:6359
4553
#: bzrlib/builtins.py:6383
4543
4554
msgid "Both --delete and --switch specified"
4544
4555
msgstr ""
4545
4556
4546
#: bzrlib/builtins.py:6362
4557
#: bzrlib/builtins.py:6386
4547
4558
msgid "Deleted all views.\n"
4548
4559
msgstr ""
4549
4560
4550
#: bzrlib/builtins.py:6364
4561
#: bzrlib/builtins.py:6388
4551
4562
msgid "No current view to delete"
4552
4563
msgstr ""
4553
4564
4554
#: bzrlib/builtins.py:6367
4565
#: bzrlib/builtins.py:6391
4555
4566
#, python-format
4556
4567
msgid "Deleted '%s' view.\n"
4557
4568
msgstr ""
4558
4569
4559
#: bzrlib/builtins.py:6371
4570
#: bzrlib/builtins.py:6395
4560
4571
msgid "Both --switch and a file list specified"
4561
4572
msgstr ""
4562
4573
4563
#: bzrlib/builtins.py:6374
4574
#: bzrlib/builtins.py:6398
4564
4575
msgid "Both --switch and --all specified"
4565
4576
msgstr ""
4566
4577
4567
#: bzrlib/builtins.py:6377
4578
#: bzrlib/builtins.py:6401
4568
4579
msgid "No current view to disable"
4569
4580
msgstr ""
4570
4581
4571
#: bzrlib/builtins.py:6379
4582
#: bzrlib/builtins.py:6403
4572
4583
#, python-format
4573
4584
msgid "Disabled '%s' view.\n"
4574
4585
msgstr ""
4575
4586
4576
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4587
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4577
4588
msgid "Using '{0}' view: {1}\n"
4578
4589
msgstr ""
4579
4590
4580
#: bzrlib/builtins.py:6386
4591
#: bzrlib/builtins.py:6410
4581
4592
msgid "Views defined:\n"
4582
4593
msgstr ""
4583
4594
4584
#: bzrlib/builtins.py:6395
4595
#: bzrlib/builtins.py:6419
4585
4596
msgid "No views defined.\n"
4586
4597
msgstr ""
4587
4598
4588
#: bzrlib/builtins.py:6402
4599
#: bzrlib/builtins.py:6426
4589
4600
msgid "Cannot change the 'off' pseudo view"
4590
4601
msgstr ""
4591
4602
4592
#: bzrlib/builtins.py:6410
4603
#: bzrlib/builtins.py:6434
4593
4604
msgid "No current view.\n"
4594
4605
msgstr ""
4595
4606
4596
#: bzrlib/builtins.py:6413
4607
#: bzrlib/builtins.py:6437
4597
4608
msgid "'{0}' view is: {1}\n"
4598
4609
msgstr ""
4599
4610
4600
#: bzrlib/builtins.py:6433
4611
#: bzrlib/builtins.py:6457
4601
4612
msgid " <no hooks installed>\n"
4602
4613
msgstr ""
4603
4614
4604
#: bzrlib/builtins.py:6437
4615
#: bzrlib/builtins.py:6461
4605
4616
msgid "Remove a branch."
4606
4617
msgstr ""
4607
4618
4608
#: bzrlib/builtins.py:6439
4619
#: bzrlib/builtins.py:6463
4609
4620
msgid ""
4610
4621
"This will remove the branch from the specified location but \n"
4611
4622
"will keep any working tree or repository in place."
4612
4623
msgstr ""
4613
4624
4614
#: bzrlib/builtins.py:6444
4625
#: bzrlib/builtins.py:6468
4615
4626
msgid " Remove the branch at repo/trunk::"
4616
4627
msgstr ""
4617
4628
4618
#: bzrlib/builtins.py:6446
4629
#: bzrlib/builtins.py:6470
4619
4630
msgid " bzr remove-branch repo/trunk"
4620
4631
msgstr ""
4621
4632
4622
#: bzrlib/builtins.py:6461
4633
#: bzrlib/builtins.py:6477
4634
msgid "Remove branch even if it is the active branch."
4635
msgstr ""
4636
4637
#: bzrlib/builtins.py:6491
4638
msgid "Branch is active. Use --force to remove it."
4639
msgstr ""
4640
4641
#: bzrlib/builtins.py:6495
4623
4642
msgid "Plaintext diff output."
4624
4643
msgstr ""
4625
4644
4626
#: bzrlib/builtins.py:6462
4645
#: bzrlib/builtins.py:6496
4627
4646
msgid "Temporarily set aside some changes from the current tree."
4628
4647
msgstr ""
4629
4648
4630
#: bzrlib/builtins.py:6464
4649
#: bzrlib/builtins.py:6498
4631
4650
msgid ""
4632
4651
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4633
4652
"ie. out of the way, until a later time when you can bring them back from\n"
4636
4655
"will they survive its deletion."
4637
4656
msgstr ""
4638
4657
4639
#: bzrlib/builtins.py:6470
4658
#: bzrlib/builtins.py:6504
4640
4659
msgid "If shelve --list is specified, previously-shelved changes are listed."
4641
4660
msgstr ""
4642
4661
4643
#: bzrlib/builtins.py:6472
4662
#: bzrlib/builtins.py:6506
4644
4663
msgid ""
4645
4664
"Shelve is intended to help separate several sets of changes that have\n"
4646
4665
"been inappropriately mingled. If you just want to get rid of all changes\n"
4648
4667
"shelve all text changes at once, use shelve --all."
4649
4668
msgstr ""
4650
4669
4651
#: bzrlib/builtins.py:6477
4670
#: bzrlib/builtins.py:6511
4652
4671
msgid ""
4653
4672
"If filenames are specified, only the changes to those files will be\n"
4654
4673
"shelved. Other files will be left untouched."
4655
4674
msgstr ""
4656
4675
4657
#: bzrlib/builtins.py:6480
4676
#: bzrlib/builtins.py:6514
4658
4677
msgid ""
4659
4678
"If a revision is specified, changes since that revision will be shelved."
4660
4679
msgstr ""
4661
4680
4662
#: bzrlib/builtins.py:6482
4681
#: bzrlib/builtins.py:6516
4663
4682
msgid ""
4664
4683
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4665
4684
"restore the most recently shelved changes."
4666
4685
msgstr ""
4667
4686
4668
#: bzrlib/builtins.py:6485
4687
#: bzrlib/builtins.py:6519
4669
4688
msgid ""
4670
4689
"For complicated changes, it is possible to edit the changes in a separate\n"
4671
4690
"editor program to decide what the file remaining in the working copy\n"
4672
4691
"should look like. To do this, add the configuration option"
4673
4692
msgstr ""
4674
4693
4675
#: bzrlib/builtins.py:6489
4694
#: bzrlib/builtins.py:6523
4676
4695
msgid " change_editor = PROGRAM @new_path @old_path"
4677
4696
msgstr ""
4678
4697
4679
#: bzrlib/builtins.py:6491
4698
#: bzrlib/builtins.py:6525
4680
4699
msgid ""
4681
4700
"where @new_path is replaced with the path of the new version of the \n"
4682
4701
"file and @old_path is replaced with the path of the old version of \n"
4685
4704
" "
4686
4705
msgstr ""
4687
4706
4688
#: bzrlib/builtins.py:6503
4707
#: bzrlib/builtins.py:6537
4689
4708
msgid "Shelve all changes."
4690
4709
msgstr ""
4691
4710
4692
#: bzrlib/builtins.py:6505
4711
#: bzrlib/builtins.py:6539
4693
4712
msgid "Method to use for writing diffs."
4694
4713
msgstr ""
4695
4714
4696
#: bzrlib/builtins.py:6505
4715
#: bzrlib/builtins.py:6539
4697
4716
msgid "writer"
4698
4717
msgstr ""
4699
4718
4700
#: bzrlib/builtins.py:6509
4719
#: bzrlib/builtins.py:6543
4701
4720
msgid "List shelved changes."
4702
4721
msgstr ""
4703
4722
4704
#: bzrlib/builtins.py:6511
4723
#: bzrlib/builtins.py:6545
4705
4724
msgid "Destroy removed changes instead of shelving them."
4706
4725
msgstr ""
4707
4726
4708
#: bzrlib/builtins.py:6540
4727
#: bzrlib/builtins.py:6574
4709
4728
msgid "No shelved changes."
4710
4729
msgstr ""
4711
4730
4712
#: bzrlib/builtins.py:6551
4731
#: bzrlib/builtins.py:6585
4713
4732
msgid "Restore shelved changes."
4714
4733
msgstr ""
4715
4734
4716
#: bzrlib/builtins.py:6553
4735
#: bzrlib/builtins.py:6587
4717
4736
msgid ""
4718
4737
"By default, the most recently shelved changes are restored. However if you\n"
4719
4738
"specify a shelf by id those changes will be restored instead. This works\n"
4720
4739
"best when the changes don't depend on each other."
4721
4740
msgstr ""
4722
4741
4723
#: bzrlib/builtins.py:6562
4742
#: bzrlib/builtins.py:6596
4724
4743
msgid "The action to perform."
4725
4744
msgstr ""
4726
4745
4727
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4746
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4728
4747
msgid "action"
4729
4748
msgstr ""
4730
4749
4731
#: bzrlib/builtins.py:6564
4750
#: bzrlib/builtins.py:6598
4732
4751
msgid "Apply changes and remove from the shelf."
4733
4752
msgstr ""
4734
4753
4735
#: bzrlib/builtins.py:6565
4754
#: bzrlib/builtins.py:6599
4736
4755
msgid "Show changes, but do not apply or remove them."
4737
4756
msgstr ""
4738
4757
4739
#: bzrlib/builtins.py:6566
4758
#: bzrlib/builtins.py:6600
4740
4759
msgid ""
4741
4760
"Instead of unshelving the changes, show the diff that would result from "
4742
4761
"unshelving."
4743
4762
msgstr ""
4744
4763
4745
#: bzrlib/builtins.py:6568
4764
#: bzrlib/builtins.py:6602
4746
4765
msgid "Delete changes without applying them."
4747
4766
msgstr ""
4748
4767
4749
#: bzrlib/builtins.py:6569
4768
#: bzrlib/builtins.py:6603
4750
4769
msgid "Apply changes but don't delete them."
4751
4770
msgstr ""
4752
4771
4753
#: bzrlib/builtins.py:6584
4772
#: bzrlib/builtins.py:6618
4754
4773
msgid "Remove unwanted files from working tree."
4755
4774
msgstr ""
4756
4775
4757
#: bzrlib/builtins.py:6586
4776
#: bzrlib/builtins.py:6620
4758
4777
msgid ""
4759
4778
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4760
4779
"files are never deleted."
4761
4780
msgstr ""
4762
4781
4763
#: bzrlib/builtins.py:6589
4782
#: bzrlib/builtins.py:6623
4764
4783
msgid ""
4765
4784
"Another class is 'detritus', which includes files emitted by bzr during\n"
4766
4785
"normal operations and selftests. (The value of these files decreases with\n"
4767
4786
"time.)"
4768
4787
msgstr ""
4769
4788
4770
#: bzrlib/builtins.py:6593
4789
#: bzrlib/builtins.py:6627
4771
4790
msgid ""
4772
4791
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4773
4792
"flags are respected, and may be combined."
4774
4793
msgstr ""
4775
4794
4776
#: bzrlib/builtins.py:6596
4795
#: bzrlib/builtins.py:6630
4777
4796
msgid "To check what clean-tree will do, use --dry-run."
4778
4797
msgstr ""
4779
4798
4780
#: bzrlib/builtins.py:6599
4799
#: bzrlib/builtins.py:6633
4781
4800
msgid "Delete all ignored files."
4782
4801
msgstr ""
4783
4802
4784
#: bzrlib/builtins.py:6600
4803
#: bzrlib/builtins.py:6634
4785
4804
msgid ""
4786
4805
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4787
4806
msgstr ""
4788
4807
4789
#: bzrlib/builtins.py:6603
4808
#: bzrlib/builtins.py:6637
4790
4809
msgid "Delete files unknown to bzr (default)."
4791
4810
msgstr ""
4792
4811
4793
#: bzrlib/builtins.py:6604
4812
#: bzrlib/builtins.py:6638
4794
4813
msgid "Show files to delete instead of deleting them."
4795
4814
msgstr ""
4796
4815
4797
#: bzrlib/builtins.py:6606
4816
#: bzrlib/builtins.py:6640
4798
4817
msgid "Do not prompt before deleting."
4799
4818
msgstr ""
4800
4819
4854
4873
msgstr[0] ""
4855
4874
msgstr[1] ""
4856
4875
4857
#: bzrlib/bzrdir.py:490
4876
#: bzrlib/bzrdir.py:487
4858
4877
msgid ""
4859
4878
"making backup of {0}\n"
4860
4879
" to {1}"
4861
4880
msgstr ""
4862
4881
4863
#: bzrlib/bzrdir.py:513
4882
#: bzrlib/bzrdir.py:510
4864
4883
msgid "renamed {0} to {1}"
4865
4884
msgstr ""
4866
4885
4867
#: bzrlib/bzrdir.py:1652
4886
#: bzrlib/bzrdir.py:1639
4868
4887
#, python-format
4869
4888
msgid ""
4870
4889
"Source repository format does not support stacking, using format:\n"
4871
4890
" %s"
4872
4891
msgstr ""
4873
4892
4874
#: bzrlib/bzrdir.py:1672
4893
#: bzrlib/bzrdir.py:1659
4875
4894
#, python-format
4876
4895
msgid ""
4877
4896
"Source branch format does not support stacking, using format:\n"
4878
4897
" %s"
4879
4898
msgstr ""
4880
4899
4881
#: bzrlib/bzrdir.py:1818
4900
#: bzrlib/bzrdir.py:1805
4882
4901
msgid "starting repository conversion"
4883
4902
msgstr ""
4884
4903
4885
#: bzrlib/bzrdir.py:2039
4904
#: bzrlib/bzrdir.py:2026
4886
4905
msgid "Using default stacking branch {0} at {1}"
4887
4906
msgstr ""
4888
4907
5065
5084
"supported formats or in a custom format based on a template."
5066
5085
msgstr ""
5067
5086
5068
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
5069
#: en/help_topics/configuration.txt:710
5087
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
5088
#: en/help_topics/configuration.txt:722
5070
5089
msgid "For example::"
5071
5090
msgstr ""
5072
5091
5192
5211
msgid ":See also: %s"
5193
5212
msgstr ":Смотрите также: %s"
5194
5213
5195
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
5214
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
5196
5215
msgid "Only ASCII permitted in option names"
5197
5216
msgstr "В именах опций разрешены только символы ASCII"
5198
5217
5199
#: bzrlib/commands.py:841 bzrlib/commands.py:849
5218
#: bzrlib/commands.py:851 bzrlib/commands.py:859
5200
5219
msgid "command {0!r} needs one or more {1}"
5201
5220
msgstr "команде {0!r} требуется один или больше {1}"
5202
5221
5203
#: bzrlib/commands.py:858
5222
#: bzrlib/commands.py:868
5204
5223
msgid "command {0!r} requires argument {1}"
5205
5224
msgstr "команде {0!r} требуется аргумент {1}"
5206
5225
5207
#: bzrlib/commands.py:865
5226
#: bzrlib/commands.py:875
5208
5227
msgid "extra argument to command {0}: {1}"
5209
5228
msgstr "лишний аргумент к команде {0}: {1}"
5210
5229
5211
#: bzrlib/commands.py:962
5230
#: bzrlib/commands.py:972
5212
5231
#, python-format
5213
5232
msgid "Profile data written to \"%s\"."
5214
5233
msgstr "Данные профиля записаны в «%s»."
5251
5270
msgid "renamed"
5252
5271
msgstr "переименованы"
5253
5272
5254
#: bzrlib/commit.py:977
5273
#: bzrlib/commit.py:976
5255
5274
msgid "unchanged"
5256
5275
msgstr "без изменений"
5257
5276
5258
#: bzrlib/commit.py:999
5277
#: bzrlib/commit.py:998
5259
5278
msgid "{0} [{1}] - Stage"
5260
5279
msgstr ""
5261
5280
5262
#: bzrlib/commit.py:1002
5281
#: bzrlib/commit.py:1001
5263
5282
#, python-format
5264
5283
msgid "%s - Stage"
5265
5284
msgstr ""
5266
5285
5286
#: bzrlib/commit_signature_commands.py:34
5287
msgid "Sign all commits by a given committer."
5288
msgstr ""
5289
5267
5290
#: bzrlib/commit_signature_commands.py:36
5268
msgid "Sign all commits by a given committer."
5269
msgstr ""
5270
5271
#: bzrlib/commit_signature_commands.py:38
5272
5291
msgid ""
5273
5292
"If location is not specified the local tree is used.\n"
5274
5293
"If committer is not specified the default committer is used."
5275
5294
msgstr ""
5276
5295
5277
#: bzrlib/commit_signature_commands.py:41
5296
#: bzrlib/commit_signature_commands.py:39
5278
5297
msgid "This does not sign commits that already have signatures."
5279
5298
msgstr ""
5280
5299
5281
#: bzrlib/commit_signature_commands.py:49
5300
#: bzrlib/commit_signature_commands.py:47
5282
5301
msgid ""
5283
5302
"Don't actually sign anything, just print the revisions that would be signed."
5284
5303
msgstr ""
5285
5304
5305
#: bzrlib/commit_signature_commands.py:98
5306
#, python-format
5307
msgid "Signed %d revision.\n"
5308
msgid_plural "Signed %d revisions.\n"
5309
msgstr[0] ""
5310
msgstr[1] ""
5311
5286
5312
#: bzrlib/commit_signature_commands.py:103
5287
5313
msgid "Verify all commit signatures."
5288
5314
msgstr ""
5298
5324
"verification."
5299
5325
msgstr ""
5300
5326
5301
#: bzrlib/commit_signature_commands.py:147
5327
#: bzrlib/commit_signature_commands.py:148
5302
5328
msgid "Cannot verify a range of non-revision-history revisions"
5303
5329
msgstr ""
5304
5330
5305
#: bzrlib/commit_signature_commands.py:168
5331
#: bzrlib/commit_signature_commands.py:166
5306
5332
msgid "All commits signed with verifiable keys"
5307
5333
msgstr ""
5308
5334
5309
#: bzrlib/config.py:475
5335
#: bzrlib/config.py:436
5310
5336
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5311
5337
msgstr ""
5312
5338
5313
#: bzrlib/config.py:2485
5339
#: bzrlib/config.py:2452
5314
5340
msgid "{0} is not an SI unit."
5315
5341
msgstr ""
5316
5342
5317
#: bzrlib/config.py:2949
5343
#: bzrlib/config.py:2971
5318
5344
msgid ""
5319
5345
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5320
5346
"will be saved."
5321
5347
msgstr ""
5322
5348
5323
#: bzrlib/config.py:3093
5349
#: bzrlib/config.py:3116
5324
5350
#, python-format
5325
5351
msgid "Invalid '%s', should be of the form 'name=value'"
5326
5352
msgstr ""
5327
5353
5328
#: bzrlib/config.py:3962
5354
#: bzrlib/config.py:4018
5329
5355
msgid "Display, set or remove a configuration option."
5330
5356
msgstr ""
5331
5357
5332
#: bzrlib/config.py:3964
5358
#: bzrlib/config.py:4020
5333
5359
msgid "Display the active value for a given option."
5334
5360
msgstr ""
5335
5361
5336
#: bzrlib/config.py:3966
5362
#: bzrlib/config.py:4022
5337
5363
msgid ""
5338
5364
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5339
5365
"matching options are displayed mentioning their scope. The active value\n"
5340
5366
"that bzr will take into account is the first one displayed for each option."
5341
5367
msgstr ""
5342
5368
5343
#: bzrlib/config.py:3970
5369
#: bzrlib/config.py:4026
5344
5370
msgid "If no NAME is given, --all .* is implied."
5345
5371
msgstr ""
5346
5372
5347
#: bzrlib/config.py:3972
5373
#: bzrlib/config.py:4028
5348
5374
msgid ""
5349
5375
"Setting a value is achieved by using name=value without spaces. The value\n"
5350
5376
"is set in the most relevant scope and can be checked by displaying the\n"
5351
5377
"option again."
5352
5378
msgstr ""
5353
5379
5354
#: bzrlib/config.py:3984
5380
#: bzrlib/config.py:4040
5355
5381
msgid "Reduce the scope to the specified configuration file."
5356
5382
msgstr ""
5357
5383
5358
#: bzrlib/config.py:3988
5384
#: bzrlib/config.py:4044
5359
5385
msgid "Display all the defined values for the matching options."
5360
5386
msgstr ""
5361
5387
5362
#: bzrlib/config.py:3990
5388
#: bzrlib/config.py:4046
5363
5389
msgid "Remove the option from the configuration file."
5364
5390
msgstr ""
5365
5391
5439
5465
msgstr[0] ""
5440
5466
msgstr[1] ""
5441
5467
5442
#: bzrlib/controldir.py:710
5468
#: bzrlib/controldir.py:712
5443
5469
msgid "{0} is{1} redirected to {2}"
5444
5470
msgstr ""
5445
5471
5656
5682
msgstr ""
5657
5683
5658
5684
#: bzrlib/errors.py:715
5685
msgid "Invalid branch name: %(name)s"
5686
msgstr ""
5687
5688
#: bzrlib/errors.py:724
5659
5689
msgid "Parent branch already exists: \"%(path)s\"."
5660
5690
msgstr ""
5661
5691
5662
#: bzrlib/errors.py:721
5692
#: bzrlib/errors.py:730
5663
5693
msgid ""
5664
5694
"Directory contains a branch, but no working tree (use bzr checkout if you "
5665
5695
"wish to build a working tree): \"%(path)s\""
5666
5696
msgstr ""
5667
5697
5668
#: bzrlib/errors.py:726
5698
#: bzrlib/errors.py:735
5669
5699
msgid ""
5670
5700
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5671
5701
msgstr ""
5672
5702
5673
#: bzrlib/errors.py:736
5703
#: bzrlib/errors.py:745
5674
5704
msgid ""
5675
5705
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5676
5706
msgstr ""
5677
5707
5678
#: bzrlib/errors.py:746
5708
#: bzrlib/errors.py:755
5679
5709
msgid "No repository present: \"%(path)s\""
5680
5710
msgstr ""
5681
5711
5682
#: bzrlib/errors.py:753
5712
#: bzrlib/errors.py:762
5683
5713
msgid ""
5684
5714
"Unsupported branch format: %(format)s\n"
5685
5715
"Please run 'bzr upgrade'"
5686
5716
msgstr ""
5687
5717
5688
#: bzrlib/errors.py:759
5718
#: bzrlib/errors.py:768
5689
5719
msgid "Unknown %(kind)s format: %(format)r"
5690
5720
msgstr ""
5691
5721
5692
#: bzrlib/errors.py:768
5722
#: bzrlib/errors.py:777
5693
5723
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5694
5724
msgstr ""
5695
5725
5696
#: bzrlib/errors.py:778
5726
#: bzrlib/errors.py:787
5697
5727
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5698
5728
msgstr ""
5699
5729
5700
#: bzrlib/errors.py:793
5730
#: bzrlib/errors.py:802
5701
5731
msgid ""
5702
5732
"%(target)s\n"
5703
5733
"is not compatible with\n"
5705
5735
"%(details)s"
5706
5736
msgstr ""
5707
5737
5708
#: bzrlib/errors.py:809
5738
#: bzrlib/errors.py:818
5709
5739
msgid "Revision is not compatible with %(repo_format)s"
5710
5740
msgstr ""
5711
5741
5712
#: bzrlib/errors.py:819
5742
#: bzrlib/errors.py:828
5713
5743
msgid "%(context_info)s%(path)s is already versioned."
5714
5744
msgstr ""
5715
5745
5716
#: bzrlib/errors.py:840
5746
#: bzrlib/errors.py:849
5717
5747
msgid "%(context_info)s%(path)s is not versioned."
5718
5748
msgstr ""
5719
5749
5720
#: bzrlib/errors.py:861
5750
#: bzrlib/errors.py:870
5721
5751
msgid "Path(s) are not versioned: %(paths_as_string)s"
5722
5752
msgstr ""
5723
5753
5724
#: bzrlib/errors.py:872
5754
#: bzrlib/errors.py:881
5725
5755
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5726
5756
msgstr ""
5727
5757
5728
#: bzrlib/errors.py:891
5758
#: bzrlib/errors.py:900
5729
5759
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5730
5760
msgstr ""
5731
5761
5732
#: bzrlib/errors.py:899
5762
#: bzrlib/errors.py:908
5733
5763
msgid ""
5734
5764
"Filename %(filename)r is not valid in your current filesystem encoding "
5735
5765
"%(fs_encoding)s"
5736
5766
msgstr ""
5737
5767
5738
#: bzrlib/errors.py:910
5768
#: bzrlib/errors.py:919
5739
5769
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5740
5770
msgstr ""
5741
5771
5742
#: bzrlib/errors.py:928
5772
#: bzrlib/errors.py:937
5743
5773
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5744
5774
msgstr ""
5745
5775
5746
#: bzrlib/errors.py:967
5776
#: bzrlib/errors.py:976
5747
5777
msgid "Cannot lock %(lock)s: %(why)s"
5748
5778
msgstr ""
5749
5779
5750
#: bzrlib/errors.py:977
5780
#: bzrlib/errors.py:986
5751
5781
msgid ""
5752
5782
"A transaction related operation was attempted after the transaction finished."
5753
5783
msgstr ""
5754
5784
5755
#: bzrlib/errors.py:1004
5785
#: bzrlib/errors.py:1013
5756
5786
msgid "Cannot lock: transport is read only: %(transport)s"
5757
5787
msgstr ""
5758
5788
5759
#: bzrlib/errors.py:1012
5789
#: bzrlib/errors.py:1021
5760
5790
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5761
5791
msgstr ""
5762
5792
5763
#: bzrlib/errors.py:1023
5793
#: bzrlib/errors.py:1032
5764
5794
msgid ""
5765
5795
"Lock was broken while still open: %(lock)s - check storage consistency!"
5766
5796
msgstr ""
5767
5797
5768
#: bzrlib/errors.py:1034
5798
#: bzrlib/errors.py:1043
5769
5799
msgid ""
5770
5800
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5771
5801
"%(holder)r, wanted to break %(target)r"
5772
5802
msgstr ""
5773
5803
5774
#: bzrlib/errors.py:1046
5804
#: bzrlib/errors.py:1055
5775
5805
msgid ""
5776
5806
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5777
5807
"Use 'bzr break-lock' to clear it"
5778
5808
msgstr ""
5779
5809
5780
#: bzrlib/errors.py:1059
5810
#: bzrlib/errors.py:1068
5781
5811
msgid "Lock not held: %(lock)s"
5782
5812
msgstr ""
5783
5813
5784
#: bzrlib/errors.py:1088
5814
#: bzrlib/errors.py:1097
5785
5815
msgid "No changes to commit"
5786
5816
msgstr ""
5787
5817
5788
#: bzrlib/errors.py:1093
5818
#: bzrlib/errors.py:1102
5789
5819
msgid ""
5790
5820
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5791
5821
msgstr ""
5792
5822
5793
#: bzrlib/errors.py:1103
5823
#: bzrlib/errors.py:1112
5794
5824
msgid ""
5795
5825
"Excluding paths during commit is not supported by repository at "
5796
5826
"%(repository)r."
5797
5827
msgstr ""
5798
5828
5799
#: bzrlib/errors.py:1112
5829
#: bzrlib/errors.py:1121
5800
5830
msgid ""
5801
5831
"The specified commit message contains characters unsupported by the current "
5802
5832
"encoding."
5803
5833
msgstr ""
5804
5834
5805
#: bzrlib/errors.py:1118
5835
#: bzrlib/errors.py:1127
5806
5836
msgid "Upgrade URL cannot work with readonly URLs."
5807
5837
msgstr ""
5808
5838
5809
#: bzrlib/errors.py:1123
5839
#: bzrlib/errors.py:1132
5810
5840
msgid "The branch format %(format)s is already at the most recent format."
5811
5841
msgstr ""
5812
5842
5813
#: bzrlib/errors.py:1146
5843
#: bzrlib/errors.py:1155
5814
5844
msgid "Option --change does not accept revision ranges"
5815
5845
msgstr ""
5816
5846
5817
#: bzrlib/errors.py:1151
5847
#: bzrlib/errors.py:1160
5818
5848
msgid "No namespace registered for string: %(spec)r"
5819
5849
msgstr ""
5820
5850
5821
#: bzrlib/errors.py:1170
5851
#: bzrlib/errors.py:1179
5822
5852
msgid ""
5823
5853
"Requested revision: '%(spec)s' does not exist in branch: "
5824
5854
"%(branch_url)s%(extra)s"
5825
5855
msgstr ""
5826
5856
5827
#: bzrlib/errors.py:1184
5857
#: bzrlib/errors.py:1193
5828
5858
msgid ""
5829
5859
"Operation denied because it would change the main history, which is not "
5830
5860
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5831
5861
msgstr ""
5832
5862
5833
#: bzrlib/errors.py:1195
5863
#: bzrlib/errors.py:1204
5834
5864
msgid ""
5835
5865
"These branches have diverged. Use the missing command to see how.\n"
5836
5866
"Use the merge command to reconcile them."
5837
5867
msgstr ""
5838
5868
5839
#: bzrlib/errors.py:1215
5869
#: bzrlib/errors.py:1224
5840
5870
msgid ""
5841
5871
"Branches have no common ancestor, and no merge base revision was specified."
5842
5872
msgstr ""
5843
5873
5844
#: bzrlib/errors.py:1221
5874
#: bzrlib/errors.py:1230
5845
5875
msgid ""
5846
5876
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5847
5877
msgstr ""
5848
5878
5849
#: bzrlib/errors.py:1227
5879
#: bzrlib/errors.py:1236
5850
5880
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5851
5881
msgstr ""
5852
5882
5853
#: bzrlib/errors.py:1236
5883
#: bzrlib/errors.py:1245
5854
5884
msgid ""
5855
5885
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5856
5886
msgstr ""
5857
5887
5858
#: bzrlib/errors.py:1245
5888
#: bzrlib/errors.py:1254
5859
5889
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5860
5890
msgstr ""
5861
5891
5862
#: bzrlib/errors.py:1254
5892
#: bzrlib/errors.py:1263
5863
5893
msgid "Branch %(branch)s has no commits."
5864
5894
msgstr ""
5865
5895
5866
#: bzrlib/errors.py:1272
5896
#: bzrlib/errors.py:1281
5867
5897
msgid ""
5868
5898
"Bound branch %(branch)s is out of date with master branch "
5869
5899
"%(master)s.%(extra_help)s"
5870
5900
msgstr ""
5871
5901
5872
#: bzrlib/errors.py:1284
5902
#: bzrlib/errors.py:1293
5873
5903
msgid ""
5874
5904
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5875
5905
"bound to %(remote)s."
5876
5906
msgstr ""
5877
5907
5878
#: bzrlib/errors.py:1296
5908
#: bzrlib/errors.py:1305
5879
5909
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5880
5910
msgstr ""
5881
5911
5882
#: bzrlib/errors.py:1305
5912
#: bzrlib/errors.py:1314
5883
5913
msgid ""
5884
5914
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5885
5915
"%(error)s"
5886
5916
msgstr ""
5887
5917
5888
#: bzrlib/errors.py:1317
5918
#: bzrlib/errors.py:1326
5889
5919
msgid "Error in processing weave: %(msg)s"
5890
5920
msgstr ""
5891
5921
5892
#: bzrlib/errors.py:1326
5922
#: bzrlib/errors.py:1335
5893
5923
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5894
5924
msgstr ""
5895
5925
5896
#: bzrlib/errors.py:1337
5926
#: bzrlib/errors.py:1346
5897
5927
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5898
5928
msgstr ""
5899
5929
5900
#: bzrlib/errors.py:1347
5930
#: bzrlib/errors.py:1356
5901
5931
msgid "Weave invariant violated: %(what)s"
5902
5932
msgstr ""
5903
5933
5904
#: bzrlib/errors.py:1356
5934
#: bzrlib/errors.py:1365
5905
5935
msgid "Parents are mismatched between two revisions. %(msg)s"
5906
5936
msgstr ""
5907
5937
5908
#: bzrlib/errors.py:1378
5938
#: bzrlib/errors.py:1387
5909
5939
msgid ""
5910
5940
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5911
5941
"%(weave_b)s"
5912
5942
msgstr ""
5913
5943
5914
#: bzrlib/errors.py:1390
5944
#: bzrlib/errors.py:1399
5915
5945
msgid "Versioned file error"
5916
5946
msgstr ""
5917
5947
5918
#: bzrlib/errors.py:1395
5948
#: bzrlib/errors.py:1404
5919
5949
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5920
5950
msgstr ""
5921
5951
5922
#: bzrlib/errors.py:1405
5952
#: bzrlib/errors.py:1414
5923
5953
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5924
5954
msgstr ""
5925
5955
5926
#: bzrlib/errors.py:1415
5956
#: bzrlib/errors.py:1424
5927
5957
msgid "Text did not match its checksum: %(msg)s"
5928
5958
msgstr ""
5929
5959
5930
#: bzrlib/errors.py:1541
5960
#: bzrlib/errors.py:1550
5931
5961
msgid "Export format %(format)r not supported"
5932
5962
msgstr ""
5933
5963
5934
#: bzrlib/errors.py:1550
5964
#: bzrlib/errors.py:1559
5935
5965
msgid "Transport error: %(msg)s %(orig_error)s"
5936
5966
msgstr ""
5937
5967
5938
#: bzrlib/errors.py:1576
5968
#: bzrlib/errors.py:1585
5939
5969
msgid "Generic bzr smart protocol error: %(details)s"
5940
5970
msgstr ""
5941
5971
5942
#: bzrlib/errors.py:1584
5972
#: bzrlib/errors.py:1593
5943
5973
msgid "Received bad protocol version marker: %(marker)r"
5944
5974
msgstr ""
5945
5975
5946
#: bzrlib/errors.py:1616
5976
#: bzrlib/errors.py:1625
5947
5977
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5948
5978
msgstr ""
5949
5979
5950
#: bzrlib/errors.py:1621
5980
#: bzrlib/errors.py:1630
5951
5981
msgid "Connection error: %(msg)s %(orig_error)s"
5952
5982
msgstr ""
5953
5983
5954
#: bzrlib/errors.py:1626
5984
#: bzrlib/errors.py:1635
5955
5985
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5956
5986
msgstr ""
5957
5987
5958
#: bzrlib/errors.py:1647
5988
#: bzrlib/errors.py:1656
5959
5989
msgid "Connection closed: %(msg)s %(orig_error)s"
5960
5990
msgstr ""
5961
5991
5962
#: bzrlib/errors.py:1652
5992
#: bzrlib/errors.py:1661
5963
5993
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5964
5994
msgstr ""
5965
5995
5966
#: bzrlib/errors.py:1657
5996
#: bzrlib/errors.py:1666
5967
5997
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5968
5998
msgstr ""
5969
5999
5970
#: bzrlib/errors.py:1667
6000
#: bzrlib/errors.py:1676
5971
6001
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5972
6002
msgstr ""
5973
6003
5974
#: bzrlib/errors.py:1682
6004
#: bzrlib/errors.py:1691
5975
6005
msgid "Certificate error: %(error)s"
5976
6006
msgstr ""
5977
6007
5978
#: bzrlib/errors.py:1690
6008
#: bzrlib/errors.py:1699
5979
6009
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5980
6010
msgstr ""
5981
6011
5982
#: bzrlib/errors.py:1704
6012
#: bzrlib/errors.py:1713
5983
6013
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5984
6014
msgstr ""
5985
6015
5986
#: bzrlib/errors.py:1712
6016
#: bzrlib/errors.py:1721
5987
6017
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5988
6018
msgstr ""
5989
6019
5990
#: bzrlib/errors.py:1721
6020
#: bzrlib/errors.py:1730
5991
6021
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5992
6022
msgstr ""
5993
6023
5994
#: bzrlib/errors.py:1735
6024
#: bzrlib/errors.py:1744
5995
6025
msgid "Too many redirections"
5996
6026
msgstr ""
5997
6027
5998
#: bzrlib/errors.py:1740
6028
#: bzrlib/errors.py:1749
5999
6029
msgid "Working tree has conflicts."
6000
6030
msgstr ""
6001
6031
6002
#: bzrlib/errors.py:1744
6032
#: bzrlib/errors.py:1753
6003
6033
msgid "Config file %(filename)s is not UTF-8 encoded\n"
6004
6034
msgstr ""
6005
6035
6006
#: bzrlib/errors.py:1753
6036
#: bzrlib/errors.py:1762
6007
6037
msgid ""
6008
6038
"Error(s) parsing config file %(filename)s:\n"
6009
6039
"%(errors)s"
6010
6040
msgstr ""
6011
6041
6012
#: bzrlib/errors.py:1763
6042
#: bzrlib/errors.py:1772
6013
6043
msgid ""
6014
6044
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6015
6045
"See ``bzr help %(name)s``"
6016
6046
msgstr ""
6017
6047
6018
#: bzrlib/errors.py:1773
6048
#: bzrlib/errors.py:1782
6019
6049
msgid "%(username)r does not seem to contain a reasonable email address"
6020
6050
msgstr ""
6021
6051
6022
#: bzrlib/errors.py:1782
6052
#: bzrlib/errors.py:1791
6023
6053
msgid "Failed to GPG sign data with command \"%(command_line)s\""
6024
6054
msgstr ""
6025
6055
6026
#: bzrlib/errors.py:1790
6056
#: bzrlib/errors.py:1799
6027
6057
msgid "Failed to verify GPG signature data with error \"%(error)s\""
6028
6058
msgstr "Не удалось верифицировать подпись GPG с ошибкой «%(error)s»"
6029
6059
6030
#: bzrlib/errors.py:1798
6060
#: bzrlib/errors.py:1807
6031
6061
msgid "Unable to import library \"%(library)s\": %(error)s"
6032
6062
msgstr "Не удалось импортировать библиотеку «%(library)s»: %(error)s"
6033
6063
6034
#: bzrlib/errors.py:1806
6064
#: bzrlib/errors.py:1815
6035
6065
msgid "python-gpgme is not installed, it is needed to verify signatures"
6036
6066
msgstr "python-gpgme не устонвлен, он нужен для верификации подписей"
6037
6067
6038
#: bzrlib/errors.py:1814
6068
#: bzrlib/errors.py:1823
6039
6069
msgid ""
6040
6070
"The working tree for %(basedir)s has changed since the last commit, but "
6041
6071
"weave merge requires that it be unchanged"
6043
6073
"Рабочее дерево для %(basedir)s изменилось с последнего закрепления, но merge "
6044
6074
"требует, чтобы оно не содержало изменений"
6045
6075
6046
#: bzrlib/errors.py:1824
6076
#: bzrlib/errors.py:1833
6047
6077
msgid ""
6048
6078
"Can't reprocess and show base, because reprocessing obscures the "
6049
6079
"relationship of conflicting lines to the base"
6050
6080
msgstr ""
6051
6081
6052
#: bzrlib/errors.py:1830
6082
#: bzrlib/errors.py:1839
6053
6083
msgid "Cycle in graph %(graph)r"
6054
6084
msgstr "Цикл в графе %(graph)r"
6055
6085
6056
#: bzrlib/errors.py:1858
6086
#: bzrlib/errors.py:1867
6057
6087
msgid "File %(filename)s is not conflicted."
6058
6088
msgstr "Файл %(filename)s не содержит конфликтов."
6059
6089
6060
#: bzrlib/errors.py:1880
6090
#: bzrlib/errors.py:1889
6061
6091
msgid "No bundle was found in \"%(filename)s\"."
6062
6092
msgstr "В файле «%(filename)s» нет пакета."
6063
6093
6064
#: bzrlib/errors.py:1889
6094
#: bzrlib/errors.py:1898
6065
6095
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6066
6096
msgstr "Не удалось обработать версию пакета %(version)s: %(msg)s"
6067
6097
6068
#: bzrlib/errors.py:1899
6098
#: bzrlib/errors.py:1908
6069
6099
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6070
6100
msgstr ""
6071
6101
"В ветви %(base)s отсутствует ревизия %(text_revision)s файла %(file_id)s"
6072
6102
6073
#: bzrlib/errors.py:1912
6103
#: bzrlib/errors.py:1921
6074
6104
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6075
6105
msgstr ""
6076
6106
"Идентификатор файла {%(file_id)s} уже присутствует в инвентаре как %(entry)s"
6077
6107
6078
#: bzrlib/errors.py:1922
6108
#: bzrlib/errors.py:1931
6079
6109
msgid "Key %(key)s is already present in map"
6080
6110
msgstr ""
6081
6111
6082
#: bzrlib/errors.py:1927
6112
#: bzrlib/errors.py:1936
6083
6113
msgid "The prefix %(prefix)s is in the help search path twice."
6084
6114
msgstr ""
6085
6115
6086
#: bzrlib/errors.py:1937
6116
#: bzrlib/errors.py:1946
6087
6117
msgid ""
6088
6118
"No final name for trans_id %(trans_id)r\n"
6089
6119
"file-id: %(file_id)r\n"
6090
6120
"root trans-id: %(root_trans_id)r\n"
6091
6121
msgstr ""
6092
6122
6093
#: bzrlib/errors.py:1969
6123
#: bzrlib/errors.py:1978
6094
6124
msgid "Attempt to reuse a transform that has already been applied."
6095
6125
msgstr ""
6096
6126
6097
#: bzrlib/errors.py:1974
6127
#: bzrlib/errors.py:1983
6098
6128
msgid "Moving the root directory is not supported at this time"
6099
6129
msgstr "Перемещение в корневую директорию пока не поддерживается"
6100
6130
6101
#: bzrlib/errors.py:1979
6131
#: bzrlib/errors.py:1988
6102
6132
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6103
6133
msgstr "Не удалось переименовать %(from_path)s в %(to_path)s: %(why)s"
6104
6134
6105
#: bzrlib/errors.py:1990
6135
#: bzrlib/errors.py:1999
6106
6136
msgid ""
6107
6137
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6108
6138
msgstr ""
6109
6139
"Не удалось переместить %(from_path)s%(operator)s "
6110
6140
"%(to_path)s%(_has_extra)s%(extra)s"
6111
6141
6112
#: bzrlib/errors.py:2026
6142
#: bzrlib/errors.py:2035
6113
6143
msgid ""
6114
6144
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6115
6145
msgstr ""
6116
6146
"Не удалось переименовать %(from_path)s%(operator)s "
6117
6147
"%(to_path)s%(_has_extra)s%(extra)s"
6118
6148
6119
#: bzrlib/errors.py:2056
6149
#: bzrlib/errors.py:2065
6120
6150
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6121
6151
msgstr ""
6122
6152
6123
#: bzrlib/errors.py:2064
6153
#: bzrlib/errors.py:2073
6124
6154
msgid "Nothing to merge."
6125
6155
msgstr "Нечего совмещать."
6126
6156
6127
#: bzrlib/errors.py:2069
6157
#: bzrlib/errors.py:2078
6128
6158
msgid "Format %(format)s cannot be initialised by this version of bzr."
6129
6159
msgstr ""
6130
6160
6131
#: bzrlib/errors.py:2078
6161
#: bzrlib/errors.py:2087
6132
6162
msgid ""
6133
6163
"Cannot convert from format %(from_format)s to format %(format)s. "
6134
6164
"%(problem)s"
6135
6165
msgstr ""
6136
6166
6137
#: bzrlib/errors.py:2090
6167
#: bzrlib/errors.py:2099
6138
6168
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6139
6169
msgstr ""
6140
6170
6141
#: bzrlib/errors.py:2098
6171
#: bzrlib/errors.py:2107
6142
6172
msgid "%(exe_name)s could not be found on this machine"
6143
6173
msgstr ""
6144
6174
6145
#: bzrlib/errors.py:2106
6175
#: bzrlib/errors.py:2115
6146
6176
msgid "Diff is not installed on this machine: %(msg)s"
6147
6177
msgstr ""
6148
6178
6149
#: bzrlib/errors.py:2114
6179
#: bzrlib/errors.py:2123
6150
6180
msgid "Diff3 is not installed on this machine."
6151
6181
msgstr "Diff3 не установлен на этой машине."
6152
6182
6153
#: bzrlib/errors.py:2120
6183
#: bzrlib/errors.py:2129
6154
6184
msgid "The content being inserted is already present."
6155
6185
msgstr ""
6156
6186
6157
#: bzrlib/errors.py:2125
6187
#: bzrlib/errors.py:2134
6158
6188
msgid ""
6159
6189
"This tree contains left-over files from a failed operation.\n"
6160
6190
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6162
6192
" keep, and delete it when you are done."
6163
6193
msgstr ""
6164
6194
6165
#: bzrlib/errors.py:2136
6195
#: bzrlib/errors.py:2145
6166
6196
msgid ""
6167
6197
"This tree contains left-over files from a failed operation.\n"
6168
6198
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6169
6199
" wish to keep, and delete it when you are done."
6170
6200
msgstr ""
6171
6201
6172
#: bzrlib/errors.py:2146
6202
#: bzrlib/errors.py:2155
6173
6203
msgid ""
6174
6204
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6175
6205
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6177
6207
" keep, and delete it when you are done."
6178
6208
msgstr ""
6179
6209
6180
#: bzrlib/errors.py:2157
6210
#: bzrlib/errors.py:2166
6181
6211
msgid ""
6182
6212
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6183
6213
"examine %(pending_deletion)s to see if it contains any files you wish to "
6184
6214
"keep, and delete it when you are done."
6185
6215
msgstr ""
6186
6216
6187
#: bzrlib/errors.py:2167
6217
#: bzrlib/errors.py:2176
6188
6218
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6189
6219
msgstr ""
6190
6220
6191
#: bzrlib/errors.py:2181
6221
#: bzrlib/errors.py:2190
6192
6222
msgid ""
6193
6223
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6194
6224
msgstr ""
6195
6225
6196
#: bzrlib/errors.py:2194
6226
#: bzrlib/errors.py:2203
6197
6227
msgid "Error in merge modified format"
6198
6228
msgstr ""
6199
6229
6200
#: bzrlib/errors.py:2199
6230
#: bzrlib/errors.py:2208
6201
6231
msgid "Format error in conflict listings"
6202
6232
msgstr ""
6203
6233
6204
#: bzrlib/errors.py:2203
6234
#: bzrlib/errors.py:2212
6205
6235
msgid ""
6206
6236
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6207
6237
"Error: %(description)s"
6208
6238
msgstr ""
6209
6239
6210
#: bzrlib/errors.py:2214
6240
#: bzrlib/errors.py:2223
6211
6241
msgid ""
6212
6242
"An error has been detected in the repository %(repo_path)s.\n"
6213
6243
"Please run bzr reconcile on this repository."
6214
6244
msgstr ""
6215
6245
6216
#: bzrlib/errors.py:2225
6246
#: bzrlib/errors.py:2234
6217
6247
msgid ""
6218
6248
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6219
6249
"reason: %(reason)s"
6220
6250
msgstr ""
6221
6251
6222
#: bzrlib/errors.py:2238
6252
#: bzrlib/errors.py:2247
6223
6253
msgid ""
6224
6254
"An inconsistent delta was supplied: %(delta)r\n"
6225
6255
"reason: %(reason)s"
6226
6256
msgstr ""
6227
6257
6228
#: bzrlib/errors.py:2250
6258
#: bzrlib/errors.py:2259
6229
6259
msgid "To use this feature you must upgrade your branch at %(path)s."
6230
6260
msgstr ""
6231
6261
6232
#: bzrlib/errors.py:2259
6262
#: bzrlib/errors.py:2268
6233
6263
msgid "To use this feature you must upgrade your repository at %(path)s."
6234
6264
msgstr ""
6235
6265
6236
#: bzrlib/errors.py:2264
6266
#: bzrlib/errors.py:2273
6237
6267
msgid ""
6238
6268
"To use this feature you must upgrade your branch at %(path)s to a format "
6239
6269
"which supports rich roots."
6240
6270
msgstr ""
6241
6271
6242
#: bzrlib/errors.py:2270
6272
#: bzrlib/errors.py:2279
6243
6273
msgid "Cannot perform local-only commits on unbound branches."
6244
6274
msgstr ""
6245
6275
6246
#: bzrlib/errors.py:2275
6276
#: bzrlib/errors.py:2284
6247
6277
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6248
6278
msgstr ""
6249
6279
6250
#: bzrlib/errors.py:2296
6280
#: bzrlib/errors.py:2305
6251
6281
msgid "Ghost tags not supported by format %(format)r."
6252
6282
msgstr ""
6253
6283
6254
#: bzrlib/errors.py:2304
6284
#: bzrlib/errors.py:2313
6255
6285
msgid "File is binary but should be text."
6256
6286
msgstr ""
6257
6287
6258
#: bzrlib/errors.py:2309
6288
#: bzrlib/errors.py:2318
6259
6289
msgid "The path %(path)s is not permitted on this platform"
6260
6290
msgstr ""
6261
6291
6262
#: bzrlib/errors.py:2318
6292
#: bzrlib/errors.py:2327
6263
6293
msgid ""
6264
6294
"Testament did not match expected value.\n"
6265
6295
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6266
6296
" {%(measured)s}"
6267
6297
msgstr ""
6268
6298
6269
#: bzrlib/errors.py:2330
6299
#: bzrlib/errors.py:2339
6270
6300
msgid "Not a bzr revision-bundle: %(text)r"
6271
6301
msgstr ""
6272
6302
6273
#: bzrlib/errors.py:2339
6303
#: bzrlib/errors.py:2348
6274
6304
msgid "Bad bzr revision-bundle: %(text)r"
6275
6305
msgstr ""
6276
6306
6277
#: bzrlib/errors.py:2348
6307
#: bzrlib/errors.py:2357
6278
6308
msgid "Malformed bzr revision-bundle header: %(text)r"
6279
6309
msgstr ""
6280
6310
6281
#: bzrlib/errors.py:2353
6311
#: bzrlib/errors.py:2362
6282
6312
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6283
6313
msgstr ""
6284
6314
6285
#: bzrlib/errors.py:2358
6315
#: bzrlib/errors.py:2367
6286
6316
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6287
6317
msgstr ""
6288
6318
6289
#: bzrlib/errors.py:2363
6319
#: bzrlib/errors.py:2372
6290
6320
msgid "End of line marker was not \\n in bzr revision-bundle"
6291
6321
msgstr ""
6292
6322
6293
#: bzrlib/errors.py:2373
6323
#: bzrlib/errors.py:2382
6294
6324
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6295
6325
msgstr ""
6296
6326
6297
#: bzrlib/errors.py:2383
6327
#: bzrlib/errors.py:2392
6298
6328
msgid "Root class for inventory serialization errors"
6299
6329
msgstr ""
6300
6330
6301
#: bzrlib/errors.py:2387
6331
#: bzrlib/errors.py:2396
6302
6332
msgid ""
6303
6333
"The inventory was not in the expected format:\n"
6304
6334
" %(msg)s"
6305
6335
msgstr ""
6306
6336
6307
#: bzrlib/errors.py:2396
6337
#: bzrlib/errors.py:2405
6308
6338
msgid "This operation requires rich root data storage"
6309
6339
msgstr ""
6310
6340
6311
#: bzrlib/errors.py:2409
6341
#: bzrlib/errors.py:2418
6312
6342
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6313
6343
msgstr ""
6314
6344
6315
#: bzrlib/errors.py:2418
6345
#: bzrlib/errors.py:2427
6316
6346
msgid ""
6317
6347
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6318
6348
"variable."
6319
6349
msgstr ""
6320
6350
6321
#: bzrlib/errors.py:2425
6351
#: bzrlib/errors.py:2434
6322
6352
msgid ""
6323
6353
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6324
6354
"ghost at {%(ghost_revision_id)s}"
6325
6355
msgstr ""
6326
6356
6327
#: bzrlib/errors.py:2435
6357
#: bzrlib/errors.py:2444
6328
6358
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6329
6359
msgstr ""
6330
6360
6331
#: bzrlib/errors.py:2486
6361
#: bzrlib/errors.py:2495
6332
6362
msgid ""
6333
6363
"A merge directive must provide either a bundle or a public branch location."
6334
6364
msgstr ""
6335
6365
6336
#: bzrlib/errors.py:2493
6366
#: bzrlib/errors.py:2502
6337
6367
msgid "Bad merge directive payload %(start)r"
6338
6368
msgstr ""
6339
6369
6340
#: bzrlib/errors.py:2503
6370
#: bzrlib/errors.py:2512
6341
6371
msgid "Preview patch does not match requested changes."
6342
6372
msgstr ""
6343
6373
6344
#: bzrlib/errors.py:2509
6374
#: bzrlib/errors.py:2518
6345
6375
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6346
6376
msgstr ""
6347
6377
6348
#: bzrlib/errors.py:2519
6378
#: bzrlib/errors.py:2528
6349
6379
msgid ""
6350
6380
"Your branch does not have all of the revisions required in order to merge "
6351
6381
"this merge directive and the target location specified in the merge "
6352
6382
"directive is not a branch: %(location)s."
6353
6383
msgstr ""
6354
6384
6355
#: bzrlib/errors.py:2531
6385
#: bzrlib/errors.py:2540
6356
6386
msgid "Unsupported entry kind %(kind)s"
6357
6387
msgstr ""
6358
6388
6359
#: bzrlib/errors.py:2539
6389
#: bzrlib/errors.py:2548
6360
6390
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6361
6391
msgstr ""
6362
6392
6363
#: bzrlib/errors.py:2549
6393
#: bzrlib/errors.py:2558
6364
6394
msgid "Subsume target %(other_tree)s needs to be upgraded."
6365
6395
msgstr ""
6366
6396
6367
#: bzrlib/errors.py:2568
6397
#: bzrlib/errors.py:2577
6368
6398
msgid "No such tag: %(tag_name)s"
6369
6399
msgstr ""
6370
6400
6371
#: bzrlib/errors.py:2576
6401
#: bzrlib/errors.py:2585
6372
6402
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6373
6403
msgstr ""
6374
6404
6375
#: bzrlib/errors.py:2585
6405
#: bzrlib/errors.py:2594
6376
6406
msgid "Tag %(tag_name)s already exists."
6377
6407
msgstr ""
6378
6408
6379
#: bzrlib/errors.py:2593
6409
#: bzrlib/errors.py:2602
6380
6410
msgid ""
6381
6411
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6382
6412
"bugs\" for more information on this feature."
6383
6413
msgstr ""
6384
6414
6385
#: bzrlib/errors.py:2603
6415
#: bzrlib/errors.py:2612
6386
6416
msgid ""
6387
6417
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6388
6418
msgstr ""
6389
6419
6390
#: bzrlib/errors.py:2613
6420
#: bzrlib/errors.py:2622
6391
6421
msgid ""
6392
6422
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6393
6423
msgstr ""
6394
6424
6395
#: bzrlib/errors.py:2623
6425
#: bzrlib/errors.py:2632
6396
6426
msgid "Invalid line in bugs property: '%(line)s'"
6397
6427
msgstr ""
6398
6428
6399
#: bzrlib/errors.py:2631
6429
#: bzrlib/errors.py:2640
6400
6430
msgid "Invalid bug status: '%(status)s'"
6401
6431
msgstr ""
6402
6432
6403
#: bzrlib/errors.py:2639
6433
#: bzrlib/errors.py:2648
6404
6434
msgid "Could not understand response from smart server: %(response_tuple)r"
6405
6435
msgstr ""
6406
6436
6407
#: bzrlib/errors.py:2678
6437
#: bzrlib/errors.py:2687
6408
6438
msgid "Server sent an unexpected error: %(error_tuple)r"
6409
6439
msgstr ""
6410
6440
6411
#: bzrlib/errors.py:2697
6441
#: bzrlib/errors.py:2706
6412
6442
msgid "Unrecognised container format: %(container_format)r"
6413
6443
msgstr ""
6414
6444
6415
#: bzrlib/errors.py:2705
6445
#: bzrlib/errors.py:2714
6416
6446
msgid "Unexpected end of container stream"
6417
6447
msgstr ""
6418
6448
6419
#: bzrlib/errors.py:2710
6449
#: bzrlib/errors.py:2719
6420
6450
msgid "Unknown record type: %(record_type)r"
6421
6451
msgstr ""
6422
6452
6423
#: bzrlib/errors.py:2718
6453
#: bzrlib/errors.py:2727
6424
6454
msgid "Invalid record: %(reason)s"
6425
6455
msgstr ""
6426
6456
6427
#: bzrlib/errors.py:2726
6457
#: bzrlib/errors.py:2735
6428
6458
msgid "Container has data after end marker: %(excess)r"
6429
6459
msgstr ""
6430
6460
6431
#: bzrlib/errors.py:2734
6461
#: bzrlib/errors.py:2743
6432
6462
msgid "Container has multiple records with the same name: %(name)s"
6433
6463
msgstr ""
6434
6464
6435
#: bzrlib/errors.py:2747
6465
#: bzrlib/errors.py:2756
6436
6466
msgid "Corrupt or incompatible data stream: %(reason)s"
6437
6467
msgstr ""
6438
6468
6439
#: bzrlib/errors.py:2755
6469
#: bzrlib/errors.py:2764
6440
6470
msgid "SMTP error: %(error)s"
6441
6471
msgstr ""
6442
6472
6443
#: bzrlib/errors.py:2763
6473
#: bzrlib/errors.py:2772
6444
6474
msgid "No message supplied."
6445
6475
msgstr ""
6446
6476
6447
#: bzrlib/errors.py:2768
6477
#: bzrlib/errors.py:2777
6448
6478
msgid "No mail-to address (--mail-to) or output (-o) specified."
6449
6479
msgstr ""
6450
6480
6451
#: bzrlib/errors.py:2773
6452
msgid "Unknown mail client: %(mail_client)s"
6453
msgstr ""
6454
6455
#: bzrlib/errors.py:2781
6481
#: bzrlib/errors.py:2782
6456
6482
msgid ""
6457
6483
"Unable to find mail client with the following names: "
6458
6484
"%(mail_command_list_string)s"
6459
6485
msgstr ""
6460
6486
6461
#: bzrlib/errors.py:2791
6487
#: bzrlib/errors.py:2792
6462
6488
msgid "SMTP connection to %(host)s refused"
6463
6489
msgstr ""
6464
6490
6465
#: bzrlib/errors.py:2800
6491
#: bzrlib/errors.py:2801
6466
6492
msgid "Please specify smtp_server. No server at default %(host)s."
6467
6493
msgstr ""
6468
6494
6469
#: bzrlib/errors.py:2814
6495
#: bzrlib/errors.py:2815
6470
6496
msgid ""
6471
6497
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6472
6498
"reconfigure."
6473
6499
msgstr ""
6474
6500
6475
#: bzrlib/errors.py:2826
6501
#: bzrlib/errors.py:2827
6476
6502
msgid "'%(display_url)s' is already a branch."
6477
6503
msgstr ""
6478
6504
6479
#: bzrlib/errors.py:2831
6505
#: bzrlib/errors.py:2832
6480
6506
msgid "'%(display_url)s' is already a tree."
6481
6507
msgstr ""
6482
6508
6483
#: bzrlib/errors.py:2836
6509
#: bzrlib/errors.py:2837
6484
6510
msgid "'%(display_url)s' is already a checkout."
6485
6511
msgstr ""
6486
6512
6487
#: bzrlib/errors.py:2841
6513
#: bzrlib/errors.py:2842
6488
6514
msgid "'%(display_url)s' is already a lightweight checkout."
6489
6515
msgstr ""
6490
6516
6491
#: bzrlib/errors.py:2846
6517
#: bzrlib/errors.py:2847
6492
6518
msgid "'%(display_url)s' is already using a shared repository."
6493
6519
msgstr ""
6494
6520
6495
#: bzrlib/errors.py:2851
6521
#: bzrlib/errors.py:2852
6496
6522
msgid "'%(display_url)s' is already standalone."
6497
6523
msgstr ""
6498
6524
6499
#: bzrlib/errors.py:2856
6525
#: bzrlib/errors.py:2857
6500
6526
msgid "Shared repository '%(display_url)s' already creates working trees."
6501
6527
msgstr ""
6502
6528
6503
#: bzrlib/errors.py:2862
6529
#: bzrlib/errors.py:2863
6504
6530
msgid ""
6505
6531
"Shared repository '%(display_url)s' already doesn't create working trees."
6506
6532
msgstr ""
6507
6533
6508
#: bzrlib/errors.py:2868
6534
#: bzrlib/errors.py:2869
6509
6535
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6510
6536
msgstr ""
6511
6537
6512
#: bzrlib/errors.py:2873
6538
#: bzrlib/errors.py:2874
6513
6539
msgid "No location could be found to bind to at %(display_url)s."
6514
6540
msgstr ""
6515
6541
6516
#: bzrlib/errors.py:2878
6542
#: bzrlib/errors.py:2879
6517
6543
msgid ""
6518
6544
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6519
6545
"status).%(more)s"
6520
6546
msgstr ""
6521
6547
6522
#: bzrlib/errors.py:2897
6548
#: bzrlib/errors.py:2898
6523
6549
msgid ""
6524
6550
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6525
6551
"list).%(more)s"
6526
6552
msgstr ""
6527
6553
6528
#: bzrlib/errors.py:2903
6554
#: bzrlib/errors.py:2904
6529
6555
msgid "Variable {%(name)s} is not available."
6530
6556
msgstr ""
6531
6557
6532
#: bzrlib/errors.py:2911
6558
#: bzrlib/errors.py:2912
6533
6559
msgid "No template specified."
6534
6560
msgstr ""
6535
6561
6536
#: bzrlib/errors.py:2916
6562
#: bzrlib/errors.py:2917
6537
6563
msgid "Unable to create symlink %(path_str)son this platform"
6538
6564
msgstr ""
6539
6565
6540
#: bzrlib/errors.py:2931
6566
#: bzrlib/errors.py:2932
6541
6567
msgid ""
6542
6568
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6543
6569
"\"original\", \"local\"."
6544
6570
msgstr ""
6545
6571
6546
#: bzrlib/errors.py:2965
6572
#: bzrlib/errors.py:2966
6547
6573
msgid ""
6548
6574
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6549
6575
msgstr ""
6550
6576
6551
#: bzrlib/errors.py:2977
6577
#: bzrlib/errors.py:2978
6552
6578
msgid "The \"%(config_id)s\" configuration does not exist."
6553
6579
msgstr ""
6554
6580
6555
#: bzrlib/errors.py:2985
6581
#: bzrlib/errors.py:2986
6556
6582
msgid "The \"%(option_name)s\" configuration option does not exist."
6557
6583
msgstr ""
6558
6584
6559
#: bzrlib/errors.py:2993
6585
#: bzrlib/errors.py:2994
6560
6586
msgid "The alias \"%(alias_name)s\" does not exist."
6561
6587
msgstr ""
6562
6588
6563
#: bzrlib/errors.py:3007
6589
#: bzrlib/errors.py:3008
6564
6590
msgid "\"%(alias_name)s\" is not a valid location alias."
6565
6591
msgstr ""
6566
6592
6567
#: bzrlib/errors.py:3015
6593
#: bzrlib/errors.py:3016
6568
6594
msgid "No %(alias_name)s location assigned."
6569
6595
msgstr ""
6570
6596
6571
#: bzrlib/errors.py:3023
6597
#: bzrlib/errors.py:3024
6572
6598
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6573
6599
msgstr ""
6574
6600
6575
#: bzrlib/errors.py:3033
6601
#: bzrlib/errors.py:3034
6576
6602
msgid "Unknown rules detected: %(unknowns_str)s."
6577
6603
msgstr ""
6578
6604
6579
#: bzrlib/errors.py:3044
6605
#: bzrlib/errors.py:3045
6580
6606
msgid "Tip change rejected: %(msg)s"
6581
6607
msgstr ""
6582
6608
6583
#: bzrlib/errors.py:3052
6609
#: bzrlib/errors.py:3053
6584
6610
msgid "Shelf corrupt."
6585
6611
msgstr ""
6586
6612
6587
#: bzrlib/errors.py:3057
6613
#: bzrlib/errors.py:3058
6588
6614
msgid "Corruption while decompressing repository file%(orig_error)s"
6589
6615
msgstr ""
6590
6616
6591
#: bzrlib/errors.py:3069
6617
#: bzrlib/errors.py:3070
6592
6618
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6593
6619
msgstr ""
6594
6620
6595
#: bzrlib/errors.py:3077
6621
#: bzrlib/errors.py:3078
6596
6622
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6597
6623
msgstr ""
6598
6624
6599
#: bzrlib/errors.py:3085
6625
#: bzrlib/errors.py:3086
6600
6626
msgid ""
6601
6627
"An attempt to access a url outside the server jail was made: '%(url)s'."
6602
6628
msgstr ""
6603
6629
6604
#: bzrlib/errors.py:3093
6630
#: bzrlib/errors.py:3094
6605
6631
msgid "The user aborted the operation."
6606
6632
msgstr ""
6607
6633
6608
#: bzrlib/errors.py:3098
6634
#: bzrlib/errors.py:3099
6609
6635
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6610
6636
msgstr ""
6611
6637
6612
#: bzrlib/errors.py:3108
6638
#: bzrlib/errors.py:3109
6613
6639
msgid "No such view: %(view_name)s."
6614
6640
msgstr ""
6615
6641
6616
#: bzrlib/errors.py:3118
6642
#: bzrlib/errors.py:3119
6617
6643
msgid ""
6618
6644
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6619
6645
"to a later format."
6620
6646
msgstr ""
6621
6647
6622
#: bzrlib/errors.py:3127
6648
#: bzrlib/errors.py:3128
6623
6649
msgid ""
6624
6650
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6625
6651
msgstr ""
6626
6652
6627
#: bzrlib/errors.py:3194
6653
#: bzrlib/errors.py:3195
6628
6654
msgid "%(bzrdir)r does not support co-located branches."
6629
6655
msgstr ""
6630
6656
6631
#: bzrlib/errors.py:3200
6657
#: bzrlib/errors.py:3201
6632
6658
msgid ""
6633
6659
"Unable to determine your name.\n"
6634
6660
"Please, set your name with the 'whoami' command.\n"
6635
6661
"E.g. bzr whoami \"Your Name <name@example.com>\""
6636
6662
msgstr ""
6637
6663
6638
#: bzrlib/errors.py:3209
6664
#: bzrlib/errors.py:3210
6639
6665
msgid "Invalid pattern(s) found. %(msg)s"
6640
6666
msgstr ""
6641
6667
6642
#: bzrlib/errors.py:3217
6668
#: bzrlib/errors.py:3218
6643
6669
msgid ""
6644
6670
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6645
6671
"unbind` to fix."
6646
6672
msgstr ""
6647
6673
6648
#: bzrlib/errors.py:3228
6674
#: bzrlib/errors.py:3229
6649
6675
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6650
6676
msgstr ""
6651
6677
6652
#: bzrlib/errors.py:3237
6678
#: bzrlib/errors.py:3238
6653
6679
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6654
6680
msgstr ""
6655
6681
6656
#: bzrlib/errors.py:3246
6682
#: bzrlib/errors.py:3247
6657
6683
msgid ""
6658
6684
"No compatible object available for operations from %(source)r to %(target)r."
6659
6685
msgstr ""
6660
6686
6661
#: bzrlib/errors.py:3256
6687
#: bzrlib/errors.py:3257
6662
6688
msgid ""
6663
6689
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6664
6690
"%(arguments)s."
6665
6691
msgstr ""
6666
6692
6667
#: bzrlib/errors.py:3266
6693
#: bzrlib/errors.py:3267
6668
6694
msgid ""
6669
6695
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6670
6696
"format %(format)r"
6671
6697
msgstr ""
6672
6698
6673
#: bzrlib/errors.py:3278
6699
#: bzrlib/errors.py:3279
6674
6700
msgid ""
6675
6701
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6676
6702
"plugin."
6677
6703
msgstr ""
6678
6704
6679
#: bzrlib/errors.py:3291
6705
#: bzrlib/errors.py:3292
6680
6706
msgid "Binary files section encountered."
6681
6707
msgstr ""
6682
6708
6683
#: bzrlib/errors.py:3299
6709
#: bzrlib/errors.py:3300
6684
6710
msgid ""
6685
6711
"Malformed patch header. %(desc)s\n"
6686
6712
"%(line)r"
6687
6713
msgstr ""
6688
6714
6689
#: bzrlib/errors.py:3308
6715
#: bzrlib/errors.py:3309
6690
6716
msgid ""
6691
6717
"Malformed hunk header. %(desc)s\n"
6692
6718
"%(line)r"
6693
6719
msgstr ""
6694
6720
6695
#: bzrlib/errors.py:3317
6721
#: bzrlib/errors.py:3318
6696
6722
msgid ""
6697
6723
"Malformed line. %(desc)s\n"
6698
6724
"%(line)r"
6699
6725
msgstr ""
6700
6726
6701
#: bzrlib/errors.py:3327
6727
#: bzrlib/errors.py:3328
6702
6728
msgid ""
6703
6729
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6704
6730
"but patch says it should be \"%(patch_line)s\""
6705
6731
msgstr ""
6706
6732
6707
#: bzrlib/errors.py:3338
6733
#: bzrlib/errors.py:3339
6708
6734
msgid "The feature %(feature)s has already been registered."
6709
6735
msgstr ""
6710
6736
6756
6782
"regular push."
6757
6783
msgstr ""
6758
6784
6759
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6785
#: bzrlib/gpg.py:366
6786
msgid "No GnuPG key results for pattern: {0}"
6787
msgstr ""
6788
6789
#: bzrlib/gpg.py:439
6760
6790
msgid "{0} commits with valid signatures"
6761
6791
msgstr ""
6762
6792
6763
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6793
#: bzrlib/gpg.py:445
6764
6794
msgid "{0} commit with unknown key"
6765
6795
msgid_plural "{0} commits with unknown keys"
6766
6796
msgstr[0] "{0} закрепление с неизвестным ключом"
6767
6797
msgstr[1] "{0} закрепления с неизвестным ключом"
6768
6798
msgstr[2] "{0} закреплений с неизвестным ключом"
6769
6799
6770
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6800
#: bzrlib/gpg.py:453
6771
6801
msgid "{0} commit not valid"
6772
6802
msgid_plural "{0} commits not valid"
6773
6803
msgstr[0] ""
6774
6804
msgstr[1] ""
6775
6805
6776
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6806
#: bzrlib/gpg.py:461
6777
6807
msgid "{0} commit not signed"
6778
6808
msgid_plural "{0} commits not signed"
6779
6809
msgstr[0] ""
6780
6810
msgstr[1] ""
6781
6811
6782
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6812
#: bzrlib/gpg.py:469
6783
6813
msgid "{0} commit with key now expired"
6784
6814
msgid_plural "{0} commits with key now expired"
6785
6815
msgstr[0] ""
6786
6816
msgstr[1] ""
6787
6817
6788
#: bzrlib/gpg.py:343
6789
msgid "No GnuPG key results for pattern: {0}"
6790
msgstr ""
6818
#: bzrlib/gpg.py:489
6819
msgid "{0} commit by author {1} with key {2} now expired"
6820
msgid_plural "{0} commits by author {1} with key {2} now expired"
6821
msgstr[0] ""
6822
msgstr[1] ""
6791
6823
6792
#: bzrlib/gpg.py:386
6824
#: bzrlib/gpg.py:505
6793
6825
msgid "{0} signed {1} commit"
6794
6826
msgid_plural "{0} signed {1} commits"
6795
6827
msgstr[0] ""
6796
6828
msgstr[1] ""
6797
6829
6798
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6830
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6799
6831
msgid "{0} commit by author {1}"
6800
6832
msgid_plural "{0} commits by author {1}"
6801
6833
msgstr[0] ""
6802
6834
msgstr[1] ""
6803
6835
6804
#: bzrlib/gpg.py:433
6836
#: bzrlib/gpg.py:554
6805
6837
msgid "Unknown key {0} signed {1} commit"
6806
6838
msgid_plural "Unknown key {0} signed {1} commits"
6807
6839
msgstr[0] "Неизвестным ключом {0} подписано {1} закрепление"
6808
6840
msgstr[1] "Неизвестным ключом {0} подписаны {1} закрепления"
6809
6841
msgstr[2] "Неизвестным ключом {0} подписаны {1} закреплений"
6810
6842
6811
#: bzrlib/gpg.py:452
6812
msgid "{0} commit by author {1} with key {2} now expired"
6813
msgid_plural "{0} commits by author {1} with key {2} now expired"
6814
msgstr[0] ""
6815
msgstr[1] ""
6816
6817
6843
#: bzrlib/groupcompress.py:1739
6818
6844
#, python-format
6819
6845
msgid "Insert claimed random_id=True, but then inserted %r two times"
6820
6846
msgstr ""
6821
6847
6822
#: bzrlib/hooks.py:331
6848
#: bzrlib/hooks.py:313
6823
6849
#, python-format
6824
6850
msgid "Introduced in: %s"
6825
6851
msgstr ""
6826
6852
6827
#: bzrlib/hooks.py:334
6853
#: bzrlib/hooks.py:316
6828
6854
#, python-format
6829
6855
msgid "Deprecated in: %s"
6830
6856
msgstr ""
6873
6899
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6874
6900
msgstr ""
6875
6901
6876
#: bzrlib/log.py:572
6902
#: bzrlib/log.py:563
6877
6903
msgid "--exclude-common-ancestry requires two different revisions"
6878
6904
msgstr ""
6879
6905
6880
#: bzrlib/log.py:574
6906
#: bzrlib/log.py:565
6881
6907
#, python-format
6882
6908
msgid "invalid direction %r"
6883
6909
msgstr ""
6884
6910
6885
#: bzrlib/log.py:662
6911
#: bzrlib/log.py:653
6886
6912
msgid "Start revision not found in history of end revision."
6887
6913
msgstr ""
6888
6914
6889
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6915
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6890
6916
msgid "Logging revision 0 is invalid."
6891
6917
msgstr ""
6892
6918
6893
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6919
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6894
6920
msgid "Start revision must be older than the end revision."
6895
6921
msgstr ""
6896
6922
6897
#: bzrlib/log.py:1827
6923
#: bzrlib/log.py:1818
6898
6924
#, python-format
6899
6925
msgid "unknown log formatter: %r"
6900
6926
msgstr ""
6901
6927
6902
#: bzrlib/log.py:2123
6928
#: bzrlib/log.py:2114
6903
6929
msgid "fixes bug"
6904
6930
msgid_plural "fixes bugs"
6905
6931
msgstr[0] ""
6914
6940
msgid "%d conflicts encountered."
6915
6941
msgstr ""
6916
6942
6917
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6943
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6918
6944
msgid "Preparing file merge"
6919
6945
msgstr ""
6920
6946
7036
7062
msgid "lstat/stat of ({0!r}): {1!r}"
7037
7063
msgstr ""
7038
7064
7039
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
7065
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
7040
7066
#, python-format
7041
7067
msgid "sorry, %r not allowed in path"
7042
7068
msgstr ""
7043
7069
7044
#: bzrlib/osutils.py:1237
7070
#: bzrlib/osutils.py:1259
7045
7071
#, python-format
7046
7072
msgid "%r is too short to calculate a relative path"
7047
7073
msgstr ""
7080
7106
msgid "Generate only the shell function, don't enable it"
7081
7107
msgstr ""
7082
7108
7083
#: bzrlib/plugins/launchpad/__init__.py:81
7109
#: bzrlib/plugins/launchpad/account.py:66
7110
msgid "Setting ssh/sftp usernames for launchpad.net."
7111
msgstr ""
7112
7113
#: bzrlib/plugins/launchpad/cmds.py:44
7084
7114
msgid "Register a branch with launchpad.net."
7085
7115
msgstr ""
7086
7116
7087
#: bzrlib/plugins/launchpad/__init__.py:83
7117
#: bzrlib/plugins/launchpad/cmds.py:46
7088
7118
msgid ""
7089
7119
"This command lists a bzr branch in the directory of branches on\n"
7090
7120
"launchpad.net. Registration allows the branch to be associated with\n"
7091
7121
"bugs or specifications."
7092
7122
msgstr ""
7093
7123
7094
#: bzrlib/plugins/launchpad/__init__.py:87
7124
#: bzrlib/plugins/launchpad/cmds.py:50
7095
7125
msgid ""
7096
7126
"Before using this command you must register the project to which the\n"
7097
7127
"branch belongs, and create an account for yourself on launchpad.net."
7098
7128
msgstr ""
7099
7129
7100
#: bzrlib/plugins/launchpad/__init__.py:90
7130
#: bzrlib/plugins/launchpad/cmds.py:53
7101
7131
msgid ""
7102
7132
"arguments:\n"
7103
7133
" public_url: The publicly visible url for the branch to register.\n"
7109
7139
" otherwise error."
7110
7140
msgstr ""
7111
7141
7112
#: bzrlib/plugins/launchpad/__init__.py:99
7142
#: bzrlib/plugins/launchpad/cmds.py:62
7113
7143
msgid ""
7114
7144
"example:\n"
7115
7145
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7116
7146
" --project fooproject"
7117
7147
msgstr ""
7118
7148
7119
#: bzrlib/plugins/launchpad/__init__.py:106
7149
#: bzrlib/plugins/launchpad/cmds.py:69
7120
7150
msgid "Launchpad project short name to associate with the branch."
7121
7151
msgstr ""
7122
7152
7123
#: bzrlib/plugins/launchpad/__init__.py:113
7153
#: bzrlib/plugins/launchpad/cmds.py:76
7124
7154
msgid ""
7125
7155
"Short name for the branch; by default taken from the last component of the "
7126
7156
"url."
7127
7157
msgstr ""
7128
7158
7129
#: bzrlib/plugins/launchpad/__init__.py:117
7159
#: bzrlib/plugins/launchpad/cmds.py:80
7130
7160
msgid "One-sentence description of the branch."
7131
7161
msgstr ""
7132
7162
7133
#: bzrlib/plugins/launchpad/__init__.py:120
7163
#: bzrlib/plugins/launchpad/cmds.py:83
7134
7164
msgid "Longer description of the purpose or contents of the branch."
7135
7165
msgstr ""
7136
7166
7137
#: bzrlib/plugins/launchpad/__init__.py:123
7167
#: bzrlib/plugins/launchpad/cmds.py:86
7138
7168
msgid "Branch author's email address, if not yourself."
7139
7169
msgstr ""
7140
7170
7141
#: bzrlib/plugins/launchpad/__init__.py:126
7171
#: bzrlib/plugins/launchpad/cmds.py:89
7142
7172
msgid "The bug this branch fixes."
7143
7173
msgstr ""
7144
7174
7145
#: bzrlib/plugins/launchpad/__init__.py:129
7175
#: bzrlib/plugins/launchpad/cmds.py:92
7146
7176
msgid "Prepare the request but don't actually send it."
7147
7177
msgstr ""
7148
7178
7149
#: bzrlib/plugins/launchpad/__init__.py:151
7179
#: bzrlib/plugins/launchpad/cmds.py:114
7150
7180
msgid ""
7151
7181
"register-branch requires a public branch url - see bzr help register-branch."
7152
7182
msgstr ""
7153
7183
7154
#: bzrlib/plugins/launchpad/__init__.py:159
7184
#: bzrlib/plugins/launchpad/cmds.py:122
7155
7185
msgid "--product is deprecated; please use --project."
7156
7186
msgstr ""
7157
7187
7158
#: bzrlib/plugins/launchpad/__init__.py:191
7188
#: bzrlib/plugins/launchpad/cmds.py:152
7159
7189
msgid "Open a Launchpad branch page in your web browser."
7160
7190
msgstr ""
7161
7191
7162
#: bzrlib/plugins/launchpad/__init__.py:196
7192
#: bzrlib/plugins/launchpad/cmds.py:157
7163
7193
msgid "Do not actually open the browser. Just say the URL we would use."
7164
7194
msgstr ""
7165
7195
7166
#: bzrlib/plugins/launchpad/__init__.py:231
7196
#: bzrlib/plugins/launchpad/cmds.py:192
7167
7197
#, python-format
7168
7198
msgid "Opening %s in web browser"
7169
7199
msgstr ""
7170
7200
7171
#: bzrlib/plugins/launchpad/__init__.py:241
7201
#: bzrlib/plugins/launchpad/cmds.py:200
7172
7202
msgid "Show or set the Launchpad user ID."
7173
7203
msgstr ""
7174
7204
7175
#: bzrlib/plugins/launchpad/__init__.py:243
7205
#: bzrlib/plugins/launchpad/cmds.py:202
7176
7206
msgid ""
7177
7207
"When communicating with Launchpad, some commands need to know your\n"
7178
7208
"Launchpad user ID. This command can be used to set or show the\n"
7179
7209
"user ID that Bazaar will use for such communication."
7180
7210
msgstr ""
7181
7211
7182
#: bzrlib/plugins/launchpad/__init__.py:247
7212
#: bzrlib/plugins/launchpad/cmds.py:206
7183
7213
msgid ""
7184
7214
":Examples:\n"
7185
7215
" Show the Launchpad ID of the current user::"
7186
7216
msgstr ""
7187
7217
7188
#: bzrlib/plugins/launchpad/__init__.py:250
7218
#: bzrlib/plugins/launchpad/cmds.py:209
7189
7219
msgid " bzr launchpad-login"
7190
7220
msgstr ""
7191
7221
7192
#: bzrlib/plugins/launchpad/__init__.py:252
7222
#: bzrlib/plugins/launchpad/cmds.py:211
7193
7223
msgid " Set the Launchpad ID of the current user to 'bob'::"
7194
7224
msgstr ""
7195
7225
7196
#: bzrlib/plugins/launchpad/__init__.py:254
7226
#: bzrlib/plugins/launchpad/cmds.py:213
7197
7227
msgid " bzr launchpad-login bob"
7198
7228
msgstr ""
7199
7229
7200
#: bzrlib/plugins/launchpad/__init__.py:261
7230
#: bzrlib/plugins/launchpad/cmds.py:220
7201
7231
msgid "Don't check that the user name is valid."
7202
7232
msgstr ""
7203
7233
7204
#: bzrlib/plugins/launchpad/__init__.py:276
7205
#: bzrlib/plugins/launchpad/__init__.py:287
7234
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
7206
7235
msgid "Launchpad user ID exists and has SSH keys.\n"
7207
7236
msgstr ""
7208
7237
7209
#: bzrlib/plugins/launchpad/__init__.py:279
7238
#: bzrlib/plugins/launchpad/cmds.py:238
7210
7239
msgid "No Launchpad user ID configured.\n"
7211
7240
msgstr ""
7212
7241
7213
#: bzrlib/plugins/launchpad/__init__.py:290
7242
#: bzrlib/plugins/launchpad/cmds.py:249
7214
7243
#, python-format
7215
7244
msgid "Launchpad user ID set to '%s'.\n"
7216
7245
msgstr ""
7217
7246
7218
#: bzrlib/plugins/launchpad/__init__.py:298
7247
#: bzrlib/plugins/launchpad/cmds.py:255
7219
7248
msgid "Ask Launchpad to mirror a branch now."
7220
7249
msgstr ""
7221
7250
7222
#: bzrlib/plugins/launchpad/__init__.py:318
7251
#: bzrlib/plugins/launchpad/cmds.py:272
7223
7252
msgid "Propose merging a branch on Launchpad."
7224
7253
msgstr ""
7225
7254
7226
#: bzrlib/plugins/launchpad/__init__.py:320
7255
#: bzrlib/plugins/launchpad/cmds.py:274
7227
7256
msgid ""
7228
7257
"This will open your usual editor to provide the initial comment. When it\n"
7229
7258
"has created the proposal, it will open it in your default web browser."
7230
7259
msgstr ""
7231
7260
7232
#: bzrlib/plugins/launchpad/__init__.py:323
7261
#: bzrlib/plugins/launchpad/cmds.py:277
7233
7262
msgid ""
7234
7263
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7235
7264
"is not supplied, the remembered submit branch will be used. If no submit\n"
7236
7265
"branch is remembered, the development focus will be used."
7237
7266
msgstr ""
7238
7267
7239
#: bzrlib/plugins/launchpad/__init__.py:327
7268
#: bzrlib/plugins/launchpad/cmds.py:281
7240
7269
msgid ""
7241
7270
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7242
7271
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7244
7273
"may optionally be followed by '=' and the review type. For example:"
7245
7274
msgstr ""
7246
7275
7247
#: bzrlib/plugins/launchpad/__init__.py:332
7276
#: bzrlib/plugins/launchpad/cmds.py:286
7248
7277
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7249
7278
msgstr ""
7250
7279
7251
#: bzrlib/plugins/launchpad/__init__.py:334
7280
#: bzrlib/plugins/launchpad/cmds.py:288
7252
7281
msgid ""
7253
7282
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7254
7283
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7255
7284
msgstr ""
7256
7285
7257
#: bzrlib/plugins/launchpad/__init__.py:339
7286
#: bzrlib/plugins/launchpad/cmds.py:293
7258
7287
msgid "Propose the merge on staging."
7259
7288
msgstr ""
7260
7289
7261
#: bzrlib/plugins/launchpad/__init__.py:341
7290
#: bzrlib/plugins/launchpad/cmds.py:295
7262
7291
msgid "Commit message."
7263
7292
msgstr ""
7264
7293
7265
#: bzrlib/plugins/launchpad/__init__.py:343
7294
#: bzrlib/plugins/launchpad/cmds.py:297
7266
7295
msgid "Mark the proposal as approved immediately."
7267
7296
msgstr ""
7268
7297
7269
#: bzrlib/plugins/launchpad/__init__.py:345
7298
#: bzrlib/plugins/launchpad/cmds.py:298
7299
msgid "The bug this proposal fixes."
7300
msgstr ""
7301
7302
#: bzrlib/plugins/launchpad/cmds.py:300
7270
7303
msgid "Requested reviewer and optional type."
7271
7304
msgstr ""
7272
7305
7273
#: bzrlib/plugins/launchpad/__init__.py:382
7306
#: bzrlib/plugins/launchpad/cmds.py:335
7274
7307
msgid "Find the proposal to merge this revision."
7275
7308
msgstr ""
7276
7309
7277
#: bzrlib/plugins/launchpad/__init__.py:384
7310
#: bzrlib/plugins/launchpad/cmds.py:337
7278
7311
msgid ""
7279
7312
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7280
7313
"This works only if the selected branch was the merge proposal target, and\n"
7282
7315
"are opened in a web browser."
7283
7316
msgstr ""
7284
7317
7285
#: bzrlib/plugins/launchpad/__init__.py:389
7318
#: bzrlib/plugins/launchpad/cmds.py:342
7286
7319
msgid ""
7287
7320
"Any revision involved in the merge may be specified-- the revision in\n"
7288
7321
"which the merge was performed, or one of the revisions that was merged."
7289
7322
msgstr ""
7290
7323
7291
#: bzrlib/plugins/launchpad/__init__.py:392
7324
#: bzrlib/plugins/launchpad/cmds.py:345
7292
7325
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7293
7326
msgstr ""
7294
7327
7295
#: bzrlib/plugins/launchpad/__init__.py:394
7328
#: bzrlib/plugins/launchpad/cmds.py:347
7296
7329
msgid " bzr lp-find-proposal -r annotate:README:1"
7297
7330
msgstr ""
7298
7331
7299
#: bzrlib/plugins/launchpad/__init__.py:409
7332
#: bzrlib/plugins/launchpad/cmds.py:363
7300
7333
msgid "No review found."
7301
7334
msgstr ""
7302
7335
7303
#: bzrlib/plugins/launchpad/__init__.py:410
7336
#: bzrlib/plugins/launchpad/cmds.py:364
7304
7337
#, python-format
7305
7338
msgid "%d proposals(s) found."
7306
7339
msgstr ""
7307
7340
7308
#: bzrlib/plugins/launchpad/__init__.py:420
7341
#: bzrlib/plugins/launchpad/cmds.py:374
7309
7342
msgid "Finding revision-id"
7310
7343
msgstr ""
7311
7344
7312
#: bzrlib/plugins/launchpad/__init__.py:427
7345
#: bzrlib/plugins/launchpad/cmds.py:381
7313
7346
msgid "Finding merge"
7314
7347
msgstr ""
7315
7348
7316
#: bzrlib/plugins/launchpad/__init__.py:432
7349
#: bzrlib/plugins/launchpad/cmds.py:386
7317
7350
msgid "Finding revno"
7318
7351
msgstr ""
7319
7352
7320
#: bzrlib/plugins/launchpad/__init__.py:437
7353
#: bzrlib/plugins/launchpad/cmds.py:392
7321
7354
msgid "Finding Launchpad branch"
7322
7355
msgstr ""
7323
7356
7324
#: bzrlib/plugins/launchpad/__init__.py:440
7357
#: bzrlib/plugins/launchpad/cmds.py:395
7325
7358
msgid "Finding proposals"
7326
7359
msgstr ""
7327
7360
7328
#: bzrlib/plugins/launchpad/account.py:66
7329
msgid "Setting ssh/sftp usernames for launchpad.net."
7330
msgstr ""
7331
7332
7361
#: bzrlib/plugins/launchpad/lp_api.py:241
7333
7362
#: bzrlib/plugins/launchpad/lp_api.py:246
7334
7363
#, python-format
7372
7401
" remote: {2}"
7373
7402
msgstr ""
7374
7403
7375
#: bzrlib/plugins/launchpad/lp_propose.py:149
7404
#: bzrlib/plugins/launchpad/lp_propose.py:150
7376
7405
#, python-format
7377
7406
msgid "There is already a branch merge proposal: %s"
7378
7407
msgstr ""
7379
7408
7380
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7409
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7381
7410
msgid "pb parameter to convert() is deprecated"
7382
7411
msgstr ""
7383
7412
7384
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7413
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7385
7414
msgid "starting upgrade from format 4 to 5"
7386
7415
msgstr ""
7387
7416
7388
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7417
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7389
7418
msgid "note: upgrade may be faster if all store files are ungzipped first"
7390
7419
msgstr ""
7391
7420
7392
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7421
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7393
7422
msgid "converting revision"
7394
7423
msgstr ""
7395
7424
7396
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7425
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7397
7426
msgid "upgraded to weaves:"
7398
7427
msgstr ""
7399
7428
7400
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7429
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7401
7430
#, python-format
7402
7431
msgid "%6d revisions and inventories"
7403
7432
msgstr ""
7404
7433
7405
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7434
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7406
7435
#, python-format
7407
7436
msgid "%6d revisions not present"
7408
7437
msgstr ""
7409
7438
7410
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7439
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7411
7440
#, python-format
7412
7441
msgid "%6d texts"
7413
7442
msgstr ""
7414
7443
7415
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7444
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7416
7445
msgid "writing weave"
7417
7446
msgstr ""
7418
7447
7419
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7420
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7448
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7449
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7421
7450
msgid "inventory"
7422
7451
msgstr ""
7423
7452
7424
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7453
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7425
7454
msgid "write revision"
7426
7455
msgstr ""
7427
7456
7428
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7457
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7429
7458
msgid "loading revision"
7430
7459
msgstr ""
7431
7460
7432
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7461
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7433
7462
#, python-format
7434
7463
msgid "revision {%s} not present in branch; will be converted as a ghost"
7435
7464
msgstr ""
7436
7465
7437
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7466
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7438
7467
msgid "starting upgrade from format 5 to 6"
7439
7468
msgstr ""
7440
7469
7441
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7470
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7442
7471
#, python-format
7443
7472
msgid "adding prefixes to %s"
7444
7473
msgstr ""
7445
7474
7446
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7475
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7447
7476
msgid "starting upgrade from format 6 to metadir"
7448
7477
msgstr ""
7449
7478
7450
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7479
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7451
7480
msgid "Removing ancestry.weave"
7452
7481
msgstr ""
7453
7482
7454
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7483
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7455
7484
msgid "Finding branch files"
7456
7485
msgstr ""
7457
7486
7458
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7487
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7459
7488
msgid "Upgrading repository"
7460
7489
msgstr ""
7461
7490
7462
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7491
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7463
7492
msgid "Upgrading branch"
7464
7493
msgstr ""
7465
7494
7466
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7495
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7467
7496
msgid "No working tree."
7468
7497
msgstr ""
7469
7498
7470
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7499
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7471
7500
msgid "Upgrading working tree"
7472
7501
msgstr ""
7473
7502
7474
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7503
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7475
7504
#, python-format
7476
7505
msgid "Make %s lock"
7477
7506
msgstr ""
7478
7507
7479
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7508
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7480
7509
#, python-format
7481
7510
msgid "Moving %s"
7482
7511
msgstr ""
7503
7532
msgid "Too many redirections trying to make %s."
7504
7533
msgstr ""
7505
7534
7506
#: bzrlib/push.py:147
7535
#: bzrlib/push.py:148
7507
7536
msgid ""
7508
7537
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7509
7538
"information."
7510
7539
msgstr ""
7511
7540
7512
#: bzrlib/push.py:151
7541
#: bzrlib/push.py:152
7513
7542
#, python-format
7514
7543
msgid ""
7515
7544
"It is not possible to losslessly push to %s. You may want to use dpush "
7516
7545
"instead."
7517
7546
msgstr ""
7518
7547
7519
#: bzrlib/push.py:157
7548
#: bzrlib/push.py:158
7520
7549
#, python-format
7521
7550
msgid ""
7522
7551
"At %s you have a valid .bzr control directory, but not a branch or "
7617
7646
msgid "bzr: ERROR (ignored): %s"
7618
7647
msgstr "bzr: ОШИБКА (игнорирована): %s"
7619
7648
7620
#: bzrlib/remote.py:2541
7649
#: bzrlib/remote.py:2534
7621
7650
msgid "Copying repository content as tarball..."
7622
7651
msgstr "Копирование содержимого репозитория в тарбол..."
7623
7652
7633
7662
msgid "{0} => {1}"
7634
7663
msgstr "{0} => {1}"
7635
7664
7636
#: bzrlib/repository.py:1787
7665
#: bzrlib/repository.py:1738
7637
7666
msgid "Moving repository to repository.backup"
7638
7667
msgstr "Перемещение репозитория в repository.backup"
7639
7668
7640
#: bzrlib/repository.py:1794
7669
#: bzrlib/repository.py:1745
7641
7670
msgid "Creating new repository"
7642
7671
msgstr "Создание нового репозитория"
7643
7672
7644
#: bzrlib/repository.py:1799
7673
#: bzrlib/repository.py:1750
7645
7674
msgid "Copying content"
7646
7675
msgstr "Копирование содержимого"
7647
7676
7648
#: bzrlib/repository.py:1803
7677
#: bzrlib/repository.py:1754
7649
7678
msgid "Deleting old repository content"
7650
7679
msgstr "Удаление старого содержимого репозитория"
7651
7680
7652
#: bzrlib/repository.py:1805
7681
#: bzrlib/repository.py:1756
7653
7682
msgid "repository converted"
7654
7683
msgstr "репозиторий преобразован"
7655
7684
7657
7686
msgid "Using {0} {1}"
7658
7687
msgstr "Используется {0} {1}"
7659
7688
7660
#: bzrlib/send.py:58
7689
#: bzrlib/send.py:59
7661
7690
#, python-format
7662
7691
msgid "Mail client \"%s\" does not support specifying body"
7663
7692
msgstr "Почтовый клиент «%s» не поддерживает определение тела"
7664
7693
7665
#: bzrlib/send.py:62
7694
#: bzrlib/send.py:63
7666
7695
msgid "--remember requires a branch to be specified."
7667
7696
msgstr "--remember требует указания ветви."
7668
7697
7669
#: bzrlib/send.py:77
7698
#: bzrlib/send.py:78
7670
7699
msgid "No submit branch known or specified"
7671
7700
msgstr "Ветвь для отсылки неизвестна и не задана"
7672
7701
7673
#: bzrlib/send.py:80
7702
#: bzrlib/send.py:81
7674
7703
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7675
7704
msgstr ""
7676
7705
"Используется сохранённое {0} местоположение «{1}» для определения изменений, "
7677
7706
"которые необходимо отправить."
7678
7707
7679
#: bzrlib/send.py:98
7708
#: bzrlib/send.py:99
7680
7709
#, python-format
7681
7710
msgid "No such send format '%s'."
7682
7711
msgstr "Нет такого формата отправки '%s'."
7683
7712
7684
#: bzrlib/send.py:114
7713
#: bzrlib/send.py:115
7685
7714
msgid "bzr send takes at most two one revision identifiers"
7686
7715
msgstr "bzr send принимает не более двух идентификаторов ревизии"
7687
7716
7688
#: bzrlib/send.py:127
7717
#: bzrlib/send.py:128
7689
7718
msgid "No revisions to submit."
7690
7719
msgstr "Нет ревизий для отправки."
7691
7720
7692
#: bzrlib/send.py:139
7721
#: bzrlib/send.py:140
7693
7722
msgid ""
7694
7723
"- not supported for merge directives that use more than one output file."
7695
7724
msgstr ""
7696
7725
"- не поддерживается для директив merge, которые используют более, чем один "
7697
7726
"файл вывода."
7698
7727
7699
#: bzrlib/send.py:185
7728
#: bzrlib/send.py:186
7700
7729
msgid "Format 0.9 does not permit bundle with no patch"
7701
7730
msgstr "Формат 0.9 не разрешает пакеты без патчей"
7702
7731
7855
7884
"Не удалось соединиться с текущей основной ветвью %(target)s: %(error)s Для "
7856
7885
"принудительного переключения используйте --force."
7857
7886
7858
#: bzrlib/switch.py:125
7887
#: bzrlib/switch.py:129
7859
7888
msgid "Cannot switch a branch, only a checkout."
7860
7889
msgstr ""
7861
7890
7862
#: bzrlib/switch.py:163
7891
#: bzrlib/switch.py:167
7863
7892
#, python-format
7864
7893
msgid "Tree is up to date at revision %d."
7865
7894
msgstr "Дерево в актуальной ревизии %d."
7866
7895
7867
#: bzrlib/switch.py:169
7896
#: bzrlib/switch.py:173
7868
7897
#, python-format
7869
7898
msgid "Updated to revision %d."
7870
7899
msgstr "Обновлено до ревизии %d."
7871
7900
7872
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7901
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7873
7902
msgid "Apply phase"
7874
7903
msgstr "Применить фазу"
7875
7904
7876
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7905
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7877
7906
msgid "removing file"
7878
7907
msgstr "удаление файла"
7879
7908
7880
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7909
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7881
7910
msgid "adding file"
7882
7911
msgstr "добавление файла"
7883
7912
7884
#: bzrlib/transform.py:2591
7913
#: bzrlib/transform.py:2598
7885
7914
msgid "Building tree"
7886
7915
msgstr "Построение дерева"
7887
7916
7888
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7917
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7889
7918
msgid "Adding file contents"
7890
7919
msgstr "Добавление содержимого файлй"
7891
7920
7892
#: bzrlib/transform.py:3028
7921
#: bzrlib/transform.py:3017
7893
7922
msgid "Resolution pass"
7894
7923
msgstr ""
7895
7924
7898
7927
msgid "Authenticated as %s"
7899
7928
msgstr ""
7900
7929
7901
#: bzrlib/tree.py:634
7930
#: bzrlib/tree.py:647
7902
7931
msgid "*** {0} content-filter: {1} => {2!r}"
7903
7932
msgstr "*** {0} content-filter: {1} => {2!r}"
7904
7933
7959
7988
msgid "failed to clean-up {0}: {1}"
7960
7989
msgstr "не удалось очистить {0}: {1}"
7961
7990
7962
#: bzrlib/vf_repository.py:1090
7991
#: bzrlib/vf_repository.py:1091
7963
7992
msgid "inventories"
7964
7993
msgstr ""
7965
7994
7966
#: bzrlib/vf_repository.py:1116
7995
#: bzrlib/vf_repository.py:1117
7967
7996
msgid "texts"
7968
7997
msgstr ""
7969
7998
7970
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7999
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7971
8000
msgid "Calculating text parents"
7972
8001
msgstr ""
7973
8002
7974
#: bzrlib/vf_repository.py:1706
8003
#: bzrlib/vf_repository.py:1707
7975
8004
msgid "Fetch texts"
7976
8005
msgstr ""
7977
8006
7978
#: bzrlib/vf_repository.py:2535
8007
#: bzrlib/vf_repository.py:2536
7979
8008
msgid "loading text store"
7980
8009
msgstr ""
7981
8010
7982
#: bzrlib/vf_repository.py:2541
8011
#: bzrlib/vf_repository.py:2542
7983
8012
msgid "checking text graph"
7984
8013
msgstr ""
7985
8014
7986
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7987
#: bzrlib/vf_repository.py:3124
8015
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
8016
#: bzrlib/vf_repository.py:3127
7988
8017
msgid "Transferring revisions"
7989
8018
msgstr ""
7990
8019
8031
8060
msgid "PageFaultCount %8d"
8032
8061
msgstr "PageFaultCount %8d"
8033
8062
8034
#: bzrlib/workingtree.py:1478
8063
#: bzrlib/workingtree.py:1482
8035
8064
msgid "Rerun update after fixing the conflicts."
8036
8065
msgstr "Снова запустите обновление после исправления конфликтов."
8037
8066
8041
8070
8042
8071
#: dummy/help_topics/basic/detail.txt:1
8043
8072
msgid ""
8044
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
8073
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
8045
8074
"http://bazaar.canonical.com/"
8046
8075
msgstr ""
8047
8076
8377
8406
msgid "How to fix diverged branches"
8378
8407
msgstr "Как исправлять отклонения ветвей"
8379
8408
8380
#: dummy/help_topics/env-variables/detail.txt:1
8381
msgid "Environment Variables"
8382
msgstr "Переменные окружения"
8383
8384
#: dummy/help_topics/env-variables/detail.txt:3
8385
msgid ""
8386
"=================== "
8387
"===========================================================\n"
8388
"BZRPATH Path where bzr is to look for shell plugin external\n"
8389
" commands.\n"
8390
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8391
"EMAIL E-Mail address of the user.\n"
8392
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8393
"EDITOR Editor for editing commit messages.\n"
8394
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8395
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8396
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8397
"BZR_PLUGIN_PATH.\n"
8398
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8399
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8400
"and\n"
8401
" HOME.\n"
8402
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8403
"URLs).\n"
8404
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8405
"sshcorp,\n"
8406
" plink or lsh.\n"
8407
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8408
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8409
"BZR_COLUMNS Override implicit terminal width.\n"
8410
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8411
"(selftest)\n"
8412
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8413
"'text'.\n"
8414
"BZR_PDB Control whether to launch a debugger on error.\n"
8415
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8416
" breakin debugger.\n"
8417
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8418
"(instead\n"
8419
" of char-based).\n"
8420
"=================== "
8421
"===========================================================\n"
8422
msgstr ""
8423
8424
8409
#: dummy/help_topics/env-variables/summary.txt:1
8425
8410
msgid "Environment variable names and values"
8426
8411
msgstr "Имена и значения переменных окружения"
9441
9426
msgid " bzr commit --fixes <tracker>:<id>"
9442
9427
msgstr ""
9443
9428
9444
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9429
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9445
9430
msgid "or::"
9446
9431
msgstr ""
9447
9432
9676
9661
"remove-tree Remove the working tree from a given branch/checkout.\n"
9677
9662
"renames Show list of renamed files.\n"
9678
9663
"resolve Mark a conflict as resolved.\n"
9679
"revert Revert files to a previous revision.\n"
9664
"revert Set files in the working tree back to the contents of a\n"
9665
" previous revision.\n"
9680
9666
"revno Show current revision number.\n"
9681
9667
"root Show the tree root directory.\n"
9682
9668
"send Mail or create a merge-directive for submitting changes.\n"
10334
10320
10335
10321
#: en/help_topics/configuration.txt:336
10336
10322
msgid ""
10323
"Another such option is ``branchname``, which refers to the name of a "
10324
"colocated\n"
10325
"branch. For non-colocated branches, it behaves like basename. It can be "
10326
"used\n"
10327
"like this::"
10328
msgstr ""
10329
10330
#: en/help_topics/configuration.txt:340
10331
msgid ""
10332
" [/home/vila/src/bzr/bugs]\n"
10333
" mypush = lp:~vila/bzr/{branchname}"
10334
msgstr ""
10335
10336
#: en/help_topics/configuration.txt:343
10337
msgid ""
10338
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10339
"get::"
10340
msgstr ""
10341
10342
#: en/help_topics/configuration.txt:345
10343
msgid ""
10344
" bzr config mypush\n"
10345
" lp:~vila/bzr/832013-expand-in-stack"
10346
msgstr ""
10347
10348
#: en/help_topics/configuration.txt:348
10349
msgid ""
10337
10350
"When an option is local to a Section, it cannot be referred to from option\n"
10338
10351
"values in any other section from the same ``Store`` nor from any other\n"
10339
10352
"``Store``."
10340
10353
msgstr ""
10341
10354
10342
#: en/help_topics/configuration.txt:340
10355
#: en/help_topics/configuration.txt:352
10343
10356
msgid ""
10344
10357
"\n"
10345
10358
"The main configuration file, bazaar.conf\n"
10346
10359
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10347
10360
msgstr ""
10348
10361
10349
#: en/help_topics/configuration.txt:344
10362
#: en/help_topics/configuration.txt:356
10350
10363
msgid ""
10351
10364
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10352
10365
"The default section contains the default\n"
10354
10367
"overriden by providing a branch-specific section in ``locations.conf``."
10355
10368
msgstr ""
10356
10369
10357
#: en/help_topics/configuration.txt:349
10370
#: en/help_topics/configuration.txt:361
10358
10371
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10359
10372
msgstr ""
10360
10373
10361
#: en/help_topics/configuration.txt:351
10374
#: en/help_topics/configuration.txt:363
10362
10375
msgid ""
10363
10376
" [DEFAULT]\n"
10364
10377
" email = John Doe <jdoe@isp.com>\n"
10366
10379
" create_signatures = when-required"
10367
10380
msgstr ""
10368
10381
10369
#: en/help_topics/configuration.txt:356
10382
#: en/help_topics/configuration.txt:368
10370
10383
msgid ""
10371
10384
"\n"
10372
10385
"The branch location configuration file, locations.conf\n"
10373
10386
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10374
10387
msgstr ""
10375
10388
10376
#: en/help_topics/configuration.txt:360
10389
#: en/help_topics/configuration.txt:372
10377
10390
msgid ""
10378
10391
"``locations.conf`` allows one to specify overriding settings for\n"
10379
10392
"a specific branch. The format is almost identical to the default section in\n"
10383
10396
"for. The '?' and '*' wildcards are supported::"
10384
10397
msgstr ""
10385
10398
10386
#: en/help_topics/configuration.txt:366
10399
#: en/help_topics/configuration.txt:378
10387
10400
msgid ""
10388
10401
" [/home/jdoe/branches/nethack]\n"
10389
10402
" email = Nethack Admin <nethack@nethack.com>"
10390
10403
msgstr ""
10391
10404
10392
#: en/help_topics/configuration.txt:369
10405
#: en/help_topics/configuration.txt:381
10393
10406
msgid ""
10394
10407
" [http://hypothetical.site.com/branches/devel-branch]\n"
10395
10408
" create_signatures = always"
10396
10409
msgstr ""
10397
10410
10398
#: en/help_topics/configuration.txt:372
10411
#: en/help_topics/configuration.txt:384
10399
10412
msgid ""
10400
10413
"The authentication configuration file, authentication.conf\n"
10401
10414
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10402
10415
msgstr ""
10403
10416
10404
#: en/help_topics/configuration.txt:375
10417
#: en/help_topics/configuration.txt:387
10405
10418
msgid ""
10406
10419
"``authentication.conf`` allows one to specify credentials for\n"
10407
10420
"remote servers. This can be used for all the supported transports and any "
10409
10422
"of bzr that requires authentication (smtp for example)."
10410
10423
msgstr ""
10411
10424
10412
#: en/help_topics/configuration.txt:379
10425
#: en/help_topics/configuration.txt:391
10413
10426
msgid ""
10414
10427
"The syntax of the file obeys the same rules as the others except for the\n"
10415
10428
"option policies which don't apply."
10416
10429
msgstr ""
10417
10430
10418
#: en/help_topics/configuration.txt:382
10431
#: en/help_topics/configuration.txt:394
10419
10432
msgid ""
10420
10433
"For more information on the possible uses of the authentication "
10421
10434
"configuration\n"
10422
10435
"file see :doc:`authentication-help`."
10423
10436
msgstr ""
10424
10437
10425
#: en/help_topics/configuration.txt:385
10438
#: en/help_topics/configuration.txt:397
10426
10439
msgid ""
10427
10440
"\n"
10428
10441
"Common options\n"
10429
10442
"--------------"
10430
10443
msgstr ""
10431
10444
10432
#: en/help_topics/configuration.txt:389
10445
#: en/help_topics/configuration.txt:401
10433
10446
msgid ""
10434
10447
"debug_flags\n"
10435
10448
"~~~~~~~~~~~"
10436
10449
msgstr ""
10437
10450
10438
#: en/help_topics/configuration.txt:392
10451
#: en/help_topics/configuration.txt:404
10439
10452
msgid ""
10440
10453
"A comma-separated list of debugging options to turn on. The same values\n"
10441
10454
"can be used as with the -D command-line option (see `help global-options`).\n"
10442
10455
"For example::"
10443
10456
msgstr ""
10444
10457
10445
#: en/help_topics/configuration.txt:396
10458
#: en/help_topics/configuration.txt:408
10446
10459
msgid " debug_flags = hpss"
10447
10460
msgstr ""
10448
10461
10449
#: en/help_topics/configuration.txt:400
10462
#: en/help_topics/configuration.txt:412
10450
10463
msgid " debug_flags = hpss,evil"
10451
10464
msgstr ""
10452
10465
10453
#: en/help_topics/configuration.txt:402
10466
#: en/help_topics/configuration.txt:414
10454
10467
msgid ""
10455
10468
"email\n"
10456
10469
"~~~~~"
10457
10470
msgstr ""
10458
10471
10459
#: en/help_topics/configuration.txt:405
10472
#: en/help_topics/configuration.txt:417
10460
10473
msgid ""
10461
10474
"The email address to use when committing a branch. Typically takes the form\n"
10462
10475
"of::"
10463
10476
msgstr ""
10464
10477
10465
#: en/help_topics/configuration.txt:408
10478
#: en/help_topics/configuration.txt:420
10466
10479
msgid " email = Full Name <account@hostname.tld>"
10467
10480
msgstr ""
10468
10481
10469
#: en/help_topics/configuration.txt:410
10482
#: en/help_topics/configuration.txt:422
10470
10483
msgid ""
10471
10484
"editor\n"
10472
10485
"~~~~~~"
10473
10486
msgstr ""
10474
10487
10475
#: en/help_topics/configuration.txt:413
10488
#: en/help_topics/configuration.txt:425
10476
10489
msgid ""
10477
10490
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10478
10491
"a commit message. This setting is trumped by the environment variable\n"
10480
10493
"variables."
10481
10494
msgstr ""
10482
10495
10483
#: en/help_topics/configuration.txt:418
10496
#: en/help_topics/configuration.txt:430
10484
10497
msgid ""
10485
10498
"log_format\n"
10486
10499
"~~~~~~~~~~"
10487
10500
msgstr ""
10488
10501
10489
#: en/help_topics/configuration.txt:421
10502
#: en/help_topics/configuration.txt:433
10490
10503
msgid ""
10491
10504
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10492
10505
"and ``line``. Additional formats may be provided by plugins. The default\n"
10493
10506
"value is ``long``."
10494
10507
msgstr ""
10495
10508
10496
#: en/help_topics/configuration.txt:425
10509
#: en/help_topics/configuration.txt:437
10497
10510
msgid ""
10498
10511
"check_signatures\n"
10499
10512
"~~~~~~~~~~~~~~~~"
10500
10513
msgstr ""
10501
10514
10502
#: en/help_topics/configuration.txt:428
10515
#: en/help_topics/configuration.txt:440
10503
10516
msgid ""
10504
10517
"Reserved for future use. These options will allow a policy for branches to\n"
10505
10518
"require signatures."
10506
10519
msgstr ""
10507
10520
10508
#: en/help_topics/configuration.txt:431
10521
#: en/help_topics/configuration.txt:443
10509
10522
msgid ""
10510
10523
"require\n"
10511
10524
" The gnupg signature for revisions must be present and must be valid."
10512
10525
msgstr ""
10513
10526
10514
#: en/help_topics/configuration.txt:434
10527
#: en/help_topics/configuration.txt:446
10515
10528
msgid ""
10516
10529
"ignore\n"
10517
10530
" Do not check gnupg signatures of revisions."
10518
10531
msgstr ""
10519
10532
10520
#: en/help_topics/configuration.txt:437
10533
#: en/help_topics/configuration.txt:449
10521
10534
msgid ""
10522
10535
"check-available\n"
10523
10536
" (default) If gnupg signatures for revisions are present, check them.\n"
10525
10538
" no signature is present."
10526
10539
msgstr ""
10527
10540
10528
#: en/help_topics/configuration.txt:442
10541
#: en/help_topics/configuration.txt:454
10529
10542
msgid ""
10530
10543
"create_signatures\n"
10531
10544
"~~~~~~~~~~~~~~~~~"
10532
10545
msgstr ""
10533
10546
10534
#: en/help_topics/configuration.txt:445
10547
#: en/help_topics/configuration.txt:457
10535
10548
msgid ""
10536
10549
"Defines the behaviour of signing revisions on commits. By default bzr will "
10537
10550
"not\n"
10538
10551
"sign new commits."
10539
10552
msgstr ""
10540
10553
10541
#: en/help_topics/configuration.txt:448
10554
#: en/help_topics/configuration.txt:460
10542
10555
msgid ""
10543
10556
"always\n"
10544
10557
" Sign every new revision that is committed. If the signing fails then "
10546
10559
" commit will not be made."
10547
10560
msgstr ""
10548
10561
10549
#: en/help_topics/configuration.txt:452
10562
#: en/help_topics/configuration.txt:464
10550
10563
msgid ""
10551
10564
"when-required\n"
10552
10565
" Reserved for future use."
10553
10566
msgstr ""
10554
10567
10555
#: en/help_topics/configuration.txt:455
10568
#: en/help_topics/configuration.txt:467
10556
10569
msgid ""
10557
10570
"never\n"
10558
10571
" Reserved for future use."
10559
10572
msgstr ""
10560
10573
10561
#: en/help_topics/configuration.txt:458
10574
#: en/help_topics/configuration.txt:470
10562
10575
msgid ""
10563
10576
"In future it is planned that ``when-required`` will sign newly\n"
10564
10577
"committed revisions only when the branch requires them. ``never`` will "
10566
10579
"to sign newly committed revisions, even if the branch requires signatures."
10567
10580
msgstr ""
10568
10581
10569
#: en/help_topics/configuration.txt:462
10582
#: en/help_topics/configuration.txt:474
10570
10583
msgid ""
10571
10584
"dirstate.fdatasync\n"
10572
10585
"~~~~~~~~~~~~~~~~~~"
10573
10586
msgstr ""
10574
10587
10575
#: en/help_topics/configuration.txt:465
10588
#: en/help_topics/configuration.txt:477
10576
10589
msgid ""
10577
10590
"If true (default), working tree metadata changes are flushed through the\n"
10578
10591
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10579
10592
"should not be lost if the machine crashes. See also repository.fdatasync."
10580
10593
msgstr ""
10581
10594
10582
#: en/help_topics/configuration.txt:469
10595
#: en/help_topics/configuration.txt:481
10583
10596
msgid ""
10584
10597
"gpg_signing_key\n"
10585
10598
"~~~~~~~~~~~~~~~"
10586
10599
msgstr ""
10587
10600
10588
#: en/help_topics/configuration.txt:472
10601
#: en/help_topics/configuration.txt:484
10589
10602
msgid ""
10590
10603
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10591
10604
"address, key fingerprint or full key ID. When unset or when set to\n"
10592
10605
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10593
10606
msgstr ""
10594
10607
10595
#: en/help_topics/configuration.txt:476
10608
#: en/help_topics/configuration.txt:488
10596
10609
msgid ""
10597
10610
"recurse\n"
10598
10611
"~~~~~~~"
10599
10612
msgstr ""
10600
10613
10601
#: en/help_topics/configuration.txt:479
10614
#: en/help_topics/configuration.txt:491
10602
10615
msgid ""
10603
10616
"Only useful in ``locations.conf``. Defines whether or not the\n"
10604
10617
"configuration for this section applies to subdirectories:"
10605
10618
msgstr ""
10606
10619
10607
#: en/help_topics/configuration.txt:482
10620
#: en/help_topics/configuration.txt:494
10608
10621
msgid ""
10609
10622
"true\n"
10610
10623
" (default) This section applies to subdirectories as well."
10611
10624
msgstr ""
10612
10625
10613
#: en/help_topics/configuration.txt:485
10626
#: en/help_topics/configuration.txt:497
10614
10627
msgid ""
10615
10628
"false\n"
10616
10629
" This section only applies to the branch at this directory and not\n"
10617
10630
" branches below it."
10618
10631
msgstr ""
10619
10632
10620
#: en/help_topics/configuration.txt:489
10633
#: en/help_topics/configuration.txt:501
10621
10634
msgid ""
10622
10635
"gpg_signing_command\n"
10623
10636
"~~~~~~~~~~~~~~~~~~~"
10624
10637
msgstr ""
10625
10638
10626
#: en/help_topics/configuration.txt:492
10639
#: en/help_topics/configuration.txt:504
10627
10640
msgid ""
10628
10641
"(Default: \"gpg\"). Which program should be used to sign and check "
10629
10642
"revisions.\n"
10630
10643
"For example::"
10631
10644
msgstr ""
10632
10645
10633
#: en/help_topics/configuration.txt:495
10646
#: en/help_topics/configuration.txt:507
10634
10647
msgid " gpg_signing_command = /usr/bin/gnpg"
10635
10648
msgstr ""
10636
10649
10637
#: en/help_topics/configuration.txt:497
10650
#: en/help_topics/configuration.txt:509
10638
10651
msgid ""
10639
10652
"The specified command must accept the options \"--clearsign\" and \"-u "
10640
10653
"<email>\"."
10641
10654
msgstr ""
10642
10655
10643
#: en/help_topics/configuration.txt:499
10656
#: en/help_topics/configuration.txt:511
10644
10657
msgid ""
10645
10658
"bzr_remote_path\n"
10646
10659
"~~~~~~~~~~~~~~~"
10647
10660
msgstr ""
10648
10661
10649
#: en/help_topics/configuration.txt:502
10662
#: en/help_topics/configuration.txt:514
10650
10663
msgid ""
10651
10664
"(Default: \"bzr\"). The path to the command that should be used to run the "
10652
10665
"smart\n"
10653
10666
"server for bzr. This value may only be specified in locations.conf, because:"
10654
10667
msgstr ""
10655
10668
10656
#: en/help_topics/configuration.txt:505
10669
#: en/help_topics/configuration.txt:517
10657
10670
msgid ""
10658
10671
"- it's needed before branch.conf is accessible\n"
10659
10672
"- allowing remote branch.conf files to specify commands would be a security\n"
10660
10673
" risk"
10661
10674
msgstr ""
10662
10675
10663
#: en/help_topics/configuration.txt:509
10676
#: en/help_topics/configuration.txt:521
10664
10677
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10665
10678
msgstr ""
10666
10679
10667
#: en/help_topics/configuration.txt:511
10680
#: en/help_topics/configuration.txt:523
10668
10681
msgid ""
10669
10682
"smtp_server\n"
10670
10683
"~~~~~~~~~~~"
10671
10684
msgstr ""
10672
10685
10673
#: en/help_topics/configuration.txt:514
10686
#: en/help_topics/configuration.txt:526
10674
10687
msgid ""
10675
10688
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10676
10689
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10677
10690
msgstr ""
10678
10691
10679
#: en/help_topics/configuration.txt:517
10692
#: en/help_topics/configuration.txt:529
10680
10693
msgid ""
10681
10694
"smtp_username, smtp_password\n"
10682
10695
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10683
10696
msgstr ""
10684
10697
10685
#: en/help_topics/configuration.txt:520
10698
#: en/help_topics/configuration.txt:532
10686
10699
msgid ""
10687
10700
"User and password to authenticate to the SMTP server. If smtp_username\n"
10688
10701
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10690
10703
"to send mail."
10691
10704
msgstr ""
10692
10705
10693
#: en/help_topics/configuration.txt:525
10706
#: en/help_topics/configuration.txt:537
10694
10707
msgid ""
10695
10708
"locks.steal_dead\n"
10696
10709
"~~~~~~~~~~~~~~~~"
10697
10710
msgstr ""
10698
10711
10699
#: en/help_topics/configuration.txt:528
10712
#: en/help_topics/configuration.txt:540
10700
10713
msgid ""
10701
10714
"If set to true, bzr will automatically break locks held by processes from\n"
10702
10715
"the same machine and user that are no longer alive. Otherwise, it will\n"
10704
10717
"the object is no longer in use."
10705
10718
msgstr ""
10706
10719
10707
#: en/help_topics/configuration.txt:533
10720
#: en/help_topics/configuration.txt:545
10708
10721
msgid ""
10709
10722
"mail_client\n"
10710
10723
"~~~~~~~~~~~"
10711
10724
msgstr ""
10712
10725
10713
#: en/help_topics/configuration.txt:536
10726
#: en/help_topics/configuration.txt:548
10714
10727
msgid ""
10715
10728
"A mail client to use for sending merge requests.\n"
10716
10729
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10719
10732
"``editor``."
10720
10733
msgstr ""
10721
10734
10722
#: en/help_topics/configuration.txt:541
10735
#: en/help_topics/configuration.txt:553
10723
10736
msgid "Supported values for specific clients:"
10724
10737
msgstr ""
10725
10738
10726
#: en/help_topics/configuration.txt:543
10739
#: en/help_topics/configuration.txt:555
10727
10740
msgid ""
10728
10741
":claws: Use Claws. This skips a dialog for attaching files.\n"
10729
10742
":evolution: Use Evolution.\n"
10734
10747
" this works around some bugs that xdg-email doesn't handle."
10735
10748
msgstr ""
10736
10749
10737
#: en/help_topics/configuration.txt:550
10750
#: en/help_topics/configuration.txt:562
10738
10751
msgid "Supported generic values are:"
10739
10752
msgstr ""
10740
10753
10741
#: en/help_topics/configuration.txt:552
10754
#: en/help_topics/configuration.txt:564
10742
10755
msgid ""
10743
10756
":default: See above.\n"
10744
10757
":editor: Use your editor to compose the merge request. This also uses\n"
10748
10761
":xdg-email: Use xdg-email to run your preferred mail program"
10749
10762
msgstr ""
10750
10763
10751
#: en/help_topics/configuration.txt:559
10764
#: en/help_topics/configuration.txt:571
10752
10765
msgid ""
10753
10766
"repository.fdatasync\n"
10754
10767
"~~~~~~~~~~~~~~~~~~~~"
10755
10768
msgstr ""
10756
10769
10757
#: en/help_topics/configuration.txt:562
10770
#: en/help_topics/configuration.txt:574
10758
10771
msgid ""
10759
10772
"If true (default), repository changes are flushed through the OS buffers\n"
10760
10773
"to physical disk. This is somewhat slower, but means data should not be\n"
10761
10774
"lost if the machine crashes. See also dirstate.fdatasync."
10762
10775
msgstr ""
10763
10776
10764
#: en/help_topics/configuration.txt:566
10777
#: en/help_topics/configuration.txt:578
10765
10778
msgid ""
10766
10779
"submit_branch\n"
10767
10780
"~~~~~~~~~~~~~"
10768
10781
msgstr ""
10769
10782
10770
#: en/help_topics/configuration.txt:569
10783
#: en/help_topics/configuration.txt:581
10771
10784
msgid ""
10772
10785
"The branch you intend to submit your current work to. This is "
10773
10786
"automatically\n"
10776
10789
"should usually be set on a per-branch or per-location basis."
10777
10790
msgstr ""
10778
10791
10779
#: en/help_topics/configuration.txt:573
10792
#: en/help_topics/configuration.txt:585
10780
10793
msgid ""
10781
10794
"public_branch\n"
10782
10795
"~~~~~~~~~~~~~"
10783
10796
msgstr ""
10784
10797
10785
#: en/help_topics/configuration.txt:576
10798
#: en/help_topics/configuration.txt:588
10786
10799
msgid ""
10787
10800
"A publically-accessible version of this branch (implying that this version "
10788
10801
"is\n"
10789
10802
"not publically-accessible). Used (and set) by ``bzr send``."
10790
10803
msgstr ""
10791
10804
10792
#: en/help_topics/configuration.txt:579
10805
#: en/help_topics/configuration.txt:591
10793
10806
msgid ""
10794
10807
"suppress_warnings\n"
10795
10808
"~~~~~~~~~~~~~~~~~"
10796
10809
msgstr ""
10797
10810
10798
#: en/help_topics/configuration.txt:582
10811
#: en/help_topics/configuration.txt:594
10799
10812
msgid ""
10800
10813
"A list of strings, each string represent a warning that can be emitted by\n"
10801
10814
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10802
10815
msgstr ""
10803
10816
10804
#: en/help_topics/configuration.txt:585
10817
#: en/help_topics/configuration.txt:597
10805
10818
msgid "Valid values:"
10806
10819
msgstr ""
10807
10820
10808
#: en/help_topics/configuration.txt:587
10821
#: en/help_topics/configuration.txt:599
10809
10822
msgid ""
10810
10823
"* ``format_deprecation``:\n"
10811
10824
" whether the format deprecation warning is shown on repositories that "
10813
10826
" using deprecated formats."
10814
10827
msgstr ""
10815
10828
10816
#: en/help_topics/configuration.txt:591
10829
#: en/help_topics/configuration.txt:603
10817
10830
msgid ""
10818
10831
"default_format\n"
10819
10832
"~~~~~~~~~~~~~~"
10820
10833
msgstr ""
10821
10834
10822
#: en/help_topics/configuration.txt:594
10835
#: en/help_topics/configuration.txt:606
10823
10836
msgid ""
10824
10837
"A format name for the default format used when creating branches. See "
10825
10838
"``bzr\n"
10826
10839
"help formats`` for possible values."
10827
10840
msgstr ""
10828
10841
10829
#: en/help_topics/configuration.txt:597
10842
#: en/help_topics/configuration.txt:609
10830
10843
msgid ""
10831
10844
"\n"
10832
10845
"Unicode options\n"
10833
10846
"---------------"
10834
10847
msgstr ""
10835
10848
10836
#: en/help_topics/configuration.txt:601
10849
#: en/help_topics/configuration.txt:613
10837
10850
msgid ""
10838
10851
"output_encoding\n"
10839
10852
"~~~~~~~~~~~~~~~"
10840
10853
msgstr ""
10841
10854
10842
#: en/help_topics/configuration.txt:604
10855
#: en/help_topics/configuration.txt:616
10843
10856
msgid ""
10844
10857
"A Python unicode encoding name for text output from bzr, such as log\n"
10845
10858
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10846
10859
"is the terminal encoding prefered by the operating system."
10847
10860
msgstr ""
10848
10861
10849
#: en/help_topics/configuration.txt:608
10862
#: en/help_topics/configuration.txt:620
10850
10863
msgid ""
10851
10864
"\n"
10852
10865
"Branch type specific options\n"
10853
10866
"----------------------------"
10854
10867
msgstr ""
10855
10868
10856
#: en/help_topics/configuration.txt:612
10869
#: en/help_topics/configuration.txt:624
10857
10870
msgid ""
10858
10871
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10859
10872
"later format. They\n"
10861
10874
"manually set in ``locations.conf`` or ``bazaar.conf``."
10862
10875
msgstr ""
10863
10876
10864
#: en/help_topics/configuration.txt:617
10877
#: en/help_topics/configuration.txt:629
10865
10878
msgid ""
10866
10879
"append_revisions_only\n"
10867
10880
"~~~~~~~~~~~~~~~~~~~~~"
10868
10881
msgstr ""
10869
10882
10870
#: en/help_topics/configuration.txt:620
10883
#: en/help_topics/configuration.txt:632
10871
10884
msgid ""
10872
10885
"If set to \"True\" then revisions can only be appended to the log, not\n"
10873
10886
"removed. A branch with this setting enabled can only pull from another\n"
10877
10890
"compatibility with previous bzr versions (older than 2.2)."
10878
10891
msgstr ""
10879
10892
10880
#: en/help_topics/configuration.txt:627
10893
#: en/help_topics/configuration.txt:639
10881
10894
msgid ""
10882
10895
"parent_location\n"
10883
10896
"~~~~~~~~~~~~~~~"
10884
10897
msgstr ""
10885
10898
10886
#: en/help_topics/configuration.txt:630
10899
#: en/help_topics/configuration.txt:642
10887
10900
msgid ""
10888
10901
"If present, the location of the default branch for pull or merge. This "
10889
10902
"option\n"
10891
10904
"--remember``."
10892
10905
msgstr ""
10893
10906
10894
#: en/help_topics/configuration.txt:634
10907
#: en/help_topics/configuration.txt:646
10895
10908
msgid ""
10896
10909
"push_location\n"
10897
10910
"~~~~~~~~~~~~~"
10898
10911
msgstr ""
10899
10912
10900
#: en/help_topics/configuration.txt:637
10913
#: en/help_topics/configuration.txt:649
10901
10914
msgid ""
10902
10915
"If present, the location of the default branch for push. This option\n"
10903
10916
"is normally set by the first ``push`` or ``push --remember``."
10904
10917
msgstr ""
10905
10918
10906
#: en/help_topics/configuration.txt:640
10919
#: en/help_topics/configuration.txt:652
10907
10920
msgid ""
10908
10921
"push_strict\n"
10909
10922
"~~~~~~~~~~~"
10910
10923
msgstr ""
10911
10924
10912
#: en/help_topics/configuration.txt:643
10925
#: en/help_topics/configuration.txt:655
10913
10926
msgid ""
10914
10927
"If present, defines the ``--strict`` option default value for checking\n"
10915
10928
"uncommitted changes before pushing."
10916
10929
msgstr ""
10917
10930
10918
#: en/help_topics/configuration.txt:646
10931
#: en/help_topics/configuration.txt:658
10919
10932
msgid ""
10920
10933
"dpush_strict\n"
10921
10934
"~~~~~~~~~~~~"
10922
10935
msgstr ""
10923
10936
10924
#: en/help_topics/configuration.txt:649
10937
#: en/help_topics/configuration.txt:661
10925
10938
msgid ""
10926
10939
"If present, defines the ``--strict`` option default value for checking\n"
10927
10940
"uncommitted changes before pushing into a different VCS without any\n"
10928
10941
"custom bzr metadata."
10929
10942
msgstr ""
10930
10943
10931
#: en/help_topics/configuration.txt:653
10944
#: en/help_topics/configuration.txt:665
10932
10945
msgid ""
10933
10946
"bound_location\n"
10934
10947
"~~~~~~~~~~~~~~"
10935
10948
msgstr ""
10936
10949
10937
#: en/help_topics/configuration.txt:656
10950
#: en/help_topics/configuration.txt:668
10938
10951
msgid ""
10939
10952
"The location that commits should go to when acting as a checkout.\n"
10940
10953
"This option is normally set by ``bind``."
10941
10954
msgstr ""
10942
10955
10943
#: en/help_topics/configuration.txt:659
10956
#: en/help_topics/configuration.txt:671
10944
10957
msgid ""
10945
10958
"bound\n"
10946
10959
"~~~~~"
10947
10960
msgstr ""
10948
10961
10949
#: en/help_topics/configuration.txt:662
10962
#: en/help_topics/configuration.txt:674
10950
10963
msgid ""
10951
10964
"If set to \"True\", the branch should act as a checkout, and push each "
10952
10965
"commit to\n"
10953
10966
"the bound_location. This option is normally set by ``bind``/``unbind``."
10954
10967
msgstr ""
10955
10968
10956
#: en/help_topics/configuration.txt:665
10969
#: en/help_topics/configuration.txt:677
10957
10970
msgid ""
10958
10971
"send_strict\n"
10959
10972
"~~~~~~~~~~~"
10960
10973
msgstr ""
10961
10974
10962
#: en/help_topics/configuration.txt:668
10975
#: en/help_topics/configuration.txt:680
10963
10976
msgid ""
10964
10977
"If present, defines the ``--strict`` option default value for checking\n"
10965
10978
"uncommitted changes before sending a merge directive."
10966
10979
msgstr ""
10967
10980
10968
#: en/help_topics/configuration.txt:671
10981
#: en/help_topics/configuration.txt:683
10969
10982
msgid ""
10970
10983
"add.maximum_file_size\n"
10971
10984
"~~~~~~~~~~~~~~~~~~~~~"
10972
10985
msgstr ""
10973
10986
10974
#: en/help_topics/configuration.txt:674
10987
#: en/help_topics/configuration.txt:686
10975
10988
msgid ""
10976
10989
"Defines the maximum file size the command line \"add\" operation will allow\n"
10977
10990
"in recursive mode, with files larger than this value being skipped. You may "
10983
10996
"will disable skipping."
10984
10997
msgstr ""
10985
10998
10986
#: en/help_topics/configuration.txt:680
10999
#: en/help_topics/configuration.txt:692
10987
11000
msgid ""
10988
11001
"External Merge Tools\n"
10989
11002
"--------------------"
10990
11003
msgstr ""
10991
11004
10992
#: en/help_topics/configuration.txt:683
11005
#: en/help_topics/configuration.txt:695
10993
11006
msgid ""
10994
11007
"bzr.mergetool.<name>\n"
10995
11008
"~~~~~~~~~~~~~~~~~~~~"
10996
11009
msgstr ""
10997
11010
10998
#: en/help_topics/configuration.txt:686
11011
#: en/help_topics/configuration.txt:698
10999
11012
msgid ""
11000
11013
"Defines an external merge tool called <name> with the given command-line.\n"
11001
11014
"Arguments containing spaces should be quoted using single or double quotes. "
11003
11016
"executable may omit its path if it can be found on the PATH."
11004
11017
msgstr ""
11005
11018
11006
#: en/help_topics/configuration.txt:690
11019
#: en/help_topics/configuration.txt:702
11007
11020
msgid ""
11008
11021
"The following markers can be used in the command-line to substitute "
11009
11022
"filenames\n"
11010
11023
"involved in the merge conflict::"
11011
11024
msgstr ""
11012
11025
11013
#: en/help_topics/configuration.txt:693
11026
#: en/help_topics/configuration.txt:705
11014
11027
msgid ""
11015
11028
" {base} file.BASE\n"
11016
11029
" {this} file.THIS\n"
11021
11034
" succeeds."
11022
11035
msgstr ""
11023
11036
11024
#: en/help_topics/configuration.txt:702
11037
#: en/help_topics/configuration.txt:714
11025
11038
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11026
11039
msgstr ""
11027
11040
11028
#: en/help_topics/configuration.txt:704
11041
#: en/help_topics/configuration.txt:716
11029
11042
msgid ""
11030
11043
"bzr.default_mergetool\n"
11031
11044
"~~~~~~~~~~~~~~~~~~~~~"
11032
11045
msgstr ""
11033
11046
11034
#: en/help_topics/configuration.txt:707
11047
#: en/help_topics/configuration.txt:719
11035
11048
msgid ""
11036
11049
"Specifies which external merge tool (as defined above) should be selected "
11037
11050
"by\n"
11038
11051
"default in tools such as ``bzr qconflicts``."
11039
11052
msgstr ""
11040
11053
11041
#: en/help_topics/configuration.txt:712
11054
#: en/help_topics/configuration.txt:724
11042
11055
msgid " bzr.default_mergetool = kdiff3\n"
11043
11056
msgstr ""
11044
11057
11989
12002
"branch can now be pushed to the mainline.\n"
11990
12003
msgstr ""
11991
12004
12005
#: en/help_topics/env-variables.txt:1
12006
msgid "Environment Variables"
12007
msgstr "Переменные окружения"
12008
12009
#: en/help_topics/env-variables.txt:3
12010
msgid ""
12011
"=================== "
12012
"===========================================================\n"
12013
"BZRPATH Path where bzr is to look for shell plugin external\n"
12014
" commands.\n"
12015
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
12016
"EMAIL E-Mail address of the user.\n"
12017
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
12018
"EDITOR Editor for editing commit messages.\n"
12019
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
12020
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
12021
"BZR_PLUGINS_AT Plugins to load from a directory not in "
12022
"BZR_PLUGIN_PATH.\n"
12023
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
12024
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
12025
"and\n"
12026
" HOME.\n"
12027
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
12028
"URLs).\n"
12029
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
12030
"sshcorp,\n"
12031
" plink or lsh.\n"
12032
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
12033
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
12034
"BZR_COLUMNS Override implicit terminal width.\n"
12035
"BZR_CONCURRENCY Number of processes that can be run concurrently "
12036
"(selftest)\n"
12037
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
12038
"'text'.\n"
12039
"BZR_PDB Control whether to launch a debugger on error.\n"
12040
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
12041
" breakin debugger.\n"
12042
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
12043
"(instead\n"
12044
" of char-based).\n"
12045
"=================== "
12046
"===========================================================\n"
12047
msgstr ""
12048
11992
12049
#: en/help_topics/eol.txt:1
11993
12050
msgid ""
11994
12051
"End of Line Conversion\n"
12296
12353
msgstr ""
12297
12354
12298
12355
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12299
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
12356
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
12300
12357
msgid "Introduced in: 2.2"
12301
12358
msgstr ""
12302
12359
12314
12371
"~~~~"
12315
12372
msgstr ""
12316
12373
12317
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
12318
#: en/help_topics/hooks.txt:304
12374
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12375
#: en/help_topics/hooks.txt:307
12319
12376
msgid "Introduced in: 1.8"
12320
12377
msgstr ""
12321
12378
12345
12402
"~~~~~~~~~~~~~~~~~~~~~~"
12346
12403
msgstr ""
12347
12404
12348
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
12405
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
12349
12406
msgid "Introduced in: 1.4"
12350
12407
msgstr ""
12351
12408
12357
12414
"uncommit will all trigger this hook."
12358
12415
msgstr ""
12359
12416
12360
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12417
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
12361
12418
msgid ""
12362
12419
"post_commit\n"
12363
12420
"~~~~~~~~~~~"
12365
12422
12366
12423
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12367
12424
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12368
#: en/help_topics/hooks.txt:145
12369
12425
msgid "Introduced in: 0.15"
12370
12426
msgstr ""
12371
12427
12470
12526
12471
12527
#: en/help_topics/hooks.txt:142
12472
12528
msgid ""
12473
"set_rh\n"
12474
"~~~~~~"
12475
msgstr ""
12476
12477
#: en/help_topics/hooks.txt:147
12478
msgid ""
12479
"Invoked whenever the revision history has been set via\n"
12480
"set_revision_history. The api signature is (branch, revision_history),\n"
12481
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12482
"for bzr to trigger, a better hook to use is\n"
12483
"Branch.post_change_branch_tip."
12484
msgstr ""
12485
12486
#: en/help_topics/hooks.txt:153
12487
msgid ""
12488
12529
"transform_fallback_location\n"
12489
12530
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12490
12531
msgstr ""
12491
12532
12492
#: en/help_topics/hooks.txt:156
12533
#: en/help_topics/hooks.txt:145
12493
12534
msgid "Introduced in: 1.9"
12494
12535
msgstr ""
12495
12536
12496
#: en/help_topics/hooks.txt:158
12537
#: en/help_topics/hooks.txt:147
12497
12538
msgid ""
12498
12539
"Called when a stacked branch is activating its fallback locations.\n"
12499
12540
"transform_fallback_location is called with (branch, url), and should\n"
12507
12548
"however undefined."
12508
12549
msgstr ""
12509
12550
12510
#: en/help_topics/hooks.txt:169
12551
#: en/help_topics/hooks.txt:158
12511
12552
msgid ""
12512
12553
"CommandHooks\n"
12513
12554
"------------"
12514
12555
msgstr ""
12515
12556
12516
#: en/help_topics/hooks.txt:172
12557
#: en/help_topics/hooks.txt:161
12517
12558
msgid ""
12518
12559
"extend_command\n"
12519
12560
"~~~~~~~~~~~~~~"
12520
12561
msgstr ""
12521
12562
12522
#: en/help_topics/hooks.txt:175
12563
#: en/help_topics/hooks.txt:164
12523
12564
msgid "Introduced in: 1.13"
12524
12565
msgstr ""
12525
12566
12526
#: en/help_topics/hooks.txt:177
12567
#: en/help_topics/hooks.txt:166
12527
12568
msgid ""
12528
12569
"Called after creating a command object to allow modifications such as\n"
12529
12570
"adding or removing options, docs etc. Called with the new\n"
12530
12571
"bzrlib.commands.Command object."
12531
12572
msgstr ""
12532
12573
12533
#: en/help_topics/hooks.txt:181
12574
#: en/help_topics/hooks.txt:170
12534
12575
msgid ""
12535
12576
"get_command\n"
12536
12577
"~~~~~~~~~~~"
12537
12578
msgstr ""
12538
12579
12539
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12540
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12580
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12581
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12541
12582
msgid "Introduced in: 1.17"
12542
12583
msgstr ""
12543
12584
12544
#: en/help_topics/hooks.txt:186
12585
#: en/help_topics/hooks.txt:175
12545
12586
msgid ""
12546
12587
"Called when creating a single command. Called with (cmd_or_None,\n"
12547
12588
"command_name). get_command should either return the cmd_or_None\n"
12551
12592
"plugin_cmds.register_lazy."
12552
12593
msgstr ""
12553
12594
12554
#: en/help_topics/hooks.txt:193
12595
#: en/help_topics/hooks.txt:182
12555
12596
msgid ""
12556
12597
"get_missing_command\n"
12557
12598
"~~~~~~~~~~~~~~~~~~~"
12558
12599
msgstr ""
12559
12600
12560
#: en/help_topics/hooks.txt:198
12601
#: en/help_topics/hooks.txt:187
12561
12602
msgid ""
12562
12603
"Called when creating a single command if no command could be found.\n"
12563
12604
"Called with (command_name). get_missing_command should either return\n"
12564
12605
"None, or a Command object to be used for the command."
12565
12606
msgstr ""
12566
12607
12567
#: en/help_topics/hooks.txt:202
12608
#: en/help_topics/hooks.txt:191
12568
12609
msgid ""
12569
12610
"list_commands\n"
12570
12611
"~~~~~~~~~~~~~"
12571
12612
msgstr ""
12572
12613
12573
#: en/help_topics/hooks.txt:207
12614
#: en/help_topics/hooks.txt:196
12574
12615
msgid ""
12575
12616
"Called when enumerating commands. Called with a set of cmd_name\n"
12576
12617
"strings for all the commands found so far. This set is safe to mutate\n"
12578
12619
"set of command names."
12579
12620
msgstr ""
12580
12621
12581
#: en/help_topics/hooks.txt:212
12622
#: en/help_topics/hooks.txt:201
12623
msgid ""
12624
"post_command\n"
12625
"~~~~~~~~~~~~"
12626
msgstr ""
12627
12628
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12629
msgid "Introduced in: 2.6"
12630
msgstr ""
12631
12632
#: en/help_topics/hooks.txt:206
12633
msgid "Called after executing a command. Called with the command object."
12634
msgstr ""
12635
12636
#: en/help_topics/hooks.txt:208
12637
msgid ""
12638
"pre_command\n"
12639
"~~~~~~~~~~~"
12640
msgstr ""
12641
12642
#: en/help_topics/hooks.txt:213
12643
msgid "Called prior to executing a command. Called with the command object."
12644
msgstr ""
12645
12646
#: en/help_topics/hooks.txt:215
12582
12647
msgid ""
12583
12648
"_ConfigHooks\n"
12584
12649
"------------"
12585
12650
msgstr ""
12586
12651
12587
#: en/help_topics/hooks.txt:215
12652
#: en/help_topics/hooks.txt:218
12588
12653
msgid ""
12589
12654
"get\n"
12590
12655
"~~~"
12591
12656
msgstr ""
12592
12657
12593
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12594
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12595
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12596
#: en/help_topics/hooks.txt:443
12658
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12659
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12660
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12661
#: en/help_topics/hooks.txt:446
12597
12662
msgid "Introduced in: 2.4"
12598
12663
msgstr ""
12599
12664
12600
#: en/help_topics/hooks.txt:220
12665
#: en/help_topics/hooks.txt:223
12601
12666
msgid ""
12602
12667
"Invoked when a config option is read. The signature is (stack, name,\n"
12603
12668
"value)."
12604
12669
msgstr ""
12605
12670
12606
#: en/help_topics/hooks.txt:223
12671
#: en/help_topics/hooks.txt:226
12607
12672
msgid ""
12608
12673
"load\n"
12609
12674
"~~~~"
12610
12675
msgstr ""
12611
12676
12612
#: en/help_topics/hooks.txt:228
12677
#: en/help_topics/hooks.txt:231
12613
12678
msgid "Invoked when a config store is loaded. The signature is (store)."
12614
12679
msgstr ""
12615
12680
12616
#: en/help_topics/hooks.txt:230
12681
#: en/help_topics/hooks.txt:233
12617
12682
msgid ""
12618
12683
"remove\n"
12619
12684
"~~~~~~"
12620
12685
msgstr ""
12621
12686
12622
#: en/help_topics/hooks.txt:235
12687
#: en/help_topics/hooks.txt:238
12623
12688
msgid ""
12624
12689
"Invoked when a config option is removed. The signature is (stack,\n"
12625
12690
"name)."
12626
12691
msgstr ""
12627
12692
12628
#: en/help_topics/hooks.txt:238
12693
#: en/help_topics/hooks.txt:241
12629
12694
msgid ""
12630
12695
"save\n"
12631
12696
"~~~~"
12632
12697
msgstr ""
12633
12698
12634
#: en/help_topics/hooks.txt:243
12699
#: en/help_topics/hooks.txt:246
12635
12700
msgid "Invoked when a config store is saved. The signature is (store)."
12636
12701
msgstr ""
12637
12702
12638
#: en/help_topics/hooks.txt:245
12703
#: en/help_topics/hooks.txt:248
12639
12704
msgid ""
12640
12705
"set\n"
12641
12706
"~~~"
12642
12707
msgstr ""
12643
12708
12644
#: en/help_topics/hooks.txt:250
12709
#: en/help_topics/hooks.txt:253
12645
12710
msgid ""
12646
12711
"Invoked when a config option is set. The signature is (stack, name,\n"
12647
12712
"value)."
12648
12713
msgstr ""
12649
12714
12650
#: en/help_topics/hooks.txt:253
12715
#: en/help_topics/hooks.txt:256
12651
12716
msgid ""
12652
12717
"ControlDirHooks\n"
12653
12718
"---------------"
12654
12719
msgstr ""
12655
12720
12656
#: en/help_topics/hooks.txt:256
12721
#: en/help_topics/hooks.txt:259
12657
12722
msgid ""
12658
12723
"post_repo_init\n"
12659
12724
"~~~~~~~~~~~~~~"
12660
12725
msgstr ""
12661
12726
12662
#: en/help_topics/hooks.txt:261
12727
#: en/help_topics/hooks.txt:264
12663
12728
msgid ""
12664
12729
"Invoked after a repository has been initialized. post_repo_init is\n"
12665
12730
"called with a bzrlib.controldir.RepoInitHookParams."
12666
12731
msgstr ""
12667
12732
12668
#: en/help_topics/hooks.txt:264
12733
#: en/help_topics/hooks.txt:267
12669
12734
msgid ""
12670
12735
"pre_open\n"
12671
12736
"~~~~~~~~"
12672
12737
msgstr ""
12673
12738
12674
#: en/help_topics/hooks.txt:267
12739
#: en/help_topics/hooks.txt:270
12675
12740
msgid "Introduced in: 1.14"
12676
12741
msgstr ""
12677
12742
12678
#: en/help_topics/hooks.txt:269
12743
#: en/help_topics/hooks.txt:272
12679
12744
msgid ""
12680
12745
"Invoked before attempting to open a ControlDir with the transport that\n"
12681
12746
"the open will use."
12682
12747
msgstr ""
12683
12748
12684
#: en/help_topics/hooks.txt:272
12749
#: en/help_topics/hooks.txt:275
12685
12750
msgid ""
12686
12751
"InfoHooks\n"
12687
12752
"---------"
12688
12753
msgstr ""
12689
12754
12690
#: en/help_topics/hooks.txt:275
12755
#: en/help_topics/hooks.txt:278
12691
12756
msgid ""
12692
12757
"repository\n"
12693
12758
"~~~~~~~~~~"
12694
12759
msgstr ""
12695
12760
12696
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12697
#: en/help_topics/hooks.txt:521
12761
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12762
#: en/help_topics/hooks.txt:524
12698
12763
msgid "Introduced in: 1.15"
12699
12764
msgstr ""
12700
12765
12701
#: en/help_topics/hooks.txt:280
12766
#: en/help_topics/hooks.txt:283
12702
12767
msgid ""
12703
12768
"Invoked when displaying the statistics for a repository. repository is\n"
12704
12769
"called with a statistics dictionary as returned by the repository and\n"
12705
12770
"a file-like object to write to."
12706
12771
msgstr ""
12707
12772
12708
#: en/help_topics/hooks.txt:284
12773
#: en/help_topics/hooks.txt:287
12709
12774
msgid ""
12710
12775
"LockHooks\n"
12711
12776
"---------"
12712
12777
msgstr ""
12713
12778
12714
#: en/help_topics/hooks.txt:287
12779
#: en/help_topics/hooks.txt:290
12715
12780
msgid ""
12716
12781
"lock_acquired\n"
12717
12782
"~~~~~~~~~~~~~"
12718
12783
msgstr ""
12719
12784
12720
#: en/help_topics/hooks.txt:292
12785
#: en/help_topics/hooks.txt:295
12721
12786
msgid ""
12722
12787
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12723
12788
msgstr ""
12724
12789
12725
#: en/help_topics/hooks.txt:294
12790
#: en/help_topics/hooks.txt:297
12726
12791
msgid ""
12727
12792
"lock_broken\n"
12728
12793
"~~~~~~~~~~~"
12729
12794
msgstr ""
12730
12795
12731
#: en/help_topics/hooks.txt:299
12796
#: en/help_topics/hooks.txt:302
12732
12797
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12733
12798
msgstr ""
12734
12799
12735
#: en/help_topics/hooks.txt:301
12800
#: en/help_topics/hooks.txt:304
12736
12801
msgid ""
12737
12802
"lock_released\n"
12738
12803
"~~~~~~~~~~~~~"
12739
12804
msgstr ""
12740
12805
12741
#: en/help_topics/hooks.txt:306
12806
#: en/help_topics/hooks.txt:309
12742
12807
msgid ""
12743
12808
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12744
12809
msgstr ""
12745
12810
12746
#: en/help_topics/hooks.txt:308
12811
#: en/help_topics/hooks.txt:311
12747
12812
msgid ""
12748
12813
"MergeHooks\n"
12749
12814
"----------"
12750
12815
msgstr ""
12751
12816
12752
#: en/help_topics/hooks.txt:311
12817
#: en/help_topics/hooks.txt:314
12753
12818
msgid ""
12754
12819
"merge_file_content\n"
12755
12820
"~~~~~~~~~~~~~~~~~~"
12756
12821
msgstr ""
12757
12822
12758
#: en/help_topics/hooks.txt:314
12823
#: en/help_topics/hooks.txt:317
12759
12824
msgid "Introduced in: 2.1"
12760
12825
msgstr ""
12761
12826
12762
#: en/help_topics/hooks.txt:316
12827
#: en/help_topics/hooks.txt:319
12763
12828
msgid ""
12764
12829
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12765
12830
"object when starting a merge. Should return either None or a subclass\n"
12769
12834
"AbstractPerFileMerger API docs for details on how it is used by merge."
12770
12835
msgstr ""
12771
12836
12772
#: en/help_topics/hooks.txt:323
12837
#: en/help_topics/hooks.txt:326
12773
12838
msgid ""
12774
12839
"post_merge\n"
12775
12840
"~~~~~~~~~~"
12776
12841
msgstr ""
12777
12842
12778
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12779
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12780
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12843
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12844
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12845
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12781
12846
msgid "Introduced in: 2.5"
12782
12847
msgstr ""
12783
12848
12784
#: en/help_topics/hooks.txt:328
12849
#: en/help_topics/hooks.txt:331
12785
12850
msgid ""
12786
12851
"Called after a merge. Receives a Merger object as the single argument.\n"
12787
12852
"The return value is ignored."
12788
12853
msgstr ""
12789
12854
12790
#: en/help_topics/hooks.txt:331
12855
#: en/help_topics/hooks.txt:334
12791
12856
msgid ""
12792
12857
"pre_merge\n"
12793
12858
"~~~~~~~~~"
12794
12859
msgstr ""
12795
12860
12796
#: en/help_topics/hooks.txt:336
12861
#: en/help_topics/hooks.txt:339
12797
12862
msgid ""
12798
12863
"Called before a merge. Receives a Merger object as the single\n"
12799
12864
"argument."
12800
12865
msgstr ""
12801
12866
12802
#: en/help_topics/hooks.txt:339
12867
#: en/help_topics/hooks.txt:342
12803
12868
msgid ""
12804
12869
"MergeDirectiveHooks\n"
12805
12870
"-------------------"
12806
12871
msgstr ""
12807
12872
12808
#: en/help_topics/hooks.txt:342
12873
#: en/help_topics/hooks.txt:345
12809
12874
msgid ""
12810
12875
"merge_request_body\n"
12811
12876
"~~~~~~~~~~~~~~~~~~"
12812
12877
msgstr ""
12813
12878
12814
#: en/help_topics/hooks.txt:345
12879
#: en/help_topics/hooks.txt:348
12815
12880
msgid "Introduced in: 1.15.0"
12816
12881
msgstr ""
12817
12882
12818
#: en/help_topics/hooks.txt:347
12883
#: en/help_topics/hooks.txt:350
12819
12884
msgid ""
12820
12885
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12821
12886
"request. Callbacks must return a body. If more than one callback is\n"
12822
12887
"registered, the output of one callback is provided to the next."
12823
12888
msgstr ""
12824
12889
12825
#: en/help_topics/hooks.txt:351
12890
#: en/help_topics/hooks.txt:354
12826
12891
msgid ""
12827
12892
"MessageEditorHooks\n"
12828
12893
"------------------"
12829
12894
msgstr ""
12830
12895
12831
#: en/help_topics/hooks.txt:354
12896
#: en/help_topics/hooks.txt:357
12832
12897
msgid ""
12833
12898
"commit_message_template\n"
12834
12899
"~~~~~~~~~~~~~~~~~~~~~~~"
12835
12900
msgstr ""
12836
12901
12837
#: en/help_topics/hooks.txt:357
12902
#: en/help_topics/hooks.txt:360
12838
12903
msgid "Introduced in: 1.10"
12839
12904
msgstr ""
12840
12905
12841
#: en/help_topics/hooks.txt:359
12906
#: en/help_topics/hooks.txt:362
12842
12907
msgid ""
12843
12908
"Called when a commit message is being generated.\n"
12844
12909
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12849
12914
"second, and so on."
12850
12915
msgstr ""
12851
12916
12852
#: en/help_topics/hooks.txt:367
12917
#: en/help_topics/hooks.txt:370
12853
12918
msgid ""
12854
12919
"set_commit_message\n"
12855
12920
"~~~~~~~~~~~~~~~~~~"
12856
12921
msgstr ""
12857
12922
12858
#: en/help_topics/hooks.txt:372
12923
#: en/help_topics/hooks.txt:375
12859
12924
msgid ""
12860
12925
"Set a fixed commit message. set_commit_message is called with the\n"
12861
12926
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12864
12929
"should use the message editor as normal."
12865
12930
msgstr ""
12866
12931
12867
#: en/help_topics/hooks.txt:378
12932
#: en/help_topics/hooks.txt:381
12868
12933
msgid ""
12869
12934
"MutableTreeHooks\n"
12870
12935
"----------------"
12871
12936
msgstr ""
12872
12937
12873
#: en/help_topics/hooks.txt:381
12938
#: en/help_topics/hooks.txt:384
12874
12939
msgid ""
12875
12940
"post_build_tree\n"
12876
12941
"~~~~~~~~~~~~~~~"
12877
12942
msgstr ""
12878
12943
12879
#: en/help_topics/hooks.txt:386
12944
#: en/help_topics/hooks.txt:389
12880
12945
msgid ""
12881
12946
"Called after a completely new tree is built. The hook is called with\n"
12882
12947
"the tree as its only argument."
12883
12948
msgstr ""
12884
12949
12885
#: en/help_topics/hooks.txt:392
12950
#: en/help_topics/hooks.txt:395
12886
12951
msgid "Introduced in: 2.0"
12887
12952
msgstr ""
12888
12953
12889
#: en/help_topics/hooks.txt:394
12954
#: en/help_topics/hooks.txt:397
12890
12955
msgid ""
12891
12956
"Called after a commit is performed on a tree. The hook is called with\n"
12892
12957
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12894
12959
"that object."
12895
12960
msgstr ""
12896
12961
12897
#: en/help_topics/hooks.txt:399
12962
#: en/help_topics/hooks.txt:402
12898
12963
msgid ""
12899
12964
"post_transform\n"
12900
12965
"~~~~~~~~~~~~~~"
12901
12966
msgstr ""
12902
12967
12903
#: en/help_topics/hooks.txt:404
12968
#: en/help_topics/hooks.txt:407
12904
12969
msgid ""
12905
12970
"Called after a tree transform has been performed on a tree. The hook\n"
12906
12971
"is called with the tree that is being transformed and the transform."
12907
12972
msgstr ""
12908
12973
12909
#: en/help_topics/hooks.txt:407
12974
#: en/help_topics/hooks.txt:410
12910
12975
msgid ""
12911
12976
"pre_transform\n"
12912
12977
"~~~~~~~~~~~~~"
12913
12978
msgstr ""
12914
12979
12915
#: en/help_topics/hooks.txt:412
12980
#: en/help_topics/hooks.txt:415
12916
12981
msgid ""
12917
12982
"Called before a tree transform on this tree. The hook is called with\n"
12918
12983
"the tree that is being transformed and the transform."
12919
12984
msgstr ""
12920
12985
12921
#: en/help_topics/hooks.txt:415
12986
#: en/help_topics/hooks.txt:418
12922
12987
msgid ""
12923
12988
"start_commit\n"
12924
12989
"~~~~~~~~~~~~"
12925
12990
msgstr ""
12926
12991
12927
#: en/help_topics/hooks.txt:420
12992
#: en/help_topics/hooks.txt:423
12928
12993
msgid ""
12929
12994
"Called before a commit is performed on a tree. The start commit hook\n"
12930
12995
"is able to change the tree before the commit takes place. start_commit\n"
12932
12997
"being performed on."
12933
12998
msgstr ""
12934
12999
12935
#: en/help_topics/hooks.txt:425
13000
#: en/help_topics/hooks.txt:428
12936
13001
msgid ""
12937
13002
"SmartClientHooks\n"
12938
13003
"----------------"
12939
13004
msgstr ""
12940
13005
12941
#: en/help_topics/hooks.txt:428
13006
#: en/help_topics/hooks.txt:431
12942
13007
msgid ""
12943
13008
"call\n"
12944
13009
"~~~~"
12945
13010
msgstr ""
12946
13011
12947
#: en/help_topics/hooks.txt:431
13012
#: en/help_topics/hooks.txt:434
12948
13013
msgid "Introduced in: unknown"
12949
13014
msgstr ""
12950
13015
12951
#: en/help_topics/hooks.txt:433
13016
#: en/help_topics/hooks.txt:436
12952
13017
msgid ""
12953
13018
"Called when the smart client is submitting a request to the smart\n"
12954
13019
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12955
13020
"Streaming request bodies, and responses, are not accessible."
12956
13021
msgstr ""
12957
13022
12958
#: en/help_topics/hooks.txt:437
13023
#: en/help_topics/hooks.txt:440
12959
13024
msgid ""
12960
13025
"SmartServerHooks\n"
12961
13026
"----------------"
12962
13027
msgstr ""
12963
13028
12964
#: en/help_topics/hooks.txt:440
13029
#: en/help_topics/hooks.txt:443
12965
13030
msgid ""
12966
13031
"server_exception\n"
12967
13032
"~~~~~~~~~~~~~~~~"
12968
13033
msgstr ""
12969
13034
12970
#: en/help_topics/hooks.txt:445
13035
#: en/help_topics/hooks.txt:448
12971
13036
msgid ""
12972
13037
"Called by the bzr server when an exception occurs. server_exception is\n"
12973
13038
"called with the sys.exc_info() tuple return true for the hook if the\n"
12975
13040
"normally."
12976
13041
msgstr ""
12977
13042
12978
#: en/help_topics/hooks.txt:450
13043
#: en/help_topics/hooks.txt:453
12979
13044
msgid ""
12980
13045
"server_started\n"
12981
13046
"~~~~~~~~~~~~~~"
12982
13047
msgstr ""
12983
13048
12984
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
13049
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12985
13050
msgid "Introduced in: 0.16"
12986
13051
msgstr ""
12987
13052
12988
#: en/help_topics/hooks.txt:455
13053
#: en/help_topics/hooks.txt:458
12989
13054
msgid ""
12990
13055
"Called by the bzr server when it starts serving a directory.\n"
12991
13056
"server_started is called with (backing urls, public url), where\n"
12994
13059
"served."
12995
13060
msgstr ""
12996
13061
12997
#: en/help_topics/hooks.txt:461
13062
#: en/help_topics/hooks.txt:464
12998
13063
msgid ""
12999
13064
"server_started_ex\n"
13000
13065
"~~~~~~~~~~~~~~~~~"
13001
13066
msgstr ""
13002
13067
13003
#: en/help_topics/hooks.txt:466
13068
#: en/help_topics/hooks.txt:469
13004
13069
msgid ""
13005
13070
"Called by the bzr server when it starts serving a directory.\n"
13006
13071
"server_started is called with (backing_urls, server_obj)."
13007
13072
msgstr ""
13008
13073
13009
#: en/help_topics/hooks.txt:469
13074
#: en/help_topics/hooks.txt:472
13010
13075
msgid ""
13011
13076
"server_stopped\n"
13012
13077
"~~~~~~~~~~~~~~"
13013
13078
msgstr ""
13014
13079
13015
#: en/help_topics/hooks.txt:474
13080
#: en/help_topics/hooks.txt:477
13016
13081
msgid ""
13017
13082
"Called by the bzr server when it stops serving a directory.\n"
13018
13083
"server_stopped is called with the same parameters as the\n"
13019
13084
"server_started hook: (backing_urls, public_url)."
13020
13085
msgstr ""
13021
13086
13022
#: en/help_topics/hooks.txt:478
13087
#: en/help_topics/hooks.txt:481
13023
13088
msgid ""
13024
13089
"StatusHooks\n"
13025
13090
"-----------"
13026
13091
msgstr ""
13027
13092
13028
#: en/help_topics/hooks.txt:481
13093
#: en/help_topics/hooks.txt:484
13029
13094
msgid ""
13030
13095
"post_status\n"
13031
13096
"~~~~~~~~~~~"
13032
13097
msgstr ""
13033
13098
13034
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
13099
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
13035
13100
msgid "Introduced in: 2.3"
13036
13101
msgstr ""
13037
13102
13038
#: en/help_topics/hooks.txt:486
13103
#: en/help_topics/hooks.txt:489
13039
13104
msgid ""
13040
13105
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13041
13106
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13044
13109
"status command. to_file is the output stream for writing."
13045
13110
msgstr ""
13046
13111
13047
#: en/help_topics/hooks.txt:492
13112
#: en/help_topics/hooks.txt:495
13048
13113
msgid ""
13049
13114
"pre_status\n"
13050
13115
"~~~~~~~~~~"
13051
13116
msgstr ""
13052
13117
13053
#: en/help_topics/hooks.txt:497
13118
#: en/help_topics/hooks.txt:500
13054
13119
msgid ""
13055
13120
"Called with argument StatusHookParams before Bazaar displays the\n"
13056
13121
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13059
13124
"status command. to_file is the output stream for writing."
13060
13125
msgstr ""
13061
13126
13062
#: en/help_topics/hooks.txt:503
13127
#: en/help_topics/hooks.txt:506
13063
13128
msgid ""
13064
13129
"TransportHooks\n"
13065
13130
"--------------"
13066
13131
msgstr ""
13067
13132
13068
#: en/help_topics/hooks.txt:506
13133
#: en/help_topics/hooks.txt:509
13069
13134
msgid ""
13070
13135
"post_connect\n"
13071
13136
"~~~~~~~~~~~~"
13072
13137
msgstr ""
13073
13138
13074
#: en/help_topics/hooks.txt:511
13139
#: en/help_topics/hooks.txt:514
13075
13140
msgid ""
13076
13141
"Called after a new connection is established or a reconnect occurs.\n"
13077
13142
"The sole argument passed is either the connected transport or smart\n"
13078
13143
"medium instance."
13079
13144
msgstr ""
13080
13145
13081
#: en/help_topics/hooks.txt:515
13146
#: en/help_topics/hooks.txt:518
13082
13147
msgid ""
13083
13148
"RioVersionInfoBuilderHooks\n"
13084
13149
"--------------------------"
13085
13150
msgstr ""
13086
13151
13087
#: en/help_topics/hooks.txt:518
13152
#: en/help_topics/hooks.txt:521
13088
13153
msgid ""
13089
13154
"revision\n"
13090
13155
"~~~~~~~~"
13091
13156
msgstr ""
13092
13157
13093
#: en/help_topics/hooks.txt:523
13158
#: en/help_topics/hooks.txt:526
13094
13159
msgid ""
13095
13160
"Invoked when adding information about a revision to the RIO stanza\n"
13096
13161
"that is printed. revision is called with a revision object and a RIO\n"
13862
13927
"Many commands that accept URLs also accept location aliases too.\n"
13863
13928
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13864
13929
msgstr ""
13930
13931
#~ msgid ""
13932
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
13933
#~ "delete them if they can easily be recovered using revert otherwise they\n"
13934
#~ "will be backed up (adding an extention of the form .~#~). If no options or\n"
13935
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
13936
#~ "Bazaar but missing in your tree and stop tracking them for you."
13937
#~ msgstr ""
13938
#~ "Прекращает отслеживание изменений в указанных файлах. Bazaar удалит их,\n"
13939
#~ "если их можно легко восстановить с помощью revert, иначе будут созданы\n"
13940
#~ "их резервные копии (с расширением вида .~#~). Если не указано ни опций,\n"
13941
#~ "ни параметров, Bazaar найдёт файлы, которые отслеживаются, но отсутствуют\n"
13942
#~ "в рабочем дереве и прекратит их отслеживать."
Loggerhead is a web-based interface for Breezy
Version: 2.0.1