16
16
"Content-Transfer-Encoding: 8bit\n"
17
17
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
18
18
"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
19
"X-Launchpad-Export-Date: 2012-07-11 04:30+0000\n"
20
"X-Generator: Launchpad (build 15593)\n"
19
"X-Launchpad-Export-Date: 2012-02-22 06:50+0000\n"
20
"X-Generator: Launchpad (build 14838)\n"
23
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
26
#: bzrlib/branch.py:854
26
#: bzrlib/branch.py:872
30
#: bzrlib/branch.py:2955
30
#: bzrlib/branch.py:3205
32
32
msgid "Pushed up to revision %d."
35
#: bzrlib/branch.py:2957
35
#: bzrlib/branch.py:3207
37
37
msgid "%d tag updated."
38
38
msgid_plural "%d tags updated."
42
#: bzrlib/branch.py:2960
42
#: bzrlib/branch.py:3210
43
43
msgid "No new revisions or tags to push."
46
#: bzrlib/branch.py:2962
46
#: bzrlib/branch.py:3212
47
47
msgid "No new revisions to push."
50
#: bzrlib/branch.py:2982
50
#: bzrlib/branch.py:3232
51
51
msgid "checked branch {0} format {1}"
54
#: bzrlib/branch.py:2985
54
#: bzrlib/branch.py:3235
56
56
msgid "found error:%s"
59
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
59
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
61
61
msgid "Ignoring files outside view. View is %s"
64
#: bzrlib/builtins.py:260
64
#: bzrlib/builtins.py:218
66
66
msgid "bzr %s --revision takes exactly one revision identifier"
69
#: bzrlib/builtins.py:315
69
#: bzrlib/builtins.py:303
70
70
msgid "Display status summary."
73
#: bzrlib/builtins.py:317
73
#: bzrlib/builtins.py:305
75
75
"This reports on versioned and unknown files, reporting them\n"
76
76
"grouped by state. Possible states are:"
79
#: bzrlib/builtins.py:320
79
#: bzrlib/builtins.py:308
82
82
" Versioned in the working copy but not in the previous revision."
85
#: bzrlib/builtins.py:323
85
#: bzrlib/builtins.py:311
88
88
" Versioned in the previous revision but removed or deleted\n"
89
89
" in the working copy."
92
#: bzrlib/builtins.py:327
92
#: bzrlib/builtins.py:315
95
95
" Path of this file changed from the previous revision;\n"
152
152
"the no-pending option or specify a file/directory."
155
#: bzrlib/builtins.py:363
155
#: bzrlib/builtins.py:351
157
157
"To compare the working directory to a specific revision, pass a\n"
158
158
"single revision to the revision argument."
161
#: bzrlib/builtins.py:366
161
#: bzrlib/builtins.py:354
163
163
"To see which files have changed in a specific revision, or between\n"
164
164
"two revisions, pass a revision range to the revision argument.\n"
165
165
"This will produce the same results as calling 'bzr diff --summarize'."
168
#: bzrlib/builtins.py:375
168
#: bzrlib/builtins.py:363
169
169
msgid "Use short status indicators."
172
#: bzrlib/builtins.py:377
172
#: bzrlib/builtins.py:365
173
173
msgid "Only show versioned files."
176
#: bzrlib/builtins.py:379
176
#: bzrlib/builtins.py:367
177
177
msgid "Don't show pending merges."
180
#: bzrlib/builtins.py:382
180
#: bzrlib/builtins.py:370
181
181
msgid "Do not mark object type using indicator."
184
#: bzrlib/builtins.py:397
184
#: bzrlib/builtins.py:385
185
185
msgid "bzr status --revision takes exactly one or two revision specifiers"
188
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
188
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
189
189
msgid "You can only supply one of revision_id or --revision"
192
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
192
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
193
193
msgid "You must supply either --revision or a revision_id"
196
#: bzrlib/builtins.py:451
196
#: bzrlib/builtins.py:439
198
198
msgid "Repository %r does not support access to raw revision texts"
201
#: bzrlib/builtins.py:462
201
#: bzrlib/builtins.py:450
202
202
msgid "The repository {0} contains no revision {1}."
205
#: bzrlib/builtins.py:469
205
#: bzrlib/builtins.py:457
206
206
msgid "You cannot specify a NULL revision."
209
#: bzrlib/builtins.py:561
209
#: bzrlib/builtins.py:549
210
210
msgid "Remove the working tree from a given branch/checkout."
213
#: bzrlib/builtins.py:563
213
#: bzrlib/builtins.py:551
215
215
"Since a lightweight checkout is little more than a working tree\n"
216
216
"this will refuse to run against one."
219
#: bzrlib/builtins.py:566
219
#: bzrlib/builtins.py:554
220
220
msgid "To re-create the working tree, use \"bzr checkout\"."
223
#: bzrlib/builtins.py:572
223
#: bzrlib/builtins.py:560
225
225
"Remove the working tree even if it has uncommitted or shelved changes."
228
#: bzrlib/builtins.py:586
228
#: bzrlib/builtins.py:574
229
229
msgid "No working tree to remove"
232
#: bzrlib/builtins.py:588
232
#: bzrlib/builtins.py:576
233
233
msgid "You cannot remove the working tree of a remote path"
236
#: bzrlib/builtins.py:597
236
#: bzrlib/builtins.py:585
237
237
msgid "You cannot remove the working tree from a lightweight checkout"
240
#: bzrlib/builtins.py:637
240
#: bzrlib/builtins.py:625
242
242
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
243
243
"instead. Use \"--force\" if you are sure you want to reset the working tree."
246
#: bzrlib/builtins.py:648
246
#: bzrlib/builtins.py:636
248
248
", the header appears corrupt, try passing -r -1 to set the state to the last "
252
#: bzrlib/builtins.py:652
252
#: bzrlib/builtins.py:640
253
253
msgid "failed to reset the tree state{0}"
256
#: bzrlib/builtins.py:656
256
#: bzrlib/builtins.py:644
257
257
msgid "Show current revision number."
260
#: bzrlib/builtins.py:658
260
#: bzrlib/builtins.py:646
261
261
msgid "This is equal to the number of revisions on this branch."
264
#: bzrlib/builtins.py:671
264
#: bzrlib/builtins.py:659
265
265
msgid "--tree and --revision can not be used together"
268
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
268
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
269
269
msgid "Tags can only be placed on a single revision, not on a range"
272
#: bzrlib/builtins.py:712
272
#: bzrlib/builtins.py:700
273
273
msgid "Show revno of working tree."
276
#: bzrlib/builtins.py:760
276
#: bzrlib/builtins.py:748
277
277
msgid "Add specified files or directories."
280
#: bzrlib/builtins.py:762
280
#: bzrlib/builtins.py:750
282
282
"In non-recursive mode, all the named items are added, regardless\n"
283
283
"of whether they were previously ignored. A warning is given if\n"
284
284
"any of the named files are already versioned."
287
#: bzrlib/builtins.py:766
287
#: bzrlib/builtins.py:754
289
289
"In recursive mode (the default), files are treated the same way\n"
290
290
"but the behaviour for directories is different. Directories that\n"
332
332
"into a subdirectory of this one."
335
#: bzrlib/builtins.py:796
335
#: bzrlib/builtins.py:784
337
337
"Any files matching patterns in the ignore list will not be added\n"
338
338
"unless they are explicitly mentioned."
341
#: bzrlib/builtins.py:799
341
#: bzrlib/builtins.py:787
343
343
"In recursive mode, files larger than the configuration option \n"
344
344
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
348
#: bzrlib/builtins.py:806
348
#: bzrlib/builtins.py:794
349
349
msgid "Don't recursively add the contents of directories."
352
#: bzrlib/builtins.py:813
352
#: bzrlib/builtins.py:800
353
353
msgid "Lookup file ids from this tree."
356
#: bzrlib/builtins.py:849
356
#: bzrlib/builtins.py:836
357
357
msgid "ignored {0} matching \"{1}\"\n"
360
#: bzrlib/builtins.py:854
360
#: bzrlib/builtins.py:841
361
361
msgid "Create a new versioned directory."
364
#: bzrlib/builtins.py:856
364
#: bzrlib/builtins.py:843
365
365
msgid "This is equivalent to creating the directory and then adding it."
368
#: bzrlib/builtins.py:863
368
#: bzrlib/builtins.py:850
369
369
msgid "No error if existing, make parent directories as needed."
372
#: bzrlib/builtins.py:897
372
#: bzrlib/builtins.py:884
374
374
msgid "added %s\n"
377
#: bzrlib/builtins.py:939
377
#: bzrlib/builtins.py:926
379
379
msgid "invalid kind %r specified"
382
#: bzrlib/builtins.py:976
382
#: bzrlib/builtins.py:963
383
383
msgid "Move or rename a file."
386
#: bzrlib/builtins.py:978
386
#: bzrlib/builtins.py:965
387
387
msgid " bzr mv SOURCE... DESTINATION"
390
#: bzrlib/builtins.py:980
390
#: bzrlib/builtins.py:967
392
392
"If the last argument is a versioned directory, all the other names\n"
393
393
"are moved into it. Otherwise, there must be exactly two arguments\n"
394
394
"and the file is changed to a new name."
397
#: bzrlib/builtins.py:984
397
#: bzrlib/builtins.py:971
399
399
"If OLDNAME does not exist on the filesystem but is versioned and\n"
400
400
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
403
403
"The same is valid when moving many SOURCE files to a DESTINATION."
406
#: bzrlib/builtins.py:990
406
#: bzrlib/builtins.py:977
407
407
msgid "Files cannot be moved between branches."
410
#: bzrlib/builtins.py:997
410
#: bzrlib/builtins.py:984
412
412
"Move only the bzr identifier of the file, because the file has already been "
416
#: bzrlib/builtins.py:999
416
#: bzrlib/builtins.py:986
417
417
msgid "Automatically guess renames."
420
#: bzrlib/builtins.py:1000
420
#: bzrlib/builtins.py:987
421
421
msgid "Avoid making changes when guessing renames."
424
#: bzrlib/builtins.py:1009
424
#: bzrlib/builtins.py:996
425
425
msgid "--dry-run requires --auto."
428
#: bzrlib/builtins.py:1013
428
#: bzrlib/builtins.py:1000
429
429
msgid "missing file argument"
432
#: bzrlib/builtins.py:1017
432
#: bzrlib/builtins.py:1004
433
433
msgid "can not move root of branch"
436
#: bzrlib/builtins.py:1023
436
#: bzrlib/builtins.py:1010
437
437
msgid "Only one path may be specified to --auto."
440
#: bzrlib/builtins.py:1026
440
#: bzrlib/builtins.py:1013
441
441
msgid "--after cannot be specified with --auto."
444
#: bzrlib/builtins.py:1062
444
#: bzrlib/builtins.py:1050
445
445
msgid "to mv multiple files the destination must be a versioned directory"
448
#: bzrlib/builtins.py:1114
448
#: bzrlib/builtins.py:1102
449
449
msgid "Turn this branch into a mirror of another branch."
452
#: bzrlib/builtins.py:1116
452
#: bzrlib/builtins.py:1104
454
454
"By default, this command only works on branches that have not diverged.\n"
455
455
"Branches are considered diverged if the destination branch's most recent \n"
479
479
"value will only be saved if the remote location can be accessed."
482
#: bzrlib/builtins.py:1134
482
#: bzrlib/builtins.py:1122
484
484
"The --verbose option will display the revisions pulled using the log_format\n"
485
485
"configuration option. You can use a different format by overriding it with\n"
486
486
"-Olog_format=<other_format>."
489
#: bzrlib/builtins.py:1138
489
#: bzrlib/builtins.py:1126
491
491
"Note: The location can be specified either in the form of a branch,\n"
492
492
"or in the form of a path to a file containing a merge directive generated\n"
496
#: bzrlib/builtins.py:1146
496
#: bzrlib/builtins.py:1134
497
497
msgid "Show logs of pulled revisions."
500
#: bzrlib/builtins.py:1148
500
#: bzrlib/builtins.py:1136
502
502
"Branch to pull into, rather than the one containing the working directory."
505
#: bzrlib/builtins.py:1151
505
#: bzrlib/builtins.py:1139
507
507
"Perform a local pull in a bound branch. Local pulls are not applied to the "
511
#: bzrlib/builtins.py:1189
511
#: bzrlib/builtins.py:1168
512
512
msgid "Need working tree for --show-base."
515
#: bzrlib/builtins.py:1205
515
#: bzrlib/builtins.py:1184
516
516
msgid "No pull location known or specified."
519
#: bzrlib/builtins.py:1211
519
#: bzrlib/builtins.py:1190
521
521
msgid "Using saved parent location: %s\n"
524
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
524
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
525
525
msgid "Cannot use -r with merge directives or bundles"
528
#: bzrlib/builtins.py:1261
528
#: bzrlib/builtins.py:1238
529
529
msgid "Update a mirror of this branch."
532
#: bzrlib/builtins.py:1263
532
#: bzrlib/builtins.py:1240
534
534
"The target branch will not have its working tree populated because this\n"
535
535
"is both expensive, and is not supported on remote file systems."
538
#: bzrlib/builtins.py:1266
538
#: bzrlib/builtins.py:1243
540
540
"Some smart servers or protocols *may* put the working tree in place in\n"
544
#: bzrlib/builtins.py:1269
544
#: bzrlib/builtins.py:1246
546
546
"This command only works on branches that have not diverged. Branches are\n"
547
547
"considered diverged if the destination branch's most recent commit is one\n"
548
548
"that has not been merged (directly or indirectly) by the source branch."
551
#: bzrlib/builtins.py:1273
551
#: bzrlib/builtins.py:1250
553
553
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
554
554
"the other branch completely, discarding its unmerged changes."
557
#: bzrlib/builtins.py:1276
557
#: bzrlib/builtins.py:1253
559
559
"If you want to ensure you have the different changes in the other branch,\n"
560
560
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
561
561
"After that you will be able to do a push without '--overwrite'."
564
#: bzrlib/builtins.py:1280
564
#: bzrlib/builtins.py:1257
566
566
"If there is no default push location set, the first push will set it (use\n"
567
567
"--no-remember to avoid setting it). After that, you can omit the\n"
569
569
"value will only be saved if the remote location can be accessed."
572
#: bzrlib/builtins.py:1285
572
#: bzrlib/builtins.py:1262
574
574
"The --verbose option will display the revisions pushed using the log_format\n"
575
575
"configuration option. You can use a different format by overriding it with\n"
576
576
"-Olog_format=<other_format>."
579
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
579
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
581
581
"Branch to push from, rather than the one containing the working directory."
584
#: bzrlib/builtins.py:1299
584
#: bzrlib/builtins.py:1276
586
586
"By default push will fail if the target directory exists, but does not "
587
587
"already have a control directory. This flag will allow push to proceed."
590
#: bzrlib/builtins.py:1304
590
#: bzrlib/builtins.py:1281
592
592
"Create a stacked branch that references the public location of the parent "
596
#: bzrlib/builtins.py:1307
596
#: bzrlib/builtins.py:1284
598
598
"Create a stacked branch that refers to another branch for the commit "
599
599
"history. Only the work not present in the referenced branch is included in "
600
600
"the branch created."
603
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
603
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
605
605
"Refuse to push if there are uncommitted changes in the working tree, --no-"
606
606
"strict disables the check."
609
#: bzrlib/builtins.py:1315
609
#: bzrlib/builtins.py:1292
610
610
msgid "Don't populate the working tree, even for protocols that support it."
613
#: bzrlib/builtins.py:1318
614
msgid "Overwrite tags only."
617
#: bzrlib/builtins.py:1369
613
#: bzrlib/builtins.py:1336
618
614
msgid "Could not determine branch to refer to."
621
#: bzrlib/builtins.py:1378
617
#: bzrlib/builtins.py:1345
624
620
"No push location known or specified. To push to the parent branch (at %s), "
625
621
"use 'bzr push :parent'."
628
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
624
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
629
625
msgid "No push location known or specified."
632
#: bzrlib/builtins.py:1388
628
#: bzrlib/builtins.py:1355
634
630
msgid "Using saved push location: %s"
637
#: bzrlib/builtins.py:1398
633
#: bzrlib/builtins.py:1365
638
634
msgid "Create a new branch that is a copy of an existing branch."
641
#: bzrlib/builtins.py:1400
637
#: bzrlib/builtins.py:1367
643
639
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
644
640
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
649
645
"create ./foo-bar."
652
#: bzrlib/builtins.py:1407
648
#: bzrlib/builtins.py:1374
654
650
"To retrieve the branch as of a particular revision, supply the --revision\n"
655
651
"parameter, as in \"branch foo/bar -r 5\"."
658
#: bzrlib/builtins.py:1410
654
#: bzrlib/builtins.py:1377
659
655
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
662
#: bzrlib/builtins.py:1420
658
#: bzrlib/builtins.py:1387
663
659
msgid "Create a branch without a working-tree."
666
#: bzrlib/builtins.py:1422
662
#: bzrlib/builtins.py:1389
667
663
msgid "Switch the checkout in the current directory to the new branch."
670
#: bzrlib/builtins.py:1425
666
#: bzrlib/builtins.py:1392
672
668
"Create a stacked branch referring to the source branch. The new branch will "
673
669
"depend on the availability of the source branch for all operations."
676
#: bzrlib/builtins.py:1429
672
#: bzrlib/builtins.py:1396
677
673
msgid "Do not use a shared repository, even if available."
680
#: bzrlib/builtins.py:1431
676
#: bzrlib/builtins.py:1398
682
678
"By default branch will fail if the target directory exists, but does not "
683
679
"already have a control directory. This flag will allow branch to proceed."
686
#: bzrlib/builtins.py:1436
682
#: bzrlib/builtins.py:1403
687
683
msgid "Bind new branch to from location."
690
#: bzrlib/builtins.py:1483
686
#: bzrlib/builtins.py:1450
692
688
msgid "Target directory \"%s\" already exists."
695
#: bzrlib/builtins.py:1495
691
#: bzrlib/builtins.py:1462
697
693
msgid "Parent of \"%s\" does not exist."
700
#: bzrlib/builtins.py:1514
696
#: bzrlib/builtins.py:1481
701
697
msgid "The branch {0} has no revision {1}."
704
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
700
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
706
702
msgid "Created new stacked branch referring to %s."
709
#: bzrlib/builtins.py:1533
705
#: bzrlib/builtins.py:1500
711
707
msgid "Branched %d revision."
712
708
msgid_plural "Branched %d revisions."
716
#: bzrlib/builtins.py:1538
712
#: bzrlib/builtins.py:1505
718
714
msgid "New branch bound to %s"
721
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
717
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
723
719
msgid "Switched to branch: %s"
726
#: bzrlib/builtins.py:1548
722
#: bzrlib/builtins.py:1515
727
723
msgid "List the branches available at the current location."
730
#: bzrlib/builtins.py:1550
726
#: bzrlib/builtins.py:1517
732
728
"This command will print the names of all the branches at the current\n"
736
#: bzrlib/builtins.py:1557
732
#: bzrlib/builtins.py:1524
738
734
"Recursively scan for branches rather than just looking in the specified "
742
#: bzrlib/builtins.py:1586
738
#: bzrlib/builtins.py:1554
743
739
msgid "(default)"
746
#: bzrlib/builtins.py:1598
742
#: bzrlib/builtins.py:1566
747
743
msgid "Create a new checkout of an existing branch."
750
#: bzrlib/builtins.py:1600
746
#: bzrlib/builtins.py:1568
752
748
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
842
838
"out the old content of that file to a new location."
845
#: bzrlib/builtins.py:1724
841
#: bzrlib/builtins.py:1694
847
843
"The 'dir' argument, if given, must be the location of the root of a\n"
848
844
"working tree to update. By default, the working tree that contains the \n"
849
845
"current working directory is used."
852
#: bzrlib/builtins.py:1740
848
#: bzrlib/builtins.py:1710
853
849
msgid "bzr update --revision takes exactly one revision"
856
#: bzrlib/builtins.py:1748
852
#: bzrlib/builtins.py:1718
857
853
msgid "bzr update can only update a whole tree, not a file or subdirectory"
860
#: bzrlib/builtins.py:1779
856
#: bzrlib/builtins.py:1749
861
857
msgid "Tree is up to date at revision {0} of branch {1}"
864
#: bzrlib/builtins.py:1795
860
#: bzrlib/builtins.py:1765
867
863
"branch has no revision %s\n"
868
864
"bzr update --revision only works for a revision in the branch history"
871
#: bzrlib/builtins.py:1801
867
#: bzrlib/builtins.py:1771
872
868
msgid "Updated to revision {0} of branch {1}"
875
#: bzrlib/builtins.py:1805
871
#: bzrlib/builtins.py:1775
877
873
"Your local commits will now show as pending merges with 'bzr status', and "
878
874
"can be committed with 'bzr commit'."
881
#: bzrlib/builtins.py:1814
877
#: bzrlib/builtins.py:1784
882
878
msgid "Show information about a working tree, branch or repository."
885
#: bzrlib/builtins.py:1816
881
#: bzrlib/builtins.py:1786
887
883
"This command will show all known locations and formats associated to the\n"
888
884
"tree, branch or repository."
891
#: bzrlib/builtins.py:1819
887
#: bzrlib/builtins.py:1789
893
889
"In verbose mode, statistical information is included with each report.\n"
894
890
"To see extended statistic information, use a verbosity level of 2 or\n"
895
891
"higher by specifying the verbose option multiple times, e.g. -vv."
898
#: bzrlib/builtins.py:1823
894
#: bzrlib/builtins.py:1793
899
895
msgid "Branches and working trees will also report any missing revisions."
902
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
903
#: bzrlib/builtins.py:6466
898
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
899
#: bzrlib/builtins.py:6442
904
900
msgid ":Examples:"
907
#: bzrlib/builtins.py:1827
903
#: bzrlib/builtins.py:1797
908
904
msgid " Display information on the format and related locations:"
911
#: bzrlib/builtins.py:1829
907
#: bzrlib/builtins.py:1799
912
908
msgid " bzr info"
915
#: bzrlib/builtins.py:1831
911
#: bzrlib/builtins.py:1801
917
913
" Display the above together with extended format information and\n"
918
914
" basic statistics (like the number of files in the working tree and\n"
919
915
" number of revisions in the branch and repository):"
922
#: bzrlib/builtins.py:1835
918
#: bzrlib/builtins.py:1805
923
919
msgid " bzr info -v"
926
#: bzrlib/builtins.py:1837
922
#: bzrlib/builtins.py:1807
927
923
msgid " Display the above together with number of committers to the branch:"
930
#: bzrlib/builtins.py:1839
926
#: bzrlib/builtins.py:1809
931
927
msgid " bzr info -vv"
934
#: bzrlib/builtins.py:1858
930
#: bzrlib/builtins.py:1828
935
931
msgid "Remove files or directories."
938
#: bzrlib/builtins.py:1860
934
#: bzrlib/builtins.py:1830
940
936
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
941
937
"delete them if they can easily be recovered using revert otherwise they\n"
942
"will be backed up (adding an extension of the form .~#~). If no options or\n"
938
"will be backed up (adding an extention of the form .~#~). If no options or\n"
943
939
"parameters are given Bazaar will scan for files that are being tracked by\n"
944
940
"Bazaar but missing in your tree and stop tracking them for you."
947
#: bzrlib/builtins.py:1868
943
#: bzrlib/builtins.py:1838
948
944
msgid "Only remove files that have never been committed."
951
#: bzrlib/builtins.py:1870
947
#: bzrlib/builtins.py:1840
952
948
msgid "The file deletion mode to be used."
955
#: bzrlib/builtins.py:1871
951
#: bzrlib/builtins.py:1841
956
952
msgid "Deletion Strategy"
959
#: bzrlib/builtins.py:1872
955
#: bzrlib/builtins.py:1842
960
956
msgid "Backup changed files (default)."
963
#: bzrlib/builtins.py:1873
959
#: bzrlib/builtins.py:1843
964
960
msgid "Delete from bzr but leave the working copy."
967
#: bzrlib/builtins.py:1874
963
#: bzrlib/builtins.py:1844
968
964
msgid "Don't backup changed files."
971
#: bzrlib/builtins.py:1875
967
#: bzrlib/builtins.py:1845
973
969
"Delete all the specified files, even if they can not be recovered and even "
974
970
"if they are non-empty directories. (deprecated, use no-backup)"
977
#: bzrlib/builtins.py:1884
973
#: bzrlib/builtins.py:1854
978
974
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
981
#: bzrlib/builtins.py:1901
977
#: bzrlib/builtins.py:1871
982
978
msgid "No matching files."
985
#: bzrlib/builtins.py:1962
981
#: bzrlib/builtins.py:1932
986
982
msgid "Reconcile bzr metadata in a branch."
989
#: bzrlib/builtins.py:1964
985
#: bzrlib/builtins.py:1934
991
987
"This can correct data mismatches that may have been caused by\n"
992
988
"previous ghost operations or bzr upgrades. You should only\n"
1066
1062
" bzr commit -m \"imported project\""
1069
#: bzrlib/builtins.py:2071
1065
#: bzrlib/builtins.py:2041
1071
1067
"Create the path leading up to the branch if it does not already exist."
1074
#: bzrlib/builtins.py:2074
1070
#: bzrlib/builtins.py:2044
1075
1071
msgid "Specify a format for this branch. See \"help formats\"."
1078
#: bzrlib/builtins.py:2082
1074
#: bzrlib/builtins.py:2052
1080
1076
"Never change revnos or the existing log. Append revisions to it only."
1083
#: bzrlib/builtins.py:2085
1079
#: bzrlib/builtins.py:2055
1084
1080
msgid "Create a branch without a working tree."
1087
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1083
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1088
1084
#, python-format
1090
1086
"Parent directory of %s does not exist.\n"
1091
1087
"You may supply --create-prefix to create all leading parent directories."
1094
#: bzrlib/builtins.py:2139
1090
#: bzrlib/builtins.py:2109
1096
1092
"This branch format cannot be set to append-revisions-only. Try --default."
1099
#: bzrlib/builtins.py:2150
1095
#: bzrlib/builtins.py:2120
1100
1096
msgid "Created a {0} (format: {1})\n"
1103
#: bzrlib/builtins.py:2159
1099
#: bzrlib/builtins.py:2129
1104
1100
#, python-format
1105
1101
msgid "Using shared repository: %s\n"
1108
#: bzrlib/builtins.py:2163
1104
#: bzrlib/builtins.py:2133
1109
1105
msgid "Create a shared repository for branches to share storage space."
1112
#: bzrlib/builtins.py:2165
1108
#: bzrlib/builtins.py:2135
1114
1110
"New branches created under the repository directory will store their\n"
1115
1111
"revisions in the repository, not in the branch directory. For branches\n"
1202
1198
" 0 - no change"
1205
#: bzrlib/builtins.py:2250
1201
#: bzrlib/builtins.py:2220
1208
1204
" Shows the difference in the working tree versus the last commit::"
1211
#: bzrlib/builtins.py:2253
1207
#: bzrlib/builtins.py:2223
1212
1208
msgid " bzr diff"
1215
#: bzrlib/builtins.py:2255
1211
#: bzrlib/builtins.py:2225
1216
1212
msgid " Difference between the working tree and revision 1::"
1219
#: bzrlib/builtins.py:2257
1215
#: bzrlib/builtins.py:2227
1220
1216
msgid " bzr diff -r1"
1223
#: bzrlib/builtins.py:2259
1219
#: bzrlib/builtins.py:2229
1224
1220
msgid " Difference between revision 3 and revision 1::"
1227
#: bzrlib/builtins.py:2261
1223
#: bzrlib/builtins.py:2231
1228
1224
msgid " bzr diff -r1..3"
1231
#: bzrlib/builtins.py:2263
1227
#: bzrlib/builtins.py:2233
1232
1228
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1235
#: bzrlib/builtins.py:2265
1231
#: bzrlib/builtins.py:2235
1236
1232
msgid " bzr diff -r1..3 xxx"
1239
#: bzrlib/builtins.py:2267
1235
#: bzrlib/builtins.py:2237
1240
1236
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1243
#: bzrlib/builtins.py:2269
1239
#: bzrlib/builtins.py:2239
1244
1240
msgid " bzr diff -c2"
1247
#: bzrlib/builtins.py:2271
1243
#: bzrlib/builtins.py:2241
1249
1245
" To see the changes introduced by revision X::\n"
1251
1247
" bzr diff -cX"
1254
#: bzrlib/builtins.py:2275
1250
#: bzrlib/builtins.py:2245
1256
1252
" Note that in the case of a merge, the -c option shows the changes\n"
1257
1253
" compared to the left hand parent. To see the changes against\n"
1258
1254
" another parent, use::"
1261
#: bzrlib/builtins.py:2279
1257
#: bzrlib/builtins.py:2249
1262
1258
msgid " bzr diff -r<chosen_parent>..X"
1265
#: bzrlib/builtins.py:2281
1261
#: bzrlib/builtins.py:2251
1267
1263
" The changes between the current revision and the previous revision\n"
1268
1264
" (equivalent to -c-1 and -r-2..-1)"
1271
#: bzrlib/builtins.py:2284
1267
#: bzrlib/builtins.py:2254
1272
1268
msgid " bzr diff -r-2.."
1275
#: bzrlib/builtins.py:2286
1271
#: bzrlib/builtins.py:2256
1276
1272
msgid " Show just the differences for file NEWS::"
1279
#: bzrlib/builtins.py:2288
1275
#: bzrlib/builtins.py:2258
1280
1276
msgid " bzr diff NEWS"
1283
#: bzrlib/builtins.py:2290
1279
#: bzrlib/builtins.py:2260
1284
1280
msgid " Show the differences in working tree xxx for file NEWS::"
1287
#: bzrlib/builtins.py:2292
1283
#: bzrlib/builtins.py:2262
1288
1284
msgid " bzr diff xxx/NEWS"
1291
#: bzrlib/builtins.py:2294
1287
#: bzrlib/builtins.py:2264
1292
1288
msgid " Show the differences from branch xxx to this working tree:"
1295
#: bzrlib/builtins.py:2296
1291
#: bzrlib/builtins.py:2266
1296
1292
msgid " bzr diff --old xxx"
1299
#: bzrlib/builtins.py:2298
1295
#: bzrlib/builtins.py:2268
1300
1296
msgid " Show the differences between two branches for file NEWS::"
1303
#: bzrlib/builtins.py:2300
1299
#: bzrlib/builtins.py:2270
1304
1300
msgid " bzr diff --old xxx --new yyy NEWS"
1307
#: bzrlib/builtins.py:2302
1303
#: bzrlib/builtins.py:2272
1308
1304
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1311
#: bzrlib/builtins.py:2304
1307
#: bzrlib/builtins.py:2274
1313
1309
" bzr diff --prefix old/:new/\n"
1317
1313
" bzr diff --using /usr/bin/diff --diff-options -wu"
1320
#: bzrlib/builtins.py:2314
1316
#: bzrlib/builtins.py:2284
1321
1317
msgid "Pass these options to the external diff program."
1324
#: bzrlib/builtins.py:2317
1320
#: bzrlib/builtins.py:2287
1326
1322
"Set prefixes added to old and new filenames, as two values separated by a "
1327
1323
"colon. (eg \"old/:new/\")."
1330
#: bzrlib/builtins.py:2320
1326
#: bzrlib/builtins.py:2290
1331
1327
msgid "Branch/tree to compare from."
1334
#: bzrlib/builtins.py:2324
1330
#: bzrlib/builtins.py:2294
1335
1331
msgid "Branch/tree to compare to."
1338
#: bzrlib/builtins.py:2330
1334
#: bzrlib/builtins.py:2300
1339
1335
msgid "Use this command to compare files."
1342
#: bzrlib/builtins.py:2335
1338
#: bzrlib/builtins.py:2305
1343
1339
msgid "Diff format to use."
1346
#: bzrlib/builtins.py:2337
1342
#: bzrlib/builtins.py:2307
1347
1343
msgid "Diff format"
1350
#: bzrlib/builtins.py:2359
1346
#: bzrlib/builtins.py:2329
1351
1347
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1354
#: bzrlib/builtins.py:2363
1350
#: bzrlib/builtins.py:2333
1355
1351
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1358
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1359
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1354
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1355
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1360
1356
msgid "{0} and {1} are mutually exclusive"
1363
#: bzrlib/builtins.py:2388
1359
#: bzrlib/builtins.py:2358
1365
1361
"List files deleted in the working tree.\n"
1369
#: bzrlib/builtins.py:2465
1365
#: bzrlib/builtins.py:2436
1370
1366
msgid "Show the tree root directory."
1373
#: bzrlib/builtins.py:2467
1369
#: bzrlib/builtins.py:2438
1375
1371
"The root is the nearest enclosing directory with a .bzr control\n"
1379
#: bzrlib/builtins.py:2482
1375
#: bzrlib/builtins.py:2453
1380
1376
msgid "The limit argument must be an integer."
1383
#: bzrlib/builtins.py:2490
1379
#: bzrlib/builtins.py:2461
1384
1380
msgid "The levels argument must be an integer."
1387
#: bzrlib/builtins.py:2495
1383
#: bzrlib/builtins.py:2466
1388
1384
msgid "Show historical log for a branch or subset of a branch."
1391
#: bzrlib/builtins.py:2497
1387
#: bzrlib/builtins.py:2468
1393
1389
"log is bzr's default tool for exploring the history of a branch.\n"
1394
1390
"The branch to use is taken from the first parameter. If no parameters\n"
1510
1506
" a nested merge revision and the log will be truncated accordingly."
1513
#: bzrlib/builtins.py:2571
1509
#: bzrlib/builtins.py:2542
1514
1510
msgid ":Path filtering:"
1517
#: bzrlib/builtins.py:2573
1513
#: bzrlib/builtins.py:2544
1519
1515
" If parameters are given and the first one is not a branch, the log\n"
1520
1516
" will be filtered to show only those revisions that changed the\n"
1521
1517
" nominated files or directories."
1524
#: bzrlib/builtins.py:2577
1520
#: bzrlib/builtins.py:2548
1526
1522
" Filenames are interpreted within their historical context. To log a\n"
1527
1523
" deleted file, specify a revision range so that the file existed at\n"
1528
1524
" the end or start of the range."
1531
#: bzrlib/builtins.py:2581
1527
#: bzrlib/builtins.py:2552
1533
1529
" Historical context is also important when interpreting pathnames of\n"
1534
1530
" renamed files/directories. Consider the following example:"
1537
#: bzrlib/builtins.py:2584
1533
#: bzrlib/builtins.py:2555
1539
1535
" * revision 1: add tutorial.txt\n"
1540
1536
" * revision 2: modify tutorial.txt\n"
1541
1537
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1544
#: bzrlib/builtins.py:2588
1540
#: bzrlib/builtins.py:2559
1545
1541
msgid " In this case:"
1548
#: bzrlib/builtins.py:2590
1544
#: bzrlib/builtins.py:2561
1549
1545
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1552
#: bzrlib/builtins.py:2592
1548
#: bzrlib/builtins.py:2563
1554
1550
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1557
#: bzrlib/builtins.py:2594
1553
#: bzrlib/builtins.py:2565
1559
1555
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1560
1556
" the original file in revision 2."
1563
#: bzrlib/builtins.py:2597
1559
#: bzrlib/builtins.py:2568
1565
1561
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1566
1562
" was no file called guide.txt in revision 2."
1569
#: bzrlib/builtins.py:2600
1565
#: bzrlib/builtins.py:2571
1571
1567
" Renames are always followed by log. By design, there is no need to\n"
1572
1568
" explicitly ask for this (and no way to stop logging a file back\n"
1573
1569
" until it was last renamed)."
1576
#: bzrlib/builtins.py:2604
1572
#: bzrlib/builtins.py:2575
1577
1573
msgid ":Other filtering:"
1580
#: bzrlib/builtins.py:2606
1576
#: bzrlib/builtins.py:2577
1582
1578
" The --match option can be used for finding revisions that match a\n"
1583
1579
" regular expression in a commit message, committer, author or bug.\n"
1649
1645
" trading disk space for faster speed."
1652
#: bzrlib/builtins.py:2653
1648
#: bzrlib/builtins.py:2624
1653
1649
msgid "Show from oldest to newest."
1656
#: bzrlib/builtins.py:2656
1652
#: bzrlib/builtins.py:2627
1657
1653
msgid "Show files changed in each revision."
1660
#: bzrlib/builtins.py:2662
1656
#: bzrlib/builtins.py:2633
1661
1657
msgid "Show just the specified revision. See also \"help revisionspec\"."
1664
#: bzrlib/builtins.py:2666
1660
#: bzrlib/builtins.py:2637
1665
1661
msgid "What names to list as authors - first, all or committer."
1668
#: bzrlib/builtins.py:2667
1664
#: bzrlib/builtins.py:2638
1669
1665
msgid "Authors"
1672
#: bzrlib/builtins.py:2672
1668
#: bzrlib/builtins.py:2643
1673
1669
msgid "Number of levels to display - 0 for all, 1 for flat."
1676
#: bzrlib/builtins.py:2682
1672
#: bzrlib/builtins.py:2653
1677
1673
msgid "Limit the output to the first N revisions."
1680
#: bzrlib/builtins.py:2687
1676
#: bzrlib/builtins.py:2658
1681
1677
msgid "Show changes made in each revision as a patch."
1684
#: bzrlib/builtins.py:2689
1680
#: bzrlib/builtins.py:2660
1685
1681
msgid "Show merged revisions like --levels 0 does."
1688
#: bzrlib/builtins.py:2693
1684
#: bzrlib/builtins.py:2664
1689
1685
msgid "Do not report commits with more than one parent."
1692
#: bzrlib/builtins.py:2695
1688
#: bzrlib/builtins.py:2666
1694
1690
"Display only the revisions that are not part of both ancestries (require -"
1698
#: bzrlib/builtins.py:2699
1694
#: bzrlib/builtins.py:2670
1699
1695
msgid "Show digital signature validity."
1702
#: bzrlib/builtins.py:2702
1698
#: bzrlib/builtins.py:2673
1703
1699
msgid "Show revisions whose properties match this expression."
1706
#: bzrlib/builtins.py:2706
1702
#: bzrlib/builtins.py:2677
1707
1703
msgid "Show revisions whose message matches this expression."
1710
#: bzrlib/builtins.py:2710
1706
#: bzrlib/builtins.py:2681
1711
1707
msgid "Show revisions whose committer matches this expression."
1714
#: bzrlib/builtins.py:2714
1710
#: bzrlib/builtins.py:2685
1715
1711
msgid "Show revisions whose authors match this expression."
1718
#: bzrlib/builtins.py:2718
1714
#: bzrlib/builtins.py:2689
1719
1715
msgid "Show revisions whose bugs match this expression."
1722
#: bzrlib/builtins.py:2772
1718
#: bzrlib/builtins.py:2743
1723
1719
msgid "--exclude-common-ancestry requires -r with two revisions"
1726
#: bzrlib/builtins.py:2800
1722
#: bzrlib/builtins.py:2771
1727
1723
#, python-format
1728
1724
msgid "Path unknown at end or start of revision range: %s"
1731
#: bzrlib/builtins.py:2917
1727
#: bzrlib/builtins.py:2888
1732
1728
#, python-format
1733
1729
msgid "bzr %s doesn't accept two revisions in different branches."
1736
#: bzrlib/builtins.py:2933
1732
#: bzrlib/builtins.py:2904
1737
1733
#, python-format
1738
1734
msgid "bzr %s --revision takes one or two values."
1741
#: bzrlib/builtins.py:2978
1737
#: bzrlib/builtins.py:2949
1743
1739
"List files in a tree.\n"
1747
#: bzrlib/builtins.py:2987
1743
#: bzrlib/builtins.py:2958
1748
1744
msgid "Recurse into subdirectories."
1751
#: bzrlib/builtins.py:2989
1747
#: bzrlib/builtins.py:2960
1752
1748
msgid "Print paths relative to the root of the branch."
1755
#: bzrlib/builtins.py:2991
1751
#: bzrlib/builtins.py:2962
1756
1752
msgid "Print unknown files."
1759
#: bzrlib/builtins.py:2992
1755
#: bzrlib/builtins.py:2963
1760
1756
msgid "Print versioned files."
1763
#: bzrlib/builtins.py:2995
1759
#: bzrlib/builtins.py:2966
1764
1760
msgid "Print ignored files."
1767
#: bzrlib/builtins.py:2997
1763
#: bzrlib/builtins.py:2968
1768
1764
msgid "List entries of a particular kind: file, directory, symlink."
1771
#: bzrlib/builtins.py:3010
1767
#: bzrlib/builtins.py:2981
1772
1768
msgid "invalid kind specified"
1775
#: bzrlib/builtins.py:3013
1771
#: bzrlib/builtins.py:2984
1776
1772
msgid "Cannot set both --verbose and --null"
1779
#: bzrlib/builtins.py:3022
1775
#: bzrlib/builtins.py:2993
1780
1776
msgid "cannot specify both --from-root and PATH"
1783
#: bzrlib/builtins.py:3109
1779
#: bzrlib/builtins.py:3080
1784
1780
msgid "Ignore specified files or patterns."
1787
#: bzrlib/builtins.py:3111
1783
#: bzrlib/builtins.py:3082
1788
1784
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1791
#: bzrlib/builtins.py:3113
1787
#: bzrlib/builtins.py:3084
1793
1789
"If a .bzrignore file does not exist, the ignore command\n"
1794
1790
"will create one and add the specified files or patterns to the newly\n"
1835
1831
" the shell on Unix."
1838
#: bzrlib/builtins.py:3142
1834
#: bzrlib/builtins.py:3113
1840
1836
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1841
1837
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1844
#: bzrlib/builtins.py:3145
1840
#: bzrlib/builtins.py:3116
1847
1843
" Ignore the top level Makefile::"
1850
#: bzrlib/builtins.py:3148
1846
#: bzrlib/builtins.py:3119
1851
1847
msgid " bzr ignore ./Makefile"
1854
#: bzrlib/builtins.py:3150
1850
#: bzrlib/builtins.py:3121
1855
1851
msgid " Ignore .class files in all directories...::"
1858
#: bzrlib/builtins.py:3152
1854
#: bzrlib/builtins.py:3123
1859
1855
msgid " bzr ignore \"*.class\""
1862
#: bzrlib/builtins.py:3154
1858
#: bzrlib/builtins.py:3125
1863
1859
msgid " ...but do not ignore \"special.class\"::"
1866
#: bzrlib/builtins.py:3156
1862
#: bzrlib/builtins.py:3127
1867
1863
msgid " bzr ignore \"!special.class\""
1870
#: bzrlib/builtins.py:3158
1866
#: bzrlib/builtins.py:3129
1871
1867
msgid " Ignore files whose name begins with the \"#\" character::"
1874
#: bzrlib/builtins.py:3160
1870
#: bzrlib/builtins.py:3131
1875
1871
msgid " bzr ignore \"RE:^#\""
1878
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1874
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1879
1875
msgid " Ignore .o files under the lib directory::"
1882
#: bzrlib/builtins.py:3164
1878
#: bzrlib/builtins.py:3135
1883
1879
msgid " bzr ignore \"lib/**/*.o\""
1886
#: bzrlib/builtins.py:3168
1882
#: bzrlib/builtins.py:3139
1887
1883
msgid " bzr ignore \"RE:lib/.*\\.o\""
1890
#: bzrlib/builtins.py:3170
1886
#: bzrlib/builtins.py:3141
1891
1887
msgid " Ignore everything but the \"debian\" toplevel directory::"
1894
#: bzrlib/builtins.py:3172
1890
#: bzrlib/builtins.py:3143
1896
1892
" bzr ignore \"RE:(?!debian/).*\"\n"
1935
#: bzrlib/builtins.py:3238
1931
#: bzrlib/builtins.py:3209
1936
1932
msgid "List ignored files and the patterns that matched them."
1939
#: bzrlib/builtins.py:3240
1935
#: bzrlib/builtins.py:3211
1941
1937
"List all the ignored files and the ignore pattern that caused the file to\n"
1945
#: bzrlib/builtins.py:3243
1941
#: bzrlib/builtins.py:3214
1946
1942
msgid "Alternatively, to list just the files::"
1949
#: bzrlib/builtins.py:3245
1945
#: bzrlib/builtins.py:3216
1950
1946
msgid " bzr ls --ignored"
1953
#: bzrlib/builtins.py:3279
1949
#: bzrlib/builtins.py:3250
1954
1950
#, python-format
1955
1951
msgid "not a valid revision-number: %r"
1958
#: bzrlib/builtins.py:3286
1954
#: bzrlib/builtins.py:3257
1960
1956
"Export current or past revision to a destination directory or archive."
1963
#: bzrlib/builtins.py:3288
1959
#: bzrlib/builtins.py:3259
1964
1960
msgid "If no revision is specified this exports the last committed revision."
1967
#: bzrlib/builtins.py:3290
1963
#: bzrlib/builtins.py:3261
1969
1965
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1970
1966
"given, try to find the format with the extension. If no extension\n"
1971
1967
"is found exports to a directory (equivalent to --format=dir)."
1974
#: bzrlib/builtins.py:3294
1970
#: bzrlib/builtins.py:3265
1976
1972
"If root is supplied, it will be used as the root directory inside\n"
1977
1973
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1978
1974
"to the exported filename. The root option has no effect for 'dir' format."
1981
#: bzrlib/builtins.py:3298
1977
#: bzrlib/builtins.py:3269
1983
1979
"If branch is omitted then the branch containing the current working\n"
1984
1980
"directory will be used."
1987
#: bzrlib/builtins.py:3301
1983
#: bzrlib/builtins.py:3272
1989
1985
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1992
#: bzrlib/builtins.py:3303
1988
#: bzrlib/builtins.py:3274
1994
1990
" ================= =========================\n"
1995
1991
" Supported formats Autodetected by extension\n"
2002
1998
" ================= ========================="
2005
#: bzrlib/builtins.py:3317
2001
#: bzrlib/builtins.py:3288
2006
2002
msgid "Type of file to export to."
2009
#: bzrlib/builtins.py:3320
2005
#: bzrlib/builtins.py:3291
2010
2006
msgid "Apply content filters to export the convenient form."
2013
#: bzrlib/builtins.py:3324
2009
#: bzrlib/builtins.py:3295
2014
2010
msgid "Name of the root directory inside the exported file."
2017
#: bzrlib/builtins.py:3326
2013
#: bzrlib/builtins.py:3297
2019
2015
"Set modification time of files to that of the last revision in which it was "
2023
#: bzrlib/builtins.py:3329
2019
#: bzrlib/builtins.py:3300
2025
2021
"Export the working tree contents rather than that of the last revision."
2028
#: bzrlib/builtins.py:3348
2024
#: bzrlib/builtins.py:3319
2029
2025
msgid "--uncommitted requires a working tree"
2032
#: bzrlib/builtins.py:3357
2028
#: bzrlib/builtins.py:3328
2033
2029
#, python-format
2034
2030
msgid "Unsupported export format: %s"
2037
#: bzrlib/builtins.py:3361
2033
#: bzrlib/builtins.py:3332
2039
2035
"Write the contents of a file as of a given revision to standard output."
2042
#: bzrlib/builtins.py:3363
2038
#: bzrlib/builtins.py:3334
2043
2039
msgid "If no revision is nominated, the last revision is used."
2046
#: bzrlib/builtins.py:3365
2042
#: bzrlib/builtins.py:3336
2048
2044
"Note: Take care to redirect standard output when using this command on a\n"
2052
#: bzrlib/builtins.py:3371
2048
#: bzrlib/builtins.py:3342
2053
2049
msgid "The path name in the old tree."
2056
#: bzrlib/builtins.py:3372
2052
#: bzrlib/builtins.py:3343
2057
2053
msgid "Apply content filters to display the convenience form."
2060
#: bzrlib/builtins.py:3383
2056
#: bzrlib/builtins.py:3354
2061
2057
msgid "bzr cat --revision takes exactly one revision specifier"
2064
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2060
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2065
2061
msgid "{0!r} is not present in revision {1}"
2068
#: bzrlib/builtins.py:3443
2064
#: bzrlib/builtins.py:3414
2069
2065
msgid "Commit changes into a new revision."
2072
#: bzrlib/builtins.py:3445
2068
#: bzrlib/builtins.py:3416
2074
2070
"An explanatory message needs to be given for each commit. This is\n"
2075
2071
"often done by using the --message option (getting the message from the\n"
2158
2154
" one or more bugs. See ``bzr help bugs`` for details."
2161
#: bzrlib/builtins.py:3503
2157
#: bzrlib/builtins.py:3474
2162
2158
msgid "Do not consider changes made to a given path."
2165
#: bzrlib/builtins.py:3506
2161
#: bzrlib/builtins.py:3477
2166
2162
msgid "Description of the new revision."
2169
#: bzrlib/builtins.py:3509
2165
#: bzrlib/builtins.py:3480
2170
2166
msgid "Commit even if nothing has changed."
2173
#: bzrlib/builtins.py:3513
2169
#: bzrlib/builtins.py:3484
2174
2170
msgid "Take commit message from this file."
2177
#: bzrlib/builtins.py:3515
2173
#: bzrlib/builtins.py:3486
2178
2174
msgid "Refuse to commit if there are unknown files in the working tree."
2181
#: bzrlib/builtins.py:3518
2177
#: bzrlib/builtins.py:3489
2183
2179
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2184
2180
"08:00:00 +0100'."
2187
#: bzrlib/builtins.py:3521
2183
#: bzrlib/builtins.py:3492
2188
2184
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2191
#: bzrlib/builtins.py:3524
2187
#: bzrlib/builtins.py:3495
2192
2188
msgid "Set the author's name, if it's different from the committer."
2195
#: bzrlib/builtins.py:3527
2191
#: bzrlib/builtins.py:3498
2197
2193
"Perform a local commit in a bound branch. Local commits are not pushed to "
2198
2194
"the master branch until a normal commit is performed."
2201
#: bzrlib/builtins.py:3533
2197
#: bzrlib/builtins.py:3504
2203
2199
"When no message is supplied, show the diff along with the status summary in "
2204
2200
"the message editor."
2207
#: bzrlib/builtins.py:3536
2203
#: bzrlib/builtins.py:3507
2209
2205
"When committing to a foreign version control system do not push data that "
2210
2206
"can not be natively represented."
2213
#: bzrlib/builtins.py:3554
2209
#: bzrlib/builtins.py:3525
2214
2210
#, python-format
2216
2212
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2226
2222
"Commit refused."
2229
#: bzrlib/builtins.py:3572
2225
#: bzrlib/builtins.py:3543
2230
2226
#, python-format
2231
2227
msgid "Unrecognized bug %s. Commit refused."
2234
#: bzrlib/builtins.py:3575
2230
#: bzrlib/builtins.py:3546
2235
2231
#, python-format
2238
2234
"Commit refused."
2241
#: bzrlib/builtins.py:3599
2237
#: bzrlib/builtins.py:3570
2242
2238
msgid "Could not parse --commit-time: "
2241
#: bzrlib/builtins.py:3610
2242
msgid "please specify either --message or --file"
2245
2245
#: bzrlib/builtins.py:3639
2246
msgid "please specify either --message or --file"
2249
#: bzrlib/builtins.py:3668
2250
2246
msgid "please specify a commit message with either --message or --file"
2253
#: bzrlib/builtins.py:3671
2249
#: bzrlib/builtins.py:3642
2255
2251
"Empty commit message specified. Please specify a commit message with either -"
2256
2252
"-message or --file or leave a blank message with --message \"\"."
2259
#: bzrlib/builtins.py:3691
2255
#: bzrlib/builtins.py:3662
2261
2257
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2262
2258
"-unchanged to force an empty commit."
2265
#: bzrlib/builtins.py:3695
2261
#: bzrlib/builtins.py:3666
2267
2263
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2268
2264
"resolve FILE\" to resolve."
2271
#: bzrlib/builtins.py:3699
2267
#: bzrlib/builtins.py:3670
2272
2268
msgid "Commit refused because there are unknown files in the working tree."
2275
#: bzrlib/builtins.py:3702
2271
#: bzrlib/builtins.py:3673
2278
2274
"To commit to master branch, run update and then commit.\n"
2279
2275
"You can also pass --local to commit to continue working disconnected."
2282
#: bzrlib/builtins.py:3710
2278
#: bzrlib/builtins.py:3681
2284
2280
"Validate working tree structure, branch consistency and repository history."
2287
#: bzrlib/builtins.py:3712
2283
#: bzrlib/builtins.py:3683
2289
2285
"This command checks various invariants about branch and repository storage\n"
2290
2286
"to detect data corruption or bzr bugs."
2293
#: bzrlib/builtins.py:3715
2289
#: bzrlib/builtins.py:3686
2295
2291
"The working tree and branch checks will only give output if a problem is\n"
2296
2292
"detected. The output fields of the repository check are:"
2299
#: bzrlib/builtins.py:3718
2295
#: bzrlib/builtins.py:3689
2302
2298
" This is just the number of revisions checked. It doesn't\n"
2303
2299
" indicate a problem."
2306
#: bzrlib/builtins.py:3722
2302
#: bzrlib/builtins.py:3693
2308
2304
"versionedfiles\n"
2309
2305
" This is just the number of versionedfiles checked. It\n"
2310
2306
" doesn't indicate a problem."
2313
#: bzrlib/builtins.py:3726
2309
#: bzrlib/builtins.py:3697
2315
2311
"unreferenced ancestors\n"
2316
2312
" Texts that are ancestors of other texts, but\n"
2334
2330
" indicate a problem."
2337
#: bzrlib/builtins.py:3741
2333
#: bzrlib/builtins.py:3712
2339
2335
"If no restrictions are specified, all Bazaar data that is found at the "
2341
2337
"location will be checked."
2344
#: bzrlib/builtins.py:3746
2340
#: bzrlib/builtins.py:3717
2345
2341
msgid " Check the tree and branch at 'foo'::"
2348
#: bzrlib/builtins.py:3748
2344
#: bzrlib/builtins.py:3719
2349
2345
msgid " bzr check --tree --branch foo"
2352
#: bzrlib/builtins.py:3750
2348
#: bzrlib/builtins.py:3721
2353
2349
msgid " Check only the repository at 'bar'::"
2356
#: bzrlib/builtins.py:3752
2352
#: bzrlib/builtins.py:3723
2357
2353
msgid " bzr check --repo bar"
2360
#: bzrlib/builtins.py:3754
2356
#: bzrlib/builtins.py:3725
2361
2357
msgid " Check everything at 'baz'::"
2364
#: bzrlib/builtins.py:3756
2360
#: bzrlib/builtins.py:3727
2365
2361
msgid " bzr check baz"
2368
#: bzrlib/builtins.py:3762
2364
#: bzrlib/builtins.py:3733
2369
2365
msgid "Check the branch related to the current directory."
2372
#: bzrlib/builtins.py:3764
2368
#: bzrlib/builtins.py:3735
2373
2369
msgid "Check the repository related to the current directory."
2376
#: bzrlib/builtins.py:3766
2372
#: bzrlib/builtins.py:3737
2377
2373
msgid "Check the working tree related to the current directory."
2380
#: bzrlib/builtins.py:3780
2376
#: bzrlib/builtins.py:3751
2381
2377
msgid "Upgrade a repository, branch or working tree to a newer format."
2384
#: bzrlib/builtins.py:3782
2380
#: bzrlib/builtins.py:3753
2386
2382
"When the default format has changed after a major new release of\n"
2387
2383
"Bazaar, you may be informed during certain operations that you\n"
2422
#: bzrlib/builtins.py:3808
2418
#: bzrlib/builtins.py:3779
2424
2420
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2425
2421
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2428
#: bzrlib/builtins.py:3816
2424
#: bzrlib/builtins.py:3787
2429
2425
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2432
#: bzrlib/builtins.py:3820
2428
#: bzrlib/builtins.py:3791
2433
2429
msgid "Branch format"
2436
#: bzrlib/builtins.py:3822
2432
#: bzrlib/builtins.py:3793
2437
2433
msgid "Remove the backup.bzr directory if successful."
2440
#: bzrlib/builtins.py:3824
2436
#: bzrlib/builtins.py:3795
2441
2437
msgid "Show what would be done, but don't actually do anything."
2444
#: bzrlib/builtins.py:3839
2440
#: bzrlib/builtins.py:3810
2445
2441
msgid "Show or set bzr user id."
2448
#: bzrlib/builtins.py:3841
2444
#: bzrlib/builtins.py:3812
2451
2447
" Show the email of the current user::"
2454
#: bzrlib/builtins.py:3844
2450
#: bzrlib/builtins.py:3815
2455
2451
msgid " bzr whoami --email"
2458
#: bzrlib/builtins.py:3846
2454
#: bzrlib/builtins.py:3817
2459
2455
msgid " Set the current user::"
2462
#: bzrlib/builtins.py:3848
2458
#: bzrlib/builtins.py:3819
2463
2459
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2466
#: bzrlib/builtins.py:3852
2462
#: bzrlib/builtins.py:3823
2467
2463
msgid "Display email address only."
2470
#: bzrlib/builtins.py:3854
2466
#: bzrlib/builtins.py:3825
2471
2467
msgid "Set identity for the current branch instead of globally."
2474
#: bzrlib/builtins.py:3880
2470
#: bzrlib/builtins.py:3851
2475
2471
msgid "--email can only be used to display existing identity"
2478
#: bzrlib/builtins.py:3904
2474
#: bzrlib/builtins.py:3873
2479
2475
msgid "Print or set the branch nickname."
2482
#: bzrlib/builtins.py:3906
2478
#: bzrlib/builtins.py:3875
2484
"If unset, the colocated branch name is used for colocated branches, and\n"
2485
"the branch directory name is used for other branches. To print the\n"
2486
"current nickname, execute with no argument."
2480
"If unset, the tree root directory name is used as the nickname.\n"
2481
"To print the current nickname, execute with no argument."
2489
#: bzrlib/builtins.py:3910
2484
#: bzrlib/builtins.py:3878
2491
2486
"Bound branches use the nickname of its master branch unless it is set\n"
2495
#: bzrlib/builtins.py:3930
2490
#: bzrlib/builtins.py:3898
2496
2491
msgid "Set/unset and display aliases."
2499
#: bzrlib/builtins.py:3932
2494
#: bzrlib/builtins.py:3900
2502
2497
" Show the current aliases::"
2505
#: bzrlib/builtins.py:3935
2500
#: bzrlib/builtins.py:3903
2506
2501
msgid " bzr alias"
2509
#: bzrlib/builtins.py:3937
2504
#: bzrlib/builtins.py:3905
2510
2505
msgid " Show the alias specified for 'll'::"
2513
#: bzrlib/builtins.py:3939
2508
#: bzrlib/builtins.py:3907
2514
2509
msgid " bzr alias ll"
2517
#: bzrlib/builtins.py:3941
2512
#: bzrlib/builtins.py:3909
2518
2513
msgid " Set an alias for 'll'::"
2521
#: bzrlib/builtins.py:3943
2516
#: bzrlib/builtins.py:3911
2522
2517
msgid " bzr alias ll=\"log --line -r-10..-1\""
2525
#: bzrlib/builtins.py:3945
2520
#: bzrlib/builtins.py:3913
2526
2521
msgid " To remove an alias for 'll'::"
2529
#: bzrlib/builtins.py:3947
2524
#: bzrlib/builtins.py:3915
2530
2525
msgid " bzr alias --remove ll"
2533
#: bzrlib/builtins.py:3952
2528
#: bzrlib/builtins.py:3920
2534
2529
msgid "Remove the alias."
2537
#: bzrlib/builtins.py:3970
2532
#: bzrlib/builtins.py:3938
2538
2533
msgid "bzr alias --remove expects an alias to remove."
2541
#: bzrlib/builtins.py:4151
2536
#: bzrlib/builtins.py:4119
2543
2538
"subunit not available. subunit needs to be installed to use --subunit."
2546
#: bzrlib/builtins.py:4168
2541
#: bzrlib/builtins.py:4136
2548
2543
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2551
#: bzrlib/builtins.py:4215
2546
#: bzrlib/builtins.py:4183
2552
2547
msgid "Show version of bzr."
2555
#: bzrlib/builtins.py:4219
2550
#: bzrlib/builtins.py:4187
2556
2551
msgid "Print just the version number."
2559
#: bzrlib/builtins.py:4238
2554
#: bzrlib/builtins.py:4206
2560
2555
msgid "It sure does!\n"
2563
#: bzrlib/builtins.py:4262
2558
#: bzrlib/builtins.py:4230
2564
2559
#, python-format
2565
2560
msgid "merge base is revision %s\n"
2568
#: bzrlib/builtins.py:4266
2563
#: bzrlib/builtins.py:4234
2569
2564
msgid "Perform a three-way merge."
2572
#: bzrlib/builtins.py:4268
2567
#: bzrlib/builtins.py:4236
2574
2569
"The source of the merge can be specified either in the form of a branch,\n"
2575
2570
"or in the form of a path to a file containing a merge directive generated\n"
2645
2640
"merge revision which has more than two parents."
2648
#: bzrlib/builtins.py:4315
2643
#: bzrlib/builtins.py:4283
2650
2645
"If one would like to merge changes from the working tree of the other\n"
2651
2646
"branch without merging any committed revisions, the --uncommitted option\n"
2652
2647
"can be given."
2655
#: bzrlib/builtins.py:4319
2650
#: bzrlib/builtins.py:4287
2657
2652
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2658
2653
"you to apply each diff hunk and file change, similar to \"shelve\"."
2661
#: bzrlib/builtins.py:4322
2656
#: bzrlib/builtins.py:4290
2664
2659
" To merge all new revisions from bzr.dev::"
2667
#: bzrlib/builtins.py:4325
2662
#: bzrlib/builtins.py:4293
2668
2663
msgid " bzr merge ../bzr.dev"
2671
#: bzrlib/builtins.py:4327
2666
#: bzrlib/builtins.py:4295
2672
2667
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2675
#: bzrlib/builtins.py:4329
2670
#: bzrlib/builtins.py:4297
2676
2671
msgid " bzr merge -r 82 ../bzr.dev"
2679
#: bzrlib/builtins.py:4331
2674
#: bzrlib/builtins.py:4299
2680
2675
msgid " To merge the changes introduced by 82, without previous changes::"
2683
#: bzrlib/builtins.py:4333
2678
#: bzrlib/builtins.py:4301
2684
2679
msgid " bzr merge -r 81..82 ../bzr.dev"
2687
#: bzrlib/builtins.py:4335
2682
#: bzrlib/builtins.py:4303
2688
2683
msgid " To apply a merge directive contained in /tmp/merge::"
2691
#: bzrlib/builtins.py:4337
2686
#: bzrlib/builtins.py:4305
2692
2687
msgid " bzr merge /tmp/merge"
2695
#: bzrlib/builtins.py:4339
2690
#: bzrlib/builtins.py:4307
2697
2692
" To create a merge revision with three parents from two branches\n"
2698
2693
" feature1a and feature1b:"
2701
#: bzrlib/builtins.py:4342
2696
#: bzrlib/builtins.py:4310
2703
2698
" bzr merge ../feature1a\n"
2704
2699
" bzr merge ../feature1b --force\n"
2705
2700
" bzr commit -m 'revision with three parents'"
2708
#: bzrlib/builtins.py:4354
2703
#: bzrlib/builtins.py:4322
2709
2704
msgid "Merge even if the destination tree has uncommitted changes."
2712
#: bzrlib/builtins.py:4360
2707
#: bzrlib/builtins.py:4328
2714
2709
"Apply uncommitted changes from a working copy, instead of branch changes."
2717
#: bzrlib/builtins.py:4362
2712
#: bzrlib/builtins.py:4330
2719
2714
"If the destination is already completely merged into the source, pull from "
2720
2715
"the source rather than merging. When this happens, you do not need to "
2721
2716
"commit the result."
2724
#: bzrlib/builtins.py:4367
2719
#: bzrlib/builtins.py:4335
2726
2721
"Branch to merge into, rather than the one containing the working directory."
2729
#: bzrlib/builtins.py:4369
2724
#: bzrlib/builtins.py:4337
2730
2725
msgid "Instead of merging, show a diff of the merge."
2733
#: bzrlib/builtins.py:4371
2728
#: bzrlib/builtins.py:4339
2734
2729
msgid "Select changes interactively."
2737
#: bzrlib/builtins.py:4393
2732
#: bzrlib/builtins.py:4361
2739
2734
"Merging into empty branches not currently supported, "
2740
2735
"https://bugs.launchpad.net/bzr/+bug/308562"
2743
#: bzrlib/builtins.py:4420
2738
#: bzrlib/builtins.py:4388
2744
2739
msgid "Cannot use --uncommitted with bundles or merge directives."
2747
#: bzrlib/builtins.py:4431
2742
#: bzrlib/builtins.py:4399
2748
2743
msgid "Cannot use --uncommitted and --revision at the same time."
2751
#: bzrlib/builtins.py:4451
2746
#: bzrlib/builtins.py:4419
2752
2747
msgid "merger: "
2755
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2750
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2756
2751
msgid "Nothing to do."
2759
#: bzrlib/builtins.py:4457
2754
#: bzrlib/builtins.py:4425
2760
2755
msgid "Cannot pull individual files"
2763
#: bzrlib/builtins.py:4465
2758
#: bzrlib/builtins.py:4433
2764
2759
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2767
#: bzrlib/builtins.py:4523
2762
#: bzrlib/builtins.py:4491
2768
2763
#, python-format
2769
2764
msgid "Show-base is not supported for this merge type. %s"
2772
#: bzrlib/builtins.py:4532
2767
#: bzrlib/builtins.py:4500
2773
2768
#, python-format
2774
2769
msgid "Conflict reduction is not supported for merge type %s."
2777
#: bzrlib/builtins.py:4536
2772
#: bzrlib/builtins.py:4504
2778
2773
msgid "Cannot do conflict reduction and show base."
2781
#: bzrlib/builtins.py:4647
2776
#: bzrlib/builtins.py:4615
2782
2777
msgid "No location specified or remembered"
2785
#: bzrlib/builtins.py:4649
2780
#: bzrlib/builtins.py:4617
2786
2781
msgid "{0} remembered {1} location {2}"
2789
#: bzrlib/builtins.py:4655
2784
#: bzrlib/builtins.py:4623
2790
2785
msgid "Redo a merge."
2793
#: bzrlib/builtins.py:4657
2788
#: bzrlib/builtins.py:4625
2795
2790
"Use this if you want to try a different merge technique while resolving\n"
2796
2791
"conflicts. Some merge techniques are better than others, and remerge\n"
2797
2792
"lets you try different ones on different files."
2800
#: bzrlib/builtins.py:4661
2795
#: bzrlib/builtins.py:4629
2802
2797
"The options for remerge have the same meaning and defaults as the ones for\n"
2803
2798
"merge. The difference is that remerge can (only) be run when there is a\n"
2804
2799
"pending merge, and it lets you specify particular files."
2807
#: bzrlib/builtins.py:4665
2802
#: bzrlib/builtins.py:4633
2810
2805
" Re-do the merge of all conflicted files, and show the base text in\n"
2811
2806
" conflict regions, in addition to the usual THIS and OTHER texts::"
2814
#: bzrlib/builtins.py:4669
2809
#: bzrlib/builtins.py:4637
2815
2810
msgid " bzr remerge --show-base"
2818
#: bzrlib/builtins.py:4671
2813
#: bzrlib/builtins.py:4639
2820
2815
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2821
2816
" additional processing to reduce the size of conflict regions::"
2824
#: bzrlib/builtins.py:4674
2819
#: bzrlib/builtins.py:4642
2825
2820
msgid " bzr remerge --merge-type weave --reprocess foobar"
2828
#: bzrlib/builtins.py:4681
2823
#: bzrlib/builtins.py:4649
2829
2824
msgid "Show base revision text in conflicts."
2832
#: bzrlib/builtins.py:4693
2827
#: bzrlib/builtins.py:4661
2834
2829
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2838
#: bzrlib/builtins.py:4751
2840
"Set files in the working tree back to the contents of a previous revision."
2833
#: bzrlib/builtins.py:4717
2834
msgid "Revert files to a previous revision."
2843
#: bzrlib/builtins.py:4753
2837
#: bzrlib/builtins.py:4719
2845
2839
"Giving a list of files will revert only those files. Otherwise, all files\n"
2846
2840
"will be reverted. If the revision is not specified with '--revision', the\n"
2847
"working tree basis revision is used. A revert operation affects only the\n"
2848
"working tree, not any revision history like the branch and repository or\n"
2849
"the working tree basis revision."
2841
"last committed revision is used."
2852
#: bzrlib/builtins.py:4759
2844
#: bzrlib/builtins.py:4723
2854
2846
"To remove only some changes, without reverting to a prior version, use\n"
2855
2847
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2856
2848
"will remove the changes introduced by the second last commit (-2), without\n"
2857
2849
"affecting the changes introduced by the last commit (-1). To remove\n"
2858
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2859
"To update the branch to a specific revision or the latest revision and\n"
2860
"update the working tree accordingly while preserving local changes, see the\n"
2850
"certain changes on a hunk-by-hunk basis, see the shelve command."
2864
#: bzrlib/builtins.py:4768
2853
#: bzrlib/builtins.py:4729
2866
"Uncommitted changes to files that are reverted will be discarded.\n"
2867
"Howver, by default, any files that have been manually changed will be\n"
2868
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2869
"files have '.~#~' appended to their name, where # is a number."
2855
"By default, any files that have been manually changed will be backed up\n"
2856
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2857
"'.~#~' appended to their name, where # is a number."
2872
#: bzrlib/builtins.py:4773
2860
#: bzrlib/builtins.py:4733
2874
2862
"When you provide files, you can use their current pathname or the pathname\n"
2875
2863
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2948
2936
" 0 - no missing revisions"
2951
#: bzrlib/builtins.py:4887
2939
#: bzrlib/builtins.py:4847
2953
2941
" Determine the missing revisions between this and the branch at the\n"
2954
2942
" remembered pull location::"
2957
#: bzrlib/builtins.py:4890
2945
#: bzrlib/builtins.py:4850
2958
2946
msgid " bzr missing"
2961
#: bzrlib/builtins.py:4892
2949
#: bzrlib/builtins.py:4852
2962
2950
msgid " Determine the missing revisions between this and another branch::"
2965
#: bzrlib/builtins.py:4894
2953
#: bzrlib/builtins.py:4854
2966
2954
msgid " bzr missing http://server/branch"
2969
#: bzrlib/builtins.py:4896
2957
#: bzrlib/builtins.py:4856
2971
2959
" Determine the missing revisions up to a specific revision on the other\n"
2975
#: bzrlib/builtins.py:4899
2963
#: bzrlib/builtins.py:4859
2976
2964
msgid " bzr missing -r ..-10"
2979
#: bzrlib/builtins.py:4901
2967
#: bzrlib/builtins.py:4861
2981
2969
" Determine the missing revisions up to a specific revision on this\n"
2985
#: bzrlib/builtins.py:4904
2973
#: bzrlib/builtins.py:4864
2986
2974
msgid " bzr missing --my-revision ..-10"
2989
#: bzrlib/builtins.py:4911
2977
#: bzrlib/builtins.py:4871
2990
2978
msgid "Reverse the order of revisions."
2993
#: bzrlib/builtins.py:4913
2981
#: bzrlib/builtins.py:4873
2994
2982
msgid "Display changes in the local branch only."
2997
#: bzrlib/builtins.py:4914
2985
#: bzrlib/builtins.py:4874
2998
2986
msgid "Same as --mine-only."
3001
#: bzrlib/builtins.py:4916
2989
#: bzrlib/builtins.py:4876
3002
2990
msgid "Display changes in the remote branch only."
3005
#: bzrlib/builtins.py:4917
2993
#: bzrlib/builtins.py:4877
3006
2994
msgid "Same as --theirs-only."
3009
#: bzrlib/builtins.py:4922
2997
#: bzrlib/builtins.py:4882
3011
2999
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3015
#: bzrlib/builtins.py:4926
3003
#: bzrlib/builtins.py:4886
3017
3005
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3021
#: bzrlib/builtins.py:4929
3009
#: bzrlib/builtins.py:4889
3022
3010
msgid "Show all revisions in addition to the mainline ones."
3025
#: bzrlib/builtins.py:4983
3013
#: bzrlib/builtins.py:4943
3026
3014
msgid "No peer location known or specified."
3029
#: bzrlib/builtins.py:4987
3017
#: bzrlib/builtins.py:4947
3030
3018
msgid "Using saved parent location: {0}\n"
3033
#: bzrlib/builtins.py:5020
3021
#: bzrlib/builtins.py:4980
3034
3022
#, python-format
3035
3023
msgid "You have %d extra revision:\n"
3036
3024
msgid_plural "You have %d extra revisions:\n"
3040
#: bzrlib/builtins.py:5040
3028
#: bzrlib/builtins.py:4996
3041
3029
#, python-format
3042
3030
msgid "You are missing %d revision:\n"
3043
3031
msgid_plural "You are missing %d revisions:\n"
3047
#: bzrlib/builtins.py:5055
3035
#: bzrlib/builtins.py:5008
3048
3036
msgid "This branch has no new revisions.\n"
3051
#: bzrlib/builtins.py:5058
3039
#: bzrlib/builtins.py:5011
3052
3040
msgid "Other branch has no new revisions.\n"
3055
#: bzrlib/builtins.py:5063
3043
#: bzrlib/builtins.py:5016
3056
3044
msgid "Branches are up to date.\n"
3059
#: bzrlib/builtins.py:5074
3047
#: bzrlib/builtins.py:5027
3060
3048
msgid "Compress the data within a repository."
3063
#: bzrlib/builtins.py:5076
3051
#: bzrlib/builtins.py:5029
3065
3053
"This operation compresses the data within a bazaar repository. As\n"
3066
3054
"bazaar supports automatic packing of repository, this operation is\n"
3067
3055
"normally not required to be done manually."
3070
#: bzrlib/builtins.py:5080
3058
#: bzrlib/builtins.py:5033
3072
3060
"During the pack operation, bazaar takes a backup of existing repository\n"
3073
3061
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3119
3107
"plugins using the Python programming language."
3122
#: bzrlib/builtins.py:5138
3110
#: bzrlib/builtins.py:5091
3123
3111
msgid "Show testament (signing-form) of a revision."
3126
#: bzrlib/builtins.py:5141
3114
#: bzrlib/builtins.py:5094
3127
3115
msgid "Produce long-format testament."
3130
#: bzrlib/builtins.py:5143
3118
#: bzrlib/builtins.py:5096
3131
3119
msgid "Produce a strict-format testament."
3134
#: bzrlib/builtins.py:5169
3122
#: bzrlib/builtins.py:5122
3135
3123
msgid "Show the origin of each line in a file."
3138
#: bzrlib/builtins.py:5171
3126
#: bzrlib/builtins.py:5124
3140
3128
"This prints out the given file with an annotation on the left side\n"
3141
3129
"indicating which revision, author and date introduced the change."
3144
#: bzrlib/builtins.py:5174
3132
#: bzrlib/builtins.py:5127
3146
3134
"If the origin is the same for a run of consecutive lines, it is\n"
3147
3135
"shown only at the top, unless the --all option is given."
3150
#: bzrlib/builtins.py:5182
3138
#: bzrlib/builtins.py:5135
3151
3139
msgid "Show annotations on all lines."
3154
#: bzrlib/builtins.py:5183
3142
#: bzrlib/builtins.py:5136
3155
3143
msgid "Show commit date in annotations."
3158
#: bzrlib/builtins.py:5270
3146
#: bzrlib/builtins.py:5223
3159
3147
msgid "Cannot sign a range of non-revision-history revisions"
3162
#: bzrlib/builtins.py:5282
3150
#: bzrlib/builtins.py:5235
3163
3151
msgid "Please supply either one revision, or a range."
3166
#: bzrlib/builtins.py:5286
3154
#: bzrlib/builtins.py:5239
3168
3156
"Convert the current branch into a checkout of the supplied branch.\n"
3169
3157
"If no branch is supplied, rebind to the last bound location."
3172
#: bzrlib/builtins.py:5289
3160
#: bzrlib/builtins.py:5242
3174
3162
"Once converted into a checkout, commits must succeed on the master branch\n"
3175
3163
"before they will be applied to the local branch."
3178
#: bzrlib/builtins.py:5292
3166
#: bzrlib/builtins.py:5245
3180
3168
"Bound branches use the nickname of its master branch unless it is set\n"
3181
3169
"locally, in which case binding will update the local nickname to be\n"
3182
3170
"that of the master."
3185
#: bzrlib/builtins.py:5307
3173
#: bzrlib/builtins.py:5260
3186
3174
msgid "No location supplied. This format does not remember old locations."
3189
#: bzrlib/builtins.py:5313
3177
#: bzrlib/builtins.py:5265
3190
3178
msgid "Branch is already bound"
3193
#: bzrlib/builtins.py:5316
3181
#: bzrlib/builtins.py:5267
3194
3182
msgid "No location supplied and no previous location known"
3197
#: bzrlib/builtins.py:5322
3185
#: bzrlib/builtins.py:5273
3198
3186
msgid "These branches have diverged. Try merging, and then bind again."
3201
#: bzrlib/builtins.py:5329
3189
#: bzrlib/builtins.py:5280
3202
3190
msgid "Convert the current checkout into a regular branch."
3205
#: bzrlib/builtins.py:5331
3193
#: bzrlib/builtins.py:5282
3207
3195
"After unbinding, the local branch is considered independent and subsequent\n"
3208
3196
"commits will be local only."
3211
#: bzrlib/builtins.py:5342
3199
#: bzrlib/builtins.py:5293
3212
3200
msgid "Local branch is not bound"
3215
#: bzrlib/builtins.py:5346
3203
#: bzrlib/builtins.py:5297
3216
3204
msgid "Remove the last committed revision."
3219
#: bzrlib/builtins.py:5348
3207
#: bzrlib/builtins.py:5299
3221
3209
"--verbose will print out what is being removed.\n"
3222
3210
"--dry-run will go through all the motions, but not actually\n"
3223
3211
"remove anything."
3226
#: bzrlib/builtins.py:5352
3214
#: bzrlib/builtins.py:5303
3228
3216
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3229
3217
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3230
3218
"branch at revision 15."
3233
#: bzrlib/builtins.py:5356
3221
#: bzrlib/builtins.py:5307
3235
3223
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3236
3224
"it may make is to restore any pending merges that were present before\n"
3240
#: bzrlib/builtins.py:5367
3228
#: bzrlib/builtins.py:5318
3241
3229
msgid "Don't actually make changes."
3244
#: bzrlib/builtins.py:5368
3232
#: bzrlib/builtins.py:5319
3245
3233
msgid "Say yes to all questions."
3248
#: bzrlib/builtins.py:5370
3236
#: bzrlib/builtins.py:5321
3249
3237
msgid "Keep tags that point to removed revisions."
3240
#: bzrlib/builtins.py:5323
3241
msgid "Only remove the commits from the local branch when in a checkout."
3252
3244
#: bzrlib/builtins.py:5372
3253
msgid "Only remove the commits from the local branch when in a checkout."
3256
#: bzrlib/builtins.py:5421
3257
3245
msgid "No revisions to uncommit.\n"
3260
#: bzrlib/builtins.py:5436
3248
#: bzrlib/builtins.py:5387
3261
3249
msgid "Dry-run, pretending to remove the above revisions.\n"
3264
#: bzrlib/builtins.py:5439
3252
#: bzrlib/builtins.py:5390
3265
3253
msgid "The above revision(s) will be removed.\n"
3268
#: bzrlib/builtins.py:5443
3256
#: bzrlib/builtins.py:5394
3269
3257
msgid "Uncommit these revisions"
3272
#: bzrlib/builtins.py:5446
3260
#: bzrlib/builtins.py:5397
3273
3261
msgid "Canceled\n"
3276
#: bzrlib/builtins.py:5453
3264
#: bzrlib/builtins.py:5404
3277
3265
#, python-format
3279
3267
"You can restore the old tip by running:\n"
3280
3268
" bzr pull . -r revid:%s\n"
3283
#: bzrlib/builtins.py:5458
3271
#: bzrlib/builtins.py:5409
3284
3272
msgid "Break a dead lock."
3287
#: bzrlib/builtins.py:5460
3275
#: bzrlib/builtins.py:5411
3289
3277
"This command breaks a lock on a repository, branch, working directory or\n"
3293
#: bzrlib/builtins.py:5463
3281
#: bzrlib/builtins.py:5414
3295
3283
"CAUTION: Locks should only be broken when you are sure that the process\n"
3296
3284
"holding the lock has been stopped."
3299
#: bzrlib/builtins.py:5466
3287
#: bzrlib/builtins.py:5417
3301
3289
"You can get information on what locks are open via the 'bzr info\n"
3302
3290
"[location]' command."
3305
#: bzrlib/builtins.py:5469
3293
#: bzrlib/builtins.py:5420
3308
3296
" bzr break-lock\n"
3310
3298
" bzr break-lock --conf ~/.bazaar"
3313
#: bzrlib/builtins.py:5478
3301
#: bzrlib/builtins.py:5429
3314
3302
msgid "LOCATION is the directory where the config lock is."
3317
#: bzrlib/builtins.py:5480
3305
#: bzrlib/builtins.py:5431
3318
3306
msgid "Do not ask for confirmation before breaking the lock."
3321
#: bzrlib/builtins.py:5515
3309
#: bzrlib/builtins.py:5466
3322
3310
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3325
#: bzrlib/builtins.py:5516
3313
#: bzrlib/builtins.py:5467
3326
3314
msgid "Run the bzr server."
3329
#: bzrlib/builtins.py:5522
3317
#: bzrlib/builtins.py:5473
3330
3318
msgid "Serve on stdin/out for use from inetd or sshd."
3333
#: bzrlib/builtins.py:5523
3321
#: bzrlib/builtins.py:5474
3334
3322
msgid "protocol"
3337
#: bzrlib/builtins.py:5524
3325
#: bzrlib/builtins.py:5475
3338
3326
msgid "Protocol to serve."
3341
#: bzrlib/builtins.py:5528
3342
msgid "Listen for connections on nominated address."
3345
#: bzrlib/builtins.py:5530
3329
#: bzrlib/builtins.py:5479
3347
"Listen for connections on nominated port. Passing 0 as the port number will "
3348
"result in a dynamically allocated port. The default port depends on the "
3331
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3332
"Passing 0 as the port number will result in a dynamically allocated port. "
3333
"The default port depends on the protocol."
3352
#: bzrlib/builtins.py:5535
3336
#: bzrlib/builtins.py:5485
3353
3337
msgid "Serve contents of this directory."
3356
#: bzrlib/builtins.py:5537
3340
#: bzrlib/builtins.py:5487
3358
3342
"By default the server is a readonly server. Supplying --allow-writes "
3359
3343
"enables write access to the contents of the served directory and below. "
3362
3346
"uncontrolled write access to your file system."
3349
#: bzrlib/builtins.py:5496
3350
msgid "Override the default idle client timeout (5min)."
3365
3353
#: bzrlib/builtins.py:5546
3366
msgid "Override the default idle client timeout (5min)."
3369
#: bzrlib/builtins.py:5564
3370
3354
msgid "Combine a tree into its containing tree."
3373
#: bzrlib/builtins.py:5566
3357
#: bzrlib/builtins.py:5548
3374
3358
msgid "This command requires the target tree to be in a rich-root format."
3377
#: bzrlib/builtins.py:5568
3361
#: bzrlib/builtins.py:5550
3379
3363
"The TREE argument should be an independent tree, inside another tree, but\n"
3380
3364
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3381
3365
"running \"bzr branch\" with the target inside a tree.)"
3384
#: bzrlib/builtins.py:5572
3368
#: bzrlib/builtins.py:5554
3386
3370
"The result is a combined tree, with the subtree no longer an independent\n"
3387
3371
"part. This is marked as a merge of the subtree into the containing tree,\n"
3388
3372
"and all history is preserved."
3391
#: bzrlib/builtins.py:5590
3375
#: bzrlib/builtins.py:5572
3392
3376
#, python-format
3394
3378
"Can't join trees because %s doesn't support rich root data.\n"
3395
3379
"You can use bzr upgrade on the repository."
3398
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3382
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3399
3383
msgid "Cannot join {0}. {1}"
3402
#: bzrlib/builtins.py:5610
3386
#: bzrlib/builtins.py:5592
3403
3387
msgid "Split a subdirectory of a tree into a separate tree."
3406
#: bzrlib/builtins.py:5612
3390
#: bzrlib/builtins.py:5594
3408
3392
"This command will produce a target tree in a format that supports\n"
3409
3393
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3410
3394
"converted into earlier formats like 'dirstate-tags'."
3413
#: bzrlib/builtins.py:5616
3397
#: bzrlib/builtins.py:5598
3415
3399
"The TREE argument should be a subdirectory of a working tree. That\n"
3416
3400
"subdirectory will be converted into an independent tree, with its own\n"
3417
3401
"branch. Commits in the top-level tree will not apply to the new subtree."
3420
#: bzrlib/builtins.py:5696
3404
#: bzrlib/builtins.py:5678
3421
3405
msgid "No submit branch specified or known"
3424
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3408
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3425
3409
msgid "No public branch specified or known"
3428
#: bzrlib/builtins.py:5710
3412
#: bzrlib/builtins.py:5691
3429
3413
msgid "bzr merge-directive takes at most two one revision identifiers"
3416
#: bzrlib/builtins.py:5700
3417
msgid "No revisions to bundle."
3432
3420
#: bzrlib/builtins.py:5719
3433
msgid "No revisions to bundle."
3436
#: bzrlib/builtins.py:5738
3437
3421
msgid "Mail or create a merge-directive for submitting changes."
3440
#: bzrlib/builtins.py:5740
3424
#: bzrlib/builtins.py:5721
3441
3425
msgid "A merge directive provides many things needed for requesting merges:"
3444
#: bzrlib/builtins.py:5742
3428
#: bzrlib/builtins.py:5723
3445
3429
msgid "* A machine-readable description of the merge to perform"
3448
#: bzrlib/builtins.py:5744
3432
#: bzrlib/builtins.py:5725
3449
3433
msgid "* An optional patch that is a preview of the changes requested"
3452
#: bzrlib/builtins.py:5746
3436
#: bzrlib/builtins.py:5727
3454
3438
"* An optional bundle of revision data, so that the changes can be applied\n"
3455
3439
" directly from the merge directive, without retrieving data from a\n"
3459
#: bzrlib/builtins.py:5750
3443
#: bzrlib/builtins.py:5731
3461
3445
"`bzr send` creates a compact data set that, when applied using bzr\n"
3462
3446
"merge, has the same effect as merging from the source branch. "
3465
#: bzrlib/builtins.py:5753
3449
#: bzrlib/builtins.py:5734
3467
3451
"By default the merge directive is self-contained and can be applied to any\n"
3468
3452
"branch containing submit_branch in its ancestory without needing access to\n"
3469
3453
"the source branch."
3472
#: bzrlib/builtins.py:5757
3456
#: bzrlib/builtins.py:5738
3474
3458
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3475
3459
"revisions, but only a structured request to merge from the\n"
3561
3545
"set them, and use `bzr info` to display them."
3564
#: bzrlib/builtins.py:5832
3548
#: bzrlib/builtins.py:5813
3565
3549
msgid "Write merge directive to this file or directory; use - for stdout."
3568
#: bzrlib/builtins.py:5836
3552
#: bzrlib/builtins.py:5817
3570
3554
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3571
3555
"strict disables the check."
3574
#: bzrlib/builtins.py:5838
3558
#: bzrlib/builtins.py:5819
3575
3559
msgid "Mail the request to this address."
3578
#: bzrlib/builtins.py:5842
3562
#: bzrlib/builtins.py:5823
3579
3563
msgid "Body for the email."
3582
#: bzrlib/builtins.py:5895
3566
#: bzrlib/builtins.py:5876
3583
3567
msgid "Do not include a bundle in the merge directive."
3586
#: bzrlib/builtins.py:5896
3570
#: bzrlib/builtins.py:5877
3587
3571
msgid "Do not include a preview patch in the merge directive."
3590
#: bzrlib/builtins.py:5899
3574
#: bzrlib/builtins.py:5880
3591
3575
msgid "Remember submit and public branch."
3594
#: bzrlib/builtins.py:5901
3578
#: bzrlib/builtins.py:5882
3596
3580
"Branch to generate the submission from, rather than the one containing the "
3597
3581
"working directory."
3600
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3584
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3604
#: bzrlib/builtins.py:5912
3588
#: bzrlib/builtins.py:5893
3605
3589
msgid "Use the specified output format."
3608
#: bzrlib/builtins.py:5934
3592
#: bzrlib/builtins.py:5915
3609
3593
msgid "Create, remove or modify a tag naming a revision."
3612
#: bzrlib/builtins.py:5936
3596
#: bzrlib/builtins.py:5917
3614
3598
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3615
3599
"(--revision) option can be given -rtag:X, where X is any previously\n"
3619
#: bzrlib/builtins.py:5940
3603
#: bzrlib/builtins.py:5921
3621
3605
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3622
3606
"along when you branch, push, pull or merge."
3625
#: bzrlib/builtins.py:5943
3609
#: bzrlib/builtins.py:5924
3627
3611
"It is an error to give a tag name that already exists unless you pass\n"
3628
3612
"--force, in which case the tag is moved to point to the new revision."
3631
#: bzrlib/builtins.py:5946
3615
#: bzrlib/builtins.py:5927
3633
3617
"To rename a tag (change the name but keep it on the same revsion), run "
3635
3619
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3638
#: bzrlib/builtins.py:5949
3622
#: bzrlib/builtins.py:5930
3640
3624
"If no tag name is specified it will be determined through the \n"
3641
3625
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3646
#: bzrlib/builtins.py:5959
3630
#: bzrlib/builtins.py:5940
3647
3631
msgid "Delete this tag rather than placing it."
3650
#: bzrlib/builtins.py:5962
3634
#: bzrlib/builtins.py:5943
3651
3635
msgid "Branch in which to place the tag."
3654
#: bzrlib/builtins.py:5964
3638
#: bzrlib/builtins.py:5945
3655
3639
msgid "Replace existing tags."
3658
#: bzrlib/builtins.py:5979
3642
#: bzrlib/builtins.py:5960
3659
3643
msgid "No tag specified to delete."
3662
#: bzrlib/builtins.py:5981
3646
#: bzrlib/builtins.py:5962
3663
3647
#, python-format
3664
3648
msgid "Deleted tag %s."
3667
#: bzrlib/builtins.py:5995
3651
#: bzrlib/builtins.py:5976
3668
3652
msgid "Please specify a tag name."
3671
#: bzrlib/builtins.py:6003
3655
#: bzrlib/builtins.py:5984
3672
3656
#, python-format
3673
3657
msgid "Tag %s already exists for that revision."
3676
#: bzrlib/builtins.py:6007
3660
#: bzrlib/builtins.py:5988
3677
3661
#, python-format
3678
3662
msgid "Created tag %s."
3681
#: bzrlib/builtins.py:6009
3665
#: bzrlib/builtins.py:5990
3682
3666
#, python-format
3683
3667
msgid "Updated tag %s."
3686
#: bzrlib/builtins.py:6013
3670
#: bzrlib/builtins.py:5994
3687
3671
msgid "List tags."
3690
#: bzrlib/builtins.py:6015
3674
#: bzrlib/builtins.py:5996
3692
3676
"This command shows a table of tag names and the revisions they reference."
3695
#: bzrlib/builtins.py:6021
3679
#: bzrlib/builtins.py:6002
3696
3680
msgid "Branch whose tags should be displayed."
3699
#: bzrlib/builtins.py:6023
3683
#: bzrlib/builtins.py:6004
3700
3684
msgid "Sort tags by different criteria."
3703
#: bzrlib/builtins.py:6023
3687
#: bzrlib/builtins.py:6004
3704
3688
msgid "Sorting"
3707
#: bzrlib/builtins.py:6092
3691
#: bzrlib/builtins.py:6073
3708
3692
msgid "Reconfigure the type of a bzr directory."
3711
#: bzrlib/builtins.py:6094
3695
#: bzrlib/builtins.py:6075
3712
3696
msgid "A target configuration must be specified."
3715
#: bzrlib/builtins.py:6096
3699
#: bzrlib/builtins.py:6077
3717
3701
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3718
3702
"The order of preference is\n"
3723
3707
"If none of these is available, --bind-to must be specified."
3726
#: bzrlib/builtins.py:6110
3710
#: bzrlib/builtins.py:6091
3727
3711
msgid "Tree type"
3730
#: bzrlib/builtins.py:6111
3714
#: bzrlib/builtins.py:6092
3731
3715
msgid "The relation between branch and tree."
3734
#: bzrlib/builtins.py:6113
3718
#: bzrlib/builtins.py:6094
3735
3719
msgid "Reconfigure to be an unbound branch with no working tree."
3738
#: bzrlib/builtins.py:6114
3722
#: bzrlib/builtins.py:6095
3739
3723
msgid "Reconfigure to be an unbound branch with a working tree."
3742
#: bzrlib/builtins.py:6115
3726
#: bzrlib/builtins.py:6096
3743
3727
msgid "Reconfigure to be a bound branch with a working tree."
3746
#: bzrlib/builtins.py:6116
3730
#: bzrlib/builtins.py:6097
3747
3731
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3750
#: bzrlib/builtins.py:6121
3734
#: bzrlib/builtins.py:6102
3751
3735
msgid "Repository type"
3754
#: bzrlib/builtins.py:6122
3738
#: bzrlib/builtins.py:6103
3755
3739
msgid "Location fo the repository."
3758
#: bzrlib/builtins.py:6124
3742
#: bzrlib/builtins.py:6105
3760
3744
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3763
#: bzrlib/builtins.py:6126
3747
#: bzrlib/builtins.py:6107
3764
3748
msgid "Reconfigure to use a shared repository."
3767
#: bzrlib/builtins.py:6130
3751
#: bzrlib/builtins.py:6111
3768
3752
msgid "Trees in Repository"
3771
#: bzrlib/builtins.py:6131
3755
#: bzrlib/builtins.py:6112
3772
3756
msgid "Whether new branches in the repository have trees."
3775
#: bzrlib/builtins.py:6133
3759
#: bzrlib/builtins.py:6114
3777
3761
"Reconfigure repository to create working trees on branches by default."
3780
#: bzrlib/builtins.py:6135
3764
#: bzrlib/builtins.py:6116
3782
3766
"Reconfigure repository to not create working trees on branches by default."
3785
#: bzrlib/builtins.py:6138
3769
#: bzrlib/builtins.py:6119
3786
3770
msgid "Branch to bind checkout to."
3789
#: bzrlib/builtins.py:6140
3773
#: bzrlib/builtins.py:6121
3790
3774
msgid "Perform reconfiguration even if local changes will be lost."
3793
#: bzrlib/builtins.py:6143
3777
#: bzrlib/builtins.py:6124
3794
3778
msgid "Reconfigure a branch to be stacked on another branch."
3797
#: bzrlib/builtins.py:6147
3781
#: bzrlib/builtins.py:6128
3799
3783
"Reconfigure a branch to be unstacked. This may require copying substantial "
3800
3784
"data into it."
3803
#: bzrlib/builtins.py:6157
3787
#: bzrlib/builtins.py:6138
3804
3788
msgid "Can't use both --stacked-on and --unstacked"
3807
#: bzrlib/builtins.py:6171
3791
#: bzrlib/builtins.py:6152
3808
3792
msgid "No target configuration specified"
3811
#: bzrlib/builtins.py:6206
3795
#: bzrlib/builtins.py:6187
3812
3796
msgid "Set the branch of a checkout and update."
3815
#: bzrlib/builtins.py:6208
3799
#: bzrlib/builtins.py:6189
3817
3801
"For lightweight checkouts, this changes the branch being referenced.\n"
3818
3802
"For heavyweight checkouts, this checks that there are no local commits\n"
3891
3875
"want to switch back to your view after that."
3894
#: bzrlib/builtins.py:6305
3878
#: bzrlib/builtins.py:6281
3897
3881
" To define the current view::"
3900
#: bzrlib/builtins.py:6308
3884
#: bzrlib/builtins.py:6284
3901
3885
msgid " bzr view file1 dir1 ..."
3904
#: bzrlib/builtins.py:6310
3888
#: bzrlib/builtins.py:6286
3905
3889
msgid " To list the current view::"
3908
#: bzrlib/builtins.py:6312
3892
#: bzrlib/builtins.py:6288
3909
3893
msgid " bzr view"
3912
#: bzrlib/builtins.py:6314
3896
#: bzrlib/builtins.py:6290
3913
3897
msgid " To delete the current view::"
3916
#: bzrlib/builtins.py:6316
3900
#: bzrlib/builtins.py:6292
3917
3901
msgid " bzr view --delete"
3920
#: bzrlib/builtins.py:6318
3904
#: bzrlib/builtins.py:6294
3921
3905
msgid " To disable the current view without deleting it::"
3924
#: bzrlib/builtins.py:6320
3908
#: bzrlib/builtins.py:6296
3925
3909
msgid " bzr view --switch off"
3928
#: bzrlib/builtins.py:6322
3912
#: bzrlib/builtins.py:6298
3929
3913
msgid " To define a named view and switch to it::"
3932
#: bzrlib/builtins.py:6324
3916
#: bzrlib/builtins.py:6300
3933
3917
msgid " bzr view --name view-name file1 dir1 ..."
3936
#: bzrlib/builtins.py:6326
3920
#: bzrlib/builtins.py:6302
3937
3921
msgid " To list a named view::"
3940
#: bzrlib/builtins.py:6328
3924
#: bzrlib/builtins.py:6304
3941
3925
msgid " bzr view --name view-name"
3944
#: bzrlib/builtins.py:6330
3928
#: bzrlib/builtins.py:6306
3945
3929
msgid " To delete a named view::"
3948
#: bzrlib/builtins.py:6332
3932
#: bzrlib/builtins.py:6308
3949
3933
msgid " bzr view --name view-name --delete"
3952
#: bzrlib/builtins.py:6334
3936
#: bzrlib/builtins.py:6310
3953
3937
msgid " To switch to a named view::"
3956
#: bzrlib/builtins.py:6336
3940
#: bzrlib/builtins.py:6312
3957
3941
msgid " bzr view --switch view-name"
3960
#: bzrlib/builtins.py:6338
3944
#: bzrlib/builtins.py:6314
3961
3945
msgid " To list all views defined::"
3964
#: bzrlib/builtins.py:6340
3948
#: bzrlib/builtins.py:6316
3965
3949
msgid " bzr view --all"
3968
#: bzrlib/builtins.py:6342
3952
#: bzrlib/builtins.py:6318
3969
3953
msgid " To delete all views::"
3972
#: bzrlib/builtins.py:6344
3956
#: bzrlib/builtins.py:6320
3973
3957
msgid " bzr view --delete --all"
3976
#: bzrlib/builtins.py:6351
3960
#: bzrlib/builtins.py:6327
3977
3961
msgid "Apply list or delete action to all views."
3980
#: bzrlib/builtins.py:6354
3964
#: bzrlib/builtins.py:6330
3981
3965
msgid "Delete the view."
3984
#: bzrlib/builtins.py:6357
3968
#: bzrlib/builtins.py:6333
3985
3969
msgid "Name of the view to define, list or delete."
3988
#: bzrlib/builtins.py:6361
3972
#: bzrlib/builtins.py:6337
3989
3973
msgid "Name of the view to switch to."
3992
#: bzrlib/builtins.py:6380
3976
#: bzrlib/builtins.py:6356
3993
3977
msgid "Both --delete and a file list specified"
3996
#: bzrlib/builtins.py:6383
3980
#: bzrlib/builtins.py:6359
3997
3981
msgid "Both --delete and --switch specified"
4000
#: bzrlib/builtins.py:6386
3984
#: bzrlib/builtins.py:6362
4001
3985
msgid "Deleted all views.\n"
4004
#: bzrlib/builtins.py:6388
3988
#: bzrlib/builtins.py:6364
4005
3989
msgid "No current view to delete"
4008
#: bzrlib/builtins.py:6391
3992
#: bzrlib/builtins.py:6367
4009
3993
#, python-format
4010
3994
msgid "Deleted '%s' view.\n"
4013
#: bzrlib/builtins.py:6395
3997
#: bzrlib/builtins.py:6371
4014
3998
msgid "Both --switch and a file list specified"
4017
#: bzrlib/builtins.py:6398
4001
#: bzrlib/builtins.py:6374
4018
4002
msgid "Both --switch and --all specified"
4021
#: bzrlib/builtins.py:6401
4005
#: bzrlib/builtins.py:6377
4022
4006
msgid "No current view to disable"
4025
#: bzrlib/builtins.py:6403
4009
#: bzrlib/builtins.py:6379
4026
4010
#, python-format
4027
4011
msgid "Disabled '%s' view.\n"
4030
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4014
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4031
4015
msgid "Using '{0}' view: {1}\n"
4034
#: bzrlib/builtins.py:6410
4018
#: bzrlib/builtins.py:6386
4035
4019
msgid "Views defined:\n"
4038
#: bzrlib/builtins.py:6419
4022
#: bzrlib/builtins.py:6395
4039
4023
msgid "No views defined.\n"
4042
#: bzrlib/builtins.py:6426
4026
#: bzrlib/builtins.py:6402
4043
4027
msgid "Cannot change the 'off' pseudo view"
4046
#: bzrlib/builtins.py:6434
4030
#: bzrlib/builtins.py:6410
4047
4031
msgid "No current view.\n"
4050
#: bzrlib/builtins.py:6437
4034
#: bzrlib/builtins.py:6413
4051
4035
msgid "'{0}' view is: {1}\n"
4054
#: bzrlib/builtins.py:6457
4038
#: bzrlib/builtins.py:6433
4055
4039
msgid " <no hooks installed>\n"
4058
#: bzrlib/builtins.py:6461
4042
#: bzrlib/builtins.py:6437
4059
4043
msgid "Remove a branch."
4062
#: bzrlib/builtins.py:6463
4046
#: bzrlib/builtins.py:6439
4064
4048
"This will remove the branch from the specified location but \n"
4065
4049
"will keep any working tree or repository in place."
4068
#: bzrlib/builtins.py:6468
4052
#: bzrlib/builtins.py:6444
4069
4053
msgid " Remove the branch at repo/trunk::"
4072
#: bzrlib/builtins.py:6470
4056
#: bzrlib/builtins.py:6446
4073
4057
msgid " bzr remove-branch repo/trunk"
4076
#: bzrlib/builtins.py:6477
4077
msgid "Remove branch even if it is the active branch."
4080
#: bzrlib/builtins.py:6491
4081
msgid "Branch is active. Use --force to remove it."
4084
#: bzrlib/builtins.py:6495
4060
#: bzrlib/builtins.py:6461
4085
4061
msgid "Plaintext diff output."
4088
#: bzrlib/builtins.py:6496
4064
#: bzrlib/builtins.py:6462
4089
4065
msgid "Temporarily set aside some changes from the current tree."
4092
#: bzrlib/builtins.py:6498
4068
#: bzrlib/builtins.py:6464
4094
4070
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4095
4071
"ie. out of the way, until a later time when you can bring them back from\n"
4150
#: bzrlib/builtins.py:6537
4126
#: bzrlib/builtins.py:6503
4151
4127
msgid "Shelve all changes."
4154
#: bzrlib/builtins.py:6539
4130
#: bzrlib/builtins.py:6505
4155
4131
msgid "Method to use for writing diffs."
4158
#: bzrlib/builtins.py:6539
4134
#: bzrlib/builtins.py:6505
4162
#: bzrlib/builtins.py:6543
4138
#: bzrlib/builtins.py:6509
4163
4139
msgid "List shelved changes."
4166
#: bzrlib/builtins.py:6545
4142
#: bzrlib/builtins.py:6511
4167
4143
msgid "Destroy removed changes instead of shelving them."
4170
#: bzrlib/builtins.py:6574
4146
#: bzrlib/builtins.py:6540
4171
4147
msgid "No shelved changes."
4174
#: bzrlib/builtins.py:6585
4150
#: bzrlib/builtins.py:6551
4175
4151
msgid "Restore shelved changes."
4178
#: bzrlib/builtins.py:6587
4154
#: bzrlib/builtins.py:6553
4180
4156
"By default, the most recently shelved changes are restored. However if you\n"
4181
4157
"specify a shelf by id those changes will be restored instead. This works\n"
4182
4158
"best when the changes don't depend on each other."
4185
#: bzrlib/builtins.py:6596
4161
#: bzrlib/builtins.py:6562
4186
4162
msgid "The action to perform."
4189
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4165
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4193
#: bzrlib/builtins.py:6598
4169
#: bzrlib/builtins.py:6564
4194
4170
msgid "Apply changes and remove from the shelf."
4197
#: bzrlib/builtins.py:6599
4173
#: bzrlib/builtins.py:6565
4198
4174
msgid "Show changes, but do not apply or remove them."
4201
#: bzrlib/builtins.py:6600
4177
#: bzrlib/builtins.py:6566
4203
4179
"Instead of unshelving the changes, show the diff that would result from "
4207
#: bzrlib/builtins.py:6602
4183
#: bzrlib/builtins.py:6568
4208
4184
msgid "Delete changes without applying them."
4211
#: bzrlib/builtins.py:6603
4187
#: bzrlib/builtins.py:6569
4212
4188
msgid "Apply changes but don't delete them."
4215
#: bzrlib/builtins.py:6618
4191
#: bzrlib/builtins.py:6584
4216
4192
msgid "Remove unwanted files from working tree."
4219
#: bzrlib/builtins.py:6620
4195
#: bzrlib/builtins.py:6586
4221
4197
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4222
4198
"files are never deleted."
4225
#: bzrlib/builtins.py:6623
4201
#: bzrlib/builtins.py:6589
4227
4203
"Another class is 'detritus', which includes files emitted by bzr during\n"
4228
4204
"normal operations and selftests. (The value of these files decreases with\n"
4232
#: bzrlib/builtins.py:6627
4208
#: bzrlib/builtins.py:6593
4234
4210
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4235
4211
"flags are respected, and may be combined."
4238
#: bzrlib/builtins.py:6630
4214
#: bzrlib/builtins.py:6596
4239
4215
msgid "To check what clean-tree will do, use --dry-run."
4242
#: bzrlib/builtins.py:6633
4218
#: bzrlib/builtins.py:6599
4243
4219
msgid "Delete all ignored files."
4246
#: bzrlib/builtins.py:6634
4222
#: bzrlib/builtins.py:6600
4248
4224
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4251
#: bzrlib/builtins.py:6637
4227
#: bzrlib/builtins.py:6603
4252
4228
msgid "Delete files unknown to bzr (default)."
4255
#: bzrlib/builtins.py:6638
4231
#: bzrlib/builtins.py:6604
4256
4232
msgid "Show files to delete instead of deleting them."
4259
#: bzrlib/builtins.py:6640
4235
#: bzrlib/builtins.py:6606
4260
4236
msgid "Do not prompt before deleting."
5174
#: bzrlib/errors.py:818
5139
#: bzrlib/errors.py:809
5175
5140
msgid "Revision is not compatible with %(repo_format)s"
5178
#: bzrlib/errors.py:828
5143
#: bzrlib/errors.py:819
5179
5144
msgid "%(context_info)s%(path)s is already versioned."
5182
#: bzrlib/errors.py:849
5147
#: bzrlib/errors.py:840
5183
5148
msgid "%(context_info)s%(path)s is not versioned."
5186
#: bzrlib/errors.py:870
5151
#: bzrlib/errors.py:861
5187
5152
msgid "Path(s) are not versioned: %(paths_as_string)s"
5190
#: bzrlib/errors.py:881
5155
#: bzrlib/errors.py:872
5191
5156
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5194
#: bzrlib/errors.py:900
5159
#: bzrlib/errors.py:891
5195
5160
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5198
#: bzrlib/errors.py:908
5163
#: bzrlib/errors.py:899
5200
5165
"Filename %(filename)r is not valid in your current filesystem encoding "
5201
5166
"%(fs_encoding)s"
5204
#: bzrlib/errors.py:919
5169
#: bzrlib/errors.py:910
5205
5170
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5208
#: bzrlib/errors.py:937
5173
#: bzrlib/errors.py:928
5209
5174
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5212
#: bzrlib/errors.py:976
5177
#: bzrlib/errors.py:967
5213
5178
msgid "Cannot lock %(lock)s: %(why)s"
5216
#: bzrlib/errors.py:986
5181
#: bzrlib/errors.py:977
5218
5183
"A transaction related operation was attempted after the transaction finished."
5221
#: bzrlib/errors.py:1013
5186
#: bzrlib/errors.py:1004
5222
5187
msgid "Cannot lock: transport is read only: %(transport)s"
5225
#: bzrlib/errors.py:1021
5190
#: bzrlib/errors.py:1012
5226
5191
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5229
#: bzrlib/errors.py:1032
5194
#: bzrlib/errors.py:1023
5231
5196
"Lock was broken while still open: %(lock)s - check storage consistency!"
5234
#: bzrlib/errors.py:1043
5199
#: bzrlib/errors.py:1034
5236
5201
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5237
5202
"%(holder)r, wanted to break %(target)r"
5240
#: bzrlib/errors.py:1055
5205
#: bzrlib/errors.py:1046
5242
5207
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5243
5208
"Use 'bzr break-lock' to clear it"
5246
#: bzrlib/errors.py:1068
5211
#: bzrlib/errors.py:1059
5247
5212
msgid "Lock not held: %(lock)s"
5250
#: bzrlib/errors.py:1097
5215
#: bzrlib/errors.py:1088
5251
5216
msgid "No changes to commit"
5254
#: bzrlib/errors.py:1102
5219
#: bzrlib/errors.py:1093
5256
5221
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5259
#: bzrlib/errors.py:1112
5224
#: bzrlib/errors.py:1103
5261
5226
"Excluding paths during commit is not supported by repository at "
5262
5227
"%(repository)r."
5265
#: bzrlib/errors.py:1121
5230
#: bzrlib/errors.py:1112
5267
5232
"The specified commit message contains characters unsupported by the current "
5271
#: bzrlib/errors.py:1127
5236
#: bzrlib/errors.py:1118
5272
5237
msgid "Upgrade URL cannot work with readonly URLs."
5275
#: bzrlib/errors.py:1132
5240
#: bzrlib/errors.py:1123
5276
5241
msgid "The branch format %(format)s is already at the most recent format."
5279
#: bzrlib/errors.py:1155
5244
#: bzrlib/errors.py:1146
5280
5245
msgid "Option --change does not accept revision ranges"
5283
#: bzrlib/errors.py:1160
5248
#: bzrlib/errors.py:1151
5284
5249
msgid "No namespace registered for string: %(spec)r"
5287
#: bzrlib/errors.py:1179
5252
#: bzrlib/errors.py:1170
5289
5254
"Requested revision: '%(spec)s' does not exist in branch: "
5290
5255
"%(branch_url)s%(extra)s"
5293
#: bzrlib/errors.py:1193
5258
#: bzrlib/errors.py:1184
5295
5260
"Operation denied because it would change the main history, which is not "
5296
5261
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5299
#: bzrlib/errors.py:1204
5264
#: bzrlib/errors.py:1195
5301
5266
"These branches have diverged. Use the missing command to see how.\n"
5302
5267
"Use the merge command to reconcile them."
5305
#: bzrlib/errors.py:1224
5270
#: bzrlib/errors.py:1215
5307
5272
"Branches have no common ancestor, and no merge base revision was specified."
5310
#: bzrlib/errors.py:1230
5275
#: bzrlib/errors.py:1221
5312
5277
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5280
#: bzrlib/errors.py:1227
5281
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5315
5284
#: bzrlib/errors.py:1236
5316
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5286
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5319
5289
#: bzrlib/errors.py:1245
5321
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5290
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5324
5293
#: bzrlib/errors.py:1254
5325
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5328
#: bzrlib/errors.py:1263
5329
5294
msgid "Branch %(branch)s has no commits."
5332
#: bzrlib/errors.py:1281
5297
#: bzrlib/errors.py:1272
5334
5299
"Bound branch %(branch)s is out of date with master branch "
5335
5300
"%(master)s.%(extra_help)s"
5338
#: bzrlib/errors.py:1293
5303
#: bzrlib/errors.py:1284
5340
5305
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5341
5306
"bound to %(remote)s."
5309
#: bzrlib/errors.py:1296
5310
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5344
5313
#: bzrlib/errors.py:1305
5345
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5348
#: bzrlib/errors.py:1314
5350
5315
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5319
#: bzrlib/errors.py:1317
5320
msgid "Error in processing weave: %(msg)s"
5354
5323
#: bzrlib/errors.py:1326
5355
msgid "Error in processing weave: %(msg)s"
5358
#: bzrlib/errors.py:1335
5359
5324
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5362
#: bzrlib/errors.py:1346
5327
#: bzrlib/errors.py:1337
5363
5328
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5331
#: bzrlib/errors.py:1347
5332
msgid "Weave invariant violated: %(what)s"
5366
5335
#: bzrlib/errors.py:1356
5367
msgid "Weave invariant violated: %(what)s"
5370
#: bzrlib/errors.py:1365
5371
5336
msgid "Parents are mismatched between two revisions. %(msg)s"
5374
#: bzrlib/errors.py:1387
5339
#: bzrlib/errors.py:1378
5376
5341
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5380
#: bzrlib/errors.py:1399
5345
#: bzrlib/errors.py:1390
5381
5346
msgid "Versioned file error"
5384
#: bzrlib/errors.py:1404
5349
#: bzrlib/errors.py:1395
5385
5350
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5388
#: bzrlib/errors.py:1414
5353
#: bzrlib/errors.py:1405
5389
5354
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5392
#: bzrlib/errors.py:1424
5357
#: bzrlib/errors.py:1415
5393
5358
msgid "Text did not match its checksum: %(msg)s"
5361
#: bzrlib/errors.py:1541
5362
msgid "Export format %(format)r not supported"
5396
5365
#: bzrlib/errors.py:1550
5397
msgid "Export format %(format)r not supported"
5400
#: bzrlib/errors.py:1559
5401
5366
msgid "Transport error: %(msg)s %(orig_error)s"
5404
#: bzrlib/errors.py:1585
5369
#: bzrlib/errors.py:1576
5405
5370
msgid "Generic bzr smart protocol error: %(details)s"
5408
#: bzrlib/errors.py:1593
5373
#: bzrlib/errors.py:1584
5409
5374
msgid "Received bad protocol version marker: %(marker)r"
5412
#: bzrlib/errors.py:1625
5377
#: bzrlib/errors.py:1616
5413
5378
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5416
#: bzrlib/errors.py:1630
5381
#: bzrlib/errors.py:1621
5417
5382
msgid "Connection error: %(msg)s %(orig_error)s"
5420
#: bzrlib/errors.py:1635
5385
#: bzrlib/errors.py:1626
5421
5386
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5424
#: bzrlib/errors.py:1656
5389
#: bzrlib/errors.py:1647
5425
5390
msgid "Connection closed: %(msg)s %(orig_error)s"
5428
#: bzrlib/errors.py:1661
5393
#: bzrlib/errors.py:1652
5429
5394
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5432
#: bzrlib/errors.py:1666
5397
#: bzrlib/errors.py:1657
5433
5398
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5436
#: bzrlib/errors.py:1676
5401
#: bzrlib/errors.py:1667
5437
5402
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5440
#: bzrlib/errors.py:1691
5405
#: bzrlib/errors.py:1682
5441
5406
msgid "Certificate error: %(error)s"
5444
#: bzrlib/errors.py:1699
5409
#: bzrlib/errors.py:1690
5445
5410
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5448
#: bzrlib/errors.py:1713
5413
#: bzrlib/errors.py:1704
5449
5414
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5417
#: bzrlib/errors.py:1712
5418
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5452
5421
#: bzrlib/errors.py:1721
5453
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5456
#: bzrlib/errors.py:1730
5457
5422
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5460
#: bzrlib/errors.py:1744
5425
#: bzrlib/errors.py:1735
5461
5426
msgid "Too many redirections"
5464
#: bzrlib/errors.py:1749
5429
#: bzrlib/errors.py:1740
5465
5430
msgid "Working tree has conflicts."
5433
#: bzrlib/errors.py:1744
5434
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5468
5437
#: bzrlib/errors.py:1753
5469
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5472
#: bzrlib/errors.py:1762
5474
5439
"Error(s) parsing config file %(filename)s:\n"
5478
#: bzrlib/errors.py:1772
5443
#: bzrlib/errors.py:1763
5480
5445
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5481
5446
"See ``bzr help %(name)s``"
5449
#: bzrlib/errors.py:1773
5450
msgid "%(username)r does not seem to contain a reasonable email address"
5484
5453
#: bzrlib/errors.py:1782
5485
msgid "%(username)r does not seem to contain a reasonable email address"
5488
#: bzrlib/errors.py:1791
5489
5454
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5492
#: bzrlib/errors.py:1799
5457
#: bzrlib/errors.py:1790
5493
5458
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5496
#: bzrlib/errors.py:1807
5461
#: bzrlib/errors.py:1798
5497
5462
msgid "Unable to import library \"%(library)s\": %(error)s"
5500
#: bzrlib/errors.py:1815
5465
#: bzrlib/errors.py:1806
5501
5466
msgid "python-gpgme is not installed, it is needed to verify signatures"
5504
#: bzrlib/errors.py:1823
5469
#: bzrlib/errors.py:1814
5506
5471
"The working tree for %(basedir)s has changed since the last commit, but "
5507
5472
"weave merge requires that it be unchanged"
5510
#: bzrlib/errors.py:1833
5475
#: bzrlib/errors.py:1824
5512
5477
"Can't reprocess and show base, because reprocessing obscures the "
5513
5478
"relationship of conflicting lines to the base"
5516
#: bzrlib/errors.py:1839
5481
#: bzrlib/errors.py:1830
5517
5482
msgid "Cycle in graph %(graph)r"
5520
#: bzrlib/errors.py:1867
5485
#: bzrlib/errors.py:1858
5521
5486
msgid "File %(filename)s is not conflicted."
5489
#: bzrlib/errors.py:1880
5490
msgid "No bundle was found in \"%(filename)s\"."
5524
5493
#: bzrlib/errors.py:1889
5525
msgid "No bundle was found in \"%(filename)s\"."
5528
#: bzrlib/errors.py:1898
5529
5494
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5532
#: bzrlib/errors.py:1908
5497
#: bzrlib/errors.py:1899
5533
5498
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5536
#: bzrlib/errors.py:1921
5501
#: bzrlib/errors.py:1912
5537
5502
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5540
#: bzrlib/errors.py:1931
5505
#: bzrlib/errors.py:1922
5541
5506
msgid "Key %(key)s is already present in map"
5544
#: bzrlib/errors.py:1936
5509
#: bzrlib/errors.py:1927
5545
5510
msgid "The prefix %(prefix)s is in the help search path twice."
5548
#: bzrlib/errors.py:1946
5513
#: bzrlib/errors.py:1937
5550
5515
"No final name for trans_id %(trans_id)r\n"
5551
5516
"file-id: %(file_id)r\n"
5552
5517
"root trans-id: %(root_trans_id)r\n"
5555
#: bzrlib/errors.py:1978
5520
#: bzrlib/errors.py:1969
5556
5521
msgid "Attempt to reuse a transform that has already been applied."
5559
#: bzrlib/errors.py:1983
5524
#: bzrlib/errors.py:1974
5560
5525
msgid "Moving the root directory is not supported at this time"
5563
#: bzrlib/errors.py:1988
5528
#: bzrlib/errors.py:1979
5564
5529
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5567
#: bzrlib/errors.py:1999
5532
#: bzrlib/errors.py:1990
5569
5534
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5572
#: bzrlib/errors.py:2035
5537
#: bzrlib/errors.py:2026
5574
5539
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5577
#: bzrlib/errors.py:2065
5542
#: bzrlib/errors.py:2056
5578
5543
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5581
#: bzrlib/errors.py:2073
5546
#: bzrlib/errors.py:2064
5582
5547
msgid "Nothing to merge."
5550
#: bzrlib/errors.py:2069
5551
msgid "Format %(format)s cannot be initialised by this version of bzr."
5585
5554
#: bzrlib/errors.py:2078
5586
msgid "Format %(format)s cannot be initialised by this version of bzr."
5589
#: bzrlib/errors.py:2087
5591
5556
"Cannot convert from format %(from_format)s to format %(format)s. "
5595
#: bzrlib/errors.py:2099
5560
#: bzrlib/errors.py:2090
5596
5561
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5599
#: bzrlib/errors.py:2107
5564
#: bzrlib/errors.py:2098
5600
5565
msgid "%(exe_name)s could not be found on this machine"
5603
#: bzrlib/errors.py:2115
5568
#: bzrlib/errors.py:2106
5604
5569
msgid "Diff is not installed on this machine: %(msg)s"
5607
#: bzrlib/errors.py:2123
5572
#: bzrlib/errors.py:2114
5608
5573
msgid "Diff3 is not installed on this machine."
5611
#: bzrlib/errors.py:2129
5576
#: bzrlib/errors.py:2120
5612
5577
msgid "The content being inserted is already present."
5615
#: bzrlib/errors.py:2134
5580
#: bzrlib/errors.py:2125
5617
5582
"This tree contains left-over files from a failed operation.\n"
5618
5583
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5635
5600
" keep, and delete it when you are done."
5638
#: bzrlib/errors.py:2166
5603
#: bzrlib/errors.py:2157
5640
5605
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5641
5606
"examine %(pending_deletion)s to see if it contains any files you wish to "
5642
5607
"keep, and delete it when you are done."
5645
#: bzrlib/errors.py:2176
5610
#: bzrlib/errors.py:2167
5646
5611
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5649
#: bzrlib/errors.py:2190
5614
#: bzrlib/errors.py:2181
5651
5616
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5654
#: bzrlib/errors.py:2203
5619
#: bzrlib/errors.py:2194
5655
5620
msgid "Error in merge modified format"
5658
#: bzrlib/errors.py:2208
5623
#: bzrlib/errors.py:2199
5659
5624
msgid "Format error in conflict listings"
5662
#: bzrlib/errors.py:2212
5627
#: bzrlib/errors.py:2203
5664
5629
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5665
5630
"Error: %(description)s"
5668
#: bzrlib/errors.py:2223
5633
#: bzrlib/errors.py:2214
5670
5635
"An error has been detected in the repository %(repo_path)s.\n"
5671
5636
"Please run bzr reconcile on this repository."
5674
#: bzrlib/errors.py:2234
5639
#: bzrlib/errors.py:2225
5676
5641
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5677
5642
"reason: %(reason)s"
5680
#: bzrlib/errors.py:2247
5645
#: bzrlib/errors.py:2238
5682
5647
"An inconsistent delta was supplied: %(delta)r\n"
5683
5648
"reason: %(reason)s"
5651
#: bzrlib/errors.py:2250
5652
msgid "To use this feature you must upgrade your branch at %(path)s."
5686
5655
#: bzrlib/errors.py:2259
5687
msgid "To use this feature you must upgrade your branch at %(path)s."
5690
#: bzrlib/errors.py:2268
5691
5656
msgid "To use this feature you must upgrade your repository at %(path)s."
5694
#: bzrlib/errors.py:2273
5659
#: bzrlib/errors.py:2264
5696
5661
"To use this feature you must upgrade your branch at %(path)s to a format "
5697
5662
"which supports rich roots."
5700
#: bzrlib/errors.py:2279
5665
#: bzrlib/errors.py:2270
5701
5666
msgid "Cannot perform local-only commits on unbound branches."
5704
#: bzrlib/errors.py:2284
5669
#: bzrlib/errors.py:2275
5705
5670
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5708
#: bzrlib/errors.py:2305
5673
#: bzrlib/errors.py:2296
5709
5674
msgid "Ghost tags not supported by format %(format)r."
5712
#: bzrlib/errors.py:2313
5677
#: bzrlib/errors.py:2304
5713
5678
msgid "File is binary but should be text."
5681
#: bzrlib/errors.py:2309
5682
msgid "The path %(path)s is not permitted on this platform"
5716
5685
#: bzrlib/errors.py:2318
5717
msgid "The path %(path)s is not permitted on this platform"
5720
#: bzrlib/errors.py:2327
5722
5687
"Testament did not match expected value.\n"
5723
5688
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5724
5689
" {%(measured)s}"
5692
#: bzrlib/errors.py:2330
5693
msgid "Not a bzr revision-bundle: %(text)r"
5727
5696
#: bzrlib/errors.py:2339
5728
msgid "Not a bzr revision-bundle: %(text)r"
5697
msgid "Bad bzr revision-bundle: %(text)r"
5731
5700
#: bzrlib/errors.py:2348
5732
msgid "Bad bzr revision-bundle: %(text)r"
5735
#: bzrlib/errors.py:2357
5736
5701
msgid "Malformed bzr revision-bundle header: %(text)r"
5739
#: bzrlib/errors.py:2362
5704
#: bzrlib/errors.py:2353
5740
5705
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5743
#: bzrlib/errors.py:2367
5708
#: bzrlib/errors.py:2358
5744
5709
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5747
#: bzrlib/errors.py:2372
5712
#: bzrlib/errors.py:2363
5748
5713
msgid "End of line marker was not \\n in bzr revision-bundle"
5751
#: bzrlib/errors.py:2382
5716
#: bzrlib/errors.py:2373
5752
5717
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5755
#: bzrlib/errors.py:2392
5720
#: bzrlib/errors.py:2383
5756
5721
msgid "Root class for inventory serialization errors"
5759
#: bzrlib/errors.py:2396
5724
#: bzrlib/errors.py:2387
5761
5726
"The inventory was not in the expected format:\n"
5765
#: bzrlib/errors.py:2405
5730
#: bzrlib/errors.py:2396
5766
5731
msgid "This operation requires rich root data storage"
5734
#: bzrlib/errors.py:2409
5735
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5769
5738
#: bzrlib/errors.py:2418
5770
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5773
#: bzrlib/errors.py:2427
5775
5740
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5779
#: bzrlib/errors.py:2434
5744
#: bzrlib/errors.py:2425
5781
5746
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5782
5747
"ghost at {%(ghost_revision_id)s}"
5785
#: bzrlib/errors.py:2444
5750
#: bzrlib/errors.py:2435
5786
5751
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5789
#: bzrlib/errors.py:2495
5754
#: bzrlib/errors.py:2486
5791
5756
"A merge directive must provide either a bundle or a public branch location."
5794
#: bzrlib/errors.py:2502
5759
#: bzrlib/errors.py:2493
5795
5760
msgid "Bad merge directive payload %(start)r"
5798
#: bzrlib/errors.py:2512
5763
#: bzrlib/errors.py:2503
5799
5764
msgid "Preview patch does not match requested changes."
5802
#: bzrlib/errors.py:2518
5767
#: bzrlib/errors.py:2509
5803
5768
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5806
#: bzrlib/errors.py:2528
5771
#: bzrlib/errors.py:2519
5808
5773
"Your branch does not have all of the revisions required in order to merge "
5809
5774
"this merge directive and the target location specified in the merge "
5810
5775
"directive is not a branch: %(location)s."
5813
#: bzrlib/errors.py:2540
5778
#: bzrlib/errors.py:2531
5814
5779
msgid "Unsupported entry kind %(kind)s"
5817
#: bzrlib/errors.py:2548
5782
#: bzrlib/errors.py:2539
5818
5783
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5821
#: bzrlib/errors.py:2558
5786
#: bzrlib/errors.py:2549
5822
5787
msgid "Subsume target %(other_tree)s needs to be upgraded."
5825
#: bzrlib/errors.py:2577
5790
#: bzrlib/errors.py:2568
5826
5791
msgid "No such tag: %(tag_name)s"
5794
#: bzrlib/errors.py:2576
5795
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5829
5798
#: bzrlib/errors.py:2585
5830
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5833
#: bzrlib/errors.py:2594
5834
5799
msgid "Tag %(tag_name)s already exists."
5837
#: bzrlib/errors.py:2602
5802
#: bzrlib/errors.py:2593
5839
5804
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5840
5805
"bugs\" for more information on this feature."
5843
#: bzrlib/errors.py:2612
5808
#: bzrlib/errors.py:2603
5845
5810
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5848
#: bzrlib/errors.py:2622
5813
#: bzrlib/errors.py:2613
5850
5815
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5853
#: bzrlib/errors.py:2632
5818
#: bzrlib/errors.py:2623
5854
5819
msgid "Invalid line in bugs property: '%(line)s'"
5857
#: bzrlib/errors.py:2640
5822
#: bzrlib/errors.py:2631
5858
5823
msgid "Invalid bug status: '%(status)s'"
5861
#: bzrlib/errors.py:2648
5826
#: bzrlib/errors.py:2639
5862
5827
msgid "Could not understand response from smart server: %(response_tuple)r"
5865
#: bzrlib/errors.py:2687
5830
#: bzrlib/errors.py:2678
5866
5831
msgid "Server sent an unexpected error: %(error_tuple)r"
5869
#: bzrlib/errors.py:2706
5834
#: bzrlib/errors.py:2697
5870
5835
msgid "Unrecognised container format: %(container_format)r"
5873
#: bzrlib/errors.py:2714
5838
#: bzrlib/errors.py:2705
5874
5839
msgid "Unexpected end of container stream"
5877
#: bzrlib/errors.py:2719
5842
#: bzrlib/errors.py:2710
5878
5843
msgid "Unknown record type: %(record_type)r"
5881
#: bzrlib/errors.py:2727
5846
#: bzrlib/errors.py:2718
5882
5847
msgid "Invalid record: %(reason)s"
5885
#: bzrlib/errors.py:2735
5850
#: bzrlib/errors.py:2726
5886
5851
msgid "Container has data after end marker: %(excess)r"
5889
#: bzrlib/errors.py:2743
5854
#: bzrlib/errors.py:2734
5890
5855
msgid "Container has multiple records with the same name: %(name)s"
5893
#: bzrlib/errors.py:2756
5858
#: bzrlib/errors.py:2747
5894
5859
msgid "Corrupt or incompatible data stream: %(reason)s"
5897
#: bzrlib/errors.py:2764
5862
#: bzrlib/errors.py:2755
5898
5863
msgid "SMTP error: %(error)s"
5901
#: bzrlib/errors.py:2772
5866
#: bzrlib/errors.py:2763
5902
5867
msgid "No message supplied."
5905
#: bzrlib/errors.py:2777
5870
#: bzrlib/errors.py:2768
5906
5871
msgid "No mail-to address (--mail-to) or output (-o) specified."
5909
#: bzrlib/errors.py:2782
5874
#: bzrlib/errors.py:2773
5875
msgid "Unknown mail client: %(mail_client)s"
5878
#: bzrlib/errors.py:2781
5911
5880
"Unable to find mail client with the following names: "
5912
5881
"%(mail_command_list_string)s"
5915
#: bzrlib/errors.py:2792
5884
#: bzrlib/errors.py:2791
5916
5885
msgid "SMTP connection to %(host)s refused"
5919
#: bzrlib/errors.py:2801
5888
#: bzrlib/errors.py:2800
5920
5889
msgid "Please specify smtp_server. No server at default %(host)s."
5923
#: bzrlib/errors.py:2815
5892
#: bzrlib/errors.py:2814
5925
5894
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5929
#: bzrlib/errors.py:2827
5898
#: bzrlib/errors.py:2826
5930
5899
msgid "'%(display_url)s' is already a branch."
5933
#: bzrlib/errors.py:2832
5902
#: bzrlib/errors.py:2831
5934
5903
msgid "'%(display_url)s' is already a tree."
5937
#: bzrlib/errors.py:2837
5906
#: bzrlib/errors.py:2836
5938
5907
msgid "'%(display_url)s' is already a checkout."
5941
#: bzrlib/errors.py:2842
5910
#: bzrlib/errors.py:2841
5942
5911
msgid "'%(display_url)s' is already a lightweight checkout."
5945
#: bzrlib/errors.py:2847
5914
#: bzrlib/errors.py:2846
5946
5915
msgid "'%(display_url)s' is already using a shared repository."
5949
#: bzrlib/errors.py:2852
5918
#: bzrlib/errors.py:2851
5950
5919
msgid "'%(display_url)s' is already standalone."
5953
#: bzrlib/errors.py:2857
5922
#: bzrlib/errors.py:2856
5954
5923
msgid "Shared repository '%(display_url)s' already creates working trees."
5957
#: bzrlib/errors.py:2863
5926
#: bzrlib/errors.py:2862
5959
5928
"Shared repository '%(display_url)s' already doesn't create working trees."
5962
#: bzrlib/errors.py:2869
5931
#: bzrlib/errors.py:2868
5963
5932
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5966
#: bzrlib/errors.py:2874
5935
#: bzrlib/errors.py:2873
5967
5936
msgid "No location could be found to bind to at %(display_url)s."
5970
#: bzrlib/errors.py:2879
5939
#: bzrlib/errors.py:2878
5972
5941
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5973
5942
"status).%(more)s"
5976
#: bzrlib/errors.py:2898
5945
#: bzrlib/errors.py:2897
5978
5947
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5979
5948
"list).%(more)s"
5982
#: bzrlib/errors.py:2904
5951
#: bzrlib/errors.py:2903
5983
5952
msgid "Variable {%(name)s} is not available."
5986
#: bzrlib/errors.py:2912
5955
#: bzrlib/errors.py:2911
5987
5956
msgid "No template specified."
5990
#: bzrlib/errors.py:2917
5959
#: bzrlib/errors.py:2916
5991
5960
msgid "Unable to create symlink %(path_str)son this platform"
5994
#: bzrlib/errors.py:2932
5963
#: bzrlib/errors.py:2931
5996
5965
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5997
5966
"\"original\", \"local\"."
6000
#: bzrlib/errors.py:2966
5969
#: bzrlib/errors.py:2965
6002
5971
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6005
#: bzrlib/errors.py:2978
5974
#: bzrlib/errors.py:2977
6006
5975
msgid "The \"%(config_id)s\" configuration does not exist."
6009
#: bzrlib/errors.py:2986
5978
#: bzrlib/errors.py:2985
6010
5979
msgid "The \"%(option_name)s\" configuration option does not exist."
6013
#: bzrlib/errors.py:2994
5982
#: bzrlib/errors.py:2993
6014
5983
msgid "The alias \"%(alias_name)s\" does not exist."
6017
#: bzrlib/errors.py:3008
5986
#: bzrlib/errors.py:3007
6018
5987
msgid "\"%(alias_name)s\" is not a valid location alias."
6021
#: bzrlib/errors.py:3016
5990
#: bzrlib/errors.py:3015
6022
5991
msgid "No %(alias_name)s location assigned."
6025
#: bzrlib/errors.py:3024
5994
#: bzrlib/errors.py:3023
6026
5995
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6029
#: bzrlib/errors.py:3034
5998
#: bzrlib/errors.py:3033
6030
5999
msgid "Unknown rules detected: %(unknowns_str)s."
6033
#: bzrlib/errors.py:3045
6002
#: bzrlib/errors.py:3044
6034
6003
msgid "Tip change rejected: %(msg)s"
6037
#: bzrlib/errors.py:3053
6006
#: bzrlib/errors.py:3052
6038
6007
msgid "Shelf corrupt."
6041
#: bzrlib/errors.py:3058
6010
#: bzrlib/errors.py:3057
6042
6011
msgid "Corruption while decompressing repository file%(orig_error)s"
6045
#: bzrlib/errors.py:3070
6014
#: bzrlib/errors.py:3069
6046
6015
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6049
#: bzrlib/errors.py:3078
6018
#: bzrlib/errors.py:3077
6050
6019
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6053
#: bzrlib/errors.py:3086
6022
#: bzrlib/errors.py:3085
6055
6024
"An attempt to access a url outside the server jail was made: '%(url)s'."
6058
#: bzrlib/errors.py:3094
6027
#: bzrlib/errors.py:3093
6059
6028
msgid "The user aborted the operation."
6062
#: bzrlib/errors.py:3099
6031
#: bzrlib/errors.py:3098
6063
6032
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6066
#: bzrlib/errors.py:3109
6035
#: bzrlib/errors.py:3108
6067
6036
msgid "No such view: %(view_name)s."
6070
#: bzrlib/errors.py:3119
6039
#: bzrlib/errors.py:3118
6072
6041
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6073
6042
"to a later format."
6076
#: bzrlib/errors.py:3128
6045
#: bzrlib/errors.py:3127
6078
6047
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6081
#: bzrlib/errors.py:3195
6050
#: bzrlib/errors.py:3194
6082
6051
msgid "%(bzrdir)r does not support co-located branches."
6085
#: bzrlib/errors.py:3201
6054
#: bzrlib/errors.py:3200
6087
6056
"Unable to determine your name.\n"
6088
6057
"Please, set your name with the 'whoami' command.\n"
6089
6058
"E.g. bzr whoami \"Your Name <name@example.com>\""
6092
#: bzrlib/errors.py:3210
6061
#: bzrlib/errors.py:3209
6093
6062
msgid "Invalid pattern(s) found. %(msg)s"
6096
#: bzrlib/errors.py:3218
6065
#: bzrlib/errors.py:3217
6098
6067
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6099
6068
"unbind` to fix."
6102
#: bzrlib/errors.py:3229
6071
#: bzrlib/errors.py:3228
6103
6072
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6106
#: bzrlib/errors.py:3238
6075
#: bzrlib/errors.py:3237
6107
6076
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6110
#: bzrlib/errors.py:3247
6079
#: bzrlib/errors.py:3246
6112
6081
"No compatible object available for operations from %(source)r to %(target)r."
6115
#: bzrlib/errors.py:3257
6084
#: bzrlib/errors.py:3256
6117
6086
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6118
6087
"%(arguments)s."
6121
#: bzrlib/errors.py:3267
6090
#: bzrlib/errors.py:3266
6123
6092
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6124
6093
"format %(format)r"
6127
#: bzrlib/errors.py:3279
6096
#: bzrlib/errors.py:3278
6129
6098
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6133
#: bzrlib/errors.py:3292
6102
#: bzrlib/errors.py:3291
6134
6103
msgid "Binary files section encountered."
6137
#: bzrlib/errors.py:3300
6106
#: bzrlib/errors.py:3299
6139
6108
"Malformed patch header. %(desc)s\n"
6143
#: bzrlib/errors.py:3309
6112
#: bzrlib/errors.py:3308
6145
6114
"Malformed hunk header. %(desc)s\n"
6149
#: bzrlib/errors.py:3318
6118
#: bzrlib/errors.py:3317
6151
6120
"Malformed line. %(desc)s\n"
6155
#: bzrlib/errors.py:3328
6124
#: bzrlib/errors.py:3327
6157
6126
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6158
6127
"but patch says it should be \"%(patch_line)s\""
6161
#: bzrlib/errors.py:3339
6130
#: bzrlib/errors.py:3338
6162
6131
msgid "The feature %(feature)s has already been registered."
6210
6179
"regular push."
6213
#: bzrlib/gpg.py:366
6214
msgid "No GnuPG key results for pattern: {0}"
6217
#: bzrlib/gpg.py:439
6182
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6218
6183
msgid "{0} commits with valid signatures"
6221
#: bzrlib/gpg.py:445
6186
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6222
6187
msgid "{0} commit with unknown key"
6223
6188
msgid_plural "{0} commits with unknown keys"
6227
#: bzrlib/gpg.py:453
6192
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6228
6193
msgid "{0} commit not valid"
6229
6194
msgid_plural "{0} commits not valid"
6233
#: bzrlib/gpg.py:461
6198
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6234
6199
msgid "{0} commit not signed"
6235
6200
msgid_plural "{0} commits not signed"
6239
#: bzrlib/gpg.py:469
6204
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6240
6205
msgid "{0} commit with key now expired"
6241
6206
msgid_plural "{0} commits with key now expired"
6245
#: bzrlib/gpg.py:489
6246
msgid "{0} commit by author {1} with key {2} now expired"
6247
msgid_plural "{0} commits by author {1} with key {2} now expired"
6210
#: bzrlib/gpg.py:343
6211
msgid "No GnuPG key results for pattern: {0}"
6251
#: bzrlib/gpg.py:505
6214
#: bzrlib/gpg.py:386
6252
6215
msgid "{0} signed {1} commit"
6253
6216
msgid_plural "{0} signed {1} commits"
6257
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6220
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6258
6221
msgid "{0} commit by author {1}"
6259
6222
msgid_plural "{0} commits by author {1}"
6263
#: bzrlib/gpg.py:554
6226
#: bzrlib/gpg.py:433
6264
6227
msgid "Unknown key {0} signed {1} commit"
6265
6228
msgid_plural "Unknown key {0} signed {1} commits"
6232
#: bzrlib/gpg.py:452
6233
msgid "{0} commit by author {1} with key {2} now expired"
6234
msgid_plural "{0} commits by author {1} with key {2} now expired"
6269
6238
#: bzrlib/groupcompress.py:1739
6270
6239
#, python-format
6271
6240
msgid "Insert claimed random_id=True, but then inserted %r two times"
6274
#: bzrlib/hooks.py:313
6243
#: bzrlib/hooks.py:331
6275
6244
#, python-format
6276
6245
msgid "Introduced in: %s"
6279
#: bzrlib/hooks.py:316
6248
#: bzrlib/hooks.py:334
6280
6249
#, python-format
6281
6250
msgid "Deprecated in: %s"
6565
6530
" otherwise error."
6568
#: bzrlib/plugins/launchpad/cmds.py:62
6533
#: bzrlib/plugins/launchpad/__init__.py:99
6571
6536
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6572
6537
" --project fooproject"
6575
#: bzrlib/plugins/launchpad/cmds.py:69
6540
#: bzrlib/plugins/launchpad/__init__.py:106
6576
6541
msgid "Launchpad project short name to associate with the branch."
6579
#: bzrlib/plugins/launchpad/cmds.py:76
6544
#: bzrlib/plugins/launchpad/__init__.py:113
6581
6546
"Short name for the branch; by default taken from the last component of the "
6585
#: bzrlib/plugins/launchpad/cmds.py:80
6550
#: bzrlib/plugins/launchpad/__init__.py:117
6586
6551
msgid "One-sentence description of the branch."
6589
#: bzrlib/plugins/launchpad/cmds.py:83
6554
#: bzrlib/plugins/launchpad/__init__.py:120
6590
6555
msgid "Longer description of the purpose or contents of the branch."
6593
#: bzrlib/plugins/launchpad/cmds.py:86
6558
#: bzrlib/plugins/launchpad/__init__.py:123
6594
6559
msgid "Branch author's email address, if not yourself."
6597
#: bzrlib/plugins/launchpad/cmds.py:89
6562
#: bzrlib/plugins/launchpad/__init__.py:126
6598
6563
msgid "The bug this branch fixes."
6601
#: bzrlib/plugins/launchpad/cmds.py:92
6566
#: bzrlib/plugins/launchpad/__init__.py:129
6602
6567
msgid "Prepare the request but don't actually send it."
6605
#: bzrlib/plugins/launchpad/cmds.py:114
6570
#: bzrlib/plugins/launchpad/__init__.py:151
6607
6572
"register-branch requires a public branch url - see bzr help register-branch."
6610
#: bzrlib/plugins/launchpad/cmds.py:122
6575
#: bzrlib/plugins/launchpad/__init__.py:159
6611
6576
msgid "--product is deprecated; please use --project."
6614
#: bzrlib/plugins/launchpad/cmds.py:152
6579
#: bzrlib/plugins/launchpad/__init__.py:191
6615
6580
msgid "Open a Launchpad branch page in your web browser."
6618
#: bzrlib/plugins/launchpad/cmds.py:157
6583
#: bzrlib/plugins/launchpad/__init__.py:196
6619
6584
msgid "Do not actually open the browser. Just say the URL we would use."
6622
#: bzrlib/plugins/launchpad/cmds.py:192
6587
#: bzrlib/plugins/launchpad/__init__.py:231
6623
6588
#, python-format
6624
6589
msgid "Opening %s in web browser"
6627
#: bzrlib/plugins/launchpad/cmds.py:200
6592
#: bzrlib/plugins/launchpad/__init__.py:241
6628
6593
msgid "Show or set the Launchpad user ID."
6631
#: bzrlib/plugins/launchpad/cmds.py:202
6596
#: bzrlib/plugins/launchpad/__init__.py:243
6633
6598
"When communicating with Launchpad, some commands need to know your\n"
6634
6599
"Launchpad user ID. This command can be used to set or show the\n"
6635
6600
"user ID that Bazaar will use for such communication."
6638
#: bzrlib/plugins/launchpad/cmds.py:206
6603
#: bzrlib/plugins/launchpad/__init__.py:247
6641
6606
" Show the Launchpad ID of the current user::"
6644
#: bzrlib/plugins/launchpad/cmds.py:209
6609
#: bzrlib/plugins/launchpad/__init__.py:250
6645
6610
msgid " bzr launchpad-login"
6648
#: bzrlib/plugins/launchpad/cmds.py:211
6613
#: bzrlib/plugins/launchpad/__init__.py:252
6649
6614
msgid " Set the Launchpad ID of the current user to 'bob'::"
6652
#: bzrlib/plugins/launchpad/cmds.py:213
6617
#: bzrlib/plugins/launchpad/__init__.py:254
6653
6618
msgid " bzr launchpad-login bob"
6656
#: bzrlib/plugins/launchpad/cmds.py:220
6621
#: bzrlib/plugins/launchpad/__init__.py:261
6657
6622
msgid "Don't check that the user name is valid."
6660
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6625
#: bzrlib/plugins/launchpad/__init__.py:276
6626
#: bzrlib/plugins/launchpad/__init__.py:287
6661
6627
msgid "Launchpad user ID exists and has SSH keys.\n"
6664
#: bzrlib/plugins/launchpad/cmds.py:238
6630
#: bzrlib/plugins/launchpad/__init__.py:279
6665
6631
msgid "No Launchpad user ID configured.\n"
6668
#: bzrlib/plugins/launchpad/cmds.py:249
6634
#: bzrlib/plugins/launchpad/__init__.py:290
6669
6635
#, python-format
6670
6636
msgid "Launchpad user ID set to '%s'.\n"
6673
#: bzrlib/plugins/launchpad/cmds.py:255
6639
#: bzrlib/plugins/launchpad/__init__.py:298
6674
6640
msgid "Ask Launchpad to mirror a branch now."
6677
#: bzrlib/plugins/launchpad/cmds.py:272
6643
#: bzrlib/plugins/launchpad/__init__.py:318
6678
6644
msgid "Propose merging a branch on Launchpad."
6681
#: bzrlib/plugins/launchpad/cmds.py:274
6647
#: bzrlib/plugins/launchpad/__init__.py:320
6683
6649
"This will open your usual editor to provide the initial comment. When it\n"
6684
6650
"has created the proposal, it will open it in your default web browser."
6687
#: bzrlib/plugins/launchpad/cmds.py:277
6653
#: bzrlib/plugins/launchpad/__init__.py:323
6689
6655
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6690
6656
"is not supplied, the remembered submit branch will be used. If no submit\n"
6691
6657
"branch is remembered, the development focus will be used."
6694
#: bzrlib/plugins/launchpad/cmds.py:281
6660
#: bzrlib/plugins/launchpad/__init__.py:327
6696
6662
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6697
6663
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6741
6703
"are opened in a web browser."
6744
#: bzrlib/plugins/launchpad/cmds.py:342
6706
#: bzrlib/plugins/launchpad/__init__.py:389
6746
6708
"Any revision involved in the merge may be specified-- the revision in\n"
6747
6709
"which the merge was performed, or one of the revisions that was merged."
6750
#: bzrlib/plugins/launchpad/cmds.py:345
6712
#: bzrlib/plugins/launchpad/__init__.py:392
6751
6713
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6754
#: bzrlib/plugins/launchpad/cmds.py:347
6716
#: bzrlib/plugins/launchpad/__init__.py:394
6755
6717
msgid " bzr lp-find-proposal -r annotate:README:1"
6758
#: bzrlib/plugins/launchpad/cmds.py:363
6720
#: bzrlib/plugins/launchpad/__init__.py:409
6759
6721
msgid "No review found."
6762
#: bzrlib/plugins/launchpad/cmds.py:364
6724
#: bzrlib/plugins/launchpad/__init__.py:410
6763
6725
#, python-format
6764
6726
msgid "%d proposals(s) found."
6767
#: bzrlib/plugins/launchpad/cmds.py:374
6729
#: bzrlib/plugins/launchpad/__init__.py:420
6768
6730
msgid "Finding revision-id"
6771
#: bzrlib/plugins/launchpad/cmds.py:381
6733
#: bzrlib/plugins/launchpad/__init__.py:427
6772
6734
msgid "Finding merge"
6775
#: bzrlib/plugins/launchpad/cmds.py:386
6737
#: bzrlib/plugins/launchpad/__init__.py:432
6776
6738
msgid "Finding revno"
6779
#: bzrlib/plugins/launchpad/cmds.py:392
6741
#: bzrlib/plugins/launchpad/__init__.py:437
6780
6742
msgid "Finding Launchpad branch"
6783
#: bzrlib/plugins/launchpad/cmds.py:395
6745
#: bzrlib/plugins/launchpad/__init__.py:440
6784
6746
msgid "Finding proposals"
6749
#: bzrlib/plugins/launchpad/account.py:66
6750
msgid "Setting ssh/sftp usernames for launchpad.net."
6787
6753
#: bzrlib/plugins/launchpad/lp_api.py:241
6788
6754
#: bzrlib/plugins/launchpad/lp_api.py:246
6789
6755
#, python-format
6830
#: bzrlib/plugins/launchpad/lp_propose.py:150
6796
#: bzrlib/plugins/launchpad/lp_propose.py:149
6831
6797
#, python-format
6832
6798
msgid "There is already a branch merge proposal: %s"
6835
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6801
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6836
6802
msgid "pb parameter to convert() is deprecated"
6839
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6805
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6840
6806
msgid "starting upgrade from format 4 to 5"
6843
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6809
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6844
6810
msgid "note: upgrade may be faster if all store files are ungzipped first"
6847
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6813
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6848
6814
msgid "converting revision"
6817
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6818
msgid "upgraded to weaves:"
6851
6821
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6852
msgid "upgraded to weaves:"
6855
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6856
6822
#, python-format
6857
6823
msgid "%6d revisions and inventories"
6860
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6826
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6861
6827
#, python-format
6862
6828
msgid "%6d revisions not present"
6865
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6831
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6866
6832
#, python-format
6867
6833
msgid "%6d texts"
6870
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6836
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6871
6837
msgid "writing weave"
6874
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6875
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6840
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6841
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6876
6842
msgid "inventory"
6879
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6845
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6880
6846
msgid "write revision"
6883
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6849
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6884
6850
msgid "loading revision"
6887
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6853
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6888
6854
#, python-format
6889
6855
msgid "revision {%s} not present in branch; will be converted as a ghost"
6892
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6858
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6893
6859
msgid "starting upgrade from format 5 to 6"
6896
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6862
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6897
6863
#, python-format
6898
6864
msgid "adding prefixes to %s"
6901
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6867
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6902
6868
msgid "starting upgrade from format 6 to metadir"
6905
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6871
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6906
6872
msgid "Removing ancestry.weave"
6909
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6875
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6910
6876
msgid "Finding branch files"
6913
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6879
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6914
6880
msgid "Upgrading repository"
6917
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6883
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6918
6884
msgid "Upgrading branch"
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6887
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6922
6888
msgid "No working tree."
6925
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6891
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6926
6892
msgid "Upgrading working tree"
6929
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6930
6896
#, python-format
6931
6897
msgid "Make %s lock"
6934
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6900
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6935
6901
#, python-format
6936
6902
msgid "Moving %s"
9801
9783
"of bzr that requires authentication (smtp for example)."
9804
#: en/help_topics/configuration.txt:391
9786
#: en/help_topics/configuration.txt:379
9806
9788
"The syntax of the file obeys the same rules as the others except for the\n"
9807
9789
"option policies which don't apply."
9810
#: en/help_topics/configuration.txt:394
9792
#: en/help_topics/configuration.txt:382
9812
9794
"For more information on the possible uses of the authentication "
9813
9795
"configuration\n"
9814
9796
"file see :doc:`authentication-help`."
9817
#: en/help_topics/configuration.txt:397
9799
#: en/help_topics/configuration.txt:385
9820
9802
"Common options\n"
9821
9803
"--------------"
9824
#: en/help_topics/configuration.txt:401
9806
#: en/help_topics/configuration.txt:389
9826
9808
"debug_flags\n"
9830
#: en/help_topics/configuration.txt:404
9812
#: en/help_topics/configuration.txt:392
9832
9814
"A comma-separated list of debugging options to turn on. The same values\n"
9833
9815
"can be used as with the -D command-line option (see `help global-options`).\n"
9834
9816
"For example::"
9837
#: en/help_topics/configuration.txt:408
9819
#: en/help_topics/configuration.txt:396
9838
9820
msgid " debug_flags = hpss"
9841
#: en/help_topics/configuration.txt:412
9823
#: en/help_topics/configuration.txt:400
9842
9824
msgid " debug_flags = hpss,evil"
9845
#: en/help_topics/configuration.txt:414
9827
#: en/help_topics/configuration.txt:402
9851
#: en/help_topics/configuration.txt:417
9833
#: en/help_topics/configuration.txt:405
9853
9835
"The email address to use when committing a branch. Typically takes the form\n"
9857
#: en/help_topics/configuration.txt:420
9839
#: en/help_topics/configuration.txt:408
9858
9840
msgid " email = Full Name <account@hostname.tld>"
9861
#: en/help_topics/configuration.txt:422
9843
#: en/help_topics/configuration.txt:410
9867
#: en/help_topics/configuration.txt:425
9849
#: en/help_topics/configuration.txt:413
9869
9851
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9870
9852
"a commit message. This setting is trumped by the environment variable\n"
9958
9940
"to sign newly committed revisions, even if the branch requires signatures."
9961
#: en/help_topics/configuration.txt:474
9943
#: en/help_topics/configuration.txt:462
9963
9945
"dirstate.fdatasync\n"
9964
9946
"~~~~~~~~~~~~~~~~~~"
9967
#: en/help_topics/configuration.txt:477
9949
#: en/help_topics/configuration.txt:465
9969
9951
"If true (default), working tree metadata changes are flushed through the\n"
9970
9952
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9971
9953
"should not be lost if the machine crashes. See also repository.fdatasync."
9974
#: en/help_topics/configuration.txt:481
9956
#: en/help_topics/configuration.txt:469
9976
9958
"gpg_signing_key\n"
9977
9959
"~~~~~~~~~~~~~~~"
9980
#: en/help_topics/configuration.txt:484
9962
#: en/help_topics/configuration.txt:472
9982
9964
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9983
9965
"address, key fingerprint or full key ID. When unset or when set to\n"
9984
9966
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9987
#: en/help_topics/configuration.txt:488
9969
#: en/help_topics/configuration.txt:476
9993
#: en/help_topics/configuration.txt:491
9975
#: en/help_topics/configuration.txt:479
9995
9977
"Only useful in ``locations.conf``. Defines whether or not the\n"
9996
9978
"configuration for this section applies to subdirectories:"
9999
#: en/help_topics/configuration.txt:494
9981
#: en/help_topics/configuration.txt:482
10002
9984
" (default) This section applies to subdirectories as well."
10005
#: en/help_topics/configuration.txt:497
9987
#: en/help_topics/configuration.txt:485
10008
9990
" This section only applies to the branch at this directory and not\n"
10009
9991
" branches below it."
10012
#: en/help_topics/configuration.txt:501
9994
#: en/help_topics/configuration.txt:489
10014
9996
"gpg_signing_command\n"
10015
9997
"~~~~~~~~~~~~~~~~~~~"
10018
#: en/help_topics/configuration.txt:504
10000
#: en/help_topics/configuration.txt:492
10020
10002
"(Default: \"gpg\"). Which program should be used to sign and check "
10021
10003
"revisions.\n"
10022
10004
"For example::"
10025
#: en/help_topics/configuration.txt:507
10007
#: en/help_topics/configuration.txt:495
10026
10008
msgid " gpg_signing_command = /usr/bin/gnpg"
10029
#: en/help_topics/configuration.txt:509
10011
#: en/help_topics/configuration.txt:497
10031
10013
"The specified command must accept the options \"--clearsign\" and \"-u "
10035
#: en/help_topics/configuration.txt:511
10017
#: en/help_topics/configuration.txt:499
10037
10019
"bzr_remote_path\n"
10038
10020
"~~~~~~~~~~~~~~~"
10041
#: en/help_topics/configuration.txt:514
10023
#: en/help_topics/configuration.txt:502
10043
10025
"(Default: \"bzr\"). The path to the command that should be used to run the "
10045
10027
"server for bzr. This value may only be specified in locations.conf, because:"
10048
#: en/help_topics/configuration.txt:517
10030
#: en/help_topics/configuration.txt:505
10050
10032
"- it's needed before branch.conf is accessible\n"
10051
10033
"- allowing remote branch.conf files to specify commands would be a security\n"
10055
#: en/help_topics/configuration.txt:521
10037
#: en/help_topics/configuration.txt:509
10056
10038
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10059
#: en/help_topics/configuration.txt:523
10041
#: en/help_topics/configuration.txt:511
10061
10043
"smtp_server\n"
10062
10044
"~~~~~~~~~~~"
10065
#: en/help_topics/configuration.txt:526
10047
#: en/help_topics/configuration.txt:514
10067
10049
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10068
10050
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10071
#: en/help_topics/configuration.txt:529
10053
#: en/help_topics/configuration.txt:517
10073
10055
"smtp_username, smtp_password\n"
10074
10056
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10077
#: en/help_topics/configuration.txt:532
10059
#: en/help_topics/configuration.txt:520
10079
10061
"User and password to authenticate to the SMTP server. If smtp_username\n"
10080
10062
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10283
10265
"--remember``."
10286
#: en/help_topics/configuration.txt:646
10268
#: en/help_topics/configuration.txt:634
10288
10270
"push_location\n"
10289
10271
"~~~~~~~~~~~~~"
10292
#: en/help_topics/configuration.txt:649
10274
#: en/help_topics/configuration.txt:637
10294
10276
"If present, the location of the default branch for push. This option\n"
10295
10277
"is normally set by the first ``push`` or ``push --remember``."
10298
#: en/help_topics/configuration.txt:652
10280
#: en/help_topics/configuration.txt:640
10300
10282
"push_strict\n"
10301
10283
"~~~~~~~~~~~"
10304
#: en/help_topics/configuration.txt:655
10286
#: en/help_topics/configuration.txt:643
10306
10288
"If present, defines the ``--strict`` option default value for checking\n"
10307
10289
"uncommitted changes before pushing."
10310
#: en/help_topics/configuration.txt:658
10292
#: en/help_topics/configuration.txt:646
10312
10294
"dpush_strict\n"
10313
10295
"~~~~~~~~~~~~"
10316
#: en/help_topics/configuration.txt:661
10298
#: en/help_topics/configuration.txt:649
10318
10300
"If present, defines the ``--strict`` option default value for checking\n"
10319
10301
"uncommitted changes before pushing into a different VCS without any\n"
10320
10302
"custom bzr metadata."
10323
#: en/help_topics/configuration.txt:665
10305
#: en/help_topics/configuration.txt:653
10325
10307
"bound_location\n"
10326
10308
"~~~~~~~~~~~~~~"
10329
#: en/help_topics/configuration.txt:668
10311
#: en/help_topics/configuration.txt:656
10331
10313
"The location that commits should go to when acting as a checkout.\n"
10332
10314
"This option is normally set by ``bind``."
10335
#: en/help_topics/configuration.txt:671
10317
#: en/help_topics/configuration.txt:659
10341
#: en/help_topics/configuration.txt:674
10323
#: en/help_topics/configuration.txt:662
10343
10325
"If set to \"True\", the branch should act as a checkout, and push each "
10344
10326
"commit to\n"
10345
10327
"the bound_location. This option is normally set by ``bind``/``unbind``."
10348
#: en/help_topics/configuration.txt:677
10330
#: en/help_topics/configuration.txt:665
10350
10332
"send_strict\n"
10351
10333
"~~~~~~~~~~~"
10354
#: en/help_topics/configuration.txt:680
10336
#: en/help_topics/configuration.txt:668
10356
10338
"If present, defines the ``--strict`` option default value for checking\n"
10357
10339
"uncommitted changes before sending a merge directive."
10360
#: en/help_topics/configuration.txt:683
10342
#: en/help_topics/configuration.txt:671
10362
10344
"add.maximum_file_size\n"
10363
10345
"~~~~~~~~~~~~~~~~~~~~~"
10366
#: en/help_topics/configuration.txt:686
10348
#: en/help_topics/configuration.txt:674
10368
10350
"Defines the maximum file size the command line \"add\" operation will allow\n"
10369
10351
"in recursive mode, with files larger than this value being skipped. You may "
11998
11952
"set of command names."
12001
#: en/help_topics/hooks.txt:201
12007
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12008
msgid "Introduced in: 2.6"
12011
#: en/help_topics/hooks.txt:206
12012
msgid "Called after executing a command. Called with the command object."
12015
#: en/help_topics/hooks.txt:208
12021
#: en/help_topics/hooks.txt:213
12022
msgid "Called prior to executing a command. Called with the command object."
11955
#: en/help_topics/hooks.txt:212
12025
11961
#: en/help_topics/hooks.txt:215
12031
#: en/help_topics/hooks.txt:218
12037
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12038
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12039
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12040
#: en/help_topics/hooks.txt:446
11967
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11968
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11969
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11970
#: en/help_topics/hooks.txt:443
12041
11971
msgid "Introduced in: 2.4"
11974
#: en/help_topics/hooks.txt:220
11976
"Invoked when a config option is read. The signature is (stack, name,\n"
12044
11980
#: en/help_topics/hooks.txt:223
12046
"Invoked when a config option is read. The signature is (stack, name,\n"
12050
#: en/help_topics/hooks.txt:226
12056
#: en/help_topics/hooks.txt:231
11986
#: en/help_topics/hooks.txt:228
12057
11987
msgid "Invoked when a config store is loaded. The signature is (store)."
12060
#: en/help_topics/hooks.txt:233
11990
#: en/help_topics/hooks.txt:230
12066
#: en/help_topics/hooks.txt:238
11996
#: en/help_topics/hooks.txt:235
12068
11998
"Invoked when a config option is removed. The signature is (stack,\n"
12072
#: en/help_topics/hooks.txt:241
12002
#: en/help_topics/hooks.txt:238
12078
#: en/help_topics/hooks.txt:246
12008
#: en/help_topics/hooks.txt:243
12079
12009
msgid "Invoked when a config store is saved. The signature is (store)."
12082
#: en/help_topics/hooks.txt:248
12012
#: en/help_topics/hooks.txt:245
12018
#: en/help_topics/hooks.txt:250
12020
"Invoked when a config option is set. The signature is (stack, name,\n"
12088
12024
#: en/help_topics/hooks.txt:253
12090
"Invoked when a config option is set. The signature is (stack, name,\n"
12026
"ControlDirHooks\n"
12094
12030
#: en/help_topics/hooks.txt:256
12096
"ControlDirHooks\n"
12100
#: en/help_topics/hooks.txt:259
12102
12032
"post_repo_init\n"
12103
12033
"~~~~~~~~~~~~~~"
12106
#: en/help_topics/hooks.txt:264
12036
#: en/help_topics/hooks.txt:261
12108
12038
"Invoked after a repository has been initialized. post_repo_init is\n"
12109
12039
"called with a bzrlib.controldir.RepoInitHookParams."
12042
#: en/help_topics/hooks.txt:264
12112
12048
#: en/help_topics/hooks.txt:267
12118
#: en/help_topics/hooks.txt:270
12119
12049
msgid "Introduced in: 1.14"
12122
#: en/help_topics/hooks.txt:272
12052
#: en/help_topics/hooks.txt:269
12124
12054
"Invoked before attempting to open a ControlDir with the transport that\n"
12125
12055
"the open will use."
12058
#: en/help_topics/hooks.txt:272
12128
12064
#: en/help_topics/hooks.txt:275
12134
#: en/help_topics/hooks.txt:278
12136
12066
"repository\n"
12140
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12141
#: en/help_topics/hooks.txt:524
12070
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12071
#: en/help_topics/hooks.txt:521
12142
12072
msgid "Introduced in: 1.15"
12145
#: en/help_topics/hooks.txt:283
12075
#: en/help_topics/hooks.txt:280
12147
12077
"Invoked when displaying the statistics for a repository. repository is\n"
12148
12078
"called with a statistics dictionary as returned by the repository and\n"
12149
12079
"a file-like object to write to."
12082
#: en/help_topics/hooks.txt:284
12152
12088
#: en/help_topics/hooks.txt:287
12158
#: en/help_topics/hooks.txt:290
12160
12090
"lock_acquired\n"
12161
12091
"~~~~~~~~~~~~~"
12164
#: en/help_topics/hooks.txt:295
12094
#: en/help_topics/hooks.txt:292
12166
12096
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12169
#: en/help_topics/hooks.txt:297
12099
#: en/help_topics/hooks.txt:294
12171
12101
"lock_broken\n"
12172
12102
"~~~~~~~~~~~"
12175
#: en/help_topics/hooks.txt:302
12105
#: en/help_topics/hooks.txt:299
12176
12106
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12179
#: en/help_topics/hooks.txt:304
12109
#: en/help_topics/hooks.txt:301
12181
12111
"lock_released\n"
12182
12112
"~~~~~~~~~~~~~"
12185
#: en/help_topics/hooks.txt:309
12115
#: en/help_topics/hooks.txt:306
12187
12117
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12120
#: en/help_topics/hooks.txt:308
12190
12126
#: en/help_topics/hooks.txt:311
12128
"merge_file_content\n"
12129
"~~~~~~~~~~~~~~~~~~"
12196
12132
#: en/help_topics/hooks.txt:314
12198
"merge_file_content\n"
12199
"~~~~~~~~~~~~~~~~~~"
12202
#: en/help_topics/hooks.txt:317
12203
12133
msgid "Introduced in: 2.1"
12206
#: en/help_topics/hooks.txt:319
12136
#: en/help_topics/hooks.txt:316
12208
12138
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12209
12139
"object when starting a merge. Should return either None or a subclass\n"
12213
12143
"AbstractPerFileMerger API docs for details on how it is used by merge."
12216
#: en/help_topics/hooks.txt:326
12146
#: en/help_topics/hooks.txt:323
12218
12148
"post_merge\n"
12222
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12223
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12224
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12152
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12153
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12154
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12225
12155
msgid "Introduced in: 2.5"
12228
#: en/help_topics/hooks.txt:331
12158
#: en/help_topics/hooks.txt:328
12230
12160
"Called after a merge. Receives a Merger object as the single argument.\n"
12231
12161
"The return value is ignored."
12234
#: en/help_topics/hooks.txt:334
12164
#: en/help_topics/hooks.txt:331
12236
12166
"pre_merge\n"
12240
#: en/help_topics/hooks.txt:339
12170
#: en/help_topics/hooks.txt:336
12242
12172
"Called before a merge. Receives a Merger object as the single\n"
12176
#: en/help_topics/hooks.txt:339
12178
"MergeDirectiveHooks\n"
12179
"-------------------"
12246
12182
#: en/help_topics/hooks.txt:342
12248
"MergeDirectiveHooks\n"
12249
"-------------------"
12184
"merge_request_body\n"
12185
"~~~~~~~~~~~~~~~~~~"
12252
12188
#: en/help_topics/hooks.txt:345
12254
"merge_request_body\n"
12255
"~~~~~~~~~~~~~~~~~~"
12258
#: en/help_topics/hooks.txt:348
12259
12189
msgid "Introduced in: 1.15.0"
12262
#: en/help_topics/hooks.txt:350
12192
#: en/help_topics/hooks.txt:347
12264
12194
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12265
12195
"request. Callbacks must return a body. If more than one callback is\n"
12266
12196
"registered, the output of one callback is provided to the next."
12199
#: en/help_topics/hooks.txt:351
12201
"MessageEditorHooks\n"
12202
"------------------"
12269
12205
#: en/help_topics/hooks.txt:354
12271
"MessageEditorHooks\n"
12272
"------------------"
12207
"commit_message_template\n"
12208
"~~~~~~~~~~~~~~~~~~~~~~~"
12275
12211
#: en/help_topics/hooks.txt:357
12277
"commit_message_template\n"
12278
"~~~~~~~~~~~~~~~~~~~~~~~"
12281
#: en/help_topics/hooks.txt:360
12282
12212
msgid "Introduced in: 1.10"
12285
#: en/help_topics/hooks.txt:362
12215
#: en/help_topics/hooks.txt:359
12287
12217
"Called when a commit message is being generated.\n"
12288
12218
"commit_message_template is called with the bzrlib.commit.Commit object\n"