« back to all changes in this revision
Viewing changes to po/sco.po
- browse files at revision 6093.4.149
- compare with another revision
- compare with revision 1684.1.3
- download diff
- download tarball
- view history from revision 6093.4.149
- Committer: Launchpad Translations on behalf of bzr-core
- Date: 2012-07-11 04:34:44 UTC
- mto: (6581.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: launchpad_translations_on_behalf_of_bzr-core-20120711043444-s6bhpt1r22h4fpi1
Launchpad automatic translations update.
added
removed
po/sco.po
7
7
msgstr ""
8
8
"Project-Id-Version: bzr\n"
9
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-03-15 10:20+0100\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
11
"PO-Revision-Date: 2011-08-31 13:33+0000\n"
12
12
"Last-Translator: Jonathan Riddell <jriddell@ubuntu.com>\n"
13
13
"Language-Team: Scots <sco@li.org>\n"
15
15
"Content-Type: text/plain; charset=UTF-8\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-03-16 04:33+0000\n"
19
"X-Generator: Launchpad (build 14951)\n"
18
"X-Launchpad-Export-Date: 2012-07-11 04:33+0000\n"
19
"X-Generator: Launchpad (build 15593)\n"
20
20
21
21
#: bzrlib/add.py:93
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
26
26
msgid "Unstacking"
27
27
msgstr ""
28
28
29
#: bzrlib/branch.py:3121
29
#: bzrlib/branch.py:2955
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr ""
33
33
34
#: bzrlib/branch.py:3123
34
#: bzrlib/branch.py:2957
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
38
msgstr[0] ""
39
39
msgstr[1] ""
40
40
41
#: bzrlib/branch.py:3126
41
#: bzrlib/branch.py:2960
42
42
msgid "No new revisions or tags to push."
43
43
msgstr ""
44
44
45
#: bzrlib/branch.py:3128
45
#: bzrlib/branch.py:2962
46
46
msgid "No new revisions to push."
47
47
msgstr ""
48
48
49
#: bzrlib/branch.py:3148
49
#: bzrlib/branch.py:2982
50
50
msgid "checked branch {0} format {1}"
51
51
msgstr ""
52
52
53
#: bzrlib/branch.py:3151
53
#: bzrlib/branch.py:2985
54
54
#, python-format
55
55
msgid "found error:%s"
56
56
msgstr ""
57
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3026 bzrlib/workingtree.py:323
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
59
59
#, python-format
60
60
msgid "Ignoring files outside view. View is %s"
61
61
msgstr ""
186
186
msgid "bzr status --revision takes exactly one or two revision specifiers"
187
187
msgstr ""
188
188
189
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5197
189
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
190
190
msgid "You can only supply one of revision_id or --revision"
191
191
msgstr ""
192
192
193
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5199
193
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
194
194
msgid "You must supply either --revision or a revision_id"
195
195
msgstr ""
196
196
266
266
msgid "--tree and --revision can not be used together"
267
267
msgstr ""
268
268
269
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5953
269
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
270
270
msgid "Tags can only be placed on a single revision, not on a range"
271
271
msgstr ""
272
272
509
509
"master branch."
510
510
msgstr ""
511
511
512
#: bzrlib/builtins.py:1180
512
#: bzrlib/builtins.py:1189
513
513
msgid "Need working tree for --show-base."
514
514
msgstr ""
515
515
516
#: bzrlib/builtins.py:1196
516
#: bzrlib/builtins.py:1205
517
517
msgid "No pull location known or specified."
518
518
msgstr ""
519
519
520
#: bzrlib/builtins.py:1202
520
#: bzrlib/builtins.py:1211
521
521
#, python-format
522
522
msgid "Using saved parent location: %s\n"
523
523
msgstr ""
524
524
525
#: bzrlib/builtins.py:1209 bzrlib/builtins.py:4406
525
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
526
526
msgid "Cannot use -r with merge directives or bundles"
527
527
msgstr ""
528
528
529
#: bzrlib/builtins.py:1252
529
#: bzrlib/builtins.py:1261
530
530
msgid "Update a mirror of this branch."
531
531
msgstr ""
532
532
533
#: bzrlib/builtins.py:1254
533
#: bzrlib/builtins.py:1263
534
534
msgid ""
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."
537
537
msgstr ""
538
538
539
#: bzrlib/builtins.py:1257
539
#: bzrlib/builtins.py:1266
540
540
msgid ""
541
541
"Some smart servers or protocols *may* put the working tree in place in\n"
542
542
"the future."
543
543
msgstr ""
544
544
545
#: bzrlib/builtins.py:1260
545
#: bzrlib/builtins.py:1269
546
546
msgid ""
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."
550
550
msgstr ""
551
551
552
#: bzrlib/builtins.py:1264
552
#: bzrlib/builtins.py:1273
553
553
msgid ""
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."
556
556
msgstr ""
557
557
558
#: bzrlib/builtins.py:1267
558
#: bzrlib/builtins.py:1276
559
559
msgid ""
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'."
563
563
msgstr ""
564
564
565
#: bzrlib/builtins.py:1271
565
#: bzrlib/builtins.py:1280
566
566
msgid ""
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."
571
571
msgstr ""
572
572
573
#: bzrlib/builtins.py:1276
573
#: bzrlib/builtins.py:1285
574
574
msgid ""
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>."
578
578
msgstr ""
579
579
580
#: bzrlib/builtins.py:1287 bzrlib/foreign.py:272
580
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
581
581
msgid ""
582
582
"Branch to push from, rather than the one containing the working directory."
583
583
msgstr ""
584
584
585
#: bzrlib/builtins.py:1290
585
#: bzrlib/builtins.py:1299
586
586
msgid ""
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."
589
589
msgstr ""
590
590
591
#: bzrlib/builtins.py:1295
591
#: bzrlib/builtins.py:1304
592
592
msgid ""
593
593
"Create a stacked branch that references the public location of the parent "
594
594
"branch."
595
595
msgstr ""
596
596
597
#: bzrlib/builtins.py:1298
597
#: bzrlib/builtins.py:1307
598
598
msgid ""
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."
602
602
msgstr ""
603
603
604
#: bzrlib/builtins.py:1303 bzrlib/foreign.py:279
604
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
605
605
msgid ""
606
606
"Refuse to push if there are uncommitted changes in the working tree, --no-"
607
607
"strict disables the check."
608
608
msgstr ""
609
609
610
#: bzrlib/builtins.py:1306
610
#: bzrlib/builtins.py:1315
611
611
msgid "Don't populate the working tree, even for protocols that support it."
612
612
msgstr ""
613
613
614
#: bzrlib/builtins.py:1350
614
#: bzrlib/builtins.py:1318
615
msgid "Overwrite tags only."
616
msgstr ""
617
618
#: bzrlib/builtins.py:1369
615
619
msgid "Could not determine branch to refer to."
616
620
msgstr ""
617
621
618
#: bzrlib/builtins.py:1359
622
#: bzrlib/builtins.py:1378
619
623
#, python-format
620
624
msgid ""
621
625
"No push location known or specified. To push to the parent branch (at %s), "
622
626
"use 'bzr push :parent'."
623
627
msgstr ""
624
628
625
#: bzrlib/builtins.py:1365 bzrlib/foreign.py:306
629
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
626
630
msgid "No push location known or specified."
627
631
msgstr ""
628
632
629
#: bzrlib/builtins.py:1369
633
#: bzrlib/builtins.py:1388
630
634
#, python-format
631
635
msgid "Using saved push location: %s"
632
636
msgstr ""
633
637
634
#: bzrlib/builtins.py:1379
638
#: bzrlib/builtins.py:1398
635
639
msgid "Create a new branch that is a copy of an existing branch."
636
640
msgstr ""
637
641
638
#: bzrlib/builtins.py:1381
642
#: bzrlib/builtins.py:1400
639
643
msgid ""
640
644
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
641
645
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
646
650
"create ./foo-bar."
647
651
msgstr ""
648
652
649
#: bzrlib/builtins.py:1388
653
#: bzrlib/builtins.py:1407
650
654
msgid ""
651
655
"To retrieve the branch as of a particular revision, supply the --revision\n"
652
656
"parameter, as in \"branch foo/bar -r 5\"."
653
657
msgstr ""
654
658
655
#: bzrlib/builtins.py:1391
659
#: bzrlib/builtins.py:1410
656
660
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
657
661
msgstr ""
658
662
659
#: bzrlib/builtins.py:1401
663
#: bzrlib/builtins.py:1420
660
664
msgid "Create a branch without a working-tree."
661
665
msgstr ""
662
666
663
#: bzrlib/builtins.py:1403
667
#: bzrlib/builtins.py:1422
664
668
msgid "Switch the checkout in the current directory to the new branch."
665
669
msgstr ""
666
670
667
#: bzrlib/builtins.py:1406
671
#: bzrlib/builtins.py:1425
668
672
msgid ""
669
673
"Create a stacked branch referring to the source branch. The new branch will "
670
674
"depend on the availability of the source branch for all operations."
671
675
msgstr ""
672
676
673
#: bzrlib/builtins.py:1410
677
#: bzrlib/builtins.py:1429
674
678
msgid "Do not use a shared repository, even if available."
675
679
msgstr ""
676
680
677
#: bzrlib/builtins.py:1412
681
#: bzrlib/builtins.py:1431
678
682
msgid ""
679
683
"By default branch will fail if the target directory exists, but does not "
680
684
"already have a control directory. This flag will allow branch to proceed."
681
685
msgstr ""
682
686
683
#: bzrlib/builtins.py:1417
687
#: bzrlib/builtins.py:1436
684
688
msgid "Bind new branch to from location."
685
689
msgstr ""
686
690
687
#: bzrlib/builtins.py:1464
691
#: bzrlib/builtins.py:1483
688
692
#, python-format
689
693
msgid "Target directory \"%s\" already exists."
690
694
msgstr ""
691
695
692
#: bzrlib/builtins.py:1476
696
#: bzrlib/builtins.py:1495
693
697
#, python-format
694
698
msgid "Parent of \"%s\" does not exist."
695
699
msgstr ""
696
700
697
#: bzrlib/builtins.py:1495
701
#: bzrlib/builtins.py:1514
698
702
msgid "The branch {0} has no revision {1}."
699
703
msgstr ""
700
704
701
#: bzrlib/builtins.py:1510 bzrlib/push.py:53
705
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
702
706
#, python-format
703
707
msgid "Created new stacked branch referring to %s."
704
708
msgstr ""
705
709
706
#: bzrlib/builtins.py:1514
710
#: bzrlib/builtins.py:1533
707
711
#, python-format
708
712
msgid "Branched %d revision."
709
713
msgid_plural "Branched %d revisions."
710
714
msgstr[0] ""
711
715
msgstr[1] ""
712
716
713
#: bzrlib/builtins.py:1519
717
#: bzrlib/builtins.py:1538
714
718
#, python-format
715
719
msgid "New branch bound to %s"
716
720
msgstr ""
717
721
718
#: bzrlib/builtins.py:1524 bzrlib/builtins.py:6247
722
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
719
723
#, python-format
720
724
msgid "Switched to branch: %s"
721
725
msgstr ""
722
726
723
#: bzrlib/builtins.py:1529
727
#: bzrlib/builtins.py:1548
724
728
msgid "List the branches available at the current location."
725
729
msgstr ""
726
730
727
#: bzrlib/builtins.py:1531
731
#: bzrlib/builtins.py:1550
728
732
msgid ""
729
733
"This command will print the names of all the branches at the current\n"
730
734
"location."
731
735
msgstr ""
732
736
733
#: bzrlib/builtins.py:1538
737
#: bzrlib/builtins.py:1557
734
738
msgid ""
735
739
"Recursively scan for branches rather than just looking in the specified "
736
740
"location."
737
741
msgstr ""
738
742
739
#: bzrlib/builtins.py:1567
743
#: bzrlib/builtins.py:1586
740
744
msgid "(default)"
741
745
msgstr ""
742
746
743
#: bzrlib/builtins.py:1579
747
#: bzrlib/builtins.py:1598
744
748
msgid "Create a new checkout of an existing branch."
745
749
msgstr ""
746
750
747
#: bzrlib/builtins.py:1581
751
#: bzrlib/builtins.py:1600
748
752
msgid ""
749
753
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
750
754
"for\n"
754
758
"location using SFTP."
755
759
msgstr ""
756
760
757
#: bzrlib/builtins.py:1586
761
#: bzrlib/builtins.py:1605
758
762
msgid ""
759
763
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
760
764
"will\n"
766
770
"create ./foo-bar."
767
771
msgstr ""
768
772
769
#: bzrlib/builtins.py:1593
773
#: bzrlib/builtins.py:1612
770
774
msgid ""
771
775
"To retrieve the branch as of a particular revision, supply the --revision\n"
772
776
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
776
780
"code.)"
777
781
msgstr ""
778
782
779
#: bzrlib/builtins.py:1603
783
#: bzrlib/builtins.py:1622
780
784
msgid ""
781
785
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
782
786
"the branch for every operation. Normal checkouts can perform common "
784
788
"commits."
785
789
msgstr ""
786
790
787
#: bzrlib/builtins.py:1610
791
#: bzrlib/builtins.py:1629
788
792
msgid "Get file contents from this tree."
789
793
msgstr ""
790
794
791
#: bzrlib/builtins.py:1612
795
#: bzrlib/builtins.py:1631
792
796
msgid "Hard-link working tree files where possible."
793
797
msgstr ""
794
798
795
#: bzrlib/builtins.py:1653
799
#: bzrlib/builtins.py:1672
796
800
msgid ""
797
801
"Show list of renamed files.\n"
798
802
" "
799
803
msgstr ""
800
804
801
#: bzrlib/builtins.py:1681
805
#: bzrlib/builtins.py:1700
802
806
msgid "Update a working tree to a new revision."
803
807
msgstr ""
804
808
805
#: bzrlib/builtins.py:1683
809
#: bzrlib/builtins.py:1702
806
810
msgid ""
807
811
"This will perform a merge of the destination revision (the tip of the\n"
808
812
"branch, or the specified revision) into the working tree, and then make\n"
809
813
"that revision the basis revision for the working tree. "
810
814
msgstr ""
811
815
812
#: bzrlib/builtins.py:1687
816
#: bzrlib/builtins.py:1706
813
817
msgid ""
814
818
"You can use this to visit an older revision, or to update a working tree\n"
815
819
"that is out of date from its branch."
816
820
msgstr ""
817
821
818
#: bzrlib/builtins.py:1690
822
#: bzrlib/builtins.py:1709
819
823
msgid ""
820
824
"If there are any uncommitted changes in the tree, they will be carried\n"
821
825
"across and remain as uncommitted changes after the update. To discard\n"
823
827
"with the changes brought in by the change in basis revision."
824
828
msgstr ""
825
829
826
#: bzrlib/builtins.py:1695
830
#: bzrlib/builtins.py:1714
827
831
msgid ""
828
832
"If the tree's branch is bound to a master branch, bzr will also update\n"
829
833
"the branch from the master."
830
834
msgstr ""
831
835
832
#: bzrlib/builtins.py:1698
836
#: bzrlib/builtins.py:1717
833
837
msgid ""
834
838
"You cannot update just a single file or directory, because each Bazaar\n"
835
839
"working tree has just a single basis revision. If you want to restore a\n"
839
843
"out the old content of that file to a new location."
840
844
msgstr ""
841
845
842
#: bzrlib/builtins.py:1705
846
#: bzrlib/builtins.py:1724
843
847
msgid ""
844
848
"The 'dir' argument, if given, must be the location of the root of a\n"
845
849
"working tree to update. By default, the working tree that contains the \n"
846
850
"current working directory is used."
847
851
msgstr ""
848
852
849
#: bzrlib/builtins.py:1721
853
#: bzrlib/builtins.py:1740
850
854
msgid "bzr update --revision takes exactly one revision"
851
855
msgstr ""
852
856
853
#: bzrlib/builtins.py:1729
857
#: bzrlib/builtins.py:1748
854
858
msgid "bzr update can only update a whole tree, not a file or subdirectory"
855
859
msgstr ""
856
860
857
#: bzrlib/builtins.py:1760
861
#: bzrlib/builtins.py:1779
858
862
msgid "Tree is up to date at revision {0} of branch {1}"
859
863
msgstr ""
860
864
861
#: bzrlib/builtins.py:1776
865
#: bzrlib/builtins.py:1795
862
866
#, python-format
863
867
msgid ""
864
868
"branch has no revision %s\n"
865
869
"bzr update --revision only works for a revision in the branch history"
866
870
msgstr ""
867
871
868
#: bzrlib/builtins.py:1782
872
#: bzrlib/builtins.py:1801
869
873
msgid "Updated to revision {0} of branch {1}"
870
874
msgstr ""
871
875
872
#: bzrlib/builtins.py:1786
876
#: bzrlib/builtins.py:1805
873
877
msgid ""
874
878
"Your local commits will now show as pending merges with 'bzr status', and "
875
879
"can be committed with 'bzr commit'."
876
880
msgstr ""
877
881
878
#: bzrlib/builtins.py:1795
882
#: bzrlib/builtins.py:1814
879
883
msgid "Show information about a working tree, branch or repository."
880
884
msgstr ""
881
885
882
#: bzrlib/builtins.py:1797
886
#: bzrlib/builtins.py:1816
883
887
msgid ""
884
888
"This command will show all known locations and formats associated to the\n"
885
889
"tree, branch or repository."
886
890
msgstr ""
887
891
888
#: bzrlib/builtins.py:1800
892
#: bzrlib/builtins.py:1819
889
893
msgid ""
890
894
"In verbose mode, statistical information is included with each report.\n"
891
895
"To see extended statistic information, use a verbosity level of 2 or\n"
892
896
"higher by specifying the verbose option multiple times, e.g. -vv."
893
897
msgstr ""
894
898
895
#: bzrlib/builtins.py:1804
899
#: bzrlib/builtins.py:1823
896
900
msgid "Branches and working trees will also report any missing revisions."
897
901
msgstr ""
898
902
899
#: bzrlib/builtins.py:1806 bzrlib/builtins.py:3725 bzrlib/builtins.py:4859
900
#: bzrlib/builtins.py:6433
903
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
904
#: bzrlib/builtins.py:6466
901
905
msgid ":Examples:"
902
906
msgstr ""
903
907
904
#: bzrlib/builtins.py:1808
908
#: bzrlib/builtins.py:1827
905
909
msgid " Display information on the format and related locations:"
906
910
msgstr ""
907
911
908
#: bzrlib/builtins.py:1810
912
#: bzrlib/builtins.py:1829
909
913
msgid " bzr info"
910
914
msgstr ""
911
915
912
#: bzrlib/builtins.py:1812
916
#: bzrlib/builtins.py:1831
913
917
msgid ""
914
918
" Display the above together with extended format information and\n"
915
919
" basic statistics (like the number of files in the working tree and\n"
916
920
" number of revisions in the branch and repository):"
917
921
msgstr ""
918
922
919
#: bzrlib/builtins.py:1816
923
#: bzrlib/builtins.py:1835
920
924
msgid " bzr info -v"
921
925
msgstr ""
922
926
923
#: bzrlib/builtins.py:1818
927
#: bzrlib/builtins.py:1837
924
928
msgid " Display the above together with number of committers to the branch:"
925
929
msgstr ""
926
930
927
#: bzrlib/builtins.py:1820
931
#: bzrlib/builtins.py:1839
928
932
msgid " bzr info -vv"
929
933
msgstr ""
930
934
931
#: bzrlib/builtins.py:1839
935
#: bzrlib/builtins.py:1858
932
936
msgid "Remove files or directories."
933
937
msgstr ""
934
938
935
#: bzrlib/builtins.py:1841
939
#: bzrlib/builtins.py:1860
936
940
msgid ""
937
941
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
938
942
"delete them if they can easily be recovered using revert otherwise they\n"
939
"will be backed up (adding an extention of the form .~#~). If no options or\n"
943
"will be backed up (adding an extension of the form .~#~). If no options or\n"
940
944
"parameters are given Bazaar will scan for files that are being tracked by\n"
941
945
"Bazaar but missing in your tree and stop tracking them for you."
942
946
msgstr ""
943
947
944
#: bzrlib/builtins.py:1849
948
#: bzrlib/builtins.py:1868
945
949
msgid "Only remove files that have never been committed."
946
950
msgstr ""
947
951
948
#: bzrlib/builtins.py:1851
952
#: bzrlib/builtins.py:1870
949
953
msgid "The file deletion mode to be used."
950
954
msgstr ""
951
955
952
#: bzrlib/builtins.py:1852
956
#: bzrlib/builtins.py:1871
953
957
msgid "Deletion Strategy"
954
958
msgstr ""
955
959
956
#: bzrlib/builtins.py:1853
960
#: bzrlib/builtins.py:1872
957
961
msgid "Backup changed files (default)."
958
962
msgstr ""
959
963
960
#: bzrlib/builtins.py:1854
964
#: bzrlib/builtins.py:1873
961
965
msgid "Delete from bzr but leave the working copy."
962
966
msgstr ""
963
967
964
#: bzrlib/builtins.py:1855
968
#: bzrlib/builtins.py:1874
965
969
msgid "Don't backup changed files."
966
970
msgstr ""
967
971
968
#: bzrlib/builtins.py:1856
972
#: bzrlib/builtins.py:1875
969
973
msgid ""
970
974
"Delete all the specified files, even if they can not be recovered and even "
971
975
"if they are non-empty directories. (deprecated, use no-backup)"
972
976
msgstr ""
973
977
974
#: bzrlib/builtins.py:1865
978
#: bzrlib/builtins.py:1884
975
979
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
976
980
msgstr ""
977
981
978
#: bzrlib/builtins.py:1882
982
#: bzrlib/builtins.py:1901
979
983
msgid "No matching files."
980
984
msgstr ""
981
985
982
#: bzrlib/builtins.py:1943
986
#: bzrlib/builtins.py:1962
983
987
msgid "Reconcile bzr metadata in a branch."
984
988
msgstr ""
985
989
986
#: bzrlib/builtins.py:1945
990
#: bzrlib/builtins.py:1964
987
991
msgid ""
988
992
"This can correct data mismatches that may have been caused by\n"
989
993
"previous ghost operations or bzr upgrades. You should only\n"
991
995
"advises you to run it."
992
996
msgstr ""
993
997
994
#: bzrlib/builtins.py:1950
998
#: bzrlib/builtins.py:1969
995
999
msgid ""
996
1000
"If a second branch is provided, cross-branch reconciliation is\n"
997
1001
"also attempted, which will check that data like the tree root\n"
999
1003
"correctly in both branches."
1000
1004
msgstr ""
1001
1005
1002
#: bzrlib/builtins.py:1955
1006
#: bzrlib/builtins.py:1974
1003
1007
msgid ""
1004
1008
"At the same time it is run it may recompress data resulting in\n"
1005
1009
"a potential saving in disk space or performance gain."
1006
1010
msgstr ""
1007
1011
1008
#: bzrlib/builtins.py:1958
1012
#: bzrlib/builtins.py:1977
1009
1013
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1010
1014
msgstr ""
1011
1015
1012
#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760
1016
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1013
1017
msgid ""
1014
1018
"Format for the bzr 2.0 series.\n"
1015
1019
"Uses group-compress storage.\n"
1016
1020
"Provides rich roots which are a one-way transition.\n"
1017
1021
msgstr ""
1018
1022
1019
#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760
1023
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1020
1024
msgid ""
1021
1025
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1022
1026
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1023
1027
msgstr ""
1024
1028
1025
#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760
1029
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1026
1030
msgid "The 2a format with experimental support for colocated branches.\n"
1027
1031
msgstr ""
1028
1032
1029
#: bzrlib/builtins.py:2026
1033
#: bzrlib/builtins.py:2045
1030
1034
msgid "Make a directory into a versioned branch."
1031
1035
msgstr ""
1032
1036
1033
#: bzrlib/builtins.py:2028
1037
#: bzrlib/builtins.py:2047
1034
1038
msgid ""
1035
1039
"Use this to create an empty branch, or before importing an\n"
1036
1040
"existing project."
1037
1041
msgstr ""
1038
1042
1039
#: bzrlib/builtins.py:2031
1043
#: bzrlib/builtins.py:2050
1040
1044
msgid ""
1041
1045
"If there is a repository in a parent directory of the location, then\n"
1042
1046
"the history of the branch will be stored in the repository. Otherwise\n"
1044
1048
"in the .bzr directory."
1045
1049
msgstr ""
1046
1050
1047
#: bzrlib/builtins.py:2036
1051
#: bzrlib/builtins.py:2055
1048
1052
msgid ""
1049
1053
"If there is already a branch at the location but it has no working tree,\n"
1050
1054
"the tree can be populated with 'bzr checkout'."
1051
1055
msgstr ""
1052
1056
1053
#: bzrlib/builtins.py:2039
1057
#: bzrlib/builtins.py:2058
1054
1058
msgid "Recipe for importing a tree of files::"
1055
1059
msgstr ""
1056
1060
1057
#: bzrlib/builtins.py:2041
1061
#: bzrlib/builtins.py:2060
1058
1062
msgid ""
1059
1063
" cd ~/project\n"
1060
1064
" bzr init\n"
1063
1067
" bzr commit -m \"imported project\""
1064
1068
msgstr ""
1065
1069
1066
#: bzrlib/builtins.py:2052
1070
#: bzrlib/builtins.py:2071
1067
1071
msgid ""
1068
1072
"Create the path leading up to the branch if it does not already exist."
1069
1073
msgstr ""
1070
1074
1071
#: bzrlib/builtins.py:2055
1075
#: bzrlib/builtins.py:2074
1072
1076
msgid "Specify a format for this branch. See \"help formats\"."
1073
1077
msgstr ""
1074
1078
1075
#: bzrlib/builtins.py:2063
1079
#: bzrlib/builtins.py:2082
1076
1080
msgid ""
1077
1081
"Never change revnos or the existing log. Append revisions to it only."
1078
1082
msgstr ""
1079
1083
1080
#: bzrlib/builtins.py:2066
1084
#: bzrlib/builtins.py:2085
1081
1085
msgid "Create a branch without a working tree."
1082
1086
msgstr ""
1083
1087
1084
#: bzrlib/builtins.py:2086 bzrlib/push.py:110
1088
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1085
1089
#, python-format
1086
1090
msgid ""
1087
1091
"Parent directory of %s does not exist.\n"
1088
1092
"You may supply --create-prefix to create all leading parent directories."
1089
1093
msgstr ""
1090
1094
1091
#: bzrlib/builtins.py:2120
1095
#: bzrlib/builtins.py:2139
1092
1096
msgid ""
1093
1097
"This branch format cannot be set to append-revisions-only. Try --default."
1094
1098
msgstr ""
1095
1099
1096
#: bzrlib/builtins.py:2131
1100
#: bzrlib/builtins.py:2150
1097
1101
msgid "Created a {0} (format: {1})\n"
1098
1102
msgstr ""
1099
1103
1100
#: bzrlib/builtins.py:2140
1104
#: bzrlib/builtins.py:2159
1101
1105
#, python-format
1102
1106
msgid "Using shared repository: %s\n"
1103
1107
msgstr ""
1104
1108
1105
#: bzrlib/builtins.py:2144
1109
#: bzrlib/builtins.py:2163
1106
1110
msgid "Create a shared repository for branches to share storage space."
1107
1111
msgstr ""
1108
1112
1109
#: bzrlib/builtins.py:2146
1113
#: bzrlib/builtins.py:2165
1110
1114
msgid ""
1111
1115
"New branches created under the repository directory will store their\n"
1112
1116
"revisions in the repository, not in the branch directory. For branches\n"
1114
1118
"speeds up the creation of new branches."
1115
1119
msgstr ""
1116
1120
1117
#: bzrlib/builtins.py:2151
1121
#: bzrlib/builtins.py:2170
1118
1122
msgid ""
1119
1123
"If the --no-trees option is given then the branches in the repository\n"
1120
1124
"will not have working trees by default. They will still exist as \n"
1124
1128
"branches, such as on a server."
1125
1129
msgstr ""
1126
1130
1127
#: bzrlib/builtins.py:2158
1131
#: bzrlib/builtins.py:2177
1128
1132
msgid ""
1129
1133
":Examples:\n"
1130
1134
" Create a shared repository holding just branches::"
1131
1135
msgstr ""
1132
1136
1133
#: bzrlib/builtins.py:2161
1137
#: bzrlib/builtins.py:2180
1134
1138
msgid ""
1135
1139
" bzr init-repo --no-trees repo\n"
1136
1140
" bzr init repo/trunk"
1137
1141
msgstr ""
1138
1142
1139
#: bzrlib/builtins.py:2164
1143
#: bzrlib/builtins.py:2183
1140
1144
msgid " Make a lightweight checkout elsewhere::"
1141
1145
msgstr ""
1142
1146
1143
#: bzrlib/builtins.py:2166
1147
#: bzrlib/builtins.py:2185
1144
1148
msgid ""
1145
1149
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1146
1150
" cd trunk-checkout\n"
1147
1151
" (add files here)"
1148
1152
msgstr ""
1149
1153
1150
#: bzrlib/builtins.py:2174
1154
#: bzrlib/builtins.py:2193
1151
1155
msgid ""
1152
1156
"Specify a format for this repository. See \"bzr help formats\" for details."
1153
1157
msgstr ""
1154
1158
1155
#: bzrlib/builtins.py:2178
1159
#: bzrlib/builtins.py:2197
1156
1160
msgid "Repository format"
1157
1161
msgstr ""
1158
1162
1159
#: bzrlib/builtins.py:2180
1163
#: bzrlib/builtins.py:2199
1160
1164
msgid "Branches in the repository will default to not having a working tree."
1161
1165
msgstr ""
1162
1166
1163
#: bzrlib/builtins.py:2206
1167
#: bzrlib/builtins.py:2225
1164
1168
msgid "Show differences in the working tree, between revisions or branches."
1165
1169
msgstr ""
1166
1170
1167
#: bzrlib/builtins.py:2208
1171
#: bzrlib/builtins.py:2227
1168
1172
msgid ""
1169
1173
"If no arguments are given, all changes for the current tree are listed.\n"
1170
1174
"If files are given, only the changes in those files are listed.\n"
1174
1178
"given."
1175
1179
msgstr ""
1176
1180
1177
#: bzrlib/builtins.py:2215
1181
#: bzrlib/builtins.py:2234
1178
1182
msgid ""
1179
1183
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1180
1184
"produces patches suitable for \"patch -p1\"."
1181
1185
msgstr ""
1182
1186
1183
#: bzrlib/builtins.py:2218
1187
#: bzrlib/builtins.py:2237
1184
1188
msgid ""
1185
1189
"Note that when using the -r argument with a range of revisions, the\n"
1186
1190
"differences are computed between the two specified revisions. That\n"
1190
1194
"in the range."
1191
1195
msgstr ""
1192
1196
1193
#: bzrlib/builtins.py:2225
1197
#: bzrlib/builtins.py:2244
1194
1198
msgid ""
1195
1199
":Exit values:\n"
1196
1200
" 1 - changed\n"
1199
1203
" 0 - no change"
1200
1204
msgstr ""
1201
1205
1202
#: bzrlib/builtins.py:2231
1206
#: bzrlib/builtins.py:2250
1203
1207
msgid ""
1204
1208
":Examples:\n"
1205
1209
" Shows the difference in the working tree versus the last commit::"
1206
1210
msgstr ""
1207
1211
1208
#: bzrlib/builtins.py:2234
1212
#: bzrlib/builtins.py:2253
1209
1213
msgid " bzr diff"
1210
1214
msgstr ""
1211
1215
1212
#: bzrlib/builtins.py:2236
1216
#: bzrlib/builtins.py:2255
1213
1217
msgid " Difference between the working tree and revision 1::"
1214
1218
msgstr ""
1215
1219
1216
#: bzrlib/builtins.py:2238
1220
#: bzrlib/builtins.py:2257
1217
1221
msgid " bzr diff -r1"
1218
1222
msgstr ""
1219
1223
1220
#: bzrlib/builtins.py:2240
1224
#: bzrlib/builtins.py:2259
1221
1225
msgid " Difference between revision 3 and revision 1::"
1222
1226
msgstr ""
1223
1227
1224
#: bzrlib/builtins.py:2242
1228
#: bzrlib/builtins.py:2261
1225
1229
msgid " bzr diff -r1..3"
1226
1230
msgstr ""
1227
1231
1228
#: bzrlib/builtins.py:2244
1232
#: bzrlib/builtins.py:2263
1229
1233
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1230
1234
msgstr ""
1231
1235
1232
#: bzrlib/builtins.py:2246
1236
#: bzrlib/builtins.py:2265
1233
1237
msgid " bzr diff -r1..3 xxx"
1234
1238
msgstr ""
1235
1239
1236
#: bzrlib/builtins.py:2248
1240
#: bzrlib/builtins.py:2267
1237
1241
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1238
1242
msgstr ""
1239
1243
1240
#: bzrlib/builtins.py:2250
1244
#: bzrlib/builtins.py:2269
1241
1245
msgid " bzr diff -c2"
1242
1246
msgstr ""
1243
1247
1244
#: bzrlib/builtins.py:2252
1248
#: bzrlib/builtins.py:2271
1245
1249
msgid ""
1246
1250
" To see the changes introduced by revision X::\n"
1247
1251
" \n"
1248
1252
" bzr diff -cX"
1249
1253
msgstr ""
1250
1254
1251
#: bzrlib/builtins.py:2256
1255
#: bzrlib/builtins.py:2275
1252
1256
msgid ""
1253
1257
" Note that in the case of a merge, the -c option shows the changes\n"
1254
1258
" compared to the left hand parent. To see the changes against\n"
1255
1259
" another parent, use::"
1256
1260
msgstr ""
1257
1261
1258
#: bzrlib/builtins.py:2260
1262
#: bzrlib/builtins.py:2279
1259
1263
msgid " bzr diff -r<chosen_parent>..X"
1260
1264
msgstr ""
1261
1265
1262
#: bzrlib/builtins.py:2262
1266
#: bzrlib/builtins.py:2281
1263
1267
msgid ""
1264
1268
" The changes between the current revision and the previous revision\n"
1265
1269
" (equivalent to -c-1 and -r-2..-1)"
1266
1270
msgstr ""
1267
1271
1268
#: bzrlib/builtins.py:2265
1272
#: bzrlib/builtins.py:2284
1269
1273
msgid " bzr diff -r-2.."
1270
1274
msgstr ""
1271
1275
1272
#: bzrlib/builtins.py:2267
1276
#: bzrlib/builtins.py:2286
1273
1277
msgid " Show just the differences for file NEWS::"
1274
1278
msgstr ""
1275
1279
1276
#: bzrlib/builtins.py:2269
1280
#: bzrlib/builtins.py:2288
1277
1281
msgid " bzr diff NEWS"
1278
1282
msgstr ""
1279
1283
1280
#: bzrlib/builtins.py:2271
1284
#: bzrlib/builtins.py:2290
1281
1285
msgid " Show the differences in working tree xxx for file NEWS::"
1282
1286
msgstr ""
1283
1287
1284
#: bzrlib/builtins.py:2273
1288
#: bzrlib/builtins.py:2292
1285
1289
msgid " bzr diff xxx/NEWS"
1286
1290
msgstr ""
1287
1291
1288
#: bzrlib/builtins.py:2275
1292
#: bzrlib/builtins.py:2294
1289
1293
msgid " Show the differences from branch xxx to this working tree:"
1290
1294
msgstr ""
1291
1295
1292
#: bzrlib/builtins.py:2277
1296
#: bzrlib/builtins.py:2296
1293
1297
msgid " bzr diff --old xxx"
1294
1298
msgstr ""
1295
1299
1296
#: bzrlib/builtins.py:2279
1300
#: bzrlib/builtins.py:2298
1297
1301
msgid " Show the differences between two branches for file NEWS::"
1298
1302
msgstr ""
1299
1303
1300
#: bzrlib/builtins.py:2281
1304
#: bzrlib/builtins.py:2300
1301
1305
msgid " bzr diff --old xxx --new yyy NEWS"
1302
1306
msgstr ""
1303
1307
1304
#: bzrlib/builtins.py:2283
1308
#: bzrlib/builtins.py:2302
1305
1309
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1306
1310
msgstr ""
1307
1311
1308
#: bzrlib/builtins.py:2285
1312
#: bzrlib/builtins.py:2304
1309
1313
msgid ""
1310
1314
" bzr diff --prefix old/:new/\n"
1311
1315
" \n"
1314
1318
" bzr diff --using /usr/bin/diff --diff-options -wu"
1315
1319
msgstr ""
1316
1320
1317
#: bzrlib/builtins.py:2295
1321
#: bzrlib/builtins.py:2314
1318
1322
msgid "Pass these options to the external diff program."
1319
1323
msgstr ""
1320
1324
1321
#: bzrlib/builtins.py:2298
1325
#: bzrlib/builtins.py:2317
1322
1326
msgid ""
1323
1327
"Set prefixes added to old and new filenames, as two values separated by a "
1324
1328
"colon. (eg \"old/:new/\")."
1325
1329
msgstr ""
1326
1330
1327
#: bzrlib/builtins.py:2301
1331
#: bzrlib/builtins.py:2320
1328
1332
msgid "Branch/tree to compare from."
1329
1333
msgstr ""
1330
1334
1331
#: bzrlib/builtins.py:2305
1335
#: bzrlib/builtins.py:2324
1332
1336
msgid "Branch/tree to compare to."
1333
1337
msgstr ""
1334
1338
1335
#: bzrlib/builtins.py:2311
1339
#: bzrlib/builtins.py:2330
1336
1340
msgid "Use this command to compare files."
1337
1341
msgstr ""
1338
1342
1339
#: bzrlib/builtins.py:2316
1343
#: bzrlib/builtins.py:2335
1340
1344
msgid "Diff format to use."
1341
1345
msgstr ""
1342
1346
1343
#: bzrlib/builtins.py:2318
1347
#: bzrlib/builtins.py:2337
1344
1348
msgid "Diff format"
1345
1349
msgstr ""
1346
1350
1347
#: bzrlib/builtins.py:2340
1351
#: bzrlib/builtins.py:2359
1348
1352
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1349
1353
msgstr ""
1350
1354
1351
#: bzrlib/builtins.py:2344
1355
#: bzrlib/builtins.py:2363
1352
1356
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1353
1357
msgstr ""
1354
1358
1355
#: bzrlib/builtins.py:2349 bzrlib/builtins.py:2746 bzrlib/builtins.py:2759
1356
#: bzrlib/builtins.py:2767 bzrlib/builtins.py:4933
1359
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1360
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1357
1361
msgid "{0} and {1} are mutually exclusive"
1358
1362
msgstr ""
1359
1363
1360
#: bzrlib/builtins.py:2369
1364
#: bzrlib/builtins.py:2388
1361
1365
msgid ""
1362
1366
"List files deleted in the working tree.\n"
1363
1367
" "
1364
1368
msgstr ""
1365
1369
1366
#: bzrlib/builtins.py:2446
1370
#: bzrlib/builtins.py:2465
1367
1371
msgid "Show the tree root directory."
1368
1372
msgstr ""
1369
1373
1370
#: bzrlib/builtins.py:2448
1374
#: bzrlib/builtins.py:2467
1371
1375
msgid ""
1372
1376
"The root is the nearest enclosing directory with a .bzr control\n"
1373
1377
"directory."
1374
1378
msgstr ""
1375
1379
1376
#: bzrlib/builtins.py:2463
1380
#: bzrlib/builtins.py:2482
1377
1381
msgid "The limit argument must be an integer."
1378
1382
msgstr ""
1379
1383
1380
#: bzrlib/builtins.py:2471
1384
#: bzrlib/builtins.py:2490
1381
1385
msgid "The levels argument must be an integer."
1382
1386
msgstr ""
1383
1387
1384
#: bzrlib/builtins.py:2476
1388
#: bzrlib/builtins.py:2495
1385
1389
msgid "Show historical log for a branch or subset of a branch."
1386
1390
msgstr ""
1387
1391
1388
#: bzrlib/builtins.py:2478
1392
#: bzrlib/builtins.py:2497
1389
1393
msgid ""
1390
1394
"log is bzr's default tool for exploring the history of a branch.\n"
1391
1395
"The branch to use is taken from the first parameter. If no parameters\n"
1393
1397
"Here are some simple examples::"
1394
1398
msgstr ""
1395
1399
1396
#: bzrlib/builtins.py:2483
1400
#: bzrlib/builtins.py:2502
1397
1401
msgid ""
1398
1402
" bzr log log the current branch\n"
1399
1403
" bzr log foo.py log a file in its branch\n"
1400
1404
" bzr log http://server/branch log a branch on a server"
1401
1405
msgstr ""
1402
1406
1403
#: bzrlib/builtins.py:2487
1407
#: bzrlib/builtins.py:2506
1404
1408
msgid ""
1405
1409
"The filtering, ordering and information shown for each revision can\n"
1406
1410
"be controlled as explained below. By default, all revisions are\n"
1410
1414
"were merged."
1411
1415
msgstr ""
1412
1416
1413
#: bzrlib/builtins.py:2494
1417
#: bzrlib/builtins.py:2513
1414
1418
msgid ":Output control:"
1415
1419
msgstr ""
1416
1420
1417
#: bzrlib/builtins.py:2496
1421
#: bzrlib/builtins.py:2515
1418
1422
msgid ""
1419
1423
" The log format controls how information about each revision is\n"
1420
1424
" displayed. The standard log formats are called ``long``, ``short``\n"
1422
1426
" for more details on log formats."
1423
1427
msgstr ""
1424
1428
1425
#: bzrlib/builtins.py:2501
1429
#: bzrlib/builtins.py:2520
1426
1430
msgid ""
1427
1431
" The following options can be used to control what information is\n"
1428
1432
" displayed::"
1429
1433
msgstr ""
1430
1434
1431
#: bzrlib/builtins.py:2504
1435
#: bzrlib/builtins.py:2523
1432
1436
msgid ""
1433
1437
" -l N display a maximum of N revisions\n"
1434
1438
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1437
1441
" --show-ids display revision-ids (and file-ids), not just revnos"
1438
1442
msgstr ""
1439
1443
1440
#: bzrlib/builtins.py:2510
1444
#: bzrlib/builtins.py:2529
1441
1445
msgid ""
1442
1446
" Note that the default number of levels to display is a function of the\n"
1443
1447
" log format. If the -n option is not used, the standard log formats show\n"
1444
1448
" just the top level (mainline)."
1445
1449
msgstr ""
1446
1450
1447
#: bzrlib/builtins.py:2514
1451
#: bzrlib/builtins.py:2533
1448
1452
msgid ""
1449
1453
" Status summaries are shown using status flags like A, M, etc. To see\n"
1450
1454
" the changes explained using words like ``added`` and ``modified``\n"
1451
1455
" instead, use the -vv option."
1452
1456
msgstr ""
1453
1457
1454
#: bzrlib/builtins.py:2518
1458
#: bzrlib/builtins.py:2537
1455
1459
msgid ":Ordering control:"
1456
1460
msgstr ""
1457
1461
1458
#: bzrlib/builtins.py:2520
1462
#: bzrlib/builtins.py:2539
1459
1463
msgid ""
1460
1464
" To display revisions from oldest to newest, use the --forward option.\n"
1461
1465
" In most cases, using this option will have little impact on the total\n"
1463
1467
" display revisions like --reverse does when it can."
1464
1468
msgstr ""
1465
1469
1466
#: bzrlib/builtins.py:2525
1470
#: bzrlib/builtins.py:2544
1467
1471
msgid ":Revision filtering:"
1468
1472
msgstr ""
1469
1473
1470
#: bzrlib/builtins.py:2527
1474
#: bzrlib/builtins.py:2546
1471
1475
msgid ""
1472
1476
" The -r option can be used to specify what revision or range of revisions\n"
1473
1477
" to filter against. The various forms are shown below::"
1474
1478
msgstr ""
1475
1479
1476
#: bzrlib/builtins.py:2530
1480
#: bzrlib/builtins.py:2549
1477
1481
msgid ""
1478
1482
" -rX display revision X\n"
1479
1483
" -rX.. display revision X and later\n"
1481
1485
" -rX..Y display from X to Y inclusive"
1482
1486
msgstr ""
1483
1487
1484
#: bzrlib/builtins.py:2535
1488
#: bzrlib/builtins.py:2554
1485
1489
msgid ""
1486
1490
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1487
1491
" Some common examples are given below::"
1488
1492
msgstr ""
1489
1493
1490
#: bzrlib/builtins.py:2538
1494
#: bzrlib/builtins.py:2557
1491
1495
msgid ""
1492
1496
" -r-1 show just the tip\n"
1493
1497
" -r-10.. show the last 10 mainline revisions\n"
1497
1501
" -rdate:yesterday.. show changes since yesterday"
1498
1502
msgstr ""
1499
1503
1500
#: bzrlib/builtins.py:2545
1504
#: bzrlib/builtins.py:2564
1501
1505
msgid ""
1502
1506
" When logging a range of revisions using -rX..Y, log starts at\n"
1503
1507
" revision Y and searches back in history through the primary\n"
1507
1511
" a nested merge revision and the log will be truncated accordingly."
1508
1512
msgstr ""
1509
1513
1510
#: bzrlib/builtins.py:2552
1514
#: bzrlib/builtins.py:2571
1511
1515
msgid ":Path filtering:"
1512
1516
msgstr ""
1513
1517
1514
#: bzrlib/builtins.py:2554
1518
#: bzrlib/builtins.py:2573
1515
1519
msgid ""
1516
1520
" If parameters are given and the first one is not a branch, the log\n"
1517
1521
" will be filtered to show only those revisions that changed the\n"
1518
1522
" nominated files or directories."
1519
1523
msgstr ""
1520
1524
1521
#: bzrlib/builtins.py:2558
1525
#: bzrlib/builtins.py:2577
1522
1526
msgid ""
1523
1527
" Filenames are interpreted within their historical context. To log a\n"
1524
1528
" deleted file, specify a revision range so that the file existed at\n"
1525
1529
" the end or start of the range."
1526
1530
msgstr ""
1527
1531
1528
#: bzrlib/builtins.py:2562
1532
#: bzrlib/builtins.py:2581
1529
1533
msgid ""
1530
1534
" Historical context is also important when interpreting pathnames of\n"
1531
1535
" renamed files/directories. Consider the following example:"
1532
1536
msgstr ""
1533
1537
1534
#: bzrlib/builtins.py:2565
1538
#: bzrlib/builtins.py:2584
1535
1539
msgid ""
1536
1540
" * revision 1: add tutorial.txt\n"
1537
1541
" * revision 2: modify tutorial.txt\n"
1538
1542
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1539
1543
msgstr ""
1540
1544
1541
#: bzrlib/builtins.py:2569
1545
#: bzrlib/builtins.py:2588
1542
1546
msgid " In this case:"
1543
1547
msgstr ""
1544
1548
1545
#: bzrlib/builtins.py:2571
1549
#: bzrlib/builtins.py:2590
1546
1550
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1547
1551
msgstr ""
1548
1552
1549
#: bzrlib/builtins.py:2573
1553
#: bzrlib/builtins.py:2592
1550
1554
msgid ""
1551
1555
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1552
1556
msgstr ""
1553
1557
1554
#: bzrlib/builtins.py:2575
1558
#: bzrlib/builtins.py:2594
1555
1559
msgid ""
1556
1560
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1557
1561
" the original file in revision 2."
1558
1562
msgstr ""
1559
1563
1560
#: bzrlib/builtins.py:2578
1564
#: bzrlib/builtins.py:2597
1561
1565
msgid ""
1562
1566
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1563
1567
" was no file called guide.txt in revision 2."
1564
1568
msgstr ""
1565
1569
1566
#: bzrlib/builtins.py:2581
1570
#: bzrlib/builtins.py:2600
1567
1571
msgid ""
1568
1572
" Renames are always followed by log. By design, there is no need to\n"
1569
1573
" explicitly ask for this (and no way to stop logging a file back\n"
1570
1574
" until it was last renamed)."
1571
1575
msgstr ""
1572
1576
1573
#: bzrlib/builtins.py:2585
1577
#: bzrlib/builtins.py:2604
1574
1578
msgid ":Other filtering:"
1575
1579
msgstr ""
1576
1580
1577
#: bzrlib/builtins.py:2587
1581
#: bzrlib/builtins.py:2606
1578
1582
msgid ""
1579
1583
" The --match option can be used for finding revisions that match a\n"
1580
1584
" regular expression in a commit message, committer, author or bug.\n"
1583
1587
" --match-message can be used to only match a specific field."
1584
1588
msgstr ""
1585
1589
1586
#: bzrlib/builtins.py:2593
1590
#: bzrlib/builtins.py:2612
1587
1591
msgid ":Tips & tricks:"
1588
1592
msgstr ""
1589
1593
1590
#: bzrlib/builtins.py:2595
1594
#: bzrlib/builtins.py:2614
1591
1595
msgid ""
1592
1596
" GUI tools and IDEs are often better at exploring history than command\n"
1593
1597
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1596
1600
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1597
1601
msgstr ""
1598
1602
1599
#: bzrlib/builtins.py:2601
1603
#: bzrlib/builtins.py:2620
1600
1604
msgid ""
1601
1605
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1602
1606
msgstr ""
1603
1607
1604
#: bzrlib/builtins.py:2603
1608
#: bzrlib/builtins.py:2622
1605
1609
msgid ""
1606
1610
" [ALIASES]\n"
1607
1611
" tip = log -r-1\n"
1609
1613
" show = log -v -p"
1610
1614
msgstr ""
1611
1615
1612
#: bzrlib/builtins.py:2608
1616
#: bzrlib/builtins.py:2627
1613
1617
msgid ""
1614
1618
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1615
1619
" will show the last 10 mainline revisions. To see the details of a\n"
1616
1620
" particular revision X, ``bzr show -rX``."
1617
1621
msgstr ""
1618
1622
1619
#: bzrlib/builtins.py:2612
1623
#: bzrlib/builtins.py:2631
1620
1624
msgid ""
1621
1625
" If you are interested in looking deeper into a particular merge X,\n"
1622
1626
" use ``bzr log -n0 -rX``."
1623
1627
msgstr ""
1624
1628
1625
#: bzrlib/builtins.py:2615
1629
#: bzrlib/builtins.py:2634
1626
1630
msgid ""
1627
1631
" ``bzr log -v`` on a branch with lots of history is currently\n"
1628
1632
" very slow. A fix for this issue is currently under development.\n"
1630
1634
" be given when using the -v option."
1631
1635
msgstr ""
1632
1636
1633
#: bzrlib/builtins.py:2620
1637
#: bzrlib/builtins.py:2639
1634
1638
msgid ""
1635
1639
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1636
1640
" used to find revisions matching user names, commit messages, etc.\n"
1638
1642
" a list of words but not others."
1639
1643
msgstr ""
1640
1644
1641
#: bzrlib/builtins.py:2625
1645
#: bzrlib/builtins.py:2644
1642
1646
msgid ""
1643
1647
" When exploring non-mainline history on large projects with deep\n"
1644
1648
" history, the performance of log can be greatly improved by installing\n"
1646
1650
" trading disk space for faster speed."
1647
1651
msgstr ""
1648
1652
1649
#: bzrlib/builtins.py:2634
1653
#: bzrlib/builtins.py:2653
1650
1654
msgid "Show from oldest to newest."
1651
1655
msgstr ""
1652
1656
1653
#: bzrlib/builtins.py:2637
1657
#: bzrlib/builtins.py:2656
1654
1658
msgid "Show files changed in each revision."
1655
1659
msgstr ""
1656
1660
1657
#: bzrlib/builtins.py:2643
1661
#: bzrlib/builtins.py:2662
1658
1662
msgid "Show just the specified revision. See also \"help revisionspec\"."
1659
1663
msgstr ""
1660
1664
1661
#: bzrlib/builtins.py:2647
1665
#: bzrlib/builtins.py:2666
1662
1666
msgid "What names to list as authors - first, all or committer."
1663
1667
msgstr ""
1664
1668
1665
#: bzrlib/builtins.py:2648
1669
#: bzrlib/builtins.py:2667
1666
1670
msgid "Authors"
1667
1671
msgstr ""
1668
1672
1669
#: bzrlib/builtins.py:2653
1673
#: bzrlib/builtins.py:2672
1670
1674
msgid "Number of levels to display - 0 for all, 1 for flat."
1671
1675
msgstr ""
1672
1676
1673
#: bzrlib/builtins.py:2663
1677
#: bzrlib/builtins.py:2682
1674
1678
msgid "Limit the output to the first N revisions."
1675
1679
msgstr ""
1676
1680
1677
#: bzrlib/builtins.py:2668
1681
#: bzrlib/builtins.py:2687
1678
1682
msgid "Show changes made in each revision as a patch."
1679
1683
msgstr ""
1680
1684
1681
#: bzrlib/builtins.py:2670
1685
#: bzrlib/builtins.py:2689
1682
1686
msgid "Show merged revisions like --levels 0 does."
1683
1687
msgstr ""
1684
1688
1685
#: bzrlib/builtins.py:2674
1689
#: bzrlib/builtins.py:2693
1686
1690
msgid "Do not report commits with more than one parent."
1687
1691
msgstr ""
1688
1692
1689
#: bzrlib/builtins.py:2676
1693
#: bzrlib/builtins.py:2695
1690
1694
msgid ""
1691
1695
"Display only the revisions that are not part of both ancestries (require -"
1692
1696
"rX..Y)."
1693
1697
msgstr ""
1694
1698
1695
#: bzrlib/builtins.py:2680
1699
#: bzrlib/builtins.py:2699
1696
1700
msgid "Show digital signature validity."
1697
1701
msgstr ""
1698
1702
1699
#: bzrlib/builtins.py:2683
1703
#: bzrlib/builtins.py:2702
1700
1704
msgid "Show revisions whose properties match this expression."
1701
1705
msgstr ""
1702
1706
1703
#: bzrlib/builtins.py:2687
1707
#: bzrlib/builtins.py:2706
1704
1708
msgid "Show revisions whose message matches this expression."
1705
1709
msgstr ""
1706
1710
1707
#: bzrlib/builtins.py:2691
1711
#: bzrlib/builtins.py:2710
1708
1712
msgid "Show revisions whose committer matches this expression."
1709
1713
msgstr ""
1710
1714
1711
#: bzrlib/builtins.py:2695
1715
#: bzrlib/builtins.py:2714
1712
1716
msgid "Show revisions whose authors match this expression."
1713
1717
msgstr ""
1714
1718
1715
#: bzrlib/builtins.py:2699
1719
#: bzrlib/builtins.py:2718
1716
1720
msgid "Show revisions whose bugs match this expression."
1717
1721
msgstr ""
1718
1722
1719
#: bzrlib/builtins.py:2753
1723
#: bzrlib/builtins.py:2772
1720
1724
msgid "--exclude-common-ancestry requires -r with two revisions"
1721
1725
msgstr ""
1722
1726
1723
#: bzrlib/builtins.py:2781
1727
#: bzrlib/builtins.py:2800
1724
1728
#, python-format
1725
1729
msgid "Path unknown at end or start of revision range: %s"
1726
1730
msgstr ""
1727
1731
1728
#: bzrlib/builtins.py:2898
1732
#: bzrlib/builtins.py:2917
1729
1733
#, python-format
1730
1734
msgid "bzr %s doesn't accept two revisions in different branches."
1731
1735
msgstr ""
1732
1736
1733
#: bzrlib/builtins.py:2914
1737
#: bzrlib/builtins.py:2933
1734
1738
#, python-format
1735
1739
msgid "bzr %s --revision takes one or two values."
1736
1740
msgstr ""
1737
1741
1738
#: bzrlib/builtins.py:2959
1742
#: bzrlib/builtins.py:2978
1739
1743
msgid ""
1740
1744
"List files in a tree.\n"
1741
1745
" "
1742
1746
msgstr ""
1743
1747
1744
#: bzrlib/builtins.py:2968
1748
#: bzrlib/builtins.py:2987
1745
1749
msgid "Recurse into subdirectories."
1746
1750
msgstr ""
1747
1751
1748
#: bzrlib/builtins.py:2970
1752
#: bzrlib/builtins.py:2989
1749
1753
msgid "Print paths relative to the root of the branch."
1750
1754
msgstr ""
1751
1755
1752
#: bzrlib/builtins.py:2972
1756
#: bzrlib/builtins.py:2991
1753
1757
msgid "Print unknown files."
1754
1758
msgstr ""
1755
1759
1756
#: bzrlib/builtins.py:2973
1760
#: bzrlib/builtins.py:2992
1757
1761
msgid "Print versioned files."
1758
1762
msgstr ""
1759
1763
1760
#: bzrlib/builtins.py:2976
1764
#: bzrlib/builtins.py:2995
1761
1765
msgid "Print ignored files."
1762
1766
msgstr ""
1763
1767
1764
#: bzrlib/builtins.py:2978
1768
#: bzrlib/builtins.py:2997
1765
1769
msgid "List entries of a particular kind: file, directory, symlink."
1766
1770
msgstr ""
1767
1771
1768
#: bzrlib/builtins.py:2991
1772
#: bzrlib/builtins.py:3010
1769
1773
msgid "invalid kind specified"
1770
1774
msgstr ""
1771
1775
1772
#: bzrlib/builtins.py:2994
1776
#: bzrlib/builtins.py:3013
1773
1777
msgid "Cannot set both --verbose and --null"
1774
1778
msgstr ""
1775
1779
1776
#: bzrlib/builtins.py:3003
1780
#: bzrlib/builtins.py:3022
1777
1781
msgid "cannot specify both --from-root and PATH"
1778
1782
msgstr ""
1779
1783
1780
#: bzrlib/builtins.py:3090
1784
#: bzrlib/builtins.py:3109
1781
1785
msgid "Ignore specified files or patterns."
1782
1786
msgstr ""
1783
1787
1784
#: bzrlib/builtins.py:3092
1788
#: bzrlib/builtins.py:3111
1785
1789
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1786
1790
msgstr ""
1787
1791
1788
#: bzrlib/builtins.py:3094
1792
#: bzrlib/builtins.py:3113
1789
1793
msgid ""
1790
1794
"If a .bzrignore file does not exist, the ignore command\n"
1791
1795
"will create one and add the specified files or patterns to the newly\n"
1794
1798
"the use of the ignore command will require an explicit add command."
1795
1799
msgstr ""
1796
1800
1797
#: bzrlib/builtins.py:3100
1801
#: bzrlib/builtins.py:3119
1798
1802
msgid ""
1799
1803
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1800
1804
"After adding, editing or deleting that file either indirectly by\n"
1802
1806
"it."
1803
1807
msgstr ""
1804
1808
1805
#: bzrlib/builtins.py:3105
1809
#: bzrlib/builtins.py:3124
1806
1810
msgid ""
1807
1811
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1808
1812
"the global ignore file can be found in the application data directory as\n"
1811
1815
"can be edited directly using an editor."
1812
1816
msgstr ""
1813
1817
1814
#: bzrlib/builtins.py:3111
1818
#: bzrlib/builtins.py:3130
1815
1819
msgid ""
1816
1820
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1817
1821
"precedence over regular ignores. Such exceptions are used to specify\n"
1818
1822
"files that should be versioned which would otherwise be ignored."
1819
1823
msgstr ""
1820
1824
1821
#: bzrlib/builtins.py:3115
1825
#: bzrlib/builtins.py:3134
1822
1826
msgid ""
1823
1827
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1824
1828
"precedence over the '!' exception patterns."
1825
1829
msgstr ""
1826
1830
1827
#: bzrlib/builtins.py:3118
1831
#: bzrlib/builtins.py:3137
1828
1832
msgid ""
1829
1833
":Notes: \n"
1830
1834
" \n"
1832
1836
" the shell on Unix."
1833
1837
msgstr ""
1834
1838
1835
#: bzrlib/builtins.py:3123
1839
#: bzrlib/builtins.py:3142
1836
1840
msgid ""
1837
1841
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1838
1842
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1839
1843
msgstr ""
1840
1844
1841
#: bzrlib/builtins.py:3126
1845
#: bzrlib/builtins.py:3145
1842
1846
msgid ""
1843
1847
":Examples:\n"
1844
1848
" Ignore the top level Makefile::"
1845
1849
msgstr ""
1846
1850
1847
#: bzrlib/builtins.py:3129
1851
#: bzrlib/builtins.py:3148
1848
1852
msgid " bzr ignore ./Makefile"
1849
1853
msgstr ""
1850
1854
1851
#: bzrlib/builtins.py:3131
1855
#: bzrlib/builtins.py:3150
1852
1856
msgid " Ignore .class files in all directories...::"
1853
1857
msgstr ""
1854
1858
1855
#: bzrlib/builtins.py:3133
1859
#: bzrlib/builtins.py:3152
1856
1860
msgid " bzr ignore \"*.class\""
1857
1861
msgstr ""
1858
1862
1859
#: bzrlib/builtins.py:3135
1863
#: bzrlib/builtins.py:3154
1860
1864
msgid " ...but do not ignore \"special.class\"::"
1861
1865
msgstr ""
1862
1866
1863
#: bzrlib/builtins.py:3137
1867
#: bzrlib/builtins.py:3156
1864
1868
msgid " bzr ignore \"!special.class\""
1865
1869
msgstr ""
1866
1870
1867
#: bzrlib/builtins.py:3139
1871
#: bzrlib/builtins.py:3158
1868
1872
msgid " Ignore files whose name begins with the \"#\" character::"
1869
1873
msgstr ""
1870
1874
1871
#: bzrlib/builtins.py:3141
1875
#: bzrlib/builtins.py:3160
1872
1876
msgid " bzr ignore \"RE:^#\""
1873
1877
msgstr ""
1874
1878
1875
#: bzrlib/builtins.py:3143 bzrlib/builtins.py:3147
1879
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1876
1880
msgid " Ignore .o files under the lib directory::"
1877
1881
msgstr ""
1878
1882
1879
#: bzrlib/builtins.py:3145
1883
#: bzrlib/builtins.py:3164
1880
1884
msgid " bzr ignore \"lib/**/*.o\""
1881
1885
msgstr ""
1882
1886
1883
#: bzrlib/builtins.py:3149
1887
#: bzrlib/builtins.py:3168
1884
1888
msgid " bzr ignore \"RE:lib/.*\\.o\""
1885
1889
msgstr ""
1886
1890
1887
#: bzrlib/builtins.py:3151
1891
#: bzrlib/builtins.py:3170
1888
1892
msgid " Ignore everything but the \"debian\" toplevel directory::"
1889
1893
msgstr ""
1890
1894
1891
#: bzrlib/builtins.py:3153
1895
#: bzrlib/builtins.py:3172
1892
1896
msgid ""
1893
1897
" bzr ignore \"RE:(?!debian/).*\"\n"
1894
1898
" \n"
1900
1904
" bzr ignore \"!!*~\""
1901
1905
msgstr ""
1902
1906
1903
#: bzrlib/builtins.py:3167
1907
#: bzrlib/builtins.py:3186
1904
1908
msgid "Display the default ignore rules that bzr uses."
1905
1909
msgstr ""
1906
1910
1907
#: bzrlib/builtins.py:3179
1911
#: bzrlib/builtins.py:3198
1908
1912
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1909
1913
msgstr ""
1910
1914
1911
#: bzrlib/builtins.py:3190
1915
#: bzrlib/builtins.py:3209
1912
1916
#, python-format
1913
1917
msgid "Invalid ignore pattern found. %s"
1914
1918
msgid_plural "Invalid ignore patterns found. %s"
1915
1919
msgstr[0] ""
1916
1920
msgstr[1] ""
1917
1921
1918
#: bzrlib/builtins.py:3199
1922
#: bzrlib/builtins.py:3218
1919
1923
msgid "NAME_PATTERN should not be an absolute path"
1920
1924
msgstr ""
1921
1925
1922
#: bzrlib/builtins.py:3212
1926
#: bzrlib/builtins.py:3231
1923
1927
#, python-format
1924
1928
msgid ""
1925
1929
"Warning: the following files are version controlled and match your ignore "
1929
1933
"them.\n"
1930
1934
msgstr ""
1931
1935
1932
#: bzrlib/builtins.py:3219
1936
#: bzrlib/builtins.py:3238
1933
1937
msgid "List ignored files and the patterns that matched them."
1934
1938
msgstr ""
1935
1939
1936
#: bzrlib/builtins.py:3221
1940
#: bzrlib/builtins.py:3240
1937
1941
msgid ""
1938
1942
"List all the ignored files and the ignore pattern that caused the file to\n"
1939
1943
"be ignored."
1940
1944
msgstr ""
1941
1945
1942
#: bzrlib/builtins.py:3224
1946
#: bzrlib/builtins.py:3243
1943
1947
msgid "Alternatively, to list just the files::"
1944
1948
msgstr ""
1945
1949
1946
#: bzrlib/builtins.py:3226
1950
#: bzrlib/builtins.py:3245
1947
1951
msgid " bzr ls --ignored"
1948
1952
msgstr ""
1949
1953
1950
#: bzrlib/builtins.py:3260
1954
#: bzrlib/builtins.py:3279
1951
1955
#, python-format
1952
1956
msgid "not a valid revision-number: %r"
1953
1957
msgstr ""
1954
1958
1955
#: bzrlib/builtins.py:3267
1959
#: bzrlib/builtins.py:3286
1956
1960
msgid ""
1957
1961
"Export current or past revision to a destination directory or archive."
1958
1962
msgstr ""
1959
1963
1960
#: bzrlib/builtins.py:3269
1964
#: bzrlib/builtins.py:3288
1961
1965
msgid "If no revision is specified this exports the last committed revision."
1962
1966
msgstr ""
1963
1967
1964
#: bzrlib/builtins.py:3271
1968
#: bzrlib/builtins.py:3290
1965
1969
msgid ""
1966
1970
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1967
1971
"given, try to find the format with the extension. If no extension\n"
1968
1972
"is found exports to a directory (equivalent to --format=dir)."
1969
1973
msgstr ""
1970
1974
1971
#: bzrlib/builtins.py:3275
1975
#: bzrlib/builtins.py:3294
1972
1976
msgid ""
1973
1977
"If root is supplied, it will be used as the root directory inside\n"
1974
1978
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1975
1979
"to the exported filename. The root option has no effect for 'dir' format."
1976
1980
msgstr ""
1977
1981
1978
#: bzrlib/builtins.py:3279
1982
#: bzrlib/builtins.py:3298
1979
1983
msgid ""
1980
1984
"If branch is omitted then the branch containing the current working\n"
1981
1985
"directory will be used."
1982
1986
msgstr ""
1983
1987
1984
#: bzrlib/builtins.py:3282
1988
#: bzrlib/builtins.py:3301
1985
1989
msgid ""
1986
1990
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1987
1991
msgstr ""
1988
1992
1989
#: bzrlib/builtins.py:3284
1993
#: bzrlib/builtins.py:3303
1990
1994
msgid ""
1991
1995
" ================= =========================\n"
1992
1996
" Supported formats Autodetected by extension\n"
1999
2003
" ================= ========================="
2000
2004
msgstr ""
2001
2005
2002
#: bzrlib/builtins.py:3298
2006
#: bzrlib/builtins.py:3317
2003
2007
msgid "Type of file to export to."
2004
2008
msgstr ""
2005
2009
2006
#: bzrlib/builtins.py:3301
2010
#: bzrlib/builtins.py:3320
2007
2011
msgid "Apply content filters to export the convenient form."
2008
2012
msgstr ""
2009
2013
2010
#: bzrlib/builtins.py:3305
2014
#: bzrlib/builtins.py:3324
2011
2015
msgid "Name of the root directory inside the exported file."
2012
2016
msgstr ""
2013
2017
2014
#: bzrlib/builtins.py:3307
2018
#: bzrlib/builtins.py:3326
2015
2019
msgid ""
2016
2020
"Set modification time of files to that of the last revision in which it was "
2017
2021
"changed."
2018
2022
msgstr ""
2019
2023
2020
#: bzrlib/builtins.py:3310
2024
#: bzrlib/builtins.py:3329
2021
2025
msgid ""
2022
2026
"Export the working tree contents rather than that of the last revision."
2023
2027
msgstr ""
2024
2028
2025
#: bzrlib/builtins.py:3329
2029
#: bzrlib/builtins.py:3348
2026
2030
msgid "--uncommitted requires a working tree"
2027
2031
msgstr ""
2028
2032
2029
#: bzrlib/builtins.py:3338
2033
#: bzrlib/builtins.py:3357
2030
2034
#, python-format
2031
2035
msgid "Unsupported export format: %s"
2032
2036
msgstr ""
2033
2037
2034
#: bzrlib/builtins.py:3342
2038
#: bzrlib/builtins.py:3361
2035
2039
msgid ""
2036
2040
"Write the contents of a file as of a given revision to standard output."
2037
2041
msgstr ""
2038
2042
2039
#: bzrlib/builtins.py:3344
2043
#: bzrlib/builtins.py:3363
2040
2044
msgid "If no revision is nominated, the last revision is used."
2041
2045
msgstr ""
2042
2046
2043
#: bzrlib/builtins.py:3346
2047
#: bzrlib/builtins.py:3365
2044
2048
msgid ""
2045
2049
"Note: Take care to redirect standard output when using this command on a\n"
2046
2050
"binary file."
2047
2051
msgstr ""
2048
2052
2049
#: bzrlib/builtins.py:3352
2053
#: bzrlib/builtins.py:3371
2050
2054
msgid "The path name in the old tree."
2051
2055
msgstr ""
2052
2056
2053
#: bzrlib/builtins.py:3353
2057
#: bzrlib/builtins.py:3372
2054
2058
msgid "Apply content filters to display the convenience form."
2055
2059
msgstr ""
2056
2060
2057
#: bzrlib/builtins.py:3364
2061
#: bzrlib/builtins.py:3383
2058
2062
msgid "bzr cat --revision takes exactly one revision specifier"
2059
2063
msgstr ""
2060
2064
2061
#: bzrlib/builtins.py:3389 bzrlib/builtins.py:3401
2065
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2062
2066
msgid "{0!r} is not present in revision {1}"
2063
2067
msgstr ""
2064
2068
2065
#: bzrlib/builtins.py:3424
2069
#: bzrlib/builtins.py:3443
2066
2070
msgid "Commit changes into a new revision."
2067
2071
msgstr ""
2068
2072
2069
#: bzrlib/builtins.py:3426
2073
#: bzrlib/builtins.py:3445
2070
2074
msgid ""
2071
2075
"An explanatory message needs to be given for each commit. This is\n"
2072
2076
"often done by using the --message option (getting the message from the\n"
2076
2080
"boilerplate text loaded into the editor, use the --show-diff option."
2077
2081
msgstr ""
2078
2082
2079
#: bzrlib/builtins.py:3433
2083
#: bzrlib/builtins.py:3452
2080
2084
msgid ""
2081
2085
"By default, the entire tree is committed and the person doing the\n"
2082
2086
"commit is assumed to be the author. These defaults can be overridden\n"
2083
2087
"as explained below."
2084
2088
msgstr ""
2085
2089
2086
#: bzrlib/builtins.py:3437
2090
#: bzrlib/builtins.py:3456
2087
2091
msgid ":Selective commits:"
2088
2092
msgstr ""
2089
2093
2090
#: bzrlib/builtins.py:3439
2094
#: bzrlib/builtins.py:3458
2091
2095
msgid ""
2092
2096
" If selected files are specified, only changes to those files are\n"
2093
2097
" committed. If a directory is specified then the directory and\n"
2094
2098
" everything within it is committed."
2095
2099
msgstr ""
2096
2100
2097
#: bzrlib/builtins.py:3443
2101
#: bzrlib/builtins.py:3462
2098
2102
msgid ""
2099
2103
" When excludes are given, they take precedence over selected files.\n"
2100
2104
" For example, to commit only changes within foo, but not changes\n"
2101
2105
" within foo/bar::"
2102
2106
msgstr ""
2103
2107
2104
#: bzrlib/builtins.py:3447
2108
#: bzrlib/builtins.py:3466
2105
2109
msgid " bzr commit foo -x foo/bar"
2106
2110
msgstr ""
2107
2111
2108
#: bzrlib/builtins.py:3449
2112
#: bzrlib/builtins.py:3468
2109
2113
msgid " A selective commit after a merge is not yet supported."
2110
2114
msgstr ""
2111
2115
2112
#: bzrlib/builtins.py:3451
2116
#: bzrlib/builtins.py:3470
2113
2117
msgid ":Custom authors:"
2114
2118
msgstr ""
2115
2119
2116
#: bzrlib/builtins.py:3453
2120
#: bzrlib/builtins.py:3472
2117
2121
msgid ""
2118
2122
" If the author of the change is not the same person as the committer,\n"
2119
2123
" you can specify the author's name using the --author option. The\n"
2123
2127
" author."
2124
2128
msgstr ""
2125
2129
2126
#: bzrlib/builtins.py:3460
2130
#: bzrlib/builtins.py:3479
2127
2131
msgid ":Checks:"
2128
2132
msgstr ""
2129
2133
2130
#: bzrlib/builtins.py:3462
2134
#: bzrlib/builtins.py:3481
2131
2135
msgid ""
2132
2136
" A common mistake is to forget to add a new file or directory before\n"
2133
2137
" running the commit command. The --strict option checks for unknown\n"
2136
2140
" for details."
2137
2141
msgstr ""
2138
2142
2139
#: bzrlib/builtins.py:3468
2143
#: bzrlib/builtins.py:3487
2140
2144
msgid ":Things to note:"
2141
2145
msgstr ""
2142
2146
2143
#: bzrlib/builtins.py:3470
2147
#: bzrlib/builtins.py:3489
2144
2148
msgid ""
2145
2149
" If you accidentially commit the wrong changes or make a spelling\n"
2146
2150
" mistake in the commit message say, you can use the uncommit command\n"
2147
2151
" to undo it. See ``bzr help uncommit`` for details."
2148
2152
msgstr ""
2149
2153
2150
#: bzrlib/builtins.py:3474
2154
#: bzrlib/builtins.py:3493
2151
2155
msgid ""
2152
2156
" Hooks can also be configured to run after a commit. This allows you\n"
2153
2157
" to trigger updates to external systems like bug trackers. The --fixes\n"
2155
2159
" one or more bugs. See ``bzr help bugs`` for details."
2156
2160
msgstr ""
2157
2161
2158
#: bzrlib/builtins.py:3484
2162
#: bzrlib/builtins.py:3503
2159
2163
msgid "Do not consider changes made to a given path."
2160
2164
msgstr ""
2161
2165
2162
#: bzrlib/builtins.py:3487
2166
#: bzrlib/builtins.py:3506
2163
2167
msgid "Description of the new revision."
2164
2168
msgstr ""
2165
2169
2166
#: bzrlib/builtins.py:3490
2170
#: bzrlib/builtins.py:3509
2167
2171
msgid "Commit even if nothing has changed."
2168
2172
msgstr ""
2169
2173
2170
#: bzrlib/builtins.py:3494
2174
#: bzrlib/builtins.py:3513
2171
2175
msgid "Take commit message from this file."
2172
2176
msgstr ""
2173
2177
2174
#: bzrlib/builtins.py:3496
2178
#: bzrlib/builtins.py:3515
2175
2179
msgid "Refuse to commit if there are unknown files in the working tree."
2176
2180
msgstr ""
2177
2181
2178
#: bzrlib/builtins.py:3499
2182
#: bzrlib/builtins.py:3518
2179
2183
msgid ""
2180
2184
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2181
2185
"08:00:00 +0100'."
2182
2186
msgstr ""
2183
2187
2184
#: bzrlib/builtins.py:3502
2188
#: bzrlib/builtins.py:3521
2185
2189
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2186
2190
msgstr ""
2187
2191
2188
#: bzrlib/builtins.py:3505
2192
#: bzrlib/builtins.py:3524
2189
2193
msgid "Set the author's name, if it's different from the committer."
2190
2194
msgstr ""
2191
2195
2192
#: bzrlib/builtins.py:3508
2196
#: bzrlib/builtins.py:3527
2193
2197
msgid ""
2194
2198
"Perform a local commit in a bound branch. Local commits are not pushed to "
2195
2199
"the master branch until a normal commit is performed."
2196
2200
msgstr ""
2197
2201
2198
#: bzrlib/builtins.py:3514
2202
#: bzrlib/builtins.py:3533
2199
2203
msgid ""
2200
2204
"When no message is supplied, show the diff along with the status summary in "
2201
2205
"the message editor."
2202
2206
msgstr ""
2203
2207
2204
#: bzrlib/builtins.py:3517
2208
#: bzrlib/builtins.py:3536
2205
2209
msgid ""
2206
2210
"When committing to a foreign version control system do not push data that "
2207
2211
"can not be natively represented."
2208
2212
msgstr ""
2209
2213
2210
#: bzrlib/builtins.py:3535
2214
#: bzrlib/builtins.py:3554
2211
2215
#, python-format
2212
2216
msgid ""
2213
2217
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2215
2219
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2216
2220
msgstr ""
2217
2221
2218
#: bzrlib/builtins.py:3544
2222
#: bzrlib/builtins.py:3563
2219
2223
#, python-format
2220
2224
msgid ""
2221
2225
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2223
2227
"Commit refused."
2224
2228
msgstr ""
2225
2229
2226
#: bzrlib/builtins.py:3553
2230
#: bzrlib/builtins.py:3572
2227
2231
#, python-format
2228
2232
msgid "Unrecognized bug %s. Commit refused."
2229
2233
msgstr ""
2230
2234
2231
#: bzrlib/builtins.py:3556
2235
#: bzrlib/builtins.py:3575
2232
2236
#, python-format
2233
2237
msgid ""
2234
2238
"%s\n"
2235
2239
"Commit refused."
2236
2240
msgstr ""
2237
2241
2238
#: bzrlib/builtins.py:3580
2242
#: bzrlib/builtins.py:3599
2239
2243
msgid "Could not parse --commit-time: "
2240
2244
msgstr ""
2241
2245
2242
#: bzrlib/builtins.py:3620
2246
#: bzrlib/builtins.py:3639
2243
2247
msgid "please specify either --message or --file"
2244
2248
msgstr ""
2245
2249
2246
#: bzrlib/builtins.py:3649
2250
#: bzrlib/builtins.py:3668
2247
2251
msgid "please specify a commit message with either --message or --file"
2248
2252
msgstr ""
2249
2253
2250
#: bzrlib/builtins.py:3652
2254
#: bzrlib/builtins.py:3671
2251
2255
msgid ""
2252
2256
"Empty commit message specified. Please specify a commit message with either -"
2253
2257
"-message or --file or leave a blank message with --message \"\"."
2254
2258
msgstr ""
2255
2259
2256
#: bzrlib/builtins.py:3672
2260
#: bzrlib/builtins.py:3691
2257
2261
msgid ""
2258
2262
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2259
2263
"-unchanged to force an empty commit."
2260
2264
msgstr ""
2261
2265
2262
#: bzrlib/builtins.py:3676
2266
#: bzrlib/builtins.py:3695
2263
2267
msgid ""
2264
2268
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2265
2269
"resolve FILE\" to resolve."
2266
2270
msgstr ""
2267
2271
2268
#: bzrlib/builtins.py:3680
2272
#: bzrlib/builtins.py:3699
2269
2273
msgid "Commit refused because there are unknown files in the working tree."
2270
2274
msgstr ""
2271
2275
2272
#: bzrlib/builtins.py:3683
2276
#: bzrlib/builtins.py:3702
2273
2277
msgid ""
2274
2278
"\n"
2275
2279
"To commit to master branch, run update and then commit.\n"
2276
2280
"You can also pass --local to commit to continue working disconnected."
2277
2281
msgstr ""
2278
2282
2279
#: bzrlib/builtins.py:3691
2283
#: bzrlib/builtins.py:3710
2280
2284
msgid ""
2281
2285
"Validate working tree structure, branch consistency and repository history."
2282
2286
msgstr ""
2283
2287
2284
#: bzrlib/builtins.py:3693
2288
#: bzrlib/builtins.py:3712
2285
2289
msgid ""
2286
2290
"This command checks various invariants about branch and repository storage\n"
2287
2291
"to detect data corruption or bzr bugs."
2288
2292
msgstr ""
2289
2293
2290
#: bzrlib/builtins.py:3696
2294
#: bzrlib/builtins.py:3715
2291
2295
msgid ""
2292
2296
"The working tree and branch checks will only give output if a problem is\n"
2293
2297
"detected. The output fields of the repository check are:"
2294
2298
msgstr ""
2295
2299
2296
#: bzrlib/builtins.py:3699
2300
#: bzrlib/builtins.py:3718
2297
2301
msgid ""
2298
2302
"revisions\n"
2299
2303
" This is just the number of revisions checked. It doesn't\n"
2300
2304
" indicate a problem."
2301
2305
msgstr ""
2302
2306
2303
#: bzrlib/builtins.py:3703
2307
#: bzrlib/builtins.py:3722
2304
2308
msgid ""
2305
2309
"versionedfiles\n"
2306
2310
" This is just the number of versionedfiles checked. It\n"
2307
2311
" doesn't indicate a problem."
2308
2312
msgstr ""
2309
2313
2310
#: bzrlib/builtins.py:3707
2314
#: bzrlib/builtins.py:3726
2311
2315
msgid ""
2312
2316
"unreferenced ancestors\n"
2313
2317
" Texts that are ancestors of other texts, but\n"
2315
2319
" subtle problem that Bazaar can work around."
2316
2320
msgstr ""
2317
2321
2318
#: bzrlib/builtins.py:3712
2322
#: bzrlib/builtins.py:3731
2319
2323
msgid ""
2320
2324
"unique file texts\n"
2321
2325
" This is the total number of unique file contents\n"
2322
2326
" seen in the checked revisions. It does not indicate a problem."
2323
2327
msgstr ""
2324
2328
2325
#: bzrlib/builtins.py:3716
2329
#: bzrlib/builtins.py:3735
2326
2330
msgid ""
2327
2331
"repeated file texts\n"
2328
2332
" This is the total number of repeated texts seen\n"
2331
2335
" indicate a problem."
2332
2336
msgstr ""
2333
2337
2334
#: bzrlib/builtins.py:3722
2338
#: bzrlib/builtins.py:3741
2335
2339
msgid ""
2336
2340
"If no restrictions are specified, all Bazaar data that is found at the "
2337
2341
"given\n"
2338
2342
"location will be checked."
2339
2343
msgstr ""
2340
2344
2341
#: bzrlib/builtins.py:3727
2345
#: bzrlib/builtins.py:3746
2342
2346
msgid " Check the tree and branch at 'foo'::"
2343
2347
msgstr ""
2344
2348
2345
#: bzrlib/builtins.py:3729
2349
#: bzrlib/builtins.py:3748
2346
2350
msgid " bzr check --tree --branch foo"
2347
2351
msgstr ""
2348
2352
2349
#: bzrlib/builtins.py:3731
2353
#: bzrlib/builtins.py:3750
2350
2354
msgid " Check only the repository at 'bar'::"
2351
2355
msgstr ""
2352
2356
2353
#: bzrlib/builtins.py:3733
2357
#: bzrlib/builtins.py:3752
2354
2358
msgid " bzr check --repo bar"
2355
2359
msgstr ""
2356
2360
2357
#: bzrlib/builtins.py:3735
2361
#: bzrlib/builtins.py:3754
2358
2362
msgid " Check everything at 'baz'::"
2359
2363
msgstr ""
2360
2364
2361
#: bzrlib/builtins.py:3737
2365
#: bzrlib/builtins.py:3756
2362
2366
msgid " bzr check baz"
2363
2367
msgstr ""
2364
2368
2365
#: bzrlib/builtins.py:3743
2369
#: bzrlib/builtins.py:3762
2366
2370
msgid "Check the branch related to the current directory."
2367
2371
msgstr ""
2368
2372
2369
#: bzrlib/builtins.py:3745
2373
#: bzrlib/builtins.py:3764
2370
2374
msgid "Check the repository related to the current directory."
2371
2375
msgstr ""
2372
2376
2373
#: bzrlib/builtins.py:3747
2377
#: bzrlib/builtins.py:3766
2374
2378
msgid "Check the working tree related to the current directory."
2375
2379
msgstr ""
2376
2380
2377
#: bzrlib/builtins.py:3761
2381
#: bzrlib/builtins.py:3780
2378
2382
msgid "Upgrade a repository, branch or working tree to a newer format."
2379
2383
msgstr ""
2380
2384
2381
#: bzrlib/builtins.py:3763
2385
#: bzrlib/builtins.py:3782
2382
2386
msgid ""
2383
2387
"When the default format has changed after a major new release of\n"
2384
2388
"Bazaar, you may be informed during certain operations that you\n"
2387
2391
"with older repositories or with older versions of Bazaar."
2388
2392
msgstr ""
2389
2393
2390
#: bzrlib/builtins.py:3769
2394
#: bzrlib/builtins.py:3788
2391
2395
msgid ""
2392
2396
"If you wish to upgrade to a particular format rather than the\n"
2393
2397
"current default, that can be specified using the --format option.\n"
2397
2401
"2.x default) so downgrading is not always possible."
2398
2402
msgstr ""
2399
2403
2400
#: bzrlib/builtins.py:3776
2404
#: bzrlib/builtins.py:3795
2401
2405
msgid ""
2402
2406
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2403
2407
"process (where # is a number). By default, this is left there on\n"
2408
2412
"afterwards."
2409
2413
msgstr ""
2410
2414
2411
#: bzrlib/builtins.py:3784
2415
#: bzrlib/builtins.py:3803
2412
2416
msgid ""
2413
2417
"If the location given is a shared repository, dependent branches\n"
2414
2418
"are also converted provided the repository converts successfully.\n"
2416
2420
"tried."
2417
2421
msgstr ""
2418
2422
2419
#: bzrlib/builtins.py:3789
2423
#: bzrlib/builtins.py:3808
2420
2424
msgid ""
2421
2425
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2422
2426
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2423
2427
msgstr ""
2424
2428
2425
#: bzrlib/builtins.py:3797
2429
#: bzrlib/builtins.py:3816
2426
2430
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2427
2431
msgstr ""
2428
2432
2429
#: bzrlib/builtins.py:3801
2433
#: bzrlib/builtins.py:3820
2430
2434
msgid "Branch format"
2431
2435
msgstr ""
2432
2436
2433
#: bzrlib/builtins.py:3803
2437
#: bzrlib/builtins.py:3822
2434
2438
msgid "Remove the backup.bzr directory if successful."
2435
2439
msgstr ""
2436
2440
2437
#: bzrlib/builtins.py:3805
2441
#: bzrlib/builtins.py:3824
2438
2442
msgid "Show what would be done, but don't actually do anything."
2439
2443
msgstr ""
2440
2444
2441
#: bzrlib/builtins.py:3820
2445
#: bzrlib/builtins.py:3839
2442
2446
msgid "Show or set bzr user id."
2443
2447
msgstr ""
2444
2448
2445
#: bzrlib/builtins.py:3822
2449
#: bzrlib/builtins.py:3841
2446
2450
msgid ""
2447
2451
":Examples:\n"
2448
2452
" Show the email of the current user::"
2449
2453
msgstr ""
2450
2454
2451
#: bzrlib/builtins.py:3825
2455
#: bzrlib/builtins.py:3844
2452
2456
msgid " bzr whoami --email"
2453
2457
msgstr ""
2454
2458
2455
#: bzrlib/builtins.py:3827
2459
#: bzrlib/builtins.py:3846
2456
2460
msgid " Set the current user::"
2457
2461
msgstr ""
2458
2462
2459
#: bzrlib/builtins.py:3829
2463
#: bzrlib/builtins.py:3848
2460
2464
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2461
2465
msgstr ""
2462
2466
2463
#: bzrlib/builtins.py:3833
2467
#: bzrlib/builtins.py:3852
2464
2468
msgid "Display email address only."
2465
2469
msgstr ""
2466
2470
2467
#: bzrlib/builtins.py:3835
2471
#: bzrlib/builtins.py:3854
2468
2472
msgid "Set identity for the current branch instead of globally."
2469
2473
msgstr ""
2470
2474
2471
#: bzrlib/builtins.py:3861
2475
#: bzrlib/builtins.py:3880
2472
2476
msgid "--email can only be used to display existing identity"
2473
2477
msgstr ""
2474
2478
2475
#: bzrlib/builtins.py:3885
2479
#: bzrlib/builtins.py:3904
2476
2480
msgid "Print or set the branch nickname."
2477
2481
msgstr ""
2478
2482
2479
#: bzrlib/builtins.py:3887
2483
#: bzrlib/builtins.py:3906
2480
2484
msgid ""
2481
2485
"If unset, the colocated branch name is used for colocated branches, and\n"
2482
2486
"the branch directory name is used for other branches. To print the\n"
2483
2487
"current nickname, execute with no argument."
2484
2488
msgstr ""
2485
2489
2486
#: bzrlib/builtins.py:3891
2490
#: bzrlib/builtins.py:3910
2487
2491
msgid ""
2488
2492
"Bound branches use the nickname of its master branch unless it is set\n"
2489
2493
"locally."
2490
2494
msgstr ""
2491
2495
2492
#: bzrlib/builtins.py:3911
2496
#: bzrlib/builtins.py:3930
2493
2497
msgid "Set/unset and display aliases."
2494
2498
msgstr ""
2495
2499
2496
#: bzrlib/builtins.py:3913
2500
#: bzrlib/builtins.py:3932
2497
2501
msgid ""
2498
2502
":Examples:\n"
2499
2503
" Show the current aliases::"
2500
2504
msgstr ""
2501
2505
2502
#: bzrlib/builtins.py:3916
2506
#: bzrlib/builtins.py:3935
2503
2507
msgid " bzr alias"
2504
2508
msgstr ""
2505
2509
2506
#: bzrlib/builtins.py:3918
2510
#: bzrlib/builtins.py:3937
2507
2511
msgid " Show the alias specified for 'll'::"
2508
2512
msgstr ""
2509
2513
2510
#: bzrlib/builtins.py:3920
2514
#: bzrlib/builtins.py:3939
2511
2515
msgid " bzr alias ll"
2512
2516
msgstr ""
2513
2517
2514
#: bzrlib/builtins.py:3922
2518
#: bzrlib/builtins.py:3941
2515
2519
msgid " Set an alias for 'll'::"
2516
2520
msgstr ""
2517
2521
2518
#: bzrlib/builtins.py:3924
2522
#: bzrlib/builtins.py:3943
2519
2523
msgid " bzr alias ll=\"log --line -r-10..-1\""
2520
2524
msgstr ""
2521
2525
2522
#: bzrlib/builtins.py:3926
2526
#: bzrlib/builtins.py:3945
2523
2527
msgid " To remove an alias for 'll'::"
2524
2528
msgstr ""
2525
2529
2526
#: bzrlib/builtins.py:3928
2530
#: bzrlib/builtins.py:3947
2527
2531
msgid " bzr alias --remove ll"
2528
2532
msgstr ""
2529
2533
2530
#: bzrlib/builtins.py:3933
2534
#: bzrlib/builtins.py:3952
2531
2535
msgid "Remove the alias."
2532
2536
msgstr ""
2533
2537
2534
#: bzrlib/builtins.py:3951
2538
#: bzrlib/builtins.py:3970
2535
2539
msgid "bzr alias --remove expects an alias to remove."
2536
2540
msgstr ""
2537
2541
2538
#: bzrlib/builtins.py:4132
2542
#: bzrlib/builtins.py:4151
2539
2543
msgid ""
2540
2544
"subunit not available. subunit needs to be installed to use --subunit."
2541
2545
msgstr ""
2542
2546
2543
#: bzrlib/builtins.py:4149
2547
#: bzrlib/builtins.py:4168
2544
2548
msgid ""
2545
2549
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2546
2550
msgstr ""
2547
2551
2548
#: bzrlib/builtins.py:4196
2552
#: bzrlib/builtins.py:4215
2549
2553
msgid "Show version of bzr."
2550
2554
msgstr ""
2551
2555
2552
#: bzrlib/builtins.py:4200
2556
#: bzrlib/builtins.py:4219
2553
2557
msgid "Print just the version number."
2554
2558
msgstr ""
2555
2559
2556
#: bzrlib/builtins.py:4219
2560
#: bzrlib/builtins.py:4238
2557
2561
msgid "It sure does!\n"
2558
2562
msgstr ""
2559
2563
2560
#: bzrlib/builtins.py:4243
2564
#: bzrlib/builtins.py:4262
2561
2565
#, python-format
2562
2566
msgid "merge base is revision %s\n"
2563
2567
msgstr ""
2564
2568
2565
#: bzrlib/builtins.py:4247
2569
#: bzrlib/builtins.py:4266
2566
2570
msgid "Perform a three-way merge."
2567
2571
msgstr ""
2568
2572
2569
#: bzrlib/builtins.py:4249
2573
#: bzrlib/builtins.py:4268
2570
2574
msgid ""
2571
2575
"The source of the merge can be specified either in the form of a branch,\n"
2572
2576
"or in the form of a path to a file containing a merge directive generated\n"
2577
2581
"the current working tree."
2578
2582
msgstr ""
2579
2583
2580
#: bzrlib/builtins.py:4257
2584
#: bzrlib/builtins.py:4276
2581
2585
msgid ""
2582
2586
"When merging from a branch, by default bzr will try to merge in all new\n"
2583
2587
"work from the other branch, automatically determining an appropriate base\n"
2584
2588
"revision. If this fails, you may need to give an explicit base."
2585
2589
msgstr ""
2586
2590
2587
#: bzrlib/builtins.py:4261
2591
#: bzrlib/builtins.py:4280
2588
2592
msgid ""
2589
2593
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2590
2594
"try to merge in all new work up to and including revision OTHER."
2591
2595
msgstr ""
2592
2596
2593
#: bzrlib/builtins.py:4264
2597
#: bzrlib/builtins.py:4283
2594
2598
msgid ""
2595
2599
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2596
2600
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2601
2605
"changes from the other branch is not stored in the commit."
2602
2606
msgstr ""
2603
2607
2604
#: bzrlib/builtins.py:4272
2608
#: bzrlib/builtins.py:4291
2605
2609
msgid "Revision numbers are always relative to the source branch."
2606
2610
msgstr ""
2607
2611
2608
#: bzrlib/builtins.py:4274 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2612
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2609
2613
msgid ""
2610
2614
"Merge will do its best to combine the changes in two branches, but there\n"
2611
2615
"are some kinds of problems only a human can fix. When it encounters those,\n"
2613
2617
"before you can commit."
2614
2618
msgstr ""
2615
2619
2616
#: bzrlib/builtins.py:4279
2620
#: bzrlib/builtins.py:4298
2617
2621
msgid ""
2618
2622
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2619
2623
msgstr ""
2620
2624
2621
#: bzrlib/builtins.py:4281
2625
#: bzrlib/builtins.py:4300
2622
2626
msgid ""
2623
2627
"If there is no default branch set, the first merge will set it (use\n"
2624
2628
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2626
2630
"only be saved if the remote location can be accessed."
2627
2631
msgstr ""
2628
2632
2629
#: bzrlib/builtins.py:4286
2633
#: bzrlib/builtins.py:4305
2630
2634
msgid ""
2631
2635
"The results of the merge are placed into the destination working\n"
2632
2636
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2633
2637
"committed to record the result of the merge."
2634
2638
msgstr ""
2635
2639
2636
#: bzrlib/builtins.py:4290
2640
#: bzrlib/builtins.py:4309
2637
2641
msgid ""
2638
2642
"merge refuses to run if there are any uncommitted changes, unless\n"
2639
2643
"--force is given. If --force is given, then the changes from the source \n"
2642
2646
"merge revision which has more than two parents."
2643
2647
msgstr ""
2644
2648
2645
#: bzrlib/builtins.py:4296
2649
#: bzrlib/builtins.py:4315
2646
2650
msgid ""
2647
2651
"If one would like to merge changes from the working tree of the other\n"
2648
2652
"branch without merging any committed revisions, the --uncommitted option\n"
2649
2653
"can be given."
2650
2654
msgstr ""
2651
2655
2652
#: bzrlib/builtins.py:4300
2656
#: bzrlib/builtins.py:4319
2653
2657
msgid ""
2654
2658
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2655
2659
"you to apply each diff hunk and file change, similar to \"shelve\"."
2656
2660
msgstr ""
2657
2661
2658
#: bzrlib/builtins.py:4303
2662
#: bzrlib/builtins.py:4322
2659
2663
msgid ""
2660
2664
":Examples:\n"
2661
2665
" To merge all new revisions from bzr.dev::"
2662
2666
msgstr ""
2663
2667
2664
#: bzrlib/builtins.py:4306
2668
#: bzrlib/builtins.py:4325
2665
2669
msgid " bzr merge ../bzr.dev"
2666
2670
msgstr ""
2667
2671
2668
#: bzrlib/builtins.py:4308
2672
#: bzrlib/builtins.py:4327
2669
2673
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2670
2674
msgstr ""
2671
2675
2672
#: bzrlib/builtins.py:4310
2676
#: bzrlib/builtins.py:4329
2673
2677
msgid " bzr merge -r 82 ../bzr.dev"
2674
2678
msgstr ""
2675
2679
2676
#: bzrlib/builtins.py:4312
2680
#: bzrlib/builtins.py:4331
2677
2681
msgid " To merge the changes introduced by 82, without previous changes::"
2678
2682
msgstr ""
2679
2683
2680
#: bzrlib/builtins.py:4314
2684
#: bzrlib/builtins.py:4333
2681
2685
msgid " bzr merge -r 81..82 ../bzr.dev"
2682
2686
msgstr ""
2683
2687
2684
#: bzrlib/builtins.py:4316
2688
#: bzrlib/builtins.py:4335
2685
2689
msgid " To apply a merge directive contained in /tmp/merge::"
2686
2690
msgstr ""
2687
2691
2688
#: bzrlib/builtins.py:4318
2692
#: bzrlib/builtins.py:4337
2689
2693
msgid " bzr merge /tmp/merge"
2690
2694
msgstr ""
2691
2695
2692
#: bzrlib/builtins.py:4320
2696
#: bzrlib/builtins.py:4339
2693
2697
msgid ""
2694
2698
" To create a merge revision with three parents from two branches\n"
2695
2699
" feature1a and feature1b:"
2696
2700
msgstr ""
2697
2701
2698
#: bzrlib/builtins.py:4323
2702
#: bzrlib/builtins.py:4342
2699
2703
msgid ""
2700
2704
" bzr merge ../feature1a\n"
2701
2705
" bzr merge ../feature1b --force\n"
2702
2706
" bzr commit -m 'revision with three parents'"
2703
2707
msgstr ""
2704
2708
2705
#: bzrlib/builtins.py:4335
2709
#: bzrlib/builtins.py:4354
2706
2710
msgid "Merge even if the destination tree has uncommitted changes."
2707
2711
msgstr ""
2708
2712
2709
#: bzrlib/builtins.py:4341
2713
#: bzrlib/builtins.py:4360
2710
2714
msgid ""
2711
2715
"Apply uncommitted changes from a working copy, instead of branch changes."
2712
2716
msgstr ""
2713
2717
2714
#: bzrlib/builtins.py:4343
2718
#: bzrlib/builtins.py:4362
2715
2719
msgid ""
2716
2720
"If the destination is already completely merged into the source, pull from "
2717
2721
"the source rather than merging. When this happens, you do not need to "
2718
2722
"commit the result."
2719
2723
msgstr ""
2720
2724
2721
#: bzrlib/builtins.py:4348
2725
#: bzrlib/builtins.py:4367
2722
2726
msgid ""
2723
2727
"Branch to merge into, rather than the one containing the working directory."
2724
2728
msgstr ""
2725
2729
2726
#: bzrlib/builtins.py:4350
2730
#: bzrlib/builtins.py:4369
2727
2731
msgid "Instead of merging, show a diff of the merge."
2728
2732
msgstr ""
2729
2733
2730
#: bzrlib/builtins.py:4352
2734
#: bzrlib/builtins.py:4371
2731
2735
msgid "Select changes interactively."
2732
2736
msgstr ""
2733
2737
2734
#: bzrlib/builtins.py:4374
2738
#: bzrlib/builtins.py:4393
2735
2739
msgid ""
2736
2740
"Merging into empty branches not currently supported, "
2737
2741
"https://bugs.launchpad.net/bzr/+bug/308562"
2738
2742
msgstr ""
2739
2743
2740
#: bzrlib/builtins.py:4401
2744
#: bzrlib/builtins.py:4420
2741
2745
msgid "Cannot use --uncommitted with bundles or merge directives."
2742
2746
msgstr ""
2743
2747
2744
#: bzrlib/builtins.py:4412
2748
#: bzrlib/builtins.py:4431
2745
2749
msgid "Cannot use --uncommitted and --revision at the same time."
2746
2750
msgstr ""
2747
2751
2748
#: bzrlib/builtins.py:4432
2752
#: bzrlib/builtins.py:4451
2749
2753
msgid "merger: "
2750
2754
msgstr ""
2751
2755
2752
#: bzrlib/builtins.py:4434 bzrlib/bundle/apply_bundle.py:71
2756
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2753
2757
msgid "Nothing to do."
2754
2758
msgstr ""
2755
2759
2756
#: bzrlib/builtins.py:4438
2760
#: bzrlib/builtins.py:4457
2757
2761
msgid "Cannot pull individual files"
2758
2762
msgstr ""
2759
2763
2760
#: bzrlib/builtins.py:4446
2764
#: bzrlib/builtins.py:4465
2761
2765
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2762
2766
msgstr ""
2763
2767
2764
#: bzrlib/builtins.py:4504
2768
#: bzrlib/builtins.py:4523
2765
2769
#, python-format
2766
2770
msgid "Show-base is not supported for this merge type. %s"
2767
2771
msgstr ""
2768
2772
2769
#: bzrlib/builtins.py:4513
2773
#: bzrlib/builtins.py:4532
2770
2774
#, python-format
2771
2775
msgid "Conflict reduction is not supported for merge type %s."
2772
2776
msgstr ""
2773
2777
2774
#: bzrlib/builtins.py:4517
2778
#: bzrlib/builtins.py:4536
2775
2779
msgid "Cannot do conflict reduction and show base."
2776
2780
msgstr ""
2777
2781
2778
#: bzrlib/builtins.py:4628
2782
#: bzrlib/builtins.py:4647
2779
2783
msgid "No location specified or remembered"
2780
2784
msgstr ""
2781
2785
2782
#: bzrlib/builtins.py:4630
2786
#: bzrlib/builtins.py:4649
2783
2787
msgid "{0} remembered {1} location {2}"
2784
2788
msgstr ""
2785
2789
2786
#: bzrlib/builtins.py:4636
2790
#: bzrlib/builtins.py:4655
2787
2791
msgid "Redo a merge."
2788
2792
msgstr ""
2789
2793
2790
#: bzrlib/builtins.py:4638
2794
#: bzrlib/builtins.py:4657
2791
2795
msgid ""
2792
2796
"Use this if you want to try a different merge technique while resolving\n"
2793
2797
"conflicts. Some merge techniques are better than others, and remerge\n"
2794
2798
"lets you try different ones on different files."
2795
2799
msgstr ""
2796
2800
2797
#: bzrlib/builtins.py:4642
2801
#: bzrlib/builtins.py:4661
2798
2802
msgid ""
2799
2803
"The options for remerge have the same meaning and defaults as the ones for\n"
2800
2804
"merge. The difference is that remerge can (only) be run when there is a\n"
2801
2805
"pending merge, and it lets you specify particular files."
2802
2806
msgstr ""
2803
2807
2804
#: bzrlib/builtins.py:4646
2808
#: bzrlib/builtins.py:4665
2805
2809
msgid ""
2806
2810
":Examples:\n"
2807
2811
" Re-do the merge of all conflicted files, and show the base text in\n"
2808
2812
" conflict regions, in addition to the usual THIS and OTHER texts::"
2809
2813
msgstr ""
2810
2814
2811
#: bzrlib/builtins.py:4650
2815
#: bzrlib/builtins.py:4669
2812
2816
msgid " bzr remerge --show-base"
2813
2817
msgstr ""
2814
2818
2815
#: bzrlib/builtins.py:4652
2819
#: bzrlib/builtins.py:4671
2816
2820
msgid ""
2817
2821
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2818
2822
" additional processing to reduce the size of conflict regions::"
2819
2823
msgstr ""
2820
2824
2821
#: bzrlib/builtins.py:4655
2825
#: bzrlib/builtins.py:4674
2822
2826
msgid " bzr remerge --merge-type weave --reprocess foobar"
2823
2827
msgstr ""
2824
2828
2825
#: bzrlib/builtins.py:4662
2829
#: bzrlib/builtins.py:4681
2826
2830
msgid "Show base revision text in conflicts."
2827
2831
msgstr ""
2828
2832
2829
#: bzrlib/builtins.py:4674
2833
#: bzrlib/builtins.py:4693
2830
2834
msgid ""
2831
2835
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2832
2836
"merges."
2833
2837
msgstr ""
2834
2838
2835
#: bzrlib/builtins.py:4731
2836
msgid "Revert files to a previous revision."
2839
#: bzrlib/builtins.py:4751
2840
msgid ""
2841
"Set files in the working tree back to the contents of a previous revision."
2837
2842
msgstr ""
2838
2843
2839
#: bzrlib/builtins.py:4733
2844
#: bzrlib/builtins.py:4753
2840
2845
msgid ""
2841
2846
"Giving a list of files will revert only those files. Otherwise, all files\n"
2842
2847
"will be reverted. If the revision is not specified with '--revision', the\n"
2843
"last committed revision is used."
2848
"working tree basis revision is used. A revert operation affects only the\n"
2849
"working tree, not any revision history like the branch and repository or\n"
2850
"the working tree basis revision."
2844
2851
msgstr ""
2845
2852
2846
#: bzrlib/builtins.py:4737
2853
#: bzrlib/builtins.py:4759
2847
2854
msgid ""
2848
2855
"To remove only some changes, without reverting to a prior version, use\n"
2849
2856
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2850
2857
"will remove the changes introduced by the second last commit (-2), without\n"
2851
2858
"affecting the changes introduced by the last commit (-1). To remove\n"
2852
"certain changes on a hunk-by-hunk basis, see the shelve command."
2859
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2860
"To update the branch to a specific revision or the latest revision and\n"
2861
"update the working tree accordingly while preserving local changes, see the\n"
2862
"update command."
2853
2863
msgstr ""
2854
2864
2855
#: bzrlib/builtins.py:4743
2865
#: bzrlib/builtins.py:4768
2856
2866
msgid ""
2857
"By default, any files that have been manually changed will be backed up\n"
2858
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2859
"'.~#~' appended to their name, where # is a number."
2867
"Uncommitted changes to files that are reverted will be discarded.\n"
2868
"Howver, by default, any files that have been manually changed will be\n"
2869
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2870
"files have '.~#~' appended to their name, where # is a number."
2860
2871
msgstr ""
2861
2872
2862
#: bzrlib/builtins.py:4747
2873
#: bzrlib/builtins.py:4773
2863
2874
msgid ""
2864
2875
"When you provide files, you can use their current pathname or the pathname\n"
2865
2876
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2867
2878
"reverted."
2868
2879
msgstr ""
2869
2880
2870
#: bzrlib/builtins.py:4752
2881
#: bzrlib/builtins.py:4778
2871
2882
msgid ""
2872
2883
"If you have newly added files since the target revision, they will be\n"
2873
2884
"removed. If the files to be removed have been changed, backups will be\n"
2875
2886
"deleted."
2876
2887
msgstr ""
2877
2888
2878
#: bzrlib/builtins.py:4757
2889
#: bzrlib/builtins.py:4783
2879
2890
msgid ""
2880
2891
"The working tree contains a list of revisions that have been merged but\n"
2881
2892
"not yet committed. These revisions will be included as additional parents\n"
2887
2898
"reverting any files."
2888
2899
msgstr ""
2889
2900
2890
#: bzrlib/builtins.py:4766
2901
#: bzrlib/builtins.py:4792
2891
2902
msgid ""
2892
2903
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2893
2904
"changes from a branch in a single revision. To do this, perform the merge\n"
2901
2912
"target branches."
2902
2913
msgstr ""
2903
2914
2904
#: bzrlib/builtins.py:4780
2915
#: bzrlib/builtins.py:4806
2905
2916
msgid "Do not save backups of reverted files."
2906
2917
msgstr ""
2907
2918
2908
#: bzrlib/builtins.py:4782
2919
#: bzrlib/builtins.py:4808
2909
2920
msgid "Remove pending merge marker, without changing any files."
2910
2921
msgstr ""
2911
2922
2912
#: bzrlib/builtins.py:4813
2923
#: bzrlib/builtins.py:4839
2913
2924
msgid ""
2914
2925
"Show help on a command or other topic.\n"
2915
2926
" "
2916
2927
msgstr ""
2917
2928
2918
#: bzrlib/builtins.py:4818
2929
#: bzrlib/builtins.py:4844
2919
2930
msgid "Show help on all commands."
2920
2931
msgstr ""
2921
2932
2922
#: bzrlib/builtins.py:4847
2933
#: bzrlib/builtins.py:4873
2923
2934
msgid "Show unmerged/unpulled revisions between two branches."
2924
2935
msgstr ""
2925
2936
2926
#: bzrlib/builtins.py:4849
2937
#: bzrlib/builtins.py:4875
2927
2938
msgid "OTHER_BRANCH may be local or remote."
2928
2939
msgstr ""
2929
2940
2930
#: bzrlib/builtins.py:4851
2941
#: bzrlib/builtins.py:4877
2931
2942
msgid ""
2932
2943
"To filter on a range of revisions, you can use the command -r begin..end\n"
2933
2944
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2938
2949
" 0 - no missing revisions"
2939
2950
msgstr ""
2940
2951
2941
#: bzrlib/builtins.py:4861
2952
#: bzrlib/builtins.py:4887
2942
2953
msgid ""
2943
2954
" Determine the missing revisions between this and the branch at the\n"
2944
2955
" remembered pull location::"
2945
2956
msgstr ""
2946
2957
2947
#: bzrlib/builtins.py:4864
2958
#: bzrlib/builtins.py:4890
2948
2959
msgid " bzr missing"
2949
2960
msgstr ""
2950
2961
2951
#: bzrlib/builtins.py:4866
2962
#: bzrlib/builtins.py:4892
2952
2963
msgid " Determine the missing revisions between this and another branch::"
2953
2964
msgstr ""
2954
2965
2955
#: bzrlib/builtins.py:4868
2966
#: bzrlib/builtins.py:4894
2956
2967
msgid " bzr missing http://server/branch"
2957
2968
msgstr ""
2958
2969
2959
#: bzrlib/builtins.py:4870
2970
#: bzrlib/builtins.py:4896
2960
2971
msgid ""
2961
2972
" Determine the missing revisions up to a specific revision on the other\n"
2962
2973
" branch::"
2963
2974
msgstr ""
2964
2975
2965
#: bzrlib/builtins.py:4873
2976
#: bzrlib/builtins.py:4899
2966
2977
msgid " bzr missing -r ..-10"
2967
2978
msgstr ""
2968
2979
2969
#: bzrlib/builtins.py:4875
2980
#: bzrlib/builtins.py:4901
2970
2981
msgid ""
2971
2982
" Determine the missing revisions up to a specific revision on this\n"
2972
2983
" branch::"
2973
2984
msgstr ""
2974
2985
2975
#: bzrlib/builtins.py:4878
2986
#: bzrlib/builtins.py:4904
2976
2987
msgid " bzr missing --my-revision ..-10"
2977
2988
msgstr ""
2978
2989
2979
#: bzrlib/builtins.py:4885
2990
#: bzrlib/builtins.py:4911
2980
2991
msgid "Reverse the order of revisions."
2981
2992
msgstr ""
2982
2993
2983
#: bzrlib/builtins.py:4887
2994
#: bzrlib/builtins.py:4913
2984
2995
msgid "Display changes in the local branch only."
2985
2996
msgstr ""
2986
2997
2987
#: bzrlib/builtins.py:4888
2998
#: bzrlib/builtins.py:4914
2988
2999
msgid "Same as --mine-only."
2989
3000
msgstr ""
2990
3001
2991
#: bzrlib/builtins.py:4890
3002
#: bzrlib/builtins.py:4916
2992
3003
msgid "Display changes in the remote branch only."
2993
3004
msgstr ""
2994
3005
2995
#: bzrlib/builtins.py:4891
3006
#: bzrlib/builtins.py:4917
2996
3007
msgid "Same as --theirs-only."
2997
3008
msgstr ""
2998
3009
2999
#: bzrlib/builtins.py:4896
3010
#: bzrlib/builtins.py:4922
3000
3011
msgid ""
3001
3012
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3002
3013
"details."
3003
3014
msgstr ""
3004
3015
3005
#: bzrlib/builtins.py:4900
3016
#: bzrlib/builtins.py:4926
3006
3017
msgid ""
3007
3018
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3008
3019
"details."
3009
3020
msgstr ""
3010
3021
3011
#: bzrlib/builtins.py:4903
3022
#: bzrlib/builtins.py:4929
3012
3023
msgid "Show all revisions in addition to the mainline ones."
3013
3024
msgstr ""
3014
3025
3015
#: bzrlib/builtins.py:4957
3026
#: bzrlib/builtins.py:4983
3016
3027
msgid "No peer location known or specified."
3017
3028
msgstr ""
3018
3029
3019
#: bzrlib/builtins.py:4961
3030
#: bzrlib/builtins.py:4987
3020
3031
msgid "Using saved parent location: {0}\n"
3021
3032
msgstr ""
3022
3033
3023
#: bzrlib/builtins.py:4994
3034
#: bzrlib/builtins.py:5020
3024
3035
#, python-format
3025
3036
msgid "You have %d extra revision:\n"
3026
3037
msgid_plural "You have %d extra revisions:\n"
3027
3038
msgstr[0] ""
3028
3039
msgstr[1] ""
3029
3040
3030
#: bzrlib/builtins.py:5010
3041
#: bzrlib/builtins.py:5040
3031
3042
#, python-format
3032
3043
msgid "You are missing %d revision:\n"
3033
3044
msgid_plural "You are missing %d revisions:\n"
3034
3045
msgstr[0] ""
3035
3046
msgstr[1] ""
3036
3047
3037
#: bzrlib/builtins.py:5022
3048
#: bzrlib/builtins.py:5055
3038
3049
msgid "This branch has no new revisions.\n"
3039
3050
msgstr ""
3040
3051
3041
#: bzrlib/builtins.py:5025
3052
#: bzrlib/builtins.py:5058
3042
3053
msgid "Other branch has no new revisions.\n"
3043
3054
msgstr ""
3044
3055
3045
#: bzrlib/builtins.py:5030
3056
#: bzrlib/builtins.py:5063
3046
3057
msgid "Branches are up to date.\n"
3047
3058
msgstr ""
3048
3059
3049
#: bzrlib/builtins.py:5041
3060
#: bzrlib/builtins.py:5074
3050
3061
msgid "Compress the data within a repository."
3051
3062
msgstr ""
3052
3063
3053
#: bzrlib/builtins.py:5043
3064
#: bzrlib/builtins.py:5076
3054
3065
msgid ""
3055
3066
"This operation compresses the data within a bazaar repository. As\n"
3056
3067
"bazaar supports automatic packing of repository, this operation is\n"
3057
3068
"normally not required to be done manually."
3058
3069
msgstr ""
3059
3070
3060
#: bzrlib/builtins.py:5047
3071
#: bzrlib/builtins.py:5080
3061
3072
msgid ""
3062
3073
"During the pack operation, bazaar takes a backup of existing repository\n"
3063
3074
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3066
3077
"used."
3067
3078
msgstr ""
3068
3079
3069
#: bzrlib/builtins.py:5053
3080
#: bzrlib/builtins.py:5086
3070
3081
msgid ""
3071
3082
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3072
3083
"during or immediately after repacking, you may be left with a state\n"
3074
3085
"been. In this case the repository may be unusable."
3075
3086
msgstr ""
3076
3087
3077
#: bzrlib/builtins.py:5062
3088
#: bzrlib/builtins.py:5095
3078
3089
msgid "Delete obsolete packs to save disk space."
3079
3090
msgstr ""
3080
3091
3081
#: bzrlib/builtins.py:5076
3092
#: bzrlib/builtins.py:5109
3082
3093
msgid "List the installed plugins."
3083
3094
msgstr ""
3084
3095
3085
#: bzrlib/builtins.py:5078
3096
#: bzrlib/builtins.py:5111
3086
3097
msgid ""
3087
3098
"This command displays the list of installed plugins including\n"
3088
3099
"version of plugin and a short description of each."
3089
3100
msgstr ""
3090
3101
3091
#: bzrlib/builtins.py:5081
3102
#: bzrlib/builtins.py:5114
3092
3103
msgid "--verbose shows the path where each plugin is located."
3093
3104
msgstr ""
3094
3105
3095
#: bzrlib/builtins.py:5083
3106
#: bzrlib/builtins.py:5116
3096
3107
msgid ""
3097
3108
"A plugin is an external component for Bazaar that extends the\n"
3098
3109
"revision control system, by adding or replacing code in Bazaar.\n"
3101
3112
"customizing log output."
3102
3113
msgstr ""
3103
3114
3104
#: bzrlib/builtins.py:5089
3115
#: bzrlib/builtins.py:5122
3105
3116
msgid ""
3106
3117
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3107
3118
"for further information on plugins including where to find them and how to\n"
3109
3120
"plugins using the Python programming language."
3110
3121
msgstr ""
3111
3122
3112
#: bzrlib/builtins.py:5105
3123
#: bzrlib/builtins.py:5138
3113
3124
msgid "Show testament (signing-form) of a revision."
3114
3125
msgstr ""
3115
3126
3116
#: bzrlib/builtins.py:5108
3127
#: bzrlib/builtins.py:5141
3117
3128
msgid "Produce long-format testament."
3118
3129
msgstr ""
3119
3130
3120
#: bzrlib/builtins.py:5110
3131
#: bzrlib/builtins.py:5143
3121
3132
msgid "Produce a strict-format testament."
3122
3133
msgstr ""
3123
3134
3124
#: bzrlib/builtins.py:5136
3135
#: bzrlib/builtins.py:5169
3125
3136
msgid "Show the origin of each line in a file."
3126
3137
msgstr ""
3127
3138
3128
#: bzrlib/builtins.py:5138
3139
#: bzrlib/builtins.py:5171
3129
3140
msgid ""
3130
3141
"This prints out the given file with an annotation on the left side\n"
3131
3142
"indicating which revision, author and date introduced the change."
3132
3143
msgstr ""
3133
3144
3134
#: bzrlib/builtins.py:5141
3145
#: bzrlib/builtins.py:5174
3135
3146
msgid ""
3136
3147
"If the origin is the same for a run of consecutive lines, it is\n"
3137
3148
"shown only at the top, unless the --all option is given."
3138
3149
msgstr ""
3139
3150
3140
#: bzrlib/builtins.py:5149
3151
#: bzrlib/builtins.py:5182
3141
3152
msgid "Show annotations on all lines."
3142
3153
msgstr ""
3143
3154
3144
#: bzrlib/builtins.py:5150
3155
#: bzrlib/builtins.py:5183
3145
3156
msgid "Show commit date in annotations."
3146
3157
msgstr ""
3147
3158
3148
#: bzrlib/builtins.py:5237
3159
#: bzrlib/builtins.py:5270
3149
3160
msgid "Cannot sign a range of non-revision-history revisions"
3150
3161
msgstr ""
3151
3162
3152
#: bzrlib/builtins.py:5249
3163
#: bzrlib/builtins.py:5282
3153
3164
msgid "Please supply either one revision, or a range."
3154
3165
msgstr ""
3155
3166
3156
#: bzrlib/builtins.py:5253
3167
#: bzrlib/builtins.py:5286
3157
3168
msgid ""
3158
3169
"Convert the current branch into a checkout of the supplied branch.\n"
3159
3170
"If no branch is supplied, rebind to the last bound location."
3160
3171
msgstr ""
3161
3172
3162
#: bzrlib/builtins.py:5256
3173
#: bzrlib/builtins.py:5289
3163
3174
msgid ""
3164
3175
"Once converted into a checkout, commits must succeed on the master branch\n"
3165
3176
"before they will be applied to the local branch."
3166
3177
msgstr ""
3167
3178
3168
#: bzrlib/builtins.py:5259
3179
#: bzrlib/builtins.py:5292
3169
3180
msgid ""
3170
3181
"Bound branches use the nickname of its master branch unless it is set\n"
3171
3182
"locally, in which case binding will update the local nickname to be\n"
3172
3183
"that of the master."
3173
3184
msgstr ""
3174
3185
3175
#: bzrlib/builtins.py:5274
3186
#: bzrlib/builtins.py:5307
3176
3187
msgid "No location supplied. This format does not remember old locations."
3177
3188
msgstr ""
3178
3189
3179
#: bzrlib/builtins.py:5280
3190
#: bzrlib/builtins.py:5313
3180
3191
msgid "Branch is already bound"
3181
3192
msgstr ""
3182
3193
3183
#: bzrlib/builtins.py:5283
3194
#: bzrlib/builtins.py:5316
3184
3195
msgid "No location supplied and no previous location known"
3185
3196
msgstr ""
3186
3197
3187
#: bzrlib/builtins.py:5289
3198
#: bzrlib/builtins.py:5322
3188
3199
msgid "These branches have diverged. Try merging, and then bind again."
3189
3200
msgstr ""
3190
3201
3191
#: bzrlib/builtins.py:5296
3202
#: bzrlib/builtins.py:5329
3192
3203
msgid "Convert the current checkout into a regular branch."
3193
3204
msgstr ""
3194
3205
3195
#: bzrlib/builtins.py:5298
3206
#: bzrlib/builtins.py:5331
3196
3207
msgid ""
3197
3208
"After unbinding, the local branch is considered independent and subsequent\n"
3198
3209
"commits will be local only."
3199
3210
msgstr ""
3200
3211
3201
#: bzrlib/builtins.py:5309
3212
#: bzrlib/builtins.py:5342
3202
3213
msgid "Local branch is not bound"
3203
3214
msgstr ""
3204
3215
3205
#: bzrlib/builtins.py:5313
3216
#: bzrlib/builtins.py:5346
3206
3217
msgid "Remove the last committed revision."
3207
3218
msgstr ""
3208
3219
3209
#: bzrlib/builtins.py:5315
3220
#: bzrlib/builtins.py:5348
3210
3221
msgid ""
3211
3222
"--verbose will print out what is being removed.\n"
3212
3223
"--dry-run will go through all the motions, but not actually\n"
3213
3224
"remove anything."
3214
3225
msgstr ""
3215
3226
3216
#: bzrlib/builtins.py:5319
3227
#: bzrlib/builtins.py:5352
3217
3228
msgid ""
3218
3229
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3219
3230
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3220
3231
"branch at revision 15."
3221
3232
msgstr ""
3222
3233
3223
#: bzrlib/builtins.py:5323
3234
#: bzrlib/builtins.py:5356
3224
3235
msgid ""
3225
3236
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3226
3237
"it may make is to restore any pending merges that were present before\n"
3227
3238
"the commit."
3228
3239
msgstr ""
3229
3240
3230
#: bzrlib/builtins.py:5334
3241
#: bzrlib/builtins.py:5367
3231
3242
msgid "Don't actually make changes."
3232
3243
msgstr ""
3233
3244
3234
#: bzrlib/builtins.py:5335
3245
#: bzrlib/builtins.py:5368
3235
3246
msgid "Say yes to all questions."
3236
3247
msgstr ""
3237
3248
3238
#: bzrlib/builtins.py:5337
3249
#: bzrlib/builtins.py:5370
3239
3250
msgid "Keep tags that point to removed revisions."
3240
3251
msgstr ""
3241
3252
3242
#: bzrlib/builtins.py:5339
3253
#: bzrlib/builtins.py:5372
3243
3254
msgid "Only remove the commits from the local branch when in a checkout."
3244
3255
msgstr ""
3245
3256
3246
#: bzrlib/builtins.py:5388
3257
#: bzrlib/builtins.py:5421
3247
3258
msgid "No revisions to uncommit.\n"
3248
3259
msgstr ""
3249
3260
3250
#: bzrlib/builtins.py:5403
3261
#: bzrlib/builtins.py:5436
3251
3262
msgid "Dry-run, pretending to remove the above revisions.\n"
3252
3263
msgstr ""
3253
3264
3254
#: bzrlib/builtins.py:5406
3265
#: bzrlib/builtins.py:5439
3255
3266
msgid "The above revision(s) will be removed.\n"
3256
3267
msgstr ""
3257
3268
3258
#: bzrlib/builtins.py:5410
3269
#: bzrlib/builtins.py:5443
3259
3270
msgid "Uncommit these revisions"
3260
3271
msgstr ""
3261
3272
3262
#: bzrlib/builtins.py:5413
3273
#: bzrlib/builtins.py:5446
3263
3274
msgid "Canceled\n"
3264
3275
msgstr ""
3265
3276
3266
#: bzrlib/builtins.py:5420
3277
#: bzrlib/builtins.py:5453
3267
3278
#, python-format
3268
3279
msgid ""
3269
3280
"You can restore the old tip by running:\n"
3270
3281
" bzr pull . -r revid:%s\n"
3271
3282
msgstr ""
3272
3283
3273
#: bzrlib/builtins.py:5425
3284
#: bzrlib/builtins.py:5458
3274
3285
msgid "Break a dead lock."
3275
3286
msgstr ""
3276
3287
3277
#: bzrlib/builtins.py:5427
3288
#: bzrlib/builtins.py:5460
3278
3289
msgid ""
3279
3290
"This command breaks a lock on a repository, branch, working directory or\n"
3280
3291
"config file."
3281
3292
msgstr ""
3282
3293
3283
#: bzrlib/builtins.py:5430
3294
#: bzrlib/builtins.py:5463
3284
3295
msgid ""
3285
3296
"CAUTION: Locks should only be broken when you are sure that the process\n"
3286
3297
"holding the lock has been stopped."
3287
3298
msgstr ""
3288
3299
3289
#: bzrlib/builtins.py:5433
3300
#: bzrlib/builtins.py:5466
3290
3301
msgid ""
3291
3302
"You can get information on what locks are open via the 'bzr info\n"
3292
3303
"[location]' command."
3293
3304
msgstr ""
3294
3305
3295
#: bzrlib/builtins.py:5436
3306
#: bzrlib/builtins.py:5469
3296
3307
msgid ""
3297
3308
":Examples:\n"
3298
3309
" bzr break-lock\n"
3300
3311
" bzr break-lock --conf ~/.bazaar"
3301
3312
msgstr ""
3302
3313
3303
#: bzrlib/builtins.py:5445
3314
#: bzrlib/builtins.py:5478
3304
3315
msgid "LOCATION is the directory where the config lock is."
3305
3316
msgstr ""
3306
3317
3307
#: bzrlib/builtins.py:5447
3318
#: bzrlib/builtins.py:5480
3308
3319
msgid "Do not ask for confirmation before breaking the lock."
3309
3320
msgstr ""
3310
3321
3311
#: bzrlib/builtins.py:5482
3322
#: bzrlib/builtins.py:5515
3312
3323
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3313
3324
msgstr ""
3314
3325
3315
#: bzrlib/builtins.py:5483
3326
#: bzrlib/builtins.py:5516
3316
3327
msgid "Run the bzr server."
3317
3328
msgstr ""
3318
3329
3319
#: bzrlib/builtins.py:5489
3330
#: bzrlib/builtins.py:5522
3320
3331
msgid "Serve on stdin/out for use from inetd or sshd."
3321
3332
msgstr ""
3322
3333
3323
#: bzrlib/builtins.py:5490
3334
#: bzrlib/builtins.py:5523
3324
3335
msgid "protocol"
3325
3336
msgstr ""
3326
3337
3327
#: bzrlib/builtins.py:5491
3338
#: bzrlib/builtins.py:5524
3328
3339
msgid "Protocol to serve."
3329
3340
msgstr ""
3330
3341
3331
#: bzrlib/builtins.py:5495
3342
#: bzrlib/builtins.py:5528
3332
3343
msgid "Listen for connections on nominated address."
3333
3344
msgstr ""
3334
3345
3335
#: bzrlib/builtins.py:5497
3346
#: bzrlib/builtins.py:5530
3336
3347
msgid ""
3337
3348
"Listen for connections on nominated port. Passing 0 as the port number will "
3338
3349
"result in a dynamically allocated port. The default port depends on the "
3339
3350
"protocol."
3340
3351
msgstr ""
3341
3352
3342
#: bzrlib/builtins.py:5502
3353
#: bzrlib/builtins.py:5535
3343
3354
msgid "Serve contents of this directory."
3344
3355
msgstr ""
3345
3356
3346
#: bzrlib/builtins.py:5504
3357
#: bzrlib/builtins.py:5537
3347
3358
msgid ""
3348
3359
"By default the server is a readonly server. Supplying --allow-writes "
3349
3360
"enables write access to the contents of the served directory and below. "
3352
3363
"uncontrolled write access to your file system."
3353
3364
msgstr ""
3354
3365
3355
#: bzrlib/builtins.py:5513
3366
#: bzrlib/builtins.py:5546
3356
3367
msgid "Override the default idle client timeout (5min)."
3357
3368
msgstr ""
3358
3369
3359
#: bzrlib/builtins.py:5531
3370
#: bzrlib/builtins.py:5564
3360
3371
msgid "Combine a tree into its containing tree."
3361
3372
msgstr ""
3362
3373
3363
#: bzrlib/builtins.py:5533
3374
#: bzrlib/builtins.py:5566
3364
3375
msgid "This command requires the target tree to be in a rich-root format."
3365
3376
msgstr ""
3366
3377
3367
#: bzrlib/builtins.py:5535
3378
#: bzrlib/builtins.py:5568
3368
3379
msgid ""
3369
3380
"The TREE argument should be an independent tree, inside another tree, but\n"
3370
3381
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3371
3382
"running \"bzr branch\" with the target inside a tree.)"
3372
3383
msgstr ""
3373
3384
3374
#: bzrlib/builtins.py:5539
3385
#: bzrlib/builtins.py:5572
3375
3386
msgid ""
3376
3387
"The result is a combined tree, with the subtree no longer an independent\n"
3377
3388
"part. This is marked as a merge of the subtree into the containing tree,\n"
3378
3389
"and all history is preserved."
3379
3390
msgstr ""
3380
3391
3381
#: bzrlib/builtins.py:5557
3392
#: bzrlib/builtins.py:5590
3382
3393
#, python-format
3383
3394
msgid ""
3384
3395
"Can't join trees because %s doesn't support rich root data.\n"
3385
3396
"You can use bzr upgrade on the repository."
3386
3397
msgstr ""
3387
3398
3388
#: bzrlib/builtins.py:5567 bzrlib/builtins.py:5573
3399
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3389
3400
msgid "Cannot join {0}. {1}"
3390
3401
msgstr ""
3391
3402
3392
#: bzrlib/builtins.py:5577
3403
#: bzrlib/builtins.py:5610
3393
3404
msgid "Split a subdirectory of a tree into a separate tree."
3394
3405
msgstr ""
3395
3406
3396
#: bzrlib/builtins.py:5579
3407
#: bzrlib/builtins.py:5612
3397
3408
msgid ""
3398
3409
"This command will produce a target tree in a format that supports\n"
3399
3410
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3400
3411
"converted into earlier formats like 'dirstate-tags'."
3401
3412
msgstr ""
3402
3413
3403
#: bzrlib/builtins.py:5583
3414
#: bzrlib/builtins.py:5616
3404
3415
msgid ""
3405
3416
"The TREE argument should be a subdirectory of a working tree. That\n"
3406
3417
"subdirectory will be converted into an independent tree, with its own\n"
3407
3418
"branch. Commits in the top-level tree will not apply to the new subtree."
3408
3419
msgstr ""
3409
3420
3410
#: bzrlib/builtins.py:5663
3421
#: bzrlib/builtins.py:5696
3411
3422
msgid "No submit branch specified or known"
3412
3423
msgstr ""
3413
3424
3414
#: bzrlib/builtins.py:5672 bzrlib/send.py:109
3425
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3415
3426
msgid "No public branch specified or known"
3416
3427
msgstr ""
3417
3428
3418
#: bzrlib/builtins.py:5677
3429
#: bzrlib/builtins.py:5710
3419
3430
msgid "bzr merge-directive takes at most two one revision identifiers"
3420
3431
msgstr ""
3421
3432
3422
#: bzrlib/builtins.py:5686
3433
#: bzrlib/builtins.py:5719
3423
3434
msgid "No revisions to bundle."
3424
3435
msgstr ""
3425
3436
3426
#: bzrlib/builtins.py:5705
3437
#: bzrlib/builtins.py:5738
3427
3438
msgid "Mail or create a merge-directive for submitting changes."
3428
3439
msgstr ""
3429
3440
3430
#: bzrlib/builtins.py:5707
3441
#: bzrlib/builtins.py:5740
3431
3442
msgid "A merge directive provides many things needed for requesting merges:"
3432
3443
msgstr ""
3433
3444
3434
#: bzrlib/builtins.py:5709
3445
#: bzrlib/builtins.py:5742
3435
3446
msgid "* A machine-readable description of the merge to perform"
3436
3447
msgstr ""
3437
3448
3438
#: bzrlib/builtins.py:5711
3449
#: bzrlib/builtins.py:5744
3439
3450
msgid "* An optional patch that is a preview of the changes requested"
3440
3451
msgstr ""
3441
3452
3442
#: bzrlib/builtins.py:5713
3453
#: bzrlib/builtins.py:5746
3443
3454
msgid ""
3444
3455
"* An optional bundle of revision data, so that the changes can be applied\n"
3445
3456
" directly from the merge directive, without retrieving data from a\n"
3446
3457
" branch."
3447
3458
msgstr ""
3448
3459
3449
#: bzrlib/builtins.py:5717
3460
#: bzrlib/builtins.py:5750
3450
3461
msgid ""
3451
3462
"`bzr send` creates a compact data set that, when applied using bzr\n"
3452
3463
"merge, has the same effect as merging from the source branch. "
3453
3464
msgstr ""
3454
3465
3455
#: bzrlib/builtins.py:5720
3466
#: bzrlib/builtins.py:5753
3456
3467
msgid ""
3457
3468
"By default the merge directive is self-contained and can be applied to any\n"
3458
3469
"branch containing submit_branch in its ancestory without needing access to\n"
3459
3470
"the source branch."
3460
3471
msgstr ""
3461
3472
3462
#: bzrlib/builtins.py:5724
3473
#: bzrlib/builtins.py:5757
3463
3474
msgid ""
3464
3475
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3465
3476
"revisions, but only a structured request to merge from the\n"
3468
3479
"included if known, so that people can check it later."
3469
3480
msgstr ""
3470
3481
3471
#: bzrlib/builtins.py:5730
3482
#: bzrlib/builtins.py:5763
3472
3483
msgid ""
3473
3484
"The submit branch defaults to the parent of the source branch, but can be\n"
3474
3485
"overridden. Both submit branch and public branch will be remembered in\n"
3477
3488
"be changed using --from."
3478
3489
msgstr ""
3479
3490
3480
#: bzrlib/builtins.py:5736
3491
#: bzrlib/builtins.py:5769
3481
3492
msgid ""
3482
3493
"Both the submit branch and the public branch follow the usual behavior with\n"
3483
3494
"respect to --remember: If there is no default location set, the first send\n"
3486
3497
"--remember. The value will only be saved if the location can be accessed."
3487
3498
msgstr ""
3488
3499
3489
#: bzrlib/builtins.py:5742
3500
#: bzrlib/builtins.py:5775
3490
3501
msgid ""
3491
3502
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3492
3503
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3494
3505
"in the merge directive."
3495
3506
msgstr ""
3496
3507
3497
#: bzrlib/builtins.py:5747
3508
#: bzrlib/builtins.py:5780
3498
3509
msgid ""
3499
3510
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3500
3511
"given, in which case it is sent to a file."
3501
3512
msgstr ""
3502
3513
3503
#: bzrlib/builtins.py:5750
3514
#: bzrlib/builtins.py:5783
3504
3515
msgid ""
3505
3516
"Mail is sent using your preferred mail program. This should be transparent\n"
3506
3517
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3507
3518
"If the preferred client can't be found (or used), your editor will be used."
3508
3519
msgstr ""
3509
3520
3510
#: bzrlib/builtins.py:5754
3521
#: bzrlib/builtins.py:5787
3511
3522
msgid ""
3512
3523
"To use a specific mail program, set the mail_client configuration option.\n"
3513
3524
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3519
3530
"supported clients."
3520
3531
msgstr ""
3521
3532
3522
#: bzrlib/builtins.py:5761
3533
#: bzrlib/builtins.py:5794
3523
3534
msgid ""
3524
3535
"If mail is being sent, a to address is required. This can be supplied\n"
3525
3536
"either on the commandline, by setting the submit_to configuration\n"
3527
3538
"in the submit branch."
3528
3539
msgstr ""
3529
3540
3530
#: bzrlib/builtins.py:5766
3541
#: bzrlib/builtins.py:5799
3531
3542
msgid ""
3532
3543
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3533
3544
"and\n"
3537
3548
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3538
3549
msgstr ""
3539
3550
3540
#: bzrlib/builtins.py:5772
3551
#: bzrlib/builtins.py:5805
3541
3552
msgid ""
3542
3553
"The merge directives created by bzr send may be applied using bzr merge or\n"
3543
3554
"bzr pull by specifying a file containing a merge directive as the location."
3544
3555
msgstr ""
3545
3556
3546
#: bzrlib/builtins.py:5775
3557
#: bzrlib/builtins.py:5808
3547
3558
msgid ""
3548
3559
"bzr send makes extensive use of public locations to map local locations "
3549
3560
"into\n"
3551
3562
"set them, and use `bzr info` to display them."
3552
3563
msgstr ""
3553
3564
3554
#: bzrlib/builtins.py:5799
3565
#: bzrlib/builtins.py:5832
3555
3566
msgid "Write merge directive to this file or directory; use - for stdout."
3556
3567
msgstr ""
3557
3568
3558
#: bzrlib/builtins.py:5803
3569
#: bzrlib/builtins.py:5836
3559
3570
msgid ""
3560
3571
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3561
3572
"strict disables the check."
3562
3573
msgstr ""
3563
3574
3564
#: bzrlib/builtins.py:5805
3575
#: bzrlib/builtins.py:5838
3565
3576
msgid "Mail the request to this address."
3566
3577
msgstr ""
3567
3578
3568
#: bzrlib/builtins.py:5809
3579
#: bzrlib/builtins.py:5842
3569
3580
msgid "Body for the email."
3570
3581
msgstr ""
3571
3582
3572
#: bzrlib/builtins.py:5862
3583
#: bzrlib/builtins.py:5895
3573
3584
msgid "Do not include a bundle in the merge directive."
3574
3585
msgstr ""
3575
3586
3576
#: bzrlib/builtins.py:5863
3587
#: bzrlib/builtins.py:5896
3577
3588
msgid "Do not include a preview patch in the merge directive."
3578
3589
msgstr ""
3579
3590
3580
#: bzrlib/builtins.py:5866
3591
#: bzrlib/builtins.py:5899
3581
3592
msgid "Remember submit and public branch."
3582
3593
msgstr ""
3583
3594
3584
#: bzrlib/builtins.py:5868
3595
#: bzrlib/builtins.py:5901
3585
3596
msgid ""
3586
3597
"Branch to generate the submission from, rather than the one containing the "
3587
3598
"working directory."
3588
3599
msgstr ""
3589
3600
3590
#: bzrlib/builtins.py:5878 bzrlib/cmd_version_info.py:76
3601
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3591
3602
msgid "format"
3592
3603
msgstr ""
3593
3604
3594
#: bzrlib/builtins.py:5879
3605
#: bzrlib/builtins.py:5912
3595
3606
msgid "Use the specified output format."
3596
3607
msgstr ""
3597
3608
3598
#: bzrlib/builtins.py:5901
3609
#: bzrlib/builtins.py:5934
3599
3610
msgid "Create, remove or modify a tag naming a revision."
3600
3611
msgstr ""
3601
3612
3602
#: bzrlib/builtins.py:5903
3613
#: bzrlib/builtins.py:5936
3603
3614
msgid ""
3604
3615
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3605
3616
"(--revision) option can be given -rtag:X, where X is any previously\n"
3606
3617
"created tag."
3607
3618
msgstr ""
3608
3619
3609
#: bzrlib/builtins.py:5907
3620
#: bzrlib/builtins.py:5940
3610
3621
msgid ""
3611
3622
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3612
3623
"along when you branch, push, pull or merge."
3613
3624
msgstr ""
3614
3625
3615
#: bzrlib/builtins.py:5910
3626
#: bzrlib/builtins.py:5943
3616
3627
msgid ""
3617
3628
"It is an error to give a tag name that already exists unless you pass\n"
3618
3629
"--force, in which case the tag is moved to point to the new revision."
3619
3630
msgstr ""
3620
3631
3621
#: bzrlib/builtins.py:5913
3632
#: bzrlib/builtins.py:5946
3622
3633
msgid ""
3623
3634
"To rename a tag (change the name but keep it on the same revsion), run "
3624
3635
"``bzr\n"
3625
3636
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3626
3637
msgstr ""
3627
3638
3628
#: bzrlib/builtins.py:5916
3639
#: bzrlib/builtins.py:5949
3629
3640
msgid ""
3630
3641
"If no tag name is specified it will be determined through the \n"
3631
3642
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3633
3644
"details."
3634
3645
msgstr ""
3635
3646
3636
#: bzrlib/builtins.py:5926
3647
#: bzrlib/builtins.py:5959
3637
3648
msgid "Delete this tag rather than placing it."
3638
3649
msgstr ""
3639
3650
3640
#: bzrlib/builtins.py:5929
3651
#: bzrlib/builtins.py:5962
3641
3652
msgid "Branch in which to place the tag."
3642
3653
msgstr ""
3643
3654
3644
#: bzrlib/builtins.py:5931
3655
#: bzrlib/builtins.py:5964
3645
3656
msgid "Replace existing tags."
3646
3657
msgstr ""
3647
3658
3648
#: bzrlib/builtins.py:5946
3659
#: bzrlib/builtins.py:5979
3649
3660
msgid "No tag specified to delete."
3650
3661
msgstr ""
3651
3662
3652
#: bzrlib/builtins.py:5948
3663
#: bzrlib/builtins.py:5981
3653
3664
#, python-format
3654
3665
msgid "Deleted tag %s."
3655
3666
msgstr ""
3656
3667
3657
#: bzrlib/builtins.py:5962
3668
#: bzrlib/builtins.py:5995
3658
3669
msgid "Please specify a tag name."
3659
3670
msgstr ""
3660
3671
3661
#: bzrlib/builtins.py:5970
3672
#: bzrlib/builtins.py:6003
3662
3673
#, python-format
3663
3674
msgid "Tag %s already exists for that revision."
3664
3675
msgstr ""
3665
3676
3666
#: bzrlib/builtins.py:5974
3677
#: bzrlib/builtins.py:6007
3667
3678
#, python-format
3668
3679
msgid "Created tag %s."
3669
3680
msgstr ""
3670
3681
3671
#: bzrlib/builtins.py:5976
3682
#: bzrlib/builtins.py:6009
3672
3683
#, python-format
3673
3684
msgid "Updated tag %s."
3674
3685
msgstr ""
3675
3686
3676
#: bzrlib/builtins.py:5980
3687
#: bzrlib/builtins.py:6013
3677
3688
msgid "List tags."
3678
3689
msgstr ""
3679
3690
3680
#: bzrlib/builtins.py:5982
3691
#: bzrlib/builtins.py:6015
3681
3692
msgid ""
3682
3693
"This command shows a table of tag names and the revisions they reference."
3683
3694
msgstr ""
3684
3695
3685
#: bzrlib/builtins.py:5988
3696
#: bzrlib/builtins.py:6021
3686
3697
msgid "Branch whose tags should be displayed."
3687
3698
msgstr ""
3688
3699
3689
#: bzrlib/builtins.py:5990
3700
#: bzrlib/builtins.py:6023
3690
3701
msgid "Sort tags by different criteria."
3691
3702
msgstr ""
3692
3703
3693
#: bzrlib/builtins.py:5990
3704
#: bzrlib/builtins.py:6023
3694
3705
msgid "Sorting"
3695
3706
msgstr ""
3696
3707
3697
#: bzrlib/builtins.py:6059
3708
#: bzrlib/builtins.py:6092
3698
3709
msgid "Reconfigure the type of a bzr directory."
3699
3710
msgstr ""
3700
3711
3701
#: bzrlib/builtins.py:6061
3712
#: bzrlib/builtins.py:6094
3702
3713
msgid "A target configuration must be specified."
3703
3714
msgstr ""
3704
3715
3705
#: bzrlib/builtins.py:6063
3716
#: bzrlib/builtins.py:6096
3706
3717
msgid ""
3707
3718
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3708
3719
"The order of preference is\n"
3713
3724
"If none of these is available, --bind-to must be specified."
3714
3725
msgstr ""
3715
3726
3716
#: bzrlib/builtins.py:6077
3727
#: bzrlib/builtins.py:6110
3717
3728
msgid "Tree type"
3718
3729
msgstr ""
3719
3730
3720
#: bzrlib/builtins.py:6078
3731
#: bzrlib/builtins.py:6111
3721
3732
msgid "The relation between branch and tree."
3722
3733
msgstr ""
3723
3734
3724
#: bzrlib/builtins.py:6080
3735
#: bzrlib/builtins.py:6113
3725
3736
msgid "Reconfigure to be an unbound branch with no working tree."
3726
3737
msgstr ""
3727
3738
3728
#: bzrlib/builtins.py:6081
3739
#: bzrlib/builtins.py:6114
3729
3740
msgid "Reconfigure to be an unbound branch with a working tree."
3730
3741
msgstr ""
3731
3742
3732
#: bzrlib/builtins.py:6082
3743
#: bzrlib/builtins.py:6115
3733
3744
msgid "Reconfigure to be a bound branch with a working tree."
3734
3745
msgstr ""
3735
3746
3736
#: bzrlib/builtins.py:6083
3747
#: bzrlib/builtins.py:6116
3737
3748
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3738
3749
msgstr ""
3739
3750
3740
#: bzrlib/builtins.py:6088
3751
#: bzrlib/builtins.py:6121
3741
3752
msgid "Repository type"
3742
3753
msgstr ""
3743
3754
3744
#: bzrlib/builtins.py:6089
3755
#: bzrlib/builtins.py:6122
3745
3756
msgid "Location fo the repository."
3746
3757
msgstr ""
3747
3758
3748
#: bzrlib/builtins.py:6091
3759
#: bzrlib/builtins.py:6124
3749
3760
msgid ""
3750
3761
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3751
3762
msgstr ""
3752
3763
3753
#: bzrlib/builtins.py:6093
3764
#: bzrlib/builtins.py:6126
3754
3765
msgid "Reconfigure to use a shared repository."
3755
3766
msgstr ""
3756
3767
3757
#: bzrlib/builtins.py:6097
3768
#: bzrlib/builtins.py:6130
3758
3769
msgid "Trees in Repository"
3759
3770
msgstr ""
3760
3771
3761
#: bzrlib/builtins.py:6098
3772
#: bzrlib/builtins.py:6131
3762
3773
msgid "Whether new branches in the repository have trees."
3763
3774
msgstr ""
3764
3775
3765
#: bzrlib/builtins.py:6100
3776
#: bzrlib/builtins.py:6133
3766
3777
msgid ""
3767
3778
"Reconfigure repository to create working trees on branches by default."
3768
3779
msgstr ""
3769
3780
3770
#: bzrlib/builtins.py:6102
3781
#: bzrlib/builtins.py:6135
3771
3782
msgid ""
3772
3783
"Reconfigure repository to not create working trees on branches by default."
3773
3784
msgstr ""
3774
3785
3775
#: bzrlib/builtins.py:6105
3786
#: bzrlib/builtins.py:6138
3776
3787
msgid "Branch to bind checkout to."
3777
3788
msgstr ""
3778
3789
3779
#: bzrlib/builtins.py:6107
3790
#: bzrlib/builtins.py:6140
3780
3791
msgid "Perform reconfiguration even if local changes will be lost."
3781
3792
msgstr ""
3782
3793
3783
#: bzrlib/builtins.py:6110
3794
#: bzrlib/builtins.py:6143
3784
3795
msgid "Reconfigure a branch to be stacked on another branch."
3785
3796
msgstr ""
3786
3797
3787
#: bzrlib/builtins.py:6114
3798
#: bzrlib/builtins.py:6147
3788
3799
msgid ""
3789
3800
"Reconfigure a branch to be unstacked. This may require copying substantial "
3790
3801
"data into it."
3791
3802
msgstr ""
3792
3803
3793
#: bzrlib/builtins.py:6124
3804
#: bzrlib/builtins.py:6157
3794
3805
msgid "Can't use both --stacked-on and --unstacked"
3795
3806
msgstr ""
3796
3807
3797
#: bzrlib/builtins.py:6138
3808
#: bzrlib/builtins.py:6171
3798
3809
msgid "No target configuration specified"
3799
3810
msgstr ""
3800
3811
3801
#: bzrlib/builtins.py:6173
3812
#: bzrlib/builtins.py:6206
3802
3813
msgid "Set the branch of a checkout and update."
3803
3814
msgstr ""
3804
3815
3805
#: bzrlib/builtins.py:6175
3816
#: bzrlib/builtins.py:6208
3806
3817
msgid ""
3807
3818
"For lightweight checkouts, this changes the branch being referenced.\n"
3808
3819
"For heavyweight checkouts, this checks that there are no local commits\n"
3810
3821
"of the new location and binds to it."
3811
3822
msgstr ""
3812
3823
3813
#: bzrlib/builtins.py:6180
3824
#: bzrlib/builtins.py:6213
3814
3825
msgid ""
3815
3826
"In both cases, the working tree is updated and uncommitted changes\n"
3816
3827
"are merged. The user can commit or revert these as they desire."
3817
3828
msgstr ""
3818
3829
3819
#: bzrlib/builtins.py:6183
3830
#: bzrlib/builtins.py:6216
3820
3831
msgid "Pending merges need to be committed or reverted before using switch."
3821
3832
msgstr ""
3822
3833
3823
#: bzrlib/builtins.py:6185
3834
#: bzrlib/builtins.py:6218
3824
3835
msgid ""
3825
3836
"The path to the branch to switch to can be specified relative to the parent\n"
3826
3837
"directory of the current branch. For example, if you are currently in a\n"
3828
3839
"/path/to/newbranch."
3829
3840
msgstr ""
3830
3841
3831
#: bzrlib/builtins.py:6190
3842
#: bzrlib/builtins.py:6223
3832
3843
msgid ""
3833
3844
"Bound branches use the nickname of its master branch unless it is set\n"
3834
3845
"locally, in which case switching will update the local nickname to be\n"
3835
3846
"that of the master."
3836
3847
msgstr ""
3837
3848
3838
#: bzrlib/builtins.py:6198
3849
#: bzrlib/builtins.py:6231
3839
3850
msgid "Switch even if local commits will be lost."
3840
3851
msgstr ""
3841
3852
3842
#: bzrlib/builtins.py:6201
3853
#: bzrlib/builtins.py:6234
3843
3854
msgid "Create the target branch from this one before switching to it."
3844
3855
msgstr ""
3845
3856
3846
#: bzrlib/builtins.py:6215
3857
#: bzrlib/builtins.py:6248
3847
3858
msgid "You must supply either a revision or a location"
3848
3859
msgstr ""
3849
3860
3850
#: bzrlib/builtins.py:6228
3861
#: bzrlib/builtins.py:6261
3851
3862
msgid "cannot create branch without source branch"
3852
3863
msgstr ""
3853
3864
3854
#: bzrlib/builtins.py:6253
3865
#: bzrlib/builtins.py:6286
3855
3866
msgid "Manage filtered views."
3856
3867
msgstr ""
3857
3868
3858
#: bzrlib/builtins.py:6255
3869
#: bzrlib/builtins.py:6288
3859
3870
msgid ""
3860
3871
"Views provide a mask over the tree so that users can focus on\n"
3861
3872
"a subset of a tree when doing their work. After creating a view,\n"
3865
3876
"must be within the current view."
3866
3877
msgstr ""
3867
3878
3868
#: bzrlib/builtins.py:6262
3879
#: bzrlib/builtins.py:6295
3869
3880
msgid ""
3870
3881
"In most cases, a view has a short life-span: it is created to make\n"
3871
3882
"a selected change and is deleted once that change is committed.\n"
3873
3884
"and switch between them."
3874
3885
msgstr ""
3875
3886
3876
#: bzrlib/builtins.py:6267
3887
#: bzrlib/builtins.py:6300
3877
3888
msgid ""
3878
3889
"To disable the current view without deleting it, you can switch to\n"
3879
3890
"the pseudo view called ``off``. This can be useful when you need\n"
3881
3892
"want to switch back to your view after that."
3882
3893
msgstr ""
3883
3894
3884
#: bzrlib/builtins.py:6272
3895
#: bzrlib/builtins.py:6305
3885
3896
msgid ""
3886
3897
":Examples:\n"
3887
3898
" To define the current view::"
3888
3899
msgstr ""
3889
3900
3890
#: bzrlib/builtins.py:6275
3901
#: bzrlib/builtins.py:6308
3891
3902
msgid " bzr view file1 dir1 ..."
3892
3903
msgstr ""
3893
3904
3894
#: bzrlib/builtins.py:6277
3905
#: bzrlib/builtins.py:6310
3895
3906
msgid " To list the current view::"
3896
3907
msgstr ""
3897
3908
3898
#: bzrlib/builtins.py:6279
3909
#: bzrlib/builtins.py:6312
3899
3910
msgid " bzr view"
3900
3911
msgstr ""
3901
3912
3902
#: bzrlib/builtins.py:6281
3913
#: bzrlib/builtins.py:6314
3903
3914
msgid " To delete the current view::"
3904
3915
msgstr ""
3905
3916
3906
#: bzrlib/builtins.py:6283
3917
#: bzrlib/builtins.py:6316
3907
3918
msgid " bzr view --delete"
3908
3919
msgstr ""
3909
3920
3910
#: bzrlib/builtins.py:6285
3921
#: bzrlib/builtins.py:6318
3911
3922
msgid " To disable the current view without deleting it::"
3912
3923
msgstr ""
3913
3924
3914
#: bzrlib/builtins.py:6287
3925
#: bzrlib/builtins.py:6320
3915
3926
msgid " bzr view --switch off"
3916
3927
msgstr ""
3917
3928
3918
#: bzrlib/builtins.py:6289
3929
#: bzrlib/builtins.py:6322
3919
3930
msgid " To define a named view and switch to it::"
3920
3931
msgstr ""
3921
3932
3922
#: bzrlib/builtins.py:6291
3933
#: bzrlib/builtins.py:6324
3923
3934
msgid " bzr view --name view-name file1 dir1 ..."
3924
3935
msgstr ""
3925
3936
3926
#: bzrlib/builtins.py:6293
3937
#: bzrlib/builtins.py:6326
3927
3938
msgid " To list a named view::"
3928
3939
msgstr ""
3929
3940
3930
#: bzrlib/builtins.py:6295
3941
#: bzrlib/builtins.py:6328
3931
3942
msgid " bzr view --name view-name"
3932
3943
msgstr ""
3933
3944
3934
#: bzrlib/builtins.py:6297
3945
#: bzrlib/builtins.py:6330
3935
3946
msgid " To delete a named view::"
3936
3947
msgstr ""
3937
3948
3938
#: bzrlib/builtins.py:6299
3949
#: bzrlib/builtins.py:6332
3939
3950
msgid " bzr view --name view-name --delete"
3940
3951
msgstr ""
3941
3952
3942
#: bzrlib/builtins.py:6301
3953
#: bzrlib/builtins.py:6334
3943
3954
msgid " To switch to a named view::"
3944
3955
msgstr ""
3945
3956
3946
#: bzrlib/builtins.py:6303
3957
#: bzrlib/builtins.py:6336
3947
3958
msgid " bzr view --switch view-name"
3948
3959
msgstr ""
3949
3960
3950
#: bzrlib/builtins.py:6305
3961
#: bzrlib/builtins.py:6338
3951
3962
msgid " To list all views defined::"
3952
3963
msgstr ""
3953
3964
3954
#: bzrlib/builtins.py:6307
3965
#: bzrlib/builtins.py:6340
3955
3966
msgid " bzr view --all"
3956
3967
msgstr ""
3957
3968
3958
#: bzrlib/builtins.py:6309
3969
#: bzrlib/builtins.py:6342
3959
3970
msgid " To delete all views::"
3960
3971
msgstr ""
3961
3972
3962
#: bzrlib/builtins.py:6311
3973
#: bzrlib/builtins.py:6344
3963
3974
msgid " bzr view --delete --all"
3964
3975
msgstr ""
3965
3976
3966
#: bzrlib/builtins.py:6318
3977
#: bzrlib/builtins.py:6351
3967
3978
msgid "Apply list or delete action to all views."
3968
3979
msgstr ""
3969
3980
3970
#: bzrlib/builtins.py:6321
3981
#: bzrlib/builtins.py:6354
3971
3982
msgid "Delete the view."
3972
3983
msgstr ""
3973
3984
3974
#: bzrlib/builtins.py:6324
3985
#: bzrlib/builtins.py:6357
3975
3986
msgid "Name of the view to define, list or delete."
3976
3987
msgstr ""
3977
3988
3978
#: bzrlib/builtins.py:6328
3989
#: bzrlib/builtins.py:6361
3979
3990
msgid "Name of the view to switch to."
3980
3991
msgstr ""
3981
3992
3982
#: bzrlib/builtins.py:6347
3993
#: bzrlib/builtins.py:6380
3983
3994
msgid "Both --delete and a file list specified"
3984
3995
msgstr ""
3985
3996
3986
#: bzrlib/builtins.py:6350
3997
#: bzrlib/builtins.py:6383
3987
3998
msgid "Both --delete and --switch specified"
3988
3999
msgstr ""
3989
4000
3990
#: bzrlib/builtins.py:6353
4001
#: bzrlib/builtins.py:6386
3991
4002
msgid "Deleted all views.\n"
3992
4003
msgstr ""
3993
4004
3994
#: bzrlib/builtins.py:6355
4005
#: bzrlib/builtins.py:6388
3995
4006
msgid "No current view to delete"
3996
4007
msgstr ""
3997
4008
3998
#: bzrlib/builtins.py:6358
4009
#: bzrlib/builtins.py:6391
3999
4010
#, python-format
4000
4011
msgid "Deleted '%s' view.\n"
4001
4012
msgstr ""
4002
4013
4003
#: bzrlib/builtins.py:6362
4014
#: bzrlib/builtins.py:6395
4004
4015
msgid "Both --switch and a file list specified"
4005
4016
msgstr ""
4006
4017
4007
#: bzrlib/builtins.py:6365
4018
#: bzrlib/builtins.py:6398
4008
4019
msgid "Both --switch and --all specified"
4009
4020
msgstr ""
4010
4021
4011
#: bzrlib/builtins.py:6368
4022
#: bzrlib/builtins.py:6401
4012
4023
msgid "No current view to disable"
4013
4024
msgstr ""
4014
4025
4015
#: bzrlib/builtins.py:6370
4026
#: bzrlib/builtins.py:6403
4016
4027
#, python-format
4017
4028
msgid "Disabled '%s' view.\n"
4018
4029
msgstr ""
4019
4030
4020
#: bzrlib/builtins.py:6374 bzrlib/builtins.py:6396
4031
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4021
4032
msgid "Using '{0}' view: {1}\n"
4022
4033
msgstr ""
4023
4034
4024
#: bzrlib/builtins.py:6377
4035
#: bzrlib/builtins.py:6410
4025
4036
msgid "Views defined:\n"
4026
4037
msgstr ""
4027
4038
4028
#: bzrlib/builtins.py:6386
4039
#: bzrlib/builtins.py:6419
4029
4040
msgid "No views defined.\n"
4030
4041
msgstr ""
4031
4042
4032
#: bzrlib/builtins.py:6393
4043
#: bzrlib/builtins.py:6426
4033
4044
msgid "Cannot change the 'off' pseudo view"
4034
4045
msgstr ""
4035
4046
4036
#: bzrlib/builtins.py:6401
4047
#: bzrlib/builtins.py:6434
4037
4048
msgid "No current view.\n"
4038
4049
msgstr ""
4039
4050
4040
#: bzrlib/builtins.py:6404
4051
#: bzrlib/builtins.py:6437
4041
4052
msgid "'{0}' view is: {1}\n"
4042
4053
msgstr ""
4043
4054
4044
#: bzrlib/builtins.py:6424
4055
#: bzrlib/builtins.py:6457
4045
4056
msgid " <no hooks installed>\n"
4046
4057
msgstr ""
4047
4058
4048
#: bzrlib/builtins.py:6428
4059
#: bzrlib/builtins.py:6461
4049
4060
msgid "Remove a branch."
4050
4061
msgstr ""
4051
4062
4052
#: bzrlib/builtins.py:6430
4063
#: bzrlib/builtins.py:6463
4053
4064
msgid ""
4054
4065
"This will remove the branch from the specified location but \n"
4055
4066
"will keep any working tree or repository in place."
4056
4067
msgstr ""
4057
4068
4058
#: bzrlib/builtins.py:6435
4069
#: bzrlib/builtins.py:6468
4059
4070
msgid " Remove the branch at repo/trunk::"
4060
4071
msgstr ""
4061
4072
4062
#: bzrlib/builtins.py:6437
4073
#: bzrlib/builtins.py:6470
4063
4074
msgid " bzr remove-branch repo/trunk"
4064
4075
msgstr ""
4065
4076
4066
#: bzrlib/builtins.py:6444
4077
#: bzrlib/builtins.py:6477
4067
4078
msgid "Remove branch even if it is the active branch."
4068
4079
msgstr ""
4069
4080
4070
#: bzrlib/builtins.py:6458
4081
#: bzrlib/builtins.py:6491
4071
4082
msgid "Branch is active. Use --force to remove it."
4072
4083
msgstr ""
4073
4084
4074
#: bzrlib/builtins.py:6462
4085
#: bzrlib/builtins.py:6495
4075
4086
msgid "Plaintext diff output."
4076
4087
msgstr ""
4077
4088
4078
#: bzrlib/builtins.py:6463
4089
#: bzrlib/builtins.py:6496
4079
4090
msgid "Temporarily set aside some changes from the current tree."
4080
4091
msgstr ""
4081
4092
4082
#: bzrlib/builtins.py:6465
4093
#: bzrlib/builtins.py:6498
4083
4094
msgid ""
4084
4095
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4085
4096
"ie. out of the way, until a later time when you can bring them back from\n"
4088
4099
"will they survive its deletion."
4089
4100
msgstr ""
4090
4101
4091
#: bzrlib/builtins.py:6471
4102
#: bzrlib/builtins.py:6504
4092
4103
msgid "If shelve --list is specified, previously-shelved changes are listed."
4093
4104
msgstr ""
4094
4105
4095
#: bzrlib/builtins.py:6473
4106
#: bzrlib/builtins.py:6506
4096
4107
msgid ""
4097
4108
"Shelve is intended to help separate several sets of changes that have\n"
4098
4109
"been inappropriately mingled. If you just want to get rid of all changes\n"
4100
4111
"shelve all text changes at once, use shelve --all."
4101
4112
msgstr ""
4102
4113
4103
#: bzrlib/builtins.py:6478
4114
#: bzrlib/builtins.py:6511
4104
4115
msgid ""
4105
4116
"If filenames are specified, only the changes to those files will be\n"
4106
4117
"shelved. Other files will be left untouched."
4107
4118
msgstr ""
4108
4119
4109
#: bzrlib/builtins.py:6481
4120
#: bzrlib/builtins.py:6514
4110
4121
msgid ""
4111
4122
"If a revision is specified, changes since that revision will be shelved."
4112
4123
msgstr ""
4113
4124
4114
#: bzrlib/builtins.py:6483
4125
#: bzrlib/builtins.py:6516
4115
4126
msgid ""
4116
4127
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4117
4128
"restore the most recently shelved changes."
4118
4129
msgstr ""
4119
4130
4120
#: bzrlib/builtins.py:6486
4131
#: bzrlib/builtins.py:6519
4121
4132
msgid ""
4122
4133
"For complicated changes, it is possible to edit the changes in a separate\n"
4123
4134
"editor program to decide what the file remaining in the working copy\n"
4124
4135
"should look like. To do this, add the configuration option"
4125
4136
msgstr ""
4126
4137
4127
#: bzrlib/builtins.py:6490
4138
#: bzrlib/builtins.py:6523
4128
4139
msgid " change_editor = PROGRAM @new_path @old_path"
4129
4140
msgstr ""
4130
4141
4131
#: bzrlib/builtins.py:6492
4142
#: bzrlib/builtins.py:6525
4132
4143
msgid ""
4133
4144
"where @new_path is replaced with the path of the new version of the \n"
4134
4145
"file and @old_path is replaced with the path of the old version of \n"
4137
4148
" "
4138
4149
msgstr ""
4139
4150
4140
#: bzrlib/builtins.py:6504
4151
#: bzrlib/builtins.py:6537
4141
4152
msgid "Shelve all changes."
4142
4153
msgstr ""
4143
4154
4144
#: bzrlib/builtins.py:6506
4155
#: bzrlib/builtins.py:6539
4145
4156
msgid "Method to use for writing diffs."
4146
4157
msgstr ""
4147
4158
4148
#: bzrlib/builtins.py:6506
4159
#: bzrlib/builtins.py:6539
4149
4160
msgid "writer"
4150
4161
msgstr ""
4151
4162
4152
#: bzrlib/builtins.py:6510
4163
#: bzrlib/builtins.py:6543
4153
4164
msgid "List shelved changes."
4154
4165
msgstr ""
4155
4166
4156
#: bzrlib/builtins.py:6512
4167
#: bzrlib/builtins.py:6545
4157
4168
msgid "Destroy removed changes instead of shelving them."
4158
4169
msgstr ""
4159
4170
4160
#: bzrlib/builtins.py:6541
4171
#: bzrlib/builtins.py:6574
4161
4172
msgid "No shelved changes."
4162
4173
msgstr ""
4163
4174
4164
#: bzrlib/builtins.py:6552
4175
#: bzrlib/builtins.py:6585
4165
4176
msgid "Restore shelved changes."
4166
4177
msgstr ""
4167
4178
4168
#: bzrlib/builtins.py:6554
4179
#: bzrlib/builtins.py:6587
4169
4180
msgid ""
4170
4181
"By default, the most recently shelved changes are restored. However if you\n"
4171
4182
"specify a shelf by id those changes will be restored instead. This works\n"
4172
4183
"best when the changes don't depend on each other."
4173
4184
msgstr ""
4174
4185
4175
#: bzrlib/builtins.py:6563
4186
#: bzrlib/builtins.py:6596
4176
4187
msgid "The action to perform."
4177
4188
msgstr ""
4178
4189
4179
#: bzrlib/builtins.py:6563 bzrlib/conflicts.py:694
4190
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4180
4191
msgid "action"
4181
4192
msgstr ""
4182
4193
4183
#: bzrlib/builtins.py:6565
4194
#: bzrlib/builtins.py:6598
4184
4195
msgid "Apply changes and remove from the shelf."
4185
4196
msgstr ""
4186
4197
4187
#: bzrlib/builtins.py:6566
4198
#: bzrlib/builtins.py:6599
4188
4199
msgid "Show changes, but do not apply or remove them."
4189
4200
msgstr ""
4190
4201
4191
#: bzrlib/builtins.py:6567
4202
#: bzrlib/builtins.py:6600
4192
4203
msgid ""
4193
4204
"Instead of unshelving the changes, show the diff that would result from "
4194
4205
"unshelving."
4195
4206
msgstr ""
4196
4207
4197
#: bzrlib/builtins.py:6569
4208
#: bzrlib/builtins.py:6602
4198
4209
msgid "Delete changes without applying them."
4199
4210
msgstr ""
4200
4211
4201
#: bzrlib/builtins.py:6570
4212
#: bzrlib/builtins.py:6603
4202
4213
msgid "Apply changes but don't delete them."
4203
4214
msgstr ""
4204
4215
4205
#: bzrlib/builtins.py:6585
4216
#: bzrlib/builtins.py:6618
4206
4217
msgid "Remove unwanted files from working tree."
4207
4218
msgstr ""
4208
4219
4209
#: bzrlib/builtins.py:6587
4220
#: bzrlib/builtins.py:6620
4210
4221
msgid ""
4211
4222
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4212
4223
"files are never deleted."
4213
4224
msgstr ""
4214
4225
4215
#: bzrlib/builtins.py:6590
4226
#: bzrlib/builtins.py:6623
4216
4227
msgid ""
4217
4228
"Another class is 'detritus', which includes files emitted by bzr during\n"
4218
4229
"normal operations and selftests. (The value of these files decreases with\n"
4219
4230
"time.)"
4220
4231
msgstr ""
4221
4232
4222
#: bzrlib/builtins.py:6594
4233
#: bzrlib/builtins.py:6627
4223
4234
msgid ""
4224
4235
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4225
4236
"flags are respected, and may be combined."
4226
4237
msgstr ""
4227
4238
4228
#: bzrlib/builtins.py:6597
4239
#: bzrlib/builtins.py:6630
4229
4240
msgid "To check what clean-tree will do, use --dry-run."
4230
4241
msgstr ""
4231
4242
4232
#: bzrlib/builtins.py:6600
4243
#: bzrlib/builtins.py:6633
4233
4244
msgid "Delete all ignored files."
4234
4245
msgstr ""
4235
4246
4236
#: bzrlib/builtins.py:6601
4247
#: bzrlib/builtins.py:6634
4237
4248
msgid ""
4238
4249
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4239
4250
msgstr ""
4240
4251
4241
#: bzrlib/builtins.py:6604
4252
#: bzrlib/builtins.py:6637
4242
4253
msgid "Delete files unknown to bzr (default)."
4243
4254
msgstr ""
4244
4255
4245
#: bzrlib/builtins.py:6605
4256
#: bzrlib/builtins.py:6638
4246
4257
msgid "Show files to delete instead of deleting them."
4247
4258
msgstr ""
4248
4259
4249
#: bzrlib/builtins.py:6607
4260
#: bzrlib/builtins.py:6640
4250
4261
msgid "Do not prompt before deleting."
4251
4262
msgstr ""
4252
4263
4306
4317
msgstr[0] ""
4307
4318
msgstr[1] ""
4308
4319
4309
#: bzrlib/bzrdir.py:486
4320
#: bzrlib/bzrdir.py:487
4310
4321
msgid ""
4311
4322
"making backup of {0}\n"
4312
4323
" to {1}"
4313
4324
msgstr ""
4314
4325
4315
#: bzrlib/bzrdir.py:509
4326
#: bzrlib/bzrdir.py:510
4316
4327
msgid "renamed {0} to {1}"
4317
4328
msgstr ""
4318
4329
4319
#: bzrlib/bzrdir.py:1638
4330
#: bzrlib/bzrdir.py:1639
4320
4331
#, python-format
4321
4332
msgid ""
4322
4333
"Source repository format does not support stacking, using format:\n"
4323
4334
" %s"
4324
4335
msgstr ""
4325
4336
4326
#: bzrlib/bzrdir.py:1658
4337
#: bzrlib/bzrdir.py:1659
4327
4338
#, python-format
4328
4339
msgid ""
4329
4340
"Source branch format does not support stacking, using format:\n"
4330
4341
" %s"
4331
4342
msgstr ""
4332
4343
4333
#: bzrlib/bzrdir.py:1804
4344
#: bzrlib/bzrdir.py:1805
4334
4345
msgid "starting repository conversion"
4335
4346
msgstr ""
4336
4347
4337
#: bzrlib/bzrdir.py:2025
4348
#: bzrlib/bzrdir.py:2026
4338
4349
msgid "Using default stacking branch {0} at {1}"
4339
4350
msgstr ""
4340
4351
4517
4528
"supported formats or in a custom format based on a template."
4518
4529
msgstr ""
4519
4530
4520
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4521
#: en/help_topics/configuration.txt:710
4531
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4532
#: en/help_topics/configuration.txt:722
4522
4533
msgid "For example::"
4523
4534
msgstr ""
4524
4535
4762
4773
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4763
4774
msgstr ""
4764
4775
4765
#: bzrlib/config.py:2451
4776
#: bzrlib/config.py:2452
4766
4777
msgid "{0} is not an SI unit."
4767
4778
msgstr ""
4768
4779
4769
#: bzrlib/config.py:2970
4780
#: bzrlib/config.py:2971
4770
4781
msgid ""
4771
4782
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4772
4783
"will be saved."
4773
4784
msgstr ""
4774
4785
4775
#: bzrlib/config.py:3114
4786
#: bzrlib/config.py:3116
4776
4787
#, python-format
4777
4788
msgid "Invalid '%s', should be of the form 'name=value'"
4778
4789
msgstr ""
4779
4790
4780
#: bzrlib/config.py:4004
4791
#: bzrlib/config.py:4018
4781
4792
msgid "Display, set or remove a configuration option."
4782
4793
msgstr ""
4783
4794
4784
#: bzrlib/config.py:4006
4795
#: bzrlib/config.py:4020
4785
4796
msgid "Display the active value for a given option."
4786
4797
msgstr ""
4787
4798
4788
#: bzrlib/config.py:4008
4799
#: bzrlib/config.py:4022
4789
4800
msgid ""
4790
4801
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4791
4802
"matching options are displayed mentioning their scope. The active value\n"
4792
4803
"that bzr will take into account is the first one displayed for each option."
4793
4804
msgstr ""
4794
4805
4795
#: bzrlib/config.py:4012
4806
#: bzrlib/config.py:4026
4796
4807
msgid "If no NAME is given, --all .* is implied."
4797
4808
msgstr ""
4798
4809
4799
#: bzrlib/config.py:4014
4810
#: bzrlib/config.py:4028
4800
4811
msgid ""
4801
4812
"Setting a value is achieved by using name=value without spaces. The value\n"
4802
4813
"is set in the most relevant scope and can be checked by displaying the\n"
4803
4814
"option again."
4804
4815
msgstr ""
4805
4816
4806
#: bzrlib/config.py:4026
4817
#: bzrlib/config.py:4040
4807
4818
msgid "Reduce the scope to the specified configuration file."
4808
4819
msgstr ""
4809
4820
4810
#: bzrlib/config.py:4030
4821
#: bzrlib/config.py:4044
4811
4822
msgid "Display all the defined values for the matching options."
4812
4823
msgstr ""
4813
4824
4814
#: bzrlib/config.py:4032
4825
#: bzrlib/config.py:4046
4815
4826
msgid "Remove the option from the configuration file."
4816
4827
msgstr ""
4817
4828
7062
7073
msgid "bzr: ERROR (ignored): %s"
7063
7074
msgstr ""
7064
7075
7065
#: bzrlib/remote.py:2541
7076
#: bzrlib/remote.py:2534
7066
7077
msgid "Copying repository content as tarball..."
7067
7078
msgstr ""
7068
7079
7078
7089
msgid "{0} => {1}"
7079
7090
msgstr ""
7080
7091
7081
#: bzrlib/repository.py:1799
7092
#: bzrlib/repository.py:1738
7082
7093
msgid "Moving repository to repository.backup"
7083
7094
msgstr ""
7084
7095
7085
#: bzrlib/repository.py:1806
7096
#: bzrlib/repository.py:1745
7086
7097
msgid "Creating new repository"
7087
7098
msgstr ""
7088
7099
7089
#: bzrlib/repository.py:1811
7100
#: bzrlib/repository.py:1750
7090
7101
msgid "Copying content"
7091
7102
msgstr ""
7092
7103
7093
#: bzrlib/repository.py:1815
7104
#: bzrlib/repository.py:1754
7094
7105
msgid "Deleting old repository content"
7095
7106
msgstr ""
7096
7107
7097
#: bzrlib/repository.py:1817
7108
#: bzrlib/repository.py:1756
7098
7109
msgid "repository converted"
7099
7110
msgstr ""
7100
7111
7320
7331
msgid "adding file"
7321
7332
msgstr ""
7322
7333
7323
#: bzrlib/transform.py:2590
7334
#: bzrlib/transform.py:2598
7324
7335
msgid "Building tree"
7325
7336
msgstr ""
7326
7337
7327
#: bzrlib/transform.py:2680 bzrlib/transform.py:2707
7338
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7328
7339
msgid "Adding file contents"
7329
7340
msgstr ""
7330
7341
7331
#: bzrlib/transform.py:3009
7342
#: bzrlib/transform.py:3017
7332
7343
msgid "Resolution pass"
7333
7344
msgstr ""
7334
7345
7337
7348
msgid "Authenticated as %s"
7338
7349
msgstr ""
7339
7350
7340
#: bzrlib/tree.py:637
7351
#: bzrlib/tree.py:647
7341
7352
msgid "*** {0} content-filter: {1} => {2!r}"
7342
7353
msgstr ""
7343
7354
7477
7488
7478
7489
#: dummy/help_topics/basic/detail.txt:1
7479
7490
msgid ""
7480
"Bazaar 2.6.0dev1 -- a free distributed version-control tool\n"
7491
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7481
7492
"http://bazaar.canonical.com/"
7482
7493
msgstr ""
7483
7494
7795
7806
msgid "How to fix diverged branches"
7796
7807
msgstr ""
7797
7808
7798
#: dummy/help_topics/env-variables/detail.txt:1
7799
msgid "Environment Variables"
7800
msgstr ""
7801
7802
#: dummy/help_topics/env-variables/detail.txt:3
7803
msgid ""
7804
"=================== "
7805
"===========================================================\n"
7806
"BZRPATH Path where bzr is to look for shell plugin external\n"
7807
" commands.\n"
7808
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7809
"EMAIL E-Mail address of the user.\n"
7810
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7811
"EDITOR Editor for editing commit messages.\n"
7812
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7813
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7814
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7815
"BZR_PLUGIN_PATH.\n"
7816
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7817
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7818
"and\n"
7819
" HOME.\n"
7820
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7821
"URLs).\n"
7822
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7823
"sshcorp,\n"
7824
" plink or lsh.\n"
7825
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7826
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7827
"BZR_COLUMNS Override implicit terminal width.\n"
7828
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7829
"(selftest)\n"
7830
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7831
"'text'.\n"
7832
"BZR_PDB Control whether to launch a debugger on error.\n"
7833
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7834
" breakin debugger.\n"
7835
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7836
"(instead\n"
7837
" of char-based).\n"
7838
"=================== "
7839
"===========================================================\n"
7840
msgstr ""
7841
7842
7809
#: dummy/help_topics/env-variables/summary.txt:1
7843
7810
msgid "Environment variable names and values"
7844
7811
msgstr ""
8839
8806
msgid " bzr commit --fixes <tracker>:<id>"
8840
8807
msgstr ""
8841
8808
8842
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8809
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8843
8810
msgid "or::"
8844
8811
msgstr ""
8845
8812
9074
9041
"remove-tree Remove the working tree from a given branch/checkout.\n"
9075
9042
"renames Show list of renamed files.\n"
9076
9043
"resolve Mark a conflict as resolved.\n"
9077
"revert Revert files to a previous revision.\n"
9044
"revert Set files in the working tree back to the contents of a\n"
9045
" previous revision.\n"
9078
9046
"revno Show current revision number.\n"
9079
9047
"root Show the tree root directory.\n"
9080
9048
"send Mail or create a merge-directive for submitting changes.\n"
9732
9700
9733
9701
#: en/help_topics/configuration.txt:336
9734
9702
msgid ""
9703
"Another such option is ``branchname``, which refers to the name of a "
9704
"colocated\n"
9705
"branch. For non-colocated branches, it behaves like basename. It can be "
9706
"used\n"
9707
"like this::"
9708
msgstr ""
9709
9710
#: en/help_topics/configuration.txt:340
9711
msgid ""
9712
" [/home/vila/src/bzr/bugs]\n"
9713
" mypush = lp:~vila/bzr/{branchname}"
9714
msgstr ""
9715
9716
#: en/help_topics/configuration.txt:343
9717
msgid ""
9718
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9719
"get::"
9720
msgstr ""
9721
9722
#: en/help_topics/configuration.txt:345
9723
msgid ""
9724
" bzr config mypush\n"
9725
" lp:~vila/bzr/832013-expand-in-stack"
9726
msgstr ""
9727
9728
#: en/help_topics/configuration.txt:348
9729
msgid ""
9735
9730
"When an option is local to a Section, it cannot be referred to from option\n"
9736
9731
"values in any other section from the same ``Store`` nor from any other\n"
9737
9732
"``Store``."
9738
9733
msgstr ""
9739
9734
9740
#: en/help_topics/configuration.txt:340
9735
#: en/help_topics/configuration.txt:352
9741
9736
msgid ""
9742
9737
"\n"
9743
9738
"The main configuration file, bazaar.conf\n"
9744
9739
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9745
9740
msgstr ""
9746
9741
9747
#: en/help_topics/configuration.txt:344
9742
#: en/help_topics/configuration.txt:356
9748
9743
msgid ""
9749
9744
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9750
9745
"The default section contains the default\n"
9752
9747
"overriden by providing a branch-specific section in ``locations.conf``."
9753
9748
msgstr ""
9754
9749
9755
#: en/help_topics/configuration.txt:349
9750
#: en/help_topics/configuration.txt:361
9756
9751
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9757
9752
msgstr ""
9758
9753
9759
#: en/help_topics/configuration.txt:351
9754
#: en/help_topics/configuration.txt:363
9760
9755
msgid ""
9761
9756
" [DEFAULT]\n"
9762
9757
" email = John Doe <jdoe@isp.com>\n"
9764
9759
" create_signatures = when-required"
9765
9760
msgstr ""
9766
9761
9767
#: en/help_topics/configuration.txt:356
9762
#: en/help_topics/configuration.txt:368
9768
9763
msgid ""
9769
9764
"\n"
9770
9765
"The branch location configuration file, locations.conf\n"
9771
9766
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9772
9767
msgstr ""
9773
9768
9774
#: en/help_topics/configuration.txt:360
9769
#: en/help_topics/configuration.txt:372
9775
9770
msgid ""
9776
9771
"``locations.conf`` allows one to specify overriding settings for\n"
9777
9772
"a specific branch. The format is almost identical to the default section in\n"
9781
9776
"for. The '?' and '*' wildcards are supported::"
9782
9777
msgstr ""
9783
9778
9784
#: en/help_topics/configuration.txt:366
9779
#: en/help_topics/configuration.txt:378
9785
9780
msgid ""
9786
9781
" [/home/jdoe/branches/nethack]\n"
9787
9782
" email = Nethack Admin <nethack@nethack.com>"
9788
9783
msgstr ""
9789
9784
9790
#: en/help_topics/configuration.txt:369
9785
#: en/help_topics/configuration.txt:381
9791
9786
msgid ""
9792
9787
" [http://hypothetical.site.com/branches/devel-branch]\n"
9793
9788
" create_signatures = always"
9794
9789
msgstr ""
9795
9790
9796
#: en/help_topics/configuration.txt:372
9791
#: en/help_topics/configuration.txt:384
9797
9792
msgid ""
9798
9793
"The authentication configuration file, authentication.conf\n"
9799
9794
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9800
9795
msgstr ""
9801
9796
9802
#: en/help_topics/configuration.txt:375
9797
#: en/help_topics/configuration.txt:387
9803
9798
msgid ""
9804
9799
"``authentication.conf`` allows one to specify credentials for\n"
9805
9800
"remote servers. This can be used for all the supported transports and any "
9807
9802
"of bzr that requires authentication (smtp for example)."
9808
9803
msgstr ""
9809
9804
9810
#: en/help_topics/configuration.txt:379
9805
#: en/help_topics/configuration.txt:391
9811
9806
msgid ""
9812
9807
"The syntax of the file obeys the same rules as the others except for the\n"
9813
9808
"option policies which don't apply."
9814
9809
msgstr ""
9815
9810
9816
#: en/help_topics/configuration.txt:382
9811
#: en/help_topics/configuration.txt:394
9817
9812
msgid ""
9818
9813
"For more information on the possible uses of the authentication "
9819
9814
"configuration\n"
9820
9815
"file see :doc:`authentication-help`."
9821
9816
msgstr ""
9822
9817
9823
#: en/help_topics/configuration.txt:385
9818
#: en/help_topics/configuration.txt:397
9824
9819
msgid ""
9825
9820
"\n"
9826
9821
"Common options\n"
9827
9822
"--------------"
9828
9823
msgstr ""
9829
9824
9830
#: en/help_topics/configuration.txt:389
9825
#: en/help_topics/configuration.txt:401
9831
9826
msgid ""
9832
9827
"debug_flags\n"
9833
9828
"~~~~~~~~~~~"
9834
9829
msgstr ""
9835
9830
9836
#: en/help_topics/configuration.txt:392
9831
#: en/help_topics/configuration.txt:404
9837
9832
msgid ""
9838
9833
"A comma-separated list of debugging options to turn on. The same values\n"
9839
9834
"can be used as with the -D command-line option (see `help global-options`).\n"
9840
9835
"For example::"
9841
9836
msgstr ""
9842
9837
9843
#: en/help_topics/configuration.txt:396
9838
#: en/help_topics/configuration.txt:408
9844
9839
msgid " debug_flags = hpss"
9845
9840
msgstr ""
9846
9841
9847
#: en/help_topics/configuration.txt:400
9842
#: en/help_topics/configuration.txt:412
9848
9843
msgid " debug_flags = hpss,evil"
9849
9844
msgstr ""
9850
9845
9851
#: en/help_topics/configuration.txt:402
9846
#: en/help_topics/configuration.txt:414
9852
9847
msgid ""
9853
9848
"email\n"
9854
9849
"~~~~~"
9855
9850
msgstr ""
9856
9851
9857
#: en/help_topics/configuration.txt:405
9852
#: en/help_topics/configuration.txt:417
9858
9853
msgid ""
9859
9854
"The email address to use when committing a branch. Typically takes the form\n"
9860
9855
"of::"
9861
9856
msgstr ""
9862
9857
9863
#: en/help_topics/configuration.txt:408
9858
#: en/help_topics/configuration.txt:420
9864
9859
msgid " email = Full Name <account@hostname.tld>"
9865
9860
msgstr ""
9866
9861
9867
#: en/help_topics/configuration.txt:410
9862
#: en/help_topics/configuration.txt:422
9868
9863
msgid ""
9869
9864
"editor\n"
9870
9865
"~~~~~~"
9871
9866
msgstr ""
9872
9867
9873
#: en/help_topics/configuration.txt:413
9868
#: en/help_topics/configuration.txt:425
9874
9869
msgid ""
9875
9870
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9876
9871
"a commit message. This setting is trumped by the environment variable\n"
9878
9873
"variables."
9879
9874
msgstr ""
9880
9875
9881
#: en/help_topics/configuration.txt:418
9876
#: en/help_topics/configuration.txt:430
9882
9877
msgid ""
9883
9878
"log_format\n"
9884
9879
"~~~~~~~~~~"
9885
9880
msgstr ""
9886
9881
9887
#: en/help_topics/configuration.txt:421
9882
#: en/help_topics/configuration.txt:433
9888
9883
msgid ""
9889
9884
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9890
9885
"and ``line``. Additional formats may be provided by plugins. The default\n"
9891
9886
"value is ``long``."
9892
9887
msgstr ""
9893
9888
9894
#: en/help_topics/configuration.txt:425
9889
#: en/help_topics/configuration.txt:437
9895
9890
msgid ""
9896
9891
"check_signatures\n"
9897
9892
"~~~~~~~~~~~~~~~~"
9898
9893
msgstr ""
9899
9894
9900
#: en/help_topics/configuration.txt:428
9895
#: en/help_topics/configuration.txt:440
9901
9896
msgid ""
9902
9897
"Reserved for future use. These options will allow a policy for branches to\n"
9903
9898
"require signatures."
9904
9899
msgstr ""
9905
9900
9906
#: en/help_topics/configuration.txt:431
9901
#: en/help_topics/configuration.txt:443
9907
9902
msgid ""
9908
9903
"require\n"
9909
9904
" The gnupg signature for revisions must be present and must be valid."
9910
9905
msgstr ""
9911
9906
9912
#: en/help_topics/configuration.txt:434
9907
#: en/help_topics/configuration.txt:446
9913
9908
msgid ""
9914
9909
"ignore\n"
9915
9910
" Do not check gnupg signatures of revisions."
9916
9911
msgstr ""
9917
9912
9918
#: en/help_topics/configuration.txt:437
9913
#: en/help_topics/configuration.txt:449
9919
9914
msgid ""
9920
9915
"check-available\n"
9921
9916
" (default) If gnupg signatures for revisions are present, check them.\n"
9923
9918
" no signature is present."
9924
9919
msgstr ""
9925
9920
9926
#: en/help_topics/configuration.txt:442
9921
#: en/help_topics/configuration.txt:454
9927
9922
msgid ""
9928
9923
"create_signatures\n"
9929
9924
"~~~~~~~~~~~~~~~~~"
9930
9925
msgstr ""
9931
9926
9932
#: en/help_topics/configuration.txt:445
9927
#: en/help_topics/configuration.txt:457
9933
9928
msgid ""
9934
9929
"Defines the behaviour of signing revisions on commits. By default bzr will "
9935
9930
"not\n"
9936
9931
"sign new commits."
9937
9932
msgstr ""
9938
9933
9939
#: en/help_topics/configuration.txt:448
9934
#: en/help_topics/configuration.txt:460
9940
9935
msgid ""
9941
9936
"always\n"
9942
9937
" Sign every new revision that is committed. If the signing fails then "
9944
9939
" commit will not be made."
9945
9940
msgstr ""
9946
9941
9947
#: en/help_topics/configuration.txt:452
9942
#: en/help_topics/configuration.txt:464
9948
9943
msgid ""
9949
9944
"when-required\n"
9950
9945
" Reserved for future use."
9951
9946
msgstr ""
9952
9947
9953
#: en/help_topics/configuration.txt:455
9948
#: en/help_topics/configuration.txt:467
9954
9949
msgid ""
9955
9950
"never\n"
9956
9951
" Reserved for future use."
9957
9952
msgstr ""
9958
9953
9959
#: en/help_topics/configuration.txt:458
9954
#: en/help_topics/configuration.txt:470
9960
9955
msgid ""
9961
9956
"In future it is planned that ``when-required`` will sign newly\n"
9962
9957
"committed revisions only when the branch requires them. ``never`` will "
9964
9959
"to sign newly committed revisions, even if the branch requires signatures."
9965
9960
msgstr ""
9966
9961
9967
#: en/help_topics/configuration.txt:462
9962
#: en/help_topics/configuration.txt:474
9968
9963
msgid ""
9969
9964
"dirstate.fdatasync\n"
9970
9965
"~~~~~~~~~~~~~~~~~~"
9971
9966
msgstr ""
9972
9967
9973
#: en/help_topics/configuration.txt:465
9968
#: en/help_topics/configuration.txt:477
9974
9969
msgid ""
9975
9970
"If true (default), working tree metadata changes are flushed through the\n"
9976
9971
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9977
9972
"should not be lost if the machine crashes. See also repository.fdatasync."
9978
9973
msgstr ""
9979
9974
9980
#: en/help_topics/configuration.txt:469
9975
#: en/help_topics/configuration.txt:481
9981
9976
msgid ""
9982
9977
"gpg_signing_key\n"
9983
9978
"~~~~~~~~~~~~~~~"
9984
9979
msgstr ""
9985
9980
9986
#: en/help_topics/configuration.txt:472
9981
#: en/help_topics/configuration.txt:484
9987
9982
msgid ""
9988
9983
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9989
9984
"address, key fingerprint or full key ID. When unset or when set to\n"
9990
9985
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9991
9986
msgstr ""
9992
9987
9993
#: en/help_topics/configuration.txt:476
9988
#: en/help_topics/configuration.txt:488
9994
9989
msgid ""
9995
9990
"recurse\n"
9996
9991
"~~~~~~~"
9997
9992
msgstr ""
9998
9993
9999
#: en/help_topics/configuration.txt:479
9994
#: en/help_topics/configuration.txt:491
10000
9995
msgid ""
10001
9996
"Only useful in ``locations.conf``. Defines whether or not the\n"
10002
9997
"configuration for this section applies to subdirectories:"
10003
9998
msgstr ""
10004
9999
10005
#: en/help_topics/configuration.txt:482
10000
#: en/help_topics/configuration.txt:494
10006
10001
msgid ""
10007
10002
"true\n"
10008
10003
" (default) This section applies to subdirectories as well."
10009
10004
msgstr ""
10010
10005
10011
#: en/help_topics/configuration.txt:485
10006
#: en/help_topics/configuration.txt:497
10012
10007
msgid ""
10013
10008
"false\n"
10014
10009
" This section only applies to the branch at this directory and not\n"
10015
10010
" branches below it."
10016
10011
msgstr ""
10017
10012
10018
#: en/help_topics/configuration.txt:489
10013
#: en/help_topics/configuration.txt:501
10019
10014
msgid ""
10020
10015
"gpg_signing_command\n"
10021
10016
"~~~~~~~~~~~~~~~~~~~"
10022
10017
msgstr ""
10023
10018
10024
#: en/help_topics/configuration.txt:492
10019
#: en/help_topics/configuration.txt:504
10025
10020
msgid ""
10026
10021
"(Default: \"gpg\"). Which program should be used to sign and check "
10027
10022
"revisions.\n"
10028
10023
"For example::"
10029
10024
msgstr ""
10030
10025
10031
#: en/help_topics/configuration.txt:495
10026
#: en/help_topics/configuration.txt:507
10032
10027
msgid " gpg_signing_command = /usr/bin/gnpg"
10033
10028
msgstr ""
10034
10029
10035
#: en/help_topics/configuration.txt:497
10030
#: en/help_topics/configuration.txt:509
10036
10031
msgid ""
10037
10032
"The specified command must accept the options \"--clearsign\" and \"-u "
10038
10033
"<email>\"."
10039
10034
msgstr ""
10040
10035
10041
#: en/help_topics/configuration.txt:499
10036
#: en/help_topics/configuration.txt:511
10042
10037
msgid ""
10043
10038
"bzr_remote_path\n"
10044
10039
"~~~~~~~~~~~~~~~"
10045
10040
msgstr ""
10046
10041
10047
#: en/help_topics/configuration.txt:502
10042
#: en/help_topics/configuration.txt:514
10048
10043
msgid ""
10049
10044
"(Default: \"bzr\"). The path to the command that should be used to run the "
10050
10045
"smart\n"
10051
10046
"server for bzr. This value may only be specified in locations.conf, because:"
10052
10047
msgstr ""
10053
10048
10054
#: en/help_topics/configuration.txt:505
10049
#: en/help_topics/configuration.txt:517
10055
10050
msgid ""
10056
10051
"- it's needed before branch.conf is accessible\n"
10057
10052
"- allowing remote branch.conf files to specify commands would be a security\n"
10058
10053
" risk"
10059
10054
msgstr ""
10060
10055
10061
#: en/help_topics/configuration.txt:509
10056
#: en/help_topics/configuration.txt:521
10062
10057
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10063
10058
msgstr ""
10064
10059
10065
#: en/help_topics/configuration.txt:511
10060
#: en/help_topics/configuration.txt:523
10066
10061
msgid ""
10067
10062
"smtp_server\n"
10068
10063
"~~~~~~~~~~~"
10069
10064
msgstr ""
10070
10065
10071
#: en/help_topics/configuration.txt:514
10066
#: en/help_topics/configuration.txt:526
10072
10067
msgid ""
10073
10068
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10074
10069
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10075
10070
msgstr ""
10076
10071
10077
#: en/help_topics/configuration.txt:517
10072
#: en/help_topics/configuration.txt:529
10078
10073
msgid ""
10079
10074
"smtp_username, smtp_password\n"
10080
10075
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10081
10076
msgstr ""
10082
10077
10083
#: en/help_topics/configuration.txt:520
10078
#: en/help_topics/configuration.txt:532
10084
10079
msgid ""
10085
10080
"User and password to authenticate to the SMTP server. If smtp_username\n"
10086
10081
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10088
10083
"to send mail."
10089
10084
msgstr ""
10090
10085
10091
#: en/help_topics/configuration.txt:525
10086
#: en/help_topics/configuration.txt:537
10092
10087
msgid ""
10093
10088
"locks.steal_dead\n"
10094
10089
"~~~~~~~~~~~~~~~~"
10095
10090
msgstr ""
10096
10091
10097
#: en/help_topics/configuration.txt:528
10092
#: en/help_topics/configuration.txt:540
10098
10093
msgid ""
10099
10094
"If set to true, bzr will automatically break locks held by processes from\n"
10100
10095
"the same machine and user that are no longer alive. Otherwise, it will\n"
10102
10097
"the object is no longer in use."
10103
10098
msgstr ""
10104
10099
10105
#: en/help_topics/configuration.txt:533
10100
#: en/help_topics/configuration.txt:545
10106
10101
msgid ""
10107
10102
"mail_client\n"
10108
10103
"~~~~~~~~~~~"
10109
10104
msgstr ""
10110
10105
10111
#: en/help_topics/configuration.txt:536
10106
#: en/help_topics/configuration.txt:548
10112
10107
msgid ""
10113
10108
"A mail client to use for sending merge requests.\n"
10114
10109
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10117
10112
"``editor``."
10118
10113
msgstr ""
10119
10114
10120
#: en/help_topics/configuration.txt:541
10115
#: en/help_topics/configuration.txt:553
10121
10116
msgid "Supported values for specific clients:"
10122
10117
msgstr ""
10123
10118
10124
#: en/help_topics/configuration.txt:543
10119
#: en/help_topics/configuration.txt:555
10125
10120
msgid ""
10126
10121
":claws: Use Claws. This skips a dialog for attaching files.\n"
10127
10122
":evolution: Use Evolution.\n"
10132
10127
" this works around some bugs that xdg-email doesn't handle."
10133
10128
msgstr ""
10134
10129
10135
#: en/help_topics/configuration.txt:550
10130
#: en/help_topics/configuration.txt:562
10136
10131
msgid "Supported generic values are:"
10137
10132
msgstr ""
10138
10133
10139
#: en/help_topics/configuration.txt:552
10134
#: en/help_topics/configuration.txt:564
10140
10135
msgid ""
10141
10136
":default: See above.\n"
10142
10137
":editor: Use your editor to compose the merge request. This also uses\n"
10146
10141
":xdg-email: Use xdg-email to run your preferred mail program"
10147
10142
msgstr ""
10148
10143
10149
#: en/help_topics/configuration.txt:559
10144
#: en/help_topics/configuration.txt:571
10150
10145
msgid ""
10151
10146
"repository.fdatasync\n"
10152
10147
"~~~~~~~~~~~~~~~~~~~~"
10153
10148
msgstr ""
10154
10149
10155
#: en/help_topics/configuration.txt:562
10150
#: en/help_topics/configuration.txt:574
10156
10151
msgid ""
10157
10152
"If true (default), repository changes are flushed through the OS buffers\n"
10158
10153
"to physical disk. This is somewhat slower, but means data should not be\n"
10159
10154
"lost if the machine crashes. See also dirstate.fdatasync."
10160
10155
msgstr ""
10161
10156
10162
#: en/help_topics/configuration.txt:566
10157
#: en/help_topics/configuration.txt:578
10163
10158
msgid ""
10164
10159
"submit_branch\n"
10165
10160
"~~~~~~~~~~~~~"
10166
10161
msgstr ""
10167
10162
10168
#: en/help_topics/configuration.txt:569
10163
#: en/help_topics/configuration.txt:581
10169
10164
msgid ""
10170
10165
"The branch you intend to submit your current work to. This is "
10171
10166
"automatically\n"
10174
10169
"should usually be set on a per-branch or per-location basis."
10175
10170
msgstr ""
10176
10171
10177
#: en/help_topics/configuration.txt:573
10172
#: en/help_topics/configuration.txt:585
10178
10173
msgid ""
10179
10174
"public_branch\n"
10180
10175
"~~~~~~~~~~~~~"
10181
10176
msgstr ""
10182
10177
10183
#: en/help_topics/configuration.txt:576
10178
#: en/help_topics/configuration.txt:588
10184
10179
msgid ""
10185
10180
"A publically-accessible version of this branch (implying that this version "
10186
10181
"is\n"
10187
10182
"not publically-accessible). Used (and set) by ``bzr send``."
10188
10183
msgstr ""
10189
10184
10190
#: en/help_topics/configuration.txt:579
10185
#: en/help_topics/configuration.txt:591
10191
10186
msgid ""
10192
10187
"suppress_warnings\n"
10193
10188
"~~~~~~~~~~~~~~~~~"
10194
10189
msgstr ""
10195
10190
10196
#: en/help_topics/configuration.txt:582
10191
#: en/help_topics/configuration.txt:594
10197
10192
msgid ""
10198
10193
"A list of strings, each string represent a warning that can be emitted by\n"
10199
10194
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10200
10195
msgstr ""
10201
10196
10202
#: en/help_topics/configuration.txt:585
10197
#: en/help_topics/configuration.txt:597
10203
10198
msgid "Valid values:"
10204
10199
msgstr ""
10205
10200
10206
#: en/help_topics/configuration.txt:587
10201
#: en/help_topics/configuration.txt:599
10207
10202
msgid ""
10208
10203
"* ``format_deprecation``:\n"
10209
10204
" whether the format deprecation warning is shown on repositories that "
10211
10206
" using deprecated formats."
10212
10207
msgstr ""
10213
10208
10214
#: en/help_topics/configuration.txt:591
10209
#: en/help_topics/configuration.txt:603
10215
10210
msgid ""
10216
10211
"default_format\n"
10217
10212
"~~~~~~~~~~~~~~"
10218
10213
msgstr ""
10219
10214
10220
#: en/help_topics/configuration.txt:594
10215
#: en/help_topics/configuration.txt:606
10221
10216
msgid ""
10222
10217
"A format name for the default format used when creating branches. See "
10223
10218
"``bzr\n"
10224
10219
"help formats`` for possible values."
10225
10220
msgstr ""
10226
10221
10227
#: en/help_topics/configuration.txt:597
10222
#: en/help_topics/configuration.txt:609
10228
10223
msgid ""
10229
10224
"\n"
10230
10225
"Unicode options\n"
10231
10226
"---------------"
10232
10227
msgstr ""
10233
10228
10234
#: en/help_topics/configuration.txt:601
10229
#: en/help_topics/configuration.txt:613
10235
10230
msgid ""
10236
10231
"output_encoding\n"
10237
10232
"~~~~~~~~~~~~~~~"
10238
10233
msgstr ""
10239
10234
10240
#: en/help_topics/configuration.txt:604
10235
#: en/help_topics/configuration.txt:616
10241
10236
msgid ""
10242
10237
"A Python unicode encoding name for text output from bzr, such as log\n"
10243
10238
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10244
10239
"is the terminal encoding prefered by the operating system."
10245
10240
msgstr ""
10246
10241
10247
#: en/help_topics/configuration.txt:608
10242
#: en/help_topics/configuration.txt:620
10248
10243
msgid ""
10249
10244
"\n"
10250
10245
"Branch type specific options\n"
10251
10246
"----------------------------"
10252
10247
msgstr ""
10253
10248
10254
#: en/help_topics/configuration.txt:612
10249
#: en/help_topics/configuration.txt:624
10255
10250
msgid ""
10256
10251
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10257
10252
"later format. They\n"
10259
10254
"manually set in ``locations.conf`` or ``bazaar.conf``."
10260
10255
msgstr ""
10261
10256
10262
#: en/help_topics/configuration.txt:617
10257
#: en/help_topics/configuration.txt:629
10263
10258
msgid ""
10264
10259
"append_revisions_only\n"
10265
10260
"~~~~~~~~~~~~~~~~~~~~~"
10266
10261
msgstr ""
10267
10262
10268
#: en/help_topics/configuration.txt:620
10263
#: en/help_topics/configuration.txt:632
10269
10264
msgid ""
10270
10265
"If set to \"True\" then revisions can only be appended to the log, not\n"
10271
10266
"removed. A branch with this setting enabled can only pull from another\n"
10275
10270
"compatibility with previous bzr versions (older than 2.2)."
10276
10271
msgstr ""
10277
10272
10278
#: en/help_topics/configuration.txt:627
10273
#: en/help_topics/configuration.txt:639
10279
10274
msgid ""
10280
10275
"parent_location\n"
10281
10276
"~~~~~~~~~~~~~~~"
10282
10277
msgstr ""
10283
10278
10284
#: en/help_topics/configuration.txt:630
10279
#: en/help_topics/configuration.txt:642
10285
10280
msgid ""
10286
10281
"If present, the location of the default branch for pull or merge. This "
10287
10282
"option\n"
10289
10284
"--remember``."
10290
10285
msgstr ""
10291
10286
10292
#: en/help_topics/configuration.txt:634
10287
#: en/help_topics/configuration.txt:646
10293
10288
msgid ""
10294
10289
"push_location\n"
10295
10290
"~~~~~~~~~~~~~"
10296
10291
msgstr ""
10297
10292
10298
#: en/help_topics/configuration.txt:637
10293
#: en/help_topics/configuration.txt:649
10299
10294
msgid ""
10300
10295
"If present, the location of the default branch for push. This option\n"
10301
10296
"is normally set by the first ``push`` or ``push --remember``."
10302
10297
msgstr ""
10303
10298
10304
#: en/help_topics/configuration.txt:640
10299
#: en/help_topics/configuration.txt:652
10305
10300
msgid ""
10306
10301
"push_strict\n"
10307
10302
"~~~~~~~~~~~"
10308
10303
msgstr ""
10309
10304
10310
#: en/help_topics/configuration.txt:643
10305
#: en/help_topics/configuration.txt:655
10311
10306
msgid ""
10312
10307
"If present, defines the ``--strict`` option default value for checking\n"
10313
10308
"uncommitted changes before pushing."
10314
10309
msgstr ""
10315
10310
10316
#: en/help_topics/configuration.txt:646
10311
#: en/help_topics/configuration.txt:658
10317
10312
msgid ""
10318
10313
"dpush_strict\n"
10319
10314
"~~~~~~~~~~~~"
10320
10315
msgstr ""
10321
10316
10322
#: en/help_topics/configuration.txt:649
10317
#: en/help_topics/configuration.txt:661
10323
10318
msgid ""
10324
10319
"If present, defines the ``--strict`` option default value for checking\n"
10325
10320
"uncommitted changes before pushing into a different VCS without any\n"
10326
10321
"custom bzr metadata."
10327
10322
msgstr ""
10328
10323
10329
#: en/help_topics/configuration.txt:653
10324
#: en/help_topics/configuration.txt:665
10330
10325
msgid ""
10331
10326
"bound_location\n"
10332
10327
"~~~~~~~~~~~~~~"
10333
10328
msgstr ""
10334
10329
10335
#: en/help_topics/configuration.txt:656
10330
#: en/help_topics/configuration.txt:668
10336
10331
msgid ""
10337
10332
"The location that commits should go to when acting as a checkout.\n"
10338
10333
"This option is normally set by ``bind``."
10339
10334
msgstr ""
10340
10335
10341
#: en/help_topics/configuration.txt:659
10336
#: en/help_topics/configuration.txt:671
10342
10337
msgid ""
10343
10338
"bound\n"
10344
10339
"~~~~~"
10345
10340
msgstr ""
10346
10341
10347
#: en/help_topics/configuration.txt:662
10342
#: en/help_topics/configuration.txt:674
10348
10343
msgid ""
10349
10344
"If set to \"True\", the branch should act as a checkout, and push each "
10350
10345
"commit to\n"
10351
10346
"the bound_location. This option is normally set by ``bind``/``unbind``."
10352
10347
msgstr ""
10353
10348
10354
#: en/help_topics/configuration.txt:665
10349
#: en/help_topics/configuration.txt:677
10355
10350
msgid ""
10356
10351
"send_strict\n"
10357
10352
"~~~~~~~~~~~"
10358
10353
msgstr ""
10359
10354
10360
#: en/help_topics/configuration.txt:668
10355
#: en/help_topics/configuration.txt:680
10361
10356
msgid ""
10362
10357
"If present, defines the ``--strict`` option default value for checking\n"
10363
10358
"uncommitted changes before sending a merge directive."
10364
10359
msgstr ""
10365
10360
10366
#: en/help_topics/configuration.txt:671
10361
#: en/help_topics/configuration.txt:683
10367
10362
msgid ""
10368
10363
"add.maximum_file_size\n"
10369
10364
"~~~~~~~~~~~~~~~~~~~~~"
10370
10365
msgstr ""
10371
10366
10372
#: en/help_topics/configuration.txt:674
10367
#: en/help_topics/configuration.txt:686
10373
10368
msgid ""
10374
10369
"Defines the maximum file size the command line \"add\" operation will allow\n"
10375
10370
"in recursive mode, with files larger than this value being skipped. You may "
10381
10376
"will disable skipping."
10382
10377
msgstr ""
10383
10378
10384
#: en/help_topics/configuration.txt:680
10379
#: en/help_topics/configuration.txt:692
10385
10380
msgid ""
10386
10381
"External Merge Tools\n"
10387
10382
"--------------------"
10388
10383
msgstr ""
10389
10384
10390
#: en/help_topics/configuration.txt:683
10385
#: en/help_topics/configuration.txt:695
10391
10386
msgid ""
10392
10387
"bzr.mergetool.<name>\n"
10393
10388
"~~~~~~~~~~~~~~~~~~~~"
10394
10389
msgstr ""
10395
10390
10396
#: en/help_topics/configuration.txt:686
10391
#: en/help_topics/configuration.txt:698
10397
10392
msgid ""
10398
10393
"Defines an external merge tool called <name> with the given command-line.\n"
10399
10394
"Arguments containing spaces should be quoted using single or double quotes. "
10401
10396
"executable may omit its path if it can be found on the PATH."
10402
10397
msgstr ""
10403
10398
10404
#: en/help_topics/configuration.txt:690
10399
#: en/help_topics/configuration.txt:702
10405
10400
msgid ""
10406
10401
"The following markers can be used in the command-line to substitute "
10407
10402
"filenames\n"
10408
10403
"involved in the merge conflict::"
10409
10404
msgstr ""
10410
10405
10411
#: en/help_topics/configuration.txt:693
10406
#: en/help_topics/configuration.txt:705
10412
10407
msgid ""
10413
10408
" {base} file.BASE\n"
10414
10409
" {this} file.THIS\n"
10419
10414
" succeeds."
10420
10415
msgstr ""
10421
10416
10422
#: en/help_topics/configuration.txt:702
10417
#: en/help_topics/configuration.txt:714
10423
10418
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10424
10419
msgstr ""
10425
10420
10426
#: en/help_topics/configuration.txt:704
10421
#: en/help_topics/configuration.txt:716
10427
10422
msgid ""
10428
10423
"bzr.default_mergetool\n"
10429
10424
"~~~~~~~~~~~~~~~~~~~~~"
10430
10425
msgstr ""
10431
10426
10432
#: en/help_topics/configuration.txt:707
10427
#: en/help_topics/configuration.txt:719
10433
10428
msgid ""
10434
10429
"Specifies which external merge tool (as defined above) should be selected "
10435
10430
"by\n"
10436
10431
"default in tools such as ``bzr qconflicts``."
10437
10432
msgstr ""
10438
10433
10439
#: en/help_topics/configuration.txt:712
10434
#: en/help_topics/configuration.txt:724
10440
10435
msgid " bzr.default_mergetool = kdiff3\n"
10441
10436
msgstr ""
10442
10437
11387
11382
"branch can now be pushed to the mainline.\n"
11388
11383
msgstr ""
11389
11384
11385
#: en/help_topics/env-variables.txt:1
11386
msgid "Environment Variables"
11387
msgstr ""
11388
11389
#: en/help_topics/env-variables.txt:3
11390
msgid ""
11391
"=================== "
11392
"===========================================================\n"
11393
"BZRPATH Path where bzr is to look for shell plugin external\n"
11394
" commands.\n"
11395
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11396
"EMAIL E-Mail address of the user.\n"
11397
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11398
"EDITOR Editor for editing commit messages.\n"
11399
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11400
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11401
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11402
"BZR_PLUGIN_PATH.\n"
11403
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11404
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11405
"and\n"
11406
" HOME.\n"
11407
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11408
"URLs).\n"
11409
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11410
"sshcorp,\n"
11411
" plink or lsh.\n"
11412
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11413
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11414
"BZR_COLUMNS Override implicit terminal width.\n"
11415
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11416
"(selftest)\n"
11417
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11418
"'text'.\n"
11419
"BZR_PDB Control whether to launch a debugger on error.\n"
11420
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11421
" breakin debugger.\n"
11422
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11423
"(instead\n"
11424
" of char-based).\n"
11425
"=================== "
11426
"===========================================================\n"
11427
msgstr ""
11428
11390
11429
#: en/help_topics/eol.txt:1
11391
11430
msgid ""
11392
11431
"End of Line Conversion\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1