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