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