6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1 |
# Japanese translation for bzr
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2 |
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3 |
# This file is distributed under the same license as the bzr package.
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4 |
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5 |
#
|
6 |
msgid "" |
|
7 |
msgstr "" |
|
8 |
"Project-Id-Version: bzr\n" |
|
9 |
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10 |
"POT-Creation-Date: 2012-07-10 11:35+0200\n" |
6093.4.212
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
11 |
"PO-Revision-Date: 2013-05-21 08:54+0000\n" |
12 |
"Last-Translator: epii <public.epii@gmail.com>\n" |
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13 |
"Language-Team: Japanese <ja@li.org>\n" |
14 |
"MIME-Version: 1.0\n" |
|
15 |
"Content-Type: text/plain; charset=UTF-8\n" |
|
16 |
"Content-Transfer-Encoding: 8bit\n" |
|
17 |
"Plural-Forms: nplurals=1; plural=0;\n" |
|
6093.4.212
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
18 |
"X-Launchpad-Export-Date: 2013-05-22 04:30+0000\n" |
19 |
"X-Generator: Launchpad (build 16626)\n" |
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
20 |
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
21 |
#: bzrlib/add.py:93
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
22 |
msgid "skipping {0} (larger than {1} of {2} bytes)" |
23 |
msgstr "{0} をスキップ ({1} の {2} byte より大きいため)" |
|
24 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
25 |
#: bzrlib/branch.py:854
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
26 |
msgid "Unstacking" |
27 |
msgstr "スタックの解除" |
|
28 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
29 |
#: bzrlib/branch.py:2955
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
30 |
#, python-format
|
31 |
msgid "Pushed up to revision %d." |
|
32 |
msgstr "リビジョン%dまでプッシュしました。" |
|
33 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
34 |
#: bzrlib/branch.py:2957
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
35 |
#, python-format
|
36 |
msgid "%d tag updated." |
|
37 |
msgid_plural "%d tags updated." |
|
38 |
msgstr[0] "%d 個のタグを更新しました" |
|
39 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
40 |
#: bzrlib/branch.py:2960
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
41 |
msgid "No new revisions or tags to push." |
42 |
msgstr "プッシュする新しいリビジョンやタグはありません。" |
|
43 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
44 |
#: bzrlib/branch.py:2962
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
45 |
msgid "No new revisions to push." |
46 |
msgstr "プッシュする新しいリビジョンはありません。" |
|
47 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
48 |
#: bzrlib/branch.py:2982
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
49 |
msgid "checked branch {0} format {1}" |
50 |
msgstr "format {1} のブランチ {0} をチェックしました" |
|
51 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
52 |
#: bzrlib/branch.py:2985
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
53 |
#, python-format
|
54 |
msgid "found error:%s" |
|
55 |
msgstr "検出されたエラー: %s" |
|
56 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
57 |
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
58 |
#, python-format
|
59 |
msgid "Ignoring files outside view. View is %s" |
|
60 |
msgstr "ビューに含まれないファイルは無視します。ビュー:%s" |
|
61 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
62 |
#: bzrlib/builtins.py:260
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
63 |
#, python-format
|
64 |
msgid "bzr %s --revision takes exactly one revision identifier" |
|
65 |
msgstr "bzr %s --revision には、リビジョンIDを一つだけ指定します。" |
|
66 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
67 |
#: bzrlib/builtins.py:315
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
68 |
msgid "Display status summary." |
69 |
msgstr "ステータスのサマリーを表示します。" |
|
70 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
71 |
#: bzrlib/builtins.py:317
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
72 |
msgid "" |
73 |
"This reports on versioned and unknown files, reporting them\n"
|
|
74 |
"grouped by state. Possible states are:"
|
|
75 |
msgstr "" |
|
76 |
"このコマンドは、バージョン管理されたファイルやバージョン管理外ファイル\n"
|
|
77 |
"について、ステータスごとにグルーピングして表示します。\n"
|
|
78 |
"表示されるステータスは以下の通りです。:"
|
|
79 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
80 |
#: bzrlib/builtins.py:320
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
81 |
msgid "" |
82 |
"added\n"
|
|
83 |
" Versioned in the working copy but not in the previous revision."
|
|
84 |
msgstr "" |
|
85 |
"added\n"
|
|
86 |
" 作業コピー内ではバージョン管理されているが、一つ前のリビジョンでは管理\n"
|
|
87 |
" されていない。"
|
|
88 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
89 |
#: bzrlib/builtins.py:323
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
90 |
msgid "" |
91 |
"removed\n"
|
|
92 |
" Versioned in the previous revision but removed or deleted\n"
|
|
93 |
" in the working copy."
|
|
94 |
msgstr "" |
|
95 |
"removed\n"
|
|
96 |
" 一つ前のリビジョンでは管理されているが、作業コピー内では削除されている。"
|
|
97 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
98 |
#: bzrlib/builtins.py:327
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
99 |
msgid "" |
100 |
"renamed\n"
|
|
101 |
" Path of this file changed from the previous revision;\n"
|
|
102 |
" the text may also have changed. This includes files whose\n"
|
|
103 |
" parent directory was renamed."
|
|
104 |
msgstr "" |
|
105 |
"renamed\n"
|
|
106 |
" このファイルのパスは一つ前のリビジョンから変更されている。\n"
|
|
107 |
" 内容も変更されている可能性がある。親ディレクトリが変更されたファイルも\n"
|
|
108 |
" 含む。"
|
|
109 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
110 |
#: bzrlib/builtins.py:332
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
111 |
msgid "" |
112 |
"modified\n"
|
|
113 |
" Text has changed since the previous revision."
|
|
114 |
msgstr "" |
|
115 |
"modified\n"
|
|
116 |
" ファイルの内容が一つ前のリビジョンから変更されている。"
|
|
117 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
118 |
#: bzrlib/builtins.py:335
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
119 |
msgid "" |
120 |
"kind changed\n"
|
|
121 |
" File kind has been changed (e.g. from file to directory)."
|
|
122 |
msgstr "" |
|
123 |
"kind changed\n"
|
|
124 |
" ファイルの種別が変更されている。(ファイルからディレクトリに変わったなど)"
|
|
125 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
126 |
#: bzrlib/builtins.py:338
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
127 |
msgid "" |
128 |
"unknown\n"
|
|
129 |
" Not versioned and not matching an ignore pattern."
|
|
130 |
msgstr "" |
|
131 |
"unknown\n"
|
|
132 |
" バージョン管理されておらず、無視パターンにも一致していない。"
|
|
133 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
134 |
#: bzrlib/builtins.py:341
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
135 |
msgid "" |
136 |
"Additionally for directories, symlinks and files with a changed\n"
|
|
137 |
"executable bit, Bazaar indicates their type using a trailing\n"
|
|
138 |
"character: '/', '@' or '*' respectively. These decorations can be\n" |
|
139 |
"disabled using the '--no-classify' option."
|
|
140 |
msgstr "" |
|
141 |
"さらにディレクトリ、シンボリックリンク、実行可能ファイルについては、\n"
|
|
142 |
"末尾に種別を現す文字としてそれぞれ'/'、'@'、'*'が付加されます。\n"
|
|
143 |
"これを表示しないようにするには、'--no-classify'オプションを指定してください。"
|
|
144 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
145 |
#: bzrlib/builtins.py:346
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
146 |
msgid "" |
147 |
"To see ignored files use 'bzr ignored'. For details on the\n"
|
|
148 |
"changes to file texts, use 'bzr diff'."
|
|
149 |
msgstr "" |
|
150 |
"無視ファイルを見るには'bzr ignored'を使ってください。\n"
|
|
151 |
"ファイルの内容の変更を詳しく見るには、'bzr diff'を使ってください。"
|
|
152 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
153 |
#: bzrlib/builtins.py:349
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
154 |
msgid "" |
155 |
"Note that --short or -S gives status flags for each item, similar\n"
|
|
156 |
"to Subversion's status command. To get output similar to svn -q,\n"
|
|
157 |
"use bzr status -SV."
|
|
158 |
msgstr "" |
|
159 |
"--shortまたは-Sを指定した場合、Subversionのstatusコマンドと同じように\n"
|
|
160 |
"すべてのアイテムにマーカーが表示されることに注意してください。\n"
|
|
161 |
"SVNで-qを指定した場合と同じような形式にするには、bzr status -SV を\n"
|
|
162 |
"使用してください。"
|
|
163 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
164 |
#: bzrlib/builtins.py:353
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
165 |
msgid "" |
166 |
"If no arguments are specified, the status of the entire working\n"
|
|
167 |
"directory is shown. Otherwise, only the status of the specified\n"
|
|
168 |
"files or directories is reported. If a directory is given, status\n"
|
|
169 |
"is reported for everything inside that directory."
|
|
170 |
msgstr "" |
|
171 |
"何も引数を指定しない場合、作業コピー全体のステータスが表示されます。\n"
|
|
172 |
"指定した場合は、指定のファイルやディレクトリのステータスだけが表示\n"
|
|
173 |
"されます。ディレクトリを指定した場合は、そのディレクトリの配下の全ての\n"
|
|
174 |
"ファイルのステータスが表示されます。"
|
|
175 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
176 |
#: bzrlib/builtins.py:358
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
177 |
msgid "" |
178 |
"Before merges are committed, the pending merge tip revisions are\n"
|
|
179 |
"shown. To see all pending merge revisions, use the -v option.\n"
|
|
180 |
"To skip the display of pending merge information altogether, use\n"
|
|
181 |
"the no-pending option or specify a file/directory."
|
|
182 |
msgstr "" |
|
183 |
"マージがコミットされる前には、マージ中のTipリビジョンが表示されます。\n"
|
|
184 |
"すべてのマージ中リビジョンを表示するには、-vオプションを使用します。\n"
|
|
185 |
"マージ中の情報を省略するには、no-pendingオプションを使用するか、\n"
|
|
186 |
"ファイルやディレクトリを指定してください。"
|
|
187 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
188 |
#: bzrlib/builtins.py:363
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
189 |
msgid "" |
190 |
"To compare the working directory to a specific revision, pass a\n"
|
|
191 |
"single revision to the revision argument."
|
|
192 |
msgstr "" |
|
193 |
"作業フォルダと指定リビジョンとを比較するには、リビジョンを一つだけ\n"
|
|
194 |
"引数に指定してください。"
|
|
195 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
196 |
#: bzrlib/builtins.py:366
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
197 |
msgid "" |
198 |
"To see which files have changed in a specific revision, or between\n"
|
|
199 |
"two revisions, pass a revision range to the revision argument.\n"
|
|
200 |
"This will produce the same results as calling 'bzr diff --summarize'."
|
|
201 |
msgstr "" |
|
202 |
"指定されたリビジョンで、もしくは指定された2つのリビジョン間でどのファイルが\n"
|
|
203 |
"変更されたかを見るには、2つのリビジョンを引数に指定してください。\n"
|
|
204 |
"'bzr diff --summarize' でも見ることができます。"
|
|
205 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
206 |
#: bzrlib/builtins.py:375
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
207 |
msgid "Use short status indicators." |
208 |
msgstr "省略形式でステータスを表示します。" |
|
209 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
210 |
#: bzrlib/builtins.py:377
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
211 |
msgid "Only show versioned files." |
212 |
msgstr "バージョン管理されているファイルだけを表示します。" |
|
213 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
214 |
#: bzrlib/builtins.py:379
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
215 |
msgid "Don't show pending merges." |
216 |
msgstr "マージ中の情報を表示しません。" |
|
217 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
218 |
#: bzrlib/builtins.py:382
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
219 |
msgid "Do not mark object type using indicator." |
220 |
msgstr "オブジェクトの種別を表すマーカーを表示しません。" |
|
221 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
222 |
#: bzrlib/builtins.py:397
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
223 |
msgid "bzr status --revision takes exactly one or two revision specifiers" |
224 |
msgstr "bzr status --revisionには、1つか2つのリビジョンを指定します。" |
|
225 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
226 |
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
227 |
msgid "You can only supply one of revision_id or --revision" |
228 |
msgstr "リビジョンIDと--revisionのどちらか一つだけを指定してください。" |
|
229 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
230 |
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
231 |
msgid "You must supply either --revision or a revision_id" |
232 |
msgstr "--revisionとリビジョンIDのどちらかを指定してください。" |
|
233 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
234 |
#: bzrlib/builtins.py:451
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
235 |
#, python-format
|
236 |
msgid "Repository %r does not support access to raw revision texts" |
|
237 |
msgstr "リポジトリ %r はリビジョンのtextへの直接アクセスをサポートしていません" |
|
238 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
239 |
#: bzrlib/builtins.py:462
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
240 |
msgid "The repository {0} contains no revision {1}." |
241 |
msgstr "リポジトリ {0} にはリビジョン {1} はありません。" |
|
242 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
243 |
#: bzrlib/builtins.py:469
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
244 |
msgid "You cannot specify a NULL revision." |
245 |
msgstr "NULLリビジョンは指定できません。" |
|
246 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
247 |
#: bzrlib/builtins.py:561
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
248 |
msgid "Remove the working tree from a given branch/checkout." |
249 |
msgstr "指定されたブランチ/チェックアウトから作業ツリーを削除します。" |
|
250 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
251 |
#: bzrlib/builtins.py:563
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
252 |
msgid "" |
253 |
"Since a lightweight checkout is little more than a working tree\n"
|
|
254 |
"this will refuse to run against one."
|
|
255 |
msgstr "" |
|
256 |
"軽量チェックアウトは作業ツリーよりも小さいため、軽量チェック\n"
|
|
257 |
"アウトに対して実行することはできません。"
|
|
258 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
259 |
#: bzrlib/builtins.py:566
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
260 |
msgid "To re-create the working tree, use \"bzr checkout\"." |
261 |
msgstr "作業ツリーを再作成するには、 \"bzr checkout\" をしてください。" |
|
262 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
263 |
#: bzrlib/builtins.py:572
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
264 |
msgid "" |
265 |
"Remove the working tree even if it has uncommitted or shelved changes."
|
|
266 |
msgstr "作業ツリーが変更されていたり、シェルフされた変更があっても、作業ツリーを削除します。" |
|
267 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
268 |
#: bzrlib/builtins.py:586
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
269 |
msgid "No working tree to remove" |
270 |
msgstr "削除する作業ツリーがありません。" |
|
271 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
272 |
#: bzrlib/builtins.py:588
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
273 |
msgid "You cannot remove the working tree of a remote path" |
274 |
msgstr "リモートの作業ツリーを削除することはできません。" |
|
275 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
276 |
#: bzrlib/builtins.py:597
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
277 |
msgid "You cannot remove the working tree from a lightweight checkout" |
278 |
msgstr "軽量チェックアウトから作業ツリーを削除することはできません。" |
|
279 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
280 |
#: bzrlib/builtins.py:637
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
281 |
msgid "" |
282 |
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
|
|
283 |
"instead. Use \"--force\" if you are sure you want to reset the working tree."
|
|
284 |
msgstr "" |
|
285 |
"ツリーは壊れていないようです。代わりに\"bzr revert\"を実行してください。もし、本当に作業ツリーをリセットしたいのであれば、\"--"
|
|
286 |
"force\"オプションを指定してください。"
|
|
287 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
288 |
#: bzrlib/builtins.py:648
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
289 |
msgid "" |
290 |
", the header appears corrupt, try passing -r -1 to set the state to the last "
|
|
291 |
"commit"
|
|
292 |
msgstr ", ヘッダーが壊れているようです。-r -1を指定して最終コミット時点の状態に戻してください。" |
|
293 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
294 |
#: bzrlib/builtins.py:652
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
295 |
msgid "failed to reset the tree state{0}" |
296 |
msgstr "ツリーの状態をリセットできませんでした。{0}" |
|
297 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
298 |
#: bzrlib/builtins.py:656
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
299 |
msgid "Show current revision number." |
300 |
msgstr "現在のリビジョン番号を表示します。" |
|
301 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
302 |
#: bzrlib/builtins.py:658
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
303 |
msgid "This is equal to the number of revisions on this branch." |
304 |
msgstr "これは、ブランチ内のリビジョンの数と同じです。" |
|
305 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
306 |
#: bzrlib/builtins.py:671
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
307 |
msgid "--tree and --revision can not be used together" |
308 |
msgstr "--tree と --revision は同時に指定できません" |
|
309 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
310 |
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
311 |
msgid "Tags can only be placed on a single revision, not on a range" |
312 |
msgstr "タグは1つのリビジョンにしか指定できません" |
|
313 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
314 |
#: bzrlib/builtins.py:712
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
315 |
msgid "Show revno of working tree." |
316 |
msgstr "作業ツリーのリビジョン番号を表示します。" |
|
317 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
318 |
#: bzrlib/builtins.py:760
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
319 |
msgid "Add specified files or directories." |
320 |
msgstr "指定されたファイルやディレクトリを追加します。" |
|
321 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
322 |
#: bzrlib/builtins.py:762
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
323 |
msgid "" |
324 |
"In non-recursive mode, all the named items are added, regardless\n"
|
|
325 |
"of whether they were previously ignored. A warning is given if\n"
|
|
326 |
"any of the named files are already versioned."
|
|
327 |
msgstr "" |
|
328 |
"non-recursiveモードの場合、無視されていたものも含めて指定されたすべての\n"
|
|
329 |
"アイテムが追加されます。指定されたファイルが既に追加されているものだった\n"
|
|
330 |
"場合は、警告が表示されます。"
|
|
331 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
332 |
#: bzrlib/builtins.py:766
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
333 |
msgid "" |
334 |
"In recursive mode (the default), files are treated the same way\n"
|
|
335 |
"but the behaviour for directories is different. Directories that\n"
|
|
336 |
"are already versioned do not give a warning. All directories,\n"
|
|
337 |
"whether already versioned or not, are searched for files or\n"
|
|
338 |
"subdirectories that are neither versioned or ignored, and these\n"
|
|
339 |
"are added. This search proceeds recursively into versioned\n"
|
|
340 |
"directories. If no names are given '.' is assumed."
|
|
341 |
msgstr "" |
|
342 |
"recursiveモード(デフォルト)の場合は、ファイルの扱いは同じですが、\n"
|
|
343 |
"ディレクトリの扱いは変わります。既に追加されているディレクトリを指定\n"
|
|
344 |
"しても警告にはなりません。バージョン管理されているかどうかにかかわらず、\n"
|
|
345 |
"指定されたすべてのディレクトリ内のファイル、サブディレクトリをチェックして、\n"
|
|
346 |
"バージョン管理対象外でかつ無視されていないものを追加します。\n"
|
|
347 |
"この処理は、バージョン管理されたディレクトリに対して再帰的に実行されます。\n"
|
|
348 |
"何も指定されていない場合は、'.'が指定されたものとみなします。"
|
|
349 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
350 |
#: bzrlib/builtins.py:774
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
351 |
msgid "" |
352 |
"A warning will be printed when nested trees are encountered,\n"
|
|
353 |
"unless they are explicitly ignored."
|
|
354 |
msgstr "ネストしたツリーがあった場合、明示的に無視しない限り警告を表示します。" |
|
355 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
356 |
#: bzrlib/builtins.py:777
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
357 |
msgid "" |
358 |
"Therefore simply saying 'bzr add' will version all files that\n"
|
|
359 |
"are currently unknown."
|
|
360 |
msgstr "" |
|
361 |
"つまり、単に 'bzr add' とした場合は、すべての不明なファイルがバージョン\n"
|
|
362 |
"管理に追加されます。"
|
|
363 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
364 |
#: bzrlib/builtins.py:780
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
365 |
msgid "" |
366 |
"Adding a file whose parent directory is not versioned will\n"
|
|
367 |
"implicitly add the parent, and so on up to the root. This means\n"
|
|
368 |
"you should never need to explicitly add a directory, they'll just\n"
|
|
369 |
"get added when you add a file in the directory."
|
|
370 |
msgstr "" |
|
371 |
"親ディレクトリがバージョン管理外のファイルを追加しようとした場合、自動的に\n"
|
|
372 |
"親ディレクトリや、そのさらに上位のディレクトリも追加されます。つまり、\n"
|
|
373 |
"ディレクトリを明示的に追加する必要はなく、その中にあるファイルを追加すれば\n"
|
|
374 |
"ディレクトリも追加されるということになります。"
|
|
375 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
376 |
#: bzrlib/builtins.py:785
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
377 |
msgid "" |
378 |
"--dry-run will show which files would be added, but not actually\n"
|
|
379 |
"add them."
|
|
380 |
msgstr "" |
|
381 |
"--dry-run を指定すると、どのファイルが追加されるかを表示しますが、実際に追加は\n"
|
|
382 |
"しません。"
|
|
383 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
384 |
#: bzrlib/builtins.py:788
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
385 |
msgid "" |
386 |
"--file-ids-from will try to use the file ids from the supplied path.\n"
|
|
387 |
"It looks up ids trying to find a matching parent directory with the\n"
|
|
388 |
"same filename, and then by pure path. This option is rarely needed\n"
|
|
389 |
"but can be useful when adding the same logical file into two\n"
|
|
390 |
"branches that will be merged later (without showing the two different\n"
|
|
391 |
"adds as a conflict). It is also useful when merging another project\n"
|
|
392 |
"into a subdirectory of this one."
|
|
393 |
msgstr "" |
|
394 |
"--file-ids-fromを指定すると、指定されたパスから得たファイルIDを使おうと\n"
|
|
395 |
"します。対応する親ディレクトリ内の同じ名前のファイルからファイルIDを探し、\n"
|
|
396 |
"無ければ純粋なパスから生成します。このオプションが必要になることはほとんど\n"
|
|
397 |
"ありませんが、同じファイルを、いずれマージする予定の2つのブランチに追加する\n"
|
|
398 |
"場合に便利です(マージの時の衝突を避けられます)。また、別のプロジェクトをサブ\n"
|
|
399 |
"ディレクトリとしてマージする時にも便利です。"
|
|
400 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
401 |
#: bzrlib/builtins.py:796
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
402 |
msgid "" |
403 |
"Any files matching patterns in the ignore list will not be added\n"
|
|
404 |
"unless they are explicitly mentioned."
|
|
405 |
msgstr "" |
|
406 |
"無視パターンにマッチするファイルは、明示的に指定されない限り追加は\n"
|
|
407 |
"されません。"
|
|
408 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
409 |
#: bzrlib/builtins.py:799
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
410 |
msgid "" |
411 |
"In recursive mode, files larger than the configuration option \n"
|
|
412 |
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
|
|
413 |
"to file size."
|
|
414 |
msgstr "" |
|
415 |
"recursiveモードの場合、add.maximum_file_sizeの設定値より大きな\n"
|
|
416 |
"ファイルは追加されません。明示的に指定されたアイテムはファイルサイズに\n"
|
|
417 |
"かかわらず追加されます。"
|
|
418 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
419 |
#: bzrlib/builtins.py:806
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
420 |
msgid "Don't recursively add the contents of directories." |
421 |
msgstr "ディレクトリの内容を再帰的に追加しません。" |
|
422 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
423 |
#: bzrlib/builtins.py:813
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
424 |
msgid "Lookup file ids from this tree." |
425 |
msgstr "このツリーからファイルIDを検索します。" |
|
426 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
427 |
#: bzrlib/builtins.py:849
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
428 |
msgid "ignored {0} matching \"{1}\"\n" |
429 |
msgstr "無視 {0} (\"{1}\"にマッチ)\n" |
|
430 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
431 |
#: bzrlib/builtins.py:854
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
432 |
msgid "Create a new versioned directory." |
433 |
msgstr "バージョン管理されたディレクトリを作成します。" |
|
434 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
435 |
#: bzrlib/builtins.py:856
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
436 |
msgid "This is equivalent to creating the directory and then adding it." |
437 |
msgstr "ディレクトリを作成して、バージョン管理に追加することと同じです。" |
|
438 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
439 |
#: bzrlib/builtins.py:863
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
440 |
msgid "No error if existing, make parent directories as needed." |
441 |
msgstr "" |
|
442 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
443 |
#: bzrlib/builtins.py:897
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
444 |
#, python-format
|
445 |
msgid "added %s\n" |
|
446 |
msgstr "%s が追加されました。\n" |
|
447 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
448 |
#: bzrlib/builtins.py:939
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
449 |
#, python-format
|
450 |
msgid "invalid kind %r specified" |
|
451 |
msgstr "kindが正しくありません。 %s" |
|
452 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
453 |
#: bzrlib/builtins.py:976
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
454 |
msgid "Move or rename a file." |
455 |
msgstr "ファイルの移動や名前の変更を行います。" |
|
456 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
457 |
#: bzrlib/builtins.py:978
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
458 |
msgid " bzr mv SOURCE... DESTINATION" |
459 |
msgstr " bzr mv SOURCE... DESTINATION" |
|
460 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
461 |
#: bzrlib/builtins.py:980
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
462 |
msgid "" |
463 |
"If the last argument is a versioned directory, all the other names\n"
|
|
464 |
"are moved into it. Otherwise, there must be exactly two arguments\n"
|
|
465 |
"and the file is changed to a new name."
|
|
466 |
msgstr "" |
|
467 |
"最後の引数がバージョン管理対象ディレクトリの場合、指定された他の項目は\n"
|
|
468 |
"すべてそのディレクトリの中に移動されます。そうでない場合は、引数の数は\n"
|
|
469 |
"2つでなければならず、ファイルは新しい名前に変更されます。"
|
|
470 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
471 |
#: bzrlib/builtins.py:984
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
472 |
msgid "" |
473 |
"If OLDNAME does not exist on the filesystem but is versioned and\n"
|
|
474 |
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
|
|
475 |
"assumes that the file has been manually moved and only updates\n"
|
|
476 |
"its internal inventory to reflect that change.\n"
|
|
477 |
"The same is valid when moving many SOURCE files to a DESTINATION."
|
|
478 |
msgstr "" |
|
479 |
"OLDNAMEがファイルシステム上に存在せず、かつバージョン管理対象に\n"
|
|
480 |
"なっていて、NEWNAMEはファイルシステム上に存在しているがバージョン\n"
|
|
481 |
"管理対象にはなっていない場合は、ファイルは既に手動で移動済みだとみなし、\n"
|
|
482 |
"内部データへの変更の反映だけを行います。\n"
|
|
483 |
"複数のSOURCEをひとつのDESTINATIONに移動する場合も同じです。"
|
|
484 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
485 |
#: bzrlib/builtins.py:990
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
486 |
msgid "Files cannot be moved between branches." |
487 |
msgstr "ファイルを別のブランチに移動することはできません。" |
|
488 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
489 |
#: bzrlib/builtins.py:997
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
490 |
msgid "" |
491 |
"Move only the bzr identifier of the file, because the file has already been "
|
|
492 |
"moved."
|
|
493 |
msgstr "ファイルは既に移動済みのため、ファイルのBazaar IDだけを移動します。" |
|
494 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
495 |
#: bzrlib/builtins.py:999
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
496 |
msgid "Automatically guess renames." |
497 |
msgstr "変名を自動的に推測します。" |
|
498 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
499 |
#: bzrlib/builtins.py:1000
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
500 |
msgid "Avoid making changes when guessing renames." |
501 |
msgstr "変名を推測する時に、実際には変更を行いません。" |
|
502 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
503 |
#: bzrlib/builtins.py:1009
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
504 |
msgid "--dry-run requires --auto." |
505 |
msgstr "--dry-runは--autoとともに指定してください。" |
|
506 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
507 |
#: bzrlib/builtins.py:1013
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
508 |
msgid "missing file argument" |
509 |
msgstr "ファイルが指定されていません。" |
|
510 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
511 |
#: bzrlib/builtins.py:1017
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
512 |
msgid "can not move root of branch" |
513 |
msgstr "ブランチの root は移動できません。" |
|
514 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
515 |
#: bzrlib/builtins.py:1023
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
516 |
msgid "Only one path may be specified to --auto." |
517 |
msgstr "--autoを指定する場合はパスはひとつだけ指定してください。" |
|
518 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
519 |
#: bzrlib/builtins.py:1026
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
520 |
msgid "--after cannot be specified with --auto." |
521 |
msgstr "--afterと--autoを同時に指定することはできません。" |
|
522 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
523 |
#: bzrlib/builtins.py:1062
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
524 |
msgid "to mv multiple files the destination must be a versioned directory" |
525 |
msgstr "複数のファイルを移動する時は、移動先はバージョン管理されていなければなりません。" |
|
526 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
527 |
#: bzrlib/builtins.py:1114
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
528 |
msgid "Turn this branch into a mirror of another branch." |
529 |
msgstr "このブランチを別のブランチのミラーにします。" |
|
530 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
531 |
#: bzrlib/builtins.py:1116
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
532 |
msgid "" |
533 |
"By default, this command only works on branches that have not diverged.\n"
|
|
534 |
"Branches are considered diverged if the destination branch's most recent \n"
|
|
535 |
"commit is one that has not been merged (directly or indirectly) into the \n"
|
|
536 |
"parent."
|
|
537 |
msgstr "" |
|
538 |
"デフォルトでは、このコマンドは分岐していないブランチでのみ実行できます。\n"
|
|
539 |
"対象のブランチの最新コミットがまだ(直接的または間接的に)親ブランチにマージ\n"
|
|
540 |
"されていなければ、ブランチが分岐しているとみなします。"
|
|
541 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
542 |
#: bzrlib/builtins.py:1121
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
543 |
msgid "" |
544 |
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
|
|
545 |
"from one into the other. Once one branch has merged, the other should\n"
|
|
546 |
"be able to pull it again."
|
|
547 |
msgstr "" |
|
548 |
"ブランチが分岐している場合、その変更を片方からもう片方に統合するために\n"
|
|
549 |
"'bzr merge'を使用することができます。ブランチをマージすれば、またpullできる\n"
|
|
550 |
"ようになるはずです。"
|
|
551 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
552 |
#: bzrlib/builtins.py:1125
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
553 |
msgid "" |
554 |
"If you want to replace your local changes and just want your branch to\n"
|
|
555 |
"match the remote one, use pull --overwrite. This will work even if the two\n"
|
|
556 |
"branches have diverged."
|
|
557 |
msgstr "" |
|
558 |
"もし、リモートの変更内容で手元での変更内容を単純に置き換えたい場合は、\n"
|
|
559 |
"pull --overwriteを使用してください。これは、ブランチ同士が分岐していても\n"
|
|
560 |
"実行できます。"
|
|
561 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
562 |
#: bzrlib/builtins.py:1129
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
563 |
msgid "" |
564 |
"If there is no default location set, the first pull will set it (use\n"
|
|
565 |
"--no-remember to avoid setting it). After that, you can omit the\n"
|
|
566 |
"location to use the default. To change the default, use --remember. The\n"
|
|
567 |
"value will only be saved if the remote location can be accessed."
|
|
568 |
msgstr "" |
|
569 |
"デフォルトのpull対象ブランチが設定されていない場合は、最初にpullした時に\n"
|
|
570 |
"設定されます。(これをしないようにするには、--no-rememberを指定します。)\n"
|
|
571 |
"その後は、デフォルトのブランチを使用する時には指定を省略できるようになり\n"
|
|
572 |
"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモート\n"
|
|
573 |
"ブランチにアクセスできた時だけ保存されます。"
|
|
574 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
575 |
#: bzrlib/builtins.py:1134
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
576 |
msgid "" |
577 |
"The --verbose option will display the revisions pulled using the log_format\n"
|
|
578 |
"configuration option. You can use a different format by overriding it with\n"
|
|
579 |
"-Olog_format=<other_format>."
|
|
580 |
msgstr "" |
|
581 |
"--verbose オプションは pull されたリビジョンを log_format 設定オプションを\n"
|
|
582 |
"利用して表示します。 -Olog_format=<other_format> と指定することで、\n"
|
|
583 |
"別のフォーマットで表示できます。"
|
|
584 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
585 |
#: bzrlib/builtins.py:1138
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
586 |
msgid "" |
587 |
"Note: The location can be specified either in the form of a branch,\n" |
|
588 |
"or in the form of a path to a file containing a merge directive generated\n"
|
|
589 |
"with bzr send."
|
|
590 |
msgstr "" |
|
591 |
"ブランチだけでなく、bzr sendで生成されたマージディレクティブを含むファイル\n"
|
|
592 |
"もpull対象として指定できることに注意してください。"
|
|
593 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
594 |
#: bzrlib/builtins.py:1146
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
595 |
msgid "Show logs of pulled revisions." |
596 |
msgstr "pull対象リビジョンのログを表示します。" |
|
597 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
598 |
#: bzrlib/builtins.py:1148
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
599 |
msgid "" |
600 |
"Branch to pull into, rather than the one containing the working directory."
|
|
601 |
msgstr "作業フォルダの代わりにpullを受け入れるブランチ" |
|
602 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
603 |
#: bzrlib/builtins.py:1151
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
604 |
msgid "" |
605 |
"Perform a local pull in a bound branch. Local pulls are not applied to the "
|
|
606 |
"master branch."
|
|
607 |
msgstr "バインドブランチに対してpullする場合に、マスターブランチには反映しないようにします。" |
|
608 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
609 |
#: bzrlib/builtins.py:1189
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
610 |
msgid "Need working tree for --show-base." |
611 |
msgstr "--show-baseオプションを使用するには作業ツリーが必要です。" |
|
612 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
613 |
#: bzrlib/builtins.py:1205
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
614 |
msgid "No pull location known or specified." |
615 |
msgstr "pull対象ブランチが指定されていません。" |
|
616 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
617 |
#: bzrlib/builtins.py:1211
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
618 |
#, python-format
|
619 |
msgid "Using saved parent location: %s\n" |
|
620 |
msgstr "デフォルトの親ブランチを使用します。: %s\n" |
|
621 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
622 |
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
623 |
msgid "Cannot use -r with merge directives or bundles" |
624 |
msgstr "マージディレクティブやバンドルに対して-rを使用することはできません。" |
|
625 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
626 |
#: bzrlib/builtins.py:1261
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
627 |
msgid "Update a mirror of this branch." |
628 |
msgstr "このブランチのミラーを更新します。" |
|
629 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
630 |
#: bzrlib/builtins.py:1263
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
631 |
msgid "" |
632 |
"The target branch will not have its working tree populated because this\n"
|
|
633 |
"is both expensive, and is not supported on remote file systems."
|
|
634 |
msgstr "" |
|
635 |
"対象のブランチの作業ツリーの更新はコストが高く、リモートファイルシステムでは\n"
|
|
636 |
"サポートされていないため、作業ツリーの更新は行いません。"
|
|
637 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
638 |
#: bzrlib/builtins.py:1266
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
639 |
msgid "" |
640 |
"Some smart servers or protocols *may* put the working tree in place in\n"
|
|
641 |
"the future."
|
|
642 |
msgstr "" |
|
643 |
"将来的に、作業ツリーの更新ができるようなスマートサーバやプロトコルがリリース\n"
|
|
644 |
"*かもしれません*。"
|
|
645 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
646 |
#: bzrlib/builtins.py:1269
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
647 |
msgid "" |
648 |
"This command only works on branches that have not diverged. Branches are\n"
|
|
649 |
"considered diverged if the destination branch's most recent commit is one\n"
|
|
650 |
"that has not been merged (directly or indirectly) by the source branch."
|
|
651 |
msgstr "" |
|
652 |
"このコマンドは、分岐していないブランチ同士でのみ使用できます。push先ブランチ\n"
|
|
653 |
"の最新のコミットが(直接的、もしくは間接的に)push元のブランチにまだマージされて\n"
|
|
654 |
"いない状態の場合に、ブランチが分岐しているとみなされます。"
|
|
655 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
656 |
#: bzrlib/builtins.py:1273
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
657 |
msgid "" |
658 |
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
|
|
659 |
"the other branch completely, discarding its unmerged changes."
|
|
660 |
msgstr "" |
|
661 |
"ブランチ同士が分岐している場合、 'bzr push --overwrite' で、まだマージされて\n"
|
|
662 |
"いない変更を破棄してpush先のブランチを完全に置きかえることができます。"
|
|
663 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
664 |
#: bzrlib/builtins.py:1276
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
665 |
msgid "" |
666 |
"If you want to ensure you have the different changes in the other branch,\n"
|
|
667 |
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
|
|
668 |
"After that you will be able to do a push without '--overwrite'."
|
|
669 |
msgstr "" |
|
670 |
"push先のブランチに違う変更があって、それを残したいなら、まずpush先のブランチ\n"
|
|
671 |
"からマージして(bzr help mergeを参照)コミットしてください。そうすれば、\n"
|
|
672 |
"'--overwrite'の指定なしでpushできるようになります。"
|
|
673 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
674 |
#: bzrlib/builtins.py:1280
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
675 |
msgid "" |
676 |
"If there is no default push location set, the first push will set it (use\n"
|
|
677 |
"--no-remember to avoid setting it). After that, you can omit the\n"
|
|
678 |
"location to use the default. To change the default, use --remember. The\n"
|
|
679 |
"value will only be saved if the remote location can be accessed."
|
|
680 |
msgstr "" |
|
681 |
"デフォルトのpush対象ブランチが設定されていない場合は、最初にpushした時に\n"
|
|
682 |
"設定されます。(これをしないようにするには、--no-rememberを指定します。)\n"
|
|
683 |
"その後は、デフォルトのブランチを使用する時には指定を省略できるようになり\n"
|
|
684 |
"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモートの\n"
|
|
685 |
"ブランチにアクセスできた時だけ保存されます。"
|
|
686 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
687 |
#: bzrlib/builtins.py:1285
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
688 |
msgid "" |
689 |
"The --verbose option will display the revisions pushed using the log_format\n"
|
|
690 |
"configuration option. You can use a different format by overriding it with\n"
|
|
691 |
"-Olog_format=<other_format>."
|
|
692 |
msgstr "" |
|
693 |
"--verbose オプションは push されたリビジョンを log_format 設定オプションを\n"
|
|
694 |
"利用して表示します。 -Olog_format=<other_format> と指定することで、\n"
|
|
695 |
"別のフォーマットで表示できます。"
|
|
696 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
697 |
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
698 |
msgid "" |
699 |
"Branch to push from, rather than the one containing the working directory."
|
|
700 |
msgstr "カレントディレクトリの代わりにpush元とするブランチを指定します。" |
|
701 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
702 |
#: bzrlib/builtins.py:1299
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
703 |
msgid "" |
704 |
"By default push will fail if the target directory exists, but does not "
|
|
705 |
"already have a control directory. This flag will allow push to proceed."
|
|
706 |
msgstr "" |
|
707 |
"デフォルトでは、push先のディレクトリが既に存在しているのにバージョン管理されていない状態の場合はpushできません。このフラグを指定すると、その場合で"
|
|
708 |
"もpushできるようになります。"
|
|
709 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
710 |
#: bzrlib/builtins.py:1304
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
711 |
msgid "" |
712 |
"Create a stacked branch that references the public location of the parent "
|
|
713 |
"branch."
|
|
714 |
msgstr "親ブランチの公開された場所を参照するスタックドブランチを作成します。" |
|
715 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
716 |
#: bzrlib/builtins.py:1307
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
717 |
msgid "" |
718 |
"Create a stacked branch that refers to another branch for the commit "
|
|
719 |
"history. Only the work not present in the referenced branch is included in "
|
|
720 |
"the branch created."
|
|
721 |
msgstr "コミットの履歴を別のブランチから参照するスタックドブランチを作成します。参照先のブランチにない変更だけがこのブランチに含まれます。" |
|
722 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
723 |
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
724 |
msgid "" |
725 |
"Refuse to push if there are uncommitted changes in the working tree, --no-"
|
|
726 |
"strict disables the check."
|
|
727 |
msgstr "" |
|
728 |
"作業コピーが変更されている場合はpushできませんが、--no-strictオプションを指定\n"
|
|
729 |
"するとpushできるようになります。"
|
|
730 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
731 |
#: bzrlib/builtins.py:1315
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
732 |
msgid "Don't populate the working tree, even for protocols that support it." |
733 |
msgstr "作業コピーを更新できるプロトコルを使っている場合でも、更新しません。" |
|
734 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
735 |
#: bzrlib/builtins.py:1318
|
736 |
msgid "Overwrite tags only." |
|
737 |
msgstr "" |
|
738 |
||
739 |
#: bzrlib/builtins.py:1369
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
740 |
msgid "Could not determine branch to refer to." |
741 |
msgstr "参照先のブランチを特定できません。" |
|
742 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
743 |
#: bzrlib/builtins.py:1378
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
744 |
#, python-format
|
745 |
msgid "" |
|
746 |
"No push location known or specified. To push to the parent branch (at %s), "
|
|
747 |
"use 'bzr push :parent'."
|
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
748 |
msgstr "push先が設定も指定もされていません。親ブランチ(%s)にpushする場合は、'bzr push :parent'を使用してください。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
749 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
750 |
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
751 |
msgid "No push location known or specified." |
752 |
msgstr "push先のブランチが設定も指定もされていません。" |
|
753 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
754 |
#: bzrlib/builtins.py:1388
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
755 |
#, python-format
|
756 |
msgid "Using saved push location: %s" |
|
757 |
msgstr "デフォルトのpush先ブランチを使用します。: %s" |
|
758 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
759 |
#: bzrlib/builtins.py:1398
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
760 |
msgid "Create a new branch that is a copy of an existing branch." |
761 |
msgstr "既存のブランチをコピーして新しいブランチを作成します。" |
|
762 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
763 |
#: bzrlib/builtins.py:1400
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
764 |
msgid "" |
765 |
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
|
|
766 |
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
|
|
767 |
"./bar.\n"
|
|
768 |
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
|
|
769 |
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
|
|
770 |
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
|
|
771 |
"create ./foo-bar."
|
|
772 |
msgstr "" |
|
773 |
"TO_LOCATIONが指定されていない場合は、FROM_LOCATIONの最後のパーツが使われます。\n"
|
|
774 |
"つまり、\"branch ../foo/bar\"とした場合は、./barが作られます。\n"
|
|
775 |
"FROM_LOCATIONに、スラッシュやその環境のパスセパレータが含まれていない場合は\n"
|
|
776 |
"FROM_LOCATIONからスキーマやドライブのIDを取り除いたものがTO_LOCATIONになり\n"
|
|
777 |
"ます。例えば、\"branch lp:foo-bar\"とすると、./foo-barが作られます。"
|
|
778 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
779 |
#: bzrlib/builtins.py:1407
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
780 |
msgid "" |
781 |
"To retrieve the branch as of a particular revision, supply the --revision\n"
|
|
782 |
"parameter, as in \"branch foo/bar -r 5\"."
|
|
783 |
msgstr "" |
|
784 |
"ブランチの特定のリビジョンで取り出したい場合は、\"branch foo/bar -r 5\"の\n"
|
|
785 |
"ように--revisionオプションを指定してください。"
|
|
786 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
787 |
#: bzrlib/builtins.py:1410
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
788 |
msgid "The synonyms 'clone' and 'get' for this command are deprecated." |
789 |
msgstr "このコマンドの別名である'clone'と'get'は廃止予定です。" |
|
790 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
791 |
#: bzrlib/builtins.py:1420
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
792 |
msgid "Create a branch without a working-tree." |
793 |
msgstr "作業ツリーのないブランチを作成します。" |
|
794 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
795 |
#: bzrlib/builtins.py:1422
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
796 |
msgid "Switch the checkout in the current directory to the new branch." |
797 |
msgstr "カレントディレクトリにあるチェックアウトの参照先を新しいブランチに切り替えます。" |
|
798 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
799 |
#: bzrlib/builtins.py:1425
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
800 |
msgid "" |
801 |
"Create a stacked branch referring to the source branch. The new branch will "
|
|
802 |
"depend on the availability of the source branch for all operations."
|
|
803 |
msgstr "元のブランチを参照するスタックドブランチを作成します。新しいブランチでは、元のブランチにアクセスできるときしか操作できません。" |
|
804 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
805 |
#: bzrlib/builtins.py:1429
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
806 |
msgid "Do not use a shared repository, even if available." |
807 |
msgstr "共有リポジトリが使える場合でも、共有リポジトリを使いません。" |
|
808 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
809 |
#: bzrlib/builtins.py:1431
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
810 |
msgid "" |
811 |
"By default branch will fail if the target directory exists, but does not "
|
|
812 |
"already have a control directory. This flag will allow branch to proceed."
|
|
813 |
msgstr "" |
|
814 |
"デフォルトでは、branch先のディレクトリが既に存在しているのにバージョン管理されていない場合はbranchできません。このフラグを指定すると、その場合"
|
|
815 |
"でもbranchできるようになります。"
|
|
816 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
817 |
#: bzrlib/builtins.py:1436
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
818 |
msgid "Bind new branch to from location." |
819 |
msgstr "新しいブランチを元のブランチにバインドします。" |
|
820 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
821 |
#: bzrlib/builtins.py:1483
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
822 |
#, python-format
|
823 |
msgid "Target directory \"%s\" already exists." |
|
824 |
msgstr "対象のディレクトリ \"%s\" は既に存在します。" |
|
825 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
826 |
#: bzrlib/builtins.py:1495
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
827 |
#, python-format
|
828 |
msgid "Parent of \"%s\" does not exist." |
|
829 |
msgstr "\"%s\" の親が見つかりません。" |
|
830 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
831 |
#: bzrlib/builtins.py:1514
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
832 |
msgid "The branch {0} has no revision {1}." |
833 |
msgstr "ブランチ {0} にリビジョン {1} はありません。" |
|
834 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
835 |
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
836 |
#, python-format
|
837 |
msgid "Created new stacked branch referring to %s." |
|
838 |
msgstr "%s を参照するスタックドブランチを作成しました。" |
|
839 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
840 |
#: bzrlib/builtins.py:1533
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
841 |
#, python-format
|
842 |
msgid "Branched %d revision." |
|
843 |
msgid_plural "Branched %d revisions." |
|
844 |
msgstr[0] "%d個のリビジョンをブランチしました。" |
|
845 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
846 |
#: bzrlib/builtins.py:1538
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
847 |
#, python-format
|
848 |
msgid "New branch bound to %s" |
|
849 |
msgstr "新しいブランチは %s にバインドされています。" |
|
850 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
851 |
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
852 |
#, python-format
|
853 |
msgid "Switched to branch: %s" |
|
854 |
msgstr "バインド先をスイッチしました。: %s" |
|
855 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
856 |
#: bzrlib/builtins.py:1548
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
857 |
msgid "List the branches available at the current location." |
858 |
msgstr "カレントフォルダにある利用可能なブランチをリストアップします。" |
|
859 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
860 |
#: bzrlib/builtins.py:1550
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
861 |
msgid "" |
862 |
"This command will print the names of all the branches at the current\n"
|
|
863 |
"location."
|
|
864 |
msgstr "このコマンドは、現在の場所にある全てのブランチの名前を表示します。" |
|
865 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
866 |
#: bzrlib/builtins.py:1557
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
867 |
msgid "" |
868 |
"Recursively scan for branches rather than just looking in the specified "
|
|
869 |
"location."
|
|
870 |
msgstr "指定された場所だけでなく、再帰的にブランチを探します。" |
|
871 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
872 |
#: bzrlib/builtins.py:1586
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
873 |
msgid "(default)" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
874 |
msgstr "(デフォルト)" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
875 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
876 |
#: bzrlib/builtins.py:1598
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
877 |
msgid "Create a new checkout of an existing branch." |
878 |
msgstr "既存のブランチのチェックアウトを新しく作成します。" |
|
879 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
880 |
#: bzrlib/builtins.py:1600
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
881 |
msgid "" |
882 |
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
|
|
883 |
"for\n"
|
|
884 |
"the branch found in '.'. This is useful if you have removed the working "
|
|
885 |
"tree\n"
|
|
886 |
"or if it was never created - i.e. if you pushed the branch to its current\n"
|
|
887 |
"location using SFTP."
|
|
888 |
msgstr "" |
|
6093.4.167
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
889 |
"BRANCH_LOCATIONが指定されていない場合は、'.'にあるブランチを再構成します。\n"
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
890 |
"これは、作業ツリーを消してしまった場合や、そもそも作業ツリーが作成されて\n"
|
891 |
"いない場合(例えば、SFTPでpushされたブランチなど)に役立ちます。"
|
|
892 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
893 |
#: bzrlib/builtins.py:1605
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
894 |
msgid "" |
895 |
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
|
|
896 |
"will\n"
|
|
897 |
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
|
|
898 |
"./bar.\n"
|
|
899 |
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
|
|
900 |
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
|
|
901 |
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
|
|
902 |
"create ./foo-bar."
|
|
903 |
msgstr "" |
|
904 |
"TO_LOCATIONが指定されていない場合は、BRANCH_LOCATIONの最後のパーツが使われ\n"
|
|
905 |
"ます。つまり、\"checkout ../foo/bar\"とした場合は、.barが作られます。\n"
|
|
906 |
"BRANCH_LOCATIONに、スラッシュやその環境のパスセパレータが含まれていない場合は\n"
|
|
907 |
"BRANCH_LOCATIONからスキーマやドライブのIDを取り除いたものがTO_LOCATIONになり\n"
|
|
908 |
"ます。例えば、\"branch lp:foo-bar\"とすると、./foo-barが作られます。"
|
|
909 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
910 |
#: bzrlib/builtins.py:1612
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
911 |
msgid "" |
912 |
"To retrieve the branch as of a particular revision, supply the --revision\n"
|
|
913 |
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
|
|
914 |
"immediately\n"
|
|
915 |
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
|
|
916 |
"old\n"
|
|
917 |
"code.)"
|
|
918 |
msgstr "" |
|
919 |
"ブランチの特定のリビジョンで取り出したい場合は、\"checkout foo/bar -r 5\"の\n"
|
|
920 |
"ように--revisionオプションを指定してください。その場合は作業コピーが古い状態に\n"
|
|
921 |
"なるため、コミットはできませんが、例えば古いコードをチェックする場合などに\n"
|
|
922 |
"役立ちます。"
|
|
923 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
924 |
#: bzrlib/builtins.py:1622
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
925 |
msgid "" |
926 |
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
|
|
927 |
"the branch for every operation. Normal checkouts can perform common "
|
|
928 |
"operations like diff and status without such access, and also support local "
|
|
929 |
"commits."
|
|
930 |
msgstr "" |
|
931 |
"軽量チェックアウトを作成します。軽量チェックアウト上での操作には、チェック\n"
|
|
932 |
"アウト元のブランチにアクセスできる必要があります。通常のチェックアウトの\n"
|
|
933 |
"場合は、diffやstatusのような一般的な操作ではその必要はありませんし、ローカル\n"
|
|
934 |
"コミットすることもできます。"
|
|
935 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
936 |
#: bzrlib/builtins.py:1629
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
937 |
msgid "Get file contents from this tree." |
938 |
msgstr "ファイルの内容をこのツリーから取得します。" |
|
939 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
940 |
#: bzrlib/builtins.py:1631
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
941 |
msgid "Hard-link working tree files where possible." |
942 |
msgstr "可能なら、作業コピーをハードリンクします。" |
|
943 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
944 |
#: bzrlib/builtins.py:1672
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
945 |
msgid "" |
946 |
"Show list of renamed files.\n"
|
|
947 |
" "
|
|
948 |
msgstr "" |
|
949 |
"変名されたファイルをリストアップします。\n"
|
|
950 |
" "
|
|
951 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
952 |
#: bzrlib/builtins.py:1700
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
953 |
msgid "Update a working tree to a new revision." |
954 |
msgstr "作業ツリーを新しいリビジョンに更新します。" |
|
955 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
956 |
#: bzrlib/builtins.py:1702
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
957 |
msgid "" |
958 |
"This will perform a merge of the destination revision (the tip of the\n"
|
|
959 |
"branch, or the specified revision) into the working tree, and then make\n"
|
|
960 |
"that revision the basis revision for the working tree. "
|
|
961 |
msgstr "" |
|
962 |
"移動先のリビジョン(ブランチのTipもしくは指定されたリビジョン)を作業ツリーに\n"
|
|
963 |
"マージして、そのリビジョンを作業ツリーのベースリビジョンに設定します。 "
|
|
964 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
965 |
#: bzrlib/builtins.py:1706
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
966 |
msgid "" |
967 |
"You can use this to visit an older revision, or to update a working tree\n"
|
|
968 |
"that is out of date from its branch."
|
|
969 |
msgstr "" |
|
970 |
"古いリビジョンに一時的に移動したり、ブランチより古くなってしまった作業ツリーを\n"
|
|
971 |
"最新の状態にしたりすることができます。"
|
|
972 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
973 |
#: bzrlib/builtins.py:1709
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
974 |
msgid "" |
975 |
"If there are any uncommitted changes in the tree, they will be carried\n"
|
|
976 |
"across and remain as uncommitted changes after the update. To discard\n"
|
|
977 |
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
|
|
978 |
"with the changes brought in by the change in basis revision."
|
|
979 |
msgstr "" |
|
980 |
"作業ツリーにコミットされていない変更があった場合、その変更は update 後も\n"
|
|
981 |
"コミットされていない変更として残ります。これらの変更を取り消すには、\n"
|
|
982 |
"'bzr revert' コマンドを利用してください。コミットされていない変更は、ベース\n"
|
|
983 |
"リビジョンの更新による変更とコンフリクトする可能性があります。"
|
|
984 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
985 |
#: bzrlib/builtins.py:1714
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
986 |
msgid "" |
987 |
"If the tree's branch is bound to a master branch, bzr will also update\n"
|
|
988 |
"the branch from the master."
|
|
989 |
msgstr "" |
|
990 |
"作業ツリーのブランチがマスターブランチに束縛されている場合、bzrは\n"
|
|
991 |
"作業ツリーのブランチもマスターブランチの状態に更新します。"
|
|
992 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
993 |
#: bzrlib/builtins.py:1717
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
994 |
msgid "" |
995 |
"You cannot update just a single file or directory, because each Bazaar\n"
|
|
996 |
"working tree has just a single basis revision. If you want to restore a\n"
|
|
997 |
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
|
|
998 |
"update'. If you want to restore a file to its state in a previous\n"
|
|
999 |
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
|
|
1000 |
"out the old content of that file to a new location."
|
|
1001 |
msgstr "" |
|
1002 |
"Bazaarの作業ツリーはそれぞれベースリビジョンをひとつだけ持っているので、\n"
|
|
1003 |
"ファイルやディレクトリを個別に更新することはできません。もし、手元で削除して\n"
|
|
1004 |
"しまったファイルを元に戻したいのであれば、'bzr update'ではなく'bzr revert'を\n"
|
|
1005 |
"使ってください。もし、ファイルを前のバージョンの状態に戻したいのであれば、\n"
|
|
1006 |
"'bzr revert'に -r オプションを指定するか、'bzr cat'を使って古い内容を書き出して\n"
|
|
1007 |
"ください。"
|
|
1008 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1009 |
#: bzrlib/builtins.py:1724
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1010 |
msgid "" |
1011 |
"The 'dir' argument, if given, must be the location of the root of a\n"
|
|
1012 |
"working tree to update. By default, the working tree that contains the \n"
|
|
1013 |
"current working directory is used."
|
|
1014 |
msgstr "" |
|
1015 |
"dir 引数を指定する場合は、作業ツリーのルートを指定する必要があります。\n"
|
|
1016 |
"デフォルトでは、カレントディレクトリを含む作業ツリーが選択されます。"
|
|
1017 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1018 |
#: bzrlib/builtins.py:1740
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1019 |
msgid "bzr update --revision takes exactly one revision" |
1020 |
msgstr "bzr update --revisionには、リビジョンをひとつだけ指定します。" |
|
1021 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1022 |
#: bzrlib/builtins.py:1748
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1023 |
msgid "bzr update can only update a whole tree, not a file or subdirectory" |
1024 |
msgstr "bzr updateは、個々のファイルやディレクトリではなく、作業ツリー全体を更新します。" |
|
1025 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1026 |
#: bzrlib/builtins.py:1779
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1027 |
msgid "Tree is up to date at revision {0} of branch {1}" |
1028 |
msgstr "ツリーはブランチ {1} のリビジョン {0} で最新の状態です。" |
|
1029 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1030 |
#: bzrlib/builtins.py:1795
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1031 |
#, python-format
|
1032 |
msgid "" |
|
1033 |
"branch has no revision %s\n"
|
|
1034 |
"bzr update --revision only works for a revision in the branch history"
|
|
1035 |
msgstr "" |
|
1036 |
"ブランチには%sというリビジョンはありません。\n"
|
|
1037 |
"bzr update --revisionには、ブランチ内のリビジョンを指定する必要があります。"
|
|
1038 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1039 |
#: bzrlib/builtins.py:1801
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1040 |
msgid "Updated to revision {0} of branch {1}" |
1041 |
msgstr "ブランチ {1} のリビジョン {0} に更新されました。" |
|
1042 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1043 |
#: bzrlib/builtins.py:1805
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1044 |
msgid "" |
1045 |
"Your local commits will now show as pending merges with 'bzr status', and "
|
|
1046 |
"can be committed with 'bzr commit'."
|
|
1047 |
msgstr "ローカルで行った変更は、'bzr status'ではマージ中状態になっており、'bzr commit'でコミットできます。" |
|
1048 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1049 |
#: bzrlib/builtins.py:1814
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1050 |
msgid "Show information about a working tree, branch or repository." |
1051 |
msgstr "作業コピー、ブランチ、リポジトリの情報を表示します。" |
|
1052 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1053 |
#: bzrlib/builtins.py:1816
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1054 |
msgid "" |
1055 |
"This command will show all known locations and formats associated to the\n"
|
|
1056 |
"tree, branch or repository."
|
|
1057 |
msgstr "" |
|
1058 |
"このコマンドは、ツリー、ブランチ、リポジトリに関連する所在やフォーマット\n"
|
|
1059 |
"のすべての情報を表示します。"
|
|
1060 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1061 |
#: bzrlib/builtins.py:1819
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1062 |
msgid "" |
1063 |
"In verbose mode, statistical information is included with each report.\n"
|
|
1064 |
"To see extended statistic information, use a verbosity level of 2 or\n"
|
|
1065 |
"higher by specifying the verbose option multiple times, e.g. -vv."
|
|
1066 |
msgstr "" |
|
1067 |
"verboseモードでは、それぞれのレポートに統計情報が追加されます。さらに\n"
|
|
1068 |
"高度な統計情報を見るには、-vvのようにverboseオプションを複数回指定する\n"
|
|
1069 |
"ことによって、verboseレベル2以上を指定してください。"
|
|
1070 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1071 |
#: bzrlib/builtins.py:1823
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1072 |
msgid "Branches and working trees will also report any missing revisions." |
1073 |
msgstr "ブランチと作業ツリーについては、存在しないリビジョンについても表示されます。" |
|
1074 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1075 |
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
|
1076 |
#: bzrlib/builtins.py:6466
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1077 |
msgid ":Examples:" |
1078 |
msgstr ":例:" |
|
1079 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1080 |
#: bzrlib/builtins.py:1827
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1081 |
msgid " Display information on the format and related locations:" |
1082 |
msgstr " フォーマットと関連する場所についての情報を表示します。" |
|
1083 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1084 |
#: bzrlib/builtins.py:1829
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1085 |
msgid " bzr info" |
1086 |
msgstr " bzr info" |
|
1087 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1088 |
#: bzrlib/builtins.py:1831
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1089 |
msgid "" |
1090 |
" Display the above together with extended format information and\n"
|
|
1091 |
" basic statistics (like the number of files in the working tree and\n"
|
|
1092 |
" number of revisions in the branch and repository):"
|
|
1093 |
msgstr "" |
|
1094 |
" より詳細なフォーマット情報と、基本的な統計情報(作業ツリー内のファイルの\n"
|
|
1095 |
" 数、ブランチ、リポジトリ内のリビジョンの数など)を一緒に表示します。:"
|
|
1096 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1097 |
#: bzrlib/builtins.py:1835
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1098 |
msgid " bzr info -v" |
1099 |
msgstr " bzr info -v" |
|
1100 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1101 |
#: bzrlib/builtins.py:1837
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1102 |
msgid " Display the above together with number of committers to the branch:" |
1103 |
msgstr " さらに、このブランチにコミットした人の数も表示します。:" |
|
1104 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1105 |
#: bzrlib/builtins.py:1839
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1106 |
msgid " bzr info -vv" |
1107 |
msgstr " bzr info -vv" |
|
1108 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1109 |
#: bzrlib/builtins.py:1858
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1110 |
msgid "Remove files or directories." |
1111 |
msgstr "ファイルやディレクトリを削除します。" |
|
1112 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1113 |
#: bzrlib/builtins.py:1860
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1114 |
msgid "" |
1115 |
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
|
|
1116 |
"delete them if they can easily be recovered using revert otherwise they\n"
|
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1117 |
"will be backed up (adding an extension of the form .~#~). If no options or\n"
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1118 |
"parameters are given Bazaar will scan for files that are being tracked by\n"
|
1119 |
"Bazaar but missing in your tree and stop tracking them for you."
|
|
1120 |
msgstr "" |
|
6093.4.212
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1121 |
"これを行うと Bazaar は指定されたファイルの変更のトラックを停止します。\n"
|
1122 |
"これらのファイルが revert を用いて簡単に復元できる場合には削除を\n"
|
|
1123 |
"行いますが、そうでない場合にはバックアップが作られます (.~#~ という\n"
|
|
1124 |
"形の拡張子を付加します)。オプションやパラメータが指定されなかった\n"
|
|
1125 |
"場合には、Bazaar がトラックしているファイルのうち、現在のワーキング\n"
|
|
1126 |
"ツリーに存在しないファイルを検索し、これらのトラックを中止します。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1127 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1128 |
#: bzrlib/builtins.py:1868
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1129 |
msgid "Only remove files that have never been committed." |
1130 |
msgstr "まだコミットされていないファイルだけを削除します。" |
|
1131 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1132 |
#: bzrlib/builtins.py:1870
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1133 |
msgid "The file deletion mode to be used." |
1134 |
msgstr "使用するファイル削除モードです。" |
|
1135 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1136 |
#: bzrlib/builtins.py:1871
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1137 |
msgid "Deletion Strategy" |
1138 |
msgstr "削除モード" |
|
1139 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1140 |
#: bzrlib/builtins.py:1872
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1141 |
msgid "Backup changed files (default)." |
1142 |
msgstr "変更したファイルをバックアップします。" |
|
1143 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1144 |
#: bzrlib/builtins.py:1873
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1145 |
msgid "Delete from bzr but leave the working copy." |
1146 |
msgstr "Bazaarからは削除しますが、作業ツリーには残します。" |
|
1147 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1148 |
#: bzrlib/builtins.py:1874
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1149 |
msgid "Don't backup changed files." |
1150 |
msgstr "変更されたファイルをバックアップしません。" |
|
1151 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1152 |
#: bzrlib/builtins.py:1875
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1153 |
msgid "" |
1154 |
"Delete all the specified files, even if they can not be recovered and even "
|
|
1155 |
"if they are non-empty directories. (deprecated, use no-backup)"
|
|
1156 |
msgstr "" |
|
1157 |
"元に戻せないファイル、空ではないディレクトリも含めて、指定されたアイテムを全て削除します。(廃止予定。no-backupを使用してください)"
|
|
1158 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1159 |
#: bzrlib/builtins.py:1884
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1160 |
msgid "(The --force option is deprecated, rather use --no-backup in future.)" |
1161 |
msgstr "(--forceオプションは廃止予定です。今後は--no-backupを使用してください)" |
|
1162 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1163 |
#: bzrlib/builtins.py:1901
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1164 |
msgid "No matching files." |
1165 |
msgstr "対象のファイルはありませんでした。" |
|
1166 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1167 |
#: bzrlib/builtins.py:1962
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1168 |
msgid "Reconcile bzr metadata in a branch." |
1169 |
msgstr "ブランチ内のBazaarのメタデータを修復します。" |
|
1170 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1171 |
#: bzrlib/builtins.py:1964
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1172 |
msgid "" |
1173 |
"This can correct data mismatches that may have been caused by\n"
|
|
1174 |
"previous ghost operations or bzr upgrades. You should only\n"
|
|
1175 |
"need to run this command if 'bzr check' or a bzr developer\n"
|
|
1176 |
"advises you to run it."
|
|
1177 |
msgstr "" |
|
1178 |
"このコマンドで、オペレーションの失敗やBzrのアップグレードによってできた\n"
|
|
1179 |
"と思われるデータの不整合を修正することができます。'bzr check'の結果や、\n"
|
|
1180 |
"Bzrの開発者からの指示があるとき以外は、実行する必要はありません。"
|
|
1181 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1182 |
#: bzrlib/builtins.py:1969
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1183 |
msgid "" |
1184 |
"If a second branch is provided, cross-branch reconciliation is\n"
|
|
1185 |
"also attempted, which will check that data like the tree root\n"
|
|
1186 |
"id which was not present in very early bzr versions is represented\n"
|
|
1187 |
"correctly in both branches."
|
|
1188 |
msgstr "" |
|
1189 |
"2番目のブランチが指定された場合は、クロスブランチ修復を行います。\n"
|
|
1190 |
"これは、ツリーのルートIDのような、非常に古いバージョンのBzrにはなかった\n"
|
|
1191 |
"データが、両方のブランチに正しく表現されているかをチェックします。"
|
|
1192 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1193 |
#: bzrlib/builtins.py:1974
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1194 |
msgid "" |
1195 |
"At the same time it is run it may recompress data resulting in\n"
|
|
1196 |
"a potential saving in disk space or performance gain."
|
|
1197 |
msgstr "" |
|
1198 |
"同時に、ディスクスペースの節約やパフォーマンスの向上のために、データの\n"
|
|
1199 |
"再圧縮がかかる可能性があります。"
|
|
1200 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1201 |
#: bzrlib/builtins.py:1977
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1202 |
msgid "The branch *MUST* be on a listable system such as local disk or sftp." |
1203 |
msgstr "" |
|
1204 |
"ブランチは、ローカルディスクやsftpのような、リスト可能なシステム上に\n"
|
|
1205 |
"ある*必要があります*。"
|
|
1206 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1207 |
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1208 |
msgid "" |
1209 |
"Format for the bzr 2.0 series.\n"
|
|
1210 |
"Uses group-compress storage.\n"
|
|
1211 |
"Provides rich roots which are a one-way transition.\n"
|
|
1212 |
msgstr "" |
|
1213 |
"bzr 2.0 シリーズのためのフォーマット。\n"
|
|
1214 |
"group-compress ストレージを利用します。\n"
|
|
1215 |
"rich root 機能を提供します。 rich root 機能を提供するフォーマットに変換すると、\n"
|
|
1216 |
"rich root 機能を持たないフォーマットに戻ることはできません。\n"
|
|
1217 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1218 |
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1219 |
msgid "" |
1220 |
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
|
|
1221 |
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
|
|
1222 |
msgstr "" |
|
6093.4.212
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1223 |
"1.x シリーズで使われているパックベースのフォーマット。0.92 で導入されました。0.92 以前の bzr リポジトリと相互運用可能ですが、0.92 "
|
1224 |
"より前の bzr からは読み込むことができません。 "
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1225 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1226 |
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1227 |
msgid "The 2a format with experimental support for colocated branches.\n" |
1228 |
msgstr "colocated branch を実験的にサポートする 2a フォーマット。\n" |
|
1229 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1230 |
#: bzrlib/builtins.py:2045
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1231 |
msgid "Make a directory into a versioned branch." |
1232 |
msgstr "ディレクトリを、バージョン管理されたブランチにします。" |
|
1233 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1234 |
#: bzrlib/builtins.py:2047
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1235 |
msgid "" |
1236 |
"Use this to create an empty branch, or before importing an\n"
|
|
1237 |
"existing project."
|
|
1238 |
msgstr "" |
|
1239 |
"空のブランチを作る場合や、既存のプロジェクトをインポートする前にこの\n"
|
|
1240 |
"コマンドを使用します。"
|
|
1241 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1242 |
#: bzrlib/builtins.py:2050
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1243 |
msgid "" |
1244 |
"If there is a repository in a parent directory of the location, then\n"
|
|
1245 |
"the history of the branch will be stored in the repository. Otherwise\n"
|
|
1246 |
"init creates a standalone branch which carries its own history\n"
|
|
1247 |
"in the .bzr directory."
|
|
1248 |
msgstr "" |
|
1249 |
"親ディレクトリにリポジトリがある場合は、ブランチ内の履歴はリポジトリに\n"
|
|
1250 |
"保存されます。そうでない場合は、履歴を.bzrディレクトリ内に持つスタンド\n"
|
|
1251 |
"アロンブランチが作成されます。"
|
|
1252 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1253 |
#: bzrlib/builtins.py:2055
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1254 |
msgid "" |
1255 |
"If there is already a branch at the location but it has no working tree,\n"
|
|
1256 |
"the tree can be populated with 'bzr checkout'."
|
|
1257 |
msgstr "" |
|
1258 |
"既にブランチがあって、作業ツリーがない場合は、'bzr checkout'でツリーを\n"
|
|
1259 |
"生成することができます。"
|
|
1260 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1261 |
#: bzrlib/builtins.py:2058
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1262 |
msgid "Recipe for importing a tree of files::" |
1263 |
msgstr "ファイルのツリーをインポートするためのレシピ::" |
|
1264 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1265 |
#: bzrlib/builtins.py:2060
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1266 |
msgid "" |
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1267 |
" cd ~/project\n"
|
1268 |
" bzr init\n"
|
|
1269 |
" bzr add .\n"
|
|
1270 |
" bzr status\n"
|
|
1271 |
" bzr commit -m \"imported project\""
|
|
1272 |
msgstr "" |
|
1273 |
" cd ~/project\n"
|
|
1274 |
" bzr init\n"
|
|
1275 |
" bzr add .\n"
|
|
1276 |
" bzr status\n"
|
|
1277 |
" bzr commit -m \"imported project\""
|
|
1278 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1279 |
#: bzrlib/builtins.py:2071
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1280 |
msgid "" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1281 |
"Create the path leading up to the branch if it does not already exist."
|
1282 |
msgstr "ブランチまでのパスが存在していなければ、作成します。" |
|
1283 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1284 |
#: bzrlib/builtins.py:2074
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1285 |
msgid "Specify a format for this branch. See \"help formats\"." |
1286 |
msgstr "ブランチのフォーマットを指定します。\"help formats\"をご覧ください。" |
|
1287 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1288 |
#: bzrlib/builtins.py:2082
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1289 |
msgid "" |
1290 |
"Never change revnos or the existing log. Append revisions to it only."
|
|
1291 |
msgstr "リビジョン番号や既存のログを変更せず、リビジョンの追加だけを行います。" |
|
1292 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1293 |
#: bzrlib/builtins.py:2085
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1294 |
msgid "Create a branch without a working tree." |
1295 |
msgstr "作業ツリーをもたないブランチを作成します。" |
|
1296 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1297 |
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1298 |
#, python-format
|
1299 |
msgid "" |
|
1300 |
"Parent directory of %s does not exist.\n"
|
|
1301 |
"You may supply --create-prefix to create all leading parent directories."
|
|
1302 |
msgstr "" |
|
1303 |
"%s の親ディレクトリがありません。\n"
|
|
1304 |
"--create-prefixを指定すれば、親ディレクトリも作成されます。"
|
|
1305 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1306 |
#: bzrlib/builtins.py:2139
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1307 |
msgid "" |
1308 |
"This branch format cannot be set to append-revisions-only. Try --default."
|
|
1309 |
msgstr "このブランチフォーマットにappend-revisions-onlyは指定できません。--defaultを試してください。" |
|
1310 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1311 |
#: bzrlib/builtins.py:2150
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1312 |
msgid "Created a {0} (format: {1})\n" |
1313 |
msgstr "{0}を作成しました。(フォーマット:{1})\n" |
|
1314 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1315 |
#: bzrlib/builtins.py:2159
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1316 |
#, python-format
|
1317 |
msgid "Using shared repository: %s\n" |
|
1318 |
msgstr "共有リポジトリを使用しました。: %s\n" |
|
1319 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1320 |
#: bzrlib/builtins.py:2163
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1321 |
msgid "Create a shared repository for branches to share storage space." |
1322 |
msgstr "ブランチのストレージを共有するための共有リポジトリを作成します。" |
|
1323 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1324 |
#: bzrlib/builtins.py:2165
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1325 |
msgid "" |
1326 |
"New branches created under the repository directory will store their\n"
|
|
1327 |
"revisions in the repository, not in the branch directory. For branches\n"
|
|
1328 |
"with shared history, this reduces the amount of storage needed and \n"
|
|
1329 |
"speeds up the creation of new branches."
|
|
1330 |
msgstr "" |
|
1331 |
"リポジトリのディレクトリの配下に新しく作られたブランチは、リビジョンを\n"
|
|
1332 |
"ブランチのディレクトリではなくリポジトリに保存します。リビジョンを共有\n"
|
|
1333 |
"しているブランチ同士のストレージサイズが節約され、新しいブランチを作成\n"
|
|
1334 |
"するスピードも速くなります。"
|
|
1335 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1336 |
#: bzrlib/builtins.py:2170
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1337 |
msgid "" |
1338 |
"If the --no-trees option is given then the branches in the repository\n"
|
|
1339 |
"will not have working trees by default. They will still exist as \n"
|
|
1340 |
"directories on disk, but they will not have separate copies of the \n"
|
|
1341 |
"files at a certain revision. This can be useful for repositories that\n"
|
|
1342 |
"store branches which are interacted with through checkouts or remote\n"
|
|
1343 |
"branches, such as on a server."
|
|
1344 |
msgstr "" |
|
1345 |
"--no-treesオプションが指定された場合は、リポジトリ内に作成されたブランチ\n"
|
|
1346 |
"にはデフォルトでは作業ツリーができません。ディスク上にディレクトリとしては\n"
|
|
1347 |
"ありますが、特定リビジョンのファイルのコピーを個々に持つことはありません。\n"
|
|
1348 |
"これは、サーバー上のリポジトリなど、チェックアウトやリモートブランチとやりとり\n"
|
|
1349 |
"するリポジトリの場合に役立ちます。"
|
|
1350 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1351 |
#: bzrlib/builtins.py:2177
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1352 |
msgid "" |
1353 |
":Examples:\n"
|
|
1354 |
" Create a shared repository holding just branches::"
|
|
1355 |
msgstr "" |
|
1356 |
":例:\n"
|
|
1357 |
" ブランチだけをもつリポジトリを作成します。::"
|
|
1358 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1359 |
#: bzrlib/builtins.py:2180
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1360 |
msgid "" |
1361 |
" bzr init-repo --no-trees repo\n"
|
|
1362 |
" bzr init repo/trunk"
|
|
1363 |
msgstr "" |
|
1364 |
" bzr init-repo --no-trees repo\n"
|
|
1365 |
" bzr init repo/trunk"
|
|
1366 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1367 |
#: bzrlib/builtins.py:2183
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1368 |
msgid " Make a lightweight checkout elsewhere::" |
1369 |
msgstr " 別の場所に軽量チェックアウトを作成します。::" |
|
1370 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1371 |
#: bzrlib/builtins.py:2185
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1372 |
msgid "" |
1373 |
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
|
|
1374 |
" cd trunk-checkout\n"
|
|
1375 |
" (add files here)"
|
|
1376 |
msgstr "" |
|
1377 |
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
|
|
1378 |
" cd trunk-checkout\n"
|
|
1379 |
" (ここでファイルを追加)"
|
|
1380 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1381 |
#: bzrlib/builtins.py:2193
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1382 |
msgid "" |
1383 |
"Specify a format for this repository. See \"bzr help formats\" for details."
|
|
1384 |
msgstr "リポジトリのフォーマットを指定します。詳しくは\"bzr help formats\"をご覧ください。" |
|
1385 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1386 |
#: bzrlib/builtins.py:2197
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1387 |
msgid "Repository format" |
1388 |
msgstr "リポジトリフォーマット" |
|
1389 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1390 |
#: bzrlib/builtins.py:2199
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1391 |
msgid "Branches in the repository will default to not having a working tree." |
1392 |
msgstr "リポジトリ内のブランチにはデフォルトでは作業ツリーを持たせません。" |
|
1393 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1394 |
#: bzrlib/builtins.py:2225
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1395 |
msgid "Show differences in the working tree, between revisions or branches." |
1396 |
msgstr "作業ツリーや、リビジョン、ブランチ間の差分を表示します。" |
|
1397 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1398 |
#: bzrlib/builtins.py:2227
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1399 |
msgid "" |
1400 |
"If no arguments are given, all changes for the current tree are listed.\n"
|
|
1401 |
"If files are given, only the changes in those files are listed.\n"
|
|
1402 |
"Remote and multiple branches can be compared by using the --old and\n"
|
|
1403 |
"--new options. If not provided, the default for both is derived from\n"
|
|
1404 |
"the first argument, if any, or the current tree if no arguments are\n"
|
|
1405 |
"given."
|
|
1406 |
msgstr "" |
|
1407 |
"引数が指定されなかった場合は、現在のツリーのすべての変更が表示されます。\n"
|
|
1408 |
"ファイルが指定された場合は、そのファイルの変更だけが表示されます。\n"
|
|
1409 |
"リモートブランチや、複数のブランチを -oldと-newオプションで指定することが\n"
|
|
1410 |
"できます。これらが指定されていない場合は最初の引数が使われ、引数が無い\n"
|
|
1411 |
"場合は作業ツリーが対象になります。"
|
|
1412 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1413 |
#: bzrlib/builtins.py:2234
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1414 |
msgid "" |
1415 |
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
|
|
1416 |
"produces patches suitable for \"patch -p1\"."
|
|
1417 |
msgstr "" |
|
6093.4.182
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1418 |
"\"bzr diff -p1\"は、\"bzr diff --prefix old/:new/\" と同じで、\"patch -p1\"に\n"
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1419 |
"準じたパッチを出力します。"
|
1420 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1421 |
#: bzrlib/builtins.py:2237
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1422 |
msgid "" |
1423 |
"Note that when using the -r argument with a range of revisions, the\n"
|
|
1424 |
"differences are computed between the two specified revisions. That\n"
|
|
1425 |
"is, the command does not show the changes introduced by the first \n"
|
|
1426 |
"revision in the range. This differs from the interpretation of \n"
|
|
1427 |
"revision ranges used by \"bzr log\" which includes the first revision\n"
|
|
1428 |
"in the range."
|
|
1429 |
msgstr "" |
|
1430 |
"-rオプションでリビジョンの範囲を指定した場合は、その2つのリビジョン間での\n"
|
|
1431 |
"差分が取得されることに注意してください。つまり、リビジョンの範囲の開始\n"
|
|
1432 |
"リビジョンでの変更は含まれません。これは、\"bzr log\"にリビジョンの範囲を\n"
|
|
1433 |
"指定した場合の動作(開始リビジョンも含む)とは異なります。"
|
|
1434 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1435 |
#: bzrlib/builtins.py:2244
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1436 |
msgid "" |
1437 |
":Exit values:\n"
|
|
1438 |
" 1 - changed\n"
|
|
1439 |
" 2 - unrepresentable changes\n"
|
|
1440 |
" 3 - error\n"
|
|
1441 |
" 0 - no change"
|
|
1442 |
msgstr "" |
|
1443 |
":Exit values:\n"
|
|
1444 |
" 1 - 変更あり\n"
|
|
1445 |
" 2 - 表示できない変更\n"
|
|
1446 |
" 3 - エラー\n"
|
|
1447 |
" 0 - 変更なし"
|
|
1448 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1449 |
#: bzrlib/builtins.py:2250
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1450 |
msgid "" |
1451 |
":Examples:\n"
|
|
1452 |
" Shows the difference in the working tree versus the last commit::"
|
|
1453 |
msgstr "" |
|
1454 |
":例:\n"
|
|
1455 |
" 最新のコミットと作業ツリーとの間の変更を表示します。::"
|
|
1456 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1457 |
#: bzrlib/builtins.py:2253
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1458 |
msgid " bzr diff" |
1459 |
msgstr " bzr diff" |
|
1460 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1461 |
#: bzrlib/builtins.py:2255
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1462 |
msgid " Difference between the working tree and revision 1::" |
1463 |
msgstr " 作業ツリーとリビジョン1を比較します。::" |
|
1464 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1465 |
#: bzrlib/builtins.py:2257
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1466 |
msgid " bzr diff -r1" |
1467 |
msgstr " bzr diff -r1" |
|
1468 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1469 |
#: bzrlib/builtins.py:2259
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1470 |
msgid " Difference between revision 3 and revision 1::" |
1471 |
msgstr " リビジョン3とリビジョン1を比較します。::" |
|
1472 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1473 |
#: bzrlib/builtins.py:2261
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1474 |
msgid " bzr diff -r1..3" |
1475 |
msgstr " bzr diff -r1..3" |
|
1476 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1477 |
#: bzrlib/builtins.py:2263
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1478 |
msgid " Difference between revision 3 and revision 1 for branch xxx::" |
1479 |
msgstr " ブランチxxxのリビジョン3とリビジョン1を比較します。::" |
|
1480 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1481 |
#: bzrlib/builtins.py:2265
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1482 |
msgid " bzr diff -r1..3 xxx" |
1483 |
msgstr " bzr diff -r1..3 xxx" |
|
1484 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1485 |
#: bzrlib/builtins.py:2267
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1486 |
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::" |
1487 |
msgstr " リビジョン2での変更です。(-r1..2 と同じです。)::" |
|
1488 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1489 |
#: bzrlib/builtins.py:2269
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1490 |
msgid " bzr diff -c2" |
1491 |
msgstr " bzr diff -c2" |
|
1492 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1493 |
#: bzrlib/builtins.py:2271
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1494 |
msgid "" |
1495 |
" To see the changes introduced by revision X::\n"
|
|
1496 |
" \n"
|
|
1497 |
" bzr diff -cX"
|
|
1498 |
msgstr "" |
|
1499 |
" リビジョンXでの変更を見るには、::\n"
|
|
1500 |
" \n"
|
|
1501 |
" bzr diff -cX"
|
|
1502 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1503 |
#: bzrlib/builtins.py:2275
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1504 |
msgid "" |
1505 |
" Note that in the case of a merge, the -c option shows the changes\n"
|
|
1506 |
" compared to the left hand parent. To see the changes against\n"
|
|
1507 |
" another parent, use::"
|
|
1508 |
msgstr "" |
|
1509 |
" マージされたリビジョンの場合は、-cオプションは左側の親からの変更を表示する\n"
|
|
1510 |
" ことに注意してください。他の親からの変更を見るには、以下のようにします。::"
|
|
1511 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1512 |
#: bzrlib/builtins.py:2279
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1513 |
msgid " bzr diff -r<chosen_parent>..X" |
1514 |
msgstr " bzr diff -r<対象の親リビジョン>..X" |
|
1515 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1516 |
#: bzrlib/builtins.py:2281
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1517 |
msgid "" |
1518 |
" The changes between the current revision and the previous revision\n"
|
|
1519 |
" (equivalent to -c-1 and -r-2..-1)"
|
|
1520 |
msgstr " 現在のリビジョンと一つ前のリビジョンとの差分です。(-c-1 、 -r-2..-1 と同じ)" |
|
1521 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1522 |
#: bzrlib/builtins.py:2284
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1523 |
msgid " bzr diff -r-2.." |
1524 |
msgstr " bzr diff -r-2.." |
|
1525 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1526 |
#: bzrlib/builtins.py:2286
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1527 |
msgid " Show just the differences for file NEWS::" |
1528 |
msgstr " ファイルNEWSの変更だけを表示します。::" |
|
1529 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1530 |
#: bzrlib/builtins.py:2288
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1531 |
msgid " bzr diff NEWS" |
1532 |
msgstr " bzr diff NEWS" |
|
1533 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1534 |
#: bzrlib/builtins.py:2290
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1535 |
msgid " Show the differences in working tree xxx for file NEWS::" |
1536 |
msgstr " 作業ツリーxxxの、ファイルNEWSの変更内容を表示します。::" |
|
1537 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1538 |
#: bzrlib/builtins.py:2292
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1539 |
msgid " bzr diff xxx/NEWS" |
1540 |
msgstr " bzr diff xxx/NEWS" |
|
1541 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1542 |
#: bzrlib/builtins.py:2294
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1543 |
msgid " Show the differences from branch xxx to this working tree:" |
1544 |
msgstr " ブランチxxxと作業ツリーとの間の差分を表示します。::" |
|
1545 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1546 |
#: bzrlib/builtins.py:2296
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1547 |
msgid " bzr diff --old xxx" |
1548 |
msgstr " bzr diff --old xxx" |
|
1549 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1550 |
#: bzrlib/builtins.py:2298
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1551 |
msgid " Show the differences between two branches for file NEWS::" |
1552 |
msgstr " 2つのブランチ間での、ファイルNEWSの差分を表示します。::" |
|
1553 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1554 |
#: bzrlib/builtins.py:2300
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1555 |
msgid " bzr diff --old xxx --new yyy NEWS" |
1556 |
msgstr " bzr diff --old xxx --new yyy NEWS" |
|
1557 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1558 |
#: bzrlib/builtins.py:2302
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1559 |
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::" |
1560 |
msgstr " 'bzr diff'と同じですが、プレフィックスold/、new/を付加します。::" |
|
1561 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1562 |
#: bzrlib/builtins.py:2304
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1563 |
msgid "" |
1564 |
" bzr diff --prefix old/:new/\n"
|
|
1565 |
" \n"
|
|
1566 |
" Show the differences using a custom diff program with options::\n"
|
|
1567 |
" \n"
|
|
1568 |
" bzr diff --using /usr/bin/diff --diff-options -wu"
|
|
1569 |
msgstr "" |
|
1570 |
" bzr diff --prefix old/:new/\n"
|
|
1571 |
" \n"
|
|
1572 |
" カスタムのdiffプログラムにオプションを指定して、差分を表示します。::\n"
|
|
1573 |
" \n"
|
|
1574 |
" bzr diff --using /usr/bin/diff --diff-options -wu"
|
|
1575 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1576 |
#: bzrlib/builtins.py:2314
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1577 |
msgid "Pass these options to the external diff program." |
1578 |
msgstr "これらのオプションは外部のdiffプログラムに渡されます。" |
|
1579 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1580 |
#: bzrlib/builtins.py:2317
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1581 |
msgid "" |
1582 |
"Set prefixes added to old and new filenames, as two values separated by a "
|
|
1583 |
"colon. (eg \"old/:new/\")."
|
|
1584 |
msgstr "古いファイル名と新しいファイル名にプレフィックスを追加します。2つの値をコロンで区切って指定します。(例 \"old/:new/\")" |
|
1585 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1586 |
#: bzrlib/builtins.py:2320
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1587 |
msgid "Branch/tree to compare from." |
1588 |
msgstr "比較元のブランチ/作業ツリーです。" |
|
1589 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1590 |
#: bzrlib/builtins.py:2324
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1591 |
msgid "Branch/tree to compare to." |
1592 |
msgstr "比較先のブランチ/作業ツリーです。" |
|
1593 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1594 |
#: bzrlib/builtins.py:2330
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1595 |
msgid "Use this command to compare files." |
1596 |
msgstr "ファイル比較に使うコマンドです。" |
|
1597 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1598 |
#: bzrlib/builtins.py:2335
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1599 |
msgid "Diff format to use." |
1600 |
msgstr "使用するDiffフォーマットです。" |
|
1601 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1602 |
#: bzrlib/builtins.py:2337
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1603 |
msgid "Diff format" |
1604 |
msgstr "Diffフォーマット" |
|
1605 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1606 |
#: bzrlib/builtins.py:2359
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1607 |
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")" |
1608 |
msgstr "--prefix は2つの値をコロンで区切ったものにしてください。 (例 \"old/:new/\")" |
|
1609 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1610 |
#: bzrlib/builtins.py:2363
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1611 |
msgid "bzr diff --revision takes exactly one or two revision specifiers" |
1612 |
msgstr "bzr diff --revision には1つまたは2つのリビジョンを指定してください。" |
|
1613 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1614 |
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
|
1615 |
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1616 |
msgid "{0} and {1} are mutually exclusive" |
1617 |
msgstr "{0} と {1} を同時に指定することはできません。" |
|
1618 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1619 |
#: bzrlib/builtins.py:2388
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1620 |
msgid "" |
1621 |
"List files deleted in the working tree.\n"
|
|
1622 |
" "
|
|
1623 |
msgstr "" |
|
1624 |
"作業ツリー上で削除されたファイルをリストアップします。\n"
|
|
1625 |
" "
|
|
1626 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1627 |
#: bzrlib/builtins.py:2465
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1628 |
msgid "Show the tree root directory." |
1629 |
msgstr "ツリーのルートディレクトリを表示します。" |
|
1630 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1631 |
#: bzrlib/builtins.py:2467
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1632 |
msgid "" |
1633 |
"The root is the nearest enclosing directory with a .bzr control\n"
|
|
1634 |
"directory."
|
|
1635 |
msgstr "ルートとは、.bzr管理ディレクトリを持つ、一番近い上位ディレクトリのことです。" |
|
1636 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1637 |
#: bzrlib/builtins.py:2482
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1638 |
msgid "The limit argument must be an integer." |
1639 |
msgstr "limitは整数でなければなりません。" |
|
1640 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1641 |
#: bzrlib/builtins.py:2490
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1642 |
msgid "The levels argument must be an integer." |
1643 |
msgstr "levelsは整数でなければなりません。" |
|
1644 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1645 |
#: bzrlib/builtins.py:2495
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1646 |
msgid "Show historical log for a branch or subset of a branch." |
1647 |
msgstr "ブランチ、もしくはブランチの一部の履歴ログを表示します。" |
|
1648 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1649 |
#: bzrlib/builtins.py:2497
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1650 |
msgid "" |
1651 |
"log is bzr's default tool for exploring the history of a branch.\n"
|
|
1652 |
"The branch to use is taken from the first parameter. If no parameters\n"
|
|
1653 |
"are given, the branch containing the working directory is logged.\n"
|
|
1654 |
"Here are some simple examples::"
|
|
1655 |
msgstr "" |
|
1656 |
"logは、ブランチの履歴を見るためのbzrのデフォルトのツールです。\n"
|
|
1657 |
"対象のブランチは1つ目の引数で指定します。引数が指定されていなければ、\n"
|
|
1658 |
"作業ディレクトリを含むブランチの履歴が表示されます。\n"
|
|
1659 |
"簡単な例を以下に示します。::"
|
|
1660 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1661 |
#: bzrlib/builtins.py:2502
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1662 |
msgid "" |
1663 |
" bzr log log the current branch\n"
|
|
1664 |
" bzr log foo.py log a file in its branch\n"
|
|
1665 |
" bzr log http://server/branch log a branch on a server"
|
|
1666 |
msgstr "" |
|
1667 |
" bzr log は、現在のブランチの履歴を表示します。\n"
|
|
1668 |
" bzr log foo,py は、ブランチ内のファイルの履歴を表示します。\n"
|
|
1669 |
" bzr log http://server/branch は、サーバ上のブランチのログを表示します。"
|
|
1670 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1671 |
#: bzrlib/builtins.py:2506
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1672 |
msgid "" |
1673 |
"The filtering, ordering and information shown for each revision can\n"
|
|
1674 |
"be controlled as explained below. By default, all revisions are\n"
|
|
1675 |
"shown sorted (topologically) so that newer revisions appear before\n"
|
|
1676 |
"older ones and descendants always appear before ancestors. If displayed,\n"
|
|
1677 |
"merged revisions are shown indented under the revision in which they\n"
|
|
1678 |
"were merged."
|
|
1679 |
msgstr "" |
|
1680 |
"フィルタリング、並び替え、各リビジョンに表示する情報については、以下のように\n"
|
|
1681 |
"変更できます。デフォルトでは、全てのリビジョンが(トポロジカルに)ソートされ、\n"
|
|
1682 |
"新しいリビジョンは古いリビジョンより前に、子孫のリビジョンは先祖より前に配置\n"
|
|
1683 |
"されます。マージされたリビジョンを表示する場合は、マージ先のリビジョンよりも\n"
|
|
1684 |
"インデントされて表示されます。"
|
|
1685 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1686 |
#: bzrlib/builtins.py:2513
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1687 |
msgid ":Output control:" |
1688 |
msgstr ":出力のコントロール:" |
|
1689 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1690 |
#: bzrlib/builtins.py:2515
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1691 |
msgid "" |
1692 |
" The log format controls how information about each revision is\n"
|
|
1693 |
" displayed. The standard log formats are called ``long``, ``short``\n"
|
|
1694 |
" and ``line``. The default is long. See ``bzr help log-formats``\n"
|
|
1695 |
" for more details on log formats."
|
|
1696 |
msgstr "" |
|
1697 |
" ログフォーマットの指定によって、各リビジョンの情報がどう表示されるかを\n"
|
|
1698 |
" コントロールします。標準のログフォーマットには ``long`` 、``short`` 、 ``line``\n"
|
|
1699 |
" があります。デフォルトはlongです。ログフォーマットについての詳細は\n"
|
|
1700 |
" ``bzr help log-formats`` をご覧ください。"
|
|
1701 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1702 |
#: bzrlib/builtins.py:2520
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1703 |
msgid "" |
1704 |
" The following options can be used to control what information is\n"
|
|
1705 |
" displayed::"
|
|
1706 |
msgstr " 以下のオプションで、どの情報を表示するかをコントロールできます。" |
|
1707 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1708 |
#: bzrlib/builtins.py:2523
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1709 |
msgid "" |
1710 |
" -l N display a maximum of N revisions\n"
|
|
1711 |
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
|
|
1712 |
" -v display a status summary (delta) for each revision\n"
|
|
1713 |
" -p display a diff (patch) for each revision\n"
|
|
1714 |
" --show-ids display revision-ids (and file-ids), not just revnos"
|
|
1715 |
msgstr "" |
|
1716 |
" -l N 最大N個のリビジョンを表示します。\n"
|
|
1717 |
" -n N Nレベルのリビジョンを表示します。(0で全て、1でメインラインのみ)\n"
|
|
1718 |
" -v ステータスのサマリ(差分)を各リビジョンに表示します。\n"
|
|
1719 |
" -p Diff(patch)を各リビジョンに表示します。\n"
|
|
1720 |
" --show-ids リビジョン番号だけでなく、リビジョンIDとファイルIDも表示します。」"
|
|
1721 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1722 |
#: bzrlib/builtins.py:2529
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1723 |
msgid "" |
1724 |
" Note that the default number of levels to display is a function of the\n"
|
|
1725 |
" log format. If the -n option is not used, the standard log formats show\n"
|
|
1726 |
" just the top level (mainline)."
|
|
1727 |
msgstr "" |
|
1728 |
" デフォルトの表示レベルは、ログフォーマットの機能であることに注意してください。\n"
|
|
1729 |
" -nオプションが使用されない場合は、標準のログフォーマットはトップレベル(メイン\n"
|
|
1730 |
" ライン)だけを表示します。"
|
|
1731 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1732 |
#: bzrlib/builtins.py:2533
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1733 |
msgid "" |
1734 |
" Status summaries are shown using status flags like A, M, etc. To see\n"
|
|
1735 |
" the changes explained using words like ``added`` and ``modified``\n"
|
|
1736 |
" instead, use the -vv option."
|
|
1737 |
msgstr "" |
|
1738 |
" ステータスのサマリは、A、Mなどのフラグで表示されます。 かわりに ``added``、\n"
|
|
1739 |
" ``modified`` などの単語で表示するには、-vvオプションを使用してください。"
|
|
1740 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1741 |
#: bzrlib/builtins.py:2537
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1742 |
msgid ":Ordering control:" |
1743 |
msgstr ":表示順のコントロール:" |
|
1744 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1745 |
#: bzrlib/builtins.py:2539
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1746 |
msgid "" |
1747 |
" To display revisions from oldest to newest, use the --forward option.\n"
|
|
1748 |
" In most cases, using this option will have little impact on the total\n"
|
|
1749 |
" time taken to produce a log, though --forward does not incrementally\n"
|
|
1750 |
" display revisions like --reverse does when it can."
|
|
1751 |
msgstr "" |
|
1752 |
" 古いリビジョンから新しいリビジョンの順で表示するには、 --forwardオプションを\n"
|
|
1753 |
" 使います。--forwardは、--reverseのようにログをインクリメンタルに表示はしません\n"
|
|
1754 |
"が、たいていの場合、ログ表示にかかる時間への影響はわずかです。"
|
|
1755 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1756 |
#: bzrlib/builtins.py:2544
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1757 |
msgid ":Revision filtering:" |
1758 |
msgstr ":リビジョンのフィルタリング:" |
|
1759 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1760 |
#: bzrlib/builtins.py:2546
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1761 |
msgid "" |
1762 |
" The -r option can be used to specify what revision or range of revisions\n"
|
|
1763 |
" to filter against. The various forms are shown below::"
|
|
1764 |
msgstr "" |
|
1765 |
" -rオプションで、どのリビジョン、もしくはリビジョンの範囲を表示するかを指定する\n"
|
|
1766 |
" ことができます。いろいろな例を以下に示します。::"
|
|
1767 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1768 |
#: bzrlib/builtins.py:2549
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1769 |
msgid "" |
1770 |
" -rX display revision X\n"
|
|
1771 |
" -rX.. display revision X and later\n"
|
|
1772 |
" -r..Y display up to and including revision Y\n"
|
|
1773 |
" -rX..Y display from X to Y inclusive"
|
|
1774 |
msgstr "" |
|
1775 |
" -rX リビジョンXを表示\n"
|
|
1776 |
" -rX.. リビジョンX以降を表示\n"
|
|
1777 |
" -r..Y リビジョンY以前(Yを含む)を表示\n"
|
|
1778 |
" -rX..Y リビジョンXからY(X、Yを含む)を表示"
|
|
1779 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1780 |
#: bzrlib/builtins.py:2554
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1781 |
msgid "" |
1782 |
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
|
|
1783 |
" Some common examples are given below::"
|
|
1784 |
msgstr "" |
|
1785 |
" X、Yの指定方法の詳細は、 ``bzr help revisionspec`` を参照してください。\n"
|
|
1786 |
" よくある例を以下に示します。::"
|
|
1787 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1788 |
#: bzrlib/builtins.py:2557
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1789 |
msgid "" |
1790 |
" -r-1 show just the tip\n"
|
|
1791 |
" -r-10.. show the last 10 mainline revisions\n"
|
|
1792 |
" -rsubmit:.. show what's new on this branch\n"
|
|
1793 |
" -rancestor:path.. show changes since the common ancestor of this\n"
|
|
1794 |
" branch and the one at location path\n"
|
|
1795 |
" -rdate:yesterday.. show changes since yesterday"
|
|
1796 |
msgstr "" |
|
1797 |
" -r-1 Tipだけを表示\n"
|
|
1798 |
" -r-10.. メインラインの最新10リビジョンを表示\n"
|
|
1799 |
" -rsubmit:.. このブランチでの変更内容を表示\n"
|
|
1800 |
" -rancestor:path.. このブランチと別のブランチとの分岐点からの\n"
|
|
1801 |
" 変更を表示\n"
|
|
1802 |
" -rdate:yesterday.. 昨日からの変更を表示"
|
|
1803 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1804 |
#: bzrlib/builtins.py:2564
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1805 |
msgid "" |
1806 |
" When logging a range of revisions using -rX..Y, log starts at\n"
|
|
1807 |
" revision Y and searches back in history through the primary\n"
|
|
1808 |
" (\"left-hand\") parents until it finds X. When logging just the\n"
|
|
1809 |
" top level (using -n1), an error is reported if X is not found\n"
|
|
1810 |
" along the way. If multi-level logging is used (-n0), X may be\n"
|
|
1811 |
" a nested merge revision and the log will be truncated accordingly."
|
|
1812 |
msgstr "" |
|
1813 |
" -rX..Yでリビジョンの範囲を指定した場合、ログはリビジョンYから始まって\n"
|
|
1814 |
" メインの(左側の)親をXに到達するまで遡ります。トップレベルだけを表示\n"
|
|
6093.4.169
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1815 |
" する場合(-n1を使用)、Xがそのルートに見つからなければエラーが発生します。\n"
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1816 |
" 他段階のログ(-n0を使用)を表示する場合は、Xは入れ子になったマージ\n"
|
1817 |
" リビジョンの中に見つかるかもしれません。その場合、ログは適切に切り捨て\n"
|
|
1818 |
" られます。"
|
|
1819 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1820 |
#: bzrlib/builtins.py:2571
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1821 |
msgid ":Path filtering:" |
1822 |
msgstr ":パスのフィルタリング:" |
|
1823 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1824 |
#: bzrlib/builtins.py:2573
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1825 |
msgid "" |
1826 |
" If parameters are given and the first one is not a branch, the log\n"
|
|
1827 |
" will be filtered to show only those revisions that changed the\n"
|
|
1828 |
" nominated files or directories."
|
|
1829 |
msgstr "" |
|
1830 |
" パラメータが指定されていて、一つ目のパラメータがブランチではない場合、\n"
|
|
1831 |
" 指定されたファイル、ディレクトリが変更されたリビジョンだけが表示されます。"
|
|
1832 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1833 |
#: bzrlib/builtins.py:2577
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1834 |
msgid "" |
1835 |
" Filenames are interpreted within their historical context. To log a\n"
|
|
1836 |
" deleted file, specify a revision range so that the file existed at\n"
|
|
1837 |
" the end or start of the range."
|
|
1838 |
msgstr "" |
|
1839 |
" ファイル名は、履歴のコンテキスト内で解釈されます。削除されたファイルの\n"
|
|
1840 |
" ログを表示するには、そのファイルが存在したリビジョンを、リビジョンの範囲\n"
|
|
1841 |
" の最初か最後に指定してください。"
|
|
1842 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1843 |
#: bzrlib/builtins.py:2581
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1844 |
msgid "" |
1845 |
" Historical context is also important when interpreting pathnames of\n"
|
|
1846 |
" renamed files/directories. Consider the following example:"
|
|
1847 |
msgstr "" |
|
1848 |
" 履歴のコンテキストは、変名されたファイルやディレクトリのパス名を解釈する\n"
|
|
1849 |
" 際にも重要になります。以下の例を考えてください。:"
|
|
1850 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1851 |
#: bzrlib/builtins.py:2584
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1852 |
msgid "" |
1853 |
" * revision 1: add tutorial.txt\n"
|
|
1854 |
" * revision 2: modify tutorial.txt\n"
|
|
1855 |
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
|
|
1856 |
msgstr "" |
|
1857 |
" * リビジョン 1: tutorial.txt を追加\n"
|
|
1858 |
" * リビジョン 2: tutorial.txt\n"
|
|
1859 |
" * リビジョン 3: tutorial.txt を guide.txt に変名し、add tutorial.txt を追加"
|
|
1860 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1861 |
#: bzrlib/builtins.py:2588
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1862 |
msgid " In this case:" |
1863 |
msgstr " この場合:" |
|
1864 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1865 |
#: bzrlib/builtins.py:2590
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1866 |
msgid " * ``bzr log guide.txt`` will log the file added in revision 1" |
1867 |
msgstr " * ``bzr log guide.txt`` は、リビジョン1で追加されたファイルを表示します。" |
|
1868 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1869 |
#: bzrlib/builtins.py:2592
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1870 |
msgid "" |
1871 |
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
|
|
1872 |
msgstr " * ``bzr log tutorial.txt`` は、リビジョン3で追加された新しいファイルを表示します。" |
|
1873 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1874 |
#: bzrlib/builtins.py:2594
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1875 |
msgid "" |
1876 |
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
|
|
1877 |
" the original file in revision 2."
|
|
1878 |
msgstr "" |
|
1879 |
" * ``bzr log -r2 -p tutorial.txt`` は、元のファイルのリビジョン2での変更\n"
|
|
1880 |
" を表示します。"
|
|
1881 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1882 |
#: bzrlib/builtins.py:2597
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1883 |
msgid "" |
1884 |
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
|
|
1885 |
" was no file called guide.txt in revision 2."
|
|
1886 |
msgstr "" |
|
1887 |
" * ``bzr log -r2 -p guide.txt`` は、リビジョン2にはguide.txtというファイルはない\n"
|
|
1888 |
" というエラーを表示します。"
|
|
1889 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1890 |
#: bzrlib/builtins.py:2600
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1891 |
msgid "" |
1892 |
" Renames are always followed by log. By design, there is no need to\n"
|
|
1893 |
" explicitly ask for this (and no way to stop logging a file back\n"
|
|
1894 |
" until it was last renamed)."
|
|
1895 |
msgstr "" |
|
1896 |
" 変名は常に履歴に表示されます。明示的に指定する必要はありません。(また、\n"
|
|
1897 |
" 最後に変名される以前のログを切り捨てる方法もありません)"
|
|
1898 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1899 |
#: bzrlib/builtins.py:2604
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1900 |
msgid ":Other filtering:" |
1901 |
msgstr ":その他のフィルタリング:" |
|
1902 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1903 |
#: bzrlib/builtins.py:2606
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1904 |
msgid "" |
1905 |
" The --match option can be used for finding revisions that match a\n"
|
|
1906 |
" regular expression in a commit message, committer, author or bug.\n"
|
|
1907 |
" Specifying the option several times will match any of the supplied\n"
|
|
1908 |
" expressions. --match-author, --match-bugs, --match-committer and\n"
|
|
1909 |
" --match-message can be used to only match a specific field."
|
|
1910 |
msgstr "" |
|
1911 |
" --matchオプションで、正規表現にコミットメッセージ、コミッター、著者、バグが\n"
|
|
1912 |
" マッチするリビジョンを検索することができます。オプションを複数回指定した\n"
|
|
1913 |
" 場合は、どれかひとつにマッチすれば検索されます。--match-author、\n"
|
|
1914 |
" --match-bug、--match-committer、--match-messageで、指定したフィールド\n"
|
|
1915 |
" だけを検索対象にすることができます。"
|
|
1916 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1917 |
#: bzrlib/builtins.py:2612
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1918 |
msgid ":Tips & tricks:" |
1919 |
msgstr ":Tips & tricks:" |
|
1920 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1921 |
#: bzrlib/builtins.py:2614
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1922 |
msgid "" |
1923 |
" GUI tools and IDEs are often better at exploring history than command\n"
|
|
1924 |
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
|
|
1925 |
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
|
|
1926 |
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
|
|
1927 |
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
|
|
1928 |
msgstr "" |
|
1929 |
" 履歴を見るには、CUIよりもGUIやIDEの方がいいことも多いでしょう。qlog、\n"
|
|
1930 |
" qbzrやbzr-gtkのビジュアライゼーション、bzr-explorerシェル、LoggerHead\n"
|
|
1931 |
" のWebインターフェイスなどが気に入るかもしれまん。プラグインガイド\n"
|
|
1932 |
" <http://doc.bazaar.canonical.com/plugins/en/> や、\n"
|
|
1933 |
" <http://wiki.bazaar.canonical.com/IDEIntegration> をご覧ください。 "
|
|
1934 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1935 |
#: bzrlib/builtins.py:2620
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1936 |
msgid "" |
1937 |
" You may find it useful to add the aliases below to ``bazaar.conf``::"
|
|
1938 |
msgstr " ``bazaar.conf`` に以下のようなエイリアスを追加しておくと便利です。::" |
|
1939 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1940 |
#: bzrlib/builtins.py:2622
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1941 |
msgid "" |
1942 |
" [ALIASES]\n"
|
|
1943 |
" tip = log -r-1\n"
|
|
1944 |
" top = log -l10 --line\n"
|
|
1945 |
" show = log -v -p"
|
|
1946 |
msgstr "" |
|
1947 |
" [ALIASES]\n"
|
|
1948 |
" tip = log -r-1\n"
|
|
1949 |
" top = log -l10 --line\n"
|
|
1950 |
" show = log -v -p"
|
|
1951 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1952 |
#: bzrlib/builtins.py:2627
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1953 |
msgid "" |
1954 |
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
|
|
1955 |
" will show the last 10 mainline revisions. To see the details of a\n"
|
|
1956 |
" particular revision X, ``bzr show -rX``."
|
|
1957 |
msgstr "" |
|
1958 |
" ``bzr tip`` は最新のリビジョンを表示し、 ``bzr top`` はメインラインの最新の\n"
|
|
1959 |
" 10リビジョンを表示します。特定のリビジョンXの詳細を見るには、 ``bzr show -X``\n"
|
|
1960 |
" を使用します。"
|
|
1961 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1962 |
#: bzrlib/builtins.py:2631
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1963 |
msgid "" |
1964 |
" If you are interested in looking deeper into a particular merge X,\n"
|
|
1965 |
" use ``bzr log -n0 -rX``."
|
|
1966 |
msgstr " 特定のマージXについて詳しく見たい場合は、 ``bzr log -n0 -rX`` を使用します。" |
|
1967 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1968 |
#: bzrlib/builtins.py:2634
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1969 |
msgid "" |
1970 |
" ``bzr log -v`` on a branch with lots of history is currently\n"
|
|
1971 |
" very slow. A fix for this issue is currently under development.\n"
|
|
1972 |
" With or without that fix, it is recommended that a revision range\n"
|
|
1973 |
" be given when using the -v option."
|
|
1974 |
msgstr "" |
|
1975 |
" 多くのリビジョンを持つブランチで ``bzr log -v`` を実行するのは、今の\n"
|
|
1976 |
" ところ非常に遅いです。この問題の修正は現在対応中ですが、いずれに\n"
|
|
1977 |
" しても、-vオプションを指定するときはリビジョンの範囲を指定することを\n"
|
|
1978 |
" おすすめします。"
|
|
1979 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1980 |
#: bzrlib/builtins.py:2639
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1981 |
msgid "" |
1982 |
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
|
|
1983 |
" used to find revisions matching user names, commit messages, etc.\n"
|
|
1984 |
" Among other features, this plugin can find all revisions containing\n"
|
|
1985 |
" a list of words but not others."
|
|
1986 |
msgstr "" |
|
1987 |
" bzrには、包括的な全文検索マッチをするbzr-searchというプラグインがあり、\n"
|
|
1988 |
" ユーザ名、コミットメッセージなどでリビジョンを検索することができます。\n"
|
|
1989 |
" 他の機能とはちがい、このプラグインでは単語のリストを含むすべての\n"
|
|
1990 |
" リビジョンを検索することができます。"
|
|
1991 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1992 |
#: bzrlib/builtins.py:2644
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
1993 |
msgid "" |
1994 |
" When exploring non-mainline history on large projects with deep\n"
|
|
1995 |
" history, the performance of log can be greatly improved by installing\n"
|
|
1996 |
" the historycache plugin. This plugin buffers historical information\n"
|
|
1997 |
" trading disk space for faster speed."
|
|
1998 |
msgstr "" |
|
1999 |
" 深い履歴をもつ大規模なプロジェクトで、メインライン以外の履歴を見る場合は、\n"
|
|
2000 |
" historycacheプラグインをインストールすることでパフォーマンスを大きく改善\n"
|
|
2001 |
" することができます。このプラグインは、履歴情報をキャッシュして、ディスク\n"
|
|
2002 |
" スペースと引き換えに高速なパフォーマンスをもたらします。"
|
|
2003 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2004 |
#: bzrlib/builtins.py:2653
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2005 |
msgid "Show from oldest to newest." |
2006 |
msgstr "古い方から新しい方へ表示する" |
|
2007 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2008 |
#: bzrlib/builtins.py:2656
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2009 |
msgid "Show files changed in each revision." |
2010 |
msgstr "各リビジョンでのファイルの変更を表示する" |
|
2011 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2012 |
#: bzrlib/builtins.py:2662
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2013 |
msgid "Show just the specified revision. See also \"help revisionspec\"." |
2014 |
msgstr "指定されたリビジョンだけを表示する。 ``help revisionspec``を参照" |
|
2015 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2016 |
#: bzrlib/builtins.py:2666
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2017 |
msgid "What names to list as authors - first, all or committer." |
2018 |
msgstr "誰を作者として表示するか - first、all、またはcommitter" |
|
2019 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2020 |
#: bzrlib/builtins.py:2667
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2021 |
msgid "Authors" |
2022 |
msgstr "作者" |
|
2023 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2024 |
#: bzrlib/builtins.py:2672
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2025 |
msgid "Number of levels to display - 0 for all, 1 for flat." |
2026 |
msgstr "表示するレベル。-0で全て、1で1階層" |
|
2027 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2028 |
#: bzrlib/builtins.py:2682
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2029 |
msgid "Limit the output to the first N revisions." |
2030 |
msgstr "最初のNリビジョンだけを出力する" |
|
2031 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2032 |
#: bzrlib/builtins.py:2687
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2033 |
msgid "Show changes made in each revision as a patch." |
2034 |
msgstr "各リビジョンでの変更をパッチとして表示" |
|
2035 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2036 |
#: bzrlib/builtins.py:2689
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2037 |
msgid "Show merged revisions like --levels 0 does." |
2038 |
msgstr "--levels 0 と同じようにマージされたリビジョンを表示する" |
|
2039 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2040 |
#: bzrlib/builtins.py:2693
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2041 |
msgid "Do not report commits with more than one parent." |
2042 |
msgstr "複数の親を持つコミットを表示しない" |
|
2043 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2044 |
#: bzrlib/builtins.py:2695
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2045 |
msgid "" |
2046 |
"Display only the revisions that are not part of both ancestries (require -"
|
|
2047 |
"rX..Y)."
|
|
2048 |
msgstr "共通の先祖に含まれないリビジョンだけを表示(-rX..Yを使用する必要がある)" |
|
2049 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2050 |
#: bzrlib/builtins.py:2699
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2051 |
msgid "Show digital signature validity." |
2052 |
msgstr "デジタル署名を表示" |
|
2053 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2054 |
#: bzrlib/builtins.py:2702
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2055 |
msgid "Show revisions whose properties match this expression." |
2056 |
msgstr "この表現にマッチするプロパティのリビジョンを表示" |
|
2057 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2058 |
#: bzrlib/builtins.py:2706
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2059 |
msgid "Show revisions whose message matches this expression." |
2060 |
msgstr "この表現にマッチするメッセージのリビジョンを表示" |
|
2061 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2062 |
#: bzrlib/builtins.py:2710
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2063 |
msgid "Show revisions whose committer matches this expression." |
2064 |
msgstr "コミッタが指定された表現にマッチするリビジョンを表示する" |
|
2065 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2066 |
#: bzrlib/builtins.py:2714
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2067 |
msgid "Show revisions whose authors match this expression." |
2068 |
msgstr "作者が指定された表現にマッチするリビジョンを表示する" |
|
2069 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2070 |
#: bzrlib/builtins.py:2718
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2071 |
msgid "Show revisions whose bugs match this expression." |
2072 |
msgstr "バグ情報が指定された表現にマッチするリビジョンを表示します" |
|
2073 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2074 |
#: bzrlib/builtins.py:2772
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2075 |
msgid "--exclude-common-ancestry requires -r with two revisions" |
2076 |
msgstr "--exclude-common-ancestryには、-rで2つのリビジョンを指定する必要があります。" |
|
2077 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2078 |
#: bzrlib/builtins.py:2800
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2079 |
#, python-format
|
2080 |
msgid "Path unknown at end or start of revision range: %s" |
|
2081 |
msgstr "最後のリビジョンにも最初のリビジョンにもパスが見つかりません: %s" |
|
2082 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2083 |
#: bzrlib/builtins.py:2917
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2084 |
#, python-format
|
2085 |
msgid "bzr %s doesn't accept two revisions in different branches." |
|
2086 |
msgstr "bzr %s には、異なるブランチ上の2つのリビジョンは指定できません。" |
|
2087 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2088 |
#: bzrlib/builtins.py:2933
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2089 |
#, python-format
|
2090 |
msgid "bzr %s --revision takes one or two values." |
|
2091 |
msgstr "bzr %s --revision は1つまたは2つの値を取ります。" |
|
2092 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2093 |
#: bzrlib/builtins.py:2978
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2094 |
msgid "" |
2095 |
"List files in a tree.\n"
|
|
2096 |
" "
|
|
2097 |
msgstr "" |
|
2098 |
"ツリー内のファイルをリストアップします。\n"
|
|
2099 |
" "
|
|
2100 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2101 |
#: bzrlib/builtins.py:2987
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2102 |
msgid "Recurse into subdirectories." |
2103 |
msgstr "サブディレクトリも再帰で処理します。" |
|
2104 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2105 |
#: bzrlib/builtins.py:2989
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2106 |
msgid "Print paths relative to the root of the branch." |
2107 |
msgstr "ブランチのルートからの相対パスを表示します。" |
|
2108 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2109 |
#: bzrlib/builtins.py:2991
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2110 |
msgid "Print unknown files." |
2111 |
msgstr "バージョン管理外のファイルを表示します。" |
|
2112 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2113 |
#: bzrlib/builtins.py:2992
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2114 |
msgid "Print versioned files." |
2115 |
msgstr "バージョン管理されたファイルを表示します。" |
|
2116 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2117 |
#: bzrlib/builtins.py:2995
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2118 |
msgid "Print ignored files." |
2119 |
msgstr "無視されたファイルを表示します。" |
|
2120 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2121 |
#: bzrlib/builtins.py:2997
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2122 |
msgid "List entries of a particular kind: file, directory, symlink." |
2123 |
msgstr "指定された種別のアイテム(ファイル、ディレクトリ、シンボリックリンク)を表示します。" |
|
2124 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2125 |
#: bzrlib/builtins.py:3010
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2126 |
msgid "invalid kind specified" |
2127 |
msgstr "無効な種別が指定されました。" |
|
2128 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2129 |
#: bzrlib/builtins.py:3013
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2130 |
msgid "Cannot set both --verbose and --null" |
2131 |
msgstr "--verboseと--nullを同時に指定することはできません。" |
|
2132 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2133 |
#: bzrlib/builtins.py:3022
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2134 |
msgid "cannot specify both --from-root and PATH" |
2135 |
msgstr "--from-rootとPATHを同時に指定することはできません。" |
|
2136 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2137 |
#: bzrlib/builtins.py:3109
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2138 |
msgid "Ignore specified files or patterns." |
2139 |
msgstr "指定されたファイルやパターンを無視します。" |
|
2140 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2141 |
#: bzrlib/builtins.py:3111
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2142 |
msgid "See ``bzr help patterns`` for details on the syntax of patterns." |
2143 |
msgstr "パターンの書き方の詳細は ``bzr help patterns`` をご覧ください。" |
|
2144 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2145 |
#: bzrlib/builtins.py:3113
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2146 |
msgid "" |
2147 |
"If a .bzrignore file does not exist, the ignore command\n"
|
|
2148 |
"will create one and add the specified files or patterns to the newly\n"
|
|
2149 |
"created file. The ignore command will also automatically add the \n"
|
|
2150 |
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
|
|
2151 |
"the use of the ignore command will require an explicit add command."
|
|
2152 |
msgstr "" |
|
2153 |
".bzrignoreファイルが存在しない場合は、ignoreコマンドはそれを作成して、\n"
|
|
2154 |
"指定されたファイルやパターンを追加します。また、.bzrignoreファイルは\n"
|
|
2155 |
"ignoreコマンドで自動的にバージョン管理に追加されます。ignoreコマンドを\n"
|
|
2156 |
"使わずに.bzrignoreファイルを手で作成した場合は、明示的にaddコマンドを\n"
|
|
2157 |
"呼ぶ必要があります。"
|
|
2158 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2159 |
#: bzrlib/builtins.py:3119
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2160 |
msgid "" |
2161 |
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
|
|
2162 |
"After adding, editing or deleting that file either indirectly by\n"
|
|
2163 |
"using this command or directly by using an editor, be sure to commit\n"
|
|
2164 |
"it."
|
|
2165 |
msgstr "" |
|
2166 |
"無視リストからパターンを削除するには、.bzrignoreファイルを編集します。\n"
|
|
2167 |
"ignoreコマンドやエディタでこのファイルのエントリを追加、編集、削除した\n"
|
|
2168 |
"場合は、忘れずにコミットしてください。"
|
|
2169 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2170 |
#: bzrlib/builtins.py:3124
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2171 |
msgid "" |
2172 |
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
|
|
2173 |
"the global ignore file can be found in the application data directory as\n"
|
|
2174 |
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n" |
|
2175 |
"Global ignores are not touched by this command. The global ignore file\n"
|
|
2176 |
"can be edited directly using an editor."
|
|
2177 |
msgstr "" |
|
2178 |
"Bazaarは、グローバルな無視ファイル ~/.bazaar/ignore もサポートしています。\n"
|
|
2179 |
"Windowsでは、このファイルはApplication Data ディレクトリにあります。\n"
|
|
2180 |
"(C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore)\n"
|
|
2181 |
"このファイルをこのコマンドで編集することはできないので、直接エディタで編集\n"
|
|
2182 |
"してください。"
|
|
2183 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2184 |
#: bzrlib/builtins.py:3130
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2185 |
msgid "" |
2186 |
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
|
|
2187 |
"precedence over regular ignores. Such exceptions are used to specify\n"
|
|
2188 |
"files that should be versioned which would otherwise be ignored."
|
|
2189 |
msgstr "" |
|
2190 |
"!で始まるパターンは、無視指定からの除外を表し、通常の無視指定よりも\n"
|
|
2191 |
"優先されます。これは、普通なら無視されるはずのファイルをバージョン管理\n"
|
|
2192 |
"の対象とするために使います。"
|
|
2193 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2194 |
#: bzrlib/builtins.py:3134
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2195 |
msgid "" |
2196 |
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
|
|
2197 |
"precedence over the '!' exception patterns."
|
|
2198 |
msgstr "" |
|
2199 |
"!!で始まるパターンは、通常の無視指定として扱われますが、!による除外\n"
|
|
2200 |
"パターンよりも優先されます。"
|
|
2201 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2202 |
#: bzrlib/builtins.py:3137
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2203 |
msgid "" |
2204 |
":Notes: \n"
|
|
2205 |
" \n"
|
|
2206 |
"* Ignore patterns containing shell wildcards must be quoted from\n"
|
|
2207 |
" the shell on Unix."
|
|
2208 |
msgstr "" |
|
2209 |
":注意: \n"
|
|
2210 |
" \n"
|
|
2211 |
"*シェルのワイルドカードをふくむ無視パターンを指定するときには、Unixシェル\n"
|
|
2212 |
" による引用符でくくる必要があります。"
|
|
2213 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2214 |
#: bzrlib/builtins.py:3142
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2215 |
msgid "" |
2216 |
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
|
|
2217 |
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
|
|
2218 |
msgstr "" |
|
2219 |
"* #で始まる無視パターンは、無視ファイル中のコメントとして扱われます。\n"
|
|
2220 |
" #で始まるファイルを無視したい場合は、\"RE:\"プレフィックスを使ってください。"
|
|
2221 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2222 |
#: bzrlib/builtins.py:3145
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2223 |
msgid "" |
2224 |
":Examples:\n"
|
|
2225 |
" Ignore the top level Makefile::"
|
|
2226 |
msgstr "" |
|
2227 |
":例:\n"
|
|
2228 |
" トップレベルのMakefileを無視する::"
|
|
2229 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2230 |
#: bzrlib/builtins.py:3148
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2231 |
msgid " bzr ignore ./Makefile" |
2232 |
msgstr " bzr ignore ./Makefile" |
|
2233 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2234 |
#: bzrlib/builtins.py:3150
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2235 |
msgid " Ignore .class files in all directories...::" |
2236 |
msgstr " すべてのディレクトリの.classファイルを無視するが...::" |
|
2237 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2238 |
#: bzrlib/builtins.py:3152
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2239 |
msgid " bzr ignore \"*.class\"" |
2240 |
msgstr " bzr ignore \"*.class\"" |
|
2241 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2242 |
#: bzrlib/builtins.py:3154
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2243 |
msgid " ...but do not ignore \"special.class\"::" |
2244 |
msgstr " ...\"special.class\" は無視しない::" |
|
2245 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2246 |
#: bzrlib/builtins.py:3156
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2247 |
msgid " bzr ignore \"!special.class\"" |
2248 |
msgstr " bzr ignore \"!special.class\"" |
|
2249 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2250 |
#: bzrlib/builtins.py:3158
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2251 |
msgid " Ignore files whose name begins with the \"#\" character::" |
2252 |
msgstr " #で始まるファイルを無視する::" |
|
2253 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2254 |
#: bzrlib/builtins.py:3160
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2255 |
msgid " bzr ignore \"RE:^#\"" |
2256 |
msgstr " bzr ignore \"RE:^#\"" |
|
2257 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2258 |
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2259 |
msgid " Ignore .o files under the lib directory::" |
2260 |
msgstr " libディレクトリ配下の.oファイルを無視する::" |
|
2261 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2262 |
#: bzrlib/builtins.py:3164
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2263 |
msgid " bzr ignore \"lib/**/*.o\"" |
2264 |
msgstr " bzr ignore \"lib/**/*.o\"" |
|
2265 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2266 |
#: bzrlib/builtins.py:3168
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2267 |
msgid " bzr ignore \"RE:lib/.*\\.o\"" |
2268 |
msgstr " bzr ignore \"RE:lib/.*\\.o\"" |
|
2269 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2270 |
#: bzrlib/builtins.py:3170
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2271 |
msgid " Ignore everything but the \"debian\" toplevel directory::" |
2272 |
msgstr " \"debian\"トップレベルディレクトリ以外の全てを無視する::" |
|
2273 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2274 |
#: bzrlib/builtins.py:3172
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2275 |
msgid "" |
2276 |
" bzr ignore \"RE:(?!debian/).*\"\n"
|
|
2277 |
" \n"
|
|
2278 |
" Ignore everything except the \"local\" toplevel directory,\n"
|
|
2279 |
" but always ignore autosave files ending in ~, even under local/::\n"
|
|
2280 |
" \n"
|
|
2281 |
" bzr ignore \"*\"\n"
|
|
2282 |
" bzr ignore \"!./local\"\n"
|
|
2283 |
" bzr ignore \"!!*~\""
|
|
2284 |
msgstr "" |
|
2285 |
" bzr ignore \"RE:(?!debian/).*\"\n"
|
|
2286 |
" \n"
|
|
2287 |
" ”local”トップレベルディレクトリ配下以外の全てを無視する,\n"
|
|
2288 |
" ただし、~で終わる自動セーブファイルは、local/配下であっても無視する::\n"
|
|
2289 |
" \n"
|
|
2290 |
" bzr ignore \"*\"\n"
|
|
2291 |
" bzr ignore \"!./local\"\n"
|
|
2292 |
" bzr ignore \"!!*~\""
|
|
2293 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2294 |
#: bzrlib/builtins.py:3186
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2295 |
msgid "Display the default ignore rules that bzr uses." |
2296 |
msgstr "bzrが使用するデフォルトの無視ルールを表示します。" |
|
2297 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2298 |
#: bzrlib/builtins.py:3198
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2299 |
msgid "ignore requires at least one NAME_PATTERN or --default-rules." |
2300 |
msgstr "ignoreにはNAME_PATTERNか--default-rulesのどちらかは指定する必要があります。" |
|
2301 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2302 |
#: bzrlib/builtins.py:3209
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2303 |
#, python-format
|
2304 |
msgid "Invalid ignore pattern found. %s" |
|
2305 |
msgid_plural "Invalid ignore patterns found. %s" |
|
2306 |
msgstr[0] "無効な無視パターンが見つかりました。 %s" |
|
2307 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2308 |
#: bzrlib/builtins.py:3218
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2309 |
msgid "NAME_PATTERN should not be an absolute path" |
2310 |
msgstr "NAME_PATTERNに絶対パスは指定できません。" |
|
2311 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2312 |
#: bzrlib/builtins.py:3231
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2313 |
#, python-format
|
2314 |
msgid "" |
|
2315 |
"Warning: the following files are version controlled and match your ignore " |
|
2316 |
"pattern:\n" |
|
2317 |
"%s\n"
|
|
2318 |
"These files will continue to be version controlled unless you 'bzr remove' "
|
|
2319 |
"them.\n"
|
|
2320 |
msgstr "" |
|
2321 |
"注意: 以下のファイルはバージョン管理されていますが、無視パターンにマッチしました。:\n"
|
|
2322 |
"%s\n"
|
|
2323 |
"これらのファイルは、'bzr remove'しない限りはバージョン管理されたままです。\n"
|
|
2324 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2325 |
#: bzrlib/builtins.py:3238
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2326 |
msgid "List ignored files and the patterns that matched them." |
2327 |
msgstr "無視するファイルとそれらにマッチするパターンの一覧を表示する。" |
|
2328 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2329 |
#: bzrlib/builtins.py:3240
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2330 |
msgid "" |
2331 |
"List all the ignored files and the ignore pattern that caused the file to\n"
|
|
2332 |
"be ignored."
|
|
2333 |
msgstr "無視されるファイルと、それがどのパターンによって無視されているかを一覧で表示します。" |
|
2334 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2335 |
#: bzrlib/builtins.py:3243
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2336 |
msgid "Alternatively, to list just the files::" |
2337 |
msgstr "代わりにファイルの一覧だけを表示するには::" |
|
2338 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2339 |
#: bzrlib/builtins.py:3245
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2340 |
msgid " bzr ls --ignored" |
2341 |
msgstr " bzr ls --ignored" |
|
2342 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2343 |
#: bzrlib/builtins.py:3279
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2344 |
#, python-format
|
2345 |
msgid "not a valid revision-number: %r" |
|
2346 |
msgstr "無効なリビジョン番号です。: %r" |
|
2347 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2348 |
#: bzrlib/builtins.py:3286
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2349 |
msgid "" |
2350 |
"Export current or past revision to a destination directory or archive."
|
|
2351 |
msgstr "最新、または過去のリビジョンを指定されたディレクトリもしくはアーカイブにエクスポートする。" |
|
2352 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2353 |
#: bzrlib/builtins.py:3288
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2354 |
msgid "If no revision is specified this exports the last committed revision." |
2355 |
msgstr "リビジョンが指定されなければ、最終コミットのリビジョンをエクスポートします。" |
|
2356 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2357 |
#: bzrlib/builtins.py:3290
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2358 |
msgid "" |
2359 |
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
|
|
2360 |
"given, try to find the format with the extension. If no extension\n"
|
|
2361 |
"is found exports to a directory (equivalent to --format=dir)."
|
|
2362 |
msgstr "" |
|
2363 |
"フォーマットはtar、tgz、tbz2のような”exporter”の名前になることができます。\n"
|
|
2364 |
" 何も渡されなければ、拡張子のフォーマットを見つけようとします。 拡張子がない\n"
|
|
2365 |
"場合は、ディレクトリにエクスポートします(–format=dirと同等)。"
|
|
2366 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2367 |
#: bzrlib/builtins.py:3294
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2368 |
msgid "" |
2369 |
"If root is supplied, it will be used as the root directory inside\n"
|
|
2370 |
"container formats (tar, zip, etc). If it is not supplied it will default\n"
|
|
2371 |
"to the exported filename. The root option has no effect for 'dir' format."
|
|
2372 |
msgstr "" |
|
2373 |
"rootが指定された場合は、コンテナフォーマット(tar、zipなど)のルート\n"
|
|
2374 |
"ディレクトリに使用されます。指定されていない場合は、エクスポート\n"
|
|
2375 |
"ファイル名がデフォルトになります。rootオプションは、'dir'フォーマット\n"
|
|
2376 |
"に対しては作用しません。"
|
|
2377 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2378 |
#: bzrlib/builtins.py:3298
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2379 |
msgid "" |
2380 |
"If branch is omitted then the branch containing the current working\n"
|
|
2381 |
"directory will be used."
|
|
2382 |
msgstr "ブランチが省略されると現在の作業ディレクトリを含むブランチが使用されます。" |
|
2383 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2384 |
#: bzrlib/builtins.py:3301
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2385 |
msgid "" |
2386 |
"Note: Export of tree with non-ASCII filenames to zip is not supported." |
|
2387 |
msgstr "注: ASCIIではないファイルを含むツリーの、zipへのエクスポートはサポートされません。" |
|
2388 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2389 |
#: bzrlib/builtins.py:3303
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2390 |
msgid "" |
2391 |
" ================= =========================\n"
|
|
2392 |
" Supported formats Autodetected by extension\n"
|
|
2393 |
" ================= =========================\n"
|
|
2394 |
" dir (none)\n"
|
|
2395 |
" tar .tar\n"
|
|
2396 |
" tbz2 .tar.bz2, .tbz2\n"
|
|
2397 |
" tgz .tar.gz, .tgz\n"
|
|
2398 |
" zip .zip\n"
|
|
2399 |
" ================= ========================="
|
|
2400 |
msgstr "" |
|
2401 |
" ==================== ====================\n"
|
|
2402 |
" サポートフォーマット 拡張子による自動検出\n"
|
|
2403 |
" ==================== ====================\n"
|
|
2404 |
" dir (none)\n"
|
|
2405 |
" tar .tar\n"
|
|
2406 |
" tbz2 .tar.bz2, .tbz2\n"
|
|
2407 |
" tgz .tar.gz, .tgz\n"
|
|
2408 |
" zip .zip\n"
|
|
2409 |
" ==================== ===================="
|
|
2410 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2411 |
#: bzrlib/builtins.py:3317
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2412 |
msgid "Type of file to export to." |
2413 |
msgstr "エクスポートするファイルの種類" |
|
2414 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2415 |
#: bzrlib/builtins.py:3320
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2416 |
msgid "Apply content filters to export the convenient form." |
2417 |
msgstr "使いやすい形でエクスポートするためのコンテンツフィルターを適用します。" |
|
2418 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2419 |
#: bzrlib/builtins.py:3324
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2420 |
msgid "Name of the root directory inside the exported file." |
2421 |
msgstr "エクスポートされたファイル内部のrootディレクトリの名前。" |
|
2422 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2423 |
#: bzrlib/builtins.py:3326
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2424 |
msgid "" |
2425 |
"Set modification time of files to that of the last revision in which it was "
|
|
2426 |
"changed."
|
|
2427 |
msgstr "各ファイルの編集日時を、最後にそのファイルが変更されたリビジョンの日時に設定します。" |
|
2428 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2429 |
#: bzrlib/builtins.py:3329
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2430 |
msgid "" |
2431 |
"Export the working tree contents rather than that of the last revision."
|
|
2432 |
msgstr "最終リビジョンではなく、作業ツリーの内容をエクスポートします。" |
|
2433 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2434 |
#: bzrlib/builtins.py:3348
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2435 |
msgid "--uncommitted requires a working tree" |
2436 |
msgstr "作業ツリーに対しては--uncommittedを指定する必要があります。" |
|
2437 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2438 |
#: bzrlib/builtins.py:3357
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2439 |
#, python-format
|
2440 |
msgid "Unsupported export format: %s" |
|
2441 |
msgstr "サポートされていないエクスポートフォーマット: %s" |
|
2442 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2443 |
#: bzrlib/builtins.py:3361
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2444 |
msgid "" |
2445 |
"Write the contents of a file as of a given revision to standard output."
|
|
2446 |
msgstr "指定されたリビジョンのファイルの内容を標準出力に書き出します。" |
|
2447 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2448 |
#: bzrlib/builtins.py:3363
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2449 |
msgid "If no revision is nominated, the last revision is used." |
2450 |
msgstr "リビジョンが指定されなければ、最後のリビジョンが使用されます。" |
|
2451 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2452 |
#: bzrlib/builtins.py:3365
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2453 |
msgid "" |
2454 |
"Note: Take care to redirect standard output when using this command on a\n" |
|
2455 |
"binary file."
|
|
2456 |
msgstr "" |
|
2457 |
"バイナリファイルでこのコマンドを使用する際には標準出力をリダイレクトするように\n"
|
|
2458 |
"気をつけてください。"
|
|
2459 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2460 |
#: bzrlib/builtins.py:3371
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2461 |
msgid "The path name in the old tree." |
2462 |
msgstr "古いツリーのパス名。" |
|
2463 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2464 |
#: bzrlib/builtins.py:3372
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2465 |
msgid "Apply content filters to display the convenience form." |
2466 |
msgstr "便利な形で表示するためのフィルタを適用します。" |
|
2467 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2468 |
#: bzrlib/builtins.py:3383
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2469 |
msgid "bzr cat --revision takes exactly one revision specifier" |
2470 |
msgstr "bzr cat --revisionにはリビジョンをひとつだけ指定します。" |
|
2471 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2472 |
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2473 |
msgid "{0!r} is not present in revision {1}" |
2474 |
msgstr "{0!r}はリビジョン{1}には存在しません。" |
|
2475 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2476 |
#: bzrlib/builtins.py:3443
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2477 |
msgid "Commit changes into a new revision." |
2478 |
msgstr "変更を新しいリビジョンにコミットする。" |
|
2479 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2480 |
#: bzrlib/builtins.py:3445
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2481 |
msgid "" |
2482 |
"An explanatory message needs to be given for each commit. This is\n"
|
|
2483 |
"often done by using the --message option (getting the message from the\n"
|
|
2484 |
"command line) or by using the --file option (getting the message from\n"
|
|
2485 |
"a file). If neither of these options is given, an editor is opened for\n"
|
|
2486 |
"the user to enter the message. To see the changed files in the\n"
|
|
2487 |
"boilerplate text loaded into the editor, use the --show-diff option."
|
|
2488 |
msgstr "" |
|
2489 |
"それぞれのコミットに、その内容を説明するメッセージを指定する必要があります。\n"
|
|
2490 |
"これは、--messageオプションで指定(コマンドラインからメッセージを取得)したり、\n"
|
|
2491 |
"--fileオプションで指定(ファイルからメッセージを取得)します。どちらのオプションも\n"
|
|
2492 |
"指定されていない場合は、メッセージを入力するためのエディタが起動します。\n"
|
|
2493 |
"エディタにロードされる定型文の中に変更されたファイルの情報を含めるためには、\n"
|
|
2494 |
"--show-diffオプションを使用します。"
|
|
2495 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2496 |
#: bzrlib/builtins.py:3452
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2497 |
msgid "" |
2498 |
"By default, the entire tree is committed and the person doing the\n"
|
|
2499 |
"commit is assumed to be the author. These defaults can be overridden\n"
|
|
2500 |
"as explained below."
|
|
2501 |
msgstr "" |
|
2502 |
"デフォルトでは、ツリー全体がコミットされ、コミットを実行した人が著者になります。\n"
|
|
2503 |
"これは、以下のような方法で上書きすることができます。"
|
|
2504 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2505 |
#: bzrlib/builtins.py:3456
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2506 |
msgid ":Selective commits:" |
2507 |
msgstr ":部分的なコミット:" |
|
2508 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2509 |
#: bzrlib/builtins.py:3458
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2510 |
msgid "" |
2511 |
" If selected files are specified, only changes to those files are\n"
|
|
2512 |
" committed. If a directory is specified then the directory and\n"
|
|
2513 |
" everything within it is committed."
|
|
2514 |
msgstr "" |
|
2515 |
" ファイルが指定された場合、そのファイルの変更だけがコミットされます。\n"
|
|
2516 |
" ディレクトリが指定された場合、そのディレクトリとその配下すべてが\n"
|
|
2517 |
" コミット対象になります。"
|
|
2518 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2519 |
#: bzrlib/builtins.py:3462
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2520 |
msgid "" |
2521 |
" When excludes are given, they take precedence over selected files.\n"
|
|
2522 |
" For example, to commit only changes within foo, but not changes\n"
|
|
2523 |
" within foo/bar::"
|
|
2524 |
msgstr "" |
|
2525 |
" excludesの指定は、コミット対象ファイルの指定よりも優先されます。\n"
|
|
2526 |
" たとえば、foo配下の変更をコミットするが、foo/bar内はコミットしないという\n"
|
|
2527 |
" 場合は::"
|
|
2528 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2529 |
#: bzrlib/builtins.py:3466
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2530 |
msgid " bzr commit foo -x foo/bar" |
2531 |
msgstr " bzr commit foo -x foo/bar" |
|
2532 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2533 |
#: bzrlib/builtins.py:3468
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2534 |
msgid " A selective commit after a merge is not yet supported." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2535 |
msgstr " マージ後の部分的なコミットはまだサポートされていません。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2536 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2537 |
#: bzrlib/builtins.py:3470
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2538 |
msgid ":Custom authors:" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2539 |
msgstr ":作者の変更:" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2540 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2541 |
#: bzrlib/builtins.py:3472
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2542 |
msgid "" |
2543 |
" If the author of the change is not the same person as the committer,\n"
|
|
2544 |
" you can specify the author's name using the --author option. The\n"
|
|
2545 |
" name should be in the same format as a committer-id, e.g.\n"
|
|
2546 |
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
|
|
2547 |
" the change you can specify the option multiple times, once for each\n"
|
|
2548 |
" author."
|
|
2549 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2550 |
" もし、変更を行った人とコミットする人がちがう場合は、作者の名前を--author\n"
|
2551 |
" オプションで指定することができます。\"John Doe <jdoe@example.com>\"の\n"
|
|
2552 |
" ように、コミッターのIDと同じフォーマットで指定するべきです。複数の作者が\n"
|
|
2553 |
" いるなら、このオプションを複数回指定することもできます。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2554 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2555 |
#: bzrlib/builtins.py:3479
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2556 |
msgid ":Checks:" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2557 |
msgstr ":チェック:" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2558 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2559 |
#: bzrlib/builtins.py:3481
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2560 |
msgid "" |
2561 |
" A common mistake is to forget to add a new file or directory before\n"
|
|
2562 |
" running the commit command. The --strict option checks for unknown\n"
|
|
2563 |
" files and aborts the commit if any are found. More advanced pre-commit\n"
|
|
2564 |
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
|
|
2565 |
" for details."
|
|
2566 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2567 |
" よくあるミスとして、新しく作ったファイルやディレクトリをコミット前に追加するのを\n"
|
2568 |
" 忘れてしまうということがあります。--strictオプションを指定すると、バージョン管理\n"
|
|
2569 |
" 外のファイルがある場合はコミットが失敗するようになります。もっと高度なコミット\n"
|
|
2570 |
" 前チェックをフックとして実装することもできます。詳細は ``bzr help hooks`` を\n"
|
|
2571 |
" ご覧ください。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2572 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2573 |
#: bzrlib/builtins.py:3487
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2574 |
msgid ":Things to note:" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2575 |
msgstr ":特記事項:" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2576 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2577 |
#: bzrlib/builtins.py:3489
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2578 |
msgid "" |
2579 |
" If you accidentially commit the wrong changes or make a spelling\n"
|
|
2580 |
" mistake in the commit message say, you can use the uncommit command\n"
|
|
2581 |
" to undo it. See ``bzr help uncommit`` for details."
|
|
2582 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2583 |
" もし、間違ったファイルをコミットしてしまったり、コミットメッセージにスペル\n"
|
2584 |
" ミスがあった場合は、uncommitコマンドでコミットを取り消すことができます。\n"
|
|
2585 |
" 詳細は ``bzr help uncommit`` をご覧ください。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2586 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2587 |
#: bzrlib/builtins.py:3493
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2588 |
msgid "" |
2589 |
" Hooks can also be configured to run after a commit. This allows you\n"
|
|
2590 |
" to trigger updates to external systems like bug trackers. The --fixes\n"
|
|
2591 |
" option can be used to record the association between a revision and\n"
|
|
2592 |
" one or more bugs. See ``bzr help bugs`` for details."
|
|
2593 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2594 |
" コミット後にフックを実行することもできます。これによって、バグトラッカーなどの\n"
|
2595 |
" 外部のシステムを更新することができます。 --fixesオプションで、リビジョンと\n"
|
|
2596 |
" バグとの関係を記録することができます。詳細は ``bzr help bugs`` を見て\n"
|
|
2597 |
" ください。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2598 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2599 |
#: bzrlib/builtins.py:3503
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2600 |
msgid "Do not consider changes made to a given path." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2601 |
msgstr "指定されたパスの変更を無視します。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2602 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2603 |
#: bzrlib/builtins.py:3506
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2604 |
msgid "Description of the new revision." |
2605 |
msgstr "新しいリビジョンの説明。" |
|
2606 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2607 |
#: bzrlib/builtins.py:3509
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2608 |
msgid "Commit even if nothing has changed." |
2609 |
msgstr "何も変更されていなくてもコミットする。" |
|
2610 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2611 |
#: bzrlib/builtins.py:3513
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2612 |
msgid "Take commit message from this file." |
2613 |
msgstr "このファイルからコミットメッセージを取得する。" |
|
2614 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2615 |
#: bzrlib/builtins.py:3515
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2616 |
msgid "Refuse to commit if there are unknown files in the working tree." |
2617 |
msgstr "作業ツリーの中にバージョン管理外のファイルが存在する場合コミットを拒否する。" |
|
2618 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2619 |
#: bzrlib/builtins.py:3518
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2620 |
msgid "" |
2621 |
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
|
|
2622 |
"08:00:00 +0100'."
|
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2623 |
msgstr "コミット日時を決められたフォーマットで手動で指定します。例) '2009-10-10 08:00:00 +0100'" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2624 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2625 |
#: bzrlib/builtins.py:3521
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2626 |
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")." |
2627 |
msgstr "このリビジョンで修正されたバグをマークする(\"bzr help bugs\"を参照)。" |
|
2628 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2629 |
#: bzrlib/builtins.py:3524
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2630 |
msgid "Set the author's name, if it's different from the committer." |
2631 |
msgstr "著者の名前がコミッターとは異なる場合、著者の名前を設定する。" |
|
2632 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2633 |
#: bzrlib/builtins.py:3527
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2634 |
msgid "" |
2635 |
"Perform a local commit in a bound branch. Local commits are not pushed to "
|
|
2636 |
"the master branch until a normal commit is performed."
|
|
2637 |
msgstr "" |
|
2638 |
"バインドされたブランチにローカルコミットを実行する。 通常のコミットが実行されるまで ローカルコミットはマスターブランチにpushされません。"
|
|
2639 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2640 |
#: bzrlib/builtins.py:3533
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2641 |
msgid "" |
2642 |
"When no message is supplied, show the diff along with the status summary in "
|
|
2643 |
"the message editor."
|
|
2644 |
msgstr "メッセージが提供されないとき、 メッセージエディタでステータスの要約と一緒に差分を表示する。" |
|
2645 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2646 |
#: bzrlib/builtins.py:3536
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2647 |
msgid "" |
2648 |
"When committing to a foreign version control system do not push data that "
|
|
2649 |
"can not be natively represented."
|
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2650 |
msgstr "外部のバージョン管理システムにコミットするときに、ネイティブに表現できないデータをプッシュしません。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2651 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2652 |
#: bzrlib/builtins.py:3554
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2653 |
#, python-format
|
2654 |
msgid "" |
|
2655 |
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
|
|
2656 |
"default bug tracker using the `bugtracker` option.\n"
|
|
2657 |
"See \"bzr help bugs\" for more information on this feature. Commit refused."
|
|
2658 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2659 |
"バグ %s のバグトラッカーが指定されていません。'トラッカー:id'の形式にするか、デフォルトのトラッカーを `bugtracker` "
|
2660 |
"オプションで指定してください。\n"
|
|
2661 |
"詳細は \"bzr help bugs\" をご覧ください。コミットは拒否されました。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2662 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2663 |
#: bzrlib/builtins.py:3563
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2664 |
#, python-format
|
2665 |
msgid "" |
|
2666 |
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
|
|
2667 |
"for more information on this feature.\n"
|
|
2668 |
"Commit refused."
|
|
2669 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2670 |
"無効なバグです。 %s 'トラッカー:id' の形式で指定する必要があります。詳細は \"bzr help bugs\" をご覧ください。\n"
|
2671 |
"コミットは拒否されました。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2672 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2673 |
#: bzrlib/builtins.py:3572
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2674 |
#, python-format
|
2675 |
msgid "Unrecognized bug %s. Commit refused." |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2676 |
msgstr "不明なバグです。 %s コミットは拒否されました。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2677 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2678 |
#: bzrlib/builtins.py:3575
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2679 |
#, python-format
|
2680 |
msgid "" |
|
2681 |
"%s\n"
|
|
2682 |
"Commit refused."
|
|
2683 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2684 |
"%s\n"
|
2685 |
"コミットは拒否されました。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2686 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2687 |
#: bzrlib/builtins.py:3599
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2688 |
msgid "Could not parse --commit-time: " |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2689 |
msgstr "--commit-timeをパースできません。: " |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2690 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2691 |
#: bzrlib/builtins.py:3639
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2692 |
msgid "please specify either --message or --file" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2693 |
msgstr "--message か --file かどちらかを指定してください。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2694 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2695 |
#: bzrlib/builtins.py:3668
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2696 |
msgid "please specify a commit message with either --message or --file" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2697 |
msgstr "--messageか--fileのどちらかでコミットメッセージを指定してください。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2698 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2699 |
#: bzrlib/builtins.py:3671
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2700 |
msgid "" |
2701 |
"Empty commit message specified. Please specify a commit message with either -"
|
|
2702 |
"-message or --file or leave a blank message with --message \"\"."
|
|
2703 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2704 |
"空のコミットメッセージが指定されました。--messageか--fileでコミットメッセージを指定するか、--message "
|
2705 |
"\"\"で空メッセージを指定してください。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2706 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2707 |
#: bzrlib/builtins.py:3691
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2708 |
msgid "" |
2709 |
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
|
|
2710 |
"-unchanged to force an empty commit."
|
|
2711 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2712 |
"コミットする変更がありません。コミットしたいファイルを'bzr add'で追加するか、--unchangedを指定して空のコミットを実行してください。"
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2713 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2714 |
#: bzrlib/builtins.py:3695
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2715 |
msgid "" |
2716 |
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
|
|
2717 |
"resolve FILE\" to resolve."
|
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2718 |
msgstr "作業ツリーに競合があります。\"bzr conflicts\" で表示して、\"bzr resolve FILE\"で解消してください。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2719 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2720 |
#: bzrlib/builtins.py:3699
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2721 |
msgid "Commit refused because there are unknown files in the working tree." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2722 |
msgstr "作業ツリーにバージョン管理外のファイルがあるため、コミットが拒否されました。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2723 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2724 |
#: bzrlib/builtins.py:3702
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2725 |
msgid "" |
2726 |
"\n"
|
|
2727 |
"To commit to master branch, run update and then commit.\n"
|
|
2728 |
"You can also pass --local to commit to continue working disconnected."
|
|
2729 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2730 |
"\n"
|
2731 |
"マスタブランチにコミットするには、先にupdateしてください。\n"
|
|
2732 |
"--localを指定してオフラインでコミットし、作業を続けることもできます。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2733 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2734 |
#: bzrlib/builtins.py:3710
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2735 |
msgid "" |
2736 |
"Validate working tree structure, branch consistency and repository history."
|
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2737 |
msgstr "作業ツリーの構造、ブランチの一貫性、リポジトリの履歴をチェックします。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2738 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2739 |
#: bzrlib/builtins.py:3712
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2740 |
msgid "" |
2741 |
"This command checks various invariants about branch and repository storage\n"
|
|
2742 |
"to detect data corruption or bzr bugs."
|
|
2743 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2744 |
"このコマンドは、データの破損やbzrのバグを検出するために、ブランチとリポジトリ\n"
|
2745 |
"ストレージの不変条件をチェックします。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2746 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2747 |
#: bzrlib/builtins.py:3715
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2748 |
msgid "" |
2749 |
"The working tree and branch checks will only give output if a problem is\n"
|
|
2750 |
"detected. The output fields of the repository check are:"
|
|
2751 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2752 |
"作業ツリーとブランチのチェック結果は、問題が見つかったときだけ表示\n"
|
2753 |
"されます。リポジトリチェックの出力は次の通りです。:"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2754 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2755 |
#: bzrlib/builtins.py:3718
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2756 |
msgid "" |
2757 |
"revisions\n"
|
|
2758 |
" This is just the number of revisions checked. It doesn't\n"
|
|
2759 |
" indicate a problem."
|
|
2760 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2761 |
"revisions\n"
|
2762 |
" チェックしたリビジョンの数です。これは問題ではありません。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2763 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2764 |
#: bzrlib/builtins.py:3722
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2765 |
msgid "" |
2766 |
"versionedfiles\n"
|
|
2767 |
" This is just the number of versionedfiles checked. It\n"
|
|
2768 |
" doesn't indicate a problem."
|
|
2769 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2770 |
"versionedfiles\n"
|
2771 |
" チェックしたバージョン管理ファイルの数です。これは問題では\n"
|
|
2772 |
" ありません。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2773 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2774 |
#: bzrlib/builtins.py:3726
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2775 |
msgid "" |
2776 |
"unreferenced ancestors\n"
|
|
2777 |
" Texts that are ancestors of other texts, but\n"
|
|
2778 |
" are not properly referenced by the revision ancestry. This is a\n"
|
|
2779 |
" subtle problem that Bazaar can work around."
|
|
2780 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2781 |
"unreferenced ancestors\n"
|
2782 |
" 他のテキストの先祖だが、上位のリビジョンから参照されていない\n"
|
|
2783 |
" と思われるテキストです。これは、Bazaarが対処できる軽微な\n"
|
|
2784 |
" 問題です。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2785 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2786 |
#: bzrlib/builtins.py:3731
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2787 |
msgid "" |
2788 |
"unique file texts\n"
|
|
2789 |
" This is the total number of unique file contents\n"
|
|
2790 |
" seen in the checked revisions. It does not indicate a problem."
|
|
2791 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2792 |
"unique file texts\n"
|
2793 |
" チェックしたリビジョンの中にある、一意なファイルコンテンツの数です。\n"
|
|
2794 |
" これは問題ではありません。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2795 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2796 |
#: bzrlib/builtins.py:3735
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2797 |
msgid "" |
2798 |
"repeated file texts\n"
|
|
2799 |
" This is the total number of repeated texts seen\n"
|
|
2800 |
" in the checked revisions. Texts can be repeated when their file\n"
|
|
2801 |
" entries are modified, but the file contents are not. It does not\n"
|
|
2802 |
" indicate a problem."
|
|
2803 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2804 |
"repeated file texts\n"
|
2805 |
" チェックしたリビジョンの中にある、重複したテキストの数です。\n"
|
|
2806 |
" ファイルのエントリが変更されたが、内容は変更されていない場合に、\n"
|
|
2807 |
" 重複が発生します。これは問題ではありません。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2808 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2809 |
#: bzrlib/builtins.py:3741
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2810 |
msgid "" |
2811 |
"If no restrictions are specified, all Bazaar data that is found at the "
|
|
2812 |
"given\n"
|
|
2813 |
"location will be checked."
|
|
2814 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2815 |
"条件が指定されなければ、指定された場所の全てのBazaarデータが\n"
|
2816 |
"チェックされます。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2817 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2818 |
#: bzrlib/builtins.py:3746
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2819 |
msgid " Check the tree and branch at 'foo'::" |
2820 |
msgstr " ‘foo’ でのツリーとブランチをチェックする::" |
|
2821 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2822 |
#: bzrlib/builtins.py:3748
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2823 |
msgid " bzr check --tree --branch foo" |
2824 |
msgstr " bzr check --tree --branch foo" |
|
2825 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2826 |
#: bzrlib/builtins.py:3750
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2827 |
msgid " Check only the repository at 'bar'::" |
2828 |
msgstr " ‘bar’でのリポジトリのみをチェックする::" |
|
2829 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2830 |
#: bzrlib/builtins.py:3752
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2831 |
msgid " bzr check --repo bar" |
2832 |
msgstr " bzr check --repo bar" |
|
2833 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2834 |
#: bzrlib/builtins.py:3754
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2835 |
msgid " Check everything at 'baz'::" |
2836 |
msgstr " ‘baz’ ですべてをチェックする::" |
|
2837 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2838 |
#: bzrlib/builtins.py:3756
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2839 |
msgid " bzr check baz" |
2840 |
msgstr " bzr check baz" |
|
2841 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2842 |
#: bzrlib/builtins.py:3762
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2843 |
msgid "Check the branch related to the current directory." |
2844 |
msgstr "現在のディレクトリに関連したブランチをチェックする。" |
|
2845 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2846 |
#: bzrlib/builtins.py:3764
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2847 |
msgid "Check the repository related to the current directory." |
2848 |
msgstr "現在のディレクトリに関連したリポジトリをチェックする。" |
|
2849 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2850 |
#: bzrlib/builtins.py:3766
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2851 |
msgid "Check the working tree related to the current directory." |
2852 |
msgstr "現在のディレクトリに関連した作業ツリーをチェックする。" |
|
2853 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2854 |
#: bzrlib/builtins.py:3780
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2855 |
msgid "Upgrade a repository, branch or working tree to a newer format." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2856 |
msgstr "リポジトリ、ブランチ、作業ツリーを新しいフォーマットにアップグレードします。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2857 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2858 |
#: bzrlib/builtins.py:3782
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2859 |
msgid "" |
2860 |
"When the default format has changed after a major new release of\n"
|
|
2861 |
"Bazaar, you may be informed during certain operations that you\n"
|
|
2862 |
"should upgrade. Upgrading to a newer format may improve performance\n"
|
|
2863 |
"or make new features available. It may however limit interoperability\n"
|
|
2864 |
"with older repositories or with older versions of Bazaar."
|
|
2865 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2866 |
"Bazaarのメジャーリリースの後にデフォルトのフォーマットが変更された場合、\n"
|
2867 |
"いくつかのオペレーションの際に、アップグレードすべきであると通知されます。\n"
|
|
2868 |
"新しいフォーマットへのアップグレードによって、パフォーマンスが改善されたり、\n"
|
|
2869 |
"新しい機能が使えるようになるでしょう。ただし、古いバージョンのリポジトリや\n"
|
|
2870 |
"Bazaarとの互換性には制限が発生するかもしれません。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2871 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2872 |
#: bzrlib/builtins.py:3788
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2873 |
msgid "" |
2874 |
"If you wish to upgrade to a particular format rather than the\n"
|
|
2875 |
"current default, that can be specified using the --format option.\n"
|
|
2876 |
"As a consequence, you can use the upgrade command this way to\n"
|
|
2877 |
"\"downgrade\" to an earlier format, though some conversions are\n"
|
|
2878 |
"a one way process (e.g. changing from the 1.x default to the\n"
|
|
2879 |
"2.x default) so downgrading is not always possible."
|
|
2880 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2881 |
"デフォルトではなく特定のフォーマットにアップグレードしたい場合は、--format\n"
|
2882 |
"オプションで指定します。これを利用して、upgradeコマンドで昔のフォーマットに\n"
|
|
2883 |
"*\"ダウングレード\"* することもできますが、変換処理によっては不可逆なものも\n"
|
|
2884 |
"あります。(たとえば、1.xのデフォルトから2.xのデフォルトへの変換は不可逆です)\n"
|
|
2885 |
"そのため、ダウングレードできない場合もあります。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2886 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2887 |
#: bzrlib/builtins.py:3795
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2888 |
msgid "" |
2889 |
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
|
|
2890 |
"process (where # is a number). By default, this is left there on\n"
|
|
2891 |
"completion. If the conversion fails, delete the new .bzr directory\n"
|
|
2892 |
"and rename this one back in its place. Use the --clean option to ask\n"
|
|
2893 |
"for the backup.bzr directory to be removed on successful conversion.\n"
|
|
2894 |
"Alternatively, you can delete it by hand if everything looks good\n"
|
|
2895 |
"afterwards."
|
|
2896 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2897 |
"変換を開始したときに、 backup.bzr.~#~ というディレクトリが作成されます。\n"
|
2898 |
"(#は連番です) デフォルトでは、このフォルダは変換後も残ります。もし変換が\n"
|
|
2899 |
"失敗したら、新しい.bzrフォルダを削除して、このフォルダを元の名前に戻して\n"
|
|
2900 |
"ください。--cleanオプションを指定すると、変換が成功したらbackup.bzr\n"
|
|
2901 |
"ディレクトリは削除されます。そうでない場合は、変換後特に問題がなければ手で\n"
|
|
2902 |
"削除してください。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2903 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2904 |
#: bzrlib/builtins.py:3803
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2905 |
msgid "" |
2906 |
"If the location given is a shared repository, dependent branches\n"
|
|
2907 |
"are also converted provided the repository converts successfully.\n"
|
|
2908 |
"If the conversion of a branch fails, remaining branches are still\n"
|
|
2909 |
"tried."
|
|
2910 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2911 |
"指定された場所が共用リポジトリの場合、リポジトリの変換が成功したら\n"
|
2912 |
"配下のブランチも変換されます。もしブランチの変換に失敗しても、他の\n"
|
|
2913 |
"ブランチの変換は続行されます。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2914 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2915 |
#: bzrlib/builtins.py:3808
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2916 |
msgid "" |
2917 |
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
|
|
2918 |
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/." |
|
2919 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2920 |
"アップグレードに関する詳細な情報は、Bazaar Upgrade Guideをご覧ください。\n"
|
2921 |
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/." |
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2922 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2923 |
#: bzrlib/builtins.py:3816
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2924 |
msgid "Upgrade to a specific format. See \"bzr help formats\" for details." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2925 |
msgstr "指定されたフォーマットにアップグレードします。詳細は\"bzr help formats\"をご覧ください。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2926 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2927 |
#: bzrlib/builtins.py:3820
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2928 |
msgid "Branch format" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2929 |
msgstr "ブランチフォーマット" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2930 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2931 |
#: bzrlib/builtins.py:3822
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2932 |
msgid "Remove the backup.bzr directory if successful." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2933 |
msgstr "変換に成功したらbackup.bzrディレクトリを削除します。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2934 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2935 |
#: bzrlib/builtins.py:3824
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2936 |
msgid "Show what would be done, but don't actually do anything." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2937 |
msgstr "何が実行されるかを表示しますが、実際には何もしません。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2938 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2939 |
#: bzrlib/builtins.py:3839
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2940 |
msgid "Show or set bzr user id." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2941 |
msgstr "bzrのユーザIDを表示、設定します。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2942 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2943 |
#: bzrlib/builtins.py:3841
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2944 |
msgid "" |
2945 |
":Examples:\n"
|
|
2946 |
" Show the email of the current user::"
|
|
2947 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2948 |
":例:\n"
|
2949 |
" 現在のユーザのEメールを表示します。::"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2950 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2951 |
#: bzrlib/builtins.py:3844
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2952 |
msgid " bzr whoami --email" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2953 |
msgstr " bzr whoami --email" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2954 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2955 |
#: bzrlib/builtins.py:3846
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2956 |
msgid " Set the current user::" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2957 |
msgstr " ユーザを設定します。::" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2958 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2959 |
#: bzrlib/builtins.py:3848
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2960 |
msgid " bzr whoami \"Frank Chu <fchu@example.com>\"" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2961 |
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\"" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2962 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2963 |
#: bzrlib/builtins.py:3852
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2964 |
msgid "Display email address only." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2965 |
msgstr "Eメールアドレスだけを表示します。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2966 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2967 |
#: bzrlib/builtins.py:3854
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2968 |
msgid "Set identity for the current branch instead of globally." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2969 |
msgstr "全体設定ではなく、現在のブランチだけにIDを設定します。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2970 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2971 |
#: bzrlib/builtins.py:3880
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2972 |
msgid "--email can only be used to display existing identity" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2973 |
msgstr "--emailは、現在のIDを表示するためだけに使用できます。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2974 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2975 |
#: bzrlib/builtins.py:3904
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2976 |
msgid "Print or set the branch nickname." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2977 |
msgstr "ブランチのニックネームを表示または設定します。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2978 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2979 |
#: bzrlib/builtins.py:3906
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2980 |
msgid "" |
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2981 |
"If unset, the colocated branch name is used for colocated branches, and\n"
|
2982 |
"the branch directory name is used for other branches. To print the\n"
|
|
2983 |
"current nickname, execute with no argument."
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2984 |
msgstr "" |
2985 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2986 |
#: bzrlib/builtins.py:3910
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2987 |
msgid "" |
2988 |
"Bound branches use the nickname of its master branch unless it is set\n"
|
|
2989 |
"locally."
|
|
2990 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2991 |
"バインドされたブランチは、ローカルでニックネームが設定されていなければ\n"
|
2992 |
"マスタブランチのニックネームを使用します。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2993 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2994 |
#: bzrlib/builtins.py:3930
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2995 |
msgid "Set/unset and display aliases." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2996 |
msgstr "エイリアスの設定、解除、表示を行います。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2997 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2998 |
#: bzrlib/builtins.py:3932
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
2999 |
msgid "" |
3000 |
":Examples:\n"
|
|
3001 |
" Show the current aliases::"
|
|
3002 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3003 |
":例:\n"
|
3004 |
" 現在のエイリアスを表示します。::"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3005 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3006 |
#: bzrlib/builtins.py:3935
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3007 |
msgid " bzr alias" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3008 |
msgstr " bzr alias" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3009 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3010 |
#: bzrlib/builtins.py:3937
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3011 |
msgid " Show the alias specified for 'll'::" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3012 |
msgstr " 'll'に設定されているエイリアスを表示します。::" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3013 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3014 |
#: bzrlib/builtins.py:3939
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3015 |
msgid " bzr alias ll" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3016 |
msgstr " bzr alias ll" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3017 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3018 |
#: bzrlib/builtins.py:3941
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3019 |
msgid " Set an alias for 'll'::" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3020 |
msgstr " エイリアス'll'を設定します。::" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3021 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3022 |
#: bzrlib/builtins.py:3943
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3023 |
msgid " bzr alias ll=\"log --line -r-10..-1\"" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3024 |
msgstr " bzr alias ll=\"log --line -r-10..-1\"" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3025 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3026 |
#: bzrlib/builtins.py:3945
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3027 |
msgid " To remove an alias for 'll'::" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3028 |
msgstr " エイリアス'll'を解除します。::" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3029 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3030 |
#: bzrlib/builtins.py:3947
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3031 |
msgid " bzr alias --remove ll" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3032 |
msgstr " bzr alias --remove ll" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3033 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3034 |
#: bzrlib/builtins.py:3952
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3035 |
msgid "Remove the alias." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3036 |
msgstr "エイリアスを削除します。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3037 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3038 |
#: bzrlib/builtins.py:3970
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3039 |
msgid "bzr alias --remove expects an alias to remove." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3040 |
msgstr "bzr alias --removeには、削除するエイリアス名を指定する必要があります。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3041 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3042 |
#: bzrlib/builtins.py:4151
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3043 |
msgid "" |
3044 |
"subunit not available. subunit needs to be installed to use --subunit."
|
|
3045 |
msgstr "" |
|
3046 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3047 |
#: bzrlib/builtins.py:4168
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3048 |
msgid "" |
3049 |
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
|
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3050 |
msgstr "--benchmarkは、bzr2.2以降はサポートしていません。かわりにbzr-usertestを使用してください。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3051 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3052 |
#: bzrlib/builtins.py:4215
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3053 |
msgid "Show version of bzr." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3054 |
msgstr "Bazaarのバージョンを表示します。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3055 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3056 |
#: bzrlib/builtins.py:4219
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3057 |
msgid "Print just the version number." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3058 |
msgstr "リビジョン番号を表示します。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3059 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3060 |
#: bzrlib/builtins.py:4238
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3061 |
msgid "It sure does!\n" |
3062 |
msgstr "" |
|
3063 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3064 |
#: bzrlib/builtins.py:4262
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3065 |
#, python-format
|
3066 |
msgid "merge base is revision %s\n" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3067 |
msgstr "マージの起点はリビジョン %s です。\n" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3068 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3069 |
#: bzrlib/builtins.py:4266
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3070 |
msgid "Perform a three-way merge." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3071 |
msgstr "3wayマージを実行します。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3072 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3073 |
#: bzrlib/builtins.py:4268
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3074 |
msgid "" |
3075 |
"The source of the merge can be specified either in the form of a branch,\n"
|
|
3076 |
"or in the form of a path to a file containing a merge directive generated\n"
|
|
3077 |
"with bzr send. If neither is specified, the default is the upstream branch\n"
|
|
3078 |
"or the branch most recently merged using --remember. The source of the\n"
|
|
3079 |
"merge may also be specified in the form of a path to a file in another\n"
|
|
3080 |
"branch: in this case, only the modifications to that file are merged into\n" |
|
3081 |
"the current working tree."
|
|
3082 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3083 |
"マージ元には、ブランチか、bzr sendで作られたマージディレクティブファイル\n"
|
3084 |
"のパスを指定できます。どちらも指定されていない場合は、アップストリームブランチ\n"
|
|
3085 |
"か、一番最後に--remember指定でマージした時のマージ元がデフォルトになります。\n"
|
|
3086 |
"別のブランチ内のファイルパスをマージ元として指定することもでき、その場合は\n"
|
|
3087 |
"指定されたファイルの変更だけが現在のブランチにマージされます。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3088 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3089 |
#: bzrlib/builtins.py:4276
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3090 |
msgid "" |
3091 |
"When merging from a branch, by default bzr will try to merge in all new\n"
|
|
3092 |
"work from the other branch, automatically determining an appropriate base\n"
|
|
3093 |
"revision. If this fails, you may need to give an explicit base."
|
|
3094 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3095 |
"ブランチからマージする場合、デフォルトでbzrは自動的に妥当なベースリビジョンを\n"
|
3096 |
"判定し、それ以降のすべての変更をマージしようとします。もしこれが失敗した場合は、\n"
|
|
3097 |
"明示的にベースリビジョンを指定する必要があります。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3098 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3099 |
#: bzrlib/builtins.py:4280
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3100 |
msgid "" |
3101 |
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
|
|
3102 |
"try to merge in all new work up to and including revision OTHER."
|
|
3103 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3104 |
"別の最終リビジョンを指定するには、\"-revision OTHER\"を指定します。この場合、\n"
|
3105 |
"OTHERまで(OTHERも含む)の全ての変更がマージされます。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3106 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3107 |
#: bzrlib/builtins.py:4283
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3108 |
msgid "" |
3109 |
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
|
|
3110 |
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
|
|
3111 |
"causes some revisions to be skipped, i.e. if the destination branch does\n"
|
|
3112 |
"not already contain revision BASE, such a merge is commonly referred to as\n"
|
|
3113 |
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
|
|
3114 |
"cherrypicks. The changes look like a normal commit, and the history of the\n"
|
|
3115 |
"changes from the other branch is not stored in the commit."
|
|
3116 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3117 |
"もし、2つのリビジョンを指定した場合(\"--revision BASE..OTHER\")、BASEから\n"
|
3118 |
"OTHERの範囲(BASEは含まず、OTHERは含む)のリビジョンがマージされます。これに\n"
|
|
3119 |
"よってスキップされるリビジョンがある場合、つまりマージ先のリビジョンにBASE\n"
|
|
3120 |
"が含まれていない場合は、いわゆる\"チェリーピック\"が行われます。通常のマージ\n"
|
|
3121 |
"とはちがい、今のところBazaarではチェリーピックは追跡しません。変更は、普通の\n"
|
|
3122 |
"コミットのように見え、マージ元での変更履歴は保存されません。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3123 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3124 |
#: bzrlib/builtins.py:4291
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3125 |
msgid "Revision numbers are always relative to the source branch." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3126 |
msgstr "リビジョン番号は常に元のブランチに関連します。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3127 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3128 |
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3129 |
msgid "" |
3130 |
"Merge will do its best to combine the changes in two branches, but there\n"
|
|
3131 |
"are some kinds of problems only a human can fix. When it encounters those,\n"
|
|
3132 |
"it will mark a conflict. A conflict means that you need to fix something,\n"
|
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3133 |
"before you can commit."
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3134 |
msgstr "" |
3135 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3136 |
#: bzrlib/builtins.py:4298
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3137 |
msgid "" |
3138 |
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
|
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3139 |
msgstr "問題を解消したら、bzr resolveを使用してください。bzr conflictsもご覧ください。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3140 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3141 |
#: bzrlib/builtins.py:4300
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3142 |
msgid "" |
3143 |
"If there is no default branch set, the first merge will set it (use\n"
|
|
3144 |
"--no-remember to avoid setting it). After that, you can omit the branch\n"
|
|
3145 |
"to use the default. To change the default, use --remember. The value will\n"
|
|
3146 |
"only be saved if the remote location can be accessed."
|
|
3147 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3148 |
"デフォルトブランチが設定されていない場合、最初にマージを実行したときに\n"
|
3149 |
"設定されます。(これをしないようにするには、--no-rememberを指定します。)\n"
|
|
3150 |
"その後は、デフォルトのブランチを使用する時には指定を省略できるようになり\n"
|
|
3151 |
"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモートの\n"
|
|
3152 |
"ブランチにアクセスできた時だけ保存されます。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3153 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3154 |
#: bzrlib/builtins.py:4305
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3155 |
msgid "" |
3156 |
"The results of the merge are placed into the destination working\n"
|
|
3157 |
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
|
|
3158 |
"committed to record the result of the merge."
|
|
3159 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3160 |
"マージの結果はマージ先の作業ツリー内に反映され、そこで(bzr diffを使って)\n"
|
3161 |
"レビューしたり、テストをしたあとで、コミットによって記録することができます。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3162 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3163 |
#: bzrlib/builtins.py:4309
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3164 |
msgid "" |
3165 |
"merge refuses to run if there are any uncommitted changes, unless\n"
|
|
3166 |
"--force is given. If --force is given, then the changes from the source \n"
|
|
3167 |
"will be merged with the current working tree, including any uncommitted\n"
|
|
3168 |
"changes in the tree. The --force option can also be used to create a\n"
|
|
3169 |
"merge revision which has more than two parents."
|
|
3170 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3171 |
"コミットされていない変更がある場合は、--forceを指定しないとマージは拒否\n"
|
3172 |
"されます。--forceが指定された場合は、未コミットの変更を含む現在の作業ツリーに\n"
|
|
3173 |
"マージ元の変更がマージされます。--forceオプションを使えば、2つ以上の親を持つ\n"
|
|
3174 |
"マージリビジョンを作ることもできます。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3175 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3176 |
#: bzrlib/builtins.py:4315
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3177 |
msgid "" |
3178 |
"If one would like to merge changes from the working tree of the other\n"
|
|
3179 |
"branch without merging any committed revisions, the --uncommitted option\n"
|
|
3180 |
"can be given."
|
|
3181 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3182 |
"コミット済みの変更ではなく、作業ツリー上での変更を別のブランチにマージしたい\n"
|
3183 |
"場合は、--uncommittedオプションを指定することができます。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3184 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3185 |
#: bzrlib/builtins.py:4319
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3186 |
msgid "" |
3187 |
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
|
|
3188 |
"you to apply each diff hunk and file change, similar to \"shelve\"."
|
|
3189 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3190 |
"変更を部分的にマージしたければ、\"merge -i\"を使用すれば、\"shelve\"と同じ\n"
|
3191 |
"ようにそれぞれのハンクをプロンプトで選択して適用することができます。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3192 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3193 |
#: bzrlib/builtins.py:4322
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3194 |
msgid "" |
3195 |
":Examples:\n"
|
|
3196 |
" To merge all new revisions from bzr.dev::"
|
|
3197 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3198 |
":例:\n"
|
3199 |
" bzr.devから全ての新しいリビジョンをマージします。::"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3200 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3201 |
#: bzrlib/builtins.py:4325
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3202 |
msgid " bzr merge ../bzr.dev" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3203 |
msgstr " bzr merge ../bzr.dev" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3204 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3205 |
#: bzrlib/builtins.py:4327
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3206 |
msgid " To merge changes up to and including revision 82 from bzr.dev::" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3207 |
msgstr " bzr.devから、リビジョン82まで(82も含む)のリビジョンをマージします::" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3208 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3209 |
#: bzrlib/builtins.py:4329
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3210 |
msgid " bzr merge -r 82 ../bzr.dev" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3211 |
msgstr " bzr merge -r 82 ../bzr.dev" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3212 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3213 |
#: bzrlib/builtins.py:4331
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3214 |
msgid " To merge the changes introduced by 82, without previous changes::" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3215 |
msgstr " リビジョン82での変更をマージし、それ以前の変更はマージしません。::" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3216 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3217 |
#: bzrlib/builtins.py:4333
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3218 |
msgid " bzr merge -r 81..82 ../bzr.dev" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3219 |
msgstr " bzr merge -r 81..82 ../bzr.dev" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3220 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3221 |
#: bzrlib/builtins.py:4335
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3222 |
msgid " To apply a merge directive contained in /tmp/merge::" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3223 |
msgstr " /tmp/merge内のマージディレクティブを適用します。::" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3224 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3225 |
#: bzrlib/builtins.py:4337
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3226 |
msgid " bzr merge /tmp/merge" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3227 |
msgstr " bzr merge /tmp/merge" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3228 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3229 |
#: bzrlib/builtins.py:4339
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3230 |
msgid "" |
3231 |
" To create a merge revision with three parents from two branches\n"
|
|
3232 |
" feature1a and feature1b:"
|
|
3233 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3234 |
" feature1a、feature1bの2つのブランチから、3つの親を持つマージ\n"
|
3235 |
" リビジョンを作ります。::"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3236 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3237 |
#: bzrlib/builtins.py:4342
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3238 |
msgid "" |
3239 |
" bzr merge ../feature1a\n"
|
|
3240 |
" bzr merge ../feature1b --force\n"
|
|
3241 |
" bzr commit -m 'revision with three parents'"
|
|
3242 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3243 |
" bzr merge ../feature1a\n"
|
3244 |
" bzr merge ../feature1b --force\n"
|
|
3245 |
" bzr commit -m 'revision with three parents'"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3246 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3247 |
#: bzrlib/builtins.py:4354
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3248 |
msgid "Merge even if the destination tree has uncommitted changes." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3249 |
msgstr "マージ先のツリーにコミットしていない変更があってもマージします。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3250 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3251 |
#: bzrlib/builtins.py:4360
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3252 |
msgid "" |
3253 |
"Apply uncommitted changes from a working copy, instead of branch changes."
|
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3254 |
msgstr "ブランチの変更ではなく、作業コピー上のコミットしていない変更をマージします。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3255 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3256 |
#: bzrlib/builtins.py:4362
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3257 |
msgid "" |
3258 |
"If the destination is already completely merged into the source, pull from "
|
|
3259 |
"the source rather than merging. When this happens, you do not need to "
|
|
3260 |
"commit the result."
|
|
3261 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3262 |
"マージ先のリビジョンがマージ元のブランチにすべて含まれている場合、マージの\n"
|
3263 |
"かわりにpullを実行します。その場合は、コミットする必要はありません。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3264 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3265 |
#: bzrlib/builtins.py:4367
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3266 |
msgid "" |
3267 |
"Branch to merge into, rather than the one containing the working directory."
|
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3268 |
msgstr "作業ディレクトリ以外にマージする場合の、マージ先のブランチ。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3269 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3270 |
#: bzrlib/builtins.py:4369
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3271 |
msgid "Instead of merging, show a diff of the merge." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3272 |
msgstr "マージを実行するかわりに、マージされる内容のdiffを表示します。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3273 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3274 |
#: bzrlib/builtins.py:4371
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3275 |
msgid "Select changes interactively." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3276 |
msgstr "変更をインタラクティブに選択します。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3277 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3278 |
#: bzrlib/builtins.py:4393
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3279 |
msgid "" |
3280 |
"Merging into empty branches not currently supported, "
|
|
3281 |
"https://bugs.launchpad.net/bzr/+bug/308562" |
|
3282 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3283 |
"空ブランチへのマージは今のところサポートされていません。https://bugs.launchpad.net/bzr/+bug/308562"
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3284 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3285 |
#: bzrlib/builtins.py:4420
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3286 |
msgid "Cannot use --uncommitted with bundles or merge directives." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3287 |
msgstr "バンドル、マージディレクティブに対して--uncommittedを指定することはできません。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3288 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3289 |
#: bzrlib/builtins.py:4431
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3290 |
msgid "Cannot use --uncommitted and --revision at the same time." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3291 |
msgstr "--uncommittedと--revisionを同時に指定することはできません。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3292 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3293 |
#: bzrlib/builtins.py:4451
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3294 |
msgid "merger: " |
6093.4.212
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3295 |
msgstr "マージした人: " |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3296 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3297 |
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3298 |
msgid "Nothing to do." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3299 |
msgstr "なにもすることがありません。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3300 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3301 |
#: bzrlib/builtins.py:4457
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3302 |
msgid "Cannot pull individual files" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3303 |
msgstr "ファイルを個別にpullすることはできません。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3304 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3305 |
#: bzrlib/builtins.py:4465
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3306 |
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3307 |
msgstr "ブランチにコミットがありません。('bzr pull'を使うべきかもしれません)" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3308 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3309 |
#: bzrlib/builtins.py:4523
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3310 |
#, python-format
|
3311 |
msgid "Show-base is not supported for this merge type. %s" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3312 |
msgstr "Show-baseはこのマージタイプではサポートされません。 %s" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3313 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3314 |
#: bzrlib/builtins.py:4532
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3315 |
#, python-format
|
3316 |
msgid "Conflict reduction is not supported for merge type %s." |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3317 |
msgstr "衝突の縮小化は、このマージタイプではサポートされません。 %s" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3318 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3319 |
#: bzrlib/builtins.py:4536
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3320 |
msgid "Cannot do conflict reduction and show base." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3321 |
msgstr "衝突の縮小化、ベースの表示ができませんでした。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3322 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3323 |
#: bzrlib/builtins.py:4647
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3324 |
msgid "No location specified or remembered" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3325 |
msgstr "対象の場所が設定も指定もされていません。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3326 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3327 |
#: bzrlib/builtins.py:4649
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3328 |
msgid "{0} remembered {1} location {2}" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3329 |
msgstr "{0} 設定された {1} の場所 {2}" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3330 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3331 |
#: bzrlib/builtins.py:4655
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3332 |
msgid "Redo a merge." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3333 |
msgstr "マージをやりなおします。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3334 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3335 |
#: bzrlib/builtins.py:4657
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3336 |
msgid "" |
3337 |
"Use this if you want to try a different merge technique while resolving\n"
|
|
3338 |
"conflicts. Some merge techniques are better than others, and remerge\n"
|
|
3339 |
"lets you try different ones on different files."
|
|
3340 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3341 |
"衝突を解決するために、別のマージ方法を試したい場合に、このコマンドを\n"
|
3342 |
"使用します。他のものより優れたマージ方法があり、remergeを使って個々の\n"
|
|
3343 |
"ファイルに別のマージ方法を試すことができます。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3344 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3345 |
#: bzrlib/builtins.py:4661
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3346 |
msgid "" |
3347 |
"The options for remerge have the same meaning and defaults as the ones for\n"
|
|
3348 |
"merge. The difference is that remerge can (only) be run when there is a\n"
|
|
3349 |
"pending merge, and it lets you specify particular files."
|
|
3350 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3351 |
"remergeのオプションの意味とデフォルトはmergeと同じです。違いは、\n"
|
3352 |
"remergeはマージ中状態のときだけ実行でき、特定のファイルを指定できる\n"
|
|
3353 |
"ということです。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3354 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3355 |
#: bzrlib/builtins.py:4665
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3356 |
msgid "" |
3357 |
":Examples:\n"
|
|
3358 |
" Re-do the merge of all conflicted files, and show the base text in\n"
|
|
3359 |
" conflict regions, in addition to the usual THIS and OTHER texts::"
|
|
3360 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3361 |
":例:\n"
|
3362 |
" すべての衝突したファイルのマージをやり直し、通常のTHIS、OTHERの\n"
|
|
3363 |
" テキストにくわえて衝突した領域のベーステキストを表示します。::"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3364 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3365 |
#: bzrlib/builtins.py:4669
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3366 |
msgid " bzr remerge --show-base" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3367 |
msgstr " bzr remerge --show-base" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3368 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3369 |
#: bzrlib/builtins.py:4671
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3370 |
msgid "" |
3371 |
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
|
|
3372 |
" additional processing to reduce the size of conflict regions::"
|
|
3373 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3374 |
" \"foobar\"のマージを、weaveマージアルゴリズムでやりなおし、衝突領域の\n"
|
3375 |
" 縮小化処理も行います。::"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3376 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3377 |
#: bzrlib/builtins.py:4674
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3378 |
msgid " bzr remerge --merge-type weave --reprocess foobar" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3379 |
msgstr " bzr remerge --merge-type weave --reprocess foobar" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3380 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3381 |
#: bzrlib/builtins.py:4681
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3382 |
msgid "Show base revision text in conflicts." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3383 |
msgstr "衝突したベースリビジョンのテキストを表示します。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3384 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3385 |
#: bzrlib/builtins.py:4693
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3386 |
msgid "" |
3387 |
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
|
|
3388 |
"merges."
|
|
3389 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3390 |
"remergeは通常のマージ後にだけ実行できます。チェリーピックや複数マージでは\r\n"
|
3391 |
"利用できません。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3392 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3393 |
#: bzrlib/builtins.py:4751
|
3394 |
msgid "" |
|
3395 |
"Set files in the working tree back to the contents of a previous revision."
|
|
3396 |
msgstr "" |
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3397 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3398 |
#: bzrlib/builtins.py:4753
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3399 |
msgid "" |
3400 |
"Giving a list of files will revert only those files. Otherwise, all files\n"
|
|
3401 |
"will be reverted. If the revision is not specified with '--revision', the\n"
|
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3402 |
"working tree basis revision is used. A revert operation affects only the\n"
|
3403 |
"working tree, not any revision history like the branch and repository or\n"
|
|
3404 |
"the working tree basis revision."
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3405 |
msgstr "" |
3406 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3407 |
#: bzrlib/builtins.py:4759
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3408 |
msgid "" |
3409 |
"To remove only some changes, without reverting to a prior version, use\n"
|
|
3410 |
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
|
|
3411 |
"will remove the changes introduced by the second last commit (-2), without\n"
|
|
3412 |
"affecting the changes introduced by the last commit (-1). To remove\n"
|
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3413 |
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
|
3414 |
"To update the branch to a specific revision or the latest revision and\n"
|
|
3415 |
"update the working tree accordingly while preserving local changes, see the\n"
|
|
3416 |
"update command."
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3417 |
msgstr "" |
3418 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3419 |
#: bzrlib/builtins.py:4768
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3420 |
msgid "" |
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3421 |
"Uncommitted changes to files that are reverted will be discarded.\n"
|
3422 |
"Howver, by default, any files that have been manually changed will be\n"
|
|
3423 |
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
|
|
3424 |
"files have '.~#~' appended to their name, where # is a number."
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3425 |
msgstr "" |
3426 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3427 |
#: bzrlib/builtins.py:4773
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3428 |
msgid "" |
3429 |
"When you provide files, you can use their current pathname or the pathname\n"
|
|
3430 |
"from the target revision. So you can use revert to \"undelete\" a file by\n"
|
|
3431 |
"name. If you name a directory, all the contents of that directory will be\n"
|
|
3432 |
"reverted."
|
|
3433 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3434 |
"ファイル名を指定するときは、現在のファイル名か、対象リビジョン時点でのファイル\n"
|
3435 |
"名かを使うことができます。つまり、ファイル名指定で「削除の取り消し」のために\n"
|
|
3436 |
"revertを使うことができます。ディレクトリを指定した場合は、その配下のすべての\n"
|
|
3437 |
"変更が取り消されます。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3438 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3439 |
#: bzrlib/builtins.py:4778
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3440 |
msgid "" |
3441 |
"If you have newly added files since the target revision, they will be\n"
|
|
3442 |
"removed. If the files to be removed have been changed, backups will be\n"
|
|
3443 |
"created as above. Directories containing unknown files will not be\n"
|
|
3444 |
"deleted."
|
|
3445 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3446 |
"対象のリビジョン以降にファイルが新しく追加されている場合は、そのファイルは\n"
|
3447 |
"削除されます。削除されるファイルが変更されている場合は、上記の通りに\n"
|
|
3448 |
"バックアップされます。バージョン管理外のファイルを含むディレクトリは削除され\n"
|
|
3449 |
"ません。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3450 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3451 |
#: bzrlib/builtins.py:4783
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3452 |
msgid "" |
3453 |
"The working tree contains a list of revisions that have been merged but\n"
|
|
3454 |
"not yet committed. These revisions will be included as additional parents\n"
|
|
3455 |
"of the next commit. Normally, using revert clears that list as well as\n"
|
|
3456 |
"reverting the files. If any files are specified, revert leaves the list\n"
|
|
3457 |
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
|
|
3458 |
".`` in the tree root to revert all files but keep the recorded merges,\n"
|
|
3459 |
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
|
|
3460 |
"reverting any files."
|
|
3461 |
msgstr "" |
|
3462 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3463 |
#: bzrlib/builtins.py:4792
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3464 |
msgid "" |
3465 |
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
|
|
3466 |
"changes from a branch in a single revision. To do this, perform the merge\n"
|
|
3467 |
"as desired. Then doing revert with the \"--forget-merges\" option will "
|
|
3468 |
"keep\n"
|
|
3469 |
"the content of the tree as it was, but it will clear the list of pending\n"
|
|
3470 |
"merges. The next commit will then contain all of the changes that are\n"
|
|
3471 |
"present in the other branch, but without any other parent revisions.\n"
|
|
3472 |
"Because this technique forgets where these changes originated, it may\n"
|
|
3473 |
"cause additional conflicts on later merges involving the same source and\n"
|
|
3474 |
"target branches."
|
|
3475 |
msgstr "" |
|
3476 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3477 |
#: bzrlib/builtins.py:4806
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3478 |
msgid "Do not save backups of reverted files." |
6093.4.212
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3479 |
msgstr "リバートされたファイルのバックアップを作成しない。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3480 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3481 |
#: bzrlib/builtins.py:4808
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3482 |
msgid "Remove pending merge marker, without changing any files." |
6093.4.212
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3483 |
msgstr "ファイルを一切変更せずに、未解決のマージマーカを削除する。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3484 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3485 |
#: bzrlib/builtins.py:4839
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3486 |
msgid "" |
3487 |
"Show help on a command or other topic.\n"
|
|
3488 |
" "
|
|
3489 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3490 |
"コマンドもしくは他のトピックのヘルプを表示する。\n"
|
3491 |
" "
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3492 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3493 |
#: bzrlib/builtins.py:4844
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3494 |
msgid "Show help on all commands." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3495 |
msgstr "全てのコマンドのヘルプを表示する。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3496 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3497 |
#: bzrlib/builtins.py:4873
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3498 |
msgid "Show unmerged/unpulled revisions between two branches." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3499 |
msgstr "2つのブランチの間のmergeされていない/pullされていない リビジョンを表示する。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3500 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3501 |
#: bzrlib/builtins.py:4875
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3502 |
msgid "OTHER_BRANCH may be local or remote." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3503 |
msgstr "OTHER_BRANCHはlocalもしくはremoteになります。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3504 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3505 |
#: bzrlib/builtins.py:4877
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3506 |
msgid "" |
3507 |
"To filter on a range of revisions, you can use the command -r begin..end\n"
|
|
3508 |
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
|
|
3509 |
"also valid.\n"
|
|
3510 |
" \n"
|
|
3511 |
":Exit values:\n"
|
|
3512 |
" 1 - some missing revisions\n"
|
|
3513 |
" 0 - no missing revisions"
|
|
3514 |
msgstr "" |
|
3515 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3516 |
#: bzrlib/builtins.py:4887
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3517 |
msgid "" |
3518 |
" Determine the missing revisions between this and the branch at the\n"
|
|
3519 |
" remembered pull location::"
|
|
3520 |
msgstr "" |
|
3521 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3522 |
#: bzrlib/builtins.py:4890
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3523 |
msgid " bzr missing" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3524 |
msgstr " bzr missing" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3525 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3526 |
#: bzrlib/builtins.py:4892
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3527 |
msgid " Determine the missing revisions between this and another branch::" |
3528 |
msgstr "" |
|
3529 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3530 |
#: bzrlib/builtins.py:4894
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3531 |
msgid " bzr missing http://server/branch" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3532 |
msgstr " bzr missing http://server/branch" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3533 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3534 |
#: bzrlib/builtins.py:4896
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3535 |
msgid "" |
3536 |
" Determine the missing revisions up to a specific revision on the other\n"
|
|
3537 |
" branch::"
|
|
3538 |
msgstr "" |
|
3539 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3540 |
#: bzrlib/builtins.py:4899
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3541 |
msgid " bzr missing -r ..-10" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3542 |
msgstr " bzr missing -r ..-10" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3543 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3544 |
#: bzrlib/builtins.py:4901
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3545 |
msgid "" |
3546 |
" Determine the missing revisions up to a specific revision on this\n"
|
|
3547 |
" branch::"
|
|
3548 |
msgstr "" |
|
3549 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3550 |
#: bzrlib/builtins.py:4904
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3551 |
msgid " bzr missing --my-revision ..-10" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3552 |
msgstr " bzr missing --my-revision ..-10" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3553 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3554 |
#: bzrlib/builtins.py:4911
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3555 |
msgid "Reverse the order of revisions." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3556 |
msgstr "リビジョンの表示順を逆転する。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3557 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3558 |
#: bzrlib/builtins.py:4913
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3559 |
msgid "Display changes in the local branch only." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3560 |
msgstr "ローカルブランチの変更のみを表示する。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3561 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3562 |
#: bzrlib/builtins.py:4914
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3563 |
msgid "Same as --mine-only." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3564 |
msgstr "--mine-onlyと同じ。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3565 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3566 |
#: bzrlib/builtins.py:4916
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3567 |
msgid "Display changes in the remote branch only." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3568 |
msgstr "リモートブランチの変更のみを表示する。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3569 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3570 |
#: bzrlib/builtins.py:4917
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3571 |
msgid "Same as --theirs-only." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3572 |
msgstr "--theirs-onlyと同じ。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3573 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3574 |
#: bzrlib/builtins.py:4922
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3575 |
msgid "" |
3576 |
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
|
|
3577 |
"details."
|
|
3578 |
msgstr "" |
|
3579 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3580 |
#: bzrlib/builtins.py:4926
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3581 |
msgid "" |
3582 |
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
|
|
3583 |
"details."
|
|
3584 |
msgstr "" |
|
3585 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3586 |
#: bzrlib/builtins.py:4929
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3587 |
msgid "Show all revisions in addition to the mainline ones." |
3588 |
msgstr "" |
|
3589 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3590 |
#: bzrlib/builtins.py:4983
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3591 |
msgid "No peer location known or specified." |
3592 |
msgstr "" |
|
3593 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3594 |
#: bzrlib/builtins.py:4987
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3595 |
msgid "Using saved parent location: {0}\n" |
6093.4.212
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3596 |
msgstr "保存済みの親ロケーションを使用する: {0}\n" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3597 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3598 |
#: bzrlib/builtins.py:5020
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3599 |
#, python-format
|
3600 |
msgid "You have %d extra revision:\n" |
|
3601 |
msgid_plural "You have %d extra revisions:\n" |
|
3602 |
msgstr[0] "" |
|
3603 |
msgstr[1] "" |
|
3604 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3605 |
#: bzrlib/builtins.py:5040
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3606 |
#, python-format
|
3607 |
msgid "You are missing %d revision:\n" |
|
3608 |
msgid_plural "You are missing %d revisions:\n" |
|
3609 |
msgstr[0] "" |
|
3610 |
msgstr[1] "" |
|
3611 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3612 |
#: bzrlib/builtins.py:5055
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3613 |
msgid "This branch has no new revisions.\n" |
6093.4.212
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3614 |
msgstr "このブランチには新しいリビジョンはありません。\n" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3615 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3616 |
#: bzrlib/builtins.py:5058
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3617 |
msgid "Other branch has no new revisions.\n" |
6093.4.212
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3618 |
msgstr "他のブランチには新しいリビジョンはありません。\n" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3619 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3620 |
#: bzrlib/builtins.py:5063
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3621 |
msgid "Branches are up to date.\n" |
6093.4.212
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3622 |
msgstr "ブランチは最新です。\n" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3623 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3624 |
#: bzrlib/builtins.py:5074
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3625 |
msgid "Compress the data within a repository." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3626 |
msgstr "リポジトリ内のデータを圧縮する。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3627 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3628 |
#: bzrlib/builtins.py:5076
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3629 |
msgid "" |
3630 |
"This operation compresses the data within a bazaar repository. As\n"
|
|
3631 |
"bazaar supports automatic packing of repository, this operation is\n"
|
|
3632 |
"normally not required to be done manually."
|
|
3633 |
msgstr "" |
|
6093.4.212
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3634 |
"この操作では bazaar リポジトリ内のデータを圧縮します。\n"
|
3635 |
"Bazaar はリポジトリの自動パック機能を備えているため、\n"
|
|
3636 |
"通常はこの操作を手動で行う必要はありません。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3637 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3638 |
#: bzrlib/builtins.py:5080
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3639 |
msgid "" |
3640 |
"During the pack operation, bazaar takes a backup of existing repository\n"
|
|
3641 |
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
|
|
3642 |
"automatically when it is safe to do so. To save disk space by removing\n"
|
|
3643 |
"the backed up pack files, the --clean-obsolete-packs option may be\n"
|
|
3644 |
"used."
|
|
3645 |
msgstr "" |
|
6093.4.212
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3646 |
"パック操作中に bazaar は既存のリポジトリデータ、\n"
|
3647 |
"すなわちパックファイルのバックアップをとります。\n"
|
|
3648 |
"このバックアップは安全に削除できるようになると、\n"
|
|
3649 |
"bazaar によって最終的には自動的に削除されます。\n"
|
|
3650 |
"バックアップされたパックファイルを削除し、\n"
|
|
3651 |
"ディスク容量を節約したい場合には --clean-obsolete-packs\n"
|
|
3652 |
"オプションをご利用ください。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3653 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3654 |
#: bzrlib/builtins.py:5086
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3655 |
msgid "" |
3656 |
"Warning: If you use --clean-obsolete-packs and your machine crashes\n" |
|
3657 |
"during or immediately after repacking, you may be left with a state\n"
|
|
3658 |
"where the deletion has been written to disk but the new packs have not\n"
|
|
3659 |
"been. In this case the repository may be unusable."
|
|
3660 |
msgstr "" |
|
6093.4.212
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3661 |
"警告: --clean-obsolete-packs を使っている最中、\n"
|
3662 |
"もしくは再パック直後にマシンがクラッシュした\n"
|
|
3663 |
"場合、削除結果はディスクに書き込まれたものの、\n"
|
|
3664 |
"新しいパックが書き込まれていない状態になって\n"
|
|
3665 |
"しまいます。この場合にはリポジトリは使用不可能と\n"
|
|
3666 |
"なってしまいます。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3667 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3668 |
#: bzrlib/builtins.py:5095
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3669 |
msgid "Delete obsolete packs to save disk space." |
6093.4.212
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3670 |
msgstr "古いパックファイルを削除し、ディスク容量を節約する。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3671 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3672 |
#: bzrlib/builtins.py:5109
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3673 |
msgid "List the installed plugins." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3674 |
msgstr "インストールされたプラグインの一覧を表示する。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3675 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3676 |
#: bzrlib/builtins.py:5111
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3677 |
msgid "" |
3678 |
"This command displays the list of installed plugins including\n"
|
|
3679 |
"version of plugin and a short description of each."
|
|
3680 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3681 |
"このコマンドは インストールされたプラグインの一覧を簡単な説明や\n"
|
3682 |
"バージョン情報とともに表示します。"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3683 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3684 |
#: bzrlib/builtins.py:5114
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3685 |
msgid "--verbose shows the path where each plugin is located." |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3686 |
msgstr "--verboseを指定すると各プラグインのインストール先のパスが表示されます。" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3687 |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3688 |
#: bzrlib/builtins.py:5116
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3689 |
msgid "" |
3690 |
"A plugin is an external component for Bazaar that extends the\n"
|
|
3691 |
"revision control system, by adding or replacing code in Bazaar.\n"
|
|
3692 |
"Plugins can do a variety of things, including overriding commands,\n"
|
|
3693 |
"adding new commands, providing additional network transports and\n"
|
|
3694 |
"customizing log output."
|
|
3695 |
msgstr "" |
|
3696 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3697 |
#: bzrlib/builtins.py:5122
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3698 |
msgid "" |
3699 |
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
|
|
3700 |
"for further information on plugins including where to find them and how to\n"
|
|
3701 |
"install them. Instructions are also provided there on how to write new\n"
|
|
3702 |
"plugins using the Python programming language."
|
|
3703 |
msgstr "" |
|
3704 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3705 |
#: bzrlib/builtins.py:5138
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3706 |
msgid "Show testament (signing-form) of a revision." |
3707 |
msgstr "" |
|
3708 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3709 |
#: bzrlib/builtins.py:5141
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3710 |
msgid "Produce long-format testament." |
3711 |
msgstr "" |
|
3712 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3713 |
#: bzrlib/builtins.py:5143
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3714 |
msgid "Produce a strict-format testament." |
3715 |
msgstr "" |
|
3716 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3717 |
#: bzrlib/builtins.py:5169
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3718 |
msgid "Show the origin of each line in a file." |
3719 |
msgstr "" |
|
3720 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3721 |
#: bzrlib/builtins.py:5171
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3722 |
msgid "" |
3723 |
"This prints out the given file with an annotation on the left side\n"
|
|
3724 |
"indicating which revision, author and date introduced the change."
|
|
3725 |
msgstr "" |
|
3726 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3727 |
#: bzrlib/builtins.py:5174
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3728 |
msgid "" |
3729 |
"If the origin is the same for a run of consecutive lines, it is\n"
|
|
3730 |
"shown only at the top, unless the --all option is given."
|
|
3731 |
msgstr "" |
|
3732 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3733 |
#: bzrlib/builtins.py:5182
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3734 |
msgid "Show annotations on all lines." |
3735 |
msgstr "" |
|
3736 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3737 |
#: bzrlib/builtins.py:5183
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3738 |
msgid "Show commit date in annotations." |
3739 |
msgstr "" |
|
3740 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3741 |
#: bzrlib/builtins.py:5270
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3742 |
msgid "Cannot sign a range of non-revision-history revisions" |
3743 |
msgstr "" |
|
3744 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3745 |
#: bzrlib/builtins.py:5282
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3746 |
msgid "Please supply either one revision, or a range." |
3747 |
msgstr "" |
|
3748 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3749 |
#: bzrlib/builtins.py:5286
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3750 |
msgid "" |
3751 |
"Convert the current branch into a checkout of the supplied branch.\n"
|
|
3752 |
"If no branch is supplied, rebind to the last bound location."
|
|
3753 |
msgstr "" |
|
3754 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3755 |
#: bzrlib/builtins.py:5289
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3756 |
msgid "" |
3757 |
"Once converted into a checkout, commits must succeed on the master branch\n"
|
|
3758 |
"before they will be applied to the local branch."
|
|
3759 |
msgstr "" |
|
3760 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3761 |
#: bzrlib/builtins.py:5292
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3762 |
msgid "" |
3763 |
"Bound branches use the nickname of its master branch unless it is set\n"
|
|
3764 |
"locally, in which case binding will update the local nickname to be\n"
|
|
3765 |
"that of the master."
|
|
3766 |
msgstr "" |
|
3767 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3768 |
#: bzrlib/builtins.py:5307
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3769 |
msgid "No location supplied. This format does not remember old locations." |
3770 |
msgstr "" |
|
3771 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3772 |
#: bzrlib/builtins.py:5313
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3773 |
msgid "Branch is already bound" |
3774 |
msgstr "" |
|
3775 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3776 |
#: bzrlib/builtins.py:5316
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3777 |
msgid "No location supplied and no previous location known" |
3778 |
msgstr "" |
|
3779 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3780 |
#: bzrlib/builtins.py:5322
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3781 |
msgid "These branches have diverged. Try merging, and then bind again." |
3782 |
msgstr "" |
|
3783 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3784 |
#: bzrlib/builtins.py:5329
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3785 |
msgid "Convert the current checkout into a regular branch." |
3786 |
msgstr "" |
|
3787 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3788 |
#: bzrlib/builtins.py:5331
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3789 |
msgid "" |
3790 |
"After unbinding, the local branch is considered independent and subsequent\n"
|
|
3791 |
"commits will be local only."
|
|
3792 |
msgstr "" |
|
3793 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3794 |
#: bzrlib/builtins.py:5342
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3795 |
msgid "Local branch is not bound" |
3796 |
msgstr "" |
|
3797 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3798 |
#: bzrlib/builtins.py:5346
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3799 |
msgid "Remove the last committed revision." |
3800 |
msgstr "" |
|
3801 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3802 |
#: bzrlib/builtins.py:5348
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3803 |
msgid "" |
3804 |
"--verbose will print out what is being removed.\n"
|
|
3805 |
"--dry-run will go through all the motions, but not actually\n"
|
|
3806 |
"remove anything."
|
|
3807 |
msgstr "" |
|
3808 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3809 |
#: bzrlib/builtins.py:5352
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3810 |
msgid "" |
3811 |
"If --revision is specified, uncommit revisions to leave the branch at the\n"
|
|
3812 |
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
|
|
3813 |
"branch at revision 15."
|
|
3814 |
msgstr "" |
|
3815 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3816 |
#: bzrlib/builtins.py:5356
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3817 |
msgid "" |
3818 |
"Uncommit leaves the working tree ready for a new commit. The only change\n"
|
|
3819 |
"it may make is to restore any pending merges that were present before\n"
|
|
3820 |
"the commit."
|
|
3821 |
msgstr "" |
|
3822 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3823 |
#: bzrlib/builtins.py:5367
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3824 |
msgid "Don't actually make changes." |
3825 |
msgstr "" |
|
3826 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3827 |
#: bzrlib/builtins.py:5368
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3828 |
msgid "Say yes to all questions." |
3829 |
msgstr "" |
|
3830 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3831 |
#: bzrlib/builtins.py:5370
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3832 |
msgid "Keep tags that point to removed revisions." |
3833 |
msgstr "" |
|
3834 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3835 |
#: bzrlib/builtins.py:5372
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3836 |
msgid "Only remove the commits from the local branch when in a checkout." |
3837 |
msgstr "" |
|
3838 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3839 |
#: bzrlib/builtins.py:5421
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3840 |
msgid "No revisions to uncommit.\n" |
3841 |
msgstr "" |
|
3842 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3843 |
#: bzrlib/builtins.py:5436
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3844 |
msgid "Dry-run, pretending to remove the above revisions.\n" |
3845 |
msgstr "" |
|
3846 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3847 |
#: bzrlib/builtins.py:5439
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3848 |
msgid "The above revision(s) will be removed.\n" |
3849 |
msgstr "" |
|
3850 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3851 |
#: bzrlib/builtins.py:5443
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3852 |
msgid "Uncommit these revisions" |
3853 |
msgstr "" |
|
3854 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3855 |
#: bzrlib/builtins.py:5446
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3856 |
msgid "Canceled\n" |
3857 |
msgstr "" |
|
3858 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3859 |
#: bzrlib/builtins.py:5453
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3860 |
#, python-format
|
3861 |
msgid "" |
|
3862 |
"You can restore the old tip by running:\n"
|
|
3863 |
" bzr pull . -r revid:%s\n"
|
|
3864 |
msgstr "" |
|
3865 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3866 |
#: bzrlib/builtins.py:5458
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3867 |
msgid "Break a dead lock." |
3868 |
msgstr "" |
|
3869 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3870 |
#: bzrlib/builtins.py:5460
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3871 |
msgid "" |
3872 |
"This command breaks a lock on a repository, branch, working directory or\n"
|
|
3873 |
"config file."
|
|
3874 |
msgstr "" |
|
3875 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3876 |
#: bzrlib/builtins.py:5463
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3877 |
msgid "" |
3878 |
"CAUTION: Locks should only be broken when you are sure that the process\n" |
|
3879 |
"holding the lock has been stopped."
|
|
3880 |
msgstr "" |
|
3881 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3882 |
#: bzrlib/builtins.py:5466
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3883 |
msgid "" |
3884 |
"You can get information on what locks are open via the 'bzr info\n"
|
|
3885 |
"[location]' command."
|
|
3886 |
msgstr "" |
|
3887 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3888 |
#: bzrlib/builtins.py:5469
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3889 |
msgid "" |
3890 |
":Examples:\n"
|
|
3891 |
" bzr break-lock\n"
|
|
3892 |
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
|
|
3893 |
" bzr break-lock --conf ~/.bazaar"
|
|
3894 |
msgstr "" |
|
3895 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3896 |
#: bzrlib/builtins.py:5478
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3897 |
msgid "LOCATION is the directory where the config lock is." |
3898 |
msgstr "" |
|
3899 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3900 |
#: bzrlib/builtins.py:5480
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3901 |
msgid "Do not ask for confirmation before breaking the lock." |
3902 |
msgstr "" |
|
3903 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3904 |
#: bzrlib/builtins.py:5515
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3905 |
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)" |
3906 |
msgstr "" |
|
3907 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3908 |
#: bzrlib/builtins.py:5516
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3909 |
msgid "Run the bzr server." |
3910 |
msgstr "" |
|
3911 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3912 |
#: bzrlib/builtins.py:5522
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3913 |
msgid "Serve on stdin/out for use from inetd or sshd." |
3914 |
msgstr "" |
|
3915 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3916 |
#: bzrlib/builtins.py:5523
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3917 |
msgid "protocol" |
3918 |
msgstr "" |
|
3919 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3920 |
#: bzrlib/builtins.py:5524
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3921 |
msgid "Protocol to serve." |
3922 |
msgstr "" |
|
3923 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3924 |
#: bzrlib/builtins.py:5528
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3925 |
msgid "Listen for connections on nominated address." |
3926 |
msgstr "" |
|
3927 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3928 |
#: bzrlib/builtins.py:5530
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3929 |
msgid "" |
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3930 |
"Listen for connections on nominated port. Passing 0 as the port number will "
|
3931 |
"result in a dynamically allocated port. The default port depends on the "
|
|
3932 |
"protocol."
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3933 |
msgstr "" |
3934 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3935 |
#: bzrlib/builtins.py:5535
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3936 |
msgid "Serve contents of this directory." |
3937 |
msgstr "" |
|
3938 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3939 |
#: bzrlib/builtins.py:5537
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3940 |
msgid "" |
3941 |
"By default the server is a readonly server. Supplying --allow-writes "
|
|
3942 |
"enables write access to the contents of the served directory and below. "
|
|
3943 |
"Note that ``bzr serve`` does not perform authentication, so unless some form "
|
|
3944 |
"of external authentication is arranged supplying this option leads to global "
|
|
3945 |
"uncontrolled write access to your file system."
|
|
3946 |
msgstr "" |
|
3947 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3948 |
#: bzrlib/builtins.py:5546
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3949 |
msgid "Override the default idle client timeout (5min)." |
3950 |
msgstr "" |
|
3951 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3952 |
#: bzrlib/builtins.py:5564
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3953 |
msgid "Combine a tree into its containing tree." |
3954 |
msgstr "" |
|
3955 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3956 |
#: bzrlib/builtins.py:5566
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3957 |
msgid "This command requires the target tree to be in a rich-root format." |
3958 |
msgstr "" |
|
3959 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3960 |
#: bzrlib/builtins.py:5568
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3961 |
msgid "" |
3962 |
"The TREE argument should be an independent tree, inside another tree, but\n"
|
|
3963 |
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
|
|
3964 |
"running \"bzr branch\" with the target inside a tree.)"
|
|
3965 |
msgstr "" |
|
3966 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3967 |
#: bzrlib/builtins.py:5572
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3968 |
msgid "" |
3969 |
"The result is a combined tree, with the subtree no longer an independent\n"
|
|
3970 |
"part. This is marked as a merge of the subtree into the containing tree,\n"
|
|
3971 |
"and all history is preserved."
|
|
3972 |
msgstr "" |
|
3973 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3974 |
#: bzrlib/builtins.py:5590
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3975 |
#, python-format
|
3976 |
msgid "" |
|
3977 |
"Can't join trees because %s doesn't support rich root data.\n"
|
|
3978 |
"You can use bzr upgrade on the repository."
|
|
3979 |
msgstr "" |
|
3980 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3981 |
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3982 |
msgid "Cannot join {0}. {1}" |
3983 |
msgstr "" |
|
3984 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3985 |
#: bzrlib/builtins.py:5610
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3986 |
msgid "Split a subdirectory of a tree into a separate tree." |
3987 |
msgstr "" |
|
3988 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3989 |
#: bzrlib/builtins.py:5612
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3990 |
msgid "" |
3991 |
"This command will produce a target tree in a format that supports\n"
|
|
3992 |
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
|
|
3993 |
"converted into earlier formats like 'dirstate-tags'."
|
|
3994 |
msgstr "" |
|
3995 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3996 |
#: bzrlib/builtins.py:5616
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
3997 |
msgid "" |
3998 |
"The TREE argument should be a subdirectory of a working tree. That\n"
|
|
3999 |
"subdirectory will be converted into an independent tree, with its own\n"
|
|
4000 |
"branch. Commits in the top-level tree will not apply to the new subtree."
|
|
4001 |
msgstr "" |
|
4002 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4003 |
#: bzrlib/builtins.py:5696
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4004 |
msgid "No submit branch specified or known" |
4005 |
msgstr "" |
|
4006 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4007 |
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4008 |
msgid "No public branch specified or known" |
4009 |
msgstr "" |
|
4010 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4011 |
#: bzrlib/builtins.py:5710
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4012 |
msgid "bzr merge-directive takes at most two one revision identifiers" |
4013 |
msgstr "" |
|
4014 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4015 |
#: bzrlib/builtins.py:5719
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4016 |
msgid "No revisions to bundle." |
4017 |
msgstr "" |
|
4018 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4019 |
#: bzrlib/builtins.py:5738
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4020 |
msgid "Mail or create a merge-directive for submitting changes." |
4021 |
msgstr "" |
|
4022 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4023 |
#: bzrlib/builtins.py:5740
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4024 |
msgid "A merge directive provides many things needed for requesting merges:" |
4025 |
msgstr "" |
|
4026 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4027 |
#: bzrlib/builtins.py:5742
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4028 |
msgid "* A machine-readable description of the merge to perform" |
4029 |
msgstr "" |
|
4030 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4031 |
#: bzrlib/builtins.py:5744
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4032 |
msgid "* An optional patch that is a preview of the changes requested" |
4033 |
msgstr "" |
|
4034 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4035 |
#: bzrlib/builtins.py:5746
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4036 |
msgid "" |
4037 |
"* An optional bundle of revision data, so that the changes can be applied\n"
|
|
4038 |
" directly from the merge directive, without retrieving data from a\n"
|
|
4039 |
" branch."
|
|
4040 |
msgstr "" |
|
4041 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4042 |
#: bzrlib/builtins.py:5750
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4043 |
msgid "" |
4044 |
"`bzr send` creates a compact data set that, when applied using bzr\n"
|
|
4045 |
"merge, has the same effect as merging from the source branch. "
|
|
4046 |
msgstr "" |
|
4047 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4048 |
#: bzrlib/builtins.py:5753
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4049 |
msgid "" |
4050 |
"By default the merge directive is self-contained and can be applied to any\n"
|
|
4051 |
"branch containing submit_branch in its ancestory without needing access to\n"
|
|
4052 |
"the source branch."
|
|
4053 |
msgstr "" |
|
4054 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4055 |
#: bzrlib/builtins.py:5757
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4056 |
msgid "" |
4057 |
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
|
|
4058 |
"revisions, but only a structured request to merge from the\n"
|
|
4059 |
"public_location. In that case the public_branch is needed and it must be\n"
|
|
4060 |
"up-to-date and accessible to the recipient. The public_branch is always\n"
|
|
4061 |
"included if known, so that people can check it later."
|
|
4062 |
msgstr "" |
|
4063 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4064 |
#: bzrlib/builtins.py:5763
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4065 |
msgid "" |
4066 |
"The submit branch defaults to the parent of the source branch, but can be\n"
|
|
4067 |
"overridden. Both submit branch and public branch will be remembered in\n"
|
|
4068 |
"branch.conf the first time they are used for a particular branch. The\n"
|
|
4069 |
"source branch defaults to that containing the working directory, but can\n"
|
|
4070 |
"be changed using --from."
|
|
4071 |
msgstr "" |
|
4072 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4073 |
#: bzrlib/builtins.py:5769
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4074 |
msgid "" |
4075 |
"Both the submit branch and the public branch follow the usual behavior with\n"
|
|
4076 |
"respect to --remember: If there is no default location set, the first send\n"
|
|
4077 |
"will set it (use --no-remember to avoid setting it). After that, you can\n"
|
|
4078 |
"omit the location to use the default. To change the default, use\n"
|
|
4079 |
"--remember. The value will only be saved if the location can be accessed."
|
|
4080 |
msgstr "" |
|
4081 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4082 |
#: bzrlib/builtins.py:5775
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4083 |
msgid "" |
4084 |
"In order to calculate those changes, bzr must analyse the submit branch.\n"
|
|
4085 |
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
|
|
4086 |
"If a public location is known for the submit_branch, that location is used\n"
|
|
4087 |
"in the merge directive."
|
|
4088 |
msgstr "" |
|
4089 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4090 |
#: bzrlib/builtins.py:5780
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4091 |
msgid "" |
4092 |
"The default behaviour is to send the merge directive by mail, unless -o is\n"
|
|
4093 |
"given, in which case it is sent to a file."
|
|
4094 |
msgstr "" |
|
4095 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4096 |
#: bzrlib/builtins.py:5783
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4097 |
msgid "" |
4098 |
"Mail is sent using your preferred mail program. This should be transparent\n"
|
|
4099 |
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
|
|
4100 |
"If the preferred client can't be found (or used), your editor will be used."
|
|
4101 |
msgstr "" |
|
4102 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4103 |
#: bzrlib/builtins.py:5787
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4104 |
msgid "" |
4105 |
"To use a specific mail program, set the mail_client configuration option.\n"
|
|
4106 |
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
|
|
4107 |
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
|
|
4108 |
"(MacOS X's\n"
|
|
4109 |
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
|
|
4110 |
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
|
|
4111 |
"add\n"
|
|
4112 |
"supported clients."
|
|
4113 |
msgstr "" |
|
4114 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4115 |
#: bzrlib/builtins.py:5794
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4116 |
msgid "" |
4117 |
"If mail is being sent, a to address is required. This can be supplied\n"
|
|
4118 |
"either on the commandline, by setting the submit_to configuration\n"
|
|
4119 |
"option in the branch itself or the child_submit_to configuration option\n"
|
|
4120 |
"in the submit branch."
|
|
4121 |
msgstr "" |
|
4122 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4123 |
#: bzrlib/builtins.py:5799
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4124 |
msgid "" |
4125 |
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
|
|
4126 |
"and\n"
|
|
4127 |
"merge directive format 2. It is significantly faster and smaller than\n"
|
|
4128 |
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
|
|
4129 |
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
|
|
4130 |
"format 1. It is compatible with Bazaar 0.12 - 0.18."
|
|
4131 |
msgstr "" |
|
4132 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4133 |
#: bzrlib/builtins.py:5805
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4134 |
msgid "" |
4135 |
"The merge directives created by bzr send may be applied using bzr merge or\n"
|
|
4136 |
"bzr pull by specifying a file containing a merge directive as the location."
|
|
4137 |
msgstr "" |
|
4138 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4139 |
#: bzrlib/builtins.py:5808
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4140 |
msgid "" |
4141 |
"bzr send makes extensive use of public locations to map local locations "
|
|
4142 |
"into\n"
|
|
4143 |
"URLs that can be used by other people. See `bzr help configuration` to\n"
|
|
4144 |
"set them, and use `bzr info` to display them."
|
|
4145 |
msgstr "" |
|
4146 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4147 |
#: bzrlib/builtins.py:5832
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4148 |
msgid "Write merge directive to this file or directory; use - for stdout." |
4149 |
msgstr "" |
|
4150 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4151 |
#: bzrlib/builtins.py:5836
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4152 |
msgid "" |
4153 |
"Refuse to send if there are uncommitted changes in the working tree, --no-"
|
|
4154 |
"strict disables the check."
|
|
4155 |
msgstr "" |
|
4156 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4157 |
#: bzrlib/builtins.py:5838
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4158 |
msgid "Mail the request to this address." |
4159 |
msgstr "" |
|
4160 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4161 |
#: bzrlib/builtins.py:5842
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4162 |
msgid "Body for the email." |
4163 |
msgstr "" |
|
4164 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4165 |
#: bzrlib/builtins.py:5895
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4166 |
msgid "Do not include a bundle in the merge directive." |
4167 |
msgstr "" |
|
4168 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4169 |
#: bzrlib/builtins.py:5896
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4170 |
msgid "Do not include a preview patch in the merge directive." |
4171 |
msgstr "" |
|
4172 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4173 |
#: bzrlib/builtins.py:5899
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4174 |
msgid "Remember submit and public branch." |
4175 |
msgstr "" |
|
4176 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4177 |
#: bzrlib/builtins.py:5901
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4178 |
msgid "" |
4179 |
"Branch to generate the submission from, rather than the one containing the "
|
|
4180 |
"working directory."
|
|
4181 |
msgstr "" |
|
4182 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4183 |
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4184 |
msgid "format" |
4185 |
msgstr "" |
|
4186 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4187 |
#: bzrlib/builtins.py:5912
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4188 |
msgid "Use the specified output format." |
4189 |
msgstr "" |
|
4190 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4191 |
#: bzrlib/builtins.py:5934
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4192 |
msgid "Create, remove or modify a tag naming a revision." |
4193 |
msgstr "" |
|
4194 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4195 |
#: bzrlib/builtins.py:5936
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4196 |
msgid "" |
4197 |
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
|
|
4198 |
"(--revision) option can be given -rtag:X, where X is any previously\n"
|
|
4199 |
"created tag."
|
|
4200 |
msgstr "" |
|
4201 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4202 |
#: bzrlib/builtins.py:5940
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4203 |
msgid "" |
4204 |
"Tags are stored in the branch. Tags are copied from one branch to another\n"
|
|
4205 |
"along when you branch, push, pull or merge."
|
|
4206 |
msgstr "" |
|
4207 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4208 |
#: bzrlib/builtins.py:5943
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4209 |
msgid "" |
4210 |
"It is an error to give a tag name that already exists unless you pass\n"
|
|
4211 |
"--force, in which case the tag is moved to point to the new revision."
|
|
4212 |
msgstr "" |
|
4213 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4214 |
#: bzrlib/builtins.py:5946
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4215 |
msgid "" |
4216 |
"To rename a tag (change the name but keep it on the same revsion), run "
|
|
4217 |
"``bzr\n"
|
|
4218 |
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
|
|
4219 |
msgstr "" |
|
4220 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4221 |
#: bzrlib/builtins.py:5949
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4222 |
msgid "" |
4223 |
"If no tag name is specified it will be determined through the \n"
|
|
4224 |
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
|
|
4225 |
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
|
|
4226 |
"details."
|
|
4227 |
msgstr "" |
|
4228 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4229 |
#: bzrlib/builtins.py:5959
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4230 |
msgid "Delete this tag rather than placing it." |
4231 |
msgstr "" |
|
4232 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4233 |
#: bzrlib/builtins.py:5962
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4234 |
msgid "Branch in which to place the tag." |
4235 |
msgstr "" |
|
4236 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4237 |
#: bzrlib/builtins.py:5964
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4238 |
msgid "Replace existing tags." |
4239 |
msgstr "" |
|
4240 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4241 |
#: bzrlib/builtins.py:5979
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4242 |
msgid "No tag specified to delete." |
4243 |
msgstr "" |
|
4244 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4245 |
#: bzrlib/builtins.py:5981
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4246 |
#, python-format
|
4247 |
msgid "Deleted tag %s." |
|
4248 |
msgstr "" |
|
4249 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4250 |
#: bzrlib/builtins.py:5995
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4251 |
msgid "Please specify a tag name." |
4252 |
msgstr "" |
|
4253 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4254 |
#: bzrlib/builtins.py:6003
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4255 |
#, python-format
|
4256 |
msgid "Tag %s already exists for that revision." |
|
4257 |
msgstr "" |
|
4258 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4259 |
#: bzrlib/builtins.py:6007
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4260 |
#, python-format
|
4261 |
msgid "Created tag %s." |
|
4262 |
msgstr "" |
|
4263 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4264 |
#: bzrlib/builtins.py:6009
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4265 |
#, python-format
|
4266 |
msgid "Updated tag %s." |
|
4267 |
msgstr "" |
|
4268 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4269 |
#: bzrlib/builtins.py:6013
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4270 |
msgid "List tags." |
4271 |
msgstr "" |
|
4272 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4273 |
#: bzrlib/builtins.py:6015
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4274 |
msgid "" |
4275 |
"This command shows a table of tag names and the revisions they reference."
|
|
4276 |
msgstr "" |
|
4277 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4278 |
#: bzrlib/builtins.py:6021
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4279 |
msgid "Branch whose tags should be displayed." |
4280 |
msgstr "" |
|
4281 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4282 |
#: bzrlib/builtins.py:6023
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4283 |
msgid "Sort tags by different criteria." |
4284 |
msgstr "" |
|
4285 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4286 |
#: bzrlib/builtins.py:6023
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4287 |
msgid "Sorting" |
4288 |
msgstr "" |
|
4289 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4290 |
#: bzrlib/builtins.py:6092
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4291 |
msgid "Reconfigure the type of a bzr directory." |
4292 |
msgstr "" |
|
4293 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4294 |
#: bzrlib/builtins.py:6094
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4295 |
msgid "A target configuration must be specified." |
4296 |
msgstr "" |
|
4297 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4298 |
#: bzrlib/builtins.py:6096
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4299 |
msgid "" |
4300 |
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
|
|
4301 |
"The order of preference is\n"
|
|
4302 |
"1. For a lightweight checkout, the current bound location.\n"
|
|
4303 |
"2. For branches that used to be checkouts, the previously-bound location.\n"
|
|
4304 |
"3. The push location.\n"
|
|
4305 |
"4. The parent location.\n"
|
|
4306 |
"If none of these is available, --bind-to must be specified."
|
|
4307 |
msgstr "" |
|
4308 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4309 |
#: bzrlib/builtins.py:6110
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4310 |
msgid "Tree type" |
4311 |
msgstr "" |
|
4312 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4313 |
#: bzrlib/builtins.py:6111
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4314 |
msgid "The relation between branch and tree." |
4315 |
msgstr "" |
|
4316 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4317 |
#: bzrlib/builtins.py:6113
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4318 |
msgid "Reconfigure to be an unbound branch with no working tree." |
4319 |
msgstr "" |
|
4320 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4321 |
#: bzrlib/builtins.py:6114
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4322 |
msgid "Reconfigure to be an unbound branch with a working tree." |
4323 |
msgstr "" |
|
4324 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4325 |
#: bzrlib/builtins.py:6115
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4326 |
msgid "Reconfigure to be a bound branch with a working tree." |
4327 |
msgstr "" |
|
4328 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4329 |
#: bzrlib/builtins.py:6116
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4330 |
msgid "Reconfigure to be a lightweight checkout (with no local history)." |
4331 |
msgstr "" |
|
4332 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4333 |
#: bzrlib/builtins.py:6121
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4334 |
msgid "Repository type" |
4335 |
msgstr "" |
|
4336 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4337 |
#: bzrlib/builtins.py:6122
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4338 |
msgid "Location fo the repository." |
4339 |
msgstr "" |
|
4340 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4341 |
#: bzrlib/builtins.py:6124
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4342 |
msgid "" |
4343 |
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
|
|
4344 |
msgstr "" |
|
4345 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4346 |
#: bzrlib/builtins.py:6126
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4347 |
msgid "Reconfigure to use a shared repository." |
4348 |
msgstr "" |
|
4349 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4350 |
#: bzrlib/builtins.py:6130
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4351 |
msgid "Trees in Repository" |
4352 |
msgstr "" |
|
4353 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4354 |
#: bzrlib/builtins.py:6131
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4355 |
msgid "Whether new branches in the repository have trees." |
4356 |
msgstr "" |
|
4357 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4358 |
#: bzrlib/builtins.py:6133
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4359 |
msgid "" |
4360 |
"Reconfigure repository to create working trees on branches by default."
|
|
4361 |
msgstr "" |
|
4362 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4363 |
#: bzrlib/builtins.py:6135
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4364 |
msgid "" |
4365 |
"Reconfigure repository to not create working trees on branches by default."
|
|
4366 |
msgstr "" |
|
4367 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4368 |
#: bzrlib/builtins.py:6138
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4369 |
msgid "Branch to bind checkout to." |
4370 |
msgstr "" |
|
4371 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4372 |
#: bzrlib/builtins.py:6140
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4373 |
msgid "Perform reconfiguration even if local changes will be lost." |
4374 |
msgstr "" |
|
4375 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4376 |
#: bzrlib/builtins.py:6143
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4377 |
msgid "Reconfigure a branch to be stacked on another branch." |
4378 |
msgstr "" |
|
4379 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4380 |
#: bzrlib/builtins.py:6147
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4381 |
msgid "" |
4382 |
"Reconfigure a branch to be unstacked. This may require copying substantial "
|
|
4383 |
"data into it."
|
|
4384 |
msgstr "" |
|
4385 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4386 |
#: bzrlib/builtins.py:6157
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4387 |
msgid "Can't use both --stacked-on and --unstacked" |
4388 |
msgstr "" |
|
4389 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4390 |
#: bzrlib/builtins.py:6171
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4391 |
msgid "No target configuration specified" |
4392 |
msgstr "" |
|
4393 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4394 |
#: bzrlib/builtins.py:6206
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4395 |
msgid "Set the branch of a checkout and update." |
4396 |
msgstr "" |
|
4397 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4398 |
#: bzrlib/builtins.py:6208
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4399 |
msgid "" |
4400 |
"For lightweight checkouts, this changes the branch being referenced.\n"
|
|
4401 |
"For heavyweight checkouts, this checks that there are no local commits\n"
|
|
4402 |
"versus the current bound branch, then it makes the local branch a mirror\n"
|
|
4403 |
"of the new location and binds to it."
|
|
4404 |
msgstr "" |
|
4405 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4406 |
#: bzrlib/builtins.py:6213
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4407 |
msgid "" |
4408 |
"In both cases, the working tree is updated and uncommitted changes\n"
|
|
4409 |
"are merged. The user can commit or revert these as they desire."
|
|
4410 |
msgstr "" |
|
4411 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4412 |
#: bzrlib/builtins.py:6216
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4413 |
msgid "Pending merges need to be committed or reverted before using switch." |
4414 |
msgstr "" |
|
4415 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4416 |
#: bzrlib/builtins.py:6218
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4417 |
msgid "" |
4418 |
"The path to the branch to switch to can be specified relative to the parent\n"
|
|
4419 |
"directory of the current branch. For example, if you are currently in a\n"
|
|
4420 |
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
|
|
4421 |
"/path/to/newbranch."
|
|
4422 |
msgstr "" |
|
4423 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4424 |
#: bzrlib/builtins.py:6223
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4425 |
msgid "" |
4426 |
"Bound branches use the nickname of its master branch unless it is set\n"
|
|
4427 |
"locally, in which case switching will update the local nickname to be\n"
|
|
4428 |
"that of the master."
|
|
4429 |
msgstr "" |
|
4430 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4431 |
#: bzrlib/builtins.py:6231
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4432 |
msgid "Switch even if local commits will be lost." |
4433 |
msgstr "" |
|
4434 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4435 |
#: bzrlib/builtins.py:6234
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4436 |
msgid "Create the target branch from this one before switching to it." |
4437 |
msgstr "" |
|
4438 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4439 |
#: bzrlib/builtins.py:6248
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4440 |
msgid "You must supply either a revision or a location" |
4441 |
msgstr "" |
|
4442 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4443 |
#: bzrlib/builtins.py:6261
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4444 |
msgid "cannot create branch without source branch" |
4445 |
msgstr "" |
|
4446 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4447 |
#: bzrlib/builtins.py:6286
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4448 |
msgid "Manage filtered views." |
4449 |
msgstr "" |
|
4450 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4451 |
#: bzrlib/builtins.py:6288
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4452 |
msgid "" |
4453 |
"Views provide a mask over the tree so that users can focus on\n"
|
|
4454 |
"a subset of a tree when doing their work. After creating a view,\n"
|
|
4455 |
"commands that support a list of files - status, diff, commit, etc -\n"
|
|
4456 |
"effectively have that list of files implicitly given each time.\n"
|
|
4457 |
"An explicit list of files can still be given but those files\n"
|
|
4458 |
"must be within the current view."
|
|
4459 |
msgstr "" |
|
4460 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4461 |
#: bzrlib/builtins.py:6295
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4462 |
msgid "" |
4463 |
"In most cases, a view has a short life-span: it is created to make\n"
|
|
4464 |
"a selected change and is deleted once that change is committed.\n"
|
|
4465 |
"At other times, you may wish to create one or more named views\n"
|
|
4466 |
"and switch between them."
|
|
4467 |
msgstr "" |
|
4468 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4469 |
#: bzrlib/builtins.py:6300
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4470 |
msgid "" |
4471 |
"To disable the current view without deleting it, you can switch to\n"
|
|
4472 |
"the pseudo view called ``off``. This can be useful when you need\n"
|
|
4473 |
"to see the whole tree for an operation or two (e.g. merge) but\n"
|
|
4474 |
"want to switch back to your view after that."
|
|
4475 |
msgstr "" |
|
4476 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4477 |
#: bzrlib/builtins.py:6305
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4478 |
msgid "" |
4479 |
":Examples:\n"
|
|
4480 |
" To define the current view::"
|
|
4481 |
msgstr "" |
|
4482 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4483 |
#: bzrlib/builtins.py:6308
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4484 |
msgid " bzr view file1 dir1 ..." |
4485 |
msgstr "" |
|
4486 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4487 |
#: bzrlib/builtins.py:6310
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4488 |
msgid " To list the current view::" |
4489 |
msgstr "" |
|
4490 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4491 |
#: bzrlib/builtins.py:6312
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4492 |
msgid " bzr view" |
4493 |
msgstr "" |
|
4494 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4495 |
#: bzrlib/builtins.py:6314
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4496 |
msgid " To delete the current view::" |
4497 |
msgstr "" |
|
4498 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4499 |
#: bzrlib/builtins.py:6316
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4500 |
msgid " bzr view --delete" |
4501 |
msgstr "" |
|
4502 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4503 |
#: bzrlib/builtins.py:6318
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4504 |
msgid " To disable the current view without deleting it::" |
4505 |
msgstr "" |
|
4506 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4507 |
#: bzrlib/builtins.py:6320
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4508 |
msgid " bzr view --switch off" |
4509 |
msgstr "" |
|
4510 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4511 |
#: bzrlib/builtins.py:6322
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4512 |
msgid " To define a named view and switch to it::" |
4513 |
msgstr "" |
|
4514 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4515 |
#: bzrlib/builtins.py:6324
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4516 |
msgid " bzr view --name view-name file1 dir1 ..." |
4517 |
msgstr "" |
|
4518 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4519 |
#: bzrlib/builtins.py:6326
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4520 |
msgid " To list a named view::" |
4521 |
msgstr "" |
|
4522 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4523 |
#: bzrlib/builtins.py:6328
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4524 |
msgid " bzr view --name view-name" |
4525 |
msgstr "" |
|
4526 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4527 |
#: bzrlib/builtins.py:6330
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4528 |
msgid " To delete a named view::" |
4529 |
msgstr "" |
|
4530 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4531 |
#: bzrlib/builtins.py:6332
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4532 |
msgid " bzr view --name view-name --delete" |
4533 |
msgstr "" |
|
4534 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4535 |
#: bzrlib/builtins.py:6334
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4536 |
msgid " To switch to a named view::" |
4537 |
msgstr "" |
|
4538 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4539 |
#: bzrlib/builtins.py:6336
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4540 |
msgid " bzr view --switch view-name" |
4541 |
msgstr "" |
|
4542 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4543 |
#: bzrlib/builtins.py:6338
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4544 |
msgid " To list all views defined::" |
4545 |
msgstr "" |
|
4546 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4547 |
#: bzrlib/builtins.py:6340
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4548 |
msgid " bzr view --all" |
4549 |
msgstr "" |
|
4550 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4551 |
#: bzrlib/builtins.py:6342
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4552 |
msgid " To delete all views::" |
4553 |
msgstr "" |
|
4554 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4555 |
#: bzrlib/builtins.py:6344
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4556 |
msgid " bzr view --delete --all" |
4557 |
msgstr "" |
|
4558 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4559 |
#: bzrlib/builtins.py:6351
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4560 |
msgid "Apply list or delete action to all views." |
4561 |
msgstr "" |
|
4562 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4563 |
#: bzrlib/builtins.py:6354
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4564 |
msgid "Delete the view." |
4565 |
msgstr "" |
|
4566 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4567 |
#: bzrlib/builtins.py:6357
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4568 |
msgid "Name of the view to define, list or delete." |
4569 |
msgstr "" |
|
4570 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4571 |
#: bzrlib/builtins.py:6361
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4572 |
msgid "Name of the view to switch to." |
4573 |
msgstr "" |
|
4574 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4575 |
#: bzrlib/builtins.py:6380
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4576 |
msgid "Both --delete and a file list specified" |
4577 |
msgstr "" |
|
4578 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4579 |
#: bzrlib/builtins.py:6383
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4580 |
msgid "Both --delete and --switch specified" |
4581 |
msgstr "" |
|
4582 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4583 |
#: bzrlib/builtins.py:6386
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4584 |
msgid "Deleted all views.\n" |
4585 |
msgstr "" |
|
4586 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4587 |
#: bzrlib/builtins.py:6388
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4588 |
msgid "No current view to delete" |
4589 |
msgstr "" |
|
4590 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4591 |
#: bzrlib/builtins.py:6391
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4592 |
#, python-format
|
4593 |
msgid "Deleted '%s' view.\n" |
|
4594 |
msgstr "" |
|
4595 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4596 |
#: bzrlib/builtins.py:6395
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4597 |
msgid "Both --switch and a file list specified" |
4598 |
msgstr "" |
|
4599 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4600 |
#: bzrlib/builtins.py:6398
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4601 |
msgid "Both --switch and --all specified" |
4602 |
msgstr "" |
|
4603 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4604 |
#: bzrlib/builtins.py:6401
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4605 |
msgid "No current view to disable" |
4606 |
msgstr "" |
|
4607 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4608 |
#: bzrlib/builtins.py:6403
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4609 |
#, python-format
|
4610 |
msgid "Disabled '%s' view.\n" |
|
4611 |
msgstr "" |
|
4612 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4613 |
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4614 |
msgid "Using '{0}' view: {1}\n" |
4615 |
msgstr "" |
|
4616 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4617 |
#: bzrlib/builtins.py:6410
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4618 |
msgid "Views defined:\n" |
4619 |
msgstr "" |
|
4620 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4621 |
#: bzrlib/builtins.py:6419
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4622 |
msgid "No views defined.\n" |
4623 |
msgstr "" |
|
4624 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4625 |
#: bzrlib/builtins.py:6426
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4626 |
msgid "Cannot change the 'off' pseudo view" |
4627 |
msgstr "" |
|
4628 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4629 |
#: bzrlib/builtins.py:6434
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4630 |
msgid "No current view.\n" |
4631 |
msgstr "" |
|
4632 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4633 |
#: bzrlib/builtins.py:6437
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4634 |
msgid "'{0}' view is: {1}\n" |
4635 |
msgstr "" |
|
4636 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4637 |
#: bzrlib/builtins.py:6457
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4638 |
msgid " <no hooks installed>\n" |
4639 |
msgstr "" |
|
4640 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4641 |
#: bzrlib/builtins.py:6461
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4642 |
msgid "Remove a branch." |
4643 |
msgstr "" |
|
4644 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4645 |
#: bzrlib/builtins.py:6463
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4646 |
msgid "" |
4647 |
"This will remove the branch from the specified location but \n"
|
|
4648 |
"will keep any working tree or repository in place."
|
|
4649 |
msgstr "" |
|
4650 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4651 |
#: bzrlib/builtins.py:6468
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4652 |
msgid " Remove the branch at repo/trunk::" |
4653 |
msgstr "" |
|
4654 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4655 |
#: bzrlib/builtins.py:6470
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4656 |
msgid " bzr remove-branch repo/trunk" |
4657 |
msgstr "" |
|
4658 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4659 |
#: bzrlib/builtins.py:6477
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4660 |
msgid "Remove branch even if it is the active branch." |
4661 |
msgstr "" |
|
4662 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4663 |
#: bzrlib/builtins.py:6491
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4664 |
msgid "Branch is active. Use --force to remove it." |
4665 |
msgstr "" |
|
4666 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4667 |
#: bzrlib/builtins.py:6495
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4668 |
msgid "Plaintext diff output." |
4669 |
msgstr "" |
|
4670 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4671 |
#: bzrlib/builtins.py:6496
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4672 |
msgid "Temporarily set aside some changes from the current tree." |
4673 |
msgstr "" |
|
4674 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4675 |
#: bzrlib/builtins.py:6498
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4676 |
msgid "" |
4677 |
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
|
|
4678 |
"ie. out of the way, until a later time when you can bring them back from\n"
|
|
4679 |
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
|
|
4680 |
"your working tree, and so they aren't propagated along with your branch nor\n"
|
|
4681 |
"will they survive its deletion."
|
|
4682 |
msgstr "" |
|
4683 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4684 |
#: bzrlib/builtins.py:6504
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4685 |
msgid "If shelve --list is specified, previously-shelved changes are listed." |
4686 |
msgstr "" |
|
4687 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4688 |
#: bzrlib/builtins.py:6506
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4689 |
msgid "" |
4690 |
"Shelve is intended to help separate several sets of changes that have\n"
|
|
4691 |
"been inappropriately mingled. If you just want to get rid of all changes\n"
|
|
4692 |
"and you don't need to restore them later, use revert. If you want to\n"
|
|
4693 |
"shelve all text changes at once, use shelve --all."
|
|
4694 |
msgstr "" |
|
4695 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4696 |
#: bzrlib/builtins.py:6511
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4697 |
msgid "" |
4698 |
"If filenames are specified, only the changes to those files will be\n"
|
|
4699 |
"shelved. Other files will be left untouched."
|
|
4700 |
msgstr "" |
|
4701 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4702 |
#: bzrlib/builtins.py:6514
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4703 |
msgid "" |
4704 |
"If a revision is specified, changes since that revision will be shelved."
|
|
4705 |
msgstr "" |
|
4706 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4707 |
#: bzrlib/builtins.py:6516
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4708 |
msgid "" |
4709 |
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
|
|
4710 |
"restore the most recently shelved changes."
|
|
4711 |
msgstr "" |
|
4712 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4713 |
#: bzrlib/builtins.py:6519
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4714 |
msgid "" |
4715 |
"For complicated changes, it is possible to edit the changes in a separate\n"
|
|
4716 |
"editor program to decide what the file remaining in the working copy\n"
|
|
4717 |
"should look like. To do this, add the configuration option"
|
|
4718 |
msgstr "" |
|
4719 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4720 |
#: bzrlib/builtins.py:6523
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4721 |
msgid " change_editor = PROGRAM @new_path @old_path" |
4722 |
msgstr "" |
|
4723 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4724 |
#: bzrlib/builtins.py:6525
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4725 |
msgid "" |
4726 |
"where @new_path is replaced with the path of the new version of the \n"
|
|
4727 |
"file and @old_path is replaced with the path of the old version of \n"
|
|
4728 |
"the file. The PROGRAM should save the new file with the desired \n"
|
|
4729 |
"contents of the file in the working tree.\n"
|
|
4730 |
" "
|
|
4731 |
msgstr "" |
|
4732 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4733 |
#: bzrlib/builtins.py:6537
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4734 |
msgid "Shelve all changes." |
4735 |
msgstr "" |
|
4736 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4737 |
#: bzrlib/builtins.py:6539
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4738 |
msgid "Method to use for writing diffs." |
4739 |
msgstr "" |
|
4740 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4741 |
#: bzrlib/builtins.py:6539
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4742 |
msgid "writer" |
4743 |
msgstr "" |
|
4744 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4745 |
#: bzrlib/builtins.py:6543
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4746 |
msgid "List shelved changes." |
4747 |
msgstr "" |
|
4748 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4749 |
#: bzrlib/builtins.py:6545
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4750 |
msgid "Destroy removed changes instead of shelving them." |
4751 |
msgstr "" |
|
4752 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4753 |
#: bzrlib/builtins.py:6574
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4754 |
msgid "No shelved changes." |
4755 |
msgstr "" |
|
4756 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4757 |
#: bzrlib/builtins.py:6585
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4758 |
msgid "Restore shelved changes." |
4759 |
msgstr "" |
|
4760 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4761 |
#: bzrlib/builtins.py:6587
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4762 |
msgid "" |
4763 |
"By default, the most recently shelved changes are restored. However if you\n"
|
|
4764 |
"specify a shelf by id those changes will be restored instead. This works\n"
|
|
4765 |
"best when the changes don't depend on each other."
|
|
4766 |
msgstr "" |
|
4767 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4768 |
#: bzrlib/builtins.py:6596
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4769 |
msgid "The action to perform." |
4770 |
msgstr "" |
|
4771 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4772 |
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4773 |
msgid "action" |
4774 |
msgstr "" |
|
4775 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4776 |
#: bzrlib/builtins.py:6598
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4777 |
msgid "Apply changes and remove from the shelf." |
4778 |
msgstr "" |
|
4779 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4780 |
#: bzrlib/builtins.py:6599
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4781 |
msgid "Show changes, but do not apply or remove them." |
4782 |
msgstr "" |
|
4783 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4784 |
#: bzrlib/builtins.py:6600
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4785 |
msgid "" |
4786 |
"Instead of unshelving the changes, show the diff that would result from "
|
|
4787 |
"unshelving."
|
|
4788 |
msgstr "" |
|
4789 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4790 |
#: bzrlib/builtins.py:6602
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4791 |
msgid "Delete changes without applying them." |
4792 |
msgstr "" |
|
4793 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4794 |
#: bzrlib/builtins.py:6603
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4795 |
msgid "Apply changes but don't delete them." |
4796 |
msgstr "" |
|
4797 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4798 |
#: bzrlib/builtins.py:6618
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4799 |
msgid "Remove unwanted files from working tree." |
4800 |
msgstr "" |
|
4801 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4802 |
#: bzrlib/builtins.py:6620
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4803 |
msgid "" |
4804 |
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
|
|
4805 |
"files are never deleted."
|
|
4806 |
msgstr "" |
|
4807 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4808 |
#: bzrlib/builtins.py:6623
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4809 |
msgid "" |
4810 |
"Another class is 'detritus', which includes files emitted by bzr during\n"
|
|
4811 |
"normal operations and selftests. (The value of these files decreases with\n"
|
|
4812 |
"time.)"
|
|
4813 |
msgstr "" |
|
4814 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4815 |
#: bzrlib/builtins.py:6627
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4816 |
msgid "" |
4817 |
"If no options are specified, unknown files are deleted. Otherwise, option\n"
|
|
4818 |
"flags are respected, and may be combined."
|
|
4819 |
msgstr "" |
|
4820 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4821 |
#: bzrlib/builtins.py:6630
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4822 |
msgid "To check what clean-tree will do, use --dry-run." |
4823 |
msgstr "" |
|
4824 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4825 |
#: bzrlib/builtins.py:6633
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4826 |
msgid "Delete all ignored files." |
4827 |
msgstr "" |
|
4828 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4829 |
#: bzrlib/builtins.py:6634
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4830 |
msgid "" |
4831 |
"Delete conflict files, merge and revert backups, and failed selftest dirs."
|
|
4832 |
msgstr "" |
|
4833 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4834 |
#: bzrlib/builtins.py:6637
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4835 |
msgid "Delete files unknown to bzr (default)." |
4836 |
msgstr "" |
|
4837 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4838 |
#: bzrlib/builtins.py:6638
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4839 |
msgid "Show files to delete instead of deleting them." |
4840 |
msgstr "" |
|
4841 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4842 |
#: bzrlib/builtins.py:6640
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4843 |
msgid "Do not prompt before deleting." |
4844 |
msgstr "" |
|
4845 |
||
4846 |
#: bzrlib/bundle/__init__.py:59
|
|
4847 |
msgid "A directory cannot be a bundle" |
|
4848 |
msgstr "" |
|
4849 |
||
4850 |
#: bzrlib/bundle/apply_bundle.py:40
|
|
4851 |
msgid "Install revisions" |
|
4852 |
msgstr "" |
|
4853 |
||
4854 |
#: bzrlib/bundle/commands.py:64
|
|
4855 |
msgid "--verbose requires a merge directive" |
|
4856 |
msgstr "" |
|
4857 |
||
4858 |
#: bzrlib/bundle/commands.py:67
|
|
4859 |
msgid "Bundle format not supported" |
|
4860 |
msgstr "" |
|
4861 |
||
4862 |
#: bzrlib/bundle/commands.py:77
|
|
4863 |
msgid "Records\n" |
|
4864 |
msgstr "" |
|
4865 |
||
4866 |
#: bzrlib/bundle/commands.py:81
|
|
4867 |
msgid "{0}: {1} ({2} multiparent)\n" |
|
4868 |
msgstr "" |
|
4869 |
||
4870 |
#: bzrlib/bundle/commands.py:83
|
|
4871 |
#, python-format
|
|
4872 |
msgid "unique files: %d\n" |
|
4873 |
msgstr "" |
|
4874 |
||
4875 |
#: bzrlib/bundle/commands.py:92
|
|
4876 |
msgid "Revisions\n" |
|
4877 |
msgstr "" |
|
4878 |
||
4879 |
#: bzrlib/bundle/commands.py:93
|
|
4880 |
#, python-format
|
|
4881 |
msgid "nicks: %s\n" |
|
4882 |
msgstr "" |
|
4883 |
||
4884 |
#: bzrlib/bundle/commands.py:95
|
|
4885 |
#, python-format
|
|
4886 |
msgid "" |
|
4887 |
"committers: \n" |
|
4888 |
"%s\n"
|
|
4889 |
msgstr "" |
|
4890 |
||
4891 |
#: bzrlib/bundle/commands.py:103
|
|
4892 |
msgid "Decoded contents\n" |
|
4893 |
msgstr "" |
|
4894 |
||
4895 |
#: bzrlib/bundle/serializer/v4.py:327
|
|
4896 |
#, python-format
|
|
4897 |
msgid "Bundling %d revision." |
|
4898 |
msgid_plural "Bundling %d revisions." |
|
4899 |
msgstr[0] "" |
|
4900 |
msgstr[1] "" |
|
4901 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4902 |
#: bzrlib/bzrdir.py:487
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4903 |
msgid "" |
4904 |
"making backup of {0}\n"
|
|
4905 |
" to {1}"
|
|
4906 |
msgstr "" |
|
4907 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4908 |
#: bzrlib/bzrdir.py:510
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4909 |
msgid "renamed {0} to {1}" |
4910 |
msgstr "" |
|
4911 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4912 |
#: bzrlib/bzrdir.py:1639
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4913 |
#, python-format
|
4914 |
msgid "" |
|
4915 |
"Source repository format does not support stacking, using format:\n"
|
|
4916 |
" %s"
|
|
4917 |
msgstr "" |
|
4918 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4919 |
#: bzrlib/bzrdir.py:1659
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4920 |
#, python-format
|
4921 |
msgid "" |
|
4922 |
"Source branch format does not support stacking, using format:\n"
|
|
4923 |
" %s"
|
|
4924 |
msgstr "" |
|
4925 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4926 |
#: bzrlib/bzrdir.py:1805
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4927 |
msgid "starting repository conversion" |
4928 |
msgstr "" |
|
4929 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4930 |
#: bzrlib/bzrdir.py:2026
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
4931 |
msgid "Using default stacking branch {0} at {1}" |
4932 |
msgstr "" |
|
4933 |
||
4934 |
#: bzrlib/check.py:108
|
|
4935 |
msgid "check" |
|
4936 |
msgstr "" |
|
4937 |
||
4938 |
#: bzrlib/check.py:110
|
|
4939 |
msgid "checking revisions" |
|
4940 |
msgstr "" |
|
4941 |
||
4942 |
#: bzrlib/check.py:112
|
|
4943 |
msgid "checking commit contents" |
|
4944 |
msgstr "" |
|
4945 |
||
4946 |
#: bzrlib/check.py:114
|
|
4947 |
msgid "checking file graphs" |
|
4948 |
msgstr "" |
|
4949 |
||
4950 |
#: bzrlib/check.py:118
|
|
4951 |
msgid "checking branches and trees" |
|
4952 |
msgstr "" |
|
4953 |
||
4954 |
#: bzrlib/check.py:205
|
|
4955 |
msgid "checked repository {0} format {1}" |
|
4956 |
msgstr "" |
|
4957 |
||
4958 |
#: bzrlib/check.py:208
|
|
4959 |
#, python-format
|
|
4960 |
msgid "%6d revisions" |
|
4961 |
msgstr "" |
|
4962 |
||
4963 |
#: bzrlib/check.py:209
|
|
4964 |
#, python-format
|
|
4965 |
msgid "%6d file-ids" |
|
4966 |
msgstr "" |
|
4967 |
||
4968 |
#: bzrlib/check.py:211
|
|
4969 |
#, python-format
|
|
4970 |
msgid "%6d unreferenced text versions" |
|
4971 |
msgstr "" |
|
4972 |
||
4973 |
#: bzrlib/check.py:215
|
|
4974 |
msgid "unreferenced version: {{{0}}} in {1}" |
|
4975 |
msgstr "" |
|
4976 |
||
4977 |
#: bzrlib/check.py:218
|
|
4978 |
#, python-format
|
|
4979 |
msgid "%6d revisions are missing inventory_sha1" |
|
4980 |
msgstr "" |
|
4981 |
||
4982 |
#: bzrlib/check.py:221
|
|
4983 |
#, python-format
|
|
4984 |
msgid "%6d revisions are mentioned but not present" |
|
4985 |
msgstr "" |
|
4986 |
||
4987 |
#: bzrlib/check.py:224
|
|
4988 |
#, python-format
|
|
4989 |
msgid "%6d ghost revisions" |
|
4990 |
msgstr "" |
|
4991 |
||
4992 |
#: bzrlib/check.py:229
|
|
4993 |
#, python-format
|
|
4994 |
msgid "%6d revisions missing parents in ancestry" |
|
4995 |
msgstr "" |
|
4996 |
||
4997 |
#: bzrlib/check.py:233
|
|
4998 |
#, python-format
|
|
4999 |
msgid " %s should be in the ancestry for:" |
|
5000 |
msgstr "" |
|
5001 |
||
5002 |
#: bzrlib/check.py:237
|
|
5003 |
#, python-format
|
|
5004 |
msgid "%6d inconsistent parents" |
|
5005 |
msgstr "" |
|
5006 |
||
5007 |
#: bzrlib/check.py:241
|
|
5008 |
msgid " * {0} version {1} has parents {2!r} but should have {3!r}" |
|
5009 |
msgstr "" |
|
5010 |
||
5011 |
#: bzrlib/check.py:247
|
|
5012 |
#, python-format
|
|
5013 |
msgid "%6d revisions have incorrect parents in the revision index" |
|
5014 |
msgstr "" |
|
5015 |
||
5016 |
#: bzrlib/check.py:253
|
|
5017 |
msgid " {0} has wrong parents in index: {1!r} should be {2!r}" |
|
5018 |
msgstr "" |
|
5019 |
||
5020 |
#: bzrlib/check.py:267
|
|
5021 |
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}" |
|
5022 |
msgstr "" |
|
5023 |
||
5024 |
#: bzrlib/check.py:296
|
|
5025 |
msgid "" |
|
5026 |
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
|
|
5027 |
"{{{4}}}"
|
|
5028 |
msgstr "" |
|
5029 |
||
5030 |
#: bzrlib/check.py:354
|
|
5031 |
#, python-format
|
|
5032 |
msgid "Checking branch at '%s'." |
|
5033 |
msgstr "" |
|
5034 |
||
5035 |
#: bzrlib/check.py:374
|
|
5036 |
#, python-format
|
|
5037 |
msgid "Checking working tree at '%s'." |
|
5038 |
msgstr "" |
|
5039 |
||
5040 |
#: bzrlib/check.py:427 bzrlib/check.py:441
|
|
5041 |
msgid "No branch found at specified location." |
|
5042 |
msgstr "" |
|
5043 |
||
5044 |
#: bzrlib/check.py:429 bzrlib/check.py:439
|
|
5045 |
msgid "No working tree found at specified location." |
|
5046 |
msgstr "" |
|
5047 |
||
5048 |
#: bzrlib/check.py:432
|
|
5049 |
#, python-format
|
|
5050 |
msgid "Checking repository at '%s'." |
|
5051 |
msgstr "" |
|
5052 |
||
5053 |
#: bzrlib/check.py:443
|
|
5054 |
msgid "No repository found at specified location." |
|
5055 |
msgstr "" |
|
5056 |
||
5057 |
#: bzrlib/clean_tree.py:63
|
|
5058 |
msgid "Nothing to delete." |
|
5059 |
msgstr "" |
|
5060 |
||
5061 |
#: bzrlib/clean_tree.py:68
|
|
5062 |
msgid "Are you sure you wish to delete these" |
|
5063 |
msgstr "" |
|
5064 |
||
5065 |
#: bzrlib/clean_tree.py:70
|
|
5066 |
msgid "Canceled" |
|
5067 |
msgstr "" |
|
5068 |
||
5069 |
#: bzrlib/clean_tree.py:107
|
|
5070 |
#, python-format
|
|
5071 |
msgid "unable to remove %s" |
|
5072 |
msgstr "" |
|
5073 |
||
5074 |
#: bzrlib/clean_tree.py:111
|
|
5075 |
msgid "deleting paths:" |
|
5076 |
msgstr "" |
|
5077 |
||
5078 |
#: bzrlib/clean_tree.py:125
|
|
5079 |
msgid "unable to remove \"{0}\": {1}." |
|
5080 |
msgstr "" |
|
5081 |
||
5082 |
#: bzrlib/clean_tree.py:130
|
|
5083 |
msgid "No files deleted." |
|
5084 |
msgstr "" |
|
5085 |
||
5086 |
#: bzrlib/cmd_version_info.py:47
|
|
5087 |
msgid "No known version info format {0}. Supported types are: {1}" |
|
5088 |
msgstr "" |
|
5089 |
||
5090 |
#: bzrlib/cmd_version_info.py:52
|
|
5091 |
msgid "Version info in Custom template-based format." |
|
5092 |
msgstr "" |
|
5093 |
||
5094 |
#: bzrlib/cmd_version_info.py:52
|
|
5095 |
msgid "Version info in Python format." |
|
5096 |
msgstr "" |
|
5097 |
||
5098 |
#: bzrlib/cmd_version_info.py:52
|
|
5099 |
msgid "Version info in RIO (simple text) format (default)." |
|
5100 |
msgstr "" |
|
5101 |
||
5102 |
#: bzrlib/cmd_version_info.py:53
|
|
5103 |
msgid "Show version information about this tree." |
|
5104 |
msgstr "" |
|
5105 |
||
5106 |
#: bzrlib/cmd_version_info.py:55
|
|
5107 |
msgid "" |
|
5108 |
"You can use this command to add information about version into\n"
|
|
5109 |
"source code of an application. The output can be in one of the\n"
|
|
5110 |
"supported formats or in a custom format based on a template."
|
|
5111 |
msgstr "" |
|
5112 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5113 |
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
|
5114 |
#: en/help_topics/configuration.txt:722
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5115 |
msgid "For example::" |
5116 |
msgstr "" |
|
5117 |
||
5118 |
#: bzrlib/cmd_version_info.py:61
|
|
5119 |
msgid "" |
|
5120 |
" bzr version-info --custom \\\n"
|
|
5121 |
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
|
|
5122 |
msgstr "" |
|
5123 |
||
5124 |
#: bzrlib/cmd_version_info.py:64
|
|
5125 |
msgid "" |
|
5126 |
"will produce a C header file with formatted string containing the\n"
|
|
5127 |
"current revision number. Other supported variables in templates are:"
|
|
5128 |
msgstr "" |
|
5129 |
||
5130 |
#: bzrlib/cmd_version_info.py:67
|
|
5131 |
msgid "" |
|
5132 |
" * {date} - date of the last revision\n"
|
|
5133 |
" * {build_date} - current date\n"
|
|
5134 |
" * {revno} - revision number\n"
|
|
5135 |
" * {revision_id} - revision id\n"
|
|
5136 |
" * {branch_nick} - branch nickname\n"
|
|
5137 |
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
|
|
5138 |
" otherwise 1"
|
|
5139 |
msgstr "" |
|
5140 |
||
5141 |
#: bzrlib/cmd_version_info.py:77
|
|
5142 |
msgid "Select the output format." |
|
5143 |
msgstr "" |
|
5144 |
||
5145 |
#: bzrlib/cmd_version_info.py:81
|
|
5146 |
msgid "Include all possible information." |
|
5147 |
msgstr "" |
|
5148 |
||
5149 |
#: bzrlib/cmd_version_info.py:82
|
|
5150 |
msgid "Check if tree is clean." |
|
5151 |
msgstr "" |
|
5152 |
||
5153 |
#: bzrlib/cmd_version_info.py:84
|
|
5154 |
msgid "Include the revision-history." |
|
5155 |
msgstr "" |
|
5156 |
||
5157 |
#: bzrlib/cmd_version_info.py:86
|
|
5158 |
msgid "Include the last revision for each file." |
|
5159 |
msgstr "" |
|
5160 |
||
5161 |
#: bzrlib/cmd_version_info.py:87
|
|
5162 |
msgid "Template for the output." |
|
5163 |
msgstr "" |
|
5164 |
||
5165 |
#: bzrlib/cmd_version_info.py:101
|
|
5166 |
msgid "bzr version-info --revision takes exactly one revision specifier" |
|
5167 |
msgstr "" |
|
5168 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5169 |
#: bzrlib/commands.py:229
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5170 |
#, python-format
|
5171 |
msgid "unknown command \"%s\"" |
|
5172 |
msgstr "" |
|
5173 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5174 |
#: bzrlib/commands.py:476
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5175 |
msgid "No help for this command." |
5176 |
msgstr "" |
|
5177 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5178 |
#: bzrlib/commands.py:489
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5179 |
#, python-format
|
5180 |
msgid ":Purpose: %s\n" |
|
5181 |
msgstr "" |
|
5182 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5183 |
#: bzrlib/commands.py:491
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5184 |
#, python-format
|
5185 |
msgid "" |
|
5186 |
":Usage:\n"
|
|
5187 |
"%s\n"
|
|
5188 |
msgstr "" |
|
5189 |
":使い方:\n"
|
|
5190 |
"%s\n"
|
|
5191 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5192 |
#: bzrlib/commands.py:493
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5193 |
#, python-format
|
5194 |
msgid ":Usage: %s\n" |
|
5195 |
msgstr ":使い方: %s\n" |
|
5196 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5197 |
#: bzrlib/commands.py:512
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5198 |
#, python-format
|
5199 |
msgid ":Options:%s" |
|
5200 |
msgstr "" |
|
5201 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5202 |
#: bzrlib/commands.py:523
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5203 |
#, python-format
|
5204 |
msgid "" |
|
5205 |
":Description:\n"
|
|
5206 |
" %s\n"
|
|
5207 |
"\n"
|
|
5208 |
msgstr "" |
|
5209 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5210 |
#: bzrlib/commands.py:533
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5211 |
#, python-format
|
5212 |
msgid "" |
|
5213 |
"See bzr help %s for more details and examples.\n"
|
|
5214 |
"\n"
|
|
5215 |
msgstr "" |
|
5216 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5217 |
#: bzrlib/commands.py:538
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5218 |
msgid ":Aliases: " |
5219 |
msgstr "" |
|
5220 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5221 |
#: bzrlib/commands.py:542
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5222 |
#, python-format
|
5223 |
msgid ":From: plugin \"%s\"\n" |
|
5224 |
msgstr "" |
|
5225 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5226 |
#: bzrlib/commands.py:554
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5227 |
msgid ":doc:`{0} <{1}-help>`" |
5228 |
msgstr "" |
|
5229 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5230 |
#: bzrlib/commands.py:558
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5231 |
#, python-format
|
5232 |
msgid ":See also: %s" |
|
5233 |
msgstr "" |
|
5234 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5235 |
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5236 |
msgid "Only ASCII permitted in option names" |
5237 |
msgstr "" |
|
5238 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5239 |
#: bzrlib/commands.py:851 bzrlib/commands.py:859
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5240 |
msgid "command {0!r} needs one or more {1}" |
5241 |
msgstr "" |
|
5242 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5243 |
#: bzrlib/commands.py:868
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5244 |
msgid "command {0!r} requires argument {1}" |
5245 |
msgstr "" |
|
5246 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5247 |
#: bzrlib/commands.py:875
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5248 |
msgid "extra argument to command {0}: {1}" |
5249 |
msgstr "" |
|
5250 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5251 |
#: bzrlib/commands.py:972
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5252 |
#, python-format
|
5253 |
msgid "Profile data written to \"%s\"." |
|
5254 |
msgstr "" |
|
5255 |
||
5256 |
#: bzrlib/commit.py:117 bzrlib/commit.py:740
|
|
5257 |
msgid "added" |
|
5258 |
msgstr "" |
|
5259 |
||
5260 |
#: bzrlib/commit.py:117 bzrlib/commit.py:748
|
|
5261 |
msgid "modified" |
|
6093.4.212
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5262 |
msgstr "変更あり" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5263 |
|
5264 |
#: bzrlib/commit.py:131
|
|
5265 |
#, python-format
|
|
5266 |
msgid "Committing%s" |
|
5267 |
msgstr "" |
|
5268 |
||
5269 |
#: bzrlib/commit.py:134
|
|
5270 |
#, python-format
|
|
5271 |
msgid "Committed revision %d." |
|
5272 |
msgstr "" |
|
5273 |
||
5274 |
#: bzrlib/commit.py:143
|
|
5275 |
#, python-format
|
|
5276 |
msgid "deleted %s" |
|
5277 |
msgstr "" |
|
5278 |
||
5279 |
#: bzrlib/commit.py:146
|
|
5280 |
#, python-format
|
|
5281 |
msgid "missing %s" |
|
5282 |
msgstr "" |
|
5283 |
||
5284 |
#: bzrlib/commit.py:511
|
|
5285 |
msgid "" |
|
5286 |
"Conflicting tags in bound branch:\n"
|
|
5287 |
"{0}"
|
|
5288 |
msgstr "" |
|
5289 |
||
5290 |
#: bzrlib/commit.py:742
|
|
5291 |
msgid "renamed" |
|
5292 |
msgstr "" |
|
5293 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5294 |
#: bzrlib/commit.py:976
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5295 |
msgid "unchanged" |
5296 |
msgstr "" |
|
5297 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5298 |
#: bzrlib/commit.py:998
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5299 |
msgid "{0} [{1}] - Stage" |
5300 |
msgstr "" |
|
5301 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5302 |
#: bzrlib/commit.py:1001
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5303 |
#, python-format
|
5304 |
msgid "%s - Stage" |
|
5305 |
msgstr "" |
|
5306 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5307 |
#: bzrlib/commit_signature_commands.py:34
|
5308 |
msgid "Sign all commits by a given committer." |
|
5309 |
msgstr "" |
|
5310 |
||
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5311 |
#: bzrlib/commit_signature_commands.py:36
|
5312 |
msgid "" |
|
5313 |
"If location is not specified the local tree is used.\n"
|
|
5314 |
"If committer is not specified the default committer is used."
|
|
5315 |
msgstr "" |
|
5316 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5317 |
#: bzrlib/commit_signature_commands.py:39
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5318 |
msgid "This does not sign commits that already have signatures." |
5319 |
msgstr "" |
|
5320 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5321 |
#: bzrlib/commit_signature_commands.py:47
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5322 |
msgid "" |
5323 |
"Don't actually sign anything, just print the revisions that would be signed."
|
|
5324 |
msgstr "" |
|
5325 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5326 |
#: bzrlib/commit_signature_commands.py:98
|
5327 |
#, python-format
|
|
5328 |
msgid "Signed %d revision.\n" |
|
5329 |
msgid_plural "Signed %d revisions.\n" |
|
5330 |
msgstr[0] "" |
|
5331 |
msgstr[1] "" |
|
5332 |
||
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5333 |
#: bzrlib/commit_signature_commands.py:103
|
5334 |
msgid "Verify all commit signatures." |
|
5335 |
msgstr "" |
|
5336 |
||
5337 |
#: bzrlib/commit_signature_commands.py:105
|
|
5338 |
msgid "" |
|
5339 |
"Verifies that all commits in the branch are signed by known GnuPG keys."
|
|
5340 |
msgstr "" |
|
5341 |
||
5342 |
#: bzrlib/commit_signature_commands.py:110
|
|
5343 |
msgid "" |
|
5344 |
"Comma separated list of GPG key patterns which are acceptable for "
|
|
5345 |
"verification."
|
|
5346 |
msgstr "" |
|
5347 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5348 |
#: bzrlib/commit_signature_commands.py:148
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5349 |
msgid "Cannot verify a range of non-revision-history revisions" |
5350 |
msgstr "" |
|
5351 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5352 |
#: bzrlib/commit_signature_commands.py:166
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5353 |
msgid "All commits signed with verifiable keys" |
5354 |
msgstr "" |
|
5355 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5356 |
#: bzrlib/config.py:436
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5357 |
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit." |
5358 |
msgstr "" |
|
5359 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5360 |
#: bzrlib/config.py:2452
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5361 |
msgid "{0} is not an SI unit." |
5362 |
msgstr "" |
|
5363 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5364 |
#: bzrlib/config.py:2971
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5365 |
msgid "" |
5366 |
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
|
|
5367 |
"will be saved."
|
|
5368 |
msgstr "" |
|
5369 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5370 |
#: bzrlib/config.py:3116
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5371 |
#, python-format
|
5372 |
msgid "Invalid '%s', should be of the form 'name=value'" |
|
5373 |
msgstr "" |
|
5374 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5375 |
#: bzrlib/config.py:4018
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5376 |
msgid "Display, set or remove a configuration option." |
5377 |
msgstr "" |
|
5378 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5379 |
#: bzrlib/config.py:4020
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5380 |
msgid "Display the active value for a given option." |
5381 |
msgstr "" |
|
5382 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5383 |
#: bzrlib/config.py:4022
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5384 |
msgid "" |
5385 |
"If --all is specified, NAME is interpreted as a regular expression and all\n"
|
|
5386 |
"matching options are displayed mentioning their scope. The active value\n"
|
|
5387 |
"that bzr will take into account is the first one displayed for each option."
|
|
5388 |
msgstr "" |
|
5389 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5390 |
#: bzrlib/config.py:4026
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5391 |
msgid "If no NAME is given, --all .* is implied." |
5392 |
msgstr "" |
|
5393 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5394 |
#: bzrlib/config.py:4028
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5395 |
msgid "" |
5396 |
"Setting a value is achieved by using name=value without spaces. The value\n"
|
|
5397 |
"is set in the most relevant scope and can be checked by displaying the\n"
|
|
5398 |
"option again."
|
|
5399 |
msgstr "" |
|
5400 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5401 |
#: bzrlib/config.py:4040
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5402 |
msgid "Reduce the scope to the specified configuration file." |
5403 |
msgstr "" |
|
5404 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5405 |
#: bzrlib/config.py:4044
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5406 |
msgid "Display all the defined values for the matching options." |
5407 |
msgstr "" |
|
5408 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5409 |
#: bzrlib/config.py:4046
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5410 |
msgid "Remove the option from the configuration file." |
5411 |
msgstr "" |
|
5412 |
||
5413 |
#: bzrlib/conflicts.py:50
|
|
5414 |
msgid "List files with conflicts." |
|
5415 |
msgstr "" |
|
5416 |
||
5417 |
#: bzrlib/conflicts.py:57
|
|
5418 |
msgid "" |
|
5419 |
"Conflicts normally are listed as short, human-readable messages. If --text\n"
|
|
5420 |
"is supplied, the pathnames of files with text conflicts are listed,\n"
|
|
5421 |
"instead. (This is useful for editing all files with text conflicts.)"
|
|
5422 |
msgstr "" |
|
5423 |
||
5424 |
#: bzrlib/conflicts.py:61
|
|
5425 |
msgid "Use bzr resolve when you have fixed a problem." |
|
5426 |
msgstr "" |
|
5427 |
||
5428 |
#: bzrlib/conflicts.py:66
|
|
5429 |
msgid "List paths of files with text conflicts." |
|
5430 |
msgstr "" |
|
5431 |
||
5432 |
#: bzrlib/conflicts.py:85
|
|
5433 |
msgid "Marks the conflict as resolved." |
|
5434 |
msgstr "" |
|
5435 |
||
5436 |
#: bzrlib/conflicts.py:88
|
|
5437 |
msgid "Resolve the conflict preserving the version in the working tree." |
|
5438 |
msgstr "" |
|
5439 |
||
5440 |
#: bzrlib/conflicts.py:91
|
|
5441 |
msgid "Resolve the conflict taking the merged version into account." |
|
5442 |
msgstr "" |
|
5443 |
||
5444 |
#: bzrlib/conflicts.py:98
|
|
5445 |
msgid "How to resolve the conflict." |
|
5446 |
msgstr "" |
|
5447 |
||
5448 |
#: bzrlib/conflicts.py:104
|
|
5449 |
msgid "Mark a conflict as resolved." |
|
5450 |
msgstr "" |
|
5451 |
||
5452 |
#: bzrlib/conflicts.py:111
|
|
5453 |
msgid "" |
|
5454 |
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
|
|
5455 |
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
|
|
5456 |
"as\n"
|
|
5457 |
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
|
|
5458 |
msgstr "" |
|
5459 |
||
5460 |
#: bzrlib/conflicts.py:119
|
|
5461 |
msgid "Resolve all conflicts in this tree." |
|
5462 |
msgstr "" |
|
5463 |
||
5464 |
#: bzrlib/conflicts.py:126
|
|
5465 |
msgid "If --all is specified, no FILE may be provided" |
|
5466 |
msgstr "" |
|
5467 |
||
5468 |
#: bzrlib/conflicts.py:151
|
|
5469 |
#, python-format
|
|
5470 |
msgid "%d conflict auto-resolved." |
|
5471 |
msgid_plural "%d conflicts auto-resolved." |
|
5472 |
msgstr[0] "" |
|
5473 |
msgstr[1] "" |
|
5474 |
||
5475 |
#: bzrlib/conflicts.py:154
|
|
5476 |
msgid "Remaining conflicts:" |
|
5477 |
msgstr "" |
|
5478 |
||
5479 |
#: bzrlib/conflicts.py:159
|
|
5480 |
msgid "All conflicts resolved." |
|
5481 |
msgstr "" |
|
5482 |
||
5483 |
#: bzrlib/conflicts.py:168
|
|
5484 |
msgid "{0} conflict resolved, {1} remaining" |
|
5485 |
msgid_plural "{0} conflicts resolved, {1} remaining" |
|
5486 |
msgstr[0] "" |
|
5487 |
msgstr[1] "" |
|
5488 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5489 |
#: bzrlib/controldir.py:712
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5490 |
msgid "{0} is{1} redirected to {2}" |
5491 |
msgstr "" |
|
5492 |
||
5493 |
#: bzrlib/diff.py:399
|
|
5494 |
#, python-format
|
|
5495 |
msgid "*** Ignoring files outside view. View is %s" |
|
5496 |
msgstr "" |
|
5497 |
||
5498 |
#: bzrlib/errors.py:157
|
|
5499 |
msgid "The tree builder is already building a tree." |
|
5500 |
msgstr "" |
|
5501 |
||
5502 |
#: bzrlib/errors.py:178
|
|
5503 |
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s" |
|
5504 |
msgstr "" |
|
5505 |
||
5506 |
#: bzrlib/errors.py:197
|
|
5507 |
msgid "" |
|
5508 |
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
|
|
5509 |
"versions \"%(minimum)s\" to \"%(current)s\"."
|
|
5510 |
msgstr "" |
|
5511 |
||
5512 |
#: bzrlib/errors.py:209
|
|
5513 |
msgid "The transport '%(transport)s' is only accessible within this process." |
|
5514 |
msgstr "" |
|
5515 |
||
5516 |
#: bzrlib/errors.py:227
|
|
5517 |
msgid "Invalid revision number %(revno)s" |
|
5518 |
msgstr "" |
|
5519 |
||
5520 |
#: bzrlib/errors.py:236
|
|
5521 |
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s" |
|
5522 |
msgstr "" |
|
5523 |
||
5524 |
#: bzrlib/errors.py:247
|
|
5525 |
msgid "Reserved revision-id {%(revision_id)s}" |
|
5526 |
msgstr "" |
|
5527 |
||
5528 |
#: bzrlib/errors.py:261
|
|
5529 |
msgid "There is no public branch set for \"%(branch_url)s\"." |
|
5530 |
msgstr "" |
|
5531 |
||
5532 |
#: bzrlib/errors.py:271
|
|
5533 |
msgid "" |
|
5534 |
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
|
|
5535 |
"obtain a list of topics."
|
|
5536 |
msgstr "" |
|
5537 |
||
5538 |
#: bzrlib/errors.py:280
|
|
5539 |
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s." |
|
5540 |
msgstr "" |
|
5541 |
||
5542 |
#: bzrlib/errors.py:290
|
|
5543 |
msgid "" |
|
5544 |
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
|
|
5545 |
msgstr "" |
|
5546 |
||
5547 |
#: bzrlib/errors.py:299
|
|
5548 |
msgid "The branch '%(branch)s' is not stacked." |
|
5549 |
msgstr "" |
|
5550 |
||
5551 |
#: bzrlib/errors.py:313
|
|
5552 |
msgid "No WorkingTree exists for \"%(base)s\"." |
|
5553 |
msgstr "" |
|
5554 |
||
5555 |
#: bzrlib/errors.py:322
|
|
5556 |
msgid "Not currently building a tree." |
|
5557 |
msgstr "" |
|
5558 |
||
5559 |
#: bzrlib/errors.py:327
|
|
5560 |
msgid "%(url)s is not a local path." |
|
5561 |
msgstr "" |
|
5562 |
||
5563 |
#: bzrlib/errors.py:355
|
|
5564 |
msgid "%(not_locked)r is not write locked but needs to be." |
|
5565 |
msgstr "" |
|
5566 |
||
5567 |
#: bzrlib/errors.py:363
|
|
5568 |
msgid "Error in command line options" |
|
5569 |
msgstr "" |
|
5570 |
||
5571 |
#: bzrlib/errors.py:368
|
|
5572 |
msgid "%(value)s is not an index of type %(_type)s." |
|
5573 |
msgstr "" |
|
5574 |
||
5575 |
#: bzrlib/errors.py:378
|
|
5576 |
msgid "Error in data for index %(value)s." |
|
5577 |
msgstr "" |
|
5578 |
||
5579 |
#: bzrlib/errors.py:387
|
|
5580 |
msgid "The key '%(key)s' is already in index '%(index)s'." |
|
5581 |
msgstr "" |
|
5582 |
||
5583 |
#: bzrlib/errors.py:397
|
|
5584 |
msgid "The key '%(key)s' is not a valid key." |
|
5585 |
msgstr "" |
|
5586 |
||
5587 |
#: bzrlib/errors.py:406
|
|
5588 |
msgid "Could not parse options for index %(value)s." |
|
5589 |
msgstr "" |
|
5590 |
||
5591 |
#: bzrlib/errors.py:415
|
|
5592 |
msgid "The value '%(value)s' is not a valid value." |
|
5593 |
msgstr "" |
|
5594 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5595 |
#: bzrlib/errors.py:424
|
5596 |
msgid "Bad value \"%(value)s\" for option \"%(name)s\"." |
|
5597 |
msgstr "オプション \"%(name)s\" に対する不正な値 \"%(value)s\"" |
|
5598 |
||
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5599 |
#: bzrlib/errors.py:443
|
5600 |
msgid "Generic path error: %(path)r%(extra)s)" |
|
5601 |
msgstr "" |
|
5602 |
||
5603 |
#: bzrlib/errors.py:456
|
|
5604 |
msgid "No such file: %(path)r%(extra)s" |
|
5605 |
msgstr "" |
|
5606 |
||
5607 |
#: bzrlib/errors.py:461
|
|
5608 |
msgid "File exists: %(path)r%(extra)s" |
|
5609 |
msgstr "" |
|
5610 |
||
5611 |
#: bzrlib/errors.py:467
|
|
5612 |
msgid "" |
|
5613 |
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
|
|
5614 |
"after to tell bzr about a rename that has already happened)%(extra)s"
|
|
5615 |
msgstr "" |
|
5616 |
||
5617 |
#: bzrlib/errors.py:483
|
|
5618 |
msgid "\"%(path)s\" is not a directory %(extra)s" |
|
5619 |
msgstr "" |
|
5620 |
||
5621 |
#: bzrlib/errors.py:488
|
|
5622 |
msgid "\"%(path)s\" is not in the working directory %(extra)s" |
|
5623 |
msgstr "" |
|
5624 |
||
5625 |
#: bzrlib/errors.py:493
|
|
5626 |
msgid "Directory not empty: \"%(path)s\"%(extra)s" |
|
5627 |
msgstr "" |
|
5628 |
||
5629 |
#: bzrlib/errors.py:498
|
|
5630 |
msgid "Hard-linking \"%(path)s\" is not supported" |
|
5631 |
msgstr "" |
|
5632 |
||
5633 |
#: bzrlib/errors.py:513
|
|
5634 |
msgid "Device or resource busy: \"%(path)s\"%(extra)s" |
|
5635 |
msgstr "" |
|
5636 |
||
5637 |
#: bzrlib/errors.py:518
|
|
5638 |
msgid "Permission denied: \"%(path)s\"%(extra)s" |
|
5639 |
msgstr "" |
|
5640 |
||
5641 |
#: bzrlib/errors.py:523
|
|
5642 |
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s" |
|
5643 |
msgstr "" |
|
5644 |
||
5645 |
#: bzrlib/errors.py:528
|
|
5646 |
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r" |
|
5647 |
msgstr "" |
|
5648 |
||
5649 |
#: bzrlib/errors.py:539
|
|
5650 |
msgid "URLs differ by more than path: %(from_)r and %(to)r" |
|
5651 |
msgstr "" |
|
5652 |
||
5653 |
#: bzrlib/errors.py:561
|
|
5654 |
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib." |
|
5655 |
msgstr "" |
|
5656 |
||
5657 |
#: bzrlib/errors.py:571
|
|
5658 |
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s" |
|
5659 |
msgstr "" |
|
5660 |
||
5661 |
#: bzrlib/errors.py:579
|
|
5662 |
msgid "" |
|
5663 |
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
|
|
5664 |
"upgrade the branch to permit branch stacking."
|
|
5665 |
msgstr "" |
|
5666 |
||
5667 |
#: bzrlib/errors.py:590
|
|
5668 |
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'." |
|
5669 |
msgstr "" |
|
5670 |
||
5671 |
#: bzrlib/errors.py:600
|
|
5672 |
msgid "" |
|
5673 |
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
|
|
5674 |
"need to upgrade the repository to permit branch stacking."
|
|
5675 |
msgstr "" |
|
5676 |
||
5677 |
#: bzrlib/errors.py:611
|
|
5678 |
msgid "Error reading from %(path)r." |
|
5679 |
msgstr "" |
|
5680 |
||
5681 |
#: bzrlib/errors.py:630
|
|
5682 |
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s" |
|
5683 |
msgstr "" |
|
5684 |
||
5685 |
#: bzrlib/errors.py:646
|
|
5686 |
msgid "Path \"%(path)s\" is not unicode normalized" |
|
5687 |
msgstr "" |
|
5688 |
||
5689 |
#: bzrlib/errors.py:654
|
|
5690 |
msgid "Not a branch: \"%(path)s\"%(detail)s." |
|
5691 |
msgstr "" |
|
5692 |
||
5693 |
#: bzrlib/errors.py:696
|
|
5694 |
msgid "No submit branch available for branch \"%(path)s\"" |
|
5695 |
msgstr "" |
|
5696 |
||
5697 |
#: bzrlib/errors.py:705
|
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5698 |
msgid "A control directory already exists: \"%(path)s\"." |
5699 |
msgstr "" |
|
5700 |
||
5701 |
#: bzrlib/errors.py:710
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5702 |
msgid "Already a branch: \"%(path)s\"." |
5703 |
msgstr "" |
|
5704 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5705 |
#: bzrlib/errors.py:715
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5706 |
msgid "Invalid branch name: %(name)s" |
5707 |
msgstr "" |
|
5708 |
||
5709 |
#: bzrlib/errors.py:724
|
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5710 |
msgid "Parent branch already exists: \"%(path)s\"." |
5711 |
msgstr "" |
|
5712 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5713 |
#: bzrlib/errors.py:730
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5714 |
msgid "" |
5715 |
"Directory contains a branch, but no working tree (use bzr checkout if you "
|
|
5716 |
"wish to build a working tree): \"%(path)s\""
|
|
5717 |
msgstr "" |
|
5718 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5719 |
#: bzrlib/errors.py:735
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5720 |
msgid "" |
5721 |
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
|
|
5722 |
msgstr "" |
|
5723 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5724 |
#: bzrlib/errors.py:745
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5725 |
msgid "" |
5726 |
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
|
|
5727 |
msgstr "" |
|
5728 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5729 |
#: bzrlib/errors.py:755
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5730 |
msgid "No repository present: \"%(path)s\"" |
5731 |
msgstr "" |
|
5732 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5733 |
#: bzrlib/errors.py:762
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5734 |
msgid "" |
5735 |
"Unsupported branch format: %(format)s\n"
|
|
5736 |
"Please run 'bzr upgrade'"
|
|
5737 |
msgstr "" |
|
5738 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5739 |
#: bzrlib/errors.py:768
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5740 |
msgid "Unknown %(kind)s format: %(format)r" |
5741 |
msgstr "" |
|
5742 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5743 |
#: bzrlib/errors.py:777
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5744 |
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s." |
5745 |
msgstr "" |
|
5746 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5747 |
#: bzrlib/errors.py:787
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5748 |
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s" |
5749 |
msgstr "" |
|
5750 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5751 |
#: bzrlib/errors.py:802
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5752 |
msgid "" |
5753 |
"%(target)s\n"
|
|
5754 |
"is not compatible with\n"
|
|
5755 |
"%(source)s\n"
|
|
5756 |
"%(details)s"
|
|
5757 |
msgstr "" |
|
5758 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5759 |
#: bzrlib/errors.py:818
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5760 |
msgid "Revision is not compatible with %(repo_format)s" |
5761 |
msgstr "" |
|
5762 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5763 |
#: bzrlib/errors.py:828
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5764 |
msgid "%(context_info)s%(path)s is already versioned." |
5765 |
msgstr "" |
|
5766 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5767 |
#: bzrlib/errors.py:849
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5768 |
msgid "%(context_info)s%(path)s is not versioned." |
5769 |
msgstr "" |
|
5770 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5771 |
#: bzrlib/errors.py:870
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5772 |
msgid "Path(s) are not versioned: %(paths_as_string)s" |
5773 |
msgstr "" |
|
5774 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5775 |
#: bzrlib/errors.py:881
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5776 |
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s" |
5777 |
msgstr "" |
|
5778 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5779 |
#: bzrlib/errors.py:900
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5780 |
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\"" |
5781 |
msgstr "" |
|
5782 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5783 |
#: bzrlib/errors.py:908
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5784 |
msgid "" |
5785 |
"Filename %(filename)r is not valid in your current filesystem encoding "
|
|
5786 |
"%(fs_encoding)s"
|
|
5787 |
msgstr "" |
|
5788 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5789 |
#: bzrlib/errors.py:919
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5790 |
msgid "Cannot operate on \"%(filename)s\" because it is a control file" |
5791 |
msgstr "" |
|
5792 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5793 |
#: bzrlib/errors.py:937
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5794 |
msgid "The lock for '%(lock_description)s' is in use and cannot be broken." |
5795 |
msgstr "" |
|
5796 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5797 |
#: bzrlib/errors.py:976
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5798 |
msgid "Cannot lock %(lock)s: %(why)s" |
5799 |
msgstr "" |
|
5800 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5801 |
#: bzrlib/errors.py:986
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5802 |
msgid "" |
5803 |
"A transaction related operation was attempted after the transaction finished."
|
|
5804 |
msgstr "" |
|
5805 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5806 |
#: bzrlib/errors.py:1013
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5807 |
msgid "Cannot lock: transport is read only: %(transport)s" |
5808 |
msgstr "" |
|
5809 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5810 |
#: bzrlib/errors.py:1021
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5811 |
msgid "Could not acquire lock \"%(lock)s\": %(msg)s" |
5812 |
msgstr "" |
|
5813 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5814 |
#: bzrlib/errors.py:1032
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5815 |
msgid "" |
5816 |
"Lock was broken while still open: %(lock)s - check storage consistency!"
|
|
5817 |
msgstr "" |
|
5818 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5819 |
#: bzrlib/errors.py:1043
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5820 |
msgid "" |
5821 |
"Lock was released and re-acquired before being broken: %(lock)s: held by "
|
|
5822 |
"%(holder)r, wanted to break %(target)r"
|
|
5823 |
msgstr "" |
|
5824 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5825 |
#: bzrlib/errors.py:1055
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5826 |
msgid "" |
5827 |
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
|
|
5828 |
"Use 'bzr break-lock' to clear it"
|
|
5829 |
msgstr "" |
|
5830 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5831 |
#: bzrlib/errors.py:1068
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5832 |
msgid "Lock not held: %(lock)s" |
5833 |
msgstr "" |
|
5834 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5835 |
#: bzrlib/errors.py:1097
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5836 |
msgid "No changes to commit" |
5837 |
msgstr "" |
|
5838 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5839 |
#: bzrlib/errors.py:1102
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5840 |
msgid "" |
5841 |
"Selected-file commit of merges is not supported yet: files %(files_str)s"
|
|
5842 |
msgstr "" |
|
5843 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5844 |
#: bzrlib/errors.py:1112
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5845 |
msgid "" |
5846 |
"Excluding paths during commit is not supported by repository at "
|
|
5847 |
"%(repository)r."
|
|
5848 |
msgstr "" |
|
5849 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5850 |
#: bzrlib/errors.py:1121
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5851 |
msgid "" |
5852 |
"The specified commit message contains characters unsupported by the current "
|
|
5853 |
"encoding."
|
|
5854 |
msgstr "" |
|
5855 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5856 |
#: bzrlib/errors.py:1127
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5857 |
msgid "Upgrade URL cannot work with readonly URLs." |
5858 |
msgstr "" |
|
5859 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5860 |
#: bzrlib/errors.py:1132
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5861 |
msgid "The branch format %(format)s is already at the most recent format." |
5862 |
msgstr "" |
|
5863 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5864 |
#: bzrlib/errors.py:1155
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5865 |
msgid "Option --change does not accept revision ranges" |
5866 |
msgstr "" |
|
5867 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5868 |
#: bzrlib/errors.py:1160
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5869 |
msgid "No namespace registered for string: %(spec)r" |
5870 |
msgstr "" |
|
5871 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5872 |
#: bzrlib/errors.py:1179
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5873 |
msgid "" |
5874 |
"Requested revision: '%(spec)s' does not exist in branch: "
|
|
5875 |
"%(branch_url)s%(extra)s"
|
|
5876 |
msgstr "" |
|
5877 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5878 |
#: bzrlib/errors.py:1193
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5879 |
msgid "" |
5880 |
"Operation denied because it would change the main history, which is not "
|
|
5881 |
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
|
|
5882 |
msgstr "" |
|
5883 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5884 |
#: bzrlib/errors.py:1204
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5885 |
msgid "" |
5886 |
"These branches have diverged. Use the missing command to see how.\n"
|
|
5887 |
"Use the merge command to reconcile them."
|
|
5888 |
msgstr "" |
|
5889 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5890 |
#: bzrlib/errors.py:1224
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5891 |
msgid "" |
5892 |
"Branches have no common ancestor, and no merge base revision was specified."
|
|
5893 |
msgstr "" |
|
5894 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5895 |
#: bzrlib/errors.py:1230
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5896 |
msgid "" |
5897 |
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
|
|
5898 |
msgstr "" |
|
5899 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5900 |
#: bzrlib/errors.py:1236
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5901 |
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s" |
5902 |
msgstr "" |
|
5903 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5904 |
#: bzrlib/errors.py:1245
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5905 |
msgid "" |
5906 |
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
|
|
5907 |
msgstr "" |
|
5908 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5909 |
#: bzrlib/errors.py:1254
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5910 |
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s" |
5911 |
msgstr "" |
|
5912 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5913 |
#: bzrlib/errors.py:1263
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5914 |
msgid "Branch %(branch)s has no commits." |
5915 |
msgstr "" |
|
5916 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5917 |
#: bzrlib/errors.py:1281
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5918 |
msgid "" |
5919 |
"Bound branch %(branch)s is out of date with master branch "
|
|
5920 |
"%(master)s.%(extra_help)s"
|
|
5921 |
msgstr "" |
|
5922 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5923 |
#: bzrlib/errors.py:1293
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5924 |
msgid "" |
5925 |
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
|
|
5926 |
"bound to %(remote)s."
|
|
5927 |
msgstr "" |
|
5928 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5929 |
#: bzrlib/errors.py:1305
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5930 |
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s" |
5931 |
msgstr "" |
|
5932 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5933 |
#: bzrlib/errors.py:1314
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5934 |
msgid "" |
5935 |
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
|
|
5936 |
"%(error)s"
|
|
5937 |
msgstr "" |
|
5938 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5939 |
#: bzrlib/errors.py:1326
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5940 |
msgid "Error in processing weave: %(msg)s" |
5941 |
msgstr "" |
|
5942 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5943 |
#: bzrlib/errors.py:1335
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5944 |
msgid "Revision {%(revision_id)s} already present in %(weave)s" |
5945 |
msgstr "" |
|
5946 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5947 |
#: bzrlib/errors.py:1346
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5948 |
msgid "Revision {%(revision_id)s} not present in %(weave)s" |
5949 |
msgstr "" |
|
5950 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5951 |
#: bzrlib/errors.py:1356
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5952 |
msgid "Weave invariant violated: %(what)s" |
5953 |
msgstr "" |
|
5954 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5955 |
#: bzrlib/errors.py:1365
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5956 |
msgid "Parents are mismatched between two revisions. %(msg)s" |
5957 |
msgstr "" |
|
5958 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5959 |
#: bzrlib/errors.py:1387
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5960 |
msgid "" |
5961 |
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
|
|
5962 |
"%(weave_b)s"
|
|
5963 |
msgstr "" |
|
5964 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5965 |
#: bzrlib/errors.py:1399
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5966 |
msgid "Versioned file error" |
5967 |
msgstr "バージョン管理されたファイルのエラー" |
|
5968 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5969 |
#: bzrlib/errors.py:1404
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5970 |
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"." |
5971 |
msgstr "\"%(file_id)s\" にはリビジョン {%(revision_id)s} がありません。" |
|
5972 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5973 |
#: bzrlib/errors.py:1414
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5974 |
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"." |
5975 |
msgstr "\"%(file_id)s\" にはすでにリビジョン {%(revision_id)s} が存在しています。" |
|
5976 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5977 |
#: bzrlib/errors.py:1424
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5978 |
msgid "Text did not match its checksum: %(msg)s" |
5979 |
msgstr "テキストがチェックサムと一致しません: %(msg)s" |
|
5980 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5981 |
#: bzrlib/errors.py:1550
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5982 |
msgid "Export format %(format)r not supported" |
5983 |
msgstr "エクスポートフォーマット %(format)r はサポートされていません" |
|
5984 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5985 |
#: bzrlib/errors.py:1559
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5986 |
msgid "Transport error: %(msg)s %(orig_error)s" |
5987 |
msgstr "" |
|
5988 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5989 |
#: bzrlib/errors.py:1585
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5990 |
msgid "Generic bzr smart protocol error: %(details)s" |
5991 |
msgstr "" |
|
5992 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5993 |
#: bzrlib/errors.py:1593
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5994 |
msgid "Received bad protocol version marker: %(marker)r" |
5995 |
msgstr "" |
|
5996 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5997 |
#: bzrlib/errors.py:1625
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
5998 |
msgid "Transport operation not possible: %(msg)s %(orig_error)s" |
5999 |
msgstr "" |
|
6000 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6001 |
#: bzrlib/errors.py:1630
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6002 |
msgid "Connection error: %(msg)s %(orig_error)s" |
6003 |
msgstr "" |
|
6004 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6005 |
#: bzrlib/errors.py:1635
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6006 |
msgid "%(msg)s %(host)s%(port)s%(orig_error)s" |
6007 |
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s" |
|
6008 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6009 |
#: bzrlib/errors.py:1656
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6010 |
msgid "Connection closed: %(msg)s %(orig_error)s" |
6011 |
msgstr "接続が閉じられました: %(msg)s %(orig_error)s" |
|
6012 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6013 |
#: bzrlib/errors.py:1661
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6014 |
msgid "Connection Timeout: %(msg)s%(orig_error)s" |
6015 |
msgstr "接続がタイムアウトしました: %(msg)s%(orig_error)s" |
|
6016 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6017 |
#: bzrlib/errors.py:1666
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6018 |
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s" |
6019 |
msgstr "%(path)s の %(offset)s に対する不正な range アクセス: %(msg)s" |
|
6020 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6021 |
#: bzrlib/errors.py:1676
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6022 |
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s" |
6023 |
msgstr "%(path)s からの不正な HTTP レスポンス: %(msg)s%(orig_error)s" |
|
6024 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6025 |
#: bzrlib/errors.py:1691
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6026 |
msgid "Certificate error: %(error)s" |
6027 |
msgstr "" |
|
6028 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6029 |
#: bzrlib/errors.py:1699
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6030 |
msgid "Invalid http range %(range)r for %(path)s: %(msg)s" |
6093.4.167
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6031 |
msgstr "%(path)s に対する不正な range %(range)r: %(msg)s" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6032 |
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6033 |
#: bzrlib/errors.py:1713
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6034 |
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s" |
6035 |
msgstr "%(path)s に HTTP MIME 境界が見つかりません: %(msg)s" |
|
6036 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6037 |
#: bzrlib/errors.py:1721
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6038 |
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s" |
6039 |
msgstr "" |
|
6040 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6041 |
#: bzrlib/errors.py:1730
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6042 |
msgid "%(source)s is%(permanently)s redirected to %(target)s" |
6043 |
msgstr "" |
|
6044 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6045 |
#: bzrlib/errors.py:1744
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6046 |
msgid "Too many redirections" |
6047 |
msgstr "リダイレクションが多すぎます" |
|
6048 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6049 |
#: bzrlib/errors.py:1749
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6050 |
msgid "Working tree has conflicts." |
6051 |
msgstr "作業ツリーに衝突があります" |
|
6052 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6053 |
#: bzrlib/errors.py:1753
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6054 |
msgid "Config file %(filename)s is not UTF-8 encoded\n" |
6055 |
msgstr "設定ファイル %(filename)s が UTF-8 でエンコードされていません\n" |
|
6056 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6057 |
#: bzrlib/errors.py:1762
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6058 |
msgid "" |
6059 |
"Error(s) parsing config file %(filename)s:\n"
|
|
6060 |
"%(errors)s"
|
|
6061 |
msgstr "" |
|
6062 |
"設定ファイル %(filename)s のパースエラー:\n"
|
|
6093.4.167
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6063 |
"%(errors)s"
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6064 |
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6065 |
#: bzrlib/errors.py:1772
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6066 |
msgid "" |
6067 |
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
|
|
6068 |
"See ``bzr help %(name)s``"
|
|
6069 |
msgstr "" |
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6070 |
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6071 |
#: bzrlib/errors.py:1782
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6072 |
msgid "%(username)r does not seem to contain a reasonable email address" |
6073 |
msgstr "%(username)r に有効な e-mail アドレスが含まれていないようです" |
|
6074 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6075 |
#: bzrlib/errors.py:1791
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6076 |
msgid "Failed to GPG sign data with command \"%(command_line)s\"" |
6077 |
msgstr "\"%(command_line)s\" コマンドでのGPGサインに失敗しました" |
|
6078 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6079 |
#: bzrlib/errors.py:1799
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6080 |
msgid "Failed to verify GPG signature data with error \"%(error)s\"" |
6081 |
msgstr "GPGシグネチャの検証に \"%(error)s\" で失敗しました。" |
|
6082 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6083 |
#: bzrlib/errors.py:1807
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6084 |
msgid "Unable to import library \"%(library)s\": %(error)s" |
6085 |
msgstr "ライブラリ \"%(library)s\" をインポートできません: %(error)s" |
|
6086 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6087 |
#: bzrlib/errors.py:1815
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6088 |
msgid "python-gpgme is not installed, it is needed to verify signatures" |
6089 |
msgstr "python-gpgme がインストールされていません。これはシグネチャの検証に必要です。" |
|
6090 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6091 |
#: bzrlib/errors.py:1823
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6092 |
msgid "" |
6093 |
"The working tree for %(basedir)s has changed since the last commit, but "
|
|
6094 |
"weave merge requires that it be unchanged"
|
|
6095 |
msgstr "作業ツリー %(basedir)s が最後のコミットから変更されています。 作業ツリーが変更されている場合weaveマージはできません。" |
|
6096 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6097 |
#: bzrlib/errors.py:1833
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6098 |
msgid "" |
6099 |
"Can't reprocess and show base, because reprocessing obscures the "
|
|
6100 |
"relationship of conflicting lines to the base"
|
|
6101 |
msgstr "" |
|
6102 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6103 |
#: bzrlib/errors.py:1839
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6104 |
msgid "Cycle in graph %(graph)r" |
6105 |
msgstr "グラフ %(graph)r がループしています。" |
|
6106 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6107 |
#: bzrlib/errors.py:1867
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6108 |
msgid "File %(filename)s is not conflicted." |
6109 |
msgstr "%(filename)s は衝突していません" |
|
6110 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6111 |
#: bzrlib/errors.py:1889
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6112 |
msgid "No bundle was found in \"%(filename)s\"." |
6113 |
msgstr "\"%(filename)s\" にバンドルが見つかりません。" |
|
6114 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6115 |
#: bzrlib/errors.py:1898
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6116 |
msgid "Unable to handle bundle version %(version)s: %(msg)s" |
6117 |
msgstr "" |
|
6118 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6119 |
#: bzrlib/errors.py:1908
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6120 |
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s" |
6121 |
msgstr "" |
|
6122 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6123 |
#: bzrlib/errors.py:1921
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6124 |
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s" |
6125 |
msgstr "" |
|
6126 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6127 |
#: bzrlib/errors.py:1931
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6128 |
msgid "Key %(key)s is already present in map" |
6129 |
msgstr "" |
|
6130 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6131 |
#: bzrlib/errors.py:1936
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6132 |
msgid "The prefix %(prefix)s is in the help search path twice." |
6133 |
msgstr "" |
|
6134 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6135 |
#: bzrlib/errors.py:1946
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6136 |
msgid "" |
6137 |
"No final name for trans_id %(trans_id)r\n"
|
|
6138 |
"file-id: %(file_id)r\n" |
|
6139 |
"root trans-id: %(root_trans_id)r\n"
|
|
6140 |
msgstr "" |
|
6141 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6142 |
#: bzrlib/errors.py:1978
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6143 |
msgid "Attempt to reuse a transform that has already been applied." |
6144 |
msgstr "" |
|
6145 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6146 |
#: bzrlib/errors.py:1983
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6147 |
msgid "Moving the root directory is not supported at this time" |
6148 |
msgstr "いまのところ、ルートディレクトリの移動はサポートされていません" |
|
6149 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6150 |
#: bzrlib/errors.py:1988
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6151 |
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s" |
6152 |
msgstr "%(from_path)s から %(to_path)s へのリネームに失敗しました: %(why)s" |
|
6153 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6154 |
#: bzrlib/errors.py:1999
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6155 |
msgid "" |
6156 |
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
|
|
6157 |
msgstr "" |
|
6158 |
"移動できません。 %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
|
|
6159 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6160 |
#: bzrlib/errors.py:2035
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6161 |
msgid "" |
6162 |
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
|
|
6163 |
msgstr "" |
|
6164 |
"%(from_path)s%(operator)s から %(to_path)s%(_has_extra)s%(extra)s へリネームできません"
|
|
6165 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6166 |
#: bzrlib/errors.py:2065
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6167 |
msgid "Unable to import paramiko (required for sftp support): %(error)s" |
6168 |
msgstr "" |
|
6169 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6170 |
#: bzrlib/errors.py:2073
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6171 |
msgid "Nothing to merge." |
6172 |
msgstr "" |
|
6173 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6174 |
#: bzrlib/errors.py:2078
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6175 |
msgid "Format %(format)s cannot be initialised by this version of bzr." |
6176 |
msgstr "" |
|
6177 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6178 |
#: bzrlib/errors.py:2087
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6179 |
msgid "" |
6180 |
"Cannot convert from format %(from_format)s to format %(format)s. "
|
|
6181 |
"%(problem)s"
|
|
6182 |
msgstr "" |
|
6183 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6184 |
#: bzrlib/errors.py:2099
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6185 |
msgid "Could not find an appropriate Differ for file \"%(path)s\"" |
6186 |
msgstr "" |
|
6187 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6188 |
#: bzrlib/errors.py:2107
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6189 |
msgid "%(exe_name)s could not be found on this machine" |
6190 |
msgstr "" |
|
6191 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6192 |
#: bzrlib/errors.py:2115
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6193 |
msgid "Diff is not installed on this machine: %(msg)s" |
6194 |
msgstr "" |
|
6195 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6196 |
#: bzrlib/errors.py:2123
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6197 |
msgid "Diff3 is not installed on this machine." |
6198 |
msgstr "" |
|
6199 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6200 |
#: bzrlib/errors.py:2129
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6201 |
msgid "The content being inserted is already present." |
6202 |
msgstr "" |
|
6203 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6204 |
#: bzrlib/errors.py:2134
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6205 |
msgid "" |
6206 |
"This tree contains left-over files from a failed operation.\n"
|
|
6207 |
" Please examine %(limbo_dir)s to see if it contains any files you wish "
|
|
6208 |
"to\n"
|
|
6209 |
" keep, and delete it when you are done."
|
|
6210 |
msgstr "" |
|
6211 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6212 |
#: bzrlib/errors.py:2145
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6213 |
msgid "" |
6214 |
"This tree contains left-over files from a failed operation.\n"
|
|
6215 |
" Please examine %(pending_deletion)s to see if it contains any files you\n"
|
|
6216 |
" wish to keep, and delete it when you are done."
|
|
6217 |
msgstr "" |
|
6218 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6219 |
#: bzrlib/errors.py:2155
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6220 |
msgid "" |
6221 |
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
|
|
6222 |
" Please examine %(limbo_dir)s to see if it contains any files you wish "
|
|
6223 |
"to\n"
|
|
6224 |
" keep, and delete it when you are done."
|
|
6225 |
msgstr "" |
|
6226 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6227 |
#: bzrlib/errors.py:2166
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6228 |
msgid "" |
6229 |
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
|
|
6230 |
"examine %(pending_deletion)s to see if it contains any files you wish to "
|
|
6231 |
"keep, and delete it when you are done."
|
|
6232 |
msgstr "" |
|
6233 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6234 |
#: bzrlib/errors.py:2176
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6235 |
msgid "Working tree is out of date, please run 'bzr update'.%(more)s" |
6236 |
msgstr "" |
|
6237 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6238 |
#: bzrlib/errors.py:2190
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6239 |
msgid "" |
6240 |
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
|
|
6241 |
msgstr "" |
|
6242 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6243 |
#: bzrlib/errors.py:2203
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6244 |
msgid "Error in merge modified format" |
6245 |
msgstr "" |
|
6246 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6247 |
#: bzrlib/errors.py:2208
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6248 |
msgid "Format error in conflict listings" |
6249 |
msgstr "" |
|
6250 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6251 |
#: bzrlib/errors.py:2212
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6252 |
msgid "" |
6253 |
"Inconsistency in dirstate file %(dirstate_path)s.\n"
|
|
6254 |
"Error: %(description)s" |
|
6255 |
msgstr "" |
|
6256 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6257 |
#: bzrlib/errors.py:2223
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6258 |
msgid "" |
6259 |
"An error has been detected in the repository %(repo_path)s.\n"
|
|
6260 |
"Please run bzr reconcile on this repository."
|
|
6261 |
msgstr "" |
|
6262 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6263 |
#: bzrlib/errors.py:2234
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6264 |
msgid "" |
6265 |
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
|
|
6266 |
"reason: %(reason)s" |
|
6267 |
msgstr "" |
|
6268 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6269 |
#: bzrlib/errors.py:2247
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6270 |
msgid "" |
6271 |
"An inconsistent delta was supplied: %(delta)r\n"
|
|
6272 |
"reason: %(reason)s" |
|
6273 |
msgstr "" |
|
6274 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6275 |
#: bzrlib/errors.py:2259
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6276 |
msgid "To use this feature you must upgrade your branch at %(path)s." |
6277 |
msgstr "" |
|
6278 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6279 |
#: bzrlib/errors.py:2268
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6280 |
msgid "To use this feature you must upgrade your repository at %(path)s." |
6281 |
msgstr "" |
|
6282 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6283 |
#: bzrlib/errors.py:2273
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6284 |
msgid "" |
6285 |
"To use this feature you must upgrade your branch at %(path)s to a format "
|
|
6286 |
"which supports rich roots."
|
|
6287 |
msgstr "" |
|
6288 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6289 |
#: bzrlib/errors.py:2279
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6290 |
msgid "Cannot perform local-only commits on unbound branches." |
6291 |
msgstr "" |
|
6292 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6293 |
#: bzrlib/errors.py:2284
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6294 |
msgid "The method %(mname)s is not supported on objects of type %(tname)s." |
6295 |
msgstr "" |
|
6296 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6297 |
#: bzrlib/errors.py:2305
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6298 |
msgid "Ghost tags not supported by format %(format)r." |
6299 |
msgstr "" |
|
6300 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6301 |
#: bzrlib/errors.py:2313
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6302 |
msgid "File is binary but should be text." |
6303 |
msgstr "" |
|
6304 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6305 |
#: bzrlib/errors.py:2318
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6306 |
msgid "The path %(path)s is not permitted on this platform" |
6307 |
msgstr "" |
|
6308 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6309 |
#: bzrlib/errors.py:2327
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6310 |
msgid "" |
6311 |
"Testament did not match expected value.\n"
|
|
6312 |
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
|
|
6313 |
" {%(measured)s}"
|
|
6314 |
msgstr "" |
|
6315 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6316 |
#: bzrlib/errors.py:2339
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6317 |
msgid "Not a bzr revision-bundle: %(text)r" |
6318 |
msgstr "" |
|
6319 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6320 |
#: bzrlib/errors.py:2348
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6321 |
msgid "Bad bzr revision-bundle: %(text)r" |
6322 |
msgstr "" |
|
6323 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6324 |
#: bzrlib/errors.py:2357
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6325 |
msgid "Malformed bzr revision-bundle header: %(text)r" |
6326 |
msgstr "" |
|
6327 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6328 |
#: bzrlib/errors.py:2362
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6329 |
msgid "Malformed patches in bzr revision-bundle: %(text)r" |
6330 |
msgstr "" |
|
6331 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6332 |
#: bzrlib/errors.py:2367
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6333 |
msgid "Malformed footer in bzr revision-bundle: %(text)r" |
6334 |
msgstr "" |
|
6335 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6336 |
#: bzrlib/errors.py:2372
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6337 |
msgid "End of line marker was not \\n in bzr revision-bundle" |
6338 |
msgstr "" |
|
6339 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6340 |
#: bzrlib/errors.py:2382
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6341 |
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s" |
6342 |
msgstr "" |
|
6343 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6344 |
#: bzrlib/errors.py:2392
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6345 |
msgid "Root class for inventory serialization errors" |
6346 |
msgstr "" |
|
6347 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6348 |
#: bzrlib/errors.py:2396
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6349 |
msgid "" |
6350 |
"The inventory was not in the expected format:\n"
|
|
6351 |
" %(msg)s"
|
|
6352 |
msgstr "" |
|
6353 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6354 |
#: bzrlib/errors.py:2405
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6355 |
msgid "This operation requires rich root data storage" |
6356 |
msgstr "" |
|
6357 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6358 |
#: bzrlib/errors.py:2418
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6359 |
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s" |
6360 |
msgstr "" |
|
6361 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6362 |
#: bzrlib/errors.py:2427
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6363 |
msgid "" |
6364 |
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
|
|
6365 |
"variable."
|
|
6366 |
msgstr "" |
|
6367 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6368 |
#: bzrlib/errors.py:2434
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6369 |
msgid "" |
6370 |
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
|
|
6371 |
"ghost at {%(ghost_revision_id)s}"
|
|
6372 |
msgstr "" |
|
6373 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6374 |
#: bzrlib/errors.py:2444
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6375 |
msgid "Ghost revision {%(revision_id)s} cannot be used here." |
6376 |
msgstr "" |
|
6377 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6378 |
#: bzrlib/errors.py:2495
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6379 |
msgid "" |
6380 |
"A merge directive must provide either a bundle or a public branch location."
|
|
6381 |
msgstr "" |
|
6382 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6383 |
#: bzrlib/errors.py:2502
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6384 |
msgid "Bad merge directive payload %(start)r" |
6385 |
msgstr "" |
|
6386 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6387 |
#: bzrlib/errors.py:2512
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6388 |
msgid "Preview patch does not match requested changes." |
6389 |
msgstr "" |
|
6390 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6391 |
#: bzrlib/errors.py:2518
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6392 |
msgid "Patch_type was %(patch_type)s, but no patch was supplied." |
6393 |
msgstr "" |
|
6394 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6395 |
#: bzrlib/errors.py:2528
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6396 |
msgid "" |
6397 |
"Your branch does not have all of the revisions required in order to merge "
|
|
6398 |
"this merge directive and the target location specified in the merge "
|
|
6399 |
"directive is not a branch: %(location)s."
|
|
6400 |
msgstr "" |
|
6401 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6402 |
#: bzrlib/errors.py:2540
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6403 |
msgid "Unsupported entry kind %(kind)s" |
6404 |
msgstr "" |
|
6405 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6406 |
#: bzrlib/errors.py:2548
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6407 |
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s" |
6408 |
msgstr "" |
|
6409 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6410 |
#: bzrlib/errors.py:2558
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6411 |
msgid "Subsume target %(other_tree)s needs to be upgraded." |
6412 |
msgstr "" |
|
6413 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6414 |
#: bzrlib/errors.py:2577
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6415 |
msgid "No such tag: %(tag_name)s" |
6416 |
msgstr "" |
|
6417 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6418 |
#: bzrlib/errors.py:2585
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6419 |
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade." |
6420 |
msgstr "" |
|
6421 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6422 |
#: bzrlib/errors.py:2594
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6423 |
msgid "Tag %(tag_name)s already exists." |
6424 |
msgstr "" |
|
6425 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6426 |
#: bzrlib/errors.py:2602
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6427 |
msgid "" |
6428 |
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
|
|
6429 |
"bugs\" for more information on this feature."
|
|
6430 |
msgstr "" |
|
6431 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6432 |
#: bzrlib/errors.py:2612
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6433 |
msgid "" |
6434 |
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
|
|
6435 |
msgstr "" |
|
6436 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6437 |
#: bzrlib/errors.py:2622
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6438 |
msgid "" |
6439 |
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
|
|
6440 |
msgstr "" |
|
6441 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6442 |
#: bzrlib/errors.py:2632
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6443 |
msgid "Invalid line in bugs property: '%(line)s'" |
6444 |
msgstr "" |
|
6445 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6446 |
#: bzrlib/errors.py:2640
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6447 |
msgid "Invalid bug status: '%(status)s'" |
6448 |
msgstr "" |
|
6449 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6450 |
#: bzrlib/errors.py:2648
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6451 |
msgid "Could not understand response from smart server: %(response_tuple)r" |
6452 |
msgstr "" |
|
6453 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6454 |
#: bzrlib/errors.py:2687
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6455 |
msgid "Server sent an unexpected error: %(error_tuple)r" |
6456 |
msgstr "" |
|
6457 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6458 |
#: bzrlib/errors.py:2706
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6459 |
msgid "Unrecognised container format: %(container_format)r" |
6460 |
msgstr "" |
|
6461 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6462 |
#: bzrlib/errors.py:2714
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6463 |
msgid "Unexpected end of container stream" |
6464 |
msgstr "" |
|
6465 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6466 |
#: bzrlib/errors.py:2719
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6467 |
msgid "Unknown record type: %(record_type)r" |
6468 |
msgstr "" |
|
6469 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6470 |
#: bzrlib/errors.py:2727
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6471 |
msgid "Invalid record: %(reason)s" |
6472 |
msgstr "" |
|
6473 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6474 |
#: bzrlib/errors.py:2735
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6475 |
msgid "Container has data after end marker: %(excess)r" |
6476 |
msgstr "" |
|
6477 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6478 |
#: bzrlib/errors.py:2743
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6479 |
msgid "Container has multiple records with the same name: %(name)s" |
6480 |
msgstr "" |
|
6481 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6482 |
#: bzrlib/errors.py:2756
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6483 |
msgid "Corrupt or incompatible data stream: %(reason)s" |
6484 |
msgstr "" |
|
6485 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6486 |
#: bzrlib/errors.py:2764
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6487 |
msgid "SMTP error: %(error)s" |
6488 |
msgstr "" |
|
6489 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6490 |
#: bzrlib/errors.py:2772
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6491 |
msgid "No message supplied." |
6492 |
msgstr "" |
|
6493 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6494 |
#: bzrlib/errors.py:2777
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6495 |
msgid "No mail-to address (--mail-to) or output (-o) specified." |
6496 |
msgstr "" |
|
6497 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6498 |
#: bzrlib/errors.py:2782
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6499 |
msgid "" |
6500 |
"Unable to find mail client with the following names: "
|
|
6501 |
"%(mail_command_list_string)s"
|
|
6502 |
msgstr "" |
|
6503 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6504 |
#: bzrlib/errors.py:2792
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6505 |
msgid "SMTP connection to %(host)s refused" |
6506 |
msgstr "" |
|
6507 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6508 |
#: bzrlib/errors.py:2801
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6509 |
msgid "Please specify smtp_server. No server at default %(host)s." |
6510 |
msgstr "" |
|
6511 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6512 |
#: bzrlib/errors.py:2815
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6513 |
msgid "" |
6514 |
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
|
|
6515 |
"reconfigure."
|
|
6516 |
msgstr "" |
|
6517 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6518 |
#: bzrlib/errors.py:2827
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6519 |
msgid "'%(display_url)s' is already a branch." |
6520 |
msgstr "" |
|
6521 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6522 |
#: bzrlib/errors.py:2832
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6523 |
msgid "'%(display_url)s' is already a tree." |
6524 |
msgstr "" |
|
6525 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6526 |
#: bzrlib/errors.py:2837
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6527 |
msgid "'%(display_url)s' is already a checkout." |
6528 |
msgstr "" |
|
6529 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6530 |
#: bzrlib/errors.py:2842
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6531 |
msgid "'%(display_url)s' is already a lightweight checkout." |
6532 |
msgstr "" |
|
6533 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6534 |
#: bzrlib/errors.py:2847
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6535 |
msgid "'%(display_url)s' is already using a shared repository." |
6536 |
msgstr "" |
|
6537 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6538 |
#: bzrlib/errors.py:2852
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6539 |
msgid "'%(display_url)s' is already standalone." |
6540 |
msgstr "" |
|
6541 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6542 |
#: bzrlib/errors.py:2857
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6543 |
msgid "Shared repository '%(display_url)s' already creates working trees." |
6544 |
msgstr "" |
|
6545 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6546 |
#: bzrlib/errors.py:2863
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6547 |
msgid "" |
6548 |
"Shared repository '%(display_url)s' already doesn't create working trees."
|
|
6549 |
msgstr "" |
|
6550 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6551 |
#: bzrlib/errors.py:2869
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6552 |
msgid "Requested reconfiguration of '%(display_url)s' is not supported." |
6553 |
msgstr "" |
|
6554 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6555 |
#: bzrlib/errors.py:2874
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6556 |
msgid "No location could be found to bind to at %(display_url)s." |
6557 |
msgstr "" |
|
6558 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6559 |
#: bzrlib/errors.py:2879
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6560 |
msgid "" |
6561 |
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
|
|
6562 |
"status).%(more)s"
|
|
6563 |
msgstr "" |
|
6564 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6565 |
#: bzrlib/errors.py:2898
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6566 |
msgid "" |
6567 |
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
|
|
6568 |
"list).%(more)s"
|
|
6569 |
msgstr "" |
|
6570 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6571 |
#: bzrlib/errors.py:2904
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6572 |
msgid "Variable {%(name)s} is not available." |
6573 |
msgstr "" |
|
6574 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6575 |
#: bzrlib/errors.py:2912
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6576 |
msgid "No template specified." |
6577 |
msgstr "" |
|
6578 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6579 |
#: bzrlib/errors.py:2917
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6580 |
msgid "Unable to create symlink %(path_str)son this platform" |
6581 |
msgstr "" |
|
6582 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6583 |
#: bzrlib/errors.py:2932
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6584 |
msgid "" |
6585 |
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
|
|
6586 |
"\"original\", \"local\"."
|
|
6587 |
msgstr "" |
|
6588 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6589 |
#: bzrlib/errors.py:2966
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6590 |
msgid "" |
6591 |
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
|
|
6592 |
msgstr "" |
|
6593 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6594 |
#: bzrlib/errors.py:2978
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6595 |
msgid "The \"%(config_id)s\" configuration does not exist." |
6596 |
msgstr "" |
|
6597 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6598 |
#: bzrlib/errors.py:2986
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6599 |
msgid "The \"%(option_name)s\" configuration option does not exist." |
6600 |
msgstr "" |
|
6601 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6602 |
#: bzrlib/errors.py:2994
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6603 |
msgid "The alias \"%(alias_name)s\" does not exist." |
6604 |
msgstr "" |
|
6605 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6606 |
#: bzrlib/errors.py:3008
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6607 |
msgid "\"%(alias_name)s\" is not a valid location alias." |
6608 |
msgstr "" |
|
6609 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6610 |
#: bzrlib/errors.py:3016
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6611 |
msgid "No %(alias_name)s location assigned." |
6612 |
msgstr "" |
|
6613 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6614 |
#: bzrlib/errors.py:3024
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6615 |
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s." |
6616 |
msgstr "" |
|
6617 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6618 |
#: bzrlib/errors.py:3034
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6619 |
msgid "Unknown rules detected: %(unknowns_str)s." |
6620 |
msgstr "" |
|
6621 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6622 |
#: bzrlib/errors.py:3045
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6623 |
msgid "Tip change rejected: %(msg)s" |
6624 |
msgstr "" |
|
6625 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6626 |
#: bzrlib/errors.py:3053
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6627 |
msgid "Shelf corrupt." |
6628 |
msgstr "" |
|
6629 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6630 |
#: bzrlib/errors.py:3058
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6631 |
msgid "Corruption while decompressing repository file%(orig_error)s" |
6632 |
msgstr "" |
|
6633 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6634 |
#: bzrlib/errors.py:3070
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6635 |
msgid "No changes are shelved with id \"%(shelf_id)d\"." |
6636 |
msgstr "" |
|
6637 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6638 |
#: bzrlib/errors.py:3078
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6639 |
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead." |
6640 |
msgstr "" |
|
6641 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6642 |
#: bzrlib/errors.py:3086
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6643 |
msgid "" |
6644 |
"An attempt to access a url outside the server jail was made: '%(url)s'."
|
|
6645 |
msgstr "" |
|
6646 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6647 |
#: bzrlib/errors.py:3094
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6648 |
msgid "The user aborted the operation." |
6649 |
msgstr "" |
|
6650 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6651 |
#: bzrlib/errors.py:3099
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6652 |
msgid "Branching '%(url)s'(%(format)s) must create a working tree." |
6653 |
msgstr "" |
|
6654 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6655 |
#: bzrlib/errors.py:3109
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6656 |
msgid "No such view: %(view_name)s." |
6657 |
msgstr "" |
|
6658 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6659 |
#: bzrlib/errors.py:3119
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6660 |
msgid "" |
6661 |
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
|
|
6662 |
"to a later format."
|
|
6663 |
msgstr "" |
|
6664 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6665 |
#: bzrlib/errors.py:3128
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6666 |
msgid "" |
6667 |
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
|
|
6668 |
msgstr "" |
|
6669 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6670 |
#: bzrlib/errors.py:3195
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6671 |
msgid "%(bzrdir)r does not support co-located branches." |
6672 |
msgstr "" |
|
6673 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6674 |
#: bzrlib/errors.py:3201
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6675 |
msgid "" |
6676 |
"Unable to determine your name.\n"
|
|
6677 |
"Please, set your name with the 'whoami' command.\n"
|
|
6678 |
"E.g. bzr whoami \"Your Name <name@example.com>\""
|
|
6679 |
msgstr "" |
|
6680 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6681 |
#: bzrlib/errors.py:3210
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6682 |
msgid "Invalid pattern(s) found. %(msg)s" |
6683 |
msgstr "" |
|
6684 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6685 |
#: bzrlib/errors.py:3218
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6686 |
msgid "" |
6687 |
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
|
|
6688 |
"unbind` to fix."
|
|
6689 |
msgstr "" |
|
6690 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6691 |
#: bzrlib/errors.py:3229
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6692 |
msgid "Loop involving %(refs)r while expanding \"%(string)s\"." |
6693 |
msgstr "" |
|
6694 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6695 |
#: bzrlib/errors.py:3238
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6696 |
msgid "Option %(name)s is not defined while expanding \"%(string)s\"." |
6697 |
msgstr "" |
|
6698 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6699 |
#: bzrlib/errors.py:3247
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6700 |
msgid "" |
6701 |
"No compatible object available for operations from %(source)r to %(target)r."
|
|
6702 |
msgstr "" |
|
6703 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6704 |
#: bzrlib/errors.py:3257
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6705 |
msgid "" |
6706 |
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
|
|
6707 |
"%(arguments)s."
|
|
6708 |
msgstr "" |
|
6709 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6710 |
#: bzrlib/errors.py:3267
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6711 |
msgid "" |
6712 |
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
|
|
6713 |
"format %(format)r"
|
|
6714 |
msgstr "" |
|
6715 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6716 |
#: bzrlib/errors.py:3279
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6717 |
msgid "" |
6718 |
"Missing feature %(feature)s not provided by this version of Bazaar or any "
|
|
6719 |
"plugin."
|
|
6720 |
msgstr "" |
|
6721 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6722 |
#: bzrlib/errors.py:3292
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6723 |
msgid "Binary files section encountered." |
6724 |
msgstr "" |
|
6725 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6726 |
#: bzrlib/errors.py:3300
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6727 |
msgid "" |
6728 |
"Malformed patch header. %(desc)s\n"
|
|
6729 |
"%(line)r"
|
|
6730 |
msgstr "" |
|
6731 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6732 |
#: bzrlib/errors.py:3309
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6733 |
msgid "" |
6734 |
"Malformed hunk header. %(desc)s\n"
|
|
6735 |
"%(line)r"
|
|
6736 |
msgstr "" |
|
6737 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6738 |
#: bzrlib/errors.py:3318
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6739 |
msgid "" |
6740 |
"Malformed line. %(desc)s\n"
|
|
6741 |
"%(line)r"
|
|
6742 |
msgstr "" |
|
6743 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6744 |
#: bzrlib/errors.py:3328
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6745 |
msgid "" |
6746 |
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
|
|
6747 |
"but patch says it should be \"%(patch_line)s\""
|
|
6748 |
msgstr "" |
|
6749 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6750 |
#: bzrlib/errors.py:3339
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6751 |
msgid "The feature %(feature)s has already been registered." |
6752 |
msgstr "" |
|
6753 |
||
6754 |
#: bzrlib/export_pot.py:252
|
|
6755 |
#, python-format
|
|
6756 |
msgid "Exporting messages from builtin command: %s" |
|
6757 |
msgstr "" |
|
6758 |
||
6759 |
#: bzrlib/export_pot.py:271
|
|
6760 |
msgid "Exporting messages from plugin command: {0} in {1}" |
|
6761 |
msgstr "" |
|
6762 |
||
6763 |
#: bzrlib/export_pot.py:292
|
|
6764 |
#, python-format
|
|
6765 |
msgid "Exporting message from error: %s" |
|
6766 |
msgstr "" |
|
6767 |
||
6768 |
#: bzrlib/fetch.py:98
|
|
6769 |
msgid "Finding revisions" |
|
6770 |
msgstr "" |
|
6771 |
||
6772 |
#: bzrlib/fetch.py:103
|
|
6773 |
msgid "Fetching revisions" |
|
6774 |
msgstr "" |
|
6775 |
||
6776 |
#: bzrlib/foreign.py:262
|
|
6777 |
msgid "Push into a different VCS without any custom bzr metadata." |
|
6778 |
msgstr "" |
|
6779 |
||
6780 |
#: bzrlib/foreign.py:264
|
|
6781 |
msgid "" |
|
6782 |
"This will afterwards rebase the local branch on the remote\n"
|
|
6783 |
"branch unless the --no-rebase option is used, in which case \n"
|
|
6784 |
"the two branches will be out of sync after the push. "
|
|
6785 |
msgstr "" |
|
6786 |
||
6787 |
#: bzrlib/foreign.py:277
|
|
6788 |
msgid "Do not rebase after push." |
|
6789 |
msgstr "" |
|
6790 |
||
6791 |
#: bzrlib/foreign.py:311
|
|
6792 |
#, python-format
|
|
6793 |
msgid "Using saved location: %s\n" |
|
6794 |
msgstr "" |
|
6795 |
||
6796 |
#: bzrlib/foreign.py:321
|
|
6797 |
msgid "" |
|
6798 |
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
|
|
6799 |
"regular push."
|
|
6800 |
msgstr "" |
|
6801 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6802 |
#: bzrlib/gpg.py:366
|
6803 |
msgid "No GnuPG key results for pattern: {0}" |
|
6804 |
msgstr "" |
|
6805 |
||
6806 |
#: bzrlib/gpg.py:439
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6807 |
msgid "{0} commits with valid signatures" |
6808 |
msgstr "" |
|
6809 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6810 |
#: bzrlib/gpg.py:445
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6811 |
msgid "{0} commit with unknown key" |
6812 |
msgid_plural "{0} commits with unknown keys" |
|
6813 |
msgstr[0] "" |
|
6814 |
msgstr[1] "" |
|
6815 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6816 |
#: bzrlib/gpg.py:453
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6817 |
msgid "{0} commit not valid" |
6818 |
msgid_plural "{0} commits not valid" |
|
6819 |
msgstr[0] "" |
|
6820 |
msgstr[1] "" |
|
6821 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6822 |
#: bzrlib/gpg.py:461
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6823 |
msgid "{0} commit not signed" |
6824 |
msgid_plural "{0} commits not signed" |
|
6825 |
msgstr[0] "" |
|
6826 |
msgstr[1] "" |
|
6827 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6828 |
#: bzrlib/gpg.py:469
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6829 |
msgid "{0} commit with key now expired" |
6830 |
msgid_plural "{0} commits with key now expired" |
|
6831 |
msgstr[0] "" |
|
6832 |
msgstr[1] "" |
|
6833 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6834 |
#: bzrlib/gpg.py:489
|
6835 |
msgid "{0} commit by author {1} with key {2} now expired" |
|
6836 |
msgid_plural "{0} commits by author {1} with key {2} now expired" |
|
6837 |
msgstr[0] "" |
|
6838 |
msgstr[1] "" |
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6839 |
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6840 |
#: bzrlib/gpg.py:505
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6841 |
msgid "{0} signed {1} commit" |
6842 |
msgid_plural "{0} signed {1} commits" |
|
6843 |
msgstr[0] "" |
|
6844 |
msgstr[1] "" |
|
6845 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6846 |
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6847 |
msgid "{0} commit by author {1}" |
6848 |
msgid_plural "{0} commits by author {1}" |
|
6849 |
msgstr[0] "" |
|
6850 |
msgstr[1] "" |
|
6851 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6852 |
#: bzrlib/gpg.py:554
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6853 |
msgid "Unknown key {0} signed {1} commit" |
6854 |
msgid_plural "Unknown key {0} signed {1} commits" |
|
6855 |
msgstr[0] "" |
|
6856 |
msgstr[1] "" |
|
6857 |
||
6858 |
#: bzrlib/groupcompress.py:1739
|
|
6859 |
#, python-format
|
|
6860 |
msgid "Insert claimed random_id=True, but then inserted %r two times" |
|
6861 |
msgstr "" |
|
6862 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6863 |
#: bzrlib/hooks.py:313
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6864 |
#, python-format
|
6865 |
msgid "Introduced in: %s" |
|
6866 |
msgstr "" |
|
6867 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6868 |
#: bzrlib/hooks.py:316
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6869 |
#, python-format
|
6870 |
msgid "Deprecated in: %s" |
|
6871 |
msgstr "" |
|
6872 |
||
6873 |
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
|
|
6874 |
msgid "Walking content" |
|
6875 |
msgstr "" |
|
6876 |
||
6877 |
#: bzrlib/knit.py:3330
|
|
6878 |
msgid "annotating" |
|
6879 |
msgstr "" |
|
6880 |
||
6881 |
#: bzrlib/lock.py:548
|
|
6882 |
msgid "{0!r} was {1} locked again" |
|
6883 |
msgstr "" |
|
6884 |
||
6885 |
#: bzrlib/lockdir.py:321
|
|
6886 |
#, python-format
|
|
6887 |
msgid "error removing pending lock: %s" |
|
6888 |
msgstr "" |
|
6889 |
||
6890 |
#: bzrlib/lockdir.py:616
|
|
6891 |
msgid "Unable to obtain" |
|
6892 |
msgstr "" |
|
6893 |
||
6894 |
#: bzrlib/lockdir.py:618
|
|
6895 |
msgid "Lock owner changed for" |
|
6896 |
msgstr "" |
|
6897 |
||
6898 |
#: bzrlib/lockdir.py:620
|
|
6899 |
msgid "{0} lock {1} {2}." |
|
6900 |
msgstr "" |
|
6901 |
||
6902 |
#: bzrlib/lockdir.py:627
|
|
6903 |
#, python-format
|
|
6904 |
msgid "Will continue to try until %s, unless you press Ctrl-C." |
|
6905 |
msgstr "" |
|
6906 |
||
6907 |
#: bzrlib/lockdir.py:629
|
|
6908 |
msgid "See \"bzr help break-lock\" for more." |
|
6909 |
msgstr "" |
|
6910 |
||
6911 |
#: bzrlib/lockdir.py:739
|
|
6912 |
#, python-format
|
|
6913 |
msgid "" |
|
6914 |
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
|
|
6915 |
msgstr "" |
|
6916 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6917 |
#: bzrlib/log.py:563
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6918 |
msgid "--exclude-common-ancestry requires two different revisions" |
6919 |
msgstr "" |
|
6920 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6921 |
#: bzrlib/log.py:565
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6922 |
#, python-format
|
6923 |
msgid "invalid direction %r" |
|
6924 |
msgstr "" |
|
6925 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6926 |
#: bzrlib/log.py:653
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6927 |
msgid "Start revision not found in history of end revision." |
6928 |
msgstr "" |
|
6929 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6930 |
#: bzrlib/log.py:1071 bzrlib/log.py:1129
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6931 |
msgid "Logging revision 0 is invalid." |
6932 |
msgstr "" |
|
6933 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6934 |
#: bzrlib/log.py:1073 bzrlib/log.py:1131
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6935 |
msgid "Start revision must be older than the end revision." |
6936 |
msgstr "" |
|
6937 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6938 |
#: bzrlib/log.py:1818
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6939 |
#, python-format
|
6940 |
msgid "unknown log formatter: %r" |
|
6941 |
msgstr "" |
|
6942 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6943 |
#: bzrlib/log.py:2114
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6944 |
msgid "fixes bug" |
6945 |
msgid_plural "fixes bugs" |
|
6946 |
msgstr[0] "" |
|
6947 |
msgstr[1] "" |
|
6948 |
||
6949 |
#: bzrlib/merge.py:689
|
|
6950 |
msgid "All changes applied successfully." |
|
6951 |
msgstr "" |
|
6952 |
||
6953 |
#: bzrlib/merge.py:691
|
|
6954 |
#, python-format
|
|
6955 |
msgid "%d conflicts encountered." |
|
6956 |
msgstr "" |
|
6957 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6958 |
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
6959 |
msgid "Preparing file merge" |
6960 |
msgstr "" |
|
6961 |
||
6962 |
#: bzrlib/multiparent.py:426
|
|
6963 |
msgid "Importing revisions" |
|
6964 |
msgstr "" |
|
6965 |
||
6966 |
#: bzrlib/option.py:526
|
|
6967 |
msgid "Show help message." |
|
6968 |
msgstr "" |
|
6969 |
||
6970 |
#: bzrlib/option.py:528
|
|
6971 |
msgid "Only display errors and warnings." |
|
6972 |
msgstr "エラーや警告だけを表示します。" |
|
6973 |
||
6974 |
#: bzrlib/option.py:531
|
|
6975 |
msgid "Show usage message and options." |
|
6976 |
msgstr "使い方とオプションを表示します。" |
|
6977 |
||
6978 |
#: bzrlib/option.py:533
|
|
6979 |
msgid "Display more information." |
|
6980 |
msgstr "より詳細な情報を表示します。" |
|
6981 |
||
6982 |
#: bzrlib/option.py:541
|
|
6983 |
msgid "" |
|
6984 |
"Select changes introduced by the specified revision. See also \"help "
|
|
6985 |
"revisionspec\"."
|
|
6986 |
msgstr "" |
|
6987 |
||
6988 |
#: bzrlib/option.py:543
|
|
6989 |
msgid "Branch to operate on, instead of working directory." |
|
6990 |
msgstr "" |
|
6991 |
||
6992 |
#: bzrlib/option.py:545
|
|
6993 |
msgid "Detailed log format." |
|
6994 |
msgstr "" |
|
6995 |
||
6996 |
#: bzrlib/option.py:545
|
|
6997 |
msgid "Format used by GNU ChangeLog files." |
|
6998 |
msgstr "" |
|
6999 |
||
7000 |
#: bzrlib/option.py:545
|
|
7001 |
msgid "Log format with one line per revision." |
|
7002 |
msgstr "" |
|
7003 |
||
7004 |
#: bzrlib/option.py:545
|
|
7005 |
msgid "Moderately short log format." |
|
7006 |
msgstr "" |
|
7007 |
||
7008 |
#: bzrlib/option.py:545
|
|
7009 |
msgid "Use specified log format." |
|
7010 |
msgstr "" |
|
7011 |
||
7012 |
#: bzrlib/option.py:547
|
|
7013 |
msgid "Log format" |
|
7014 |
msgstr "" |
|
7015 |
||
7016 |
#: bzrlib/option.py:549
|
|
7017 |
msgid "LCA-newness merge." |
|
7018 |
msgstr "" |
|
7019 |
||
7020 |
#: bzrlib/option.py:549
|
|
7021 |
msgid "Merge using external diff3." |
|
7022 |
msgstr "" |
|
7023 |
||
7024 |
#: bzrlib/option.py:549
|
|
7025 |
msgid "Native diff3-style merge." |
|
7026 |
msgstr "" |
|
7027 |
||
7028 |
#: bzrlib/option.py:549
|
|
7029 |
msgid "Select a particular merge algorithm." |
|
7030 |
msgstr "" |
|
7031 |
||
7032 |
#: bzrlib/option.py:549
|
|
7033 |
msgid "Weave-based merge." |
|
7034 |
msgstr "" |
|
7035 |
||
7036 |
#: bzrlib/option.py:551
|
|
7037 |
msgid "Merge algorithm" |
|
7038 |
msgstr "" |
|
7039 |
||
7040 |
#: bzrlib/option.py:554
|
|
7041 |
msgid "Message string." |
|
7042 |
msgstr "" |
|
7043 |
||
7044 |
#: bzrlib/option.py:556
|
|
7045 |
msgid "Use an ASCII NUL (\\0) separator rather than a newline." |
|
7046 |
msgstr "" |
|
7047 |
||
7048 |
#: bzrlib/option.py:558
|
|
7049 |
msgid "Ignore differences between branches and overwrite unconditionally." |
|
7050 |
msgstr "" |
|
7051 |
||
7052 |
#: bzrlib/option.py:560
|
|
7053 |
msgid "Remember the specified location as a default." |
|
7054 |
msgstr "" |
|
7055 |
||
7056 |
#: bzrlib/option.py:562
|
|
7057 |
msgid "Reprocess to reduce spurious conflicts." |
|
7058 |
msgstr "" |
|
7059 |
||
7060 |
#: bzrlib/option.py:566
|
|
7061 |
msgid "See \"help revisionspec\" for details." |
|
7062 |
msgstr "詳細は \"help revisionspec\" を参照してください。" |
|
7063 |
||
7064 |
#: bzrlib/option.py:568
|
|
7065 |
msgid "Show internal object ids." |
|
7066 |
msgstr "" |
|
7067 |
||
7068 |
#: bzrlib/option.py:571
|
|
7069 |
msgid "Display timezone as local, original, or utc." |
|
7070 |
msgstr "" |
|
7071 |
||
7072 |
#: bzrlib/osutils.py:100
|
|
7073 |
msgid "Parameter {0!r} encoding is unsupported by {1} application locale." |
|
7074 |
msgstr "" |
|
7075 |
||
7076 |
#: bzrlib/osutils.py:220
|
|
7077 |
msgid "lstat/stat of ({0!r}): {1!r}" |
|
7078 |
msgstr "" |
|
7079 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7080 |
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7081 |
#, python-format
|
7082 |
msgid "sorry, %r not allowed in path" |
|
7083 |
msgstr "" |
|
7084 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7085 |
#: bzrlib/osutils.py:1259
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7086 |
#, python-format
|
7087 |
msgid "%r is too short to calculate a relative path" |
|
7088 |
msgstr "" |
|
7089 |
||
7090 |
#: bzrlib/plugin.py:143
|
|
7091 |
#, python-format
|
|
7092 |
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description " |
|
7093 |
msgstr "" |
|
7094 |
||
7095 |
#: bzrlib/plugins/bash_completion/bashcomp.py:411
|
|
7096 |
msgid "Enable completions for the selected plugin (default: all plugins)" |
|
7097 |
msgstr "" |
|
7098 |
||
7099 |
#: bzrlib/plugins/bash_completion/bashcomp.py:412
|
|
7100 |
msgid "Generate a shell function for bash command line completion." |
|
7101 |
msgstr "" |
|
7102 |
||
7103 |
#: bzrlib/plugins/bash_completion/bashcomp.py:414
|
|
7104 |
msgid "" |
|
7105 |
"This command generates a shell function which can be used by bash to\n"
|
|
7106 |
"automatically complete the currently typed command when the user presses\n"
|
|
7107 |
"the completion key (usually tab)."
|
|
7108 |
msgstr "" |
|
7109 |
||
7110 |
#: bzrlib/plugins/bash_completion/bashcomp.py:418
|
|
7111 |
msgid "" |
|
7112 |
"Commonly used like this:\n"
|
|
7113 |
" eval \"`bzr bash-completion`\""
|
|
7114 |
msgstr "" |
|
7115 |
||
7116 |
#: bzrlib/plugins/bash_completion/bashcomp.py:424
|
|
7117 |
msgid "Name of the generated function (default: _bzr)" |
|
7118 |
msgstr "" |
|
7119 |
||
7120 |
#: bzrlib/plugins/bash_completion/bashcomp.py:426
|
|
7121 |
msgid "Generate only the shell function, don't enable it" |
|
7122 |
msgstr "" |
|
7123 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7124 |
#: bzrlib/plugins/launchpad/account.py:66
|
7125 |
msgid "Setting ssh/sftp usernames for launchpad.net." |
|
7126 |
msgstr "" |
|
7127 |
||
7128 |
#: bzrlib/plugins/launchpad/cmds.py:44
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7129 |
msgid "Register a branch with launchpad.net." |
7130 |
msgstr "" |
|
7131 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7132 |
#: bzrlib/plugins/launchpad/cmds.py:46
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7133 |
msgid "" |
7134 |
"This command lists a bzr branch in the directory of branches on\n"
|
|
7135 |
"launchpad.net. Registration allows the branch to be associated with\n"
|
|
7136 |
"bugs or specifications."
|
|
7137 |
msgstr "" |
|
7138 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7139 |
#: bzrlib/plugins/launchpad/cmds.py:50
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7140 |
msgid "" |
7141 |
"Before using this command you must register the project to which the\n"
|
|
7142 |
"branch belongs, and create an account for yourself on launchpad.net."
|
|
7143 |
msgstr "" |
|
7144 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7145 |
#: bzrlib/plugins/launchpad/cmds.py:53
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7146 |
msgid "" |
7147 |
"arguments:\n" |
|
7148 |
" public_url: The publicly visible url for the branch to register.\n"
|
|
7149 |
" This must be an http or https url (which Launchpad can read\n"
|
|
7150 |
" from to access the branch). Local file urls, SFTP urls, and\n"
|
|
7151 |
" bzr+ssh urls will not work.\n"
|
|
7152 |
" If no public_url is provided, bzr will use the configured\n"
|
|
7153 |
" public_url if there is one for the current branch, and\n"
|
|
7154 |
" otherwise error."
|
|
7155 |
msgstr "" |
|
7156 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7157 |
#: bzrlib/plugins/launchpad/cmds.py:62
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7158 |
msgid "" |
7159 |
"example:\n" |
|
7160 |
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
|
|
7161 |
" --project fooproject"
|
|
7162 |
msgstr "" |
|
7163 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7164 |
#: bzrlib/plugins/launchpad/cmds.py:69
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7165 |
msgid "Launchpad project short name to associate with the branch." |
7166 |
msgstr "" |
|
7167 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7168 |
#: bzrlib/plugins/launchpad/cmds.py:76
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7169 |
msgid "" |
7170 |
"Short name for the branch; by default taken from the last component of the "
|
|
7171 |
"url."
|
|
7172 |
msgstr "" |
|
7173 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7174 |
#: bzrlib/plugins/launchpad/cmds.py:80
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7175 |
msgid "One-sentence description of the branch." |
7176 |
msgstr "" |
|
7177 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7178 |
#: bzrlib/plugins/launchpad/cmds.py:83
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7179 |
msgid "Longer description of the purpose or contents of the branch." |
7180 |
msgstr "" |
|
7181 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7182 |
#: bzrlib/plugins/launchpad/cmds.py:86
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7183 |
msgid "Branch author's email address, if not yourself." |
7184 |
msgstr "" |
|
7185 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7186 |
#: bzrlib/plugins/launchpad/cmds.py:89
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7187 |
msgid "The bug this branch fixes." |
7188 |
msgstr "" |
|
7189 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7190 |
#: bzrlib/plugins/launchpad/cmds.py:92
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7191 |
msgid "Prepare the request but don't actually send it." |
7192 |
msgstr "" |
|
7193 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7194 |
#: bzrlib/plugins/launchpad/cmds.py:114
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7195 |
msgid "" |
7196 |
"register-branch requires a public branch url - see bzr help register-branch."
|
|
7197 |
msgstr "" |
|
7198 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7199 |
#: bzrlib/plugins/launchpad/cmds.py:122
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7200 |
msgid "--product is deprecated; please use --project." |
7201 |
msgstr "" |
|
7202 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7203 |
#: bzrlib/plugins/launchpad/cmds.py:152
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7204 |
msgid "Open a Launchpad branch page in your web browser." |
7205 |
msgstr "" |
|
7206 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7207 |
#: bzrlib/plugins/launchpad/cmds.py:157
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7208 |
msgid "Do not actually open the browser. Just say the URL we would use." |
7209 |
msgstr "" |
|
7210 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7211 |
#: bzrlib/plugins/launchpad/cmds.py:192
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7212 |
#, python-format
|
7213 |
msgid "Opening %s in web browser" |
|
7214 |
msgstr "" |
|
7215 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7216 |
#: bzrlib/plugins/launchpad/cmds.py:200
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7217 |
msgid "Show or set the Launchpad user ID." |
7218 |
msgstr "" |
|
7219 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7220 |
#: bzrlib/plugins/launchpad/cmds.py:202
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7221 |
msgid "" |
7222 |
"When communicating with Launchpad, some commands need to know your\n"
|
|
7223 |
"Launchpad user ID. This command can be used to set or show the\n"
|
|
7224 |
"user ID that Bazaar will use for such communication."
|
|
7225 |
msgstr "" |
|
7226 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7227 |
#: bzrlib/plugins/launchpad/cmds.py:206
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7228 |
msgid "" |
7229 |
":Examples:\n"
|
|
7230 |
" Show the Launchpad ID of the current user::"
|
|
7231 |
msgstr "" |
|
7232 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7233 |
#: bzrlib/plugins/launchpad/cmds.py:209
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7234 |
msgid " bzr launchpad-login" |
7235 |
msgstr "" |
|
7236 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7237 |
#: bzrlib/plugins/launchpad/cmds.py:211
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7238 |
msgid " Set the Launchpad ID of the current user to 'bob'::" |
7239 |
msgstr "" |
|
7240 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7241 |
#: bzrlib/plugins/launchpad/cmds.py:213
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7242 |
msgid " bzr launchpad-login bob" |
7243 |
msgstr "" |
|
7244 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7245 |
#: bzrlib/plugins/launchpad/cmds.py:220
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7246 |
msgid "Don't check that the user name is valid." |
7247 |
msgstr "" |
|
7248 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7249 |
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7250 |
msgid "Launchpad user ID exists and has SSH keys.\n" |
7251 |
msgstr "" |
|
7252 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7253 |
#: bzrlib/plugins/launchpad/cmds.py:238
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7254 |
msgid "No Launchpad user ID configured.\n" |
7255 |
msgstr "" |
|
7256 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7257 |
#: bzrlib/plugins/launchpad/cmds.py:249
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7258 |
#, python-format
|
7259 |
msgid "Launchpad user ID set to '%s'.\n" |
|
7260 |
msgstr "" |
|
7261 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7262 |
#: bzrlib/plugins/launchpad/cmds.py:255
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7263 |
msgid "Ask Launchpad to mirror a branch now." |
7264 |
msgstr "" |
|
7265 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7266 |
#: bzrlib/plugins/launchpad/cmds.py:272
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7267 |
msgid "Propose merging a branch on Launchpad." |
7268 |
msgstr "" |
|
7269 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7270 |
#: bzrlib/plugins/launchpad/cmds.py:274
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7271 |
msgid "" |
7272 |
"This will open your usual editor to provide the initial comment. When it\n"
|
|
7273 |
"has created the proposal, it will open it in your default web browser."
|
|
7274 |
msgstr "" |
|
7275 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7276 |
#: bzrlib/plugins/launchpad/cmds.py:277
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7277 |
msgid "" |
7278 |
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
|
|
7279 |
"is not supplied, the remembered submit branch will be used. If no submit\n"
|
|
7280 |
"branch is remembered, the development focus will be used."
|
|
7281 |
msgstr "" |
|
7282 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7283 |
#: bzrlib/plugins/launchpad/cmds.py:281
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7284 |
msgid "" |
7285 |
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
|
|
7286 |
"the merge proposal. This can be overriden by specifying --review (-R).\n"
|
|
7287 |
"The parameter the launchpad account name of the desired reviewer. This\n"
|
|
7288 |
"may optionally be followed by '=' and the review type. For example:"
|
|
7289 |
msgstr "" |
|
7290 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7291 |
#: bzrlib/plugins/launchpad/cmds.py:286
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7292 |
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa" |
7293 |
msgstr "" |
|
7294 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7295 |
#: bzrlib/plugins/launchpad/cmds.py:288
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7296 |
msgid "" |
7297 |
"This will propose a merge, request \"jrandom\" to perform a review of\n"
|
|
7298 |
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
|
|
7299 |
msgstr "" |
|
7300 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7301 |
#: bzrlib/plugins/launchpad/cmds.py:293
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7302 |
msgid "Propose the merge on staging." |
7303 |
msgstr "" |
|
7304 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7305 |
#: bzrlib/plugins/launchpad/cmds.py:295
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7306 |
msgid "Commit message." |
7307 |
msgstr "" |
|
7308 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7309 |
#: bzrlib/plugins/launchpad/cmds.py:297
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7310 |
msgid "Mark the proposal as approved immediately." |
7311 |
msgstr "" |
|
7312 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7313 |
#: bzrlib/plugins/launchpad/cmds.py:298
|
7314 |
msgid "The bug this proposal fixes." |
|
7315 |
msgstr "" |
|
7316 |
||
7317 |
#: bzrlib/plugins/launchpad/cmds.py:300
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7318 |
msgid "Requested reviewer and optional type." |
7319 |
msgstr "" |
|
7320 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7321 |
#: bzrlib/plugins/launchpad/cmds.py:335
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7322 |
msgid "Find the proposal to merge this revision." |
7323 |
msgstr "" |
|
7324 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7325 |
#: bzrlib/plugins/launchpad/cmds.py:337
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7326 |
msgid "" |
7327 |
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
|
|
7328 |
"This works only if the selected branch was the merge proposal target, and\n"
|
|
7329 |
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
|
|
7330 |
"are opened in a web browser."
|
|
7331 |
msgstr "" |
|
7332 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7333 |
#: bzrlib/plugins/launchpad/cmds.py:342
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7334 |
msgid "" |
7335 |
"Any revision involved in the merge may be specified-- the revision in\n"
|
|
7336 |
"which the merge was performed, or one of the revisions that was merged."
|
|
7337 |
msgstr "" |
|
7338 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7339 |
#: bzrlib/plugins/launchpad/cmds.py:345
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7340 |
msgid "So, to find the merge proposal that reviewed line 1 of README::" |
7341 |
msgstr "" |
|
7342 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7343 |
#: bzrlib/plugins/launchpad/cmds.py:347
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7344 |
msgid " bzr lp-find-proposal -r annotate:README:1" |
7345 |
msgstr "" |
|
7346 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7347 |
#: bzrlib/plugins/launchpad/cmds.py:363
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7348 |
msgid "No review found." |
7349 |
msgstr "" |
|
7350 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7351 |
#: bzrlib/plugins/launchpad/cmds.py:364
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7352 |
#, python-format
|
7353 |
msgid "%d proposals(s) found." |
|
7354 |
msgstr "" |
|
7355 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7356 |
#: bzrlib/plugins/launchpad/cmds.py:374
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7357 |
msgid "Finding revision-id" |
7358 |
msgstr "" |
|
7359 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7360 |
#: bzrlib/plugins/launchpad/cmds.py:381
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7361 |
msgid "Finding merge" |
7362 |
msgstr "" |
|
7363 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7364 |
#: bzrlib/plugins/launchpad/cmds.py:386
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7365 |
msgid "Finding revno" |
7366 |
msgstr "" |
|
7367 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7368 |
#: bzrlib/plugins/launchpad/cmds.py:392
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7369 |
msgid "Finding Launchpad branch" |
7370 |
msgstr "" |
|
7371 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7372 |
#: bzrlib/plugins/launchpad/cmds.py:395
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7373 |
msgid "Finding proposals" |
7374 |
msgstr "" |
|
7375 |
||
7376 |
#: bzrlib/plugins/launchpad/lp_api.py:241
|
|
7377 |
#: bzrlib/plugins/launchpad/lp_api.py:246
|
|
7378 |
#, python-format
|
|
7379 |
msgid "%s is not registered on Launchpad" |
|
7380 |
msgstr "" |
|
7381 |
||
7382 |
#: bzrlib/plugins/launchpad/lp_api.py:256
|
|
7383 |
#, python-format
|
|
7384 |
msgid "%s has no development focus." |
|
7385 |
msgstr "" |
|
7386 |
||
7387 |
#: bzrlib/plugins/launchpad/lp_api.py:261
|
|
7388 |
#, python-format
|
|
7389 |
msgid "development focus %s has no branch." |
|
7390 |
msgstr "" |
|
7391 |
||
7392 |
#: bzrlib/plugins/launchpad/lp_api.py:266
|
|
7393 |
#, python-format
|
|
7394 |
msgid "source package %s has no branch." |
|
7395 |
msgstr "" |
|
7396 |
||
7397 |
#: bzrlib/plugins/launchpad/lp_api.py:270
|
|
7398 |
#, python-format
|
|
7399 |
msgid "%s has no associated product or source package." |
|
7400 |
msgstr "" |
|
7401 |
||
7402 |
#: bzrlib/plugins/launchpad/lp_api.py:282
|
|
7403 |
#, python-format
|
|
7404 |
msgid "%s is already up-to-date." |
|
7405 |
msgstr "" |
|
7406 |
||
7407 |
#: bzrlib/plugins/launchpad/lp_api.py:289
|
|
7408 |
#, python-format
|
|
7409 |
msgid "Pushing to %s" |
|
7410 |
msgstr "" |
|
7411 |
||
7412 |
#: bzrlib/plugins/launchpad/lp_directory.py:170
|
|
7413 |
msgid "" |
|
7414 |
"resolution for {0}\n"
|
|
7415 |
" local: {1}\n"
|
|
7416 |
" remote: {2}"
|
|
7417 |
msgstr "" |
|
7418 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7419 |
#: bzrlib/plugins/launchpad/lp_propose.py:150
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7420 |
#, python-format
|
7421 |
msgid "There is already a branch merge proposal: %s" |
|
7422 |
msgstr "" |
|
7423 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7424 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7425 |
msgid "pb parameter to convert() is deprecated" |
7426 |
msgstr "" |
|
7427 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7428 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7429 |
msgid "starting upgrade from format 4 to 5" |
7430 |
msgstr "" |
|
7431 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7432 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7433 |
msgid "note: upgrade may be faster if all store files are ungzipped first" |
7434 |
msgstr "" |
|
7435 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7436 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7437 |
msgid "converting revision" |
7438 |
msgstr "" |
|
7439 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7440 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7441 |
msgid "upgraded to weaves:" |
7442 |
msgstr "" |
|
7443 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7444 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7445 |
#, python-format
|
7446 |
msgid "%6d revisions and inventories" |
|
7447 |
msgstr "" |
|
7448 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7449 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7450 |
#, python-format
|
7451 |
msgid "%6d revisions not present" |
|
7452 |
msgstr "" |
|
7453 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7454 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7455 |
#, python-format
|
7456 |
msgid "%6d texts" |
|
7457 |
msgstr "" |
|
7458 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7459 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7460 |
msgid "writing weave" |
7461 |
msgstr "" |
|
7462 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7463 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
|
7464 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7465 |
msgid "inventory" |
7466 |
msgstr "" |
|
7467 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7468 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7469 |
msgid "write revision" |
7470 |
msgstr "" |
|
7471 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7472 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7473 |
msgid "loading revision" |
7474 |
msgstr "" |
|
7475 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7476 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7477 |
#, python-format
|
7478 |
msgid "revision {%s} not present in branch; will be converted as a ghost" |
|
7479 |
msgstr "" |
|
7480 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7481 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7482 |
msgid "starting upgrade from format 5 to 6" |
7483 |
msgstr "" |
|
7484 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7485 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7486 |
#, python-format
|
7487 |
msgid "adding prefixes to %s" |
|
7488 |
msgstr "" |
|
7489 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7490 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7491 |
msgid "starting upgrade from format 6 to metadir" |
7492 |
msgstr "" |
|
7493 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7494 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7495 |
msgid "Removing ancestry.weave" |
7496 |
msgstr "" |
|
7497 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7498 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7499 |
msgid "Finding branch files" |
7500 |
msgstr "" |
|
7501 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7502 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7503 |
msgid "Upgrading repository" |
7504 |
msgstr "" |
|
7505 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7506 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7507 |
msgid "Upgrading branch" |
7508 |
msgstr "" |
|
7509 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7510 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7511 |
msgid "No working tree." |
7512 |
msgstr "" |
|
7513 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7514 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7515 |
msgid "Upgrading working tree" |
7516 |
msgstr "" |
|
7517 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7518 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7519 |
#, python-format
|
7520 |
msgid "Make %s lock" |
|
7521 |
msgstr "" |
|
7522 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7523 |
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7524 |
#, python-format
|
7525 |
msgid "Moving %s" |
|
7526 |
msgstr "" |
|
7527 |
||
7528 |
#: bzrlib/push.py:56
|
|
7529 |
msgid "Created new branch." |
|
7530 |
msgstr "" |
|
7531 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7532 |
#: bzrlib/push.py:97
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7533 |
#, python-format
|
7534 |
msgid "" |
|
7535 |
"Target directory %s already contains a .bzr directory, but it is not valid."
|
|
7536 |
msgstr "" |
|
7537 |
||
7538 |
#: bzrlib/push.py:101
|
|
7539 |
#, python-format
|
|
7540 |
msgid "" |
|
7541 |
"Target directory %s already exists, but does not have a .bzr directory. "
|
|
7542 |
"Supply --use-existing-dir to push there anyway."
|
|
7543 |
msgstr "" |
|
7544 |
||
7545 |
#: bzrlib/push.py:122
|
|
7546 |
#, python-format
|
|
7547 |
msgid "Too many redirections trying to make %s." |
|
7548 |
msgstr "" |
|
7549 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7550 |
#: bzrlib/push.py:148
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7551 |
msgid "" |
7552 |
"These branches have diverged. See \"bzr help diverged-branches\" for more "
|
|
7553 |
"information."
|
|
7554 |
msgstr "" |
|
7555 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7556 |
#: bzrlib/push.py:152
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7557 |
#, python-format
|
7558 |
msgid "" |
|
7559 |
"It is not possible to losslessly push to %s. You may want to use dpush "
|
|
7560 |
"instead."
|
|
7561 |
msgstr "" |
|
7562 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7563 |
#: bzrlib/push.py:158
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7564 |
#, python-format
|
7565 |
msgid "" |
|
7566 |
"At %s you have a valid .bzr control directory, but not a branch or "
|
|
7567 |
"repository. This is an unsupported configuration. Please move the target "
|
|
7568 |
"directory out of the way and try again."
|
|
7569 |
msgstr "" |
|
7570 |
||
7571 |
#: bzrlib/reconcile.py:97
|
|
7572 |
#, python-format
|
|
7573 |
msgid "Reconciling branch %s" |
|
7574 |
msgstr "" |
|
7575 |
||
7576 |
#: bzrlib/reconcile.py:103
|
|
7577 |
#, python-format
|
|
7578 |
msgid "Reconciling repository %s" |
|
7579 |
msgstr "" |
|
7580 |
||
7581 |
#: bzrlib/reconcile.py:105
|
|
7582 |
msgid "Reconciling repository" |
|
7583 |
msgstr "" |
|
7584 |
||
7585 |
#: bzrlib/reconcile.py:111
|
|
7586 |
#, python-format
|
|
7587 |
msgid "%s cannot canonicalize CHKs." |
|
7588 |
msgstr "" |
|
7589 |
||
7590 |
#: bzrlib/reconcile.py:119
|
|
7591 |
msgid "Reconcile aborted: revision index has inconsistent parents." |
|
7592 |
msgstr "" |
|
7593 |
||
7594 |
#: bzrlib/reconcile.py:121
|
|
7595 |
msgid "Run \"bzr check\" for more details." |
|
7596 |
msgstr "" |
|
7597 |
||
7598 |
#: bzrlib/reconcile.py:123
|
|
7599 |
msgid "Reconciliation complete." |
|
7600 |
msgstr "" |
|
7601 |
||
7602 |
#: bzrlib/reconcile.py:166
|
|
7603 |
msgid "Fixing last revision info {0} => {1}" |
|
7604 |
msgstr "" |
|
7605 |
||
7606 |
#: bzrlib/reconcile.py:173
|
|
7607 |
msgid "revision_history ok." |
|
7608 |
msgstr "" |
|
7609 |
||
7610 |
#: bzrlib/reconcile.py:234
|
|
7611 |
msgid "Reading inventory data" |
|
7612 |
msgstr "" |
|
7613 |
||
7614 |
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
|
|
7615 |
msgid "Inventory ok." |
|
7616 |
msgstr "" |
|
7617 |
||
7618 |
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
|
|
7619 |
msgid "Backing up inventory" |
|
7620 |
msgstr "" |
|
7621 |
||
7622 |
#: bzrlib/reconcile.py:258
|
|
7623 |
msgid "Backup inventory created." |
|
7624 |
msgstr "" |
|
7625 |
||
7626 |
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
|
|
7627 |
msgid "Writing weave" |
|
7628 |
msgstr "" |
|
7629 |
||
7630 |
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
|
|
7631 |
msgid "Inventory regenerated." |
|
7632 |
msgstr "" |
|
7633 |
||
7634 |
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
|
|
7635 |
msgid "Reading indexes" |
|
7636 |
msgstr "" |
|
7637 |
||
7638 |
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
|
|
7639 |
msgid "Checking unused inventories" |
|
7640 |
msgstr "" |
|
7641 |
||
7642 |
#: bzrlib/reconcile.py:388
|
|
7643 |
msgid "Backup Inventory created" |
|
7644 |
msgstr "" |
|
7645 |
||
7646 |
#: bzrlib/reconcile.py:446
|
|
7647 |
msgid "Fixing text parents" |
|
7648 |
msgstr "" |
|
7649 |
||
7650 |
#: bzrlib/reconfigure.py:54
|
|
7651 |
msgid "{0} is now stacked on {1}\n" |
|
7652 |
msgstr "" |
|
7653 |
||
7654 |
#: bzrlib/reconfigure.py:69
|
|
7655 |
#, python-format
|
|
7656 |
msgid "%s is now not stacked\n" |
|
7657 |
msgstr "" |
|
7658 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7659 |
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7660 |
#, python-format
|
7661 |
msgid "bzr: ERROR (ignored): %s" |
|
7662 |
msgstr "" |
|
7663 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7664 |
#: bzrlib/remote.py:2534
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7665 |
msgid "Copying repository content as tarball..." |
7666 |
msgstr "" |
|
7667 |
||
7668 |
#: bzrlib/rename_map.py:69
|
|
7669 |
msgid "Calculating hashes" |
|
7670 |
msgstr "" |
|
7671 |
||
7672 |
#: bzrlib/rename_map.py:107
|
|
7673 |
msgid "Determining hash hits" |
|
7674 |
msgstr "" |
|
7675 |
||
7676 |
#: bzrlib/rename_map.py:242
|
|
7677 |
msgid "{0} => {1}" |
|
7678 |
msgstr "" |
|
7679 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7680 |
#: bzrlib/repository.py:1738
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7681 |
msgid "Moving repository to repository.backup" |
7682 |
msgstr "" |
|
7683 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7684 |
#: bzrlib/repository.py:1745
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7685 |
msgid "Creating new repository" |
7686 |
msgstr "" |
|
7687 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7688 |
#: bzrlib/repository.py:1750
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7689 |
msgid "Copying content" |
7690 |
msgstr "" |
|
7691 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7692 |
#: bzrlib/repository.py:1754
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7693 |
msgid "Deleting old repository content" |
7694 |
msgstr "" |
|
7695 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7696 |
#: bzrlib/repository.py:1756
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7697 |
msgid "repository converted" |
7698 |
msgstr "" |
|
7699 |
||
7700 |
#: bzrlib/revisionspec.py:903
|
|
7701 |
msgid "Using {0} {1}" |
|
7702 |
msgstr "" |
|
7703 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7704 |
#: bzrlib/send.py:59
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7705 |
#, python-format
|
7706 |
msgid "Mail client \"%s\" does not support specifying body" |
|
7707 |
msgstr "" |
|
7708 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7709 |
#: bzrlib/send.py:63
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7710 |
msgid "--remember requires a branch to be specified." |
7711 |
msgstr "" |
|
7712 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7713 |
#: bzrlib/send.py:78
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7714 |
msgid "No submit branch known or specified" |
7715 |
msgstr "" |
|
7716 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7717 |
#: bzrlib/send.py:81
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7718 |
msgid "Using saved {0} location \"{1}\" to determine what changes to submit." |
7719 |
msgstr "" |
|
7720 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7721 |
#: bzrlib/send.py:99
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7722 |
#, python-format
|
7723 |
msgid "No such send format '%s'." |
|
7724 |
msgstr "" |
|
7725 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7726 |
#: bzrlib/send.py:115
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7727 |
msgid "bzr send takes at most two one revision identifiers" |
7728 |
msgstr "" |
|
7729 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7730 |
#: bzrlib/send.py:128
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7731 |
msgid "No revisions to submit." |
7732 |
msgstr "" |
|
7733 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7734 |
#: bzrlib/send.py:140
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7735 |
msgid "" |
7736 |
"- not supported for merge directives that use more than one output file."
|
|
7737 |
msgstr "" |
|
7738 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7739 |
#: bzrlib/send.py:186
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7740 |
msgid "Format 0.9 does not permit bundle with no patch" |
7741 |
msgstr "" |
|
7742 |
||
7743 |
#: bzrlib/shelf_ui.py:46
|
|
7744 |
#, python-format
|
|
7745 |
msgid "Shelve adding file \"%(path)s\"?" |
|
7746 |
msgstr "" |
|
7747 |
||
7748 |
#: bzrlib/shelf_ui.py:47
|
|
7749 |
msgid "Shelve binary changes?" |
|
7750 |
msgstr "" |
|
7751 |
||
7752 |
#: bzrlib/shelf_ui.py:48
|
|
7753 |
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?" |
|
7754 |
msgstr "" |
|
7755 |
||
7756 |
#: bzrlib/shelf_ui.py:50
|
|
7757 |
#, python-format
|
|
7758 |
msgid "Shelve removing file \"%(path)s\"?" |
|
7759 |
msgstr "" |
|
7760 |
||
7761 |
#: bzrlib/shelf_ui.py:51
|
|
7762 |
#, python-format
|
|
7763 |
msgid "Shelve %d change(s)?" |
|
7764 |
msgstr "" |
|
7765 |
||
7766 |
#: bzrlib/shelf_ui.py:52
|
|
7767 |
msgid "Shelve?" |
|
7768 |
msgstr "" |
|
7769 |
||
7770 |
#: bzrlib/shelf_ui.py:53
|
|
7771 |
#, python-format
|
|
7772 |
msgid "" |
|
7773 |
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
|
|
7774 |
msgstr "" |
|
7775 |
||
7776 |
#: bzrlib/shelf_ui.py:55
|
|
7777 |
#, python-format
|
|
7778 |
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?" |
|
7779 |
msgstr "" |
|
7780 |
||
7781 |
#: bzrlib/shelf_ui.py:70
|
|
7782 |
#, python-format
|
|
7783 |
msgid "Changes shelved with id \"%d\"." |
|
7784 |
msgstr "" |
|
7785 |
||
7786 |
#: bzrlib/shelf_ui.py:74
|
|
7787 |
msgid "Selected changes destroyed." |
|
7788 |
msgstr "" |
|
7789 |
||
7790 |
#: bzrlib/shelf_ui.py:78
|
|
7791 |
msgid "Selected changes:" |
|
7792 |
msgstr "" |
|
7793 |
||
7794 |
#: bzrlib/shelf_ui.py:98
|
|
7795 |
#, python-format
|
|
7796 |
msgid "Delete file \"%(path)s\"?" |
|
7797 |
msgstr "" |
|
7798 |
||
7799 |
#: bzrlib/shelf_ui.py:99
|
|
7800 |
msgid "Apply binary changes?" |
|
7801 |
msgstr "" |
|
7802 |
||
7803 |
#: bzrlib/shelf_ui.py:100
|
|
7804 |
#, python-format
|
|
7805 |
msgid "Change \"%(path)s\" from %(this)s to %(other)s?" |
|
7806 |
msgstr "" |
|
7807 |
||
7808 |
#: bzrlib/shelf_ui.py:102
|
|
7809 |
#, python-format
|
|
7810 |
msgid "Add file \"%(path)s\"?" |
|
7811 |
msgstr "" |
|
7812 |
||
7813 |
#: bzrlib/shelf_ui.py:103
|
|
7814 |
#, python-format
|
|
7815 |
msgid "Apply %d change(s)?" |
|
7816 |
msgstr "" |
|
7817 |
||
7818 |
#: bzrlib/shelf_ui.py:104
|
|
7819 |
msgid "Apply change?" |
|
7820 |
msgstr "" |
|
7821 |
||
7822 |
#: bzrlib/shelf_ui.py:105
|
|
7823 |
#, python-format
|
|
7824 |
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?" |
|
7825 |
msgstr "" |
|
7826 |
||
7827 |
#: bzrlib/shelf_ui.py:107
|
|
7828 |
#, python-format
|
|
7829 |
msgid "Rename \"%(this)s\" => \"%(other)s\"?" |
|
7830 |
msgstr "" |
|
7831 |
||
7832 |
#: bzrlib/shelf_ui.py:402
|
|
7833 |
msgid "No changes are shelved." |
|
7834 |
msgstr "" |
|
7835 |
||
7836 |
#: bzrlib/shelf_ui.py:460
|
|
7837 |
#, python-format
|
|
7838 |
msgid "Using changes with id \"%d\"." |
|
7839 |
msgstr "" |
|
7840 |
||
7841 |
#: bzrlib/shelf_ui.py:464
|
|
7842 |
#, python-format
|
|
7843 |
msgid "Message: %s" |
|
7844 |
msgstr "" |
|
7845 |
||
7846 |
#: bzrlib/shelf_ui.py:476
|
|
7847 |
#, python-format
|
|
7848 |
msgid "Deleted changes with id \"%d\"." |
|
7849 |
msgstr "" |
|
7850 |
||
7851 |
#: bzrlib/smart/medium.py:714
|
|
7852 |
msgid "HPSS calls: {0} ({1} vfs) {2}" |
|
7853 |
msgstr "" |
|
7854 |
||
7855 |
#: bzrlib/smart/server.py:169
|
|
7856 |
msgid "Requested to stop gracefully" |
|
7857 |
msgstr "" |
|
7858 |
||
7859 |
#: bzrlib/smart/server.py:179
|
|
7860 |
#, python-format
|
|
7861 |
msgid "Waiting for %d client(s) to finish" |
|
7862 |
msgstr "" |
|
7863 |
||
7864 |
#: bzrlib/smart/server.py:185
|
|
7865 |
#, python-format
|
|
7866 |
msgid "Still waiting for %d client(s) to finish" |
|
7867 |
msgstr "" |
|
7868 |
||
7869 |
#: bzrlib/smart/server.py:219
|
|
7870 |
#, python-format
|
|
7871 |
msgid "listening socket error: %s" |
|
7872 |
msgstr "" |
|
7873 |
||
7874 |
#: bzrlib/smart/server.py:452
|
|
7875 |
#, python-format
|
|
7876 |
msgid "listening on port: %s" |
|
7877 |
msgstr "" |
|
7878 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7879 |
#: bzrlib/switch.py:73
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7880 |
msgid "Pending merges must be committed or reverted before using switch." |
7881 |
msgstr "" |
|
7882 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7883 |
#: bzrlib/switch.py:100
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7884 |
msgid "" |
7885 |
"Cannot switch as local commits found in the checkout. Commit these to the "
|
|
7886 |
"bound branch or use --force to throw them away."
|
|
7887 |
msgstr "" |
|
7888 |
||
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7889 |
#: bzrlib/switch.py:105
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7890 |
#, python-format
|
7891 |
msgid "" |
|
7892 |
"Unable to connect to current master branch %(target)s: %(error)s To switch "
|
|
7893 |
"anyway, use --force."
|
|
7894 |
msgstr "" |
|
7895 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7896 |
#: bzrlib/switch.py:129
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7897 |
msgid "Cannot switch a branch, only a checkout." |
7898 |
msgstr "" |
|
7899 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7900 |
#: bzrlib/switch.py:167
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7901 |
#, python-format
|
7902 |
msgid "Tree is up to date at revision %d." |
|
7903 |
msgstr "" |
|
7904 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7905 |
#: bzrlib/switch.py:173
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7906 |
#, python-format
|
7907 |
msgid "Updated to revision %d." |
|
7908 |
msgstr "" |
|
7909 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7910 |
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7911 |
msgid "Apply phase" |
7912 |
msgstr "" |
|
7913 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7914 |
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7915 |
msgid "removing file" |
7916 |
msgstr "" |
|
7917 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7918 |
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7919 |
msgid "adding file" |
7920 |
msgstr "" |
|
7921 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7922 |
#: bzrlib/transform.py:2598
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7923 |
msgid "Building tree" |
7924 |
msgstr "" |
|
7925 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7926 |
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7927 |
msgid "Adding file contents" |
7928 |
msgstr "" |
|
7929 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7930 |
#: bzrlib/transform.py:3017
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7931 |
msgid "Resolution pass" |
7932 |
msgstr "" |
|
7933 |
||
7934 |
#: bzrlib/transport/ftp/_gssapi.py:88
|
|
7935 |
#, python-format
|
|
7936 |
msgid "Authenticated as %s" |
|
7937 |
msgstr "" |
|
7938 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7939 |
#: bzrlib/tree.py:647
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7940 |
msgid "*** {0} content-filter: {1} => {2!r}" |
7941 |
msgstr "" |
|
7942 |
||
7943 |
#: bzrlib/upgrade.py:77
|
|
7944 |
#, python-format
|
|
7945 |
msgid "This is a checkout. The branch (%s) needs to be upgraded separately." |
|
7946 |
msgstr "" |
|
7947 |
||
7948 |
#: bzrlib/upgrade.py:100
|
|
7949 |
#, python-format
|
|
7950 |
msgid "cannot upgrade from bzrdir format %s" |
|
7951 |
msgstr "" |
|
7952 |
||
7953 |
#: bzrlib/upgrade.py:103
|
|
7954 |
#, python-format
|
|
7955 |
msgid "starting upgrade of %s" |
|
7956 |
msgstr "" |
|
7957 |
||
7958 |
#: bzrlib/upgrade.py:110
|
|
7959 |
msgid "finished" |
|
7960 |
msgstr "" |
|
7961 |
||
7962 |
#: bzrlib/upgrade.py:120
|
|
7963 |
msgid "Deleting backup.bzr" |
|
7964 |
msgstr "" |
|
7965 |
||
7966 |
#: bzrlib/upgrade.py:151
|
|
7967 |
msgid "" |
|
7968 |
"\n"
|
|
7969 |
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed" |
|
7970 |
msgstr "" |
|
7971 |
||
7972 |
#: bzrlib/upgrade.py:208
|
|
7973 |
#, python-format
|
|
7974 |
msgid "Found %d dependent branches - upgrading ..." |
|
7975 |
msgstr "" |
|
7976 |
||
7977 |
#: bzrlib/upgrade.py:276
|
|
7978 |
msgid "Upgrading bzrdirs" |
|
7979 |
msgstr "" |
|
7980 |
||
7981 |
#: bzrlib/upgrade.py:282
|
|
7982 |
#, python-format
|
|
7983 |
msgid "Upgrading %s" |
|
7984 |
msgstr "" |
|
7985 |
||
7986 |
#: bzrlib/upgrade.py:283
|
|
7987 |
msgid "Upgrading {0} {1} ..." |
|
7988 |
msgstr "" |
|
7989 |
||
7990 |
#: bzrlib/upgrade.py:301
|
|
7991 |
msgid "Removing backup ..." |
|
7992 |
msgstr "" |
|
7993 |
||
7994 |
#: bzrlib/upgrade.py:305
|
|
7995 |
msgid "failed to clean-up {0}: {1}" |
|
7996 |
msgstr "" |
|
7997 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7998 |
#: bzrlib/vf_repository.py:1091
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
7999 |
msgid "inventories" |
8000 |
msgstr "" |
|
8001 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
8002 |
#: bzrlib/vf_repository.py:1117
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
8003 |
msgid "texts" |
8004 |
msgstr "" |
|
8005 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
8006 |
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
8007 |
msgid "Calculating text parents" |
8008 |
msgstr "" |
|
8009 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
8010 |
#: bzrlib/vf_repository.py:1707
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
8011 |
msgid "Fetch texts" |
8012 |
msgstr "" |
|
8013 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
8014 |
#: bzrlib/vf_repository.py:2536
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
8015 |
msgid "loading text store" |
8016 |
msgstr "" |
|
8017 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
8018 |
#: bzrlib/vf_repository.py:2542
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
8019 |
msgid "checking text graph" |
8020 |
msgstr "" |
|
8021 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
8022 |
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
|
8023 |
#: bzrlib/vf_repository.py:3127
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
8024 |
msgid "Transferring revisions" |
8025 |
msgstr "" |
|
8026 |
||
8027 |
#: bzrlib/win32utils.py:146
|
|
8028 |
msgid "Failed to GetProcessMemoryInfo()" |
|
8029 |
msgstr "" |
|
8030 |
||
8031 |
#: bzrlib/win32utils.py:167
|
|
8032 |
msgid "Cannot debug memory on win32 without ctypes or win32process" |
|
8033 |
msgstr "" |
|
8034 |
||
8035 |
#: bzrlib/win32utils.py:172
|
|
8036 |
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}" |
|
8037 |
msgstr "" |
|
8038 |
||
8039 |
#: bzrlib/win32utils.py:180
|
|
8040 |
#, python-format
|
|
8041 |
msgid "WorkingSize %8d KiB" |
|
8042 |
msgstr "" |
|
8043 |
||
8044 |
#: bzrlib/win32utils.py:181
|
|
8045 |
#, python-format
|
|
8046 |
msgid "PeakWorking %8d KiB" |
|
8047 |
msgstr "" |
|
8048 |
||
8049 |
#: bzrlib/win32utils.py:182
|
|
8050 |
#, python-format
|
|
8051 |
msgid "PagefileUsage %8d KiB" |
|
8052 |
msgstr "" |
|
8053 |
||
8054 |
#: bzrlib/win32utils.py:183
|
|
8055 |
#, python-format
|
|
8056 |
msgid "PeakPagefileUsage %8d KiB" |
|
8057 |
msgstr "" |
|
8058 |
||
8059 |
#: bzrlib/win32utils.py:185
|
|
8060 |
#, python-format
|
|
8061 |
msgid "PrivateUsage %8d KiB" |
|
8062 |
msgstr "" |
|
8063 |
||
8064 |
#: bzrlib/win32utils.py:186
|
|
8065 |
#, python-format
|
|
8066 |
msgid "PageFaultCount %8d" |
|
8067 |
msgstr "" |
|
8068 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
8069 |
#: bzrlib/workingtree.py:1482
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
8070 |
msgid "Rerun update after fixing the conflicts." |
8071 |
msgstr "" |
|
8072 |
||
8073 |
#: dummy/help_topics/authentication/summary.txt:1
|
|
8074 |
msgid "Information on configuring authentication" |
|
8075 |
msgstr "" |
|
8076 |
||
8077 |
#: dummy/help_topics/basic/detail.txt:1
|
|
8078 |
msgid "" |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
8079 |
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
8080 |
"http://bazaar.canonical.com/" |
8081 |
msgstr "" |
|
8082 |
||
8083 |
#: dummy/help_topics/basic/detail.txt:4
|
|
8084 |
msgid "" |
|
8085 |
"Basic commands:\n"
|
|
8086 |
" bzr init makes this directory a versioned branch\n"
|
|
8087 |
" bzr branch make a copy of another branch"
|
|
8088 |
msgstr "" |
|
8089 |
||
8090 |
#: dummy/help_topics/basic/detail.txt:8
|
|
8091 |
msgid "" |
|
8092 |
" bzr add make files or directories versioned\n"
|
|
8093 |
" bzr ignore ignore a file or pattern\n"
|
|
8094 |
" bzr mv move or rename a versioned file"
|
|
8095 |
msgstr "" |
|
8096 |
||
8097 |
#: dummy/help_topics/basic/detail.txt:12
|
|
8098 |
msgid "" |
|
8099 |
" bzr status summarize changes in working copy\n"
|
|
8100 |
" bzr diff show detailed diffs"
|
|
8101 |
msgstr "" |
|
8102 |
||
8103 |
#: dummy/help_topics/basic/detail.txt:15
|
|
8104 |
msgid "" |
|
8105 |
" bzr merge pull in changes from another branch\n"
|
|
8106 |
" bzr commit save some or all changes\n"
|
|
8107 |
" bzr send send changes via email"
|
|
8108 |
msgstr "" |
|
8109 |
||
8110 |
#: dummy/help_topics/basic/detail.txt:19
|
|
8111 |
msgid "" |
|
8112 |
" bzr log show history of changes\n"
|
|
8113 |
" bzr check validate storage"
|
|
8114 |
msgstr "" |
|
8115 |
||
8116 |
#: dummy/help_topics/basic/detail.txt:22
|
|
8117 |
msgid "" |
|
8118 |
" bzr help init more help on e.g. init command\n"
|
|
8119 |
" bzr help commands list all commands\n"
|
|
8120 |
" bzr help topics list all help topics\n"
|
|
8121 |
msgstr "" |
|
8122 |
||
8123 |
#: dummy/help_topics/basic/summary.txt:1
|
|
8124 |
msgid "Basic commands" |
|
8125 |
msgstr "" |
|
8126 |
||
8127 |
#: dummy/help_topics/branches/detail.txt:1
|
|
8128 |
msgid "Branches" |
|
8129 |
msgstr "" |
|
8130 |
||
8131 |
#: dummy/help_topics/branches/detail.txt:3
|
|
8132 |
msgid "" |
|
8133 |
"A branch consists of the state of a project, including all of its\n"
|
|
8134 |
"history. All branches have a repository associated (which is where the\n"
|
|
8135 |
"branch history is stored), but multiple branches may share the same\n"
|
|
8136 |
"repository (a shared repository). Branches can be copied and merged."
|
|
8137 |
msgstr "" |
|
8138 |
||
8139 |
#: dummy/help_topics/branches/detail.txt:8
|
|
8140 |
msgid "" |
|
8141 |
"In addition, one branch may be bound to another one. Binding to another\n"
|
|
8142 |
"branch indicates that commits which happen in this branch must also \n"
|
|
8143 |
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
|
|
8144 |
"commits when the two branches are out of date. In order for a commit \n"
|
|
8145 |
"to succeed, it may be necessary to update the current branch using \n"
|
|
8146 |
"``bzr update``."
|
|
8147 |
msgstr "" |
|
8148 |
||
8149 |
#: dummy/help_topics/branches/detail.txt:15
|
|
8150 |
#: dummy/help_topics/checkouts/detail.txt:66
|
|
8151 |
#: dummy/help_topics/repositories/detail.txt:36
|
|
8152 |
msgid "Related commands::" |
|
8153 |
msgstr "" |
|
8154 |
||
8155 |
#: dummy/help_topics/branches/detail.txt:17
|
|
8156 |
msgid "" |
|
8157 |
" init Change a directory into a versioned branch.\n"
|
|
8158 |
" branch Create a new branch that is a copy of an existing branch.\n"
|
|
8159 |
" merge Perform a three-way merge.\n"
|
|
8160 |
" bind Bind a branch to another one.\n"
|
|
8161 |
msgstr "" |
|
8162 |
||
8163 |
#: dummy/help_topics/branches/summary.txt:1
|
|
8164 |
msgid "Information on what a branch is" |
|
8165 |
msgstr "" |
|
8166 |
||
8167 |
#: dummy/help_topics/bugs/summary.txt:1
|
|
8168 |
msgid "Bug tracker settings" |
|
8169 |
msgstr "" |
|
8170 |
||
8171 |
#: dummy/help_topics/checkouts/detail.txt:1
|
|
8172 |
msgid "Checkouts" |
|
8173 |
msgstr "" |
|
8174 |
||
8175 |
#: dummy/help_topics/checkouts/detail.txt:3
|
|
8176 |
msgid "" |
|
8177 |
"Checkouts are source trees that are connected to a branch, so that when\n"
|
|
8178 |
"you commit in the source tree, the commit goes into that branch. They\n"
|
|
8179 |
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
|
|
8180 |
"Bazaar's decentralized features until you want them. Using checkouts\n"
|
|
8181 |
"with shared repositories is very similar to working with SVN or CVS, but\n"
|
|
8182 |
"doesn't have the same restrictions. And using checkouts still allows\n"
|
|
8183 |
"others working on the project to use whatever workflow they like."
|
|
8184 |
msgstr "" |
|
8185 |
||
8186 |
#: dummy/help_topics/checkouts/detail.txt:11
|
|
8187 |
msgid "" |
|
8188 |
"A checkout is created with the bzr checkout command (see \"help "
|
|
8189 |
"checkout\").\n"
|
|
8190 |
"You pass it a reference to another branch, and it will create a local copy\n"
|
|
8191 |
"for you that still contains a reference to the branch you created the\n"
|
|
8192 |
"checkout from (the master branch). Then if you make any commits they will "
|
|
8193 |
"be\n"
|
|
8194 |
"made on the other branch first. This creates an instant mirror of your work, "
|
|
8195 |
"or\n"
|
|
8196 |
"facilitates lockstep development, where each developer is working together,\n"
|
|
8197 |
"continuously integrating the changes of others."
|
|
8198 |
msgstr "" |
|
8199 |
||
8200 |
#: dummy/help_topics/checkouts/detail.txt:19
|
|
8201 |
msgid "" |
|
8202 |
"However the checkout is still a first class branch in Bazaar terms, so that\n"
|
|
8203 |
"you have the full history locally. As you have a first class branch you "
|
|
8204 |
"can\n"
|
|
8205 |
"also commit locally if you want, for instance due to the temporary loss af "
|
|
8206 |
"a\n"
|
|
8207 |
"network connection. Use the --local option to commit to do this. All the "
|
|
8208 |
"local\n"
|
|
8209 |
"commits will then be made on the master branch the next time you do a non-"
|
|
8210 |
"local\n"
|
|
8211 |
"commit."
|
|
8212 |
msgstr "" |
|
8213 |
||
8214 |
#: dummy/help_topics/checkouts/detail.txt:26
|
|
8215 |
msgid "" |
|
8216 |
"If you are using a checkout from a shared branch you will periodically want "
|
|
8217 |
"to\n"
|
|
8218 |
"pull in all the changes made by others. This is done using the \"update\"\n"
|
|
8219 |
"command. The changes need to be applied before any non-local commit, but\n"
|
|
8220 |
"Bazaar will tell you if there are any changes and suggest that you use this\n"
|
|
8221 |
"command when needed."
|
|
8222 |
msgstr "" |
|
8223 |
||
8224 |
#: dummy/help_topics/checkouts/detail.txt:32
|
|
8225 |
msgid "" |
|
8226 |
"It is also possible to create a \"lightweight\" checkout by passing the\n"
|
|
8227 |
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
|
|
8228 |
"SVN checkout in that it is not a first class branch, it mainly consists of "
|
|
8229 |
"the\n"
|
|
8230 |
"working tree. This means that any history operations must query the master\n"
|
|
8231 |
"branch, which could be slow if a network connection is involved. Also, as "
|
|
8232 |
"you\n"
|
|
8233 |
"don't have a local branch, then you cannot commit locally."
|
|
8234 |
msgstr "" |
|
8235 |
||
8236 |
#: dummy/help_topics/checkouts/detail.txt:39
|
|
8237 |
msgid "" |
|
8238 |
"Lightweight checkouts work best when you have fast reliable access to the\n"
|
|
8239 |
"master branch. This means that if the master branch is on the same disk or "
|
|
8240 |
"LAN\n"
|
|
8241 |
"a lightweight checkout will be faster than a heavyweight one for any "
|
|
8242 |
"commands\n"
|
|
8243 |
"that modify the revision history (as only one copy of the branch needs to\n"
|
|
8244 |
"be updated). Heavyweight checkouts will generally be faster for any command\n"
|
|
8245 |
"that uses the history but does not change it, but if the master branch is "
|
|
8246 |
"on\n"
|
|
8247 |
"the same disk then there won't be a noticeable difference."
|
|
8248 |
msgstr "" |
|
8249 |
||
8250 |
#: dummy/help_topics/checkouts/detail.txt:47
|
|
8251 |
msgid "" |
|
8252 |
"Another possible use for a checkout is to use it with a treeless repository\n"
|
|
8253 |
"containing your branches, where you maintain only one working tree by\n"
|
|
8254 |
"switching the master branch that the checkout points to when you want to\n"
|
|
8255 |
"work on a different branch."
|
|
8256 |
msgstr "" |
|
8257 |
||
8258 |
#: dummy/help_topics/checkouts/detail.txt:52
|
|
8259 |
msgid "" |
|
8260 |
"Obviously to commit on a checkout you need to be able to write to the "
|
|
8261 |
"master\n"
|
|
8262 |
"branch. This means that the master branch must be accessible over a "
|
|
8263 |
"writeable\n"
|
|
8264 |
"protocol , such as sftp://, and that you have write permissions at the "
|
|
8265 |
"other\n"
|
|
8266 |
"end. Checkouts also work on the local file system, so that all that matters "
|
|
8267 |
"is\n"
|
|
8268 |
"file permissions."
|
|
8269 |
msgstr "" |
|
8270 |
||
8271 |
#: dummy/help_topics/checkouts/detail.txt:58
|
|
8272 |
msgid "" |
|
8273 |
"You can change the master of a checkout by using the \"switch\" command "
|
|
8274 |
"(see\n"
|
|
8275 |
"\"help switch\"). This will change the location that the commits are sent "
|
|
8276 |
"to.\n"
|
|
8277 |
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
|
|
8278 |
"checkout. If you would like to convert your heavy checkout into a normal\n"
|
|
8279 |
"branch so that every commit is local, you can use the \"unbind\" command. To "
|
|
8280 |
"see\n"
|
|
8281 |
"whether or not a branch is bound or not you can use the \"info\" command. If "
|
|
8282 |
"the\n"
|
|
8283 |
"branch is bound it will tell you the location of the bound branch."
|
|
8284 |
msgstr "" |
|
8285 |
||
8286 |
#: dummy/help_topics/checkouts/detail.txt:68
|
|
8287 |
msgid "" |
|
8288 |
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
|
|
8289 |
" checkout\n"
|
|
8290 |
" update Pull any changes in the master branch in to your checkout\n"
|
|
8291 |
" commit Make a commit that is sent to the master branch. If you have\n"
|
|
8292 |
" a heavy checkout then the --local option will commit to the\n"
|
|
8293 |
" checkout without sending the commit to the master\n"
|
|
8294 |
" switch Change the master branch that the commits in the checkout "
|
|
8295 |
"will\n"
|
|
8296 |
" be sent to\n"
|
|
8297 |
" bind Turn a standalone branch into a heavy checkout so that any\n"
|
|
8298 |
" commits will be sent to the master branch\n"
|
|
8299 |
" unbind Turn a heavy checkout into a standalone branch so that any\n"
|
|
8300 |
" commits are only made locally\n"
|
|
8301 |
" info Displays whether a branch is bound or unbound. If the branch "
|
|
8302 |
"is\n"
|
|
8303 |
" bound, then it will also display the location of the bound "
|
|
8304 |
"branch\n"
|
|
8305 |
msgstr "" |
|
8306 |
||
8307 |
#: dummy/help_topics/checkouts/summary.txt:1
|
|
8308 |
msgid "Information on what a checkout is" |
|
8309 |
msgstr "" |
|
8310 |
||
8311 |
#: dummy/help_topics/commands/summary.txt:1
|
|
8312 |
msgid "Basic help for all commands" |
|
8313 |
msgstr "" |
|
8314 |
||
8315 |
#: dummy/help_topics/configuration/summary.txt:1
|
|
8316 |
msgid "Details on the configuration settings available" |
|
8317 |
msgstr "" |
|
8318 |
||
8319 |
#: dummy/help_topics/conflict-types/summary.txt:1
|
|
8320 |
msgid "Types of conflicts and what to do about them" |
|
8321 |
msgstr "" |
|
8322 |
||
8323 |
#: dummy/help_topics/content-filters/summary.txt:1
|
|
8324 |
msgid "Conversion of content into/from working trees" |
|
8325 |
msgstr "" |
|
8326 |
||
8327 |
#: dummy/help_topics/criss-cross/detail.txt:1
|
|
8328 |
msgid "Criss-Cross" |
|
8329 |
msgstr "" |
|
8330 |
||
8331 |
#: dummy/help_topics/criss-cross/detail.txt:3
|
|
8332 |
msgid "" |
|
8333 |
"A criss-cross in the branch history can cause the default merge technique\n"
|
|
8334 |
"to emit more conflicts than would normally be expected."
|
|
8335 |
msgstr "" |
|
8336 |
||
8337 |
#: dummy/help_topics/criss-cross/detail.txt:6
|
|
8338 |
msgid "" |
|
8339 |
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
|
|
8340 |
"give\n"
|
|
8341 |
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
|
|
8342 |
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
|
|
8343 |
msgstr "" |
|
8344 |
||
8345 |
#: dummy/help_topics/criss-cross/detail.txt:10
|
|
8346 |
msgid "" |
|
8347 |
"Criss-crosses occur in a branch's history if two branches merge the same "
|
|
8348 |
"thing\n"
|
|
8349 |
"and then merge one another, or if two branches merge one another at the "
|
|
8350 |
"same\n"
|
|
8351 |
"time. They can be avoided by having each branch only merge from or into a\n"
|
|
8352 |
"designated central branch (a \"star topology\")."
|
|
8353 |
msgstr "" |
|
8354 |
||
8355 |
#: dummy/help_topics/criss-cross/detail.txt:15
|
|
8356 |
msgid "" |
|
8357 |
"Criss-crosses cause problems because of the way merge works. Bazaar's "
|
|
8358 |
"default\n"
|
|
8359 |
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
|
|
8360 |
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
|
|
8361 |
"differences between THIS and OTHER are due to one side adding lines, or\n"
|
|
8362 |
"from another side removing lines."
|
|
8363 |
msgstr "" |
|
8364 |
||
8365 |
#: dummy/help_topics/criss-cross/detail.txt:21
|
|
8366 |
msgid "" |
|
8367 |
"Criss-crosses mean there is no good choice for a base. Selecting the "
|
|
8368 |
"recent\n"
|
|
8369 |
"merge points could cause one side's changes to be silently discarded.\n"
|
|
8370 |
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
|
|
8371 |
"are emitted."
|
|
8372 |
msgstr "" |
|
8373 |
||
8374 |
#: dummy/help_topics/criss-cross/detail.txt:26
|
|
8375 |
msgid "" |
|
8376 |
"The ``weave`` merge type is not affected by this problem because it uses\n"
|
|
8377 |
"line-origin detection instead of a basis revision to determine the cause of\n"
|
|
8378 |
"differences.\n"
|
|
8379 |
msgstr "" |
|
8380 |
||
8381 |
#: dummy/help_topics/criss-cross/summary.txt:1
|
|
8382 |
msgid "Information on criss-cross merging" |
|
8383 |
msgstr "" |
|
8384 |
||
8385 |
#: dummy/help_topics/current-formats/summary.txt:1
|
|
8386 |
msgid "Current storage formats" |
|
8387 |
msgstr "" |
|
8388 |
||
8389 |
#: dummy/help_topics/debug-flags/summary.txt:1
|
|
8390 |
msgid "Options to show or record debug information" |
|
8391 |
msgstr "" |
|
8392 |
||
8393 |
#: dummy/help_topics/diverged-branches/summary.txt:1
|
|
8394 |
msgid "How to fix diverged branches" |
|
8395 |
msgstr "" |
|
8396 |
||
8397 |
#: dummy/help_topics/env-variables/summary.txt:1
|
|
8398 |
msgid "Environment variable names and values" |
|
8399 |
msgstr "" |
|
8400 |
||
8401 |
#: dummy/help_topics/eol/summary.txt:1
|
|
8402 |
msgid "Information on end-of-line handling" |
|
8403 |
msgstr "" |
|
8404 |
||
8405 |
#: dummy/help_topics/files/detail.txt:1
|
|
8406 |
msgid "Files" |
|
8407 |
msgstr "" |
|
8408 |
||
8409 |
#: dummy/help_topics/files/detail.txt:3
|
|
8410 |
msgid "" |
|
8411 |
":On Unix: ~/.bazaar/bazaar.conf\n"
|
|
8412 |
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
|
|
8413 |
"bazaar\\\\2.0\\\\bazaar.conf"
|
|
8414 |
msgstr "" |
|
8415 |
||
8416 |
#: dummy/help_topics/files/detail.txt:6
|
|
8417 |
msgid "" |
|
8418 |
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
|
|
8419 |
"used to define general configuration that will be applied everywhere.\n"
|
|
8420 |
"The section ``[ALIASES]`` can be used to create command aliases for\n"
|
|
8421 |
"commonly used options."
|
|
8422 |
msgstr "" |
|
8423 |
||
8424 |
#: dummy/help_topics/files/detail.txt:11
|
|
8425 |
msgid "A typical config file might look something like::" |
|
8426 |
msgstr "" |
|
8427 |
||
8428 |
#: dummy/help_topics/files/detail.txt:13
|
|
8429 |
msgid "" |
|
8430 |
" [DEFAULT]\n"
|
|
8431 |
" email=John Doe <jdoe@isp.com>"
|
|
8432 |
msgstr "" |
|
8433 |
||
8434 |
#: dummy/help_topics/files/detail.txt:16
|
|
8435 |
msgid "" |
|
8436 |
" [ALIASES]\n"
|
|
8437 |
" commit = commit --strict\n"
|
|
8438 |
" log10 = log --short -r -10..-1\n"
|
|
8439 |
msgstr "" |
|
8440 |
||
8441 |
#: dummy/help_topics/files/summary.txt:1
|
|
8442 |
msgid "Information on configuration and log files" |
|
8443 |
msgstr "" |
|
8444 |
||
8445 |
#: dummy/help_topics/formats/detail.txt:1
|
|
8446 |
msgid "Storage Formats" |
|
8447 |
msgstr "" |
|
8448 |
||
8449 |
#: dummy/help_topics/formats/detail.txt:3
|
|
8450 |
msgid "" |
|
8451 |
"To ensure that older clients do not access data incorrectly,\n"
|
|
8452 |
"Bazaar's policy is to introduce a new storage format whenever\n"
|
|
8453 |
"new features requiring new metadata are added. New storage\n"
|
|
8454 |
"formats may also be introduced to improve performance and\n"
|
|
8455 |
"scalability."
|
|
8456 |
msgstr "" |
|
8457 |
||
8458 |
#: dummy/help_topics/formats/detail.txt:9
|
|
8459 |
msgid "" |
|
8460 |
"The newest format, 2a, is highly recommended. If your\n"
|
|
8461 |
"project is not using 2a, then you should suggest to the\n"
|
|
8462 |
"project owner to upgrade."
|
|
8463 |
msgstr "" |
|
8464 |
||
8465 |
#: dummy/help_topics/formats/detail.txt:13
|
|
8466 |
msgid "" |
|
8467 |
"\n"
|
|
8468 |
".. note::"
|
|
8469 |
msgstr "" |
|
8470 |
||
8471 |
#: dummy/help_topics/formats/detail.txt:16
|
|
8472 |
msgid "" |
|
8473 |
" Some of the older formats have two variants:\n"
|
|
8474 |
" a plain one and a rich-root one. The latter include an additional\n"
|
|
8475 |
" field about the root of the tree. There is no performance cost\n"
|
|
8476 |
" for using a rich-root format but you cannot easily merge changes\n"
|
|
8477 |
" from a rich-root format into a plain format. As a consequence,\n"
|
|
8478 |
" moving a project to a rich-root format takes some co-ordination\n"
|
|
8479 |
" in that all contributors need to upgrade their repositories\n"
|
|
8480 |
" around the same time. 2a and all future formats will be\n"
|
|
8481 |
" implicitly rich-root."
|
|
8482 |
msgstr "" |
|
8483 |
||
8484 |
#: dummy/help_topics/formats/detail.txt:26
|
|
8485 |
msgid "" |
|
8486 |
"See :doc:`current-formats-help` for the complete list of\n"
|
|
8487 |
"currently supported formats. See :doc:`other-formats-help` for\n"
|
|
8488 |
"descriptions of any available experimental and deprecated formats.\n"
|
|
8489 |
msgstr "" |
|
8490 |
||
8491 |
#: dummy/help_topics/formats/summary.txt:1
|
|
8492 |
msgid "Information on choosing a storage format" |
|
8493 |
msgstr "" |
|
8494 |
||
8495 |
#: dummy/help_topics/global-options/detail.txt:1
|
|
8496 |
msgid "Global Options" |
|
8497 |
msgstr "" |
|
8498 |
||
8499 |
#: dummy/help_topics/global-options/detail.txt:3
|
|
8500 |
msgid "" |
|
8501 |
"These options may be used with any command, and may appear in front of any\n"
|
|
8502 |
"command. (e.g. ``bzr --profile help``)."
|
|
8503 |
msgstr "" |
|
8504 |
||
8505 |
#: dummy/help_topics/global-options/detail.txt:6
|
|
8506 |
msgid "" |
|
8507 |
"--version Print the version number. Must be supplied before the "
|
|
8508 |
"command.\n"
|
|
8509 |
"--no-aliases Do not process command aliases when running this command.\n"
|
|
8510 |
"--builtin Use the built-in version of a command, not the plugin "
|
|
8511 |
"version.\n"
|
|
8512 |
" This does not suppress other plugin effects.\n"
|
|
8513 |
"--no-plugins Do not process any plugins.\n"
|
|
8514 |
"--no-l10n Do not translate messages.\n"
|
|
8515 |
"--concurrency Number of processes that can be run concurrently (selftest)."
|
|
8516 |
msgstr "" |
|
8517 |
||
8518 |
#: dummy/help_topics/global-options/detail.txt:14
|
|
8519 |
msgid "" |
|
8520 |
"--profile Profile execution using the hotshot profiler.\n"
|
|
8521 |
"--lsprof Profile execution using the lsprof profiler.\n"
|
|
8522 |
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
|
|
8523 |
" results to a specified file. If the filename ends with "
|
|
8524 |
"\".txt\",\n"
|
|
8525 |
" text format will be used. If the filename either starts "
|
|
8526 |
"with\n"
|
|
8527 |
" \"callgrind.out\" or end with \".callgrind\", the output will "
|
|
8528 |
"be\n"
|
|
8529 |
" formatted for use with KCacheGrind. Otherwise, the output\n"
|
|
8530 |
" will be a pickle.\n"
|
|
8531 |
"--coverage Generate line coverage report in the specified directory."
|
|
8532 |
msgstr "" |
|
8533 |
||
8534 |
#: dummy/help_topics/global-options/detail.txt:24
|
|
8535 |
msgid "" |
|
8536 |
"-Oname=value Override the ``name`` config option setting it to ``value`` "
|
|
8537 |
"for\n"
|
|
8538 |
" the duration of the command. This can be used multiple times "
|
|
8539 |
"if\n"
|
|
8540 |
" several options need to be overridden."
|
|
8541 |
msgstr "" |
|
8542 |
||
8543 |
#: dummy/help_topics/global-options/detail.txt:28
|
|
8544 |
msgid "" |
|
8545 |
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
|
|
8546 |
"information on profiling."
|
|
8547 |
msgstr "" |
|
8548 |
||
8549 |
#: dummy/help_topics/global-options/detail.txt:31
|
|
8550 |
msgid "" |
|
8551 |
"A number of debug flags are also available to assist troubleshooting and\n"
|
|
8552 |
"development. See :doc:`debug-flags-help`.\n"
|
|
8553 |
msgstr "" |
|
8554 |
||
8555 |
#: dummy/help_topics/global-options/summary.txt:1
|
|
8556 |
msgid "Options that control how Bazaar runs" |
|
8557 |
msgstr "" |
|
8558 |
||
8559 |
#: dummy/help_topics/hidden-commands/summary.txt:1
|
|
8560 |
msgid "All hidden commands" |
|
8561 |
msgstr "" |
|
8562 |
||
8563 |
#: dummy/help_topics/hooks/summary.txt:1
|
|
8564 |
msgid "Points at which custom processing can be added" |
|
8565 |
msgstr "" |
|
8566 |
||
8567 |
#: dummy/help_topics/launchpad/detail.txt:1
|
|
8568 |
msgid "Integration with Launchpad.net" |
|
8569 |
msgstr "" |
|
8570 |
||
8571 |
#: dummy/help_topics/launchpad/detail.txt:3
|
|
8572 |
msgid "" |
|
8573 |
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
|
|
8574 |
"specification tracking."
|
|
8575 |
msgstr "" |
|
8576 |
||
8577 |
#: dummy/help_topics/launchpad/detail.txt:6
|
|
8578 |
msgid "" |
|
8579 |
"The bzr client (through the plugin called 'launchpad') has special\n"
|
|
8580 |
"features to communicate with Launchpad:"
|
|
8581 |
msgstr "" |
|
8582 |
||
8583 |
#: dummy/help_topics/launchpad/detail.txt:9
|
|
8584 |
msgid "" |
|
8585 |
" * The launchpad-login command tells Bazaar your Launchpad user name. "
|
|
8586 |
"This\n"
|
|
8587 |
" is then used by the 'lp:' transport to download your branches using\n"
|
|
8588 |
" bzr+ssh://."
|
|
8589 |
msgstr "" |
|
8590 |
||
8591 |
#: dummy/help_topics/launchpad/detail.txt:13
|
|
8592 |
msgid "" |
|
8593 |
" * The 'lp:' transport uses Launchpad as a directory service: for "
|
|
8594 |
"example\n"
|
|
8595 |
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
|
|
8596 |
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
|
|
8597 |
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
|
|
8598 |
msgstr "" |
|
8599 |
||
8600 |
#: dummy/help_topics/launchpad/detail.txt:18
|
|
8601 |
msgid "" |
|
8602 |
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
|
|
8603 |
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
|
|
8604 |
"lp:12345'\n" |
|
8605 |
" will record a revision property that marks that revision as fixing\n"
|
|
8606 |
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
|
|
8607 |
" automatically be linked to the bug report."
|
|
8608 |
msgstr "" |
|
8609 |
||
8610 |
#: dummy/help_topics/launchpad/detail.txt:24
|
|
8611 |
msgid "" |
|
8612 |
" * The register-branch command tells Launchpad about the url of a\n"
|
|
8613 |
" public branch. Launchpad will then mirror the branch, display\n"
|
|
8614 |
" its contents and allow it to be attached to bugs and other\n"
|
|
8615 |
" objects."
|
|
8616 |
msgstr "" |
|
8617 |
||
8618 |
#: dummy/help_topics/launchpad/detail.txt:29
|
|
8619 |
msgid "For more information see http://help.launchpad.net/\n" |
|
8620 |
msgstr "" |
|
8621 |
||
8622 |
#: dummy/help_topics/launchpad/summary.txt:1
|
|
8623 |
msgid "Using Bazaar with Launchpad.net" |
|
8624 |
msgstr "" |
|
8625 |
||
8626 |
#: dummy/help_topics/location-alias/summary.txt:1
|
|
8627 |
msgid "Aliases for remembered locations" |
|
8628 |
msgstr "" |
|
8629 |
||
8630 |
#: dummy/help_topics/log-formats/summary.txt:1
|
|
8631 |
msgid "Details on the logging formats available" |
|
8632 |
msgstr "" |
|
8633 |
||
8634 |
#: dummy/help_topics/other-formats/summary.txt:1
|
|
8635 |
msgid "Experimental and deprecated storage formats" |
|
8636 |
msgstr "" |
|
8637 |
||
8638 |
#: dummy/help_topics/patterns/summary.txt:1
|
|
8639 |
msgid "Information on the pattern syntax" |
|
8640 |
msgstr "" |
|
8641 |
||
8642 |
#: dummy/help_topics/repositories/detail.txt:1
|
|
8643 |
msgid "Repositories" |
|
8644 |
msgstr "" |
|
8645 |
||
8646 |
#: dummy/help_topics/repositories/detail.txt:3
|
|
8647 |
msgid "" |
|
8648 |
"Repositories in Bazaar are where committed information is stored. There is\n"
|
|
8649 |
"a repository associated with every branch."
|
|
8650 |
msgstr "" |
|
8651 |
||
8652 |
#: dummy/help_topics/repositories/detail.txt:6
|
|
8653 |
msgid "" |
|
8654 |
"Repositories are a form of database. Bzr will usually maintain this for\n"
|
|
8655 |
"good performance automatically, but in some situations (e.g. when doing\n"
|
|
8656 |
"very many commits in a short time period) you may want to ask bzr to\n"
|
|
8657 |
"optimise the database indices. This can be done by the 'bzr pack' command."
|
|
8658 |
msgstr "" |
|
8659 |
||
8660 |
#: dummy/help_topics/repositories/detail.txt:11
|
|
8661 |
msgid "" |
|
8662 |
"By default just running 'bzr init' will create a repository within the new\n"
|
|
8663 |
"branch but it is possible to create a shared repository which allows "
|
|
8664 |
"multiple\n"
|
|
8665 |
"branches to share their information in the same location. When a new branch "
|
|
8666 |
"is\n"
|
|
8667 |
"created it will first look to see if there is a containing shared repository "
|
|
8668 |
"it\n"
|
|
8669 |
"can use."
|
|
8670 |
msgstr "" |
|
8671 |
||
8672 |
#: dummy/help_topics/repositories/detail.txt:17
|
|
8673 |
msgid "" |
|
8674 |
"When two branches of the same project share a repository, there is\n"
|
|
8675 |
"generally a large space saving. For some operations (e.g. branching\n"
|
|
8676 |
"within the repository) this translates in to a large time saving."
|
|
8677 |
msgstr "" |
|
8678 |
||
8679 |
#: dummy/help_topics/repositories/detail.txt:21
|
|
8680 |
msgid "" |
|
8681 |
"To create a shared repository use the init-repository command (or the alias\n"
|
|
8682 |
"init-repo). This command takes the location of the repository to create. "
|
|
8683 |
"This\n"
|
|
8684 |
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
|
|
8685 |
"which contains a shared repository. Any new branches that are created in "
|
|
8686 |
"this\n"
|
|
8687 |
"directory will then use it for storage."
|
|
8688 |
msgstr "" |
|
8689 |
||
8690 |
#: dummy/help_topics/repositories/detail.txt:27
|
|
8691 |
msgid "" |
|
8692 |
"It is a good idea to create a repository whenever you might create more\n"
|
|
8693 |
"than one branch of a project. This is true for both working areas where you\n"
|
|
8694 |
"are doing the development, and any server areas that you use for hosting\n"
|
|
8695 |
"projects. In the latter case, it is common to want branches without working\n"
|
|
8696 |
"trees. Since the files in the branch will not be edited directly there is "
|
|
8697 |
"no\n"
|
|
8698 |
"need to use up disk space for a working tree. To create a repository in "
|
|
8699 |
"which\n"
|
|
8700 |
"the branches will not have working trees pass the '--no-trees' option to\n"
|
|
8701 |
"'init-repository'."
|
|
8702 |
msgstr "" |
|
8703 |
||
8704 |
#: dummy/help_topics/repositories/detail.txt:38
|
|
8705 |
msgid "" |
|
8706 |
" init-repository Create a shared repository. Use --no-trees to create "
|
|
8707 |
"one\n"
|
|
8708 |
" in which new branches won't get a working tree.\n"
|
|
8709 |
msgstr "" |
|
8710 |
||
8711 |
#: dummy/help_topics/repositories/summary.txt:1
|
|
8712 |
msgid "Basic information on shared repositories." |
|
8713 |
msgstr "" |
|
8714 |
||
8715 |
#: dummy/help_topics/revisionspec/summary.txt:1
|
|
8716 |
msgid "Explain how to use --revision" |
|
8717 |
msgstr "" |
|
8718 |
||
8719 |
#: dummy/help_topics/rules/summary.txt:1
|
|
8720 |
msgid "Information on defining rule-based preferences" |
|
8721 |
msgstr "" |
|
8722 |
||
8723 |
#: dummy/help_topics/standalone-trees/detail.txt:1
|
|
8724 |
msgid "Standalone Trees" |
|
8725 |
msgstr "" |
|
8726 |
||
8727 |
#: dummy/help_topics/standalone-trees/detail.txt:3
|
|
8728 |
msgid "" |
|
8729 |
"A standalone tree is a working tree with an associated repository. It\n"
|
|
8730 |
"is an independently usable branch, with no dependencies on any other.\n"
|
|
8731 |
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
|
|
8732 |
"an existing project under version control."
|
|
8733 |
msgstr "" |
|
8734 |
||
8735 |
#: dummy/help_topics/standalone-trees/detail.txt:8
|
|
8736 |
msgid "Related Commands::" |
|
8737 |
msgstr "" |
|
8738 |
||
8739 |
#: dummy/help_topics/standalone-trees/detail.txt:10
|
|
8740 |
msgid " init Make a directory into a versioned branch.\n" |
|
8741 |
msgstr "" |
|
8742 |
||
8743 |
#: dummy/help_topics/standalone-trees/summary.txt:1
|
|
8744 |
msgid "Information on what a standalone tree is" |
|
8745 |
msgstr "" |
|
8746 |
||
8747 |
#: dummy/help_topics/standard-options/detail.txt:1
|
|
8748 |
msgid "Standard Options" |
|
8749 |
msgstr "" |
|
8750 |
||
8751 |
#: dummy/help_topics/standard-options/detail.txt:3
|
|
8752 |
msgid "Standard options are legal for all commands." |
|
8753 |
msgstr "" |
|
8754 |
||
8755 |
#: dummy/help_topics/standard-options/detail.txt:5
|
|
8756 |
msgid "" |
|
8757 |
"--help, -h Show help message.\n"
|
|
8758 |
"--verbose, -v Display more information.\n"
|
|
8759 |
"--quiet, -q Only display errors and warnings."
|
|
8760 |
msgstr "" |
|
8761 |
"--help, -h ヘルプを表示します。\n"
|
|
8762 |
"--verbose, -v より詳細な情報を表示します。\n"
|
|
8763 |
"--quiet, -q エラーや警告だけを表示します。"
|
|
8764 |
||
8765 |
#: dummy/help_topics/standard-options/detail.txt:9
|
|
8766 |
msgid "Unlike global options, standard options can be used in aliases.\n" |
|
8767 |
msgstr "" |
|
8768 |
||
8769 |
#: dummy/help_topics/standard-options/summary.txt:1
|
|
8770 |
msgid "Options that can be used with any command" |
|
8771 |
msgstr "" |
|
8772 |
||
8773 |
#: dummy/help_topics/status-flags/detail.txt:1
|
|
8774 |
msgid "Status Flags" |
|
8775 |
msgstr "" |
|
8776 |
||
8777 |
#: dummy/help_topics/status-flags/detail.txt:3
|
|
8778 |
msgid "" |
|
8779 |
"Status flags are used to summarise changes to the working tree in a concise\n"
|
|
8780 |
"manner. They are in the form::"
|
|
8781 |
msgstr "" |
|
8782 |
||
8783 |
#: dummy/help_topics/status-flags/detail.txt:6
|
|
8784 |
msgid " xxx <filename>" |
|
8785 |
msgstr "" |
|
8786 |
||
8787 |
#: dummy/help_topics/status-flags/detail.txt:8
|
|
8788 |
msgid "where the columns' meanings are as follows." |
|
8789 |
msgstr "" |
|
8790 |
||
8791 |
#: dummy/help_topics/status-flags/detail.txt:10
|
|
8792 |
msgid "Column 1 - versioning/renames::" |
|
8793 |
msgstr "" |
|
8794 |
||
8795 |
#: dummy/help_topics/status-flags/detail.txt:12
|
|
8796 |
msgid "" |
|
8797 |
" + File versioned\n"
|
|
8798 |
" - File unversioned\n"
|
|
8799 |
" R File renamed\n"
|
|
8800 |
" ? File unknown\n"
|
|
8801 |
" X File nonexistent (and unknown to bzr)\n"
|
|
8802 |
" C File has conflicts\n"
|
|
8803 |
" P Entry for a pending merge (not a file)"
|
|
8804 |
msgstr "" |
|
8805 |
||
8806 |
#: dummy/help_topics/status-flags/detail.txt:20
|
|
8807 |
msgid "Column 2 - contents::" |
|
8808 |
msgstr "" |
|
8809 |
||
8810 |
#: dummy/help_topics/status-flags/detail.txt:22
|
|
8811 |
msgid "" |
|
8812 |
" N File created\n"
|
|
8813 |
" D File deleted\n"
|
|
8814 |
" K File kind changed\n"
|
|
8815 |
" M File modified"
|
|
8816 |
msgstr "" |
|
8817 |
||
8818 |
#: dummy/help_topics/status-flags/detail.txt:27
|
|
8819 |
msgid "Column 3 - execute::" |
|
8820 |
msgstr "" |
|
8821 |
||
8822 |
#: dummy/help_topics/status-flags/detail.txt:29
|
|
8823 |
msgid " * The execute bit was changed\n" |
|
8824 |
msgstr "" |
|
8825 |
||
8826 |
#: dummy/help_topics/status-flags/summary.txt:1
|
|
8827 |
msgid "Help on status flags" |
|
8828 |
msgstr "" |
|
8829 |
||
8830 |
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
|
|
8831 |
msgid "Branches Out of Sync" |
|
8832 |
msgstr "" |
|
8833 |
||
8834 |
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
|
|
8835 |
msgid "" |
|
8836 |
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
|
|
8837 |
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
|
|
8838 |
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
|
|
8839 |
"have the same last revision as the new reference branch for the lightweight\n"
|
|
8840 |
"checkout, data could be lost, so Bazaar refuses."
|
|
8841 |
msgstr "" |
|
8842 |
||
8843 |
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
|
|
8844 |
msgid "How you deal with this depends on *why* the branches are out of sync." |
|
8845 |
msgstr "" |
|
8846 |
||
8847 |
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
|
|
8848 |
msgid "" |
|
8849 |
"If you have a checkout and have done local commits, you can get back in "
|
|
8850 |
"sync\n"
|
|
8851 |
"by running \"bzr update\" (and possibly \"bzr commit\")."
|
|
8852 |
msgstr "" |
|
8853 |
||
8854 |
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
|
|
8855 |
msgid "" |
|
8856 |
"If you have a branch and the remote branch is out-of-date, you can push\n"
|
|
8857 |
"the local changes using \"bzr push\". If the local branch is out of date, "
|
|
8858 |
"you\n"
|
|
8859 |
"can do \"bzr pull\". If both branches have had changes, you can merge, "
|
|
8860 |
"commit\n"
|
|
8861 |
"and then push your changes. If you decide that some of the changes aren't\n"
|
|
8862 |
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
|
|
8863 |
msgstr "" |
|
8864 |
||
8865 |
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
|
|
8866 |
msgid "Steps to resolve \"out-of-sync\" when reconfiguring" |
|
8867 |
msgstr "" |
|
8868 |
||
8869 |
#: dummy/help_topics/topics/summary.txt:1
|
|
8870 |
msgid "Topics list" |
|
8871 |
msgstr "" |
|
8872 |
||
8873 |
#: dummy/help_topics/url-special-chars/summary.txt:1
|
|
8874 |
msgid "Special character handling in URLs" |
|
8875 |
msgstr "" |
|
8876 |
||
8877 |
#: dummy/help_topics/urlspec/summary.txt:1
|
|
8878 |
msgid "Supported transport protocols" |
|
8879 |
msgstr "" |
|
8880 |
||
8881 |
#: dummy/help_topics/working-trees/detail.txt:1
|
|
8882 |
msgid "Working Trees" |
|
8883 |
msgstr "" |
|
8884 |
||
8885 |
#: dummy/help_topics/working-trees/detail.txt:3
|
|
8886 |
msgid "" |
|
8887 |
"A working tree is the contents of a branch placed on disk so that you can\n"
|
|
8888 |
"see the files and edit them. The working tree is where you make changes to "
|
|
8889 |
"a\n"
|
|
8890 |
"branch, and when you commit the current state of the working tree is the\n"
|
|
8891 |
"snapshot that is recorded in the commit."
|
|
8892 |
msgstr "" |
|
8893 |
||
8894 |
#: dummy/help_topics/working-trees/detail.txt:8
|
|
8895 |
msgid "" |
|
8896 |
"When you push a branch to a remote system, a working tree will not be\n"
|
|
8897 |
"created. If one is already present the files will not be updated. The\n"
|
|
8898 |
"branch information will be updated and the working tree will be marked\n"
|
|
8899 |
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
|
|
8900 |
"may be uncommitted changes or the update may cause content conflicts that "
|
|
8901 |
"are\n"
|
|
8902 |
"difficult to deal with remotely."
|
|
8903 |
msgstr "" |
|
8904 |
||
8905 |
#: dummy/help_topics/working-trees/detail.txt:15
|
|
8906 |
msgid "" |
|
8907 |
"If you have a branch with no working tree you can use the 'checkout' "
|
|
8908 |
"command\n"
|
|
8909 |
"to create a working tree. If you run 'bzr checkout .' from the branch it "
|
|
8910 |
"will\n"
|
|
8911 |
"create the working tree. If the branch is updated remotely, you can update "
|
|
8912 |
"the\n"
|
|
8913 |
"working tree by running 'bzr update' in that directory."
|
|
8914 |
msgstr "" |
|
8915 |
||
8916 |
#: dummy/help_topics/working-trees/detail.txt:20
|
|
8917 |
msgid "" |
|
8918 |
"If you have a branch with a working tree that you do not want the 'remove-"
|
|
8919 |
"tree'\n"
|
|
8920 |
"command will remove the tree if it is safe. This can be done to avoid the\n"
|
|
8921 |
"warning about the remote working tree not being updated when pushing to the\n"
|
|
8922 |
"branch. It can also be useful when working with a '--no-trees' repository\n"
|
|
8923 |
"(see 'bzr help repositories')."
|
|
8924 |
msgstr "" |
|
8925 |
||
8926 |
#: dummy/help_topics/working-trees/detail.txt:26
|
|
8927 |
msgid "" |
|
8928 |
"If you want to have a working tree on a remote machine that you push to you\n"
|
|
8929 |
"can either run 'bzr update' in the remote branch after each push, or use "
|
|
8930 |
"some\n"
|
|
8931 |
"other method to update the tree during the push. There is an 'rspush' "
|
|
8932 |
"plugin\n"
|
|
8933 |
"that will update the working tree using rsync as well as doing a push. "
|
|
8934 |
"There\n"
|
|
8935 |
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
|
|
8936 |
"SSH\n"
|
|
8937 |
"after each push."
|
|
8938 |
msgstr "" |
|
8939 |
||
8940 |
#: dummy/help_topics/working-trees/detail.txt:33
|
|
8941 |
msgid "Useful commands::" |
|
8942 |
msgstr "" |
|
8943 |
||
8944 |
#: dummy/help_topics/working-trees/detail.txt:35
|
|
8945 |
msgid "" |
|
8946 |
" checkout Create a working tree when a branch does not have one.\n"
|
|
8947 |
" remove-tree Removes the working tree from a branch when it is safe to do "
|
|
8948 |
"so.\n"
|
|
8949 |
" update When a working tree is out of sync with its associated "
|
|
8950 |
"branch\n"
|
|
8951 |
" this will update the tree to match the branch.\n"
|
|
8952 |
msgstr "" |
|
8953 |
||
8954 |
#: dummy/help_topics/working-trees/summary.txt:1
|
|
8955 |
msgid "Information on working trees" |
|
8956 |
msgstr "" |
|
8957 |
||
8958 |
#: en/help_topics/authentication.txt:1
|
|
8959 |
msgid "" |
|
8960 |
"Authentication Settings\n"
|
|
8961 |
"======================="
|
|
8962 |
msgstr "" |
|
8963 |
||
8964 |
#: en/help_topics/authentication.txt:4
|
|
8965 |
msgid "" |
|
8966 |
"\n"
|
|
8967 |
"Intent\n"
|
|
8968 |
"------"
|
|
8969 |
msgstr "" |
|
8970 |
||
8971 |
#: en/help_topics/authentication.txt:8
|
|
8972 |
msgid "" |
|
8973 |
"Many different authentication policies can be described in the\n"
|
|
8974 |
"``authentication.conf`` file but a particular user should need only a few\n"
|
|
8975 |
"definitions to cover his needs without having to specify a user and a "
|
|
8976 |
"password\n"
|
|
8977 |
"for every branch he uses."
|
|
8978 |
msgstr "" |
|
8979 |
||
8980 |
#: en/help_topics/authentication.txt:13
|
|
8981 |
msgid "" |
|
8982 |
"The definitions found in this file are used to find the credentials to use "
|
|
8983 |
"for\n"
|
|
8984 |
"a given url. The same credentials can generally be used for as many branches "
|
|
8985 |
"as\n"
|
|
8986 |
"possible by grouping their declaration around the remote servers that need\n"
|
|
8987 |
"them. It's even possible to declare credentials that will be used by "
|
|
8988 |
"different\n"
|
|
8989 |
"servers."
|
|
8990 |
msgstr "" |
|
8991 |
||
8992 |
#: en/help_topics/authentication.txt:19
|
|
8993 |
msgid "" |
|
8994 |
"The intent is to make this file as small as possible to minimize maintenance."
|
|
8995 |
msgstr "" |
|
8996 |
||
8997 |
#: en/help_topics/authentication.txt:21
|
|
8998 |
msgid "" |
|
8999 |
"Once the relevant credentials are declared in this file you may use branch "
|
|
9000 |
"urls\n"
|
|
9001 |
"without embedding passwords (security hazard) or even users (enabling "
|
|
9002 |
"sharing\n"
|
|
9003 |
"of your urls with others)."
|
|
9004 |
msgstr "" |
|
9005 |
||
9006 |
#: en/help_topics/authentication.txt:25
|
|
9007 |
msgid "Instead of using::" |
|
9008 |
msgstr "" |
|
9009 |
||
9010 |
#: en/help_topics/authentication.txt:27
|
|
9011 |
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch" |
|
9012 |
msgstr "" |
|
9013 |
||
9014 |
#: en/help_topics/authentication.txt:29
|
|
9015 |
msgid "you simply use::" |
|
9016 |
msgstr "" |
|
9017 |
||
9018 |
#: en/help_topics/authentication.txt:31
|
|
9019 |
msgid " bzr branch ftp://host.com/path/to/my/branch" |
|
9020 |
msgstr "" |
|
9021 |
||
9022 |
#: en/help_topics/authentication.txt:33
|
|
9023 |
msgid "" |
|
9024 |
"provided you have created the following ``authentication.conf`` file::"
|
|
9025 |
msgstr "" |
|
9026 |
||
9027 |
#: en/help_topics/authentication.txt:35
|
|
9028 |
msgid "" |
|
9029 |
" [myprojects]\n"
|
|
9030 |
" scheme=ftp\n"
|
|
9031 |
" host=host.com\n"
|
|
9032 |
" user=joe\n"
|
|
9033 |
" password=secret\n"
|
|
9034 |
" "
|
|
9035 |
msgstr "" |
|
9036 |
||
9037 |
#: en/help_topics/authentication.txt:42
|
|
9038 |
msgid "" |
|
9039 |
"Authentication definitions\n"
|
|
9040 |
"--------------------------"
|
|
9041 |
msgstr "" |
|
9042 |
||
9043 |
#: en/help_topics/authentication.txt:45
|
|
9044 |
msgid "" |
|
9045 |
"There are two kinds of authentication used by the various schemes supported "
|
|
9046 |
"by\n"
|
|
9047 |
"bzr:" |
|
9048 |
msgstr "" |
|
9049 |
||
9050 |
#: en/help_topics/authentication.txt:48
|
|
9051 |
msgid "1. user and password" |
|
9052 |
msgstr "" |
|
9053 |
||
9054 |
#: en/help_topics/authentication.txt:50
|
|
9055 |
msgid "" |
|
9056 |
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
|
|
9057 |
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
|
|
9058 |
"ssh agents are a better, more secure solution. So we have chosen to not "
|
|
9059 |
"provide\n"
|
|
9060 |
"our own less secure method."
|
|
9061 |
msgstr "" |
|
9062 |
||
9063 |
#: en/help_topics/authentication.txt:55
|
|
9064 |
msgid "2. user, realm and password" |
|
9065 |
msgstr "" |
|
9066 |
||
9067 |
#: en/help_topics/authentication.txt:57
|
|
9068 |
msgid "" |
|
9069 |
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
|
|
9070 |
"against a host. But, by using ``.htaccess`` files, for example, it is "
|
|
9071 |
"possible\n"
|
|
9072 |
"to define several (``user, realm, password``) for a given ``host``. So what "
|
|
9073 |
"is\n"
|
|
9074 |
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
|
|
9075 |
"is\n"
|
|
9076 |
"not taken into account in the definitions, but will displayed if bzr "
|
|
9077 |
"prompts\n"
|
|
9078 |
"you for a password."
|
|
9079 |
msgstr "" |
|
9080 |
||
9081 |
#: en/help_topics/authentication.txt:64
|
|
9082 |
msgid "" |
|
9083 |
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
|
|
9084 |
"specifying the appropriate port."
|
|
9085 |
msgstr "" |
|
9086 |
||
9087 |
#: en/help_topics/authentication.txt:67
|
|
9088 |
msgid "" |
|
9089 |
"To take all schemes into account, the password will be deduced from a set "
|
|
9090 |
"of\n"
|
|
9091 |
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
|
|
9092 |
"``user``,\n"
|
|
9093 |
"``password``)."
|
|
9094 |
msgstr "" |
|
9095 |
||
9096 |
#: en/help_topics/authentication.txt:71
|
|
9097 |
msgid "" |
|
9098 |
" * ``scheme``: can be empty (meaning the rest of the definition can be "
|
|
9099 |
"used\n"
|
|
9100 |
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
|
|
9101 |
"``ssh``\n"
|
|
9102 |
" should be used instead since this is the real scheme regarding\n"
|
|
9103 |
" authentication,"
|
|
9104 |
msgstr "" |
|
9105 |
||
9106 |
#: en/help_topics/authentication.txt:76
|
|
9107 |
msgid " * ``host``: can be empty (to act as a default for any host)," |
|
9108 |
msgstr "" |
|
9109 |
||
9110 |
#: en/help_topics/authentication.txt:78
|
|
9111 |
msgid "" |
|
9112 |
" * ``port`` can be empty (useful when an host provides several servers for "
|
|
9113 |
"the\n"
|
|
9114 |
" same scheme), only numerical values are allowed, this should be used "
|
|
9115 |
"only\n"
|
|
9116 |
" when the server uses a port different than the scheme standard port,"
|
|
9117 |
msgstr "" |
|
9118 |
||
9119 |
#: en/help_topics/authentication.txt:82
|
|
9120 |
msgid " * ``path``: can be empty (FTP or SFTP will never user it)," |
|
9121 |
msgstr "" |
|
9122 |
||
9123 |
#: en/help_topics/authentication.txt:84
|
|
9124 |
msgid "" |
|
9125 |
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
|
|
9126 |
" ``getpass.get_user()``),"
|
|
9127 |
msgstr "" |
|
9128 |
||
9129 |
#: en/help_topics/authentication.txt:87
|
|
9130 |
msgid "" |
|
9131 |
" * ``password``: can be empty if you prefer to always be prompted for your\n"
|
|
9132 |
" password."
|
|
9133 |
msgstr "" |
|
9134 |
||
9135 |
#: en/help_topics/authentication.txt:90
|
|
9136 |
msgid "" |
|
9137 |
"Multiple definitions can be provided and, for a given URL, bzr will select "
|
|
9138 |
"a\n"
|
|
9139 |
"(``user`` [, ``password``]) based on the following rules :"
|
|
9140 |
msgstr "" |
|
9141 |
||
9142 |
#: en/help_topics/authentication.txt:93
|
|
9143 |
msgid " 1. the first match wins," |
|
9144 |
msgstr "" |
|
9145 |
||
9146 |
#: en/help_topics/authentication.txt:95
|
|
9147 |
msgid " 2. empty fields match everything," |
|
9148 |
msgstr "" |
|
9149 |
||
9150 |
#: en/help_topics/authentication.txt:97
|
|
9151 |
msgid "" |
|
9152 |
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
|
|
9153 |
msgstr "" |
|
9154 |
||
9155 |
#: en/help_topics/authentication.txt:99
|
|
9156 |
msgid "" |
|
9157 |
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
|
|
9158 |
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
|
|
9159 |
"``projectbzr.sf.net``\n"
|
|
9160 |
" will not match ``bzr.sf.net``)."
|
|
9161 |
msgstr "" |
|
9162 |
||
9163 |
#: en/help_topics/authentication.txt:103
|
|
9164 |
msgid "" |
|
9165 |
" 5. ``port`` matches if included in the requested URL (exact matches only)"
|
|
9166 |
msgstr "" |
|
9167 |
||
9168 |
#: en/help_topics/authentication.txt:105
|
|
9169 |
msgid "" |
|
9170 |
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
|
|
9171 |
"above,\n"
|
|
9172 |
" empty paths will match any provided path)."
|
|
9173 |
msgstr "" |
|
9174 |
||
9175 |
#: en/help_topics/authentication.txt:110
|
|
9176 |
msgid "" |
|
9177 |
"File format\n"
|
|
9178 |
"-----------"
|
|
9179 |
msgstr "" |
|
9180 |
||
9181 |
#: en/help_topics/authentication.txt:113
|
|
9182 |
msgid "" |
|
9183 |
"The general rules for :doc:`configuration files <configuration-help>`\n"
|
|
9184 |
"apply except for the variable policies."
|
|
9185 |
msgstr "" |
|
9186 |
||
9187 |
#: en/help_topics/authentication.txt:116
|
|
9188 |
msgid "Each section describes an authentication definition." |
|
9189 |
msgstr "" |
|
9190 |
||
9191 |
#: en/help_topics/authentication.txt:118
|
|
9192 |
msgid "" |
|
9193 |
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
|
|
9194 |
"reserved\n"
|
|
9195 |
"and should appear as the *last* section."
|
|
9196 |
msgstr "" |
|
9197 |
||
9198 |
#: en/help_topics/authentication.txt:121
|
|
9199 |
msgid "Each section should define:" |
|
9200 |
msgstr "" |
|
9201 |
||
9202 |
#: en/help_topics/authentication.txt:123
|
|
9203 |
msgid "* ``user``: the login to be used," |
|
9204 |
msgstr "" |
|
9205 |
||
9206 |
#: en/help_topics/authentication.txt:125
|
|
9207 |
msgid "Each section could define:" |
|
9208 |
msgstr "" |
|
9209 |
||
9210 |
#: en/help_topics/authentication.txt:127
|
|
9211 |
msgid "* ``host``: the remote server," |
|
9212 |
msgstr "" |
|
9213 |
||
9214 |
#: en/help_topics/authentication.txt:129
|
|
9215 |
msgid "* ``port``: the port the server is listening," |
|
9216 |
msgstr "" |
|
9217 |
||
9218 |
#: en/help_topics/authentication.txt:131
|
|
9219 |
msgid "* ``path``: the branch location," |
|
9220 |
msgstr "" |
|
9221 |
||
9222 |
#: en/help_topics/authentication.txt:133
|
|
9223 |
msgid "* ``password``: the password." |
|
9224 |
msgstr "" |
|
9225 |
||
9226 |
#: en/help_topics/authentication.txt:135
|
|
9227 |
msgid "" |
|
9228 |
"\n"
|
|
9229 |
"Examples\n"
|
|
9230 |
"--------"
|
|
9231 |
msgstr "" |
|
9232 |
||
9233 |
#: en/help_topics/authentication.txt:139
|
|
9234 |
msgid "" |
|
9235 |
"\n"
|
|
9236 |
"Personal projects hosted outside\n"
|
|
9237 |
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
|
9238 |
msgstr "" |
|
9239 |
||
9240 |
#: en/help_topics/authentication.txt:143
|
|
9241 |
msgid "" |
|
9242 |
"All connections are done with the same ``user`` (the remote one for which "
|
|
9243 |
"the\n"
|
|
9244 |
"default bzr one is not appropriate) and the password is always prompted "
|
|
9245 |
"with\n"
|
|
9246 |
"some exceptions::"
|
|
9247 |
msgstr "" |
|
9248 |
||
9249 |
#: en/help_topics/authentication.txt:147
|
|
9250 |
msgid "" |
|
9251 |
" # Pet projects on hobby.net\n"
|
|
9252 |
" [hobby]\n"
|
|
9253 |
" host=r.hobby.net\n"
|
|
9254 |
" user=jim\n"
|
|
9255 |
" password=obvious1234\n"
|
|
9256 |
" \n"
|
|
9257 |
" # Home server\n"
|
|
9258 |
" [home]\n"
|
|
9259 |
" scheme=https\n"
|
|
9260 |
" host=home.net\n"
|
|
9261 |
" user=joe\n"
|
|
9262 |
" password=1essobV10us\n"
|
|
9263 |
" \n"
|
|
9264 |
" [DEFAULT]\n"
|
|
9265 |
" # Our local user is barbaz, on all remote sites we're known as "
|
|
9266 |
"foobar\n"
|
|
9267 |
" user=foobar"
|
|
9268 |
msgstr "" |
|
9269 |
||
9270 |
#: en/help_topics/authentication.txt:164
|
|
9271 |
msgid "" |
|
9272 |
"\n"
|
|
9273 |
"Source hosting provider\n"
|
|
9274 |
"~~~~~~~~~~~~~~~~~~~~~~~"
|
|
9275 |
msgstr "" |
|
9276 |
||
9277 |
#: en/help_topics/authentication.txt:168
|
|
9278 |
msgid "In the shp.net (fictitious) domain, each project has its own site::" |
|
9279 |
msgstr "" |
|
9280 |
||
9281 |
#: en/help_topics/authentication.txt:170
|
|
9282 |
msgid "" |
|
9283 |
" [shpnet domain]\n"
|
|
9284 |
" # we use sftp, but ssh is the scheme used for authentication\n"
|
|
9285 |
" scheme=ssh\n"
|
|
9286 |
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
|
|
9287 |
" host=.shp.net\n"
|
|
9288 |
" user=joe\n"
|
|
9289 |
" # bzr don't support supplying a password for sftp,\n"
|
|
9290 |
" # consider using an ssh agent if you don't want to supply\n"
|
|
9291 |
" # a password interactively. (pageant, ssh-agent, etc)"
|
|
9292 |
msgstr "" |
|
9293 |
||
9294 |
#: en/help_topics/authentication.txt:180
|
|
9295 |
msgid "" |
|
9296 |
"HTTPS, SFTP servers and their proxy\n"
|
|
9297 |
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
|
9298 |
msgstr "" |
|
9299 |
||
9300 |
#: en/help_topics/authentication.txt:183
|
|
9301 |
msgid "" |
|
9302 |
"At company.com, the server hosting release and integration branches is "
|
|
9303 |
"behind a\n"
|
|
9304 |
"proxy, and the two branches use different authentication policies::"
|
|
9305 |
msgstr "" |
|
9306 |
||
9307 |
#: en/help_topics/authentication.txt:186
|
|
9308 |
msgid "" |
|
9309 |
" [reference code]\n"
|
|
9310 |
" scheme=https\n"
|
|
9311 |
" host=dev.company.com\n"
|
|
9312 |
" path=/dev\n"
|
|
9313 |
" user=user1\n"
|
|
9314 |
" password=pass1"
|
|
9315 |
msgstr "" |
|
9316 |
||
9317 |
#: en/help_topics/authentication.txt:193
|
|
9318 |
msgid "" |
|
9319 |
" # development branches on dev server\n"
|
|
9320 |
" [dev]\n"
|
|
9321 |
" scheme=ssh # bzr+ssh and sftp are available here\n"
|
|
9322 |
" host=dev.company.com\n"
|
|
9323 |
" path=/dev/integration\n"
|
|
9324 |
" user=user2\n"
|
|
9325 |
" \n"
|
|
9326 |
" # proxy\n"
|
|
9327 |
" [proxy]\n"
|
|
9328 |
" scheme=http\n"
|
|
9329 |
" host=proxy.company.com\n"
|
|
9330 |
" port=3128\n"
|
|
9331 |
" user=proxyuser1\n"
|
|
9332 |
" password=proxypass1"
|
|
9333 |
msgstr "" |
|
9334 |
||
9335 |
#: en/help_topics/authentication.txt:208
|
|
9336 |
msgid "" |
|
9337 |
"\n"
|
|
9338 |
"Planned enhancements\n"
|
|
9339 |
"--------------------"
|
|
9340 |
msgstr "" |
|
9341 |
||
9342 |
#: en/help_topics/authentication.txt:212
|
|
9343 |
msgid "" |
|
9344 |
"The following are not yet implemented but planned as parts of a work in\n"
|
|
9345 |
"progress:" |
|
9346 |
msgstr "" |
|
9347 |
||
9348 |
#: en/help_topics/authentication.txt:215
|
|
9349 |
msgid "* add a ``password_encoding`` field allowing:" |
|
9350 |
msgstr "" |
|
9351 |
||
9352 |
#: en/help_topics/authentication.txt:217
|
|
9353 |
msgid "" |
|
9354 |
" - storing the passwords in various obfuscating encodings (base64 for one),"
|
|
9355 |
msgstr "" |
|
9356 |
||
9357 |
#: en/help_topics/authentication.txt:219
|
|
9358 |
msgid " - delegate password storage to plugins (.netrc for example)." |
|
9359 |
msgstr "" |
|
9360 |
||
9361 |
#: en/help_topics/authentication.txt:221
|
|
9362 |
msgid "" |
|
9363 |
"* update the credentials when the user is prompted for user or password,"
|
|
9364 |
msgstr "" |
|
9365 |
||
9366 |
#: en/help_topics/authentication.txt:223
|
|
9367 |
msgid "* add a ``verify_certificates`` field for ``HTTPS``." |
|
9368 |
msgstr "" |
|
9369 |
||
9370 |
#: en/help_topics/authentication.txt:225
|
|
9371 |
msgid "" |
|
9372 |
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
|
|
9373 |
"but\n"
|
|
9374 |
"ignored in the actual implementation.\n"
|
|
9375 |
msgstr "" |
|
9376 |
||
9377 |
#: en/help_topics/bugs.txt:1
|
|
9378 |
msgid "Bug Tracker Settings" |
|
9379 |
msgstr "" |
|
9380 |
||
9381 |
#: en/help_topics/bugs.txt:3
|
|
9382 |
msgid "" |
|
9383 |
"When making a commit, metadata about bugs fixed by that change can be\n"
|
|
9384 |
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
|
|
9385 |
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
|
|
9386 |
"(The only ``status`` value currently supported is ``fixed.``)"
|
|
9387 |
msgstr "" |
|
9388 |
||
9389 |
#: en/help_topics/bugs.txt:8
|
|
9390 |
msgid "" |
|
9391 |
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
|
|
9392 |
"identifier\n"
|
|
9393 |
"rather than a full URL. This looks like::"
|
|
9394 |
msgstr "" |
|
9395 |
||
9396 |
#: en/help_topics/bugs.txt:11
|
|
9397 |
msgid " bzr commit --fixes <tracker>:<id>" |
|
9398 |
msgstr "" |
|
9399 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
9400 |
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
9401 |
msgid "or::" |
9402 |
msgstr "" |
|
9403 |
||
9404 |
#: en/help_topics/bugs.txt:15
|
|
9405 |
msgid " bzr commit --fixes <id>" |
|
9406 |
msgstr "" |
|
9407 |
||
9408 |
#: en/help_topics/bugs.txt:17
|
|
9409 |
msgid "" |
|
9410 |
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
|
|
9411 |
"the\n"
|
|
9412 |
"identifier for that bug within the bugtracker, usually the bug number.\n"
|
|
9413 |
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
|
|
9414 |
"or global configuration is used."
|
|
9415 |
msgstr "" |
|
9416 |
||
9417 |
#: en/help_topics/bugs.txt:22
|
|
9418 |
msgid "" |
|
9419 |
"Bazaar knows about a few bug trackers that have many users. If\n"
|
|
9420 |
"you use one of these bug trackers then there is no setup required to\n"
|
|
9421 |
"use this feature, you just need to know the tracker identifier to use.\n"
|
|
9422 |
"These are the bugtrackers that are built in:"
|
|
9423 |
msgstr "" |
|
9424 |
||
9425 |
#: en/help_topics/bugs.txt:27
|
|
9426 |
msgid "" |
|
9427 |
" ============================ ============ ============\n"
|
|
9428 |
" URL Abbreviation Example\n"
|
|
9429 |
" ============================ ============ ============\n"
|
|
9430 |
" https://bugs.launchpad.net/ lp lp:12345\n"
|
|
9431 |
" http://bugs.debian.org/ deb deb:12345\n"
|
|
9432 |
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
|
|
9433 |
" ============================ ============ ============"
|
|
9434 |
msgstr "" |
|
9435 |
||
9436 |
#: en/help_topics/bugs.txt:35
|
|
9437 |
msgid "" |
|
9438 |
"For the bug trackers not listed above configuration is required.\n"
|
|
9439 |
"Support for generating the URLs for any project using Bugzilla or Trac\n"
|
|
9440 |
"is built in, along with a template mechanism for other bugtrackers with\n"
|
|
9441 |
"simple URL schemes. If your bug tracker can't be described by one\n"
|
|
9442 |
"of the schemes described below then you can write a plugin to support\n"
|
|
9443 |
"it."
|
|
9444 |
msgstr "" |
|
9445 |
||
9446 |
#: en/help_topics/bugs.txt:42
|
|
9447 |
msgid "" |
|
9448 |
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
|
|
9449 |
"variable which contains the base URL of the bug tracker. These options\n"
|
|
9450 |
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
|
|
9451 |
"configuration section in ``locations.conf``. You can set up these values\n"
|
|
9452 |
"for each of the projects you work on."
|
|
9453 |
msgstr "" |
|
9454 |
||
9455 |
#: en/help_topics/bugs.txt:48
|
|
9456 |
msgid "" |
|
9457 |
"Note: As you provide a short name for each tracker, you can specify one or\n" |
|
9458 |
"more bugs in one or more trackers at commit time if you wish."
|
|
9459 |
msgstr "" |
|
9460 |
||
9461 |
#: en/help_topics/bugs.txt:51
|
|
9462 |
msgid "" |
|
9463 |
"Launchpad\n"
|
|
9464 |
"---------"
|
|
9465 |
msgstr "" |
|
9466 |
||
9467 |
#: en/help_topics/bugs.txt:54
|
|
9468 |
msgid "" |
|
9469 |
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
|
|
9470 |
msgstr "" |
|
9471 |
||
9472 |
#: en/help_topics/bugs.txt:56
|
|
9473 |
msgid "" |
|
9474 |
"bugzilla_<tracker>_url\n"
|
|
9475 |
"----------------------"
|
|
9476 |
msgstr "" |
|
9477 |
||
9478 |
#: en/help_topics/bugs.txt:59
|
|
9479 |
msgid "" |
|
9480 |
"If present, the location of the Bugzilla bug tracker referred to by\n"
|
|
9481 |
"<tracker>. This option can then be used together with ``bzr commit\n"
|
|
9482 |
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
|
|
9483 |
"example::" |
|
9484 |
msgstr "" |
|
9485 |
||
9486 |
#: en/help_topics/bugs.txt:64
|
|
9487 |
msgid " bugzilla_squid_url = http://bugs.squid-cache.org" |
|
9488 |
msgstr "" |
|
9489 |
||
9490 |
#: en/help_topics/bugs.txt:66
|
|
9491 |
msgid "" |
|
9492 |
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
|
|
9493 |
"fixed."
|
|
9494 |
msgstr "" |
|
9495 |
||
9496 |
#: en/help_topics/bugs.txt:69
|
|
9497 |
msgid "" |
|
9498 |
"trac_<tracker>_url\n"
|
|
9499 |
"------------------"
|
|
9500 |
msgstr "" |
|
9501 |
||
9502 |
#: en/help_topics/bugs.txt:72
|
|
9503 |
msgid "" |
|
9504 |
"If present, the location of the Trac instance referred to by\n"
|
|
9505 |
"<tracker>. This option can then be used together with ``bzr commit\n"
|
|
9506 |
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
|
|
9507 |
"example::" |
|
9508 |
msgstr "" |
|
9509 |
||
9510 |
#: en/help_topics/bugs.txt:77
|
|
9511 |
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac" |
|
9512 |
msgstr "" |
|
9513 |
||
9514 |
#: en/help_topics/bugs.txt:79
|
|
9515 |
msgid "" |
|
9516 |
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
|
|
9517 |
"as\n"
|
|
9518 |
"fixed."
|
|
9519 |
msgstr "" |
|
9520 |
||
9521 |
#: en/help_topics/bugs.txt:82
|
|
9522 |
msgid "" |
|
9523 |
"bugtracker_<tracker>_url\n"
|
|
9524 |
"------------------------"
|
|
9525 |
msgstr "" |
|
9526 |
||
9527 |
#: en/help_topics/bugs.txt:85
|
|
9528 |
msgid "" |
|
9529 |
"If present, the location of a generic bug tracker instance referred to by\n"
|
|
9530 |
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
|
|
9531 |
"which will be replaced by a specific bug ID. This option can then be used\n"
|
|
9532 |
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
|
|
9533 |
"fixed by that commit. For example::"
|
|
9534 |
msgstr "" |
|
9535 |
||
9536 |
#: en/help_topics/bugs.txt:91
|
|
9537 |
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}" |
|
9538 |
msgstr "" |
|
9539 |
||
9540 |
#: en/help_topics/bugs.txt:93
|
|
9541 |
msgid "" |
|
9542 |
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
|
|
9543 |
"Roundup bug tracker as fixed, or::"
|
|
9544 |
msgstr "" |
|
9545 |
||
9546 |
#: en/help_topics/bugs.txt:96
|
|
9547 |
msgid "" |
|
9548 |
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
|
|
9549 |
msgstr "" |
|
9550 |
||
9551 |
#: en/help_topics/bugs.txt:98
|
|
9552 |
msgid "" |
|
9553 |
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
|
|
9554 |
"RT bug tracker as fixed, or::"
|
|
9555 |
msgstr "" |
|
9556 |
||
9557 |
#: en/help_topics/bugs.txt:101
|
|
9558 |
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}" |
|
9559 |
msgstr "" |
|
9560 |
||
9561 |
#: en/help_topics/bugs.txt:103
|
|
9562 |
msgid "" |
|
9563 |
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
|
|
9564 |
"1234\n"
|
|
9565 |
"in Hudson's JIRA bug tracker as fixed.\n"
|
|
9566 |
msgstr "" |
|
9567 |
||
9568 |
#: en/help_topics/commands.txt:1
|
|
9569 |
msgid "" |
|
9570 |
"add Add specified files or directories.\n"
|
|
9571 |
"alias Set/unset and display aliases.\n"
|
|
9572 |
"annotate Show the origin of each line in a file.\n"
|
|
9573 |
"bash-completion Generate a shell function for bash command line "
|
|
9574 |
"completion.\n"
|
|
9575 |
" [bash_completion]\n"
|
|
9576 |
"bind Convert the current branch into a checkout of the "
|
|
9577 |
"supplied\n"
|
|
9578 |
" branch.\n"
|
|
9579 |
"branch Create a new branch that is a copy of an existing branch.\n"
|
|
9580 |
"branches List the branches available at the current location.\n"
|
|
9581 |
"break-lock Break a dead lock.\n"
|
|
9582 |
"cat Write the contents of a file as of a given revision to\n"
|
|
9583 |
" standard output.\n"
|
|
9584 |
"check Validate working tree structure, branch consistency and\n"
|
|
9585 |
" repository history.\n"
|
|
9586 |
"checkout Create a new checkout of an existing branch.\n"
|
|
9587 |
"clean-tree Remove unwanted files from working tree.\n"
|
|
9588 |
"commit Commit changes into a new revision.\n"
|
|
9589 |
"config Display, set or remove a configuration option.\n"
|
|
9590 |
"conflicts List files with conflicts.\n"
|
|
9591 |
"deleted List files deleted in the working tree.\n"
|
|
9592 |
"diff Show differences in the working tree, between revisions "
|
|
9593 |
"or\n"
|
|
9594 |
" branches.\n"
|
|
9595 |
"dpush Push into a different VCS without any custom bzr "
|
|
9596 |
"metadata.\n"
|
|
9597 |
"export Export current or past revision to a destination directory "
|
|
9598 |
"or\n"
|
|
9599 |
" archive.\n"
|
|
9600 |
"help Show help on a command or other topic.\n"
|
|
9601 |
"ignore Ignore specified files or patterns.\n"
|
|
9602 |
"ignored List ignored files and the patterns that matched them.\n"
|
|
9603 |
"info Show information about a working tree, branch or "
|
|
9604 |
"repository.\n"
|
|
9605 |
"init Make a directory into a versioned branch.\n"
|
|
9606 |
"init-repository Create a shared repository for branches to share storage\n"
|
|
9607 |
" space.\n"
|
|
9608 |
"join Combine a tree into its containing tree.\n"
|
|
9609 |
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
|
|
9610 |
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
|
|
9611 |
"launchpad-open Open a Launchpad branch page in your web browser. "
|
|
9612 |
"[launchpad]\n"
|
|
9613 |
"log Show historical log for a branch or subset of a branch.\n"
|
|
9614 |
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
|
|
9615 |
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
|
|
9616 |
"ls List files in a tree.\n"
|
|
9617 |
"merge Perform a three-way merge.\n"
|
|
9618 |
"missing Show unmerged/unpulled revisions between two branches.\n"
|
|
9619 |
"mkdir Create a new versioned directory.\n"
|
|
9620 |
"mv Move or rename a file.\n"
|
|
9621 |
"nick Print or set the branch nickname.\n"
|
|
9622 |
"pack Compress the data within a repository.\n"
|
|
9623 |
"plugins List the installed plugins.\n"
|
|
9624 |
"pull Turn this branch into a mirror of another branch.\n"
|
|
9625 |
"push Update a mirror of this branch.\n"
|
|
9626 |
"reconcile Reconcile bzr metadata in a branch.\n"
|
|
9627 |
"reconfigure Reconfigure the type of a bzr directory.\n"
|
|
9628 |
"register-branch Register a branch with launchpad.net. [launchpad]\n"
|
|
9629 |
"remerge Redo a merge.\n"
|
|
9630 |
"remove Remove files or directories.\n"
|
|
9631 |
"remove-branch Remove a branch.\n"
|
|
9632 |
"remove-tree Remove the working tree from a given branch/checkout.\n"
|
|
9633 |
"renames Show list of renamed files.\n"
|
|
9634 |
"resolve Mark a conflict as resolved.\n"
|
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
9635 |
"revert Set files in the working tree back to the contents of a\n"
|
9636 |
" previous revision.\n"
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
9637 |
"revno Show current revision number.\n"
|
9638 |
"root Show the tree root directory.\n"
|
|
9639 |
"send Mail or create a merge-directive for submitting changes.\n"
|
|
9640 |
"serve Run the bzr server.\n"
|
|
9641 |
"shelve Temporarily set aside some changes from the current tree.\n"
|
|
9642 |
"sign-my-commits Sign all commits by a given committer.\n"
|
|
9643 |
"split Split a subdirectory of a tree into a separate tree.\n"
|
|
9644 |
"status Display status summary.\n"
|
|
9645 |
"switch Set the branch of a checkout and update.\n"
|
|
9646 |
"tag Create, remove or modify a tag naming a revision.\n"
|
|
9647 |
"tags List tags.\n"
|
|
9648 |
"testament Show testament (signing-form) of a revision.\n"
|
|
9649 |
"unbind Convert the current checkout into a regular branch.\n"
|
|
9650 |
"uncommit Remove the last committed revision.\n"
|
|
9651 |
"unshelve Restore shelved changes.\n"
|
|
9652 |
"update Update a working tree to a new revision.\n"
|
|
9653 |
"upgrade Upgrade a repository, branch or working tree to a newer\n"
|
|
9654 |
" format.\n"
|
|
9655 |
"verify-signatures Verify all commit signatures.\n"
|
|
9656 |
"version Show version of bzr.\n"
|
|
9657 |
"version-info Show version information about this tree.\n"
|
|
9658 |
"view Manage filtered views.\n"
|
|
9659 |
"whoami Show or set bzr user id.\n"
|
|
9660 |
msgstr "" |
|
9661 |
||
9662 |
#: en/help_topics/configuration.txt:1
|
|
9663 |
msgid "" |
|
9664 |
"Configuration Settings\n"
|
|
9665 |
"======================="
|
|
9666 |
msgstr "" |
|
9667 |
||
9668 |
#: en/help_topics/configuration.txt:4
|
|
9669 |
msgid "" |
|
9670 |
"Environment settings\n"
|
|
9671 |
"---------------------"
|
|
9672 |
msgstr "" |
|
9673 |
||
9674 |
#: en/help_topics/configuration.txt:7
|
|
9675 |
msgid "" |
|
9676 |
"While most configuration is handled by configuration files, some options\n"
|
|
9677 |
"which may be semi-permanent can also be controlled through the environment."
|
|
9678 |
msgstr "" |
|
9679 |
||
9680 |
#: en/help_topics/configuration.txt:10
|
|
9681 |
msgid "" |
|
9682 |
"BZR_EMAIL\n"
|
|
9683 |
"~~~~~~~~~"
|
|
9684 |
msgstr "" |
|
9685 |
||
9686 |
#: en/help_topics/configuration.txt:13
|
|
9687 |
msgid "Override the email id used by Bazaar. Typical format::" |
|
9688 |
msgstr "" |
|
9689 |
||
9690 |
#: en/help_topics/configuration.txt:15
|
|
9691 |
msgid " \"John Doe <jdoe@example.com>\"" |
|
9692 |
msgstr "" |
|
9693 |
||
9694 |
#: en/help_topics/configuration.txt:17
|
|
9695 |
msgid "See also the ``email`` configuration option." |
|
9696 |
msgstr "" |
|
9697 |
||
9698 |
#: en/help_topics/configuration.txt:19
|
|
9699 |
msgid "" |
|
9700 |
"BZR_PROGRESS_BAR\n"
|
|
9701 |
"~~~~~~~~~~~~~~~~"
|
|
9702 |
msgstr "" |
|
9703 |
||
9704 |
#: en/help_topics/configuration.txt:22
|
|
9705 |
msgid "" |
|
9706 |
"Override the progress display. Possible values are \"none\" or \"text\". "
|
|
9707 |
"If\n"
|
|
9708 |
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
|
|
9709 |
"draws\n"
|
|
9710 |
"the ordinary command line progress bar."
|
|
9711 |
msgstr "" |
|
9712 |
||
9713 |
#: en/help_topics/configuration.txt:26
|
|
9714 |
msgid "" |
|
9715 |
"BZR_SIGQUIT_PDB\n"
|
|
9716 |
"~~~~~~~~~~~~~~~"
|
|
9717 |
msgstr "" |
|
9718 |
||
9719 |
#: en/help_topics/configuration.txt:29
|
|
9720 |
msgid "" |
|
9721 |
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
|
|
9722 |
msgstr "" |
|
9723 |
||
9724 |
#: en/help_topics/configuration.txt:31
|
|
9725 |
msgid "" |
|
9726 |
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
|
|
9727 |
"* 1 = Invoke breakin debugger (default)"
|
|
9728 |
msgstr "" |
|
9729 |
||
9730 |
#: en/help_topics/configuration.txt:34
|
|
9731 |
msgid "" |
|
9732 |
"BZR_HOME\n"
|
|
9733 |
"~~~~~~~~"
|
|
9734 |
msgstr "" |
|
9735 |
||
9736 |
#: en/help_topics/configuration.txt:37
|
|
9737 |
msgid "Override the home directory used by Bazaar." |
|
9738 |
msgstr "" |
|
9739 |
||
9740 |
#: en/help_topics/configuration.txt:39
|
|
9741 |
msgid "" |
|
9742 |
"BZR_SSH\n"
|
|
9743 |
"~~~~~~~"
|
|
9744 |
msgstr "" |
|
9745 |
||
9746 |
#: en/help_topics/configuration.txt:42
|
|
9747 |
msgid "Select a different SSH implementation." |
|
9748 |
msgstr "" |
|
9749 |
||
9750 |
#: en/help_topics/configuration.txt:44
|
|
9751 |
msgid "" |
|
9752 |
"BZR_PDB\n"
|
|
9753 |
"~~~~~~~"
|
|
9754 |
msgstr "" |
|
9755 |
||
9756 |
#: en/help_topics/configuration.txt:47
|
|
9757 |
msgid "Control whether to launch a debugger on error." |
|
9758 |
msgstr "" |
|
9759 |
||
9760 |
#: en/help_topics/configuration.txt:49
|
|
9761 |
msgid "" |
|
9762 |
"* 0 = Standard behavior\n"
|
|
9763 |
"* 1 = Launch debugger"
|
|
9764 |
msgstr "" |
|
9765 |
||
9766 |
#: en/help_topics/configuration.txt:52
|
|
9767 |
msgid "" |
|
9768 |
"BZR_REMOTE_PATH\n"
|
|
9769 |
"~~~~~~~~~~~~~~~"
|
|
9770 |
msgstr "" |
|
9771 |
||
9772 |
#: en/help_topics/configuration.txt:55
|
|
9773 |
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol." |
|
9774 |
msgstr "" |
|
9775 |
||
9776 |
#: en/help_topics/configuration.txt:57
|
|
9777 |
msgid "See also the ``bzr_remote_path`` configuration option." |
|
9778 |
msgstr "" |
|
9779 |
||
9780 |
#: en/help_topics/configuration.txt:59
|
|
9781 |
msgid "" |
|
9782 |
"BZR_EDITOR\n"
|
|
9783 |
"~~~~~~~~~~"
|
|
9784 |
msgstr "" |
|
9785 |
||
9786 |
#: en/help_topics/configuration.txt:62
|
|
9787 |
msgid "Path to the editor Bazaar should use for commit messages, etc." |
|
9788 |
msgstr "" |
|
9789 |
||
9790 |
#: en/help_topics/configuration.txt:64
|
|
9791 |
msgid "" |
|
9792 |
"BZR_LOG\n"
|
|
9793 |
"~~~~~~~"
|
|
9794 |
msgstr "" |
|
9795 |
||
9796 |
#: en/help_topics/configuration.txt:67
|
|
9797 |
msgid "" |
|
9798 |
"Location of the Bazaar log file. You can check the current location by\n"
|
|
9799 |
"running ``bzr version``."
|
|
9800 |
msgstr "" |
|
9801 |
||
9802 |
#: en/help_topics/configuration.txt:70
|
|
9803 |
msgid "" |
|
9804 |
"The log file contains debug information that is useful for diagnosing or\n"
|
|
9805 |
"reporting problems with Bazaar."
|
|
9806 |
msgstr "" |
|
9807 |
||
9808 |
#: en/help_topics/configuration.txt:73
|
|
9809 |
msgid "" |
|
9810 |
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
|
|
9811 |
"will disable logging."
|
|
9812 |
msgstr "" |
|
9813 |
||
9814 |
#: en/help_topics/configuration.txt:76
|
|
9815 |
msgid "" |
|
9816 |
"\n"
|
|
9817 |
"BZR_PLUGIN_PATH\n"
|
|
9818 |
"~~~~~~~~~~~~~~~"
|
|
9819 |
msgstr "" |
|
9820 |
||
9821 |
#: en/help_topics/configuration.txt:80
|
|
9822 |
msgid "" |
|
9823 |
"The path to the plugins directory that Bazaar should use.\n"
|
|
9824 |
"If not set, Bazaar will search for plugins in:"
|
|
9825 |
msgstr "" |
|
9826 |
||
9827 |
#: en/help_topics/configuration.txt:83
|
|
9828 |
msgid "" |
|
9829 |
"* the user specific plugin directory (containing the ``user`` plugins),"
|
|
9830 |
msgstr "" |
|
9831 |
||
9832 |
#: en/help_topics/configuration.txt:85
|
|
9833 |
msgid "* the bzrlib directory (containing the ``core`` plugins)," |
|
9834 |
msgstr "" |
|
9835 |
||
9836 |
#: en/help_topics/configuration.txt:87
|
|
9837 |
msgid "" |
|
9838 |
"* the site specific plugin directory if applicable (containing\n"
|
|
9839 |
" the ``site`` plugins)."
|
|
9840 |
msgstr "" |
|
9841 |
||
9842 |
#: en/help_topics/configuration.txt:90
|
|
9843 |
msgid "" |
|
9844 |
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
|
|
9845 |
"the way the plugin are searched. "
|
|
9846 |
msgstr "" |
|
9847 |
||
9848 |
#: en/help_topics/configuration.txt:93
|
|
9849 |
msgid "" |
|
9850 |
"As for the ``PATH`` variables, if multiple directories are\n"
|
|
9851 |
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
|
|
9852 |
"platform specific appropriate character (':' on Unix,\n"
|
|
9853 |
"';' on windows)"
|
|
9854 |
msgstr "" |
|
9855 |
||
9856 |
#: en/help_topics/configuration.txt:98
|
|
9857 |
msgid "" |
|
9858 |
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
|
|
9859 |
"in ``user``. However it will continue to search in ``core`` and\n"
|
|
9860 |
"``site`` unless they are explicitly removed."
|
|
9861 |
msgstr "" |
|
9862 |
||
9863 |
#: en/help_topics/configuration.txt:102
|
|
9864 |
msgid "" |
|
9865 |
"If you need to change the order or remove one of these\n"
|
|
9866 |
"directories, you should use special values:"
|
|
9867 |
msgstr "" |
|
9868 |
||
9869 |
#: en/help_topics/configuration.txt:105
|
|
9870 |
msgid "" |
|
9871 |
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
|
|
9872 |
" path from the default values,"
|
|
9873 |
msgstr "" |
|
9874 |
||
9875 |
#: en/help_topics/configuration.txt:108
|
|
9876 |
msgid "" |
|
9877 |
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
|
|
9878 |
" before the remaining default values (and also remove it from\n"
|
|
9879 |
" the default values)."
|
|
9880 |
msgstr "" |
|
9881 |
||
9882 |
#: en/help_topics/configuration.txt:112
|
|
9883 |
msgid "" |
|
9884 |
"Note that the special values 'user', 'core' and 'site' should be\n"
|
|
9885 |
"used literally, they will be substituted by the corresponding,\n"
|
|
9886 |
"platform specific, values."
|
|
9887 |
msgstr "" |
|
9888 |
||
9889 |
#: en/help_topics/configuration.txt:116
|
|
9890 |
msgid "" |
|
9891 |
"The examples below use ':' as the separator, windows users\n"
|
|
9892 |
"should use ';'."
|
|
9893 |
msgstr "" |
|
9894 |
||
9895 |
#: en/help_topics/configuration.txt:119
|
|
9896 |
msgid "Overriding the default user plugin directory::" |
|
9897 |
msgstr "" |
|
9898 |
||
9899 |
#: en/help_topics/configuration.txt:121
|
|
9900 |
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'" |
|
9901 |
msgstr "" |
|
9902 |
||
9903 |
#: en/help_topics/configuration.txt:123
|
|
9904 |
msgid "Disabling the site directory while retaining the user directory::" |
|
9905 |
msgstr "" |
|
9906 |
||
9907 |
#: en/help_topics/configuration.txt:125
|
|
9908 |
msgid " BZR_PLUGIN_PATH='-site:+user'" |
|
9909 |
msgstr "" |
|
9910 |
||
9911 |
#: en/help_topics/configuration.txt:127
|
|
9912 |
msgid "Disabling all plugins (better achieved with --no-plugins)::" |
|
9913 |
msgstr "" |
|
9914 |
||
9915 |
#: en/help_topics/configuration.txt:129
|
|
9916 |
msgid " BZR_PLUGIN_PATH='-user:-core:-site'" |
|
9917 |
msgstr "" |
|
9918 |
||
9919 |
#: en/help_topics/configuration.txt:131
|
|
9920 |
msgid "Overriding the default site plugin directory::" |
|
9921 |
msgstr "" |
|
9922 |
||
9923 |
#: en/help_topics/configuration.txt:133
|
|
9924 |
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user" |
|
9925 |
msgstr "" |
|
9926 |
||
9927 |
#: en/help_topics/configuration.txt:135
|
|
9928 |
msgid "" |
|
9929 |
"BZR_DISABLE_PLUGINS\n"
|
|
9930 |
"~~~~~~~~~~~~~~~~~~~"
|
|
9931 |
msgstr "" |
|
9932 |
||
9933 |
#: en/help_topics/configuration.txt:138
|
|
9934 |
msgid "" |
|
9935 |
"Under special circumstances (mostly when trying to diagnose a\n"
|
|
9936 |
"bug), it's better to disable a plugin (or several) rather than\n"
|
|
9937 |
"uninstalling them completely. Such plugins can be specified in\n"
|
|
9938 |
"the ``BZR_DISABLE_PLUGINS`` environment variable."
|
|
9939 |
msgstr "" |
|
9940 |
||
9941 |
#: en/help_topics/configuration.txt:143
|
|
9942 |
msgid "" |
|
9943 |
"In that case, ``bzr`` will stop loading the specified plugins and\n"
|
|
9944 |
"will raise an import error if they are explicitly imported (by\n"
|
|
9945 |
"another plugin that depends on them for example)."
|
|
9946 |
msgstr "" |
|
9947 |
||
9948 |
#: en/help_topics/configuration.txt:147
|
|
9949 |
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::" |
|
9950 |
msgstr "" |
|
9951 |
||
9952 |
#: en/help_topics/configuration.txt:149
|
|
9953 |
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'" |
|
9954 |
msgstr "" |
|
9955 |
||
9956 |
#: en/help_topics/configuration.txt:151
|
|
9957 |
msgid "" |
|
9958 |
"BZR_PLUGINS_AT\n"
|
|
9959 |
"~~~~~~~~~~~~~~"
|
|
9960 |
msgstr "" |
|
9961 |
||
9962 |
#: en/help_topics/configuration.txt:154
|
|
9963 |
msgid "" |
|
9964 |
"When adding a new feature or working on a bug in a plugin,\n"
|
|
9965 |
"developers often need to use a specific version of a given\n"
|
|
9966 |
"plugin. Since python requires that the directory containing the\n"
|
|
9967 |
"code is named like the plugin itself this make it impossible to\n"
|
|
9968 |
"use arbitrary directory names (using a two-level directory scheme\n"
|
|
9969 |
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
|
|
9970 |
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
|
|
9971 |
msgstr "" |
|
9972 |
||
9973 |
#: en/help_topics/configuration.txt:162
|
|
9974 |
msgid "" |
|
9975 |
"Plugins specified in this environment variable takes precedence\n"
|
|
9976 |
"over the ones in ``BZR_PLUGIN_PATH``."
|
|
9977 |
msgstr "" |
|
9978 |
||
9979 |
#: en/help_topics/configuration.txt:165
|
|
9980 |
msgid "" |
|
9981 |
"The variable specified a list of ``plugin_name@plugin path``,\n"
|
|
9982 |
"``plugin_name`` being the name of the plugin as it appears in\n"
|
|
9983 |
"python module paths, ``plugin_path`` being the path to the\n"
|
|
9984 |
"directory containing the plugin code itself\n"
|
|
9985 |
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
|
|
9986 |
"separator, use ';' on windows."
|
|
9987 |
msgstr "" |
|
9988 |
||
9989 |
#: en/help_topics/configuration.txt:172
|
|
9990 |
msgid "" |
|
9991 |
"Example:\n" |
|
9992 |
"~~~~~~~~"
|
|
9993 |
msgstr "" |
|
9994 |
||
9995 |
#: en/help_topics/configuration.txt:175
|
|
9996 |
msgid "" |
|
9997 |
"Using a specific version of ``myplugin``:\n"
|
|
9998 |
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
|
|
9999 |
msgstr "" |
|
10000 |
||
10001 |
#: en/help_topics/configuration.txt:178
|
|
10002 |
msgid "" |
|
10003 |
"BZRPATH\n"
|
|
10004 |
"~~~~~~~"
|
|
10005 |
msgstr "" |
|
10006 |
||
10007 |
#: en/help_topics/configuration.txt:181
|
|
10008 |
msgid "The path where Bazaar should look for shell plugin external commands." |
|
10009 |
msgstr "" |
|
10010 |
||
10011 |
#: en/help_topics/configuration.txt:183
|
|
10012 |
msgid "" |
|
10013 |
"\n"
|
|
10014 |
"http_proxy, https_proxy\n"
|
|
10015 |
"~~~~~~~~~~~~~~~~~~~~~~~"
|
|
10016 |
msgstr "" |
|
10017 |
||
10018 |
#: en/help_topics/configuration.txt:187
|
|
10019 |
msgid "Specifies the network proxy for outgoing connections, for example::" |
|
10020 |
msgstr "" |
|
10021 |
||
10022 |
#: en/help_topics/configuration.txt:189
|
|
10023 |
msgid "" |
|
10024 |
" http_proxy=http://proxy.example.com:3128/ \n"
|
|
10025 |
" https_proxy=http://proxy.example.com:3128/"
|
|
10026 |
msgstr "" |
|
10027 |
||
10028 |
#: en/help_topics/configuration.txt:192
|
|
10029 |
msgid "" |
|
10030 |
"\n"
|
|
10031 |
"Configuration files\n"
|
|
10032 |
"-------------------"
|
|
10033 |
msgstr "" |
|
10034 |
||
10035 |
#: en/help_topics/configuration.txt:196
|
|
10036 |
msgid "" |
|
10037 |
"Location\n"
|
|
10038 |
"~~~~~~~~"
|
|
10039 |
msgstr "" |
|
10040 |
||
10041 |
#: en/help_topics/configuration.txt:199
|
|
10042 |
msgid "" |
|
10043 |
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
|
|
10044 |
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
|
|
10045 |
"on\n"
|
|
10046 |
"Windows. (You can check the location for your system by using\n"
|
|
10047 |
"``bzr version``.)"
|
|
10048 |
msgstr "" |
|
10049 |
||
10050 |
#: en/help_topics/configuration.txt:204
|
|
10051 |
msgid "There are three primary configuration files in this location:" |
|
10052 |
msgstr "" |
|
10053 |
||
10054 |
#: en/help_topics/configuration.txt:206
|
|
10055 |
msgid "* ``bazaar.conf`` describes default configuration options," |
|
10056 |
msgstr "" |
|
10057 |
||
10058 |
#: en/help_topics/configuration.txt:208
|
|
10059 |
msgid "" |
|
10060 |
"* ``locations.conf`` describes configuration information for\n"
|
|
10061 |
" specific branch locations,"
|
|
10062 |
msgstr "" |
|
10063 |
||
10064 |
#: en/help_topics/configuration.txt:211
|
|
10065 |
msgid "" |
|
10066 |
"* ``authentication.conf`` describes credential information for\n"
|
|
10067 |
" remote servers."
|
|
10068 |
msgstr "" |
|
10069 |
||
10070 |
#: en/help_topics/configuration.txt:214
|
|
10071 |
msgid "" |
|
10072 |
"Each branch can also contain a configuration file that sets values specific\n"
|
|
10073 |
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
|
|
10074 |
"the\n"
|
|
10075 |
"branch. This file is visible to all users of a branch, if you wish to "
|
|
10076 |
"override\n"
|
|
10077 |
"one of the values for a branch with a setting that is specific to you then "
|
|
10078 |
"you\n"
|
|
10079 |
"can do so in ``locations.conf``."
|
|
10080 |
msgstr "" |
|
10081 |
||
10082 |
#: en/help_topics/configuration.txt:220
|
|
10083 |
msgid "" |
|
10084 |
"General format\n"
|
|
10085 |
"~~~~~~~~~~~~~~"
|
|
10086 |
msgstr "" |
|
10087 |
||
10088 |
#: en/help_topics/configuration.txt:223
|
|
10089 |
msgid "" |
|
10090 |
"An ini file has three types of contructs: section headers, section\n"
|
|
10091 |
"options and comments."
|
|
10092 |
msgstr "" |
|
10093 |
||
10094 |
#: en/help_topics/configuration.txt:226
|
|
10095 |
msgid "" |
|
10096 |
"Comments\n"
|
|
10097 |
"^^^^^^^^"
|
|
10098 |
msgstr "" |
|
10099 |
||
10100 |
#: en/help_topics/configuration.txt:229
|
|
10101 |
msgid "" |
|
10102 |
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
|
|
10103 |
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
|
|
10104 |
"Bazaar when parsing ini files."
|
|
10105 |
msgstr "" |
|
10106 |
||
10107 |
#: en/help_topics/configuration.txt:233
|
|
10108 |
msgid "" |
|
10109 |
"Section headers\n"
|
|
10110 |
"^^^^^^^^^^^^^^^"
|
|
10111 |
msgstr "" |
|
10112 |
||
10113 |
#: en/help_topics/configuration.txt:236
|
|
10114 |
msgid "" |
|
10115 |
"A section header is a word enclosed in brackets that starts at the begining\n"
|
|
10116 |
"of a line. A typical section header looks like this::"
|
|
10117 |
msgstr "" |
|
10118 |
||
10119 |
#: en/help_topics/configuration.txt:239
|
|
10120 |
msgid " [DEFAULT]" |
|
10121 |
msgstr "" |
|
10122 |
||
10123 |
#: en/help_topics/configuration.txt:241
|
|
10124 |
msgid "" |
|
10125 |
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
|
|
10126 |
"[ALIASES]. Section headers are case sensitive. The default section provides "
|
|
10127 |
"for\n"
|
|
10128 |
"setting options which can be overridden with the branch config file."
|
|
10129 |
msgstr "" |
|
10130 |
||
10131 |
#: en/help_topics/configuration.txt:245
|
|
10132 |
msgid "" |
|
10133 |
"For ``locations.conf``, the options from the section with the\n"
|
|
10134 |
"longest matching section header are used to the exclusion of other\n"
|
|
10135 |
"potentially valid section headers. A section header uses the path for\n"
|
|
10136 |
"the branch as the section header. Some examples include::"
|
|
10137 |
msgstr "" |
|
10138 |
||
10139 |
#: en/help_topics/configuration.txt:250
|
|
10140 |
msgid "" |
|
10141 |
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
|
|
10142 |
" [/home/jdoe/branches/]"
|
|
10143 |
msgstr "" |
|
10144 |
||
10145 |
#: en/help_topics/configuration.txt:253
|
|
10146 |
msgid "" |
|
10147 |
"\n"
|
|
10148 |
"Section options\n"
|
|
10149 |
"^^^^^^^^^^^^^^^"
|
|
10150 |
msgstr "" |
|
10151 |
||
10152 |
#: en/help_topics/configuration.txt:257
|
|
10153 |
msgid "" |
|
10154 |
"A section option resides within a section. A section option contains an\n"
|
|
10155 |
"option name, an equals sign and a value. For example::"
|
|
10156 |
msgstr "" |
|
10157 |
||
10158 |
#: en/help_topics/configuration.txt:260
|
|
10159 |
msgid "" |
|
10160 |
" email = John Doe <jdoe@isp.com>\n"
|
|
10161 |
" gpg_signing_key = Amy Pond <amy@example.com>"
|
|
10162 |
msgstr "" |
|
10163 |
||
10164 |
#: en/help_topics/configuration.txt:263
|
|
10165 |
msgid "" |
|
10166 |
"A option can reference other options by enclosing them in curly brackets::"
|
|
10167 |
msgstr "" |
|
10168 |
||
10169 |
#: en/help_topics/configuration.txt:265
|
|
10170 |
msgid "" |
|
10171 |
" my_branch_name = feature_x\n"
|
|
10172 |
" my_server = bzr+ssh://example.com\n"
|
|
10173 |
" push_location = {my_server}/project/{my_branch_name}"
|
|
10174 |
msgstr "" |
|
10175 |
||
10176 |
#: en/help_topics/configuration.txt:269
|
|
10177 |
msgid "" |
|
10178 |
"Option policies\n"
|
|
10179 |
"^^^^^^^^^^^^^^^"
|
|
10180 |
msgstr "" |
|
10181 |
||
10182 |
#: en/help_topics/configuration.txt:272
|
|
10183 |
msgid "" |
|
10184 |
"Options defined in a section affect the named directory or URL plus\n"
|
|
10185 |
"any locations they contain. Policies can be used to change how an\n"
|
|
10186 |
"option value is interpreted for contained locations. Currently\n"
|
|
10187 |
"there are three policies available:"
|
|
10188 |
msgstr "" |
|
10189 |
||
10190 |
#: en/help_topics/configuration.txt:277
|
|
10191 |
msgid "" |
|
10192 |
" none:\n"
|
|
10193 |
" the value is interpreted the same for contained locations. This is\n"
|
|
10194 |
" the default behaviour.\n"
|
|
10195 |
" norecurse:\n"
|
|
10196 |
" the value is only used for the exact location specified by the\n"
|
|
10197 |
" section name.\n"
|
|
10198 |
" appendpath:\n"
|
|
10199 |
" for contained locations, any additional path components are\n"
|
|
10200 |
" appended to the value."
|
|
10201 |
msgstr "" |
|
10202 |
||
10203 |
#: en/help_topics/configuration.txt:287
|
|
10204 |
msgid "" |
|
10205 |
"Policies are specified by keys with names of the form "
|
|
10206 |
"\"<option_name>:policy\".\n"
|
|
10207 |
"For example, to define the push location for a tree of branches, the\n"
|
|
10208 |
"following could be used::"
|
|
10209 |
msgstr "" |
|
10210 |
||
10211 |
#: en/help_topics/configuration.txt:291
|
|
10212 |
msgid "" |
|
10213 |
" [/top/location]\n"
|
|
10214 |
" push_location = sftp://example.com/location\n"
|
|
10215 |
" push_location:policy = appendpath"
|
|
10216 |
msgstr "" |
|
10217 |
||
10218 |
#: en/help_topics/configuration.txt:295
|
|
10219 |
msgid "" |
|
10220 |
"With this configuration, the push location for ``/top/location/branch1``\n"
|
|
10221 |
"would be ``sftp://example.com/location/branch1``."
|
|
10222 |
msgstr "" |
|
10223 |
||
10224 |
#: en/help_topics/configuration.txt:298
|
|
10225 |
msgid "" |
|
10226 |
"Section local options\n"
|
|
10227 |
"^^^^^^^^^^^^^^^^^^^^^"
|
|
10228 |
msgstr "" |
|
10229 |
||
10230 |
#: en/help_topics/configuration.txt:301
|
|
10231 |
msgid "" |
|
10232 |
"Some options are defined automatically inside a given section and can be\n"
|
|
10233 |
"refered to in this section only. "
|
|
10234 |
msgstr "" |
|
10235 |
||
10236 |
#: en/help_topics/configuration.txt:304
|
|
10237 |
msgid "For example, the ``appendpath`` policy can be used like this::" |
|
10238 |
msgstr "" |
|
10239 |
||
10240 |
#: en/help_topics/configuration.txt:306
|
|
10241 |
msgid "" |
|
10242 |
" [/home/vila/src/bzr/bugs]\n"
|
|
10243 |
" mypush = lp:~vila/bzr\n"
|
|
10244 |
" mypush:policy=appendpath"
|
|
10245 |
msgstr "" |
|
10246 |
||
10247 |
#: en/help_topics/configuration.txt:310
|
|
10248 |
msgid "Using ``relpath`` to achieve the same result is done like this::" |
|
10249 |
msgstr "" |
|
10250 |
||
10251 |
#: en/help_topics/configuration.txt:312
|
|
10252 |
msgid "" |
|
10253 |
" [/home/vila/src/bzr/bugs]\n"
|
|
10254 |
" mypush = lp:~vila/bzr/{relpath}"
|
|
10255 |
msgstr "" |
|
10256 |
||
10257 |
#: en/help_topics/configuration.txt:315
|
|
10258 |
msgid "" |
|
10259 |
"In both cases, when used in a directory like\n"
|
|
10260 |
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
|
|
10261 |
msgstr "" |
|
10262 |
||
10263 |
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
|
|
10264 |
msgid "" |
|
10265 |
" $ bzr config mypush\n"
|
|
10266 |
" lp:~vila/bzr/832013-expand-in-stack"
|
|
10267 |
msgstr "" |
|
10268 |
||
10269 |
#: en/help_topics/configuration.txt:321
|
|
10270 |
msgid "Another such option is ``basename`` which can be used like this::" |
|
10271 |
msgstr "" |
|
10272 |
||
10273 |
#: en/help_topics/configuration.txt:323
|
|
10274 |
msgid "" |
|
10275 |
" [/home/vila/src/bzr]\n"
|
|
10276 |
" mypush = lp:~vila/bzr/{basename}"
|
|
10277 |
msgstr "" |
|
10278 |
||
10279 |
#: en/help_topics/configuration.txt:326
|
|
10280 |
msgid "" |
|
10281 |
"When used in a directory like\n"
|
|
10282 |
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
|
|
10283 |
msgstr "" |
|
10284 |
||
10285 |
#: en/help_topics/configuration.txt:332
|
|
10286 |
msgid "" |
|
10287 |
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
|
|
10288 |
"itself is defined as the relative path between the section name and the\n"
|
|
10289 |
"location it matches."
|
|
10290 |
msgstr "" |
|
10291 |
||
10292 |
#: en/help_topics/configuration.txt:336
|
|
10293 |
msgid "" |
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10294 |
"Another such option is ``branchname``, which refers to the name of a "
|
10295 |
"colocated\n"
|
|
10296 |
"branch. For non-colocated branches, it behaves like basename. It can be "
|
|
10297 |
"used\n"
|
|
10298 |
"like this::"
|
|
10299 |
msgstr "" |
|
10300 |
||
10301 |
#: en/help_topics/configuration.txt:340
|
|
10302 |
msgid "" |
|
10303 |
" [/home/vila/src/bzr/bugs]\n"
|
|
10304 |
" mypush = lp:~vila/bzr/{branchname}"
|
|
10305 |
msgstr "" |
|
10306 |
||
10307 |
#: en/help_topics/configuration.txt:343
|
|
10308 |
msgid "" |
|
10309 |
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
|
|
10310 |
"get::" |
|
10311 |
msgstr "" |
|
10312 |
||
10313 |
#: en/help_topics/configuration.txt:345
|
|
10314 |
msgid "" |
|
10315 |
" bzr config mypush\n"
|
|
10316 |
" lp:~vila/bzr/832013-expand-in-stack"
|
|
10317 |
msgstr "" |
|
10318 |
||
10319 |
#: en/help_topics/configuration.txt:348
|
|
10320 |
msgid "" |
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10321 |
"When an option is local to a Section, it cannot be referred to from option\n"
|
10322 |
"values in any other section from the same ``Store`` nor from any other\n"
|
|
10323 |
"``Store``."
|
|
10324 |
msgstr "" |
|
10325 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10326 |
#: en/help_topics/configuration.txt:352
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10327 |
msgid "" |
10328 |
"\n"
|
|
10329 |
"The main configuration file, bazaar.conf\n"
|
|
10330 |
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
|
10331 |
msgstr "" |
|
10332 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10333 |
#: en/help_topics/configuration.txt:356
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10334 |
msgid "" |
10335 |
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
|
|
10336 |
"The default section contains the default\n"
|
|
10337 |
"configuration options for all branches. The default section can be\n"
|
|
10338 |
"overriden by providing a branch-specific section in ``locations.conf``."
|
|
10339 |
msgstr "" |
|
10340 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10341 |
#: en/help_topics/configuration.txt:361
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10342 |
msgid "A typical ``bazaar.conf`` section often looks like the following::" |
10343 |
msgstr "" |
|
10344 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10345 |
#: en/help_topics/configuration.txt:363
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10346 |
msgid "" |
10347 |
" [DEFAULT]\n"
|
|
10348 |
" email = John Doe <jdoe@isp.com>\n"
|
|
10349 |
" editor = /usr/bin/vim\n"
|
|
10350 |
" create_signatures = when-required"
|
|
10351 |
msgstr "" |
|
10352 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10353 |
#: en/help_topics/configuration.txt:368
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10354 |
msgid "" |
10355 |
"\n"
|
|
10356 |
"The branch location configuration file, locations.conf\n"
|
|
10357 |
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
|
10358 |
msgstr "" |
|
10359 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10360 |
#: en/help_topics/configuration.txt:372
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10361 |
msgid "" |
10362 |
"``locations.conf`` allows one to specify overriding settings for\n"
|
|
10363 |
"a specific branch. The format is almost identical to the default section in\n"
|
|
10364 |
"bazaar.conf with one significant change: The section header, instead of "
|
|
10365 |
"saying\n"
|
|
10366 |
"default, will be the path to a branch that you wish to override a value\n"
|
|
10367 |
"for. The '?' and '*' wildcards are supported::"
|
|
10368 |
msgstr "" |
|
10369 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10370 |
#: en/help_topics/configuration.txt:378
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10371 |
msgid "" |
10372 |
" [/home/jdoe/branches/nethack]\n"
|
|
10373 |
" email = Nethack Admin <nethack@nethack.com>"
|
|
10374 |
msgstr "" |
|
10375 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10376 |
#: en/help_topics/configuration.txt:381
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10377 |
msgid "" |
10378 |
" [http://hypothetical.site.com/branches/devel-branch]\n"
|
|
10379 |
" create_signatures = always"
|
|
10380 |
msgstr "" |
|
10381 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10382 |
#: en/help_topics/configuration.txt:384
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10383 |
msgid "" |
10384 |
"The authentication configuration file, authentication.conf\n"
|
|
10385 |
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
|
10386 |
msgstr "" |
|
10387 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10388 |
#: en/help_topics/configuration.txt:387
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10389 |
msgid "" |
10390 |
"``authentication.conf`` allows one to specify credentials for\n"
|
|
10391 |
"remote servers. This can be used for all the supported transports and any "
|
|
10392 |
"part\n"
|
|
10393 |
"of bzr that requires authentication (smtp for example)."
|
|
10394 |
msgstr "" |
|
10395 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10396 |
#: en/help_topics/configuration.txt:391
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10397 |
msgid "" |
10398 |
"The syntax of the file obeys the same rules as the others except for the\n"
|
|
10399 |
"option policies which don't apply."
|
|
10400 |
msgstr "" |
|
10401 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10402 |
#: en/help_topics/configuration.txt:394
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10403 |
msgid "" |
10404 |
"For more information on the possible uses of the authentication "
|
|
10405 |
"configuration\n"
|
|
10406 |
"file see :doc:`authentication-help`."
|
|
10407 |
msgstr "" |
|
10408 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10409 |
#: en/help_topics/configuration.txt:397
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10410 |
msgid "" |
10411 |
"\n"
|
|
10412 |
"Common options\n"
|
|
10413 |
"--------------"
|
|
10414 |
msgstr "" |
|
10415 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10416 |
#: en/help_topics/configuration.txt:401
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10417 |
msgid "" |
10418 |
"debug_flags\n"
|
|
10419 |
"~~~~~~~~~~~"
|
|
10420 |
msgstr "" |
|
10421 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10422 |
#: en/help_topics/configuration.txt:404
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10423 |
msgid "" |
10424 |
"A comma-separated list of debugging options to turn on. The same values\n"
|
|
10425 |
"can be used as with the -D command-line option (see `help global-options`).\n"
|
|
10426 |
"For example::"
|
|
10427 |
msgstr "" |
|
10428 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10429 |
#: en/help_topics/configuration.txt:408
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10430 |
msgid " debug_flags = hpss" |
10431 |
msgstr "" |
|
10432 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10433 |
#: en/help_topics/configuration.txt:412
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10434 |
msgid " debug_flags = hpss,evil" |
10435 |
msgstr "" |
|
10436 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10437 |
#: en/help_topics/configuration.txt:414
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10438 |
msgid "" |
10439 |
"email\n"
|
|
10440 |
"~~~~~"
|
|
10441 |
msgstr "" |
|
10442 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10443 |
#: en/help_topics/configuration.txt:417
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10444 |
msgid "" |
10445 |
"The email address to use when committing a branch. Typically takes the form\n"
|
|
10446 |
"of::" |
|
10447 |
msgstr "" |
|
10448 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10449 |
#: en/help_topics/configuration.txt:420
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10450 |
msgid " email = Full Name <account@hostname.tld>" |
10451 |
msgstr "" |
|
10452 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10453 |
#: en/help_topics/configuration.txt:422
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10454 |
msgid "" |
10455 |
"editor\n"
|
|
10456 |
"~~~~~~"
|
|
10457 |
msgstr "" |
|
10458 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10459 |
#: en/help_topics/configuration.txt:425
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10460 |
msgid "" |
10461 |
"The path of the editor that you wish to use if *bzr commit* is run without\n"
|
|
10462 |
"a commit message. This setting is trumped by the environment variable\n"
|
|
10463 |
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
|
|
10464 |
"variables."
|
|
10465 |
msgstr "" |
|
10466 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10467 |
#: en/help_topics/configuration.txt:430
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10468 |
msgid "" |
10469 |
"log_format\n"
|
|
10470 |
"~~~~~~~~~~"
|
|
10471 |
msgstr "" |
|
10472 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10473 |
#: en/help_topics/configuration.txt:433
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10474 |
msgid "" |
10475 |
"The default log format to use. Standard log formats are ``long``, ``short``\n"
|
|
10476 |
"and ``line``. Additional formats may be provided by plugins. The default\n"
|
|
10477 |
"value is ``long``."
|
|
10478 |
msgstr "" |
|
10479 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10480 |
#: en/help_topics/configuration.txt:437
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10481 |
msgid "" |
10482 |
"check_signatures\n"
|
|
10483 |
"~~~~~~~~~~~~~~~~"
|
|
10484 |
msgstr "" |
|
10485 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10486 |
#: en/help_topics/configuration.txt:440
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10487 |
msgid "" |
10488 |
"Reserved for future use. These options will allow a policy for branches to\n"
|
|
10489 |
"require signatures."
|
|
10490 |
msgstr "" |
|
10491 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10492 |
#: en/help_topics/configuration.txt:443
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10493 |
msgid "" |
10494 |
"require\n"
|
|
10495 |
" The gnupg signature for revisions must be present and must be valid."
|
|
10496 |
msgstr "" |
|
10497 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10498 |
#: en/help_topics/configuration.txt:446
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10499 |
msgid "" |
10500 |
"ignore\n"
|
|
10501 |
" Do not check gnupg signatures of revisions."
|
|
10502 |
msgstr "" |
|
10503 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10504 |
#: en/help_topics/configuration.txt:449
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10505 |
msgid "" |
10506 |
"check-available\n"
|
|
10507 |
" (default) If gnupg signatures for revisions are present, check them.\n"
|
|
10508 |
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
|
|
10509 |
" no signature is present."
|
|
10510 |
msgstr "" |
|
10511 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10512 |
#: en/help_topics/configuration.txt:454
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10513 |
msgid "" |
10514 |
"create_signatures\n"
|
|
10515 |
"~~~~~~~~~~~~~~~~~"
|
|
10516 |
msgstr "" |
|
10517 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10518 |
#: en/help_topics/configuration.txt:457
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10519 |
msgid "" |
10520 |
"Defines the behaviour of signing revisions on commits. By default bzr will "
|
|
10521 |
"not\n"
|
|
10522 |
"sign new commits."
|
|
10523 |
msgstr "" |
|
10524 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10525 |
#: en/help_topics/configuration.txt:460
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10526 |
msgid "" |
10527 |
"always\n"
|
|
10528 |
" Sign every new revision that is committed. If the signing fails then "
|
|
10529 |
"the\n"
|
|
10530 |
" commit will not be made."
|
|
10531 |
msgstr "" |
|
10532 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10533 |
#: en/help_topics/configuration.txt:464
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10534 |
msgid "" |
10535 |
"when-required\n"
|
|
10536 |
" Reserved for future use."
|
|
10537 |
msgstr "" |
|
10538 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10539 |
#: en/help_topics/configuration.txt:467
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10540 |
msgid "" |
10541 |
"never\n"
|
|
10542 |
" Reserved for future use."
|
|
10543 |
msgstr "" |
|
10544 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10545 |
#: en/help_topics/configuration.txt:470
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10546 |
msgid "" |
10547 |
"In future it is planned that ``when-required`` will sign newly\n"
|
|
10548 |
"committed revisions only when the branch requires them. ``never`` will "
|
|
10549 |
"refuse\n"
|
|
10550 |
"to sign newly committed revisions, even if the branch requires signatures."
|
|
10551 |
msgstr "" |
|
10552 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10553 |
#: en/help_topics/configuration.txt:474
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10554 |
msgid "" |
10555 |
"dirstate.fdatasync\n"
|
|
10556 |
"~~~~~~~~~~~~~~~~~~"
|
|
10557 |
msgstr "" |
|
10558 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10559 |
#: en/help_topics/configuration.txt:477
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10560 |
msgid "" |
10561 |
"If true (default), working tree metadata changes are flushed through the\n"
|
|
10562 |
"OS buffers to physical disk. This is somewhat slower, but means data\n"
|
|
10563 |
"should not be lost if the machine crashes. See also repository.fdatasync."
|
|
10564 |
msgstr "" |
|
10565 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10566 |
#: en/help_topics/configuration.txt:481
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10567 |
msgid "" |
10568 |
"gpg_signing_key\n"
|
|
10569 |
"~~~~~~~~~~~~~~~"
|
|
10570 |
msgstr "" |
|
10571 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10572 |
#: en/help_topics/configuration.txt:484
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10573 |
msgid "" |
10574 |
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
|
|
10575 |
"address, key fingerprint or full key ID. When unset or when set to\n"
|
|
10576 |
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
|
|
10577 |
msgstr "" |
|
10578 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10579 |
#: en/help_topics/configuration.txt:488
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10580 |
msgid "" |
10581 |
"recurse\n"
|
|
10582 |
"~~~~~~~"
|
|
10583 |
msgstr "" |
|
10584 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10585 |
#: en/help_topics/configuration.txt:491
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10586 |
msgid "" |
10587 |
"Only useful in ``locations.conf``. Defines whether or not the\n"
|
|
10588 |
"configuration for this section applies to subdirectories:"
|
|
10589 |
msgstr "" |
|
10590 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10591 |
#: en/help_topics/configuration.txt:494
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10592 |
msgid "" |
10593 |
"true\n"
|
|
10594 |
" (default) This section applies to subdirectories as well."
|
|
10595 |
msgstr "" |
|
10596 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10597 |
#: en/help_topics/configuration.txt:497
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10598 |
msgid "" |
10599 |
"false\n"
|
|
10600 |
" This section only applies to the branch at this directory and not\n"
|
|
10601 |
" branches below it."
|
|
10602 |
msgstr "" |
|
10603 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10604 |
#: en/help_topics/configuration.txt:501
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10605 |
msgid "" |
10606 |
"gpg_signing_command\n"
|
|
10607 |
"~~~~~~~~~~~~~~~~~~~"
|
|
10608 |
msgstr "" |
|
10609 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10610 |
#: en/help_topics/configuration.txt:504
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10611 |
msgid "" |
10612 |
"(Default: \"gpg\"). Which program should be used to sign and check "
|
|
10613 |
"revisions.\n"
|
|
10614 |
"For example::"
|
|
10615 |
msgstr "" |
|
10616 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10617 |
#: en/help_topics/configuration.txt:507
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10618 |
msgid " gpg_signing_command = /usr/bin/gnpg" |
10619 |
msgstr "" |
|
10620 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10621 |
#: en/help_topics/configuration.txt:509
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10622 |
msgid "" |
10623 |
"The specified command must accept the options \"--clearsign\" and \"-u "
|
|
10624 |
"<email>\"."
|
|
10625 |
msgstr "" |
|
10626 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10627 |
#: en/help_topics/configuration.txt:511
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10628 |
msgid "" |
10629 |
"bzr_remote_path\n"
|
|
10630 |
"~~~~~~~~~~~~~~~"
|
|
10631 |
msgstr "" |
|
10632 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10633 |
#: en/help_topics/configuration.txt:514
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10634 |
msgid "" |
10635 |
"(Default: \"bzr\"). The path to the command that should be used to run the "
|
|
10636 |
"smart\n"
|
|
10637 |
"server for bzr. This value may only be specified in locations.conf, because:"
|
|
10638 |
msgstr "" |
|
10639 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10640 |
#: en/help_topics/configuration.txt:517
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10641 |
msgid "" |
10642 |
"- it's needed before branch.conf is accessible\n"
|
|
10643 |
"- allowing remote branch.conf files to specify commands would be a security\n"
|
|
10644 |
" risk"
|
|
10645 |
msgstr "" |
|
10646 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10647 |
#: en/help_topics/configuration.txt:521
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10648 |
msgid "It is overridden by the BZR_REMOTE_PATH environment variable." |
10649 |
msgstr "" |
|
10650 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10651 |
#: en/help_topics/configuration.txt:523
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10652 |
msgid "" |
10653 |
"smtp_server\n"
|
|
10654 |
"~~~~~~~~~~~"
|
|
10655 |
msgstr "" |
|
10656 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10657 |
#: en/help_topics/configuration.txt:526
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10658 |
msgid "" |
10659 |
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
|
|
10660 |
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
|
|
10661 |
msgstr "" |
|
10662 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10663 |
#: en/help_topics/configuration.txt:529
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10664 |
msgid "" |
10665 |
"smtp_username, smtp_password\n"
|
|
10666 |
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
|
10667 |
msgstr "" |
|
10668 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10669 |
#: en/help_topics/configuration.txt:532
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10670 |
msgid "" |
10671 |
"User and password to authenticate to the SMTP server. If smtp_username\n"
|
|
10672 |
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
|
|
10673 |
"These settings are only needed if the SMTP server requires authentication\n"
|
|
10674 |
"to send mail."
|
|
10675 |
msgstr "" |
|
10676 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10677 |
#: en/help_topics/configuration.txt:537
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10678 |
msgid "" |
10679 |
"locks.steal_dead\n"
|
|
10680 |
"~~~~~~~~~~~~~~~~"
|
|
10681 |
msgstr "" |
|
10682 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10683 |
#: en/help_topics/configuration.txt:540
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10684 |
msgid "" |
10685 |
"If set to true, bzr will automatically break locks held by processes from\n"
|
|
10686 |
"the same machine and user that are no longer alive. Otherwise, it will\n"
|
|
10687 |
"print a message and you can break the lock manually, if you are satisfied\n"
|
|
10688 |
"the object is no longer in use."
|
|
10689 |
msgstr "" |
|
10690 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10691 |
#: en/help_topics/configuration.txt:545
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10692 |
msgid "" |
10693 |
"mail_client\n"
|
|
10694 |
"~~~~~~~~~~~"
|
|
10695 |
msgstr "" |
|
10696 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10697 |
#: en/help_topics/configuration.txt:548
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10698 |
msgid "" |
10699 |
"A mail client to use for sending merge requests.\n"
|
|
10700 |
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
|
|
10701 |
"it\n"
|
|
10702 |
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
|
|
10703 |
"``editor``."
|
|
10704 |
msgstr "" |
|
10705 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10706 |
#: en/help_topics/configuration.txt:553
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10707 |
msgid "Supported values for specific clients:" |
10708 |
msgstr "" |
|
10709 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10710 |
#: en/help_topics/configuration.txt:555
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10711 |
msgid "" |
10712 |
":claws: Use Claws. This skips a dialog for attaching files.\n"
|
|
10713 |
":evolution: Use Evolution.\n"
|
|
10714 |
":kmail: Use KMail.\n"
|
|
10715 |
":mutt: Use Mutt.\n"
|
|
10716 |
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
|
|
10717 |
"1.5,\n"
|
|
10718 |
" this works around some bugs that xdg-email doesn't handle."
|
|
10719 |
msgstr "" |
|
10720 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10721 |
#: en/help_topics/configuration.txt:562
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10722 |
msgid "Supported generic values are:" |
10723 |
msgstr "" |
|
10724 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10725 |
#: en/help_topics/configuration.txt:564
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10726 |
msgid "" |
10727 |
":default: See above.\n"
|
|
10728 |
":editor: Use your editor to compose the merge request. This also uses\n"
|
|
10729 |
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
|
|
10730 |
" smtp_username and smtp_password.\n"
|
|
10731 |
":mapi: Use your preferred e-mail client on Windows.\n"
|
|
10732 |
":xdg-email: Use xdg-email to run your preferred mail program"
|
|
10733 |
msgstr "" |
|
10734 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10735 |
#: en/help_topics/configuration.txt:571
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10736 |
msgid "" |
10737 |
"repository.fdatasync\n"
|
|
10738 |
"~~~~~~~~~~~~~~~~~~~~"
|
|
10739 |
msgstr "" |
|
10740 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10741 |
#: en/help_topics/configuration.txt:574
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10742 |
msgid "" |
10743 |
"If true (default), repository changes are flushed through the OS buffers\n"
|
|
10744 |
"to physical disk. This is somewhat slower, but means data should not be\n"
|
|
10745 |
"lost if the machine crashes. See also dirstate.fdatasync."
|
|
10746 |
msgstr "" |
|
10747 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10748 |
#: en/help_topics/configuration.txt:578
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10749 |
msgid "" |
10750 |
"submit_branch\n"
|
|
10751 |
"~~~~~~~~~~~~~"
|
|
10752 |
msgstr "" |
|
10753 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10754 |
#: en/help_topics/configuration.txt:581
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10755 |
msgid "" |
10756 |
"The branch you intend to submit your current work to. This is "
|
|
10757 |
"automatically\n"
|
|
10758 |
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
|
|
10759 |
"This\n"
|
|
10760 |
"should usually be set on a per-branch or per-location basis."
|
|
10761 |
msgstr "" |
|
10762 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10763 |
#: en/help_topics/configuration.txt:585
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10764 |
msgid "" |
10765 |
"public_branch\n"
|
|
10766 |
"~~~~~~~~~~~~~"
|
|
10767 |
msgstr "" |
|
10768 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10769 |
#: en/help_topics/configuration.txt:588
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10770 |
msgid "" |
10771 |
"A publically-accessible version of this branch (implying that this version "
|
|
10772 |
"is\n"
|
|
10773 |
"not publically-accessible). Used (and set) by ``bzr send``."
|
|
10774 |
msgstr "" |
|
10775 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10776 |
#: en/help_topics/configuration.txt:591
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10777 |
msgid "" |
10778 |
"suppress_warnings\n"
|
|
10779 |
"~~~~~~~~~~~~~~~~~"
|
|
10780 |
msgstr "" |
|
10781 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10782 |
#: en/help_topics/configuration.txt:594
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10783 |
msgid "" |
10784 |
"A list of strings, each string represent a warning that can be emitted by\n"
|
|
10785 |
"bzr. Mentioning a warning in this list tells bzr to not emit it."
|
|
10786 |
msgstr "" |
|
10787 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10788 |
#: en/help_topics/configuration.txt:597
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10789 |
msgid "Valid values:" |
10790 |
msgstr "" |
|
10791 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10792 |
#: en/help_topics/configuration.txt:599
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10793 |
msgid "" |
10794 |
"* ``format_deprecation``:\n"
|
|
10795 |
" whether the format deprecation warning is shown on repositories that "
|
|
10796 |
"are\n"
|
|
10797 |
" using deprecated formats."
|
|
10798 |
msgstr "" |
|
10799 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10800 |
#: en/help_topics/configuration.txt:603
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10801 |
msgid "" |
10802 |
"default_format\n"
|
|
10803 |
"~~~~~~~~~~~~~~"
|
|
10804 |
msgstr "" |
|
10805 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10806 |
#: en/help_topics/configuration.txt:606
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10807 |
msgid "" |
10808 |
"A format name for the default format used when creating branches. See "
|
|
10809 |
"``bzr\n"
|
|
10810 |
"help formats`` for possible values."
|
|
10811 |
msgstr "" |
|
10812 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10813 |
#: en/help_topics/configuration.txt:609
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10814 |
msgid "" |
10815 |
"\n"
|
|
10816 |
"Unicode options\n"
|
|
10817 |
"---------------"
|
|
10818 |
msgstr "" |
|
10819 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10820 |
#: en/help_topics/configuration.txt:613
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10821 |
msgid "" |
10822 |
"output_encoding\n"
|
|
10823 |
"~~~~~~~~~~~~~~~"
|
|
10824 |
msgstr "" |
|
10825 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10826 |
#: en/help_topics/configuration.txt:616
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10827 |
msgid "" |
10828 |
"A Python unicode encoding name for text output from bzr, such as log\n"
|
|
10829 |
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
|
|
10830 |
"is the terminal encoding prefered by the operating system."
|
|
10831 |
msgstr "" |
|
10832 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10833 |
#: en/help_topics/configuration.txt:620
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10834 |
msgid "" |
10835 |
"\n"
|
|
10836 |
"Branch type specific options\n"
|
|
10837 |
"----------------------------"
|
|
10838 |
msgstr "" |
|
10839 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10840 |
#: en/help_topics/configuration.txt:624
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10841 |
msgid "" |
10842 |
"These options apply only to branches that use the ``dirstate-tags`` or\n"
|
|
10843 |
"later format. They\n"
|
|
10844 |
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
|
|
10845 |
"manually set in ``locations.conf`` or ``bazaar.conf``."
|
|
10846 |
msgstr "" |
|
10847 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10848 |
#: en/help_topics/configuration.txt:629
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10849 |
msgid "" |
10850 |
"append_revisions_only\n"
|
|
10851 |
"~~~~~~~~~~~~~~~~~~~~~"
|
|
10852 |
msgstr "" |
|
10853 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10854 |
#: en/help_topics/configuration.txt:632
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10855 |
msgid "" |
10856 |
"If set to \"True\" then revisions can only be appended to the log, not\n"
|
|
10857 |
"removed. A branch with this setting enabled can only pull from another\n"
|
|
10858 |
"branch if the other branch's log is a longer version of its own. This is\n"
|
|
10859 |
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
|
|
10860 |
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
|
|
10861 |
"compatibility with previous bzr versions (older than 2.2)."
|
|
10862 |
msgstr "" |
|
10863 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10864 |
#: en/help_topics/configuration.txt:639
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10865 |
msgid "" |
10866 |
"parent_location\n"
|
|
10867 |
"~~~~~~~~~~~~~~~"
|
|
10868 |
msgstr "" |
|
10869 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10870 |
#: en/help_topics/configuration.txt:642
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10871 |
msgid "" |
10872 |
"If present, the location of the default branch for pull or merge. This "
|
|
10873 |
"option\n"
|
|
10874 |
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
|
|
10875 |
"--remember``."
|
|
10876 |
msgstr "" |
|
10877 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10878 |
#: en/help_topics/configuration.txt:646
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10879 |
msgid "" |
10880 |
"push_location\n"
|
|
10881 |
"~~~~~~~~~~~~~"
|
|
10882 |
msgstr "" |
|
10883 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10884 |
#: en/help_topics/configuration.txt:649
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10885 |
msgid "" |
10886 |
"If present, the location of the default branch for push. This option\n"
|
|
10887 |
"is normally set by the first ``push`` or ``push --remember``."
|
|
10888 |
msgstr "" |
|
10889 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10890 |
#: en/help_topics/configuration.txt:652
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10891 |
msgid "" |
10892 |
"push_strict\n"
|
|
10893 |
"~~~~~~~~~~~"
|
|
10894 |
msgstr "" |
|
10895 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10896 |
#: en/help_topics/configuration.txt:655
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10897 |
msgid "" |
10898 |
"If present, defines the ``--strict`` option default value for checking\n"
|
|
10899 |
"uncommitted changes before pushing."
|
|
10900 |
msgstr "" |
|
10901 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10902 |
#: en/help_topics/configuration.txt:658
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10903 |
msgid "" |
10904 |
"dpush_strict\n"
|
|
10905 |
"~~~~~~~~~~~~"
|
|
10906 |
msgstr "" |
|
10907 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10908 |
#: en/help_topics/configuration.txt:661
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10909 |
msgid "" |
10910 |
"If present, defines the ``--strict`` option default value for checking\n"
|
|
10911 |
"uncommitted changes before pushing into a different VCS without any\n"
|
|
10912 |
"custom bzr metadata."
|
|
10913 |
msgstr "" |
|
10914 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10915 |
#: en/help_topics/configuration.txt:665
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10916 |
msgid "" |
10917 |
"bound_location\n"
|
|
10918 |
"~~~~~~~~~~~~~~"
|
|
10919 |
msgstr "" |
|
10920 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10921 |
#: en/help_topics/configuration.txt:668
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10922 |
msgid "" |
10923 |
"The location that commits should go to when acting as a checkout.\n"
|
|
10924 |
"This option is normally set by ``bind``."
|
|
10925 |
msgstr "" |
|
10926 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10927 |
#: en/help_topics/configuration.txt:671
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10928 |
msgid "" |
10929 |
"bound\n"
|
|
10930 |
"~~~~~"
|
|
10931 |
msgstr "" |
|
10932 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10933 |
#: en/help_topics/configuration.txt:674
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10934 |
msgid "" |
10935 |
"If set to \"True\", the branch should act as a checkout, and push each "
|
|
10936 |
"commit to\n"
|
|
10937 |
"the bound_location. This option is normally set by ``bind``/``unbind``."
|
|
10938 |
msgstr "" |
|
10939 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10940 |
#: en/help_topics/configuration.txt:677
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10941 |
msgid "" |
10942 |
"send_strict\n"
|
|
10943 |
"~~~~~~~~~~~"
|
|
10944 |
msgstr "" |
|
10945 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10946 |
#: en/help_topics/configuration.txt:680
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10947 |
msgid "" |
10948 |
"If present, defines the ``--strict`` option default value for checking\n"
|
|
10949 |
"uncommitted changes before sending a merge directive."
|
|
10950 |
msgstr "" |
|
10951 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10952 |
#: en/help_topics/configuration.txt:683
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10953 |
msgid "" |
10954 |
"add.maximum_file_size\n"
|
|
10955 |
"~~~~~~~~~~~~~~~~~~~~~"
|
|
10956 |
msgstr "" |
|
10957 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10958 |
#: en/help_topics/configuration.txt:686
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10959 |
msgid "" |
10960 |
"Defines the maximum file size the command line \"add\" operation will allow\n"
|
|
10961 |
"in recursive mode, with files larger than this value being skipped. You may "
|
|
10962 |
"\n"
|
|
10963 |
"specify this value as an integer (in which case it is interpreted as bytes), "
|
|
10964 |
"\n"
|
|
10965 |
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
|
|
10966 |
"0 \n"
|
|
10967 |
"will disable skipping."
|
|
10968 |
msgstr "" |
|
10969 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10970 |
#: en/help_topics/configuration.txt:692
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10971 |
msgid "" |
10972 |
"External Merge Tools\n"
|
|
10973 |
"--------------------"
|
|
10974 |
msgstr "" |
|
10975 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10976 |
#: en/help_topics/configuration.txt:695
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10977 |
msgid "" |
10978 |
"bzr.mergetool.<name>\n"
|
|
10979 |
"~~~~~~~~~~~~~~~~~~~~"
|
|
10980 |
msgstr "" |
|
10981 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10982 |
#: en/help_topics/configuration.txt:698
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10983 |
msgid "" |
10984 |
"Defines an external merge tool called <name> with the given command-line.\n"
|
|
10985 |
"Arguments containing spaces should be quoted using single or double quotes. "
|
|
10986 |
"The\n"
|
|
10987 |
"executable may omit its path if it can be found on the PATH."
|
|
10988 |
msgstr "" |
|
10989 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10990 |
#: en/help_topics/configuration.txt:702
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10991 |
msgid "" |
10992 |
"The following markers can be used in the command-line to substitute "
|
|
10993 |
"filenames\n"
|
|
10994 |
"involved in the merge conflict::"
|
|
10995 |
msgstr "" |
|
10996 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10997 |
#: en/help_topics/configuration.txt:705
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
10998 |
msgid "" |
10999 |
" {base} file.BASE\n"
|
|
11000 |
" {this} file.THIS\n"
|
|
11001 |
" {other} file.OTHER\n"
|
|
11002 |
" {result} output file\n"
|
|
11003 |
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
|
|
11004 |
"merge\n"
|
|
11005 |
" succeeds."
|
|
11006 |
msgstr "" |
|
11007 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
11008 |
#: en/help_topics/configuration.txt:714
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
11009 |
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}" |
11010 |
msgstr "" |
|
11011 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
11012 |
#: en/help_topics/configuration.txt:716
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
11013 |
msgid "" |
11014 |
"bzr.default_mergetool\n"
|
|
11015 |
"~~~~~~~~~~~~~~~~~~~~~"
|
|
11016 |
msgstr "" |
|
11017 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
11018 |
#: en/help_topics/configuration.txt:719
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
11019 |
msgid "" |
11020 |
"Specifies which external merge tool (as defined above) should be selected "
|
|
11021 |
"by\n"
|
|
11022 |
"default in tools such as ``bzr qconflicts``."
|
|
11023 |
msgstr "" |
|
11024 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
11025 |
#: en/help_topics/configuration.txt:724
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
11026 |
msgid " bzr.default_mergetool = kdiff3\n" |
11027 |
msgstr "" |
|
11028 |
||
11029 |
#: en/help_topics/conflict-types.txt:1
|
|
11030 |
msgid "" |
|
11031 |
"Conflict Types\n"
|
|
11032 |
"=============="
|
|
11033 |
msgstr "" |
|
11034 |
||
11035 |
#: en/help_topics/conflict-types.txt:4
|
|
11036 |
msgid "" |
|
11037 |
"Some operations, like merge, revert and pull, modify the contents of your\n"
|
|
11038 |
"working tree. These modifications are programmatically generated, and so "
|
|
11039 |
"they\n"
|
|
11040 |
"may conflict with the current state of your working tree. "
|
|
11041 |
msgstr "" |
|
11042 |
||
11043 |
#: en/help_topics/conflict-types.txt:8
|
|
11044 |
msgid "" |
|
11045 |
"When conflicts are present in your working tree (as shown by ``bzr\n"
|
|
11046 |
"conflicts``), you should resolve them and then inform bzr that the "
|
|
11047 |
"conflicts\n"
|
|
11048 |
"have been resolved."
|
|
11049 |
msgstr "" |
|
11050 |
||
11051 |
#: en/help_topics/conflict-types.txt:12
|
|
11052 |
msgid "" |
|
11053 |
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
|
|
11054 |
"should resolve them is not the one responsible for their occurrence, as is "
|
|
11055 |
"the\n"
|
|
11056 |
"case when merging other people's work or because some conflicts are "
|
|
11057 |
"presented\n"
|
|
11058 |
"in a way that is not easy to understand."
|
|
11059 |
msgstr "" |
|
11060 |
||
11061 |
#: en/help_topics/conflict-types.txt:17
|
|
11062 |
msgid "" |
|
11063 |
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
|
|
11064 |
"conflict if and only if there's an actual conceptual conflict in the source\n"
|
|
11065 |
"tree. Because Bazaar doesn't understand the real meaning of the files "
|
|
11066 |
"being\n"
|
|
11067 |
"versioned, it can, when faced with ambiguities, fall short in either "
|
|
11068 |
"direction\n"
|
|
11069 |
"trying to resolve the conflict itself. Many kinds of changes can be "
|
|
11070 |
"combined\n"
|
|
11071 |
"programmatically, but sometimes only a human can determine the right thing "
|
|
11072 |
"to\n"
|
|
11073 |
"do."
|
|
11074 |
msgstr "" |
|
11075 |
||
11076 |
#: en/help_topics/conflict-types.txt:25
|
|
11077 |
msgid "" |
|
11078 |
"When Bazaar generates a conflict, it adds information into the working tree "
|
|
11079 |
"to\n"
|
|
11080 |
"present the conflicting versions, and it's up to you to find the correct\n"
|
|
11081 |
"resolution."
|
|
11082 |
msgstr "" |
|
11083 |
||
11084 |
#: en/help_topics/conflict-types.txt:29
|
|
11085 |
msgid "Whatever the conflict is, resolving it is roughly done in two steps:" |
|
11086 |
msgstr "" |
|
11087 |
||
11088 |
#: en/help_topics/conflict-types.txt:31
|
|
11089 |
msgid "" |
|
11090 |
"1. Modify the working tree content so that the conflicted item is now in "
|
|
11091 |
"the\n"
|
|
11092 |
" state you want to keep, then"
|
|
11093 |
msgstr "" |
|
11094 |
||
11095 |
#: en/help_topics/conflict-types.txt:34
|
|
11096 |
msgid "" |
|
11097 |
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
|
|
11098 |
" remaining generated information (``bzr resolve <item>``)."
|
|
11099 |
msgstr "" |
|
11100 |
||
11101 |
#: en/help_topics/conflict-types.txt:37
|
|
11102 |
msgid "" |
|
11103 |
"For most conflict types, there are some obvious ways to modify the working\n"
|
|
11104 |
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
|
|
11105 |
"itself already made a choice, when possible."
|
|
11106 |
msgstr "" |
|
11107 |
||
11108 |
#: en/help_topics/conflict-types.txt:41
|
|
11109 |
msgid "" |
|
11110 |
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
|
|
11111 |
"different ways to resolve the conflict."
|
|
11112 |
msgstr "" |
|
11113 |
||
11114 |
#: en/help_topics/conflict-types.txt:44
|
|
11115 |
msgid "" |
|
11116 |
"Each type of conflict is explained below, and the action which must be done "
|
|
11117 |
"to\n"
|
|
11118 |
"resolve the conflict is outlined."
|
|
11119 |
msgstr "" |
|
11120 |
||
11121 |
#: en/help_topics/conflict-types.txt:47
|
|
11122 |
msgid "" |
|
11123 |
"Various actions are available depending on the kind of conflict, for some "
|
|
11124 |
"of\n"
|
|
11125 |
"these actions, Bazaar can provide some help. In the end you should at least\n"
|
|
11126 |
"inform Bazaar that you're done with the conflict with::"
|
|
11127 |
msgstr "" |
|
11128 |
||
11129 |
#: en/help_topics/conflict-types.txt:51
|
|
11130 |
msgid " ``bzr resolve FILE --action=done'" |
|
11131 |
msgstr "" |
|
11132 |
||
11133 |
#: en/help_topics/conflict-types.txt:53
|
|
11134 |
msgid "" |
|
11135 |
"Note that this is the default action when a single file is involved so you "
|
|
11136 |
"can\n"
|
|
11137 |
"simply use::"
|
|
11138 |
msgstr "" |
|
11139 |
||
11140 |
#: en/help_topics/conflict-types.txt:56
|
|
11141 |
msgid " ``bzr resolve FILE``" |
|
11142 |
msgstr "" |
|
11143 |
||
11144 |
#: en/help_topics/conflict-types.txt:58
|
|
11145 |
msgid "See ``bzr help resolve`` for more details." |
|
11146 |
msgstr "" |
|
11147 |
||
11148 |
#: en/help_topics/conflict-types.txt:60
|
|
11149 |
msgid "" |
|
11150 |
"Text conflicts\n"
|
|
11151 |
"--------------"
|
|
11152 |
msgstr "" |
|
11153 |
||
11154 |
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
|
|
11155 |
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
|
|
11156 |
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
|
|
11157 |
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
|
|
11158 |
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
|
|
11159 |
msgid "Typical message::" |
|
11160 |
msgstr "" |
|
11161 |
||
11162 |
#: en/help_topics/conflict-types.txt:65
|
|
11163 |
msgid " Text conflict in FILE" |
|
11164 |
msgstr "" |
|
11165 |
||
11166 |
#: en/help_topics/conflict-types.txt:67
|
|
11167 |
msgid "" |
|
11168 |
"These are produced when a text merge cannot completely reconcile two sets "
|
|
11169 |
"of\n"
|
|
11170 |
"text changes. Bazaar will emit files for each version with the extensions\n"
|
|
11171 |
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
|
|
11172 |
"tree,\n"
|
|
11173 |
"i.e. the tree that you are merging changes into. OTHER is the version that "
|
|
11174 |
"you\n"
|
|
11175 |
"are merging into the target. BASE is an older version that is used as a "
|
|
11176 |
"basis\n"
|
|
11177 |
"for comparison."
|
|
11178 |
msgstr "" |
|
11179 |
||
11180 |
#: en/help_topics/conflict-types.txt:74
|
|
11181 |
msgid "" |
|
11182 |
"In the main copy of the file, Bazaar will include all the changes that it\n"
|
|
11183 |
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
|
|
11184 |
"\"herringbone\" markers like ``<<<<<<<``."
|
|
11185 |
msgstr "" |
|
11186 |
||
11187 |
#: en/help_topics/conflict-types.txt:78
|
|
11188 |
msgid "" |
|
11189 |
"Say the initial text is \"The project leader released it.\", and THIS "
|
|
11190 |
"modifies it\n"
|
|
11191 |
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
|
|
11192 |
"leader\n"
|
|
11193 |
"released Bazaar.\" A conflict would look like this::"
|
|
11194 |
msgstr "" |
|
11195 |
||
11196 |
#: en/help_topics/conflict-types.txt:82
|
|
11197 |
msgid "" |
|
11198 |
" <<<<<<< TREE\n"
|
|
11199 |
" Martin Pool released it.\n"
|
|
11200 |
" =======\n"
|
|
11201 |
" The project leader released Bazaar.\n"
|
|
11202 |
" >>>>>>> MERGE-SOURCE"
|
|
11203 |
msgstr "" |
|
11204 |
||
11205 |
#: en/help_topics/conflict-types.txt:88
|
|
11206 |
msgid "The correct resolution would be \"Martin Pool released Bazaar.\"" |
|
11207 |
msgstr "" |
|
11208 |
||
11209 |
#: en/help_topics/conflict-types.txt:90
|
|
11210 |
msgid "" |
|
11211 |
"You can handle text conflicts either by editing the main copy of the file,\n"
|
|
11212 |
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
|
|
11213 |
"worth mentioning that resolving text conflicts rarely involves picking one\n"
|
|
11214 |
"set of changes over the other (but see below when you encounter these\n"
|
|
11215 |
"cases). More often, the two sets of changes must be intelligently combined."
|
|
11216 |
msgstr "" |
|
11217 |
||
11218 |
#: en/help_topics/conflict-types.txt:96
|
|
11219 |
msgid "" |
|
11220 |
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
|
|
11221 |
"you are done editing, the file should look like it never had a conflict, and "
|
|
11222 |
"be\n"
|
|
11223 |
"ready to commit."
|
|
11224 |
msgstr "" |
|
11225 |
||
11226 |
#: en/help_topics/conflict-types.txt:100
|
|
11227 |
msgid "" |
|
11228 |
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
|
|
11229 |
"Bazaar will auto-detect which conflicts you have resolved."
|
|
11230 |
msgstr "" |
|
11231 |
||
11232 |
#: en/help_topics/conflict-types.txt:103
|
|
11233 |
msgid "" |
|
11234 |
"When the conflict is resolved, Bazaar deletes the previously generated\n"
|
|
11235 |
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
|
|
11236 |
"working tree."
|
|
11237 |
msgstr "" |
|
11238 |
||
11239 |
#: en/help_topics/conflict-types.txt:107
|
|
11240 |
msgid "" |
|
11241 |
"\n"
|
|
11242 |
"When you want to pick one set of changes over the other, you can use ``bzr\n"
|
|
11243 |
"resolve`` with one of the following actions:"
|
|
11244 |
msgstr "" |
|
11245 |
||
11246 |
#: en/help_topics/conflict-types.txt:111
|
|
11247 |
msgid "" |
|
11248 |
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
|
|
11249 |
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
|
|
11250 |
msgstr "" |
|
11251 |
||
11252 |
#: en/help_topics/conflict-types.txt:114
|
|
11253 |
msgid "" |
|
11254 |
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
|
|
11255 |
"modifications will be taken into account."
|
|
11256 |
msgstr "" |
|
11257 |
||
11258 |
#: en/help_topics/conflict-types.txt:117
|
|
11259 |
msgid "" |
|
11260 |
"Content conflicts\n"
|
|
11261 |
"-----------------"
|
|
11262 |
msgstr "" |
|
11263 |
||
11264 |
#: en/help_topics/conflict-types.txt:122
|
|
11265 |
msgid " Contents conflict in FILE" |
|
11266 |
msgstr "" |
|
11267 |
||
11268 |
#: en/help_topics/conflict-types.txt:124
|
|
11269 |
msgid "" |
|
11270 |
"This conflict happens when there are conflicting changes in the working "
|
|
11271 |
"tree\n"
|
|
11272 |
"and the merge source, but the conflicted items are not text files. They "
|
|
11273 |
"may\n"
|
|
11274 |
"be binary files, or symlinks, or directories. It can even happen with "
|
|
11275 |
"files\n"
|
|
11276 |
"that are deleted on one side, and modified on the other."
|
|
11277 |
msgstr "" |
|
11278 |
||
11279 |
#: en/help_topics/conflict-types.txt:129
|
|
11280 |
msgid "" |
|
11281 |
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
|
|
11282 |
"be\n"
|
|
11283 |
"regular files, symlinks or directories). But it will not include a \"main "
|
|
11284 |
"copy\"\n"
|
|
11285 |
"of the file with herringbone conflict markers. It will appear that the "
|
|
11286 |
"\"main\n"
|
|
11287 |
"copy\" has been renamed to THIS or OTHER."
|
|
11288 |
msgstr "" |
|
11289 |
||
11290 |
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
|
|
11291 |
msgid "" |
|
11292 |
"To resolve that kind of conflict, you should rebuild FILE from either "
|
|
11293 |
"version\n"
|
|
11294 |
"or a combination of both."
|
|
11295 |
msgstr "" |
|
11296 |
||
11297 |
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
|
|
11298 |
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
|
|
11299 |
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
|
|
11300 |
#: en/help_topics/conflict-types.txt:361
|
|
11301 |
msgid "``bzr resolve`` recognizes the following actions:" |
|
11302 |
msgstr "" |
|
11303 |
||
11304 |
#: en/help_topics/conflict-types.txt:139
|
|
11305 |
msgid "" |
|
11306 |
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
|
|
11307 |
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
|
|
11308 |
"* ``--action=done`` will just mark the conflict as resolved."
|
|
11309 |
msgstr "" |
|
11310 |
||
11311 |
#: en/help_topics/conflict-types.txt:143
|
|
11312 |
msgid "" |
|
11313 |
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
|
|
11314 |
"and\n"
|
|
11315 |
"``.OTHER`` files if they are still present in the working tree."
|
|
11316 |
msgstr "" |
|
11317 |
||
11318 |
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
|
|
11319 |
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
|
|
11320 |
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
|
|
11321 |
#: en/help_topics/conflict-types.txt:369
|
|
11322 |
msgid "" |
|
11323 |
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
|
|
11324 |
msgstr "" |
|
11325 |
||
11326 |
#: en/help_topics/conflict-types.txt:148
|
|
11327 |
msgid "" |
|
11328 |
"Tag conflicts\n"
|
|
11329 |
"-------------"
|
|
11330 |
msgstr "" |
|
11331 |
||
11332 |
#: en/help_topics/conflict-types.txt:153
|
|
11333 |
msgid "" |
|
11334 |
" Conflicting tags:\n"
|
|
11335 |
" version-0.1"
|
|
11336 |
msgstr "" |
|
11337 |
||
11338 |
#: en/help_topics/conflict-types.txt:156
|
|
11339 |
msgid "" |
|
11340 |
"When pulling from or pushing to another branch, Bazaar informs you about "
|
|
11341 |
"tags\n"
|
|
11342 |
"that conflict between the two branches; that is the same tag points to two\n"
|
|
11343 |
"different revisions. You need not resolve these conflicts, but subsequent\n"
|
|
11344 |
"uses of pull or push will result in the same message."
|
|
11345 |
msgstr "" |
|
11346 |
||
11347 |
#: en/help_topics/conflict-types.txt:161
|
|
11348 |
msgid "" |
|
11349 |
"To resolve the conflict, you must apply the correct tags to either the "
|
|
11350 |
"target\n"
|
|
11351 |
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
|
|
11352 |
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
|
|
11353 |
"target branch's tags match the source branch, then in the target branch do\n"
|
|
11354 |
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
|
|
11355 |
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
|
|
11356 |
"source\n"
|
|
11357 |
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
|
|
11358 |
"favor of the target branch, you need to similarly use ``tag --force`` in "
|
|
11359 |
"the\n"
|
|
11360 |
"source branch. (Note that pulling or pushing using --overwrite will "
|
|
11361 |
"overwrite\n"
|
|
11362 |
"all tags as well.)"
|
|
11363 |
msgstr "" |
|
11364 |
||
11365 |
#: en/help_topics/conflict-types.txt:172
|
|
11366 |
msgid "" |
|
11367 |
"Duplicate paths\n"
|
|
11368 |
"---------------"
|
|
11369 |
msgstr "" |
|
11370 |
||
11371 |
#: en/help_topics/conflict-types.txt:177
|
|
11372 |
msgid " Conflict adding file FILE. Moved existing file to FILE.moved." |
|
11373 |
msgstr "" |
|
11374 |
||
11375 |
#: en/help_topics/conflict-types.txt:179
|
|
11376 |
msgid "" |
|
11377 |
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
|
|
11378 |
"already been used. The existing file will be renamed to \"FILE.moved\". "
|
|
11379 |
msgstr "" |
|
11380 |
||
11381 |
#: en/help_topics/conflict-types.txt:187
|
|
11382 |
msgid "" |
|
11383 |
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
|
|
11384 |
"FILE``,\n"
|
|
11385 |
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
|
|
11386 |
"* ``--action=done`` will just mark the conflict as resolved."
|
|
11387 |
msgstr "" |
|
11388 |
||
11389 |
#: en/help_topics/conflict-types.txt:191
|
|
11390 |
msgid "" |
|
11391 |
"Note that you must get rid of FILE.moved before using ``--action=done``."
|
|
11392 |
msgstr "" |
|
11393 |
||
11394 |
#: en/help_topics/conflict-types.txt:195
|
|
11395 |
msgid "" |
|
11396 |
"Unversioned parent\n"
|
|
11397 |
"------------------"
|
|
11398 |
msgstr "" |
|
11399 |
||
11400 |
#: en/help_topics/conflict-types.txt:200
|
|
11401 |
msgid "" |
|
11402 |
" Conflict because FILE is not versioned, but has versioned children."
|
|
11403 |
msgstr "" |
|
11404 |
||
11405 |
#: en/help_topics/conflict-types.txt:202
|
|
11406 |
msgid "" |
|
11407 |
"Sometimes Bazaar will attempt to create a file whose parent directory is "
|
|
11408 |
"not\n"
|
|
11409 |
"versioned. This happens when the directory has been deleted in the target,\n"
|
|
11410 |
"but has a new child in the source, or vice versa. In this situation, "
|
|
11411 |
"Bazaar\n"
|
|
11412 |
"will version the parent directory as well. Resolving this issue depends\n"
|
|
11413 |
"very much on the particular scenario. You may wish to rename or delete "
|
|
11414 |
"either\n"
|
|
11415 |
"the file or the directory. When you are satisfied, you can run \"bzr "
|
|
11416 |
"resolve\n"
|
|
11417 |
"FILE\" to mark the conflict as resolved."
|
|
11418 |
msgstr "" |
|
11419 |
||
11420 |
#: en/help_topics/conflict-types.txt:210
|
|
11421 |
msgid "" |
|
11422 |
"Missing parent\n"
|
|
11423 |
"--------------"
|
|
11424 |
msgstr "" |
|
11425 |
||
11426 |
#: en/help_topics/conflict-types.txt:215
|
|
11427 |
msgid " Conflict adding files to FILE. Created directory." |
|
11428 |
msgstr "" |
|
11429 |
||
11430 |
#: en/help_topics/conflict-types.txt:217
|
|
11431 |
msgid "" |
|
11432 |
"This happens when a directory has been deleted in the target, but has new\n"
|
|
11433 |
"children in the source. This is similar to the \"unversioned parent\" "
|
|
11434 |
"conflict,\n"
|
|
11435 |
"except that the parent directory does not *exist*, instead of just being\n"
|
|
11436 |
"unversioned. In this situation, Bazaar will create the missing parent.\n"
|
|
11437 |
"Resolving this issue depends very much on the particular scenario."
|
|
11438 |
msgstr "" |
|
11439 |
||
11440 |
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
|
|
11441 |
msgid "" |
|
11442 |
"To resolve that kind of conflict, you should either remove or rename the\n"
|
|
11443 |
"children or the directory or a combination of both."
|
|
11444 |
msgstr "" |
|
11445 |
||
11446 |
#: en/help_topics/conflict-types.txt:228
|
|
11447 |
msgid "" |
|
11448 |
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
|
|
11449 |
" children,\n"
|
|
11450 |
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
|
|
11451 |
"children\n"
|
|
11452 |
" and restoring the directory,\n"
|
|
11453 |
"* ``--action=done`` will just mark the conflict as resolved."
|
|
11454 |
msgstr "" |
|
11455 |
||
11456 |
#: en/help_topics/conflict-types.txt:236
|
|
11457 |
msgid "" |
|
11458 |
"Deleting parent\n"
|
|
11459 |
"---------------"
|
|
11460 |
msgstr "" |
|
11461 |
||
11462 |
#: en/help_topics/conflict-types.txt:241
|
|
11463 |
msgid " Conflict: can't delete DIR because it is not empty. Not deleting." |
|
11464 |
msgstr "" |
|
11465 |
||
11466 |
#: en/help_topics/conflict-types.txt:243
|
|
11467 |
msgid "" |
|
11468 |
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
|
|
11469 |
"source, but has new children in the target (either because a directory\n"
|
|
11470 |
"deletion is merged or because the merge introduce new children). Bazaar\n"
|
|
11471 |
"will retain the directory. Resolving this issue depends very much on the\n"
|
|
11472 |
"particular scenario."
|
|
11473 |
msgstr "" |
|
11474 |
||
11475 |
#: en/help_topics/conflict-types.txt:254
|
|
11476 |
msgid "" |
|
11477 |
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
|
|
11478 |
"directory,"
|
|
11479 |
msgstr "" |
|
11480 |
||
11481 |
#: en/help_topics/conflict-types.txt:256
|
|
11482 |
msgid "" |
|
11483 |
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
|
|
11484 |
" children,"
|
|
11485 |
msgstr "" |
|
11486 |
||
11487 |
#: en/help_topics/conflict-types.txt:259
|
|
11488 |
msgid "* ``--action=done`` will just mark the conflict as resolved." |
|
11489 |
msgstr "" |
|
11490 |
||
11491 |
#: en/help_topics/conflict-types.txt:261
|
|
11492 |
msgid "" |
|
11493 |
"Note that when merging a directory deletion, if unversioned files are\n"
|
|
11494 |
"present, they become potential orphans has they don't have a directory\n"
|
|
11495 |
"parent anymore."
|
|
11496 |
msgstr "" |
|
11497 |
||
11498 |
#: en/help_topics/conflict-types.txt:265
|
|
11499 |
msgid "" |
|
11500 |
"Handling such orphans, *before* the conflict is created, is controlled by\n"
|
|
11501 |
"setting the ``bzr.transform.orphan_policy`` configuration option."
|
|
11502 |
msgstr "" |
|
11503 |
||
11504 |
#: en/help_topics/conflict-types.txt:268
|
|
11505 |
msgid "There are two possible values for this option:" |
|
11506 |
msgstr "" |
|
11507 |
||
11508 |
#: en/help_topics/conflict-types.txt:270
|
|
11509 |
msgid "" |
|
11510 |
"* ``conflict`` (the default): will leave the orphans in place and\n"
|
|
11511 |
" generate a conflicts,"
|
|
11512 |
msgstr "" |
|
11513 |
||
11514 |
#: en/help_topics/conflict-types.txt:273
|
|
11515 |
msgid "" |
|
11516 |
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
|
|
11517 |
"root\n"
|
|
11518 |
" of the working tree with names like ``<file>.~#~``."
|
|
11519 |
msgstr "" |
|
11520 |
||
11521 |
#: en/help_topics/conflict-types.txt:278
|
|
11522 |
msgid "" |
|
11523 |
"Path conflict\n"
|
|
11524 |
"-------------"
|
|
11525 |
msgstr "" |
|
11526 |
||
11527 |
#: en/help_topics/conflict-types.txt:283
|
|
11528 |
msgid " Path conflict: PATH1 / PATH2" |
|
11529 |
msgstr "" |
|
11530 |
||
11531 |
#: en/help_topics/conflict-types.txt:285
|
|
11532 |
msgid "" |
|
11533 |
"This happens when the source and target have each modified the name or "
|
|
11534 |
"parent\n"
|
|
11535 |
"directory of a file. Bazaar will use the path elements from the source."
|
|
11536 |
msgstr "" |
|
11537 |
||
11538 |
#: en/help_topics/conflict-types.txt:288
|
|
11539 |
msgid "" |
|
11540 |
"To resolve that kind of conflict, you just have to decide what name should "
|
|
11541 |
"be\n"
|
|
11542 |
"retained for the file involved."
|
|
11543 |
msgstr "" |
|
11544 |
||
11545 |
#: en/help_topics/conflict-types.txt:293
|
|
11546 |
msgid "" |
|
11547 |
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
|
|
11548 |
" issuing ``bzr mv PATH2 PATH1``,\n"
|
|
11549 |
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
|
|
11550 |
"``PATH2``,\n"
|
|
11551 |
"* ``--action=done`` will just mark the conflict as resolved."
|
|
11552 |
msgstr "" |
|
11553 |
||
11554 |
#: en/help_topics/conflict-types.txt:300
|
|
11555 |
msgid "" |
|
11556 |
"Parent loop\n"
|
|
11557 |
"-----------"
|
|
11558 |
msgstr "" |
|
11559 |
||
11560 |
#: en/help_topics/conflict-types.txt:305
|
|
11561 |
msgid " Conflict moving FILE into DIRECTORY. Cancelled move." |
|
11562 |
msgstr "" |
|
11563 |
||
11564 |
#: en/help_topics/conflict-types.txt:307
|
|
11565 |
msgid "" |
|
11566 |
"This happens when the source and the target have each moved directories, so\n"
|
|
11567 |
"that, if the change could be applied, a directory would be contained by "
|
|
11568 |
"itself.\n"
|
|
11569 |
"For example::"
|
|
11570 |
msgstr "" |
|
11571 |
||
11572 |
#: en/help_topics/conflict-types.txt:311
|
|
11573 |
msgid "" |
|
11574 |
" $ bzr init\n"
|
|
11575 |
" $ bzr mkdir white\n"
|
|
11576 |
" $ bzr mkdir black\n"
|
|
11577 |
" $ bzr commit -m \"BASE\"\n"
|
|
11578 |
" $ bzr branch . ../other\n"
|
|
11579 |
" $ bzr mv white black\n"
|
|
11580 |
" $ bzr commit -m \"THIS\"\n"
|
|
11581 |
" $ bzr mv ../other/black ../other/white\n"
|
|
11582 |
" $ bzr commit ../other -m \"OTHER\"\n"
|
|
11583 |
" $ bzr merge ../other"
|
|
11584 |
msgstr "" |
|
11585 |
||
11586 |
#: en/help_topics/conflict-types.txt:322
|
|
11587 |
msgid "" |
|
11588 |
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
|
|
11589 |
"``black``. To resolve that kind of conflict, you just have to decide what\n"
|
|
11590 |
"name should be retained for the directories involved."
|
|
11591 |
msgstr "" |
|
11592 |
||
11593 |
#: en/help_topics/conflict-types.txt:328
|
|
11594 |
msgid "" |
|
11595 |
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
|
|
11596 |
"\n"
|
|
11597 |
" in ``black``,\n"
|
|
11598 |
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
|
|
11599 |
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
|
|
11600 |
"* ``--action=done`` will just mark the conflict as resolved."
|
|
11601 |
msgstr "" |
|
11602 |
||
11603 |
#: en/help_topics/conflict-types.txt:336
|
|
11604 |
msgid "" |
|
11605 |
"Non-directory parent\n"
|
|
11606 |
"--------------------"
|
|
11607 |
msgstr "" |
|
11608 |
||
11609 |
#: en/help_topics/conflict-types.txt:341
|
|
11610 |
msgid "" |
|
11611 |
" Conflict: foo.new is not a directory, but has files in it.\n"
|
|
11612 |
" Created directory."
|
|
11613 |
msgstr "" |
|
11614 |
||
11615 |
#: en/help_topics/conflict-types.txt:344
|
|
11616 |
msgid "" |
|
11617 |
"This happens when one side has added files to a directory, and the other "
|
|
11618 |
"side\n"
|
|
11619 |
"has changed the directory into a file or symlink. For example::"
|
|
11620 |
msgstr "" |
|
11621 |
||
11622 |
#: en/help_topics/conflict-types.txt:347
|
|
11623 |
msgid "" |
|
11624 |
" $ bzr init\n"
|
|
11625 |
" $ bzr mkdir foo\n"
|
|
11626 |
" $ bzr commit -m \"BASE\"\n"
|
|
11627 |
" $ bzr branch . ../other\n"
|
|
11628 |
" $ rmdir foo\n"
|
|
11629 |
" $ touch foo\n"
|
|
11630 |
" $ bzr commit -m \"THIS\"\n"
|
|
11631 |
" $ bzr mkdir ../other/foo/bar\n"
|
|
11632 |
" $ bzr commit ../other -m \"OTHER\"\n"
|
|
11633 |
" $ bzr merge ../other"
|
|
11634 |
msgstr "" |
|
11635 |
||
11636 |
#: en/help_topics/conflict-types.txt:358
|
|
11637 |
msgid "" |
|
11638 |
"To resolve that kind of conflict, you have to decide what name should be\n"
|
|
11639 |
"retained for the file, directory or symlink involved."
|
|
11640 |
msgstr "" |
|
11641 |
||
11642 |
#: en/help_topics/conflict-types.txt:363
|
|
11643 |
msgid "" |
|
11644 |
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
|
|
11645 |
" ``bzr add foo``,\n"
|
|
11646 |
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
|
|
11647 |
" ``bzr mv foo.new foo``,\n"
|
|
11648 |
"* ``--action=done`` will just mark the conflict as resolved."
|
|
11649 |
msgstr "" |
|
11650 |
||
11651 |
#: en/help_topics/conflict-types.txt:371
|
|
11652 |
msgid "" |
|
11653 |
"MalformedTransform\n"
|
|
11654 |
"------------------"
|
|
11655 |
msgstr "" |
|
11656 |
||
11657 |
#: en/help_topics/conflict-types.txt:374
|
|
11658 |
msgid "" |
|
11659 |
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
|
|
11660 |
"exception. This means that Bazaar encountered a filesystem conflict that it "
|
|
11661 |
"was\n"
|
|
11662 |
"unable to resolve. This usually indicates a bug. Please let us know if "
|
|
11663 |
"you\n"
|
|
11664 |
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
|
|
11665 |
msgstr "" |
|
11666 |
||
11667 |
#: en/help_topics/content-filters.txt:1
|
|
11668 |
msgid "" |
|
11669 |
"Content Filters\n"
|
|
11670 |
"==============="
|
|
11671 |
msgstr "" |
|
11672 |
||
11673 |
#: en/help_topics/content-filters.txt:4
|
|
11674 |
msgid "" |
|
11675 |
"Content formats\n"
|
|
11676 |
"---------------"
|
|
11677 |
msgstr "" |
|
11678 |
||
11679 |
#: en/help_topics/content-filters.txt:7
|
|
11680 |
msgid "" |
|
11681 |
"Bazaar's content filtering allows you to store files in a different\n"
|
|
11682 |
"format from the copy in your working tree. This lets you, or your\n"
|
|
11683 |
"co-developers, use Windows development tools that expect CRLF files\n"
|
|
11684 |
"on projects that use other line-ending conventions. Among other things,\n"
|
|
11685 |
"content filters also let Unix developers more easily work on projects\n"
|
|
11686 |
"using Windows line-ending conventions, keyword expansion/compression,\n"
|
|
11687 |
"and trailing spaces on lines in text files to be implicitly stripped\n"
|
|
11688 |
"when committed."
|
|
11689 |
msgstr "" |
|
11690 |
||
11691 |
#: en/help_topics/content-filters.txt:16
|
|
11692 |
msgid "To generalize, there are two content formats supported by Bazaar:" |
|
11693 |
msgstr "" |
|
11694 |
||
11695 |
#: en/help_topics/content-filters.txt:18
|
|
11696 |
msgid "" |
|
11697 |
"* a canonical format - how files are stored internally\n"
|
|
11698 |
"* a convenience format - how files are created in a working tree."
|
|
11699 |
msgstr "" |
|
11700 |
||
11701 |
#: en/help_topics/content-filters.txt:21
|
|
11702 |
msgid "" |
|
11703 |
"\n"
|
|
11704 |
"Format conversion\n"
|
|
11705 |
"-----------------"
|
|
11706 |
msgstr "" |
|
11707 |
||
11708 |
#: en/help_topics/content-filters.txt:25
|
|
11709 |
msgid "" |
|
11710 |
"The conversion between these formats is done by content filters.\n"
|
|
11711 |
"A content filter has two parts:"
|
|
11712 |
msgstr "" |
|
11713 |
||
11714 |
#: en/help_topics/content-filters.txt:28
|
|
11715 |
msgid "" |
|
11716 |
"* a read converter - converts from convenience to canonical format\n"
|
|
11717 |
"* a write converter - converts from canonical to convenience format."
|
|
11718 |
msgstr "" |
|
11719 |
||
11720 |
#: en/help_topics/content-filters.txt:31
|
|
11721 |
msgid "" |
|
11722 |
"Many of these converters will provide *round-trip* conversion,\n"
|
|
11723 |
"i.e. applying the read converter followed by the write converter\n"
|
|
11724 |
"gives back the original content. However, others may provide an\n"
|
|
11725 |
"asymmetric conversion. For example, a read converter might strip\n"
|
|
11726 |
"trailing whitespace off lines in source code while the matching\n"
|
|
11727 |
"write converter might pass content through unchanged."
|
|
11728 |
msgstr "" |
|
11729 |
||
11730 |
#: en/help_topics/content-filters.txt:38
|
|
11731 |
msgid "" |
|
11732 |
"\n"
|
|
11733 |
"Enabling content filters\n"
|
|
11734 |
"------------------------"
|
|
11735 |
msgstr "" |
|
11736 |
||
11737 |
#: en/help_topics/content-filters.txt:42
|
|
11738 |
msgid "" |
|
11739 |
"Content filters are typically provided by plugins, so the first step\n"
|
|
11740 |
"in using them is to install the relevant plugins and read their\n"
|
|
11741 |
"documentation. Some plugins may be very specific about which files\n"
|
|
11742 |
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
|
|
11743 |
"In other cases, the plugin may leave it in the user's hands to\n"
|
|
11744 |
"define which files are to be filtered. This is typically done\n"
|
|
11745 |
"using rule-based preferences. See ``bzr help rules`` for general\n"
|
|
11746 |
"information about defining these."
|
|
11747 |
msgstr "" |
|
11748 |
||
11749 |
#: en/help_topics/content-filters.txt:51
|
|
11750 |
msgid "" |
|
11751 |
"\n"
|
|
11752 |
"Impact on commands\n"
|
|
11753 |
"------------------"
|
|
11754 |
msgstr "" |
|
11755 |
||
11756 |
#: en/help_topics/content-filters.txt:55
|
|
11757 |
msgid "" |
|
11758 |
"Read converters are only applied to commands that read content from\n"
|
|
11759 |
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
|
|
11760 |
"will apply read converters to files in the working tree, then compare\n"
|
|
11761 |
"the results to the content last committed."
|
|
11762 |
msgstr "" |
|
11763 |
||
11764 |
#: en/help_topics/content-filters.txt:60
|
|
11765 |
msgid "" |
|
11766 |
"Write converters are only applied by commands that **create files in a\n"
|
|
11767 |
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
|
|
11768 |
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
|
|
11769 |
"respectively."
|
|
11770 |
msgstr "" |
|
11771 |
||
11772 |
#: en/help_topics/content-filters.txt:65
|
|
11773 |
msgid "" |
|
11774 |
"Note: ``bzr commit`` does not implicitly apply write converters after\n" |
|
11775 |
"comitting files. If this makes sense for a given plugin providing\n"
|
|
11776 |
"a content filter, the plugin can usually achieve this effect by using a\n"
|
|
11777 |
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
|
|
11778 |
"for more information on hooks."
|
|
11779 |
msgstr "" |
|
11780 |
||
11781 |
#: en/help_topics/content-filters.txt:71
|
|
11782 |
msgid "" |
|
11783 |
"\n"
|
|
11784 |
"Refreshing your working tree\n"
|
|
11785 |
"----------------------------"
|
|
11786 |
msgstr "" |
|
11787 |
||
11788 |
#: en/help_topics/content-filters.txt:75
|
|
11789 |
msgid "" |
|
11790 |
"For performance reasons, Bazaar caches the timestamps of files in\n"
|
|
11791 |
"a working tree, and assumes files are unchanged if their timestamps\n"
|
|
11792 |
"match the cached values. As a consequence, there are times when\n"
|
|
11793 |
"you may need to explicitly ask for content filtering to be reapplied\n"
|
|
11794 |
"in one or both directions, e.g. after installing or reconfiguring\n"
|
|
11795 |
"plugins providing it."
|
|
11796 |
msgstr "" |
|
11797 |
||
11798 |
#: en/help_topics/content-filters.txt:82
|
|
11799 |
msgid "Here are some general guidelines for doing this:" |
|
11800 |
msgstr "" |
|
11801 |
||
11802 |
#: en/help_topics/content-filters.txt:84
|
|
11803 |
msgid "" |
|
11804 |
" * To reapply read converters, ``touch`` files, i.e. update their\n"
|
|
11805 |
" timestamp. Operations like ``bzr status`` should then reapply the\n"
|
|
11806 |
" relevant read converters and compare the end result with the\n"
|
|
11807 |
" canonical format."
|
|
11808 |
msgstr "" |
|
11809 |
||
11810 |
#: en/help_topics/content-filters.txt:89
|
|
11811 |
msgid "" |
|
11812 |
" * To reapply write converters, ensure there are no local changes,\n"
|
|
11813 |
" delete the relevant files and run ``bzr revert`` on those files."
|
|
11814 |
msgstr "" |
|
11815 |
||
11816 |
#: en/help_topics/content-filters.txt:92
|
|
11817 |
msgid "" |
|
11818 |
"Note: In the future, it is likely that additional options will be added\n" |
|
11819 |
"to commands to make this refreshing process faster and safer.\n"
|
|
11820 |
msgstr "" |
|
11821 |
||
11822 |
#: en/help_topics/current-formats.txt:1
|
|
11823 |
msgid "Current Storage Formats" |
|
11824 |
msgstr "" |
|
11825 |
||
11826 |
#: en/help_topics/current-formats.txt:3
|
|
11827 |
msgid "" |
|
11828 |
":2a:\n"
|
|
11829 |
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
|
|
11830 |
" compress storage. Provides rich roots which are a one-way\n"
|
|
11831 |
" transition."
|
|
11832 |
msgstr "" |
|
11833 |
||
11834 |
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
|
|
11835 |
msgid "" |
|
11836 |
"\n"
|
|
11837 |
"See :doc:`formats-help` for more about storage formats."
|
|
11838 |
msgstr "" |
|
11839 |
||
11840 |
#: en/help_topics/debug-flags.txt:1
|
|
11841 |
msgid "" |
|
11842 |
"Debug Flags\n"
|
|
11843 |
"==========="
|
|
11844 |
msgstr "" |
|
11845 |
||
11846 |
#: en/help_topics/debug-flags.txt:4
|
|
11847 |
msgid "" |
|
11848 |
"These flags can be passed on the bzr command line or (without the ``-D``\n"
|
|
11849 |
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
|
|
11850 |
msgstr "" |
|
11851 |
||
11852 |
#: en/help_topics/debug-flags.txt:7
|
|
11853 |
msgid "" |
|
11854 |
"-Dauth Trace authentication sections used.\n"
|
|
11855 |
"-Dbytes Print out how many bytes were transferred\n"
|
|
11856 |
"-Ddirstate Trace dirstate activity (verbose!)\n"
|
|
11857 |
"-Derror Instead of normal error handling, always print a "
|
|
11858 |
"traceback\n"
|
|
11859 |
" on error.\n"
|
|
11860 |
"-Devil Capture call sites that do expensive or badly-scaling\n"
|
|
11861 |
" operations.\n"
|
|
11862 |
"-Dfetch Trace history copying between repositories.\n"
|
|
11863 |
"-Dfilters Emit information for debugging content filtering.\n"
|
|
11864 |
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
|
|
11865 |
"fetch.\n"
|
|
11866 |
"-Dgraph Trace graph traversal.\n"
|
|
11867 |
"-Dhashcache Log every time a working file is read to determine its "
|
|
11868 |
"hash.\n"
|
|
11869 |
"-Dhooks Trace hook execution.\n"
|
|
11870 |
"-Dhpss Trace smart protocol requests and responses.\n"
|
|
11871 |
"-Dhpssdetail More hpss details.\n"
|
|
11872 |
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
|
|
11873 |
"-Dhttp Trace http connections, requests and responses.\n"
|
|
11874 |
"-Dindex Trace major index operations.\n"
|
|
11875 |
"-Dknit Trace knit operations.\n"
|
|
11876 |
"-Dlock Trace when lockdir locks are taken or released.\n"
|
|
11877 |
"-Dnoretry If a connection is reset, fail immediately rather than\n"
|
|
11878 |
" retrying the request.\n"
|
|
11879 |
"-Dprogress Trace progress bar operations.\n"
|
|
11880 |
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
|
|
11881 |
"-Dmerge Emit information for debugging merges.\n"
|
|
11882 |
"-Dno_apport Don't use apport to report crashes.\n"
|
|
11883 |
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
|
|
11884 |
"-Dpack Emit information about pack operations.\n"
|
|
11885 |
"-Drelock Emit a message every time a branch or repository object "
|
|
11886 |
"is\n"
|
|
11887 |
" unlocked then relocked the same way.\n"
|
|
11888 |
"-Dsftp Trace SFTP internals.\n"
|
|
11889 |
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
|
|
11890 |
"expected\n"
|
|
11891 |
"-Dstream Trace fetch streams.\n"
|
|
11892 |
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
|
|
11893 |
"portable\n"
|
|
11894 |
" manner.\n"
|
|
11895 |
"-Dunlock Some errors during unlock are treated as warnings.\n"
|
|
11896 |
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
|
|
11897 |
"-DIDS_always Always use InterDifferingSerializer to fetch if "
|
|
11898 |
"appropriate\n"
|
|
11899 |
" for the format, even for non-local fetches.\n"
|
|
11900 |
msgstr "" |
|
11901 |
||
11902 |
#: en/help_topics/diverged-branches.txt:1
|
|
11903 |
msgid "" |
|
11904 |
"Diverged Branches\n"
|
|
11905 |
"================="
|
|
11906 |
msgstr "" |
|
11907 |
||
11908 |
#: en/help_topics/diverged-branches.txt:4
|
|
11909 |
msgid "" |
|
11910 |
"When Bazaar tries to push one branch onto another, it requires that the\n"
|
|
11911 |
"destination branch must be ready to receive the source branch. If this "
|
|
11912 |
"isn't\n"
|
|
11913 |
"the case, then we say that the branches have ``diverged``. Branches are\n"
|
|
11914 |
"considered diverged if the destination branch's most recent commit is one "
|
|
11915 |
"that\n"
|
|
11916 |
"has not been merged (directly or indirectly) by the source branch. To "
|
|
11917 |
"recover\n"
|
|
11918 |
"from diverged branches, one must merge the missing revisions into the "
|
|
11919 |
"source\n"
|
|
11920 |
"branch."
|
|
11921 |
msgstr "" |
|
11922 |
||
11923 |
#: en/help_topics/diverged-branches.txt:12
|
|
11924 |
msgid "" |
|
11925 |
"This situation commonly arises when using a centralized workflow with local\n"
|
|
11926 |
"commits. If someone else has committed new work to the mainline since your\n"
|
|
11927 |
"last pull and you have local commits that have not yet been pushed to the\n"
|
|
11928 |
"mainline, then your local branch and the mainline have diverged."
|
|
11929 |
msgstr "" |
|
11930 |
||
11931 |
#: en/help_topics/diverged-branches.txt:17
|
|
11932 |
msgid "" |
|
11933 |
"Discovering What Has Diverged\n"
|
|
11934 |
"-----------------------------"
|
|
11935 |
msgstr "" |
|
11936 |
||
11937 |
#: en/help_topics/diverged-branches.txt:20
|
|
11938 |
msgid "" |
|
11939 |
"The ``bzr missing`` command is used to find out what revisions are in "
|
|
11940 |
"another\n"
|
|
11941 |
"branch that are not present in the current branch, and vice-versa. It shows "
|
|
11942 |
"a\n"
|
|
11943 |
"summary of which extra revisions exist in each branch. If you want to see "
|
|
11944 |
"the\n"
|
|
11945 |
"precise effects of those revisions, you can use ``bzr diff --"
|
|
11946 |
"old=other_branch``\n"
|
|
11947 |
"to show the differences between other_branch and your current branch."
|
|
11948 |
msgstr "" |
|
11949 |
||
11950 |
#: en/help_topics/diverged-branches.txt:26
|
|
11951 |
msgid "" |
|
11952 |
"A Solution\n"
|
|
11953 |
"----------"
|
|
11954 |
msgstr "" |
|
11955 |
||
11956 |
#: en/help_topics/diverged-branches.txt:29
|
|
11957 |
msgid "" |
|
11958 |
"The solution is to merge the revisions from the mainline into your local\n"
|
|
11959 |
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
|
|
11960 |
"mainline. This merge may result in conflicts if the other developer's "
|
|
11961 |
"changes\n"
|
|
11962 |
"overlap with your changes. These conflicts should be resolved before\n"
|
|
11963 |
"continuing. After any conflicts have been resolved, or even if there were "
|
|
11964 |
"no\n"
|
|
11965 |
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
|
|
11966 |
"to your local branch. This requirement gives you an opportunity to test "
|
|
11967 |
"the\n"
|
|
11968 |
"resulting working tree for correctness, since the merged revisions could "
|
|
11969 |
"have\n"
|
|
11970 |
"made arbitrary changes. After testing, you should commit the merge using\n"
|
|
11971 |
"``bzr commit``. This clears up the diverged branches situation. Your "
|
|
11972 |
"local\n"
|
|
11973 |
"branch can now be pushed to the mainline.\n"
|
|
11974 |
msgstr "" |
|
11975 |
||
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
11976 |
#: en/help_topics/env-variables.txt:1
|
11977 |
msgid "Environment Variables" |
|
11978 |
msgstr "" |
|
11979 |
||
11980 |
#: en/help_topics/env-variables.txt:3
|
|
11981 |
msgid "" |
|
11982 |
"=================== "
|
|
11983 |
"===========================================================\n"
|
|
11984 |
"BZRPATH Path where bzr is to look for shell plugin external\n"
|
|
11985 |
" commands.\n"
|
|
11986 |
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
|
|
11987 |
"EMAIL E-Mail address of the user.\n"
|
|
11988 |
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
|
|
11989 |
"EDITOR Editor for editing commit messages.\n"
|
|
11990 |
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
|
|
11991 |
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
|
|
11992 |
"BZR_PLUGINS_AT Plugins to load from a directory not in "
|
|
11993 |
"BZR_PLUGIN_PATH.\n"
|
|
11994 |
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
|
|
11995 |
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
|
|
11996 |
"and\n"
|
|
11997 |
" HOME.\n"
|
|
11998 |
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
|
|
11999 |
"URLs).\n"
|
|
12000 |
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
|
|
12001 |
"sshcorp,\n"
|
|
12002 |
" plink or lsh.\n"
|
|
12003 |
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
|
|
12004 |
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
|
|
12005 |
"BZR_COLUMNS Override implicit terminal width.\n"
|
|
12006 |
"BZR_CONCURRENCY Number of processes that can be run concurrently "
|
|
12007 |
"(selftest)\n"
|
|
12008 |
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
|
|
12009 |
"'text'.\n"
|
|
12010 |
"BZR_PDB Control whether to launch a debugger on error.\n"
|
|
12011 |
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
|
|
12012 |
" breakin debugger.\n"
|
|
12013 |
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
|
|
12014 |
"(instead\n"
|
|
12015 |
" of char-based).\n"
|
|
12016 |
"=================== "
|
|
12017 |
"===========================================================\n"
|
|
12018 |
msgstr "" |
|
12019 |
||
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12020 |
#: en/help_topics/eol.txt:1
|
12021 |
msgid "" |
|
12022 |
"End of Line Conversion\n"
|
|
12023 |
"======================"
|
|
12024 |
msgstr "" |
|
12025 |
||
12026 |
#: en/help_topics/eol.txt:4
|
|
12027 |
msgid "" |
|
12028 |
"EOL conversion is provided as a content filter where Bazaar internally\n"
|
|
12029 |
"stores a canonical format but outputs a convenience format. See\n"
|
|
12030 |
"``bzr help content-filters`` for general information about using these."
|
|
12031 |
msgstr "" |
|
12032 |
||
12033 |
#: en/help_topics/eol.txt:8
|
|
12034 |
msgid "" |
|
12035 |
"Note: Content filtering is only supported in recently added formats,\n" |
|
12036 |
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
|
|
12037 |
"in a recent format. (Just setting the format on the repository\n"
|
|
12038 |
"is not enough.) If content filtering does not appear to be working, use\n"
|
|
12039 |
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
|
|
12040 |
"or later."
|
|
12041 |
msgstr "" |
|
12042 |
||
12043 |
#: en/help_topics/eol.txt:15
|
|
12044 |
msgid "" |
|
12045 |
"EOL conversion needs to be enabled for selected file patterns using\n"
|
|
12046 |
"rules. See ``bzr help rules`` for general information on defining rules.\n"
|
|
12047 |
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
|
|
12048 |
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
|
|
12049 |
"supported in a future verison of Bazaar."
|
|
12050 |
msgstr "" |
|
12051 |
||
12052 |
#: en/help_topics/eol.txt:21
|
|
12053 |
msgid "" |
|
12054 |
"To configure which files to filter, set ``eol`` to one of the values below.\n"
|
|
12055 |
"(If a value is not set, ``exact`` is the default.)"
|
|
12056 |
msgstr "" |
|
12057 |
||
12058 |
#: en/help_topics/eol.txt:24
|
|
12059 |
msgid "" |
|
12060 |
" ========== ===================================== ======================\n"
|
|
12061 |
" Value Checkout end-of-lines as Commit end-of-lines as\n"
|
|
12062 |
" ========== ===================================== ======================\n"
|
|
12063 |
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
|
|
12064 |
" ---------- ------------------------------------- ----------------------\n"
|
|
12065 |
" ``lf`` ``lf`` ``lf``\n"
|
|
12066 |
" ---------- ------------------------------------- ----------------------\n"
|
|
12067 |
" ``crlf`` ``crlf`` ``lf``\n"
|
|
12068 |
" ---------- ------------------------------------- ----------------------\n"
|
|
12069 |
" ``exact`` No conversion Exactly as in file\n"
|
|
12070 |
" ========== ===================================== ======================"
|
|
12071 |
msgstr "" |
|
12072 |
||
12073 |
#: en/help_topics/eol.txt:36
|
|
12074 |
msgid "" |
|
12075 |
"Note: For safety reasons, no conversion is applied to any file where a null\n" |
|
12076 |
"byte is detected in the file."
|
|
12077 |
msgstr "" |
|
12078 |
||
12079 |
#: en/help_topics/eol.txt:39
|
|
12080 |
msgid "" |
|
12081 |
"For users working on a cross-platform project, here is a suggested rule\n"
|
|
12082 |
"to use as a starting point::"
|
|
12083 |
msgstr "" |
|
12084 |
||
12085 |
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
|
|
12086 |
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
|
|
12087 |
msgid "" |
|
12088 |
" [name *]\n"
|
|
12089 |
" eol = native"
|
|
12090 |
msgstr "" |
|
12091 |
||
12092 |
#: en/help_topics/eol.txt:45
|
|
12093 |
msgid "" |
|
12094 |
"If you have binary files that do not contain a null byte though, be\n"
|
|
12095 |
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
|
|
12096 |
"by giving more explicit patterns earlier in the rules file. For example::"
|
|
12097 |
msgstr "" |
|
12098 |
||
12099 |
#: en/help_topics/eol.txt:49
|
|
12100 |
msgid "" |
|
12101 |
" [name *.png]\n"
|
|
12102 |
" eol = exact"
|
|
12103 |
msgstr "" |
|
12104 |
||
12105 |
#: en/help_topics/eol.txt:55
|
|
12106 |
msgid "" |
|
12107 |
"If your working tree is on a network drive shared by users on different\n"
|
|
12108 |
"operating systems, you typically want to force certain conventions for\n"
|
|
12109 |
"certain files. In that way, if a file is created with the wrong line\n"
|
|
12110 |
"endings or line endings get mixed during editing, it gets committed\n"
|
|
12111 |
"correctly and gets checked out correctly. For example::"
|
|
12112 |
msgstr "" |
|
12113 |
||
12114 |
#: en/help_topics/eol.txt:61
|
|
12115 |
msgid "" |
|
12116 |
" [name *.bat]\n"
|
|
12117 |
" eol = crlf"
|
|
12118 |
msgstr "" |
|
12119 |
||
12120 |
#: en/help_topics/eol.txt:64
|
|
12121 |
msgid "" |
|
12122 |
" [name *.sh]\n"
|
|
12123 |
" eol = lf"
|
|
12124 |
msgstr "" |
|
12125 |
||
12126 |
#: en/help_topics/eol.txt:70
|
|
12127 |
msgid "" |
|
12128 |
"If you take the care to create files with their required endings, you can\n"
|
|
12129 |
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
|
|
12130 |
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
|
|
12131 |
"introducing mixed line endings will be corrected during commit for files\n"
|
|
12132 |
"with those settings."
|
|
12133 |
msgstr "" |
|
12134 |
||
12135 |
#: en/help_topics/eol.txt:76
|
|
12136 |
msgid "" |
|
12137 |
"If you have sample test data that deliberately has text files with mixed\n"
|
|
12138 |
"newline conventions, you can ask for those to be left alone like this::"
|
|
12139 |
msgstr "" |
|
12140 |
||
12141 |
#: en/help_topics/eol.txt:79
|
|
12142 |
msgid "" |
|
12143 |
" [name test_data/]\n"
|
|
12144 |
" eol = exact"
|
|
12145 |
msgstr "" |
|
12146 |
||
12147 |
#: en/help_topics/eol.txt:85
|
|
12148 |
msgid "" |
|
12149 |
"Note that ``exact`` does not imply the file is binary but it does mean\n"
|
|
12150 |
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
|
|
12151 |
"of content analysis to detect binary files for commands like ``diff``.\n"
|
|
12152 |
"In the future, a ``binary = true`` rule may be added but it is not\n"
|
|
12153 |
"supported yet.)"
|
|
12154 |
msgstr "" |
|
12155 |
||
12156 |
#: en/help_topics/eol.txt:91
|
|
12157 |
msgid "" |
|
12158 |
"If you have an existing repository with text files already stored using\n"
|
|
12159 |
"Windows newline conventions (``crlf``), then you may want to keep using "
|
|
12160 |
"that\n"
|
|
12161 |
"convention in the repository. Forcing certain files to this convention\n"
|
|
12162 |
"may also help users who do not have rules configured. To do this, set\n"
|
|
12163 |
"``eol`` to one of the values below."
|
|
12164 |
msgstr "" |
|
12165 |
||
12166 |
#: en/help_topics/eol.txt:97
|
|
12167 |
msgid "" |
|
12168 |
" ============================ ======================== "
|
|
12169 |
"======================\n"
|
|
12170 |
" Value Checkout end-of-lines as Commit end-of-lines "
|
|
12171 |
"as\n"
|
|
12172 |
" ============================ ======================== "
|
|
12173 |
"======================\n"
|
|
12174 |
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
|
|
12175 |
" ``lf`` otherwise\n"
|
|
12176 |
" ---------------------------- ------------------------ ----------------------"
|
|
12177 |
"\n"
|
|
12178 |
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
|
|
12179 |
" ---------------------------- ------------------------ ----------------------"
|
|
12180 |
"\n"
|
|
12181 |
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
|
|
12182 |
" ============================ ======================== ======================"
|
|
12183 |
msgstr "" |
|
12184 |
||
12185 |
#: en/help_topics/eol.txt:108
|
|
12186 |
msgid "" |
|
12187 |
"For users working on an existing project that uses Windows newline\n"
|
|
12188 |
"conventions in their Bazaar repository, this rule is suggested as a\n"
|
|
12189 |
"starting point::"
|
|
12190 |
msgstr "" |
|
12191 |
||
12192 |
#: en/help_topics/eol.txt:112
|
|
12193 |
msgid "" |
|
12194 |
" [name *]\n"
|
|
12195 |
" eol = native-with-crlf-in-repo"
|
|
12196 |
msgstr "" |
|
12197 |
||
12198 |
#: en/help_topics/eol.txt:115
|
|
12199 |
msgid "" |
|
12200 |
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
|
|
12201 |
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
|
|
12202 |
"``crlf`` and ``exact``."
|
|
12203 |
msgstr "" |
|
12204 |
||
12205 |
#: en/help_topics/eol.txt:119
|
|
12206 |
msgid "" |
|
12207 |
"Note: Bazaar's EOL conversion will convert the content of files but\n" |
|
12208 |
"never reject files because a given line ending or mixed line endings\n"
|
|
12209 |
"are found. A precommit hook should be used if you wish to validate\n"
|
|
12210 |
"(and not just convert) content before committing.\n"
|
|
12211 |
msgstr "" |
|
12212 |
||
12213 |
#: en/help_topics/hidden-commands.txt:1
|
|
12214 |
msgid "" |
|
12215 |
"added List files added in working tree.\n"
|
|
12216 |
"ancestry List all revisions merged into this branch.\n"
|
|
12217 |
"assert-fail Test reporting of assertion failures\n"
|
|
12218 |
"bundle-info Output interesting stats about a bundle\n"
|
|
12219 |
"bundle-revisions Create a merge-directive for submitting changes.\n"
|
|
12220 |
"cat-revision Write out metadata for a revision.\n"
|
|
12221 |
"dump-btree Dump the contents of a btree index file to stdout.\n"
|
|
12222 |
"export-pot Export command helps and error messages in po format.\n"
|
|
12223 |
"file-id Print file_id of a particular file or directory.\n"
|
|
12224 |
"file-path Print path of file_ids to a file or directory.\n"
|
|
12225 |
"find-merge-base Find and print a base revision for merging two "
|
|
12226 |
"branches.\n"
|
|
12227 |
"hooks Show hooks.\n"
|
|
12228 |
"inventory Show inventory of the current working copy or a "
|
|
12229 |
"revision.\n"
|
|
12230 |
"local-time-offset Show the offset in seconds from GMT to local time.\n"
|
|
12231 |
"lookup-revision Lookup the revision-id from a revision-number\n"
|
|
12232 |
"merge-directive Generate a merge directive for auto-merge tools.\n"
|
|
12233 |
"modified List files modified in working tree.\n"
|
|
12234 |
"re-sign Create a digital signature for an existing revision.\n"
|
|
12235 |
"reference list, view and set branch locations for nested trees.\n"
|
|
12236 |
"relpath Show path of a file relative to root\n"
|
|
12237 |
"repair-workingtree Reset the working tree state file.\n"
|
|
12238 |
"revision-history Display the list of revision ids on a branch.\n"
|
|
12239 |
"revision-info Show revision number and revision id for a given "
|
|
12240 |
"revision\n"
|
|
12241 |
" identifier.\n"
|
|
12242 |
"rocks Statement of optimism.\n"
|
|
12243 |
"selftest Run internal test suite.\n"
|
|
12244 |
"shell-complete Show appropriate completions for context.\n"
|
|
12245 |
"test-script Run a shell-like test from a file.\n"
|
|
12246 |
"touching-revisions Return revision-ids which affected a particular file.\n"
|
|
12247 |
"unknowns List unknown files.\n"
|
|
12248 |
"wait-until-signalled Test helper for\n"
|
|
12249 |
" test_start_and_stop_bzr_subprocess_send_signal.\n"
|
|
12250 |
msgstr "" |
|
12251 |
||
12252 |
#: en/help_topics/hooks.txt:1
|
|
12253 |
msgid "" |
|
12254 |
"\n"
|
|
12255 |
"Hooks\n"
|
|
12256 |
"====="
|
|
12257 |
msgstr "" |
|
12258 |
||
12259 |
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
|
|
12260 |
msgid "" |
|
12261 |
"Introduction\n"
|
|
12262 |
"------------"
|
|
12263 |
msgstr "" |
|
12264 |
||
12265 |
#: en/help_topics/hooks.txt:8
|
|
12266 |
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::" |
|
12267 |
msgstr "" |
|
12268 |
||
12269 |
#: en/help_topics/hooks.txt:10
|
|
12270 |
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)" |
|
12271 |
msgstr "" |
|
12272 |
||
12273 |
#: en/help_topics/hooks.txt:12
|
|
12274 |
msgid "" |
|
12275 |
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
|
|
12276 |
msgstr "" |
|
12277 |
||
12278 |
#: en/help_topics/hooks.txt:14
|
|
12279 |
msgid "" |
|
12280 |
"The class that contains each hook is given before the hooks it supplies. "
|
|
12281 |
"For\n"
|
|
12282 |
"instance, BranchHooks as the class is the hooks class for\n"
|
|
12283 |
"`bzrlib.branch.Branch.hooks`."
|
|
12284 |
msgstr "" |
|
12285 |
||
12286 |
#: en/help_topics/hooks.txt:18
|
|
12287 |
msgid "" |
|
12288 |
"Each description also indicates whether the hook runs on the client (the\n"
|
|
12289 |
"machine where bzr was invoked) or the server (the machine addressed by\n"
|
|
12290 |
"the branch URL). These may be, but are not necessarily, the same machine."
|
|
12291 |
msgstr "" |
|
12292 |
||
12293 |
#: en/help_topics/hooks.txt:22
|
|
12294 |
msgid "" |
|
12295 |
"Plugins (including hooks) are run on the server if all of these is true:"
|
|
12296 |
msgstr "" |
|
12297 |
||
12298 |
#: en/help_topics/hooks.txt:24
|
|
12299 |
msgid "" |
|
12300 |
" * The connection is via a smart server (accessed with a URL starting with\n"
|
|
12301 |
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
|
|
12302 |
"\"http://\"\n"
|
|
12303 |
" URL when a smart server is available via HTTP)."
|
|
12304 |
msgstr "" |
|
12305 |
||
12306 |
#: en/help_topics/hooks.txt:28
|
|
12307 |
msgid "" |
|
12308 |
" * The hook is either server specific or part of general infrastructure "
|
|
12309 |
"rather\n"
|
|
12310 |
" than client specific code (such as commit)."
|
|
12311 |
msgstr "" |
|
12312 |
||
12313 |
#: en/help_topics/hooks.txt:31
|
|
12314 |
msgid "" |
|
12315 |
"\n"
|
|
12316 |
"BranchHooks\n"
|
|
12317 |
"-----------"
|
|
12318 |
msgstr "" |
|
12319 |
||
12320 |
#: en/help_topics/hooks.txt:35
|
|
12321 |
msgid "" |
|
12322 |
"automatic_tag_name\n"
|
|
12323 |
"~~~~~~~~~~~~~~~~~~"
|
|
12324 |
msgstr "" |
|
12325 |
||
12326 |
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
|
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12327 |
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12328 |
msgid "Introduced in: 2.2" |
12329 |
msgstr "" |
|
12330 |
||
12331 |
#: en/help_topics/hooks.txt:40
|
|
12332 |
msgid "" |
|
12333 |
"Called to determine an automatic tag name for a revision.\n"
|
|
12334 |
"automatic_tag_name is called with (branch, revision_id) and should\n"
|
|
12335 |
"return a tag name or None if no tag name could be determined. The\n"
|
|
12336 |
"first non-None tag name returned will be used."
|
|
12337 |
msgstr "" |
|
12338 |
||
12339 |
#: en/help_topics/hooks.txt:45
|
|
12340 |
msgid "" |
|
12341 |
"open\n"
|
|
12342 |
"~~~~"
|
|
12343 |
msgstr "" |
|
12344 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12345 |
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
|
12346 |
#: en/help_topics/hooks.txt:307
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12347 |
msgid "Introduced in: 1.8" |
12348 |
msgstr "" |
|
12349 |
||
12350 |
#: en/help_topics/hooks.txt:50
|
|
12351 |
msgid "" |
|
12352 |
"Called with the Branch object that has been opened after a branch is\n"
|
|
12353 |
"opened."
|
|
12354 |
msgstr "" |
|
12355 |
||
12356 |
#: en/help_topics/hooks.txt:53
|
|
12357 |
msgid "" |
|
12358 |
"post_branch_init\n"
|
|
12359 |
"~~~~~~~~~~~~~~~~"
|
|
12360 |
msgstr "" |
|
12361 |
||
12362 |
#: en/help_topics/hooks.txt:58
|
|
12363 |
msgid "" |
|
12364 |
"Called after new branch initialization completes. post_branch_init is\n"
|
|
12365 |
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
|
|
12366 |
"branch and checkout (both heavyweight and lightweight) will all\n"
|
|
12367 |
"trigger this hook."
|
|
12368 |
msgstr "" |
|
12369 |
||
12370 |
#: en/help_topics/hooks.txt:63
|
|
12371 |
msgid "" |
|
12372 |
"post_change_branch_tip\n"
|
|
12373 |
"~~~~~~~~~~~~~~~~~~~~~~"
|
|
12374 |
msgstr "" |
|
12375 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12376 |
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12377 |
msgid "Introduced in: 1.4" |
12378 |
msgstr "" |
|
12379 |
||
12380 |
#: en/help_topics/hooks.txt:68
|
|
12381 |
msgid "" |
|
12382 |
"Called in bzr client and server after a change to the tip of a branch\n"
|
|
12383 |
"is made. post_change_branch_tip is called with a\n"
|
|
12384 |
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
|
|
12385 |
"uncommit will all trigger this hook."
|
|
12386 |
msgstr "" |
|
12387 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12388 |
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12389 |
msgid "" |
12390 |
"post_commit\n"
|
|
12391 |
"~~~~~~~~~~~"
|
|
12392 |
msgstr "" |
|
12393 |
||
12394 |
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
|
|
12395 |
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
|
|
12396 |
msgid "Introduced in: 0.15" |
|
12397 |
msgstr "" |
|
12398 |
||
12399 |
#: en/help_topics/hooks.txt:78
|
|
12400 |
msgid "" |
|
12401 |
"Called in the bzr client after a commit has completed. post_commit is\n"
|
|
12402 |
"called with (local, master, old_revno, old_revid, new_revno,\n"
|
|
12403 |
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
|
|
12404 |
"branch."
|
|
12405 |
msgstr "" |
|
12406 |
||
12407 |
#: en/help_topics/hooks.txt:83
|
|
12408 |
msgid "" |
|
12409 |
"post_pull\n"
|
|
12410 |
"~~~~~~~~~"
|
|
12411 |
msgstr "" |
|
12412 |
||
12413 |
#: en/help_topics/hooks.txt:88
|
|
12414 |
msgid "" |
|
12415 |
"Called after a pull operation completes. post_pull is called with a\n"
|
|
12416 |
"bzrlib.branch.PullResult object and only runs in the bzr client."
|
|
12417 |
msgstr "" |
|
12418 |
||
12419 |
#: en/help_topics/hooks.txt:91
|
|
12420 |
msgid "" |
|
12421 |
"post_push\n"
|
|
12422 |
"~~~~~~~~~"
|
|
12423 |
msgstr "" |
|
12424 |
||
12425 |
#: en/help_topics/hooks.txt:96
|
|
12426 |
msgid "" |
|
12427 |
"Called after a push operation completes. post_push is called with a\n"
|
|
12428 |
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
|
|
12429 |
msgstr "" |
|
12430 |
||
12431 |
#: en/help_topics/hooks.txt:99
|
|
12432 |
msgid "" |
|
12433 |
"post_switch\n"
|
|
12434 |
"~~~~~~~~~~~"
|
|
12435 |
msgstr "" |
|
12436 |
||
12437 |
#: en/help_topics/hooks.txt:104
|
|
12438 |
msgid "" |
|
12439 |
"Called after a checkout switches branch. post_switch is called with a\n"
|
|
12440 |
"bzrlib.branch.SwitchHookParams."
|
|
12441 |
msgstr "" |
|
12442 |
||
12443 |
#: en/help_topics/hooks.txt:107
|
|
12444 |
msgid "" |
|
12445 |
"post_uncommit\n"
|
|
12446 |
"~~~~~~~~~~~~~"
|
|
12447 |
msgstr "" |
|
12448 |
||
12449 |
#: en/help_topics/hooks.txt:112
|
|
12450 |
msgid "" |
|
12451 |
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
|
|
12452 |
"called with (local, master, old_revno, old_revid, new_revno,\n"
|
|
12453 |
"new_revid) where local is the local branch or None, master is the\n"
|
|
12454 |
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
|
|
12455 |
"of None."
|
|
12456 |
msgstr "" |
|
12457 |
||
12458 |
#: en/help_topics/hooks.txt:118
|
|
12459 |
msgid "" |
|
12460 |
"pre_change_branch_tip\n"
|
|
12461 |
"~~~~~~~~~~~~~~~~~~~~~"
|
|
12462 |
msgstr "" |
|
12463 |
||
12464 |
#: en/help_topics/hooks.txt:121
|
|
12465 |
msgid "Introduced in: 1.6" |
|
12466 |
msgstr "" |
|
12467 |
||
12468 |
#: en/help_topics/hooks.txt:123
|
|
12469 |
msgid "" |
|
12470 |
"Called in bzr client and server before a change to the tip of a branch\n"
|
|
12471 |
"is made. pre_change_branch_tip is called with a\n"
|
|
12472 |
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
|
|
12473 |
"uncommit will all trigger this hook."
|
|
12474 |
msgstr "" |
|
12475 |
||
12476 |
#: en/help_topics/hooks.txt:128
|
|
12477 |
msgid "" |
|
12478 |
"pre_commit\n"
|
|
12479 |
"~~~~~~~~~~"
|
|
12480 |
msgstr "" |
|
12481 |
||
12482 |
#: en/help_topics/hooks.txt:131
|
|
12483 |
msgid "Introduced in: 0.91" |
|
12484 |
msgstr "" |
|
12485 |
||
12486 |
#: en/help_topics/hooks.txt:133
|
|
12487 |
msgid "" |
|
12488 |
"Called after a commit is calculated but before it is completed.\n"
|
|
12489 |
"pre_commit is called with (local, master, old_revno, old_revid,\n"
|
|
12490 |
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
|
|
12491 |
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
|
|
12492 |
"TreeDelta object describing changes from the basis revision. hooks\n"
|
|
12493 |
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
|
|
12494 |
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
|
|
12495 |
"tree."
|
|
12496 |
msgstr "" |
|
12497 |
||
12498 |
#: en/help_topics/hooks.txt:142
|
|
12499 |
msgid "" |
|
12500 |
"transform_fallback_location\n"
|
|
12501 |
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
|
12502 |
msgstr "" |
|
12503 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12504 |
#: en/help_topics/hooks.txt:145
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12505 |
msgid "Introduced in: 1.9" |
12506 |
msgstr "" |
|
12507 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12508 |
#: en/help_topics/hooks.txt:147
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12509 |
msgid "" |
12510 |
"Called when a stacked branch is activating its fallback locations.\n"
|
|
12511 |
"transform_fallback_location is called with (branch, url), and should\n"
|
|
12512 |
"return a new url. Returning the same url allows it to be used as-is,\n"
|
|
12513 |
"returning a different one can be used to cause the branch to stack on\n"
|
|
12514 |
"a closer copy of that fallback_location. Note that the branch cannot\n"
|
|
12515 |
"have history accessing methods called on it during this hook because\n"
|
|
12516 |
"the fallback locations have not been activated. When there are\n"
|
|
12517 |
"multiple hooks installed for transform_fallback_location, all are\n"
|
|
12518 |
"called with the url returned from the previous hook.The order is\n"
|
|
12519 |
"however undefined."
|
|
12520 |
msgstr "" |
|
12521 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12522 |
#: en/help_topics/hooks.txt:158
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12523 |
msgid "" |
12524 |
"CommandHooks\n"
|
|
12525 |
"------------"
|
|
12526 |
msgstr "" |
|
12527 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12528 |
#: en/help_topics/hooks.txt:161
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12529 |
msgid "" |
12530 |
"extend_command\n"
|
|
12531 |
"~~~~~~~~~~~~~~"
|
|
12532 |
msgstr "" |
|
12533 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12534 |
#: en/help_topics/hooks.txt:164
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12535 |
msgid "Introduced in: 1.13" |
12536 |
msgstr "" |
|
12537 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12538 |
#: en/help_topics/hooks.txt:166
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12539 |
msgid "" |
12540 |
"Called after creating a command object to allow modifications such as\n"
|
|
12541 |
"adding or removing options, docs etc. Called with the new\n"
|
|
12542 |
"bzrlib.commands.Command object."
|
|
12543 |
msgstr "" |
|
12544 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12545 |
#: en/help_topics/hooks.txt:170
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12546 |
msgid "" |
12547 |
"get_command\n"
|
|
12548 |
"~~~~~~~~~~~"
|
|
12549 |
msgstr "" |
|
12550 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12551 |
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
|
12552 |
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12553 |
msgid "Introduced in: 1.17" |
12554 |
msgstr "" |
|
12555 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12556 |
#: en/help_topics/hooks.txt:175
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12557 |
msgid "" |
12558 |
"Called when creating a single command. Called with (cmd_or_None,\n"
|
|
12559 |
"command_name). get_command should either return the cmd_or_None\n"
|
|
12560 |
"parameter, or a replacement Command object that should be used for the\n"
|
|
12561 |
"command. Note that the Command.hooks hooks are core infrastructure.\n"
|
|
12562 |
"Many users will prefer to use bzrlib.commands.register_command or\n"
|
|
12563 |
"plugin_cmds.register_lazy."
|
|
12564 |
msgstr "" |
|
12565 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12566 |
#: en/help_topics/hooks.txt:182
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12567 |
msgid "" |
12568 |
"get_missing_command\n"
|
|
12569 |
"~~~~~~~~~~~~~~~~~~~"
|
|
12570 |
msgstr "" |
|
12571 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12572 |
#: en/help_topics/hooks.txt:187
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12573 |
msgid "" |
12574 |
"Called when creating a single command if no command could be found.\n"
|
|
12575 |
"Called with (command_name). get_missing_command should either return\n"
|
|
12576 |
"None, or a Command object to be used for the command."
|
|
12577 |
msgstr "" |
|
12578 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12579 |
#: en/help_topics/hooks.txt:191
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12580 |
msgid "" |
12581 |
"list_commands\n"
|
|
12582 |
"~~~~~~~~~~~~~"
|
|
12583 |
msgstr "" |
|
12584 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12585 |
#: en/help_topics/hooks.txt:196
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12586 |
msgid "" |
12587 |
"Called when enumerating commands. Called with a set of cmd_name\n"
|
|
12588 |
"strings for all the commands found so far. This set is safe to mutate\n"
|
|
12589 |
"- e.g. to remove a command. list_commands should return the updated\n"
|
|
12590 |
"set of command names."
|
|
12591 |
msgstr "" |
|
12592 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12593 |
#: en/help_topics/hooks.txt:201
|
12594 |
msgid "" |
|
12595 |
"post_command\n"
|
|
12596 |
"~~~~~~~~~~~~"
|
|
12597 |
msgstr "" |
|
12598 |
||
12599 |
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
|
|
12600 |
msgid "Introduced in: 2.6" |
|
12601 |
msgstr "" |
|
12602 |
||
12603 |
#: en/help_topics/hooks.txt:206
|
|
12604 |
msgid "Called after executing a command. Called with the command object." |
|
12605 |
msgstr "" |
|
12606 |
||
12607 |
#: en/help_topics/hooks.txt:208
|
|
12608 |
msgid "" |
|
12609 |
"pre_command\n"
|
|
12610 |
"~~~~~~~~~~~"
|
|
12611 |
msgstr "" |
|
12612 |
||
12613 |
#: en/help_topics/hooks.txt:213
|
|
12614 |
msgid "Called prior to executing a command. Called with the command object." |
|
12615 |
msgstr "" |
|
12616 |
||
12617 |
#: en/help_topics/hooks.txt:215
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12618 |
msgid "" |
12619 |
"_ConfigHooks\n"
|
|
12620 |
"------------"
|
|
12621 |
msgstr "" |
|
12622 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12623 |
#: en/help_topics/hooks.txt:218
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12624 |
msgid "" |
12625 |
"get\n"
|
|
12626 |
"~~~"
|
|
12627 |
msgstr "" |
|
12628 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12629 |
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
|
12630 |
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
|
|
12631 |
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
|
|
12632 |
#: en/help_topics/hooks.txt:446
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12633 |
msgid "Introduced in: 2.4" |
12634 |
msgstr "" |
|
12635 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12636 |
#: en/help_topics/hooks.txt:223
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12637 |
msgid "" |
12638 |
"Invoked when a config option is read. The signature is (stack, name,\n"
|
|
12639 |
"value)."
|
|
12640 |
msgstr "" |
|
12641 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12642 |
#: en/help_topics/hooks.txt:226
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12643 |
msgid "" |
12644 |
"load\n"
|
|
12645 |
"~~~~"
|
|
12646 |
msgstr "" |
|
12647 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12648 |
#: en/help_topics/hooks.txt:231
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12649 |
msgid "Invoked when a config store is loaded. The signature is (store)." |
12650 |
msgstr "" |
|
12651 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12652 |
#: en/help_topics/hooks.txt:233
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12653 |
msgid "" |
12654 |
"remove\n"
|
|
12655 |
"~~~~~~"
|
|
12656 |
msgstr "" |
|
12657 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12658 |
#: en/help_topics/hooks.txt:238
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12659 |
msgid "" |
12660 |
"Invoked when a config option is removed. The signature is (stack,\n"
|
|
12661 |
"name)."
|
|
12662 |
msgstr "" |
|
12663 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12664 |
#: en/help_topics/hooks.txt:241
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12665 |
msgid "" |
12666 |
"save\n"
|
|
12667 |
"~~~~"
|
|
12668 |
msgstr "" |
|
12669 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12670 |
#: en/help_topics/hooks.txt:246
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12671 |
msgid "Invoked when a config store is saved. The signature is (store)." |
12672 |
msgstr "" |
|
12673 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12674 |
#: en/help_topics/hooks.txt:248
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12675 |
msgid "" |
12676 |
"set\n"
|
|
12677 |
"~~~"
|
|
12678 |
msgstr "" |
|
12679 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12680 |
#: en/help_topics/hooks.txt:253
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12681 |
msgid "" |
12682 |
"Invoked when a config option is set. The signature is (stack, name,\n"
|
|
12683 |
"value)."
|
|
12684 |
msgstr "" |
|
12685 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12686 |
#: en/help_topics/hooks.txt:256
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12687 |
msgid "" |
12688 |
"ControlDirHooks\n"
|
|
12689 |
"---------------"
|
|
12690 |
msgstr "" |
|
12691 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12692 |
#: en/help_topics/hooks.txt:259
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12693 |
msgid "" |
12694 |
"post_repo_init\n"
|
|
12695 |
"~~~~~~~~~~~~~~"
|
|
12696 |
msgstr "" |
|
12697 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12698 |
#: en/help_topics/hooks.txt:264
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12699 |
msgid "" |
12700 |
"Invoked after a repository has been initialized. post_repo_init is\n"
|
|
12701 |
"called with a bzrlib.controldir.RepoInitHookParams."
|
|
12702 |
msgstr "" |
|
12703 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12704 |
#: en/help_topics/hooks.txt:267
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12705 |
msgid "" |
12706 |
"pre_open\n"
|
|
12707 |
"~~~~~~~~"
|
|
12708 |
msgstr "" |
|
12709 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12710 |
#: en/help_topics/hooks.txt:270
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12711 |
msgid "Introduced in: 1.14" |
12712 |
msgstr "" |
|
12713 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12714 |
#: en/help_topics/hooks.txt:272
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12715 |
msgid "" |
12716 |
"Invoked before attempting to open a ControlDir with the transport that\n"
|
|
12717 |
"the open will use."
|
|
12718 |
msgstr "" |
|
12719 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12720 |
#: en/help_topics/hooks.txt:275
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12721 |
msgid "" |
12722 |
"InfoHooks\n"
|
|
12723 |
"---------"
|
|
12724 |
msgstr "" |
|
12725 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12726 |
#: en/help_topics/hooks.txt:278
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12727 |
msgid "" |
12728 |
"repository\n"
|
|
12729 |
"~~~~~~~~~~"
|
|
12730 |
msgstr "" |
|
12731 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12732 |
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
|
12733 |
#: en/help_topics/hooks.txt:524
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12734 |
msgid "Introduced in: 1.15" |
12735 |
msgstr "" |
|
12736 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12737 |
#: en/help_topics/hooks.txt:283
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12738 |
msgid "" |
12739 |
"Invoked when displaying the statistics for a repository. repository is\n"
|
|
12740 |
"called with a statistics dictionary as returned by the repository and\n"
|
|
12741 |
"a file-like object to write to."
|
|
12742 |
msgstr "" |
|
12743 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12744 |
#: en/help_topics/hooks.txt:287
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12745 |
msgid "" |
12746 |
"LockHooks\n"
|
|
12747 |
"---------"
|
|
12748 |
msgstr "" |
|
12749 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12750 |
#: en/help_topics/hooks.txt:290
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12751 |
msgid "" |
12752 |
"lock_acquired\n"
|
|
12753 |
"~~~~~~~~~~~~~"
|
|
12754 |
msgstr "" |
|
12755 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12756 |
#: en/help_topics/hooks.txt:295
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12757 |
msgid "" |
12758 |
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
|
|
12759 |
msgstr "" |
|
12760 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12761 |
#: en/help_topics/hooks.txt:297
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12762 |
msgid "" |
12763 |
"lock_broken\n"
|
|
12764 |
"~~~~~~~~~~~"
|
|
12765 |
msgstr "" |
|
12766 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12767 |
#: en/help_topics/hooks.txt:302
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12768 |
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken." |
12769 |
msgstr "" |
|
12770 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12771 |
#: en/help_topics/hooks.txt:304
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12772 |
msgid "" |
12773 |
"lock_released\n"
|
|
12774 |
"~~~~~~~~~~~~~"
|
|
12775 |
msgstr "" |
|
12776 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12777 |
#: en/help_topics/hooks.txt:309
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12778 |
msgid "" |
12779 |
"Called with a bzrlib.lock.LockResult when a physical lock is released."
|
|
12780 |
msgstr "" |
|
12781 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12782 |
#: en/help_topics/hooks.txt:311
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12783 |
msgid "" |
12784 |
"MergeHooks\n"
|
|
12785 |
"----------"
|
|
12786 |
msgstr "" |
|
12787 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12788 |
#: en/help_topics/hooks.txt:314
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12789 |
msgid "" |
12790 |
"merge_file_content\n"
|
|
12791 |
"~~~~~~~~~~~~~~~~~~"
|
|
12792 |
msgstr "" |
|
12793 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12794 |
#: en/help_topics/hooks.txt:317
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12795 |
msgid "Introduced in: 2.1" |
12796 |
msgstr "" |
|
12797 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12798 |
#: en/help_topics/hooks.txt:319
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12799 |
msgid "" |
12800 |
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
|
|
12801 |
"object when starting a merge. Should return either None or a subclass\n"
|
|
12802 |
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
|
|
12803 |
"called per file that needs to be merged (including when one side has\n"
|
|
12804 |
"deleted the file and the other has changed it). See the\n"
|
|
12805 |
"AbstractPerFileMerger API docs for details on how it is used by merge."
|
|
12806 |
msgstr "" |
|
12807 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12808 |
#: en/help_topics/hooks.txt:326
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12809 |
msgid "" |
12810 |
"post_merge\n"
|
|
12811 |
"~~~~~~~~~~"
|
|
12812 |
msgstr "" |
|
12813 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12814 |
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
|
12815 |
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
|
|
12816 |
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
|
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12817 |
msgid "Introduced in: 2.5" |
12818 |
msgstr "" |
|
12819 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12820 |
#: en/help_topics/hooks.txt:331
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12821 |
msgid "" |
12822 |
"Called after a merge. Receives a Merger object as the single argument.\n"
|
|
12823 |
"The return value is ignored."
|
|
12824 |
msgstr "" |
|
12825 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12826 |
#: en/help_topics/hooks.txt:334
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12827 |
msgid "" |
12828 |
"pre_merge\n"
|
|
12829 |
"~~~~~~~~~"
|
|
12830 |
msgstr "" |
|
12831 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12832 |
#: en/help_topics/hooks.txt:339
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12833 |
msgid "" |
12834 |
"Called before a merge. Receives a Merger object as the single\n"
|
|
12835 |
"argument."
|
|
12836 |
msgstr "" |
|
12837 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12838 |
#: en/help_topics/hooks.txt:342
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12839 |
msgid "" |
12840 |
"MergeDirectiveHooks\n"
|
|
12841 |
"-------------------"
|
|
12842 |
msgstr "" |
|
12843 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12844 |
#: en/help_topics/hooks.txt:345
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12845 |
msgid "" |
12846 |
"merge_request_body\n"
|
|
12847 |
"~~~~~~~~~~~~~~~~~~"
|
|
12848 |
msgstr "" |
|
12849 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12850 |
#: en/help_topics/hooks.txt:348
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12851 |
msgid "Introduced in: 1.15.0" |
12852 |
msgstr "" |
|
12853 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12854 |
#: en/help_topics/hooks.txt:350
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12855 |
msgid "" |
12856 |
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
|
|
12857 |
"request. Callbacks must return a body. If more than one callback is\n"
|
|
12858 |
"registered, the output of one callback is provided to the next."
|
|
12859 |
msgstr "" |
|
12860 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12861 |
#: en/help_topics/hooks.txt:354
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12862 |
msgid "" |
12863 |
"MessageEditorHooks\n"
|
|
12864 |
"------------------"
|
|
12865 |
msgstr "" |
|
12866 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12867 |
#: en/help_topics/hooks.txt:357
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12868 |
msgid "" |
12869 |
"commit_message_template\n"
|
|
12870 |
"~~~~~~~~~~~~~~~~~~~~~~~"
|
|
12871 |
msgstr "" |
|
12872 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12873 |
#: en/help_topics/hooks.txt:360
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12874 |
msgid "Introduced in: 1.10" |
12875 |
msgstr "" |
|
12876 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12877 |
#: en/help_topics/hooks.txt:362
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12878 |
msgid "" |
12879 |
"Called when a commit message is being generated.\n"
|
|
12880 |
"commit_message_template is called with the bzrlib.commit.Commit object\n"
|
|
12881 |
"and the message that is known so far. commit_message_template must\n"
|
|
12882 |
"return a new message to use (which could be the same as it was given).\n"
|
|
12883 |
"When there are multiple hooks registered for commit_message_template,\n"
|
|
12884 |
"they are chained with the result from the first passed into the\n"
|
|
12885 |
"second, and so on."
|
|
12886 |
msgstr "" |
|
12887 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12888 |
#: en/help_topics/hooks.txt:370
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12889 |
msgid "" |
12890 |
"set_commit_message\n"
|
|
12891 |
"~~~~~~~~~~~~~~~~~~"
|
|
12892 |
msgstr "" |
|
12893 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12894 |
#: en/help_topics/hooks.txt:375
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12895 |
msgid "" |
12896 |
"Set a fixed commit message. set_commit_message is called with the\n"
|
|
12897 |
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
|
|
12898 |
"properties by editing commit.builder._revprops) and the message so\n"
|
|
12899 |
"far. set_commit_message must return the message to use or None if it\n"
|
|
12900 |
"should use the message editor as normal."
|
|
12901 |
msgstr "" |
|
12902 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12903 |
#: en/help_topics/hooks.txt:381
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12904 |
msgid "" |
12905 |
"MutableTreeHooks\n"
|
|
12906 |
"----------------"
|
|
12907 |
msgstr "" |
|
12908 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12909 |
#: en/help_topics/hooks.txt:384
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12910 |
msgid "" |
12911 |
"post_build_tree\n"
|
|
12912 |
"~~~~~~~~~~~~~~~"
|
|
12913 |
msgstr "" |
|
12914 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12915 |
#: en/help_topics/hooks.txt:389
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12916 |
msgid "" |
12917 |
"Called after a completely new tree is built. The hook is called with\n"
|
|
12918 |
"the tree as its only argument."
|
|
12919 |
msgstr "" |
|
12920 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12921 |
#: en/help_topics/hooks.txt:395
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12922 |
msgid "Introduced in: 2.0" |
12923 |
msgstr "" |
|
12924 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12925 |
#: en/help_topics/hooks.txt:397
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12926 |
msgid "" |
12927 |
"Called after a commit is performed on a tree. The hook is called with\n"
|
|
12928 |
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
|
|
12929 |
"commit was performed on is available via the mutable_tree attribute of\n"
|
|
12930 |
"that object."
|
|
12931 |
msgstr "" |
|
12932 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12933 |
#: en/help_topics/hooks.txt:402
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12934 |
msgid "" |
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12935 |
"post_transform\n"
|
12936 |
"~~~~~~~~~~~~~~"
|
|
12937 |
msgstr "" |
|
12938 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12939 |
#: en/help_topics/hooks.txt:407
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12940 |
msgid "" |
12941 |
"Called after a tree transform has been performed on a tree. The hook\n"
|
|
12942 |
"is called with the tree that is being transformed and the transform."
|
|
12943 |
msgstr "" |
|
12944 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12945 |
#: en/help_topics/hooks.txt:410
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12946 |
msgid "" |
12947 |
"pre_transform\n"
|
|
12948 |
"~~~~~~~~~~~~~"
|
|
12949 |
msgstr "" |
|
12950 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12951 |
#: en/help_topics/hooks.txt:415
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12952 |
msgid "" |
12953 |
"Called before a tree transform on this tree. The hook is called with\n"
|
|
12954 |
"the tree that is being transformed and the transform."
|
|
12955 |
msgstr "" |
|
12956 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12957 |
#: en/help_topics/hooks.txt:418
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12958 |
msgid "" |
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12959 |
"start_commit\n"
|
12960 |
"~~~~~~~~~~~~"
|
|
12961 |
msgstr "" |
|
12962 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12963 |
#: en/help_topics/hooks.txt:423
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12964 |
msgid "" |
12965 |
"Called before a commit is performed on a tree. The start commit hook\n"
|
|
12966 |
"is able to change the tree before the commit takes place. start_commit\n"
|
|
12967 |
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
|
|
12968 |
"being performed on."
|
|
12969 |
msgstr "" |
|
12970 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12971 |
#: en/help_topics/hooks.txt:428
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12972 |
msgid "" |
12973 |
"SmartClientHooks\n"
|
|
12974 |
"----------------"
|
|
12975 |
msgstr "" |
|
12976 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12977 |
#: en/help_topics/hooks.txt:431
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12978 |
msgid "" |
12979 |
"call\n"
|
|
12980 |
"~~~~"
|
|
12981 |
msgstr "" |
|
12982 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12983 |
#: en/help_topics/hooks.txt:434
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12984 |
msgid "Introduced in: unknown" |
12985 |
msgstr "" |
|
12986 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12987 |
#: en/help_topics/hooks.txt:436
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12988 |
msgid "" |
12989 |
"Called when the smart client is submitting a request to the smart\n"
|
|
12990 |
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
|
|
12991 |
"Streaming request bodies, and responses, are not accessible."
|
|
12992 |
msgstr "" |
|
12993 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12994 |
#: en/help_topics/hooks.txt:440
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
12995 |
msgid "" |
12996 |
"SmartServerHooks\n"
|
|
12997 |
"----------------"
|
|
12998 |
msgstr "" |
|
12999 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13000 |
#: en/help_topics/hooks.txt:443
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13001 |
msgid "" |
13002 |
"server_exception\n"
|
|
13003 |
"~~~~~~~~~~~~~~~~"
|
|
13004 |
msgstr "" |
|
13005 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13006 |
#: en/help_topics/hooks.txt:448
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13007 |
msgid "" |
13008 |
"Called by the bzr server when an exception occurs. server_exception is\n"
|
|
13009 |
"called with the sys.exc_info() tuple return true for the hook if the\n"
|
|
13010 |
"exception has been handled, in which case the server will exit\n"
|
|
13011 |
"normally."
|
|
13012 |
msgstr "" |
|
13013 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13014 |
#: en/help_topics/hooks.txt:453
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13015 |
msgid "" |
13016 |
"server_started\n"
|
|
13017 |
"~~~~~~~~~~~~~~"
|
|
13018 |
msgstr "" |
|
13019 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13020 |
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13021 |
msgid "Introduced in: 0.16" |
13022 |
msgstr "" |
|
13023 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13024 |
#: en/help_topics/hooks.txt:458
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13025 |
msgid "" |
13026 |
"Called by the bzr server when it starts serving a directory.\n"
|
|
13027 |
"server_started is called with (backing urls, public url), where\n"
|
|
13028 |
"backing_url is a list of URLs giving the server-specific directory\n"
|
|
13029 |
"locations, and public_url is the public URL for the directory being\n"
|
|
13030 |
"served."
|
|
13031 |
msgstr "" |
|
13032 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13033 |
#: en/help_topics/hooks.txt:464
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13034 |
msgid "" |
13035 |
"server_started_ex\n"
|
|
13036 |
"~~~~~~~~~~~~~~~~~"
|
|
13037 |
msgstr "" |
|
13038 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13039 |
#: en/help_topics/hooks.txt:469
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13040 |
msgid "" |
13041 |
"Called by the bzr server when it starts serving a directory.\n"
|
|
13042 |
"server_started is called with (backing_urls, server_obj)."
|
|
13043 |
msgstr "" |
|
13044 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13045 |
#: en/help_topics/hooks.txt:472
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13046 |
msgid "" |
13047 |
"server_stopped\n"
|
|
13048 |
"~~~~~~~~~~~~~~"
|
|
13049 |
msgstr "" |
|
13050 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13051 |
#: en/help_topics/hooks.txt:477
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13052 |
msgid "" |
13053 |
"Called by the bzr server when it stops serving a directory.\n"
|
|
13054 |
"server_stopped is called with the same parameters as the\n"
|
|
13055 |
"server_started hook: (backing_urls, public_url)."
|
|
13056 |
msgstr "" |
|
13057 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13058 |
#: en/help_topics/hooks.txt:481
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13059 |
msgid "" |
13060 |
"StatusHooks\n"
|
|
13061 |
"-----------"
|
|
13062 |
msgstr "" |
|
13063 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13064 |
#: en/help_topics/hooks.txt:484
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13065 |
msgid "" |
13066 |
"post_status\n"
|
|
13067 |
"~~~~~~~~~~~"
|
|
13068 |
msgstr "" |
|
13069 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13070 |
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13071 |
msgid "Introduced in: 2.3" |
13072 |
msgstr "" |
|
13073 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13074 |
#: en/help_topics/hooks.txt:489
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13075 |
msgid "" |
13076 |
"Called with argument StatusHookParams after Bazaar has displayed the\n"
|
|
13077 |
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
|
|
13078 |
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
|
|
13079 |
"correspond to the command line options specified by the user for the\n"
|
|
13080 |
"status command. to_file is the output stream for writing."
|
|
13081 |
msgstr "" |
|
13082 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13083 |
#: en/help_topics/hooks.txt:495
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13084 |
msgid "" |
13085 |
"pre_status\n"
|
|
13086 |
"~~~~~~~~~~"
|
|
13087 |
msgstr "" |
|
13088 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13089 |
#: en/help_topics/hooks.txt:500
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13090 |
msgid "" |
13091 |
"Called with argument StatusHookParams before Bazaar displays the\n"
|
|
13092 |
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
|
|
13093 |
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
|
|
13094 |
"correspond to the command line options specified by the user for the\n"
|
|
13095 |
"status command. to_file is the output stream for writing."
|
|
13096 |
msgstr "" |
|
13097 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13098 |
#: en/help_topics/hooks.txt:506
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13099 |
msgid "" |
13100 |
"TransportHooks\n"
|
|
13101 |
"--------------"
|
|
13102 |
msgstr "" |
|
13103 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13104 |
#: en/help_topics/hooks.txt:509
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13105 |
msgid "" |
13106 |
"post_connect\n"
|
|
13107 |
"~~~~~~~~~~~~"
|
|
13108 |
msgstr "" |
|
13109 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13110 |
#: en/help_topics/hooks.txt:514
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13111 |
msgid "" |
13112 |
"Called after a new connection is established or a reconnect occurs.\n"
|
|
13113 |
"The sole argument passed is either the connected transport or smart\n"
|
|
13114 |
"medium instance."
|
|
13115 |
msgstr "" |
|
13116 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13117 |
#: en/help_topics/hooks.txt:518
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13118 |
msgid "" |
13119 |
"RioVersionInfoBuilderHooks\n"
|
|
13120 |
"--------------------------"
|
|
13121 |
msgstr "" |
|
13122 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13123 |
#: en/help_topics/hooks.txt:521
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13124 |
msgid "" |
13125 |
"revision\n"
|
|
13126 |
"~~~~~~~~"
|
|
13127 |
msgstr "" |
|
13128 |
||
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13129 |
#: en/help_topics/hooks.txt:526
|
6437.2.3
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13130 |
msgid "" |
13131 |
"Invoked when adding information about a revision to the RIO stanza\n"
|
|
13132 |
"that is printed. revision is called with a revision object and a RIO\n"
|
|
13133 |
"stanza.\n"
|
|
13134 |
msgstr "" |
|
13135 |
||
13136 |
#: en/help_topics/location-alias.txt:1
|
|
13137 |
msgid "" |
|
13138 |
"Location aliases\n"
|
|
13139 |
"================"
|
|
13140 |
msgstr "" |
|
13141 |
||
13142 |
#: en/help_topics/location-alias.txt:4
|
|
13143 |
msgid "" |
|
13144 |
"Bazaar defines several aliases for locations associated with a branch. "
|
|
13145 |
"These\n"
|
|
13146 |
"can be used with most commands that expect a location, such as `bzr push`."
|
|
13147 |
msgstr "" |
|
13148 |
||
13149 |
#: en/help_topics/location-alias.txt:7
|
|
13150 |
msgid "The aliases are::" |
|
13151 |
msgstr "" |
|
13152 |
||
13153 |
#: en/help_topics/location-alias.txt:9
|
|
13154 |
msgid "" |
|
13155 |
" :bound The branch this branch is bound to, for bound branches.\n"
|
|
13156 |
" :parent The parent of this branch.\n"
|
|
13157 |
" :public The public location of this branch.\n"
|
|
13158 |
" :push The saved location used for `bzr push` with no arguments.\n"
|
|
13159 |
" :submit The submit branch for this branch.\n"
|
|
13160 |
" :this This branch."
|
|
13161 |
msgstr "" |
|
13162 |
||
13163 |
#: en/help_topics/location-alias.txt:16
|
|
13164 |
msgid "For example, to push to the parent location::" |
|
13165 |
msgstr "" |
|
13166 |
||
13167 |
#: en/help_topics/location-alias.txt:18
|
|
13168 |
msgid " bzr push :parent\n" |
|
13169 |
msgstr "" |
|
13170 |
||
13171 |
#: en/help_topics/log-formats.txt:1
|
|
13172 |
msgid "" |
|
13173 |
"Log Formats\n"
|
|
13174 |
"==========="
|
|
13175 |
msgstr "" |
|
13176 |
||
13177 |
#: en/help_topics/log-formats.txt:4
|
|
13178 |
msgid "" |
|
13179 |
"A log format controls how information about each revision is displayed.\n"
|
|
13180 |
"The standard log formats are compared below::"
|
|
13181 |
msgstr "" |
|
13182 |
||
13183 |
#: en/help_topics/log-formats.txt:7
|
|
13184 |
msgid "" |
|
13185 |
" Feature long short line\n"
|
|
13186 |
" ---------------------- ------------- ------------ -------------------\n"
|
|
13187 |
" design goal detailed view concise view 1 revision per line\n"
|
|
13188 |
" committer name+email name only name only\n"
|
|
13189 |
" author name+email - -\n"
|
|
13190 |
" date-time format full date only date only\n"
|
|
13191 |
" commit message full full top line\n"
|
|
13192 |
" tags yes yes yes\n"
|
|
13193 |
" merges indicator - yes -\n"
|
|
13194 |
" status/delta optional optional -\n"
|
|
13195 |
" diff/patch optional optional -\n"
|
|
13196 |
" revision-id optional optional -\n"
|
|
13197 |
" branch nick yes - -\n"
|
|
13198 |
" foreign vcs properties yes yes -\n"
|
|
13199 |
" preferred levels all 1 1\n"
|
|
13200 |
" digital signature optional - -"
|
|
13201 |
msgstr "" |
|
13202 |
||
13203 |
#: en/help_topics/log-formats.txt:24
|
|
13204 |
msgid "" |
|
13205 |
"The default format is ``long``. To change this, define the ``log_format``\n"
|
|
13206 |
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
|
|
13207 |
msgstr "" |
|
13208 |
||
13209 |
#: en/help_topics/log-formats.txt:27
|
|
13210 |
msgid "" |
|
13211 |
" [DEFAULT]\n"
|
|
13212 |
" log_format = short"
|
|
13213 |
msgstr "" |
|
13214 |
||
13215 |
#: en/help_topics/log-formats.txt:30
|
|
13216 |
msgid "" |
|
13217 |
"Alternatively, to change the log format used for a given query, use the\n"
|
|
13218 |
"--long, --short or --line options."
|
|
13219 |
msgstr "" |
|
13220 |
||
13221 |
#: en/help_topics/log-formats.txt:33
|
|
13222 |
msgid "" |
|
13223 |
"If one of the standard log formats does not meet your needs, additional\n"
|
|
13224 |
"formats can be provided by plugins.\n"
|
|
13225 |
msgstr "" |
|
13226 |
||
13227 |
#: en/help_topics/other-formats.txt:1
|
|
13228 |
msgid "Other Storage Formats" |
|
13229 |
msgstr "" |
|
13230 |
||
13231 |
#: en/help_topics/other-formats.txt:3
|
|
13232 |
msgid "Experimental formats are shown below." |
|
13233 |
msgstr "" |
|
13234 |
||
13235 |
#: en/help_topics/other-formats.txt:5
|
|
13236 |
msgid "" |
|
13237 |
":development-colo:\n"
|
|
13238 |
" (native) The 2a format with experimental support for colocated\n"
|
|
13239 |
" branches."
|
|
13240 |
msgstr "" |
|
13241 |
||
13242 |
#: en/help_topics/other-formats.txt:9
|
|
13243 |
msgid "" |
|
13244 |
"\n"
|
|
13245 |
"Deprecated formats are shown below."
|
|
13246 |
msgstr "" |
|
13247 |
||
13248 |
#: en/help_topics/other-formats.txt:12
|
|
13249 |
msgid "" |
|
13250 |
":pack-0.92:\n"
|
|
13251 |
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
|
|
13252 |
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
|
|
13253 |
" by bzr < 0.92."
|
|
13254 |
msgstr "" |
|
13255 |
||
13256 |
#: en/help_topics/patterns.txt:1
|
|
13257 |
msgid "" |
|
13258 |
"Patterns\n"
|
|
13259 |
"========"
|
|
13260 |
msgstr "" |
|
13261 |
||
13262 |
#: en/help_topics/patterns.txt:4
|
|
13263 |
msgid "" |
|
13264 |
"Bazaar uses patterns to match files at various times. For example,\n"
|
|
13265 |
"the ``add`` command skips over files that match ignore patterns\n"
|
|
13266 |
"and preferences can be associated with files using rule patterns.\n"
|
|
13267 |
"The pattern syntax is described below."
|
|
13268 |
msgstr "" |
|
13269 |
||
13270 |
#: en/help_topics/patterns.txt:9
|
|
13271 |
msgid "" |
|
13272 |
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
|
|
13273 |
"slash or is a regular expression, it is compared to the whole path\n"
|
|
13274 |
"from the branch root. Otherwise, it is compared to only the last\n"
|
|
13275 |
"component of the path. To match a file only in the root directory,\n"
|
|
13276 |
"prepend ``./``. Patterns specifying absolute paths are not allowed."
|
|
13277 |
msgstr "" |
|
13278 |
||
13279 |
#: en/help_topics/patterns.txt:15
|
|
13280 |
msgid "Patterns may include globbing wildcards such as::" |
|
13281 |
msgstr "" |
|
13282 |
||
13283 |
#: en/help_topics/patterns.txt:17
|
|
13284 |
msgid "" |
|
13285 |
" ? - Matches any single character except '/'\n"
|
|
13286 |
" * - Matches 0 or more characters except '/'\n"
|
|
13287 |
" /**/ - Matches 0 or more directories in a path\n"
|
|
13288 |
" [a-z] - Matches a single character from within a group of characters"
|
|
13289 |
msgstr "" |
|
13290 |
||
13291 |
#: en/help_topics/patterns.txt:22
|
|
13292 |
msgid "" |
|
13293 |
"Patterns may also be `Python regular expressions`_. Regular expression\n"
|
|
13294 |
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
|
|
13295 |
"expression. Regular expression patterns may not include named or\n"
|
|
13296 |
"numbered groups."
|
|
13297 |
msgstr "" |
|
13298 |
||
13299 |
#: en/help_topics/patterns.txt:27
|
|
13300 |
msgid "" |
|
13301 |
"Case insensitive ignore patterns can be specified with regular expressions\n"
|
|
13302 |
"by using the ``i`` (for ignore case) flag in the pattern."
|
|
13303 |
msgstr "" |
|
13304 |
||
13305 |
#: en/help_topics/patterns.txt:30
|
|
13306 |
msgid "" |
|
13307 |
"For example, a case insensitive match for ``foo`` may be specified as::"
|
|
13308 |
msgstr "" |
|
13309 |
||
13310 |
#: en/help_topics/patterns.txt:32
|
|
13311 |
msgid " RE:(?i)foo" |
|
13312 |
msgstr "" |
|
13313 |
||
13314 |
#: en/help_topics/patterns.txt:34
|
|
13315 |
msgid "" |
|
13316 |
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
|
|
13317 |
"matched by that pattern will not be ignored."
|
|
13318 |
msgstr "" |
|
13319 |
||
13320 |
#: en/help_topics/patterns.txt:37
|
|
13321 |
msgid "" |
|
13322 |
".. _Python regular expressions: http://docs.python.org/library/re.html"
|
|
13323 |
msgstr "" |
|
13324 |
||
13325 |
#: en/help_topics/revisionspec.txt:1
|
|
13326 |
msgid "Revision Identifiers" |
|
13327 |
msgstr "" |
|
13328 |
||
13329 |
#: en/help_topics/revisionspec.txt:3
|
|
13330 |
msgid "" |
|
13331 |
"A revision identifier refers to a specific state of a branch's history. It\n"
|
|
13332 |
"can be expressed in several ways. It can begin with a keyword to\n"
|
|
13333 |
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
|
|
13334 |
"'before:yesterday' and 'submit:'."
|
|
13335 |
msgstr "" |
|
13336 |
||
13337 |
#: en/help_topics/revisionspec.txt:8
|
|
13338 |
msgid "" |
|
13339 |
"Alternately, it can be given without a keyword, in which case it will be\n"
|
|
13340 |
"checked as a revision number, a tag, a revision id, a date specification, or "
|
|
13341 |
"a\n"
|
|
13342 |
"branch specification, in that order. For example, 'date:today' could be\n"
|
|
13343 |
"written as simply 'today', though if you have a tag called 'today' that "
|
|
13344 |
"will\n"
|
|
13345 |
"be found first."
|
|
13346 |
msgstr "" |
|
13347 |
||
13348 |
#: en/help_topics/revisionspec.txt:14
|
|
13349 |
msgid "" |
|
13350 |
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
|
|
13351 |
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
|
|
13352 |
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
|
|
13353 |
"or\n"
|
|
13354 |
"spaces around the '..')."
|
|
13355 |
msgstr "" |
|
13356 |
||
13357 |
#: en/help_topics/revisionspec.txt:19
|
|
13358 |
msgid "" |
|
13359 |
"Ranges are interpreted differently by different commands. To the \"log\" "
|
|
13360 |
"command,\n"
|
|
13361 |
"a range is a sequence of log messages, but to the \"diff\" command, the "
|
|
13362 |
"range\n"
|
|
13363 |
"denotes a change between revisions (and not a sequence of changes). In\n"
|
|
13364 |
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
|
|
13365 |
"consider it\n"
|
|
13366 |
"to be open-ended, that is, they include one end but not the other. For "
|
|
13367 |
"example:\n" |
|
13368 |
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
|
|
13369 |
"3649,\n"
|
|
13370 |
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
|
|
13371 |
"and\n"
|
|
13372 |
"3649, but not 3647."
|
|
13373 |
msgstr "" |
|
13374 |
||
13375 |
#: en/help_topics/revisionspec.txt:28
|
|
13376 |
msgid "The keywords used as revision selection methods are the following:" |
|
13377 |
msgstr "" |
|
13378 |
||
13379 |
#: en/help_topics/revisionspec.txt:30
|
|
13380 |
msgid "" |
|
13381 |
":revid:\n"
|
|
13382 |
"\tSelects a revision using the revision id.\n"
|
|
13383 |
":submit:\n"
|
|
13384 |
"\tSelects a common ancestor with the submit branch.\n"
|
|
13385 |
":ancestor:\n"
|
|
13386 |
"\tSelects a common ancestor with a second branch.\n"
|
|
13387 |
":date:\n"
|
|
13388 |
"\tSelects a revision on the basis of a datestamp.\n"
|
|
13389 |
":branch:\n"
|
|
13390 |
"\tSelects the last revision of a specified branch.\n"
|
|
13391 |
":tag:\n"
|
|
13392 |
"\tSelects a revision identified by a tag name.\n"
|
|
13393 |
":revno:\n"
|
|
13394 |
"\tSelects a revision using a number.\n"
|
|
13395 |
":before:\n"
|
|
13396 |
"\tSelects the parent of the revision specified.\n"
|
|
13397 |
":annotate:\n"
|
|
13398 |
"\tSelect the revision that last modified the specified line.\n"
|
|
13399 |
":mainline:\n"
|
|
13400 |
"\tSelect mainline revision that merged the specified revision.\n"
|
|
13401 |
":last:\n"
|
|
13402 |
"\tSelects the nth revision from the end."
|
|
13403 |
msgstr "" |
|
13404 |
||
13405 |
#: en/help_topics/revisionspec.txt:53
|
|
13406 |
msgid "In addition, plugins can provide other keywords." |
|
13407 |
msgstr "" |
|
13408 |
||
13409 |
#: en/help_topics/revisionspec.txt:55
|
|
13410 |
msgid "A detailed description of each keyword is given below." |
|
13411 |
msgstr "" |
|
13412 |
||
13413 |
#: en/help_topics/revisionspec.txt:57
|
|
13414 |
msgid ":revid:" |
|
13415 |
msgstr "" |
|
13416 |
||
13417 |
#: en/help_topics/revisionspec.txt:59
|
|
13418 |
msgid "" |
|
13419 |
" Supply a specific revision id, that can be used to specify any\n"
|
|
13420 |
" revision id in the ancestry of the branch.\n"
|
|
13421 |
" Including merges, and pending merges.\n"
|
|
13422 |
" Examples::"
|
|
13423 |
msgstr "" |
|
13424 |
||
13425 |
#: en/help_topics/revisionspec.txt:64
|
|
13426 |
msgid "" |
|
13427 |
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
|
|
13428 |
msgstr "" |
|
13429 |
||
13430 |
#: en/help_topics/revisionspec.txt:66
|
|
13431 |
msgid ":submit:" |
|
13432 |
msgstr "" |
|
13433 |
||
13434 |
#: en/help_topics/revisionspec.txt:68
|
|
13435 |
msgid "" |
|
13436 |
" Diffing against this shows all the changes that were made in this "
|
|
13437 |
"branch,\n"
|
|
13438 |
" and is a good predictor of what merge will do. The submit branch is\n"
|
|
13439 |
" used by the bundle and merge directive commands. If no submit branch\n"
|
|
13440 |
" is specified, the parent branch is used instead."
|
|
13441 |
msgstr "" |
|
13442 |
||
13443 |
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
|
|
13444 |
msgid "" |
|
13445 |
" The common ancestor is the last revision that existed in both\n"
|
|
13446 |
" branches. Usually this is the branch point, but it could also be\n"
|
|
13447 |
" a revision that was merged."
|
|
13448 |
msgstr "" |
|
13449 |
||
13450 |
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
|
|
13451 |
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
|
|
13452 |
#: en/help_topics/revisionspec.txt:153
|
|
13453 |
msgid " Examples::" |
|
13454 |
msgstr "" |
|
13455 |
||
13456 |
#: en/help_topics/revisionspec.txt:79
|
|
13457 |
msgid " $ bzr diff -r submit:" |
|
13458 |
msgstr "" |
|
13459 |
||
13460 |
#: en/help_topics/revisionspec.txt:81
|
|
13461 |
msgid ":ancestor:" |
|
13462 |
msgstr "" |
|
13463 |
||
13464 |
#: en/help_topics/revisionspec.txt:83
|
|
13465 |
msgid " Supply the path to a branch to select the common ancestor." |
|
13466 |
msgstr "" |
|
13467 |
||
13468 |
#: en/help_topics/revisionspec.txt:89
|
|
13469 |
msgid "" |
|
13470 |
" This is frequently used with 'diff' to return all of the changes\n"
|
|
13471 |
" that your branch introduces, while excluding the changes that you\n"
|
|
13472 |
" have not merged from the remote branch."
|
|
13473 |
msgstr "" |
|
13474 |
||
13475 |
#: en/help_topics/revisionspec.txt:95
|
|
13476 |
msgid "" |
|
13477 |
" ancestor:/path/to/branch\n"
|
|
13478 |
" $ bzr diff -r ancestor:../../mainline/branch"
|
|
13479 |
msgstr "" |
|
13480 |
||
13481 |
#: en/help_topics/revisionspec.txt:98
|
|
13482 |
msgid ":date:" |
|
13483 |
msgstr "" |
|
13484 |
||
13485 |
#: en/help_topics/revisionspec.txt:100
|
|
13486 |
msgid "" |
|
13487 |
" Supply a datestamp to select the first revision that matches the date.\n"
|
|
13488 |
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
|
|
13489 |
" Matches the first entry after a given date (either at midnight or\n"
|
|
13490 |
" at a specified time)."
|
|
13491 |
msgstr "" |
|
13492 |
||
13493 |
#: en/help_topics/revisionspec.txt:105
|
|
13494 |
msgid " One way to display all the changes since yesterday would be::" |
|
13495 |
msgstr "" |
|
13496 |
||
13497 |
#: en/help_topics/revisionspec.txt:107
|
|
13498 |
msgid " bzr log -r date:yesterday.." |
|
13499 |
msgstr "" |
|
13500 |
||
13501 |
#: en/help_topics/revisionspec.txt:111
|
|
13502 |
msgid "" |
|
13503 |
" date:yesterday -> select the first revision since "
|
|
13504 |
"yesterday\n"
|
|
13505 |
" date:2006-08-14,17:10:14 -> select the first revision after\n"
|
|
13506 |
" August 14th, 2006 at 5:10pm."
|
|
13507 |
msgstr "" |
|
13508 |
||
13509 |
#: en/help_topics/revisionspec.txt:115
|
|
13510 |
msgid ":branch:" |
|
13511 |
msgstr "" |
|
13512 |
||
13513 |
#: en/help_topics/revisionspec.txt:117
|
|
13514 |
msgid " Supply the path to a branch to select its last revision." |
|
13515 |
msgstr "" |
|
13516 |
||
13517 |
#: en/help_topics/revisionspec.txt:121
|
|
13518 |
msgid " branch:/path/to/branch" |
|
13519 |
msgstr "" |
|
13520 |
||
13521 |
#: en/help_topics/revisionspec.txt:123
|
|
13522 |
msgid ":tag:" |
|
13523 |
msgstr "" |
|
13524 |
||
13525 |
#: en/help_topics/revisionspec.txt:125
|
|
13526 |
msgid " Tags are stored in the branch and created by the 'tag' command." |
|
13527 |
msgstr "" |
|
13528 |
||
13529 |
#: en/help_topics/revisionspec.txt:127
|
|
13530 |
msgid ":revno:" |
|
13531 |
msgstr "" |
|
13532 |
||
13533 |
#: en/help_topics/revisionspec.txt:129
|
|
13534 |
msgid "" |
|
13535 |
" Use an integer to specify a revision in the history of the branch.\n"
|
|
13536 |
" Optionally a branch can be specified. A negative number will count\n"
|
|
13537 |
" from the end of the branch (-1 is the last revision, -2 the previous\n"
|
|
13538 |
" one). If the negative number is larger than the branch's history, the\n"
|
|
13539 |
" first revision is returned.\n"
|
|
13540 |
" Examples::"
|
|
13541 |
msgstr "" |
|
13542 |
||
13543 |
#: en/help_topics/revisionspec.txt:136
|
|
13544 |
msgid "" |
|
13545 |
" revno:1 -> return the first revision of this branch\n"
|
|
13546 |
" revno:3:/path/to/branch -> return the 3rd revision of\n"
|
|
13547 |
" the branch '/path/to/branch'\n"
|
|
13548 |
" revno:-1 -> The last revision in a branch.\n"
|
|
13549 |
" -2:http://other/branch -> The second to last revision in the\n"
|
|
13550 |
" remote branch.\n"
|
|
13551 |
" -1000000 -> Most likely the first revision, unless\n"
|
|
13552 |
" your history is very long."
|
|
13553 |
msgstr "" |
|
13554 |
||
13555 |
#: en/help_topics/revisionspec.txt:145
|
|
13556 |
msgid ":before:" |
|
13557 |
msgstr "" |
|
13558 |
||
13559 |
#: en/help_topics/revisionspec.txt:147
|
|
13560 |
msgid "" |
|
13561 |
" Supply any revision spec to return the parent of that revision. This "
|
|
13562 |
"is\n"
|
|
13563 |
" mostly useful when inspecting revisions that are not in the revision "
|
|
13564 |
"history\n"
|
|
13565 |
" of a branch."
|
|
13566 |
msgstr "" |
|
13567 |
||
13568 |
#: en/help_topics/revisionspec.txt:151
|
|
13569 |
msgid "" |
|
13570 |
" It is an error to request the parent of the null revision (before:0)."
|
|
13571 |
msgstr "" |
|
13572 |
||
13573 |
#: en/help_topics/revisionspec.txt:155
|
|
13574 |
msgid "" |
|
13575 |
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
|
|
13576 |
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
|
|
13577 |
" aaaa@bbbb-1234567890\n"
|
|
13578 |
" bzr diff -r before:1913..1913\n"
|
|
13579 |
" -> Find the changes between revision 1913 and its parent "
|
|
13580 |
"(1912).\n"
|
|
13581 |
" (What changes did revision 1913 introduce).\n"
|
|
13582 |
" This is equivalent to: bzr diff -c 1913"
|
|
13583 |
msgstr "" |
|
13584 |
||
13585 |
#: en/help_topics/revisionspec.txt:163
|
|
13586 |
msgid ":annotate:" |
|
13587 |
msgstr "" |
|
13588 |
||
13589 |
#: en/help_topics/revisionspec.txt:165
|
|
13590 |
msgid "" |
|
13591 |
" Select the revision that last modified the specified line. Line is\n"
|
|
13592 |
" specified as path:number. Path is a relative path to the file. "
|
|
13593 |
"Numbers\n"
|
|
13594 |
" start at 1, and are relative to the current version, not the last-\n"
|
|
13595 |
" committed version of the file."
|
|
13596 |
msgstr "" |
|
13597 |
||
13598 |
#: en/help_topics/revisionspec.txt:170
|
|
13599 |
msgid ":mainline:" |
|
13600 |
msgstr "" |
|
13601 |
||
13602 |
#: en/help_topics/revisionspec.txt:172
|
|
13603 |
msgid "" |
|
13604 |
" Select the revision that merged the specified revision into mainline."
|
|
13605 |
msgstr "" |
|
13606 |
||
13607 |
#: en/help_topics/revisionspec.txt:174
|
|
13608 |
msgid ":last:" |
|
13609 |
msgstr "" |
|
13610 |
||
13611 |
#: en/help_topics/revisionspec.txt:176
|
|
13612 |
msgid "" |
|
13613 |
" Supply a positive number to get the nth revision from the end.\n"
|
|
13614 |
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
|
|
13615 |
" Examples::"
|
|
13616 |
msgstr "" |
|
13617 |
||
13618 |
#: en/help_topics/revisionspec.txt:180
|
|
13619 |
msgid "" |
|
13620 |
" last:1 -> return the last revision\n"
|
|
13621 |
" last:3 -> return the revision 2 before the end.\n"
|
|
13622 |
msgstr "" |
|
13623 |
||
13624 |
#: en/help_topics/rules.txt:1
|
|
13625 |
msgid "" |
|
13626 |
"Rules\n"
|
|
13627 |
"====="
|
|
13628 |
msgstr "" |
|
13629 |
||
13630 |
#: en/help_topics/rules.txt:7
|
|
13631 |
msgid "" |
|
13632 |
"Rules are defined in ini file format where the sections are file glob\n"
|
|
13633 |
"patterns and the contents of each section are the preferences for files\n"
|
|
13634 |
"matching that pattern(s). For example::"
|
|
13635 |
msgstr "" |
|
13636 |
||
13637 |
#: en/help_topics/rules.txt:11
|
|
13638 |
msgid "" |
|
13639 |
" [name *.bat]\n"
|
|
13640 |
" eol = native"
|
|
13641 |
msgstr "" |
|
13642 |
||
13643 |
#: en/help_topics/rules.txt:14
|
|
13644 |
msgid "" |
|
13645 |
" [name *.html *.xml]\n"
|
|
13646 |
" keywords = xml_escape"
|
|
13647 |
msgstr "" |
|
13648 |
||
13649 |
#: en/help_topics/rules.txt:17
|
|
13650 |
msgid "" |
|
13651 |
"Preferences like these are useful for commands and plugins wishing to\n"
|
|
13652 |
"provide custom behaviour for selected files. For more information on \n"
|
|
13653 |
"end of line conversion see :doc:`eol-help`.\n"
|
|
13654 |
"Keyword support is provided by the `keywords plugin\n"
|
|
13655 |
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
|
|
13656 |
msgstr "" |
|
13657 |
||
13658 |
#: en/help_topics/rules.txt:23
|
|
13659 |
msgid "" |
|
13660 |
"Files\n"
|
|
13661 |
"-----"
|
|
13662 |
msgstr "" |
|
13663 |
||
13664 |
#: en/help_topics/rules.txt:26
|
|
13665 |
msgid "" |
|
13666 |
"Default rules for all branches are defined in the optional file\n"
|
|
13667 |
"``BZR_HOME/rules``. "
|
|
13668 |
msgstr "" |
|
13669 |
||
13670 |
#: en/help_topics/rules.txt:29
|
|
13671 |
msgid "" |
|
13672 |
"Rule Patterns\n"
|
|
13673 |
"-------------"
|
|
13674 |
msgstr "" |
|
13675 |
||
13676 |
#: en/help_topics/rules.txt:32
|
|
13677 |
msgid "" |
|
13678 |
"Patterns are ordered and searching stops as soon as one matches.\n"
|
|
13679 |
"As a consequence, more explicit patterns should be placed towards\n"
|
|
13680 |
"the top of the file. Rule patterns use exactly the same conventions\n"
|
|
13681 |
"as ignore patterns. See :doc:`patterns-help` for details."
|
|
13682 |
msgstr "" |
|
13683 |
||
13684 |
#: en/help_topics/rules.txt:37
|
|
13685 |
msgid ".. note::" |
|
13686 |
msgstr "" |
|
13687 |
||
13688 |
#: en/help_topics/rules.txt:39
|
|
13689 |
msgid "" |
|
13690 |
" Patterns containing square brackets or spaces should be\n"
|
|
13691 |
" surrounded in quotes to ensure they are correctly parsed.\n"
|
|
13692 |
msgstr "" |
|
13693 |
||
13694 |
#: en/help_topics/topics.txt:1
|
|
13695 |
msgid "" |
|
13696 |
"authentication Information on configuring authentication\n"
|
|
13697 |
"basic Basic commands\n"
|
|
13698 |
"branches Information on what a branch is\n"
|
|
13699 |
"bugs Bug tracker settings\n"
|
|
13700 |
"checkouts Information on what a checkout is\n"
|
|
13701 |
"commands Basic help for all commands\n"
|
|
13702 |
"configuration Details on the configuration settings available\n"
|
|
13703 |
"conflict-types Types of conflicts and what to do about them\n"
|
|
13704 |
"content-filters Conversion of content into/from working trees\n"
|
|
13705 |
"criss-cross Information on criss-cross merging\n"
|
|
13706 |
"current-formats Current storage formats\n"
|
|
13707 |
"debug-flags Options to show or record debug information\n"
|
|
13708 |
"diverged-branches How to fix diverged branches\n"
|
|
13709 |
"env-variables Environment variable names and values\n"
|
|
13710 |
"eol Information on end-of-line handling\n"
|
|
13711 |
"files Information on configuration and log files\n"
|
|
13712 |
"formats Information on choosing a storage format\n"
|
|
13713 |
"global-options Options that control how Bazaar runs\n"
|
|
13714 |
"hidden-commands All hidden commands\n"
|
|
13715 |
"hooks Points at which custom processing can be added\n"
|
|
13716 |
"launchpad Using Bazaar with Launchpad.net\n"
|
|
13717 |
"location-alias Aliases for remembered locations\n"
|
|
13718 |
"log-formats Details on the logging formats available\n"
|
|
13719 |
"other-formats Experimental and deprecated storage formats\n"
|
|
13720 |
"patterns Information on the pattern syntax\n"
|
|
13721 |
"repositories Basic information on shared repositories.\n"
|
|
13722 |
"revisionspec Explain how to use --revision\n"
|
|
13723 |
"rules Information on defining rule-based preferences\n"
|
|
13724 |
"standalone-trees Information on what a standalone tree is\n"
|
|
13725 |
"standard-options Options that can be used with any command\n"
|
|
13726 |
"status-flags Help on status flags\n"
|
|
13727 |
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
|
|
13728 |
"topics Topics list\n"
|
|
13729 |
"url-special-chars Special character handling in URLs\n"
|
|
13730 |
"urlspec Supported transport protocols\n"
|
|
13731 |
"working-trees Information on working trees\n"
|
|
13732 |
msgstr "" |
|
13733 |
||
13734 |
#: en/help_topics/url-special-chars.txt:1
|
|
13735 |
msgid "" |
|
13736 |
"Special character handling in URLs\n"
|
|
13737 |
"=================================="
|
|
13738 |
msgstr "" |
|
13739 |
||
13740 |
#: en/help_topics/url-special-chars.txt:4
|
|
13741 |
msgid "Bazaar allows locations to be specified in multiple ways, either:" |
|
13742 |
msgstr "" |
|
13743 |
||
13744 |
#: en/help_topics/url-special-chars.txt:6
|
|
13745 |
msgid " * Fully qualified URLs" |
|
13746 |
msgstr "" |
|
13747 |
||
13748 |
#: en/help_topics/url-special-chars.txt:8
|
|
13749 |
msgid " * File system paths, relative or absolute" |
|
13750 |
msgstr "" |
|
13751 |
||
13752 |
#: en/help_topics/url-special-chars.txt:10
|
|
13753 |
msgid "" |
|
13754 |
"Internally bzr treats all locations as URLs. For any file system paths\n"
|
|
13755 |
"that are specified it will automatically determine the appropriate URL\n"
|
|
13756 |
"representation, and escape special characters where necessary."
|
|
13757 |
msgstr "" |
|
13758 |
||
13759 |
#: en/help_topics/url-special-chars.txt:14
|
|
13760 |
msgid "" |
|
13761 |
"There are a few characters which have special meaning in URLs and need "
|
|
13762 |
"careful\n"
|
|
13763 |
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
|
|
13764 |
"value in URLs. Any non-ASCII characters in a file path will automatically "
|
|
13765 |
"be\n"
|
|
13766 |
"urlencoded when the path is converted to a URL."
|
|
13767 |
msgstr "" |
|
13768 |
||
13769 |
#: en/help_topics/url-special-chars.txt:19
|
|
13770 |
msgid "" |
|
13771 |
"URLs represent non-ASCII characters in an encoding defined by the server, "
|
|
13772 |
"but\n"
|
|
13773 |
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
|
|
13774 |
"be\n"
|
|
13775 |
"generous in what it accepts as a URL and to print them in a way that\n"
|
|
13776 |
"will be readable."
|
|
13777 |
msgstr "" |
|
13778 |
||
13779 |
#: en/help_topics/url-special-chars.txt:24
|
|
13780 |
msgid "" |
|
13781 |
"For example, if you have a directory named '/tmp/%2False' these are all "
|
|
13782 |
"valid\n"
|
|
13783 |
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
|
|
13784 |
"slash)::"
|
|
13785 |
msgstr "" |
|
13786 |
||
13787 |
#: en/help_topics/url-special-chars.txt:27
|
|
13788 |
msgid "" |
|
13789 |
" cd /tmp\n"
|
|
13790 |
" bzr log /tmp/%2False\n"
|
|
13791 |
" bzr log %2False\n"
|
|
13792 |
" bzr log file:///tmp/%252False\n"
|
|
13793 |
" bzr log file://localhost/tmp/%252False\n"
|
|
13794 |
" bzr log file:%252False"
|
|
13795 |
msgstr "" |
|
13796 |
||
13797 |
#: en/help_topics/url-special-chars.txt:34
|
|
13798 |
msgid "These are valid but do not refer to the same file::" |
|
13799 |
msgstr "" |
|
13800 |
||
13801 |
#: en/help_topics/url-special-chars.txt:36
|
|
13802 |
msgid "" |
|
13803 |
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
|
|
13804 |
" bzr log %252False (refers to a file called /tmp/%252False)"
|
|
13805 |
msgstr "" |
|
13806 |
||
13807 |
#: en/help_topics/url-special-chars.txt:39
|
|
13808 |
msgid "" |
|
13809 |
"Comma also has special meaning in URLs, because it denotes `segment "
|
|
13810 |
"parameters`_"
|
|
13811 |
msgstr "" |
|
13812 |
||
13813 |
#: en/help_topics/url-special-chars.txt:41
|
|
13814 |
msgid "" |
|
13815 |
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
|
|
13816 |
msgstr "" |
|
13817 |
||
13818 |
#: en/help_topics/url-special-chars.txt:43
|
|
13819 |
msgid "" |
|
13820 |
"Comma is also special in any file system paths that are specified. To use a "
|
|
13821 |
"literal\n"
|
|
13822 |
"comma in a file system path, specify a URL and URL encode the comma::"
|
|
13823 |
msgstr "" |
|
13824 |
||
13825 |
#: en/help_topics/url-special-chars.txt:46
|
|
13826 |
msgid "" |
|
13827 |
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
|
|
13828 |
"\"branch\" set to \"bla\"\n"
|
|
13829 |
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
|
|
13830 |
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
|
|
13831 |
"\"branch\" set to \"bla\"\n"
|
|
13832 |
msgstr "" |
|
13833 |
||
13834 |
#: en/help_topics/urlspec.txt:1
|
|
13835 |
msgid "URL Identifiers" |
|
13836 |
msgstr "" |
|
13837 |
||
13838 |
#: en/help_topics/urlspec.txt:3
|
|
13839 |
msgid "Supported URL prefixes::" |
|
13840 |
msgstr "" |
|
13841 |
||
13842 |
#: en/help_topics/urlspec.txt:5
|
|
13843 |
msgid "" |
|
13844 |
" aftp:// Access using active FTP.\n"
|
|
13845 |
" bzr:// Fast access using the Bazaar smart server.\n"
|
|
13846 |
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
|
|
13847 |
" file:// Access using the standard filesystem (default)\n"
|
|
13848 |
" ftp:// Access using passive FTP.\n"
|
|
13849 |
" http:// Read-only access of branches exported on the web.\n"
|
|
13850 |
" https:// Read-only access of branches exported on the web using "
|
|
13851 |
"SSL.\n"
|
|
13852 |
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
|
|
13853 |
msgstr "" |
|
13854 |
||
13855 |
#: en/help_topics/urlspec.txt:14
|
|
13856 |
msgid "Supported modifiers::" |
|
13857 |
msgstr "" |
|
13858 |
||
13859 |
#: en/help_topics/urlspec.txt:16
|
|
13860 |
msgid " gio+ Access using any GIO supported protocols." |
|
13861 |
msgstr "" |
|
13862 |
||
13863 |
#: en/help_topics/urlspec.txt:18
|
|
13864 |
msgid "Bazaar supports all of the standard parts within the URL::" |
|
13865 |
msgstr "" |
|
13866 |
||
13867 |
#: en/help_topics/urlspec.txt:20
|
|
13868 |
msgid " <protocol>://[user[:password]@]host[:port]/[path]" |
|
13869 |
msgstr "" |
|
13870 |
||
13871 |
#: en/help_topics/urlspec.txt:22
|
|
13872 |
msgid "allowing URLs such as::" |
|
13873 |
msgstr "" |
|
13874 |
||
13875 |
#: en/help_topics/urlspec.txt:24
|
|
13876 |
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk" |
|
13877 |
msgstr "" |
|
13878 |
||
13879 |
#: en/help_topics/urlspec.txt:26
|
|
13880 |
msgid "" |
|
13881 |
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
|
|
13882 |
"with '~' as meaning that the rest of the path should be interpreted\n"
|
|
13883 |
"relative to the remote user's home directory. For example if the user\n"
|
|
13884 |
"``remote`` has a home directory of ``/home/remote`` on the server\n"
|
|
13885 |
"shell.example.com, then::"
|
|
13886 |
msgstr "" |
|
13887 |
||
13888 |
#: en/help_topics/urlspec.txt:32
|
|
13889 |
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk" |
|
13890 |
msgstr "" |
|
13891 |
||
13892 |
#: en/help_topics/urlspec.txt:34
|
|
13893 |
msgid "would refer to ``/home/remote/myproject/trunk``." |
|
13894 |
msgstr "" |
|
13895 |
||
13896 |
#: en/help_topics/urlspec.txt:36
|
|
13897 |
msgid "" |
|
13898 |
"Many commands that accept URLs also accept location aliases too.\n"
|
|
13899 |
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
|
|
13900 |
msgstr "" |
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13901 |
|
13902 |
#~ msgid ""
|
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13903 |
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
|
13904 |
#~ "delete them if they can easily be recovered using revert otherwise they\n"
|
|
13905 |
#~ "will be backed up (adding an extention of the form .~#~). If no options or\n"
|
|
13906 |
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
|
|
13907 |
#~ "Bazaar but missing in your tree and stop tracking them for you."
|
|
13908 |
#~ msgstr ""
|
|
13909 |
#~ "このコマンドで指定されたファイルの変更をBazaarは管理しなくなります。\n"
|
|
13910 |
#~ "revertでファイルが簡単に復活できる場合は、ファイルは削除されますし、そうで\n"
|
|
13911 |
#~ "ない場合はバックアップ(.~#~という形式の拡張子がつきます)されます。オプション\n"
|
|
13912 |
#~ "やパラメータが指定されていない場合は、バージョン管理されているけれどツリー\n"
|
|
13913 |
#~ "削除されているファイルを探して、そのファイルのバージョン管理を止めます。"
|
|
13914 |
||
13915 |
#~ msgid ""
|
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13916 |
#~ "If unset, the tree root directory name is used as the nickname.\n"
|
13917 |
#~ "To print the current nickname, execute with no argument."
|
|
6437.2.5
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13918 |
#~ msgstr ""
|
6093.4.92
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13919 |
#~ "設定されていない場合は、ツリーのルートディレクトリの名前が\n"
|
13920 |
#~ "ニックネームとして扱われます。引数なしで実行すると、現在の\n"
|
|
13921 |
#~ "ニックネームを表示します。"
|
|
6093.4.149
by Launchpad Translations on behalf of bzr-core
Launchpad automatic translations update. |
13922 |
|
13923 |
#~ msgid "Revert files to a previous revision."
|
|
13924 |
#~ msgstr "ファイルを過去のリビジョンに戻します。"
|
|
13925 |
||
13926 |
#~ msgid ""
|
|
13927 |
#~ "To remove only some changes, without reverting to a prior version, use\n"
|
|
13928 |
#~ "merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
|
|
13929 |
#~ "will remove the changes introduced by the second last commit (-2), without\n"
|
|
13930 |
#~ "affecting the changes introduced by the last commit (-1). To remove\n"
|
|
13931 |
#~ "certain changes on a hunk-by-hunk basis, see the shelve command."
|
|
13932 |
#~ msgstr ""
|
|
13933 |
#~ "以前のリビジョンに戻さずにいくつかの変更を取り除くには、mergeをかわりに\n"
|
|
13934 |
#~ "使用します。例えば、\"merge . -r -2..-3\" (.を忘れないように)で、最終リビジョン\n"
|
|
13935 |
#~ "(-1)での変更はそのままで、その一つ前のリビジョン(-2)での変更だけを取り\n"
|
|
13936 |
#~ "除くことができます。特定の変更をハンクごと取り除く方法は、shelveをご覧\n"
|
|
13937 |
#~ "ください。"
|
|
13938 |
||
13939 |
#~ msgid ""
|
|
13940 |
#~ "By default, any files that have been manually changed will be backed up\n"
|
|
13941 |
#~ "first. (Files changed only by merge are not backed up.) Backup files have\n"
|
|
13942 |
#~ "'.~#~' appended to their name, where # is a number."
|
|
13943 |
#~ msgstr ""
|
|
13944 |
#~ "デフォルトでは、手で変更されたファイルは最初にバックアップされます。(merge\n"
|
|
13945 |
#~ "コマンドで変更されただけのファイルはバックアップされません)バックアップ\n"
|
|
13946 |
#~ "ファイル名は、元の名前に「.~#~」(#は数字)を付け足したものになります。"
|
|
13947 |
||
13948 |
#~ msgid ""
|
|
13949 |
#~ "Giving a list of files will revert only those files. Otherwise, all files\n"
|
|
13950 |
#~ "will be reverted. If the revision is not specified with '--revision', the\n"
|
|
13951 |
#~ "last committed revision is used."
|
|
13952 |
#~ msgstr ""
|
|
13953 |
#~ "ファイルのリストを指定すると、そのファイルだけが元に戻されます。\n"
|
|
13954 |
#~ "そうでない場合は、全てのファイルが対象になります。--revisionで\n"
|
|
13955 |
#~ "リビジョンを指定しない場合は、最後にコミットされたリビジョンが使用\n"
|
|
13956 |
#~ "されます。"
|