153
153
"the no-pending option or specify a file/directory."
156
#: bzrlib/builtins.py:351
156
#: bzrlib/builtins.py:263
158
158
"To compare the working directory to a specific revision, pass a\n"
159
159
"single revision to the revision argument."
162
#: bzrlib/builtins.py:354
162
#: bzrlib/builtins.py:266
164
164
"To see which files have changed in a specific revision, or between\n"
165
165
"two revisions, pass a revision range to the revision argument.\n"
166
166
"This will produce the same results as calling 'bzr diff --summarize'."
169
#: bzrlib/builtins.py:363
169
#: bzrlib/builtins.py:275
170
170
msgid "Use short status indicators."
173
#: bzrlib/builtins.py:365
173
#: bzrlib/builtins.py:277
174
174
msgid "Only show versioned files."
177
#: bzrlib/builtins.py:367
177
#: bzrlib/builtins.py:279
178
178
msgid "Don't show pending merges."
181
#: bzrlib/builtins.py:370
181
#: bzrlib/builtins.py:282
182
182
msgid "Do not mark object type using indicator."
185
#: bzrlib/builtins.py:385
185
#: bzrlib/builtins.py:297
186
186
msgid "bzr status --revision takes exactly one or two revision specifiers"
189
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
189
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
190
190
msgid "You can only supply one of revision_id or --revision"
193
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
193
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
194
194
msgid "You must supply either --revision or a revision_id"
197
#: bzrlib/builtins.py:439
197
#: bzrlib/builtins.py:351
199
199
msgid "Repository %r does not support access to raw revision texts"
202
#: bzrlib/builtins.py:450
202
#: bzrlib/builtins.py:362
203
203
msgid "The repository {0} contains no revision {1}."
206
#: bzrlib/builtins.py:457
206
#: bzrlib/builtins.py:369
207
207
msgid "You cannot specify a NULL revision."
210
#: bzrlib/builtins.py:549
210
#: bzrlib/builtins.py:461
211
211
msgid "Remove the working tree from a given branch/checkout."
212
212
msgstr "Remove the working tree frae a gien branch/checkoot."
214
#: bzrlib/builtins.py:551
214
#: bzrlib/builtins.py:463
216
216
"Since a lightweight checkout is little more than a working tree\n"
217
217
"this will refuse to run against one."
220
#: bzrlib/builtins.py:554
220
#: bzrlib/builtins.py:466
221
221
msgid "To re-create the working tree, use \"bzr checkout\"."
224
#: bzrlib/builtins.py:560
224
#: bzrlib/builtins.py:472
226
226
"Remove the working tree even if it has uncommitted or shelved changes."
229
#: bzrlib/builtins.py:574
229
#: bzrlib/builtins.py:486
230
230
msgid "No working tree to remove"
233
#: bzrlib/builtins.py:576
233
#: bzrlib/builtins.py:488
234
234
msgid "You cannot remove the working tree of a remote path"
237
#: bzrlib/builtins.py:585
237
#: bzrlib/builtins.py:497
238
238
msgid "You cannot remove the working tree from a lightweight checkout"
241
#: bzrlib/builtins.py:625
241
#: bzrlib/builtins.py:537
243
243
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
244
244
"instead. Use \"--force\" if you are sure you want to reset the working tree."
247
#: bzrlib/builtins.py:636
247
#: bzrlib/builtins.py:548
249
249
", the header appears corrupt, try passing -r -1 to set the state to the last "
253
#: bzrlib/builtins.py:640
253
#: bzrlib/builtins.py:552
254
254
msgid "failed to reset the tree state{0}"
257
#: bzrlib/builtins.py:644
257
#: bzrlib/builtins.py:556
258
258
msgid "Show current revision number."
261
#: bzrlib/builtins.py:646
261
#: bzrlib/builtins.py:558
262
262
msgid "This is equal to the number of revisions on this branch."
265
#: bzrlib/builtins.py:659
265
#: bzrlib/builtins.py:571
266
266
msgid "--tree and --revision can not be used together"
269
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
269
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
270
270
msgid "Tags can only be placed on a single revision, not on a range"
273
#: bzrlib/builtins.py:700
273
#: bzrlib/builtins.py:612
274
274
msgid "Show revno of working tree."
277
#: bzrlib/builtins.py:748
277
#: bzrlib/builtins.py:660
278
278
msgid "Add specified files or directories."
281
#: bzrlib/builtins.py:750
281
#: bzrlib/builtins.py:662
283
283
"In non-recursive mode, all the named items are added, regardless\n"
284
284
"of whether they were previously ignored. A warning is given if\n"
285
285
"any of the named files are already versioned."
288
#: bzrlib/builtins.py:754
288
#: bzrlib/builtins.py:666
290
290
"In recursive mode (the default), files are treated the same way\n"
291
291
"but the behaviour for directories is different. Directories that\n"
333
333
"into a subdirectory of this one."
336
#: bzrlib/builtins.py:784
336
#: bzrlib/builtins.py:696
338
338
"Any files matching patterns in the ignore list will not be added\n"
339
339
"unless they are explicitly mentioned."
342
#: bzrlib/builtins.py:787
342
#: bzrlib/builtins.py:699
344
344
"In recursive mode, files larger than the configuration option \n"
345
345
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
349
#: bzrlib/builtins.py:794
349
#: bzrlib/builtins.py:706
350
350
msgid "Don't recursively add the contents of directories."
353
#: bzrlib/builtins.py:800
353
#: bzrlib/builtins.py:712
354
354
msgid "Lookup file ids from this tree."
357
#: bzrlib/builtins.py:836
357
#: bzrlib/builtins.py:748
358
358
msgid "ignored {0} matching \"{1}\"\n"
361
#: bzrlib/builtins.py:841
361
#: bzrlib/builtins.py:753
362
362
msgid "Create a new versioned directory."
365
#: bzrlib/builtins.py:843
365
#: bzrlib/builtins.py:755
366
366
msgid "This is equivalent to creating the directory and then adding it."
369
#: bzrlib/builtins.py:850
369
#: bzrlib/builtins.py:762
370
370
msgid "No error if existing, make parent directories as needed."
373
#: bzrlib/builtins.py:884
373
#: bzrlib/builtins.py:796
375
375
msgid "added %s\n"
378
#: bzrlib/builtins.py:926
378
#: bzrlib/builtins.py:838
380
380
msgid "invalid kind %r specified"
383
#: bzrlib/builtins.py:963
383
#: bzrlib/builtins.py:875
384
384
msgid "Move or rename a file."
387
#: bzrlib/builtins.py:965
387
#: bzrlib/builtins.py:877
388
388
msgid " bzr mv SOURCE... DESTINATION"
391
#: bzrlib/builtins.py:967
391
#: bzrlib/builtins.py:879
393
393
"If the last argument is a versioned directory, all the other names\n"
394
394
"are moved into it. Otherwise, there must be exactly two arguments\n"
395
395
"and the file is changed to a new name."
398
#: bzrlib/builtins.py:971
398
#: bzrlib/builtins.py:883
400
400
"If OLDNAME does not exist on the filesystem but is versioned and\n"
401
401
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
404
404
"The same is valid when moving many SOURCE files to a DESTINATION."
407
#: bzrlib/builtins.py:977
407
#: bzrlib/builtins.py:889
408
408
msgid "Files cannot be moved between branches."
411
#: bzrlib/builtins.py:984
411
#: bzrlib/builtins.py:896
413
413
"Move only the bzr identifier of the file, because the file has already been "
417
#: bzrlib/builtins.py:986
417
#: bzrlib/builtins.py:898
418
418
msgid "Automatically guess renames."
421
#: bzrlib/builtins.py:987
421
#: bzrlib/builtins.py:899
422
422
msgid "Avoid making changes when guessing renames."
425
#: bzrlib/builtins.py:996
425
#: bzrlib/builtins.py:908
426
426
msgid "--dry-run requires --auto."
429
#: bzrlib/builtins.py:1000
429
#: bzrlib/builtins.py:912
430
430
msgid "missing file argument"
433
#: bzrlib/builtins.py:1004
433
#: bzrlib/builtins.py:916
434
434
msgid "can not move root of branch"
437
#: bzrlib/builtins.py:1010
437
#: bzrlib/builtins.py:922
438
438
msgid "Only one path may be specified to --auto."
441
#: bzrlib/builtins.py:1013
441
#: bzrlib/builtins.py:925
442
442
msgid "--after cannot be specified with --auto."
445
#: bzrlib/builtins.py:1050
445
#: bzrlib/builtins.py:962
446
446
msgid "to mv multiple files the destination must be a versioned directory"
449
#: bzrlib/builtins.py:1102
449
#: bzrlib/builtins.py:1014
450
450
msgid "Turn this branch into a mirror of another branch."
453
#: bzrlib/builtins.py:1104
453
#: bzrlib/builtins.py:1016
455
455
"By default, this command only works on branches that have not diverged.\n"
456
456
"Branches are considered diverged if the destination branch's most recent \n"
480
480
"value will only be saved if the remote location can be accessed."
483
#: bzrlib/builtins.py:1122
483
#: bzrlib/builtins.py:1034
485
485
"The --verbose option will display the revisions pulled using the log_format\n"
486
486
"configuration option. You can use a different format by overriding it with\n"
487
487
"-Olog_format=<other_format>."
490
#: bzrlib/builtins.py:1126
490
#: bzrlib/builtins.py:1038
492
492
"Note: The location can be specified either in the form of a branch,\n"
493
493
"or in the form of a path to a file containing a merge directive generated\n"
497
#: bzrlib/builtins.py:1134
497
#: bzrlib/builtins.py:1046
498
498
msgid "Show logs of pulled revisions."
501
#: bzrlib/builtins.py:1136
501
#: bzrlib/builtins.py:1048
503
503
"Branch to pull into, rather than the one containing the working directory."
506
#: bzrlib/builtins.py:1139
506
#: bzrlib/builtins.py:1051
508
508
"Perform a local pull in a bound branch. Local pulls are not applied to the "
512
#: bzrlib/builtins.py:1168
512
#: bzrlib/builtins.py:1080
513
513
msgid "Need working tree for --show-base."
516
#: bzrlib/builtins.py:1184
516
#: bzrlib/builtins.py:1096
517
517
msgid "No pull location known or specified."
520
#: bzrlib/builtins.py:1190
520
#: bzrlib/builtins.py:1102
522
522
msgid "Using saved parent location: %s\n"
525
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
525
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
526
526
msgid "Cannot use -r with merge directives or bundles"
529
#: bzrlib/builtins.py:1238
529
#: bzrlib/builtins.py:1150
530
530
msgid "Update a mirror of this branch."
533
#: bzrlib/builtins.py:1240
533
#: bzrlib/builtins.py:1152
535
535
"The target branch will not have its working tree populated because this\n"
536
536
"is both expensive, and is not supported on remote file systems."
539
#: bzrlib/builtins.py:1243
539
#: bzrlib/builtins.py:1155
541
541
"Some smart servers or protocols *may* put the working tree in place in\n"
545
#: bzrlib/builtins.py:1246
545
#: bzrlib/builtins.py:1158
547
547
"This command only works on branches that have not diverged. Branches are\n"
548
548
"considered diverged if the destination branch's most recent commit is one\n"
549
549
"that has not been merged (directly or indirectly) by the source branch."
552
#: bzrlib/builtins.py:1250
552
#: bzrlib/builtins.py:1162
554
554
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
555
555
"the other branch completely, discarding its unmerged changes."
558
#: bzrlib/builtins.py:1253
558
#: bzrlib/builtins.py:1165
560
560
"If you want to ensure you have the different changes in the other branch,\n"
561
561
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
562
562
"After that you will be able to do a push without '--overwrite'."
565
#: bzrlib/builtins.py:1257
565
#: bzrlib/builtins.py:1169
567
567
"If there is no default push location set, the first push will set it (use\n"
568
568
"--no-remember to avoid setting it). After that, you can omit the\n"
570
570
"value will only be saved if the remote location can be accessed."
573
#: bzrlib/builtins.py:1262
573
#: bzrlib/builtins.py:1174
575
575
"The --verbose option will display the revisions pushed using the log_format\n"
576
576
"configuration option. You can use a different format by overriding it with\n"
577
577
"-Olog_format=<other_format>."
580
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
580
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
582
582
"Branch to push from, rather than the one containing the working directory."
585
#: bzrlib/builtins.py:1276
585
#: bzrlib/builtins.py:1188
587
587
"By default push will fail if the target directory exists, but does not "
588
588
"already have a control directory. This flag will allow push to proceed."
591
#: bzrlib/builtins.py:1281
591
#: bzrlib/builtins.py:1193
593
593
"Create a stacked branch that references the public location of the parent "
597
#: bzrlib/builtins.py:1284
597
#: bzrlib/builtins.py:1196
599
599
"Create a stacked branch that refers to another branch for the commit "
600
600
"history. Only the work not present in the referenced branch is included in "
601
601
"the branch created."
604
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
604
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
606
606
"Refuse to push if there are uncommitted changes in the working tree, --no-"
607
607
"strict disables the check."
610
#: bzrlib/builtins.py:1292
610
#: bzrlib/builtins.py:1204
611
611
msgid "Don't populate the working tree, even for protocols that support it."
614
#: bzrlib/builtins.py:1336
614
#: bzrlib/builtins.py:1248
615
615
msgid "Could not determine branch to refer to."
618
#: bzrlib/builtins.py:1345
618
#: bzrlib/builtins.py:1257
621
621
"No push location known or specified. To push to the parent branch (at %s), "
622
622
"use 'bzr push :parent'."
625
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
625
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
626
626
msgid "No push location known or specified."
629
#: bzrlib/builtins.py:1355
629
#: bzrlib/builtins.py:1267
631
631
msgid "Using saved push location: %s"
634
#: bzrlib/builtins.py:1365
634
#: bzrlib/builtins.py:1277
635
635
msgid "Create a new branch that is a copy of an existing branch."
638
#: bzrlib/builtins.py:1367
638
#: bzrlib/builtins.py:1279
640
640
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
641
641
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
646
646
"create ./foo-bar."
649
#: bzrlib/builtins.py:1374
649
#: bzrlib/builtins.py:1286
651
651
"To retrieve the branch as of a particular revision, supply the --revision\n"
652
652
"parameter, as in \"branch foo/bar -r 5\"."
655
#: bzrlib/builtins.py:1377
655
#: bzrlib/builtins.py:1289
656
656
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
659
#: bzrlib/builtins.py:1387
659
#: bzrlib/builtins.py:1299
660
660
msgid "Create a branch without a working-tree."
663
#: bzrlib/builtins.py:1389
663
#: bzrlib/builtins.py:1301
664
664
msgid "Switch the checkout in the current directory to the new branch."
667
#: bzrlib/builtins.py:1392
667
#: bzrlib/builtins.py:1304
669
669
"Create a stacked branch referring to the source branch. The new branch will "
670
670
"depend on the availability of the source branch for all operations."
673
#: bzrlib/builtins.py:1396
673
#: bzrlib/builtins.py:1308
674
674
msgid "Do not use a shared repository, even if available."
677
#: bzrlib/builtins.py:1398
677
#: bzrlib/builtins.py:1310
679
679
"By default branch will fail if the target directory exists, but does not "
680
680
"already have a control directory. This flag will allow branch to proceed."
683
#: bzrlib/builtins.py:1403
683
#: bzrlib/builtins.py:1315
684
684
msgid "Bind new branch to from location."
687
#: bzrlib/builtins.py:1450
687
#: bzrlib/builtins.py:1362
689
689
msgid "Target directory \"%s\" already exists."
692
#: bzrlib/builtins.py:1462
692
#: bzrlib/builtins.py:1374
694
694
msgid "Parent of \"%s\" does not exist."
697
#: bzrlib/builtins.py:1481
697
#: bzrlib/builtins.py:1393
698
698
msgid "The branch {0} has no revision {1}."
701
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
701
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
703
703
msgid "Created new stacked branch referring to %s."
706
#: bzrlib/builtins.py:1500
706
#: bzrlib/builtins.py:1407
708
708
msgid "Branched %d revision."
709
709
msgid_plural "Branched %d revisions."
713
#: bzrlib/builtins.py:1505
713
#: bzrlib/builtins.py:1412
715
715
msgid "New branch bound to %s"
718
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
718
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
720
720
msgid "Switched to branch: %s"
723
#: bzrlib/builtins.py:1515
723
#: bzrlib/builtins.py:1422
724
724
msgid "List the branches available at the current location."
727
#: bzrlib/builtins.py:1517
727
#: bzrlib/builtins.py:1424
729
729
"This command will print the names of all the branches at the current\n"
733
#: bzrlib/builtins.py:1524
733
#: bzrlib/builtins.py:1431
735
735
"Recursively scan for branches rather than just looking in the specified "
739
#: bzrlib/builtins.py:1554
739
#: bzrlib/builtins.py:1461
740
740
msgid "(default)"
743
#: bzrlib/builtins.py:1566
743
#: bzrlib/builtins.py:1473
744
744
msgid "Create a new checkout of an existing branch."
747
#: bzrlib/builtins.py:1568
747
#: bzrlib/builtins.py:1475
749
749
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
787
#: bzrlib/builtins.py:1597
787
#: bzrlib/builtins.py:1504
788
788
msgid "Get file contents from this tree."
791
#: bzrlib/builtins.py:1599
791
#: bzrlib/builtins.py:1506
792
792
msgid "Hard-link working tree files where possible."
795
#: bzrlib/builtins.py:1640
795
#: bzrlib/builtins.py:1547
797
797
"Show list of renamed files.\n"
801
#: bzrlib/builtins.py:1670
801
#: bzrlib/builtins.py:1577
802
802
msgid "Update a working tree to a new revision."
805
#: bzrlib/builtins.py:1672
805
#: bzrlib/builtins.py:1579
807
807
"This will perform a merge of the destination revision (the tip of the\n"
808
808
"branch, or the specified revision) into the working tree, and then make\n"
809
809
"that revision the basis revision for the working tree. "
812
#: bzrlib/builtins.py:1676
812
#: bzrlib/builtins.py:1583
814
814
"You can use this to visit an older revision, or to update a working tree\n"
815
815
"that is out of date from its branch."
818
#: bzrlib/builtins.py:1679
818
#: bzrlib/builtins.py:1586
820
820
"If there are any uncommitted changes in the tree, they will be carried\n"
821
821
"across and remain as uncommitted changes after the update. To discard\n"
839
839
"out the old content of that file to a new location."
842
#: bzrlib/builtins.py:1694
842
#: bzrlib/builtins.py:1601
844
844
"The 'dir' argument, if given, must be the location of the root of a\n"
845
845
"working tree to update. By default, the working tree that contains the \n"
846
846
"current working directory is used."
849
#: bzrlib/builtins.py:1710
849
#: bzrlib/builtins.py:1617
850
850
msgid "bzr update --revision takes exactly one revision"
853
#: bzrlib/builtins.py:1718
853
#: bzrlib/builtins.py:1625
854
854
msgid "bzr update can only update a whole tree, not a file or subdirectory"
857
#: bzrlib/builtins.py:1749
857
#: bzrlib/builtins.py:1656
858
858
msgid "Tree is up to date at revision {0} of branch {1}"
861
#: bzrlib/builtins.py:1765
861
#: bzrlib/builtins.py:1672
864
864
"branch has no revision %s\n"
865
865
"bzr update --revision only works for a revision in the branch history"
868
#: bzrlib/builtins.py:1771
868
#: bzrlib/builtins.py:1678
869
869
msgid "Updated to revision {0} of branch {1}"
872
#: bzrlib/builtins.py:1775
872
#: bzrlib/builtins.py:1682
874
874
"Your local commits will now show as pending merges with 'bzr status', and "
875
875
"can be committed with 'bzr commit'."
878
#: bzrlib/builtins.py:1784
878
#: bzrlib/builtins.py:1691
879
879
msgid "Show information about a working tree, branch or repository."
882
#: bzrlib/builtins.py:1786
882
#: bzrlib/builtins.py:1693
884
884
"This command will show all known locations and formats associated to the\n"
885
885
"tree, branch or repository."
888
#: bzrlib/builtins.py:1789
888
#: bzrlib/builtins.py:1696
890
890
"In verbose mode, statistical information is included with each report.\n"
891
891
"To see extended statistic information, use a verbosity level of 2 or\n"
892
892
"higher by specifying the verbose option multiple times, e.g. -vv."
895
#: bzrlib/builtins.py:1793
895
#: bzrlib/builtins.py:1700
896
896
msgid "Branches and working trees will also report any missing revisions."
899
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
900
#: bzrlib/builtins.py:6442
899
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
900
#: bzrlib/builtins.py:6389
901
901
msgid ":Examples:"
904
#: bzrlib/builtins.py:1797
904
#: bzrlib/builtins.py:1704
905
905
msgid " Display information on the format and related locations:"
908
#: bzrlib/builtins.py:1799
908
#: bzrlib/builtins.py:1706
909
909
msgid " bzr info"
912
#: bzrlib/builtins.py:1801
912
#: bzrlib/builtins.py:1708
914
914
" Display the above together with extended format information and\n"
915
915
" basic statistics (like the number of files in the working tree and\n"
916
916
" number of revisions in the branch and repository):"
919
#: bzrlib/builtins.py:1805
919
#: bzrlib/builtins.py:1712
920
920
msgid " bzr info -v"
923
#: bzrlib/builtins.py:1807
923
#: bzrlib/builtins.py:1714
924
924
msgid " Display the above together with number of committers to the branch:"
927
#: bzrlib/builtins.py:1809
927
#: bzrlib/builtins.py:1716
928
928
msgid " bzr info -vv"
931
#: bzrlib/builtins.py:1828
931
#: bzrlib/builtins.py:1735
932
932
msgid "Remove files or directories."
935
#: bzrlib/builtins.py:1830
935
#: bzrlib/builtins.py:1737
937
937
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
938
938
"delete them if they can easily be recovered using revert otherwise they\n"
941
941
"Bazaar but missing in your tree and stop tracking them for you."
944
#: bzrlib/builtins.py:1838
944
#: bzrlib/builtins.py:1745
945
945
msgid "Only remove files that have never been committed."
948
#: bzrlib/builtins.py:1840
948
#: bzrlib/builtins.py:1747
949
949
msgid "The file deletion mode to be used."
952
#: bzrlib/builtins.py:1841
952
#: bzrlib/builtins.py:1748
953
953
msgid "Deletion Strategy"
956
#: bzrlib/builtins.py:1842
956
#: bzrlib/builtins.py:1749
957
957
msgid "Backup changed files (default)."
960
#: bzrlib/builtins.py:1843
960
#: bzrlib/builtins.py:1750
961
961
msgid "Delete from bzr but leave the working copy."
964
#: bzrlib/builtins.py:1844
964
#: bzrlib/builtins.py:1751
965
965
msgid "Don't backup changed files."
968
#: bzrlib/builtins.py:1845
968
#: bzrlib/builtins.py:1752
970
970
"Delete all the specified files, even if they can not be recovered and even "
971
971
"if they are non-empty directories. (deprecated, use no-backup)"
974
#: bzrlib/builtins.py:1854
974
#: bzrlib/builtins.py:1761
975
975
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
978
#: bzrlib/builtins.py:1871
978
#: bzrlib/builtins.py:1778
979
979
msgid "No matching files."
982
#: bzrlib/builtins.py:1932
982
#: bzrlib/builtins.py:1839
983
983
msgid "Reconcile bzr metadata in a branch."
986
#: bzrlib/builtins.py:1934
986
#: bzrlib/builtins.py:1841
988
988
"This can correct data mismatches that may have been caused by\n"
989
989
"previous ghost operations or bzr upgrades. You should only\n"
999
999
"correctly in both branches."
1002
#: bzrlib/builtins.py:1944
1002
#: bzrlib/builtins.py:1851
1004
1004
"At the same time it is run it may recompress data resulting in\n"
1005
1005
"a potential saving in disk space or performance gain."
1008
#: bzrlib/builtins.py:1947
1008
#: bzrlib/builtins.py:1854
1009
1009
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1012
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1012
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1014
1014
"Format for the bzr 2.0 series.\n"
1015
1015
"Uses group-compress storage.\n"
1016
1016
"Provides rich roots which are a one-way transition.\n"
1019
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1019
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1021
1021
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1022
1022
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1025
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1025
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1026
1026
msgid "The 2a format with experimental support for colocated branches.\n"
1029
#: bzrlib/builtins.py:2015
1029
#: bzrlib/builtins.py:1922
1030
1030
msgid "Make a directory into a versioned branch."
1033
#: bzrlib/builtins.py:2017
1033
#: bzrlib/builtins.py:1924
1035
1035
"Use this to create an empty branch, or before importing an\n"
1036
1036
"existing project."
1039
#: bzrlib/builtins.py:2020
1039
#: bzrlib/builtins.py:1927
1041
1041
"If there is a repository in a parent directory of the location, then\n"
1042
1042
"the history of the branch will be stored in the repository. Otherwise\n"
1063
1063
" bzr commit -m \"imported project\""
1066
#: bzrlib/builtins.py:2041
1066
#: bzrlib/builtins.py:1948
1068
1068
"Create the path leading up to the branch if it does not already exist."
1071
#: bzrlib/builtins.py:2044
1071
#: bzrlib/builtins.py:1951
1072
1072
msgid "Specify a format for this branch. See \"help formats\"."
1075
#: bzrlib/builtins.py:2052
1075
#: bzrlib/builtins.py:1959
1077
1077
"Never change revnos or the existing log. Append revisions to it only."
1080
#: bzrlib/builtins.py:2055
1080
#: bzrlib/builtins.py:1962
1081
1081
msgid "Create a branch without a working tree."
1084
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1084
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1085
1085
#, python-format
1087
1087
"Parent directory of %s does not exist.\n"
1088
1088
"You may supply --create-prefix to create all leading parent directories."
1091
#: bzrlib/builtins.py:2109
1091
#: bzrlib/builtins.py:2016
1093
1093
"This branch format cannot be set to append-revisions-only. Try --default."
1096
#: bzrlib/builtins.py:2120
1096
#: bzrlib/builtins.py:2027
1097
1097
msgid "Created a {0} (format: {1})\n"
1100
#: bzrlib/builtins.py:2129
1100
#: bzrlib/builtins.py:2036
1101
1101
#, python-format
1102
1102
msgid "Using shared repository: %s\n"
1105
#: bzrlib/builtins.py:2133
1105
#: bzrlib/builtins.py:2040
1106
1106
msgid "Create a shared repository for branches to share storage space."
1109
#: bzrlib/builtins.py:2135
1109
#: bzrlib/builtins.py:2042
1111
1111
"New branches created under the repository directory will store their\n"
1112
1112
"revisions in the repository, not in the branch directory. For branches\n"
1124
1124
"branches, such as on a server."
1127
#: bzrlib/builtins.py:2147
1127
#: bzrlib/builtins.py:2054
1130
1130
" Create a shared repository holding just branches::"
1133
#: bzrlib/builtins.py:2150
1133
#: bzrlib/builtins.py:2057
1135
1135
" bzr init-repo --no-trees repo\n"
1136
1136
" bzr init repo/trunk"
1139
#: bzrlib/builtins.py:2153
1139
#: bzrlib/builtins.py:2060
1140
1140
msgid " Make a lightweight checkout elsewhere::"
1143
#: bzrlib/builtins.py:2155
1143
#: bzrlib/builtins.py:2062
1145
1145
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1146
1146
" cd trunk-checkout\n"
1147
1147
" (add files here)"
1150
#: bzrlib/builtins.py:2163
1150
#: bzrlib/builtins.py:2070
1152
1152
"Specify a format for this repository. See \"bzr help formats\" for details."
1155
#: bzrlib/builtins.py:2167
1155
#: bzrlib/builtins.py:2074
1156
1156
msgid "Repository format"
1159
#: bzrlib/builtins.py:2169
1159
#: bzrlib/builtins.py:2076
1160
1160
msgid "Branches in the repository will default to not having a working tree."
1163
#: bzrlib/builtins.py:2195
1163
#: bzrlib/builtins.py:2102
1164
1164
msgid "Show differences in the working tree, between revisions or branches."
1167
#: bzrlib/builtins.py:2197
1167
#: bzrlib/builtins.py:2104
1169
1169
"If no arguments are given, all changes for the current tree are listed.\n"
1170
1170
"If files are given, only the changes in those files are listed.\n"
1199
1199
" 0 - no change"
1202
#: bzrlib/builtins.py:2220
1202
#: bzrlib/builtins.py:2127
1205
1205
" Shows the difference in the working tree versus the last commit::"
1208
#: bzrlib/builtins.py:2223
1208
#: bzrlib/builtins.py:2130
1209
1209
msgid " bzr diff"
1212
#: bzrlib/builtins.py:2225
1212
#: bzrlib/builtins.py:2132
1213
1213
msgid " Difference between the working tree and revision 1::"
1216
#: bzrlib/builtins.py:2227
1216
#: bzrlib/builtins.py:2134
1217
1217
msgid " bzr diff -r1"
1220
#: bzrlib/builtins.py:2229
1220
#: bzrlib/builtins.py:2136
1221
1221
msgid " Difference between revision 3 and revision 1::"
1224
#: bzrlib/builtins.py:2231
1224
#: bzrlib/builtins.py:2138
1225
1225
msgid " bzr diff -r1..3"
1228
#: bzrlib/builtins.py:2233
1228
#: bzrlib/builtins.py:2140
1229
1229
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1232
#: bzrlib/builtins.py:2235
1232
#: bzrlib/builtins.py:2142
1233
1233
msgid " bzr diff -r1..3 xxx"
1236
#: bzrlib/builtins.py:2237
1236
#: bzrlib/builtins.py:2144
1237
1237
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1240
#: bzrlib/builtins.py:2239
1240
#: bzrlib/builtins.py:2146
1241
1241
msgid " bzr diff -c2"
1244
#: bzrlib/builtins.py:2241
1244
#: bzrlib/builtins.py:2148
1246
1246
" To see the changes introduced by revision X::\n"
1248
1248
" bzr diff -cX"
1251
#: bzrlib/builtins.py:2245
1251
#: bzrlib/builtins.py:2152
1253
1253
" Note that in the case of a merge, the -c option shows the changes\n"
1254
1254
" compared to the left hand parent. To see the changes against\n"
1255
1255
" another parent, use::"
1258
#: bzrlib/builtins.py:2249
1258
#: bzrlib/builtins.py:2156
1259
1259
msgid " bzr diff -r<chosen_parent>..X"
1262
#: bzrlib/builtins.py:2251
1262
#: bzrlib/builtins.py:2158
1264
1264
" The changes between the current revision and the previous revision\n"
1265
1265
" (equivalent to -c-1 and -r-2..-1)"
1268
#: bzrlib/builtins.py:2254
1268
#: bzrlib/builtins.py:2161
1269
1269
msgid " bzr diff -r-2.."
1272
#: bzrlib/builtins.py:2256
1272
#: bzrlib/builtins.py:2163
1273
1273
msgid " Show just the differences for file NEWS::"
1276
#: bzrlib/builtins.py:2258
1276
#: bzrlib/builtins.py:2165
1277
1277
msgid " bzr diff NEWS"
1280
#: bzrlib/builtins.py:2260
1280
#: bzrlib/builtins.py:2167
1281
1281
msgid " Show the differences in working tree xxx for file NEWS::"
1284
#: bzrlib/builtins.py:2262
1284
#: bzrlib/builtins.py:2169
1285
1285
msgid " bzr diff xxx/NEWS"
1288
#: bzrlib/builtins.py:2264
1288
#: bzrlib/builtins.py:2171
1289
1289
msgid " Show the differences from branch xxx to this working tree:"
1292
#: bzrlib/builtins.py:2266
1292
#: bzrlib/builtins.py:2173
1293
1293
msgid " bzr diff --old xxx"
1296
#: bzrlib/builtins.py:2268
1296
#: bzrlib/builtins.py:2175
1297
1297
msgid " Show the differences between two branches for file NEWS::"
1300
#: bzrlib/builtins.py:2270
1300
#: bzrlib/builtins.py:2177
1301
1301
msgid " bzr diff --old xxx --new yyy NEWS"
1304
#: bzrlib/builtins.py:2272
1304
#: bzrlib/builtins.py:2179
1305
1305
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1308
#: bzrlib/builtins.py:2274
1308
#: bzrlib/builtins.py:2181
1310
1310
" bzr diff --prefix old/:new/\n"
1314
1314
" bzr diff --using /usr/bin/diff --diff-options -wu"
1317
#: bzrlib/builtins.py:2284
1317
#: bzrlib/builtins.py:2191
1318
1318
msgid "Pass these options to the external diff program."
1321
#: bzrlib/builtins.py:2287
1321
#: bzrlib/builtins.py:2194
1323
1323
"Set prefixes added to old and new filenames, as two values separated by a "
1324
1324
"colon. (eg \"old/:new/\")."
1327
#: bzrlib/builtins.py:2290
1327
#: bzrlib/builtins.py:2197
1328
1328
msgid "Branch/tree to compare from."
1331
#: bzrlib/builtins.py:2294
1331
#: bzrlib/builtins.py:2201
1332
1332
msgid "Branch/tree to compare to."
1335
#: bzrlib/builtins.py:2300
1335
#: bzrlib/builtins.py:2207
1336
1336
msgid "Use this command to compare files."
1339
#: bzrlib/builtins.py:2305
1339
#: bzrlib/builtins.py:2212
1340
1340
msgid "Diff format to use."
1343
#: bzrlib/builtins.py:2307
1343
#: bzrlib/builtins.py:2214
1344
1344
msgid "Diff format"
1347
#: bzrlib/builtins.py:2329
1347
#: bzrlib/builtins.py:2236
1348
1348
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1351
#: bzrlib/builtins.py:2333
1351
#: bzrlib/builtins.py:2240
1352
1352
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1355
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1356
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1355
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1356
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1357
1357
msgid "{0} and {1} are mutually exclusive"
1360
#: bzrlib/builtins.py:2358
1360
#: bzrlib/builtins.py:2265
1362
1362
"List files deleted in the working tree.\n"
1366
#: bzrlib/builtins.py:2436
1366
#: bzrlib/builtins.py:2343
1367
1367
msgid "Show the tree root directory."
1370
#: bzrlib/builtins.py:2438
1370
#: bzrlib/builtins.py:2345
1372
1372
"The root is the nearest enclosing directory with a .bzr control\n"
1376
#: bzrlib/builtins.py:2453
1376
#: bzrlib/builtins.py:2360
1377
1377
msgid "The limit argument must be an integer."
1380
#: bzrlib/builtins.py:2461
1380
#: bzrlib/builtins.py:2368
1381
1381
msgid "The levels argument must be an integer."
1384
#: bzrlib/builtins.py:2466
1384
#: bzrlib/builtins.py:2373
1385
1385
msgid "Show historical log for a branch or subset of a branch."
1388
#: bzrlib/builtins.py:2468
1388
#: bzrlib/builtins.py:2375
1390
1390
"log is bzr's default tool for exploring the history of a branch.\n"
1391
1391
"The branch to use is taken from the first parameter. If no parameters\n"
1507
1507
" a nested merge revision and the log will be truncated accordingly."
1510
#: bzrlib/builtins.py:2542
1510
#: bzrlib/builtins.py:2449
1511
1511
msgid ":Path filtering:"
1514
#: bzrlib/builtins.py:2544
1514
#: bzrlib/builtins.py:2451
1516
1516
" If parameters are given and the first one is not a branch, the log\n"
1517
1517
" will be filtered to show only those revisions that changed the\n"
1518
1518
" nominated files or directories."
1521
#: bzrlib/builtins.py:2548
1521
#: bzrlib/builtins.py:2455
1523
1523
" Filenames are interpreted within their historical context. To log a\n"
1524
1524
" deleted file, specify a revision range so that the file existed at\n"
1525
1525
" the end or start of the range."
1528
#: bzrlib/builtins.py:2552
1528
#: bzrlib/builtins.py:2459
1530
1530
" Historical context is also important when interpreting pathnames of\n"
1531
1531
" renamed files/directories. Consider the following example:"
1534
#: bzrlib/builtins.py:2555
1534
#: bzrlib/builtins.py:2462
1536
1536
" * revision 1: add tutorial.txt\n"
1537
1537
" * revision 2: modify tutorial.txt\n"
1538
1538
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1541
#: bzrlib/builtins.py:2559
1541
#: bzrlib/builtins.py:2466
1542
1542
msgid " In this case:"
1545
#: bzrlib/builtins.py:2561
1545
#: bzrlib/builtins.py:2468
1546
1546
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1549
#: bzrlib/builtins.py:2563
1549
#: bzrlib/builtins.py:2470
1551
1551
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1554
#: bzrlib/builtins.py:2565
1554
#: bzrlib/builtins.py:2472
1556
1556
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1557
1557
" the original file in revision 2."
1560
#: bzrlib/builtins.py:2568
1560
#: bzrlib/builtins.py:2475
1562
1562
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1563
1563
" was no file called guide.txt in revision 2."
1566
#: bzrlib/builtins.py:2571
1566
#: bzrlib/builtins.py:2478
1568
1568
" Renames are always followed by log. By design, there is no need to\n"
1569
1569
" explicitly ask for this (and no way to stop logging a file back\n"
1570
1570
" until it was last renamed)."
1573
#: bzrlib/builtins.py:2575
1573
#: bzrlib/builtins.py:2482
1574
1574
msgid ":Other filtering:"
1577
#: bzrlib/builtins.py:2577
1577
#: bzrlib/builtins.py:2484
1579
1579
" The --match option can be used for finding revisions that match a\n"
1580
1580
" regular expression in a commit message, committer, author or bug.\n"
1646
1646
" trading disk space for faster speed."
1649
#: bzrlib/builtins.py:2624
1649
#: bzrlib/builtins.py:2531
1650
1650
msgid "Show from oldest to newest."
1653
#: bzrlib/builtins.py:2627
1653
#: bzrlib/builtins.py:2534
1654
1654
msgid "Show files changed in each revision."
1657
#: bzrlib/builtins.py:2633
1657
#: bzrlib/builtins.py:2540
1658
1658
msgid "Show just the specified revision. See also \"help revisionspec\"."
1661
#: bzrlib/builtins.py:2637
1661
#: bzrlib/builtins.py:2544
1662
1662
msgid "What names to list as authors - first, all or committer."
1665
#: bzrlib/builtins.py:2638
1665
#: bzrlib/builtins.py:2545
1666
1666
msgid "Authors"
1669
#: bzrlib/builtins.py:2643
1669
#: bzrlib/builtins.py:2550
1670
1670
msgid "Number of levels to display - 0 for all, 1 for flat."
1673
#: bzrlib/builtins.py:2653
1673
#: bzrlib/builtins.py:2560
1674
1674
msgid "Limit the output to the first N revisions."
1677
#: bzrlib/builtins.py:2658
1677
#: bzrlib/builtins.py:2565
1678
1678
msgid "Show changes made in each revision as a patch."
1681
#: bzrlib/builtins.py:2660
1681
#: bzrlib/builtins.py:2567
1682
1682
msgid "Show merged revisions like --levels 0 does."
1685
#: bzrlib/builtins.py:2664
1685
#: bzrlib/builtins.py:2571
1686
1686
msgid "Do not report commits with more than one parent."
1689
#: bzrlib/builtins.py:2666
1689
#: bzrlib/builtins.py:2573
1691
1691
"Display only the revisions that are not part of both ancestries (require -"
1695
#: bzrlib/builtins.py:2670
1695
#: bzrlib/builtins.py:2577
1696
1696
msgid "Show digital signature validity."
1699
#: bzrlib/builtins.py:2673
1699
#: bzrlib/builtins.py:2580
1700
1700
msgid "Show revisions whose properties match this expression."
1703
#: bzrlib/builtins.py:2677
1703
#: bzrlib/builtins.py:2584
1704
1704
msgid "Show revisions whose message matches this expression."
1707
#: bzrlib/builtins.py:2681
1707
#: bzrlib/builtins.py:2588
1708
1708
msgid "Show revisions whose committer matches this expression."
1711
#: bzrlib/builtins.py:2685
1711
#: bzrlib/builtins.py:2592
1712
1712
msgid "Show revisions whose authors match this expression."
1715
#: bzrlib/builtins.py:2689
1715
#: bzrlib/builtins.py:2596
1716
1716
msgid "Show revisions whose bugs match this expression."
1719
#: bzrlib/builtins.py:2743
1719
#: bzrlib/builtins.py:2650
1720
1720
msgid "--exclude-common-ancestry requires -r with two revisions"
1723
#: bzrlib/builtins.py:2771
1723
#: bzrlib/builtins.py:2678
1724
1724
#, python-format
1725
1725
msgid "Path unknown at end or start of revision range: %s"
1728
#: bzrlib/builtins.py:2888
1728
#: bzrlib/builtins.py:2795
1729
1729
#, python-format
1730
1730
msgid "bzr %s doesn't accept two revisions in different branches."
1733
#: bzrlib/builtins.py:2904
1733
#: bzrlib/builtins.py:2811
1734
1734
#, python-format
1735
1735
msgid "bzr %s --revision takes one or two values."
1738
#: bzrlib/builtins.py:2949
1738
#: bzrlib/builtins.py:2856
1740
1740
"List files in a tree.\n"
1744
#: bzrlib/builtins.py:2958
1744
#: bzrlib/builtins.py:2865
1745
1745
msgid "Recurse into subdirectories."
1748
#: bzrlib/builtins.py:2960
1748
#: bzrlib/builtins.py:2867
1749
1749
msgid "Print paths relative to the root of the branch."
1752
#: bzrlib/builtins.py:2962
1752
#: bzrlib/builtins.py:2869
1753
1753
msgid "Print unknown files."
1756
#: bzrlib/builtins.py:2963
1756
#: bzrlib/builtins.py:2870
1757
1757
msgid "Print versioned files."
1760
#: bzrlib/builtins.py:2966
1760
#: bzrlib/builtins.py:2873
1761
1761
msgid "Print ignored files."
1764
#: bzrlib/builtins.py:2968
1764
#: bzrlib/builtins.py:2875
1765
1765
msgid "List entries of a particular kind: file, directory, symlink."
1768
#: bzrlib/builtins.py:2981
1768
#: bzrlib/builtins.py:2888
1769
1769
msgid "invalid kind specified"
1772
#: bzrlib/builtins.py:2984
1772
#: bzrlib/builtins.py:2891
1773
1773
msgid "Cannot set both --verbose and --null"
1776
#: bzrlib/builtins.py:2993
1776
#: bzrlib/builtins.py:2900
1777
1777
msgid "cannot specify both --from-root and PATH"
1780
#: bzrlib/builtins.py:3080
1780
#: bzrlib/builtins.py:2987
1781
1781
msgid "Ignore specified files or patterns."
1784
#: bzrlib/builtins.py:3082
1784
#: bzrlib/builtins.py:2989
1785
1785
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1788
#: bzrlib/builtins.py:3084
1788
#: bzrlib/builtins.py:2991
1790
1790
"If a .bzrignore file does not exist, the ignore command\n"
1791
1791
"will create one and add the specified files or patterns to the newly\n"
1832
1832
" the shell on Unix."
1835
#: bzrlib/builtins.py:3113
1835
#: bzrlib/builtins.py:3020
1837
1837
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1838
1838
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1841
#: bzrlib/builtins.py:3116
1841
#: bzrlib/builtins.py:3023
1844
1844
" Ignore the top level Makefile::"
1847
#: bzrlib/builtins.py:3119
1847
#: bzrlib/builtins.py:3026
1848
1848
msgid " bzr ignore ./Makefile"
1851
#: bzrlib/builtins.py:3121
1851
#: bzrlib/builtins.py:3028
1852
1852
msgid " Ignore .class files in all directories...::"
1855
#: bzrlib/builtins.py:3123
1855
#: bzrlib/builtins.py:3030
1856
1856
msgid " bzr ignore \"*.class\""
1859
#: bzrlib/builtins.py:3125
1859
#: bzrlib/builtins.py:3032
1860
1860
msgid " ...but do not ignore \"special.class\"::"
1863
#: bzrlib/builtins.py:3127
1863
#: bzrlib/builtins.py:3034
1864
1864
msgid " bzr ignore \"!special.class\""
1867
#: bzrlib/builtins.py:3129
1867
#: bzrlib/builtins.py:3036
1868
1868
msgid " Ignore files whose name begins with the \"#\" character::"
1871
#: bzrlib/builtins.py:3131
1871
#: bzrlib/builtins.py:3038
1872
1872
msgid " bzr ignore \"RE:^#\""
1875
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1875
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
1876
1876
msgid " Ignore .o files under the lib directory::"
1879
#: bzrlib/builtins.py:3135
1879
#: bzrlib/builtins.py:3042
1880
1880
msgid " bzr ignore \"lib/**/*.o\""
1883
#: bzrlib/builtins.py:3139
1883
#: bzrlib/builtins.py:3046
1884
1884
msgid " bzr ignore \"RE:lib/.*\\.o\""
1887
#: bzrlib/builtins.py:3141
1887
#: bzrlib/builtins.py:3048
1888
1888
msgid " Ignore everything but the \"debian\" toplevel directory::"
1891
#: bzrlib/builtins.py:3143
1891
#: bzrlib/builtins.py:3050
1893
1893
" bzr ignore \"RE:(?!debian/).*\"\n"
1932
#: bzrlib/builtins.py:3209
1932
#: bzrlib/builtins.py:3116
1933
1933
msgid "List ignored files and the patterns that matched them."
1936
#: bzrlib/builtins.py:3211
1936
#: bzrlib/builtins.py:3118
1938
1938
"List all the ignored files and the ignore pattern that caused the file to\n"
1942
#: bzrlib/builtins.py:3214
1942
#: bzrlib/builtins.py:3121
1943
1943
msgid "Alternatively, to list just the files::"
1946
#: bzrlib/builtins.py:3216
1946
#: bzrlib/builtins.py:3123
1947
1947
msgid " bzr ls --ignored"
1950
#: bzrlib/builtins.py:3250
1950
#: bzrlib/builtins.py:3157
1951
1951
#, python-format
1952
1952
msgid "not a valid revision-number: %r"
1955
#: bzrlib/builtins.py:3257
1955
#: bzrlib/builtins.py:3164
1957
1957
"Export current or past revision to a destination directory or archive."
1960
#: bzrlib/builtins.py:3259
1960
#: bzrlib/builtins.py:3166
1961
1961
msgid "If no revision is specified this exports the last committed revision."
1964
#: bzrlib/builtins.py:3261
1964
#: bzrlib/builtins.py:3168
1966
1966
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1967
1967
"given, try to find the format with the extension. If no extension\n"
1968
1968
"is found exports to a directory (equivalent to --format=dir)."
1971
#: bzrlib/builtins.py:3265
1971
#: bzrlib/builtins.py:3172
1973
1973
"If root is supplied, it will be used as the root directory inside\n"
1974
1974
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1975
1975
"to the exported filename. The root option has no effect for 'dir' format."
1978
#: bzrlib/builtins.py:3269
1978
#: bzrlib/builtins.py:3176
1980
1980
"If branch is omitted then the branch containing the current working\n"
1981
1981
"directory will be used."
1984
#: bzrlib/builtins.py:3272
1984
#: bzrlib/builtins.py:3179
1986
1986
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1989
#: bzrlib/builtins.py:3274
1989
#: bzrlib/builtins.py:3181
1991
1991
" ================= =========================\n"
1992
1992
" Supported formats Autodetected by extension\n"
1999
1999
" ================= ========================="
2002
#: bzrlib/builtins.py:3288
2002
#: bzrlib/builtins.py:3195
2003
2003
msgid "Type of file to export to."
2006
#: bzrlib/builtins.py:3291
2006
#: bzrlib/builtins.py:3198
2007
2007
msgid "Apply content filters to export the convenient form."
2010
#: bzrlib/builtins.py:3295
2010
#: bzrlib/builtins.py:3202
2011
2011
msgid "Name of the root directory inside the exported file."
2014
#: bzrlib/builtins.py:3297
2014
#: bzrlib/builtins.py:3204
2016
2016
"Set modification time of files to that of the last revision in which it was "
2020
#: bzrlib/builtins.py:3300
2020
#: bzrlib/builtins.py:3207
2022
2022
"Export the working tree contents rather than that of the last revision."
2025
#: bzrlib/builtins.py:3319
2025
#: bzrlib/builtins.py:3226
2026
2026
msgid "--uncommitted requires a working tree"
2029
#: bzrlib/builtins.py:3328
2029
#: bzrlib/builtins.py:3235
2030
2030
#, python-format
2031
2031
msgid "Unsupported export format: %s"
2034
#: bzrlib/builtins.py:3332
2034
#: bzrlib/builtins.py:3239
2036
2036
"Write the contents of a file as of a given revision to standard output."
2039
#: bzrlib/builtins.py:3334
2039
#: bzrlib/builtins.py:3241
2040
2040
msgid "If no revision is nominated, the last revision is used."
2043
#: bzrlib/builtins.py:3336
2043
#: bzrlib/builtins.py:3243
2045
2045
"Note: Take care to redirect standard output when using this command on a\n"
2049
#: bzrlib/builtins.py:3342
2049
#: bzrlib/builtins.py:3249
2050
2050
msgid "The path name in the old tree."
2053
#: bzrlib/builtins.py:3343
2053
#: bzrlib/builtins.py:3250
2054
2054
msgid "Apply content filters to display the convenience form."
2057
#: bzrlib/builtins.py:3354
2057
#: bzrlib/builtins.py:3261
2058
2058
msgid "bzr cat --revision takes exactly one revision specifier"
2061
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2061
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2062
2062
msgid "{0!r} is not present in revision {1}"
2065
#: bzrlib/builtins.py:3414
2065
#: bzrlib/builtins.py:3321
2066
2066
msgid "Commit changes into a new revision."
2069
#: bzrlib/builtins.py:3416
2069
#: bzrlib/builtins.py:3323
2071
2071
"An explanatory message needs to be given for each commit. This is\n"
2072
2072
"often done by using the --message option (getting the message from the\n"
2076
2076
"boilerplate text loaded into the editor, use the --show-diff option."
2079
#: bzrlib/builtins.py:3423
2079
#: bzrlib/builtins.py:3330
2081
2081
"By default, the entire tree is committed and the person doing the\n"
2082
2082
"commit is assumed to be the author. These defaults can be overridden\n"
2083
2083
"as explained below."
2086
#: bzrlib/builtins.py:3427
2086
#: bzrlib/builtins.py:3334
2087
2087
msgid ":Selective commits:"
2090
#: bzrlib/builtins.py:3429
2090
#: bzrlib/builtins.py:3336
2092
2092
" If selected files are specified, only changes to those files are\n"
2093
2093
" committed. If a directory is specified then the directory and\n"
2094
2094
" everything within it is committed."
2097
#: bzrlib/builtins.py:3433
2097
#: bzrlib/builtins.py:3340
2099
2099
" When excludes are given, they take precedence over selected files.\n"
2100
2100
" For example, to commit only changes within foo, but not changes\n"
2101
2101
" within foo/bar::"
2104
#: bzrlib/builtins.py:3437
2104
#: bzrlib/builtins.py:3344
2105
2105
msgid " bzr commit foo -x foo/bar"
2108
#: bzrlib/builtins.py:3439
2108
#: bzrlib/builtins.py:3346
2109
2109
msgid " A selective commit after a merge is not yet supported."
2112
#: bzrlib/builtins.py:3441
2112
#: bzrlib/builtins.py:3348
2113
2113
msgid ":Custom authors:"
2116
#: bzrlib/builtins.py:3443
2116
#: bzrlib/builtins.py:3350
2118
2118
" If the author of the change is not the same person as the committer,\n"
2119
2119
" you can specify the author's name using the --author option. The\n"
2155
2155
" one or more bugs. See ``bzr help bugs`` for details."
2158
#: bzrlib/builtins.py:3474
2158
#: bzrlib/builtins.py:3381
2159
2159
msgid "Do not consider changes made to a given path."
2162
#: bzrlib/builtins.py:3477
2162
#: bzrlib/builtins.py:3384
2163
2163
msgid "Description of the new revision."
2166
#: bzrlib/builtins.py:3480
2166
#: bzrlib/builtins.py:3387
2167
2167
msgid "Commit even if nothing has changed."
2170
#: bzrlib/builtins.py:3484
2170
#: bzrlib/builtins.py:3391
2171
2171
msgid "Take commit message from this file."
2174
#: bzrlib/builtins.py:3486
2174
#: bzrlib/builtins.py:3393
2175
2175
msgid "Refuse to commit if there are unknown files in the working tree."
2178
#: bzrlib/builtins.py:3489
2178
#: bzrlib/builtins.py:3396
2180
2180
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2181
2181
"08:00:00 +0100'."
2184
#: bzrlib/builtins.py:3492
2184
#: bzrlib/builtins.py:3399
2185
2185
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2188
#: bzrlib/builtins.py:3495
2188
#: bzrlib/builtins.py:3402
2189
2189
msgid "Set the author's name, if it's different from the committer."
2192
#: bzrlib/builtins.py:3498
2192
#: bzrlib/builtins.py:3405
2194
2194
"Perform a local commit in a bound branch. Local commits are not pushed to "
2195
2195
"the master branch until a normal commit is performed."
2198
#: bzrlib/builtins.py:3504
2198
#: bzrlib/builtins.py:3411
2200
2200
"When no message is supplied, show the diff along with the status summary in "
2201
2201
"the message editor."
2204
#: bzrlib/builtins.py:3507
2204
#: bzrlib/builtins.py:3414
2206
2206
"When committing to a foreign version control system do not push data that "
2207
2207
"can not be natively represented."
2210
#: bzrlib/builtins.py:3525
2210
#: bzrlib/builtins.py:3432
2211
2211
#, python-format
2213
2213
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2223
2223
"Commit refused."
2226
#: bzrlib/builtins.py:3543
2226
#: bzrlib/builtins.py:3450
2227
2227
#, python-format
2228
2228
msgid "Unrecognized bug %s. Commit refused."
2231
#: bzrlib/builtins.py:3546
2231
#: bzrlib/builtins.py:3453
2232
2232
#, python-format
2235
2235
"Commit refused."
2238
#: bzrlib/builtins.py:3570
2238
#: bzrlib/builtins.py:3477
2239
2239
msgid "Could not parse --commit-time: "
2242
#: bzrlib/builtins.py:3610
2242
#: bzrlib/builtins.py:3517
2243
2243
msgid "please specify either --message or --file"
2246
#: bzrlib/builtins.py:3639
2246
#: bzrlib/builtins.py:3546
2247
2247
msgid "please specify a commit message with either --message or --file"
2250
#: bzrlib/builtins.py:3642
2250
#: bzrlib/builtins.py:3549
2252
2252
"Empty commit message specified. Please specify a commit message with either -"
2253
2253
"-message or --file or leave a blank message with --message \"\"."
2256
#: bzrlib/builtins.py:3662
2256
#: bzrlib/builtins.py:3569
2258
2258
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2259
2259
"-unchanged to force an empty commit."
2262
#: bzrlib/builtins.py:3666
2262
#: bzrlib/builtins.py:3573
2264
2264
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2265
2265
"resolve FILE\" to resolve."
2268
#: bzrlib/builtins.py:3670
2268
#: bzrlib/builtins.py:3577
2269
2269
msgid "Commit refused because there are unknown files in the working tree."
2272
#: bzrlib/builtins.py:3673
2272
#: bzrlib/builtins.py:3580
2275
2275
"To commit to master branch, run update and then commit.\n"
2276
2276
"You can also pass --local to commit to continue working disconnected."
2279
#: bzrlib/builtins.py:3681
2279
#: bzrlib/builtins.py:3588
2281
2281
"Validate working tree structure, branch consistency and repository history."
2284
#: bzrlib/builtins.py:3683
2284
#: bzrlib/builtins.py:3590
2286
2286
"This command checks various invariants about branch and repository storage\n"
2287
2287
"to detect data corruption or bzr bugs."
2290
#: bzrlib/builtins.py:3686
2290
#: bzrlib/builtins.py:3593
2292
2292
"The working tree and branch checks will only give output if a problem is\n"
2293
2293
"detected. The output fields of the repository check are:"
2296
#: bzrlib/builtins.py:3689
2296
#: bzrlib/builtins.py:3596
2299
2299
" This is just the number of revisions checked. It doesn't\n"
2300
2300
" indicate a problem."
2303
#: bzrlib/builtins.py:3693
2303
#: bzrlib/builtins.py:3600
2305
2305
"versionedfiles\n"
2306
2306
" This is just the number of versionedfiles checked. It\n"
2307
2307
" doesn't indicate a problem."
2310
#: bzrlib/builtins.py:3697
2310
#: bzrlib/builtins.py:3604
2312
2312
"unreferenced ancestors\n"
2313
2313
" Texts that are ancestors of other texts, but\n"
2331
2331
" indicate a problem."
2334
#: bzrlib/builtins.py:3712
2334
#: bzrlib/builtins.py:3619
2336
2336
"If no restrictions are specified, all Bazaar data that is found at the "
2338
2338
"location will be checked."
2341
#: bzrlib/builtins.py:3717
2341
#: bzrlib/builtins.py:3624
2342
2342
msgid " Check the tree and branch at 'foo'::"
2345
#: bzrlib/builtins.py:3719
2345
#: bzrlib/builtins.py:3626
2346
2346
msgid " bzr check --tree --branch foo"
2349
#: bzrlib/builtins.py:3721
2349
#: bzrlib/builtins.py:3628
2350
2350
msgid " Check only the repository at 'bar'::"
2353
#: bzrlib/builtins.py:3723
2353
#: bzrlib/builtins.py:3630
2354
2354
msgid " bzr check --repo bar"
2357
#: bzrlib/builtins.py:3725
2357
#: bzrlib/builtins.py:3632
2358
2358
msgid " Check everything at 'baz'::"
2361
#: bzrlib/builtins.py:3727
2361
#: bzrlib/builtins.py:3634
2362
2362
msgid " bzr check baz"
2365
#: bzrlib/builtins.py:3733
2365
#: bzrlib/builtins.py:3640
2366
2366
msgid "Check the branch related to the current directory."
2369
#: bzrlib/builtins.py:3735
2369
#: bzrlib/builtins.py:3642
2370
2370
msgid "Check the repository related to the current directory."
2373
#: bzrlib/builtins.py:3737
2373
#: bzrlib/builtins.py:3644
2374
2374
msgid "Check the working tree related to the current directory."
2377
#: bzrlib/builtins.py:3751
2377
#: bzrlib/builtins.py:3658
2378
2378
msgid "Upgrade a repository, branch or working tree to a newer format."
2381
#: bzrlib/builtins.py:3753
2381
#: bzrlib/builtins.py:3660
2383
2383
"When the default format has changed after a major new release of\n"
2384
2384
"Bazaar, you may be informed during certain operations that you\n"
2419
#: bzrlib/builtins.py:3779
2419
#: bzrlib/builtins.py:3686
2421
2421
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2422
2422
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2425
#: bzrlib/builtins.py:3787
2425
#: bzrlib/builtins.py:3694
2426
2426
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2429
#: bzrlib/builtins.py:3791
2429
#: bzrlib/builtins.py:3698
2430
2430
msgid "Branch format"
2433
#: bzrlib/builtins.py:3793
2433
#: bzrlib/builtins.py:3700
2434
2434
msgid "Remove the backup.bzr directory if successful."
2437
#: bzrlib/builtins.py:3795
2437
#: bzrlib/builtins.py:3702
2438
2438
msgid "Show what would be done, but don't actually do anything."
2441
#: bzrlib/builtins.py:3810
2441
#: bzrlib/builtins.py:3717
2442
2442
msgid "Show or set bzr user id."
2445
#: bzrlib/builtins.py:3812
2445
#: bzrlib/builtins.py:3719
2448
2448
" Show the email of the current user::"
2451
#: bzrlib/builtins.py:3815
2451
#: bzrlib/builtins.py:3722
2452
2452
msgid " bzr whoami --email"
2455
#: bzrlib/builtins.py:3817
2455
#: bzrlib/builtins.py:3724
2456
2456
msgid " Set the current user::"
2459
#: bzrlib/builtins.py:3819
2459
#: bzrlib/builtins.py:3726
2460
2460
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2463
#: bzrlib/builtins.py:3823
2463
#: bzrlib/builtins.py:3730
2464
2464
msgid "Display email address only."
2467
#: bzrlib/builtins.py:3825
2467
#: bzrlib/builtins.py:3732
2468
2468
msgid "Set identity for the current branch instead of globally."
2471
#: bzrlib/builtins.py:3851
2471
#: bzrlib/builtins.py:3758
2472
2472
msgid "--email can only be used to display existing identity"
2475
#: bzrlib/builtins.py:3873
2475
#: bzrlib/builtins.py:3780
2476
2476
msgid "Print or set the branch nickname."
2479
#: bzrlib/builtins.py:3875
2479
#: bzrlib/builtins.py:3782
2481
2481
"If unset, the tree root directory name is used as the nickname.\n"
2482
2482
"To print the current nickname, execute with no argument."
2485
#: bzrlib/builtins.py:3878
2485
#: bzrlib/builtins.py:3785
2487
2487
"Bound branches use the nickname of its master branch unless it is set\n"
2491
#: bzrlib/builtins.py:3898
2491
#: bzrlib/builtins.py:3805
2492
2492
msgid "Set/unset and display aliases."
2495
#: bzrlib/builtins.py:3900
2495
#: bzrlib/builtins.py:3807
2498
2498
" Show the current aliases::"
2501
#: bzrlib/builtins.py:3903
2501
#: bzrlib/builtins.py:3810
2502
2502
msgid " bzr alias"
2505
#: bzrlib/builtins.py:3905
2505
#: bzrlib/builtins.py:3812
2506
2506
msgid " Show the alias specified for 'll'::"
2509
#: bzrlib/builtins.py:3907
2509
#: bzrlib/builtins.py:3814
2510
2510
msgid " bzr alias ll"
2513
#: bzrlib/builtins.py:3909
2513
#: bzrlib/builtins.py:3816
2514
2514
msgid " Set an alias for 'll'::"
2517
#: bzrlib/builtins.py:3911
2517
#: bzrlib/builtins.py:3818
2518
2518
msgid " bzr alias ll=\"log --line -r-10..-1\""
2521
#: bzrlib/builtins.py:3913
2521
#: bzrlib/builtins.py:3820
2522
2522
msgid " To remove an alias for 'll'::"
2525
#: bzrlib/builtins.py:3915
2525
#: bzrlib/builtins.py:3822
2526
2526
msgid " bzr alias --remove ll"
2529
#: bzrlib/builtins.py:3920
2529
#: bzrlib/builtins.py:3827
2530
2530
msgid "Remove the alias."
2533
#: bzrlib/builtins.py:3938
2533
#: bzrlib/builtins.py:3845
2534
2534
msgid "bzr alias --remove expects an alias to remove."
2537
#: bzrlib/builtins.py:4119
2537
#: bzrlib/builtins.py:4026
2539
2539
"subunit not available. subunit needs to be installed to use --subunit."
2542
#: bzrlib/builtins.py:4136
2542
#: bzrlib/builtins.py:4043
2544
2544
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2547
#: bzrlib/builtins.py:4183
2547
#: bzrlib/builtins.py:4090
2548
2548
msgid "Show version of bzr."
2551
#: bzrlib/builtins.py:4187
2551
#: bzrlib/builtins.py:4094
2552
2552
msgid "Print just the version number."
2555
#: bzrlib/builtins.py:4206
2555
#: bzrlib/builtins.py:4113
2556
2556
msgid "It sure does!\n"
2559
#: bzrlib/builtins.py:4230
2559
#: bzrlib/builtins.py:4137
2560
2560
#, python-format
2561
2561
msgid "merge base is revision %s\n"
2564
#: bzrlib/builtins.py:4234
2564
#: bzrlib/builtins.py:4141
2565
2565
msgid "Perform a three-way merge."
2568
#: bzrlib/builtins.py:4236
2568
#: bzrlib/builtins.py:4143
2570
2570
"The source of the merge can be specified either in the form of a branch,\n"
2571
2571
"or in the form of a path to a file containing a merge directive generated\n"
2641
2641
"merge revision which has more than two parents."
2644
#: bzrlib/builtins.py:4283
2644
#: bzrlib/builtins.py:4190
2646
2646
"If one would like to merge changes from the working tree of the other\n"
2647
2647
"branch without merging any committed revisions, the --uncommitted option\n"
2648
2648
"can be given."
2651
#: bzrlib/builtins.py:4287
2651
#: bzrlib/builtins.py:4194
2653
2653
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2654
2654
"you to apply each diff hunk and file change, similar to \"shelve\"."
2657
#: bzrlib/builtins.py:4290
2657
#: bzrlib/builtins.py:4197
2660
2660
" To merge all new revisions from bzr.dev::"
2663
#: bzrlib/builtins.py:4293
2663
#: bzrlib/builtins.py:4200
2664
2664
msgid " bzr merge ../bzr.dev"
2667
#: bzrlib/builtins.py:4295
2667
#: bzrlib/builtins.py:4202
2668
2668
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2671
#: bzrlib/builtins.py:4297
2671
#: bzrlib/builtins.py:4204
2672
2672
msgid " bzr merge -r 82 ../bzr.dev"
2675
#: bzrlib/builtins.py:4299
2675
#: bzrlib/builtins.py:4206
2676
2676
msgid " To merge the changes introduced by 82, without previous changes::"
2679
#: bzrlib/builtins.py:4301
2679
#: bzrlib/builtins.py:4208
2680
2680
msgid " bzr merge -r 81..82 ../bzr.dev"
2683
#: bzrlib/builtins.py:4303
2683
#: bzrlib/builtins.py:4210
2684
2684
msgid " To apply a merge directive contained in /tmp/merge::"
2687
#: bzrlib/builtins.py:4305
2687
#: bzrlib/builtins.py:4212
2688
2688
msgid " bzr merge /tmp/merge"
2691
#: bzrlib/builtins.py:4307
2691
#: bzrlib/builtins.py:4214
2693
2693
" To create a merge revision with three parents from two branches\n"
2694
2694
" feature1a and feature1b:"
2697
#: bzrlib/builtins.py:4310
2697
#: bzrlib/builtins.py:4217
2699
2699
" bzr merge ../feature1a\n"
2700
2700
" bzr merge ../feature1b --force\n"
2701
2701
" bzr commit -m 'revision with three parents'"
2704
#: bzrlib/builtins.py:4322
2704
#: bzrlib/builtins.py:4229
2705
2705
msgid "Merge even if the destination tree has uncommitted changes."
2708
#: bzrlib/builtins.py:4328
2708
#: bzrlib/builtins.py:4235
2710
2710
"Apply uncommitted changes from a working copy, instead of branch changes."
2713
#: bzrlib/builtins.py:4330
2713
#: bzrlib/builtins.py:4237
2715
2715
"If the destination is already completely merged into the source, pull from "
2716
2716
"the source rather than merging. When this happens, you do not need to "
2717
2717
"commit the result."
2720
#: bzrlib/builtins.py:4335
2720
#: bzrlib/builtins.py:4242
2722
2722
"Branch to merge into, rather than the one containing the working directory."
2725
#: bzrlib/builtins.py:4337
2725
#: bzrlib/builtins.py:4244
2726
2726
msgid "Instead of merging, show a diff of the merge."
2729
#: bzrlib/builtins.py:4339
2729
#: bzrlib/builtins.py:4246
2730
2730
msgid "Select changes interactively."
2733
#: bzrlib/builtins.py:4361
2733
#: bzrlib/builtins.py:4268
2735
2735
"Merging into empty branches not currently supported, "
2736
2736
"https://bugs.launchpad.net/bzr/+bug/308562"
2739
#: bzrlib/builtins.py:4388
2739
#: bzrlib/builtins.py:4295
2740
2740
msgid "Cannot use --uncommitted with bundles or merge directives."
2743
#: bzrlib/builtins.py:4399
2743
#: bzrlib/builtins.py:4306
2744
2744
msgid "Cannot use --uncommitted and --revision at the same time."
2747
#: bzrlib/builtins.py:4419
2747
#: bzrlib/builtins.py:4326
2748
2748
msgid "merger: "
2751
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2751
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2752
2752
msgid "Nothing to do."
2755
#: bzrlib/builtins.py:4425
2755
#: bzrlib/builtins.py:4332
2756
2756
msgid "Cannot pull individual files"
2759
#: bzrlib/builtins.py:4433
2759
#: bzrlib/builtins.py:4340
2760
2760
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2763
#: bzrlib/builtins.py:4491
2763
#: bzrlib/builtins.py:4398
2764
2764
#, python-format
2765
2765
msgid "Show-base is not supported for this merge type. %s"
2768
#: bzrlib/builtins.py:4500
2768
#: bzrlib/builtins.py:4407
2769
2769
#, python-format
2770
2770
msgid "Conflict reduction is not supported for merge type %s."
2773
#: bzrlib/builtins.py:4504
2773
#: bzrlib/builtins.py:4411
2774
2774
msgid "Cannot do conflict reduction and show base."
2777
#: bzrlib/builtins.py:4615
2777
#: bzrlib/builtins.py:4522
2778
2778
msgid "No location specified or remembered"
2781
#: bzrlib/builtins.py:4617
2781
#: bzrlib/builtins.py:4524
2782
2782
msgid "{0} remembered {1} location {2}"
2785
#: bzrlib/builtins.py:4623
2785
#: bzrlib/builtins.py:4530
2786
2786
msgid "Redo a merge."
2789
#: bzrlib/builtins.py:4625
2789
#: bzrlib/builtins.py:4532
2791
2791
"Use this if you want to try a different merge technique while resolving\n"
2792
2792
"conflicts. Some merge techniques are better than others, and remerge\n"
2793
2793
"lets you try different ones on different files."
2796
#: bzrlib/builtins.py:4629
2796
#: bzrlib/builtins.py:4536
2798
2798
"The options for remerge have the same meaning and defaults as the ones for\n"
2799
2799
"merge. The difference is that remerge can (only) be run when there is a\n"
2800
2800
"pending merge, and it lets you specify particular files."
2803
#: bzrlib/builtins.py:4633
2803
#: bzrlib/builtins.py:4540
2806
2806
" Re-do the merge of all conflicted files, and show the base text in\n"
2807
2807
" conflict regions, in addition to the usual THIS and OTHER texts::"
2810
#: bzrlib/builtins.py:4637
2810
#: bzrlib/builtins.py:4544
2811
2811
msgid " bzr remerge --show-base"
2814
#: bzrlib/builtins.py:4639
2814
#: bzrlib/builtins.py:4546
2816
2816
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2817
2817
" additional processing to reduce the size of conflict regions::"
2820
#: bzrlib/builtins.py:4642
2820
#: bzrlib/builtins.py:4549
2821
2821
msgid " bzr remerge --merge-type weave --reprocess foobar"
2824
#: bzrlib/builtins.py:4649
2824
#: bzrlib/builtins.py:4556
2825
2825
msgid "Show base revision text in conflicts."
2828
#: bzrlib/builtins.py:4661
2828
#: bzrlib/builtins.py:4568
2830
2830
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2834
#: bzrlib/builtins.py:4717
2834
#: bzrlib/builtins.py:4624
2835
2835
msgid "Revert files to a previous revision."
2838
#: bzrlib/builtins.py:4719
2838
#: bzrlib/builtins.py:4626
2840
2840
"Giving a list of files will revert only those files. Otherwise, all files\n"
2841
2841
"will be reverted. If the revision is not specified with '--revision', the\n"
2842
2842
"last committed revision is used."
2845
#: bzrlib/builtins.py:4723
2845
#: bzrlib/builtins.py:4630
2847
2847
"To remove only some changes, without reverting to a prior version, use\n"
2848
2848
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2937
2937
" 0 - no missing revisions"
2940
#: bzrlib/builtins.py:4847
2940
#: bzrlib/builtins.py:4754
2942
2942
" Determine the missing revisions between this and the branch at the\n"
2943
2943
" remembered pull location::"
2946
#: bzrlib/builtins.py:4850
2946
#: bzrlib/builtins.py:4757
2947
2947
msgid " bzr missing"
2950
#: bzrlib/builtins.py:4852
2950
#: bzrlib/builtins.py:4759
2951
2951
msgid " Determine the missing revisions between this and another branch::"
2954
#: bzrlib/builtins.py:4854
2954
#: bzrlib/builtins.py:4761
2955
2955
msgid " bzr missing http://server/branch"
2958
#: bzrlib/builtins.py:4856
2958
#: bzrlib/builtins.py:4763
2960
2960
" Determine the missing revisions up to a specific revision on the other\n"
2964
#: bzrlib/builtins.py:4859
2964
#: bzrlib/builtins.py:4766
2965
2965
msgid " bzr missing -r ..-10"
2968
#: bzrlib/builtins.py:4861
2968
#: bzrlib/builtins.py:4768
2970
2970
" Determine the missing revisions up to a specific revision on this\n"
2974
#: bzrlib/builtins.py:4864
2974
#: bzrlib/builtins.py:4771
2975
2975
msgid " bzr missing --my-revision ..-10"
2978
#: bzrlib/builtins.py:4871
2978
#: bzrlib/builtins.py:4778
2979
2979
msgid "Reverse the order of revisions."
2982
#: bzrlib/builtins.py:4873
2982
#: bzrlib/builtins.py:4780
2983
2983
msgid "Display changes in the local branch only."
2986
#: bzrlib/builtins.py:4874
2986
#: bzrlib/builtins.py:4781
2987
2987
msgid "Same as --mine-only."
2990
#: bzrlib/builtins.py:4876
2990
#: bzrlib/builtins.py:4783
2991
2991
msgid "Display changes in the remote branch only."
2994
#: bzrlib/builtins.py:4877
2994
#: bzrlib/builtins.py:4784
2995
2995
msgid "Same as --theirs-only."
2998
#: bzrlib/builtins.py:4882
2998
#: bzrlib/builtins.py:4789
3000
3000
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3004
#: bzrlib/builtins.py:4886
3004
#: bzrlib/builtins.py:4793
3006
3006
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3010
#: bzrlib/builtins.py:4889
3010
#: bzrlib/builtins.py:4796
3011
3011
msgid "Show all revisions in addition to the mainline ones."
3014
#: bzrlib/builtins.py:4943
3014
#: bzrlib/builtins.py:4850
3015
3015
msgid "No peer location known or specified."
3018
#: bzrlib/builtins.py:4947
3018
#: bzrlib/builtins.py:4854
3019
3019
msgid "Using saved parent location: {0}\n"
3022
#: bzrlib/builtins.py:4980
3022
#: bzrlib/builtins.py:4887
3023
3023
#, python-format
3024
3024
msgid "You have %d extra revision:\n"
3025
3025
msgid_plural "You have %d extra revisions:\n"
3029
#: bzrlib/builtins.py:4996
3029
#: bzrlib/builtins.py:4903
3030
3030
#, python-format
3031
3031
msgid "You are missing %d revision:\n"
3032
3032
msgid_plural "You are missing %d revisions:\n"
3036
#: bzrlib/builtins.py:5008
3036
#: bzrlib/builtins.py:4915
3037
3037
msgid "This branch has no new revisions.\n"
3040
#: bzrlib/builtins.py:5011
3040
#: bzrlib/builtins.py:4918
3041
3041
msgid "Other branch has no new revisions.\n"
3044
#: bzrlib/builtins.py:5016
3044
#: bzrlib/builtins.py:4923
3045
3045
msgid "Branches are up to date.\n"
3048
#: bzrlib/builtins.py:5027
3048
#: bzrlib/builtins.py:4934
3049
3049
msgid "Compress the data within a repository."
3052
#: bzrlib/builtins.py:5029
3052
#: bzrlib/builtins.py:4936
3054
3054
"This operation compresses the data within a bazaar repository. As\n"
3055
3055
"bazaar supports automatic packing of repository, this operation is\n"
3056
3056
"normally not required to be done manually."
3059
#: bzrlib/builtins.py:5033
3059
#: bzrlib/builtins.py:4940
3061
3061
"During the pack operation, bazaar takes a backup of existing repository\n"
3062
3062
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3108
3108
"plugins using the Python programming language."
3111
#: bzrlib/builtins.py:5091
3111
#: bzrlib/builtins.py:4998
3112
3112
msgid "Show testament (signing-form) of a revision."
3115
#: bzrlib/builtins.py:5094
3115
#: bzrlib/builtins.py:5001
3116
3116
msgid "Produce long-format testament."
3119
#: bzrlib/builtins.py:5096
3119
#: bzrlib/builtins.py:5003
3120
3120
msgid "Produce a strict-format testament."
3123
#: bzrlib/builtins.py:5122
3123
#: bzrlib/builtins.py:5029
3124
3124
msgid "Show the origin of each line in a file."
3127
#: bzrlib/builtins.py:5124
3127
#: bzrlib/builtins.py:5031
3129
3129
"This prints out the given file with an annotation on the left side\n"
3130
3130
"indicating which revision, author and date introduced the change."
3133
#: bzrlib/builtins.py:5127
3133
#: bzrlib/builtins.py:5034
3135
3135
"If the origin is the same for a run of consecutive lines, it is\n"
3136
3136
"shown only at the top, unless the --all option is given."
3139
#: bzrlib/builtins.py:5135
3139
#: bzrlib/builtins.py:5042
3140
3140
msgid "Show annotations on all lines."
3143
#: bzrlib/builtins.py:5136
3143
#: bzrlib/builtins.py:5043
3144
3144
msgid "Show commit date in annotations."
3147
#: bzrlib/builtins.py:5223
3147
#: bzrlib/builtins.py:5130
3148
3148
msgid "Cannot sign a range of non-revision-history revisions"
3151
#: bzrlib/builtins.py:5235
3151
#: bzrlib/builtins.py:5142
3152
3152
msgid "Please supply either one revision, or a range."
3155
#: bzrlib/builtins.py:5239
3155
#: bzrlib/builtins.py:5146
3157
3157
"Convert the current branch into a checkout of the supplied branch.\n"
3158
3158
"If no branch is supplied, rebind to the last bound location."
3161
#: bzrlib/builtins.py:5242
3161
#: bzrlib/builtins.py:5149
3163
3163
"Once converted into a checkout, commits must succeed on the master branch\n"
3164
3164
"before they will be applied to the local branch."
3167
#: bzrlib/builtins.py:5245
3167
#: bzrlib/builtins.py:5152
3169
3169
"Bound branches use the nickname of its master branch unless it is set\n"
3170
3170
"locally, in which case binding will update the local nickname to be\n"
3171
3171
"that of the master."
3174
#: bzrlib/builtins.py:5260
3174
#: bzrlib/builtins.py:5167
3175
3175
msgid "No location supplied. This format does not remember old locations."
3178
#: bzrlib/builtins.py:5265
3178
#: bzrlib/builtins.py:5172
3179
3179
msgid "Branch is already bound"
3182
#: bzrlib/builtins.py:5267
3182
#: bzrlib/builtins.py:5174
3183
3183
msgid "No location supplied and no previous location known"
3186
#: bzrlib/builtins.py:5273
3186
#: bzrlib/builtins.py:5180
3187
3187
msgid "These branches have diverged. Try merging, and then bind again."
3190
#: bzrlib/builtins.py:5280
3190
#: bzrlib/builtins.py:5187
3191
3191
msgid "Convert the current checkout into a regular branch."
3194
#: bzrlib/builtins.py:5282
3194
#: bzrlib/builtins.py:5189
3196
3196
"After unbinding, the local branch is considered independent and subsequent\n"
3197
3197
"commits will be local only."
3200
#: bzrlib/builtins.py:5293
3200
#: bzrlib/builtins.py:5200
3201
3201
msgid "Local branch is not bound"
3204
#: bzrlib/builtins.py:5297
3204
#: bzrlib/builtins.py:5204
3205
3205
msgid "Remove the last committed revision."
3208
#: bzrlib/builtins.py:5299
3208
#: bzrlib/builtins.py:5206
3210
3210
"--verbose will print out what is being removed.\n"
3211
3211
"--dry-run will go through all the motions, but not actually\n"
3212
3212
"remove anything."
3215
#: bzrlib/builtins.py:5303
3215
#: bzrlib/builtins.py:5210
3217
3217
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3218
3218
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3219
3219
"branch at revision 15."
3222
#: bzrlib/builtins.py:5307
3222
#: bzrlib/builtins.py:5214
3224
3224
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3225
3225
"it may make is to restore any pending merges that were present before\n"
3229
#: bzrlib/builtins.py:5318
3229
#: bzrlib/builtins.py:5225
3230
3230
msgid "Don't actually make changes."
3233
#: bzrlib/builtins.py:5319
3233
#: bzrlib/builtins.py:5226
3234
3234
msgid "Say yes to all questions."
3237
#: bzrlib/builtins.py:5321
3237
#: bzrlib/builtins.py:5228
3238
3238
msgid "Keep tags that point to removed revisions."
3241
#: bzrlib/builtins.py:5323
3241
#: bzrlib/builtins.py:5230
3242
3242
msgid "Only remove the commits from the local branch when in a checkout."
3245
#: bzrlib/builtins.py:5372
3245
#: bzrlib/builtins.py:5279
3246
3246
msgid "No revisions to uncommit.\n"
3249
#: bzrlib/builtins.py:5387
3249
#: bzrlib/builtins.py:5294
3250
3250
msgid "Dry-run, pretending to remove the above revisions.\n"
3253
#: bzrlib/builtins.py:5390
3253
#: bzrlib/builtins.py:5297
3254
3254
msgid "The above revision(s) will be removed.\n"
3257
#: bzrlib/builtins.py:5394
3257
#: bzrlib/builtins.py:5301
3258
3258
msgid "Uncommit these revisions"
3261
#: bzrlib/builtins.py:5397
3261
#: bzrlib/builtins.py:5304
3262
3262
msgid "Canceled\n"
3265
#: bzrlib/builtins.py:5404
3265
#: bzrlib/builtins.py:5311
3266
3266
#, python-format
3268
3268
"You can restore the old tip by running:\n"
3269
3269
" bzr pull . -r revid:%s\n"
3272
#: bzrlib/builtins.py:5409
3272
#: bzrlib/builtins.py:5316
3273
3273
msgid "Break a dead lock."
3276
#: bzrlib/builtins.py:5411
3276
#: bzrlib/builtins.py:5318
3278
3278
"This command breaks a lock on a repository, branch, working directory or\n"
3282
#: bzrlib/builtins.py:5414
3282
#: bzrlib/builtins.py:5321
3284
3284
"CAUTION: Locks should only be broken when you are sure that the process\n"
3285
3285
"holding the lock has been stopped."
3288
#: bzrlib/builtins.py:5417
3288
#: bzrlib/builtins.py:5324
3290
3290
"You can get information on what locks are open via the 'bzr info\n"
3291
3291
"[location]' command."
3294
#: bzrlib/builtins.py:5420
3294
#: bzrlib/builtins.py:5327
3297
3297
" bzr break-lock\n"
3299
3299
" bzr break-lock --conf ~/.bazaar"
3302
#: bzrlib/builtins.py:5429
3302
#: bzrlib/builtins.py:5336
3303
3303
msgid "LOCATION is the directory where the config lock is."
3306
#: bzrlib/builtins.py:5431
3306
#: bzrlib/builtins.py:5338
3307
3307
msgid "Do not ask for confirmation before breaking the lock."
3310
#: bzrlib/builtins.py:5466
3310
#: bzrlib/builtins.py:5373
3311
3311
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3314
#: bzrlib/builtins.py:5467
3314
#: bzrlib/builtins.py:5374
3315
3315
msgid "Run the bzr server."
3318
#: bzrlib/builtins.py:5473
3318
#: bzrlib/builtins.py:5380
3319
3319
msgid "Serve on stdin/out for use from inetd or sshd."
3322
#: bzrlib/builtins.py:5474
3322
#: bzrlib/builtins.py:5381
3323
3323
msgid "protocol"
3326
#: bzrlib/builtins.py:5475
3326
#: bzrlib/builtins.py:5382
3327
3327
msgid "Protocol to serve."
3330
#: bzrlib/builtins.py:5479
3330
#: bzrlib/builtins.py:5386
3332
3332
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3333
3333
"Passing 0 as the port number will result in a dynamically allocated port. "
3334
3334
"The default port depends on the protocol."
3337
#: bzrlib/builtins.py:5485
3337
#: bzrlib/builtins.py:5392
3338
3338
msgid "Serve contents of this directory."
3341
#: bzrlib/builtins.py:5487
3341
#: bzrlib/builtins.py:5394
3343
3343
"By default the server is a readonly server. Supplying --allow-writes "
3344
3344
"enables write access to the contents of the served directory and below. "
3347
3347
"uncontrolled write access to your file system."
3350
#: bzrlib/builtins.py:5496
3350
#: bzrlib/builtins.py:5403
3351
3351
msgid "Override the default idle client timeout (5min)."
3354
#: bzrlib/builtins.py:5546
3354
#: bzrlib/builtins.py:5453
3355
3355
msgid "Combine a tree into its containing tree."
3358
#: bzrlib/builtins.py:5548
3358
#: bzrlib/builtins.py:5455
3359
3359
msgid "This command requires the target tree to be in a rich-root format."
3362
#: bzrlib/builtins.py:5550
3362
#: bzrlib/builtins.py:5457
3364
3364
"The TREE argument should be an independent tree, inside another tree, but\n"
3365
3365
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3366
3366
"running \"bzr branch\" with the target inside a tree.)"
3369
#: bzrlib/builtins.py:5554
3369
#: bzrlib/builtins.py:5461
3371
3371
"The result is a combined tree, with the subtree no longer an independent\n"
3372
3372
"part. This is marked as a merge of the subtree into the containing tree,\n"
3373
3373
"and all history is preserved."
3376
#: bzrlib/builtins.py:5572
3376
#: bzrlib/builtins.py:5479
3377
3377
#, python-format
3379
3379
"Can't join trees because %s doesn't support rich root data.\n"
3380
3380
"You can use bzr upgrade on the repository."
3383
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3383
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3384
3384
msgid "Cannot join {0}. {1}"
3387
#: bzrlib/builtins.py:5592
3387
#: bzrlib/builtins.py:5499
3388
3388
msgid "Split a subdirectory of a tree into a separate tree."
3391
#: bzrlib/builtins.py:5594
3391
#: bzrlib/builtins.py:5501
3393
3393
"This command will produce a target tree in a format that supports\n"
3394
3394
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3395
3395
"converted into earlier formats like 'dirstate-tags'."
3398
#: bzrlib/builtins.py:5598
3398
#: bzrlib/builtins.py:5505
3400
3400
"The TREE argument should be a subdirectory of a working tree. That\n"
3401
3401
"subdirectory will be converted into an independent tree, with its own\n"
3402
3402
"branch. Commits in the top-level tree will not apply to the new subtree."
3405
#: bzrlib/builtins.py:5678
3405
#: bzrlib/builtins.py:5585
3406
3406
msgid "No submit branch specified or known"
3409
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3409
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3410
3410
msgid "No public branch specified or known"
3413
#: bzrlib/builtins.py:5691
3413
#: bzrlib/builtins.py:5598
3414
3414
msgid "bzr merge-directive takes at most two one revision identifiers"
3417
#: bzrlib/builtins.py:5700
3417
#: bzrlib/builtins.py:5607
3418
3418
msgid "No revisions to bundle."
3421
#: bzrlib/builtins.py:5719
3421
#: bzrlib/builtins.py:5626
3422
3422
msgid "Mail or create a merge-directive for submitting changes."
3425
#: bzrlib/builtins.py:5721
3425
#: bzrlib/builtins.py:5628
3426
3426
msgid "A merge directive provides many things needed for requesting merges:"
3429
#: bzrlib/builtins.py:5723
3429
#: bzrlib/builtins.py:5630
3430
3430
msgid "* A machine-readable description of the merge to perform"
3433
#: bzrlib/builtins.py:5725
3433
#: bzrlib/builtins.py:5632
3434
3434
msgid "* An optional patch that is a preview of the changes requested"
3437
#: bzrlib/builtins.py:5727
3437
#: bzrlib/builtins.py:5634
3439
3439
"* An optional bundle of revision data, so that the changes can be applied\n"
3440
3440
" directly from the merge directive, without retrieving data from a\n"
3444
#: bzrlib/builtins.py:5731
3444
#: bzrlib/builtins.py:5638
3446
3446
"`bzr send` creates a compact data set that, when applied using bzr\n"
3447
3447
"merge, has the same effect as merging from the source branch. "
3450
#: bzrlib/builtins.py:5734
3450
#: bzrlib/builtins.py:5641
3452
3452
"By default the merge directive is self-contained and can be applied to any\n"
3453
3453
"branch containing submit_branch in its ancestory without needing access to\n"
3454
3454
"the source branch."
3457
#: bzrlib/builtins.py:5738
3457
#: bzrlib/builtins.py:5645
3459
3459
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3460
3460
"revisions, but only a structured request to merge from the\n"
3546
3546
"set them, and use `bzr info` to display them."
3549
#: bzrlib/builtins.py:5813
3549
#: bzrlib/builtins.py:5720
3550
3550
msgid "Write merge directive to this file or directory; use - for stdout."
3553
#: bzrlib/builtins.py:5817
3553
#: bzrlib/builtins.py:5724
3555
3555
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3556
3556
"strict disables the check."
3559
#: bzrlib/builtins.py:5819
3559
#: bzrlib/builtins.py:5726
3560
3560
msgid "Mail the request to this address."
3563
#: bzrlib/builtins.py:5823
3563
#: bzrlib/builtins.py:5730
3564
3564
msgid "Body for the email."
3567
#: bzrlib/builtins.py:5876
3567
#: bzrlib/builtins.py:5783
3568
3568
msgid "Do not include a bundle in the merge directive."
3571
#: bzrlib/builtins.py:5877
3571
#: bzrlib/builtins.py:5784
3572
3572
msgid "Do not include a preview patch in the merge directive."
3575
#: bzrlib/builtins.py:5880
3575
#: bzrlib/builtins.py:5787
3576
3576
msgid "Remember submit and public branch."
3579
#: bzrlib/builtins.py:5882
3579
#: bzrlib/builtins.py:5789
3581
3581
"Branch to generate the submission from, rather than the one containing the "
3582
3582
"working directory."
3585
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3585
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3589
#: bzrlib/builtins.py:5893
3589
#: bzrlib/builtins.py:5800
3590
3590
msgid "Use the specified output format."
3593
#: bzrlib/builtins.py:5915
3593
#: bzrlib/builtins.py:5822
3594
3594
msgid "Create, remove or modify a tag naming a revision."
3597
#: bzrlib/builtins.py:5917
3597
#: bzrlib/builtins.py:5824
3599
3599
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3600
3600
"(--revision) option can be given -rtag:X, where X is any previously\n"
3604
#: bzrlib/builtins.py:5921
3604
#: bzrlib/builtins.py:5828
3606
3606
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3607
3607
"along when you branch, push, pull or merge."
3610
#: bzrlib/builtins.py:5924
3610
#: bzrlib/builtins.py:5831
3612
3612
"It is an error to give a tag name that already exists unless you pass\n"
3613
3613
"--force, in which case the tag is moved to point to the new revision."
3616
#: bzrlib/builtins.py:5927
3616
#: bzrlib/builtins.py:5834
3618
3618
"To rename a tag (change the name but keep it on the same revsion), run "
3620
3620
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3623
#: bzrlib/builtins.py:5930
3623
#: bzrlib/builtins.py:5837
3625
3625
"If no tag name is specified it will be determined through the \n"
3626
3626
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3631
#: bzrlib/builtins.py:5940
3631
#: bzrlib/builtins.py:5847
3632
3632
msgid "Delete this tag rather than placing it."
3635
#: bzrlib/builtins.py:5943
3635
#: bzrlib/builtins.py:5850
3636
3636
msgid "Branch in which to place the tag."
3639
#: bzrlib/builtins.py:5945
3639
#: bzrlib/builtins.py:5852
3640
3640
msgid "Replace existing tags."
3643
#: bzrlib/builtins.py:5960
3643
#: bzrlib/builtins.py:5867
3644
3644
msgid "No tag specified to delete."
3647
#: bzrlib/builtins.py:5962
3647
#: bzrlib/builtins.py:5869
3648
3648
#, python-format
3649
3649
msgid "Deleted tag %s."
3652
#: bzrlib/builtins.py:5976
3652
#: bzrlib/builtins.py:5883
3653
3653
msgid "Please specify a tag name."
3656
#: bzrlib/builtins.py:5984
3656
#: bzrlib/builtins.py:5891
3657
3657
#, python-format
3658
3658
msgid "Tag %s already exists for that revision."
3661
#: bzrlib/builtins.py:5988
3661
#: bzrlib/builtins.py:5895
3662
3662
#, python-format
3663
3663
msgid "Created tag %s."
3666
#: bzrlib/builtins.py:5990
3666
#: bzrlib/builtins.py:5897
3667
3667
#, python-format
3668
3668
msgid "Updated tag %s."
3671
#: bzrlib/builtins.py:5994
3671
#: bzrlib/builtins.py:5901
3672
3672
msgid "List tags."
3675
#: bzrlib/builtins.py:5996
3675
#: bzrlib/builtins.py:5903
3677
3677
"This command shows a table of tag names and the revisions they reference."
3680
#: bzrlib/builtins.py:6002
3680
#: bzrlib/builtins.py:5909
3681
3681
msgid "Branch whose tags should be displayed."
3684
#: bzrlib/builtins.py:6004
3684
#: bzrlib/builtins.py:5911
3685
3685
msgid "Sort tags by different criteria."
3688
#: bzrlib/builtins.py:6004
3688
#: bzrlib/builtins.py:5911
3689
3689
msgid "Sorting"
3692
#: bzrlib/builtins.py:6073
3692
#: bzrlib/builtins.py:5980
3693
3693
msgid "Reconfigure the type of a bzr directory."
3696
#: bzrlib/builtins.py:6075
3696
#: bzrlib/builtins.py:5982
3697
3697
msgid "A target configuration must be specified."
3700
#: bzrlib/builtins.py:6077
3700
#: bzrlib/builtins.py:5984
3702
3702
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3703
3703
"The order of preference is\n"
3708
3708
"If none of these is available, --bind-to must be specified."
3711
#: bzrlib/builtins.py:6091
3711
#: bzrlib/builtins.py:5998
3712
3712
msgid "Tree type"
3715
#: bzrlib/builtins.py:6092
3715
#: bzrlib/builtins.py:5999
3716
3716
msgid "The relation between branch and tree."
3719
#: bzrlib/builtins.py:6094
3719
#: bzrlib/builtins.py:6001
3720
3720
msgid "Reconfigure to be an unbound branch with no working tree."
3723
#: bzrlib/builtins.py:6095
3723
#: bzrlib/builtins.py:6002
3724
3724
msgid "Reconfigure to be an unbound branch with a working tree."
3727
#: bzrlib/builtins.py:6096
3727
#: bzrlib/builtins.py:6003
3728
3728
msgid "Reconfigure to be a bound branch with a working tree."
3731
#: bzrlib/builtins.py:6097
3731
#: bzrlib/builtins.py:6004
3732
3732
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3735
#: bzrlib/builtins.py:6102
3735
#: bzrlib/builtins.py:6009
3736
3736
msgid "Repository type"
3739
#: bzrlib/builtins.py:6103
3739
#: bzrlib/builtins.py:6010
3740
3740
msgid "Location fo the repository."
3743
#: bzrlib/builtins.py:6105
3743
#: bzrlib/builtins.py:6012
3745
3745
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3748
#: bzrlib/builtins.py:6107
3748
#: bzrlib/builtins.py:6014
3749
3749
msgid "Reconfigure to use a shared repository."
3752
#: bzrlib/builtins.py:6111
3752
#: bzrlib/builtins.py:6018
3753
3753
msgid "Trees in Repository"
3756
#: bzrlib/builtins.py:6112
3756
#: bzrlib/builtins.py:6019
3757
3757
msgid "Whether new branches in the repository have trees."
3760
#: bzrlib/builtins.py:6114
3760
#: bzrlib/builtins.py:6021
3762
3762
"Reconfigure repository to create working trees on branches by default."
3765
#: bzrlib/builtins.py:6116
3765
#: bzrlib/builtins.py:6023
3767
3767
"Reconfigure repository to not create working trees on branches by default."
3770
#: bzrlib/builtins.py:6119
3770
#: bzrlib/builtins.py:6026
3771
3771
msgid "Branch to bind checkout to."
3774
#: bzrlib/builtins.py:6121
3774
#: bzrlib/builtins.py:6028
3775
3775
msgid "Perform reconfiguration even if local changes will be lost."
3778
#: bzrlib/builtins.py:6124
3778
#: bzrlib/builtins.py:6031
3779
3779
msgid "Reconfigure a branch to be stacked on another branch."
3782
#: bzrlib/builtins.py:6128
3782
#: bzrlib/builtins.py:6035
3784
3784
"Reconfigure a branch to be unstacked. This may require copying substantial "
3785
3785
"data into it."
3788
#: bzrlib/builtins.py:6138
3788
#: bzrlib/builtins.py:6045
3789
3789
msgid "Can't use both --stacked-on and --unstacked"
3792
#: bzrlib/builtins.py:6152
3792
#: bzrlib/builtins.py:6059
3793
3793
msgid "No target configuration specified"
3796
#: bzrlib/builtins.py:6187
3796
#: bzrlib/builtins.py:6094
3797
3797
msgid "Set the branch of a checkout and update."
3800
#: bzrlib/builtins.py:6189
3800
#: bzrlib/builtins.py:6096
3802
3802
"For lightweight checkouts, this changes the branch being referenced.\n"
3803
3803
"For heavyweight checkouts, this checks that there are no local commits\n"
3876
3876
"want to switch back to your view after that."
3879
#: bzrlib/builtins.py:6281
3879
#: bzrlib/builtins.py:6228
3882
3882
" To define the current view::"
3885
#: bzrlib/builtins.py:6284
3885
#: bzrlib/builtins.py:6231
3886
3886
msgid " bzr view file1 dir1 ..."
3889
#: bzrlib/builtins.py:6286
3889
#: bzrlib/builtins.py:6233
3890
3890
msgid " To list the current view::"
3893
#: bzrlib/builtins.py:6288
3893
#: bzrlib/builtins.py:6235
3894
3894
msgid " bzr view"
3897
#: bzrlib/builtins.py:6290
3897
#: bzrlib/builtins.py:6237
3898
3898
msgid " To delete the current view::"
3901
#: bzrlib/builtins.py:6292
3901
#: bzrlib/builtins.py:6239
3902
3902
msgid " bzr view --delete"
3905
#: bzrlib/builtins.py:6294
3905
#: bzrlib/builtins.py:6241
3906
3906
msgid " To disable the current view without deleting it::"
3909
#: bzrlib/builtins.py:6296
3909
#: bzrlib/builtins.py:6243
3910
3910
msgid " bzr view --switch off"
3913
#: bzrlib/builtins.py:6298
3913
#: bzrlib/builtins.py:6245
3914
3914
msgid " To define a named view and switch to it::"
3917
#: bzrlib/builtins.py:6300
3917
#: bzrlib/builtins.py:6247
3918
3918
msgid " bzr view --name view-name file1 dir1 ..."
3921
#: bzrlib/builtins.py:6302
3921
#: bzrlib/builtins.py:6249
3922
3922
msgid " To list a named view::"
3925
#: bzrlib/builtins.py:6304
3925
#: bzrlib/builtins.py:6251
3926
3926
msgid " bzr view --name view-name"
3929
#: bzrlib/builtins.py:6306
3929
#: bzrlib/builtins.py:6253
3930
3930
msgid " To delete a named view::"
3933
#: bzrlib/builtins.py:6308
3933
#: bzrlib/builtins.py:6255
3934
3934
msgid " bzr view --name view-name --delete"
3937
#: bzrlib/builtins.py:6310
3937
#: bzrlib/builtins.py:6257
3938
3938
msgid " To switch to a named view::"
3941
#: bzrlib/builtins.py:6312
3941
#: bzrlib/builtins.py:6259
3942
3942
msgid " bzr view --switch view-name"
3945
#: bzrlib/builtins.py:6314
3945
#: bzrlib/builtins.py:6261
3946
3946
msgid " To list all views defined::"
3949
#: bzrlib/builtins.py:6316
3949
#: bzrlib/builtins.py:6263
3950
3950
msgid " bzr view --all"
3953
#: bzrlib/builtins.py:6318
3953
#: bzrlib/builtins.py:6265
3954
3954
msgid " To delete all views::"
3957
#: bzrlib/builtins.py:6320
3957
#: bzrlib/builtins.py:6267
3958
3958
msgid " bzr view --delete --all"
3961
#: bzrlib/builtins.py:6327
3961
#: bzrlib/builtins.py:6274
3962
3962
msgid "Apply list or delete action to all views."
3965
#: bzrlib/builtins.py:6330
3965
#: bzrlib/builtins.py:6277
3966
3966
msgid "Delete the view."
3969
#: bzrlib/builtins.py:6333
3969
#: bzrlib/builtins.py:6280
3970
3970
msgid "Name of the view to define, list or delete."
3973
#: bzrlib/builtins.py:6337
3973
#: bzrlib/builtins.py:6284
3974
3974
msgid "Name of the view to switch to."
3977
#: bzrlib/builtins.py:6356
3977
#: bzrlib/builtins.py:6303
3978
3978
msgid "Both --delete and a file list specified"
3981
#: bzrlib/builtins.py:6359
3981
#: bzrlib/builtins.py:6306
3982
3982
msgid "Both --delete and --switch specified"
3985
#: bzrlib/builtins.py:6362
3985
#: bzrlib/builtins.py:6309
3986
3986
msgid "Deleted all views.\n"
3989
#: bzrlib/builtins.py:6364
3989
#: bzrlib/builtins.py:6311
3990
3990
msgid "No current view to delete"
3993
#: bzrlib/builtins.py:6367
3993
#: bzrlib/builtins.py:6314
3994
3994
#, python-format
3995
3995
msgid "Deleted '%s' view.\n"
3998
#: bzrlib/builtins.py:6371
3998
#: bzrlib/builtins.py:6318
3999
3999
msgid "Both --switch and a file list specified"
4002
#: bzrlib/builtins.py:6374
4002
#: bzrlib/builtins.py:6321
4003
4003
msgid "Both --switch and --all specified"
4006
#: bzrlib/builtins.py:6377
4006
#: bzrlib/builtins.py:6324
4007
4007
msgid "No current view to disable"
4010
#: bzrlib/builtins.py:6379
4010
#: bzrlib/builtins.py:6326
4011
4011
#, python-format
4012
4012
msgid "Disabled '%s' view.\n"
4015
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4015
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4016
4016
msgid "Using '{0}' view: {1}\n"
4019
#: bzrlib/builtins.py:6386
4019
#: bzrlib/builtins.py:6333
4020
4020
msgid "Views defined:\n"
4023
#: bzrlib/builtins.py:6395
4023
#: bzrlib/builtins.py:6342
4024
4024
msgid "No views defined.\n"
4027
#: bzrlib/builtins.py:6402
4027
#: bzrlib/builtins.py:6349
4028
4028
msgid "Cannot change the 'off' pseudo view"
4031
#: bzrlib/builtins.py:6410
4031
#: bzrlib/builtins.py:6357
4032
4032
msgid "No current view.\n"
4035
#: bzrlib/builtins.py:6413
4035
#: bzrlib/builtins.py:6360
4036
4036
msgid "'{0}' view is: {1}\n"
4039
#: bzrlib/builtins.py:6433
4039
#: bzrlib/builtins.py:6380
4040
4040
msgid " <no hooks installed>\n"
4043
#: bzrlib/builtins.py:6437
4043
#: bzrlib/builtins.py:6384
4044
4044
msgid "Remove a branch."
4047
#: bzrlib/builtins.py:6439
4047
#: bzrlib/builtins.py:6386
4049
4049
"This will remove the branch from the specified location but \n"
4050
4050
"will keep any working tree or repository in place."
4053
#: bzrlib/builtins.py:6444
4053
#: bzrlib/builtins.py:6391
4054
4054
msgid " Remove the branch at repo/trunk::"
4057
#: bzrlib/builtins.py:6446
4057
#: bzrlib/builtins.py:6393
4058
4058
msgid " bzr remove-branch repo/trunk"
4061
#: bzrlib/builtins.py:6461
4061
#: bzrlib/builtins.py:6408
4062
4062
msgid "Plaintext diff output."
4065
#: bzrlib/builtins.py:6462
4065
#: bzrlib/builtins.py:6409
4066
4066
msgid "Temporarily set aside some changes from the current tree."
4069
#: bzrlib/builtins.py:6464
4069
#: bzrlib/builtins.py:6411
4071
4071
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4072
4072
"ie. out of the way, until a later time when you can bring them back from\n"
4087
4087
"shelve all text changes at once, use shelve --all."
4090
#: bzrlib/builtins.py:6477
4090
#: bzrlib/builtins.py:6424
4092
4092
"If filenames are specified, only the changes to those files will be\n"
4093
4093
"shelved. Other files will be left untouched."
4096
#: bzrlib/builtins.py:6480
4096
#: bzrlib/builtins.py:6427
4098
4098
"If a revision is specified, changes since that revision will be shelved."
4101
#: bzrlib/builtins.py:6482
4101
#: bzrlib/builtins.py:6429
4103
4103
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4104
4104
"restore the most recently shelved changes."
4107
#: bzrlib/builtins.py:6485
4107
#: bzrlib/builtins.py:6432
4109
4109
"For complicated changes, it is possible to edit the changes in a separate\n"
4110
4110
"editor program to decide what the file remaining in the working copy\n"
4111
4111
"should look like. To do this, add the configuration option"
4114
#: bzrlib/builtins.py:6489
4114
#: bzrlib/builtins.py:6436
4115
4115
msgid " change_editor = PROGRAM @new_path @old_path"
4118
#: bzrlib/builtins.py:6491
4118
#: bzrlib/builtins.py:6438
4120
4120
"where @new_path is replaced with the path of the new version of the \n"
4121
4121
"file and @old_path is replaced with the path of the old version of \n"
4127
#: bzrlib/builtins.py:6503
4127
#: bzrlib/builtins.py:6450
4128
4128
msgid "Shelve all changes."
4131
#: bzrlib/builtins.py:6505
4131
#: bzrlib/builtins.py:6452
4132
4132
msgid "Method to use for writing diffs."
4135
#: bzrlib/builtins.py:6505
4135
#: bzrlib/builtins.py:6452
4139
#: bzrlib/builtins.py:6509
4139
#: bzrlib/builtins.py:6456
4140
4140
msgid "List shelved changes."
4143
#: bzrlib/builtins.py:6511
4143
#: bzrlib/builtins.py:6458
4144
4144
msgid "Destroy removed changes instead of shelving them."
4147
#: bzrlib/builtins.py:6540
4147
#: bzrlib/builtins.py:6487
4148
4148
msgid "No shelved changes."
4151
#: bzrlib/builtins.py:6551
4151
#: bzrlib/builtins.py:6498
4152
4152
msgid "Restore shelved changes."
4155
#: bzrlib/builtins.py:6553
4155
#: bzrlib/builtins.py:6500
4157
4157
"By default, the most recently shelved changes are restored. However if you\n"
4158
4158
"specify a shelf by id those changes will be restored instead. This works\n"
4159
4159
"best when the changes don't depend on each other."
4162
#: bzrlib/builtins.py:6562
4162
#: bzrlib/builtins.py:6509
4163
4163
msgid "The action to perform."
4166
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4166
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4170
#: bzrlib/builtins.py:6564
4170
#: bzrlib/builtins.py:6511
4171
4171
msgid "Apply changes and remove from the shelf."
4174
#: bzrlib/builtins.py:6565
4174
#: bzrlib/builtins.py:6512
4175
4175
msgid "Show changes, but do not apply or remove them."
4178
#: bzrlib/builtins.py:6566
4178
#: bzrlib/builtins.py:6513
4180
4180
"Instead of unshelving the changes, show the diff that would result from "
4184
#: bzrlib/builtins.py:6568
4184
#: bzrlib/builtins.py:6515
4185
4185
msgid "Delete changes without applying them."
4188
#: bzrlib/builtins.py:6569
4188
#: bzrlib/builtins.py:6516
4189
4189
msgid "Apply changes but don't delete them."
4192
#: bzrlib/builtins.py:6584
4192
#: bzrlib/builtins.py:6531
4193
4193
msgid "Remove unwanted files from working tree."
4196
#: bzrlib/builtins.py:6586
4196
#: bzrlib/builtins.py:6533
4198
4198
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4199
4199
"files are never deleted."
4202
#: bzrlib/builtins.py:6589
4202
#: bzrlib/builtins.py:6536
4204
4204
"Another class is 'detritus', which includes files emitted by bzr during\n"
4205
4205
"normal operations and selftests. (The value of these files decreases with\n"
4209
#: bzrlib/builtins.py:6593
4209
#: bzrlib/builtins.py:6540
4211
4211
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4212
4212
"flags are respected, and may be combined."
4215
#: bzrlib/builtins.py:6596
4215
#: bzrlib/builtins.py:6543
4216
4216
msgid "To check what clean-tree will do, use --dry-run."
4219
#: bzrlib/builtins.py:6599
4219
#: bzrlib/builtins.py:6546
4220
4220
msgid "Delete all ignored files."
4223
#: bzrlib/builtins.py:6600
4223
#: bzrlib/builtins.py:6547
4225
4225
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4228
#: bzrlib/builtins.py:6603
4228
#: bzrlib/builtins.py:6550
4229
4229
msgid "Delete files unknown to bzr (default)."
4232
#: bzrlib/builtins.py:6604
4232
#: bzrlib/builtins.py:6551
4233
4233
msgid "Show files to delete instead of deleting them."
4236
#: bzrlib/builtins.py:6606
4236
#: bzrlib/builtins.py:6553
4237
4237
msgid "Do not prompt before deleting."
4602
#: bzrlib/commands.py:533
4602
#: bzrlib/commands.py:532
4603
4603
#, python-format
4605
4605
"See bzr help %s for more details and examples.\n"
4609
#: bzrlib/commands.py:538
4609
#: bzrlib/commands.py:537
4610
4610
msgid ":Aliases: "
4613
#: bzrlib/commands.py:542
4613
#: bzrlib/commands.py:541
4614
4614
#, python-format
4615
4615
msgid ":From: plugin \"%s\"\n"
4618
#: bzrlib/commands.py:554
4618
#: bzrlib/commands.py:553
4619
4619
msgid ":doc:`{0} <{1}-help>`"
4622
#: bzrlib/commands.py:558
4622
#: bzrlib/commands.py:557
4623
4623
#, python-format
4624
4624
msgid ":See also: %s"
4627
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4627
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4628
4628
msgid "Only ASCII permitted in option names"
4631
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4631
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4632
4632
msgid "command {0!r} needs one or more {1}"
4635
#: bzrlib/commands.py:858
4635
#: bzrlib/commands.py:857
4636
4636
msgid "command {0!r} requires argument {1}"
4639
#: bzrlib/commands.py:865
4639
#: bzrlib/commands.py:864
4640
4640
msgid "extra argument to command {0}: {1}"
4643
#: bzrlib/commands.py:962
4643
#: bzrlib/commands.py:961
4644
4644
#, python-format
4645
4645
msgid "Profile data written to \"%s\"."
5128
#: bzrlib/errors.py:799
5129
msgid "Revision is not compatible with %(repo_format)s"
5140
5132
#: bzrlib/errors.py:809
5141
msgid "Revision is not compatible with %(repo_format)s"
5144
#: bzrlib/errors.py:819
5145
5133
msgid "%(context_info)s%(path)s is already versioned."
5148
#: bzrlib/errors.py:840
5136
#: bzrlib/errors.py:830
5149
5137
msgid "%(context_info)s%(path)s is not versioned."
5152
#: bzrlib/errors.py:861
5140
#: bzrlib/errors.py:851
5153
5141
msgid "Path(s) are not versioned: %(paths_as_string)s"
5156
#: bzrlib/errors.py:872
5144
#: bzrlib/errors.py:862
5157
5145
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5160
#: bzrlib/errors.py:891
5148
#: bzrlib/errors.py:881
5161
5149
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5164
#: bzrlib/errors.py:899
5152
#: bzrlib/errors.py:889
5166
5154
"Filename %(filename)r is not valid in your current filesystem encoding "
5167
5155
"%(fs_encoding)s"
5170
#: bzrlib/errors.py:910
5158
#: bzrlib/errors.py:900
5171
5159
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5174
#: bzrlib/errors.py:928
5162
#: bzrlib/errors.py:918
5175
5163
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5166
#: bzrlib/errors.py:957
5167
msgid "Cannot lock %(lock)s: %(why)s"
5178
5170
#: bzrlib/errors.py:967
5179
msgid "Cannot lock %(lock)s: %(why)s"
5182
#: bzrlib/errors.py:977
5184
5172
"A transaction related operation was attempted after the transaction finished."
5187
#: bzrlib/errors.py:1004
5175
#: bzrlib/errors.py:994
5188
5176
msgid "Cannot lock: transport is read only: %(transport)s"
5191
#: bzrlib/errors.py:1012
5179
#: bzrlib/errors.py:1002
5192
5180
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5195
#: bzrlib/errors.py:1023
5183
#: bzrlib/errors.py:1013
5197
5185
"Lock was broken while still open: %(lock)s - check storage consistency!"
5200
#: bzrlib/errors.py:1034
5188
#: bzrlib/errors.py:1024
5202
5190
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5203
5191
"%(holder)r, wanted to break %(target)r"
5206
#: bzrlib/errors.py:1046
5194
#: bzrlib/errors.py:1036
5208
5196
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5209
5197
"Use 'bzr break-lock' to clear it"
5212
#: bzrlib/errors.py:1059
5200
#: bzrlib/errors.py:1049
5213
5201
msgid "Lock not held: %(lock)s"
5216
#: bzrlib/errors.py:1088
5204
#: bzrlib/errors.py:1078
5217
5205
msgid "No changes to commit"
5208
#: bzrlib/errors.py:1083
5210
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5220
5213
#: bzrlib/errors.py:1093
5222
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5225
#: bzrlib/errors.py:1103
5227
5215
"Excluding paths during commit is not supported by repository at "
5228
5216
"%(repository)r."
5231
#: bzrlib/errors.py:1112
5219
#: bzrlib/errors.py:1102
5233
5221
"The specified commit message contains characters unsupported by the current "
5237
#: bzrlib/errors.py:1118
5225
#: bzrlib/errors.py:1108
5238
5226
msgid "Upgrade URL cannot work with readonly URLs."
5241
#: bzrlib/errors.py:1123
5229
#: bzrlib/errors.py:1113
5242
5230
msgid "The branch format %(format)s is already at the most recent format."
5245
#: bzrlib/errors.py:1146
5233
#: bzrlib/errors.py:1136
5246
5234
msgid "Option --change does not accept revision ranges"
5249
#: bzrlib/errors.py:1151
5237
#: bzrlib/errors.py:1141
5250
5238
msgid "No namespace registered for string: %(spec)r"
5253
#: bzrlib/errors.py:1170
5241
#: bzrlib/errors.py:1160
5255
5243
"Requested revision: '%(spec)s' does not exist in branch: "
5256
5244
"%(branch_url)s%(extra)s"
5259
#: bzrlib/errors.py:1184
5247
#: bzrlib/errors.py:1174
5261
5249
"Operation denied because it would change the main history, which is not "
5262
5250
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5265
#: bzrlib/errors.py:1195
5253
#: bzrlib/errors.py:1185
5267
5255
"These branches have diverged. Use the missing command to see how.\n"
5268
5256
"Use the merge command to reconcile them."
5271
#: bzrlib/errors.py:1215
5259
#: bzrlib/errors.py:1205
5273
5261
"Branches have no common ancestor, and no merge base revision was specified."
5276
#: bzrlib/errors.py:1221
5264
#: bzrlib/errors.py:1211
5278
5266
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5281
#: bzrlib/errors.py:1227
5269
#: bzrlib/errors.py:1217
5282
5270
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5285
#: bzrlib/errors.py:1236
5273
#: bzrlib/errors.py:1226
5287
5275
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5290
#: bzrlib/errors.py:1245
5278
#: bzrlib/errors.py:1235
5291
5279
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5294
#: bzrlib/errors.py:1254
5282
#: bzrlib/errors.py:1244
5295
5283
msgid "Branch %(branch)s has no commits."
5298
#: bzrlib/errors.py:1272
5286
#: bzrlib/errors.py:1262
5300
5288
"Bound branch %(branch)s is out of date with master branch "
5301
5289
"%(master)s.%(extra_help)s"
5304
#: bzrlib/errors.py:1284
5292
#: bzrlib/errors.py:1274
5306
5294
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5307
5295
"bound to %(remote)s."
5310
#: bzrlib/errors.py:1296
5298
#: bzrlib/errors.py:1286
5311
5299
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5314
#: bzrlib/errors.py:1305
5302
#: bzrlib/errors.py:1295
5316
5304
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5320
#: bzrlib/errors.py:1317
5308
#: bzrlib/errors.py:1307
5321
5309
msgid "Error in processing weave: %(msg)s"
5324
#: bzrlib/errors.py:1326
5312
#: bzrlib/errors.py:1316
5325
5313
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5316
#: bzrlib/errors.py:1327
5317
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5328
5320
#: bzrlib/errors.py:1337
5329
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5332
#: bzrlib/errors.py:1347
5333
5321
msgid "Weave invariant violated: %(what)s"
5336
#: bzrlib/errors.py:1356
5324
#: bzrlib/errors.py:1346
5337
5325
msgid "Parents are mismatched between two revisions. %(msg)s"
5340
#: bzrlib/errors.py:1378
5328
#: bzrlib/errors.py:1368
5342
5330
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5346
#: bzrlib/errors.py:1390
5334
#: bzrlib/errors.py:1380
5347
5335
msgid "Versioned file error"
5338
#: bzrlib/errors.py:1385
5339
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5350
5342
#: bzrlib/errors.py:1395
5351
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5343
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5354
5346
#: bzrlib/errors.py:1405
5355
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5358
#: bzrlib/errors.py:1415
5359
5347
msgid "Text did not match its checksum: %(msg)s"
5362
#: bzrlib/errors.py:1541
5350
#: bzrlib/errors.py:1531
5363
5351
msgid "Export format %(format)r not supported"
5366
#: bzrlib/errors.py:1550
5354
#: bzrlib/errors.py:1540
5367
5355
msgid "Transport error: %(msg)s %(orig_error)s"
5370
#: bzrlib/errors.py:1576
5358
#: bzrlib/errors.py:1566
5371
5359
msgid "Generic bzr smart protocol error: %(details)s"
5374
#: bzrlib/errors.py:1584
5362
#: bzrlib/errors.py:1574
5375
5363
msgid "Received bad protocol version marker: %(marker)r"
5378
#: bzrlib/errors.py:1616
5366
#: bzrlib/errors.py:1606
5379
5367
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5382
#: bzrlib/errors.py:1621
5370
#: bzrlib/errors.py:1611
5383
5371
msgid "Connection error: %(msg)s %(orig_error)s"
5386
#: bzrlib/errors.py:1626
5374
#: bzrlib/errors.py:1616
5387
5375
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5390
#: bzrlib/errors.py:1647
5378
#: bzrlib/errors.py:1637
5391
5379
msgid "Connection closed: %(msg)s %(orig_error)s"
5394
#: bzrlib/errors.py:1652
5382
#: bzrlib/errors.py:1642
5395
5383
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5386
#: bzrlib/errors.py:1647
5387
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5398
5390
#: bzrlib/errors.py:1657
5399
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5402
#: bzrlib/errors.py:1667
5403
5391
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5406
#: bzrlib/errors.py:1682
5407
msgid "Certificate error: %(error)s"
5410
#: bzrlib/errors.py:1690
5394
#: bzrlib/errors.py:1672
5411
5395
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5414
#: bzrlib/errors.py:1704
5398
#: bzrlib/errors.py:1686
5415
5399
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5418
#: bzrlib/errors.py:1712
5402
#: bzrlib/errors.py:1694
5419
5403
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5422
#: bzrlib/errors.py:1721
5406
#: bzrlib/errors.py:1703
5423
5407
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5426
#: bzrlib/errors.py:1735
5410
#: bzrlib/errors.py:1717
5427
5411
msgid "Too many redirections"
5430
#: bzrlib/errors.py:1740
5414
#: bzrlib/errors.py:1722
5431
5415
msgid "Working tree has conflicts."
5434
#: bzrlib/errors.py:1744
5418
#: bzrlib/errors.py:1726
5435
5419
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5438
#: bzrlib/errors.py:1753
5422
#: bzrlib/errors.py:1735
5440
5424
"Error(s) parsing config file %(filename)s:\n"
5428
#: bzrlib/errors.py:1746
5429
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5432
#: bzrlib/errors.py:1754
5433
msgid "%(username)r does not seem to contain a reasonable email address"
5444
5436
#: bzrlib/errors.py:1763
5446
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5447
"See ``bzr help %(name)s``"
5450
#: bzrlib/errors.py:1773
5451
msgid "%(username)r does not seem to contain a reasonable email address"
5454
#: bzrlib/errors.py:1782
5455
5437
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5458
#: bzrlib/errors.py:1790
5440
#: bzrlib/errors.py:1771
5459
5441
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5462
#: bzrlib/errors.py:1798
5444
#: bzrlib/errors.py:1779
5463
5445
msgid "Unable to import library \"%(library)s\": %(error)s"
5466
#: bzrlib/errors.py:1806
5448
#: bzrlib/errors.py:1787
5467
5449
msgid "python-gpgme is not installed, it is needed to verify signatures"
5470
#: bzrlib/errors.py:1814
5452
#: bzrlib/errors.py:1795
5472
5454
"The working tree for %(basedir)s has changed since the last commit, but "
5473
5455
"weave merge requires that it be unchanged"
5476
#: bzrlib/errors.py:1824
5458
#: bzrlib/errors.py:1805
5478
5460
"Can't reprocess and show base, because reprocessing obscures the "
5479
5461
"relationship of conflicting lines to the base"
5482
#: bzrlib/errors.py:1830
5464
#: bzrlib/errors.py:1811
5483
5465
msgid "Cycle in graph %(graph)r"
5486
#: bzrlib/errors.py:1858
5468
#: bzrlib/errors.py:1839
5487
5469
msgid "File %(filename)s is not conflicted."
5490
#: bzrlib/errors.py:1880
5472
#: bzrlib/errors.py:1861
5491
5473
msgid "No bundle was found in \"%(filename)s\"."
5494
#: bzrlib/errors.py:1889
5476
#: bzrlib/errors.py:1870
5495
5477
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5498
#: bzrlib/errors.py:1899
5480
#: bzrlib/errors.py:1880
5499
5481
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5502
#: bzrlib/errors.py:1912
5484
#: bzrlib/errors.py:1893
5503
5485
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5506
#: bzrlib/errors.py:1922
5488
#: bzrlib/errors.py:1903
5507
5489
msgid "Key %(key)s is already present in map"
5510
#: bzrlib/errors.py:1927
5492
#: bzrlib/errors.py:1908
5511
5493
msgid "The prefix %(prefix)s is in the help search path twice."
5514
#: bzrlib/errors.py:1937
5496
#: bzrlib/errors.py:1918
5516
5498
"No final name for trans_id %(trans_id)r\n"
5517
5499
"file-id: %(file_id)r\n"
5518
5500
"root trans-id: %(root_trans_id)r\n"
5521
#: bzrlib/errors.py:1969
5503
#: bzrlib/errors.py:1950
5522
5504
msgid "Attempt to reuse a transform that has already been applied."
5525
#: bzrlib/errors.py:1974
5507
#: bzrlib/errors.py:1955
5526
5508
msgid "Moving the root directory is not supported at this time"
5529
#: bzrlib/errors.py:1979
5511
#: bzrlib/errors.py:1960
5530
5512
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5533
#: bzrlib/errors.py:1990
5515
#: bzrlib/errors.py:1971
5535
5517
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5538
#: bzrlib/errors.py:2026
5520
#: bzrlib/errors.py:2007
5540
5522
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5543
#: bzrlib/errors.py:2056
5525
#: bzrlib/errors.py:2037
5544
5526
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5547
#: bzrlib/errors.py:2064
5529
#: bzrlib/errors.py:2045
5548
5530
msgid "Nothing to merge."
5551
#: bzrlib/errors.py:2069
5533
#: bzrlib/errors.py:2050
5552
5534
msgid "Format %(format)s cannot be initialised by this version of bzr."
5555
#: bzrlib/errors.py:2078
5537
#: bzrlib/errors.py:2059
5557
5539
"Cannot convert from format %(from_format)s to format %(format)s. "
5561
#: bzrlib/errors.py:2090
5543
#: bzrlib/errors.py:2071
5562
5544
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5565
#: bzrlib/errors.py:2098
5547
#: bzrlib/errors.py:2079
5566
5548
msgid "%(exe_name)s could not be found on this machine"
5569
#: bzrlib/errors.py:2106
5551
#: bzrlib/errors.py:2087
5570
5552
msgid "Diff is not installed on this machine: %(msg)s"
5573
#: bzrlib/errors.py:2114
5555
#: bzrlib/errors.py:2095
5574
5556
msgid "Diff3 is not installed on this machine."
5577
#: bzrlib/errors.py:2120
5559
#: bzrlib/errors.py:2101
5578
5560
msgid "The content being inserted is already present."
5581
#: bzrlib/errors.py:2125
5563
#: bzrlib/errors.py:2106
5583
5565
"This tree contains left-over files from a failed operation.\n"
5584
5566
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5601
5583
" keep, and delete it when you are done."
5604
#: bzrlib/errors.py:2157
5586
#: bzrlib/errors.py:2138
5606
5588
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5607
5589
"examine %(pending_deletion)s to see if it contains any files you wish to "
5608
5590
"keep, and delete it when you are done."
5611
#: bzrlib/errors.py:2167
5593
#: bzrlib/errors.py:2148
5612
5594
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5615
#: bzrlib/errors.py:2181
5597
#: bzrlib/errors.py:2162
5617
5599
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5620
#: bzrlib/errors.py:2194
5602
#: bzrlib/errors.py:2175
5621
5603
msgid "Error in merge modified format"
5624
#: bzrlib/errors.py:2199
5606
#: bzrlib/errors.py:2180
5625
5607
msgid "Format error in conflict listings"
5628
#: bzrlib/errors.py:2203
5610
#: bzrlib/errors.py:2184
5630
5612
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5631
5613
"Error: %(description)s"
5634
#: bzrlib/errors.py:2214
5616
#: bzrlib/errors.py:2195
5636
5618
"An error has been detected in the repository %(repo_path)s.\n"
5637
5619
"Please run bzr reconcile on this repository."
5640
#: bzrlib/errors.py:2225
5622
#: bzrlib/errors.py:2206
5642
5624
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5643
5625
"reason: %(reason)s"
5646
#: bzrlib/errors.py:2238
5628
#: bzrlib/errors.py:2219
5648
5630
"An inconsistent delta was supplied: %(delta)r\n"
5649
5631
"reason: %(reason)s"
5652
#: bzrlib/errors.py:2250
5634
#: bzrlib/errors.py:2231
5653
5635
msgid "To use this feature you must upgrade your branch at %(path)s."
5656
#: bzrlib/errors.py:2259
5638
#: bzrlib/errors.py:2240
5657
5639
msgid "To use this feature you must upgrade your repository at %(path)s."
5660
#: bzrlib/errors.py:2264
5642
#: bzrlib/errors.py:2245
5662
5644
"To use this feature you must upgrade your branch at %(path)s to a format "
5663
5645
"which supports rich roots."
5666
#: bzrlib/errors.py:2270
5648
#: bzrlib/errors.py:2251
5667
5649
msgid "Cannot perform local-only commits on unbound branches."
5670
#: bzrlib/errors.py:2275
5652
#: bzrlib/errors.py:2256
5671
5653
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5674
#: bzrlib/errors.py:2296
5656
#: bzrlib/errors.py:2277
5675
5657
msgid "Ghost tags not supported by format %(format)r."
5678
#: bzrlib/errors.py:2304
5660
#: bzrlib/errors.py:2285
5679
5661
msgid "File is binary but should be text."
5682
#: bzrlib/errors.py:2309
5664
#: bzrlib/errors.py:2290
5683
5665
msgid "The path %(path)s is not permitted on this platform"
5686
#: bzrlib/errors.py:2318
5668
#: bzrlib/errors.py:2299
5688
5670
"Testament did not match expected value.\n"
5689
5671
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5690
5672
" {%(measured)s}"
5693
#: bzrlib/errors.py:2330
5675
#: bzrlib/errors.py:2311
5694
5676
msgid "Not a bzr revision-bundle: %(text)r"
5697
#: bzrlib/errors.py:2339
5679
#: bzrlib/errors.py:2320
5698
5680
msgid "Bad bzr revision-bundle: %(text)r"
5701
#: bzrlib/errors.py:2348
5683
#: bzrlib/errors.py:2329
5702
5684
msgid "Malformed bzr revision-bundle header: %(text)r"
5705
#: bzrlib/errors.py:2353
5687
#: bzrlib/errors.py:2334
5706
5688
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5709
#: bzrlib/errors.py:2358
5691
#: bzrlib/errors.py:2339
5710
5692
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5713
#: bzrlib/errors.py:2363
5695
#: bzrlib/errors.py:2344
5714
5696
msgid "End of line marker was not \\n in bzr revision-bundle"
5717
#: bzrlib/errors.py:2373
5699
#: bzrlib/errors.py:2354
5718
5700
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5721
#: bzrlib/errors.py:2383
5703
#: bzrlib/errors.py:2364
5722
5704
msgid "Root class for inventory serialization errors"
5725
#: bzrlib/errors.py:2387
5707
#: bzrlib/errors.py:2368
5727
5709
"The inventory was not in the expected format:\n"
5731
#: bzrlib/errors.py:2396
5713
#: bzrlib/errors.py:2377
5732
5714
msgid "This operation requires rich root data storage"
5735
#: bzrlib/errors.py:2409
5717
#: bzrlib/errors.py:2390
5736
5718
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5739
#: bzrlib/errors.py:2418
5721
#: bzrlib/errors.py:2399
5741
5723
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5745
#: bzrlib/errors.py:2425
5727
#: bzrlib/errors.py:2406
5747
5729
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5748
5730
"ghost at {%(ghost_revision_id)s}"
5751
#: bzrlib/errors.py:2435
5733
#: bzrlib/errors.py:2416
5752
5734
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5755
#: bzrlib/errors.py:2486
5737
#: bzrlib/errors.py:2467
5757
5739
"A merge directive must provide either a bundle or a public branch location."
5760
#: bzrlib/errors.py:2493
5742
#: bzrlib/errors.py:2474
5761
5743
msgid "Bad merge directive payload %(start)r"
5764
#: bzrlib/errors.py:2503
5746
#: bzrlib/errors.py:2484
5765
5747
msgid "Preview patch does not match requested changes."
5768
#: bzrlib/errors.py:2509
5750
#: bzrlib/errors.py:2490
5769
5751
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5772
#: bzrlib/errors.py:2519
5754
#: bzrlib/errors.py:2500
5774
5756
"Your branch does not have all of the revisions required in order to merge "
5775
5757
"this merge directive and the target location specified in the merge "
5776
5758
"directive is not a branch: %(location)s."
5779
#: bzrlib/errors.py:2531
5761
#: bzrlib/errors.py:2512
5780
5762
msgid "Unsupported entry kind %(kind)s"
5783
#: bzrlib/errors.py:2539
5765
#: bzrlib/errors.py:2520
5784
5766
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5769
#: bzrlib/errors.py:2530
5770
msgid "Subsume target %(other_tree)s needs to be upgraded."
5787
5773
#: bzrlib/errors.py:2549
5788
msgid "Subsume target %(other_tree)s needs to be upgraded."
5791
#: bzrlib/errors.py:2568
5792
5774
msgid "No such tag: %(tag_name)s"
5795
#: bzrlib/errors.py:2576
5777
#: bzrlib/errors.py:2557
5796
5778
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5799
#: bzrlib/errors.py:2585
5781
#: bzrlib/errors.py:2566
5800
5782
msgid "Tag %(tag_name)s already exists."
5803
#: bzrlib/errors.py:2593
5785
#: bzrlib/errors.py:2574
5805
5787
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5806
5788
"bugs\" for more information on this feature."
5809
#: bzrlib/errors.py:2603
5791
#: bzrlib/errors.py:2584
5811
5793
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5814
#: bzrlib/errors.py:2613
5796
#: bzrlib/errors.py:2594
5816
5798
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5819
#: bzrlib/errors.py:2623
5801
#: bzrlib/errors.py:2604
5820
5802
msgid "Invalid line in bugs property: '%(line)s'"
5823
#: bzrlib/errors.py:2631
5805
#: bzrlib/errors.py:2612
5824
5806
msgid "Invalid bug status: '%(status)s'"
5827
#: bzrlib/errors.py:2639
5809
#: bzrlib/errors.py:2620
5828
5810
msgid "Could not understand response from smart server: %(response_tuple)r"
5813
#: bzrlib/errors.py:2659
5814
msgid "Server sent an unexpected error: %(error_tuple)r"
5831
5817
#: bzrlib/errors.py:2678
5832
msgid "Server sent an unexpected error: %(error_tuple)r"
5835
#: bzrlib/errors.py:2697
5836
5818
msgid "Unrecognised container format: %(container_format)r"
5839
#: bzrlib/errors.py:2705
5821
#: bzrlib/errors.py:2686
5840
5822
msgid "Unexpected end of container stream"
5843
#: bzrlib/errors.py:2710
5825
#: bzrlib/errors.py:2691
5844
5826
msgid "Unknown record type: %(record_type)r"
5847
#: bzrlib/errors.py:2718
5829
#: bzrlib/errors.py:2699
5848
5830
msgid "Invalid record: %(reason)s"
5851
#: bzrlib/errors.py:2726
5833
#: bzrlib/errors.py:2707
5852
5834
msgid "Container has data after end marker: %(excess)r"
5855
#: bzrlib/errors.py:2734
5837
#: bzrlib/errors.py:2715
5856
5838
msgid "Container has multiple records with the same name: %(name)s"
5859
#: bzrlib/errors.py:2747
5841
#: bzrlib/errors.py:2728
5860
5842
msgid "Corrupt or incompatible data stream: %(reason)s"
5863
#: bzrlib/errors.py:2755
5845
#: bzrlib/errors.py:2736
5864
5846
msgid "SMTP error: %(error)s"
5867
#: bzrlib/errors.py:2763
5849
#: bzrlib/errors.py:2744
5868
5850
msgid "No message supplied."
5871
#: bzrlib/errors.py:2768
5853
#: bzrlib/errors.py:2749
5872
5854
msgid "No mail-to address (--mail-to) or output (-o) specified."
5875
#: bzrlib/errors.py:2773
5857
#: bzrlib/errors.py:2754
5876
5858
msgid "Unknown mail client: %(mail_client)s"
5879
#: bzrlib/errors.py:2781
5861
#: bzrlib/errors.py:2762
5881
5863
"Unable to find mail client with the following names: "
5882
5864
"%(mail_command_list_string)s"
5885
#: bzrlib/errors.py:2791
5867
#: bzrlib/errors.py:2772
5886
5868
msgid "SMTP connection to %(host)s refused"
5889
#: bzrlib/errors.py:2800
5871
#: bzrlib/errors.py:2781
5890
5872
msgid "Please specify smtp_server. No server at default %(host)s."
5893
#: bzrlib/errors.py:2814
5875
#: bzrlib/errors.py:2795
5895
5877
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5899
#: bzrlib/errors.py:2826
5881
#: bzrlib/errors.py:2807
5900
5882
msgid "'%(display_url)s' is already a branch."
5903
#: bzrlib/errors.py:2831
5885
#: bzrlib/errors.py:2812
5904
5886
msgid "'%(display_url)s' is already a tree."
5907
#: bzrlib/errors.py:2836
5889
#: bzrlib/errors.py:2817
5908
5890
msgid "'%(display_url)s' is already a checkout."
5911
#: bzrlib/errors.py:2841
5893
#: bzrlib/errors.py:2822
5912
5894
msgid "'%(display_url)s' is already a lightweight checkout."
5915
#: bzrlib/errors.py:2846
5897
#: bzrlib/errors.py:2827
5916
5898
msgid "'%(display_url)s' is already using a shared repository."
5919
#: bzrlib/errors.py:2851
5901
#: bzrlib/errors.py:2832
5920
5902
msgid "'%(display_url)s' is already standalone."
5923
#: bzrlib/errors.py:2856
5905
#: bzrlib/errors.py:2837
5924
5906
msgid "Shared repository '%(display_url)s' already creates working trees."
5927
#: bzrlib/errors.py:2862
5909
#: bzrlib/errors.py:2843
5929
5911
"Shared repository '%(display_url)s' already doesn't create working trees."
5932
#: bzrlib/errors.py:2868
5914
#: bzrlib/errors.py:2849
5933
5915
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5936
#: bzrlib/errors.py:2873
5918
#: bzrlib/errors.py:2854
5937
5919
msgid "No location could be found to bind to at %(display_url)s."
5940
#: bzrlib/errors.py:2878
5922
#: bzrlib/errors.py:2859
5942
5924
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5943
5925
"status).%(more)s"
5946
#: bzrlib/errors.py:2897
5928
#: bzrlib/errors.py:2878
5948
5930
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5949
5931
"list).%(more)s"
5952
#: bzrlib/errors.py:2903
5934
#: bzrlib/errors.py:2884
5953
5935
msgid "Variable {%(name)s} is not available."
5956
#: bzrlib/errors.py:2911
5938
#: bzrlib/errors.py:2892
5957
5939
msgid "No template specified."
5960
#: bzrlib/errors.py:2916
5942
#: bzrlib/errors.py:2897
5961
5943
msgid "Unable to create symlink %(path_str)son this platform"
5964
#: bzrlib/errors.py:2931
5946
#: bzrlib/errors.py:2912
5966
5948
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5967
5949
"\"original\", \"local\"."
5970
#: bzrlib/errors.py:2965
5952
#: bzrlib/errors.py:2946
5972
5954
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5975
#: bzrlib/errors.py:2977
5957
#: bzrlib/errors.py:2958
5976
5958
msgid "The \"%(config_id)s\" configuration does not exist."
5979
#: bzrlib/errors.py:2985
5961
#: bzrlib/errors.py:2966
5980
5962
msgid "The \"%(option_name)s\" configuration option does not exist."
5983
#: bzrlib/errors.py:2993
5965
#: bzrlib/errors.py:2974
5984
5966
msgid "The alias \"%(alias_name)s\" does not exist."
5987
#: bzrlib/errors.py:3007
5969
#: bzrlib/errors.py:2988
5988
5970
msgid "\"%(alias_name)s\" is not a valid location alias."
5991
#: bzrlib/errors.py:3015
5973
#: bzrlib/errors.py:2996
5992
5974
msgid "No %(alias_name)s location assigned."
5995
#: bzrlib/errors.py:3023
5977
#: bzrlib/errors.py:3004
5996
5978
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
5999
#: bzrlib/errors.py:3033
5981
#: bzrlib/errors.py:3014
6000
5982
msgid "Unknown rules detected: %(unknowns_str)s."
6003
#: bzrlib/errors.py:3044
5985
#: bzrlib/errors.py:3025
6004
5986
msgid "Tip change rejected: %(msg)s"
6007
#: bzrlib/errors.py:3052
5989
#: bzrlib/errors.py:3033
6008
5990
msgid "Shelf corrupt."
6011
#: bzrlib/errors.py:3057
5993
#: bzrlib/errors.py:3038
6012
5994
msgid "Corruption while decompressing repository file%(orig_error)s"
6015
#: bzrlib/errors.py:3069
5997
#: bzrlib/errors.py:3050
6016
5998
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6019
#: bzrlib/errors.py:3077
6001
#: bzrlib/errors.py:3058
6020
6002
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6023
#: bzrlib/errors.py:3085
6005
#: bzrlib/errors.py:3066
6025
6007
"An attempt to access a url outside the server jail was made: '%(url)s'."
6028
#: bzrlib/errors.py:3093
6010
#: bzrlib/errors.py:3074
6029
6011
msgid "The user aborted the operation."
6032
#: bzrlib/errors.py:3098
6014
#: bzrlib/errors.py:3079
6033
6015
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6036
#: bzrlib/errors.py:3108
6018
#: bzrlib/errors.py:3089
6037
6019
msgid "No such view: %(view_name)s."
6040
#: bzrlib/errors.py:3118
6022
#: bzrlib/errors.py:3099
6042
6024
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6043
6025
"to a later format."
6046
#: bzrlib/errors.py:3127
6028
#: bzrlib/errors.py:3108
6048
6030
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6051
#: bzrlib/errors.py:3194
6033
#: bzrlib/errors.py:3175
6052
6034
msgid "%(bzrdir)r does not support co-located branches."
6055
#: bzrlib/errors.py:3200
6037
#: bzrlib/errors.py:3181
6057
6039
"Unable to determine your name.\n"
6058
6040
"Please, set your name with the 'whoami' command.\n"
6059
6041
"E.g. bzr whoami \"Your Name <name@example.com>\""
6062
#: bzrlib/errors.py:3209
6044
#: bzrlib/errors.py:3190
6063
6045
msgid "Invalid pattern(s) found. %(msg)s"
6066
#: bzrlib/errors.py:3217
6048
#: bzrlib/errors.py:3198
6068
6050
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6069
6051
"unbind` to fix."
6072
#: bzrlib/errors.py:3228
6054
#: bzrlib/errors.py:3209
6073
6055
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6076
#: bzrlib/errors.py:3237
6058
#: bzrlib/errors.py:3218
6077
6059
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6080
#: bzrlib/errors.py:3246
6062
#: bzrlib/errors.py:3227
6082
6064
"No compatible object available for operations from %(source)r to %(target)r."
6085
#: bzrlib/errors.py:3256
6067
#: bzrlib/errors.py:3237
6087
6069
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6088
6070
"%(arguments)s."
6091
#: bzrlib/errors.py:3266
6073
#: bzrlib/errors.py:3247
6093
6075
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6094
6076
"format %(format)r"
6097
#: bzrlib/errors.py:3278
6079
#: bzrlib/errors.py:3259
6099
6081
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6103
#: bzrlib/errors.py:3291
6085
#: bzrlib/errors.py:3272
6104
6086
msgid "Binary files section encountered."
6107
#: bzrlib/errors.py:3299
6089
#: bzrlib/errors.py:3280
6109
6091
"Malformed patch header. %(desc)s\n"
6113
#: bzrlib/errors.py:3308
6095
#: bzrlib/errors.py:3289
6115
6097
"Malformed hunk header. %(desc)s\n"
6119
#: bzrlib/errors.py:3317
6101
#: bzrlib/errors.py:3298
6121
6103
"Malformed line. %(desc)s\n"
6125
#: bzrlib/errors.py:3327
6107
#: bzrlib/errors.py:3308
6127
6109
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6128
6110
"but patch says it should be \"%(patch_line)s\""
6131
#: bzrlib/errors.py:3338
6113
#: bzrlib/errors.py:3319
6132
6114
msgid "The feature %(feature)s has already been registered."
12272
12253
#: en/help_topics/hooks.txt:399
12278
12259
#: en/help_topics/hooks.txt:404
12280
"Called after a tree transform has been performed on a tree. The hook\n"
12281
"is called with the tree that is being transformed and the transform."
12284
#: en/help_topics/hooks.txt:407
12290
#: en/help_topics/hooks.txt:412
12292
"Called before a tree transform on this tree. The hook is called with\n"
12293
"the tree that is being transformed and the transform."
12296
#: en/help_topics/hooks.txt:415
12302
#: en/help_topics/hooks.txt:420
12304
12261
"Called before a commit is performed on a tree. The start commit hook\n"
12305
12262
"is able to change the tree before the commit takes place. start_commit\n"
12306
12263
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12307
12264
"being performed on."
12310
#: en/help_topics/hooks.txt:425
12267
#: en/help_topics/hooks.txt:409
12312
12269
"SmartClientHooks\n"
12313
12270
"----------------"
12316
#: en/help_topics/hooks.txt:428
12273
#: en/help_topics/hooks.txt:412
12322
#: en/help_topics/hooks.txt:431
12279
#: en/help_topics/hooks.txt:415
12323
12280
msgid "Introduced in: unknown"
12326
#: en/help_topics/hooks.txt:433
12283
#: en/help_topics/hooks.txt:417
12328
12285
"Called when the smart client is submitting a request to the smart\n"
12329
12286
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12330
12287
"Streaming request bodies, and responses, are not accessible."
12333
#: en/help_topics/hooks.txt:437
12290
#: en/help_topics/hooks.txt:421
12335
12292
"SmartServerHooks\n"
12336
12293
"----------------"
12339
#: en/help_topics/hooks.txt:440
12296
#: en/help_topics/hooks.txt:424
12341
12298
"server_exception\n"
12342
12299
"~~~~~~~~~~~~~~~~"
12345
#: en/help_topics/hooks.txt:445
12302
#: en/help_topics/hooks.txt:429
12347
12304
"Called by the bzr server when an exception occurs. server_exception is\n"
12348
12305
"called with the sys.exc_info() tuple return true for the hook if the\n"