« back to all changes in this revision
Viewing changes to po/ru.po
- browse files at revision 6517.1.6
- compare with another revision
- download diff
- download tarball
- view history from revision 6517.1.6
- Committer: Jelmer Vernooij
- Date: 2012-07-06 17:06:02 UTC
- mto: This revision was merged to the branch mainline in revision 6535.
- Revision ID: jelmer@samba.org-20120706170602-1r5m1una9oucwvah
Fix remaining tests.
- 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) 2011 Rosetta Contributors and Canonical Ltd 2011
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
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-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2013-04-08 07:57+0000\n"
12
"Last-Translator: Артём Воротников <Unknown>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
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: 2013-04-09 04:32+0000\n"
20
"X-Generator: Launchpad (build 16550)\n"
19
"X-Launchpad-Export-Date: 2012-02-04 06:20+0000\n"
20
"X-Generator: Launchpad (build 14738)\n"
21
21
22
#: bzrlib/add.py:93
22
#: bzrlib/add.py:95
23
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
24
24
msgstr "пропуск {0} (более, чем {1} из {2} байт)"
25
25
26
#: bzrlib/branch.py:854
26
#: bzrlib/branch.py:872
27
27
msgid "Unstacking"
28
28
msgstr "Извлечение из стека"
29
29
30
#: bzrlib/branch.py:2955
30
#: bzrlib/branch.py:3205
31
31
#, python-format
32
32
msgid "Pushed up to revision %d."
33
33
msgstr "Отправлено до ревизии %d включительно."
34
34
35
#: bzrlib/branch.py:2957
35
#: bzrlib/branch.py:3207
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:2960
43
#: bzrlib/branch.py:3210
44
44
msgid "No new revisions or tags to push."
45
45
msgstr "Нет новых ревизий или тегов для отправки."
46
46
47
#: bzrlib/branch.py:2962
47
#: bzrlib/branch.py:3212
48
48
msgid "No new revisions to push."
49
49
msgstr "Нет новых ревизий для отправки."
50
50
51
#: bzrlib/branch.py:2982
51
#: bzrlib/branch.py:3232
52
52
msgid "checked branch {0} format {1}"
53
53
msgstr "проверена ветвь {0} формата {1}"
54
54
55
#: bzrlib/branch.py:2985
55
#: bzrlib/branch.py:3235
56
56
#, python-format
57
57
msgid "found error:%s"
58
58
msgstr "обнаружена ошибка:%s"
59
59
60
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
60
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
61
61
#, python-format
62
62
msgid "Ignoring files outside view. View is %s"
63
63
msgstr "Игнорируются файлы вне окна просмотра. Окно просмотра: %s"
64
64
65
#: bzrlib/builtins.py:260
65
#: bzrlib/builtins.py:218
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:315
70
#: bzrlib/builtins.py:303
71
71
msgid "Display status summary."
72
72
msgstr "Отобразить краткое описание состояния."
73
73
74
#: bzrlib/builtins.py:317
74
#: bzrlib/builtins.py:305
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:320
82
#: bzrlib/builtins.py:308
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:323
91
#: bzrlib/builtins.py:311
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:327
101
#: bzrlib/builtins.py:315
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:332
113
#: bzrlib/builtins.py:320
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:335
121
#: bzrlib/builtins.py:323
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:338
129
#: bzrlib/builtins.py:326
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:341
137
#: bzrlib/builtins.py:329
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:346
149
#: bzrlib/builtins.py:334
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:349
157
#: bzrlib/builtins.py:337
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:353
167
#: bzrlib/builtins.py:341
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:358
179
#: bzrlib/builtins.py:346
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:363
191
#: bzrlib/builtins.py:351
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:366
199
#: bzrlib/builtins.py:354
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:375
209
#: bzrlib/builtins.py:363
210
210
msgid "Use short status indicators."
211
211
msgstr "Использовать короткие статусные пометки."
212
212
213
#: bzrlib/builtins.py:377
213
#: bzrlib/builtins.py:365
214
214
msgid "Only show versioned files."
215
215
msgstr "Показывать только файлы, имеющие версию."
216
216
217
#: bzrlib/builtins.py:379
217
#: bzrlib/builtins.py:367
218
218
msgid "Don't show pending merges."
219
219
msgstr "Не показывать необработанные слияния."
220
220
221
#: bzrlib/builtins.py:382
221
#: bzrlib/builtins.py:370
222
222
msgid "Do not mark object type using indicator."
223
223
msgstr "Не помечать типы объектов суффиксами."
224
224
225
#: bzrlib/builtins.py:397
225
#: bzrlib/builtins.py:385
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:441 bzrlib/builtins.py:5230
230
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
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:444 bzrlib/builtins.py:5232
234
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
235
235
msgid "You must supply either --revision or a revision_id"
236
236
msgstr "Вы должны предоставить --revision или revision_id"
237
237
238
#: bzrlib/builtins.py:451
238
#: bzrlib/builtins.py:439
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:462
243
#: bzrlib/builtins.py:450
244
244
msgid "The repository {0} contains no revision {1}."
245
245
msgstr "Репозиторий {0} не содержит ревизии {1}."
246
246
247
#: bzrlib/builtins.py:469
247
#: bzrlib/builtins.py:457
248
248
msgid "You cannot specify a NULL revision."
249
249
msgstr "Вы не можете указать ревизию NULL."
250
250
251
#: bzrlib/builtins.py:561
251
#: bzrlib/builtins.py:549
252
252
msgid "Remove the working tree from a given branch/checkout."
253
253
msgstr "Удалить рабочее дерево из данной ветви или рабочей копии."
254
254
255
#: bzrlib/builtins.py:563
255
#: bzrlib/builtins.py:551
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:566
263
#: bzrlib/builtins.py:554
264
264
msgid "To re-create the working tree, use \"bzr checkout\"."
265
265
msgstr "Чтобы воссоздать рабочее дерево, используйте «bzr checkout»."
266
266
267
#: bzrlib/builtins.py:572
267
#: bzrlib/builtins.py:560
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:586
274
#: bzrlib/builtins.py:574
275
275
msgid "No working tree to remove"
276
276
msgstr "Нет рабочего дерева для удаления"
277
277
278
#: bzrlib/builtins.py:588
278
#: bzrlib/builtins.py:576
279
279
msgid "You cannot remove the working tree of a remote path"
280
280
msgstr "Вы не можете удалить внешнее рабочее дерево"
281
281
282
#: bzrlib/builtins.py:597
282
#: bzrlib/builtins.py:585
283
283
msgid "You cannot remove the working tree from a lightweight checkout"
284
284
msgstr "Вы не можете удалить рабочее дерево из легковесной рабочей копии"
285
285
286
#: bzrlib/builtins.py:637
286
#: bzrlib/builtins.py:625
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:648
294
#: bzrlib/builtins.py:636
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:652
302
#: bzrlib/builtins.py:640
303
303
msgid "failed to reset the tree state{0}"
304
304
msgstr "не удалось сбросить состояние дерева {0}"
305
305
306
#: bzrlib/builtins.py:656
306
#: bzrlib/builtins.py:644
307
307
msgid "Show current revision number."
308
308
msgstr "Показать номер текущей ревизии."
309
309
310
#: bzrlib/builtins.py:658
310
#: bzrlib/builtins.py:646
311
311
msgid "This is equal to the number of revisions on this branch."
312
312
msgstr "Это эквивалентно числу ревизий в этой ветви."
313
313
314
#: bzrlib/builtins.py:671
314
#: bzrlib/builtins.py:659
315
315
msgid "--tree and --revision can not be used together"
316
316
msgstr "--tree и --revision не могут использоваться вместе"
317
317
318
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
318
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
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:712
322
#: bzrlib/builtins.py:700
323
323
msgid "Show revno of working tree."
324
324
msgstr "Показать номер ревизии рабочего дерева."
325
325
326
#: bzrlib/builtins.py:760
326
#: bzrlib/builtins.py:748
327
327
msgid "Add specified files or directories."
328
328
msgstr "Добавить указанные файлы или директории."
329
329
330
#: bzrlib/builtins.py:762
330
#: bzrlib/builtins.py:750
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:766
341
#: bzrlib/builtins.py:754
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:774
360
#: bzrlib/builtins.py:762
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:777
368
#: bzrlib/builtins.py:765
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:780
376
#: bzrlib/builtins.py:768
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:785
388
#: bzrlib/builtins.py:773
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:788
396
#: bzrlib/builtins.py:776
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:796
416
#: bzrlib/builtins.py:784
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:799
424
#: bzrlib/builtins.py:787
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:806
434
#: bzrlib/builtins.py:794
435
435
msgid "Don't recursively add the contents of directories."
436
436
msgstr "Не добавлять содержимое директорий рекурсивно."
437
437
438
#: bzrlib/builtins.py:813
438
#: bzrlib/builtins.py:800
439
439
msgid "Lookup file ids from this tree."
440
440
msgstr "Искать идентификаторы в этом дереве."
441
441
442
#: bzrlib/builtins.py:849
442
#: bzrlib/builtins.py:836
443
443
msgid "ignored {0} matching \"{1}\"\n"
444
444
msgstr "пропуск {0} из-за условия «{1}»\n"
445
445
446
#: bzrlib/builtins.py:854
446
#: bzrlib/builtins.py:841
447
447
msgid "Create a new versioned directory."
448
448
msgstr "Создать новую директорию в системе версий."
449
449
450
#: bzrlib/builtins.py:856
450
#: bzrlib/builtins.py:843
451
451
msgid "This is equivalent to creating the directory and then adding it."
452
452
msgstr "Это эквивалентно созданию директории и её добавлению."
453
453
454
#: bzrlib/builtins.py:863
454
#: bzrlib/builtins.py:850
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:897
460
#: bzrlib/builtins.py:884
461
461
#, python-format
462
462
msgid "added %s\n"
463
463
msgstr "добавлен %s\n"
464
464
465
#: bzrlib/builtins.py:939
465
#: bzrlib/builtins.py:926
466
466
#, python-format
467
467
msgid "invalid kind %r specified"
468
468
msgstr "указан неизвестный вид %r"
469
469
470
#: bzrlib/builtins.py:976
470
#: bzrlib/builtins.py:963
471
471
msgid "Move or rename a file."
472
472
msgstr "Переместить или переименовать файл."
473
473
474
#: bzrlib/builtins.py:978
474
#: bzrlib/builtins.py:965
475
475
msgid " bzr mv SOURCE... DESTINATION"
476
476
msgstr " bzr mv ИСТОЧНИК... НАЗНАЧЕНИЕ"
477
477
478
#: bzrlib/builtins.py:980
478
#: bzrlib/builtins.py:967
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:984
488
#: bzrlib/builtins.py:971
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:990
502
#: bzrlib/builtins.py:977
503
503
msgid "Files cannot be moved between branches."
504
504
msgstr "Файлы нельзя перемещать между ветвями."
505
505
506
#: bzrlib/builtins.py:997
506
#: bzrlib/builtins.py:984
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:999
514
#: bzrlib/builtins.py:986
515
515
msgid "Automatically guess renames."
516
516
msgstr "Автоматически предполагать переименования."
517
517
518
#: bzrlib/builtins.py:1000
518
#: bzrlib/builtins.py:987
519
519
msgid "Avoid making changes when guessing renames."
520
520
msgstr "Избегать изменений при угадывании переименований."
521
521
522
#: bzrlib/builtins.py:1009
522
#: bzrlib/builtins.py:996
523
523
msgid "--dry-run requires --auto."
524
524
msgstr "--dry-run требует --auto."
525
525
526
#: bzrlib/builtins.py:1013
526
#: bzrlib/builtins.py:1000
527
527
msgid "missing file argument"
528
528
msgstr "отсутствует аргумент файл"
529
529
530
#: bzrlib/builtins.py:1017
530
#: bzrlib/builtins.py:1004
531
531
msgid "can not move root of branch"
532
532
msgstr "нельзя переместить корень ветви"
533
533
534
#: bzrlib/builtins.py:1023
534
#: bzrlib/builtins.py:1010
535
535
msgid "Only one path may be specified to --auto."
536
536
msgstr "Только один путь может быть указан, как аргумент --auto."
537
537
538
#: bzrlib/builtins.py:1026
538
#: bzrlib/builtins.py:1013
539
539
msgid "--after cannot be specified with --auto."
540
540
msgstr "--after не может использоваться вместе с --auto."
541
541
542
#: bzrlib/builtins.py:1062
542
#: bzrlib/builtins.py:1050
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:1114
548
#: bzrlib/builtins.py:1102
549
549
msgid "Turn this branch into a mirror of another branch."
550
550
msgstr "Преобразовать эту ветвь в зеркало другой ветви."
551
551
552
#: bzrlib/builtins.py:1116
552
#: bzrlib/builtins.py:1104
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:1121
563
#: bzrlib/builtins.py:1109
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:1125
573
#: bzrlib/builtins.py:1113
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:1129
583
#: bzrlib/builtins.py:1117
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:1134
597
#: bzrlib/builtins.py:1122
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:1138
607
#: bzrlib/builtins.py:1126
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:1146
616
#: bzrlib/builtins.py:1134
617
617
msgid "Show logs of pulled revisions."
618
618
msgstr "Показать журналы принятых ревизий."
619
619
620
#: bzrlib/builtins.py:1148
620
#: bzrlib/builtins.py:1136
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:1151
626
#: bzrlib/builtins.py:1139
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:1189
634
#: bzrlib/builtins.py:1168
635
635
msgid "Need working tree for --show-base."
636
636
msgstr "Для --show-base необходимо рабочее дерево."
637
637
638
#: bzrlib/builtins.py:1205
638
#: bzrlib/builtins.py:1184
639
639
msgid "No pull location known or specified."
640
640
msgstr "Местоположение для приёма неизвестно и не указано."
641
641
642
#: bzrlib/builtins.py:1211
642
#: bzrlib/builtins.py:1190
643
643
#, python-format
644
644
msgid "Using saved parent location: %s\n"
645
645
msgstr "Используется сохранённое местоположение родителя: %s\n"
646
646
647
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
647
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
648
648
msgid "Cannot use -r with merge directives or bundles"
649
649
msgstr "Нельзя использовать -r с директивами слияния или пакетами"
650
650
651
#: bzrlib/builtins.py:1261
651
#: bzrlib/builtins.py:1238
652
652
msgid "Update a mirror of this branch."
653
653
msgstr "Обновить зеркало этой ветви."
654
654
655
#: bzrlib/builtins.py:1263
655
#: bzrlib/builtins.py:1240
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:1266
663
#: bzrlib/builtins.py:1243
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:1269
671
#: bzrlib/builtins.py:1246
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:1273
682
#: bzrlib/builtins.py:1250
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:1276
691
#: bzrlib/builtins.py:1253
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:1280
702
#: bzrlib/builtins.py:1257
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:1285
716
#: bzrlib/builtins.py:1262
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:1296 bzrlib/foreign.py:272
726
#: bzrlib/builtins.py:1273 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:1299
731
#: bzrlib/builtins.py:1276
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:1304
740
#: bzrlib/builtins.py:1281
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:1307
748
#: bzrlib/builtins.py:1284
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:1312 bzrlib/foreign.py:279
758
#: bzrlib/builtins.py:1289 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:1315
766
#: bzrlib/builtins.py:1292
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:1318
772
msgid "Overwrite tags only."
773
msgstr "Переписать только теги."
774
775
#: bzrlib/builtins.py:1369
771
#: bzrlib/builtins.py:1336
776
772
msgid "Could not determine branch to refer to."
777
773
msgstr "Не удалось определить ветвь, на которую нужно ссылаться."
778
774
779
#: bzrlib/builtins.py:1378
775
#: bzrlib/builtins.py:1345
780
776
#, python-format
781
777
msgid ""
782
778
"No push location known or specified. To push to the parent branch (at %s), "
783
779
"use 'bzr push :parent'."
784
780
msgstr ""
785
"Не указано местоположение отправки. Чтобы отправить в родительскую ветвь (на "
786
"%s) используйте 'bzr push :parent'."
787
781
788
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
782
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
789
783
msgid "No push location known or specified."
790
784
msgstr "Местоположение для отсылки изменений неизвестно и не указано."
791
785
792
#: bzrlib/builtins.py:1388
786
#: bzrlib/builtins.py:1355
793
787
#, python-format
794
788
msgid "Using saved push location: %s"
795
789
msgstr "Используется сохранённое местоположение отсылки: %s"
796
790
797
#: bzrlib/builtins.py:1398
791
#: bzrlib/builtins.py:1365
798
792
msgid "Create a new branch that is a copy of an existing branch."
799
793
msgstr "Создать новую ветвь, являющуюся копией существующей ветви."
800
794
801
#: bzrlib/builtins.py:1400
795
#: bzrlib/builtins.py:1367
802
796
msgid ""
803
797
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
804
798
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
814
808
"из FROM_LOCATION удалением префикса. Например «branch lp:foo-bar»\n"
815
809
"попытается создать ./foo-bar."
816
810
817
#: bzrlib/builtins.py:1407
811
#: bzrlib/builtins.py:1374
818
812
msgid ""
819
813
"To retrieve the branch as of a particular revision, supply the --revision\n"
820
814
"parameter, as in \"branch foo/bar -r 5\"."
822
816
"Чтобы получить определённую ревизию ветви, передайте её в параметре\n"
823
817
"--revision, напр. «branch foo/bar -r 5»."
824
818
825
#: bzrlib/builtins.py:1410
819
#: bzrlib/builtins.py:1377
826
820
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
827
821
msgstr "Синонимы 'clone' и 'get' для этой команды устарели."
828
822
829
#: bzrlib/builtins.py:1420
823
#: bzrlib/builtins.py:1387
830
824
msgid "Create a branch without a working-tree."
831
825
msgstr "Создать ветвь без рабочего дерева."
832
826
833
#: bzrlib/builtins.py:1422
827
#: bzrlib/builtins.py:1389
834
828
msgid "Switch the checkout in the current directory to the new branch."
835
829
msgstr "Заменить рабочую копию в текущей директории новой ветвью."
836
830
837
#: bzrlib/builtins.py:1425
831
#: bzrlib/builtins.py:1392
838
832
msgid ""
839
833
"Create a stacked branch referring to the source branch. The new branch will "
840
834
"depend on the availability of the source branch for all operations."
842
836
"Создать стековую ветвь, ссылающуюся на исходную ветвь. Все операции над "
843
837
"новой ветвью будут зависеть от доступности старой ветви."
844
838
845
#: bzrlib/builtins.py:1429
839
#: bzrlib/builtins.py:1396
846
840
msgid "Do not use a shared repository, even if available."
847
841
msgstr "Не использовать общий репозиторий, даже если доступен."
848
842
849
#: bzrlib/builtins.py:1431
843
#: bzrlib/builtins.py:1398
850
844
msgid ""
851
845
"By default branch will fail if the target directory exists, but does not "
852
846
"already have a control directory. This flag will allow branch to proceed."
855
849
"существует, но не содержит управляющих метаданных. Этот флаг позволит branch "
856
850
"продолжаться."
857
851
858
#: bzrlib/builtins.py:1436
852
#: bzrlib/builtins.py:1403
859
853
msgid "Bind new branch to from location."
860
854
msgstr "Связать новую ветвь с FROM_LOCATION"
861
855
862
#: bzrlib/builtins.py:1483
856
#: bzrlib/builtins.py:1450
863
857
#, python-format
864
858
msgid "Target directory \"%s\" already exists."
865
859
msgstr "Целевая директория «%s» уже существует."
866
860
867
#: bzrlib/builtins.py:1495
861
#: bzrlib/builtins.py:1462
868
862
#, python-format
869
863
msgid "Parent of \"%s\" does not exist."
870
864
msgstr "Родитель «%s» не существует."
871
865
872
#: bzrlib/builtins.py:1514
866
#: bzrlib/builtins.py:1481
873
867
msgid "The branch {0} has no revision {1}."
874
868
msgstr "В ветви {0} отсутствует ревизия {1}."
875
869
876
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
870
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
877
871
#, python-format
878
872
msgid "Created new stacked branch referring to %s."
879
873
msgstr "Создана новая стековая ветвь, ссылающаяся на %s."
880
874
881
#: bzrlib/builtins.py:1533
875
#: bzrlib/builtins.py:1500
882
876
#, python-format
883
877
msgid "Branched %d revision."
884
878
msgid_plural "Branched %d revisions."
886
880
msgstr[1] "Ответвлены %d ревизии."
887
881
msgstr[2] "Ответвлены %d ревизий."
888
882
889
#: bzrlib/builtins.py:1538
883
#: bzrlib/builtins.py:1505
890
884
#, python-format
891
885
msgid "New branch bound to %s"
892
886
msgstr "Новая ветвь, связанная с %s"
893
887
894
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
888
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
895
889
#, python-format
896
890
msgid "Switched to branch: %s"
897
891
msgstr "Переключение на ветвь: %s"
898
892
899
#: bzrlib/builtins.py:1548
893
#: bzrlib/builtins.py:1515
900
894
msgid "List the branches available at the current location."
901
895
msgstr "Вывести список ветвей, доступных в текущем местоположении."
902
896
903
#: bzrlib/builtins.py:1550
897
#: bzrlib/builtins.py:1517
904
898
msgid ""
905
899
"This command will print the names of all the branches at the current\n"
906
900
"location."
907
901
msgstr "Эта команда выведет имена всех ветвей в текущем местоположении."
908
902
909
#: bzrlib/builtins.py:1557
903
#: bzrlib/builtins.py:1524
910
904
msgid ""
911
905
"Recursively scan for branches rather than just looking in the specified "
912
906
"location."
913
907
msgstr ""
914
908
"Рекурсивно сканировать ветви, а не смотреть в указанном местоположении."
915
909
916
#: bzrlib/builtins.py:1586
910
#: bzrlib/builtins.py:1554
917
911
msgid "(default)"
918
912
msgstr "(по умолчанию)"
919
913
920
#: bzrlib/builtins.py:1598
914
#: bzrlib/builtins.py:1566
921
915
msgid "Create a new checkout of an existing branch."
922
916
msgstr "Создать новую рабочую копию текущей ветви."
923
917
924
#: bzrlib/builtins.py:1600
918
#: bzrlib/builtins.py:1568
925
919
msgid ""
926
920
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
927
921
"for\n"
934
928
"для ветви, найденной в '.'. Это полезно, если вы удалили рабочее дерево,\n"
935
929
"или если вы никогда не создавали его."
936
930
937
#: bzrlib/builtins.py:1605
931
#: bzrlib/builtins.py:1573
938
932
msgid ""
939
933
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
940
934
"will\n"
951
945
"то TO_LOCATION определется из BRANCH_LOCATION удалением префикса.\n"
952
946
"Например «checkout lp:foo-bar» попытается создать ./foo-bar."
953
947
954
#: bzrlib/builtins.py:1612
948
#: bzrlib/builtins.py:1580
955
949
msgid ""
956
950
"To retrieve the branch as of a particular revision, supply the --revision\n"
957
951
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
965
959
"просрочено [так что в не сможете закрепить изменения], но это может быть\n"
966
960
"полезно, к примеру, для просмотра старого кода."
967
961
968
#: bzrlib/builtins.py:1622
962
#: bzrlib/builtins.py:1590
969
963
msgid ""
970
964
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
971
965
"the branch for every operation. Normal checkouts can perform common "
977
971
"производить стандартные операции, как diff и status, без такого доступа, а "
978
972
"также поддерживают локальные закрепления."
979
973
980
#: bzrlib/builtins.py:1629
974
#: bzrlib/builtins.py:1597
981
975
msgid "Get file contents from this tree."
982
976
msgstr "Получить содержимое файла из этого дерева."
983
977
984
#: bzrlib/builtins.py:1631
978
#: bzrlib/builtins.py:1599
985
979
msgid "Hard-link working tree files where possible."
986
980
msgstr "Использовать жёсткие ссылки в рабочем дереве, когда это возможно."
987
981
988
#: bzrlib/builtins.py:1672
982
#: bzrlib/builtins.py:1640
989
983
msgid ""
990
984
"Show list of renamed files.\n"
991
985
" "
993
987
"Показать список переименованных файлов.\n"
994
988
" "
995
989
996
#: bzrlib/builtins.py:1700
990
#: bzrlib/builtins.py:1670
997
991
msgid "Update a working tree to a new revision."
998
992
msgstr "Обновить рабочее дерево до новой ревизии."
999
993
1000
#: bzrlib/builtins.py:1702
994
#: bzrlib/builtins.py:1672
1001
995
msgid ""
1002
996
"This will perform a merge of the destination revision (the tip of the\n"
1003
997
"branch, or the specified revision) into the working tree, and then make\n"
1004
998
"that revision the basis revision for the working tree. "
1005
999
msgstr ""
1006
1000
1007
#: bzrlib/builtins.py:1706
1001
#: bzrlib/builtins.py:1676
1008
1002
msgid ""
1009
1003
"You can use this to visit an older revision, or to update a working tree\n"
1010
1004
"that is out of date from its branch."
1011
1005
msgstr ""
1012
"Вы можете использовать это для того, чтобы увидеть старые ревизии или "
1013
"обновить рабочее дерево, которое устарело по отношению к своей ветке."
1014
1006
1015
#: bzrlib/builtins.py:1709
1007
#: bzrlib/builtins.py:1679
1016
1008
msgid ""
1017
1009
"If there are any uncommitted changes in the tree, they will be carried\n"
1018
1010
"across and remain as uncommitted changes after the update. To discard\n"
1019
1011
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
1020
1012
"with the changes brought in by the change in basis revision."
1021
1013
msgstr ""
1022
"При наличии не подтверждённых изменений в рабочем дереве,они будут "
1023
"осуществлены и оставлены как неподтвержденные после обновления. Чтобы "
1024
"отменить эти изменения используйте 'bzr revert'. Не подтверждённые изменения "
1025
"могут конфликтовать с изменениями, вызванными обновлением."
1026
1014
1027
#: bzrlib/builtins.py:1714
1015
#: bzrlib/builtins.py:1684
1028
1016
msgid ""
1029
1017
"If the tree's branch is bound to a master branch, bzr will also update\n"
1030
1018
"the branch from the master."
1031
1019
msgstr ""
1032
1020
1033
#: bzrlib/builtins.py:1717
1021
#: bzrlib/builtins.py:1687
1034
1022
msgid ""
1035
1023
"You cannot update just a single file or directory, because each Bazaar\n"
1036
1024
"working tree has just a single basis revision. If you want to restore a\n"
1047
1035
"или используйте 'bzr cat', чтобы записать старое содержимое этого файла\n"
1048
1036
"в новое местоположение."
1049
1037
1050
#: bzrlib/builtins.py:1724
1038
#: bzrlib/builtins.py:1694
1051
1039
msgid ""
1052
1040
"The 'dir' argument, if given, must be the location of the root of a\n"
1053
1041
"working tree to update. By default, the working tree that contains the \n"
1054
1042
"current working directory is used."
1055
1043
msgstr ""
1056
1044
1057
#: bzrlib/builtins.py:1740
1045
#: bzrlib/builtins.py:1710
1058
1046
msgid "bzr update --revision takes exactly one revision"
1059
1047
msgstr "bzr update --revision принимает ровно одну ревизию"
1060
1048
1061
#: bzrlib/builtins.py:1748
1049
#: bzrlib/builtins.py:1718
1062
1050
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1063
1051
msgstr ""
1064
1052
"bzr update может обновить только всё дерево, не файл или поддиректорию"
1065
1053
1066
#: bzrlib/builtins.py:1779
1054
#: bzrlib/builtins.py:1749
1067
1055
msgid "Tree is up to date at revision {0} of branch {1}"
1068
1056
msgstr "Дерево в актуальной ревизии {0} ветви {1}"
1069
1057
1070
#: bzrlib/builtins.py:1795
1058
#: bzrlib/builtins.py:1765
1071
1059
#, python-format
1072
1060
msgid ""
1073
1061
"branch has no revision %s\n"
1076
1064
"в ветви нет ревизии %s\n"
1077
1065
"bzr update --revision работает только для ревизий в истории ветви"
1078
1066
1079
#: bzrlib/builtins.py:1801
1067
#: bzrlib/builtins.py:1771
1080
1068
msgid "Updated to revision {0} of branch {1}"
1081
1069
msgstr "Обновлено до ревизии {0} ветви {1}"
1082
1070
1083
#: bzrlib/builtins.py:1805
1071
#: bzrlib/builtins.py:1775
1084
1072
msgid ""
1085
1073
"Your local commits will now show as pending merges with 'bzr status', and "
1086
1074
"can be committed with 'bzr commit'."
1088
1076
"Ваши локальные закрепления теперь будут отображаться в 'bzr status' как "
1089
1077
"незавершённые слияния, и их можно закрепить с помощью 'bzr commit'."
1090
1078
1091
#: bzrlib/builtins.py:1814
1079
#: bzrlib/builtins.py:1784
1092
1080
msgid "Show information about a working tree, branch or repository."
1093
1081
msgstr "Показать информацию о рабочем дереве, ветви или репозитории."
1094
1082
1095
#: bzrlib/builtins.py:1816
1083
#: bzrlib/builtins.py:1786
1096
1084
msgid ""
1097
1085
"This command will show all known locations and formats associated to the\n"
1098
1086
"tree, branch or repository."
1100
1088
"Эта команда выведет все известные местоположения и форматы, связанные\n"
1101
1089
"с деревом, ветвью или репозиторием."
1102
1090
1103
#: bzrlib/builtins.py:1819
1091
#: bzrlib/builtins.py:1789
1104
1092
msgid ""
1105
1093
"In verbose mode, statistical information is included with each report.\n"
1106
1094
"To see extended statistic information, use a verbosity level of 2 or\n"
1110
1098
"Чтобы увидеть расширенную статистическую информацию, используйте уровень\n"
1111
1099
"подробностей 2 или выше, указывая опцию -v несколько раз, например -vv."
1112
1100
1113
#: bzrlib/builtins.py:1823
1101
#: bzrlib/builtins.py:1793
1114
1102
msgid "Branches and working trees will also report any missing revisions."
1115
1103
msgstr ""
1116
1104
"Ветви и рабочие деревья также включают в отчёт отсутствующие ревизии."
1117
1105
1118
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1119
#: bzrlib/builtins.py:6466
1106
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1107
#: bzrlib/builtins.py:6442
1120
1108
msgid ":Examples:"
1121
1109
msgstr ":Примеры:"
1122
1110
1123
#: bzrlib/builtins.py:1827
1111
#: bzrlib/builtins.py:1797
1124
1112
msgid " Display information on the format and related locations:"
1125
1113
msgstr " Вывести информацию о формате и связанных местоположениях:"
1126
1114
1127
#: bzrlib/builtins.py:1829
1115
#: bzrlib/builtins.py:1799
1128
1116
msgid " bzr info"
1129
1117
msgstr " bzr info"
1130
1118
1131
#: bzrlib/builtins.py:1831
1119
#: bzrlib/builtins.py:1801
1132
1120
msgid ""
1133
1121
" Display the above together with extended format information and\n"
1134
1122
" basic statistics (like the number of files in the working tree and\n"
1138
1126
" и базовую статистику (как число файлов в рабочем дереве и число\n"
1139
1127
" ревизий в ветви и репозитории):"
1140
1128
1141
#: bzrlib/builtins.py:1835
1129
#: bzrlib/builtins.py:1805
1142
1130
msgid " bzr info -v"
1143
1131
msgstr " bzr info -v"
1144
1132
1145
#: bzrlib/builtins.py:1837
1133
#: bzrlib/builtins.py:1807
1146
1134
msgid " Display the above together with number of committers to the branch:"
1147
1135
msgstr " Вывести то же, что и выше, а также число участников ветви:"
1148
1136
1149
#: bzrlib/builtins.py:1839
1137
#: bzrlib/builtins.py:1809
1150
1138
msgid " bzr info -vv"
1151
1139
msgstr " bzr info -vv"
1152
1140
1153
#: bzrlib/builtins.py:1858
1141
#: bzrlib/builtins.py:1828
1154
1142
msgid "Remove files or directories."
1155
1143
msgstr "Исключить файлы или директории."
1156
1144
1157
#: bzrlib/builtins.py:1860
1145
#: bzrlib/builtins.py:1830
1158
1146
msgid ""
1159
1147
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1160
1148
"delete them if they can easily be recovered using revert otherwise they\n"
1161
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1149
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1162
1150
"parameters are given Bazaar will scan for files that are being tracked by\n"
1163
1151
"Bazaar but missing in your tree and stop tracking them for you."
1164
1152
msgstr ""
1153
"Прекращает отслеживание изменений в указанных файлах. Bazaar удалит их,\n"
1154
"если их можно легко восстановить с помощью revert, иначе будут созданы\n"
1155
"их резервные копии (с расширением вида .~#~). Если не указано ни опций,\n"
1156
"ни параметров, Bazaar найдёт файлы, которые отслеживаются, но отсутствуют\n"
1157
"в рабочем дереве и прекратит их отслеживать."
1165
1158
1166
#: bzrlib/builtins.py:1868
1159
#: bzrlib/builtins.py:1838
1167
1160
msgid "Only remove files that have never been committed."
1168
1161
msgstr "Исключать только файлы, которые никогда не были закреплены."
1169
1162
1170
#: bzrlib/builtins.py:1870
1163
#: bzrlib/builtins.py:1840
1171
1164
msgid "The file deletion mode to be used."
1172
1165
msgstr "Используемый способ удаления файлов."
1173
1166
1174
#: bzrlib/builtins.py:1871
1167
#: bzrlib/builtins.py:1841
1175
1168
msgid "Deletion Strategy"
1176
1169
msgstr "Стратегия удаления"
1177
1170
1178
#: bzrlib/builtins.py:1872
1171
#: bzrlib/builtins.py:1842
1179
1172
msgid "Backup changed files (default)."
1180
msgstr "Создать резервную копию изменённых файлов (по умолчанию)."
1173
msgstr ""
1181
1174
1182
#: bzrlib/builtins.py:1873
1175
#: bzrlib/builtins.py:1843
1183
1176
msgid "Delete from bzr but leave the working copy."
1184
1177
msgstr "Удалить из bzr, но оставить рабочую копию."
1185
1178
1186
#: bzrlib/builtins.py:1874
1179
#: bzrlib/builtins.py:1844
1187
1180
msgid "Don't backup changed files."
1188
1181
msgstr "Не создавать резервные копии изменённых файлов."
1189
1182
1190
#: bzrlib/builtins.py:1875
1183
#: bzrlib/builtins.py:1845
1191
1184
msgid ""
1192
1185
"Delete all the specified files, even if they can not be recovered and even "
1193
1186
"if they are non-empty directories. (deprecated, use no-backup)"
1195
1188
"Удалить все указанные файлы, даже если их нельзя восстановить или они "
1196
1189
"являются непустыми директориями. (устарело, используйте no-backup)"
1197
1190
1198
#: bzrlib/builtins.py:1884
1191
#: bzrlib/builtins.py:1854
1199
1192
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1200
1193
msgstr ""
1201
1194
"(Опция --force устарела, в будущем следует использовать --no-backup.)"
1202
1195
1203
#: bzrlib/builtins.py:1901
1196
#: bzrlib/builtins.py:1871
1204
1197
msgid "No matching files."
1205
1198
msgstr "Нет файлов, удовлетворяющих критерию."
1206
1199
1207
#: bzrlib/builtins.py:1962
1200
#: bzrlib/builtins.py:1932
1208
1201
msgid "Reconcile bzr metadata in a branch."
1209
1202
msgstr "Согласовать метаданные bzr в ветви."
1210
1203
1211
#: bzrlib/builtins.py:1964
1204
#: bzrlib/builtins.py:1934
1212
1205
msgid ""
1213
1206
"This can correct data mismatches that may have been caused by\n"
1214
1207
"previous ghost operations or bzr upgrades. You should only\n"
1219
1212
"Эту команду стоит запускать только, если 'bzr check' или разработчик\n"
1220
1213
"bzr предложат вам сделать это."
1221
1214
1222
#: bzrlib/builtins.py:1969
1215
#: bzrlib/builtins.py:1939
1223
1216
msgid ""
1224
1217
"If a second branch is provided, cross-branch reconciliation is\n"
1225
1218
"also attempted, which will check that data like the tree root\n"
1231
1224
"присутствовавшие в ранних версиях bzr, корректно представлены\n"
1232
1225
"в обоих ветвях."
1233
1226
1234
#: bzrlib/builtins.py:1974
1227
#: bzrlib/builtins.py:1944
1235
1228
msgid ""
1236
1229
"At the same time it is run it may recompress data resulting in\n"
1237
1230
"a potential saving in disk space or performance gain."
1240
1233
"уменьшающее размер занимаемого пространства и повышающее\n"
1241
1234
"производительность."
1242
1235
1243
#: bzrlib/builtins.py:1977
1236
#: bzrlib/builtins.py:1947
1244
1237
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1245
1238
msgstr ""
1246
1239
"Ветвь *ДОЛЖНА* быть на системе, поддерживающей список файлов, такой как\r\n"
1247
1240
"локальный диск или SFTP."
1248
1241
1249
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1242
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1250
1243
msgid ""
1251
1244
"Format for the bzr 2.0 series.\n"
1252
1245
"Uses group-compress storage.\n"
1253
1246
"Provides rich roots which are a one-way transition.\n"
1254
1247
msgstr ""
1255
1248
1256
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1249
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1257
1250
msgid ""
1258
1251
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1259
1252
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1260
1253
msgstr ""
1261
"Пакетный формат, используемый в версиях 1.х. Представлен в 0.92. "
1262
"Взаимодействует с хранилищами bzr 0.92 и ниже, но не читается bzr ниже 0.92. "
1263
1254
1264
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1255
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1265
1256
msgid "The 2a format with experimental support for colocated branches.\n"
1266
1257
msgstr ""
1267
1258
1268
#: bzrlib/builtins.py:2045
1259
#: bzrlib/builtins.py:2015
1269
1260
msgid "Make a directory into a versioned branch."
1270
1261
msgstr "Преобразовать директорию в ветвь системы контроля версий."
1271
1262
1272
#: bzrlib/builtins.py:2047
1263
#: bzrlib/builtins.py:2017
1273
1264
msgid ""
1274
1265
"Use this to create an empty branch, or before importing an\n"
1275
1266
"existing project."
1277
1268
"Используйте эту команду для создания пустой ветви или\n"
1278
1269
"перед импортом существующего проекта."
1279
1270
1280
#: bzrlib/builtins.py:2050
1271
#: bzrlib/builtins.py:2020
1281
1272
msgid ""
1282
1273
"If there is a repository in a parent directory of the location, then\n"
1283
1274
"the history of the branch will be stored in the repository. Otherwise\n"
1288
1279
"будет сохранена в репозитории. Иначе, init создаёт одиночную ветвь,\n"
1289
1280
"которая несёт историю с собой в директории .bzr."
1290
1281
1291
#: bzrlib/builtins.py:2055
1282
#: bzrlib/builtins.py:2025
1292
1283
msgid ""
1293
1284
"If there is already a branch at the location but it has no working tree,\n"
1294
1285
"the tree can be populated with 'bzr checkout'."
1296
1287
"Если ветвь уже существует, но рабочее дерево отсутствует, то оно\n"
1297
1288
"создаётся с помощью 'bzr checkout'."
1298
1289
1299
#: bzrlib/builtins.py:2058
1290
#: bzrlib/builtins.py:2028
1300
1291
msgid "Recipe for importing a tree of files::"
1301
1292
msgstr "Рецепт для импорта дерева файлов::"
1302
1293
1303
#: bzrlib/builtins.py:2060
1294
#: bzrlib/builtins.py:2030
1304
1295
msgid ""
1305
1296
" cd ~/project\n"
1306
1297
" bzr init\n"
1314
1305
" bzr status\n"
1315
1306
" bzr commit -m \"проект импортирован\""
1316
1307
1317
#: bzrlib/builtins.py:2071
1308
#: bzrlib/builtins.py:2041
1318
1309
msgid ""
1319
1310
"Create the path leading up to the branch if it does not already exist."
1320
1311
msgstr "Создать путь, ведущий к ветви, если он ещё не существует."
1321
1312
1322
#: bzrlib/builtins.py:2074
1313
#: bzrlib/builtins.py:2044
1323
1314
msgid "Specify a format for this branch. See \"help formats\"."
1324
1315
msgstr "Указать формат данной ветви. См. «help formats»."
1325
1316
1326
#: bzrlib/builtins.py:2082
1317
#: bzrlib/builtins.py:2052
1327
1318
msgid ""
1328
1319
"Never change revnos or the existing log. Append revisions to it only."
1329
1320
msgstr ""
1330
1321
"Никогда не изменять номера ревизий в существующем журнале. Только добавлять "
1331
1322
"к нему ревизии."
1332
1323
1333
#: bzrlib/builtins.py:2085
1324
#: bzrlib/builtins.py:2055
1334
1325
msgid "Create a branch without a working tree."
1335
1326
msgstr "Создать ветвь без рабочего дерева."
1336
1327
1337
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1328
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1338
1329
#, python-format
1339
1330
msgid ""
1340
1331
"Parent directory of %s does not exist.\n"
1344
1335
"Вы может предоставить --create-prefix, чтобы создать все родительские "
1345
1336
"директории."
1346
1337
1347
#: bzrlib/builtins.py:2139
1338
#: bzrlib/builtins.py:2109
1348
1339
msgid ""
1349
1340
"This branch format cannot be set to append-revisions-only. Try --default."
1350
1341
msgstr ""
1351
1342
"Формат этой ветви не может быть установлен в append-revisions-only. "
1352
1343
"Попробуйте --default."
1353
1344
1354
#: bzrlib/builtins.py:2150
1345
#: bzrlib/builtins.py:2120
1355
1346
msgid "Created a {0} (format: {1})\n"
1356
1347
msgstr "Создана {0} в формате {1}\n"
1357
1348
1358
#: bzrlib/builtins.py:2159
1349
#: bzrlib/builtins.py:2129
1359
1350
#, python-format
1360
1351
msgid "Using shared repository: %s\n"
1361
1352
msgstr "Используется общий репозиторий: %s\n"
1362
1353
1363
#: bzrlib/builtins.py:2163
1354
#: bzrlib/builtins.py:2133
1364
1355
msgid "Create a shared repository for branches to share storage space."
1365
1356
msgstr ""
1366
1357
"Создать общий репозиторий для ветвей, которые разделяют общее пространство."
1367
1358
1368
#: bzrlib/builtins.py:2165
1359
#: bzrlib/builtins.py:2135
1369
1360
msgid ""
1370
1361
"New branches created under the repository directory will store their\n"
1371
1362
"revisions in the repository, not in the branch directory. For branches\n"
1377
1368
"Для ветвей с общей историей это уменьшает размер необходимого\n"
1378
1369
"пространства и ускоряет создание новых ветвей."
1379
1370
1380
#: bzrlib/builtins.py:2170
1371
#: bzrlib/builtins.py:2140
1381
1372
msgid ""
1382
1373
"If the --no-trees option is given then the branches in the repository\n"
1383
1374
"will not have working trees by default. They will still exist as \n"
1393
1384
"хранящих ветви, работа с которыми производится через рабочие копии\n"
1394
1385
"или через удалённые ветви, например на сервере."
1395
1386
1396
#: bzrlib/builtins.py:2177
1387
#: bzrlib/builtins.py:2147
1397
1388
msgid ""
1398
1389
":Examples:\n"
1399
1390
" Create a shared repository holding just branches::"
1401
1392
":Примеры:\n"
1402
1393
" Создать общий репозиторий, хранящий только ветви::"
1403
1394
1404
#: bzrlib/builtins.py:2180
1395
#: bzrlib/builtins.py:2150
1405
1396
msgid ""
1406
1397
" bzr init-repo --no-trees repo\n"
1407
1398
" bzr init repo/trunk"
1409
1400
" bzr init-repo --no-trees repo\n"
1410
1401
" bzr init repo/trunk"
1411
1402
1412
#: bzrlib/builtins.py:2183
1403
#: bzrlib/builtins.py:2153
1413
1404
msgid " Make a lightweight checkout elsewhere::"
1414
1405
msgstr " Создать легковесную рабочую копию где-нибудь ещё::"
1415
1406
1416
#: bzrlib/builtins.py:2185
1407
#: bzrlib/builtins.py:2155
1417
1408
msgid ""
1418
1409
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1419
1410
" cd trunk-checkout\n"
1423
1414
" cd trunk-checkout\n"
1424
1415
" (здесь добавляйте файлы)"
1425
1416
1426
#: bzrlib/builtins.py:2193
1417
#: bzrlib/builtins.py:2163
1427
1418
msgid ""
1428
1419
"Specify a format for this repository. See \"bzr help formats\" for details."
1429
1420
msgstr ""
1430
1421
"Указать формат для этого репозитория. Описание форматов см. в «bzr help "
1431
1422
"formats»."
1432
1423
1433
#: bzrlib/builtins.py:2197
1424
#: bzrlib/builtins.py:2167
1434
1425
msgid "Repository format"
1435
1426
msgstr "Формат репозитория"
1436
1427
1437
#: bzrlib/builtins.py:2199
1428
#: bzrlib/builtins.py:2169
1438
1429
msgid "Branches in the repository will default to not having a working tree."
1439
1430
msgstr "Ветви в репозитории по умолчанию не будут иметь рабочего дерева."
1440
1431
1441
#: bzrlib/builtins.py:2225
1432
#: bzrlib/builtins.py:2195
1442
1433
msgid "Show differences in the working tree, between revisions or branches."
1443
1434
msgstr "Показать изменения в рабочем дереве, между ревизиями или ветвями."
1444
1435
1445
#: bzrlib/builtins.py:2227
1436
#: bzrlib/builtins.py:2197
1446
1437
msgid ""
1447
1438
"If no arguments are given, all changes for the current tree are listed.\n"
1448
1439
"If files are given, only the changes in those files are listed.\n"
1457
1448
"Если не указаны, значение по умолчанию для обоих извлекается из первого\n"
1458
1449
"аргумента или из текущего дерева, если не дано аргументов."
1459
1450
1460
#: bzrlib/builtins.py:2234
1451
#: bzrlib/builtins.py:2204
1461
1452
msgid ""
1462
1453
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1463
1454
"produces patches suitable for \"patch -p1\"."
1465
1456
"«bzr diff -p1» эквивалентно «bzr diff -prefix old/:new/», и\n"
1466
1457
"создаёт патчи, подходящие для «patch -p1»."
1467
1458
1468
#: bzrlib/builtins.py:2237
1459
#: bzrlib/builtins.py:2207
1469
1460
msgid ""
1470
1461
"Note that when using the -r argument with a range of revisions, the\n"
1471
1462
"differences are computed between the two specified revisions. That\n"
1480
1471
"Это отличается от интерпретации интервалов ревизий командой «bzr log»,\n"
1481
1472
"которая включает первую ревизию интервала."
1482
1473
1483
#: bzrlib/builtins.py:2244
1474
#: bzrlib/builtins.py:2214
1484
1475
msgid ""
1485
1476
":Exit values:\n"
1486
1477
" 1 - changed\n"
1494
1485
" 3 - ошибка\n"
1495
1486
" 0 - нет изменений"
1496
1487
1497
#: bzrlib/builtins.py:2250
1488
#: bzrlib/builtins.py:2220
1498
1489
msgid ""
1499
1490
":Examples:\n"
1500
1491
" Shows the difference in the working tree versus the last commit::"
1502
1493
":Примеры:\n"
1503
1494
" Показывает отличия рабочего дерева от последнего закрепления::"
1504
1495
1505
#: bzrlib/builtins.py:2253
1496
#: bzrlib/builtins.py:2223
1506
1497
msgid " bzr diff"
1507
1498
msgstr " bzr diff"
1508
1499
1509
#: bzrlib/builtins.py:2255
1500
#: bzrlib/builtins.py:2225
1510
1501
msgid " Difference between the working tree and revision 1::"
1511
1502
msgstr " Различия между рабочим деревом и ревизией 1::"
1512
1503
1513
#: bzrlib/builtins.py:2257
1504
#: bzrlib/builtins.py:2227
1514
1505
msgid " bzr diff -r1"
1515
1506
msgstr " bzr diff -r1"
1516
1507
1517
#: bzrlib/builtins.py:2259
1508
#: bzrlib/builtins.py:2229
1518
1509
msgid " Difference between revision 3 and revision 1::"
1519
1510
msgstr " Различия между ревизией 3 и ревизией 1::"
1520
1511
1521
#: bzrlib/builtins.py:2261
1512
#: bzrlib/builtins.py:2231
1522
1513
msgid " bzr diff -r1..3"
1523
1514
msgstr " bzr diff -r1..3"
1524
1515
1525
#: bzrlib/builtins.py:2263
1516
#: bzrlib/builtins.py:2233
1526
1517
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1527
1518
msgstr " Различия между ревизией 3 и ревизией 1 для ветви xxx::"
1528
1519
1529
#: bzrlib/builtins.py:2265
1520
#: bzrlib/builtins.py:2235
1530
1521
msgid " bzr diff -r1..3 xxx"
1531
1522
msgstr " bzr diff -r1..3 xxx"
1532
1523
1533
#: bzrlib/builtins.py:2267
1524
#: bzrlib/builtins.py:2237
1534
1525
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1535
1526
msgstr " Изменения, представленные в ревизии 2 (эквивалентно -r1..2)::"
1536
1527
1537
#: bzrlib/builtins.py:2269
1528
#: bzrlib/builtins.py:2239
1538
1529
msgid " bzr diff -c2"
1539
1530
msgstr " bzr diff -c2"
1540
1531
1541
#: bzrlib/builtins.py:2271
1532
#: bzrlib/builtins.py:2241
1542
1533
msgid ""
1543
1534
" To see the changes introduced by revision X::\n"
1544
1535
" \n"
1548
1539
" \n"
1549
1540
" bzr diff -cX"
1550
1541
1551
#: bzrlib/builtins.py:2275
1542
#: bzrlib/builtins.py:2245
1552
1543
msgid ""
1553
1544
" Note that in the case of a merge, the -c option shows the changes\n"
1554
1545
" compared to the left hand parent. To see the changes against\n"
1558
1549
" относительно левого родителя. Чтобы увидеть изменения относительно\n"
1559
1550
" правого родителя, используйте::"
1560
1551
1561
#: bzrlib/builtins.py:2279
1552
#: bzrlib/builtins.py:2249
1562
1553
msgid " bzr diff -r<chosen_parent>..X"
1563
1554
msgstr " bzr diff -r<выбранный_родитель>..X"
1564
1555
1565
#: bzrlib/builtins.py:2281
1556
#: bzrlib/builtins.py:2251
1566
1557
msgid ""
1567
1558
" The changes between the current revision and the previous revision\n"
1568
1559
" (equivalent to -c-1 and -r-2..-1)"
1570
1561
" Изменения между текущей ревизией и предыдущей\n"
1571
1562
" (эквивалент -c-1 и -r-2..-1)"
1572
1563
1573
#: bzrlib/builtins.py:2284
1564
#: bzrlib/builtins.py:2254
1574
1565
msgid " bzr diff -r-2.."
1575
1566
msgstr " bzr diff -r-2.."
1576
1567
1577
#: bzrlib/builtins.py:2286
1568
#: bzrlib/builtins.py:2256
1578
1569
msgid " Show just the differences for file NEWS::"
1579
1570
msgstr " Показать изменения только для файла NEWS::"
1580
1571
1581
#: bzrlib/builtins.py:2288
1572
#: bzrlib/builtins.py:2258
1582
1573
msgid " bzr diff NEWS"
1583
1574
msgstr " bzr diff NEWS"
1584
1575
1585
#: bzrlib/builtins.py:2290
1576
#: bzrlib/builtins.py:2260
1586
1577
msgid " Show the differences in working tree xxx for file NEWS::"
1587
1578
msgstr " Показать изменения в рабочем дереве xxx для файла NEWS::"
1588
1579
1589
#: bzrlib/builtins.py:2292
1580
#: bzrlib/builtins.py:2262
1590
1581
msgid " bzr diff xxx/NEWS"
1591
1582
msgstr " bzr diff xxx/NEWS"
1592
1583
1593
#: bzrlib/builtins.py:2294
1584
#: bzrlib/builtins.py:2264
1594
1585
msgid " Show the differences from branch xxx to this working tree:"
1595
1586
msgstr " Показать изменения рабочего дерева относительно ветви xxx:"
1596
1587
1597
#: bzrlib/builtins.py:2296
1588
#: bzrlib/builtins.py:2266
1598
1589
msgid " bzr diff --old xxx"
1599
1590
msgstr " bzr diff --old xxx"
1600
1591
1601
#: bzrlib/builtins.py:2298
1592
#: bzrlib/builtins.py:2268
1602
1593
msgid " Show the differences between two branches for file NEWS::"
1603
1594
msgstr " Показать различия в файле NEWS между двумя ветвями::"
1604
1595
1605
#: bzrlib/builtins.py:2300
1596
#: bzrlib/builtins.py:2270
1606
1597
msgid " bzr diff --old xxx --new yyy NEWS"
1607
1598
msgstr " bzr diff --old xxx --new yyy NEWS"
1608
1599
1609
#: bzrlib/builtins.py:2302
1600
#: bzrlib/builtins.py:2272
1610
1601
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1611
1602
msgstr " Тоже, что и 'bzr diff', но начать пути с old/ и new/::"
1612
1603
1613
#: bzrlib/builtins.py:2304
1604
#: bzrlib/builtins.py:2274
1614
1605
msgid ""
1615
1606
" bzr diff --prefix old/:new/\n"
1616
1607
" \n"
1625
1616
" \n"
1626
1617
" bzr diff --using /usr/bin/diff --diff-options -wu"
1627
1618
1628
#: bzrlib/builtins.py:2314
1619
#: bzrlib/builtins.py:2284
1629
1620
msgid "Pass these options to the external diff program."
1630
1621
msgstr "Передать эти опции внешней программе diff."
1631
1622
1632
#: bzrlib/builtins.py:2317
1623
#: bzrlib/builtins.py:2287
1633
1624
msgid ""
1634
1625
"Set prefixes added to old and new filenames, as two values separated by a "
1635
1626
"colon. (eg \"old/:new/\")."
1637
1628
"Установить префиксы, добавляемые к старым и новым именам файлов, как "
1638
1629
"значения, разделённые двоеточием (напр. «old/:new/»)."
1639
1630
1640
#: bzrlib/builtins.py:2320
1631
#: bzrlib/builtins.py:2290
1641
1632
msgid "Branch/tree to compare from."
1642
1633
msgstr "Ветвь или дерево, которое сравнивать."
1643
1634
1644
#: bzrlib/builtins.py:2324
1635
#: bzrlib/builtins.py:2294
1645
1636
msgid "Branch/tree to compare to."
1646
1637
msgstr "Ветвь или дерево, с которым сравнивать."
1647
1638
1648
#: bzrlib/builtins.py:2330
1639
#: bzrlib/builtins.py:2300
1649
1640
msgid "Use this command to compare files."
1650
1641
msgstr "Использовать эту команду для сравнения."
1651
1642
1652
#: bzrlib/builtins.py:2335
1643
#: bzrlib/builtins.py:2305
1653
1644
msgid "Diff format to use."
1654
1645
msgstr "Используемый формат diff."
1655
1646
1656
#: bzrlib/builtins.py:2337
1647
#: bzrlib/builtins.py:2307
1657
1648
msgid "Diff format"
1658
1649
msgstr "Формат diff"
1659
1650
1660
#: bzrlib/builtins.py:2359
1651
#: bzrlib/builtins.py:2329
1661
1652
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1662
1653
msgstr ""
1663
1654
"--prefix ожидает два значения, разделённые двоеточием (напр. «old/:new/»)"
1664
1655
1665
#: bzrlib/builtins.py:2363
1656
#: bzrlib/builtins.py:2333
1666
1657
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1667
1658
msgstr "bzr diff --revision принимает ровно ожин или два аргумента"
1668
1659
1669
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1670
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1660
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1661
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1671
1662
msgid "{0} and {1} are mutually exclusive"
1672
1663
msgstr "{0} и {1} взаимоисключающи"
1673
1664
1674
#: bzrlib/builtins.py:2388
1665
#: bzrlib/builtins.py:2358
1675
1666
msgid ""
1676
1667
"List files deleted in the working tree.\n"
1677
1668
" "
1679
1670
"Вывести список файлов, удалённых в рабочем дереве.\n"
1680
1671
" "
1681
1672
1682
#: bzrlib/builtins.py:2465
1673
#: bzrlib/builtins.py:2436
1683
1674
msgid "Show the tree root directory."
1684
1675
msgstr "Показать корневую директорию дерева."
1685
1676
1686
#: bzrlib/builtins.py:2467
1677
#: bzrlib/builtins.py:2438
1687
1678
msgid ""
1688
1679
"The root is the nearest enclosing directory with a .bzr control\n"
1689
1680
"directory."
1691
1682
"Корень это ближайшая родительская директория с управляющей\n"
1692
1683
"директорией .bzr."
1693
1684
1694
#: bzrlib/builtins.py:2482
1685
#: bzrlib/builtins.py:2453
1695
1686
msgid "The limit argument must be an integer."
1696
1687
msgstr "Аргумент предела должен быть целым числом."
1697
1688
1698
#: bzrlib/builtins.py:2490
1689
#: bzrlib/builtins.py:2461
1699
1690
msgid "The levels argument must be an integer."
1700
1691
msgstr "Аргументы пределов должны быть целыми числами."
1701
1692
1702
#: bzrlib/builtins.py:2495
1693
#: bzrlib/builtins.py:2466
1703
1694
msgid "Show historical log for a branch or subset of a branch."
1704
1695
msgstr "Показать журнал истории ветви или подмножества ветви."
1705
1696
1706
#: bzrlib/builtins.py:2497
1697
#: bzrlib/builtins.py:2468
1707
1698
msgid ""
1708
1699
"log is bzr's default tool for exploring the history of a branch.\n"
1709
1700
"The branch to use is taken from the first parameter. If no parameters\n"
1715
1706
"параметров, выводится журнал ветви, содержащей рабочюю директорию.\n"
1716
1707
"Вот несколько простых примеров::"
1717
1708
1718
#: bzrlib/builtins.py:2502
1709
#: bzrlib/builtins.py:2473
1719
1710
msgid ""
1720
1711
" bzr log log the current branch\n"
1721
1712
" bzr log foo.py log a file in its branch\n"
1725
1716
" bzr log foo.py журнал файла в его ветви\n"
1726
1717
" bzr log http://server/branch журнал ветви на сервере"
1727
1718
1728
#: bzrlib/builtins.py:2506
1719
#: bzrlib/builtins.py:2477
1729
1720
msgid ""
1730
1721
"The filtering, ordering and information shown for each revision can\n"
1731
1722
"be controlled as explained below. By default, all revisions are\n"
1741
1732
"отображаются, то они отображаются с отступом, относительно ревизии,\n"
1742
1733
"в которой происходило слияние."
1743
1734
1744
#: bzrlib/builtins.py:2513
1735
#: bzrlib/builtins.py:2484
1745
1736
msgid ":Output control:"
1746
1737
msgstr ":Управление выводом:"
1747
1738
1748
#: bzrlib/builtins.py:2515
1739
#: bzrlib/builtins.py:2486
1749
1740
msgid ""
1750
1741
" The log format controls how information about each revision is\n"
1751
1742
" displayed. The standard log formats are called ``long``, ``short``\n"
1757
1748
" и «line». По умолчание используется long. Подробности о форматах\n"
1758
1749
" смотрите в «bzr help log-formats»."
1759
1750
1760
#: bzrlib/builtins.py:2520
1751
#: bzrlib/builtins.py:2491
1761
1752
msgid ""
1762
1753
" The following options can be used to control what information is\n"
1763
1754
" displayed::"
1765
1756
" Следующие опции могут использоваться для управления отображением\n"
1766
1757
" информации::"
1767
1758
1768
#: bzrlib/builtins.py:2523
1759
#: bzrlib/builtins.py:2494
1769
1760
msgid ""
1770
1761
" -l N display a maximum of N revisions\n"
1771
1762
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1779
1770
" -p выводить различия diff для каждой ревизии\n"
1780
1771
" --show-ids выводить id ревизий (и id файлов), не только номера ревизий"
1781
1772
1782
#: bzrlib/builtins.py:2529
1773
#: bzrlib/builtins.py:2500
1783
1774
msgid ""
1784
1775
" Note that the default number of levels to display is a function of the\n"
1785
1776
" log format. If the -n option is not used, the standard log formats show\n"
1789
1780
" Если используется не опция -n, стандартные форматы журнала показывают\n"
1790
1781
" верхний уровень (основную линию)."
1791
1782
1792
#: bzrlib/builtins.py:2533
1783
#: bzrlib/builtins.py:2504
1793
1784
msgid ""
1794
1785
" Status summaries are shown using status flags like A, M, etc. To see\n"
1795
1786
" the changes explained using words like ``added`` and ``modified``\n"
1799
1790
" увидеть изменения, описанные словами вроде «добавлены» и «изменены»,\n"
1800
1791
" используйте опцию -vv."
1801
1792
1802
#: bzrlib/builtins.py:2537
1793
#: bzrlib/builtins.py:2508
1803
1794
msgid ":Ordering control:"
1804
1795
msgstr ":Управление порядком:"
1805
1796
1806
#: bzrlib/builtins.py:2539
1797
#: bzrlib/builtins.py:2510
1807
1798
msgid ""
1808
1799
" To display revisions from oldest to newest, use the --forward option.\n"
1809
1800
" In most cases, using this option will have little impact on the total\n"
1815
1806
" расходуется мало времени, хотя --forward не выводит ревизии по порядку,\n"
1816
1807
" как это делает --reverse."
1817
1808
1818
#: bzrlib/builtins.py:2544
1809
#: bzrlib/builtins.py:2515
1819
1810
msgid ":Revision filtering:"
1820
1811
msgstr ":Фильтрация ревизий:"
1821
1812
1822
#: bzrlib/builtins.py:2546
1813
#: bzrlib/builtins.py:2517
1823
1814
msgid ""
1824
1815
" The -r option can be used to specify what revision or range of revisions\n"
1825
1816
" to filter against. The various forms are shown below::"
1827
1818
" Опцию -r можно использовать для указания ревизии или интервала ревизий\n"
1828
1819
" для фильтрации. Различные формы показаны ниже::"
1829
1820
1830
#: bzrlib/builtins.py:2549
1821
#: bzrlib/builtins.py:2520
1831
1822
msgid ""
1832
1823
" -rX display revision X\n"
1833
1824
" -rX.. display revision X and later\n"
1839
1830
" -r..Y вывести до и включая ревизию Y\n"
1840
1831
" -rX..Y вывести от X до Y включительно"
1841
1832
1842
#: bzrlib/builtins.py:2554
1833
#: bzrlib/builtins.py:2525
1843
1834
msgid ""
1844
1835
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1845
1836
" Some common examples are given below::"
1847
1838
" Чтобы узнать, как указывать X и Y, смотрите «bzr help revisionspec».\n"
1848
1839
" Ниже приведеные некоторые распространённые примеры::"
1849
1840
1850
#: bzrlib/builtins.py:2557
1841
#: bzrlib/builtins.py:2528
1851
1842
msgid ""
1852
1843
" -r-1 show just the tip\n"
1853
1844
" -r-10.. show the last 10 mainline revisions\n"
1863
1854
" этой ветви и указанной в пути\n"
1864
1855
" -rdate:yesterday.. показать изменения со вчерашнего дня"
1865
1856
1866
#: bzrlib/builtins.py:2564
1857
#: bzrlib/builtins.py:2535
1867
1858
msgid ""
1868
1859
" When logging a range of revisions using -rX..Y, log starts at\n"
1869
1860
" revision Y and searches back in history through the primary\n"
1873
1864
" a nested merge revision and the log will be truncated accordingly."
1874
1865
msgstr ""
1875
1866
1876
#: bzrlib/builtins.py:2571
1867
#: bzrlib/builtins.py:2542
1877
1868
msgid ":Path filtering:"
1878
1869
msgstr ":Фильтрация пути:"
1879
1870
1880
#: bzrlib/builtins.py:2573
1871
#: bzrlib/builtins.py:2544
1881
1872
msgid ""
1882
1873
" If parameters are given and the first one is not a branch, the log\n"
1883
1874
" will be filtered to show only those revisions that changed the\n"
1886
1877
" Если заданы параметры и первый не является ветвью, будут отображаться\n"
1887
1878
" только те ревизии, которые изменяли указанные файлы или директории."
1888
1879
1889
#: bzrlib/builtins.py:2577
1880
#: bzrlib/builtins.py:2548
1890
1881
msgid ""
1891
1882
" Filenames are interpreted within their historical context. To log a\n"
1892
1883
" deleted file, specify a revision range so that the file existed at\n"
1896
1887
" журнал для удалённого файла, укажите такой интервал ревизий, что файл\n"
1897
1888
" существует от начала до конца интервала."
1898
1889
1899
#: bzrlib/builtins.py:2581
1890
#: bzrlib/builtins.py:2552
1900
1891
msgid ""
1901
1892
" Historical context is also important when interpreting pathnames of\n"
1902
1893
" renamed files/directories. Consider the following example:"
1904
1895
" Исторический контекст также важен при интерпретации путей\n"
1905
1896
" переименованных файлов и директорий. Рассмотрим следующий пример:"
1906
1897
1907
#: bzrlib/builtins.py:2584
1898
#: bzrlib/builtins.py:2555
1908
1899
msgid ""
1909
1900
" * revision 1: add tutorial.txt\n"
1910
1901
" * revision 2: modify tutorial.txt\n"
1914
1905
" * ревизия 2: изменён tutorial.txt\n"
1915
1906
" * ревизия 3: переименован tutorial.txt в guide.txt; добавлен tutorial.txt"
1916
1907
1917
#: bzrlib/builtins.py:2588
1908
#: bzrlib/builtins.py:2559
1918
1909
msgid " In this case:"
1919
1910
msgstr " В этом случае:"
1920
1911
1921
#: bzrlib/builtins.py:2590
1912
#: bzrlib/builtins.py:2561
1922
1913
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1923
1914
msgstr ""
1924
1915
" * «bzr log guide.txt» выведет журнал файла, добавленного в ревизии 1"
1925
1916
1926
#: bzrlib/builtins.py:2592
1917
#: bzrlib/builtins.py:2563
1927
1918
msgid ""
1928
1919
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1929
1920
msgstr ""
1930
1921
" * «bzr log tutorial.txt» выведет журнал нового файла, добавленного\r\n"
1931
1922
" в ревизии 3"
1932
1923
1933
#: bzrlib/builtins.py:2594
1924
#: bzrlib/builtins.py:2565
1934
1925
msgid ""
1935
1926
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1936
1927
" the original file in revision 2."
1938
1929
" * «bzr log -r2 -p tutorial.txt» выведет изменения оригинального\n"
1939
1930
" файла в ревизии 2."
1940
1931
1941
#: bzrlib/builtins.py:2597
1932
#: bzrlib/builtins.py:2568
1942
1933
msgid ""
1943
1934
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1944
1935
" was no file called guide.txt in revision 2."
1946
1937
" * «bzr log -r2 -p guide.txt» выведет сообщение об ошибке, так как\n"
1947
1938
" в ревизии 2 нет файла guide.txt."
1948
1939
1949
#: bzrlib/builtins.py:2600
1940
#: bzrlib/builtins.py:2571
1950
1941
msgid ""
1951
1942
" Renames are always followed by log. By design, there is no need to\n"
1952
1943
" explicitly ask for this (and no way to stop logging a file back\n"
1953
1944
" until it was last renamed)."
1954
1945
msgstr ""
1955
1946
1956
#: bzrlib/builtins.py:2604
1947
#: bzrlib/builtins.py:2575
1957
1948
msgid ":Other filtering:"
1958
1949
msgstr ":Другая фильтрация:"
1959
1950
1960
#: bzrlib/builtins.py:2606
1951
#: bzrlib/builtins.py:2577
1961
1952
msgid ""
1962
1953
" The --match option can be used for finding revisions that match a\n"
1963
1954
" regular expression in a commit message, committer, author or bug.\n"
1972
1963
" полям можно использовать опции --match-author, --match-bugs,\n"
1973
1964
" --match-committer и --match-message."
1974
1965
1975
#: bzrlib/builtins.py:2612
1966
#: bzrlib/builtins.py:2583
1976
1967
msgid ":Tips & tricks:"
1977
1968
msgstr ":Советы и трюки:"
1978
1969
1979
#: bzrlib/builtins.py:2614
1970
#: bzrlib/builtins.py:2585
1980
1971
msgid ""
1981
1972
" GUI tools and IDEs are often better at exploring history than command\n"
1982
1973
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1990
1981
" <http://doc.bazaar.canonical.com/plugins/en/> и\n"
1991
1982
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1992
1983
1993
#: bzrlib/builtins.py:2620
1984
#: bzrlib/builtins.py:2591
1994
1985
msgid ""
1995
1986
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1996
1987
msgstr ""
1997
1988
" Возможно, вы захотите добавить следующие псевдонимы в «bazaar.conf»::"
1998
1989
1999
#: bzrlib/builtins.py:2622
1990
#: bzrlib/builtins.py:2593
2000
1991
msgid ""
2001
1992
" [ALIASES]\n"
2002
1993
" tip = log -r-1\n"
2008
1999
" top = log -l10 --line\n"
2009
2000
" show = log -v -p"
2010
2001
2011
#: bzrlib/builtins.py:2627
2002
#: bzrlib/builtins.py:2598
2012
2003
msgid ""
2013
2004
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
2014
2005
" will show the last 10 mainline revisions. To see the details of a\n"
2018
2009
" 10 ревизий основной линии. Чтобы просмотреть журнал определённой\n"
2019
2010
" ревизии X, используйте «bzr show -rX»."
2020
2011
2021
#: bzrlib/builtins.py:2631
2012
#: bzrlib/builtins.py:2602
2022
2013
msgid ""
2023
2014
" If you are interested in looking deeper into a particular merge X,\n"
2024
2015
" use ``bzr log -n0 -rX``."
2026
2017
" Если вы хотите подробно рассмотреть определённое слияние X,\n"
2027
2018
" используйте «bzr log -n0 -rX»."
2028
2019
2029
#: bzrlib/builtins.py:2634
2020
#: bzrlib/builtins.py:2605
2030
2021
msgid ""
2031
2022
" ``bzr log -v`` on a branch with lots of history is currently\n"
2032
2023
" very slow. A fix for this issue is currently under development.\n"
2038
2029
" недостатка. Независимо от того, будет это исправлено или нет,\n"
2039
2030
" рекомендуется задавать интервал ревизий с помощью опции -v."
2040
2031
2041
#: bzrlib/builtins.py:2639
2032
#: bzrlib/builtins.py:2610
2042
2033
msgid ""
2043
2034
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
2044
2035
" used to find revisions matching user names, commit messages, etc.\n"
2046
2037
" a list of words but not others."
2047
2038
msgstr ""
2048
2039
2049
#: bzrlib/builtins.py:2644
2040
#: bzrlib/builtins.py:2615
2050
2041
msgid ""
2051
2042
" When exploring non-mainline history on large projects with deep\n"
2052
2043
" history, the performance of log can be greatly improved by installing\n"
2054
2045
" trading disk space for faster speed."
2055
2046
msgstr ""
2056
2047
2057
#: bzrlib/builtins.py:2653
2048
#: bzrlib/builtins.py:2624
2058
2049
msgid "Show from oldest to newest."
2059
2050
msgstr "Выводить от старых к новым."
2060
2051
2061
#: bzrlib/builtins.py:2656
2052
#: bzrlib/builtins.py:2627
2062
2053
msgid "Show files changed in each revision."
2063
2054
msgstr "Показывать файлы, изменённые в каждой ревизии."
2064
2055
2065
#: bzrlib/builtins.py:2662
2056
#: bzrlib/builtins.py:2633
2066
2057
msgid "Show just the specified revision. See also \"help revisionspec\"."
2067
2058
msgstr "Показать только указанную ревизию. См. также «help revisionspec»."
2068
2059
2069
#: bzrlib/builtins.py:2666
2060
#: bzrlib/builtins.py:2637
2070
2061
msgid "What names to list as authors - first, all or committer."
2071
2062
msgstr "Какие имена выводить, как авторов — first, all или committer."
2072
2063
2073
#: bzrlib/builtins.py:2667
2064
#: bzrlib/builtins.py:2638
2074
2065
msgid "Authors"
2075
2066
msgstr "Авторы"
2076
2067
2077
#: bzrlib/builtins.py:2672
2068
#: bzrlib/builtins.py:2643
2078
2069
msgid "Number of levels to display - 0 for all, 1 for flat."
2079
2070
msgstr "Число уровней для вывода — 0 для всех, 1 для плоского вывода."
2080
2071
2081
#: bzrlib/builtins.py:2682
2072
#: bzrlib/builtins.py:2653
2082
2073
msgid "Limit the output to the first N revisions."
2083
2074
msgstr "Ограничить вывод лишь первыми N ревизиями."
2084
2075
2085
#: bzrlib/builtins.py:2687
2076
#: bzrlib/builtins.py:2658
2086
2077
msgid "Show changes made in each revision as a patch."
2087
2078
msgstr "Показать изменения, сделанные в каждой ревизии, в виде патча."
2088
2079
2089
#: bzrlib/builtins.py:2689
2080
#: bzrlib/builtins.py:2660
2090
2081
msgid "Show merged revisions like --levels 0 does."
2091
2082
msgstr "Показывать слияния, как это делает --levels 0."
2092
2083
2093
#: bzrlib/builtins.py:2693
2084
#: bzrlib/builtins.py:2664
2094
2085
msgid "Do not report commits with more than one parent."
2095
2086
msgstr "Не сообщать о закреплениях с более, чем одним родителем."
2096
2087
2097
#: bzrlib/builtins.py:2695
2088
#: bzrlib/builtins.py:2666
2098
2089
msgid ""
2099
2090
"Display only the revisions that are not part of both ancestries (require -"
2100
2091
"rX..Y)."
2102
2093
"Показать только ревизии, которые не являются частью обоих предков (требует -"
2103
2094
"rX..Y)."
2104
2095
2105
#: bzrlib/builtins.py:2699
2096
#: bzrlib/builtins.py:2670
2106
2097
msgid "Show digital signature validity."
2107
msgstr "Показать корректность цифровой подписи."
2098
msgstr ""
2108
2099
2109
#: bzrlib/builtins.py:2702
2100
#: bzrlib/builtins.py:2673
2110
2101
msgid "Show revisions whose properties match this expression."
2111
2102
msgstr "Показывать ревизии, свойства которых удовлетворяют этому выражению."
2112
2103
2113
#: bzrlib/builtins.py:2706
2104
#: bzrlib/builtins.py:2677
2114
2105
msgid "Show revisions whose message matches this expression."
2115
2106
msgstr ""
2116
2107
"Показывать ревизии, комментарий которых удовлетворяет этому выражению."
2117
2108
2118
#: bzrlib/builtins.py:2710
2109
#: bzrlib/builtins.py:2681
2119
2110
msgid "Show revisions whose committer matches this expression."
2120
2111
msgstr ""
2121
2112
"Показывать ревизии, закрепитель которых удовлетворяет этому выражению."
2122
2113
2123
#: bzrlib/builtins.py:2714
2114
#: bzrlib/builtins.py:2685
2124
2115
msgid "Show revisions whose authors match this expression."
2125
2116
msgstr "Показывать ревизии, авторы которых удовлетворяют этому выражению."
2126
2117
2127
#: bzrlib/builtins.py:2718
2118
#: bzrlib/builtins.py:2689
2128
2119
msgid "Show revisions whose bugs match this expression."
2129
2120
msgstr "Показывать ревизии, ошибки которых удовлетворяют этому выражению."
2130
2121
2131
#: bzrlib/builtins.py:2772
2122
#: bzrlib/builtins.py:2743
2132
2123
msgid "--exclude-common-ancestry requires -r with two revisions"
2133
2124
msgstr "--exclude-common-ancestry требует -r с двумя ревизиями"
2134
2125
2135
#: bzrlib/builtins.py:2800
2126
#: bzrlib/builtins.py:2771
2136
2127
#, python-format
2137
2128
msgid "Path unknown at end or start of revision range: %s"
2138
2129
msgstr "Неизвестный путь в начале или конце интервала ревизий: %s"
2139
2130
2140
#: bzrlib/builtins.py:2917
2131
#: bzrlib/builtins.py:2888
2141
2132
#, python-format
2142
2133
msgid "bzr %s doesn't accept two revisions in different branches."
2143
2134
msgstr "bzr %s не принимает две ревизии в различных ветвях."
2144
2135
2145
#: bzrlib/builtins.py:2933
2136
#: bzrlib/builtins.py:2904
2146
2137
#, python-format
2147
2138
msgid "bzr %s --revision takes one or two values."
2148
2139
msgstr "bzr %s --revision принимает одно или два значения."
2149
2140
2150
#: bzrlib/builtins.py:2978
2141
#: bzrlib/builtins.py:2949
2151
2142
msgid ""
2152
2143
"List files in a tree.\n"
2153
2144
" "
2155
2146
"Вывести список файлов в дереве.\n"
2156
2147
" "
2157
2148
2158
#: bzrlib/builtins.py:2987
2149
#: bzrlib/builtins.py:2958
2159
2150
msgid "Recurse into subdirectories."
2160
2151
msgstr "Рекурсивно входить в поддиректории."
2161
2152
2162
#: bzrlib/builtins.py:2989
2153
#: bzrlib/builtins.py:2960
2163
2154
msgid "Print paths relative to the root of the branch."
2164
2155
msgstr "Выводить пути относительно корня ветви."
2165
2156
2166
#: bzrlib/builtins.py:2991
2157
#: bzrlib/builtins.py:2962
2167
2158
msgid "Print unknown files."
2168
2159
msgstr "Выводить неизвестные файлы."
2169
2160
2170
#: bzrlib/builtins.py:2992
2161
#: bzrlib/builtins.py:2963
2171
2162
msgid "Print versioned files."
2172
2163
msgstr "Выводить файлы под контролем системы версий."
2173
2164
2174
#: bzrlib/builtins.py:2995
2165
#: bzrlib/builtins.py:2966
2175
2166
msgid "Print ignored files."
2176
2167
msgstr "Выводить игнорируемые файлы."
2177
2168
2178
#: bzrlib/builtins.py:2997
2169
#: bzrlib/builtins.py:2968
2179
2170
msgid "List entries of a particular kind: file, directory, symlink."
2180
2171
msgstr "Выводить файлы определённого типа: file, directory, symlink."
2181
2172
2182
#: bzrlib/builtins.py:3010
2173
#: bzrlib/builtins.py:2981
2183
2174
msgid "invalid kind specified"
2184
2175
msgstr "указан неверный вид файла"
2185
2176
2186
#: bzrlib/builtins.py:3013
2177
#: bzrlib/builtins.py:2984
2187
2178
msgid "Cannot set both --verbose and --null"
2188
2179
msgstr "Нельзя установить оба --verbose и --null"
2189
2180
2190
#: bzrlib/builtins.py:3022
2181
#: bzrlib/builtins.py:2993
2191
2182
msgid "cannot specify both --from-root and PATH"
2192
2183
msgstr "нельзя указать оба --from-root и PATH"
2193
2184
2194
#: bzrlib/builtins.py:3109
2185
#: bzrlib/builtins.py:3080
2195
2186
msgid "Ignore specified files or patterns."
2196
2187
msgstr "Игнорировать указанные файлы или шаблоны."
2197
2188
2198
#: bzrlib/builtins.py:3111
2189
#: bzrlib/builtins.py:3082
2199
2190
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2200
2191
msgstr "Смотрите подробности о синтаксисе шаблонов в «bzr help patterns»."
2201
2192
2202
#: bzrlib/builtins.py:3113
2193
#: bzrlib/builtins.py:3084
2203
2194
msgid ""
2204
2195
"If a .bzrignore file does not exist, the ignore command\n"
2205
2196
"will create one and add the specified files or patterns to the newly\n"
2213
2204
"к системе версий. Создание файла .bzrignore без использования\n"
2214
2205
"команды ignore потребует явного добавления командой add."
2215
2206
2216
#: bzrlib/builtins.py:3119
2207
#: bzrlib/builtins.py:3090
2217
2208
msgid ""
2218
2209
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2219
2210
"After adding, editing or deleting that file either indirectly by\n"
2225
2216
"файла, как неявно с помощью этой команды, так и явно при помощи\n"
2226
2217
"редактора, не забывайте закреплять его."
2227
2218
2228
#: bzrlib/builtins.py:3124
2219
#: bzrlib/builtins.py:3095
2229
2220
msgid ""
2230
2221
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2231
2222
"the global ignore file can be found in the application data directory as\n"
2241
2232
"Эта команда не изменяет глобальный файл игнорирования. Он может быть\n"
2242
2233
"отредактирован вручную с помощью текстового редактора."
2243
2234
2244
#: bzrlib/builtins.py:3130
2235
#: bzrlib/builtins.py:3101
2245
2236
msgid ""
2246
2237
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2247
2238
"precedence over regular ignores. Such exceptions are used to specify\n"
2252
2243
"указания файлов, которые должны попасть под контроль системы версий, но\n"
2253
2244
"по умолчанию игнорируются."
2254
2245
2255
#: bzrlib/builtins.py:3134
2246
#: bzrlib/builtins.py:3105
2256
2247
msgid ""
2257
2248
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2258
2249
"precedence over the '!' exception patterns."
2260
2251
"Шаблоны, начинающиеся с '!!' ведут себя как обычные шаблоны, но имеют\n"
2261
2252
"приоритет над шаблонами исключений '!'."
2262
2253
2263
#: bzrlib/builtins.py:3137
2254
#: bzrlib/builtins.py:3108
2264
2255
msgid ""
2265
2256
":Notes: \n"
2266
2257
" \n"
2272
2263
"* Шаблоны игнорирования, содержащие специальные символы оболочки,\n"
2273
2264
" должны быть заключены в кавычки при указании в командной строке."
2274
2265
2275
#: bzrlib/builtins.py:3142
2266
#: bzrlib/builtins.py:3113
2276
2267
msgid ""
2277
2268
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2278
2269
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2281
2272
" Чтобы добавить шаблон, начинающийся с этого символа, используйте\n"
2282
2273
" префикс \"RE:\"."
2283
2274
2284
#: bzrlib/builtins.py:3145
2275
#: bzrlib/builtins.py:3116
2285
2276
msgid ""
2286
2277
":Examples:\n"
2287
2278
" Ignore the top level Makefile::"
2289
2280
":Примеры:\n"
2290
2281
" Игнорировать файл Makefile на верхнем уровне::"
2291
2282
2292
#: bzrlib/builtins.py:3148
2283
#: bzrlib/builtins.py:3119
2293
2284
msgid " bzr ignore ./Makefile"
2294
2285
msgstr " bzr ignore ./Makefile"
2295
2286
2296
#: bzrlib/builtins.py:3150
2287
#: bzrlib/builtins.py:3121
2297
2288
msgid " Ignore .class files in all directories...::"
2298
2289
msgstr " Игнорировать файлы .class во всех директориях...::"
2299
2290
2300
#: bzrlib/builtins.py:3152
2291
#: bzrlib/builtins.py:3123
2301
2292
msgid " bzr ignore \"*.class\""
2302
2293
msgstr " bzr ignore \"*.class\""
2303
2294
2304
#: bzrlib/builtins.py:3154
2295
#: bzrlib/builtins.py:3125
2305
2296
msgid " ...but do not ignore \"special.class\"::"
2306
2297
msgstr " ...но не игнорировать \"special.class\"::"
2307
2298
2308
#: bzrlib/builtins.py:3156
2299
#: bzrlib/builtins.py:3127
2309
2300
msgid " bzr ignore \"!special.class\""
2310
2301
msgstr " bzr ignore \"!special.class\""
2311
2302
2312
#: bzrlib/builtins.py:3158
2303
#: bzrlib/builtins.py:3129
2313
2304
msgid " Ignore files whose name begins with the \"#\" character::"
2314
2305
msgstr " Игнорировать файлы, начинающиеся с символа \"#\"::"
2315
2306
2316
#: bzrlib/builtins.py:3160
2307
#: bzrlib/builtins.py:3131
2317
2308
msgid " bzr ignore \"RE:^#\""
2318
2309
msgstr " bzr ignore \"RE:^#\""
2319
2310
2320
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2311
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2321
2312
msgid " Ignore .o files under the lib directory::"
2322
2313
msgstr " Игнорировать файлы .o в директории lib::"
2323
2314
2324
#: bzrlib/builtins.py:3164
2315
#: bzrlib/builtins.py:3135
2325
2316
msgid " bzr ignore \"lib/**/*.o\""
2326
2317
msgstr " bzr ignore \"lib/**/*.o\""
2327
2318
2328
#: bzrlib/builtins.py:3168
2319
#: bzrlib/builtins.py:3139
2329
2320
msgid " bzr ignore \"RE:lib/.*\\.o\""
2330
2321
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2331
2322
2332
#: bzrlib/builtins.py:3170
2323
#: bzrlib/builtins.py:3141
2333
2324
msgid " Ignore everything but the \"debian\" toplevel directory::"
2334
2325
msgstr " Игнорировать всё, кроме верхней директории \"debian\"::"
2335
2326
2336
#: bzrlib/builtins.py:3172
2327
#: bzrlib/builtins.py:3143
2337
2328
msgid ""
2338
2329
" bzr ignore \"RE:(?!debian/).*\"\n"
2339
2330
" \n"
2353
2344
" bzr ignore \"!./local\"\n"
2354
2345
" bzr ignore \"!!*~\""
2355
2346
2356
#: bzrlib/builtins.py:3186
2347
#: bzrlib/builtins.py:3157
2357
2348
msgid "Display the default ignore rules that bzr uses."
2358
2349
msgstr "Вывести правила игнорирования, которые bzr использует по умолчанию."
2359
2350
2360
#: bzrlib/builtins.py:3198
2351
#: bzrlib/builtins.py:3169
2361
2352
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2362
2353
msgstr ""
2363
2354
"Для ignore требуется как минимум одно из NAME_PATTERN или --default-rules."
2364
2355
2365
#: bzrlib/builtins.py:3209
2356
#: bzrlib/builtins.py:3180
2366
2357
#, python-format
2367
2358
msgid "Invalid ignore pattern found. %s"
2368
2359
msgid_plural "Invalid ignore patterns found. %s"
2370
2361
msgstr[1] "Найдены некорректные шаблоны игнорирования. %s"
2371
2362
msgstr[2] "Найдены некорректные шаблоны игнорирования. %s"
2372
2363
2373
#: bzrlib/builtins.py:3218
2364
#: bzrlib/builtins.py:3189
2374
2365
msgid "NAME_PATTERN should not be an absolute path"
2375
2366
msgstr "NAME_PATTERN не должен быть абсолютным путём"
2376
2367
2377
#: bzrlib/builtins.py:3231
2368
#: bzrlib/builtins.py:3202
2378
2369
#, python-format
2379
2370
msgid ""
2380
2371
"Warning: the following files are version controlled and match your ignore "
2389
2380
"Эти файлы будут продолжать под контролем системы версий, пока вы не "
2390
2381
"выполните 'bzr remove'.\n"
2391
2382
2392
#: bzrlib/builtins.py:3238
2383
#: bzrlib/builtins.py:3209
2393
2384
msgid "List ignored files and the patterns that matched them."
2394
2385
msgstr "Вывести игнорируемые файлы и шаблоны, которым они удовлетворяют."
2395
2386
2396
#: bzrlib/builtins.py:3240
2387
#: bzrlib/builtins.py:3211
2397
2388
msgid ""
2398
2389
"List all the ignored files and the ignore pattern that caused the file to\n"
2399
2390
"be ignored."
2401
2392
"Вывести все игнорируемые файлы и шаблоны игнорирования, из-за которых эти\n"
2402
2393
"файлы игнорируются."
2403
2394
2404
#: bzrlib/builtins.py:3243
2395
#: bzrlib/builtins.py:3214
2405
2396
msgid "Alternatively, to list just the files::"
2406
2397
msgstr "Альтернативно, чтобы вывести только файлы::"
2407
2398
2408
#: bzrlib/builtins.py:3245
2399
#: bzrlib/builtins.py:3216
2409
2400
msgid " bzr ls --ignored"
2410
2401
msgstr " bzr ls --ignored"
2411
2402
2412
#: bzrlib/builtins.py:3279
2403
#: bzrlib/builtins.py:3250
2413
2404
#, python-format
2414
2405
msgid "not a valid revision-number: %r"
2415
2406
msgstr "некорректный номер ревизии: %r"
2416
2407
2417
#: bzrlib/builtins.py:3286
2408
#: bzrlib/builtins.py:3257
2418
2409
msgid ""
2419
2410
"Export current or past revision to a destination directory or archive."
2420
2411
msgstr ""
2421
2412
"Экспортировать текущую или прошлую ревизию в директорию назначения\r\n"
2422
2413
"или архив."
2423
2414
2424
#: bzrlib/builtins.py:3288
2415
#: bzrlib/builtins.py:3259
2425
2416
msgid "If no revision is specified this exports the last committed revision."
2426
2417
msgstr "Если ревизия не указана, экспортирует последнюю ревизию."
2427
2418
2428
#: bzrlib/builtins.py:3290
2419
#: bzrlib/builtins.py:3261
2429
2420
msgid ""
2430
2421
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2431
2422
"given, try to find the format with the extension. If no extension\n"
2435
2426
"Если не указан, формат определяется по расширению. Если расширение\n"
2436
2427
"отсутствует, экспортирует в директорию (эквивалентно --format=dir)."
2437
2428
2438
#: bzrlib/builtins.py:3294
2429
#: bzrlib/builtins.py:3265
2439
2430
msgid ""
2440
2431
"If root is supplied, it will be used as the root directory inside\n"
2441
2432
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2446
2437
"умолчанию используется имя файла для эскпорта. Опция root не имеет\n"
2447
2438
"эффекта для формата 'dir'."
2448
2439
2449
#: bzrlib/builtins.py:3298
2440
#: bzrlib/builtins.py:3269
2450
2441
msgid ""
2451
2442
"If branch is omitted then the branch containing the current working\n"
2452
2443
"directory will be used."
2454
2445
"Если ветвь опущена, используется ветвь, содержащая текущую рабочую\n"
2455
2446
"директорию."
2456
2447
2457
#: bzrlib/builtins.py:3301
2448
#: bzrlib/builtins.py:3272
2458
2449
msgid ""
2459
2450
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2460
2451
msgstr ""
2461
2452
"Замечание: Экспорт в zip деревьев с именами файлов, содержащими не-ASCII\r\n"
2462
2453
"символы, не поддерживается."
2463
2454
2464
#: bzrlib/builtins.py:3303
2455
#: bzrlib/builtins.py:3274
2465
2456
msgid ""
2466
2457
" ================= =========================\n"
2467
2458
" Supported formats Autodetected by extension\n"
2483
2474
" zip .zip\n"
2484
2475
" ====================== ============================="
2485
2476
2486
#: bzrlib/builtins.py:3317
2477
#: bzrlib/builtins.py:3288
2487
2478
msgid "Type of file to export to."
2488
2479
msgstr "Тип файла для экспорта."
2489
2480
2490
#: bzrlib/builtins.py:3320
2481
#: bzrlib/builtins.py:3291
2491
2482
msgid "Apply content filters to export the convenient form."
2492
msgstr "Применить фильтры содержимого для экспорта в удобной форме."
2483
msgstr ""
2493
2484
2494
#: bzrlib/builtins.py:3324
2485
#: bzrlib/builtins.py:3295
2495
2486
msgid "Name of the root directory inside the exported file."
2496
2487
msgstr "Имя корневой директории внутри экспортируемого файла."
2497
2488
2498
#: bzrlib/builtins.py:3326
2489
#: bzrlib/builtins.py:3297
2499
2490
msgid ""
2500
2491
"Set modification time of files to that of the last revision in which it was "
2501
2492
"changed."
2503
2494
"Установить время изменения файлов на время последней ревизии, в которой они "
2504
2495
"были изменены."
2505
2496
2506
#: bzrlib/builtins.py:3329
2497
#: bzrlib/builtins.py:3300
2507
2498
msgid ""
2508
2499
"Export the working tree contents rather than that of the last revision."
2509
msgstr "Экспортировать содержимое рабочего дерева вместо последней ревизии."
2500
msgstr ""
2510
2501
2511
#: bzrlib/builtins.py:3348
2502
#: bzrlib/builtins.py:3319
2512
2503
msgid "--uncommitted requires a working tree"
2513
2504
msgstr "--uncommitted требует рабочее дерево"
2514
2505
2515
#: bzrlib/builtins.py:3357
2506
#: bzrlib/builtins.py:3328
2516
2507
#, python-format
2517
2508
msgid "Unsupported export format: %s"
2518
2509
msgstr "Неподдерживаемый формат экспорта: %s"
2519
2510
2520
#: bzrlib/builtins.py:3361
2511
#: bzrlib/builtins.py:3332
2521
2512
msgid ""
2522
2513
"Write the contents of a file as of a given revision to standard output."
2523
2514
msgstr ""
2524
2515
"Вывести содержимое файла из определённой ревизии на стандартный вывод."
2525
2516
2526
#: bzrlib/builtins.py:3363
2517
#: bzrlib/builtins.py:3334
2527
2518
msgid "If no revision is nominated, the last revision is used."
2528
2519
msgstr "Если ревизия не указана, используется последняя."
2529
2520
2530
#: bzrlib/builtins.py:3365
2521
#: bzrlib/builtins.py:3336
2531
2522
msgid ""
2532
2523
"Note: Take care to redirect standard output when using this command on a\n"
2533
2524
"binary file."
2535
2526
"Замечание: Не забывайте перенаправлять стандартный вывод при использовании\n"
2536
2527
"этой команды на двоичном файле."
2537
2528
2538
#: bzrlib/builtins.py:3371
2529
#: bzrlib/builtins.py:3342
2539
2530
msgid "The path name in the old tree."
2540
2531
msgstr "Имя пути в старом дереве."
2541
2532
2542
#: bzrlib/builtins.py:3372
2533
#: bzrlib/builtins.py:3343
2543
2534
msgid "Apply content filters to display the convenience form."
2544
2535
msgstr "Применить фильтры содержимого для отображения в удобной форме."
2545
2536
2546
#: bzrlib/builtins.py:3383
2537
#: bzrlib/builtins.py:3354
2547
2538
msgid "bzr cat --revision takes exactly one revision specifier"
2548
2539
msgstr "bzr cat --revision принимает ровно один спецификатор ревизии"
2549
2540
2550
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2541
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2551
2542
msgid "{0!r} is not present in revision {1}"
2552
2543
msgstr "{0!r} не представлен в ревизии {1}"
2553
2544
2554
#: bzrlib/builtins.py:3443
2545
#: bzrlib/builtins.py:3414
2555
2546
msgid "Commit changes into a new revision."
2556
2547
msgstr "Закрепить изменения в новой ревизии."
2557
2548
2558
#: bzrlib/builtins.py:3445
2549
#: bzrlib/builtins.py:3416
2559
2550
msgid ""
2560
2551
"An explanatory message needs to be given for each commit. This is\n"
2561
2552
"often done by using the --message option (getting the message from the\n"
2565
2556
"boilerplate text loaded into the editor, use the --show-diff option."
2566
2557
msgstr ""
2567
2558
2568
#: bzrlib/builtins.py:3452
2559
#: bzrlib/builtins.py:3423
2569
2560
msgid ""
2570
2561
"By default, the entire tree is committed and the person doing the\n"
2571
2562
"commit is assumed to be the author. These defaults can be overridden\n"
2574
2565
"По умолчанию, закрепляется всё дерево и закрепляющий считается автором.\n"
2575
2566
"Эти умолчания могут быть перезаписаны, как объяснено ниже."
2576
2567
2577
#: bzrlib/builtins.py:3456
2568
#: bzrlib/builtins.py:3427
2578
2569
msgid ":Selective commits:"
2579
2570
msgstr ":Выборочные закрепления:"
2580
2571
2581
#: bzrlib/builtins.py:3458
2572
#: bzrlib/builtins.py:3429
2582
2573
msgid ""
2583
2574
" If selected files are specified, only changes to those files are\n"
2584
2575
" committed. If a directory is specified then the directory and\n"
2588
2579
" Если указана директория, то закрепляется директория и всё её\n"
2589
2580
" содержимое."
2590
2581
2591
#: bzrlib/builtins.py:3462
2582
#: bzrlib/builtins.py:3433
2592
2583
msgid ""
2593
2584
" When excludes are given, they take precedence over selected files.\n"
2594
2585
" For example, to commit only changes within foo, but not changes\n"
2598
2589
" Например, чтобы закрепить изменения внутри foo, но не изменения\n"
2599
2590
" в foo/bar::"
2600
2591
2601
#: bzrlib/builtins.py:3466
2592
#: bzrlib/builtins.py:3437
2602
2593
msgid " bzr commit foo -x foo/bar"
2603
2594
msgstr " bzr commit foo -x foo/bar"
2604
2595
2605
#: bzrlib/builtins.py:3468
2596
#: bzrlib/builtins.py:3439
2606
2597
msgid " A selective commit after a merge is not yet supported."
2607
2598
msgstr " Выборочные закрепления после слияния пока не поддерживаются."
2608
2599
2609
#: bzrlib/builtins.py:3470
2600
#: bzrlib/builtins.py:3441
2610
2601
msgid ":Custom authors:"
2611
2602
msgstr ":Выбор автора:"
2612
2603
2613
#: bzrlib/builtins.py:3472
2604
#: bzrlib/builtins.py:3443
2614
2605
msgid ""
2615
2606
" If the author of the change is not the same person as the committer,\n"
2616
2607
" you can specify the author's name using the --author option. The\n"
2625
2616
" \"John Doe <jdoe@example.com>\". Если в изменении участвовал более,\n"
2626
2617
" чем один автор, вы можете указать эту опцию несколько раз."
2627
2618
2628
#: bzrlib/builtins.py:3479
2619
#: bzrlib/builtins.py:3450
2629
2620
msgid ":Checks:"
2630
2621
msgstr ":Проверки:"
2631
2622
2632
#: bzrlib/builtins.py:3481
2623
#: bzrlib/builtins.py:3452
2633
2624
msgid ""
2634
2625
" A common mistake is to forget to add a new file or directory before\n"
2635
2626
" running the commit command. The --strict option checks for unknown\n"
2643
2634
" быть реализованы определением обработчиков. Подробности можно найти,\n"
2644
2635
" выполнив команду ``bzr help hooks''."
2645
2636
2646
#: bzrlib/builtins.py:3487
2637
#: bzrlib/builtins.py:3458
2647
2638
msgid ":Things to note:"
2648
2639
msgstr ":На заметку:"
2649
2640
2650
#: bzrlib/builtins.py:3489
2641
#: bzrlib/builtins.py:3460
2651
2642
msgid ""
2652
2643
" If you accidentially commit the wrong changes or make a spelling\n"
2653
2644
" mistake in the commit message say, you can use the uncommit command\n"
2658
2649
" uncommit, чтобы отменить последнее закрепление. Подробности смотрите\n"
2659
2650
" в «bzr help uncommit»."
2660
2651
2661
#: bzrlib/builtins.py:3493
2652
#: bzrlib/builtins.py:3464
2662
2653
msgid ""
2663
2654
" Hooks can also be configured to run after a commit. This allows you\n"
2664
2655
" to trigger updates to external systems like bug trackers. The --fixes\n"
2666
2657
" one or more bugs. See ``bzr help bugs`` for details."
2667
2658
msgstr ""
2668
2659
2669
#: bzrlib/builtins.py:3503
2660
#: bzrlib/builtins.py:3474
2670
2661
msgid "Do not consider changes made to a given path."
2671
2662
msgstr "Не рассматривать изменения, сделанные в заданном пути."
2672
2663
2673
#: bzrlib/builtins.py:3506
2664
#: bzrlib/builtins.py:3477
2674
2665
msgid "Description of the new revision."
2675
2666
msgstr "Описание новой ревизии."
2676
2667
2677
#: bzrlib/builtins.py:3509
2668
#: bzrlib/builtins.py:3480
2678
2669
msgid "Commit even if nothing has changed."
2679
2670
msgstr "Закрепить, даже если ничего не изменилось."
2680
2671
2681
#: bzrlib/builtins.py:3513
2672
#: bzrlib/builtins.py:3484
2682
2673
msgid "Take commit message from this file."
2683
2674
msgstr "Взять сообщение о закреплении из этого файла."
2684
2675
2685
#: bzrlib/builtins.py:3515
2676
#: bzrlib/builtins.py:3486
2686
2677
msgid "Refuse to commit if there are unknown files in the working tree."
2687
2678
msgstr ""
2688
2679
"Отказываться закреплять, если в рабочем дереве есть неизвестные файлы."
2689
2680
2690
#: bzrlib/builtins.py:3518
2681
#: bzrlib/builtins.py:3489
2691
2682
msgid ""
2692
2683
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2693
2684
"08:00:00 +0100'."
2695
2686
"Вручную установить время закрепления, используя формат даты закрепления, "
2696
2687
"напр. '2009-10-10 08:00:00 +0100'."
2697
2688
2698
#: bzrlib/builtins.py:3521
2689
#: bzrlib/builtins.py:3492
2699
2690
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2700
2691
msgstr ""
2701
2692
"Отметить ошибку, как исправленную в этой ревизии (см. «bzr help bugs»)."
2702
2693
2703
#: bzrlib/builtins.py:3524
2694
#: bzrlib/builtins.py:3495
2704
2695
msgid "Set the author's name, if it's different from the committer."
2705
2696
msgstr "Установить имя автора, если оно отличается от имени закрепляющего."
2706
2697
2707
#: bzrlib/builtins.py:3527
2698
#: bzrlib/builtins.py:3498
2708
2699
msgid ""
2709
2700
"Perform a local commit in a bound branch. Local commits are not pushed to "
2710
2701
"the master branch until a normal commit is performed."
2713
2704
"выгружаются в основную ветвь до тех пор, пока не совершено нормальное "
2714
2705
"закрепление."
2715
2706
2716
#: bzrlib/builtins.py:3533
2707
#: bzrlib/builtins.py:3504
2717
2708
msgid ""
2718
2709
"When no message is supplied, show the diff along with the status summary in "
2719
2710
"the message editor."
2721
2712
"Если не указано сообщение, показывать изменения формате diff вместе с "
2722
2713
"обзором состояния в редакторе сообщения."
2723
2714
2724
#: bzrlib/builtins.py:3536
2715
#: bzrlib/builtins.py:3507
2725
2716
msgid ""
2726
2717
"When committing to a foreign version control system do not push data that "
2727
2718
"can not be natively represented."
2729
2720
"При закреплении в иной системе контроля версий, не выгружать данные, которые "
2730
2721
"нельзя в ней представить."
2731
2722
2732
#: bzrlib/builtins.py:3554
2723
#: bzrlib/builtins.py:3525
2733
2724
#, python-format
2734
2725
msgid ""
2735
2726
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2741
2732
"Больше информации об этом можно узнать, выполнив «bzr help bugs». "
2742
2733
"Закрепление отклонено."
2743
2734
2744
#: bzrlib/builtins.py:3563
2735
#: bzrlib/builtins.py:3534
2745
2736
#, python-format
2746
2737
msgid ""
2747
2738
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2752
2743
"информации об этом можно узнать, выполнив «bzr help bugs».\n"
2753
2744
"Закрепление отклонено."
2754
2745
2755
#: bzrlib/builtins.py:3572
2746
#: bzrlib/builtins.py:3543
2756
2747
#, python-format
2757
2748
msgid "Unrecognized bug %s. Commit refused."
2758
2749
msgstr "Ошибка %s не распознана. Закрепление отклонено."
2759
2750
2760
#: bzrlib/builtins.py:3575
2751
#: bzrlib/builtins.py:3546
2761
2752
#, python-format
2762
2753
msgid ""
2763
2754
"%s\n"
2766
2757
"%s\n"
2767
2758
"Закрепление отклонено."
2768
2759
2769
#: bzrlib/builtins.py:3599
2760
#: bzrlib/builtins.py:3570
2770
2761
msgid "Could not parse --commit-time: "
2771
2762
msgstr "Не удалось разобрать --commit-time: "
2772
2763
2773
#: bzrlib/builtins.py:3639
2764
#: bzrlib/builtins.py:3610
2774
2765
msgid "please specify either --message or --file"
2775
2766
msgstr "укажите либо --message, либо --file"
2776
2767
2777
#: bzrlib/builtins.py:3668
2768
#: bzrlib/builtins.py:3639
2778
2769
msgid "please specify a commit message with either --message or --file"
2779
2770
msgstr "укажите сообщение о закреплении, используя --message либо --file"
2780
2771
2781
#: bzrlib/builtins.py:3671
2772
#: bzrlib/builtins.py:3642
2782
2773
msgid ""
2783
2774
"Empty commit message specified. Please specify a commit message with either -"
2784
2775
"-message or --file or leave a blank message with --message \"\"."
2786
2777
"Указано пустое сообщение о закреплении. Пожалуйста, укажите сообщение опцией "
2787
2778
"--message либо --file или оставьте пустым, указав --message \"\"."
2788
2779
2789
#: bzrlib/builtins.py:3691
2780
#: bzrlib/builtins.py:3662
2790
2781
msgid ""
2791
2782
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2792
2783
"-unchanged to force an empty commit."
2795
2786
"командой 'bzr add', или используйте --unchanged, чтобы принудительно сделать "
2796
2787
"пустое закрепление."
2797
2788
2798
#: bzrlib/builtins.py:3695
2789
#: bzrlib/builtins.py:3666
2799
2790
msgid ""
2800
2791
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2801
2792
"resolve FILE\" to resolve."
2803
2794
"В рабочем дереве обнаружены конфликты. Выполните «bzr conflicts», чтобы "
2804
2795
"вывести список конфликтов и «bzr resolve ФАЙЛ» для исправления."
2805
2796
2806
#: bzrlib/builtins.py:3699
2797
#: bzrlib/builtins.py:3670
2807
2798
msgid "Commit refused because there are unknown files in the working tree."
2808
2799
msgstr "Закрепление отклонено, поскольку в рабочем дереве неизвестные файлы."
2809
2800
2810
#: bzrlib/builtins.py:3702
2801
#: bzrlib/builtins.py:3673
2811
2802
msgid ""
2812
2803
"\n"
2813
2804
"To commit to master branch, run update and then commit.\n"
2814
2805
"You can also pass --local to commit to continue working disconnected."
2815
2806
msgstr ""
2816
2807
2817
#: bzrlib/builtins.py:3710
2808
#: bzrlib/builtins.py:3681
2818
2809
msgid ""
2819
2810
"Validate working tree structure, branch consistency and repository history."
2820
2811
msgstr ""
2821
2812
2822
#: bzrlib/builtins.py:3712
2813
#: bzrlib/builtins.py:3683
2823
2814
msgid ""
2824
2815
"This command checks various invariants about branch and repository storage\n"
2825
2816
"to detect data corruption or bzr bugs."
2826
2817
msgstr ""
2827
2818
2828
#: bzrlib/builtins.py:3715
2819
#: bzrlib/builtins.py:3686
2829
2820
msgid ""
2830
2821
"The working tree and branch checks will only give output if a problem is\n"
2831
2822
"detected. The output fields of the repository check are:"
2833
2824
"Проверки рабочего дерева и ветви выведут что-либо только в случае\n"
2834
2825
"обнаружения проблемы. Поля вывода проверки репозитория следующие:"
2835
2826
2836
#: bzrlib/builtins.py:3718
2827
#: bzrlib/builtins.py:3689
2837
2828
msgid ""
2838
2829
"revisions\n"
2839
2830
" This is just the number of revisions checked. It doesn't\n"
2843
2834
" Это просто число проверенных ревизий. Оно не указывает\n"
2844
2835
" на проблему."
2845
2836
2846
#: bzrlib/builtins.py:3722
2837
#: bzrlib/builtins.py:3693
2847
2838
msgid ""
2848
2839
"versionedfiles\n"
2849
2840
" This is just the number of versionedfiles checked. It\n"
2853
2844
" Это просто число проверенных файлов под контролем системы\n"
2854
2845
" версий. Оно не указывает на проблему."
2855
2846
2856
#: bzrlib/builtins.py:3726
2847
#: bzrlib/builtins.py:3697
2857
2848
msgid ""
2858
2849
"unreferenced ancestors\n"
2859
2850
" Texts that are ancestors of other texts, but\n"
2865
2856
" корректных ссылок в истории ревизии. Это небольшая\n"
2866
2857
" проблема, с которой Bazaar может разобраться."
2867
2858
2868
#: bzrlib/builtins.py:3731
2859
#: bzrlib/builtins.py:3702
2869
2860
msgid ""
2870
2861
"unique file texts\n"
2871
2862
" This is the total number of unique file contents\n"
2875
2866
" Это общее число уникального содержимого файлов, встреченного\n"
2876
2867
" в проверенных ревизиях. Оно не указывает на проблему."
2877
2868
2878
#: bzrlib/builtins.py:3735
2869
#: bzrlib/builtins.py:3706
2879
2870
msgid ""
2880
2871
"repeated file texts\n"
2881
2872
" This is the total number of repeated texts seen\n"
2889
2880
" файлов изменились, но их содержимое осталось прежним. Оно не\n"
2890
2881
" указывает на проблему."
2891
2882
2892
#: bzrlib/builtins.py:3741
2883
#: bzrlib/builtins.py:3712
2893
2884
msgid ""
2894
2885
"If no restrictions are specified, all Bazaar data that is found at the "
2895
2886
"given\n"
2896
2887
"location will be checked."
2897
2888
msgstr ""
2898
2889
2899
#: bzrlib/builtins.py:3746
2890
#: bzrlib/builtins.py:3717
2900
2891
msgid " Check the tree and branch at 'foo'::"
2901
2892
msgstr " Проверить рабочее дерево и ветвь в 'foo'::"
2902
2893
2903
#: bzrlib/builtins.py:3748
2894
#: bzrlib/builtins.py:3719
2904
2895
msgid " bzr check --tree --branch foo"
2905
2896
msgstr " bzr check --tree --branch foo"
2906
2897
2907
#: bzrlib/builtins.py:3750
2898
#: bzrlib/builtins.py:3721
2908
2899
msgid " Check only the repository at 'bar'::"
2909
2900
msgstr " Проверить только репозиторий в 'bar'::"
2910
2901
2911
#: bzrlib/builtins.py:3752
2902
#: bzrlib/builtins.py:3723
2912
2903
msgid " bzr check --repo bar"
2913
2904
msgstr " bzr check --repo bar"
2914
2905
2915
#: bzrlib/builtins.py:3754
2906
#: bzrlib/builtins.py:3725
2916
2907
msgid " Check everything at 'baz'::"
2917
2908
msgstr " Проверить всё в 'baz'::"
2918
2909
2919
#: bzrlib/builtins.py:3756
2910
#: bzrlib/builtins.py:3727
2920
2911
msgid " bzr check baz"
2921
2912
msgstr " bzr check baz"
2922
2913
2923
#: bzrlib/builtins.py:3762
2914
#: bzrlib/builtins.py:3733
2924
2915
msgid "Check the branch related to the current directory."
2925
2916
msgstr "Проверить ветвь, относящуюся к текущей директории."
2926
2917
2927
#: bzrlib/builtins.py:3764
2918
#: bzrlib/builtins.py:3735
2928
2919
msgid "Check the repository related to the current directory."
2929
2920
msgstr "Проверить репозиторий, относящийся к текущей директории."
2930
2921
2931
#: bzrlib/builtins.py:3766
2922
#: bzrlib/builtins.py:3737
2932
2923
msgid "Check the working tree related to the current directory."
2933
2924
msgstr "Проверить рабочее дерево, относящееся к текущей директории."
2934
2925
2935
#: bzrlib/builtins.py:3780
2926
#: bzrlib/builtins.py:3751
2936
2927
msgid "Upgrade a repository, branch or working tree to a newer format."
2937
2928
msgstr "Обновить репозиторий, ветвь или рабочее дерево до нового формата."
2938
2929
2939
#: bzrlib/builtins.py:3782
2930
#: bzrlib/builtins.py:3753
2940
2931
msgid ""
2941
2932
"When the default format has changed after a major new release of\n"
2942
2933
"Bazaar, you may be informed during certain operations that you\n"
2945
2936
"with older repositories or with older versions of Bazaar."
2946
2937
msgstr ""
2947
2938
2948
#: bzrlib/builtins.py:3788
2939
#: bzrlib/builtins.py:3759
2949
2940
msgid ""
2950
2941
"If you wish to upgrade to a particular format rather than the\n"
2951
2942
"current default, that can be specified using the --format option.\n"
2955
2946
"2.x default) so downgrading is not always possible."
2956
2947
msgstr ""
2957
2948
2958
#: bzrlib/builtins.py:3795
2949
#: bzrlib/builtins.py:3766
2959
2950
msgid ""
2960
2951
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2961
2952
"process (where # is a number). By default, this is left there on\n"
2966
2957
"afterwards."
2967
2958
msgstr ""
2968
2959
2969
#: bzrlib/builtins.py:3803
2960
#: bzrlib/builtins.py:3774
2970
2961
msgid ""
2971
2962
"If the location given is a shared repository, dependent branches\n"
2972
2963
"are also converted provided the repository converts successfully.\n"
2974
2965
"tried."
2975
2966
msgstr ""
2976
2967
2977
#: bzrlib/builtins.py:3808
2968
#: bzrlib/builtins.py:3779
2978
2969
msgid ""
2979
2970
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2980
2971
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2981
2972
msgstr ""
2982
2973
2983
#: bzrlib/builtins.py:3816
2974
#: bzrlib/builtins.py:3787
2984
2975
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2985
2976
msgstr ""
2986
2977
"Обновить до определённого формата. Подробности см. в «bzr help formats»."
2987
2978
2988
#: bzrlib/builtins.py:3820
2979
#: bzrlib/builtins.py:3791
2989
2980
msgid "Branch format"
2990
2981
msgstr "Формат ветви"
2991
2982
2992
#: bzrlib/builtins.py:3822
2983
#: bzrlib/builtins.py:3793
2993
2984
msgid "Remove the backup.bzr directory if successful."
2994
2985
msgstr "Удалить директорию backup.bzr при успешном завершении."
2995
2986
2996
#: bzrlib/builtins.py:3824
2987
#: bzrlib/builtins.py:3795
2997
2988
msgid "Show what would be done, but don't actually do anything."
2998
2989
msgstr ""
2999
2990
3000
#: bzrlib/builtins.py:3839
2991
#: bzrlib/builtins.py:3810
3001
2992
msgid "Show or set bzr user id."
3002
2993
msgstr ""
3003
2994
3004
#: bzrlib/builtins.py:3841
2995
#: bzrlib/builtins.py:3812
3005
2996
msgid ""
3006
2997
":Examples:\n"
3007
2998
" Show the email of the current user::"
3009
3000
":Примеры:\n"
3010
3001
" Показать email текущего пользователя::"
3011
3002
3012
#: bzrlib/builtins.py:3844
3003
#: bzrlib/builtins.py:3815
3013
3004
msgid " bzr whoami --email"
3014
3005
msgstr " bzr whoami --email"
3015
3006
3016
#: bzrlib/builtins.py:3846
3007
#: bzrlib/builtins.py:3817
3017
3008
msgid " Set the current user::"
3018
3009
msgstr " Установить текущего пользователя::"
3019
3010
3020
#: bzrlib/builtins.py:3848
3011
#: bzrlib/builtins.py:3819
3021
3012
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
3022
3013
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
3023
3014
3024
#: bzrlib/builtins.py:3852
3015
#: bzrlib/builtins.py:3823
3025
3016
msgid "Display email address only."
3026
3017
msgstr "Показать только адрес email."
3027
3018
3028
#: bzrlib/builtins.py:3854
3019
#: bzrlib/builtins.py:3825
3029
3020
msgid "Set identity for the current branch instead of globally."
3030
3021
msgstr ""
3031
3022
3032
#: bzrlib/builtins.py:3880
3023
#: bzrlib/builtins.py:3851
3033
3024
msgid "--email can only be used to display existing identity"
3034
3025
msgstr ""
3035
3026
3036
#: bzrlib/builtins.py:3904
3027
#: bzrlib/builtins.py:3873
3037
3028
msgid "Print or set the branch nickname."
3038
3029
msgstr "Вывести или установить имя ветви."
3039
3030
3040
#: bzrlib/builtins.py:3906
3031
#: bzrlib/builtins.py:3875
3041
3032
msgid ""
3042
"If unset, the colocated branch name is used for colocated branches, and\n"
3043
"the branch directory name is used for other branches. To print the\n"
3044
"current nickname, execute with no argument."
3033
"If unset, the tree root directory name is used as the nickname.\n"
3034
"To print the current nickname, execute with no argument."
3045
3035
msgstr ""
3046
3036
3047
#: bzrlib/builtins.py:3910
3037
#: bzrlib/builtins.py:3878
3048
3038
msgid ""
3049
3039
"Bound branches use the nickname of its master branch unless it is set\n"
3050
3040
"locally."
3051
3041
msgstr ""
3052
3042
3053
#: bzrlib/builtins.py:3930
3043
#: bzrlib/builtins.py:3898
3054
3044
msgid "Set/unset and display aliases."
3055
3045
msgstr "Установить, удалить или отобразить псевдонимы."
3056
3046
3057
#: bzrlib/builtins.py:3932
3047
#: bzrlib/builtins.py:3900
3058
3048
msgid ""
3059
3049
":Examples:\n"
3060
3050
" Show the current aliases::"
3062
3052
":Примеры:\n"
3063
3053
" Показать текущие псевдонимы::"
3064
3054
3065
#: bzrlib/builtins.py:3935
3055
#: bzrlib/builtins.py:3903
3066
3056
msgid " bzr alias"
3067
3057
msgstr " bzr alias"
3068
3058
3069
#: bzrlib/builtins.py:3937
3059
#: bzrlib/builtins.py:3905
3070
3060
msgid " Show the alias specified for 'll'::"
3071
3061
msgstr " Показать псевдоним для 'll'::"
3072
3062
3073
#: bzrlib/builtins.py:3939
3063
#: bzrlib/builtins.py:3907
3074
3064
msgid " bzr alias ll"
3075
3065
msgstr " bzr alias ll"
3076
3066
3077
#: bzrlib/builtins.py:3941
3067
#: bzrlib/builtins.py:3909
3078
3068
msgid " Set an alias for 'll'::"
3079
3069
msgstr " Установить псевдоним для 'll'::"
3080
3070
3081
#: bzrlib/builtins.py:3943
3071
#: bzrlib/builtins.py:3911
3082
3072
msgid " bzr alias ll=\"log --line -r-10..-1\""
3083
3073
msgstr " bzr alias ll=\"log --line -r-10..-1\""
3084
3074
3085
#: bzrlib/builtins.py:3945
3075
#: bzrlib/builtins.py:3913
3086
3076
msgid " To remove an alias for 'll'::"
3087
3077
msgstr " Удалить псевдоним для 'll'::"
3088
3078
3089
#: bzrlib/builtins.py:3947
3079
#: bzrlib/builtins.py:3915
3090
3080
msgid " bzr alias --remove ll"
3091
3081
msgstr " bzr alias --remove ll"
3092
3082
3093
#: bzrlib/builtins.py:3952
3083
#: bzrlib/builtins.py:3920
3094
3084
msgid "Remove the alias."
3095
3085
msgstr "Удалить псевдоним."
3096
3086
3097
#: bzrlib/builtins.py:3970
3087
#: bzrlib/builtins.py:3938
3098
3088
msgid "bzr alias --remove expects an alias to remove."
3099
3089
msgstr "bzr alias --remove требуется псевдоним для удаления."
3100
3090
3101
#: bzrlib/builtins.py:4151
3091
#: bzrlib/builtins.py:4119
3102
3092
msgid ""
3103
3093
"subunit not available. subunit needs to be installed to use --subunit."
3104
3094
msgstr ""
3105
3095
"subunit не доступен. Нужно установить subunit, чтобы использовать --subunit."
3106
3096
3107
#: bzrlib/builtins.py:4168
3097
#: bzrlib/builtins.py:4136
3108
3098
msgid ""
3109
3099
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3110
3100
msgstr ""
3111
3101
"--benchmark не поддерживается начиная с версии bzr 2.2; вместо этого "
3112
3102
"используйте bzr-usertest"
3113
3103
3114
#: bzrlib/builtins.py:4215
3104
#: bzrlib/builtins.py:4183
3115
3105
msgid "Show version of bzr."
3116
3106
msgstr "Вывести версию bzr."
3117
3107
3118
#: bzrlib/builtins.py:4219
3108
#: bzrlib/builtins.py:4187
3119
3109
msgid "Print just the version number."
3120
3110
msgstr "Вывести только номер версии."
3121
3111
3122
#: bzrlib/builtins.py:4238
3112
#: bzrlib/builtins.py:4206
3123
3113
msgid "It sure does!\n"
3124
3114
msgstr "Да, он крут!\n"
3125
3115
3126
#: bzrlib/builtins.py:4262
3116
#: bzrlib/builtins.py:4230
3127
3117
#, python-format
3128
3118
msgid "merge base is revision %s\n"
3129
3119
msgstr ""
3130
3120
3131
#: bzrlib/builtins.py:4266
3121
#: bzrlib/builtins.py:4234
3132
3122
msgid "Perform a three-way merge."
3133
3123
msgstr ""
3134
3124
3135
#: bzrlib/builtins.py:4268
3125
#: bzrlib/builtins.py:4236
3136
3126
msgid ""
3137
3127
"The source of the merge can be specified either in the form of a branch,\n"
3138
3128
"or in the form of a path to a file containing a merge directive generated\n"
3143
3133
"the current working tree."
3144
3134
msgstr ""
3145
3135
3146
#: bzrlib/builtins.py:4276
3136
#: bzrlib/builtins.py:4244
3147
3137
msgid ""
3148
3138
"When merging from a branch, by default bzr will try to merge in all new\n"
3149
3139
"work from the other branch, automatically determining an appropriate base\n"
3150
3140
"revision. If this fails, you may need to give an explicit base."
3151
3141
msgstr ""
3152
3142
3153
#: bzrlib/builtins.py:4280
3143
#: bzrlib/builtins.py:4248
3154
3144
msgid ""
3155
3145
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3156
3146
"try to merge in all new work up to and including revision OTHER."
3157
3147
msgstr ""
3158
3148
3159
#: bzrlib/builtins.py:4283
3149
#: bzrlib/builtins.py:4251
3160
3150
msgid ""
3161
3151
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3162
3152
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3167
3157
"changes from the other branch is not stored in the commit."
3168
3158
msgstr ""
3169
3159
3170
#: bzrlib/builtins.py:4291
3160
#: bzrlib/builtins.py:4259
3171
3161
msgid "Revision numbers are always relative to the source branch."
3172
3162
msgstr ""
3173
3163
3174
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3164
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3175
3165
msgid ""
3176
3166
"Merge will do its best to combine the changes in two branches, but there\n"
3177
3167
"are some kinds of problems only a human can fix. When it encounters those,\n"
3179
3169
"before you can commit."
3180
3170
msgstr ""
3181
3171
3182
#: bzrlib/builtins.py:4298
3172
#: bzrlib/builtins.py:4266
3183
3173
msgid ""
3184
3174
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3185
3175
msgstr ""
3186
3176
3187
#: bzrlib/builtins.py:4300
3177
#: bzrlib/builtins.py:4268
3188
3178
msgid ""
3189
3179
"If there is no default branch set, the first merge will set it (use\n"
3190
3180
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3192
3182
"only be saved if the remote location can be accessed."
3193
3183
msgstr ""
3194
3184
3195
#: bzrlib/builtins.py:4305
3185
#: bzrlib/builtins.py:4273
3196
3186
msgid ""
3197
3187
"The results of the merge are placed into the destination working\n"
3198
3188
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3199
3189
"committed to record the result of the merge."
3200
3190
msgstr ""
3201
3191
3202
#: bzrlib/builtins.py:4309
3192
#: bzrlib/builtins.py:4277
3203
3193
msgid ""
3204
3194
"merge refuses to run if there are any uncommitted changes, unless\n"
3205
3195
"--force is given. If --force is given, then the changes from the source \n"
3208
3198
"merge revision which has more than two parents."
3209
3199
msgstr ""
3210
3200
3211
#: bzrlib/builtins.py:4315
3201
#: bzrlib/builtins.py:4283
3212
3202
msgid ""
3213
3203
"If one would like to merge changes from the working tree of the other\n"
3214
3204
"branch without merging any committed revisions, the --uncommitted option\n"
3215
3205
"can be given."
3216
3206
msgstr ""
3217
3207
3218
#: bzrlib/builtins.py:4319
3208
#: bzrlib/builtins.py:4287
3219
3209
msgid ""
3220
3210
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3221
3211
"you to apply each diff hunk and file change, similar to \"shelve\"."
3222
3212
msgstr ""
3223
3213
3224
#: bzrlib/builtins.py:4322
3214
#: bzrlib/builtins.py:4290
3225
3215
msgid ""
3226
3216
":Examples:\n"
3227
3217
" To merge all new revisions from bzr.dev::"
3228
3218
msgstr ""
3229
3219
3230
#: bzrlib/builtins.py:4325
3220
#: bzrlib/builtins.py:4293
3231
3221
msgid " bzr merge ../bzr.dev"
3232
3222
msgstr ""
3233
3223
3234
#: bzrlib/builtins.py:4327
3224
#: bzrlib/builtins.py:4295
3235
3225
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3236
3226
msgstr ""
3237
3227
3238
#: bzrlib/builtins.py:4329
3228
#: bzrlib/builtins.py:4297
3239
3229
msgid " bzr merge -r 82 ../bzr.dev"
3240
3230
msgstr ""
3241
3231
3242
#: bzrlib/builtins.py:4331
3232
#: bzrlib/builtins.py:4299
3243
3233
msgid " To merge the changes introduced by 82, without previous changes::"
3244
3234
msgstr ""
3245
3235
3246
#: bzrlib/builtins.py:4333
3236
#: bzrlib/builtins.py:4301
3247
3237
msgid " bzr merge -r 81..82 ../bzr.dev"
3248
3238
msgstr ""
3249
3239
3250
#: bzrlib/builtins.py:4335
3240
#: bzrlib/builtins.py:4303
3251
3241
msgid " To apply a merge directive contained in /tmp/merge::"
3252
3242
msgstr ""
3253
3243
3254
#: bzrlib/builtins.py:4337
3244
#: bzrlib/builtins.py:4305
3255
3245
msgid " bzr merge /tmp/merge"
3256
3246
msgstr ""
3257
3247
3258
#: bzrlib/builtins.py:4339
3248
#: bzrlib/builtins.py:4307
3259
3249
msgid ""
3260
3250
" To create a merge revision with three parents from two branches\n"
3261
3251
" feature1a and feature1b:"
3262
3252
msgstr ""
3263
3253
3264
#: bzrlib/builtins.py:4342
3254
#: bzrlib/builtins.py:4310
3265
3255
msgid ""
3266
3256
" bzr merge ../feature1a\n"
3267
3257
" bzr merge ../feature1b --force\n"
3268
3258
" bzr commit -m 'revision with three parents'"
3269
3259
msgstr ""
3270
3260
3271
#: bzrlib/builtins.py:4354
3261
#: bzrlib/builtins.py:4322
3272
3262
msgid "Merge even if the destination tree has uncommitted changes."
3273
3263
msgstr ""
3274
3264
3275
#: bzrlib/builtins.py:4360
3265
#: bzrlib/builtins.py:4328
3276
3266
msgid ""
3277
3267
"Apply uncommitted changes from a working copy, instead of branch changes."
3278
3268
msgstr ""
3279
3269
3280
#: bzrlib/builtins.py:4362
3270
#: bzrlib/builtins.py:4330
3281
3271
msgid ""
3282
3272
"If the destination is already completely merged into the source, pull from "
3283
3273
"the source rather than merging. When this happens, you do not need to "
3284
3274
"commit the result."
3285
3275
msgstr ""
3286
3276
3287
#: bzrlib/builtins.py:4367
3277
#: bzrlib/builtins.py:4335
3288
3278
msgid ""
3289
3279
"Branch to merge into, rather than the one containing the working directory."
3290
3280
msgstr ""
3291
3281
3292
#: bzrlib/builtins.py:4369
3282
#: bzrlib/builtins.py:4337
3293
3283
msgid "Instead of merging, show a diff of the merge."
3294
3284
msgstr ""
3295
3285
3296
#: bzrlib/builtins.py:4371
3286
#: bzrlib/builtins.py:4339
3297
3287
msgid "Select changes interactively."
3298
3288
msgstr ""
3299
3289
3300
#: bzrlib/builtins.py:4393
3290
#: bzrlib/builtins.py:4361
3301
3291
msgid ""
3302
3292
"Merging into empty branches not currently supported, "
3303
3293
"https://bugs.launchpad.net/bzr/+bug/308562"
3304
3294
msgstr ""
3305
3295
3306
#: bzrlib/builtins.py:4420
3296
#: bzrlib/builtins.py:4388
3307
3297
msgid "Cannot use --uncommitted with bundles or merge directives."
3308
3298
msgstr ""
3309
3299
3310
#: bzrlib/builtins.py:4431
3300
#: bzrlib/builtins.py:4399
3311
3301
msgid "Cannot use --uncommitted and --revision at the same time."
3312
3302
msgstr ""
3313
3303
3314
#: bzrlib/builtins.py:4451
3304
#: bzrlib/builtins.py:4419
3315
3305
msgid "merger: "
3316
3306
msgstr ""
3317
3307
3318
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
3308
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
3319
3309
msgid "Nothing to do."
3320
3310
msgstr ""
3321
3311
3322
#: bzrlib/builtins.py:4457
3312
#: bzrlib/builtins.py:4425
3323
3313
msgid "Cannot pull individual files"
3324
3314
msgstr ""
3325
3315
3326
#: bzrlib/builtins.py:4465
3316
#: bzrlib/builtins.py:4433
3327
3317
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3328
3318
msgstr ""
3329
3319
3330
#: bzrlib/builtins.py:4523
3320
#: bzrlib/builtins.py:4491
3331
3321
#, python-format
3332
3322
msgid "Show-base is not supported for this merge type. %s"
3333
3323
msgstr ""
3334
3324
3335
#: bzrlib/builtins.py:4532
3325
#: bzrlib/builtins.py:4500
3336
3326
#, python-format
3337
3327
msgid "Conflict reduction is not supported for merge type %s."
3338
3328
msgstr ""
3339
3329
3340
#: bzrlib/builtins.py:4536
3330
#: bzrlib/builtins.py:4504
3341
3331
msgid "Cannot do conflict reduction and show base."
3342
3332
msgstr ""
3343
3333
3344
#: bzrlib/builtins.py:4647
3334
#: bzrlib/builtins.py:4615
3345
3335
msgid "No location specified or remembered"
3346
3336
msgstr ""
3347
3337
3348
#: bzrlib/builtins.py:4649
3338
#: bzrlib/builtins.py:4617
3349
3339
msgid "{0} remembered {1} location {2}"
3350
3340
msgstr ""
3351
3341
3352
#: bzrlib/builtins.py:4655
3342
#: bzrlib/builtins.py:4623
3353
3343
msgid "Redo a merge."
3354
3344
msgstr ""
3355
3345
3356
#: bzrlib/builtins.py:4657
3346
#: bzrlib/builtins.py:4625
3357
3347
msgid ""
3358
3348
"Use this if you want to try a different merge technique while resolving\n"
3359
3349
"conflicts. Some merge techniques are better than others, and remerge\n"
3360
3350
"lets you try different ones on different files."
3361
3351
msgstr ""
3362
3352
3363
#: bzrlib/builtins.py:4661
3353
#: bzrlib/builtins.py:4629
3364
3354
msgid ""
3365
3355
"The options for remerge have the same meaning and defaults as the ones for\n"
3366
3356
"merge. The difference is that remerge can (only) be run when there is a\n"
3367
3357
"pending merge, and it lets you specify particular files."
3368
3358
msgstr ""
3369
3359
3370
#: bzrlib/builtins.py:4665
3360
#: bzrlib/builtins.py:4633
3371
3361
msgid ""
3372
3362
":Examples:\n"
3373
3363
" Re-do the merge of all conflicted files, and show the base text in\n"
3374
3364
" conflict regions, in addition to the usual THIS and OTHER texts::"
3375
3365
msgstr ""
3376
3366
3377
#: bzrlib/builtins.py:4669
3367
#: bzrlib/builtins.py:4637
3378
3368
msgid " bzr remerge --show-base"
3379
3369
msgstr ""
3380
3370
3381
#: bzrlib/builtins.py:4671
3371
#: bzrlib/builtins.py:4639
3382
3372
msgid ""
3383
3373
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3384
3374
" additional processing to reduce the size of conflict regions::"
3385
3375
msgstr ""
3386
3376
3387
#: bzrlib/builtins.py:4674
3377
#: bzrlib/builtins.py:4642
3388
3378
msgid " bzr remerge --merge-type weave --reprocess foobar"
3389
3379
msgstr ""
3390
3380
3391
#: bzrlib/builtins.py:4681
3381
#: bzrlib/builtins.py:4649
3392
3382
msgid "Show base revision text in conflicts."
3393
3383
msgstr ""
3394
3384
3395
#: bzrlib/builtins.py:4693
3385
#: bzrlib/builtins.py:4661
3396
3386
msgid ""
3397
3387
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3398
3388
"merges."
3399
3389
msgstr ""
3400
3390
3401
#: bzrlib/builtins.py:4751
3402
msgid ""
3403
"Set files in the working tree back to the contents of a previous revision."
3391
#: bzrlib/builtins.py:4717
3392
msgid "Revert files to a previous revision."
3404
3393
msgstr ""
3405
3394
3406
#: bzrlib/builtins.py:4753
3395
#: bzrlib/builtins.py:4719
3407
3396
msgid ""
3408
3397
"Giving a list of files will revert only those files. Otherwise, all files\n"
3409
3398
"will be reverted. If the revision is not specified with '--revision', the\n"
3410
"working tree basis revision is used. A revert operation affects only the\n"
3411
"working tree, not any revision history like the branch and repository or\n"
3412
"the working tree basis revision."
3399
"last committed revision is used."
3413
3400
msgstr ""
3414
3401
3415
#: bzrlib/builtins.py:4759
3402
#: bzrlib/builtins.py:4723
3416
3403
msgid ""
3417
3404
"To remove only some changes, without reverting to a prior version, use\n"
3418
3405
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3419
3406
"will remove the changes introduced by the second last commit (-2), without\n"
3420
3407
"affecting the changes introduced by the last commit (-1). To remove\n"
3421
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3422
"To update the branch to a specific revision or the latest revision and\n"
3423
"update the working tree accordingly while preserving local changes, see the\n"
3424
"update command."
3408
"certain changes on a hunk-by-hunk basis, see the shelve command."
3425
3409
msgstr ""
3426
3410
3427
#: bzrlib/builtins.py:4768
3411
#: bzrlib/builtins.py:4729
3428
3412
msgid ""
3429
"Uncommitted changes to files that are reverted will be discarded.\n"
3430
"Howver, by default, any files that have been manually changed will be\n"
3431
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3432
"files have '.~#~' appended to their name, where # is a number."
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."
3433
3416
msgstr ""
3434
3417
3435
#: bzrlib/builtins.py:4773
3418
#: bzrlib/builtins.py:4733
3436
3419
msgid ""
3437
3420
"When you provide files, you can use their current pathname or the pathname\n"
3438
3421
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3440
3423
"reverted."
3441
3424
msgstr ""
3442
3425
3443
#: bzrlib/builtins.py:4778
3426
#: bzrlib/builtins.py:4738
3444
3427
msgid ""
3445
3428
"If you have newly added files since the target revision, they will be\n"
3446
3429
"removed. If the files to be removed have been changed, backups will be\n"
3448
3431
"deleted."
3449
3432
msgstr ""
3450
3433
3451
#: bzrlib/builtins.py:4783
3434
#: bzrlib/builtins.py:4743
3452
3435
msgid ""
3453
3436
"The working tree contains a list of revisions that have been merged but\n"
3454
3437
"not yet committed. These revisions will be included as additional parents\n"
3460
3443
"reverting any files."
3461
3444
msgstr ""
3462
3445
3463
#: bzrlib/builtins.py:4792
3446
#: bzrlib/builtins.py:4752
3464
3447
msgid ""
3465
3448
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3466
3449
"changes from a branch in a single revision. To do this, perform the merge\n"
3474
3457
"target branches."
3475
3458
msgstr ""
3476
3459
3477
#: bzrlib/builtins.py:4806
3460
#: bzrlib/builtins.py:4766
3478
3461
msgid "Do not save backups of reverted files."
3479
3462
msgstr ""
3480
3463
3481
#: bzrlib/builtins.py:4808
3464
#: bzrlib/builtins.py:4768
3482
3465
msgid "Remove pending merge marker, without changing any files."
3483
3466
msgstr ""
3484
3467
3485
#: bzrlib/builtins.py:4839
3468
#: bzrlib/builtins.py:4799
3486
3469
msgid ""
3487
3470
"Show help on a command or other topic.\n"
3488
3471
" "
3489
3472
msgstr ""
3490
3473
3491
#: bzrlib/builtins.py:4844
3474
#: bzrlib/builtins.py:4804
3492
3475
msgid "Show help on all commands."
3493
3476
msgstr ""
3494
3477
3495
#: bzrlib/builtins.py:4873
3478
#: bzrlib/builtins.py:4833
3496
3479
msgid "Show unmerged/unpulled revisions between two branches."
3497
3480
msgstr ""
3498
3481
3499
#: bzrlib/builtins.py:4875
3482
#: bzrlib/builtins.py:4835
3500
3483
msgid "OTHER_BRANCH may be local or remote."
3501
3484
msgstr ""
3502
3485
3503
#: bzrlib/builtins.py:4877
3486
#: bzrlib/builtins.py:4837
3504
3487
msgid ""
3505
3488
"To filter on a range of revisions, you can use the command -r begin..end\n"
3506
3489
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3511
3494
" 0 - no missing revisions"
3512
3495
msgstr ""
3513
3496
3514
#: bzrlib/builtins.py:4887
3497
#: bzrlib/builtins.py:4847
3515
3498
msgid ""
3516
3499
" Determine the missing revisions between this and the branch at the\n"
3517
3500
" remembered pull location::"
3518
3501
msgstr ""
3519
3502
3520
#: bzrlib/builtins.py:4890
3503
#: bzrlib/builtins.py:4850
3521
3504
msgid " bzr missing"
3522
3505
msgstr ""
3523
3506
3524
#: bzrlib/builtins.py:4892
3507
#: bzrlib/builtins.py:4852
3525
3508
msgid " Determine the missing revisions between this and another branch::"
3526
3509
msgstr ""
3527
3510
3528
#: bzrlib/builtins.py:4894
3511
#: bzrlib/builtins.py:4854
3529
3512
msgid " bzr missing http://server/branch"
3530
3513
msgstr ""
3531
3514
3532
#: bzrlib/builtins.py:4896
3515
#: bzrlib/builtins.py:4856
3533
3516
msgid ""
3534
3517
" Determine the missing revisions up to a specific revision on the other\n"
3535
3518
" branch::"
3536
3519
msgstr ""
3537
3520
3538
#: bzrlib/builtins.py:4899
3521
#: bzrlib/builtins.py:4859
3539
3522
msgid " bzr missing -r ..-10"
3540
3523
msgstr ""
3541
3524
3542
#: bzrlib/builtins.py:4901
3525
#: bzrlib/builtins.py:4861
3543
3526
msgid ""
3544
3527
" Determine the missing revisions up to a specific revision on this\n"
3545
3528
" branch::"
3546
3529
msgstr ""
3547
3530
3548
#: bzrlib/builtins.py:4904
3531
#: bzrlib/builtins.py:4864
3549
3532
msgid " bzr missing --my-revision ..-10"
3550
3533
msgstr ""
3551
3534
3552
#: bzrlib/builtins.py:4911
3535
#: bzrlib/builtins.py:4871
3553
3536
msgid "Reverse the order of revisions."
3554
3537
msgstr ""
3555
3538
3556
#: bzrlib/builtins.py:4913
3539
#: bzrlib/builtins.py:4873
3557
3540
msgid "Display changes in the local branch only."
3558
3541
msgstr ""
3559
3542
3560
#: bzrlib/builtins.py:4914
3543
#: bzrlib/builtins.py:4874
3561
3544
msgid "Same as --mine-only."
3562
3545
msgstr ""
3563
3546
3564
#: bzrlib/builtins.py:4916
3547
#: bzrlib/builtins.py:4876
3565
3548
msgid "Display changes in the remote branch only."
3566
3549
msgstr ""
3567
3550
3568
#: bzrlib/builtins.py:4917
3551
#: bzrlib/builtins.py:4877
3569
3552
msgid "Same as --theirs-only."
3570
3553
msgstr ""
3571
3554
3572
#: bzrlib/builtins.py:4922
3555
#: bzrlib/builtins.py:4882
3573
3556
msgid ""
3574
3557
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3575
3558
"details."
3576
3559
msgstr ""
3577
3560
3578
#: bzrlib/builtins.py:4926
3561
#: bzrlib/builtins.py:4886
3579
3562
msgid ""
3580
3563
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3581
3564
"details."
3582
3565
msgstr ""
3583
3566
3584
#: bzrlib/builtins.py:4929
3567
#: bzrlib/builtins.py:4889
3585
3568
msgid "Show all revisions in addition to the mainline ones."
3586
3569
msgstr ""
3587
3570
3588
#: bzrlib/builtins.py:4983
3571
#: bzrlib/builtins.py:4943
3589
3572
msgid "No peer location known or specified."
3590
3573
msgstr ""
3591
3574
3592
#: bzrlib/builtins.py:4987
3575
#: bzrlib/builtins.py:4947
3593
3576
msgid "Using saved parent location: {0}\n"
3594
3577
msgstr ""
3595
3578
3596
#: bzrlib/builtins.py:5020
3579
#: bzrlib/builtins.py:4980
3597
3580
#, python-format
3598
3581
msgid "You have %d extra revision:\n"
3599
3582
msgid_plural "You have %d extra revisions:\n"
3600
3583
msgstr[0] ""
3601
3584
msgstr[1] ""
3602
3585
3603
#: bzrlib/builtins.py:5040
3586
#: bzrlib/builtins.py:4996
3604
3587
#, python-format
3605
3588
msgid "You are missing %d revision:\n"
3606
3589
msgid_plural "You are missing %d revisions:\n"
3607
3590
msgstr[0] ""
3608
3591
msgstr[1] ""
3609
3592
3610
#: bzrlib/builtins.py:5055
3593
#: bzrlib/builtins.py:5008
3611
3594
msgid "This branch has no new revisions.\n"
3612
3595
msgstr ""
3613
3596
3614
#: bzrlib/builtins.py:5058
3597
#: bzrlib/builtins.py:5011
3615
3598
msgid "Other branch has no new revisions.\n"
3616
3599
msgstr ""
3617
3600
3618
#: bzrlib/builtins.py:5063
3601
#: bzrlib/builtins.py:5016
3619
3602
msgid "Branches are up to date.\n"
3620
3603
msgstr ""
3621
3604
3622
#: bzrlib/builtins.py:5074
3605
#: bzrlib/builtins.py:5027
3623
3606
msgid "Compress the data within a repository."
3624
3607
msgstr ""
3625
3608
3626
#: bzrlib/builtins.py:5076
3609
#: bzrlib/builtins.py:5029
3627
3610
msgid ""
3628
3611
"This operation compresses the data within a bazaar repository. As\n"
3629
3612
"bazaar supports automatic packing of repository, this operation is\n"
3630
3613
"normally not required to be done manually."
3631
3614
msgstr ""
3632
3615
3633
#: bzrlib/builtins.py:5080
3616
#: bzrlib/builtins.py:5033
3634
3617
msgid ""
3635
3618
"During the pack operation, bazaar takes a backup of existing repository\n"
3636
3619
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3639
3622
"used."
3640
3623
msgstr ""
3641
3624
3642
#: bzrlib/builtins.py:5086
3625
#: bzrlib/builtins.py:5039
3643
3626
msgid ""
3644
3627
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3645
3628
"during or immediately after repacking, you may be left with a state\n"
3647
3630
"been. In this case the repository may be unusable."
3648
3631
msgstr ""
3649
3632
3650
#: bzrlib/builtins.py:5095
3633
#: bzrlib/builtins.py:5048
3651
3634
msgid "Delete obsolete packs to save disk space."
3652
3635
msgstr ""
3653
3636
3654
#: bzrlib/builtins.py:5109
3637
#: bzrlib/builtins.py:5062
3655
3638
msgid "List the installed plugins."
3656
3639
msgstr ""
3657
3640
3658
#: bzrlib/builtins.py:5111
3641
#: bzrlib/builtins.py:5064
3659
3642
msgid ""
3660
3643
"This command displays the list of installed plugins including\n"
3661
3644
"version of plugin and a short description of each."
3662
3645
msgstr ""
3663
3646
3664
#: bzrlib/builtins.py:5114
3647
#: bzrlib/builtins.py:5067
3665
3648
msgid "--verbose shows the path where each plugin is located."
3666
3649
msgstr ""
3667
3650
3668
#: bzrlib/builtins.py:5116
3651
#: bzrlib/builtins.py:5069
3669
3652
msgid ""
3670
3653
"A plugin is an external component for Bazaar that extends the\n"
3671
3654
"revision control system, by adding or replacing code in Bazaar.\n"
3674
3657
"customizing log output."
3675
3658
msgstr ""
3676
3659
3677
#: bzrlib/builtins.py:5122
3660
#: bzrlib/builtins.py:5075
3678
3661
msgid ""
3679
3662
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3680
3663
"for further information on plugins including where to find them and how to\n"
3682
3665
"plugins using the Python programming language."
3683
3666
msgstr ""
3684
3667
3685
#: bzrlib/builtins.py:5138
3668
#: bzrlib/builtins.py:5091
3686
3669
msgid "Show testament (signing-form) of a revision."
3687
3670
msgstr ""
3688
3671
3689
#: bzrlib/builtins.py:5141
3672
#: bzrlib/builtins.py:5094
3690
3673
msgid "Produce long-format testament."
3691
3674
msgstr ""
3692
3675
3693
#: bzrlib/builtins.py:5143
3676
#: bzrlib/builtins.py:5096
3694
3677
msgid "Produce a strict-format testament."
3695
3678
msgstr ""
3696
3679
3697
#: bzrlib/builtins.py:5169
3680
#: bzrlib/builtins.py:5122
3698
3681
msgid "Show the origin of each line in a file."
3699
3682
msgstr ""
3700
3683
3701
#: bzrlib/builtins.py:5171
3684
#: bzrlib/builtins.py:5124
3702
3685
msgid ""
3703
3686
"This prints out the given file with an annotation on the left side\n"
3704
3687
"indicating which revision, author and date introduced the change."
3705
3688
msgstr ""
3706
3689
3707
#: bzrlib/builtins.py:5174
3690
#: bzrlib/builtins.py:5127
3708
3691
msgid ""
3709
3692
"If the origin is the same for a run of consecutive lines, it is\n"
3710
3693
"shown only at the top, unless the --all option is given."
3711
3694
msgstr ""
3712
3695
3713
#: bzrlib/builtins.py:5182
3696
#: bzrlib/builtins.py:5135
3714
3697
msgid "Show annotations on all lines."
3715
3698
msgstr ""
3716
3699
3717
#: bzrlib/builtins.py:5183
3700
#: bzrlib/builtins.py:5136
3718
3701
msgid "Show commit date in annotations."
3719
3702
msgstr ""
3720
3703
3721
#: bzrlib/builtins.py:5270
3704
#: bzrlib/builtins.py:5223
3722
3705
msgid "Cannot sign a range of non-revision-history revisions"
3723
3706
msgstr ""
3724
3707
3725
#: bzrlib/builtins.py:5282
3708
#: bzrlib/builtins.py:5235
3726
3709
msgid "Please supply either one revision, or a range."
3727
3710
msgstr ""
3728
3711
3729
#: bzrlib/builtins.py:5286
3712
#: bzrlib/builtins.py:5239
3730
3713
msgid ""
3731
3714
"Convert the current branch into a checkout of the supplied branch.\n"
3732
3715
"If no branch is supplied, rebind to the last bound location."
3734
3717
"Преобразовать текущую ветвь в рабочую копию указанной ветви.\n"
3735
3718
"Если ветвь не указаны, перепривязать последнее расположение привязки."
3736
3719
3737
#: bzrlib/builtins.py:5289
3720
#: bzrlib/builtins.py:5242
3738
3721
msgid ""
3739
3722
"Once converted into a checkout, commits must succeed on the master branch\n"
3740
3723
"before they will be applied to the local branch."
3742
3725
"После преобразования в рабочую копию, закрепления должны производиться\n"
3743
3726
"над основной ветвью, прежде чем они могут быть применены к локальной."
3744
3727
3745
#: bzrlib/builtins.py:5292
3728
#: bzrlib/builtins.py:5245
3746
3729
msgid ""
3747
3730
"Bound branches use the nickname of its master branch unless it is set\n"
3748
3731
"locally, in which case binding will update the local nickname to be\n"
3749
3732
"that of the master."
3750
3733
msgstr ""
3751
3734
3752
#: bzrlib/builtins.py:5307
3735
#: bzrlib/builtins.py:5260
3753
3736
msgid "No location supplied. This format does not remember old locations."
3754
3737
msgstr ""
3755
3738
3756
#: bzrlib/builtins.py:5313
3739
#: bzrlib/builtins.py:5265
3757
3740
msgid "Branch is already bound"
3758
3741
msgstr ""
3759
3742
3760
#: bzrlib/builtins.py:5316
3743
#: bzrlib/builtins.py:5267
3761
3744
msgid "No location supplied and no previous location known"
3762
3745
msgstr ""
3763
3746
3764
#: bzrlib/builtins.py:5322
3747
#: bzrlib/builtins.py:5273
3765
3748
msgid "These branches have diverged. Try merging, and then bind again."
3766
3749
msgstr ""
3767
3750
3768
#: bzrlib/builtins.py:5329
3751
#: bzrlib/builtins.py:5280
3769
3752
msgid "Convert the current checkout into a regular branch."
3770
3753
msgstr "Преобразовать текущую рабочую копию в обычную ветвь."
3771
3754
3772
#: bzrlib/builtins.py:5331
3755
#: bzrlib/builtins.py:5282
3773
3756
msgid ""
3774
3757
"After unbinding, the local branch is considered independent and subsequent\n"
3775
3758
"commits will be local only."
3776
3759
msgstr ""
3777
3760
3778
#: bzrlib/builtins.py:5342
3761
#: bzrlib/builtins.py:5293
3779
3762
msgid "Local branch is not bound"
3780
3763
msgstr ""
3781
3764
3782
#: bzrlib/builtins.py:5346
3765
#: bzrlib/builtins.py:5297
3783
3766
msgid "Remove the last committed revision."
3784
3767
msgstr ""
3785
3768
3786
#: bzrlib/builtins.py:5348
3769
#: bzrlib/builtins.py:5299
3787
3770
msgid ""
3788
3771
"--verbose will print out what is being removed.\n"
3789
3772
"--dry-run will go through all the motions, but not actually\n"
3790
3773
"remove anything."
3791
3774
msgstr ""
3792
3775
3793
#: bzrlib/builtins.py:5352
3776
#: bzrlib/builtins.py:5303
3794
3777
msgid ""
3795
3778
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3796
3779
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3797
3780
"branch at revision 15."
3798
3781
msgstr ""
3799
3782
3800
#: bzrlib/builtins.py:5356
3783
#: bzrlib/builtins.py:5307
3801
3784
msgid ""
3802
3785
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3803
3786
"it may make is to restore any pending merges that were present before\n"
3804
3787
"the commit."
3805
3788
msgstr ""
3806
3789
3807
#: bzrlib/builtins.py:5367
3790
#: bzrlib/builtins.py:5318
3808
3791
msgid "Don't actually make changes."
3809
3792
msgstr ""
3810
3793
3811
#: bzrlib/builtins.py:5368
3794
#: bzrlib/builtins.py:5319
3812
3795
msgid "Say yes to all questions."
3813
3796
msgstr ""
3814
3797
3815
#: bzrlib/builtins.py:5370
3798
#: bzrlib/builtins.py:5321
3816
3799
msgid "Keep tags that point to removed revisions."
3817
3800
msgstr ""
3818
3801
3819
#: bzrlib/builtins.py:5372
3802
#: bzrlib/builtins.py:5323
3820
3803
msgid "Only remove the commits from the local branch when in a checkout."
3821
3804
msgstr "Удалить закрепления из локальной ветви только в рабочей копии."
3822
3805
3823
#: bzrlib/builtins.py:5421
3806
#: bzrlib/builtins.py:5372
3824
3807
msgid "No revisions to uncommit.\n"
3825
3808
msgstr ""
3826
3809
3827
#: bzrlib/builtins.py:5436
3810
#: bzrlib/builtins.py:5387
3828
3811
msgid "Dry-run, pretending to remove the above revisions.\n"
3829
3812
msgstr ""
3830
3813
3831
#: bzrlib/builtins.py:5439
3814
#: bzrlib/builtins.py:5390
3832
3815
msgid "The above revision(s) will be removed.\n"
3833
3816
msgstr ""
3834
3817
3835
#: bzrlib/builtins.py:5443
3818
#: bzrlib/builtins.py:5394
3836
3819
msgid "Uncommit these revisions"
3837
3820
msgstr ""
3838
3821
3839
#: bzrlib/builtins.py:5446
3822
#: bzrlib/builtins.py:5397
3840
3823
msgid "Canceled\n"
3841
3824
msgstr ""
3842
3825
3843
#: bzrlib/builtins.py:5453
3826
#: bzrlib/builtins.py:5404
3844
3827
#, python-format
3845
3828
msgid ""
3846
3829
"You can restore the old tip by running:\n"
3847
3830
" bzr pull . -r revid:%s\n"
3848
3831
msgstr ""
3849
3832
3850
#: bzrlib/builtins.py:5458
3833
#: bzrlib/builtins.py:5409
3851
3834
msgid "Break a dead lock."
3852
3835
msgstr ""
3853
3836
3854
#: bzrlib/builtins.py:5460
3837
#: bzrlib/builtins.py:5411
3855
3838
msgid ""
3856
3839
"This command breaks a lock on a repository, branch, working directory or\n"
3857
3840
"config file."
3858
3841
msgstr ""
3859
3842
3860
#: bzrlib/builtins.py:5463
3843
#: bzrlib/builtins.py:5414
3861
3844
msgid ""
3862
3845
"CAUTION: Locks should only be broken when you are sure that the process\n"
3863
3846
"holding the lock has been stopped."
3864
3847
msgstr ""
3865
3848
3866
#: bzrlib/builtins.py:5466
3849
#: bzrlib/builtins.py:5417
3867
3850
msgid ""
3868
3851
"You can get information on what locks are open via the 'bzr info\n"
3869
3852
"[location]' command."
3870
3853
msgstr ""
3871
3854
3872
#: bzrlib/builtins.py:5469
3855
#: bzrlib/builtins.py:5420
3873
3856
msgid ""
3874
3857
":Examples:\n"
3875
3858
" bzr break-lock\n"
3877
3860
" bzr break-lock --conf ~/.bazaar"
3878
3861
msgstr ""
3879
3862
3880
#: bzrlib/builtins.py:5478
3863
#: bzrlib/builtins.py:5429
3881
3864
msgid "LOCATION is the directory where the config lock is."
3882
3865
msgstr ""
3883
3866
3884
#: bzrlib/builtins.py:5480
3867
#: bzrlib/builtins.py:5431
3885
3868
msgid "Do not ask for confirmation before breaking the lock."
3886
3869
msgstr ""
3887
3870
3888
#: bzrlib/builtins.py:5515
3871
#: bzrlib/builtins.py:5466
3889
3872
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3890
3873
msgstr ""
3891
3874
3892
#: bzrlib/builtins.py:5516
3875
#: bzrlib/builtins.py:5467
3893
3876
msgid "Run the bzr server."
3894
3877
msgstr ""
3895
3878
3896
#: bzrlib/builtins.py:5522
3879
#: bzrlib/builtins.py:5473
3897
3880
msgid "Serve on stdin/out for use from inetd or sshd."
3898
3881
msgstr ""
3899
3882
3900
#: bzrlib/builtins.py:5523
3883
#: bzrlib/builtins.py:5474
3901
3884
msgid "protocol"
3902
3885
msgstr ""
3903
3886
3904
#: bzrlib/builtins.py:5524
3887
#: bzrlib/builtins.py:5475
3905
3888
msgid "Protocol to serve."
3906
3889
msgstr ""
3907
3890
3908
#: bzrlib/builtins.py:5528
3909
msgid "Listen for connections on nominated address."
3910
msgstr ""
3911
3912
#: bzrlib/builtins.py:5530
3891
#: bzrlib/builtins.py:5479
3913
3892
msgid ""
3914
"Listen for connections on nominated port. Passing 0 as the port number will "
3915
"result in a dynamically allocated port. The default port depends on the "
3916
"protocol."
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."
3917
3896
msgstr ""
3918
3897
3919
#: bzrlib/builtins.py:5535
3898
#: bzrlib/builtins.py:5485
3920
3899
msgid "Serve contents of this directory."
3921
3900
msgstr ""
3922
3901
3923
#: bzrlib/builtins.py:5537
3902
#: bzrlib/builtins.py:5487
3924
3903
msgid ""
3925
3904
"By default the server is a readonly server. Supplying --allow-writes "
3926
3905
"enables write access to the contents of the served directory and below. "
3929
3908
"uncontrolled write access to your file system."
3930
3909
msgstr ""
3931
3910
3911
#: bzrlib/builtins.py:5496
3912
msgid "Override the default idle client timeout (5min)."
3913
msgstr ""
3914
3932
3915
#: bzrlib/builtins.py:5546
3933
msgid "Override the default idle client timeout (5min)."
3934
msgstr ""
3935
3936
#: bzrlib/builtins.py:5564
3937
3916
msgid "Combine a tree into its containing tree."
3938
3917
msgstr ""
3939
3918
3940
#: bzrlib/builtins.py:5566
3919
#: bzrlib/builtins.py:5548
3941
3920
msgid "This command requires the target tree to be in a rich-root format."
3942
3921
msgstr ""
3943
3922
3944
#: bzrlib/builtins.py:5568
3923
#: bzrlib/builtins.py:5550
3945
3924
msgid ""
3946
3925
"The TREE argument should be an independent tree, inside another tree, but\n"
3947
3926
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3948
3927
"running \"bzr branch\" with the target inside a tree.)"
3949
3928
msgstr ""
3950
3929
3951
#: bzrlib/builtins.py:5572
3930
#: bzrlib/builtins.py:5554
3952
3931
msgid ""
3953
3932
"The result is a combined tree, with the subtree no longer an independent\n"
3954
3933
"part. This is marked as a merge of the subtree into the containing tree,\n"
3955
3934
"and all history is preserved."
3956
3935
msgstr ""
3957
3936
3958
#: bzrlib/builtins.py:5590
3937
#: bzrlib/builtins.py:5572
3959
3938
#, python-format
3960
3939
msgid ""
3961
3940
"Can't join trees because %s doesn't support rich root data.\n"
3962
3941
"You can use bzr upgrade on the repository."
3963
3942
msgstr ""
3964
3943
3965
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3944
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3966
3945
msgid "Cannot join {0}. {1}"
3967
3946
msgstr ""
3968
3947
3969
#: bzrlib/builtins.py:5610
3948
#: bzrlib/builtins.py:5592
3970
3949
msgid "Split a subdirectory of a tree into a separate tree."
3971
3950
msgstr ""
3972
3951
3973
#: bzrlib/builtins.py:5612
3952
#: bzrlib/builtins.py:5594
3974
3953
msgid ""
3975
3954
"This command will produce a target tree in a format that supports\n"
3976
3955
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3977
3956
"converted into earlier formats like 'dirstate-tags'."
3978
3957
msgstr ""
3979
3958
3980
#: bzrlib/builtins.py:5616
3959
#: bzrlib/builtins.py:5598
3981
3960
msgid ""
3982
3961
"The TREE argument should be a subdirectory of a working tree. That\n"
3983
3962
"subdirectory will be converted into an independent tree, with its own\n"
3984
3963
"branch. Commits in the top-level tree will not apply to the new subtree."
3985
3964
msgstr ""
3986
3965
3987
#: bzrlib/builtins.py:5696
3966
#: bzrlib/builtins.py:5678
3988
3967
msgid "No submit branch specified or known"
3989
3968
msgstr ""
3990
3969
3991
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3970
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3992
3971
msgid "No public branch specified or known"
3993
3972
msgstr ""
3994
3973
3995
#: bzrlib/builtins.py:5710
3974
#: bzrlib/builtins.py:5691
3996
3975
msgid "bzr merge-directive takes at most two one revision identifiers"
3997
3976
msgstr ""
3998
3977
3978
#: bzrlib/builtins.py:5700
3979
msgid "No revisions to bundle."
3980
msgstr ""
3981
3999
3982
#: bzrlib/builtins.py:5719
4000
msgid "No revisions to bundle."
4001
msgstr ""
4002
4003
#: bzrlib/builtins.py:5738
4004
3983
msgid "Mail or create a merge-directive for submitting changes."
4005
3984
msgstr ""
4006
3985
4007
#: bzrlib/builtins.py:5740
3986
#: bzrlib/builtins.py:5721
4008
3987
msgid "A merge directive provides many things needed for requesting merges:"
4009
3988
msgstr ""
4010
3989
4011
#: bzrlib/builtins.py:5742
3990
#: bzrlib/builtins.py:5723
4012
3991
msgid "* A machine-readable description of the merge to perform"
4013
3992
msgstr ""
4014
3993
4015
#: bzrlib/builtins.py:5744
3994
#: bzrlib/builtins.py:5725
4016
3995
msgid "* An optional patch that is a preview of the changes requested"
4017
3996
msgstr ""
4018
3997
4019
#: bzrlib/builtins.py:5746
3998
#: bzrlib/builtins.py:5727
4020
3999
msgid ""
4021
4000
"* An optional bundle of revision data, so that the changes can be applied\n"
4022
4001
" directly from the merge directive, without retrieving data from a\n"
4023
4002
" branch."
4024
4003
msgstr ""
4025
4004
4026
#: bzrlib/builtins.py:5750
4005
#: bzrlib/builtins.py:5731
4027
4006
msgid ""
4028
4007
"`bzr send` creates a compact data set that, when applied using bzr\n"
4029
4008
"merge, has the same effect as merging from the source branch. "
4030
4009
msgstr ""
4031
4010
4032
#: bzrlib/builtins.py:5753
4011
#: bzrlib/builtins.py:5734
4033
4012
msgid ""
4034
4013
"By default the merge directive is self-contained and can be applied to any\n"
4035
4014
"branch containing submit_branch in its ancestory without needing access to\n"
4036
4015
"the source branch."
4037
4016
msgstr ""
4038
4017
4039
#: bzrlib/builtins.py:5757
4018
#: bzrlib/builtins.py:5738
4040
4019
msgid ""
4041
4020
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4042
4021
"revisions, but only a structured request to merge from the\n"
4045
4024
"included if known, so that people can check it later."
4046
4025
msgstr ""
4047
4026
4048
#: bzrlib/builtins.py:5763
4027
#: bzrlib/builtins.py:5744
4049
4028
msgid ""
4050
4029
"The submit branch defaults to the parent of the source branch, but can be\n"
4051
4030
"overridden. Both submit branch and public branch will be remembered in\n"
4054
4033
"be changed using --from."
4055
4034
msgstr ""
4056
4035
4057
#: bzrlib/builtins.py:5769
4036
#: bzrlib/builtins.py:5750
4058
4037
msgid ""
4059
4038
"Both the submit branch and the public branch follow the usual behavior with\n"
4060
4039
"respect to --remember: If there is no default location set, the first send\n"
4063
4042
"--remember. The value will only be saved if the location can be accessed."
4064
4043
msgstr ""
4065
4044
4066
#: bzrlib/builtins.py:5775
4045
#: bzrlib/builtins.py:5756
4067
4046
msgid ""
4068
4047
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4069
4048
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4071
4050
"in the merge directive."
4072
4051
msgstr ""
4073
4052
4074
#: bzrlib/builtins.py:5780
4053
#: bzrlib/builtins.py:5761
4075
4054
msgid ""
4076
4055
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4077
4056
"given, in which case it is sent to a file."
4078
4057
msgstr ""
4079
4058
4080
#: bzrlib/builtins.py:5783
4059
#: bzrlib/builtins.py:5764
4081
4060
msgid ""
4082
4061
"Mail is sent using your preferred mail program. This should be transparent\n"
4083
4062
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4084
4063
"If the preferred client can't be found (or used), your editor will be used."
4085
4064
msgstr ""
4086
4065
4087
#: bzrlib/builtins.py:5787
4066
#: bzrlib/builtins.py:5768
4088
4067
msgid ""
4089
4068
"To use a specific mail program, set the mail_client configuration option.\n"
4090
4069
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4096
4075
"supported clients."
4097
4076
msgstr ""
4098
4077
4099
#: bzrlib/builtins.py:5794
4078
#: bzrlib/builtins.py:5775
4100
4079
msgid ""
4101
4080
"If mail is being sent, a to address is required. This can be supplied\n"
4102
4081
"either on the commandline, by setting the submit_to configuration\n"
4104
4083
"in the submit branch."
4105
4084
msgstr ""
4106
4085
4107
#: bzrlib/builtins.py:5799
4086
#: bzrlib/builtins.py:5780
4108
4087
msgid ""
4109
4088
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4110
4089
"and\n"
4114
4093
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4115
4094
msgstr ""
4116
4095
4117
#: bzrlib/builtins.py:5805
4096
#: bzrlib/builtins.py:5786
4118
4097
msgid ""
4119
4098
"The merge directives created by bzr send may be applied using bzr merge or\n"
4120
4099
"bzr pull by specifying a file containing a merge directive as the location."
4121
4100
msgstr ""
4122
4101
4123
#: bzrlib/builtins.py:5808
4102
#: bzrlib/builtins.py:5789
4124
4103
msgid ""
4125
4104
"bzr send makes extensive use of public locations to map local locations "
4126
4105
"into\n"
4128
4107
"set them, and use `bzr info` to display them."
4129
4108
msgstr ""
4130
4109
4131
#: bzrlib/builtins.py:5832
4110
#: bzrlib/builtins.py:5813
4132
4111
msgid "Write merge directive to this file or directory; use - for stdout."
4133
4112
msgstr ""
4134
4113
4135
#: bzrlib/builtins.py:5836
4114
#: bzrlib/builtins.py:5817
4136
4115
msgid ""
4137
4116
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4138
4117
"strict disables the check."
4139
4118
msgstr ""
4140
4119
4141
#: bzrlib/builtins.py:5838
4120
#: bzrlib/builtins.py:5819
4142
4121
msgid "Mail the request to this address."
4143
4122
msgstr ""
4144
4123
4145
#: bzrlib/builtins.py:5842
4124
#: bzrlib/builtins.py:5823
4146
4125
msgid "Body for the email."
4147
4126
msgstr ""
4148
4127
4149
#: bzrlib/builtins.py:5895
4128
#: bzrlib/builtins.py:5876
4150
4129
msgid "Do not include a bundle in the merge directive."
4151
4130
msgstr ""
4152
4131
4153
#: bzrlib/builtins.py:5896
4132
#: bzrlib/builtins.py:5877
4154
4133
msgid "Do not include a preview patch in the merge directive."
4155
4134
msgstr ""
4156
4135
4157
#: bzrlib/builtins.py:5899
4136
#: bzrlib/builtins.py:5880
4158
4137
msgid "Remember submit and public branch."
4159
4138
msgstr ""
4160
4139
4161
#: bzrlib/builtins.py:5901
4140
#: bzrlib/builtins.py:5882
4162
4141
msgid ""
4163
4142
"Branch to generate the submission from, rather than the one containing the "
4164
4143
"working directory."
4165
4144
msgstr ""
4166
4145
4167
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
4146
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
4168
4147
msgid "format"
4169
4148
msgstr ""
4170
4149
4171
#: bzrlib/builtins.py:5912
4150
#: bzrlib/builtins.py:5893
4172
4151
msgid "Use the specified output format."
4173
4152
msgstr ""
4174
4153
4175
#: bzrlib/builtins.py:5934
4154
#: bzrlib/builtins.py:5915
4176
4155
msgid "Create, remove or modify a tag naming a revision."
4177
4156
msgstr ""
4178
4157
4179
#: bzrlib/builtins.py:5936
4158
#: bzrlib/builtins.py:5917
4180
4159
msgid ""
4181
4160
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4182
4161
"(--revision) option can be given -rtag:X, where X is any previously\n"
4183
4162
"created tag."
4184
4163
msgstr ""
4185
4164
4186
#: bzrlib/builtins.py:5940
4165
#: bzrlib/builtins.py:5921
4187
4166
msgid ""
4188
4167
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4189
4168
"along when you branch, push, pull or merge."
4190
4169
msgstr ""
4191
4170
4192
#: bzrlib/builtins.py:5943
4171
#: bzrlib/builtins.py:5924
4193
4172
msgid ""
4194
4173
"It is an error to give a tag name that already exists unless you pass\n"
4195
4174
"--force, in which case the tag is moved to point to the new revision."
4196
4175
msgstr ""
4197
4176
4198
#: bzrlib/builtins.py:5946
4177
#: bzrlib/builtins.py:5927
4199
4178
msgid ""
4200
4179
"To rename a tag (change the name but keep it on the same revsion), run "
4201
4180
"``bzr\n"
4202
4181
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4203
4182
msgstr ""
4204
4183
4205
#: bzrlib/builtins.py:5949
4184
#: bzrlib/builtins.py:5930
4206
4185
msgid ""
4207
4186
"If no tag name is specified it will be determined through the \n"
4208
4187
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4210
4189
"details."
4211
4190
msgstr ""
4212
4191
4213
#: bzrlib/builtins.py:5959
4192
#: bzrlib/builtins.py:5940
4214
4193
msgid "Delete this tag rather than placing it."
4215
4194
msgstr ""
4216
4195
4217
#: bzrlib/builtins.py:5962
4196
#: bzrlib/builtins.py:5943
4218
4197
msgid "Branch in which to place the tag."
4219
4198
msgstr ""
4220
4199
4221
#: bzrlib/builtins.py:5964
4200
#: bzrlib/builtins.py:5945
4222
4201
msgid "Replace existing tags."
4223
4202
msgstr ""
4224
4203
4225
#: bzrlib/builtins.py:5979
4204
#: bzrlib/builtins.py:5960
4226
4205
msgid "No tag specified to delete."
4227
4206
msgstr ""
4228
4207
4229
#: bzrlib/builtins.py:5981
4208
#: bzrlib/builtins.py:5962
4230
4209
#, python-format
4231
4210
msgid "Deleted tag %s."
4232
4211
msgstr ""
4233
4212
4234
#: bzrlib/builtins.py:5995
4213
#: bzrlib/builtins.py:5976
4235
4214
msgid "Please specify a tag name."
4236
4215
msgstr ""
4237
4216
4238
#: bzrlib/builtins.py:6003
4217
#: bzrlib/builtins.py:5984
4239
4218
#, python-format
4240
4219
msgid "Tag %s already exists for that revision."
4241
4220
msgstr ""
4242
4221
4243
#: bzrlib/builtins.py:6007
4222
#: bzrlib/builtins.py:5988
4244
4223
#, python-format
4245
4224
msgid "Created tag %s."
4246
4225
msgstr ""
4247
4226
4248
#: bzrlib/builtins.py:6009
4227
#: bzrlib/builtins.py:5990
4249
4228
#, python-format
4250
4229
msgid "Updated tag %s."
4251
4230
msgstr ""
4252
4231
4253
#: bzrlib/builtins.py:6013
4232
#: bzrlib/builtins.py:5994
4254
4233
msgid "List tags."
4255
4234
msgstr ""
4256
4235
4257
#: bzrlib/builtins.py:6015
4236
#: bzrlib/builtins.py:5996
4258
4237
msgid ""
4259
4238
"This command shows a table of tag names and the revisions they reference."
4260
4239
msgstr ""
4261
4240
4262
#: bzrlib/builtins.py:6021
4241
#: bzrlib/builtins.py:6002
4263
4242
msgid "Branch whose tags should be displayed."
4264
4243
msgstr ""
4265
4244
4266
#: bzrlib/builtins.py:6023
4245
#: bzrlib/builtins.py:6004
4267
4246
msgid "Sort tags by different criteria."
4268
4247
msgstr ""
4269
4248
4270
#: bzrlib/builtins.py:6023
4249
#: bzrlib/builtins.py:6004
4271
4250
msgid "Sorting"
4272
4251
msgstr ""
4273
4252
4274
#: bzrlib/builtins.py:6092
4253
#: bzrlib/builtins.py:6073
4275
4254
msgid "Reconfigure the type of a bzr directory."
4276
4255
msgstr ""
4277
4256
4278
#: bzrlib/builtins.py:6094
4257
#: bzrlib/builtins.py:6075
4279
4258
msgid "A target configuration must be specified."
4280
4259
msgstr ""
4281
4260
4282
#: bzrlib/builtins.py:6096
4261
#: bzrlib/builtins.py:6077
4283
4262
msgid ""
4284
4263
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4285
4264
"The order of preference is\n"
4290
4269
"If none of these is available, --bind-to must be specified."
4291
4270
msgstr ""
4292
4271
4293
#: bzrlib/builtins.py:6110
4272
#: bzrlib/builtins.py:6091
4294
4273
msgid "Tree type"
4295
4274
msgstr ""
4296
4275
4297
#: bzrlib/builtins.py:6111
4276
#: bzrlib/builtins.py:6092
4298
4277
msgid "The relation between branch and tree."
4299
4278
msgstr ""
4300
4279
4301
#: bzrlib/builtins.py:6113
4280
#: bzrlib/builtins.py:6094
4302
4281
msgid "Reconfigure to be an unbound branch with no working tree."
4303
4282
msgstr ""
4304
4283
4305
#: bzrlib/builtins.py:6114
4284
#: bzrlib/builtins.py:6095
4306
4285
msgid "Reconfigure to be an unbound branch with a working tree."
4307
4286
msgstr ""
4308
4287
4309
#: bzrlib/builtins.py:6115
4288
#: bzrlib/builtins.py:6096
4310
4289
msgid "Reconfigure to be a bound branch with a working tree."
4311
4290
msgstr ""
4312
4291
4313
#: bzrlib/builtins.py:6116
4292
#: bzrlib/builtins.py:6097
4314
4293
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4315
4294
msgstr ""
4316
4295
4317
#: bzrlib/builtins.py:6121
4296
#: bzrlib/builtins.py:6102
4318
4297
msgid "Repository type"
4319
4298
msgstr ""
4320
4299
4321
#: bzrlib/builtins.py:6122
4300
#: bzrlib/builtins.py:6103
4322
4301
msgid "Location fo the repository."
4323
4302
msgstr ""
4324
4303
4325
#: bzrlib/builtins.py:6124
4304
#: bzrlib/builtins.py:6105
4326
4305
msgid ""
4327
4306
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4328
4307
msgstr ""
4329
4308
4330
#: bzrlib/builtins.py:6126
4309
#: bzrlib/builtins.py:6107
4331
4310
msgid "Reconfigure to use a shared repository."
4332
4311
msgstr ""
4333
4312
4334
#: bzrlib/builtins.py:6130
4313
#: bzrlib/builtins.py:6111
4335
4314
msgid "Trees in Repository"
4336
4315
msgstr ""
4337
4316
4338
#: bzrlib/builtins.py:6131
4317
#: bzrlib/builtins.py:6112
4339
4318
msgid "Whether new branches in the repository have trees."
4340
4319
msgstr ""
4341
4320
4342
#: bzrlib/builtins.py:6133
4321
#: bzrlib/builtins.py:6114
4343
4322
msgid ""
4344
4323
"Reconfigure repository to create working trees on branches by default."
4345
4324
msgstr ""
4346
4325
4347
#: bzrlib/builtins.py:6135
4326
#: bzrlib/builtins.py:6116
4348
4327
msgid ""
4349
4328
"Reconfigure repository to not create working trees on branches by default."
4350
4329
msgstr ""
4351
4330
4352
#: bzrlib/builtins.py:6138
4331
#: bzrlib/builtins.py:6119
4353
4332
msgid "Branch to bind checkout to."
4354
4333
msgstr "Ветвь, с которой связать рабочую копию."
4355
4334
4356
#: bzrlib/builtins.py:6140
4335
#: bzrlib/builtins.py:6121
4357
4336
msgid "Perform reconfiguration even if local changes will be lost."
4358
4337
msgstr ""
4359
4338
4360
#: bzrlib/builtins.py:6143
4339
#: bzrlib/builtins.py:6124
4361
4340
msgid "Reconfigure a branch to be stacked on another branch."
4362
4341
msgstr ""
4363
4342
4364
#: bzrlib/builtins.py:6147
4343
#: bzrlib/builtins.py:6128
4365
4344
msgid ""
4366
4345
"Reconfigure a branch to be unstacked. This may require copying substantial "
4367
4346
"data into it."
4368
4347
msgstr ""
4369
4348
4370
#: bzrlib/builtins.py:6157
4349
#: bzrlib/builtins.py:6138
4371
4350
msgid "Can't use both --stacked-on and --unstacked"
4372
4351
msgstr ""
4373
4352
4374
#: bzrlib/builtins.py:6171
4353
#: bzrlib/builtins.py:6152
4375
4354
msgid "No target configuration specified"
4376
4355
msgstr ""
4377
4356
4378
#: bzrlib/builtins.py:6206
4357
#: bzrlib/builtins.py:6187
4379
4358
msgid "Set the branch of a checkout and update."
4380
4359
msgstr "Выбрать ветвь рабочей копии и обновить."
4381
4360
4382
#: bzrlib/builtins.py:6208
4361
#: bzrlib/builtins.py:6189
4383
4362
msgid ""
4384
4363
"For lightweight checkouts, this changes the branch being referenced.\n"
4385
4364
"For heavyweight checkouts, this checks that there are no local commits\n"
4387
4366
"of the new location and binds to it."
4388
4367
msgstr ""
4389
4368
4390
#: bzrlib/builtins.py:6213
4369
#: bzrlib/builtins.py:6194
4391
4370
msgid ""
4392
4371
"In both cases, the working tree is updated and uncommitted changes\n"
4393
4372
"are merged. The user can commit or revert these as they desire."
4394
4373
msgstr ""
4395
4374
4396
#: bzrlib/builtins.py:6216
4375
#: bzrlib/builtins.py:6197
4397
4376
msgid "Pending merges need to be committed or reverted before using switch."
4398
4377
msgstr ""
4399
4378
4400
#: bzrlib/builtins.py:6218
4379
#: bzrlib/builtins.py:6199
4401
4380
msgid ""
4402
4381
"The path to the branch to switch to can be specified relative to the parent\n"
4403
4382
"directory of the current branch. For example, if you are currently in a\n"
4405
4384
"/path/to/newbranch."
4406
4385
msgstr ""
4407
4386
4408
#: bzrlib/builtins.py:6223
4387
#: bzrlib/builtins.py:6204
4409
4388
msgid ""
4410
4389
"Bound branches use the nickname of its master branch unless it is set\n"
4411
4390
"locally, in which case switching will update the local nickname to be\n"
4412
4391
"that of the master."
4413
4392
msgstr ""
4414
4393
4415
#: bzrlib/builtins.py:6231
4394
#: bzrlib/builtins.py:6212
4416
4395
msgid "Switch even if local commits will be lost."
4417
4396
msgstr ""
4418
4397
4419
#: bzrlib/builtins.py:6234
4398
#: bzrlib/builtins.py:6215
4420
4399
msgid "Create the target branch from this one before switching to it."
4421
4400
msgstr ""
4422
4401
4423
#: bzrlib/builtins.py:6248
4402
#: bzrlib/builtins.py:6229
4424
4403
msgid "You must supply either a revision or a location"
4425
4404
msgstr ""
4426
4405
4427
#: bzrlib/builtins.py:6261
4406
#: bzrlib/builtins.py:6242
4428
4407
msgid "cannot create branch without source branch"
4429
4408
msgstr ""
4430
4409
4431
#: bzrlib/builtins.py:6286
4410
#: bzrlib/builtins.py:6262
4432
4411
msgid "Manage filtered views."
4433
4412
msgstr ""
4434
4413
4435
#: bzrlib/builtins.py:6288
4414
#: bzrlib/builtins.py:6264
4436
4415
msgid ""
4437
4416
"Views provide a mask over the tree so that users can focus on\n"
4438
4417
"a subset of a tree when doing their work. After creating a view,\n"
4442
4421
"must be within the current view."
4443
4422
msgstr ""
4444
4423
4445
#: bzrlib/builtins.py:6295
4424
#: bzrlib/builtins.py:6271
4446
4425
msgid ""
4447
4426
"In most cases, a view has a short life-span: it is created to make\n"
4448
4427
"a selected change and is deleted once that change is committed.\n"
4450
4429
"and switch between them."
4451
4430
msgstr ""
4452
4431
4453
#: bzrlib/builtins.py:6300
4432
#: bzrlib/builtins.py:6276
4454
4433
msgid ""
4455
4434
"To disable the current view without deleting it, you can switch to\n"
4456
4435
"the pseudo view called ``off``. This can be useful when you need\n"
4458
4437
"want to switch back to your view after that."
4459
4438
msgstr ""
4460
4439
4461
#: bzrlib/builtins.py:6305
4440
#: bzrlib/builtins.py:6281
4462
4441
msgid ""
4463
4442
":Examples:\n"
4464
4443
" To define the current view::"
4465
4444
msgstr ""
4466
4445
4467
#: bzrlib/builtins.py:6308
4446
#: bzrlib/builtins.py:6284
4468
4447
msgid " bzr view file1 dir1 ..."
4469
4448
msgstr ""
4470
4449
4471
#: bzrlib/builtins.py:6310
4450
#: bzrlib/builtins.py:6286
4472
4451
msgid " To list the current view::"
4473
4452
msgstr ""
4474
4453
4475
#: bzrlib/builtins.py:6312
4454
#: bzrlib/builtins.py:6288
4476
4455
msgid " bzr view"
4477
4456
msgstr ""
4478
4457
4479
#: bzrlib/builtins.py:6314
4458
#: bzrlib/builtins.py:6290
4480
4459
msgid " To delete the current view::"
4481
4460
msgstr ""
4482
4461
4483
#: bzrlib/builtins.py:6316
4462
#: bzrlib/builtins.py:6292
4484
4463
msgid " bzr view --delete"
4485
4464
msgstr ""
4486
4465
4487
#: bzrlib/builtins.py:6318
4466
#: bzrlib/builtins.py:6294
4488
4467
msgid " To disable the current view without deleting it::"
4489
4468
msgstr ""
4490
4469
4491
#: bzrlib/builtins.py:6320
4470
#: bzrlib/builtins.py:6296
4492
4471
msgid " bzr view --switch off"
4493
4472
msgstr ""
4494
4473
4495
#: bzrlib/builtins.py:6322
4474
#: bzrlib/builtins.py:6298
4496
4475
msgid " To define a named view and switch to it::"
4497
4476
msgstr ""
4498
4477
4499
#: bzrlib/builtins.py:6324
4478
#: bzrlib/builtins.py:6300
4500
4479
msgid " bzr view --name view-name file1 dir1 ..."
4501
4480
msgstr ""
4502
4481
4503
#: bzrlib/builtins.py:6326
4482
#: bzrlib/builtins.py:6302
4504
4483
msgid " To list a named view::"
4505
4484
msgstr ""
4506
4485
4507
#: bzrlib/builtins.py:6328
4486
#: bzrlib/builtins.py:6304
4508
4487
msgid " bzr view --name view-name"
4509
4488
msgstr ""
4510
4489
4511
#: bzrlib/builtins.py:6330
4490
#: bzrlib/builtins.py:6306
4512
4491
msgid " To delete a named view::"
4513
4492
msgstr ""
4514
4493
4515
#: bzrlib/builtins.py:6332
4494
#: bzrlib/builtins.py:6308
4516
4495
msgid " bzr view --name view-name --delete"
4517
4496
msgstr ""
4518
4497
4519
#: bzrlib/builtins.py:6334
4498
#: bzrlib/builtins.py:6310
4520
4499
msgid " To switch to a named view::"
4521
4500
msgstr ""
4522
4501
4523
#: bzrlib/builtins.py:6336
4502
#: bzrlib/builtins.py:6312
4524
4503
msgid " bzr view --switch view-name"
4525
4504
msgstr ""
4526
4505
4527
#: bzrlib/builtins.py:6338
4506
#: bzrlib/builtins.py:6314
4528
4507
msgid " To list all views defined::"
4529
4508
msgstr ""
4530
4509
4531
#: bzrlib/builtins.py:6340
4510
#: bzrlib/builtins.py:6316
4532
4511
msgid " bzr view --all"
4533
4512
msgstr ""
4534
4513
4535
#: bzrlib/builtins.py:6342
4514
#: bzrlib/builtins.py:6318
4536
4515
msgid " To delete all views::"
4537
4516
msgstr ""
4538
4517
4539
#: bzrlib/builtins.py:6344
4518
#: bzrlib/builtins.py:6320
4540
4519
msgid " bzr view --delete --all"
4541
4520
msgstr ""
4542
4521
4543
#: bzrlib/builtins.py:6351
4522
#: bzrlib/builtins.py:6327
4544
4523
msgid "Apply list or delete action to all views."
4545
4524
msgstr ""
4546
4525
4547
#: bzrlib/builtins.py:6354
4526
#: bzrlib/builtins.py:6330
4548
4527
msgid "Delete the view."
4549
4528
msgstr ""
4550
4529
4551
#: bzrlib/builtins.py:6357
4530
#: bzrlib/builtins.py:6333
4552
4531
msgid "Name of the view to define, list or delete."
4553
4532
msgstr ""
4554
4533
4555
#: bzrlib/builtins.py:6361
4534
#: bzrlib/builtins.py:6337
4556
4535
msgid "Name of the view to switch to."
4557
4536
msgstr ""
4558
4537
4559
#: bzrlib/builtins.py:6380
4538
#: bzrlib/builtins.py:6356
4560
4539
msgid "Both --delete and a file list specified"
4561
4540
msgstr ""
4562
4541
4563
#: bzrlib/builtins.py:6383
4542
#: bzrlib/builtins.py:6359
4564
4543
msgid "Both --delete and --switch specified"
4565
4544
msgstr ""
4566
4545
4567
#: bzrlib/builtins.py:6386
4546
#: bzrlib/builtins.py:6362
4568
4547
msgid "Deleted all views.\n"
4569
4548
msgstr ""
4570
4549
4571
#: bzrlib/builtins.py:6388
4550
#: bzrlib/builtins.py:6364
4572
4551
msgid "No current view to delete"
4573
4552
msgstr ""
4574
4553
4575
#: bzrlib/builtins.py:6391
4554
#: bzrlib/builtins.py:6367
4576
4555
#, python-format
4577
4556
msgid "Deleted '%s' view.\n"
4578
4557
msgstr ""
4579
4558
4580
#: bzrlib/builtins.py:6395
4559
#: bzrlib/builtins.py:6371
4581
4560
msgid "Both --switch and a file list specified"
4582
4561
msgstr ""
4583
4562
4584
#: bzrlib/builtins.py:6398
4563
#: bzrlib/builtins.py:6374
4585
4564
msgid "Both --switch and --all specified"
4586
4565
msgstr ""
4587
4566
4588
#: bzrlib/builtins.py:6401
4567
#: bzrlib/builtins.py:6377
4589
4568
msgid "No current view to disable"
4590
4569
msgstr ""
4591
4570
4592
#: bzrlib/builtins.py:6403
4571
#: bzrlib/builtins.py:6379
4593
4572
#, python-format
4594
4573
msgid "Disabled '%s' view.\n"
4595
4574
msgstr ""
4596
4575
4597
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4576
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4598
4577
msgid "Using '{0}' view: {1}\n"
4599
4578
msgstr ""
4600
4579
4601
#: bzrlib/builtins.py:6410
4580
#: bzrlib/builtins.py:6386
4602
4581
msgid "Views defined:\n"
4603
4582
msgstr ""
4604
4583
4605
#: bzrlib/builtins.py:6419
4584
#: bzrlib/builtins.py:6395
4606
4585
msgid "No views defined.\n"
4607
4586
msgstr ""
4608
4587
4609
#: bzrlib/builtins.py:6426
4588
#: bzrlib/builtins.py:6402
4610
4589
msgid "Cannot change the 'off' pseudo view"
4611
4590
msgstr ""
4612
4591
4613
#: bzrlib/builtins.py:6434
4592
#: bzrlib/builtins.py:6410
4614
4593
msgid "No current view.\n"
4615
4594
msgstr ""
4616
4595
4617
#: bzrlib/builtins.py:6437
4596
#: bzrlib/builtins.py:6413
4618
4597
msgid "'{0}' view is: {1}\n"
4619
4598
msgstr ""
4620
4599
4621
#: bzrlib/builtins.py:6457
4600
#: bzrlib/builtins.py:6433
4622
4601
msgid " <no hooks installed>\n"
4623
4602
msgstr ""
4624
4603
4625
#: bzrlib/builtins.py:6461
4604
#: bzrlib/builtins.py:6437
4626
4605
msgid "Remove a branch."
4627
4606
msgstr ""
4628
4607
4629
#: bzrlib/builtins.py:6463
4608
#: bzrlib/builtins.py:6439
4630
4609
msgid ""
4631
4610
"This will remove the branch from the specified location but \n"
4632
4611
"will keep any working tree or repository in place."
4633
4612
msgstr ""
4634
4613
4635
#: bzrlib/builtins.py:6468
4614
#: bzrlib/builtins.py:6444
4636
4615
msgid " Remove the branch at repo/trunk::"
4637
4616
msgstr ""
4638
4617
4639
#: bzrlib/builtins.py:6470
4618
#: bzrlib/builtins.py:6446
4640
4619
msgid " bzr remove-branch repo/trunk"
4641
4620
msgstr ""
4642
4621
4643
#: bzrlib/builtins.py:6477
4644
msgid "Remove branch even if it is the active branch."
4645
msgstr ""
4646
4647
#: bzrlib/builtins.py:6491
4648
msgid "Branch is active. Use --force to remove it."
4649
msgstr ""
4650
4651
#: bzrlib/builtins.py:6495
4622
#: bzrlib/builtins.py:6461
4652
4623
msgid "Plaintext diff output."
4653
4624
msgstr ""
4654
4625
4655
#: bzrlib/builtins.py:6496
4626
#: bzrlib/builtins.py:6462
4656
4627
msgid "Temporarily set aside some changes from the current tree."
4657
4628
msgstr ""
4658
4629
4659
#: bzrlib/builtins.py:6498
4630
#: bzrlib/builtins.py:6464
4660
4631
msgid ""
4661
4632
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4662
4633
"ie. out of the way, until a later time when you can bring them back from\n"
4665
4636
"will they survive its deletion."
4666
4637
msgstr ""
4667
4638
4668
#: bzrlib/builtins.py:6504
4639
#: bzrlib/builtins.py:6470
4669
4640
msgid "If shelve --list is specified, previously-shelved changes are listed."
4670
4641
msgstr ""
4671
4642
4672
#: bzrlib/builtins.py:6506
4643
#: bzrlib/builtins.py:6472
4673
4644
msgid ""
4674
4645
"Shelve is intended to help separate several sets of changes that have\n"
4675
4646
"been inappropriately mingled. If you just want to get rid of all changes\n"
4677
4648
"shelve all text changes at once, use shelve --all."
4678
4649
msgstr ""
4679
4650
4680
#: bzrlib/builtins.py:6511
4651
#: bzrlib/builtins.py:6477
4681
4652
msgid ""
4682
4653
"If filenames are specified, only the changes to those files will be\n"
4683
4654
"shelved. Other files will be left untouched."
4684
4655
msgstr ""
4685
4656
4686
#: bzrlib/builtins.py:6514
4657
#: bzrlib/builtins.py:6480
4687
4658
msgid ""
4688
4659
"If a revision is specified, changes since that revision will be shelved."
4689
4660
msgstr ""
4690
4661
4691
#: bzrlib/builtins.py:6516
4662
#: bzrlib/builtins.py:6482
4692
4663
msgid ""
4693
4664
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4694
4665
"restore the most recently shelved changes."
4695
4666
msgstr ""
4696
4667
4697
#: bzrlib/builtins.py:6519
4668
#: bzrlib/builtins.py:6485
4698
4669
msgid ""
4699
4670
"For complicated changes, it is possible to edit the changes in a separate\n"
4700
4671
"editor program to decide what the file remaining in the working copy\n"
4701
4672
"should look like. To do this, add the configuration option"
4702
4673
msgstr ""
4703
4674
4704
#: bzrlib/builtins.py:6523
4675
#: bzrlib/builtins.py:6489
4705
4676
msgid " change_editor = PROGRAM @new_path @old_path"
4706
4677
msgstr ""
4707
4678
4708
#: bzrlib/builtins.py:6525
4679
#: bzrlib/builtins.py:6491
4709
4680
msgid ""
4710
4681
"where @new_path is replaced with the path of the new version of the \n"
4711
4682
"file and @old_path is replaced with the path of the old version of \n"
4714
4685
" "
4715
4686
msgstr ""
4716
4687
4717
#: bzrlib/builtins.py:6537
4688
#: bzrlib/builtins.py:6503
4718
4689
msgid "Shelve all changes."
4719
4690
msgstr ""
4720
4691
4721
#: bzrlib/builtins.py:6539
4692
#: bzrlib/builtins.py:6505
4722
4693
msgid "Method to use for writing diffs."
4723
4694
msgstr ""
4724
4695
4725
#: bzrlib/builtins.py:6539
4696
#: bzrlib/builtins.py:6505
4726
4697
msgid "writer"
4727
4698
msgstr ""
4728
4699
4729
#: bzrlib/builtins.py:6543
4700
#: bzrlib/builtins.py:6509
4730
4701
msgid "List shelved changes."
4731
4702
msgstr ""
4732
4703
4733
#: bzrlib/builtins.py:6545
4704
#: bzrlib/builtins.py:6511
4734
4705
msgid "Destroy removed changes instead of shelving them."
4735
4706
msgstr ""
4736
4707
4737
#: bzrlib/builtins.py:6574
4708
#: bzrlib/builtins.py:6540
4738
4709
msgid "No shelved changes."
4739
4710
msgstr ""
4740
4711
4741
#: bzrlib/builtins.py:6585
4712
#: bzrlib/builtins.py:6551
4742
4713
msgid "Restore shelved changes."
4743
4714
msgstr ""
4744
4715
4745
#: bzrlib/builtins.py:6587
4716
#: bzrlib/builtins.py:6553
4746
4717
msgid ""
4747
4718
"By default, the most recently shelved changes are restored. However if you\n"
4748
4719
"specify a shelf by id those changes will be restored instead. This works\n"
4749
4720
"best when the changes don't depend on each other."
4750
4721
msgstr ""
4751
4722
4752
#: bzrlib/builtins.py:6596
4723
#: bzrlib/builtins.py:6562
4753
4724
msgid "The action to perform."
4754
4725
msgstr ""
4755
4726
4756
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4727
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4757
4728
msgid "action"
4758
4729
msgstr ""
4759
4730
4760
#: bzrlib/builtins.py:6598
4731
#: bzrlib/builtins.py:6564
4761
4732
msgid "Apply changes and remove from the shelf."
4762
4733
msgstr ""
4763
4734
4764
#: bzrlib/builtins.py:6599
4735
#: bzrlib/builtins.py:6565
4765
4736
msgid "Show changes, but do not apply or remove them."
4766
4737
msgstr ""
4767
4738
4768
#: bzrlib/builtins.py:6600
4739
#: bzrlib/builtins.py:6566
4769
4740
msgid ""
4770
4741
"Instead of unshelving the changes, show the diff that would result from "
4771
4742
"unshelving."
4772
4743
msgstr ""
4773
4744
4774
#: bzrlib/builtins.py:6602
4745
#: bzrlib/builtins.py:6568
4775
4746
msgid "Delete changes without applying them."
4776
4747
msgstr ""
4777
4748
4778
#: bzrlib/builtins.py:6603
4749
#: bzrlib/builtins.py:6569
4779
4750
msgid "Apply changes but don't delete them."
4780
4751
msgstr ""
4781
4752
4782
#: bzrlib/builtins.py:6618
4753
#: bzrlib/builtins.py:6584
4783
4754
msgid "Remove unwanted files from working tree."
4784
4755
msgstr ""
4785
4756
4786
#: bzrlib/builtins.py:6620
4757
#: bzrlib/builtins.py:6586
4787
4758
msgid ""
4788
4759
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4789
4760
"files are never deleted."
4790
4761
msgstr ""
4791
4762
4792
#: bzrlib/builtins.py:6623
4763
#: bzrlib/builtins.py:6589
4793
4764
msgid ""
4794
4765
"Another class is 'detritus', which includes files emitted by bzr during\n"
4795
4766
"normal operations and selftests. (The value of these files decreases with\n"
4796
4767
"time.)"
4797
4768
msgstr ""
4798
4769
4799
#: bzrlib/builtins.py:6627
4770
#: bzrlib/builtins.py:6593
4800
4771
msgid ""
4801
4772
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4802
4773
"flags are respected, and may be combined."
4803
4774
msgstr ""
4804
4775
4805
#: bzrlib/builtins.py:6630
4776
#: bzrlib/builtins.py:6596
4806
4777
msgid "To check what clean-tree will do, use --dry-run."
4807
4778
msgstr ""
4808
4779
4809
#: bzrlib/builtins.py:6633
4780
#: bzrlib/builtins.py:6599
4810
4781
msgid "Delete all ignored files."
4811
4782
msgstr ""
4812
4783
4813
#: bzrlib/builtins.py:6634
4784
#: bzrlib/builtins.py:6600
4814
4785
msgid ""
4815
4786
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4816
4787
msgstr ""
4817
4788
4818
#: bzrlib/builtins.py:6637
4789
#: bzrlib/builtins.py:6603
4819
4790
msgid "Delete files unknown to bzr (default)."
4820
4791
msgstr ""
4821
4792
4822
#: bzrlib/builtins.py:6638
4793
#: bzrlib/builtins.py:6604
4823
4794
msgid "Show files to delete instead of deleting them."
4824
4795
msgstr ""
4825
4796
4826
#: bzrlib/builtins.py:6640
4797
#: bzrlib/builtins.py:6606
4827
4798
msgid "Do not prompt before deleting."
4828
4799
msgstr ""
4829
4800
4883
4854
msgstr[0] ""
4884
4855
msgstr[1] ""
4885
4856
4886
#: bzrlib/bzrdir.py:487
4857
#: bzrlib/bzrdir.py:490
4887
4858
msgid ""
4888
4859
"making backup of {0}\n"
4889
4860
" to {1}"
4890
4861
msgstr ""
4891
4862
4892
#: bzrlib/bzrdir.py:510
4863
#: bzrlib/bzrdir.py:513
4893
4864
msgid "renamed {0} to {1}"
4894
4865
msgstr ""
4895
4866
4896
#: bzrlib/bzrdir.py:1639
4867
#: bzrlib/bzrdir.py:1652
4897
4868
#, python-format
4898
4869
msgid ""
4899
4870
"Source repository format does not support stacking, using format:\n"
4900
4871
" %s"
4901
4872
msgstr ""
4902
4873
4903
#: bzrlib/bzrdir.py:1659
4874
#: bzrlib/bzrdir.py:1672
4904
4875
#, python-format
4905
4876
msgid ""
4906
4877
"Source branch format does not support stacking, using format:\n"
4907
4878
" %s"
4908
4879
msgstr ""
4909
4880
4910
#: bzrlib/bzrdir.py:1805
4881
#: bzrlib/bzrdir.py:1818
4911
4882
msgid "starting repository conversion"
4912
4883
msgstr ""
4913
4884
4914
#: bzrlib/bzrdir.py:2026
4885
#: bzrlib/bzrdir.py:2039
4915
4886
msgid "Using default stacking branch {0} at {1}"
4916
4887
msgstr ""
4917
4888
5094
5065
"supported formats or in a custom format based on a template."
5095
5066
msgstr ""
5096
5067
5097
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
5098
#: en/help_topics/configuration.txt:722
5068
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
5069
#: en/help_topics/configuration.txt:710
5099
5070
msgid "For example::"
5100
5071
msgstr ""
5101
5072
5221
5192
msgid ":See also: %s"
5222
5193
msgstr ":Смотрите также: %s"
5223
5194
5224
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
5195
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
5225
5196
msgid "Only ASCII permitted in option names"
5226
5197
msgstr "В именах опций разрешены только символы ASCII"
5227
5198
5228
#: bzrlib/commands.py:851 bzrlib/commands.py:859
5199
#: bzrlib/commands.py:841 bzrlib/commands.py:849
5229
5200
msgid "command {0!r} needs one or more {1}"
5230
5201
msgstr "команде {0!r} требуется один или больше {1}"
5231
5202
5232
#: bzrlib/commands.py:868
5203
#: bzrlib/commands.py:858
5233
5204
msgid "command {0!r} requires argument {1}"
5234
5205
msgstr "команде {0!r} требуется аргумент {1}"
5235
5206
5236
#: bzrlib/commands.py:875
5207
#: bzrlib/commands.py:865
5237
5208
msgid "extra argument to command {0}: {1}"
5238
5209
msgstr "лишний аргумент к команде {0}: {1}"
5239
5210
5240
#: bzrlib/commands.py:972
5211
#: bzrlib/commands.py:962
5241
5212
#, python-format
5242
5213
msgid "Profile data written to \"%s\"."
5243
5214
msgstr "Данные профиля записаны в «%s»."
5280
5251
msgid "renamed"
5281
5252
msgstr "переименованы"
5282
5253
5283
#: bzrlib/commit.py:976
5254
#: bzrlib/commit.py:977
5284
5255
msgid "unchanged"
5285
5256
msgstr "без изменений"
5286
5257
5287
#: bzrlib/commit.py:998
5258
#: bzrlib/commit.py:999
5288
5259
msgid "{0} [{1}] - Stage"
5289
5260
msgstr ""
5290
5261
5291
#: bzrlib/commit.py:1001
5262
#: bzrlib/commit.py:1002
5292
5263
#, python-format
5293
5264
msgid "%s - Stage"
5294
5265
msgstr ""
5295
5266
5296
#: bzrlib/commit_signature_commands.py:34
5267
#: bzrlib/commit_signature_commands.py:36
5297
5268
msgid "Sign all commits by a given committer."
5298
5269
msgstr ""
5299
5270
5300
#: bzrlib/commit_signature_commands.py:36
5271
#: bzrlib/commit_signature_commands.py:38
5301
5272
msgid ""
5302
5273
"If location is not specified the local tree is used.\n"
5303
5274
"If committer is not specified the default committer is used."
5304
5275
msgstr ""
5305
5276
5306
#: bzrlib/commit_signature_commands.py:39
5277
#: bzrlib/commit_signature_commands.py:41
5307
5278
msgid "This does not sign commits that already have signatures."
5308
5279
msgstr ""
5309
5280
5310
#: bzrlib/commit_signature_commands.py:47
5281
#: bzrlib/commit_signature_commands.py:49
5311
5282
msgid ""
5312
5283
"Don't actually sign anything, just print the revisions that would be signed."
5313
5284
msgstr ""
5314
5285
5315
#: bzrlib/commit_signature_commands.py:98
5316
#, python-format
5317
msgid "Signed %d revision.\n"
5318
msgid_plural "Signed %d revisions.\n"
5319
msgstr[0] ""
5320
msgstr[1] ""
5321
5322
5286
#: bzrlib/commit_signature_commands.py:103
5323
5287
msgid "Verify all commit signatures."
5324
5288
msgstr ""
5334
5298
"verification."
5335
5299
msgstr ""
5336
5300
5337
#: bzrlib/commit_signature_commands.py:148
5301
#: bzrlib/commit_signature_commands.py:147
5338
5302
msgid "Cannot verify a range of non-revision-history revisions"
5339
5303
msgstr ""
5340
5304
5341
#: bzrlib/commit_signature_commands.py:166
5305
#: bzrlib/commit_signature_commands.py:168
5342
5306
msgid "All commits signed with verifiable keys"
5343
5307
msgstr ""
5344
5308
5345
#: bzrlib/config.py:436
5309
#: bzrlib/config.py:475
5346
5310
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5347
5311
msgstr ""
5348
5312
5349
#: bzrlib/config.py:2452
5313
#: bzrlib/config.py:2485
5350
5314
msgid "{0} is not an SI unit."
5351
5315
msgstr ""
5352
5316
5353
#: bzrlib/config.py:2971
5317
#: bzrlib/config.py:2949
5354
5318
msgid ""
5355
5319
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5356
5320
"will be saved."
5357
5321
msgstr ""
5358
5322
5359
#: bzrlib/config.py:3116
5323
#: bzrlib/config.py:3093
5360
5324
#, python-format
5361
5325
msgid "Invalid '%s', should be of the form 'name=value'"
5362
5326
msgstr ""
5363
5327
5364
#: bzrlib/config.py:4018
5328
#: bzrlib/config.py:3962
5365
5329
msgid "Display, set or remove a configuration option."
5366
5330
msgstr ""
5367
5331
5368
#: bzrlib/config.py:4020
5332
#: bzrlib/config.py:3964
5369
5333
msgid "Display the active value for a given option."
5370
5334
msgstr ""
5371
5335
5372
#: bzrlib/config.py:4022
5336
#: bzrlib/config.py:3966
5373
5337
msgid ""
5374
5338
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5375
5339
"matching options are displayed mentioning their scope. The active value\n"
5376
5340
"that bzr will take into account is the first one displayed for each option."
5377
5341
msgstr ""
5378
5342
5379
#: bzrlib/config.py:4026
5343
#: bzrlib/config.py:3970
5380
5344
msgid "If no NAME is given, --all .* is implied."
5381
5345
msgstr ""
5382
5346
5383
#: bzrlib/config.py:4028
5347
#: bzrlib/config.py:3972
5384
5348
msgid ""
5385
5349
"Setting a value is achieved by using name=value without spaces. The value\n"
5386
5350
"is set in the most relevant scope and can be checked by displaying the\n"
5387
5351
"option again."
5388
5352
msgstr ""
5389
5353
5390
#: bzrlib/config.py:4040
5354
#: bzrlib/config.py:3984
5391
5355
msgid "Reduce the scope to the specified configuration file."
5392
5356
msgstr ""
5393
5357
5394
#: bzrlib/config.py:4044
5358
#: bzrlib/config.py:3988
5395
5359
msgid "Display all the defined values for the matching options."
5396
5360
msgstr ""
5397
5361
5398
#: bzrlib/config.py:4046
5362
#: bzrlib/config.py:3990
5399
5363
msgid "Remove the option from the configuration file."
5400
5364
msgstr ""
5401
5365
5475
5439
msgstr[0] ""
5476
5440
msgstr[1] ""
5477
5441
5478
#: bzrlib/controldir.py:712
5442
#: bzrlib/controldir.py:710
5479
5443
msgid "{0} is{1} redirected to {2}"
5480
5444
msgstr ""
5481
5445
5692
5656
msgstr ""
5693
5657
5694
5658
#: bzrlib/errors.py:715
5695
msgid "Invalid branch name: %(name)s"
5696
msgstr ""
5697
5698
#: bzrlib/errors.py:724
5699
5659
msgid "Parent branch already exists: \"%(path)s\"."
5700
5660
msgstr ""
5701
5661
5702
#: bzrlib/errors.py:730
5662
#: bzrlib/errors.py:721
5703
5663
msgid ""
5704
5664
"Directory contains a branch, but no working tree (use bzr checkout if you "
5705
5665
"wish to build a working tree): \"%(path)s\""
5706
5666
msgstr ""
5707
5667
5708
#: bzrlib/errors.py:735
5668
#: bzrlib/errors.py:726
5709
5669
msgid ""
5710
5670
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5711
5671
msgstr ""
5712
5672
5713
#: bzrlib/errors.py:745
5673
#: bzrlib/errors.py:736
5714
5674
msgid ""
5715
5675
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5716
5676
msgstr ""
5717
5677
5718
#: bzrlib/errors.py:755
5678
#: bzrlib/errors.py:746
5719
5679
msgid "No repository present: \"%(path)s\""
5720
5680
msgstr ""
5721
5681
5722
#: bzrlib/errors.py:762
5682
#: bzrlib/errors.py:753
5723
5683
msgid ""
5724
5684
"Unsupported branch format: %(format)s\n"
5725
5685
"Please run 'bzr upgrade'"
5726
5686
msgstr ""
5727
5687
5688
#: bzrlib/errors.py:759
5689
msgid "Unknown %(kind)s format: %(format)r"
5690
msgstr ""
5691
5728
5692
#: bzrlib/errors.py:768
5729
msgid "Unknown %(kind)s format: %(format)r"
5730
msgstr ""
5731
5732
#: bzrlib/errors.py:777
5733
5693
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5734
5694
msgstr ""
5735
5695
5736
#: bzrlib/errors.py:787
5696
#: bzrlib/errors.py:778
5737
5697
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5738
5698
msgstr ""
5739
5699
5740
#: bzrlib/errors.py:802
5700
#: bzrlib/errors.py:793
5741
5701
msgid ""
5742
5702
"%(target)s\n"
5743
5703
"is not compatible with\n"
5745
5705
"%(details)s"
5746
5706
msgstr ""
5747
5707
5748
#: bzrlib/errors.py:818
5708
#: bzrlib/errors.py:809
5749
5709
msgid "Revision is not compatible with %(repo_format)s"
5750
5710
msgstr ""
5751
5711
5752
#: bzrlib/errors.py:828
5712
#: bzrlib/errors.py:819
5753
5713
msgid "%(context_info)s%(path)s is already versioned."
5754
5714
msgstr ""
5755
5715
5756
#: bzrlib/errors.py:849
5716
#: bzrlib/errors.py:840
5757
5717
msgid "%(context_info)s%(path)s is not versioned."
5758
5718
msgstr ""
5759
5719
5760
#: bzrlib/errors.py:870
5720
#: bzrlib/errors.py:861
5761
5721
msgid "Path(s) are not versioned: %(paths_as_string)s"
5762
5722
msgstr ""
5763
5723
5764
#: bzrlib/errors.py:881
5724
#: bzrlib/errors.py:872
5765
5725
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5766
5726
msgstr ""
5767
5727
5768
#: bzrlib/errors.py:900
5728
#: bzrlib/errors.py:891
5769
5729
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5770
5730
msgstr ""
5771
5731
5772
#: bzrlib/errors.py:908
5732
#: bzrlib/errors.py:899
5773
5733
msgid ""
5774
5734
"Filename %(filename)r is not valid in your current filesystem encoding "
5775
5735
"%(fs_encoding)s"
5776
5736
msgstr ""
5777
5737
5778
#: bzrlib/errors.py:919
5738
#: bzrlib/errors.py:910
5779
5739
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5780
5740
msgstr ""
5781
5741
5782
#: bzrlib/errors.py:937
5742
#: bzrlib/errors.py:928
5783
5743
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5784
5744
msgstr ""
5785
5745
5786
#: bzrlib/errors.py:976
5746
#: bzrlib/errors.py:967
5787
5747
msgid "Cannot lock %(lock)s: %(why)s"
5788
5748
msgstr ""
5789
5749
5790
#: bzrlib/errors.py:986
5750
#: bzrlib/errors.py:977
5791
5751
msgid ""
5792
5752
"A transaction related operation was attempted after the transaction finished."
5793
5753
msgstr ""
5794
5754
5795
#: bzrlib/errors.py:1013
5755
#: bzrlib/errors.py:1004
5796
5756
msgid "Cannot lock: transport is read only: %(transport)s"
5797
5757
msgstr ""
5798
5758
5799
#: bzrlib/errors.py:1021
5759
#: bzrlib/errors.py:1012
5800
5760
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5801
5761
msgstr ""
5802
5762
5803
#: bzrlib/errors.py:1032
5763
#: bzrlib/errors.py:1023
5804
5764
msgid ""
5805
5765
"Lock was broken while still open: %(lock)s - check storage consistency!"
5806
5766
msgstr ""
5807
5767
5808
#: bzrlib/errors.py:1043
5768
#: bzrlib/errors.py:1034
5809
5769
msgid ""
5810
5770
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5811
5771
"%(holder)r, wanted to break %(target)r"
5812
5772
msgstr ""
5813
5773
5814
#: bzrlib/errors.py:1055
5774
#: bzrlib/errors.py:1046
5815
5775
msgid ""
5816
5776
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5817
5777
"Use 'bzr break-lock' to clear it"
5818
5778
msgstr ""
5819
5779
5820
#: bzrlib/errors.py:1068
5780
#: bzrlib/errors.py:1059
5821
5781
msgid "Lock not held: %(lock)s"
5822
5782
msgstr ""
5823
5783
5824
#: bzrlib/errors.py:1097
5784
#: bzrlib/errors.py:1088
5825
5785
msgid "No changes to commit"
5826
5786
msgstr ""
5827
5787
5828
#: bzrlib/errors.py:1102
5788
#: bzrlib/errors.py:1093
5829
5789
msgid ""
5830
5790
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5831
5791
msgstr ""
5832
5792
5833
#: bzrlib/errors.py:1112
5793
#: bzrlib/errors.py:1103
5834
5794
msgid ""
5835
5795
"Excluding paths during commit is not supported by repository at "
5836
5796
"%(repository)r."
5837
5797
msgstr ""
5838
5798
5839
#: bzrlib/errors.py:1121
5799
#: bzrlib/errors.py:1112
5840
5800
msgid ""
5841
5801
"The specified commit message contains characters unsupported by the current "
5842
5802
"encoding."
5843
5803
msgstr ""
5844
5804
5845
#: bzrlib/errors.py:1127
5805
#: bzrlib/errors.py:1118
5846
5806
msgid "Upgrade URL cannot work with readonly URLs."
5847
5807
msgstr ""
5848
5808
5849
#: bzrlib/errors.py:1132
5809
#: bzrlib/errors.py:1123
5850
5810
msgid "The branch format %(format)s is already at the most recent format."
5851
5811
msgstr ""
5852
5812
5853
#: bzrlib/errors.py:1155
5813
#: bzrlib/errors.py:1146
5854
5814
msgid "Option --change does not accept revision ranges"
5855
5815
msgstr ""
5856
5816
5857
#: bzrlib/errors.py:1160
5817
#: bzrlib/errors.py:1151
5858
5818
msgid "No namespace registered for string: %(spec)r"
5859
5819
msgstr ""
5860
5820
5861
#: bzrlib/errors.py:1179
5821
#: bzrlib/errors.py:1170
5862
5822
msgid ""
5863
5823
"Requested revision: '%(spec)s' does not exist in branch: "
5864
5824
"%(branch_url)s%(extra)s"
5865
5825
msgstr ""
5866
5826
5867
#: bzrlib/errors.py:1193
5827
#: bzrlib/errors.py:1184
5868
5828
msgid ""
5869
5829
"Operation denied because it would change the main history, which is not "
5870
5830
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5871
5831
msgstr ""
5872
5832
5873
#: bzrlib/errors.py:1204
5833
#: bzrlib/errors.py:1195
5874
5834
msgid ""
5875
5835
"These branches have diverged. Use the missing command to see how.\n"
5876
5836
"Use the merge command to reconcile them."
5877
5837
msgstr ""
5878
5838
5879
#: bzrlib/errors.py:1224
5839
#: bzrlib/errors.py:1215
5880
5840
msgid ""
5881
5841
"Branches have no common ancestor, and no merge base revision was specified."
5882
5842
msgstr ""
5883
5843
5884
#: bzrlib/errors.py:1230
5844
#: bzrlib/errors.py:1221
5885
5845
msgid ""
5886
5846
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5887
5847
msgstr ""
5888
5848
5849
#: bzrlib/errors.py:1227
5850
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5851
msgstr ""
5852
5889
5853
#: bzrlib/errors.py:1236
5890
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5854
msgid ""
5855
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5891
5856
msgstr ""
5892
5857
5893
5858
#: bzrlib/errors.py:1245
5894
msgid ""
5895
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5859
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5896
5860
msgstr ""
5897
5861
5898
5862
#: bzrlib/errors.py:1254
5899
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:1263
5903
5863
msgid "Branch %(branch)s has no commits."
5904
5864
msgstr ""
5905
5865
5906
#: bzrlib/errors.py:1281
5866
#: bzrlib/errors.py:1272
5907
5867
msgid ""
5908
5868
"Bound branch %(branch)s is out of date with master branch "
5909
5869
"%(master)s.%(extra_help)s"
5910
5870
msgstr ""
5911
5871
5912
#: bzrlib/errors.py:1293
5872
#: bzrlib/errors.py:1284
5913
5873
msgid ""
5914
5874
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5915
5875
"bound to %(remote)s."
5916
5876
msgstr ""
5917
5877
5878
#: bzrlib/errors.py:1296
5879
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5880
msgstr ""
5881
5918
5882
#: bzrlib/errors.py:1305
5919
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5920
msgstr ""
5921
5922
#: bzrlib/errors.py:1314
5923
5883
msgid ""
5924
5884
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5925
5885
"%(error)s"
5926
5886
msgstr ""
5927
5887
5888
#: bzrlib/errors.py:1317
5889
msgid "Error in processing weave: %(msg)s"
5890
msgstr ""
5891
5928
5892
#: bzrlib/errors.py:1326
5929
msgid "Error in processing weave: %(msg)s"
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:1335
5933
5893
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5934
5894
msgstr ""
5935
5895
5936
#: bzrlib/errors.py:1346
5896
#: bzrlib/errors.py:1337
5937
5897
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5938
5898
msgstr ""
5939
5899
5900
#: bzrlib/errors.py:1347
5901
msgid "Weave invariant violated: %(what)s"
5902
msgstr ""
5903
5940
5904
#: bzrlib/errors.py:1356
5941
msgid "Weave invariant violated: %(what)s"
5942
msgstr ""
5943
5944
#: bzrlib/errors.py:1365
5945
5905
msgid "Parents are mismatched between two revisions. %(msg)s"
5946
5906
msgstr ""
5947
5907
5948
#: bzrlib/errors.py:1387
5908
#: bzrlib/errors.py:1378
5949
5909
msgid ""
5950
5910
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5951
5911
"%(weave_b)s"
5952
5912
msgstr ""
5953
5913
5954
#: bzrlib/errors.py:1399
5914
#: bzrlib/errors.py:1390
5955
5915
msgid "Versioned file error"
5956
5916
msgstr ""
5957
5917
5958
#: bzrlib/errors.py:1404
5918
#: bzrlib/errors.py:1395
5959
5919
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5960
5920
msgstr ""
5961
5921
5962
#: bzrlib/errors.py:1414
5922
#: bzrlib/errors.py:1405
5963
5923
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5964
5924
msgstr ""
5965
5925
5966
#: bzrlib/errors.py:1424
5926
#: bzrlib/errors.py:1415
5967
5927
msgid "Text did not match its checksum: %(msg)s"
5968
5928
msgstr ""
5969
5929
5930
#: bzrlib/errors.py:1541
5931
msgid "Export format %(format)r not supported"
5932
msgstr ""
5933
5970
5934
#: bzrlib/errors.py:1550
5971
msgid "Export format %(format)r not supported"
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:1559
5975
5935
msgid "Transport error: %(msg)s %(orig_error)s"
5976
5936
msgstr ""
5977
5937
5978
#: bzrlib/errors.py:1585
5938
#: bzrlib/errors.py:1576
5979
5939
msgid "Generic bzr smart protocol error: %(details)s"
5980
5940
msgstr ""
5981
5941
5982
#: bzrlib/errors.py:1593
5942
#: bzrlib/errors.py:1584
5983
5943
msgid "Received bad protocol version marker: %(marker)r"
5984
5944
msgstr ""
5985
5945
5986
#: bzrlib/errors.py:1625
5946
#: bzrlib/errors.py:1616
5987
5947
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5988
5948
msgstr ""
5989
5949
5990
#: bzrlib/errors.py:1630
5950
#: bzrlib/errors.py:1621
5991
5951
msgid "Connection error: %(msg)s %(orig_error)s"
5992
5952
msgstr ""
5993
5953
5994
#: bzrlib/errors.py:1635
5954
#: bzrlib/errors.py:1626
5995
5955
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5996
5956
msgstr ""
5997
5957
5998
#: bzrlib/errors.py:1656
5958
#: bzrlib/errors.py:1647
5999
5959
msgid "Connection closed: %(msg)s %(orig_error)s"
6000
5960
msgstr ""
6001
5961
6002
#: bzrlib/errors.py:1661
5962
#: bzrlib/errors.py:1652
6003
5963
msgid "Connection Timeout: %(msg)s%(orig_error)s"
6004
5964
msgstr ""
6005
5965
6006
#: bzrlib/errors.py:1666
5966
#: bzrlib/errors.py:1657
6007
5967
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
6008
5968
msgstr ""
6009
5969
6010
#: bzrlib/errors.py:1676
5970
#: bzrlib/errors.py:1667
6011
5971
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
6012
5972
msgstr ""
6013
5973
6014
#: bzrlib/errors.py:1691
5974
#: bzrlib/errors.py:1682
6015
5975
msgid "Certificate error: %(error)s"
6016
5976
msgstr ""
6017
5977
6018
#: bzrlib/errors.py:1699
5978
#: bzrlib/errors.py:1690
6019
5979
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
6020
5980
msgstr ""
6021
5981
6022
#: bzrlib/errors.py:1713
5982
#: bzrlib/errors.py:1704
6023
5983
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
6024
5984
msgstr ""
6025
5985
5986
#: bzrlib/errors.py:1712
5987
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5988
msgstr ""
5989
6026
5990
#: bzrlib/errors.py:1721
6027
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
6028
msgstr ""
6029
6030
#: bzrlib/errors.py:1730
6031
5991
msgid "%(source)s is%(permanently)s redirected to %(target)s"
6032
5992
msgstr ""
6033
5993
6034
#: bzrlib/errors.py:1744
5994
#: bzrlib/errors.py:1735
6035
5995
msgid "Too many redirections"
6036
5996
msgstr ""
6037
5997
6038
#: bzrlib/errors.py:1749
5998
#: bzrlib/errors.py:1740
6039
5999
msgid "Working tree has conflicts."
6040
6000
msgstr ""
6041
6001
6002
#: bzrlib/errors.py:1744
6003
msgid "Config file %(filename)s is not UTF-8 encoded\n"
6004
msgstr ""
6005
6042
6006
#: bzrlib/errors.py:1753
6043
msgid "Config file %(filename)s is not UTF-8 encoded\n"
6044
msgstr ""
6045
6046
#: bzrlib/errors.py:1762
6047
6007
msgid ""
6048
6008
"Error(s) parsing config file %(filename)s:\n"
6049
6009
"%(errors)s"
6050
6010
msgstr ""
6051
6011
6052
#: bzrlib/errors.py:1772
6012
#: bzrlib/errors.py:1763
6053
6013
msgid ""
6054
6014
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6055
6015
"See ``bzr help %(name)s``"
6056
6016
msgstr ""
6057
6017
6018
#: bzrlib/errors.py:1773
6019
msgid "%(username)r does not seem to contain a reasonable email address"
6020
msgstr ""
6021
6058
6022
#: bzrlib/errors.py:1782
6059
msgid "%(username)r does not seem to contain a reasonable email address"
6060
msgstr ""
6061
6062
#: bzrlib/errors.py:1791
6063
6023
msgid "Failed to GPG sign data with command \"%(command_line)s\""
6064
6024
msgstr ""
6065
6025
6066
#: bzrlib/errors.py:1799
6026
#: bzrlib/errors.py:1790
6067
6027
msgid "Failed to verify GPG signature data with error \"%(error)s\""
6068
6028
msgstr "Не удалось верифицировать подпись GPG с ошибкой «%(error)s»"
6069
6029
6070
#: bzrlib/errors.py:1807
6030
#: bzrlib/errors.py:1798
6071
6031
msgid "Unable to import library \"%(library)s\": %(error)s"
6072
6032
msgstr "Не удалось импортировать библиотеку «%(library)s»: %(error)s"
6073
6033
6074
#: bzrlib/errors.py:1815
6034
#: bzrlib/errors.py:1806
6075
6035
msgid "python-gpgme is not installed, it is needed to verify signatures"
6076
6036
msgstr "python-gpgme не устонвлен, он нужен для верификации подписей"
6077
6037
6078
#: bzrlib/errors.py:1823
6038
#: bzrlib/errors.py:1814
6079
6039
msgid ""
6080
6040
"The working tree for %(basedir)s has changed since the last commit, but "
6081
6041
"weave merge requires that it be unchanged"
6083
6043
"Рабочее дерево для %(basedir)s изменилось с последнего закрепления, но merge "
6084
6044
"требует, чтобы оно не содержало изменений"
6085
6045
6086
#: bzrlib/errors.py:1833
6046
#: bzrlib/errors.py:1824
6087
6047
msgid ""
6088
6048
"Can't reprocess and show base, because reprocessing obscures the "
6089
6049
"relationship of conflicting lines to the base"
6090
6050
msgstr ""
6091
6051
6092
#: bzrlib/errors.py:1839
6052
#: bzrlib/errors.py:1830
6093
6053
msgid "Cycle in graph %(graph)r"
6094
6054
msgstr "Цикл в графе %(graph)r"
6095
6055
6096
#: bzrlib/errors.py:1867
6056
#: bzrlib/errors.py:1858
6097
6057
msgid "File %(filename)s is not conflicted."
6098
6058
msgstr "Файл %(filename)s не содержит конфликтов."
6099
6059
6100
#: bzrlib/errors.py:1889
6060
#: bzrlib/errors.py:1880
6101
6061
msgid "No bundle was found in \"%(filename)s\"."
6102
6062
msgstr "В файле «%(filename)s» нет пакета."
6103
6063
6104
#: bzrlib/errors.py:1898
6064
#: bzrlib/errors.py:1889
6105
6065
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6106
6066
msgstr "Не удалось обработать версию пакета %(version)s: %(msg)s"
6107
6067
6108
#: bzrlib/errors.py:1908
6068
#: bzrlib/errors.py:1899
6109
6069
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6110
6070
msgstr ""
6111
6071
"В ветви %(base)s отсутствует ревизия %(text_revision)s файла %(file_id)s"
6112
6072
6113
#: bzrlib/errors.py:1921
6073
#: bzrlib/errors.py:1912
6114
6074
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6115
6075
msgstr ""
6116
6076
"Идентификатор файла {%(file_id)s} уже присутствует в инвентаре как %(entry)s"
6117
6077
6118
#: bzrlib/errors.py:1931
6078
#: bzrlib/errors.py:1922
6119
6079
msgid "Key %(key)s is already present in map"
6120
6080
msgstr ""
6121
6081
6122
#: bzrlib/errors.py:1936
6082
#: bzrlib/errors.py:1927
6123
6083
msgid "The prefix %(prefix)s is in the help search path twice."
6124
6084
msgstr ""
6125
6085
6126
#: bzrlib/errors.py:1946
6086
#: bzrlib/errors.py:1937
6127
6087
msgid ""
6128
6088
"No final name for trans_id %(trans_id)r\n"
6129
6089
"file-id: %(file_id)r\n"
6130
6090
"root trans-id: %(root_trans_id)r\n"
6131
6091
msgstr ""
6132
6092
6133
#: bzrlib/errors.py:1978
6093
#: bzrlib/errors.py:1969
6134
6094
msgid "Attempt to reuse a transform that has already been applied."
6135
6095
msgstr ""
6136
6096
6137
#: bzrlib/errors.py:1983
6097
#: bzrlib/errors.py:1974
6138
6098
msgid "Moving the root directory is not supported at this time"
6139
6099
msgstr "Перемещение в корневую директорию пока не поддерживается"
6140
6100
6141
#: bzrlib/errors.py:1988
6101
#: bzrlib/errors.py:1979
6142
6102
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6143
6103
msgstr "Не удалось переименовать %(from_path)s в %(to_path)s: %(why)s"
6144
6104
6145
#: bzrlib/errors.py:1999
6105
#: bzrlib/errors.py:1990
6146
6106
msgid ""
6147
6107
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6148
6108
msgstr ""
6149
6109
"Не удалось переместить %(from_path)s%(operator)s "
6150
6110
"%(to_path)s%(_has_extra)s%(extra)s"
6151
6111
6152
#: bzrlib/errors.py:2035
6112
#: bzrlib/errors.py:2026
6153
6113
msgid ""
6154
6114
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6155
6115
msgstr ""
6156
6116
"Не удалось переименовать %(from_path)s%(operator)s "
6157
6117
"%(to_path)s%(_has_extra)s%(extra)s"
6158
6118
6159
#: bzrlib/errors.py:2065
6119
#: bzrlib/errors.py:2056
6160
6120
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6161
6121
msgstr ""
6162
6122
6163
#: bzrlib/errors.py:2073
6123
#: bzrlib/errors.py:2064
6164
6124
msgid "Nothing to merge."
6165
6125
msgstr "Нечего совмещать."
6166
6126
6127
#: bzrlib/errors.py:2069
6128
msgid "Format %(format)s cannot be initialised by this version of bzr."
6129
msgstr ""
6130
6167
6131
#: bzrlib/errors.py:2078
6168
msgid "Format %(format)s cannot be initialised by this version of bzr."
6169
msgstr ""
6170
6171
#: bzrlib/errors.py:2087
6172
6132
msgid ""
6173
6133
"Cannot convert from format %(from_format)s to format %(format)s. "
6174
6134
"%(problem)s"
6175
6135
msgstr ""
6176
6136
6177
#: bzrlib/errors.py:2099
6137
#: bzrlib/errors.py:2090
6178
6138
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6179
6139
msgstr ""
6180
6140
6181
#: bzrlib/errors.py:2107
6141
#: bzrlib/errors.py:2098
6182
6142
msgid "%(exe_name)s could not be found on this machine"
6183
6143
msgstr ""
6184
6144
6185
#: bzrlib/errors.py:2115
6145
#: bzrlib/errors.py:2106
6186
6146
msgid "Diff is not installed on this machine: %(msg)s"
6187
6147
msgstr ""
6188
6148
6189
#: bzrlib/errors.py:2123
6149
#: bzrlib/errors.py:2114
6190
6150
msgid "Diff3 is not installed on this machine."
6191
6151
msgstr "Diff3 не установлен на этой машине."
6192
6152
6193
#: bzrlib/errors.py:2129
6153
#: bzrlib/errors.py:2120
6194
6154
msgid "The content being inserted is already present."
6195
6155
msgstr ""
6196
6156
6197
#: bzrlib/errors.py:2134
6157
#: bzrlib/errors.py:2125
6198
6158
msgid ""
6199
6159
"This tree contains left-over files from a failed operation.\n"
6200
6160
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6202
6162
" keep, and delete it when you are done."
6203
6163
msgstr ""
6204
6164
6205
#: bzrlib/errors.py:2145
6165
#: bzrlib/errors.py:2136
6206
6166
msgid ""
6207
6167
"This tree contains left-over files from a failed operation.\n"
6208
6168
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6209
6169
" wish to keep, and delete it when you are done."
6210
6170
msgstr ""
6211
6171
6212
#: bzrlib/errors.py:2155
6172
#: bzrlib/errors.py:2146
6213
6173
msgid ""
6214
6174
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6215
6175
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6217
6177
" keep, and delete it when you are done."
6218
6178
msgstr ""
6219
6179
6220
#: bzrlib/errors.py:2166
6180
#: bzrlib/errors.py:2157
6221
6181
msgid ""
6222
6182
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6223
6183
"examine %(pending_deletion)s to see if it contains any files you wish to "
6224
6184
"keep, and delete it when you are done."
6225
6185
msgstr ""
6226
6186
6227
#: bzrlib/errors.py:2176
6187
#: bzrlib/errors.py:2167
6228
6188
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6229
6189
msgstr ""
6230
6190
6231
#: bzrlib/errors.py:2190
6191
#: bzrlib/errors.py:2181
6232
6192
msgid ""
6233
6193
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6234
6194
msgstr ""
6235
6195
6236
#: bzrlib/errors.py:2203
6196
#: bzrlib/errors.py:2194
6237
6197
msgid "Error in merge modified format"
6238
6198
msgstr ""
6239
6199
6240
#: bzrlib/errors.py:2208
6200
#: bzrlib/errors.py:2199
6241
6201
msgid "Format error in conflict listings"
6242
6202
msgstr ""
6243
6203
6244
#: bzrlib/errors.py:2212
6204
#: bzrlib/errors.py:2203
6245
6205
msgid ""
6246
6206
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6247
6207
"Error: %(description)s"
6248
6208
msgstr ""
6249
6209
6250
#: bzrlib/errors.py:2223
6210
#: bzrlib/errors.py:2214
6251
6211
msgid ""
6252
6212
"An error has been detected in the repository %(repo_path)s.\n"
6253
6213
"Please run bzr reconcile on this repository."
6254
6214
msgstr ""
6255
6215
6256
#: bzrlib/errors.py:2234
6216
#: bzrlib/errors.py:2225
6257
6217
msgid ""
6258
6218
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6259
6219
"reason: %(reason)s"
6260
6220
msgstr ""
6261
6221
6262
#: bzrlib/errors.py:2247
6222
#: bzrlib/errors.py:2238
6263
6223
msgid ""
6264
6224
"An inconsistent delta was supplied: %(delta)r\n"
6265
6225
"reason: %(reason)s"
6266
6226
msgstr ""
6267
6227
6228
#: bzrlib/errors.py:2250
6229
msgid "To use this feature you must upgrade your branch at %(path)s."
6230
msgstr ""
6231
6268
6232
#: bzrlib/errors.py:2259
6269
msgid "To use this feature you must upgrade your branch at %(path)s."
6270
msgstr ""
6271
6272
#: bzrlib/errors.py:2268
6273
6233
msgid "To use this feature you must upgrade your repository at %(path)s."
6274
6234
msgstr ""
6275
6235
6276
#: bzrlib/errors.py:2273
6236
#: bzrlib/errors.py:2264
6277
6237
msgid ""
6278
6238
"To use this feature you must upgrade your branch at %(path)s to a format "
6279
6239
"which supports rich roots."
6280
6240
msgstr ""
6281
6241
6282
#: bzrlib/errors.py:2279
6242
#: bzrlib/errors.py:2270
6283
6243
msgid "Cannot perform local-only commits on unbound branches."
6284
6244
msgstr ""
6285
6245
6286
#: bzrlib/errors.py:2284
6246
#: bzrlib/errors.py:2275
6287
6247
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6288
6248
msgstr ""
6289
6249
6290
#: bzrlib/errors.py:2305
6250
#: bzrlib/errors.py:2296
6291
6251
msgid "Ghost tags not supported by format %(format)r."
6292
6252
msgstr ""
6293
6253
6294
#: bzrlib/errors.py:2313
6254
#: bzrlib/errors.py:2304
6295
6255
msgid "File is binary but should be text."
6296
6256
msgstr ""
6297
6257
6258
#: bzrlib/errors.py:2309
6259
msgid "The path %(path)s is not permitted on this platform"
6260
msgstr ""
6261
6298
6262
#: bzrlib/errors.py:2318
6299
msgid "The path %(path)s is not permitted on this platform"
6300
msgstr ""
6301
6302
#: bzrlib/errors.py:2327
6303
6263
msgid ""
6304
6264
"Testament did not match expected value.\n"
6305
6265
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6306
6266
" {%(measured)s}"
6307
6267
msgstr ""
6308
6268
6269
#: bzrlib/errors.py:2330
6270
msgid "Not a bzr revision-bundle: %(text)r"
6271
msgstr ""
6272
6309
6273
#: bzrlib/errors.py:2339
6310
msgid "Not a bzr revision-bundle: %(text)r"
6274
msgid "Bad bzr revision-bundle: %(text)r"
6311
6275
msgstr ""
6312
6276
6313
6277
#: bzrlib/errors.py:2348
6314
msgid "Bad bzr revision-bundle: %(text)r"
6315
msgstr ""
6316
6317
#: bzrlib/errors.py:2357
6318
6278
msgid "Malformed bzr revision-bundle header: %(text)r"
6319
6279
msgstr ""
6320
6280
6321
#: bzrlib/errors.py:2362
6281
#: bzrlib/errors.py:2353
6322
6282
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6323
6283
msgstr ""
6324
6284
6325
#: bzrlib/errors.py:2367
6285
#: bzrlib/errors.py:2358
6326
6286
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6327
6287
msgstr ""
6328
6288
6329
#: bzrlib/errors.py:2372
6289
#: bzrlib/errors.py:2363
6330
6290
msgid "End of line marker was not \\n in bzr revision-bundle"
6331
6291
msgstr ""
6332
6292
6333
#: bzrlib/errors.py:2382
6293
#: bzrlib/errors.py:2373
6334
6294
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6335
6295
msgstr ""
6336
6296
6337
#: bzrlib/errors.py:2392
6297
#: bzrlib/errors.py:2383
6338
6298
msgid "Root class for inventory serialization errors"
6339
6299
msgstr ""
6340
6300
6341
#: bzrlib/errors.py:2396
6301
#: bzrlib/errors.py:2387
6342
6302
msgid ""
6343
6303
"The inventory was not in the expected format:\n"
6344
6304
" %(msg)s"
6345
6305
msgstr ""
6346
6306
6347
#: bzrlib/errors.py:2405
6307
#: bzrlib/errors.py:2396
6348
6308
msgid "This operation requires rich root data storage"
6349
6309
msgstr ""
6350
6310
6311
#: bzrlib/errors.py:2409
6312
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6313
msgstr ""
6314
6351
6315
#: bzrlib/errors.py:2418
6352
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6353
msgstr ""
6354
6355
#: bzrlib/errors.py:2427
6356
6316
msgid ""
6357
6317
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6358
6318
"variable."
6359
6319
msgstr ""
6360
6320
6361
#: bzrlib/errors.py:2434
6321
#: bzrlib/errors.py:2425
6362
6322
msgid ""
6363
6323
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6364
6324
"ghost at {%(ghost_revision_id)s}"
6365
6325
msgstr ""
6366
6326
6367
#: bzrlib/errors.py:2444
6327
#: bzrlib/errors.py:2435
6368
6328
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6369
6329
msgstr ""
6370
6330
6371
#: bzrlib/errors.py:2495
6331
#: bzrlib/errors.py:2486
6372
6332
msgid ""
6373
6333
"A merge directive must provide either a bundle or a public branch location."
6374
6334
msgstr ""
6375
6335
6376
#: bzrlib/errors.py:2502
6336
#: bzrlib/errors.py:2493
6377
6337
msgid "Bad merge directive payload %(start)r"
6378
6338
msgstr ""
6379
6339
6380
#: bzrlib/errors.py:2512
6340
#: bzrlib/errors.py:2503
6381
6341
msgid "Preview patch does not match requested changes."
6382
6342
msgstr ""
6383
6343
6384
#: bzrlib/errors.py:2518
6344
#: bzrlib/errors.py:2509
6385
6345
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6386
6346
msgstr ""
6387
6347
6388
#: bzrlib/errors.py:2528
6348
#: bzrlib/errors.py:2519
6389
6349
msgid ""
6390
6350
"Your branch does not have all of the revisions required in order to merge "
6391
6351
"this merge directive and the target location specified in the merge "
6392
6352
"directive is not a branch: %(location)s."
6393
6353
msgstr ""
6394
6354
6395
#: bzrlib/errors.py:2540
6355
#: bzrlib/errors.py:2531
6396
6356
msgid "Unsupported entry kind %(kind)s"
6397
6357
msgstr ""
6398
6358
6399
#: bzrlib/errors.py:2548
6359
#: bzrlib/errors.py:2539
6400
6360
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6401
6361
msgstr ""
6402
6362
6403
#: bzrlib/errors.py:2558
6363
#: bzrlib/errors.py:2549
6404
6364
msgid "Subsume target %(other_tree)s needs to be upgraded."
6405
6365
msgstr ""
6406
6366
6407
#: bzrlib/errors.py:2577
6367
#: bzrlib/errors.py:2568
6408
6368
msgid "No such tag: %(tag_name)s"
6409
6369
msgstr ""
6410
6370
6371
#: bzrlib/errors.py:2576
6372
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6373
msgstr ""
6374
6411
6375
#: bzrlib/errors.py:2585
6412
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6413
msgstr ""
6414
6415
#: bzrlib/errors.py:2594
6416
6376
msgid "Tag %(tag_name)s already exists."
6417
6377
msgstr ""
6418
6378
6419
#: bzrlib/errors.py:2602
6379
#: bzrlib/errors.py:2593
6420
6380
msgid ""
6421
6381
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6422
6382
"bugs\" for more information on this feature."
6423
6383
msgstr ""
6424
6384
6425
#: bzrlib/errors.py:2612
6385
#: bzrlib/errors.py:2603
6426
6386
msgid ""
6427
6387
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6428
6388
msgstr ""
6429
6389
6430
#: bzrlib/errors.py:2622
6390
#: bzrlib/errors.py:2613
6431
6391
msgid ""
6432
6392
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6433
6393
msgstr ""
6434
6394
6435
#: bzrlib/errors.py:2632
6395
#: bzrlib/errors.py:2623
6436
6396
msgid "Invalid line in bugs property: '%(line)s'"
6437
6397
msgstr ""
6438
6398
6439
#: bzrlib/errors.py:2640
6399
#: bzrlib/errors.py:2631
6440
6400
msgid "Invalid bug status: '%(status)s'"
6441
6401
msgstr ""
6442
6402
6443
#: bzrlib/errors.py:2648
6403
#: bzrlib/errors.py:2639
6444
6404
msgid "Could not understand response from smart server: %(response_tuple)r"
6445
6405
msgstr ""
6446
6406
6447
#: bzrlib/errors.py:2687
6407
#: bzrlib/errors.py:2678
6448
6408
msgid "Server sent an unexpected error: %(error_tuple)r"
6449
6409
msgstr ""
6450
6410
6451
#: bzrlib/errors.py:2706
6411
#: bzrlib/errors.py:2697
6452
6412
msgid "Unrecognised container format: %(container_format)r"
6453
6413
msgstr ""
6454
6414
6455
#: bzrlib/errors.py:2714
6415
#: bzrlib/errors.py:2705
6456
6416
msgid "Unexpected end of container stream"
6457
6417
msgstr ""
6458
6418
6459
#: bzrlib/errors.py:2719
6419
#: bzrlib/errors.py:2710
6460
6420
msgid "Unknown record type: %(record_type)r"
6461
6421
msgstr ""
6462
6422
6463
#: bzrlib/errors.py:2727
6423
#: bzrlib/errors.py:2718
6464
6424
msgid "Invalid record: %(reason)s"
6465
6425
msgstr ""
6466
6426
6467
#: bzrlib/errors.py:2735
6427
#: bzrlib/errors.py:2726
6468
6428
msgid "Container has data after end marker: %(excess)r"
6469
6429
msgstr ""
6470
6430
6471
#: bzrlib/errors.py:2743
6431
#: bzrlib/errors.py:2734
6472
6432
msgid "Container has multiple records with the same name: %(name)s"
6473
6433
msgstr ""
6474
6434
6475
#: bzrlib/errors.py:2756
6435
#: bzrlib/errors.py:2747
6476
6436
msgid "Corrupt or incompatible data stream: %(reason)s"
6477
6437
msgstr ""
6478
6438
6479
#: bzrlib/errors.py:2764
6439
#: bzrlib/errors.py:2755
6480
6440
msgid "SMTP error: %(error)s"
6481
6441
msgstr ""
6482
6442
6483
#: bzrlib/errors.py:2772
6443
#: bzrlib/errors.py:2763
6484
6444
msgid "No message supplied."
6485
6445
msgstr ""
6486
6446
6487
#: bzrlib/errors.py:2777
6447
#: bzrlib/errors.py:2768
6488
6448
msgid "No mail-to address (--mail-to) or output (-o) specified."
6489
6449
msgstr ""
6490
6450
6491
#: bzrlib/errors.py:2782
6451
#: bzrlib/errors.py:2773
6452
msgid "Unknown mail client: %(mail_client)s"
6453
msgstr ""
6454
6455
#: bzrlib/errors.py:2781
6492
6456
msgid ""
6493
6457
"Unable to find mail client with the following names: "
6494
6458
"%(mail_command_list_string)s"
6495
6459
msgstr ""
6496
6460
6497
#: bzrlib/errors.py:2792
6461
#: bzrlib/errors.py:2791
6498
6462
msgid "SMTP connection to %(host)s refused"
6499
6463
msgstr ""
6500
6464
6501
#: bzrlib/errors.py:2801
6465
#: bzrlib/errors.py:2800
6502
6466
msgid "Please specify smtp_server. No server at default %(host)s."
6503
6467
msgstr ""
6504
6468
6505
#: bzrlib/errors.py:2815
6469
#: bzrlib/errors.py:2814
6506
6470
msgid ""
6507
6471
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6508
6472
"reconfigure."
6509
6473
msgstr ""
6510
6474
6511
#: bzrlib/errors.py:2827
6475
#: bzrlib/errors.py:2826
6512
6476
msgid "'%(display_url)s' is already a branch."
6513
6477
msgstr ""
6514
6478
6515
#: bzrlib/errors.py:2832
6479
#: bzrlib/errors.py:2831
6516
6480
msgid "'%(display_url)s' is already a tree."
6517
6481
msgstr ""
6518
6482
6519
#: bzrlib/errors.py:2837
6483
#: bzrlib/errors.py:2836
6520
6484
msgid "'%(display_url)s' is already a checkout."
6521
6485
msgstr ""
6522
6486
6523
#: bzrlib/errors.py:2842
6487
#: bzrlib/errors.py:2841
6524
6488
msgid "'%(display_url)s' is already a lightweight checkout."
6525
6489
msgstr ""
6526
6490
6527
#: bzrlib/errors.py:2847
6491
#: bzrlib/errors.py:2846
6528
6492
msgid "'%(display_url)s' is already using a shared repository."
6529
6493
msgstr ""
6530
6494
6531
#: bzrlib/errors.py:2852
6495
#: bzrlib/errors.py:2851
6532
6496
msgid "'%(display_url)s' is already standalone."
6533
6497
msgstr ""
6534
6498
6535
#: bzrlib/errors.py:2857
6499
#: bzrlib/errors.py:2856
6536
6500
msgid "Shared repository '%(display_url)s' already creates working trees."
6537
6501
msgstr ""
6538
6502
6539
#: bzrlib/errors.py:2863
6503
#: bzrlib/errors.py:2862
6540
6504
msgid ""
6541
6505
"Shared repository '%(display_url)s' already doesn't create working trees."
6542
6506
msgstr ""
6543
6507
6544
#: bzrlib/errors.py:2869
6508
#: bzrlib/errors.py:2868
6545
6509
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6546
6510
msgstr ""
6547
6511
6548
#: bzrlib/errors.py:2874
6512
#: bzrlib/errors.py:2873
6549
6513
msgid "No location could be found to bind to at %(display_url)s."
6550
6514
msgstr ""
6551
6515
6552
#: bzrlib/errors.py:2879
6516
#: bzrlib/errors.py:2878
6553
6517
msgid ""
6554
6518
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6555
6519
"status).%(more)s"
6556
6520
msgstr ""
6557
6521
6558
#: bzrlib/errors.py:2898
6522
#: bzrlib/errors.py:2897
6559
6523
msgid ""
6560
6524
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6561
6525
"list).%(more)s"
6562
6526
msgstr ""
6563
6527
6564
#: bzrlib/errors.py:2904
6528
#: bzrlib/errors.py:2903
6565
6529
msgid "Variable {%(name)s} is not available."
6566
6530
msgstr ""
6567
6531
6568
#: bzrlib/errors.py:2912
6532
#: bzrlib/errors.py:2911
6569
6533
msgid "No template specified."
6570
6534
msgstr ""
6571
6535
6572
#: bzrlib/errors.py:2917
6536
#: bzrlib/errors.py:2916
6573
6537
msgid "Unable to create symlink %(path_str)son this platform"
6574
6538
msgstr ""
6575
6539
6576
#: bzrlib/errors.py:2932
6540
#: bzrlib/errors.py:2931
6577
6541
msgid ""
6578
6542
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6579
6543
"\"original\", \"local\"."
6580
6544
msgstr ""
6581
6545
6582
#: bzrlib/errors.py:2966
6546
#: bzrlib/errors.py:2965
6583
6547
msgid ""
6584
6548
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6585
6549
msgstr ""
6586
6550
6587
#: bzrlib/errors.py:2978
6551
#: bzrlib/errors.py:2977
6588
6552
msgid "The \"%(config_id)s\" configuration does not exist."
6589
6553
msgstr ""
6590
6554
6591
#: bzrlib/errors.py:2986
6555
#: bzrlib/errors.py:2985
6592
6556
msgid "The \"%(option_name)s\" configuration option does not exist."
6593
6557
msgstr ""
6594
6558
6595
#: bzrlib/errors.py:2994
6559
#: bzrlib/errors.py:2993
6596
6560
msgid "The alias \"%(alias_name)s\" does not exist."
6597
6561
msgstr ""
6598
6562
6599
#: bzrlib/errors.py:3008
6563
#: bzrlib/errors.py:3007
6600
6564
msgid "\"%(alias_name)s\" is not a valid location alias."
6601
6565
msgstr ""
6602
6566
6603
#: bzrlib/errors.py:3016
6567
#: bzrlib/errors.py:3015
6604
6568
msgid "No %(alias_name)s location assigned."
6605
6569
msgstr ""
6606
6570
6607
#: bzrlib/errors.py:3024
6571
#: bzrlib/errors.py:3023
6608
6572
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6609
6573
msgstr ""
6610
6574
6611
#: bzrlib/errors.py:3034
6575
#: bzrlib/errors.py:3033
6612
6576
msgid "Unknown rules detected: %(unknowns_str)s."
6613
6577
msgstr ""
6614
6578
6615
#: bzrlib/errors.py:3045
6579
#: bzrlib/errors.py:3044
6616
6580
msgid "Tip change rejected: %(msg)s"
6617
6581
msgstr ""
6618
6582
6619
#: bzrlib/errors.py:3053
6583
#: bzrlib/errors.py:3052
6620
6584
msgid "Shelf corrupt."
6621
6585
msgstr ""
6622
6586
6623
#: bzrlib/errors.py:3058
6587
#: bzrlib/errors.py:3057
6624
6588
msgid "Corruption while decompressing repository file%(orig_error)s"
6625
6589
msgstr ""
6626
6590
6627
#: bzrlib/errors.py:3070
6591
#: bzrlib/errors.py:3069
6628
6592
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6629
6593
msgstr ""
6630
6594
6631
#: bzrlib/errors.py:3078
6595
#: bzrlib/errors.py:3077
6632
6596
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6633
6597
msgstr ""
6634
6598
6635
#: bzrlib/errors.py:3086
6599
#: bzrlib/errors.py:3085
6636
6600
msgid ""
6637
6601
"An attempt to access a url outside the server jail was made: '%(url)s'."
6638
6602
msgstr ""
6639
6603
6640
#: bzrlib/errors.py:3094
6604
#: bzrlib/errors.py:3093
6641
6605
msgid "The user aborted the operation."
6642
6606
msgstr ""
6643
6607
6644
#: bzrlib/errors.py:3099
6608
#: bzrlib/errors.py:3098
6645
6609
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6646
6610
msgstr ""
6647
6611
6648
#: bzrlib/errors.py:3109
6612
#: bzrlib/errors.py:3108
6649
6613
msgid "No such view: %(view_name)s."
6650
6614
msgstr ""
6651
6615
6652
#: bzrlib/errors.py:3119
6616
#: bzrlib/errors.py:3118
6653
6617
msgid ""
6654
6618
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6655
6619
"to a later format."
6656
6620
msgstr ""
6657
6621
6658
#: bzrlib/errors.py:3128
6622
#: bzrlib/errors.py:3127
6659
6623
msgid ""
6660
6624
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6661
6625
msgstr ""
6662
6626
6663
#: bzrlib/errors.py:3195
6627
#: bzrlib/errors.py:3194
6664
6628
msgid "%(bzrdir)r does not support co-located branches."
6665
6629
msgstr ""
6666
6630
6667
#: bzrlib/errors.py:3201
6631
#: bzrlib/errors.py:3200
6668
6632
msgid ""
6669
6633
"Unable to determine your name.\n"
6670
6634
"Please, set your name with the 'whoami' command.\n"
6671
6635
"E.g. bzr whoami \"Your Name <name@example.com>\""
6672
6636
msgstr ""
6673
6637
6674
#: bzrlib/errors.py:3210
6638
#: bzrlib/errors.py:3209
6675
6639
msgid "Invalid pattern(s) found. %(msg)s"
6676
6640
msgstr ""
6677
6641
6678
#: bzrlib/errors.py:3218
6642
#: bzrlib/errors.py:3217
6679
6643
msgid ""
6680
6644
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6681
6645
"unbind` to fix."
6682
6646
msgstr ""
6683
6647
6684
#: bzrlib/errors.py:3229
6648
#: bzrlib/errors.py:3228
6685
6649
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6686
6650
msgstr ""
6687
6651
6688
#: bzrlib/errors.py:3238
6652
#: bzrlib/errors.py:3237
6689
6653
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6690
6654
msgstr ""
6691
6655
6692
#: bzrlib/errors.py:3247
6656
#: bzrlib/errors.py:3246
6693
6657
msgid ""
6694
6658
"No compatible object available for operations from %(source)r to %(target)r."
6695
6659
msgstr ""
6696
6660
6697
#: bzrlib/errors.py:3257
6661
#: bzrlib/errors.py:3256
6698
6662
msgid ""
6699
6663
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6700
6664
"%(arguments)s."
6701
6665
msgstr ""
6702
6666
6703
#: bzrlib/errors.py:3267
6667
#: bzrlib/errors.py:3266
6704
6668
msgid ""
6705
6669
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6706
6670
"format %(format)r"
6707
6671
msgstr ""
6708
6672
6709
#: bzrlib/errors.py:3279
6673
#: bzrlib/errors.py:3278
6710
6674
msgid ""
6711
6675
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6712
6676
"plugin."
6713
6677
msgstr ""
6714
6678
6715
#: bzrlib/errors.py:3292
6679
#: bzrlib/errors.py:3291
6716
6680
msgid "Binary files section encountered."
6717
6681
msgstr ""
6718
6682
6719
#: bzrlib/errors.py:3300
6683
#: bzrlib/errors.py:3299
6720
6684
msgid ""
6721
6685
"Malformed patch header. %(desc)s\n"
6722
6686
"%(line)r"
6723
6687
msgstr ""
6724
6688
6725
#: bzrlib/errors.py:3309
6689
#: bzrlib/errors.py:3308
6726
6690
msgid ""
6727
6691
"Malformed hunk header. %(desc)s\n"
6728
6692
"%(line)r"
6729
6693
msgstr ""
6730
6694
6731
#: bzrlib/errors.py:3318
6695
#: bzrlib/errors.py:3317
6732
6696
msgid ""
6733
6697
"Malformed line. %(desc)s\n"
6734
6698
"%(line)r"
6735
6699
msgstr ""
6736
6700
6737
#: bzrlib/errors.py:3328
6701
#: bzrlib/errors.py:3327
6738
6702
msgid ""
6739
6703
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6740
6704
"but patch says it should be \"%(patch_line)s\""
6741
6705
msgstr ""
6742
6706
6743
#: bzrlib/errors.py:3339
6707
#: bzrlib/errors.py:3338
6744
6708
msgid "The feature %(feature)s has already been registered."
6745
6709
msgstr ""
6746
6710
6792
6756
"regular push."
6793
6757
msgstr ""
6794
6758
6795
#: bzrlib/gpg.py:366
6796
msgid "No GnuPG key results for pattern: {0}"
6797
msgstr ""
6798
6799
#: bzrlib/gpg.py:439
6759
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6800
6760
msgid "{0} commits with valid signatures"
6801
6761
msgstr ""
6802
6762
6803
#: bzrlib/gpg.py:445
6763
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6804
6764
msgid "{0} commit with unknown key"
6805
6765
msgid_plural "{0} commits with unknown keys"
6806
6766
msgstr[0] "{0} закрепление с неизвестным ключом"
6807
6767
msgstr[1] "{0} закрепления с неизвестным ключом"
6808
6768
msgstr[2] "{0} закреплений с неизвестным ключом"
6809
6769
6810
#: bzrlib/gpg.py:453
6770
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6811
6771
msgid "{0} commit not valid"
6812
6772
msgid_plural "{0} commits not valid"
6813
6773
msgstr[0] ""
6814
6774
msgstr[1] ""
6815
6775
6816
#: bzrlib/gpg.py:461
6776
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6817
6777
msgid "{0} commit not signed"
6818
6778
msgid_plural "{0} commits not signed"
6819
6779
msgstr[0] ""
6820
6780
msgstr[1] ""
6821
6781
6822
#: bzrlib/gpg.py:469
6782
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6823
6783
msgid "{0} commit with key now expired"
6824
6784
msgid_plural "{0} commits with key now expired"
6825
6785
msgstr[0] ""
6826
6786
msgstr[1] ""
6827
6787
6828
#: bzrlib/gpg.py:489
6829
msgid "{0} commit by author {1} with key {2} now expired"
6830
msgid_plural "{0} commits by author {1} with key {2} now expired"
6831
msgstr[0] ""
6832
msgstr[1] ""
6788
#: bzrlib/gpg.py:343
6789
msgid "No GnuPG key results for pattern: {0}"
6790
msgstr ""
6833
6791
6834
#: bzrlib/gpg.py:505
6792
#: bzrlib/gpg.py:386
6835
6793
msgid "{0} signed {1} commit"
6836
6794
msgid_plural "{0} signed {1} commits"
6837
6795
msgstr[0] ""
6838
6796
msgstr[1] ""
6839
6797
6840
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6798
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6841
6799
msgid "{0} commit by author {1}"
6842
6800
msgid_plural "{0} commits by author {1}"
6843
6801
msgstr[0] ""
6844
6802
msgstr[1] ""
6845
6803
6846
#: bzrlib/gpg.py:554
6804
#: bzrlib/gpg.py:433
6847
6805
msgid "Unknown key {0} signed {1} commit"
6848
6806
msgid_plural "Unknown key {0} signed {1} commits"
6849
6807
msgstr[0] "Неизвестным ключом {0} подписано {1} закрепление"
6850
6808
msgstr[1] "Неизвестным ключом {0} подписаны {1} закрепления"
6851
6809
msgstr[2] "Неизвестным ключом {0} подписаны {1} закреплений"
6852
6810
6811
#: bzrlib/gpg.py:452
6812
msgid "{0} commit by author {1} with key {2} now expired"
6813
msgid_plural "{0} commits by author {1} with key {2} now expired"
6814
msgstr[0] ""
6815
msgstr[1] ""
6816
6853
6817
#: bzrlib/groupcompress.py:1739
6854
6818
#, python-format
6855
6819
msgid "Insert claimed random_id=True, but then inserted %r two times"
6856
6820
msgstr ""
6857
6821
6858
#: bzrlib/hooks.py:313
6822
#: bzrlib/hooks.py:331
6859
6823
#, python-format
6860
6824
msgid "Introduced in: %s"
6861
6825
msgstr ""
6862
6826
6863
#: bzrlib/hooks.py:316
6827
#: bzrlib/hooks.py:334
6864
6828
#, python-format
6865
6829
msgid "Deprecated in: %s"
6866
6830
msgstr ""
6909
6873
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6910
6874
msgstr ""
6911
6875
6912
#: bzrlib/log.py:563
6876
#: bzrlib/log.py:572
6913
6877
msgid "--exclude-common-ancestry requires two different revisions"
6914
6878
msgstr ""
6915
6879
6916
#: bzrlib/log.py:565
6880
#: bzrlib/log.py:574
6917
6881
#, python-format
6918
6882
msgid "invalid direction %r"
6919
6883
msgstr ""
6920
6884
6921
#: bzrlib/log.py:653
6885
#: bzrlib/log.py:662
6922
6886
msgid "Start revision not found in history of end revision."
6923
6887
msgstr ""
6924
6888
6925
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6889
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6926
6890
msgid "Logging revision 0 is invalid."
6927
6891
msgstr ""
6928
6892
6929
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6893
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6930
6894
msgid "Start revision must be older than the end revision."
6931
6895
msgstr ""
6932
6896
6933
#: bzrlib/log.py:1818
6897
#: bzrlib/log.py:1827
6934
6898
#, python-format
6935
6899
msgid "unknown log formatter: %r"
6936
6900
msgstr ""
6937
6901
6938
#: bzrlib/log.py:2114
6902
#: bzrlib/log.py:2123
6939
6903
msgid "fixes bug"
6940
6904
msgid_plural "fixes bugs"
6941
6905
msgstr[0] ""
6950
6914
msgid "%d conflicts encountered."
6951
6915
msgstr ""
6952
6916
6953
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6917
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6954
6918
msgid "Preparing file merge"
6955
6919
msgstr ""
6956
6920
7072
7036
msgid "lstat/stat of ({0!r}): {1!r}"
7073
7037
msgstr ""
7074
7038
7075
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
7039
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
7076
7040
#, python-format
7077
7041
msgid "sorry, %r not allowed in path"
7078
7042
msgstr ""
7079
7043
7080
#: bzrlib/osutils.py:1259
7044
#: bzrlib/osutils.py:1237
7081
7045
#, python-format
7082
7046
msgid "%r is too short to calculate a relative path"
7083
7047
msgstr ""
7116
7080
msgid "Generate only the shell function, don't enable it"
7117
7081
msgstr ""
7118
7082
7119
#: bzrlib/plugins/launchpad/account.py:66
7120
msgid "Setting ssh/sftp usernames for launchpad.net."
7121
msgstr ""
7122
7123
#: bzrlib/plugins/launchpad/cmds.py:44
7083
#: bzrlib/plugins/launchpad/__init__.py:81
7124
7084
msgid "Register a branch with launchpad.net."
7125
7085
msgstr ""
7126
7086
7127
#: bzrlib/plugins/launchpad/cmds.py:46
7087
#: bzrlib/plugins/launchpad/__init__.py:83
7128
7088
msgid ""
7129
7089
"This command lists a bzr branch in the directory of branches on\n"
7130
7090
"launchpad.net. Registration allows the branch to be associated with\n"
7131
7091
"bugs or specifications."
7132
7092
msgstr ""
7133
7093
7134
#: bzrlib/plugins/launchpad/cmds.py:50
7094
#: bzrlib/plugins/launchpad/__init__.py:87
7135
7095
msgid ""
7136
7096
"Before using this command you must register the project to which the\n"
7137
7097
"branch belongs, and create an account for yourself on launchpad.net."
7138
7098
msgstr ""
7139
7099
7140
#: bzrlib/plugins/launchpad/cmds.py:53
7100
#: bzrlib/plugins/launchpad/__init__.py:90
7141
7101
msgid ""
7142
7102
"arguments:\n"
7143
7103
" public_url: The publicly visible url for the branch to register.\n"
7149
7109
" otherwise error."
7150
7110
msgstr ""
7151
7111
7152
#: bzrlib/plugins/launchpad/cmds.py:62
7112
#: bzrlib/plugins/launchpad/__init__.py:99
7153
7113
msgid ""
7154
7114
"example:\n"
7155
7115
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7156
7116
" --project fooproject"
7157
7117
msgstr ""
7158
7118
7159
#: bzrlib/plugins/launchpad/cmds.py:69
7119
#: bzrlib/plugins/launchpad/__init__.py:106
7160
7120
msgid "Launchpad project short name to associate with the branch."
7161
7121
msgstr ""
7162
7122
7163
#: bzrlib/plugins/launchpad/cmds.py:76
7123
#: bzrlib/plugins/launchpad/__init__.py:113
7164
7124
msgid ""
7165
7125
"Short name for the branch; by default taken from the last component of the "
7166
7126
"url."
7167
7127
msgstr ""
7168
7128
7169
#: bzrlib/plugins/launchpad/cmds.py:80
7129
#: bzrlib/plugins/launchpad/__init__.py:117
7170
7130
msgid "One-sentence description of the branch."
7171
7131
msgstr ""
7172
7132
7173
#: bzrlib/plugins/launchpad/cmds.py:83
7133
#: bzrlib/plugins/launchpad/__init__.py:120
7174
7134
msgid "Longer description of the purpose or contents of the branch."
7175
7135
msgstr ""
7176
7136
7177
#: bzrlib/plugins/launchpad/cmds.py:86
7137
#: bzrlib/plugins/launchpad/__init__.py:123
7178
7138
msgid "Branch author's email address, if not yourself."
7179
7139
msgstr ""
7180
7140
7181
#: bzrlib/plugins/launchpad/cmds.py:89
7141
#: bzrlib/plugins/launchpad/__init__.py:126
7182
7142
msgid "The bug this branch fixes."
7183
7143
msgstr ""
7184
7144
7185
#: bzrlib/plugins/launchpad/cmds.py:92
7145
#: bzrlib/plugins/launchpad/__init__.py:129
7186
7146
msgid "Prepare the request but don't actually send it."
7187
7147
msgstr ""
7188
7148
7189
#: bzrlib/plugins/launchpad/cmds.py:114
7149
#: bzrlib/plugins/launchpad/__init__.py:151
7190
7150
msgid ""
7191
7151
"register-branch requires a public branch url - see bzr help register-branch."
7192
7152
msgstr ""
7193
7153
7194
#: bzrlib/plugins/launchpad/cmds.py:122
7154
#: bzrlib/plugins/launchpad/__init__.py:159
7195
7155
msgid "--product is deprecated; please use --project."
7196
7156
msgstr ""
7197
7157
7198
#: bzrlib/plugins/launchpad/cmds.py:152
7158
#: bzrlib/plugins/launchpad/__init__.py:191
7199
7159
msgid "Open a Launchpad branch page in your web browser."
7200
7160
msgstr ""
7201
7161
7202
#: bzrlib/plugins/launchpad/cmds.py:157
7162
#: bzrlib/plugins/launchpad/__init__.py:196
7203
7163
msgid "Do not actually open the browser. Just say the URL we would use."
7204
7164
msgstr ""
7205
7165
7206
#: bzrlib/plugins/launchpad/cmds.py:192
7166
#: bzrlib/plugins/launchpad/__init__.py:231
7207
7167
#, python-format
7208
7168
msgid "Opening %s in web browser"
7209
7169
msgstr ""
7210
7170
7211
#: bzrlib/plugins/launchpad/cmds.py:200
7171
#: bzrlib/plugins/launchpad/__init__.py:241
7212
7172
msgid "Show or set the Launchpad user ID."
7213
7173
msgstr ""
7214
7174
7215
#: bzrlib/plugins/launchpad/cmds.py:202
7175
#: bzrlib/plugins/launchpad/__init__.py:243
7216
7176
msgid ""
7217
7177
"When communicating with Launchpad, some commands need to know your\n"
7218
7178
"Launchpad user ID. This command can be used to set or show the\n"
7219
7179
"user ID that Bazaar will use for such communication."
7220
7180
msgstr ""
7221
7181
7222
#: bzrlib/plugins/launchpad/cmds.py:206
7182
#: bzrlib/plugins/launchpad/__init__.py:247
7223
7183
msgid ""
7224
7184
":Examples:\n"
7225
7185
" Show the Launchpad ID of the current user::"
7226
7186
msgstr ""
7227
7187
7228
#: bzrlib/plugins/launchpad/cmds.py:209
7188
#: bzrlib/plugins/launchpad/__init__.py:250
7229
7189
msgid " bzr launchpad-login"
7230
7190
msgstr ""
7231
7191
7232
#: bzrlib/plugins/launchpad/cmds.py:211
7192
#: bzrlib/plugins/launchpad/__init__.py:252
7233
7193
msgid " Set the Launchpad ID of the current user to 'bob'::"
7234
7194
msgstr ""
7235
7195
7236
#: bzrlib/plugins/launchpad/cmds.py:213
7196
#: bzrlib/plugins/launchpad/__init__.py:254
7237
7197
msgid " bzr launchpad-login bob"
7238
7198
msgstr ""
7239
7199
7240
#: bzrlib/plugins/launchpad/cmds.py:220
7200
#: bzrlib/plugins/launchpad/__init__.py:261
7241
7201
msgid "Don't check that the user name is valid."
7242
7202
msgstr ""
7243
7203
7244
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
7204
#: bzrlib/plugins/launchpad/__init__.py:276
7205
#: bzrlib/plugins/launchpad/__init__.py:287
7245
7206
msgid "Launchpad user ID exists and has SSH keys.\n"
7246
7207
msgstr ""
7247
7208
7248
#: bzrlib/plugins/launchpad/cmds.py:238
7209
#: bzrlib/plugins/launchpad/__init__.py:279
7249
7210
msgid "No Launchpad user ID configured.\n"
7250
7211
msgstr ""
7251
7212
7252
#: bzrlib/plugins/launchpad/cmds.py:249
7213
#: bzrlib/plugins/launchpad/__init__.py:290
7253
7214
#, python-format
7254
7215
msgid "Launchpad user ID set to '%s'.\n"
7255
7216
msgstr ""
7256
7217
7257
#: bzrlib/plugins/launchpad/cmds.py:255
7218
#: bzrlib/plugins/launchpad/__init__.py:298
7258
7219
msgid "Ask Launchpad to mirror a branch now."
7259
7220
msgstr ""
7260
7221
7261
#: bzrlib/plugins/launchpad/cmds.py:272
7222
#: bzrlib/plugins/launchpad/__init__.py:318
7262
7223
msgid "Propose merging a branch on Launchpad."
7263
7224
msgstr ""
7264
7225
7265
#: bzrlib/plugins/launchpad/cmds.py:274
7226
#: bzrlib/plugins/launchpad/__init__.py:320
7266
7227
msgid ""
7267
7228
"This will open your usual editor to provide the initial comment. When it\n"
7268
7229
"has created the proposal, it will open it in your default web browser."
7269
7230
msgstr ""
7270
7231
7271
#: bzrlib/plugins/launchpad/cmds.py:277
7232
#: bzrlib/plugins/launchpad/__init__.py:323
7272
7233
msgid ""
7273
7234
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7274
7235
"is not supplied, the remembered submit branch will be used. If no submit\n"
7275
7236
"branch is remembered, the development focus will be used."
7276
7237
msgstr ""
7277
7238
7278
#: bzrlib/plugins/launchpad/cmds.py:281
7239
#: bzrlib/plugins/launchpad/__init__.py:327
7279
7240
msgid ""
7280
7241
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7281
7242
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7283
7244
"may optionally be followed by '=' and the review type. For example:"
7284
7245
msgstr ""
7285
7246
7286
#: bzrlib/plugins/launchpad/cmds.py:286
7247
#: bzrlib/plugins/launchpad/__init__.py:332
7287
7248
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7288
7249
msgstr ""
7289
7250
7290
#: bzrlib/plugins/launchpad/cmds.py:288
7251
#: bzrlib/plugins/launchpad/__init__.py:334
7291
7252
msgid ""
7292
7253
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7293
7254
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7294
7255
msgstr ""
7295
7256
7296
#: bzrlib/plugins/launchpad/cmds.py:293
7257
#: bzrlib/plugins/launchpad/__init__.py:339
7297
7258
msgid "Propose the merge on staging."
7298
7259
msgstr ""
7299
7260
7300
#: bzrlib/plugins/launchpad/cmds.py:295
7261
#: bzrlib/plugins/launchpad/__init__.py:341
7301
7262
msgid "Commit message."
7302
7263
msgstr ""
7303
7264
7304
#: bzrlib/plugins/launchpad/cmds.py:297
7265
#: bzrlib/plugins/launchpad/__init__.py:343
7305
7266
msgid "Mark the proposal as approved immediately."
7306
7267
msgstr ""
7307
7268
7308
#: bzrlib/plugins/launchpad/cmds.py:298
7309
msgid "The bug this proposal fixes."
7310
msgstr ""
7311
7312
#: bzrlib/plugins/launchpad/cmds.py:300
7269
#: bzrlib/plugins/launchpad/__init__.py:345
7313
7270
msgid "Requested reviewer and optional type."
7314
7271
msgstr ""
7315
7272
7316
#: bzrlib/plugins/launchpad/cmds.py:335
7273
#: bzrlib/plugins/launchpad/__init__.py:382
7317
7274
msgid "Find the proposal to merge this revision."
7318
7275
msgstr ""
7319
7276
7320
#: bzrlib/plugins/launchpad/cmds.py:337
7277
#: bzrlib/plugins/launchpad/__init__.py:384
7321
7278
msgid ""
7322
7279
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7323
7280
"This works only if the selected branch was the merge proposal target, and\n"
7325
7282
"are opened in a web browser."
7326
7283
msgstr ""
7327
7284
7328
#: bzrlib/plugins/launchpad/cmds.py:342
7285
#: bzrlib/plugins/launchpad/__init__.py:389
7329
7286
msgid ""
7330
7287
"Any revision involved in the merge may be specified-- the revision in\n"
7331
7288
"which the merge was performed, or one of the revisions that was merged."
7332
7289
msgstr ""
7333
7290
7334
#: bzrlib/plugins/launchpad/cmds.py:345
7291
#: bzrlib/plugins/launchpad/__init__.py:392
7335
7292
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7336
7293
msgstr ""
7337
7294
7338
#: bzrlib/plugins/launchpad/cmds.py:347
7295
#: bzrlib/plugins/launchpad/__init__.py:394
7339
7296
msgid " bzr lp-find-proposal -r annotate:README:1"
7340
7297
msgstr ""
7341
7298
7342
#: bzrlib/plugins/launchpad/cmds.py:363
7299
#: bzrlib/plugins/launchpad/__init__.py:409
7343
7300
msgid "No review found."
7344
7301
msgstr ""
7345
7302
7346
#: bzrlib/plugins/launchpad/cmds.py:364
7303
#: bzrlib/plugins/launchpad/__init__.py:410
7347
7304
#, python-format
7348
7305
msgid "%d proposals(s) found."
7349
7306
msgstr ""
7350
7307
7351
#: bzrlib/plugins/launchpad/cmds.py:374
7308
#: bzrlib/plugins/launchpad/__init__.py:420
7352
7309
msgid "Finding revision-id"
7353
7310
msgstr ""
7354
7311
7355
#: bzrlib/plugins/launchpad/cmds.py:381
7312
#: bzrlib/plugins/launchpad/__init__.py:427
7356
7313
msgid "Finding merge"
7357
7314
msgstr ""
7358
7315
7359
#: bzrlib/plugins/launchpad/cmds.py:386
7316
#: bzrlib/plugins/launchpad/__init__.py:432
7360
7317
msgid "Finding revno"
7361
7318
msgstr ""
7362
7319
7363
#: bzrlib/plugins/launchpad/cmds.py:392
7320
#: bzrlib/plugins/launchpad/__init__.py:437
7364
7321
msgid "Finding Launchpad branch"
7365
7322
msgstr ""
7366
7323
7367
#: bzrlib/plugins/launchpad/cmds.py:395
7324
#: bzrlib/plugins/launchpad/__init__.py:440
7368
7325
msgid "Finding proposals"
7369
7326
msgstr ""
7370
7327
7328
#: bzrlib/plugins/launchpad/account.py:66
7329
msgid "Setting ssh/sftp usernames for launchpad.net."
7330
msgstr ""
7331
7371
7332
#: bzrlib/plugins/launchpad/lp_api.py:241
7372
7333
#: bzrlib/plugins/launchpad/lp_api.py:246
7373
7334
#, python-format
7411
7372
" remote: {2}"
7412
7373
msgstr ""
7413
7374
7414
#: bzrlib/plugins/launchpad/lp_propose.py:150
7375
#: bzrlib/plugins/launchpad/lp_propose.py:149
7415
7376
#, python-format
7416
7377
msgid "There is already a branch merge proposal: %s"
7417
7378
msgstr ""
7418
7379
7419
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7380
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7420
7381
msgid "pb parameter to convert() is deprecated"
7421
7382
msgstr ""
7422
7383
7423
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7384
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7424
7385
msgid "starting upgrade from format 4 to 5"
7425
7386
msgstr ""
7426
7387
7427
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7388
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7428
7389
msgid "note: upgrade may be faster if all store files are ungzipped first"
7429
7390
msgstr ""
7430
7391
7431
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7392
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7432
7393
msgid "converting revision"
7433
7394
msgstr ""
7434
7395
7396
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7397
msgid "upgraded to weaves:"
7398
msgstr ""
7399
7435
7400
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7436
msgid "upgraded to weaves:"
7437
msgstr ""
7438
7439
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7440
7401
#, python-format
7441
7402
msgid "%6d revisions and inventories"
7442
7403
msgstr ""
7443
7404
7444
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7405
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7445
7406
#, python-format
7446
7407
msgid "%6d revisions not present"
7447
7408
msgstr ""
7448
7409
7449
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7410
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7450
7411
#, python-format
7451
7412
msgid "%6d texts"
7452
7413
msgstr ""
7453
7414
7454
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7415
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7455
7416
msgid "writing weave"
7456
7417
msgstr ""
7457
7418
7458
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7459
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7419
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7420
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7460
7421
msgid "inventory"
7461
7422
msgstr ""
7462
7423
7463
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7424
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7464
7425
msgid "write revision"
7465
7426
msgstr ""
7466
7427
7467
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7428
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7468
7429
msgid "loading revision"
7469
7430
msgstr ""
7470
7431
7471
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7432
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7472
7433
#, python-format
7473
7434
msgid "revision {%s} not present in branch; will be converted as a ghost"
7474
7435
msgstr ""
7475
7436
7476
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7437
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7477
7438
msgid "starting upgrade from format 5 to 6"
7478
7439
msgstr ""
7479
7440
7480
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7441
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7481
7442
#, python-format
7482
7443
msgid "adding prefixes to %s"
7483
7444
msgstr ""
7484
7445
7485
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7446
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7486
7447
msgid "starting upgrade from format 6 to metadir"
7487
7448
msgstr ""
7488
7449
7489
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7450
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7490
7451
msgid "Removing ancestry.weave"
7491
7452
msgstr ""
7492
7453
7493
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7454
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7494
7455
msgid "Finding branch files"
7495
7456
msgstr ""
7496
7457
7497
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7458
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7498
7459
msgid "Upgrading repository"
7499
7460
msgstr ""
7500
7461
7501
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7462
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7502
7463
msgid "Upgrading branch"
7503
7464
msgstr ""
7504
7465
7505
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7466
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7506
7467
msgid "No working tree."
7507
7468
msgstr ""
7508
7469
7509
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7470
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7510
7471
msgid "Upgrading working tree"
7511
7472
msgstr ""
7512
7473
7513
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7474
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7514
7475
#, python-format
7515
7476
msgid "Make %s lock"
7516
7477
msgstr ""
7517
7478
7518
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7479
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7519
7480
#, python-format
7520
7481
msgid "Moving %s"
7521
7482
msgstr ""
7542
7503
msgid "Too many redirections trying to make %s."
7543
7504
msgstr ""
7544
7505
7545
#: bzrlib/push.py:148
7506
#: bzrlib/push.py:147
7546
7507
msgid ""
7547
7508
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7548
7509
"information."
7549
7510
msgstr ""
7550
7511
7551
#: bzrlib/push.py:152
7512
#: bzrlib/push.py:151
7552
7513
#, python-format
7553
7514
msgid ""
7554
7515
"It is not possible to losslessly push to %s. You may want to use dpush "
7555
7516
"instead."
7556
7517
msgstr ""
7557
7518
7558
#: bzrlib/push.py:158
7519
#: bzrlib/push.py:157
7559
7520
#, python-format
7560
7521
msgid ""
7561
7522
"At %s you have a valid .bzr control directory, but not a branch or "
7656
7617
msgid "bzr: ERROR (ignored): %s"
7657
7618
msgstr "bzr: ОШИБКА (игнорирована): %s"
7658
7619
7659
#: bzrlib/remote.py:2534
7620
#: bzrlib/remote.py:2541
7660
7621
msgid "Copying repository content as tarball..."
7661
7622
msgstr "Копирование содержимого репозитория в тарбол..."
7662
7623
7672
7633
msgid "{0} => {1}"
7673
7634
msgstr "{0} => {1}"
7674
7635
7675
#: bzrlib/repository.py:1738
7636
#: bzrlib/repository.py:1787
7676
7637
msgid "Moving repository to repository.backup"
7677
7638
msgstr "Перемещение репозитория в repository.backup"
7678
7639
7679
#: bzrlib/repository.py:1745
7640
#: bzrlib/repository.py:1794
7680
7641
msgid "Creating new repository"
7681
7642
msgstr "Создание нового репозитория"
7682
7643
7683
#: bzrlib/repository.py:1750
7644
#: bzrlib/repository.py:1799
7684
7645
msgid "Copying content"
7685
7646
msgstr "Копирование содержимого"
7686
7647
7687
#: bzrlib/repository.py:1754
7648
#: bzrlib/repository.py:1803
7688
7649
msgid "Deleting old repository content"
7689
7650
msgstr "Удаление старого содержимого репозитория"
7690
7651
7691
#: bzrlib/repository.py:1756
7652
#: bzrlib/repository.py:1805
7692
7653
msgid "repository converted"
7693
7654
msgstr "репозиторий преобразован"
7694
7655
7696
7657
msgid "Using {0} {1}"
7697
7658
msgstr "Используется {0} {1}"
7698
7659
7699
#: bzrlib/send.py:59
7660
#: bzrlib/send.py:58
7700
7661
#, python-format
7701
7662
msgid "Mail client \"%s\" does not support specifying body"
7702
7663
msgstr "Почтовый клиент «%s» не поддерживает определение тела"
7703
7664
7704
#: bzrlib/send.py:63
7665
#: bzrlib/send.py:62
7705
7666
msgid "--remember requires a branch to be specified."
7706
7667
msgstr "--remember требует указания ветви."
7707
7668
7708
#: bzrlib/send.py:78
7669
#: bzrlib/send.py:77
7709
7670
msgid "No submit branch known or specified"
7710
7671
msgstr "Ветвь для отсылки неизвестна и не задана"
7711
7672
7712
#: bzrlib/send.py:81
7673
#: bzrlib/send.py:80
7713
7674
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7714
7675
msgstr ""
7715
7676
"Используется сохранённое {0} местоположение «{1}» для определения изменений, "
7716
7677
"которые необходимо отправить."
7717
7678
7718
#: bzrlib/send.py:99
7679
#: bzrlib/send.py:98
7719
7680
#, python-format
7720
7681
msgid "No such send format '%s'."
7721
7682
msgstr "Нет такого формата отправки '%s'."
7722
7683
7723
#: bzrlib/send.py:115
7684
#: bzrlib/send.py:114
7724
7685
msgid "bzr send takes at most two one revision identifiers"
7725
7686
msgstr "bzr send принимает не более двух идентификаторов ревизии"
7726
7687
7727
#: bzrlib/send.py:128
7688
#: bzrlib/send.py:127
7728
7689
msgid "No revisions to submit."
7729
7690
msgstr "Нет ревизий для отправки."
7730
7691
7731
#: bzrlib/send.py:140
7692
#: bzrlib/send.py:139
7732
7693
msgid ""
7733
7694
"- not supported for merge directives that use more than one output file."
7734
7695
msgstr ""
7735
7696
"- не поддерживается для директив merge, которые используют более, чем один "
7736
7697
"файл вывода."
7737
7698
7738
#: bzrlib/send.py:186
7699
#: bzrlib/send.py:185
7739
7700
msgid "Format 0.9 does not permit bundle with no patch"
7740
7701
msgstr "Формат 0.9 не разрешает пакеты без патчей"
7741
7702
7894
7855
"Не удалось соединиться с текущей основной ветвью %(target)s: %(error)s Для "
7895
7856
"принудительного переключения используйте --force."
7896
7857
7897
#: bzrlib/switch.py:129
7858
#: bzrlib/switch.py:125
7898
7859
msgid "Cannot switch a branch, only a checkout."
7899
7860
msgstr ""
7900
7861
7901
#: bzrlib/switch.py:167
7862
#: bzrlib/switch.py:163
7902
7863
#, python-format
7903
7864
msgid "Tree is up to date at revision %d."
7904
7865
msgstr "Дерево в актуальной ревизии %d."
7905
7866
7906
#: bzrlib/switch.py:173
7867
#: bzrlib/switch.py:169
7907
7868
#, python-format
7908
7869
msgid "Updated to revision %d."
7909
7870
msgstr "Обновлено до ревизии %d."
7910
7871
7911
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7872
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7912
7873
msgid "Apply phase"
7913
7874
msgstr "Применить фазу"
7914
7875
7915
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7876
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7916
7877
msgid "removing file"
7917
7878
msgstr "удаление файла"
7918
7879
7919
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7880
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7920
7881
msgid "adding file"
7921
7882
msgstr "добавление файла"
7922
7883
7923
#: bzrlib/transform.py:2598
7884
#: bzrlib/transform.py:2591
7924
7885
msgid "Building tree"
7925
7886
msgstr "Построение дерева"
7926
7887
7927
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7888
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7928
7889
msgid "Adding file contents"
7929
7890
msgstr "Добавление содержимого файлй"
7930
7891
7931
#: bzrlib/transform.py:3017
7892
#: bzrlib/transform.py:3028
7932
7893
msgid "Resolution pass"
7933
7894
msgstr ""
7934
7895
7937
7898
msgid "Authenticated as %s"
7938
7899
msgstr ""
7939
7900
7940
#: bzrlib/tree.py:647
7901
#: bzrlib/tree.py:634
7941
7902
msgid "*** {0} content-filter: {1} => {2!r}"
7942
7903
msgstr "*** {0} content-filter: {1} => {2!r}"
7943
7904
7998
7959
msgid "failed to clean-up {0}: {1}"
7999
7960
msgstr "не удалось очистить {0}: {1}"
8000
7961
8001
#: bzrlib/vf_repository.py:1091
7962
#: bzrlib/vf_repository.py:1090
8002
7963
msgid "inventories"
8003
7964
msgstr ""
8004
7965
8005
#: bzrlib/vf_repository.py:1117
7966
#: bzrlib/vf_repository.py:1116
8006
7967
msgid "texts"
8007
7968
msgstr ""
8008
7969
8009
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7970
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
8010
7971
msgid "Calculating text parents"
8011
7972
msgstr ""
8012
7973
8013
#: bzrlib/vf_repository.py:1707
7974
#: bzrlib/vf_repository.py:1706
8014
7975
msgid "Fetch texts"
8015
7976
msgstr ""
8016
7977
8017
#: bzrlib/vf_repository.py:2536
7978
#: bzrlib/vf_repository.py:2535
8018
7979
msgid "loading text store"
8019
7980
msgstr ""
8020
7981
8021
#: bzrlib/vf_repository.py:2542
7982
#: bzrlib/vf_repository.py:2541
8022
7983
msgid "checking text graph"
8023
7984
msgstr ""
8024
7985
8025
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
8026
#: bzrlib/vf_repository.py:3127
7986
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7987
#: bzrlib/vf_repository.py:3124
8027
7988
msgid "Transferring revisions"
8028
7989
msgstr ""
8029
7990
8070
8031
msgid "PageFaultCount %8d"
8071
8032
msgstr "PageFaultCount %8d"
8072
8033
8073
#: bzrlib/workingtree.py:1482
8034
#: bzrlib/workingtree.py:1478
8074
8035
msgid "Rerun update after fixing the conflicts."
8075
8036
msgstr "Снова запустите обновление после исправления конфликтов."
8076
8037
8080
8041
8081
8042
#: dummy/help_topics/basic/detail.txt:1
8082
8043
msgid ""
8083
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
8044
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
8084
8045
"http://bazaar.canonical.com/"
8085
8046
msgstr ""
8086
8047
8416
8377
msgid "How to fix diverged branches"
8417
8378
msgstr "Как исправлять отклонения ветвей"
8418
8379
8380
#: dummy/help_topics/env-variables/detail.txt:1
8381
msgid "Environment Variables"
8382
msgstr "Переменные окружения"
8383
8384
#: dummy/help_topics/env-variables/detail.txt:3
8385
msgid ""
8386
"=================== "
8387
"===========================================================\n"
8388
"BZRPATH Path where bzr is to look for shell plugin external\n"
8389
" commands.\n"
8390
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8391
"EMAIL E-Mail address of the user.\n"
8392
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8393
"EDITOR Editor for editing commit messages.\n"
8394
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8395
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8396
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8397
"BZR_PLUGIN_PATH.\n"
8398
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8399
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8400
"and\n"
8401
" HOME.\n"
8402
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8403
"URLs).\n"
8404
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8405
"sshcorp,\n"
8406
" plink or lsh.\n"
8407
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8408
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8409
"BZR_COLUMNS Override implicit terminal width.\n"
8410
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8411
"(selftest)\n"
8412
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8413
"'text'.\n"
8414
"BZR_PDB Control whether to launch a debugger on error.\n"
8415
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8416
" breakin debugger.\n"
8417
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8418
"(instead\n"
8419
" of char-based).\n"
8420
"=================== "
8421
"===========================================================\n"
8422
msgstr ""
8423
8419
8424
#: dummy/help_topics/env-variables/summary.txt:1
8420
8425
msgid "Environment variable names and values"
8421
8426
msgstr "Имена и значения переменных окружения"
9436
9441
msgid " bzr commit --fixes <tracker>:<id>"
9437
9442
msgstr ""
9438
9443
9439
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9444
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9440
9445
msgid "or::"
9441
9446
msgstr ""
9442
9447
9671
9676
"remove-tree Remove the working tree from a given branch/checkout.\n"
9672
9677
"renames Show list of renamed files.\n"
9673
9678
"resolve Mark a conflict as resolved.\n"
9674
"revert Set files in the working tree back to the contents of a\n"
9675
" previous revision.\n"
9679
"revert Revert files to a previous revision.\n"
9676
9680
"revno Show current revision number.\n"
9677
9681
"root Show the tree root directory.\n"
9678
9682
"send Mail or create a merge-directive for submitting changes.\n"
10330
10334
10331
10335
#: en/help_topics/configuration.txt:336
10332
10336
msgid ""
10333
"Another such option is ``branchname``, which refers to the name of a "
10334
"colocated\n"
10335
"branch. For non-colocated branches, it behaves like basename. It can be "
10336
"used\n"
10337
"like this::"
10338
msgstr ""
10339
10340
#: en/help_topics/configuration.txt:340
10341
msgid ""
10342
" [/home/vila/src/bzr/bugs]\n"
10343
" mypush = lp:~vila/bzr/{branchname}"
10344
msgstr ""
10345
10346
#: en/help_topics/configuration.txt:343
10347
msgid ""
10348
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10349
"get::"
10350
msgstr ""
10351
10352
#: en/help_topics/configuration.txt:345
10353
msgid ""
10354
" bzr config mypush\n"
10355
" lp:~vila/bzr/832013-expand-in-stack"
10356
msgstr ""
10357
10358
#: en/help_topics/configuration.txt:348
10359
msgid ""
10360
10337
"When an option is local to a Section, it cannot be referred to from option\n"
10361
10338
"values in any other section from the same ``Store`` nor from any other\n"
10362
10339
"``Store``."
10363
10340
msgstr ""
10364
10341
10365
#: en/help_topics/configuration.txt:352
10342
#: en/help_topics/configuration.txt:340
10366
10343
msgid ""
10367
10344
"\n"
10368
10345
"The main configuration file, bazaar.conf\n"
10369
10346
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10370
10347
msgstr ""
10371
10348
10372
#: en/help_topics/configuration.txt:356
10349
#: en/help_topics/configuration.txt:344
10373
10350
msgid ""
10374
10351
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10375
10352
"The default section contains the default\n"
10377
10354
"overriden by providing a branch-specific section in ``locations.conf``."
10378
10355
msgstr ""
10379
10356
10380
#: en/help_topics/configuration.txt:361
10357
#: en/help_topics/configuration.txt:349
10381
10358
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10382
10359
msgstr ""
10383
10360
10384
#: en/help_topics/configuration.txt:363
10361
#: en/help_topics/configuration.txt:351
10385
10362
msgid ""
10386
10363
" [DEFAULT]\n"
10387
10364
" email = John Doe <jdoe@isp.com>\n"
10389
10366
" create_signatures = when-required"
10390
10367
msgstr ""
10391
10368
10392
#: en/help_topics/configuration.txt:368
10369
#: en/help_topics/configuration.txt:356
10393
10370
msgid ""
10394
10371
"\n"
10395
10372
"The branch location configuration file, locations.conf\n"
10396
10373
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10397
10374
msgstr ""
10398
10375
10399
#: en/help_topics/configuration.txt:372
10376
#: en/help_topics/configuration.txt:360
10400
10377
msgid ""
10401
10378
"``locations.conf`` allows one to specify overriding settings for\n"
10402
10379
"a specific branch. The format is almost identical to the default section in\n"
10406
10383
"for. The '?' and '*' wildcards are supported::"
10407
10384
msgstr ""
10408
10385
10409
#: en/help_topics/configuration.txt:378
10386
#: en/help_topics/configuration.txt:366
10410
10387
msgid ""
10411
10388
" [/home/jdoe/branches/nethack]\n"
10412
10389
" email = Nethack Admin <nethack@nethack.com>"
10413
10390
msgstr ""
10414
10391
10415
#: en/help_topics/configuration.txt:381
10392
#: en/help_topics/configuration.txt:369
10416
10393
msgid ""
10417
10394
" [http://hypothetical.site.com/branches/devel-branch]\n"
10418
10395
" create_signatures = always"
10419
10396
msgstr ""
10420
10397
10421
#: en/help_topics/configuration.txt:384
10398
#: en/help_topics/configuration.txt:372
10422
10399
msgid ""
10423
10400
"The authentication configuration file, authentication.conf\n"
10424
10401
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10425
10402
msgstr ""
10426
10403
10427
#: en/help_topics/configuration.txt:387
10404
#: en/help_topics/configuration.txt:375
10428
10405
msgid ""
10429
10406
"``authentication.conf`` allows one to specify credentials for\n"
10430
10407
"remote servers. This can be used for all the supported transports and any "
10432
10409
"of bzr that requires authentication (smtp for example)."
10433
10410
msgstr ""
10434
10411
10435
#: en/help_topics/configuration.txt:391
10412
#: en/help_topics/configuration.txt:379
10436
10413
msgid ""
10437
10414
"The syntax of the file obeys the same rules as the others except for the\n"
10438
10415
"option policies which don't apply."
10439
10416
msgstr ""
10440
10417
10441
#: en/help_topics/configuration.txt:394
10418
#: en/help_topics/configuration.txt:382
10442
10419
msgid ""
10443
10420
"For more information on the possible uses of the authentication "
10444
10421
"configuration\n"
10445
10422
"file see :doc:`authentication-help`."
10446
10423
msgstr ""
10447
10424
10448
#: en/help_topics/configuration.txt:397
10425
#: en/help_topics/configuration.txt:385
10449
10426
msgid ""
10450
10427
"\n"
10451
10428
"Common options\n"
10452
10429
"--------------"
10453
10430
msgstr ""
10454
10431
10455
#: en/help_topics/configuration.txt:401
10432
#: en/help_topics/configuration.txt:389
10456
10433
msgid ""
10457
10434
"debug_flags\n"
10458
10435
"~~~~~~~~~~~"
10459
10436
msgstr ""
10460
10437
10461
#: en/help_topics/configuration.txt:404
10438
#: en/help_topics/configuration.txt:392
10462
10439
msgid ""
10463
10440
"A comma-separated list of debugging options to turn on. The same values\n"
10464
10441
"can be used as with the -D command-line option (see `help global-options`).\n"
10465
10442
"For example::"
10466
10443
msgstr ""
10467
10444
10468
#: en/help_topics/configuration.txt:408
10445
#: en/help_topics/configuration.txt:396
10469
10446
msgid " debug_flags = hpss"
10470
10447
msgstr ""
10471
10448
10472
#: en/help_topics/configuration.txt:412
10449
#: en/help_topics/configuration.txt:400
10473
10450
msgid " debug_flags = hpss,evil"
10474
10451
msgstr ""
10475
10452
10476
#: en/help_topics/configuration.txt:414
10453
#: en/help_topics/configuration.txt:402
10477
10454
msgid ""
10478
10455
"email\n"
10479
10456
"~~~~~"
10480
10457
msgstr ""
10481
10458
10482
#: en/help_topics/configuration.txt:417
10459
#: en/help_topics/configuration.txt:405
10483
10460
msgid ""
10484
10461
"The email address to use when committing a branch. Typically takes the form\n"
10485
10462
"of::"
10486
10463
msgstr ""
10487
10464
10488
#: en/help_topics/configuration.txt:420
10465
#: en/help_topics/configuration.txt:408
10489
10466
msgid " email = Full Name <account@hostname.tld>"
10490
10467
msgstr ""
10491
10468
10492
#: en/help_topics/configuration.txt:422
10469
#: en/help_topics/configuration.txt:410
10493
10470
msgid ""
10494
10471
"editor\n"
10495
10472
"~~~~~~"
10496
10473
msgstr ""
10497
10474
10498
#: en/help_topics/configuration.txt:425
10475
#: en/help_topics/configuration.txt:413
10499
10476
msgid ""
10500
10477
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10501
10478
"a commit message. This setting is trumped by the environment variable\n"
10503
10480
"variables."
10504
10481
msgstr ""
10505
10482
10506
#: en/help_topics/configuration.txt:430
10483
#: en/help_topics/configuration.txt:418
10507
10484
msgid ""
10508
10485
"log_format\n"
10509
10486
"~~~~~~~~~~"
10510
10487
msgstr ""
10511
10488
10512
#: en/help_topics/configuration.txt:433
10489
#: en/help_topics/configuration.txt:421
10513
10490
msgid ""
10514
10491
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10515
10492
"and ``line``. Additional formats may be provided by plugins. The default\n"
10516
10493
"value is ``long``."
10517
10494
msgstr ""
10518
10495
10519
#: en/help_topics/configuration.txt:437
10496
#: en/help_topics/configuration.txt:425
10520
10497
msgid ""
10521
10498
"check_signatures\n"
10522
10499
"~~~~~~~~~~~~~~~~"
10523
10500
msgstr ""
10524
10501
10525
#: en/help_topics/configuration.txt:440
10502
#: en/help_topics/configuration.txt:428
10526
10503
msgid ""
10527
10504
"Reserved for future use. These options will allow a policy for branches to\n"
10528
10505
"require signatures."
10529
10506
msgstr ""
10530
10507
10531
#: en/help_topics/configuration.txt:443
10508
#: en/help_topics/configuration.txt:431
10532
10509
msgid ""
10533
10510
"require\n"
10534
10511
" The gnupg signature for revisions must be present and must be valid."
10535
10512
msgstr ""
10536
10513
10537
#: en/help_topics/configuration.txt:446
10514
#: en/help_topics/configuration.txt:434
10538
10515
msgid ""
10539
10516
"ignore\n"
10540
10517
" Do not check gnupg signatures of revisions."
10541
10518
msgstr ""
10542
10519
10543
#: en/help_topics/configuration.txt:449
10520
#: en/help_topics/configuration.txt:437
10544
10521
msgid ""
10545
10522
"check-available\n"
10546
10523
" (default) If gnupg signatures for revisions are present, check them.\n"
10548
10525
" no signature is present."
10549
10526
msgstr ""
10550
10527
10551
#: en/help_topics/configuration.txt:454
10528
#: en/help_topics/configuration.txt:442
10552
10529
msgid ""
10553
10530
"create_signatures\n"
10554
10531
"~~~~~~~~~~~~~~~~~"
10555
10532
msgstr ""
10556
10533
10557
#: en/help_topics/configuration.txt:457
10534
#: en/help_topics/configuration.txt:445
10558
10535
msgid ""
10559
10536
"Defines the behaviour of signing revisions on commits. By default bzr will "
10560
10537
"not\n"
10561
10538
"sign new commits."
10562
10539
msgstr ""
10563
10540
10564
#: en/help_topics/configuration.txt:460
10541
#: en/help_topics/configuration.txt:448
10565
10542
msgid ""
10566
10543
"always\n"
10567
10544
" Sign every new revision that is committed. If the signing fails then "
10569
10546
" commit will not be made."
10570
10547
msgstr ""
10571
10548
10572
#: en/help_topics/configuration.txt:464
10549
#: en/help_topics/configuration.txt:452
10573
10550
msgid ""
10574
10551
"when-required\n"
10575
10552
" Reserved for future use."
10576
10553
msgstr ""
10577
10554
10578
#: en/help_topics/configuration.txt:467
10555
#: en/help_topics/configuration.txt:455
10579
10556
msgid ""
10580
10557
"never\n"
10581
10558
" Reserved for future use."
10582
10559
msgstr ""
10583
10560
10584
#: en/help_topics/configuration.txt:470
10561
#: en/help_topics/configuration.txt:458
10585
10562
msgid ""
10586
10563
"In future it is planned that ``when-required`` will sign newly\n"
10587
10564
"committed revisions only when the branch requires them. ``never`` will "
10589
10566
"to sign newly committed revisions, even if the branch requires signatures."
10590
10567
msgstr ""
10591
10568
10592
#: en/help_topics/configuration.txt:474
10569
#: en/help_topics/configuration.txt:462
10593
10570
msgid ""
10594
10571
"dirstate.fdatasync\n"
10595
10572
"~~~~~~~~~~~~~~~~~~"
10596
10573
msgstr ""
10597
10574
10598
#: en/help_topics/configuration.txt:477
10575
#: en/help_topics/configuration.txt:465
10599
10576
msgid ""
10600
10577
"If true (default), working tree metadata changes are flushed through the\n"
10601
10578
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10602
10579
"should not be lost if the machine crashes. See also repository.fdatasync."
10603
10580
msgstr ""
10604
10581
10605
#: en/help_topics/configuration.txt:481
10582
#: en/help_topics/configuration.txt:469
10606
10583
msgid ""
10607
10584
"gpg_signing_key\n"
10608
10585
"~~~~~~~~~~~~~~~"
10609
10586
msgstr ""
10610
10587
10611
#: en/help_topics/configuration.txt:484
10588
#: en/help_topics/configuration.txt:472
10612
10589
msgid ""
10613
10590
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10614
10591
"address, key fingerprint or full key ID. When unset or when set to\n"
10615
10592
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10616
10593
msgstr ""
10617
10594
10618
#: en/help_topics/configuration.txt:488
10595
#: en/help_topics/configuration.txt:476
10619
10596
msgid ""
10620
10597
"recurse\n"
10621
10598
"~~~~~~~"
10622
10599
msgstr ""
10623
10600
10624
#: en/help_topics/configuration.txt:491
10601
#: en/help_topics/configuration.txt:479
10625
10602
msgid ""
10626
10603
"Only useful in ``locations.conf``. Defines whether or not the\n"
10627
10604
"configuration for this section applies to subdirectories:"
10628
10605
msgstr ""
10629
10606
10630
#: en/help_topics/configuration.txt:494
10607
#: en/help_topics/configuration.txt:482
10631
10608
msgid ""
10632
10609
"true\n"
10633
10610
" (default) This section applies to subdirectories as well."
10634
10611
msgstr ""
10635
10612
10636
#: en/help_topics/configuration.txt:497
10613
#: en/help_topics/configuration.txt:485
10637
10614
msgid ""
10638
10615
"false\n"
10639
10616
" This section only applies to the branch at this directory and not\n"
10640
10617
" branches below it."
10641
10618
msgstr ""
10642
10619
10643
#: en/help_topics/configuration.txt:501
10620
#: en/help_topics/configuration.txt:489
10644
10621
msgid ""
10645
10622
"gpg_signing_command\n"
10646
10623
"~~~~~~~~~~~~~~~~~~~"
10647
10624
msgstr ""
10648
10625
10649
#: en/help_topics/configuration.txt:504
10626
#: en/help_topics/configuration.txt:492
10650
10627
msgid ""
10651
10628
"(Default: \"gpg\"). Which program should be used to sign and check "
10652
10629
"revisions.\n"
10653
10630
"For example::"
10654
10631
msgstr ""
10655
10632
10656
#: en/help_topics/configuration.txt:507
10633
#: en/help_topics/configuration.txt:495
10657
10634
msgid " gpg_signing_command = /usr/bin/gnpg"
10658
10635
msgstr ""
10659
10636
10660
#: en/help_topics/configuration.txt:509
10637
#: en/help_topics/configuration.txt:497
10661
10638
msgid ""
10662
10639
"The specified command must accept the options \"--clearsign\" and \"-u "
10663
10640
"<email>\"."
10664
10641
msgstr ""
10665
10642
10666
#: en/help_topics/configuration.txt:511
10643
#: en/help_topics/configuration.txt:499
10667
10644
msgid ""
10668
10645
"bzr_remote_path\n"
10669
10646
"~~~~~~~~~~~~~~~"
10670
10647
msgstr ""
10671
10648
10672
#: en/help_topics/configuration.txt:514
10649
#: en/help_topics/configuration.txt:502
10673
10650
msgid ""
10674
10651
"(Default: \"bzr\"). The path to the command that should be used to run the "
10675
10652
"smart\n"
10676
10653
"server for bzr. This value may only be specified in locations.conf, because:"
10677
10654
msgstr ""
10678
10655
10679
#: en/help_topics/configuration.txt:517
10656
#: en/help_topics/configuration.txt:505
10680
10657
msgid ""
10681
10658
"- it's needed before branch.conf is accessible\n"
10682
10659
"- allowing remote branch.conf files to specify commands would be a security\n"
10683
10660
" risk"
10684
10661
msgstr ""
10685
10662
10686
#: en/help_topics/configuration.txt:521
10663
#: en/help_topics/configuration.txt:509
10687
10664
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10688
10665
msgstr ""
10689
10666
10690
#: en/help_topics/configuration.txt:523
10667
#: en/help_topics/configuration.txt:511
10691
10668
msgid ""
10692
10669
"smtp_server\n"
10693
10670
"~~~~~~~~~~~"
10694
10671
msgstr ""
10695
10672
10696
#: en/help_topics/configuration.txt:526
10673
#: en/help_topics/configuration.txt:514
10697
10674
msgid ""
10698
10675
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10699
10676
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10700
10677
msgstr ""
10701
10678
10702
#: en/help_topics/configuration.txt:529
10679
#: en/help_topics/configuration.txt:517
10703
10680
msgid ""
10704
10681
"smtp_username, smtp_password\n"
10705
10682
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10706
10683
msgstr ""
10707
10684
10708
#: en/help_topics/configuration.txt:532
10685
#: en/help_topics/configuration.txt:520
10709
10686
msgid ""
10710
10687
"User and password to authenticate to the SMTP server. If smtp_username\n"
10711
10688
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10713
10690
"to send mail."
10714
10691
msgstr ""
10715
10692
10716
#: en/help_topics/configuration.txt:537
10693
#: en/help_topics/configuration.txt:525
10717
10694
msgid ""
10718
10695
"locks.steal_dead\n"
10719
10696
"~~~~~~~~~~~~~~~~"
10720
10697
msgstr ""
10721
10698
10722
#: en/help_topics/configuration.txt:540
10699
#: en/help_topics/configuration.txt:528
10723
10700
msgid ""
10724
10701
"If set to true, bzr will automatically break locks held by processes from\n"
10725
10702
"the same machine and user that are no longer alive. Otherwise, it will\n"
10727
10704
"the object is no longer in use."
10728
10705
msgstr ""
10729
10706
10730
#: en/help_topics/configuration.txt:545
10707
#: en/help_topics/configuration.txt:533
10731
10708
msgid ""
10732
10709
"mail_client\n"
10733
10710
"~~~~~~~~~~~"
10734
10711
msgstr ""
10735
10712
10736
#: en/help_topics/configuration.txt:548
10713
#: en/help_topics/configuration.txt:536
10737
10714
msgid ""
10738
10715
"A mail client to use for sending merge requests.\n"
10739
10716
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10742
10719
"``editor``."
10743
10720
msgstr ""
10744
10721
10745
#: en/help_topics/configuration.txt:553
10722
#: en/help_topics/configuration.txt:541
10746
10723
msgid "Supported values for specific clients:"
10747
10724
msgstr ""
10748
10725
10749
#: en/help_topics/configuration.txt:555
10726
#: en/help_topics/configuration.txt:543
10750
10727
msgid ""
10751
10728
":claws: Use Claws. This skips a dialog for attaching files.\n"
10752
10729
":evolution: Use Evolution.\n"
10757
10734
" this works around some bugs that xdg-email doesn't handle."
10758
10735
msgstr ""
10759
10736
10760
#: en/help_topics/configuration.txt:562
10737
#: en/help_topics/configuration.txt:550
10761
10738
msgid "Supported generic values are:"
10762
10739
msgstr ""
10763
10740
10764
#: en/help_topics/configuration.txt:564
10741
#: en/help_topics/configuration.txt:552
10765
10742
msgid ""
10766
10743
":default: See above.\n"
10767
10744
":editor: Use your editor to compose the merge request. This also uses\n"
10771
10748
":xdg-email: Use xdg-email to run your preferred mail program"
10772
10749
msgstr ""
10773
10750
10774
#: en/help_topics/configuration.txt:571
10751
#: en/help_topics/configuration.txt:559
10775
10752
msgid ""
10776
10753
"repository.fdatasync\n"
10777
10754
"~~~~~~~~~~~~~~~~~~~~"
10778
10755
msgstr ""
10779
10756
10780
#: en/help_topics/configuration.txt:574
10757
#: en/help_topics/configuration.txt:562
10781
10758
msgid ""
10782
10759
"If true (default), repository changes are flushed through the OS buffers\n"
10783
10760
"to physical disk. This is somewhat slower, but means data should not be\n"
10784
10761
"lost if the machine crashes. See also dirstate.fdatasync."
10785
10762
msgstr ""
10786
10763
10787
#: en/help_topics/configuration.txt:578
10764
#: en/help_topics/configuration.txt:566
10788
10765
msgid ""
10789
10766
"submit_branch\n"
10790
10767
"~~~~~~~~~~~~~"
10791
10768
msgstr ""
10792
10769
10793
#: en/help_topics/configuration.txt:581
10770
#: en/help_topics/configuration.txt:569
10794
10771
msgid ""
10795
10772
"The branch you intend to submit your current work to. This is "
10796
10773
"automatically\n"
10799
10776
"should usually be set on a per-branch or per-location basis."
10800
10777
msgstr ""
10801
10778
10802
#: en/help_topics/configuration.txt:585
10779
#: en/help_topics/configuration.txt:573
10803
10780
msgid ""
10804
10781
"public_branch\n"
10805
10782
"~~~~~~~~~~~~~"
10806
10783
msgstr ""
10807
10784
10808
#: en/help_topics/configuration.txt:588
10785
#: en/help_topics/configuration.txt:576
10809
10786
msgid ""
10810
10787
"A publically-accessible version of this branch (implying that this version "
10811
10788
"is\n"
10812
10789
"not publically-accessible). Used (and set) by ``bzr send``."
10813
10790
msgstr ""
10814
10791
10815
#: en/help_topics/configuration.txt:591
10792
#: en/help_topics/configuration.txt:579
10816
10793
msgid ""
10817
10794
"suppress_warnings\n"
10818
10795
"~~~~~~~~~~~~~~~~~"
10819
10796
msgstr ""
10820
10797
10821
#: en/help_topics/configuration.txt:594
10798
#: en/help_topics/configuration.txt:582
10822
10799
msgid ""
10823
10800
"A list of strings, each string represent a warning that can be emitted by\n"
10824
10801
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10825
10802
msgstr ""
10826
10803
10827
#: en/help_topics/configuration.txt:597
10804
#: en/help_topics/configuration.txt:585
10828
10805
msgid "Valid values:"
10829
10806
msgstr ""
10830
10807
10831
#: en/help_topics/configuration.txt:599
10808
#: en/help_topics/configuration.txt:587
10832
10809
msgid ""
10833
10810
"* ``format_deprecation``:\n"
10834
10811
" whether the format deprecation warning is shown on repositories that "
10836
10813
" using deprecated formats."
10837
10814
msgstr ""
10838
10815
10839
#: en/help_topics/configuration.txt:603
10816
#: en/help_topics/configuration.txt:591
10840
10817
msgid ""
10841
10818
"default_format\n"
10842
10819
"~~~~~~~~~~~~~~"
10843
10820
msgstr ""
10844
10821
10845
#: en/help_topics/configuration.txt:606
10822
#: en/help_topics/configuration.txt:594
10846
10823
msgid ""
10847
10824
"A format name for the default format used when creating branches. See "
10848
10825
"``bzr\n"
10849
10826
"help formats`` for possible values."
10850
10827
msgstr ""
10851
10828
10852
#: en/help_topics/configuration.txt:609
10829
#: en/help_topics/configuration.txt:597
10853
10830
msgid ""
10854
10831
"\n"
10855
10832
"Unicode options\n"
10856
10833
"---------------"
10857
10834
msgstr ""
10858
10835
10859
#: en/help_topics/configuration.txt:613
10836
#: en/help_topics/configuration.txt:601
10860
10837
msgid ""
10861
10838
"output_encoding\n"
10862
10839
"~~~~~~~~~~~~~~~"
10863
10840
msgstr ""
10864
10841
10865
#: en/help_topics/configuration.txt:616
10842
#: en/help_topics/configuration.txt:604
10866
10843
msgid ""
10867
10844
"A Python unicode encoding name for text output from bzr, such as log\n"
10868
10845
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10869
10846
"is the terminal encoding prefered by the operating system."
10870
10847
msgstr ""
10871
10848
10872
#: en/help_topics/configuration.txt:620
10849
#: en/help_topics/configuration.txt:608
10873
10850
msgid ""
10874
10851
"\n"
10875
10852
"Branch type specific options\n"
10876
10853
"----------------------------"
10877
10854
msgstr ""
10878
10855
10879
#: en/help_topics/configuration.txt:624
10856
#: en/help_topics/configuration.txt:612
10880
10857
msgid ""
10881
10858
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10882
10859
"later format. They\n"
10884
10861
"manually set in ``locations.conf`` or ``bazaar.conf``."
10885
10862
msgstr ""
10886
10863
10887
#: en/help_topics/configuration.txt:629
10864
#: en/help_topics/configuration.txt:617
10888
10865
msgid ""
10889
10866
"append_revisions_only\n"
10890
10867
"~~~~~~~~~~~~~~~~~~~~~"
10891
10868
msgstr ""
10892
10869
10893
#: en/help_topics/configuration.txt:632
10870
#: en/help_topics/configuration.txt:620
10894
10871
msgid ""
10895
10872
"If set to \"True\" then revisions can only be appended to the log, not\n"
10896
10873
"removed. A branch with this setting enabled can only pull from another\n"
10900
10877
"compatibility with previous bzr versions (older than 2.2)."
10901
10878
msgstr ""
10902
10879
10903
#: en/help_topics/configuration.txt:639
10880
#: en/help_topics/configuration.txt:627
10904
10881
msgid ""
10905
10882
"parent_location\n"
10906
10883
"~~~~~~~~~~~~~~~"
10907
10884
msgstr ""
10908
10885
10909
#: en/help_topics/configuration.txt:642
10886
#: en/help_topics/configuration.txt:630
10910
10887
msgid ""
10911
10888
"If present, the location of the default branch for pull or merge. This "
10912
10889
"option\n"
10914
10891
"--remember``."
10915
10892
msgstr ""
10916
10893
10917
#: en/help_topics/configuration.txt:646
10894
#: en/help_topics/configuration.txt:634
10918
10895
msgid ""
10919
10896
"push_location\n"
10920
10897
"~~~~~~~~~~~~~"
10921
10898
msgstr ""
10922
10899
10923
#: en/help_topics/configuration.txt:649
10900
#: en/help_topics/configuration.txt:637
10924
10901
msgid ""
10925
10902
"If present, the location of the default branch for push. This option\n"
10926
10903
"is normally set by the first ``push`` or ``push --remember``."
10927
10904
msgstr ""
10928
10905
10929
#: en/help_topics/configuration.txt:652
10906
#: en/help_topics/configuration.txt:640
10930
10907
msgid ""
10931
10908
"push_strict\n"
10932
10909
"~~~~~~~~~~~"
10933
10910
msgstr ""
10934
10911
10935
#: en/help_topics/configuration.txt:655
10912
#: en/help_topics/configuration.txt:643
10936
10913
msgid ""
10937
10914
"If present, defines the ``--strict`` option default value for checking\n"
10938
10915
"uncommitted changes before pushing."
10939
10916
msgstr ""
10940
10917
10941
#: en/help_topics/configuration.txt:658
10918
#: en/help_topics/configuration.txt:646
10942
10919
msgid ""
10943
10920
"dpush_strict\n"
10944
10921
"~~~~~~~~~~~~"
10945
10922
msgstr ""
10946
10923
10947
#: en/help_topics/configuration.txt:661
10924
#: en/help_topics/configuration.txt:649
10948
10925
msgid ""
10949
10926
"If present, defines the ``--strict`` option default value for checking\n"
10950
10927
"uncommitted changes before pushing into a different VCS without any\n"
10951
10928
"custom bzr metadata."
10952
10929
msgstr ""
10953
10930
10954
#: en/help_topics/configuration.txt:665
10931
#: en/help_topics/configuration.txt:653
10955
10932
msgid ""
10956
10933
"bound_location\n"
10957
10934
"~~~~~~~~~~~~~~"
10958
10935
msgstr ""
10959
10936
10960
#: en/help_topics/configuration.txt:668
10937
#: en/help_topics/configuration.txt:656
10961
10938
msgid ""
10962
10939
"The location that commits should go to when acting as a checkout.\n"
10963
10940
"This option is normally set by ``bind``."
10964
10941
msgstr ""
10965
10942
10966
#: en/help_topics/configuration.txt:671
10943
#: en/help_topics/configuration.txt:659
10967
10944
msgid ""
10968
10945
"bound\n"
10969
10946
"~~~~~"
10970
10947
msgstr ""
10971
10948
10972
#: en/help_topics/configuration.txt:674
10949
#: en/help_topics/configuration.txt:662
10973
10950
msgid ""
10974
10951
"If set to \"True\", the branch should act as a checkout, and push each "
10975
10952
"commit to\n"
10976
10953
"the bound_location. This option is normally set by ``bind``/``unbind``."
10977
10954
msgstr ""
10978
10955
10979
#: en/help_topics/configuration.txt:677
10956
#: en/help_topics/configuration.txt:665
10980
10957
msgid ""
10981
10958
"send_strict\n"
10982
10959
"~~~~~~~~~~~"
10983
10960
msgstr ""
10984
10961
10985
#: en/help_topics/configuration.txt:680
10962
#: en/help_topics/configuration.txt:668
10986
10963
msgid ""
10987
10964
"If present, defines the ``--strict`` option default value for checking\n"
10988
10965
"uncommitted changes before sending a merge directive."
10989
10966
msgstr ""
10990
10967
10991
#: en/help_topics/configuration.txt:683
10968
#: en/help_topics/configuration.txt:671
10992
10969
msgid ""
10993
10970
"add.maximum_file_size\n"
10994
10971
"~~~~~~~~~~~~~~~~~~~~~"
10995
10972
msgstr ""
10996
10973
10997
#: en/help_topics/configuration.txt:686
10974
#: en/help_topics/configuration.txt:674
10998
10975
msgid ""
10999
10976
"Defines the maximum file size the command line \"add\" operation will allow\n"
11000
10977
"in recursive mode, with files larger than this value being skipped. You may "
11006
10983
"will disable skipping."
11007
10984
msgstr ""
11008
10985
11009
#: en/help_topics/configuration.txt:692
10986
#: en/help_topics/configuration.txt:680
11010
10987
msgid ""
11011
10988
"External Merge Tools\n"
11012
10989
"--------------------"
11013
10990
msgstr ""
11014
10991
11015
#: en/help_topics/configuration.txt:695
10992
#: en/help_topics/configuration.txt:683
11016
10993
msgid ""
11017
10994
"bzr.mergetool.<name>\n"
11018
10995
"~~~~~~~~~~~~~~~~~~~~"
11019
10996
msgstr ""
11020
10997
11021
#: en/help_topics/configuration.txt:698
10998
#: en/help_topics/configuration.txt:686
11022
10999
msgid ""
11023
11000
"Defines an external merge tool called <name> with the given command-line.\n"
11024
11001
"Arguments containing spaces should be quoted using single or double quotes. "
11026
11003
"executable may omit its path if it can be found on the PATH."
11027
11004
msgstr ""
11028
11005
11029
#: en/help_topics/configuration.txt:702
11006
#: en/help_topics/configuration.txt:690
11030
11007
msgid ""
11031
11008
"The following markers can be used in the command-line to substitute "
11032
11009
"filenames\n"
11033
11010
"involved in the merge conflict::"
11034
11011
msgstr ""
11035
11012
11036
#: en/help_topics/configuration.txt:705
11013
#: en/help_topics/configuration.txt:693
11037
11014
msgid ""
11038
11015
" {base} file.BASE\n"
11039
11016
" {this} file.THIS\n"
11044
11021
" succeeds."
11045
11022
msgstr ""
11046
11023
11047
#: en/help_topics/configuration.txt:714
11024
#: en/help_topics/configuration.txt:702
11048
11025
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11049
11026
msgstr ""
11050
11027
11051
#: en/help_topics/configuration.txt:716
11028
#: en/help_topics/configuration.txt:704
11052
11029
msgid ""
11053
11030
"bzr.default_mergetool\n"
11054
11031
"~~~~~~~~~~~~~~~~~~~~~"
11055
11032
msgstr ""
11056
11033
11057
#: en/help_topics/configuration.txt:719
11034
#: en/help_topics/configuration.txt:707
11058
11035
msgid ""
11059
11036
"Specifies which external merge tool (as defined above) should be selected "
11060
11037
"by\n"
11061
11038
"default in tools such as ``bzr qconflicts``."
11062
11039
msgstr ""
11063
11040
11064
#: en/help_topics/configuration.txt:724
11041
#: en/help_topics/configuration.txt:712
11065
11042
msgid " bzr.default_mergetool = kdiff3\n"
11066
11043
msgstr ""
11067
11044
12012
11989
"branch can now be pushed to the mainline.\n"
12013
11990
msgstr ""
12014
11991
12015
#: en/help_topics/env-variables.txt:1
12016
msgid "Environment Variables"
12017
msgstr "Переменные окружения"
12018
12019
#: en/help_topics/env-variables.txt:3
12020
msgid ""
12021
"=================== "
12022
"===========================================================\n"
12023
"BZRPATH Path where bzr is to look for shell plugin external\n"
12024
" commands.\n"
12025
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
12026
"EMAIL E-Mail address of the user.\n"
12027
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
12028
"EDITOR Editor for editing commit messages.\n"
12029
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
12030
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
12031
"BZR_PLUGINS_AT Plugins to load from a directory not in "
12032
"BZR_PLUGIN_PATH.\n"
12033
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
12034
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
12035
"and\n"
12036
" HOME.\n"
12037
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
12038
"URLs).\n"
12039
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
12040
"sshcorp,\n"
12041
" plink or lsh.\n"
12042
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
12043
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
12044
"BZR_COLUMNS Override implicit terminal width.\n"
12045
"BZR_CONCURRENCY Number of processes that can be run concurrently "
12046
"(selftest)\n"
12047
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
12048
"'text'.\n"
12049
"BZR_PDB Control whether to launch a debugger on error.\n"
12050
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
12051
" breakin debugger.\n"
12052
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
12053
"(instead\n"
12054
" of char-based).\n"
12055
"=================== "
12056
"===========================================================\n"
12057
msgstr ""
12058
12059
11992
#: en/help_topics/eol.txt:1
12060
11993
msgid ""
12061
11994
"End of Line Conversion\n"
12363
12296
msgstr ""
12364
12297
12365
12298
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12366
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
12299
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
12367
12300
msgid "Introduced in: 2.2"
12368
12301
msgstr ""
12369
12302
12381
12314
"~~~~"
12382
12315
msgstr ""
12383
12316
12384
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12385
#: en/help_topics/hooks.txt:307
12317
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
12318
#: en/help_topics/hooks.txt:304
12386
12319
msgid "Introduced in: 1.8"
12387
12320
msgstr ""
12388
12321
12412
12345
"~~~~~~~~~~~~~~~~~~~~~~"
12413
12346
msgstr ""
12414
12347
12415
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
12348
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
12416
12349
msgid "Introduced in: 1.4"
12417
12350
msgstr ""
12418
12351
12424
12357
"uncommit will all trigger this hook."
12425
12358
msgstr ""
12426
12359
12427
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
12360
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12428
12361
msgid ""
12429
12362
"post_commit\n"
12430
12363
"~~~~~~~~~~~"
12432
12365
12433
12366
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12434
12367
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12368
#: en/help_topics/hooks.txt:145
12435
12369
msgid "Introduced in: 0.15"
12436
12370
msgstr ""
12437
12371
12536
12470
12537
12471
#: en/help_topics/hooks.txt:142
12538
12472
msgid ""
12473
"set_rh\n"
12474
"~~~~~~"
12475
msgstr ""
12476
12477
#: en/help_topics/hooks.txt:147
12478
msgid ""
12479
"Invoked whenever the revision history has been set via\n"
12480
"set_revision_history. The api signature is (branch, revision_history),\n"
12481
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12482
"for bzr to trigger, a better hook to use is\n"
12483
"Branch.post_change_branch_tip."
12484
msgstr ""
12485
12486
#: en/help_topics/hooks.txt:153
12487
msgid ""
12539
12488
"transform_fallback_location\n"
12540
12489
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12541
12490
msgstr ""
12542
12491
12543
#: en/help_topics/hooks.txt:145
12492
#: en/help_topics/hooks.txt:156
12544
12493
msgid "Introduced in: 1.9"
12545
12494
msgstr ""
12546
12495
12547
#: en/help_topics/hooks.txt:147
12496
#: en/help_topics/hooks.txt:158
12548
12497
msgid ""
12549
12498
"Called when a stacked branch is activating its fallback locations.\n"
12550
12499
"transform_fallback_location is called with (branch, url), and should\n"
12558
12507
"however undefined."
12559
12508
msgstr ""
12560
12509
12561
#: en/help_topics/hooks.txt:158
12510
#: en/help_topics/hooks.txt:169
12562
12511
msgid ""
12563
12512
"CommandHooks\n"
12564
12513
"------------"
12565
12514
msgstr ""
12566
12515
12567
#: en/help_topics/hooks.txt:161
12516
#: en/help_topics/hooks.txt:172
12568
12517
msgid ""
12569
12518
"extend_command\n"
12570
12519
"~~~~~~~~~~~~~~"
12571
12520
msgstr ""
12572
12521
12573
#: en/help_topics/hooks.txt:164
12522
#: en/help_topics/hooks.txt:175
12574
12523
msgid "Introduced in: 1.13"
12575
12524
msgstr ""
12576
12525
12577
#: en/help_topics/hooks.txt:166
12526
#: en/help_topics/hooks.txt:177
12578
12527
msgid ""
12579
12528
"Called after creating a command object to allow modifications such as\n"
12580
12529
"adding or removing options, docs etc. Called with the new\n"
12581
12530
"bzrlib.commands.Command object."
12582
12531
msgstr ""
12583
12532
12584
#: en/help_topics/hooks.txt:170
12533
#: en/help_topics/hooks.txt:181
12585
12534
msgid ""
12586
12535
"get_command\n"
12587
12536
"~~~~~~~~~~~"
12588
12537
msgstr ""
12589
12538
12590
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12591
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
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
12592
12541
msgid "Introduced in: 1.17"
12593
12542
msgstr ""
12594
12543
12595
#: en/help_topics/hooks.txt:175
12544
#: en/help_topics/hooks.txt:186
12596
12545
msgid ""
12597
12546
"Called when creating a single command. Called with (cmd_or_None,\n"
12598
12547
"command_name). get_command should either return the cmd_or_None\n"
12602
12551
"plugin_cmds.register_lazy."
12603
12552
msgstr ""
12604
12553
12605
#: en/help_topics/hooks.txt:182
12554
#: en/help_topics/hooks.txt:193
12606
12555
msgid ""
12607
12556
"get_missing_command\n"
12608
12557
"~~~~~~~~~~~~~~~~~~~"
12609
12558
msgstr ""
12610
12559
12611
#: en/help_topics/hooks.txt:187
12560
#: en/help_topics/hooks.txt:198
12612
12561
msgid ""
12613
12562
"Called when creating a single command if no command could be found.\n"
12614
12563
"Called with (command_name). get_missing_command should either return\n"
12615
12564
"None, or a Command object to be used for the command."
12616
12565
msgstr ""
12617
12566
12618
#: en/help_topics/hooks.txt:191
12567
#: en/help_topics/hooks.txt:202
12619
12568
msgid ""
12620
12569
"list_commands\n"
12621
12570
"~~~~~~~~~~~~~"
12622
12571
msgstr ""
12623
12572
12624
#: en/help_topics/hooks.txt:196
12573
#: en/help_topics/hooks.txt:207
12625
12574
msgid ""
12626
12575
"Called when enumerating commands. Called with a set of cmd_name\n"
12627
12576
"strings for all the commands found so far. This set is safe to mutate\n"
12629
12578
"set of command names."
12630
12579
msgstr ""
12631
12580
12632
#: en/help_topics/hooks.txt:201
12633
msgid ""
12634
"post_command\n"
12635
"~~~~~~~~~~~~"
12636
msgstr ""
12637
12638
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12639
msgid "Introduced in: 2.6"
12640
msgstr ""
12641
12642
#: en/help_topics/hooks.txt:206
12643
msgid "Called after executing a command. Called with the command object."
12644
msgstr ""
12645
12646
#: en/help_topics/hooks.txt:208
12647
msgid ""
12648
"pre_command\n"
12649
"~~~~~~~~~~~"
12650
msgstr ""
12651
12652
#: en/help_topics/hooks.txt:213
12653
msgid "Called prior to executing a command. Called with the command object."
12581
#: en/help_topics/hooks.txt:212
12582
msgid ""
12583
"_ConfigHooks\n"
12584
"------------"
12654
12585
msgstr ""
12655
12586
12656
12587
#: en/help_topics/hooks.txt:215
12657
12588
msgid ""
12658
"_ConfigHooks\n"
12659
"------------"
12660
msgstr ""
12661
12662
#: en/help_topics/hooks.txt:218
12663
msgid ""
12664
12589
"get\n"
12665
12590
"~~~"
12666
12591
msgstr ""
12667
12592
12668
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12669
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12670
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12671
#: en/help_topics/hooks.txt:446
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
12672
12597
msgid "Introduced in: 2.4"
12673
12598
msgstr ""
12674
12599
12600
#: en/help_topics/hooks.txt:220
12601
msgid ""
12602
"Invoked when a config option is read. The signature is (stack, name,\n"
12603
"value)."
12604
msgstr ""
12605
12675
12606
#: en/help_topics/hooks.txt:223
12676
12607
msgid ""
12677
"Invoked when a config option is read. The signature is (stack, name,\n"
12678
"value)."
12679
msgstr ""
12680
12681
#: en/help_topics/hooks.txt:226
12682
msgid ""
12683
12608
"load\n"
12684
12609
"~~~~"
12685
12610
msgstr ""
12686
12611
12687
#: en/help_topics/hooks.txt:231
12612
#: en/help_topics/hooks.txt:228
12688
12613
msgid "Invoked when a config store is loaded. The signature is (store)."
12689
12614
msgstr ""
12690
12615
12691
#: en/help_topics/hooks.txt:233
12616
#: en/help_topics/hooks.txt:230
12692
12617
msgid ""
12693
12618
"remove\n"
12694
12619
"~~~~~~"
12695
12620
msgstr ""
12696
12621
12697
#: en/help_topics/hooks.txt:238
12622
#: en/help_topics/hooks.txt:235
12698
12623
msgid ""
12699
12624
"Invoked when a config option is removed. The signature is (stack,\n"
12700
12625
"name)."
12701
12626
msgstr ""
12702
12627
12703
#: en/help_topics/hooks.txt:241
12628
#: en/help_topics/hooks.txt:238
12704
12629
msgid ""
12705
12630
"save\n"
12706
12631
"~~~~"
12707
12632
msgstr ""
12708
12633
12709
#: en/help_topics/hooks.txt:246
12634
#: en/help_topics/hooks.txt:243
12710
12635
msgid "Invoked when a config store is saved. The signature is (store)."
12711
12636
msgstr ""
12712
12637
12713
#: en/help_topics/hooks.txt:248
12638
#: en/help_topics/hooks.txt:245
12714
12639
msgid ""
12715
12640
"set\n"
12716
12641
"~~~"
12717
12642
msgstr ""
12718
12643
12644
#: en/help_topics/hooks.txt:250
12645
msgid ""
12646
"Invoked when a config option is set. The signature is (stack, name,\n"
12647
"value)."
12648
msgstr ""
12649
12719
12650
#: en/help_topics/hooks.txt:253
12720
12651
msgid ""
12721
"Invoked when a config option is set. The signature is (stack, name,\n"
12722
"value)."
12652
"ControlDirHooks\n"
12653
"---------------"
12723
12654
msgstr ""
12724
12655
12725
12656
#: en/help_topics/hooks.txt:256
12726
12657
msgid ""
12727
"ControlDirHooks\n"
12728
"---------------"
12729
msgstr ""
12730
12731
#: en/help_topics/hooks.txt:259
12732
msgid ""
12733
12658
"post_repo_init\n"
12734
12659
"~~~~~~~~~~~~~~"
12735
12660
msgstr ""
12736
12661
12737
#: en/help_topics/hooks.txt:264
12662
#: en/help_topics/hooks.txt:261
12738
12663
msgid ""
12739
12664
"Invoked after a repository has been initialized. post_repo_init is\n"
12740
12665
"called with a bzrlib.controldir.RepoInitHookParams."
12741
12666
msgstr ""
12742
12667
12668
#: en/help_topics/hooks.txt:264
12669
msgid ""
12670
"pre_open\n"
12671
"~~~~~~~~"
12672
msgstr ""
12673
12743
12674
#: en/help_topics/hooks.txt:267
12744
msgid ""
12745
"pre_open\n"
12746
"~~~~~~~~"
12747
msgstr ""
12748
12749
#: en/help_topics/hooks.txt:270
12750
12675
msgid "Introduced in: 1.14"
12751
12676
msgstr ""
12752
12677
12753
#: en/help_topics/hooks.txt:272
12678
#: en/help_topics/hooks.txt:269
12754
12679
msgid ""
12755
12680
"Invoked before attempting to open a ControlDir with the transport that\n"
12756
12681
"the open will use."
12757
12682
msgstr ""
12758
12683
12684
#: en/help_topics/hooks.txt:272
12685
msgid ""
12686
"InfoHooks\n"
12687
"---------"
12688
msgstr ""
12689
12759
12690
#: en/help_topics/hooks.txt:275
12760
12691
msgid ""
12761
"InfoHooks\n"
12762
"---------"
12763
msgstr ""
12764
12765
#: en/help_topics/hooks.txt:278
12766
msgid ""
12767
12692
"repository\n"
12768
12693
"~~~~~~~~~~"
12769
12694
msgstr ""
12770
12695
12771
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12772
#: en/help_topics/hooks.txt:524
12696
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12697
#: en/help_topics/hooks.txt:521
12773
12698
msgid "Introduced in: 1.15"
12774
12699
msgstr ""
12775
12700
12776
#: en/help_topics/hooks.txt:283
12701
#: en/help_topics/hooks.txt:280
12777
12702
msgid ""
12778
12703
"Invoked when displaying the statistics for a repository. repository is\n"
12779
12704
"called with a statistics dictionary as returned by the repository and\n"
12780
12705
"a file-like object to write to."
12781
12706
msgstr ""
12782
12707
12708
#: en/help_topics/hooks.txt:284
12709
msgid ""
12710
"LockHooks\n"
12711
"---------"
12712
msgstr ""
12713
12783
12714
#: en/help_topics/hooks.txt:287
12784
12715
msgid ""
12785
"LockHooks\n"
12786
"---------"
12787
msgstr ""
12788
12789
#: en/help_topics/hooks.txt:290
12790
msgid ""
12791
12716
"lock_acquired\n"
12792
12717
"~~~~~~~~~~~~~"
12793
12718
msgstr ""
12794
12719
12795
#: en/help_topics/hooks.txt:295
12720
#: en/help_topics/hooks.txt:292
12796
12721
msgid ""
12797
12722
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12798
12723
msgstr ""
12799
12724
12800
#: en/help_topics/hooks.txt:297
12725
#: en/help_topics/hooks.txt:294
12801
12726
msgid ""
12802
12727
"lock_broken\n"
12803
12728
"~~~~~~~~~~~"
12804
12729
msgstr ""
12805
12730
12806
#: en/help_topics/hooks.txt:302
12731
#: en/help_topics/hooks.txt:299
12807
12732
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12808
12733
msgstr ""
12809
12734
12810
#: en/help_topics/hooks.txt:304
12735
#: en/help_topics/hooks.txt:301
12811
12736
msgid ""
12812
12737
"lock_released\n"
12813
12738
"~~~~~~~~~~~~~"
12814
12739
msgstr ""
12815
12740
12816
#: en/help_topics/hooks.txt:309
12741
#: en/help_topics/hooks.txt:306
12817
12742
msgid ""
12818
12743
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12819
12744
msgstr ""
12820
12745
12746
#: en/help_topics/hooks.txt:308
12747
msgid ""
12748
"MergeHooks\n"
12749
"----------"
12750
msgstr ""
12751
12821
12752
#: en/help_topics/hooks.txt:311
12822
12753
msgid ""
12823
"MergeHooks\n"
12824
"----------"
12754
"merge_file_content\n"
12755
"~~~~~~~~~~~~~~~~~~"
12825
12756
msgstr ""
12826
12757
12827
12758
#: en/help_topics/hooks.txt:314
12828
msgid ""
12829
"merge_file_content\n"
12830
"~~~~~~~~~~~~~~~~~~"
12831
msgstr ""
12832
12833
#: en/help_topics/hooks.txt:317
12834
12759
msgid "Introduced in: 2.1"
12835
12760
msgstr ""
12836
12761
12837
#: en/help_topics/hooks.txt:319
12762
#: en/help_topics/hooks.txt:316
12838
12763
msgid ""
12839
12764
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12840
12765
"object when starting a merge. Should return either None or a subclass\n"
12844
12769
"AbstractPerFileMerger API docs for details on how it is used by merge."
12845
12770
msgstr ""
12846
12771
12847
#: en/help_topics/hooks.txt:326
12772
#: en/help_topics/hooks.txt:323
12848
12773
msgid ""
12849
12774
"post_merge\n"
12850
12775
"~~~~~~~~~~"
12851
12776
msgstr ""
12852
12777
12853
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12854
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12855
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
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
12856
12781
msgid "Introduced in: 2.5"
12857
12782
msgstr ""
12858
12783
12859
#: en/help_topics/hooks.txt:331
12784
#: en/help_topics/hooks.txt:328
12860
12785
msgid ""
12861
12786
"Called after a merge. Receives a Merger object as the single argument.\n"
12862
12787
"The return value is ignored."
12863
12788
msgstr ""
12864
12789
12865
#: en/help_topics/hooks.txt:334
12790
#: en/help_topics/hooks.txt:331
12866
12791
msgid ""
12867
12792
"pre_merge\n"
12868
12793
"~~~~~~~~~"
12869
12794
msgstr ""
12870
12795
12871
#: en/help_topics/hooks.txt:339
12796
#: en/help_topics/hooks.txt:336
12872
12797
msgid ""
12873
12798
"Called before a merge. Receives a Merger object as the single\n"
12874
12799
"argument."
12875
12800
msgstr ""
12876
12801
12802
#: en/help_topics/hooks.txt:339
12803
msgid ""
12804
"MergeDirectiveHooks\n"
12805
"-------------------"
12806
msgstr ""
12807
12877
12808
#: en/help_topics/hooks.txt:342
12878
12809
msgid ""
12879
"MergeDirectiveHooks\n"
12880
"-------------------"
12810
"merge_request_body\n"
12811
"~~~~~~~~~~~~~~~~~~"
12881
12812
msgstr ""
12882
12813
12883
12814
#: en/help_topics/hooks.txt:345
12884
msgid ""
12885
"merge_request_body\n"
12886
"~~~~~~~~~~~~~~~~~~"
12887
msgstr ""
12888
12889
#: en/help_topics/hooks.txt:348
12890
12815
msgid "Introduced in: 1.15.0"
12891
12816
msgstr ""
12892
12817
12893
#: en/help_topics/hooks.txt:350
12818
#: en/help_topics/hooks.txt:347
12894
12819
msgid ""
12895
12820
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12896
12821
"request. Callbacks must return a body. If more than one callback is\n"
12897
12822
"registered, the output of one callback is provided to the next."
12898
12823
msgstr ""
12899
12824
12825
#: en/help_topics/hooks.txt:351
12826
msgid ""
12827
"MessageEditorHooks\n"
12828
"------------------"
12829
msgstr ""
12830
12900
12831
#: en/help_topics/hooks.txt:354
12901
12832
msgid ""
12902
"MessageEditorHooks\n"
12903
"------------------"
12833
"commit_message_template\n"
12834
"~~~~~~~~~~~~~~~~~~~~~~~"
12904
12835
msgstr ""
12905
12836
12906
12837
#: en/help_topics/hooks.txt:357
12907
msgid ""
12908
"commit_message_template\n"
12909
"~~~~~~~~~~~~~~~~~~~~~~~"
12910
msgstr ""
12911
12912
#: en/help_topics/hooks.txt:360
12913
12838
msgid "Introduced in: 1.10"
12914
12839
msgstr ""
12915
12840
12916
#: en/help_topics/hooks.txt:362
12841
#: en/help_topics/hooks.txt:359
12917
12842
msgid ""
12918
12843
"Called when a commit message is being generated.\n"
12919
12844
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12924
12849
"second, and so on."
12925
12850
msgstr ""
12926
12851
12927
#: en/help_topics/hooks.txt:370
12852
#: en/help_topics/hooks.txt:367
12928
12853
msgid ""
12929
12854
"set_commit_message\n"
12930
12855
"~~~~~~~~~~~~~~~~~~"
12931
12856
msgstr ""
12932
12857
12933
#: en/help_topics/hooks.txt:375
12858
#: en/help_topics/hooks.txt:372
12934
12859
msgid ""
12935
12860
"Set a fixed commit message. set_commit_message is called with the\n"
12936
12861
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12939
12864
"should use the message editor as normal."
12940
12865
msgstr ""
12941
12866
12867
#: en/help_topics/hooks.txt:378
12868
msgid ""
12869
"MutableTreeHooks\n"
12870
"----------------"
12871
msgstr ""
12872
12942
12873
#: en/help_topics/hooks.txt:381
12943
12874
msgid ""
12944
"MutableTreeHooks\n"
12945
"----------------"
12946
msgstr ""
12947
12948
#: en/help_topics/hooks.txt:384
12949
msgid ""
12950
12875
"post_build_tree\n"
12951
12876
"~~~~~~~~~~~~~~~"
12952
12877
msgstr ""
12953
12878
12954
#: en/help_topics/hooks.txt:389
12879
#: en/help_topics/hooks.txt:386
12955
12880
msgid ""
12956
12881
"Called after a completely new tree is built. The hook is called with\n"
12957
12882
"the tree as its only argument."
12958
12883
msgstr ""
12959
12884
12960
#: en/help_topics/hooks.txt:395
12885
#: en/help_topics/hooks.txt:392
12961
12886
msgid "Introduced in: 2.0"
12962
12887
msgstr ""
12963
12888
12964
#: en/help_topics/hooks.txt:397
12889
#: en/help_topics/hooks.txt:394
12965
12890
msgid ""
12966
12891
"Called after a commit is performed on a tree. The hook is called with\n"
12967
12892
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12969
12894
"that object."
12970
12895
msgstr ""
12971
12896
12972
#: en/help_topics/hooks.txt:402
12897
#: en/help_topics/hooks.txt:399
12973
12898
msgid ""
12974
12899
"post_transform\n"
12975
12900
"~~~~~~~~~~~~~~"
12976
12901
msgstr ""
12977
12902
12978
#: en/help_topics/hooks.txt:407
12903
#: en/help_topics/hooks.txt:404
12979
12904
msgid ""
12980
12905
"Called after a tree transform has been performed on a tree. The hook\n"
12981
12906
"is called with the tree that is being transformed and the transform."
12982
12907
msgstr ""
12983
12908
12984
#: en/help_topics/hooks.txt:410
12909
#: en/help_topics/hooks.txt:407
12985
12910
msgid ""
12986
12911
"pre_transform\n"
12987
12912
"~~~~~~~~~~~~~"
12988
12913
msgstr ""
12989
12914
12990
#: en/help_topics/hooks.txt:415
12915
#: en/help_topics/hooks.txt:412
12991
12916
msgid ""
12992
12917
"Called before a tree transform on this tree. The hook is called with\n"
12993
12918
"the tree that is being transformed and the transform."
12994
12919
msgstr ""
12995
12920
12996
#: en/help_topics/hooks.txt:418
12921
#: en/help_topics/hooks.txt:415
12997
12922
msgid ""
12998
12923
"start_commit\n"
12999
12924
"~~~~~~~~~~~~"
13000
12925
msgstr ""
13001
12926
13002
#: en/help_topics/hooks.txt:423
12927
#: en/help_topics/hooks.txt:420
13003
12928
msgid ""
13004
12929
"Called before a commit is performed on a tree. The start commit hook\n"
13005
12930
"is able to change the tree before the commit takes place. start_commit\n"
13007
12932
"being performed on."
13008
12933
msgstr ""
13009
12934
12935
#: en/help_topics/hooks.txt:425
12936
msgid ""
12937
"SmartClientHooks\n"
12938
"----------------"
12939
msgstr ""
12940
13010
12941
#: en/help_topics/hooks.txt:428
13011
12942
msgid ""
13012
"SmartClientHooks\n"
13013
"----------------"
12943
"call\n"
12944
"~~~~"
13014
12945
msgstr ""
13015
12946
13016
12947
#: en/help_topics/hooks.txt:431
13017
msgid ""
13018
"call\n"
13019
"~~~~"
13020
msgstr ""
13021
13022
#: en/help_topics/hooks.txt:434
13023
12948
msgid "Introduced in: unknown"
13024
12949
msgstr ""
13025
12950
13026
#: en/help_topics/hooks.txt:436
12951
#: en/help_topics/hooks.txt:433
13027
12952
msgid ""
13028
12953
"Called when the smart client is submitting a request to the smart\n"
13029
12954
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
13030
12955
"Streaming request bodies, and responses, are not accessible."
13031
12956
msgstr ""
13032
12957
12958
#: en/help_topics/hooks.txt:437
12959
msgid ""
12960
"SmartServerHooks\n"
12961
"----------------"
12962
msgstr ""
12963
13033
12964
#: en/help_topics/hooks.txt:440
13034
12965
msgid ""
13035
"SmartServerHooks\n"
13036
"----------------"
13037
msgstr ""
13038
13039
#: en/help_topics/hooks.txt:443
13040
msgid ""
13041
12966
"server_exception\n"
13042
12967
"~~~~~~~~~~~~~~~~"
13043
12968
msgstr ""
13044
12969
13045
#: en/help_topics/hooks.txt:448
12970
#: en/help_topics/hooks.txt:445
13046
12971
msgid ""
13047
12972
"Called by the bzr server when an exception occurs. server_exception is\n"
13048
12973
"called with the sys.exc_info() tuple return true for the hook if the\n"
13050
12975
"normally."
13051
12976
msgstr ""
13052
12977
13053
#: en/help_topics/hooks.txt:453
12978
#: en/help_topics/hooks.txt:450
13054
12979
msgid ""
13055
12980
"server_started\n"
13056
12981
"~~~~~~~~~~~~~~"
13057
12982
msgstr ""
13058
12983
13059
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12984
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
13060
12985
msgid "Introduced in: 0.16"
13061
12986
msgstr ""
13062
12987
13063
#: en/help_topics/hooks.txt:458
12988
#: en/help_topics/hooks.txt:455
13064
12989
msgid ""
13065
12990
"Called by the bzr server when it starts serving a directory.\n"
13066
12991
"server_started is called with (backing urls, public url), where\n"
13069
12994
"served."
13070
12995
msgstr ""
13071
12996
13072
#: en/help_topics/hooks.txt:464
12997
#: en/help_topics/hooks.txt:461
13073
12998
msgid ""
13074
12999
"server_started_ex\n"
13075
13000
"~~~~~~~~~~~~~~~~~"
13076
13001
msgstr ""
13077
13002
13003
#: en/help_topics/hooks.txt:466
13004
msgid ""
13005
"Called by the bzr server when it starts serving a directory.\n"
13006
"server_started is called with (backing_urls, server_obj)."
13007
msgstr ""
13008
13078
13009
#: en/help_topics/hooks.txt:469
13079
13010
msgid ""
13080
"Called by the bzr server when it starts serving a directory.\n"
13081
"server_started is called with (backing_urls, server_obj)."
13082
msgstr ""
13083
13084
#: en/help_topics/hooks.txt:472
13085
msgid ""
13086
13011
"server_stopped\n"
13087
13012
"~~~~~~~~~~~~~~"
13088
13013
msgstr ""
13089
13014
13090
#: en/help_topics/hooks.txt:477
13015
#: en/help_topics/hooks.txt:474
13091
13016
msgid ""
13092
13017
"Called by the bzr server when it stops serving a directory.\n"
13093
13018
"server_stopped is called with the same parameters as the\n"
13094
13019
"server_started hook: (backing_urls, public_url)."
13095
13020
msgstr ""
13096
13021
13022
#: en/help_topics/hooks.txt:478
13023
msgid ""
13024
"StatusHooks\n"
13025
"-----------"
13026
msgstr ""
13027
13097
13028
#: en/help_topics/hooks.txt:481
13098
13029
msgid ""
13099
"StatusHooks\n"
13100
"-----------"
13101
msgstr ""
13102
13103
#: en/help_topics/hooks.txt:484
13104
msgid ""
13105
13030
"post_status\n"
13106
13031
"~~~~~~~~~~~"
13107
13032
msgstr ""
13108
13033
13109
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
13034
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
13110
13035
msgid "Introduced in: 2.3"
13111
13036
msgstr ""
13112
13037
13113
#: en/help_topics/hooks.txt:489
13038
#: en/help_topics/hooks.txt:486
13114
13039
msgid ""
13115
13040
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13116
13041
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13119
13044
"status command. to_file is the output stream for writing."
13120
13045
msgstr ""
13121
13046
13122
#: en/help_topics/hooks.txt:495
13047
#: en/help_topics/hooks.txt:492
13123
13048
msgid ""
13124
13049
"pre_status\n"
13125
13050
"~~~~~~~~~~"
13126
13051
msgstr ""
13127
13052
13128
#: en/help_topics/hooks.txt:500
13053
#: en/help_topics/hooks.txt:497
13129
13054
msgid ""
13130
13055
"Called with argument StatusHookParams before Bazaar displays the\n"
13131
13056
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13134
13059
"status command. to_file is the output stream for writing."
13135
13060
msgstr ""
13136
13061
13062
#: en/help_topics/hooks.txt:503
13063
msgid ""
13064
"TransportHooks\n"
13065
"--------------"
13066
msgstr ""
13067
13137
13068
#: en/help_topics/hooks.txt:506
13138
13069
msgid ""
13139
"TransportHooks\n"
13140
"--------------"
13141
msgstr ""
13142
13143
#: en/help_topics/hooks.txt:509
13144
msgid ""
13145
13070
"post_connect\n"
13146
13071
"~~~~~~~~~~~~"
13147
13072
msgstr ""
13148
13073
13149
#: en/help_topics/hooks.txt:514
13074
#: en/help_topics/hooks.txt:511
13150
13075
msgid ""
13151
13076
"Called after a new connection is established or a reconnect occurs.\n"
13152
13077
"The sole argument passed is either the connected transport or smart\n"
13153
13078
"medium instance."
13154
13079
msgstr ""
13155
13080
13081
#: en/help_topics/hooks.txt:515
13082
msgid ""
13083
"RioVersionInfoBuilderHooks\n"
13084
"--------------------------"
13085
msgstr ""
13086
13156
13087
#: en/help_topics/hooks.txt:518
13157
13088
msgid ""
13158
"RioVersionInfoBuilderHooks\n"
13159
"--------------------------"
13160
msgstr ""
13161
13162
#: en/help_topics/hooks.txt:521
13163
msgid ""
13164
13089
"revision\n"
13165
13090
"~~~~~~~~"
13166
13091
msgstr ""
13167
13092
13168
#: en/help_topics/hooks.txt:526
13093
#: en/help_topics/hooks.txt:523
13169
13094
msgid ""
13170
13095
"Invoked when adding information about a revision to the RIO stanza\n"
13171
13096
"that is printed. revision is called with a revision object and a RIO\n"
13937
13862
"Many commands that accept URLs also accept location aliases too.\n"
13938
13863
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13939
13864
msgstr ""
13940
13941
#~ msgid ""
13942
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
13943
#~ "delete them if they can easily be recovered using revert otherwise they\n"
13944
#~ "will be backed up (adding an extention of the form .~#~). If no options or\n"
13945
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
13946
#~ "Bazaar but missing in your tree and stop tracking them for you."
13947
#~ msgstr ""
13948
#~ "Прекращает отслеживание изменений в указанных файлах. Bazaar удалит их,\n"
13949
#~ "если их можно легко восстановить с помощью revert, иначе будут созданы\n"
13950
#~ "их резервные копии (с расширением вида .~#~). Если не указано ни опций,\n"
13951
#~ "ни параметров, Bazaar найдёт файлы, которые отслеживаются, но отсутствуют\n"
13952
#~ "в рабочем дереве и прекратит их отслеживать."
Loggerhead is a web-based interface for Breezy
Version: 2.0.1