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