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