To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6138.3.4
- compare with another revision
- download diff
- download tarball
- view history from revision 6138.3.4
- Committer: Jonathan Riddell
- Date: 2011-09-15 11:31:47 UTC
- mto: This revision was merged to the branch mainline in revision 6143.
- Revision ID: jriddell@canonical.com-20110915113147-bgleett47i4jjxya
add gettext() to uses of trace.note()
- files added:
- NEWS
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/tests/per_bzrdir
- bzrlib/tests/per_repository_vf
- po
- files removed:
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- files renamed:
- 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_bzrdir_colo/ => bzrlib/tests/per_controldir_colo/
- 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/bzr.pot
1
# SOME DESCRIPTIVE TITLE.
2
# Copyright (C) YEAR Canonical
3
# This file is distributed under the same license as the PACKAGE package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5
#
6
#, fuzzy
7
msgid ""
8
msgstr ""
9
"Project-Id-Version: bzr\n"
10
"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
11
"POT-Creation-Date: 2011-09-14 12:41+0100\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
15
"Language: \n"
16
"MIME-Version: 1.0\n"
17
"Content-Type: text/plain; charset=CHARSET\n"
18
"Content-Transfer-Encoding: 8bit\n"
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
21
#: bzrlib/builtins.py:116 bzrlib/builtins.py:2756
22
#, python-format
23
msgid "Ignoring files outside view. View is %s"
24
msgstr ""
25
26
#: bzrlib/builtins.py:125
27
#, python-format
28
msgid "bzr %s --revision takes exactly one revision identifier"
29
msgstr ""
30
31
#: bzrlib/builtins.py:210
32
msgid "Display status summary."
33
msgstr ""
34
35
#: bzrlib/builtins.py:212
36
msgid ""
37
"This reports on versioned and unknown files, reporting them\n"
38
"grouped by state. Possible states are:"
39
msgstr ""
40
41
#: bzrlib/builtins.py:215
42
msgid ""
43
"added\n"
44
" Versioned in the working copy but not in the previous revision."
45
msgstr ""
46
47
#: bzrlib/builtins.py:218
48
msgid ""
49
"removed\n"
50
" Versioned in the previous revision but removed or deleted\n"
51
" in the working copy."
52
msgstr ""
53
54
#: bzrlib/builtins.py:222
55
msgid ""
56
"renamed\n"
57
" Path of this file changed from the previous revision;\n"
58
" the text may also have changed. This includes files whose\n"
59
" parent directory was renamed."
60
msgstr ""
61
62
#: bzrlib/builtins.py:227
63
msgid ""
64
"modified\n"
65
" Text has changed since the previous revision."
66
msgstr ""
67
68
#: bzrlib/builtins.py:230
69
msgid ""
70
"kind changed\n"
71
" File kind has been changed (e.g. from file to directory)."
72
msgstr ""
73
74
#: bzrlib/builtins.py:233
75
msgid ""
76
"unknown\n"
77
" Not versioned and not matching an ignore pattern."
78
msgstr ""
79
80
#: bzrlib/builtins.py:236
81
msgid ""
82
"Additionally for directories, symlinks and files with a changed\n"
83
"executable bit, Bazaar indicates their type using a trailing\n"
84
"character: '/', '@' or '*' respectively. These decorations can be\n"
85
"disabled using the '--no-classify' option."
86
msgstr ""
87
88
#: bzrlib/builtins.py:241
89
msgid ""
90
"To see ignored files use 'bzr ignored'. For details on the\n"
91
"changes to file texts, use 'bzr diff'."
92
msgstr ""
93
94
#: bzrlib/builtins.py:244
95
msgid ""
96
"Note that --short or -S gives status flags for each item, similar\n"
97
"to Subversion's status command. To get output similar to svn -q,\n"
98
"use bzr status -SV."
99
msgstr ""
100
101
#: bzrlib/builtins.py:248
102
msgid ""
103
"If no arguments are specified, the status of the entire working\n"
104
"directory is shown. Otherwise, only the status of the specified\n"
105
"files or directories is reported. If a directory is given, status\n"
106
"is reported for everything inside that directory."
107
msgstr ""
108
109
#: bzrlib/builtins.py:253
110
msgid ""
111
"Before merges are committed, the pending merge tip revisions are\n"
112
"shown. To see all pending merge revisions, use the -v option.\n"
113
"To skip the display of pending merge information altogether, use\n"
114
"the no-pending option or specify a file/directory."
115
msgstr ""
116
117
#: bzrlib/builtins.py:258
118
msgid ""
119
"To compare the working directory to a specific revision, pass a\n"
120
"single revision to the revision argument."
121
msgstr ""
122
123
#: bzrlib/builtins.py:261
124
msgid ""
125
"To see which files have changed in a specific revision, or between\n"
126
"two revisions, pass a revision range to the revision argument.\n"
127
"This will produce the same results as calling 'bzr diff --summarize'."
128
msgstr ""
129
130
# help of 'short' option of 'status' command
131
#: bzrlib/builtins.py:270
132
msgid "Use short status indicators."
133
msgstr ""
134
135
# help of 'versioned' option of 'status' command
136
#: bzrlib/builtins.py:272
137
msgid "Only show versioned files."
138
msgstr ""
139
140
# help of 'no-pending' option of 'status' command
141
#: bzrlib/builtins.py:274
142
msgid "Don't show pending merges."
143
msgstr ""
144
145
# help of 'no-classify' option of 'status' command
146
#: bzrlib/builtins.py:277
147
msgid "Do not mark object type using indicator."
148
msgstr ""
149
150
#: bzrlib/builtins.py:292
151
msgid "bzr status --revision takes exactly one or two revision specifiers"
152
msgstr ""
153
154
#: bzrlib/builtins.py:336 bzrlib/builtins.py:4875
155
msgid "You can only supply one of revision_id or --revision"
156
msgstr ""
157
158
#: bzrlib/builtins.py:339 bzrlib/builtins.py:4877
159
msgid "You must supply either --revision or a revision_id"
160
msgstr ""
161
162
#: bzrlib/builtins.py:346
163
#, python-format
164
msgid "Repository %r does not support access to raw revision texts"
165
msgstr ""
166
167
#: bzrlib/builtins.py:357
168
#, python-format
169
msgid "The repository %s contains no revision %s."
170
msgstr ""
171
172
#: bzrlib/builtins.py:364
173
msgid "You cannot specify a NULL revision."
174
msgstr ""
175
176
#: bzrlib/builtins.py:456
177
msgid "Remove the working tree from a given branch/checkout."
178
msgstr ""
179
180
#: bzrlib/builtins.py:458
181
msgid ""
182
"Since a lightweight checkout is little more than a working tree\n"
183
"this will refuse to run against one."
184
msgstr ""
185
186
#: bzrlib/builtins.py:461
187
msgid "To re-create the working tree, use \"bzr checkout\"."
188
msgstr ""
189
190
# help of 'force' option of 'remove-tree' command
191
#: bzrlib/builtins.py:467
192
msgid "Remove the working tree even if it has uncommitted or shelved changes."
193
msgstr ""
194
195
#: bzrlib/builtins.py:481
196
msgid "No working tree to remove"
197
msgstr ""
198
199
#: bzrlib/builtins.py:483
200
msgid "You cannot remove the working tree of a remote path"
201
msgstr ""
202
203
#: bzrlib/builtins.py:492
204
msgid "You cannot remove the working tree from a lightweight checkout"
205
msgstr ""
206
207
#: bzrlib/builtins.py:532
208
msgid ""
209
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
210
"instead. Use \"--force\" if you are sure you want to reset the working tree."
211
msgstr ""
212
213
#: bzrlib/builtins.py:543
214
msgid ""
215
", the header appears corrupt, try passing -r -1 to set the state to the last "
216
"commit"
217
msgstr ""
218
219
#: bzrlib/builtins.py:547
220
msgid "failed to reset the tree state{0}"
221
msgstr ""
222
223
#: bzrlib/builtins.py:551
224
msgid "Show current revision number."
225
msgstr ""
226
227
#: bzrlib/builtins.py:553
228
msgid "This is equal to the number of revisions on this branch."
229
msgstr ""
230
231
# help of 'tree' option of 'revno' command
232
#: bzrlib/builtins.py:594
233
msgid "Show revno of working tree"
234
msgstr ""
235
236
#: bzrlib/builtins.py:642
237
msgid "Add specified files or directories."
238
msgstr ""
239
240
#: bzrlib/builtins.py:644
241
msgid ""
242
"In non-recursive mode, all the named items are added, regardless\n"
243
"of whether they were previously ignored. A warning is given if\n"
244
"any of the named files are already versioned."
245
msgstr ""
246
247
#: bzrlib/builtins.py:648
248
msgid ""
249
"In recursive mode (the default), files are treated the same way\n"
250
"but the behaviour for directories is different. Directories that\n"
251
"are already versioned do not give a warning. All directories,\n"
252
"whether already versioned or not, are searched for files or\n"
253
"subdirectories that are neither versioned or ignored, and these\n"
254
"are added. This search proceeds recursively into versioned\n"
255
"directories. If no names are given '.' is assumed."
256
msgstr ""
257
258
#: bzrlib/builtins.py:656
259
msgid ""
260
"Therefore simply saying 'bzr add' will version all files that\n"
261
"are currently unknown."
262
msgstr ""
263
264
#: bzrlib/builtins.py:659
265
msgid ""
266
"Adding a file whose parent directory is not versioned will\n"
267
"implicitly add the parent, and so on up to the root. This means\n"
268
"you should never need to explicitly add a directory, they'll just\n"
269
"get added when you add a file in the directory."
270
msgstr ""
271
272
#: bzrlib/builtins.py:664
273
msgid ""
274
"--dry-run will show which files would be added, but not actually\n"
275
"add them."
276
msgstr ""
277
278
#: bzrlib/builtins.py:667
279
msgid ""
280
"--file-ids-from will try to use the file ids from the supplied path.\n"
281
"It looks up ids trying to find a matching parent directory with the\n"
282
"same filename, and then by pure path. This option is rarely needed\n"
283
"but can be useful when adding the same logical file into two\n"
284
"branches that will be merged later (without showing the two different\n"
285
"adds as a conflict). It is also useful when merging another project\n"
286
"into a subdirectory of this one."
287
msgstr ""
288
289
#: bzrlib/builtins.py:675
290
msgid ""
291
"Any files matching patterns in the ignore list will not be added\n"
292
"unless they are explicitly mentioned."
293
msgstr ""
294
295
#: bzrlib/builtins.py:678
296
msgid ""
297
"In recursive mode, files larger than the configuration option \n"
298
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
299
"to file size."
300
msgstr ""
301
302
# help of 'no-recurse' option of 'add' command
303
#: bzrlib/builtins.py:685
304
msgid "Don't recursively add the contents of directories."
305
msgstr ""
306
307
# help of 'file-ids-from' option of 'add' command
308
#: bzrlib/builtins.py:691
309
msgid "Lookup file ids from this tree."
310
msgstr ""
311
312
#: bzrlib/builtins.py:726
313
#, python-format
314
msgid "ignored %s matching \"%s\"\n"
315
msgstr ""
316
317
#: bzrlib/builtins.py:731
318
msgid "Create a new versioned directory."
319
msgstr ""
320
321
#: bzrlib/builtins.py:733
322
msgid "This is equivalent to creating the directory and then adding it."
323
msgstr ""
324
325
#: bzrlib/builtins.py:747
326
#, python-format
327
msgid "added %s\n"
328
msgstr ""
329
330
#: bzrlib/builtins.py:791
331
#, python-format
332
msgid "invalid kind %r specified"
333
msgstr ""
334
335
#: bzrlib/builtins.py:828
336
msgid "Move or rename a file."
337
msgstr ""
338
339
#: bzrlib/builtins.py:830
340
msgid " bzr mv SOURCE... DESTINATION"
341
msgstr ""
342
343
#: bzrlib/builtins.py:832
344
msgid ""
345
"If the last argument is a versioned directory, all the other names\n"
346
"are moved into it. Otherwise, there must be exactly two arguments\n"
347
"and the file is changed to a new name."
348
msgstr ""
349
350
#: bzrlib/builtins.py:836
351
msgid ""
352
"If OLDNAME does not exist on the filesystem but is versioned and\n"
353
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
354
"assumes that the file has been manually moved and only updates\n"
355
"its internal inventory to reflect that change.\n"
356
"The same is valid when moving many SOURCE files to a DESTINATION."
357
msgstr ""
358
359
#: bzrlib/builtins.py:842
360
msgid "Files cannot be moved between branches."
361
msgstr ""
362
363
# help of 'after' option of 'mv' command
364
#: bzrlib/builtins.py:849
365
msgid ""
366
"Move only the bzr identifier of the file, because the file has already been "
367
"moved."
368
msgstr ""
369
370
# help of 'auto' option of 'mv' command
371
#: bzrlib/builtins.py:851
372
msgid "Automatically guess renames."
373
msgstr ""
374
375
# help of 'dry-run' option of 'mv' command
376
#: bzrlib/builtins.py:852
377
msgid "Avoid making changes when guessing renames."
378
msgstr ""
379
380
#: bzrlib/builtins.py:861
381
msgid "--dry-run requires --auto."
382
msgstr ""
383
384
#: bzrlib/builtins.py:865
385
msgid "missing file argument"
386
msgstr ""
387
388
#: bzrlib/builtins.py:872
389
msgid "Only one path may be specified to --auto."
390
msgstr ""
391
392
#: bzrlib/builtins.py:875
393
msgid "--after cannot be specified with --auto."
394
msgstr ""
395
396
#: bzrlib/builtins.py:912
397
msgid "to mv multiple files the destination must be a versioned directory"
398
msgstr ""
399
400
#: bzrlib/builtins.py:964
401
msgid "Turn this branch into a mirror of another branch."
402
msgstr ""
403
404
#: bzrlib/builtins.py:966
405
msgid ""
406
"By default, this command only works on branches that have not diverged.\n"
407
"Branches are considered diverged if the destination branch's most recent \n"
408
"commit is one that has not been merged (directly or indirectly) into the \n"
409
"parent."
410
msgstr ""
411
412
#: bzrlib/builtins.py:971
413
msgid ""
414
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
415
"from one into the other. Once one branch has merged, the other should\n"
416
"be able to pull it again."
417
msgstr ""
418
419
#: bzrlib/builtins.py:975
420
msgid ""
421
"If you want to replace your local changes and just want your branch to\n"
422
"match the remote one, use pull --overwrite. This will work even if the two\n"
423
"branches have diverged."
424
msgstr ""
425
426
#: bzrlib/builtins.py:979
427
msgid ""
428
"If there is no default location set, the first pull will set it (use\n"
429
"--no-remember to avoid setting it). After that, you can omit the\n"
430
"location to use the default. To change the default, use --remember. The\n"
431
"value will only be saved if the remote location can be accessed."
432
msgstr ""
433
434
#: bzrlib/builtins.py:984
435
msgid ""
436
"Note: The location can be specified either in the form of a branch,\n"
437
"or in the form of a path to a file containing a merge directive generated\n"
438
"with bzr send."
439
msgstr ""
440
441
# help of 'verbose' option of 'pull' command
442
#: bzrlib/builtins.py:992
443
msgid "Show logs of pulled revisions."
444
msgstr ""
445
446
# help of 'directory' option of 'pull' command
447
#: bzrlib/builtins.py:994
448
msgid ""
449
"Branch to pull into, rather than the one containing the working directory."
450
msgstr ""
451
452
# help of 'local' option of 'pull' command
453
#: bzrlib/builtins.py:997
454
msgid ""
455
"Perform a local pull in a bound branch. Local pulls are not applied to the "
456
"master branch."
457
msgstr ""
458
459
#: bzrlib/builtins.py:1026
460
msgid "Need working tree for --show-base."
461
msgstr ""
462
463
#: bzrlib/builtins.py:1042
464
msgid "No pull location known or specified."
465
msgstr ""
466
467
#: bzrlib/builtins.py:1048
468
#, python-format
469
msgid "Using saved parent location: %s\n"
470
msgstr ""
471
472
#: bzrlib/builtins.py:1055 bzrlib/builtins.py:4107
473
msgid "Cannot use -r with merge directives or bundles"
474
msgstr ""
475
476
#: bzrlib/builtins.py:1096
477
msgid "Update a mirror of this branch."
478
msgstr ""
479
480
#: bzrlib/builtins.py:1098
481
msgid ""
482
"The target branch will not have its working tree populated because this\n"
483
"is both expensive, and is not supported on remote file systems."
484
msgstr ""
485
486
#: bzrlib/builtins.py:1101
487
msgid ""
488
"Some smart servers or protocols *may* put the working tree in place in\n"
489
"the future."
490
msgstr ""
491
492
#: bzrlib/builtins.py:1104
493
msgid ""
494
"This command only works on branches that have not diverged. Branches are\n"
495
"considered diverged if the destination branch's most recent commit is one\n"
496
"that has not been merged (directly or indirectly) by the source branch."
497
msgstr ""
498
499
#: bzrlib/builtins.py:1108
500
msgid ""
501
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
502
"the other branch completely, discarding its unmerged changes."
503
msgstr ""
504
505
#: bzrlib/builtins.py:1111
506
msgid ""
507
"If you want to ensure you have the different changes in the other branch,\n"
508
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
509
"After that you will be able to do a push without '--overwrite'."
510
msgstr ""
511
512
#: bzrlib/builtins.py:1115
513
msgid ""
514
"If there is no default push location set, the first push will set it (use\n"
515
"--no-remember to avoid setting it). After that, you can omit the\n"
516
"location to use the default. To change the default, use --remember. The\n"
517
"value will only be saved if the remote location can be accessed."
518
msgstr ""
519
520
# help of 'directory' option of 'push' command
521
#: bzrlib/builtins.py:1127
522
msgid ""
523
"Branch to push from, rather than the one containing the working directory."
524
msgstr ""
525
526
# help of 'use-existing-dir' option of 'push' command
527
#: bzrlib/builtins.py:1130
528
msgid ""
529
"By default push will fail if the target directory exists, but does not "
530
"already have a control directory. This flag will allow push to proceed."
531
msgstr ""
532
533
# help of 'stacked' option of 'push' command
534
#: bzrlib/builtins.py:1135
535
msgid ""
536
"Create a stacked branch that references the public location of the parent "
537
"branch."
538
msgstr ""
539
540
# help of 'stacked-on' option of 'push' command
541
#: bzrlib/builtins.py:1138
542
msgid ""
543
"Create a stacked branch that refers to another branch for the commit "
544
"history. Only the work not present in the referenced branch is included in "
545
"the branch created."
546
msgstr ""
547
548
# help of 'strict' option of 'push' command
549
#: bzrlib/builtins.py:1143
550
msgid ""
551
"Refuse to push if there are uncommitted changes in the working tree, --no-"
552
"strict disables the check."
553
msgstr ""
554
555
# help of 'no-tree' option of 'push' command
556
#: bzrlib/builtins.py:1146
557
msgid "Don't populate the working tree, even for protocols that support it."
558
msgstr ""
559
560
#: bzrlib/builtins.py:1190
561
msgid "Could not determine branch to refer to."
562
msgstr ""
563
564
#: bzrlib/builtins.py:1197
565
msgid "No push location known or specified."
566
msgstr ""
567
568
#: bzrlib/builtins.py:1201
569
#, python-format
570
msgid "Using saved push location: %s"
571
msgstr ""
572
573
#: bzrlib/builtins.py:1211
574
msgid "Create a new branch that is a copy of an existing branch."
575
msgstr ""
576
577
#: bzrlib/builtins.py:1213
578
msgid ""
579
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
580
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
581
"bar.\n"
582
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
583
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
584
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
585
"create ./foo-bar."
586
msgstr ""
587
588
#: bzrlib/builtins.py:1220
589
msgid ""
590
"To retrieve the branch as of a particular revision, supply the --revision\n"
591
"parameter, as in \"branch foo/bar -r 5\"."
592
msgstr ""
593
594
#: bzrlib/builtins.py:1223
595
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
596
msgstr ""
597
598
# help of 'no-tree' option of 'branch' command
599
#: bzrlib/builtins.py:1233
600
msgid "Create a branch without a working-tree."
601
msgstr ""
602
603
# help of 'switch' option of 'branch' command
604
#: bzrlib/builtins.py:1235
605
msgid "Switch the checkout in the current directory to the new branch."
606
msgstr ""
607
608
# help of 'stacked' option of 'branch' command
609
#: bzrlib/builtins.py:1238
610
msgid ""
611
"Create a stacked branch referring to the source branch. The new branch will "
612
"depend on the availability of the source branch for all operations."
613
msgstr ""
614
615
# help of 'standalone' option of 'branch' command
616
#: bzrlib/builtins.py:1242
617
msgid "Do not use a shared repository, even if available."
618
msgstr ""
619
620
# help of 'use-existing-dir' option of 'branch' command
621
#: bzrlib/builtins.py:1244
622
msgid ""
623
"By default branch will fail if the target directory exists, but does not "
624
"already have a control directory. This flag will allow branch to proceed."
625
msgstr ""
626
627
# help of 'bind' option of 'branch' command
628
#: bzrlib/builtins.py:1249
629
msgid "Bind new branch to from location."
630
msgstr ""
631
632
#: bzrlib/builtins.py:1290
633
#, python-format
634
msgid "Target directory \"%s\" already exists."
635
msgstr ""
636
637
#: bzrlib/builtins.py:1300
638
#, python-format
639
msgid "Parent of \"%s\" does not exist."
640
msgstr ""
641
642
#: bzrlib/builtins.py:1314
643
#, python-format
644
msgid "The branch %s has no revision %s."
645
msgstr ""
646
647
#: bzrlib/builtins.py:1322
648
#, python-format
649
msgid "Created new stacked branch referring to %s."
650
msgstr ""
651
652
#: bzrlib/builtins.py:1326
653
#, python-format
654
msgid "Branched %d revision(s)."
655
msgstr ""
656
657
#: bzrlib/builtins.py:1331
658
#, python-format
659
msgid "New branch bound to %s"
660
msgstr ""
661
662
#: bzrlib/builtins.py:1336 bzrlib/builtins.py:5916
663
#, python-format
664
msgid "Switched to branch: %s"
665
msgstr ""
666
667
#: bzrlib/builtins.py:1341
668
msgid "List the branches available at the current location."
669
msgstr ""
670
671
#: bzrlib/builtins.py:1343
672
msgid ""
673
"This command will print the names of all the branches at the current "
674
"location."
675
msgstr ""
676
677
#: bzrlib/builtins.py:1352
678
msgid " (default)\n"
679
msgstr ""
680
681
#: bzrlib/builtins.py:1358
682
msgid "Create a new checkout of an existing branch."
683
msgstr ""
684
685
#: bzrlib/builtins.py:1360
686
msgid ""
687
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
688
"for\n"
689
"the branch found in '.'. This is useful if you have removed the working "
690
"tree\n"
691
"or if it was never created - i.e. if you pushed the branch to its current\n"
692
"location using SFTP."
693
msgstr ""
694
695
#: bzrlib/builtins.py:1365
696
msgid ""
697
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
698
"will\n"
699
"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./"
700
"bar.\n"
701
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
702
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
703
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
704
"create ./foo-bar."
705
msgstr ""
706
707
#: bzrlib/builtins.py:1372
708
msgid ""
709
"To retrieve the branch as of a particular revision, supply the --revision\n"
710
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
711
"immediately\n"
712
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
713
"old\n"
714
"code.)"
715
msgstr ""
716
717
# help of 'lightweight' option of 'checkout' command
718
#: bzrlib/builtins.py:1382
719
msgid ""
720
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
721
"the branch for every operation. Normal checkouts can perform common "
722
"operations like diff and status without such access, and also support local "
723
"commits."
724
msgstr ""
725
726
# help of 'files-from' option of 'branch' command
727
#: bzrlib/builtins.py:1389
728
msgid "Get file contents from this tree."
729
msgstr ""
730
731
# help of 'hardlink' option of 'branch' command
732
#: bzrlib/builtins.py:1391
733
msgid "Hard-link working tree files where possible."
734
msgstr ""
735
736
#: bzrlib/builtins.py:1432
737
msgid ""
738
"Show list of renamed files.\n"
739
" "
740
msgstr ""
741
742
#: bzrlib/builtins.py:1462
743
msgid "Update a tree to have the latest code committed to its branch."
744
msgstr ""
745
746
#: bzrlib/builtins.py:1464
747
msgid ""
748
"This will perform a merge into the working tree, and may generate\n"
749
"conflicts. If you have any local changes, you will still\n"
750
"need to commit them after the update for the update to be complete."
751
msgstr ""
752
753
#: bzrlib/builtins.py:1468
754
msgid ""
755
"If you want to discard your local changes, you can just do a\n"
756
"'bzr revert' instead of 'bzr commit' after the update."
757
msgstr ""
758
759
#: bzrlib/builtins.py:1471
760
msgid ""
761
"If you want to restore a file that has been removed locally, use\n"
762
"'bzr revert' instead of 'bzr update'."
763
msgstr ""
764
765
#: bzrlib/builtins.py:1474
766
msgid ""
767
"If the tree's branch is bound to a master branch, it will also update\n"
768
"the branch from the master."
769
msgstr ""
770
771
#: bzrlib/builtins.py:1489
772
msgid "bzr update --revision takes exactly one revision"
773
msgstr ""
774
775
#: bzrlib/builtins.py:1520
776
#, python-format
777
msgid "Tree is up to date at revision %s of branch %s"
778
msgstr ""
779
780
#: bzrlib/builtins.py:1536
781
#, python-format
782
msgid ""
783
"branch has no revision %s\n"
784
"bzr update --revision only works for a revision in the branch history"
785
msgstr ""
786
787
#: bzrlib/builtins.py:1542
788
#, python-format
789
msgid "Updated to revision %s of branch %s"
790
msgstr ""
791
792
#: bzrlib/builtins.py:1546
793
msgid ""
794
"Your local commits will now show as pending merges with 'bzr status', and "
795
"can be committed with 'bzr commit'."
796
msgstr ""
797
798
#: bzrlib/builtins.py:1555
799
msgid "Show information about a working tree, branch or repository."
800
msgstr ""
801
802
#: bzrlib/builtins.py:1557
803
msgid ""
804
"This command will show all known locations and formats associated to the\n"
805
"tree, branch or repository."
806
msgstr ""
807
808
#: bzrlib/builtins.py:1560
809
msgid ""
810
"In verbose mode, statistical information is included with each report.\n"
811
"To see extended statistic information, use a verbosity level of 2 or\n"
812
"higher by specifying the verbose option multiple times, e.g. -vv."
813
msgstr ""
814
815
#: bzrlib/builtins.py:1564
816
msgid "Branches and working trees will also report any missing revisions."
817
msgstr ""
818
819
#: bzrlib/builtins.py:1568
820
msgid " Display information on the format and related locations:"
821
msgstr ""
822
823
#: bzrlib/builtins.py:1570
824
msgid " bzr info"
825
msgstr ""
826
827
#: bzrlib/builtins.py:1572
828
msgid ""
829
" Display the above together with extended format information and\n"
830
" basic statistics (like the number of files in the working tree and\n"
831
" number of revisions in the branch and repository):"
832
msgstr ""
833
834
#: bzrlib/builtins.py:1576
835
msgid " bzr info -v"
836
msgstr ""
837
838
#: bzrlib/builtins.py:1578
839
msgid " Display the above together with number of committers to the branch:"
840
msgstr ""
841
842
#: bzrlib/builtins.py:1580
843
msgid " bzr info -vv"
844
msgstr ""
845
846
#: bzrlib/builtins.py:1599
847
msgid "Remove files or directories."
848
msgstr ""
849
850
#: bzrlib/builtins.py:1601
851
msgid ""
852
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
853
"delete them if they can easily be recovered using revert otherwise they\n"
854
"will be backed up (adding an extention of the form .~#~). If no options or\n"
855
"parameters are given Bazaar will scan for files that are being tracked by\n"
856
"Bazaar but missing in your tree and stop tracking them for you."
857
msgstr ""
858
859
# help of 'new' option of 'remove' command
860
#: bzrlib/builtins.py:1609
861
msgid "Only remove files that have never been committed."
862
msgstr ""
863
864
# help of 'file-deletion-strategy' option of 'remove' command
865
#: bzrlib/builtins.py:1611
866
msgid "The file deletion mode to be used."
867
msgstr ""
868
869
# title of 'file-deletion-strategy' option of 'remove' command
870
#: bzrlib/builtins.py:1612
871
msgid "Deletion Strategy"
872
msgstr ""
873
874
#: bzrlib/builtins.py:1625
875
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
876
msgstr ""
877
878
#: bzrlib/builtins.py:1642
879
msgid "No matching files."
880
msgstr ""
881
882
#: bzrlib/builtins.py:1703
883
msgid "Reconcile bzr metadata in a branch."
884
msgstr ""
885
886
#: bzrlib/builtins.py:1705
887
msgid ""
888
"This can correct data mismatches that may have been caused by\n"
889
"previous ghost operations or bzr upgrades. You should only\n"
890
"need to run this command if 'bzr check' or a bzr developer\n"
891
"advises you to run it."
892
msgstr ""
893
894
#: bzrlib/builtins.py:1710
895
msgid ""
896
"If a second branch is provided, cross-branch reconciliation is\n"
897
"also attempted, which will check that data like the tree root\n"
898
"id which was not present in very early bzr versions is represented\n"
899
"correctly in both branches."
900
msgstr ""
901
902
#: bzrlib/builtins.py:1715
903
msgid ""
904
"At the same time it is run it may recompress data resulting in\n"
905
"a potential saving in disk space or performance gain."
906
msgstr ""
907
908
#: bzrlib/builtins.py:1718
909
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
910
msgstr ""
911
912
#: bzrlib/builtins.py:1782
913
msgid "Make a directory into a versioned branch."
914
msgstr ""
915
916
#: bzrlib/builtins.py:1784
917
msgid ""
918
"Use this to create an empty branch, or before importing an\n"
919
"existing project."
920
msgstr ""
921
922
#: bzrlib/builtins.py:1787
923
msgid ""
924
"If there is a repository in a parent directory of the location, then\n"
925
"the history of the branch will be stored in the repository. Otherwise\n"
926
"init creates a standalone branch which carries its own history\n"
927
"in the .bzr directory."
928
msgstr ""
929
930
#: bzrlib/builtins.py:1792
931
msgid ""
932
"If there is already a branch at the location but it has no working tree,\n"
933
"the tree can be populated with 'bzr checkout'."
934
msgstr ""
935
936
#: bzrlib/builtins.py:1795
937
msgid "Recipe for importing a tree of files::"
938
msgstr ""
939
940
#: bzrlib/builtins.py:1797
941
msgid ""
942
" cd ~/project\n"
943
" bzr init\n"
944
" bzr add .\n"
945
" bzr status\n"
946
" bzr commit -m \"imported project\""
947
msgstr ""
948
949
# help of 'create-prefix' option of 'init' command
950
#: bzrlib/builtins.py:1808
951
msgid "Create the path leading up to the branch if it does not already exist."
952
msgstr ""
953
954
# help of 'format' option of 'init' command
955
#: bzrlib/builtins.py:1811
956
msgid "Specify a format for this branch. See \"help formats\"."
957
msgstr ""
958
959
# help of 'append-revisions-only' option of 'init' command
960
#: bzrlib/builtins.py:1819
961
msgid "Never change revnos or the existing log. Append revisions to it only."
962
msgstr ""
963
964
# help of 'no-tree' option of 'init' command
965
#: bzrlib/builtins.py:1822
966
msgid "Create a branch without a working tree."
967
msgstr ""
968
969
#: bzrlib/builtins.py:1842
970
#, python-format
971
msgid ""
972
"Parent directory of %s does not exist.\n"
973
"You may supply --create-prefix to create all leading parent directories."
974
msgstr ""
975
976
#: bzrlib/builtins.py:1876
977
msgid ""
978
"This branch format cannot be set to append-revisions-only. Try --default."
979
msgstr ""
980
981
#: bzrlib/builtins.py:1887
982
#, python-format
983
msgid "Created a %s (format: %s)\n"
984
msgstr ""
985
986
#: bzrlib/builtins.py:1895
987
#, python-format
988
msgid "Using shared repository: %s\n"
989
msgstr ""
990
991
#: bzrlib/builtins.py:1899
992
msgid "Create a shared repository for branches to share storage space."
993
msgstr ""
994
995
#: bzrlib/builtins.py:1901
996
msgid ""
997
"New branches created under the repository directory will store their\n"
998
"revisions in the repository, not in the branch directory. For branches\n"
999
"with shared history, this reduces the amount of storage needed and \n"
1000
"speeds up the creation of new branches."
1001
msgstr ""
1002
1003
#: bzrlib/builtins.py:1906
1004
msgid ""
1005
"If the --no-trees option is given then the branches in the repository\n"
1006
"will not have working trees by default. They will still exist as \n"
1007
"directories on disk, but they will not have separate copies of the \n"
1008
"files at a certain revision. This can be useful for repositories that\n"
1009
"store branches which are interacted with through checkouts or remote\n"
1010
"branches, such as on a server."
1011
msgstr ""
1012
1013
#: bzrlib/builtins.py:1913
1014
msgid ""
1015
":Examples:\n"
1016
" Create a shared repository holding just branches::"
1017
msgstr ""
1018
1019
#: bzrlib/builtins.py:1916
1020
msgid ""
1021
" bzr init-repo --no-trees repo\n"
1022
" bzr init repo/trunk"
1023
msgstr ""
1024
1025
#: bzrlib/builtins.py:1919
1026
msgid " Make a lightweight checkout elsewhere::"
1027
msgstr ""
1028
1029
#: bzrlib/builtins.py:1921
1030
msgid ""
1031
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1032
" cd trunk-checkout\n"
1033
" (add files here)"
1034
msgstr ""
1035
1036
# help of 'format' option of 'init-repository' command
1037
#: bzrlib/builtins.py:1929
1038
msgid ""
1039
"Specify a format for this repository. See \"bzr help formats\" for details."
1040
msgstr ""
1041
1042
# title of 'format' option of 'init-repository' command
1043
#: bzrlib/builtins.py:1933
1044
msgid "Repository format"
1045
msgstr ""
1046
1047
# help of 'no-trees' option of 'init-repository' command
1048
#: bzrlib/builtins.py:1935
1049
msgid "Branches in the repository will default to not having a working tree."
1050
msgstr ""
1051
1052
#: bzrlib/builtins.py:1959
1053
msgid "Show differences in the working tree, between revisions or branches."
1054
msgstr ""
1055
1056
#: bzrlib/builtins.py:1961
1057
msgid ""
1058
"If no arguments are given, all changes for the current tree are listed.\n"
1059
"If files are given, only the changes in those files are listed.\n"
1060
"Remote and multiple branches can be compared by using the --old and\n"
1061
"--new options. If not provided, the default for both is derived from\n"
1062
"the first argument, if any, or the current tree if no arguments are\n"
1063
"given."
1064
msgstr ""
1065
1066
#: bzrlib/builtins.py:1968
1067
msgid ""
1068
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1069
"produces patches suitable for \"patch -p1\"."
1070
msgstr ""
1071
1072
#: bzrlib/builtins.py:1971
1073
msgid ""
1074
"Note that when using the -r argument with a range of revisions, the\n"
1075
"differences are computed between the two specified revisions. That\n"
1076
"is, the command does not show the changes introduced by the first \n"
1077
"revision in the range. This differs from the interpretation of \n"
1078
"revision ranges used by \"bzr log\" which includes the first revision\n"
1079
"in the range."
1080
msgstr ""
1081
1082
#: bzrlib/builtins.py:1978
1083
msgid ""
1084
":Exit values:\n"
1085
" 1 - changed\n"
1086
" 2 - unrepresentable changes\n"
1087
" 3 - error\n"
1088
" 0 - no change"
1089
msgstr ""
1090
1091
#: bzrlib/builtins.py:1984
1092
msgid ""
1093
":Examples:\n"
1094
" Shows the difference in the working tree versus the last commit::"
1095
msgstr ""
1096
1097
#: bzrlib/builtins.py:1987
1098
msgid " bzr diff"
1099
msgstr ""
1100
1101
#: bzrlib/builtins.py:1989
1102
msgid " Difference between the working tree and revision 1::"
1103
msgstr ""
1104
1105
#: bzrlib/builtins.py:1991
1106
msgid " bzr diff -r1"
1107
msgstr ""
1108
1109
#: bzrlib/builtins.py:1993
1110
msgid " Difference between revision 3 and revision 1::"
1111
msgstr ""
1112
1113
#: bzrlib/builtins.py:1995
1114
msgid " bzr diff -r1..3"
1115
msgstr ""
1116
1117
#: bzrlib/builtins.py:1997
1118
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1119
msgstr ""
1120
1121
#: bzrlib/builtins.py:1999
1122
msgid " bzr diff -r1..3 xxx"
1123
msgstr ""
1124
1125
#: bzrlib/builtins.py:2001
1126
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1127
msgstr ""
1128
1129
#: bzrlib/builtins.py:2003
1130
msgid " bzr diff -c2"
1131
msgstr ""
1132
1133
#: bzrlib/builtins.py:2005
1134
msgid ""
1135
" To see the changes introduced by revision X::\n"
1136
" \n"
1137
" bzr diff -cX"
1138
msgstr ""
1139
1140
#: bzrlib/builtins.py:2009
1141
msgid ""
1142
" Note that in the case of a merge, the -c option shows the changes\n"
1143
" compared to the left hand parent. To see the changes against\n"
1144
" another parent, use::"
1145
msgstr ""
1146
1147
#: bzrlib/builtins.py:2013
1148
msgid " bzr diff -r<chosen_parent>..X"
1149
msgstr ""
1150
1151
#: bzrlib/builtins.py:2015
1152
msgid ""
1153
" The changes between the current revision and the previous revision\n"
1154
" (equivalent to -c-1 and -r-2..-1)"
1155
msgstr ""
1156
1157
#: bzrlib/builtins.py:2018
1158
msgid " bzr diff -r-2.."
1159
msgstr ""
1160
1161
#: bzrlib/builtins.py:2020
1162
msgid " Show just the differences for file NEWS::"
1163
msgstr ""
1164
1165
#: bzrlib/builtins.py:2022
1166
msgid " bzr diff NEWS"
1167
msgstr ""
1168
1169
#: bzrlib/builtins.py:2024
1170
msgid " Show the differences in working tree xxx for file NEWS::"
1171
msgstr ""
1172
1173
#: bzrlib/builtins.py:2026
1174
msgid " bzr diff xxx/NEWS"
1175
msgstr ""
1176
1177
#: bzrlib/builtins.py:2028
1178
msgid " Show the differences from branch xxx to this working tree:"
1179
msgstr ""
1180
1181
#: bzrlib/builtins.py:2030
1182
msgid " bzr diff --old xxx"
1183
msgstr ""
1184
1185
#: bzrlib/builtins.py:2032
1186
msgid " Show the differences between two branches for file NEWS::"
1187
msgstr ""
1188
1189
#: bzrlib/builtins.py:2034
1190
msgid " bzr diff --old xxx --new yyy NEWS"
1191
msgstr ""
1192
1193
#: bzrlib/builtins.py:2036
1194
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1195
msgstr ""
1196
1197
#: bzrlib/builtins.py:2038
1198
msgid ""
1199
" bzr diff --prefix old/:new/\n"
1200
" \n"
1201
" Show the differences using a custom diff program with options::\n"
1202
" \n"
1203
" bzr diff --using /usr/bin/diff --diff-options -wu"
1204
msgstr ""
1205
1206
# help of 'diff-options' option of 'diff' command
1207
#: bzrlib/builtins.py:2048
1208
msgid "Pass these options to the external diff program."
1209
msgstr ""
1210
1211
# help of 'prefix' option of 'diff' command
1212
#: bzrlib/builtins.py:2051
1213
msgid ""
1214
"Set prefixes added to old and new filenames, as two values separated by a "
1215
"colon. (eg \"old/:new/\")."
1216
msgstr ""
1217
1218
# help of 'old' option of 'diff' command
1219
#: bzrlib/builtins.py:2054
1220
msgid "Branch/tree to compare from."
1221
msgstr ""
1222
1223
# help of 'new' option of 'diff' command
1224
#: bzrlib/builtins.py:2058
1225
msgid "Branch/tree to compare to."
1226
msgstr ""
1227
1228
# help of 'using' option of 'diff' command
1229
#: bzrlib/builtins.py:2064
1230
msgid "Use this command to compare files."
1231
msgstr ""
1232
1233
# help of 'format' option of 'diff' command
1234
#: bzrlib/builtins.py:2069
1235
msgid "Diff format to use."
1236
msgstr ""
1237
1238
# title of 'format' option of 'diff' command
1239
#: bzrlib/builtins.py:2071
1240
msgid "Diff format"
1241
msgstr ""
1242
1243
#: bzrlib/builtins.py:2093
1244
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1245
msgstr ""
1246
1247
#: bzrlib/builtins.py:2097
1248
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1249
msgstr ""
1250
1251
#: bzrlib/builtins.py:2101
1252
msgid "--using and --format are mutually exclusive."
1253
msgstr ""
1254
1255
#: bzrlib/builtins.py:2121
1256
msgid ""
1257
"List files deleted in the working tree.\n"
1258
" "
1259
msgstr ""
1260
1261
#: bzrlib/builtins.py:2199
1262
msgid "Show the tree root directory."
1263
msgstr ""
1264
1265
#: bzrlib/builtins.py:2201
1266
msgid ""
1267
"The root is the nearest enclosing directory with a .bzr control\n"
1268
"directory."
1269
msgstr ""
1270
1271
#: bzrlib/builtins.py:2216
1272
msgid "The limit argument must be an integer."
1273
msgstr ""
1274
1275
#: bzrlib/builtins.py:2224
1276
msgid "The levels argument must be an integer."
1277
msgstr ""
1278
1279
#: bzrlib/builtins.py:2229
1280
msgid "Show historical log for a branch or subset of a branch."
1281
msgstr ""
1282
1283
#: bzrlib/builtins.py:2231
1284
msgid ""
1285
"log is bzr's default tool for exploring the history of a branch.\n"
1286
"The branch to use is taken from the first parameter. If no parameters\n"
1287
"are given, the branch containing the working directory is logged.\n"
1288
"Here are some simple examples::"
1289
msgstr ""
1290
1291
#: bzrlib/builtins.py:2236
1292
msgid ""
1293
" bzr log log the current branch\n"
1294
" bzr log foo.py log a file in its branch\n"
1295
" bzr log http://server/branch log a branch on a server"
1296
msgstr ""
1297
1298
#: bzrlib/builtins.py:2240
1299
msgid ""
1300
"The filtering, ordering and information shown for each revision can\n"
1301
"be controlled as explained below. By default, all revisions are\n"
1302
"shown sorted (topologically) so that newer revisions appear before\n"
1303
"older ones and descendants always appear before ancestors. If displayed,\n"
1304
"merged revisions are shown indented under the revision in which they\n"
1305
"were merged."
1306
msgstr ""
1307
1308
#: bzrlib/builtins.py:2247
1309
msgid ":Output control:"
1310
msgstr ""
1311
1312
#: bzrlib/builtins.py:2249
1313
msgid ""
1314
" The log format controls how information about each revision is\n"
1315
" displayed. The standard log formats are called ``long``, ``short``\n"
1316
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1317
" for more details on log formats."
1318
msgstr ""
1319
1320
#: bzrlib/builtins.py:2254
1321
msgid ""
1322
" The following options can be used to control what information is\n"
1323
" displayed::"
1324
msgstr ""
1325
1326
#: bzrlib/builtins.py:2257
1327
msgid ""
1328
" -l N display a maximum of N revisions\n"
1329
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1330
" -v display a status summary (delta) for each revision\n"
1331
" -p display a diff (patch) for each revision\n"
1332
" --show-ids display revision-ids (and file-ids), not just revnos"
1333
msgstr ""
1334
1335
#: bzrlib/builtins.py:2263
1336
msgid ""
1337
" Note that the default number of levels to display is a function of the\n"
1338
" log format. If the -n option is not used, the standard log formats show\n"
1339
" just the top level (mainline)."
1340
msgstr ""
1341
1342
#: bzrlib/builtins.py:2267
1343
msgid ""
1344
" Status summaries are shown using status flags like A, M, etc. To see\n"
1345
" the changes explained using words like ``added`` and ``modified``\n"
1346
" instead, use the -vv option."
1347
msgstr ""
1348
1349
#: bzrlib/builtins.py:2271
1350
msgid ":Ordering control:"
1351
msgstr ""
1352
1353
#: bzrlib/builtins.py:2273
1354
msgid ""
1355
" To display revisions from oldest to newest, use the --forward option.\n"
1356
" In most cases, using this option will have little impact on the total\n"
1357
" time taken to produce a log, though --forward does not incrementally\n"
1358
" display revisions like --reverse does when it can."
1359
msgstr ""
1360
1361
#: bzrlib/builtins.py:2278
1362
msgid ":Revision filtering:"
1363
msgstr ""
1364
1365
#: bzrlib/builtins.py:2280
1366
msgid ""
1367
" The -r option can be used to specify what revision or range of revisions\n"
1368
" to filter against. The various forms are shown below::"
1369
msgstr ""
1370
1371
#: bzrlib/builtins.py:2283
1372
msgid ""
1373
" -rX display revision X\n"
1374
" -rX.. display revision X and later\n"
1375
" -r..Y display up to and including revision Y\n"
1376
" -rX..Y display from X to Y inclusive"
1377
msgstr ""
1378
1379
#: bzrlib/builtins.py:2288
1380
msgid ""
1381
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1382
" Some common examples are given below::"
1383
msgstr ""
1384
1385
#: bzrlib/builtins.py:2291
1386
msgid ""
1387
" -r-1 show just the tip\n"
1388
" -r-10.. show the last 10 mainline revisions\n"
1389
" -rsubmit:.. show what's new on this branch\n"
1390
" -rancestor:path.. show changes since the common ancestor of this\n"
1391
" branch and the one at location path\n"
1392
" -rdate:yesterday.. show changes since yesterday"
1393
msgstr ""
1394
1395
#: bzrlib/builtins.py:2298
1396
msgid ""
1397
" When logging a range of revisions using -rX..Y, log starts at\n"
1398
" revision Y and searches back in history through the primary\n"
1399
" (\"left-hand\") parents until it finds X. When logging just the\n"
1400
" top level (using -n1), an error is reported if X is not found\n"
1401
" along the way. If multi-level logging is used (-n0), X may be\n"
1402
" a nested merge revision and the log will be truncated accordingly."
1403
msgstr ""
1404
1405
#: bzrlib/builtins.py:2305
1406
msgid ":Path filtering:"
1407
msgstr ""
1408
1409
#: bzrlib/builtins.py:2307
1410
msgid ""
1411
" If parameters are given and the first one is not a branch, the log\n"
1412
" will be filtered to show only those revisions that changed the\n"
1413
" nominated files or directories."
1414
msgstr ""
1415
1416
#: bzrlib/builtins.py:2311
1417
msgid ""
1418
" Filenames are interpreted within their historical context. To log a\n"
1419
" deleted file, specify a revision range so that the file existed at\n"
1420
" the end or start of the range."
1421
msgstr ""
1422
1423
#: bzrlib/builtins.py:2315
1424
msgid ""
1425
" Historical context is also important when interpreting pathnames of\n"
1426
" renamed files/directories. Consider the following example:"
1427
msgstr ""
1428
1429
#: bzrlib/builtins.py:2318
1430
msgid ""
1431
" * revision 1: add tutorial.txt\n"
1432
" * revision 2: modify tutorial.txt\n"
1433
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1434
msgstr ""
1435
1436
#: bzrlib/builtins.py:2322
1437
msgid " In this case:"
1438
msgstr ""
1439
1440
#: bzrlib/builtins.py:2324
1441
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1442
msgstr ""
1443
1444
#: bzrlib/builtins.py:2326
1445
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1446
msgstr ""
1447
1448
#: bzrlib/builtins.py:2328
1449
msgid ""
1450
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1451
" the original file in revision 2."
1452
msgstr ""
1453
1454
#: bzrlib/builtins.py:2331
1455
msgid ""
1456
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1457
" was no file called guide.txt in revision 2."
1458
msgstr ""
1459
1460
#: bzrlib/builtins.py:2334
1461
msgid ""
1462
" Renames are always followed by log. By design, there is no need to\n"
1463
" explicitly ask for this (and no way to stop logging a file back\n"
1464
" until it was last renamed)."
1465
msgstr ""
1466
1467
#: bzrlib/builtins.py:2338
1468
msgid ":Other filtering:"
1469
msgstr ""
1470
1471
#: bzrlib/builtins.py:2340
1472
msgid ""
1473
" The --match option can be used for finding revisions that match a\n"
1474
" regular expression in a commit message, committer, author or bug.\n"
1475
" Specifying the option several times will match any of the supplied\n"
1476
" expressions. --match-author, --match-bugs, --match-committer and\n"
1477
" --match-message can be used to only match a specific field."
1478
msgstr ""
1479
1480
#: bzrlib/builtins.py:2346
1481
msgid ":Tips & tricks:"
1482
msgstr ""
1483
1484
#: bzrlib/builtins.py:2348
1485
msgid ""
1486
" GUI tools and IDEs are often better at exploring history than command\n"
1487
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1488
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1489
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1490
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1491
msgstr ""
1492
1493
#: bzrlib/builtins.py:2354
1494
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1495
msgstr ""
1496
1497
#: bzrlib/builtins.py:2356
1498
msgid ""
1499
" [ALIASES]\n"
1500
" tip = log -r-1\n"
1501
" top = log -l10 --line\n"
1502
" show = log -v -p"
1503
msgstr ""
1504
1505
#: bzrlib/builtins.py:2361
1506
msgid ""
1507
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1508
" will show the last 10 mainline revisions. To see the details of a\n"
1509
" particular revision X, ``bzr show -rX``."
1510
msgstr ""
1511
1512
#: bzrlib/builtins.py:2365
1513
msgid ""
1514
" If you are interested in looking deeper into a particular merge X,\n"
1515
" use ``bzr log -n0 -rX``."
1516
msgstr ""
1517
1518
#: bzrlib/builtins.py:2368
1519
msgid ""
1520
" ``bzr log -v`` on a branch with lots of history is currently\n"
1521
" very slow. A fix for this issue is currently under development.\n"
1522
" With or without that fix, it is recommended that a revision range\n"
1523
" be given when using the -v option."
1524
msgstr ""
1525
1526
#: bzrlib/builtins.py:2373
1527
msgid ""
1528
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1529
" used to find revisions matching user names, commit messages, etc.\n"
1530
" Among other features, this plugin can find all revisions containing\n"
1531
" a list of words but not others."
1532
msgstr ""
1533
1534
#: bzrlib/builtins.py:2378
1535
msgid ""
1536
" When exploring non-mainline history on large projects with deep\n"
1537
" history, the performance of log can be greatly improved by installing\n"
1538
" the historycache plugin. This plugin buffers historical information\n"
1539
" trading disk space for faster speed."
1540
msgstr ""
1541
1542
# help of 'forward' option of 'log' command
1543
#: bzrlib/builtins.py:2387
1544
msgid "Show from oldest to newest."
1545
msgstr ""
1546
1547
# help of 'verbose' option of 'log' command
1548
#: bzrlib/builtins.py:2390
1549
msgid "Show files changed in each revision."
1550
msgstr ""
1551
1552
# help of 'change' option of 'log' command
1553
#: bzrlib/builtins.py:2396
1554
msgid "Show just the specified revision. See also \"help revisionspec\"."
1555
msgstr ""
1556
1557
# help of 'authors' option of 'log' command
1558
#: bzrlib/builtins.py:2400
1559
msgid "What names to list as authors - first, all or committer."
1560
msgstr ""
1561
1562
# title of 'authors' option of 'log' command
1563
#: bzrlib/builtins.py:2401
1564
msgid "Authors"
1565
msgstr ""
1566
1567
# help of 'levels' option of 'log' command
1568
#: bzrlib/builtins.py:2406
1569
msgid "Number of levels to display - 0 for all, 1 for flat."
1570
msgstr ""
1571
1572
# help of 'limit' option of 'log' command
1573
#: bzrlib/builtins.py:2416
1574
msgid "Limit the output to the first N revisions."
1575
msgstr ""
1576
1577
# help of 'show-diff' option of 'log' command
1578
#: bzrlib/builtins.py:2421
1579
msgid "Show changes made in each revision as a patch."
1580
msgstr ""
1581
1582
# help of 'include-merges' option of 'log' command
1583
#: bzrlib/builtins.py:2423
1584
msgid "Show merged revisions like --levels 0 does."
1585
msgstr ""
1586
1587
# help of 'exclude-common-ancestry' option of 'log' command
1588
#: bzrlib/builtins.py:2425
1589
msgid ""
1590
"Display only the revisions that are not part of both ancestries (require -"
1591
"rX..Y)"
1592
msgstr ""
1593
1594
# help of 'signatures' option of 'log' command
1595
#: bzrlib/builtins.py:2429
1596
msgid "Show digital signature validity"
1597
msgstr ""
1598
1599
# help of 'match' option of 'log' command
1600
#: bzrlib/builtins.py:2432
1601
msgid "Show revisions whose properties match this expression."
1602
msgstr ""
1603
1604
# help of 'match-message' option of 'log' command
1605
#: bzrlib/builtins.py:2436
1606
msgid "Show revisions whose message matches this expression."
1607
msgstr ""
1608
1609
# help of 'match-committer' option of 'log' command
1610
#: bzrlib/builtins.py:2440
1611
msgid "Show revisions whose committer matches this expression."
1612
msgstr ""
1613
1614
# help of 'match-author' option of 'log' command
1615
#: bzrlib/builtins.py:2444
1616
msgid "Show revisions whose authors match this expression."
1617
msgstr ""
1618
1619
# help of 'match-bugs' option of 'log' command
1620
#: bzrlib/builtins.py:2448
1621
msgid "Show revisions whose bugs match this expression."
1622
msgstr ""
1623
1624
#: bzrlib/builtins.py:2485
1625
msgid "--exclude-common-ancestry requires -r with two revisions"
1626
msgstr ""
1627
1628
#: bzrlib/builtins.py:2491
1629
msgid "--levels and --include-merges are mutually exclusive"
1630
msgstr ""
1631
1632
#: bzrlib/builtins.py:2498
1633
msgid "--revision and --change are mutually exclusive"
1634
msgstr ""
1635
1636
#: bzrlib/builtins.py:2511
1637
#, python-format
1638
msgid "Path unknown at end or start of revision range: %s"
1639
msgstr ""
1640
1641
#: bzrlib/builtins.py:2628
1642
#, python-format
1643
msgid "bzr %s doesn't accept two revisions in different branches."
1644
msgstr ""
1645
1646
#: bzrlib/builtins.py:2644
1647
#, python-format
1648
msgid "bzr %s --revision takes one or two values."
1649
msgstr ""
1650
1651
#: bzrlib/builtins.py:2689
1652
msgid ""
1653
"List files in a tree.\n"
1654
" "
1655
msgstr ""
1656
1657
# help of 'recursive' option of 'ls' command
1658
#: bzrlib/builtins.py:2698
1659
msgid "Recurse into subdirectories."
1660
msgstr ""
1661
1662
# help of 'from-root' option of 'ls' command
1663
#: bzrlib/builtins.py:2700
1664
msgid "Print paths relative to the root of the branch."
1665
msgstr ""
1666
1667
# help of 'unknown' option of 'ls' command
1668
#: bzrlib/builtins.py:2702
1669
msgid "Print unknown files."
1670
msgstr ""
1671
1672
# help of 'versioned' option of 'ls' command
1673
#: bzrlib/builtins.py:2703
1674
msgid "Print versioned files."
1675
msgstr ""
1676
1677
# help of 'ignored' option of 'ls' command
1678
#: bzrlib/builtins.py:2706
1679
msgid "Print ignored files."
1680
msgstr ""
1681
1682
# help of 'kind' option of 'ls' command
1683
#: bzrlib/builtins.py:2708
1684
msgid "List entries of a particular kind: file, directory, symlink."
1685
msgstr ""
1686
1687
#: bzrlib/builtins.py:2721
1688
msgid "invalid kind specified"
1689
msgstr ""
1690
1691
#: bzrlib/builtins.py:2724
1692
msgid "Cannot set both --verbose and --null"
1693
msgstr ""
1694
1695
#: bzrlib/builtins.py:2733
1696
msgid "cannot specify both --from-root and PATH"
1697
msgstr ""
1698
1699
#: bzrlib/builtins.py:2820
1700
msgid "Ignore specified files or patterns."
1701
msgstr ""
1702
1703
#: bzrlib/builtins.py:2822
1704
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1705
msgstr ""
1706
1707
#: bzrlib/builtins.py:2824
1708
msgid ""
1709
"If a .bzrignore file does not exist, the ignore command\n"
1710
"will create one and add the specified files or patterns to the newly\n"
1711
"created file. The ignore command will also automatically add the \n"
1712
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1713
"the use of the ignore command will require an explicit add command."
1714
msgstr ""
1715
1716
#: bzrlib/builtins.py:2830
1717
msgid ""
1718
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1719
"After adding, editing or deleting that file either indirectly by\n"
1720
"using this command or directly by using an editor, be sure to commit\n"
1721
"it."
1722
msgstr ""
1723
1724
#: bzrlib/builtins.py:2835
1725
msgid ""
1726
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1727
"the global ignore file can be found in the application data directory as\n"
1728
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1729
"Global ignores are not touched by this command. The global ignore file\n"
1730
"can be edited directly using an editor."
1731
msgstr ""
1732
1733
#: bzrlib/builtins.py:2841
1734
msgid ""
1735
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1736
"precedence over regular ignores. Such exceptions are used to specify\n"
1737
"files that should be versioned which would otherwise be ignored."
1738
msgstr ""
1739
1740
#: bzrlib/builtins.py:2845
1741
msgid ""
1742
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1743
"precedence over the '!' exception patterns."
1744
msgstr ""
1745
1746
#: bzrlib/builtins.py:2848
1747
msgid ""
1748
":Notes: \n"
1749
" \n"
1750
"* Ignore patterns containing shell wildcards must be quoted from\n"
1751
" the shell on Unix."
1752
msgstr ""
1753
1754
#: bzrlib/builtins.py:2853
1755
msgid ""
1756
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1757
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1758
msgstr ""
1759
1760
#: bzrlib/builtins.py:2856
1761
msgid ""
1762
":Examples:\n"
1763
" Ignore the top level Makefile::"
1764
msgstr ""
1765
1766
#: bzrlib/builtins.py:2859
1767
msgid " bzr ignore ./Makefile"
1768
msgstr ""
1769
1770
#: bzrlib/builtins.py:2861
1771
msgid " Ignore .class files in all directories...::"
1772
msgstr ""
1773
1774
#: bzrlib/builtins.py:2863
1775
msgid " bzr ignore \"*.class\""
1776
msgstr ""
1777
1778
#: bzrlib/builtins.py:2865
1779
msgid " ...but do not ignore \"special.class\"::"
1780
msgstr ""
1781
1782
#: bzrlib/builtins.py:2867
1783
msgid " bzr ignore \"!special.class\""
1784
msgstr ""
1785
1786
#: bzrlib/builtins.py:2869
1787
msgid " Ignore files whose name begins with the \"#\" character::"
1788
msgstr ""
1789
1790
#: bzrlib/builtins.py:2871
1791
msgid " bzr ignore \"RE:^#\""
1792
msgstr ""
1793
1794
#: bzrlib/builtins.py:2873
1795
msgid " Ignore .o files under the lib directory::"
1796
msgstr ""
1797
1798
#: bzrlib/builtins.py:2875
1799
msgid " bzr ignore \"lib/**/*.o\""
1800
msgstr ""
1801
1802
#: bzrlib/builtins.py:2879
1803
msgid " bzr ignore \"RE:lib/.*\\.o\""
1804
msgstr ""
1805
1806
#: bzrlib/builtins.py:2881
1807
msgid " Ignore everything but the \"debian\" toplevel directory::"
1808
msgstr ""
1809
1810
#: bzrlib/builtins.py:2883
1811
msgid ""
1812
" bzr ignore \"RE:(?!debian/).*\"\n"
1813
" \n"
1814
" Ignore everything except the \"local\" toplevel directory,\n"
1815
" but always ignore autosave files ending in ~, even under local/::\n"
1816
" \n"
1817
" bzr ignore \"*\"\n"
1818
" bzr ignore \"!./local\"\n"
1819
" bzr ignore \"!!*~\""
1820
msgstr ""
1821
1822
# help of 'default-rules' option of 'ignore' command
1823
#: bzrlib/builtins.py:2897
1824
msgid "Display the default ignore rules that bzr uses."
1825
msgstr ""
1826
1827
#: bzrlib/builtins.py:2909
1828
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1829
msgstr ""
1830
1831
#: bzrlib/builtins.py:2925
1832
msgid "NAME_PATTERN should not be an absolute path"
1833
msgstr ""
1834
1835
#: bzrlib/builtins.py:2938
1836
#, python-format
1837
msgid ""
1838
"Warning: the following files are version controlled and match your ignore "
1839
"pattern:\n"
1840
"%s\n"
1841
"These files will continue to be version controlled unless you 'bzr remove' "
1842
"them.\n"
1843
msgstr ""
1844
1845
#: bzrlib/builtins.py:2945
1846
msgid "List ignored files and the patterns that matched them."
1847
msgstr ""
1848
1849
#: bzrlib/builtins.py:2947
1850
msgid ""
1851
"List all the ignored files and the ignore pattern that caused the file to\n"
1852
"be ignored."
1853
msgstr ""
1854
1855
#: bzrlib/builtins.py:2950
1856
msgid "Alternatively, to list just the files::"
1857
msgstr ""
1858
1859
#: bzrlib/builtins.py:2952
1860
msgid " bzr ls --ignored"
1861
msgstr ""
1862
1863
#: bzrlib/builtins.py:2986
1864
#, python-format
1865
msgid "not a valid revision-number: %r"
1866
msgstr ""
1867
1868
#: bzrlib/builtins.py:2993
1869
msgid "Export current or past revision to a destination directory or archive."
1870
msgstr ""
1871
1872
#: bzrlib/builtins.py:2995
1873
msgid "If no revision is specified this exports the last committed revision."
1874
msgstr ""
1875
1876
#: bzrlib/builtins.py:2997
1877
msgid ""
1878
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1879
"given, try to find the format with the extension. If no extension\n"
1880
"is found exports to a directory (equivalent to --format=dir)."
1881
msgstr ""
1882
1883
#: bzrlib/builtins.py:3001
1884
msgid ""
1885
"If root is supplied, it will be used as the root directory inside\n"
1886
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1887
"to the exported filename. The root option has no effect for 'dir' format."
1888
msgstr ""
1889
1890
#: bzrlib/builtins.py:3005
1891
msgid ""
1892
"If branch is omitted then the branch containing the current working\n"
1893
"directory will be used."
1894
msgstr ""
1895
1896
#: bzrlib/builtins.py:3008
1897
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
1898
msgstr ""
1899
1900
#: bzrlib/builtins.py:3010
1901
msgid ""
1902
" ================= =========================\n"
1903
" Supported formats Autodetected by extension\n"
1904
" ================= =========================\n"
1905
" dir (none)\n"
1906
" tar .tar\n"
1907
" tbz2 .tar.bz2, .tbz2\n"
1908
" tgz .tar.gz, .tgz\n"
1909
" zip .zip\n"
1910
" ================= ========================="
1911
msgstr ""
1912
1913
# help of 'format' option of 'export' command
1914
#: bzrlib/builtins.py:3024
1915
msgid "Type of file to export to."
1916
msgstr ""
1917
1918
# help of 'filters' option of 'export' command
1919
#: bzrlib/builtins.py:3027
1920
msgid "Apply content filters to export the convenient form."
1921
msgstr ""
1922
1923
# help of 'root' option of 'export' command
1924
#: bzrlib/builtins.py:3031
1925
msgid "Name of the root directory inside the exported file."
1926
msgstr ""
1927
1928
# help of 'per-file-timestamps' option of 'export' command
1929
#: bzrlib/builtins.py:3033
1930
msgid ""
1931
"Set modification time of files to that of the last revision in which it was "
1932
"changed."
1933
msgstr ""
1934
1935
#: bzrlib/builtins.py:3057
1936
msgid "Write the contents of a file as of a given revision to standard output."
1937
msgstr ""
1938
1939
#: bzrlib/builtins.py:3059
1940
msgid "If no revision is nominated, the last revision is used."
1941
msgstr ""
1942
1943
#: bzrlib/builtins.py:3061
1944
msgid ""
1945
"Note: Take care to redirect standard output when using this command on a\n"
1946
"binary file."
1947
msgstr ""
1948
1949
# help of 'filters' option of 'cat' command
1950
#: bzrlib/builtins.py:3068
1951
msgid "Apply content filters to display the convenience form."
1952
msgstr ""
1953
1954
#: bzrlib/builtins.py:3079
1955
msgid "bzr cat --revision takes exactly one revision specifier"
1956
msgstr ""
1957
1958
#: bzrlib/builtins.py:3104 bzrlib/builtins.py:3116
1959
#, python-format
1960
msgid "%r is not present in revision %s"
1961
msgstr ""
1962
1963
#: bzrlib/builtins.py:3139
1964
msgid "Commit changes into a new revision."
1965
msgstr ""
1966
1967
#: bzrlib/builtins.py:3141
1968
msgid ""
1969
"An explanatory message needs to be given for each commit. This is\n"
1970
"often done by using the --message option (getting the message from the\n"
1971
"command line) or by using the --file option (getting the message from\n"
1972
"a file). If neither of these options is given, an editor is opened for\n"
1973
"the user to enter the message. To see the changed files in the\n"
1974
"boilerplate text loaded into the editor, use the --show-diff option."
1975
msgstr ""
1976
1977
#: bzrlib/builtins.py:3148
1978
msgid ""
1979
"By default, the entire tree is committed and the person doing the\n"
1980
"commit is assumed to be the author. These defaults can be overridden\n"
1981
"as explained below."
1982
msgstr ""
1983
1984
#: bzrlib/builtins.py:3152
1985
msgid ":Selective commits:"
1986
msgstr ""
1987
1988
#: bzrlib/builtins.py:3154
1989
msgid ""
1990
" If selected files are specified, only changes to those files are\n"
1991
" committed. If a directory is specified then the directory and\n"
1992
" everything within it is committed."
1993
msgstr ""
1994
1995
#: bzrlib/builtins.py:3158
1996
msgid ""
1997
" When excludes are given, they take precedence over selected files.\n"
1998
" For example, to commit only changes within foo, but not changes\n"
1999
" within foo/bar::"
2000
msgstr ""
2001
2002
#: bzrlib/builtins.py:3162
2003
msgid " bzr commit foo -x foo/bar"
2004
msgstr ""
2005
2006
#: bzrlib/builtins.py:3164
2007
msgid " A selective commit after a merge is not yet supported."
2008
msgstr ""
2009
2010
#: bzrlib/builtins.py:3166
2011
msgid ":Custom authors:"
2012
msgstr ""
2013
2014
#: bzrlib/builtins.py:3168
2015
msgid ""
2016
" If the author of the change is not the same person as the committer,\n"
2017
" you can specify the author's name using the --author option. The\n"
2018
" name should be in the same format as a committer-id, e.g.\n"
2019
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2020
" the change you can specify the option multiple times, once for each\n"
2021
" author."
2022
msgstr ""
2023
2024
#: bzrlib/builtins.py:3175
2025
msgid ":Checks:"
2026
msgstr ""
2027
2028
#: bzrlib/builtins.py:3177
2029
msgid ""
2030
" A common mistake is to forget to add a new file or directory before\n"
2031
" running the commit command. The --strict option checks for unknown\n"
2032
" files and aborts the commit if any are found. More advanced pre-commit\n"
2033
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2034
" for details."
2035
msgstr ""
2036
2037
#: bzrlib/builtins.py:3183
2038
msgid ":Things to note:"
2039
msgstr ""
2040
2041
#: bzrlib/builtins.py:3185
2042
msgid ""
2043
" If you accidentially commit the wrong changes or make a spelling\n"
2044
" mistake in the commit message say, you can use the uncommit command\n"
2045
" to undo it. See ``bzr help uncommit`` for details."
2046
msgstr ""
2047
2048
#: bzrlib/builtins.py:3189
2049
msgid ""
2050
" Hooks can also be configured to run after a commit. This allows you\n"
2051
" to trigger updates to external systems like bug trackers. The --fixes\n"
2052
" option can be used to record the association between a revision and\n"
2053
" one or more bugs. See ``bzr help bugs`` for details."
2054
msgstr ""
2055
2056
# help of 'exclude' option of 'commit' command
2057
#: bzrlib/builtins.py:3199
2058
msgid "Do not consider changes made to a given path."
2059
msgstr ""
2060
2061
# help of 'message' option of 'commit' command
2062
#: bzrlib/builtins.py:3202
2063
msgid "Description of the new revision."
2064
msgstr ""
2065
2066
# help of 'unchanged' option of 'commit' command
2067
#: bzrlib/builtins.py:3205
2068
msgid "Commit even if nothing has changed."
2069
msgstr ""
2070
2071
# help of 'file' option of 'commit' command
2072
#: bzrlib/builtins.py:3209
2073
msgid "Take commit message from this file."
2074
msgstr ""
2075
2076
# help of 'strict' option of 'commit' command
2077
#: bzrlib/builtins.py:3211
2078
msgid "Refuse to commit if there are unknown files in the working tree."
2079
msgstr ""
2080
2081
# help of 'commit-time' option of 'commit' command
2082
#: bzrlib/builtins.py:3214
2083
msgid ""
2084
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2085
"08:00:00 +0100'."
2086
msgstr ""
2087
2088
# help of 'fixes' option of 'commit' command
2089
#: bzrlib/builtins.py:3217
2090
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2091
msgstr ""
2092
2093
# help of 'author' option of 'commit' command
2094
#: bzrlib/builtins.py:3220
2095
msgid "Set the author's name, if it's different from the committer."
2096
msgstr ""
2097
2098
# help of 'local' option of 'commit' command
2099
#: bzrlib/builtins.py:3223
2100
msgid ""
2101
"Perform a local commit in a bound branch. Local commits are not pushed to "
2102
"the master branch until a normal commit is performed."
2103
msgstr ""
2104
2105
# help of 'show-diff' option of 'commit' command
2106
#: bzrlib/builtins.py:3229
2107
msgid ""
2108
"When no message is supplied, show the diff along with the status summary in "
2109
"the message editor."
2110
msgstr ""
2111
2112
# help of 'lossy' option of 'commit' command
2113
#: bzrlib/builtins.py:3232
2114
msgid ""
2115
"When committing to a foreign version control system do not push data that "
2116
"can not be natively represented."
2117
msgstr ""
2118
2119
#: bzrlib/builtins.py:3250
2120
#, python-format
2121
msgid ""
2122
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2123
"default bug tracker using the `bugtracker` option.\n"
2124
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2125
msgstr ""
2126
2127
#: bzrlib/builtins.py:3259
2128
#, python-format
2129
msgid ""
2130
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2131
"for more information on this feature.\n"
2132
"Commit refused."
2133
msgstr ""
2134
2135
#: bzrlib/builtins.py:3268
2136
#, python-format
2137
msgid "Unrecognized bug %s. Commit refused."
2138
msgstr ""
2139
2140
#: bzrlib/builtins.py:3271
2141
#, python-format
2142
msgid ""
2143
"%s\n"
2144
"Commit refused."
2145
msgstr ""
2146
2147
#: bzrlib/builtins.py:3295
2148
msgid "Could not parse --commit-time: "
2149
msgstr ""
2150
2151
#: bzrlib/builtins.py:3335
2152
msgid "please specify either --message or --file"
2153
msgstr ""
2154
2155
#: bzrlib/builtins.py:3364
2156
msgid "please specify a commit message with either --message or --file"
2157
msgstr ""
2158
2159
#: bzrlib/builtins.py:3367
2160
msgid ""
2161
"Empty commit message specified. Please specify a commit message with either "
2162
"--message or --file or leave a blank message with --message \"\"."
2163
msgstr ""
2164
2165
#: bzrlib/builtins.py:3387
2166
msgid ""
2167
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2168
"--unchanged to force an empty commit."
2169
msgstr ""
2170
2171
#: bzrlib/builtins.py:3391
2172
msgid ""
2173
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2174
"resolve FILE\" to resolve."
2175
msgstr ""
2176
2177
#: bzrlib/builtins.py:3395
2178
msgid "Commit refused because there are unknown files in the working tree."
2179
msgstr ""
2180
2181
#: bzrlib/builtins.py:3398
2182
msgid ""
2183
"\n"
2184
"To commit to master branch, run update and then commit.\n"
2185
"You can also pass --local to commit to continue working disconnected."
2186
msgstr ""
2187
2188
#: bzrlib/builtins.py:3406
2189
msgid ""
2190
"Validate working tree structure, branch consistency and repository history."
2191
msgstr ""
2192
2193
#: bzrlib/builtins.py:3408
2194
msgid ""
2195
"This command checks various invariants about branch and repository storage\n"
2196
"to detect data corruption or bzr bugs."
2197
msgstr ""
2198
2199
#: bzrlib/builtins.py:3411
2200
msgid ""
2201
"The working tree and branch checks will only give output if a problem is\n"
2202
"detected. The output fields of the repository check are:"
2203
msgstr ""
2204
2205
#: bzrlib/builtins.py:3414
2206
msgid ""
2207
"revisions\n"
2208
" This is just the number of revisions checked. It doesn't\n"
2209
" indicate a problem."
2210
msgstr ""
2211
2212
#: bzrlib/builtins.py:3418
2213
msgid ""
2214
"versionedfiles\n"
2215
" This is just the number of versionedfiles checked. It\n"
2216
" doesn't indicate a problem."
2217
msgstr ""
2218
2219
#: bzrlib/builtins.py:3422
2220
msgid ""
2221
"unreferenced ancestors\n"
2222
" Texts that are ancestors of other texts, but\n"
2223
" are not properly referenced by the revision ancestry. This is a\n"
2224
" subtle problem that Bazaar can work around."
2225
msgstr ""
2226
2227
#: bzrlib/builtins.py:3427
2228
msgid ""
2229
"unique file texts\n"
2230
" This is the total number of unique file contents\n"
2231
" seen in the checked revisions. It does not indicate a problem."
2232
msgstr ""
2233
2234
#: bzrlib/builtins.py:3431
2235
msgid ""
2236
"repeated file texts\n"
2237
" This is the total number of repeated texts seen\n"
2238
" in the checked revisions. Texts can be repeated when their file\n"
2239
" entries are modified, but the file contents are not. It does not\n"
2240
" indicate a problem."
2241
msgstr ""
2242
2243
#: bzrlib/builtins.py:3437
2244
msgid ""
2245
"If no restrictions are specified, all Bazaar data that is found at the "
2246
"given\n"
2247
"location will be checked."
2248
msgstr ""
2249
2250
#: bzrlib/builtins.py:3440
2251
msgid ":Examples:"
2252
msgstr ""
2253
2254
#: bzrlib/builtins.py:3442
2255
msgid " Check the tree and branch at 'foo'::"
2256
msgstr ""
2257
2258
#: bzrlib/builtins.py:3444
2259
msgid " bzr check --tree --branch foo"
2260
msgstr ""
2261
2262
#: bzrlib/builtins.py:3446
2263
msgid " Check only the repository at 'bar'::"
2264
msgstr ""
2265
2266
#: bzrlib/builtins.py:3448
2267
msgid " bzr check --repo bar"
2268
msgstr ""
2269
2270
#: bzrlib/builtins.py:3450
2271
msgid " Check everything at 'baz'::"
2272
msgstr ""
2273
2274
#: bzrlib/builtins.py:3452
2275
msgid " bzr check baz"
2276
msgstr ""
2277
2278
# help of 'branch' option of 'check' command
2279
#: bzrlib/builtins.py:3458
2280
msgid "Check the branch related to the current directory."
2281
msgstr ""
2282
2283
# help of 'repo' option of 'check' command
2284
#: bzrlib/builtins.py:3460
2285
msgid "Check the repository related to the current directory."
2286
msgstr ""
2287
2288
# help of 'tree' option of 'check' command
2289
#: bzrlib/builtins.py:3462
2290
msgid "Check the working tree related to the current directory."
2291
msgstr ""
2292
2293
#: bzrlib/builtins.py:3476
2294
msgid "Upgrade a repository, branch or working tree to a newer format."
2295
msgstr ""
2296
2297
#: bzrlib/builtins.py:3478
2298
msgid ""
2299
"When the default format has changed after a major new release of\n"
2300
"Bazaar, you may be informed during certain operations that you\n"
2301
"should upgrade. Upgrading to a newer format may improve performance\n"
2302
"or make new features available. It may however limit interoperability\n"
2303
"with older repositories or with older versions of Bazaar."
2304
msgstr ""
2305
2306
#: bzrlib/builtins.py:3484
2307
msgid ""
2308
"If you wish to upgrade to a particular format rather than the\n"
2309
"current default, that can be specified using the --format option.\n"
2310
"As a consequence, you can use the upgrade command this way to\n"
2311
"\"downgrade\" to an earlier format, though some conversions are\n"
2312
"a one way process (e.g. changing from the 1.x default to the\n"
2313
"2.x default) so downgrading is not always possible."
2314
msgstr ""
2315
2316
#: bzrlib/builtins.py:3491
2317
msgid ""
2318
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2319
"process (where # is a number). By default, this is left there on\n"
2320
"completion. If the conversion fails, delete the new .bzr directory\n"
2321
"and rename this one back in its place. Use the --clean option to ask\n"
2322
"for the backup.bzr directory to be removed on successful conversion.\n"
2323
"Alternatively, you can delete it by hand if everything looks good\n"
2324
"afterwards."
2325
msgstr ""
2326
2327
#: bzrlib/builtins.py:3499
2328
msgid ""
2329
"If the location given is a shared repository, dependent branches\n"
2330
"are also converted provided the repository converts successfully.\n"
2331
"If the conversion of a branch fails, remaining branches are still\n"
2332
"tried."
2333
msgstr ""
2334
2335
#: bzrlib/builtins.py:3504
2336
msgid ""
2337
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2338
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2339
msgstr ""
2340
2341
# help of 'format' option of 'upgrade' command
2342
#: bzrlib/builtins.py:3512
2343
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2344
msgstr ""
2345
2346
# title of 'format' option of 'init' command
2347
#: bzrlib/builtins.py:3516
2348
msgid "Branch format"
2349
msgstr ""
2350
2351
# help of 'clean' option of 'upgrade' command
2352
#: bzrlib/builtins.py:3518
2353
msgid "Remove the backup.bzr directory if successful."
2354
msgstr ""
2355
2356
#: bzrlib/builtins.py:3535
2357
msgid "Show or set bzr user id."
2358
msgstr ""
2359
2360
#: bzrlib/builtins.py:3537
2361
msgid ""
2362
":Examples:\n"
2363
" Show the email of the current user::"
2364
msgstr ""
2365
2366
#: bzrlib/builtins.py:3540
2367
msgid " bzr whoami --email"
2368
msgstr ""
2369
2370
#: bzrlib/builtins.py:3542
2371
msgid " Set the current user::"
2372
msgstr ""
2373
2374
#: bzrlib/builtins.py:3544
2375
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2376
msgstr ""
2377
2378
# help of 'email' option of 'whoami' command
2379
#: bzrlib/builtins.py:3548
2380
msgid "Display email address only."
2381
msgstr ""
2382
2383
# help of 'branch' option of 'whoami' command
2384
#: bzrlib/builtins.py:3550
2385
msgid "Set identity for the current branch instead of globally."
2386
msgstr ""
2387
2388
#: bzrlib/builtins.py:3574
2389
msgid "--email can only be used to display existing identity"
2390
msgstr ""
2391
2392
#: bzrlib/builtins.py:3596
2393
msgid "Print or set the branch nickname."
2394
msgstr ""
2395
2396
#: bzrlib/builtins.py:3598
2397
msgid ""
2398
"If unset, the tree root directory name is used as the nickname.\n"
2399
"To print the current nickname, execute with no argument."
2400
msgstr ""
2401
2402
#: bzrlib/builtins.py:3601
2403
msgid ""
2404
"Bound branches use the nickname of its master branch unless it is set\n"
2405
"locally."
2406
msgstr ""
2407
2408
#: bzrlib/builtins.py:3621
2409
msgid "Set/unset and display aliases."
2410
msgstr ""
2411
2412
#: bzrlib/builtins.py:3623
2413
msgid ""
2414
":Examples:\n"
2415
" Show the current aliases::"
2416
msgstr ""
2417
2418
#: bzrlib/builtins.py:3626
2419
msgid " bzr alias"
2420
msgstr ""
2421
2422
#: bzrlib/builtins.py:3628
2423
msgid " Show the alias specified for 'll'::"
2424
msgstr ""
2425
2426
#: bzrlib/builtins.py:3630
2427
msgid " bzr alias ll"
2428
msgstr ""
2429
2430
#: bzrlib/builtins.py:3632
2431
msgid " Set an alias for 'll'::"
2432
msgstr ""
2433
2434
#: bzrlib/builtins.py:3634
2435
msgid " bzr alias ll=\"log --line -r-10..-1\""
2436
msgstr ""
2437
2438
#: bzrlib/builtins.py:3636
2439
msgid " To remove an alias for 'll'::"
2440
msgstr ""
2441
2442
#: bzrlib/builtins.py:3638
2443
msgid " bzr alias --remove ll"
2444
msgstr ""
2445
2446
# help of 'remove' option of 'alias' command
2447
#: bzrlib/builtins.py:3643
2448
msgid "Remove the alias."
2449
msgstr ""
2450
2451
#: bzrlib/builtins.py:3661
2452
msgid "bzr alias --remove expects an alias to remove."
2453
msgstr ""
2454
2455
#: bzrlib/builtins.py:3833
2456
msgid "subunit not available. subunit needs to be installed to use --subunit."
2457
msgstr ""
2458
2459
#: bzrlib/builtins.py:3850
2460
msgid ""
2461
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2462
msgstr ""
2463
2464
#: bzrlib/builtins.py:3897
2465
msgid "Show version of bzr."
2466
msgstr ""
2467
2468
# help of 'short' option of 'version' command
2469
#: bzrlib/builtins.py:3901
2470
msgid "Print just the version number."
2471
msgstr ""
2472
2473
#: bzrlib/builtins.py:3920
2474
msgid "It sure does!\n"
2475
msgstr ""
2476
2477
#: bzrlib/builtins.py:3944
2478
#, python-format
2479
msgid "merge base is revision %s\n"
2480
msgstr ""
2481
2482
#: bzrlib/builtins.py:3948
2483
msgid "Perform a three-way merge."
2484
msgstr ""
2485
2486
#: bzrlib/builtins.py:3950
2487
msgid ""
2488
"The source of the merge can be specified either in the form of a branch,\n"
2489
"or in the form of a path to a file containing a merge directive generated\n"
2490
"with bzr send. If neither is specified, the default is the upstream branch\n"
2491
"or the branch most recently merged using --remember. The source of the\n"
2492
"merge may also be specified in the form of a path to a file in another\n"
2493
"branch: in this case, only the modifications to that file are merged into\n"
2494
"the current working tree."
2495
msgstr ""
2496
2497
#: bzrlib/builtins.py:3958
2498
msgid ""
2499
"When merging from a branch, by default bzr will try to merge in all new\n"
2500
"work from the other branch, automatically determining an appropriate base\n"
2501
"revision. If this fails, you may need to give an explicit base."
2502
msgstr ""
2503
2504
#: bzrlib/builtins.py:3962
2505
msgid ""
2506
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2507
"try to merge in all new work up to and including revision OTHER."
2508
msgstr ""
2509
2510
#: bzrlib/builtins.py:3965
2511
msgid ""
2512
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2513
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2514
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2515
"not already contain revision BASE, such a merge is commonly referred to as\n"
2516
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2517
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2518
"changes from the other branch is not stored in the commit."
2519
msgstr ""
2520
2521
#: bzrlib/builtins.py:3973
2522
msgid "Revision numbers are always relative to the source branch."
2523
msgstr ""
2524
2525
#: bzrlib/builtins.py:3980
2526
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2527
msgstr ""
2528
2529
#: bzrlib/builtins.py:3982
2530
msgid ""
2531
"If there is no default branch set, the first merge will set it (use\n"
2532
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2533
"to use the default. To change the default, use --remember. The value will\n"
2534
"only be saved if the remote location can be accessed."
2535
msgstr ""
2536
2537
#: bzrlib/builtins.py:3987
2538
msgid ""
2539
"The results of the merge are placed into the destination working\n"
2540
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2541
"committed to record the result of the merge."
2542
msgstr ""
2543
2544
#: bzrlib/builtins.py:3991
2545
msgid ""
2546
"merge refuses to run if there are any uncommitted changes, unless\n"
2547
"--force is given. If --force is given, then the changes from the source \n"
2548
"will be merged with the current working tree, including any uncommitted\n"
2549
"changes in the tree. The --force option can also be used to create a\n"
2550
"merge revision which has more than two parents."
2551
msgstr ""
2552
2553
#: bzrlib/builtins.py:3997
2554
msgid ""
2555
"If one would like to merge changes from the working tree of the other\n"
2556
"branch without merging any committed revisions, the --uncommitted option\n"
2557
"can be given."
2558
msgstr ""
2559
2560
#: bzrlib/builtins.py:4001
2561
msgid ""
2562
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2563
"you to apply each diff hunk and file change, similar to \"shelve\"."
2564
msgstr ""
2565
2566
#: bzrlib/builtins.py:4004
2567
msgid ""
2568
":Examples:\n"
2569
" To merge all new revisions from bzr.dev::"
2570
msgstr ""
2571
2572
#: bzrlib/builtins.py:4007
2573
msgid " bzr merge ../bzr.dev"
2574
msgstr ""
2575
2576
#: bzrlib/builtins.py:4009
2577
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2578
msgstr ""
2579
2580
#: bzrlib/builtins.py:4011
2581
msgid " bzr merge -r 82 ../bzr.dev"
2582
msgstr ""
2583
2584
#: bzrlib/builtins.py:4013
2585
msgid " To merge the changes introduced by 82, without previous changes::"
2586
msgstr ""
2587
2588
#: bzrlib/builtins.py:4015
2589
msgid " bzr merge -r 81..82 ../bzr.dev"
2590
msgstr ""
2591
2592
#: bzrlib/builtins.py:4017
2593
msgid " To apply a merge directive contained in /tmp/merge::"
2594
msgstr ""
2595
2596
#: bzrlib/builtins.py:4019
2597
msgid " bzr merge /tmp/merge"
2598
msgstr ""
2599
2600
#: bzrlib/builtins.py:4021
2601
msgid ""
2602
" To create a merge revision with three parents from two branches\n"
2603
" feature1a and feature1b:"
2604
msgstr ""
2605
2606
#: bzrlib/builtins.py:4024
2607
msgid ""
2608
" bzr merge ../feature1a\n"
2609
" bzr merge ../feature1b --force\n"
2610
" bzr commit -m 'revision with three parents'"
2611
msgstr ""
2612
2613
# help of 'force' option of 'merge' command
2614
#: bzrlib/builtins.py:4036
2615
msgid "Merge even if the destination tree has uncommitted changes."
2616
msgstr ""
2617
2618
# help of 'uncommitted' option of 'merge' command
2619
#: bzrlib/builtins.py:4042
2620
msgid ""
2621
"Apply uncommitted changes from a working copy, instead of branch changes."
2622
msgstr ""
2623
2624
# help of 'pull' option of 'merge' command
2625
#: bzrlib/builtins.py:4044
2626
msgid ""
2627
"If the destination is already completely merged into the source, pull from "
2628
"the source rather than merging. When this happens, you do not need to "
2629
"commit the result."
2630
msgstr ""
2631
2632
# help of 'directory' option of 'merge' command
2633
#: bzrlib/builtins.py:4049
2634
msgid ""
2635
"Branch to merge into, rather than the one containing the working directory."
2636
msgstr ""
2637
2638
# help of 'preview' option of 'merge' command
2639
#: bzrlib/builtins.py:4051
2640
msgid "Instead of merging, show a diff of the merge."
2641
msgstr ""
2642
2643
# help of 'interactive' option of 'merge' command
2644
#: bzrlib/builtins.py:4053
2645
msgid "Select changes interactively."
2646
msgstr ""
2647
2648
#: bzrlib/builtins.py:4075
2649
msgid ""
2650
"Merging into empty branches not currently supported, https://bugs.launchpad."
2651
"net/bzr/+bug/308562"
2652
msgstr ""
2653
2654
#: bzrlib/builtins.py:4102
2655
msgid "Cannot use --uncommitted with bundles or merge directives."
2656
msgstr ""
2657
2658
#: bzrlib/builtins.py:4113
2659
msgid "Cannot use --uncommitted and --revision at the same time."
2660
msgstr ""
2661
2662
#: bzrlib/builtins.py:4133
2663
msgid "merger: "
2664
msgstr ""
2665
2666
#: bzrlib/builtins.py:4135
2667
msgid "Nothing to do."
2668
msgstr ""
2669
2670
#: bzrlib/builtins.py:4139
2671
msgid "Cannot pull individual files"
2672
msgstr ""
2673
2674
#: bzrlib/builtins.py:4147
2675
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2676
msgstr ""
2677
2678
#: bzrlib/builtins.py:4205
2679
#, python-format
2680
msgid "Show-base is not supported for this merge type. %s"
2681
msgstr ""
2682
2683
#: bzrlib/builtins.py:4214
2684
#, python-format
2685
msgid "Conflict reduction is not supported for merge type %s."
2686
msgstr ""
2687
2688
#: bzrlib/builtins.py:4218
2689
msgid "Cannot do conflict reduction and show base."
2690
msgstr ""
2691
2692
#: bzrlib/builtins.py:4329
2693
msgid "No location specified or remembered"
2694
msgstr ""
2695
2696
#: bzrlib/builtins.py:4331
2697
#, python-format
2698
msgid "%s remembered %s location %s"
2699
msgstr ""
2700
2701
#: bzrlib/builtins.py:4337
2702
msgid "Redo a merge."
2703
msgstr ""
2704
2705
#: bzrlib/builtins.py:4339
2706
msgid ""
2707
"Use this if you want to try a different merge technique while resolving\n"
2708
"conflicts. Some merge techniques are better than others, and remerge\n"
2709
"lets you try different ones on different files."
2710
msgstr ""
2711
2712
#: bzrlib/builtins.py:4343
2713
msgid ""
2714
"The options for remerge have the same meaning and defaults as the ones for\n"
2715
"merge. The difference is that remerge can (only) be run when there is a\n"
2716
"pending merge, and it lets you specify particular files."
2717
msgstr ""
2718
2719
#: bzrlib/builtins.py:4347
2720
msgid ""
2721
":Examples:\n"
2722
" Re-do the merge of all conflicted files, and show the base text in\n"
2723
" conflict regions, in addition to the usual THIS and OTHER texts::"
2724
msgstr ""
2725
2726
#: bzrlib/builtins.py:4351
2727
msgid " bzr remerge --show-base"
2728
msgstr ""
2729
2730
#: bzrlib/builtins.py:4353
2731
msgid ""
2732
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2733
" additional processing to reduce the size of conflict regions::"
2734
msgstr ""
2735
2736
#: bzrlib/builtins.py:4356
2737
msgid " bzr remerge --merge-type weave --reprocess foobar"
2738
msgstr ""
2739
2740
# help of 'show-base' option of 'merge' command
2741
#: bzrlib/builtins.py:4363
2742
msgid "Show base revision text in conflicts."
2743
msgstr ""
2744
2745
#: bzrlib/builtins.py:4375
2746
msgid ""
2747
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2748
"merges."
2749
msgstr ""
2750
2751
#: bzrlib/builtins.py:4431
2752
msgid "Revert files to a previous revision."
2753
msgstr ""
2754
2755
#: bzrlib/builtins.py:4433
2756
msgid ""
2757
"Giving a list of files will revert only those files. Otherwise, all files\n"
2758
"will be reverted. If the revision is not specified with '--revision', the\n"
2759
"last committed revision is used."
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4437
2763
msgid ""
2764
"To remove only some changes, without reverting to a prior version, use\n"
2765
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2766
"will remove the changes introduced by the second last commit (-2), without\n"
2767
"affecting the changes introduced by the last commit (-1). To remove\n"
2768
"certain changes on a hunk-by-hunk basis, see the shelve command."
2769
msgstr ""
2770
2771
#: bzrlib/builtins.py:4443
2772
msgid ""
2773
"By default, any files that have been manually changed will be backed up\n"
2774
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2775
"'.~#~' appended to their name, where # is a number."
2776
msgstr ""
2777
2778
#: bzrlib/builtins.py:4447
2779
msgid ""
2780
"When you provide files, you can use their current pathname or the pathname\n"
2781
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2782
"name. If you name a directory, all the contents of that directory will be\n"
2783
"reverted."
2784
msgstr ""
2785
2786
#: bzrlib/builtins.py:4452
2787
msgid ""
2788
"If you have newly added files since the target revision, they will be\n"
2789
"removed. If the files to be removed have been changed, backups will be\n"
2790
"created as above. Directories containing unknown files will not be\n"
2791
"deleted."
2792
msgstr ""
2793
2794
#: bzrlib/builtins.py:4457
2795
msgid ""
2796
"The working tree contains a list of revisions that have been merged but\n"
2797
"not yet committed. These revisions will be included as additional parents\n"
2798
"of the next commit. Normally, using revert clears that list as well as\n"
2799
"reverting the files. If any files are specified, revert leaves the list\n"
2800
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2801
".`` in the tree root to revert all files but keep the recorded merges,\n"
2802
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2803
"reverting any files."
2804
msgstr ""
2805
2806
#: bzrlib/builtins.py:4466
2807
msgid ""
2808
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2809
"changes from a branch in a single revision. To do this, perform the merge\n"
2810
"as desired. Then doing revert with the \"--forget-merges\" option will "
2811
"keep\n"
2812
"the content of the tree as it was, but it will clear the list of pending\n"
2813
"merges. The next commit will then contain all of the changes that are\n"
2814
"present in the other branch, but without any other parent revisions.\n"
2815
"Because this technique forgets where these changes originated, it may\n"
2816
"cause additional conflicts on later merges involving the same source and\n"
2817
"target branches."
2818
msgstr ""
2819
2820
# help of 'no-backup' option of 'revert' command
2821
#: bzrlib/builtins.py:4480
2822
msgid "Do not save backups of reverted files."
2823
msgstr ""
2824
2825
# help of 'forget-merges' option of 'revert' command
2826
#: bzrlib/builtins.py:4482
2827
msgid "Remove pending merge marker, without changing any files."
2828
msgstr ""
2829
2830
#: bzrlib/builtins.py:4513
2831
msgid ""
2832
"Show help on a command or other topic.\n"
2833
" "
2834
msgstr ""
2835
2836
# help of 'long' option of 'help' command
2837
#: bzrlib/builtins.py:4518
2838
msgid "Show help on all commands."
2839
msgstr ""
2840
2841
#: bzrlib/builtins.py:4547
2842
msgid "Show unmerged/unpulled revisions between two branches."
2843
msgstr ""
2844
2845
#: bzrlib/builtins.py:4549
2846
msgid "OTHER_BRANCH may be local or remote."
2847
msgstr ""
2848
2849
#: bzrlib/builtins.py:4551
2850
msgid ""
2851
"To filter on a range of revisions, you can use the command -r begin..end\n"
2852
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2853
"also valid.\n"
2854
" \n"
2855
":Exit values:\n"
2856
" 1 - some missing revisions\n"
2857
" 0 - no missing revisions"
2858
msgstr ""
2859
2860
#: bzrlib/builtins.py:4561
2861
msgid ""
2862
" Determine the missing revisions between this and the branch at the\n"
2863
" remembered pull location::"
2864
msgstr ""
2865
2866
#: bzrlib/builtins.py:4564
2867
msgid " bzr missing"
2868
msgstr ""
2869
2870
#: bzrlib/builtins.py:4566
2871
msgid " Determine the missing revisions between this and another branch::"
2872
msgstr ""
2873
2874
#: bzrlib/builtins.py:4568
2875
msgid " bzr missing http://server/branch"
2876
msgstr ""
2877
2878
#: bzrlib/builtins.py:4570
2879
msgid ""
2880
" Determine the missing revisions up to a specific revision on the other\n"
2881
" branch::"
2882
msgstr ""
2883
2884
#: bzrlib/builtins.py:4573
2885
msgid " bzr missing -r ..-10"
2886
msgstr ""
2887
2888
#: bzrlib/builtins.py:4575
2889
msgid ""
2890
" Determine the missing revisions up to a specific revision on this\n"
2891
" branch::"
2892
msgstr ""
2893
2894
#: bzrlib/builtins.py:4578
2895
msgid " bzr missing --my-revision ..-10"
2896
msgstr ""
2897
2898
# help of 'reverse' option of 'missing' command
2899
#: bzrlib/builtins.py:4585
2900
msgid "Reverse the order of revisions."
2901
msgstr ""
2902
2903
# help of 'mine-only' option of 'missing' command
2904
#: bzrlib/builtins.py:4587
2905
msgid "Display changes in the local branch only."
2906
msgstr ""
2907
2908
# help of 'this' option of 'missing' command
2909
#: bzrlib/builtins.py:4588
2910
msgid "Same as --mine-only."
2911
msgstr ""
2912
2913
# help of 'theirs-only' option of 'missing' command
2914
#: bzrlib/builtins.py:4590
2915
msgid "Display changes in the remote branch only."
2916
msgstr ""
2917
2918
# help of 'other' option of 'missing' command
2919
#: bzrlib/builtins.py:4591
2920
msgid "Same as --theirs-only."
2921
msgstr ""
2922
2923
# help of 'revision' option of 'missing' command
2924
#: bzrlib/builtins.py:4596
2925
msgid ""
2926
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
2927
"details."
2928
msgstr ""
2929
2930
# help of 'my-revision' option of 'missing' command
2931
#: bzrlib/builtins.py:4600
2932
msgid ""
2933
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
2934
"details."
2935
msgstr ""
2936
2937
# help of 'include-merges' option of 'missing' command
2938
#: bzrlib/builtins.py:4603
2939
msgid "Show all revisions in addition to the mainline ones."
2940
msgstr ""
2941
2942
#: bzrlib/builtins.py:4639
2943
msgid "No peer location known or specified."
2944
msgstr ""
2945
2946
#: bzrlib/builtins.py:4643
2947
msgid "Using saved parent location: {0}\n"
2948
msgstr ""
2949
2950
#: bzrlib/builtins.py:4676
2951
#, python-format
2952
msgid "You have %d extra revision(s):\n"
2953
msgstr ""
2954
2955
#: bzrlib/builtins.py:4690
2956
#, python-format
2957
msgid "You are missing %d revision(s):\n"
2958
msgstr ""
2959
2960
#: bzrlib/builtins.py:4700
2961
msgid "This branch has no new revisions.\n"
2962
msgstr ""
2963
2964
#: bzrlib/builtins.py:4703
2965
msgid "Other branch has no new revisions.\n"
2966
msgstr ""
2967
2968
#: bzrlib/builtins.py:4708
2969
msgid "Branches are up to date.\n"
2970
msgstr ""
2971
2972
#: bzrlib/builtins.py:4719
2973
msgid "Compress the data within a repository."
2974
msgstr ""
2975
2976
#: bzrlib/builtins.py:4721
2977
msgid ""
2978
"This operation compresses the data within a bazaar repository. As\n"
2979
"bazaar supports automatic packing of repository, this operation is\n"
2980
"normally not required to be done manually."
2981
msgstr ""
2982
2983
#: bzrlib/builtins.py:4725
2984
msgid ""
2985
"During the pack operation, bazaar takes a backup of existing repository\n"
2986
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
2987
"automatically when it is safe to do so. To save disk space by removing\n"
2988
"the backed up pack files, the --clean-obsolete-packs option may be\n"
2989
"used."
2990
msgstr ""
2991
2992
#: bzrlib/builtins.py:4731
2993
msgid ""
2994
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
2995
"during or immediately after repacking, you may be left with a state\n"
2996
"where the deletion has been written to disk but the new packs have not\n"
2997
"been. In this case the repository may be unusable."
2998
msgstr ""
2999
3000
# help of 'clean-obsolete-packs' option of 'pack' command
3001
#: bzrlib/builtins.py:4740
3002
msgid "Delete obsolete packs to save disk space."
3003
msgstr ""
3004
3005
#: bzrlib/builtins.py:4754
3006
msgid "List the installed plugins."
3007
msgstr ""
3008
3009
#: bzrlib/builtins.py:4756
3010
msgid ""
3011
"This command displays the list of installed plugins including\n"
3012
"version of plugin and a short description of each."
3013
msgstr ""
3014
3015
#: bzrlib/builtins.py:4759
3016
msgid "--verbose shows the path where each plugin is located."
3017
msgstr ""
3018
3019
#: bzrlib/builtins.py:4761
3020
msgid ""
3021
"A plugin is an external component for Bazaar that extends the\n"
3022
"revision control system, by adding or replacing code in Bazaar.\n"
3023
"Plugins can do a variety of things, including overriding commands,\n"
3024
"adding new commands, providing additional network transports and\n"
3025
"customizing log output."
3026
msgstr ""
3027
3028
#: bzrlib/builtins.py:4767
3029
msgid ""
3030
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3031
"for further information on plugins including where to find them and how to\n"
3032
"install them. Instructions are also provided there on how to write new\n"
3033
"plugins using the Python programming language."
3034
msgstr ""
3035
3036
#: bzrlib/builtins.py:4783
3037
msgid "Show testament (signing-form) of a revision."
3038
msgstr ""
3039
3040
# help of 'long' option of 'testament' command
3041
#: bzrlib/builtins.py:4786
3042
msgid "Produce long-format testament."
3043
msgstr ""
3044
3045
# help of 'strict' option of 'testament' command
3046
#: bzrlib/builtins.py:4788
3047
msgid "Produce a strict-format testament."
3048
msgstr ""
3049
3050
#: bzrlib/builtins.py:4814
3051
msgid "Show the origin of each line in a file."
3052
msgstr ""
3053
3054
#: bzrlib/builtins.py:4816
3055
msgid ""
3056
"This prints out the given file with an annotation on the left side\n"
3057
"indicating which revision, author and date introduced the change."
3058
msgstr ""
3059
3060
#: bzrlib/builtins.py:4819
3061
msgid ""
3062
"If the origin is the same for a run of consecutive lines, it is\n"
3063
"shown only at the top, unless the --all option is given."
3064
msgstr ""
3065
3066
# help of 'all' option of 'annotate' command
3067
#: bzrlib/builtins.py:4827
3068
msgid "Show annotations on all lines."
3069
msgstr ""
3070
3071
# help of 'long' option of 'annotate' command
3072
#: bzrlib/builtins.py:4828
3073
msgid "Show commit date in annotations."
3074
msgstr ""
3075
3076
#: bzrlib/builtins.py:4915
3077
msgid "Cannot sign a range of non-revision-history revisions"
3078
msgstr ""
3079
3080
#: bzrlib/builtins.py:4927
3081
msgid "Please supply either one revision, or a range."
3082
msgstr ""
3083
3084
#: bzrlib/builtins.py:4931
3085
msgid ""
3086
"Convert the current branch into a checkout of the supplied branch.\n"
3087
"If no branch is supplied, rebind to the last bound location."
3088
msgstr ""
3089
3090
#: bzrlib/builtins.py:4934
3091
msgid ""
3092
"Once converted into a checkout, commits must succeed on the master branch\n"
3093
"before they will be applied to the local branch."
3094
msgstr ""
3095
3096
#: bzrlib/builtins.py:4937
3097
msgid ""
3098
"Bound branches use the nickname of its master branch unless it is set\n"
3099
"locally, in which case binding will update the local nickname to be\n"
3100
"that of the master."
3101
msgstr ""
3102
3103
#: bzrlib/builtins.py:4952
3104
msgid "No location supplied. This format does not remember old locations."
3105
msgstr ""
3106
3107
#: bzrlib/builtins.py:4957
3108
msgid "Branch is already bound"
3109
msgstr ""
3110
3111
#: bzrlib/builtins.py:4959
3112
msgid "No location supplied and no previous location known"
3113
msgstr ""
3114
3115
#: bzrlib/builtins.py:4965
3116
msgid "These branches have diverged. Try merging, and then bind again."
3117
msgstr ""
3118
3119
#: bzrlib/builtins.py:4972
3120
msgid "Convert the current checkout into a regular branch."
3121
msgstr ""
3122
3123
#: bzrlib/builtins.py:4974
3124
msgid ""
3125
"After unbinding, the local branch is considered independent and subsequent\n"
3126
"commits will be local only."
3127
msgstr ""
3128
3129
#: bzrlib/builtins.py:4985
3130
msgid "Local branch is not bound"
3131
msgstr ""
3132
3133
#: bzrlib/builtins.py:4989
3134
msgid "Remove the last committed revision."
3135
msgstr ""
3136
3137
#: bzrlib/builtins.py:4991
3138
msgid ""
3139
"--verbose will print out what is being removed.\n"
3140
"--dry-run will go through all the motions, but not actually\n"
3141
"remove anything."
3142
msgstr ""
3143
3144
#: bzrlib/builtins.py:4995
3145
msgid ""
3146
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3147
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3148
"branch at revision 15."
3149
msgstr ""
3150
3151
#: bzrlib/builtins.py:4999
3152
msgid ""
3153
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3154
"it may make is to restore any pending merges that were present before\n"
3155
"the commit."
3156
msgstr ""
3157
3158
# help of 'dry-run' option of 'uncommit' command
3159
#: bzrlib/builtins.py:5010
3160
msgid "Don't actually make changes."
3161
msgstr ""
3162
3163
# help of 'force' option of 'uncommit' command
3164
#: bzrlib/builtins.py:5011
3165
msgid "Say yes to all questions."
3166
msgstr ""
3167
3168
# help of 'keep-tags' option of 'uncommit' command
3169
#: bzrlib/builtins.py:5013
3170
msgid "Keep tags that point to removed revisions."
3171
msgstr ""
3172
3173
# help of 'local' option of 'uncommit' command
3174
#: bzrlib/builtins.py:5015
3175
msgid "Only remove the commits from the local branch when in a checkout."
3176
msgstr ""
3177
3178
#: bzrlib/builtins.py:5064
3179
msgid "No revisions to uncommit.\n"
3180
msgstr ""
3181
3182
#: bzrlib/builtins.py:5079
3183
msgid "Dry-run, pretending to remove the above revisions.\n"
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:5082
3187
msgid "The above revision(s) will be removed.\n"
3188
msgstr ""
3189
3190
#: bzrlib/builtins.py:5086
3191
msgid "Uncommit these revisions"
3192
msgstr ""
3193
3194
#: bzrlib/builtins.py:5089
3195
msgid "Canceled\n"
3196
msgstr ""
3197
3198
#: bzrlib/builtins.py:5096
3199
#, python-format
3200
msgid ""
3201
"You can restore the old tip by running:\n"
3202
" bzr pull . -r revid:%s\n"
3203
msgstr ""
3204
3205
#: bzrlib/builtins.py:5101
3206
msgid "Break a dead lock."
3207
msgstr ""
3208
3209
#: bzrlib/builtins.py:5103
3210
msgid ""
3211
"This command breaks a lock on a repository, branch, working directory or\n"
3212
"config file."
3213
msgstr ""
3214
3215
#: bzrlib/builtins.py:5106
3216
msgid ""
3217
"CAUTION: Locks should only be broken when you are sure that the process\n"
3218
"holding the lock has been stopped."
3219
msgstr ""
3220
3221
#: bzrlib/builtins.py:5109
3222
msgid ""
3223
"You can get information on what locks are open via the 'bzr info\n"
3224
"[location]' command."
3225
msgstr ""
3226
3227
#: bzrlib/builtins.py:5112
3228
msgid ""
3229
":Examples:\n"
3230
" bzr break-lock\n"
3231
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3232
" bzr break-lock --conf ~/.bazaar"
3233
msgstr ""
3234
3235
# help of 'config' option of 'break-lock' command
3236
#: bzrlib/builtins.py:5121
3237
msgid "LOCATION is the directory where the config lock is."
3238
msgstr ""
3239
3240
# help of 'force' option of 'break-lock' command
3241
#: bzrlib/builtins.py:5123
3242
msgid "Do not ask for confirmation before breaking the lock."
3243
msgstr ""
3244
3245
#: bzrlib/builtins.py:5159
3246
msgid "Run the bzr server."
3247
msgstr ""
3248
3249
# help of 'inet' option of 'serve' command
3250
#: bzrlib/builtins.py:5165
3251
msgid "Serve on stdin/out for use from inetd or sshd."
3252
msgstr ""
3253
3254
# title of 'protocol' option of 'serve' command
3255
#: bzrlib/builtins.py:5166
3256
msgid "protocol"
3257
msgstr ""
3258
3259
# help of 'protocol' option of 'serve' command
3260
#: bzrlib/builtins.py:5167
3261
msgid "Protocol to serve."
3262
msgstr ""
3263
3264
# help of 'port' option of 'serve' command
3265
#: bzrlib/builtins.py:5171
3266
msgid ""
3267
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3268
"Passing 0 as the port number will result in a dynamically allocated port. "
3269
"The default port depends on the protocol."
3270
msgstr ""
3271
3272
# help of 'directory' option of 'serve' command
3273
#: bzrlib/builtins.py:5177
3274
msgid "Serve contents of this directory."
3275
msgstr ""
3276
3277
# help of 'allow-writes' option of 'serve' command
3278
#: bzrlib/builtins.py:5179
3279
msgid ""
3280
"By default the server is a readonly server. Supplying --allow-writes "
3281
"enables write access to the contents of the served directory and below. "
3282
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3283
"of external authentication is arranged supplying this option leads to global "
3284
"uncontrolled write access to your file system."
3285
msgstr ""
3286
3287
#: bzrlib/builtins.py:5224
3288
msgid "Combine a tree into its containing tree."
3289
msgstr ""
3290
3291
#: bzrlib/builtins.py:5226
3292
msgid "This command requires the target tree to be in a rich-root format."
3293
msgstr ""
3294
3295
#: bzrlib/builtins.py:5228
3296
msgid ""
3297
"The TREE argument should be an independent tree, inside another tree, but\n"
3298
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3299
"running \"bzr branch\" with the target inside a tree.)"
3300
msgstr ""
3301
3302
#: bzrlib/builtins.py:5232
3303
msgid ""
3304
"The result is a combined tree, with the subtree no longer an independent\n"
3305
"part. This is marked as a merge of the subtree into the containing tree,\n"
3306
"and all history is preserved."
3307
msgstr ""
3308
3309
#: bzrlib/builtins.py:5250
3310
#, python-format
3311
msgid ""
3312
"Can't join trees because %s doesn't support rich root data.\n"
3313
"You can use bzr upgrade on the repository."
3314
msgstr ""
3315
3316
#: bzrlib/builtins.py:5259 bzrlib/builtins.py:5265
3317
#, python-format
3318
msgid "Cannot join %s. %s"
3319
msgstr ""
3320
3321
#: bzrlib/builtins.py:5270
3322
msgid "Split a subdirectory of a tree into a separate tree."
3323
msgstr ""
3324
3325
#: bzrlib/builtins.py:5272
3326
msgid ""
3327
"This command will produce a target tree in a format that supports\n"
3328
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3329
"converted into earlier formats like 'dirstate-tags'."
3330
msgstr ""
3331
3332
#: bzrlib/builtins.py:5276
3333
msgid ""
3334
"The TREE argument should be a subdirectory of a working tree. That\n"
3335
"subdirectory will be converted into an independent tree, with its own\n"
3336
"branch. Commits in the top-level tree will not apply to the new subtree."
3337
msgstr ""
3338
3339
#: bzrlib/builtins.py:5356
3340
msgid "No submit branch specified or known"
3341
msgstr ""
3342
3343
#: bzrlib/builtins.py:5364
3344
msgid "No public branch specified or known"
3345
msgstr ""
3346
3347
#: bzrlib/builtins.py:5369
3348
msgid "bzr merge-directive takes at most two one revision identifiers"
3349
msgstr ""
3350
3351
#: bzrlib/builtins.py:5378
3352
msgid "No revisions to bundle."
3353
msgstr ""
3354
3355
#: bzrlib/builtins.py:5397
3356
msgid "Mail or create a merge-directive for submitting changes."
3357
msgstr ""
3358
3359
#: bzrlib/builtins.py:5399
3360
msgid "A merge directive provides many things needed for requesting merges:"
3361
msgstr ""
3362
3363
#: bzrlib/builtins.py:5401
3364
msgid "* A machine-readable description of the merge to perform"
3365
msgstr ""
3366
3367
#: bzrlib/builtins.py:5403
3368
msgid "* An optional patch that is a preview of the changes requested"
3369
msgstr ""
3370
3371
#: bzrlib/builtins.py:5405
3372
msgid ""
3373
"* An optional bundle of revision data, so that the changes can be applied\n"
3374
" directly from the merge directive, without retrieving data from a\n"
3375
" branch."
3376
msgstr ""
3377
3378
#: bzrlib/builtins.py:5409
3379
msgid ""
3380
"`bzr send` creates a compact data set that, when applied using bzr\n"
3381
"merge, has the same effect as merging from the source branch. "
3382
msgstr ""
3383
3384
#: bzrlib/builtins.py:5412
3385
msgid ""
3386
"By default the merge directive is self-contained and can be applied to any\n"
3387
"branch containing submit_branch in its ancestory without needing access to\n"
3388
"the source branch."
3389
msgstr ""
3390
3391
#: bzrlib/builtins.py:5416
3392
msgid ""
3393
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3394
"revisions, but only a structured request to merge from the\n"
3395
"public_location. In that case the public_branch is needed and it must be\n"
3396
"up-to-date and accessible to the recipient. The public_branch is always\n"
3397
"included if known, so that people can check it later."
3398
msgstr ""
3399
3400
#: bzrlib/builtins.py:5422
3401
msgid ""
3402
"The submit branch defaults to the parent of the source branch, but can be\n"
3403
"overridden. Both submit branch and public branch will be remembered in\n"
3404
"branch.conf the first time they are used for a particular branch. The\n"
3405
"source branch defaults to that containing the working directory, but can\n"
3406
"be changed using --from."
3407
msgstr ""
3408
3409
#: bzrlib/builtins.py:5428
3410
msgid ""
3411
"Both the submit branch and the public branch follow the usual behavior with\n"
3412
"respect to --remember: If there is no default location set, the first send\n"
3413
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3414
"omit the location to use the default. To change the default, use\n"
3415
"--remember. The value will only be saved if the location can be accessed."
3416
msgstr ""
3417
3418
#: bzrlib/builtins.py:5434
3419
msgid ""
3420
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3421
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3422
"If a public location is known for the submit_branch, that location is used\n"
3423
"in the merge directive."
3424
msgstr ""
3425
3426
#: bzrlib/builtins.py:5439
3427
msgid ""
3428
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3429
"given, in which case it is sent to a file."
3430
msgstr ""
3431
3432
#: bzrlib/builtins.py:5442
3433
msgid ""
3434
"Mail is sent using your preferred mail program. This should be transparent\n"
3435
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3436
"If the preferred client can't be found (or used), your editor will be used."
3437
msgstr ""
3438
3439
#: bzrlib/builtins.py:5446
3440
msgid ""
3441
"To use a specific mail program, set the mail_client configuration option.\n"
3442
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3443
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
3444
"\" (MacOS X's\n"
3445
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3446
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3447
"add\n"
3448
"supported clients."
3449
msgstr ""
3450
3451
#: bzrlib/builtins.py:5453
3452
msgid ""
3453
"If mail is being sent, a to address is required. This can be supplied\n"
3454
"either on the commandline, by setting the submit_to configuration\n"
3455
"option in the branch itself or the child_submit_to configuration option\n"
3456
"in the submit branch."
3457
msgstr ""
3458
3459
#: bzrlib/builtins.py:5458
3460
msgid ""
3461
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3462
"and\n"
3463
"merge directive format 2. It is significantly faster and smaller than\n"
3464
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3465
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3466
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3467
msgstr ""
3468
3469
#: bzrlib/builtins.py:5464
3470
msgid ""
3471
"The merge directives created by bzr send may be applied using bzr merge or\n"
3472
"bzr pull by specifying a file containing a merge directive as the location."
3473
msgstr ""
3474
3475
#: bzrlib/builtins.py:5467
3476
msgid ""
3477
"bzr send makes extensive use of public locations to map local locations "
3478
"into\n"
3479
"URLs that can be used by other people. See `bzr help configuration` to\n"
3480
"set them, and use `bzr info` to display them."
3481
msgstr ""
3482
3483
# help of 'output' option of 'send' command
3484
#: bzrlib/builtins.py:5491
3485
msgid "Write merge directive to this file or directory; use - for stdout."
3486
msgstr ""
3487
3488
# help of 'strict' option of 'send' command
3489
#: bzrlib/builtins.py:5495
3490
msgid ""
3491
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3492
"strict disables the check."
3493
msgstr ""
3494
3495
# help of 'mail-to' option of 'send' command
3496
#: bzrlib/builtins.py:5497
3497
msgid "Mail the request to this address."
3498
msgstr ""
3499
3500
# help of 'body' option of 'send' command
3501
#: bzrlib/builtins.py:5501
3502
msgid "Body for the email."
3503
msgstr ""
3504
3505
# help of 'no-bundle' option of 'send' command
3506
#: bzrlib/builtins.py:5554
3507
msgid "Do not include a bundle in the merge directive."
3508
msgstr ""
3509
3510
# help of 'no-patch' option of 'send' command
3511
#: bzrlib/builtins.py:5555
3512
msgid "Do not include a preview patch in the merge directive."
3513
msgstr ""
3514
3515
# help of 'remember' option of 'send' command
3516
#: bzrlib/builtins.py:5558
3517
msgid "Remember submit and public branch."
3518
msgstr ""
3519
3520
# help of 'from' option of 'send' command
3521
#: bzrlib/builtins.py:5560
3522
msgid ""
3523
"Branch to generate the submission from, rather than the one containing the "
3524
"working directory."
3525
msgstr ""
3526
3527
# title of 'format' option of 'send' command
3528
#: bzrlib/builtins.py:5570
3529
msgid "format"
3530
msgstr ""
3531
3532
# help of 'format' option of 'send' command
3533
#: bzrlib/builtins.py:5571
3534
msgid "Use the specified output format."
3535
msgstr ""
3536
3537
#: bzrlib/builtins.py:5593
3538
msgid "Create, remove or modify a tag naming a revision."
3539
msgstr ""
3540
3541
#: bzrlib/builtins.py:5595
3542
msgid ""
3543
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3544
"(--revision) option can be given -rtag:X, where X is any previously\n"
3545
"created tag."
3546
msgstr ""
3547
3548
#: bzrlib/builtins.py:5599
3549
msgid ""
3550
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3551
"along when you branch, push, pull or merge."
3552
msgstr ""
3553
3554
#: bzrlib/builtins.py:5602
3555
msgid ""
3556
"It is an error to give a tag name that already exists unless you pass\n"
3557
"--force, in which case the tag is moved to point to the new revision."
3558
msgstr ""
3559
3560
#: bzrlib/builtins.py:5605
3561
msgid ""
3562
"To rename a tag (change the name but keep it on the same revsion), run "
3563
"``bzr\n"
3564
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3565
msgstr ""
3566
3567
#: bzrlib/builtins.py:5608
3568
msgid ""
3569
"If no tag name is specified it will be determined through the \n"
3570
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3571
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3572
"details."
3573
msgstr ""
3574
3575
# help of 'delete' option of 'tag' command
3576
#: bzrlib/builtins.py:5618
3577
msgid "Delete this tag rather than placing it."
3578
msgstr ""
3579
3580
# help of 'directory' option of 'tag' command
3581
#: bzrlib/builtins.py:5621
3582
msgid "Branch in which to place the tag."
3583
msgstr ""
3584
3585
# help of 'force' option of 'tag' command
3586
#: bzrlib/builtins.py:5623
3587
msgid "Replace existing tags."
3588
msgstr ""
3589
3590
#: bzrlib/builtins.py:5638
3591
msgid "No tag specified to delete."
3592
msgstr ""
3593
3594
#: bzrlib/builtins.py:5640
3595
#, python-format
3596
msgid "Deleted tag %s."
3597
msgstr ""
3598
3599
#: bzrlib/builtins.py:5645
3600
msgid "Tags can only be placed on a single revision, not on a range"
3601
msgstr ""
3602
3603
#: bzrlib/builtins.py:5654
3604
msgid "Please specify a tag name."
3605
msgstr ""
3606
3607
#: bzrlib/builtins.py:5662
3608
#, python-format
3609
msgid "Tag %s already exists for that revision."
3610
msgstr ""
3611
3612
#: bzrlib/builtins.py:5666
3613
#, python-format
3614
msgid "Created tag %s."
3615
msgstr ""
3616
3617
#: bzrlib/builtins.py:5668
3618
#, python-format
3619
msgid "Updated tag %s."
3620
msgstr ""
3621
3622
#: bzrlib/builtins.py:5672
3623
msgid "List tags."
3624
msgstr ""
3625
3626
#: bzrlib/builtins.py:5674
3627
msgid ""
3628
"This command shows a table of tag names and the revisions they reference."
3629
msgstr ""
3630
3631
# help of 'directory' option of 'tags' command
3632
#: bzrlib/builtins.py:5680
3633
msgid "Branch whose tags should be displayed."
3634
msgstr ""
3635
3636
# help of 'sort' option of 'tags' command
3637
#: bzrlib/builtins.py:5682
3638
msgid "Sort tags by different criteria."
3639
msgstr ""
3640
3641
# title of 'sort' option of 'tags' command
3642
#: bzrlib/builtins.py:5682
3643
msgid "Sorting"
3644
msgstr ""
3645
3646
#: bzrlib/builtins.py:5727
3647
msgid "Reconfigure the type of a bzr directory."
3648
msgstr ""
3649
3650
#: bzrlib/builtins.py:5729
3651
msgid "A target configuration must be specified."
3652
msgstr ""
3653
3654
#: bzrlib/builtins.py:5731
3655
msgid ""
3656
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3657
"The order of preference is\n"
3658
"1. For a lightweight checkout, the current bound location.\n"
3659
"2. For branches that used to be checkouts, the previously-bound location.\n"
3660
"3. The push location.\n"
3661
"4. The parent location.\n"
3662
"If none of these is available, --bind-to must be specified."
3663
msgstr ""
3664
3665
# title of 'tree_type' option of 'reconfigure' command
3666
#: bzrlib/builtins.py:5745
3667
msgid "Tree type"
3668
msgstr ""
3669
3670
# help of 'tree_type' option of 'reconfigure' command
3671
#: bzrlib/builtins.py:5746
3672
msgid "The relation between branch and tree."
3673
msgstr ""
3674
3675
# title of 'repository_type' option of 'reconfigure' command
3676
#: bzrlib/builtins.py:5756
3677
msgid "Repository type"
3678
msgstr ""
3679
3680
# help of 'repository_type' option of 'reconfigure' command
3681
#: bzrlib/builtins.py:5757
3682
msgid "Location fo the repository."
3683
msgstr ""
3684
3685
# title of 'repository_trees' option of 'reconfigure' command
3686
#: bzrlib/builtins.py:5765
3687
msgid "Trees in Repository"
3688
msgstr ""
3689
3690
# help of 'repository_trees' option of 'reconfigure' command
3691
#: bzrlib/builtins.py:5766
3692
msgid "Whether new branches in the repository have trees."
3693
msgstr ""
3694
3695
# help of 'bind-to' option of 'reconfigure' command
3696
#: bzrlib/builtins.py:5773
3697
msgid "Branch to bind checkout to."
3698
msgstr ""
3699
3700
# help of 'force' option of 'reconfigure' command
3701
#: bzrlib/builtins.py:5775
3702
msgid "Perform reconfiguration even if local changes will be lost."
3703
msgstr ""
3704
3705
# help of 'stacked-on' option of 'reconfigure' command
3706
#: bzrlib/builtins.py:5778
3707
msgid "Reconfigure a branch to be stacked on another branch."
3708
msgstr ""
3709
3710
# help of 'unstacked' option of 'reconfigure' command
3711
#: bzrlib/builtins.py:5782
3712
msgid ""
3713
"Reconfigure a branch to be unstacked. This may require copying substantial "
3714
"data into it."
3715
msgstr ""
3716
3717
#: bzrlib/builtins.py:5792
3718
msgid "Can't use both --stacked-on and --unstacked"
3719
msgstr ""
3720
3721
#: bzrlib/builtins.py:5806
3722
msgid "No target configuration specified"
3723
msgstr ""
3724
3725
#: bzrlib/builtins.py:5841
3726
msgid "Set the branch of a checkout and update."
3727
msgstr ""
3728
3729
#: bzrlib/builtins.py:5843
3730
msgid ""
3731
"For lightweight checkouts, this changes the branch being referenced.\n"
3732
"For heavyweight checkouts, this checks that there are no local commits\n"
3733
"versus the current bound branch, then it makes the local branch a mirror\n"
3734
"of the new location and binds to it."
3735
msgstr ""
3736
3737
#: bzrlib/builtins.py:5848
3738
msgid ""
3739
"In both cases, the working tree is updated and uncommitted changes\n"
3740
"are merged. The user can commit or revert these as they desire."
3741
msgstr ""
3742
3743
#: bzrlib/builtins.py:5851
3744
msgid "Pending merges need to be committed or reverted before using switch."
3745
msgstr ""
3746
3747
#: bzrlib/builtins.py:5853
3748
msgid ""
3749
"The path to the branch to switch to can be specified relative to the parent\n"
3750
"directory of the current branch. For example, if you are currently in a\n"
3751
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3752
"/path/to/newbranch."
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:5858
3756
msgid ""
3757
"Bound branches use the nickname of its master branch unless it is set\n"
3758
"locally, in which case switching will update the local nickname to be\n"
3759
"that of the master."
3760
msgstr ""
3761
3762
# help of 'force' option of 'switch' command
3763
#: bzrlib/builtins.py:5866
3764
msgid "Switch even if local commits will be lost."
3765
msgstr ""
3766
3767
# help of 'create-branch' option of 'switch' command
3768
#: bzrlib/builtins.py:5869
3769
msgid "Create the target branch from this one before switching to it."
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:5881
3773
msgid "You must supply either a revision or a location"
3774
msgstr ""
3775
3776
#: bzrlib/builtins.py:5892
3777
msgid "cannot create branch without source branch"
3778
msgstr ""
3779
3780
#: bzrlib/builtins.py:5938
3781
msgid "Manage filtered views."
3782
msgstr ""
3783
3784
#: bzrlib/builtins.py:5940
3785
msgid ""
3786
"Views provide a mask over the tree so that users can focus on\n"
3787
"a subset of a tree when doing their work. After creating a view,\n"
3788
"commands that support a list of files - status, diff, commit, etc -\n"
3789
"effectively have that list of files implicitly given each time.\n"
3790
"An explicit list of files can still be given but those files\n"
3791
"must be within the current view."
3792
msgstr ""
3793
3794
#: bzrlib/builtins.py:5947
3795
msgid ""
3796
"In most cases, a view has a short life-span: it is created to make\n"
3797
"a selected change and is deleted once that change is committed.\n"
3798
"At other times, you may wish to create one or more named views\n"
3799
"and switch between them."
3800
msgstr ""
3801
3802
#: bzrlib/builtins.py:5952
3803
msgid ""
3804
"To disable the current view without deleting it, you can switch to\n"
3805
"the pseudo view called ``off``. This can be useful when you need\n"
3806
"to see the whole tree for an operation or two (e.g. merge) but\n"
3807
"want to switch back to your view after that."
3808
msgstr ""
3809
3810
#: bzrlib/builtins.py:5957
3811
msgid ""
3812
":Examples:\n"
3813
" To define the current view::"
3814
msgstr ""
3815
3816
#: bzrlib/builtins.py:5960
3817
msgid " bzr view file1 dir1 ..."
3818
msgstr ""
3819
3820
#: bzrlib/builtins.py:5962
3821
msgid " To list the current view::"
3822
msgstr ""
3823
3824
#: bzrlib/builtins.py:5964
3825
msgid " bzr view"
3826
msgstr ""
3827
3828
#: bzrlib/builtins.py:5966
3829
msgid " To delete the current view::"
3830
msgstr ""
3831
3832
#: bzrlib/builtins.py:5968
3833
msgid " bzr view --delete"
3834
msgstr ""
3835
3836
#: bzrlib/builtins.py:5970
3837
msgid " To disable the current view without deleting it::"
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:5972
3841
msgid " bzr view --switch off"
3842
msgstr ""
3843
3844
#: bzrlib/builtins.py:5974
3845
msgid " To define a named view and switch to it::"
3846
msgstr ""
3847
3848
#: bzrlib/builtins.py:5976
3849
msgid " bzr view --name view-name file1 dir1 ..."
3850
msgstr ""
3851
3852
#: bzrlib/builtins.py:5978
3853
msgid " To list a named view::"
3854
msgstr ""
3855
3856
#: bzrlib/builtins.py:5980
3857
msgid " bzr view --name view-name"
3858
msgstr ""
3859
3860
#: bzrlib/builtins.py:5982
3861
msgid " To delete a named view::"
3862
msgstr ""
3863
3864
#: bzrlib/builtins.py:5984
3865
msgid " bzr view --name view-name --delete"
3866
msgstr ""
3867
3868
#: bzrlib/builtins.py:5986
3869
msgid " To switch to a named view::"
3870
msgstr ""
3871
3872
#: bzrlib/builtins.py:5988
3873
msgid " bzr view --switch view-name"
3874
msgstr ""
3875
3876
#: bzrlib/builtins.py:5990
3877
msgid " To list all views defined::"
3878
msgstr ""
3879
3880
#: bzrlib/builtins.py:5992
3881
msgid " bzr view --all"
3882
msgstr ""
3883
3884
#: bzrlib/builtins.py:5994
3885
msgid " To delete all views::"
3886
msgstr ""
3887
3888
#: bzrlib/builtins.py:5996
3889
msgid " bzr view --delete --all"
3890
msgstr ""
3891
3892
# help of 'all' option of 'view' command
3893
#: bzrlib/builtins.py:6003
3894
msgid "Apply list or delete action to all views."
3895
msgstr ""
3896
3897
# help of 'delete' option of 'view' command
3898
#: bzrlib/builtins.py:6006
3899
msgid "Delete the view."
3900
msgstr ""
3901
3902
# help of 'name' option of 'view' command
3903
#: bzrlib/builtins.py:6009
3904
msgid "Name of the view to define, list or delete."
3905
msgstr ""
3906
3907
# help of 'switch' option of 'view' command
3908
#: bzrlib/builtins.py:6013
3909
msgid "Name of the view to switch to."
3910
msgstr ""
3911
3912
#: bzrlib/builtins.py:6032
3913
msgid "Both --delete and a file list specified"
3914
msgstr ""
3915
3916
#: bzrlib/builtins.py:6035
3917
msgid "Both --delete and --switch specified"
3918
msgstr ""
3919
3920
#: bzrlib/builtins.py:6038
3921
msgid "Deleted all views.\n"
3922
msgstr ""
3923
3924
#: bzrlib/builtins.py:6040
3925
msgid "No current view to delete"
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:6043
3929
#, python-format
3930
msgid "Deleted '%s' view.\n"
3931
msgstr ""
3932
3933
#: bzrlib/builtins.py:6047
3934
msgid "Both --switch and a file list specified"
3935
msgstr ""
3936
3937
#: bzrlib/builtins.py:6050
3938
msgid "Both --switch and --all specified"
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:6053
3942
msgid "No current view to disable"
3943
msgstr ""
3944
3945
#: bzrlib/builtins.py:6055
3946
#, python-format
3947
msgid "Disabled '%s' view.\n"
3948
msgstr ""
3949
3950
#: bzrlib/builtins.py:6059 bzrlib/builtins.py:6081
3951
#, python-format
3952
msgid "Using '%s' view: %s\n"
3953
msgstr ""
3954
3955
#: bzrlib/builtins.py:6062
3956
msgid "Views defined:\n"
3957
msgstr ""
3958
3959
#: bzrlib/builtins.py:6071
3960
msgid "No views defined.\n"
3961
msgstr ""
3962
3963
#: bzrlib/builtins.py:6078
3964
msgid "Cannot change the 'off' pseudo view"
3965
msgstr ""
3966
3967
#: bzrlib/builtins.py:6086
3968
msgid "No current view.\n"
3969
msgstr ""
3970
3971
#: bzrlib/builtins.py:6089
3972
#, python-format
3973
msgid "'%s' view is: %s\n"
3974
msgstr ""
3975
3976
#: bzrlib/builtins.py:6109
3977
msgid " <no hooks installed>\n"
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:6113
3981
msgid "Remove a branch."
3982
msgstr ""
3983
3984
#: bzrlib/builtins.py:6115
3985
msgid ""
3986
"This will remove the branch from the specified location but \n"
3987
"will keep any working tree or repository in place."
3988
msgstr ""
3989
3990
#: bzrlib/builtins.py:6120
3991
msgid " Remove the branch at repo/trunk::"
3992
msgstr ""
3993
3994
#: bzrlib/builtins.py:6122
3995
msgid " bzr remove-branch repo/trunk"
3996
msgstr ""
3997
3998
#: bzrlib/builtins.py:6138
3999
msgid "Temporarily set aside some changes from the current tree."
4000
msgstr ""
4001
4002
#: bzrlib/builtins.py:6140
4003
msgid ""
4004
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4005
"ie. out of the way, until a later time when you can bring them back from\n"
4006
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4007
"your working tree, and so they aren't propagated along with your branch nor\n"
4008
"will they survive its deletion."
4009
msgstr ""
4010
4011
#: bzrlib/builtins.py:6146
4012
msgid "If shelve --list is specified, previously-shelved changes are listed."
4013
msgstr ""
4014
4015
#: bzrlib/builtins.py:6148
4016
msgid ""
4017
"Shelve is intended to help separate several sets of changes that have\n"
4018
"been inappropriately mingled. If you just want to get rid of all changes\n"
4019
"and you don't need to restore them later, use revert. If you want to\n"
4020
"shelve all text changes at once, use shelve --all."
4021
msgstr ""
4022
4023
#: bzrlib/builtins.py:6153
4024
msgid ""
4025
"If filenames are specified, only the changes to those files will be\n"
4026
"shelved. Other files will be left untouched."
4027
msgstr ""
4028
4029
#: bzrlib/builtins.py:6156
4030
msgid ""
4031
"If a revision is specified, changes since that revision will be shelved."
4032
msgstr ""
4033
4034
#: bzrlib/builtins.py:6158
4035
msgid ""
4036
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4037
"restore the most recently shelved changes."
4038
msgstr ""
4039
4040
#: bzrlib/builtins.py:6161
4041
msgid ""
4042
"For complicated changes, it is possible to edit the changes in a separate\n"
4043
"editor program to decide what the file remaining in the working copy\n"
4044
"should look like. To do this, add the configuration option"
4045
msgstr ""
4046
4047
#: bzrlib/builtins.py:6165
4048
msgid " change_editor = PROGRAM @new_path @old_path"
4049
msgstr ""
4050
4051
#: bzrlib/builtins.py:6167
4052
msgid ""
4053
"where @new_path is replaced with the path of the new version of the \n"
4054
"file and @old_path is replaced with the path of the old version of \n"
4055
"the file. The PROGRAM should save the new file with the desired \n"
4056
"contents of the file in the working tree.\n"
4057
" "
4058
msgstr ""
4059
4060
# help of 'all' option of 'shelve' command
4061
#: bzrlib/builtins.py:6179
4062
msgid "Shelve all changes."
4063
msgstr ""
4064
4065
# help of 'writer' option of 'shelve' command
4066
#: bzrlib/builtins.py:6181
4067
msgid "Method to use for writing diffs."
4068
msgstr ""
4069
4070
# title of 'writer' option of 'shelve' command
4071
#: bzrlib/builtins.py:6181
4072
msgid "writer"
4073
msgstr ""
4074
4075
# help of 'list' option of 'shelve' command
4076
#: bzrlib/builtins.py:6185
4077
msgid "List shelved changes."
4078
msgstr ""
4079
4080
# help of 'destroy' option of 'shelve' command
4081
#: bzrlib/builtins.py:6187
4082
msgid "Destroy removed changes instead of shelving them."
4083
msgstr ""
4084
4085
#: bzrlib/builtins.py:6216
4086
msgid "No shelved changes."
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:6227
4090
msgid "Restore shelved changes."
4091
msgstr ""
4092
4093
#: bzrlib/builtins.py:6229
4094
msgid ""
4095
"By default, the most recently shelved changes are restored. However if you\n"
4096
"specify a shelf by id those changes will be restored instead. This works\n"
4097
"best when the changes don't depend on each other."
4098
msgstr ""
4099
4100
# help of 'action' option of 'unshelve' command
4101
#: bzrlib/builtins.py:6238
4102
msgid "The action to perform."
4103
msgstr ""
4104
4105
#: bzrlib/builtins.py:6260
4106
msgid "Remove unwanted files from working tree."
4107
msgstr ""
4108
4109
#: bzrlib/builtins.py:6262
4110
msgid ""
4111
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4112
"files are never deleted."
4113
msgstr ""
4114
4115
#: bzrlib/builtins.py:6265
4116
msgid ""
4117
"Another class is 'detritus', which includes files emitted by bzr during\n"
4118
"normal operations and selftests. (The value of these files decreases with\n"
4119
"time.)"
4120
msgstr ""
4121
4122
#: bzrlib/builtins.py:6269
4123
msgid ""
4124
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4125
"flags are respected, and may be combined."
4126
msgstr ""
4127
4128
#: bzrlib/builtins.py:6272
4129
msgid "To check what clean-tree will do, use --dry-run."
4130
msgstr ""
4131
4132
# help of 'ignored' option of 'clean-tree' command
4133
#: bzrlib/builtins.py:6275
4134
msgid "Delete all ignored files."
4135
msgstr ""
4136
4137
# help of 'detritus' option of 'clean-tree' command
4138
#: bzrlib/builtins.py:6276
4139
msgid ""
4140
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4141
msgstr ""
4142
4143
# help of 'unknown' option of 'clean-tree' command
4144
#: bzrlib/builtins.py:6279
4145
msgid "Delete files unknown to bzr (default)."
4146
msgstr ""
4147
4148
# help of 'dry-run' option of 'clean-tree' command
4149
#: bzrlib/builtins.py:6280
4150
msgid "Show files to delete instead of deleting them."
4151
msgstr ""
4152
4153
# help of 'force' option of 'clean-tree' command
4154
#: bzrlib/builtins.py:6282
4155
msgid "Do not prompt before deleting."
4156
msgstr ""
4157
4158
#: bzrlib/cmd_version_info.py:50
4159
msgid "Show version information about this tree."
4160
msgstr ""
4161
4162
#: bzrlib/cmd_version_info.py:52
4163
msgid ""
4164
"You can use this command to add information about version into\n"
4165
"source code of an application. The output can be in one of the\n"
4166
"supported formats or in a custom format based on a template."
4167
msgstr ""
4168
4169
#: bzrlib/cmd_version_info.py:56
4170
msgid "For example::"
4171
msgstr ""
4172
4173
#: bzrlib/cmd_version_info.py:58
4174
msgid ""
4175
" bzr version-info --custom \\\n"
4176
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4177
msgstr ""
4178
4179
#: bzrlib/cmd_version_info.py:61
4180
msgid ""
4181
"will produce a C header file with formatted string containing the\n"
4182
"current revision number. Other supported variables in templates are:"
4183
msgstr ""
4184
4185
#: bzrlib/cmd_version_info.py:64
4186
msgid ""
4187
" * {date} - date of the last revision\n"
4188
" * {build_date} - current date\n"
4189
" * {revno} - revision number\n"
4190
" * {revision_id} - revision id\n"
4191
" * {branch_nick} - branch nickname\n"
4192
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4193
" otherwise 1"
4194
msgstr ""
4195
4196
# help of 'format' option of 'version-info' command
4197
#: bzrlib/cmd_version_info.py:74
4198
msgid "Select the output format."
4199
msgstr ""
4200
4201
# help of 'all' option of 'version-info' command
4202
#: bzrlib/cmd_version_info.py:78
4203
msgid "Include all possible information."
4204
msgstr ""
4205
4206
# help of 'check-clean' option of 'version-info' command
4207
#: bzrlib/cmd_version_info.py:79
4208
msgid "Check if tree is clean."
4209
msgstr ""
4210
4211
# help of 'include-history' option of 'version-info' command
4212
#: bzrlib/cmd_version_info.py:81
4213
msgid "Include the revision-history."
4214
msgstr ""
4215
4216
# help of 'include-file-revisions' option of 'version-info' command
4217
#: bzrlib/cmd_version_info.py:83
4218
msgid "Include the last revision for each file."
4219
msgstr ""
4220
4221
# help of 'template' option of 'version-info' command
4222
#: bzrlib/cmd_version_info.py:84
4223
msgid "Template for the output."
4224
msgstr ""
4225
4226
#: bzrlib/commands.py:479
4227
msgid "No help for this command."
4228
msgstr ""
4229
4230
#: bzrlib/commands.py:492
4231
#, python-format
4232
msgid ":Purpose: %s\n"
4233
msgstr ""
4234
4235
#: bzrlib/commands.py:494
4236
#, python-format
4237
msgid ""
4238
":Usage:\n"
4239
"%s\n"
4240
msgstr ""
4241
4242
#: bzrlib/commands.py:496
4243
#, python-format
4244
msgid ":Usage: %s\n"
4245
msgstr ""
4246
4247
#: bzrlib/commands.py:515
4248
#, python-format
4249
msgid ":Options:%s"
4250
msgstr ""
4251
4252
#: bzrlib/commands.py:526
4253
#, python-format
4254
msgid ""
4255
":Description:\n"
4256
" %s\n"
4257
"\n"
4258
msgstr ""
4259
4260
#: bzrlib/commands.py:536
4261
#, python-format
4262
msgid ""
4263
"See bzr help %s for more details and examples.\n"
4264
"\n"
4265
msgstr ""
4266
4267
#: bzrlib/commands.py:541
4268
msgid ":Aliases: "
4269
msgstr ""
4270
4271
#: bzrlib/commands.py:545
4272
#, python-format
4273
msgid ":From: plugin \"%s\"\n"
4274
msgstr ""
4275
4276
#: bzrlib/commands.py:557
4277
#, python-format
4278
msgid ":doc:`%s <%s-help>`"
4279
msgstr ""
4280
4281
#: bzrlib/commands.py:560
4282
#, python-format
4283
msgid ":See also: %s"
4284
msgstr ""
4285
4286
#: bzrlib/commit_signature_commands.py:34
4287
msgid "Sign all commits by a given committer."
4288
msgstr ""
4289
4290
#: bzrlib/commit_signature_commands.py:36
4291
msgid ""
4292
"If location is not specified the local tree is used.\n"
4293
"If committer is not specified the default committer is used."
4294
msgstr ""
4295
4296
#: bzrlib/commit_signature_commands.py:39
4297
msgid "This does not sign commits that already have signatures."
4298
msgstr ""
4299
4300
# help of 'dry-run' option of 'sign-my-commits' command
4301
#: bzrlib/commit_signature_commands.py:47
4302
msgid ""
4303
"Don't actually sign anything, just print the revisions that would be signed."
4304
msgstr ""
4305
4306
#: bzrlib/commit_signature_commands.py:101
4307
msgid "Verify all commit signatures."
4308
msgstr ""
4309
4310
#: bzrlib/commit_signature_commands.py:103
4311
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
4312
msgstr ""
4313
4314
# help of 'acceptable-keys' option of 'verify-signatures' command
4315
#: bzrlib/commit_signature_commands.py:108
4316
msgid ""
4317
"Comma separated list of GPG key patterns which are acceptable for "
4318
"verification."
4319
msgstr ""
4320
4321
#: bzrlib/commit_signature_commands.py:166
4322
msgid "All commits signed with verifiable keys"
4323
msgstr ""
4324
4325
#: bzrlib/config.py:3293
4326
msgid "Display, set or remove a configuration option."
4327
msgstr ""
4328
4329
#: bzrlib/config.py:3295
4330
msgid "Display the active value for a given option."
4331
msgstr ""
4332
4333
#: bzrlib/config.py:3297
4334
msgid ""
4335
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4336
"matching options are displayed mentioning their scope. The active value\n"
4337
"that bzr will take into account is the first one displayed for each option."
4338
msgstr ""
4339
4340
#: bzrlib/config.py:3301
4341
msgid "If no NAME is given, --all .* is implied."
4342
msgstr ""
4343
4344
#: bzrlib/config.py:3303
4345
msgid ""
4346
"Setting a value is achieved by using name=value without spaces. The value\n"
4347
"is set in the most relevant scope and can be checked by displaying the\n"
4348
"option again."
4349
msgstr ""
4350
4351
# help of 'scope' option of 'config' command
4352
#: bzrlib/config.py:3314
4353
msgid "Reduce the scope to the specified configuration file"
4354
msgstr ""
4355
4356
# help of 'all' option of 'config' command
4357
#: bzrlib/config.py:3318
4358
msgid "Display all the defined values for the matching options."
4359
msgstr ""
4360
4361
# help of 'remove' option of 'config' command
4362
#: bzrlib/config.py:3320
4363
msgid "Remove the option from the configuration file"
4364
msgstr ""
4365
4366
#: bzrlib/conflicts.py:47
4367
msgid "List files with conflicts."
4368
msgstr ""
4369
4370
#: bzrlib/conflicts.py:49
4371
msgid ""
4372
"Merge will do its best to combine the changes in two branches, but there\n"
4373
"are some kinds of problems only a human can fix. When it encounters those,\n"
4374
"it will mark a conflict. A conflict means that you need to fix something,\n"
4375
"before you should commit."
4376
msgstr ""
4377
4378
#: bzrlib/conflicts.py:54
4379
msgid ""
4380
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4381
"is supplied, the pathnames of files with text conflicts are listed,\n"
4382
"instead. (This is useful for editing all files with text conflicts.)"
4383
msgstr ""
4384
4385
#: bzrlib/conflicts.py:58
4386
msgid "Use bzr resolve when you have fixed a problem."
4387
msgstr ""
4388
4389
# help of 'text' option of 'conflicts' command
4390
#: bzrlib/conflicts.py:63
4391
msgid "List paths of files with text conflicts."
4392
msgstr ""
4393
4394
# help of 'action' option of 'resolve' command
4395
#: bzrlib/conflicts.py:95
4396
msgid "How to resolve the conflict."
4397
msgstr ""
4398
4399
#: bzrlib/conflicts.py:101
4400
msgid "Mark a conflict as resolved."
4401
msgstr ""
4402
4403
#: bzrlib/conflicts.py:108
4404
msgid ""
4405
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4406
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4407
"as\n"
4408
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4409
msgstr ""
4410
4411
# help of 'all' option of 'resolve' command
4412
#: bzrlib/conflicts.py:116
4413
msgid "Resolve all conflicts in this tree."
4414
msgstr ""
4415
4416
# title of 'action' option of 'resolve' command
4417
#: bzrlib/conflicts.py:688
4418
msgid "action"
4419
msgstr ""
4420
4421
#: bzrlib/errors.py:215
4422
msgid "The tree builder is already building a tree."
4423
msgstr ""
4424
4425
#: bzrlib/errors.py:236
4426
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4427
msgstr ""
4428
4429
#: bzrlib/errors.py:255
4430
msgid ""
4431
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4432
"versions \"%(minimum)s\" to \"%(current)s\"."
4433
msgstr ""
4434
4435
#: bzrlib/errors.py:267
4436
msgid "The transport '%(transport)s' is only accessible within this process."
4437
msgstr ""
4438
4439
#: bzrlib/errors.py:285
4440
msgid "Invalid revision number %(revno)s"
4441
msgstr ""
4442
4443
#: bzrlib/errors.py:294
4444
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4445
msgstr ""
4446
4447
#: bzrlib/errors.py:305
4448
msgid "Reserved revision-id {%(revision_id)s}"
4449
msgstr ""
4450
4451
#: bzrlib/errors.py:319
4452
msgid "There is no public branch set for \"%(branch_url)s\"."
4453
msgstr ""
4454
4455
#: bzrlib/errors.py:329
4456
msgid ""
4457
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4458
"obtain a list of topics."
4459
msgstr ""
4460
4461
#: bzrlib/errors.py:338
4462
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4463
msgstr ""
4464
4465
#: bzrlib/errors.py:348
4466
msgid ""
4467
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4468
msgstr ""
4469
4470
#: bzrlib/errors.py:357
4471
msgid "The branch '%(branch)s' is not stacked."
4472
msgstr ""
4473
4474
#: bzrlib/errors.py:371
4475
msgid "No WorkingTree exists for \"%(base)s\"."
4476
msgstr ""
4477
4478
#: bzrlib/errors.py:380
4479
msgid "Not currently building a tree."
4480
msgstr ""
4481
4482
#: bzrlib/errors.py:385
4483
msgid "%(url)s is not a local path."
4484
msgstr ""
4485
4486
#: bzrlib/errors.py:413
4487
msgid "%(not_locked)r is not write locked but needs to be."
4488
msgstr ""
4489
4490
#: bzrlib/errors.py:421
4491
msgid "Error in command line options"
4492
msgstr ""
4493
4494
#: bzrlib/errors.py:426
4495
msgid "%(value)s is not an index of type %(_type)s."
4496
msgstr ""
4497
4498
#: bzrlib/errors.py:436
4499
msgid "Error in data for index %(value)s."
4500
msgstr ""
4501
4502
#: bzrlib/errors.py:445
4503
msgid "The key '%(key)s' is already in index '%(index)s'."
4504
msgstr ""
4505
4506
#: bzrlib/errors.py:455
4507
msgid "The key '%(key)s' is not a valid key."
4508
msgstr ""
4509
4510
#: bzrlib/errors.py:464
4511
msgid "Could not parse options for index %(value)s."
4512
msgstr ""
4513
4514
#: bzrlib/errors.py:473
4515
msgid "The value '%(value)s' is not a valid value."
4516
msgstr ""
4517
4518
#: bzrlib/errors.py:501
4519
msgid "Generic path error: %(path)r%(extra)s)"
4520
msgstr ""
4521
4522
#: bzrlib/errors.py:514
4523
msgid "No such file: %(path)r%(extra)s"
4524
msgstr ""
4525
4526
#: bzrlib/errors.py:519
4527
msgid "File exists: %(path)r%(extra)s"
4528
msgstr ""
4529
4530
#: bzrlib/errors.py:525
4531
msgid ""
4532
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
4533
"after to tell bzr about a rename that has already happened)%(extra)s"
4534
msgstr ""
4535
4536
#: bzrlib/errors.py:541
4537
msgid "\"%(path)s\" is not a directory %(extra)s"
4538
msgstr ""
4539
4540
#: bzrlib/errors.py:546
4541
msgid "\"%(path)s\" is not in the working directory %(extra)s"
4542
msgstr ""
4543
4544
#: bzrlib/errors.py:551
4545
msgid "Directory not empty: \"%(path)s\"%(extra)s"
4546
msgstr ""
4547
4548
#: bzrlib/errors.py:556
4549
msgid "Hard-linking \"%(path)s\" is not supported"
4550
msgstr ""
4551
4552
#: bzrlib/errors.py:571
4553
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
4554
msgstr ""
4555
4556
#: bzrlib/errors.py:576
4557
msgid "Permission denied: \"%(path)s\"%(extra)s"
4558
msgstr ""
4559
4560
#: bzrlib/errors.py:581
4561
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
4562
msgstr ""
4563
4564
#: bzrlib/errors.py:586
4565
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
4566
msgstr ""
4567
4568
#: bzrlib/errors.py:597
4569
msgid "URLs differ by more than path: %(from_)r and %(to)r"
4570
msgstr ""
4571
4572
#: bzrlib/errors.py:619
4573
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
4574
msgstr ""
4575
4576
#: bzrlib/errors.py:629
4577
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
4578
msgstr ""
4579
4580
#: bzrlib/errors.py:637
4581
msgid ""
4582
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
4583
"upgrade the branch to permit branch stacking."
4584
msgstr ""
4585
4586
#: bzrlib/errors.py:648
4587
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
4588
msgstr ""
4589
4590
#: bzrlib/errors.py:658
4591
msgid ""
4592
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
4593
"need to upgrade the repository to permit branch stacking."
4594
msgstr ""
4595
4596
#: bzrlib/errors.py:669
4597
msgid "Error reading from %(path)r."
4598
msgstr ""
4599
4600
#: bzrlib/errors.py:688
4601
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
4602
msgstr ""
4603
4604
#: bzrlib/errors.py:704
4605
msgid "Path \"%(path)s\" is not unicode normalized"
4606
msgstr ""
4607
4608
#: bzrlib/errors.py:712
4609
msgid "Not a branch: \"%(path)s\"%(detail)s."
4610
msgstr ""
4611
4612
#: bzrlib/errors.py:754
4613
msgid "No submit branch available for branch \"%(path)s\""
4614
msgstr ""
4615
4616
#: bzrlib/errors.py:763
4617
msgid "Already a branch: \"%(path)s\"."
4618
msgstr ""
4619
4620
#: bzrlib/errors.py:769
4621
msgid ""
4622
"Directory contains a branch, but no working tree (use bzr checkout if you "
4623
"wish to build a working tree): \"%(path)s\""
4624
msgstr ""
4625
4626
#: bzrlib/errors.py:774
4627
msgid ""
4628
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
4629
msgstr ""
4630
4631
#: bzrlib/errors.py:784
4632
msgid ""
4633
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
4634
msgstr ""
4635
4636
#: bzrlib/errors.py:794
4637
msgid "No repository present: \"%(path)s\""
4638
msgstr ""
4639
4640
#: bzrlib/errors.py:802
4641
msgid "File \"%(path)s\" is not in branch %(branch_base)s."
4642
msgstr ""
4643
4644
#: bzrlib/errors.py:814
4645
msgid ""
4646
"Unsupported branch format: %(format)s\n"
4647
"Please run 'bzr upgrade'"
4648
msgstr ""
4649
4650
#: bzrlib/errors.py:820
4651
msgid "Unknown %(kind)s format: %(format)r"
4652
msgstr ""
4653
4654
#: bzrlib/errors.py:829
4655
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
4656
msgstr ""
4657
4658
#: bzrlib/errors.py:842
4659
msgid ""
4660
"%(target)s\n"
4661
"is not compatible with\n"
4662
"%(source)s\n"
4663
"%(details)s"
4664
msgstr ""
4665
4666
#: bzrlib/errors.py:858
4667
msgid "Revision is not compatible with %(repo_format)s"
4668
msgstr ""
4669
4670
#: bzrlib/errors.py:868
4671
msgid "%(context_info)s%(path)s is already versioned."
4672
msgstr ""
4673
4674
#: bzrlib/errors.py:889
4675
msgid "%(context_info)s%(path)s is not versioned."
4676
msgstr ""
4677
4678
#: bzrlib/errors.py:910
4679
msgid "Path(s) are not versioned: %(paths_as_string)s"
4680
msgstr ""
4681
4682
#: bzrlib/errors.py:921
4683
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
4684
msgstr ""
4685
4686
#: bzrlib/errors.py:940
4687
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
4688
msgstr ""
4689
4690
#: bzrlib/errors.py:948
4691
msgid ""
4692
"Filename %(filename)r is not valid in your current filesystem encoding "
4693
"%(fs_encoding)s"
4694
msgstr ""
4695
4696
#: bzrlib/errors.py:959
4697
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
4698
msgstr ""
4699
4700
#: bzrlib/errors.py:977
4701
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
4702
msgstr ""
4703
4704
#: bzrlib/errors.py:1016
4705
msgid "Cannot lock %(lock)s: %(why)s"
4706
msgstr ""
4707
4708
#: bzrlib/errors.py:1026
4709
msgid ""
4710
"A transaction related operation was attempted after the transaction finished."
4711
msgstr ""
4712
4713
#: bzrlib/errors.py:1053
4714
msgid "Cannot lock: transport is read only: %(transport)s"
4715
msgstr ""
4716
4717
#: bzrlib/errors.py:1061
4718
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
4719
msgstr ""
4720
4721
#: bzrlib/errors.py:1072
4722
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
4723
msgstr ""
4724
4725
#: bzrlib/errors.py:1083
4726
msgid ""
4727
"Lock was released and re-acquired before being broken: %(lock)s: held by "
4728
"%(holder)r, wanted to break %(target)r"
4729
msgstr ""
4730
4731
#: bzrlib/errors.py:1095
4732
msgid ""
4733
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
4734
"Use 'bzr break-lock' to clear it"
4735
msgstr ""
4736
4737
#: bzrlib/errors.py:1108
4738
msgid "Lock not held: %(lock)s"
4739
msgstr ""
4740
4741
#: bzrlib/errors.py:1137
4742
msgid "No changes to commit"
4743
msgstr ""
4744
4745
#: bzrlib/errors.py:1142
4746
msgid ""
4747
"Selected-file commit of merges is not supported yet: files %(files_str)s"
4748
msgstr ""
4749
4750
#: bzrlib/errors.py:1152
4751
msgid ""
4752
"Excluding paths during commit is not supported by repository at %(repository)"
4753
"r."
4754
msgstr ""
4755
4756
#: bzrlib/errors.py:1161
4757
msgid ""
4758
"The specified commit message contains characters unsupported by the current "
4759
"encoding."
4760
msgstr ""
4761
4762
#: bzrlib/errors.py:1167
4763
msgid "Upgrade URL cannot work with readonly URLs."
4764
msgstr ""
4765
4766
#: bzrlib/errors.py:1172
4767
msgid "The branch format %(format)s is already at the most recent format."
4768
msgstr ""
4769
4770
#: bzrlib/errors.py:1195
4771
msgid "Option --change does not accept revision ranges"
4772
msgstr ""
4773
4774
#: bzrlib/errors.py:1200
4775
msgid "No namespace registered for string: %(spec)r"
4776
msgstr ""
4777
4778
#: bzrlib/errors.py:1219
4779
msgid ""
4780
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
4781
"%(extra)s"
4782
msgstr ""
4783
4784
#: bzrlib/errors.py:1233
4785
msgid "%(branch)s is missing %(object_type)s {%(object_id)s}"
4786
msgstr ""
4787
4788
#: bzrlib/errors.py:1238
4789
msgid ""
4790
"Operation denied because it would change the main history, which is not "
4791
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
4792
msgstr ""
4793
4794
#: bzrlib/errors.py:1249
4795
msgid ""
4796
"These branches have diverged. Use the missing command to see how.\n"
4797
"Use the merge command to reconcile them."
4798
msgstr ""
4799
4800
#: bzrlib/errors.py:1269
4801
msgid ""
4802
"Branches have no common ancestor, and no merge base revision was specified."
4803
msgstr ""
4804
4805
#: bzrlib/errors.py:1275
4806
msgid ""
4807
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
4808
msgstr ""
4809
4810
#: bzrlib/errors.py:1281
4811
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
4812
msgstr ""
4813
4814
#: bzrlib/errors.py:1290
4815
msgid ""
4816
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
4817
msgstr ""
4818
4819
#: bzrlib/errors.py:1299
4820
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
4821
msgstr ""
4822
4823
#: bzrlib/errors.py:1319
4824
msgid "Branch %(branch)s has no commits."
4825
msgstr ""
4826
4827
#: bzrlib/errors.py:1337
4828
msgid ""
4829
"Bound branch %(branch)s is out of date with master branch %(master)s."
4830
"%(extra_help)s"
4831
msgstr ""
4832
4833
#: bzrlib/errors.py:1349
4834
msgid ""
4835
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
4836
"bound to %(remote)s."
4837
msgstr ""
4838
4839
#: bzrlib/errors.py:1361
4840
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
4841
msgstr ""
4842
4843
#: bzrlib/errors.py:1370
4844
msgid ""
4845
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
4846
"%(error)s"
4847
msgstr ""
4848
4849
#: bzrlib/errors.py:1382
4850
msgid "Error in processing weave: %(msg)s"
4851
msgstr ""
4852
4853
#: bzrlib/errors.py:1391
4854
msgid "Revision {%(revision_id)s} already present in %(weave)s"
4855
msgstr ""
4856
4857
#: bzrlib/errors.py:1402
4858
msgid "Revision {%(revision_id)s} not present in %(weave)s"
4859
msgstr ""
4860
4861
#: bzrlib/errors.py:1412
4862
msgid "Weave invariant violated: %(what)s"
4863
msgstr ""
4864
4865
#: bzrlib/errors.py:1421
4866
msgid "Parents are mismatched between two revisions. %(msg)s"
4867
msgstr ""
4868
4869
#: bzrlib/errors.py:1443
4870
msgid ""
4871
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
4872
"%(weave_b)s"
4873
msgstr ""
4874
4875
#: bzrlib/errors.py:1455
4876
msgid "Versioned file error"
4877
msgstr ""
4878
4879
#: bzrlib/errors.py:1460
4880
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
4881
msgstr ""
4882
4883
#: bzrlib/errors.py:1470
4884
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
4885
msgstr ""
4886
4887
#: bzrlib/errors.py:1480
4888
msgid "Text did not match its checksum: %(msg)s"
4889
msgstr ""
4890
4891
#: bzrlib/errors.py:1605
4892
msgid "Export format %(format)r not supported"
4893
msgstr ""
4894
4895
#: bzrlib/errors.py:1614
4896
msgid "Transport error: %(msg)s %(orig_error)s"
4897
msgstr ""
4898
4899
#: bzrlib/errors.py:1640
4900
msgid "Generic bzr smart protocol error: %(details)s"
4901
msgstr ""
4902
4903
#: bzrlib/errors.py:1648
4904
msgid "Received bad protocol version marker: %(marker)r"
4905
msgstr ""
4906
4907
#: bzrlib/errors.py:1679
4908
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
4909
msgstr ""
4910
4911
#: bzrlib/errors.py:1684
4912
msgid "Connection error: %(msg)s %(orig_error)s"
4913
msgstr ""
4914
4915
#: bzrlib/errors.py:1689
4916
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
4917
msgstr ""
4918
4919
#: bzrlib/errors.py:1710
4920
msgid "Connection closed: %(msg)s %(orig_error)s"
4921
msgstr ""
4922
4923
#: bzrlib/errors.py:1715
4924
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
4925
msgstr ""
4926
4927
#: bzrlib/errors.py:1725
4928
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
4929
msgstr ""
4930
4931
#: bzrlib/errors.py:1740
4932
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
4933
msgstr ""
4934
4935
#: bzrlib/errors.py:1754
4936
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
4937
msgstr ""
4938
4939
#: bzrlib/errors.py:1762
4940
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
4941
msgstr ""
4942
4943
#: bzrlib/errors.py:1771
4944
msgid "%(source)s is%(permanently)s redirected to %(target)s"
4945
msgstr ""
4946
4947
#: bzrlib/errors.py:1785
4948
msgid "Too many redirections"
4949
msgstr ""
4950
4951
#: bzrlib/errors.py:1790
4952
msgid "Working tree has conflicts."
4953
msgstr ""
4954
4955
#: bzrlib/errors.py:1794
4956
msgid "Config file %(filename)s is not UTF-8 encoded\n"
4957
msgstr ""
4958
4959
#: bzrlib/errors.py:1803
4960
msgid ""
4961
"Error(s) parsing config file %(filename)s:\n"
4962
"%(errors)s"
4963
msgstr ""
4964
4965
#: bzrlib/errors.py:1814
4966
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
4967
msgstr ""
4968
4969
#: bzrlib/errors.py:1822
4970
msgid "%(username)r does not seem to contain a reasonable email address"
4971
msgstr ""
4972
4973
#: bzrlib/errors.py:1831
4974
msgid "Failed to GPG sign data with command \"%(command_line)s\""
4975
msgstr ""
4976
4977
#: bzrlib/errors.py:1839
4978
msgid "Failed to verify GPG signature data with error \"%(error)s\""
4979
msgstr ""
4980
4981
#: bzrlib/errors.py:1847
4982
msgid "Unable to import library \"%(library)s\": %(error)s"
4983
msgstr ""
4984
4985
#: bzrlib/errors.py:1855
4986
msgid "python-gpgme is not installed, it is needed to verify signatures"
4987
msgstr ""
4988
4989
#: bzrlib/errors.py:1863
4990
msgid ""
4991
"The working tree for %(basedir)s has changed since the last commit, but "
4992
"weave merge requires that it be unchanged"
4993
msgstr ""
4994
4995
#: bzrlib/errors.py:1873
4996
msgid ""
4997
"Can't reprocess and show base, because reprocessing obscures the "
4998
"relationship of conflicting lines to the base"
4999
msgstr ""
5000
5001
#: bzrlib/errors.py:1879
5002
msgid "Cycle in graph %(graph)r"
5003
msgstr ""
5004
5005
#: bzrlib/errors.py:1907
5006
msgid "File %(filename)s is not conflicted."
5007
msgstr ""
5008
5009
#: bzrlib/errors.py:1929
5010
msgid "No bundle was found in \"%(filename)s\"."
5011
msgstr ""
5012
5013
#: bzrlib/errors.py:1938
5014
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5015
msgstr ""
5016
5017
#: bzrlib/errors.py:1948
5018
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5019
msgstr ""
5020
5021
#: bzrlib/errors.py:1961
5022
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5023
msgstr ""
5024
5025
#: bzrlib/errors.py:1971
5026
msgid "Key %(key)s is already present in map"
5027
msgstr ""
5028
5029
#: bzrlib/errors.py:1976
5030
msgid "The prefix %(prefix)s is in the help search path twice."
5031
msgstr ""
5032
5033
#: bzrlib/errors.py:1984
5034
msgid "Tree transform is malformed %(conflicts)r"
5035
msgstr ""
5036
5037
#: bzrlib/errors.py:1986
5038
msgid ""
5039
"No final name for trans_id %(trans_id)r\n"
5040
"file-id: %(file_id)r\n"
5041
"root trans-id: %(root_trans_id)r\n"
5042
msgstr ""
5043
5044
#: bzrlib/errors.py:2018
5045
msgid "Attempt to reuse a transform that has already been applied."
5046
msgstr ""
5047
5048
#: bzrlib/errors.py:2023
5049
msgid "Moving the root directory is not supported at this time"
5050
msgstr ""
5051
5052
#: bzrlib/errors.py:2028
5053
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5054
msgstr ""
5055
5056
#: bzrlib/errors.py:2039
5057
msgid ""
5058
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5059
msgstr ""
5060
5061
#: bzrlib/errors.py:2075
5062
msgid ""
5063
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5064
msgstr ""
5065
5066
#: bzrlib/errors.py:2084
5067
msgid ""
5068
"Can't safely remove modified or unknown files:\n"
5069
"%(changes_as_text)sUse --keep to not delete them, or --force to delete them "
5070
"regardless."
5071
msgstr ""
5072
5073
#: bzrlib/errors.py:2121
5074
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5075
msgstr ""
5076
5077
#: bzrlib/errors.py:2129
5078
msgid "Nothing to merge."
5079
msgstr ""
5080
5081
#: bzrlib/errors.py:2134
5082
msgid "Format %(format)s cannot be initialised by this version of bzr."
5083
msgstr ""
5084
5085
#: bzrlib/errors.py:2143
5086
msgid ""
5087
"Cannot convert from format %(from_format)s to format %(format)s. "
5088
"%(problem)s"
5089
msgstr ""
5090
5091
#: bzrlib/errors.py:2155
5092
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5093
msgstr ""
5094
5095
#: bzrlib/errors.py:2163
5096
msgid "%(exe_name)s could not be found on this machine"
5097
msgstr ""
5098
5099
#: bzrlib/errors.py:2171
5100
msgid "Diff is not installed on this machine: %(msg)s"
5101
msgstr ""
5102
5103
#: bzrlib/errors.py:2179
5104
msgid "Diff3 is not installed on this machine."
5105
msgstr ""
5106
5107
#: bzrlib/errors.py:2185
5108
msgid "The content being inserted is already present."
5109
msgstr ""
5110
5111
#: bzrlib/errors.py:2190
5112
msgid ""
5113
"This tree contains left-over files from a failed operation.\n"
5114
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5115
"to\n"
5116
" keep, and delete it when you are done."
5117
msgstr ""
5118
5119
#: bzrlib/errors.py:2201
5120
msgid ""
5121
"This tree contains left-over files from a failed operation.\n"
5122
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5123
" wish to keep, and delete it when you are done."
5124
msgstr ""
5125
5126
#: bzrlib/errors.py:2211
5127
msgid ""
5128
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5129
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5130
"to\n"
5131
" keep, and delete it when you are done."
5132
msgstr ""
5133
5134
#: bzrlib/errors.py:2222
5135
msgid ""
5136
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5137
"examine %(pending_deletion)s to see if it contains any files you wish to "
5138
"keep, and delete it when you are done."
5139
msgstr ""
5140
5141
#: bzrlib/errors.py:2232
5142
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5143
msgstr ""
5144
5145
#: bzrlib/errors.py:2246
5146
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5147
msgstr ""
5148
5149
#: bzrlib/errors.py:2259
5150
msgid "Error in merge modified format"
5151
msgstr ""
5152
5153
#: bzrlib/errors.py:2264
5154
msgid "Format error in conflict listings"
5155
msgstr ""
5156
5157
#: bzrlib/errors.py:2268
5158
msgid ""
5159
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5160
"Error: %(description)s"
5161
msgstr ""
5162
5163
#: bzrlib/errors.py:2279
5164
msgid ""
5165
"An error has been detected in the repository %(repo_path)s.\n"
5166
"Please run bzr reconcile on this repository."
5167
msgstr ""
5168
5169
#: bzrlib/errors.py:2290
5170
msgid ""
5171
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5172
"reason: %(reason)s"
5173
msgstr ""
5174
5175
#: bzrlib/errors.py:2303
5176
msgid ""
5177
"An inconsistent delta was supplied: %(delta)r\n"
5178
"reason: %(reason)s"
5179
msgstr ""
5180
5181
#: bzrlib/errors.py:2315
5182
msgid "To use this feature you must upgrade your branch at %(path)s."
5183
msgstr ""
5184
5185
#: bzrlib/errors.py:2324
5186
msgid "To use this feature you must upgrade your repository at %(path)s."
5187
msgstr ""
5188
5189
#: bzrlib/errors.py:2329
5190
msgid ""
5191
"To use this feature you must upgrade your branch at %(path)s to a format "
5192
"which supports rich roots."
5193
msgstr ""
5194
5195
#: bzrlib/errors.py:2335
5196
msgid "Cannot perform local-only commits on unbound branches."
5197
msgstr ""
5198
5199
#: bzrlib/errors.py:2340
5200
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5201
msgstr ""
5202
5203
#: bzrlib/errors.py:2361
5204
msgid "Ghost tags not supported by format %(format)r."
5205
msgstr ""
5206
5207
#: bzrlib/errors.py:2369
5208
msgid "File is binary but should be text."
5209
msgstr ""
5210
5211
#: bzrlib/errors.py:2374
5212
msgid "The path %(path)s is not permitted on this platform"
5213
msgstr ""
5214
5215
#: bzrlib/errors.py:2383
5216
msgid ""
5217
"Testament did not match expected value.\n"
5218
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5219
" {%(measured)s}"
5220
msgstr ""
5221
5222
#: bzrlib/errors.py:2395
5223
msgid "Not a bzr revision-bundle: %(text)r"
5224
msgstr ""
5225
5226
#: bzrlib/errors.py:2404
5227
msgid "Bad bzr revision-bundle: %(text)r"
5228
msgstr ""
5229
5230
#: bzrlib/errors.py:2413
5231
msgid "Malformed bzr revision-bundle header: %(text)r"
5232
msgstr ""
5233
5234
#: bzrlib/errors.py:2418
5235
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5236
msgstr ""
5237
5238
#: bzrlib/errors.py:2423
5239
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5240
msgstr ""
5241
5242
#: bzrlib/errors.py:2428
5243
msgid "End of line marker was not \\n in bzr revision-bundle"
5244
msgstr ""
5245
5246
#: bzrlib/errors.py:2438
5247
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5248
msgstr ""
5249
5250
#: bzrlib/errors.py:2448
5251
msgid "Root class for inventory serialization errors"
5252
msgstr ""
5253
5254
#: bzrlib/errors.py:2452
5255
msgid ""
5256
"The inventory was not in the expected format:\n"
5257
" %(msg)s"
5258
msgstr ""
5259
5260
#: bzrlib/errors.py:2461
5261
msgid "This operation requires rich root data storage"
5262
msgstr ""
5263
5264
#: bzrlib/errors.py:2474
5265
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5266
msgstr ""
5267
5268
#: bzrlib/errors.py:2483
5269
msgid ""
5270
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5271
"variable."
5272
msgstr ""
5273
5274
#: bzrlib/errors.py:2490
5275
msgid ""
5276
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5277
"ghost at {%(ghost_revision_id)s}"
5278
msgstr ""
5279
5280
#: bzrlib/errors.py:2500
5281
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5282
msgstr ""
5283
5284
#: bzrlib/errors.py:2551
5285
msgid ""
5286
"A merge directive must provide either a bundle or a public branch location."
5287
msgstr ""
5288
5289
#: bzrlib/errors.py:2558
5290
msgid "Bad merge directive payload %(start)r"
5291
msgstr ""
5292
5293
#: bzrlib/errors.py:2568
5294
msgid "Preview patch does not match requested changes."
5295
msgstr ""
5296
5297
#: bzrlib/errors.py:2574
5298
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5299
msgstr ""
5300
5301
#: bzrlib/errors.py:2584
5302
msgid ""
5303
"Your branch does not have all of the revisions required in order to merge "
5304
"this merge directive and the target location specified in the merge "
5305
"directive is not a branch: %(location)s."
5306
msgstr ""
5307
5308
#: bzrlib/errors.py:2596
5309
msgid "Unsupported entry kind %(kind)s"
5310
msgstr ""
5311
5312
#: bzrlib/errors.py:2604
5313
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5314
msgstr ""
5315
5316
#: bzrlib/errors.py:2614
5317
msgid "Subsume target %(other_tree)s needs to be upgraded."
5318
msgstr ""
5319
5320
#: bzrlib/errors.py:2633
5321
msgid "No such tag: %(tag_name)s"
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:2641
5325
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5326
msgstr ""
5327
5328
#: bzrlib/errors.py:2650
5329
msgid "Tag %(tag_name)s already exists."
5330
msgstr ""
5331
5332
#: bzrlib/errors.py:2658
5333
msgid ""
5334
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
5335
"\" for more information on this feature."
5336
msgstr ""
5337
5338
#: bzrlib/errors.py:2668
5339
msgid ""
5340
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5341
msgstr ""
5342
5343
#: bzrlib/errors.py:2678
5344
msgid ""
5345
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5346
msgstr ""
5347
5348
#: bzrlib/errors.py:2688
5349
msgid "Invalid line in bugs property: '%(line)s'"
5350
msgstr ""
5351
5352
#: bzrlib/errors.py:2696
5353
msgid "Invalid bug status: '%(status)s'"
5354
msgstr ""
5355
5356
#: bzrlib/errors.py:2704
5357
msgid "Could not understand response from smart server: %(response_tuple)r"
5358
msgstr ""
5359
5360
#: bzrlib/errors.py:2743
5361
msgid "Server sent an unexpected error: %(error_tuple)r"
5362
msgstr ""
5363
5364
#: bzrlib/errors.py:2762
5365
msgid "Unrecognised container format: %(container_format)r"
5366
msgstr ""
5367
5368
#: bzrlib/errors.py:2770
5369
msgid "Unexpected end of container stream"
5370
msgstr ""
5371
5372
#: bzrlib/errors.py:2775
5373
msgid "Unknown record type: %(record_type)r"
5374
msgstr ""
5375
5376
#: bzrlib/errors.py:2783
5377
msgid "Invalid record: %(reason)s"
5378
msgstr ""
5379
5380
#: bzrlib/errors.py:2791
5381
msgid "Container has data after end marker: %(excess)r"
5382
msgstr ""
5383
5384
#: bzrlib/errors.py:2799
5385
msgid "Container has multiple records with the same name: %(name)s"
5386
msgstr ""
5387
5388
#: bzrlib/errors.py:2812
5389
msgid "Corrupt or incompatible data stream: %(reason)s"
5390
msgstr ""
5391
5392
#: bzrlib/errors.py:2820
5393
msgid "SMTP error: %(error)s"
5394
msgstr ""
5395
5396
#: bzrlib/errors.py:2828
5397
msgid "No message supplied."
5398
msgstr ""
5399
5400
#: bzrlib/errors.py:2833
5401
msgid "No mail-to address (--mail-to) or output (-o) specified."
5402
msgstr ""
5403
5404
#: bzrlib/errors.py:2838
5405
msgid "Unknown mail client: %(mail_client)s"
5406
msgstr ""
5407
5408
#: bzrlib/errors.py:2846
5409
msgid ""
5410
"Unable to find mail client with the following names: "
5411
"%(mail_command_list_string)s"
5412
msgstr ""
5413
5414
#: bzrlib/errors.py:2856
5415
msgid "SMTP connection to %(host)s refused"
5416
msgstr ""
5417
5418
#: bzrlib/errors.py:2865
5419
msgid "Please specify smtp_server. No server at default %(host)s."
5420
msgstr ""
5421
5422
#: bzrlib/errors.py:2879
5423
msgid ""
5424
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5425
"reconfigure."
5426
msgstr ""
5427
5428
#: bzrlib/errors.py:2891
5429
msgid "'%(display_url)s' is already a branch."
5430
msgstr ""
5431
5432
#: bzrlib/errors.py:2896
5433
msgid "'%(display_url)s' is already a tree."
5434
msgstr ""
5435
5436
#: bzrlib/errors.py:2901
5437
msgid "'%(display_url)s' is already a checkout."
5438
msgstr ""
5439
5440
#: bzrlib/errors.py:2906
5441
msgid "'%(display_url)s' is already a lightweight checkout."
5442
msgstr ""
5443
5444
#: bzrlib/errors.py:2911
5445
msgid "'%(display_url)s' is already using a shared repository."
5446
msgstr ""
5447
5448
#: bzrlib/errors.py:2916
5449
msgid "'%(display_url)s' is already standalone."
5450
msgstr ""
5451
5452
#: bzrlib/errors.py:2921
5453
msgid "Shared repository '%(display_url)s' already creates working trees."
5454
msgstr ""
5455
5456
#: bzrlib/errors.py:2927
5457
msgid ""
5458
"Shared repository '%(display_url)s' already doesn't create working trees."
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:2933
5462
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5463
msgstr ""
5464
5465
#: bzrlib/errors.py:2938
5466
msgid "No location could be found to bind to at %(display_url)s."
5467
msgstr ""
5468
5469
#: bzrlib/errors.py:2943
5470
msgid ""
5471
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
5472
"%(more)s"
5473
msgstr ""
5474
5475
#: bzrlib/errors.py:2962
5476
msgid ""
5477
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
5478
"%(more)s"
5479
msgstr ""
5480
5481
#: bzrlib/errors.py:2968
5482
msgid "Variable {%(name)s} is not available."
5483
msgstr ""
5484
5485
#: bzrlib/errors.py:2976
5486
msgid "No template specified."
5487
msgstr ""
5488
5489
#: bzrlib/errors.py:2981
5490
msgid "Unable to create symlink %(path_str)son this platform"
5491
msgstr ""
5492
5493
#: bzrlib/errors.py:2996
5494
msgid ""
5495
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
5496
"\", \"local\"."
5497
msgstr ""
5498
5499
#: bzrlib/errors.py:3030
5500
msgid ""
5501
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5502
msgstr ""
5503
5504
#: bzrlib/errors.py:3042
5505
msgid "The \"%(config_id)s\" configuration does not exist."
5506
msgstr ""
5507
5508
#: bzrlib/errors.py:3050
5509
msgid "The \"%(option_name)s\" configuration option does not exist."
5510
msgstr ""
5511
5512
#: bzrlib/errors.py:3058
5513
msgid "The alias \"%(alias_name)s\" does not exist."
5514
msgstr ""
5515
5516
#: bzrlib/errors.py:3072
5517
msgid "\"%(alias_name)s\" is not a valid location alias."
5518
msgstr ""
5519
5520
#: bzrlib/errors.py:3080
5521
msgid "No %(alias_name)s location assigned."
5522
msgstr ""
5523
5524
#: bzrlib/errors.py:3088
5525
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
5526
msgstr ""
5527
5528
#: bzrlib/errors.py:3098
5529
msgid "Unknown rules detected: %(unknowns_str)s."
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:3111
5533
msgid ""
5534
"Hook '%(hook_name)s' during %(hook_stage)s failed:\n"
5535
"%(traceback_text)s%(exc_value)s"
5536
msgstr ""
5537
5538
#: bzrlib/errors.py:3134
5539
msgid "Tip change rejected: %(msg)s"
5540
msgstr ""
5541
5542
#: bzrlib/errors.py:3142
5543
msgid "Shelf corrupt."
5544
msgstr ""
5545
5546
#: bzrlib/errors.py:3147
5547
msgid "Corruption while decompressing repository file%(orig_error)s"
5548
msgstr ""
5549
5550
#: bzrlib/errors.py:3159
5551
msgid "No changes are shelved with id \"%(shelf_id)d\"."
5552
msgstr ""
5553
5554
#: bzrlib/errors.py:3167
5555
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
5556
msgstr ""
5557
5558
#: bzrlib/errors.py:3175
5559
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
5560
msgstr ""
5561
5562
#: bzrlib/errors.py:3183
5563
msgid "The user aborted the operation."
5564
msgstr ""
5565
5566
#: bzrlib/errors.py:3188
5567
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
5568
msgstr ""
5569
5570
#: bzrlib/errors.py:3198
5571
msgid "No such view: %(view_name)s."
5572
msgstr ""
5573
5574
#: bzrlib/errors.py:3208
5575
msgid ""
5576
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
5577
"to a later format."
5578
msgstr ""
5579
5580
#: bzrlib/errors.py:3217
5581
msgid ""
5582
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
5583
msgstr ""
5584
5585
#: bzrlib/errors.py:3284
5586
msgid "%(bzrdir)r does not support co-located branches."
5587
msgstr ""
5588
5589
#: bzrlib/errors.py:3290
5590
msgid ""
5591
"Unable to determine your name.\n"
5592
"Please, set your name with the 'whoami' command.\n"
5593
"E.g. bzr whoami \"Your Name <name@example.com>\""
5594
msgstr ""
5595
5596
#: bzrlib/errors.py:3299
5597
msgid "Invalid pattern(s) found. %(msg)s"
5598
msgstr ""
5599
5600
#: bzrlib/errors.py:3307
5601
msgid ""
5602
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
5603
"unbind` to fix."
5604
msgstr ""
5605
5606
#: bzrlib/errors.py:3318
5607
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
5608
msgstr ""
5609
5610
#: bzrlib/errors.py:3327
5611
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
5612
msgstr ""
5613
5614
#: bzrlib/errors.py:3336
5615
msgid ""
5616
"No compatible object available for operations from %(source)r to %(target)r."
5617
msgstr ""
5618
5619
#: bzrlib/errors.py:3346
5620
msgid ""
5621
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
5622
"%(arguments)s."
5623
msgstr ""
5624
5625
#: bzrlib/gpg.py:116 bzrlib/gpg.py:454
5626
msgid "{0} commits with valid signatures"
5627
msgstr ""
5628
5629
#: bzrlib/gpg.py:120 bzrlib/gpg.py:459
5630
msgid "{0} commit with unknown key"
5631
msgid_plural "{0} commits with unknown keys"
5632
msgstr[0] ""
5633
msgstr[1] ""
5634
5635
#: bzrlib/gpg.py:126 bzrlib/gpg.py:466
5636
msgid "{0} commit not valid"
5637
msgid_plural "{0} commits not valid"
5638
msgstr[0] ""
5639
msgstr[1] ""
5640
5641
#: bzrlib/gpg.py:132 bzrlib/gpg.py:473
5642
msgid "{0} commit not signed"
5643
msgid_plural "{0} commits not signed"
5644
msgstr[0] ""
5645
msgstr[1] ""
5646
5647
#: bzrlib/gpg.py:138 bzrlib/gpg.py:480
5648
msgid "{0} commit with key now expired"
5649
msgid_plural "{0} commits with key now expired"
5650
msgstr[0] ""
5651
msgstr[1] ""
5652
5653
#: bzrlib/gpg.py:336
5654
msgid "No GnuPG key results for pattern: {0}"
5655
msgstr ""
5656
5657
#: bzrlib/gpg.py:379
5658
msgid "{0} signed {1} commit"
5659
msgid_plural "{0} signed {1} commits"
5660
msgstr[0] ""
5661
msgstr[1] ""
5662
5663
#: bzrlib/gpg.py:396 bzrlib/gpg.py:412
5664
msgid "{0} commit by author {1}"
5665
msgid_plural "{0} commits by author {1}"
5666
msgstr[0] ""
5667
msgstr[1] ""
5668
5669
#: bzrlib/gpg.py:426
5670
msgid "Unknown key {0} signed {1} commit"
5671
msgid_plural "Unknown key {0} signed {1} commits"
5672
msgstr[0] ""
5673
msgstr[1] ""
5674
5675
#: bzrlib/gpg.py:444
5676
msgid "{0} commit by author {1} with key {2} now expired"
5677
msgid_plural "{0} commits by author {1} with key {2} now expired"
5678
msgstr[0] ""
5679
msgstr[1] ""
5680
5681
# help of 'help' option
5682
#: bzrlib/option.py:530
5683
msgid "Show help message."
5684
msgstr ""
5685
5686
# help of 'usage' option
5687
#: bzrlib/option.py:532
5688
msgid "Show usage message and options."
5689
msgstr ""
5690
5691
# help of 'verbose' option
5692
#: bzrlib/option.py:534
5693
msgid "Display more information."
5694
msgstr ""
5695
5696
# help of 'quiet' option
5697
#: bzrlib/option.py:537
5698
msgid "Only display errors and warnings."
5699
msgstr ""
5700
5701
# help of 'overwrite' option
5702
#: bzrlib/option.py:542
5703
msgid "Ignore differences between branches and overwrite unconditionally."
5704
msgstr ""
5705
5706
# help of 'message' option
5707
#: bzrlib/option.py:553
5708
msgid "Message string."
5709
msgstr ""
5710
5711
# help of 'null' option
5712
#: bzrlib/option.py:556
5713
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
5714
msgstr ""
5715
5716
# help of 'profile' option
5717
#: bzrlib/option.py:559
5718
msgid "Show performance profiling information."
5719
msgstr ""
5720
5721
# help of 'revision' option
5722
#: bzrlib/option.py:563
5723
msgid "See \"help revisionspec\" for details."
5724
msgstr ""
5725
5726
# help of 'change' option
5727
#: bzrlib/option.py:568
5728
msgid ""
5729
"Select changes introduced by the specified revision. See also \"help "
5730
"revisionspec\"."
5731
msgstr ""
5732
5733
# help of 'show-ids' option
5734
#: bzrlib/option.py:570
5735
msgid "Show internal object ids."
5736
msgstr ""
5737
5738
# help of 'timezone' option
5739
#: bzrlib/option.py:573
5740
msgid "Display timezone as local, original, or utc."
5741
msgstr ""
5742
5743
# help of 'log-format' option
5744
#: bzrlib/option.py:578
5745
msgid "Use specified log format."
5746
msgstr ""
5747
5748
# title of 'log-format' option
5749
#: bzrlib/option.py:580
5750
msgid "Log format"
5751
msgstr ""
5752
5753
# help of 'long' option
5754
#: bzrlib/option.py:582
5755
msgid "Use detailed log format. Same as --log-format long"
5756
msgstr ""
5757
5758
# help of 'short' option
5759
#: bzrlib/option.py:584
5760
msgid "Use moderately short log format. Same as --log-format short"
5761
msgstr ""
5762
5763
# help of 'line' option
5764
#: bzrlib/option.py:585
5765
msgid "Use log format with one line per revision. Same as --log-format line"
5766
msgstr ""
5767
5768
# help of 'merge-type' option
5769
#: bzrlib/option.py:588
5770
msgid "Select a particular merge algorithm."
5771
msgstr ""
5772
5773
# title of 'merge-type' option
5774
#: bzrlib/option.py:590
5775
msgid "Merge algorithm"
5776
msgstr ""
5777
5778
# help of 'remember' option
5779
#: bzrlib/option.py:592
5780
msgid "Remember the specified location as a default."
5781
msgstr ""
5782
5783
# help of 'reprocess' option
5784
#: bzrlib/option.py:594
5785
msgid "Reprocess to reduce spurious conflicts."
5786
msgstr ""
5787
5788
# help of 'dry-run' option
5789
#: bzrlib/option.py:597
5790
msgid "Show what would be done, but don't actually do anything."
5791
msgstr ""
5792
5793
# help of 'name-from-revision' option
5794
#: bzrlib/option.py:598
5795
msgid "The path name in the old tree."
5796
msgstr ""
5797
5798
# help of 'directory' option
5799
#: bzrlib/option.py:600
5800
msgid "Branch to operate on, instead of working directory"
5801
msgstr ""
5802
5803
# help of 'plugin' option of 'bash-completion' command
5804
#: bzrlib/plugins/bash_completion/bashcomp.py:407
5805
msgid "Enable completions for the selected plugin (default: all plugins)"
5806
msgstr ""
5807
5808
#: bzrlib/plugins/bash_completion/bashcomp.py:409
5809
msgid "Generate a shell function for bash command line completion."
5810
msgstr ""
5811
5812
#: bzrlib/plugins/bash_completion/bashcomp.py:411
5813
msgid ""
5814
"This command generates a shell function which can be used by bash to\n"
5815
"automatically complete the currently typed command when the user presses\n"
5816
"the completion key (usually tab)."
5817
msgstr ""
5818
5819
#: bzrlib/plugins/bash_completion/bashcomp.py:415
5820
msgid ""
5821
"Commonly used like this:\n"
5822
" eval \"`bzr bash-completion`\""
5823
msgstr ""
5824
5825
# help of 'function-name' option of 'bash-completion' command
5826
#: bzrlib/plugins/bash_completion/bashcomp.py:421
5827
msgid "Name of the generated function (default: _bzr)"
5828
msgstr ""
5829
5830
# help of 'function-only' option of 'bash-completion' command
5831
#: bzrlib/plugins/bash_completion/bashcomp.py:423
5832
msgid "Generate only the shell function, don't enable it"
5833
msgstr ""
5834
5835
#: bzrlib/plugins/launchpad/__init__.py:78
5836
msgid "Register a branch with launchpad.net."
5837
msgstr ""
5838
5839
#: bzrlib/plugins/launchpad/__init__.py:80
5840
msgid ""
5841
"This command lists a bzr branch in the directory of branches on\n"
5842
"launchpad.net. Registration allows the branch to be associated with\n"
5843
"bugs or specifications."
5844
msgstr ""
5845
5846
#: bzrlib/plugins/launchpad/__init__.py:84
5847
msgid ""
5848
"Before using this command you must register the project to which the\n"
5849
"branch belongs, and create an account for yourself on launchpad.net."
5850
msgstr ""
5851
5852
#: bzrlib/plugins/launchpad/__init__.py:87
5853
msgid ""
5854
"arguments:\n"
5855
" public_url: The publicly visible url for the branch to register.\n"
5856
" This must be an http or https url (which Launchpad can read\n"
5857
" from to access the branch). Local file urls, SFTP urls, and\n"
5858
" bzr+ssh urls will not work.\n"
5859
" If no public_url is provided, bzr will use the configured\n"
5860
" public_url if there is one for the current branch, and\n"
5861
" otherwise error."
5862
msgstr ""
5863
5864
#: bzrlib/plugins/launchpad/__init__.py:96
5865
msgid ""
5866
"example:\n"
5867
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
5868
" --project fooproject"
5869
msgstr ""
5870
5871
# help of 'project' option of 'register-branch' command
5872
#: bzrlib/plugins/launchpad/__init__.py:103
5873
msgid "Launchpad project short name to associate with the branch."
5874
msgstr ""
5875
5876
# help of 'branch-name' option of 'register-branch' command
5877
#: bzrlib/plugins/launchpad/__init__.py:110
5878
msgid ""
5879
"Short name for the branch; by default taken from the last component of the "
5880
"url."
5881
msgstr ""
5882
5883
# help of 'branch-title' option of 'register-branch' command
5884
#: bzrlib/plugins/launchpad/__init__.py:114
5885
msgid "One-sentence description of the branch."
5886
msgstr ""
5887
5888
# help of 'branch-description' option of 'register-branch' command
5889
#: bzrlib/plugins/launchpad/__init__.py:117
5890
msgid "Longer description of the purpose or contents of the branch."
5891
msgstr ""
5892
5893
# help of 'author' option of 'register-branch' command
5894
#: bzrlib/plugins/launchpad/__init__.py:120
5895
msgid "Branch author's email address, if not yourself."
5896
msgstr ""
5897
5898
# help of 'link-bug' option of 'register-branch' command
5899
#: bzrlib/plugins/launchpad/__init__.py:123
5900
msgid "The bug this branch fixes."
5901
msgstr ""
5902
5903
# help of 'dry-run' option of 'register-branch' command
5904
#: bzrlib/plugins/launchpad/__init__.py:126
5905
msgid "Prepare the request but don't actually send it."
5906
msgstr ""
5907
5908
#: bzrlib/plugins/launchpad/__init__.py:186
5909
msgid "Open a Launchpad branch page in your web browser."
5910
msgstr ""
5911
5912
# help of 'dry-run' option of 'launchpad-open' command
5913
#: bzrlib/plugins/launchpad/__init__.py:191
5914
msgid "Do not actually open the browser. Just say the URL we would use."
5915
msgstr ""
5916
5917
#: bzrlib/plugins/launchpad/__init__.py:236
5918
msgid "Show or set the Launchpad user ID."
5919
msgstr ""
5920
5921
#: bzrlib/plugins/launchpad/__init__.py:238
5922
msgid ""
5923
"When communicating with Launchpad, some commands need to know your\n"
5924
"Launchpad user ID. This command can be used to set or show the\n"
5925
"user ID that Bazaar will use for such communication."
5926
msgstr ""
5927
5928
#: bzrlib/plugins/launchpad/__init__.py:242
5929
msgid ""
5930
":Examples:\n"
5931
" Show the Launchpad ID of the current user::"
5932
msgstr ""
5933
5934
#: bzrlib/plugins/launchpad/__init__.py:245
5935
msgid " bzr launchpad-login"
5936
msgstr ""
5937
5938
#: bzrlib/plugins/launchpad/__init__.py:247
5939
msgid " Set the Launchpad ID of the current user to 'bob'::"
5940
msgstr ""
5941
5942
#: bzrlib/plugins/launchpad/__init__.py:249
5943
msgid " bzr launchpad-login bob"
5944
msgstr ""
5945
5946
# help of 'no-check' option of 'launchpad-login' command
5947
#: bzrlib/plugins/launchpad/__init__.py:256
5948
msgid "Don't check that the user name is valid."
5949
msgstr ""
5950
5951
#: bzrlib/plugins/launchpad/__init__.py:292
5952
msgid "Ask Launchpad to mirror a branch now."
5953
msgstr ""
5954
5955
#: bzrlib/plugins/launchpad/__init__.py:312
5956
msgid "Propose merging a branch on Launchpad."
5957
msgstr ""
5958
5959
#: bzrlib/plugins/launchpad/__init__.py:314
5960
msgid ""
5961
"This will open your usual editor to provide the initial comment. When it\n"
5962
"has created the proposal, it will open it in your default web browser."
5963
msgstr ""
5964
5965
#: bzrlib/plugins/launchpad/__init__.py:317
5966
msgid ""
5967
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
5968
"is not supplied, the remembered submit branch will be used. If no submit\n"
5969
"branch is remembered, the development focus will be used."
5970
msgstr ""
5971
5972
#: bzrlib/plugins/launchpad/__init__.py:321
5973
msgid ""
5974
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
5975
"the merge proposal. This can be overriden by specifying --review (-R).\n"
5976
"The parameter the launchpad account name of the desired reviewer. This\n"
5977
"may optionally be followed by '=' and the review type. For example:"
5978
msgstr ""
5979
5980
#: bzrlib/plugins/launchpad/__init__.py:326
5981
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
5982
msgstr ""
5983
5984
#: bzrlib/plugins/launchpad/__init__.py:328
5985
msgid ""
5986
"This will propose a merge, request \"jrandom\" to perform a review of\n"
5987
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
5988
msgstr ""
5989
5990
# help of 'staging' option of 'lp-propose-merge' command
5991
#: bzrlib/plugins/launchpad/__init__.py:333
5992
msgid "Propose the merge on staging."
5993
msgstr ""
5994
5995
# help of 'message' option of 'lp-propose-merge' command
5996
#: bzrlib/plugins/launchpad/__init__.py:335
5997
msgid "Commit message."
5998
msgstr ""
5999
6000
# help of 'approve' option of 'lp-propose-merge' command
6001
#: bzrlib/plugins/launchpad/__init__.py:337
6002
msgid "Mark the proposal as approved immediately."
6003
msgstr ""
6004
6005
# help of 'review' option of 'lp-propose-merge' command
6006
#: bzrlib/plugins/launchpad/__init__.py:339
6007
msgid "Requested reviewer and optional type."
6008
msgstr ""
6009
6010
#: bzrlib/plugins/launchpad/__init__.py:376
6011
msgid "Find the proposal to merge this revision."
6012
msgstr ""
6013
6014
#: bzrlib/plugins/launchpad/__init__.py:378
6015
msgid ""
6016
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6017
"This works only if the selected branch was the merge proposal target, and\n"
6018
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6019
"are opened in a web browser."
6020
msgstr ""
6021
6022
#: bzrlib/plugins/launchpad/__init__.py:383
6023
msgid ""
6024
"Any revision involved in the merge may be specified-- the revision in\n"
6025
"which the merge was performed, or one of the revisions that was merged."
6026
msgstr ""
6027
6028
#: bzrlib/plugins/launchpad/__init__.py:386
6029
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6030
msgstr ""
6031
6032
#: bzrlib/plugins/launchpad/__init__.py:388
6033
msgid " bzr lp-find-proposal -r annotate:README:1"
6034
msgstr ""
6035
6036
#: dummy/help_topics/authentication/summary.txt:1
6037
msgid "Information on configuring authentication"
6038
msgstr ""
6039
6040
#: dummy/help_topics/basic/detail.txt:1
6041
msgid ""
6042
"Bazaar 2.5.0dev1 -- a free distributed version-control tool\n"
6043
"http://bazaar.canonical.com/"
6044
msgstr ""
6045
6046
#: dummy/help_topics/basic/detail.txt:4
6047
msgid ""
6048
"Basic commands:\n"
6049
" bzr init makes this directory a versioned branch\n"
6050
" bzr branch make a copy of another branch"
6051
msgstr ""
6052
6053
#: dummy/help_topics/basic/detail.txt:8
6054
msgid ""
6055
" bzr add make files or directories versioned\n"
6056
" bzr ignore ignore a file or pattern\n"
6057
" bzr mv move or rename a versioned file"
6058
msgstr ""
6059
6060
#: dummy/help_topics/basic/detail.txt:12
6061
msgid ""
6062
" bzr status summarize changes in working copy\n"
6063
" bzr diff show detailed diffs"
6064
msgstr ""
6065
6066
#: dummy/help_topics/basic/detail.txt:15
6067
msgid ""
6068
" bzr merge pull in changes from another branch\n"
6069
" bzr commit save some or all changes\n"
6070
" bzr send send changes via email"
6071
msgstr ""
6072
6073
#: dummy/help_topics/basic/detail.txt:19
6074
msgid ""
6075
" bzr log show history of changes\n"
6076
" bzr check validate storage"
6077
msgstr ""
6078
6079
#: dummy/help_topics/basic/detail.txt:22
6080
msgid ""
6081
" bzr help init more help on e.g. init command\n"
6082
" bzr help commands list all commands\n"
6083
" bzr help topics list all help topics\n"
6084
msgstr ""
6085
6086
#: dummy/help_topics/basic/summary.txt:1
6087
msgid "Basic commands"
6088
msgstr ""
6089
6090
#: dummy/help_topics/branches/detail.txt:1
6091
msgid "Branches"
6092
msgstr ""
6093
6094
#: dummy/help_topics/branches/detail.txt:3
6095
msgid ""
6096
"A branch consists of the state of a project, including all of its\n"
6097
"history. All branches have a repository associated (which is where the\n"
6098
"branch history is stored), but multiple branches may share the same\n"
6099
"repository (a shared repository). Branches can be copied and merged."
6100
msgstr ""
6101
6102
#: dummy/help_topics/branches/detail.txt:8
6103
msgid ""
6104
"In addition, one branch may be bound to another one. Binding to another\n"
6105
"branch indicates that commits which happen in this branch must also \n"
6106
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
6107
"commits when the two branches are out of date. In order for a commit \n"
6108
"to succeed, it may be necessary to update the current branch using \n"
6109
"``bzr update``."
6110
msgstr ""
6111
6112
#: dummy/help_topics/branches/detail.txt:15
6113
msgid "Related commands::"
6114
msgstr ""
6115
6116
#: dummy/help_topics/branches/detail.txt:17
6117
msgid ""
6118
" init Change a directory into a versioned branch.\n"
6119
" branch Create a new branch that is a copy of an existing branch.\n"
6120
" merge Perform a three-way merge.\n"
6121
" bind Bind a branch to another one.\n"
6122
msgstr ""
6123
6124
#: dummy/help_topics/branches/summary.txt:1
6125
msgid "Information on what a branch is"
6126
msgstr ""
6127
6128
#: dummy/help_topics/bugs/summary.txt:1
6129
msgid "Bug tracker settings"
6130
msgstr ""
6131
6132
#: dummy/help_topics/checkouts/detail.txt:1
6133
msgid "Checkouts"
6134
msgstr ""
6135
6136
#: dummy/help_topics/checkouts/detail.txt:3
6137
msgid ""
6138
"Checkouts are source trees that are connected to a branch, so that when\n"
6139
"you commit in the source tree, the commit goes into that branch. They\n"
6140
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
6141
"Bazaar's decentralized features until you want them. Using checkouts\n"
6142
"with shared repositories is very similar to working with SVN or CVS, but\n"
6143
"doesn't have the same restrictions. And using checkouts still allows\n"
6144
"others working on the project to use whatever workflow they like."
6145
msgstr ""
6146
6147
#: dummy/help_topics/checkouts/detail.txt:11
6148
msgid ""
6149
"A checkout is created with the bzr checkout command (see \"help checkout"
6150
"\").\n"
6151
"You pass it a reference to another branch, and it will create a local copy\n"
6152
"for you that still contains a reference to the branch you created the\n"
6153
"checkout from (the master branch). Then if you make any commits they will "
6154
"be\n"
6155
"made on the other branch first. This creates an instant mirror of your work, "
6156
"or\n"
6157
"facilitates lockstep development, where each developer is working together,\n"
6158
"continuously integrating the changes of others."
6159
msgstr ""
6160
6161
#: dummy/help_topics/checkouts/detail.txt:19
6162
msgid ""
6163
"However the checkout is still a first class branch in Bazaar terms, so that\n"
6164
"you have the full history locally. As you have a first class branch you "
6165
"can\n"
6166
"also commit locally if you want, for instance due to the temporary loss af "
6167
"a\n"
6168
"network connection. Use the --local option to commit to do this. All the "
6169
"local\n"
6170
"commits will then be made on the master branch the next time you do a non-"
6171
"local\n"
6172
"commit."
6173
msgstr ""
6174
6175
#: dummy/help_topics/checkouts/detail.txt:26
6176
msgid ""
6177
"If you are using a checkout from a shared branch you will periodically want "
6178
"to\n"
6179
"pull in all the changes made by others. This is done using the \"update\"\n"
6180
"command. The changes need to be applied before any non-local commit, but\n"
6181
"Bazaar will tell you if there are any changes and suggest that you use this\n"
6182
"command when needed."
6183
msgstr ""
6184
6185
#: dummy/help_topics/checkouts/detail.txt:32
6186
msgid ""
6187
"It is also possible to create a \"lightweight\" checkout by passing the\n"
6188
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
6189
"SVN checkout in that it is not a first class branch, it mainly consists of "
6190
"the\n"
6191
"working tree. This means that any history operations must query the master\n"
6192
"branch, which could be slow if a network connection is involved. Also, as "
6193
"you\n"
6194
"don't have a local branch, then you cannot commit locally."
6195
msgstr ""
6196
6197
#: dummy/help_topics/checkouts/detail.txt:39
6198
msgid ""
6199
"Lightweight checkouts work best when you have fast reliable access to the\n"
6200
"master branch. This means that if the master branch is on the same disk or "
6201
"LAN\n"
6202
"a lightweight checkout will be faster than a heavyweight one for any "
6203
"commands\n"
6204
"that modify the revision history (as only one copy of the branch needs to\n"
6205
"be updated). Heavyweight checkouts will generally be faster for any command\n"
6206
"that uses the history but does not change it, but if the master branch is "
6207
"on\n"
6208
"the same disk then there won't be a noticeable difference."
6209
msgstr ""
6210
6211
#: dummy/help_topics/checkouts/detail.txt:47
6212
msgid ""
6213
"Another possible use for a checkout is to use it with a treeless repository\n"
6214
"containing your branches, where you maintain only one working tree by\n"
6215
"switching the master branch that the checkout points to when you want to\n"
6216
"work on a different branch."
6217
msgstr ""
6218
6219
#: dummy/help_topics/checkouts/detail.txt:52
6220
msgid ""
6221
"Obviously to commit on a checkout you need to be able to write to the "
6222
"master\n"
6223
"branch. This means that the master branch must be accessible over a "
6224
"writeable\n"
6225
"protocol , such as sftp://, and that you have write permissions at the "
6226
"other\n"
6227
"end. Checkouts also work on the local file system, so that all that matters "
6228
"is\n"
6229
"file permissions."
6230
msgstr ""
6231
6232
#: dummy/help_topics/checkouts/detail.txt:58
6233
msgid ""
6234
"You can change the master of a checkout by using the \"switch\" command "
6235
"(see\n"
6236
"\"help switch\"). This will change the location that the commits are sent "
6237
"to.\n"
6238
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
6239
"checkout. If you would like to convert your heavy checkout into a normal\n"
6240
"branch so that every commit is local, you can use the \"unbind\" command. To "
6241
"see\n"
6242
"whether or not a branch is bound or not you can use the \"info\" command. If "
6243
"the\n"
6244
"branch is bound it will tell you the location of the bound branch."
6245
msgstr ""
6246
6247
#: dummy/help_topics/checkouts/detail.txt:68
6248
msgid ""
6249
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
6250
" checkout\n"
6251
" update Pull any changes in the master branch in to your checkout\n"
6252
" commit Make a commit that is sent to the master branch. If you have\n"
6253
" a heavy checkout then the --local option will commit to the\n"
6254
" checkout without sending the commit to the master\n"
6255
" switch Change the master branch that the commits in the checkout "
6256
"will\n"
6257
" be sent to\n"
6258
" bind Turn a standalone branch into a heavy checkout so that any\n"
6259
" commits will be sent to the master branch\n"
6260
" unbind Turn a heavy checkout into a standalone branch so that any\n"
6261
" commits are only made locally\n"
6262
" info Displays whether a branch is bound or unbound. If the branch "
6263
"is\n"
6264
" bound, then it will also display the location of the bound "
6265
"branch\n"
6266
msgstr ""
6267
6268
#: dummy/help_topics/checkouts/summary.txt:1
6269
msgid "Information on what a checkout is"
6270
msgstr ""
6271
6272
#: dummy/help_topics/commands/summary.txt:1
6273
msgid "Basic help for all commands"
6274
msgstr ""
6275
6276
#: dummy/help_topics/configuration/summary.txt:1
6277
msgid "Details on the configuration settings available"
6278
msgstr ""
6279
6280
#: dummy/help_topics/conflict-types/summary.txt:1
6281
msgid "Types of conflicts and what to do about them"
6282
msgstr ""
6283
6284
#: dummy/help_topics/content-filters/summary.txt:1
6285
msgid "Conversion of content into/from working trees"
6286
msgstr ""
6287
6288
#: dummy/help_topics/criss-cross/detail.txt:1
6289
msgid "Criss-Cross"
6290
msgstr ""
6291
6292
#: dummy/help_topics/criss-cross/detail.txt:3
6293
msgid ""
6294
"A criss-cross in the branch history can cause the default merge technique\n"
6295
"to emit more conflicts than would normally be expected."
6296
msgstr ""
6297
6298
#: dummy/help_topics/criss-cross/detail.txt:6
6299
msgid ""
6300
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
6301
"give\n"
6302
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
6303
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
6304
msgstr ""
6305
6306
#: dummy/help_topics/criss-cross/detail.txt:10
6307
msgid ""
6308
"Criss-crosses occur in a branch's history if two branches merge the same "
6309
"thing\n"
6310
"and then merge one another, or if two branches merge one another at the "
6311
"same\n"
6312
"time. They can be avoided by having each branch only merge from or into a\n"
6313
"designated central branch (a \"star topology\")."
6314
msgstr ""
6315
6316
#: dummy/help_topics/criss-cross/detail.txt:15
6317
msgid ""
6318
"Criss-crosses cause problems because of the way merge works. Bazaar's "
6319
"default\n"
6320
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
6321
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
6322
"differences between THIS and OTHER are due to one side adding lines, or\n"
6323
"from another side removing lines."
6324
msgstr ""
6325
6326
#: dummy/help_topics/criss-cross/detail.txt:21
6327
msgid ""
6328
"Criss-crosses mean there is no good choice for a base. Selecting the "
6329
"recent\n"
6330
"merge points could cause one side's changes to be silently discarded.\n"
6331
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
6332
"are emitted."
6333
msgstr ""
6334
6335
#: dummy/help_topics/criss-cross/detail.txt:26
6336
msgid ""
6337
"The ``weave`` merge type is not affected by this problem because it uses\n"
6338
"line-origin detection instead of a basis revision to determine the cause of\n"
6339
"differences.\n"
6340
msgstr ""
6341
6342
#: dummy/help_topics/criss-cross/summary.txt:1
6343
msgid "Information on criss-cross merging"
6344
msgstr ""
6345
6346
#: dummy/help_topics/current-formats/summary.txt:1
6347
msgid "Current storage formats"
6348
msgstr ""
6349
6350
#: dummy/help_topics/debug-flags/summary.txt:1
6351
msgid "Options to show or record debug information"
6352
msgstr ""
6353
6354
#: dummy/help_topics/diverged-branches/summary.txt:1
6355
msgid "How to fix diverged branches"
6356
msgstr ""
6357
6358
#: dummy/help_topics/env-variables/detail.txt:1
6359
msgid "Environment Variables"
6360
msgstr ""
6361
6362
#: dummy/help_topics/env-variables/detail.txt:3
6363
msgid ""
6364
"=================== "
6365
"===========================================================\n"
6366
"BZRPATH Path where bzr is to look for shell plugin external\n"
6367
" commands.\n"
6368
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
6369
"EMAIL E-Mail address of the user.\n"
6370
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
6371
"EDITOR Editor for editing commit messages.\n"
6372
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
6373
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
6374
"BZR_PLUGINS_AT Plugins to load from a directory not in "
6375
"BZR_PLUGIN_PATH.\n"
6376
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
6377
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
6378
"and\n"
6379
" HOME.\n"
6380
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
6381
"URLs).\n"
6382
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
6383
"sshcorp,\n"
6384
" plink or lsh.\n"
6385
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
6386
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
6387
"BZR_COLUMNS Override implicit terminal width.\n"
6388
"BZR_CONCURRENCY Number of processes that can be run concurrently "
6389
"(selftest)\n"
6390
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
6391
"'text'.\n"
6392
"BZR_PDB Control whether to launch a debugger on error.\n"
6393
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
6394
" breakin debugger.\n"
6395
"=================== "
6396
"===========================================================\n"
6397
msgstr ""
6398
6399
#: dummy/help_topics/env-variables/summary.txt:1
6400
msgid "Environment variable names and values"
6401
msgstr ""
6402
6403
#: dummy/help_topics/eol/summary.txt:1
6404
msgid "Information on end-of-line handling"
6405
msgstr ""
6406
6407
#: dummy/help_topics/files/detail.txt:1
6408
msgid "Files"
6409
msgstr ""
6410
6411
#: dummy/help_topics/files/detail.txt:3
6412
msgid ""
6413
":On Unix: ~/.bazaar/bazaar.conf\n"
6414
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
6415
"\\bazaar\\\\2.0\\\\bazaar.conf"
6416
msgstr ""
6417
6418
#: dummy/help_topics/files/detail.txt:6
6419
msgid ""
6420
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
6421
"used to define general configuration that will be applied everywhere.\n"
6422
"The section ``[ALIASES]`` can be used to create command aliases for\n"
6423
"commonly used options."
6424
msgstr ""
6425
6426
#: dummy/help_topics/files/detail.txt:11
6427
msgid "A typical config file might look something like::"
6428
msgstr ""
6429
6430
#: dummy/help_topics/files/detail.txt:13
6431
msgid ""
6432
" [DEFAULT]\n"
6433
" email=John Doe <jdoe@isp.com>"
6434
msgstr ""
6435
6436
#: dummy/help_topics/files/detail.txt:16
6437
msgid ""
6438
" [ALIASES]\n"
6439
" commit = commit --strict\n"
6440
" log10 = log --short -r -10..-1\n"
6441
msgstr ""
6442
6443
#: dummy/help_topics/files/summary.txt:1
6444
msgid "Information on configuration and log files"
6445
msgstr ""
6446
6447
#: dummy/help_topics/formats/detail.txt:1
6448
msgid "Storage Formats"
6449
msgstr ""
6450
6451
#: dummy/help_topics/formats/detail.txt:3
6452
msgid ""
6453
"To ensure that older clients do not access data incorrectly,\n"
6454
"Bazaar's policy is to introduce a new storage format whenever\n"
6455
"new features requiring new metadata are added. New storage\n"
6456
"formats may also be introduced to improve performance and\n"
6457
"scalability."
6458
msgstr ""
6459
6460
#: dummy/help_topics/formats/detail.txt:9
6461
msgid ""
6462
"The newest format, 2a, is highly recommended. If your\n"
6463
"project is not using 2a, then you should suggest to the\n"
6464
"project owner to upgrade."
6465
msgstr ""
6466
6467
#: dummy/help_topics/formats/detail.txt:13
6468
msgid ""
6469
"\n"
6470
".. note::"
6471
msgstr ""
6472
6473
#: dummy/help_topics/formats/detail.txt:16
6474
msgid ""
6475
" Some of the older formats have two variants:\n"
6476
" a plain one and a rich-root one. The latter include an additional\n"
6477
" field about the root of the tree. There is no performance cost\n"
6478
" for using a rich-root format but you cannot easily merge changes\n"
6479
" from a rich-root format into a plain format. As a consequence,\n"
6480
" moving a project to a rich-root format takes some co-ordination\n"
6481
" in that all contributors need to upgrade their repositories\n"
6482
" around the same time. 2a and all future formats will be\n"
6483
" implicitly rich-root."
6484
msgstr ""
6485
6486
#: dummy/help_topics/formats/detail.txt:26
6487
msgid ""
6488
"See :doc:`current-formats-help` for the complete list of\n"
6489
"currently supported formats. See :doc:`other-formats-help` for\n"
6490
"descriptions of any available experimental and deprecated formats.\n"
6491
msgstr ""
6492
6493
#: dummy/help_topics/formats/summary.txt:1
6494
msgid "Information on choosing a storage format"
6495
msgstr ""
6496
6497
#: dummy/help_topics/global-options/detail.txt:1
6498
msgid "Global Options"
6499
msgstr ""
6500
6501
#: dummy/help_topics/global-options/detail.txt:3
6502
msgid ""
6503
"These options may be used with any command, and may appear in front of any\n"
6504
"command. (e.g. ``bzr --profile help``)."
6505
msgstr ""
6506
6507
#: dummy/help_topics/global-options/detail.txt:6
6508
msgid ""
6509
"--version Print the version number. Must be supplied before the "
6510
"command.\n"
6511
"--no-aliases Do not process command aliases when running this command.\n"
6512
"--builtin Use the built-in version of a command, not the plugin "
6513
"version.\n"
6514
" This does not suppress other plugin effects.\n"
6515
"--no-plugins Do not process any plugins.\n"
6516
"--no-l10n Do not translate messages.\n"
6517
"--concurrency Number of processes that can be run concurrently (selftest)."
6518
msgstr ""
6519
6520
#: dummy/help_topics/global-options/detail.txt:14
6521
msgid ""
6522
"--profile Profile execution using the hotshot profiler.\n"
6523
"--lsprof Profile execution using the lsprof profiler.\n"
6524
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
6525
" results to a specified file. If the filename ends with \".txt"
6526
"\",\n"
6527
" text format will be used. If the filename either starts "
6528
"with\n"
6529
" \"callgrind.out\" or end with \".callgrind\", the output will "
6530
"be\n"
6531
" formatted for use with KCacheGrind. Otherwise, the output\n"
6532
" will be a pickle.\n"
6533
"--coverage Generate line coverage report in the specified directory."
6534
msgstr ""
6535
6536
#: dummy/help_topics/global-options/detail.txt:24
6537
msgid ""
6538
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
6539
"information on profiling."
6540
msgstr ""
6541
6542
#: dummy/help_topics/global-options/detail.txt:27
6543
msgid ""
6544
"A number of debug flags are also available to assist troubleshooting and\n"
6545
"development. See :doc:`debug-flags-help`.\n"
6546
msgstr ""
6547
6548
#: dummy/help_topics/global-options/summary.txt:1
6549
msgid "Options that control how Bazaar runs"
6550
msgstr ""
6551
6552
#: dummy/help_topics/hidden-commands/summary.txt:1
6553
msgid "All hidden commands"
6554
msgstr ""
6555
6556
#: dummy/help_topics/hooks/summary.txt:1
6557
msgid "Points at which custom processing can be added"
6558
msgstr ""
6559
6560
#: dummy/help_topics/launchpad/detail.txt:1
6561
msgid "Integration with Launchpad.net"
6562
msgstr ""
6563
6564
#: dummy/help_topics/launchpad/detail.txt:3
6565
msgid ""
6566
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
6567
"specification tracking."
6568
msgstr ""
6569
6570
#: dummy/help_topics/launchpad/detail.txt:6
6571
msgid ""
6572
"The bzr client (through the plugin called 'launchpad') has special\n"
6573
"features to communicate with Launchpad:"
6574
msgstr ""
6575
6576
#: dummy/help_topics/launchpad/detail.txt:9
6577
msgid ""
6578
" * The launchpad-login command tells Bazaar your Launchpad user name. "
6579
"This\n"
6580
" is then used by the 'lp:' transport to download your branches using\n"
6581
" bzr+ssh://."
6582
msgstr ""
6583
6584
#: dummy/help_topics/launchpad/detail.txt:13
6585
msgid ""
6586
" * The 'lp:' transport uses Launchpad as a directory service: for "
6587
"example\n"
6588
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
6589
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
6590
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
6591
msgstr ""
6592
6593
#: dummy/help_topics/launchpad/detail.txt:18
6594
msgid ""
6595
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
6596
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
6597
"lp:12345'\n"
6598
" will record a revision property that marks that revision as fixing\n"
6599
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
6600
" automatically be linked to the bug report."
6601
msgstr ""
6602
6603
#: dummy/help_topics/launchpad/detail.txt:24
6604
msgid ""
6605
" * The register-branch command tells Launchpad about the url of a\n"
6606
" public branch. Launchpad will then mirror the branch, display\n"
6607
" its contents and allow it to be attached to bugs and other\n"
6608
" objects."
6609
msgstr ""
6610
6611
#: dummy/help_topics/launchpad/detail.txt:29
6612
msgid "For more information see http://help.launchpad.net/\n"
6613
msgstr ""
6614
6615
#: dummy/help_topics/launchpad/summary.txt:1
6616
msgid "Using Bazaar with Launchpad.net"
6617
msgstr ""
6618
6619
#: dummy/help_topics/location-alias/summary.txt:1
6620
msgid "Aliases for remembered locations"
6621
msgstr ""
6622
6623
#: dummy/help_topics/log-formats/summary.txt:1
6624
msgid "Details on the logging formats available"
6625
msgstr ""
6626
6627
#: dummy/help_topics/other-formats/summary.txt:1
6628
msgid "Experimental and deprecated storage formats"
6629
msgstr ""
6630
6631
#: dummy/help_topics/patterns/summary.txt:1
6632
msgid "Information on the pattern syntax"
6633
msgstr ""
6634
6635
#: dummy/help_topics/repositories/detail.txt:1
6636
msgid "Repositories"
6637
msgstr ""
6638
6639
#: dummy/help_topics/repositories/detail.txt:3
6640
msgid ""
6641
"Repositories in Bazaar are where committed information is stored. There is\n"
6642
"a repository associated with every branch."
6643
msgstr ""
6644
6645
#: dummy/help_topics/repositories/detail.txt:6
6646
msgid ""
6647
"Repositories are a form of database. Bzr will usually maintain this for\n"
6648
"good performance automatically, but in some situations (e.g. when doing\n"
6649
"very many commits in a short time period) you may want to ask bzr to\n"
6650
"optimise the database indices. This can be done by the 'bzr pack' command."
6651
msgstr ""
6652
6653
#: dummy/help_topics/repositories/detail.txt:11
6654
msgid ""
6655
"By default just running 'bzr init' will create a repository within the new\n"
6656
"branch but it is possible to create a shared repository which allows "
6657
"multiple\n"
6658
"branches to share their information in the same location. When a new branch "
6659
"is\n"
6660
"created it will first look to see if there is a containing shared repository "
6661
"it\n"
6662
"can use."
6663
msgstr ""
6664
6665
#: dummy/help_topics/repositories/detail.txt:17
6666
msgid ""
6667
"When two branches of the same project share a repository, there is\n"
6668
"generally a large space saving. For some operations (e.g. branching\n"
6669
"within the repository) this translates in to a large time saving."
6670
msgstr ""
6671
6672
#: dummy/help_topics/repositories/detail.txt:21
6673
msgid ""
6674
"To create a shared repository use the init-repository command (or the alias\n"
6675
"init-repo). This command takes the location of the repository to create. "
6676
"This\n"
6677
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
6678
"which contains a shared repository. Any new branches that are created in "
6679
"this\n"
6680
"directory will then use it for storage."
6681
msgstr ""
6682
6683
#: dummy/help_topics/repositories/detail.txt:27
6684
msgid ""
6685
"It is a good idea to create a repository whenever you might create more\n"
6686
"than one branch of a project. This is true for both working areas where you\n"
6687
"are doing the development, and any server areas that you use for hosting\n"
6688
"projects. In the latter case, it is common to want branches without working\n"
6689
"trees. Since the files in the branch will not be edited directly there is "
6690
"no\n"
6691
"need to use up disk space for a working tree. To create a repository in "
6692
"which\n"
6693
"the branches will not have working trees pass the '--no-trees' option to\n"
6694
"'init-repository'."
6695
msgstr ""
6696
6697
#: dummy/help_topics/repositories/detail.txt:38
6698
msgid ""
6699
" init-repository Create a shared repository. Use --no-trees to create "
6700
"one\n"
6701
" in which new branches won't get a working tree.\n"
6702
msgstr ""
6703
6704
#: dummy/help_topics/repositories/summary.txt:1
6705
msgid "Basic information on shared repositories."
6706
msgstr ""
6707
6708
#: dummy/help_topics/revisionspec/summary.txt:1
6709
msgid "Explain how to use --revision"
6710
msgstr ""
6711
6712
#: dummy/help_topics/rules/summary.txt:1
6713
msgid "Information on defining rule-based preferences"
6714
msgstr ""
6715
6716
#: dummy/help_topics/standalone-trees/detail.txt:1
6717
msgid "Standalone Trees"
6718
msgstr ""
6719
6720
#: dummy/help_topics/standalone-trees/detail.txt:3
6721
msgid ""
6722
"A standalone tree is a working tree with an associated repository. It\n"
6723
"is an independently usable branch, with no dependencies on any other.\n"
6724
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
6725
"an existing project under version control."
6726
msgstr ""
6727
6728
#: dummy/help_topics/standalone-trees/detail.txt:8
6729
msgid "Related Commands::"
6730
msgstr ""
6731
6732
#: dummy/help_topics/standalone-trees/detail.txt:10
6733
msgid " init Make a directory into a versioned branch.\n"
6734
msgstr ""
6735
6736
#: dummy/help_topics/standalone-trees/summary.txt:1
6737
msgid "Information on what a standalone tree is"
6738
msgstr ""
6739
6740
#: dummy/help_topics/standard-options/detail.txt:1
6741
msgid "Standard Options"
6742
msgstr ""
6743
6744
#: dummy/help_topics/standard-options/detail.txt:3
6745
msgid "Standard options are legal for all commands."
6746
msgstr ""
6747
6748
#: dummy/help_topics/standard-options/detail.txt:5
6749
msgid ""
6750
"--help, -h Show help message.\n"
6751
"--verbose, -v Display more information.\n"
6752
"--quiet, -q Only display errors and warnings."
6753
msgstr ""
6754
6755
#: dummy/help_topics/standard-options/detail.txt:9
6756
msgid "Unlike global options, standard options can be used in aliases.\n"
6757
msgstr ""
6758
6759
#: dummy/help_topics/standard-options/summary.txt:1
6760
msgid "Options that can be used with any command"
6761
msgstr ""
6762
6763
#: dummy/help_topics/status-flags/detail.txt:1
6764
msgid "Status Flags"
6765
msgstr ""
6766
6767
#: dummy/help_topics/status-flags/detail.txt:3
6768
msgid ""
6769
"Status flags are used to summarise changes to the working tree in a concise\n"
6770
"manner. They are in the form::"
6771
msgstr ""
6772
6773
#: dummy/help_topics/status-flags/detail.txt:6
6774
msgid " xxx <filename>"
6775
msgstr ""
6776
6777
#: dummy/help_topics/status-flags/detail.txt:8
6778
msgid "where the columns' meanings are as follows."
6779
msgstr ""
6780
6781
#: dummy/help_topics/status-flags/detail.txt:10
6782
msgid "Column 1 - versioning/renames::"
6783
msgstr ""
6784
6785
#: dummy/help_topics/status-flags/detail.txt:12
6786
msgid ""
6787
" + File versioned\n"
6788
" - File unversioned\n"
6789
" R File renamed\n"
6790
" ? File unknown\n"
6791
" X File nonexistent (and unknown to bzr)\n"
6792
" C File has conflicts\n"
6793
" P Entry for a pending merge (not a file)"
6794
msgstr ""
6795
6796
#: dummy/help_topics/status-flags/detail.txt:20
6797
msgid "Column 2 - contents::"
6798
msgstr ""
6799
6800
#: dummy/help_topics/status-flags/detail.txt:22
6801
msgid ""
6802
" N File created\n"
6803
" D File deleted\n"
6804
" K File kind changed\n"
6805
" M File modified"
6806
msgstr ""
6807
6808
#: dummy/help_topics/status-flags/detail.txt:27
6809
msgid "Column 3 - execute::"
6810
msgstr ""
6811
6812
#: dummy/help_topics/status-flags/detail.txt:29
6813
msgid " * The execute bit was changed\n"
6814
msgstr ""
6815
6816
#: dummy/help_topics/status-flags/summary.txt:1
6817
msgid "Help on status flags"
6818
msgstr ""
6819
6820
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
6821
msgid "Branches Out of Sync"
6822
msgstr ""
6823
6824
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
6825
msgid ""
6826
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
6827
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
6828
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
6829
"have the same last revision as the new reference branch for the lightweight\n"
6830
"checkout, data could be lost, so Bazaar refuses."
6831
msgstr ""
6832
6833
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
6834
msgid "How you deal with this depends on *why* the branches are out of sync."
6835
msgstr ""
6836
6837
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
6838
msgid ""
6839
"If you have a checkout and have done local commits, you can get back in "
6840
"sync\n"
6841
"by running \"bzr update\" (and possibly \"bzr commit\")."
6842
msgstr ""
6843
6844
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
6845
msgid ""
6846
"If you have a branch and the remote branch is out-of-date, you can push\n"
6847
"the local changes using \"bzr push\". If the local branch is out of date, "
6848
"you\n"
6849
"can do \"bzr pull\". If both branches have had changes, you can merge, "
6850
"commit\n"
6851
"and then push your changes. If you decide that some of the changes aren't\n"
6852
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
6853
msgstr ""
6854
6855
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
6856
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
6857
msgstr ""
6858
6859
#: dummy/help_topics/topics/summary.txt:1
6860
msgid "Topics list"
6861
msgstr ""
6862
6863
#: dummy/help_topics/url-special-chars/summary.txt:1
6864
msgid "Special character handling in URLs"
6865
msgstr ""
6866
6867
#: dummy/help_topics/urlspec/summary.txt:1
6868
msgid "Supported transport protocols"
6869
msgstr ""
6870
6871
#: dummy/help_topics/working-trees/detail.txt:1
6872
msgid "Working Trees"
6873
msgstr ""
6874
6875
#: dummy/help_topics/working-trees/detail.txt:3
6876
msgid ""
6877
"A working tree is the contents of a branch placed on disk so that you can\n"
6878
"see the files and edit them. The working tree is where you make changes to "
6879
"a\n"
6880
"branch, and when you commit the current state of the working tree is the\n"
6881
"snapshot that is recorded in the commit."
6882
msgstr ""
6883
6884
#: dummy/help_topics/working-trees/detail.txt:8
6885
msgid ""
6886
"When you push a branch to a remote system, a working tree will not be\n"
6887
"created. If one is already present the files will not be updated. The\n"
6888
"branch information will be updated and the working tree will be marked\n"
6889
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
6890
"may be uncommitted changes or the update may cause content conflicts that "
6891
"are\n"
6892
"difficult to deal with remotely."
6893
msgstr ""
6894
6895
#: dummy/help_topics/working-trees/detail.txt:15
6896
msgid ""
6897
"If you have a branch with no working tree you can use the 'checkout' "
6898
"command\n"
6899
"to create a working tree. If you run 'bzr checkout .' from the branch it "
6900
"will\n"
6901
"create the working tree. If the branch is updated remotely, you can update "
6902
"the\n"
6903
"working tree by running 'bzr update' in that directory."
6904
msgstr ""
6905
6906
#: dummy/help_topics/working-trees/detail.txt:20
6907
msgid ""
6908
"If you have a branch with a working tree that you do not want the 'remove-"
6909
"tree'\n"
6910
"command will remove the tree if it is safe. This can be done to avoid the\n"
6911
"warning about the remote working tree not being updated when pushing to the\n"
6912
"branch. It can also be useful when working with a '--no-trees' repository\n"
6913
"(see 'bzr help repositories')."
6914
msgstr ""
6915
6916
#: dummy/help_topics/working-trees/detail.txt:26
6917
msgid ""
6918
"If you want to have a working tree on a remote machine that you push to you\n"
6919
"can either run 'bzr update' in the remote branch after each push, or use "
6920
"some\n"
6921
"other method to update the tree during the push. There is an 'rspush' "
6922
"plugin\n"
6923
"that will update the working tree using rsync as well as doing a push. "
6924
"There\n"
6925
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
6926
"SSH\n"
6927
"after each push."
6928
msgstr ""
6929
6930
#: dummy/help_topics/working-trees/detail.txt:33
6931
msgid "Useful commands::"
6932
msgstr ""
6933
6934
#: dummy/help_topics/working-trees/detail.txt:35
6935
msgid ""
6936
" checkout Create a working tree when a branch does not have one.\n"
6937
" remove-tree Removes the working tree from a branch when it is safe to do "
6938
"so.\n"
6939
" update When a working tree is out of sync with its associated "
6940
"branch\n"
6941
" this will update the tree to match the branch.\n"
6942
msgstr ""
6943
6944
#: dummy/help_topics/working-trees/summary.txt:1
6945
msgid "Information on working trees"
6946
msgstr ""
6947
6948
#: en/help_topics/authentication.txt:1
6949
msgid ""
6950
"Authentication Settings\n"
6951
"======================="
6952
msgstr ""
6953
6954
#: en/help_topics/authentication.txt:4
6955
msgid ""
6956
"\n"
6957
"Intent\n"
6958
"------"
6959
msgstr ""
6960
6961
#: en/help_topics/authentication.txt:8
6962
msgid ""
6963
"Many different authentication policies can be described in the\n"
6964
"``authentication.conf`` file but a particular user should need only a few\n"
6965
"definitions to cover his needs without having to specify a user and a "
6966
"password\n"
6967
"for every branch he uses."
6968
msgstr ""
6969
6970
#: en/help_topics/authentication.txt:13
6971
msgid ""
6972
"The definitions found in this file are used to find the credentials to use "
6973
"for\n"
6974
"a given url. The same credentials can generally be used for as many branches "
6975
"as\n"
6976
"possible by grouping their declaration around the remote servers that need\n"
6977
"them. It's even possible to declare credentials that will be used by "
6978
"different\n"
6979
"servers."
6980
msgstr ""
6981
6982
#: en/help_topics/authentication.txt:19
6983
msgid ""
6984
"The intent is to make this file as small as possible to minimize maintenance."
6985
msgstr ""
6986
6987
#: en/help_topics/authentication.txt:21
6988
msgid ""
6989
"Once the relevant credentials are declared in this file you may use branch "
6990
"urls\n"
6991
"without embedding passwords (security hazard) or even users (enabling "
6992
"sharing\n"
6993
"of your urls with others)."
6994
msgstr ""
6995
6996
#: en/help_topics/authentication.txt:25
6997
msgid "Instead of using::"
6998
msgstr ""
6999
7000
#: en/help_topics/authentication.txt:27
7001
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
7002
msgstr ""
7003
7004
#: en/help_topics/authentication.txt:29
7005
msgid "you simply use::"
7006
msgstr ""
7007
7008
#: en/help_topics/authentication.txt:31
7009
msgid " bzr branch ftp://host.com/path/to/my/branch"
7010
msgstr ""
7011
7012
#: en/help_topics/authentication.txt:33
7013
msgid "provided you have created the following ``authentication.conf`` file::"
7014
msgstr ""
7015
7016
#: en/help_topics/authentication.txt:35
7017
msgid ""
7018
" [myprojects]\n"
7019
" scheme=ftp\n"
7020
" host=host.com\n"
7021
" user=joe\n"
7022
" password=secret\n"
7023
" "
7024
msgstr ""
7025
7026
#: en/help_topics/authentication.txt:42
7027
msgid ""
7028
"Authentication definitions\n"
7029
"--------------------------"
7030
msgstr ""
7031
7032
#: en/help_topics/authentication.txt:45
7033
msgid ""
7034
"There are two kinds of authentication used by the various schemes supported "
7035
"by\n"
7036
"bzr:"
7037
msgstr ""
7038
7039
#: en/help_topics/authentication.txt:48
7040
msgid "1. user and password"
7041
msgstr ""
7042
7043
#: en/help_topics/authentication.txt:50
7044
msgid ""
7045
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
7046
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
7047
"ssh agents are a better, more secure solution. So we have chosen to not "
7048
"provide\n"
7049
"our own less secure method."
7050
msgstr ""
7051
7052
#: en/help_topics/authentication.txt:55
7053
msgid "2. user, realm and password"
7054
msgstr ""
7055
7056
#: en/help_topics/authentication.txt:57
7057
msgid ""
7058
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
7059
"against a host. But, by using ``.htaccess`` files, for example, it is "
7060
"possible\n"
7061
"to define several (``user, realm, password``) for a given ``host``. So what "
7062
"is\n"
7063
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
7064
"is\n"
7065
"not taken into account in the definitions, but will displayed if bzr "
7066
"prompts\n"
7067
"you for a password."
7068
msgstr ""
7069
7070
#: en/help_topics/authentication.txt:64
7071
msgid ""
7072
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
7073
"specifying the appropriate port."
7074
msgstr ""
7075
7076
#: en/help_topics/authentication.txt:67
7077
msgid ""
7078
"To take all schemes into account, the password will be deduced from a set "
7079
"of\n"
7080
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
7081
"``user``,\n"
7082
"``password``)."
7083
msgstr ""
7084
7085
#: en/help_topics/authentication.txt:71
7086
msgid ""
7087
" * ``scheme``: can be empty (meaning the rest of the definition can be "
7088
"used\n"
7089
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
7090
"``ssh``\n"
7091
" should be used instead since this is the real scheme regarding\n"
7092
" authentication,"
7093
msgstr ""
7094
7095
#: en/help_topics/authentication.txt:76
7096
msgid " * ``host``: can be empty (to act as a default for any host),"
7097
msgstr ""
7098
7099
#: en/help_topics/authentication.txt:78
7100
msgid ""
7101
" * ``port`` can be empty (useful when an host provides several servers for "
7102
"the\n"
7103
" same scheme), only numerical values are allowed, this should be used "
7104
"only\n"
7105
" when the server uses a port different than the scheme standard port,"
7106
msgstr ""
7107
7108
#: en/help_topics/authentication.txt:82
7109
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
7110
msgstr ""
7111
7112
#: en/help_topics/authentication.txt:84
7113
msgid ""
7114
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
7115
" ``getpass.get_user()``),"
7116
msgstr ""
7117
7118
#: en/help_topics/authentication.txt:87
7119
msgid ""
7120
" * ``password``: can be empty if you prefer to always be prompted for your\n"
7121
" password."
7122
msgstr ""
7123
7124
#: en/help_topics/authentication.txt:90
7125
msgid ""
7126
"Multiple definitions can be provided and, for a given URL, bzr will select "
7127
"a\n"
7128
"(``user`` [, ``password``]) based on the following rules :"
7129
msgstr ""
7130
7131
#: en/help_topics/authentication.txt:93
7132
msgid " 1. the first match wins,"
7133
msgstr ""
7134
7135
#: en/help_topics/authentication.txt:95
7136
msgid " 2. empty fields match everything,"
7137
msgstr ""
7138
7139
#: en/help_topics/authentication.txt:97
7140
msgid ""
7141
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
7142
msgstr ""
7143
7144
#: en/help_topics/authentication.txt:99
7145
msgid ""
7146
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
7147
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
7148
"net``\n"
7149
" will not match ``bzr.sf.net``)."
7150
msgstr ""
7151
7152
#: en/help_topics/authentication.txt:103
7153
msgid ""
7154
" 5. ``port`` matches if included in the requested URL (exact matches only)"
7155
msgstr ""
7156
7157
#: en/help_topics/authentication.txt:105
7158
msgid ""
7159
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
7160
"above,\n"
7161
" empty paths will match any provided path)."
7162
msgstr ""
7163
7164
#: en/help_topics/authentication.txt:110
7165
msgid ""
7166
"File format\n"
7167
"-----------"
7168
msgstr ""
7169
7170
#: en/help_topics/authentication.txt:113
7171
msgid ""
7172
"The general rules for :doc:`configuration files <configuration-help>`\n"
7173
"apply except for the variable policies."
7174
msgstr ""
7175
7176
#: en/help_topics/authentication.txt:116
7177
msgid "Each section describes an authentication definition."
7178
msgstr ""
7179
7180
#: en/help_topics/authentication.txt:118
7181
msgid ""
7182
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
7183
"reserved\n"
7184
"and should appear as the *last* section."
7185
msgstr ""
7186
7187
#: en/help_topics/authentication.txt:121
7188
msgid "Each section should define:"
7189
msgstr ""
7190
7191
#: en/help_topics/authentication.txt:123
7192
msgid "* ``user``: the login to be used,"
7193
msgstr ""
7194
7195
#: en/help_topics/authentication.txt:125
7196
msgid "Each section could define:"
7197
msgstr ""
7198
7199
#: en/help_topics/authentication.txt:127
7200
msgid "* ``host``: the remote server,"
7201
msgstr ""
7202
7203
#: en/help_topics/authentication.txt:129
7204
msgid "* ``port``: the port the server is listening,"
7205
msgstr ""
7206
7207
#: en/help_topics/authentication.txt:131
7208
msgid "* ``path``: the branch location,"
7209
msgstr ""
7210
7211
#: en/help_topics/authentication.txt:133
7212
msgid "* ``password``: the password."
7213
msgstr ""
7214
7215
#: en/help_topics/authentication.txt:135
7216
msgid ""
7217
"\n"
7218
"Examples\n"
7219
"--------"
7220
msgstr ""
7221
7222
#: en/help_topics/authentication.txt:139
7223
msgid ""
7224
"\n"
7225
"Personal projects hosted outside\n"
7226
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
7227
msgstr ""
7228
7229
#: en/help_topics/authentication.txt:143
7230
msgid ""
7231
"All connections are done with the same ``user`` (the remote one for which "
7232
"the\n"
7233
"default bzr one is not appropriate) and the password is always prompted "
7234
"with\n"
7235
"some exceptions::"
7236
msgstr ""
7237
7238
#: en/help_topics/authentication.txt:147
7239
msgid ""
7240
" # Pet projects on hobby.net\n"
7241
" [hobby]\n"
7242
" host=r.hobby.net\n"
7243
" user=jim\n"
7244
" password=obvious1234\n"
7245
" \n"
7246
" # Home server\n"
7247
" [home]\n"
7248
" scheme=https\n"
7249
" host=home.net\n"
7250
" user=joe\n"
7251
" password=1essobV10us\n"
7252
" \n"
7253
" [DEFAULT]\n"
7254
" # Our local user is barbaz, on all remote sites we're known as "
7255
"foobar\n"
7256
" user=foobar"
7257
msgstr ""
7258
7259
#: en/help_topics/authentication.txt:164
7260
msgid ""
7261
"\n"
7262
"Source hosting provider\n"
7263
"~~~~~~~~~~~~~~~~~~~~~~~"
7264
msgstr ""
7265
7266
#: en/help_topics/authentication.txt:168
7267
msgid "In the shp.net (fictitious) domain, each project has its own site::"
7268
msgstr ""
7269
7270
#: en/help_topics/authentication.txt:170
7271
msgid ""
7272
" [shpnet domain]\n"
7273
" # we use sftp, but ssh is the scheme used for authentication\n"
7274
" scheme=ssh\n"
7275
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
7276
" host=.shp.net\n"
7277
" user=joe\n"
7278
" # bzr don't support supplying a password for sftp,\n"
7279
" # consider using an ssh agent if you don't want to supply\n"
7280
" # a password interactively. (pageant, ssh-agent, etc)"
7281
msgstr ""
7282
7283
#: en/help_topics/authentication.txt:180
7284
msgid ""
7285
"HTTPS, SFTP servers and their proxy\n"
7286
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
7287
msgstr ""
7288
7289
#: en/help_topics/authentication.txt:183
7290
msgid ""
7291
"At company.com, the server hosting release and integration branches is "
7292
"behind a\n"
7293
"proxy, and the two branches use different authentication policies::"
7294
msgstr ""
7295
7296
#: en/help_topics/authentication.txt:186
7297
msgid ""
7298
" [reference code]\n"
7299
" scheme=https\n"
7300
" host=dev.company.com\n"
7301
" path=/dev\n"
7302
" user=user1\n"
7303
" password=pass1"
7304
msgstr ""
7305
7306
#: en/help_topics/authentication.txt:193
7307
msgid ""
7308
" # development branches on dev server\n"
7309
" [dev]\n"
7310
" scheme=ssh # bzr+ssh and sftp are available here\n"
7311
" host=dev.company.com\n"
7312
" path=/dev/integration\n"
7313
" user=user2\n"
7314
" \n"
7315
" # proxy\n"
7316
" [proxy]\n"
7317
" scheme=http\n"
7318
" host=proxy.company.com\n"
7319
" port=3128\n"
7320
" user=proxyuser1\n"
7321
" password=proxypass1"
7322
msgstr ""
7323
7324
#: en/help_topics/authentication.txt:208
7325
msgid ""
7326
"\n"
7327
"Planned enhancements\n"
7328
"--------------------"
7329
msgstr ""
7330
7331
#: en/help_topics/authentication.txt:212
7332
msgid ""
7333
"The following are not yet implemented but planned as parts of a work in\n"
7334
"progress:"
7335
msgstr ""
7336
7337
#: en/help_topics/authentication.txt:215
7338
msgid "* add a ``password_encoding`` field allowing:"
7339
msgstr ""
7340
7341
#: en/help_topics/authentication.txt:217
7342
msgid ""
7343
" - storing the passwords in various obfuscating encodings (base64 for one),"
7344
msgstr ""
7345
7346
#: en/help_topics/authentication.txt:219
7347
msgid " - delegate password storage to plugins (.netrc for example)."
7348
msgstr ""
7349
7350
#: en/help_topics/authentication.txt:221
7351
msgid ""
7352
"* update the credentials when the user is prompted for user or password,"
7353
msgstr ""
7354
7355
#: en/help_topics/authentication.txt:223
7356
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
7357
msgstr ""
7358
7359
#: en/help_topics/authentication.txt:225
7360
msgid ""
7361
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
7362
"but\n"
7363
"ignored in the actual implementation.\n"
7364
msgstr ""
7365
7366
#: en/help_topics/bugs.txt:1
7367
msgid "Bug Tracker Settings"
7368
msgstr ""
7369
7370
#: en/help_topics/bugs.txt:3
7371
msgid ""
7372
"When making a commit, metadata about bugs fixed by that change can be\n"
7373
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
7374
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
7375
"(The only ``status`` value currently supported is ``fixed.``)"
7376
msgstr ""
7377
7378
#: en/help_topics/bugs.txt:8
7379
msgid ""
7380
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
7381
"identifier\n"
7382
"rather than a full URL. This looks like::"
7383
msgstr ""
7384
7385
#: en/help_topics/bugs.txt:11
7386
msgid " bzr commit --fixes <tracker>:<id>"
7387
msgstr ""
7388
7389
#: en/help_topics/bugs.txt:13
7390
msgid "or::"
7391
msgstr ""
7392
7393
#: en/help_topics/bugs.txt:15
7394
msgid " bzr commit --fixes <id>"
7395
msgstr ""
7396
7397
#: en/help_topics/bugs.txt:17
7398
msgid ""
7399
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
7400
"the\n"
7401
"identifier for that bug within the bugtracker, usually the bug number.\n"
7402
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
7403
"or global configuration is used."
7404
msgstr ""
7405
7406
#: en/help_topics/bugs.txt:22
7407
msgid ""
7408
"Bazaar knows about a few bug trackers that have many users. If\n"
7409
"you use one of these bug trackers then there is no setup required to\n"
7410
"use this feature, you just need to know the tracker identifier to use.\n"
7411
"These are the bugtrackers that are built in:"
7412
msgstr ""
7413
7414
#: en/help_topics/bugs.txt:27
7415
msgid ""
7416
" ============================ ============ ============\n"
7417
" URL Abbreviation Example\n"
7418
" ============================ ============ ============\n"
7419
" https://bugs.launchpad.net/ lp lp:12345\n"
7420
" http://bugs.debian.org/ deb deb:12345\n"
7421
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
7422
" ============================ ============ ============"
7423
msgstr ""
7424
7425
#: en/help_topics/bugs.txt:35
7426
msgid ""
7427
"For the bug trackers not listed above configuration is required.\n"
7428
"Support for generating the URLs for any project using Bugzilla or Trac\n"
7429
"is built in, along with a template mechanism for other bugtrackers with\n"
7430
"simple URL schemes. If your bug tracker can't be described by one\n"
7431
"of the schemes described below then you can write a plugin to support\n"
7432
"it."
7433
msgstr ""
7434
7435
#: en/help_topics/bugs.txt:42
7436
msgid ""
7437
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
7438
"variable which contains the base URL of the bug tracker. These options\n"
7439
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
7440
"configuration section in ``locations.conf``. You can set up these values\n"
7441
"for each of the projects you work on."
7442
msgstr ""
7443
7444
#: en/help_topics/bugs.txt:48
7445
msgid ""
7446
"Note: As you provide a short name for each tracker, you can specify one or\n"
7447
"more bugs in one or more trackers at commit time if you wish."
7448
msgstr ""
7449
7450
#: en/help_topics/bugs.txt:51
7451
msgid ""
7452
"Launchpad\n"
7453
"---------"
7454
msgstr ""
7455
7456
#: en/help_topics/bugs.txt:54
7457
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
7458
msgstr ""
7459
7460
#: en/help_topics/bugs.txt:56
7461
msgid ""
7462
"bugzilla_<tracker>_url\n"
7463
"----------------------"
7464
msgstr ""
7465
7466
#: en/help_topics/bugs.txt:59
7467
msgid ""
7468
"If present, the location of the Bugzilla bug tracker referred to by\n"
7469
"<tracker>. This option can then be used together with ``bzr commit\n"
7470
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
7471
"example::"
7472
msgstr ""
7473
7474
#: en/help_topics/bugs.txt:64
7475
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
7476
msgstr ""
7477
7478
#: en/help_topics/bugs.txt:66
7479
msgid ""
7480
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
7481
"fixed."
7482
msgstr ""
7483
7484
#: en/help_topics/bugs.txt:69
7485
msgid ""
7486
"trac_<tracker>_url\n"
7487
"------------------"
7488
msgstr ""
7489
7490
#: en/help_topics/bugs.txt:72
7491
msgid ""
7492
"If present, the location of the Trac instance referred to by\n"
7493
"<tracker>. This option can then be used together with ``bzr commit\n"
7494
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
7495
"example::"
7496
msgstr ""
7497
7498
#: en/help_topics/bugs.txt:77
7499
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
7500
msgstr ""
7501
7502
#: en/help_topics/bugs.txt:79
7503
msgid ""
7504
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
7505
"as\n"
7506
"fixed."
7507
msgstr ""
7508
7509
#: en/help_topics/bugs.txt:82
7510
msgid ""
7511
"bugtracker_<tracker>_url\n"
7512
"------------------------"
7513
msgstr ""
7514
7515
#: en/help_topics/bugs.txt:85
7516
msgid ""
7517
"If present, the location of a generic bug tracker instance referred to by\n"
7518
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
7519
"which will be replaced by a specific bug ID. This option can then be used\n"
7520
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
7521
"fixed by that commit. For example::"
7522
msgstr ""
7523
7524
#: en/help_topics/bugs.txt:91
7525
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
7526
msgstr ""
7527
7528
#: en/help_topics/bugs.txt:93
7529
msgid ""
7530
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
7531
"Roundup bug tracker as fixed, or::"
7532
msgstr ""
7533
7534
#: en/help_topics/bugs.txt:96
7535
msgid ""
7536
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
7537
msgstr ""
7538
7539
#: en/help_topics/bugs.txt:98
7540
msgid ""
7541
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
7542
"RT bug tracker as fixed, or::"
7543
msgstr ""
7544
7545
#: en/help_topics/bugs.txt:101
7546
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
7547
msgstr ""
7548
7549
#: en/help_topics/bugs.txt:103
7550
msgid ""
7551
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
7552
"HUDSON-1234\n"
7553
"in Hudson's JIRA bug tracker as fixed.\n"
7554
msgstr ""
7555
7556
#: en/help_topics/commands.txt:1
7557
msgid ""
7558
"add Add specified files or directories.\n"
7559
"alias Set/unset and display aliases.\n"
7560
"annotate Show the origin of each line in a file.\n"
7561
"bash-completion Generate a shell function for bash command line "
7562
"completion.\n"
7563
" [bash_completion]\n"
7564
"bd-do Run a command in an exported package, copying the result\n"
7565
" back. [builddeb]\n"
7566
"bind Convert the current branch into a checkout of the "
7567
"supplied\n"
7568
" branch.\n"
7569
"branch Create a new branch that is a copy of an existing "
7570
"branch.\n"
7571
"branch-history Display the development history of a branch. [bzrtools]\n"
7572
"branches Scan a location for branches [bzrtools]\n"
7573
"break-lock Break a dead lock.\n"
7574
"bug-url Print full URL to a specific bug, or open it in your\n"
7575
" browser. [qbzr]\n"
7576
"builddeb Builds a Debian package from a branch. [builddeb]\n"
7577
"cat Write the contents of a file as of a given revision to\n"
7578
" standard output.\n"
7579
"cbranch Create a new checkout, associated with a new repository\n"
7580
" branch. [bzrtools]\n"
7581
"cdiff A color version of bzr's diff [bzrtools]\n"
7582
"check Validate working tree structure, branch consistency and\n"
7583
" repository history.\n"
7584
"checkout Create a new checkout of an existing branch.\n"
7585
"clean-tree Remove unwanted files from working tree.\n"
7586
"commit Commit changes into a new revision.\n"
7587
"config Display, set or remove a configuration option.\n"
7588
"conflict-diff Compare a conflicted file against BASE. [bzrtools]\n"
7589
"conflicts List files with conflicts.\n"
7590
"create-mirror Create a mirror of another branch. [bzrtools]\n"
7591
"deleted List files deleted in the working tree.\n"
7592
"dep3-patch Format the changes in a branch as a DEP-3 patch. "
7593
"[builddeb]\n"
7594
"dh-make Helps you create a new package. [builddeb]\n"
7595
"diff Show differences in the working tree, between revisions "
7596
"or\n"
7597
" branches.\n"
7598
"explorer Desktop application for Bazaar. [explorer]\n"
7599
"export Export current or past revision to a destination "
7600
"directory\n"
7601
" or archive.\n"
7602
"fetch-ghosts Attempt to retrieve ghosts from another branch. "
7603
"[bzrtools]\n"
7604
"graph-ancestry Produce ancestry graphs using dot. [bzrtools]\n"
7605
"grep Print lines matching PATTERN for specified files and\n"
7606
" revisions. [grep]\n"
7607
"heads Show all revisions in a repository not having "
7608
"descendants.\n"
7609
" [bzrtools]\n"
7610
"help Show help on a command or other topic.\n"
7611
"ignore Ignore specified files or patterns.\n"
7612
"ignored List ignored files and the patterns that matched them.\n"
7613
"import Import sources from a directory, tarball or zip file\n"
7614
" [bzrtools]\n"
7615
"import-dsc Import a series of source packages. [builddeb]\n"
7616
"import-upstream Imports an upstream tarball. [builddeb]\n"
7617
"info Show information about a working tree, branch or "
7618
"repository.\n"
7619
"init Make a directory into a versioned branch.\n"
7620
"init-repository Create a shared repository for branches to share storage\n"
7621
" space.\n"
7622
"init-workspace Start a new workspace. [explorer]\n"
7623
"join Combine a tree into its containing tree.\n"
7624
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
7625
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
7626
"launchpad-open Open a Launchpad branch page in your web browser.\n"
7627
" [launchpad]\n"
7628
"link-tree Hardlink matching files to another tree. [bzrtools]\n"
7629
"log Show historical log for a branch or subset of a branch.\n"
7630
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
7631
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
7632
"ls List files in a tree.\n"
7633
"mark-uploaded Mark that this branch has been uploaded, prior to "
7634
"pushing\n"
7635
" it. [builddeb]\n"
7636
"merge Perform a three-way merge.\n"
7637
"merge-package Merges source packaging branch into target packaging "
7638
"branch.\n"
7639
" [builddeb]\n"
7640
"merge-upstream Merges a new upstream version into the current branch.\n"
7641
" [builddeb]\n"
7642
"missing Show unmerged/unpulled revisions between two branches.\n"
7643
"mkdir Create a new versioned directory.\n"
7644
"multi-pull Pull all the branches under a location, e.g. a "
7645
"repository.\n"
7646
" [bzrtools]\n"
7647
"mv Move or rename a file.\n"
7648
"nick Print or set the branch nickname.\n"
7649
"pack Compress the data within a repository.\n"
7650
"patch Apply a named patch to the current tree. [bzrtools]\n"
7651
"plugins List the installed plugins.\n"
7652
"pull Turn this branch into a mirror of another branch.\n"
7653
"push Update a mirror of this branch.\n"
7654
"qadd GUI for adding files or directories. [qbzr]\n"
7655
"qannotate Show the origin of each line in a file. [qbzr]\n"
7656
"qbind Convert the current branch into a checkout of the "
7657
"supplied\n"
7658
" branch. [qbzr]\n"
7659
"qbranch Create a new copy of a branch. [qbzr]\n"
7660
"qbrowse Show inventory or working tree. [qbzr]\n"
7661
"qcat View the contents of a file as of a given revision. "
7662
"[qbzr]\n"
7663
"qcommit GUI for committing revisions. [qbzr]\n"
7664
"qconfig Configure Bazaar and QBzr. [qbzr]\n"
7665
"qconflicts Show conflicts. [qbzr]\n"
7666
"qdiff Show differences in working tree in a GUI window. [qbzr]\n"
7667
"qexport Export current or past revision to a destination "
7668
"directory\n"
7669
" or archive. [qbzr]\n"
7670
"qgetnew Creates a new working tree (either a checkout or full\n"
7671
" branch). [qbzr]\n"
7672
"qgetupdates Fetches external changes into the working tree. [qbzr]\n"
7673
"qinfo Shows information about the current location. [qbzr]\n"
7674
"qinit Initializes a new branch or shared repository. [qbzr]\n"
7675
"qinit-workspace Start a new workspace using a GUI. [explorer]\n"
7676
"qlog Show log of a repository, branch, file, or directory in a "
7677
"Qt\n"
7678
" window. [qbzr]\n"
7679
"qmerge Perform a three-way merge. [qbzr]\n"
7680
"qplugins Show information about installed plugins. [qbzr]\n"
7681
"qpull Turn this branch into a mirror of another branch. [qbzr]\n"
7682
"qpush Update a mirror of this branch. [qbzr]\n"
7683
"qrevert Revert changes files. [qbzr]\n"
7684
"qrun Run arbitrary bzr command. [qbzr]\n"
7685
"qsend Mail or create a merge-directive for submitting changes.\n"
7686
" [qbzr]\n"
7687
"qshelve Shelve selected changes away. [qbzr]\n"
7688
"qswitch Set the branch of a checkout and update. [qbzr]\n"
7689
"qtag Edit tags. [qbzr]\n"
7690
"qunbind Convert the current checkout into a regular branch. "
7691
"[qbzr]\n"
7692
"quncommit Move the tip of a branch to an earlier revision. [qbzr]\n"
7693
"qunshelve Restore shalved changes. [qbzr]\n"
7694
"qupdate Update working tree with latest changes in the branch.\n"
7695
" [qbzr]\n"
7696
"qverify-signatures Shows digital signature statuses for branch commits "
7697
"[qbzr]\n"
7698
"qversion Show version/system information. [qbzr]\n"
7699
"qviewer Simple file viewer. [qbzr]\n"
7700
"reconcile Reconcile bzr metadata in a branch.\n"
7701
"reconfigure Reconfigure the type of a bzr directory.\n"
7702
"register-branch Register a branch with launchpad.net. [launchpad]\n"
7703
"remerge Redo a merge.\n"
7704
"remove Remove files or directories.\n"
7705
"remove-branch Remove a branch.\n"
7706
"remove-tree Remove the working tree from a given branch/checkout.\n"
7707
"renames Show list of renamed files.\n"
7708
"resolve Mark a conflict as resolved.\n"
7709
"revert Revert files to a previous revision.\n"
7710
"revno Show current revision number.\n"
7711
"root Show the tree root directory.\n"
7712
"rspush Upload this branch to another location using rsync.\n"
7713
" [bzrtools]\n"
7714
"send Mail or create a merge-directive for submitting changes.\n"
7715
"serve Run the bzr server.\n"
7716
"shelf1 Perform various operations on your shelved patches. See "
7717
"also\n"
7718
" shelve1. [bzrtools]\n"
7719
"shell Begin an interactive shell tailored for bzr. [bzrtools]\n"
7720
"shelve Temporarily set aside some changes from the current "
7721
"tree.\n"
7722
"shelve1 Temporarily set aside some changes from the current "
7723
"tree.\n"
7724
" [bzrtools]\n"
7725
"sign-my-commits Sign all commits by a given committer.\n"
7726
"split Split a subdirectory of a tree into a separate tree.\n"
7727
"status Display status summary.\n"
7728
"switch Set the branch of a checkout and update.\n"
7729
"tag Create, remove or modify a tag naming a revision.\n"
7730
"tags List tags.\n"
7731
"testament Show testament (signing-form) of a revision.\n"
7732
"trees Scan a location for trees [bzrtools]\n"
7733
"unbind Convert the current checkout into a regular branch.\n"
7734
"uncommit Remove the last committed revision.\n"
7735
"unshelve Restore shelved changes.\n"
7736
"unshelve1 Restore shelved changes. [bzrtools]\n"
7737
"update Update a tree to have the latest code committed to its\n"
7738
" branch.\n"
7739
"upgrade Upgrade a repository, branch or working tree to a newer\n"
7740
" format.\n"
7741
"verify-signatures Verify all commit signatures.\n"
7742
"version Show version of bzr.\n"
7743
"version-info Show version information about this tree.\n"
7744
"view Manage filtered views.\n"
7745
"whoami Show or set bzr user id.\n"
7746
"zap Remove a lightweight checkout, if it can be done safely.\n"
7747
" [bzrtools]\n"
7748
msgstr ""
7749
7750
#: en/help_topics/configuration.txt:1
7751
msgid ""
7752
"Configuration Settings\n"
7753
"======================="
7754
msgstr ""
7755
7756
#: en/help_topics/configuration.txt:4
7757
msgid ""
7758
"Environment settings\n"
7759
"---------------------"
7760
msgstr ""
7761
7762
#: en/help_topics/configuration.txt:7
7763
msgid ""
7764
"While most configuration is handled by configuration files, some options\n"
7765
"which may be semi-permanent can also be controlled through the environment."
7766
msgstr ""
7767
7768
#: en/help_topics/configuration.txt:10
7769
msgid ""
7770
"BZR_EMAIL\n"
7771
"~~~~~~~~~"
7772
msgstr ""
7773
7774
#: en/help_topics/configuration.txt:13
7775
msgid "Override the email id used by Bazaar. Typical format::"
7776
msgstr ""
7777
7778
#: en/help_topics/configuration.txt:15
7779
msgid " \"John Doe <jdoe@example.com>\""
7780
msgstr ""
7781
7782
#: en/help_topics/configuration.txt:17
7783
msgid "See also the ``email`` configuration option."
7784
msgstr ""
7785
7786
#: en/help_topics/configuration.txt:19
7787
msgid ""
7788
"BZR_PROGRESS_BAR\n"
7789
"~~~~~~~~~~~~~~~~"
7790
msgstr ""
7791
7792
#: en/help_topics/configuration.txt:22
7793
msgid ""
7794
"Override the progress display. Possible values are \"none\" or \"text\". "
7795
"If\n"
7796
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
7797
"draws\n"
7798
"the ordinary command line progress bar."
7799
msgstr ""
7800
7801
#: en/help_topics/configuration.txt:26
7802
msgid ""
7803
"BZR_SIGQUIT_PDB\n"
7804
"~~~~~~~~~~~~~~~"
7805
msgstr ""
7806
7807
#: en/help_topics/configuration.txt:29
7808
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
7809
msgstr ""
7810
7811
#: en/help_topics/configuration.txt:31
7812
msgid ""
7813
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
7814
"* 1 = Invoke breakin debugger (default)"
7815
msgstr ""
7816
7817
#: en/help_topics/configuration.txt:34
7818
msgid ""
7819
"BZR_HOME\n"
7820
"~~~~~~~~"
7821
msgstr ""
7822
7823
#: en/help_topics/configuration.txt:37
7824
msgid "Override the home directory used by Bazaar."
7825
msgstr ""
7826
7827
#: en/help_topics/configuration.txt:39
7828
msgid ""
7829
"BZR_SSH\n"
7830
"~~~~~~~"
7831
msgstr ""
7832
7833
#: en/help_topics/configuration.txt:42
7834
msgid "Select a different SSH implementation."
7835
msgstr ""
7836
7837
#: en/help_topics/configuration.txt:44
7838
msgid ""
7839
"BZR_PDB\n"
7840
"~~~~~~~"
7841
msgstr ""
7842
7843
#: en/help_topics/configuration.txt:47
7844
msgid "Control whether to launch a debugger on error."
7845
msgstr ""
7846
7847
#: en/help_topics/configuration.txt:49
7848
msgid ""
7849
"* 0 = Standard behavior\n"
7850
"* 1 = Launch debugger"
7851
msgstr ""
7852
7853
#: en/help_topics/configuration.txt:52
7854
msgid ""
7855
"BZR_REMOTE_PATH\n"
7856
"~~~~~~~~~~~~~~~"
7857
msgstr ""
7858
7859
#: en/help_topics/configuration.txt:55
7860
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
7861
msgstr ""
7862
7863
#: en/help_topics/configuration.txt:57
7864
msgid "See also the ``bzr_remote_path`` configuration option."
7865
msgstr ""
7866
7867
#: en/help_topics/configuration.txt:59
7868
msgid ""
7869
"BZR_EDITOR\n"
7870
"~~~~~~~~~~"
7871
msgstr ""
7872
7873
#: en/help_topics/configuration.txt:62
7874
msgid "Path to the editor Bazaar should use for commit messages, etc."
7875
msgstr ""
7876
7877
#: en/help_topics/configuration.txt:64
7878
msgid ""
7879
"BZR_LOG\n"
7880
"~~~~~~~"
7881
msgstr ""
7882
7883
#: en/help_topics/configuration.txt:67
7884
msgid ""
7885
"Location of the Bazaar log file. You can check the current location by\n"
7886
"running ``bzr version``."
7887
msgstr ""
7888
7889
#: en/help_topics/configuration.txt:70
7890
msgid ""
7891
"The log file contains debug information that is useful for diagnosing or\n"
7892
"reporting problems with Bazaar."
7893
msgstr ""
7894
7895
#: en/help_topics/configuration.txt:73
7896
msgid ""
7897
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
7898
"will disable logging."
7899
msgstr ""
7900
7901
#: en/help_topics/configuration.txt:76
7902
msgid ""
7903
"\n"
7904
"BZR_PLUGIN_PATH\n"
7905
"~~~~~~~~~~~~~~~"
7906
msgstr ""
7907
7908
#: en/help_topics/configuration.txt:80
7909
msgid ""
7910
"The path to the plugins directory that Bazaar should use.\n"
7911
"If not set, Bazaar will search for plugins in:"
7912
msgstr ""
7913
7914
#: en/help_topics/configuration.txt:83
7915
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
7916
msgstr ""
7917
7918
#: en/help_topics/configuration.txt:85
7919
msgid "* the bzrlib directory (containing the ``core`` plugins),"
7920
msgstr ""
7921
7922
#: en/help_topics/configuration.txt:87
7923
msgid ""
7924
"* the site specific plugin directory if applicable (containing\n"
7925
" the ``site`` plugins)."
7926
msgstr ""
7927
7928
#: en/help_topics/configuration.txt:90
7929
msgid ""
7930
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
7931
"the way the plugin are searched. "
7932
msgstr ""
7933
7934
#: en/help_topics/configuration.txt:93
7935
msgid ""
7936
"As for the ``PATH`` variables, if multiple directories are\n"
7937
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
7938
"platform specific appropriate character (':' on Unix,\n"
7939
"';' on windows)"
7940
msgstr ""
7941
7942
#: en/help_topics/configuration.txt:98
7943
msgid ""
7944
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
7945
"in ``user``. However it will continue to search in ``core`` and\n"
7946
"``site`` unless they are explicitly removed."
7947
msgstr ""
7948
7949
#: en/help_topics/configuration.txt:102
7950
msgid ""
7951
"If you need to change the order or remove one of these\n"
7952
"directories, you should use special values:"
7953
msgstr ""
7954
7955
#: en/help_topics/configuration.txt:105
7956
msgid ""
7957
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
7958
" path from the default values,"
7959
msgstr ""
7960
7961
#: en/help_topics/configuration.txt:108
7962
msgid ""
7963
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
7964
" before the remaining default values (and also remove it from\n"
7965
" the default values)."
7966
msgstr ""
7967
7968
#: en/help_topics/configuration.txt:112
7969
msgid ""
7970
"Note that the special values 'user', 'core' and 'site' should be\n"
7971
"used literally, they will be substituted by the corresponding,\n"
7972
"platform specific, values."
7973
msgstr ""
7974
7975
#: en/help_topics/configuration.txt:116
7976
msgid ""
7977
"The examples below use ':' as the separator, windows users\n"
7978
"should use ';'."
7979
msgstr ""
7980
7981
#: en/help_topics/configuration.txt:119
7982
msgid "Overriding the default user plugin directory::"
7983
msgstr ""
7984
7985
#: en/help_topics/configuration.txt:121
7986
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
7987
msgstr ""
7988
7989
#: en/help_topics/configuration.txt:123
7990
msgid "Disabling the site directory while retaining the user directory::"
7991
msgstr ""
7992
7993
#: en/help_topics/configuration.txt:125
7994
msgid " BZR_PLUGIN_PATH='-site:+user'"
7995
msgstr ""
7996
7997
#: en/help_topics/configuration.txt:127
7998
msgid "Disabling all plugins (better achieved with --no-plugins)::"
7999
msgstr ""
8000
8001
#: en/help_topics/configuration.txt:129
8002
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
8003
msgstr ""
8004
8005
#: en/help_topics/configuration.txt:131
8006
msgid "Overriding the default site plugin directory::"
8007
msgstr ""
8008
8009
#: en/help_topics/configuration.txt:133
8010
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
8011
msgstr ""
8012
8013
#: en/help_topics/configuration.txt:135
8014
msgid ""
8015
"BZR_DISABLE_PLUGINS\n"
8016
"~~~~~~~~~~~~~~~~~~~"
8017
msgstr ""
8018
8019
#: en/help_topics/configuration.txt:138
8020
msgid ""
8021
"Under special circumstances (mostly when trying to diagnose a\n"
8022
"bug), it's better to disable a plugin (or several) rather than\n"
8023
"uninstalling them completely. Such plugins can be specified in\n"
8024
"the ``BZR_DISABLE_PLUGINS`` environment variable."
8025
msgstr ""
8026
8027
#: en/help_topics/configuration.txt:143
8028
msgid ""
8029
"In that case, ``bzr`` will stop loading the specified plugins and\n"
8030
"will raise an import error if they are explicitly imported (by\n"
8031
"another plugin that depends on them for example)."
8032
msgstr ""
8033
8034
#: en/help_topics/configuration.txt:147
8035
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
8036
msgstr ""
8037
8038
#: en/help_topics/configuration.txt:149
8039
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
8040
msgstr ""
8041
8042
#: en/help_topics/configuration.txt:151
8043
msgid ""
8044
"BZR_PLUGINS_AT\n"
8045
"~~~~~~~~~~~~~~"
8046
msgstr ""
8047
8048
#: en/help_topics/configuration.txt:154
8049
msgid ""
8050
"When adding a new feature or working on a bug in a plugin,\n"
8051
"developers often need to use a specific version of a given\n"
8052
"plugin. Since python requires that the directory containing the\n"
8053
"code is named like the plugin itself this make it impossible to\n"
8054
"use arbitrary directory names (using a two-level directory scheme\n"
8055
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
8056
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
8057
msgstr ""
8058
8059
#: en/help_topics/configuration.txt:162
8060
msgid ""
8061
"Plugins specified in this environment variable takes precedence\n"
8062
"over the ones in ``BZR_PLUGIN_PATH``."
8063
msgstr ""
8064
8065
#: en/help_topics/configuration.txt:165
8066
msgid ""
8067
"The variable specified a list of ``plugin_name@plugin path``,\n"
8068
"``plugin_name`` being the name of the plugin as it appears in\n"
8069
"python module paths, ``plugin_path`` being the path to the\n"
8070
"directory containing the plugin code itself\n"
8071
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
8072
"separator, use ';' on windows."
8073
msgstr ""
8074
8075
#: en/help_topics/configuration.txt:172
8076
msgid ""
8077
"Example:\n"
8078
"~~~~~~~~"
8079
msgstr ""
8080
8081
#: en/help_topics/configuration.txt:175
8082
msgid ""
8083
"Using a specific version of ``myplugin``:\n"
8084
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
8085
msgstr ""
8086
8087
#: en/help_topics/configuration.txt:178
8088
msgid ""
8089
"BZRPATH\n"
8090
"~~~~~~~"
8091
msgstr ""
8092
8093
#: en/help_topics/configuration.txt:181
8094
msgid "The path where Bazaar should look for shell plugin external commands."
8095
msgstr ""
8096
8097
#: en/help_topics/configuration.txt:183
8098
msgid ""
8099
"\n"
8100
"http_proxy, https_proxy\n"
8101
"~~~~~~~~~~~~~~~~~~~~~~~"
8102
msgstr ""
8103
8104
#: en/help_topics/configuration.txt:187
8105
msgid "Specifies the network proxy for outgoing connections, for example::"
8106
msgstr ""
8107
8108
#: en/help_topics/configuration.txt:189
8109
msgid ""
8110
" http_proxy=http://proxy.example.com:3128/ \n"
8111
" https_proxy=http://proxy.example.com:3128/"
8112
msgstr ""
8113
8114
#: en/help_topics/configuration.txt:192
8115
msgid ""
8116
"\n"
8117
"Configuration files\n"
8118
"-------------------"
8119
msgstr ""
8120
8121
#: en/help_topics/configuration.txt:196
8122
msgid ""
8123
"Location\n"
8124
"~~~~~~~~"
8125
msgstr ""
8126
8127
#: en/help_topics/configuration.txt:199
8128
msgid ""
8129
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
8130
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
8131
"on\n"
8132
"Windows. (You can check the location for your system by using\n"
8133
"``bzr version``.)"
8134
msgstr ""
8135
8136
#: en/help_topics/configuration.txt:204
8137
msgid "There are three primary configuration files in this location:"
8138
msgstr ""
8139
8140
#: en/help_topics/configuration.txt:206
8141
msgid "* ``bazaar.conf`` describes default configuration options,"
8142
msgstr ""
8143
8144
#: en/help_topics/configuration.txt:208
8145
msgid ""
8146
"* ``locations.conf`` describes configuration information for\n"
8147
" specific branch locations,"
8148
msgstr ""
8149
8150
#: en/help_topics/configuration.txt:211
8151
msgid ""
8152
"* ``authentication.conf`` describes credential information for\n"
8153
" remote servers."
8154
msgstr ""
8155
8156
#: en/help_topics/configuration.txt:214
8157
msgid ""
8158
"Each branch can also contain a configuration file that sets values specific\n"
8159
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
8160
"the\n"
8161
"branch. This file is visible to all users of a branch, if you wish to "
8162
"override\n"
8163
"one of the values for a branch with a setting that is specific to you then "
8164
"you\n"
8165
"can do so in ``locations.conf``."
8166
msgstr ""
8167
8168
#: en/help_topics/configuration.txt:220
8169
msgid ""
8170
"General format\n"
8171
"~~~~~~~~~~~~~~"
8172
msgstr ""
8173
8174
#: en/help_topics/configuration.txt:223
8175
msgid ""
8176
"An ini file has three types of contructs: section headers, section\n"
8177
"variables and comments."
8178
msgstr ""
8179
8180
#: en/help_topics/configuration.txt:226
8181
msgid ""
8182
"Comments\n"
8183
"^^^^^^^^"
8184
msgstr ""
8185
8186
#: en/help_topics/configuration.txt:229
8187
msgid ""
8188
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
8189
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
8190
"Bazaar when parsing ini files."
8191
msgstr ""
8192
8193
#: en/help_topics/configuration.txt:233
8194
msgid ""
8195
"Section headers\n"
8196
"^^^^^^^^^^^^^^^"
8197
msgstr ""
8198
8199
#: en/help_topics/configuration.txt:236
8200
msgid ""
8201
"A section header is a word enclosed in brackets that starts at the begining\n"
8202
"of a line. A typical section header looks like this::"
8203
msgstr ""
8204
8205
#: en/help_topics/configuration.txt:239
8206
msgid " [DEFAULT]"
8207
msgstr ""
8208
8209
#: en/help_topics/configuration.txt:241
8210
msgid ""
8211
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
8212
"[ALIASES]. Section headers are case sensitive. The default section provides "
8213
"for\n"
8214
"setting variables which can be overridden with the branch config file."
8215
msgstr ""
8216
8217
#: en/help_topics/configuration.txt:245
8218
msgid ""
8219
"For ``locations.conf``, the variables from the section with the\n"
8220
"longest matching section header are used to the exclusion of other\n"
8221
"potentially valid section headers. A section header uses the path for\n"
8222
"the branch as the section header. Some examples include::"
8223
msgstr ""
8224
8225
#: en/help_topics/configuration.txt:250
8226
msgid ""
8227
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
8228
" [/home/jdoe/branches/]"
8229
msgstr ""
8230
8231
#: en/help_topics/configuration.txt:253
8232
msgid ""
8233
"\n"
8234
"Section variables\n"
8235
"^^^^^^^^^^^^^^^^^"
8236
msgstr ""
8237
8238
#: en/help_topics/configuration.txt:257
8239
msgid ""
8240
"A section variable resides within a section. A section variable contains a\n"
8241
"variable name, an equals sign and a value. For example::"
8242
msgstr ""
8243
8244
#: en/help_topics/configuration.txt:260
8245
msgid ""
8246
" email = John Doe <jdoe@isp.com>\n"
8247
" gpg_signing_key = Amy Pond <amy@example.com>"
8248
msgstr ""
8249
8250
#: en/help_topics/configuration.txt:263
8251
msgid ""
8252
"A variable can reference other variables **in the same configuration file** "
8253
"by\n"
8254
"enclosing them in curly brackets::"
8255
msgstr ""
8256
8257
#: en/help_topics/configuration.txt:266
8258
msgid ""
8259
" my_branch_name = feature_x\n"
8260
" my_server = bzr+ssh://example.com\n"
8261
" push_location = {my_server}/project/{my_branch_name}"
8262
msgstr ""
8263
8264
#: en/help_topics/configuration.txt:270
8265
msgid ""
8266
"\n"
8267
"Variable policies\n"
8268
"^^^^^^^^^^^^^^^^^"
8269
msgstr ""
8270
8271
#: en/help_topics/configuration.txt:274
8272
msgid ""
8273
"Variables defined in a section affect the named directory or URL plus\n"
8274
"any locations they contain. Policies can be used to change how a\n"
8275
"variable value is interpreted for contained locations. Currently\n"
8276
"there are three policies available:"
8277
msgstr ""
8278
8279
#: en/help_topics/configuration.txt:279
8280
msgid ""
8281
" none:\n"
8282
" the value is interpreted the same for contained locations. This is\n"
8283
" the default behaviour.\n"
8284
" norecurse:\n"
8285
" the value is only used for the exact location specified by the\n"
8286
" section name.\n"
8287
" appendpath:\n"
8288
" for contained locations, any additional path components are\n"
8289
" appended to the value."
8290
msgstr ""
8291
8292
#: en/help_topics/configuration.txt:289
8293
msgid ""
8294
"Policies are specified by keys with names of the form \"$var:policy\".\n"
8295
"For example, to define the push location for a tree of branches, the\n"
8296
"following could be used::"
8297
msgstr ""
8298
8299
#: en/help_topics/configuration.txt:293
8300
msgid ""
8301
" [/top/location]\n"
8302
" push_location = sftp://example.com/location\n"
8303
" push_location:policy = appendpath"
8304
msgstr ""
8305
8306
#: en/help_topics/configuration.txt:297
8307
msgid ""
8308
"With this configuration, the push location for ``/top/location/branch1``\n"
8309
"would be ``sftp://example.com/location/branch1``."
8310
msgstr ""
8311
8312
#: en/help_topics/configuration.txt:300
8313
msgid ""
8314
"\n"
8315
"The main configuration file, bazaar.conf\n"
8316
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8317
msgstr ""
8318
8319
#: en/help_topics/configuration.txt:304
8320
msgid ""
8321
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
8322
"The default section contains the default\n"
8323
"configuration options for all branches. The default section can be\n"
8324
"overriden by providing a branch-specific section in ``locations.conf``."
8325
msgstr ""
8326
8327
#: en/help_topics/configuration.txt:309
8328
msgid "A typical ``bazaar.conf`` section often looks like the following::"
8329
msgstr ""
8330
8331
#: en/help_topics/configuration.txt:311
8332
msgid ""
8333
" [DEFAULT]\n"
8334
" email = John Doe <jdoe@isp.com>\n"
8335
" editor = /usr/bin/vim\n"
8336
" create_signatures = when-required"
8337
msgstr ""
8338
8339
#: en/help_topics/configuration.txt:316
8340
msgid ""
8341
"\n"
8342
"The branch location configuration file, locations.conf\n"
8343
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8344
msgstr ""
8345
8346
#: en/help_topics/configuration.txt:320
8347
msgid ""
8348
"``locations.conf`` allows one to specify overriding settings for\n"
8349
"a specific branch. The format is almost identical to the default section in\n"
8350
"bazaar.conf with one significant change: The section header, instead of "
8351
"saying\n"
8352
"default, will be the path to a branch that you wish to override a value\n"
8353
"for. The '?' and '*' wildcards are supported::"
8354
msgstr ""
8355
8356
#: en/help_topics/configuration.txt:326
8357
msgid ""
8358
" [/home/jdoe/branches/nethack]\n"
8359
" email = Nethack Admin <nethack@nethack.com>"
8360
msgstr ""
8361
8362
#: en/help_topics/configuration.txt:329
8363
msgid ""
8364
" [http://hypothetical.site.com/branches/devel-branch]\n"
8365
" create_signatures = always"
8366
msgstr ""
8367
8368
#: en/help_topics/configuration.txt:332
8369
msgid ""
8370
"The authentication configuration file, authentication.conf\n"
8371
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8372
msgstr ""
8373
8374
#: en/help_topics/configuration.txt:335
8375
msgid ""
8376
"``authentication.conf`` allows one to specify credentials for\n"
8377
"remote servers. This can be used for all the supported transports and any "
8378
"part\n"
8379
"of bzr that requires authentication (smtp for example)."
8380
msgstr ""
8381
8382
#: en/help_topics/configuration.txt:339
8383
msgid ""
8384
"The syntax of the file obeys the same rules as the others except for the\n"
8385
"variable policies which don't apply."
8386
msgstr ""
8387
8388
#: en/help_topics/configuration.txt:342
8389
msgid ""
8390
"For more information on the possible uses of the authentication "
8391
"configuration\n"
8392
"file see :doc:`authentication-help`."
8393
msgstr ""
8394
8395
#: en/help_topics/configuration.txt:345
8396
msgid ""
8397
"\n"
8398
"Common variable options\n"
8399
"-----------------------"
8400
msgstr ""
8401
8402
#: en/help_topics/configuration.txt:349
8403
msgid ""
8404
"debug_flags\n"
8405
"~~~~~~~~~~~"
8406
msgstr ""
8407
8408
#: en/help_topics/configuration.txt:352
8409
msgid ""
8410
"A comma-separated list of debugging options to turn on. The same values\n"
8411
"can be used as with the -D command-line option (see `help global-options`).\n"
8412
"For example::"
8413
msgstr ""
8414
8415
#: en/help_topics/configuration.txt:356
8416
msgid " debug_flags = hpss"
8417
msgstr ""
8418
8419
#: en/help_topics/configuration.txt:360
8420
msgid " debug_flags = hpss,evil"
8421
msgstr ""
8422
8423
#: en/help_topics/configuration.txt:362
8424
msgid ""
8425
"email\n"
8426
"~~~~~"
8427
msgstr ""
8428
8429
#: en/help_topics/configuration.txt:365
8430
msgid ""
8431
"The email address to use when committing a branch. Typically takes the form\n"
8432
"of::"
8433
msgstr ""
8434
8435
#: en/help_topics/configuration.txt:368
8436
msgid " email = Full Name <account@hostname.tld>"
8437
msgstr ""
8438
8439
#: en/help_topics/configuration.txt:370
8440
msgid ""
8441
"editor\n"
8442
"~~~~~~"
8443
msgstr ""
8444
8445
#: en/help_topics/configuration.txt:373
8446
msgid ""
8447
"The path of the editor that you wish to use if *bzr commit* is run without\n"
8448
"a commit message. This setting is trumped by the environment variable\n"
8449
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
8450
"variables."
8451
msgstr ""
8452
8453
#: en/help_topics/configuration.txt:378
8454
msgid ""
8455
"log_format\n"
8456
"~~~~~~~~~~"
8457
msgstr ""
8458
8459
#: en/help_topics/configuration.txt:381
8460
msgid ""
8461
"The default log format to use. Standard log formats are ``long``, ``short``\n"
8462
"and ``line``. Additional formats may be provided by plugins. The default\n"
8463
"value is ``long``."
8464
msgstr ""
8465
8466
#: en/help_topics/configuration.txt:385
8467
msgid ""
8468
"check_signatures\n"
8469
"~~~~~~~~~~~~~~~~"
8470
msgstr ""
8471
8472
#: en/help_topics/configuration.txt:388
8473
msgid ""
8474
"Reserved for future use. These options will allow a policy for branches to\n"
8475
"require signatures."
8476
msgstr ""
8477
8478
#: en/help_topics/configuration.txt:391
8479
msgid ""
8480
"require\n"
8481
" The gnupg signature for revisions must be present and must be valid."
8482
msgstr ""
8483
8484
#: en/help_topics/configuration.txt:394
8485
msgid ""
8486
"ignore\n"
8487
" Do not check gnupg signatures of revisions."
8488
msgstr ""
8489
8490
#: en/help_topics/configuration.txt:397
8491
msgid ""
8492
"check-available\n"
8493
" (default) If gnupg signatures for revisions are present, check them.\n"
8494
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
8495
" no signature is present."
8496
msgstr ""
8497
8498
#: en/help_topics/configuration.txt:402
8499
msgid ""
8500
"create_signatures\n"
8501
"~~~~~~~~~~~~~~~~~"
8502
msgstr ""
8503
8504
#: en/help_topics/configuration.txt:405
8505
msgid ""
8506
"Defines the behaviour of signing revisions on commits. By default bzr will "
8507
"not\n"
8508
"sign new commits."
8509
msgstr ""
8510
8511
#: en/help_topics/configuration.txt:408
8512
msgid ""
8513
"always\n"
8514
" Sign every new revision that is committed. If the signing fails then "
8515
"the\n"
8516
" commit will not be made."
8517
msgstr ""
8518
8519
#: en/help_topics/configuration.txt:412
8520
msgid ""
8521
"when-required\n"
8522
" Reserved for future use."
8523
msgstr ""
8524
8525
#: en/help_topics/configuration.txt:415
8526
msgid ""
8527
"never\n"
8528
" Reserved for future use."
8529
msgstr ""
8530
8531
#: en/help_topics/configuration.txt:418
8532
msgid ""
8533
"In future it is planned that ``when-required`` will sign newly\n"
8534
"committed revisions only when the branch requires them. ``never`` will "
8535
"refuse\n"
8536
"to sign newly committed revisions, even if the branch requires signatures."
8537
msgstr ""
8538
8539
#: en/help_topics/configuration.txt:422
8540
msgid ""
8541
"dirstate.fdatasync\n"
8542
"~~~~~~~~~~~~~~~~~~"
8543
msgstr ""
8544
8545
#: en/help_topics/configuration.txt:425
8546
msgid ""
8547
"If true (default), working tree metadata changes are flushed through the\n"
8548
"OS buffers to physical disk. This is somewhat slower, but means data\n"
8549
"should not be lost if the machine crashes. See also repository.fdatasync."
8550
msgstr ""
8551
8552
#: en/help_topics/configuration.txt:429
8553
msgid ""
8554
"gpg_signing_key\n"
8555
"~~~~~~~~~~~~~~~"
8556
msgstr ""
8557
8558
#: en/help_topics/configuration.txt:432
8559
msgid ""
8560
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
8561
"address, key fingerprint or full key ID. When unset or when set to\n"
8562
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
8563
msgstr ""
8564
8565
#: en/help_topics/configuration.txt:436
8566
msgid ""
8567
"recurse\n"
8568
"~~~~~~~"
8569
msgstr ""
8570
8571
#: en/help_topics/configuration.txt:439
8572
msgid ""
8573
"Only useful in ``locations.conf``. Defines whether or not the\n"
8574
"configuration for this section applies to subdirectories:"
8575
msgstr ""
8576
8577
#: en/help_topics/configuration.txt:442
8578
msgid ""
8579
"true\n"
8580
" (default) This section applies to subdirectories as well."
8581
msgstr ""
8582
8583
#: en/help_topics/configuration.txt:445
8584
msgid ""
8585
"false\n"
8586
" This section only applies to the branch at this directory and not\n"
8587
" branches below it."
8588
msgstr ""
8589
8590
#: en/help_topics/configuration.txt:449
8591
msgid ""
8592
"gpg_signing_command\n"
8593
"~~~~~~~~~~~~~~~~~~~"
8594
msgstr ""
8595
8596
#: en/help_topics/configuration.txt:452
8597
msgid ""
8598
"(Default: \"gpg\"). Which program should be used to sign and check "
8599
"revisions.\n"
8600
"For example::"
8601
msgstr ""
8602
8603
#: en/help_topics/configuration.txt:455
8604
msgid " gpg_signing_command = /usr/bin/gnpg"
8605
msgstr ""
8606
8607
#: en/help_topics/configuration.txt:457
8608
msgid ""
8609
"The specified command must accept the options \"--clearsign\" and \"-u "
8610
"<email>\"."
8611
msgstr ""
8612
8613
#: en/help_topics/configuration.txt:459
8614
msgid ""
8615
"bzr_remote_path\n"
8616
"~~~~~~~~~~~~~~~"
8617
msgstr ""
8618
8619
#: en/help_topics/configuration.txt:462
8620
msgid ""
8621
"(Default: \"bzr\"). The path to the command that should be used to run the "
8622
"smart\n"
8623
"server for bzr. This value may only be specified in locations.conf, because:"
8624
msgstr ""
8625
8626
#: en/help_topics/configuration.txt:465
8627
msgid ""
8628
"- it's needed before branch.conf is accessible\n"
8629
"- allowing remote branch.conf files to specify commands would be a security\n"
8630
" risk"
8631
msgstr ""
8632
8633
#: en/help_topics/configuration.txt:469
8634
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
8635
msgstr ""
8636
8637
#: en/help_topics/configuration.txt:471
8638
msgid ""
8639
"smtp_server\n"
8640
"~~~~~~~~~~~"
8641
msgstr ""
8642
8643
#: en/help_topics/configuration.txt:474
8644
msgid ""
8645
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
8646
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
8647
msgstr ""
8648
8649
#: en/help_topics/configuration.txt:477
8650
msgid ""
8651
"smtp_username, smtp_password\n"
8652
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8653
msgstr ""
8654
8655
#: en/help_topics/configuration.txt:480
8656
msgid ""
8657
"User and password to authenticate to the SMTP server. If smtp_username\n"
8658
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
8659
"These settings are only needed if the SMTP server requires authentication\n"
8660
"to send mail."
8661
msgstr ""
8662
8663
#: en/help_topics/configuration.txt:485
8664
msgid ""
8665
"locks.steal_dead\n"
8666
"~~~~~~~~~~~~~~~~"
8667
msgstr ""
8668
8669
#: en/help_topics/configuration.txt:488
8670
msgid ""
8671
"If set to true, bzr will automatically break locks held by processes from\n"
8672
"the same machine and user that are no longer alive. Otherwise, it will\n"
8673
"print a message and you can break the lock manually, if you are satisfied\n"
8674
"the object is no longer in use."
8675
msgstr ""
8676
8677
#: en/help_topics/configuration.txt:493
8678
msgid ""
8679
"mail_client\n"
8680
"~~~~~~~~~~~"
8681
msgstr ""
8682
8683
#: en/help_topics/configuration.txt:496
8684
msgid ""
8685
"A mail client to use for sending merge requests.\n"
8686
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
8687
"it\n"
8688
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
8689
"``editor``."
8690
msgstr ""
8691
8692
#: en/help_topics/configuration.txt:501
8693
msgid "Supported values for specific clients:"
8694
msgstr ""
8695
8696
#: en/help_topics/configuration.txt:503
8697
msgid ""
8698
":claws: Use Claws. This skips a dialog for attaching files.\n"
8699
":evolution: Use Evolution.\n"
8700
":kmail: Use KMail.\n"
8701
":mutt: Use Mutt.\n"
8702
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
8703
"1.5,\n"
8704
" this works around some bugs that xdg-email doesn't handle."
8705
msgstr ""
8706
8707
#: en/help_topics/configuration.txt:510
8708
msgid "Supported generic values are:"
8709
msgstr ""
8710
8711
#: en/help_topics/configuration.txt:512
8712
msgid ""
8713
":default: See above.\n"
8714
":editor: Use your editor to compose the merge request. This also uses\n"
8715
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
8716
" smtp_username and smtp_password.\n"
8717
":mapi: Use your preferred e-mail client on Windows.\n"
8718
":xdg-email: Use xdg-email to run your preferred mail program"
8719
msgstr ""
8720
8721
#: en/help_topics/configuration.txt:519
8722
msgid ""
8723
"repository.fdatasync\n"
8724
"~~~~~~~~~~~~~~~~~~~~"
8725
msgstr ""
8726
8727
#: en/help_topics/configuration.txt:522
8728
msgid ""
8729
"If true (default), repository changes are flushed through the OS buffers\n"
8730
"to physical disk. This is somewhat slower, but means data should not be\n"
8731
"lost if the machine crashes. See also dirstate.fdatasync."
8732
msgstr ""
8733
8734
#: en/help_topics/configuration.txt:526
8735
msgid ""
8736
"submit_branch\n"
8737
"~~~~~~~~~~~~~"
8738
msgstr ""
8739
8740
#: en/help_topics/configuration.txt:529
8741
msgid ""
8742
"The branch you intend to submit your current work to. This is "
8743
"automatically\n"
8744
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
8745
"This\n"
8746
"should usually be set on a per-branch or per-location basis."
8747
msgstr ""
8748
8749
#: en/help_topics/configuration.txt:533
8750
msgid ""
8751
"public_branch\n"
8752
"~~~~~~~~~~~~~"
8753
msgstr ""
8754
8755
#: en/help_topics/configuration.txt:536
8756
msgid ""
8757
"A publically-accessible version of this branch (implying that this version "
8758
"is\n"
8759
"not publically-accessible). Used (and set) by ``bzr send``."
8760
msgstr ""
8761
8762
#: en/help_topics/configuration.txt:539
8763
msgid ""
8764
"suppress_warnings\n"
8765
"~~~~~~~~~~~~~~~~~"
8766
msgstr ""
8767
8768
#: en/help_topics/configuration.txt:542
8769
msgid ""
8770
"A list of strings, each string represent a warning that can be emitted by\n"
8771
"bzr. Mentioning a warning in this list tells bzr to not emit it."
8772
msgstr ""
8773
8774
#: en/help_topics/configuration.txt:545
8775
msgid "Valid values:"
8776
msgstr ""
8777
8778
#: en/help_topics/configuration.txt:547
8779
msgid ""
8780
"* ``format_deprecation``:\n"
8781
" whether the format deprecation warning is shown on repositories that "
8782
"are\n"
8783
" using deprecated formats."
8784
msgstr ""
8785
8786
#: en/help_topics/configuration.txt:551
8787
msgid ""
8788
"default_format\n"
8789
"~~~~~~~~~~~~~~"
8790
msgstr ""
8791
8792
#: en/help_topics/configuration.txt:554
8793
msgid ""
8794
"A format name for the default format used when creating branches. See "
8795
"``bzr\n"
8796
"help formats`` for possible values."
8797
msgstr ""
8798
8799
#: en/help_topics/configuration.txt:557
8800
msgid ""
8801
"\n"
8802
"Unicode options\n"
8803
"---------------"
8804
msgstr ""
8805
8806
#: en/help_topics/configuration.txt:561
8807
msgid ""
8808
"output_encoding\n"
8809
"~~~~~~~~~~~~~~~"
8810
msgstr ""
8811
8812
#: en/help_topics/configuration.txt:564
8813
msgid ""
8814
"A Python unicode encoding name for text output from bzr, such as log\n"
8815
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
8816
"is the terminal encoding prefered by the operating system."
8817
msgstr ""
8818
8819
#: en/help_topics/configuration.txt:568
8820
msgid ""
8821
"\n"
8822
"Branch type specific options\n"
8823
"----------------------------"
8824
msgstr ""
8825
8826
#: en/help_topics/configuration.txt:572
8827
msgid ""
8828
"These options apply only to branches that use the ``dirstate-tags`` or\n"
8829
"later format. They\n"
8830
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
8831
"manually set in ``locations.conf`` or ``bazaar.conf``."
8832
msgstr ""
8833
8834
#: en/help_topics/configuration.txt:577
8835
msgid ""
8836
"append_revisions_only\n"
8837
"~~~~~~~~~~~~~~~~~~~~~"
8838
msgstr ""
8839
8840
#: en/help_topics/configuration.txt:580
8841
msgid ""
8842
"If set to \"True\" then revisions can only be appended to the log, not\n"
8843
"removed. A branch with this setting enabled can only pull from another\n"
8844
"branch if the other branch's log is a longer version of its own. This is\n"
8845
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
8846
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
8847
"compatibility with previous bzr versions (older than 2.2)."
8848
msgstr ""
8849
8850
#: en/help_topics/configuration.txt:587
8851
msgid ""
8852
"parent_location\n"
8853
"~~~~~~~~~~~~~~~"
8854
msgstr ""
8855
8856
#: en/help_topics/configuration.txt:590
8857
msgid ""
8858
"If present, the location of the default branch for pull or merge. This "
8859
"option\n"
8860
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
8861
"--remember``."
8862
msgstr ""
8863
8864
#: en/help_topics/configuration.txt:594
8865
msgid ""
8866
"push_location\n"
8867
"~~~~~~~~~~~~~"
8868
msgstr ""
8869
8870
#: en/help_topics/configuration.txt:597
8871
msgid ""
8872
"If present, the location of the default branch for push. This option\n"
8873
"is normally set by the first ``push`` or ``push --remember``."
8874
msgstr ""
8875
8876
#: en/help_topics/configuration.txt:600
8877
msgid ""
8878
"push_strict\n"
8879
"~~~~~~~~~~~"
8880
msgstr ""
8881
8882
#: en/help_topics/configuration.txt:603
8883
msgid ""
8884
"If present, defines the ``--strict`` option default value for checking\n"
8885
"uncommitted changes before pushing."
8886
msgstr ""
8887
8888
#: en/help_topics/configuration.txt:606
8889
msgid ""
8890
"dpush_strict\n"
8891
"~~~~~~~~~~~~"
8892
msgstr ""
8893
8894
#: en/help_topics/configuration.txt:609
8895
msgid ""
8896
"If present, defines the ``--strict`` option default value for checking\n"
8897
"uncommitted changes before pushing into a different VCS without any\n"
8898
"custom bzr metadata."
8899
msgstr ""
8900
8901
#: en/help_topics/configuration.txt:613
8902
msgid ""
8903
"bound_location\n"
8904
"~~~~~~~~~~~~~~"
8905
msgstr ""
8906
8907
#: en/help_topics/configuration.txt:616
8908
msgid ""
8909
"The location that commits should go to when acting as a checkout.\n"
8910
"This option is normally set by ``bind``."
8911
msgstr ""
8912
8913
#: en/help_topics/configuration.txt:619
8914
msgid ""
8915
"bound\n"
8916
"~~~~~"
8917
msgstr ""
8918
8919
#: en/help_topics/configuration.txt:622
8920
msgid ""
8921
"If set to \"True\", the branch should act as a checkout, and push each "
8922
"commit to\n"
8923
"the bound_location. This option is normally set by ``bind``/``unbind``."
8924
msgstr ""
8925
8926
#: en/help_topics/configuration.txt:625
8927
msgid ""
8928
"send_strict\n"
8929
"~~~~~~~~~~~"
8930
msgstr ""
8931
8932
#: en/help_topics/configuration.txt:628
8933
msgid ""
8934
"If present, defines the ``--strict`` option default value for checking\n"
8935
"uncommitted changes before sending a merge directive."
8936
msgstr ""
8937
8938
#: en/help_topics/configuration.txt:631
8939
msgid ""
8940
"add.maximum_file_size\n"
8941
"~~~~~~~~~~~~~~~~~~~~~"
8942
msgstr ""
8943
8944
#: en/help_topics/configuration.txt:634
8945
msgid ""
8946
"Defines the maximum file size the command line \"add\" operation will allow\n"
8947
"in recursive mode, with files larger than this value being skipped. You "
8948
"may \n"
8949
"specify this value as an integer (in which case it is interpreted as "
8950
"bytes), \n"
8951
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
8952
"0 \n"
8953
"will disable skipping."
8954
msgstr ""
8955
8956
#: en/help_topics/configuration.txt:640
8957
msgid ""
8958
"External Merge Tools\n"
8959
"--------------------"
8960
msgstr ""
8961
8962
#: en/help_topics/configuration.txt:643
8963
msgid ""
8964
"bzr.mergetool.<name>\n"
8965
"~~~~~~~~~~~~~~~~~~~~"
8966
msgstr ""
8967
8968
#: en/help_topics/configuration.txt:646
8969
msgid ""
8970
"Defines an external merge tool called <name> with the given command-line.\n"
8971
"Arguments containing spaces should be quoted using single or double quotes. "
8972
"The\n"
8973
"executable may omit its path if it can be found on the PATH."
8974
msgstr ""
8975
8976
#: en/help_topics/configuration.txt:650
8977
msgid ""
8978
"The following markers can be used in the command-line to substitute "
8979
"filenames\n"
8980
"involved in the merge conflict::"
8981
msgstr ""
8982
8983
#: en/help_topics/configuration.txt:653
8984
msgid ""
8985
" {base} file.BASE\n"
8986
" {this} file.THIS\n"
8987
" {other} file.OTHER\n"
8988
" {result} output file\n"
8989
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
8990
"merge\n"
8991
" succeeds."
8992
msgstr ""
8993
8994
#: en/help_topics/configuration.txt:662
8995
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
8996
msgstr ""
8997
8998
#: en/help_topics/configuration.txt:664
8999
msgid ""
9000
"bzr.default_mergetool\n"
9001
"~~~~~~~~~~~~~~~~~~~~~"
9002
msgstr ""
9003
9004
#: en/help_topics/configuration.txt:667
9005
msgid ""
9006
"Specifies which external merge tool (as defined above) should be selected "
9007
"by\n"
9008
"default in tools such as ``bzr qconflicts``."
9009
msgstr ""
9010
9011
#: en/help_topics/configuration.txt:672
9012
msgid " bzr.default_mergetool = kdiff3\n"
9013
msgstr ""
9014
9015
#: en/help_topics/conflict-types.txt:1
9016
msgid ""
9017
"Conflict Types\n"
9018
"=============="
9019
msgstr ""
9020
9021
#: en/help_topics/conflict-types.txt:4
9022
msgid ""
9023
"Some operations, like merge, revert and pull, modify the contents of your\n"
9024
"working tree. These modifications are programmatically generated, and so "
9025
"they\n"
9026
"may conflict with the current state of your working tree. "
9027
msgstr ""
9028
9029
#: en/help_topics/conflict-types.txt:8
9030
msgid ""
9031
"When conflicts are present in your working tree (as shown by ``bzr\n"
9032
"conflicts``), you should resolve them and then inform bzr that the "
9033
"conflicts\n"
9034
"have been resolved."
9035
msgstr ""
9036
9037
#: en/help_topics/conflict-types.txt:12
9038
msgid ""
9039
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
9040
"should resolve them is not the one responsible for their occurrence, as is "
9041
"the\n"
9042
"case when merging other people's work or because some conflicts are "
9043
"presented\n"
9044
"in a way that is not easy to understand."
9045
msgstr ""
9046
9047
#: en/help_topics/conflict-types.txt:17
9048
msgid ""
9049
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
9050
"conflict if and only if there's an actual conceptual conflict in the source\n"
9051
"tree. Because Bazaar doesn't understand the real meaning of the files "
9052
"being\n"
9053
"versioned, it can, when faced with ambiguities, fall short in either "
9054
"direction\n"
9055
"trying to resolve the conflict itself. Many kinds of changes can be "
9056
"combined\n"
9057
"programmatically, but sometimes only a human can determine the right thing "
9058
"to\n"
9059
"do."
9060
msgstr ""
9061
9062
#: en/help_topics/conflict-types.txt:25
9063
msgid ""
9064
"When Bazaar generates a conflict, it adds information into the working tree "
9065
"to\n"
9066
"present the conflicting versions, and it's up to you to find the correct\n"
9067
"resolution."
9068
msgstr ""
9069
9070
#: en/help_topics/conflict-types.txt:29
9071
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
9072
msgstr ""
9073
9074
#: en/help_topics/conflict-types.txt:31
9075
msgid ""
9076
"1. Modify the working tree content so that the conflicted item is now in "
9077
"the\n"
9078
" state you want to keep, then"
9079
msgstr ""
9080
9081
#: en/help_topics/conflict-types.txt:34
9082
msgid ""
9083
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
9084
" remaining generated information (``bzr resolve <item>``)."
9085
msgstr ""
9086
9087
#: en/help_topics/conflict-types.txt:37
9088
msgid ""
9089
"For most conflict types, there are some obvious ways to modify the working\n"
9090
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
9091
"itself already made a choice, when possible."
9092
msgstr ""
9093
9094
#: en/help_topics/conflict-types.txt:41
9095
msgid ""
9096
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
9097
"different ways to resolve the conflict."
9098
msgstr ""
9099
9100
#: en/help_topics/conflict-types.txt:44
9101
msgid ""
9102
"Each type of conflict is explained below, and the action which must be done "
9103
"to\n"
9104
"resolve the conflict is outlined."
9105
msgstr ""
9106
9107
#: en/help_topics/conflict-types.txt:47
9108
msgid ""
9109
"Various actions are available depending on the kind of conflict, for some "
9110
"of\n"
9111
"these actions, Bazaar can provide some help. In the end you should at least\n"
9112
"inform Bazaar that you're done with the conflict with::"
9113
msgstr ""
9114
9115
#: en/help_topics/conflict-types.txt:51
9116
msgid " ``bzr resolve FILE --action=done'"
9117
msgstr ""
9118
9119
#: en/help_topics/conflict-types.txt:53
9120
msgid ""
9121
"Note that this is the default action when a single file is involved so you "
9122
"can\n"
9123
"simply use::"
9124
msgstr ""
9125
9126
#: en/help_topics/conflict-types.txt:56
9127
msgid " ``bzr resolve FILE``"
9128
msgstr ""
9129
9130
#: en/help_topics/conflict-types.txt:58
9131
msgid "See ``bzr help resolve`` for more details."
9132
msgstr ""
9133
9134
#: en/help_topics/conflict-types.txt:60
9135
msgid ""
9136
"Text conflicts\n"
9137
"--------------"
9138
msgstr ""
9139
9140
#: en/help_topics/conflict-types.txt:63
9141
msgid "Typical message::"
9142
msgstr ""
9143
9144
#: en/help_topics/conflict-types.txt:65
9145
msgid " Text conflict in FILE"
9146
msgstr ""
9147
9148
#: en/help_topics/conflict-types.txt:67
9149
msgid ""
9150
"These are produced when a text merge cannot completely reconcile two sets "
9151
"of\n"
9152
"text changes. Bazaar will emit files for each version with the extensions\n"
9153
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
9154
"tree,\n"
9155
"i.e. the tree that you are merging changes into. OTHER is the version that "
9156
"you\n"
9157
"are merging into the target. BASE is an older version that is used as a "
9158
"basis\n"
9159
"for comparison."
9160
msgstr ""
9161
9162
#: en/help_topics/conflict-types.txt:74
9163
msgid ""
9164
"In the main copy of the file, Bazaar will include all the changes that it\n"
9165
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
9166
"\"herringbone\" markers like ``<<<<<<<``."
9167
msgstr ""
9168
9169
#: en/help_topics/conflict-types.txt:78
9170
msgid ""
9171
"Say the initial text is \"The project leader released it.\", and THIS "
9172
"modifies it\n"
9173
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
9174
"leader\n"
9175
"released Bazaar.\" A conflict would look like this::"
9176
msgstr ""
9177
9178
#: en/help_topics/conflict-types.txt:82
9179
msgid ""
9180
" <<<<<<< TREE\n"
9181
" Martin Pool released it.\n"
9182
" =======\n"
9183
" The project leader released Bazaar.\n"
9184
" >>>>>>> MERGE-SOURCE"
9185
msgstr ""
9186
9187
#: en/help_topics/conflict-types.txt:88
9188
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
9189
msgstr ""
9190
9191
#: en/help_topics/conflict-types.txt:90
9192
msgid ""
9193
"You can handle text conflicts either by editing the main copy of the file,\n"
9194
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
9195
"worth mentioning that resolving text conflicts rarely involves picking one\n"
9196
"set of changes over the other (but see below when you encounter these\n"
9197
"cases). More often, the two sets of changes must be intelligently combined."
9198
msgstr ""
9199
9200
#: en/help_topics/conflict-types.txt:96
9201
msgid ""
9202
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
9203
"you are done editing, the file should look like it never had a conflict, and "
9204
"be\n"
9205
"ready to commit."
9206
msgstr ""
9207
9208
#: en/help_topics/conflict-types.txt:100
9209
msgid ""
9210
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
9211
"Bazaar will auto-detect which conflicts you have resolved."
9212
msgstr ""
9213
9214
#: en/help_topics/conflict-types.txt:103
9215
msgid ""
9216
"When the conflict is resolved, Bazaar deletes the previously generated\n"
9217
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
9218
"working tree."
9219
msgstr ""
9220
9221
#: en/help_topics/conflict-types.txt:107
9222
msgid ""
9223
"\n"
9224
"When you want to pick one set of changes over the other, you can use ``bzr\n"
9225
"resolve`` with one of the following actions:"
9226
msgstr ""
9227
9228
#: en/help_topics/conflict-types.txt:111
9229
msgid ""
9230
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
9231
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
9232
msgstr ""
9233
9234
#: en/help_topics/conflict-types.txt:114
9235
msgid ""
9236
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
9237
"modifications will be taken into account."
9238
msgstr ""
9239
9240
#: en/help_topics/conflict-types.txt:117
9241
msgid ""
9242
"Content conflicts\n"
9243
"-----------------"
9244
msgstr ""
9245
9246
#: en/help_topics/conflict-types.txt:122
9247
msgid " Contents conflict in FILE"
9248
msgstr ""
9249
9250
#: en/help_topics/conflict-types.txt:124
9251
msgid ""
9252
"This conflict happens when there are conflicting changes in the working "
9253
"tree\n"
9254
"and the merge source, but the conflicted items are not text files. They "
9255
"may\n"
9256
"be binary files, or symlinks, or directories. It can even happen with "
9257
"files\n"
9258
"that are deleted on one side, and modified on the other."
9259
msgstr ""
9260
9261
#: en/help_topics/conflict-types.txt:129
9262
msgid ""
9263
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
9264
"be\n"
9265
"regular files, symlinks or directories). But it will not include a \"main "
9266
"copy\"\n"
9267
"of the file with herringbone conflict markers. It will appear that the "
9268
"\"main\n"
9269
"copy\" has been renamed to THIS or OTHER."
9270
msgstr ""
9271
9272
#: en/help_topics/conflict-types.txt:134
9273
msgid ""
9274
"To resolve that kind of conflict, you should rebuild FILE from either "
9275
"version\n"
9276
"or a combination of both."
9277
msgstr ""
9278
9279
#: en/help_topics/conflict-types.txt:137
9280
msgid "``bzr resolve`` recognizes the following actions:"
9281
msgstr ""
9282
9283
#: en/help_topics/conflict-types.txt:139
9284
msgid ""
9285
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
9286
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
9287
"* ``--action=done`` will just mark the conflict as resolved."
9288
msgstr ""
9289
9290
#: en/help_topics/conflict-types.txt:143
9291
msgid ""
9292
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
9293
"and\n"
9294
"``.OTHER`` files if they are still present in the working tree."
9295
msgstr ""
9296
9297
#: en/help_topics/conflict-types.txt:146
9298
msgid ""
9299
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
9300
msgstr ""
9301
9302
#: en/help_topics/conflict-types.txt:148
9303
msgid ""
9304
"Tag conflicts\n"
9305
"-------------"
9306
msgstr ""
9307
9308
#: en/help_topics/conflict-types.txt:153
9309
msgid ""
9310
" Conflicting tags:\n"
9311
" version-0.1"
9312
msgstr ""
9313
9314
#: en/help_topics/conflict-types.txt:156
9315
msgid ""
9316
"When pulling from or pushing to another branch, Bazaar informs you about "
9317
"tags\n"
9318
"that conflict between the two branches; that is the same tag points to two\n"
9319
"different revisions. You need not resolve these conflicts, but subsequent\n"
9320
"uses of pull or push will result in the same message."
9321
msgstr ""
9322
9323
#: en/help_topics/conflict-types.txt:161
9324
msgid ""
9325
"To resolve the conflict, you must apply the correct tags to either the "
9326
"target\n"
9327
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
9328
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
9329
"target branch's tags match the source branch, then in the target branch do\n"
9330
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
9331
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
9332
"source\n"
9333
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
9334
"favor of the target branch, you need to similarly use ``tag --force`` in "
9335
"the\n"
9336
"source branch. (Note that pulling or pushing using --overwrite will "
9337
"overwrite\n"
9338
"all tags as well.)"
9339
msgstr ""
9340
9341
#: en/help_topics/conflict-types.txt:172
9342
msgid ""
9343
"Duplicate paths\n"
9344
"---------------"
9345
msgstr ""
9346
9347
#: en/help_topics/conflict-types.txt:177
9348
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
9349
msgstr ""
9350
9351
#: en/help_topics/conflict-types.txt:179
9352
msgid ""
9353
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
9354
"already been used. The existing file will be renamed to \"FILE.moved\". "
9355
msgstr ""
9356
9357
#: en/help_topics/conflict-types.txt:187
9358
msgid ""
9359
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
9360
"FILE``,\n"
9361
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
9362
"* ``--action=done`` will just mark the conflict as resolved."
9363
msgstr ""
9364
9365
#: en/help_topics/conflict-types.txt:191
9366
msgid ""
9367
"Note that you must get rid of FILE.moved before using ``--action=done``."
9368
msgstr ""
9369
9370
#: en/help_topics/conflict-types.txt:195
9371
msgid ""
9372
"Unversioned parent\n"
9373
"------------------"
9374
msgstr ""
9375
9376
#: en/help_topics/conflict-types.txt:200
9377
msgid " Conflict because FILE is not versioned, but has versioned children."
9378
msgstr ""
9379
9380
#: en/help_topics/conflict-types.txt:202
9381
msgid ""
9382
"Sometimes Bazaar will attempt to create a file whose parent directory is "
9383
"not\n"
9384
"versioned. This happens when the directory has been deleted in the target,\n"
9385
"but has a new child in the source, or vice versa. In this situation, "
9386
"Bazaar\n"
9387
"will version the parent directory as well. Resolving this issue depends\n"
9388
"very much on the particular scenario. You may wish to rename or delete "
9389
"either\n"
9390
"the file or the directory. When you are satisfied, you can run \"bzr "
9391
"resolve\n"
9392
"FILE\" to mark the conflict as resolved."
9393
msgstr ""
9394
9395
#: en/help_topics/conflict-types.txt:210
9396
msgid ""
9397
"Missing parent\n"
9398
"--------------"
9399
msgstr ""
9400
9401
#: en/help_topics/conflict-types.txt:215
9402
msgid " Conflict adding files to FILE. Created directory."
9403
msgstr ""
9404
9405
#: en/help_topics/conflict-types.txt:217
9406
msgid ""
9407
"This happens when a directory has been deleted in the target, but has new\n"
9408
"children in the source. This is similar to the \"unversioned parent\" "
9409
"conflict,\n"
9410
"except that the parent directory does not *exist*, instead of just being\n"
9411
"unversioned. In this situation, Bazaar will create the missing parent.\n"
9412
"Resolving this issue depends very much on the particular scenario."
9413
msgstr ""
9414
9415
#: en/help_topics/conflict-types.txt:223
9416
msgid ""
9417
"To resolve that kind of conflict, you should either remove or rename the\n"
9418
"children or the directory or a combination of both."
9419
msgstr ""
9420
9421
#: en/help_topics/conflict-types.txt:228
9422
msgid ""
9423
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
9424
" children,\n"
9425
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
9426
"children\n"
9427
" and restoring the directory,\n"
9428
"* ``--action=done`` will just mark the conflict as resolved."
9429
msgstr ""
9430
9431
#: en/help_topics/conflict-types.txt:236
9432
msgid ""
9433
"Deleting parent\n"
9434
"---------------"
9435
msgstr ""
9436
9437
#: en/help_topics/conflict-types.txt:241
9438
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
9439
msgstr ""
9440
9441
#: en/help_topics/conflict-types.txt:243
9442
msgid ""
9443
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
9444
"source, but has new children in the target (either because a directory\n"
9445
"deletion is merged or because the merge introduce new children). Bazaar\n"
9446
"will retain the directory. Resolving this issue depends very much on the\n"
9447
"particular scenario."
9448
msgstr ""
9449
9450
#: en/help_topics/conflict-types.txt:254
9451
msgid ""
9452
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
9453
"directory,"
9454
msgstr ""
9455
9456
#: en/help_topics/conflict-types.txt:256
9457
msgid ""
9458
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
9459
" children,"
9460
msgstr ""
9461
9462
#: en/help_topics/conflict-types.txt:259
9463
msgid "* ``--action=done`` will just mark the conflict as resolved."
9464
msgstr ""
9465
9466
#: en/help_topics/conflict-types.txt:261
9467
msgid ""
9468
"Note that when merging a directory deletion, if unversioned files are\n"
9469
"present, they become potential orphans has they don't have a directory\n"
9470
"parent anymore."
9471
msgstr ""
9472
9473
#: en/help_topics/conflict-types.txt:265
9474
msgid ""
9475
"Handling such orphans, *before* the conflict is created, is controlled by\n"
9476
"setting the ``bzr.transform.orphan_policy`` configuration option."
9477
msgstr ""
9478
9479
#: en/help_topics/conflict-types.txt:268
9480
msgid "There are two possible values for this option:"
9481
msgstr ""
9482
9483
#: en/help_topics/conflict-types.txt:270
9484
msgid ""
9485
"* ``conflict`` (the default): will leave the orphans in place and\n"
9486
" generate a conflicts,"
9487
msgstr ""
9488
9489
#: en/help_topics/conflict-types.txt:273
9490
msgid ""
9491
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
9492
"root\n"
9493
" of the working tree with names like ``<file>.~#~``."
9494
msgstr ""
9495
9496
#: en/help_topics/conflict-types.txt:278
9497
msgid ""
9498
"Path conflict\n"
9499
"-------------"
9500
msgstr ""
9501
9502
#: en/help_topics/conflict-types.txt:283
9503
msgid " Path conflict: PATH1 / PATH2"
9504
msgstr ""
9505
9506
#: en/help_topics/conflict-types.txt:285
9507
msgid ""
9508
"This happens when the source and target have each modified the name or "
9509
"parent\n"
9510
"directory of a file. Bazaar will use the path elements from the source."
9511
msgstr ""
9512
9513
#: en/help_topics/conflict-types.txt:288
9514
msgid ""
9515
"To resolve that kind of conflict, you just have to decide what name should "
9516
"be\n"
9517
"retained for the file involved."
9518
msgstr ""
9519
9520
#: en/help_topics/conflict-types.txt:293
9521
msgid ""
9522
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
9523
" issuing ``bzr mv PATH2 PATH1``,\n"
9524
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
9525
"``PATH2``,\n"
9526
"* ``--action=done`` will just mark the conflict as resolved."
9527
msgstr ""
9528
9529
#: en/help_topics/conflict-types.txt:300
9530
msgid ""
9531
"Parent loop\n"
9532
"-----------"
9533
msgstr ""
9534
9535
#: en/help_topics/conflict-types.txt:305
9536
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
9537
msgstr ""
9538
9539
#: en/help_topics/conflict-types.txt:307
9540
msgid ""
9541
"This happens when the source and the target have each moved directories, so\n"
9542
"that, if the change could be applied, a directory would be contained by "
9543
"itself.\n"
9544
"For example::"
9545
msgstr ""
9546
9547
#: en/help_topics/conflict-types.txt:311
9548
msgid ""
9549
" $ bzr init\n"
9550
" $ bzr mkdir white\n"
9551
" $ bzr mkdir black\n"
9552
" $ bzr commit -m \"BASE\"\n"
9553
" $ bzr branch . ../other\n"
9554
" $ bzr mv white black\n"
9555
" $ bzr commit -m \"THIS\"\n"
9556
" $ bzr mv ../other/black ../other/white\n"
9557
" $ bzr commit ../other -m \"OTHER\"\n"
9558
" $ bzr merge ../other"
9559
msgstr ""
9560
9561
#: en/help_topics/conflict-types.txt:322
9562
msgid ""
9563
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
9564
"``black``. To resolve that kind of conflict, you just have to decide what\n"
9565
"name should be retained for the directories involved."
9566
msgstr ""
9567
9568
#: en/help_topics/conflict-types.txt:328
9569
msgid ""
9570
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
9571
"``white`` \n"
9572
" in ``black``,\n"
9573
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
9574
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
9575
"* ``--action=done`` will just mark the conflict as resolved."
9576
msgstr ""
9577
9578
#: en/help_topics/conflict-types.txt:336
9579
msgid ""
9580
"Non-directory parent\n"
9581
"--------------------"
9582
msgstr ""
9583
9584
#: en/help_topics/conflict-types.txt:341
9585
msgid ""
9586
" Conflict: foo.new is not a directory, but has files in it.\n"
9587
" Created directory."
9588
msgstr ""
9589
9590
#: en/help_topics/conflict-types.txt:344
9591
msgid ""
9592
"This happens when one side has added files to a directory, and the other "
9593
"side\n"
9594
"has changed the directory into a file or symlink. For example::"
9595
msgstr ""
9596
9597
#: en/help_topics/conflict-types.txt:347
9598
msgid ""
9599
" $ bzr init\n"
9600
" $ bzr mkdir foo\n"
9601
" $ bzr commit -m \"BASE\"\n"
9602
" $ bzr branch . ../other\n"
9603
" $ rmdir foo\n"
9604
" $ touch foo\n"
9605
" $ bzr commit -m \"THIS\"\n"
9606
" $ bzr mkdir ../other/foo/bar\n"
9607
" $ bzr commit ../other -m \"OTHER\"\n"
9608
" $ bzr merge ../other"
9609
msgstr ""
9610
9611
#: en/help_topics/conflict-types.txt:358
9612
msgid ""
9613
"To resolve that kind of conflict, you have to decide what name should be\n"
9614
"retained for the file, directory or symlink involved."
9615
msgstr ""
9616
9617
#: en/help_topics/conflict-types.txt:363
9618
msgid ""
9619
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
9620
" ``bzr add foo``,\n"
9621
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
9622
" ``bzr mv foo.new foo``,\n"
9623
"* ``--action=done`` will just mark the conflict as resolved."
9624
msgstr ""
9625
9626
#: en/help_topics/conflict-types.txt:371
9627
msgid ""
9628
"MalformedTransform\n"
9629
"------------------"
9630
msgstr ""
9631
9632
#: en/help_topics/conflict-types.txt:374
9633
msgid ""
9634
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
9635
"exception. This means that Bazaar encountered a filesystem conflict that it "
9636
"was\n"
9637
"unable to resolve. This usually indicates a bug. Please let us know if "
9638
"you\n"
9639
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
9640
msgstr ""
9641
9642
#: en/help_topics/content-filters.txt:1
9643
msgid ""
9644
"Content Filters\n"
9645
"==============="
9646
msgstr ""
9647
9648
#: en/help_topics/content-filters.txt:4
9649
msgid ""
9650
"Content formats\n"
9651
"---------------"
9652
msgstr ""
9653
9654
#: en/help_topics/content-filters.txt:7
9655
msgid ""
9656
"Bazaar's content filtering allows you to store files in a different\n"
9657
"format from the copy in your working tree. This lets you, or your\n"
9658
"co-developers, use Windows development tools that expect CRLF files\n"
9659
"on projects that use other line-ending conventions. Among other things,\n"
9660
"content filters also let Unix developers more easily work on projects\n"
9661
"using Windows line-ending conventions, keyword expansion/compression,\n"
9662
"and trailing spaces on lines in text files to be implicitly stripped\n"
9663
"when committed."
9664
msgstr ""
9665
9666
#: en/help_topics/content-filters.txt:16
9667
msgid "To generalize, there are two content formats supported by Bazaar:"
9668
msgstr ""
9669
9670
#: en/help_topics/content-filters.txt:18
9671
msgid ""
9672
"* a canonical format - how files are stored internally\n"
9673
"* a convenience format - how files are created in a working tree."
9674
msgstr ""
9675
9676
#: en/help_topics/content-filters.txt:21
9677
msgid ""
9678
"\n"
9679
"Format conversion\n"
9680
"-----------------"
9681
msgstr ""
9682
9683
#: en/help_topics/content-filters.txt:25
9684
msgid ""
9685
"The conversion between these formats is done by content filters.\n"
9686
"A content filter has two parts:"
9687
msgstr ""
9688
9689
#: en/help_topics/content-filters.txt:28
9690
msgid ""
9691
"* a read converter - converts from convenience to canonical format\n"
9692
"* a write converter - converts from canonical to convenience format."
9693
msgstr ""
9694
9695
#: en/help_topics/content-filters.txt:31
9696
msgid ""
9697
"Many of these converters will provide *round-trip* conversion,\n"
9698
"i.e. applying the read converter followed by the write converter\n"
9699
"gives back the original content. However, others may provide an\n"
9700
"asymmetric conversion. For example, a read converter might strip\n"
9701
"trailing whitespace off lines in source code while the matching\n"
9702
"write converter might pass content through unchanged."
9703
msgstr ""
9704
9705
#: en/help_topics/content-filters.txt:38
9706
msgid ""
9707
"\n"
9708
"Enabling content filters\n"
9709
"------------------------"
9710
msgstr ""
9711
9712
#: en/help_topics/content-filters.txt:42
9713
msgid ""
9714
"Content filters are typically provided by plugins, so the first step\n"
9715
"in using them is to install the relevant plugins and read their\n"
9716
"documentation. Some plugins may be very specific about which files\n"
9717
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
9718
"In other cases, the plugin may leave it in the user's hands to\n"
9719
"define which files are to be filtered. This is typically done\n"
9720
"using rule-based preferences. See ``bzr help rules`` for general\n"
9721
"information about defining these."
9722
msgstr ""
9723
9724
#: en/help_topics/content-filters.txt:51
9725
msgid ""
9726
"\n"
9727
"Impact on commands\n"
9728
"------------------"
9729
msgstr ""
9730
9731
#: en/help_topics/content-filters.txt:55
9732
msgid ""
9733
"Read converters are only applied to commands that read content from\n"
9734
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
9735
"will apply read converters to files in the working tree, then compare\n"
9736
"the results to the content last committed."
9737
msgstr ""
9738
9739
#: en/help_topics/content-filters.txt:60
9740
msgid ""
9741
"Write converters are only applied by commands that **create files in a\n"
9742
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
9743
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
9744
"respectively."
9745
msgstr ""
9746
9747
#: en/help_topics/content-filters.txt:65
9748
msgid ""
9749
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
9750
"comitting files. If this makes sense for a given plugin providing\n"
9751
"a content filter, the plugin can usually achieve this effect by using a\n"
9752
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
9753
"for more information on hooks."
9754
msgstr ""
9755
9756
#: en/help_topics/content-filters.txt:71
9757
msgid ""
9758
"\n"
9759
"Refreshing your working tree\n"
9760
"----------------------------"
9761
msgstr ""
9762
9763
#: en/help_topics/content-filters.txt:75
9764
msgid ""
9765
"For performance reasons, Bazaar caches the timestamps of files in\n"
9766
"a working tree, and assumes files are unchanged if their timestamps\n"
9767
"match the cached values. As a consequence, there are times when\n"
9768
"you may need to explicitly ask for content filtering to be reapplied\n"
9769
"in one or both directions, e.g. after installing or reconfiguring\n"
9770
"plugins providing it."
9771
msgstr ""
9772
9773
#: en/help_topics/content-filters.txt:82
9774
msgid "Here are some general guidelines for doing this:"
9775
msgstr ""
9776
9777
#: en/help_topics/content-filters.txt:84
9778
msgid ""
9779
" * To reapply read converters, ``touch`` files, i.e. update their\n"
9780
" timestamp. Operations like ``bzr status`` should then reapply the\n"
9781
" relevant read converters and compare the end result with the\n"
9782
" canonical format."
9783
msgstr ""
9784
9785
#: en/help_topics/content-filters.txt:89
9786
msgid ""
9787
" * To reapply write converters, ensure there are no local changes,\n"
9788
" delete the relevant files and run ``bzr revert`` on those files."
9789
msgstr ""
9790
9791
#: en/help_topics/content-filters.txt:92
9792
msgid ""
9793
"Note: In the future, it is likely that additional options will be added\n"
9794
"to commands to make this refreshing process faster and safer.\n"
9795
msgstr ""
9796
9797
#: en/help_topics/current-formats.txt:1
9798
msgid "Current Storage Formats"
9799
msgstr ""
9800
9801
#: en/help_topics/current-formats.txt:3
9802
msgid ""
9803
":2a:\n"
9804
" (native) (default) First format for bzr 2.0 series. Uses group-\n"
9805
" compress storage. Provides rich roots which are a one-way\n"
9806
" transition."
9807
msgstr ""
9808
9809
#: en/help_topics/current-formats.txt:8
9810
msgid ""
9811
":pack-0.92:\n"
9812
" (native) New in 0.92: Pack-based format with data compatible with\n"
9813
" dirstate-tags format repositories. Interoperates with bzr\n"
9814
" repositories before 0.92 but cannot be read by bzr < 0.92."
9815
msgstr ""
9816
9817
#: en/help_topics/current-formats.txt:13
9818
msgid ""
9819
":1.14:\n"
9820
" (native) A working-tree format that supports content filtering."
9821
msgstr ""
9822
9823
#: en/help_topics/current-formats.txt:16
9824
msgid ""
9825
":1.14-rich-root:\n"
9826
" (native) A variant of 1.14 that supports rich-root data (needed\n"
9827
" for bzr-svn and bzr-git)."
9828
msgstr ""
9829
9830
#: en/help_topics/current-formats.txt:20
9831
msgid ""
9832
"\n"
9833
"See :doc:`formats-help` for more about storage formats."
9834
msgstr ""
9835
9836
#: en/help_topics/debug-flags.txt:1
9837
msgid ""
9838
"Debug Flags\n"
9839
"==========="
9840
msgstr ""
9841
9842
#: en/help_topics/debug-flags.txt:4
9843
msgid ""
9844
"These flags can be passed on the bzr command line or (without the ``-D``\n"
9845
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
9846
msgstr ""
9847
9848
#: en/help_topics/debug-flags.txt:7
9849
msgid ""
9850
"-Dauth Trace authentication sections used.\n"
9851
"-Dbytes Print out how many bytes were transferred\n"
9852
"-Ddirstate Trace dirstate activity (verbose!)\n"
9853
"-Derror Instead of normal error handling, always print a "
9854
"traceback\n"
9855
" on error.\n"
9856
"-Devil Capture call sites that do expensive or badly-scaling\n"
9857
" operations.\n"
9858
"-Dfetch Trace history copying between repositories.\n"
9859
"-Dfilters Emit information for debugging content filtering.\n"
9860
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
9861
"fetch.\n"
9862
"-Dgraph Trace graph traversal.\n"
9863
"-Dhashcache Log every time a working file is read to determine its "
9864
"hash.\n"
9865
"-Dhooks Trace hook execution.\n"
9866
"-Dhpss Trace smart protocol requests and responses.\n"
9867
"-Dhpssdetail More hpss details.\n"
9868
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
9869
"-Dhttp Trace http connections, requests and responses.\n"
9870
"-Dindex Trace major index operations.\n"
9871
"-Dknit Trace knit operations.\n"
9872
"-Dlock Trace when lockdir locks are taken or released.\n"
9873
"-Dprogress Trace progress bar operations.\n"
9874
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
9875
"-Dmerge Emit information for debugging merges.\n"
9876
"-Dno_apport Don't use apport to report crashes.\n"
9877
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
9878
"-Dpack Emit information about pack operations.\n"
9879
"-Drelock Emit a message every time a branch or repository object "
9880
"is\n"
9881
" unlocked then relocked the same way.\n"
9882
"-Dsftp Trace SFTP internals.\n"
9883
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
9884
"expected\n"
9885
"-Dstream Trace fetch streams.\n"
9886
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
9887
"portable\n"
9888
" manner.\n"
9889
"-Dunlock Some errors during unlock are treated as warnings.\n"
9890
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
9891
"-DIDS_always Always use InterDifferingSerializer to fetch if "
9892
"appropriate\n"
9893
" for the format, even for non-local fetches.\n"
9894
msgstr ""
9895
9896
#: en/help_topics/diverged-branches.txt:1
9897
msgid ""
9898
"Diverged Branches\n"
9899
"================="
9900
msgstr ""
9901
9902
#: en/help_topics/diverged-branches.txt:4
9903
msgid ""
9904
"When Bazaar tries to push one branch onto another, it requires that the\n"
9905
"destination branch must be ready to receive the source branch. If this "
9906
"isn't\n"
9907
"the case, then we say that the branches have ``diverged``. Branches are\n"
9908
"considered diverged if the destination branch's most recent commit is one "
9909
"that\n"
9910
"has not been merged (directly or indirectly) by the source branch. To "
9911
"recover\n"
9912
"from diverged branches, one must merge the missing revisions into the "
9913
"source\n"
9914
"branch."
9915
msgstr ""
9916
9917
#: en/help_topics/diverged-branches.txt:12
9918
msgid ""
9919
"This situation commonly arises when using a centralized workflow with local\n"
9920
"commits. If someone else has committed new work to the mainline since your\n"
9921
"last pull and you have local commits that have not yet been pushed to the\n"
9922
"mainline, then your local branch and the mainline have diverged."
9923
msgstr ""
9924
9925
#: en/help_topics/diverged-branches.txt:17
9926
msgid ""
9927
"Discovering What Has Diverged\n"
9928
"-----------------------------"
9929
msgstr ""
9930
9931
#: en/help_topics/diverged-branches.txt:20
9932
msgid ""
9933
"The ``bzr missing`` command is used to find out what revisions are in "
9934
"another\n"
9935
"branch that are not present in the current branch, and vice-versa. It shows "
9936
"a\n"
9937
"summary of which extra revisions exist in each branch. If you want to see "
9938
"the\n"
9939
"precise effects of those revisions, you can use ``bzr diff --"
9940
"old=other_branch``\n"
9941
"to show the differences between other_branch and your current branch."
9942
msgstr ""
9943
9944
#: en/help_topics/diverged-branches.txt:26
9945
msgid ""
9946
"A Solution\n"
9947
"----------"
9948
msgstr ""
9949
9950
#: en/help_topics/diverged-branches.txt:29
9951
msgid ""
9952
"The solution is to merge the revisions from the mainline into your local\n"
9953
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
9954
"mainline. This merge may result in conflicts if the other developer's "
9955
"changes\n"
9956
"overlap with your changes. These conflicts should be resolved before\n"
9957
"continuing. After any conflicts have been resolved, or even if there were "
9958
"no\n"
9959
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
9960
"to your local branch. This requirement gives you an opportunity to test "
9961
"the\n"
9962
"resulting working tree for correctness, since the merged revisions could "
9963
"have\n"
9964
"made arbitrary changes. After testing, you should commit the merge using\n"
9965
"``bzr commit``. This clears up the diverged branches situation. Your "
9966
"local\n"
9967
"branch can now be pushed to the mainline.\n"
9968
msgstr ""
9969
9970
#: en/help_topics/eol.txt:1
9971
msgid ""
9972
"End of Line Conversion\n"
9973
"======================"
9974
msgstr ""
9975
9976
#: en/help_topics/eol.txt:4
9977
msgid ""
9978
"EOL conversion is provided as a content filter where Bazaar internally\n"
9979
"stores a canonical format but outputs a convenience format. See\n"
9980
"``bzr help content-filters`` for general information about using these."
9981
msgstr ""
9982
9983
#: en/help_topics/eol.txt:8
9984
msgid ""
9985
"Note: Content filtering is only supported in recently added formats,\n"
9986
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
9987
"in a recent format. (Just setting the format on the repository\n"
9988
"is not enough.) If content filtering does not appear to be working, use\n"
9989
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
9990
"or later."
9991
msgstr ""
9992
9993
#: en/help_topics/eol.txt:15
9994
msgid ""
9995
"EOL conversion needs to be enabled for selected file patterns using\n"
9996
"rules. See ``bzr help rules`` for general information on defining rules.\n"
9997
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
9998
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
9999
"supported in a future verison of Bazaar."
10000
msgstr ""
10001
10002
#: en/help_topics/eol.txt:21
10003
msgid ""
10004
"To configure which files to filter, set ``eol`` to one of the values below.\n"
10005
"(If a value is not set, ``exact`` is the default.)"
10006
msgstr ""
10007
10008
#: en/help_topics/eol.txt:24
10009
msgid ""
10010
" ========== ===================================== ======================\n"
10011
" Value Checkout end-of-lines as Commit end-of-lines as\n"
10012
" ========== ===================================== ======================\n"
10013
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
10014
" ---------- ------------------------------------- ----------------------\n"
10015
" ``lf`` ``lf`` ``lf``\n"
10016
" ---------- ------------------------------------- ----------------------\n"
10017
" ``crlf`` ``crlf`` ``lf``\n"
10018
" ---------- ------------------------------------- ----------------------\n"
10019
" ``exact`` No conversion Exactly as in file\n"
10020
" ========== ===================================== ======================"
10021
msgstr ""
10022
10023
#: en/help_topics/eol.txt:36
10024
msgid ""
10025
"Note: For safety reasons, no conversion is applied to any file where a null\n"
10026
"byte is detected in the file."
10027
msgstr ""
10028
10029
#: en/help_topics/eol.txt:39
10030
msgid ""
10031
"For users working on a cross-platform project, here is a suggested rule\n"
10032
"to use as a starting point::"
10033
msgstr ""
10034
10035
#: en/help_topics/eol.txt:42
10036
msgid ""
10037
" [name *]\n"
10038
" eol = native"
10039
msgstr ""
10040
10041
#: en/help_topics/eol.txt:45
10042
msgid ""
10043
"If you have binary files that do not contain a null byte though, be\n"
10044
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
10045
"by giving more explicit patterns earlier in the rules file. For example::"
10046
msgstr ""
10047
10048
#: en/help_topics/eol.txt:49
10049
msgid ""
10050
" [name *.png]\n"
10051
" eol = exact"
10052
msgstr ""
10053
10054
#: en/help_topics/eol.txt:55
10055
msgid ""
10056
"If your working tree is on a network drive shared by users on different\n"
10057
"operating systems, you typically want to force certain conventions for\n"
10058
"certain files. In that way, if a file is created with the wrong line\n"
10059
"endings or line endings get mixed during editing, it gets committed\n"
10060
"correctly and gets checked out correctly. For example::"
10061
msgstr ""
10062
10063
#: en/help_topics/eol.txt:61
10064
msgid ""
10065
" [name *.bat]\n"
10066
" eol = crlf"
10067
msgstr ""
10068
10069
#: en/help_topics/eol.txt:64
10070
msgid ""
10071
" [name *.sh]\n"
10072
" eol = lf"
10073
msgstr ""
10074
10075
#: en/help_topics/eol.txt:70
10076
msgid ""
10077
"If you take the care to create files with their required endings, you can\n"
10078
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
10079
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
10080
"introducing mixed line endings will be corrected during commit for files\n"
10081
"with those settings."
10082
msgstr ""
10083
10084
#: en/help_topics/eol.txt:76
10085
msgid ""
10086
"If you have sample test data that deliberately has text files with mixed\n"
10087
"newline conventions, you can ask for those to be left alone like this::"
10088
msgstr ""
10089
10090
#: en/help_topics/eol.txt:79
10091
msgid ""
10092
" [name test_data/]\n"
10093
" eol = exact"
10094
msgstr ""
10095
10096
#: en/help_topics/eol.txt:85
10097
msgid ""
10098
"Note that ``exact`` does not imply the file is binary but it does mean\n"
10099
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
10100
"of content analysis to detect binary files for commands like ``diff``.\n"
10101
"In the future, a ``binary = true`` rule may be added but it is not\n"
10102
"supported yet.)"
10103
msgstr ""
10104
10105
#: en/help_topics/eol.txt:91
10106
msgid ""
10107
"If you have an existing repository with text files already stored using\n"
10108
"Windows newline conventions (``crlf``), then you may want to keep using "
10109
"that\n"
10110
"convention in the repository. Forcing certain files to this convention\n"
10111
"may also help users who do not have rules configured. To do this, set\n"
10112
"``eol`` to one of the values below."
10113
msgstr ""
10114
10115
#: en/help_topics/eol.txt:97
10116
msgid ""
10117
" ============================ ======================== "
10118
"======================\n"
10119
" Value Checkout end-of-lines as Commit end-of-lines "
10120
"as\n"
10121
" ============================ ======================== "
10122
"======================\n"
10123
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
10124
" ``lf`` otherwise\n"
10125
" ---------------------------- ------------------------ "
10126
"----------------------\n"
10127
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
10128
" ---------------------------- ------------------------ "
10129
"----------------------\n"
10130
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
10131
" ============================ ======================== ======================"
10132
msgstr ""
10133
10134
#: en/help_topics/eol.txt:108
10135
msgid ""
10136
"For users working on an existing project that uses Windows newline\n"
10137
"conventions in their Bazaar repository, this rule is suggested as a\n"
10138
"starting point::"
10139
msgstr ""
10140
10141
#: en/help_topics/eol.txt:112
10142
msgid ""
10143
" [name *]\n"
10144
" eol = native-with-crlf-in-repo"
10145
msgstr ""
10146
10147
#: en/help_topics/eol.txt:115
10148
msgid ""
10149
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
10150
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
10151
"``crlf`` and ``exact``."
10152
msgstr ""
10153
10154
#: en/help_topics/eol.txt:119
10155
msgid ""
10156
"Note: Bazaar's EOL conversion will convert the content of files but\n"
10157
"never reject files because a given line ending or mixed line endings\n"
10158
"are found. A precommit hook should be used if you wish to validate\n"
10159
"(and not just convert) content before committing.\n"
10160
msgstr ""
10161
10162
#: en/help_topics/hidden-commands.txt:1
10163
msgid ""
10164
"added List files added in working tree.\n"
10165
"ancestry List all revisions merged into this branch.\n"
10166
"assert-fail Test reporting of assertion failures\n"
10167
"bundle-info Output interesting stats about a bundle\n"
10168
"bundle-revisions Create a merge-directive for submitting changes.\n"
10169
"cat-revision Write out metadata for a revision.\n"
10170
"dpush Push into a different VCS without any custom bzr\n"
10171
" metadata.\n"
10172
"dump-btree Dump the contents of a btree index file to stdout.\n"
10173
"export-pot Export command helps and error messages in po "
10174
"format.\n"
10175
"file-id Print file_id of a particular file or directory.\n"
10176
"file-path Print path of file_ids to a file or directory.\n"
10177
"find-merge-base Find and print a base revision for merging two "
10178
"branches.\n"
10179
"hooks Show hooks.\n"
10180
"inventory Show inventory of the current working copy or a\n"
10181
" revision.\n"
10182
"is-ignored Check if a path is ignored. [qbzr]\n"
10183
"is-versioned Check if a path is versioned. [qbzr]\n"
10184
"local-time-offset Show the offset in seconds from GMT to local time.\n"
10185
"lookup-revision Lookup the revision-id from a revision-number\n"
10186
"merge-directive Generate a merge directive for auto-merge tools.\n"
10187
"modified List files modified in working tree.\n"
10188
"qcheckout-ala-explorer Checkout a branch. The checkout is always "
10189
"lightweight.\n"
10190
" [explorer]\n"
10191
"qhelp Shows a help window [qbzr]\n"
10192
"qmain The QBzr main application. [qbzr]\n"
10193
"qsubprocess Run some bzr command as subprocess. [qbzr]\n"
10194
"re-sign Create a digital signature for an existing revision.\n"
10195
"reference list, view and set branch locations for nested "
10196
"trees.\n"
10197
"relpath Show path of a file relative to root\n"
10198
"repair-workingtree Reset the working tree state file.\n"
10199
"revision-history Display the list of revision ids on a branch.\n"
10200
"revision-info Show revision number and revision id for a given\n"
10201
" revision identifier.\n"
10202
"rocks Statement of optimism.\n"
10203
"selftest Run internal test suite.\n"
10204
"shell-complete Show appropriate completions for context.\n"
10205
"test-script Run a shell-like test from a file.\n"
10206
"touching-revisions Return revision-ids which affected a particular "
10207
"file.\n"
10208
"unknowns List unknown files.\n"
10209
"wait-until-signalled Test helper for\n"
10210
" test_start_and_stop_bzr_subprocess_send_signal.\n"
10211
msgstr ""
10212
10213
#: en/help_topics/hooks.txt:1
10214
msgid ""
10215
"\n"
10216
"Hooks\n"
10217
"====="
10218
msgstr ""
10219
10220
#: en/help_topics/hooks.txt:5
10221
msgid ""
10222
"Introduction\n"
10223
"------------"
10224
msgstr ""
10225
10226
#: en/help_topics/hooks.txt:8
10227
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
10228
msgstr ""
10229
10230
#: en/help_topics/hooks.txt:10
10231
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
10232
msgstr ""
10233
10234
#: en/help_topics/hooks.txt:12
10235
msgid ""
10236
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
10237
msgstr ""
10238
10239
#: en/help_topics/hooks.txt:14
10240
msgid ""
10241
"The class that contains each hook is given before the hooks it supplies. "
10242
"For\n"
10243
"instance, BranchHooks as the class is the hooks class for\n"
10244
"`bzrlib.branch.Branch.hooks`."
10245
msgstr ""
10246
10247
#: en/help_topics/hooks.txt:18
10248
msgid ""
10249
"Each description also indicates whether the hook runs on the client (the\n"
10250
"machine where bzr was invoked) or the server (the machine addressed by\n"
10251
"the branch URL). These may be, but are not necessarily, the same machine."
10252
msgstr ""
10253
10254
#: en/help_topics/hooks.txt:22
10255
msgid ""
10256
"Plugins (including hooks) are run on the server if all of these is true:"
10257
msgstr ""
10258
10259
#: en/help_topics/hooks.txt:24
10260
msgid ""
10261
" * The connection is via a smart server (accessed with a URL starting with\n"
10262
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
10263
"\"http://\"\n"
10264
" URL when a smart server is available via HTTP)."
10265
msgstr ""
10266
10267
#: en/help_topics/hooks.txt:28
10268
msgid ""
10269
" * The hook is either server specific or part of general infrastructure "
10270
"rather\n"
10271
" than client specific code (such as commit)."
10272
msgstr ""
10273
10274
#: en/help_topics/hooks.txt:31
10275
msgid ""
10276
"\n"
10277
"BranchHooks\n"
10278
"-----------"
10279
msgstr ""
10280
10281
#: en/help_topics/hooks.txt:35
10282
msgid ""
10283
"automatic_tag_name\n"
10284
"~~~~~~~~~~~~~~~~~~"
10285
msgstr ""
10286
10287
#: en/help_topics/hooks.txt:38
10288
msgid "Introduced in: 2.2"
10289
msgstr ""
10290
10291
#: en/help_topics/hooks.txt:40
10292
msgid ""
10293
"Called to determine an automatic tag name for a revision.\n"
10294
"automatic_tag_name is called with (branch, revision_id) and should\n"
10295
"return a tag name or None if no tag name could be determined. The\n"
10296
"first non-None tag name returned will be used."
10297
msgstr ""
10298
10299
#: en/help_topics/hooks.txt:45
10300
msgid ""
10301
"open\n"
10302
"~~~~"
10303
msgstr ""
10304
10305
#: en/help_topics/hooks.txt:48
10306
msgid "Introduced in: 1.8"
10307
msgstr ""
10308
10309
#: en/help_topics/hooks.txt:50
10310
msgid ""
10311
"Called with the Branch object that has been opened after a branch is\n"
10312
"opened."
10313
msgstr ""
10314
10315
#: en/help_topics/hooks.txt:53
10316
msgid ""
10317
"post_branch_init\n"
10318
"~~~~~~~~~~~~~~~~"
10319
msgstr ""
10320
10321
#: en/help_topics/hooks.txt:58
10322
msgid ""
10323
"Called after new branch initialization completes. post_branch_init is\n"
10324
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
10325
"branch and checkout (both heavyweight and lightweight) will all\n"
10326
"trigger this hook."
10327
msgstr ""
10328
10329
#: en/help_topics/hooks.txt:63
10330
msgid ""
10331
"post_change_branch_tip\n"
10332
"~~~~~~~~~~~~~~~~~~~~~~"
10333
msgstr ""
10334
10335
#: en/help_topics/hooks.txt:66
10336
msgid "Introduced in: 1.4"
10337
msgstr ""
10338
10339
#: en/help_topics/hooks.txt:68
10340
msgid ""
10341
"Called in bzr client and server after a change to the tip of a branch\n"
10342
"is made. post_change_branch_tip is called with a\n"
10343
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
10344
"uncommit will all trigger this hook."
10345
msgstr ""
10346
10347
#: en/help_topics/hooks.txt:73
10348
msgid ""
10349
"post_commit\n"
10350
"~~~~~~~~~~~"
10351
msgstr ""
10352
10353
#: en/help_topics/hooks.txt:76
10354
msgid "Introduced in: 0.15"
10355
msgstr ""
10356
10357
#: en/help_topics/hooks.txt:78
10358
msgid ""
10359
"Called in the bzr client after a commit has completed. post_commit is\n"
10360
"called with (local, master, old_revno, old_revid, new_revno,\n"
10361
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
10362
"branch."
10363
msgstr ""
10364
10365
#: en/help_topics/hooks.txt:83
10366
msgid ""
10367
"post_pull\n"
10368
"~~~~~~~~~"
10369
msgstr ""
10370
10371
#: en/help_topics/hooks.txt:88
10372
msgid ""
10373
"Called after a pull operation completes. post_pull is called with a\n"
10374
"bzrlib.branch.PullResult object and only runs in the bzr client."
10375
msgstr ""
10376
10377
#: en/help_topics/hooks.txt:91
10378
msgid ""
10379
"post_push\n"
10380
"~~~~~~~~~"
10381
msgstr ""
10382
10383
#: en/help_topics/hooks.txt:96
10384
msgid ""
10385
"Called after a push operation completes. post_push is called with a\n"
10386
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
10387
msgstr ""
10388
10389
#: en/help_topics/hooks.txt:99
10390
msgid ""
10391
"post_switch\n"
10392
"~~~~~~~~~~~"
10393
msgstr ""
10394
10395
#: en/help_topics/hooks.txt:104
10396
msgid ""
10397
"Called after a checkout switches branch. post_switch is called with a\n"
10398
"bzrlib.branch.SwitchHookParams."
10399
msgstr ""
10400
10401
#: en/help_topics/hooks.txt:107
10402
msgid ""
10403
"post_uncommit\n"
10404
"~~~~~~~~~~~~~"
10405
msgstr ""
10406
10407
#: en/help_topics/hooks.txt:112
10408
msgid ""
10409
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
10410
"called with (local, master, old_revno, old_revid, new_revno,\n"
10411
"new_revid) where local is the local branch or None, master is the\n"
10412
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
10413
"of None."
10414
msgstr ""
10415
10416
#: en/help_topics/hooks.txt:118
10417
msgid ""
10418
"pre_change_branch_tip\n"
10419
"~~~~~~~~~~~~~~~~~~~~~"
10420
msgstr ""
10421
10422
#: en/help_topics/hooks.txt:121
10423
msgid "Introduced in: 1.6"
10424
msgstr ""
10425
10426
#: en/help_topics/hooks.txt:123
10427
msgid ""
10428
"Called in bzr client and server before a change to the tip of a branch\n"
10429
"is made. pre_change_branch_tip is called with a\n"
10430
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
10431
"uncommit will all trigger this hook."
10432
msgstr ""
10433
10434
#: en/help_topics/hooks.txt:128
10435
msgid ""
10436
"pre_commit\n"
10437
"~~~~~~~~~~"
10438
msgstr ""
10439
10440
#: en/help_topics/hooks.txt:131
10441
msgid "Introduced in: 0.91"
10442
msgstr ""
10443
10444
#: en/help_topics/hooks.txt:133
10445
msgid ""
10446
"Called after a commit is calculated but before it is completed.\n"
10447
"pre_commit is called with (local, master, old_revno, old_revid,\n"
10448
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
10449
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
10450
"TreeDelta object describing changes from the basis revision. hooks\n"
10451
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
10452
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
10453
"tree."
10454
msgstr ""
10455
10456
#: en/help_topics/hooks.txt:142
10457
msgid ""
10458
"set_rh\n"
10459
"~~~~~~"
10460
msgstr ""
10461
10462
#: en/help_topics/hooks.txt:147
10463
msgid ""
10464
"Invoked whenever the revision history has been set via\n"
10465
"set_revision_history. The api signature is (branch, revision_history),\n"
10466
"and the branch will be write-locked. The set_rh hook can be expensive\n"
10467
"for bzr to trigger, a better hook to use is\n"
10468
"Branch.post_change_branch_tip."
10469
msgstr ""
10470
10471
#: en/help_topics/hooks.txt:153
10472
msgid ""
10473
"transform_fallback_location\n"
10474
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10475
msgstr ""
10476
10477
#: en/help_topics/hooks.txt:156
10478
msgid "Introduced in: 1.9"
10479
msgstr ""
10480
10481
#: en/help_topics/hooks.txt:158
10482
msgid ""
10483
"Called when a stacked branch is activating its fallback locations.\n"
10484
"transform_fallback_location is called with (branch, url), and should\n"
10485
"return a new url. Returning the same url allows it to be used as-is,\n"
10486
"returning a different one can be used to cause the branch to stack on\n"
10487
"a closer copy of that fallback_location. Note that the branch cannot\n"
10488
"have history accessing methods called on it during this hook because\n"
10489
"the fallback locations have not been activated. When there are\n"
10490
"multiple hooks installed for transform_fallback_location, all are\n"
10491
"called with the url returned from the previous hook.The order is\n"
10492
"however undefined."
10493
msgstr ""
10494
10495
#: en/help_topics/hooks.txt:169
10496
msgid ""
10497
"BzrDirHooks\n"
10498
"-----------"
10499
msgstr ""
10500
10501
#: en/help_topics/hooks.txt:172
10502
msgid ""
10503
"post_repo_init\n"
10504
"~~~~~~~~~~~~~~"
10505
msgstr ""
10506
10507
#: en/help_topics/hooks.txt:177
10508
msgid ""
10509
"Invoked after a repository has been initialized. post_repo_init is\n"
10510
"called with a bzrlib.bzrdir.RepoInitHookParams."
10511
msgstr ""
10512
10513
#: en/help_topics/hooks.txt:180
10514
msgid ""
10515
"pre_open\n"
10516
"~~~~~~~~"
10517
msgstr ""
10518
10519
#: en/help_topics/hooks.txt:183
10520
msgid "Introduced in: 1.14"
10521
msgstr ""
10522
10523
#: en/help_topics/hooks.txt:185
10524
msgid ""
10525
"Invoked before attempting to open a BzrDir with the transport that the\n"
10526
"open will use."
10527
msgstr ""
10528
10529
#: en/help_topics/hooks.txt:188
10530
msgid ""
10531
"CommandHooks\n"
10532
"------------"
10533
msgstr ""
10534
10535
#: en/help_topics/hooks.txt:191
10536
msgid ""
10537
"extend_command\n"
10538
"~~~~~~~~~~~~~~"
10539
msgstr ""
10540
10541
#: en/help_topics/hooks.txt:194
10542
msgid "Introduced in: 1.13"
10543
msgstr ""
10544
10545
#: en/help_topics/hooks.txt:196
10546
msgid ""
10547
"Called after creating a command object to allow modifications such as\n"
10548
"adding or removing options, docs etc. Called with the new\n"
10549
"bzrlib.commands.Command object."
10550
msgstr ""
10551
10552
#: en/help_topics/hooks.txt:200
10553
msgid ""
10554
"get_command\n"
10555
"~~~~~~~~~~~"
10556
msgstr ""
10557
10558
#: en/help_topics/hooks.txt:203
10559
msgid "Introduced in: 1.17"
10560
msgstr ""
10561
10562
#: en/help_topics/hooks.txt:205
10563
msgid ""
10564
"Called when creating a single command. Called with (cmd_or_None,\n"
10565
"command_name). get_command should either return the cmd_or_None\n"
10566
"parameter, or a replacement Command object that should be used for the\n"
10567
"command. Note that the Command.hooks hooks are core infrastructure.\n"
10568
"Many users will prefer to use bzrlib.commands.register_command or\n"
10569
"plugin_cmds.register_lazy."
10570
msgstr ""
10571
10572
#: en/help_topics/hooks.txt:212
10573
msgid ""
10574
"get_missing_command\n"
10575
"~~~~~~~~~~~~~~~~~~~"
10576
msgstr ""
10577
10578
#: en/help_topics/hooks.txt:217
10579
msgid ""
10580
"Called when creating a single command if no command could be found.\n"
10581
"Called with (command_name). get_missing_command should either return\n"
10582
"None, or a Command object to be used for the command."
10583
msgstr ""
10584
10585
#: en/help_topics/hooks.txt:221
10586
msgid ""
10587
"list_commands\n"
10588
"~~~~~~~~~~~~~"
10589
msgstr ""
10590
10591
#: en/help_topics/hooks.txt:226
10592
msgid ""
10593
"Called when enumerating commands. Called with a set of cmd_name\n"
10594
"strings for all the commands found so far. This set is safe to mutate\n"
10595
"- e.g. to remove a command. list_commands should return the updated\n"
10596
"set of command names."
10597
msgstr ""
10598
10599
#: en/help_topics/hooks.txt:231
10600
msgid ""
10601
"_ConfigHooks\n"
10602
"------------"
10603
msgstr ""
10604
10605
#: en/help_topics/hooks.txt:234
10606
msgid ""
10607
"get\n"
10608
"~~~"
10609
msgstr ""
10610
10611
#: en/help_topics/hooks.txt:237
10612
msgid "Introduced in: 2.4"
10613
msgstr ""
10614
10615
#: en/help_topics/hooks.txt:239
10616
msgid ""
10617
"Invoked when a config option is read. The signature is (stack, name,\n"
10618
"value)."
10619
msgstr ""
10620
10621
#: en/help_topics/hooks.txt:242
10622
msgid ""
10623
"load\n"
10624
"~~~~"
10625
msgstr ""
10626
10627
#: en/help_topics/hooks.txt:247
10628
msgid "Invoked when a config store is loaded. The signature is (store)."
10629
msgstr ""
10630
10631
#: en/help_topics/hooks.txt:249
10632
msgid ""
10633
"remove\n"
10634
"~~~~~~"
10635
msgstr ""
10636
10637
#: en/help_topics/hooks.txt:254
10638
msgid ""
10639
"Invoked when a config option is removed. The signature is (stack,\n"
10640
"name)."
10641
msgstr ""
10642
10643
#: en/help_topics/hooks.txt:257
10644
msgid ""
10645
"save\n"
10646
"~~~~"
10647
msgstr ""
10648
10649
#: en/help_topics/hooks.txt:262
10650
msgid "Invoked when a config store is saved. The signature is (store)."
10651
msgstr ""
10652
10653
#: en/help_topics/hooks.txt:264
10654
msgid ""
10655
"set\n"
10656
"~~~"
10657
msgstr ""
10658
10659
#: en/help_topics/hooks.txt:269
10660
msgid ""
10661
"Invoked when a config option is set. The signature is (stack, name,\n"
10662
"value)."
10663
msgstr ""
10664
10665
#: en/help_topics/hooks.txt:272
10666
msgid ""
10667
"InfoHooks\n"
10668
"---------"
10669
msgstr ""
10670
10671
#: en/help_topics/hooks.txt:275
10672
msgid ""
10673
"repository\n"
10674
"~~~~~~~~~~"
10675
msgstr ""
10676
10677
#: en/help_topics/hooks.txt:278
10678
msgid "Introduced in: 1.15"
10679
msgstr ""
10680
10681
#: en/help_topics/hooks.txt:280
10682
msgid ""
10683
"Invoked when displaying the statistics for a repository. repository is\n"
10684
"called with a statistics dictionary as returned by the repository and\n"
10685
"a file-like object to write to."
10686
msgstr ""
10687
10688
#: en/help_topics/hooks.txt:284
10689
msgid ""
10690
"LockHooks\n"
10691
"---------"
10692
msgstr ""
10693
10694
#: en/help_topics/hooks.txt:287
10695
msgid ""
10696
"lock_acquired\n"
10697
"~~~~~~~~~~~~~"
10698
msgstr ""
10699
10700
#: en/help_topics/hooks.txt:292
10701
msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."
10702
msgstr ""
10703
10704
#: en/help_topics/hooks.txt:294
10705
msgid ""
10706
"lock_broken\n"
10707
"~~~~~~~~~~~"
10708
msgstr ""
10709
10710
#: en/help_topics/hooks.txt:299
10711
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
10712
msgstr ""
10713
10714
#: en/help_topics/hooks.txt:301
10715
msgid ""
10716
"lock_released\n"
10717
"~~~~~~~~~~~~~"
10718
msgstr ""
10719
10720
#: en/help_topics/hooks.txt:306
10721
msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."
10722
msgstr ""
10723
10724
#: en/help_topics/hooks.txt:308
10725
msgid ""
10726
"MergeHooks\n"
10727
"----------"
10728
msgstr ""
10729
10730
#: en/help_topics/hooks.txt:311
10731
msgid ""
10732
"merge_file_content\n"
10733
"~~~~~~~~~~~~~~~~~~"
10734
msgstr ""
10735
10736
#: en/help_topics/hooks.txt:314
10737
msgid "Introduced in: 2.1"
10738
msgstr ""
10739
10740
#: en/help_topics/hooks.txt:316
10741
msgid ""
10742
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
10743
"object when starting a merge. Should return either None or a subclass\n"
10744
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
10745
"called per file that needs to be merged (including when one side has\n"
10746
"deleted the file and the other has changed it). See the\n"
10747
"AbstractPerFileMerger API docs for details on how it is used by merge."
10748
msgstr ""
10749
10750
#: en/help_topics/hooks.txt:323
10751
msgid ""
10752
"MergeDirectiveHooks\n"
10753
"-------------------"
10754
msgstr ""
10755
10756
#: en/help_topics/hooks.txt:326
10757
msgid ""
10758
"merge_request_body\n"
10759
"~~~~~~~~~~~~~~~~~~"
10760
msgstr ""
10761
10762
#: en/help_topics/hooks.txt:329
10763
msgid "Introduced in: 1.15.0"
10764
msgstr ""
10765
10766
#: en/help_topics/hooks.txt:331
10767
msgid ""
10768
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
10769
"request. Callbacks must return a body. If more than one callback is\n"
10770
"registered, the output of one callback is provided to the next."
10771
msgstr ""
10772
10773
#: en/help_topics/hooks.txt:335
10774
msgid ""
10775
"MessageEditorHooks\n"
10776
"------------------"
10777
msgstr ""
10778
10779
#: en/help_topics/hooks.txt:338
10780
msgid ""
10781
"commit_message_template\n"
10782
"~~~~~~~~~~~~~~~~~~~~~~~"
10783
msgstr ""
10784
10785
#: en/help_topics/hooks.txt:341
10786
msgid "Introduced in: 1.10"
10787
msgstr ""
10788
10789
#: en/help_topics/hooks.txt:343
10790
msgid ""
10791
"Called when a commit message is being generated.\n"
10792
"commit_message_template is called with the bzrlib.commit.Commit object\n"
10793
"and the message that is known so far. commit_message_template must\n"
10794
"return a new message to use (which could be the same as it was given).\n"
10795
"When there are multiple hooks registered for commit_message_template,\n"
10796
"they are chained with the result from the first passed into the\n"
10797
"second, and so on."
10798
msgstr ""
10799
10800
#: en/help_topics/hooks.txt:351
10801
msgid ""
10802
"set_commit_message\n"
10803
"~~~~~~~~~~~~~~~~~~"
10804
msgstr ""
10805
10806
#: en/help_topics/hooks.txt:356
10807
msgid ""
10808
"Set a fixed commit message. set_commit_message is called with the\n"
10809
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
10810
"properties by editing commit.builder._revprops) and the message so\n"
10811
"far. set_commit_message must return the message to use or None if it\n"
10812
"should use the message editor as normal."
10813
msgstr ""
10814
10815
#: en/help_topics/hooks.txt:362
10816
msgid ""
10817
"MutableTreeHooks\n"
10818
"----------------"
10819
msgstr ""
10820
10821
#: en/help_topics/hooks.txt:368
10822
msgid "Introduced in: 2.0"
10823
msgstr ""
10824
10825
#: en/help_topics/hooks.txt:370
10826
msgid ""
10827
"Called after a commit is performed on a tree. The hook is called with\n"
10828
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
10829
"commit was performed on is available via the mutable_tree attribute of\n"
10830
"that object."
10831
msgstr ""
10832
10833
#: en/help_topics/hooks.txt:375
10834
msgid ""
10835
"start_commit\n"
10836
"~~~~~~~~~~~~"
10837
msgstr ""
10838
10839
#: en/help_topics/hooks.txt:380
10840
msgid ""
10841
"Called before a commit is performed on a tree. The start commit hook\n"
10842
"is able to change the tree before the commit takes place. start_commit\n"
10843
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
10844
"being performed on."
10845
msgstr ""
10846
10847
#: en/help_topics/hooks.txt:385
10848
msgid ""
10849
"SmartClientHooks\n"
10850
"----------------"
10851
msgstr ""
10852
10853
#: en/help_topics/hooks.txt:388
10854
msgid ""
10855
"call\n"
10856
"~~~~"
10857
msgstr ""
10858
10859
#: en/help_topics/hooks.txt:391
10860
msgid "Introduced in: unknown"
10861
msgstr ""
10862
10863
#: en/help_topics/hooks.txt:393
10864
msgid ""
10865
"Called when the smart client is submitting a request to the smart\n"
10866
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
10867
"Streaming request bodies, and responses, are not accessible."
10868
msgstr ""
10869
10870
#: en/help_topics/hooks.txt:397
10871
msgid ""
10872
"SmartServerHooks\n"
10873
"----------------"
10874
msgstr ""
10875
10876
#: en/help_topics/hooks.txt:400
10877
msgid ""
10878
"server_exception\n"
10879
"~~~~~~~~~~~~~~~~"
10880
msgstr ""
10881
10882
#: en/help_topics/hooks.txt:405
10883
msgid ""
10884
"Called by the bzr server when an exception occurs. server_exception is\n"
10885
"called with the sys.exc_info() tuple return true for the hook if the\n"
10886
"exception has been handled, in which case the server will exit\n"
10887
"normally."
10888
msgstr ""
10889
10890
#: en/help_topics/hooks.txt:410
10891
msgid ""
10892
"server_started\n"
10893
"~~~~~~~~~~~~~~"
10894
msgstr ""
10895
10896
#: en/help_topics/hooks.txt:413
10897
msgid "Introduced in: 0.16"
10898
msgstr ""
10899
10900
#: en/help_topics/hooks.txt:415
10901
msgid ""
10902
"Called by the bzr server when it starts serving a directory.\n"
10903
"server_started is called with (backing urls, public url), where\n"
10904
"backing_url is a list of URLs giving the server-specific directory\n"
10905
"locations, and public_url is the public URL for the directory being\n"
10906
"served."
10907
msgstr ""
10908
10909
#: en/help_topics/hooks.txt:421
10910
msgid ""
10911
"server_started_ex\n"
10912
"~~~~~~~~~~~~~~~~~"
10913
msgstr ""
10914
10915
#: en/help_topics/hooks.txt:426
10916
msgid ""
10917
"Called by the bzr server when it starts serving a directory.\n"
10918
"server_started is called with (backing_urls, server_obj)."
10919
msgstr ""
10920
10921
#: en/help_topics/hooks.txt:429
10922
msgid ""
10923
"server_stopped\n"
10924
"~~~~~~~~~~~~~~"
10925
msgstr ""
10926
10927
#: en/help_topics/hooks.txt:434
10928
msgid ""
10929
"Called by the bzr server when it stops serving a directory.\n"
10930
"server_stopped is called with the same parameters as the\n"
10931
"server_started hook: (backing_urls, public_url)."
10932
msgstr ""
10933
10934
#: en/help_topics/hooks.txt:438
10935
msgid ""
10936
"StatusHooks\n"
10937
"-----------"
10938
msgstr ""
10939
10940
#: en/help_topics/hooks.txt:441
10941
msgid ""
10942
"post_status\n"
10943
"~~~~~~~~~~~"
10944
msgstr ""
10945
10946
#: en/help_topics/hooks.txt:444
10947
msgid "Introduced in: 2.3"
10948
msgstr ""
10949
10950
#: en/help_topics/hooks.txt:446
10951
msgid ""
10952
"Called with argument StatusHookParams after Bazaar has displayed the\n"
10953
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
10954
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
10955
"correspond to the command line options specified by the user for the\n"
10956
"status command. to_file is the output stream for writing."
10957
msgstr ""
10958
10959
#: en/help_topics/hooks.txt:452
10960
msgid ""
10961
"pre_status\n"
10962
"~~~~~~~~~~"
10963
msgstr ""
10964
10965
#: en/help_topics/hooks.txt:457
10966
msgid ""
10967
"Called with argument StatusHookParams before Bazaar displays the\n"
10968
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
10969
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
10970
"correspond to the command line options specified by the user for the\n"
10971
"status command. to_file is the output stream for writing."
10972
msgstr ""
10973
10974
#: en/help_topics/hooks.txt:463
10975
msgid ""
10976
"RioVersionInfoBuilderHooks\n"
10977
"--------------------------"
10978
msgstr ""
10979
10980
#: en/help_topics/hooks.txt:466
10981
msgid ""
10982
"revision\n"
10983
"~~~~~~~~"
10984
msgstr ""
10985
10986
#: en/help_topics/hooks.txt:471
10987
msgid ""
10988
"Invoked when adding information about a revision to the RIO stanza\n"
10989
"that is printed. revision is called with a revision object and a RIO\n"
10990
"stanza.\n"
10991
msgstr ""
10992
10993
#: en/help_topics/location-alias.txt:1
10994
msgid ""
10995
"Location aliases\n"
10996
"================"
10997
msgstr ""
10998
10999
#: en/help_topics/location-alias.txt:4
11000
msgid ""
11001
"Bazaar defines several aliases for locations associated with a branch. "
11002
"These\n"
11003
"can be used with most commands that expect a location, such as `bzr push`."
11004
msgstr ""
11005
11006
#: en/help_topics/location-alias.txt:7
11007
msgid "The aliases are::"
11008
msgstr ""
11009
11010
#: en/help_topics/location-alias.txt:9
11011
msgid ""
11012
" :parent the parent of this branch\n"
11013
" :submit the submit branch for this branch\n"
11014
" :public the public location of this branch\n"
11015
" :bound the branch this branch is bound to, for bound branches\n"
11016
" :push the saved location used for `bzr push` with no arguments\n"
11017
" :this this branch"
11018
msgstr ""
11019
11020
#: en/help_topics/location-alias.txt:16
11021
msgid "For example, to push to the parent location::"
11022
msgstr ""
11023
11024
#: en/help_topics/location-alias.txt:18
11025
msgid " bzr push :parent"
11026
msgstr ""
11027
11028
#: en/help_topics/log-formats.txt:1
11029
msgid ""
11030
"Log Formats\n"
11031
"==========="
11032
msgstr ""
11033
11034
#: en/help_topics/log-formats.txt:4
11035
msgid ""
11036
"A log format controls how information about each revision is displayed.\n"
11037
"The standard log formats are compared below::"
11038
msgstr ""
11039
11040
#: en/help_topics/log-formats.txt:7
11041
msgid ""
11042
" Feature long short line\n"
11043
" ---------------------- ------------- ------------ -------------------\n"
11044
" design goal detailed view concise view 1 revision per line\n"
11045
" committer name+email name only name only\n"
11046
" author name+email - -\n"
11047
" date-time format full date only date only\n"
11048
" commit message full full top line\n"
11049
" tags yes yes yes\n"
11050
" merges indicator - yes -\n"
11051
" status/delta optional optional -\n"
11052
" diff/patch optional optional -\n"
11053
" revision-id optional optional -\n"
11054
" branch nick yes - -\n"
11055
" foreign vcs properties yes yes -\n"
11056
" preferred levels all 1 1\n"
11057
" digital signature optional - -"
11058
msgstr ""
11059
11060
#: en/help_topics/log-formats.txt:24
11061
msgid ""
11062
"The default format is ``long``. To change this, define the ``log_format``\n"
11063
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
11064
msgstr ""
11065
11066
#: en/help_topics/log-formats.txt:27
11067
msgid ""
11068
" [DEFAULT]\n"
11069
" log_format = short"
11070
msgstr ""
11071
11072
#: en/help_topics/log-formats.txt:30
11073
msgid ""
11074
"Alternatively, to change the log format used for a given query, use the\n"
11075
"--long, --short or --line options."
11076
msgstr ""
11077
11078
#: en/help_topics/log-formats.txt:33
11079
msgid ""
11080
"If one of the standard log formats does not meet your needs, additional\n"
11081
"formats can be provided by plugins.\n"
11082
msgstr ""
11083
11084
#: en/help_topics/other-formats.txt:1
11085
msgid "Other Storage Formats"
11086
msgstr ""
11087
11088
#: en/help_topics/other-formats.txt:3
11089
msgid "No experimental formats are available."
11090
msgstr ""
11091
11092
#: en/help_topics/other-formats.txt:5
11093
msgid ""
11094
"\n"
11095
"No deprecated formats are available."
11096
msgstr ""
11097
11098
#: en/help_topics/patterns.txt:1
11099
msgid ""
11100
"Patterns\n"
11101
"========"
11102
msgstr ""
11103
11104
#: en/help_topics/patterns.txt:4
11105
msgid ""
11106
"Bazaar uses patterns to match files at various times. For example,\n"
11107
"the ``add`` command skips over files that match ignore patterns\n"
11108
"and preferences can be associated with files using rule patterns.\n"
11109
"The pattern syntax is described below."
11110
msgstr ""
11111
11112
#: en/help_topics/patterns.txt:9
11113
msgid ""
11114
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
11115
"slash or is a regular expression, it is compared to the whole path\n"
11116
"from the branch root. Otherwise, it is compared to only the last\n"
11117
"component of the path. To match a file only in the root directory,\n"
11118
"prepend ``./``. Patterns specifying absolute paths are not allowed."
11119
msgstr ""
11120
11121
#: en/help_topics/patterns.txt:15
11122
msgid "Patterns may include globbing wildcards such as::"
11123
msgstr ""
11124
11125
#: en/help_topics/patterns.txt:17
11126
msgid ""
11127
" ? - Matches any single character except '/'\n"
11128
" * - Matches 0 or more characters except '/'\n"
11129
" /**/ - Matches 0 or more directories in a path\n"
11130
" [a-z] - Matches a single character from within a group of characters"
11131
msgstr ""
11132
11133
#: en/help_topics/patterns.txt:22
11134
msgid ""
11135
"Patterns may also be `Python regular expressions`_. Regular expression\n"
11136
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
11137
"expression. Regular expression patterns may not include named or\n"
11138
"numbered groups."
11139
msgstr ""
11140
11141
#: en/help_topics/patterns.txt:27
11142
msgid ""
11143
"Case insensitive ignore patterns can be specified with regular expressions\n"
11144
"by using the ``i`` (for ignore case) flag in the pattern."
11145
msgstr ""
11146
11147
#: en/help_topics/patterns.txt:30
11148
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
11149
msgstr ""
11150
11151
#: en/help_topics/patterns.txt:32
11152
msgid " RE:(?i)foo"
11153
msgstr ""
11154
11155
#: en/help_topics/patterns.txt:34
11156
msgid ""
11157
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
11158
"matched by that pattern will not be ignored."
11159
msgstr ""
11160
11161
#: en/help_topics/patterns.txt:37
11162
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
11163
msgstr ""
11164
11165
#: en/help_topics/revisionspec.txt:1
11166
msgid "Revision Identifiers"
11167
msgstr ""
11168
11169
#: en/help_topics/revisionspec.txt:3
11170
msgid ""
11171
"A revision identifier refers to a specific state of a branch's history. It\n"
11172
"can be expressed in several ways. It can begin with a keyword to\n"
11173
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
11174
"'before:yesterday' and 'submit:'."
11175
msgstr ""
11176
11177
#: en/help_topics/revisionspec.txt:8
11178
msgid ""
11179
"Alternately, it can be given without a keyword, in which case it will be\n"
11180
"checked as a revision number, a tag, a revision id, a date specification, or "
11181
"a\n"
11182
"branch specification, in that order. For example, 'date:today' could be\n"
11183
"written as simply 'today', though if you have a tag called 'today' that "
11184
"will\n"
11185
"be found first."
11186
msgstr ""
11187
11188
#: en/help_topics/revisionspec.txt:14
11189
msgid ""
11190
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
11191
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
11192
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
11193
"or\n"
11194
"spaces around the '..')."
11195
msgstr ""
11196
11197
#: en/help_topics/revisionspec.txt:19
11198
msgid ""
11199
"Ranges are interpreted differently by different commands. To the \"log\" "
11200
"command,\n"
11201
"a range is a sequence of log messages, but to the \"diff\" command, the "
11202
"range\n"
11203
"denotes a change between revisions (and not a sequence of changes). In\n"
11204
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
11205
"consider it\n"
11206
"to be open-ended, that is, they include one end but not the other. For "
11207
"example:\n"
11208
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
11209
"3649,\n"
11210
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
11211
"and\n"
11212
"3649, but not 3647."
11213
msgstr ""
11214
11215
#: en/help_topics/revisionspec.txt:28
11216
msgid "The keywords used as revision selection methods are the following:"
11217
msgstr ""
11218
11219
#: en/help_topics/revisionspec.txt:30
11220
msgid ""
11221
":revid:\n"
11222
"\tSelects a revision using the revision id.\n"
11223
":submit:\n"
11224
"\tSelects a common ancestor with the submit branch.\n"
11225
":ancestor:\n"
11226
"\tSelects a common ancestor with a second branch.\n"
11227
":date:\n"
11228
"\tSelects a revision on the basis of a datestamp.\n"
11229
":branch:\n"
11230
"\tSelects the last revision of a specified branch.\n"
11231
":tag:\n"
11232
"\tSelects a revision identified by a tag name.\n"
11233
":package:\n"
11234
"\tSelects the revision corresponding to a version of a package.\n"
11235
":revno:\n"
11236
"\tSelects a revision using a number.\n"
11237
":before:\n"
11238
"\tSelects the parent of the revision specified.\n"
11239
":annotate:\n"
11240
"\tSelect the revision that last modified the specified line.\n"
11241
":mainline:\n"
11242
"\tSelect mainline revision that merged the specified revision.\n"
11243
":last:\n"
11244
"\tSelects the nth revision from the end."
11245
msgstr ""
11246
11247
#: en/help_topics/revisionspec.txt:55
11248
msgid "In addition, plugins can provide other keywords."
11249
msgstr ""
11250
11251
#: en/help_topics/revisionspec.txt:57
11252
msgid "A detailed description of each keyword is given below."
11253
msgstr ""
11254
11255
#: en/help_topics/revisionspec.txt:59
11256
msgid ":revid:"
11257
msgstr ""
11258
11259
#: en/help_topics/revisionspec.txt:61
11260
msgid ""
11261
" Supply a specific revision id, that can be used to specify any\n"
11262
" revision id in the ancestry of the branch.\n"
11263
" Including merges, and pending merges.\n"
11264
" Examples::"
11265
msgstr ""
11266
11267
#: en/help_topics/revisionspec.txt:66
11268
msgid ""
11269
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
11270
msgstr ""
11271
11272
#: en/help_topics/revisionspec.txt:68
11273
msgid ":submit:"
11274
msgstr ""
11275
11276
#: en/help_topics/revisionspec.txt:70
11277
msgid ""
11278
" Diffing against this shows all the changes that were made in this "
11279
"branch,\n"
11280
" and is a good predictor of what merge will do. The submit branch is\n"
11281
" used by the bundle and merge directive commands. If no submit branch\n"
11282
" is specified, the parent branch is used instead."
11283
msgstr ""
11284
11285
#: en/help_topics/revisionspec.txt:75
11286
msgid ""
11287
" The common ancestor is the last revision that existed in both\n"
11288
" branches. Usually this is the branch point, but it could also be\n"
11289
" a revision that was merged."
11290
msgstr ""
11291
11292
#: en/help_topics/revisionspec.txt:79
11293
msgid " Examples::"
11294
msgstr ""
11295
11296
#: en/help_topics/revisionspec.txt:81
11297
msgid " $ bzr diff -r submit:"
11298
msgstr ""
11299
11300
#: en/help_topics/revisionspec.txt:83
11301
msgid ":ancestor:"
11302
msgstr ""
11303
11304
#: en/help_topics/revisionspec.txt:85
11305
msgid " Supply the path to a branch to select the common ancestor."
11306
msgstr ""
11307
11308
#: en/help_topics/revisionspec.txt:91
11309
msgid ""
11310
" This is frequently used with 'diff' to return all of the changes\n"
11311
" that your branch introduces, while excluding the changes that you\n"
11312
" have not merged from the remote branch."
11313
msgstr ""
11314
11315
#: en/help_topics/revisionspec.txt:97
11316
msgid ""
11317
" ancestor:/path/to/branch\n"
11318
" $ bzr diff -r ancestor:../../mainline/branch"
11319
msgstr ""
11320
11321
#: en/help_topics/revisionspec.txt:100
11322
msgid ":date:"
11323
msgstr ""
11324
11325
#: en/help_topics/revisionspec.txt:102
11326
msgid ""
11327
" Supply a datestamp to select the first revision that matches the date.\n"
11328
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
11329
" Matches the first entry after a given date (either at midnight or\n"
11330
" at a specified time)."
11331
msgstr ""
11332
11333
#: en/help_topics/revisionspec.txt:107
11334
msgid " One way to display all the changes since yesterday would be::"
11335
msgstr ""
11336
11337
#: en/help_topics/revisionspec.txt:109
11338
msgid " bzr log -r date:yesterday.."
11339
msgstr ""
11340
11341
#: en/help_topics/revisionspec.txt:113
11342
msgid ""
11343
" date:yesterday -> select the first revision since "
11344
"yesterday\n"
11345
" date:2006-08-14,17:10:14 -> select the first revision after\n"
11346
" August 14th, 2006 at 5:10pm."
11347
msgstr ""
11348
11349
#: en/help_topics/revisionspec.txt:117
11350
msgid ":branch:"
11351
msgstr ""
11352
11353
#: en/help_topics/revisionspec.txt:119
11354
msgid " Supply the path to a branch to select its last revision."
11355
msgstr ""
11356
11357
#: en/help_topics/revisionspec.txt:123
11358
msgid " branch:/path/to/branch"
11359
msgstr ""
11360
11361
#: en/help_topics/revisionspec.txt:125
11362
msgid ":tag:"
11363
msgstr ""
11364
11365
#: en/help_topics/revisionspec.txt:127
11366
msgid " Tags are stored in the branch and created by the 'tag' command."
11367
msgstr ""
11368
11369
#: en/help_topics/revisionspec.txt:129
11370
msgid ":package:"
11371
msgstr ""
11372
11373
#: en/help_topics/revisionspec.txt:131
11374
msgid ""
11375
" Given a package version number this revision specifier will allow you\n"
11376
" specify the revision corresponding to the upload of that version of\n"
11377
" the package."
11378
msgstr ""
11379
11380
#: en/help_topics/revisionspec.txt:135
11381
msgid ":revno:"
11382
msgstr ""
11383
11384
#: en/help_topics/revisionspec.txt:137
11385
msgid ""
11386
" Use an integer to specify a revision in the history of the branch.\n"
11387
" Optionally a branch can be specified. A negative number will count\n"
11388
" from the end of the branch (-1 is the last revision, -2 the previous\n"
11389
" one). If the negative number is larger than the branch's history, the\n"
11390
" first revision is returned.\n"
11391
" Examples::"
11392
msgstr ""
11393
11394
#: en/help_topics/revisionspec.txt:144
11395
msgid ""
11396
" revno:1 -> return the first revision of this branch\n"
11397
" revno:3:/path/to/branch -> return the 3rd revision of\n"
11398
" the branch '/path/to/branch'\n"
11399
" revno:-1 -> The last revision in a branch.\n"
11400
" -2:http://other/branch -> The second to last revision in the\n"
11401
" remote branch.\n"
11402
" -1000000 -> Most likely the first revision, unless\n"
11403
" your history is very long."
11404
msgstr ""
11405
11406
#: en/help_topics/revisionspec.txt:153
11407
msgid ":before:"
11408
msgstr ""
11409
11410
#: en/help_topics/revisionspec.txt:155
11411
msgid ""
11412
" Supply any revision spec to return the parent of that revision. This "
11413
"is\n"
11414
" mostly useful when inspecting revisions that are not in the revision "
11415
"history\n"
11416
" of a branch."
11417
msgstr ""
11418
11419
#: en/help_topics/revisionspec.txt:159
11420
msgid ""
11421
" It is an error to request the parent of the null revision (before:0)."
11422
msgstr ""
11423
11424
#: en/help_topics/revisionspec.txt:163
11425
msgid ""
11426
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
11427
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
11428
" aaaa@bbbb-1234567890\n"
11429
" bzr diff -r before:1913..1913\n"
11430
" -> Find the changes between revision 1913 and its parent "
11431
"(1912).\n"
11432
" (What changes did revision 1913 introduce).\n"
11433
" This is equivalent to: bzr diff -c 1913"
11434
msgstr ""
11435
11436
#: en/help_topics/revisionspec.txt:171
11437
msgid ":annotate:"
11438
msgstr ""
11439
11440
#: en/help_topics/revisionspec.txt:173
11441
msgid ""
11442
" Select the revision that last modified the specified line. Line is\n"
11443
" specified as path:number. Path is a relative path to the file. "
11444
"Numbers\n"
11445
" start at 1, and are relative to the current version, not the last-\n"
11446
" committed version of the file."
11447
msgstr ""
11448
11449
#: en/help_topics/revisionspec.txt:178
11450
msgid ":mainline:"
11451
msgstr ""
11452
11453
#: en/help_topics/revisionspec.txt:180
11454
msgid ""
11455
" Select the revision that merged the specified revision into mainline."
11456
msgstr ""
11457
11458
#: en/help_topics/revisionspec.txt:182
11459
msgid ":last:"
11460
msgstr ""
11461
11462
#: en/help_topics/revisionspec.txt:184
11463
msgid ""
11464
" Supply a positive number to get the nth revision from the end.\n"
11465
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
11466
" Examples::"
11467
msgstr ""
11468
11469
#: en/help_topics/revisionspec.txt:188
11470
msgid ""
11471
" last:1 -> return the last revision\n"
11472
" last:3 -> return the revision 2 before the end.\n"
11473
msgstr ""
11474
11475
#: en/help_topics/rules.txt:1
11476
msgid ""
11477
"Rules\n"
11478
"====="
11479
msgstr ""
11480
11481
#: en/help_topics/rules.txt:7
11482
msgid ""
11483
"Rules are defined in ini file format where the sections are file glob\n"
11484
"patterns and the contents of each section are the preferences for files\n"
11485
"matching that pattern(s). For example::"
11486
msgstr ""
11487
11488
#: en/help_topics/rules.txt:11
11489
msgid ""
11490
" [name *.bat]\n"
11491
" eol = native"
11492
msgstr ""
11493
11494
#: en/help_topics/rules.txt:14
11495
msgid ""
11496
" [name *.html *.xml]\n"
11497
" keywords = xml_escape"
11498
msgstr ""
11499
11500
#: en/help_topics/rules.txt:17
11501
msgid ""
11502
"Preferences like these are useful for commands and plugins wishing to\n"
11503
"provide custom behaviour for selected files. For more information on \n"
11504
"end of line conversion see :doc:`eol-help`.\n"
11505
"Keyword support is provided by the `keywords plugin\n"
11506
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
11507
msgstr ""
11508
11509
#: en/help_topics/rules.txt:23
11510
msgid ""
11511
"Files\n"
11512
"-----"
11513
msgstr ""
11514
11515
#: en/help_topics/rules.txt:26
11516
msgid ""
11517
"Default rules for all branches are defined in the optional file\n"
11518
"``BZR_HOME/rules``. "
11519
msgstr ""
11520
11521
#: en/help_topics/rules.txt:29
11522
msgid ""
11523
"Rule Patterns\n"
11524
"-------------"
11525
msgstr ""
11526
11527
#: en/help_topics/rules.txt:32
11528
msgid ""
11529
"Patterns are ordered and searching stops as soon as one matches.\n"
11530
"As a consequence, more explicit patterns should be placed towards\n"
11531
"the top of the file. Rule patterns use exactly the same conventions\n"
11532
"as ignore patterns. See :doc:`patterns-help` for details."
11533
msgstr ""
11534
11535
#: en/help_topics/rules.txt:37
11536
msgid ".. note::"
11537
msgstr ""
11538
11539
#: en/help_topics/rules.txt:39
11540
msgid ""
11541
" Patterns containing square brackets or spaces should be\n"
11542
" surrounded in quotes to ensure they are correctly parsed.\n"
11543
msgstr ""
11544
11545
#: en/help_topics/topics.txt:1
11546
msgid ""
11547
"authentication Information on configuring authentication\n"
11548
"basic Basic commands\n"
11549
"branches Information on what a branch is\n"
11550
"bugs Bug tracker settings\n"
11551
"checkouts Information on what a checkout is\n"
11552
"commands Basic help for all commands\n"
11553
"configuration Details on the configuration settings available\n"
11554
"conflict-types Types of conflicts and what to do about them\n"
11555
"content-filters Conversion of content into/from working trees\n"
11556
"criss-cross Information on criss-cross merging\n"
11557
"current-formats Current storage formats\n"
11558
"debug-flags Options to show or record debug information\n"
11559
"diverged-branches How to fix diverged branches\n"
11560
"env-variables Environment variable names and values\n"
11561
"eol Information on end-of-line handling\n"
11562
"files Information on configuration and log files\n"
11563
"formats Information on choosing a storage format\n"
11564
"global-options Options that control how Bazaar runs\n"
11565
"hidden-commands All hidden commands\n"
11566
"hooks Points at which custom processing can be added\n"
11567
"launchpad Using Bazaar with Launchpad.net\n"
11568
"location-alias Aliases for remembered locations\n"
11569
"log-formats Details on the logging formats available\n"
11570
"other-formats Experimental and deprecated storage formats\n"
11571
"patterns Information on the pattern syntax\n"
11572
"repositories Basic information on shared repositories.\n"
11573
"revisionspec Explain how to use --revision\n"
11574
"rules Information on defining rule-based preferences\n"
11575
"standalone-trees Information on what a standalone tree is\n"
11576
"standard-options Options that can be used with any command\n"
11577
"status-flags Help on status flags\n"
11578
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
11579
"topics Topics list\n"
11580
"url-special-chars Special character handling in URLs\n"
11581
"urlspec Supported transport protocols\n"
11582
"working-trees Information on working trees\n"
11583
msgstr ""
11584
11585
#: en/help_topics/url-special-chars.txt:1
11586
msgid ""
11587
"Special character handling in URLs\n"
11588
"=================================="
11589
msgstr ""
11590
11591
#: en/help_topics/url-special-chars.txt:4
11592
msgid "Bazaar allows locations to be specified in multiple ways, either:"
11593
msgstr ""
11594
11595
#: en/help_topics/url-special-chars.txt:6
11596
msgid " * Fully qualified URLs"
11597
msgstr ""
11598
11599
#: en/help_topics/url-special-chars.txt:8
11600
msgid " * File system paths, relative or absolute"
11601
msgstr ""
11602
11603
#: en/help_topics/url-special-chars.txt:10
11604
msgid ""
11605
"Internally bzr treats all locations as URLs. For any file system paths\n"
11606
"that are specified it will automatically determine the appropriate URL\n"
11607
"representation, and escape special characters where necessary."
11608
msgstr ""
11609
11610
#: en/help_topics/url-special-chars.txt:14
11611
msgid ""
11612
"There are a few characters which have special meaning in URLs and need "
11613
"careful\n"
11614
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
11615
"value in URLs. Any non-ASCII characters in a file path will automatically "
11616
"be\n"
11617
"urlencoded when the path is converted to a URL."
11618
msgstr ""
11619
11620
#: en/help_topics/url-special-chars.txt:19
11621
msgid ""
11622
"URLs represent non-ASCII characters in an encoding defined by the server, "
11623
"but\n"
11624
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
11625
"be\n"
11626
"generous in what it accepts as a URL and to print them in a way that\n"
11627
"will be readable."
11628
msgstr ""
11629
11630
#: en/help_topics/url-special-chars.txt:24
11631
msgid ""
11632
"For example, if you have a directory named '/tmp/%2False' these are all "
11633
"valid\n"
11634
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
11635
"slash)::"
11636
msgstr ""
11637
11638
#: en/help_topics/url-special-chars.txt:27
11639
msgid ""
11640
" cd /tmp\n"
11641
" bzr log /tmp/%2False\n"
11642
" bzr log %2False\n"
11643
" bzr log file:///tmp/%252False\n"
11644
" bzr log file://localhost/tmp/%252False\n"
11645
" bzr log file:%252False"
11646
msgstr ""
11647
11648
#: en/help_topics/url-special-chars.txt:34
11649
msgid "These are valid but do not refer to the same file::"
11650
msgstr ""
11651
11652
#: en/help_topics/url-special-chars.txt:36
11653
msgid ""
11654
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
11655
" bzr log %252False (refers to a file called /tmp/%252False)"
11656
msgstr ""
11657
11658
#: en/help_topics/url-special-chars.txt:39
11659
msgid ""
11660
"Comma also has special meaning in URLs, because it denotes `segment "
11661
"parameters`_"
11662
msgstr ""
11663
11664
#: en/help_topics/url-special-chars.txt:41
11665
msgid ""
11666
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
11667
msgstr ""
11668
11669
#: en/help_topics/url-special-chars.txt:43
11670
msgid ""
11671
"Comma is also special in any file system paths that are specified. To use a "
11672
"literal\n"
11673
"comma in a file system path, specify a URL and URL encode the comma::"
11674
msgstr ""
11675
11676
#: en/help_topics/url-special-chars.txt:46
11677
msgid ""
11678
" bzr log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
11679
"\" set to \"bla\"\n"
11680
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
11681
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
11682
"\" set to \"bla\"\n"
11683
msgstr ""
11684
11685
#: en/help_topics/urlspec.txt:1
11686
msgid "URL Identifiers"
11687
msgstr ""
11688
11689
#: en/help_topics/urlspec.txt:3
11690
msgid "Supported URL prefixes::"
11691
msgstr ""
11692
11693
#: en/help_topics/urlspec.txt:5
11694
msgid ""
11695
" aftp:// Access using active FTP.\n"
11696
" bzr:// Fast access using the Bazaar smart server.\n"
11697
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
11698
" file:// Access using the standard filesystem (default)\n"
11699
" ftp:// Access using passive FTP.\n"
11700
" http:// Read-only access of branches exported on the web.\n"
11701
" https:// Read-only access of branches exported on the web using "
11702
"SSL.\n"
11703
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
11704
msgstr ""
11705
11706
#: en/help_topics/urlspec.txt:14
11707
msgid "Supported modifiers::"
11708
msgstr ""
11709
11710
#: en/help_topics/urlspec.txt:16
11711
msgid " gio+ Access using any GIO supported protocols."
11712
msgstr ""
11713
11714
#: en/help_topics/urlspec.txt:18
11715
msgid "Bazaar supports all of the standard parts within the URL::"
11716
msgstr ""
11717
11718
#: en/help_topics/urlspec.txt:20
11719
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
11720
msgstr ""
11721
11722
#: en/help_topics/urlspec.txt:22
11723
msgid "allowing URLs such as::"
11724
msgstr ""
11725
11726
#: en/help_topics/urlspec.txt:24
11727
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
11728
msgstr ""
11729
11730
#: en/help_topics/urlspec.txt:26
11731
msgid ""
11732
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
11733
"with '~' as meaning that the rest of the path should be interpreted\n"
11734
"relative to the remote user's home directory. For example if the user\n"
11735
"``remote`` has a home directory of ``/home/remote`` on the server\n"
11736
"shell.example.com, then::"
11737
msgstr ""
11738
11739
#: en/help_topics/urlspec.txt:32
11740
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
11741
msgstr ""
11742
11743
#: en/help_topics/urlspec.txt:34
11744
msgid "would refer to ``/home/remote/myproject/trunk``."
11745
msgstr ""
11746
11747
#: en/help_topics/urlspec.txt:36
11748
msgid ""
11749
"Many commands that accept URLs also accept location aliases too.\n"
11750
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
11751
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0