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