« back to all changes in this revision
Viewing changes to po/ja.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/ja.po
7
7
msgstr ""
8
8
"Project-Id-Version: bzr\n"
9
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-03-15 10:20+0100\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
11
"PO-Revision-Date: 2012-01-26 15:16+0000\n"
12
12
"Last-Translator: IWATA Hidetaka <Unknown>\n"
13
13
"Language-Team: Japanese <ja@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:32+0000\n"
19
"X-Generator: Launchpad (build 14951)\n"
18
"X-Launchpad-Export-Date: 2012-07-11 04:32+0000\n"
19
"X-Generator: Launchpad (build 15593)\n"
20
20
21
21
#: bzrlib/add.py:93
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
26
26
msgid "Unstacking"
27
27
msgstr "スタックの解除"
28
28
29
#: bzrlib/branch.py:3121
29
#: bzrlib/branch.py:2955
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr "リビジョン%dまでプッシュしました。"
33
33
34
#: bzrlib/branch.py:3123
34
#: bzrlib/branch.py:2957
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
38
msgstr[0] "%d 個のタグを更新しました"
39
39
40
#: bzrlib/branch.py:3126
40
#: bzrlib/branch.py:2960
41
41
msgid "No new revisions or tags to push."
42
42
msgstr "プッシュする新しいリビジョンやタグはありません。"
43
43
44
#: bzrlib/branch.py:3128
44
#: bzrlib/branch.py:2962
45
45
msgid "No new revisions to push."
46
46
msgstr "プッシュする新しいリビジョンはありません。"
47
47
48
#: bzrlib/branch.py:3148
48
#: bzrlib/branch.py:2982
49
49
msgid "checked branch {0} format {1}"
50
50
msgstr "format {1} のブランチ {0} をチェックしました"
51
51
52
#: bzrlib/branch.py:3151
52
#: bzrlib/branch.py:2985
53
53
#, python-format
54
54
msgid "found error:%s"
55
55
msgstr "検出されたエラー: %s"
56
56
57
#: 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
58
58
#, python-format
59
59
msgid "Ignoring files outside view. View is %s"
60
60
msgstr "ビューに含まれないファイルは無視します。ビュー：%s"
223
223
msgid "bzr status --revision takes exactly one or two revision specifiers"
224
224
msgstr "bzr status --revisionには、１つか２つのリビジョンを指定します。"
225
225
226
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5197
226
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
227
227
msgid "You can only supply one of revision_id or --revision"
228
228
msgstr "リビジョンＩＤと--revisionのどちらか一つだけを指定してください。"
229
229
230
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5199
230
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
231
231
msgid "You must supply either --revision or a revision_id"
232
232
msgstr "--revisionとリビジョンＩＤのどちらかを指定してください。"
233
233
307
307
msgid "--tree and --revision can not be used together"
308
308
msgstr "--tree と --revision は同時に指定できません"
309
309
310
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5953
310
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
311
311
msgid "Tags can only be placed on a single revision, not on a range"
312
312
msgstr "タグは1つのリビジョンにしか指定できません"
313
313
606
606
"master branch."
607
607
msgstr "バインドブランチに対してpullする場合に、マスターブランチには反映しないようにします。"
608
608
609
#: bzrlib/builtins.py:1180
609
#: bzrlib/builtins.py:1189
610
610
msgid "Need working tree for --show-base."
611
611
msgstr "--show-baseオプションを使用するには作業ツリーが必要です。"
612
612
613
#: bzrlib/builtins.py:1196
613
#: bzrlib/builtins.py:1205
614
614
msgid "No pull location known or specified."
615
615
msgstr "pull対象ブランチが指定されていません。"
616
616
617
#: bzrlib/builtins.py:1202
617
#: bzrlib/builtins.py:1211
618
618
#, python-format
619
619
msgid "Using saved parent location: %s\n"
620
620
msgstr "デフォルトの親ブランチを使用します。: %s\n"
621
621
622
#: bzrlib/builtins.py:1209 bzrlib/builtins.py:4406
622
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
623
623
msgid "Cannot use -r with merge directives or bundles"
624
624
msgstr "マージディレクティブやバンドルに対して-rを使用することはできません。"
625
625
626
#: bzrlib/builtins.py:1252
626
#: bzrlib/builtins.py:1261
627
627
msgid "Update a mirror of this branch."
628
628
msgstr "このブランチのミラーを更新します。"
629
629
630
#: bzrlib/builtins.py:1254
630
#: bzrlib/builtins.py:1263
631
631
msgid ""
632
632
"The target branch will not have its working tree populated because this\n"
633
633
"is both expensive, and is not supported on remote file systems."
635
635
"対象のブランチの作業ツリーの更新はコストが高く、リモートファイルシステムでは\n"
636
636
"サポートされていないため、作業ツリーの更新は行いません。"
637
637
638
#: bzrlib/builtins.py:1257
638
#: bzrlib/builtins.py:1266
639
639
msgid ""
640
640
"Some smart servers or protocols *may* put the working tree in place in\n"
641
641
"the future."
643
643
"将来的に、作業ツリーの更新ができるようなスマートサーバやプロトコルがリリース\n"
644
644
"*かもしれません*。"
645
645
646
#: bzrlib/builtins.py:1260
646
#: bzrlib/builtins.py:1269
647
647
msgid ""
648
648
"This command only works on branches that have not diverged. Branches are\n"
649
649
"considered diverged if the destination branch's most recent commit is one\n"
653
653
"の最新のコミットが(直接的、もしくは間接的に)push元のブランチにまだマージされて\n"
654
654
"いない状態の場合に、ブランチが分岐しているとみなされます。"
655
655
656
#: bzrlib/builtins.py:1264
656
#: bzrlib/builtins.py:1273
657
657
msgid ""
658
658
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
659
659
"the other branch completely, discarding its unmerged changes."
661
661
"ブランチ同士が分岐している場合、 'bzr push --overwrite' で、まだマージされて\n"
662
662
"いない変更を破棄してpush先のブランチを完全に置きかえることができます。"
663
663
664
#: bzrlib/builtins.py:1267
664
#: bzrlib/builtins.py:1276
665
665
msgid ""
666
666
"If you want to ensure you have the different changes in the other branch,\n"
667
667
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
671
671
"からマージして(bzr help mergeを参照)コミットしてください。そうすれば、\n"
672
672
"'--overwrite'の指定なしでpushできるようになります。"
673
673
674
#: bzrlib/builtins.py:1271
674
#: bzrlib/builtins.py:1280
675
675
msgid ""
676
676
"If there is no default push location set, the first push will set it (use\n"
677
677
"--no-remember to avoid setting it). After that, you can omit the\n"
684
684
"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモートの\n"
685
685
"ブランチにアクセスできた時だけ保存されます。"
686
686
687
#: bzrlib/builtins.py:1276
687
#: bzrlib/builtins.py:1285
688
688
msgid ""
689
689
"The --verbose option will display the revisions pushed using the log_format\n"
690
690
"configuration option. You can use a different format by overriding it with\n"
694
694
"利用して表示します。 -Olog_format=<other_format> と指定することで、\n"
695
695
"別のフォーマットで表示できます。"
696
696
697
#: bzrlib/builtins.py:1287 bzrlib/foreign.py:272
697
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
698
698
msgid ""
699
699
"Branch to push from, rather than the one containing the working directory."
700
700
msgstr "カレントディレクトリの代わりにpush元とするブランチを指定します。"
701
701
702
#: bzrlib/builtins.py:1290
702
#: bzrlib/builtins.py:1299
703
703
msgid ""
704
704
"By default push will fail if the target directory exists, but does not "
705
705
"already have a control directory. This flag will allow push to proceed."
707
707
"デフォルトでは、push先のディレクトリが既に存在しているのにバージョン管理されていない状態の場合はpushできません。このフラグを指定すると、その場合で"
708
708
"もpushできるようになります。"
709
709
710
#: bzrlib/builtins.py:1295
710
#: bzrlib/builtins.py:1304
711
711
msgid ""
712
712
"Create a stacked branch that references the public location of the parent "
713
713
"branch."
714
714
msgstr "親ブランチの公開された場所を参照するスタックドブランチを作成します。"
715
715
716
#: bzrlib/builtins.py:1298
716
#: bzrlib/builtins.py:1307
717
717
msgid ""
718
718
"Create a stacked branch that refers to another branch for the commit "
719
719
"history. Only the work not present in the referenced branch is included in "
720
720
"the branch created."
721
721
msgstr "コミットの履歴を別のブランチから参照するスタックドブランチを作成します。参照先のブランチにない変更だけがこのブランチに含まれます。"
722
722
723
#: bzrlib/builtins.py:1303 bzrlib/foreign.py:279
723
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
724
724
msgid ""
725
725
"Refuse to push if there are uncommitted changes in the working tree, --no-"
726
726
"strict disables the check."
728
728
"作業コピーが変更されている場合はpushできませんが、--no-strictオプションを指定\n"
729
729
"するとpushできるようになります。"
730
730
731
#: bzrlib/builtins.py:1306
731
#: bzrlib/builtins.py:1315
732
732
msgid "Don't populate the working tree, even for protocols that support it."
733
733
msgstr "作業コピーを更新できるプロトコルを使っている場合でも、更新しません。"
734
734
735
#: bzrlib/builtins.py:1350
735
#: bzrlib/builtins.py:1318
736
msgid "Overwrite tags only."
737
msgstr ""
738
739
#: bzrlib/builtins.py:1369
736
740
msgid "Could not determine branch to refer to."
737
741
msgstr "参照先のブランチを特定できません。"
738
742
739
#: bzrlib/builtins.py:1359
743
#: bzrlib/builtins.py:1378
740
744
#, python-format
741
745
msgid ""
742
746
"No push location known or specified. To push to the parent branch (at %s), "
743
747
"use 'bzr push :parent'."
744
748
msgstr "push先が設定も指定もされていません。親ブランチ(%s)にpushする場合は、'bzr push :parent'を使用してください。"
745
749
746
#: bzrlib/builtins.py:1365 bzrlib/foreign.py:306
750
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
747
751
msgid "No push location known or specified."
748
752
msgstr "push先のブランチが設定も指定もされていません。"
749
753
750
#: bzrlib/builtins.py:1369
754
#: bzrlib/builtins.py:1388
751
755
#, python-format
752
756
msgid "Using saved push location: %s"
753
757
msgstr "デフォルトのpush先ブランチを使用します。: %s"
754
758
755
#: bzrlib/builtins.py:1379
759
#: bzrlib/builtins.py:1398
756
760
msgid "Create a new branch that is a copy of an existing branch."
757
761
msgstr "既存のブランチをコピーして新しいブランチを作成します。"
758
762
759
#: bzrlib/builtins.py:1381
763
#: bzrlib/builtins.py:1400
760
764
msgid ""
761
765
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
762
766
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
772
776
"FROM_LOCATIONからスキーマやドライブのIDを取り除いたものがTO_LOCATIONになり\n"
773
777
"ます。例えば、\"branch lp:foo-bar\"とすると、./foo-barが作られます。"
774
778
775
#: bzrlib/builtins.py:1388
779
#: bzrlib/builtins.py:1407
776
780
msgid ""
777
781
"To retrieve the branch as of a particular revision, supply the --revision\n"
778
782
"parameter, as in \"branch foo/bar -r 5\"."
780
784
"ブランチの特定のリビジョンで取り出したい場合は、\"branch foo/bar -r 5\"の\n"
781
785
"ように--revisionオプションを指定してください。"
782
786
783
#: bzrlib/builtins.py:1391
787
#: bzrlib/builtins.py:1410
784
788
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
785
789
msgstr "このコマンドの別名である'clone'と'get'は廃止予定です。"
786
790
787
#: bzrlib/builtins.py:1401
791
#: bzrlib/builtins.py:1420
788
792
msgid "Create a branch without a working-tree."
789
793
msgstr "作業ツリーのないブランチを作成します。"
790
794
791
#: bzrlib/builtins.py:1403
795
#: bzrlib/builtins.py:1422
792
796
msgid "Switch the checkout in the current directory to the new branch."
793
797
msgstr "カレントディレクトリにあるチェックアウトの参照先を新しいブランチに切り替えます。"
794
798
795
#: bzrlib/builtins.py:1406
799
#: bzrlib/builtins.py:1425
796
800
msgid ""
797
801
"Create a stacked branch referring to the source branch. The new branch will "
798
802
"depend on the availability of the source branch for all operations."
799
803
msgstr "元のブランチを参照するスタックドブランチを作成します。新しいブランチでは、元のブランチにアクセスできるときしか操作できません。"
800
804
801
#: bzrlib/builtins.py:1410
805
#: bzrlib/builtins.py:1429
802
806
msgid "Do not use a shared repository, even if available."
803
807
msgstr "共有リポジトリが使える場合でも、共有リポジトリを使いません。"
804
808
805
#: bzrlib/builtins.py:1412
809
#: bzrlib/builtins.py:1431
806
810
msgid ""
807
811
"By default branch will fail if the target directory exists, but does not "
808
812
"already have a control directory. This flag will allow branch to proceed."
810
814
"デフォルトでは、branch先のディレクトリが既に存在しているのにバージョン管理されていない場合はbranchできません。このフラグを指定すると、その場合"
811
815
"でもbranchできるようになります。"
812
816
813
#: bzrlib/builtins.py:1417
817
#: bzrlib/builtins.py:1436
814
818
msgid "Bind new branch to from location."
815
819
msgstr "新しいブランチを元のブランチにバインドします。"
816
820
817
#: bzrlib/builtins.py:1464
821
#: bzrlib/builtins.py:1483
818
822
#, python-format
819
823
msgid "Target directory \"%s\" already exists."
820
824
msgstr "対象のディレクトリ \"%s\" は既に存在します。"
821
825
822
#: bzrlib/builtins.py:1476
826
#: bzrlib/builtins.py:1495
823
827
#, python-format
824
828
msgid "Parent of \"%s\" does not exist."
825
829
msgstr "\"%s\" の親が見つかりません。"
826
830
827
#: bzrlib/builtins.py:1495
831
#: bzrlib/builtins.py:1514
828
832
msgid "The branch {0} has no revision {1}."
829
833
msgstr "ブランチ {0} にリビジョン {1} はありません。"
830
834
831
#: bzrlib/builtins.py:1510 bzrlib/push.py:53
835
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
832
836
#, python-format
833
837
msgid "Created new stacked branch referring to %s."
834
838
msgstr "%s を参照するスタックドブランチを作成しました。"
835
839
836
#: bzrlib/builtins.py:1514
840
#: bzrlib/builtins.py:1533
837
841
#, python-format
838
842
msgid "Branched %d revision."
839
843
msgid_plural "Branched %d revisions."
840
844
msgstr[0] "%d個のリビジョンをブランチしました。"
841
845
842
#: bzrlib/builtins.py:1519
846
#: bzrlib/builtins.py:1538
843
847
#, python-format
844
848
msgid "New branch bound to %s"
845
849
msgstr "新しいブランチは %s にバインドされています。"
846
850
847
#: bzrlib/builtins.py:1524 bzrlib/builtins.py:6247
851
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
848
852
#, python-format
849
853
msgid "Switched to branch: %s"
850
854
msgstr "バインド先をスイッチしました。: %s"
851
855
852
#: bzrlib/builtins.py:1529
856
#: bzrlib/builtins.py:1548
853
857
msgid "List the branches available at the current location."
854
858
msgstr "カレントフォルダにある利用可能なブランチをリストアップします。"
855
859
856
#: bzrlib/builtins.py:1531
860
#: bzrlib/builtins.py:1550
857
861
msgid ""
858
862
"This command will print the names of all the branches at the current\n"
859
863
"location."
860
864
msgstr "このコマンドは、現在の場所にある全てのブランチの名前を表示します。"
861
865
862
#: bzrlib/builtins.py:1538
866
#: bzrlib/builtins.py:1557
863
867
msgid ""
864
868
"Recursively scan for branches rather than just looking in the specified "
865
869
"location."
866
870
msgstr "指定された場所だけでなく、再帰的にブランチを探します。"
867
871
868
#: bzrlib/builtins.py:1567
872
#: bzrlib/builtins.py:1586
869
873
msgid "(default)"
870
874
msgstr "(デフォルト)"
871
875
872
#: bzrlib/builtins.py:1579
876
#: bzrlib/builtins.py:1598
873
877
msgid "Create a new checkout of an existing branch."
874
878
msgstr "既存のブランチのチェックアウトを新しく作成します。"
875
879
876
#: bzrlib/builtins.py:1581
880
#: bzrlib/builtins.py:1600
877
881
msgid ""
878
882
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
879
883
"for\n"
886
890
"これは、作業ツリーを消してしまった場合や、そもそも作業ツリーが作成されて\n"
887
891
"いない場合(例えば、SFTPでpushされたブランチなど)に役立ちます。"
888
892
889
#: bzrlib/builtins.py:1586
893
#: bzrlib/builtins.py:1605
890
894
msgid ""
891
895
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
892
896
"will\n"
903
907
"BRANCH_LOCATIONからスキーマやドライブのIDを取り除いたものがTO_LOCATIONになり\n"
904
908
"ます。例えば、\"branch lp:foo-bar\"とすると、./foo-barが作られます。"
905
909
906
#: bzrlib/builtins.py:1593
910
#: bzrlib/builtins.py:1612
907
911
msgid ""
908
912
"To retrieve the branch as of a particular revision, supply the --revision\n"
909
913
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
917
921
"なるため、コミットはできませんが、例えば古いコードをチェックする場合などに\n"
918
922
"役立ちます。"
919
923
920
#: bzrlib/builtins.py:1603
924
#: bzrlib/builtins.py:1622
921
925
msgid ""
922
926
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
923
927
"the branch for every operation. Normal checkouts can perform common "
929
933
"場合は、diffやstatusのような一般的な操作ではその必要はありませんし、ローカル\n"
930
934
"コミットすることもできます。"
931
935
932
#: bzrlib/builtins.py:1610
936
#: bzrlib/builtins.py:1629
933
937
msgid "Get file contents from this tree."
934
938
msgstr "ファイルの内容をこのツリーから取得します。"
935
939
936
#: bzrlib/builtins.py:1612
940
#: bzrlib/builtins.py:1631
937
941
msgid "Hard-link working tree files where possible."
938
942
msgstr "可能なら、作業コピーをハードリンクします。"
939
943
940
#: bzrlib/builtins.py:1653
944
#: bzrlib/builtins.py:1672
941
945
msgid ""
942
946
"Show list of renamed files.\n"
943
947
" "
945
949
"変名されたファイルをリストアップします。\n"
946
950
" "
947
951
948
#: bzrlib/builtins.py:1681
952
#: bzrlib/builtins.py:1700
949
953
msgid "Update a working tree to a new revision."
950
954
msgstr "作業ツリーを新しいリビジョンに更新します。"
951
955
952
#: bzrlib/builtins.py:1683
956
#: bzrlib/builtins.py:1702
953
957
msgid ""
954
958
"This will perform a merge of the destination revision (the tip of the\n"
955
959
"branch, or the specified revision) into the working tree, and then make\n"
958
962
"移動先のリビジョン(ブランチのTipもしくは指定されたリビジョン)を作業ツリーに\n"
959
963
"マージして、そのリビジョンを作業ツリーのベースリビジョンに設定します。 "
960
964
961
#: bzrlib/builtins.py:1687
965
#: bzrlib/builtins.py:1706
962
966
msgid ""
963
967
"You can use this to visit an older revision, or to update a working tree\n"
964
968
"that is out of date from its branch."
966
970
"古いリビジョンに一時的に移動したり、ブランチより古くなってしまった作業ツリーを\n"
967
971
"最新の状態にしたりすることができます。"
968
972
969
#: bzrlib/builtins.py:1690
973
#: bzrlib/builtins.py:1709
970
974
msgid ""
971
975
"If there are any uncommitted changes in the tree, they will be carried\n"
972
976
"across and remain as uncommitted changes after the update. To discard\n"
978
982
"'bzr revert' コマンドを利用してください。コミットされていない変更は、ベース\n"
979
983
"リビジョンの更新による変更とコンフリクトする可能性があります。"
980
984
981
#: bzrlib/builtins.py:1695
985
#: bzrlib/builtins.py:1714
982
986
msgid ""
983
987
"If the tree's branch is bound to a master branch, bzr will also update\n"
984
988
"the branch from the master."
986
990
"作業ツリーのブランチがマスターブランチに束縛されている場合、bzrは\n"
987
991
"作業ツリーのブランチもマスターブランチの状態に更新します。"
988
992
989
#: bzrlib/builtins.py:1698
993
#: bzrlib/builtins.py:1717
990
994
msgid ""
991
995
"You cannot update just a single file or directory, because each Bazaar\n"
992
996
"working tree has just a single basis revision. If you want to restore a\n"
1002
1006
"'bzr revert'に -r オプションを指定するか、'bzr cat'を使って古い内容を書き出して\n"
1003
1007
"ください。"
1004
1008
1005
#: bzrlib/builtins.py:1705
1009
#: bzrlib/builtins.py:1724
1006
1010
msgid ""
1007
1011
"The 'dir' argument, if given, must be the location of the root of a\n"
1008
1012
"working tree to update. By default, the working tree that contains the \n"
1011
1015
"dir 引数を指定する場合は、作業ツリーのルートを指定する必要があります。\n"
1012
1016
"デフォルトでは、カレントディレクトリを含む作業ツリーが選択されます。"
1013
1017
1014
#: bzrlib/builtins.py:1721
1018
#: bzrlib/builtins.py:1740
1015
1019
msgid "bzr update --revision takes exactly one revision"
1016
1020
msgstr "bzr update --revisionには、リビジョンをひとつだけ指定します。"
1017
1021
1018
#: bzrlib/builtins.py:1729
1022
#: bzrlib/builtins.py:1748
1019
1023
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1020
1024
msgstr "bzr updateは、個々のファイルやディレクトリではなく、作業ツリー全体を更新します。"
1021
1025
1022
#: bzrlib/builtins.py:1760
1026
#: bzrlib/builtins.py:1779
1023
1027
msgid "Tree is up to date at revision {0} of branch {1}"
1024
1028
msgstr "ツリーはブランチ {1} のリビジョン {0} で最新の状態です。"
1025
1029
1026
#: bzrlib/builtins.py:1776
1030
#: bzrlib/builtins.py:1795
1027
1031
#, python-format
1028
1032
msgid ""
1029
1033
"branch has no revision %s\n"
1032
1036
"ブランチには%sというリビジョンはありません。\n"
1033
1037
"bzr update --revisionには、ブランチ内のリビジョンを指定する必要があります。"
1034
1038
1035
#: bzrlib/builtins.py:1782
1039
#: bzrlib/builtins.py:1801
1036
1040
msgid "Updated to revision {0} of branch {1}"
1037
1041
msgstr "ブランチ {1} のリビジョン {0} に更新されました。"
1038
1042
1039
#: bzrlib/builtins.py:1786
1043
#: bzrlib/builtins.py:1805
1040
1044
msgid ""
1041
1045
"Your local commits will now show as pending merges with 'bzr status', and "
1042
1046
"can be committed with 'bzr commit'."
1043
1047
msgstr "ローカルで行った変更は、'bzr status'ではマージ中状態になっており、'bzr commit'でコミットできます。"
1044
1048
1045
#: bzrlib/builtins.py:1795
1049
#: bzrlib/builtins.py:1814
1046
1050
msgid "Show information about a working tree, branch or repository."
1047
1051
msgstr "作業コピー、ブランチ、リポジトリの情報を表示します。"
1048
1052
1049
#: bzrlib/builtins.py:1797
1053
#: bzrlib/builtins.py:1816
1050
1054
msgid ""
1051
1055
"This command will show all known locations and formats associated to the\n"
1052
1056
"tree, branch or repository."
1054
1058
"このコマンドは、ツリー、ブランチ、リポジトリに関連する所在やフォーマット\n"
1055
1059
"のすべての情報を表示します。"
1056
1060
1057
#: bzrlib/builtins.py:1800
1061
#: bzrlib/builtins.py:1819
1058
1062
msgid ""
1059
1063
"In verbose mode, statistical information is included with each report.\n"
1060
1064
"To see extended statistic information, use a verbosity level of 2 or\n"
1064
1068
"高度な統計情報を見るには、-vvのようにverboseオプションを複数回指定する\n"
1065
1069
"ことによって、verboseレベル2以上を指定してください。"
1066
1070
1067
#: bzrlib/builtins.py:1804
1071
#: bzrlib/builtins.py:1823
1068
1072
msgid "Branches and working trees will also report any missing revisions."
1069
1073
msgstr "ブランチと作業ツリーについては、存在しないリビジョンについても表示されます。"
1070
1074
1071
#: bzrlib/builtins.py:1806 bzrlib/builtins.py:3725 bzrlib/builtins.py:4859
1072
#: bzrlib/builtins.py:6433
1075
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1076
#: bzrlib/builtins.py:6466
1073
1077
msgid ":Examples:"
1074
1078
msgstr ":例:"
1075
1079
1076
#: bzrlib/builtins.py:1808
1080
#: bzrlib/builtins.py:1827
1077
1081
msgid " Display information on the format and related locations:"
1078
1082
msgstr " フォーマットと関連する場所についての情報を表示します。"
1079
1083
1080
#: bzrlib/builtins.py:1810
1084
#: bzrlib/builtins.py:1829
1081
1085
msgid " bzr info"
1082
1086
msgstr " bzr info"
1083
1087
1084
#: bzrlib/builtins.py:1812
1088
#: bzrlib/builtins.py:1831
1085
1089
msgid ""
1086
1090
" Display the above together with extended format information and\n"
1087
1091
" basic statistics (like the number of files in the working tree and\n"
1090
1094
" より詳細なフォーマット情報と、基本的な統計情報(作業ツリー内のファイルの\n"
1091
1095
" 数、ブランチ、リポジトリ内のリビジョンの数など)を一緒に表示します。:"
1092
1096
1093
#: bzrlib/builtins.py:1816
1097
#: bzrlib/builtins.py:1835
1094
1098
msgid " bzr info -v"
1095
1099
msgstr " bzr info -v"
1096
1100
1097
#: bzrlib/builtins.py:1818
1101
#: bzrlib/builtins.py:1837
1098
1102
msgid " Display the above together with number of committers to the branch:"
1099
1103
msgstr " さらに、このブランチにコミットした人の数も表示します。:"
1100
1104
1101
#: bzrlib/builtins.py:1820
1105
#: bzrlib/builtins.py:1839
1102
1106
msgid " bzr info -vv"
1103
1107
msgstr " bzr info -vv"
1104
1108
1105
#: bzrlib/builtins.py:1839
1109
#: bzrlib/builtins.py:1858
1106
1110
msgid "Remove files or directories."
1107
1111
msgstr "ファイルやディレクトリを削除します。"
1108
1112
1109
#: bzrlib/builtins.py:1841
1113
#: bzrlib/builtins.py:1860
1110
1114
msgid ""
1111
1115
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1112
1116
"delete them if they can easily be recovered using revert otherwise they\n"
1113
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1117
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1114
1118
"parameters are given Bazaar will scan for files that are being tracked by\n"
1115
1119
"Bazaar but missing in your tree and stop tracking them for you."
1116
1120
msgstr ""
1117
"このコマンドで指定されたファイルの変更をBazaarは管理しなくなります。\n"
1118
"revertでファイルが簡単に復活できる場合は、ファイルは削除されますし、そうで\n"
1119
"ない場合はバックアップ(.~#~という形式の拡張子がつきます)されます。オプション\n"
1120
"やパラメータが指定されていない場合は、バージョン管理されているけれどツリー\n"
1121
"削除されているファイルを探して、そのファイルのバージョン管理を止めます。"
1122
1121
1123
#: bzrlib/builtins.py:1849
1122
#: bzrlib/builtins.py:1868
1124
1123
msgid "Only remove files that have never been committed."
1125
1124
msgstr "まだコミットされていないファイルだけを削除します。"
1126
1125
1127
#: bzrlib/builtins.py:1851
1126
#: bzrlib/builtins.py:1870
1128
1127
msgid "The file deletion mode to be used."
1129
1128
msgstr "使用するファイル削除モードです。"
1130
1129
1131
#: bzrlib/builtins.py:1852
1130
#: bzrlib/builtins.py:1871
1132
1131
msgid "Deletion Strategy"
1133
1132
msgstr "削除モード"
1134
1133
1135
#: bzrlib/builtins.py:1853
1134
#: bzrlib/builtins.py:1872
1136
1135
msgid "Backup changed files (default)."
1137
1136
msgstr "変更したファイルをバックアップします。"
1138
1137
1139
#: bzrlib/builtins.py:1854
1138
#: bzrlib/builtins.py:1873
1140
1139
msgid "Delete from bzr but leave the working copy."
1141
1140
msgstr "Bazaarからは削除しますが、作業ツリーには残します。"
1142
1141
1143
#: bzrlib/builtins.py:1855
1142
#: bzrlib/builtins.py:1874
1144
1143
msgid "Don't backup changed files."
1145
1144
msgstr "変更されたファイルをバックアップしません。"
1146
1145
1147
#: bzrlib/builtins.py:1856
1146
#: bzrlib/builtins.py:1875
1148
1147
msgid ""
1149
1148
"Delete all the specified files, even if they can not be recovered and even "
1150
1149
"if they are non-empty directories. (deprecated, use no-backup)"
1151
1150
msgstr ""
1152
1151
"元に戻せないファイル、空ではないディレクトリも含めて、指定されたアイテムを全て削除します。(廃止予定。no-backupを使用してください)"
1153
1152
1154
#: bzrlib/builtins.py:1865
1153
#: bzrlib/builtins.py:1884
1155
1154
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1156
1155
msgstr "(--forceオプションは廃止予定です。今後は--no-backupを使用してください)"
1157
1156
1158
#: bzrlib/builtins.py:1882
1157
#: bzrlib/builtins.py:1901
1159
1158
msgid "No matching files."
1160
1159
msgstr "対象のファイルはありませんでした。"
1161
1160
1162
#: bzrlib/builtins.py:1943
1161
#: bzrlib/builtins.py:1962
1163
1162
msgid "Reconcile bzr metadata in a branch."
1164
1163
msgstr "ブランチ内のBazaarのメタデータを修復します。"
1165
1164
1166
#: bzrlib/builtins.py:1945
1165
#: bzrlib/builtins.py:1964
1167
1166
msgid ""
1168
1167
"This can correct data mismatches that may have been caused by\n"
1169
1168
"previous ghost operations or bzr upgrades. You should only\n"
1174
1173
"と思われるデータの不整合を修正することができます。'bzr check'の結果や、\n"
1175
1174
"Bzrの開発者からの指示があるとき以外は、実行する必要はありません。"
1176
1175
1177
#: bzrlib/builtins.py:1950
1176
#: bzrlib/builtins.py:1969
1178
1177
msgid ""
1179
1178
"If a second branch is provided, cross-branch reconciliation is\n"
1180
1179
"also attempted, which will check that data like the tree root\n"
1185
1184
"これは、ツリーのルートIDのような、非常に古いバージョンのBzrにはなかった\n"
1186
1185
"データが、両方のブランチに正しく表現されているかをチェックします。"
1187
1186
1188
#: bzrlib/builtins.py:1955
1187
#: bzrlib/builtins.py:1974
1189
1188
msgid ""
1190
1189
"At the same time it is run it may recompress data resulting in\n"
1191
1190
"a potential saving in disk space or performance gain."
1193
1192
"同時に、ディスクスペースの節約やパフォーマンスの向上のために、データの\n"
1194
1193
"再圧縮がかかる可能性があります。"
1195
1194
1196
#: bzrlib/builtins.py:1958
1195
#: bzrlib/builtins.py:1977
1197
1196
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1198
1197
msgstr ""
1199
1198
"ブランチは、ローカルディスクやsftpのような、リスト可能なシステム上に\n"
1200
1199
"ある*必要があります*。"
1201
1200
1202
#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760
1201
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1203
1202
msgid ""
1204
1203
"Format for the bzr 2.0 series.\n"
1205
1204
"Uses group-compress storage.\n"
1210
1209
"rich root 機能を提供します。 rich root 機能を提供するフォーマットに変換すると、\n"
1211
1210
"rich root 機能を持たないフォーマットに戻ることはできません。\n"
1212
1211
1213
#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760
1212
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1214
1213
msgid ""
1215
1214
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1216
1215
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1217
1216
msgstr ""
1218
1217
1219
#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760
1218
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1220
1219
msgid "The 2a format with experimental support for colocated branches.\n"
1221
1220
msgstr "colocated branch を実験的にサポートする 2a フォーマット。\n"
1222
1221
1223
#: bzrlib/builtins.py:2026
1222
#: bzrlib/builtins.py:2045
1224
1223
msgid "Make a directory into a versioned branch."
1225
1224
msgstr "ディレクトリを、バージョン管理されたブランチにします。"
1226
1225
1227
#: bzrlib/builtins.py:2028
1226
#: bzrlib/builtins.py:2047
1228
1227
msgid ""
1229
1228
"Use this to create an empty branch, or before importing an\n"
1230
1229
"existing project."
1232
1231
"空のブランチを作る場合や、既存のプロジェクトをインポートする前にこの\n"
1233
1232
"コマンドを使用します。"
1234
1233
1235
#: bzrlib/builtins.py:2031
1234
#: bzrlib/builtins.py:2050
1236
1235
msgid ""
1237
1236
"If there is a repository in a parent directory of the location, then\n"
1238
1237
"the history of the branch will be stored in the repository. Otherwise\n"
1243
1242
"保存されます。そうでない場合は、履歴を.bzrディレクトリ内に持つスタンド\n"
1244
1243
"アロンブランチが作成されます。"
1245
1244
1246
#: bzrlib/builtins.py:2036
1245
#: bzrlib/builtins.py:2055
1247
1246
msgid ""
1248
1247
"If there is already a branch at the location but it has no working tree,\n"
1249
1248
"the tree can be populated with 'bzr checkout'."
1251
1250
"既にブランチがあって、作業ツリーがない場合は、'bzr checkout'でツリーを\n"
1252
1251
"生成することができます。"
1253
1252
1254
#: bzrlib/builtins.py:2039
1253
#: bzrlib/builtins.py:2058
1255
1254
msgid "Recipe for importing a tree of files::"
1256
1255
msgstr "ファイルのツリーをインポートするためのレシピ::"
1257
1256
1258
#: bzrlib/builtins.py:2041
1257
#: bzrlib/builtins.py:2060
1259
1258
msgid ""
1260
1259
" cd ~/project\n"
1261
1260
" bzr init\n"
1269
1268
" bzr status\n"
1270
1269
" bzr commit -m \"imported project\""
1271
1270
1272
#: bzrlib/builtins.py:2052
1271
#: bzrlib/builtins.py:2071
1273
1272
msgid ""
1274
1273
"Create the path leading up to the branch if it does not already exist."
1275
1274
msgstr "ブランチまでのパスが存在していなければ、作成します。"
1276
1275
1277
#: bzrlib/builtins.py:2055
1276
#: bzrlib/builtins.py:2074
1278
1277
msgid "Specify a format for this branch. See \"help formats\"."
1279
1278
msgstr "ブランチのフォーマットを指定します。\"help formats\"をご覧ください。"
1280
1279
1281
#: bzrlib/builtins.py:2063
1280
#: bzrlib/builtins.py:2082
1282
1281
msgid ""
1283
1282
"Never change revnos or the existing log. Append revisions to it only."
1284
1283
msgstr "リビジョン番号や既存のログを変更せず、リビジョンの追加だけを行います。"
1285
1284
1286
#: bzrlib/builtins.py:2066
1285
#: bzrlib/builtins.py:2085
1287
1286
msgid "Create a branch without a working tree."
1288
1287
msgstr "作業ツリーをもたないブランチを作成します。"
1289
1288
1290
#: bzrlib/builtins.py:2086 bzrlib/push.py:110
1289
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1291
1290
#, python-format
1292
1291
msgid ""
1293
1292
"Parent directory of %s does not exist.\n"
1296
1295
"%s の親ディレクトリがありません。\n"
1297
1296
"--create-prefixを指定すれば、親ディレクトリも作成されます。"
1298
1297
1299
#: bzrlib/builtins.py:2120
1298
#: bzrlib/builtins.py:2139
1300
1299
msgid ""
1301
1300
"This branch format cannot be set to append-revisions-only. Try --default."
1302
1301
msgstr "このブランチフォーマットにappend-revisions-onlyは指定できません。--defaultを試してください。"
1303
1302
1304
#: bzrlib/builtins.py:2131
1303
#: bzrlib/builtins.py:2150
1305
1304
msgid "Created a {0} (format: {1})\n"
1306
1305
msgstr "{0}を作成しました。(フォーマット:{1})\n"
1307
1306
1308
#: bzrlib/builtins.py:2140
1307
#: bzrlib/builtins.py:2159
1309
1308
#, python-format
1310
1309
msgid "Using shared repository: %s\n"
1311
1310
msgstr "共有リポジトリを使用しました。: %s\n"
1312
1311
1313
#: bzrlib/builtins.py:2144
1312
#: bzrlib/builtins.py:2163
1314
1313
msgid "Create a shared repository for branches to share storage space."
1315
1314
msgstr "ブランチのストレージを共有するための共有リポジトリを作成します。"
1316
1315
1317
#: bzrlib/builtins.py:2146
1316
#: bzrlib/builtins.py:2165
1318
1317
msgid ""
1319
1318
"New branches created under the repository directory will store their\n"
1320
1319
"revisions in the repository, not in the branch directory. For branches\n"
1326
1325
"しているブランチ同士のストレージサイズが節約され、新しいブランチを作成\n"
1327
1326
"するスピードも速くなります。"
1328
1327
1329
#: bzrlib/builtins.py:2151
1328
#: bzrlib/builtins.py:2170
1330
1329
msgid ""
1331
1330
"If the --no-trees option is given then the branches in the repository\n"
1332
1331
"will not have working trees by default. They will still exist as \n"
1341
1340
"これは、サーバー上のリポジトリなど、チェックアウトやリモートブランチとやりとり\n"
1342
1341
"するリポジトリの場合に役立ちます。"
1343
1342
1344
#: bzrlib/builtins.py:2158
1343
#: bzrlib/builtins.py:2177
1345
1344
msgid ""
1346
1345
":Examples:\n"
1347
1346
" Create a shared repository holding just branches::"
1349
1348
":例:\n"
1350
1349
" ブランチだけをもつリポジトリを作成します。::"
1351
1350
1352
#: bzrlib/builtins.py:2161
1351
#: bzrlib/builtins.py:2180
1353
1352
msgid ""
1354
1353
" bzr init-repo --no-trees repo\n"
1355
1354
" bzr init repo/trunk"
1357
1356
" bzr init-repo --no-trees repo\n"
1358
1357
" bzr init repo/trunk"
1359
1358
1360
#: bzrlib/builtins.py:2164
1359
#: bzrlib/builtins.py:2183
1361
1360
msgid " Make a lightweight checkout elsewhere::"
1362
1361
msgstr " 別の場所に軽量チェックアウトを作成します。::"
1363
1362
1364
#: bzrlib/builtins.py:2166
1363
#: bzrlib/builtins.py:2185
1365
1364
msgid ""
1366
1365
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1367
1366
" cd trunk-checkout\n"
1371
1370
" cd trunk-checkout\n"
1372
1371
" (ここでファイルを追加)"
1373
1372
1374
#: bzrlib/builtins.py:2174
1373
#: bzrlib/builtins.py:2193
1375
1374
msgid ""
1376
1375
"Specify a format for this repository. See \"bzr help formats\" for details."
1377
1376
msgstr "リポジトリのフォーマットを指定します。詳しくは\"bzr help formats\"をご覧ください。"
1378
1377
1379
#: bzrlib/builtins.py:2178
1378
#: bzrlib/builtins.py:2197
1380
1379
msgid "Repository format"
1381
1380
msgstr "リポジトリフォーマット"
1382
1381
1383
#: bzrlib/builtins.py:2180
1382
#: bzrlib/builtins.py:2199
1384
1383
msgid "Branches in the repository will default to not having a working tree."
1385
1384
msgstr "リポジトリ内のブランチにはデフォルトでは作業ツリーを持たせません。"
1386
1385
1387
#: bzrlib/builtins.py:2206
1386
#: bzrlib/builtins.py:2225
1388
1387
msgid "Show differences in the working tree, between revisions or branches."
1389
1388
msgstr "作業ツリーや、リビジョン、ブランチ間の差分を表示します。"
1390
1389
1391
#: bzrlib/builtins.py:2208
1390
#: bzrlib/builtins.py:2227
1392
1391
msgid ""
1393
1392
"If no arguments are given, all changes for the current tree are listed.\n"
1394
1393
"If files are given, only the changes in those files are listed.\n"
1403
1402
"できます。これらが指定されていない場合は最初の引数が使われ、引数が無い\n"
1404
1403
"場合は作業ツリーが対象になります。"
1405
1404
1406
#: bzrlib/builtins.py:2215
1405
#: bzrlib/builtins.py:2234
1407
1406
msgid ""
1408
1407
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1409
1408
"produces patches suitable for \"patch -p1\"."
1411
1410
"\"bzr dif -p1\"は、\"bzr diff --prefix old/:new/\" と同じで、\"patch -p1\"に\n"
1412
1411
"準じたパッチを出力します。"
1413
1412
1414
#: bzrlib/builtins.py:2218
1413
#: bzrlib/builtins.py:2237
1415
1414
msgid ""
1416
1415
"Note that when using the -r argument with a range of revisions, the\n"
1417
1416
"differences are computed between the two specified revisions. That\n"
1425
1424
"リビジョンでの変更は含まれません。これは、\"bzr log\"にリビジョンの範囲を\n"
1426
1425
"指定した場合の動作(開始リビジョンも含む)とは異なります。"
1427
1426
1428
#: bzrlib/builtins.py:2225
1427
#: bzrlib/builtins.py:2244
1429
1428
msgid ""
1430
1429
":Exit values:\n"
1431
1430
" 1 - changed\n"
1439
1438
" 3 - エラー\n"
1440
1439
" 0 - 変更なし"
1441
1440
1442
#: bzrlib/builtins.py:2231
1441
#: bzrlib/builtins.py:2250
1443
1442
msgid ""
1444
1443
":Examples:\n"
1445
1444
" Shows the difference in the working tree versus the last commit::"
1447
1446
":例:\n"
1448
1447
" 最新のコミットと作業ツリーとの間の変更を表示します。::"
1449
1448
1450
#: bzrlib/builtins.py:2234
1449
#: bzrlib/builtins.py:2253
1451
1450
msgid " bzr diff"
1452
1451
msgstr " bzr diff"
1453
1452
1454
#: bzrlib/builtins.py:2236
1453
#: bzrlib/builtins.py:2255
1455
1454
msgid " Difference between the working tree and revision 1::"
1456
1455
msgstr " 作業ツリーとリビジョン１を比較します。::"
1457
1456
1458
#: bzrlib/builtins.py:2238
1457
#: bzrlib/builtins.py:2257
1459
1458
msgid " bzr diff -r1"
1460
1459
msgstr " bzr diff -r1"
1461
1460
1462
#: bzrlib/builtins.py:2240
1461
#: bzrlib/builtins.py:2259
1463
1462
msgid " Difference between revision 3 and revision 1::"
1464
1463
msgstr " リビジョン３とリビジョン１を比較します。::"
1465
1464
1466
#: bzrlib/builtins.py:2242
1465
#: bzrlib/builtins.py:2261
1467
1466
msgid " bzr diff -r1..3"
1468
1467
msgstr " bzr diff -r1..3"
1469
1468
1470
#: bzrlib/builtins.py:2244
1469
#: bzrlib/builtins.py:2263
1471
1470
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1472
1471
msgstr " ブランチxxxのリビジョン３とリビジョン１を比較します。::"
1473
1472
1474
#: bzrlib/builtins.py:2246
1473
#: bzrlib/builtins.py:2265
1475
1474
msgid " bzr diff -r1..3 xxx"
1476
1475
msgstr " bzr diff -r1..3 xxx"
1477
1476
1478
#: bzrlib/builtins.py:2248
1477
#: bzrlib/builtins.py:2267
1479
1478
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1480
1479
msgstr " リビジョン２での変更です。(-r1..2 と同じです。)::"
1481
1480
1482
#: bzrlib/builtins.py:2250
1481
#: bzrlib/builtins.py:2269
1483
1482
msgid " bzr diff -c2"
1484
1483
msgstr " bzr diff -c2"
1485
1484
1486
#: bzrlib/builtins.py:2252
1485
#: bzrlib/builtins.py:2271
1487
1486
msgid ""
1488
1487
" To see the changes introduced by revision X::\n"
1489
1488
" \n"
1493
1492
" \n"
1494
1493
" bzr diff -cX"
1495
1494
1496
#: bzrlib/builtins.py:2256
1495
#: bzrlib/builtins.py:2275
1497
1496
msgid ""
1498
1497
" Note that in the case of a merge, the -c option shows the changes\n"
1499
1498
" compared to the left hand parent. To see the changes against\n"
1502
1501
" マージされたリビジョンの場合は、-cオプションは左側の親からの変更を表示する\n"
1503
1502
" ことに注意してください。他の親からの変更を見るには、以下のようにします。::"
1504
1503
1505
#: bzrlib/builtins.py:2260
1504
#: bzrlib/builtins.py:2279
1506
1505
msgid " bzr diff -r<chosen_parent>..X"
1507
1506
msgstr " bzr diff -r<対象の親リビジョン>..X"
1508
1507
1509
#: bzrlib/builtins.py:2262
1508
#: bzrlib/builtins.py:2281
1510
1509
msgid ""
1511
1510
" The changes between the current revision and the previous revision\n"
1512
1511
" (equivalent to -c-1 and -r-2..-1)"
1513
1512
msgstr " 現在のリビジョンと一つ前のリビジョンとの差分です。(-c-1 、 -r-2..-1 と同じ)"
1514
1513
1515
#: bzrlib/builtins.py:2265
1514
#: bzrlib/builtins.py:2284
1516
1515
msgid " bzr diff -r-2.."
1517
1516
msgstr " bzr diff -r-2.."
1518
1517
1519
#: bzrlib/builtins.py:2267
1518
#: bzrlib/builtins.py:2286
1520
1519
msgid " Show just the differences for file NEWS::"
1521
1520
msgstr " ファイルNEWSの変更だけを表示します。::"
1522
1521
1523
#: bzrlib/builtins.py:2269
1522
#: bzrlib/builtins.py:2288
1524
1523
msgid " bzr diff NEWS"
1525
1524
msgstr " bzr diff NEWS"
1526
1525
1527
#: bzrlib/builtins.py:2271
1526
#: bzrlib/builtins.py:2290
1528
1527
msgid " Show the differences in working tree xxx for file NEWS::"
1529
1528
msgstr " 作業ツリーxxxの、ファイルNEWSの変更内容を表示します。::"
1530
1529
1531
#: bzrlib/builtins.py:2273
1530
#: bzrlib/builtins.py:2292
1532
1531
msgid " bzr diff xxx/NEWS"
1533
1532
msgstr " bzr diff xxx/NEWS"
1534
1533
1535
#: bzrlib/builtins.py:2275
1534
#: bzrlib/builtins.py:2294
1536
1535
msgid " Show the differences from branch xxx to this working tree:"
1537
1536
msgstr " ブランチxxxと作業ツリーとの間の差分を表示します。::"
1538
1537
1539
#: bzrlib/builtins.py:2277
1538
#: bzrlib/builtins.py:2296
1540
1539
msgid " bzr diff --old xxx"
1541
1540
msgstr " bzr diff --old xxx"
1542
1541
1543
#: bzrlib/builtins.py:2279
1542
#: bzrlib/builtins.py:2298
1544
1543
msgid " Show the differences between two branches for file NEWS::"
1545
1544
msgstr " ２つのブランチ間での、ファイルNEWSの差分を表示します。::"
1546
1545
1547
#: bzrlib/builtins.py:2281
1546
#: bzrlib/builtins.py:2300
1548
1547
msgid " bzr diff --old xxx --new yyy NEWS"
1549
1548
msgstr " bzr diff --old xxx --new yyy NEWS"
1550
1549
1551
#: bzrlib/builtins.py:2283
1550
#: bzrlib/builtins.py:2302
1552
1551
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1553
1552
msgstr " 'bzr diff'と同じですが、プレフィックスold/、new/を付加します。::"
1554
1553
1555
#: bzrlib/builtins.py:2285
1554
#: bzrlib/builtins.py:2304
1556
1555
msgid ""
1557
1556
" bzr diff --prefix old/:new/\n"
1558
1557
" \n"
1566
1565
" \n"
1567
1566
" bzr diff --using /usr/bin/diff --diff-options -wu"
1568
1567
1569
#: bzrlib/builtins.py:2295
1568
#: bzrlib/builtins.py:2314
1570
1569
msgid "Pass these options to the external diff program."
1571
1570
msgstr "これらのオプションは外部のdiffプログラムに渡されます。"
1572
1571
1573
#: bzrlib/builtins.py:2298
1572
#: bzrlib/builtins.py:2317
1574
1573
msgid ""
1575
1574
"Set prefixes added to old and new filenames, as two values separated by a "
1576
1575
"colon. (eg \"old/:new/\")."
1577
1576
msgstr "古いファイル名と新しいファイル名にプレフィックスを追加します。２つの値をコロンで区切って指定します。(例 \"old/:new/\")"
1578
1577
1579
#: bzrlib/builtins.py:2301
1578
#: bzrlib/builtins.py:2320
1580
1579
msgid "Branch/tree to compare from."
1581
1580
msgstr "比較元のブランチ/作業ツリーです。"
1582
1581
1583
#: bzrlib/builtins.py:2305
1582
#: bzrlib/builtins.py:2324
1584
1583
msgid "Branch/tree to compare to."
1585
1584
msgstr "比較先のブランチ/作業ツリーです。"
1586
1585
1587
#: bzrlib/builtins.py:2311
1586
#: bzrlib/builtins.py:2330
1588
1587
msgid "Use this command to compare files."
1589
1588
msgstr "ファイル比較に使うコマンドです。"
1590
1589
1591
#: bzrlib/builtins.py:2316
1590
#: bzrlib/builtins.py:2335
1592
1591
msgid "Diff format to use."
1593
1592
msgstr "使用するDiffフォーマットです。"
1594
1593
1595
#: bzrlib/builtins.py:2318
1594
#: bzrlib/builtins.py:2337
1596
1595
msgid "Diff format"
1597
1596
msgstr "Diffフォーマット"
1598
1597
1599
#: bzrlib/builtins.py:2340
1598
#: bzrlib/builtins.py:2359
1600
1599
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1601
1600
msgstr "--prefix は２つの値をコロンで区切ったものにしてください。 (例 \"old/:new/\")"
1602
1601
1603
#: bzrlib/builtins.py:2344
1602
#: bzrlib/builtins.py:2363
1604
1603
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1605
1604
msgstr "bzr diff --revision には１つまたは２つのリビジョンを指定してください。"
1606
1605
1607
#: bzrlib/builtins.py:2349 bzrlib/builtins.py:2746 bzrlib/builtins.py:2759
1608
#: bzrlib/builtins.py:2767 bzrlib/builtins.py:4933
1606
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1607
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1609
1608
msgid "{0} and {1} are mutually exclusive"
1610
1609
msgstr "{0} と {1} を同時に指定することはできません。"
1611
1610
1612
#: bzrlib/builtins.py:2369
1611
#: bzrlib/builtins.py:2388
1613
1612
msgid ""
1614
1613
"List files deleted in the working tree.\n"
1615
1614
" "
1617
1616
"作業ツリー上で削除されたファイルをリストアップします。\n"
1618
1617
" "
1619
1618
1620
#: bzrlib/builtins.py:2446
1619
#: bzrlib/builtins.py:2465
1621
1620
msgid "Show the tree root directory."
1622
1621
msgstr "ツリーのルートディレクトリを表示します。"
1623
1622
1624
#: bzrlib/builtins.py:2448
1623
#: bzrlib/builtins.py:2467
1625
1624
msgid ""
1626
1625
"The root is the nearest enclosing directory with a .bzr control\n"
1627
1626
"directory."
1628
1627
msgstr "ルートとは、.bzr管理ディレクトリを持つ、一番近い上位ディレクトリのことです。"
1629
1628
1630
#: bzrlib/builtins.py:2463
1629
#: bzrlib/builtins.py:2482
1631
1630
msgid "The limit argument must be an integer."
1632
1631
msgstr "limitは整数でなければなりません。"
1633
1632
1634
#: bzrlib/builtins.py:2471
1633
#: bzrlib/builtins.py:2490
1635
1634
msgid "The levels argument must be an integer."
1636
1635
msgstr "levelsは整数でなければなりません。"
1637
1636
1638
#: bzrlib/builtins.py:2476
1637
#: bzrlib/builtins.py:2495
1639
1638
msgid "Show historical log for a branch or subset of a branch."
1640
1639
msgstr "ブランチ、もしくはブランチの一部の履歴ログを表示します。"
1641
1640
1642
#: bzrlib/builtins.py:2478
1641
#: bzrlib/builtins.py:2497
1643
1642
msgid ""
1644
1643
"log is bzr's default tool for exploring the history of a branch.\n"
1645
1644
"The branch to use is taken from the first parameter. If no parameters\n"
1651
1650
"作業ディレクトリを含むブランチの履歴が表示されます。\n"
1652
1651
"簡単な例を以下に示します。::"
1653
1652
1654
#: bzrlib/builtins.py:2483
1653
#: bzrlib/builtins.py:2502
1655
1654
msgid ""
1656
1655
" bzr log log the current branch\n"
1657
1656
" bzr log foo.py log a file in its branch\n"
1661
1660
" bzr log foo,py は、ブランチ内のファイルの履歴を表示します。\n"
1662
1661
" bzr log http://server/branch は、サーバ上のブランチのログを表示します。"
1663
1662
1664
#: bzrlib/builtins.py:2487
1663
#: bzrlib/builtins.py:2506
1665
1664
msgid ""
1666
1665
"The filtering, ordering and information shown for each revision can\n"
1667
1666
"be controlled as explained below. By default, all revisions are\n"
1676
1675
"されます。マージされたリビジョンを表示する場合は、マージ先のリビジョンよりも\n"
1677
1676
"インデントされて表示されます。"
1678
1677
1679
#: bzrlib/builtins.py:2494
1678
#: bzrlib/builtins.py:2513
1680
1679
msgid ":Output control:"
1681
1680
msgstr ":出力のコントロール:"
1682
1681
1683
#: bzrlib/builtins.py:2496
1682
#: bzrlib/builtins.py:2515
1684
1683
msgid ""
1685
1684
" The log format controls how information about each revision is\n"
1686
1685
" displayed. The standard log formats are called ``long``, ``short``\n"
1692
1691
" があります。デフォルトはlongです。ログフォーマットについての詳細は\n"
1693
1692
" ``bzr help log-formats`` をご覧ください。"
1694
1693
1695
#: bzrlib/builtins.py:2501
1694
#: bzrlib/builtins.py:2520
1696
1695
msgid ""
1697
1696
" The following options can be used to control what information is\n"
1698
1697
" displayed::"
1699
1698
msgstr " 以下のオプションで、どの情報を表示するかをコントロールできます。"
1700
1699
1701
#: bzrlib/builtins.py:2504
1700
#: bzrlib/builtins.py:2523
1702
1701
msgid ""
1703
1702
" -l N display a maximum of N revisions\n"
1704
1703
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1712
1711
" -p Diff(patch)を各リビジョンに表示します。\n"
1713
1712
" --show-ids リビジョン番号だけでなく、リビジョンIDとファイルIDも表示します。」"
1714
1713
1715
#: bzrlib/builtins.py:2510
1714
#: bzrlib/builtins.py:2529
1716
1715
msgid ""
1717
1716
" Note that the default number of levels to display is a function of the\n"
1718
1717
" log format. If the -n option is not used, the standard log formats show\n"
1722
1721
" -nオプションが使用されない場合は、標準のログフォーマットはトップレベル(メイン\n"
1723
1722
" ライン)だけを表示します。"
1724
1723
1725
#: bzrlib/builtins.py:2514
1724
#: bzrlib/builtins.py:2533
1726
1725
msgid ""
1727
1726
" Status summaries are shown using status flags like A, M, etc. To see\n"
1728
1727
" the changes explained using words like ``added`` and ``modified``\n"
1731
1730
" ステータスのサマリは、A、Mなどのフラグで表示されます。 かわりに ``added``、\n"
1732
1731
" ``modified`` などの単語で表示するには、-vvオプションを使用してください。"
1733
1732
1734
#: bzrlib/builtins.py:2518
1733
#: bzrlib/builtins.py:2537
1735
1734
msgid ":Ordering control:"
1736
1735
msgstr ":表示順のコントロール:"
1737
1736
1738
#: bzrlib/builtins.py:2520
1737
#: bzrlib/builtins.py:2539
1739
1738
msgid ""
1740
1739
" To display revisions from oldest to newest, use the --forward option.\n"
1741
1740
" In most cases, using this option will have little impact on the total\n"
1746
1745
" 使います。--forwardは、--reverseのようにログをインクリメンタルに表示はしません\n"
1747
1746
"が、たいていの場合、ログ表示にかかる時間への影響はわずかです。"
1748
1747
1749
#: bzrlib/builtins.py:2525
1748
#: bzrlib/builtins.py:2544
1750
1749
msgid ":Revision filtering:"
1751
1750
msgstr ":リビジョンのフィルタリング:"
1752
1751
1753
#: bzrlib/builtins.py:2527
1752
#: bzrlib/builtins.py:2546
1754
1753
msgid ""
1755
1754
" The -r option can be used to specify what revision or range of revisions\n"
1756
1755
" to filter against. The various forms are shown below::"
1758
1757
" -rオプションで、どのリビジョン、もしくはリビジョンの範囲を表示するかを指定する\n"
1759
1758
" ことができます。いろいろな例を以下に示します。::"
1760
1759
1761
#: bzrlib/builtins.py:2530
1760
#: bzrlib/builtins.py:2549
1762
1761
msgid ""
1763
1762
" -rX display revision X\n"
1764
1763
" -rX.. display revision X and later\n"
1770
1769
" -r..Y リビジョンY以前(Yを含む)を表示\n"
1771
1770
" -rX..Y リビジョンXからY(X、Yを含む)を表示"
1772
1771
1773
#: bzrlib/builtins.py:2535
1772
#: bzrlib/builtins.py:2554
1774
1773
msgid ""
1775
1774
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1776
1775
" Some common examples are given below::"
1778
1777
" X、Yの指定方法の詳細は、 ``bzr help revisionspec`` を参照してください。\n"
1779
1778
" よくある例を以下に示します。::"
1780
1779
1781
#: bzrlib/builtins.py:2538
1780
#: bzrlib/builtins.py:2557
1782
1781
msgid ""
1783
1782
" -r-1 show just the tip\n"
1784
1783
" -r-10.. show the last 10 mainline revisions\n"
1794
1793
" 変更を表示\n"
1795
1794
" -rdate:yesterday.. 昨日からの変更を表示"
1796
1795
1797
#: bzrlib/builtins.py:2545
1796
#: bzrlib/builtins.py:2564
1798
1797
msgid ""
1799
1798
" When logging a range of revisions using -rX..Y, log starts at\n"
1800
1799
" revision Y and searches back in history through the primary\n"
1810
1809
" リビジョンの中に見つかるかもしれません。その場合、ログは適切に切り捨て\n"
1811
1810
" られます。"
1812
1811
1813
#: bzrlib/builtins.py:2552
1812
#: bzrlib/builtins.py:2571
1814
1813
msgid ":Path filtering:"
1815
1814
msgstr ":パスのフィルタリング:"
1816
1815
1817
#: bzrlib/builtins.py:2554
1816
#: bzrlib/builtins.py:2573
1818
1817
msgid ""
1819
1818
" If parameters are given and the first one is not a branch, the log\n"
1820
1819
" will be filtered to show only those revisions that changed the\n"
1823
1822
" パラメータが指定されていて、一つ目のパラメータがブランチではない場合、\n"
1824
1823
" 指定されたファイル、ディレクトリが変更されたリビジョンだけが表示されます。"
1825
1824
1826
#: bzrlib/builtins.py:2558
1825
#: bzrlib/builtins.py:2577
1827
1826
msgid ""
1828
1827
" Filenames are interpreted within their historical context. To log a\n"
1829
1828
" deleted file, specify a revision range so that the file existed at\n"
1833
1832
" ログを表示するには、そのファイルが存在したリビジョンを、リビジョンの範囲\n"
1834
1833
" の最初か最後に指定してください。"
1835
1834
1836
#: bzrlib/builtins.py:2562
1835
#: bzrlib/builtins.py:2581
1837
1836
msgid ""
1838
1837
" Historical context is also important when interpreting pathnames of\n"
1839
1838
" renamed files/directories. Consider the following example:"
1841
1840
" 履歴のコンテキストは、変名されたファイルやディレクトリのパス名を解釈する\n"
1842
1841
" 際にも重要になります。以下の例を考えてください。："
1843
1842
1844
#: bzrlib/builtins.py:2565
1843
#: bzrlib/builtins.py:2584
1845
1844
msgid ""
1846
1845
" * revision 1: add tutorial.txt\n"
1847
1846
" * revision 2: modify tutorial.txt\n"
1851
1850
" * リビジョン 2: tutorial.txt\n"
1852
1851
" * リビジョン 3: tutorial.txt を guide.txt に変名し、add tutorial.txt を追加"
1853
1852
1854
#: bzrlib/builtins.py:2569
1853
#: bzrlib/builtins.py:2588
1855
1854
msgid " In this case:"
1856
1855
msgstr " この場合:"
1857
1856
1858
#: bzrlib/builtins.py:2571
1857
#: bzrlib/builtins.py:2590
1859
1858
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1860
1859
msgstr " * ``bzr log guide.txt`` は、リビジョン1で追加されたファイルを表示します。"
1861
1860
1862
#: bzrlib/builtins.py:2573
1861
#: bzrlib/builtins.py:2592
1863
1862
msgid ""
1864
1863
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1865
1864
msgstr " * ``bzr log tutorial.txt`` は、リビジョン3で追加された新しいファイルを表示します。"
1866
1865
1867
#: bzrlib/builtins.py:2575
1866
#: bzrlib/builtins.py:2594
1868
1867
msgid ""
1869
1868
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1870
1869
" the original file in revision 2."
1872
1871
" * ``bzr log -r2 -p tutorial.txt`` は、元のファイルのリビジョン2での変更\n"
1873
1872
" を表示します。"
1874
1873
1875
#: bzrlib/builtins.py:2578
1874
#: bzrlib/builtins.py:2597
1876
1875
msgid ""
1877
1876
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1878
1877
" was no file called guide.txt in revision 2."
1880
1879
" * ``bzr log -r2 -p guide.txt`` は、リビジョン2にはguide.txtというファイルはない\n"
1881
1880
" というエラーを表示します。"
1882
1881
1883
#: bzrlib/builtins.py:2581
1882
#: bzrlib/builtins.py:2600
1884
1883
msgid ""
1885
1884
" Renames are always followed by log. By design, there is no need to\n"
1886
1885
" explicitly ask for this (and no way to stop logging a file back\n"
1889
1888
" 変名は常に履歴に表示されます。明示的に指定する必要はありません。(また、\n"
1890
1889
" 最後に変名される以前のログを切り捨てる方法もありません)"
1891
1890
1892
#: bzrlib/builtins.py:2585
1891
#: bzrlib/builtins.py:2604
1893
1892
msgid ":Other filtering:"
1894
1893
msgstr ":その他のフィルタリング:"
1895
1894
1896
#: bzrlib/builtins.py:2587
1895
#: bzrlib/builtins.py:2606
1897
1896
msgid ""
1898
1897
" The --match option can be used for finding revisions that match a\n"
1899
1898
" regular expression in a commit message, committer, author or bug.\n"
1907
1906
" --match-bug、--match-committer、--match-messageで、指定したフィールド\n"
1908
1907
" だけを検索対象にすることができます。"
1909
1908
1910
#: bzrlib/builtins.py:2593
1909
#: bzrlib/builtins.py:2612
1911
1910
msgid ":Tips & tricks:"
1912
1911
msgstr ":Tips & tricks:"
1913
1912
1914
#: bzrlib/builtins.py:2595
1913
#: bzrlib/builtins.py:2614
1915
1914
msgid ""
1916
1915
" GUI tools and IDEs are often better at exploring history than command\n"
1917
1916
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1925
1924
" <http://doc.bazaar.canonical.com/plugins/en/> や、\n"
1926
1925
" <http://wiki.bazaar.canonical.com/IDEIntegration> をご覧ください。 "
1927
1926
1928
#: bzrlib/builtins.py:2601
1927
#: bzrlib/builtins.py:2620
1929
1928
msgid ""
1930
1929
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1931
1930
msgstr " ``bazaar.conf`` に以下のようなエイリアスを追加しておくと便利です。::"
1932
1931
1933
#: bzrlib/builtins.py:2603
1932
#: bzrlib/builtins.py:2622
1934
1933
msgid ""
1935
1934
" [ALIASES]\n"
1936
1935
" tip = log -r-1\n"
1942
1941
" top = log -l10 --line\n"
1943
1942
" show = log -v -p"
1944
1943
1945
#: bzrlib/builtins.py:2608
1944
#: bzrlib/builtins.py:2627
1946
1945
msgid ""
1947
1946
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1948
1947
" will show the last 10 mainline revisions. To see the details of a\n"
1952
1951
" 10リビジョンを表示します。特定のリビジョンXの詳細を見るには、 ``bzr show -X``\n"
1953
1952
" を使用します。"
1954
1953
1955
#: bzrlib/builtins.py:2612
1954
#: bzrlib/builtins.py:2631
1956
1955
msgid ""
1957
1956
" If you are interested in looking deeper into a particular merge X,\n"
1958
1957
" use ``bzr log -n0 -rX``."
1959
1958
msgstr " 特定のマージXについて詳しく見たい場合は、 ``bzr log -n0 -rX`` を使用します。"
1960
1959
1961
#: bzrlib/builtins.py:2615
1960
#: bzrlib/builtins.py:2634
1962
1961
msgid ""
1963
1962
" ``bzr log -v`` on a branch with lots of history is currently\n"
1964
1963
" very slow. A fix for this issue is currently under development.\n"
1970
1969
" しても、-vオプションを指定するときはリビジョンの範囲を指定することを\n"
1971
1970
" おすすめします。"
1972
1971
1973
#: bzrlib/builtins.py:2620
1972
#: bzrlib/builtins.py:2639
1974
1973
msgid ""
1975
1974
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1976
1975
" used to find revisions matching user names, commit messages, etc.\n"
1982
1981
" 他の機能とはちがい、このプラグインでは単語のリストを含むすべての\n"
1983
1982
" リビジョンを検索することができます。"
1984
1983
1985
#: bzrlib/builtins.py:2625
1984
#: bzrlib/builtins.py:2644
1986
1985
msgid ""
1987
1986
" When exploring non-mainline history on large projects with deep\n"
1988
1987
" history, the performance of log can be greatly improved by installing\n"
1994
1993
" することができます。このプラグインは、履歴情報をキャッシュして、ディスク\n"
1995
1994
" スペースと引き換えに高速なパフォーマンスをもたらします。"
1996
1995
1997
#: bzrlib/builtins.py:2634
1996
#: bzrlib/builtins.py:2653
1998
1997
msgid "Show from oldest to newest."
1999
1998
msgstr "古い方から新しい方へ表示する"
2000
1999
2001
#: bzrlib/builtins.py:2637
2000
#: bzrlib/builtins.py:2656
2002
2001
msgid "Show files changed in each revision."
2003
2002
msgstr "各リビジョンでのファイルの変更を表示する"
2004
2003
2005
#: bzrlib/builtins.py:2643
2004
#: bzrlib/builtins.py:2662
2006
2005
msgid "Show just the specified revision. See also \"help revisionspec\"."
2007
2006
msgstr "指定されたリビジョンだけを表示する。 ``help revisionspec``を参照"
2008
2007
2009
#: bzrlib/builtins.py:2647
2008
#: bzrlib/builtins.py:2666
2010
2009
msgid "What names to list as authors - first, all or committer."
2011
2010
msgstr "誰を作者として表示するか - first、all、またはcommitter"
2012
2011
2013
#: bzrlib/builtins.py:2648
2012
#: bzrlib/builtins.py:2667
2014
2013
msgid "Authors"
2015
2014
msgstr "作者"
2016
2015
2017
#: bzrlib/builtins.py:2653
2016
#: bzrlib/builtins.py:2672
2018
2017
msgid "Number of levels to display - 0 for all, 1 for flat."
2019
2018
msgstr "表示するレベル。-0で全て、1で１階層"
2020
2019
2021
#: bzrlib/builtins.py:2663
2020
#: bzrlib/builtins.py:2682
2022
2021
msgid "Limit the output to the first N revisions."
2023
2022
msgstr "最初のNリビジョンだけを出力する"
2024
2023
2025
#: bzrlib/builtins.py:2668
2024
#: bzrlib/builtins.py:2687
2026
2025
msgid "Show changes made in each revision as a patch."
2027
2026
msgstr "各リビジョンでの変更をパッチとして表示"
2028
2027
2029
#: bzrlib/builtins.py:2670
2028
#: bzrlib/builtins.py:2689
2030
2029
msgid "Show merged revisions like --levels 0 does."
2031
2030
msgstr "--levels 0 と同じようにマージされたリビジョンを表示する"
2032
2031
2033
#: bzrlib/builtins.py:2674
2032
#: bzrlib/builtins.py:2693
2034
2033
msgid "Do not report commits with more than one parent."
2035
2034
msgstr "複数の親を持つコミットを表示しない"
2036
2035
2037
#: bzrlib/builtins.py:2676
2036
#: bzrlib/builtins.py:2695
2038
2037
msgid ""
2039
2038
"Display only the revisions that are not part of both ancestries (require -"
2040
2039
"rX..Y)."
2041
2040
msgstr "共通の先祖に含まれないリビジョンだけを表示(-rX..Yを使用する必要がある)"
2042
2041
2043
#: bzrlib/builtins.py:2680
2042
#: bzrlib/builtins.py:2699
2044
2043
msgid "Show digital signature validity."
2045
2044
msgstr "デジタル署名を表示"
2046
2045
2047
#: bzrlib/builtins.py:2683
2046
#: bzrlib/builtins.py:2702
2048
2047
msgid "Show revisions whose properties match this expression."
2049
2048
msgstr "この表現にマッチするプロパティのリビジョンを表示"
2050
2049
2051
#: bzrlib/builtins.py:2687
2050
#: bzrlib/builtins.py:2706
2052
2051
msgid "Show revisions whose message matches this expression."
2053
2052
msgstr "この表現にマッチするメッセージのリビジョンを表示"
2054
2053
2055
#: bzrlib/builtins.py:2691
2054
#: bzrlib/builtins.py:2710
2056
2055
msgid "Show revisions whose committer matches this expression."
2057
2056
msgstr "コミッタが指定された表現にマッチするリビジョンを表示する"
2058
2057
2059
#: bzrlib/builtins.py:2695
2058
#: bzrlib/builtins.py:2714
2060
2059
msgid "Show revisions whose authors match this expression."
2061
2060
msgstr "作者が指定された表現にマッチするリビジョンを表示する"
2062
2061
2063
#: bzrlib/builtins.py:2699
2062
#: bzrlib/builtins.py:2718
2064
2063
msgid "Show revisions whose bugs match this expression."
2065
2064
msgstr "バグ情報が指定された表現にマッチするリビジョンを表示します"
2066
2065
2067
#: bzrlib/builtins.py:2753
2066
#: bzrlib/builtins.py:2772
2068
2067
msgid "--exclude-common-ancestry requires -r with two revisions"
2069
2068
msgstr "--exclude-common-ancestryには、-rで2つのリビジョンを指定する必要があります。"
2070
2069
2071
#: bzrlib/builtins.py:2781
2070
#: bzrlib/builtins.py:2800
2072
2071
#, python-format
2073
2072
msgid "Path unknown at end or start of revision range: %s"
2074
2073
msgstr "最後のリビジョンにも最初のリビジョンにもパスが見つかりません: %s"
2075
2074
2076
#: bzrlib/builtins.py:2898
2075
#: bzrlib/builtins.py:2917
2077
2076
#, python-format
2078
2077
msgid "bzr %s doesn't accept two revisions in different branches."
2079
2078
msgstr "bzr %s には、異なるブランチ上の2つのリビジョンは指定できません。"
2080
2079
2081
#: bzrlib/builtins.py:2914
2080
#: bzrlib/builtins.py:2933
2082
2081
#, python-format
2083
2082
msgid "bzr %s --revision takes one or two values."
2084
2083
msgstr "bzr %s --revision は1つまたは2つの値を取ります。"
2085
2084
2086
#: bzrlib/builtins.py:2959
2085
#: bzrlib/builtins.py:2978
2087
2086
msgid ""
2088
2087
"List files in a tree.\n"
2089
2088
" "
2091
2090
"ツリー内のファイルをリストアップします。\n"
2092
2091
" "
2093
2092
2094
#: bzrlib/builtins.py:2968
2093
#: bzrlib/builtins.py:2987
2095
2094
msgid "Recurse into subdirectories."
2096
2095
msgstr "サブディレクトリも再帰で処理します。"
2097
2096
2098
#: bzrlib/builtins.py:2970
2097
#: bzrlib/builtins.py:2989
2099
2098
msgid "Print paths relative to the root of the branch."
2100
2099
msgstr "ブランチのルートからの相対パスを表示します。"
2101
2100
2102
#: bzrlib/builtins.py:2972
2101
#: bzrlib/builtins.py:2991
2103
2102
msgid "Print unknown files."
2104
2103
msgstr "バージョン管理外のファイルを表示します。"
2105
2104
2106
#: bzrlib/builtins.py:2973
2105
#: bzrlib/builtins.py:2992
2107
2106
msgid "Print versioned files."
2108
2107
msgstr "バージョン管理されたファイルを表示します。"
2109
2108
2110
#: bzrlib/builtins.py:2976
2109
#: bzrlib/builtins.py:2995
2111
2110
msgid "Print ignored files."
2112
2111
msgstr "無視されたファイルを表示します。"
2113
2112
2114
#: bzrlib/builtins.py:2978
2113
#: bzrlib/builtins.py:2997
2115
2114
msgid "List entries of a particular kind: file, directory, symlink."
2116
2115
msgstr "指定された種別のアイテム(ファイル、ディレクトリ、シンボリックリンク)を表示します。"
2117
2116
2118
#: bzrlib/builtins.py:2991
2117
#: bzrlib/builtins.py:3010
2119
2118
msgid "invalid kind specified"
2120
2119
msgstr "無効な種別が指定されました。"
2121
2120
2122
#: bzrlib/builtins.py:2994
2121
#: bzrlib/builtins.py:3013
2123
2122
msgid "Cannot set both --verbose and --null"
2124
2123
msgstr "--verboseと--nullを同時に指定することはできません。"
2125
2124
2126
#: bzrlib/builtins.py:3003
2125
#: bzrlib/builtins.py:3022
2127
2126
msgid "cannot specify both --from-root and PATH"
2128
2127
msgstr "--from-rootとPATHを同時に指定することはできません。"
2129
2128
2130
#: bzrlib/builtins.py:3090
2129
#: bzrlib/builtins.py:3109
2131
2130
msgid "Ignore specified files or patterns."
2132
2131
msgstr "指定されたファイルやパターンを無視します。"
2133
2132
2134
#: bzrlib/builtins.py:3092
2133
#: bzrlib/builtins.py:3111
2135
2134
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2136
2135
msgstr "パターンの書き方の詳細は ``bzr help patterns`` をご覧ください。"
2137
2136
2138
#: bzrlib/builtins.py:3094
2137
#: bzrlib/builtins.py:3113
2139
2138
msgid ""
2140
2139
"If a .bzrignore file does not exist, the ignore command\n"
2141
2140
"will create one and add the specified files or patterns to the newly\n"
2149
2148
"使わずに.bzrignoreファイルを手で作成した場合は、明示的にaddコマンドを\n"
2150
2149
"呼ぶ必要があります。"
2151
2150
2152
#: bzrlib/builtins.py:3100
2151
#: bzrlib/builtins.py:3119
2153
2152
msgid ""
2154
2153
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2155
2154
"After adding, editing or deleting that file either indirectly by\n"
2160
2159
"ignoreコマンドやエディタでこのファイルのエントリを追加、編集、削除した\n"
2161
2160
"場合は、忘れずにコミットしてください。"
2162
2161
2163
#: bzrlib/builtins.py:3105
2162
#: bzrlib/builtins.py:3124
2164
2163
msgid ""
2165
2164
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2166
2165
"the global ignore file can be found in the application data directory as\n"
2174
2173
"このファイルをこのコマンドで編集することはできないので、直接エディタで編集\n"
2175
2174
"してください。"
2176
2175
2177
#: bzrlib/builtins.py:3111
2176
#: bzrlib/builtins.py:3130
2178
2177
msgid ""
2179
2178
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2180
2179
"precedence over regular ignores. Such exceptions are used to specify\n"
2184
2183
"優先されます。これは、普通なら無視されるはずのファイルをバージョン管理\n"
2185
2184
"の対象とするために使います。"
2186
2185
2187
#: bzrlib/builtins.py:3115
2186
#: bzrlib/builtins.py:3134
2188
2187
msgid ""
2189
2188
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2190
2189
"precedence over the '!' exception patterns."
2192
2191
"!!で始まるパターンは、通常の無視指定として扱われますが、!による除外\n"
2193
2192
"パターンよりも優先されます。"
2194
2193
2195
#: bzrlib/builtins.py:3118
2194
#: bzrlib/builtins.py:3137
2196
2195
msgid ""
2197
2196
":Notes: \n"
2198
2197
" \n"
2204
2203
"*シェルのワイルドカードをふくむ無視パターンを指定するときには、Unixシェル\n"
2205
2204
" による引用符でくくる必要があります。"
2206
2205
2207
#: bzrlib/builtins.py:3123
2206
#: bzrlib/builtins.py:3142
2208
2207
msgid ""
2209
2208
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2210
2209
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2212
2211
"* #で始まる無視パターンは、無視ファイル中のコメントとして扱われます。\n"
2213
2212
" #で始まるファイルを無視したい場合は、\"RE:\"プレフィックスを使ってください。"
2214
2213
2215
#: bzrlib/builtins.py:3126
2214
#: bzrlib/builtins.py:3145
2216
2215
msgid ""
2217
2216
":Examples:\n"
2218
2217
" Ignore the top level Makefile::"
2220
2219
":例:\n"
2221
2220
" トップレベルのMakefileを無視する::"
2222
2221
2223
#: bzrlib/builtins.py:3129
2222
#: bzrlib/builtins.py:3148
2224
2223
msgid " bzr ignore ./Makefile"
2225
2224
msgstr " bzr ignore ./Makefile"
2226
2225
2227
#: bzrlib/builtins.py:3131
2226
#: bzrlib/builtins.py:3150
2228
2227
msgid " Ignore .class files in all directories...::"
2229
2228
msgstr " すべてのディレクトリの.classファイルを無視するが...::"
2230
2229
2231
#: bzrlib/builtins.py:3133
2230
#: bzrlib/builtins.py:3152
2232
2231
msgid " bzr ignore \"*.class\""
2233
2232
msgstr " bzr ignore \"*.class\""
2234
2233
2235
#: bzrlib/builtins.py:3135
2234
#: bzrlib/builtins.py:3154
2236
2235
msgid " ...but do not ignore \"special.class\"::"
2237
2236
msgstr " ...\"special.class\" は無視しない::"
2238
2237
2239
#: bzrlib/builtins.py:3137
2238
#: bzrlib/builtins.py:3156
2240
2239
msgid " bzr ignore \"!special.class\""
2241
2240
msgstr " bzr ignore \"!special.class\""
2242
2241
2243
#: bzrlib/builtins.py:3139
2242
#: bzrlib/builtins.py:3158
2244
2243
msgid " Ignore files whose name begins with the \"#\" character::"
2245
2244
msgstr " #で始まるファイルを無視する::"
2246
2245
2247
#: bzrlib/builtins.py:3141
2246
#: bzrlib/builtins.py:3160
2248
2247
msgid " bzr ignore \"RE:^#\""
2249
2248
msgstr " bzr ignore \"RE:^#\""
2250
2249
2251
#: bzrlib/builtins.py:3143 bzrlib/builtins.py:3147
2250
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2252
2251
msgid " Ignore .o files under the lib directory::"
2253
2252
msgstr " libディレクトリ配下の.oファイルを無視する::"
2254
2253
2255
#: bzrlib/builtins.py:3145
2254
#: bzrlib/builtins.py:3164
2256
2255
msgid " bzr ignore \"lib/**/*.o\""
2257
2256
msgstr " bzr ignore \"lib/**/*.o\""
2258
2257
2259
#: bzrlib/builtins.py:3149
2258
#: bzrlib/builtins.py:3168
2260
2259
msgid " bzr ignore \"RE:lib/.*\\.o\""
2261
2260
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2262
2261
2263
#: bzrlib/builtins.py:3151
2262
#: bzrlib/builtins.py:3170
2264
2263
msgid " Ignore everything but the \"debian\" toplevel directory::"
2265
2264
msgstr " \"debian\"トップレベルディレクトリ以外の全てを無視する::"
2266
2265
2267
#: bzrlib/builtins.py:3153
2266
#: bzrlib/builtins.py:3172
2268
2267
msgid ""
2269
2268
" bzr ignore \"RE:(?!debian/).*\"\n"
2270
2269
" \n"
2284
2283
" bzr ignore \"!./local\"\n"
2285
2284
" bzr ignore \"!!*~\""
2286
2285
2287
#: bzrlib/builtins.py:3167
2286
#: bzrlib/builtins.py:3186
2288
2287
msgid "Display the default ignore rules that bzr uses."
2289
2288
msgstr "bzrが使用するデフォルトの無視ルールを表示します。"
2290
2289
2291
#: bzrlib/builtins.py:3179
2290
#: bzrlib/builtins.py:3198
2292
2291
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2293
2292
msgstr "ignoreにはNAME_PATTERNか--default-rulesのどちらかは指定する必要があります。"
2294
2293
2295
#: bzrlib/builtins.py:3190
2294
#: bzrlib/builtins.py:3209
2296
2295
#, python-format
2297
2296
msgid "Invalid ignore pattern found. %s"
2298
2297
msgid_plural "Invalid ignore patterns found. %s"
2299
2298
msgstr[0] "無効な無視パターンが見つかりました。 %s"
2300
2299
2301
#: bzrlib/builtins.py:3199
2300
#: bzrlib/builtins.py:3218
2302
2301
msgid "NAME_PATTERN should not be an absolute path"
2303
2302
msgstr "NAME_PATTERNに絶対パスは指定できません。"
2304
2303
2305
#: bzrlib/builtins.py:3212
2304
#: bzrlib/builtins.py:3231
2306
2305
#, python-format
2307
2306
msgid ""
2308
2307
"Warning: the following files are version controlled and match your ignore "
2315
2314
"%s\n"
2316
2315
"これらのファイルは、'bzr remove'しない限りはバージョン管理されたままです。\n"
2317
2316
2318
#: bzrlib/builtins.py:3219
2317
#: bzrlib/builtins.py:3238
2319
2318
msgid "List ignored files and the patterns that matched them."
2320
2319
msgstr "無視するファイルとそれらにマッチするパターンの一覧を表示する。"
2321
2320
2322
#: bzrlib/builtins.py:3221
2321
#: bzrlib/builtins.py:3240
2323
2322
msgid ""
2324
2323
"List all the ignored files and the ignore pattern that caused the file to\n"
2325
2324
"be ignored."
2326
2325
msgstr "無視されるファイルと、それがどのパターンによって無視されているかを一覧で表示します。"
2327
2326
2328
#: bzrlib/builtins.py:3224
2327
#: bzrlib/builtins.py:3243
2329
2328
msgid "Alternatively, to list just the files::"
2330
2329
msgstr "代わりにファイルの一覧だけを表示するには::"
2331
2330
2332
#: bzrlib/builtins.py:3226
2331
#: bzrlib/builtins.py:3245
2333
2332
msgid " bzr ls --ignored"
2334
2333
msgstr " bzr ls --ignored"
2335
2334
2336
#: bzrlib/builtins.py:3260
2335
#: bzrlib/builtins.py:3279
2337
2336
#, python-format
2338
2337
msgid "not a valid revision-number: %r"
2339
2338
msgstr "無効なリビジョン番号です。: %r"
2340
2339
2341
#: bzrlib/builtins.py:3267
2340
#: bzrlib/builtins.py:3286
2342
2341
msgid ""
2343
2342
"Export current or past revision to a destination directory or archive."
2344
2343
msgstr "最新、または過去のリビジョンを指定されたディレクトリもしくはアーカイブにエクスポートする。"
2345
2344
2346
#: bzrlib/builtins.py:3269
2345
#: bzrlib/builtins.py:3288
2347
2346
msgid "If no revision is specified this exports the last committed revision."
2348
2347
msgstr "リビジョンが指定されなければ、最終コミットのリビジョンをエクスポートします。"
2349
2348
2350
#: bzrlib/builtins.py:3271
2349
#: bzrlib/builtins.py:3290
2351
2350
msgid ""
2352
2351
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2353
2352
"given, try to find the format with the extension. If no extension\n"
2357
2356
" 何も渡されなければ、拡張子のフォーマットを見つけようとします。 拡張子がない\n"
2358
2357
"場合は、ディレクトリにエクスポートします(–format=dirと同等)。"
2359
2358
2360
#: bzrlib/builtins.py:3275
2359
#: bzrlib/builtins.py:3294
2361
2360
msgid ""
2362
2361
"If root is supplied, it will be used as the root directory inside\n"
2363
2362
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2368
2367
"ファイル名がデフォルトになります。rootオプションは、'dir'フォーマット\n"
2369
2368
"に対しては作用しません。"
2370
2369
2371
#: bzrlib/builtins.py:3279
2370
#: bzrlib/builtins.py:3298
2372
2371
msgid ""
2373
2372
"If branch is omitted then the branch containing the current working\n"
2374
2373
"directory will be used."
2375
2374
msgstr "ブランチが省略されると現在の作業ディレクトリを含むブランチが使用されます。"
2376
2375
2377
#: bzrlib/builtins.py:3282
2376
#: bzrlib/builtins.py:3301
2378
2377
msgid ""
2379
2378
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2380
2379
msgstr "注: ASCIIではないファイルを含むツリーの、zipへのエクスポートはサポートされません。"
2381
2380
2382
#: bzrlib/builtins.py:3284
2381
#: bzrlib/builtins.py:3303
2383
2382
msgid ""
2384
2383
" ================= =========================\n"
2385
2384
" Supported formats Autodetected by extension\n"
2401
2400
" zip .zip\n"
2402
2401
" ==================== ===================="
2403
2402
2404
#: bzrlib/builtins.py:3298
2403
#: bzrlib/builtins.py:3317
2405
2404
msgid "Type of file to export to."
2406
2405
msgstr "エクスポートするファイルの種類"
2407
2406
2408
#: bzrlib/builtins.py:3301
2407
#: bzrlib/builtins.py:3320
2409
2408
msgid "Apply content filters to export the convenient form."
2410
2409
msgstr "使いやすい形でエクスポートするためのコンテンツフィルターを適用します。"
2411
2410
2412
#: bzrlib/builtins.py:3305
2411
#: bzrlib/builtins.py:3324
2413
2412
msgid "Name of the root directory inside the exported file."
2414
2413
msgstr "エクスポートされたファイル内部のrootディレクトリの名前。"
2415
2414
2416
#: bzrlib/builtins.py:3307
2415
#: bzrlib/builtins.py:3326
2417
2416
msgid ""
2418
2417
"Set modification time of files to that of the last revision in which it was "
2419
2418
"changed."
2420
2419
msgstr "各ファイルの編集日時を、最後にそのファイルが変更されたリビジョンの日時に設定します。"
2421
2420
2422
#: bzrlib/builtins.py:3310
2421
#: bzrlib/builtins.py:3329
2423
2422
msgid ""
2424
2423
"Export the working tree contents rather than that of the last revision."
2425
2424
msgstr "最終リビジョンではなく、作業ツリーの内容をエクスポートします。"
2426
2425
2427
#: bzrlib/builtins.py:3329
2426
#: bzrlib/builtins.py:3348
2428
2427
msgid "--uncommitted requires a working tree"
2429
2428
msgstr "作業ツリーに対しては--uncommittedを指定する必要があります。"
2430
2429
2431
#: bzrlib/builtins.py:3338
2430
#: bzrlib/builtins.py:3357
2432
2431
#, python-format
2433
2432
msgid "Unsupported export format: %s"
2434
2433
msgstr "サポートされていないエクスポートフォーマット: %s"
2435
2434
2436
#: bzrlib/builtins.py:3342
2435
#: bzrlib/builtins.py:3361
2437
2436
msgid ""
2438
2437
"Write the contents of a file as of a given revision to standard output."
2439
2438
msgstr "指定されたリビジョンのファイルの内容を標準出力に書き出します。"
2440
2439
2441
#: bzrlib/builtins.py:3344
2440
#: bzrlib/builtins.py:3363
2442
2441
msgid "If no revision is nominated, the last revision is used."
2443
2442
msgstr "リビジョンが指定されなければ、最後のリビジョンが使用されます。"
2444
2443
2445
#: bzrlib/builtins.py:3346
2444
#: bzrlib/builtins.py:3365
2446
2445
msgid ""
2447
2446
"Note: Take care to redirect standard output when using this command on a\n"
2448
2447
"binary file."
2450
2449
"バイナリファイルでこのコマンドを使用する際には標準出力をリダイレクトするように\n"
2451
2450
"気をつけてください。"
2452
2451
2453
#: bzrlib/builtins.py:3352
2452
#: bzrlib/builtins.py:3371
2454
2453
msgid "The path name in the old tree."
2455
2454
msgstr "古いツリーのパス名。"
2456
2455
2457
#: bzrlib/builtins.py:3353
2456
#: bzrlib/builtins.py:3372
2458
2457
msgid "Apply content filters to display the convenience form."
2459
2458
msgstr "便利な形で表示するためのフィルタを適用します。"
2460
2459
2461
#: bzrlib/builtins.py:3364
2460
#: bzrlib/builtins.py:3383
2462
2461
msgid "bzr cat --revision takes exactly one revision specifier"
2463
2462
msgstr "bzr cat --revisionにはリビジョンをひとつだけ指定します。"
2464
2463
2465
#: bzrlib/builtins.py:3389 bzrlib/builtins.py:3401
2464
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2466
2465
msgid "{0!r} is not present in revision {1}"
2467
2466
msgstr "{0!r}はリビジョン{1}には存在しません。"
2468
2467
2469
#: bzrlib/builtins.py:3424
2468
#: bzrlib/builtins.py:3443
2470
2469
msgid "Commit changes into a new revision."
2471
2470
msgstr "変更を新しいリビジョンにコミットする。"
2472
2471
2473
#: bzrlib/builtins.py:3426
2472
#: bzrlib/builtins.py:3445
2474
2473
msgid ""
2475
2474
"An explanatory message needs to be given for each commit. This is\n"
2476
2475
"often done by using the --message option (getting the message from the\n"
2486
2485
"エディタにロードされる定型文の中に変更されたファイルの情報を含めるためには、\n"
2487
2486
"--show-diffオプションを使用します。"
2488
2487
2489
#: bzrlib/builtins.py:3433
2488
#: bzrlib/builtins.py:3452
2490
2489
msgid ""
2491
2490
"By default, the entire tree is committed and the person doing the\n"
2492
2491
"commit is assumed to be the author. These defaults can be overridden\n"
2495
2494
"デフォルトでは、ツリー全体がコミットされ、コミットを実行した人が著者になります。\n"
2496
2495
"これは、以下のような方法で上書きすることができます。"
2497
2496
2498
#: bzrlib/builtins.py:3437
2497
#: bzrlib/builtins.py:3456
2499
2498
msgid ":Selective commits:"
2500
2499
msgstr ":部分的なコミット:"
2501
2500
2502
#: bzrlib/builtins.py:3439
2501
#: bzrlib/builtins.py:3458
2503
2502
msgid ""
2504
2503
" If selected files are specified, only changes to those files are\n"
2505
2504
" committed. If a directory is specified then the directory and\n"
2509
2508
" ディレクトリが指定された場合、そのディレクトリとその配下すべてが\n"
2510
2509
" コミット対象になります。"
2511
2510
2512
#: bzrlib/builtins.py:3443
2511
#: bzrlib/builtins.py:3462
2513
2512
msgid ""
2514
2513
" When excludes are given, they take precedence over selected files.\n"
2515
2514
" For example, to commit only changes within foo, but not changes\n"
2519
2518
" たとえば、foo配下の変更をコミットするが、foo/bar内はコミットしないという\n"
2520
2519
" 場合は::"
2521
2520
2522
#: bzrlib/builtins.py:3447
2521
#: bzrlib/builtins.py:3466
2523
2522
msgid " bzr commit foo -x foo/bar"
2524
2523
msgstr " bzr commit foo -x foo/bar"
2525
2524
2526
#: bzrlib/builtins.py:3449
2525
#: bzrlib/builtins.py:3468
2527
2526
msgid " A selective commit after a merge is not yet supported."
2528
2527
msgstr " マージ後の部分的なコミットはまだサポートされていません。"
2529
2528
2530
#: bzrlib/builtins.py:3451
2529
#: bzrlib/builtins.py:3470
2531
2530
msgid ":Custom authors:"
2532
2531
msgstr ":作者の変更:"
2533
2532
2534
#: bzrlib/builtins.py:3453
2533
#: bzrlib/builtins.py:3472
2535
2534
msgid ""
2536
2535
" If the author of the change is not the same person as the committer,\n"
2537
2536
" you can specify the author's name using the --author option. The\n"
2545
2544
" ように、コミッターのIDと同じフォーマットで指定するべきです。複数の作者が\n"
2546
2545
" いるなら、このオプションを複数回指定することもできます。"
2547
2546
2548
#: bzrlib/builtins.py:3460
2547
#: bzrlib/builtins.py:3479
2549
2548
msgid ":Checks:"
2550
2549
msgstr ":チェック:"
2551
2550
2552
#: bzrlib/builtins.py:3462
2551
#: bzrlib/builtins.py:3481
2553
2552
msgid ""
2554
2553
" A common mistake is to forget to add a new file or directory before\n"
2555
2554
" running the commit command. The --strict option checks for unknown\n"
2563
2562
" 前チェックをフックとして実装することもできます。詳細は ``bzr help hooks`` を\n"
2564
2563
" ご覧ください。"
2565
2564
2566
#: bzrlib/builtins.py:3468
2565
#: bzrlib/builtins.py:3487
2567
2566
msgid ":Things to note:"
2568
2567
msgstr ":特記事項:"
2569
2568
2570
#: bzrlib/builtins.py:3470
2569
#: bzrlib/builtins.py:3489
2571
2570
msgid ""
2572
2571
" If you accidentially commit the wrong changes or make a spelling\n"
2573
2572
" mistake in the commit message say, you can use the uncommit command\n"
2577
2576
" ミスがあった場合は、uncommitコマンドでコミットを取り消すことができます。\n"
2578
2577
" 詳細は ``bzr help uncommit`` をご覧ください。"
2579
2578
2580
#: bzrlib/builtins.py:3474
2579
#: bzrlib/builtins.py:3493
2581
2580
msgid ""
2582
2581
" Hooks can also be configured to run after a commit. This allows you\n"
2583
2582
" to trigger updates to external systems like bug trackers. The --fixes\n"
2589
2588
" バグとの関係を記録することができます。詳細は ``bzr help bugs`` を見て\n"
2590
2589
" ください。"
2591
2590
2592
#: bzrlib/builtins.py:3484
2591
#: bzrlib/builtins.py:3503
2593
2592
msgid "Do not consider changes made to a given path."
2594
2593
msgstr "指定されたパスの変更を無視します。"
2595
2594
2596
#: bzrlib/builtins.py:3487
2595
#: bzrlib/builtins.py:3506
2597
2596
msgid "Description of the new revision."
2598
2597
msgstr "新しいリビジョンの説明。"
2599
2598
2600
#: bzrlib/builtins.py:3490
2599
#: bzrlib/builtins.py:3509
2601
2600
msgid "Commit even if nothing has changed."
2602
2601
msgstr "何も変更されていなくてもコミットする。"
2603
2602
2604
#: bzrlib/builtins.py:3494
2603
#: bzrlib/builtins.py:3513
2605
2604
msgid "Take commit message from this file."
2606
2605
msgstr "このファイルからコミットメッセージを取得する。"
2607
2606
2608
#: bzrlib/builtins.py:3496
2607
#: bzrlib/builtins.py:3515
2609
2608
msgid "Refuse to commit if there are unknown files in the working tree."
2610
2609
msgstr "作業ツリーの中にバージョン管理外のファイルが存在する場合コミットを拒否する。"
2611
2610
2612
#: bzrlib/builtins.py:3499
2611
#: bzrlib/builtins.py:3518
2613
2612
msgid ""
2614
2613
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2615
2614
"08:00:00 +0100'."
2616
2615
msgstr "コミット日時を決められたフォーマットで手動で指定します。例) '2009-10-10 08:00:00 +0100'"
2617
2616
2618
#: bzrlib/builtins.py:3502
2617
#: bzrlib/builtins.py:3521
2619
2618
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2620
2619
msgstr "このリビジョンで修正されたバグをマークする(\"bzr help bugs\"を参照)。"
2621
2620
2622
#: bzrlib/builtins.py:3505
2621
#: bzrlib/builtins.py:3524
2623
2622
msgid "Set the author's name, if it's different from the committer."
2624
2623
msgstr "著者の名前がコミッターとは異なる場合、著者の名前を設定する。"
2625
2624
2626
#: bzrlib/builtins.py:3508
2625
#: bzrlib/builtins.py:3527
2627
2626
msgid ""
2628
2627
"Perform a local commit in a bound branch. Local commits are not pushed to "
2629
2628
"the master branch until a normal commit is performed."
2630
2629
msgstr ""
2631
2630
"バインドされたブランチにローカルコミットを実行する。 通常のコミットが実行されるまで ローカルコミットはマスターブランチにpushされません。"
2632
2631
2633
#: bzrlib/builtins.py:3514
2632
#: bzrlib/builtins.py:3533
2634
2633
msgid ""
2635
2634
"When no message is supplied, show the diff along with the status summary in "
2636
2635
"the message editor."
2637
2636
msgstr "メッセージが提供されないとき、 メッセージエディタでステータスの要約と一緒に差分を表示する。"
2638
2637
2639
#: bzrlib/builtins.py:3517
2638
#: bzrlib/builtins.py:3536
2640
2639
msgid ""
2641
2640
"When committing to a foreign version control system do not push data that "
2642
2641
"can not be natively represented."
2643
2642
msgstr "外部のバージョン管理システムにコミットするときに、ネイティブに表現できないデータをプッシュしません。"
2644
2643
2645
#: bzrlib/builtins.py:3535
2644
#: bzrlib/builtins.py:3554
2646
2645
#, python-format
2647
2646
msgid ""
2648
2647
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2653
2652
"オプションで指定してください。\n"
2654
2653
"詳細は \"bzr help bugs\" をご覧ください。コミットは拒否されました。"
2655
2654
2656
#: bzrlib/builtins.py:3544
2655
#: bzrlib/builtins.py:3563
2657
2656
#, python-format
2658
2657
msgid ""
2659
2658
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2663
2662
"無効なバグです。 %s 'トラッカー:id' の形式で指定する必要があります。詳細は \"bzr help bugs\" をご覧ください。\n"
2664
2663
"コミットは拒否されました。"
2665
2664
2666
#: bzrlib/builtins.py:3553
2665
#: bzrlib/builtins.py:3572
2667
2666
#, python-format
2668
2667
msgid "Unrecognized bug %s. Commit refused."
2669
2668
msgstr "不明なバグです。 %s コミットは拒否されました。"
2670
2669
2671
#: bzrlib/builtins.py:3556
2670
#: bzrlib/builtins.py:3575
2672
2671
#, python-format
2673
2672
msgid ""
2674
2673
"%s\n"
2677
2676
"%s\n"
2678
2677
"コミットは拒否されました。"
2679
2678
2680
#: bzrlib/builtins.py:3580
2679
#: bzrlib/builtins.py:3599
2681
2680
msgid "Could not parse --commit-time: "
2682
2681
msgstr "--commit-timeをパースできません。: "
2683
2682
2684
#: bzrlib/builtins.py:3620
2683
#: bzrlib/builtins.py:3639
2685
2684
msgid "please specify either --message or --file"
2686
2685
msgstr "--message か --file かどちらかを指定してください。"
2687
2686
2688
#: bzrlib/builtins.py:3649
2687
#: bzrlib/builtins.py:3668
2689
2688
msgid "please specify a commit message with either --message or --file"
2690
2689
msgstr "--messageか--fileのどちらかでコミットメッセージを指定してください。"
2691
2690
2692
#: bzrlib/builtins.py:3652
2691
#: bzrlib/builtins.py:3671
2693
2692
msgid ""
2694
2693
"Empty commit message specified. Please specify a commit message with either -"
2695
2694
"-message or --file or leave a blank message with --message \"\"."
2697
2696
"空のコミットメッセージが指定されました。--messageか--fileでコミットメッセージを指定するか、--message "
2698
2697
"\"\"で空メッセージを指定してください。"
2699
2698
2700
#: bzrlib/builtins.py:3672
2699
#: bzrlib/builtins.py:3691
2701
2700
msgid ""
2702
2701
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2703
2702
"-unchanged to force an empty commit."
2704
2703
msgstr ""
2705
2704
"コミットする変更がありません。コミットしたいファイルを'bzr add'で追加するか、--unchangedを指定して空のコミットを実行してください。"
2706
2705
2707
#: bzrlib/builtins.py:3676
2706
#: bzrlib/builtins.py:3695
2708
2707
msgid ""
2709
2708
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2710
2709
"resolve FILE\" to resolve."
2711
2710
msgstr "作業ツリーに競合があります。\"bzr conflicts\" で表示して、\"bzr resolve FILE\"で解消してください。"
2712
2711
2713
#: bzrlib/builtins.py:3680
2712
#: bzrlib/builtins.py:3699
2714
2713
msgid "Commit refused because there are unknown files in the working tree."
2715
2714
msgstr "作業ツリーにバージョン管理外のファイルがあるため、コミットが拒否されました。"
2716
2715
2717
#: bzrlib/builtins.py:3683
2716
#: bzrlib/builtins.py:3702
2718
2717
msgid ""
2719
2718
"\n"
2720
2719
"To commit to master branch, run update and then commit.\n"
2724
2723
"マスタブランチにコミットするには、先にupdateしてください。\n"
2725
2724
"--localを指定してオフラインでコミットし、作業を続けることもできます。"
2726
2725
2727
#: bzrlib/builtins.py:3691
2726
#: bzrlib/builtins.py:3710
2728
2727
msgid ""
2729
2728
"Validate working tree structure, branch consistency and repository history."
2730
2729
msgstr "作業ツリーの構造、ブランチの一貫性、リポジトリの履歴をチェックします。"
2731
2730
2732
#: bzrlib/builtins.py:3693
2731
#: bzrlib/builtins.py:3712
2733
2732
msgid ""
2734
2733
"This command checks various invariants about branch and repository storage\n"
2735
2734
"to detect data corruption or bzr bugs."
2737
2736
"このコマンドは、データの破損やbzrのバグを検出するために、ブランチとリポジトリ\n"
2738
2737
"ストレージの不変条件をチェックします。"
2739
2738
2740
#: bzrlib/builtins.py:3696
2739
#: bzrlib/builtins.py:3715
2741
2740
msgid ""
2742
2741
"The working tree and branch checks will only give output if a problem is\n"
2743
2742
"detected. The output fields of the repository check are:"
2745
2744
"作業ツリーとブランチのチェック結果は、問題が見つかったときだけ表示\n"
2746
2745
"されます。リポジトリチェックの出力は次の通りです。:"
2747
2746
2748
#: bzrlib/builtins.py:3699
2747
#: bzrlib/builtins.py:3718
2749
2748
msgid ""
2750
2749
"revisions\n"
2751
2750
" This is just the number of revisions checked. It doesn't\n"
2754
2753
"revisions\n"
2755
2754
" チェックしたリビジョンの数です。これは問題ではありません。"
2756
2755
2757
#: bzrlib/builtins.py:3703
2756
#: bzrlib/builtins.py:3722
2758
2757
msgid ""
2759
2758
"versionedfiles\n"
2760
2759
" This is just the number of versionedfiles checked. It\n"
2764
2763
" チェックしたバージョン管理ファイルの数です。これは問題では\n"
2765
2764
" ありません。"
2766
2765
2767
#: bzrlib/builtins.py:3707
2766
#: bzrlib/builtins.py:3726
2768
2767
msgid ""
2769
2768
"unreferenced ancestors\n"
2770
2769
" Texts that are ancestors of other texts, but\n"
2776
2775
" と思われるテキストです。これは、Bazaarが対処できる軽微な\n"
2777
2776
" 問題です。"
2778
2777
2779
#: bzrlib/builtins.py:3712
2778
#: bzrlib/builtins.py:3731
2780
2779
msgid ""
2781
2780
"unique file texts\n"
2782
2781
" This is the total number of unique file contents\n"
2786
2785
" チェックしたリビジョンの中にある、一意なファイルコンテンツの数です。\n"
2787
2786
" これは問題ではありません。"
2788
2787
2789
#: bzrlib/builtins.py:3716
2788
#: bzrlib/builtins.py:3735
2790
2789
msgid ""
2791
2790
"repeated file texts\n"
2792
2791
" This is the total number of repeated texts seen\n"
2799
2798
" ファイルのエントリが変更されたが、内容は変更されていない場合に、\n"
2800
2799
" 重複が発生します。これは問題ではありません。"
2801
2800
2802
#: bzrlib/builtins.py:3722
2801
#: bzrlib/builtins.py:3741
2803
2802
msgid ""
2804
2803
"If no restrictions are specified, all Bazaar data that is found at the "
2805
2804
"given\n"
2808
2807
"条件が指定されなければ、指定された場所の全てのBazaarデータが\n"
2809
2808
"チェックされます。"
2810
2809
2811
#: bzrlib/builtins.py:3727
2810
#: bzrlib/builtins.py:3746
2812
2811
msgid " Check the tree and branch at 'foo'::"
2813
2812
msgstr " ‘foo’ でのツリーとブランチをチェックする::"
2814
2813
2815
#: bzrlib/builtins.py:3729
2814
#: bzrlib/builtins.py:3748
2816
2815
msgid " bzr check --tree --branch foo"
2817
2816
msgstr " bzr check --tree --branch foo"
2818
2817
2819
#: bzrlib/builtins.py:3731
2818
#: bzrlib/builtins.py:3750
2820
2819
msgid " Check only the repository at 'bar'::"
2821
2820
msgstr " ‘bar’でのリポジトリのみをチェックする::"
2822
2821
2823
#: bzrlib/builtins.py:3733
2822
#: bzrlib/builtins.py:3752
2824
2823
msgid " bzr check --repo bar"
2825
2824
msgstr " bzr check --repo bar"
2826
2825
2827
#: bzrlib/builtins.py:3735
2826
#: bzrlib/builtins.py:3754
2828
2827
msgid " Check everything at 'baz'::"
2829
2828
msgstr " ‘baz’ ですべてをチェックする::"
2830
2829
2831
#: bzrlib/builtins.py:3737
2830
#: bzrlib/builtins.py:3756
2832
2831
msgid " bzr check baz"
2833
2832
msgstr " bzr check baz"
2834
2833
2835
#: bzrlib/builtins.py:3743
2834
#: bzrlib/builtins.py:3762
2836
2835
msgid "Check the branch related to the current directory."
2837
2836
msgstr "現在のディレクトリに関連したブランチをチェックする。"
2838
2837
2839
#: bzrlib/builtins.py:3745
2838
#: bzrlib/builtins.py:3764
2840
2839
msgid "Check the repository related to the current directory."
2841
2840
msgstr "現在のディレクトリに関連したリポジトリをチェックする。"
2842
2841
2843
#: bzrlib/builtins.py:3747
2842
#: bzrlib/builtins.py:3766
2844
2843
msgid "Check the working tree related to the current directory."
2845
2844
msgstr "現在のディレクトリに関連した作業ツリーをチェックする。"
2846
2845
2847
#: bzrlib/builtins.py:3761
2846
#: bzrlib/builtins.py:3780
2848
2847
msgid "Upgrade a repository, branch or working tree to a newer format."
2849
2848
msgstr "リポジトリ、ブランチ、作業ツリーを新しいフォーマットにアップグレードします。"
2850
2849
2851
#: bzrlib/builtins.py:3763
2850
#: bzrlib/builtins.py:3782
2852
2851
msgid ""
2853
2852
"When the default format has changed after a major new release of\n"
2854
2853
"Bazaar, you may be informed during certain operations that you\n"
2862
2861
"新しい機能が使えるようになるでしょう。ただし、古いバージョンのリポジトリや\n"
2863
2862
"Bazaarとの互換性には制限が発生するかもしれません。"
2864
2863
2865
#: bzrlib/builtins.py:3769
2864
#: bzrlib/builtins.py:3788
2866
2865
msgid ""
2867
2866
"If you wish to upgrade to a particular format rather than the\n"
2868
2867
"current default, that can be specified using the --format option.\n"
2877
2876
"あります。(たとえば、1.xのデフォルトから2.xのデフォルトへの変換は不可逆です)\n"
2878
2877
"そのため、ダウングレードできない場合もあります。"
2879
2878
2880
#: bzrlib/builtins.py:3776
2879
#: bzrlib/builtins.py:3795
2881
2880
msgid ""
2882
2881
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2883
2882
"process (where # is a number). By default, this is left there on\n"
2894
2893
"ディレクトリは削除されます。そうでない場合は、変換後特に問題がなければ手で\n"
2895
2894
"削除してください。"
2896
2895
2897
#: bzrlib/builtins.py:3784
2896
#: bzrlib/builtins.py:3803
2898
2897
msgid ""
2899
2898
"If the location given is a shared repository, dependent branches\n"
2900
2899
"are also converted provided the repository converts successfully.\n"
2905
2904
"配下のブランチも変換されます。もしブランチの変換に失敗しても、他の\n"
2906
2905
"ブランチの変換は続行されます。"
2907
2906
2908
#: bzrlib/builtins.py:3789
2907
#: bzrlib/builtins.py:3808
2909
2908
msgid ""
2910
2909
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2911
2910
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2913
2912
"アップグレードに関する詳細な情報は、Bazaar Upgrade Guideをご覧ください。\n"
2914
2913
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2915
2914
2916
#: bzrlib/builtins.py:3797
2915
#: bzrlib/builtins.py:3816
2917
2916
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2918
2917
msgstr "指定されたフォーマットにアップグレードします。詳細は\"bzr help formats\"をご覧ください。"
2919
2918
2920
#: bzrlib/builtins.py:3801
2919
#: bzrlib/builtins.py:3820
2921
2920
msgid "Branch format"
2922
2921
msgstr "ブランチフォーマット"
2923
2922
2924
#: bzrlib/builtins.py:3803
2923
#: bzrlib/builtins.py:3822
2925
2924
msgid "Remove the backup.bzr directory if successful."
2926
2925
msgstr "変換に成功したらbackup.bzrディレクトリを削除します。"
2927
2926
2928
#: bzrlib/builtins.py:3805
2927
#: bzrlib/builtins.py:3824
2929
2928
msgid "Show what would be done, but don't actually do anything."
2930
2929
msgstr "何が実行されるかを表示しますが、実際には何もしません。"
2931
2930
2932
#: bzrlib/builtins.py:3820
2931
#: bzrlib/builtins.py:3839
2933
2932
msgid "Show or set bzr user id."
2934
2933
msgstr "bzrのユーザIDを表示、設定します。"
2935
2934
2936
#: bzrlib/builtins.py:3822
2935
#: bzrlib/builtins.py:3841
2937
2936
msgid ""
2938
2937
":Examples:\n"
2939
2938
" Show the email of the current user::"
2941
2940
":例:\n"
2942
2941
" 現在のユーザのEメールを表示します。::"
2943
2942
2944
#: bzrlib/builtins.py:3825
2943
#: bzrlib/builtins.py:3844
2945
2944
msgid " bzr whoami --email"
2946
2945
msgstr " bzr whoami --email"
2947
2946
2948
#: bzrlib/builtins.py:3827
2947
#: bzrlib/builtins.py:3846
2949
2948
msgid " Set the current user::"
2950
2949
msgstr " ユーザを設定します。::"
2951
2950
2952
#: bzrlib/builtins.py:3829
2951
#: bzrlib/builtins.py:3848
2953
2952
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2954
2953
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
2955
2954
2956
#: bzrlib/builtins.py:3833
2955
#: bzrlib/builtins.py:3852
2957
2956
msgid "Display email address only."
2958
2957
msgstr "Eメールアドレスだけを表示します。"
2959
2958
2960
#: bzrlib/builtins.py:3835
2959
#: bzrlib/builtins.py:3854
2961
2960
msgid "Set identity for the current branch instead of globally."
2962
2961
msgstr "全体設定ではなく、現在のブランチだけにIDを設定します。"
2963
2962
2964
#: bzrlib/builtins.py:3861
2963
#: bzrlib/builtins.py:3880
2965
2964
msgid "--email can only be used to display existing identity"
2966
2965
msgstr "--emailは、現在のIDを表示するためだけに使用できます。"
2967
2966
2968
#: bzrlib/builtins.py:3885
2967
#: bzrlib/builtins.py:3904
2969
2968
msgid "Print or set the branch nickname."
2970
2969
msgstr "ブランチのニックネームを表示または設定します。"
2971
2970
2972
#: bzrlib/builtins.py:3887
2971
#: bzrlib/builtins.py:3906
2973
2972
msgid ""
2974
2973
"If unset, the colocated branch name is used for colocated branches, and\n"
2975
2974
"the branch directory name is used for other branches. To print the\n"
2976
2975
"current nickname, execute with no argument."
2977
2976
msgstr ""
2978
2977
2979
#: bzrlib/builtins.py:3891
2978
#: bzrlib/builtins.py:3910
2980
2979
msgid ""
2981
2980
"Bound branches use the nickname of its master branch unless it is set\n"
2982
2981
"locally."
2984
2983
"バインドされたブランチは、ローカルでニックネームが設定されていなければ\n"
2985
2984
"マスタブランチのニックネームを使用します。"
2986
2985
2987
#: bzrlib/builtins.py:3911
2986
#: bzrlib/builtins.py:3930
2988
2987
msgid "Set/unset and display aliases."
2989
2988
msgstr "エイリアスの設定、解除、表示を行います。"
2990
2989
2991
#: bzrlib/builtins.py:3913
2990
#: bzrlib/builtins.py:3932
2992
2991
msgid ""
2993
2992
":Examples:\n"
2994
2993
" Show the current aliases::"
2996
2995
":例:\n"
2997
2996
" 現在のエイリアスを表示します。::"
2998
2997
2999
#: bzrlib/builtins.py:3916
2998
#: bzrlib/builtins.py:3935
3000
2999
msgid " bzr alias"
3001
3000
msgstr " bzr alias"
3002
3001
3003
#: bzrlib/builtins.py:3918
3002
#: bzrlib/builtins.py:3937
3004
3003
msgid " Show the alias specified for 'll'::"
3005
3004
msgstr " 'll'に設定されているエイリアスを表示します。::"
3006
3005
3007
#: bzrlib/builtins.py:3920
3006
#: bzrlib/builtins.py:3939
3008
3007
msgid " bzr alias ll"
3009
3008
msgstr " bzr alias ll"
3010
3009
3011
#: bzrlib/builtins.py:3922
3010
#: bzrlib/builtins.py:3941
3012
3011
msgid " Set an alias for 'll'::"
3013
3012
msgstr " エイリアス'll'を設定します。::"
3014
3013
3015
#: bzrlib/builtins.py:3924
3014
#: bzrlib/builtins.py:3943
3016
3015
msgid " bzr alias ll=\"log --line -r-10..-1\""
3017
3016
msgstr " bzr alias ll=\"log --line -r-10..-1\""
3018
3017
3019
#: bzrlib/builtins.py:3926
3018
#: bzrlib/builtins.py:3945
3020
3019
msgid " To remove an alias for 'll'::"
3021
3020
msgstr " エイリアス'll'を解除します。::"
3022
3021
3023
#: bzrlib/builtins.py:3928
3022
#: bzrlib/builtins.py:3947
3024
3023
msgid " bzr alias --remove ll"
3025
3024
msgstr " bzr alias --remove ll"
3026
3025
3027
#: bzrlib/builtins.py:3933
3026
#: bzrlib/builtins.py:3952
3028
3027
msgid "Remove the alias."
3029
3028
msgstr "エイリアスを削除します。"
3030
3029
3031
#: bzrlib/builtins.py:3951
3030
#: bzrlib/builtins.py:3970
3032
3031
msgid "bzr alias --remove expects an alias to remove."
3033
3032
msgstr "bzr alias --removeには、削除するエイリアス名を指定する必要があります。"
3034
3033
3035
#: bzrlib/builtins.py:4132
3034
#: bzrlib/builtins.py:4151
3036
3035
msgid ""
3037
3036
"subunit not available. subunit needs to be installed to use --subunit."
3038
3037
msgstr ""
3039
3038
3040
#: bzrlib/builtins.py:4149
3039
#: bzrlib/builtins.py:4168
3041
3040
msgid ""
3042
3041
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3043
3042
msgstr "--benchmarkは、bzr2.2以降はサポートしていません。かわりにbzr-usertestを使用してください。"
3044
3043
3045
#: bzrlib/builtins.py:4196
3044
#: bzrlib/builtins.py:4215
3046
3045
msgid "Show version of bzr."
3047
3046
msgstr "Bazaarのバージョンを表示します。"
3048
3047
3049
#: bzrlib/builtins.py:4200
3048
#: bzrlib/builtins.py:4219
3050
3049
msgid "Print just the version number."
3051
3050
msgstr "リビジョン番号を表示します。"
3052
3051
3053
#: bzrlib/builtins.py:4219
3052
#: bzrlib/builtins.py:4238
3054
3053
msgid "It sure does!\n"
3055
3054
msgstr ""
3056
3055
3057
#: bzrlib/builtins.py:4243
3056
#: bzrlib/builtins.py:4262
3058
3057
#, python-format
3059
3058
msgid "merge base is revision %s\n"
3060
3059
msgstr "マージの起点はリビジョン %s です。\n"
3061
3060
3062
#: bzrlib/builtins.py:4247
3061
#: bzrlib/builtins.py:4266
3063
3062
msgid "Perform a three-way merge."
3064
3063
msgstr "3wayマージを実行します。"
3065
3064
3066
#: bzrlib/builtins.py:4249
3065
#: bzrlib/builtins.py:4268
3067
3066
msgid ""
3068
3067
"The source of the merge can be specified either in the form of a branch,\n"
3069
3068
"or in the form of a path to a file containing a merge directive generated\n"
3079
3078
"別のブランチ内のファイルパスをマージ元として指定することもでき、その場合は\n"
3080
3079
"指定されたファイルの変更だけが現在のブランチにマージされます。"
3081
3080
3082
#: bzrlib/builtins.py:4257
3081
#: bzrlib/builtins.py:4276
3083
3082
msgid ""
3084
3083
"When merging from a branch, by default bzr will try to merge in all new\n"
3085
3084
"work from the other branch, automatically determining an appropriate base\n"
3089
3088
"判定し、それ以降のすべての変更をマージしようとします。もしこれが失敗した場合は、\n"
3090
3089
"明示的にベースリビジョンを指定する必要があります。"
3091
3090
3092
#: bzrlib/builtins.py:4261
3091
#: bzrlib/builtins.py:4280
3093
3092
msgid ""
3094
3093
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3095
3094
"try to merge in all new work up to and including revision OTHER."
3097
3096
"別の最終リビジョンを指定するには、\"-revision OTHER\"を指定します。この場合、\n"
3098
3097
"OTHERまで(OTHERも含む)の全ての変更がマージされます。"
3099
3098
3100
#: bzrlib/builtins.py:4264
3099
#: bzrlib/builtins.py:4283
3101
3100
msgid ""
3102
3101
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3103
3102
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3114
3113
"とはちがい、今のところBazaarではチェリーピックは追跡しません。変更は、普通の\n"
3115
3114
"コミットのように見え、マージ元での変更履歴は保存されません。"
3116
3115
3117
#: bzrlib/builtins.py:4272
3116
#: bzrlib/builtins.py:4291
3118
3117
msgid "Revision numbers are always relative to the source branch."
3119
3118
msgstr "リビジョン番号は常に元のブランチに関連します。"
3120
3119
3121
#: bzrlib/builtins.py:4274 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3120
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3122
3121
msgid ""
3123
3122
"Merge will do its best to combine the changes in two branches, but there\n"
3124
3123
"are some kinds of problems only a human can fix. When it encounters those,\n"
3126
3125
"before you can commit."
3127
3126
msgstr ""
3128
3127
3129
#: bzrlib/builtins.py:4279
3128
#: bzrlib/builtins.py:4298
3130
3129
msgid ""
3131
3130
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3132
3131
msgstr "問題を解消したら、bzr resolveを使用してください。bzr conflictsもご覧ください。"
3133
3132
3134
#: bzrlib/builtins.py:4281
3133
#: bzrlib/builtins.py:4300
3135
3134
msgid ""
3136
3135
"If there is no default branch set, the first merge will set it (use\n"
3137
3136
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3144
3143
"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモートの\n"
3145
3144
"ブランチにアクセスできた時だけ保存されます。"
3146
3145
3147
#: bzrlib/builtins.py:4286
3146
#: bzrlib/builtins.py:4305
3148
3147
msgid ""
3149
3148
"The results of the merge are placed into the destination working\n"
3150
3149
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3153
3152
"マージの結果はマージ先の作業ツリー内に反映され、そこで(bzr diffを使って)\n"
3154
3153
"レビューしたり、テストをしたあとで、コミットによって記録することができます。"
3155
3154
3156
#: bzrlib/builtins.py:4290
3155
#: bzrlib/builtins.py:4309
3157
3156
msgid ""
3158
3157
"merge refuses to run if there are any uncommitted changes, unless\n"
3159
3158
"--force is given. If --force is given, then the changes from the source \n"
3166
3165
"マージ元の変更がマージされます。--forceオプションを使えば、２つ以上の親を持つ\n"
3167
3166
"マージリビジョンを作ることもできます。"
3168
3167
3169
#: bzrlib/builtins.py:4296
3168
#: bzrlib/builtins.py:4315
3170
3169
msgid ""
3171
3170
"If one would like to merge changes from the working tree of the other\n"
3172
3171
"branch without merging any committed revisions, the --uncommitted option\n"
3175
3174
"コミット済みの変更ではなく、作業ツリー上での変更を別のブランチにマージしたい\n"
3176
3175
"場合は、--uncommittedオプションを指定することができます。"
3177
3176
3178
#: bzrlib/builtins.py:4300
3177
#: bzrlib/builtins.py:4319
3179
3178
msgid ""
3180
3179
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3181
3180
"you to apply each diff hunk and file change, similar to \"shelve\"."
3183
3182
"変更を部分的にマージしたければ、\"merge -i\"を使用すれば、\"shelve\"と同じ\n"
3184
3183
"ようにそれぞれのハンクをプロンプトで選択して適用することができます。"
3185
3184
3186
#: bzrlib/builtins.py:4303
3185
#: bzrlib/builtins.py:4322
3187
3186
msgid ""
3188
3187
":Examples:\n"
3189
3188
" To merge all new revisions from bzr.dev::"
3191
3190
":例:\n"
3192
3191
" bzr.devから全ての新しいリビジョンをマージします。::"
3193
3192
3194
#: bzrlib/builtins.py:4306
3193
#: bzrlib/builtins.py:4325
3195
3194
msgid " bzr merge ../bzr.dev"
3196
3195
msgstr " bzr merge ../bzr.dev"
3197
3196
3198
#: bzrlib/builtins.py:4308
3197
#: bzrlib/builtins.py:4327
3199
3198
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3200
3199
msgstr " bzr.devから、リビジョン82まで(82も含む)のリビジョンをマージします::"
3201
3200
3202
#: bzrlib/builtins.py:4310
3201
#: bzrlib/builtins.py:4329
3203
3202
msgid " bzr merge -r 82 ../bzr.dev"
3204
3203
msgstr " bzr merge -r 82 ../bzr.dev"
3205
3204
3206
#: bzrlib/builtins.py:4312
3205
#: bzrlib/builtins.py:4331
3207
3206
msgid " To merge the changes introduced by 82, without previous changes::"
3208
3207
msgstr " リビジョン82での変更をマージし、それ以前の変更はマージしません。::"
3209
3208
3210
#: bzrlib/builtins.py:4314
3209
#: bzrlib/builtins.py:4333
3211
3210
msgid " bzr merge -r 81..82 ../bzr.dev"
3212
3211
msgstr " bzr merge -r 81..82 ../bzr.dev"
3213
3212
3214
#: bzrlib/builtins.py:4316
3213
#: bzrlib/builtins.py:4335
3215
3214
msgid " To apply a merge directive contained in /tmp/merge::"
3216
3215
msgstr " /tmp/merge内のマージディレクティブを適用します。::"
3217
3216
3218
#: bzrlib/builtins.py:4318
3217
#: bzrlib/builtins.py:4337
3219
3218
msgid " bzr merge /tmp/merge"
3220
3219
msgstr " bzr merge /tmp/merge"
3221
3220
3222
#: bzrlib/builtins.py:4320
3221
#: bzrlib/builtins.py:4339
3223
3222
msgid ""
3224
3223
" To create a merge revision with three parents from two branches\n"
3225
3224
" feature1a and feature1b:"
3227
3226
" feature1a、feature1bの２つのブランチから、３つの親を持つマージ\n"
3228
3227
" リビジョンを作ります。::"
3229
3228
3230
#: bzrlib/builtins.py:4323
3229
#: bzrlib/builtins.py:4342
3231
3230
msgid ""
3232
3231
" bzr merge ../feature1a\n"
3233
3232
" bzr merge ../feature1b --force\n"
3237
3236
" bzr merge ../feature1b --force\n"
3238
3237
" bzr commit -m 'revision with three parents'"
3239
3238
3240
#: bzrlib/builtins.py:4335
3239
#: bzrlib/builtins.py:4354
3241
3240
msgid "Merge even if the destination tree has uncommitted changes."
3242
3241
msgstr "マージ先のツリーにコミットしていない変更があってもマージします。"
3243
3242
3244
#: bzrlib/builtins.py:4341
3243
#: bzrlib/builtins.py:4360
3245
3244
msgid ""
3246
3245
"Apply uncommitted changes from a working copy, instead of branch changes."
3247
3246
msgstr "ブランチの変更ではなく、作業コピー上のコミットしていない変更をマージします。"
3248
3247
3249
#: bzrlib/builtins.py:4343
3248
#: bzrlib/builtins.py:4362
3250
3249
msgid ""
3251
3250
"If the destination is already completely merged into the source, pull from "
3252
3251
"the source rather than merging. When this happens, you do not need to "
3255
3254
"マージ先のリビジョンがマージ元のブランチにすべて含まれている場合、マージの\n"
3256
3255
"かわりにpullを実行します。その場合は、コミットする必要はありません。"
3257
3256
3258
#: bzrlib/builtins.py:4348
3257
#: bzrlib/builtins.py:4367
3259
3258
msgid ""
3260
3259
"Branch to merge into, rather than the one containing the working directory."
3261
3260
msgstr "作業ディレクトリ以外にマージする場合の、マージ先のブランチ。"
3262
3261
3263
#: bzrlib/builtins.py:4350
3262
#: bzrlib/builtins.py:4369
3264
3263
msgid "Instead of merging, show a diff of the merge."
3265
3264
msgstr "マージを実行するかわりに、マージされる内容のdiffを表示します。"
3266
3265
3267
#: bzrlib/builtins.py:4352
3266
#: bzrlib/builtins.py:4371
3268
3267
msgid "Select changes interactively."
3269
3268
msgstr "変更をインタラクティブに選択します。"
3270
3269
3271
#: bzrlib/builtins.py:4374
3270
#: bzrlib/builtins.py:4393
3272
3271
msgid ""
3273
3272
"Merging into empty branches not currently supported, "
3274
3273
"https://bugs.launchpad.net/bzr/+bug/308562"
3275
3274
msgstr ""
3276
3275
"空ブランチへのマージは今のところサポートされていません。https://bugs.launchpad.net/bzr/+bug/308562"
3277
3276
3278
#: bzrlib/builtins.py:4401
3277
#: bzrlib/builtins.py:4420
3279
3278
msgid "Cannot use --uncommitted with bundles or merge directives."
3280
3279
msgstr "バンドル、マージディレクティブに対して--uncommittedを指定することはできません。"
3281
3280
3282
#: bzrlib/builtins.py:4412
3281
#: bzrlib/builtins.py:4431
3283
3282
msgid "Cannot use --uncommitted and --revision at the same time."
3284
3283
msgstr "--uncommittedと--revisionを同時に指定することはできません。"
3285
3284
3286
#: bzrlib/builtins.py:4432
3285
#: bzrlib/builtins.py:4451
3287
3286
msgid "merger: "
3288
3287
msgstr ""
3289
3288
3290
#: bzrlib/builtins.py:4434 bzrlib/bundle/apply_bundle.py:71
3289
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
3291
3290
msgid "Nothing to do."
3292
3291
msgstr "なにもすることがありません。"
3293
3292
3294
#: bzrlib/builtins.py:4438
3293
#: bzrlib/builtins.py:4457
3295
3294
msgid "Cannot pull individual files"
3296
3295
msgstr "ファイルを個別にpullすることはできません。"
3297
3296
3298
#: bzrlib/builtins.py:4446
3297
#: bzrlib/builtins.py:4465
3299
3298
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3300
3299
msgstr "ブランチにコミットがありません。('bzr pull'を使うべきかもしれません)"
3301
3300
3302
#: bzrlib/builtins.py:4504
3301
#: bzrlib/builtins.py:4523
3303
3302
#, python-format
3304
3303
msgid "Show-base is not supported for this merge type. %s"
3305
3304
msgstr "Show-baseはこのマージタイプではサポートされません。 %s"
3306
3305
3307
#: bzrlib/builtins.py:4513
3306
#: bzrlib/builtins.py:4532
3308
3307
#, python-format
3309
3308
msgid "Conflict reduction is not supported for merge type %s."
3310
3309
msgstr "衝突の縮小化は、このマージタイプではサポートされません。 %s"
3311
3310
3312
#: bzrlib/builtins.py:4517
3311
#: bzrlib/builtins.py:4536
3313
3312
msgid "Cannot do conflict reduction and show base."
3314
3313
msgstr "衝突の縮小化、ベースの表示ができませんでした。"
3315
3314
3316
#: bzrlib/builtins.py:4628
3315
#: bzrlib/builtins.py:4647
3317
3316
msgid "No location specified or remembered"
3318
3317
msgstr "対象の場所が設定も指定もされていません。"
3319
3318
3320
#: bzrlib/builtins.py:4630
3319
#: bzrlib/builtins.py:4649
3321
3320
msgid "{0} remembered {1} location {2}"
3322
3321
msgstr "{0} 設定された {1} の場所 {2}"
3323
3322
3324
#: bzrlib/builtins.py:4636
3323
#: bzrlib/builtins.py:4655
3325
3324
msgid "Redo a merge."
3326
3325
msgstr "マージをやりなおします。"
3327
3326
3328
#: bzrlib/builtins.py:4638
3327
#: bzrlib/builtins.py:4657
3329
3328
msgid ""
3330
3329
"Use this if you want to try a different merge technique while resolving\n"
3331
3330
"conflicts. Some merge techniques are better than others, and remerge\n"
3335
3334
"使用します。他のものより優れたマージ方法があり、remergeを使って個々の\n"
3336
3335
"ファイルに別のマージ方法を試すことができます。"
3337
3336
3338
#: bzrlib/builtins.py:4642
3337
#: bzrlib/builtins.py:4661
3339
3338
msgid ""
3340
3339
"The options for remerge have the same meaning and defaults as the ones for\n"
3341
3340
"merge. The difference is that remerge can (only) be run when there is a\n"
3345
3344
"remergeはマージ中状態のときだけ実行でき、特定のファイルを指定できる\n"
3346
3345
"ということです。"
3347
3346
3348
#: bzrlib/builtins.py:4646
3347
#: bzrlib/builtins.py:4665
3349
3348
msgid ""
3350
3349
":Examples:\n"
3351
3350
" Re-do the merge of all conflicted files, and show the base text in\n"
3355
3354
" すべての衝突したファイルのマージをやり直し、通常のTHIS、OTHERの\n"
3356
3355
" テキストにくわえて衝突した領域のベーステキストを表示します。::"
3357
3356
3358
#: bzrlib/builtins.py:4650
3357
#: bzrlib/builtins.py:4669
3359
3358
msgid " bzr remerge --show-base"
3360
3359
msgstr " bzr remerge --show-base"
3361
3360
3362
#: bzrlib/builtins.py:4652
3361
#: bzrlib/builtins.py:4671
3363
3362
msgid ""
3364
3363
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3365
3364
" additional processing to reduce the size of conflict regions::"
3367
3366
" \"foobar\"のマージを、weaveマージアルゴリズムでやりなおし、衝突領域の\n"
3368
3367
" 縮小化処理も行います。::"
3369
3368
3370
#: bzrlib/builtins.py:4655
3369
#: bzrlib/builtins.py:4674
3371
3370
msgid " bzr remerge --merge-type weave --reprocess foobar"
3372
3371
msgstr " bzr remerge --merge-type weave --reprocess foobar"
3373
3372
3374
#: bzrlib/builtins.py:4662
3373
#: bzrlib/builtins.py:4681
3375
3374
msgid "Show base revision text in conflicts."
3376
3375
msgstr "衝突したベースリビジョンのテキストを表示します。"
3377
3376
3378
#: bzrlib/builtins.py:4674
3377
#: bzrlib/builtins.py:4693
3379
3378
msgid ""
3380
3379
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3381
3380
"merges."
3383
3382
"remergeは通常のマージ後にだけ実行できます。チェリーピックや複数マージでは\r\n"
3384
3383
"利用できません。"
3385
3384
3386
#: bzrlib/builtins.py:4731
3387
msgid "Revert files to a previous revision."
3388
msgstr "ファイルを過去のリビジョンに戻します。"
3385
#: bzrlib/builtins.py:4751
3386
msgid ""
3387
"Set files in the working tree back to the contents of a previous revision."
3388
msgstr ""
3389
3389
3390
#: bzrlib/builtins.py:4733
3390
#: bzrlib/builtins.py:4753
3391
3391
msgid ""
3392
3392
"Giving a list of files will revert only those files. Otherwise, all files\n"
3393
3393
"will be reverted. If the revision is not specified with '--revision', the\n"
3394
"last committed revision is used."
3394
"working tree basis revision is used. A revert operation affects only the\n"
3395
"working tree, not any revision history like the branch and repository or\n"
3396
"the working tree basis revision."
3395
3397
msgstr ""
3396
"ファイルのリストを指定すると、そのファイルだけが元に戻されます。\n"
3397
"そうでない場合は、全てのファイルが対象になります。--revisionで\n"
3398
"リビジョンを指定しない場合は、最後にコミットされたリビジョンが使用\n"
3399
"されます。"
3400
3398
3401
#: bzrlib/builtins.py:4737
3399
#: bzrlib/builtins.py:4759
3402
3400
msgid ""
3403
3401
"To remove only some changes, without reverting to a prior version, use\n"
3404
3402
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3405
3403
"will remove the changes introduced by the second last commit (-2), without\n"
3406
3404
"affecting the changes introduced by the last commit (-1). To remove\n"
3407
"certain changes on a hunk-by-hunk basis, see the shelve command."
3405
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3406
"To update the branch to a specific revision or the latest revision and\n"
3407
"update the working tree accordingly while preserving local changes, see the\n"
3408
"update command."
3408
3409
msgstr ""
3409
"以前のリビジョンに戻さずにいくつかの変更を取り除くには、mergeをかわりに\n"
3410
"使用します。例えば、\"merge . -r -2..-3\" (.を忘れないように)で、最終リビジョン\n"
3411
"(-1)での変更はそのままで、その一つ前のリビジョン(-2)での変更だけを取り\n"
3412
"除くことができます。特定の変更をハンクごと取り除く方法は、shelveをご覧\n"
3413
"ください。"
3414
3410
3415
#: bzrlib/builtins.py:4743
3411
#: bzrlib/builtins.py:4768
3416
3412
msgid ""
3417
"By default, any files that have been manually changed will be backed up\n"
3418
"first. (Files changed only by merge are not backed up.) Backup files have\n"
3419
"'.~#~' appended to their name, where # is a number."
3413
"Uncommitted changes to files that are reverted will be discarded.\n"
3414
"Howver, by default, any files that have been manually changed will be\n"
3415
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3416
"files have '.~#~' appended to their name, where # is a number."
3420
3417
msgstr ""
3421
"デフォルトでは、手で変更されたファイルは最初にバックアップされます。(merge\n"
3422
"コマンドで変更されただけのファイルはバックアップされません)バックアップ\n"
3423
"ファイル名は、元の名前に「.~#~」(#は数字)を付け足したものになります。"
3424
3418
3425
#: bzrlib/builtins.py:4747
3419
#: bzrlib/builtins.py:4773
3426
3420
msgid ""
3427
3421
"When you provide files, you can use their current pathname or the pathname\n"
3428
3422
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3434
3428
"revertを使うことができます。ディレクトリを指定した場合は、その配下のすべての\n"
3435
3429
"変更が取り消されます。"
3436
3430
3437
#: bzrlib/builtins.py:4752
3431
#: bzrlib/builtins.py:4778
3438
3432
msgid ""
3439
3433
"If you have newly added files since the target revision, they will be\n"
3440
3434
"removed. If the files to be removed have been changed, backups will be\n"
3446
3440
"バックアップされます。バージョン管理外のファイルを含むディレクトリは削除され\n"
3447
3441
"ません。"
3448
3442
3449
#: bzrlib/builtins.py:4757
3443
#: bzrlib/builtins.py:4783
3450
3444
msgid ""
3451
3445
"The working tree contains a list of revisions that have been merged but\n"
3452
3446
"not yet committed. These revisions will be included as additional parents\n"
3458
3452
"reverting any files."
3459
3453
msgstr ""
3460
3454
3461
#: bzrlib/builtins.py:4766
3455
#: bzrlib/builtins.py:4792
3462
3456
msgid ""
3463
3457
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3464
3458
"changes from a branch in a single revision. To do this, perform the merge\n"
3472
3466
"target branches."
3473
3467
msgstr ""
3474
3468
3475
#: bzrlib/builtins.py:4780
3469
#: bzrlib/builtins.py:4806
3476
3470
msgid "Do not save backups of reverted files."
3477
3471
msgstr ""
3478
3472
3479
#: bzrlib/builtins.py:4782
3473
#: bzrlib/builtins.py:4808
3480
3474
msgid "Remove pending merge marker, without changing any files."
3481
3475
msgstr ""
3482
3476
3483
#: bzrlib/builtins.py:4813
3477
#: bzrlib/builtins.py:4839
3484
3478
msgid ""
3485
3479
"Show help on a command or other topic.\n"
3486
3480
" "
3488
3482
"コマンドもしくは他のトピックのヘルプを表示する。\n"
3489
3483
" "
3490
3484
3491
#: bzrlib/builtins.py:4818
3485
#: bzrlib/builtins.py:4844
3492
3486
msgid "Show help on all commands."
3493
3487
msgstr "全てのコマンドのヘルプを表示する。"
3494
3488
3495
#: bzrlib/builtins.py:4847
3489
#: bzrlib/builtins.py:4873
3496
3490
msgid "Show unmerged/unpulled revisions between two branches."
3497
3491
msgstr "2つのブランチの間のmergeされていない/pullされていない リビジョンを表示する。"
3498
3492
3499
#: bzrlib/builtins.py:4849
3493
#: bzrlib/builtins.py:4875
3500
3494
msgid "OTHER_BRANCH may be local or remote."
3501
3495
msgstr "OTHER_BRANCHはlocalもしくはremoteになります。"
3502
3496
3503
#: bzrlib/builtins.py:4851
3497
#: bzrlib/builtins.py:4877
3504
3498
msgid ""
3505
3499
"To filter on a range of revisions, you can use the command -r begin..end\n"
3506
3500
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3511
3505
" 0 - no missing revisions"
3512
3506
msgstr ""
3513
3507
3514
#: bzrlib/builtins.py:4861
3508
#: bzrlib/builtins.py:4887
3515
3509
msgid ""
3516
3510
" Determine the missing revisions between this and the branch at the\n"
3517
3511
" remembered pull location::"
3518
3512
msgstr ""
3519
3513
3520
#: bzrlib/builtins.py:4864
3514
#: bzrlib/builtins.py:4890
3521
3515
msgid " bzr missing"
3522
3516
msgstr " bzr missing"
3523
3517
3524
#: bzrlib/builtins.py:4866
3518
#: bzrlib/builtins.py:4892
3525
3519
msgid " Determine the missing revisions between this and another branch::"
3526
3520
msgstr ""
3527
3521
3528
#: bzrlib/builtins.py:4868
3522
#: bzrlib/builtins.py:4894
3529
3523
msgid " bzr missing http://server/branch"
3530
3524
msgstr " bzr missing http://server/branch"
3531
3525
3532
#: bzrlib/builtins.py:4870
3526
#: bzrlib/builtins.py:4896
3533
3527
msgid ""
3534
3528
" Determine the missing revisions up to a specific revision on the other\n"
3535
3529
" branch::"
3536
3530
msgstr ""
3537
3531
3538
#: bzrlib/builtins.py:4873
3532
#: bzrlib/builtins.py:4899
3539
3533
msgid " bzr missing -r ..-10"
3540
3534
msgstr " bzr missing -r ..-10"
3541
3535
3542
#: bzrlib/builtins.py:4875
3536
#: bzrlib/builtins.py:4901
3543
3537
msgid ""
3544
3538
" Determine the missing revisions up to a specific revision on this\n"
3545
3539
" branch::"
3546
3540
msgstr ""
3547
3541
3548
#: bzrlib/builtins.py:4878
3542
#: bzrlib/builtins.py:4904
3549
3543
msgid " bzr missing --my-revision ..-10"
3550
3544
msgstr " bzr missing --my-revision ..-10"
3551
3545
3552
#: bzrlib/builtins.py:4885
3546
#: bzrlib/builtins.py:4911
3553
3547
msgid "Reverse the order of revisions."
3554
3548
msgstr "リビジョンの表示順を逆転する。"
3555
3549
3556
#: bzrlib/builtins.py:4887
3550
#: bzrlib/builtins.py:4913
3557
3551
msgid "Display changes in the local branch only."
3558
3552
msgstr "ローカルブランチの変更のみを表示する。"
3559
3553
3560
#: bzrlib/builtins.py:4888
3554
#: bzrlib/builtins.py:4914
3561
3555
msgid "Same as --mine-only."
3562
3556
msgstr "--mine-onlyと同じ。"
3563
3557
3564
#: bzrlib/builtins.py:4890
3558
#: bzrlib/builtins.py:4916
3565
3559
msgid "Display changes in the remote branch only."
3566
3560
msgstr "リモートブランチの変更のみを表示する。"
3567
3561
3568
#: bzrlib/builtins.py:4891
3562
#: bzrlib/builtins.py:4917
3569
3563
msgid "Same as --theirs-only."
3570
3564
msgstr "--theirs-onlyと同じ。"
3571
3565
3572
#: bzrlib/builtins.py:4896
3566
#: bzrlib/builtins.py:4922
3573
3567
msgid ""
3574
3568
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3575
3569
"details."
3576
3570
msgstr ""
3577
3571
3578
#: bzrlib/builtins.py:4900
3572
#: bzrlib/builtins.py:4926
3579
3573
msgid ""
3580
3574
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3581
3575
"details."
3582
3576
msgstr ""
3583
3577
3584
#: bzrlib/builtins.py:4903
3578
#: bzrlib/builtins.py:4929
3585
3579
msgid "Show all revisions in addition to the mainline ones."
3586
3580
msgstr ""
3587
3581
3588
#: bzrlib/builtins.py:4957
3582
#: bzrlib/builtins.py:4983
3589
3583
msgid "No peer location known or specified."
3590
3584
msgstr ""
3591
3585
3592
#: bzrlib/builtins.py:4961
3586
#: bzrlib/builtins.py:4987
3593
3587
msgid "Using saved parent location: {0}\n"
3594
3588
msgstr ""
3595
3589
3596
#: bzrlib/builtins.py:4994
3590
#: bzrlib/builtins.py:5020
3597
3591
#, python-format
3598
3592
msgid "You have %d extra revision:\n"
3599
3593
msgid_plural "You have %d extra revisions:\n"
3600
3594
msgstr[0] ""
3601
3595
msgstr[1] ""
3602
3596
3603
#: bzrlib/builtins.py:5010
3597
#: bzrlib/builtins.py:5040
3604
3598
#, python-format
3605
3599
msgid "You are missing %d revision:\n"
3606
3600
msgid_plural "You are missing %d revisions:\n"
3607
3601
msgstr[0] ""
3608
3602
msgstr[1] ""
3609
3603
3610
#: bzrlib/builtins.py:5022
3604
#: bzrlib/builtins.py:5055
3611
3605
msgid "This branch has no new revisions.\n"
3612
3606
msgstr ""
3613
3607
3614
#: bzrlib/builtins.py:5025
3608
#: bzrlib/builtins.py:5058
3615
3609
msgid "Other branch has no new revisions.\n"
3616
3610
msgstr ""
3617
3611
3618
#: bzrlib/builtins.py:5030
3612
#: bzrlib/builtins.py:5063
3619
3613
msgid "Branches are up to date.\n"
3620
3614
msgstr ""
3621
3615
3622
#: bzrlib/builtins.py:5041
3616
#: bzrlib/builtins.py:5074
3623
3617
msgid "Compress the data within a repository."
3624
3618
msgstr "リポジトリ内のデータを圧縮する。"
3625
3619
3626
#: bzrlib/builtins.py:5043
3620
#: bzrlib/builtins.py:5076
3627
3621
msgid ""
3628
3622
"This operation compresses the data within a bazaar repository. As\n"
3629
3623
"bazaar supports automatic packing of repository, this operation is\n"
3630
3624
"normally not required to be done manually."
3631
3625
msgstr ""
3632
3626
3633
#: bzrlib/builtins.py:5047
3627
#: bzrlib/builtins.py:5080
3634
3628
msgid ""
3635
3629
"During the pack operation, bazaar takes a backup of existing repository\n"
3636
3630
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3639
3633
"used."
3640
3634
msgstr ""
3641
3635
3642
#: bzrlib/builtins.py:5053
3636
#: bzrlib/builtins.py:5086
3643
3637
msgid ""
3644
3638
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3645
3639
"during or immediately after repacking, you may be left with a state\n"
3647
3641
"been. In this case the repository may be unusable."
3648
3642
msgstr ""
3649
3643
3650
#: bzrlib/builtins.py:5062
3644
#: bzrlib/builtins.py:5095
3651
3645
msgid "Delete obsolete packs to save disk space."
3652
3646
msgstr ""
3653
3647
3654
#: bzrlib/builtins.py:5076
3648
#: bzrlib/builtins.py:5109
3655
3649
msgid "List the installed plugins."
3656
3650
msgstr "インストールされたプラグインの一覧を表示する。"
3657
3651
3658
#: bzrlib/builtins.py:5078
3652
#: bzrlib/builtins.py:5111
3659
3653
msgid ""
3660
3654
"This command displays the list of installed plugins including\n"
3661
3655
"version of plugin and a short description of each."
3663
3657
"このコマンドは インストールされたプラグインの一覧を簡単な説明や\n"
3664
3658
"バージョン情報とともに表示します。"
3665
3659
3666
#: bzrlib/builtins.py:5081
3660
#: bzrlib/builtins.py:5114
3667
3661
msgid "--verbose shows the path where each plugin is located."
3668
3662
msgstr "--verboseを指定すると各プラグインのインストール先のパスが表示されます。"
3669
3663
3670
#: bzrlib/builtins.py:5083
3664
#: bzrlib/builtins.py:5116
3671
3665
msgid ""
3672
3666
"A plugin is an external component for Bazaar that extends the\n"
3673
3667
"revision control system, by adding or replacing code in Bazaar.\n"
3676
3670
"customizing log output."
3677
3671
msgstr ""
3678
3672
3679
#: bzrlib/builtins.py:5089
3673
#: bzrlib/builtins.py:5122
3680
3674
msgid ""
3681
3675
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3682
3676
"for further information on plugins including where to find them and how to\n"
3684
3678
"plugins using the Python programming language."
3685
3679
msgstr ""
3686
3680
3687
#: bzrlib/builtins.py:5105
3681
#: bzrlib/builtins.py:5138
3688
3682
msgid "Show testament (signing-form) of a revision."
3689
3683
msgstr ""
3690
3684
3691
#: bzrlib/builtins.py:5108
3685
#: bzrlib/builtins.py:5141
3692
3686
msgid "Produce long-format testament."
3693
3687
msgstr ""
3694
3688
3695
#: bzrlib/builtins.py:5110
3689
#: bzrlib/builtins.py:5143
3696
3690
msgid "Produce a strict-format testament."
3697
3691
msgstr ""
3698
3692
3699
#: bzrlib/builtins.py:5136
3693
#: bzrlib/builtins.py:5169
3700
3694
msgid "Show the origin of each line in a file."
3701
3695
msgstr ""
3702
3696
3703
#: bzrlib/builtins.py:5138
3697
#: bzrlib/builtins.py:5171
3704
3698
msgid ""
3705
3699
"This prints out the given file with an annotation on the left side\n"
3706
3700
"indicating which revision, author and date introduced the change."
3707
3701
msgstr ""
3708
3702
3709
#: bzrlib/builtins.py:5141
3703
#: bzrlib/builtins.py:5174
3710
3704
msgid ""
3711
3705
"If the origin is the same for a run of consecutive lines, it is\n"
3712
3706
"shown only at the top, unless the --all option is given."
3713
3707
msgstr ""
3714
3708
3715
#: bzrlib/builtins.py:5149
3709
#: bzrlib/builtins.py:5182
3716
3710
msgid "Show annotations on all lines."
3717
3711
msgstr ""
3718
3712
3719
#: bzrlib/builtins.py:5150
3713
#: bzrlib/builtins.py:5183
3720
3714
msgid "Show commit date in annotations."
3721
3715
msgstr ""
3722
3716
3723
#: bzrlib/builtins.py:5237
3717
#: bzrlib/builtins.py:5270
3724
3718
msgid "Cannot sign a range of non-revision-history revisions"
3725
3719
msgstr ""
3726
3720
3727
#: bzrlib/builtins.py:5249
3721
#: bzrlib/builtins.py:5282
3728
3722
msgid "Please supply either one revision, or a range."
3729
3723
msgstr ""
3730
3724
3731
#: bzrlib/builtins.py:5253
3725
#: bzrlib/builtins.py:5286
3732
3726
msgid ""
3733
3727
"Convert the current branch into a checkout of the supplied branch.\n"
3734
3728
"If no branch is supplied, rebind to the last bound location."
3735
3729
msgstr ""
3736
3730
3737
#: bzrlib/builtins.py:5256
3731
#: bzrlib/builtins.py:5289
3738
3732
msgid ""
3739
3733
"Once converted into a checkout, commits must succeed on the master branch\n"
3740
3734
"before they will be applied to the local branch."
3741
3735
msgstr ""
3742
3736
3743
#: bzrlib/builtins.py:5259
3737
#: bzrlib/builtins.py:5292
3744
3738
msgid ""
3745
3739
"Bound branches use the nickname of its master branch unless it is set\n"
3746
3740
"locally, in which case binding will update the local nickname to be\n"
3747
3741
"that of the master."
3748
3742
msgstr ""
3749
3743
3750
#: bzrlib/builtins.py:5274
3744
#: bzrlib/builtins.py:5307
3751
3745
msgid "No location supplied. This format does not remember old locations."
3752
3746
msgstr ""
3753
3747
3754
#: bzrlib/builtins.py:5280
3748
#: bzrlib/builtins.py:5313
3755
3749
msgid "Branch is already bound"
3756
3750
msgstr ""
3757
3751
3758
#: bzrlib/builtins.py:5283
3752
#: bzrlib/builtins.py:5316
3759
3753
msgid "No location supplied and no previous location known"
3760
3754
msgstr ""
3761
3755
3762
#: bzrlib/builtins.py:5289
3756
#: bzrlib/builtins.py:5322
3763
3757
msgid "These branches have diverged. Try merging, and then bind again."
3764
3758
msgstr ""
3765
3759
3766
#: bzrlib/builtins.py:5296
3760
#: bzrlib/builtins.py:5329
3767
3761
msgid "Convert the current checkout into a regular branch."
3768
3762
msgstr ""
3769
3763
3770
#: bzrlib/builtins.py:5298
3764
#: bzrlib/builtins.py:5331
3771
3765
msgid ""
3772
3766
"After unbinding, the local branch is considered independent and subsequent\n"
3773
3767
"commits will be local only."
3774
3768
msgstr ""
3775
3769
3776
#: bzrlib/builtins.py:5309
3770
#: bzrlib/builtins.py:5342
3777
3771
msgid "Local branch is not bound"
3778
3772
msgstr ""
3779
3773
3780
#: bzrlib/builtins.py:5313
3774
#: bzrlib/builtins.py:5346
3781
3775
msgid "Remove the last committed revision."
3782
3776
msgstr ""
3783
3777
3784
#: bzrlib/builtins.py:5315
3778
#: bzrlib/builtins.py:5348
3785
3779
msgid ""
3786
3780
"--verbose will print out what is being removed.\n"
3787
3781
"--dry-run will go through all the motions, but not actually\n"
3788
3782
"remove anything."
3789
3783
msgstr ""
3790
3784
3791
#: bzrlib/builtins.py:5319
3785
#: bzrlib/builtins.py:5352
3792
3786
msgid ""
3793
3787
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3794
3788
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3795
3789
"branch at revision 15."
3796
3790
msgstr ""
3797
3791
3798
#: bzrlib/builtins.py:5323
3792
#: bzrlib/builtins.py:5356
3799
3793
msgid ""
3800
3794
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3801
3795
"it may make is to restore any pending merges that were present before\n"
3802
3796
"the commit."
3803
3797
msgstr ""
3804
3798
3805
#: bzrlib/builtins.py:5334
3799
#: bzrlib/builtins.py:5367
3806
3800
msgid "Don't actually make changes."
3807
3801
msgstr ""
3808
3802
3809
#: bzrlib/builtins.py:5335
3803
#: bzrlib/builtins.py:5368
3810
3804
msgid "Say yes to all questions."
3811
3805
msgstr ""
3812
3806
3813
#: bzrlib/builtins.py:5337
3807
#: bzrlib/builtins.py:5370
3814
3808
msgid "Keep tags that point to removed revisions."
3815
3809
msgstr ""
3816
3810
3817
#: bzrlib/builtins.py:5339
3811
#: bzrlib/builtins.py:5372
3818
3812
msgid "Only remove the commits from the local branch when in a checkout."
3819
3813
msgstr ""
3820
3814
3821
#: bzrlib/builtins.py:5388
3815
#: bzrlib/builtins.py:5421
3822
3816
msgid "No revisions to uncommit.\n"
3823
3817
msgstr ""
3824
3818
3825
#: bzrlib/builtins.py:5403
3819
#: bzrlib/builtins.py:5436
3826
3820
msgid "Dry-run, pretending to remove the above revisions.\n"
3827
3821
msgstr ""
3828
3822
3829
#: bzrlib/builtins.py:5406
3823
#: bzrlib/builtins.py:5439
3830
3824
msgid "The above revision(s) will be removed.\n"
3831
3825
msgstr ""
3832
3826
3833
#: bzrlib/builtins.py:5410
3827
#: bzrlib/builtins.py:5443
3834
3828
msgid "Uncommit these revisions"
3835
3829
msgstr ""
3836
3830
3837
#: bzrlib/builtins.py:5413
3831
#: bzrlib/builtins.py:5446
3838
3832
msgid "Canceled\n"
3839
3833
msgstr ""
3840
3834
3841
#: bzrlib/builtins.py:5420
3835
#: bzrlib/builtins.py:5453
3842
3836
#, python-format
3843
3837
msgid ""
3844
3838
"You can restore the old tip by running:\n"
3845
3839
" bzr pull . -r revid:%s\n"
3846
3840
msgstr ""
3847
3841
3848
#: bzrlib/builtins.py:5425
3842
#: bzrlib/builtins.py:5458
3849
3843
msgid "Break a dead lock."
3850
3844
msgstr ""
3851
3845
3852
#: bzrlib/builtins.py:5427
3846
#: bzrlib/builtins.py:5460
3853
3847
msgid ""
3854
3848
"This command breaks a lock on a repository, branch, working directory or\n"
3855
3849
"config file."
3856
3850
msgstr ""
3857
3851
3858
#: bzrlib/builtins.py:5430
3852
#: bzrlib/builtins.py:5463
3859
3853
msgid ""
3860
3854
"CAUTION: Locks should only be broken when you are sure that the process\n"
3861
3855
"holding the lock has been stopped."
3862
3856
msgstr ""
3863
3857
3864
#: bzrlib/builtins.py:5433
3858
#: bzrlib/builtins.py:5466
3865
3859
msgid ""
3866
3860
"You can get information on what locks are open via the 'bzr info\n"
3867
3861
"[location]' command."
3868
3862
msgstr ""
3869
3863
3870
#: bzrlib/builtins.py:5436
3864
#: bzrlib/builtins.py:5469
3871
3865
msgid ""
3872
3866
":Examples:\n"
3873
3867
" bzr break-lock\n"
3875
3869
" bzr break-lock --conf ~/.bazaar"
3876
3870
msgstr ""
3877
3871
3878
#: bzrlib/builtins.py:5445
3872
#: bzrlib/builtins.py:5478
3879
3873
msgid "LOCATION is the directory where the config lock is."
3880
3874
msgstr ""
3881
3875
3882
#: bzrlib/builtins.py:5447
3876
#: bzrlib/builtins.py:5480
3883
3877
msgid "Do not ask for confirmation before breaking the lock."
3884
3878
msgstr ""
3885
3879
3886
#: bzrlib/builtins.py:5482
3880
#: bzrlib/builtins.py:5515
3887
3881
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3888
3882
msgstr ""
3889
3883
3890
#: bzrlib/builtins.py:5483
3884
#: bzrlib/builtins.py:5516
3891
3885
msgid "Run the bzr server."
3892
3886
msgstr ""
3893
3887
3894
#: bzrlib/builtins.py:5489
3888
#: bzrlib/builtins.py:5522
3895
3889
msgid "Serve on stdin/out for use from inetd or sshd."
3896
3890
msgstr ""
3897
3891
3898
#: bzrlib/builtins.py:5490
3892
#: bzrlib/builtins.py:5523
3899
3893
msgid "protocol"
3900
3894
msgstr ""
3901
3895
3902
#: bzrlib/builtins.py:5491
3896
#: bzrlib/builtins.py:5524
3903
3897
msgid "Protocol to serve."
3904
3898
msgstr ""
3905
3899
3906
#: bzrlib/builtins.py:5495
3900
#: bzrlib/builtins.py:5528
3907
3901
msgid "Listen for connections on nominated address."
3908
3902
msgstr ""
3909
3903
3910
#: bzrlib/builtins.py:5497
3904
#: bzrlib/builtins.py:5530
3911
3905
msgid ""
3912
3906
"Listen for connections on nominated port. Passing 0 as the port number will "
3913
3907
"result in a dynamically allocated port. The default port depends on the "
3914
3908
"protocol."
3915
3909
msgstr ""
3916
3910
3917
#: bzrlib/builtins.py:5502
3911
#: bzrlib/builtins.py:5535
3918
3912
msgid "Serve contents of this directory."
3919
3913
msgstr ""
3920
3914
3921
#: bzrlib/builtins.py:5504
3915
#: bzrlib/builtins.py:5537
3922
3916
msgid ""
3923
3917
"By default the server is a readonly server. Supplying --allow-writes "
3924
3918
"enables write access to the contents of the served directory and below. "
3927
3921
"uncontrolled write access to your file system."
3928
3922
msgstr ""
3929
3923
3930
#: bzrlib/builtins.py:5513
3924
#: bzrlib/builtins.py:5546
3931
3925
msgid "Override the default idle client timeout (5min)."
3932
3926
msgstr ""
3933
3927
3934
#: bzrlib/builtins.py:5531
3928
#: bzrlib/builtins.py:5564
3935
3929
msgid "Combine a tree into its containing tree."
3936
3930
msgstr ""
3937
3931
3938
#: bzrlib/builtins.py:5533
3932
#: bzrlib/builtins.py:5566
3939
3933
msgid "This command requires the target tree to be in a rich-root format."
3940
3934
msgstr ""
3941
3935
3942
#: bzrlib/builtins.py:5535
3936
#: bzrlib/builtins.py:5568
3943
3937
msgid ""
3944
3938
"The TREE argument should be an independent tree, inside another tree, but\n"
3945
3939
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3946
3940
"running \"bzr branch\" with the target inside a tree.)"
3947
3941
msgstr ""
3948
3942
3949
#: bzrlib/builtins.py:5539
3943
#: bzrlib/builtins.py:5572
3950
3944
msgid ""
3951
3945
"The result is a combined tree, with the subtree no longer an independent\n"
3952
3946
"part. This is marked as a merge of the subtree into the containing tree,\n"
3953
3947
"and all history is preserved."
3954
3948
msgstr ""
3955
3949
3956
#: bzrlib/builtins.py:5557
3950
#: bzrlib/builtins.py:5590
3957
3951
#, python-format
3958
3952
msgid ""
3959
3953
"Can't join trees because %s doesn't support rich root data.\n"
3960
3954
"You can use bzr upgrade on the repository."
3961
3955
msgstr ""
3962
3956
3963
#: bzrlib/builtins.py:5567 bzrlib/builtins.py:5573
3957
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3964
3958
msgid "Cannot join {0}. {1}"
3965
3959
msgstr ""
3966
3960
3967
#: bzrlib/builtins.py:5577
3961
#: bzrlib/builtins.py:5610
3968
3962
msgid "Split a subdirectory of a tree into a separate tree."
3969
3963
msgstr ""
3970
3964
3971
#: bzrlib/builtins.py:5579
3965
#: bzrlib/builtins.py:5612
3972
3966
msgid ""
3973
3967
"This command will produce a target tree in a format that supports\n"
3974
3968
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3975
3969
"converted into earlier formats like 'dirstate-tags'."
3976
3970
msgstr ""
3977
3971
3978
#: bzrlib/builtins.py:5583
3972
#: bzrlib/builtins.py:5616
3979
3973
msgid ""
3980
3974
"The TREE argument should be a subdirectory of a working tree. That\n"
3981
3975
"subdirectory will be converted into an independent tree, with its own\n"
3982
3976
"branch. Commits in the top-level tree will not apply to the new subtree."
3983
3977
msgstr ""
3984
3978
3985
#: bzrlib/builtins.py:5663
3979
#: bzrlib/builtins.py:5696
3986
3980
msgid "No submit branch specified or known"
3987
3981
msgstr ""
3988
3982
3989
#: bzrlib/builtins.py:5672 bzrlib/send.py:109
3983
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3990
3984
msgid "No public branch specified or known"
3991
3985
msgstr ""
3992
3986
3993
#: bzrlib/builtins.py:5677
3987
#: bzrlib/builtins.py:5710
3994
3988
msgid "bzr merge-directive takes at most two one revision identifiers"
3995
3989
msgstr ""
3996
3990
3997
#: bzrlib/builtins.py:5686
3991
#: bzrlib/builtins.py:5719
3998
3992
msgid "No revisions to bundle."
3999
3993
msgstr ""
4000
3994
4001
#: bzrlib/builtins.py:5705
3995
#: bzrlib/builtins.py:5738
4002
3996
msgid "Mail or create a merge-directive for submitting changes."
4003
3997
msgstr ""
4004
3998
4005
#: bzrlib/builtins.py:5707
3999
#: bzrlib/builtins.py:5740
4006
4000
msgid "A merge directive provides many things needed for requesting merges:"
4007
4001
msgstr ""
4008
4002
4009
#: bzrlib/builtins.py:5709
4003
#: bzrlib/builtins.py:5742
4010
4004
msgid "* A machine-readable description of the merge to perform"
4011
4005
msgstr ""
4012
4006
4013
#: bzrlib/builtins.py:5711
4007
#: bzrlib/builtins.py:5744
4014
4008
msgid "* An optional patch that is a preview of the changes requested"
4015
4009
msgstr ""
4016
4010
4017
#: bzrlib/builtins.py:5713
4011
#: bzrlib/builtins.py:5746
4018
4012
msgid ""
4019
4013
"* An optional bundle of revision data, so that the changes can be applied\n"
4020
4014
" directly from the merge directive, without retrieving data from a\n"
4021
4015
" branch."
4022
4016
msgstr ""
4023
4017
4024
#: bzrlib/builtins.py:5717
4018
#: bzrlib/builtins.py:5750
4025
4019
msgid ""
4026
4020
"`bzr send` creates a compact data set that, when applied using bzr\n"
4027
4021
"merge, has the same effect as merging from the source branch. "
4028
4022
msgstr ""
4029
4023
4030
#: bzrlib/builtins.py:5720
4024
#: bzrlib/builtins.py:5753
4031
4025
msgid ""
4032
4026
"By default the merge directive is self-contained and can be applied to any\n"
4033
4027
"branch containing submit_branch in its ancestory without needing access to\n"
4034
4028
"the source branch."
4035
4029
msgstr ""
4036
4030
4037
#: bzrlib/builtins.py:5724
4031
#: bzrlib/builtins.py:5757
4038
4032
msgid ""
4039
4033
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4040
4034
"revisions, but only a structured request to merge from the\n"
4043
4037
"included if known, so that people can check it later."
4044
4038
msgstr ""
4045
4039
4046
#: bzrlib/builtins.py:5730
4040
#: bzrlib/builtins.py:5763
4047
4041
msgid ""
4048
4042
"The submit branch defaults to the parent of the source branch, but can be\n"
4049
4043
"overridden. Both submit branch and public branch will be remembered in\n"
4052
4046
"be changed using --from."
4053
4047
msgstr ""
4054
4048
4055
#: bzrlib/builtins.py:5736
4049
#: bzrlib/builtins.py:5769
4056
4050
msgid ""
4057
4051
"Both the submit branch and the public branch follow the usual behavior with\n"
4058
4052
"respect to --remember: If there is no default location set, the first send\n"
4061
4055
"--remember. The value will only be saved if the location can be accessed."
4062
4056
msgstr ""
4063
4057
4064
#: bzrlib/builtins.py:5742
4058
#: bzrlib/builtins.py:5775
4065
4059
msgid ""
4066
4060
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4067
4061
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4069
4063
"in the merge directive."
4070
4064
msgstr ""
4071
4065
4072
#: bzrlib/builtins.py:5747
4066
#: bzrlib/builtins.py:5780
4073
4067
msgid ""
4074
4068
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4075
4069
"given, in which case it is sent to a file."
4076
4070
msgstr ""
4077
4071
4078
#: bzrlib/builtins.py:5750
4072
#: bzrlib/builtins.py:5783
4079
4073
msgid ""
4080
4074
"Mail is sent using your preferred mail program. This should be transparent\n"
4081
4075
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4082
4076
"If the preferred client can't be found (or used), your editor will be used."
4083
4077
msgstr ""
4084
4078
4085
#: bzrlib/builtins.py:5754
4079
#: bzrlib/builtins.py:5787
4086
4080
msgid ""
4087
4081
"To use a specific mail program, set the mail_client configuration option.\n"
4088
4082
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4094
4088
"supported clients."
4095
4089
msgstr ""
4096
4090
4097
#: bzrlib/builtins.py:5761
4091
#: bzrlib/builtins.py:5794
4098
4092
msgid ""
4099
4093
"If mail is being sent, a to address is required. This can be supplied\n"
4100
4094
"either on the commandline, by setting the submit_to configuration\n"
4102
4096
"in the submit branch."
4103
4097
msgstr ""
4104
4098
4105
#: bzrlib/builtins.py:5766
4099
#: bzrlib/builtins.py:5799
4106
4100
msgid ""
4107
4101
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4108
4102
"and\n"
4112
4106
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4113
4107
msgstr ""
4114
4108
4115
#: bzrlib/builtins.py:5772
4109
#: bzrlib/builtins.py:5805
4116
4110
msgid ""
4117
4111
"The merge directives created by bzr send may be applied using bzr merge or\n"
4118
4112
"bzr pull by specifying a file containing a merge directive as the location."
4119
4113
msgstr ""
4120
4114
4121
#: bzrlib/builtins.py:5775
4115
#: bzrlib/builtins.py:5808
4122
4116
msgid ""
4123
4117
"bzr send makes extensive use of public locations to map local locations "
4124
4118
"into\n"
4126
4120
"set them, and use `bzr info` to display them."
4127
4121
msgstr ""
4128
4122
4129
#: bzrlib/builtins.py:5799
4123
#: bzrlib/builtins.py:5832
4130
4124
msgid "Write merge directive to this file or directory; use - for stdout."
4131
4125
msgstr ""
4132
4126
4133
#: bzrlib/builtins.py:5803
4127
#: bzrlib/builtins.py:5836
4134
4128
msgid ""
4135
4129
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4136
4130
"strict disables the check."
4137
4131
msgstr ""
4138
4132
4139
#: bzrlib/builtins.py:5805
4133
#: bzrlib/builtins.py:5838
4140
4134
msgid "Mail the request to this address."
4141
4135
msgstr ""
4142
4136
4143
#: bzrlib/builtins.py:5809
4137
#: bzrlib/builtins.py:5842
4144
4138
msgid "Body for the email."
4145
4139
msgstr ""
4146
4140
4147
#: bzrlib/builtins.py:5862
4141
#: bzrlib/builtins.py:5895
4148
4142
msgid "Do not include a bundle in the merge directive."
4149
4143
msgstr ""
4150
4144
4151
#: bzrlib/builtins.py:5863
4145
#: bzrlib/builtins.py:5896
4152
4146
msgid "Do not include a preview patch in the merge directive."
4153
4147
msgstr ""
4154
4148
4155
#: bzrlib/builtins.py:5866
4149
#: bzrlib/builtins.py:5899
4156
4150
msgid "Remember submit and public branch."
4157
4151
msgstr ""
4158
4152
4159
#: bzrlib/builtins.py:5868
4153
#: bzrlib/builtins.py:5901
4160
4154
msgid ""
4161
4155
"Branch to generate the submission from, rather than the one containing the "
4162
4156
"working directory."
4163
4157
msgstr ""
4164
4158
4165
#: bzrlib/builtins.py:5878 bzrlib/cmd_version_info.py:76
4159
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
4166
4160
msgid "format"
4167
4161
msgstr ""
4168
4162
4169
#: bzrlib/builtins.py:5879
4163
#: bzrlib/builtins.py:5912
4170
4164
msgid "Use the specified output format."
4171
4165
msgstr ""
4172
4166
4173
#: bzrlib/builtins.py:5901
4167
#: bzrlib/builtins.py:5934
4174
4168
msgid "Create, remove or modify a tag naming a revision."
4175
4169
msgstr ""
4176
4170
4177
#: bzrlib/builtins.py:5903
4171
#: bzrlib/builtins.py:5936
4178
4172
msgid ""
4179
4173
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4180
4174
"(--revision) option can be given -rtag:X, where X is any previously\n"
4181
4175
"created tag."
4182
4176
msgstr ""
4183
4177
4184
#: bzrlib/builtins.py:5907
4178
#: bzrlib/builtins.py:5940
4185
4179
msgid ""
4186
4180
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4187
4181
"along when you branch, push, pull or merge."
4188
4182
msgstr ""
4189
4183
4190
#: bzrlib/builtins.py:5910
4184
#: bzrlib/builtins.py:5943
4191
4185
msgid ""
4192
4186
"It is an error to give a tag name that already exists unless you pass\n"
4193
4187
"--force, in which case the tag is moved to point to the new revision."
4194
4188
msgstr ""
4195
4189
4196
#: bzrlib/builtins.py:5913
4190
#: bzrlib/builtins.py:5946
4197
4191
msgid ""
4198
4192
"To rename a tag (change the name but keep it on the same revsion), run "
4199
4193
"``bzr\n"
4200
4194
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4201
4195
msgstr ""
4202
4196
4203
#: bzrlib/builtins.py:5916
4197
#: bzrlib/builtins.py:5949
4204
4198
msgid ""
4205
4199
"If no tag name is specified it will be determined through the \n"
4206
4200
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4208
4202
"details."
4209
4203
msgstr ""
4210
4204
4211
#: bzrlib/builtins.py:5926
4205
#: bzrlib/builtins.py:5959
4212
4206
msgid "Delete this tag rather than placing it."
4213
4207
msgstr ""
4214
4208
4215
#: bzrlib/builtins.py:5929
4209
#: bzrlib/builtins.py:5962
4216
4210
msgid "Branch in which to place the tag."
4217
4211
msgstr ""
4218
4212
4219
#: bzrlib/builtins.py:5931
4213
#: bzrlib/builtins.py:5964
4220
4214
msgid "Replace existing tags."
4221
4215
msgstr ""
4222
4216
4223
#: bzrlib/builtins.py:5946
4217
#: bzrlib/builtins.py:5979
4224
4218
msgid "No tag specified to delete."
4225
4219
msgstr ""
4226
4220
4227
#: bzrlib/builtins.py:5948
4221
#: bzrlib/builtins.py:5981
4228
4222
#, python-format
4229
4223
msgid "Deleted tag %s."
4230
4224
msgstr ""
4231
4225
4232
#: bzrlib/builtins.py:5962
4226
#: bzrlib/builtins.py:5995
4233
4227
msgid "Please specify a tag name."
4234
4228
msgstr ""
4235
4229
4236
#: bzrlib/builtins.py:5970
4230
#: bzrlib/builtins.py:6003
4237
4231
#, python-format
4238
4232
msgid "Tag %s already exists for that revision."
4239
4233
msgstr ""
4240
4234
4241
#: bzrlib/builtins.py:5974
4235
#: bzrlib/builtins.py:6007
4242
4236
#, python-format
4243
4237
msgid "Created tag %s."
4244
4238
msgstr ""
4245
4239
4246
#: bzrlib/builtins.py:5976
4240
#: bzrlib/builtins.py:6009
4247
4241
#, python-format
4248
4242
msgid "Updated tag %s."
4249
4243
msgstr ""
4250
4244
4251
#: bzrlib/builtins.py:5980
4245
#: bzrlib/builtins.py:6013
4252
4246
msgid "List tags."
4253
4247
msgstr ""
4254
4248
4255
#: bzrlib/builtins.py:5982
4249
#: bzrlib/builtins.py:6015
4256
4250
msgid ""
4257
4251
"This command shows a table of tag names and the revisions they reference."
4258
4252
msgstr ""
4259
4253
4260
#: bzrlib/builtins.py:5988
4254
#: bzrlib/builtins.py:6021
4261
4255
msgid "Branch whose tags should be displayed."
4262
4256
msgstr ""
4263
4257
4264
#: bzrlib/builtins.py:5990
4258
#: bzrlib/builtins.py:6023
4265
4259
msgid "Sort tags by different criteria."
4266
4260
msgstr ""
4267
4261
4268
#: bzrlib/builtins.py:5990
4262
#: bzrlib/builtins.py:6023
4269
4263
msgid "Sorting"
4270
4264
msgstr ""
4271
4265
4272
#: bzrlib/builtins.py:6059
4266
#: bzrlib/builtins.py:6092
4273
4267
msgid "Reconfigure the type of a bzr directory."
4274
4268
msgstr ""
4275
4269
4276
#: bzrlib/builtins.py:6061
4270
#: bzrlib/builtins.py:6094
4277
4271
msgid "A target configuration must be specified."
4278
4272
msgstr ""
4279
4273
4280
#: bzrlib/builtins.py:6063
4274
#: bzrlib/builtins.py:6096
4281
4275
msgid ""
4282
4276
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4283
4277
"The order of preference is\n"
4288
4282
"If none of these is available, --bind-to must be specified."
4289
4283
msgstr ""
4290
4284
4291
#: bzrlib/builtins.py:6077
4285
#: bzrlib/builtins.py:6110
4292
4286
msgid "Tree type"
4293
4287
msgstr ""
4294
4288
4295
#: bzrlib/builtins.py:6078
4289
#: bzrlib/builtins.py:6111
4296
4290
msgid "The relation between branch and tree."
4297
4291
msgstr ""
4298
4292
4299
#: bzrlib/builtins.py:6080
4293
#: bzrlib/builtins.py:6113
4300
4294
msgid "Reconfigure to be an unbound branch with no working tree."
4301
4295
msgstr ""
4302
4296
4303
#: bzrlib/builtins.py:6081
4297
#: bzrlib/builtins.py:6114
4304
4298
msgid "Reconfigure to be an unbound branch with a working tree."
4305
4299
msgstr ""
4306
4300
4307
#: bzrlib/builtins.py:6082
4301
#: bzrlib/builtins.py:6115
4308
4302
msgid "Reconfigure to be a bound branch with a working tree."
4309
4303
msgstr ""
4310
4304
4311
#: bzrlib/builtins.py:6083
4305
#: bzrlib/builtins.py:6116
4312
4306
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4313
4307
msgstr ""
4314
4308
4315
#: bzrlib/builtins.py:6088
4309
#: bzrlib/builtins.py:6121
4316
4310
msgid "Repository type"
4317
4311
msgstr ""
4318
4312
4319
#: bzrlib/builtins.py:6089
4313
#: bzrlib/builtins.py:6122
4320
4314
msgid "Location fo the repository."
4321
4315
msgstr ""
4322
4316
4323
#: bzrlib/builtins.py:6091
4317
#: bzrlib/builtins.py:6124
4324
4318
msgid ""
4325
4319
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4326
4320
msgstr ""
4327
4321
4328
#: bzrlib/builtins.py:6093
4322
#: bzrlib/builtins.py:6126
4329
4323
msgid "Reconfigure to use a shared repository."
4330
4324
msgstr ""
4331
4325
4332
#: bzrlib/builtins.py:6097
4326
#: bzrlib/builtins.py:6130
4333
4327
msgid "Trees in Repository"
4334
4328
msgstr ""
4335
4329
4336
#: bzrlib/builtins.py:6098
4330
#: bzrlib/builtins.py:6131
4337
4331
msgid "Whether new branches in the repository have trees."
4338
4332
msgstr ""
4339
4333
4340
#: bzrlib/builtins.py:6100
4334
#: bzrlib/builtins.py:6133
4341
4335
msgid ""
4342
4336
"Reconfigure repository to create working trees on branches by default."
4343
4337
msgstr ""
4344
4338
4345
#: bzrlib/builtins.py:6102
4339
#: bzrlib/builtins.py:6135
4346
4340
msgid ""
4347
4341
"Reconfigure repository to not create working trees on branches by default."
4348
4342
msgstr ""
4349
4343
4350
#: bzrlib/builtins.py:6105
4344
#: bzrlib/builtins.py:6138
4351
4345
msgid "Branch to bind checkout to."
4352
4346
msgstr ""
4353
4347
4354
#: bzrlib/builtins.py:6107
4348
#: bzrlib/builtins.py:6140
4355
4349
msgid "Perform reconfiguration even if local changes will be lost."
4356
4350
msgstr ""
4357
4351
4358
#: bzrlib/builtins.py:6110
4352
#: bzrlib/builtins.py:6143
4359
4353
msgid "Reconfigure a branch to be stacked on another branch."
4360
4354
msgstr ""
4361
4355
4362
#: bzrlib/builtins.py:6114
4356
#: bzrlib/builtins.py:6147
4363
4357
msgid ""
4364
4358
"Reconfigure a branch to be unstacked. This may require copying substantial "
4365
4359
"data into it."
4366
4360
msgstr ""
4367
4361
4368
#: bzrlib/builtins.py:6124
4362
#: bzrlib/builtins.py:6157
4369
4363
msgid "Can't use both --stacked-on and --unstacked"
4370
4364
msgstr ""
4371
4365
4372
#: bzrlib/builtins.py:6138
4366
#: bzrlib/builtins.py:6171
4373
4367
msgid "No target configuration specified"
4374
4368
msgstr ""
4375
4369
4376
#: bzrlib/builtins.py:6173
4370
#: bzrlib/builtins.py:6206
4377
4371
msgid "Set the branch of a checkout and update."
4378
4372
msgstr ""
4379
4373
4380
#: bzrlib/builtins.py:6175
4374
#: bzrlib/builtins.py:6208
4381
4375
msgid ""
4382
4376
"For lightweight checkouts, this changes the branch being referenced.\n"
4383
4377
"For heavyweight checkouts, this checks that there are no local commits\n"
4385
4379
"of the new location and binds to it."
4386
4380
msgstr ""
4387
4381
4388
#: bzrlib/builtins.py:6180
4382
#: bzrlib/builtins.py:6213
4389
4383
msgid ""
4390
4384
"In both cases, the working tree is updated and uncommitted changes\n"
4391
4385
"are merged. The user can commit or revert these as they desire."
4392
4386
msgstr ""
4393
4387
4394
#: bzrlib/builtins.py:6183
4388
#: bzrlib/builtins.py:6216
4395
4389
msgid "Pending merges need to be committed or reverted before using switch."
4396
4390
msgstr ""
4397
4391
4398
#: bzrlib/builtins.py:6185
4392
#: bzrlib/builtins.py:6218
4399
4393
msgid ""
4400
4394
"The path to the branch to switch to can be specified relative to the parent\n"
4401
4395
"directory of the current branch. For example, if you are currently in a\n"
4403
4397
"/path/to/newbranch."
4404
4398
msgstr ""
4405
4399
4406
#: bzrlib/builtins.py:6190
4400
#: bzrlib/builtins.py:6223
4407
4401
msgid ""
4408
4402
"Bound branches use the nickname of its master branch unless it is set\n"
4409
4403
"locally, in which case switching will update the local nickname to be\n"
4410
4404
"that of the master."
4411
4405
msgstr ""
4412
4406
4413
#: bzrlib/builtins.py:6198
4407
#: bzrlib/builtins.py:6231
4414
4408
msgid "Switch even if local commits will be lost."
4415
4409
msgstr ""
4416
4410
4417
#: bzrlib/builtins.py:6201
4411
#: bzrlib/builtins.py:6234
4418
4412
msgid "Create the target branch from this one before switching to it."
4419
4413
msgstr ""
4420
4414
4421
#: bzrlib/builtins.py:6215
4415
#: bzrlib/builtins.py:6248
4422
4416
msgid "You must supply either a revision or a location"
4423
4417
msgstr ""
4424
4418
4425
#: bzrlib/builtins.py:6228
4419
#: bzrlib/builtins.py:6261
4426
4420
msgid "cannot create branch without source branch"
4427
4421
msgstr ""
4428
4422
4429
#: bzrlib/builtins.py:6253
4423
#: bzrlib/builtins.py:6286
4430
4424
msgid "Manage filtered views."
4431
4425
msgstr ""
4432
4426
4433
#: bzrlib/builtins.py:6255
4427
#: bzrlib/builtins.py:6288
4434
4428
msgid ""
4435
4429
"Views provide a mask over the tree so that users can focus on\n"
4436
4430
"a subset of a tree when doing their work. After creating a view,\n"
4440
4434
"must be within the current view."
4441
4435
msgstr ""
4442
4436
4443
#: bzrlib/builtins.py:6262
4437
#: bzrlib/builtins.py:6295
4444
4438
msgid ""
4445
4439
"In most cases, a view has a short life-span: it is created to make\n"
4446
4440
"a selected change and is deleted once that change is committed.\n"
4448
4442
"and switch between them."
4449
4443
msgstr ""
4450
4444
4451
#: bzrlib/builtins.py:6267
4445
#: bzrlib/builtins.py:6300
4452
4446
msgid ""
4453
4447
"To disable the current view without deleting it, you can switch to\n"
4454
4448
"the pseudo view called ``off``. This can be useful when you need\n"
4456
4450
"want to switch back to your view after that."
4457
4451
msgstr ""
4458
4452
4459
#: bzrlib/builtins.py:6272
4453
#: bzrlib/builtins.py:6305
4460
4454
msgid ""
4461
4455
":Examples:\n"
4462
4456
" To define the current view::"
4463
4457
msgstr ""
4464
4458
4465
#: bzrlib/builtins.py:6275
4459
#: bzrlib/builtins.py:6308
4466
4460
msgid " bzr view file1 dir1 ..."
4467
4461
msgstr ""
4468
4462
4469
#: bzrlib/builtins.py:6277
4463
#: bzrlib/builtins.py:6310
4470
4464
msgid " To list the current view::"
4471
4465
msgstr ""
4472
4466
4473
#: bzrlib/builtins.py:6279
4467
#: bzrlib/builtins.py:6312
4474
4468
msgid " bzr view"
4475
4469
msgstr ""
4476
4470
4477
#: bzrlib/builtins.py:6281
4471
#: bzrlib/builtins.py:6314
4478
4472
msgid " To delete the current view::"
4479
4473
msgstr ""
4480
4474
4481
#: bzrlib/builtins.py:6283
4475
#: bzrlib/builtins.py:6316
4482
4476
msgid " bzr view --delete"
4483
4477
msgstr ""
4484
4478
4485
#: bzrlib/builtins.py:6285
4479
#: bzrlib/builtins.py:6318
4486
4480
msgid " To disable the current view without deleting it::"
4487
4481
msgstr ""
4488
4482
4489
#: bzrlib/builtins.py:6287
4483
#: bzrlib/builtins.py:6320
4490
4484
msgid " bzr view --switch off"
4491
4485
msgstr ""
4492
4486
4493
#: bzrlib/builtins.py:6289
4487
#: bzrlib/builtins.py:6322
4494
4488
msgid " To define a named view and switch to it::"
4495
4489
msgstr ""
4496
4490
4497
#: bzrlib/builtins.py:6291
4491
#: bzrlib/builtins.py:6324
4498
4492
msgid " bzr view --name view-name file1 dir1 ..."
4499
4493
msgstr ""
4500
4494
4501
#: bzrlib/builtins.py:6293
4495
#: bzrlib/builtins.py:6326
4502
4496
msgid " To list a named view::"
4503
4497
msgstr ""
4504
4498
4505
#: bzrlib/builtins.py:6295
4499
#: bzrlib/builtins.py:6328
4506
4500
msgid " bzr view --name view-name"
4507
4501
msgstr ""
4508
4502
4509
#: bzrlib/builtins.py:6297
4503
#: bzrlib/builtins.py:6330
4510
4504
msgid " To delete a named view::"
4511
4505
msgstr ""
4512
4506
4513
#: bzrlib/builtins.py:6299
4507
#: bzrlib/builtins.py:6332
4514
4508
msgid " bzr view --name view-name --delete"
4515
4509
msgstr ""
4516
4510
4517
#: bzrlib/builtins.py:6301
4511
#: bzrlib/builtins.py:6334
4518
4512
msgid " To switch to a named view::"
4519
4513
msgstr ""
4520
4514
4521
#: bzrlib/builtins.py:6303
4515
#: bzrlib/builtins.py:6336
4522
4516
msgid " bzr view --switch view-name"
4523
4517
msgstr ""
4524
4518
4525
#: bzrlib/builtins.py:6305
4519
#: bzrlib/builtins.py:6338
4526
4520
msgid " To list all views defined::"
4527
4521
msgstr ""
4528
4522
4529
#: bzrlib/builtins.py:6307
4523
#: bzrlib/builtins.py:6340
4530
4524
msgid " bzr view --all"
4531
4525
msgstr ""
4532
4526
4533
#: bzrlib/builtins.py:6309
4527
#: bzrlib/builtins.py:6342
4534
4528
msgid " To delete all views::"
4535
4529
msgstr ""
4536
4530
4537
#: bzrlib/builtins.py:6311
4531
#: bzrlib/builtins.py:6344
4538
4532
msgid " bzr view --delete --all"
4539
4533
msgstr ""
4540
4534
4541
#: bzrlib/builtins.py:6318
4535
#: bzrlib/builtins.py:6351
4542
4536
msgid "Apply list or delete action to all views."
4543
4537
msgstr ""
4544
4538
4545
#: bzrlib/builtins.py:6321
4539
#: bzrlib/builtins.py:6354
4546
4540
msgid "Delete the view."
4547
4541
msgstr ""
4548
4542
4549
#: bzrlib/builtins.py:6324
4543
#: bzrlib/builtins.py:6357
4550
4544
msgid "Name of the view to define, list or delete."
4551
4545
msgstr ""
4552
4546
4553
#: bzrlib/builtins.py:6328
4547
#: bzrlib/builtins.py:6361
4554
4548
msgid "Name of the view to switch to."
4555
4549
msgstr ""
4556
4550
4557
#: bzrlib/builtins.py:6347
4551
#: bzrlib/builtins.py:6380
4558
4552
msgid "Both --delete and a file list specified"
4559
4553
msgstr ""
4560
4554
4561
#: bzrlib/builtins.py:6350
4555
#: bzrlib/builtins.py:6383
4562
4556
msgid "Both --delete and --switch specified"
4563
4557
msgstr ""
4564
4558
4565
#: bzrlib/builtins.py:6353
4559
#: bzrlib/builtins.py:6386
4566
4560
msgid "Deleted all views.\n"
4567
4561
msgstr ""
4568
4562
4569
#: bzrlib/builtins.py:6355
4563
#: bzrlib/builtins.py:6388
4570
4564
msgid "No current view to delete"
4571
4565
msgstr ""
4572
4566
4573
#: bzrlib/builtins.py:6358
4567
#: bzrlib/builtins.py:6391
4574
4568
#, python-format
4575
4569
msgid "Deleted '%s' view.\n"
4576
4570
msgstr ""
4577
4571
4578
#: bzrlib/builtins.py:6362
4572
#: bzrlib/builtins.py:6395
4579
4573
msgid "Both --switch and a file list specified"
4580
4574
msgstr ""
4581
4575
4582
#: bzrlib/builtins.py:6365
4576
#: bzrlib/builtins.py:6398
4583
4577
msgid "Both --switch and --all specified"
4584
4578
msgstr ""
4585
4579
4586
#: bzrlib/builtins.py:6368
4580
#: bzrlib/builtins.py:6401
4587
4581
msgid "No current view to disable"
4588
4582
msgstr ""
4589
4583
4590
#: bzrlib/builtins.py:6370
4584
#: bzrlib/builtins.py:6403
4591
4585
#, python-format
4592
4586
msgid "Disabled '%s' view.\n"
4593
4587
msgstr ""
4594
4588
4595
#: bzrlib/builtins.py:6374 bzrlib/builtins.py:6396
4589
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4596
4590
msgid "Using '{0}' view: {1}\n"
4597
4591
msgstr ""
4598
4592
4599
#: bzrlib/builtins.py:6377
4593
#: bzrlib/builtins.py:6410
4600
4594
msgid "Views defined:\n"
4601
4595
msgstr ""
4602
4596
4603
#: bzrlib/builtins.py:6386
4597
#: bzrlib/builtins.py:6419
4604
4598
msgid "No views defined.\n"
4605
4599
msgstr ""
4606
4600
4607
#: bzrlib/builtins.py:6393
4601
#: bzrlib/builtins.py:6426
4608
4602
msgid "Cannot change the 'off' pseudo view"
4609
4603
msgstr ""
4610
4604
4611
#: bzrlib/builtins.py:6401
4605
#: bzrlib/builtins.py:6434
4612
4606
msgid "No current view.\n"
4613
4607
msgstr ""
4614
4608
4615
#: bzrlib/builtins.py:6404
4609
#: bzrlib/builtins.py:6437
4616
4610
msgid "'{0}' view is: {1}\n"
4617
4611
msgstr ""
4618
4612
4619
#: bzrlib/builtins.py:6424
4613
#: bzrlib/builtins.py:6457
4620
4614
msgid " <no hooks installed>\n"
4621
4615
msgstr ""
4622
4616
4623
#: bzrlib/builtins.py:6428
4617
#: bzrlib/builtins.py:6461
4624
4618
msgid "Remove a branch."
4625
4619
msgstr ""
4626
4620
4627
#: bzrlib/builtins.py:6430
4621
#: bzrlib/builtins.py:6463
4628
4622
msgid ""
4629
4623
"This will remove the branch from the specified location but \n"
4630
4624
"will keep any working tree or repository in place."
4631
4625
msgstr ""
4632
4626
4633
#: bzrlib/builtins.py:6435
4627
#: bzrlib/builtins.py:6468
4634
4628
msgid " Remove the branch at repo/trunk::"
4635
4629
msgstr ""
4636
4630
4637
#: bzrlib/builtins.py:6437
4631
#: bzrlib/builtins.py:6470
4638
4632
msgid " bzr remove-branch repo/trunk"
4639
4633
msgstr ""
4640
4634
4641
#: bzrlib/builtins.py:6444
4635
#: bzrlib/builtins.py:6477
4642
4636
msgid "Remove branch even if it is the active branch."
4643
4637
msgstr ""
4644
4638
4645
#: bzrlib/builtins.py:6458
4639
#: bzrlib/builtins.py:6491
4646
4640
msgid "Branch is active. Use --force to remove it."
4647
4641
msgstr ""
4648
4642
4649
#: bzrlib/builtins.py:6462
4643
#: bzrlib/builtins.py:6495
4650
4644
msgid "Plaintext diff output."
4651
4645
msgstr ""
4652
4646
4653
#: bzrlib/builtins.py:6463
4647
#: bzrlib/builtins.py:6496
4654
4648
msgid "Temporarily set aside some changes from the current tree."
4655
4649
msgstr ""
4656
4650
4657
#: bzrlib/builtins.py:6465
4651
#: bzrlib/builtins.py:6498
4658
4652
msgid ""
4659
4653
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4660
4654
"ie. out of the way, until a later time when you can bring them back from\n"
4663
4657
"will they survive its deletion."
4664
4658
msgstr ""
4665
4659
4666
#: bzrlib/builtins.py:6471
4660
#: bzrlib/builtins.py:6504
4667
4661
msgid "If shelve --list is specified, previously-shelved changes are listed."
4668
4662
msgstr ""
4669
4663
4670
#: bzrlib/builtins.py:6473
4664
#: bzrlib/builtins.py:6506
4671
4665
msgid ""
4672
4666
"Shelve is intended to help separate several sets of changes that have\n"
4673
4667
"been inappropriately mingled. If you just want to get rid of all changes\n"
4675
4669
"shelve all text changes at once, use shelve --all."
4676
4670
msgstr ""
4677
4671
4678
#: bzrlib/builtins.py:6478
4672
#: bzrlib/builtins.py:6511
4679
4673
msgid ""
4680
4674
"If filenames are specified, only the changes to those files will be\n"
4681
4675
"shelved. Other files will be left untouched."
4682
4676
msgstr ""
4683
4677
4684
#: bzrlib/builtins.py:6481
4678
#: bzrlib/builtins.py:6514
4685
4679
msgid ""
4686
4680
"If a revision is specified, changes since that revision will be shelved."
4687
4681
msgstr ""
4688
4682
4689
#: bzrlib/builtins.py:6483
4683
#: bzrlib/builtins.py:6516
4690
4684
msgid ""
4691
4685
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4692
4686
"restore the most recently shelved changes."
4693
4687
msgstr ""
4694
4688
4695
#: bzrlib/builtins.py:6486
4689
#: bzrlib/builtins.py:6519
4696
4690
msgid ""
4697
4691
"For complicated changes, it is possible to edit the changes in a separate\n"
4698
4692
"editor program to decide what the file remaining in the working copy\n"
4699
4693
"should look like. To do this, add the configuration option"
4700
4694
msgstr ""
4701
4695
4702
#: bzrlib/builtins.py:6490
4696
#: bzrlib/builtins.py:6523
4703
4697
msgid " change_editor = PROGRAM @new_path @old_path"
4704
4698
msgstr ""
4705
4699
4706
#: bzrlib/builtins.py:6492
4700
#: bzrlib/builtins.py:6525
4707
4701
msgid ""
4708
4702
"where @new_path is replaced with the path of the new version of the \n"
4709
4703
"file and @old_path is replaced with the path of the old version of \n"
4712
4706
" "
4713
4707
msgstr ""
4714
4708
4715
#: bzrlib/builtins.py:6504
4709
#: bzrlib/builtins.py:6537
4716
4710
msgid "Shelve all changes."
4717
4711
msgstr ""
4718
4712
4719
#: bzrlib/builtins.py:6506
4713
#: bzrlib/builtins.py:6539
4720
4714
msgid "Method to use for writing diffs."
4721
4715
msgstr ""
4722
4716
4723
#: bzrlib/builtins.py:6506
4717
#: bzrlib/builtins.py:6539
4724
4718
msgid "writer"
4725
4719
msgstr ""
4726
4720
4727
#: bzrlib/builtins.py:6510
4721
#: bzrlib/builtins.py:6543
4728
4722
msgid "List shelved changes."
4729
4723
msgstr ""
4730
4724
4731
#: bzrlib/builtins.py:6512
4725
#: bzrlib/builtins.py:6545
4732
4726
msgid "Destroy removed changes instead of shelving them."
4733
4727
msgstr ""
4734
4728
4735
#: bzrlib/builtins.py:6541
4729
#: bzrlib/builtins.py:6574
4736
4730
msgid "No shelved changes."
4737
4731
msgstr ""
4738
4732
4739
#: bzrlib/builtins.py:6552
4733
#: bzrlib/builtins.py:6585
4740
4734
msgid "Restore shelved changes."
4741
4735
msgstr ""
4742
4736
4743
#: bzrlib/builtins.py:6554
4737
#: bzrlib/builtins.py:6587
4744
4738
msgid ""
4745
4739
"By default, the most recently shelved changes are restored. However if you\n"
4746
4740
"specify a shelf by id those changes will be restored instead. This works\n"
4747
4741
"best when the changes don't depend on each other."
4748
4742
msgstr ""
4749
4743
4750
#: bzrlib/builtins.py:6563
4744
#: bzrlib/builtins.py:6596
4751
4745
msgid "The action to perform."
4752
4746
msgstr ""
4753
4747
4754
#: bzrlib/builtins.py:6563 bzrlib/conflicts.py:694
4748
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4755
4749
msgid "action"
4756
4750
msgstr ""
4757
4751
4758
#: bzrlib/builtins.py:6565
4752
#: bzrlib/builtins.py:6598
4759
4753
msgid "Apply changes and remove from the shelf."
4760
4754
msgstr ""
4761
4755
4762
#: bzrlib/builtins.py:6566
4756
#: bzrlib/builtins.py:6599
4763
4757
msgid "Show changes, but do not apply or remove them."
4764
4758
msgstr ""
4765
4759
4766
#: bzrlib/builtins.py:6567
4760
#: bzrlib/builtins.py:6600
4767
4761
msgid ""
4768
4762
"Instead of unshelving the changes, show the diff that would result from "
4769
4763
"unshelving."
4770
4764
msgstr ""
4771
4765
4772
#: bzrlib/builtins.py:6569
4766
#: bzrlib/builtins.py:6602
4773
4767
msgid "Delete changes without applying them."
4774
4768
msgstr ""
4775
4769
4776
#: bzrlib/builtins.py:6570
4770
#: bzrlib/builtins.py:6603
4777
4771
msgid "Apply changes but don't delete them."
4778
4772
msgstr ""
4779
4773
4780
#: bzrlib/builtins.py:6585
4774
#: bzrlib/builtins.py:6618
4781
4775
msgid "Remove unwanted files from working tree."
4782
4776
msgstr ""
4783
4777
4784
#: bzrlib/builtins.py:6587
4778
#: bzrlib/builtins.py:6620
4785
4779
msgid ""
4786
4780
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4787
4781
"files are never deleted."
4788
4782
msgstr ""
4789
4783
4790
#: bzrlib/builtins.py:6590
4784
#: bzrlib/builtins.py:6623
4791
4785
msgid ""
4792
4786
"Another class is 'detritus', which includes files emitted by bzr during\n"
4793
4787
"normal operations and selftests. (The value of these files decreases with\n"
4794
4788
"time.)"
4795
4789
msgstr ""
4796
4790
4797
#: bzrlib/builtins.py:6594
4791
#: bzrlib/builtins.py:6627
4798
4792
msgid ""
4799
4793
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4800
4794
"flags are respected, and may be combined."
4801
4795
msgstr ""
4802
4796
4803
#: bzrlib/builtins.py:6597
4797
#: bzrlib/builtins.py:6630
4804
4798
msgid "To check what clean-tree will do, use --dry-run."
4805
4799
msgstr ""
4806
4800
4807
#: bzrlib/builtins.py:6600
4801
#: bzrlib/builtins.py:6633
4808
4802
msgid "Delete all ignored files."
4809
4803
msgstr ""
4810
4804
4811
#: bzrlib/builtins.py:6601
4805
#: bzrlib/builtins.py:6634
4812
4806
msgid ""
4813
4807
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4814
4808
msgstr ""
4815
4809
4816
#: bzrlib/builtins.py:6604
4810
#: bzrlib/builtins.py:6637
4817
4811
msgid "Delete files unknown to bzr (default)."
4818
4812
msgstr ""
4819
4813
4820
#: bzrlib/builtins.py:6605
4814
#: bzrlib/builtins.py:6638
4821
4815
msgid "Show files to delete instead of deleting them."
4822
4816
msgstr ""
4823
4817
4824
#: bzrlib/builtins.py:6607
4818
#: bzrlib/builtins.py:6640
4825
4819
msgid "Do not prompt before deleting."
4826
4820
msgstr ""
4827
4821
4881
4875
msgstr[0] ""
4882
4876
msgstr[1] ""
4883
4877
4884
#: bzrlib/bzrdir.py:486
4878
#: bzrlib/bzrdir.py:487
4885
4879
msgid ""
4886
4880
"making backup of {0}\n"
4887
4881
" to {1}"
4888
4882
msgstr ""
4889
4883
4890
#: bzrlib/bzrdir.py:509
4884
#: bzrlib/bzrdir.py:510
4891
4885
msgid "renamed {0} to {1}"
4892
4886
msgstr ""
4893
4887
4894
#: bzrlib/bzrdir.py:1638
4888
#: bzrlib/bzrdir.py:1639
4895
4889
#, python-format
4896
4890
msgid ""
4897
4891
"Source repository format does not support stacking, using format:\n"
4898
4892
" %s"
4899
4893
msgstr ""
4900
4894
4901
#: bzrlib/bzrdir.py:1658
4895
#: bzrlib/bzrdir.py:1659
4902
4896
#, python-format
4903
4897
msgid ""
4904
4898
"Source branch format does not support stacking, using format:\n"
4905
4899
" %s"
4906
4900
msgstr ""
4907
4901
4908
#: bzrlib/bzrdir.py:1804
4902
#: bzrlib/bzrdir.py:1805
4909
4903
msgid "starting repository conversion"
4910
4904
msgstr ""
4911
4905
4912
#: bzrlib/bzrdir.py:2025
4906
#: bzrlib/bzrdir.py:2026
4913
4907
msgid "Using default stacking branch {0} at {1}"
4914
4908
msgstr ""
4915
4909
5092
5086
"supported formats or in a custom format based on a template."
5093
5087
msgstr ""
5094
5088
5095
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
5096
#: en/help_topics/configuration.txt:710
5089
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
5090
#: en/help_topics/configuration.txt:722
5097
5091
msgid "For example::"
5098
5092
msgstr ""
5099
5093
5339
5333
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5340
5334
msgstr ""
5341
5335
5342
#: bzrlib/config.py:2451
5336
#: bzrlib/config.py:2452
5343
5337
msgid "{0} is not an SI unit."
5344
5338
msgstr ""
5345
5339
5346
#: bzrlib/config.py:2970
5340
#: bzrlib/config.py:2971
5347
5341
msgid ""
5348
5342
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5349
5343
"will be saved."
5350
5344
msgstr ""
5351
5345
5352
#: bzrlib/config.py:3114
5346
#: bzrlib/config.py:3116
5353
5347
#, python-format
5354
5348
msgid "Invalid '%s', should be of the form 'name=value'"
5355
5349
msgstr ""
5356
5350
5357
#: bzrlib/config.py:4004
5351
#: bzrlib/config.py:4018
5358
5352
msgid "Display, set or remove a configuration option."
5359
5353
msgstr ""
5360
5354
5361
#: bzrlib/config.py:4006
5355
#: bzrlib/config.py:4020
5362
5356
msgid "Display the active value for a given option."
5363
5357
msgstr ""
5364
5358
5365
#: bzrlib/config.py:4008
5359
#: bzrlib/config.py:4022
5366
5360
msgid ""
5367
5361
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5368
5362
"matching options are displayed mentioning their scope. The active value\n"
5369
5363
"that bzr will take into account is the first one displayed for each option."
5370
5364
msgstr ""
5371
5365
5372
#: bzrlib/config.py:4012
5366
#: bzrlib/config.py:4026
5373
5367
msgid "If no NAME is given, --all .* is implied."
5374
5368
msgstr ""
5375
5369
5376
#: bzrlib/config.py:4014
5370
#: bzrlib/config.py:4028
5377
5371
msgid ""
5378
5372
"Setting a value is achieved by using name=value without spaces. The value\n"
5379
5373
"is set in the most relevant scope and can be checked by displaying the\n"
5380
5374
"option again."
5381
5375
msgstr ""
5382
5376
5383
#: bzrlib/config.py:4026
5377
#: bzrlib/config.py:4040
5384
5378
msgid "Reduce the scope to the specified configuration file."
5385
5379
msgstr ""
5386
5380
5387
#: bzrlib/config.py:4030
5381
#: bzrlib/config.py:4044
5388
5382
msgid "Display all the defined values for the matching options."
5389
5383
msgstr ""
5390
5384
5391
#: bzrlib/config.py:4032
5385
#: bzrlib/config.py:4046
5392
5386
msgid "Remove the option from the configuration file."
5393
5387
msgstr ""
5394
5388
7643
7637
msgid "bzr: ERROR (ignored): %s"
7644
7638
msgstr ""
7645
7639
7646
#: bzrlib/remote.py:2541
7640
#: bzrlib/remote.py:2534
7647
7641
msgid "Copying repository content as tarball..."
7648
7642
msgstr ""
7649
7643
7659
7653
msgid "{0} => {1}"
7660
7654
msgstr ""
7661
7655
7662
#: bzrlib/repository.py:1799
7656
#: bzrlib/repository.py:1738
7663
7657
msgid "Moving repository to repository.backup"
7664
7658
msgstr ""
7665
7659
7666
#: bzrlib/repository.py:1806
7660
#: bzrlib/repository.py:1745
7667
7661
msgid "Creating new repository"
7668
7662
msgstr ""
7669
7663
7670
#: bzrlib/repository.py:1811
7664
#: bzrlib/repository.py:1750
7671
7665
msgid "Copying content"
7672
7666
msgstr ""
7673
7667
7674
#: bzrlib/repository.py:1815
7668
#: bzrlib/repository.py:1754
7675
7669
msgid "Deleting old repository content"
7676
7670
msgstr ""
7677
7671
7678
#: bzrlib/repository.py:1817
7672
#: bzrlib/repository.py:1756
7679
7673
msgid "repository converted"
7680
7674
msgstr ""
7681
7675
7901
7895
msgid "adding file"
7902
7896
msgstr ""
7903
7897
7904
#: bzrlib/transform.py:2590
7898
#: bzrlib/transform.py:2598
7905
7899
msgid "Building tree"
7906
7900
msgstr ""
7907
7901
7908
#: bzrlib/transform.py:2680 bzrlib/transform.py:2707
7902
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7909
7903
msgid "Adding file contents"
7910
7904
msgstr ""
7911
7905
7912
#: bzrlib/transform.py:3009
7906
#: bzrlib/transform.py:3017
7913
7907
msgid "Resolution pass"
7914
7908
msgstr ""
7915
7909
7918
7912
msgid "Authenticated as %s"
7919
7913
msgstr ""
7920
7914
7921
#: bzrlib/tree.py:637
7915
#: bzrlib/tree.py:647
7922
7916
msgid "*** {0} content-filter: {1} => {2!r}"
7923
7917
msgstr ""
7924
7918
8058
8052
8059
8053
#: dummy/help_topics/basic/detail.txt:1
8060
8054
msgid ""
8061
"Bazaar 2.6.0dev1 -- a free distributed version-control tool\n"
8055
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
8062
8056
"http://bazaar.canonical.com/"
8063
8057
msgstr ""
8064
8058
8376
8370
msgid "How to fix diverged branches"
8377
8371
msgstr ""
8378
8372
8379
#: dummy/help_topics/env-variables/detail.txt:1
8380
msgid "Environment Variables"
8381
msgstr ""
8382
8383
#: dummy/help_topics/env-variables/detail.txt:3
8384
msgid ""
8385
"=================== "
8386
"===========================================================\n"
8387
"BZRPATH Path where bzr is to look for shell plugin external\n"
8388
" commands.\n"
8389
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8390
"EMAIL E-Mail address of the user.\n"
8391
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8392
"EDITOR Editor for editing commit messages.\n"
8393
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8394
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8395
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8396
"BZR_PLUGIN_PATH.\n"
8397
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8398
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8399
"and\n"
8400
" HOME.\n"
8401
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8402
"URLs).\n"
8403
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8404
"sshcorp,\n"
8405
" plink or lsh.\n"
8406
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8407
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8408
"BZR_COLUMNS Override implicit terminal width.\n"
8409
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8410
"(selftest)\n"
8411
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8412
"'text'.\n"
8413
"BZR_PDB Control whether to launch a debugger on error.\n"
8414
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8415
" breakin debugger.\n"
8416
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8417
"(instead\n"
8418
" of char-based).\n"
8419
"=================== "
8420
"===========================================================\n"
8421
msgstr ""
8422
8423
8373
#: dummy/help_topics/env-variables/summary.txt:1
8424
8374
msgid "Environment variable names and values"
8425
8375
msgstr ""
9423
9373
msgid " bzr commit --fixes <tracker>:<id>"
9424
9374
msgstr ""
9425
9375
9426
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9376
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9427
9377
msgid "or::"
9428
9378
msgstr ""
9429
9379
9658
9608
"remove-tree Remove the working tree from a given branch/checkout.\n"
9659
9609
"renames Show list of renamed files.\n"
9660
9610
"resolve Mark a conflict as resolved.\n"
9661
"revert Revert files to a previous revision.\n"
9611
"revert Set files in the working tree back to the contents of a\n"
9612
" previous revision.\n"
9662
9613
"revno Show current revision number.\n"
9663
9614
"root Show the tree root directory.\n"
9664
9615
"send Mail or create a merge-directive for submitting changes.\n"
10316
10267
10317
10268
#: en/help_topics/configuration.txt:336
10318
10269
msgid ""
10270
"Another such option is ``branchname``, which refers to the name of a "
10271
"colocated\n"
10272
"branch. For non-colocated branches, it behaves like basename. It can be "
10273
"used\n"
10274
"like this::"
10275
msgstr ""
10276
10277
#: en/help_topics/configuration.txt:340
10278
msgid ""
10279
" [/home/vila/src/bzr/bugs]\n"
10280
" mypush = lp:~vila/bzr/{branchname}"
10281
msgstr ""
10282
10283
#: en/help_topics/configuration.txt:343
10284
msgid ""
10285
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10286
"get::"
10287
msgstr ""
10288
10289
#: en/help_topics/configuration.txt:345
10290
msgid ""
10291
" bzr config mypush\n"
10292
" lp:~vila/bzr/832013-expand-in-stack"
10293
msgstr ""
10294
10295
#: en/help_topics/configuration.txt:348
10296
msgid ""
10319
10297
"When an option is local to a Section, it cannot be referred to from option\n"
10320
10298
"values in any other section from the same ``Store`` nor from any other\n"
10321
10299
"``Store``."
10322
10300
msgstr ""
10323
10301
10324
#: en/help_topics/configuration.txt:340
10302
#: en/help_topics/configuration.txt:352
10325
10303
msgid ""
10326
10304
"\n"
10327
10305
"The main configuration file, bazaar.conf\n"
10328
10306
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10329
10307
msgstr ""
10330
10308
10331
#: en/help_topics/configuration.txt:344
10309
#: en/help_topics/configuration.txt:356
10332
10310
msgid ""
10333
10311
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10334
10312
"The default section contains the default\n"
10336
10314
"overriden by providing a branch-specific section in ``locations.conf``."
10337
10315
msgstr ""
10338
10316
10339
#: en/help_topics/configuration.txt:349
10317
#: en/help_topics/configuration.txt:361
10340
10318
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10341
10319
msgstr ""
10342
10320
10343
#: en/help_topics/configuration.txt:351
10321
#: en/help_topics/configuration.txt:363
10344
10322
msgid ""
10345
10323
" [DEFAULT]\n"
10346
10324
" email = John Doe <jdoe@isp.com>\n"
10348
10326
" create_signatures = when-required"
10349
10327
msgstr ""
10350
10328
10351
#: en/help_topics/configuration.txt:356
10329
#: en/help_topics/configuration.txt:368
10352
10330
msgid ""
10353
10331
"\n"
10354
10332
"The branch location configuration file, locations.conf\n"
10355
10333
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10356
10334
msgstr ""
10357
10335
10358
#: en/help_topics/configuration.txt:360
10336
#: en/help_topics/configuration.txt:372
10359
10337
msgid ""
10360
10338
"``locations.conf`` allows one to specify overriding settings for\n"
10361
10339
"a specific branch. The format is almost identical to the default section in\n"
10365
10343
"for. The '?' and '*' wildcards are supported::"
10366
10344
msgstr ""
10367
10345
10368
#: en/help_topics/configuration.txt:366
10346
#: en/help_topics/configuration.txt:378
10369
10347
msgid ""
10370
10348
" [/home/jdoe/branches/nethack]\n"
10371
10349
" email = Nethack Admin <nethack@nethack.com>"
10372
10350
msgstr ""
10373
10351
10374
#: en/help_topics/configuration.txt:369
10352
#: en/help_topics/configuration.txt:381
10375
10353
msgid ""
10376
10354
" [http://hypothetical.site.com/branches/devel-branch]\n"
10377
10355
" create_signatures = always"
10378
10356
msgstr ""
10379
10357
10380
#: en/help_topics/configuration.txt:372
10358
#: en/help_topics/configuration.txt:384
10381
10359
msgid ""
10382
10360
"The authentication configuration file, authentication.conf\n"
10383
10361
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10384
10362
msgstr ""
10385
10363
10386
#: en/help_topics/configuration.txt:375
10364
#: en/help_topics/configuration.txt:387
10387
10365
msgid ""
10388
10366
"``authentication.conf`` allows one to specify credentials for\n"
10389
10367
"remote servers. This can be used for all the supported transports and any "
10391
10369
"of bzr that requires authentication (smtp for example)."
10392
10370
msgstr ""
10393
10371
10394
#: en/help_topics/configuration.txt:379
10372
#: en/help_topics/configuration.txt:391
10395
10373
msgid ""
10396
10374
"The syntax of the file obeys the same rules as the others except for the\n"
10397
10375
"option policies which don't apply."
10398
10376
msgstr ""
10399
10377
10400
#: en/help_topics/configuration.txt:382
10378
#: en/help_topics/configuration.txt:394
10401
10379
msgid ""
10402
10380
"For more information on the possible uses of the authentication "
10403
10381
"configuration\n"
10404
10382
"file see :doc:`authentication-help`."
10405
10383
msgstr ""
10406
10384
10407
#: en/help_topics/configuration.txt:385
10385
#: en/help_topics/configuration.txt:397
10408
10386
msgid ""
10409
10387
"\n"
10410
10388
"Common options\n"
10411
10389
"--------------"
10412
10390
msgstr ""
10413
10391
10414
#: en/help_topics/configuration.txt:389
10392
#: en/help_topics/configuration.txt:401
10415
10393
msgid ""
10416
10394
"debug_flags\n"
10417
10395
"~~~~~~~~~~~"
10418
10396
msgstr ""
10419
10397
10420
#: en/help_topics/configuration.txt:392
10398
#: en/help_topics/configuration.txt:404
10421
10399
msgid ""
10422
10400
"A comma-separated list of debugging options to turn on. The same values\n"
10423
10401
"can be used as with the -D command-line option (see `help global-options`).\n"
10424
10402
"For example::"
10425
10403
msgstr ""
10426
10404
10427
#: en/help_topics/configuration.txt:396
10405
#: en/help_topics/configuration.txt:408
10428
10406
msgid " debug_flags = hpss"
10429
10407
msgstr ""
10430
10408
10431
#: en/help_topics/configuration.txt:400
10409
#: en/help_topics/configuration.txt:412
10432
10410
msgid " debug_flags = hpss,evil"
10433
10411
msgstr ""
10434
10412
10435
#: en/help_topics/configuration.txt:402
10413
#: en/help_topics/configuration.txt:414
10436
10414
msgid ""
10437
10415
"email\n"
10438
10416
"~~~~~"
10439
10417
msgstr ""
10440
10418
10441
#: en/help_topics/configuration.txt:405
10419
#: en/help_topics/configuration.txt:417
10442
10420
msgid ""
10443
10421
"The email address to use when committing a branch. Typically takes the form\n"
10444
10422
"of::"
10445
10423
msgstr ""
10446
10424
10447
#: en/help_topics/configuration.txt:408
10425
#: en/help_topics/configuration.txt:420
10448
10426
msgid " email = Full Name <account@hostname.tld>"
10449
10427
msgstr ""
10450
10428
10451
#: en/help_topics/configuration.txt:410
10429
#: en/help_topics/configuration.txt:422
10452
10430
msgid ""
10453
10431
"editor\n"
10454
10432
"~~~~~~"
10455
10433
msgstr ""
10456
10434
10457
#: en/help_topics/configuration.txt:413
10435
#: en/help_topics/configuration.txt:425
10458
10436
msgid ""
10459
10437
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10460
10438
"a commit message. This setting is trumped by the environment variable\n"
10462
10440
"variables."
10463
10441
msgstr ""
10464
10442
10465
#: en/help_topics/configuration.txt:418
10443
#: en/help_topics/configuration.txt:430
10466
10444
msgid ""
10467
10445
"log_format\n"
10468
10446
"~~~~~~~~~~"
10469
10447
msgstr ""
10470
10448
10471
#: en/help_topics/configuration.txt:421
10449
#: en/help_topics/configuration.txt:433
10472
10450
msgid ""
10473
10451
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10474
10452
"and ``line``. Additional formats may be provided by plugins. The default\n"
10475
10453
"value is ``long``."
10476
10454
msgstr ""
10477
10455
10478
#: en/help_topics/configuration.txt:425
10456
#: en/help_topics/configuration.txt:437
10479
10457
msgid ""
10480
10458
"check_signatures\n"
10481
10459
"~~~~~~~~~~~~~~~~"
10482
10460
msgstr ""
10483
10461
10484
#: en/help_topics/configuration.txt:428
10462
#: en/help_topics/configuration.txt:440
10485
10463
msgid ""
10486
10464
"Reserved for future use. These options will allow a policy for branches to\n"
10487
10465
"require signatures."
10488
10466
msgstr ""
10489
10467
10490
#: en/help_topics/configuration.txt:431
10468
#: en/help_topics/configuration.txt:443
10491
10469
msgid ""
10492
10470
"require\n"
10493
10471
" The gnupg signature for revisions must be present and must be valid."
10494
10472
msgstr ""
10495
10473
10496
#: en/help_topics/configuration.txt:434
10474
#: en/help_topics/configuration.txt:446
10497
10475
msgid ""
10498
10476
"ignore\n"
10499
10477
" Do not check gnupg signatures of revisions."
10500
10478
msgstr ""
10501
10479
10502
#: en/help_topics/configuration.txt:437
10480
#: en/help_topics/configuration.txt:449
10503
10481
msgid ""
10504
10482
"check-available\n"
10505
10483
" (default) If gnupg signatures for revisions are present, check them.\n"
10507
10485
" no signature is present."
10508
10486
msgstr ""
10509
10487
10510
#: en/help_topics/configuration.txt:442
10488
#: en/help_topics/configuration.txt:454
10511
10489
msgid ""
10512
10490
"create_signatures\n"
10513
10491
"~~~~~~~~~~~~~~~~~"
10514
10492
msgstr ""
10515
10493
10516
#: en/help_topics/configuration.txt:445
10494
#: en/help_topics/configuration.txt:457
10517
10495
msgid ""
10518
10496
"Defines the behaviour of signing revisions on commits. By default bzr will "
10519
10497
"not\n"
10520
10498
"sign new commits."
10521
10499
msgstr ""
10522
10500
10523
#: en/help_topics/configuration.txt:448
10501
#: en/help_topics/configuration.txt:460
10524
10502
msgid ""
10525
10503
"always\n"
10526
10504
" Sign every new revision that is committed. If the signing fails then "
10528
10506
" commit will not be made."
10529
10507
msgstr ""
10530
10508
10531
#: en/help_topics/configuration.txt:452
10509
#: en/help_topics/configuration.txt:464
10532
10510
msgid ""
10533
10511
"when-required\n"
10534
10512
" Reserved for future use."
10535
10513
msgstr ""
10536
10514
10537
#: en/help_topics/configuration.txt:455
10515
#: en/help_topics/configuration.txt:467
10538
10516
msgid ""
10539
10517
"never\n"
10540
10518
" Reserved for future use."
10541
10519
msgstr ""
10542
10520
10543
#: en/help_topics/configuration.txt:458
10521
#: en/help_topics/configuration.txt:470
10544
10522
msgid ""
10545
10523
"In future it is planned that ``when-required`` will sign newly\n"
10546
10524
"committed revisions only when the branch requires them. ``never`` will "
10548
10526
"to sign newly committed revisions, even if the branch requires signatures."
10549
10527
msgstr ""
10550
10528
10551
#: en/help_topics/configuration.txt:462
10529
#: en/help_topics/configuration.txt:474
10552
10530
msgid ""
10553
10531
"dirstate.fdatasync\n"
10554
10532
"~~~~~~~~~~~~~~~~~~"
10555
10533
msgstr ""
10556
10534
10557
#: en/help_topics/configuration.txt:465
10535
#: en/help_topics/configuration.txt:477
10558
10536
msgid ""
10559
10537
"If true (default), working tree metadata changes are flushed through the\n"
10560
10538
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10561
10539
"should not be lost if the machine crashes. See also repository.fdatasync."
10562
10540
msgstr ""
10563
10541
10564
#: en/help_topics/configuration.txt:469
10542
#: en/help_topics/configuration.txt:481
10565
10543
msgid ""
10566
10544
"gpg_signing_key\n"
10567
10545
"~~~~~~~~~~~~~~~"
10568
10546
msgstr ""
10569
10547
10570
#: en/help_topics/configuration.txt:472
10548
#: en/help_topics/configuration.txt:484
10571
10549
msgid ""
10572
10550
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10573
10551
"address, key fingerprint or full key ID. When unset or when set to\n"
10574
10552
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10575
10553
msgstr ""
10576
10554
10577
#: en/help_topics/configuration.txt:476
10555
#: en/help_topics/configuration.txt:488
10578
10556
msgid ""
10579
10557
"recurse\n"
10580
10558
"~~~~~~~"
10581
10559
msgstr ""
10582
10560
10583
#: en/help_topics/configuration.txt:479
10561
#: en/help_topics/configuration.txt:491
10584
10562
msgid ""
10585
10563
"Only useful in ``locations.conf``. Defines whether or not the\n"
10586
10564
"configuration for this section applies to subdirectories:"
10587
10565
msgstr ""
10588
10566
10589
#: en/help_topics/configuration.txt:482
10567
#: en/help_topics/configuration.txt:494
10590
10568
msgid ""
10591
10569
"true\n"
10592
10570
" (default) This section applies to subdirectories as well."
10593
10571
msgstr ""
10594
10572
10595
#: en/help_topics/configuration.txt:485
10573
#: en/help_topics/configuration.txt:497
10596
10574
msgid ""
10597
10575
"false\n"
10598
10576
" This section only applies to the branch at this directory and not\n"
10599
10577
" branches below it."
10600
10578
msgstr ""
10601
10579
10602
#: en/help_topics/configuration.txt:489
10580
#: en/help_topics/configuration.txt:501
10603
10581
msgid ""
10604
10582
"gpg_signing_command\n"
10605
10583
"~~~~~~~~~~~~~~~~~~~"
10606
10584
msgstr ""
10607
10585
10608
#: en/help_topics/configuration.txt:492
10586
#: en/help_topics/configuration.txt:504
10609
10587
msgid ""
10610
10588
"(Default: \"gpg\"). Which program should be used to sign and check "
10611
10589
"revisions.\n"
10612
10590
"For example::"
10613
10591
msgstr ""
10614
10592
10615
#: en/help_topics/configuration.txt:495
10593
#: en/help_topics/configuration.txt:507
10616
10594
msgid " gpg_signing_command = /usr/bin/gnpg"
10617
10595
msgstr ""
10618
10596
10619
#: en/help_topics/configuration.txt:497
10597
#: en/help_topics/configuration.txt:509
10620
10598
msgid ""
10621
10599
"The specified command must accept the options \"--clearsign\" and \"-u "
10622
10600
"<email>\"."
10623
10601
msgstr ""
10624
10602
10625
#: en/help_topics/configuration.txt:499
10603
#: en/help_topics/configuration.txt:511
10626
10604
msgid ""
10627
10605
"bzr_remote_path\n"
10628
10606
"~~~~~~~~~~~~~~~"
10629
10607
msgstr ""
10630
10608
10631
#: en/help_topics/configuration.txt:502
10609
#: en/help_topics/configuration.txt:514
10632
10610
msgid ""
10633
10611
"(Default: \"bzr\"). The path to the command that should be used to run the "
10634
10612
"smart\n"
10635
10613
"server for bzr. This value may only be specified in locations.conf, because:"
10636
10614
msgstr ""
10637
10615
10638
#: en/help_topics/configuration.txt:505
10616
#: en/help_topics/configuration.txt:517
10639
10617
msgid ""
10640
10618
"- it's needed before branch.conf is accessible\n"
10641
10619
"- allowing remote branch.conf files to specify commands would be a security\n"
10642
10620
" risk"
10643
10621
msgstr ""
10644
10622
10645
#: en/help_topics/configuration.txt:509
10623
#: en/help_topics/configuration.txt:521
10646
10624
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10647
10625
msgstr ""
10648
10626
10649
#: en/help_topics/configuration.txt:511
10627
#: en/help_topics/configuration.txt:523
10650
10628
msgid ""
10651
10629
"smtp_server\n"
10652
10630
"~~~~~~~~~~~"
10653
10631
msgstr ""
10654
10632
10655
#: en/help_topics/configuration.txt:514
10633
#: en/help_topics/configuration.txt:526
10656
10634
msgid ""
10657
10635
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10658
10636
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10659
10637
msgstr ""
10660
10638
10661
#: en/help_topics/configuration.txt:517
10639
#: en/help_topics/configuration.txt:529
10662
10640
msgid ""
10663
10641
"smtp_username, smtp_password\n"
10664
10642
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10665
10643
msgstr ""
10666
10644
10667
#: en/help_topics/configuration.txt:520
10645
#: en/help_topics/configuration.txt:532
10668
10646
msgid ""
10669
10647
"User and password to authenticate to the SMTP server. If smtp_username\n"
10670
10648
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10672
10650
"to send mail."
10673
10651
msgstr ""
10674
10652
10675
#: en/help_topics/configuration.txt:525
10653
#: en/help_topics/configuration.txt:537
10676
10654
msgid ""
10677
10655
"locks.steal_dead\n"
10678
10656
"~~~~~~~~~~~~~~~~"
10679
10657
msgstr ""
10680
10658
10681
#: en/help_topics/configuration.txt:528
10659
#: en/help_topics/configuration.txt:540
10682
10660
msgid ""
10683
10661
"If set to true, bzr will automatically break locks held by processes from\n"
10684
10662
"the same machine and user that are no longer alive. Otherwise, it will\n"
10686
10664
"the object is no longer in use."
10687
10665
msgstr ""
10688
10666
10689
#: en/help_topics/configuration.txt:533
10667
#: en/help_topics/configuration.txt:545
10690
10668
msgid ""
10691
10669
"mail_client\n"
10692
10670
"~~~~~~~~~~~"
10693
10671
msgstr ""
10694
10672
10695
#: en/help_topics/configuration.txt:536
10673
#: en/help_topics/configuration.txt:548
10696
10674
msgid ""
10697
10675
"A mail client to use for sending merge requests.\n"
10698
10676
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10701
10679
"``editor``."
10702
10680
msgstr ""
10703
10681
10704
#: en/help_topics/configuration.txt:541
10682
#: en/help_topics/configuration.txt:553
10705
10683
msgid "Supported values for specific clients:"
10706
10684
msgstr ""
10707
10685
10708
#: en/help_topics/configuration.txt:543
10686
#: en/help_topics/configuration.txt:555
10709
10687
msgid ""
10710
10688
":claws: Use Claws. This skips a dialog for attaching files.\n"
10711
10689
":evolution: Use Evolution.\n"
10716
10694
" this works around some bugs that xdg-email doesn't handle."
10717
10695
msgstr ""
10718
10696
10719
#: en/help_topics/configuration.txt:550
10697
#: en/help_topics/configuration.txt:562
10720
10698
msgid "Supported generic values are:"
10721
10699
msgstr ""
10722
10700
10723
#: en/help_topics/configuration.txt:552
10701
#: en/help_topics/configuration.txt:564
10724
10702
msgid ""
10725
10703
":default: See above.\n"
10726
10704
":editor: Use your editor to compose the merge request. This also uses\n"
10730
10708
":xdg-email: Use xdg-email to run your preferred mail program"
10731
10709
msgstr ""
10732
10710
10733
#: en/help_topics/configuration.txt:559
10711
#: en/help_topics/configuration.txt:571
10734
10712
msgid ""
10735
10713
"repository.fdatasync\n"
10736
10714
"~~~~~~~~~~~~~~~~~~~~"
10737
10715
msgstr ""
10738
10716
10739
#: en/help_topics/configuration.txt:562
10717
#: en/help_topics/configuration.txt:574
10740
10718
msgid ""
10741
10719
"If true (default), repository changes are flushed through the OS buffers\n"
10742
10720
"to physical disk. This is somewhat slower, but means data should not be\n"
10743
10721
"lost if the machine crashes. See also dirstate.fdatasync."
10744
10722
msgstr ""
10745
10723
10746
#: en/help_topics/configuration.txt:566
10724
#: en/help_topics/configuration.txt:578
10747
10725
msgid ""
10748
10726
"submit_branch\n"
10749
10727
"~~~~~~~~~~~~~"
10750
10728
msgstr ""
10751
10729
10752
#: en/help_topics/configuration.txt:569
10730
#: en/help_topics/configuration.txt:581
10753
10731
msgid ""
10754
10732
"The branch you intend to submit your current work to. This is "
10755
10733
"automatically\n"
10758
10736
"should usually be set on a per-branch or per-location basis."
10759
10737
msgstr ""
10760
10738
10761
#: en/help_topics/configuration.txt:573
10739
#: en/help_topics/configuration.txt:585
10762
10740
msgid ""
10763
10741
"public_branch\n"
10764
10742
"~~~~~~~~~~~~~"
10765
10743
msgstr ""
10766
10744
10767
#: en/help_topics/configuration.txt:576
10745
#: en/help_topics/configuration.txt:588
10768
10746
msgid ""
10769
10747
"A publically-accessible version of this branch (implying that this version "
10770
10748
"is\n"
10771
10749
"not publically-accessible). Used (and set) by ``bzr send``."
10772
10750
msgstr ""
10773
10751
10774
#: en/help_topics/configuration.txt:579
10752
#: en/help_topics/configuration.txt:591
10775
10753
msgid ""
10776
10754
"suppress_warnings\n"
10777
10755
"~~~~~~~~~~~~~~~~~"
10778
10756
msgstr ""
10779
10757
10780
#: en/help_topics/configuration.txt:582
10758
#: en/help_topics/configuration.txt:594
10781
10759
msgid ""
10782
10760
"A list of strings, each string represent a warning that can be emitted by\n"
10783
10761
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10784
10762
msgstr ""
10785
10763
10786
#: en/help_topics/configuration.txt:585
10764
#: en/help_topics/configuration.txt:597
10787
10765
msgid "Valid values:"
10788
10766
msgstr ""
10789
10767
10790
#: en/help_topics/configuration.txt:587
10768
#: en/help_topics/configuration.txt:599
10791
10769
msgid ""
10792
10770
"* ``format_deprecation``:\n"
10793
10771
" whether the format deprecation warning is shown on repositories that "
10795
10773
" using deprecated formats."
10796
10774
msgstr ""
10797
10775
10798
#: en/help_topics/configuration.txt:591
10776
#: en/help_topics/configuration.txt:603
10799
10777
msgid ""
10800
10778
"default_format\n"
10801
10779
"~~~~~~~~~~~~~~"
10802
10780
msgstr ""
10803
10781
10804
#: en/help_topics/configuration.txt:594
10782
#: en/help_topics/configuration.txt:606
10805
10783
msgid ""
10806
10784
"A format name for the default format used when creating branches. See "
10807
10785
"``bzr\n"
10808
10786
"help formats`` for possible values."
10809
10787
msgstr ""
10810
10788
10811
#: en/help_topics/configuration.txt:597
10789
#: en/help_topics/configuration.txt:609
10812
10790
msgid ""
10813
10791
"\n"
10814
10792
"Unicode options\n"
10815
10793
"---------------"
10816
10794
msgstr ""
10817
10795
10818
#: en/help_topics/configuration.txt:601
10796
#: en/help_topics/configuration.txt:613
10819
10797
msgid ""
10820
10798
"output_encoding\n"
10821
10799
"~~~~~~~~~~~~~~~"
10822
10800
msgstr ""
10823
10801
10824
#: en/help_topics/configuration.txt:604
10802
#: en/help_topics/configuration.txt:616
10825
10803
msgid ""
10826
10804
"A Python unicode encoding name for text output from bzr, such as log\n"
10827
10805
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10828
10806
"is the terminal encoding prefered by the operating system."
10829
10807
msgstr ""
10830
10808
10831
#: en/help_topics/configuration.txt:608
10809
#: en/help_topics/configuration.txt:620
10832
10810
msgid ""
10833
10811
"\n"
10834
10812
"Branch type specific options\n"
10835
10813
"----------------------------"
10836
10814
msgstr ""
10837
10815
10838
#: en/help_topics/configuration.txt:612
10816
#: en/help_topics/configuration.txt:624
10839
10817
msgid ""
10840
10818
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10841
10819
"later format. They\n"
10843
10821
"manually set in ``locations.conf`` or ``bazaar.conf``."
10844
10822
msgstr ""
10845
10823
10846
#: en/help_topics/configuration.txt:617
10824
#: en/help_topics/configuration.txt:629
10847
10825
msgid ""
10848
10826
"append_revisions_only\n"
10849
10827
"~~~~~~~~~~~~~~~~~~~~~"
10850
10828
msgstr ""
10851
10829
10852
#: en/help_topics/configuration.txt:620
10830
#: en/help_topics/configuration.txt:632
10853
10831
msgid ""
10854
10832
"If set to \"True\" then revisions can only be appended to the log, not\n"
10855
10833
"removed. A branch with this setting enabled can only pull from another\n"
10859
10837
"compatibility with previous bzr versions (older than 2.2)."
10860
10838
msgstr ""
10861
10839
10862
#: en/help_topics/configuration.txt:627
10840
#: en/help_topics/configuration.txt:639
10863
10841
msgid ""
10864
10842
"parent_location\n"
10865
10843
"~~~~~~~~~~~~~~~"
10866
10844
msgstr ""
10867
10845
10868
#: en/help_topics/configuration.txt:630
10846
#: en/help_topics/configuration.txt:642
10869
10847
msgid ""
10870
10848
"If present, the location of the default branch for pull or merge. This "
10871
10849
"option\n"
10873
10851
"--remember``."
10874
10852
msgstr ""
10875
10853
10876
#: en/help_topics/configuration.txt:634
10854
#: en/help_topics/configuration.txt:646
10877
10855
msgid ""
10878
10856
"push_location\n"
10879
10857
"~~~~~~~~~~~~~"
10880
10858
msgstr ""
10881
10859
10882
#: en/help_topics/configuration.txt:637
10860
#: en/help_topics/configuration.txt:649
10883
10861
msgid ""
10884
10862
"If present, the location of the default branch for push. This option\n"
10885
10863
"is normally set by the first ``push`` or ``push --remember``."
10886
10864
msgstr ""
10887
10865
10888
#: en/help_topics/configuration.txt:640
10866
#: en/help_topics/configuration.txt:652
10889
10867
msgid ""
10890
10868
"push_strict\n"
10891
10869
"~~~~~~~~~~~"
10892
10870
msgstr ""
10893
10871
10894
#: en/help_topics/configuration.txt:643
10872
#: en/help_topics/configuration.txt:655
10895
10873
msgid ""
10896
10874
"If present, defines the ``--strict`` option default value for checking\n"
10897
10875
"uncommitted changes before pushing."
10898
10876
msgstr ""
10899
10877
10900
#: en/help_topics/configuration.txt:646
10878
#: en/help_topics/configuration.txt:658
10901
10879
msgid ""
10902
10880
"dpush_strict\n"
10903
10881
"~~~~~~~~~~~~"
10904
10882
msgstr ""
10905
10883
10906
#: en/help_topics/configuration.txt:649
10884
#: en/help_topics/configuration.txt:661
10907
10885
msgid ""
10908
10886
"If present, defines the ``--strict`` option default value for checking\n"
10909
10887
"uncommitted changes before pushing into a different VCS without any\n"
10910
10888
"custom bzr metadata."
10911
10889
msgstr ""
10912
10890
10913
#: en/help_topics/configuration.txt:653
10891
#: en/help_topics/configuration.txt:665
10914
10892
msgid ""
10915
10893
"bound_location\n"
10916
10894
"~~~~~~~~~~~~~~"
10917
10895
msgstr ""
10918
10896
10919
#: en/help_topics/configuration.txt:656
10897
#: en/help_topics/configuration.txt:668
10920
10898
msgid ""
10921
10899
"The location that commits should go to when acting as a checkout.\n"
10922
10900
"This option is normally set by ``bind``."
10923
10901
msgstr ""
10924
10902
10925
#: en/help_topics/configuration.txt:659
10903
#: en/help_topics/configuration.txt:671
10926
10904
msgid ""
10927
10905
"bound\n"
10928
10906
"~~~~~"
10929
10907
msgstr ""
10930
10908
10931
#: en/help_topics/configuration.txt:662
10909
#: en/help_topics/configuration.txt:674
10932
10910
msgid ""
10933
10911
"If set to \"True\", the branch should act as a checkout, and push each "
10934
10912
"commit to\n"
10935
10913
"the bound_location. This option is normally set by ``bind``/``unbind``."
10936
10914
msgstr ""
10937
10915
10938
#: en/help_topics/configuration.txt:665
10916
#: en/help_topics/configuration.txt:677
10939
10917
msgid ""
10940
10918
"send_strict\n"
10941
10919
"~~~~~~~~~~~"
10942
10920
msgstr ""
10943
10921
10944
#: en/help_topics/configuration.txt:668
10922
#: en/help_topics/configuration.txt:680
10945
10923
msgid ""
10946
10924
"If present, defines the ``--strict`` option default value for checking\n"
10947
10925
"uncommitted changes before sending a merge directive."
10948
10926
msgstr ""
10949
10927
10950
#: en/help_topics/configuration.txt:671
10928
#: en/help_topics/configuration.txt:683
10951
10929
msgid ""
10952
10930
"add.maximum_file_size\n"
10953
10931
"~~~~~~~~~~~~~~~~~~~~~"
10954
10932
msgstr ""
10955
10933
10956
#: en/help_topics/configuration.txt:674
10934
#: en/help_topics/configuration.txt:686
10957
10935
msgid ""
10958
10936
"Defines the maximum file size the command line \"add\" operation will allow\n"
10959
10937
"in recursive mode, with files larger than this value being skipped. You may "
10965
10943
"will disable skipping."
10966
10944
msgstr ""
10967
10945
10968
#: en/help_topics/configuration.txt:680
10946
#: en/help_topics/configuration.txt:692
10969
10947
msgid ""
10970
10948
"External Merge Tools\n"
10971
10949
"--------------------"
10972
10950
msgstr ""
10973
10951
10974
#: en/help_topics/configuration.txt:683
10952
#: en/help_topics/configuration.txt:695
10975
10953
msgid ""
10976
10954
"bzr.mergetool.<name>\n"
10977
10955
"~~~~~~~~~~~~~~~~~~~~"
10978
10956
msgstr ""
10979
10957
10980
#: en/help_topics/configuration.txt:686
10958
#: en/help_topics/configuration.txt:698
10981
10959
msgid ""
10982
10960
"Defines an external merge tool called <name> with the given command-line.\n"
10983
10961
"Arguments containing spaces should be quoted using single or double quotes. "
10985
10963
"executable may omit its path if it can be found on the PATH."
10986
10964
msgstr ""
10987
10965
10988
#: en/help_topics/configuration.txt:690
10966
#: en/help_topics/configuration.txt:702
10989
10967
msgid ""
10990
10968
"The following markers can be used in the command-line to substitute "
10991
10969
"filenames\n"
10992
10970
"involved in the merge conflict::"
10993
10971
msgstr ""
10994
10972
10995
#: en/help_topics/configuration.txt:693
10973
#: en/help_topics/configuration.txt:705
10996
10974
msgid ""
10997
10975
" {base} file.BASE\n"
10998
10976
" {this} file.THIS\n"
11003
10981
" succeeds."
11004
10982
msgstr ""
11005
10983
11006
#: en/help_topics/configuration.txt:702
10984
#: en/help_topics/configuration.txt:714
11007
10985
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11008
10986
msgstr ""
11009
10987
11010
#: en/help_topics/configuration.txt:704
10988
#: en/help_topics/configuration.txt:716
11011
10989
msgid ""
11012
10990
"bzr.default_mergetool\n"
11013
10991
"~~~~~~~~~~~~~~~~~~~~~"
11014
10992
msgstr ""
11015
10993
11016
#: en/help_topics/configuration.txt:707
10994
#: en/help_topics/configuration.txt:719
11017
10995
msgid ""
11018
10996
"Specifies which external merge tool (as defined above) should be selected "
11019
10997
"by\n"
11020
10998
"default in tools such as ``bzr qconflicts``."
11021
10999
msgstr ""
11022
11000
11023
#: en/help_topics/configuration.txt:712
11001
#: en/help_topics/configuration.txt:724
11024
11002
msgid " bzr.default_mergetool = kdiff3\n"
11025
11003
msgstr ""
11026
11004
11971
11949
"branch can now be pushed to the mainline.\n"
11972
11950
msgstr ""
11973
11951
11952
#: en/help_topics/env-variables.txt:1
11953
msgid "Environment Variables"
11954
msgstr ""
11955
11956
#: en/help_topics/env-variables.txt:3
11957
msgid ""
11958
"=================== "
11959
"===========================================================\n"
11960
"BZRPATH Path where bzr is to look for shell plugin external\n"
11961
" commands.\n"
11962
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11963
"EMAIL E-Mail address of the user.\n"
11964
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11965
"EDITOR Editor for editing commit messages.\n"
11966
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11967
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11968
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11969
"BZR_PLUGIN_PATH.\n"
11970
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11971
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11972
"and\n"
11973
" HOME.\n"
11974
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11975
"URLs).\n"
11976
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11977
"sshcorp,\n"
11978
" plink or lsh.\n"
11979
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11980
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11981
"BZR_COLUMNS Override implicit terminal width.\n"
11982
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11983
"(selftest)\n"
11984
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11985
"'text'.\n"
11986
"BZR_PDB Control whether to launch a debugger on error.\n"
11987
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11988
" breakin debugger.\n"
11989
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11990
"(instead\n"
11991
" of char-based).\n"
11992
"=================== "
11993
"===========================================================\n"
11994
msgstr ""
11995
11974
11996
#: en/help_topics/eol.txt:1
11975
11997
msgid ""
11976
11998
"End of Line Conversion\n"
13854
13876
msgstr ""
13855
13877
13856
13878
#~ msgid ""
13879
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
13880
#~ "delete them if they can easily be recovered using revert otherwise they\n"
13881
#~ "will be backed up (adding an extention of the form .~#~). If no options or\n"
13882
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
13883
#~ "Bazaar but missing in your tree and stop tracking them for you."
13884
#~ msgstr ""
13885
#~ "このコマンドで指定されたファイルの変更をBazaarは管理しなくなります。\n"
13886
#~ "revertでファイルが簡単に復活できる場合は、ファイルは削除されますし、そうで\n"
13887
#~ "ない場合はバックアップ(.~#~という形式の拡張子がつきます)されます。オプション\n"
13888
#~ "やパラメータが指定されていない場合は、バージョン管理されているけれどツリー\n"
13889
#~ "削除されているファイルを探して、そのファイルのバージョン管理を止めます。"
13890
13891
#~ msgid ""
13857
13892
#~ "If unset, the tree root directory name is used as the nickname.\n"
13858
13893
#~ "To print the current nickname, execute with no argument."
13859
13894
#~ msgstr ""
13860
13895
#~ "設定されていない場合は、ツリーのルートディレクトリの名前が\n"
13861
13896
#~ "ニックネームとして扱われます。引数なしで実行すると、現在の\n"
13862
13897
#~ "ニックネームを表示します。"
13898
13899
#~ msgid "Revert files to a previous revision."
13900
#~ msgstr "ファイルを過去のリビジョンに戻します。"
13901
13902
#~ msgid ""
13903
#~ "To remove only some changes, without reverting to a prior version, use\n"
13904
#~ "merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
13905
#~ "will remove the changes introduced by the second last commit (-2), without\n"
13906
#~ "affecting the changes introduced by the last commit (-1). To remove\n"
13907
#~ "certain changes on a hunk-by-hunk basis, see the shelve command."
13908
#~ msgstr ""
13909
#~ "以前のリビジョンに戻さずにいくつかの変更を取り除くには、mergeをかわりに\n"
13910
#~ "使用します。例えば、\"merge . -r -2..-3\" (.を忘れないように)で、最終リビジョン\n"
13911
#~ "(-1)での変更はそのままで、その一つ前のリビジョン(-2)での変更だけを取り\n"
13912
#~ "除くことができます。特定の変更をハンクごと取り除く方法は、shelveをご覧\n"
13913
#~ "ください。"
13914
13915
#~ msgid ""
13916
#~ "By default, any files that have been manually changed will be backed up\n"
13917
#~ "first. (Files changed only by merge are not backed up.) Backup files have\n"
13918
#~ "'.~#~' appended to their name, where # is a number."
13919
#~ msgstr ""
13920
#~ "デフォルトでは、手で変更されたファイルは最初にバックアップされます。(merge\n"
13921
#~ "コマンドで変更されただけのファイルはバックアップされません)バックアップ\n"
13922
#~ "ファイル名は、元の名前に「.~#~」(#は数字)を付け足したものになります。"
13923
13924
#~ msgid ""
13925
#~ "Giving a list of files will revert only those files. Otherwise, all files\n"
13926
#~ "will be reverted. If the revision is not specified with '--revision', the\n"
13927
#~ "last committed revision is used."
13928
#~ msgstr ""
13929
#~ "ファイルのリストを指定すると、そのファイルだけが元に戻されます。\n"
13930
#~ "そうでない場合は、全てのファイルが対象になります。--revisionで\n"
13931
#~ "リビジョンを指定しない場合は、最後にコミットされたリビジョンが使用\n"
13932
#~ "されます。"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1