« back to all changes in this revision
Viewing changes to po/en_GB.po
- browse files at revision 6613
- compare with another revision
- download diff
- download tarball
- view history from revision 6613
- Committer: Patch Queue Manager
- Date: 2016-01-22 08:32:00 UTC
- mfrom: (6609.2.3 106898-put-bytes-raises-TypeError)
- Revision ID: pqm@pqm.ubuntu.com-20160122083200-1mrbddrmyxim19hg
(vila) Make all transport put_bytes() raises TypeError when given unicode
strings rather than bytes (Vincent Ladeuil)
strings rather than bytes (Vincent Ladeuil)
- files added:
- NEWS
- bzrlib/branchfmt
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_bzrdir
- bzrlib/tests/per_controldir_colo
- bzrlib/tests/per_repository_vf
- po
- files removed:
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- contrib/apport/ => apport/
- contrib/apport/bzr.conf => apport/bzr-crashdb.conf
- bzrlib/sign_my_commits.py => bzrlib/commit_signature_commands.py
- bzrlib/doc_generate/sphinx_conf.py => bzrlib/doc_generate/conf.py
- bzrlib/repofmt/weaverepo.py => bzrlib/plugins/weave_fmt/repository.py
- bzrlib/xml4.py => bzrlib/plugins/weave_fmt/xml4.py
- bzrlib/tests/per_bzrdir/ => bzrlib/tests/per_controldir/
- bzrlib/tests/per_bzrdir/test_bzrdir.py => bzrlib/tests/per_controldir/test_controldir.py
- bzrlib/tests/per_repository/test_is_write_locked.py => bzrlib/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/helpers.py => bzrlib/tests/per_repository_vf/helpers.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => bzrlib/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_check_reconcile.py => bzrlib/tests/per_repository_vf/test_check_reconcile.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => bzrlib/tests/per_repository_vf/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- NEWS => doc/en/release-notes/bzr-2.3.txt
- NEWS-template.txt => doc/en/release-notes/release-template.txt
- files modified:
- .bzrignore
added
removed
po/en_GB.po
1
# English (United Kingdom) translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2012-01-17 10:28+0000\n"
12
"Last-Translator: Anthony Harrington <untaintableangel@hotmail.co.uk>\n"
13
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-07-11 04:34+0000\n"
19
"X-Generator: Launchpad (build 15593)\n"
20
21
#: bzrlib/add.py:93
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "skipping {0} (larger than {1} of {2} bytes)"
24
25
#: bzrlib/branch.py:854
26
msgid "Unstacking"
27
msgstr "Unstacking"
28
29
#: bzrlib/branch.py:2955
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "Pushed up to revision %d."
33
34
#: bzrlib/branch.py:2957
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d tag updated."
39
msgstr[1] "%d tags updated."
40
41
#: bzrlib/branch.py:2960
42
msgid "No new revisions or tags to push."
43
msgstr "No new revisions or tags to push."
44
45
#: bzrlib/branch.py:2962
46
msgid "No new revisions to push."
47
msgstr "No new revisions to push."
48
49
#: bzrlib/branch.py:2982
50
msgid "checked branch {0} format {1}"
51
msgstr "checked branch {0} format {1}"
52
53
#: bzrlib/branch.py:2985
54
#, python-format
55
msgid "found error:%s"
56
msgstr "found error:%s"
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr "Ignoring files outside view. View is %s"
62
63
#: bzrlib/builtins.py:260
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision takes exactly one revision identifier"
67
68
#: bzrlib/builtins.py:315
69
msgid "Display status summary."
70
msgstr "Display status summary."
71
72
#: bzrlib/builtins.py:317
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"This reports on versioned and unknown files, reporting them\n"
78
"grouped by state. Possible states are:"
79
80
#: bzrlib/builtins.py:320
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"added\n"
86
" Versioned in the working copy but not in the previous revision."
87
88
#: bzrlib/builtins.py:323
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"removed\n"
95
" Versioned in the previous revision but removed or deleted\n"
96
" in the working copy."
97
98
#: bzrlib/builtins.py:327
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renamed\n"
106
" Path of this file changed from the previous revision;\n"
107
" the text may also have changed. This includes files whose\n"
108
" parent directory was renamed."
109
110
#: bzrlib/builtins.py:332
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"modified\n"
116
" Text has changed since the previous revision."
117
118
#: bzrlib/builtins.py:335
119
msgid ""
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"type changed\n"
124
" File type has been changed (e.g. from file to directory)."
125
126
#: bzrlib/builtins.py:338
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"unknown\n"
132
" Not versioned and not matching an ignore pattern."
133
134
#: bzrlib/builtins.py:341
135
msgid ""
136
"Additionally for directories, symlinks and files with a changed\n"
137
"executable bit, Bazaar indicates their type using a trailing\n"
138
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
"disabled using the '--no-classify' option."
140
msgstr ""
141
"Additionally for directories, symlinks and files with a changed\n"
142
"executable bit, Bazaar indicates their type using a trailing\n"
143
"character: '/', '@' or '*' respectively. These decorations can be\n"
144
"disabled using the '--no-classify' option."
145
146
#: bzrlib/builtins.py:346
147
msgid ""
148
"To see ignored files use 'bzr ignored'. For details on the\n"
149
"changes to file texts, use 'bzr diff'."
150
msgstr ""
151
"To see ignored files, use 'bzr ignored'. For details on the\n"
152
"changes to file texts, use 'bzr diff'."
153
154
#: bzrlib/builtins.py:349
155
msgid ""
156
"Note that --short or -S gives status flags for each item, similar\n"
157
"to Subversion's status command. To get output similar to svn -q,\n"
158
"use bzr status -SV."
159
msgstr ""
160
"Note that --short or -S gives status flags for each item, similar\n"
161
"to Subversion's status command. To get output similar to svn -q,\n"
162
"use bzr status -SV."
163
164
#: bzrlib/builtins.py:353
165
msgid ""
166
"If no arguments are specified, the status of the entire working\n"
167
"directory is shown. Otherwise, only the status of the specified\n"
168
"files or directories is reported. If a directory is given, status\n"
169
"is reported for everything inside that directory."
170
msgstr ""
171
"If no arguments are specified, the status of the entire working\n"
172
"directory is shown. Otherwise, only the status of the specified\n"
173
"files or directories is reported. If a directory is given, status\n"
174
"is reported for everything inside that directory."
175
176
#: bzrlib/builtins.py:358
177
msgid ""
178
"Before merges are committed, the pending merge tip revisions are\n"
179
"shown. To see all pending merge revisions, use the -v option.\n"
180
"To skip the display of pending merge information altogether, use\n"
181
"the no-pending option or specify a file/directory."
182
msgstr ""
183
"Before merges are committed, the pending merge tip revisions are\n"
184
"shown. To see all pending merge revisions, use the -v option.\n"
185
"To skip the display of pending merge information altogether, use\n"
186
"the no-pending option or specify a file/directory."
187
188
#: bzrlib/builtins.py:363
189
msgid ""
190
"To compare the working directory to a specific revision, pass a\n"
191
"single revision to the revision argument."
192
msgstr ""
193
"To compare the working directory to a specific revision, pass a\n"
194
"single revision to the revision argument."
195
196
#: bzrlib/builtins.py:366
197
msgid ""
198
"To see which files have changed in a specific revision, or between\n"
199
"two revisions, pass a revision range to the revision argument.\n"
200
"This will produce the same results as calling 'bzr diff --summarize'."
201
msgstr ""
202
"To see which files have changed in a specific revision, or between\n"
203
"two revisions, pass a revision range to the revision argument.\n"
204
"This will produce the same results as calling 'bzr diff --summarize'."
205
206
#: bzrlib/builtins.py:375
207
msgid "Use short status indicators."
208
msgstr "Use short status indicators."
209
210
#: bzrlib/builtins.py:377
211
msgid "Only show versioned files."
212
msgstr "Only show versioned files."
213
214
#: bzrlib/builtins.py:379
215
msgid "Don't show pending merges."
216
msgstr "Don't show pending merges."
217
218
#: bzrlib/builtins.py:382
219
msgid "Do not mark object type using indicator."
220
msgstr "Do not mark object type using indicator."
221
222
#: bzrlib/builtins.py:397
223
msgid "bzr status --revision takes exactly one or two revision specifiers"
224
msgstr "bzr status --revision takes exactly one or two revision specifiers"
225
226
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
227
msgid "You can only supply one of revision_id or --revision"
228
msgstr "You can only supply one of revision_id or --revision"
229
230
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
231
msgid "You must supply either --revision or a revision_id"
232
msgstr "You must supply either --revision or a revision_id"
233
234
#: bzrlib/builtins.py:451
235
#, python-format
236
msgid "Repository %r does not support access to raw revision texts"
237
msgstr "Repository %r does not support access to raw revision texts"
238
239
#: bzrlib/builtins.py:462
240
msgid "The repository {0} contains no revision {1}."
241
msgstr "The repository {0} contains no revision {1}."
242
243
#: bzrlib/builtins.py:469
244
msgid "You cannot specify a NULL revision."
245
msgstr "You cannot specify a NULL revision."
246
247
#: bzrlib/builtins.py:561
248
msgid "Remove the working tree from a given branch/checkout."
249
msgstr "Remove the working tree from a given branch/checkout."
250
251
#: bzrlib/builtins.py:563
252
msgid ""
253
"Since a lightweight checkout is little more than a working tree\n"
254
"this will refuse to run against one."
255
msgstr ""
256
"Since a lightweight checkout is little more than a working tree,\n"
257
"this will refuse to run against one."
258
259
#: bzrlib/builtins.py:566
260
msgid "To re-create the working tree, use \"bzr checkout\"."
261
msgstr "To re-create the working tree, use \"bzr checkout\"."
262
263
#: bzrlib/builtins.py:572
264
msgid ""
265
"Remove the working tree even if it has uncommitted or shelved changes."
266
msgstr ""
267
"Remove the working tree even if it has uncommitted or shelved changes."
268
269
#: bzrlib/builtins.py:586
270
msgid "No working tree to remove"
271
msgstr "No working tree to remove"
272
273
#: bzrlib/builtins.py:588
274
msgid "You cannot remove the working tree of a remote path"
275
msgstr "You cannot remove the working tree of a remote path"
276
277
#: bzrlib/builtins.py:597
278
msgid "You cannot remove the working tree from a lightweight checkout"
279
msgstr "You cannot remove the working tree from a lightweight checkout"
280
281
#: bzrlib/builtins.py:637
282
msgid ""
283
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
284
"instead. Use \"--force\" if you are sure you want to reset the working tree."
285
msgstr ""
286
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
287
"instead. Use \"--force\" if you are sure you want to reset the working tree."
288
289
#: bzrlib/builtins.py:648
290
msgid ""
291
", the header appears corrupt, try passing -r -1 to set the state to the last "
292
"commit"
293
msgstr ""
294
", the header appears corrupt, try passing -r -1 to set the state to the last "
295
"commit"
296
297
#: bzrlib/builtins.py:652
298
msgid "failed to reset the tree state{0}"
299
msgstr "failed to reset the tree state{0}"
300
301
#: bzrlib/builtins.py:656
302
msgid "Show current revision number."
303
msgstr "Show current revision number."
304
305
#: bzrlib/builtins.py:658
306
msgid "This is equal to the number of revisions on this branch."
307
msgstr "This is equal to the number of revisions on this branch."
308
309
#: bzrlib/builtins.py:671
310
msgid "--tree and --revision can not be used together"
311
msgstr "--tree and --revision can not be used together"
312
313
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
314
msgid "Tags can only be placed on a single revision, not on a range"
315
msgstr "Tags can only be placed on a single revision, not on a range"
316
317
#: bzrlib/builtins.py:712
318
msgid "Show revno of working tree."
319
msgstr "Show revno of working tree."
320
321
#: bzrlib/builtins.py:760
322
msgid "Add specified files or directories."
323
msgstr "Add specified files or directories."
324
325
#: bzrlib/builtins.py:762
326
msgid ""
327
"In non-recursive mode, all the named items are added, regardless\n"
328
"of whether they were previously ignored. A warning is given if\n"
329
"any of the named files are already versioned."
330
msgstr ""
331
"In non-recursive mode, all the named items are added, regardless\n"
332
"of whether they were previously ignored. A warning is given if\n"
333
"any of the named files are already versioned."
334
335
#: bzrlib/builtins.py:766
336
msgid ""
337
"In recursive mode (the default), files are treated the same way\n"
338
"but the behaviour for directories is different. Directories that\n"
339
"are already versioned do not give a warning. All directories,\n"
340
"whether already versioned or not, are searched for files or\n"
341
"subdirectories that are neither versioned or ignored, and these\n"
342
"are added. This search proceeds recursively into versioned\n"
343
"directories. If no names are given '.' is assumed."
344
msgstr ""
345
346
#: bzrlib/builtins.py:774
347
msgid ""
348
"A warning will be printed when nested trees are encountered,\n"
349
"unless they are explicitly ignored."
350
msgstr ""
351
"A warning will be printed when nested trees are encountered,\n"
352
"unless they are explicitly ignored."
353
354
#: bzrlib/builtins.py:777
355
msgid ""
356
"Therefore simply saying 'bzr add' will version all files that\n"
357
"are currently unknown."
358
msgstr ""
359
"Therefore simply saying 'bzr add' will version all files that\n"
360
"are currently unknown."
361
362
#: bzrlib/builtins.py:780
363
msgid ""
364
"Adding a file whose parent directory is not versioned will\n"
365
"implicitly add the parent, and so on up to the root. This means\n"
366
"you should never need to explicitly add a directory, they'll just\n"
367
"get added when you add a file in the directory."
368
msgstr ""
369
370
#: bzrlib/builtins.py:785
371
msgid ""
372
"--dry-run will show which files would be added, but not actually\n"
373
"add them."
374
msgstr ""
375
"--dry-run will show which files would be added, but not actually\n"
376
"add them."
377
378
#: bzrlib/builtins.py:788
379
msgid ""
380
"--file-ids-from will try to use the file ids from the supplied path.\n"
381
"It looks up ids trying to find a matching parent directory with the\n"
382
"same filename, and then by pure path. This option is rarely needed\n"
383
"but can be useful when adding the same logical file into two\n"
384
"branches that will be merged later (without showing the two different\n"
385
"adds as a conflict). It is also useful when merging another project\n"
386
"into a subdirectory of this one."
387
msgstr ""
388
389
#: bzrlib/builtins.py:796
390
msgid ""
391
"Any files matching patterns in the ignore list will not be added\n"
392
"unless they are explicitly mentioned."
393
msgstr ""
394
"Any files matching patterns in the ignore list will not be added\n"
395
"unless they are explicitly mentioned."
396
397
#: bzrlib/builtins.py:799
398
msgid ""
399
"In recursive mode, files larger than the configuration option \n"
400
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
401
"to file size."
402
msgstr ""
403
"In recursive mode, files larger than the configuration option \n"
404
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
405
"to file size."
406
407
#: bzrlib/builtins.py:806
408
msgid "Don't recursively add the contents of directories."
409
msgstr "Do not recursively add the contents of directories."
410
411
#: bzrlib/builtins.py:813
412
msgid "Lookup file ids from this tree."
413
msgstr "Lookup file ids from this tree."
414
415
#: bzrlib/builtins.py:849
416
msgid "ignored {0} matching \"{1}\"\n"
417
msgstr "ignored {0} matching \"{1}\"\n"
418
419
#: bzrlib/builtins.py:854
420
msgid "Create a new versioned directory."
421
msgstr "Create a new versioned directory."
422
423
#: bzrlib/builtins.py:856
424
msgid "This is equivalent to creating the directory and then adding it."
425
msgstr "This is equivalent to creating the directory and then adding it."
426
427
#: bzrlib/builtins.py:863
428
msgid "No error if existing, make parent directories as needed."
429
msgstr "No error if existing, make parent directories as needed."
430
431
#: bzrlib/builtins.py:897
432
#, python-format
433
msgid "added %s\n"
434
msgstr "added %s\n"
435
436
#: bzrlib/builtins.py:939
437
#, python-format
438
msgid "invalid kind %r specified"
439
msgstr "invalid type %r specified"
440
441
#: bzrlib/builtins.py:976
442
msgid "Move or rename a file."
443
msgstr "Move or rename a file."
444
445
#: bzrlib/builtins.py:978
446
msgid " bzr mv SOURCE... DESTINATION"
447
msgstr " bzr mv SOURCE... DESTINATION"
448
449
#: bzrlib/builtins.py:980
450
msgid ""
451
"If the last argument is a versioned directory, all the other names\n"
452
"are moved into it. Otherwise, there must be exactly two arguments\n"
453
"and the file is changed to a new name."
454
msgstr ""
455
"If the last argument is a versioned directory, all the other names\n"
456
"are moved into it. Otherwise, there must be exactly two arguments\n"
457
"and the file is changed to a new name."
458
459
#: bzrlib/builtins.py:984
460
msgid ""
461
"If OLDNAME does not exist on the filesystem but is versioned and\n"
462
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
463
"assumes that the file has been manually moved and only updates\n"
464
"its internal inventory to reflect that change.\n"
465
"The same is valid when moving many SOURCE files to a DESTINATION."
466
msgstr ""
467
"If OLDNAME does not exist on the filesystem but is versioned and\n"
468
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
469
"assumes that the file has been manually moved and only updates\n"
470
"its internal inventory to reflect that change.\n"
471
"The same is valid when moving many SOURCE files to a DESTINATION."
472
473
#: bzrlib/builtins.py:990
474
msgid "Files cannot be moved between branches."
475
msgstr "Files cannot be moved between branches."
476
477
#: bzrlib/builtins.py:997
478
msgid ""
479
"Move only the bzr identifier of the file, because the file has already been "
480
"moved."
481
msgstr ""
482
"Move only the bzr identifier of the file, because the file has already been "
483
"moved."
484
485
#: bzrlib/builtins.py:999
486
msgid "Automatically guess renames."
487
msgstr "Automatically guess renames."
488
489
#: bzrlib/builtins.py:1000
490
msgid "Avoid making changes when guessing renames."
491
msgstr "Avoid making changes when guessing renames."
492
493
#: bzrlib/builtins.py:1009
494
msgid "--dry-run requires --auto."
495
msgstr "--dry-run requires --auto."
496
497
#: bzrlib/builtins.py:1013
498
msgid "missing file argument"
499
msgstr "missing file argument"
500
501
#: bzrlib/builtins.py:1017
502
msgid "can not move root of branch"
503
msgstr "cannot move root of branch"
504
505
#: bzrlib/builtins.py:1023
506
msgid "Only one path may be specified to --auto."
507
msgstr "Only one path may be specified to --auto."
508
509
#: bzrlib/builtins.py:1026
510
msgid "--after cannot be specified with --auto."
511
msgstr "--after cannot be specified with --auto."
512
513
#: bzrlib/builtins.py:1062
514
msgid "to mv multiple files the destination must be a versioned directory"
515
msgstr "to mv multiple files the destination must be a versioned directory"
516
517
#: bzrlib/builtins.py:1114
518
msgid "Turn this branch into a mirror of another branch."
519
msgstr "Turn this branch into a mirror of another branch."
520
521
#: bzrlib/builtins.py:1116
522
msgid ""
523
"By default, this command only works on branches that have not diverged.\n"
524
"Branches are considered diverged if the destination branch's most recent \n"
525
"commit is one that has not been merged (directly or indirectly) into the \n"
526
"parent."
527
msgstr ""
528
"By default, this command only works on branches that have not diverged.\n"
529
"Branches are considered diverged if the destination branch's most recent \n"
530
"commit is one that has not been merged (directly or indirectly) into the \n"
531
"parent."
532
533
#: bzrlib/builtins.py:1121
534
msgid ""
535
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
536
"from one into the other. Once one branch has merged, the other should\n"
537
"be able to pull it again."
538
msgstr ""
539
540
#: bzrlib/builtins.py:1125
541
msgid ""
542
"If you want to replace your local changes and just want your branch to\n"
543
"match the remote one, use pull --overwrite. This will work even if the two\n"
544
"branches have diverged."
545
msgstr ""
546
547
#: bzrlib/builtins.py:1129
548
msgid ""
549
"If there is no default location set, the first pull will set it (use\n"
550
"--no-remember to avoid setting it). After that, you can omit the\n"
551
"location to use the default. To change the default, use --remember. The\n"
552
"value will only be saved if the remote location can be accessed."
553
msgstr ""
554
555
#: bzrlib/builtins.py:1134
556
msgid ""
557
"The --verbose option will display the revisions pulled using the log_format\n"
558
"configuration option. You can use a different format by overriding it with\n"
559
"-Olog_format=<other_format>."
560
msgstr ""
561
562
#: bzrlib/builtins.py:1138
563
msgid ""
564
"Note: The location can be specified either in the form of a branch,\n"
565
"or in the form of a path to a file containing a merge directive generated\n"
566
"with bzr send."
567
msgstr ""
568
569
#: bzrlib/builtins.py:1146
570
msgid "Show logs of pulled revisions."
571
msgstr ""
572
573
#: bzrlib/builtins.py:1148
574
msgid ""
575
"Branch to pull into, rather than the one containing the working directory."
576
msgstr ""
577
578
#: bzrlib/builtins.py:1151
579
msgid ""
580
"Perform a local pull in a bound branch. Local pulls are not applied to the "
581
"master branch."
582
msgstr ""
583
584
#: bzrlib/builtins.py:1189
585
msgid "Need working tree for --show-base."
586
msgstr ""
587
588
#: bzrlib/builtins.py:1205
589
msgid "No pull location known or specified."
590
msgstr ""
591
592
#: bzrlib/builtins.py:1211
593
#, python-format
594
msgid "Using saved parent location: %s\n"
595
msgstr ""
596
597
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
598
msgid "Cannot use -r with merge directives or bundles"
599
msgstr ""
600
601
#: bzrlib/builtins.py:1261
602
msgid "Update a mirror of this branch."
603
msgstr ""
604
605
#: bzrlib/builtins.py:1263
606
msgid ""
607
"The target branch will not have its working tree populated because this\n"
608
"is both expensive, and is not supported on remote file systems."
609
msgstr ""
610
611
#: bzrlib/builtins.py:1266
612
msgid ""
613
"Some smart servers or protocols *may* put the working tree in place in\n"
614
"the future."
615
msgstr ""
616
617
#: bzrlib/builtins.py:1269
618
msgid ""
619
"This command only works on branches that have not diverged. Branches are\n"
620
"considered diverged if the destination branch's most recent commit is one\n"
621
"that has not been merged (directly or indirectly) by the source branch."
622
msgstr ""
623
624
#: bzrlib/builtins.py:1273
625
msgid ""
626
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
627
"the other branch completely, discarding its unmerged changes."
628
msgstr ""
629
630
#: bzrlib/builtins.py:1276
631
msgid ""
632
"If you want to ensure you have the different changes in the other branch,\n"
633
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
634
"After that you will be able to do a push without '--overwrite'."
635
msgstr ""
636
637
#: bzrlib/builtins.py:1280
638
msgid ""
639
"If there is no default push location set, the first push will set it (use\n"
640
"--no-remember to avoid setting it). After that, you can omit the\n"
641
"location to use the default. To change the default, use --remember. The\n"
642
"value will only be saved if the remote location can be accessed."
643
msgstr ""
644
645
#: bzrlib/builtins.py:1285
646
msgid ""
647
"The --verbose option will display the revisions pushed using the log_format\n"
648
"configuration option. You can use a different format by overriding it with\n"
649
"-Olog_format=<other_format>."
650
msgstr ""
651
652
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
653
msgid ""
654
"Branch to push from, rather than the one containing the working directory."
655
msgstr ""
656
657
#: bzrlib/builtins.py:1299
658
msgid ""
659
"By default push will fail if the target directory exists, but does not "
660
"already have a control directory. This flag will allow push to proceed."
661
msgstr ""
662
663
#: bzrlib/builtins.py:1304
664
msgid ""
665
"Create a stacked branch that references the public location of the parent "
666
"branch."
667
msgstr ""
668
669
#: bzrlib/builtins.py:1307
670
msgid ""
671
"Create a stacked branch that refers to another branch for the commit "
672
"history. Only the work not present in the referenced branch is included in "
673
"the branch created."
674
msgstr ""
675
676
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
677
msgid ""
678
"Refuse to push if there are uncommitted changes in the working tree, --no-"
679
"strict disables the check."
680
msgstr ""
681
682
#: bzrlib/builtins.py:1315
683
msgid "Don't populate the working tree, even for protocols that support it."
684
msgstr ""
685
686
#: bzrlib/builtins.py:1318
687
msgid "Overwrite tags only."
688
msgstr ""
689
690
#: bzrlib/builtins.py:1369
691
msgid "Could not determine branch to refer to."
692
msgstr ""
693
694
#: bzrlib/builtins.py:1378
695
#, python-format
696
msgid ""
697
"No push location known or specified. To push to the parent branch (at %s), "
698
"use 'bzr push :parent'."
699
msgstr ""
700
701
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
702
msgid "No push location known or specified."
703
msgstr ""
704
705
#: bzrlib/builtins.py:1388
706
#, python-format
707
msgid "Using saved push location: %s"
708
msgstr ""
709
710
#: bzrlib/builtins.py:1398
711
msgid "Create a new branch that is a copy of an existing branch."
712
msgstr ""
713
714
#: bzrlib/builtins.py:1400
715
msgid ""
716
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
717
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
718
"./bar.\n"
719
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
720
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
721
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
722
"create ./foo-bar."
723
msgstr ""
724
725
#: bzrlib/builtins.py:1407
726
msgid ""
727
"To retrieve the branch as of a particular revision, supply the --revision\n"
728
"parameter, as in \"branch foo/bar -r 5\"."
729
msgstr ""
730
731
#: bzrlib/builtins.py:1410
732
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
733
msgstr ""
734
735
#: bzrlib/builtins.py:1420
736
msgid "Create a branch without a working-tree."
737
msgstr ""
738
739
#: bzrlib/builtins.py:1422
740
msgid "Switch the checkout in the current directory to the new branch."
741
msgstr ""
742
743
#: bzrlib/builtins.py:1425
744
msgid ""
745
"Create a stacked branch referring to the source branch. The new branch will "
746
"depend on the availability of the source branch for all operations."
747
msgstr ""
748
749
#: bzrlib/builtins.py:1429
750
msgid "Do not use a shared repository, even if available."
751
msgstr ""
752
753
#: bzrlib/builtins.py:1431
754
msgid ""
755
"By default branch will fail if the target directory exists, but does not "
756
"already have a control directory. This flag will allow branch to proceed."
757
msgstr ""
758
759
#: bzrlib/builtins.py:1436
760
msgid "Bind new branch to from location."
761
msgstr ""
762
763
#: bzrlib/builtins.py:1483
764
#, python-format
765
msgid "Target directory \"%s\" already exists."
766
msgstr ""
767
768
#: bzrlib/builtins.py:1495
769
#, python-format
770
msgid "Parent of \"%s\" does not exist."
771
msgstr ""
772
773
#: bzrlib/builtins.py:1514
774
msgid "The branch {0} has no revision {1}."
775
msgstr ""
776
777
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
778
#, python-format
779
msgid "Created new stacked branch referring to %s."
780
msgstr ""
781
782
#: bzrlib/builtins.py:1533
783
#, python-format
784
msgid "Branched %d revision."
785
msgid_plural "Branched %d revisions."
786
msgstr[0] ""
787
msgstr[1] ""
788
789
#: bzrlib/builtins.py:1538
790
#, python-format
791
msgid "New branch bound to %s"
792
msgstr ""
793
794
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
795
#, python-format
796
msgid "Switched to branch: %s"
797
msgstr ""
798
799
#: bzrlib/builtins.py:1548
800
msgid "List the branches available at the current location."
801
msgstr ""
802
803
#: bzrlib/builtins.py:1550
804
msgid ""
805
"This command will print the names of all the branches at the current\n"
806
"location."
807
msgstr ""
808
809
#: bzrlib/builtins.py:1557
810
msgid ""
811
"Recursively scan for branches rather than just looking in the specified "
812
"location."
813
msgstr ""
814
815
#: bzrlib/builtins.py:1586
816
msgid "(default)"
817
msgstr ""
818
819
#: bzrlib/builtins.py:1598
820
msgid "Create a new checkout of an existing branch."
821
msgstr ""
822
823
#: bzrlib/builtins.py:1600
824
msgid ""
825
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
826
"for\n"
827
"the branch found in '.'. This is useful if you have removed the working "
828
"tree\n"
829
"or if it was never created - i.e. if you pushed the branch to its current\n"
830
"location using SFTP."
831
msgstr ""
832
833
#: bzrlib/builtins.py:1605
834
msgid ""
835
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
836
"will\n"
837
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
838
"./bar.\n"
839
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
840
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
841
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
842
"create ./foo-bar."
843
msgstr ""
844
845
#: bzrlib/builtins.py:1612
846
msgid ""
847
"To retrieve the branch as of a particular revision, supply the --revision\n"
848
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
849
"immediately\n"
850
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
851
"old\n"
852
"code.)"
853
msgstr ""
854
855
#: bzrlib/builtins.py:1622
856
msgid ""
857
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
858
"the branch for every operation. Normal checkouts can perform common "
859
"operations like diff and status without such access, and also support local "
860
"commits."
861
msgstr ""
862
863
#: bzrlib/builtins.py:1629
864
msgid "Get file contents from this tree."
865
msgstr ""
866
867
#: bzrlib/builtins.py:1631
868
msgid "Hard-link working tree files where possible."
869
msgstr ""
870
871
#: bzrlib/builtins.py:1672
872
msgid ""
873
"Show list of renamed files.\n"
874
" "
875
msgstr ""
876
877
#: bzrlib/builtins.py:1700
878
msgid "Update a working tree to a new revision."
879
msgstr ""
880
881
#: bzrlib/builtins.py:1702
882
msgid ""
883
"This will perform a merge of the destination revision (the tip of the\n"
884
"branch, or the specified revision) into the working tree, and then make\n"
885
"that revision the basis revision for the working tree. "
886
msgstr ""
887
888
#: bzrlib/builtins.py:1706
889
msgid ""
890
"You can use this to visit an older revision, or to update a working tree\n"
891
"that is out of date from its branch."
892
msgstr ""
893
894
#: bzrlib/builtins.py:1709
895
msgid ""
896
"If there are any uncommitted changes in the tree, they will be carried\n"
897
"across and remain as uncommitted changes after the update. To discard\n"
898
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
899
"with the changes brought in by the change in basis revision."
900
msgstr ""
901
902
#: bzrlib/builtins.py:1714
903
msgid ""
904
"If the tree's branch is bound to a master branch, bzr will also update\n"
905
"the branch from the master."
906
msgstr ""
907
908
#: bzrlib/builtins.py:1717
909
msgid ""
910
"You cannot update just a single file or directory, because each Bazaar\n"
911
"working tree has just a single basis revision. If you want to restore a\n"
912
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
913
"update'. If you want to restore a file to its state in a previous\n"
914
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
915
"out the old content of that file to a new location."
916
msgstr ""
917
918
#: bzrlib/builtins.py:1724
919
msgid ""
920
"The 'dir' argument, if given, must be the location of the root of a\n"
921
"working tree to update. By default, the working tree that contains the \n"
922
"current working directory is used."
923
msgstr ""
924
925
#: bzrlib/builtins.py:1740
926
msgid "bzr update --revision takes exactly one revision"
927
msgstr ""
928
929
#: bzrlib/builtins.py:1748
930
msgid "bzr update can only update a whole tree, not a file or subdirectory"
931
msgstr ""
932
933
#: bzrlib/builtins.py:1779
934
msgid "Tree is up to date at revision {0} of branch {1}"
935
msgstr ""
936
937
#: bzrlib/builtins.py:1795
938
#, python-format
939
msgid ""
940
"branch has no revision %s\n"
941
"bzr update --revision only works for a revision in the branch history"
942
msgstr ""
943
944
#: bzrlib/builtins.py:1801
945
msgid "Updated to revision {0} of branch {1}"
946
msgstr ""
947
948
#: bzrlib/builtins.py:1805
949
msgid ""
950
"Your local commits will now show as pending merges with 'bzr status', and "
951
"can be committed with 'bzr commit'."
952
msgstr ""
953
954
#: bzrlib/builtins.py:1814
955
msgid "Show information about a working tree, branch or repository."
956
msgstr ""
957
958
#: bzrlib/builtins.py:1816
959
msgid ""
960
"This command will show all known locations and formats associated to the\n"
961
"tree, branch or repository."
962
msgstr ""
963
964
#: bzrlib/builtins.py:1819
965
msgid ""
966
"In verbose mode, statistical information is included with each report.\n"
967
"To see extended statistic information, use a verbosity level of 2 or\n"
968
"higher by specifying the verbose option multiple times, e.g. -vv."
969
msgstr ""
970
971
#: bzrlib/builtins.py:1823
972
msgid "Branches and working trees will also report any missing revisions."
973
msgstr ""
974
975
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
976
#: bzrlib/builtins.py:6466
977
msgid ":Examples:"
978
msgstr ""
979
980
#: bzrlib/builtins.py:1827
981
msgid " Display information on the format and related locations:"
982
msgstr ""
983
984
#: bzrlib/builtins.py:1829
985
msgid " bzr info"
986
msgstr ""
987
988
#: bzrlib/builtins.py:1831
989
msgid ""
990
" Display the above together with extended format information and\n"
991
" basic statistics (like the number of files in the working tree and\n"
992
" number of revisions in the branch and repository):"
993
msgstr ""
994
995
#: bzrlib/builtins.py:1835
996
msgid " bzr info -v"
997
msgstr ""
998
999
#: bzrlib/builtins.py:1837
1000
msgid " Display the above together with number of committers to the branch:"
1001
msgstr ""
1002
1003
#: bzrlib/builtins.py:1839
1004
msgid " bzr info -vv"
1005
msgstr ""
1006
1007
#: bzrlib/builtins.py:1858
1008
msgid "Remove files or directories."
1009
msgstr ""
1010
1011
#: bzrlib/builtins.py:1860
1012
msgid ""
1013
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1014
"delete them if they can easily be recovered using revert otherwise they\n"
1015
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1016
"parameters are given Bazaar will scan for files that are being tracked by\n"
1017
"Bazaar but missing in your tree and stop tracking them for you."
1018
msgstr ""
1019
1020
#: bzrlib/builtins.py:1868
1021
msgid "Only remove files that have never been committed."
1022
msgstr ""
1023
1024
#: bzrlib/builtins.py:1870
1025
msgid "The file deletion mode to be used."
1026
msgstr ""
1027
1028
#: bzrlib/builtins.py:1871
1029
msgid "Deletion Strategy"
1030
msgstr ""
1031
1032
#: bzrlib/builtins.py:1872
1033
msgid "Backup changed files (default)."
1034
msgstr ""
1035
1036
#: bzrlib/builtins.py:1873
1037
msgid "Delete from bzr but leave the working copy."
1038
msgstr ""
1039
1040
#: bzrlib/builtins.py:1874
1041
msgid "Don't backup changed files."
1042
msgstr ""
1043
1044
#: bzrlib/builtins.py:1875
1045
msgid ""
1046
"Delete all the specified files, even if they can not be recovered and even "
1047
"if they are non-empty directories. (deprecated, use no-backup)"
1048
msgstr ""
1049
1050
#: bzrlib/builtins.py:1884
1051
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1052
msgstr ""
1053
1054
#: bzrlib/builtins.py:1901
1055
msgid "No matching files."
1056
msgstr ""
1057
1058
#: bzrlib/builtins.py:1962
1059
msgid "Reconcile bzr metadata in a branch."
1060
msgstr ""
1061
1062
#: bzrlib/builtins.py:1964
1063
msgid ""
1064
"This can correct data mismatches that may have been caused by\n"
1065
"previous ghost operations or bzr upgrades. You should only\n"
1066
"need to run this command if 'bzr check' or a bzr developer\n"
1067
"advises you to run it."
1068
msgstr ""
1069
1070
#: bzrlib/builtins.py:1969
1071
msgid ""
1072
"If a second branch is provided, cross-branch reconciliation is\n"
1073
"also attempted, which will check that data like the tree root\n"
1074
"id which was not present in very early bzr versions is represented\n"
1075
"correctly in both branches."
1076
msgstr ""
1077
1078
#: bzrlib/builtins.py:1974
1079
msgid ""
1080
"At the same time it is run it may recompress data resulting in\n"
1081
"a potential saving in disk space or performance gain."
1082
msgstr ""
1083
1084
#: bzrlib/builtins.py:1977
1085
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1086
msgstr ""
1087
1088
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1089
msgid ""
1090
"Format for the bzr 2.0 series.\n"
1091
"Uses group-compress storage.\n"
1092
"Provides rich roots which are a one-way transition.\n"
1093
msgstr ""
1094
1095
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1096
msgid ""
1097
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1098
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1099
msgstr ""
1100
1101
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1102
msgid "The 2a format with experimental support for colocated branches.\n"
1103
msgstr ""
1104
1105
#: bzrlib/builtins.py:2045
1106
msgid "Make a directory into a versioned branch."
1107
msgstr ""
1108
1109
#: bzrlib/builtins.py:2047
1110
msgid ""
1111
"Use this to create an empty branch, or before importing an\n"
1112
"existing project."
1113
msgstr ""
1114
1115
#: bzrlib/builtins.py:2050
1116
msgid ""
1117
"If there is a repository in a parent directory of the location, then\n"
1118
"the history of the branch will be stored in the repository. Otherwise\n"
1119
"init creates a standalone branch which carries its own history\n"
1120
"in the .bzr directory."
1121
msgstr ""
1122
1123
#: bzrlib/builtins.py:2055
1124
msgid ""
1125
"If there is already a branch at the location but it has no working tree,\n"
1126
"the tree can be populated with 'bzr checkout'."
1127
msgstr ""
1128
1129
#: bzrlib/builtins.py:2058
1130
msgid "Recipe for importing a tree of files::"
1131
msgstr ""
1132
1133
#: bzrlib/builtins.py:2060
1134
msgid ""
1135
" cd ~/project\n"
1136
" bzr init\n"
1137
" bzr add .\n"
1138
" bzr status\n"
1139
" bzr commit -m \"imported project\""
1140
msgstr ""
1141
1142
#: bzrlib/builtins.py:2071
1143
msgid ""
1144
"Create the path leading up to the branch if it does not already exist."
1145
msgstr ""
1146
1147
#: bzrlib/builtins.py:2074
1148
msgid "Specify a format for this branch. See \"help formats\"."
1149
msgstr ""
1150
1151
#: bzrlib/builtins.py:2082
1152
msgid ""
1153
"Never change revnos or the existing log. Append revisions to it only."
1154
msgstr ""
1155
1156
#: bzrlib/builtins.py:2085
1157
msgid "Create a branch without a working tree."
1158
msgstr ""
1159
1160
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1161
#, python-format
1162
msgid ""
1163
"Parent directory of %s does not exist.\n"
1164
"You may supply --create-prefix to create all leading parent directories."
1165
msgstr ""
1166
1167
#: bzrlib/builtins.py:2139
1168
msgid ""
1169
"This branch format cannot be set to append-revisions-only. Try --default."
1170
msgstr ""
1171
1172
#: bzrlib/builtins.py:2150
1173
msgid "Created a {0} (format: {1})\n"
1174
msgstr ""
1175
1176
#: bzrlib/builtins.py:2159
1177
#, python-format
1178
msgid "Using shared repository: %s\n"
1179
msgstr ""
1180
1181
#: bzrlib/builtins.py:2163
1182
msgid "Create a shared repository for branches to share storage space."
1183
msgstr ""
1184
1185
#: bzrlib/builtins.py:2165
1186
msgid ""
1187
"New branches created under the repository directory will store their\n"
1188
"revisions in the repository, not in the branch directory. For branches\n"
1189
"with shared history, this reduces the amount of storage needed and \n"
1190
"speeds up the creation of new branches."
1191
msgstr ""
1192
1193
#: bzrlib/builtins.py:2170
1194
msgid ""
1195
"If the --no-trees option is given then the branches in the repository\n"
1196
"will not have working trees by default. They will still exist as \n"
1197
"directories on disk, but they will not have separate copies of the \n"
1198
"files at a certain revision. This can be useful for repositories that\n"
1199
"store branches which are interacted with through checkouts or remote\n"
1200
"branches, such as on a server."
1201
msgstr ""
1202
1203
#: bzrlib/builtins.py:2177
1204
msgid ""
1205
":Examples:\n"
1206
" Create a shared repository holding just branches::"
1207
msgstr ""
1208
1209
#: bzrlib/builtins.py:2180
1210
msgid ""
1211
" bzr init-repo --no-trees repo\n"
1212
" bzr init repo/trunk"
1213
msgstr ""
1214
1215
#: bzrlib/builtins.py:2183
1216
msgid " Make a lightweight checkout elsewhere::"
1217
msgstr ""
1218
1219
#: bzrlib/builtins.py:2185
1220
msgid ""
1221
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1222
" cd trunk-checkout\n"
1223
" (add files here)"
1224
msgstr ""
1225
1226
#: bzrlib/builtins.py:2193
1227
msgid ""
1228
"Specify a format for this repository. See \"bzr help formats\" for details."
1229
msgstr ""
1230
1231
#: bzrlib/builtins.py:2197
1232
msgid "Repository format"
1233
msgstr ""
1234
1235
#: bzrlib/builtins.py:2199
1236
msgid "Branches in the repository will default to not having a working tree."
1237
msgstr ""
1238
1239
#: bzrlib/builtins.py:2225
1240
msgid "Show differences in the working tree, between revisions or branches."
1241
msgstr ""
1242
1243
#: bzrlib/builtins.py:2227
1244
msgid ""
1245
"If no arguments are given, all changes for the current tree are listed.\n"
1246
"If files are given, only the changes in those files are listed.\n"
1247
"Remote and multiple branches can be compared by using the --old and\n"
1248
"--new options. If not provided, the default for both is derived from\n"
1249
"the first argument, if any, or the current tree if no arguments are\n"
1250
"given."
1251
msgstr ""
1252
1253
#: bzrlib/builtins.py:2234
1254
msgid ""
1255
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1256
"produces patches suitable for \"patch -p1\"."
1257
msgstr ""
1258
1259
#: bzrlib/builtins.py:2237
1260
msgid ""
1261
"Note that when using the -r argument with a range of revisions, the\n"
1262
"differences are computed between the two specified revisions. That\n"
1263
"is, the command does not show the changes introduced by the first \n"
1264
"revision in the range. This differs from the interpretation of \n"
1265
"revision ranges used by \"bzr log\" which includes the first revision\n"
1266
"in the range."
1267
msgstr ""
1268
1269
#: bzrlib/builtins.py:2244
1270
msgid ""
1271
":Exit values:\n"
1272
" 1 - changed\n"
1273
" 2 - unrepresentable changes\n"
1274
" 3 - error\n"
1275
" 0 - no change"
1276
msgstr ""
1277
1278
#: bzrlib/builtins.py:2250
1279
msgid ""
1280
":Examples:\n"
1281
" Shows the difference in the working tree versus the last commit::"
1282
msgstr ""
1283
1284
#: bzrlib/builtins.py:2253
1285
msgid " bzr diff"
1286
msgstr ""
1287
1288
#: bzrlib/builtins.py:2255
1289
msgid " Difference between the working tree and revision 1::"
1290
msgstr ""
1291
1292
#: bzrlib/builtins.py:2257
1293
msgid " bzr diff -r1"
1294
msgstr ""
1295
1296
#: bzrlib/builtins.py:2259
1297
msgid " Difference between revision 3 and revision 1::"
1298
msgstr ""
1299
1300
#: bzrlib/builtins.py:2261
1301
msgid " bzr diff -r1..3"
1302
msgstr ""
1303
1304
#: bzrlib/builtins.py:2263
1305
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1306
msgstr ""
1307
1308
#: bzrlib/builtins.py:2265
1309
msgid " bzr diff -r1..3 xxx"
1310
msgstr ""
1311
1312
#: bzrlib/builtins.py:2267
1313
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1314
msgstr ""
1315
1316
#: bzrlib/builtins.py:2269
1317
msgid " bzr diff -c2"
1318
msgstr ""
1319
1320
#: bzrlib/builtins.py:2271
1321
msgid ""
1322
" To see the changes introduced by revision X::\n"
1323
" \n"
1324
" bzr diff -cX"
1325
msgstr ""
1326
1327
#: bzrlib/builtins.py:2275
1328
msgid ""
1329
" Note that in the case of a merge, the -c option shows the changes\n"
1330
" compared to the left hand parent. To see the changes against\n"
1331
" another parent, use::"
1332
msgstr ""
1333
1334
#: bzrlib/builtins.py:2279
1335
msgid " bzr diff -r<chosen_parent>..X"
1336
msgstr ""
1337
1338
#: bzrlib/builtins.py:2281
1339
msgid ""
1340
" The changes between the current revision and the previous revision\n"
1341
" (equivalent to -c-1 and -r-2..-1)"
1342
msgstr ""
1343
1344
#: bzrlib/builtins.py:2284
1345
msgid " bzr diff -r-2.."
1346
msgstr ""
1347
1348
#: bzrlib/builtins.py:2286
1349
msgid " Show just the differences for file NEWS::"
1350
msgstr ""
1351
1352
#: bzrlib/builtins.py:2288
1353
msgid " bzr diff NEWS"
1354
msgstr ""
1355
1356
#: bzrlib/builtins.py:2290
1357
msgid " Show the differences in working tree xxx for file NEWS::"
1358
msgstr ""
1359
1360
#: bzrlib/builtins.py:2292
1361
msgid " bzr diff xxx/NEWS"
1362
msgstr ""
1363
1364
#: bzrlib/builtins.py:2294
1365
msgid " Show the differences from branch xxx to this working tree:"
1366
msgstr ""
1367
1368
#: bzrlib/builtins.py:2296
1369
msgid " bzr diff --old xxx"
1370
msgstr ""
1371
1372
#: bzrlib/builtins.py:2298
1373
msgid " Show the differences between two branches for file NEWS::"
1374
msgstr ""
1375
1376
#: bzrlib/builtins.py:2300
1377
msgid " bzr diff --old xxx --new yyy NEWS"
1378
msgstr ""
1379
1380
#: bzrlib/builtins.py:2302
1381
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1382
msgstr ""
1383
1384
#: bzrlib/builtins.py:2304
1385
msgid ""
1386
" bzr diff --prefix old/:new/\n"
1387
" \n"
1388
" Show the differences using a custom diff program with options::\n"
1389
" \n"
1390
" bzr diff --using /usr/bin/diff --diff-options -wu"
1391
msgstr ""
1392
1393
#: bzrlib/builtins.py:2314
1394
msgid "Pass these options to the external diff program."
1395
msgstr ""
1396
1397
#: bzrlib/builtins.py:2317
1398
msgid ""
1399
"Set prefixes added to old and new filenames, as two values separated by a "
1400
"colon. (eg \"old/:new/\")."
1401
msgstr ""
1402
1403
#: bzrlib/builtins.py:2320
1404
msgid "Branch/tree to compare from."
1405
msgstr ""
1406
1407
#: bzrlib/builtins.py:2324
1408
msgid "Branch/tree to compare to."
1409
msgstr ""
1410
1411
#: bzrlib/builtins.py:2330
1412
msgid "Use this command to compare files."
1413
msgstr ""
1414
1415
#: bzrlib/builtins.py:2335
1416
msgid "Diff format to use."
1417
msgstr ""
1418
1419
#: bzrlib/builtins.py:2337
1420
msgid "Diff format"
1421
msgstr ""
1422
1423
#: bzrlib/builtins.py:2359
1424
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1425
msgstr ""
1426
1427
#: bzrlib/builtins.py:2363
1428
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1429
msgstr ""
1430
1431
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1432
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1433
msgid "{0} and {1} are mutually exclusive"
1434
msgstr ""
1435
1436
#: bzrlib/builtins.py:2388
1437
msgid ""
1438
"List files deleted in the working tree.\n"
1439
" "
1440
msgstr ""
1441
1442
#: bzrlib/builtins.py:2465
1443
msgid "Show the tree root directory."
1444
msgstr ""
1445
1446
#: bzrlib/builtins.py:2467
1447
msgid ""
1448
"The root is the nearest enclosing directory with a .bzr control\n"
1449
"directory."
1450
msgstr ""
1451
1452
#: bzrlib/builtins.py:2482
1453
msgid "The limit argument must be an integer."
1454
msgstr ""
1455
1456
#: bzrlib/builtins.py:2490
1457
msgid "The levels argument must be an integer."
1458
msgstr ""
1459
1460
#: bzrlib/builtins.py:2495
1461
msgid "Show historical log for a branch or subset of a branch."
1462
msgstr ""
1463
1464
#: bzrlib/builtins.py:2497
1465
msgid ""
1466
"log is bzr's default tool for exploring the history of a branch.\n"
1467
"The branch to use is taken from the first parameter. If no parameters\n"
1468
"are given, the branch containing the working directory is logged.\n"
1469
"Here are some simple examples::"
1470
msgstr ""
1471
1472
#: bzrlib/builtins.py:2502
1473
msgid ""
1474
" bzr log log the current branch\n"
1475
" bzr log foo.py log a file in its branch\n"
1476
" bzr log http://server/branch log a branch on a server"
1477
msgstr ""
1478
1479
#: bzrlib/builtins.py:2506
1480
msgid ""
1481
"The filtering, ordering and information shown for each revision can\n"
1482
"be controlled as explained below. By default, all revisions are\n"
1483
"shown sorted (topologically) so that newer revisions appear before\n"
1484
"older ones and descendants always appear before ancestors. If displayed,\n"
1485
"merged revisions are shown indented under the revision in which they\n"
1486
"were merged."
1487
msgstr ""
1488
1489
#: bzrlib/builtins.py:2513
1490
msgid ":Output control:"
1491
msgstr ""
1492
1493
#: bzrlib/builtins.py:2515
1494
msgid ""
1495
" The log format controls how information about each revision is\n"
1496
" displayed. The standard log formats are called ``long``, ``short``\n"
1497
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1498
" for more details on log formats."
1499
msgstr ""
1500
1501
#: bzrlib/builtins.py:2520
1502
msgid ""
1503
" The following options can be used to control what information is\n"
1504
" displayed::"
1505
msgstr ""
1506
1507
#: bzrlib/builtins.py:2523
1508
msgid ""
1509
" -l N display a maximum of N revisions\n"
1510
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1511
" -v display a status summary (delta) for each revision\n"
1512
" -p display a diff (patch) for each revision\n"
1513
" --show-ids display revision-ids (and file-ids), not just revnos"
1514
msgstr ""
1515
1516
#: bzrlib/builtins.py:2529
1517
msgid ""
1518
" Note that the default number of levels to display is a function of the\n"
1519
" log format. If the -n option is not used, the standard log formats show\n"
1520
" just the top level (mainline)."
1521
msgstr ""
1522
1523
#: bzrlib/builtins.py:2533
1524
msgid ""
1525
" Status summaries are shown using status flags like A, M, etc. To see\n"
1526
" the changes explained using words like ``added`` and ``modified``\n"
1527
" instead, use the -vv option."
1528
msgstr ""
1529
1530
#: bzrlib/builtins.py:2537
1531
msgid ":Ordering control:"
1532
msgstr ""
1533
1534
#: bzrlib/builtins.py:2539
1535
msgid ""
1536
" To display revisions from oldest to newest, use the --forward option.\n"
1537
" In most cases, using this option will have little impact on the total\n"
1538
" time taken to produce a log, though --forward does not incrementally\n"
1539
" display revisions like --reverse does when it can."
1540
msgstr ""
1541
1542
#: bzrlib/builtins.py:2544
1543
msgid ":Revision filtering:"
1544
msgstr ""
1545
1546
#: bzrlib/builtins.py:2546
1547
msgid ""
1548
" The -r option can be used to specify what revision or range of revisions\n"
1549
" to filter against. The various forms are shown below::"
1550
msgstr ""
1551
1552
#: bzrlib/builtins.py:2549
1553
msgid ""
1554
" -rX display revision X\n"
1555
" -rX.. display revision X and later\n"
1556
" -r..Y display up to and including revision Y\n"
1557
" -rX..Y display from X to Y inclusive"
1558
msgstr ""
1559
1560
#: bzrlib/builtins.py:2554
1561
msgid ""
1562
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1563
" Some common examples are given below::"
1564
msgstr ""
1565
1566
#: bzrlib/builtins.py:2557
1567
msgid ""
1568
" -r-1 show just the tip\n"
1569
" -r-10.. show the last 10 mainline revisions\n"
1570
" -rsubmit:.. show what's new on this branch\n"
1571
" -rancestor:path.. show changes since the common ancestor of this\n"
1572
" branch and the one at location path\n"
1573
" -rdate:yesterday.. show changes since yesterday"
1574
msgstr ""
1575
1576
#: bzrlib/builtins.py:2564
1577
msgid ""
1578
" When logging a range of revisions using -rX..Y, log starts at\n"
1579
" revision Y and searches back in history through the primary\n"
1580
" (\"left-hand\") parents until it finds X. When logging just the\n"
1581
" top level (using -n1), an error is reported if X is not found\n"
1582
" along the way. If multi-level logging is used (-n0), X may be\n"
1583
" a nested merge revision and the log will be truncated accordingly."
1584
msgstr ""
1585
1586
#: bzrlib/builtins.py:2571
1587
msgid ":Path filtering:"
1588
msgstr ""
1589
1590
#: bzrlib/builtins.py:2573
1591
msgid ""
1592
" If parameters are given and the first one is not a branch, the log\n"
1593
" will be filtered to show only those revisions that changed the\n"
1594
" nominated files or directories."
1595
msgstr ""
1596
1597
#: bzrlib/builtins.py:2577
1598
msgid ""
1599
" Filenames are interpreted within their historical context. To log a\n"
1600
" deleted file, specify a revision range so that the file existed at\n"
1601
" the end or start of the range."
1602
msgstr ""
1603
1604
#: bzrlib/builtins.py:2581
1605
msgid ""
1606
" Historical context is also important when interpreting pathnames of\n"
1607
" renamed files/directories. Consider the following example:"
1608
msgstr ""
1609
1610
#: bzrlib/builtins.py:2584
1611
msgid ""
1612
" * revision 1: add tutorial.txt\n"
1613
" * revision 2: modify tutorial.txt\n"
1614
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1615
msgstr ""
1616
1617
#: bzrlib/builtins.py:2588
1618
msgid " In this case:"
1619
msgstr ""
1620
1621
#: bzrlib/builtins.py:2590
1622
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1623
msgstr ""
1624
1625
#: bzrlib/builtins.py:2592
1626
msgid ""
1627
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1628
msgstr ""
1629
1630
#: bzrlib/builtins.py:2594
1631
msgid ""
1632
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1633
" the original file in revision 2."
1634
msgstr ""
1635
1636
#: bzrlib/builtins.py:2597
1637
msgid ""
1638
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1639
" was no file called guide.txt in revision 2."
1640
msgstr ""
1641
1642
#: bzrlib/builtins.py:2600
1643
msgid ""
1644
" Renames are always followed by log. By design, there is no need to\n"
1645
" explicitly ask for this (and no way to stop logging a file back\n"
1646
" until it was last renamed)."
1647
msgstr ""
1648
1649
#: bzrlib/builtins.py:2604
1650
msgid ":Other filtering:"
1651
msgstr ""
1652
1653
#: bzrlib/builtins.py:2606
1654
msgid ""
1655
" The --match option can be used for finding revisions that match a\n"
1656
" regular expression in a commit message, committer, author or bug.\n"
1657
" Specifying the option several times will match any of the supplied\n"
1658
" expressions. --match-author, --match-bugs, --match-committer and\n"
1659
" --match-message can be used to only match a specific field."
1660
msgstr ""
1661
1662
#: bzrlib/builtins.py:2612
1663
msgid ":Tips & tricks:"
1664
msgstr ""
1665
1666
#: bzrlib/builtins.py:2614
1667
msgid ""
1668
" GUI tools and IDEs are often better at exploring history than command\n"
1669
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1670
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1671
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1672
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1673
msgstr ""
1674
1675
#: bzrlib/builtins.py:2620
1676
msgid ""
1677
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1678
msgstr ""
1679
1680
#: bzrlib/builtins.py:2622
1681
msgid ""
1682
" [ALIASES]\n"
1683
" tip = log -r-1\n"
1684
" top = log -l10 --line\n"
1685
" show = log -v -p"
1686
msgstr ""
1687
1688
#: bzrlib/builtins.py:2627
1689
msgid ""
1690
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1691
" will show the last 10 mainline revisions. To see the details of a\n"
1692
" particular revision X, ``bzr show -rX``."
1693
msgstr ""
1694
1695
#: bzrlib/builtins.py:2631
1696
msgid ""
1697
" If you are interested in looking deeper into a particular merge X,\n"
1698
" use ``bzr log -n0 -rX``."
1699
msgstr ""
1700
1701
#: bzrlib/builtins.py:2634
1702
msgid ""
1703
" ``bzr log -v`` on a branch with lots of history is currently\n"
1704
" very slow. A fix for this issue is currently under development.\n"
1705
" With or without that fix, it is recommended that a revision range\n"
1706
" be given when using the -v option."
1707
msgstr ""
1708
1709
#: bzrlib/builtins.py:2639
1710
msgid ""
1711
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1712
" used to find revisions matching user names, commit messages, etc.\n"
1713
" Among other features, this plugin can find all revisions containing\n"
1714
" a list of words but not others."
1715
msgstr ""
1716
1717
#: bzrlib/builtins.py:2644
1718
msgid ""
1719
" When exploring non-mainline history on large projects with deep\n"
1720
" history, the performance of log can be greatly improved by installing\n"
1721
" the historycache plugin. This plugin buffers historical information\n"
1722
" trading disk space for faster speed."
1723
msgstr ""
1724
1725
#: bzrlib/builtins.py:2653
1726
msgid "Show from oldest to newest."
1727
msgstr ""
1728
1729
#: bzrlib/builtins.py:2656
1730
msgid "Show files changed in each revision."
1731
msgstr ""
1732
1733
#: bzrlib/builtins.py:2662
1734
msgid "Show just the specified revision. See also \"help revisionspec\"."
1735
msgstr ""
1736
1737
#: bzrlib/builtins.py:2666
1738
msgid "What names to list as authors - first, all or committer."
1739
msgstr ""
1740
1741
#: bzrlib/builtins.py:2667
1742
msgid "Authors"
1743
msgstr ""
1744
1745
#: bzrlib/builtins.py:2672
1746
msgid "Number of levels to display - 0 for all, 1 for flat."
1747
msgstr ""
1748
1749
#: bzrlib/builtins.py:2682
1750
msgid "Limit the output to the first N revisions."
1751
msgstr ""
1752
1753
#: bzrlib/builtins.py:2687
1754
msgid "Show changes made in each revision as a patch."
1755
msgstr ""
1756
1757
#: bzrlib/builtins.py:2689
1758
msgid "Show merged revisions like --levels 0 does."
1759
msgstr ""
1760
1761
#: bzrlib/builtins.py:2693
1762
msgid "Do not report commits with more than one parent."
1763
msgstr ""
1764
1765
#: bzrlib/builtins.py:2695
1766
msgid ""
1767
"Display only the revisions that are not part of both ancestries (require -"
1768
"rX..Y)."
1769
msgstr ""
1770
1771
#: bzrlib/builtins.py:2699
1772
msgid "Show digital signature validity."
1773
msgstr ""
1774
1775
#: bzrlib/builtins.py:2702
1776
msgid "Show revisions whose properties match this expression."
1777
msgstr ""
1778
1779
#: bzrlib/builtins.py:2706
1780
msgid "Show revisions whose message matches this expression."
1781
msgstr ""
1782
1783
#: bzrlib/builtins.py:2710
1784
msgid "Show revisions whose committer matches this expression."
1785
msgstr ""
1786
1787
#: bzrlib/builtins.py:2714
1788
msgid "Show revisions whose authors match this expression."
1789
msgstr ""
1790
1791
#: bzrlib/builtins.py:2718
1792
msgid "Show revisions whose bugs match this expression."
1793
msgstr ""
1794
1795
#: bzrlib/builtins.py:2772
1796
msgid "--exclude-common-ancestry requires -r with two revisions"
1797
msgstr ""
1798
1799
#: bzrlib/builtins.py:2800
1800
#, python-format
1801
msgid "Path unknown at end or start of revision range: %s"
1802
msgstr ""
1803
1804
#: bzrlib/builtins.py:2917
1805
#, python-format
1806
msgid "bzr %s doesn't accept two revisions in different branches."
1807
msgstr ""
1808
1809
#: bzrlib/builtins.py:2933
1810
#, python-format
1811
msgid "bzr %s --revision takes one or two values."
1812
msgstr ""
1813
1814
#: bzrlib/builtins.py:2978
1815
msgid ""
1816
"List files in a tree.\n"
1817
" "
1818
msgstr ""
1819
1820
#: bzrlib/builtins.py:2987
1821
msgid "Recurse into subdirectories."
1822
msgstr ""
1823
1824
#: bzrlib/builtins.py:2989
1825
msgid "Print paths relative to the root of the branch."
1826
msgstr ""
1827
1828
#: bzrlib/builtins.py:2991
1829
msgid "Print unknown files."
1830
msgstr ""
1831
1832
#: bzrlib/builtins.py:2992
1833
msgid "Print versioned files."
1834
msgstr ""
1835
1836
#: bzrlib/builtins.py:2995
1837
msgid "Print ignored files."
1838
msgstr ""
1839
1840
#: bzrlib/builtins.py:2997
1841
msgid "List entries of a particular kind: file, directory, symlink."
1842
msgstr "List entries of a particular type: file, directory, symlink."
1843
1844
#: bzrlib/builtins.py:3010
1845
msgid "invalid kind specified"
1846
msgstr "invalid type specified"
1847
1848
#: bzrlib/builtins.py:3013
1849
msgid "Cannot set both --verbose and --null"
1850
msgstr ""
1851
1852
#: bzrlib/builtins.py:3022
1853
msgid "cannot specify both --from-root and PATH"
1854
msgstr ""
1855
1856
#: bzrlib/builtins.py:3109
1857
msgid "Ignore specified files or patterns."
1858
msgstr ""
1859
1860
#: bzrlib/builtins.py:3111
1861
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1862
msgstr ""
1863
1864
#: bzrlib/builtins.py:3113
1865
msgid ""
1866
"If a .bzrignore file does not exist, the ignore command\n"
1867
"will create one and add the specified files or patterns to the newly\n"
1868
"created file. The ignore command will also automatically add the \n"
1869
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1870
"the use of the ignore command will require an explicit add command."
1871
msgstr ""
1872
1873
#: bzrlib/builtins.py:3119
1874
msgid ""
1875
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1876
"After adding, editing or deleting that file either indirectly by\n"
1877
"using this command or directly by using an editor, be sure to commit\n"
1878
"it."
1879
msgstr ""
1880
1881
#: bzrlib/builtins.py:3124
1882
msgid ""
1883
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1884
"the global ignore file can be found in the application data directory as\n"
1885
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1886
"Global ignores are not touched by this command. The global ignore file\n"
1887
"can be edited directly using an editor."
1888
msgstr ""
1889
1890
#: bzrlib/builtins.py:3130
1891
msgid ""
1892
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1893
"precedence over regular ignores. Such exceptions are used to specify\n"
1894
"files that should be versioned which would otherwise be ignored."
1895
msgstr ""
1896
1897
#: bzrlib/builtins.py:3134
1898
msgid ""
1899
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1900
"precedence over the '!' exception patterns."
1901
msgstr ""
1902
1903
#: bzrlib/builtins.py:3137
1904
msgid ""
1905
":Notes: \n"
1906
" \n"
1907
"* Ignore patterns containing shell wildcards must be quoted from\n"
1908
" the shell on Unix."
1909
msgstr ""
1910
1911
#: bzrlib/builtins.py:3142
1912
msgid ""
1913
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1914
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1915
msgstr ""
1916
1917
#: bzrlib/builtins.py:3145
1918
msgid ""
1919
":Examples:\n"
1920
" Ignore the top level Makefile::"
1921
msgstr ""
1922
1923
#: bzrlib/builtins.py:3148
1924
msgid " bzr ignore ./Makefile"
1925
msgstr ""
1926
1927
#: bzrlib/builtins.py:3150
1928
msgid " Ignore .class files in all directories...::"
1929
msgstr ""
1930
1931
#: bzrlib/builtins.py:3152
1932
msgid " bzr ignore \"*.class\""
1933
msgstr ""
1934
1935
#: bzrlib/builtins.py:3154
1936
msgid " ...but do not ignore \"special.class\"::"
1937
msgstr ""
1938
1939
#: bzrlib/builtins.py:3156
1940
msgid " bzr ignore \"!special.class\""
1941
msgstr ""
1942
1943
#: bzrlib/builtins.py:3158
1944
msgid " Ignore files whose name begins with the \"#\" character::"
1945
msgstr ""
1946
1947
#: bzrlib/builtins.py:3160
1948
msgid " bzr ignore \"RE:^#\""
1949
msgstr ""
1950
1951
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1952
msgid " Ignore .o files under the lib directory::"
1953
msgstr ""
1954
1955
#: bzrlib/builtins.py:3164
1956
msgid " bzr ignore \"lib/**/*.o\""
1957
msgstr ""
1958
1959
#: bzrlib/builtins.py:3168
1960
msgid " bzr ignore \"RE:lib/.*\\.o\""
1961
msgstr ""
1962
1963
#: bzrlib/builtins.py:3170
1964
msgid " Ignore everything but the \"debian\" toplevel directory::"
1965
msgstr ""
1966
1967
#: bzrlib/builtins.py:3172
1968
msgid ""
1969
" bzr ignore \"RE:(?!debian/).*\"\n"
1970
" \n"
1971
" Ignore everything except the \"local\" toplevel directory,\n"
1972
" but always ignore autosave files ending in ~, even under local/::\n"
1973
" \n"
1974
" bzr ignore \"*\"\n"
1975
" bzr ignore \"!./local\"\n"
1976
" bzr ignore \"!!*~\""
1977
msgstr ""
1978
1979
#: bzrlib/builtins.py:3186
1980
msgid "Display the default ignore rules that bzr uses."
1981
msgstr ""
1982
1983
#: bzrlib/builtins.py:3198
1984
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1985
msgstr ""
1986
1987
#: bzrlib/builtins.py:3209
1988
#, python-format
1989
msgid "Invalid ignore pattern found. %s"
1990
msgid_plural "Invalid ignore patterns found. %s"
1991
msgstr[0] ""
1992
msgstr[1] ""
1993
1994
#: bzrlib/builtins.py:3218
1995
msgid "NAME_PATTERN should not be an absolute path"
1996
msgstr ""
1997
1998
#: bzrlib/builtins.py:3231
1999
#, python-format
2000
msgid ""
2001
"Warning: the following files are version controlled and match your ignore "
2002
"pattern:\n"
2003
"%s\n"
2004
"These files will continue to be version controlled unless you 'bzr remove' "
2005
"them.\n"
2006
msgstr ""
2007
2008
#: bzrlib/builtins.py:3238
2009
msgid "List ignored files and the patterns that matched them."
2010
msgstr ""
2011
2012
#: bzrlib/builtins.py:3240
2013
msgid ""
2014
"List all the ignored files and the ignore pattern that caused the file to\n"
2015
"be ignored."
2016
msgstr ""
2017
2018
#: bzrlib/builtins.py:3243
2019
msgid "Alternatively, to list just the files::"
2020
msgstr ""
2021
2022
#: bzrlib/builtins.py:3245
2023
msgid " bzr ls --ignored"
2024
msgstr ""
2025
2026
#: bzrlib/builtins.py:3279
2027
#, python-format
2028
msgid "not a valid revision-number: %r"
2029
msgstr ""
2030
2031
#: bzrlib/builtins.py:3286
2032
msgid ""
2033
"Export current or past revision to a destination directory or archive."
2034
msgstr ""
2035
2036
#: bzrlib/builtins.py:3288
2037
msgid "If no revision is specified this exports the last committed revision."
2038
msgstr ""
2039
2040
#: bzrlib/builtins.py:3290
2041
msgid ""
2042
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2043
"given, try to find the format with the extension. If no extension\n"
2044
"is found exports to a directory (equivalent to --format=dir)."
2045
msgstr ""
2046
2047
#: bzrlib/builtins.py:3294
2048
msgid ""
2049
"If root is supplied, it will be used as the root directory inside\n"
2050
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2051
"to the exported filename. The root option has no effect for 'dir' format."
2052
msgstr ""
2053
2054
#: bzrlib/builtins.py:3298
2055
msgid ""
2056
"If branch is omitted then the branch containing the current working\n"
2057
"directory will be used."
2058
msgstr ""
2059
2060
#: bzrlib/builtins.py:3301
2061
msgid ""
2062
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2063
msgstr ""
2064
2065
#: bzrlib/builtins.py:3303
2066
msgid ""
2067
" ================= =========================\n"
2068
" Supported formats Autodetected by extension\n"
2069
" ================= =========================\n"
2070
" dir (none)\n"
2071
" tar .tar\n"
2072
" tbz2 .tar.bz2, .tbz2\n"
2073
" tgz .tar.gz, .tgz\n"
2074
" zip .zip\n"
2075
" ================= ========================="
2076
msgstr ""
2077
2078
#: bzrlib/builtins.py:3317
2079
msgid "Type of file to export to."
2080
msgstr ""
2081
2082
#: bzrlib/builtins.py:3320
2083
msgid "Apply content filters to export the convenient form."
2084
msgstr ""
2085
2086
#: bzrlib/builtins.py:3324
2087
msgid "Name of the root directory inside the exported file."
2088
msgstr ""
2089
2090
#: bzrlib/builtins.py:3326
2091
msgid ""
2092
"Set modification time of files to that of the last revision in which it was "
2093
"changed."
2094
msgstr ""
2095
2096
#: bzrlib/builtins.py:3329
2097
msgid ""
2098
"Export the working tree contents rather than that of the last revision."
2099
msgstr ""
2100
2101
#: bzrlib/builtins.py:3348
2102
msgid "--uncommitted requires a working tree"
2103
msgstr ""
2104
2105
#: bzrlib/builtins.py:3357
2106
#, python-format
2107
msgid "Unsupported export format: %s"
2108
msgstr ""
2109
2110
#: bzrlib/builtins.py:3361
2111
msgid ""
2112
"Write the contents of a file as of a given revision to standard output."
2113
msgstr ""
2114
2115
#: bzrlib/builtins.py:3363
2116
msgid "If no revision is nominated, the last revision is used."
2117
msgstr ""
2118
2119
#: bzrlib/builtins.py:3365
2120
msgid ""
2121
"Note: Take care to redirect standard output when using this command on a\n"
2122
"binary file."
2123
msgstr ""
2124
2125
#: bzrlib/builtins.py:3371
2126
msgid "The path name in the old tree."
2127
msgstr ""
2128
2129
#: bzrlib/builtins.py:3372
2130
msgid "Apply content filters to display the convenience form."
2131
msgstr ""
2132
2133
#: bzrlib/builtins.py:3383
2134
msgid "bzr cat --revision takes exactly one revision specifier"
2135
msgstr ""
2136
2137
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2138
msgid "{0!r} is not present in revision {1}"
2139
msgstr ""
2140
2141
#: bzrlib/builtins.py:3443
2142
msgid "Commit changes into a new revision."
2143
msgstr ""
2144
2145
#: bzrlib/builtins.py:3445
2146
msgid ""
2147
"An explanatory message needs to be given for each commit. This is\n"
2148
"often done by using the --message option (getting the message from the\n"
2149
"command line) or by using the --file option (getting the message from\n"
2150
"a file). If neither of these options is given, an editor is opened for\n"
2151
"the user to enter the message. To see the changed files in the\n"
2152
"boilerplate text loaded into the editor, use the --show-diff option."
2153
msgstr ""
2154
2155
#: bzrlib/builtins.py:3452
2156
msgid ""
2157
"By default, the entire tree is committed and the person doing the\n"
2158
"commit is assumed to be the author. These defaults can be overridden\n"
2159
"as explained below."
2160
msgstr ""
2161
2162
#: bzrlib/builtins.py:3456
2163
msgid ":Selective commits:"
2164
msgstr ""
2165
2166
#: bzrlib/builtins.py:3458
2167
msgid ""
2168
" If selected files are specified, only changes to those files are\n"
2169
" committed. If a directory is specified then the directory and\n"
2170
" everything within it is committed."
2171
msgstr ""
2172
2173
#: bzrlib/builtins.py:3462
2174
msgid ""
2175
" When excludes are given, they take precedence over selected files.\n"
2176
" For example, to commit only changes within foo, but not changes\n"
2177
" within foo/bar::"
2178
msgstr ""
2179
2180
#: bzrlib/builtins.py:3466
2181
msgid " bzr commit foo -x foo/bar"
2182
msgstr ""
2183
2184
#: bzrlib/builtins.py:3468
2185
msgid " A selective commit after a merge is not yet supported."
2186
msgstr ""
2187
2188
#: bzrlib/builtins.py:3470
2189
msgid ":Custom authors:"
2190
msgstr ""
2191
2192
#: bzrlib/builtins.py:3472
2193
msgid ""
2194
" If the author of the change is not the same person as the committer,\n"
2195
" you can specify the author's name using the --author option. The\n"
2196
" name should be in the same format as a committer-id, e.g.\n"
2197
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2198
" the change you can specify the option multiple times, once for each\n"
2199
" author."
2200
msgstr ""
2201
2202
#: bzrlib/builtins.py:3479
2203
msgid ":Checks:"
2204
msgstr ""
2205
2206
#: bzrlib/builtins.py:3481
2207
msgid ""
2208
" A common mistake is to forget to add a new file or directory before\n"
2209
" running the commit command. The --strict option checks for unknown\n"
2210
" files and aborts the commit if any are found. More advanced pre-commit\n"
2211
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2212
" for details."
2213
msgstr ""
2214
2215
#: bzrlib/builtins.py:3487
2216
msgid ":Things to note:"
2217
msgstr ""
2218
2219
#: bzrlib/builtins.py:3489
2220
msgid ""
2221
" If you accidentially commit the wrong changes or make a spelling\n"
2222
" mistake in the commit message say, you can use the uncommit command\n"
2223
" to undo it. See ``bzr help uncommit`` for details."
2224
msgstr ""
2225
2226
#: bzrlib/builtins.py:3493
2227
msgid ""
2228
" Hooks can also be configured to run after a commit. This allows you\n"
2229
" to trigger updates to external systems like bug trackers. The --fixes\n"
2230
" option can be used to record the association between a revision and\n"
2231
" one or more bugs. See ``bzr help bugs`` for details."
2232
msgstr ""
2233
2234
#: bzrlib/builtins.py:3503
2235
msgid "Do not consider changes made to a given path."
2236
msgstr ""
2237
2238
#: bzrlib/builtins.py:3506
2239
msgid "Description of the new revision."
2240
msgstr ""
2241
2242
#: bzrlib/builtins.py:3509
2243
msgid "Commit even if nothing has changed."
2244
msgstr ""
2245
2246
#: bzrlib/builtins.py:3513
2247
msgid "Take commit message from this file."
2248
msgstr ""
2249
2250
#: bzrlib/builtins.py:3515
2251
msgid "Refuse to commit if there are unknown files in the working tree."
2252
msgstr ""
2253
2254
#: bzrlib/builtins.py:3518
2255
msgid ""
2256
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2257
"08:00:00 +0100'."
2258
msgstr ""
2259
2260
#: bzrlib/builtins.py:3521
2261
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2262
msgstr ""
2263
2264
#: bzrlib/builtins.py:3524
2265
msgid "Set the author's name, if it's different from the committer."
2266
msgstr ""
2267
2268
#: bzrlib/builtins.py:3527
2269
msgid ""
2270
"Perform a local commit in a bound branch. Local commits are not pushed to "
2271
"the master branch until a normal commit is performed."
2272
msgstr ""
2273
2274
#: bzrlib/builtins.py:3533
2275
msgid ""
2276
"When no message is supplied, show the diff along with the status summary in "
2277
"the message editor."
2278
msgstr ""
2279
2280
#: bzrlib/builtins.py:3536
2281
msgid ""
2282
"When committing to a foreign version control system do not push data that "
2283
"can not be natively represented."
2284
msgstr ""
2285
2286
#: bzrlib/builtins.py:3554
2287
#, python-format
2288
msgid ""
2289
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2290
"default bug tracker using the `bugtracker` option.\n"
2291
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2292
msgstr ""
2293
2294
#: bzrlib/builtins.py:3563
2295
#, python-format
2296
msgid ""
2297
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2298
"for more information on this feature.\n"
2299
"Commit refused."
2300
msgstr ""
2301
2302
#: bzrlib/builtins.py:3572
2303
#, python-format
2304
msgid "Unrecognized bug %s. Commit refused."
2305
msgstr "Unrecognised bug %s. Commit refused."
2306
2307
#: bzrlib/builtins.py:3575
2308
#, python-format
2309
msgid ""
2310
"%s\n"
2311
"Commit refused."
2312
msgstr ""
2313
2314
#: bzrlib/builtins.py:3599
2315
msgid "Could not parse --commit-time: "
2316
msgstr ""
2317
2318
#: bzrlib/builtins.py:3639
2319
msgid "please specify either --message or --file"
2320
msgstr ""
2321
2322
#: bzrlib/builtins.py:3668
2323
msgid "please specify a commit message with either --message or --file"
2324
msgstr ""
2325
2326
#: bzrlib/builtins.py:3671
2327
msgid ""
2328
"Empty commit message specified. Please specify a commit message with either -"
2329
"-message or --file or leave a blank message with --message \"\"."
2330
msgstr ""
2331
2332
#: bzrlib/builtins.py:3691
2333
msgid ""
2334
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2335
"-unchanged to force an empty commit."
2336
msgstr ""
2337
2338
#: bzrlib/builtins.py:3695
2339
msgid ""
2340
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2341
"resolve FILE\" to resolve."
2342
msgstr ""
2343
2344
#: bzrlib/builtins.py:3699
2345
msgid "Commit refused because there are unknown files in the working tree."
2346
msgstr ""
2347
2348
#: bzrlib/builtins.py:3702
2349
msgid ""
2350
"\n"
2351
"To commit to master branch, run update and then commit.\n"
2352
"You can also pass --local to commit to continue working disconnected."
2353
msgstr ""
2354
2355
#: bzrlib/builtins.py:3710
2356
msgid ""
2357
"Validate working tree structure, branch consistency and repository history."
2358
msgstr ""
2359
2360
#: bzrlib/builtins.py:3712
2361
msgid ""
2362
"This command checks various invariants about branch and repository storage\n"
2363
"to detect data corruption or bzr bugs."
2364
msgstr ""
2365
2366
#: bzrlib/builtins.py:3715
2367
msgid ""
2368
"The working tree and branch checks will only give output if a problem is\n"
2369
"detected. The output fields of the repository check are:"
2370
msgstr ""
2371
2372
#: bzrlib/builtins.py:3718
2373
msgid ""
2374
"revisions\n"
2375
" This is just the number of revisions checked. It doesn't\n"
2376
" indicate a problem."
2377
msgstr ""
2378
2379
#: bzrlib/builtins.py:3722
2380
msgid ""
2381
"versionedfiles\n"
2382
" This is just the number of versionedfiles checked. It\n"
2383
" doesn't indicate a problem."
2384
msgstr ""
2385
2386
#: bzrlib/builtins.py:3726
2387
msgid ""
2388
"unreferenced ancestors\n"
2389
" Texts that are ancestors of other texts, but\n"
2390
" are not properly referenced by the revision ancestry. This is a\n"
2391
" subtle problem that Bazaar can work around."
2392
msgstr ""
2393
2394
#: bzrlib/builtins.py:3731
2395
msgid ""
2396
"unique file texts\n"
2397
" This is the total number of unique file contents\n"
2398
" seen in the checked revisions. It does not indicate a problem."
2399
msgstr ""
2400
2401
#: bzrlib/builtins.py:3735
2402
msgid ""
2403
"repeated file texts\n"
2404
" This is the total number of repeated texts seen\n"
2405
" in the checked revisions. Texts can be repeated when their file\n"
2406
" entries are modified, but the file contents are not. It does not\n"
2407
" indicate a problem."
2408
msgstr ""
2409
2410
#: bzrlib/builtins.py:3741
2411
msgid ""
2412
"If no restrictions are specified, all Bazaar data that is found at the "
2413
"given\n"
2414
"location will be checked."
2415
msgstr ""
2416
2417
#: bzrlib/builtins.py:3746
2418
msgid " Check the tree and branch at 'foo'::"
2419
msgstr ""
2420
2421
#: bzrlib/builtins.py:3748
2422
msgid " bzr check --tree --branch foo"
2423
msgstr ""
2424
2425
#: bzrlib/builtins.py:3750
2426
msgid " Check only the repository at 'bar'::"
2427
msgstr ""
2428
2429
#: bzrlib/builtins.py:3752
2430
msgid " bzr check --repo bar"
2431
msgstr ""
2432
2433
#: bzrlib/builtins.py:3754
2434
msgid " Check everything at 'baz'::"
2435
msgstr ""
2436
2437
#: bzrlib/builtins.py:3756
2438
msgid " bzr check baz"
2439
msgstr ""
2440
2441
#: bzrlib/builtins.py:3762
2442
msgid "Check the branch related to the current directory."
2443
msgstr ""
2444
2445
#: bzrlib/builtins.py:3764
2446
msgid "Check the repository related to the current directory."
2447
msgstr ""
2448
2449
#: bzrlib/builtins.py:3766
2450
msgid "Check the working tree related to the current directory."
2451
msgstr ""
2452
2453
#: bzrlib/builtins.py:3780
2454
msgid "Upgrade a repository, branch or working tree to a newer format."
2455
msgstr ""
2456
2457
#: bzrlib/builtins.py:3782
2458
msgid ""
2459
"When the default format has changed after a major new release of\n"
2460
"Bazaar, you may be informed during certain operations that you\n"
2461
"should upgrade. Upgrading to a newer format may improve performance\n"
2462
"or make new features available. It may however limit interoperability\n"
2463
"with older repositories or with older versions of Bazaar."
2464
msgstr ""
2465
2466
#: bzrlib/builtins.py:3788
2467
msgid ""
2468
"If you wish to upgrade to a particular format rather than the\n"
2469
"current default, that can be specified using the --format option.\n"
2470
"As a consequence, you can use the upgrade command this way to\n"
2471
"\"downgrade\" to an earlier format, though some conversions are\n"
2472
"a one way process (e.g. changing from the 1.x default to the\n"
2473
"2.x default) so downgrading is not always possible."
2474
msgstr ""
2475
2476
#: bzrlib/builtins.py:3795
2477
msgid ""
2478
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2479
"process (where # is a number). By default, this is left there on\n"
2480
"completion. If the conversion fails, delete the new .bzr directory\n"
2481
"and rename this one back in its place. Use the --clean option to ask\n"
2482
"for the backup.bzr directory to be removed on successful conversion.\n"
2483
"Alternatively, you can delete it by hand if everything looks good\n"
2484
"afterwards."
2485
msgstr ""
2486
2487
#: bzrlib/builtins.py:3803
2488
msgid ""
2489
"If the location given is a shared repository, dependent branches\n"
2490
"are also converted provided the repository converts successfully.\n"
2491
"If the conversion of a branch fails, remaining branches are still\n"
2492
"tried."
2493
msgstr ""
2494
2495
#: bzrlib/builtins.py:3808
2496
msgid ""
2497
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2498
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2499
msgstr ""
2500
2501
#: bzrlib/builtins.py:3816
2502
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2503
msgstr ""
2504
2505
#: bzrlib/builtins.py:3820
2506
msgid "Branch format"
2507
msgstr ""
2508
2509
#: bzrlib/builtins.py:3822
2510
msgid "Remove the backup.bzr directory if successful."
2511
msgstr ""
2512
2513
#: bzrlib/builtins.py:3824
2514
msgid "Show what would be done, but don't actually do anything."
2515
msgstr ""
2516
2517
#: bzrlib/builtins.py:3839
2518
msgid "Show or set bzr user id."
2519
msgstr ""
2520
2521
#: bzrlib/builtins.py:3841
2522
msgid ""
2523
":Examples:\n"
2524
" Show the email of the current user::"
2525
msgstr ""
2526
2527
#: bzrlib/builtins.py:3844
2528
msgid " bzr whoami --email"
2529
msgstr ""
2530
2531
#: bzrlib/builtins.py:3846
2532
msgid " Set the current user::"
2533
msgstr ""
2534
2535
#: bzrlib/builtins.py:3848
2536
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2537
msgstr ""
2538
2539
#: bzrlib/builtins.py:3852
2540
msgid "Display email address only."
2541
msgstr ""
2542
2543
#: bzrlib/builtins.py:3854
2544
msgid "Set identity for the current branch instead of globally."
2545
msgstr ""
2546
2547
#: bzrlib/builtins.py:3880
2548
msgid "--email can only be used to display existing identity"
2549
msgstr ""
2550
2551
#: bzrlib/builtins.py:3904
2552
msgid "Print or set the branch nickname."
2553
msgstr ""
2554
2555
#: bzrlib/builtins.py:3906
2556
msgid ""
2557
"If unset, the colocated branch name is used for colocated branches, and\n"
2558
"the branch directory name is used for other branches. To print the\n"
2559
"current nickname, execute with no argument."
2560
msgstr ""
2561
2562
#: bzrlib/builtins.py:3910
2563
msgid ""
2564
"Bound branches use the nickname of its master branch unless it is set\n"
2565
"locally."
2566
msgstr ""
2567
2568
#: bzrlib/builtins.py:3930
2569
msgid "Set/unset and display aliases."
2570
msgstr ""
2571
2572
#: bzrlib/builtins.py:3932
2573
msgid ""
2574
":Examples:\n"
2575
" Show the current aliases::"
2576
msgstr ""
2577
2578
#: bzrlib/builtins.py:3935
2579
msgid " bzr alias"
2580
msgstr ""
2581
2582
#: bzrlib/builtins.py:3937
2583
msgid " Show the alias specified for 'll'::"
2584
msgstr ""
2585
2586
#: bzrlib/builtins.py:3939
2587
msgid " bzr alias ll"
2588
msgstr ""
2589
2590
#: bzrlib/builtins.py:3941
2591
msgid " Set an alias for 'll'::"
2592
msgstr ""
2593
2594
#: bzrlib/builtins.py:3943
2595
msgid " bzr alias ll=\"log --line -r-10..-1\""
2596
msgstr ""
2597
2598
#: bzrlib/builtins.py:3945
2599
msgid " To remove an alias for 'll'::"
2600
msgstr ""
2601
2602
#: bzrlib/builtins.py:3947
2603
msgid " bzr alias --remove ll"
2604
msgstr ""
2605
2606
#: bzrlib/builtins.py:3952
2607
msgid "Remove the alias."
2608
msgstr ""
2609
2610
#: bzrlib/builtins.py:3970
2611
msgid "bzr alias --remove expects an alias to remove."
2612
msgstr ""
2613
2614
#: bzrlib/builtins.py:4151
2615
msgid ""
2616
"subunit not available. subunit needs to be installed to use --subunit."
2617
msgstr ""
2618
2619
#: bzrlib/builtins.py:4168
2620
msgid ""
2621
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2622
msgstr ""
2623
2624
#: bzrlib/builtins.py:4215
2625
msgid "Show version of bzr."
2626
msgstr ""
2627
2628
#: bzrlib/builtins.py:4219
2629
msgid "Print just the version number."
2630
msgstr ""
2631
2632
#: bzrlib/builtins.py:4238
2633
msgid "It sure does!\n"
2634
msgstr ""
2635
2636
#: bzrlib/builtins.py:4262
2637
#, python-format
2638
msgid "merge base is revision %s\n"
2639
msgstr ""
2640
2641
#: bzrlib/builtins.py:4266
2642
msgid "Perform a three-way merge."
2643
msgstr ""
2644
2645
#: bzrlib/builtins.py:4268
2646
msgid ""
2647
"The source of the merge can be specified either in the form of a branch,\n"
2648
"or in the form of a path to a file containing a merge directive generated\n"
2649
"with bzr send. If neither is specified, the default is the upstream branch\n"
2650
"or the branch most recently merged using --remember. The source of the\n"
2651
"merge may also be specified in the form of a path to a file in another\n"
2652
"branch: in this case, only the modifications to that file are merged into\n"
2653
"the current working tree."
2654
msgstr ""
2655
2656
#: bzrlib/builtins.py:4276
2657
msgid ""
2658
"When merging from a branch, by default bzr will try to merge in all new\n"
2659
"work from the other branch, automatically determining an appropriate base\n"
2660
"revision. If this fails, you may need to give an explicit base."
2661
msgstr ""
2662
2663
#: bzrlib/builtins.py:4280
2664
msgid ""
2665
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2666
"try to merge in all new work up to and including revision OTHER."
2667
msgstr ""
2668
2669
#: bzrlib/builtins.py:4283
2670
msgid ""
2671
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2672
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2673
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2674
"not already contain revision BASE, such a merge is commonly referred to as\n"
2675
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2676
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2677
"changes from the other branch is not stored in the commit."
2678
msgstr ""
2679
2680
#: bzrlib/builtins.py:4291
2681
msgid "Revision numbers are always relative to the source branch."
2682
msgstr ""
2683
2684
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2685
msgid ""
2686
"Merge will do its best to combine the changes in two branches, but there\n"
2687
"are some kinds of problems only a human can fix. When it encounters those,\n"
2688
"it will mark a conflict. A conflict means that you need to fix something,\n"
2689
"before you can commit."
2690
msgstr ""
2691
2692
#: bzrlib/builtins.py:4298
2693
msgid ""
2694
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2695
msgstr ""
2696
2697
#: bzrlib/builtins.py:4300
2698
msgid ""
2699
"If there is no default branch set, the first merge will set it (use\n"
2700
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2701
"to use the default. To change the default, use --remember. The value will\n"
2702
"only be saved if the remote location can be accessed."
2703
msgstr ""
2704
2705
#: bzrlib/builtins.py:4305
2706
msgid ""
2707
"The results of the merge are placed into the destination working\n"
2708
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2709
"committed to record the result of the merge."
2710
msgstr ""
2711
2712
#: bzrlib/builtins.py:4309
2713
msgid ""
2714
"merge refuses to run if there are any uncommitted changes, unless\n"
2715
"--force is given. If --force is given, then the changes from the source \n"
2716
"will be merged with the current working tree, including any uncommitted\n"
2717
"changes in the tree. The --force option can also be used to create a\n"
2718
"merge revision which has more than two parents."
2719
msgstr ""
2720
2721
#: bzrlib/builtins.py:4315
2722
msgid ""
2723
"If one would like to merge changes from the working tree of the other\n"
2724
"branch without merging any committed revisions, the --uncommitted option\n"
2725
"can be given."
2726
msgstr ""
2727
2728
#: bzrlib/builtins.py:4319
2729
msgid ""
2730
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2731
"you to apply each diff hunk and file change, similar to \"shelve\"."
2732
msgstr ""
2733
2734
#: bzrlib/builtins.py:4322
2735
msgid ""
2736
":Examples:\n"
2737
" To merge all new revisions from bzr.dev::"
2738
msgstr ""
2739
2740
#: bzrlib/builtins.py:4325
2741
msgid " bzr merge ../bzr.dev"
2742
msgstr ""
2743
2744
#: bzrlib/builtins.py:4327
2745
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2746
msgstr ""
2747
2748
#: bzrlib/builtins.py:4329
2749
msgid " bzr merge -r 82 ../bzr.dev"
2750
msgstr ""
2751
2752
#: bzrlib/builtins.py:4331
2753
msgid " To merge the changes introduced by 82, without previous changes::"
2754
msgstr ""
2755
2756
#: bzrlib/builtins.py:4333
2757
msgid " bzr merge -r 81..82 ../bzr.dev"
2758
msgstr ""
2759
2760
#: bzrlib/builtins.py:4335
2761
msgid " To apply a merge directive contained in /tmp/merge::"
2762
msgstr ""
2763
2764
#: bzrlib/builtins.py:4337
2765
msgid " bzr merge /tmp/merge"
2766
msgstr ""
2767
2768
#: bzrlib/builtins.py:4339
2769
msgid ""
2770
" To create a merge revision with three parents from two branches\n"
2771
" feature1a and feature1b:"
2772
msgstr ""
2773
2774
#: bzrlib/builtins.py:4342
2775
msgid ""
2776
" bzr merge ../feature1a\n"
2777
" bzr merge ../feature1b --force\n"
2778
" bzr commit -m 'revision with three parents'"
2779
msgstr ""
2780
2781
#: bzrlib/builtins.py:4354
2782
msgid "Merge even if the destination tree has uncommitted changes."
2783
msgstr ""
2784
2785
#: bzrlib/builtins.py:4360
2786
msgid ""
2787
"Apply uncommitted changes from a working copy, instead of branch changes."
2788
msgstr ""
2789
2790
#: bzrlib/builtins.py:4362
2791
msgid ""
2792
"If the destination is already completely merged into the source, pull from "
2793
"the source rather than merging. When this happens, you do not need to "
2794
"commit the result."
2795
msgstr ""
2796
2797
#: bzrlib/builtins.py:4367
2798
msgid ""
2799
"Branch to merge into, rather than the one containing the working directory."
2800
msgstr ""
2801
2802
#: bzrlib/builtins.py:4369
2803
msgid "Instead of merging, show a diff of the merge."
2804
msgstr ""
2805
2806
#: bzrlib/builtins.py:4371
2807
msgid "Select changes interactively."
2808
msgstr ""
2809
2810
#: bzrlib/builtins.py:4393
2811
msgid ""
2812
"Merging into empty branches not currently supported, "
2813
"https://bugs.launchpad.net/bzr/+bug/308562"
2814
msgstr ""
2815
2816
#: bzrlib/builtins.py:4420
2817
msgid "Cannot use --uncommitted with bundles or merge directives."
2818
msgstr ""
2819
2820
#: bzrlib/builtins.py:4431
2821
msgid "Cannot use --uncommitted and --revision at the same time."
2822
msgstr ""
2823
2824
#: bzrlib/builtins.py:4451
2825
msgid "merger: "
2826
msgstr ""
2827
2828
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2829
msgid "Nothing to do."
2830
msgstr ""
2831
2832
#: bzrlib/builtins.py:4457
2833
msgid "Cannot pull individual files"
2834
msgstr ""
2835
2836
#: bzrlib/builtins.py:4465
2837
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2838
msgstr ""
2839
2840
#: bzrlib/builtins.py:4523
2841
#, python-format
2842
msgid "Show-base is not supported for this merge type. %s"
2843
msgstr ""
2844
2845
#: bzrlib/builtins.py:4532
2846
#, python-format
2847
msgid "Conflict reduction is not supported for merge type %s."
2848
msgstr ""
2849
2850
#: bzrlib/builtins.py:4536
2851
msgid "Cannot do conflict reduction and show base."
2852
msgstr ""
2853
2854
#: bzrlib/builtins.py:4647
2855
msgid "No location specified or remembered"
2856
msgstr ""
2857
2858
#: bzrlib/builtins.py:4649
2859
msgid "{0} remembered {1} location {2}"
2860
msgstr ""
2861
2862
#: bzrlib/builtins.py:4655
2863
msgid "Redo a merge."
2864
msgstr ""
2865
2866
#: bzrlib/builtins.py:4657
2867
msgid ""
2868
"Use this if you want to try a different merge technique while resolving\n"
2869
"conflicts. Some merge techniques are better than others, and remerge\n"
2870
"lets you try different ones on different files."
2871
msgstr ""
2872
2873
#: bzrlib/builtins.py:4661
2874
msgid ""
2875
"The options for remerge have the same meaning and defaults as the ones for\n"
2876
"merge. The difference is that remerge can (only) be run when there is a\n"
2877
"pending merge, and it lets you specify particular files."
2878
msgstr ""
2879
2880
#: bzrlib/builtins.py:4665
2881
msgid ""
2882
":Examples:\n"
2883
" Re-do the merge of all conflicted files, and show the base text in\n"
2884
" conflict regions, in addition to the usual THIS and OTHER texts::"
2885
msgstr ""
2886
2887
#: bzrlib/builtins.py:4669
2888
msgid " bzr remerge --show-base"
2889
msgstr ""
2890
2891
#: bzrlib/builtins.py:4671
2892
msgid ""
2893
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2894
" additional processing to reduce the size of conflict regions::"
2895
msgstr ""
2896
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2897
" additional processing to reduce the size of conflict regions::"
2898
2899
#: bzrlib/builtins.py:4674
2900
msgid " bzr remerge --merge-type weave --reprocess foobar"
2901
msgstr ""
2902
2903
#: bzrlib/builtins.py:4681
2904
msgid "Show base revision text in conflicts."
2905
msgstr ""
2906
2907
#: bzrlib/builtins.py:4693
2908
msgid ""
2909
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2910
"merges."
2911
msgstr ""
2912
2913
#: bzrlib/builtins.py:4751
2914
msgid ""
2915
"Set files in the working tree back to the contents of a previous revision."
2916
msgstr ""
2917
2918
#: bzrlib/builtins.py:4753
2919
msgid ""
2920
"Giving a list of files will revert only those files. Otherwise, all files\n"
2921
"will be reverted. If the revision is not specified with '--revision', the\n"
2922
"working tree basis revision is used. A revert operation affects only the\n"
2923
"working tree, not any revision history like the branch and repository or\n"
2924
"the working tree basis revision."
2925
msgstr ""
2926
2927
#: bzrlib/builtins.py:4759
2928
msgid ""
2929
"To remove only some changes, without reverting to a prior version, use\n"
2930
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2931
"will remove the changes introduced by the second last commit (-2), without\n"
2932
"affecting the changes introduced by the last commit (-1). To remove\n"
2933
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2934
"To update the branch to a specific revision or the latest revision and\n"
2935
"update the working tree accordingly while preserving local changes, see the\n"
2936
"update command."
2937
msgstr ""
2938
2939
#: bzrlib/builtins.py:4768
2940
msgid ""
2941
"Uncommitted changes to files that are reverted will be discarded.\n"
2942
"Howver, by default, any files that have been manually changed will be\n"
2943
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2944
"files have '.~#~' appended to their name, where # is a number."
2945
msgstr ""
2946
2947
#: bzrlib/builtins.py:4773
2948
msgid ""
2949
"When you provide files, you can use their current pathname or the pathname\n"
2950
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2951
"name. If you name a directory, all the contents of that directory will be\n"
2952
"reverted."
2953
msgstr ""
2954
2955
#: bzrlib/builtins.py:4778
2956
msgid ""
2957
"If you have newly added files since the target revision, they will be\n"
2958
"removed. If the files to be removed have been changed, backups will be\n"
2959
"created as above. Directories containing unknown files will not be\n"
2960
"deleted."
2961
msgstr ""
2962
2963
#: bzrlib/builtins.py:4783
2964
msgid ""
2965
"The working tree contains a list of revisions that have been merged but\n"
2966
"not yet committed. These revisions will be included as additional parents\n"
2967
"of the next commit. Normally, using revert clears that list as well as\n"
2968
"reverting the files. If any files are specified, revert leaves the list\n"
2969
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2970
".`` in the tree root to revert all files but keep the recorded merges,\n"
2971
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2972
"reverting any files."
2973
msgstr ""
2974
2975
#: bzrlib/builtins.py:4792
2976
msgid ""
2977
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2978
"changes from a branch in a single revision. To do this, perform the merge\n"
2979
"as desired. Then doing revert with the \"--forget-merges\" option will "
2980
"keep\n"
2981
"the content of the tree as it was, but it will clear the list of pending\n"
2982
"merges. The next commit will then contain all of the changes that are\n"
2983
"present in the other branch, but without any other parent revisions.\n"
2984
"Because this technique forgets where these changes originated, it may\n"
2985
"cause additional conflicts on later merges involving the same source and\n"
2986
"target branches."
2987
msgstr ""
2988
2989
#: bzrlib/builtins.py:4806
2990
msgid "Do not save backups of reverted files."
2991
msgstr ""
2992
2993
#: bzrlib/builtins.py:4808
2994
msgid "Remove pending merge marker, without changing any files."
2995
msgstr ""
2996
2997
#: bzrlib/builtins.py:4839
2998
msgid ""
2999
"Show help on a command or other topic.\n"
3000
" "
3001
msgstr ""
3002
3003
#: bzrlib/builtins.py:4844
3004
msgid "Show help on all commands."
3005
msgstr ""
3006
3007
#: bzrlib/builtins.py:4873
3008
msgid "Show unmerged/unpulled revisions between two branches."
3009
msgstr ""
3010
3011
#: bzrlib/builtins.py:4875
3012
msgid "OTHER_BRANCH may be local or remote."
3013
msgstr ""
3014
3015
#: bzrlib/builtins.py:4877
3016
msgid ""
3017
"To filter on a range of revisions, you can use the command -r begin..end\n"
3018
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3019
"also valid.\n"
3020
" \n"
3021
":Exit values:\n"
3022
" 1 - some missing revisions\n"
3023
" 0 - no missing revisions"
3024
msgstr ""
3025
3026
#: bzrlib/builtins.py:4887
3027
msgid ""
3028
" Determine the missing revisions between this and the branch at the\n"
3029
" remembered pull location::"
3030
msgstr ""
3031
3032
#: bzrlib/builtins.py:4890
3033
msgid " bzr missing"
3034
msgstr ""
3035
3036
#: bzrlib/builtins.py:4892
3037
msgid " Determine the missing revisions between this and another branch::"
3038
msgstr ""
3039
3040
#: bzrlib/builtins.py:4894
3041
msgid " bzr missing http://server/branch"
3042
msgstr ""
3043
3044
#: bzrlib/builtins.py:4896
3045
msgid ""
3046
" Determine the missing revisions up to a specific revision on the other\n"
3047
" branch::"
3048
msgstr ""
3049
3050
#: bzrlib/builtins.py:4899
3051
msgid " bzr missing -r ..-10"
3052
msgstr ""
3053
3054
#: bzrlib/builtins.py:4901
3055
msgid ""
3056
" Determine the missing revisions up to a specific revision on this\n"
3057
" branch::"
3058
msgstr ""
3059
3060
#: bzrlib/builtins.py:4904
3061
msgid " bzr missing --my-revision ..-10"
3062
msgstr ""
3063
3064
#: bzrlib/builtins.py:4911
3065
msgid "Reverse the order of revisions."
3066
msgstr ""
3067
3068
#: bzrlib/builtins.py:4913
3069
msgid "Display changes in the local branch only."
3070
msgstr ""
3071
3072
#: bzrlib/builtins.py:4914
3073
msgid "Same as --mine-only."
3074
msgstr ""
3075
3076
#: bzrlib/builtins.py:4916
3077
msgid "Display changes in the remote branch only."
3078
msgstr ""
3079
3080
#: bzrlib/builtins.py:4917
3081
msgid "Same as --theirs-only."
3082
msgstr ""
3083
3084
#: bzrlib/builtins.py:4922
3085
msgid ""
3086
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3087
"details."
3088
msgstr ""
3089
3090
#: bzrlib/builtins.py:4926
3091
msgid ""
3092
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3093
"details."
3094
msgstr ""
3095
3096
#: bzrlib/builtins.py:4929
3097
msgid "Show all revisions in addition to the mainline ones."
3098
msgstr ""
3099
3100
#: bzrlib/builtins.py:4983
3101
msgid "No peer location known or specified."
3102
msgstr ""
3103
3104
#: bzrlib/builtins.py:4987
3105
msgid "Using saved parent location: {0}\n"
3106
msgstr ""
3107
3108
#: bzrlib/builtins.py:5020
3109
#, python-format
3110
msgid "You have %d extra revision:\n"
3111
msgid_plural "You have %d extra revisions:\n"
3112
msgstr[0] ""
3113
msgstr[1] ""
3114
3115
#: bzrlib/builtins.py:5040
3116
#, python-format
3117
msgid "You are missing %d revision:\n"
3118
msgid_plural "You are missing %d revisions:\n"
3119
msgstr[0] ""
3120
msgstr[1] ""
3121
3122
#: bzrlib/builtins.py:5055
3123
msgid "This branch has no new revisions.\n"
3124
msgstr ""
3125
3126
#: bzrlib/builtins.py:5058
3127
msgid "Other branch has no new revisions.\n"
3128
msgstr ""
3129
3130
#: bzrlib/builtins.py:5063
3131
msgid "Branches are up to date.\n"
3132
msgstr ""
3133
3134
#: bzrlib/builtins.py:5074
3135
msgid "Compress the data within a repository."
3136
msgstr ""
3137
3138
#: bzrlib/builtins.py:5076
3139
msgid ""
3140
"This operation compresses the data within a bazaar repository. As\n"
3141
"bazaar supports automatic packing of repository, this operation is\n"
3142
"normally not required to be done manually."
3143
msgstr ""
3144
3145
#: bzrlib/builtins.py:5080
3146
msgid ""
3147
"During the pack operation, bazaar takes a backup of existing repository\n"
3148
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3149
"automatically when it is safe to do so. To save disk space by removing\n"
3150
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3151
"used."
3152
msgstr ""
3153
3154
#: bzrlib/builtins.py:5086
3155
msgid ""
3156
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3157
"during or immediately after repacking, you may be left with a state\n"
3158
"where the deletion has been written to disk but the new packs have not\n"
3159
"been. In this case the repository may be unusable."
3160
msgstr ""
3161
3162
#: bzrlib/builtins.py:5095
3163
msgid "Delete obsolete packs to save disk space."
3164
msgstr ""
3165
3166
#: bzrlib/builtins.py:5109
3167
msgid "List the installed plugins."
3168
msgstr ""
3169
3170
#: bzrlib/builtins.py:5111
3171
msgid ""
3172
"This command displays the list of installed plugins including\n"
3173
"version of plugin and a short description of each."
3174
msgstr ""
3175
3176
#: bzrlib/builtins.py:5114
3177
msgid "--verbose shows the path where each plugin is located."
3178
msgstr ""
3179
3180
#: bzrlib/builtins.py:5116
3181
msgid ""
3182
"A plugin is an external component for Bazaar that extends the\n"
3183
"revision control system, by adding or replacing code in Bazaar.\n"
3184
"Plugins can do a variety of things, including overriding commands,\n"
3185
"adding new commands, providing additional network transports and\n"
3186
"customizing log output."
3187
msgstr ""
3188
3189
#: bzrlib/builtins.py:5122
3190
msgid ""
3191
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3192
"for further information on plugins including where to find them and how to\n"
3193
"install them. Instructions are also provided there on how to write new\n"
3194
"plugins using the Python programming language."
3195
msgstr ""
3196
3197
#: bzrlib/builtins.py:5138
3198
msgid "Show testament (signing-form) of a revision."
3199
msgstr ""
3200
3201
#: bzrlib/builtins.py:5141
3202
msgid "Produce long-format testament."
3203
msgstr ""
3204
3205
#: bzrlib/builtins.py:5143
3206
msgid "Produce a strict-format testament."
3207
msgstr ""
3208
3209
#: bzrlib/builtins.py:5169
3210
msgid "Show the origin of each line in a file."
3211
msgstr ""
3212
3213
#: bzrlib/builtins.py:5171
3214
msgid ""
3215
"This prints out the given file with an annotation on the left side\n"
3216
"indicating which revision, author and date introduced the change."
3217
msgstr ""
3218
3219
#: bzrlib/builtins.py:5174
3220
msgid ""
3221
"If the origin is the same for a run of consecutive lines, it is\n"
3222
"shown only at the top, unless the --all option is given."
3223
msgstr ""
3224
3225
#: bzrlib/builtins.py:5182
3226
msgid "Show annotations on all lines."
3227
msgstr ""
3228
3229
#: bzrlib/builtins.py:5183
3230
msgid "Show commit date in annotations."
3231
msgstr ""
3232
3233
#: bzrlib/builtins.py:5270
3234
msgid "Cannot sign a range of non-revision-history revisions"
3235
msgstr ""
3236
3237
#: bzrlib/builtins.py:5282
3238
msgid "Please supply either one revision, or a range."
3239
msgstr ""
3240
3241
#: bzrlib/builtins.py:5286
3242
msgid ""
3243
"Convert the current branch into a checkout of the supplied branch.\n"
3244
"If no branch is supplied, rebind to the last bound location."
3245
msgstr ""
3246
3247
#: bzrlib/builtins.py:5289
3248
msgid ""
3249
"Once converted into a checkout, commits must succeed on the master branch\n"
3250
"before they will be applied to the local branch."
3251
msgstr ""
3252
3253
#: bzrlib/builtins.py:5292
3254
msgid ""
3255
"Bound branches use the nickname of its master branch unless it is set\n"
3256
"locally, in which case binding will update the local nickname to be\n"
3257
"that of the master."
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:5307
3261
msgid "No location supplied. This format does not remember old locations."
3262
msgstr ""
3263
3264
#: bzrlib/builtins.py:5313
3265
msgid "Branch is already bound"
3266
msgstr ""
3267
3268
#: bzrlib/builtins.py:5316
3269
msgid "No location supplied and no previous location known"
3270
msgstr ""
3271
3272
#: bzrlib/builtins.py:5322
3273
msgid "These branches have diverged. Try merging, and then bind again."
3274
msgstr ""
3275
3276
#: bzrlib/builtins.py:5329
3277
msgid "Convert the current checkout into a regular branch."
3278
msgstr ""
3279
3280
#: bzrlib/builtins.py:5331
3281
msgid ""
3282
"After unbinding, the local branch is considered independent and subsequent\n"
3283
"commits will be local only."
3284
msgstr ""
3285
3286
#: bzrlib/builtins.py:5342
3287
msgid "Local branch is not bound"
3288
msgstr ""
3289
3290
#: bzrlib/builtins.py:5346
3291
msgid "Remove the last committed revision."
3292
msgstr ""
3293
3294
#: bzrlib/builtins.py:5348
3295
msgid ""
3296
"--verbose will print out what is being removed.\n"
3297
"--dry-run will go through all the motions, but not actually\n"
3298
"remove anything."
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5352
3302
msgid ""
3303
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3304
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3305
"branch at revision 15."
3306
msgstr ""
3307
3308
#: bzrlib/builtins.py:5356
3309
msgid ""
3310
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3311
"it may make is to restore any pending merges that were present before\n"
3312
"the commit."
3313
msgstr ""
3314
3315
#: bzrlib/builtins.py:5367
3316
msgid "Don't actually make changes."
3317
msgstr ""
3318
3319
#: bzrlib/builtins.py:5368
3320
msgid "Say yes to all questions."
3321
msgstr ""
3322
3323
#: bzrlib/builtins.py:5370
3324
msgid "Keep tags that point to removed revisions."
3325
msgstr ""
3326
3327
#: bzrlib/builtins.py:5372
3328
msgid "Only remove the commits from the local branch when in a checkout."
3329
msgstr ""
3330
3331
#: bzrlib/builtins.py:5421
3332
msgid "No revisions to uncommit.\n"
3333
msgstr ""
3334
3335
#: bzrlib/builtins.py:5436
3336
msgid "Dry-run, pretending to remove the above revisions.\n"
3337
msgstr ""
3338
3339
#: bzrlib/builtins.py:5439
3340
msgid "The above revision(s) will be removed.\n"
3341
msgstr ""
3342
3343
#: bzrlib/builtins.py:5443
3344
msgid "Uncommit these revisions"
3345
msgstr ""
3346
3347
#: bzrlib/builtins.py:5446
3348
msgid "Canceled\n"
3349
msgstr ""
3350
3351
#: bzrlib/builtins.py:5453
3352
#, python-format
3353
msgid ""
3354
"You can restore the old tip by running:\n"
3355
" bzr pull . -r revid:%s\n"
3356
msgstr ""
3357
3358
#: bzrlib/builtins.py:5458
3359
msgid "Break a dead lock."
3360
msgstr ""
3361
3362
#: bzrlib/builtins.py:5460
3363
msgid ""
3364
"This command breaks a lock on a repository, branch, working directory or\n"
3365
"config file."
3366
msgstr ""
3367
3368
#: bzrlib/builtins.py:5463
3369
msgid ""
3370
"CAUTION: Locks should only be broken when you are sure that the process\n"
3371
"holding the lock has been stopped."
3372
msgstr ""
3373
3374
#: bzrlib/builtins.py:5466
3375
msgid ""
3376
"You can get information on what locks are open via the 'bzr info\n"
3377
"[location]' command."
3378
msgstr ""
3379
3380
#: bzrlib/builtins.py:5469
3381
msgid ""
3382
":Examples:\n"
3383
" bzr break-lock\n"
3384
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3385
" bzr break-lock --conf ~/.bazaar"
3386
msgstr ""
3387
3388
#: bzrlib/builtins.py:5478
3389
msgid "LOCATION is the directory where the config lock is."
3390
msgstr ""
3391
3392
#: bzrlib/builtins.py:5480
3393
msgid "Do not ask for confirmation before breaking the lock."
3394
msgstr ""
3395
3396
#: bzrlib/builtins.py:5515
3397
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3398
msgstr ""
3399
3400
#: bzrlib/builtins.py:5516
3401
msgid "Run the bzr server."
3402
msgstr ""
3403
3404
#: bzrlib/builtins.py:5522
3405
msgid "Serve on stdin/out for use from inetd or sshd."
3406
msgstr ""
3407
3408
#: bzrlib/builtins.py:5523
3409
msgid "protocol"
3410
msgstr ""
3411
3412
#: bzrlib/builtins.py:5524
3413
msgid "Protocol to serve."
3414
msgstr ""
3415
3416
#: bzrlib/builtins.py:5528
3417
msgid "Listen for connections on nominated address."
3418
msgstr ""
3419
3420
#: bzrlib/builtins.py:5530
3421
msgid ""
3422
"Listen for connections on nominated port. Passing 0 as the port number will "
3423
"result in a dynamically allocated port. The default port depends on the "
3424
"protocol."
3425
msgstr ""
3426
3427
#: bzrlib/builtins.py:5535
3428
msgid "Serve contents of this directory."
3429
msgstr ""
3430
3431
#: bzrlib/builtins.py:5537
3432
msgid ""
3433
"By default the server is a readonly server. Supplying --allow-writes "
3434
"enables write access to the contents of the served directory and below. "
3435
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3436
"of external authentication is arranged supplying this option leads to global "
3437
"uncontrolled write access to your file system."
3438
msgstr ""
3439
3440
#: bzrlib/builtins.py:5546
3441
msgid "Override the default idle client timeout (5min)."
3442
msgstr ""
3443
3444
#: bzrlib/builtins.py:5564
3445
msgid "Combine a tree into its containing tree."
3446
msgstr ""
3447
3448
#: bzrlib/builtins.py:5566
3449
msgid "This command requires the target tree to be in a rich-root format."
3450
msgstr ""
3451
3452
#: bzrlib/builtins.py:5568
3453
msgid ""
3454
"The TREE argument should be an independent tree, inside another tree, but\n"
3455
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3456
"running \"bzr branch\" with the target inside a tree.)"
3457
msgstr ""
3458
3459
#: bzrlib/builtins.py:5572
3460
msgid ""
3461
"The result is a combined tree, with the subtree no longer an independent\n"
3462
"part. This is marked as a merge of the subtree into the containing tree,\n"
3463
"and all history is preserved."
3464
msgstr ""
3465
3466
#: bzrlib/builtins.py:5590
3467
#, python-format
3468
msgid ""
3469
"Can't join trees because %s doesn't support rich root data.\n"
3470
"You can use bzr upgrade on the repository."
3471
msgstr ""
3472
3473
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3474
msgid "Cannot join {0}. {1}"
3475
msgstr ""
3476
3477
#: bzrlib/builtins.py:5610
3478
msgid "Split a subdirectory of a tree into a separate tree."
3479
msgstr ""
3480
3481
#: bzrlib/builtins.py:5612
3482
msgid ""
3483
"This command will produce a target tree in a format that supports\n"
3484
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3485
"converted into earlier formats like 'dirstate-tags'."
3486
msgstr ""
3487
3488
#: bzrlib/builtins.py:5616
3489
msgid ""
3490
"The TREE argument should be a subdirectory of a working tree. That\n"
3491
"subdirectory will be converted into an independent tree, with its own\n"
3492
"branch. Commits in the top-level tree will not apply to the new subtree."
3493
msgstr ""
3494
3495
#: bzrlib/builtins.py:5696
3496
msgid "No submit branch specified or known"
3497
msgstr ""
3498
3499
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3500
msgid "No public branch specified or known"
3501
msgstr ""
3502
3503
#: bzrlib/builtins.py:5710
3504
msgid "bzr merge-directive takes at most two one revision identifiers"
3505
msgstr ""
3506
3507
#: bzrlib/builtins.py:5719
3508
msgid "No revisions to bundle."
3509
msgstr ""
3510
3511
#: bzrlib/builtins.py:5738
3512
msgid "Mail or create a merge-directive for submitting changes."
3513
msgstr ""
3514
3515
#: bzrlib/builtins.py:5740
3516
msgid "A merge directive provides many things needed for requesting merges:"
3517
msgstr ""
3518
3519
#: bzrlib/builtins.py:5742
3520
msgid "* A machine-readable description of the merge to perform"
3521
msgstr ""
3522
3523
#: bzrlib/builtins.py:5744
3524
msgid "* An optional patch that is a preview of the changes requested"
3525
msgstr ""
3526
3527
#: bzrlib/builtins.py:5746
3528
msgid ""
3529
"* An optional bundle of revision data, so that the changes can be applied\n"
3530
" directly from the merge directive, without retrieving data from a\n"
3531
" branch."
3532
msgstr ""
3533
3534
#: bzrlib/builtins.py:5750
3535
msgid ""
3536
"`bzr send` creates a compact data set that, when applied using bzr\n"
3537
"merge, has the same effect as merging from the source branch. "
3538
msgstr ""
3539
3540
#: bzrlib/builtins.py:5753
3541
msgid ""
3542
"By default the merge directive is self-contained and can be applied to any\n"
3543
"branch containing submit_branch in its ancestory without needing access to\n"
3544
"the source branch."
3545
msgstr ""
3546
3547
#: bzrlib/builtins.py:5757
3548
msgid ""
3549
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3550
"revisions, but only a structured request to merge from the\n"
3551
"public_location. In that case the public_branch is needed and it must be\n"
3552
"up-to-date and accessible to the recipient. The public_branch is always\n"
3553
"included if known, so that people can check it later."
3554
msgstr ""
3555
3556
#: bzrlib/builtins.py:5763
3557
msgid ""
3558
"The submit branch defaults to the parent of the source branch, but can be\n"
3559
"overridden. Both submit branch and public branch will be remembered in\n"
3560
"branch.conf the first time they are used for a particular branch. The\n"
3561
"source branch defaults to that containing the working directory, but can\n"
3562
"be changed using --from."
3563
msgstr ""
3564
3565
#: bzrlib/builtins.py:5769
3566
msgid ""
3567
"Both the submit branch and the public branch follow the usual behavior with\n"
3568
"respect to --remember: If there is no default location set, the first send\n"
3569
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3570
"omit the location to use the default. To change the default, use\n"
3571
"--remember. The value will only be saved if the location can be accessed."
3572
msgstr ""
3573
3574
#: bzrlib/builtins.py:5775
3575
msgid ""
3576
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3577
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3578
"If a public location is known for the submit_branch, that location is used\n"
3579
"in the merge directive."
3580
msgstr ""
3581
3582
#: bzrlib/builtins.py:5780
3583
msgid ""
3584
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3585
"given, in which case it is sent to a file."
3586
msgstr ""
3587
3588
#: bzrlib/builtins.py:5783
3589
msgid ""
3590
"Mail is sent using your preferred mail program. This should be transparent\n"
3591
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3592
"If the preferred client can't be found (or used), your editor will be used."
3593
msgstr ""
3594
3595
#: bzrlib/builtins.py:5787
3596
msgid ""
3597
"To use a specific mail program, set the mail_client configuration option.\n"
3598
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3599
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3600
"(MacOS X's\n"
3601
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3602
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3603
"add\n"
3604
"supported clients."
3605
msgstr ""
3606
3607
#: bzrlib/builtins.py:5794
3608
msgid ""
3609
"If mail is being sent, a to address is required. This can be supplied\n"
3610
"either on the commandline, by setting the submit_to configuration\n"
3611
"option in the branch itself or the child_submit_to configuration option\n"
3612
"in the submit branch."
3613
msgstr ""
3614
3615
#: bzrlib/builtins.py:5799
3616
msgid ""
3617
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3618
"and\n"
3619
"merge directive format 2. It is significantly faster and smaller than\n"
3620
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3621
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3622
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3623
msgstr ""
3624
3625
#: bzrlib/builtins.py:5805
3626
msgid ""
3627
"The merge directives created by bzr send may be applied using bzr merge or\n"
3628
"bzr pull by specifying a file containing a merge directive as the location."
3629
msgstr ""
3630
3631
#: bzrlib/builtins.py:5808
3632
msgid ""
3633
"bzr send makes extensive use of public locations to map local locations "
3634
"into\n"
3635
"URLs that can be used by other people. See `bzr help configuration` to\n"
3636
"set them, and use `bzr info` to display them."
3637
msgstr ""
3638
3639
#: bzrlib/builtins.py:5832
3640
msgid "Write merge directive to this file or directory; use - for stdout."
3641
msgstr ""
3642
3643
#: bzrlib/builtins.py:5836
3644
msgid ""
3645
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3646
"strict disables the check."
3647
msgstr ""
3648
3649
#: bzrlib/builtins.py:5838
3650
msgid "Mail the request to this address."
3651
msgstr ""
3652
3653
#: bzrlib/builtins.py:5842
3654
msgid "Body for the email."
3655
msgstr ""
3656
3657
#: bzrlib/builtins.py:5895
3658
msgid "Do not include a bundle in the merge directive."
3659
msgstr ""
3660
3661
#: bzrlib/builtins.py:5896
3662
msgid "Do not include a preview patch in the merge directive."
3663
msgstr ""
3664
3665
#: bzrlib/builtins.py:5899
3666
msgid "Remember submit and public branch."
3667
msgstr ""
3668
3669
#: bzrlib/builtins.py:5901
3670
msgid ""
3671
"Branch to generate the submission from, rather than the one containing the "
3672
"working directory."
3673
msgstr ""
3674
3675
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3676
msgid "format"
3677
msgstr ""
3678
3679
#: bzrlib/builtins.py:5912
3680
msgid "Use the specified output format."
3681
msgstr ""
3682
3683
#: bzrlib/builtins.py:5934
3684
msgid "Create, remove or modify a tag naming a revision."
3685
msgstr ""
3686
3687
#: bzrlib/builtins.py:5936
3688
msgid ""
3689
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3690
"(--revision) option can be given -rtag:X, where X is any previously\n"
3691
"created tag."
3692
msgstr ""
3693
3694
#: bzrlib/builtins.py:5940
3695
msgid ""
3696
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3697
"along when you branch, push, pull or merge."
3698
msgstr ""
3699
3700
#: bzrlib/builtins.py:5943
3701
msgid ""
3702
"It is an error to give a tag name that already exists unless you pass\n"
3703
"--force, in which case the tag is moved to point to the new revision."
3704
msgstr ""
3705
3706
#: bzrlib/builtins.py:5946
3707
msgid ""
3708
"To rename a tag (change the name but keep it on the same revsion), run "
3709
"``bzr\n"
3710
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3711
msgstr ""
3712
3713
#: bzrlib/builtins.py:5949
3714
msgid ""
3715
"If no tag name is specified it will be determined through the \n"
3716
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3717
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3718
"details."
3719
msgstr ""
3720
3721
#: bzrlib/builtins.py:5959
3722
msgid "Delete this tag rather than placing it."
3723
msgstr ""
3724
3725
#: bzrlib/builtins.py:5962
3726
msgid "Branch in which to place the tag."
3727
msgstr ""
3728
3729
#: bzrlib/builtins.py:5964
3730
msgid "Replace existing tags."
3731
msgstr ""
3732
3733
#: bzrlib/builtins.py:5979
3734
msgid "No tag specified to delete."
3735
msgstr ""
3736
3737
#: bzrlib/builtins.py:5981
3738
#, python-format
3739
msgid "Deleted tag %s."
3740
msgstr ""
3741
3742
#: bzrlib/builtins.py:5995
3743
msgid "Please specify a tag name."
3744
msgstr ""
3745
3746
#: bzrlib/builtins.py:6003
3747
#, python-format
3748
msgid "Tag %s already exists for that revision."
3749
msgstr ""
3750
3751
#: bzrlib/builtins.py:6007
3752
#, python-format
3753
msgid "Created tag %s."
3754
msgstr ""
3755
3756
#: bzrlib/builtins.py:6009
3757
#, python-format
3758
msgid "Updated tag %s."
3759
msgstr ""
3760
3761
#: bzrlib/builtins.py:6013
3762
msgid "List tags."
3763
msgstr ""
3764
3765
#: bzrlib/builtins.py:6015
3766
msgid ""
3767
"This command shows a table of tag names and the revisions they reference."
3768
msgstr ""
3769
3770
#: bzrlib/builtins.py:6021
3771
msgid "Branch whose tags should be displayed."
3772
msgstr ""
3773
3774
#: bzrlib/builtins.py:6023
3775
msgid "Sort tags by different criteria."
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:6023
3779
msgid "Sorting"
3780
msgstr ""
3781
3782
#: bzrlib/builtins.py:6092
3783
msgid "Reconfigure the type of a bzr directory."
3784
msgstr ""
3785
3786
#: bzrlib/builtins.py:6094
3787
msgid "A target configuration must be specified."
3788
msgstr ""
3789
3790
#: bzrlib/builtins.py:6096
3791
msgid ""
3792
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3793
"The order of preference is\n"
3794
"1. For a lightweight checkout, the current bound location.\n"
3795
"2. For branches that used to be checkouts, the previously-bound location.\n"
3796
"3. The push location.\n"
3797
"4. The parent location.\n"
3798
"If none of these is available, --bind-to must be specified."
3799
msgstr ""
3800
3801
#: bzrlib/builtins.py:6110
3802
msgid "Tree type"
3803
msgstr ""
3804
3805
#: bzrlib/builtins.py:6111
3806
msgid "The relation between branch and tree."
3807
msgstr ""
3808
3809
#: bzrlib/builtins.py:6113
3810
msgid "Reconfigure to be an unbound branch with no working tree."
3811
msgstr ""
3812
3813
#: bzrlib/builtins.py:6114
3814
msgid "Reconfigure to be an unbound branch with a working tree."
3815
msgstr ""
3816
3817
#: bzrlib/builtins.py:6115
3818
msgid "Reconfigure to be a bound branch with a working tree."
3819
msgstr ""
3820
3821
#: bzrlib/builtins.py:6116
3822
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3823
msgstr ""
3824
3825
#: bzrlib/builtins.py:6121
3826
msgid "Repository type"
3827
msgstr ""
3828
3829
#: bzrlib/builtins.py:6122
3830
msgid "Location fo the repository."
3831
msgstr ""
3832
3833
#: bzrlib/builtins.py:6124
3834
msgid ""
3835
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3836
msgstr ""
3837
3838
#: bzrlib/builtins.py:6126
3839
msgid "Reconfigure to use a shared repository."
3840
msgstr ""
3841
3842
#: bzrlib/builtins.py:6130
3843
msgid "Trees in Repository"
3844
msgstr ""
3845
3846
#: bzrlib/builtins.py:6131
3847
msgid "Whether new branches in the repository have trees."
3848
msgstr ""
3849
3850
#: bzrlib/builtins.py:6133
3851
msgid ""
3852
"Reconfigure repository to create working trees on branches by default."
3853
msgstr ""
3854
3855
#: bzrlib/builtins.py:6135
3856
msgid ""
3857
"Reconfigure repository to not create working trees on branches by default."
3858
msgstr ""
3859
3860
#: bzrlib/builtins.py:6138
3861
msgid "Branch to bind checkout to."
3862
msgstr ""
3863
3864
#: bzrlib/builtins.py:6140
3865
msgid "Perform reconfiguration even if local changes will be lost."
3866
msgstr ""
3867
3868
#: bzrlib/builtins.py:6143
3869
msgid "Reconfigure a branch to be stacked on another branch."
3870
msgstr ""
3871
3872
#: bzrlib/builtins.py:6147
3873
msgid ""
3874
"Reconfigure a branch to be unstacked. This may require copying substantial "
3875
"data into it."
3876
msgstr ""
3877
3878
#: bzrlib/builtins.py:6157
3879
msgid "Can't use both --stacked-on and --unstacked"
3880
msgstr ""
3881
3882
#: bzrlib/builtins.py:6171
3883
msgid "No target configuration specified"
3884
msgstr ""
3885
3886
#: bzrlib/builtins.py:6206
3887
msgid "Set the branch of a checkout and update."
3888
msgstr ""
3889
3890
#: bzrlib/builtins.py:6208
3891
msgid ""
3892
"For lightweight checkouts, this changes the branch being referenced.\n"
3893
"For heavyweight checkouts, this checks that there are no local commits\n"
3894
"versus the current bound branch, then it makes the local branch a mirror\n"
3895
"of the new location and binds to it."
3896
msgstr ""
3897
3898
#: bzrlib/builtins.py:6213
3899
msgid ""
3900
"In both cases, the working tree is updated and uncommitted changes\n"
3901
"are merged. The user can commit or revert these as they desire."
3902
msgstr ""
3903
3904
#: bzrlib/builtins.py:6216
3905
msgid "Pending merges need to be committed or reverted before using switch."
3906
msgstr ""
3907
3908
#: bzrlib/builtins.py:6218
3909
msgid ""
3910
"The path to the branch to switch to can be specified relative to the parent\n"
3911
"directory of the current branch. For example, if you are currently in a\n"
3912
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3913
"/path/to/newbranch."
3914
msgstr ""
3915
3916
#: bzrlib/builtins.py:6223
3917
msgid ""
3918
"Bound branches use the nickname of its master branch unless it is set\n"
3919
"locally, in which case switching will update the local nickname to be\n"
3920
"that of the master."
3921
msgstr ""
3922
3923
#: bzrlib/builtins.py:6231
3924
msgid "Switch even if local commits will be lost."
3925
msgstr ""
3926
3927
#: bzrlib/builtins.py:6234
3928
msgid "Create the target branch from this one before switching to it."
3929
msgstr ""
3930
3931
#: bzrlib/builtins.py:6248
3932
msgid "You must supply either a revision or a location"
3933
msgstr ""
3934
3935
#: bzrlib/builtins.py:6261
3936
msgid "cannot create branch without source branch"
3937
msgstr ""
3938
3939
#: bzrlib/builtins.py:6286
3940
msgid "Manage filtered views."
3941
msgstr ""
3942
3943
#: bzrlib/builtins.py:6288
3944
msgid ""
3945
"Views provide a mask over the tree so that users can focus on\n"
3946
"a subset of a tree when doing their work. After creating a view,\n"
3947
"commands that support a list of files - status, diff, commit, etc -\n"
3948
"effectively have that list of files implicitly given each time.\n"
3949
"An explicit list of files can still be given but those files\n"
3950
"must be within the current view."
3951
msgstr ""
3952
3953
#: bzrlib/builtins.py:6295
3954
msgid ""
3955
"In most cases, a view has a short life-span: it is created to make\n"
3956
"a selected change and is deleted once that change is committed.\n"
3957
"At other times, you may wish to create one or more named views\n"
3958
"and switch between them."
3959
msgstr ""
3960
3961
#: bzrlib/builtins.py:6300
3962
msgid ""
3963
"To disable the current view without deleting it, you can switch to\n"
3964
"the pseudo view called ``off``. This can be useful when you need\n"
3965
"to see the whole tree for an operation or two (e.g. merge) but\n"
3966
"want to switch back to your view after that."
3967
msgstr ""
3968
3969
#: bzrlib/builtins.py:6305
3970
msgid ""
3971
":Examples:\n"
3972
" To define the current view::"
3973
msgstr ""
3974
3975
#: bzrlib/builtins.py:6308
3976
msgid " bzr view file1 dir1 ..."
3977
msgstr ""
3978
3979
#: bzrlib/builtins.py:6310
3980
msgid " To list the current view::"
3981
msgstr ""
3982
3983
#: bzrlib/builtins.py:6312
3984
msgid " bzr view"
3985
msgstr ""
3986
3987
#: bzrlib/builtins.py:6314
3988
msgid " To delete the current view::"
3989
msgstr ""
3990
3991
#: bzrlib/builtins.py:6316
3992
msgid " bzr view --delete"
3993
msgstr ""
3994
3995
#: bzrlib/builtins.py:6318
3996
msgid " To disable the current view without deleting it::"
3997
msgstr ""
3998
3999
#: bzrlib/builtins.py:6320
4000
msgid " bzr view --switch off"
4001
msgstr ""
4002
4003
#: bzrlib/builtins.py:6322
4004
msgid " To define a named view and switch to it::"
4005
msgstr ""
4006
4007
#: bzrlib/builtins.py:6324
4008
msgid " bzr view --name view-name file1 dir1 ..."
4009
msgstr ""
4010
4011
#: bzrlib/builtins.py:6326
4012
msgid " To list a named view::"
4013
msgstr ""
4014
4015
#: bzrlib/builtins.py:6328
4016
msgid " bzr view --name view-name"
4017
msgstr ""
4018
4019
#: bzrlib/builtins.py:6330
4020
msgid " To delete a named view::"
4021
msgstr ""
4022
4023
#: bzrlib/builtins.py:6332
4024
msgid " bzr view --name view-name --delete"
4025
msgstr ""
4026
4027
#: bzrlib/builtins.py:6334
4028
msgid " To switch to a named view::"
4029
msgstr ""
4030
4031
#: bzrlib/builtins.py:6336
4032
msgid " bzr view --switch view-name"
4033
msgstr ""
4034
4035
#: bzrlib/builtins.py:6338
4036
msgid " To list all views defined::"
4037
msgstr ""
4038
4039
#: bzrlib/builtins.py:6340
4040
msgid " bzr view --all"
4041
msgstr ""
4042
4043
#: bzrlib/builtins.py:6342
4044
msgid " To delete all views::"
4045
msgstr ""
4046
4047
#: bzrlib/builtins.py:6344
4048
msgid " bzr view --delete --all"
4049
msgstr ""
4050
4051
#: bzrlib/builtins.py:6351
4052
msgid "Apply list or delete action to all views."
4053
msgstr ""
4054
4055
#: bzrlib/builtins.py:6354
4056
msgid "Delete the view."
4057
msgstr ""
4058
4059
#: bzrlib/builtins.py:6357
4060
msgid "Name of the view to define, list or delete."
4061
msgstr ""
4062
4063
#: bzrlib/builtins.py:6361
4064
msgid "Name of the view to switch to."
4065
msgstr ""
4066
4067
#: bzrlib/builtins.py:6380
4068
msgid "Both --delete and a file list specified"
4069
msgstr ""
4070
4071
#: bzrlib/builtins.py:6383
4072
msgid "Both --delete and --switch specified"
4073
msgstr ""
4074
4075
#: bzrlib/builtins.py:6386
4076
msgid "Deleted all views.\n"
4077
msgstr ""
4078
4079
#: bzrlib/builtins.py:6388
4080
msgid "No current view to delete"
4081
msgstr ""
4082
4083
#: bzrlib/builtins.py:6391
4084
#, python-format
4085
msgid "Deleted '%s' view.\n"
4086
msgstr ""
4087
4088
#: bzrlib/builtins.py:6395
4089
msgid "Both --switch and a file list specified"
4090
msgstr ""
4091
4092
#: bzrlib/builtins.py:6398
4093
msgid "Both --switch and --all specified"
4094
msgstr ""
4095
4096
#: bzrlib/builtins.py:6401
4097
msgid "No current view to disable"
4098
msgstr ""
4099
4100
#: bzrlib/builtins.py:6403
4101
#, python-format
4102
msgid "Disabled '%s' view.\n"
4103
msgstr ""
4104
4105
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4106
msgid "Using '{0}' view: {1}\n"
4107
msgstr ""
4108
4109
#: bzrlib/builtins.py:6410
4110
msgid "Views defined:\n"
4111
msgstr ""
4112
4113
#: bzrlib/builtins.py:6419
4114
msgid "No views defined.\n"
4115
msgstr ""
4116
4117
#: bzrlib/builtins.py:6426
4118
msgid "Cannot change the 'off' pseudo view"
4119
msgstr ""
4120
4121
#: bzrlib/builtins.py:6434
4122
msgid "No current view.\n"
4123
msgstr ""
4124
4125
#: bzrlib/builtins.py:6437
4126
msgid "'{0}' view is: {1}\n"
4127
msgstr ""
4128
4129
#: bzrlib/builtins.py:6457
4130
msgid " <no hooks installed>\n"
4131
msgstr ""
4132
4133
#: bzrlib/builtins.py:6461
4134
msgid "Remove a branch."
4135
msgstr ""
4136
4137
#: bzrlib/builtins.py:6463
4138
msgid ""
4139
"This will remove the branch from the specified location but \n"
4140
"will keep any working tree or repository in place."
4141
msgstr ""
4142
4143
#: bzrlib/builtins.py:6468
4144
msgid " Remove the branch at repo/trunk::"
4145
msgstr ""
4146
4147
#: bzrlib/builtins.py:6470
4148
msgid " bzr remove-branch repo/trunk"
4149
msgstr ""
4150
4151
#: bzrlib/builtins.py:6477
4152
msgid "Remove branch even if it is the active branch."
4153
msgstr ""
4154
4155
#: bzrlib/builtins.py:6491
4156
msgid "Branch is active. Use --force to remove it."
4157
msgstr ""
4158
4159
#: bzrlib/builtins.py:6495
4160
msgid "Plaintext diff output."
4161
msgstr ""
4162
4163
#: bzrlib/builtins.py:6496
4164
msgid "Temporarily set aside some changes from the current tree."
4165
msgstr ""
4166
4167
#: bzrlib/builtins.py:6498
4168
msgid ""
4169
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4170
"ie. out of the way, until a later time when you can bring them back from\n"
4171
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4172
"your working tree, and so they aren't propagated along with your branch nor\n"
4173
"will they survive its deletion."
4174
msgstr ""
4175
4176
#: bzrlib/builtins.py:6504
4177
msgid "If shelve --list is specified, previously-shelved changes are listed."
4178
msgstr ""
4179
4180
#: bzrlib/builtins.py:6506
4181
msgid ""
4182
"Shelve is intended to help separate several sets of changes that have\n"
4183
"been inappropriately mingled. If you just want to get rid of all changes\n"
4184
"and you don't need to restore them later, use revert. If you want to\n"
4185
"shelve all text changes at once, use shelve --all."
4186
msgstr ""
4187
4188
#: bzrlib/builtins.py:6511
4189
msgid ""
4190
"If filenames are specified, only the changes to those files will be\n"
4191
"shelved. Other files will be left untouched."
4192
msgstr ""
4193
4194
#: bzrlib/builtins.py:6514
4195
msgid ""
4196
"If a revision is specified, changes since that revision will be shelved."
4197
msgstr ""
4198
4199
#: bzrlib/builtins.py:6516
4200
msgid ""
4201
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4202
"restore the most recently shelved changes."
4203
msgstr ""
4204
4205
#: bzrlib/builtins.py:6519
4206
msgid ""
4207
"For complicated changes, it is possible to edit the changes in a separate\n"
4208
"editor program to decide what the file remaining in the working copy\n"
4209
"should look like. To do this, add the configuration option"
4210
msgstr ""
4211
4212
#: bzrlib/builtins.py:6523
4213
msgid " change_editor = PROGRAM @new_path @old_path"
4214
msgstr ""
4215
4216
#: bzrlib/builtins.py:6525
4217
msgid ""
4218
"where @new_path is replaced with the path of the new version of the \n"
4219
"file and @old_path is replaced with the path of the old version of \n"
4220
"the file. The PROGRAM should save the new file with the desired \n"
4221
"contents of the file in the working tree.\n"
4222
" "
4223
msgstr ""
4224
4225
#: bzrlib/builtins.py:6537
4226
msgid "Shelve all changes."
4227
msgstr ""
4228
4229
#: bzrlib/builtins.py:6539
4230
msgid "Method to use for writing diffs."
4231
msgstr ""
4232
4233
#: bzrlib/builtins.py:6539
4234
msgid "writer"
4235
msgstr ""
4236
4237
#: bzrlib/builtins.py:6543
4238
msgid "List shelved changes."
4239
msgstr ""
4240
4241
#: bzrlib/builtins.py:6545
4242
msgid "Destroy removed changes instead of shelving them."
4243
msgstr ""
4244
4245
#: bzrlib/builtins.py:6574
4246
msgid "No shelved changes."
4247
msgstr ""
4248
4249
#: bzrlib/builtins.py:6585
4250
msgid "Restore shelved changes."
4251
msgstr ""
4252
4253
#: bzrlib/builtins.py:6587
4254
msgid ""
4255
"By default, the most recently shelved changes are restored. However if you\n"
4256
"specify a shelf by id those changes will be restored instead. This works\n"
4257
"best when the changes don't depend on each other."
4258
msgstr ""
4259
4260
#: bzrlib/builtins.py:6596
4261
msgid "The action to perform."
4262
msgstr ""
4263
4264
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4265
msgid "action"
4266
msgstr ""
4267
4268
#: bzrlib/builtins.py:6598
4269
msgid "Apply changes and remove from the shelf."
4270
msgstr ""
4271
4272
#: bzrlib/builtins.py:6599
4273
msgid "Show changes, but do not apply or remove them."
4274
msgstr ""
4275
4276
#: bzrlib/builtins.py:6600
4277
msgid ""
4278
"Instead of unshelving the changes, show the diff that would result from "
4279
"unshelving."
4280
msgstr ""
4281
4282
#: bzrlib/builtins.py:6602
4283
msgid "Delete changes without applying them."
4284
msgstr ""
4285
4286
#: bzrlib/builtins.py:6603
4287
msgid "Apply changes but don't delete them."
4288
msgstr ""
4289
4290
#: bzrlib/builtins.py:6618
4291
msgid "Remove unwanted files from working tree."
4292
msgstr ""
4293
4294
#: bzrlib/builtins.py:6620
4295
msgid ""
4296
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4297
"files are never deleted."
4298
msgstr ""
4299
4300
#: bzrlib/builtins.py:6623
4301
msgid ""
4302
"Another class is 'detritus', which includes files emitted by bzr during\n"
4303
"normal operations and selftests. (The value of these files decreases with\n"
4304
"time.)"
4305
msgstr ""
4306
4307
#: bzrlib/builtins.py:6627
4308
msgid ""
4309
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4310
"flags are respected, and may be combined."
4311
msgstr ""
4312
4313
#: bzrlib/builtins.py:6630
4314
msgid "To check what clean-tree will do, use --dry-run."
4315
msgstr ""
4316
4317
#: bzrlib/builtins.py:6633
4318
msgid "Delete all ignored files."
4319
msgstr ""
4320
4321
#: bzrlib/builtins.py:6634
4322
msgid ""
4323
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4324
msgstr ""
4325
4326
#: bzrlib/builtins.py:6637
4327
msgid "Delete files unknown to bzr (default)."
4328
msgstr ""
4329
4330
#: bzrlib/builtins.py:6638
4331
msgid "Show files to delete instead of deleting them."
4332
msgstr ""
4333
4334
#: bzrlib/builtins.py:6640
4335
msgid "Do not prompt before deleting."
4336
msgstr ""
4337
4338
#: bzrlib/bundle/__init__.py:59
4339
msgid "A directory cannot be a bundle"
4340
msgstr ""
4341
4342
#: bzrlib/bundle/apply_bundle.py:40
4343
msgid "Install revisions"
4344
msgstr ""
4345
4346
#: bzrlib/bundle/commands.py:64
4347
msgid "--verbose requires a merge directive"
4348
msgstr ""
4349
4350
#: bzrlib/bundle/commands.py:67
4351
msgid "Bundle format not supported"
4352
msgstr ""
4353
4354
#: bzrlib/bundle/commands.py:77
4355
msgid "Records\n"
4356
msgstr ""
4357
4358
#: bzrlib/bundle/commands.py:81
4359
msgid "{0}: {1} ({2} multiparent)\n"
4360
msgstr ""
4361
4362
#: bzrlib/bundle/commands.py:83
4363
#, python-format
4364
msgid "unique files: %d\n"
4365
msgstr ""
4366
4367
#: bzrlib/bundle/commands.py:92
4368
msgid "Revisions\n"
4369
msgstr ""
4370
4371
#: bzrlib/bundle/commands.py:93
4372
#, python-format
4373
msgid "nicks: %s\n"
4374
msgstr ""
4375
4376
#: bzrlib/bundle/commands.py:95
4377
#, python-format
4378
msgid ""
4379
"committers: \n"
4380
"%s\n"
4381
msgstr ""
4382
4383
#: bzrlib/bundle/commands.py:103
4384
msgid "Decoded contents\n"
4385
msgstr ""
4386
4387
#: bzrlib/bundle/serializer/v4.py:327
4388
#, python-format
4389
msgid "Bundling %d revision."
4390
msgid_plural "Bundling %d revisions."
4391
msgstr[0] ""
4392
msgstr[1] ""
4393
4394
#: bzrlib/bzrdir.py:487
4395
msgid ""
4396
"making backup of {0}\n"
4397
" to {1}"
4398
msgstr ""
4399
4400
#: bzrlib/bzrdir.py:510
4401
msgid "renamed {0} to {1}"
4402
msgstr ""
4403
4404
#: bzrlib/bzrdir.py:1639
4405
#, python-format
4406
msgid ""
4407
"Source repository format does not support stacking, using format:\n"
4408
" %s"
4409
msgstr ""
4410
4411
#: bzrlib/bzrdir.py:1659
4412
#, python-format
4413
msgid ""
4414
"Source branch format does not support stacking, using format:\n"
4415
" %s"
4416
msgstr ""
4417
4418
#: bzrlib/bzrdir.py:1805
4419
msgid "starting repository conversion"
4420
msgstr ""
4421
4422
#: bzrlib/bzrdir.py:2026
4423
msgid "Using default stacking branch {0} at {1}"
4424
msgstr ""
4425
4426
#: bzrlib/check.py:108
4427
msgid "check"
4428
msgstr ""
4429
4430
#: bzrlib/check.py:110
4431
msgid "checking revisions"
4432
msgstr ""
4433
4434
#: bzrlib/check.py:112
4435
msgid "checking commit contents"
4436
msgstr ""
4437
4438
#: bzrlib/check.py:114
4439
msgid "checking file graphs"
4440
msgstr ""
4441
4442
#: bzrlib/check.py:118
4443
msgid "checking branches and trees"
4444
msgstr ""
4445
4446
#: bzrlib/check.py:205
4447
msgid "checked repository {0} format {1}"
4448
msgstr ""
4449
4450
#: bzrlib/check.py:208
4451
#, python-format
4452
msgid "%6d revisions"
4453
msgstr ""
4454
4455
#: bzrlib/check.py:209
4456
#, python-format
4457
msgid "%6d file-ids"
4458
msgstr ""
4459
4460
#: bzrlib/check.py:211
4461
#, python-format
4462
msgid "%6d unreferenced text versions"
4463
msgstr ""
4464
4465
#: bzrlib/check.py:215
4466
msgid "unreferenced version: {{{0}}} in {1}"
4467
msgstr ""
4468
4469
#: bzrlib/check.py:218
4470
#, python-format
4471
msgid "%6d revisions are missing inventory_sha1"
4472
msgstr ""
4473
4474
#: bzrlib/check.py:221
4475
#, python-format
4476
msgid "%6d revisions are mentioned but not present"
4477
msgstr ""
4478
4479
#: bzrlib/check.py:224
4480
#, python-format
4481
msgid "%6d ghost revisions"
4482
msgstr ""
4483
4484
#: bzrlib/check.py:229
4485
#, python-format
4486
msgid "%6d revisions missing parents in ancestry"
4487
msgstr ""
4488
4489
#: bzrlib/check.py:233
4490
#, python-format
4491
msgid " %s should be in the ancestry for:"
4492
msgstr ""
4493
4494
#: bzrlib/check.py:237
4495
#, python-format
4496
msgid "%6d inconsistent parents"
4497
msgstr ""
4498
4499
#: bzrlib/check.py:241
4500
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4501
msgstr ""
4502
4503
#: bzrlib/check.py:247
4504
#, python-format
4505
msgid "%6d revisions have incorrect parents in the revision index"
4506
msgstr ""
4507
4508
#: bzrlib/check.py:253
4509
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4510
msgstr ""
4511
4512
#: bzrlib/check.py:267
4513
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4514
msgstr ""
4515
4516
#: bzrlib/check.py:296
4517
msgid ""
4518
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4519
"{{{4}}}"
4520
msgstr ""
4521
4522
#: bzrlib/check.py:354
4523
#, python-format
4524
msgid "Checking branch at '%s'."
4525
msgstr ""
4526
4527
#: bzrlib/check.py:374
4528
#, python-format
4529
msgid "Checking working tree at '%s'."
4530
msgstr ""
4531
4532
#: bzrlib/check.py:427 bzrlib/check.py:441
4533
msgid "No branch found at specified location."
4534
msgstr ""
4535
4536
#: bzrlib/check.py:429 bzrlib/check.py:439
4537
msgid "No working tree found at specified location."
4538
msgstr ""
4539
4540
#: bzrlib/check.py:432
4541
#, python-format
4542
msgid "Checking repository at '%s'."
4543
msgstr ""
4544
4545
#: bzrlib/check.py:443
4546
msgid "No repository found at specified location."
4547
msgstr ""
4548
4549
#: bzrlib/clean_tree.py:63
4550
msgid "Nothing to delete."
4551
msgstr ""
4552
4553
#: bzrlib/clean_tree.py:68
4554
msgid "Are you sure you wish to delete these"
4555
msgstr ""
4556
4557
#: bzrlib/clean_tree.py:70
4558
msgid "Canceled"
4559
msgstr ""
4560
4561
#: bzrlib/clean_tree.py:107
4562
#, python-format
4563
msgid "unable to remove %s"
4564
msgstr ""
4565
4566
#: bzrlib/clean_tree.py:111
4567
msgid "deleting paths:"
4568
msgstr ""
4569
4570
#: bzrlib/clean_tree.py:125
4571
msgid "unable to remove \"{0}\": {1}."
4572
msgstr ""
4573
4574
#: bzrlib/clean_tree.py:130
4575
msgid "No files deleted."
4576
msgstr ""
4577
4578
#: bzrlib/cmd_version_info.py:47
4579
msgid "No known version info format {0}. Supported types are: {1}"
4580
msgstr ""
4581
4582
#: bzrlib/cmd_version_info.py:52
4583
msgid "Version info in Custom template-based format."
4584
msgstr ""
4585
4586
#: bzrlib/cmd_version_info.py:52
4587
msgid "Version info in Python format."
4588
msgstr ""
4589
4590
#: bzrlib/cmd_version_info.py:52
4591
msgid "Version info in RIO (simple text) format (default)."
4592
msgstr ""
4593
4594
#: bzrlib/cmd_version_info.py:53
4595
msgid "Show version information about this tree."
4596
msgstr ""
4597
4598
#: bzrlib/cmd_version_info.py:55
4599
msgid ""
4600
"You can use this command to add information about version into\n"
4601
"source code of an application. The output can be in one of the\n"
4602
"supported formats or in a custom format based on a template."
4603
msgstr ""
4604
4605
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4606
#: en/help_topics/configuration.txt:722
4607
msgid "For example::"
4608
msgstr ""
4609
4610
#: bzrlib/cmd_version_info.py:61
4611
msgid ""
4612
" bzr version-info --custom \\\n"
4613
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4614
msgstr ""
4615
4616
#: bzrlib/cmd_version_info.py:64
4617
msgid ""
4618
"will produce a C header file with formatted string containing the\n"
4619
"current revision number. Other supported variables in templates are:"
4620
msgstr ""
4621
4622
#: bzrlib/cmd_version_info.py:67
4623
msgid ""
4624
" * {date} - date of the last revision\n"
4625
" * {build_date} - current date\n"
4626
" * {revno} - revision number\n"
4627
" * {revision_id} - revision id\n"
4628
" * {branch_nick} - branch nickname\n"
4629
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4630
" otherwise 1"
4631
msgstr ""
4632
4633
#: bzrlib/cmd_version_info.py:77
4634
msgid "Select the output format."
4635
msgstr ""
4636
4637
#: bzrlib/cmd_version_info.py:81
4638
msgid "Include all possible information."
4639
msgstr ""
4640
4641
#: bzrlib/cmd_version_info.py:82
4642
msgid "Check if tree is clean."
4643
msgstr ""
4644
4645
#: bzrlib/cmd_version_info.py:84
4646
msgid "Include the revision-history."
4647
msgstr ""
4648
4649
#: bzrlib/cmd_version_info.py:86
4650
msgid "Include the last revision for each file."
4651
msgstr ""
4652
4653
#: bzrlib/cmd_version_info.py:87
4654
msgid "Template for the output."
4655
msgstr ""
4656
4657
#: bzrlib/cmd_version_info.py:101
4658
msgid "bzr version-info --revision takes exactly one revision specifier"
4659
msgstr ""
4660
4661
#: bzrlib/commands.py:229
4662
#, python-format
4663
msgid "unknown command \"%s\""
4664
msgstr ""
4665
4666
#: bzrlib/commands.py:476
4667
msgid "No help for this command."
4668
msgstr ""
4669
4670
#: bzrlib/commands.py:489
4671
#, python-format
4672
msgid ":Purpose: %s\n"
4673
msgstr ""
4674
4675
#: bzrlib/commands.py:491
4676
#, python-format
4677
msgid ""
4678
":Usage:\n"
4679
"%s\n"
4680
msgstr ""
4681
4682
#: bzrlib/commands.py:493
4683
#, python-format
4684
msgid ":Usage: %s\n"
4685
msgstr ""
4686
4687
#: bzrlib/commands.py:512
4688
#, python-format
4689
msgid ":Options:%s"
4690
msgstr ""
4691
4692
#: bzrlib/commands.py:523
4693
#, python-format
4694
msgid ""
4695
":Description:\n"
4696
" %s\n"
4697
"\n"
4698
msgstr ""
4699
4700
#: bzrlib/commands.py:533
4701
#, python-format
4702
msgid ""
4703
"See bzr help %s for more details and examples.\n"
4704
"\n"
4705
msgstr ""
4706
4707
#: bzrlib/commands.py:538
4708
msgid ":Aliases: "
4709
msgstr ""
4710
4711
#: bzrlib/commands.py:542
4712
#, python-format
4713
msgid ":From: plugin \"%s\"\n"
4714
msgstr ""
4715
4716
#: bzrlib/commands.py:554
4717
msgid ":doc:`{0} <{1}-help>`"
4718
msgstr ""
4719
4720
#: bzrlib/commands.py:558
4721
#, python-format
4722
msgid ":See also: %s"
4723
msgstr ""
4724
4725
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4726
msgid "Only ASCII permitted in option names"
4727
msgstr ""
4728
4729
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4730
msgid "command {0!r} needs one or more {1}"
4731
msgstr ""
4732
4733
#: bzrlib/commands.py:868
4734
msgid "command {0!r} requires argument {1}"
4735
msgstr ""
4736
4737
#: bzrlib/commands.py:875
4738
msgid "extra argument to command {0}: {1}"
4739
msgstr ""
4740
4741
#: bzrlib/commands.py:972
4742
#, python-format
4743
msgid "Profile data written to \"%s\"."
4744
msgstr ""
4745
4746
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4747
msgid "added"
4748
msgstr ""
4749
4750
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4751
msgid "modified"
4752
msgstr ""
4753
4754
#: bzrlib/commit.py:131
4755
#, python-format
4756
msgid "Committing%s"
4757
msgstr ""
4758
4759
#: bzrlib/commit.py:134
4760
#, python-format
4761
msgid "Committed revision %d."
4762
msgstr ""
4763
4764
#: bzrlib/commit.py:143
4765
#, python-format
4766
msgid "deleted %s"
4767
msgstr ""
4768
4769
#: bzrlib/commit.py:146
4770
#, python-format
4771
msgid "missing %s"
4772
msgstr ""
4773
4774
#: bzrlib/commit.py:511
4775
msgid ""
4776
"Conflicting tags in bound branch:\n"
4777
"{0}"
4778
msgstr ""
4779
4780
#: bzrlib/commit.py:742
4781
msgid "renamed"
4782
msgstr ""
4783
4784
#: bzrlib/commit.py:976
4785
msgid "unchanged"
4786
msgstr ""
4787
4788
#: bzrlib/commit.py:998
4789
msgid "{0} [{1}] - Stage"
4790
msgstr ""
4791
4792
#: bzrlib/commit.py:1001
4793
#, python-format
4794
msgid "%s - Stage"
4795
msgstr ""
4796
4797
#: bzrlib/commit_signature_commands.py:34
4798
msgid "Sign all commits by a given committer."
4799
msgstr ""
4800
4801
#: bzrlib/commit_signature_commands.py:36
4802
msgid ""
4803
"If location is not specified the local tree is used.\n"
4804
"If committer is not specified the default committer is used."
4805
msgstr ""
4806
4807
#: bzrlib/commit_signature_commands.py:39
4808
msgid "This does not sign commits that already have signatures."
4809
msgstr ""
4810
4811
#: bzrlib/commit_signature_commands.py:47
4812
msgid ""
4813
"Don't actually sign anything, just print the revisions that would be signed."
4814
msgstr ""
4815
4816
#: bzrlib/commit_signature_commands.py:98
4817
#, python-format
4818
msgid "Signed %d revision.\n"
4819
msgid_plural "Signed %d revisions.\n"
4820
msgstr[0] ""
4821
msgstr[1] ""
4822
4823
#: bzrlib/commit_signature_commands.py:103
4824
msgid "Verify all commit signatures."
4825
msgstr ""
4826
4827
#: bzrlib/commit_signature_commands.py:105
4828
msgid ""
4829
"Verifies that all commits in the branch are signed by known GnuPG keys."
4830
msgstr ""
4831
4832
#: bzrlib/commit_signature_commands.py:110
4833
msgid ""
4834
"Comma separated list of GPG key patterns which are acceptable for "
4835
"verification."
4836
msgstr ""
4837
4838
#: bzrlib/commit_signature_commands.py:148
4839
msgid "Cannot verify a range of non-revision-history revisions"
4840
msgstr ""
4841
4842
#: bzrlib/commit_signature_commands.py:166
4843
msgid "All commits signed with verifiable keys"
4844
msgstr ""
4845
4846
#: bzrlib/config.py:436
4847
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4848
msgstr ""
4849
4850
#: bzrlib/config.py:2452
4851
msgid "{0} is not an SI unit."
4852
msgstr ""
4853
4854
#: bzrlib/config.py:2971
4855
msgid ""
4856
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4857
"will be saved."
4858
msgstr ""
4859
4860
#: bzrlib/config.py:3116
4861
#, python-format
4862
msgid "Invalid '%s', should be of the form 'name=value'"
4863
msgstr ""
4864
4865
#: bzrlib/config.py:4018
4866
msgid "Display, set or remove a configuration option."
4867
msgstr ""
4868
4869
#: bzrlib/config.py:4020
4870
msgid "Display the active value for a given option."
4871
msgstr ""
4872
4873
#: bzrlib/config.py:4022
4874
msgid ""
4875
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4876
"matching options are displayed mentioning their scope. The active value\n"
4877
"that bzr will take into account is the first one displayed for each option."
4878
msgstr ""
4879
4880
#: bzrlib/config.py:4026
4881
msgid "If no NAME is given, --all .* is implied."
4882
msgstr ""
4883
4884
#: bzrlib/config.py:4028
4885
msgid ""
4886
"Setting a value is achieved by using name=value without spaces. The value\n"
4887
"is set in the most relevant scope and can be checked by displaying the\n"
4888
"option again."
4889
msgstr ""
4890
4891
#: bzrlib/config.py:4040
4892
msgid "Reduce the scope to the specified configuration file."
4893
msgstr ""
4894
4895
#: bzrlib/config.py:4044
4896
msgid "Display all the defined values for the matching options."
4897
msgstr ""
4898
4899
#: bzrlib/config.py:4046
4900
msgid "Remove the option from the configuration file."
4901
msgstr ""
4902
4903
#: bzrlib/conflicts.py:50
4904
msgid "List files with conflicts."
4905
msgstr ""
4906
4907
#: bzrlib/conflicts.py:57
4908
msgid ""
4909
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4910
"is supplied, the pathnames of files with text conflicts are listed,\n"
4911
"instead. (This is useful for editing all files with text conflicts.)"
4912
msgstr ""
4913
4914
#: bzrlib/conflicts.py:61
4915
msgid "Use bzr resolve when you have fixed a problem."
4916
msgstr ""
4917
4918
#: bzrlib/conflicts.py:66
4919
msgid "List paths of files with text conflicts."
4920
msgstr ""
4921
4922
#: bzrlib/conflicts.py:85
4923
msgid "Marks the conflict as resolved."
4924
msgstr ""
4925
4926
#: bzrlib/conflicts.py:88
4927
msgid "Resolve the conflict preserving the version in the working tree."
4928
msgstr ""
4929
4930
#: bzrlib/conflicts.py:91
4931
msgid "Resolve the conflict taking the merged version into account."
4932
msgstr ""
4933
4934
#: bzrlib/conflicts.py:98
4935
msgid "How to resolve the conflict."
4936
msgstr ""
4937
4938
#: bzrlib/conflicts.py:104
4939
msgid "Mark a conflict as resolved."
4940
msgstr ""
4941
4942
#: bzrlib/conflicts.py:111
4943
msgid ""
4944
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4945
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4946
"as\n"
4947
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4948
msgstr ""
4949
4950
#: bzrlib/conflicts.py:119
4951
msgid "Resolve all conflicts in this tree."
4952
msgstr ""
4953
4954
#: bzrlib/conflicts.py:126
4955
msgid "If --all is specified, no FILE may be provided"
4956
msgstr ""
4957
4958
#: bzrlib/conflicts.py:151
4959
#, python-format
4960
msgid "%d conflict auto-resolved."
4961
msgid_plural "%d conflicts auto-resolved."
4962
msgstr[0] ""
4963
msgstr[1] ""
4964
4965
#: bzrlib/conflicts.py:154
4966
msgid "Remaining conflicts:"
4967
msgstr ""
4968
4969
#: bzrlib/conflicts.py:159
4970
msgid "All conflicts resolved."
4971
msgstr ""
4972
4973
#: bzrlib/conflicts.py:168
4974
msgid "{0} conflict resolved, {1} remaining"
4975
msgid_plural "{0} conflicts resolved, {1} remaining"
4976
msgstr[0] ""
4977
msgstr[1] ""
4978
4979
#: bzrlib/controldir.py:712
4980
msgid "{0} is{1} redirected to {2}"
4981
msgstr ""
4982
4983
#: bzrlib/diff.py:399
4984
#, python-format
4985
msgid "*** Ignoring files outside view. View is %s"
4986
msgstr ""
4987
4988
#: bzrlib/errors.py:157
4989
msgid "The tree builder is already building a tree."
4990
msgstr ""
4991
4992
#: bzrlib/errors.py:178
4993
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4994
msgstr ""
4995
4996
#: bzrlib/errors.py:197
4997
msgid ""
4998
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4999
"versions \"%(minimum)s\" to \"%(current)s\"."
5000
msgstr ""
5001
5002
#: bzrlib/errors.py:209
5003
msgid "The transport '%(transport)s' is only accessible within this process."
5004
msgstr ""
5005
5006
#: bzrlib/errors.py:227
5007
msgid "Invalid revision number %(revno)s"
5008
msgstr ""
5009
5010
#: bzrlib/errors.py:236
5011
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5012
msgstr ""
5013
5014
#: bzrlib/errors.py:247
5015
msgid "Reserved revision-id {%(revision_id)s}"
5016
msgstr ""
5017
5018
#: bzrlib/errors.py:261
5019
msgid "There is no public branch set for \"%(branch_url)s\"."
5020
msgstr ""
5021
5022
#: bzrlib/errors.py:271
5023
msgid ""
5024
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5025
"obtain a list of topics."
5026
msgstr ""
5027
5028
#: bzrlib/errors.py:280
5029
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5030
msgstr ""
5031
5032
#: bzrlib/errors.py:290
5033
msgid ""
5034
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5035
msgstr ""
5036
5037
#: bzrlib/errors.py:299
5038
msgid "The branch '%(branch)s' is not stacked."
5039
msgstr ""
5040
5041
#: bzrlib/errors.py:313
5042
msgid "No WorkingTree exists for \"%(base)s\"."
5043
msgstr ""
5044
5045
#: bzrlib/errors.py:322
5046
msgid "Not currently building a tree."
5047
msgstr ""
5048
5049
#: bzrlib/errors.py:327
5050
msgid "%(url)s is not a local path."
5051
msgstr ""
5052
5053
#: bzrlib/errors.py:355
5054
msgid "%(not_locked)r is not write locked but needs to be."
5055
msgstr ""
5056
5057
#: bzrlib/errors.py:363
5058
msgid "Error in command line options"
5059
msgstr ""
5060
5061
#: bzrlib/errors.py:368
5062
msgid "%(value)s is not an index of type %(_type)s."
5063
msgstr ""
5064
5065
#: bzrlib/errors.py:378
5066
msgid "Error in data for index %(value)s."
5067
msgstr ""
5068
5069
#: bzrlib/errors.py:387
5070
msgid "The key '%(key)s' is already in index '%(index)s'."
5071
msgstr ""
5072
5073
#: bzrlib/errors.py:397
5074
msgid "The key '%(key)s' is not a valid key."
5075
msgstr ""
5076
5077
#: bzrlib/errors.py:406
5078
msgid "Could not parse options for index %(value)s."
5079
msgstr ""
5080
5081
#: bzrlib/errors.py:415
5082
msgid "The value '%(value)s' is not a valid value."
5083
msgstr ""
5084
5085
#: bzrlib/errors.py:424
5086
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5087
msgstr ""
5088
5089
#: bzrlib/errors.py:443
5090
msgid "Generic path error: %(path)r%(extra)s)"
5091
msgstr ""
5092
5093
#: bzrlib/errors.py:456
5094
msgid "No such file: %(path)r%(extra)s"
5095
msgstr ""
5096
5097
#: bzrlib/errors.py:461
5098
msgid "File exists: %(path)r%(extra)s"
5099
msgstr ""
5100
5101
#: bzrlib/errors.py:467
5102
msgid ""
5103
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5104
"after to tell bzr about a rename that has already happened)%(extra)s"
5105
msgstr ""
5106
5107
#: bzrlib/errors.py:483
5108
msgid "\"%(path)s\" is not a directory %(extra)s"
5109
msgstr ""
5110
5111
#: bzrlib/errors.py:488
5112
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5113
msgstr ""
5114
5115
#: bzrlib/errors.py:493
5116
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5117
msgstr ""
5118
5119
#: bzrlib/errors.py:498
5120
msgid "Hard-linking \"%(path)s\" is not supported"
5121
msgstr ""
5122
5123
#: bzrlib/errors.py:513
5124
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5125
msgstr ""
5126
5127
#: bzrlib/errors.py:518
5128
msgid "Permission denied: \"%(path)s\"%(extra)s"
5129
msgstr ""
5130
5131
#: bzrlib/errors.py:523
5132
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5133
msgstr ""
5134
5135
#: bzrlib/errors.py:528
5136
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5137
msgstr ""
5138
5139
#: bzrlib/errors.py:539
5140
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5141
msgstr ""
5142
5143
#: bzrlib/errors.py:561
5144
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:571
5148
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5149
msgstr ""
5150
5151
#: bzrlib/errors.py:579
5152
msgid ""
5153
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5154
"upgrade the branch to permit branch stacking."
5155
msgstr ""
5156
5157
#: bzrlib/errors.py:590
5158
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5159
msgstr ""
5160
5161
#: bzrlib/errors.py:600
5162
msgid ""
5163
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5164
"need to upgrade the repository to permit branch stacking."
5165
msgstr ""
5166
5167
#: bzrlib/errors.py:611
5168
msgid "Error reading from %(path)r."
5169
msgstr ""
5170
5171
#: bzrlib/errors.py:630
5172
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5173
msgstr ""
5174
5175
#: bzrlib/errors.py:646
5176
msgid "Path \"%(path)s\" is not unicode normalized"
5177
msgstr "Path \"%(path)s\" is not unicode normalised"
5178
5179
#: bzrlib/errors.py:654
5180
msgid "Not a branch: \"%(path)s\"%(detail)s."
5181
msgstr ""
5182
5183
#: bzrlib/errors.py:696
5184
msgid "No submit branch available for branch \"%(path)s\""
5185
msgstr ""
5186
5187
#: bzrlib/errors.py:705
5188
msgid "A control directory already exists: \"%(path)s\"."
5189
msgstr ""
5190
5191
#: bzrlib/errors.py:710
5192
msgid "Already a branch: \"%(path)s\"."
5193
msgstr ""
5194
5195
#: bzrlib/errors.py:715
5196
msgid "Invalid branch name: %(name)s"
5197
msgstr ""
5198
5199
#: bzrlib/errors.py:724
5200
msgid "Parent branch already exists: \"%(path)s\"."
5201
msgstr ""
5202
5203
#: bzrlib/errors.py:730
5204
msgid ""
5205
"Directory contains a branch, but no working tree (use bzr checkout if you "
5206
"wish to build a working tree): \"%(path)s\""
5207
msgstr ""
5208
5209
#: bzrlib/errors.py:735
5210
msgid ""
5211
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5212
msgstr ""
5213
5214
#: bzrlib/errors.py:745
5215
msgid ""
5216
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5217
msgstr ""
5218
5219
#: bzrlib/errors.py:755
5220
msgid "No repository present: \"%(path)s\""
5221
msgstr ""
5222
5223
#: bzrlib/errors.py:762
5224
msgid ""
5225
"Unsupported branch format: %(format)s\n"
5226
"Please run 'bzr upgrade'"
5227
msgstr ""
5228
5229
#: bzrlib/errors.py:768
5230
msgid "Unknown %(kind)s format: %(format)r"
5231
msgstr "Unknown %(kind)s format: %(format)r"
5232
5233
#: bzrlib/errors.py:777
5234
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5235
msgstr ""
5236
5237
#: bzrlib/errors.py:787
5238
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5239
msgstr ""
5240
5241
#: bzrlib/errors.py:802
5242
msgid ""
5243
"%(target)s\n"
5244
"is not compatible with\n"
5245
"%(source)s\n"
5246
"%(details)s"
5247
msgstr ""
5248
5249
#: bzrlib/errors.py:818
5250
msgid "Revision is not compatible with %(repo_format)s"
5251
msgstr ""
5252
5253
#: bzrlib/errors.py:828
5254
msgid "%(context_info)s%(path)s is already versioned."
5255
msgstr ""
5256
5257
#: bzrlib/errors.py:849
5258
msgid "%(context_info)s%(path)s is not versioned."
5259
msgstr ""
5260
5261
#: bzrlib/errors.py:870
5262
msgid "Path(s) are not versioned: %(paths_as_string)s"
5263
msgstr ""
5264
5265
#: bzrlib/errors.py:881
5266
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5267
msgstr ""
5268
5269
#: bzrlib/errors.py:900
5270
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5271
msgstr "Cannot operate on \"%(filename)s\" of unsupported type \"%(kind)s\""
5272
5273
#: bzrlib/errors.py:908
5274
msgid ""
5275
"Filename %(filename)r is not valid in your current filesystem encoding "
5276
"%(fs_encoding)s"
5277
msgstr ""
5278
5279
#: bzrlib/errors.py:919
5280
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5281
msgstr ""
5282
5283
#: bzrlib/errors.py:937
5284
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5285
msgstr ""
5286
5287
#: bzrlib/errors.py:976
5288
msgid "Cannot lock %(lock)s: %(why)s"
5289
msgstr ""
5290
5291
#: bzrlib/errors.py:986
5292
msgid ""
5293
"A transaction related operation was attempted after the transaction finished."
5294
msgstr ""
5295
5296
#: bzrlib/errors.py:1013
5297
msgid "Cannot lock: transport is read only: %(transport)s"
5298
msgstr ""
5299
5300
#: bzrlib/errors.py:1021
5301
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5302
msgstr ""
5303
5304
#: bzrlib/errors.py:1032
5305
msgid ""
5306
"Lock was broken while still open: %(lock)s - check storage consistency!"
5307
msgstr ""
5308
5309
#: bzrlib/errors.py:1043
5310
msgid ""
5311
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5312
"%(holder)r, wanted to break %(target)r"
5313
msgstr ""
5314
5315
#: bzrlib/errors.py:1055
5316
msgid ""
5317
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5318
"Use 'bzr break-lock' to clear it"
5319
msgstr ""
5320
5321
#: bzrlib/errors.py:1068
5322
msgid "Lock not held: %(lock)s"
5323
msgstr ""
5324
5325
#: bzrlib/errors.py:1097
5326
msgid "No changes to commit"
5327
msgstr ""
5328
5329
#: bzrlib/errors.py:1102
5330
msgid ""
5331
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5332
msgstr ""
5333
5334
#: bzrlib/errors.py:1112
5335
msgid ""
5336
"Excluding paths during commit is not supported by repository at "
5337
"%(repository)r."
5338
msgstr ""
5339
5340
#: bzrlib/errors.py:1121
5341
msgid ""
5342
"The specified commit message contains characters unsupported by the current "
5343
"encoding."
5344
msgstr ""
5345
5346
#: bzrlib/errors.py:1127
5347
msgid "Upgrade URL cannot work with readonly URLs."
5348
msgstr ""
5349
5350
#: bzrlib/errors.py:1132
5351
msgid "The branch format %(format)s is already at the most recent format."
5352
msgstr ""
5353
5354
#: bzrlib/errors.py:1155
5355
msgid "Option --change does not accept revision ranges"
5356
msgstr ""
5357
5358
#: bzrlib/errors.py:1160
5359
msgid "No namespace registered for string: %(spec)r"
5360
msgstr ""
5361
5362
#: bzrlib/errors.py:1179
5363
msgid ""
5364
"Requested revision: '%(spec)s' does not exist in branch: "
5365
"%(branch_url)s%(extra)s"
5366
msgstr ""
5367
5368
#: bzrlib/errors.py:1193
5369
msgid ""
5370
"Operation denied because it would change the main history, which is not "
5371
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:1204
5375
msgid ""
5376
"These branches have diverged. Use the missing command to see how.\n"
5377
"Use the merge command to reconcile them."
5378
msgstr ""
5379
5380
#: bzrlib/errors.py:1224
5381
msgid ""
5382
"Branches have no common ancestor, and no merge base revision was specified."
5383
msgstr ""
5384
5385
#: bzrlib/errors.py:1230
5386
msgid ""
5387
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5388
msgstr ""
5389
5390
#: bzrlib/errors.py:1236
5391
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5392
msgstr ""
5393
5394
#: bzrlib/errors.py:1245
5395
msgid ""
5396
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5397
msgstr ""
5398
5399
#: bzrlib/errors.py:1254
5400
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5401
msgstr ""
5402
5403
#: bzrlib/errors.py:1263
5404
msgid "Branch %(branch)s has no commits."
5405
msgstr ""
5406
5407
#: bzrlib/errors.py:1281
5408
msgid ""
5409
"Bound branch %(branch)s is out of date with master branch "
5410
"%(master)s.%(extra_help)s"
5411
msgstr ""
5412
5413
#: bzrlib/errors.py:1293
5414
msgid ""
5415
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5416
"bound to %(remote)s."
5417
msgstr ""
5418
5419
#: bzrlib/errors.py:1305
5420
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5421
msgstr ""
5422
5423
#: bzrlib/errors.py:1314
5424
msgid ""
5425
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5426
"%(error)s"
5427
msgstr ""
5428
5429
#: bzrlib/errors.py:1326
5430
msgid "Error in processing weave: %(msg)s"
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1335
5434
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5435
msgstr ""
5436
5437
#: bzrlib/errors.py:1346
5438
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5439
msgstr ""
5440
5441
#: bzrlib/errors.py:1356
5442
msgid "Weave invariant violated: %(what)s"
5443
msgstr ""
5444
5445
#: bzrlib/errors.py:1365
5446
msgid "Parents are mismatched between two revisions. %(msg)s"
5447
msgstr ""
5448
5449
#: bzrlib/errors.py:1387
5450
msgid ""
5451
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5452
"%(weave_b)s"
5453
msgstr ""
5454
5455
#: bzrlib/errors.py:1399
5456
msgid "Versioned file error"
5457
msgstr ""
5458
5459
#: bzrlib/errors.py:1404
5460
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5461
msgstr ""
5462
5463
#: bzrlib/errors.py:1414
5464
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5465
msgstr ""
5466
5467
#: bzrlib/errors.py:1424
5468
msgid "Text did not match its checksum: %(msg)s"
5469
msgstr ""
5470
5471
#: bzrlib/errors.py:1550
5472
msgid "Export format %(format)r not supported"
5473
msgstr ""
5474
5475
#: bzrlib/errors.py:1559
5476
msgid "Transport error: %(msg)s %(orig_error)s"
5477
msgstr ""
5478
5479
#: bzrlib/errors.py:1585
5480
msgid "Generic bzr smart protocol error: %(details)s"
5481
msgstr ""
5482
5483
#: bzrlib/errors.py:1593
5484
msgid "Received bad protocol version marker: %(marker)r"
5485
msgstr ""
5486
5487
#: bzrlib/errors.py:1625
5488
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5489
msgstr ""
5490
5491
#: bzrlib/errors.py:1630
5492
msgid "Connection error: %(msg)s %(orig_error)s"
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:1635
5496
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5497
msgstr ""
5498
5499
#: bzrlib/errors.py:1656
5500
msgid "Connection closed: %(msg)s %(orig_error)s"
5501
msgstr ""
5502
5503
#: bzrlib/errors.py:1661
5504
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5505
msgstr ""
5506
5507
#: bzrlib/errors.py:1666
5508
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5509
msgstr ""
5510
5511
#: bzrlib/errors.py:1676
5512
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5513
msgstr ""
5514
5515
#: bzrlib/errors.py:1691
5516
msgid "Certificate error: %(error)s"
5517
msgstr ""
5518
5519
#: bzrlib/errors.py:1699
5520
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5521
msgstr ""
5522
5523
#: bzrlib/errors.py:1713
5524
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5525
msgstr ""
5526
5527
#: bzrlib/errors.py:1721
5528
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5529
msgstr ""
5530
5531
#: bzrlib/errors.py:1730
5532
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5533
msgstr ""
5534
5535
#: bzrlib/errors.py:1744
5536
msgid "Too many redirections"
5537
msgstr ""
5538
5539
#: bzrlib/errors.py:1749
5540
msgid "Working tree has conflicts."
5541
msgstr ""
5542
5543
#: bzrlib/errors.py:1753
5544
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5545
msgstr ""
5546
5547
#: bzrlib/errors.py:1762
5548
msgid ""
5549
"Error(s) parsing config file %(filename)s:\n"
5550
"%(errors)s"
5551
msgstr ""
5552
5553
#: bzrlib/errors.py:1772
5554
msgid ""
5555
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5556
"See ``bzr help %(name)s``"
5557
msgstr ""
5558
5559
#: bzrlib/errors.py:1782
5560
msgid "%(username)r does not seem to contain a reasonable email address"
5561
msgstr ""
5562
5563
#: bzrlib/errors.py:1791
5564
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5565
msgstr ""
5566
5567
#: bzrlib/errors.py:1799
5568
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5569
msgstr ""
5570
5571
#: bzrlib/errors.py:1807
5572
msgid "Unable to import library \"%(library)s\": %(error)s"
5573
msgstr ""
5574
5575
#: bzrlib/errors.py:1815
5576
msgid "python-gpgme is not installed, it is needed to verify signatures"
5577
msgstr ""
5578
5579
#: bzrlib/errors.py:1823
5580
msgid ""
5581
"The working tree for %(basedir)s has changed since the last commit, but "
5582
"weave merge requires that it be unchanged"
5583
msgstr ""
5584
5585
#: bzrlib/errors.py:1833
5586
msgid ""
5587
"Can't reprocess and show base, because reprocessing obscures the "
5588
"relationship of conflicting lines to the base"
5589
msgstr ""
5590
5591
#: bzrlib/errors.py:1839
5592
msgid "Cycle in graph %(graph)r"
5593
msgstr ""
5594
5595
#: bzrlib/errors.py:1867
5596
msgid "File %(filename)s is not conflicted."
5597
msgstr ""
5598
5599
#: bzrlib/errors.py:1889
5600
msgid "No bundle was found in \"%(filename)s\"."
5601
msgstr ""
5602
5603
#: bzrlib/errors.py:1898
5604
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5605
msgstr ""
5606
5607
#: bzrlib/errors.py:1908
5608
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5609
msgstr ""
5610
5611
#: bzrlib/errors.py:1921
5612
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5613
msgstr ""
5614
5615
#: bzrlib/errors.py:1931
5616
msgid "Key %(key)s is already present in map"
5617
msgstr ""
5618
5619
#: bzrlib/errors.py:1936
5620
msgid "The prefix %(prefix)s is in the help search path twice."
5621
msgstr ""
5622
5623
#: bzrlib/errors.py:1946
5624
msgid ""
5625
"No final name for trans_id %(trans_id)r\n"
5626
"file-id: %(file_id)r\n"
5627
"root trans-id: %(root_trans_id)r\n"
5628
msgstr ""
5629
5630
#: bzrlib/errors.py:1978
5631
msgid "Attempt to reuse a transform that has already been applied."
5632
msgstr ""
5633
5634
#: bzrlib/errors.py:1983
5635
msgid "Moving the root directory is not supported at this time"
5636
msgstr ""
5637
5638
#: bzrlib/errors.py:1988
5639
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5640
msgstr ""
5641
5642
#: bzrlib/errors.py:1999
5643
msgid ""
5644
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5645
msgstr ""
5646
5647
#: bzrlib/errors.py:2035
5648
msgid ""
5649
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5650
msgstr ""
5651
5652
#: bzrlib/errors.py:2065
5653
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5654
msgstr ""
5655
5656
#: bzrlib/errors.py:2073
5657
msgid "Nothing to merge."
5658
msgstr ""
5659
5660
#: bzrlib/errors.py:2078
5661
msgid "Format %(format)s cannot be initialised by this version of bzr."
5662
msgstr ""
5663
5664
#: bzrlib/errors.py:2087
5665
msgid ""
5666
"Cannot convert from format %(from_format)s to format %(format)s. "
5667
"%(problem)s"
5668
msgstr ""
5669
5670
#: bzrlib/errors.py:2099
5671
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5672
msgstr ""
5673
5674
#: bzrlib/errors.py:2107
5675
msgid "%(exe_name)s could not be found on this machine"
5676
msgstr ""
5677
5678
#: bzrlib/errors.py:2115
5679
msgid "Diff is not installed on this machine: %(msg)s"
5680
msgstr ""
5681
5682
#: bzrlib/errors.py:2123
5683
msgid "Diff3 is not installed on this machine."
5684
msgstr ""
5685
5686
#: bzrlib/errors.py:2129
5687
msgid "The content being inserted is already present."
5688
msgstr ""
5689
5690
#: bzrlib/errors.py:2134
5691
msgid ""
5692
"This tree contains left-over files from a failed operation.\n"
5693
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5694
"to\n"
5695
" keep, and delete it when you are done."
5696
msgstr ""
5697
5698
#: bzrlib/errors.py:2145
5699
msgid ""
5700
"This tree contains left-over files from a failed operation.\n"
5701
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5702
" wish to keep, and delete it when you are done."
5703
msgstr ""
5704
5705
#: bzrlib/errors.py:2155
5706
msgid ""
5707
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5708
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5709
"to\n"
5710
" keep, and delete it when you are done."
5711
msgstr ""
5712
5713
#: bzrlib/errors.py:2166
5714
msgid ""
5715
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5716
"examine %(pending_deletion)s to see if it contains any files you wish to "
5717
"keep, and delete it when you are done."
5718
msgstr ""
5719
5720
#: bzrlib/errors.py:2176
5721
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5722
msgstr ""
5723
5724
#: bzrlib/errors.py:2190
5725
msgid ""
5726
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5727
msgstr ""
5728
5729
#: bzrlib/errors.py:2203
5730
msgid "Error in merge modified format"
5731
msgstr ""
5732
5733
#: bzrlib/errors.py:2208
5734
msgid "Format error in conflict listings"
5735
msgstr ""
5736
5737
#: bzrlib/errors.py:2212
5738
msgid ""
5739
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5740
"Error: %(description)s"
5741
msgstr ""
5742
5743
#: bzrlib/errors.py:2223
5744
msgid ""
5745
"An error has been detected in the repository %(repo_path)s.\n"
5746
"Please run bzr reconcile on this repository."
5747
msgstr ""
5748
5749
#: bzrlib/errors.py:2234
5750
msgid ""
5751
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5752
"reason: %(reason)s"
5753
msgstr ""
5754
5755
#: bzrlib/errors.py:2247
5756
msgid ""
5757
"An inconsistent delta was supplied: %(delta)r\n"
5758
"reason: %(reason)s"
5759
msgstr ""
5760
5761
#: bzrlib/errors.py:2259
5762
msgid "To use this feature you must upgrade your branch at %(path)s."
5763
msgstr ""
5764
5765
#: bzrlib/errors.py:2268
5766
msgid "To use this feature you must upgrade your repository at %(path)s."
5767
msgstr ""
5768
5769
#: bzrlib/errors.py:2273
5770
msgid ""
5771
"To use this feature you must upgrade your branch at %(path)s to a format "
5772
"which supports rich roots."
5773
msgstr ""
5774
5775
#: bzrlib/errors.py:2279
5776
msgid "Cannot perform local-only commits on unbound branches."
5777
msgstr ""
5778
5779
#: bzrlib/errors.py:2284
5780
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5781
msgstr ""
5782
5783
#: bzrlib/errors.py:2305
5784
msgid "Ghost tags not supported by format %(format)r."
5785
msgstr ""
5786
5787
#: bzrlib/errors.py:2313
5788
msgid "File is binary but should be text."
5789
msgstr ""
5790
5791
#: bzrlib/errors.py:2318
5792
msgid "The path %(path)s is not permitted on this platform"
5793
msgstr ""
5794
5795
#: bzrlib/errors.py:2327
5796
msgid ""
5797
"Testament did not match expected value.\n"
5798
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5799
" {%(measured)s}"
5800
msgstr ""
5801
5802
#: bzrlib/errors.py:2339
5803
msgid "Not a bzr revision-bundle: %(text)r"
5804
msgstr ""
5805
5806
#: bzrlib/errors.py:2348
5807
msgid "Bad bzr revision-bundle: %(text)r"
5808
msgstr ""
5809
5810
#: bzrlib/errors.py:2357
5811
msgid "Malformed bzr revision-bundle header: %(text)r"
5812
msgstr ""
5813
5814
#: bzrlib/errors.py:2362
5815
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5816
msgstr ""
5817
5818
#: bzrlib/errors.py:2367
5819
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5820
msgstr ""
5821
5822
#: bzrlib/errors.py:2372
5823
msgid "End of line marker was not \\n in bzr revision-bundle"
5824
msgstr ""
5825
5826
#: bzrlib/errors.py:2382
5827
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5828
msgstr ""
5829
5830
#: bzrlib/errors.py:2392
5831
msgid "Root class for inventory serialization errors"
5832
msgstr "Root class for inventory serialisation errors"
5833
5834
#: bzrlib/errors.py:2396
5835
msgid ""
5836
"The inventory was not in the expected format:\n"
5837
" %(msg)s"
5838
msgstr ""
5839
5840
#: bzrlib/errors.py:2405
5841
msgid "This operation requires rich root data storage"
5842
msgstr ""
5843
5844
#: bzrlib/errors.py:2418
5845
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5846
msgstr ""
5847
5848
#: bzrlib/errors.py:2427
5849
msgid ""
5850
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5851
"variable."
5852
msgstr ""
5853
5854
#: bzrlib/errors.py:2434
5855
msgid ""
5856
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5857
"ghost at {%(ghost_revision_id)s}"
5858
msgstr ""
5859
5860
#: bzrlib/errors.py:2444
5861
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5862
msgstr ""
5863
5864
#: bzrlib/errors.py:2495
5865
msgid ""
5866
"A merge directive must provide either a bundle or a public branch location."
5867
msgstr ""
5868
5869
#: bzrlib/errors.py:2502
5870
msgid "Bad merge directive payload %(start)r"
5871
msgstr ""
5872
5873
#: bzrlib/errors.py:2512
5874
msgid "Preview patch does not match requested changes."
5875
msgstr ""
5876
5877
#: bzrlib/errors.py:2518
5878
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5879
msgstr ""
5880
5881
#: bzrlib/errors.py:2528
5882
msgid ""
5883
"Your branch does not have all of the revisions required in order to merge "
5884
"this merge directive and the target location specified in the merge "
5885
"directive is not a branch: %(location)s."
5886
msgstr ""
5887
5888
#: bzrlib/errors.py:2540
5889
msgid "Unsupported entry kind %(kind)s"
5890
msgstr "Unsupported entry type %(kind)s"
5891
5892
#: bzrlib/errors.py:2548
5893
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5894
msgstr ""
5895
5896
#: bzrlib/errors.py:2558
5897
msgid "Subsume target %(other_tree)s needs to be upgraded."
5898
msgstr ""
5899
5900
#: bzrlib/errors.py:2577
5901
msgid "No such tag: %(tag_name)s"
5902
msgstr ""
5903
5904
#: bzrlib/errors.py:2585
5905
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5906
msgstr ""
5907
5908
#: bzrlib/errors.py:2594
5909
msgid "Tag %(tag_name)s already exists."
5910
msgstr ""
5911
5912
#: bzrlib/errors.py:2602
5913
msgid ""
5914
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5915
"bugs\" for more information on this feature."
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:2612
5919
msgid ""
5920
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5921
msgstr ""
5922
5923
#: bzrlib/errors.py:2622
5924
msgid ""
5925
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5926
msgstr ""
5927
5928
#: bzrlib/errors.py:2632
5929
msgid "Invalid line in bugs property: '%(line)s'"
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:2640
5933
msgid "Invalid bug status: '%(status)s'"
5934
msgstr ""
5935
5936
#: bzrlib/errors.py:2648
5937
msgid "Could not understand response from smart server: %(response_tuple)r"
5938
msgstr ""
5939
5940
#: bzrlib/errors.py:2687
5941
msgid "Server sent an unexpected error: %(error_tuple)r"
5942
msgstr ""
5943
5944
#: bzrlib/errors.py:2706
5945
msgid "Unrecognised container format: %(container_format)r"
5946
msgstr ""
5947
5948
#: bzrlib/errors.py:2714
5949
msgid "Unexpected end of container stream"
5950
msgstr ""
5951
5952
#: bzrlib/errors.py:2719
5953
msgid "Unknown record type: %(record_type)r"
5954
msgstr ""
5955
5956
#: bzrlib/errors.py:2727
5957
msgid "Invalid record: %(reason)s"
5958
msgstr ""
5959
5960
#: bzrlib/errors.py:2735
5961
msgid "Container has data after end marker: %(excess)r"
5962
msgstr ""
5963
5964
#: bzrlib/errors.py:2743
5965
msgid "Container has multiple records with the same name: %(name)s"
5966
msgstr ""
5967
5968
#: bzrlib/errors.py:2756
5969
msgid "Corrupt or incompatible data stream: %(reason)s"
5970
msgstr ""
5971
5972
#: bzrlib/errors.py:2764
5973
msgid "SMTP error: %(error)s"
5974
msgstr ""
5975
5976
#: bzrlib/errors.py:2772
5977
msgid "No message supplied."
5978
msgstr ""
5979
5980
#: bzrlib/errors.py:2777
5981
msgid "No mail-to address (--mail-to) or output (-o) specified."
5982
msgstr ""
5983
5984
#: bzrlib/errors.py:2782
5985
msgid ""
5986
"Unable to find mail client with the following names: "
5987
"%(mail_command_list_string)s"
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:2792
5991
msgid "SMTP connection to %(host)s refused"
5992
msgstr ""
5993
5994
#: bzrlib/errors.py:2801
5995
msgid "Please specify smtp_server. No server at default %(host)s."
5996
msgstr ""
5997
5998
#: bzrlib/errors.py:2815
5999
msgid ""
6000
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6001
"reconfigure."
6002
msgstr ""
6003
6004
#: bzrlib/errors.py:2827
6005
msgid "'%(display_url)s' is already a branch."
6006
msgstr ""
6007
6008
#: bzrlib/errors.py:2832
6009
msgid "'%(display_url)s' is already a tree."
6010
msgstr ""
6011
6012
#: bzrlib/errors.py:2837
6013
msgid "'%(display_url)s' is already a checkout."
6014
msgstr ""
6015
6016
#: bzrlib/errors.py:2842
6017
msgid "'%(display_url)s' is already a lightweight checkout."
6018
msgstr ""
6019
6020
#: bzrlib/errors.py:2847
6021
msgid "'%(display_url)s' is already using a shared repository."
6022
msgstr ""
6023
6024
#: bzrlib/errors.py:2852
6025
msgid "'%(display_url)s' is already standalone."
6026
msgstr ""
6027
6028
#: bzrlib/errors.py:2857
6029
msgid "Shared repository '%(display_url)s' already creates working trees."
6030
msgstr ""
6031
6032
#: bzrlib/errors.py:2863
6033
msgid ""
6034
"Shared repository '%(display_url)s' already doesn't create working trees."
6035
msgstr ""
6036
6037
#: bzrlib/errors.py:2869
6038
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6039
msgstr ""
6040
6041
#: bzrlib/errors.py:2874
6042
msgid "No location could be found to bind to at %(display_url)s."
6043
msgstr ""
6044
6045
#: bzrlib/errors.py:2879
6046
msgid ""
6047
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6048
"status).%(more)s"
6049
msgstr ""
6050
6051
#: bzrlib/errors.py:2898
6052
msgid ""
6053
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6054
"list).%(more)s"
6055
msgstr ""
6056
6057
#: bzrlib/errors.py:2904
6058
msgid "Variable {%(name)s} is not available."
6059
msgstr ""
6060
6061
#: bzrlib/errors.py:2912
6062
msgid "No template specified."
6063
msgstr ""
6064
6065
#: bzrlib/errors.py:2917
6066
msgid "Unable to create symlink %(path_str)son this platform"
6067
msgstr ""
6068
6069
#: bzrlib/errors.py:2932
6070
msgid ""
6071
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6072
"\"original\", \"local\"."
6073
msgstr ""
6074
6075
#: bzrlib/errors.py:2966
6076
msgid ""
6077
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6078
msgstr ""
6079
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6080
6081
#: bzrlib/errors.py:2978
6082
msgid "The \"%(config_id)s\" configuration does not exist."
6083
msgstr ""
6084
6085
#: bzrlib/errors.py:2986
6086
msgid "The \"%(option_name)s\" configuration option does not exist."
6087
msgstr ""
6088
6089
#: bzrlib/errors.py:2994
6090
msgid "The alias \"%(alias_name)s\" does not exist."
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:3008
6094
msgid "\"%(alias_name)s\" is not a valid location alias."
6095
msgstr ""
6096
6097
#: bzrlib/errors.py:3016
6098
msgid "No %(alias_name)s location assigned."
6099
msgstr ""
6100
6101
#: bzrlib/errors.py:3024
6102
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6103
msgstr ""
6104
6105
#: bzrlib/errors.py:3034
6106
msgid "Unknown rules detected: %(unknowns_str)s."
6107
msgstr ""
6108
6109
#: bzrlib/errors.py:3045
6110
msgid "Tip change rejected: %(msg)s"
6111
msgstr ""
6112
6113
#: bzrlib/errors.py:3053
6114
msgid "Shelf corrupt."
6115
msgstr ""
6116
6117
#: bzrlib/errors.py:3058
6118
msgid "Corruption while decompressing repository file%(orig_error)s"
6119
msgstr ""
6120
6121
#: bzrlib/errors.py:3070
6122
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6123
msgstr ""
6124
6125
#: bzrlib/errors.py:3078
6126
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6127
msgstr ""
6128
6129
#: bzrlib/errors.py:3086
6130
msgid ""
6131
"An attempt to access a url outside the server jail was made: '%(url)s'."
6132
msgstr ""
6133
6134
#: bzrlib/errors.py:3094
6135
msgid "The user aborted the operation."
6136
msgstr ""
6137
6138
#: bzrlib/errors.py:3099
6139
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6140
msgstr ""
6141
6142
#: bzrlib/errors.py:3109
6143
msgid "No such view: %(view_name)s."
6144
msgstr ""
6145
6146
#: bzrlib/errors.py:3119
6147
msgid ""
6148
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6149
"to a later format."
6150
msgstr ""
6151
6152
#: bzrlib/errors.py:3128
6153
msgid ""
6154
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6155
msgstr ""
6156
6157
#: bzrlib/errors.py:3195
6158
msgid "%(bzrdir)r does not support co-located branches."
6159
msgstr ""
6160
6161
#: bzrlib/errors.py:3201
6162
msgid ""
6163
"Unable to determine your name.\n"
6164
"Please, set your name with the 'whoami' command.\n"
6165
"E.g. bzr whoami \"Your Name <name@example.com>\""
6166
msgstr ""
6167
6168
#: bzrlib/errors.py:3210
6169
msgid "Invalid pattern(s) found. %(msg)s"
6170
msgstr ""
6171
6172
#: bzrlib/errors.py:3218
6173
msgid ""
6174
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6175
"unbind` to fix."
6176
msgstr ""
6177
6178
#: bzrlib/errors.py:3229
6179
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6180
msgstr ""
6181
6182
#: bzrlib/errors.py:3238
6183
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6184
msgstr ""
6185
6186
#: bzrlib/errors.py:3247
6187
msgid ""
6188
"No compatible object available for operations from %(source)r to %(target)r."
6189
msgstr ""
6190
6191
#: bzrlib/errors.py:3257
6192
msgid ""
6193
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6194
"%(arguments)s."
6195
msgstr ""
6196
6197
#: bzrlib/errors.py:3267
6198
msgid ""
6199
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6200
"format %(format)r"
6201
msgstr ""
6202
"Type change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6203
"format %(format)r"
6204
6205
#: bzrlib/errors.py:3279
6206
msgid ""
6207
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6208
"plugin."
6209
msgstr ""
6210
6211
#: bzrlib/errors.py:3292
6212
msgid "Binary files section encountered."
6213
msgstr ""
6214
6215
#: bzrlib/errors.py:3300
6216
msgid ""
6217
"Malformed patch header. %(desc)s\n"
6218
"%(line)r"
6219
msgstr ""
6220
6221
#: bzrlib/errors.py:3309
6222
msgid ""
6223
"Malformed hunk header. %(desc)s\n"
6224
"%(line)r"
6225
msgstr ""
6226
6227
#: bzrlib/errors.py:3318
6228
msgid ""
6229
"Malformed line. %(desc)s\n"
6230
"%(line)r"
6231
msgstr ""
6232
6233
#: bzrlib/errors.py:3328
6234
msgid ""
6235
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6236
"but patch says it should be \"%(patch_line)s\""
6237
msgstr ""
6238
6239
#: bzrlib/errors.py:3339
6240
msgid "The feature %(feature)s has already been registered."
6241
msgstr ""
6242
6243
#: bzrlib/export_pot.py:252
6244
#, python-format
6245
msgid "Exporting messages from builtin command: %s"
6246
msgstr ""
6247
6248
#: bzrlib/export_pot.py:271
6249
msgid "Exporting messages from plugin command: {0} in {1}"
6250
msgstr ""
6251
6252
#: bzrlib/export_pot.py:292
6253
#, python-format
6254
msgid "Exporting message from error: %s"
6255
msgstr ""
6256
6257
#: bzrlib/fetch.py:98
6258
msgid "Finding revisions"
6259
msgstr ""
6260
6261
#: bzrlib/fetch.py:103
6262
msgid "Fetching revisions"
6263
msgstr ""
6264
6265
#: bzrlib/foreign.py:262
6266
msgid "Push into a different VCS without any custom bzr metadata."
6267
msgstr ""
6268
6269
#: bzrlib/foreign.py:264
6270
msgid ""
6271
"This will afterwards rebase the local branch on the remote\n"
6272
"branch unless the --no-rebase option is used, in which case \n"
6273
"the two branches will be out of sync after the push. "
6274
msgstr ""
6275
6276
#: bzrlib/foreign.py:277
6277
msgid "Do not rebase after push."
6278
msgstr ""
6279
6280
#: bzrlib/foreign.py:311
6281
#, python-format
6282
msgid "Using saved location: %s\n"
6283
msgstr ""
6284
6285
#: bzrlib/foreign.py:321
6286
msgid ""
6287
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6288
"regular push."
6289
msgstr ""
6290
6291
#: bzrlib/gpg.py:366
6292
msgid "No GnuPG key results for pattern: {0}"
6293
msgstr ""
6294
6295
#: bzrlib/gpg.py:439
6296
msgid "{0} commits with valid signatures"
6297
msgstr ""
6298
6299
#: bzrlib/gpg.py:445
6300
msgid "{0} commit with unknown key"
6301
msgid_plural "{0} commits with unknown keys"
6302
msgstr[0] ""
6303
msgstr[1] ""
6304
6305
#: bzrlib/gpg.py:453
6306
msgid "{0} commit not valid"
6307
msgid_plural "{0} commits not valid"
6308
msgstr[0] ""
6309
msgstr[1] ""
6310
6311
#: bzrlib/gpg.py:461
6312
msgid "{0} commit not signed"
6313
msgid_plural "{0} commits not signed"
6314
msgstr[0] ""
6315
msgstr[1] ""
6316
6317
#: bzrlib/gpg.py:469
6318
msgid "{0} commit with key now expired"
6319
msgid_plural "{0} commits with key now expired"
6320
msgstr[0] ""
6321
msgstr[1] ""
6322
6323
#: bzrlib/gpg.py:489
6324
msgid "{0} commit by author {1} with key {2} now expired"
6325
msgid_plural "{0} commits by author {1} with key {2} now expired"
6326
msgstr[0] ""
6327
msgstr[1] ""
6328
6329
#: bzrlib/gpg.py:505
6330
msgid "{0} signed {1} commit"
6331
msgid_plural "{0} signed {1} commits"
6332
msgstr[0] ""
6333
msgstr[1] ""
6334
6335
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6336
msgid "{0} commit by author {1}"
6337
msgid_plural "{0} commits by author {1}"
6338
msgstr[0] ""
6339
msgstr[1] ""
6340
6341
#: bzrlib/gpg.py:554
6342
msgid "Unknown key {0} signed {1} commit"
6343
msgid_plural "Unknown key {0} signed {1} commits"
6344
msgstr[0] ""
6345
msgstr[1] ""
6346
6347
#: bzrlib/groupcompress.py:1739
6348
#, python-format
6349
msgid "Insert claimed random_id=True, but then inserted %r two times"
6350
msgstr ""
6351
6352
#: bzrlib/hooks.py:313
6353
#, python-format
6354
msgid "Introduced in: %s"
6355
msgstr ""
6356
6357
#: bzrlib/hooks.py:316
6358
#, python-format
6359
msgid "Deprecated in: %s"
6360
msgstr ""
6361
6362
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6363
msgid "Walking content"
6364
msgstr ""
6365
6366
#: bzrlib/knit.py:3330
6367
msgid "annotating"
6368
msgstr ""
6369
6370
#: bzrlib/lock.py:548
6371
msgid "{0!r} was {1} locked again"
6372
msgstr ""
6373
6374
#: bzrlib/lockdir.py:321
6375
#, python-format
6376
msgid "error removing pending lock: %s"
6377
msgstr ""
6378
6379
#: bzrlib/lockdir.py:616
6380
msgid "Unable to obtain"
6381
msgstr ""
6382
6383
#: bzrlib/lockdir.py:618
6384
msgid "Lock owner changed for"
6385
msgstr ""
6386
6387
#: bzrlib/lockdir.py:620
6388
msgid "{0} lock {1} {2}."
6389
msgstr ""
6390
6391
#: bzrlib/lockdir.py:627
6392
#, python-format
6393
msgid "Will continue to try until %s, unless you press Ctrl-C."
6394
msgstr ""
6395
6396
#: bzrlib/lockdir.py:629
6397
msgid "See \"bzr help break-lock\" for more."
6398
msgstr ""
6399
6400
#: bzrlib/lockdir.py:739
6401
#, python-format
6402
msgid ""
6403
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6404
msgstr ""
6405
6406
#: bzrlib/log.py:563
6407
msgid "--exclude-common-ancestry requires two different revisions"
6408
msgstr ""
6409
6410
#: bzrlib/log.py:565
6411
#, python-format
6412
msgid "invalid direction %r"
6413
msgstr ""
6414
6415
#: bzrlib/log.py:653
6416
msgid "Start revision not found in history of end revision."
6417
msgstr ""
6418
6419
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6420
msgid "Logging revision 0 is invalid."
6421
msgstr ""
6422
6423
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6424
msgid "Start revision must be older than the end revision."
6425
msgstr ""
6426
6427
#: bzrlib/log.py:1818
6428
#, python-format
6429
msgid "unknown log formatter: %r"
6430
msgstr ""
6431
6432
#: bzrlib/log.py:2114
6433
msgid "fixes bug"
6434
msgid_plural "fixes bugs"
6435
msgstr[0] ""
6436
msgstr[1] ""
6437
6438
#: bzrlib/merge.py:689
6439
msgid "All changes applied successfully."
6440
msgstr ""
6441
6442
#: bzrlib/merge.py:691
6443
#, python-format
6444
msgid "%d conflicts encountered."
6445
msgstr ""
6446
6447
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6448
msgid "Preparing file merge"
6449
msgstr ""
6450
6451
#: bzrlib/multiparent.py:426
6452
msgid "Importing revisions"
6453
msgstr ""
6454
6455
#: bzrlib/option.py:526
6456
msgid "Show help message."
6457
msgstr ""
6458
6459
#: bzrlib/option.py:528
6460
msgid "Only display errors and warnings."
6461
msgstr ""
6462
6463
#: bzrlib/option.py:531
6464
msgid "Show usage message and options."
6465
msgstr ""
6466
6467
#: bzrlib/option.py:533
6468
msgid "Display more information."
6469
msgstr ""
6470
6471
#: bzrlib/option.py:541
6472
msgid ""
6473
"Select changes introduced by the specified revision. See also \"help "
6474
"revisionspec\"."
6475
msgstr ""
6476
6477
#: bzrlib/option.py:543
6478
msgid "Branch to operate on, instead of working directory."
6479
msgstr ""
6480
6481
#: bzrlib/option.py:545
6482
msgid "Detailed log format."
6483
msgstr ""
6484
6485
#: bzrlib/option.py:545
6486
msgid "Format used by GNU ChangeLog files."
6487
msgstr ""
6488
6489
#: bzrlib/option.py:545
6490
msgid "Log format with one line per revision."
6491
msgstr ""
6492
6493
#: bzrlib/option.py:545
6494
msgid "Moderately short log format."
6495
msgstr ""
6496
6497
#: bzrlib/option.py:545
6498
msgid "Use specified log format."
6499
msgstr ""
6500
6501
#: bzrlib/option.py:547
6502
msgid "Log format"
6503
msgstr ""
6504
6505
#: bzrlib/option.py:549
6506
msgid "LCA-newness merge."
6507
msgstr ""
6508
6509
#: bzrlib/option.py:549
6510
msgid "Merge using external diff3."
6511
msgstr ""
6512
6513
#: bzrlib/option.py:549
6514
msgid "Native diff3-style merge."
6515
msgstr ""
6516
6517
#: bzrlib/option.py:549
6518
msgid "Select a particular merge algorithm."
6519
msgstr ""
6520
6521
#: bzrlib/option.py:549
6522
msgid "Weave-based merge."
6523
msgstr ""
6524
6525
#: bzrlib/option.py:551
6526
msgid "Merge algorithm"
6527
msgstr ""
6528
6529
#: bzrlib/option.py:554
6530
msgid "Message string."
6531
msgstr ""
6532
6533
#: bzrlib/option.py:556
6534
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6535
msgstr ""
6536
6537
#: bzrlib/option.py:558
6538
msgid "Ignore differences between branches and overwrite unconditionally."
6539
msgstr ""
6540
6541
#: bzrlib/option.py:560
6542
msgid "Remember the specified location as a default."
6543
msgstr ""
6544
6545
#: bzrlib/option.py:562
6546
msgid "Reprocess to reduce spurious conflicts."
6547
msgstr ""
6548
6549
#: bzrlib/option.py:566
6550
msgid "See \"help revisionspec\" for details."
6551
msgstr ""
6552
6553
#: bzrlib/option.py:568
6554
msgid "Show internal object ids."
6555
msgstr ""
6556
6557
#: bzrlib/option.py:571
6558
msgid "Display timezone as local, original, or utc."
6559
msgstr ""
6560
6561
#: bzrlib/osutils.py:100
6562
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6563
msgstr ""
6564
6565
#: bzrlib/osutils.py:220
6566
msgid "lstat/stat of ({0!r}): {1!r}"
6567
msgstr ""
6568
6569
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6570
#, python-format
6571
msgid "sorry, %r not allowed in path"
6572
msgstr ""
6573
6574
#: bzrlib/osutils.py:1259
6575
#, python-format
6576
msgid "%r is too short to calculate a relative path"
6577
msgstr ""
6578
6579
#: bzrlib/plugin.py:143
6580
#, python-format
6581
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6582
msgstr ""
6583
6584
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6585
msgid "Enable completions for the selected plugin (default: all plugins)"
6586
msgstr ""
6587
6588
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6589
msgid "Generate a shell function for bash command line completion."
6590
msgstr ""
6591
6592
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6593
msgid ""
6594
"This command generates a shell function which can be used by bash to\n"
6595
"automatically complete the currently typed command when the user presses\n"
6596
"the completion key (usually tab)."
6597
msgstr ""
6598
6599
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6600
msgid ""
6601
"Commonly used like this:\n"
6602
" eval \"`bzr bash-completion`\""
6603
msgstr ""
6604
6605
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6606
msgid "Name of the generated function (default: _bzr)"
6607
msgstr ""
6608
6609
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6610
msgid "Generate only the shell function, don't enable it"
6611
msgstr ""
6612
6613
#: bzrlib/plugins/launchpad/account.py:66
6614
msgid "Setting ssh/sftp usernames for launchpad.net."
6615
msgstr ""
6616
6617
#: bzrlib/plugins/launchpad/cmds.py:44
6618
msgid "Register a branch with launchpad.net."
6619
msgstr ""
6620
6621
#: bzrlib/plugins/launchpad/cmds.py:46
6622
msgid ""
6623
"This command lists a bzr branch in the directory of branches on\n"
6624
"launchpad.net. Registration allows the branch to be associated with\n"
6625
"bugs or specifications."
6626
msgstr ""
6627
6628
#: bzrlib/plugins/launchpad/cmds.py:50
6629
msgid ""
6630
"Before using this command you must register the project to which the\n"
6631
"branch belongs, and create an account for yourself on launchpad.net."
6632
msgstr ""
6633
6634
#: bzrlib/plugins/launchpad/cmds.py:53
6635
msgid ""
6636
"arguments:\n"
6637
" public_url: The publicly visible url for the branch to register.\n"
6638
" This must be an http or https url (which Launchpad can read\n"
6639
" from to access the branch). Local file urls, SFTP urls, and\n"
6640
" bzr+ssh urls will not work.\n"
6641
" If no public_url is provided, bzr will use the configured\n"
6642
" public_url if there is one for the current branch, and\n"
6643
" otherwise error."
6644
msgstr ""
6645
6646
#: bzrlib/plugins/launchpad/cmds.py:62
6647
msgid ""
6648
"example:\n"
6649
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6650
" --project fooproject"
6651
msgstr ""
6652
6653
#: bzrlib/plugins/launchpad/cmds.py:69
6654
msgid "Launchpad project short name to associate with the branch."
6655
msgstr ""
6656
6657
#: bzrlib/plugins/launchpad/cmds.py:76
6658
msgid ""
6659
"Short name for the branch; by default taken from the last component of the "
6660
"url."
6661
msgstr ""
6662
6663
#: bzrlib/plugins/launchpad/cmds.py:80
6664
msgid "One-sentence description of the branch."
6665
msgstr ""
6666
6667
#: bzrlib/plugins/launchpad/cmds.py:83
6668
msgid "Longer description of the purpose or contents of the branch."
6669
msgstr ""
6670
6671
#: bzrlib/plugins/launchpad/cmds.py:86
6672
msgid "Branch author's email address, if not yourself."
6673
msgstr ""
6674
6675
#: bzrlib/plugins/launchpad/cmds.py:89
6676
msgid "The bug this branch fixes."
6677
msgstr ""
6678
6679
#: bzrlib/plugins/launchpad/cmds.py:92
6680
msgid "Prepare the request but don't actually send it."
6681
msgstr ""
6682
6683
#: bzrlib/plugins/launchpad/cmds.py:114
6684
msgid ""
6685
"register-branch requires a public branch url - see bzr help register-branch."
6686
msgstr ""
6687
6688
#: bzrlib/plugins/launchpad/cmds.py:122
6689
msgid "--product is deprecated; please use --project."
6690
msgstr ""
6691
6692
#: bzrlib/plugins/launchpad/cmds.py:152
6693
msgid "Open a Launchpad branch page in your web browser."
6694
msgstr ""
6695
6696
#: bzrlib/plugins/launchpad/cmds.py:157
6697
msgid "Do not actually open the browser. Just say the URL we would use."
6698
msgstr ""
6699
6700
#: bzrlib/plugins/launchpad/cmds.py:192
6701
#, python-format
6702
msgid "Opening %s in web browser"
6703
msgstr ""
6704
6705
#: bzrlib/plugins/launchpad/cmds.py:200
6706
msgid "Show or set the Launchpad user ID."
6707
msgstr ""
6708
6709
#: bzrlib/plugins/launchpad/cmds.py:202
6710
msgid ""
6711
"When communicating with Launchpad, some commands need to know your\n"
6712
"Launchpad user ID. This command can be used to set or show the\n"
6713
"user ID that Bazaar will use for such communication."
6714
msgstr ""
6715
6716
#: bzrlib/plugins/launchpad/cmds.py:206
6717
msgid ""
6718
":Examples:\n"
6719
" Show the Launchpad ID of the current user::"
6720
msgstr ""
6721
6722
#: bzrlib/plugins/launchpad/cmds.py:209
6723
msgid " bzr launchpad-login"
6724
msgstr ""
6725
6726
#: bzrlib/plugins/launchpad/cmds.py:211
6727
msgid " Set the Launchpad ID of the current user to 'bob'::"
6728
msgstr ""
6729
6730
#: bzrlib/plugins/launchpad/cmds.py:213
6731
msgid " bzr launchpad-login bob"
6732
msgstr ""
6733
6734
#: bzrlib/plugins/launchpad/cmds.py:220
6735
msgid "Don't check that the user name is valid."
6736
msgstr ""
6737
6738
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6739
msgid "Launchpad user ID exists and has SSH keys.\n"
6740
msgstr ""
6741
6742
#: bzrlib/plugins/launchpad/cmds.py:238
6743
msgid "No Launchpad user ID configured.\n"
6744
msgstr ""
6745
6746
#: bzrlib/plugins/launchpad/cmds.py:249
6747
#, python-format
6748
msgid "Launchpad user ID set to '%s'.\n"
6749
msgstr ""
6750
6751
#: bzrlib/plugins/launchpad/cmds.py:255
6752
msgid "Ask Launchpad to mirror a branch now."
6753
msgstr ""
6754
6755
#: bzrlib/plugins/launchpad/cmds.py:272
6756
msgid "Propose merging a branch on Launchpad."
6757
msgstr ""
6758
6759
#: bzrlib/plugins/launchpad/cmds.py:274
6760
msgid ""
6761
"This will open your usual editor to provide the initial comment. When it\n"
6762
"has created the proposal, it will open it in your default web browser."
6763
msgstr ""
6764
6765
#: bzrlib/plugins/launchpad/cmds.py:277
6766
msgid ""
6767
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6768
"is not supplied, the remembered submit branch will be used. If no submit\n"
6769
"branch is remembered, the development focus will be used."
6770
msgstr ""
6771
6772
#: bzrlib/plugins/launchpad/cmds.py:281
6773
msgid ""
6774
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6775
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6776
"The parameter the launchpad account name of the desired reviewer. This\n"
6777
"may optionally be followed by '=' and the review type. For example:"
6778
msgstr ""
6779
6780
#: bzrlib/plugins/launchpad/cmds.py:286
6781
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6782
msgstr ""
6783
6784
#: bzrlib/plugins/launchpad/cmds.py:288
6785
msgid ""
6786
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6787
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6788
msgstr ""
6789
6790
#: bzrlib/plugins/launchpad/cmds.py:293
6791
msgid "Propose the merge on staging."
6792
msgstr ""
6793
6794
#: bzrlib/plugins/launchpad/cmds.py:295
6795
msgid "Commit message."
6796
msgstr ""
6797
6798
#: bzrlib/plugins/launchpad/cmds.py:297
6799
msgid "Mark the proposal as approved immediately."
6800
msgstr ""
6801
6802
#: bzrlib/plugins/launchpad/cmds.py:298
6803
msgid "The bug this proposal fixes."
6804
msgstr ""
6805
6806
#: bzrlib/plugins/launchpad/cmds.py:300
6807
msgid "Requested reviewer and optional type."
6808
msgstr ""
6809
6810
#: bzrlib/plugins/launchpad/cmds.py:335
6811
msgid "Find the proposal to merge this revision."
6812
msgstr ""
6813
6814
#: bzrlib/plugins/launchpad/cmds.py:337
6815
msgid ""
6816
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6817
"This works only if the selected branch was the merge proposal target, and\n"
6818
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6819
"are opened in a web browser."
6820
msgstr ""
6821
6822
#: bzrlib/plugins/launchpad/cmds.py:342
6823
msgid ""
6824
"Any revision involved in the merge may be specified-- the revision in\n"
6825
"which the merge was performed, or one of the revisions that was merged."
6826
msgstr ""
6827
6828
#: bzrlib/plugins/launchpad/cmds.py:345
6829
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6830
msgstr ""
6831
6832
#: bzrlib/plugins/launchpad/cmds.py:347
6833
msgid " bzr lp-find-proposal -r annotate:README:1"
6834
msgstr ""
6835
6836
#: bzrlib/plugins/launchpad/cmds.py:363
6837
msgid "No review found."
6838
msgstr ""
6839
6840
#: bzrlib/plugins/launchpad/cmds.py:364
6841
#, python-format
6842
msgid "%d proposals(s) found."
6843
msgstr ""
6844
6845
#: bzrlib/plugins/launchpad/cmds.py:374
6846
msgid "Finding revision-id"
6847
msgstr ""
6848
6849
#: bzrlib/plugins/launchpad/cmds.py:381
6850
msgid "Finding merge"
6851
msgstr ""
6852
6853
#: bzrlib/plugins/launchpad/cmds.py:386
6854
msgid "Finding revno"
6855
msgstr ""
6856
6857
#: bzrlib/plugins/launchpad/cmds.py:392
6858
msgid "Finding Launchpad branch"
6859
msgstr ""
6860
6861
#: bzrlib/plugins/launchpad/cmds.py:395
6862
msgid "Finding proposals"
6863
msgstr ""
6864
6865
#: bzrlib/plugins/launchpad/lp_api.py:241
6866
#: bzrlib/plugins/launchpad/lp_api.py:246
6867
#, python-format
6868
msgid "%s is not registered on Launchpad"
6869
msgstr ""
6870
6871
#: bzrlib/plugins/launchpad/lp_api.py:256
6872
#, python-format
6873
msgid "%s has no development focus."
6874
msgstr ""
6875
6876
#: bzrlib/plugins/launchpad/lp_api.py:261
6877
#, python-format
6878
msgid "development focus %s has no branch."
6879
msgstr ""
6880
6881
#: bzrlib/plugins/launchpad/lp_api.py:266
6882
#, python-format
6883
msgid "source package %s has no branch."
6884
msgstr ""
6885
6886
#: bzrlib/plugins/launchpad/lp_api.py:270
6887
#, python-format
6888
msgid "%s has no associated product or source package."
6889
msgstr ""
6890
6891
#: bzrlib/plugins/launchpad/lp_api.py:282
6892
#, python-format
6893
msgid "%s is already up-to-date."
6894
msgstr ""
6895
6896
#: bzrlib/plugins/launchpad/lp_api.py:289
6897
#, python-format
6898
msgid "Pushing to %s"
6899
msgstr ""
6900
6901
#: bzrlib/plugins/launchpad/lp_directory.py:170
6902
msgid ""
6903
"resolution for {0}\n"
6904
" local: {1}\n"
6905
" remote: {2}"
6906
msgstr ""
6907
6908
#: bzrlib/plugins/launchpad/lp_propose.py:150
6909
#, python-format
6910
msgid "There is already a branch merge proposal: %s"
6911
msgstr ""
6912
6913
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6914
msgid "pb parameter to convert() is deprecated"
6915
msgstr ""
6916
6917
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6918
msgid "starting upgrade from format 4 to 5"
6919
msgstr ""
6920
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6922
msgid "note: upgrade may be faster if all store files are ungzipped first"
6923
msgstr ""
6924
6925
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6926
msgid "converting revision"
6927
msgstr ""
6928
6929
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6930
msgid "upgraded to weaves:"
6931
msgstr ""
6932
6933
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6934
#, python-format
6935
msgid "%6d revisions and inventories"
6936
msgstr ""
6937
6938
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6939
#, python-format
6940
msgid "%6d revisions not present"
6941
msgstr ""
6942
6943
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6944
#, python-format
6945
msgid "%6d texts"
6946
msgstr ""
6947
6948
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6949
msgid "writing weave"
6950
msgstr ""
6951
6952
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6953
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6954
msgid "inventory"
6955
msgstr ""
6956
6957
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6958
msgid "write revision"
6959
msgstr ""
6960
6961
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6962
msgid "loading revision"
6963
msgstr ""
6964
6965
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6966
#, python-format
6967
msgid "revision {%s} not present in branch; will be converted as a ghost"
6968
msgstr ""
6969
6970
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6971
msgid "starting upgrade from format 5 to 6"
6972
msgstr ""
6973
6974
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6975
#, python-format
6976
msgid "adding prefixes to %s"
6977
msgstr ""
6978
6979
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6980
msgid "starting upgrade from format 6 to metadir"
6981
msgstr ""
6982
6983
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6984
msgid "Removing ancestry.weave"
6985
msgstr ""
6986
6987
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6988
msgid "Finding branch files"
6989
msgstr ""
6990
6991
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6992
msgid "Upgrading repository"
6993
msgstr ""
6994
6995
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6996
msgid "Upgrading branch"
6997
msgstr ""
6998
6999
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7000
msgid "No working tree."
7001
msgstr ""
7002
7003
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7004
msgid "Upgrading working tree"
7005
msgstr ""
7006
7007
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7008
#, python-format
7009
msgid "Make %s lock"
7010
msgstr ""
7011
7012
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7013
#, python-format
7014
msgid "Moving %s"
7015
msgstr ""
7016
7017
#: bzrlib/push.py:56
7018
msgid "Created new branch."
7019
msgstr ""
7020
7021
#: bzrlib/push.py:97
7022
#, python-format
7023
msgid ""
7024
"Target directory %s already contains a .bzr directory, but it is not valid."
7025
msgstr ""
7026
7027
#: bzrlib/push.py:101
7028
#, python-format
7029
msgid ""
7030
"Target directory %s already exists, but does not have a .bzr directory. "
7031
"Supply --use-existing-dir to push there anyway."
7032
msgstr ""
7033
7034
#: bzrlib/push.py:122
7035
#, python-format
7036
msgid "Too many redirections trying to make %s."
7037
msgstr ""
7038
7039
#: bzrlib/push.py:148
7040
msgid ""
7041
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7042
"information."
7043
msgstr ""
7044
7045
#: bzrlib/push.py:152
7046
#, python-format
7047
msgid ""
7048
"It is not possible to losslessly push to %s. You may want to use dpush "
7049
"instead."
7050
msgstr ""
7051
7052
#: bzrlib/push.py:158
7053
#, python-format
7054
msgid ""
7055
"At %s you have a valid .bzr control directory, but not a branch or "
7056
"repository. This is an unsupported configuration. Please move the target "
7057
"directory out of the way and try again."
7058
msgstr ""
7059
7060
#: bzrlib/reconcile.py:97
7061
#, python-format
7062
msgid "Reconciling branch %s"
7063
msgstr ""
7064
7065
#: bzrlib/reconcile.py:103
7066
#, python-format
7067
msgid "Reconciling repository %s"
7068
msgstr ""
7069
7070
#: bzrlib/reconcile.py:105
7071
msgid "Reconciling repository"
7072
msgstr ""
7073
7074
#: bzrlib/reconcile.py:111
7075
#, python-format
7076
msgid "%s cannot canonicalize CHKs."
7077
msgstr "%s cannot canonicalise CHKs."
7078
7079
#: bzrlib/reconcile.py:119
7080
msgid "Reconcile aborted: revision index has inconsistent parents."
7081
msgstr ""
7082
7083
#: bzrlib/reconcile.py:121
7084
msgid "Run \"bzr check\" for more details."
7085
msgstr ""
7086
7087
#: bzrlib/reconcile.py:123
7088
msgid "Reconciliation complete."
7089
msgstr ""
7090
7091
#: bzrlib/reconcile.py:166
7092
msgid "Fixing last revision info {0} => {1}"
7093
msgstr ""
7094
7095
#: bzrlib/reconcile.py:173
7096
msgid "revision_history ok."
7097
msgstr ""
7098
7099
#: bzrlib/reconcile.py:234
7100
msgid "Reading inventory data"
7101
msgstr ""
7102
7103
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7104
msgid "Inventory ok."
7105
msgstr ""
7106
7107
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7108
msgid "Backing up inventory"
7109
msgstr ""
7110
7111
#: bzrlib/reconcile.py:258
7112
msgid "Backup inventory created."
7113
msgstr ""
7114
7115
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7116
msgid "Writing weave"
7117
msgstr ""
7118
7119
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7120
msgid "Inventory regenerated."
7121
msgstr ""
7122
7123
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7124
msgid "Reading indexes"
7125
msgstr ""
7126
7127
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7128
msgid "Checking unused inventories"
7129
msgstr ""
7130
7131
#: bzrlib/reconcile.py:388
7132
msgid "Backup Inventory created"
7133
msgstr ""
7134
7135
#: bzrlib/reconcile.py:446
7136
msgid "Fixing text parents"
7137
msgstr ""
7138
7139
#: bzrlib/reconfigure.py:54
7140
msgid "{0} is now stacked on {1}\n"
7141
msgstr ""
7142
7143
#: bzrlib/reconfigure.py:69
7144
#, python-format
7145
msgid "%s is now not stacked\n"
7146
msgstr ""
7147
7148
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7149
#, python-format
7150
msgid "bzr: ERROR (ignored): %s"
7151
msgstr ""
7152
7153
#: bzrlib/remote.py:2534
7154
msgid "Copying repository content as tarball..."
7155
msgstr ""
7156
7157
#: bzrlib/rename_map.py:69
7158
msgid "Calculating hashes"
7159
msgstr ""
7160
7161
#: bzrlib/rename_map.py:107
7162
msgid "Determining hash hits"
7163
msgstr ""
7164
7165
#: bzrlib/rename_map.py:242
7166
msgid "{0} => {1}"
7167
msgstr ""
7168
7169
#: bzrlib/repository.py:1738
7170
msgid "Moving repository to repository.backup"
7171
msgstr ""
7172
7173
#: bzrlib/repository.py:1745
7174
msgid "Creating new repository"
7175
msgstr ""
7176
7177
#: bzrlib/repository.py:1750
7178
msgid "Copying content"
7179
msgstr ""
7180
7181
#: bzrlib/repository.py:1754
7182
msgid "Deleting old repository content"
7183
msgstr ""
7184
7185
#: bzrlib/repository.py:1756
7186
msgid "repository converted"
7187
msgstr ""
7188
7189
#: bzrlib/revisionspec.py:903
7190
msgid "Using {0} {1}"
7191
msgstr ""
7192
7193
#: bzrlib/send.py:59
7194
#, python-format
7195
msgid "Mail client \"%s\" does not support specifying body"
7196
msgstr ""
7197
7198
#: bzrlib/send.py:63
7199
msgid "--remember requires a branch to be specified."
7200
msgstr ""
7201
7202
#: bzrlib/send.py:78
7203
msgid "No submit branch known or specified"
7204
msgstr ""
7205
7206
#: bzrlib/send.py:81
7207
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7208
msgstr ""
7209
7210
#: bzrlib/send.py:99
7211
#, python-format
7212
msgid "No such send format '%s'."
7213
msgstr ""
7214
7215
#: bzrlib/send.py:115
7216
msgid "bzr send takes at most two one revision identifiers"
7217
msgstr ""
7218
7219
#: bzrlib/send.py:128
7220
msgid "No revisions to submit."
7221
msgstr ""
7222
7223
#: bzrlib/send.py:140
7224
msgid ""
7225
"- not supported for merge directives that use more than one output file."
7226
msgstr ""
7227
7228
#: bzrlib/send.py:186
7229
msgid "Format 0.9 does not permit bundle with no patch"
7230
msgstr ""
7231
7232
#: bzrlib/shelf_ui.py:46
7233
#, python-format
7234
msgid "Shelve adding file \"%(path)s\"?"
7235
msgstr ""
7236
7237
#: bzrlib/shelf_ui.py:47
7238
msgid "Shelve binary changes?"
7239
msgstr ""
7240
7241
#: bzrlib/shelf_ui.py:48
7242
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7243
msgstr ""
7244
7245
#: bzrlib/shelf_ui.py:50
7246
#, python-format
7247
msgid "Shelve removing file \"%(path)s\"?"
7248
msgstr ""
7249
7250
#: bzrlib/shelf_ui.py:51
7251
#, python-format
7252
msgid "Shelve %d change(s)?"
7253
msgstr ""
7254
7255
#: bzrlib/shelf_ui.py:52
7256
msgid "Shelve?"
7257
msgstr ""
7258
7259
#: bzrlib/shelf_ui.py:53
7260
#, python-format
7261
msgid ""
7262
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7263
msgstr ""
7264
7265
#: bzrlib/shelf_ui.py:55
7266
#, python-format
7267
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7268
msgstr ""
7269
7270
#: bzrlib/shelf_ui.py:70
7271
#, python-format
7272
msgid "Changes shelved with id \"%d\"."
7273
msgstr ""
7274
7275
#: bzrlib/shelf_ui.py:74
7276
msgid "Selected changes destroyed."
7277
msgstr ""
7278
7279
#: bzrlib/shelf_ui.py:78
7280
msgid "Selected changes:"
7281
msgstr ""
7282
7283
#: bzrlib/shelf_ui.py:98
7284
#, python-format
7285
msgid "Delete file \"%(path)s\"?"
7286
msgstr ""
7287
7288
#: bzrlib/shelf_ui.py:99
7289
msgid "Apply binary changes?"
7290
msgstr ""
7291
7292
#: bzrlib/shelf_ui.py:100
7293
#, python-format
7294
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7295
msgstr ""
7296
7297
#: bzrlib/shelf_ui.py:102
7298
#, python-format
7299
msgid "Add file \"%(path)s\"?"
7300
msgstr ""
7301
7302
#: bzrlib/shelf_ui.py:103
7303
#, python-format
7304
msgid "Apply %d change(s)?"
7305
msgstr ""
7306
7307
#: bzrlib/shelf_ui.py:104
7308
msgid "Apply change?"
7309
msgstr ""
7310
7311
#: bzrlib/shelf_ui.py:105
7312
#, python-format
7313
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7314
msgstr ""
7315
7316
#: bzrlib/shelf_ui.py:107
7317
#, python-format
7318
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7319
msgstr ""
7320
7321
#: bzrlib/shelf_ui.py:402
7322
msgid "No changes are shelved."
7323
msgstr ""
7324
7325
#: bzrlib/shelf_ui.py:460
7326
#, python-format
7327
msgid "Using changes with id \"%d\"."
7328
msgstr ""
7329
7330
#: bzrlib/shelf_ui.py:464
7331
#, python-format
7332
msgid "Message: %s"
7333
msgstr ""
7334
7335
#: bzrlib/shelf_ui.py:476
7336
#, python-format
7337
msgid "Deleted changes with id \"%d\"."
7338
msgstr ""
7339
7340
#: bzrlib/smart/medium.py:714
7341
msgid "HPSS calls: {0} ({1} vfs) {2}"
7342
msgstr ""
7343
7344
#: bzrlib/smart/server.py:169
7345
msgid "Requested to stop gracefully"
7346
msgstr ""
7347
7348
#: bzrlib/smart/server.py:179
7349
#, python-format
7350
msgid "Waiting for %d client(s) to finish"
7351
msgstr ""
7352
7353
#: bzrlib/smart/server.py:185
7354
#, python-format
7355
msgid "Still waiting for %d client(s) to finish"
7356
msgstr ""
7357
7358
#: bzrlib/smart/server.py:219
7359
#, python-format
7360
msgid "listening socket error: %s"
7361
msgstr ""
7362
7363
#: bzrlib/smart/server.py:452
7364
#, python-format
7365
msgid "listening on port: %s"
7366
msgstr ""
7367
7368
#: bzrlib/switch.py:73
7369
msgid "Pending merges must be committed or reverted before using switch."
7370
msgstr ""
7371
7372
#: bzrlib/switch.py:100
7373
msgid ""
7374
"Cannot switch as local commits found in the checkout. Commit these to the "
7375
"bound branch or use --force to throw them away."
7376
msgstr ""
7377
7378
#: bzrlib/switch.py:105
7379
#, python-format
7380
msgid ""
7381
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7382
"anyway, use --force."
7383
msgstr ""
7384
7385
#: bzrlib/switch.py:129
7386
msgid "Cannot switch a branch, only a checkout."
7387
msgstr ""
7388
7389
#: bzrlib/switch.py:167
7390
#, python-format
7391
msgid "Tree is up to date at revision %d."
7392
msgstr ""
7393
7394
#: bzrlib/switch.py:173
7395
#, python-format
7396
msgid "Updated to revision %d."
7397
msgstr ""
7398
7399
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7400
msgid "Apply phase"
7401
msgstr ""
7402
7403
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7404
msgid "removing file"
7405
msgstr ""
7406
7407
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7408
msgid "adding file"
7409
msgstr ""
7410
7411
#: bzrlib/transform.py:2598
7412
msgid "Building tree"
7413
msgstr ""
7414
7415
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7416
msgid "Adding file contents"
7417
msgstr ""
7418
7419
#: bzrlib/transform.py:3017
7420
msgid "Resolution pass"
7421
msgstr ""
7422
7423
#: bzrlib/transport/ftp/_gssapi.py:88
7424
#, python-format
7425
msgid "Authenticated as %s"
7426
msgstr ""
7427
7428
#: bzrlib/tree.py:647
7429
msgid "*** {0} content-filter: {1} => {2!r}"
7430
msgstr ""
7431
7432
#: bzrlib/upgrade.py:77
7433
#, python-format
7434
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7435
msgstr ""
7436
7437
#: bzrlib/upgrade.py:100
7438
#, python-format
7439
msgid "cannot upgrade from bzrdir format %s"
7440
msgstr ""
7441
7442
#: bzrlib/upgrade.py:103
7443
#, python-format
7444
msgid "starting upgrade of %s"
7445
msgstr ""
7446
7447
#: bzrlib/upgrade.py:110
7448
msgid "finished"
7449
msgstr ""
7450
7451
#: bzrlib/upgrade.py:120
7452
msgid "Deleting backup.bzr"
7453
msgstr ""
7454
7455
#: bzrlib/upgrade.py:151
7456
msgid ""
7457
"\n"
7458
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7459
msgstr ""
7460
7461
#: bzrlib/upgrade.py:208
7462
#, python-format
7463
msgid "Found %d dependent branches - upgrading ..."
7464
msgstr ""
7465
7466
#: bzrlib/upgrade.py:276
7467
msgid "Upgrading bzrdirs"
7468
msgstr ""
7469
7470
#: bzrlib/upgrade.py:282
7471
#, python-format
7472
msgid "Upgrading %s"
7473
msgstr ""
7474
7475
#: bzrlib/upgrade.py:283
7476
msgid "Upgrading {0} {1} ..."
7477
msgstr ""
7478
7479
#: bzrlib/upgrade.py:301
7480
msgid "Removing backup ..."
7481
msgstr ""
7482
7483
#: bzrlib/upgrade.py:305
7484
msgid "failed to clean-up {0}: {1}"
7485
msgstr ""
7486
7487
#: bzrlib/vf_repository.py:1091
7488
msgid "inventories"
7489
msgstr ""
7490
7491
#: bzrlib/vf_repository.py:1117
7492
msgid "texts"
7493
msgstr ""
7494
7495
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7496
msgid "Calculating text parents"
7497
msgstr ""
7498
7499
#: bzrlib/vf_repository.py:1707
7500
msgid "Fetch texts"
7501
msgstr ""
7502
7503
#: bzrlib/vf_repository.py:2536
7504
msgid "loading text store"
7505
msgstr ""
7506
7507
#: bzrlib/vf_repository.py:2542
7508
msgid "checking text graph"
7509
msgstr ""
7510
7511
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7512
#: bzrlib/vf_repository.py:3127
7513
msgid "Transferring revisions"
7514
msgstr ""
7515
7516
#: bzrlib/win32utils.py:146
7517
msgid "Failed to GetProcessMemoryInfo()"
7518
msgstr ""
7519
7520
#: bzrlib/win32utils.py:167
7521
msgid "Cannot debug memory on win32 without ctypes or win32process"
7522
msgstr ""
7523
7524
#: bzrlib/win32utils.py:172
7525
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7526
msgstr "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7527
7528
#: bzrlib/win32utils.py:180
7529
#, python-format
7530
msgid "WorkingSize %8d KiB"
7531
msgstr "WorkingSize %8d KiB"
7532
7533
#: bzrlib/win32utils.py:181
7534
#, python-format
7535
msgid "PeakWorking %8d KiB"
7536
msgstr ""
7537
7538
#: bzrlib/win32utils.py:182
7539
#, python-format
7540
msgid "PagefileUsage %8d KiB"
7541
msgstr ""
7542
7543
#: bzrlib/win32utils.py:183
7544
#, python-format
7545
msgid "PeakPagefileUsage %8d KiB"
7546
msgstr ""
7547
7548
#: bzrlib/win32utils.py:185
7549
#, python-format
7550
msgid "PrivateUsage %8d KiB"
7551
msgstr ""
7552
7553
#: bzrlib/win32utils.py:186
7554
#, python-format
7555
msgid "PageFaultCount %8d"
7556
msgstr ""
7557
7558
#: bzrlib/workingtree.py:1482
7559
msgid "Rerun update after fixing the conflicts."
7560
msgstr ""
7561
7562
#: dummy/help_topics/authentication/summary.txt:1
7563
msgid "Information on configuring authentication"
7564
msgstr ""
7565
7566
#: dummy/help_topics/basic/detail.txt:1
7567
msgid ""
7568
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7569
"http://bazaar.canonical.com/"
7570
msgstr ""
7571
7572
#: dummy/help_topics/basic/detail.txt:4
7573
msgid ""
7574
"Basic commands:\n"
7575
" bzr init makes this directory a versioned branch\n"
7576
" bzr branch make a copy of another branch"
7577
msgstr ""
7578
7579
#: dummy/help_topics/basic/detail.txt:8
7580
msgid ""
7581
" bzr add make files or directories versioned\n"
7582
" bzr ignore ignore a file or pattern\n"
7583
" bzr mv move or rename a versioned file"
7584
msgstr ""
7585
7586
#: dummy/help_topics/basic/detail.txt:12
7587
msgid ""
7588
" bzr status summarize changes in working copy\n"
7589
" bzr diff show detailed diffs"
7590
msgstr ""
7591
" bzr status summarise changes in working copy\n"
7592
" bzr diff show detailed diffs"
7593
7594
#: dummy/help_topics/basic/detail.txt:15
7595
msgid ""
7596
" bzr merge pull in changes from another branch\n"
7597
" bzr commit save some or all changes\n"
7598
" bzr send send changes via email"
7599
msgstr ""
7600
7601
#: dummy/help_topics/basic/detail.txt:19
7602
msgid ""
7603
" bzr log show history of changes\n"
7604
" bzr check validate storage"
7605
msgstr ""
7606
7607
#: dummy/help_topics/basic/detail.txt:22
7608
msgid ""
7609
" bzr help init more help on e.g. init command\n"
7610
" bzr help commands list all commands\n"
7611
" bzr help topics list all help topics\n"
7612
msgstr ""
7613
7614
#: dummy/help_topics/basic/summary.txt:1
7615
msgid "Basic commands"
7616
msgstr ""
7617
7618
#: dummy/help_topics/branches/detail.txt:1
7619
msgid "Branches"
7620
msgstr ""
7621
7622
#: dummy/help_topics/branches/detail.txt:3
7623
msgid ""
7624
"A branch consists of the state of a project, including all of its\n"
7625
"history. All branches have a repository associated (which is where the\n"
7626
"branch history is stored), but multiple branches may share the same\n"
7627
"repository (a shared repository). Branches can be copied and merged."
7628
msgstr ""
7629
7630
#: dummy/help_topics/branches/detail.txt:8
7631
msgid ""
7632
"In addition, one branch may be bound to another one. Binding to another\n"
7633
"branch indicates that commits which happen in this branch must also \n"
7634
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7635
"commits when the two branches are out of date. In order for a commit \n"
7636
"to succeed, it may be necessary to update the current branch using \n"
7637
"``bzr update``."
7638
msgstr ""
7639
7640
#: dummy/help_topics/branches/detail.txt:15
7641
#: dummy/help_topics/checkouts/detail.txt:66
7642
#: dummy/help_topics/repositories/detail.txt:36
7643
msgid "Related commands::"
7644
msgstr ""
7645
7646
#: dummy/help_topics/branches/detail.txt:17
7647
msgid ""
7648
" init Change a directory into a versioned branch.\n"
7649
" branch Create a new branch that is a copy of an existing branch.\n"
7650
" merge Perform a three-way merge.\n"
7651
" bind Bind a branch to another one.\n"
7652
msgstr ""
7653
7654
#: dummy/help_topics/branches/summary.txt:1
7655
msgid "Information on what a branch is"
7656
msgstr ""
7657
7658
#: dummy/help_topics/bugs/summary.txt:1
7659
msgid "Bug tracker settings"
7660
msgstr ""
7661
7662
#: dummy/help_topics/checkouts/detail.txt:1
7663
msgid "Checkouts"
7664
msgstr ""
7665
7666
#: dummy/help_topics/checkouts/detail.txt:3
7667
msgid ""
7668
"Checkouts are source trees that are connected to a branch, so that when\n"
7669
"you commit in the source tree, the commit goes into that branch. They\n"
7670
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7671
"Bazaar's decentralized features until you want them. Using checkouts\n"
7672
"with shared repositories is very similar to working with SVN or CVS, but\n"
7673
"doesn't have the same restrictions. And using checkouts still allows\n"
7674
"others working on the project to use whatever workflow they like."
7675
msgstr ""
7676
"Checkouts are source trees that are connected to a branch, so that when\n"
7677
"you commit in the source tree, the commit goes into that branch. They\n"
7678
"allow you to use a simpler, more centralised workflow, ignoring some of\n"
7679
"Bazaar's decentralised features until you want them.\n"
7680
"Using checkouts with shared repositories is very similar to working with \n"
7681
"SVN or CVS, but doesn't have the same restrictions. \n"
7682
"And using checkouts still allows others working on the project to use \n"
7683
"whatever workflow they like."
7684
7685
#: dummy/help_topics/checkouts/detail.txt:11
7686
msgid ""
7687
"A checkout is created with the bzr checkout command (see \"help "
7688
"checkout\").\n"
7689
"You pass it a reference to another branch, and it will create a local copy\n"
7690
"for you that still contains a reference to the branch you created the\n"
7691
"checkout from (the master branch). Then if you make any commits they will "
7692
"be\n"
7693
"made on the other branch first. This creates an instant mirror of your work, "
7694
"or\n"
7695
"facilitates lockstep development, where each developer is working together,\n"
7696
"continuously integrating the changes of others."
7697
msgstr ""
7698
7699
#: dummy/help_topics/checkouts/detail.txt:19
7700
msgid ""
7701
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7702
"you have the full history locally. As you have a first class branch you "
7703
"can\n"
7704
"also commit locally if you want, for instance due to the temporary loss af "
7705
"a\n"
7706
"network connection. Use the --local option to commit to do this. All the "
7707
"local\n"
7708
"commits will then be made on the master branch the next time you do a non-"
7709
"local\n"
7710
"commit."
7711
msgstr ""
7712
7713
#: dummy/help_topics/checkouts/detail.txt:26
7714
msgid ""
7715
"If you are using a checkout from a shared branch you will periodically want "
7716
"to\n"
7717
"pull in all the changes made by others. This is done using the \"update\"\n"
7718
"command. The changes need to be applied before any non-local commit, but\n"
7719
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7720
"command when needed."
7721
msgstr ""
7722
7723
#: dummy/help_topics/checkouts/detail.txt:32
7724
msgid ""
7725
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7726
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7727
"SVN checkout in that it is not a first class branch, it mainly consists of "
7728
"the\n"
7729
"working tree. This means that any history operations must query the master\n"
7730
"branch, which could be slow if a network connection is involved. Also, as "
7731
"you\n"
7732
"don't have a local branch, then you cannot commit locally."
7733
msgstr ""
7734
7735
#: dummy/help_topics/checkouts/detail.txt:39
7736
msgid ""
7737
"Lightweight checkouts work best when you have fast reliable access to the\n"
7738
"master branch. This means that if the master branch is on the same disk or "
7739
"LAN\n"
7740
"a lightweight checkout will be faster than a heavyweight one for any "
7741
"commands\n"
7742
"that modify the revision history (as only one copy of the branch needs to\n"
7743
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7744
"that uses the history but does not change it, but if the master branch is "
7745
"on\n"
7746
"the same disk then there won't be a noticeable difference."
7747
msgstr ""
7748
7749
#: dummy/help_topics/checkouts/detail.txt:47
7750
msgid ""
7751
"Another possible use for a checkout is to use it with a treeless repository\n"
7752
"containing your branches, where you maintain only one working tree by\n"
7753
"switching the master branch that the checkout points to when you want to\n"
7754
"work on a different branch."
7755
msgstr ""
7756
7757
#: dummy/help_topics/checkouts/detail.txt:52
7758
msgid ""
7759
"Obviously to commit on a checkout you need to be able to write to the "
7760
"master\n"
7761
"branch. This means that the master branch must be accessible over a "
7762
"writeable\n"
7763
"protocol , such as sftp://, and that you have write permissions at the "
7764
"other\n"
7765
"end. Checkouts also work on the local file system, so that all that matters "
7766
"is\n"
7767
"file permissions."
7768
msgstr ""
7769
7770
#: dummy/help_topics/checkouts/detail.txt:58
7771
msgid ""
7772
"You can change the master of a checkout by using the \"switch\" command "
7773
"(see\n"
7774
"\"help switch\"). This will change the location that the commits are sent "
7775
"to.\n"
7776
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7777
"checkout. If you would like to convert your heavy checkout into a normal\n"
7778
"branch so that every commit is local, you can use the \"unbind\" command. To "
7779
"see\n"
7780
"whether or not a branch is bound or not you can use the \"info\" command. If "
7781
"the\n"
7782
"branch is bound it will tell you the location of the bound branch."
7783
msgstr ""
7784
7785
#: dummy/help_topics/checkouts/detail.txt:68
7786
msgid ""
7787
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7788
" checkout\n"
7789
" update Pull any changes in the master branch in to your checkout\n"
7790
" commit Make a commit that is sent to the master branch. If you have\n"
7791
" a heavy checkout then the --local option will commit to the\n"
7792
" checkout without sending the commit to the master\n"
7793
" switch Change the master branch that the commits in the checkout "
7794
"will\n"
7795
" be sent to\n"
7796
" bind Turn a standalone branch into a heavy checkout so that any\n"
7797
" commits will be sent to the master branch\n"
7798
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7799
" commits are only made locally\n"
7800
" info Displays whether a branch is bound or unbound. If the branch "
7801
"is\n"
7802
" bound, then it will also display the location of the bound "
7803
"branch\n"
7804
msgstr ""
7805
7806
#: dummy/help_topics/checkouts/summary.txt:1
7807
msgid "Information on what a checkout is"
7808
msgstr ""
7809
7810
#: dummy/help_topics/commands/summary.txt:1
7811
msgid "Basic help for all commands"
7812
msgstr ""
7813
7814
#: dummy/help_topics/configuration/summary.txt:1
7815
msgid "Details on the configuration settings available"
7816
msgstr ""
7817
7818
#: dummy/help_topics/conflict-types/summary.txt:1
7819
msgid "Types of conflicts and what to do about them"
7820
msgstr ""
7821
7822
#: dummy/help_topics/content-filters/summary.txt:1
7823
msgid "Conversion of content into/from working trees"
7824
msgstr ""
7825
7826
#: dummy/help_topics/criss-cross/detail.txt:1
7827
msgid "Criss-Cross"
7828
msgstr ""
7829
7830
#: dummy/help_topics/criss-cross/detail.txt:3
7831
msgid ""
7832
"A criss-cross in the branch history can cause the default merge technique\n"
7833
"to emit more conflicts than would normally be expected."
7834
msgstr ""
7835
7836
#: dummy/help_topics/criss-cross/detail.txt:6
7837
msgid ""
7838
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7839
"give\n"
7840
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7841
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7842
msgstr ""
7843
7844
#: dummy/help_topics/criss-cross/detail.txt:10
7845
msgid ""
7846
"Criss-crosses occur in a branch's history if two branches merge the same "
7847
"thing\n"
7848
"and then merge one another, or if two branches merge one another at the "
7849
"same\n"
7850
"time. They can be avoided by having each branch only merge from or into a\n"
7851
"designated central branch (a \"star topology\")."
7852
msgstr ""
7853
7854
#: dummy/help_topics/criss-cross/detail.txt:15
7855
msgid ""
7856
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7857
"default\n"
7858
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7859
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7860
"differences between THIS and OTHER are due to one side adding lines, or\n"
7861
"from another side removing lines."
7862
msgstr ""
7863
7864
#: dummy/help_topics/criss-cross/detail.txt:21
7865
msgid ""
7866
"Criss-crosses mean there is no good choice for a base. Selecting the "
7867
"recent\n"
7868
"merge points could cause one side's changes to be silently discarded.\n"
7869
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7870
"are emitted."
7871
msgstr ""
7872
7873
#: dummy/help_topics/criss-cross/detail.txt:26
7874
msgid ""
7875
"The ``weave`` merge type is not affected by this problem because it uses\n"
7876
"line-origin detection instead of a basis revision to determine the cause of\n"
7877
"differences.\n"
7878
msgstr ""
7879
7880
#: dummy/help_topics/criss-cross/summary.txt:1
7881
msgid "Information on criss-cross merging"
7882
msgstr ""
7883
7884
#: dummy/help_topics/current-formats/summary.txt:1
7885
msgid "Current storage formats"
7886
msgstr ""
7887
7888
#: dummy/help_topics/debug-flags/summary.txt:1
7889
msgid "Options to show or record debug information"
7890
msgstr ""
7891
7892
#: dummy/help_topics/diverged-branches/summary.txt:1
7893
msgid "How to fix diverged branches"
7894
msgstr ""
7895
7896
#: dummy/help_topics/env-variables/summary.txt:1
7897
msgid "Environment variable names and values"
7898
msgstr ""
7899
7900
#: dummy/help_topics/eol/summary.txt:1
7901
msgid "Information on end-of-line handling"
7902
msgstr ""
7903
7904
#: dummy/help_topics/files/detail.txt:1
7905
msgid "Files"
7906
msgstr ""
7907
7908
#: dummy/help_topics/files/detail.txt:3
7909
msgid ""
7910
":On Unix: ~/.bazaar/bazaar.conf\n"
7911
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7912
"bazaar\\\\2.0\\\\bazaar.conf"
7913
msgstr ""
7914
7915
#: dummy/help_topics/files/detail.txt:6
7916
msgid ""
7917
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7918
"used to define general configuration that will be applied everywhere.\n"
7919
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7920
"commonly used options."
7921
msgstr ""
7922
7923
#: dummy/help_topics/files/detail.txt:11
7924
msgid "A typical config file might look something like::"
7925
msgstr ""
7926
7927
#: dummy/help_topics/files/detail.txt:13
7928
msgid ""
7929
" [DEFAULT]\n"
7930
" email=John Doe <jdoe@isp.com>"
7931
msgstr ""
7932
7933
#: dummy/help_topics/files/detail.txt:16
7934
msgid ""
7935
" [ALIASES]\n"
7936
" commit = commit --strict\n"
7937
" log10 = log --short -r -10..-1\n"
7938
msgstr ""
7939
7940
#: dummy/help_topics/files/summary.txt:1
7941
msgid "Information on configuration and log files"
7942
msgstr ""
7943
7944
#: dummy/help_topics/formats/detail.txt:1
7945
msgid "Storage Formats"
7946
msgstr ""
7947
7948
#: dummy/help_topics/formats/detail.txt:3
7949
msgid ""
7950
"To ensure that older clients do not access data incorrectly,\n"
7951
"Bazaar's policy is to introduce a new storage format whenever\n"
7952
"new features requiring new metadata are added. New storage\n"
7953
"formats may also be introduced to improve performance and\n"
7954
"scalability."
7955
msgstr ""
7956
7957
#: dummy/help_topics/formats/detail.txt:9
7958
msgid ""
7959
"The newest format, 2a, is highly recommended. If your\n"
7960
"project is not using 2a, then you should suggest to the\n"
7961
"project owner to upgrade."
7962
msgstr ""
7963
7964
#: dummy/help_topics/formats/detail.txt:13
7965
msgid ""
7966
"\n"
7967
".. note::"
7968
msgstr ""
7969
7970
#: dummy/help_topics/formats/detail.txt:16
7971
msgid ""
7972
" Some of the older formats have two variants:\n"
7973
" a plain one and a rich-root one. The latter include an additional\n"
7974
" field about the root of the tree. There is no performance cost\n"
7975
" for using a rich-root format but you cannot easily merge changes\n"
7976
" from a rich-root format into a plain format. As a consequence,\n"
7977
" moving a project to a rich-root format takes some co-ordination\n"
7978
" in that all contributors need to upgrade their repositories\n"
7979
" around the same time. 2a and all future formats will be\n"
7980
" implicitly rich-root."
7981
msgstr ""
7982
7983
#: dummy/help_topics/formats/detail.txt:26
7984
msgid ""
7985
"See :doc:`current-formats-help` for the complete list of\n"
7986
"currently supported formats. See :doc:`other-formats-help` for\n"
7987
"descriptions of any available experimental and deprecated formats.\n"
7988
msgstr ""
7989
7990
#: dummy/help_topics/formats/summary.txt:1
7991
msgid "Information on choosing a storage format"
7992
msgstr ""
7993
7994
#: dummy/help_topics/global-options/detail.txt:1
7995
msgid "Global Options"
7996
msgstr ""
7997
7998
#: dummy/help_topics/global-options/detail.txt:3
7999
msgid ""
8000
"These options may be used with any command, and may appear in front of any\n"
8001
"command. (e.g. ``bzr --profile help``)."
8002
msgstr ""
8003
8004
#: dummy/help_topics/global-options/detail.txt:6
8005
msgid ""
8006
"--version Print the version number. Must be supplied before the "
8007
"command.\n"
8008
"--no-aliases Do not process command aliases when running this command.\n"
8009
"--builtin Use the built-in version of a command, not the plugin "
8010
"version.\n"
8011
" This does not suppress other plugin effects.\n"
8012
"--no-plugins Do not process any plugins.\n"
8013
"--no-l10n Do not translate messages.\n"
8014
"--concurrency Number of processes that can be run concurrently (selftest)."
8015
msgstr ""
8016
8017
#: dummy/help_topics/global-options/detail.txt:14
8018
msgid ""
8019
"--profile Profile execution using the hotshot profiler.\n"
8020
"--lsprof Profile execution using the lsprof profiler.\n"
8021
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8022
" results to a specified file. If the filename ends with "
8023
"\".txt\",\n"
8024
" text format will be used. If the filename either starts "
8025
"with\n"
8026
" \"callgrind.out\" or end with \".callgrind\", the output will "
8027
"be\n"
8028
" formatted for use with KCacheGrind. Otherwise, the output\n"
8029
" will be a pickle.\n"
8030
"--coverage Generate line coverage report in the specified directory."
8031
msgstr ""
8032
8033
#: dummy/help_topics/global-options/detail.txt:24
8034
msgid ""
8035
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8036
"for\n"
8037
" the duration of the command. This can be used multiple times "
8038
"if\n"
8039
" several options need to be overridden."
8040
msgstr ""
8041
8042
#: dummy/help_topics/global-options/detail.txt:28
8043
msgid ""
8044
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8045
"information on profiling."
8046
msgstr ""
8047
8048
#: dummy/help_topics/global-options/detail.txt:31
8049
msgid ""
8050
"A number of debug flags are also available to assist troubleshooting and\n"
8051
"development. See :doc:`debug-flags-help`.\n"
8052
msgstr ""
8053
8054
#: dummy/help_topics/global-options/summary.txt:1
8055
msgid "Options that control how Bazaar runs"
8056
msgstr ""
8057
8058
#: dummy/help_topics/hidden-commands/summary.txt:1
8059
msgid "All hidden commands"
8060
msgstr ""
8061
8062
#: dummy/help_topics/hooks/summary.txt:1
8063
msgid "Points at which custom processing can be added"
8064
msgstr ""
8065
8066
#: dummy/help_topics/launchpad/detail.txt:1
8067
msgid "Integration with Launchpad.net"
8068
msgstr ""
8069
8070
#: dummy/help_topics/launchpad/detail.txt:3
8071
msgid ""
8072
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8073
"specification tracking."
8074
msgstr ""
8075
8076
#: dummy/help_topics/launchpad/detail.txt:6
8077
msgid ""
8078
"The bzr client (through the plugin called 'launchpad') has special\n"
8079
"features to communicate with Launchpad:"
8080
msgstr ""
8081
8082
#: dummy/help_topics/launchpad/detail.txt:9
8083
msgid ""
8084
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8085
"This\n"
8086
" is then used by the 'lp:' transport to download your branches using\n"
8087
" bzr+ssh://."
8088
msgstr ""
8089
8090
#: dummy/help_topics/launchpad/detail.txt:13
8091
msgid ""
8092
" * The 'lp:' transport uses Launchpad as a directory service: for "
8093
"example\n"
8094
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8095
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8096
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8097
msgstr ""
8098
8099
#: dummy/help_topics/launchpad/detail.txt:18
8100
msgid ""
8101
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8102
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8103
"lp:12345'\n"
8104
" will record a revision property that marks that revision as fixing\n"
8105
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8106
" automatically be linked to the bug report."
8107
msgstr ""
8108
8109
#: dummy/help_topics/launchpad/detail.txt:24
8110
msgid ""
8111
" * The register-branch command tells Launchpad about the url of a\n"
8112
" public branch. Launchpad will then mirror the branch, display\n"
8113
" its contents and allow it to be attached to bugs and other\n"
8114
" objects."
8115
msgstr ""
8116
8117
#: dummy/help_topics/launchpad/detail.txt:29
8118
msgid "For more information see http://help.launchpad.net/\n"
8119
msgstr ""
8120
8121
#: dummy/help_topics/launchpad/summary.txt:1
8122
msgid "Using Bazaar with Launchpad.net"
8123
msgstr ""
8124
8125
#: dummy/help_topics/location-alias/summary.txt:1
8126
msgid "Aliases for remembered locations"
8127
msgstr ""
8128
8129
#: dummy/help_topics/log-formats/summary.txt:1
8130
msgid "Details on the logging formats available"
8131
msgstr ""
8132
8133
#: dummy/help_topics/other-formats/summary.txt:1
8134
msgid "Experimental and deprecated storage formats"
8135
msgstr ""
8136
8137
#: dummy/help_topics/patterns/summary.txt:1
8138
msgid "Information on the pattern syntax"
8139
msgstr ""
8140
8141
#: dummy/help_topics/repositories/detail.txt:1
8142
msgid "Repositories"
8143
msgstr ""
8144
8145
#: dummy/help_topics/repositories/detail.txt:3
8146
msgid ""
8147
"Repositories in Bazaar are where committed information is stored. There is\n"
8148
"a repository associated with every branch."
8149
msgstr ""
8150
8151
#: dummy/help_topics/repositories/detail.txt:6
8152
msgid ""
8153
"Repositories are a form of database. Bzr will usually maintain this for\n"
8154
"good performance automatically, but in some situations (e.g. when doing\n"
8155
"very many commits in a short time period) you may want to ask bzr to\n"
8156
"optimise the database indices. This can be done by the 'bzr pack' command."
8157
msgstr ""
8158
8159
#: dummy/help_topics/repositories/detail.txt:11
8160
msgid ""
8161
"By default just running 'bzr init' will create a repository within the new\n"
8162
"branch but it is possible to create a shared repository which allows "
8163
"multiple\n"
8164
"branches to share their information in the same location. When a new branch "
8165
"is\n"
8166
"created it will first look to see if there is a containing shared repository "
8167
"it\n"
8168
"can use."
8169
msgstr ""
8170
8171
#: dummy/help_topics/repositories/detail.txt:17
8172
msgid ""
8173
"When two branches of the same project share a repository, there is\n"
8174
"generally a large space saving. For some operations (e.g. branching\n"
8175
"within the repository) this translates in to a large time saving."
8176
msgstr ""
8177
8178
#: dummy/help_topics/repositories/detail.txt:21
8179
msgid ""
8180
"To create a shared repository use the init-repository command (or the alias\n"
8181
"init-repo). This command takes the location of the repository to create. "
8182
"This\n"
8183
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8184
"which contains a shared repository. Any new branches that are created in "
8185
"this\n"
8186
"directory will then use it for storage."
8187
msgstr ""
8188
8189
#: dummy/help_topics/repositories/detail.txt:27
8190
msgid ""
8191
"It is a good idea to create a repository whenever you might create more\n"
8192
"than one branch of a project. This is true for both working areas where you\n"
8193
"are doing the development, and any server areas that you use for hosting\n"
8194
"projects. In the latter case, it is common to want branches without working\n"
8195
"trees. Since the files in the branch will not be edited directly there is "
8196
"no\n"
8197
"need to use up disk space for a working tree. To create a repository in "
8198
"which\n"
8199
"the branches will not have working trees pass the '--no-trees' option to\n"
8200
"'init-repository'."
8201
msgstr ""
8202
8203
#: dummy/help_topics/repositories/detail.txt:38
8204
msgid ""
8205
" init-repository Create a shared repository. Use --no-trees to create "
8206
"one\n"
8207
" in which new branches won't get a working tree.\n"
8208
msgstr ""
8209
8210
#: dummy/help_topics/repositories/summary.txt:1
8211
msgid "Basic information on shared repositories."
8212
msgstr ""
8213
8214
#: dummy/help_topics/revisionspec/summary.txt:1
8215
msgid "Explain how to use --revision"
8216
msgstr ""
8217
8218
#: dummy/help_topics/rules/summary.txt:1
8219
msgid "Information on defining rule-based preferences"
8220
msgstr ""
8221
8222
#: dummy/help_topics/standalone-trees/detail.txt:1
8223
msgid "Standalone Trees"
8224
msgstr ""
8225
8226
#: dummy/help_topics/standalone-trees/detail.txt:3
8227
msgid ""
8228
"A standalone tree is a working tree with an associated repository. It\n"
8229
"is an independently usable branch, with no dependencies on any other.\n"
8230
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8231
"an existing project under version control."
8232
msgstr ""
8233
8234
#: dummy/help_topics/standalone-trees/detail.txt:8
8235
msgid "Related Commands::"
8236
msgstr ""
8237
8238
#: dummy/help_topics/standalone-trees/detail.txt:10
8239
msgid " init Make a directory into a versioned branch.\n"
8240
msgstr ""
8241
8242
#: dummy/help_topics/standalone-trees/summary.txt:1
8243
msgid "Information on what a standalone tree is"
8244
msgstr ""
8245
8246
#: dummy/help_topics/standard-options/detail.txt:1
8247
msgid "Standard Options"
8248
msgstr ""
8249
8250
#: dummy/help_topics/standard-options/detail.txt:3
8251
msgid "Standard options are legal for all commands."
8252
msgstr ""
8253
8254
#: dummy/help_topics/standard-options/detail.txt:5
8255
msgid ""
8256
"--help, -h Show help message.\n"
8257
"--verbose, -v Display more information.\n"
8258
"--quiet, -q Only display errors and warnings."
8259
msgstr ""
8260
8261
#: dummy/help_topics/standard-options/detail.txt:9
8262
msgid "Unlike global options, standard options can be used in aliases.\n"
8263
msgstr ""
8264
8265
#: dummy/help_topics/standard-options/summary.txt:1
8266
msgid "Options that can be used with any command"
8267
msgstr ""
8268
8269
#: dummy/help_topics/status-flags/detail.txt:1
8270
msgid "Status Flags"
8271
msgstr ""
8272
8273
#: dummy/help_topics/status-flags/detail.txt:3
8274
msgid ""
8275
"Status flags are used to summarise changes to the working tree in a concise\n"
8276
"manner. They are in the form::"
8277
msgstr ""
8278
8279
#: dummy/help_topics/status-flags/detail.txt:6
8280
msgid " xxx <filename>"
8281
msgstr ""
8282
8283
#: dummy/help_topics/status-flags/detail.txt:8
8284
msgid "where the columns' meanings are as follows."
8285
msgstr ""
8286
8287
#: dummy/help_topics/status-flags/detail.txt:10
8288
msgid "Column 1 - versioning/renames::"
8289
msgstr ""
8290
8291
#: dummy/help_topics/status-flags/detail.txt:12
8292
msgid ""
8293
" + File versioned\n"
8294
" - File unversioned\n"
8295
" R File renamed\n"
8296
" ? File unknown\n"
8297
" X File nonexistent (and unknown to bzr)\n"
8298
" C File has conflicts\n"
8299
" P Entry for a pending merge (not a file)"
8300
msgstr ""
8301
8302
#: dummy/help_topics/status-flags/detail.txt:20
8303
msgid "Column 2 - contents::"
8304
msgstr ""
8305
8306
#: dummy/help_topics/status-flags/detail.txt:22
8307
msgid ""
8308
" N File created\n"
8309
" D File deleted\n"
8310
" K File kind changed\n"
8311
" M File modified"
8312
msgstr ""
8313
" N File created\n"
8314
" D File deleted\n"
8315
" K File type changed\n"
8316
" M File modified"
8317
8318
#: dummy/help_topics/status-flags/detail.txt:27
8319
msgid "Column 3 - execute::"
8320
msgstr ""
8321
8322
#: dummy/help_topics/status-flags/detail.txt:29
8323
msgid " * The execute bit was changed\n"
8324
msgstr ""
8325
8326
#: dummy/help_topics/status-flags/summary.txt:1
8327
msgid "Help on status flags"
8328
msgstr ""
8329
8330
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8331
msgid "Branches Out of Sync"
8332
msgstr ""
8333
8334
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8335
msgid ""
8336
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8337
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8338
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8339
"have the same last revision as the new reference branch for the lightweight\n"
8340
"checkout, data could be lost, so Bazaar refuses."
8341
msgstr ""
8342
8343
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8344
msgid "How you deal with this depends on *why* the branches are out of sync."
8345
msgstr ""
8346
8347
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8348
msgid ""
8349
"If you have a checkout and have done local commits, you can get back in "
8350
"sync\n"
8351
"by running \"bzr update\" (and possibly \"bzr commit\")."
8352
msgstr ""
8353
8354
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8355
msgid ""
8356
"If you have a branch and the remote branch is out-of-date, you can push\n"
8357
"the local changes using \"bzr push\". If the local branch is out of date, "
8358
"you\n"
8359
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8360
"commit\n"
8361
"and then push your changes. If you decide that some of the changes aren't\n"
8362
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8363
msgstr ""
8364
8365
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8366
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8367
msgstr ""
8368
8369
#: dummy/help_topics/topics/summary.txt:1
8370
msgid "Topics list"
8371
msgstr ""
8372
8373
#: dummy/help_topics/url-special-chars/summary.txt:1
8374
msgid "Special character handling in URLs"
8375
msgstr ""
8376
8377
#: dummy/help_topics/urlspec/summary.txt:1
8378
msgid "Supported transport protocols"
8379
msgstr ""
8380
8381
#: dummy/help_topics/working-trees/detail.txt:1
8382
msgid "Working Trees"
8383
msgstr ""
8384
8385
#: dummy/help_topics/working-trees/detail.txt:3
8386
msgid ""
8387
"A working tree is the contents of a branch placed on disk so that you can\n"
8388
"see the files and edit them. The working tree is where you make changes to "
8389
"a\n"
8390
"branch, and when you commit the current state of the working tree is the\n"
8391
"snapshot that is recorded in the commit."
8392
msgstr ""
8393
8394
#: dummy/help_topics/working-trees/detail.txt:8
8395
msgid ""
8396
"When you push a branch to a remote system, a working tree will not be\n"
8397
"created. If one is already present the files will not be updated. The\n"
8398
"branch information will be updated and the working tree will be marked\n"
8399
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8400
"may be uncommitted changes or the update may cause content conflicts that "
8401
"are\n"
8402
"difficult to deal with remotely."
8403
msgstr ""
8404
8405
#: dummy/help_topics/working-trees/detail.txt:15
8406
msgid ""
8407
"If you have a branch with no working tree you can use the 'checkout' "
8408
"command\n"
8409
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8410
"will\n"
8411
"create the working tree. If the branch is updated remotely, you can update "
8412
"the\n"
8413
"working tree by running 'bzr update' in that directory."
8414
msgstr ""
8415
8416
#: dummy/help_topics/working-trees/detail.txt:20
8417
msgid ""
8418
"If you have a branch with a working tree that you do not want the 'remove-"
8419
"tree'\n"
8420
"command will remove the tree if it is safe. This can be done to avoid the\n"
8421
"warning about the remote working tree not being updated when pushing to the\n"
8422
"branch. It can also be useful when working with a '--no-trees' repository\n"
8423
"(see 'bzr help repositories')."
8424
msgstr ""
8425
8426
#: dummy/help_topics/working-trees/detail.txt:26
8427
msgid ""
8428
"If you want to have a working tree on a remote machine that you push to you\n"
8429
"can either run 'bzr update' in the remote branch after each push, or use "
8430
"some\n"
8431
"other method to update the tree during the push. There is an 'rspush' "
8432
"plugin\n"
8433
"that will update the working tree using rsync as well as doing a push. "
8434
"There\n"
8435
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8436
"SSH\n"
8437
"after each push."
8438
msgstr ""
8439
8440
#: dummy/help_topics/working-trees/detail.txt:33
8441
msgid "Useful commands::"
8442
msgstr ""
8443
8444
#: dummy/help_topics/working-trees/detail.txt:35
8445
msgid ""
8446
" checkout Create a working tree when a branch does not have one.\n"
8447
" remove-tree Removes the working tree from a branch when it is safe to do "
8448
"so.\n"
8449
" update When a working tree is out of sync with its associated "
8450
"branch\n"
8451
" this will update the tree to match the branch.\n"
8452
msgstr ""
8453
8454
#: dummy/help_topics/working-trees/summary.txt:1
8455
msgid "Information on working trees"
8456
msgstr ""
8457
8458
#: en/help_topics/authentication.txt:1
8459
msgid ""
8460
"Authentication Settings\n"
8461
"======================="
8462
msgstr ""
8463
8464
#: en/help_topics/authentication.txt:4
8465
msgid ""
8466
"\n"
8467
"Intent\n"
8468
"------"
8469
msgstr ""
8470
8471
#: en/help_topics/authentication.txt:8
8472
msgid ""
8473
"Many different authentication policies can be described in the\n"
8474
"``authentication.conf`` file but a particular user should need only a few\n"
8475
"definitions to cover his needs without having to specify a user and a "
8476
"password\n"
8477
"for every branch he uses."
8478
msgstr ""
8479
8480
#: en/help_topics/authentication.txt:13
8481
msgid ""
8482
"The definitions found in this file are used to find the credentials to use "
8483
"for\n"
8484
"a given url. The same credentials can generally be used for as many branches "
8485
"as\n"
8486
"possible by grouping their declaration around the remote servers that need\n"
8487
"them. It's even possible to declare credentials that will be used by "
8488
"different\n"
8489
"servers."
8490
msgstr ""
8491
8492
#: en/help_topics/authentication.txt:19
8493
msgid ""
8494
"The intent is to make this file as small as possible to minimize maintenance."
8495
msgstr ""
8496
"The intent is to make this file as small as possible to minimise maintenance."
8497
8498
#: en/help_topics/authentication.txt:21
8499
msgid ""
8500
"Once the relevant credentials are declared in this file you may use branch "
8501
"urls\n"
8502
"without embedding passwords (security hazard) or even users (enabling "
8503
"sharing\n"
8504
"of your urls with others)."
8505
msgstr ""
8506
8507
#: en/help_topics/authentication.txt:25
8508
msgid "Instead of using::"
8509
msgstr ""
8510
8511
#: en/help_topics/authentication.txt:27
8512
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8513
msgstr ""
8514
8515
#: en/help_topics/authentication.txt:29
8516
msgid "you simply use::"
8517
msgstr ""
8518
8519
#: en/help_topics/authentication.txt:31
8520
msgid " bzr branch ftp://host.com/path/to/my/branch"
8521
msgstr ""
8522
8523
#: en/help_topics/authentication.txt:33
8524
msgid ""
8525
"provided you have created the following ``authentication.conf`` file::"
8526
msgstr ""
8527
8528
#: en/help_topics/authentication.txt:35
8529
msgid ""
8530
" [myprojects]\n"
8531
" scheme=ftp\n"
8532
" host=host.com\n"
8533
" user=joe\n"
8534
" password=secret\n"
8535
" "
8536
msgstr ""
8537
8538
#: en/help_topics/authentication.txt:42
8539
msgid ""
8540
"Authentication definitions\n"
8541
"--------------------------"
8542
msgstr ""
8543
8544
#: en/help_topics/authentication.txt:45
8545
msgid ""
8546
"There are two kinds of authentication used by the various schemes supported "
8547
"by\n"
8548
"bzr:"
8549
msgstr ""
8550
"There are two kinds of authentication used by the various schemes supported "
8551
"by\n"
8552
"bzr:"
8553
8554
#: en/help_topics/authentication.txt:48
8555
msgid "1. user and password"
8556
msgstr ""
8557
8558
#: en/help_topics/authentication.txt:50
8559
msgid ""
8560
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8561
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8562
"ssh agents are a better, more secure solution. So we have chosen to not "
8563
"provide\n"
8564
"our own less secure method."
8565
msgstr ""
8566
8567
#: en/help_topics/authentication.txt:55
8568
msgid "2. user, realm and password"
8569
msgstr ""
8570
8571
#: en/help_topics/authentication.txt:57
8572
msgid ""
8573
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8574
"against a host. But, by using ``.htaccess`` files, for example, it is "
8575
"possible\n"
8576
"to define several (``user, realm, password``) for a given ``host``. So what "
8577
"is\n"
8578
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8579
"is\n"
8580
"not taken into account in the definitions, but will displayed if bzr "
8581
"prompts\n"
8582
"you for a password."
8583
msgstr ""
8584
8585
#: en/help_topics/authentication.txt:64
8586
msgid ""
8587
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8588
"specifying the appropriate port."
8589
msgstr ""
8590
8591
#: en/help_topics/authentication.txt:67
8592
msgid ""
8593
"To take all schemes into account, the password will be deduced from a set "
8594
"of\n"
8595
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8596
"``user``,\n"
8597
"``password``)."
8598
msgstr ""
8599
8600
#: en/help_topics/authentication.txt:71
8601
msgid ""
8602
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8603
"used\n"
8604
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8605
"``ssh``\n"
8606
" should be used instead since this is the real scheme regarding\n"
8607
" authentication,"
8608
msgstr ""
8609
8610
#: en/help_topics/authentication.txt:76
8611
msgid " * ``host``: can be empty (to act as a default for any host),"
8612
msgstr ""
8613
8614
#: en/help_topics/authentication.txt:78
8615
msgid ""
8616
" * ``port`` can be empty (useful when an host provides several servers for "
8617
"the\n"
8618
" same scheme), only numerical values are allowed, this should be used "
8619
"only\n"
8620
" when the server uses a port different than the scheme standard port,"
8621
msgstr ""
8622
8623
#: en/help_topics/authentication.txt:82
8624
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8625
msgstr ""
8626
8627
#: en/help_topics/authentication.txt:84
8628
msgid ""
8629
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8630
" ``getpass.get_user()``),"
8631
msgstr ""
8632
8633
#: en/help_topics/authentication.txt:87
8634
msgid ""
8635
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8636
" password."
8637
msgstr ""
8638
8639
#: en/help_topics/authentication.txt:90
8640
msgid ""
8641
"Multiple definitions can be provided and, for a given URL, bzr will select "
8642
"a\n"
8643
"(``user`` [, ``password``]) based on the following rules :"
8644
msgstr ""
8645
8646
#: en/help_topics/authentication.txt:93
8647
msgid " 1. the first match wins,"
8648
msgstr ""
8649
8650
#: en/help_topics/authentication.txt:95
8651
msgid " 2. empty fields match everything,"
8652
msgstr ""
8653
8654
#: en/help_topics/authentication.txt:97
8655
msgid ""
8656
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8657
msgstr ""
8658
8659
#: en/help_topics/authentication.txt:99
8660
msgid ""
8661
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8662
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8663
"``projectbzr.sf.net``\n"
8664
" will not match ``bzr.sf.net``)."
8665
msgstr ""
8666
8667
#: en/help_topics/authentication.txt:103
8668
msgid ""
8669
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8670
msgstr ""
8671
8672
#: en/help_topics/authentication.txt:105
8673
msgid ""
8674
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8675
"above,\n"
8676
" empty paths will match any provided path)."
8677
msgstr ""
8678
8679
#: en/help_topics/authentication.txt:110
8680
msgid ""
8681
"File format\n"
8682
"-----------"
8683
msgstr ""
8684
8685
#: en/help_topics/authentication.txt:113
8686
msgid ""
8687
"The general rules for :doc:`configuration files <configuration-help>`\n"
8688
"apply except for the variable policies."
8689
msgstr ""
8690
8691
#: en/help_topics/authentication.txt:116
8692
msgid "Each section describes an authentication definition."
8693
msgstr ""
8694
8695
#: en/help_topics/authentication.txt:118
8696
msgid ""
8697
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8698
"reserved\n"
8699
"and should appear as the *last* section."
8700
msgstr ""
8701
8702
#: en/help_topics/authentication.txt:121
8703
msgid "Each section should define:"
8704
msgstr ""
8705
8706
#: en/help_topics/authentication.txt:123
8707
msgid "* ``user``: the login to be used,"
8708
msgstr ""
8709
8710
#: en/help_topics/authentication.txt:125
8711
msgid "Each section could define:"
8712
msgstr ""
8713
8714
#: en/help_topics/authentication.txt:127
8715
msgid "* ``host``: the remote server,"
8716
msgstr ""
8717
8718
#: en/help_topics/authentication.txt:129
8719
msgid "* ``port``: the port the server is listening,"
8720
msgstr ""
8721
8722
#: en/help_topics/authentication.txt:131
8723
msgid "* ``path``: the branch location,"
8724
msgstr ""
8725
8726
#: en/help_topics/authentication.txt:133
8727
msgid "* ``password``: the password."
8728
msgstr ""
8729
8730
#: en/help_topics/authentication.txt:135
8731
msgid ""
8732
"\n"
8733
"Examples\n"
8734
"--------"
8735
msgstr ""
8736
8737
#: en/help_topics/authentication.txt:139
8738
msgid ""
8739
"\n"
8740
"Personal projects hosted outside\n"
8741
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8742
msgstr ""
8743
8744
#: en/help_topics/authentication.txt:143
8745
msgid ""
8746
"All connections are done with the same ``user`` (the remote one for which "
8747
"the\n"
8748
"default bzr one is not appropriate) and the password is always prompted "
8749
"with\n"
8750
"some exceptions::"
8751
msgstr ""
8752
8753
#: en/help_topics/authentication.txt:147
8754
msgid ""
8755
" # Pet projects on hobby.net\n"
8756
" [hobby]\n"
8757
" host=r.hobby.net\n"
8758
" user=jim\n"
8759
" password=obvious1234\n"
8760
" \n"
8761
" # Home server\n"
8762
" [home]\n"
8763
" scheme=https\n"
8764
" host=home.net\n"
8765
" user=joe\n"
8766
" password=1essobV10us\n"
8767
" \n"
8768
" [DEFAULT]\n"
8769
" # Our local user is barbaz, on all remote sites we're known as "
8770
"foobar\n"
8771
" user=foobar"
8772
msgstr ""
8773
8774
#: en/help_topics/authentication.txt:164
8775
msgid ""
8776
"\n"
8777
"Source hosting provider\n"
8778
"~~~~~~~~~~~~~~~~~~~~~~~"
8779
msgstr ""
8780
8781
#: en/help_topics/authentication.txt:168
8782
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8783
msgstr ""
8784
8785
#: en/help_topics/authentication.txt:170
8786
msgid ""
8787
" [shpnet domain]\n"
8788
" # we use sftp, but ssh is the scheme used for authentication\n"
8789
" scheme=ssh\n"
8790
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8791
" host=.shp.net\n"
8792
" user=joe\n"
8793
" # bzr don't support supplying a password for sftp,\n"
8794
" # consider using an ssh agent if you don't want to supply\n"
8795
" # a password interactively. (pageant, ssh-agent, etc)"
8796
msgstr ""
8797
8798
#: en/help_topics/authentication.txt:180
8799
msgid ""
8800
"HTTPS, SFTP servers and their proxy\n"
8801
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8802
msgstr ""
8803
8804
#: en/help_topics/authentication.txt:183
8805
msgid ""
8806
"At company.com, the server hosting release and integration branches is "
8807
"behind a\n"
8808
"proxy, and the two branches use different authentication policies::"
8809
msgstr ""
8810
8811
#: en/help_topics/authentication.txt:186
8812
msgid ""
8813
" [reference code]\n"
8814
" scheme=https\n"
8815
" host=dev.company.com\n"
8816
" path=/dev\n"
8817
" user=user1\n"
8818
" password=pass1"
8819
msgstr ""
8820
8821
#: en/help_topics/authentication.txt:193
8822
msgid ""
8823
" # development branches on dev server\n"
8824
" [dev]\n"
8825
" scheme=ssh # bzr+ssh and sftp are available here\n"
8826
" host=dev.company.com\n"
8827
" path=/dev/integration\n"
8828
" user=user2\n"
8829
" \n"
8830
" # proxy\n"
8831
" [proxy]\n"
8832
" scheme=http\n"
8833
" host=proxy.company.com\n"
8834
" port=3128\n"
8835
" user=proxyuser1\n"
8836
" password=proxypass1"
8837
msgstr ""
8838
8839
#: en/help_topics/authentication.txt:208
8840
msgid ""
8841
"\n"
8842
"Planned enhancements\n"
8843
"--------------------"
8844
msgstr ""
8845
8846
#: en/help_topics/authentication.txt:212
8847
msgid ""
8848
"The following are not yet implemented but planned as parts of a work in\n"
8849
"progress:"
8850
msgstr ""
8851
8852
#: en/help_topics/authentication.txt:215
8853
msgid "* add a ``password_encoding`` field allowing:"
8854
msgstr ""
8855
8856
#: en/help_topics/authentication.txt:217
8857
msgid ""
8858
" - storing the passwords in various obfuscating encodings (base64 for one),"
8859
msgstr ""
8860
8861
#: en/help_topics/authentication.txt:219
8862
msgid " - delegate password storage to plugins (.netrc for example)."
8863
msgstr ""
8864
8865
#: en/help_topics/authentication.txt:221
8866
msgid ""
8867
"* update the credentials when the user is prompted for user or password,"
8868
msgstr ""
8869
8870
#: en/help_topics/authentication.txt:223
8871
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8872
msgstr ""
8873
8874
#: en/help_topics/authentication.txt:225
8875
msgid ""
8876
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8877
"but\n"
8878
"ignored in the actual implementation.\n"
8879
msgstr ""
8880
"The ``password_encoding`` and ``verify_certificates`` fields are recognised "
8881
"but\n"
8882
"ignored in the actual implementation.\n"
8883
8884
#: en/help_topics/bugs.txt:1
8885
msgid "Bug Tracker Settings"
8886
msgstr ""
8887
8888
#: en/help_topics/bugs.txt:3
8889
msgid ""
8890
"When making a commit, metadata about bugs fixed by that change can be\n"
8891
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8892
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8893
"(The only ``status`` value currently supported is ``fixed.``)"
8894
msgstr ""
8895
8896
#: en/help_topics/bugs.txt:8
8897
msgid ""
8898
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8899
"identifier\n"
8900
"rather than a full URL. This looks like::"
8901
msgstr ""
8902
8903
#: en/help_topics/bugs.txt:11
8904
msgid " bzr commit --fixes <tracker>:<id>"
8905
msgstr ""
8906
8907
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8908
msgid "or::"
8909
msgstr ""
8910
8911
#: en/help_topics/bugs.txt:15
8912
msgid " bzr commit --fixes <id>"
8913
msgstr ""
8914
8915
#: en/help_topics/bugs.txt:17
8916
msgid ""
8917
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8918
"the\n"
8919
"identifier for that bug within the bugtracker, usually the bug number.\n"
8920
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8921
"or global configuration is used."
8922
msgstr ""
8923
8924
#: en/help_topics/bugs.txt:22
8925
msgid ""
8926
"Bazaar knows about a few bug trackers that have many users. If\n"
8927
"you use one of these bug trackers then there is no setup required to\n"
8928
"use this feature, you just need to know the tracker identifier to use.\n"
8929
"These are the bugtrackers that are built in:"
8930
msgstr ""
8931
8932
#: en/help_topics/bugs.txt:27
8933
msgid ""
8934
" ============================ ============ ============\n"
8935
" URL Abbreviation Example\n"
8936
" ============================ ============ ============\n"
8937
" https://bugs.launchpad.net/ lp lp:12345\n"
8938
" http://bugs.debian.org/ deb deb:12345\n"
8939
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8940
" ============================ ============ ============"
8941
msgstr ""
8942
8943
#: en/help_topics/bugs.txt:35
8944
msgid ""
8945
"For the bug trackers not listed above configuration is required.\n"
8946
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8947
"is built in, along with a template mechanism for other bugtrackers with\n"
8948
"simple URL schemes. If your bug tracker can't be described by one\n"
8949
"of the schemes described below then you can write a plugin to support\n"
8950
"it."
8951
msgstr ""
8952
8953
#: en/help_topics/bugs.txt:42
8954
msgid ""
8955
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8956
"variable which contains the base URL of the bug tracker. These options\n"
8957
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8958
"configuration section in ``locations.conf``. You can set up these values\n"
8959
"for each of the projects you work on."
8960
msgstr ""
8961
8962
#: en/help_topics/bugs.txt:48
8963
msgid ""
8964
"Note: As you provide a short name for each tracker, you can specify one or\n"
8965
"more bugs in one or more trackers at commit time if you wish."
8966
msgstr ""
8967
8968
#: en/help_topics/bugs.txt:51
8969
msgid ""
8970
"Launchpad\n"
8971
"---------"
8972
msgstr ""
8973
8974
#: en/help_topics/bugs.txt:54
8975
msgid ""
8976
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8977
msgstr ""
8978
8979
#: en/help_topics/bugs.txt:56
8980
msgid ""
8981
"bugzilla_<tracker>_url\n"
8982
"----------------------"
8983
msgstr ""
8984
8985
#: en/help_topics/bugs.txt:59
8986
msgid ""
8987
"If present, the location of the Bugzilla bug tracker referred to by\n"
8988
"<tracker>. This option can then be used together with ``bzr commit\n"
8989
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8990
"example::"
8991
msgstr ""
8992
8993
#: en/help_topics/bugs.txt:64
8994
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8995
msgstr ""
8996
8997
#: en/help_topics/bugs.txt:66
8998
msgid ""
8999
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9000
"fixed."
9001
msgstr ""
9002
9003
#: en/help_topics/bugs.txt:69
9004
msgid ""
9005
"trac_<tracker>_url\n"
9006
"------------------"
9007
msgstr ""
9008
9009
#: en/help_topics/bugs.txt:72
9010
msgid ""
9011
"If present, the location of the Trac instance referred to by\n"
9012
"<tracker>. This option can then be used together with ``bzr commit\n"
9013
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9014
"example::"
9015
msgstr ""
9016
9017
#: en/help_topics/bugs.txt:77
9018
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9019
msgstr ""
9020
9021
#: en/help_topics/bugs.txt:79
9022
msgid ""
9023
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9024
"as\n"
9025
"fixed."
9026
msgstr ""
9027
9028
#: en/help_topics/bugs.txt:82
9029
msgid ""
9030
"bugtracker_<tracker>_url\n"
9031
"------------------------"
9032
msgstr ""
9033
9034
#: en/help_topics/bugs.txt:85
9035
msgid ""
9036
"If present, the location of a generic bug tracker instance referred to by\n"
9037
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9038
"which will be replaced by a specific bug ID. This option can then be used\n"
9039
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9040
"fixed by that commit. For example::"
9041
msgstr ""
9042
9043
#: en/help_topics/bugs.txt:91
9044
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9045
msgstr ""
9046
9047
#: en/help_topics/bugs.txt:93
9048
msgid ""
9049
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9050
"Roundup bug tracker as fixed, or::"
9051
msgstr ""
9052
9053
#: en/help_topics/bugs.txt:96
9054
msgid ""
9055
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9056
msgstr ""
9057
9058
#: en/help_topics/bugs.txt:98
9059
msgid ""
9060
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9061
"RT bug tracker as fixed, or::"
9062
msgstr ""
9063
9064
#: en/help_topics/bugs.txt:101
9065
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9066
msgstr ""
9067
9068
#: en/help_topics/bugs.txt:103
9069
msgid ""
9070
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9071
"1234\n"
9072
"in Hudson's JIRA bug tracker as fixed.\n"
9073
msgstr ""
9074
9075
#: en/help_topics/commands.txt:1
9076
msgid ""
9077
"add Add specified files or directories.\n"
9078
"alias Set/unset and display aliases.\n"
9079
"annotate Show the origin of each line in a file.\n"
9080
"bash-completion Generate a shell function for bash command line "
9081
"completion.\n"
9082
" [bash_completion]\n"
9083
"bind Convert the current branch into a checkout of the "
9084
"supplied\n"
9085
" branch.\n"
9086
"branch Create a new branch that is a copy of an existing branch.\n"
9087
"branches List the branches available at the current location.\n"
9088
"break-lock Break a dead lock.\n"
9089
"cat Write the contents of a file as of a given revision to\n"
9090
" standard output.\n"
9091
"check Validate working tree structure, branch consistency and\n"
9092
" repository history.\n"
9093
"checkout Create a new checkout of an existing branch.\n"
9094
"clean-tree Remove unwanted files from working tree.\n"
9095
"commit Commit changes into a new revision.\n"
9096
"config Display, set or remove a configuration option.\n"
9097
"conflicts List files with conflicts.\n"
9098
"deleted List files deleted in the working tree.\n"
9099
"diff Show differences in the working tree, between revisions "
9100
"or\n"
9101
" branches.\n"
9102
"dpush Push into a different VCS without any custom bzr "
9103
"metadata.\n"
9104
"export Export current or past revision to a destination directory "
9105
"or\n"
9106
" archive.\n"
9107
"help Show help on a command or other topic.\n"
9108
"ignore Ignore specified files or patterns.\n"
9109
"ignored List ignored files and the patterns that matched them.\n"
9110
"info Show information about a working tree, branch or "
9111
"repository.\n"
9112
"init Make a directory into a versioned branch.\n"
9113
"init-repository Create a shared repository for branches to share storage\n"
9114
" space.\n"
9115
"join Combine a tree into its containing tree.\n"
9116
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9117
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9118
"launchpad-open Open a Launchpad branch page in your web browser. "
9119
"[launchpad]\n"
9120
"log Show historical log for a branch or subset of a branch.\n"
9121
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9122
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9123
"ls List files in a tree.\n"
9124
"merge Perform a three-way merge.\n"
9125
"missing Show unmerged/unpulled revisions between two branches.\n"
9126
"mkdir Create a new versioned directory.\n"
9127
"mv Move or rename a file.\n"
9128
"nick Print or set the branch nickname.\n"
9129
"pack Compress the data within a repository.\n"
9130
"plugins List the installed plugins.\n"
9131
"pull Turn this branch into a mirror of another branch.\n"
9132
"push Update a mirror of this branch.\n"
9133
"reconcile Reconcile bzr metadata in a branch.\n"
9134
"reconfigure Reconfigure the type of a bzr directory.\n"
9135
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9136
"remerge Redo a merge.\n"
9137
"remove Remove files or directories.\n"
9138
"remove-branch Remove a branch.\n"
9139
"remove-tree Remove the working tree from a given branch/checkout.\n"
9140
"renames Show list of renamed files.\n"
9141
"resolve Mark a conflict as resolved.\n"
9142
"revert Set files in the working tree back to the contents of a\n"
9143
" previous revision.\n"
9144
"revno Show current revision number.\n"
9145
"root Show the tree root directory.\n"
9146
"send Mail or create a merge-directive for submitting changes.\n"
9147
"serve Run the bzr server.\n"
9148
"shelve Temporarily set aside some changes from the current tree.\n"
9149
"sign-my-commits Sign all commits by a given committer.\n"
9150
"split Split a subdirectory of a tree into a separate tree.\n"
9151
"status Display status summary.\n"
9152
"switch Set the branch of a checkout and update.\n"
9153
"tag Create, remove or modify a tag naming a revision.\n"
9154
"tags List tags.\n"
9155
"testament Show testament (signing-form) of a revision.\n"
9156
"unbind Convert the current checkout into a regular branch.\n"
9157
"uncommit Remove the last committed revision.\n"
9158
"unshelve Restore shelved changes.\n"
9159
"update Update a working tree to a new revision.\n"
9160
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9161
" format.\n"
9162
"verify-signatures Verify all commit signatures.\n"
9163
"version Show version of bzr.\n"
9164
"version-info Show version information about this tree.\n"
9165
"view Manage filtered views.\n"
9166
"whoami Show or set bzr user id.\n"
9167
msgstr ""
9168
9169
#: en/help_topics/configuration.txt:1
9170
msgid ""
9171
"Configuration Settings\n"
9172
"======================="
9173
msgstr ""
9174
9175
#: en/help_topics/configuration.txt:4
9176
msgid ""
9177
"Environment settings\n"
9178
"---------------------"
9179
msgstr ""
9180
9181
#: en/help_topics/configuration.txt:7
9182
msgid ""
9183
"While most configuration is handled by configuration files, some options\n"
9184
"which may be semi-permanent can also be controlled through the environment."
9185
msgstr ""
9186
9187
#: en/help_topics/configuration.txt:10
9188
msgid ""
9189
"BZR_EMAIL\n"
9190
"~~~~~~~~~"
9191
msgstr ""
9192
9193
#: en/help_topics/configuration.txt:13
9194
msgid "Override the email id used by Bazaar. Typical format::"
9195
msgstr ""
9196
9197
#: en/help_topics/configuration.txt:15
9198
msgid " \"John Doe <jdoe@example.com>\""
9199
msgstr ""
9200
9201
#: en/help_topics/configuration.txt:17
9202
msgid "See also the ``email`` configuration option."
9203
msgstr ""
9204
9205
#: en/help_topics/configuration.txt:19
9206
msgid ""
9207
"BZR_PROGRESS_BAR\n"
9208
"~~~~~~~~~~~~~~~~"
9209
msgstr ""
9210
9211
#: en/help_topics/configuration.txt:22
9212
msgid ""
9213
"Override the progress display. Possible values are \"none\" or \"text\". "
9214
"If\n"
9215
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9216
"draws\n"
9217
"the ordinary command line progress bar."
9218
msgstr ""
9219
9220
#: en/help_topics/configuration.txt:26
9221
msgid ""
9222
"BZR_SIGQUIT_PDB\n"
9223
"~~~~~~~~~~~~~~~"
9224
msgstr ""
9225
9226
#: en/help_topics/configuration.txt:29
9227
msgid ""
9228
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9229
msgstr ""
9230
9231
#: en/help_topics/configuration.txt:31
9232
msgid ""
9233
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9234
"* 1 = Invoke breakin debugger (default)"
9235
msgstr ""
9236
9237
#: en/help_topics/configuration.txt:34
9238
msgid ""
9239
"BZR_HOME\n"
9240
"~~~~~~~~"
9241
msgstr ""
9242
9243
#: en/help_topics/configuration.txt:37
9244
msgid "Override the home directory used by Bazaar."
9245
msgstr ""
9246
9247
#: en/help_topics/configuration.txt:39
9248
msgid ""
9249
"BZR_SSH\n"
9250
"~~~~~~~"
9251
msgstr ""
9252
9253
#: en/help_topics/configuration.txt:42
9254
msgid "Select a different SSH implementation."
9255
msgstr ""
9256
9257
#: en/help_topics/configuration.txt:44
9258
msgid ""
9259
"BZR_PDB\n"
9260
"~~~~~~~"
9261
msgstr ""
9262
9263
#: en/help_topics/configuration.txt:47
9264
msgid "Control whether to launch a debugger on error."
9265
msgstr ""
9266
9267
#: en/help_topics/configuration.txt:49
9268
msgid ""
9269
"* 0 = Standard behavior\n"
9270
"* 1 = Launch debugger"
9271
msgstr ""
9272
9273
#: en/help_topics/configuration.txt:52
9274
msgid ""
9275
"BZR_REMOTE_PATH\n"
9276
"~~~~~~~~~~~~~~~"
9277
msgstr ""
9278
9279
#: en/help_topics/configuration.txt:55
9280
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9281
msgstr ""
9282
9283
#: en/help_topics/configuration.txt:57
9284
msgid "See also the ``bzr_remote_path`` configuration option."
9285
msgstr ""
9286
9287
#: en/help_topics/configuration.txt:59
9288
msgid ""
9289
"BZR_EDITOR\n"
9290
"~~~~~~~~~~"
9291
msgstr ""
9292
9293
#: en/help_topics/configuration.txt:62
9294
msgid "Path to the editor Bazaar should use for commit messages, etc."
9295
msgstr ""
9296
9297
#: en/help_topics/configuration.txt:64
9298
msgid ""
9299
"BZR_LOG\n"
9300
"~~~~~~~"
9301
msgstr ""
9302
9303
#: en/help_topics/configuration.txt:67
9304
msgid ""
9305
"Location of the Bazaar log file. You can check the current location by\n"
9306
"running ``bzr version``."
9307
msgstr ""
9308
9309
#: en/help_topics/configuration.txt:70
9310
msgid ""
9311
"The log file contains debug information that is useful for diagnosing or\n"
9312
"reporting problems with Bazaar."
9313
msgstr ""
9314
9315
#: en/help_topics/configuration.txt:73
9316
msgid ""
9317
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9318
"will disable logging."
9319
msgstr ""
9320
9321
#: en/help_topics/configuration.txt:76
9322
msgid ""
9323
"\n"
9324
"BZR_PLUGIN_PATH\n"
9325
"~~~~~~~~~~~~~~~"
9326
msgstr ""
9327
9328
#: en/help_topics/configuration.txt:80
9329
msgid ""
9330
"The path to the plugins directory that Bazaar should use.\n"
9331
"If not set, Bazaar will search for plugins in:"
9332
msgstr ""
9333
9334
#: en/help_topics/configuration.txt:83
9335
msgid ""
9336
"* the user specific plugin directory (containing the ``user`` plugins),"
9337
msgstr ""
9338
9339
#: en/help_topics/configuration.txt:85
9340
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9341
msgstr ""
9342
9343
#: en/help_topics/configuration.txt:87
9344
msgid ""
9345
"* the site specific plugin directory if applicable (containing\n"
9346
" the ``site`` plugins)."
9347
msgstr ""
9348
9349
#: en/help_topics/configuration.txt:90
9350
msgid ""
9351
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9352
"the way the plugin are searched. "
9353
msgstr ""
9354
9355
#: en/help_topics/configuration.txt:93
9356
msgid ""
9357
"As for the ``PATH`` variables, if multiple directories are\n"
9358
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9359
"platform specific appropriate character (':' on Unix,\n"
9360
"';' on windows)"
9361
msgstr ""
9362
9363
#: en/help_topics/configuration.txt:98
9364
msgid ""
9365
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9366
"in ``user``. However it will continue to search in ``core`` and\n"
9367
"``site`` unless they are explicitly removed."
9368
msgstr ""
9369
9370
#: en/help_topics/configuration.txt:102
9371
msgid ""
9372
"If you need to change the order or remove one of these\n"
9373
"directories, you should use special values:"
9374
msgstr ""
9375
9376
#: en/help_topics/configuration.txt:105
9377
msgid ""
9378
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9379
" path from the default values,"
9380
msgstr ""
9381
9382
#: en/help_topics/configuration.txt:108
9383
msgid ""
9384
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9385
" before the remaining default values (and also remove it from\n"
9386
" the default values)."
9387
msgstr ""
9388
9389
#: en/help_topics/configuration.txt:112
9390
msgid ""
9391
"Note that the special values 'user', 'core' and 'site' should be\n"
9392
"used literally, they will be substituted by the corresponding,\n"
9393
"platform specific, values."
9394
msgstr ""
9395
9396
#: en/help_topics/configuration.txt:116
9397
msgid ""
9398
"The examples below use ':' as the separator, windows users\n"
9399
"should use ';'."
9400
msgstr ""
9401
9402
#: en/help_topics/configuration.txt:119
9403
msgid "Overriding the default user plugin directory::"
9404
msgstr ""
9405
9406
#: en/help_topics/configuration.txt:121
9407
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9408
msgstr ""
9409
9410
#: en/help_topics/configuration.txt:123
9411
msgid "Disabling the site directory while retaining the user directory::"
9412
msgstr ""
9413
9414
#: en/help_topics/configuration.txt:125
9415
msgid " BZR_PLUGIN_PATH='-site:+user'"
9416
msgstr ""
9417
9418
#: en/help_topics/configuration.txt:127
9419
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9420
msgstr ""
9421
9422
#: en/help_topics/configuration.txt:129
9423
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9424
msgstr ""
9425
9426
#: en/help_topics/configuration.txt:131
9427
msgid "Overriding the default site plugin directory::"
9428
msgstr ""
9429
9430
#: en/help_topics/configuration.txt:133
9431
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9432
msgstr ""
9433
9434
#: en/help_topics/configuration.txt:135
9435
msgid ""
9436
"BZR_DISABLE_PLUGINS\n"
9437
"~~~~~~~~~~~~~~~~~~~"
9438
msgstr ""
9439
9440
#: en/help_topics/configuration.txt:138
9441
msgid ""
9442
"Under special circumstances (mostly when trying to diagnose a\n"
9443
"bug), it's better to disable a plugin (or several) rather than\n"
9444
"uninstalling them completely. Such plugins can be specified in\n"
9445
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9446
msgstr ""
9447
9448
#: en/help_topics/configuration.txt:143
9449
msgid ""
9450
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9451
"will raise an import error if they are explicitly imported (by\n"
9452
"another plugin that depends on them for example)."
9453
msgstr ""
9454
9455
#: en/help_topics/configuration.txt:147
9456
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9457
msgstr ""
9458
9459
#: en/help_topics/configuration.txt:149
9460
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9461
msgstr ""
9462
9463
#: en/help_topics/configuration.txt:151
9464
msgid ""
9465
"BZR_PLUGINS_AT\n"
9466
"~~~~~~~~~~~~~~"
9467
msgstr ""
9468
9469
#: en/help_topics/configuration.txt:154
9470
msgid ""
9471
"When adding a new feature or working on a bug in a plugin,\n"
9472
"developers often need to use a specific version of a given\n"
9473
"plugin. Since python requires that the directory containing the\n"
9474
"code is named like the plugin itself this make it impossible to\n"
9475
"use arbitrary directory names (using a two-level directory scheme\n"
9476
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9477
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9478
msgstr ""
9479
9480
#: en/help_topics/configuration.txt:162
9481
msgid ""
9482
"Plugins specified in this environment variable takes precedence\n"
9483
"over the ones in ``BZR_PLUGIN_PATH``."
9484
msgstr ""
9485
9486
#: en/help_topics/configuration.txt:165
9487
msgid ""
9488
"The variable specified a list of ``plugin_name@plugin path``,\n"
9489
"``plugin_name`` being the name of the plugin as it appears in\n"
9490
"python module paths, ``plugin_path`` being the path to the\n"
9491
"directory containing the plugin code itself\n"
9492
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9493
"separator, use ';' on windows."
9494
msgstr ""
9495
9496
#: en/help_topics/configuration.txt:172
9497
msgid ""
9498
"Example:\n"
9499
"~~~~~~~~"
9500
msgstr ""
9501
9502
#: en/help_topics/configuration.txt:175
9503
msgid ""
9504
"Using a specific version of ``myplugin``:\n"
9505
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9506
msgstr ""
9507
9508
#: en/help_topics/configuration.txt:178
9509
msgid ""
9510
"BZRPATH\n"
9511
"~~~~~~~"
9512
msgstr ""
9513
9514
#: en/help_topics/configuration.txt:181
9515
msgid "The path where Bazaar should look for shell plugin external commands."
9516
msgstr ""
9517
9518
#: en/help_topics/configuration.txt:183
9519
msgid ""
9520
"\n"
9521
"http_proxy, https_proxy\n"
9522
"~~~~~~~~~~~~~~~~~~~~~~~"
9523
msgstr ""
9524
9525
#: en/help_topics/configuration.txt:187
9526
msgid "Specifies the network proxy for outgoing connections, for example::"
9527
msgstr ""
9528
9529
#: en/help_topics/configuration.txt:189
9530
msgid ""
9531
" http_proxy=http://proxy.example.com:3128/ \n"
9532
" https_proxy=http://proxy.example.com:3128/"
9533
msgstr ""
9534
9535
#: en/help_topics/configuration.txt:192
9536
msgid ""
9537
"\n"
9538
"Configuration files\n"
9539
"-------------------"
9540
msgstr ""
9541
9542
#: en/help_topics/configuration.txt:196
9543
msgid ""
9544
"Location\n"
9545
"~~~~~~~~"
9546
msgstr ""
9547
9548
#: en/help_topics/configuration.txt:199
9549
msgid ""
9550
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9551
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9552
"on\n"
9553
"Windows. (You can check the location for your system by using\n"
9554
"``bzr version``.)"
9555
msgstr ""
9556
9557
#: en/help_topics/configuration.txt:204
9558
msgid "There are three primary configuration files in this location:"
9559
msgstr ""
9560
9561
#: en/help_topics/configuration.txt:206
9562
msgid "* ``bazaar.conf`` describes default configuration options,"
9563
msgstr ""
9564
9565
#: en/help_topics/configuration.txt:208
9566
msgid ""
9567
"* ``locations.conf`` describes configuration information for\n"
9568
" specific branch locations,"
9569
msgstr ""
9570
9571
#: en/help_topics/configuration.txt:211
9572
msgid ""
9573
"* ``authentication.conf`` describes credential information for\n"
9574
" remote servers."
9575
msgstr ""
9576
9577
#: en/help_topics/configuration.txt:214
9578
msgid ""
9579
"Each branch can also contain a configuration file that sets values specific\n"
9580
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9581
"the\n"
9582
"branch. This file is visible to all users of a branch, if you wish to "
9583
"override\n"
9584
"one of the values for a branch with a setting that is specific to you then "
9585
"you\n"
9586
"can do so in ``locations.conf``."
9587
msgstr ""
9588
9589
#: en/help_topics/configuration.txt:220
9590
msgid ""
9591
"General format\n"
9592
"~~~~~~~~~~~~~~"
9593
msgstr ""
9594
9595
#: en/help_topics/configuration.txt:223
9596
msgid ""
9597
"An ini file has three types of contructs: section headers, section\n"
9598
"options and comments."
9599
msgstr ""
9600
9601
#: en/help_topics/configuration.txt:226
9602
msgid ""
9603
"Comments\n"
9604
"^^^^^^^^"
9605
msgstr ""
9606
9607
#: en/help_topics/configuration.txt:229
9608
msgid ""
9609
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9610
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9611
"Bazaar when parsing ini files."
9612
msgstr ""
9613
9614
#: en/help_topics/configuration.txt:233
9615
msgid ""
9616
"Section headers\n"
9617
"^^^^^^^^^^^^^^^"
9618
msgstr ""
9619
9620
#: en/help_topics/configuration.txt:236
9621
msgid ""
9622
"A section header is a word enclosed in brackets that starts at the begining\n"
9623
"of a line. A typical section header looks like this::"
9624
msgstr ""
9625
9626
#: en/help_topics/configuration.txt:239
9627
msgid " [DEFAULT]"
9628
msgstr ""
9629
9630
#: en/help_topics/configuration.txt:241
9631
msgid ""
9632
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9633
"[ALIASES]. Section headers are case sensitive. The default section provides "
9634
"for\n"
9635
"setting options which can be overridden with the branch config file."
9636
msgstr ""
9637
9638
#: en/help_topics/configuration.txt:245
9639
msgid ""
9640
"For ``locations.conf``, the options from the section with the\n"
9641
"longest matching section header are used to the exclusion of other\n"
9642
"potentially valid section headers. A section header uses the path for\n"
9643
"the branch as the section header. Some examples include::"
9644
msgstr ""
9645
9646
#: en/help_topics/configuration.txt:250
9647
msgid ""
9648
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9649
" [/home/jdoe/branches/]"
9650
msgstr ""
9651
9652
#: en/help_topics/configuration.txt:253
9653
msgid ""
9654
"\n"
9655
"Section options\n"
9656
"^^^^^^^^^^^^^^^"
9657
msgstr ""
9658
9659
#: en/help_topics/configuration.txt:257
9660
msgid ""
9661
"A section option resides within a section. A section option contains an\n"
9662
"option name, an equals sign and a value. For example::"
9663
msgstr ""
9664
9665
#: en/help_topics/configuration.txt:260
9666
msgid ""
9667
" email = John Doe <jdoe@isp.com>\n"
9668
" gpg_signing_key = Amy Pond <amy@example.com>"
9669
msgstr ""
9670
9671
#: en/help_topics/configuration.txt:263
9672
msgid ""
9673
"A option can reference other options by enclosing them in curly brackets::"
9674
msgstr ""
9675
9676
#: en/help_topics/configuration.txt:265
9677
msgid ""
9678
" my_branch_name = feature_x\n"
9679
" my_server = bzr+ssh://example.com\n"
9680
" push_location = {my_server}/project/{my_branch_name}"
9681
msgstr ""
9682
9683
#: en/help_topics/configuration.txt:269
9684
msgid ""
9685
"Option policies\n"
9686
"^^^^^^^^^^^^^^^"
9687
msgstr ""
9688
9689
#: en/help_topics/configuration.txt:272
9690
msgid ""
9691
"Options defined in a section affect the named directory or URL plus\n"
9692
"any locations they contain. Policies can be used to change how an\n"
9693
"option value is interpreted for contained locations. Currently\n"
9694
"there are three policies available:"
9695
msgstr ""
9696
9697
#: en/help_topics/configuration.txt:277
9698
msgid ""
9699
" none:\n"
9700
" the value is interpreted the same for contained locations. This is\n"
9701
" the default behaviour.\n"
9702
" norecurse:\n"
9703
" the value is only used for the exact location specified by the\n"
9704
" section name.\n"
9705
" appendpath:\n"
9706
" for contained locations, any additional path components are\n"
9707
" appended to the value."
9708
msgstr ""
9709
9710
#: en/help_topics/configuration.txt:287
9711
msgid ""
9712
"Policies are specified by keys with names of the form "
9713
"\"<option_name>:policy\".\n"
9714
"For example, to define the push location for a tree of branches, the\n"
9715
"following could be used::"
9716
msgstr ""
9717
9718
#: en/help_topics/configuration.txt:291
9719
msgid ""
9720
" [/top/location]\n"
9721
" push_location = sftp://example.com/location\n"
9722
" push_location:policy = appendpath"
9723
msgstr ""
9724
9725
#: en/help_topics/configuration.txt:295
9726
msgid ""
9727
"With this configuration, the push location for ``/top/location/branch1``\n"
9728
"would be ``sftp://example.com/location/branch1``."
9729
msgstr ""
9730
9731
#: en/help_topics/configuration.txt:298
9732
msgid ""
9733
"Section local options\n"
9734
"^^^^^^^^^^^^^^^^^^^^^"
9735
msgstr ""
9736
9737
#: en/help_topics/configuration.txt:301
9738
msgid ""
9739
"Some options are defined automatically inside a given section and can be\n"
9740
"refered to in this section only. "
9741
msgstr ""
9742
9743
#: en/help_topics/configuration.txt:304
9744
msgid "For example, the ``appendpath`` policy can be used like this::"
9745
msgstr ""
9746
9747
#: en/help_topics/configuration.txt:306
9748
msgid ""
9749
" [/home/vila/src/bzr/bugs]\n"
9750
" mypush = lp:~vila/bzr\n"
9751
" mypush:policy=appendpath"
9752
msgstr ""
9753
9754
#: en/help_topics/configuration.txt:310
9755
msgid "Using ``relpath`` to achieve the same result is done like this::"
9756
msgstr ""
9757
9758
#: en/help_topics/configuration.txt:312
9759
msgid ""
9760
" [/home/vila/src/bzr/bugs]\n"
9761
" mypush = lp:~vila/bzr/{relpath}"
9762
msgstr ""
9763
9764
#: en/help_topics/configuration.txt:315
9765
msgid ""
9766
"In both cases, when used in a directory like\n"
9767
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9768
msgstr ""
9769
9770
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9771
msgid ""
9772
" $ bzr config mypush\n"
9773
" lp:~vila/bzr/832013-expand-in-stack"
9774
msgstr ""
9775
9776
#: en/help_topics/configuration.txt:321
9777
msgid "Another such option is ``basename`` which can be used like this::"
9778
msgstr ""
9779
9780
#: en/help_topics/configuration.txt:323
9781
msgid ""
9782
" [/home/vila/src/bzr]\n"
9783
" mypush = lp:~vila/bzr/{basename}"
9784
msgstr ""
9785
9786
#: en/help_topics/configuration.txt:326
9787
msgid ""
9788
"When used in a directory like\n"
9789
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9790
msgstr ""
9791
9792
#: en/help_topics/configuration.txt:332
9793
msgid ""
9794
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9795
"itself is defined as the relative path between the section name and the\n"
9796
"location it matches."
9797
msgstr ""
9798
9799
#: en/help_topics/configuration.txt:336
9800
msgid ""
9801
"Another such option is ``branchname``, which refers to the name of a "
9802
"colocated\n"
9803
"branch. For non-colocated branches, it behaves like basename. It can be "
9804
"used\n"
9805
"like this::"
9806
msgstr ""
9807
9808
#: en/help_topics/configuration.txt:340
9809
msgid ""
9810
" [/home/vila/src/bzr/bugs]\n"
9811
" mypush = lp:~vila/bzr/{branchname}"
9812
msgstr ""
9813
9814
#: en/help_topics/configuration.txt:343
9815
msgid ""
9816
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9817
"get::"
9818
msgstr ""
9819
9820
#: en/help_topics/configuration.txt:345
9821
msgid ""
9822
" bzr config mypush\n"
9823
" lp:~vila/bzr/832013-expand-in-stack"
9824
msgstr ""
9825
9826
#: en/help_topics/configuration.txt:348
9827
msgid ""
9828
"When an option is local to a Section, it cannot be referred to from option\n"
9829
"values in any other section from the same ``Store`` nor from any other\n"
9830
"``Store``."
9831
msgstr ""
9832
9833
#: en/help_topics/configuration.txt:352
9834
msgid ""
9835
"\n"
9836
"The main configuration file, bazaar.conf\n"
9837
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9838
msgstr ""
9839
9840
#: en/help_topics/configuration.txt:356
9841
msgid ""
9842
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9843
"The default section contains the default\n"
9844
"configuration options for all branches. The default section can be\n"
9845
"overriden by providing a branch-specific section in ``locations.conf``."
9846
msgstr ""
9847
9848
#: en/help_topics/configuration.txt:361
9849
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9850
msgstr ""
9851
9852
#: en/help_topics/configuration.txt:363
9853
msgid ""
9854
" [DEFAULT]\n"
9855
" email = John Doe <jdoe@isp.com>\n"
9856
" editor = /usr/bin/vim\n"
9857
" create_signatures = when-required"
9858
msgstr ""
9859
9860
#: en/help_topics/configuration.txt:368
9861
msgid ""
9862
"\n"
9863
"The branch location configuration file, locations.conf\n"
9864
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9865
msgstr ""
9866
9867
#: en/help_topics/configuration.txt:372
9868
msgid ""
9869
"``locations.conf`` allows one to specify overriding settings for\n"
9870
"a specific branch. The format is almost identical to the default section in\n"
9871
"bazaar.conf with one significant change: The section header, instead of "
9872
"saying\n"
9873
"default, will be the path to a branch that you wish to override a value\n"
9874
"for. The '?' and '*' wildcards are supported::"
9875
msgstr ""
9876
9877
#: en/help_topics/configuration.txt:378
9878
msgid ""
9879
" [/home/jdoe/branches/nethack]\n"
9880
" email = Nethack Admin <nethack@nethack.com>"
9881
msgstr ""
9882
9883
#: en/help_topics/configuration.txt:381
9884
msgid ""
9885
" [http://hypothetical.site.com/branches/devel-branch]\n"
9886
" create_signatures = always"
9887
msgstr ""
9888
9889
#: en/help_topics/configuration.txt:384
9890
msgid ""
9891
"The authentication configuration file, authentication.conf\n"
9892
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9893
msgstr ""
9894
9895
#: en/help_topics/configuration.txt:387
9896
msgid ""
9897
"``authentication.conf`` allows one to specify credentials for\n"
9898
"remote servers. This can be used for all the supported transports and any "
9899
"part\n"
9900
"of bzr that requires authentication (smtp for example)."
9901
msgstr ""
9902
9903
#: en/help_topics/configuration.txt:391
9904
msgid ""
9905
"The syntax of the file obeys the same rules as the others except for the\n"
9906
"option policies which don't apply."
9907
msgstr ""
9908
9909
#: en/help_topics/configuration.txt:394
9910
msgid ""
9911
"For more information on the possible uses of the authentication "
9912
"configuration\n"
9913
"file see :doc:`authentication-help`."
9914
msgstr ""
9915
9916
#: en/help_topics/configuration.txt:397
9917
msgid ""
9918
"\n"
9919
"Common options\n"
9920
"--------------"
9921
msgstr ""
9922
9923
#: en/help_topics/configuration.txt:401
9924
msgid ""
9925
"debug_flags\n"
9926
"~~~~~~~~~~~"
9927
msgstr ""
9928
9929
#: en/help_topics/configuration.txt:404
9930
msgid ""
9931
"A comma-separated list of debugging options to turn on. The same values\n"
9932
"can be used as with the -D command-line option (see `help global-options`).\n"
9933
"For example::"
9934
msgstr ""
9935
9936
#: en/help_topics/configuration.txt:408
9937
msgid " debug_flags = hpss"
9938
msgstr ""
9939
9940
#: en/help_topics/configuration.txt:412
9941
msgid " debug_flags = hpss,evil"
9942
msgstr ""
9943
9944
#: en/help_topics/configuration.txt:414
9945
msgid ""
9946
"email\n"
9947
"~~~~~"
9948
msgstr ""
9949
9950
#: en/help_topics/configuration.txt:417
9951
msgid ""
9952
"The email address to use when committing a branch. Typically takes the form\n"
9953
"of::"
9954
msgstr ""
9955
9956
#: en/help_topics/configuration.txt:420
9957
msgid " email = Full Name <account@hostname.tld>"
9958
msgstr ""
9959
9960
#: en/help_topics/configuration.txt:422
9961
msgid ""
9962
"editor\n"
9963
"~~~~~~"
9964
msgstr ""
9965
9966
#: en/help_topics/configuration.txt:425
9967
msgid ""
9968
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9969
"a commit message. This setting is trumped by the environment variable\n"
9970
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9971
"variables."
9972
msgstr ""
9973
9974
#: en/help_topics/configuration.txt:430
9975
msgid ""
9976
"log_format\n"
9977
"~~~~~~~~~~"
9978
msgstr ""
9979
9980
#: en/help_topics/configuration.txt:433
9981
msgid ""
9982
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9983
"and ``line``. Additional formats may be provided by plugins. The default\n"
9984
"value is ``long``."
9985
msgstr ""
9986
9987
#: en/help_topics/configuration.txt:437
9988
msgid ""
9989
"check_signatures\n"
9990
"~~~~~~~~~~~~~~~~"
9991
msgstr ""
9992
9993
#: en/help_topics/configuration.txt:440
9994
msgid ""
9995
"Reserved for future use. These options will allow a policy for branches to\n"
9996
"require signatures."
9997
msgstr ""
9998
9999
#: en/help_topics/configuration.txt:443
10000
msgid ""
10001
"require\n"
10002
" The gnupg signature for revisions must be present and must be valid."
10003
msgstr ""
10004
10005
#: en/help_topics/configuration.txt:446
10006
msgid ""
10007
"ignore\n"
10008
" Do not check gnupg signatures of revisions."
10009
msgstr ""
10010
10011
#: en/help_topics/configuration.txt:449
10012
msgid ""
10013
"check-available\n"
10014
" (default) If gnupg signatures for revisions are present, check them.\n"
10015
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10016
" no signature is present."
10017
msgstr ""
10018
10019
#: en/help_topics/configuration.txt:454
10020
msgid ""
10021
"create_signatures\n"
10022
"~~~~~~~~~~~~~~~~~"
10023
msgstr ""
10024
10025
#: en/help_topics/configuration.txt:457
10026
msgid ""
10027
"Defines the behaviour of signing revisions on commits. By default bzr will "
10028
"not\n"
10029
"sign new commits."
10030
msgstr ""
10031
10032
#: en/help_topics/configuration.txt:460
10033
msgid ""
10034
"always\n"
10035
" Sign every new revision that is committed. If the signing fails then "
10036
"the\n"
10037
" commit will not be made."
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:464
10041
msgid ""
10042
"when-required\n"
10043
" Reserved for future use."
10044
msgstr ""
10045
10046
#: en/help_topics/configuration.txt:467
10047
msgid ""
10048
"never\n"
10049
" Reserved for future use."
10050
msgstr ""
10051
10052
#: en/help_topics/configuration.txt:470
10053
msgid ""
10054
"In future it is planned that ``when-required`` will sign newly\n"
10055
"committed revisions only when the branch requires them. ``never`` will "
10056
"refuse\n"
10057
"to sign newly committed revisions, even if the branch requires signatures."
10058
msgstr ""
10059
10060
#: en/help_topics/configuration.txt:474
10061
msgid ""
10062
"dirstate.fdatasync\n"
10063
"~~~~~~~~~~~~~~~~~~"
10064
msgstr ""
10065
10066
#: en/help_topics/configuration.txt:477
10067
msgid ""
10068
"If true (default), working tree metadata changes are flushed through the\n"
10069
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10070
"should not be lost if the machine crashes. See also repository.fdatasync."
10071
msgstr ""
10072
10073
#: en/help_topics/configuration.txt:481
10074
msgid ""
10075
"gpg_signing_key\n"
10076
"~~~~~~~~~~~~~~~"
10077
msgstr ""
10078
10079
#: en/help_topics/configuration.txt:484
10080
msgid ""
10081
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10082
"address, key fingerprint or full key ID. When unset or when set to\n"
10083
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10084
msgstr ""
10085
10086
#: en/help_topics/configuration.txt:488
10087
msgid ""
10088
"recurse\n"
10089
"~~~~~~~"
10090
msgstr ""
10091
10092
#: en/help_topics/configuration.txt:491
10093
msgid ""
10094
"Only useful in ``locations.conf``. Defines whether or not the\n"
10095
"configuration for this section applies to subdirectories:"
10096
msgstr ""
10097
10098
#: en/help_topics/configuration.txt:494
10099
msgid ""
10100
"true\n"
10101
" (default) This section applies to subdirectories as well."
10102
msgstr ""
10103
10104
#: en/help_topics/configuration.txt:497
10105
msgid ""
10106
"false\n"
10107
" This section only applies to the branch at this directory and not\n"
10108
" branches below it."
10109
msgstr ""
10110
10111
#: en/help_topics/configuration.txt:501
10112
msgid ""
10113
"gpg_signing_command\n"
10114
"~~~~~~~~~~~~~~~~~~~"
10115
msgstr ""
10116
10117
#: en/help_topics/configuration.txt:504
10118
msgid ""
10119
"(Default: \"gpg\"). Which program should be used to sign and check "
10120
"revisions.\n"
10121
"For example::"
10122
msgstr ""
10123
10124
#: en/help_topics/configuration.txt:507
10125
msgid " gpg_signing_command = /usr/bin/gnpg"
10126
msgstr ""
10127
10128
#: en/help_topics/configuration.txt:509
10129
msgid ""
10130
"The specified command must accept the options \"--clearsign\" and \"-u "
10131
"<email>\"."
10132
msgstr ""
10133
10134
#: en/help_topics/configuration.txt:511
10135
msgid ""
10136
"bzr_remote_path\n"
10137
"~~~~~~~~~~~~~~~"
10138
msgstr ""
10139
10140
#: en/help_topics/configuration.txt:514
10141
msgid ""
10142
"(Default: \"bzr\"). The path to the command that should be used to run the "
10143
"smart\n"
10144
"server for bzr. This value may only be specified in locations.conf, because:"
10145
msgstr ""
10146
10147
#: en/help_topics/configuration.txt:517
10148
msgid ""
10149
"- it's needed before branch.conf is accessible\n"
10150
"- allowing remote branch.conf files to specify commands would be a security\n"
10151
" risk"
10152
msgstr ""
10153
10154
#: en/help_topics/configuration.txt:521
10155
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10156
msgstr ""
10157
10158
#: en/help_topics/configuration.txt:523
10159
msgid ""
10160
"smtp_server\n"
10161
"~~~~~~~~~~~"
10162
msgstr ""
10163
10164
#: en/help_topics/configuration.txt:526
10165
msgid ""
10166
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10167
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10168
msgstr ""
10169
10170
#: en/help_topics/configuration.txt:529
10171
msgid ""
10172
"smtp_username, smtp_password\n"
10173
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10174
msgstr ""
10175
10176
#: en/help_topics/configuration.txt:532
10177
msgid ""
10178
"User and password to authenticate to the SMTP server. If smtp_username\n"
10179
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10180
"These settings are only needed if the SMTP server requires authentication\n"
10181
"to send mail."
10182
msgstr ""
10183
10184
#: en/help_topics/configuration.txt:537
10185
msgid ""
10186
"locks.steal_dead\n"
10187
"~~~~~~~~~~~~~~~~"
10188
msgstr ""
10189
10190
#: en/help_topics/configuration.txt:540
10191
msgid ""
10192
"If set to true, bzr will automatically break locks held by processes from\n"
10193
"the same machine and user that are no longer alive. Otherwise, it will\n"
10194
"print a message and you can break the lock manually, if you are satisfied\n"
10195
"the object is no longer in use."
10196
msgstr ""
10197
10198
#: en/help_topics/configuration.txt:545
10199
msgid ""
10200
"mail_client\n"
10201
"~~~~~~~~~~~"
10202
msgstr ""
10203
10204
#: en/help_topics/configuration.txt:548
10205
msgid ""
10206
"A mail client to use for sending merge requests.\n"
10207
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10208
"it\n"
10209
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10210
"``editor``."
10211
msgstr ""
10212
10213
#: en/help_topics/configuration.txt:553
10214
msgid "Supported values for specific clients:"
10215
msgstr ""
10216
10217
#: en/help_topics/configuration.txt:555
10218
msgid ""
10219
":claws: Use Claws. This skips a dialog for attaching files.\n"
10220
":evolution: Use Evolution.\n"
10221
":kmail: Use KMail.\n"
10222
":mutt: Use Mutt.\n"
10223
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10224
"1.5,\n"
10225
" this works around some bugs that xdg-email doesn't handle."
10226
msgstr ""
10227
10228
#: en/help_topics/configuration.txt:562
10229
msgid "Supported generic values are:"
10230
msgstr ""
10231
10232
#: en/help_topics/configuration.txt:564
10233
msgid ""
10234
":default: See above.\n"
10235
":editor: Use your editor to compose the merge request. This also uses\n"
10236
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10237
" smtp_username and smtp_password.\n"
10238
":mapi: Use your preferred e-mail client on Windows.\n"
10239
":xdg-email: Use xdg-email to run your preferred mail program"
10240
msgstr ""
10241
10242
#: en/help_topics/configuration.txt:571
10243
msgid ""
10244
"repository.fdatasync\n"
10245
"~~~~~~~~~~~~~~~~~~~~"
10246
msgstr ""
10247
10248
#: en/help_topics/configuration.txt:574
10249
msgid ""
10250
"If true (default), repository changes are flushed through the OS buffers\n"
10251
"to physical disk. This is somewhat slower, but means data should not be\n"
10252
"lost if the machine crashes. See also dirstate.fdatasync."
10253
msgstr ""
10254
10255
#: en/help_topics/configuration.txt:578
10256
msgid ""
10257
"submit_branch\n"
10258
"~~~~~~~~~~~~~"
10259
msgstr ""
10260
10261
#: en/help_topics/configuration.txt:581
10262
msgid ""
10263
"The branch you intend to submit your current work to. This is "
10264
"automatically\n"
10265
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10266
"This\n"
10267
"should usually be set on a per-branch or per-location basis."
10268
msgstr ""
10269
10270
#: en/help_topics/configuration.txt:585
10271
msgid ""
10272
"public_branch\n"
10273
"~~~~~~~~~~~~~"
10274
msgstr ""
10275
10276
#: en/help_topics/configuration.txt:588
10277
msgid ""
10278
"A publically-accessible version of this branch (implying that this version "
10279
"is\n"
10280
"not publically-accessible). Used (and set) by ``bzr send``."
10281
msgstr ""
10282
10283
#: en/help_topics/configuration.txt:591
10284
msgid ""
10285
"suppress_warnings\n"
10286
"~~~~~~~~~~~~~~~~~"
10287
msgstr ""
10288
10289
#: en/help_topics/configuration.txt:594
10290
msgid ""
10291
"A list of strings, each string represent a warning that can be emitted by\n"
10292
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10293
msgstr ""
10294
10295
#: en/help_topics/configuration.txt:597
10296
msgid "Valid values:"
10297
msgstr ""
10298
10299
#: en/help_topics/configuration.txt:599
10300
msgid ""
10301
"* ``format_deprecation``:\n"
10302
" whether the format deprecation warning is shown on repositories that "
10303
"are\n"
10304
" using deprecated formats."
10305
msgstr ""
10306
10307
#: en/help_topics/configuration.txt:603
10308
msgid ""
10309
"default_format\n"
10310
"~~~~~~~~~~~~~~"
10311
msgstr ""
10312
10313
#: en/help_topics/configuration.txt:606
10314
msgid ""
10315
"A format name for the default format used when creating branches. See "
10316
"``bzr\n"
10317
"help formats`` for possible values."
10318
msgstr ""
10319
10320
#: en/help_topics/configuration.txt:609
10321
msgid ""
10322
"\n"
10323
"Unicode options\n"
10324
"---------------"
10325
msgstr ""
10326
10327
#: en/help_topics/configuration.txt:613
10328
msgid ""
10329
"output_encoding\n"
10330
"~~~~~~~~~~~~~~~"
10331
msgstr ""
10332
10333
#: en/help_topics/configuration.txt:616
10334
msgid ""
10335
"A Python unicode encoding name for text output from bzr, such as log\n"
10336
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10337
"is the terminal encoding prefered by the operating system."
10338
msgstr ""
10339
10340
#: en/help_topics/configuration.txt:620
10341
msgid ""
10342
"\n"
10343
"Branch type specific options\n"
10344
"----------------------------"
10345
msgstr ""
10346
10347
#: en/help_topics/configuration.txt:624
10348
msgid ""
10349
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10350
"later format. They\n"
10351
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10352
"manually set in ``locations.conf`` or ``bazaar.conf``."
10353
msgstr ""
10354
10355
#: en/help_topics/configuration.txt:629
10356
msgid ""
10357
"append_revisions_only\n"
10358
"~~~~~~~~~~~~~~~~~~~~~"
10359
msgstr ""
10360
10361
#: en/help_topics/configuration.txt:632
10362
msgid ""
10363
"If set to \"True\" then revisions can only be appended to the log, not\n"
10364
"removed. A branch with this setting enabled can only pull from another\n"
10365
"branch if the other branch's log is a longer version of its own. This is\n"
10366
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10367
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10368
"compatibility with previous bzr versions (older than 2.2)."
10369
msgstr ""
10370
10371
#: en/help_topics/configuration.txt:639
10372
msgid ""
10373
"parent_location\n"
10374
"~~~~~~~~~~~~~~~"
10375
msgstr ""
10376
10377
#: en/help_topics/configuration.txt:642
10378
msgid ""
10379
"If present, the location of the default branch for pull or merge. This "
10380
"option\n"
10381
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10382
"--remember``."
10383
msgstr ""
10384
10385
#: en/help_topics/configuration.txt:646
10386
msgid ""
10387
"push_location\n"
10388
"~~~~~~~~~~~~~"
10389
msgstr ""
10390
10391
#: en/help_topics/configuration.txt:649
10392
msgid ""
10393
"If present, the location of the default branch for push. This option\n"
10394
"is normally set by the first ``push`` or ``push --remember``."
10395
msgstr ""
10396
10397
#: en/help_topics/configuration.txt:652
10398
msgid ""
10399
"push_strict\n"
10400
"~~~~~~~~~~~"
10401
msgstr ""
10402
10403
#: en/help_topics/configuration.txt:655
10404
msgid ""
10405
"If present, defines the ``--strict`` option default value for checking\n"
10406
"uncommitted changes before pushing."
10407
msgstr ""
10408
10409
#: en/help_topics/configuration.txt:658
10410
msgid ""
10411
"dpush_strict\n"
10412
"~~~~~~~~~~~~"
10413
msgstr ""
10414
10415
#: en/help_topics/configuration.txt:661
10416
msgid ""
10417
"If present, defines the ``--strict`` option default value for checking\n"
10418
"uncommitted changes before pushing into a different VCS without any\n"
10419
"custom bzr metadata."
10420
msgstr ""
10421
10422
#: en/help_topics/configuration.txt:665
10423
msgid ""
10424
"bound_location\n"
10425
"~~~~~~~~~~~~~~"
10426
msgstr ""
10427
10428
#: en/help_topics/configuration.txt:668
10429
msgid ""
10430
"The location that commits should go to when acting as a checkout.\n"
10431
"This option is normally set by ``bind``."
10432
msgstr ""
10433
10434
#: en/help_topics/configuration.txt:671
10435
msgid ""
10436
"bound\n"
10437
"~~~~~"
10438
msgstr ""
10439
10440
#: en/help_topics/configuration.txt:674
10441
msgid ""
10442
"If set to \"True\", the branch should act as a checkout, and push each "
10443
"commit to\n"
10444
"the bound_location. This option is normally set by ``bind``/``unbind``."
10445
msgstr ""
10446
10447
#: en/help_topics/configuration.txt:677
10448
msgid ""
10449
"send_strict\n"
10450
"~~~~~~~~~~~"
10451
msgstr ""
10452
10453
#: en/help_topics/configuration.txt:680
10454
msgid ""
10455
"If present, defines the ``--strict`` option default value for checking\n"
10456
"uncommitted changes before sending a merge directive."
10457
msgstr ""
10458
10459
#: en/help_topics/configuration.txt:683
10460
msgid ""
10461
"add.maximum_file_size\n"
10462
"~~~~~~~~~~~~~~~~~~~~~"
10463
msgstr ""
10464
"add.maximum_file_size\n"
10465
"~~~~~~~~~~~~~~~~~~~~~"
10466
10467
#: en/help_topics/configuration.txt:686
10468
msgid ""
10469
"Defines the maximum file size the command line \"add\" operation will allow\n"
10470
"in recursive mode, with files larger than this value being skipped. You may "
10471
"\n"
10472
"specify this value as an integer (in which case it is interpreted as bytes), "
10473
"\n"
10474
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10475
"0 \n"
10476
"will disable skipping."
10477
msgstr ""
10478
"Defines the maximum file size the command line \"add\" operation will allow\n"
10479
"in recursive mode, with files larger than this value being skipped. You may "
10480
"\n"
10481
"specify this value as an integer (in which case it is interpreted as bytes), "
10482
"\n"
10483
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10484
"0 \n"
10485
"will disable skipping."
10486
10487
#: en/help_topics/configuration.txt:692
10488
msgid ""
10489
"External Merge Tools\n"
10490
"--------------------"
10491
msgstr ""
10492
10493
#: en/help_topics/configuration.txt:695
10494
msgid ""
10495
"bzr.mergetool.<name>\n"
10496
"~~~~~~~~~~~~~~~~~~~~"
10497
msgstr ""
10498
10499
#: en/help_topics/configuration.txt:698
10500
msgid ""
10501
"Defines an external merge tool called <name> with the given command-line.\n"
10502
"Arguments containing spaces should be quoted using single or double quotes. "
10503
"The\n"
10504
"executable may omit its path if it can be found on the PATH."
10505
msgstr ""
10506
10507
#: en/help_topics/configuration.txt:702
10508
msgid ""
10509
"The following markers can be used in the command-line to substitute "
10510
"filenames\n"
10511
"involved in the merge conflict::"
10512
msgstr ""
10513
10514
#: en/help_topics/configuration.txt:705
10515
msgid ""
10516
" {base} file.BASE\n"
10517
" {this} file.THIS\n"
10518
" {other} file.OTHER\n"
10519
" {result} output file\n"
10520
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10521
"merge\n"
10522
" succeeds."
10523
msgstr ""
10524
10525
#: en/help_topics/configuration.txt:714
10526
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10527
msgstr ""
10528
10529
#: en/help_topics/configuration.txt:716
10530
msgid ""
10531
"bzr.default_mergetool\n"
10532
"~~~~~~~~~~~~~~~~~~~~~"
10533
msgstr ""
10534
10535
#: en/help_topics/configuration.txt:719
10536
msgid ""
10537
"Specifies which external merge tool (as defined above) should be selected "
10538
"by\n"
10539
"default in tools such as ``bzr qconflicts``."
10540
msgstr ""
10541
10542
#: en/help_topics/configuration.txt:724
10543
msgid " bzr.default_mergetool = kdiff3\n"
10544
msgstr ""
10545
10546
#: en/help_topics/conflict-types.txt:1
10547
msgid ""
10548
"Conflict Types\n"
10549
"=============="
10550
msgstr ""
10551
10552
#: en/help_topics/conflict-types.txt:4
10553
msgid ""
10554
"Some operations, like merge, revert and pull, modify the contents of your\n"
10555
"working tree. These modifications are programmatically generated, and so "
10556
"they\n"
10557
"may conflict with the current state of your working tree. "
10558
msgstr ""
10559
10560
#: en/help_topics/conflict-types.txt:8
10561
msgid ""
10562
"When conflicts are present in your working tree (as shown by ``bzr\n"
10563
"conflicts``), you should resolve them and then inform bzr that the "
10564
"conflicts\n"
10565
"have been resolved."
10566
msgstr ""
10567
10568
#: en/help_topics/conflict-types.txt:12
10569
msgid ""
10570
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10571
"should resolve them is not the one responsible for their occurrence, as is "
10572
"the\n"
10573
"case when merging other people's work or because some conflicts are "
10574
"presented\n"
10575
"in a way that is not easy to understand."
10576
msgstr ""
10577
10578
#: en/help_topics/conflict-types.txt:17
10579
msgid ""
10580
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10581
"conflict if and only if there's an actual conceptual conflict in the source\n"
10582
"tree. Because Bazaar doesn't understand the real meaning of the files "
10583
"being\n"
10584
"versioned, it can, when faced with ambiguities, fall short in either "
10585
"direction\n"
10586
"trying to resolve the conflict itself. Many kinds of changes can be "
10587
"combined\n"
10588
"programmatically, but sometimes only a human can determine the right thing "
10589
"to\n"
10590
"do."
10591
msgstr ""
10592
"Bazaar tries to avoid conflicts; its aim is to ask you to resolve the\n"
10593
"conflict if and only if there's an actual conceptual conflict in the source\n"
10594
"tree. Because Bazaar doesn't understand the real meaning of the files "
10595
"being\n"
10596
"versioned, it can, when faced with ambiguities, fall short in either "
10597
"direction\n"
10598
"trying to resolve the conflict itself. Many kinds of changes can be "
10599
"combined\n"
10600
"programmatically, but sometimes only a human can determine the right thing "
10601
"to\n"
10602
"do."
10603
10604
#: en/help_topics/conflict-types.txt:25
10605
msgid ""
10606
"When Bazaar generates a conflict, it adds information into the working tree "
10607
"to\n"
10608
"present the conflicting versions, and it's up to you to find the correct\n"
10609
"resolution."
10610
msgstr ""
10611
10612
#: en/help_topics/conflict-types.txt:29
10613
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10614
msgstr ""
10615
10616
#: en/help_topics/conflict-types.txt:31
10617
msgid ""
10618
"1. Modify the working tree content so that the conflicted item is now in "
10619
"the\n"
10620
" state you want to keep, then"
10621
msgstr ""
10622
10623
#: en/help_topics/conflict-types.txt:34
10624
msgid ""
10625
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10626
" remaining generated information (``bzr resolve <item>``)."
10627
msgstr ""
10628
10629
#: en/help_topics/conflict-types.txt:37
10630
msgid ""
10631
"For most conflict types, there are some obvious ways to modify the working\n"
10632
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10633
"itself already made a choice, when possible."
10634
msgstr ""
10635
10636
#: en/help_topics/conflict-types.txt:41
10637
msgid ""
10638
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10639
"different ways to resolve the conflict."
10640
msgstr ""
10641
10642
#: en/help_topics/conflict-types.txt:44
10643
msgid ""
10644
"Each type of conflict is explained below, and the action which must be done "
10645
"to\n"
10646
"resolve the conflict is outlined."
10647
msgstr ""
10648
10649
#: en/help_topics/conflict-types.txt:47
10650
msgid ""
10651
"Various actions are available depending on the kind of conflict, for some "
10652
"of\n"
10653
"these actions, Bazaar can provide some help. In the end you should at least\n"
10654
"inform Bazaar that you're done with the conflict with::"
10655
msgstr ""
10656
"Various actions are available depending on the kind of conflict; for some "
10657
"of\n"
10658
"these actions, Bazaar can provide some help. In the end you should at least\n"
10659
"inform Bazaar that you're done with the conflict with::"
10660
10661
#: en/help_topics/conflict-types.txt:51
10662
msgid " ``bzr resolve FILE --action=done'"
10663
msgstr ""
10664
10665
#: en/help_topics/conflict-types.txt:53
10666
msgid ""
10667
"Note that this is the default action when a single file is involved so you "
10668
"can\n"
10669
"simply use::"
10670
msgstr ""
10671
10672
#: en/help_topics/conflict-types.txt:56
10673
msgid " ``bzr resolve FILE``"
10674
msgstr ""
10675
10676
#: en/help_topics/conflict-types.txt:58
10677
msgid "See ``bzr help resolve`` for more details."
10678
msgstr ""
10679
10680
#: en/help_topics/conflict-types.txt:60
10681
msgid ""
10682
"Text conflicts\n"
10683
"--------------"
10684
msgstr ""
10685
10686
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10687
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10688
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10689
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10690
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10691
msgid "Typical message::"
10692
msgstr ""
10693
10694
#: en/help_topics/conflict-types.txt:65
10695
msgid " Text conflict in FILE"
10696
msgstr ""
10697
10698
#: en/help_topics/conflict-types.txt:67
10699
msgid ""
10700
"These are produced when a text merge cannot completely reconcile two sets "
10701
"of\n"
10702
"text changes. Bazaar will emit files for each version with the extensions\n"
10703
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10704
"tree,\n"
10705
"i.e. the tree that you are merging changes into. OTHER is the version that "
10706
"you\n"
10707
"are merging into the target. BASE is an older version that is used as a "
10708
"basis\n"
10709
"for comparison."
10710
msgstr ""
10711
10712
#: en/help_topics/conflict-types.txt:74
10713
msgid ""
10714
"In the main copy of the file, Bazaar will include all the changes that it\n"
10715
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10716
"\"herringbone\" markers like ``<<<<<<<``."
10717
msgstr ""
10718
10719
#: en/help_topics/conflict-types.txt:78
10720
msgid ""
10721
"Say the initial text is \"The project leader released it.\", and THIS "
10722
"modifies it\n"
10723
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10724
"leader\n"
10725
"released Bazaar.\" A conflict would look like this::"
10726
msgstr ""
10727
10728
#: en/help_topics/conflict-types.txt:82
10729
msgid ""
10730
" <<<<<<< TREE\n"
10731
" Martin Pool released it.\n"
10732
" =======\n"
10733
" The project leader released Bazaar.\n"
10734
" >>>>>>> MERGE-SOURCE"
10735
msgstr ""
10736
10737
#: en/help_topics/conflict-types.txt:88
10738
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10739
msgstr ""
10740
10741
#: en/help_topics/conflict-types.txt:90
10742
msgid ""
10743
"You can handle text conflicts either by editing the main copy of the file,\n"
10744
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10745
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10746
"set of changes over the other (but see below when you encounter these\n"
10747
"cases). More often, the two sets of changes must be intelligently combined."
10748
msgstr ""
10749
10750
#: en/help_topics/conflict-types.txt:96
10751
msgid ""
10752
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10753
"you are done editing, the file should look like it never had a conflict, and "
10754
"be\n"
10755
"ready to commit."
10756
msgstr ""
10757
10758
#: en/help_topics/conflict-types.txt:100
10759
msgid ""
10760
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10761
"Bazaar will auto-detect which conflicts you have resolved."
10762
msgstr ""
10763
10764
#: en/help_topics/conflict-types.txt:103
10765
msgid ""
10766
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10767
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10768
"working tree."
10769
msgstr ""
10770
10771
#: en/help_topics/conflict-types.txt:107
10772
msgid ""
10773
"\n"
10774
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10775
"resolve`` with one of the following actions:"
10776
msgstr ""
10777
10778
#: en/help_topics/conflict-types.txt:111
10779
msgid ""
10780
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10781
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10782
msgstr ""
10783
10784
#: en/help_topics/conflict-types.txt:114
10785
msgid ""
10786
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10787
"modifications will be taken into account."
10788
msgstr ""
10789
10790
#: en/help_topics/conflict-types.txt:117
10791
msgid ""
10792
"Content conflicts\n"
10793
"-----------------"
10794
msgstr ""
10795
10796
#: en/help_topics/conflict-types.txt:122
10797
msgid " Contents conflict in FILE"
10798
msgstr ""
10799
10800
#: en/help_topics/conflict-types.txt:124
10801
msgid ""
10802
"This conflict happens when there are conflicting changes in the working "
10803
"tree\n"
10804
"and the merge source, but the conflicted items are not text files. They "
10805
"may\n"
10806
"be binary files, or symlinks, or directories. It can even happen with "
10807
"files\n"
10808
"that are deleted on one side, and modified on the other."
10809
msgstr ""
10810
10811
#: en/help_topics/conflict-types.txt:129
10812
msgid ""
10813
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10814
"be\n"
10815
"regular files, symlinks or directories). But it will not include a \"main "
10816
"copy\"\n"
10817
"of the file with herringbone conflict markers. It will appear that the "
10818
"\"main\n"
10819
"copy\" has been renamed to THIS or OTHER."
10820
msgstr ""
10821
10822
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10823
msgid ""
10824
"To resolve that kind of conflict, you should rebuild FILE from either "
10825
"version\n"
10826
"or a combination of both."
10827
msgstr ""
10828
"To resolve that kind of conflict, you should rebuild FILE from either "
10829
"version\n"
10830
"or a combination of both."
10831
10832
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10833
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10834
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10835
#: en/help_topics/conflict-types.txt:361
10836
msgid "``bzr resolve`` recognizes the following actions:"
10837
msgstr "``bzr resolve`` recognises the following actions:"
10838
10839
#: en/help_topics/conflict-types.txt:139
10840
msgid ""
10841
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10842
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10843
"* ``--action=done`` will just mark the conflict as resolved."
10844
msgstr ""
10845
10846
#: en/help_topics/conflict-types.txt:143
10847
msgid ""
10848
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10849
"and\n"
10850
"``.OTHER`` files if they are still present in the working tree."
10851
msgstr ""
10852
10853
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10854
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10855
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10856
#: en/help_topics/conflict-types.txt:369
10857
msgid ""
10858
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10859
msgstr ""
10860
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10861
10862
#: en/help_topics/conflict-types.txt:148
10863
msgid ""
10864
"Tag conflicts\n"
10865
"-------------"
10866
msgstr ""
10867
10868
#: en/help_topics/conflict-types.txt:153
10869
msgid ""
10870
" Conflicting tags:\n"
10871
" version-0.1"
10872
msgstr ""
10873
10874
#: en/help_topics/conflict-types.txt:156
10875
msgid ""
10876
"When pulling from or pushing to another branch, Bazaar informs you about "
10877
"tags\n"
10878
"that conflict between the two branches; that is the same tag points to two\n"
10879
"different revisions. You need not resolve these conflicts, but subsequent\n"
10880
"uses of pull or push will result in the same message."
10881
msgstr ""
10882
10883
#: en/help_topics/conflict-types.txt:161
10884
msgid ""
10885
"To resolve the conflict, you must apply the correct tags to either the "
10886
"target\n"
10887
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10888
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10889
"target branch's tags match the source branch, then in the target branch do\n"
10890
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10891
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10892
"source\n"
10893
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10894
"favor of the target branch, you need to similarly use ``tag --force`` in "
10895
"the\n"
10896
"source branch. (Note that pulling or pushing using --overwrite will "
10897
"overwrite\n"
10898
"all tags as well.)"
10899
msgstr ""
10900
10901
#: en/help_topics/conflict-types.txt:172
10902
msgid ""
10903
"Duplicate paths\n"
10904
"---------------"
10905
msgstr ""
10906
10907
#: en/help_topics/conflict-types.txt:177
10908
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10909
msgstr ""
10910
10911
#: en/help_topics/conflict-types.txt:179
10912
msgid ""
10913
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10914
"already been used. The existing file will be renamed to \"FILE.moved\". "
10915
msgstr ""
10916
10917
#: en/help_topics/conflict-types.txt:187
10918
msgid ""
10919
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10920
"FILE``,\n"
10921
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10922
"* ``--action=done`` will just mark the conflict as resolved."
10923
msgstr ""
10924
10925
#: en/help_topics/conflict-types.txt:191
10926
msgid ""
10927
"Note that you must get rid of FILE.moved before using ``--action=done``."
10928
msgstr ""
10929
10930
#: en/help_topics/conflict-types.txt:195
10931
msgid ""
10932
"Unversioned parent\n"
10933
"------------------"
10934
msgstr ""
10935
10936
#: en/help_topics/conflict-types.txt:200
10937
msgid ""
10938
" Conflict because FILE is not versioned, but has versioned children."
10939
msgstr ""
10940
10941
#: en/help_topics/conflict-types.txt:202
10942
msgid ""
10943
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10944
"not\n"
10945
"versioned. This happens when the directory has been deleted in the target,\n"
10946
"but has a new child in the source, or vice versa. In this situation, "
10947
"Bazaar\n"
10948
"will version the parent directory as well. Resolving this issue depends\n"
10949
"very much on the particular scenario. You may wish to rename or delete "
10950
"either\n"
10951
"the file or the directory. When you are satisfied, you can run \"bzr "
10952
"resolve\n"
10953
"FILE\" to mark the conflict as resolved."
10954
msgstr ""
10955
10956
#: en/help_topics/conflict-types.txt:210
10957
msgid ""
10958
"Missing parent\n"
10959
"--------------"
10960
msgstr ""
10961
10962
#: en/help_topics/conflict-types.txt:215
10963
msgid " Conflict adding files to FILE. Created directory."
10964
msgstr ""
10965
10966
#: en/help_topics/conflict-types.txt:217
10967
msgid ""
10968
"This happens when a directory has been deleted in the target, but has new\n"
10969
"children in the source. This is similar to the \"unversioned parent\" "
10970
"conflict,\n"
10971
"except that the parent directory does not *exist*, instead of just being\n"
10972
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10973
"Resolving this issue depends very much on the particular scenario."
10974
msgstr ""
10975
10976
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10977
msgid ""
10978
"To resolve that kind of conflict, you should either remove or rename the\n"
10979
"children or the directory or a combination of both."
10980
msgstr ""
10981
"To resolve that kind of conflict, you should either remove or rename the\n"
10982
"children or the directory or a combination of both."
10983
10984
#: en/help_topics/conflict-types.txt:228
10985
msgid ""
10986
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10987
" children,\n"
10988
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10989
"children\n"
10990
" and restoring the directory,\n"
10991
"* ``--action=done`` will just mark the conflict as resolved."
10992
msgstr ""
10993
10994
#: en/help_topics/conflict-types.txt:236
10995
msgid ""
10996
"Deleting parent\n"
10997
"---------------"
10998
msgstr ""
10999
11000
#: en/help_topics/conflict-types.txt:241
11001
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11002
msgstr ""
11003
11004
#: en/help_topics/conflict-types.txt:243
11005
msgid ""
11006
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11007
"source, but has new children in the target (either because a directory\n"
11008
"deletion is merged or because the merge introduce new children). Bazaar\n"
11009
"will retain the directory. Resolving this issue depends very much on the\n"
11010
"particular scenario."
11011
msgstr ""
11012
11013
#: en/help_topics/conflict-types.txt:254
11014
msgid ""
11015
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11016
"directory,"
11017
msgstr ""
11018
11019
#: en/help_topics/conflict-types.txt:256
11020
msgid ""
11021
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11022
" children,"
11023
msgstr ""
11024
11025
#: en/help_topics/conflict-types.txt:259
11026
msgid "* ``--action=done`` will just mark the conflict as resolved."
11027
msgstr ""
11028
11029
#: en/help_topics/conflict-types.txt:261
11030
msgid ""
11031
"Note that when merging a directory deletion, if unversioned files are\n"
11032
"present, they become potential orphans has they don't have a directory\n"
11033
"parent anymore."
11034
msgstr ""
11035
11036
#: en/help_topics/conflict-types.txt:265
11037
msgid ""
11038
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11039
"setting the ``bzr.transform.orphan_policy`` configuration option."
11040
msgstr ""
11041
11042
#: en/help_topics/conflict-types.txt:268
11043
msgid "There are two possible values for this option:"
11044
msgstr ""
11045
11046
#: en/help_topics/conflict-types.txt:270
11047
msgid ""
11048
"* ``conflict`` (the default): will leave the orphans in place and\n"
11049
" generate a conflicts,"
11050
msgstr ""
11051
11052
#: en/help_topics/conflict-types.txt:273
11053
msgid ""
11054
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11055
"root\n"
11056
" of the working tree with names like ``<file>.~#~``."
11057
msgstr ""
11058
11059
#: en/help_topics/conflict-types.txt:278
11060
msgid ""
11061
"Path conflict\n"
11062
"-------------"
11063
msgstr ""
11064
11065
#: en/help_topics/conflict-types.txt:283
11066
msgid " Path conflict: PATH1 / PATH2"
11067
msgstr ""
11068
11069
#: en/help_topics/conflict-types.txt:285
11070
msgid ""
11071
"This happens when the source and target have each modified the name or "
11072
"parent\n"
11073
"directory of a file. Bazaar will use the path elements from the source."
11074
msgstr ""
11075
11076
#: en/help_topics/conflict-types.txt:288
11077
msgid ""
11078
"To resolve that kind of conflict, you just have to decide what name should "
11079
"be\n"
11080
"retained for the file involved."
11081
msgstr ""
11082
"To resolve that kind of conflict, you just have to decide which name should "
11083
"be\n"
11084
"retained for the file involved."
11085
11086
#: en/help_topics/conflict-types.txt:293
11087
msgid ""
11088
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11089
" issuing ``bzr mv PATH2 PATH1``,\n"
11090
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11091
"``PATH2``,\n"
11092
"* ``--action=done`` will just mark the conflict as resolved."
11093
msgstr ""
11094
11095
#: en/help_topics/conflict-types.txt:300
11096
msgid ""
11097
"Parent loop\n"
11098
"-----------"
11099
msgstr ""
11100
11101
#: en/help_topics/conflict-types.txt:305
11102
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11103
msgstr ""
11104
11105
#: en/help_topics/conflict-types.txt:307
11106
msgid ""
11107
"This happens when the source and the target have each moved directories, so\n"
11108
"that, if the change could be applied, a directory would be contained by "
11109
"itself.\n"
11110
"For example::"
11111
msgstr ""
11112
11113
#: en/help_topics/conflict-types.txt:311
11114
msgid ""
11115
" $ bzr init\n"
11116
" $ bzr mkdir white\n"
11117
" $ bzr mkdir black\n"
11118
" $ bzr commit -m \"BASE\"\n"
11119
" $ bzr branch . ../other\n"
11120
" $ bzr mv white black\n"
11121
" $ bzr commit -m \"THIS\"\n"
11122
" $ bzr mv ../other/black ../other/white\n"
11123
" $ bzr commit ../other -m \"OTHER\"\n"
11124
" $ bzr merge ../other"
11125
msgstr ""
11126
11127
#: en/help_topics/conflict-types.txt:322
11128
msgid ""
11129
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11130
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11131
"name should be retained for the directories involved."
11132
msgstr ""
11133
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11134
"``black``. To resolve that kind of conflict, you just have to decide which\n"
11135
"name should be retained for the directories involved."
11136
11137
#: en/help_topics/conflict-types.txt:328
11138
msgid ""
11139
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11140
"\n"
11141
" in ``black``,\n"
11142
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11143
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11144
"* ``--action=done`` will just mark the conflict as resolved."
11145
msgstr ""
11146
11147
#: en/help_topics/conflict-types.txt:336
11148
msgid ""
11149
"Non-directory parent\n"
11150
"--------------------"
11151
msgstr ""
11152
11153
#: en/help_topics/conflict-types.txt:341
11154
msgid ""
11155
" Conflict: foo.new is not a directory, but has files in it.\n"
11156
" Created directory."
11157
msgstr ""
11158
11159
#: en/help_topics/conflict-types.txt:344
11160
msgid ""
11161
"This happens when one side has added files to a directory, and the other "
11162
"side\n"
11163
"has changed the directory into a file or symlink. For example::"
11164
msgstr ""
11165
11166
#: en/help_topics/conflict-types.txt:347
11167
msgid ""
11168
" $ bzr init\n"
11169
" $ bzr mkdir foo\n"
11170
" $ bzr commit -m \"BASE\"\n"
11171
" $ bzr branch . ../other\n"
11172
" $ rmdir foo\n"
11173
" $ touch foo\n"
11174
" $ bzr commit -m \"THIS\"\n"
11175
" $ bzr mkdir ../other/foo/bar\n"
11176
" $ bzr commit ../other -m \"OTHER\"\n"
11177
" $ bzr merge ../other"
11178
msgstr ""
11179
11180
#: en/help_topics/conflict-types.txt:358
11181
msgid ""
11182
"To resolve that kind of conflict, you have to decide what name should be\n"
11183
"retained for the file, directory or symlink involved."
11184
msgstr ""
11185
"To resolve that kind of conflict, you have to decidewhich name should be\n"
11186
"retained for the file, directory or symlink involved."
11187
11188
#: en/help_topics/conflict-types.txt:363
11189
msgid ""
11190
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11191
" ``bzr add foo``,\n"
11192
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11193
" ``bzr mv foo.new foo``,\n"
11194
"* ``--action=done`` will just mark the conflict as resolved."
11195
msgstr ""
11196
11197
#: en/help_topics/conflict-types.txt:371
11198
msgid ""
11199
"MalformedTransform\n"
11200
"------------------"
11201
msgstr ""
11202
11203
#: en/help_topics/conflict-types.txt:374
11204
msgid ""
11205
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11206
"exception. This means that Bazaar encountered a filesystem conflict that it "
11207
"was\n"
11208
"unable to resolve. This usually indicates a bug. Please let us know if "
11209
"you\n"
11210
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11211
msgstr ""
11212
11213
#: en/help_topics/content-filters.txt:1
11214
msgid ""
11215
"Content Filters\n"
11216
"==============="
11217
msgstr ""
11218
11219
#: en/help_topics/content-filters.txt:4
11220
msgid ""
11221
"Content formats\n"
11222
"---------------"
11223
msgstr ""
11224
11225
#: en/help_topics/content-filters.txt:7
11226
msgid ""
11227
"Bazaar's content filtering allows you to store files in a different\n"
11228
"format from the copy in your working tree. This lets you, or your\n"
11229
"co-developers, use Windows development tools that expect CRLF files\n"
11230
"on projects that use other line-ending conventions. Among other things,\n"
11231
"content filters also let Unix developers more easily work on projects\n"
11232
"using Windows line-ending conventions, keyword expansion/compression,\n"
11233
"and trailing spaces on lines in text files to be implicitly stripped\n"
11234
"when committed."
11235
msgstr ""
11236
11237
#: en/help_topics/content-filters.txt:16
11238
msgid "To generalize, there are two content formats supported by Bazaar:"
11239
msgstr "To generalise, there are two content formats supported by Bazaar:"
11240
11241
#: en/help_topics/content-filters.txt:18
11242
msgid ""
11243
"* a canonical format - how files are stored internally\n"
11244
"* a convenience format - how files are created in a working tree."
11245
msgstr ""
11246
11247
#: en/help_topics/content-filters.txt:21
11248
msgid ""
11249
"\n"
11250
"Format conversion\n"
11251
"-----------------"
11252
msgstr ""
11253
11254
#: en/help_topics/content-filters.txt:25
11255
msgid ""
11256
"The conversion between these formats is done by content filters.\n"
11257
"A content filter has two parts:"
11258
msgstr ""
11259
11260
#: en/help_topics/content-filters.txt:28
11261
msgid ""
11262
"* a read converter - converts from convenience to canonical format\n"
11263
"* a write converter - converts from canonical to convenience format."
11264
msgstr ""
11265
11266
#: en/help_topics/content-filters.txt:31
11267
msgid ""
11268
"Many of these converters will provide *round-trip* conversion,\n"
11269
"i.e. applying the read converter followed by the write converter\n"
11270
"gives back the original content. However, others may provide an\n"
11271
"asymmetric conversion. For example, a read converter might strip\n"
11272
"trailing whitespace off lines in source code while the matching\n"
11273
"write converter might pass content through unchanged."
11274
msgstr ""
11275
11276
#: en/help_topics/content-filters.txt:38
11277
msgid ""
11278
"\n"
11279
"Enabling content filters\n"
11280
"------------------------"
11281
msgstr ""
11282
11283
#: en/help_topics/content-filters.txt:42
11284
msgid ""
11285
"Content filters are typically provided by plugins, so the first step\n"
11286
"in using them is to install the relevant plugins and read their\n"
11287
"documentation. Some plugins may be very specific about which files\n"
11288
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11289
"In other cases, the plugin may leave it in the user's hands to\n"
11290
"define which files are to be filtered. This is typically done\n"
11291
"using rule-based preferences. See ``bzr help rules`` for general\n"
11292
"information about defining these."
11293
msgstr ""
11294
11295
#: en/help_topics/content-filters.txt:51
11296
msgid ""
11297
"\n"
11298
"Impact on commands\n"
11299
"------------------"
11300
msgstr ""
11301
11302
#: en/help_topics/content-filters.txt:55
11303
msgid ""
11304
"Read converters are only applied to commands that read content from\n"
11305
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11306
"will apply read converters to files in the working tree, then compare\n"
11307
"the results to the content last committed."
11308
msgstr ""
11309
11310
#: en/help_topics/content-filters.txt:60
11311
msgid ""
11312
"Write converters are only applied by commands that **create files in a\n"
11313
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11314
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11315
"respectively."
11316
msgstr ""
11317
11318
#: en/help_topics/content-filters.txt:65
11319
msgid ""
11320
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11321
"comitting files. If this makes sense for a given plugin providing\n"
11322
"a content filter, the plugin can usually achieve this effect by using a\n"
11323
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11324
"for more information on hooks."
11325
msgstr ""
11326
11327
#: en/help_topics/content-filters.txt:71
11328
msgid ""
11329
"\n"
11330
"Refreshing your working tree\n"
11331
"----------------------------"
11332
msgstr ""
11333
11334
#: en/help_topics/content-filters.txt:75
11335
msgid ""
11336
"For performance reasons, Bazaar caches the timestamps of files in\n"
11337
"a working tree, and assumes files are unchanged if their timestamps\n"
11338
"match the cached values. As a consequence, there are times when\n"
11339
"you may need to explicitly ask for content filtering to be reapplied\n"
11340
"in one or both directions, e.g. after installing or reconfiguring\n"
11341
"plugins providing it."
11342
msgstr ""
11343
11344
#: en/help_topics/content-filters.txt:82
11345
msgid "Here are some general guidelines for doing this:"
11346
msgstr ""
11347
11348
#: en/help_topics/content-filters.txt:84
11349
msgid ""
11350
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11351
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11352
" relevant read converters and compare the end result with the\n"
11353
" canonical format."
11354
msgstr ""
11355
11356
#: en/help_topics/content-filters.txt:89
11357
msgid ""
11358
" * To reapply write converters, ensure there are no local changes,\n"
11359
" delete the relevant files and run ``bzr revert`` on those files."
11360
msgstr ""
11361
11362
#: en/help_topics/content-filters.txt:92
11363
msgid ""
11364
"Note: In the future, it is likely that additional options will be added\n"
11365
"to commands to make this refreshing process faster and safer.\n"
11366
msgstr ""
11367
11368
#: en/help_topics/current-formats.txt:1
11369
msgid "Current Storage Formats"
11370
msgstr ""
11371
11372
#: en/help_topics/current-formats.txt:3
11373
msgid ""
11374
":2a:\n"
11375
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11376
" compress storage. Provides rich roots which are a one-way\n"
11377
" transition."
11378
msgstr ""
11379
11380
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11381
msgid ""
11382
"\n"
11383
"See :doc:`formats-help` for more about storage formats."
11384
msgstr ""
11385
11386
#: en/help_topics/debug-flags.txt:1
11387
msgid ""
11388
"Debug Flags\n"
11389
"==========="
11390
msgstr ""
11391
11392
#: en/help_topics/debug-flags.txt:4
11393
msgid ""
11394
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11395
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11396
msgstr ""
11397
11398
#: en/help_topics/debug-flags.txt:7
11399
msgid ""
11400
"-Dauth Trace authentication sections used.\n"
11401
"-Dbytes Print out how many bytes were transferred\n"
11402
"-Ddirstate Trace dirstate activity (verbose!)\n"
11403
"-Derror Instead of normal error handling, always print a "
11404
"traceback\n"
11405
" on error.\n"
11406
"-Devil Capture call sites that do expensive or badly-scaling\n"
11407
" operations.\n"
11408
"-Dfetch Trace history copying between repositories.\n"
11409
"-Dfilters Emit information for debugging content filtering.\n"
11410
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11411
"fetch.\n"
11412
"-Dgraph Trace graph traversal.\n"
11413
"-Dhashcache Log every time a working file is read to determine its "
11414
"hash.\n"
11415
"-Dhooks Trace hook execution.\n"
11416
"-Dhpss Trace smart protocol requests and responses.\n"
11417
"-Dhpssdetail More hpss details.\n"
11418
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11419
"-Dhttp Trace http connections, requests and responses.\n"
11420
"-Dindex Trace major index operations.\n"
11421
"-Dknit Trace knit operations.\n"
11422
"-Dlock Trace when lockdir locks are taken or released.\n"
11423
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11424
" retrying the request.\n"
11425
"-Dprogress Trace progress bar operations.\n"
11426
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11427
"-Dmerge Emit information for debugging merges.\n"
11428
"-Dno_apport Don't use apport to report crashes.\n"
11429
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11430
"-Dpack Emit information about pack operations.\n"
11431
"-Drelock Emit a message every time a branch or repository object "
11432
"is\n"
11433
" unlocked then relocked the same way.\n"
11434
"-Dsftp Trace SFTP internals.\n"
11435
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11436
"expected\n"
11437
"-Dstream Trace fetch streams.\n"
11438
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11439
"portable\n"
11440
" manner.\n"
11441
"-Dunlock Some errors during unlock are treated as warnings.\n"
11442
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11443
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11444
"appropriate\n"
11445
" for the format, even for non-local fetches.\n"
11446
msgstr ""
11447
"-Dauth Trace authentication sections used.\n"
11448
"-Dbytes Print out how many bytes were transferred\n"
11449
"-Ddirstate Trace dirstate activity (verbose!)\n"
11450
"-Derror Instead of normal error handling, always print a "
11451
"traceback\n"
11452
" on error.\n"
11453
"-Devil Capture call sites that do expensive or badly-scaling\n"
11454
" operations.\n"
11455
"-Dfetch Trace history copying between repositories.\n"
11456
"-Dfilters Emit information for debugging content filtering.\n"
11457
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11458
"fetch.\n"
11459
"-Dgraph Trace graph traversal.\n"
11460
"-Dhashcache Log every time a working file is read to determine its "
11461
"hash.\n"
11462
"-Dhooks Trace hook execution.\n"
11463
"-Dhpss Trace smart protocol requests and responses.\n"
11464
"-Dhpssdetail More hpss details.\n"
11465
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11466
"-Dhttp Trace http connections, requests and responses.\n"
11467
"-Dindex Trace major index operations.\n"
11468
"-Dknit Trace knit operations.\n"
11469
"-Dlock Trace when lockdir locks are taken or released.\n"
11470
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11471
" retrying the request.\n"
11472
"-Dprogress Trace progress bar operations.\n"
11473
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11474
"-Dmerge Emit information for debugging merges.\n"
11475
"-Dno_apport Don't use apport to report crashes.\n"
11476
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11477
"-Dpack Emit information about pack operations.\n"
11478
"-Drelock Emit a message every time a branch or repository object "
11479
"is\n"
11480
" unlocked then relocked the same way.\n"
11481
"-Dsftp Trace SFTP internals.\n"
11482
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11483
"expected\n"
11484
"-Dstream Trace fetch streams.\n"
11485
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11486
"portable\n"
11487
" manner.\n"
11488
"-Dunlock Some errors during unlock are treated as warnings.\n"
11489
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11490
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11491
"appropriate\n"
11492
" for the format, even for non-local fetches.\n"
11493
11494
#: en/help_topics/diverged-branches.txt:1
11495
msgid ""
11496
"Diverged Branches\n"
11497
"================="
11498
msgstr ""
11499
11500
#: en/help_topics/diverged-branches.txt:4
11501
msgid ""
11502
"When Bazaar tries to push one branch onto another, it requires that the\n"
11503
"destination branch must be ready to receive the source branch. If this "
11504
"isn't\n"
11505
"the case, then we say that the branches have ``diverged``. Branches are\n"
11506
"considered diverged if the destination branch's most recent commit is one "
11507
"that\n"
11508
"has not been merged (directly or indirectly) by the source branch. To "
11509
"recover\n"
11510
"from diverged branches, one must merge the missing revisions into the "
11511
"source\n"
11512
"branch."
11513
msgstr ""
11514
11515
#: en/help_topics/diverged-branches.txt:12
11516
msgid ""
11517
"This situation commonly arises when using a centralized workflow with local\n"
11518
"commits. If someone else has committed new work to the mainline since your\n"
11519
"last pull and you have local commits that have not yet been pushed to the\n"
11520
"mainline, then your local branch and the mainline have diverged."
11521
msgstr ""
11522
"This situation commonly arises when using a centralised workflow with local\n"
11523
"commits. If someone else has committed new work to the mainline since your\n"
11524
"last pull and you have local commits that have not yet been pushed to the\n"
11525
"mainline, then your local branch and the mainline have diverged."
11526
11527
#: en/help_topics/diverged-branches.txt:17
11528
msgid ""
11529
"Discovering What Has Diverged\n"
11530
"-----------------------------"
11531
msgstr ""
11532
11533
#: en/help_topics/diverged-branches.txt:20
11534
msgid ""
11535
"The ``bzr missing`` command is used to find out what revisions are in "
11536
"another\n"
11537
"branch that are not present in the current branch, and vice-versa. It shows "
11538
"a\n"
11539
"summary of which extra revisions exist in each branch. If you want to see "
11540
"the\n"
11541
"precise effects of those revisions, you can use ``bzr diff --"
11542
"old=other_branch``\n"
11543
"to show the differences between other_branch and your current branch."
11544
msgstr ""
11545
11546
#: en/help_topics/diverged-branches.txt:26
11547
msgid ""
11548
"A Solution\n"
11549
"----------"
11550
msgstr ""
11551
11552
#: en/help_topics/diverged-branches.txt:29
11553
msgid ""
11554
"The solution is to merge the revisions from the mainline into your local\n"
11555
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11556
"mainline. This merge may result in conflicts if the other developer's "
11557
"changes\n"
11558
"overlap with your changes. These conflicts should be resolved before\n"
11559
"continuing. After any conflicts have been resolved, or even if there were "
11560
"no\n"
11561
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11562
"to your local branch. This requirement gives you an opportunity to test "
11563
"the\n"
11564
"resulting working tree for correctness, since the merged revisions could "
11565
"have\n"
11566
"made arbitrary changes. After testing, you should commit the merge using\n"
11567
"``bzr commit``. This clears up the diverged branches situation. Your "
11568
"local\n"
11569
"branch can now be pushed to the mainline.\n"
11570
msgstr ""
11571
11572
#: en/help_topics/env-variables.txt:1
11573
msgid "Environment Variables"
11574
msgstr ""
11575
11576
#: en/help_topics/env-variables.txt:3
11577
msgid ""
11578
"=================== "
11579
"===========================================================\n"
11580
"BZRPATH Path where bzr is to look for shell plugin external\n"
11581
" commands.\n"
11582
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11583
"EMAIL E-Mail address of the user.\n"
11584
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11585
"EDITOR Editor for editing commit messages.\n"
11586
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11587
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11588
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11589
"BZR_PLUGIN_PATH.\n"
11590
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11591
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11592
"and\n"
11593
" HOME.\n"
11594
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11595
"URLs).\n"
11596
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11597
"sshcorp,\n"
11598
" plink or lsh.\n"
11599
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11600
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11601
"BZR_COLUMNS Override implicit terminal width.\n"
11602
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11603
"(selftest)\n"
11604
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11605
"'text'.\n"
11606
"BZR_PDB Control whether to launch a debugger on error.\n"
11607
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11608
" breakin debugger.\n"
11609
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11610
"(instead\n"
11611
" of char-based).\n"
11612
"=================== "
11613
"===========================================================\n"
11614
msgstr ""
11615
11616
#: en/help_topics/eol.txt:1
11617
msgid ""
11618
"End of Line Conversion\n"
11619
"======================"
11620
msgstr ""
11621
11622
#: en/help_topics/eol.txt:4
11623
msgid ""
11624
"EOL conversion is provided as a content filter where Bazaar internally\n"
11625
"stores a canonical format but outputs a convenience format. See\n"
11626
"``bzr help content-filters`` for general information about using these."
11627
msgstr ""
11628
11629
#: en/help_topics/eol.txt:8
11630
msgid ""
11631
"Note: Content filtering is only supported in recently added formats,\n"
11632
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11633
"in a recent format. (Just setting the format on the repository\n"
11634
"is not enough.) If content filtering does not appear to be working, use\n"
11635
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11636
"or later."
11637
msgstr ""
11638
11639
#: en/help_topics/eol.txt:15
11640
msgid ""
11641
"EOL conversion needs to be enabled for selected file patterns using\n"
11642
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11643
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11644
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11645
"supported in a future verison of Bazaar."
11646
msgstr ""
11647
11648
#: en/help_topics/eol.txt:21
11649
msgid ""
11650
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11651
"(If a value is not set, ``exact`` is the default.)"
11652
msgstr ""
11653
11654
#: en/help_topics/eol.txt:24
11655
msgid ""
11656
" ========== ===================================== ======================\n"
11657
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11658
" ========== ===================================== ======================\n"
11659
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11660
" ---------- ------------------------------------- ----------------------\n"
11661
" ``lf`` ``lf`` ``lf``\n"
11662
" ---------- ------------------------------------- ----------------------\n"
11663
" ``crlf`` ``crlf`` ``lf``\n"
11664
" ---------- ------------------------------------- ----------------------\n"
11665
" ``exact`` No conversion Exactly as in file\n"
11666
" ========== ===================================== ======================"
11667
msgstr ""
11668
11669
#: en/help_topics/eol.txt:36
11670
msgid ""
11671
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11672
"byte is detected in the file."
11673
msgstr ""
11674
11675
#: en/help_topics/eol.txt:39
11676
msgid ""
11677
"For users working on a cross-platform project, here is a suggested rule\n"
11678
"to use as a starting point::"
11679
msgstr ""
11680
11681
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11682
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11683
msgid ""
11684
" [name *]\n"
11685
" eol = native"
11686
msgstr ""
11687
11688
#: en/help_topics/eol.txt:45
11689
msgid ""
11690
"If you have binary files that do not contain a null byte though, be\n"
11691
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11692
"by giving more explicit patterns earlier in the rules file. For example::"
11693
msgstr ""
11694
11695
#: en/help_topics/eol.txt:49
11696
msgid ""
11697
" [name *.png]\n"
11698
" eol = exact"
11699
msgstr ""
11700
11701
#: en/help_topics/eol.txt:55
11702
msgid ""
11703
"If your working tree is on a network drive shared by users on different\n"
11704
"operating systems, you typically want to force certain conventions for\n"
11705
"certain files. In that way, if a file is created with the wrong line\n"
11706
"endings or line endings get mixed during editing, it gets committed\n"
11707
"correctly and gets checked out correctly. For example::"
11708
msgstr ""
11709
11710
#: en/help_topics/eol.txt:61
11711
msgid ""
11712
" [name *.bat]\n"
11713
" eol = crlf"
11714
msgstr ""
11715
11716
#: en/help_topics/eol.txt:64
11717
msgid ""
11718
" [name *.sh]\n"
11719
" eol = lf"
11720
msgstr ""
11721
11722
#: en/help_topics/eol.txt:70
11723
msgid ""
11724
"If you take the care to create files with their required endings, you can\n"
11725
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11726
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11727
"introducing mixed line endings will be corrected during commit for files\n"
11728
"with those settings."
11729
msgstr ""
11730
11731
#: en/help_topics/eol.txt:76
11732
msgid ""
11733
"If you have sample test data that deliberately has text files with mixed\n"
11734
"newline conventions, you can ask for those to be left alone like this::"
11735
msgstr ""
11736
11737
#: en/help_topics/eol.txt:79
11738
msgid ""
11739
" [name test_data/]\n"
11740
" eol = exact"
11741
msgstr ""
11742
11743
#: en/help_topics/eol.txt:85
11744
msgid ""
11745
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11746
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11747
"of content analysis to detect binary files for commands like ``diff``.\n"
11748
"In the future, a ``binary = true`` rule may be added but it is not\n"
11749
"supported yet.)"
11750
msgstr ""
11751
11752
#: en/help_topics/eol.txt:91
11753
msgid ""
11754
"If you have an existing repository with text files already stored using\n"
11755
"Windows newline conventions (``crlf``), then you may want to keep using "
11756
"that\n"
11757
"convention in the repository. Forcing certain files to this convention\n"
11758
"may also help users who do not have rules configured. To do this, set\n"
11759
"``eol`` to one of the values below."
11760
msgstr ""
11761
11762
#: en/help_topics/eol.txt:97
11763
msgid ""
11764
" ============================ ======================== "
11765
"======================\n"
11766
" Value Checkout end-of-lines as Commit end-of-lines "
11767
"as\n"
11768
" ============================ ======================== "
11769
"======================\n"
11770
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11771
" ``lf`` otherwise\n"
11772
" ---------------------------- ------------------------ ----------------------"
11773
"\n"
11774
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11775
" ---------------------------- ------------------------ ----------------------"
11776
"\n"
11777
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11778
" ============================ ======================== ======================"
11779
msgstr ""
11780
11781
#: en/help_topics/eol.txt:108
11782
msgid ""
11783
"For users working on an existing project that uses Windows newline\n"
11784
"conventions in their Bazaar repository, this rule is suggested as a\n"
11785
"starting point::"
11786
msgstr ""
11787
11788
#: en/help_topics/eol.txt:112
11789
msgid ""
11790
" [name *]\n"
11791
" eol = native-with-crlf-in-repo"
11792
msgstr ""
11793
11794
#: en/help_topics/eol.txt:115
11795
msgid ""
11796
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11797
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11798
"``crlf`` and ``exact``."
11799
msgstr ""
11800
11801
#: en/help_topics/eol.txt:119
11802
msgid ""
11803
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11804
"never reject files because a given line ending or mixed line endings\n"
11805
"are found. A precommit hook should be used if you wish to validate\n"
11806
"(and not just convert) content before committing.\n"
11807
msgstr ""
11808
11809
#: en/help_topics/hidden-commands.txt:1
11810
msgid ""
11811
"added List files added in working tree.\n"
11812
"ancestry List all revisions merged into this branch.\n"
11813
"assert-fail Test reporting of assertion failures\n"
11814
"bundle-info Output interesting stats about a bundle\n"
11815
"bundle-revisions Create a merge-directive for submitting changes.\n"
11816
"cat-revision Write out metadata for a revision.\n"
11817
"dump-btree Dump the contents of a btree index file to stdout.\n"
11818
"export-pot Export command helps and error messages in po format.\n"
11819
"file-id Print file_id of a particular file or directory.\n"
11820
"file-path Print path of file_ids to a file or directory.\n"
11821
"find-merge-base Find and print a base revision for merging two "
11822
"branches.\n"
11823
"hooks Show hooks.\n"
11824
"inventory Show inventory of the current working copy or a "
11825
"revision.\n"
11826
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11827
"lookup-revision Lookup the revision-id from a revision-number\n"
11828
"merge-directive Generate a merge directive for auto-merge tools.\n"
11829
"modified List files modified in working tree.\n"
11830
"re-sign Create a digital signature for an existing revision.\n"
11831
"reference list, view and set branch locations for nested trees.\n"
11832
"relpath Show path of a file relative to root\n"
11833
"repair-workingtree Reset the working tree state file.\n"
11834
"revision-history Display the list of revision ids on a branch.\n"
11835
"revision-info Show revision number and revision id for a given "
11836
"revision\n"
11837
" identifier.\n"
11838
"rocks Statement of optimism.\n"
11839
"selftest Run internal test suite.\n"
11840
"shell-complete Show appropriate completions for context.\n"
11841
"test-script Run a shell-like test from a file.\n"
11842
"touching-revisions Return revision-ids which affected a particular file.\n"
11843
"unknowns List unknown files.\n"
11844
"wait-until-signalled Test helper for\n"
11845
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11846
msgstr ""
11847
11848
#: en/help_topics/hooks.txt:1
11849
msgid ""
11850
"\n"
11851
"Hooks\n"
11852
"====="
11853
msgstr ""
11854
11855
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11856
msgid ""
11857
"Introduction\n"
11858
"------------"
11859
msgstr ""
11860
11861
#: en/help_topics/hooks.txt:8
11862
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11863
msgstr ""
11864
11865
#: en/help_topics/hooks.txt:10
11866
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11867
msgstr ""
11868
11869
#: en/help_topics/hooks.txt:12
11870
msgid ""
11871
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11872
msgstr ""
11873
11874
#: en/help_topics/hooks.txt:14
11875
msgid ""
11876
"The class that contains each hook is given before the hooks it supplies. "
11877
"For\n"
11878
"instance, BranchHooks as the class is the hooks class for\n"
11879
"`bzrlib.branch.Branch.hooks`."
11880
msgstr ""
11881
11882
#: en/help_topics/hooks.txt:18
11883
msgid ""
11884
"Each description also indicates whether the hook runs on the client (the\n"
11885
"machine where bzr was invoked) or the server (the machine addressed by\n"
11886
"the branch URL). These may be, but are not necessarily, the same machine."
11887
msgstr ""
11888
11889
#: en/help_topics/hooks.txt:22
11890
msgid ""
11891
"Plugins (including hooks) are run on the server if all of these is true:"
11892
msgstr ""
11893
11894
#: en/help_topics/hooks.txt:24
11895
msgid ""
11896
" * The connection is via a smart server (accessed with a URL starting with\n"
11897
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11898
"\"http://\"\n"
11899
" URL when a smart server is available via HTTP)."
11900
msgstr ""
11901
11902
#: en/help_topics/hooks.txt:28
11903
msgid ""
11904
" * The hook is either server specific or part of general infrastructure "
11905
"rather\n"
11906
" than client specific code (such as commit)."
11907
msgstr ""
11908
11909
#: en/help_topics/hooks.txt:31
11910
msgid ""
11911
"\n"
11912
"BranchHooks\n"
11913
"-----------"
11914
msgstr ""
11915
11916
#: en/help_topics/hooks.txt:35
11917
msgid ""
11918
"automatic_tag_name\n"
11919
"~~~~~~~~~~~~~~~~~~"
11920
msgstr ""
11921
11922
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11923
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11924
msgid "Introduced in: 2.2"
11925
msgstr ""
11926
11927
#: en/help_topics/hooks.txt:40
11928
msgid ""
11929
"Called to determine an automatic tag name for a revision.\n"
11930
"automatic_tag_name is called with (branch, revision_id) and should\n"
11931
"return a tag name or None if no tag name could be determined. The\n"
11932
"first non-None tag name returned will be used."
11933
msgstr ""
11934
11935
#: en/help_topics/hooks.txt:45
11936
msgid ""
11937
"open\n"
11938
"~~~~"
11939
msgstr ""
11940
11941
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11942
#: en/help_topics/hooks.txt:307
11943
msgid "Introduced in: 1.8"
11944
msgstr ""
11945
11946
#: en/help_topics/hooks.txt:50
11947
msgid ""
11948
"Called with the Branch object that has been opened after a branch is\n"
11949
"opened."
11950
msgstr ""
11951
11952
#: en/help_topics/hooks.txt:53
11953
msgid ""
11954
"post_branch_init\n"
11955
"~~~~~~~~~~~~~~~~"
11956
msgstr ""
11957
11958
#: en/help_topics/hooks.txt:58
11959
msgid ""
11960
"Called after new branch initialization completes. post_branch_init is\n"
11961
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11962
"branch and checkout (both heavyweight and lightweight) will all\n"
11963
"trigger this hook."
11964
msgstr ""
11965
"Called after new branch initialisation completes. post_branch_init is\n"
11966
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11967
"branch and checkout (both heavyweight and lightweight) will all\n"
11968
"trigger this hook."
11969
11970
#: en/help_topics/hooks.txt:63
11971
msgid ""
11972
"post_change_branch_tip\n"
11973
"~~~~~~~~~~~~~~~~~~~~~~"
11974
msgstr ""
11975
11976
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11977
msgid "Introduced in: 1.4"
11978
msgstr ""
11979
11980
#: en/help_topics/hooks.txt:68
11981
msgid ""
11982
"Called in bzr client and server after a change to the tip of a branch\n"
11983
"is made. post_change_branch_tip is called with a\n"
11984
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11985
"uncommit will all trigger this hook."
11986
msgstr ""
11987
11988
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11989
msgid ""
11990
"post_commit\n"
11991
"~~~~~~~~~~~"
11992
msgstr ""
11993
11994
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11995
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11996
msgid "Introduced in: 0.15"
11997
msgstr ""
11998
11999
#: en/help_topics/hooks.txt:78
12000
msgid ""
12001
"Called in the bzr client after a commit has completed. post_commit is\n"
12002
"called with (local, master, old_revno, old_revid, new_revno,\n"
12003
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12004
"branch."
12005
msgstr ""
12006
12007
#: en/help_topics/hooks.txt:83
12008
msgid ""
12009
"post_pull\n"
12010
"~~~~~~~~~"
12011
msgstr ""
12012
12013
#: en/help_topics/hooks.txt:88
12014
msgid ""
12015
"Called after a pull operation completes. post_pull is called with a\n"
12016
"bzrlib.branch.PullResult object and only runs in the bzr client."
12017
msgstr ""
12018
12019
#: en/help_topics/hooks.txt:91
12020
msgid ""
12021
"post_push\n"
12022
"~~~~~~~~~"
12023
msgstr ""
12024
12025
#: en/help_topics/hooks.txt:96
12026
msgid ""
12027
"Called after a push operation completes. post_push is called with a\n"
12028
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12029
msgstr ""
12030
12031
#: en/help_topics/hooks.txt:99
12032
msgid ""
12033
"post_switch\n"
12034
"~~~~~~~~~~~"
12035
msgstr ""
12036
12037
#: en/help_topics/hooks.txt:104
12038
msgid ""
12039
"Called after a checkout switches branch. post_switch is called with a\n"
12040
"bzrlib.branch.SwitchHookParams."
12041
msgstr ""
12042
12043
#: en/help_topics/hooks.txt:107
12044
msgid ""
12045
"post_uncommit\n"
12046
"~~~~~~~~~~~~~"
12047
msgstr ""
12048
12049
#: en/help_topics/hooks.txt:112
12050
msgid ""
12051
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12052
"called with (local, master, old_revno, old_revid, new_revno,\n"
12053
"new_revid) where local is the local branch or None, master is the\n"
12054
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12055
"of None."
12056
msgstr ""
12057
12058
#: en/help_topics/hooks.txt:118
12059
msgid ""
12060
"pre_change_branch_tip\n"
12061
"~~~~~~~~~~~~~~~~~~~~~"
12062
msgstr ""
12063
12064
#: en/help_topics/hooks.txt:121
12065
msgid "Introduced in: 1.6"
12066
msgstr ""
12067
12068
#: en/help_topics/hooks.txt:123
12069
msgid ""
12070
"Called in bzr client and server before a change to the tip of a branch\n"
12071
"is made. pre_change_branch_tip is called with a\n"
12072
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12073
"uncommit will all trigger this hook."
12074
msgstr ""
12075
12076
#: en/help_topics/hooks.txt:128
12077
msgid ""
12078
"pre_commit\n"
12079
"~~~~~~~~~~"
12080
msgstr ""
12081
12082
#: en/help_topics/hooks.txt:131
12083
msgid "Introduced in: 0.91"
12084
msgstr ""
12085
12086
#: en/help_topics/hooks.txt:133
12087
msgid ""
12088
"Called after a commit is calculated but before it is completed.\n"
12089
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12090
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12091
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12092
"TreeDelta object describing changes from the basis revision. hooks\n"
12093
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12094
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12095
"tree."
12096
msgstr ""
12097
12098
#: en/help_topics/hooks.txt:142
12099
msgid ""
12100
"transform_fallback_location\n"
12101
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12102
msgstr ""
12103
12104
#: en/help_topics/hooks.txt:145
12105
msgid "Introduced in: 1.9"
12106
msgstr ""
12107
12108
#: en/help_topics/hooks.txt:147
12109
msgid ""
12110
"Called when a stacked branch is activating its fallback locations.\n"
12111
"transform_fallback_location is called with (branch, url), and should\n"
12112
"return a new url. Returning the same url allows it to be used as-is,\n"
12113
"returning a different one can be used to cause the branch to stack on\n"
12114
"a closer copy of that fallback_location. Note that the branch cannot\n"
12115
"have history accessing methods called on it during this hook because\n"
12116
"the fallback locations have not been activated. When there are\n"
12117
"multiple hooks installed for transform_fallback_location, all are\n"
12118
"called with the url returned from the previous hook.The order is\n"
12119
"however undefined."
12120
msgstr ""
12121
12122
#: en/help_topics/hooks.txt:158
12123
msgid ""
12124
"CommandHooks\n"
12125
"------------"
12126
msgstr ""
12127
12128
#: en/help_topics/hooks.txt:161
12129
msgid ""
12130
"extend_command\n"
12131
"~~~~~~~~~~~~~~"
12132
msgstr ""
12133
12134
#: en/help_topics/hooks.txt:164
12135
msgid "Introduced in: 1.13"
12136
msgstr ""
12137
12138
#: en/help_topics/hooks.txt:166
12139
msgid ""
12140
"Called after creating a command object to allow modifications such as\n"
12141
"adding or removing options, docs etc. Called with the new\n"
12142
"bzrlib.commands.Command object."
12143
msgstr ""
12144
12145
#: en/help_topics/hooks.txt:170
12146
msgid ""
12147
"get_command\n"
12148
"~~~~~~~~~~~"
12149
msgstr ""
12150
12151
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12152
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12153
msgid "Introduced in: 1.17"
12154
msgstr ""
12155
12156
#: en/help_topics/hooks.txt:175
12157
msgid ""
12158
"Called when creating a single command. Called with (cmd_or_None,\n"
12159
"command_name). get_command should either return the cmd_or_None\n"
12160
"parameter, or a replacement Command object that should be used for the\n"
12161
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12162
"Many users will prefer to use bzrlib.commands.register_command or\n"
12163
"plugin_cmds.register_lazy."
12164
msgstr ""
12165
12166
#: en/help_topics/hooks.txt:182
12167
msgid ""
12168
"get_missing_command\n"
12169
"~~~~~~~~~~~~~~~~~~~"
12170
msgstr ""
12171
12172
#: en/help_topics/hooks.txt:187
12173
msgid ""
12174
"Called when creating a single command if no command could be found.\n"
12175
"Called with (command_name). get_missing_command should either return\n"
12176
"None, or a Command object to be used for the command."
12177
msgstr ""
12178
12179
#: en/help_topics/hooks.txt:191
12180
msgid ""
12181
"list_commands\n"
12182
"~~~~~~~~~~~~~"
12183
msgstr ""
12184
12185
#: en/help_topics/hooks.txt:196
12186
msgid ""
12187
"Called when enumerating commands. Called with a set of cmd_name\n"
12188
"strings for all the commands found so far. This set is safe to mutate\n"
12189
"- e.g. to remove a command. list_commands should return the updated\n"
12190
"set of command names."
12191
msgstr ""
12192
12193
#: en/help_topics/hooks.txt:201
12194
msgid ""
12195
"post_command\n"
12196
"~~~~~~~~~~~~"
12197
msgstr ""
12198
12199
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12200
msgid "Introduced in: 2.6"
12201
msgstr ""
12202
12203
#: en/help_topics/hooks.txt:206
12204
msgid "Called after executing a command. Called with the command object."
12205
msgstr ""
12206
12207
#: en/help_topics/hooks.txt:208
12208
msgid ""
12209
"pre_command\n"
12210
"~~~~~~~~~~~"
12211
msgstr ""
12212
12213
#: en/help_topics/hooks.txt:213
12214
msgid "Called prior to executing a command. Called with the command object."
12215
msgstr ""
12216
12217
#: en/help_topics/hooks.txt:215
12218
msgid ""
12219
"_ConfigHooks\n"
12220
"------------"
12221
msgstr ""
12222
12223
#: en/help_topics/hooks.txt:218
12224
msgid ""
12225
"get\n"
12226
"~~~"
12227
msgstr ""
12228
12229
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12230
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12231
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12232
#: en/help_topics/hooks.txt:446
12233
msgid "Introduced in: 2.4"
12234
msgstr ""
12235
12236
#: en/help_topics/hooks.txt:223
12237
msgid ""
12238
"Invoked when a config option is read. The signature is (stack, name,\n"
12239
"value)."
12240
msgstr ""
12241
12242
#: en/help_topics/hooks.txt:226
12243
msgid ""
12244
"load\n"
12245
"~~~~"
12246
msgstr ""
12247
12248
#: en/help_topics/hooks.txt:231
12249
msgid "Invoked when a config store is loaded. The signature is (store)."
12250
msgstr ""
12251
12252
#: en/help_topics/hooks.txt:233
12253
msgid ""
12254
"remove\n"
12255
"~~~~~~"
12256
msgstr ""
12257
12258
#: en/help_topics/hooks.txt:238
12259
msgid ""
12260
"Invoked when a config option is removed. The signature is (stack,\n"
12261
"name)."
12262
msgstr ""
12263
12264
#: en/help_topics/hooks.txt:241
12265
msgid ""
12266
"save\n"
12267
"~~~~"
12268
msgstr ""
12269
12270
#: en/help_topics/hooks.txt:246
12271
msgid "Invoked when a config store is saved. The signature is (store)."
12272
msgstr ""
12273
12274
#: en/help_topics/hooks.txt:248
12275
msgid ""
12276
"set\n"
12277
"~~~"
12278
msgstr ""
12279
12280
#: en/help_topics/hooks.txt:253
12281
msgid ""
12282
"Invoked when a config option is set. The signature is (stack, name,\n"
12283
"value)."
12284
msgstr ""
12285
12286
#: en/help_topics/hooks.txt:256
12287
msgid ""
12288
"ControlDirHooks\n"
12289
"---------------"
12290
msgstr ""
12291
12292
#: en/help_topics/hooks.txt:259
12293
msgid ""
12294
"post_repo_init\n"
12295
"~~~~~~~~~~~~~~"
12296
msgstr ""
12297
12298
#: en/help_topics/hooks.txt:264
12299
msgid ""
12300
"Invoked after a repository has been initialized. post_repo_init is\n"
12301
"called with a bzrlib.controldir.RepoInitHookParams."
12302
msgstr ""
12303
"Invoked after a repository has been initialised. post_repo_init is\n"
12304
"called with a bzrlib.controldir.RepoInitHookParams."
12305
12306
#: en/help_topics/hooks.txt:267
12307
msgid ""
12308
"pre_open\n"
12309
"~~~~~~~~"
12310
msgstr ""
12311
12312
#: en/help_topics/hooks.txt:270
12313
msgid "Introduced in: 1.14"
12314
msgstr ""
12315
12316
#: en/help_topics/hooks.txt:272
12317
msgid ""
12318
"Invoked before attempting to open a ControlDir with the transport that\n"
12319
"the open will use."
12320
msgstr ""
12321
12322
#: en/help_topics/hooks.txt:275
12323
msgid ""
12324
"InfoHooks\n"
12325
"---------"
12326
msgstr ""
12327
12328
#: en/help_topics/hooks.txt:278
12329
msgid ""
12330
"repository\n"
12331
"~~~~~~~~~~"
12332
msgstr ""
12333
12334
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12335
#: en/help_topics/hooks.txt:524
12336
msgid "Introduced in: 1.15"
12337
msgstr ""
12338
12339
#: en/help_topics/hooks.txt:283
12340
msgid ""
12341
"Invoked when displaying the statistics for a repository. repository is\n"
12342
"called with a statistics dictionary as returned by the repository and\n"
12343
"a file-like object to write to."
12344
msgstr ""
12345
12346
#: en/help_topics/hooks.txt:287
12347
msgid ""
12348
"LockHooks\n"
12349
"---------"
12350
msgstr ""
12351
12352
#: en/help_topics/hooks.txt:290
12353
msgid ""
12354
"lock_acquired\n"
12355
"~~~~~~~~~~~~~"
12356
msgstr ""
12357
12358
#: en/help_topics/hooks.txt:295
12359
msgid ""
12360
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12361
msgstr ""
12362
12363
#: en/help_topics/hooks.txt:297
12364
msgid ""
12365
"lock_broken\n"
12366
"~~~~~~~~~~~"
12367
msgstr ""
12368
12369
#: en/help_topics/hooks.txt:302
12370
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12371
msgstr ""
12372
12373
#: en/help_topics/hooks.txt:304
12374
msgid ""
12375
"lock_released\n"
12376
"~~~~~~~~~~~~~"
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:309
12380
msgid ""
12381
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12382
msgstr ""
12383
12384
#: en/help_topics/hooks.txt:311
12385
msgid ""
12386
"MergeHooks\n"
12387
"----------"
12388
msgstr ""
12389
12390
#: en/help_topics/hooks.txt:314
12391
msgid ""
12392
"merge_file_content\n"
12393
"~~~~~~~~~~~~~~~~~~"
12394
msgstr ""
12395
12396
#: en/help_topics/hooks.txt:317
12397
msgid "Introduced in: 2.1"
12398
msgstr ""
12399
12400
#: en/help_topics/hooks.txt:319
12401
msgid ""
12402
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12403
"object when starting a merge. Should return either None or a subclass\n"
12404
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12405
"called per file that needs to be merged (including when one side has\n"
12406
"deleted the file and the other has changed it). See the\n"
12407
"AbstractPerFileMerger API docs for details on how it is used by merge."
12408
msgstr ""
12409
12410
#: en/help_topics/hooks.txt:326
12411
msgid ""
12412
"post_merge\n"
12413
"~~~~~~~~~~"
12414
msgstr ""
12415
12416
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12417
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12418
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12419
msgid "Introduced in: 2.5"
12420
msgstr ""
12421
12422
#: en/help_topics/hooks.txt:331
12423
msgid ""
12424
"Called after a merge. Receives a Merger object as the single argument.\n"
12425
"The return value is ignored."
12426
msgstr ""
12427
12428
#: en/help_topics/hooks.txt:334
12429
msgid ""
12430
"pre_merge\n"
12431
"~~~~~~~~~"
12432
msgstr ""
12433
12434
#: en/help_topics/hooks.txt:339
12435
msgid ""
12436
"Called before a merge. Receives a Merger object as the single\n"
12437
"argument."
12438
msgstr ""
12439
12440
#: en/help_topics/hooks.txt:342
12441
msgid ""
12442
"MergeDirectiveHooks\n"
12443
"-------------------"
12444
msgstr ""
12445
12446
#: en/help_topics/hooks.txt:345
12447
msgid ""
12448
"merge_request_body\n"
12449
"~~~~~~~~~~~~~~~~~~"
12450
msgstr ""
12451
12452
#: en/help_topics/hooks.txt:348
12453
msgid "Introduced in: 1.15.0"
12454
msgstr ""
12455
12456
#: en/help_topics/hooks.txt:350
12457
msgid ""
12458
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12459
"request. Callbacks must return a body. If more than one callback is\n"
12460
"registered, the output of one callback is provided to the next."
12461
msgstr ""
12462
12463
#: en/help_topics/hooks.txt:354
12464
msgid ""
12465
"MessageEditorHooks\n"
12466
"------------------"
12467
msgstr ""
12468
12469
#: en/help_topics/hooks.txt:357
12470
msgid ""
12471
"commit_message_template\n"
12472
"~~~~~~~~~~~~~~~~~~~~~~~"
12473
msgstr ""
12474
12475
#: en/help_topics/hooks.txt:360
12476
msgid "Introduced in: 1.10"
12477
msgstr ""
12478
12479
#: en/help_topics/hooks.txt:362
12480
msgid ""
12481
"Called when a commit message is being generated.\n"
12482
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12483
"and the message that is known so far. commit_message_template must\n"
12484
"return a new message to use (which could be the same as it was given).\n"
12485
"When there are multiple hooks registered for commit_message_template,\n"
12486
"they are chained with the result from the first passed into the\n"
12487
"second, and so on."
12488
msgstr ""
12489
12490
#: en/help_topics/hooks.txt:370
12491
msgid ""
12492
"set_commit_message\n"
12493
"~~~~~~~~~~~~~~~~~~"
12494
msgstr ""
12495
12496
#: en/help_topics/hooks.txt:375
12497
msgid ""
12498
"Set a fixed commit message. set_commit_message is called with the\n"
12499
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12500
"properties by editing commit.builder._revprops) and the message so\n"
12501
"far. set_commit_message must return the message to use or None if it\n"
12502
"should use the message editor as normal."
12503
msgstr ""
12504
12505
#: en/help_topics/hooks.txt:381
12506
msgid ""
12507
"MutableTreeHooks\n"
12508
"----------------"
12509
msgstr ""
12510
12511
#: en/help_topics/hooks.txt:384
12512
msgid ""
12513
"post_build_tree\n"
12514
"~~~~~~~~~~~~~~~"
12515
msgstr ""
12516
12517
#: en/help_topics/hooks.txt:389
12518
msgid ""
12519
"Called after a completely new tree is built. The hook is called with\n"
12520
"the tree as its only argument."
12521
msgstr ""
12522
12523
#: en/help_topics/hooks.txt:395
12524
msgid "Introduced in: 2.0"
12525
msgstr ""
12526
12527
#: en/help_topics/hooks.txt:397
12528
msgid ""
12529
"Called after a commit is performed on a tree. The hook is called with\n"
12530
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12531
"commit was performed on is available via the mutable_tree attribute of\n"
12532
"that object."
12533
msgstr ""
12534
12535
#: en/help_topics/hooks.txt:402
12536
msgid ""
12537
"post_transform\n"
12538
"~~~~~~~~~~~~~~"
12539
msgstr ""
12540
12541
#: en/help_topics/hooks.txt:407
12542
msgid ""
12543
"Called after a tree transform has been performed on a tree. The hook\n"
12544
"is called with the tree that is being transformed and the transform."
12545
msgstr ""
12546
12547
#: en/help_topics/hooks.txt:410
12548
msgid ""
12549
"pre_transform\n"
12550
"~~~~~~~~~~~~~"
12551
msgstr ""
12552
12553
#: en/help_topics/hooks.txt:415
12554
msgid ""
12555
"Called before a tree transform on this tree. The hook is called with\n"
12556
"the tree that is being transformed and the transform."
12557
msgstr ""
12558
12559
#: en/help_topics/hooks.txt:418
12560
msgid ""
12561
"start_commit\n"
12562
"~~~~~~~~~~~~"
12563
msgstr ""
12564
12565
#: en/help_topics/hooks.txt:423
12566
msgid ""
12567
"Called before a commit is performed on a tree. The start commit hook\n"
12568
"is able to change the tree before the commit takes place. start_commit\n"
12569
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12570
"being performed on."
12571
msgstr ""
12572
12573
#: en/help_topics/hooks.txt:428
12574
msgid ""
12575
"SmartClientHooks\n"
12576
"----------------"
12577
msgstr ""
12578
12579
#: en/help_topics/hooks.txt:431
12580
msgid ""
12581
"call\n"
12582
"~~~~"
12583
msgstr ""
12584
12585
#: en/help_topics/hooks.txt:434
12586
msgid "Introduced in: unknown"
12587
msgstr ""
12588
12589
#: en/help_topics/hooks.txt:436
12590
msgid ""
12591
"Called when the smart client is submitting a request to the smart\n"
12592
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12593
"Streaming request bodies, and responses, are not accessible."
12594
msgstr ""
12595
12596
#: en/help_topics/hooks.txt:440
12597
msgid ""
12598
"SmartServerHooks\n"
12599
"----------------"
12600
msgstr ""
12601
12602
#: en/help_topics/hooks.txt:443
12603
msgid ""
12604
"server_exception\n"
12605
"~~~~~~~~~~~~~~~~"
12606
msgstr ""
12607
12608
#: en/help_topics/hooks.txt:448
12609
msgid ""
12610
"Called by the bzr server when an exception occurs. server_exception is\n"
12611
"called with the sys.exc_info() tuple return true for the hook if the\n"
12612
"exception has been handled, in which case the server will exit\n"
12613
"normally."
12614
msgstr ""
12615
12616
#: en/help_topics/hooks.txt:453
12617
msgid ""
12618
"server_started\n"
12619
"~~~~~~~~~~~~~~"
12620
msgstr ""
12621
12622
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12623
msgid "Introduced in: 0.16"
12624
msgstr ""
12625
12626
#: en/help_topics/hooks.txt:458
12627
msgid ""
12628
"Called by the bzr server when it starts serving a directory.\n"
12629
"server_started is called with (backing urls, public url), where\n"
12630
"backing_url is a list of URLs giving the server-specific directory\n"
12631
"locations, and public_url is the public URL for the directory being\n"
12632
"served."
12633
msgstr ""
12634
12635
#: en/help_topics/hooks.txt:464
12636
msgid ""
12637
"server_started_ex\n"
12638
"~~~~~~~~~~~~~~~~~"
12639
msgstr ""
12640
12641
#: en/help_topics/hooks.txt:469
12642
msgid ""
12643
"Called by the bzr server when it starts serving a directory.\n"
12644
"server_started is called with (backing_urls, server_obj)."
12645
msgstr ""
12646
12647
#: en/help_topics/hooks.txt:472
12648
msgid ""
12649
"server_stopped\n"
12650
"~~~~~~~~~~~~~~"
12651
msgstr ""
12652
12653
#: en/help_topics/hooks.txt:477
12654
msgid ""
12655
"Called by the bzr server when it stops serving a directory.\n"
12656
"server_stopped is called with the same parameters as the\n"
12657
"server_started hook: (backing_urls, public_url)."
12658
msgstr ""
12659
12660
#: en/help_topics/hooks.txt:481
12661
msgid ""
12662
"StatusHooks\n"
12663
"-----------"
12664
msgstr ""
12665
12666
#: en/help_topics/hooks.txt:484
12667
msgid ""
12668
"post_status\n"
12669
"~~~~~~~~~~~"
12670
msgstr ""
12671
12672
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12673
msgid "Introduced in: 2.3"
12674
msgstr ""
12675
12676
#: en/help_topics/hooks.txt:489
12677
msgid ""
12678
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12679
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12680
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12681
"correspond to the command line options specified by the user for the\n"
12682
"status command. to_file is the output stream for writing."
12683
msgstr ""
12684
12685
#: en/help_topics/hooks.txt:495
12686
msgid ""
12687
"pre_status\n"
12688
"~~~~~~~~~~"
12689
msgstr ""
12690
12691
#: en/help_topics/hooks.txt:500
12692
msgid ""
12693
"Called with argument StatusHookParams before Bazaar displays the\n"
12694
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12695
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12696
"correspond to the command line options specified by the user for the\n"
12697
"status command. to_file is the output stream for writing."
12698
msgstr ""
12699
12700
#: en/help_topics/hooks.txt:506
12701
msgid ""
12702
"TransportHooks\n"
12703
"--------------"
12704
msgstr ""
12705
12706
#: en/help_topics/hooks.txt:509
12707
msgid ""
12708
"post_connect\n"
12709
"~~~~~~~~~~~~"
12710
msgstr ""
12711
12712
#: en/help_topics/hooks.txt:514
12713
msgid ""
12714
"Called after a new connection is established or a reconnect occurs.\n"
12715
"The sole argument passed is either the connected transport or smart\n"
12716
"medium instance."
12717
msgstr ""
12718
12719
#: en/help_topics/hooks.txt:518
12720
msgid ""
12721
"RioVersionInfoBuilderHooks\n"
12722
"--------------------------"
12723
msgstr ""
12724
12725
#: en/help_topics/hooks.txt:521
12726
msgid ""
12727
"revision\n"
12728
"~~~~~~~~"
12729
msgstr ""
12730
12731
#: en/help_topics/hooks.txt:526
12732
msgid ""
12733
"Invoked when adding information about a revision to the RIO stanza\n"
12734
"that is printed. revision is called with a revision object and a RIO\n"
12735
"stanza.\n"
12736
msgstr ""
12737
12738
#: en/help_topics/location-alias.txt:1
12739
msgid ""
12740
"Location aliases\n"
12741
"================"
12742
msgstr ""
12743
12744
#: en/help_topics/location-alias.txt:4
12745
msgid ""
12746
"Bazaar defines several aliases for locations associated with a branch. "
12747
"These\n"
12748
"can be used with most commands that expect a location, such as `bzr push`."
12749
msgstr ""
12750
12751
#: en/help_topics/location-alias.txt:7
12752
msgid "The aliases are::"
12753
msgstr ""
12754
12755
#: en/help_topics/location-alias.txt:9
12756
msgid ""
12757
" :bound The branch this branch is bound to, for bound branches.\n"
12758
" :parent The parent of this branch.\n"
12759
" :public The public location of this branch.\n"
12760
" :push The saved location used for `bzr push` with no arguments.\n"
12761
" :submit The submit branch for this branch.\n"
12762
" :this This branch."
12763
msgstr ""
12764
12765
#: en/help_topics/location-alias.txt:16
12766
msgid "For example, to push to the parent location::"
12767
msgstr ""
12768
12769
#: en/help_topics/location-alias.txt:18
12770
msgid " bzr push :parent\n"
12771
msgstr ""
12772
12773
#: en/help_topics/log-formats.txt:1
12774
msgid ""
12775
"Log Formats\n"
12776
"==========="
12777
msgstr ""
12778
12779
#: en/help_topics/log-formats.txt:4
12780
msgid ""
12781
"A log format controls how information about each revision is displayed.\n"
12782
"The standard log formats are compared below::"
12783
msgstr ""
12784
12785
#: en/help_topics/log-formats.txt:7
12786
msgid ""
12787
" Feature long short line\n"
12788
" ---------------------- ------------- ------------ -------------------\n"
12789
" design goal detailed view concise view 1 revision per line\n"
12790
" committer name+email name only name only\n"
12791
" author name+email - -\n"
12792
" date-time format full date only date only\n"
12793
" commit message full full top line\n"
12794
" tags yes yes yes\n"
12795
" merges indicator - yes -\n"
12796
" status/delta optional optional -\n"
12797
" diff/patch optional optional -\n"
12798
" revision-id optional optional -\n"
12799
" branch nick yes - -\n"
12800
" foreign vcs properties yes yes -\n"
12801
" preferred levels all 1 1\n"
12802
" digital signature optional - -"
12803
msgstr ""
12804
12805
#: en/help_topics/log-formats.txt:24
12806
msgid ""
12807
"The default format is ``long``. To change this, define the ``log_format``\n"
12808
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12809
msgstr ""
12810
12811
#: en/help_topics/log-formats.txt:27
12812
msgid ""
12813
" [DEFAULT]\n"
12814
" log_format = short"
12815
msgstr ""
12816
12817
#: en/help_topics/log-formats.txt:30
12818
msgid ""
12819
"Alternatively, to change the log format used for a given query, use the\n"
12820
"--long, --short or --line options."
12821
msgstr ""
12822
12823
#: en/help_topics/log-formats.txt:33
12824
msgid ""
12825
"If one of the standard log formats does not meet your needs, additional\n"
12826
"formats can be provided by plugins.\n"
12827
msgstr ""
12828
12829
#: en/help_topics/other-formats.txt:1
12830
msgid "Other Storage Formats"
12831
msgstr ""
12832
12833
#: en/help_topics/other-formats.txt:3
12834
msgid "Experimental formats are shown below."
12835
msgstr ""
12836
12837
#: en/help_topics/other-formats.txt:5
12838
msgid ""
12839
":development-colo:\n"
12840
" (native) The 2a format with experimental support for colocated\n"
12841
" branches."
12842
msgstr ""
12843
12844
#: en/help_topics/other-formats.txt:9
12845
msgid ""
12846
"\n"
12847
"Deprecated formats are shown below."
12848
msgstr ""
12849
12850
#: en/help_topics/other-formats.txt:12
12851
msgid ""
12852
":pack-0.92:\n"
12853
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12854
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12855
" by bzr < 0.92."
12856
msgstr ""
12857
12858
#: en/help_topics/patterns.txt:1
12859
msgid ""
12860
"Patterns\n"
12861
"========"
12862
msgstr ""
12863
12864
#: en/help_topics/patterns.txt:4
12865
msgid ""
12866
"Bazaar uses patterns to match files at various times. For example,\n"
12867
"the ``add`` command skips over files that match ignore patterns\n"
12868
"and preferences can be associated with files using rule patterns.\n"
12869
"The pattern syntax is described below."
12870
msgstr ""
12871
12872
#: en/help_topics/patterns.txt:9
12873
msgid ""
12874
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12875
"slash or is a regular expression, it is compared to the whole path\n"
12876
"from the branch root. Otherwise, it is compared to only the last\n"
12877
"component of the path. To match a file only in the root directory,\n"
12878
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12879
msgstr ""
12880
12881
#: en/help_topics/patterns.txt:15
12882
msgid "Patterns may include globbing wildcards such as::"
12883
msgstr ""
12884
12885
#: en/help_topics/patterns.txt:17
12886
msgid ""
12887
" ? - Matches any single character except '/'\n"
12888
" * - Matches 0 or more characters except '/'\n"
12889
" /**/ - Matches 0 or more directories in a path\n"
12890
" [a-z] - Matches a single character from within a group of characters"
12891
msgstr ""
12892
12893
#: en/help_topics/patterns.txt:22
12894
msgid ""
12895
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12896
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12897
"expression. Regular expression patterns may not include named or\n"
12898
"numbered groups."
12899
msgstr ""
12900
12901
#: en/help_topics/patterns.txt:27
12902
msgid ""
12903
"Case insensitive ignore patterns can be specified with regular expressions\n"
12904
"by using the ``i`` (for ignore case) flag in the pattern."
12905
msgstr ""
12906
12907
#: en/help_topics/patterns.txt:30
12908
msgid ""
12909
"For example, a case insensitive match for ``foo`` may be specified as::"
12910
msgstr ""
12911
12912
#: en/help_topics/patterns.txt:32
12913
msgid " RE:(?i)foo"
12914
msgstr ""
12915
12916
#: en/help_topics/patterns.txt:34
12917
msgid ""
12918
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12919
"matched by that pattern will not be ignored."
12920
msgstr ""
12921
12922
#: en/help_topics/patterns.txt:37
12923
msgid ""
12924
".. _Python regular expressions: http://docs.python.org/library/re.html"
12925
msgstr ""
12926
12927
#: en/help_topics/revisionspec.txt:1
12928
msgid "Revision Identifiers"
12929
msgstr ""
12930
12931
#: en/help_topics/revisionspec.txt:3
12932
msgid ""
12933
"A revision identifier refers to a specific state of a branch's history. It\n"
12934
"can be expressed in several ways. It can begin with a keyword to\n"
12935
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12936
"'before:yesterday' and 'submit:'."
12937
msgstr ""
12938
12939
#: en/help_topics/revisionspec.txt:8
12940
msgid ""
12941
"Alternately, it can be given without a keyword, in which case it will be\n"
12942
"checked as a revision number, a tag, a revision id, a date specification, or "
12943
"a\n"
12944
"branch specification, in that order. For example, 'date:today' could be\n"
12945
"written as simply 'today', though if you have a tag called 'today' that "
12946
"will\n"
12947
"be found first."
12948
msgstr ""
12949
12950
#: en/help_topics/revisionspec.txt:14
12951
msgid ""
12952
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12953
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12954
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12955
"or\n"
12956
"spaces around the '..')."
12957
msgstr ""
12958
12959
#: en/help_topics/revisionspec.txt:19
12960
msgid ""
12961
"Ranges are interpreted differently by different commands. To the \"log\" "
12962
"command,\n"
12963
"a range is a sequence of log messages, but to the \"diff\" command, the "
12964
"range\n"
12965
"denotes a change between revisions (and not a sequence of changes). In\n"
12966
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12967
"consider it\n"
12968
"to be open-ended, that is, they include one end but not the other. For "
12969
"example:\n"
12970
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12971
"3649,\n"
12972
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12973
"and\n"
12974
"3649, but not 3647."
12975
msgstr ""
12976
12977
#: en/help_topics/revisionspec.txt:28
12978
msgid "The keywords used as revision selection methods are the following:"
12979
msgstr ""
12980
12981
#: en/help_topics/revisionspec.txt:30
12982
msgid ""
12983
":revid:\n"
12984
"\tSelects a revision using the revision id.\n"
12985
":submit:\n"
12986
"\tSelects a common ancestor with the submit branch.\n"
12987
":ancestor:\n"
12988
"\tSelects a common ancestor with a second branch.\n"
12989
":date:\n"
12990
"\tSelects a revision on the basis of a datestamp.\n"
12991
":branch:\n"
12992
"\tSelects the last revision of a specified branch.\n"
12993
":tag:\n"
12994
"\tSelects a revision identified by a tag name.\n"
12995
":revno:\n"
12996
"\tSelects a revision using a number.\n"
12997
":before:\n"
12998
"\tSelects the parent of the revision specified.\n"
12999
":annotate:\n"
13000
"\tSelect the revision that last modified the specified line.\n"
13001
":mainline:\n"
13002
"\tSelect mainline revision that merged the specified revision.\n"
13003
":last:\n"
13004
"\tSelects the nth revision from the end."
13005
msgstr ""
13006
13007
#: en/help_topics/revisionspec.txt:53
13008
msgid "In addition, plugins can provide other keywords."
13009
msgstr ""
13010
13011
#: en/help_topics/revisionspec.txt:55
13012
msgid "A detailed description of each keyword is given below."
13013
msgstr ""
13014
13015
#: en/help_topics/revisionspec.txt:57
13016
msgid ":revid:"
13017
msgstr ""
13018
13019
#: en/help_topics/revisionspec.txt:59
13020
msgid ""
13021
" Supply a specific revision id, that can be used to specify any\n"
13022
" revision id in the ancestry of the branch.\n"
13023
" Including merges, and pending merges.\n"
13024
" Examples::"
13025
msgstr ""
13026
13027
#: en/help_topics/revisionspec.txt:64
13028
msgid ""
13029
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13030
msgstr ""
13031
13032
#: en/help_topics/revisionspec.txt:66
13033
msgid ":submit:"
13034
msgstr ""
13035
13036
#: en/help_topics/revisionspec.txt:68
13037
msgid ""
13038
" Diffing against this shows all the changes that were made in this "
13039
"branch,\n"
13040
" and is a good predictor of what merge will do. The submit branch is\n"
13041
" used by the bundle and merge directive commands. If no submit branch\n"
13042
" is specified, the parent branch is used instead."
13043
msgstr ""
13044
13045
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13046
msgid ""
13047
" The common ancestor is the last revision that existed in both\n"
13048
" branches. Usually this is the branch point, but it could also be\n"
13049
" a revision that was merged."
13050
msgstr ""
13051
13052
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13053
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13054
#: en/help_topics/revisionspec.txt:153
13055
msgid " Examples::"
13056
msgstr ""
13057
13058
#: en/help_topics/revisionspec.txt:79
13059
msgid " $ bzr diff -r submit:"
13060
msgstr ""
13061
13062
#: en/help_topics/revisionspec.txt:81
13063
msgid ":ancestor:"
13064
msgstr ""
13065
13066
#: en/help_topics/revisionspec.txt:83
13067
msgid " Supply the path to a branch to select the common ancestor."
13068
msgstr ""
13069
13070
#: en/help_topics/revisionspec.txt:89
13071
msgid ""
13072
" This is frequently used with 'diff' to return all of the changes\n"
13073
" that your branch introduces, while excluding the changes that you\n"
13074
" have not merged from the remote branch."
13075
msgstr ""
13076
13077
#: en/help_topics/revisionspec.txt:95
13078
msgid ""
13079
" ancestor:/path/to/branch\n"
13080
" $ bzr diff -r ancestor:../../mainline/branch"
13081
msgstr ""
13082
13083
#: en/help_topics/revisionspec.txt:98
13084
msgid ":date:"
13085
msgstr ""
13086
13087
#: en/help_topics/revisionspec.txt:100
13088
msgid ""
13089
" Supply a datestamp to select the first revision that matches the date.\n"
13090
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13091
" Matches the first entry after a given date (either at midnight or\n"
13092
" at a specified time)."
13093
msgstr ""
13094
13095
#: en/help_topics/revisionspec.txt:105
13096
msgid " One way to display all the changes since yesterday would be::"
13097
msgstr ""
13098
13099
#: en/help_topics/revisionspec.txt:107
13100
msgid " bzr log -r date:yesterday.."
13101
msgstr ""
13102
13103
#: en/help_topics/revisionspec.txt:111
13104
msgid ""
13105
" date:yesterday -> select the first revision since "
13106
"yesterday\n"
13107
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13108
" August 14th, 2006 at 5:10pm."
13109
msgstr ""
13110
13111
#: en/help_topics/revisionspec.txt:115
13112
msgid ":branch:"
13113
msgstr ""
13114
13115
#: en/help_topics/revisionspec.txt:117
13116
msgid " Supply the path to a branch to select its last revision."
13117
msgstr ""
13118
13119
#: en/help_topics/revisionspec.txt:121
13120
msgid " branch:/path/to/branch"
13121
msgstr ""
13122
13123
#: en/help_topics/revisionspec.txt:123
13124
msgid ":tag:"
13125
msgstr ""
13126
13127
#: en/help_topics/revisionspec.txt:125
13128
msgid " Tags are stored in the branch and created by the 'tag' command."
13129
msgstr ""
13130
13131
#: en/help_topics/revisionspec.txt:127
13132
msgid ":revno:"
13133
msgstr ""
13134
13135
#: en/help_topics/revisionspec.txt:129
13136
msgid ""
13137
" Use an integer to specify a revision in the history of the branch.\n"
13138
" Optionally a branch can be specified. A negative number will count\n"
13139
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13140
" one). If the negative number is larger than the branch's history, the\n"
13141
" first revision is returned.\n"
13142
" Examples::"
13143
msgstr ""
13144
13145
#: en/help_topics/revisionspec.txt:136
13146
msgid ""
13147
" revno:1 -> return the first revision of this branch\n"
13148
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13149
" the branch '/path/to/branch'\n"
13150
" revno:-1 -> The last revision in a branch.\n"
13151
" -2:http://other/branch -> The second to last revision in the\n"
13152
" remote branch.\n"
13153
" -1000000 -> Most likely the first revision, unless\n"
13154
" your history is very long."
13155
msgstr ""
13156
13157
#: en/help_topics/revisionspec.txt:145
13158
msgid ":before:"
13159
msgstr ""
13160
13161
#: en/help_topics/revisionspec.txt:147
13162
msgid ""
13163
" Supply any revision spec to return the parent of that revision. This "
13164
"is\n"
13165
" mostly useful when inspecting revisions that are not in the revision "
13166
"history\n"
13167
" of a branch."
13168
msgstr ""
13169
13170
#: en/help_topics/revisionspec.txt:151
13171
msgid ""
13172
" It is an error to request the parent of the null revision (before:0)."
13173
msgstr ""
13174
13175
#: en/help_topics/revisionspec.txt:155
13176
msgid ""
13177
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13178
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13179
" aaaa@bbbb-1234567890\n"
13180
" bzr diff -r before:1913..1913\n"
13181
" -> Find the changes between revision 1913 and its parent "
13182
"(1912).\n"
13183
" (What changes did revision 1913 introduce).\n"
13184
" This is equivalent to: bzr diff -c 1913"
13185
msgstr ""
13186
13187
#: en/help_topics/revisionspec.txt:163
13188
msgid ":annotate:"
13189
msgstr ""
13190
13191
#: en/help_topics/revisionspec.txt:165
13192
msgid ""
13193
" Select the revision that last modified the specified line. Line is\n"
13194
" specified as path:number. Path is a relative path to the file. "
13195
"Numbers\n"
13196
" start at 1, and are relative to the current version, not the last-\n"
13197
" committed version of the file."
13198
msgstr ""
13199
13200
#: en/help_topics/revisionspec.txt:170
13201
msgid ":mainline:"
13202
msgstr ""
13203
13204
#: en/help_topics/revisionspec.txt:172
13205
msgid ""
13206
" Select the revision that merged the specified revision into mainline."
13207
msgstr ""
13208
13209
#: en/help_topics/revisionspec.txt:174
13210
msgid ":last:"
13211
msgstr ""
13212
13213
#: en/help_topics/revisionspec.txt:176
13214
msgid ""
13215
" Supply a positive number to get the nth revision from the end.\n"
13216
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13217
" Examples::"
13218
msgstr ""
13219
13220
#: en/help_topics/revisionspec.txt:180
13221
msgid ""
13222
" last:1 -> return the last revision\n"
13223
" last:3 -> return the revision 2 before the end.\n"
13224
msgstr ""
13225
13226
#: en/help_topics/rules.txt:1
13227
msgid ""
13228
"Rules\n"
13229
"====="
13230
msgstr ""
13231
13232
#: en/help_topics/rules.txt:7
13233
msgid ""
13234
"Rules are defined in ini file format where the sections are file glob\n"
13235
"patterns and the contents of each section are the preferences for files\n"
13236
"matching that pattern(s). For example::"
13237
msgstr ""
13238
13239
#: en/help_topics/rules.txt:11
13240
msgid ""
13241
" [name *.bat]\n"
13242
" eol = native"
13243
msgstr ""
13244
13245
#: en/help_topics/rules.txt:14
13246
msgid ""
13247
" [name *.html *.xml]\n"
13248
" keywords = xml_escape"
13249
msgstr ""
13250
13251
#: en/help_topics/rules.txt:17
13252
msgid ""
13253
"Preferences like these are useful for commands and plugins wishing to\n"
13254
"provide custom behaviour for selected files. For more information on \n"
13255
"end of line conversion see :doc:`eol-help`.\n"
13256
"Keyword support is provided by the `keywords plugin\n"
13257
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13258
msgstr ""
13259
13260
#: en/help_topics/rules.txt:23
13261
msgid ""
13262
"Files\n"
13263
"-----"
13264
msgstr ""
13265
13266
#: en/help_topics/rules.txt:26
13267
msgid ""
13268
"Default rules for all branches are defined in the optional file\n"
13269
"``BZR_HOME/rules``. "
13270
msgstr ""
13271
13272
#: en/help_topics/rules.txt:29
13273
msgid ""
13274
"Rule Patterns\n"
13275
"-------------"
13276
msgstr ""
13277
13278
#: en/help_topics/rules.txt:32
13279
msgid ""
13280
"Patterns are ordered and searching stops as soon as one matches.\n"
13281
"As a consequence, more explicit patterns should be placed towards\n"
13282
"the top of the file. Rule patterns use exactly the same conventions\n"
13283
"as ignore patterns. See :doc:`patterns-help` for details."
13284
msgstr ""
13285
13286
#: en/help_topics/rules.txt:37
13287
msgid ".. note::"
13288
msgstr ""
13289
13290
#: en/help_topics/rules.txt:39
13291
msgid ""
13292
" Patterns containing square brackets or spaces should be\n"
13293
" surrounded in quotes to ensure they are correctly parsed.\n"
13294
msgstr ""
13295
13296
#: en/help_topics/topics.txt:1
13297
msgid ""
13298
"authentication Information on configuring authentication\n"
13299
"basic Basic commands\n"
13300
"branches Information on what a branch is\n"
13301
"bugs Bug tracker settings\n"
13302
"checkouts Information on what a checkout is\n"
13303
"commands Basic help for all commands\n"
13304
"configuration Details on the configuration settings available\n"
13305
"conflict-types Types of conflicts and what to do about them\n"
13306
"content-filters Conversion of content into/from working trees\n"
13307
"criss-cross Information on criss-cross merging\n"
13308
"current-formats Current storage formats\n"
13309
"debug-flags Options to show or record debug information\n"
13310
"diverged-branches How to fix diverged branches\n"
13311
"env-variables Environment variable names and values\n"
13312
"eol Information on end-of-line handling\n"
13313
"files Information on configuration and log files\n"
13314
"formats Information on choosing a storage format\n"
13315
"global-options Options that control how Bazaar runs\n"
13316
"hidden-commands All hidden commands\n"
13317
"hooks Points at which custom processing can be added\n"
13318
"launchpad Using Bazaar with Launchpad.net\n"
13319
"location-alias Aliases for remembered locations\n"
13320
"log-formats Details on the logging formats available\n"
13321
"other-formats Experimental and deprecated storage formats\n"
13322
"patterns Information on the pattern syntax\n"
13323
"repositories Basic information on shared repositories.\n"
13324
"revisionspec Explain how to use --revision\n"
13325
"rules Information on defining rule-based preferences\n"
13326
"standalone-trees Information on what a standalone tree is\n"
13327
"standard-options Options that can be used with any command\n"
13328
"status-flags Help on status flags\n"
13329
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13330
"topics Topics list\n"
13331
"url-special-chars Special character handling in URLs\n"
13332
"urlspec Supported transport protocols\n"
13333
"working-trees Information on working trees\n"
13334
msgstr ""
13335
13336
#: en/help_topics/url-special-chars.txt:1
13337
msgid ""
13338
"Special character handling in URLs\n"
13339
"=================================="
13340
msgstr ""
13341
13342
#: en/help_topics/url-special-chars.txt:4
13343
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13344
msgstr ""
13345
13346
#: en/help_topics/url-special-chars.txt:6
13347
msgid " * Fully qualified URLs"
13348
msgstr ""
13349
13350
#: en/help_topics/url-special-chars.txt:8
13351
msgid " * File system paths, relative or absolute"
13352
msgstr ""
13353
13354
#: en/help_topics/url-special-chars.txt:10
13355
msgid ""
13356
"Internally bzr treats all locations as URLs. For any file system paths\n"
13357
"that are specified it will automatically determine the appropriate URL\n"
13358
"representation, and escape special characters where necessary."
13359
msgstr ""
13360
13361
#: en/help_topics/url-special-chars.txt:14
13362
msgid ""
13363
"There are a few characters which have special meaning in URLs and need "
13364
"careful\n"
13365
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13366
"value in URLs. Any non-ASCII characters in a file path will automatically "
13367
"be\n"
13368
"urlencoded when the path is converted to a URL."
13369
msgstr ""
13370
13371
#: en/help_topics/url-special-chars.txt:19
13372
msgid ""
13373
"URLs represent non-ASCII characters in an encoding defined by the server, "
13374
"but\n"
13375
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13376
"be\n"
13377
"generous in what it accepts as a URL and to print them in a way that\n"
13378
"will be readable."
13379
msgstr ""
13380
13381
#: en/help_topics/url-special-chars.txt:24
13382
msgid ""
13383
"For example, if you have a directory named '/tmp/%2False' these are all "
13384
"valid\n"
13385
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13386
"slash)::"
13387
msgstr ""
13388
13389
#: en/help_topics/url-special-chars.txt:27
13390
msgid ""
13391
" cd /tmp\n"
13392
" bzr log /tmp/%2False\n"
13393
" bzr log %2False\n"
13394
" bzr log file:///tmp/%252False\n"
13395
" bzr log file://localhost/tmp/%252False\n"
13396
" bzr log file:%252False"
13397
msgstr ""
13398
13399
#: en/help_topics/url-special-chars.txt:34
13400
msgid "These are valid but do not refer to the same file::"
13401
msgstr ""
13402
13403
#: en/help_topics/url-special-chars.txt:36
13404
msgid ""
13405
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13406
" bzr log %252False (refers to a file called /tmp/%252False)"
13407
msgstr ""
13408
13409
#: en/help_topics/url-special-chars.txt:39
13410
msgid ""
13411
"Comma also has special meaning in URLs, because it denotes `segment "
13412
"parameters`_"
13413
msgstr ""
13414
13415
#: en/help_topics/url-special-chars.txt:41
13416
msgid ""
13417
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13418
msgstr ""
13419
13420
#: en/help_topics/url-special-chars.txt:43
13421
msgid ""
13422
"Comma is also special in any file system paths that are specified. To use a "
13423
"literal\n"
13424
"comma in a file system path, specify a URL and URL encode the comma::"
13425
msgstr ""
13426
13427
#: en/help_topics/url-special-chars.txt:46
13428
msgid ""
13429
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13430
"\"branch\" set to \"bla\"\n"
13431
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13432
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13433
"\"branch\" set to \"bla\"\n"
13434
msgstr ""
13435
13436
#: en/help_topics/urlspec.txt:1
13437
msgid "URL Identifiers"
13438
msgstr ""
13439
13440
#: en/help_topics/urlspec.txt:3
13441
msgid "Supported URL prefixes::"
13442
msgstr ""
13443
13444
#: en/help_topics/urlspec.txt:5
13445
msgid ""
13446
" aftp:// Access using active FTP.\n"
13447
" bzr:// Fast access using the Bazaar smart server.\n"
13448
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13449
" file:// Access using the standard filesystem (default)\n"
13450
" ftp:// Access using passive FTP.\n"
13451
" http:// Read-only access of branches exported on the web.\n"
13452
" https:// Read-only access of branches exported on the web using "
13453
"SSL.\n"
13454
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13455
msgstr ""
13456
13457
#: en/help_topics/urlspec.txt:14
13458
msgid "Supported modifiers::"
13459
msgstr ""
13460
13461
#: en/help_topics/urlspec.txt:16
13462
msgid " gio+ Access using any GIO supported protocols."
13463
msgstr ""
13464
13465
#: en/help_topics/urlspec.txt:18
13466
msgid "Bazaar supports all of the standard parts within the URL::"
13467
msgstr ""
13468
13469
#: en/help_topics/urlspec.txt:20
13470
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13471
msgstr ""
13472
13473
#: en/help_topics/urlspec.txt:22
13474
msgid "allowing URLs such as::"
13475
msgstr ""
13476
13477
#: en/help_topics/urlspec.txt:24
13478
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13479
msgstr ""
13480
13481
#: en/help_topics/urlspec.txt:26
13482
msgid ""
13483
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13484
"with '~' as meaning that the rest of the path should be interpreted\n"
13485
"relative to the remote user's home directory. For example if the user\n"
13486
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13487
"shell.example.com, then::"
13488
msgstr ""
13489
13490
#: en/help_topics/urlspec.txt:32
13491
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13492
msgstr ""
13493
13494
#: en/help_topics/urlspec.txt:34
13495
msgid "would refer to ``/home/remote/myproject/trunk``."
13496
msgstr ""
13497
13498
#: en/help_topics/urlspec.txt:36
13499
msgid ""
13500
"Many commands that accept URLs also accept location aliases too.\n"
13501
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13502
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1