To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to po/ja.po
- browse files at revision 6623
- compare with another revision
- download diff
- download tarball
- view history from revision 6623
- Committer: Jelmer Vernooij
- Date: 2017-05-21 19:09:26 UTC
- mfrom: (6622.1.36 breezy)
- Revision ID: jelmer@jelmer.uk-20170521190926-5vtz8xaf0e9ylrpc
Merge rename to breezy.
- files added:
- doc/en/release-notes/brz-3.0.txt
- files removed:
- bzr.ico
- files renamed:
- apport/bzr-crashdb.conf => apport/brz-crashdb.conf
- apport/source_bzr.py => apport/source_brz.py
- bzrlib/ => breezy/
- bzr => brz
- contrib/bash/bzr => contrib/bash/brz
- contrib/bash/bzrbashprompt.sh => contrib/bash/brzbashprompt.sh
- contrib/bzr_access => contrib/brz_access
- contrib/emacs/bzr-mode.el => contrib/emacs/brz-mode.el
- doc/developers/_static/bzr-doc.css => doc/developers/_static/brz-doc.css
- doc/en/_static/en/bzr-en-quick-reference.pdf => doc/en/_static/en/brz-en-quick-reference.pdf
- doc/en/_static/en/bzr-en-quick-reference.png => doc/en/_static/en/brz-en-quick-reference.png
- doc/en/_static/en/bzr-en-quick-reference.svg => doc/en/_static/en/brz-en-quick-reference.svg
- doc/en/tutorials/using_bazaar_with_launchpad.txt => doc/en/tutorials/using_breezy_with_launchpad.txt
- po/bzr.pot => po/brz.pot
- tools/bzr_epydoc => tools/brz_epydoc
- tools/bzr_epydoc_uid.py => tools/brz_epydoc_uid.py
- tools/win32/bzr-win32-bdist-postinstall.py => tools/win32/brz-win32-bdist-postinstall.py
- tools/win32/bzr.iss.cog => tools/win32/brz.iss.cog
- tools/win32/bzr_postinstall.py => tools/win32/brz_postinstall.py
- tools/win32/start_bzr.bat => tools/win32/start_brz.bat
- files modified:
- .bzrignore
added
removed
po/ja.po
1
# Japanese translation for bzr
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2013-05-21 08:54+0000\n"
12
"Last-Translator: epii <public.epii@gmail.com>\n"
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"
18
"X-Launchpad-Export-Date: 2013-05-22 04:30+0000\n"
19
"X-Generator: Launchpad (build 16626)\n"
20
21
#: bzrlib/add.py:93
1
#: breezy/add.py:93
2
#, python-brace-format
22
3
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "{0} をスキップ ({1} の {2} byte より大きいため)"
4
msgstr ""
24
5
25
#: bzrlib/branch.py:854
6
#: breezy/branch.py:872
26
7
msgid "Unstacking"
27
msgstr "スタックの解除"
8
msgstr ""
28
9
29
#: bzrlib/branch.py:2955
10
#: breezy/branch.py:3012
30
11
#, python-format
31
12
msgid "Pushed up to revision %d."
32
msgstr "リビジョン%dまでプッシュしました。"
13
msgstr ""
33
14
34
#: bzrlib/branch.py:2957
15
#: breezy/branch.py:3014
35
16
#, python-format
36
17
msgid "%d tag updated."
37
18
msgid_plural "%d tags updated."
38
msgstr[0] "%d 個のタグを更新しました"
19
msgstr[0] ""
20
msgstr[1] ""
39
21
40
#: bzrlib/branch.py:2960
22
#: breezy/branch.py:3017
41
23
msgid "No new revisions or tags to push."
42
msgstr "プッシュする新しいリビジョンやタグはありません。"
24
msgstr ""
43
25
44
#: bzrlib/branch.py:2962
26
#: breezy/branch.py:3019
45
27
msgid "No new revisions to push."
46
msgstr "プッシュする新しいリビジョンはありません。"
28
msgstr ""
47
29
48
#: bzrlib/branch.py:2982
30
#: breezy/branch.py:3039
31
#, python-brace-format
49
32
msgid "checked branch {0} format {1}"
50
msgstr "format {1} のブランチ {0} をチェックしました"
33
msgstr ""
51
34
52
#: bzrlib/branch.py:2985
35
#: breezy/branch.py:3042
53
36
#, python-format
54
37
msgid "found error:%s"
55
msgstr "検出されたエラー: %s"
38
msgstr ""
56
39
57
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
40
#: breezy/builtins.py:251 breezy/builtins.py:3043 breezy/workingtree.py:324
58
41
#, python-format
59
42
msgid "Ignoring files outside view. View is %s"
60
msgstr "ビューに含まれないファイルは無視します。ビュー：%s"
43
msgstr ""
61
44
62
#: bzrlib/builtins.py:260
45
#: breezy/builtins.py:260
63
46
#, python-format
64
msgid "bzr %s --revision takes exactly one revision identifier"
65
msgstr "bzr %s --revision には、リビジョンＩＤを一つだけ指定します。"
47
msgid "brz %s --revision takes exactly one revision identifier"
48
msgstr ""
66
49
67
#: bzrlib/builtins.py:315
50
#: breezy/builtins.py:315
68
51
msgid "Display status summary."
69
msgstr "ステータスのサマリーを表示します。"
52
msgstr ""
70
53
71
#: bzrlib/builtins.py:317
54
#: breezy/builtins.py:317
72
55
msgid ""
73
56
"This reports on versioned and unknown files, reporting them\n"
74
57
"grouped by state. Possible states are:"
75
58
msgstr ""
76
"このコマンドは、バージョン管理されたファイルやバージョン管理外ファイル\n"
77
"について、ステータスごとにグルーピングして表示します。\n"
78
"表示されるステータスは以下の通りです。:"
79
59
80
#: bzrlib/builtins.py:320
60
#: breezy/builtins.py:320
81
61
msgid ""
82
62
"added\n"
83
63
" Versioned in the working copy but not in the previous revision."
84
64
msgstr ""
85
"added\n"
86
" 作業コピー内ではバージョン管理されているが、一つ前のリビジョンでは管理\n"
87
" されていない。"
88
65
89
#: bzrlib/builtins.py:323
66
#: breezy/builtins.py:323
90
67
msgid ""
91
68
"removed\n"
92
69
" Versioned in the previous revision but removed or deleted\n"
93
70
" in the working copy."
94
71
msgstr ""
95
"removed\n"
96
" 一つ前のリビジョンでは管理されているが、作業コピー内では削除されている。"
97
72
98
#: bzrlib/builtins.py:327
73
#: breezy/builtins.py:327
99
74
msgid ""
100
75
"renamed\n"
101
76
" Path of this file changed from the previous revision;\n"
102
77
" the text may also have changed. This includes files whose\n"
103
78
" parent directory was renamed."
104
79
msgstr ""
105
"renamed\n"
106
" このファイルのパスは一つ前のリビジョンから変更されている。\n"
107
" 内容も変更されている可能性がある。親ディレクトリが変更されたファイルも\n"
108
" 含む。"
109
80
110
#: bzrlib/builtins.py:332
81
#: breezy/builtins.py:332
111
82
msgid ""
112
83
"modified\n"
113
84
" Text has changed since the previous revision."
114
85
msgstr ""
115
"modified\n"
116
" ファイルの内容が一つ前のリビジョンから変更されている。"
117
86
118
#: bzrlib/builtins.py:335
87
#: breezy/builtins.py:335
119
88
msgid ""
120
89
"kind changed\n"
121
90
" File kind has been changed (e.g. from file to directory)."
122
91
msgstr ""
123
"kind changed\n"
124
" ファイルの種別が変更されている。(ファイルからディレクトリに変わったなど)"
125
92
126
#: bzrlib/builtins.py:338
93
#: breezy/builtins.py:338
127
94
msgid ""
128
95
"unknown\n"
129
96
" Not versioned and not matching an ignore pattern."
130
97
msgstr ""
131
"unknown\n"
132
" バージョン管理されておらず、無視パターンにも一致していない。"
133
98
134
#: bzrlib/builtins.py:341
99
#: breezy/builtins.py:341
135
100
msgid ""
136
101
"Additionally for directories, symlinks and files with a changed\n"
137
102
"executable bit, Bazaar indicates their type using a trailing\n"
138
103
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
104
"disabled using the '--no-classify' option."
140
105
msgstr ""
141
"さらにディレクトリ、シンボリックリンク、実行可能ファイルについては、\n"
142
"末尾に種別を現す文字としてそれぞれ'/'、'@'、'*'が付加されます。\n"
143
"これを表示しないようにするには、'--no-classify'オプションを指定してください。"
144
106
145
#: bzrlib/builtins.py:346
107
#: breezy/builtins.py:346
146
108
msgid ""
147
"To see ignored files use 'bzr ignored'. For details on the\n"
148
"changes to file texts, use 'bzr diff'."
109
"To see ignored files use 'brz ignored'. For details on the\n"
110
"changes to file texts, use 'brz diff'."
149
111
msgstr ""
150
"無視ファイルを見るには'bzr ignored'を使ってください。\n"
151
"ファイルの内容の変更を詳しく見るには、'bzr diff'を使ってください。"
152
112
153
#: bzrlib/builtins.py:349
113
#: breezy/builtins.py:349
154
114
msgid ""
155
115
"Note that --short or -S gives status flags for each item, similar\n"
156
116
"to Subversion's status command. To get output similar to svn -q,\n"
157
"use bzr status -SV."
117
"use brz status -SV."
158
118
msgstr ""
159
"--shortまたは-Sを指定した場合、Subversionのstatusコマンドと同じように\n"
160
"すべてのアイテムにマーカーが表示されることに注意してください。\n"
161
"SVNで-qを指定した場合と同じような形式にするには、bzr status -SV を\n"
162
"使用してください。"
163
119
164
#: bzrlib/builtins.py:353
120
#: breezy/builtins.py:353
165
121
msgid ""
166
122
"If no arguments are specified, the status of the entire working\n"
167
123
"directory is shown. Otherwise, only the status of the specified\n"
168
124
"files or directories is reported. If a directory is given, status\n"
169
125
"is reported for everything inside that directory."
170
126
msgstr ""
171
"何も引数を指定しない場合、作業コピー全体のステータスが表示されます。\n"
172
"指定した場合は、指定のファイルやディレクトリのステータスだけが表示\n"
173
"されます。ディレクトリを指定した場合は、そのディレクトリの配下の全ての\n"
174
"ファイルのステータスが表示されます。"
175
127
176
#: bzrlib/builtins.py:358
128
#: breezy/builtins.py:358
177
129
msgid ""
178
130
"Before merges are committed, the pending merge tip revisions are\n"
179
131
"shown. To see all pending merge revisions, use the -v option.\n"
180
132
"To skip the display of pending merge information altogether, use\n"
181
133
"the no-pending option or specify a file/directory."
182
134
msgstr ""
183
"マージがコミットされる前には、マージ中のTipリビジョンが表示されます。\n"
184
"すべてのマージ中リビジョンを表示するには、-vオプションを使用します。\n"
185
"マージ中の情報を省略するには、no-pendingオプションを使用するか、\n"
186
"ファイルやディレクトリを指定してください。"
187
135
188
#: bzrlib/builtins.py:363
136
#: breezy/builtins.py:363
189
137
msgid ""
190
138
"To compare the working directory to a specific revision, pass a\n"
191
139
"single revision to the revision argument."
192
140
msgstr ""
193
"作業フォルダと指定リビジョンとを比較するには、リビジョンを一つだけ\n"
194
"引数に指定してください。"
195
141
196
#: bzrlib/builtins.py:366
142
#: breezy/builtins.py:366
197
143
msgid ""
198
144
"To see which files have changed in a specific revision, or between\n"
199
145
"two revisions, pass a revision range to the revision argument.\n"
200
"This will produce the same results as calling 'bzr diff --summarize'."
146
"This will produce the same results as calling 'brz diff --summarize'."
201
147
msgstr ""
202
"指定されたリビジョンで、もしくは指定された２つのリビジョン間でどのファイルが\n"
203
"変更されたかを見るには、２つのリビジョンを引数に指定してください。\n"
204
"'bzr diff --summarize' でも見ることができます。"
205
148
206
#: bzrlib/builtins.py:375
149
# help of 'short' option of 'status' command
150
#: breezy/builtins.py:375
207
151
msgid "Use short status indicators."
208
msgstr "省略形式でステータスを表示します。"
152
msgstr ""
209
153
210
#: bzrlib/builtins.py:377
154
# help of 'versioned' option of 'status' command
155
#: breezy/builtins.py:377
211
156
msgid "Only show versioned files."
212
msgstr "バージョン管理されているファイルだけを表示します。"
157
msgstr ""
213
158
214
#: bzrlib/builtins.py:379
159
# help of 'no-pending' option of 'status' command
160
#: breezy/builtins.py:379
215
161
msgid "Don't show pending merges."
216
msgstr "マージ中の情報を表示しません。"
162
msgstr ""
217
163
218
#: bzrlib/builtins.py:382
164
# help of 'no-classify' option of 'status' command
165
#: breezy/builtins.py:382
219
166
msgid "Do not mark object type using indicator."
220
msgstr "オブジェクトの種別を表すマーカーを表示しません。"
221
222
#: bzrlib/builtins.py:397
223
msgid "bzr status --revision takes exactly one or two revision specifiers"
224
msgstr "bzr status --revisionには、１つか２つのリビジョンを指定します。"
225
226
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
167
msgstr ""
168
169
#: breezy/builtins.py:397
170
msgid "brz status --revision takes exactly one or two revision specifiers"
171
msgstr ""
172
173
#: breezy/builtins.py:441 breezy/builtins.py:5229
227
174
msgid "You can only supply one of revision_id or --revision"
228
msgstr "リビジョンＩＤと--revisionのどちらか一つだけを指定してください。"
175
msgstr ""
229
176
230
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
177
#: breezy/builtins.py:444 breezy/builtins.py:5231
231
178
msgid "You must supply either --revision or a revision_id"
232
msgstr "--revisionとリビジョンＩＤのどちらかを指定してください。"
179
msgstr ""
233
180
234
#: bzrlib/builtins.py:451
181
#: breezy/builtins.py:451
235
182
#, python-format
236
183
msgid "Repository %r does not support access to raw revision texts"
237
msgstr "リポジトリ %r はリビジョンのtextへの直接アクセスをサポートしていません"
184
msgstr ""
238
185
239
#: bzrlib/builtins.py:462
186
#: breezy/builtins.py:462
187
#, python-brace-format
240
188
msgid "The repository {0} contains no revision {1}."
241
msgstr "リポジトリ {0} にはリビジョン {1} はありません。"
189
msgstr ""
242
190
243
#: bzrlib/builtins.py:469
191
#: breezy/builtins.py:469
244
192
msgid "You cannot specify a NULL revision."
245
msgstr "NULLリビジョンは指定できません。"
193
msgstr ""
246
194
247
#: bzrlib/builtins.py:561
195
#: breezy/builtins.py:561
248
196
msgid "Remove the working tree from a given branch/checkout."
249
msgstr "指定されたブランチ/チェックアウトから作業ツリーを削除します。"
197
msgstr ""
250
198
251
#: bzrlib/builtins.py:563
199
#: breezy/builtins.py:563
252
200
msgid ""
253
201
"Since a lightweight checkout is little more than a working tree\n"
254
202
"this will refuse to run against one."
255
203
msgstr ""
256
"軽量チェックアウトは作業ツリーよりも小さいため、軽量チェック\n"
257
"アウトに対して実行することはできません。"
258
259
#: bzrlib/builtins.py:566
260
msgid "To re-create the working tree, use \"bzr checkout\"."
261
msgstr "作業ツリーを再作成するには、 \"bzr checkout\" をしてください。"
262
263
#: bzrlib/builtins.py:572
264
msgid ""
265
"Remove the working tree even if it has uncommitted or shelved changes."
266
msgstr "作業ツリーが変更されていたり、シェルフされた変更があっても、作業ツリーを削除します。"
267
268
#: bzrlib/builtins.py:586
204
205
#: breezy/builtins.py:566
206
msgid "To re-create the working tree, use \"brz checkout\"."
207
msgstr ""
208
209
# help of 'force' option of 'remove-tree' command
210
#: breezy/builtins.py:572
211
msgid "Remove the working tree even if it has uncommitted or shelved changes."
212
msgstr ""
213
214
#: breezy/builtins.py:586
269
215
msgid "No working tree to remove"
270
msgstr "削除する作業ツリーがありません。"
216
msgstr ""
271
217
272
#: bzrlib/builtins.py:588
218
#: breezy/builtins.py:588
273
219
msgid "You cannot remove the working tree of a remote path"
274
msgstr "リモートの作業ツリーを削除することはできません。"
220
msgstr ""
275
221
276
#: bzrlib/builtins.py:597
222
#: breezy/builtins.py:597
277
223
msgid "You cannot remove the working tree from a lightweight checkout"
278
msgstr "軽量チェックアウトから作業ツリーを削除することはできません。"
224
msgstr ""
279
225
280
#: bzrlib/builtins.py:637
226
#: breezy/builtins.py:637
281
227
msgid ""
282
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
228
"The tree does not appear to be corrupt. You probably want \"brz revert\" "
283
229
"instead. Use \"--force\" if you are sure you want to reset the working tree."
284
230
msgstr ""
285
"ツリーは壊れていないようです。代わりに\"bzr revert\"を実行してください。もし、本当に作業ツリーをリセットしたいのであれば、\"--"
286
"force\"オプションを指定してください。"
287
231
288
#: bzrlib/builtins.py:648
232
#: breezy/builtins.py:648
289
233
msgid ""
290
234
", the header appears corrupt, try passing -r -1 to set the state to the last "
291
235
"commit"
292
msgstr ", ヘッダーが壊れているようです。-r -1を指定して最終コミット時点の状態に戻してください。"
236
msgstr ""
293
237
294
#: bzrlib/builtins.py:652
238
#: breezy/builtins.py:652
239
#, python-brace-format
295
240
msgid "failed to reset the tree state{0}"
296
msgstr "ツリーの状態をリセットできませんでした。{0}"
241
msgstr ""
297
242
298
#: bzrlib/builtins.py:656
243
#: breezy/builtins.py:656
299
244
msgid "Show current revision number."
300
msgstr "現在のリビジョン番号を表示します。"
245
msgstr ""
301
246
302
#: bzrlib/builtins.py:658
247
#: breezy/builtins.py:658
303
248
msgid "This is equal to the number of revisions on this branch."
304
msgstr "これは、ブランチ内のリビジョンの数と同じです。"
249
msgstr ""
305
250
306
#: bzrlib/builtins.py:671
251
#: breezy/builtins.py:671
307
252
msgid "--tree and --revision can not be used together"
308
msgstr "--tree と --revision は同時に指定できません"
309
310
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
311
msgid "Tags can only be placed on a single revision, not on a range"
312
msgstr "タグは1つのリビジョンにしか指定できません"
313
314
#: bzrlib/builtins.py:712
253
msgstr ""
254
255
#: breezy/builtins.py:688
256
msgid "Revision numbers only make sense for single revisions, not ranges"
257
msgstr ""
258
259
# help of 'tree' option of 'revno' command
260
#: breezy/builtins.py:712
315
261
msgid "Show revno of working tree."
316
msgstr "作業ツリーのリビジョン番号を表示します。"
262
msgstr ""
317
263
318
#: bzrlib/builtins.py:760
264
#: breezy/builtins.py:760
319
265
msgid "Add specified files or directories."
320
msgstr "指定されたファイルやディレクトリを追加します。"
266
msgstr ""
321
267
322
#: bzrlib/builtins.py:762
268
#: breezy/builtins.py:762
323
269
msgid ""
324
270
"In non-recursive mode, all the named items are added, regardless\n"
325
271
"of whether they were previously ignored. A warning is given if\n"
326
272
"any of the named files are already versioned."
327
273
msgstr ""
328
"non-recursiveモードの場合、無視されていたものも含めて指定されたすべての\n"
329
"アイテムが追加されます。指定されたファイルが既に追加されているものだった\n"
330
"場合は、警告が表示されます。"
331
274
332
#: bzrlib/builtins.py:766
275
#: breezy/builtins.py:766
333
276
msgid ""
334
277
"In recursive mode (the default), files are treated the same way\n"
335
278
"but the behaviour for directories is different. Directories that\n"
339
282
"are added. This search proceeds recursively into versioned\n"
340
283
"directories. If no names are given '.' is assumed."
341
284
msgstr ""
342
"recursiveモード(デフォルト)の場合は、ファイルの扱いは同じですが、\n"
343
"ディレクトリの扱いは変わります。既に追加されているディレクトリを指定\n"
344
"しても警告にはなりません。バージョン管理されているかどうかにかかわらず、\n"
345
"指定されたすべてのディレクトリ内のファイル、サブディレクトリをチェックして、\n"
346
"バージョン管理対象外でかつ無視されていないものを追加します。\n"
347
"この処理は、バージョン管理されたディレクトリに対して再帰的に実行されます。\n"
348
"何も指定されていない場合は、'.'が指定されたものとみなします。"
349
285
350
#: bzrlib/builtins.py:774
286
#: breezy/builtins.py:774
351
287
msgid ""
352
288
"A warning will be printed when nested trees are encountered,\n"
353
289
"unless they are explicitly ignored."
354
msgstr "ネストしたツリーがあった場合、明示的に無視しない限り警告を表示します。"
290
msgstr ""
355
291
356
#: bzrlib/builtins.py:777
292
#: breezy/builtins.py:777
357
293
msgid ""
358
"Therefore simply saying 'bzr add' will version all files that\n"
294
"Therefore simply saying 'brz add' will version all files that\n"
359
295
"are currently unknown."
360
296
msgstr ""
361
"つまり、単に 'bzr add' とした場合は、すべての不明なファイルがバージョン\n"
362
"管理に追加されます。"
363
297
364
#: bzrlib/builtins.py:780
298
#: breezy/builtins.py:780
365
299
msgid ""
366
300
"Adding a file whose parent directory is not versioned will\n"
367
301
"implicitly add the parent, and so on up to the root. This means\n"
368
302
"you should never need to explicitly add a directory, they'll just\n"
369
303
"get added when you add a file in the directory."
370
304
msgstr ""
371
"親ディレクトリがバージョン管理外のファイルを追加しようとした場合、自動的に\n"
372
"親ディレクトリや、そのさらに上位のディレクトリも追加されます。つまり、\n"
373
"ディレクトリを明示的に追加する必要はなく、その中にあるファイルを追加すれば\n"
374
"ディレクトリも追加されるということになります。"
375
305
376
#: bzrlib/builtins.py:785
306
#: breezy/builtins.py:785
377
307
msgid ""
378
308
"--dry-run will show which files would be added, but not actually\n"
379
309
"add them."
380
310
msgstr ""
381
"--dry-run を指定すると、どのファイルが追加されるかを表示しますが、実際に追加は\n"
382
"しません。"
383
311
384
#: bzrlib/builtins.py:788
312
#: breezy/builtins.py:788
385
313
msgid ""
386
314
"--file-ids-from will try to use the file ids from the supplied path.\n"
387
315
"It looks up ids trying to find a matching parent directory with the\n"
391
319
"adds as a conflict). It is also useful when merging another project\n"
392
320
"into a subdirectory of this one."
393
321
msgstr ""
394
"--file-ids-fromを指定すると、指定されたパスから得たファイルIDを使おうと\n"
395
"します。対応する親ディレクトリ内の同じ名前のファイルからファイルIDを探し、\n"
396
"無ければ純粋なパスから生成します。このオプションが必要になることはほとんど\n"
397
"ありませんが、同じファイルを、いずれマージする予定の２つのブランチに追加する\n"
398
"場合に便利です(マージの時の衝突を避けられます)。また、別のプロジェクトをサブ\n"
399
"ディレクトリとしてマージする時にも便利です。"
400
322
401
#: bzrlib/builtins.py:796
323
#: breezy/builtins.py:796
402
324
msgid ""
403
325
"Any files matching patterns in the ignore list will not be added\n"
404
326
"unless they are explicitly mentioned."
405
327
msgstr ""
406
"無視パターンにマッチするファイルは、明示的に指定されない限り追加は\n"
407
"されません。"
408
328
409
#: bzrlib/builtins.py:799
329
#: breezy/builtins.py:799
410
330
msgid ""
411
331
"In recursive mode, files larger than the configuration option \n"
412
332
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
413
333
"to file size."
414
334
msgstr ""
415
"recursiveモードの場合、add.maximum_file_sizeの設定値より大きな\n"
416
"ファイルは追加されません。明示的に指定されたアイテムはファイルサイズに\n"
417
"かかわらず追加されます。"
418
335
419
#: bzrlib/builtins.py:806
336
# help of 'no-recurse' option of 'add' command
337
#: breezy/builtins.py:806
420
338
msgid "Don't recursively add the contents of directories."
421
msgstr "ディレクトリの内容を再帰的に追加しません。"
339
msgstr ""
422
340
423
#: bzrlib/builtins.py:813
341
# help of 'file-ids-from' option of 'add' command
342
#: breezy/builtins.py:813
424
343
msgid "Lookup file ids from this tree."
425
msgstr "このツリーからファイルIDを検索します。"
344
msgstr ""
426
345
427
#: bzrlib/builtins.py:849
346
#: breezy/builtins.py:849
347
#, python-brace-format
428
348
msgid "ignored {0} matching \"{1}\"\n"
429
msgstr "無視 {0} (\"{1}\"にマッチ)\n"
349
msgstr ""
430
350
431
#: bzrlib/builtins.py:854
351
#: breezy/builtins.py:854
432
352
msgid "Create a new versioned directory."
433
msgstr "バージョン管理されたディレクトリを作成します。"
353
msgstr ""
434
354
435
#: bzrlib/builtins.py:856
355
#: breezy/builtins.py:856
436
356
msgid "This is equivalent to creating the directory and then adding it."
437
msgstr "ディレクトリを作成して、バージョン管理に追加することと同じです。"
357
msgstr ""
438
358
439
#: bzrlib/builtins.py:863
359
# help of 'parents' option of 'mkdir' command
360
#: breezy/builtins.py:863
440
361
msgid "No error if existing, make parent directories as needed."
441
362
msgstr ""
442
363
443
#: bzrlib/builtins.py:897
364
#: breezy/builtins.py:897
444
365
#, python-format
445
366
msgid "added %s\n"
446
msgstr "%s が追加されました。\n"
367
msgstr ""
447
368
448
#: bzrlib/builtins.py:939
369
#: breezy/builtins.py:939
449
370
#, python-format
450
371
msgid "invalid kind %r specified"
451
msgstr "kindが正しくありません。 %s"
372
msgstr ""
452
373
453
#: bzrlib/builtins.py:976
374
#: breezy/builtins.py:976
454
375
msgid "Move or rename a file."
455
msgstr "ファイルの移動や名前の変更を行います。"
456
457
#: bzrlib/builtins.py:978
458
msgid " bzr mv SOURCE... DESTINATION"
459
msgstr " bzr mv SOURCE... DESTINATION"
460
461
#: bzrlib/builtins.py:980
376
msgstr ""
377
378
#: breezy/builtins.py:978
379
msgid " brz mv SOURCE... DESTINATION"
380
msgstr ""
381
382
#: breezy/builtins.py:980
462
383
msgid ""
463
384
"If the last argument is a versioned directory, all the other names\n"
464
385
"are moved into it. Otherwise, there must be exactly two arguments\n"
465
386
"and the file is changed to a new name."
466
387
msgstr ""
467
"最後の引数がバージョン管理対象ディレクトリの場合、指定された他の項目は\n"
468
"すべてそのディレクトリの中に移動されます。そうでない場合は、引数の数は\n"
469
"２つでなければならず、ファイルは新しい名前に変更されます。"
470
388
471
#: bzrlib/builtins.py:984
389
#: breezy/builtins.py:984
472
390
msgid ""
473
391
"If OLDNAME does not exist on the filesystem but is versioned and\n"
474
392
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
476
394
"its internal inventory to reflect that change.\n"
477
395
"The same is valid when moving many SOURCE files to a DESTINATION."
478
396
msgstr ""
479
"OLDNAMEがファイルシステム上に存在せず、かつバージョン管理対象に\n"
480
"なっていて、NEWNAMEはファイルシステム上に存在しているがバージョン\n"
481
"管理対象にはなっていない場合は、ファイルは既に手動で移動済みだとみなし、\n"
482
"内部データへの変更の反映だけを行います。\n"
483
"複数のSOURCEをひとつのDESTINATIONに移動する場合も同じです。"
484
397
485
#: bzrlib/builtins.py:990
398
#: breezy/builtins.py:990
486
399
msgid "Files cannot be moved between branches."
487
msgstr "ファイルを別のブランチに移動することはできません。"
400
msgstr ""
488
401
489
#: bzrlib/builtins.py:997
402
# help of 'after' option of 'mv' command
403
#: breezy/builtins.py:997
490
404
msgid ""
491
"Move only the bzr identifier of the file, because the file has already been "
405
"Move only the brz identifier of the file, because the file has already been "
492
406
"moved."
493
msgstr "ファイルは既に移動済みのため、ファイルのBazaar IDだけを移動します。"
407
msgstr ""
494
408
495
#: bzrlib/builtins.py:999
409
# help of 'auto' option of 'mv' command
410
#: breezy/builtins.py:999
496
411
msgid "Automatically guess renames."
497
msgstr "変名を自動的に推測します。"
412
msgstr ""
498
413
499
#: bzrlib/builtins.py:1000
414
# help of 'dry-run' option of 'mv' command
415
#: breezy/builtins.py:1000
500
416
msgid "Avoid making changes when guessing renames."
501
msgstr "変名を推測する時に、実際には変更を行いません。"
417
msgstr ""
502
418
503
#: bzrlib/builtins.py:1009
419
#: breezy/builtins.py:1009
504
420
msgid "--dry-run requires --auto."
505
msgstr "--dry-runは--autoとともに指定してください。"
421
msgstr ""
506
422
507
#: bzrlib/builtins.py:1013
423
#: breezy/builtins.py:1013
508
424
msgid "missing file argument"
509
msgstr "ファイルが指定されていません。"
425
msgstr ""
510
426
511
#: bzrlib/builtins.py:1017
427
#: breezy/builtins.py:1017
512
428
msgid "can not move root of branch"
513
msgstr "ブランチの root は移動できません。"
429
msgstr ""
514
430
515
#: bzrlib/builtins.py:1023
431
#: breezy/builtins.py:1023
516
432
msgid "Only one path may be specified to --auto."
517
msgstr "--autoを指定する場合はパスはひとつだけ指定してください。"
433
msgstr ""
518
434
519
#: bzrlib/builtins.py:1026
435
#: breezy/builtins.py:1026
520
436
msgid "--after cannot be specified with --auto."
521
msgstr "--afterと--autoを同時に指定することはできません。"
437
msgstr ""
522
438
523
#: bzrlib/builtins.py:1062
439
#: breezy/builtins.py:1062
524
440
msgid "to mv multiple files the destination must be a versioned directory"
525
msgstr "複数のファイルを移動する時は、移動先はバージョン管理されていなければなりません。"
441
msgstr ""
526
442
527
#: bzrlib/builtins.py:1114
443
#: breezy/builtins.py:1114
528
444
msgid "Turn this branch into a mirror of another branch."
529
msgstr "このブランチを別のブランチのミラーにします。"
445
msgstr ""
530
446
531
#: bzrlib/builtins.py:1116
447
#: breezy/builtins.py:1116
532
448
msgid ""
533
449
"By default, this command only works on branches that have not diverged.\n"
534
450
"Branches are considered diverged if the destination branch's most recent \n"
535
451
"commit is one that has not been merged (directly or indirectly) into the \n"
536
452
"parent."
537
453
msgstr ""
538
"デフォルトでは、このコマンドは分岐していないブランチでのみ実行できます。\n"
539
"対象のブランチの最新コミットがまだ(直接的または間接的に)親ブランチにマージ\n"
540
"されていなければ、ブランチが分岐しているとみなします。"
541
454
542
#: bzrlib/builtins.py:1121
455
#: breezy/builtins.py:1121
543
456
msgid ""
544
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
457
"If branches have diverged, you can use 'brz merge' to integrate the changes\n"
545
458
"from one into the other. Once one branch has merged, the other should\n"
546
459
"be able to pull it again."
547
460
msgstr ""
548
"ブランチが分岐している場合、その変更を片方からもう片方に統合するために\n"
549
"'bzr merge'を使用することができます。ブランチをマージすれば、またpullできる\n"
550
"ようになるはずです。"
551
461
552
#: bzrlib/builtins.py:1125
462
#: breezy/builtins.py:1125
553
463
msgid ""
554
464
"If you want to replace your local changes and just want your branch to\n"
555
465
"match the remote one, use pull --overwrite. This will work even if the two\n"
556
466
"branches have diverged."
557
467
msgstr ""
558
"もし、リモートの変更内容で手元での変更内容を単純に置き換えたい場合は、\n"
559
"pull --overwriteを使用してください。これは、ブランチ同士が分岐していても\n"
560
"実行できます。"
561
468
562
#: bzrlib/builtins.py:1129
469
#: breezy/builtins.py:1129
563
470
msgid ""
564
471
"If there is no default location set, the first pull will set it (use\n"
565
472
"--no-remember to avoid setting it). After that, you can omit the\n"
566
473
"location to use the default. To change the default, use --remember. The\n"
567
474
"value will only be saved if the remote location can be accessed."
568
475
msgstr ""
569
"デフォルトのpull対象ブランチが設定されていない場合は、最初にpullした時に\n"
570
"設定されます。(これをしないようにするには、--no-rememberを指定します。)\n"
571
"その後は、デフォルトのブランチを使用する時には指定を省略できるようになり\n"
572
"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモート\n"
573
"ブランチにアクセスできた時だけ保存されます。"
574
476
575
#: bzrlib/builtins.py:1134
477
#: breezy/builtins.py:1134
576
478
msgid ""
577
479
"The --verbose option will display the revisions pulled using the log_format\n"
578
480
"configuration option. You can use a different format by overriding it with\n"
579
481
"-Olog_format=<other_format>."
580
482
msgstr ""
581
"--verbose オプションは pull されたリビジョンを log_format 設定オプションを\n"
582
"利用して表示します。 -Olog_format=<other_format> と指定することで、\n"
583
"別のフォーマットで表示できます。"
584
483
585
#: bzrlib/builtins.py:1138
484
#: breezy/builtins.py:1138
586
485
msgid ""
587
486
"Note: The location can be specified either in the form of a branch,\n"
588
487
"or in the form of a path to a file containing a merge directive generated\n"
589
"with bzr send."
488
"with brz send."
590
489
msgstr ""
591
"ブランチだけでなく、bzr sendで生成されたマージディレクティブを含むファイル\n"
592
"もpull対象として指定できることに注意してください。"
593
490
594
#: bzrlib/builtins.py:1146
491
# help of 'verbose' option of 'pull' command
492
#: breezy/builtins.py:1146
595
493
msgid "Show logs of pulled revisions."
596
msgstr "pull対象リビジョンのログを表示します。"
494
msgstr ""
597
495
598
#: bzrlib/builtins.py:1148
496
# help of 'directory' option of 'pull' command
497
#: breezy/builtins.py:1148
599
498
msgid ""
600
499
"Branch to pull into, rather than the one containing the working directory."
601
msgstr "作業フォルダの代わりにpullを受け入れるブランチ"
500
msgstr ""
602
501
603
#: bzrlib/builtins.py:1151
502
# help of 'local' option of 'pull' command
503
#: breezy/builtins.py:1151
604
504
msgid ""
605
505
"Perform a local pull in a bound branch. Local pulls are not applied to the "
606
506
"master branch."
607
msgstr "バインドブランチに対してpullする場合に、マスターブランチには反映しないようにします。"
608
609
#: bzrlib/builtins.py:1189
610
msgid "Need working tree for --show-base."
611
msgstr "--show-baseオプションを使用するには作業ツリーが必要です。"
612
613
#: bzrlib/builtins.py:1205
507
msgstr ""
508
509
#: breezy/builtins.py:1188
510
msgid "No working tree, ignoring --show-base"
511
msgstr ""
512
513
#: breezy/builtins.py:1204
614
514
msgid "No pull location known or specified."
615
msgstr "pull対象ブランチが指定されていません。"
515
msgstr ""
616
516
617
#: bzrlib/builtins.py:1211
517
#: breezy/builtins.py:1210
618
518
#, python-format
619
519
msgid "Using saved parent location: %s\n"
620
msgstr "デフォルトの親ブランチを使用します。: %s\n"
520
msgstr ""
621
521
622
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
522
#: breezy/builtins.py:1217 breezy/builtins.py:4423
623
523
msgid "Cannot use -r with merge directives or bundles"
624
msgstr "マージディレクティブやバンドルに対して-rを使用することはできません。"
524
msgstr ""
625
525
626
#: bzrlib/builtins.py:1261
526
#: breezy/builtins.py:1260
627
527
msgid "Update a mirror of this branch."
628
msgstr "このブランチのミラーを更新します。"
528
msgstr ""
629
529
630
#: bzrlib/builtins.py:1263
530
#: breezy/builtins.py:1262
631
531
msgid ""
632
532
"The target branch will not have its working tree populated because this\n"
633
533
"is both expensive, and is not supported on remote file systems."
634
534
msgstr ""
635
"対象のブランチの作業ツリーの更新はコストが高く、リモートファイルシステムでは\n"
636
"サポートされていないため、作業ツリーの更新は行いません。"
637
535
638
#: bzrlib/builtins.py:1266
536
#: breezy/builtins.py:1265
639
537
msgid ""
640
538
"Some smart servers or protocols *may* put the working tree in place in\n"
641
539
"the future."
642
540
msgstr ""
643
"将来的に、作業ツリーの更新ができるようなスマートサーバやプロトコルがリリース\n"
644
"*かもしれません*。"
645
541
646
#: bzrlib/builtins.py:1269
542
#: breezy/builtins.py:1268
647
543
msgid ""
648
544
"This command only works on branches that have not diverged. Branches are\n"
649
545
"considered diverged if the destination branch's most recent commit is one\n"
650
546
"that has not been merged (directly or indirectly) by the source branch."
651
547
msgstr ""
652
"このコマンドは、分岐していないブランチ同士でのみ使用できます。push先ブランチ\n"
653
"の最新のコミットが(直接的、もしくは間接的に)push元のブランチにまだマージされて\n"
654
"いない状態の場合に、ブランチが分岐しているとみなされます。"
655
548
656
#: bzrlib/builtins.py:1273
549
#: breezy/builtins.py:1272
657
550
msgid ""
658
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
551
"If branches have diverged, you can use 'brz push --overwrite' to replace\n"
659
552
"the other branch completely, discarding its unmerged changes."
660
553
msgstr ""
661
"ブランチ同士が分岐している場合、 'bzr push --overwrite' で、まだマージされて\n"
662
"いない変更を破棄してpush先のブランチを完全に置きかえることができます。"
663
554
664
#: bzrlib/builtins.py:1276
555
#: breezy/builtins.py:1275
665
556
msgid ""
666
557
"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"
558
"do a merge (see brz help merge) from the other branch, and commit that.\n"
668
559
"After that you will be able to do a push without '--overwrite'."
669
560
msgstr ""
670
"push先のブランチに違う変更があって、それを残したいなら、まずpush先のブランチ\n"
671
"からマージして(bzr help mergeを参照)コミットしてください。そうすれば、\n"
672
"'--overwrite'の指定なしでpushできるようになります。"
673
561
674
#: bzrlib/builtins.py:1280
562
#: breezy/builtins.py:1279
675
563
msgid ""
676
564
"If there is no default push location set, the first push will set it (use\n"
677
565
"--no-remember to avoid setting it). After that, you can omit the\n"
678
566
"location to use the default. To change the default, use --remember. The\n"
679
567
"value will only be saved if the remote location can be accessed."
680
568
msgstr ""
681
"デフォルトのpush対象ブランチが設定されていない場合は、最初にpushした時に\n"
682
"設定されます。(これをしないようにするには、--no-rememberを指定します。)\n"
683
"その後は、デフォルトのブランチを使用する時には指定を省略できるようになり\n"
684
"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモートの\n"
685
"ブランチにアクセスできた時だけ保存されます。"
686
569
687
#: bzrlib/builtins.py:1285
570
#: breezy/builtins.py:1284
688
571
msgid ""
689
572
"The --verbose option will display the revisions pushed using the log_format\n"
690
573
"configuration option. You can use a different format by overriding it with\n"
691
574
"-Olog_format=<other_format>."
692
575
msgstr ""
693
"--verbose オプションは push されたリビジョンを log_format 設定オプションを\n"
694
"利用して表示します。 -Olog_format=<other_format> と指定することで、\n"
695
"別のフォーマットで表示できます。"
696
576
697
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
577
# help of 'directory' option of 'dpush' command
578
# help of 'directory' option of 'push' command
579
#: breezy/builtins.py:1295 breezy/foreign.py:272
698
580
msgid ""
699
581
"Branch to push from, rather than the one containing the working directory."
700
msgstr "カレントディレクトリの代わりにpush元とするブランチを指定します。"
582
msgstr ""
701
583
702
#: bzrlib/builtins.py:1299
584
# help of 'use-existing-dir' option of 'push' command
585
#: breezy/builtins.py:1298
703
586
msgid ""
704
587
"By default push will fail if the target directory exists, but does not "
705
588
"already have a control directory. This flag will allow push to proceed."
706
589
msgstr ""
707
"デフォルトでは、push先のディレクトリが既に存在しているのにバージョン管理されていない状態の場合はpushできません。このフラグを指定すると、その場合で"
708
"もpushできるようになります。"
709
590
710
#: bzrlib/builtins.py:1304
591
# help of 'stacked' option of 'push' command
592
#: breezy/builtins.py:1303
711
593
msgid ""
712
594
"Create a stacked branch that references the public location of the parent "
713
595
"branch."
714
msgstr "親ブランチの公開された場所を参照するスタックドブランチを作成します。"
596
msgstr ""
715
597
716
#: bzrlib/builtins.py:1307
598
# help of 'stacked-on' option of 'push' command
599
#: breezy/builtins.py:1306
717
600
msgid ""
718
601
"Create a stacked branch that refers to another branch for the commit "
719
602
"history. Only the work not present in the referenced branch is included in "
720
603
"the branch created."
721
msgstr "コミットの履歴を別のブランチから参照するスタックドブランチを作成します。参照先のブランチにない変更だけがこのブランチに含まれます。"
604
msgstr ""
722
605
723
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
606
# help of 'strict' option of 'dpush' command
607
# help of 'strict' option of 'push' command
608
#: breezy/builtins.py:1311 breezy/foreign.py:279
724
609
msgid ""
725
610
"Refuse to push if there are uncommitted changes in the working tree, --no-"
726
611
"strict disables the check."
727
612
msgstr ""
728
"作業コピーが変更されている場合はpushできませんが、--no-strictオプションを指定\n"
729
"するとpushできるようになります。"
730
613
731
#: bzrlib/builtins.py:1315
614
# help of 'no-tree' option of 'push' command
615
#: breezy/builtins.py:1314
732
616
msgid "Don't populate the working tree, even for protocols that support it."
733
msgstr "作業コピーを更新できるプロトコルを使っている場合でも、更新しません。"
617
msgstr ""
734
618
735
#: bzrlib/builtins.py:1318
619
# help of 'overwrite-tags' option of 'pull' command
620
# help of 'overwrite-tags' option of 'push' command
621
#: breezy/builtins.py:1317
736
622
msgid "Overwrite tags only."
737
623
msgstr ""
738
624
739
#: bzrlib/builtins.py:1369
625
#: breezy/builtins.py:1368
740
626
msgid "Could not determine branch to refer to."
741
msgstr "参照先のブランチを特定できません。"
627
msgstr ""
742
628
743
#: bzrlib/builtins.py:1378
629
#: breezy/builtins.py:1377
744
630
#, python-format
745
631
msgid ""
746
632
"No push location known or specified. To push to the parent branch (at %s), "
747
"use 'bzr push :parent'."
748
msgstr "push先が設定も指定もされていません。親ブランチ(%s)にpushする場合は、'bzr push :parent'を使用してください。"
633
"use 'brz push :parent'."
634
msgstr ""
749
635
750
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
636
#: breezy/builtins.py:1383 breezy/foreign.py:306
751
637
msgid "No push location known or specified."
752
msgstr "push先のブランチが設定も指定もされていません。"
638
msgstr ""
753
639
754
#: bzrlib/builtins.py:1388
640
#: breezy/builtins.py:1387
755
641
#, python-format
756
642
msgid "Using saved push location: %s"
757
msgstr "デフォルトのpush先ブランチを使用します。: %s"
643
msgstr ""
758
644
759
#: bzrlib/builtins.py:1398
645
#: breezy/builtins.py:1397
760
646
msgid "Create a new branch that is a copy of an existing branch."
761
msgstr "既存のブランチをコピーして新しいブランチを作成します。"
647
msgstr ""
762
648
763
#: bzrlib/builtins.py:1400
649
#: breezy/builtins.py:1399
764
650
msgid ""
765
651
"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"
652
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
653
"bar.\n"
768
654
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
769
655
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
770
656
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
771
657
"create ./foo-bar."
772
658
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
659
779
#: bzrlib/builtins.py:1407
660
#: breezy/builtins.py:1406
780
661
msgid ""
781
662
"To retrieve the branch as of a particular revision, supply the --revision\n"
782
663
"parameter, as in \"branch foo/bar -r 5\"."
783
664
msgstr ""
784
"ブランチの特定のリビジョンで取り出したい場合は、\"branch foo/bar -r 5\"の\n"
785
"ように--revisionオプションを指定してください。"
786
665
787
#: bzrlib/builtins.py:1410
666
#: breezy/builtins.py:1409
788
667
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
789
msgstr "このコマンドの別名である'clone'と'get'は廃止予定です。"
668
msgstr ""
790
669
791
#: bzrlib/builtins.py:1420
670
# help of 'no-tree' option of 'branch' command
671
#: breezy/builtins.py:1419
792
672
msgid "Create a branch without a working-tree."
793
msgstr "作業ツリーのないブランチを作成します。"
673
msgstr ""
794
674
795
#: bzrlib/builtins.py:1422
675
# help of 'switch' option of 'branch' command
676
#: breezy/builtins.py:1421
796
677
msgid "Switch the checkout in the current directory to the new branch."
797
msgstr "カレントディレクトリにあるチェックアウトの参照先を新しいブランチに切り替えます。"
678
msgstr ""
798
679
799
#: bzrlib/builtins.py:1425
680
# help of 'stacked' option of 'branch' command
681
#: breezy/builtins.py:1424
800
682
msgid ""
801
683
"Create a stacked branch referring to the source branch. The new branch will "
802
684
"depend on the availability of the source branch for all operations."
803
msgstr "元のブランチを参照するスタックドブランチを作成します。新しいブランチでは、元のブランチにアクセスできるときしか操作できません。"
685
msgstr ""
804
686
805
#: bzrlib/builtins.py:1429
687
# help of 'standalone' option of 'branch' command
688
#: breezy/builtins.py:1428
806
689
msgid "Do not use a shared repository, even if available."
807
msgstr "共有リポジトリが使える場合でも、共有リポジトリを使いません。"
690
msgstr ""
808
691
809
#: bzrlib/builtins.py:1431
692
# help of 'use-existing-dir' option of 'branch' command
693
#: breezy/builtins.py:1430
810
694
msgid ""
811
695
"By default branch will fail if the target directory exists, but does not "
812
696
"already have a control directory. This flag will allow branch to proceed."
813
697
msgstr ""
814
"デフォルトでは、branch先のディレクトリが既に存在しているのにバージョン管理されていない場合はbranchできません。このフラグを指定すると、その場合"
815
"でもbranchできるようになります。"
816
698
817
#: bzrlib/builtins.py:1436
699
# help of 'bind' option of 'branch' command
700
#: breezy/builtins.py:1435
818
701
msgid "Bind new branch to from location."
819
msgstr "新しいブランチを元のブランチにバインドします。"
702
msgstr ""
820
703
821
#: bzrlib/builtins.py:1483
704
#: breezy/builtins.py:1482
822
705
#, python-format
823
706
msgid "Target directory \"%s\" already exists."
824
msgstr "対象のディレクトリ \"%s\" は既に存在します。"
707
msgstr ""
825
708
826
#: bzrlib/builtins.py:1495
709
#: breezy/builtins.py:1494
827
710
#, python-format
828
711
msgid "Parent of \"%s\" does not exist."
829
msgstr "\"%s\" の親が見つかりません。"
712
msgstr ""
830
713
831
#: bzrlib/builtins.py:1514
714
#: breezy/builtins.py:1513
715
#, python-brace-format
832
716
msgid "The branch {0} has no revision {1}."
833
msgstr "ブランチ {0} にリビジョン {1} はありません。"
717
msgstr ""
834
718
835
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
719
#: breezy/builtins.py:1528 breezy/push.py:53
836
720
#, python-format
837
721
msgid "Created new stacked branch referring to %s."
838
msgstr "%s を参照するスタックドブランチを作成しました。"
722
msgstr ""
839
723
840
#: bzrlib/builtins.py:1533
724
#: breezy/builtins.py:1532
841
725
#, python-format
842
726
msgid "Branched %d revision."
843
727
msgid_plural "Branched %d revisions."
844
msgstr[0] "%d個のリビジョンをブランチしました。"
728
msgstr[0] ""
729
msgstr[1] ""
845
730
846
#: bzrlib/builtins.py:1538
731
#: breezy/builtins.py:1537
847
732
#, python-format
848
733
msgid "New branch bound to %s"
849
msgstr "新しいブランチは %s にバインドされています。"
734
msgstr ""
850
735
851
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
736
#: breezy/builtins.py:1542 breezy/builtins.py:6283
852
737
#, python-format
853
738
msgid "Switched to branch: %s"
854
msgstr "バインド先をスイッチしました。: %s"
739
msgstr ""
855
740
856
#: bzrlib/builtins.py:1548
741
#: breezy/builtins.py:1547
857
742
msgid "List the branches available at the current location."
858
msgstr "カレントフォルダにある利用可能なブランチをリストアップします。"
743
msgstr ""
859
744
860
#: bzrlib/builtins.py:1550
745
#: breezy/builtins.py:1549
861
746
msgid ""
862
747
"This command will print the names of all the branches at the current\n"
863
748
"location."
864
msgstr "このコマンドは、現在の場所にある全てのブランチの名前を表示します。"
749
msgstr ""
865
750
866
#: bzrlib/builtins.py:1557
751
# help of 'recursive' option of 'branches' command
752
#: breezy/builtins.py:1556
867
753
msgid ""
868
754
"Recursively scan for branches rather than just looking in the specified "
869
755
"location."
870
msgstr "指定された場所だけでなく、再帰的にブランチを探します。"
756
msgstr ""
871
757
872
#: bzrlib/builtins.py:1586
758
#: breezy/builtins.py:1585
873
759
msgid "(default)"
874
msgstr "(デフォルト)"
760
msgstr ""
875
761
876
#: bzrlib/builtins.py:1598
762
#: breezy/builtins.py:1597
877
763
msgid "Create a new checkout of an existing branch."
878
msgstr "既存のブランチのチェックアウトを新しく作成します。"
764
msgstr ""
879
765
880
#: bzrlib/builtins.py:1600
766
#: breezy/builtins.py:1599
881
767
msgid ""
882
768
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
883
769
"for\n"
886
772
"or if it was never created - i.e. if you pushed the branch to its current\n"
887
773
"location using SFTP."
888
774
msgstr ""
889
"BRANCH_LOCATIONが指定されていない場合は、'.'にあるブランチを再構成します。\n"
890
"これは、作業ツリーを消してしまった場合や、そもそも作業ツリーが作成されて\n"
891
"いない場合(例えば、SFTPでpushされたブランチなど)に役立ちます。"
892
775
893
#: bzrlib/builtins.py:1605
776
#: breezy/builtins.py:1604
894
777
msgid ""
895
778
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
896
779
"will\n"
897
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
898
"./bar.\n"
780
"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./"
781
"bar.\n"
899
782
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
900
783
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
901
784
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
902
785
"create ./foo-bar."
903
786
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
787
910
#: bzrlib/builtins.py:1612
788
#: breezy/builtins.py:1611
911
789
msgid ""
912
790
"To retrieve the branch as of a particular revision, supply the --revision\n"
913
791
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
916
794
"old\n"
917
795
"code.)"
918
796
msgstr ""
919
"ブランチの特定のリビジョンで取り出したい場合は、\"checkout foo/bar -r 5\"の\n"
920
"ように--revisionオプションを指定してください。その場合は作業コピーが古い状態に\n"
921
"なるため、コミットはできませんが、例えば古いコードをチェックする場合などに\n"
922
"役立ちます。"
923
797
924
#: bzrlib/builtins.py:1622
798
# help of 'lightweight' option of 'checkout' command
799
#: breezy/builtins.py:1621
925
800
msgid ""
926
801
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
927
802
"the branch for every operation. Normal checkouts can perform common "
928
803
"operations like diff and status without such access, and also support local "
929
804
"commits."
930
805
msgstr ""
931
"軽量チェックアウトを作成します。軽量チェックアウト上での操作には、チェック\n"
932
"アウト元のブランチにアクセスできる必要があります。通常のチェックアウトの\n"
933
"場合は、diffやstatusのような一般的な操作ではその必要はありませんし、ローカル\n"
934
"コミットすることもできます。"
935
806
936
#: bzrlib/builtins.py:1629
807
# help of 'files-from' option of 'branch' command
808
# help of 'files-from' option of 'checkout' command
809
#: breezy/builtins.py:1628
937
810
msgid "Get file contents from this tree."
938
msgstr "ファイルの内容をこのツリーから取得します。"
811
msgstr ""
939
812
940
#: bzrlib/builtins.py:1631
813
# help of 'hardlink' option of 'branch' command
814
# help of 'hardlink' option of 'checkout' command
815
#: breezy/builtins.py:1630
941
816
msgid "Hard-link working tree files where possible."
942
msgstr "可能なら、作業コピーをハードリンクします。"
817
msgstr ""
943
818
944
#: bzrlib/builtins.py:1672
819
#: breezy/builtins.py:1671
945
820
msgid ""
946
821
"Show list of renamed files.\n"
947
822
" "
948
823
msgstr ""
949
"変名されたファイルをリストアップします。\n"
950
" "
951
824
952
#: bzrlib/builtins.py:1700
825
#: breezy/builtins.py:1699
953
826
msgid "Update a working tree to a new revision."
954
msgstr "作業ツリーを新しいリビジョンに更新します。"
827
msgstr ""
955
828
956
#: bzrlib/builtins.py:1702
829
#: breezy/builtins.py:1701
957
830
msgid ""
958
831
"This will perform a merge of the destination revision (the tip of the\n"
959
832
"branch, or the specified revision) into the working tree, and then make\n"
960
833
"that revision the basis revision for the working tree. "
961
834
msgstr ""
962
"移動先のリビジョン(ブランチのTipもしくは指定されたリビジョン)を作業ツリーに\n"
963
"マージして、そのリビジョンを作業ツリーのベースリビジョンに設定します。 "
964
835
965
#: bzrlib/builtins.py:1706
836
#: breezy/builtins.py:1705
966
837
msgid ""
967
838
"You can use this to visit an older revision, or to update a working tree\n"
968
839
"that is out of date from its branch."
969
840
msgstr ""
970
"古いリビジョンに一時的に移動したり、ブランチより古くなってしまった作業ツリーを\n"
971
"最新の状態にしたりすることができます。"
972
841
973
#: bzrlib/builtins.py:1709
842
#: breezy/builtins.py:1708
974
843
msgid ""
975
844
"If there are any uncommitted changes in the tree, they will be carried\n"
976
845
"across and remain as uncommitted changes after the update. To discard\n"
977
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
846
"these changes, use 'brz revert'. The uncommitted changes may conflict\n"
978
847
"with the changes brought in by the change in basis revision."
979
848
msgstr ""
980
"作業ツリーにコミットされていない変更があった場合、その変更は update 後も\n"
981
"コミットされていない変更として残ります。これらの変更を取り消すには、\n"
982
"'bzr revert' コマンドを利用してください。コミットされていない変更は、ベース\n"
983
"リビジョンの更新による変更とコンフリクトする可能性があります。"
984
849
985
#: bzrlib/builtins.py:1714
850
#: breezy/builtins.py:1713
986
851
msgid ""
987
"If the tree's branch is bound to a master branch, bzr will also update\n"
852
"If the tree's branch is bound to a master branch, brz will also update\n"
988
853
"the branch from the master."
989
854
msgstr ""
990
"作業ツリーのブランチがマスターブランチに束縛されている場合、bzrは\n"
991
"作業ツリーのブランチもマスターブランチの状態に更新します。"
992
855
993
#: bzrlib/builtins.py:1717
856
#: breezy/builtins.py:1716
994
857
msgid ""
995
858
"You cannot update just a single file or directory, because each Bazaar\n"
996
859
"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"
860
"file that has been removed locally, use 'brz revert' instead of 'brz\n"
998
861
"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"
862
"revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write\n"
1000
863
"out the old content of that file to a new location."
1001
864
msgstr ""
1002
"Bazaarの作業ツリーはそれぞれベースリビジョンをひとつだけ持っているので、\n"
1003
"ファイルやディレクトリを個別に更新することはできません。もし、手元で削除して\n"
1004
"しまったファイルを元に戻したいのであれば、'bzr update'ではなく'bzr revert'を\n"
1005
"使ってください。もし、ファイルを前のバージョンの状態に戻したいのであれば、\n"
1006
"'bzr revert'に -r オプションを指定するか、'bzr cat'を使って古い内容を書き出して\n"
1007
"ください。"
1008
865
1009
#: bzrlib/builtins.py:1724
866
#: breezy/builtins.py:1723
1010
867
msgid ""
1011
868
"The 'dir' argument, if given, must be the location of the root of a\n"
1012
869
"working tree to update. By default, the working tree that contains the \n"
1013
870
"current working directory is used."
1014
871
msgstr ""
1015
"dir 引数を指定する場合は、作業ツリーのルートを指定する必要があります。\n"
1016
"デフォルトでは、カレントディレクトリを含む作業ツリーが選択されます。"
1017
1018
#: bzrlib/builtins.py:1740
1019
msgid "bzr update --revision takes exactly one revision"
1020
msgstr "bzr update --revisionには、リビジョンをひとつだけ指定します。"
1021
1022
#: bzrlib/builtins.py:1748
1023
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1024
msgstr "bzr updateは、個々のファイルやディレクトリではなく、作業ツリー全体を更新します。"
1025
1026
#: bzrlib/builtins.py:1779
872
873
#: breezy/builtins.py:1739
874
msgid "brz update --revision takes exactly one revision"
875
msgstr ""
876
877
#: breezy/builtins.py:1747
878
msgid "brz update can only update a whole tree, not a file or subdirectory"
879
msgstr ""
880
881
#: breezy/builtins.py:1778
882
#, python-brace-format
1027
883
msgid "Tree is up to date at revision {0} of branch {1}"
1028
msgstr "ツリーはブランチ {1} のリビジョン {0} で最新の状態です。"
884
msgstr ""
1029
885
1030
#: bzrlib/builtins.py:1795
886
#: breezy/builtins.py:1794
1031
887
#, python-format
1032
888
msgid ""
1033
889
"branch has no revision %s\n"
1034
"bzr update --revision only works for a revision in the branch history"
890
"brz update --revision only works for a revision in the branch history"
1035
891
msgstr ""
1036
"ブランチには%sというリビジョンはありません。\n"
1037
"bzr update --revisionには、ブランチ内のリビジョンを指定する必要があります。"
1038
892
1039
#: bzrlib/builtins.py:1801
893
#: breezy/builtins.py:1800
894
#, python-brace-format
1040
895
msgid "Updated to revision {0} of branch {1}"
1041
msgstr "ブランチ {1} のリビジョン {0} に更新されました。"
896
msgstr ""
1042
897
1043
#: bzrlib/builtins.py:1805
898
#: breezy/builtins.py:1804
1044
899
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'でコミットできます。"
900
"Your local commits will now show as pending merges with 'brz status', and "
901
"can be committed with 'brz commit'."
902
msgstr ""
1048
903
1049
#: bzrlib/builtins.py:1814
904
#: breezy/builtins.py:1813
1050
905
msgid "Show information about a working tree, branch or repository."
1051
msgstr "作業コピー、ブランチ、リポジトリの情報を表示します。"
906
msgstr ""
1052
907
1053
#: bzrlib/builtins.py:1816
908
#: breezy/builtins.py:1815
1054
909
msgid ""
1055
910
"This command will show all known locations and formats associated to the\n"
1056
911
"tree, branch or repository."
1057
912
msgstr ""
1058
"このコマンドは、ツリー、ブランチ、リポジトリに関連する所在やフォーマット\n"
1059
"のすべての情報を表示します。"
1060
913
1061
#: bzrlib/builtins.py:1819
914
#: breezy/builtins.py:1818
1062
915
msgid ""
1063
916
"In verbose mode, statistical information is included with each report.\n"
1064
917
"To see extended statistic information, use a verbosity level of 2 or\n"
1065
918
"higher by specifying the verbose option multiple times, e.g. -vv."
1066
919
msgstr ""
1067
"verboseモードでは、それぞれのレポートに統計情報が追加されます。さらに\n"
1068
"高度な統計情報を見るには、-vvのようにverboseオプションを複数回指定する\n"
1069
"ことによって、verboseレベル2以上を指定してください。"
1070
920
1071
#: bzrlib/builtins.py:1823
921
#: breezy/builtins.py:1822
1072
922
msgid "Branches and working trees will also report any missing revisions."
1073
msgstr "ブランチと作業ツリーについては、存在しないリビジョンについても表示されます。"
923
msgstr ""
1074
924
1075
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1076
#: bzrlib/builtins.py:6466
925
#: breezy/builtins.py:1824 breezy/builtins.py:3742 breezy/builtins.py:4883
926
#: breezy/builtins.py:6469
1077
927
msgid ":Examples:"
1078
msgstr ":例:"
928
msgstr ""
1079
929
1080
#: bzrlib/builtins.py:1827
930
#: breezy/builtins.py:1826
1081
931
msgid " Display information on the format and related locations:"
1082
msgstr " フォーマットと関連する場所についての情報を表示します。"
1083
1084
#: bzrlib/builtins.py:1829
1085
msgid " bzr info"
1086
msgstr " bzr info"
1087
1088
#: bzrlib/builtins.py:1831
932
msgstr ""
933
934
#: breezy/builtins.py:1828
935
msgid " brz info"
936
msgstr ""
937
938
#: breezy/builtins.py:1830
1089
939
msgid ""
1090
940
" Display the above together with extended format information and\n"
1091
941
" basic statistics (like the number of files in the working tree and\n"
1092
942
" number of revisions in the branch and repository):"
1093
943
msgstr ""
1094
" より詳細なフォーマット情報と、基本的な統計情報(作業ツリー内のファイルの\n"
1095
" 数、ブランチ、リポジトリ内のリビジョンの数など)を一緒に表示します。:"
1096
1097
#: bzrlib/builtins.py:1835
1098
msgid " bzr info -v"
1099
msgstr " bzr info -v"
1100
1101
#: bzrlib/builtins.py:1837
944
945
#: breezy/builtins.py:1834
946
msgid " brz info -v"
947
msgstr ""
948
949
#: breezy/builtins.py:1836
1102
950
msgid " Display the above together with number of committers to the branch:"
1103
msgstr " さらに、このブランチにコミットした人の数も表示します。:"
1104
1105
#: bzrlib/builtins.py:1839
1106
msgid " bzr info -vv"
1107
msgstr " bzr info -vv"
1108
1109
#: bzrlib/builtins.py:1858
951
msgstr ""
952
953
#: breezy/builtins.py:1838
954
msgid " brz info -vv"
955
msgstr ""
956
957
#: breezy/builtins.py:1857
1110
958
msgid "Remove files or directories."
1111
msgstr "ファイルやディレクトリを削除します。"
959
msgstr ""
1112
960
1113
#: bzrlib/builtins.py:1860
961
#: breezy/builtins.py:1859
1114
962
msgid ""
1115
963
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1116
964
"delete them if they can easily be recovered using revert otherwise they\n"
1118
966
"parameters are given Bazaar will scan for files that are being tracked by\n"
1119
967
"Bazaar but missing in your tree and stop tracking them for you."
1120
968
msgstr ""
1121
"これを行うと Bazaar は指定されたファイルの変更のトラックを停止します。\n"
1122
"これらのファイルが revert を用いて簡単に復元できる場合には削除を\n"
1123
"行いますが、そうでない場合にはバックアップが作られます (.~#~ という\n"
1124
"形の拡張子を付加します)。オプションやパラメータが指定されなかった\n"
1125
"場合には、Bazaar がトラックしているファイルのうち、現在のワーキング\n"
1126
"ツリーに存在しないファイルを検索し、これらのトラックを中止します。"
1127
969
1128
#: bzrlib/builtins.py:1868
970
# help of 'new' option of 'remove' command
971
#: breezy/builtins.py:1867
1129
972
msgid "Only remove files that have never been committed."
1130
msgstr "まだコミットされていないファイルだけを削除します。"
973
msgstr ""
1131
974
1132
#: bzrlib/builtins.py:1870
975
# help of 'file-deletion-strategy' option of 'remove' command
976
#: breezy/builtins.py:1869
1133
977
msgid "The file deletion mode to be used."
1134
msgstr "使用するファイル削除モードです。"
978
msgstr ""
1135
979
1136
#: bzrlib/builtins.py:1871
980
# title of 'file-deletion-strategy' option of 'remove' command
981
#: breezy/builtins.py:1870
1137
982
msgid "Deletion Strategy"
1138
msgstr "削除モード"
983
msgstr ""
1139
984
1140
#: bzrlib/builtins.py:1872
985
# help of 'file-deletion-strategy=safe' option of 'remove' command
986
#: breezy/builtins.py:1871
1141
987
msgid "Backup changed files (default)."
1142
msgstr "変更したファイルをバックアップします。"
1143
1144
#: bzrlib/builtins.py:1873
1145
msgid "Delete from bzr but leave the working copy."
1146
msgstr "Bazaarからは削除しますが、作業ツリーには残します。"
1147
1148
#: bzrlib/builtins.py:1874
988
msgstr ""
989
990
# help of 'file-deletion-strategy=keep' option of 'remove' command
991
#: breezy/builtins.py:1872
992
msgid "Delete from brz but leave the working copy."
993
msgstr ""
994
995
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
996
#: breezy/builtins.py:1873
1149
997
msgid "Don't backup changed files."
1150
msgstr "変更されたファイルをバックアップしません。"
1151
1152
#: bzrlib/builtins.py:1875
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
998
msgstr ""
1157
"元に戻せないファイル、空ではないディレクトリも含めて、指定されたアイテムを全て削除します。(廃止予定。no-backupを使用してください)"
1158
1159
#: bzrlib/builtins.py:1884
1160
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1161
msgstr "(--forceオプションは廃止予定です。今後は--no-backupを使用してください)"
1162
1163
#: bzrlib/builtins.py:1901
999
1000
#: breezy/builtins.py:1894
1164
1001
msgid "No matching files."
1165
msgstr "対象のファイルはありませんでした。"
1166
1167
#: bzrlib/builtins.py:1962
1168
msgid "Reconcile bzr metadata in a branch."
1169
msgstr "ブランチ内のBazaarのメタデータを修復します。"
1170
1171
#: bzrlib/builtins.py:1964
1002
msgstr ""
1003
1004
#: breezy/builtins.py:1955
1005
msgid "Reconcile brz metadata in a branch."
1006
msgstr ""
1007
1008
#: breezy/builtins.py:1957
1172
1009
msgid ""
1173
1010
"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"
1011
"previous ghost operations or brz upgrades. You should only\n"
1012
"need to run this command if 'brz check' or a brz developer\n"
1176
1013
"advises you to run it."
1177
1014
msgstr ""
1178
"このコマンドで、オペレーションの失敗やBzrのアップグレードによってできた\n"
1179
"と思われるデータの不整合を修正することができます。'bzr check'の結果や、\n"
1180
"Bzrの開発者からの指示があるとき以外は、実行する必要はありません。"
1181
1015
1182
#: bzrlib/builtins.py:1969
1016
#: breezy/builtins.py:1962
1183
1017
msgid ""
1184
1018
"If a second branch is provided, cross-branch reconciliation is\n"
1185
1019
"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"
1020
"id which was not present in very early brz versions is represented\n"
1187
1021
"correctly in both branches."
1188
1022
msgstr ""
1189
"２番目のブランチが指定された場合は、クロスブランチ修復を行います。\n"
1190
"これは、ツリーのルートIDのような、非常に古いバージョンのBzrにはなかった\n"
1191
"データが、両方のブランチに正しく表現されているかをチェックします。"
1192
1023
1193
#: bzrlib/builtins.py:1974
1024
#: breezy/builtins.py:1967
1194
1025
msgid ""
1195
1026
"At the same time it is run it may recompress data resulting in\n"
1196
1027
"a potential saving in disk space or performance gain."
1197
1028
msgstr ""
1198
"同時に、ディスクスペースの節約やパフォーマンスの向上のために、データの\n"
1199
"再圧縮がかかる可能性があります。"
1200
1029
1201
#: bzrlib/builtins.py:1977
1030
#: breezy/builtins.py:1970
1202
1031
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1203
1032
msgstr ""
1204
"ブランチは、ローカルディスクやsftpのような、リスト可能なシステム上に\n"
1205
"ある*必要があります*。"
1206
1033
1207
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1034
# help of 'format=2a' option of 'init' command
1035
# help of 'format=default' option of 'init' command
1036
# help of 'format=2a' option of 'init-repository' command
1037
# help of 'format=default' option of 'init-repository' command
1038
# help of 'format=2a' option of 'upgrade' command
1039
# help of 'format=default' option of 'upgrade' command
1040
#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
1208
1041
msgid ""
1209
1042
"Format for the bzr 2.0 series.\n"
1210
1043
"Uses group-compress storage.\n"
1211
1044
"Provides rich roots which are a one-way transition.\n"
1212
1045
msgstr ""
1213
"bzr 2.0 シリーズのためのフォーマット。\n"
1214
"group-compress ストレージを利用します。\n"
1215
"rich root 機能を提供します。 rich root 機能を提供するフォーマットに変換すると、\n"
1216
"rich root 機能を持たないフォーマットに戻ることはできません。\n"
1217
1046
1218
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1047
# help of 'format=pack-0.92' option of 'init' command
1048
# help of 'format=pack-0.92' option of 'init-repository' command
1049
# help of 'format=pack-0.92' option of 'upgrade' command
1050
#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
1219
1051
msgid ""
1220
1052
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1221
1053
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1222
1054
msgstr ""
1223
"1.x シリーズで使われているパックベースのフォーマット。0.92 で導入されました。0.92 以前の bzr リポジトリと相互運用可能ですが、0.92 "
1224
"より前の bzr からは読み込むことができません。 "
1225
1055
1226
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1056
# help of 'format=development-colo' option of 'init' command
1057
# help of 'format=development-colo' option of 'init-repository' command
1058
# help of 'format=development-colo' option of 'upgrade' command
1059
#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
1227
1060
msgid "The 2a format with experimental support for colocated branches.\n"
1228
msgstr "colocated branch を実験的にサポートする 2a フォーマット。\n"
1061
msgstr ""
1229
1062
1230
#: bzrlib/builtins.py:2045
1063
#: breezy/builtins.py:2038
1231
1064
msgid "Make a directory into a versioned branch."
1232
msgstr "ディレクトリを、バージョン管理されたブランチにします。"
1065
msgstr ""
1233
1066
1234
#: bzrlib/builtins.py:2047
1067
#: breezy/builtins.py:2040
1235
1068
msgid ""
1236
1069
"Use this to create an empty branch, or before importing an\n"
1237
1070
"existing project."
1238
1071
msgstr ""
1239
"空のブランチを作る場合や、既存のプロジェクトをインポートする前にこの\n"
1240
"コマンドを使用します。"
1241
1072
1242
#: bzrlib/builtins.py:2050
1073
#: breezy/builtins.py:2043
1243
1074
msgid ""
1244
1075
"If there is a repository in a parent directory of the location, then\n"
1245
1076
"the history of the branch will be stored in the repository. Otherwise\n"
1246
1077
"init creates a standalone branch which carries its own history\n"
1247
1078
"in the .bzr directory."
1248
1079
msgstr ""
1249
"親ディレクトリにリポジトリがある場合は、ブランチ内の履歴はリポジトリに\n"
1250
"保存されます。そうでない場合は、履歴を.bzrディレクトリ内に持つスタンド\n"
1251
"アロンブランチが作成されます。"
1252
1080
1253
#: bzrlib/builtins.py:2055
1081
#: breezy/builtins.py:2048
1254
1082
msgid ""
1255
1083
"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'."
1084
"the tree can be populated with 'brz checkout'."
1257
1085
msgstr ""
1258
"既にブランチがあって、作業ツリーがない場合は、'bzr checkout'でツリーを\n"
1259
"生成することができます。"
1260
1086
1261
#: bzrlib/builtins.py:2058
1087
#: breezy/builtins.py:2051
1262
1088
msgid "Recipe for importing a tree of files::"
1263
msgstr "ファイルのツリーをインポートするためのレシピ::"
1264
1265
#: bzrlib/builtins.py:2060
1266
msgid ""
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
1279
#: bzrlib/builtins.py:2071
1280
msgid ""
1281
"Create the path leading up to the branch if it does not already exist."
1282
msgstr "ブランチまでのパスが存在していなければ、作成します。"
1283
1284
#: bzrlib/builtins.py:2074
1089
msgstr ""
1090
1091
#: breezy/builtins.py:2053
1092
msgid ""
1093
" cd ~/project\n"
1094
" brz init\n"
1095
" brz add .\n"
1096
" brz status\n"
1097
" brz commit -m \"imported project\""
1098
msgstr ""
1099
1100
# help of 'create-prefix' option of 'init' command
1101
# help of 'create-prefix' option of 'push' command
1102
#: breezy/builtins.py:2064
1103
msgid "Create the path leading up to the branch if it does not already exist."
1104
msgstr ""
1105
1106
# help of 'format' option of 'init' command
1107
#: breezy/builtins.py:2067
1285
1108
msgid "Specify a format for this branch. See \"help formats\"."
1286
msgstr "ブランチのフォーマットを指定します。\"help formats\"をご覧ください。"
1287
1288
#: bzrlib/builtins.py:2082
1289
msgid ""
1290
"Never change revnos or the existing log. Append revisions to it only."
1291
msgstr "リビジョン番号や既存のログを変更せず、リビジョンの追加だけを行います。"
1292
1293
#: bzrlib/builtins.py:2085
1109
msgstr ""
1110
1111
# help of 'append-revisions-only' option of 'init' command
1112
#: breezy/builtins.py:2075
1113
msgid "Never change revnos or the existing log. Append revisions to it only."
1114
msgstr ""
1115
1116
# help of 'no-tree' option of 'init' command
1117
#: breezy/builtins.py:2078
1294
1118
msgid "Create a branch without a working tree."
1295
msgstr "作業ツリーをもたないブランチを作成します。"
1119
msgstr ""
1296
1120
1297
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1121
#: breezy/builtins.py:2098 breezy/push.py:110
1298
1122
#, python-format
1299
1123
msgid ""
1300
1124
"Parent directory of %s does not exist.\n"
1301
1125
"You may supply --create-prefix to create all leading parent directories."
1302
1126
msgstr ""
1303
"%s の親ディレクトリがありません。\n"
1304
"--create-prefixを指定すれば、親ディレクトリも作成されます。"
1305
1127
1306
#: bzrlib/builtins.py:2139
1128
#: breezy/builtins.py:2132
1307
1129
msgid ""
1308
1130
"This branch format cannot be set to append-revisions-only. Try --default."
1309
msgstr "このブランチフォーマットにappend-revisions-onlyは指定できません。--defaultを試してください。"
1131
msgstr ""
1310
1132
1311
#: bzrlib/builtins.py:2150
1133
#: breezy/builtins.py:2143
1134
#, python-brace-format
1312
1135
msgid "Created a {0} (format: {1})\n"
1313
msgstr "{0}を作成しました。(フォーマット:{1})\n"
1136
msgstr ""
1314
1137
1315
#: bzrlib/builtins.py:2159
1138
#: breezy/builtins.py:2152
1316
1139
#, python-format
1317
1140
msgid "Using shared repository: %s\n"
1318
msgstr "共有リポジトリを使用しました。: %s\n"
1141
msgstr ""
1319
1142
1320
#: bzrlib/builtins.py:2163
1143
#: breezy/builtins.py:2156
1321
1144
msgid "Create a shared repository for branches to share storage space."
1322
msgstr "ブランチのストレージを共有するための共有リポジトリを作成します。"
1145
msgstr ""
1323
1146
1324
#: bzrlib/builtins.py:2165
1147
#: breezy/builtins.py:2158
1325
1148
msgid ""
1326
1149
"New branches created under the repository directory will store their\n"
1327
1150
"revisions in the repository, not in the branch directory. For branches\n"
1328
1151
"with shared history, this reduces the amount of storage needed and \n"
1329
1152
"speeds up the creation of new branches."
1330
1153
msgstr ""
1331
"リポジトリのディレクトリの配下に新しく作られたブランチは、リビジョンを\n"
1332
"ブランチのディレクトリではなくリポジトリに保存します。リビジョンを共有\n"
1333
"しているブランチ同士のストレージサイズが節約され、新しいブランチを作成\n"
1334
"するスピードも速くなります。"
1335
1154
1336
#: bzrlib/builtins.py:2170
1155
#: breezy/builtins.py:2163
1337
1156
msgid ""
1338
1157
"If the --no-trees option is given then the branches in the repository\n"
1339
1158
"will not have working trees by default. They will still exist as \n"
1342
1161
"store branches which are interacted with through checkouts or remote\n"
1343
1162
"branches, such as on a server."
1344
1163
msgstr ""
1345
"--no-treesオプションが指定された場合は、リポジトリ内に作成されたブランチ\n"
1346
"にはデフォルトでは作業ツリーができません。ディスク上にディレクトリとしては\n"
1347
"ありますが、特定リビジョンのファイルのコピーを個々に持つことはありません。\n"
1348
"これは、サーバー上のリポジトリなど、チェックアウトやリモートブランチとやりとり\n"
1349
"するリポジトリの場合に役立ちます。"
1350
1164
1351
#: bzrlib/builtins.py:2177
1165
#: breezy/builtins.py:2170
1352
1166
msgid ""
1353
1167
":Examples:\n"
1354
1168
" Create a shared repository holding just branches::"
1355
1169
msgstr ""
1356
":例:\n"
1357
" ブランチだけをもつリポジトリを作成します。::"
1358
1170
1359
#: bzrlib/builtins.py:2180
1171
#: breezy/builtins.py:2173
1360
1172
msgid ""
1361
" bzr init-repo --no-trees repo\n"
1362
" bzr init repo/trunk"
1173
" brz init-repo --no-trees repo\n"
1174
" brz init repo/trunk"
1363
1175
msgstr ""
1364
" bzr init-repo --no-trees repo\n"
1365
" bzr init repo/trunk"
1366
1176
1367
#: bzrlib/builtins.py:2183
1177
#: breezy/builtins.py:2176
1368
1178
msgid " Make a lightweight checkout elsewhere::"
1369
msgstr " 別の場所に軽量チェックアウトを作成します。::"
1179
msgstr ""
1370
1180
1371
#: bzrlib/builtins.py:2185
1181
#: breezy/builtins.py:2178
1372
1182
msgid ""
1373
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1183
" brz checkout --lightweight repo/trunk trunk-checkout\n"
1374
1184
" cd trunk-checkout\n"
1375
1185
" (add files here)"
1376
1186
msgstr ""
1377
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1378
" cd trunk-checkout\n"
1379
" (ここでファイルを追加)"
1380
1187
1381
#: bzrlib/builtins.py:2193
1188
# help of 'format' option of 'init-repository' command
1189
#: breezy/builtins.py:2186
1382
1190
msgid ""
1383
"Specify a format for this repository. See \"bzr help formats\" for details."
1384
msgstr "リポジトリのフォーマットを指定します。詳しくは\"bzr help formats\"をご覧ください。"
1191
"Specify a format for this repository. See \"brz help formats\" for details."
1192
msgstr ""
1385
1193
1386
#: bzrlib/builtins.py:2197
1194
# title of 'format' option of 'init-repository' command
1195
#: breezy/builtins.py:2190
1387
1196
msgid "Repository format"
1388
msgstr "リポジトリフォーマット"
1197
msgstr ""
1389
1198
1390
#: bzrlib/builtins.py:2199
1199
# help of 'no-trees' option of 'init-repository' command
1200
#: breezy/builtins.py:2192
1391
1201
msgid "Branches in the repository will default to not having a working tree."
1392
msgstr "リポジトリ内のブランチにはデフォルトでは作業ツリーを持たせません。"
1202
msgstr ""
1393
1203
1394
#: bzrlib/builtins.py:2225
1204
#: breezy/builtins.py:2218
1395
1205
msgid "Show differences in the working tree, between revisions or branches."
1396
msgstr "作業ツリーや、リビジョン、ブランチ間の差分を表示します。"
1206
msgstr ""
1397
1207
1398
#: bzrlib/builtins.py:2227
1208
#: breezy/builtins.py:2220
1399
1209
msgid ""
1400
1210
"If no arguments are given, all changes for the current tree are listed.\n"
1401
1211
"If files are given, only the changes in those files are listed.\n"
1404
1214
"the first argument, if any, or the current tree if no arguments are\n"
1405
1215
"given."
1406
1216
msgstr ""
1407
"引数が指定されなかった場合は、現在のツリーのすべての変更が表示されます。\n"
1408
"ファイルが指定された場合は、そのファイルの変更だけが表示されます。\n"
1409
"リモートブランチや、複数のブランチを -oldと-newオプションで指定することが\n"
1410
"できます。これらが指定されていない場合は最初の引数が使われ、引数が無い\n"
1411
"場合は作業ツリーが対象になります。"
1412
1217
1413
#: bzrlib/builtins.py:2234
1218
#: breezy/builtins.py:2227
1414
1219
msgid ""
1415
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1220
"\"brz diff -p1\" is equivalent to \"brz diff --prefix old/:new/\", and\n"
1416
1221
"produces patches suitable for \"patch -p1\"."
1417
1222
msgstr ""
1418
"\"bzr diff -p1\"は、\"bzr diff --prefix old/:new/\" と同じで、\"patch -p1\"に\n"
1419
"準じたパッチを出力します。"
1420
1223
1421
#: bzrlib/builtins.py:2237
1224
#: breezy/builtins.py:2230
1422
1225
msgid ""
1423
1226
"Note that when using the -r argument with a range of revisions, the\n"
1424
1227
"differences are computed between the two specified revisions. That\n"
1425
1228
"is, the command does not show the changes introduced by the first \n"
1426
1229
"revision in the range. This differs from the interpretation of \n"
1427
"revision ranges used by \"bzr log\" which includes the first revision\n"
1230
"revision ranges used by \"brz log\" which includes the first revision\n"
1428
1231
"in the range."
1429
1232
msgstr ""
1430
"-rオプションでリビジョンの範囲を指定した場合は、その２つのリビジョン間での\n"
1431
"差分が取得されることに注意してください。つまり、リビジョンの範囲の開始\n"
1432
"リビジョンでの変更は含まれません。これは、\"bzr log\"にリビジョンの範囲を\n"
1433
"指定した場合の動作(開始リビジョンも含む)とは異なります。"
1434
1233
1435
#: bzrlib/builtins.py:2244
1234
#: breezy/builtins.py:2237
1436
1235
msgid ""
1437
1236
":Exit values:\n"
1438
1237
" 1 - changed\n"
1440
1239
" 3 - error\n"
1441
1240
" 0 - no change"
1442
1241
msgstr ""
1443
":Exit values:\n"
1444
" 1 - 変更あり\n"
1445
" 2 - 表示できない変更\n"
1446
" 3 - エラー\n"
1447
" 0 - 変更なし"
1448
1242
1449
#: bzrlib/builtins.py:2250
1243
#: breezy/builtins.py:2243
1450
1244
msgid ""
1451
1245
":Examples:\n"
1452
1246
" Shows the difference in the working tree versus the last commit::"
1453
1247
msgstr ""
1454
":例:\n"
1455
" 最新のコミットと作業ツリーとの間の変更を表示します。::"
1456
1457
#: bzrlib/builtins.py:2253
1458
msgid " bzr diff"
1459
msgstr " bzr diff"
1460
1461
#: bzrlib/builtins.py:2255
1248
1249
#: breezy/builtins.py:2246
1250
msgid " brz diff"
1251
msgstr ""
1252
1253
#: breezy/builtins.py:2248
1462
1254
msgid " Difference between the working tree and revision 1::"
1463
msgstr " 作業ツリーとリビジョン１を比較します。::"
1464
1465
#: bzrlib/builtins.py:2257
1466
msgid " bzr diff -r1"
1467
msgstr " bzr diff -r1"
1468
1469
#: bzrlib/builtins.py:2259
1255
msgstr ""
1256
1257
#: breezy/builtins.py:2250
1258
msgid " brz diff -r1"
1259
msgstr ""
1260
1261
#: breezy/builtins.py:2252
1470
1262
msgid " Difference between revision 3 and revision 1::"
1471
msgstr " リビジョン３とリビジョン１を比較します。::"
1472
1473
#: bzrlib/builtins.py:2261
1474
msgid " bzr diff -r1..3"
1475
msgstr " bzr diff -r1..3"
1476
1477
#: bzrlib/builtins.py:2263
1263
msgstr ""
1264
1265
#: breezy/builtins.py:2254
1266
msgid " brz diff -r1..3"
1267
msgstr ""
1268
1269
#: breezy/builtins.py:2256
1478
1270
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1479
msgstr " ブランチxxxのリビジョン３とリビジョン１を比較します。::"
1480
1481
#: bzrlib/builtins.py:2265
1482
msgid " bzr diff -r1..3 xxx"
1483
msgstr " bzr diff -r1..3 xxx"
1484
1485
#: bzrlib/builtins.py:2267
1271
msgstr ""
1272
1273
#: breezy/builtins.py:2258
1274
msgid " brz diff -r1..3 xxx"
1275
msgstr ""
1276
1277
#: breezy/builtins.py:2260
1486
1278
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1487
msgstr " リビジョン２での変更です。(-r1..2 と同じです。)::"
1488
1489
#: bzrlib/builtins.py:2269
1490
msgid " bzr diff -c2"
1491
msgstr " bzr diff -c2"
1492
1493
#: bzrlib/builtins.py:2271
1279
msgstr ""
1280
1281
#: breezy/builtins.py:2262
1282
msgid " brz diff -c2"
1283
msgstr ""
1284
1285
#: breezy/builtins.py:2264
1494
1286
msgid ""
1495
1287
" To see the changes introduced by revision X::\n"
1496
1288
" \n"
1497
" bzr diff -cX"
1289
" brz diff -cX"
1498
1290
msgstr ""
1499
" リビジョンXでの変更を見るには、::\n"
1500
" \n"
1501
" bzr diff -cX"
1502
1291
1503
#: bzrlib/builtins.py:2275
1292
#: breezy/builtins.py:2268
1504
1293
msgid ""
1505
1294
" Note that in the case of a merge, the -c option shows the changes\n"
1506
1295
" compared to the left hand parent. To see the changes against\n"
1507
1296
" another parent, use::"
1508
1297
msgstr ""
1509
" マージされたリビジョンの場合は、-cオプションは左側の親からの変更を表示する\n"
1510
" ことに注意してください。他の親からの変更を見るには、以下のようにします。::"
1511
1512
#: bzrlib/builtins.py:2279
1513
msgid " bzr diff -r<chosen_parent>..X"
1514
msgstr " bzr diff -r<対象の親リビジョン>..X"
1515
1516
#: bzrlib/builtins.py:2281
1298
1299
#: breezy/builtins.py:2272
1300
msgid " brz diff -r<chosen_parent>..X"
1301
msgstr ""
1302
1303
#: breezy/builtins.py:2274
1517
1304
msgid ""
1518
1305
" The changes between the current revision and the previous revision\n"
1519
1306
" (equivalent to -c-1 and -r-2..-1)"
1520
msgstr " 現在のリビジョンと一つ前のリビジョンとの差分です。(-c-1 、 -r-2..-1 と同じ)"
1521
1522
#: bzrlib/builtins.py:2284
1523
msgid " bzr diff -r-2.."
1524
msgstr " bzr diff -r-2.."
1525
1526
#: bzrlib/builtins.py:2286
1307
msgstr ""
1308
1309
#: breezy/builtins.py:2277
1310
msgid " brz diff -r-2.."
1311
msgstr ""
1312
1313
#: breezy/builtins.py:2279
1527
1314
msgid " Show just the differences for file NEWS::"
1528
msgstr " ファイルNEWSの変更だけを表示します。::"
1529
1530
#: bzrlib/builtins.py:2288
1531
msgid " bzr diff NEWS"
1532
msgstr " bzr diff NEWS"
1533
1534
#: bzrlib/builtins.py:2290
1315
msgstr ""
1316
1317
#: breezy/builtins.py:2281
1318
msgid " brz diff NEWS"
1319
msgstr ""
1320
1321
#: breezy/builtins.py:2283
1535
1322
msgid " Show the differences in working tree xxx for file NEWS::"
1536
msgstr " 作業ツリーxxxの、ファイルNEWSの変更内容を表示します。::"
1537
1538
#: bzrlib/builtins.py:2292
1539
msgid " bzr diff xxx/NEWS"
1540
msgstr " bzr diff xxx/NEWS"
1541
1542
#: bzrlib/builtins.py:2294
1323
msgstr ""
1324
1325
#: breezy/builtins.py:2285
1326
msgid " brz diff xxx/NEWS"
1327
msgstr ""
1328
1329
#: breezy/builtins.py:2287
1543
1330
msgid " Show the differences from branch xxx to this working tree:"
1544
msgstr " ブランチxxxと作業ツリーとの間の差分を表示します。::"
1545
1546
#: bzrlib/builtins.py:2296
1547
msgid " bzr diff --old xxx"
1548
msgstr " bzr diff --old xxx"
1549
1550
#: bzrlib/builtins.py:2298
1331
msgstr ""
1332
1333
#: breezy/builtins.py:2289
1334
msgid " brz diff --old xxx"
1335
msgstr ""
1336
1337
#: breezy/builtins.py:2291
1551
1338
msgid " Show the differences between two branches for file NEWS::"
1552
msgstr " ２つのブランチ間での、ファイルNEWSの差分を表示します。::"
1553
1554
#: bzrlib/builtins.py:2300
1555
msgid " bzr diff --old xxx --new yyy NEWS"
1556
msgstr " bzr diff --old xxx --new yyy NEWS"
1557
1558
#: bzrlib/builtins.py:2302
1559
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1560
msgstr " 'bzr diff'と同じですが、プレフィックスold/、new/を付加します。::"
1561
1562
#: bzrlib/builtins.py:2304
1339
msgstr ""
1340
1341
#: breezy/builtins.py:2293
1342
msgid " brz diff --old xxx --new yyy NEWS"
1343
msgstr ""
1344
1345
#: breezy/builtins.py:2295
1346
msgid " Same as 'brz diff' but prefix paths with old/ and new/::"
1347
msgstr ""
1348
1349
#: breezy/builtins.py:2297
1563
1350
msgid ""
1564
" bzr diff --prefix old/:new/\n"
1351
" brz diff --prefix old/:new/\n"
1565
1352
" \n"
1566
1353
" Show the differences using a custom diff program with options::\n"
1567
1354
" \n"
1568
" bzr diff --using /usr/bin/diff --diff-options -wu"
1355
" brz diff --using /usr/bin/diff --diff-options -wu"
1569
1356
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
1357
1576
#: bzrlib/builtins.py:2314
1358
# help of 'diff-options' option of 'diff' command
1359
#: breezy/builtins.py:2307
1577
1360
msgid "Pass these options to the external diff program."
1578
msgstr "これらのオプションは外部のdiffプログラムに渡されます。"
1361
msgstr ""
1579
1362
1580
#: bzrlib/builtins.py:2317
1363
# help of 'prefix' option of 'diff' command
1364
#: breezy/builtins.py:2310
1581
1365
msgid ""
1582
1366
"Set prefixes added to old and new filenames, as two values separated by a "
1583
1367
"colon. (eg \"old/:new/\")."
1584
msgstr "古いファイル名と新しいファイル名にプレフィックスを追加します。２つの値をコロンで区切って指定します。(例 \"old/:new/\")"
1368
msgstr ""
1585
1369
1586
#: bzrlib/builtins.py:2320
1370
# help of 'old' option of 'diff' command
1371
#: breezy/builtins.py:2313
1587
1372
msgid "Branch/tree to compare from."
1588
msgstr "比較元のブランチ/作業ツリーです。"
1373
msgstr ""
1589
1374
1590
#: bzrlib/builtins.py:2324
1375
# help of 'new' option of 'diff' command
1376
#: breezy/builtins.py:2317
1591
1377
msgid "Branch/tree to compare to."
1592
msgstr "比較先のブランチ/作業ツリーです。"
1378
msgstr ""
1593
1379
1594
#: bzrlib/builtins.py:2330
1380
# help of 'using' option of 'diff' command
1381
#: breezy/builtins.py:2323
1595
1382
msgid "Use this command to compare files."
1596
msgstr "ファイル比較に使うコマンドです。"
1383
msgstr ""
1597
1384
1598
#: bzrlib/builtins.py:2335
1385
# help of 'format' option of 'diff' command
1386
#: breezy/builtins.py:2328
1599
1387
msgid "Diff format to use."
1600
msgstr "使用するDiffフォーマットです。"
1388
msgstr ""
1601
1389
1602
#: bzrlib/builtins.py:2337
1390
# title of 'format' option of 'diff' command
1391
#: breezy/builtins.py:2330
1603
1392
msgid "Diff format"
1604
msgstr "Diffフォーマット"
1605
1606
#: bzrlib/builtins.py:2359
1393
msgstr ""
1394
1395
# help of 'context' option of 'diff' command
1396
#: breezy/builtins.py:2332
1397
msgid "How many lines of context to show."
1398
msgstr ""
1399
1400
#: breezy/builtins.py:2357
1607
1401
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1608
msgstr "--prefix は２つの値をコロンで区切ったものにしてください。 (例 \"old/:new/\")"
1609
1610
#: bzrlib/builtins.py:2363
1611
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1612
msgstr "bzr diff --revision には１つまたは２つのリビジョンを指定してください。"
1613
1614
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1615
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1402
msgstr ""
1403
1404
#: breezy/builtins.py:2361
1405
msgid "brz diff --revision takes exactly one or two revision specifiers"
1406
msgstr ""
1407
1408
#: breezy/builtins.py:2366 breezy/builtins.py:2763 breezy/builtins.py:2776
1409
#: breezy/builtins.py:2784 breezy/builtins.py:4957
1410
#, python-brace-format
1616
1411
msgid "{0} and {1} are mutually exclusive"
1617
msgstr "{0} と {1} を同時に指定することはできません。"
1412
msgstr ""
1618
1413
1619
#: bzrlib/builtins.py:2388
1414
#: breezy/builtins.py:2386
1620
1415
msgid ""
1621
1416
"List files deleted in the working tree.\n"
1622
1417
" "
1623
1418
msgstr ""
1624
"作業ツリー上で削除されたファイルをリストアップします。\n"
1625
" "
1626
1419
1627
#: bzrlib/builtins.py:2465
1420
#: breezy/builtins.py:2463
1628
1421
msgid "Show the tree root directory."
1629
msgstr "ツリーのルートディレクトリを表示します。"
1422
msgstr ""
1630
1423
1631
#: bzrlib/builtins.py:2467
1424
#: breezy/builtins.py:2465
1632
1425
msgid ""
1633
1426
"The root is the nearest enclosing directory with a .bzr control\n"
1634
1427
"directory."
1635
msgstr "ルートとは、.bzr管理ディレクトリを持つ、一番近い上位ディレクトリのことです。"
1428
msgstr ""
1636
1429
1637
#: bzrlib/builtins.py:2482
1430
#: breezy/builtins.py:2480
1638
1431
msgid "The limit argument must be an integer."
1639
msgstr "limitは整数でなければなりません。"
1432
msgstr ""
1640
1433
1641
#: bzrlib/builtins.py:2490
1434
#: breezy/builtins.py:2488
1642
1435
msgid "The levels argument must be an integer."
1643
msgstr "levelsは整数でなければなりません。"
1436
msgstr ""
1644
1437
1645
#: bzrlib/builtins.py:2495
1438
#: breezy/builtins.py:2493
1646
1439
msgid "Show historical log for a branch or subset of a branch."
1647
msgstr "ブランチ、もしくはブランチの一部の履歴ログを表示します。"
1440
msgstr ""
1648
1441
1649
#: bzrlib/builtins.py:2497
1442
#: breezy/builtins.py:2495
1650
1443
msgid ""
1651
"log is bzr's default tool for exploring the history of a branch.\n"
1444
"log is brz's default tool for exploring the history of a branch.\n"
1652
1445
"The branch to use is taken from the first parameter. If no parameters\n"
1653
1446
"are given, the branch containing the working directory is logged.\n"
1654
1447
"Here are some simple examples::"
1655
1448
msgstr ""
1656
"logは、ブランチの履歴を見るためのbzrのデフォルトのツールです。\n"
1657
"対象のブランチは１つ目の引数で指定します。引数が指定されていなければ、\n"
1658
"作業ディレクトリを含むブランチの履歴が表示されます。\n"
1659
"簡単な例を以下に示します。::"
1660
1449
1661
#: bzrlib/builtins.py:2502
1450
#: breezy/builtins.py:2500
1662
1451
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"
1452
" brz log log the current branch\n"
1453
" brz log foo.py log a file in its branch\n"
1454
" brz log http://server/branch log a branch on a server"
1666
1455
msgstr ""
1667
" bzr log は、現在のブランチの履歴を表示します。\n"
1668
" bzr log foo,py は、ブランチ内のファイルの履歴を表示します。\n"
1669
" bzr log http://server/branch は、サーバ上のブランチのログを表示します。"
1670
1456
1671
#: bzrlib/builtins.py:2506
1457
#: breezy/builtins.py:2504
1672
1458
msgid ""
1673
1459
"The filtering, ordering and information shown for each revision can\n"
1674
1460
"be controlled as explained below. By default, all revisions are\n"
1677
1463
"merged revisions are shown indented under the revision in which they\n"
1678
1464
"were merged."
1679
1465
msgstr ""
1680
"フィルタリング、並び替え、各リビジョンに表示する情報については、以下のように\n"
1681
"変更できます。デフォルトでは、全てのリビジョンが(トポロジカルに)ソートされ、\n"
1682
"新しいリビジョンは古いリビジョンより前に、子孫のリビジョンは先祖より前に配置\n"
1683
"されます。マージされたリビジョンを表示する場合は、マージ先のリビジョンよりも\n"
1684
"インデントされて表示されます。"
1685
1466
1686
#: bzrlib/builtins.py:2513
1467
#: breezy/builtins.py:2511
1687
1468
msgid ":Output control:"
1688
msgstr ":出力のコントロール:"
1469
msgstr ""
1689
1470
1690
#: bzrlib/builtins.py:2515
1471
#: breezy/builtins.py:2513
1691
1472
msgid ""
1692
1473
" The log format controls how information about each revision is\n"
1693
1474
" displayed. The standard log formats are called ``long``, ``short``\n"
1694
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1475
" and ``line``. The default is long. See ``brz help log-formats``\n"
1695
1476
" for more details on log formats."
1696
1477
msgstr ""
1697
" ログフォーマットの指定によって、各リビジョンの情報がどう表示されるかを\n"
1698
" コントロールします。標準のログフォーマットには ``long`` 、``short`` 、 ``line``\n"
1699
" があります。デフォルトはlongです。ログフォーマットについての詳細は\n"
1700
" ``bzr help log-formats`` をご覧ください。"
1701
1478
1702
#: bzrlib/builtins.py:2520
1479
#: breezy/builtins.py:2518
1703
1480
msgid ""
1704
1481
" The following options can be used to control what information is\n"
1705
1482
" displayed::"
1706
msgstr " 以下のオプションで、どの情報を表示するかをコントロールできます。"
1483
msgstr ""
1707
1484
1708
#: bzrlib/builtins.py:2523
1485
#: breezy/builtins.py:2521
1709
1486
msgid ""
1710
1487
" -l N display a maximum of N revisions\n"
1711
1488
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1713
1490
" -p display a diff (patch) for each revision\n"
1714
1491
" --show-ids display revision-ids (and file-ids), not just revnos"
1715
1492
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
1493
1722
#: bzrlib/builtins.py:2529
1494
#: breezy/builtins.py:2527
1723
1495
msgid ""
1724
1496
" Note that the default number of levels to display is a function of the\n"
1725
1497
" log format. If the -n option is not used, the standard log formats show\n"
1726
1498
" just the top level (mainline)."
1727
1499
msgstr ""
1728
" デフォルトの表示レベルは、ログフォーマットの機能であることに注意してください。\n"
1729
" -nオプションが使用されない場合は、標準のログフォーマットはトップレベル(メイン\n"
1730
" ライン)だけを表示します。"
1731
1500
1732
#: bzrlib/builtins.py:2533
1501
#: breezy/builtins.py:2531
1733
1502
msgid ""
1734
1503
" Status summaries are shown using status flags like A, M, etc. To see\n"
1735
1504
" the changes explained using words like ``added`` and ``modified``\n"
1736
1505
" instead, use the -vv option."
1737
1506
msgstr ""
1738
" ステータスのサマリは、A、Mなどのフラグで表示されます。 かわりに ``added``、\n"
1739
" ``modified`` などの単語で表示するには、-vvオプションを使用してください。"
1740
1507
1741
#: bzrlib/builtins.py:2537
1508
#: breezy/builtins.py:2535
1742
1509
msgid ":Ordering control:"
1743
msgstr ":表示順のコントロール:"
1510
msgstr ""
1744
1511
1745
#: bzrlib/builtins.py:2539
1512
#: breezy/builtins.py:2537
1746
1513
msgid ""
1747
1514
" To display revisions from oldest to newest, use the --forward option.\n"
1748
1515
" In most cases, using this option will have little impact on the total\n"
1749
1516
" time taken to produce a log, though --forward does not incrementally\n"
1750
1517
" display revisions like --reverse does when it can."
1751
1518
msgstr ""
1752
" 古いリビジョンから新しいリビジョンの順で表示するには、 --forwardオプションを\n"
1753
" 使います。--forwardは、--reverseのようにログをインクリメンタルに表示はしません\n"
1754
"が、たいていの場合、ログ表示にかかる時間への影響はわずかです。"
1755
1519
1756
#: bzrlib/builtins.py:2544
1520
#: breezy/builtins.py:2542
1757
1521
msgid ":Revision filtering:"
1758
msgstr ":リビジョンのフィルタリング:"
1522
msgstr ""
1759
1523
1760
#: bzrlib/builtins.py:2546
1524
#: breezy/builtins.py:2544
1761
1525
msgid ""
1762
1526
" The -r option can be used to specify what revision or range of revisions\n"
1763
1527
" to filter against. The various forms are shown below::"
1764
1528
msgstr ""
1765
" -rオプションで、どのリビジョン、もしくはリビジョンの範囲を表示するかを指定する\n"
1766
" ことができます。いろいろな例を以下に示します。::"
1767
1529
1768
#: bzrlib/builtins.py:2549
1530
#: breezy/builtins.py:2547
1769
1531
msgid ""
1770
1532
" -rX display revision X\n"
1771
1533
" -rX.. display revision X and later\n"
1772
1534
" -r..Y display up to and including revision Y\n"
1773
1535
" -rX..Y display from X to Y inclusive"
1774
1536
msgstr ""
1775
" -rX リビジョンXを表示\n"
1776
" -rX.. リビジョンX以降を表示\n"
1777
" -r..Y リビジョンY以前(Yを含む)を表示\n"
1778
" -rX..Y リビジョンXからY(X、Yを含む)を表示"
1779
1537
1780
#: bzrlib/builtins.py:2554
1538
#: breezy/builtins.py:2552
1781
1539
msgid ""
1782
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1540
" See ``brz help revisionspec`` for details on how to specify X and Y.\n"
1783
1541
" Some common examples are given below::"
1784
1542
msgstr ""
1785
" X、Yの指定方法の詳細は、 ``bzr help revisionspec`` を参照してください。\n"
1786
" よくある例を以下に示します。::"
1787
1543
1788
#: bzrlib/builtins.py:2557
1544
#: breezy/builtins.py:2555
1789
1545
msgid ""
1790
1546
" -r-1 show just the tip\n"
1791
1547
" -r-10.. show the last 10 mainline revisions\n"
1794
1550
" branch and the one at location path\n"
1795
1551
" -rdate:yesterday.. show changes since yesterday"
1796
1552
msgstr ""
1797
" -r-1 Tipだけを表示\n"
1798
" -r-10.. メインラインの最新10リビジョンを表示\n"
1799
" -rsubmit:.. このブランチでの変更内容を表示\n"
1800
" -rancestor:path.. このブランチと別のブランチとの分岐点からの\n"
1801
" 変更を表示\n"
1802
" -rdate:yesterday.. 昨日からの変更を表示"
1803
1553
1804
#: bzrlib/builtins.py:2564
1554
#: breezy/builtins.py:2562
1805
1555
msgid ""
1806
1556
" When logging a range of revisions using -rX..Y, log starts at\n"
1807
1557
" revision Y and searches back in history through the primary\n"
1810
1560
" along the way. If multi-level logging is used (-n0), X may be\n"
1811
1561
" a nested merge revision and the log will be truncated accordingly."
1812
1562
msgstr ""
1813
" -rX..Yでリビジョンの範囲を指定した場合、ログはリビジョンYから始まって\n"
1814
" メインの(左側の)親をXに到達するまで遡ります。トップレベルだけを表示\n"
1815
" する場合(-n1を使用)、Xがそのルートに見つからなければエラーが発生します。\n"
1816
" 他段階のログ(-n0を使用)を表示する場合は、Xは入れ子になったマージ\n"
1817
" リビジョンの中に見つかるかもしれません。その場合、ログは適切に切り捨て\n"
1818
" られます。"
1819
1563
1820
#: bzrlib/builtins.py:2571
1564
#: breezy/builtins.py:2569
1821
1565
msgid ":Path filtering:"
1822
msgstr ":パスのフィルタリング:"
1566
msgstr ""
1823
1567
1824
#: bzrlib/builtins.py:2573
1568
#: breezy/builtins.py:2571
1825
1569
msgid ""
1826
1570
" If parameters are given and the first one is not a branch, the log\n"
1827
1571
" will be filtered to show only those revisions that changed the\n"
1828
1572
" nominated files or directories."
1829
1573
msgstr ""
1830
" パラメータが指定されていて、一つ目のパラメータがブランチではない場合、\n"
1831
" 指定されたファイル、ディレクトリが変更されたリビジョンだけが表示されます。"
1832
1574
1833
#: bzrlib/builtins.py:2577
1575
#: breezy/builtins.py:2575
1834
1576
msgid ""
1835
1577
" Filenames are interpreted within their historical context. To log a\n"
1836
1578
" deleted file, specify a revision range so that the file existed at\n"
1837
1579
" the end or start of the range."
1838
1580
msgstr ""
1839
" ファイル名は、履歴のコンテキスト内で解釈されます。削除されたファイルの\n"
1840
" ログを表示するには、そのファイルが存在したリビジョンを、リビジョンの範囲\n"
1841
" の最初か最後に指定してください。"
1842
1581
1843
#: bzrlib/builtins.py:2581
1582
#: breezy/builtins.py:2579
1844
1583
msgid ""
1845
1584
" Historical context is also important when interpreting pathnames of\n"
1846
1585
" renamed files/directories. Consider the following example:"
1847
1586
msgstr ""
1848
" 履歴のコンテキストは、変名されたファイルやディレクトリのパス名を解釈する\n"
1849
" 際にも重要になります。以下の例を考えてください。："
1850
1587
1851
#: bzrlib/builtins.py:2584
1588
#: breezy/builtins.py:2582
1852
1589
msgid ""
1853
1590
" * revision 1: add tutorial.txt\n"
1854
1591
" * revision 2: modify tutorial.txt\n"
1855
1592
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1856
1593
msgstr ""
1857
" * リビジョン 1: tutorial.txt を追加\n"
1858
" * リビジョン 2: tutorial.txt\n"
1859
" * リビジョン 3: tutorial.txt を guide.txt に変名し、add tutorial.txt を追加"
1860
1594
1861
#: bzrlib/builtins.py:2588
1595
#: breezy/builtins.py:2586
1862
1596
msgid " In this case:"
1863
msgstr " この場合:"
1864
1865
#: bzrlib/builtins.py:2590
1866
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1867
msgstr " * ``bzr log guide.txt`` は、リビジョン1で追加されたファイルを表示します。"
1868
1869
#: bzrlib/builtins.py:2592
1870
msgid ""
1871
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1872
msgstr " * ``bzr log tutorial.txt`` は、リビジョン3で追加された新しいファイルを表示します。"
1873
1874
#: bzrlib/builtins.py:2594
1875
msgid ""
1876
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1597
msgstr ""
1598
1599
#: breezy/builtins.py:2588
1600
msgid " * ``brz log guide.txt`` will log the file added in revision 1"
1601
msgstr ""
1602
1603
#: breezy/builtins.py:2590
1604
msgid " * ``brz log tutorial.txt`` will log the new file added in revision 3"
1605
msgstr ""
1606
1607
#: breezy/builtins.py:2592
1608
msgid ""
1609
" * ``brz log -r2 -p tutorial.txt`` will show the changes made to\n"
1877
1610
" the original file in revision 2."
1878
1611
msgstr ""
1879
" * ``bzr log -r2 -p tutorial.txt`` は、元のファイルのリビジョン2での変更\n"
1880
" を表示します。"
1881
1612
1882
#: bzrlib/builtins.py:2597
1613
#: breezy/builtins.py:2595
1883
1614
msgid ""
1884
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1615
" * ``brz log -r2 -p guide.txt`` will display an error message as there\n"
1885
1616
" was no file called guide.txt in revision 2."
1886
1617
msgstr ""
1887
" * ``bzr log -r2 -p guide.txt`` は、リビジョン2にはguide.txtというファイルはない\n"
1888
" というエラーを表示します。"
1889
1618
1890
#: bzrlib/builtins.py:2600
1619
#: breezy/builtins.py:2598
1891
1620
msgid ""
1892
1621
" Renames are always followed by log. By design, there is no need to\n"
1893
1622
" explicitly ask for this (and no way to stop logging a file back\n"
1894
1623
" until it was last renamed)."
1895
1624
msgstr ""
1896
" 変名は常に履歴に表示されます。明示的に指定する必要はありません。(また、\n"
1897
" 最後に変名される以前のログを切り捨てる方法もありません)"
1898
1625
1899
#: bzrlib/builtins.py:2604
1626
#: breezy/builtins.py:2602
1900
1627
msgid ":Other filtering:"
1901
msgstr ":その他のフィルタリング:"
1628
msgstr ""
1902
1629
1903
#: bzrlib/builtins.py:2606
1630
#: breezy/builtins.py:2604
1904
1631
msgid ""
1905
1632
" The --match option can be used for finding revisions that match a\n"
1906
1633
" regular expression in a commit message, committer, author or bug.\n"
1908
1635
" expressions. --match-author, --match-bugs, --match-committer and\n"
1909
1636
" --match-message can be used to only match a specific field."
1910
1637
msgstr ""
1911
" --matchオプションで、正規表現にコミットメッセージ、コミッター、著者、バグが\n"
1912
" マッチするリビジョンを検索することができます。オプションを複数回指定した\n"
1913
" 場合は、どれかひとつにマッチすれば検索されます。--match-author、\n"
1914
" --match-bug、--match-committer、--match-messageで、指定したフィールド\n"
1915
" だけを検索対象にすることができます。"
1916
1638
1917
#: bzrlib/builtins.py:2612
1639
#: breezy/builtins.py:2610
1918
1640
msgid ":Tips & tricks:"
1919
msgstr ":Tips & tricks:"
1641
msgstr ""
1920
1642
1921
#: bzrlib/builtins.py:2614
1643
#: breezy/builtins.py:2612
1922
1644
msgid ""
1923
1645
" GUI tools and IDEs are often better at exploring history than command\n"
1924
1646
" 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"
1647
" bzr-explorer shell, or the Loggerhead web interface. See the Bazaar\n"
1648
" Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1927
1649
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1928
1650
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
1935
#: bzrlib/builtins.py:2620
1936
msgid ""
1937
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1938
msgstr " ``bazaar.conf`` に以下のようなエイリアスを追加しておくと便利です。::"
1939
1940
#: bzrlib/builtins.py:2622
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
1952
#: bzrlib/builtins.py:2627
1953
msgid ""
1954
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1651
1652
#: breezy/builtins.py:2618
1653
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1654
msgstr ""
1655
1656
#: breezy/builtins.py:2620
1657
msgid ""
1658
" [ALIASES]\n"
1659
" tip = log -r-1\n"
1660
" top = log -l10 --line\n"
1661
" show = log -v -p"
1662
msgstr ""
1663
1664
#: breezy/builtins.py:2625
1665
msgid ""
1666
" ``brz tip`` will then show the latest revision while ``brz top``\n"
1955
1667
" will show the last 10 mainline revisions. To see the details of a\n"
1956
" particular revision X, ``bzr show -rX``."
1668
" particular revision X, ``brz show -rX``."
1957
1669
msgstr ""
1958
" ``bzr tip`` は最新のリビジョンを表示し、 ``bzr top`` はメインラインの最新の\n"
1959
" 10リビジョンを表示します。特定のリビジョンXの詳細を見るには、 ``bzr show -X``\n"
1960
" を使用します。"
1961
1670
1962
#: bzrlib/builtins.py:2631
1671
#: breezy/builtins.py:2629
1963
1672
msgid ""
1964
1673
" 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`` を使用します。"
1674
" use ``brz log -n0 -rX``."
1675
msgstr ""
1967
1676
1968
#: bzrlib/builtins.py:2634
1677
#: breezy/builtins.py:2632
1969
1678
msgid ""
1970
" ``bzr log -v`` on a branch with lots of history is currently\n"
1679
" ``brz log -v`` on a branch with lots of history is currently\n"
1971
1680
" very slow. A fix for this issue is currently under development.\n"
1972
1681
" With or without that fix, it is recommended that a revision range\n"
1973
1682
" be given when using the -v option."
1974
1683
msgstr ""
1975
" 多くのリビジョンを持つブランチで ``bzr log -v`` を実行するのは、今の\n"
1976
" ところ非常に遅いです。この問題の修正は現在対応中ですが、いずれに\n"
1977
" しても、-vオプションを指定するときはリビジョンの範囲を指定することを\n"
1978
" おすすめします。"
1979
1684
1980
#: bzrlib/builtins.py:2639
1685
#: breezy/builtins.py:2637
1981
1686
msgid ""
1982
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1687
" brz has a generic full-text matching plugin, brz-search, that can be\n"
1983
1688
" used to find revisions matching user names, commit messages, etc.\n"
1984
1689
" Among other features, this plugin can find all revisions containing\n"
1985
1690
" a list of words but not others."
1986
1691
msgstr ""
1987
" bzrには、包括的な全文検索マッチをするbzr-searchというプラグインがあり、\n"
1988
" ユーザ名、コミットメッセージなどでリビジョンを検索することができます。\n"
1989
" 他の機能とはちがい、このプラグインでは単語のリストを含むすべての\n"
1990
" リビジョンを検索することができます。"
1991
1692
1992
#: bzrlib/builtins.py:2644
1693
#: breezy/builtins.py:2642
1993
1694
msgid ""
1994
1695
" When exploring non-mainline history on large projects with deep\n"
1995
1696
" history, the performance of log can be greatly improved by installing\n"
1996
1697
" the historycache plugin. This plugin buffers historical information\n"
1997
1698
" trading disk space for faster speed."
1998
1699
msgstr ""
1999
" 深い履歴をもつ大規模なプロジェクトで、メインライン以外の履歴を見る場合は、\n"
2000
" historycacheプラグインをインストールすることでパフォーマンスを大きく改善\n"
2001
" することができます。このプラグインは、履歴情報をキャッシュして、ディスク\n"
2002
" スペースと引き換えに高速なパフォーマンスをもたらします。"
2003
1700
2004
#: bzrlib/builtins.py:2653
1701
# help of 'forward' option of 'log' command
1702
#: breezy/builtins.py:2651
2005
1703
msgid "Show from oldest to newest."
2006
msgstr "古い方から新しい方へ表示する"
1704
msgstr ""
2007
1705
2008
#: bzrlib/builtins.py:2656
1706
# help of 'verbose' option of 'log' command
1707
#: breezy/builtins.py:2654
2009
1708
msgid "Show files changed in each revision."
2010
msgstr "各リビジョンでのファイルの変更を表示する"
1709
msgstr ""
2011
1710
2012
#: bzrlib/builtins.py:2662
1711
# help of 'change' option of 'log' command
1712
#: breezy/builtins.py:2660
2013
1713
msgid "Show just the specified revision. See also \"help revisionspec\"."
2014
msgstr "指定されたリビジョンだけを表示する。 ``help revisionspec``を参照"
1714
msgstr ""
2015
1715
2016
#: bzrlib/builtins.py:2666
1716
# help of 'authors' option of 'log' command
1717
#: breezy/builtins.py:2664
2017
1718
msgid "What names to list as authors - first, all or committer."
2018
msgstr "誰を作者として表示するか - first、all、またはcommitter"
1719
msgstr ""
2019
1720
2020
#: bzrlib/builtins.py:2667
1721
# title of 'authors' option of 'log' command
1722
#: breezy/builtins.py:2665
2021
1723
msgid "Authors"
2022
msgstr "作者"
1724
msgstr ""
2023
1725
2024
#: bzrlib/builtins.py:2672
1726
# help of 'levels' option of 'log' command
1727
#: breezy/builtins.py:2670
2025
1728
msgid "Number of levels to display - 0 for all, 1 for flat."
2026
msgstr "表示するレベル。-0で全て、1で１階層"
1729
msgstr ""
2027
1730
2028
#: bzrlib/builtins.py:2682
1731
# help of 'limit' option of 'log' command
1732
#: breezy/builtins.py:2680
2029
1733
msgid "Limit the output to the first N revisions."
2030
msgstr "最初のNリビジョンだけを出力する"
1734
msgstr ""
2031
1735
2032
#: bzrlib/builtins.py:2687
1736
# help of 'show-diff' option of 'log' command
1737
#: breezy/builtins.py:2685
2033
1738
msgid "Show changes made in each revision as a patch."
2034
msgstr "各リビジョンでの変更をパッチとして表示"
1739
msgstr ""
2035
1740
2036
#: bzrlib/builtins.py:2689
1741
# help of 'include-merged' option of 'log' command
1742
#: breezy/builtins.py:2687
2037
1743
msgid "Show merged revisions like --levels 0 does."
2038
msgstr "--levels 0 と同じようにマージされたリビジョンを表示する"
1744
msgstr ""
2039
1745
2040
#: bzrlib/builtins.py:2693
1746
# help of 'omit-merges' option of 'log' command
1747
#: breezy/builtins.py:2691
2041
1748
msgid "Do not report commits with more than one parent."
2042
msgstr "複数の親を持つコミットを表示しない"
1749
msgstr ""
2043
1750
2044
#: bzrlib/builtins.py:2695
1751
# help of 'exclude-common-ancestry' option of 'log' command
1752
#: breezy/builtins.py:2693
2045
1753
msgid ""
2046
1754
"Display only the revisions that are not part of both ancestries (require -"
2047
1755
"rX..Y)."
2048
msgstr "共通の先祖に含まれないリビジョンだけを表示(-rX..Yを使用する必要がある)"
1756
msgstr ""
2049
1757
2050
#: bzrlib/builtins.py:2699
1758
# help of 'signatures' option of 'log' command
1759
#: breezy/builtins.py:2697
2051
1760
msgid "Show digital signature validity."
2052
msgstr "デジタル署名を表示"
1761
msgstr ""
2053
1762
2054
#: bzrlib/builtins.py:2702
1763
# help of 'match' option of 'log' command
1764
#: breezy/builtins.py:2700
2055
1765
msgid "Show revisions whose properties match this expression."
2056
msgstr "この表現にマッチするプロパティのリビジョンを表示"
1766
msgstr ""
2057
1767
2058
#: bzrlib/builtins.py:2706
1768
# help of 'match-message' option of 'log' command
1769
#: breezy/builtins.py:2704
2059
1770
msgid "Show revisions whose message matches this expression."
2060
msgstr "この表現にマッチするメッセージのリビジョンを表示"
1771
msgstr ""
2061
1772
2062
#: bzrlib/builtins.py:2710
1773
# help of 'match-committer' option of 'log' command
1774
#: breezy/builtins.py:2708
2063
1775
msgid "Show revisions whose committer matches this expression."
2064
msgstr "コミッタが指定された表現にマッチするリビジョンを表示する"
1776
msgstr ""
2065
1777
2066
#: bzrlib/builtins.py:2714
1778
# help of 'match-author' option of 'log' command
1779
#: breezy/builtins.py:2712
2067
1780
msgid "Show revisions whose authors match this expression."
2068
msgstr "作者が指定された表現にマッチするリビジョンを表示する"
1781
msgstr ""
2069
1782
2070
#: bzrlib/builtins.py:2718
1783
# help of 'match-bugs' option of 'log' command
1784
#: breezy/builtins.py:2716
2071
1785
msgid "Show revisions whose bugs match this expression."
2072
msgstr "バグ情報が指定された表現にマッチするリビジョンを表示します"
1786
msgstr ""
2073
1787
2074
#: bzrlib/builtins.py:2772
1788
#: breezy/builtins.py:2770
2075
1789
msgid "--exclude-common-ancestry requires -r with two revisions"
2076
msgstr "--exclude-common-ancestryには、-rで2つのリビジョンを指定する必要があります。"
1790
msgstr ""
2077
1791
2078
#: bzrlib/builtins.py:2800
1792
#: breezy/builtins.py:2798
2079
1793
#, python-format
2080
1794
msgid "Path unknown at end or start of revision range: %s"
2081
msgstr "最後のリビジョンにも最初のリビジョンにもパスが見つかりません: %s"
2082
2083
#: bzrlib/builtins.py:2917
2084
#, python-format
2085
msgid "bzr %s doesn't accept two revisions in different branches."
2086
msgstr "bzr %s には、異なるブランチ上の2つのリビジョンは指定できません。"
2087
2088
#: bzrlib/builtins.py:2933
2089
#, python-format
2090
msgid "bzr %s --revision takes one or two values."
2091
msgstr "bzr %s --revision は1つまたは2つの値を取ります。"
2092
2093
#: bzrlib/builtins.py:2978
1795
msgstr ""
1796
1797
#: breezy/builtins.py:2915
1798
#, python-format
1799
msgid "brz %s doesn't accept two revisions in different branches."
1800
msgstr ""
1801
1802
#: breezy/builtins.py:2931
1803
#, python-format
1804
msgid "brz %s --revision takes one or two values."
1805
msgstr ""
1806
1807
#: breezy/builtins.py:2976
2094
1808
msgid ""
2095
1809
"List files in a tree.\n"
2096
1810
" "
2097
1811
msgstr ""
2098
"ツリー内のファイルをリストアップします。\n"
2099
" "
2100
1812
2101
#: bzrlib/builtins.py:2987
1813
# help of 'recursive' option of 'ls' command
1814
#: breezy/builtins.py:2985
2102
1815
msgid "Recurse into subdirectories."
2103
msgstr "サブディレクトリも再帰で処理します。"
1816
msgstr ""
2104
1817
2105
#: bzrlib/builtins.py:2989
1818
# help of 'from-root' option of 'ls' command
1819
#: breezy/builtins.py:2987
2106
1820
msgid "Print paths relative to the root of the branch."
2107
msgstr "ブランチのルートからの相対パスを表示します。"
1821
msgstr ""
2108
1822
2109
#: bzrlib/builtins.py:2991
1823
# help of 'unknown' option of 'ls' command
1824
#: breezy/builtins.py:2989
2110
1825
msgid "Print unknown files."
2111
msgstr "バージョン管理外のファイルを表示します。"
1826
msgstr ""
2112
1827
2113
#: bzrlib/builtins.py:2992
1828
# help of 'versioned' option of 'ls' command
1829
#: breezy/builtins.py:2990
2114
1830
msgid "Print versioned files."
2115
msgstr "バージョン管理されたファイルを表示します。"
1831
msgstr ""
2116
1832
2117
#: bzrlib/builtins.py:2995
1833
# help of 'ignored' option of 'ls' command
1834
#: breezy/builtins.py:2993
2118
1835
msgid "Print ignored files."
2119
msgstr "無視されたファイルを表示します。"
1836
msgstr ""
2120
1837
2121
#: bzrlib/builtins.py:2997
1838
# help of 'kind' option of 'ls' command
1839
#: breezy/builtins.py:2995
2122
1840
msgid "List entries of a particular kind: file, directory, symlink."
2123
msgstr "指定された種別のアイテム(ファイル、ディレクトリ、シンボリックリンク)を表示します。"
1841
msgstr ""
2124
1842
2125
#: bzrlib/builtins.py:3010
1843
#: breezy/builtins.py:3008
2126
1844
msgid "invalid kind specified"
2127
msgstr "無効な種別が指定されました。"
1845
msgstr ""
2128
1846
2129
#: bzrlib/builtins.py:3013
1847
#: breezy/builtins.py:3011
2130
1848
msgid "Cannot set both --verbose and --null"
2131
msgstr "--verboseと--nullを同時に指定することはできません。"
1849
msgstr ""
2132
1850
2133
#: bzrlib/builtins.py:3022
1851
#: breezy/builtins.py:3020
2134
1852
msgid "cannot specify both --from-root and PATH"
2135
msgstr "--from-rootとPATHを同時に指定することはできません。"
1853
msgstr ""
2136
1854
2137
#: bzrlib/builtins.py:3109
1855
#: breezy/builtins.py:3107
2138
1856
msgid "Ignore specified files or patterns."
2139
msgstr "指定されたファイルやパターンを無視します。"
2140
2141
#: bzrlib/builtins.py:3111
2142
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2143
msgstr "パターンの書き方の詳細は ``bzr help patterns`` をご覧ください。"
2144
2145
#: bzrlib/builtins.py:3113
1857
msgstr ""
1858
1859
#: breezy/builtins.py:3109
1860
msgid "See ``brz help patterns`` for details on the syntax of patterns."
1861
msgstr ""
1862
1863
#: breezy/builtins.py:3111
2146
1864
msgid ""
2147
1865
"If a .bzrignore file does not exist, the ignore command\n"
2148
1866
"will create one and add the specified files or patterns to the newly\n"
2150
1868
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2151
1869
"the use of the ignore command will require an explicit add command."
2152
1870
msgstr ""
2153
".bzrignoreファイルが存在しない場合は、ignoreコマンドはそれを作成して、\n"
2154
"指定されたファイルやパターンを追加します。また、.bzrignoreファイルは\n"
2155
"ignoreコマンドで自動的にバージョン管理に追加されます。ignoreコマンドを\n"
2156
"使わずに.bzrignoreファイルを手で作成した場合は、明示的にaddコマンドを\n"
2157
"呼ぶ必要があります。"
2158
1871
2159
#: bzrlib/builtins.py:3119
1872
#: breezy/builtins.py:3117
2160
1873
msgid ""
2161
1874
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2162
1875
"After adding, editing or deleting that file either indirectly by\n"
2163
1876
"using this command or directly by using an editor, be sure to commit\n"
2164
1877
"it."
2165
1878
msgstr ""
2166
"無視リストからパターンを削除するには、.bzrignoreファイルを編集します。\n"
2167
"ignoreコマンドやエディタでこのファイルのエントリを追加、編集、削除した\n"
2168
"場合は、忘れずにコミットしてください。"
2169
1879
2170
#: bzrlib/builtins.py:3124
1880
#: breezy/builtins.py:3122
2171
1881
msgid ""
2172
1882
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2173
1883
"the global ignore file can be found in the application data directory as\n"
2175
1885
"Global ignores are not touched by this command. The global ignore file\n"
2176
1886
"can be edited directly using an editor."
2177
1887
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
1888
2184
#: bzrlib/builtins.py:3130
1889
#: breezy/builtins.py:3128
2185
1890
msgid ""
2186
1891
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2187
1892
"precedence over regular ignores. Such exceptions are used to specify\n"
2188
1893
"files that should be versioned which would otherwise be ignored."
2189
1894
msgstr ""
2190
"!で始まるパターンは、無視指定からの除外を表し、通常の無視指定よりも\n"
2191
"優先されます。これは、普通なら無視されるはずのファイルをバージョン管理\n"
2192
"の対象とするために使います。"
2193
1895
2194
#: bzrlib/builtins.py:3134
1896
#: breezy/builtins.py:3132
2195
1897
msgid ""
2196
1898
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2197
1899
"precedence over the '!' exception patterns."
2198
1900
msgstr ""
2199
"!!で始まるパターンは、通常の無視指定として扱われますが、!による除外\n"
2200
"パターンよりも優先されます。"
2201
1901
2202
#: bzrlib/builtins.py:3137
1902
#: breezy/builtins.py:3135
2203
1903
msgid ""
2204
1904
":Notes: \n"
2205
1905
" \n"
2206
1906
"* Ignore patterns containing shell wildcards must be quoted from\n"
2207
1907
" the shell on Unix."
2208
1908
msgstr ""
2209
":注意: \n"
2210
" \n"
2211
"*シェルのワイルドカードをふくむ無視パターンを指定するときには、Unixシェル\n"
2212
" による引用符でくくる必要があります。"
2213
1909
2214
#: bzrlib/builtins.py:3142
1910
#: breezy/builtins.py:3140
2215
1911
msgid ""
2216
1912
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2217
1913
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2218
1914
msgstr ""
2219
"* #で始まる無視パターンは、無視ファイル中のコメントとして扱われます。\n"
2220
" #で始まるファイルを無視したい場合は、\"RE:\"プレフィックスを使ってください。"
2221
1915
2222
#: bzrlib/builtins.py:3145
1916
#: breezy/builtins.py:3143
2223
1917
msgid ""
2224
1918
":Examples:\n"
2225
1919
" Ignore the top level Makefile::"
2226
1920
msgstr ""
2227
":例:\n"
2228
" トップレベルのMakefileを無視する::"
2229
2230
#: bzrlib/builtins.py:3148
2231
msgid " bzr ignore ./Makefile"
2232
msgstr " bzr ignore ./Makefile"
2233
2234
#: bzrlib/builtins.py:3150
1921
1922
#: breezy/builtins.py:3146
1923
msgid " brz ignore ./Makefile"
1924
msgstr ""
1925
1926
#: breezy/builtins.py:3148
2235
1927
msgid " Ignore .class files in all directories...::"
2236
msgstr " すべてのディレクトリの.classファイルを無視するが...::"
2237
2238
#: bzrlib/builtins.py:3152
2239
msgid " bzr ignore \"*.class\""
2240
msgstr " bzr ignore \"*.class\""
2241
2242
#: bzrlib/builtins.py:3154
1928
msgstr ""
1929
1930
#: breezy/builtins.py:3150
1931
msgid " brz ignore \"*.class\""
1932
msgstr ""
1933
1934
#: breezy/builtins.py:3152
2243
1935
msgid " ...but do not ignore \"special.class\"::"
2244
msgstr " ...\"special.class\" は無視しない::"
2245
2246
#: bzrlib/builtins.py:3156
2247
msgid " bzr ignore \"!special.class\""
2248
msgstr " bzr ignore \"!special.class\""
2249
2250
#: bzrlib/builtins.py:3158
1936
msgstr ""
1937
1938
#: breezy/builtins.py:3154
1939
msgid " brz ignore \"!special.class\""
1940
msgstr ""
1941
1942
#: breezy/builtins.py:3156
2251
1943
msgid " Ignore files whose name begins with the \"#\" character::"
2252
msgstr " #で始まるファイルを無視する::"
2253
2254
#: bzrlib/builtins.py:3160
2255
msgid " bzr ignore \"RE:^#\""
2256
msgstr " bzr ignore \"RE:^#\""
2257
2258
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1944
msgstr ""
1945
1946
#: breezy/builtins.py:3158
1947
msgid " brz ignore \"RE:^#\""
1948
msgstr ""
1949
1950
#: breezy/builtins.py:3160 breezy/builtins.py:3164
2259
1951
msgid " Ignore .o files under the lib directory::"
2260
msgstr " libディレクトリ配下の.oファイルを無視する::"
2261
2262
#: bzrlib/builtins.py:3164
2263
msgid " bzr ignore \"lib/**/*.o\""
2264
msgstr " bzr ignore \"lib/**/*.o\""
2265
2266
#: bzrlib/builtins.py:3168
2267
msgid " bzr ignore \"RE:lib/.*\\.o\""
2268
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2269
2270
#: bzrlib/builtins.py:3170
1952
msgstr ""
1953
1954
#: breezy/builtins.py:3162
1955
msgid " brz ignore \"lib/**/*.o\""
1956
msgstr ""
1957
1958
#: breezy/builtins.py:3166
1959
msgid " brz ignore \"RE:lib/.*\\.o\""
1960
msgstr ""
1961
1962
#: breezy/builtins.py:3168
2271
1963
msgid " Ignore everything but the \"debian\" toplevel directory::"
2272
msgstr " \"debian\"トップレベルディレクトリ以外の全てを無視する::"
1964
msgstr ""
2273
1965
2274
#: bzrlib/builtins.py:3172
1966
#: breezy/builtins.py:3170
2275
1967
msgid ""
2276
" bzr ignore \"RE:(?!debian/).*\"\n"
1968
" brz ignore \"RE:(?!debian/).*\"\n"
2277
1969
" \n"
2278
1970
" Ignore everything except the \"local\" toplevel directory,\n"
2279
1971
" but always ignore autosave files ending in ~, even under local/::\n"
2280
1972
" \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
2294
#: bzrlib/builtins.py:3186
2295
msgid "Display the default ignore rules that bzr uses."
2296
msgstr "bzrが使用するデフォルトの無視ルールを表示します。"
2297
2298
#: bzrlib/builtins.py:3198
1973
" brz ignore \"*\"\n"
1974
" brz ignore \"!./local\"\n"
1975
" brz ignore \"!!*~\""
1976
msgstr ""
1977
1978
# help of 'default-rules' option of 'ignore' command
1979
#: breezy/builtins.py:3184
1980
msgid "Display the default ignore rules that brz uses."
1981
msgstr ""
1982
1983
#: breezy/builtins.py:3196
2299
1984
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2300
msgstr "ignoreにはNAME_PATTERNか--default-rulesのどちらかは指定する必要があります。"
1985
msgstr ""
2301
1986
2302
#: bzrlib/builtins.py:3209
1987
#: breezy/builtins.py:3207
2303
1988
#, python-format
2304
1989
msgid "Invalid ignore pattern found. %s"
2305
1990
msgid_plural "Invalid ignore patterns found. %s"
2306
msgstr[0] "無効な無視パターンが見つかりました。 %s"
1991
msgstr[0] ""
1992
msgstr[1] ""
2307
1993
2308
#: bzrlib/builtins.py:3218
1994
#: breezy/builtins.py:3216
2309
1995
msgid "NAME_PATTERN should not be an absolute path"
2310
msgstr "NAME_PATTERNに絶対パスは指定できません。"
1996
msgstr ""
2311
1997
2312
#: bzrlib/builtins.py:3231
1998
#: breezy/builtins.py:3229
2313
1999
#, python-format
2314
2000
msgid ""
2315
2001
"Warning: the following files are version controlled and match your ignore "
2316
2002
"pattern:\n"
2317
2003
"%s\n"
2318
"These files will continue to be version controlled unless you 'bzr remove' "
2004
"These files will continue to be version controlled unless you 'brz remove' "
2319
2005
"them.\n"
2320
2006
msgstr ""
2321
"注意: 以下のファイルはバージョン管理されていますが、無視パターンにマッチしました。:\n"
2322
"%s\n"
2323
"これらのファイルは、'bzr remove'しない限りはバージョン管理されたままです。\n"
2324
2007
2325
#: bzrlib/builtins.py:3238
2008
#: breezy/builtins.py:3236
2326
2009
msgid "List ignored files and the patterns that matched them."
2327
msgstr "無視するファイルとそれらにマッチするパターンの一覧を表示する。"
2010
msgstr ""
2328
2011
2329
#: bzrlib/builtins.py:3240
2012
#: breezy/builtins.py:3238
2330
2013
msgid ""
2331
2014
"List all the ignored files and the ignore pattern that caused the file to\n"
2332
2015
"be ignored."
2333
msgstr "無視されるファイルと、それがどのパターンによって無視されているかを一覧で表示します。"
2016
msgstr ""
2334
2017
2335
#: bzrlib/builtins.py:3243
2018
#: breezy/builtins.py:3241
2336
2019
msgid "Alternatively, to list just the files::"
2337
msgstr "代わりにファイルの一覧だけを表示するには::"
2338
2339
#: bzrlib/builtins.py:3245
2340
msgid " bzr ls --ignored"
2341
msgstr " bzr ls --ignored"
2342
2343
#: bzrlib/builtins.py:3279
2020
msgstr ""
2021
2022
#: breezy/builtins.py:3243
2023
msgid " brz ls --ignored"
2024
msgstr ""
2025
2026
#: breezy/builtins.py:3277
2344
2027
#, python-format
2345
2028
msgid "not a valid revision-number: %r"
2346
msgstr "無効なリビジョン番号です。: %r"
2347
2348
#: bzrlib/builtins.py:3286
2349
msgid ""
2350
"Export current or past revision to a destination directory or archive."
2351
msgstr "最新、または過去のリビジョンを指定されたディレクトリもしくはアーカイブにエクスポートする。"
2352
2353
#: bzrlib/builtins.py:3288
2029
msgstr ""
2030
2031
#: breezy/builtins.py:3284
2032
msgid "Export current or past revision to a destination directory or archive."
2033
msgstr ""
2034
2035
#: breezy/builtins.py:3286
2354
2036
msgid "If no revision is specified this exports the last committed revision."
2355
msgstr "リビジョンが指定されなければ、最終コミットのリビジョンをエクスポートします。"
2037
msgstr ""
2356
2038
2357
#: bzrlib/builtins.py:3290
2039
#: breezy/builtins.py:3288
2358
2040
msgid ""
2359
2041
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2360
2042
"given, try to find the format with the extension. If no extension\n"
2361
2043
"is found exports to a directory (equivalent to --format=dir)."
2362
2044
msgstr ""
2363
"フォーマットはtar、tgz、tbz2のような”exporter”の名前になることができます。\n"
2364
" 何も渡されなければ、拡張子のフォーマットを見つけようとします。 拡張子がない\n"
2365
"場合は、ディレクトリにエクスポートします(–format=dirと同等)。"
2366
2045
2367
#: bzrlib/builtins.py:3294
2046
#: breezy/builtins.py:3292
2368
2047
msgid ""
2369
2048
"If root is supplied, it will be used as the root directory inside\n"
2370
2049
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2371
2050
"to the exported filename. The root option has no effect for 'dir' format."
2372
2051
msgstr ""
2373
"rootが指定された場合は、コンテナフォーマット(tar、zipなど)のルート\n"
2374
"ディレクトリに使用されます。指定されていない場合は、エクスポート\n"
2375
"ファイル名がデフォルトになります。rootオプションは、'dir'フォーマット\n"
2376
"に対しては作用しません。"
2377
2052
2378
#: bzrlib/builtins.py:3298
2053
#: breezy/builtins.py:3296
2379
2054
msgid ""
2380
2055
"If branch is omitted then the branch containing the current working\n"
2381
2056
"directory will be used."
2382
msgstr "ブランチが省略されると現在の作業ディレクトリを含むブランチが使用されます。"
2383
2384
#: bzrlib/builtins.py:3301
2385
msgid ""
2386
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2387
msgstr "注: ASCIIではないファイルを含むツリーの、zipへのエクスポートはサポートされません。"
2388
2389
#: bzrlib/builtins.py:3303
2057
msgstr ""
2058
2059
#: breezy/builtins.py:3299
2060
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2061
msgstr ""
2062
2063
#: breezy/builtins.py:3301
2390
2064
msgid ""
2391
2065
" ================= =========================\n"
2392
2066
" Supported formats Autodetected by extension\n"
2398
2072
" zip .zip\n"
2399
2073
" ================= ========================="
2400
2074
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
2075
2411
#: bzrlib/builtins.py:3317
2076
# help of 'format' option of 'export' command
2077
#: breezy/builtins.py:3315
2412
2078
msgid "Type of file to export to."
2413
msgstr "エクスポートするファイルの種類"
2079
msgstr ""
2414
2080
2415
#: bzrlib/builtins.py:3320
2081
# help of 'filters' option of 'export' command
2082
#: breezy/builtins.py:3318
2416
2083
msgid "Apply content filters to export the convenient form."
2417
msgstr "使いやすい形でエクスポートするためのコンテンツフィルターを適用します。"
2084
msgstr ""
2418
2085
2419
#: bzrlib/builtins.py:3324
2086
# help of 'root' option of 'export' command
2087
#: breezy/builtins.py:3322
2420
2088
msgid "Name of the root directory inside the exported file."
2421
msgstr "エクスポートされたファイル内部のrootディレクトリの名前。"
2089
msgstr ""
2422
2090
2423
#: bzrlib/builtins.py:3326
2091
# help of 'per-file-timestamps' option of 'export' command
2092
#: breezy/builtins.py:3324
2424
2093
msgid ""
2425
2094
"Set modification time of files to that of the last revision in which it was "
2426
2095
"changed."
2427
msgstr "各ファイルの編集日時を、最後にそのファイルが変更されたリビジョンの日時に設定します。"
2428
2429
#: bzrlib/builtins.py:3329
2430
msgid ""
2431
"Export the working tree contents rather than that of the last revision."
2432
msgstr "最終リビジョンではなく、作業ツリーの内容をエクスポートします。"
2433
2434
#: bzrlib/builtins.py:3348
2096
msgstr ""
2097
2098
# help of 'uncommitted' option of 'export' command
2099
#: breezy/builtins.py:3327
2100
msgid "Export the working tree contents rather than that of the last revision."
2101
msgstr ""
2102
2103
#: breezy/builtins.py:3346
2435
2104
msgid "--uncommitted requires a working tree"
2436
msgstr "作業ツリーに対しては--uncommittedを指定する必要があります。"
2105
msgstr ""
2437
2106
2438
#: bzrlib/builtins.py:3357
2107
#: breezy/builtins.py:3355
2439
2108
#, python-format
2440
2109
msgid "Unsupported export format: %s"
2441
msgstr "サポートされていないエクスポートフォーマット: %s"
2442
2443
#: bzrlib/builtins.py:3361
2444
msgid ""
2445
"Write the contents of a file as of a given revision to standard output."
2446
msgstr "指定されたリビジョンのファイルの内容を標準出力に書き出します。"
2447
2448
#: bzrlib/builtins.py:3363
2110
msgstr ""
2111
2112
#: breezy/builtins.py:3359
2113
msgid "Write the contents of a file as of a given revision to standard output."
2114
msgstr ""
2115
2116
#: breezy/builtins.py:3361
2449
2117
msgid "If no revision is nominated, the last revision is used."
2450
msgstr "リビジョンが指定されなければ、最後のリビジョンが使用されます。"
2118
msgstr ""
2451
2119
2452
#: bzrlib/builtins.py:3365
2120
#: breezy/builtins.py:3363
2453
2121
msgid ""
2454
2122
"Note: Take care to redirect standard output when using this command on a\n"
2455
2123
"binary file."
2456
2124
msgstr ""
2457
"バイナリファイルでこのコマンドを使用する際には標準出力をリダイレクトするように\n"
2458
"気をつけてください。"
2459
2125
2460
#: bzrlib/builtins.py:3371
2126
# help of 'name-from-revision' option of 'cat' command
2127
#: breezy/builtins.py:3369
2461
2128
msgid "The path name in the old tree."
2462
msgstr "古いツリーのパス名。"
2129
msgstr ""
2463
2130
2464
#: bzrlib/builtins.py:3372
2131
# help of 'filters' option of 'cat' command
2132
#: breezy/builtins.py:3370
2465
2133
msgid "Apply content filters to display the convenience form."
2466
msgstr "便利な形で表示するためのフィルタを適用します。"
2467
2468
#: bzrlib/builtins.py:3383
2469
msgid "bzr cat --revision takes exactly one revision specifier"
2470
msgstr "bzr cat --revisionにはリビジョンをひとつだけ指定します。"
2471
2472
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2134
msgstr ""
2135
2136
#: breezy/builtins.py:3381
2137
msgid "brz cat --revision takes exactly one revision specifier"
2138
msgstr ""
2139
2140
#: breezy/builtins.py:3406 breezy/builtins.py:3418
2473
2141
msgid "{0!r} is not present in revision {1}"
2474
msgstr "{0!r}はリビジョン{1}には存在しません。"
2142
msgstr ""
2475
2143
2476
#: bzrlib/builtins.py:3443
2144
#: breezy/builtins.py:3441
2477
2145
msgid "Commit changes into a new revision."
2478
msgstr "変更を新しいリビジョンにコミットする。"
2146
msgstr ""
2479
2147
2480
#: bzrlib/builtins.py:3445
2148
#: breezy/builtins.py:3443
2481
2149
msgid ""
2482
2150
"An explanatory message needs to be given for each commit. This is\n"
2483
2151
"often done by using the --message option (getting the message from the\n"
2486
2154
"the user to enter the message. To see the changed files in the\n"
2487
2155
"boilerplate text loaded into the editor, use the --show-diff option."
2488
2156
msgstr ""
2489
"それぞれのコミットに、その内容を説明するメッセージを指定する必要があります。\n"
2490
"これは、--messageオプションで指定(コマンドラインからメッセージを取得)したり、\n"
2491
"--fileオプションで指定(ファイルからメッセージを取得)します。どちらのオプションも\n"
2492
"指定されていない場合は、メッセージを入力するためのエディタが起動します。\n"
2493
"エディタにロードされる定型文の中に変更されたファイルの情報を含めるためには、\n"
2494
"--show-diffオプションを使用します。"
2495
2157
2496
#: bzrlib/builtins.py:3452
2158
#: breezy/builtins.py:3450
2497
2159
msgid ""
2498
2160
"By default, the entire tree is committed and the person doing the\n"
2499
2161
"commit is assumed to be the author. These defaults can be overridden\n"
2500
2162
"as explained below."
2501
2163
msgstr ""
2502
"デフォルトでは、ツリー全体がコミットされ、コミットを実行した人が著者になります。\n"
2503
"これは、以下のような方法で上書きすることができます。"
2504
2164
2505
#: bzrlib/builtins.py:3456
2165
#: breezy/builtins.py:3454
2506
2166
msgid ":Selective commits:"
2507
msgstr ":部分的なコミット:"
2167
msgstr ""
2508
2168
2509
#: bzrlib/builtins.py:3458
2169
#: breezy/builtins.py:3456
2510
2170
msgid ""
2511
2171
" If selected files are specified, only changes to those files are\n"
2512
2172
" committed. If a directory is specified then the directory and\n"
2513
2173
" everything within it is committed."
2514
2174
msgstr ""
2515
" ファイルが指定された場合、そのファイルの変更だけがコミットされます。\n"
2516
" ディレクトリが指定された場合、そのディレクトリとその配下すべてが\n"
2517
" コミット対象になります。"
2518
2175
2519
#: bzrlib/builtins.py:3462
2176
#: breezy/builtins.py:3460
2520
2177
msgid ""
2521
2178
" When excludes are given, they take precedence over selected files.\n"
2522
2179
" For example, to commit only changes within foo, but not changes\n"
2523
2180
" within foo/bar::"
2524
2181
msgstr ""
2525
" excludesの指定は、コミット対象ファイルの指定よりも優先されます。\n"
2526
" たとえば、foo配下の変更をコミットするが、foo/bar内はコミットしないという\n"
2527
" 場合は::"
2528
2529
#: bzrlib/builtins.py:3466
2530
msgid " bzr commit foo -x foo/bar"
2531
msgstr " bzr commit foo -x foo/bar"
2532
2533
#: bzrlib/builtins.py:3468
2182
2183
#: breezy/builtins.py:3464
2184
msgid " brz commit foo -x foo/bar"
2185
msgstr ""
2186
2187
#: breezy/builtins.py:3466
2534
2188
msgid " A selective commit after a merge is not yet supported."
2535
msgstr " マージ後の部分的なコミットはまだサポートされていません。"
2189
msgstr ""
2536
2190
2537
#: bzrlib/builtins.py:3470
2191
#: breezy/builtins.py:3468
2538
2192
msgid ":Custom authors:"
2539
msgstr ":作者の変更:"
2193
msgstr ""
2540
2194
2541
#: bzrlib/builtins.py:3472
2195
#: breezy/builtins.py:3470
2542
2196
msgid ""
2543
2197
" If the author of the change is not the same person as the committer,\n"
2544
2198
" you can specify the author's name using the --author option. The\n"
2547
2201
" the change you can specify the option multiple times, once for each\n"
2548
2202
" author."
2549
2203
msgstr ""
2550
" もし、変更を行った人とコミットする人がちがう場合は、作者の名前を--author\n"
2551
" オプションで指定することができます。\"John Doe <jdoe@example.com>\"の\n"
2552
" ように、コミッターのIDと同じフォーマットで指定するべきです。複数の作者が\n"
2553
" いるなら、このオプションを複数回指定することもできます。"
2554
2204
2555
#: bzrlib/builtins.py:3479
2205
#: breezy/builtins.py:3477
2556
2206
msgid ":Checks:"
2557
msgstr ":チェック:"
2207
msgstr ""
2558
2208
2559
#: bzrlib/builtins.py:3481
2209
#: breezy/builtins.py:3479
2560
2210
msgid ""
2561
2211
" A common mistake is to forget to add a new file or directory before\n"
2562
2212
" running the commit command. The --strict option checks for unknown\n"
2563
2213
" 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"
2214
" checks can be implemented by defining hooks. See ``brz help hooks``\n"
2565
2215
" for details."
2566
2216
msgstr ""
2567
" よくあるミスとして、新しく作ったファイルやディレクトリをコミット前に追加するのを\n"
2568
" 忘れてしまうということがあります。--strictオプションを指定すると、バージョン管理\n"
2569
" 外のファイルがある場合はコミットが失敗するようになります。もっと高度なコミット\n"
2570
" 前チェックをフックとして実装することもできます。詳細は ``bzr help hooks`` を\n"
2571
" ご覧ください。"
2572
2217
2573
#: bzrlib/builtins.py:3487
2218
#: breezy/builtins.py:3485
2574
2219
msgid ":Things to note:"
2575
msgstr ":特記事項:"
2220
msgstr ""
2576
2221
2577
#: bzrlib/builtins.py:3489
2222
#: breezy/builtins.py:3487
2578
2223
msgid ""
2579
2224
" If you accidentially commit the wrong changes or make a spelling\n"
2580
2225
" mistake in the commit message say, you can use the uncommit command\n"
2581
" to undo it. See ``bzr help uncommit`` for details."
2226
" to undo it. See ``brz help uncommit`` for details."
2582
2227
msgstr ""
2583
" もし、間違ったファイルをコミットしてしまったり、コミットメッセージにスペル\n"
2584
" ミスがあった場合は、uncommitコマンドでコミットを取り消すことができます。\n"
2585
" 詳細は ``bzr help uncommit`` をご覧ください。"
2586
2228
2587
#: bzrlib/builtins.py:3493
2229
#: breezy/builtins.py:3491
2588
2230
msgid ""
2589
2231
" Hooks can also be configured to run after a commit. This allows you\n"
2590
2232
" to trigger updates to external systems like bug trackers. The --fixes\n"
2591
2233
" option can be used to record the association between a revision and\n"
2592
" one or more bugs. See ``bzr help bugs`` for details."
2234
" one or more bugs. See ``brz help bugs`` for details."
2593
2235
msgstr ""
2594
" コミット後にフックを実行することもできます。これによって、バグトラッカーなどの\n"
2595
" 外部のシステムを更新することができます。 --fixesオプションで、リビジョンと\n"
2596
" バグとの関係を記録することができます。詳細は ``bzr help bugs`` を見て\n"
2597
" ください。"
2598
2236
2599
#: bzrlib/builtins.py:3503
2237
# help of 'exclude' option of 'commit' command
2238
#: breezy/builtins.py:3501
2600
2239
msgid "Do not consider changes made to a given path."
2601
msgstr "指定されたパスの変更を無視します。"
2240
msgstr ""
2602
2241
2603
#: bzrlib/builtins.py:3506
2242
# help of 'message' option of 'commit' command
2243
#: breezy/builtins.py:3504
2604
2244
msgid "Description of the new revision."
2605
msgstr "新しいリビジョンの説明。"
2245
msgstr ""
2606
2246
2607
#: bzrlib/builtins.py:3509
2247
# help of 'unchanged' option of 'commit' command
2248
#: breezy/builtins.py:3507
2608
2249
msgid "Commit even if nothing has changed."
2609
msgstr "何も変更されていなくてもコミットする。"
2250
msgstr ""
2610
2251
2611
#: bzrlib/builtins.py:3513
2252
# help of 'file' option of 'commit' command
2253
#: breezy/builtins.py:3511
2612
2254
msgid "Take commit message from this file."
2613
msgstr "このファイルからコミットメッセージを取得する。"
2255
msgstr ""
2614
2256
2615
#: bzrlib/builtins.py:3515
2257
# help of 'strict' option of 'commit' command
2258
#: breezy/builtins.py:3513
2616
2259
msgid "Refuse to commit if there are unknown files in the working tree."
2617
msgstr "作業ツリーの中にバージョン管理外のファイルが存在する場合コミットを拒否する。"
2260
msgstr ""
2618
2261
2619
#: bzrlib/builtins.py:3518
2262
# help of 'commit-time' option of 'commit' command
2263
#: breezy/builtins.py:3516
2620
2264
msgid ""
2621
2265
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2622
2266
"08:00:00 +0100'."
2623
msgstr "コミット日時を決められたフォーマットで手動で指定します。例) '2009-10-10 08:00:00 +0100'"
2624
2625
#: bzrlib/builtins.py:3521
2626
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2627
msgstr "このリビジョンで修正されたバグをマークする(\"bzr help bugs\"を参照)。"
2628
2629
#: bzrlib/builtins.py:3524
2267
msgstr ""
2268
2269
# help of 'fixes' option of 'commit' command
2270
#: breezy/builtins.py:3519
2271
msgid "Mark a bug as being fixed by this revision (see \"brz help bugs\")."
2272
msgstr ""
2273
2274
# help of 'author' option of 'commit' command
2275
#: breezy/builtins.py:3522
2630
2276
msgid "Set the author's name, if it's different from the committer."
2631
msgstr "著者の名前がコミッターとは異なる場合、著者の名前を設定する。"
2277
msgstr ""
2632
2278
2633
#: bzrlib/builtins.py:3527
2279
# help of 'local' option of 'commit' command
2280
#: breezy/builtins.py:3525
2634
2281
msgid ""
2635
2282
"Perform a local commit in a bound branch. Local commits are not pushed to "
2636
2283
"the master branch until a normal commit is performed."
2637
2284
msgstr ""
2638
"バインドされたブランチにローカルコミットを実行する。 通常のコミットが実行されるまで ローカルコミットはマスターブランチにpushされません。"
2639
2285
2640
#: bzrlib/builtins.py:3533
2286
# help of 'show-diff' option of 'commit' command
2287
#: breezy/builtins.py:3531
2641
2288
msgid ""
2642
2289
"When no message is supplied, show the diff along with the status summary in "
2643
2290
"the message editor."
2644
msgstr "メッセージが提供されないとき、 メッセージエディタでステータスの要約と一緒に差分を表示する。"
2291
msgstr ""
2645
2292
2646
#: bzrlib/builtins.py:3536
2293
# help of 'lossy' option of 'commit' command
2294
#: breezy/builtins.py:3534
2647
2295
msgid ""
2648
2296
"When committing to a foreign version control system do not push data that "
2649
2297
"can not be natively represented."
2650
msgstr "外部のバージョン管理システムにコミットするときに、ネイティブに表現できないデータをプッシュしません。"
2298
msgstr ""
2651
2299
2652
#: bzrlib/builtins.py:3554
2300
#: breezy/builtins.py:3552
2653
2301
#, python-format
2654
2302
msgid ""
2655
2303
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2656
2304
"default bug tracker using the `bugtracker` option.\n"
2657
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2305
"See \"brz help bugs\" for more information on this feature. Commit refused."
2658
2306
msgstr ""
2659
"バグ %s のバグトラッカーが指定されていません。'トラッカー:id'の形式にするか、デフォルトのトラッカーを `bugtracker` "
2660
"オプションで指定してください。\n"
2661
"詳細は \"bzr help bugs\" をご覧ください。コミットは拒否されました。"
2662
2307
2663
#: bzrlib/builtins.py:3563
2308
#: breezy/builtins.py:3561
2664
2309
#, python-format
2665
2310
msgid ""
2666
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2311
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"brz help bugs\" "
2667
2312
"for more information on this feature.\n"
2668
2313
"Commit refused."
2669
2314
msgstr ""
2670
"無効なバグです。 %s 'トラッカー:id' の形式で指定する必要があります。詳細は \"bzr help bugs\" をご覧ください。\n"
2671
"コミットは拒否されました。"
2672
2315
2673
#: bzrlib/builtins.py:3572
2316
#: breezy/builtins.py:3570
2674
2317
#, python-format
2675
2318
msgid "Unrecognized bug %s. Commit refused."
2676
msgstr "不明なバグです。 %s コミットは拒否されました。"
2319
msgstr ""
2677
2320
2678
#: bzrlib/builtins.py:3575
2321
#: breezy/builtins.py:3573
2679
2322
#, python-format
2680
2323
msgid ""
2681
2324
"%s\n"
2682
2325
"Commit refused."
2683
2326
msgstr ""
2684
"%s\n"
2685
"コミットは拒否されました。"
2686
2327
2687
#: bzrlib/builtins.py:3599
2328
#: breezy/builtins.py:3597
2688
2329
msgid "Could not parse --commit-time: "
2689
msgstr "--commit-timeをパースできません。: "
2330
msgstr ""
2690
2331
2691
#: bzrlib/builtins.py:3639
2332
#: breezy/builtins.py:3637
2692
2333
msgid "please specify either --message or --file"
2693
msgstr "--message か --file かどちらかを指定してください。"
2334
msgstr ""
2694
2335
2695
#: bzrlib/builtins.py:3668
2336
#: breezy/builtins.py:3666
2696
2337
msgid "please specify a commit message with either --message or --file"
2697
msgstr "--messageか--fileのどちらかでコミットメッセージを指定してください。"
2698
2699
#: bzrlib/builtins.py:3671
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 ""
2704
"空のコミットメッセージが指定されました。--messageか--fileでコミットメッセージを指定するか、--message "
2705
"\"\"で空メッセージを指定してください。"
2706
2707
#: bzrlib/builtins.py:3691
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 ""
2712
"コミットする変更がありません。コミットしたいファイルを'bzr add'で追加するか、--unchangedを指定して空のコミットを実行してください。"
2713
2714
#: bzrlib/builtins.py:3695
2715
msgid ""
2716
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2338
msgstr ""
2339
2340
#: breezy/builtins.py:3669
2341
msgid ""
2342
"Empty commit message specified. Please specify a commit message with either "
2343
"--message or --file or leave a blank message with --message \"\"."
2344
msgstr ""
2345
2346
#: breezy/builtins.py:3689
2347
msgid ""
2348
"No changes to commit. Please 'brz add' the files you want to commit, or use "
2349
"--unchanged to force an empty commit."
2350
msgstr ""
2351
2352
#: breezy/builtins.py:3693
2353
msgid ""
2354
"Conflicts detected in working tree. Use \"brz conflicts\" to list, \"brz "
2717
2355
"resolve FILE\" to resolve."
2718
msgstr "作業ツリーに競合があります。\"bzr conflicts\" で表示して、\"bzr resolve FILE\"で解消してください。"
2356
msgstr ""
2719
2357
2720
#: bzrlib/builtins.py:3699
2358
#: breezy/builtins.py:3697
2721
2359
msgid "Commit refused because there are unknown files in the working tree."
2722
msgstr "作業ツリーにバージョン管理外のファイルがあるため、コミットが拒否されました。"
2360
msgstr ""
2723
2361
2724
#: bzrlib/builtins.py:3702
2362
#: breezy/builtins.py:3700
2725
2363
msgid ""
2726
2364
"\n"
2727
2365
"To commit to master branch, run update and then commit.\n"
2728
2366
"You can also pass --local to commit to continue working disconnected."
2729
2367
msgstr ""
2730
"\n"
2731
"マスタブランチにコミットするには、先にupdateしてください。\n"
2732
"--localを指定してオフラインでコミットし、作業を続けることもできます。"
2733
2368
2734
#: bzrlib/builtins.py:3710
2369
#: breezy/builtins.py:3708
2735
2370
msgid ""
2736
2371
"Validate working tree structure, branch consistency and repository history."
2737
msgstr "作業ツリーの構造、ブランチの一貫性、リポジトリの履歴をチェックします。"
2372
msgstr ""
2738
2373
2739
#: bzrlib/builtins.py:3712
2374
#: breezy/builtins.py:3710
2740
2375
msgid ""
2741
2376
"This command checks various invariants about branch and repository storage\n"
2742
"to detect data corruption or bzr bugs."
2377
"to detect data corruption or brz bugs."
2743
2378
msgstr ""
2744
"このコマンドは、データの破損やbzrのバグを検出するために、ブランチとリポジトリ\n"
2745
"ストレージの不変条件をチェックします。"
2746
2379
2747
#: bzrlib/builtins.py:3715
2380
#: breezy/builtins.py:3713
2748
2381
msgid ""
2749
2382
"The working tree and branch checks will only give output if a problem is\n"
2750
2383
"detected. The output fields of the repository check are:"
2751
2384
msgstr ""
2752
"作業ツリーとブランチのチェック結果は、問題が見つかったときだけ表示\n"
2753
"されます。リポジトリチェックの出力は次の通りです。:"
2754
2385
2755
#: bzrlib/builtins.py:3718
2386
#: breezy/builtins.py:3716
2756
2387
msgid ""
2757
2388
"revisions\n"
2758
2389
" This is just the number of revisions checked. It doesn't\n"
2759
2390
" indicate a problem."
2760
2391
msgstr ""
2761
"revisions\n"
2762
" チェックしたリビジョンの数です。これは問題ではありません。"
2763
2392
2764
#: bzrlib/builtins.py:3722
2393
#: breezy/builtins.py:3720
2765
2394
msgid ""
2766
2395
"versionedfiles\n"
2767
2396
" This is just the number of versionedfiles checked. It\n"
2768
2397
" doesn't indicate a problem."
2769
2398
msgstr ""
2770
"versionedfiles\n"
2771
" チェックしたバージョン管理ファイルの数です。これは問題では\n"
2772
" ありません。"
2773
2399
2774
#: bzrlib/builtins.py:3726
2400
#: breezy/builtins.py:3724
2775
2401
msgid ""
2776
2402
"unreferenced ancestors\n"
2777
2403
" Texts that are ancestors of other texts, but\n"
2778
2404
" are not properly referenced by the revision ancestry. This is a\n"
2779
2405
" subtle problem that Bazaar can work around."
2780
2406
msgstr ""
2781
"unreferenced ancestors\n"
2782
" 他のテキストの先祖だが、上位のリビジョンから参照されていない\n"
2783
" と思われるテキストです。これは、Bazaarが対処できる軽微な\n"
2784
" 問題です。"
2785
2407
2786
#: bzrlib/builtins.py:3731
2408
#: breezy/builtins.py:3729
2787
2409
msgid ""
2788
2410
"unique file texts\n"
2789
2411
" This is the total number of unique file contents\n"
2790
2412
" seen in the checked revisions. It does not indicate a problem."
2791
2413
msgstr ""
2792
"unique file texts\n"
2793
" チェックしたリビジョンの中にある、一意なファイルコンテンツの数です。\n"
2794
" これは問題ではありません。"
2795
2414
2796
#: bzrlib/builtins.py:3735
2415
#: breezy/builtins.py:3733
2797
2416
msgid ""
2798
2417
"repeated file texts\n"
2799
2418
" This is the total number of repeated texts seen\n"
2801
2420
" entries are modified, but the file contents are not. It does not\n"
2802
2421
" indicate a problem."
2803
2422
msgstr ""
2804
"repeated file texts\n"
2805
" チェックしたリビジョンの中にある、重複したテキストの数です。\n"
2806
" ファイルのエントリが変更されたが、内容は変更されていない場合に、\n"
2807
" 重複が発生します。これは問題ではありません。"
2808
2423
2809
#: bzrlib/builtins.py:3741
2424
#: breezy/builtins.py:3739
2810
2425
msgid ""
2811
2426
"If no restrictions are specified, all Bazaar data that is found at the "
2812
2427
"given\n"
2813
2428
"location will be checked."
2814
2429
msgstr ""
2815
"条件が指定されなければ、指定された場所の全てのBazaarデータが\n"
2816
"チェックされます。"
2817
2430
2818
#: bzrlib/builtins.py:3746
2431
#: breezy/builtins.py:3744
2819
2432
msgid " Check the tree and branch at 'foo'::"
2820
msgstr " ‘foo’ でのツリーとブランチをチェックする::"
2821
2822
#: bzrlib/builtins.py:3748
2823
msgid " bzr check --tree --branch foo"
2824
msgstr " bzr check --tree --branch foo"
2825
2826
#: bzrlib/builtins.py:3750
2433
msgstr ""
2434
2435
#: breezy/builtins.py:3746
2436
msgid " brz check --tree --branch foo"
2437
msgstr ""
2438
2439
#: breezy/builtins.py:3748
2827
2440
msgid " Check only the repository at 'bar'::"
2828
msgstr " ‘bar’でのリポジトリのみをチェックする::"
2829
2830
#: bzrlib/builtins.py:3752
2831
msgid " bzr check --repo bar"
2832
msgstr " bzr check --repo bar"
2833
2834
#: bzrlib/builtins.py:3754
2441
msgstr ""
2442
2443
#: breezy/builtins.py:3750
2444
msgid " brz check --repo bar"
2445
msgstr ""
2446
2447
#: breezy/builtins.py:3752
2835
2448
msgid " Check everything at 'baz'::"
2836
msgstr " ‘baz’ ですべてをチェックする::"
2837
2838
#: bzrlib/builtins.py:3756
2839
msgid " bzr check baz"
2840
msgstr " bzr check baz"
2841
2842
#: bzrlib/builtins.py:3762
2449
msgstr ""
2450
2451
#: breezy/builtins.py:3754
2452
msgid " brz check baz"
2453
msgstr ""
2454
2455
# help of 'branch' option of 'check' command
2456
#: breezy/builtins.py:3760
2843
2457
msgid "Check the branch related to the current directory."
2844
msgstr "現在のディレクトリに関連したブランチをチェックする。"
2458
msgstr ""
2845
2459
2846
#: bzrlib/builtins.py:3764
2460
# help of 'repo' option of 'check' command
2461
#: breezy/builtins.py:3762
2847
2462
msgid "Check the repository related to the current directory."
2848
msgstr "現在のディレクトリに関連したリポジトリをチェックする。"
2463
msgstr ""
2849
2464
2850
#: bzrlib/builtins.py:3766
2465
# help of 'tree' option of 'check' command
2466
#: breezy/builtins.py:3764
2851
2467
msgid "Check the working tree related to the current directory."
2852
msgstr "現在のディレクトリに関連した作業ツリーをチェックする。"
2468
msgstr ""
2853
2469
2854
#: bzrlib/builtins.py:3780
2470
#: breezy/builtins.py:3778
2855
2471
msgid "Upgrade a repository, branch or working tree to a newer format."
2856
msgstr "リポジトリ、ブランチ、作業ツリーを新しいフォーマットにアップグレードします。"
2472
msgstr ""
2857
2473
2858
#: bzrlib/builtins.py:3782
2474
#: breezy/builtins.py:3780
2859
2475
msgid ""
2860
2476
"When the default format has changed after a major new release of\n"
2861
2477
"Bazaar, you may be informed during certain operations that you\n"
2863
2479
"or make new features available. It may however limit interoperability\n"
2864
2480
"with older repositories or with older versions of Bazaar."
2865
2481
msgstr ""
2866
"Bazaarのメジャーリリースの後にデフォルトのフォーマットが変更された場合、\n"
2867
"いくつかのオペレーションの際に、アップグレードすべきであると通知されます。\n"
2868
"新しいフォーマットへのアップグレードによって、パフォーマンスが改善されたり、\n"
2869
"新しい機能が使えるようになるでしょう。ただし、古いバージョンのリポジトリや\n"
2870
"Bazaarとの互換性には制限が発生するかもしれません。"
2871
2482
2872
#: bzrlib/builtins.py:3788
2483
#: breezy/builtins.py:3786
2873
2484
msgid ""
2874
2485
"If you wish to upgrade to a particular format rather than the\n"
2875
2486
"current default, that can be specified using the --format option.\n"
2878
2489
"a one way process (e.g. changing from the 1.x default to the\n"
2879
2490
"2.x default) so downgrading is not always possible."
2880
2491
msgstr ""
2881
"デフォルトではなく特定のフォーマットにアップグレードしたい場合は、--format\n"
2882
"オプションで指定します。これを利用して、upgradeコマンドで昔のフォーマットに\n"
2883
"*\"ダウングレード\"* することもできますが、変換処理によっては不可逆なものも\n"
2884
"あります。(たとえば、1.xのデフォルトから2.xのデフォルトへの変換は不可逆です)\n"
2885
"そのため、ダウングレードできない場合もあります。"
2886
2492
2887
#: bzrlib/builtins.py:3795
2493
#: breezy/builtins.py:3793
2888
2494
msgid ""
2889
2495
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2890
2496
"process (where # is a number). By default, this is left there on\n"
2894
2500
"Alternatively, you can delete it by hand if everything looks good\n"
2895
2501
"afterwards."
2896
2502
msgstr ""
2897
"変換を開始したときに、 backup.bzr.~#~ というディレクトリが作成されます。\n"
2898
"(#は連番です) デフォルトでは、このフォルダは変換後も残ります。もし変換が\n"
2899
"失敗したら、新しい.bzrフォルダを削除して、このフォルダを元の名前に戻して\n"
2900
"ください。--cleanオプションを指定すると、変換が成功したらbackup.bzr\n"
2901
"ディレクトリは削除されます。そうでない場合は、変換後特に問題がなければ手で\n"
2902
"削除してください。"
2903
2503
2904
#: bzrlib/builtins.py:3803
2504
#: breezy/builtins.py:3801
2905
2505
msgid ""
2906
2506
"If the location given is a shared repository, dependent branches\n"
2907
2507
"are also converted provided the repository converts successfully.\n"
2908
2508
"If the conversion of a branch fails, remaining branches are still\n"
2909
2509
"tried."
2910
2510
msgstr ""
2911
"指定された場所が共用リポジトリの場合、リポジトリの変換が成功したら\n"
2912
"配下のブランチも変換されます。もしブランチの変換に失敗しても、他の\n"
2913
"ブランチの変換は続行されます。"
2914
2511
2915
#: bzrlib/builtins.py:3808
2512
#: breezy/builtins.py:3806
2916
2513
msgid ""
2917
2514
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2918
2515
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2919
2516
msgstr ""
2920
"アップグレードに関する詳細な情報は、Bazaar Upgrade Guideをご覧ください。\n"
2921
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2922
2923
#: bzrlib/builtins.py:3816
2924
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2925
msgstr "指定されたフォーマットにアップグレードします。詳細は\"bzr help formats\"をご覧ください。"
2926
2927
#: bzrlib/builtins.py:3820
2517
2518
# help of 'format' option of 'upgrade' command
2519
#: breezy/builtins.py:3814
2520
msgid "Upgrade to a specific format. See \"brz help formats\" for details."
2521
msgstr ""
2522
2523
# title of 'format' option of 'init' command
2524
# title of 'format' option of 'upgrade' command
2525
#: breezy/builtins.py:3818
2928
2526
msgid "Branch format"
2929
msgstr "ブランチフォーマット"
2527
msgstr ""
2930
2528
2931
#: bzrlib/builtins.py:3822
2529
# help of 'clean' option of 'upgrade' command
2530
#: breezy/builtins.py:3820
2932
2531
msgid "Remove the backup.bzr directory if successful."
2933
msgstr "変換に成功したらbackup.bzrディレクトリを削除します。"
2532
msgstr ""
2934
2533
2935
#: bzrlib/builtins.py:3824
2534
# help of 'dry-run' option of 'add' command
2535
# help of 'dry-run' option of 'upgrade' command
2536
#: breezy/builtins.py:3822
2936
2537
msgid "Show what would be done, but don't actually do anything."
2937
msgstr "何が実行されるかを表示しますが、実際には何もしません。"
2938
2939
#: bzrlib/builtins.py:3839
2940
msgid "Show or set bzr user id."
2941
msgstr "bzrのユーザIDを表示、設定します。"
2942
2943
#: bzrlib/builtins.py:3841
2538
msgstr ""
2539
2540
#: breezy/builtins.py:3837
2541
msgid "Show or set brz user id."
2542
msgstr ""
2543
2544
#: breezy/builtins.py:3839
2944
2545
msgid ""
2945
2546
":Examples:\n"
2946
2547
" Show the email of the current user::"
2947
2548
msgstr ""
2948
":例:\n"
2949
" 現在のユーザのEメールを表示します。::"
2950
2951
#: bzrlib/builtins.py:3844
2952
msgid " bzr whoami --email"
2953
msgstr " bzr whoami --email"
2954
2955
#: bzrlib/builtins.py:3846
2549
2550
#: breezy/builtins.py:3842
2551
msgid " brz whoami --email"
2552
msgstr ""
2553
2554
#: breezy/builtins.py:3844
2956
2555
msgid " Set the current user::"
2957
msgstr " ユーザを設定します。::"
2958
2959
#: bzrlib/builtins.py:3848
2960
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2961
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
2962
2963
#: bzrlib/builtins.py:3852
2556
msgstr ""
2557
2558
#: breezy/builtins.py:3846
2559
msgid " brz whoami \"Frank Chu <fchu@example.com>\""
2560
msgstr ""
2561
2562
# help of 'email' option of 'whoami' command
2563
#: breezy/builtins.py:3850
2964
2564
msgid "Display email address only."
2965
msgstr "Eメールアドレスだけを表示します。"
2565
msgstr ""
2966
2566
2967
#: bzrlib/builtins.py:3854
2567
# help of 'branch' option of 'whoami' command
2568
#: breezy/builtins.py:3852
2968
2569
msgid "Set identity for the current branch instead of globally."
2969
msgstr "全体設定ではなく、現在のブランチだけにIDを設定します。"
2570
msgstr ""
2970
2571
2971
#: bzrlib/builtins.py:3880
2572
#: breezy/builtins.py:3878
2972
2573
msgid "--email can only be used to display existing identity"
2973
msgstr "--emailは、現在のIDを表示するためだけに使用できます。"
2574
msgstr ""
2974
2575
2975
#: bzrlib/builtins.py:3904
2576
#: breezy/builtins.py:3902
2976
2577
msgid "Print or set the branch nickname."
2977
msgstr "ブランチのニックネームを表示または設定します。"
2578
msgstr ""
2978
2579
2979
#: bzrlib/builtins.py:3906
2580
#: breezy/builtins.py:3904
2980
2581
msgid ""
2981
2582
"If unset, the colocated branch name is used for colocated branches, and\n"
2982
2583
"the branch directory name is used for other branches. To print the\n"
2983
2584
"current nickname, execute with no argument."
2984
2585
msgstr ""
2985
2586
2986
#: bzrlib/builtins.py:3910
2587
#: breezy/builtins.py:3908
2987
2588
msgid ""
2988
2589
"Bound branches use the nickname of its master branch unless it is set\n"
2989
2590
"locally."
2990
2591
msgstr ""
2991
"バインドされたブランチは、ローカルでニックネームが設定されていなければ\n"
2992
"マスタブランチのニックネームを使用します。"
2993
2592
2994
#: bzrlib/builtins.py:3930
2593
#: breezy/builtins.py:3928
2995
2594
msgid "Set/unset and display aliases."
2996
msgstr "エイリアスの設定、解除、表示を行います。"
2595
msgstr ""
2997
2596
2998
#: bzrlib/builtins.py:3932
2597
#: breezy/builtins.py:3930
2999
2598
msgid ""
3000
2599
":Examples:\n"
3001
2600
" Show the current aliases::"
3002
2601
msgstr ""
3003
":例:\n"
3004
" 現在のエイリアスを表示します。::"
3005
3006
#: bzrlib/builtins.py:3935
3007
msgid " bzr alias"
3008
msgstr " bzr alias"
3009
3010
#: bzrlib/builtins.py:3937
2602
2603
#: breezy/builtins.py:3933
2604
msgid " brz alias"
2605
msgstr ""
2606
2607
#: breezy/builtins.py:3935
3011
2608
msgid " Show the alias specified for 'll'::"
3012
msgstr " 'll'に設定されているエイリアスを表示します。::"
3013
3014
#: bzrlib/builtins.py:3939
3015
msgid " bzr alias ll"
3016
msgstr " bzr alias ll"
3017
3018
#: bzrlib/builtins.py:3941
2609
msgstr ""
2610
2611
#: breezy/builtins.py:3937
2612
msgid " brz alias ll"
2613
msgstr ""
2614
2615
#: breezy/builtins.py:3939
3019
2616
msgid " Set an alias for 'll'::"
3020
msgstr " エイリアス'll'を設定します。::"
3021
3022
#: bzrlib/builtins.py:3943
3023
msgid " bzr alias ll=\"log --line -r-10..-1\""
3024
msgstr " bzr alias ll=\"log --line -r-10..-1\""
3025
3026
#: bzrlib/builtins.py:3945
2617
msgstr ""
2618
2619
#: breezy/builtins.py:3941
2620
msgid " brz alias ll=\"log --line -r-10..-1\""
2621
msgstr ""
2622
2623
#: breezy/builtins.py:3943
3027
2624
msgid " To remove an alias for 'll'::"
3028
msgstr " エイリアス'll'を解除します。::"
3029
3030
#: bzrlib/builtins.py:3947
3031
msgid " bzr alias --remove ll"
3032
msgstr " bzr alias --remove ll"
3033
3034
#: bzrlib/builtins.py:3952
2625
msgstr ""
2626
2627
#: breezy/builtins.py:3945
2628
msgid " brz alias --remove ll"
2629
msgstr ""
2630
2631
# help of 'remove' option of 'alias' command
2632
#: breezy/builtins.py:3950
3035
2633
msgid "Remove the alias."
3036
msgstr "エイリアスを削除します。"
3037
3038
#: bzrlib/builtins.py:3970
3039
msgid "bzr alias --remove expects an alias to remove."
3040
msgstr "bzr alias --removeには、削除するエイリアス名を指定する必要があります。"
3041
3042
#: bzrlib/builtins.py:4151
3043
msgid ""
3044
"subunit not available. subunit needs to be installed to use --subunit."
3045
msgstr ""
3046
3047
#: bzrlib/builtins.py:4168
3048
msgid ""
3049
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3050
msgstr "--benchmarkは、bzr2.2以降はサポートしていません。かわりにbzr-usertestを使用してください。"
3051
3052
#: bzrlib/builtins.py:4215
3053
msgid "Show version of bzr."
3054
msgstr "Bazaarのバージョンを表示します。"
3055
3056
#: bzrlib/builtins.py:4219
2634
msgstr ""
2635
2636
#: breezy/builtins.py:3968
2637
msgid "brz alias --remove expects an alias to remove."
2638
msgstr ""
2639
2640
#: breezy/builtins.py:4149
2641
msgid "subunit not available. subunit needs to be installed to use --subunit."
2642
msgstr ""
2643
2644
#: breezy/builtins.py:4166
2645
msgid ""
2646
"--benchmark is no longer supported from brz 2.2; use bzr-usertest instead"
2647
msgstr ""
2648
2649
#: breezy/builtins.py:4213
2650
msgid "Show version of brz."
2651
msgstr ""
2652
2653
# help of 'short' option of 'version' command
2654
#: breezy/builtins.py:4217
3057
2655
msgid "Print just the version number."
3058
msgstr "リビジョン番号を表示します。"
2656
msgstr ""
3059
2657
3060
#: bzrlib/builtins.py:4238
2658
#: breezy/builtins.py:4236
3061
2659
msgid "It sure does!\n"
3062
2660
msgstr ""
3063
2661
3064
#: bzrlib/builtins.py:4262
2662
#: breezy/builtins.py:4260
3065
2663
#, python-format
3066
2664
msgid "merge base is revision %s\n"
3067
msgstr "マージの起点はリビジョン %s です。\n"
2665
msgstr ""
3068
2666
3069
#: bzrlib/builtins.py:4266
2667
#: breezy/builtins.py:4264
3070
2668
msgid "Perform a three-way merge."
3071
msgstr "3wayマージを実行します。"
2669
msgstr ""
3072
2670
3073
#: bzrlib/builtins.py:4268
2671
#: breezy/builtins.py:4266
3074
2672
msgid ""
3075
2673
"The source of the merge can be specified either in the form of a branch,\n"
3076
2674
"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"
2675
"with brz send. If neither is specified, the default is the upstream branch\n"
3078
2676
"or the branch most recently merged using --remember. The source of the\n"
3079
2677
"merge may also be specified in the form of a path to a file in another\n"
3080
2678
"branch: in this case, only the modifications to that file are merged into\n"
3081
2679
"the current working tree."
3082
2680
msgstr ""
3083
"マージ元には、ブランチか、bzr sendで作られたマージディレクティブファイル\n"
3084
"のパスを指定できます。どちらも指定されていない場合は、アップストリームブランチ\n"
3085
"か、一番最後に--remember指定でマージした時のマージ元がデフォルトになります。\n"
3086
"別のブランチ内のファイルパスをマージ元として指定することもでき、その場合は\n"
3087
"指定されたファイルの変更だけが現在のブランチにマージされます。"
3088
2681
3089
#: bzrlib/builtins.py:4276
2682
#: breezy/builtins.py:4274
3090
2683
msgid ""
3091
"When merging from a branch, by default bzr will try to merge in all new\n"
2684
"When merging from a branch, by default brz will try to merge in all new\n"
3092
2685
"work from the other branch, automatically determining an appropriate base\n"
3093
2686
"revision. If this fails, you may need to give an explicit base."
3094
2687
msgstr ""
3095
"ブランチからマージする場合、デフォルトでbzrは自動的に妥当なベースリビジョンを\n"
3096
"判定し、それ以降のすべての変更をマージしようとします。もしこれが失敗した場合は、\n"
3097
"明示的にベースリビジョンを指定する必要があります。"
3098
2688
3099
#: bzrlib/builtins.py:4280
2689
#: breezy/builtins.py:4278
3100
2690
msgid ""
3101
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2691
"To pick a different ending revision, pass \"--revision OTHER\". brz will\n"
3102
2692
"try to merge in all new work up to and including revision OTHER."
3103
2693
msgstr ""
3104
"別の最終リビジョンを指定するには、\"-revision OTHER\"を指定します。この場合、\n"
3105
"OTHERまで(OTHERも含む)の全ての変更がマージされます。"
3106
2694
3107
#: bzrlib/builtins.py:4283
2695
#: breezy/builtins.py:4281
3108
2696
msgid ""
3109
2697
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3110
2698
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3114
2702
"cherrypicks. The changes look like a normal commit, and the history of the\n"
3115
2703
"changes from the other branch is not stored in the commit."
3116
2704
msgstr ""
3117
"もし、２つのリビジョンを指定した場合(\"--revision BASE..OTHER\")、BASEから\n"
3118
"OTHERの範囲(BASEは含まず、OTHERは含む)のリビジョンがマージされます。これに\n"
3119
"よってスキップされるリビジョンがある場合、つまりマージ先のリビジョンにBASE\n"
3120
"が含まれていない場合は、いわゆる\"チェリーピック\"が行われます。通常のマージ\n"
3121
"とはちがい、今のところBazaarではチェリーピックは追跡しません。変更は、普通の\n"
3122
"コミットのように見え、マージ元での変更履歴は保存されません。"
3123
2705
3124
#: bzrlib/builtins.py:4291
2706
#: breezy/builtins.py:4289
3125
2707
msgid "Revision numbers are always relative to the source branch."
3126
msgstr "リビジョン番号は常に元のブランチに関連します。"
2708
msgstr ""
3127
2709
3128
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2710
#: breezy/builtins.py:4291 breezy/conflicts.py:52 breezy/conflicts.py:106
3129
2711
msgid ""
3130
2712
"Merge will do its best to combine the changes in two branches, but there\n"
3131
2713
"are some kinds of problems only a human can fix. When it encounters those,\n"
3133
2715
"before you can commit."
3134
2716
msgstr ""
3135
2717
3136
#: bzrlib/builtins.py:4298
3137
msgid ""
3138
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3139
msgstr "問題を解消したら、bzr resolveを使用してください。bzr conflictsもご覧ください。"
2718
#: breezy/builtins.py:4296
2719
msgid "Use brz resolve when you have fixed a problem. See also brz conflicts."
2720
msgstr ""
3140
2721
3141
#: bzrlib/builtins.py:4300
2722
#: breezy/builtins.py:4298
3142
2723
msgid ""
3143
2724
"If there is no default branch set, the first merge will set it (use\n"
3144
2725
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3145
2726
"to use the default. To change the default, use --remember. The value will\n"
3146
2727
"only be saved if the remote location can be accessed."
3147
2728
msgstr ""
3148
"デフォルトブランチが設定されていない場合、最初にマージを実行したときに\n"
3149
"設定されます。(これをしないようにするには、--no-rememberを指定します。)\n"
3150
"その後は、デフォルトのブランチを使用する時には指定を省略できるようになり\n"
3151
"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモートの\n"
3152
"ブランチにアクセスできた時だけ保存されます。"
3153
2729
3154
#: bzrlib/builtins.py:4305
2730
#: breezy/builtins.py:4303
3155
2731
msgid ""
3156
2732
"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"
2733
"directory, where they can be reviewed (with brz diff), tested, and then\n"
3158
2734
"committed to record the result of the merge."
3159
2735
msgstr ""
3160
"マージの結果はマージ先の作業ツリー内に反映され、そこで(bzr diffを使って)\n"
3161
"レビューしたり、テストをしたあとで、コミットによって記録することができます。"
3162
2736
3163
#: bzrlib/builtins.py:4309
2737
#: breezy/builtins.py:4307
3164
2738
msgid ""
3165
2739
"merge refuses to run if there are any uncommitted changes, unless\n"
3166
2740
"--force is given. If --force is given, then the changes from the source \n"
3168
2742
"changes in the tree. The --force option can also be used to create a\n"
3169
2743
"merge revision which has more than two parents."
3170
2744
msgstr ""
3171
"コミットされていない変更がある場合は、--forceを指定しないとマージは拒否\n"
3172
"されます。--forceが指定された場合は、未コミットの変更を含む現在の作業ツリーに\n"
3173
"マージ元の変更がマージされます。--forceオプションを使えば、２つ以上の親を持つ\n"
3174
"マージリビジョンを作ることもできます。"
3175
2745
3176
#: bzrlib/builtins.py:4315
2746
#: breezy/builtins.py:4313
3177
2747
msgid ""
3178
2748
"If one would like to merge changes from the working tree of the other\n"
3179
2749
"branch without merging any committed revisions, the --uncommitted option\n"
3180
2750
"can be given."
3181
2751
msgstr ""
3182
"コミット済みの変更ではなく、作業ツリー上での変更を別のブランチにマージしたい\n"
3183
"場合は、--uncommittedオプションを指定することができます。"
3184
2752
3185
#: bzrlib/builtins.py:4319
2753
#: breezy/builtins.py:4317
3186
2754
msgid ""
3187
2755
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3188
2756
"you to apply each diff hunk and file change, similar to \"shelve\"."
3189
2757
msgstr ""
3190
"変更を部分的にマージしたければ、\"merge -i\"を使用すれば、\"shelve\"と同じ\n"
3191
"ようにそれぞれのハンクをプロンプトで選択して適用することができます。"
3192
2758
3193
#: bzrlib/builtins.py:4322
2759
#: breezy/builtins.py:4320
3194
2760
msgid ""
3195
2761
":Examples:\n"
3196
" To merge all new revisions from bzr.dev::"
3197
msgstr ""
3198
":例:\n"
3199
" bzr.devから全ての新しいリビジョンをマージします。::"
3200
3201
#: bzrlib/builtins.py:4325
3202
msgid " bzr merge ../bzr.dev"
3203
msgstr " bzr merge ../bzr.dev"
3204
3205
#: bzrlib/builtins.py:4327
3206
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3207
msgstr " bzr.devから、リビジョン82まで(82も含む)のリビジョンをマージします::"
3208
3209
#: bzrlib/builtins.py:4329
3210
msgid " bzr merge -r 82 ../bzr.dev"
3211
msgstr " bzr merge -r 82 ../bzr.dev"
3212
3213
#: bzrlib/builtins.py:4331
2762
" To merge all new revisions from brz.dev::"
2763
msgstr ""
2764
2765
#: breezy/builtins.py:4323
2766
msgid " brz merge ../brz.dev"
2767
msgstr ""
2768
2769
#: breezy/builtins.py:4325
2770
msgid " To merge changes up to and including revision 82 from brz.dev::"
2771
msgstr ""
2772
2773
#: breezy/builtins.py:4327
2774
msgid " brz merge -r 82 ../brz.dev"
2775
msgstr ""
2776
2777
#: breezy/builtins.py:4329
3214
2778
msgid " To merge the changes introduced by 82, without previous changes::"
3215
msgstr " リビジョン82での変更をマージし、それ以前の変更はマージしません。::"
3216
3217
#: bzrlib/builtins.py:4333
3218
msgid " bzr merge -r 81..82 ../bzr.dev"
3219
msgstr " bzr merge -r 81..82 ../bzr.dev"
3220
3221
#: bzrlib/builtins.py:4335
2779
msgstr ""
2780
2781
#: breezy/builtins.py:4331
2782
msgid " brz merge -r 81..82 ../brz.dev"
2783
msgstr ""
2784
2785
#: breezy/builtins.py:4333
3222
2786
msgid " To apply a merge directive contained in /tmp/merge::"
3223
msgstr " /tmp/merge内のマージディレクティブを適用します。::"
3224
3225
#: bzrlib/builtins.py:4337
3226
msgid " bzr merge /tmp/merge"
3227
msgstr " bzr merge /tmp/merge"
3228
3229
#: bzrlib/builtins.py:4339
2787
msgstr ""
2788
2789
#: breezy/builtins.py:4335
2790
msgid " brz merge /tmp/merge"
2791
msgstr ""
2792
2793
#: breezy/builtins.py:4337
3230
2794
msgid ""
3231
2795
" To create a merge revision with three parents from two branches\n"
3232
2796
" feature1a and feature1b:"
3233
2797
msgstr ""
3234
" feature1a、feature1bの２つのブランチから、３つの親を持つマージ\n"
3235
" リビジョンを作ります。::"
3236
2798
3237
#: bzrlib/builtins.py:4342
2799
#: breezy/builtins.py:4340
3238
2800
msgid ""
3239
" bzr merge ../feature1a\n"
3240
" bzr merge ../feature1b --force\n"
3241
" bzr commit -m 'revision with three parents'"
2801
" brz merge ../feature1a\n"
2802
" brz merge ../feature1b --force\n"
2803
" brz commit -m 'revision with three parents'"
3242
2804
msgstr ""
3243
" bzr merge ../feature1a\n"
3244
" bzr merge ../feature1b --force\n"
3245
" bzr commit -m 'revision with three parents'"
3246
2805
3247
#: bzrlib/builtins.py:4354
2806
# help of 'force' option of 'merge' command
2807
#: breezy/builtins.py:4352
3248
2808
msgid "Merge even if the destination tree has uncommitted changes."
3249
msgstr "マージ先のツリーにコミットしていない変更があってもマージします。"
2809
msgstr ""
3250
2810
3251
#: bzrlib/builtins.py:4360
2811
# help of 'uncommitted' option of 'merge' command
2812
#: breezy/builtins.py:4358
3252
2813
msgid ""
3253
2814
"Apply uncommitted changes from a working copy, instead of branch changes."
3254
msgstr "ブランチの変更ではなく、作業コピー上のコミットしていない変更をマージします。"
2815
msgstr ""
3255
2816
3256
#: bzrlib/builtins.py:4362
2817
# help of 'pull' option of 'merge' command
2818
#: breezy/builtins.py:4360
3257
2819
msgid ""
3258
2820
"If the destination is already completely merged into the source, pull from "
3259
2821
"the source rather than merging. When this happens, you do not need to "
3260
2822
"commit the result."
3261
2823
msgstr ""
3262
"マージ先のリビジョンがマージ元のブランチにすべて含まれている場合、マージの\n"
3263
"かわりにpullを実行します。その場合は、コミットする必要はありません。"
3264
2824
3265
#: bzrlib/builtins.py:4367
2825
# help of 'directory' option of 'merge' command
2826
#: breezy/builtins.py:4365
3266
2827
msgid ""
3267
2828
"Branch to merge into, rather than the one containing the working directory."
3268
msgstr "作業ディレクトリ以外にマージする場合の、マージ先のブランチ。"
2829
msgstr ""
3269
2830
3270
#: bzrlib/builtins.py:4369
2831
# help of 'preview' option of 'merge' command
2832
#: breezy/builtins.py:4367
3271
2833
msgid "Instead of merging, show a diff of the merge."
3272
msgstr "マージを実行するかわりに、マージされる内容のdiffを表示します。"
2834
msgstr ""
3273
2835
3274
#: bzrlib/builtins.py:4371
2836
# help of 'interactive' option of 'merge' command
2837
#: breezy/builtins.py:4369
3275
2838
msgid "Select changes interactively."
3276
msgstr "変更をインタラクティブに選択します。"
2839
msgstr ""
3277
2840
3278
#: bzrlib/builtins.py:4393
2841
#: breezy/builtins.py:4391
3279
2842
msgid ""
3280
"Merging into empty branches not currently supported, "
3281
"https://bugs.launchpad.net/bzr/+bug/308562"
2843
"Merging into empty branches not currently supported, https://bugs.launchpad."
2844
"net/brz/+bug/308562"
3282
2845
msgstr ""
3283
"空ブランチへのマージは今のところサポートされていません。https://bugs.launchpad.net/bzr/+bug/308562"
3284
2846
3285
#: bzrlib/builtins.py:4420
2847
#: breezy/builtins.py:4418
3286
2848
msgid "Cannot use --uncommitted with bundles or merge directives."
3287
msgstr "バンドル、マージディレクティブに対して--uncommittedを指定することはできません。"
2849
msgstr ""
3288
2850
3289
#: bzrlib/builtins.py:4431
2851
#: breezy/builtins.py:4429
3290
2852
msgid "Cannot use --uncommitted and --revision at the same time."
3291
msgstr "--uncommittedと--revisionを同時に指定することはできません。"
2853
msgstr ""
3292
2854
3293
#: bzrlib/builtins.py:4451
2855
#: breezy/builtins.py:4449
3294
2856
msgid "merger: "
3295
msgstr "マージした人: "
2857
msgstr ""
3296
2858
3297
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2859
#: breezy/builtins.py:4451 breezy/bundle/apply_bundle.py:71
3298
2860
msgid "Nothing to do."
3299
msgstr "なにもすることがありません。"
2861
msgstr ""
3300
2862
3301
#: bzrlib/builtins.py:4457
2863
#: breezy/builtins.py:4455
3302
2864
msgid "Cannot pull individual files"
3303
msgstr "ファイルを個別にpullすることはできません。"
3304
3305
#: bzrlib/builtins.py:4465
3306
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3307
msgstr "ブランチにコミットがありません。('bzr pull'を使うべきかもしれません)"
3308
3309
#: bzrlib/builtins.py:4523
2865
msgstr ""
2866
2867
#: breezy/builtins.py:4463
2868
msgid "This branch has no commits. (perhaps you would prefer 'brz pull')"
2869
msgstr ""
2870
2871
#: breezy/builtins.py:4521
3310
2872
#, python-format
3311
2873
msgid "Show-base is not supported for this merge type. %s"
3312
msgstr "Show-baseはこのマージタイプではサポートされません。 %s"
2874
msgstr ""
3313
2875
3314
#: bzrlib/builtins.py:4532
2876
#: breezy/builtins.py:4530
3315
2877
#, python-format
3316
2878
msgid "Conflict reduction is not supported for merge type %s."
3317
msgstr "衝突の縮小化は、このマージタイプではサポートされません。 %s"
2879
msgstr ""
3318
2880
3319
#: bzrlib/builtins.py:4536
2881
#: breezy/builtins.py:4534
3320
2882
msgid "Cannot do conflict reduction and show base."
3321
msgstr "衝突の縮小化、ベースの表示ができませんでした。"
2883
msgstr ""
3322
2884
3323
#: bzrlib/builtins.py:4647
2885
#: breezy/builtins.py:4645
3324
2886
msgid "No location specified or remembered"
3325
msgstr "対象の場所が設定も指定もされていません。"
2887
msgstr ""
3326
2888
3327
#: bzrlib/builtins.py:4649
2889
#: breezy/builtins.py:4647
2890
#, python-brace-format
3328
2891
msgid "{0} remembered {1} location {2}"
3329
msgstr "{0} 設定された {1} の場所 {2}"
2892
msgstr ""
3330
2893
3331
#: bzrlib/builtins.py:4655
2894
#: breezy/builtins.py:4653
3332
2895
msgid "Redo a merge."
3333
msgstr "マージをやりなおします。"
2896
msgstr ""
3334
2897
3335
#: bzrlib/builtins.py:4657
2898
#: breezy/builtins.py:4655
3336
2899
msgid ""
3337
2900
"Use this if you want to try a different merge technique while resolving\n"
3338
2901
"conflicts. Some merge techniques are better than others, and remerge\n"
3339
2902
"lets you try different ones on different files."
3340
2903
msgstr ""
3341
"衝突を解決するために、別のマージ方法を試したい場合に、このコマンドを\n"
3342
"使用します。他のものより優れたマージ方法があり、remergeを使って個々の\n"
3343
"ファイルに別のマージ方法を試すことができます。"
3344
2904
3345
#: bzrlib/builtins.py:4661
2905
#: breezy/builtins.py:4659
3346
2906
msgid ""
3347
2907
"The options for remerge have the same meaning and defaults as the ones for\n"
3348
2908
"merge. The difference is that remerge can (only) be run when there is a\n"
3349
2909
"pending merge, and it lets you specify particular files."
3350
2910
msgstr ""
3351
"remergeのオプションの意味とデフォルトはmergeと同じです。違いは、\n"
3352
"remergeはマージ中状態のときだけ実行でき、特定のファイルを指定できる\n"
3353
"ということです。"
3354
2911
3355
#: bzrlib/builtins.py:4665
2912
#: breezy/builtins.py:4663
3356
2913
msgid ""
3357
2914
":Examples:\n"
3358
2915
" Re-do the merge of all conflicted files, and show the base text in\n"
3359
2916
" conflict regions, in addition to the usual THIS and OTHER texts::"
3360
2917
msgstr ""
3361
":例:\n"
3362
" すべての衝突したファイルのマージをやり直し、通常のTHIS、OTHERの\n"
3363
" テキストにくわえて衝突した領域のベーステキストを表示します。::"
3364
3365
#: bzrlib/builtins.py:4669
3366
msgid " bzr remerge --show-base"
3367
msgstr " bzr remerge --show-base"
3368
3369
#: bzrlib/builtins.py:4671
2918
2919
#: breezy/builtins.py:4667
2920
msgid " brz remerge --show-base"
2921
msgstr ""
2922
2923
#: breezy/builtins.py:4669
3370
2924
msgid ""
3371
2925
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3372
2926
" additional processing to reduce the size of conflict regions::"
3373
2927
msgstr ""
3374
" \"foobar\"のマージを、weaveマージアルゴリズムでやりなおし、衝突領域の\n"
3375
" 縮小化処理も行います。::"
3376
3377
#: bzrlib/builtins.py:4674
3378
msgid " bzr remerge --merge-type weave --reprocess foobar"
3379
msgstr " bzr remerge --merge-type weave --reprocess foobar"
3380
3381
#: bzrlib/builtins.py:4681
2928
2929
#: breezy/builtins.py:4672
2930
msgid " brz remerge --merge-type weave --reprocess foobar"
2931
msgstr ""
2932
2933
# help of 'show-base' option of 'merge' command
2934
# help of 'show-base' option of 'pull' command
2935
# help of 'show-base' option of 'remerge' command
2936
# help of 'show-base' option of 'update' command
2937
#: breezy/builtins.py:4679
3382
2938
msgid "Show base revision text in conflicts."
3383
msgstr "衝突したベースリビジョンのテキストを表示します。"
2939
msgstr ""
3384
2940
3385
#: bzrlib/builtins.py:4693
2941
#: breezy/builtins.py:4691
3386
2942
msgid ""
3387
2943
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3388
2944
"merges."
3389
2945
msgstr ""
3390
"remergeは通常のマージ後にだけ実行できます。チェリーピックや複数マージでは\r\n"
3391
"利用できません。"
3392
2946
3393
#: bzrlib/builtins.py:4751
2947
#: breezy/builtins.py:4749
3394
2948
msgid ""
3395
2949
"Set files in the working tree back to the contents of a previous revision."
3396
2950
msgstr ""
3397
2951
3398
#: bzrlib/builtins.py:4753
2952
#: breezy/builtins.py:4751
3399
2953
msgid ""
3400
2954
"Giving a list of files will revert only those files. Otherwise, all files\n"
3401
2955
"will be reverted. If the revision is not specified with '--revision', the\n"
3404
2958
"the working tree basis revision."
3405
2959
msgstr ""
3406
2960
3407
#: bzrlib/builtins.py:4759
2961
#: breezy/builtins.py:4757
3408
2962
msgid ""
3409
2963
"To remove only some changes, without reverting to a prior version, use\n"
3410
2964
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3416
2970
"update command."
3417
2971
msgstr ""
3418
2972
3419
#: bzrlib/builtins.py:4768
2973
#: breezy/builtins.py:4766
3420
2974
msgid ""
3421
2975
"Uncommitted changes to files that are reverted will be discarded.\n"
3422
2976
"Howver, by default, any files that have been manually changed will be\n"
3424
2978
"files have '.~#~' appended to their name, where # is a number."
3425
2979
msgstr ""
3426
2980
3427
#: bzrlib/builtins.py:4773
2981
#: breezy/builtins.py:4771
3428
2982
msgid ""
3429
2983
"When you provide files, you can use their current pathname or the pathname\n"
3430
2984
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3431
2985
"name. If you name a directory, all the contents of that directory will be\n"
3432
2986
"reverted."
3433
2987
msgstr ""
3434
"ファイル名を指定するときは、現在のファイル名か、対象リビジョン時点でのファイル\n"
3435
"名かを使うことができます。つまり、ファイル名指定で「削除の取り消し」のために\n"
3436
"revertを使うことができます。ディレクトリを指定した場合は、その配下のすべての\n"
3437
"変更が取り消されます。"
3438
2988
3439
#: bzrlib/builtins.py:4778
2989
#: breezy/builtins.py:4776
3440
2990
msgid ""
3441
2991
"If you have newly added files since the target revision, they will be\n"
3442
2992
"removed. If the files to be removed have been changed, backups will be\n"
3443
2993
"created as above. Directories containing unknown files will not be\n"
3444
2994
"deleted."
3445
2995
msgstr ""
3446
"対象のリビジョン以降にファイルが新しく追加されている場合は、そのファイルは\n"
3447
"削除されます。削除されるファイルが変更されている場合は、上記の通りに\n"
3448
"バックアップされます。バージョン管理外のファイルを含むディレクトリは削除され\n"
3449
"ません。"
3450
2996
3451
#: bzrlib/builtins.py:4783
2997
#: breezy/builtins.py:4781
3452
2998
msgid ""
3453
2999
"The working tree contains a list of revisions that have been merged but\n"
3454
3000
"not yet committed. These revisions will be included as additional parents\n"
3455
3001
"of the next commit. Normally, using revert clears that list as well as\n"
3456
3002
"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"
3003
"of uncommitted merges alone and reverts only the files. Use ``brz revert\n"
3458
3004
".`` 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"
3005
"and ``brz revert --forget-merges`` to clear the pending merge list without\n"
3460
3006
"reverting any files."
3461
3007
msgstr ""
3462
3008
3463
#: bzrlib/builtins.py:4792
3009
#: breezy/builtins.py:4790
3464
3010
msgid ""
3465
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3011
"Using \"brz revert --forget-merges\", it is possible to apply all of the\n"
3466
3012
"changes from a branch in a single revision. To do this, perform the merge\n"
3467
3013
"as desired. Then doing revert with the \"--forget-merges\" option will "
3468
3014
"keep\n"
3474
3020
"target branches."
3475
3021
msgstr ""
3476
3022
3477
#: bzrlib/builtins.py:4806
3023
# help of 'no-backup' option of 'revert' command
3024
#: breezy/builtins.py:4804
3478
3025
msgid "Do not save backups of reverted files."
3479
msgstr "リバートされたファイルのバックアップを作成しない。"
3026
msgstr ""
3480
3027
3481
#: bzrlib/builtins.py:4808
3028
# help of 'forget-merges' option of 'revert' command
3029
#: breezy/builtins.py:4806
3482
3030
msgid "Remove pending merge marker, without changing any files."
3483
msgstr "ファイルを一切変更せずに、未解決のマージマーカを削除する。"
3031
msgstr ""
3484
3032
3485
#: bzrlib/builtins.py:4839
3033
#: breezy/builtins.py:4837
3486
3034
msgid ""
3487
3035
"Show help on a command or other topic.\n"
3488
3036
" "
3489
3037
msgstr ""
3490
"コマンドもしくは他のトピックのヘルプを表示する。\n"
3491
" "
3492
3038
3493
#: bzrlib/builtins.py:4844
3039
# help of 'long' option of 'help' command
3040
#: breezy/builtins.py:4842
3494
3041
msgid "Show help on all commands."
3495
msgstr "全てのコマンドのヘルプを表示する。"
3042
msgstr ""
3496
3043
3497
#: bzrlib/builtins.py:4873
3044
#: breezy/builtins.py:4871
3498
3045
msgid "Show unmerged/unpulled revisions between two branches."
3499
msgstr "2つのブランチの間のmergeされていない/pullされていない リビジョンを表示する。"
3046
msgstr ""
3500
3047
3501
#: bzrlib/builtins.py:4875
3048
#: breezy/builtins.py:4873
3502
3049
msgid "OTHER_BRANCH may be local or remote."
3503
msgstr "OTHER_BRANCHはlocalもしくはremoteになります。"
3050
msgstr ""
3504
3051
3505
#: bzrlib/builtins.py:4877
3052
#: breezy/builtins.py:4875
3506
3053
msgid ""
3507
3054
"To filter on a range of revisions, you can use the command -r begin..end\n"
3508
3055
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3513
3060
" 0 - no missing revisions"
3514
3061
msgstr ""
3515
3062
3516
#: bzrlib/builtins.py:4887
3063
#: breezy/builtins.py:4885
3517
3064
msgid ""
3518
3065
" Determine the missing revisions between this and the branch at the\n"
3519
3066
" remembered pull location::"
3520
3067
msgstr ""
3521
3068
3522
#: bzrlib/builtins.py:4890
3523
msgid " bzr missing"
3524
msgstr " bzr missing"
3069
#: breezy/builtins.py:4888
3070
msgid " brz missing"
3071
msgstr ""
3525
3072
3526
#: bzrlib/builtins.py:4892
3073
#: breezy/builtins.py:4890
3527
3074
msgid " Determine the missing revisions between this and another branch::"
3528
3075
msgstr ""
3529
3076
3530
#: bzrlib/builtins.py:4894
3531
msgid " bzr missing http://server/branch"
3532
msgstr " bzr missing http://server/branch"
3077
#: breezy/builtins.py:4892
3078
msgid " brz missing http://server/branch"
3079
msgstr ""
3533
3080
3534
#: bzrlib/builtins.py:4896
3081
#: breezy/builtins.py:4894
3535
3082
msgid ""
3536
3083
" Determine the missing revisions up to a specific revision on the other\n"
3537
3084
" branch::"
3538
3085
msgstr ""
3539
3086
3540
#: bzrlib/builtins.py:4899
3541
msgid " bzr missing -r ..-10"
3542
msgstr " bzr missing -r ..-10"
3087
#: breezy/builtins.py:4897
3088
msgid " brz missing -r ..-10"
3089
msgstr ""
3543
3090
3544
#: bzrlib/builtins.py:4901
3091
#: breezy/builtins.py:4899
3545
3092
msgid ""
3546
3093
" Determine the missing revisions up to a specific revision on this\n"
3547
3094
" branch::"
3548
3095
msgstr ""
3549
3096
3550
#: bzrlib/builtins.py:4904
3551
msgid " bzr missing --my-revision ..-10"
3552
msgstr " bzr missing --my-revision ..-10"
3097
#: breezy/builtins.py:4902
3098
msgid " brz missing --my-revision ..-10"
3099
msgstr ""
3553
3100
3554
#: bzrlib/builtins.py:4911
3101
# help of 'reverse' option of 'missing' command
3102
#: breezy/builtins.py:4909
3555
3103
msgid "Reverse the order of revisions."
3556
msgstr "リビジョンの表示順を逆転する。"
3104
msgstr ""
3557
3105
3558
#: bzrlib/builtins.py:4913
3106
# help of 'mine-only' option of 'missing' command
3107
#: breezy/builtins.py:4911
3559
3108
msgid "Display changes in the local branch only."
3560
msgstr "ローカルブランチの変更のみを表示する。"
3109
msgstr ""
3561
3110
3562
#: bzrlib/builtins.py:4914
3111
# help of 'this' option of 'missing' command
3112
#: breezy/builtins.py:4912
3563
3113
msgid "Same as --mine-only."
3564
msgstr "--mine-onlyと同じ。"
3114
msgstr ""
3565
3115
3566
#: bzrlib/builtins.py:4916
3116
# help of 'theirs-only' option of 'missing' command
3117
#: breezy/builtins.py:4914
3567
3118
msgid "Display changes in the remote branch only."
3568
msgstr "リモートブランチの変更のみを表示する。"
3119
msgstr ""
3569
3120
3570
#: bzrlib/builtins.py:4917
3121
# help of 'other' option of 'missing' command
3122
#: breezy/builtins.py:4915
3571
3123
msgid "Same as --theirs-only."
3572
msgstr "--theirs-onlyと同じ。"
3124
msgstr ""
3573
3125
3574
#: bzrlib/builtins.py:4922
3126
# help of 'revision' option of 'missing' command
3127
#: breezy/builtins.py:4920
3575
3128
msgid ""
3576
3129
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3577
3130
"details."
3578
3131
msgstr ""
3579
3132
3580
#: bzrlib/builtins.py:4926
3133
# help of 'my-revision' option of 'missing' command
3134
#: breezy/builtins.py:4924
3581
3135
msgid ""
3582
3136
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3583
3137
"details."
3584
3138
msgstr ""
3585
3139
3586
#: bzrlib/builtins.py:4929
3140
# help of 'include-merged' option of 'missing' command
3141
#: breezy/builtins.py:4927
3587
3142
msgid "Show all revisions in addition to the mainline ones."
3588
3143
msgstr ""
3589
3144
3590
#: bzrlib/builtins.py:4983
3145
#: breezy/builtins.py:4981
3591
3146
msgid "No peer location known or specified."
3592
3147
msgstr ""
3593
3148
3594
#: bzrlib/builtins.py:4987
3149
#: breezy/builtins.py:4985
3150
#, python-brace-format
3595
3151
msgid "Using saved parent location: {0}\n"
3596
msgstr "保存済みの親ロケーションを使用する: {0}\n"
3152
msgstr ""
3597
3153
3598
#: bzrlib/builtins.py:5020
3154
#: breezy/builtins.py:5018
3599
3155
#, python-format
3600
3156
msgid "You have %d extra revision:\n"
3601
3157
msgid_plural "You have %d extra revisions:\n"
3602
3158
msgstr[0] ""
3603
3159
msgstr[1] ""
3604
3160
3605
#: bzrlib/builtins.py:5040
3161
#: breezy/builtins.py:5038
3606
3162
#, python-format
3607
3163
msgid "You are missing %d revision:\n"
3608
3164
msgid_plural "You are missing %d revisions:\n"
3609
3165
msgstr[0] ""
3610
3166
msgstr[1] ""
3611
3167
3612
#: bzrlib/builtins.py:5055
3168
#: breezy/builtins.py:5053
3613
3169
msgid "This branch has no new revisions.\n"
3614
msgstr "このブランチには新しいリビジョンはありません。\n"
3170
msgstr ""
3615
3171
3616
#: bzrlib/builtins.py:5058
3172
#: breezy/builtins.py:5056
3617
3173
msgid "Other branch has no new revisions.\n"
3618
msgstr "他のブランチには新しいリビジョンはありません。\n"
3174
msgstr ""
3619
3175
3620
#: bzrlib/builtins.py:5063
3176
#: breezy/builtins.py:5061
3621
3177
msgid "Branches are up to date.\n"
3622
msgstr "ブランチは最新です。\n"
3178
msgstr ""
3623
3179
3624
#: bzrlib/builtins.py:5074
3180
#: breezy/builtins.py:5072
3625
3181
msgid "Compress the data within a repository."
3626
msgstr "リポジトリ内のデータを圧縮する。"
3182
msgstr ""
3627
3183
3628
#: bzrlib/builtins.py:5076
3184
#: breezy/builtins.py:5074
3629
3185
msgid ""
3630
3186
"This operation compresses the data within a bazaar repository. As\n"
3631
3187
"bazaar supports automatic packing of repository, this operation is\n"
3632
3188
"normally not required to be done manually."
3633
3189
msgstr ""
3634
"この操作では bazaar リポジトリ内のデータを圧縮します。\n"
3635
"Bazaar はリポジトリの自動パック機能を備えているため、\n"
3636
"通常はこの操作を手動で行う必要はありません。"
3637
3190
3638
#: bzrlib/builtins.py:5080
3191
#: breezy/builtins.py:5078
3639
3192
msgid ""
3640
3193
"During the pack operation, bazaar takes a backup of existing repository\n"
3641
3194
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3643
3196
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3644
3197
"used."
3645
3198
msgstr ""
3646
"パック操作中に bazaar は既存のリポジトリデータ、\n"
3647
"すなわちパックファイルのバックアップをとります。\n"
3648
"このバックアップは安全に削除できるようになると、\n"
3649
"bazaar によって最終的には自動的に削除されます。\n"
3650
"バックアップされたパックファイルを削除し、\n"
3651
"ディスク容量を節約したい場合には --clean-obsolete-packs\n"
3652
"オプションをご利用ください。"
3653
3199
3654
#: bzrlib/builtins.py:5086
3200
#: breezy/builtins.py:5084
3655
3201
msgid ""
3656
3202
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3657
3203
"during or immediately after repacking, you may be left with a state\n"
3658
3204
"where the deletion has been written to disk but the new packs have not\n"
3659
3205
"been. In this case the repository may be unusable."
3660
3206
msgstr ""
3661
"警告: --clean-obsolete-packs を使っている最中、\n"
3662
"もしくは再パック直後にマシンがクラッシュした\n"
3663
"場合、削除結果はディスクに書き込まれたものの、\n"
3664
"新しいパックが書き込まれていない状態になって\n"
3665
"しまいます。この場合にはリポジトリは使用不可能と\n"
3666
"なってしまいます。"
3667
3207
3668
#: bzrlib/builtins.py:5095
3208
# help of 'clean-obsolete-packs' option of 'pack' command
3209
#: breezy/builtins.py:5093
3669
3210
msgid "Delete obsolete packs to save disk space."
3670
msgstr "古いパックファイルを削除し、ディスク容量を節約する。"
3211
msgstr ""
3671
3212
3672
#: bzrlib/builtins.py:5109
3213
#: breezy/builtins.py:5107
3673
3214
msgid "List the installed plugins."
3674
msgstr "インストールされたプラグインの一覧を表示する。"
3215
msgstr ""
3675
3216
3676
#: bzrlib/builtins.py:5111
3217
#: breezy/builtins.py:5109
3677
3218
msgid ""
3678
3219
"This command displays the list of installed plugins including\n"
3679
3220
"version of plugin and a short description of each."
3680
3221
msgstr ""
3681
"このコマンドは インストールされたプラグインの一覧を簡単な説明や\n"
3682
"バージョン情報とともに表示します。"
3683
3222
3684
#: bzrlib/builtins.py:5114
3223
#: breezy/builtins.py:5112
3685
3224
msgid "--verbose shows the path where each plugin is located."
3686
msgstr "--verboseを指定すると各プラグインのインストール先のパスが表示されます。"
3225
msgstr ""
3687
3226
3688
#: bzrlib/builtins.py:5116
3227
#: breezy/builtins.py:5114
3689
3228
msgid ""
3690
3229
"A plugin is an external component for Bazaar that extends the\n"
3691
3230
"revision control system, by adding or replacing code in Bazaar.\n"
3694
3233
"customizing log output."
3695
3234
msgstr ""
3696
3235
3697
#: bzrlib/builtins.py:5122
3236
#: breezy/builtins.py:5120
3698
3237
msgid ""
3699
3238
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3700
3239
"for further information on plugins including where to find them and how to\n"
3702
3241
"plugins using the Python programming language."
3703
3242
msgstr ""
3704
3243
3705
#: bzrlib/builtins.py:5138
3244
#: breezy/builtins.py:5136
3706
3245
msgid "Show testament (signing-form) of a revision."
3707
3246
msgstr ""
3708
3247
3709
#: bzrlib/builtins.py:5141
3248
# help of 'long' option of 'testament' command
3249
#: breezy/builtins.py:5139
3710
3250
msgid "Produce long-format testament."
3711
3251
msgstr ""
3712
3252
3713
#: bzrlib/builtins.py:5143
3253
# help of 'strict' option of 'testament' command
3254
#: breezy/builtins.py:5141
3714
3255
msgid "Produce a strict-format testament."
3715
3256
msgstr ""
3716
3257
3717
#: bzrlib/builtins.py:5169
3258
#: breezy/builtins.py:5168
3718
3259
msgid "Show the origin of each line in a file."
3719
3260
msgstr ""
3720
3261
3721
#: bzrlib/builtins.py:5171
3262
#: breezy/builtins.py:5170
3722
3263
msgid ""
3723
3264
"This prints out the given file with an annotation on the left side\n"
3724
3265
"indicating which revision, author and date introduced the change."
3725
3266
msgstr ""
3726
3267
3727
#: bzrlib/builtins.py:5174
3268
#: breezy/builtins.py:5173
3728
3269
msgid ""
3729
3270
"If the origin is the same for a run of consecutive lines, it is\n"
3730
3271
"shown only at the top, unless the --all option is given."
3731
3272
msgstr ""
3732
3273
3733
#: bzrlib/builtins.py:5182
3274
# help of 'all' option of 'annotate' command
3275
#: breezy/builtins.py:5181
3734
3276
msgid "Show annotations on all lines."
3735
3277
msgstr ""
3736
3278
3737
#: bzrlib/builtins.py:5183
3279
# help of 'long' option of 'annotate' command
3280
#: breezy/builtins.py:5182
3738
3281
msgid "Show commit date in annotations."
3739
3282
msgstr ""
3740
3283
3741
#: bzrlib/builtins.py:5270
3284
#: breezy/builtins.py:5269
3742
3285
msgid "Cannot sign a range of non-revision-history revisions"
3743
3286
msgstr ""
3744
3287
3745
#: bzrlib/builtins.py:5282
3288
#: breezy/builtins.py:5281
3746
3289
msgid "Please supply either one revision, or a range."
3747
3290
msgstr ""
3748
3291
3749
#: bzrlib/builtins.py:5286
3292
#: breezy/builtins.py:5285
3750
3293
msgid ""
3751
3294
"Convert the current branch into a checkout of the supplied branch.\n"
3752
3295
"If no branch is supplied, rebind to the last bound location."
3753
3296
msgstr ""
3754
3297
3755
#: bzrlib/builtins.py:5289
3298
#: breezy/builtins.py:5288
3756
3299
msgid ""
3757
3300
"Once converted into a checkout, commits must succeed on the master branch\n"
3758
3301
"before they will be applied to the local branch."
3759
3302
msgstr ""
3760
3303
3761
#: bzrlib/builtins.py:5292
3304
#: breezy/builtins.py:5291
3762
3305
msgid ""
3763
3306
"Bound branches use the nickname of its master branch unless it is set\n"
3764
3307
"locally, in which case binding will update the local nickname to be\n"
3765
3308
"that of the master."
3766
3309
msgstr ""
3767
3310
3768
#: bzrlib/builtins.py:5307
3311
#: breezy/builtins.py:5306
3769
3312
msgid "No location supplied. This format does not remember old locations."
3770
3313
msgstr ""
3771
3314
3772
#: bzrlib/builtins.py:5313
3315
#: breezy/builtins.py:5312
3773
3316
msgid "Branch is already bound"
3774
3317
msgstr ""
3775
3318
3776
#: bzrlib/builtins.py:5316
3319
#: breezy/builtins.py:5315
3777
3320
msgid "No location supplied and no previous location known"
3778
3321
msgstr ""
3779
3322
3780
#: bzrlib/builtins.py:5322
3323
#: breezy/builtins.py:5321
3781
3324
msgid "These branches have diverged. Try merging, and then bind again."
3782
3325
msgstr ""
3783
3326
3784
#: bzrlib/builtins.py:5329
3327
#: breezy/builtins.py:5328
3785
3328
msgid "Convert the current checkout into a regular branch."
3786
3329
msgstr ""
3787
3330
3788
#: bzrlib/builtins.py:5331
3331
#: breezy/builtins.py:5330
3789
3332
msgid ""
3790
3333
"After unbinding, the local branch is considered independent and subsequent\n"
3791
3334
"commits will be local only."
3792
3335
msgstr ""
3793
3336
3794
#: bzrlib/builtins.py:5342
3337
#: breezy/builtins.py:5341
3795
3338
msgid "Local branch is not bound"
3796
3339
msgstr ""
3797
3340
3798
#: bzrlib/builtins.py:5346
3341
#: breezy/builtins.py:5345
3799
3342
msgid "Remove the last committed revision."
3800
3343
msgstr ""
3801
3344
3802
#: bzrlib/builtins.py:5348
3345
#: breezy/builtins.py:5347
3803
3346
msgid ""
3804
3347
"--verbose will print out what is being removed.\n"
3805
3348
"--dry-run will go through all the motions, but not actually\n"
3806
3349
"remove anything."
3807
3350
msgstr ""
3808
3351
3809
#: bzrlib/builtins.py:5352
3352
#: breezy/builtins.py:5351
3810
3353
msgid ""
3811
3354
"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"
3355
"specified revision. For example, \"brz uncommit -r 15\" will leave the\n"
3813
3356
"branch at revision 15."
3814
3357
msgstr ""
3815
3358
3816
#: bzrlib/builtins.py:5356
3359
#: breezy/builtins.py:5355
3817
3360
msgid ""
3818
3361
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3819
3362
"it may make is to restore any pending merges that were present before\n"
3820
3363
"the commit."
3821
3364
msgstr ""
3822
3365
3823
#: bzrlib/builtins.py:5367
3366
# help of 'dry-run' option of 'uncommit' command
3367
#: breezy/builtins.py:5366
3824
3368
msgid "Don't actually make changes."
3825
3369
msgstr ""
3826
3370
3827
#: bzrlib/builtins.py:5368
3371
# help of 'force' option of 'uncommit' command
3372
#: breezy/builtins.py:5367
3828
3373
msgid "Say yes to all questions."
3829
3374
msgstr ""
3830
3375
3831
#: bzrlib/builtins.py:5370
3376
# help of 'keep-tags' option of 'uncommit' command
3377
#: breezy/builtins.py:5369
3832
3378
msgid "Keep tags that point to removed revisions."
3833
3379
msgstr ""
3834
3380
3835
#: bzrlib/builtins.py:5372
3381
# help of 'local' option of 'uncommit' command
3382
#: breezy/builtins.py:5371
3836
3383
msgid "Only remove the commits from the local branch when in a checkout."
3837
3384
msgstr ""
3838
3385
3839
#: bzrlib/builtins.py:5421
3386
#: breezy/builtins.py:5420
3840
3387
msgid "No revisions to uncommit.\n"
3841
3388
msgstr ""
3842
3389
3843
#: bzrlib/builtins.py:5436
3390
#: breezy/builtins.py:5435
3844
3391
msgid "Dry-run, pretending to remove the above revisions.\n"
3845
3392
msgstr ""
3846
3393
3847
#: bzrlib/builtins.py:5439
3394
#: breezy/builtins.py:5438
3848
3395
msgid "The above revision(s) will be removed.\n"
3849
3396
msgstr ""
3850
3397
3851
#: bzrlib/builtins.py:5443
3398
#: breezy/builtins.py:5442
3852
3399
msgid "Uncommit these revisions"
3853
3400
msgstr ""
3854
3401
3855
#: bzrlib/builtins.py:5446
3402
#: breezy/builtins.py:5445
3856
3403
msgid "Canceled\n"
3857
3404
msgstr ""
3858
3405
3859
#: bzrlib/builtins.py:5453
3406
#: breezy/builtins.py:5452
3860
3407
#, python-format
3861
3408
msgid ""
3862
3409
"You can restore the old tip by running:\n"
3863
" bzr pull . -r revid:%s\n"
3410
" brz pull . -r revid:%s\n"
3864
3411
msgstr ""
3865
3412
3866
#: bzrlib/builtins.py:5458
3413
#: breezy/builtins.py:5457
3867
3414
msgid "Break a dead lock."
3868
3415
msgstr ""
3869
3416
3870
#: bzrlib/builtins.py:5460
3417
#: breezy/builtins.py:5459
3871
3418
msgid ""
3872
3419
"This command breaks a lock on a repository, branch, working directory or\n"
3873
3420
"config file."
3874
3421
msgstr ""
3875
3422
3876
#: bzrlib/builtins.py:5463
3423
#: breezy/builtins.py:5462
3877
3424
msgid ""
3878
3425
"CAUTION: Locks should only be broken when you are sure that the process\n"
3879
3426
"holding the lock has been stopped."
3880
3427
msgstr ""
3881
3428
3882
#: bzrlib/builtins.py:5466
3429
#: breezy/builtins.py:5465
3883
3430
msgid ""
3884
"You can get information on what locks are open via the 'bzr info\n"
3431
"You can get information on what locks are open via the 'brz info\n"
3885
3432
"[location]' command."
3886
3433
msgstr ""
3887
3434
3888
#: bzrlib/builtins.py:5469
3435
#: breezy/builtins.py:5468
3889
3436
msgid ""
3890
3437
":Examples:\n"
3891
" bzr break-lock\n"
3892
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3893
" bzr break-lock --conf ~/.bazaar"
3438
" brz break-lock\n"
3439
" brz break-lock brz+ssh://example.com/brz/foo\n"
3440
" brz break-lock --conf ~/.bazaar"
3894
3441
msgstr ""
3895
3442
3896
#: bzrlib/builtins.py:5478
3443
# help of 'config' option of 'break-lock' command
3444
#: breezy/builtins.py:5477
3897
3445
msgid "LOCATION is the directory where the config lock is."
3898
3446
msgstr ""
3899
3447
3900
#: bzrlib/builtins.py:5480
3448
# help of 'force' option of 'break-lock' command
3449
#: breezy/builtins.py:5479
3901
3450
msgid "Do not ask for confirmation before breaking the lock."
3902
3451
msgstr ""
3903
3452
3904
#: bzrlib/builtins.py:5515
3453
# help of 'protocol=bzr' option of 'serve' command
3454
#: breezy/builtins.py:5514
3905
3455
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3906
3456
msgstr ""
3907
3457
3908
#: bzrlib/builtins.py:5516
3909
msgid "Run the bzr server."
3458
#: breezy/builtins.py:5515
3459
msgid "Run the brz server."
3910
3460
msgstr ""
3911
3461
3912
#: bzrlib/builtins.py:5522
3462
# help of 'inet' option of 'serve' command
3463
#: breezy/builtins.py:5521
3913
3464
msgid "Serve on stdin/out for use from inetd or sshd."
3914
3465
msgstr ""
3915
3466
3916
#: bzrlib/builtins.py:5523
3467
# title of 'protocol' option of 'serve' command
3468
#: breezy/builtins.py:5522
3917
3469
msgid "protocol"
3918
3470
msgstr ""
3919
3471
3920
#: bzrlib/builtins.py:5524
3472
# help of 'protocol' option of 'serve' command
3473
#: breezy/builtins.py:5523
3921
3474
msgid "Protocol to serve."
3922
3475
msgstr ""
3923
3476
3924
#: bzrlib/builtins.py:5528
3477
# help of 'listen' option of 'serve' command
3478
#: breezy/builtins.py:5527
3925
3479
msgid "Listen for connections on nominated address."
3926
3480
msgstr ""
3927
3481
3928
#: bzrlib/builtins.py:5530
3482
# help of 'port' option of 'serve' command
3483
#: breezy/builtins.py:5529
3929
3484
msgid ""
3930
3485
"Listen for connections on nominated port. Passing 0 as the port number will "
3931
3486
"result in a dynamically allocated port. The default port depends on the "
3932
3487
"protocol."
3933
3488
msgstr ""
3934
3489
3935
#: bzrlib/builtins.py:5535
3490
# help of 'directory' option of 'serve' command
3491
#: breezy/builtins.py:5534
3936
3492
msgid "Serve contents of this directory."
3937
3493
msgstr ""
3938
3494
3939
#: bzrlib/builtins.py:5537
3495
# help of 'allow-writes' option of 'serve' command
3496
#: breezy/builtins.py:5536
3940
3497
msgid ""
3941
3498
"By default the server is a readonly server. Supplying --allow-writes "
3942
3499
"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 "
3500
"Note that ``brz serve`` does not perform authentication, so unless some form "
3944
3501
"of external authentication is arranged supplying this option leads to global "
3945
3502
"uncontrolled write access to your file system."
3946
3503
msgstr ""
3947
3504
3948
#: bzrlib/builtins.py:5546
3505
# help of 'client-timeout' option of 'serve' command
3506
#: breezy/builtins.py:5545
3949
3507
msgid "Override the default idle client timeout (5min)."
3950
3508
msgstr ""
3951
3509
3952
#: bzrlib/builtins.py:5564
3510
#: breezy/builtins.py:5563
3953
3511
msgid "Combine a tree into its containing tree."
3954
3512
msgstr ""
3955
3513
3956
#: bzrlib/builtins.py:5566
3514
#: breezy/builtins.py:5565
3957
3515
msgid "This command requires the target tree to be in a rich-root format."
3958
3516
msgstr ""
3959
3517
3960
#: bzrlib/builtins.py:5568
3518
#: breezy/builtins.py:5567
3961
3519
msgid ""
3962
3520
"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.)"
3521
"not part of it. (Such trees can be produced by \"brz split\", but also by\n"
3522
"running \"brz branch\" with the target inside a tree.)"
3965
3523
msgstr ""
3966
3524
3967
#: bzrlib/builtins.py:5572
3525
#: breezy/builtins.py:5571
3968
3526
msgid ""
3969
3527
"The result is a combined tree, with the subtree no longer an independent\n"
3970
3528
"part. This is marked as a merge of the subtree into the containing tree,\n"
3971
3529
"and all history is preserved."
3972
3530
msgstr ""
3973
3531
3974
#: bzrlib/builtins.py:5590
3532
#: breezy/builtins.py:5589
3975
3533
#, python-format
3976
3534
msgid ""
3977
3535
"Can't join trees because %s doesn't support rich root data.\n"
3978
"You can use bzr upgrade on the repository."
3536
"You can use brz upgrade on the repository."
3979
3537
msgstr ""
3980
3538
3981
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3539
#: breezy/builtins.py:5599 breezy/builtins.py:5605
3540
#, python-brace-format
3982
3541
msgid "Cannot join {0}. {1}"
3983
3542
msgstr ""
3984
3543
3985
#: bzrlib/builtins.py:5610
3544
#: breezy/builtins.py:5609
3986
3545
msgid "Split a subdirectory of a tree into a separate tree."
3987
3546
msgstr ""
3988
3547
3989
#: bzrlib/builtins.py:5612
3548
#: breezy/builtins.py:5611
3990
3549
msgid ""
3991
3550
"This command will produce a target tree in a format that supports\n"
3992
3551
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3993
3552
"converted into earlier formats like 'dirstate-tags'."
3994
3553
msgstr ""
3995
3554
3996
#: bzrlib/builtins.py:5616
3555
#: breezy/builtins.py:5615
3997
3556
msgid ""
3998
3557
"The TREE argument should be a subdirectory of a working tree. That\n"
3999
3558
"subdirectory will be converted into an independent tree, with its own\n"
4000
3559
"branch. Commits in the top-level tree will not apply to the new subtree."
4001
3560
msgstr ""
4002
3561
4003
#: bzrlib/builtins.py:5696
3562
#: breezy/builtins.py:5695
4004
3563
msgid "No submit branch specified or known"
4005
3564
msgstr ""
4006
3565
4007
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3566
#: breezy/builtins.py:5704 breezy/send.py:109
4008
3567
msgid "No public branch specified or known"
4009
3568
msgstr ""
4010
3569
4011
#: bzrlib/builtins.py:5710
4012
msgid "bzr merge-directive takes at most two one revision identifiers"
3570
#: breezy/builtins.py:5709
3571
msgid "brz merge-directive takes at most two one revision identifiers"
4013
3572
msgstr ""
4014
3573
4015
#: bzrlib/builtins.py:5719
3574
#: breezy/builtins.py:5718
4016
3575
msgid "No revisions to bundle."
4017
3576
msgstr ""
4018
3577
4019
#: bzrlib/builtins.py:5738
3578
#: breezy/builtins.py:5737
4020
3579
msgid "Mail or create a merge-directive for submitting changes."
4021
3580
msgstr ""
4022
3581
4023
#: bzrlib/builtins.py:5740
3582
#: breezy/builtins.py:5739
4024
3583
msgid "A merge directive provides many things needed for requesting merges:"
4025
3584
msgstr ""
4026
3585
4027
#: bzrlib/builtins.py:5742
3586
#: breezy/builtins.py:5741
4028
3587
msgid "* A machine-readable description of the merge to perform"
4029
3588
msgstr ""
4030
3589
4031
#: bzrlib/builtins.py:5744
3590
#: breezy/builtins.py:5743
4032
3591
msgid "* An optional patch that is a preview of the changes requested"
4033
3592
msgstr ""
4034
3593
4035
#: bzrlib/builtins.py:5746
3594
#: breezy/builtins.py:5745
4036
3595
msgid ""
4037
3596
"* An optional bundle of revision data, so that the changes can be applied\n"
4038
3597
" directly from the merge directive, without retrieving data from a\n"
4039
3598
" branch."
4040
3599
msgstr ""
4041
3600
4042
#: bzrlib/builtins.py:5750
3601
#: breezy/builtins.py:5749
4043
3602
msgid ""
4044
"`bzr send` creates a compact data set that, when applied using bzr\n"
3603
"`brz send` creates a compact data set that, when applied using brz\n"
4045
3604
"merge, has the same effect as merging from the source branch. "
4046
3605
msgstr ""
4047
3606
4048
#: bzrlib/builtins.py:5753
3607
#: breezy/builtins.py:5752
4049
3608
msgid ""
4050
3609
"By default the merge directive is self-contained and can be applied to any\n"
4051
3610
"branch containing submit_branch in its ancestory without needing access to\n"
4052
3611
"the source branch."
4053
3612
msgstr ""
4054
3613
4055
#: bzrlib/builtins.py:5757
3614
#: breezy/builtins.py:5756
4056
3615
msgid ""
4057
3616
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4058
3617
"revisions, but only a structured request to merge from the\n"
4061
3620
"included if known, so that people can check it later."
4062
3621
msgstr ""
4063
3622
4064
#: bzrlib/builtins.py:5763
3623
#: breezy/builtins.py:5762
4065
3624
msgid ""
4066
3625
"The submit branch defaults to the parent of the source branch, but can be\n"
4067
3626
"overridden. Both submit branch and public branch will be remembered in\n"
4070
3629
"be changed using --from."
4071
3630
msgstr ""
4072
3631
4073
#: bzrlib/builtins.py:5769
3632
#: breezy/builtins.py:5768
4074
3633
msgid ""
4075
3634
"Both the submit branch and the public branch follow the usual behavior with\n"
4076
3635
"respect to --remember: If there is no default location set, the first send\n"
4079
3638
"--remember. The value will only be saved if the location can be accessed."
4080
3639
msgstr ""
4081
3640
4082
#: bzrlib/builtins.py:5775
3641
#: breezy/builtins.py:5774
4083
3642
msgid ""
4084
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3643
"In order to calculate those changes, brz must analyse the submit branch.\n"
4085
3644
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4086
3645
"If a public location is known for the submit_branch, that location is used\n"
4087
3646
"in the merge directive."
4088
3647
msgstr ""
4089
3648
4090
#: bzrlib/builtins.py:5780
3649
#: breezy/builtins.py:5779
4091
3650
msgid ""
4092
3651
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4093
3652
"given, in which case it is sent to a file."
4094
3653
msgstr ""
4095
3654
4096
#: bzrlib/builtins.py:5783
3655
#: breezy/builtins.py:5782
4097
3656
msgid ""
4098
3657
"Mail is sent using your preferred mail program. This should be transparent\n"
4099
3658
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4100
3659
"If the preferred client can't be found (or used), your editor will be used."
4101
3660
msgstr ""
4102
3661
4103
#: bzrlib/builtins.py:5787
3662
#: breezy/builtins.py:5786
4104
3663
msgid ""
4105
3664
"To use a specific mail program, set the mail_client configuration option.\n"
4106
3665
"(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"
3666
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
3667
"\" (MacOS X's\n"
4109
3668
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
4110
3669
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
4111
3670
"add\n"
4112
3671
"supported clients."
4113
3672
msgstr ""
4114
3673
4115
#: bzrlib/builtins.py:5794
3674
#: breezy/builtins.py:5793
4116
3675
msgid ""
4117
3676
"If mail is being sent, a to address is required. This can be supplied\n"
4118
3677
"either on the commandline, by setting the submit_to configuration\n"
4120
3679
"in the submit branch."
4121
3680
msgstr ""
4122
3681
4123
#: bzrlib/builtins.py:5799
3682
#: breezy/builtins.py:5798
4124
3683
msgid ""
4125
3684
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4126
3685
"and\n"
4130
3689
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4131
3690
msgstr ""
4132
3691
4133
#: bzrlib/builtins.py:5805
3692
#: breezy/builtins.py:5804
4134
3693
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."
3694
"The merge directives created by brz send may be applied using brz merge or\n"
3695
"brz pull by specifying a file containing a merge directive as the location."
4137
3696
msgstr ""
4138
3697
4139
#: bzrlib/builtins.py:5808
3698
#: breezy/builtins.py:5807
4140
3699
msgid ""
4141
"bzr send makes extensive use of public locations to map local locations "
3700
"brz send makes extensive use of public locations to map local locations "
4142
3701
"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."
3702
"URLs that can be used by other people. See `brz help configuration` to\n"
3703
"set them, and use `brz info` to display them."
4145
3704
msgstr ""
4146
3705
4147
#: bzrlib/builtins.py:5832
3706
# help of 'output' option of 'send' command
3707
#: breezy/builtins.py:5831
4148
3708
msgid "Write merge directive to this file or directory; use - for stdout."
4149
3709
msgstr ""
4150
3710
4151
#: bzrlib/builtins.py:5836
3711
# help of 'strict' option of 'send' command
3712
#: breezy/builtins.py:5835
4152
3713
msgid ""
4153
3714
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4154
3715
"strict disables the check."
4155
3716
msgstr ""
4156
3717
4157
#: bzrlib/builtins.py:5838
3718
# help of 'mail-to' option of 'send' command
3719
#: breezy/builtins.py:5837
4158
3720
msgid "Mail the request to this address."
4159
3721
msgstr ""
4160
3722
4161
#: bzrlib/builtins.py:5842
3723
# help of 'body' option of 'send' command
3724
#: breezy/builtins.py:5841
4162
3725
msgid "Body for the email."
4163
3726
msgstr ""
4164
3727
4165
#: bzrlib/builtins.py:5895
3728
# help of 'no-bundle' option of 'send' command
3729
#: breezy/builtins.py:5894
4166
3730
msgid "Do not include a bundle in the merge directive."
4167
3731
msgstr ""
4168
3732
4169
#: bzrlib/builtins.py:5896
3733
# help of 'no-patch' option of 'send' command
3734
#: breezy/builtins.py:5895
4170
3735
msgid "Do not include a preview patch in the merge directive."
4171
3736
msgstr ""
4172
3737
4173
#: bzrlib/builtins.py:5899
3738
# help of 'remember' option of 'send' command
3739
#: breezy/builtins.py:5898
4174
3740
msgid "Remember submit and public branch."
4175
3741
msgstr ""
4176
3742
4177
#: bzrlib/builtins.py:5901
3743
# help of 'from' option of 'send' command
3744
#: breezy/builtins.py:5900
4178
3745
msgid ""
4179
3746
"Branch to generate the submission from, rather than the one containing the "
4180
3747
"working directory."
4181
3748
msgstr ""
4182
3749
4183
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3750
# title of 'format' option of 'send' command
3751
# title of 'format' option of 'version-info' command
3752
#: breezy/builtins.py:5910 breezy/cmd_version_info.py:76
4184
3753
msgid "format"
4185
3754
msgstr ""
4186
3755
4187
#: bzrlib/builtins.py:5912
3756
# help of 'format' option of 'send' command
3757
#: breezy/builtins.py:5911
4188
3758
msgid "Use the specified output format."
4189
3759
msgstr ""
4190
3760
4191
#: bzrlib/builtins.py:5934
3761
#: breezy/builtins.py:5933
4192
3762
msgid "Create, remove or modify a tag naming a revision."
4193
3763
msgstr ""
4194
3764
4195
#: bzrlib/builtins.py:5936
3765
#: breezy/builtins.py:5935
4196
3766
msgid ""
4197
3767
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4198
3768
"(--revision) option can be given -rtag:X, where X is any previously\n"
4199
3769
"created tag."
4200
3770
msgstr ""
4201
3771
4202
#: bzrlib/builtins.py:5940
3772
#: breezy/builtins.py:5939
4203
3773
msgid ""
4204
3774
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4205
3775
"along when you branch, push, pull or merge."
4206
3776
msgstr ""
4207
3777
4208
#: bzrlib/builtins.py:5943
3778
#: breezy/builtins.py:5942
4209
3779
msgid ""
4210
3780
"It is an error to give a tag name that already exists unless you pass\n"
4211
3781
"--force, in which case the tag is moved to point to the new revision."
4212
3782
msgstr ""
4213
3783
4214
#: bzrlib/builtins.py:5946
3784
#: breezy/builtins.py:5945
4215
3785
msgid ""
4216
3786
"To rename a tag (change the name but keep it on the same revsion), run "
4217
3787
"``bzr\n"
4218
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3788
"tag new-name -r tag:old-name`` and then ``brz tag --delete oldname``."
4219
3789
msgstr ""
4220
3790
4221
#: bzrlib/builtins.py:5949
3791
#: breezy/builtins.py:5948
4222
3792
msgid ""
4223
3793
"If no tag name is specified it will be determined through the \n"
4224
3794
"'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"
3795
"upstream releases by reading configure.ac. See ``brz help hooks`` for\n"
4226
3796
"details."
4227
3797
msgstr ""
4228
3798
4229
#: bzrlib/builtins.py:5959
3799
# help of 'delete' option of 'tag' command
3800
#: breezy/builtins.py:5958
4230
3801
msgid "Delete this tag rather than placing it."
4231
3802
msgstr ""
4232
3803
4233
#: bzrlib/builtins.py:5962
3804
# help of 'directory' option of 'tag' command
3805
#: breezy/builtins.py:5961
4234
3806
msgid "Branch in which to place the tag."
4235
3807
msgstr ""
4236
3808
4237
#: bzrlib/builtins.py:5964
3809
# help of 'force' option of 'tag' command
3810
#: breezy/builtins.py:5963
4238
3811
msgid "Replace existing tags."
4239
3812
msgstr ""
4240
3813
4241
#: bzrlib/builtins.py:5979
3814
#: breezy/builtins.py:5978
4242
3815
msgid "No tag specified to delete."
4243
3816
msgstr ""
4244
3817
4245
#: bzrlib/builtins.py:5981
3818
#: breezy/builtins.py:5980
4246
3819
#, python-format
4247
3820
msgid "Deleted tag %s."
4248
3821
msgstr ""
4249
3822
4250
#: bzrlib/builtins.py:5995
3823
#: breezy/builtins.py:5985
3824
msgid "Tags can only be placed on a single revision, not on a range"
3825
msgstr ""
3826
3827
#: breezy/builtins.py:5994
4251
3828
msgid "Please specify a tag name."
4252
3829
msgstr ""
4253
3830
4254
#: bzrlib/builtins.py:6003
3831
#: breezy/builtins.py:6002
4255
3832
#, python-format
4256
3833
msgid "Tag %s already exists for that revision."
4257
3834
msgstr ""
4258
3835
4259
#: bzrlib/builtins.py:6007
3836
#: breezy/builtins.py:6006
4260
3837
#, python-format
4261
3838
msgid "Created tag %s."
4262
3839
msgstr ""
4263
3840
4264
#: bzrlib/builtins.py:6009
3841
#: breezy/builtins.py:6008
4265
3842
#, python-format
4266
3843
msgid "Updated tag %s."
4267
3844
msgstr ""
4268
3845
4269
#: bzrlib/builtins.py:6013
3846
#: breezy/builtins.py:6012
4270
3847
msgid "List tags."
4271
3848
msgstr ""
4272
3849
4273
#: bzrlib/builtins.py:6015
3850
#: breezy/builtins.py:6014
4274
3851
msgid ""
4275
3852
"This command shows a table of tag names and the revisions they reference."
4276
3853
msgstr ""
4277
3854
4278
#: bzrlib/builtins.py:6021
3855
# help of 'directory' option of 'tags' command
3856
#: breezy/builtins.py:6020
4279
3857
msgid "Branch whose tags should be displayed."
4280
3858
msgstr ""
4281
3859
4282
#: bzrlib/builtins.py:6023
3860
# help of 'sort' option of 'tags' command
3861
#: breezy/builtins.py:6022
4283
3862
msgid "Sort tags by different criteria."
4284
3863
msgstr ""
4285
3864
4286
#: bzrlib/builtins.py:6023
3865
# title of 'sort' option of 'tags' command
3866
#: breezy/builtins.py:6022
4287
3867
msgid "Sorting"
4288
3868
msgstr ""
4289
3869
4290
#: bzrlib/builtins.py:6092
4291
msgid "Reconfigure the type of a bzr directory."
3870
#: breezy/builtins.py:6091
3871
msgid "Reconfigure the type of a brz directory."
4292
3872
msgstr ""
4293
3873
4294
#: bzrlib/builtins.py:6094
3874
#: breezy/builtins.py:6093
4295
3875
msgid "A target configuration must be specified."
4296
3876
msgstr ""
4297
3877
4298
#: bzrlib/builtins.py:6096
3878
#: breezy/builtins.py:6095
4299
3879
msgid ""
4300
3880
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4301
3881
"The order of preference is\n"
4306
3886
"If none of these is available, --bind-to must be specified."
4307
3887
msgstr ""
4308
3888
4309
#: bzrlib/builtins.py:6110
3889
# title of 'tree_type' option of 'reconfigure' command
3890
#: breezy/builtins.py:6109
4310
3891
msgid "Tree type"
4311
3892
msgstr ""
4312
3893
4313
#: bzrlib/builtins.py:6111
3894
# help of 'tree_type' option of 'reconfigure' command
3895
#: breezy/builtins.py:6110
4314
3896
msgid "The relation between branch and tree."
4315
3897
msgstr ""
4316
3898
4317
#: bzrlib/builtins.py:6113
3899
# help of 'tree_type=branch' option of 'reconfigure' command
3900
#: breezy/builtins.py:6112
4318
3901
msgid "Reconfigure to be an unbound branch with no working tree."
4319
3902
msgstr ""
4320
3903
4321
#: bzrlib/builtins.py:6114
3904
# help of 'tree_type=tree' option of 'reconfigure' command
3905
#: breezy/builtins.py:6113
4322
3906
msgid "Reconfigure to be an unbound branch with a working tree."
4323
3907
msgstr ""
4324
3908
4325
#: bzrlib/builtins.py:6115
3909
# help of 'tree_type=checkout' option of 'reconfigure' command
3910
#: breezy/builtins.py:6114
4326
3911
msgid "Reconfigure to be a bound branch with a working tree."
4327
3912
msgstr ""
4328
3913
4329
#: bzrlib/builtins.py:6116
3914
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3915
#: breezy/builtins.py:6115
4330
3916
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4331
3917
msgstr ""
4332
3918
4333
#: bzrlib/builtins.py:6121
3919
# title of 'repository_type' option of 'reconfigure' command
3920
#: breezy/builtins.py:6120
4334
3921
msgid "Repository type"
4335
3922
msgstr ""
4336
3923
4337
#: bzrlib/builtins.py:6122
3924
# help of 'repository_type' option of 'reconfigure' command
3925
#: breezy/builtins.py:6121
4338
3926
msgid "Location fo the repository."
4339
3927
msgstr ""
4340
3928
4341
#: bzrlib/builtins.py:6124
3929
# help of 'repository_type=standalone' option of 'reconfigure' command
3930
#: breezy/builtins.py:6123
4342
3931
msgid ""
4343
3932
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4344
3933
msgstr ""
4345
3934
4346
#: bzrlib/builtins.py:6126
3935
# help of 'repository_type=use-shared' option of 'reconfigure' command
3936
#: breezy/builtins.py:6125
4347
3937
msgid "Reconfigure to use a shared repository."
4348
3938
msgstr ""
4349
3939
4350
#: bzrlib/builtins.py:6130
3940
# title of 'repository_trees' option of 'reconfigure' command
3941
#: breezy/builtins.py:6129
4351
3942
msgid "Trees in Repository"
4352
3943
msgstr ""
4353
3944
4354
#: bzrlib/builtins.py:6131
3945
# help of 'repository_trees' option of 'reconfigure' command
3946
#: breezy/builtins.py:6130
4355
3947
msgid "Whether new branches in the repository have trees."
4356
3948
msgstr ""
4357
3949
4358
#: bzrlib/builtins.py:6133
4359
msgid ""
4360
"Reconfigure repository to create working trees on branches by default."
3950
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3951
#: breezy/builtins.py:6132
3952
msgid "Reconfigure repository to create working trees on branches by default."
4361
3953
msgstr ""
4362
3954
4363
#: bzrlib/builtins.py:6135
3955
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3956
#: breezy/builtins.py:6134
4364
3957
msgid ""
4365
3958
"Reconfigure repository to not create working trees on branches by default."
4366
3959
msgstr ""
4367
3960
4368
#: bzrlib/builtins.py:6138
3961
# help of 'bind-to' option of 'reconfigure' command
3962
#: breezy/builtins.py:6137
4369
3963
msgid "Branch to bind checkout to."
4370
3964
msgstr ""
4371
3965
4372
#: bzrlib/builtins.py:6140
3966
# help of 'force' option of 'reconfigure' command
3967
#: breezy/builtins.py:6139
4373
3968
msgid "Perform reconfiguration even if local changes will be lost."
4374
3969
msgstr ""
4375
3970
4376
#: bzrlib/builtins.py:6143
3971
# help of 'stacked-on' option of 'reconfigure' command
3972
#: breezy/builtins.py:6142
4377
3973
msgid "Reconfigure a branch to be stacked on another branch."
4378
3974
msgstr ""
4379
3975
4380
#: bzrlib/builtins.py:6147
3976
# help of 'unstacked' option of 'reconfigure' command
3977
#: breezy/builtins.py:6146
4381
3978
msgid ""
4382
3979
"Reconfigure a branch to be unstacked. This may require copying substantial "
4383
3980
"data into it."
4384
3981
msgstr ""
4385
3982
4386
#: bzrlib/builtins.py:6157
3983
#: breezy/builtins.py:6156
4387
3984
msgid "Can't use both --stacked-on and --unstacked"
4388
3985
msgstr ""
4389
3986
4390
#: bzrlib/builtins.py:6171
3987
#: breezy/builtins.py:6170
4391
3988
msgid "No target configuration specified"
4392
3989
msgstr ""
4393
3990
4394
#: bzrlib/builtins.py:6206
3991
#: breezy/builtins.py:6205
4395
3992
msgid "Set the branch of a checkout and update."
4396
3993
msgstr ""
4397
3994
4398
#: bzrlib/builtins.py:6208
3995
#: breezy/builtins.py:6207
4399
3996
msgid ""
4400
3997
"For lightweight checkouts, this changes the branch being referenced.\n"
4401
3998
"For heavyweight checkouts, this checks that there are no local commits\n"
4403
4000
"of the new location and binds to it."
4404
4001
msgstr ""
4405
4002
4406
#: bzrlib/builtins.py:6213
4003
#: breezy/builtins.py:6212
4407
4004
msgid ""
4408
4005
"In both cases, the working tree is updated and uncommitted changes\n"
4409
4006
"are merged. The user can commit or revert these as they desire."
4410
4007
msgstr ""
4411
4008
4412
#: bzrlib/builtins.py:6216
4009
#: breezy/builtins.py:6215
4413
4010
msgid "Pending merges need to be committed or reverted before using switch."
4414
4011
msgstr ""
4415
4012
4416
#: bzrlib/builtins.py:6218
4013
#: breezy/builtins.py:6217
4417
4014
msgid ""
4418
4015
"The path to the branch to switch to can be specified relative to the parent\n"
4419
4016
"directory of the current branch. For example, if you are currently in a\n"
4421
4018
"/path/to/newbranch."
4422
4019
msgstr ""
4423
4020
4424
#: bzrlib/builtins.py:6223
4021
#: breezy/builtins.py:6222
4425
4022
msgid ""
4426
4023
"Bound branches use the nickname of its master branch unless it is set\n"
4427
4024
"locally, in which case switching will update the local nickname to be\n"
4428
4025
"that of the master."
4429
4026
msgstr ""
4430
4027
4431
#: bzrlib/builtins.py:6231
4028
# help of 'force' option of 'switch' command
4029
#: breezy/builtins.py:6230
4432
4030
msgid "Switch even if local commits will be lost."
4433
4031
msgstr ""
4434
4032
4435
#: bzrlib/builtins.py:6234
4033
# help of 'create-branch' option of 'switch' command
4034
#: breezy/builtins.py:6233
4436
4035
msgid "Create the target branch from this one before switching to it."
4437
4036
msgstr ""
4438
4037
4439
#: bzrlib/builtins.py:6248
4038
# help of 'store' option of 'switch' command
4039
#: breezy/builtins.py:6236
4040
msgid "Store and restore uncommitted changes in the branch."
4041
msgstr ""
4042
4043
#: breezy/builtins.py:6250
4440
4044
msgid "You must supply either a revision or a location"
4441
4045
msgstr ""
4442
4046
4443
#: bzrlib/builtins.py:6261
4047
#: breezy/builtins.py:6263
4444
4048
msgid "cannot create branch without source branch"
4445
4049
msgstr ""
4446
4050
4447
#: bzrlib/builtins.py:6286
4051
#: breezy/builtins.py:6289
4448
4052
msgid "Manage filtered views."
4449
4053
msgstr ""
4450
4054
4451
#: bzrlib/builtins.py:6288
4055
#: breezy/builtins.py:6291
4452
4056
msgid ""
4453
4057
"Views provide a mask over the tree so that users can focus on\n"
4454
4058
"a subset of a tree when doing their work. After creating a view,\n"
4458
4062
"must be within the current view."
4459
4063
msgstr ""
4460
4064
4461
#: bzrlib/builtins.py:6295
4065
#: breezy/builtins.py:6298
4462
4066
msgid ""
4463
4067
"In most cases, a view has a short life-span: it is created to make\n"
4464
4068
"a selected change and is deleted once that change is committed.\n"
4466
4070
"and switch between them."
4467
4071
msgstr ""
4468
4072
4469
#: bzrlib/builtins.py:6300
4073
#: breezy/builtins.py:6303
4470
4074
msgid ""
4471
4075
"To disable the current view without deleting it, you can switch to\n"
4472
4076
"the pseudo view called ``off``. This can be useful when you need\n"
4474
4078
"want to switch back to your view after that."
4475
4079
msgstr ""
4476
4080
4477
#: bzrlib/builtins.py:6305
4081
#: breezy/builtins.py:6308
4478
4082
msgid ""
4479
4083
":Examples:\n"
4480
4084
" To define the current view::"
4481
4085
msgstr ""
4482
4086
4483
#: bzrlib/builtins.py:6308
4484
msgid " bzr view file1 dir1 ..."
4087
#: breezy/builtins.py:6311
4088
msgid " brz view file1 dir1 ..."
4485
4089
msgstr ""
4486
4090
4487
#: bzrlib/builtins.py:6310
4091
#: breezy/builtins.py:6313
4488
4092
msgid " To list the current view::"
4489
4093
msgstr ""
4490
4094
4491
#: bzrlib/builtins.py:6312
4492
msgid " bzr view"
4095
#: breezy/builtins.py:6315
4096
msgid " brz view"
4493
4097
msgstr ""
4494
4098
4495
#: bzrlib/builtins.py:6314
4099
#: breezy/builtins.py:6317
4496
4100
msgid " To delete the current view::"
4497
4101
msgstr ""
4498
4102
4499
#: bzrlib/builtins.py:6316
4500
msgid " bzr view --delete"
4103
#: breezy/builtins.py:6319
4104
msgid " brz view --delete"
4501
4105
msgstr ""
4502
4106
4503
#: bzrlib/builtins.py:6318
4107
#: breezy/builtins.py:6321
4504
4108
msgid " To disable the current view without deleting it::"
4505
4109
msgstr ""
4506
4110
4507
#: bzrlib/builtins.py:6320
4508
msgid " bzr view --switch off"
4111
#: breezy/builtins.py:6323
4112
msgid " brz view --switch off"
4509
4113
msgstr ""
4510
4114
4511
#: bzrlib/builtins.py:6322
4115
#: breezy/builtins.py:6325
4512
4116
msgid " To define a named view and switch to it::"
4513
4117
msgstr ""
4514
4118
4515
#: bzrlib/builtins.py:6324
4516
msgid " bzr view --name view-name file1 dir1 ..."
4119
#: breezy/builtins.py:6327
4120
msgid " brz view --name view-name file1 dir1 ..."
4517
4121
msgstr ""
4518
4122
4519
#: bzrlib/builtins.py:6326
4123
#: breezy/builtins.py:6329
4520
4124
msgid " To list a named view::"
4521
4125
msgstr ""
4522
4126
4523
#: bzrlib/builtins.py:6328
4524
msgid " bzr view --name view-name"
4127
#: breezy/builtins.py:6331
4128
msgid " brz view --name view-name"
4525
4129
msgstr ""
4526
4130
4527
#: bzrlib/builtins.py:6330
4131
#: breezy/builtins.py:6333
4528
4132
msgid " To delete a named view::"
4529
4133
msgstr ""
4530
4134
4531
#: bzrlib/builtins.py:6332
4532
msgid " bzr view --name view-name --delete"
4135
#: breezy/builtins.py:6335
4136
msgid " brz view --name view-name --delete"
4533
4137
msgstr ""
4534
4138
4535
#: bzrlib/builtins.py:6334
4139
#: breezy/builtins.py:6337
4536
4140
msgid " To switch to a named view::"
4537
4141
msgstr ""
4538
4142
4539
#: bzrlib/builtins.py:6336
4540
msgid " bzr view --switch view-name"
4143
#: breezy/builtins.py:6339
4144
msgid " brz view --switch view-name"
4541
4145
msgstr ""
4542
4146
4543
#: bzrlib/builtins.py:6338
4147
#: breezy/builtins.py:6341
4544
4148
msgid " To list all views defined::"
4545
4149
msgstr ""
4546
4150
4547
#: bzrlib/builtins.py:6340
4548
msgid " bzr view --all"
4151
#: breezy/builtins.py:6343
4152
msgid " brz view --all"
4549
4153
msgstr ""
4550
4154
4551
#: bzrlib/builtins.py:6342
4155
#: breezy/builtins.py:6345
4552
4156
msgid " To delete all views::"
4553
4157
msgstr ""
4554
4158
4555
#: bzrlib/builtins.py:6344
4556
msgid " bzr view --delete --all"
4159
#: breezy/builtins.py:6347
4160
msgid " brz view --delete --all"
4557
4161
msgstr ""
4558
4162
4559
#: bzrlib/builtins.py:6351
4163
# help of 'all' option of 'view' command
4164
#: breezy/builtins.py:6354
4560
4165
msgid "Apply list or delete action to all views."
4561
4166
msgstr ""
4562
4167
4563
#: bzrlib/builtins.py:6354
4168
# help of 'delete' option of 'view' command
4169
#: breezy/builtins.py:6357
4564
4170
msgid "Delete the view."
4565
4171
msgstr ""
4566
4172
4567
#: bzrlib/builtins.py:6357
4173
# help of 'name' option of 'view' command
4174
#: breezy/builtins.py:6360
4568
4175
msgid "Name of the view to define, list or delete."
4569
4176
msgstr ""
4570
4177
4571
#: bzrlib/builtins.py:6361
4178
# help of 'switch' option of 'view' command
4179
#: breezy/builtins.py:6364
4572
4180
msgid "Name of the view to switch to."
4573
4181
msgstr ""
4574
4182
4575
#: bzrlib/builtins.py:6380
4183
#: breezy/builtins.py:6383
4576
4184
msgid "Both --delete and a file list specified"
4577
4185
msgstr ""
4578
4186
4579
#: bzrlib/builtins.py:6383
4187
#: breezy/builtins.py:6386
4580
4188
msgid "Both --delete and --switch specified"
4581
4189
msgstr ""
4582
4190
4583
#: bzrlib/builtins.py:6386
4191
#: breezy/builtins.py:6389
4584
4192
msgid "Deleted all views.\n"
4585
4193
msgstr ""
4586
4194
4587
#: bzrlib/builtins.py:6388
4195
#: breezy/builtins.py:6391
4588
4196
msgid "No current view to delete"
4589
4197
msgstr ""
4590
4198
4591
#: bzrlib/builtins.py:6391
4199
#: breezy/builtins.py:6394
4592
4200
#, python-format
4593
4201
msgid "Deleted '%s' view.\n"
4594
4202
msgstr ""
4595
4203
4596
#: bzrlib/builtins.py:6395
4204
#: breezy/builtins.py:6398
4597
4205
msgid "Both --switch and a file list specified"
4598
4206
msgstr ""
4599
4207
4600
#: bzrlib/builtins.py:6398
4208
#: breezy/builtins.py:6401
4601
4209
msgid "Both --switch and --all specified"
4602
4210
msgstr ""
4603
4211
4604
#: bzrlib/builtins.py:6401
4212
#: breezy/builtins.py:6404
4605
4213
msgid "No current view to disable"
4606
4214
msgstr ""
4607
4215
4608
#: bzrlib/builtins.py:6403
4216
#: breezy/builtins.py:6406
4609
4217
#, python-format
4610
4218
msgid "Disabled '%s' view.\n"
4611
4219
msgstr ""
4612
4220
4613
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4221
#: breezy/builtins.py:6410 breezy/builtins.py:6432
4222
#, python-brace-format
4614
4223
msgid "Using '{0}' view: {1}\n"
4615
4224
msgstr ""
4616
4225
4617
#: bzrlib/builtins.py:6410
4226
#: breezy/builtins.py:6413
4618
4227
msgid "Views defined:\n"
4619
4228
msgstr ""
4620
4229
4621
#: bzrlib/builtins.py:6419
4230
#: breezy/builtins.py:6422
4622
4231
msgid "No views defined.\n"
4623
4232
msgstr ""
4624
4233
4625
#: bzrlib/builtins.py:6426
4234
#: breezy/builtins.py:6429
4626
4235
msgid "Cannot change the 'off' pseudo view"
4627
4236
msgstr ""
4628
4237
4629
#: bzrlib/builtins.py:6434
4238
#: breezy/builtins.py:6437
4630
4239
msgid "No current view.\n"
4631
4240
msgstr ""
4632
4241
4633
#: bzrlib/builtins.py:6437
4242
#: breezy/builtins.py:6440
4243
#, python-brace-format
4634
4244
msgid "'{0}' view is: {1}\n"
4635
4245
msgstr ""
4636
4246
4637
#: bzrlib/builtins.py:6457
4247
#: breezy/builtins.py:6460
4638
4248
msgid " <no hooks installed>\n"
4639
4249
msgstr ""
4640
4250
4641
#: bzrlib/builtins.py:6461
4251
#: breezy/builtins.py:6464
4642
4252
msgid "Remove a branch."
4643
4253
msgstr ""
4644
4254
4645
#: bzrlib/builtins.py:6463
4255
#: breezy/builtins.py:6466
4646
4256
msgid ""
4647
4257
"This will remove the branch from the specified location but \n"
4648
4258
"will keep any working tree or repository in place."
4649
4259
msgstr ""
4650
4260
4651
#: bzrlib/builtins.py:6468
4261
#: breezy/builtins.py:6471
4652
4262
msgid " Remove the branch at repo/trunk::"
4653
4263
msgstr ""
4654
4264
4655
#: bzrlib/builtins.py:6470
4265
#: breezy/builtins.py:6473
4656
4266
msgid " bzr remove-branch repo/trunk"
4657
4267
msgstr ""
4658
4268
4659
#: bzrlib/builtins.py:6477
4269
# help of 'force' option of 'remove-branch' command
4270
#: breezy/builtins.py:6480
4660
4271
msgid "Remove branch even if it is the active branch."
4661
4272
msgstr ""
4662
4273
4663
#: bzrlib/builtins.py:6491
4274
#: breezy/builtins.py:6494
4664
4275
msgid "Branch is active. Use --force to remove it."
4665
4276
msgstr ""
4666
4277
4667
#: bzrlib/builtins.py:6495
4278
# help of 'writer=plain' option of 'shelve' command
4279
#: breezy/builtins.py:6498
4668
4280
msgid "Plaintext diff output."
4669
4281
msgstr ""
4670
4282
4671
#: bzrlib/builtins.py:6496
4283
#: breezy/builtins.py:6499
4672
4284
msgid "Temporarily set aside some changes from the current tree."
4673
4285
msgstr ""
4674
4286
4675
#: bzrlib/builtins.py:6498
4287
#: breezy/builtins.py:6501
4676
4288
msgid ""
4677
4289
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4678
4290
"ie. out of the way, until a later time when you can bring them back from\n"
4681
4293
"will they survive its deletion."
4682
4294
msgstr ""
4683
4295
4684
#: bzrlib/builtins.py:6504
4296
#: breezy/builtins.py:6507
4685
4297
msgid "If shelve --list is specified, previously-shelved changes are listed."
4686
4298
msgstr ""
4687
4299
4688
#: bzrlib/builtins.py:6506
4300
#: breezy/builtins.py:6509
4689
4301
msgid ""
4690
4302
"Shelve is intended to help separate several sets of changes that have\n"
4691
4303
"been inappropriately mingled. If you just want to get rid of all changes\n"
4693
4305
"shelve all text changes at once, use shelve --all."
4694
4306
msgstr ""
4695
4307
4696
#: bzrlib/builtins.py:6511
4308
#: breezy/builtins.py:6514
4697
4309
msgid ""
4698
4310
"If filenames are specified, only the changes to those files will be\n"
4699
4311
"shelved. Other files will be left untouched."
4700
4312
msgstr ""
4701
4313
4702
#: bzrlib/builtins.py:6514
4314
#: breezy/builtins.py:6517
4703
4315
msgid ""
4704
4316
"If a revision is specified, changes since that revision will be shelved."
4705
4317
msgstr ""
4706
4318
4707
#: bzrlib/builtins.py:6516
4319
#: breezy/builtins.py:6519
4708
4320
msgid ""
4709
4321
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4710
4322
"restore the most recently shelved changes."
4711
4323
msgstr ""
4712
4324
4713
#: bzrlib/builtins.py:6519
4325
#: breezy/builtins.py:6522
4714
4326
msgid ""
4715
4327
"For complicated changes, it is possible to edit the changes in a separate\n"
4716
4328
"editor program to decide what the file remaining in the working copy\n"
4717
4329
"should look like. To do this, add the configuration option"
4718
4330
msgstr ""
4719
4331
4720
#: bzrlib/builtins.py:6523
4332
#: breezy/builtins.py:6526
4721
4333
msgid " change_editor = PROGRAM @new_path @old_path"
4722
4334
msgstr ""
4723
4335
4724
#: bzrlib/builtins.py:6525
4336
#: breezy/builtins.py:6528
4725
4337
msgid ""
4726
4338
"where @new_path is replaced with the path of the new version of the \n"
4727
4339
"file and @old_path is replaced with the path of the old version of \n"
4730
4342
" "
4731
4343
msgstr ""
4732
4344
4733
#: bzrlib/builtins.py:6537
4345
# help of 'all' option of 'shelve' command
4346
#: breezy/builtins.py:6540
4734
4347
msgid "Shelve all changes."
4735
4348
msgstr ""
4736
4349
4737
#: bzrlib/builtins.py:6539
4350
# help of 'writer' option of 'shelve' command
4351
#: breezy/builtins.py:6542
4738
4352
msgid "Method to use for writing diffs."
4739
4353
msgstr ""
4740
4354
4741
#: bzrlib/builtins.py:6539
4355
# title of 'writer' option of 'shelve' command
4356
#: breezy/builtins.py:6542
4742
4357
msgid "writer"
4743
4358
msgstr ""
4744
4359
4745
#: bzrlib/builtins.py:6543
4360
# help of 'list' option of 'shelve' command
4361
#: breezy/builtins.py:6546
4746
4362
msgid "List shelved changes."
4747
4363
msgstr ""
4748
4364
4749
#: bzrlib/builtins.py:6545
4365
# help of 'destroy' option of 'shelve' command
4366
#: breezy/builtins.py:6548
4750
4367
msgid "Destroy removed changes instead of shelving them."
4751
4368
msgstr ""
4752
4369
4753
#: bzrlib/builtins.py:6574
4370
#: breezy/builtins.py:6577
4754
4371
msgid "No shelved changes."
4755
4372
msgstr ""
4756
4373
4757
#: bzrlib/builtins.py:6585
4374
#: breezy/builtins.py:6588
4758
4375
msgid "Restore shelved changes."
4759
4376
msgstr ""
4760
4377
4761
#: bzrlib/builtins.py:6587
4378
#: breezy/builtins.py:6590
4762
4379
msgid ""
4763
4380
"By default, the most recently shelved changes are restored. However if you\n"
4764
4381
"specify a shelf by id those changes will be restored instead. This works\n"
4765
4382
"best when the changes don't depend on each other."
4766
4383
msgstr ""
4767
4384
4768
#: bzrlib/builtins.py:6596
4385
# help of 'action' option of 'unshelve' command
4386
#: breezy/builtins.py:6599
4769
4387
msgid "The action to perform."
4770
4388
msgstr ""
4771
4389
4772
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4390
# title of 'action' option of 'resolve' command
4391
# title of 'action' option of 'unshelve' command
4392
#: breezy/builtins.py:6599 breezy/conflicts.py:694
4773
4393
msgid "action"
4774
4394
msgstr ""
4775
4395
4776
#: bzrlib/builtins.py:6598
4396
# help of 'action=apply' option of 'unshelve' command
4397
#: breezy/builtins.py:6601
4777
4398
msgid "Apply changes and remove from the shelf."
4778
4399
msgstr ""
4779
4400
4780
#: bzrlib/builtins.py:6599
4401
# help of 'action=dry-run' option of 'unshelve' command
4402
#: breezy/builtins.py:6602
4781
4403
msgid "Show changes, but do not apply or remove them."
4782
4404
msgstr ""
4783
4405
4784
#: bzrlib/builtins.py:6600
4406
# help of 'action=preview' option of 'unshelve' command
4407
#: breezy/builtins.py:6603
4785
4408
msgid ""
4786
4409
"Instead of unshelving the changes, show the diff that would result from "
4787
4410
"unshelving."
4788
4411
msgstr ""
4789
4412
4790
#: bzrlib/builtins.py:6602
4413
# help of 'action=delete-only' option of 'unshelve' command
4414
#: breezy/builtins.py:6605
4791
4415
msgid "Delete changes without applying them."
4792
4416
msgstr ""
4793
4417
4794
#: bzrlib/builtins.py:6603
4418
# help of 'action=keep' option of 'unshelve' command
4419
#: breezy/builtins.py:6606
4795
4420
msgid "Apply changes but don't delete them."
4796
4421
msgstr ""
4797
4422
4798
#: bzrlib/builtins.py:6618
4423
#: breezy/builtins.py:6621
4799
4424
msgid "Remove unwanted files from working tree."
4800
4425
msgstr ""
4801
4426
4802
#: bzrlib/builtins.py:6620
4427
#: breezy/builtins.py:6623
4803
4428
msgid ""
4804
4429
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4805
4430
"files are never deleted."
4806
4431
msgstr ""
4807
4432
4808
#: bzrlib/builtins.py:6623
4433
#: breezy/builtins.py:6626
4809
4434
msgid ""
4810
"Another class is 'detritus', which includes files emitted by bzr during\n"
4435
"Another class is 'detritus', which includes files emitted by brz during\n"
4811
4436
"normal operations and selftests. (The value of these files decreases with\n"
4812
4437
"time.)"
4813
4438
msgstr ""
4814
4439
4815
#: bzrlib/builtins.py:6627
4440
#: breezy/builtins.py:6630
4816
4441
msgid ""
4817
4442
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4818
4443
"flags are respected, and may be combined."
4819
4444
msgstr ""
4820
4445
4821
#: bzrlib/builtins.py:6630
4446
#: breezy/builtins.py:6633
4822
4447
msgid "To check what clean-tree will do, use --dry-run."
4823
4448
msgstr ""
4824
4449
4825
#: bzrlib/builtins.py:6633
4450
# help of 'ignored' option of 'clean-tree' command
4451
#: breezy/builtins.py:6636
4826
4452
msgid "Delete all ignored files."
4827
4453
msgstr ""
4828
4454
4829
#: bzrlib/builtins.py:6634
4455
# help of 'detritus' option of 'clean-tree' command
4456
#: breezy/builtins.py:6637
4830
4457
msgid ""
4831
4458
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4832
4459
msgstr ""
4833
4460
4834
#: bzrlib/builtins.py:6637
4835
msgid "Delete files unknown to bzr (default)."
4461
# help of 'unknown' option of 'clean-tree' command
4462
#: breezy/builtins.py:6640
4463
msgid "Delete files unknown to brz (default)."
4836
4464
msgstr ""
4837
4465
4838
#: bzrlib/builtins.py:6638
4466
# help of 'dry-run' option of 'clean-tree' command
4467
#: breezy/builtins.py:6641
4839
4468
msgid "Show files to delete instead of deleting them."
4840
4469
msgstr ""
4841
4470
4842
#: bzrlib/builtins.py:6640
4471
# help of 'force' option of 'clean-tree' command
4472
#: breezy/builtins.py:6643
4843
4473
msgid "Do not prompt before deleting."
4844
4474
msgstr ""
4845
4475
4846
#: bzrlib/bundle/__init__.py:59
4476
#: breezy/bundle/__init__.py:59
4847
4477
msgid "A directory cannot be a bundle"
4848
4478
msgstr ""
4849
4479
4850
#: bzrlib/bundle/apply_bundle.py:40
4480
#: breezy/bundle/apply_bundle.py:40
4851
4481
msgid "Install revisions"
4852
4482
msgstr ""
4853
4483
4854
#: bzrlib/bundle/commands.py:64
4484
#: breezy/bundle/commands.py:64
4855
4485
msgid "--verbose requires a merge directive"
4856
4486
msgstr ""
4857
4487
4858
#: bzrlib/bundle/commands.py:67
4488
#: breezy/bundle/commands.py:67
4859
4489
msgid "Bundle format not supported"
4860
4490
msgstr ""
4861
4491
4862
#: bzrlib/bundle/commands.py:77
4492
#: breezy/bundle/commands.py:77
4863
4493
msgid "Records\n"
4864
4494
msgstr ""
4865
4495
4866
#: bzrlib/bundle/commands.py:81
4496
#: breezy/bundle/commands.py:81
4497
#, python-brace-format
4867
4498
msgid "{0}: {1} ({2} multiparent)\n"
4868
4499
msgstr ""
4869
4500
4870
#: bzrlib/bundle/commands.py:83
4501
#: breezy/bundle/commands.py:83
4871
4502
#, python-format
4872
4503
msgid "unique files: %d\n"
4873
4504
msgstr ""
4874
4505
4875
#: bzrlib/bundle/commands.py:92
4506
#: breezy/bundle/commands.py:92
4876
4507
msgid "Revisions\n"
4877
4508
msgstr ""
4878
4509
4879
#: bzrlib/bundle/commands.py:93
4510
#: breezy/bundle/commands.py:93
4880
4511
#, python-format
4881
4512
msgid "nicks: %s\n"
4882
4513
msgstr ""
4883
4514
4884
#: bzrlib/bundle/commands.py:95
4515
#: breezy/bundle/commands.py:95
4885
4516
#, python-format
4886
4517
msgid ""
4887
4518
"committers: \n"
4888
4519
"%s\n"
4889
4520
msgstr ""
4890
4521
4891
#: bzrlib/bundle/commands.py:103
4522
#: breezy/bundle/commands.py:103
4892
4523
msgid "Decoded contents\n"
4893
4524
msgstr ""
4894
4525
4895
#: bzrlib/bundle/serializer/v4.py:327
4526
#: breezy/bundle/serializer/v4.py:327
4896
4527
#, python-format
4897
4528
msgid "Bundling %d revision."
4898
4529
msgid_plural "Bundling %d revisions."
4899
4530
msgstr[0] ""
4900
4531
msgstr[1] ""
4901
4532
4902
#: bzrlib/bzrdir.py:487
4533
#: breezy/bzrdir.py:487
4534
#, python-brace-format
4903
4535
msgid ""
4904
4536
"making backup of {0}\n"
4905
4537
" to {1}"
4906
4538
msgstr ""
4907
4539
4908
#: bzrlib/bzrdir.py:510
4540
#: breezy/bzrdir.py:510
4541
#, python-brace-format
4909
4542
msgid "renamed {0} to {1}"
4910
4543
msgstr ""
4911
4544
4912
#: bzrlib/bzrdir.py:1639
4545
#: breezy/bzrdir.py:1639
4913
4546
#, python-format
4914
4547
msgid ""
4915
4548
"Source repository format does not support stacking, using format:\n"
4916
4549
" %s"
4917
4550
msgstr ""
4918
4551
4919
#: bzrlib/bzrdir.py:1659
4552
#: breezy/bzrdir.py:1659
4920
4553
#, python-format
4921
4554
msgid ""
4922
4555
"Source branch format does not support stacking, using format:\n"
4923
4556
" %s"
4924
4557
msgstr ""
4925
4558
4926
#: bzrlib/bzrdir.py:1805
4559
#: breezy/bzrdir.py:1805
4927
4560
msgid "starting repository conversion"
4928
4561
msgstr ""
4929
4562
4930
#: bzrlib/bzrdir.py:2026
4563
#: breezy/bzrdir.py:2026
4564
#, python-brace-format
4931
4565
msgid "Using default stacking branch {0} at {1}"
4932
4566
msgstr ""
4933
4567
4934
#: bzrlib/check.py:108
4568
#: breezy/check.py:108
4935
4569
msgid "check"
4936
4570
msgstr ""
4937
4571
4938
#: bzrlib/check.py:110
4572
#: breezy/check.py:110
4939
4573
msgid "checking revisions"
4940
4574
msgstr ""
4941
4575
4942
#: bzrlib/check.py:112
4576
#: breezy/check.py:112
4943
4577
msgid "checking commit contents"
4944
4578
msgstr ""
4945
4579
4946
#: bzrlib/check.py:114
4580
#: breezy/check.py:114
4947
4581
msgid "checking file graphs"
4948
4582
msgstr ""
4949
4583
4950
#: bzrlib/check.py:118
4584
#: breezy/check.py:118
4951
4585
msgid "checking branches and trees"
4952
4586
msgstr ""
4953
4587
4954
#: bzrlib/check.py:205
4588
#: breezy/check.py:205
4589
#, python-brace-format
4955
4590
msgid "checked repository {0} format {1}"
4956
4591
msgstr ""
4957
4592
4958
#: bzrlib/check.py:208
4593
#: breezy/check.py:208
4959
4594
#, python-format
4960
4595
msgid "%6d revisions"
4961
4596
msgstr ""
4962
4597
4963
#: bzrlib/check.py:209
4598
#: breezy/check.py:209
4964
4599
#, python-format
4965
4600
msgid "%6d file-ids"
4966
4601
msgstr ""
4967
4602
4968
#: bzrlib/check.py:211
4603
#: breezy/check.py:211
4969
4604
#, python-format
4970
4605
msgid "%6d unreferenced text versions"
4971
4606
msgstr ""
4972
4607
4973
#: bzrlib/check.py:215
4608
#: breezy/check.py:215
4609
#, python-brace-format
4974
4610
msgid "unreferenced version: {{{0}}} in {1}"
4975
4611
msgstr ""
4976
4612
4977
#: bzrlib/check.py:218
4613
#: breezy/check.py:218
4978
4614
#, python-format
4979
4615
msgid "%6d revisions are missing inventory_sha1"
4980
4616
msgstr ""
4981
4617
4982
#: bzrlib/check.py:221
4618
#: breezy/check.py:221
4983
4619
#, python-format
4984
4620
msgid "%6d revisions are mentioned but not present"
4985
4621
msgstr ""
4986
4622
4987
#: bzrlib/check.py:224
4623
#: breezy/check.py:224
4988
4624
#, python-format
4989
4625
msgid "%6d ghost revisions"
4990
4626
msgstr ""
4991
4627
4992
#: bzrlib/check.py:229
4628
#: breezy/check.py:229
4993
4629
#, python-format
4994
4630
msgid "%6d revisions missing parents in ancestry"
4995
4631
msgstr ""
4996
4632
4997
#: bzrlib/check.py:233
4633
#: breezy/check.py:233
4998
4634
#, python-format
4999
4635
msgid " %s should be in the ancestry for:"
5000
4636
msgstr ""
5001
4637
5002
#: bzrlib/check.py:237
4638
#: breezy/check.py:237
5003
4639
#, python-format
5004
4640
msgid "%6d inconsistent parents"
5005
4641
msgstr ""
5006
4642
5007
#: bzrlib/check.py:241
4643
#: breezy/check.py:241
5008
4644
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
5009
4645
msgstr ""
5010
4646
5011
#: bzrlib/check.py:247
4647
#: breezy/check.py:247
5012
4648
#, python-format
5013
4649
msgid "%6d revisions have incorrect parents in the revision index"
5014
4650
msgstr ""
5015
4651
5016
#: bzrlib/check.py:253
4652
#: breezy/check.py:253
5017
4653
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
5018
4654
msgstr ""
5019
4655
5020
#: bzrlib/check.py:267
4656
#: breezy/check.py:267
4657
#, python-brace-format
5021
4658
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
5022
4659
msgstr ""
5023
4660
5024
#: bzrlib/check.py:296
4661
#: breezy/check.py:296
4662
#, python-brace-format
5025
4663
msgid ""
5026
4664
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
5027
4665
"{{{4}}}"
5028
4666
msgstr ""
5029
4667
5030
#: bzrlib/check.py:354
4668
#: breezy/check.py:354
5031
4669
#, python-format
5032
4670
msgid "Checking branch at '%s'."
5033
4671
msgstr ""
5034
4672
5035
#: bzrlib/check.py:374
4673
#: breezy/check.py:374
5036
4674
#, python-format
5037
4675
msgid "Checking working tree at '%s'."
5038
4676
msgstr ""
5039
4677
5040
#: bzrlib/check.py:427 bzrlib/check.py:441
4678
#: breezy/check.py:427 breezy/check.py:441
5041
4679
msgid "No branch found at specified location."
5042
4680
msgstr ""
5043
4681
5044
#: bzrlib/check.py:429 bzrlib/check.py:439
4682
#: breezy/check.py:429 breezy/check.py:439
5045
4683
msgid "No working tree found at specified location."
5046
4684
msgstr ""
5047
4685
5048
#: bzrlib/check.py:432
4686
#: breezy/check.py:432
5049
4687
#, python-format
5050
4688
msgid "Checking repository at '%s'."
5051
4689
msgstr ""
5052
4690
5053
#: bzrlib/check.py:443
4691
#: breezy/check.py:443
5054
4692
msgid "No repository found at specified location."
5055
4693
msgstr ""
5056
4694
5057
#: bzrlib/clean_tree.py:63
4695
#: breezy/clean_tree.py:63
5058
4696
msgid "Nothing to delete."
5059
4697
msgstr ""
5060
4698
5061
#: bzrlib/clean_tree.py:68
4699
#: breezy/clean_tree.py:68
5062
4700
msgid "Are you sure you wish to delete these"
5063
4701
msgstr ""
5064
4702
5065
#: bzrlib/clean_tree.py:70
4703
#: breezy/clean_tree.py:70
5066
4704
msgid "Canceled"
5067
4705
msgstr ""
5068
4706
5069
#: bzrlib/clean_tree.py:107
4707
#: breezy/clean_tree.py:107
5070
4708
#, python-format
5071
4709
msgid "unable to remove %s"
5072
4710
msgstr ""
5073
4711
5074
#: bzrlib/clean_tree.py:111
4712
#: breezy/clean_tree.py:111
5075
4713
msgid "deleting paths:"
5076
4714
msgstr ""
5077
4715
5078
#: bzrlib/clean_tree.py:125
4716
#: breezy/clean_tree.py:125
4717
#, python-brace-format
5079
4718
msgid "unable to remove \"{0}\": {1}."
5080
4719
msgstr ""
5081
4720
5082
#: bzrlib/clean_tree.py:130
4721
#: breezy/clean_tree.py:130
5083
4722
msgid "No files deleted."
5084
4723
msgstr ""
5085
4724
5086
#: bzrlib/cmd_version_info.py:47
4725
#: breezy/cmd_version_info.py:47
4726
#, python-brace-format
5087
4727
msgid "No known version info format {0}. Supported types are: {1}"
5088
4728
msgstr ""
5089
4729
5090
#: bzrlib/cmd_version_info.py:52
4730
# help of 'format=custom' option of 'version-info' command
4731
#: breezy/cmd_version_info.py:52
5091
4732
msgid "Version info in Custom template-based format."
5092
4733
msgstr ""
5093
4734
5094
#: bzrlib/cmd_version_info.py:52
4735
# help of 'format=python' option of 'version-info' command
4736
#: breezy/cmd_version_info.py:52
5095
4737
msgid "Version info in Python format."
5096
4738
msgstr ""
5097
4739
5098
#: bzrlib/cmd_version_info.py:52
4740
# help of 'format=rio' option of 'version-info' command
4741
#: breezy/cmd_version_info.py:52
5099
4742
msgid "Version info in RIO (simple text) format (default)."
5100
4743
msgstr ""
5101
4744
5102
#: bzrlib/cmd_version_info.py:53
4745
#: breezy/cmd_version_info.py:53
5103
4746
msgid "Show version information about this tree."
5104
4747
msgstr ""
5105
4748
5106
#: bzrlib/cmd_version_info.py:55
4749
#: breezy/cmd_version_info.py:55
5107
4750
msgid ""
5108
4751
"You can use this command to add information about version into\n"
5109
4752
"source code of an application. The output can be in one of the\n"
5110
4753
"supported formats or in a custom format based on a template."
5111
4754
msgstr ""
5112
4755
5113
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
5114
#: en/help_topics/configuration.txt:722
4756
#: breezy/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4757
#: en/help_topics/configuration.txt:738
5115
4758
msgid "For example::"
5116
4759
msgstr ""
5117
4760
5118
#: bzrlib/cmd_version_info.py:61
4761
#: breezy/cmd_version_info.py:61
5119
4762
msgid ""
5120
4763
" bzr version-info --custom \\\n"
5121
4764
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
5122
4765
msgstr ""
5123
4766
5124
#: bzrlib/cmd_version_info.py:64
4767
#: breezy/cmd_version_info.py:64
5125
4768
msgid ""
5126
4769
"will produce a C header file with formatted string containing the\n"
5127
4770
"current revision number. Other supported variables in templates are:"
5128
4771
msgstr ""
5129
4772
5130
#: bzrlib/cmd_version_info.py:67
4773
#: breezy/cmd_version_info.py:67
5131
4774
msgid ""
5132
4775
" * {date} - date of the last revision\n"
5133
4776
" * {build_date} - current date\n"
5138
4781
" otherwise 1"
5139
4782
msgstr ""
5140
4783
5141
#: bzrlib/cmd_version_info.py:77
4784
# help of 'format' option of 'version-info' command
4785
#: breezy/cmd_version_info.py:77
5142
4786
msgid "Select the output format."
5143
4787
msgstr ""
5144
4788
5145
#: bzrlib/cmd_version_info.py:81
4789
# help of 'all' option of 'version-info' command
4790
#: breezy/cmd_version_info.py:81
5146
4791
msgid "Include all possible information."
5147
4792
msgstr ""
5148
4793
5149
#: bzrlib/cmd_version_info.py:82
4794
# help of 'check-clean' option of 'version-info' command
4795
#: breezy/cmd_version_info.py:82
5150
4796
msgid "Check if tree is clean."
5151
4797
msgstr ""
5152
4798
5153
#: bzrlib/cmd_version_info.py:84
4799
# help of 'include-history' option of 'version-info' command
4800
#: breezy/cmd_version_info.py:84
5154
4801
msgid "Include the revision-history."
5155
4802
msgstr ""
5156
4803
5157
#: bzrlib/cmd_version_info.py:86
4804
# help of 'include-file-revisions' option of 'version-info' command
4805
#: breezy/cmd_version_info.py:86
5158
4806
msgid "Include the last revision for each file."
5159
4807
msgstr ""
5160
4808
5161
#: bzrlib/cmd_version_info.py:87
4809
# help of 'template' option of 'version-info' command
4810
#: breezy/cmd_version_info.py:87
5162
4811
msgid "Template for the output."
5163
4812
msgstr ""
5164
4813
5165
#: bzrlib/cmd_version_info.py:101
4814
#: breezy/cmd_version_info.py:101
5166
4815
msgid "bzr version-info --revision takes exactly one revision specifier"
5167
4816
msgstr ""
5168
4817
5169
#: bzrlib/commands.py:229
4818
#: breezy/commands.py:229
5170
4819
#, python-format
5171
4820
msgid "unknown command \"%s\""
5172
4821
msgstr ""
5173
4822
5174
#: bzrlib/commands.py:476
4823
#: breezy/commands.py:476
5175
4824
msgid "No help for this command."
5176
4825
msgstr ""
5177
4826
5178
#: bzrlib/commands.py:489
4827
#: breezy/commands.py:489
5179
4828
#, python-format
5180
4829
msgid ":Purpose: %s\n"
5181
4830
msgstr ""
5182
4831
5183
#: bzrlib/commands.py:491
4832
#: breezy/commands.py:491
5184
4833
#, python-format
5185
4834
msgid ""
5186
4835
":Usage:\n"
5187
4836
"%s\n"
5188
4837
msgstr ""
5189
":使い方:\n"
5190
"%s\n"
5191
4838
5192
#: bzrlib/commands.py:493
4839
#: breezy/commands.py:493
5193
4840
#, python-format
5194
4841
msgid ":Usage: %s\n"
5195
msgstr ":使い方: %s\n"
4842
msgstr ""
5196
4843
5197
#: bzrlib/commands.py:512
4844
#: breezy/commands.py:512
5198
4845
#, python-format
5199
4846
msgid ":Options:%s"
5200
4847
msgstr ""
5201
4848
5202
#: bzrlib/commands.py:523
4849
#: breezy/commands.py:523
5203
4850
#, python-format
5204
4851
msgid ""
5205
4852
":Description:\n"
5207
4854
"\n"
5208
4855
msgstr ""
5209
4856
5210
#: bzrlib/commands.py:533
4857
#: breezy/commands.py:533
5211
4858
#, python-format
5212
4859
msgid ""
5213
4860
"See bzr help %s for more details and examples.\n"
5214
4861
"\n"
5215
4862
msgstr ""
5216
4863
5217
#: bzrlib/commands.py:538
4864
#: breezy/commands.py:538
5218
4865
msgid ":Aliases: "
5219
4866
msgstr ""
5220
4867
5221
#: bzrlib/commands.py:542
4868
#: breezy/commands.py:542
5222
4869
#, python-format
5223
4870
msgid ":From: plugin \"%s\"\n"
5224
4871
msgstr ""
5225
4872
5226
#: bzrlib/commands.py:554
4873
#: breezy/commands.py:554
4874
#, python-brace-format
5227
4875
msgid ":doc:`{0} <{1}-help>`"
5228
4876
msgstr ""
5229
4877
5230
#: bzrlib/commands.py:558
4878
#: breezy/commands.py:558
5231
4879
#, python-format
5232
4880
msgid ":See also: %s"
5233
4881
msgstr ""
5234
4882
5235
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4883
#: breezy/commands.py:826
5236
4884
msgid "Only ASCII permitted in option names"
5237
4885
msgstr ""
5238
4886
5239
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4887
#: breezy/commands.py:851 breezy/commands.py:859
5240
4888
msgid "command {0!r} needs one or more {1}"
5241
4889
msgstr ""
5242
4890
5243
#: bzrlib/commands.py:868
4891
#: breezy/commands.py:868
5244
4892
msgid "command {0!r} requires argument {1}"
5245
4893
msgstr ""
5246
4894
5247
#: bzrlib/commands.py:875
4895
#: breezy/commands.py:875
4896
#, python-brace-format
5248
4897
msgid "extra argument to command {0}: {1}"
5249
4898
msgstr ""
5250
4899
5251
#: bzrlib/commands.py:972
4900
#: breezy/commands.py:952
5252
4901
#, python-format
5253
4902
msgid "Profile data written to \"%s\"."
5254
4903
msgstr ""
5255
4904
5256
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4905
#: breezy/commit.py:117 breezy/commit.py:740
5257
4906
msgid "added"
5258
4907
msgstr ""
5259
4908
5260
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4909
#: breezy/commit.py:117 breezy/commit.py:748
5261
4910
msgid "modified"
5262
msgstr "変更あり"
4911
msgstr ""
5263
4912
5264
#: bzrlib/commit.py:131
4913
#: breezy/commit.py:131
5265
4914
#, python-format
5266
4915
msgid "Committing%s"
5267
4916
msgstr ""
5268
4917
5269
#: bzrlib/commit.py:134
4918
#: breezy/commit.py:134
5270
4919
#, python-format
5271
4920
msgid "Committed revision %d."
5272
4921
msgstr ""
5273
4922
5274
#: bzrlib/commit.py:143
4923
#: breezy/commit.py:143
5275
4924
#, python-format
5276
4925
msgid "deleted %s"
5277
4926
msgstr ""
5278
4927
5279
#: bzrlib/commit.py:146
4928
#: breezy/commit.py:146
5280
4929
#, python-format
5281
4930
msgid "missing %s"
5282
4931
msgstr ""
5283
4932
5284
#: bzrlib/commit.py:511
4933
#: breezy/commit.py:511
4934
#, python-brace-format
5285
4935
msgid ""
5286
4936
"Conflicting tags in bound branch:\n"
5287
4937
"{0}"
5288
4938
msgstr ""
5289
4939
5290
#: bzrlib/commit.py:742
4940
#: breezy/commit.py:742
5291
4941
msgid "renamed"
5292
4942
msgstr ""
5293
4943
5294
#: bzrlib/commit.py:976
4944
#: breezy/commit.py:976
5295
4945
msgid "unchanged"
5296
4946
msgstr ""
5297
4947
5298
#: bzrlib/commit.py:998
4948
#: breezy/commit.py:998
4949
#, python-brace-format
5299
4950
msgid "{0} [{1}] - Stage"
5300
4951
msgstr ""
5301
4952
5302
#: bzrlib/commit.py:1001
4953
#: breezy/commit.py:1001
5303
4954
#, python-format
5304
4955
msgid "%s - Stage"
5305
4956
msgstr ""
5306
4957
5307
#: bzrlib/commit_signature_commands.py:34
4958
#: breezy/commit_signature_commands.py:34
5308
4959
msgid "Sign all commits by a given committer."
5309
4960
msgstr ""
5310
4961
5311
#: bzrlib/commit_signature_commands.py:36
4962
#: breezy/commit_signature_commands.py:36
5312
4963
msgid ""
5313
4964
"If location is not specified the local tree is used.\n"
5314
4965
"If committer is not specified the default committer is used."
5315
4966
msgstr ""
5316
4967
5317
#: bzrlib/commit_signature_commands.py:39
4968
#: breezy/commit_signature_commands.py:39
5318
4969
msgid "This does not sign commits that already have signatures."
5319
4970
msgstr ""
5320
4971
5321
#: bzrlib/commit_signature_commands.py:47
4972
# help of 'dry-run' option of 'sign-my-commits' command
4973
#: breezy/commit_signature_commands.py:47
5322
4974
msgid ""
5323
4975
"Don't actually sign anything, just print the revisions that would be signed."
5324
4976
msgstr ""
5325
4977
5326
#: bzrlib/commit_signature_commands.py:98
4978
#: breezy/commit_signature_commands.py:98
5327
4979
#, python-format
5328
4980
msgid "Signed %d revision.\n"
5329
4981
msgid_plural "Signed %d revisions.\n"
5330
4982
msgstr[0] ""
5331
4983
msgstr[1] ""
5332
4984
5333
#: bzrlib/commit_signature_commands.py:103
4985
#: breezy/commit_signature_commands.py:103
5334
4986
msgid "Verify all commit signatures."
5335
4987
msgstr ""
5336
4988
5337
#: bzrlib/commit_signature_commands.py:105
5338
msgid ""
5339
"Verifies that all commits in the branch are signed by known GnuPG keys."
4989
#: breezy/commit_signature_commands.py:105
4990
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
5340
4991
msgstr ""
5341
4992
5342
#: bzrlib/commit_signature_commands.py:110
4993
# help of 'acceptable-keys' option of 'verify-signatures' command
4994
#: breezy/commit_signature_commands.py:110
5343
4995
msgid ""
5344
4996
"Comma separated list of GPG key patterns which are acceptable for "
5345
4997
"verification."
5346
4998
msgstr ""
5347
4999
5348
#: bzrlib/commit_signature_commands.py:148
5000
#: breezy/commit_signature_commands.py:148
5349
5001
msgid "Cannot verify a range of non-revision-history revisions"
5350
5002
msgstr ""
5351
5003
5352
#: bzrlib/commit_signature_commands.py:166
5004
#: breezy/commit_signature_commands.py:166
5353
5005
msgid "All commits signed with verifiable keys"
5354
5006
msgstr ""
5355
5007
5356
#: bzrlib/config.py:436
5008
#: breezy/config.py:438
5357
5009
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5358
5010
msgstr ""
5359
5011
5360
#: bzrlib/config.py:2452
5012
#: breezy/config.py:2465
5013
#, python-brace-format
5361
5014
msgid "{0} is not an SI unit."
5362
5015
msgstr ""
5363
5016
5364
#: bzrlib/config.py:2971
5017
#: breezy/config.py:3013
5018
#, python-brace-format
5365
5019
msgid ""
5366
5020
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5367
5021
"will be saved."
5368
5022
msgstr ""
5369
5023
5370
#: bzrlib/config.py:3116
5024
#: breezy/config.py:3158
5371
5025
#, python-format
5372
5026
msgid "Invalid '%s', should be of the form 'name=value'"
5373
5027
msgstr ""
5374
5028
5375
#: bzrlib/config.py:4018
5029
#: breezy/config.py:4096
5376
5030
msgid "Display, set or remove a configuration option."
5377
5031
msgstr ""
5378
5032
5379
#: bzrlib/config.py:4020
5380
msgid "Display the active value for a given option."
5033
#: breezy/config.py:4098
5034
msgid "Display the active value for option NAME."
5381
5035
msgstr ""
5382
5036
5383
#: bzrlib/config.py:4022
5037
#: breezy/config.py:4100
5384
5038
msgid ""
5385
5039
"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
5390
#: bzrlib/config.py:4026
5391
msgid "If no NAME is given, --all .* is implied."
5392
msgstr ""
5393
5394
#: bzrlib/config.py:4028
5395
msgid ""
5396
"Setting a value is achieved by using name=value without spaces. The value\n"
5040
"matching options are displayed mentioning their scope and without resolving\n"
5041
"option references in the value). The active value that bzr will take into\n"
5042
"account is the first one displayed for each option."
5043
msgstr ""
5044
5045
#: breezy/config.py:4105
5046
msgid ""
5047
"If NAME is not given, --all .* is implied (all options are displayed for "
5048
"the\n"
5049
"current scope)."
5050
msgstr ""
5051
5052
#: breezy/config.py:4108
5053
msgid ""
5054
"Setting a value is achieved by using NAME=value without spaces. The value\n"
5397
5055
"is set in the most relevant scope and can be checked by displaying the\n"
5398
5056
"option again."
5399
5057
msgstr ""
5400
5058
5401
#: bzrlib/config.py:4040
5059
#: breezy/config.py:4112
5060
msgid "Removing a value is achieved by using --remove NAME."
5061
msgstr ""
5062
5063
# help of 'scope' option of 'config' command
5064
#: breezy/config.py:4122
5402
5065
msgid "Reduce the scope to the specified configuration file."
5403
5066
msgstr ""
5404
5067
5405
#: bzrlib/config.py:4044
5068
# help of 'all' option of 'config' command
5069
#: breezy/config.py:4126
5406
5070
msgid "Display all the defined values for the matching options."
5407
5071
msgstr ""
5408
5072
5409
#: bzrlib/config.py:4046
5073
# help of 'remove' option of 'config' command
5074
#: breezy/config.py:4128
5410
5075
msgid "Remove the option from the configuration file."
5411
5076
msgstr ""
5412
5077
5413
#: bzrlib/conflicts.py:50
5078
#: breezy/conflicts.py:50
5414
5079
msgid "List files with conflicts."
5415
5080
msgstr ""
5416
5081
5417
#: bzrlib/conflicts.py:57
5082
#: breezy/conflicts.py:57
5418
5083
msgid ""
5419
5084
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5420
5085
"is supplied, the pathnames of files with text conflicts are listed,\n"
5421
5086
"instead. (This is useful for editing all files with text conflicts.)"
5422
5087
msgstr ""
5423
5088
5424
#: bzrlib/conflicts.py:61
5089
#: breezy/conflicts.py:61
5425
5090
msgid "Use bzr resolve when you have fixed a problem."
5426
5091
msgstr ""
5427
5092
5428
#: bzrlib/conflicts.py:66
5093
# help of 'text' option of 'conflicts' command
5094
#: breezy/conflicts.py:66
5429
5095
msgid "List paths of files with text conflicts."
5430
5096
msgstr ""
5431
5097
5432
#: bzrlib/conflicts.py:85
5098
# help of 'action=done' option of 'resolve' command
5099
#: breezy/conflicts.py:85
5433
5100
msgid "Marks the conflict as resolved."
5434
5101
msgstr ""
5435
5102
5436
#: bzrlib/conflicts.py:88
5103
# help of 'action=take-this' option of 'resolve' command
5104
#: breezy/conflicts.py:88
5437
5105
msgid "Resolve the conflict preserving the version in the working tree."
5438
5106
msgstr ""
5439
5107
5440
#: bzrlib/conflicts.py:91
5108
# help of 'action=take-other' option of 'resolve' command
5109
#: breezy/conflicts.py:91
5441
5110
msgid "Resolve the conflict taking the merged version into account."
5442
5111
msgstr ""
5443
5112
5444
#: bzrlib/conflicts.py:98
5113
# help of 'action' option of 'resolve' command
5114
#: breezy/conflicts.py:98
5445
5115
msgid "How to resolve the conflict."
5446
5116
msgstr ""
5447
5117
5448
#: bzrlib/conflicts.py:104
5118
#: breezy/conflicts.py:104
5449
5119
msgid "Mark a conflict as resolved."
5450
5120
msgstr ""
5451
5121
5452
#: bzrlib/conflicts.py:111
5122
#: breezy/conflicts.py:111
5453
5123
msgid ""
5454
5124
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5455
5125
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5457
5127
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5458
5128
msgstr ""
5459
5129
5460
#: bzrlib/conflicts.py:119
5130
# help of 'all' option of 'resolve' command
5131
#: breezy/conflicts.py:119
5461
5132
msgid "Resolve all conflicts in this tree."
5462
5133
msgstr ""
5463
5134
5464
#: bzrlib/conflicts.py:126
5135
#: breezy/conflicts.py:126
5465
5136
msgid "If --all is specified, no FILE may be provided"
5466
5137
msgstr ""
5467
5138
5468
#: bzrlib/conflicts.py:151
5139
#: breezy/conflicts.py:151
5469
5140
#, python-format
5470
5141
msgid "%d conflict auto-resolved."
5471
5142
msgid_plural "%d conflicts auto-resolved."
5472
5143
msgstr[0] ""
5473
5144
msgstr[1] ""
5474
5145
5475
#: bzrlib/conflicts.py:154
5146
#: breezy/conflicts.py:154
5476
5147
msgid "Remaining conflicts:"
5477
5148
msgstr ""
5478
5149
5479
#: bzrlib/conflicts.py:159
5150
#: breezy/conflicts.py:159
5480
5151
msgid "All conflicts resolved."
5481
5152
msgstr ""
5482
5153
5483
#: bzrlib/conflicts.py:168
5154
#: breezy/conflicts.py:168
5155
#, python-brace-format
5484
5156
msgid "{0} conflict resolved, {1} remaining"
5485
5157
msgid_plural "{0} conflicts resolved, {1} remaining"
5486
5158
msgstr[0] ""
5487
5159
msgstr[1] ""
5488
5160
5489
#: bzrlib/controldir.py:712
5161
#: breezy/controldir.py:712
5162
#, python-brace-format
5490
5163
msgid "{0} is{1} redirected to {2}"
5491
5164
msgstr ""
5492
5165
5493
#: bzrlib/diff.py:399
5166
#: breezy/diff.py:413
5494
5167
#, python-format
5495
5168
msgid "*** Ignoring files outside view. View is %s"
5496
5169
msgstr ""
5497
5170
5498
#: bzrlib/errors.py:157
5171
#: breezy/errors.py:157
5499
5172
msgid "The tree builder is already building a tree."
5500
5173
msgstr ""
5501
5174
5502
#: bzrlib/errors.py:178
5175
#: breezy/errors.py:178
5503
5176
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5504
5177
msgstr ""
5505
5178
5506
#: bzrlib/errors.py:197
5179
#: breezy/errors.py:197
5507
5180
msgid ""
5508
5181
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5509
5182
"versions \"%(minimum)s\" to \"%(current)s\"."
5510
5183
msgstr ""
5511
5184
5512
#: bzrlib/errors.py:209
5185
#: breezy/errors.py:209
5513
5186
msgid "The transport '%(transport)s' is only accessible within this process."
5514
5187
msgstr ""
5515
5188
5516
#: bzrlib/errors.py:227
5189
#: breezy/errors.py:227
5517
5190
msgid "Invalid revision number %(revno)s"
5518
5191
msgstr ""
5519
5192
5520
#: bzrlib/errors.py:236
5193
#: breezy/errors.py:236
5521
5194
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5522
5195
msgstr ""
5523
5196
5524
#: bzrlib/errors.py:247
5197
#: breezy/errors.py:247
5525
5198
msgid "Reserved revision-id {%(revision_id)s}"
5526
5199
msgstr ""
5527
5200
5528
#: bzrlib/errors.py:261
5201
#: breezy/errors.py:261
5529
5202
msgid "There is no public branch set for \"%(branch_url)s\"."
5530
5203
msgstr ""
5531
5204
5532
#: bzrlib/errors.py:271
5205
#: breezy/errors.py:271
5533
5206
msgid ""
5534
5207
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5535
5208
"obtain a list of topics."
5536
5209
msgstr ""
5537
5210
5538
#: bzrlib/errors.py:280
5211
#: breezy/errors.py:280
5539
5212
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5540
5213
msgstr ""
5541
5214
5542
#: bzrlib/errors.py:290
5215
#: breezy/errors.py:290
5543
5216
msgid ""
5544
5217
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5545
5218
msgstr ""
5546
5219
5547
#: bzrlib/errors.py:299
5220
#: breezy/errors.py:299
5548
5221
msgid "The branch '%(branch)s' is not stacked."
5549
5222
msgstr ""
5550
5223
5551
#: bzrlib/errors.py:313
5224
#: breezy/errors.py:313
5552
5225
msgid "No WorkingTree exists for \"%(base)s\"."
5553
5226
msgstr ""
5554
5227
5555
#: bzrlib/errors.py:322
5228
#: breezy/errors.py:322
5556
5229
msgid "Not currently building a tree."
5557
5230
msgstr ""
5558
5231
5559
#: bzrlib/errors.py:327
5232
#: breezy/errors.py:327
5560
5233
msgid "%(url)s is not a local path."
5561
5234
msgstr ""
5562
5235
5563
#: bzrlib/errors.py:355
5236
#: breezy/errors.py:355
5564
5237
msgid "%(not_locked)r is not write locked but needs to be."
5565
5238
msgstr ""
5566
5239
5567
#: bzrlib/errors.py:363
5240
#: breezy/errors.py:363
5568
5241
msgid "Error in command line options"
5569
5242
msgstr ""
5570
5243
5571
#: bzrlib/errors.py:368
5244
#: breezy/errors.py:368
5572
5245
msgid "%(value)s is not an index of type %(_type)s."
5573
5246
msgstr ""
5574
5247
5575
#: bzrlib/errors.py:378
5248
#: breezy/errors.py:378
5576
5249
msgid "Error in data for index %(value)s."
5577
5250
msgstr ""
5578
5251
5579
#: bzrlib/errors.py:387
5252
#: breezy/errors.py:387
5580
5253
msgid "The key '%(key)s' is already in index '%(index)s'."
5581
5254
msgstr ""
5582
5255
5583
#: bzrlib/errors.py:397
5256
#: breezy/errors.py:397
5584
5257
msgid "The key '%(key)s' is not a valid key."
5585
5258
msgstr ""
5586
5259
5587
#: bzrlib/errors.py:406
5260
#: breezy/errors.py:406
5588
5261
msgid "Could not parse options for index %(value)s."
5589
5262
msgstr ""
5590
5263
5591
#: bzrlib/errors.py:415
5264
#: breezy/errors.py:415
5592
5265
msgid "The value '%(value)s' is not a valid value."
5593
5266
msgstr ""
5594
5267
5595
#: bzrlib/errors.py:424
5268
#: breezy/errors.py:424
5596
5269
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5597
msgstr "オプション \"%(name)s\" に対する不正な値 \"%(value)s\""
5270
msgstr ""
5598
5271
5599
#: bzrlib/errors.py:443
5272
#: breezy/errors.py:443
5600
5273
msgid "Generic path error: %(path)r%(extra)s)"
5601
5274
msgstr ""
5602
5275
5603
#: bzrlib/errors.py:456
5276
#: breezy/errors.py:456
5604
5277
msgid "No such file: %(path)r%(extra)s"
5605
5278
msgstr ""
5606
5279
5607
#: bzrlib/errors.py:461
5280
#: breezy/errors.py:461
5608
5281
msgid "File exists: %(path)r%(extra)s"
5609
5282
msgstr ""
5610
5283
5611
#: bzrlib/errors.py:467
5284
#: breezy/errors.py:467
5612
5285
msgid ""
5613
5286
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5614
5287
"after to tell bzr about a rename that has already happened)%(extra)s"
5615
5288
msgstr ""
5616
5289
5617
#: bzrlib/errors.py:483
5290
#: breezy/errors.py:483
5618
5291
msgid "\"%(path)s\" is not a directory %(extra)s"
5619
5292
msgstr ""
5620
5293
5621
#: bzrlib/errors.py:488
5294
#: breezy/errors.py:488
5622
5295
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5623
5296
msgstr ""
5624
5297
5625
#: bzrlib/errors.py:493
5298
#: breezy/errors.py:493
5626
5299
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5627
5300
msgstr ""
5628
5301
5629
#: bzrlib/errors.py:498
5302
#: breezy/errors.py:498
5630
5303
msgid "Hard-linking \"%(path)s\" is not supported"
5631
5304
msgstr ""
5632
5305
5633
#: bzrlib/errors.py:513
5306
#: breezy/errors.py:513
5634
5307
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5635
5308
msgstr ""
5636
5309
5637
#: bzrlib/errors.py:518
5310
#: breezy/errors.py:518
5638
5311
msgid "Permission denied: \"%(path)s\"%(extra)s"
5639
5312
msgstr ""
5640
5313
5641
#: bzrlib/errors.py:523
5314
#: breezy/errors.py:523
5642
5315
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5643
5316
msgstr ""
5644
5317
5645
#: bzrlib/errors.py:528
5318
#: breezy/errors.py:528
5646
5319
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5647
5320
msgstr ""
5648
5321
5649
#: bzrlib/errors.py:539
5322
#: breezy/errors.py:539
5650
5323
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5651
5324
msgstr ""
5652
5325
5653
#: bzrlib/errors.py:561
5654
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5326
#: breezy/errors.py:561
5327
msgid "The %(type)s hook '%(hook)s' is unknown in this version of breezy."
5655
5328
msgstr ""
5656
5329
5657
#: bzrlib/errors.py:571
5330
#: breezy/errors.py:571
5658
5331
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5659
5332
msgstr ""
5660
5333
5661
#: bzrlib/errors.py:579
5334
#: breezy/errors.py:579
5662
5335
msgid ""
5663
5336
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5664
5337
"upgrade the branch to permit branch stacking."
5665
5338
msgstr ""
5666
5339
5667
#: bzrlib/errors.py:590
5340
#: breezy/errors.py:590
5668
5341
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5669
5342
msgstr ""
5670
5343
5671
#: bzrlib/errors.py:600
5344
#: breezy/errors.py:600
5672
5345
msgid ""
5673
5346
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5674
5347
"need to upgrade the repository to permit branch stacking."
5675
5348
msgstr ""
5676
5349
5677
#: bzrlib/errors.py:611
5350
#: breezy/errors.py:611
5678
5351
msgid "Error reading from %(path)r."
5679
5352
msgstr ""
5680
5353
5681
#: bzrlib/errors.py:630
5354
#: breezy/errors.py:630
5682
5355
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5683
5356
msgstr ""
5684
5357
5685
#: bzrlib/errors.py:646
5358
#: breezy/errors.py:646
5686
5359
msgid "Path \"%(path)s\" is not unicode normalized"
5687
5360
msgstr ""
5688
5361
5689
#: bzrlib/errors.py:654
5362
#: breezy/errors.py:654
5690
5363
msgid "Not a branch: \"%(path)s\"%(detail)s."
5691
5364
msgstr ""
5692
5365
5693
#: bzrlib/errors.py:696
5366
#: breezy/errors.py:696
5694
5367
msgid "No submit branch available for branch \"%(path)s\""
5695
5368
msgstr ""
5696
5369
5697
#: bzrlib/errors.py:705
5370
#: breezy/errors.py:705
5698
5371
msgid "A control directory already exists: \"%(path)s\"."
5699
5372
msgstr ""
5700
5373
5701
#: bzrlib/errors.py:710
5374
#: breezy/errors.py:710
5702
5375
msgid "Already a branch: \"%(path)s\"."
5703
5376
msgstr ""
5704
5377
5705
#: bzrlib/errors.py:715
5378
#: breezy/errors.py:715
5706
5379
msgid "Invalid branch name: %(name)s"
5707
5380
msgstr ""
5708
5381
5709
#: bzrlib/errors.py:724
5382
#: breezy/errors.py:724
5710
5383
msgid "Parent branch already exists: \"%(path)s\"."
5711
5384
msgstr ""
5712
5385
5713
#: bzrlib/errors.py:730
5386
#: breezy/errors.py:730
5714
5387
msgid ""
5715
5388
"Directory contains a branch, but no working tree (use bzr checkout if you "
5716
5389
"wish to build a working tree): \"%(path)s\""
5717
5390
msgstr ""
5718
5391
5719
#: bzrlib/errors.py:735
5392
#: breezy/errors.py:735
5720
5393
msgid ""
5721
5394
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5722
5395
msgstr ""
5723
5396
5724
#: bzrlib/errors.py:745
5397
#: breezy/errors.py:745
5725
5398
msgid ""
5726
5399
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5727
5400
msgstr ""
5728
5401
5729
#: bzrlib/errors.py:755
5402
#: breezy/errors.py:755
5730
5403
msgid "No repository present: \"%(path)s\""
5731
5404
msgstr ""
5732
5405
5733
#: bzrlib/errors.py:762
5406
#: breezy/errors.py:762
5734
5407
msgid ""
5735
5408
"Unsupported branch format: %(format)s\n"
5736
5409
"Please run 'bzr upgrade'"
5737
5410
msgstr ""
5738
5411
5739
#: bzrlib/errors.py:768
5412
#: breezy/errors.py:768
5740
5413
msgid "Unknown %(kind)s format: %(format)r"
5741
5414
msgstr ""
5742
5415
5743
#: bzrlib/errors.py:777
5416
#: breezy/errors.py:777
5744
5417
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5745
5418
msgstr ""
5746
5419
5747
#: bzrlib/errors.py:787
5420
#: breezy/errors.py:787
5748
5421
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5749
5422
msgstr ""
5750
5423
5751
#: bzrlib/errors.py:802
5424
#: breezy/errors.py:802
5752
5425
msgid ""
5753
5426
"%(target)s\n"
5754
5427
"is not compatible with\n"
5756
5429
"%(details)s"
5757
5430
msgstr ""
5758
5431
5759
#: bzrlib/errors.py:818
5432
#: breezy/errors.py:818
5760
5433
msgid "Revision is not compatible with %(repo_format)s"
5761
5434
msgstr ""
5762
5435
5763
#: bzrlib/errors.py:828
5436
#: breezy/errors.py:828
5764
5437
msgid "%(context_info)s%(path)s is already versioned."
5765
5438
msgstr ""
5766
5439
5767
#: bzrlib/errors.py:849
5440
#: breezy/errors.py:849
5768
5441
msgid "%(context_info)s%(path)s is not versioned."
5769
5442
msgstr ""
5770
5443
5771
#: bzrlib/errors.py:870
5444
#: breezy/errors.py:870
5772
5445
msgid "Path(s) are not versioned: %(paths_as_string)s"
5773
5446
msgstr ""
5774
5447
5775
#: bzrlib/errors.py:881
5448
#: breezy/errors.py:881
5776
5449
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5777
5450
msgstr ""
5778
5451
5779
#: bzrlib/errors.py:900
5452
#: breezy/errors.py:900
5780
5453
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5781
5454
msgstr ""
5782
5455
5783
#: bzrlib/errors.py:908
5456
#: breezy/errors.py:908
5784
5457
msgid ""
5785
5458
"Filename %(filename)r is not valid in your current filesystem encoding "
5786
5459
"%(fs_encoding)s"
5787
5460
msgstr ""
5788
5461
5789
#: bzrlib/errors.py:919
5462
#: breezy/errors.py:919
5790
5463
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5791
5464
msgstr ""
5792
5465
5793
#: bzrlib/errors.py:937
5466
#: breezy/errors.py:937
5794
5467
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5795
5468
msgstr ""
5796
5469
5797
#: bzrlib/errors.py:976
5470
#: breezy/errors.py:976
5798
5471
msgid "Cannot lock %(lock)s: %(why)s"
5799
5472
msgstr ""
5800
5473
5801
#: bzrlib/errors.py:986
5474
#: breezy/errors.py:986
5802
5475
msgid ""
5803
5476
"A transaction related operation was attempted after the transaction finished."
5804
5477
msgstr ""
5805
5478
5806
#: bzrlib/errors.py:1013
5479
#: breezy/errors.py:1013
5807
5480
msgid "Cannot lock: transport is read only: %(transport)s"
5808
5481
msgstr ""
5809
5482
5810
#: bzrlib/errors.py:1021
5483
#: breezy/errors.py:1021
5811
5484
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5812
5485
msgstr ""
5813
5486
5814
#: bzrlib/errors.py:1032
5815
msgid ""
5816
"Lock was broken while still open: %(lock)s - check storage consistency!"
5487
#: breezy/errors.py:1032
5488
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5817
5489
msgstr ""
5818
5490
5819
#: bzrlib/errors.py:1043
5491
#: breezy/errors.py:1043
5820
5492
msgid ""
5821
5493
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5822
5494
"%(holder)r, wanted to break %(target)r"
5823
5495
msgstr ""
5824
5496
5825
#: bzrlib/errors.py:1055
5497
#: breezy/errors.py:1055
5826
5498
msgid ""
5827
5499
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5828
5500
"Use 'bzr break-lock' to clear it"
5829
5501
msgstr ""
5830
5502
5831
#: bzrlib/errors.py:1068
5503
#: breezy/errors.py:1068
5832
5504
msgid "Lock not held: %(lock)s"
5833
5505
msgstr ""
5834
5506
5835
#: bzrlib/errors.py:1097
5507
#: breezy/errors.py:1097
5836
5508
msgid "No changes to commit"
5837
5509
msgstr ""
5838
5510
5839
#: bzrlib/errors.py:1102
5511
#: breezy/errors.py:1102
5840
5512
msgid ""
5841
5513
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5842
5514
msgstr ""
5843
5515
5844
#: bzrlib/errors.py:1112
5516
#: breezy/errors.py:1112
5845
5517
msgid ""
5846
5518
"Excluding paths during commit is not supported by repository at "
5847
5519
"%(repository)r."
5848
5520
msgstr ""
5849
5521
5850
#: bzrlib/errors.py:1121
5522
#: breezy/errors.py:1121
5851
5523
msgid ""
5852
5524
"The specified commit message contains characters unsupported by the current "
5853
5525
"encoding."
5854
5526
msgstr ""
5855
5527
5856
#: bzrlib/errors.py:1127
5528
#: breezy/errors.py:1127
5857
5529
msgid "Upgrade URL cannot work with readonly URLs."
5858
5530
msgstr ""
5859
5531
5860
#: bzrlib/errors.py:1132
5532
#: breezy/errors.py:1132
5861
5533
msgid "The branch format %(format)s is already at the most recent format."
5862
5534
msgstr ""
5863
5535
5864
#: bzrlib/errors.py:1155
5536
#: breezy/errors.py:1155
5865
5537
msgid "Option --change does not accept revision ranges"
5866
5538
msgstr ""
5867
5539
5868
#: bzrlib/errors.py:1160
5540
#: breezy/errors.py:1160
5869
5541
msgid "No namespace registered for string: %(spec)r"
5870
5542
msgstr ""
5871
5543
5872
#: bzrlib/errors.py:1179
5544
#: breezy/errors.py:1179
5873
5545
msgid ""
5874
"Requested revision: '%(spec)s' does not exist in branch: "
5875
"%(branch_url)s%(extra)s"
5546
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5547
"%(extra)s"
5876
5548
msgstr ""
5877
5549
5878
#: bzrlib/errors.py:1193
5550
#: breezy/errors.py:1193
5879
5551
msgid ""
5880
5552
"Operation denied because it would change the main history, which is not "
5881
5553
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5882
5554
msgstr ""
5883
5555
5884
#: bzrlib/errors.py:1204
5556
#: breezy/errors.py:1204
5885
5557
msgid ""
5886
5558
"These branches have diverged. Use the missing command to see how.\n"
5887
5559
"Use the merge command to reconcile them."
5888
5560
msgstr ""
5889
5561
5890
#: bzrlib/errors.py:1224
5562
#: breezy/errors.py:1224
5891
5563
msgid ""
5892
5564
"Branches have no common ancestor, and no merge base revision was specified."
5893
5565
msgstr ""
5894
5566
5895
#: bzrlib/errors.py:1230
5567
#: breezy/errors.py:1230
5896
5568
msgid ""
5897
5569
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5898
5570
msgstr ""
5899
5571
5900
#: bzrlib/errors.py:1236
5572
#: breezy/errors.py:1236
5901
5573
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5902
5574
msgstr ""
5903
5575
5904
#: bzrlib/errors.py:1245
5576
#: breezy/errors.py:1245
5905
5577
msgid ""
5906
5578
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5907
5579
msgstr ""
5908
5580
5909
#: bzrlib/errors.py:1254
5581
#: breezy/errors.py:1254
5910
5582
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5911
5583
msgstr ""
5912
5584
5913
#: bzrlib/errors.py:1263
5585
#: breezy/errors.py:1263
5914
5586
msgid "Branch %(branch)s has no commits."
5915
5587
msgstr ""
5916
5588
5917
#: bzrlib/errors.py:1281
5589
#: breezy/errors.py:1281
5918
5590
msgid ""
5919
"Bound branch %(branch)s is out of date with master branch "
5920
"%(master)s.%(extra_help)s"
5591
"Bound branch %(branch)s is out of date with master branch %(master)s."
5592
"%(extra_help)s"
5921
5593
msgstr ""
5922
5594
5923
#: bzrlib/errors.py:1293
5595
#: breezy/errors.py:1293
5924
5596
msgid ""
5925
5597
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5926
5598
"bound to %(remote)s."
5927
5599
msgstr ""
5928
5600
5929
#: bzrlib/errors.py:1305
5601
#: breezy/errors.py:1305
5930
5602
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5931
5603
msgstr ""
5932
5604
5933
#: bzrlib/errors.py:1314
5605
#: breezy/errors.py:1314
5934
5606
msgid ""
5935
5607
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5936
5608
"%(error)s"
5937
5609
msgstr ""
5938
5610
5939
#: bzrlib/errors.py:1326
5611
#: breezy/errors.py:1326
5940
5612
msgid "Error in processing weave: %(msg)s"
5941
5613
msgstr ""
5942
5614
5943
#: bzrlib/errors.py:1335
5615
#: breezy/errors.py:1335
5944
5616
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5945
5617
msgstr ""
5946
5618
5947
#: bzrlib/errors.py:1346
5619
#: breezy/errors.py:1346
5948
5620
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5949
5621
msgstr ""
5950
5622
5951
#: bzrlib/errors.py:1356
5623
#: breezy/errors.py:1356
5952
5624
msgid "Weave invariant violated: %(what)s"
5953
5625
msgstr ""
5954
5626
5955
#: bzrlib/errors.py:1365
5627
#: breezy/errors.py:1365
5956
5628
msgid "Parents are mismatched between two revisions. %(msg)s"
5957
5629
msgstr ""
5958
5630
5959
#: bzrlib/errors.py:1387
5631
#: breezy/errors.py:1387
5960
5632
msgid ""
5961
5633
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5962
5634
"%(weave_b)s"
5963
5635
msgstr ""
5964
5636
5965
#: bzrlib/errors.py:1399
5637
#: breezy/errors.py:1399
5966
5638
msgid "Versioned file error"
5967
msgstr "バージョン管理されたファイルのエラー"
5639
msgstr ""
5968
5640
5969
#: bzrlib/errors.py:1404
5641
#: breezy/errors.py:1404
5970
5642
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5971
msgstr "\"%(file_id)s\" にはリビジョン {%(revision_id)s} がありません。"
5643
msgstr ""
5972
5644
5973
#: bzrlib/errors.py:1414
5645
#: breezy/errors.py:1414
5974
5646
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5975
msgstr "\"%(file_id)s\" にはすでにリビジョン {%(revision_id)s} が存在しています。"
5647
msgstr ""
5976
5648
5977
#: bzrlib/errors.py:1424
5649
#: breezy/errors.py:1424
5978
5650
msgid "Text did not match its checksum: %(msg)s"
5979
msgstr "テキストがチェックサムと一致しません: %(msg)s"
5651
msgstr ""
5980
5652
5981
#: bzrlib/errors.py:1550
5653
#: breezy/errors.py:1550
5982
5654
msgid "Export format %(format)r not supported"
5983
msgstr "エクスポートフォーマット %(format)r はサポートされていません"
5655
msgstr ""
5984
5656
5985
#: bzrlib/errors.py:1559
5657
#: breezy/errors.py:1559
5986
5658
msgid "Transport error: %(msg)s %(orig_error)s"
5987
5659
msgstr ""
5988
5660
5989
#: bzrlib/errors.py:1585
5661
#: breezy/errors.py:1585
5990
5662
msgid "Generic bzr smart protocol error: %(details)s"
5991
5663
msgstr ""
5992
5664
5993
#: bzrlib/errors.py:1593
5665
#: breezy/errors.py:1593
5994
5666
msgid "Received bad protocol version marker: %(marker)r"
5995
5667
msgstr ""
5996
5668
5997
#: bzrlib/errors.py:1625
5669
#: breezy/errors.py:1625
5998
5670
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5999
5671
msgstr ""
6000
5672
6001
#: bzrlib/errors.py:1630
5673
#: breezy/errors.py:1630
6002
5674
msgid "Connection error: %(msg)s %(orig_error)s"
6003
5675
msgstr ""
6004
5676
6005
#: bzrlib/errors.py:1635
5677
#: breezy/errors.py:1635
6006
5678
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
6007
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
5679
msgstr ""
6008
5680
6009
#: bzrlib/errors.py:1656
5681
#: breezy/errors.py:1656
6010
5682
msgid "Connection closed: %(msg)s %(orig_error)s"
6011
msgstr "接続が閉じられました: %(msg)s %(orig_error)s"
5683
msgstr ""
6012
5684
6013
#: bzrlib/errors.py:1661
5685
#: breezy/errors.py:1661
6014
5686
msgid "Connection Timeout: %(msg)s%(orig_error)s"
6015
msgstr "接続がタイムアウトしました: %(msg)s%(orig_error)s"
5687
msgstr ""
6016
5688
6017
#: bzrlib/errors.py:1666
5689
#: breezy/errors.py:1666
6018
5690
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
6019
msgstr "%(path)s の %(offset)s に対する不正な range アクセス: %(msg)s"
5691
msgstr ""
6020
5692
6021
#: bzrlib/errors.py:1676
5693
#: breezy/errors.py:1676
6022
5694
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
6023
msgstr "%(path)s からの不正な HTTP レスポンス: %(msg)s%(orig_error)s"
6024
6025
#: bzrlib/errors.py:1691
6026
msgid "Certificate error: %(error)s"
6027
5695
msgstr ""
6028
5696
6029
#: bzrlib/errors.py:1699
5697
#: breezy/errors.py:1691
6030
5698
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
6031
msgstr "%(path)s に対する不正な range %(range)r: %(msg)s"
5699
msgstr ""
6032
5700
6033
#: bzrlib/errors.py:1713
5701
#: breezy/errors.py:1705
6034
5702
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
6035
msgstr "%(path)s に HTTP MIME 境界が見つかりません: %(msg)s"
5703
msgstr ""
6036
5704
6037
#: bzrlib/errors.py:1721
5705
#: breezy/errors.py:1713
6038
5706
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
6039
5707
msgstr ""
6040
5708
6041
#: bzrlib/errors.py:1730
5709
#: breezy/errors.py:1722
6042
5710
msgid "%(source)s is%(permanently)s redirected to %(target)s"
6043
5711
msgstr ""
6044
5712
6045
#: bzrlib/errors.py:1744
5713
#: breezy/errors.py:1736
6046
5714
msgid "Too many redirections"
6047
msgstr "リダイレクションが多すぎます"
5715
msgstr ""
6048
5716
6049
#: bzrlib/errors.py:1749
5717
#: breezy/errors.py:1741
6050
5718
msgid "Working tree has conflicts."
6051
msgstr "作業ツリーに衝突があります"
5719
msgstr ""
6052
5720
6053
#: bzrlib/errors.py:1753
5721
#: breezy/errors.py:1745
6054
5722
msgid "Config file %(filename)s is not UTF-8 encoded\n"
6055
msgstr "設定ファイル %(filename)s が UTF-8 でエンコードされていません\n"
5723
msgstr ""
6056
5724
6057
#: bzrlib/errors.py:1762
5725
#: breezy/errors.py:1754
6058
5726
msgid ""
6059
5727
"Error(s) parsing config file %(filename)s:\n"
6060
5728
"%(errors)s"
6061
5729
msgstr ""
6062
"設定ファイル %(filename)s のパースエラー:\n"
6063
"%(errors)s"
6064
5730
6065
#: bzrlib/errors.py:1772
5731
#: breezy/errors.py:1764
6066
5732
msgid ""
6067
5733
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6068
5734
"See ``bzr help %(name)s``"
6069
5735
msgstr ""
6070
5736
6071
#: bzrlib/errors.py:1782
5737
#: breezy/errors.py:1774
6072
5738
msgid "%(username)r does not seem to contain a reasonable email address"
6073
msgstr "%(username)r に有効な e-mail アドレスが含まれていないようです"
5739
msgstr ""
6074
5740
6075
#: bzrlib/errors.py:1791
5741
#: breezy/errors.py:1783
6076
5742
msgid "Failed to GPG sign data with command \"%(command_line)s\""
6077
msgstr "\"%(command_line)s\" コマンドでのGPGサインに失敗しました"
5743
msgstr ""
6078
5744
6079
#: bzrlib/errors.py:1799
5745
#: breezy/errors.py:1791
6080
5746
msgid "Failed to verify GPG signature data with error \"%(error)s\""
6081
msgstr "GPGシグネチャの検証に \"%(error)s\" で失敗しました。"
5747
msgstr ""
6082
5748
6083
#: bzrlib/errors.py:1807
5749
#: breezy/errors.py:1799
6084
5750
msgid "Unable to import library \"%(library)s\": %(error)s"
6085
msgstr "ライブラリ \"%(library)s\" をインポートできません: %(error)s"
5751
msgstr ""
6086
5752
6087
#: bzrlib/errors.py:1815
5753
#: breezy/errors.py:1807
6088
5754
msgid "python-gpgme is not installed, it is needed to verify signatures"
6089
msgstr "python-gpgme がインストールされていません。これはシグネチャの検証に必要です。"
5755
msgstr ""
6090
5756
6091
#: bzrlib/errors.py:1823
5757
#: breezy/errors.py:1815
6092
5758
msgid ""
6093
5759
"The working tree for %(basedir)s has changed since the last commit, but "
6094
5760
"weave merge requires that it be unchanged"
6095
msgstr "作業ツリー %(basedir)s が最後のコミットから変更されています。 作業ツリーが変更されている場合weaveマージはできません。"
5761
msgstr ""
6096
5762
6097
#: bzrlib/errors.py:1833
5763
#: breezy/errors.py:1825
6098
5764
msgid ""
6099
5765
"Can't reprocess and show base, because reprocessing obscures the "
6100
5766
"relationship of conflicting lines to the base"
6101
5767
msgstr ""
6102
5768
6103
#: bzrlib/errors.py:1839
5769
#: breezy/errors.py:1831
6104
5770
msgid "Cycle in graph %(graph)r"
6105
msgstr "グラフ %(graph)r がループしています。"
5771
msgstr ""
6106
5772
6107
#: bzrlib/errors.py:1867
5773
#: breezy/errors.py:1859
6108
5774
msgid "File %(filename)s is not conflicted."
6109
msgstr "%(filename)s は衝突していません"
5775
msgstr ""
6110
5776
6111
#: bzrlib/errors.py:1889
5777
#: breezy/errors.py:1881
6112
5778
msgid "No bundle was found in \"%(filename)s\"."
6113
msgstr "\"%(filename)s\" にバンドルが見つかりません。"
5779
msgstr ""
6114
5780
6115
#: bzrlib/errors.py:1898
5781
#: breezy/errors.py:1890
6116
5782
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6117
5783
msgstr ""
6118
5784
6119
#: bzrlib/errors.py:1908
5785
#: breezy/errors.py:1900
6120
5786
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6121
5787
msgstr ""
6122
5788
6123
#: bzrlib/errors.py:1921
5789
#: breezy/errors.py:1913
6124
5790
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6125
5791
msgstr ""
6126
5792
6127
#: bzrlib/errors.py:1931
5793
#: breezy/errors.py:1923
6128
5794
msgid "Key %(key)s is already present in map"
6129
5795
msgstr ""
6130
5796
6131
#: bzrlib/errors.py:1936
5797
#: breezy/errors.py:1928
6132
5798
msgid "The prefix %(prefix)s is in the help search path twice."
6133
5799
msgstr ""
6134
5800
6135
#: bzrlib/errors.py:1946
5801
#: breezy/errors.py:1938
6136
5802
msgid ""
6137
5803
"No final name for trans_id %(trans_id)r\n"
6138
5804
"file-id: %(file_id)r\n"
6139
5805
"root trans-id: %(root_trans_id)r\n"
6140
5806
msgstr ""
6141
5807
6142
#: bzrlib/errors.py:1978
5808
#: breezy/errors.py:1970
6143
5809
msgid "Attempt to reuse a transform that has already been applied."
6144
5810
msgstr ""
6145
5811
6146
#: bzrlib/errors.py:1983
5812
#: breezy/errors.py:1975
6147
5813
msgid "Moving the root directory is not supported at this time"
6148
msgstr "いまのところ、ルートディレクトリの移動はサポートされていません"
5814
msgstr ""
6149
5815
6150
#: bzrlib/errors.py:1988
5816
#: breezy/errors.py:1980
6151
5817
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6152
msgstr "%(from_path)s から %(to_path)s へのリネームに失敗しました: %(why)s"
5818
msgstr ""
6153
5819
6154
#: bzrlib/errors.py:1999
5820
#: breezy/errors.py:1991
6155
5821
msgid ""
6156
5822
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6157
5823
msgstr ""
6158
"移動できません。 %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6159
5824
6160
#: bzrlib/errors.py:2035
5825
#: breezy/errors.py:2027
6161
5826
msgid ""
6162
5827
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6163
5828
msgstr ""
6164
"%(from_path)s%(operator)s から %(to_path)s%(_has_extra)s%(extra)s へリネームできません"
6165
5829
6166
#: bzrlib/errors.py:2065
5830
#: breezy/errors.py:2057
6167
5831
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6168
5832
msgstr ""
6169
5833
6170
#: bzrlib/errors.py:2073
5834
#: breezy/errors.py:2065
6171
5835
msgid "Nothing to merge."
6172
5836
msgstr ""
6173
5837
6174
#: bzrlib/errors.py:2078
5838
#: breezy/errors.py:2070
6175
5839
msgid "Format %(format)s cannot be initialised by this version of bzr."
6176
5840
msgstr ""
6177
5841
6178
#: bzrlib/errors.py:2087
5842
#: breezy/errors.py:2079
6179
5843
msgid ""
6180
5844
"Cannot convert from format %(from_format)s to format %(format)s. "
6181
5845
"%(problem)s"
6182
5846
msgstr ""
6183
5847
6184
#: bzrlib/errors.py:2099
5848
#: breezy/errors.py:2091
6185
5849
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6186
5850
msgstr ""
6187
5851
6188
#: bzrlib/errors.py:2107
5852
#: breezy/errors.py:2099
6189
5853
msgid "%(exe_name)s could not be found on this machine"
6190
5854
msgstr ""
6191
5855
6192
#: bzrlib/errors.py:2115
5856
#: breezy/errors.py:2107
6193
5857
msgid "Diff is not installed on this machine: %(msg)s"
6194
5858
msgstr ""
6195
5859
6196
#: bzrlib/errors.py:2123
5860
#: breezy/errors.py:2115
6197
5861
msgid "Diff3 is not installed on this machine."
6198
5862
msgstr ""
6199
5863
6200
#: bzrlib/errors.py:2129
5864
#: breezy/errors.py:2121
6201
5865
msgid "The content being inserted is already present."
6202
5866
msgstr ""
6203
5867
6204
#: bzrlib/errors.py:2134
5868
#: breezy/errors.py:2126
6205
5869
msgid ""
6206
5870
"This tree contains left-over files from a failed operation.\n"
6207
5871
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6209
5873
" keep, and delete it when you are done."
6210
5874
msgstr ""
6211
5875
6212
#: bzrlib/errors.py:2145
5876
#: breezy/errors.py:2137
6213
5877
msgid ""
6214
5878
"This tree contains left-over files from a failed operation.\n"
6215
5879
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6216
5880
" wish to keep, and delete it when you are done."
6217
5881
msgstr ""
6218
5882
6219
#: bzrlib/errors.py:2155
5883
#: breezy/errors.py:2147
6220
5884
msgid ""
6221
5885
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6222
5886
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6224
5888
" keep, and delete it when you are done."
6225
5889
msgstr ""
6226
5890
6227
#: bzrlib/errors.py:2166
5891
#: breezy/errors.py:2158
6228
5892
msgid ""
6229
5893
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6230
5894
"examine %(pending_deletion)s to see if it contains any files you wish to "
6231
5895
"keep, and delete it when you are done."
6232
5896
msgstr ""
6233
5897
6234
#: bzrlib/errors.py:2176
5898
#: breezy/errors.py:2168
6235
5899
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6236
5900
msgstr ""
6237
5901
6238
#: bzrlib/errors.py:2190
6239
msgid ""
6240
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5902
#: breezy/errors.py:2182
5903
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6241
5904
msgstr ""
6242
5905
6243
#: bzrlib/errors.py:2203
5906
#: breezy/errors.py:2195
6244
5907
msgid "Error in merge modified format"
6245
5908
msgstr ""
6246
5909
6247
#: bzrlib/errors.py:2208
5910
#: breezy/errors.py:2200
6248
5911
msgid "Format error in conflict listings"
6249
5912
msgstr ""
6250
5913
6251
#: bzrlib/errors.py:2212
5914
#: breezy/errors.py:2204
6252
5915
msgid ""
6253
5916
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6254
5917
"Error: %(description)s"
6255
5918
msgstr ""
6256
5919
6257
#: bzrlib/errors.py:2223
5920
#: breezy/errors.py:2215
6258
5921
msgid ""
6259
5922
"An error has been detected in the repository %(repo_path)s.\n"
6260
5923
"Please run bzr reconcile on this repository."
6261
5924
msgstr ""
6262
5925
6263
#: bzrlib/errors.py:2234
5926
#: breezy/errors.py:2226
6264
5927
msgid ""
6265
5928
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6266
5929
"reason: %(reason)s"
6267
5930
msgstr ""
6268
5931
6269
#: bzrlib/errors.py:2247
5932
#: breezy/errors.py:2239
6270
5933
msgid ""
6271
5934
"An inconsistent delta was supplied: %(delta)r\n"
6272
5935
"reason: %(reason)s"
6273
5936
msgstr ""
6274
5937
6275
#: bzrlib/errors.py:2259
5938
#: breezy/errors.py:2251
6276
5939
msgid "To use this feature you must upgrade your branch at %(path)s."
6277
5940
msgstr ""
6278
5941
6279
#: bzrlib/errors.py:2268
5942
#: breezy/errors.py:2260
6280
5943
msgid "To use this feature you must upgrade your repository at %(path)s."
6281
5944
msgstr ""
6282
5945
6283
#: bzrlib/errors.py:2273
5946
#: breezy/errors.py:2265
6284
5947
msgid ""
6285
5948
"To use this feature you must upgrade your branch at %(path)s to a format "
6286
5949
"which supports rich roots."
6287
5950
msgstr ""
6288
5951
6289
#: bzrlib/errors.py:2279
5952
#: breezy/errors.py:2271
6290
5953
msgid "Cannot perform local-only commits on unbound branches."
6291
5954
msgstr ""
6292
5955
6293
#: bzrlib/errors.py:2284
5956
#: breezy/errors.py:2276
6294
5957
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6295
5958
msgstr ""
6296
5959
6297
#: bzrlib/errors.py:2305
5960
#: breezy/errors.py:2297
6298
5961
msgid "Ghost tags not supported by format %(format)r."
6299
5962
msgstr ""
6300
5963
6301
#: bzrlib/errors.py:2313
5964
#: breezy/errors.py:2305
6302
5965
msgid "File is binary but should be text."
6303
5966
msgstr ""
6304
5967
6305
#: bzrlib/errors.py:2318
5968
#: breezy/errors.py:2310
6306
5969
msgid "The path %(path)s is not permitted on this platform"
6307
5970
msgstr ""
6308
5971
6309
#: bzrlib/errors.py:2327
5972
#: breezy/errors.py:2319
6310
5973
msgid ""
6311
5974
"Testament did not match expected value.\n"
6312
5975
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6313
5976
" {%(measured)s}"
6314
5977
msgstr ""
6315
5978
6316
#: bzrlib/errors.py:2339
5979
#: breezy/errors.py:2331
6317
5980
msgid "Not a bzr revision-bundle: %(text)r"
6318
5981
msgstr ""
6319
5982
6320
#: bzrlib/errors.py:2348
5983
#: breezy/errors.py:2340
6321
5984
msgid "Bad bzr revision-bundle: %(text)r"
6322
5985
msgstr ""
6323
5986
6324
#: bzrlib/errors.py:2357
5987
#: breezy/errors.py:2349
6325
5988
msgid "Malformed bzr revision-bundle header: %(text)r"
6326
5989
msgstr ""
6327
5990
6328
#: bzrlib/errors.py:2362
5991
#: breezy/errors.py:2354
6329
5992
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6330
5993
msgstr ""
6331
5994
6332
#: bzrlib/errors.py:2367
5995
#: breezy/errors.py:2359
6333
5996
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6334
5997
msgstr ""
6335
5998
6336
#: bzrlib/errors.py:2372
5999
#: breezy/errors.py:2364
6337
6000
msgid "End of line marker was not \\n in bzr revision-bundle"
6338
6001
msgstr ""
6339
6002
6340
#: bzrlib/errors.py:2382
6003
#: breezy/errors.py:2374
6341
6004
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6342
6005
msgstr ""
6343
6006
6344
#: bzrlib/errors.py:2392
6007
#: breezy/errors.py:2384
6345
6008
msgid "Root class for inventory serialization errors"
6346
6009
msgstr ""
6347
6010
6348
#: bzrlib/errors.py:2396
6011
#: breezy/errors.py:2388
6349
6012
msgid ""
6350
6013
"The inventory was not in the expected format:\n"
6351
6014
" %(msg)s"
6352
6015
msgstr ""
6353
6016
6354
#: bzrlib/errors.py:2405
6017
#: breezy/errors.py:2397
6355
6018
msgid "This operation requires rich root data storage"
6356
6019
msgstr ""
6357
6020
6358
#: bzrlib/errors.py:2418
6359
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6021
#: breezy/errors.py:2410
6022
msgid "Unrecognised value for BRZ_SSH environment variable: %(vendor)s"
6360
6023
msgstr ""
6361
6024
6362
#: bzrlib/errors.py:2427
6025
#: breezy/errors.py:2419
6363
6026
msgid ""
6364
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6027
"Don't know how to handle SSH connections. Please set BRZ_SSH environment "
6365
6028
"variable."
6366
6029
msgstr ""
6367
6030
6368
#: bzrlib/errors.py:2434
6031
#: breezy/errors.py:2426
6369
6032
msgid ""
6370
6033
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6371
6034
"ghost at {%(ghost_revision_id)s}"
6372
6035
msgstr ""
6373
6036
6374
#: bzrlib/errors.py:2444
6037
#: breezy/errors.py:2436
6375
6038
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6376
6039
msgstr ""
6377
6040
6378
#: bzrlib/errors.py:2495
6041
#: breezy/errors.py:2487
6379
6042
msgid ""
6380
6043
"A merge directive must provide either a bundle or a public branch location."
6381
6044
msgstr ""
6382
6045
6383
#: bzrlib/errors.py:2502
6046
#: breezy/errors.py:2494
6384
6047
msgid "Bad merge directive payload %(start)r"
6385
6048
msgstr ""
6386
6049
6387
#: bzrlib/errors.py:2512
6050
#: breezy/errors.py:2504
6388
6051
msgid "Preview patch does not match requested changes."
6389
6052
msgstr ""
6390
6053
6391
#: bzrlib/errors.py:2518
6054
#: breezy/errors.py:2510
6392
6055
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6393
6056
msgstr ""
6394
6057
6395
#: bzrlib/errors.py:2528
6058
#: breezy/errors.py:2520
6396
6059
msgid ""
6397
6060
"Your branch does not have all of the revisions required in order to merge "
6398
6061
"this merge directive and the target location specified in the merge "
6399
6062
"directive is not a branch: %(location)s."
6400
6063
msgstr ""
6401
6064
6402
#: bzrlib/errors.py:2540
6065
#: breezy/errors.py:2532
6403
6066
msgid "Unsupported entry kind %(kind)s"
6404
6067
msgstr ""
6405
6068
6406
#: bzrlib/errors.py:2548
6069
#: breezy/errors.py:2540
6407
6070
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6408
6071
msgstr ""
6409
6072
6410
#: bzrlib/errors.py:2558
6073
#: breezy/errors.py:2550
6411
6074
msgid "Subsume target %(other_tree)s needs to be upgraded."
6412
6075
msgstr ""
6413
6076
6414
#: bzrlib/errors.py:2577
6077
#: breezy/errors.py:2569
6415
6078
msgid "No such tag: %(tag_name)s"
6416
6079
msgstr ""
6417
6080
6418
#: bzrlib/errors.py:2585
6081
#: breezy/errors.py:2577
6419
6082
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6420
6083
msgstr ""
6421
6084
6422
#: bzrlib/errors.py:2594
6085
#: breezy/errors.py:2586
6423
6086
msgid "Tag %(tag_name)s already exists."
6424
6087
msgstr ""
6425
6088
6426
#: bzrlib/errors.py:2602
6089
#: breezy/errors.py:2594
6427
6090
msgid ""
6428
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6429
"bugs\" for more information on this feature."
6091
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
6092
"\" for more information on this feature."
6430
6093
msgstr ""
6431
6094
6432
#: bzrlib/errors.py:2612
6095
#: breezy/errors.py:2604
6433
6096
msgid ""
6434
6097
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6435
6098
msgstr ""
6436
6099
6437
#: bzrlib/errors.py:2622
6100
#: breezy/errors.py:2614
6438
6101
msgid ""
6439
6102
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6440
6103
msgstr ""
6441
6104
6442
#: bzrlib/errors.py:2632
6105
#: breezy/errors.py:2624
6443
6106
msgid "Invalid line in bugs property: '%(line)s'"
6444
6107
msgstr ""
6445
6108
6446
#: bzrlib/errors.py:2640
6109
#: breezy/errors.py:2632
6447
6110
msgid "Invalid bug status: '%(status)s'"
6448
6111
msgstr ""
6449
6112
6450
#: bzrlib/errors.py:2648
6113
#: breezy/errors.py:2640
6451
6114
msgid "Could not understand response from smart server: %(response_tuple)r"
6452
6115
msgstr ""
6453
6116
6454
#: bzrlib/errors.py:2687
6117
#: breezy/errors.py:2679
6455
6118
msgid "Server sent an unexpected error: %(error_tuple)r"
6456
6119
msgstr ""
6457
6120
6458
#: bzrlib/errors.py:2706
6121
#: breezy/errors.py:2698
6459
6122
msgid "Unrecognised container format: %(container_format)r"
6460
6123
msgstr ""
6461
6124
6462
#: bzrlib/errors.py:2714
6125
#: breezy/errors.py:2706
6463
6126
msgid "Unexpected end of container stream"
6464
6127
msgstr ""
6465
6128
6466
#: bzrlib/errors.py:2719
6129
#: breezy/errors.py:2711
6467
6130
msgid "Unknown record type: %(record_type)r"
6468
6131
msgstr ""
6469
6132
6470
#: bzrlib/errors.py:2727
6133
#: breezy/errors.py:2719
6471
6134
msgid "Invalid record: %(reason)s"
6472
6135
msgstr ""
6473
6136
6474
#: bzrlib/errors.py:2735
6137
#: breezy/errors.py:2727
6475
6138
msgid "Container has data after end marker: %(excess)r"
6476
6139
msgstr ""
6477
6140
6478
#: bzrlib/errors.py:2743
6141
#: breezy/errors.py:2735
6479
6142
msgid "Container has multiple records with the same name: %(name)s"
6480
6143
msgstr ""
6481
6144
6482
#: bzrlib/errors.py:2756
6145
#: breezy/errors.py:2748
6483
6146
msgid "Corrupt or incompatible data stream: %(reason)s"
6484
6147
msgstr ""
6485
6148
6486
#: bzrlib/errors.py:2764
6149
#: breezy/errors.py:2756
6487
6150
msgid "SMTP error: %(error)s"
6488
6151
msgstr ""
6489
6152
6490
#: bzrlib/errors.py:2772
6153
#: breezy/errors.py:2764
6491
6154
msgid "No message supplied."
6492
6155
msgstr ""
6493
6156
6494
#: bzrlib/errors.py:2777
6157
#: breezy/errors.py:2769
6495
6158
msgid "No mail-to address (--mail-to) or output (-o) specified."
6496
6159
msgstr ""
6497
6160
6498
#: bzrlib/errors.py:2782
6161
#: breezy/errors.py:2774
6499
6162
msgid ""
6500
6163
"Unable to find mail client with the following names: "
6501
6164
"%(mail_command_list_string)s"
6502
6165
msgstr ""
6503
6166
6504
#: bzrlib/errors.py:2792
6167
#: breezy/errors.py:2784
6505
6168
msgid "SMTP connection to %(host)s refused"
6506
6169
msgstr ""
6507
6170
6508
#: bzrlib/errors.py:2801
6171
#: breezy/errors.py:2793
6509
6172
msgid "Please specify smtp_server. No server at default %(host)s."
6510
6173
msgstr ""
6511
6174
6512
#: bzrlib/errors.py:2815
6175
#: breezy/errors.py:2807
6513
6176
msgid ""
6514
6177
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6515
6178
"reconfigure."
6516
6179
msgstr ""
6517
6180
6518
#: bzrlib/errors.py:2827
6181
#: breezy/errors.py:2819
6519
6182
msgid "'%(display_url)s' is already a branch."
6520
6183
msgstr ""
6521
6184
6522
#: bzrlib/errors.py:2832
6185
#: breezy/errors.py:2824
6523
6186
msgid "'%(display_url)s' is already a tree."
6524
6187
msgstr ""
6525
6188
6526
#: bzrlib/errors.py:2837
6189
#: breezy/errors.py:2829
6527
6190
msgid "'%(display_url)s' is already a checkout."
6528
6191
msgstr ""
6529
6192
6530
#: bzrlib/errors.py:2842
6193
#: breezy/errors.py:2834
6531
6194
msgid "'%(display_url)s' is already a lightweight checkout."
6532
6195
msgstr ""
6533
6196
6534
#: bzrlib/errors.py:2847
6197
#: breezy/errors.py:2839
6535
6198
msgid "'%(display_url)s' is already using a shared repository."
6536
6199
msgstr ""
6537
6200
6538
#: bzrlib/errors.py:2852
6201
#: breezy/errors.py:2844
6539
6202
msgid "'%(display_url)s' is already standalone."
6540
6203
msgstr ""
6541
6204
6542
#: bzrlib/errors.py:2857
6205
#: breezy/errors.py:2849
6543
6206
msgid "Shared repository '%(display_url)s' already creates working trees."
6544
6207
msgstr ""
6545
6208
6546
#: bzrlib/errors.py:2863
6209
#: breezy/errors.py:2855
6547
6210
msgid ""
6548
6211
"Shared repository '%(display_url)s' already doesn't create working trees."
6549
6212
msgstr ""
6550
6213
6551
#: bzrlib/errors.py:2869
6214
#: breezy/errors.py:2861
6552
6215
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6553
6216
msgstr ""
6554
6217
6555
#: bzrlib/errors.py:2874
6218
#: breezy/errors.py:2866
6556
6219
msgid "No location could be found to bind to at %(display_url)s."
6557
6220
msgstr ""
6558
6221
6559
#: bzrlib/errors.py:2879
6560
msgid ""
6561
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6562
"status).%(more)s"
6563
msgstr ""
6564
6565
#: bzrlib/errors.py:2898
6566
msgid ""
6567
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6568
"list).%(more)s"
6569
msgstr ""
6570
6571
#: bzrlib/errors.py:2904
6222
#: breezy/errors.py:2871
6223
msgid ""
6224
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
6225
"%(more)s"
6226
msgstr ""
6227
6228
#: breezy/errors.py:2890
6229
msgid ""
6230
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
6231
msgstr ""
6232
6233
#: breezy/errors.py:2905
6234
msgid ""
6235
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
6236
"%(more)s"
6237
msgstr ""
6238
6239
#: breezy/errors.py:2911
6572
6240
msgid "Variable {%(name)s} is not available."
6573
6241
msgstr ""
6574
6242
6575
#: bzrlib/errors.py:2912
6243
#: breezy/errors.py:2919
6576
6244
msgid "No template specified."
6577
6245
msgstr ""
6578
6246
6579
#: bzrlib/errors.py:2917
6247
#: breezy/errors.py:2924
6580
6248
msgid "Unable to create symlink %(path_str)son this platform"
6581
6249
msgstr ""
6582
6250
6583
#: bzrlib/errors.py:2932
6251
#: breezy/errors.py:2939
6584
6252
msgid ""
6585
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6586
"\"original\", \"local\"."
6253
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6254
"\", \"local\"."
6587
6255
msgstr ""
6588
6256
6589
#: bzrlib/errors.py:2966
6257
#: breezy/errors.py:2973
6590
6258
msgid ""
6591
6259
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6592
6260
msgstr ""
6593
6261
6594
#: bzrlib/errors.py:2978
6262
#: breezy/errors.py:2985
6595
6263
msgid "The \"%(config_id)s\" configuration does not exist."
6596
6264
msgstr ""
6597
6265
6598
#: bzrlib/errors.py:2986
6266
#: breezy/errors.py:2993
6599
6267
msgid "The \"%(option_name)s\" configuration option does not exist."
6600
6268
msgstr ""
6601
6269
6602
#: bzrlib/errors.py:2994
6270
#: breezy/errors.py:3001
6603
6271
msgid "The alias \"%(alias_name)s\" does not exist."
6604
6272
msgstr ""
6605
6273
6606
#: bzrlib/errors.py:3008
6274
#: breezy/errors.py:3015
6607
6275
msgid "\"%(alias_name)s\" is not a valid location alias."
6608
6276
msgstr ""
6609
6277
6610
#: bzrlib/errors.py:3016
6278
#: breezy/errors.py:3023
6611
6279
msgid "No %(alias_name)s location assigned."
6612
6280
msgstr ""
6613
6281
6614
#: bzrlib/errors.py:3024
6282
#: breezy/errors.py:3031
6615
6283
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6616
6284
msgstr ""
6617
6285
6618
#: bzrlib/errors.py:3034
6286
#: breezy/errors.py:3041
6619
6287
msgid "Unknown rules detected: %(unknowns_str)s."
6620
6288
msgstr ""
6621
6289
6622
#: bzrlib/errors.py:3045
6290
#: breezy/errors.py:3052
6623
6291
msgid "Tip change rejected: %(msg)s"
6624
6292
msgstr ""
6625
6293
6626
#: bzrlib/errors.py:3053
6294
#: breezy/errors.py:3060
6627
6295
msgid "Shelf corrupt."
6628
6296
msgstr ""
6629
6297
6630
#: bzrlib/errors.py:3058
6298
#: breezy/errors.py:3065
6631
6299
msgid "Corruption while decompressing repository file%(orig_error)s"
6632
6300
msgstr ""
6633
6301
6634
#: bzrlib/errors.py:3070
6302
#: breezy/errors.py:3077
6635
6303
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6636
6304
msgstr ""
6637
6305
6638
#: bzrlib/errors.py:3078
6306
#: breezy/errors.py:3085
6639
6307
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6640
6308
msgstr ""
6641
6309
6642
#: bzrlib/errors.py:3086
6643
msgid ""
6644
"An attempt to access a url outside the server jail was made: '%(url)s'."
6310
#: breezy/errors.py:3093
6311
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6645
6312
msgstr ""
6646
6313
6647
#: bzrlib/errors.py:3094
6314
#: breezy/errors.py:3101
6648
6315
msgid "The user aborted the operation."
6649
6316
msgstr ""
6650
6317
6651
#: bzrlib/errors.py:3099
6318
#: breezy/errors.py:3106
6652
6319
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6653
6320
msgstr ""
6654
6321
6655
#: bzrlib/errors.py:3109
6322
#: breezy/errors.py:3116
6656
6323
msgid "No such view: %(view_name)s."
6657
6324
msgstr ""
6658
6325
6659
#: bzrlib/errors.py:3119
6326
#: breezy/errors.py:3126
6660
6327
msgid ""
6661
6328
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6662
6329
"to a later format."
6663
6330
msgstr ""
6664
6331
6665
#: bzrlib/errors.py:3128
6332
#: breezy/errors.py:3135
6666
6333
msgid ""
6667
6334
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6668
6335
msgstr ""
6669
6336
6670
#: bzrlib/errors.py:3195
6337
#: breezy/errors.py:3202
6671
6338
msgid "%(bzrdir)r does not support co-located branches."
6672
6339
msgstr ""
6673
6340
6674
#: bzrlib/errors.py:3201
6341
#: breezy/errors.py:3208
6675
6342
msgid ""
6676
6343
"Unable to determine your name.\n"
6677
6344
"Please, set your name with the 'whoami' command.\n"
6678
6345
"E.g. bzr whoami \"Your Name <name@example.com>\""
6679
6346
msgstr ""
6680
6347
6681
#: bzrlib/errors.py:3210
6348
#: breezy/errors.py:3217
6682
6349
msgid "Invalid pattern(s) found. %(msg)s"
6683
6350
msgstr ""
6684
6351
6685
#: bzrlib/errors.py:3218
6352
#: breezy/errors.py:3225
6686
6353
msgid ""
6687
6354
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6688
6355
"unbind` to fix."
6689
6356
msgstr ""
6690
6357
6691
#: bzrlib/errors.py:3229
6358
#: breezy/errors.py:3236
6692
6359
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6693
6360
msgstr ""
6694
6361
6695
#: bzrlib/errors.py:3238
6696
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6697
msgstr ""
6698
6699
#: bzrlib/errors.py:3247
6362
#: breezy/errors.py:3245
6363
msgid "Option \"%(name)s\" is not defined while expanding \"%(string)s\"."
6364
msgstr ""
6365
6366
#: breezy/errors.py:3254
6367
msgid "Option \"%(name)s\" is not allowed."
6368
msgstr ""
6369
6370
#: breezy/errors.py:3262
6700
6371
msgid ""
6701
6372
"No compatible object available for operations from %(source)r to %(target)r."
6702
6373
msgstr ""
6703
6374
6704
#: bzrlib/errors.py:3257
6375
#: breezy/errors.py:3272
6705
6376
msgid ""
6706
6377
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6707
6378
"%(arguments)s."
6708
6379
msgstr ""
6709
6380
6710
#: bzrlib/errors.py:3267
6381
#: breezy/errors.py:3282
6711
6382
msgid ""
6712
6383
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6713
6384
"format %(format)r"
6714
6385
msgstr ""
6715
6386
6716
#: bzrlib/errors.py:3279
6387
#: breezy/errors.py:3294
6717
6388
msgid ""
6718
6389
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6719
6390
"plugin."
6720
6391
msgstr ""
6721
6392
6722
#: bzrlib/errors.py:3292
6393
#: breezy/errors.py:3307
6723
6394
msgid "Binary files section encountered."
6724
6395
msgstr ""
6725
6396
6726
#: bzrlib/errors.py:3300
6397
#: breezy/errors.py:3315
6727
6398
msgid ""
6728
6399
"Malformed patch header. %(desc)s\n"
6729
6400
"%(line)r"
6730
6401
msgstr ""
6731
6402
6732
#: bzrlib/errors.py:3309
6403
#: breezy/errors.py:3324
6733
6404
msgid ""
6734
6405
"Malformed hunk header. %(desc)s\n"
6735
6406
"%(line)r"
6736
6407
msgstr ""
6737
6408
6738
#: bzrlib/errors.py:3318
6409
#: breezy/errors.py:3333
6739
6410
msgid ""
6740
6411
"Malformed line. %(desc)s\n"
6741
6412
"%(line)r"
6742
6413
msgstr ""
6743
6414
6744
#: bzrlib/errors.py:3328
6415
#: breezy/errors.py:3343
6745
6416
msgid ""
6746
6417
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6747
6418
"but patch says it should be \"%(patch_line)s\""
6748
6419
msgstr ""
6749
6420
6750
#: bzrlib/errors.py:3339
6421
#: breezy/errors.py:3354
6751
6422
msgid "The feature %(feature)s has already been registered."
6752
6423
msgstr ""
6753
6424
6754
#: bzrlib/export_pot.py:252
6425
#: breezy/errors.py:3362
6426
msgid ""
6427
"Cannot store uncommitted changes because this branch already stores "
6428
"uncommitted changes."
6429
msgstr ""
6430
6431
#: breezy/export_pot.py:252
6755
6432
#, python-format
6756
6433
msgid "Exporting messages from builtin command: %s"
6757
6434
msgstr ""
6758
6435
6759
#: bzrlib/export_pot.py:271
6436
#: breezy/export_pot.py:271
6437
#, python-brace-format
6760
6438
msgid "Exporting messages from plugin command: {0} in {1}"
6761
6439
msgstr ""
6762
6440
6763
#: bzrlib/export_pot.py:292
6441
#: breezy/export_pot.py:292
6764
6442
#, python-format
6765
6443
msgid "Exporting message from error: %s"
6766
6444
msgstr ""
6767
6445
6768
#: bzrlib/fetch.py:98
6446
#: breezy/fetch.py:98
6769
6447
msgid "Finding revisions"
6770
6448
msgstr ""
6771
6449
6772
#: bzrlib/fetch.py:103
6450
#: breezy/fetch.py:103
6773
6451
msgid "Fetching revisions"
6774
6452
msgstr ""
6775
6453
6776
#: bzrlib/foreign.py:262
6454
#: breezy/foreign.py:262
6777
6455
msgid "Push into a different VCS without any custom bzr metadata."
6778
6456
msgstr ""
6779
6457
6780
#: bzrlib/foreign.py:264
6458
#: breezy/foreign.py:264
6781
6459
msgid ""
6782
6460
"This will afterwards rebase the local branch on the remote\n"
6783
6461
"branch unless the --no-rebase option is used, in which case \n"
6784
6462
"the two branches will be out of sync after the push. "
6785
6463
msgstr ""
6786
6464
6787
#: bzrlib/foreign.py:277
6465
# help of 'no-rebase' option of 'dpush' command
6466
#: breezy/foreign.py:277
6788
6467
msgid "Do not rebase after push."
6789
6468
msgstr ""
6790
6469
6791
#: bzrlib/foreign.py:311
6470
#: breezy/foreign.py:311
6792
6471
#, python-format
6793
6472
msgid "Using saved location: %s\n"
6794
6473
msgstr ""
6795
6474
6796
#: bzrlib/foreign.py:321
6475
#: breezy/foreign.py:321
6797
6476
msgid ""
6798
6477
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6799
6478
"regular push."
6800
6479
msgstr ""
6801
6480
6802
#: bzrlib/gpg.py:366
6481
#: breezy/gpg.py:358
6482
#, python-brace-format
6803
6483
msgid "No GnuPG key results for pattern: {0}"
6804
6484
msgstr ""
6805
6485
6806
#: bzrlib/gpg.py:439
6486
#: breezy/gpg.py:431
6487
#, python-brace-format
6807
6488
msgid "{0} commits with valid signatures"
6808
6489
msgstr ""
6809
6490
6810
#: bzrlib/gpg.py:445
6491
#: breezy/gpg.py:437
6492
#, python-brace-format
6811
6493
msgid "{0} commit with unknown key"
6812
6494
msgid_plural "{0} commits with unknown keys"
6813
6495
msgstr[0] ""
6814
6496
msgstr[1] ""
6815
6497
6816
#: bzrlib/gpg.py:453
6498
#: breezy/gpg.py:445
6499
#, python-brace-format
6817
6500
msgid "{0} commit not valid"
6818
6501
msgid_plural "{0} commits not valid"
6819
6502
msgstr[0] ""
6820
6503
msgstr[1] ""
6821
6504
6822
#: bzrlib/gpg.py:461
6505
#: breezy/gpg.py:453
6506
#, python-brace-format
6823
6507
msgid "{0} commit not signed"
6824
6508
msgid_plural "{0} commits not signed"
6825
6509
msgstr[0] ""
6826
6510
msgstr[1] ""
6827
6511
6828
#: bzrlib/gpg.py:469
6512
#: breezy/gpg.py:461
6513
#, python-brace-format
6829
6514
msgid "{0} commit with key now expired"
6830
6515
msgid_plural "{0} commits with key now expired"
6831
6516
msgstr[0] ""
6832
6517
msgstr[1] ""
6833
6518
6834
#: bzrlib/gpg.py:489
6519
#: breezy/gpg.py:481
6520
#, python-brace-format
6835
6521
msgid "{0} commit by author {1} with key {2} now expired"
6836
6522
msgid_plural "{0} commits by author {1} with key {2} now expired"
6837
6523
msgstr[0] ""
6838
6524
msgstr[1] ""
6839
6525
6840
#: bzrlib/gpg.py:505
6526
#: breezy/gpg.py:497
6527
#, python-brace-format
6841
6528
msgid "{0} signed {1} commit"
6842
6529
msgid_plural "{0} signed {1} commits"
6843
6530
msgstr[0] ""
6844
6531
msgstr[1] ""
6845
6532
6846
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6533
#: breezy/gpg.py:514 breezy/gpg.py:531
6534
#, python-brace-format
6847
6535
msgid "{0} commit by author {1}"
6848
6536
msgid_plural "{0} commits by author {1}"
6849
6537
msgstr[0] ""
6850
6538
msgstr[1] ""
6851
6539
6852
#: bzrlib/gpg.py:554
6540
#: breezy/gpg.py:546
6541
#, python-brace-format
6853
6542
msgid "Unknown key {0} signed {1} commit"
6854
6543
msgid_plural "Unknown key {0} signed {1} commits"
6855
6544
msgstr[0] ""
6856
6545
msgstr[1] ""
6857
6546
6858
#: bzrlib/groupcompress.py:1739
6547
#: breezy/groupcompress.py:1739
6859
6548
#, python-format
6860
6549
msgid "Insert claimed random_id=True, but then inserted %r two times"
6861
6550
msgstr ""
6862
6551
6863
#: bzrlib/hooks.py:313
6552
#: breezy/hooks.py:313
6864
6553
#, python-format
6865
6554
msgid "Introduced in: %s"
6866
6555
msgstr ""
6867
6556
6868
#: bzrlib/hooks.py:316
6557
#: breezy/hooks.py:316
6869
6558
#, python-format
6870
6559
msgid "Deprecated in: %s"
6871
6560
msgstr ""
6872
6561
6873
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6562
#: breezy/knit.py:1766 breezy/knit.py:1802
6874
6563
msgid "Walking content"
6875
6564
msgstr ""
6876
6565
6877
#: bzrlib/knit.py:3330
6566
#: breezy/knit.py:3330
6878
6567
msgid "annotating"
6879
6568
msgstr ""
6880
6569
6881
#: bzrlib/lock.py:548
6570
#: breezy/lock.py:549
6882
6571
msgid "{0!r} was {1} locked again"
6883
6572
msgstr ""
6884
6573
6885
#: bzrlib/lockdir.py:321
6574
#: breezy/lockdir.py:321
6886
6575
#, python-format
6887
6576
msgid "error removing pending lock: %s"
6888
6577
msgstr ""
6889
6578
6890
#: bzrlib/lockdir.py:616
6579
#: breezy/lockdir.py:616
6891
6580
msgid "Unable to obtain"
6892
6581
msgstr ""
6893
6582
6894
#: bzrlib/lockdir.py:618
6583
#: breezy/lockdir.py:618
6895
6584
msgid "Lock owner changed for"
6896
6585
msgstr ""
6897
6586
6898
#: bzrlib/lockdir.py:620
6587
#: breezy/lockdir.py:620
6588
#, python-brace-format
6899
6589
msgid "{0} lock {1} {2}."
6900
6590
msgstr ""
6901
6591
6902
#: bzrlib/lockdir.py:627
6592
#: breezy/lockdir.py:627
6903
6593
#, python-format
6904
6594
msgid "Will continue to try until %s, unless you press Ctrl-C."
6905
6595
msgstr ""
6906
6596
6907
#: bzrlib/lockdir.py:629
6597
#: breezy/lockdir.py:629
6908
6598
msgid "See \"bzr help break-lock\" for more."
6909
6599
msgstr ""
6910
6600
6911
#: bzrlib/lockdir.py:739
6601
#: breezy/lockdir.py:739
6912
6602
#, python-format
6913
6603
msgid ""
6914
6604
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6915
6605
msgstr ""
6916
6606
6917
#: bzrlib/log.py:563
6607
#: breezy/log.py:563
6918
6608
msgid "--exclude-common-ancestry requires two different revisions"
6919
6609
msgstr ""
6920
6610
6921
#: bzrlib/log.py:565
6611
#: breezy/log.py:565
6922
6612
#, python-format
6923
6613
msgid "invalid direction %r"
6924
6614
msgstr ""
6925
6615
6926
#: bzrlib/log.py:653
6616
#: breezy/log.py:653
6927
6617
msgid "Start revision not found in history of end revision."
6928
6618
msgstr ""
6929
6619
6930
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6620
#: breezy/log.py:1071 breezy/log.py:1129
6931
6621
msgid "Logging revision 0 is invalid."
6932
6622
msgstr ""
6933
6623
6934
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6624
#: breezy/log.py:1073 breezy/log.py:1131
6935
6625
msgid "Start revision must be older than the end revision."
6936
6626
msgstr ""
6937
6627
6938
#: bzrlib/log.py:1818
6628
#: breezy/log.py:1818
6939
6629
#, python-format
6940
6630
msgid "unknown log formatter: %r"
6941
6631
msgstr ""
6942
6632
6943
#: bzrlib/log.py:2114
6633
#: breezy/log.py:2114
6944
6634
msgid "fixes bug"
6945
6635
msgid_plural "fixes bugs"
6946
6636
msgstr[0] ""
6947
6637
msgstr[1] ""
6948
6638
6949
#: bzrlib/merge.py:689
6639
#: breezy/merge.py:689
6950
6640
msgid "All changes applied successfully."
6951
6641
msgstr ""
6952
6642
6953
#: bzrlib/merge.py:691
6643
#: breezy/merge.py:691
6954
6644
#, python-format
6955
6645
msgid "%d conflicts encountered."
6956
6646
msgstr ""
6957
6647
6958
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6648
#: breezy/merge.py:845 breezy/merge.py:1868
6959
6649
msgid "Preparing file merge"
6960
6650
msgstr ""
6961
6651
6962
#: bzrlib/multiparent.py:426
6652
#: breezy/multiparent.py:426
6963
6653
msgid "Importing revisions"
6964
6654
msgstr ""
6965
6655
6966
#: bzrlib/option.py:526
6656
# help of 'help' option
6657
#: breezy/option.py:526
6967
6658
msgid "Show help message."
6968
6659
msgstr ""
6969
6660
6970
#: bzrlib/option.py:528
6661
# help of 'quiet' option
6662
#: breezy/option.py:528
6971
6663
msgid "Only display errors and warnings."
6972
msgstr "エラーや警告だけを表示します。"
6664
msgstr ""
6973
6665
6974
#: bzrlib/option.py:531
6666
# help of 'usage' option
6667
#: breezy/option.py:531
6975
6668
msgid "Show usage message and options."
6976
msgstr "使い方とオプションを表示します。"
6669
msgstr ""
6977
6670
6978
#: bzrlib/option.py:533
6671
# help of 'verbose' option
6672
#: breezy/option.py:533
6979
6673
msgid "Display more information."
6980
msgstr "より詳細な情報を表示します。"
6674
msgstr ""
6981
6675
6982
#: bzrlib/option.py:541
6676
# help of 'change' option
6677
#: breezy/option.py:541
6983
6678
msgid ""
6984
6679
"Select changes introduced by the specified revision. See also \"help "
6985
6680
"revisionspec\"."
6986
6681
msgstr ""
6987
6682
6988
#: bzrlib/option.py:543
6683
# help of 'directory' option
6684
#: breezy/option.py:543
6989
6685
msgid "Branch to operate on, instead of working directory."
6990
6686
msgstr ""
6991
6687
6992
#: bzrlib/option.py:545
6688
# help of 'log-format=long' option
6689
#: breezy/option.py:545
6993
6690
msgid "Detailed log format."
6994
6691
msgstr ""
6995
6692
6996
#: bzrlib/option.py:545
6693
# help of 'log-format=gnu-changelog' option
6694
#: breezy/option.py:545
6997
6695
msgid "Format used by GNU ChangeLog files."
6998
6696
msgstr ""
6999
6697
7000
#: bzrlib/option.py:545
6698
# help of 'log-format=line' option
6699
#: breezy/option.py:545
7001
6700
msgid "Log format with one line per revision."
7002
6701
msgstr ""
7003
6702
7004
#: bzrlib/option.py:545
6703
# help of 'log-format=short' option
6704
#: breezy/option.py:545
7005
6705
msgid "Moderately short log format."
7006
6706
msgstr ""
7007
6707
7008
#: bzrlib/option.py:545
6708
# help of 'log-format' option
6709
#: breezy/option.py:545
7009
6710
msgid "Use specified log format."
7010
6711
msgstr ""
7011
6712
7012
#: bzrlib/option.py:547
6713
# title of 'log-format' option
6714
#: breezy/option.py:547
7013
6715
msgid "Log format"
7014
6716
msgstr ""
7015
6717
7016
#: bzrlib/option.py:549
6718
# help of 'merge-type=lca' option
6719
#: breezy/option.py:549
7017
6720
msgid "LCA-newness merge."
7018
6721
msgstr ""
7019
6722
7020
#: bzrlib/option.py:549
6723
# help of 'merge-type=diff3' option
6724
#: breezy/option.py:549
7021
6725
msgid "Merge using external diff3."
7022
6726
msgstr ""
7023
6727
7024
#: bzrlib/option.py:549
6728
# help of 'merge-type=merge3' option
6729
#: breezy/option.py:549
7025
6730
msgid "Native diff3-style merge."
7026
6731
msgstr ""
7027
6732
7028
#: bzrlib/option.py:549
6733
# help of 'merge-type' option
6734
#: breezy/option.py:549
7029
6735
msgid "Select a particular merge algorithm."
7030
6736
msgstr ""
7031
6737
7032
#: bzrlib/option.py:549
6738
# help of 'merge-type=weave' option
6739
#: breezy/option.py:549
7033
6740
msgid "Weave-based merge."
7034
6741
msgstr ""
7035
6742
7036
#: bzrlib/option.py:551
6743
# title of 'merge-type' option
6744
#: breezy/option.py:551
7037
6745
msgid "Merge algorithm"
7038
6746
msgstr ""
7039
6747
7040
#: bzrlib/option.py:554
6748
# help of 'message' option
6749
#: breezy/option.py:554
7041
6750
msgid "Message string."
7042
6751
msgstr ""
7043
6752
7044
#: bzrlib/option.py:556
6753
# help of 'null' option
6754
#: breezy/option.py:556
7045
6755
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
7046
6756
msgstr ""
7047
6757
7048
#: bzrlib/option.py:558
6758
# help of 'overwrite' option
6759
#: breezy/option.py:558
7049
6760
msgid "Ignore differences between branches and overwrite unconditionally."
7050
6761
msgstr ""
7051
6762
7052
#: bzrlib/option.py:560
6763
# help of 'remember' option
6764
#: breezy/option.py:560
7053
6765
msgid "Remember the specified location as a default."
7054
6766
msgstr ""
7055
6767
7056
#: bzrlib/option.py:562
6768
# help of 'reprocess' option
6769
#: breezy/option.py:562
7057
6770
msgid "Reprocess to reduce spurious conflicts."
7058
6771
msgstr ""
7059
6772
7060
#: bzrlib/option.py:566
6773
# help of 'revision' option
6774
#: breezy/option.py:566
7061
6775
msgid "See \"help revisionspec\" for details."
7062
msgstr "詳細は \"help revisionspec\" を参照してください。"
6776
msgstr ""
7063
6777
7064
#: bzrlib/option.py:568
6778
# help of 'show-ids' option
6779
#: breezy/option.py:568
7065
6780
msgid "Show internal object ids."
7066
6781
msgstr ""
7067
6782
7068
#: bzrlib/option.py:571
6783
# help of 'timezone' option
6784
#: breezy/option.py:571
7069
6785
msgid "Display timezone as local, original, or utc."
7070
6786
msgstr ""
7071
6787
7072
#: bzrlib/osutils.py:100
6788
#: breezy/osutils.py:101
7073
6789
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
7074
6790
msgstr ""
7075
6791
7076
#: bzrlib/osutils.py:220
6792
#: breezy/osutils.py:221
7077
6793
msgid "lstat/stat of ({0!r}): {1!r}"
7078
6794
msgstr ""
7079
6795
7080
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6796
#: breezy/osutils.py:1041 breezy/osutils.py:1052
7081
6797
#, python-format
7082
6798
msgid "sorry, %r not allowed in path"
7083
6799
msgstr ""
7084
6800
7085
#: bzrlib/osutils.py:1259
6801
#: breezy/osutils.py:1270
7086
6802
#, python-format
7087
6803
msgid "%r is too short to calculate a relative path"
7088
6804
msgstr ""
7089
6805
7090
#: bzrlib/plugin.py:143
6806
#: breezy/plugin.py:143
7091
6807
#, python-format
7092
6808
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
7093
6809
msgstr ""
7094
6810
7095
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6811
# help of 'plugin' option of 'bash-completion' command
6812
#: breezy/plugins/bash_completion/bashcomp.py:411
7096
6813
msgid "Enable completions for the selected plugin (default: all plugins)"
7097
6814
msgstr ""
7098
6815
7099
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6816
#: breezy/plugins/bash_completion/bashcomp.py:412
7100
6817
msgid "Generate a shell function for bash command line completion."
7101
6818
msgstr ""
7102
6819
7103
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6820
#: breezy/plugins/bash_completion/bashcomp.py:414
7104
6821
msgid ""
7105
6822
"This command generates a shell function which can be used by bash to\n"
7106
6823
"automatically complete the currently typed command when the user presses\n"
7107
6824
"the completion key (usually tab)."
7108
6825
msgstr ""
7109
6826
7110
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6827
#: breezy/plugins/bash_completion/bashcomp.py:418
7111
6828
msgid ""
7112
6829
"Commonly used like this:\n"
7113
6830
" eval \"`bzr bash-completion`\""
7114
6831
msgstr ""
7115
6832
7116
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6833
# help of 'function-name' option of 'bash-completion' command
6834
#: breezy/plugins/bash_completion/bashcomp.py:424
7117
6835
msgid "Name of the generated function (default: _bzr)"
7118
6836
msgstr ""
7119
6837
7120
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6838
# help of 'function-only' option of 'bash-completion' command
6839
#: breezy/plugins/bash_completion/bashcomp.py:426
7121
6840
msgid "Generate only the shell function, don't enable it"
7122
6841
msgstr ""
7123
6842
7124
#: bzrlib/plugins/launchpad/account.py:66
6843
#: breezy/plugins/grep/cmds.py:77
6844
msgid "Print lines matching PATTERN for specified files and revisions."
6845
msgstr ""
6846
6847
#: breezy/plugins/grep/cmds.py:79
6848
msgid ""
6849
"This command searches the specified files and revisions for a given\n"
6850
"pattern. The pattern is specified as a Python regular expressions[1]."
6851
msgstr ""
6852
6853
#: breezy/plugins/grep/cmds.py:82
6854
msgid ""
6855
"If the file name is not specified, the revisions starting with the\n"
6856
"current directory are searched recursively. If the revision number is\n"
6857
"not specified, the working copy is searched. To search the last committed\n"
6858
"revision, use the '-r -1' or '-r last:1' option."
6859
msgstr ""
6860
6861
#: breezy/plugins/grep/cmds.py:87
6862
msgid ""
6863
"Unversioned files are not searched unless explicitly specified on the\n"
6864
"command line. Unversioned directores are not searched."
6865
msgstr ""
6866
6867
#: breezy/plugins/grep/cmds.py:90
6868
msgid ""
6869
"When searching a pattern, the output is shown in the 'filepath:string'\n"
6870
"format. If a revision is explicitly searched, the output is shown as\n"
6871
"'filepath~N:string', where N is the revision number."
6872
msgstr ""
6873
6874
#: breezy/plugins/grep/cmds.py:94
6875
msgid ""
6876
"--include and --exclude options can be used to search only (or exclude\n"
6877
"from search) files with base name matches the specified Unix style GLOB\n"
6878
"pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
6879
"to quote wildcard or backslash character literally. Note that the glob\n"
6880
"pattern is not a regular expression."
6881
msgstr ""
6882
6883
#: breezy/plugins/grep/cmds.py:100
6884
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
6885
msgstr ""
6886
6887
# help of 'color' option of 'grep' command
6888
#: breezy/plugins/grep/cmds.py:109
6889
msgid "Show match in color. WHEN is never, always or auto."
6890
msgstr ""
6891
6892
# help of 'diff' option of 'grep' command
6893
#: breezy/plugins/grep/cmds.py:111
6894
msgid "Grep for pattern in changeset for each revision."
6895
msgstr ""
6896
6897
# help of 'exclude' option of 'grep' command
6898
#: breezy/plugins/grep/cmds.py:113
6899
msgid "Skip files whose base name matches GLOB."
6900
msgstr ""
6901
6902
# help of 'include' option of 'grep' command
6903
#: breezy/plugins/grep/cmds.py:115
6904
msgid "Search only files whose base name matches GLOB."
6905
msgstr ""
6906
6907
# help of 'files-with-matches' option of 'grep' command
6908
#: breezy/plugins/grep/cmds.py:117
6909
msgid "Print only the name of each input file in which PATTERN is found."
6910
msgstr ""
6911
6912
# help of 'files-without-match' option of 'grep' command
6913
#: breezy/plugins/grep/cmds.py:120
6914
msgid "Print only the name of each input file in which PATTERN is not found."
6915
msgstr ""
6916
6917
# help of 'fixed-string' option of 'grep' command
6918
#: breezy/plugins/grep/cmds.py:123
6919
msgid "Interpret PATTERN is a single fixed string (not regex)."
6920
msgstr ""
6921
6922
# help of 'from-root' option of 'grep' command
6923
#: breezy/plugins/grep/cmds.py:125
6924
msgid ""
6925
"Search for pattern starting from the root of the branch. (implies --"
6926
"recursive)"
6927
msgstr ""
6928
6929
# help of 'ignore-case' option of 'grep' command
6930
#: breezy/plugins/grep/cmds.py:128
6931
msgid "ignore case distinctions while matching."
6932
msgstr ""
6933
6934
# help of 'levels' option of 'grep' command
6935
#: breezy/plugins/grep/cmds.py:130
6936
msgid ""
6937
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
6938
msgstr ""
6939
6940
# help of 'line-number' option of 'grep' command
6941
#: breezy/plugins/grep/cmds.py:135
6942
msgid "show 1-based line number."
6943
msgstr ""
6944
6945
# help of 'no-recursive' option of 'grep' command
6946
#: breezy/plugins/grep/cmds.py:137
6947
msgid "Don't recurse into subdirectories. (default is --recursive)"
6948
msgstr ""
6949
6950
# help of 'null' option of 'grep' command
6951
#: breezy/plugins/grep/cmds.py:139
6952
msgid ""
6953
"Write an ASCII NUL (\\0) separator between output lines rather than a "
6954
"newline."
6955
msgstr ""
6956
6957
#: breezy/plugins/launchpad/account.py:66
7125
6958
msgid "Setting ssh/sftp usernames for launchpad.net."
7126
6959
msgstr ""
7127
6960
7128
#: bzrlib/plugins/launchpad/cmds.py:44
6961
#: breezy/plugins/launchpad/cmds.py:43
7129
6962
msgid "Register a branch with launchpad.net."
7130
6963
msgstr ""
7131
6964
7132
#: bzrlib/plugins/launchpad/cmds.py:46
6965
#: breezy/plugins/launchpad/cmds.py:45
7133
6966
msgid ""
7134
6967
"This command lists a bzr branch in the directory of branches on\n"
7135
6968
"launchpad.net. Registration allows the branch to be associated with\n"
7136
6969
"bugs or specifications."
7137
6970
msgstr ""
7138
6971
7139
#: bzrlib/plugins/launchpad/cmds.py:50
6972
#: breezy/plugins/launchpad/cmds.py:49
7140
6973
msgid ""
7141
6974
"Before using this command you must register the project to which the\n"
7142
6975
"branch belongs, and create an account for yourself on launchpad.net."
7143
6976
msgstr ""
7144
6977
7145
#: bzrlib/plugins/launchpad/cmds.py:53
6978
#: breezy/plugins/launchpad/cmds.py:52
7146
6979
msgid ""
7147
6980
"arguments:\n"
7148
6981
" public_url: The publicly visible url for the branch to register.\n"
7154
6987
" otherwise error."
7155
6988
msgstr ""
7156
6989
7157
#: bzrlib/plugins/launchpad/cmds.py:62
6990
#: breezy/plugins/launchpad/cmds.py:61
7158
6991
msgid ""
7159
6992
"example:\n"
7160
6993
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7161
6994
" --project fooproject"
7162
6995
msgstr ""
7163
6996
7164
#: bzrlib/plugins/launchpad/cmds.py:69
6997
# help of 'project' option of 'register-branch' command
6998
#: breezy/plugins/launchpad/cmds.py:68
7165
6999
msgid "Launchpad project short name to associate with the branch."
7166
7000
msgstr ""
7167
7001
7168
#: bzrlib/plugins/launchpad/cmds.py:76
7002
# help of 'branch-name' option of 'register-branch' command
7003
#: breezy/plugins/launchpad/cmds.py:75
7169
7004
msgid ""
7170
7005
"Short name for the branch; by default taken from the last component of the "
7171
7006
"url."
7172
7007
msgstr ""
7173
7008
7174
#: bzrlib/plugins/launchpad/cmds.py:80
7009
# help of 'branch-title' option of 'register-branch' command
7010
#: breezy/plugins/launchpad/cmds.py:79
7175
7011
msgid "One-sentence description of the branch."
7176
7012
msgstr ""
7177
7013
7178
#: bzrlib/plugins/launchpad/cmds.py:83
7014
# help of 'branch-description' option of 'register-branch' command
7015
#: breezy/plugins/launchpad/cmds.py:82
7179
7016
msgid "Longer description of the purpose or contents of the branch."
7180
7017
msgstr ""
7181
7018
7182
#: bzrlib/plugins/launchpad/cmds.py:86
7019
# help of 'author' option of 'register-branch' command
7020
#: breezy/plugins/launchpad/cmds.py:85
7183
7021
msgid "Branch author's email address, if not yourself."
7184
7022
msgstr ""
7185
7023
7186
#: bzrlib/plugins/launchpad/cmds.py:89
7024
# help of 'link-bug' option of 'register-branch' command
7025
#: breezy/plugins/launchpad/cmds.py:88
7187
7026
msgid "The bug this branch fixes."
7188
7027
msgstr ""
7189
7028
7190
#: bzrlib/plugins/launchpad/cmds.py:92
7029
# help of 'dry-run' option of 'register-branch' command
7030
#: breezy/plugins/launchpad/cmds.py:91
7191
7031
msgid "Prepare the request but don't actually send it."
7192
7032
msgstr ""
7193
7033
7194
#: bzrlib/plugins/launchpad/cmds.py:114
7034
#: breezy/plugins/launchpad/cmds.py:113
7195
7035
msgid ""
7196
7036
"register-branch requires a public branch url - see bzr help register-branch."
7197
7037
msgstr ""
7198
7038
7199
#: bzrlib/plugins/launchpad/cmds.py:122
7039
#: breezy/plugins/launchpad/cmds.py:121
7200
7040
msgid "--product is deprecated; please use --project."
7201
7041
msgstr ""
7202
7042
7203
#: bzrlib/plugins/launchpad/cmds.py:152
7043
#: breezy/plugins/launchpad/cmds.py:151
7204
7044
msgid "Open a Launchpad branch page in your web browser."
7205
7045
msgstr ""
7206
7046
7207
#: bzrlib/plugins/launchpad/cmds.py:157
7047
# help of 'dry-run' option of 'launchpad-open' command
7048
#: breezy/plugins/launchpad/cmds.py:156
7208
7049
msgid "Do not actually open the browser. Just say the URL we would use."
7209
7050
msgstr ""
7210
7051
7211
#: bzrlib/plugins/launchpad/cmds.py:192
7052
#: breezy/plugins/launchpad/cmds.py:191
7212
7053
#, python-format
7213
7054
msgid "Opening %s in web browser"
7214
7055
msgstr ""
7215
7056
7216
#: bzrlib/plugins/launchpad/cmds.py:200
7057
#: breezy/plugins/launchpad/cmds.py:199
7217
7058
msgid "Show or set the Launchpad user ID."
7218
7059
msgstr ""
7219
7060
7220
#: bzrlib/plugins/launchpad/cmds.py:202
7061
#: breezy/plugins/launchpad/cmds.py:201
7221
7062
msgid ""
7222
7063
"When communicating with Launchpad, some commands need to know your\n"
7223
7064
"Launchpad user ID. This command can be used to set or show the\n"
7224
7065
"user ID that Bazaar will use for such communication."
7225
7066
msgstr ""
7226
7067
7227
#: bzrlib/plugins/launchpad/cmds.py:206
7068
#: breezy/plugins/launchpad/cmds.py:205
7228
7069
msgid ""
7229
7070
":Examples:\n"
7230
7071
" Show the Launchpad ID of the current user::"
7231
7072
msgstr ""
7232
7073
7233
#: bzrlib/plugins/launchpad/cmds.py:209
7074
#: breezy/plugins/launchpad/cmds.py:208
7234
7075
msgid " bzr launchpad-login"
7235
7076
msgstr ""
7236
7077
7237
#: bzrlib/plugins/launchpad/cmds.py:211
7078
#: breezy/plugins/launchpad/cmds.py:210
7238
7079
msgid " Set the Launchpad ID of the current user to 'bob'::"
7239
7080
msgstr ""
7240
7081
7241
#: bzrlib/plugins/launchpad/cmds.py:213
7082
#: breezy/plugins/launchpad/cmds.py:212
7242
7083
msgid " bzr launchpad-login bob"
7243
7084
msgstr ""
7244
7085
7245
#: bzrlib/plugins/launchpad/cmds.py:220
7086
# help of 'no-check' option of 'launchpad-login' command
7087
#: breezy/plugins/launchpad/cmds.py:219
7246
7088
msgid "Don't check that the user name is valid."
7247
7089
msgstr ""
7248
7090
7249
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
7091
#: breezy/plugins/launchpad/cmds.py:234 breezy/plugins/launchpad/cmds.py:245
7250
7092
msgid "Launchpad user ID exists and has SSH keys.\n"
7251
7093
msgstr ""
7252
7094
7253
#: bzrlib/plugins/launchpad/cmds.py:238
7095
#: breezy/plugins/launchpad/cmds.py:237
7254
7096
msgid "No Launchpad user ID configured.\n"
7255
7097
msgstr ""
7256
7098
7257
#: bzrlib/plugins/launchpad/cmds.py:249
7099
#: breezy/plugins/launchpad/cmds.py:248
7258
7100
#, python-format
7259
7101
msgid "Launchpad user ID set to '%s'.\n"
7260
7102
msgstr ""
7261
7103
7262
#: bzrlib/plugins/launchpad/cmds.py:255
7104
#: breezy/plugins/launchpad/cmds.py:254
7263
7105
msgid "Ask Launchpad to mirror a branch now."
7264
7106
msgstr ""
7265
7107
7266
#: bzrlib/plugins/launchpad/cmds.py:272
7108
#: breezy/plugins/launchpad/cmds.py:271
7267
7109
msgid "Propose merging a branch on Launchpad."
7268
7110
msgstr ""
7269
7111
7270
#: bzrlib/plugins/launchpad/cmds.py:274
7112
#: breezy/plugins/launchpad/cmds.py:273
7271
7113
msgid ""
7272
7114
"This will open your usual editor to provide the initial comment. When it\n"
7273
7115
"has created the proposal, it will open it in your default web browser."
7274
7116
msgstr ""
7275
7117
7276
#: bzrlib/plugins/launchpad/cmds.py:277
7118
#: breezy/plugins/launchpad/cmds.py:276
7277
7119
msgid ""
7278
7120
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7279
7121
"is not supplied, the remembered submit branch will be used. If no submit\n"
7280
7122
"branch is remembered, the development focus will be used."
7281
7123
msgstr ""
7282
7124
7283
#: bzrlib/plugins/launchpad/cmds.py:281
7125
#: breezy/plugins/launchpad/cmds.py:280
7284
7126
msgid ""
7285
7127
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7286
7128
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7288
7130
"may optionally be followed by '=' and the review type. For example:"
7289
7131
msgstr ""
7290
7132
7291
#: bzrlib/plugins/launchpad/cmds.py:286
7133
#: breezy/plugins/launchpad/cmds.py:285
7292
7134
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7293
7135
msgstr ""
7294
7136
7295
#: bzrlib/plugins/launchpad/cmds.py:288
7137
#: breezy/plugins/launchpad/cmds.py:287
7296
7138
msgid ""
7297
7139
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7298
7140
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7299
7141
msgstr ""
7300
7142
7301
#: bzrlib/plugins/launchpad/cmds.py:293
7143
# help of 'staging' option of 'lp-propose-merge' command
7144
#: breezy/plugins/launchpad/cmds.py:292
7302
7145
msgid "Propose the merge on staging."
7303
7146
msgstr ""
7304
7147
7305
#: bzrlib/plugins/launchpad/cmds.py:295
7148
# help of 'message' option of 'lp-propose-merge' command
7149
#: breezy/plugins/launchpad/cmds.py:294
7306
7150
msgid "Commit message."
7307
7151
msgstr ""
7308
7152
7309
#: bzrlib/plugins/launchpad/cmds.py:297
7310
msgid "Mark the proposal as approved immediately."
7153
# help of 'approve' option of 'lp-propose-merge' command
7154
#: breezy/plugins/launchpad/cmds.py:296
7155
msgid ""
7156
"Mark the proposal as approved immediately, setting the approved revision to "
7157
"tip."
7311
7158
msgstr ""
7312
7159
7313
#: bzrlib/plugins/launchpad/cmds.py:298
7160
# help of 'fixes' option of 'lp-propose-merge' command
7161
#: breezy/plugins/launchpad/cmds.py:298
7314
7162
msgid "The bug this proposal fixes."
7315
7163
msgstr ""
7316
7164
7317
#: bzrlib/plugins/launchpad/cmds.py:300
7165
# help of 'review' option of 'lp-propose-merge' command
7166
#: breezy/plugins/launchpad/cmds.py:300
7318
7167
msgid "Requested reviewer and optional type."
7319
7168
msgstr ""
7320
7169
7321
#: bzrlib/plugins/launchpad/cmds.py:335
7170
#: breezy/plugins/launchpad/cmds.py:335
7322
7171
msgid "Find the proposal to merge this revision."
7323
7172
msgstr ""
7324
7173
7325
#: bzrlib/plugins/launchpad/cmds.py:337
7174
#: breezy/plugins/launchpad/cmds.py:337
7326
7175
msgid ""
7327
7176
"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."
7177
"This works only if the if the merged_revno was recorded for the merge\n"
7178
"proposal. The proposal(s) are opened in a web browser."
7331
7179
msgstr ""
7332
7180
7333
#: bzrlib/plugins/launchpad/cmds.py:342
7181
#: breezy/plugins/launchpad/cmds.py:341
7334
7182
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."
7183
"Only the revision specified is searched for. To find the mainline\n"
7184
"revision that merged it into mainline, use the \"mainline\" revision spec."
7337
7185
msgstr ""
7338
7186
7339
#: bzrlib/plugins/launchpad/cmds.py:345
7187
#: breezy/plugins/launchpad/cmds.py:344
7340
7188
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7341
7189
msgstr ""
7342
7190
7343
#: bzrlib/plugins/launchpad/cmds.py:347
7344
msgid " bzr lp-find-proposal -r annotate:README:1"
7191
#: breezy/plugins/launchpad/cmds.py:346
7192
msgid " bzr lp-find-proposal -r mainline:annotate:README:1"
7345
7193
msgstr ""
7346
7194
7347
#: bzrlib/plugins/launchpad/cmds.py:363
7195
#: breezy/plugins/launchpad/cmds.py:365
7348
7196
msgid "No review found."
7349
7197
msgstr ""
7350
7198
7351
#: bzrlib/plugins/launchpad/cmds.py:364
7199
#: breezy/plugins/launchpad/cmds.py:366
7352
7200
#, python-format
7353
7201
msgid "%d proposals(s) found."
7354
7202
msgstr ""
7355
7203
7356
#: bzrlib/plugins/launchpad/cmds.py:374
7357
msgid "Finding revision-id"
7358
msgstr ""
7359
7360
#: bzrlib/plugins/launchpad/cmds.py:381
7361
msgid "Finding merge"
7362
msgstr ""
7363
7364
#: bzrlib/plugins/launchpad/cmds.py:386
7365
msgid "Finding revno"
7366
msgstr ""
7367
7368
#: bzrlib/plugins/launchpad/cmds.py:392
7369
msgid "Finding Launchpad branch"
7370
msgstr ""
7371
7372
#: bzrlib/plugins/launchpad/cmds.py:395
7204
#: breezy/plugins/launchpad/cmds.py:378
7373
7205
msgid "Finding proposals"
7374
7206
msgstr ""
7375
7207
7376
#: bzrlib/plugins/launchpad/lp_api.py:241
7377
#: bzrlib/plugins/launchpad/lp_api.py:246
7208
#: breezy/plugins/launchpad/lp_api.py:231
7209
#: breezy/plugins/launchpad/lp_api.py:236
7378
7210
#, python-format
7379
7211
msgid "%s is not registered on Launchpad"
7380
7212
msgstr ""
7381
7213
7382
#: bzrlib/plugins/launchpad/lp_api.py:256
7214
#: breezy/plugins/launchpad/lp_api.py:246
7383
7215
#, python-format
7384
7216
msgid "%s has no development focus."
7385
7217
msgstr ""
7386
7218
7387
#: bzrlib/plugins/launchpad/lp_api.py:261
7219
#: breezy/plugins/launchpad/lp_api.py:251
7388
7220
#, python-format
7389
7221
msgid "development focus %s has no branch."
7390
7222
msgstr ""
7391
7223
7392
#: bzrlib/plugins/launchpad/lp_api.py:266
7224
#: breezy/plugins/launchpad/lp_api.py:256
7393
7225
#, python-format
7394
7226
msgid "source package %s has no branch."
7395
7227
msgstr ""
7396
7228
7397
#: bzrlib/plugins/launchpad/lp_api.py:270
7229
#: breezy/plugins/launchpad/lp_api.py:260
7398
7230
#, python-format
7399
7231
msgid "%s has no associated product or source package."
7400
7232
msgstr ""
7401
7233
7402
#: bzrlib/plugins/launchpad/lp_api.py:282
7234
#: breezy/plugins/launchpad/lp_api.py:272
7403
7235
#, python-format
7404
7236
msgid "%s is already up-to-date."
7405
7237
msgstr ""
7406
7238
7407
#: bzrlib/plugins/launchpad/lp_api.py:289
7239
#: breezy/plugins/launchpad/lp_api.py:279
7408
7240
#, python-format
7409
7241
msgid "Pushing to %s"
7410
7242
msgstr ""
7411
7243
7412
#: bzrlib/plugins/launchpad/lp_directory.py:170
7244
#: breezy/plugins/launchpad/lp_directory.py:170
7245
#, python-brace-format
7413
7246
msgid ""
7414
7247
"resolution for {0}\n"
7415
7248
" local: {1}\n"
7416
7249
" remote: {2}"
7417
7250
msgstr ""
7418
7251
7419
#: bzrlib/plugins/launchpad/lp_propose.py:150
7252
#: breezy/plugins/launchpad/lp_propose.py:161
7420
7253
#, python-format
7421
7254
msgid "There is already a branch merge proposal: %s"
7422
7255
msgstr ""
7423
7256
7424
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7257
#: breezy/plugins/weave_fmt/bzrdir.py:237
7425
7258
msgid "pb parameter to convert() is deprecated"
7426
7259
msgstr ""
7427
7260
7428
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7261
#: breezy/plugins/weave_fmt/bzrdir.py:240
7429
7262
msgid "starting upgrade from format 4 to 5"
7430
7263
msgstr ""
7431
7264
7432
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7265
#: breezy/plugins/weave_fmt/bzrdir.py:250
7433
7266
msgid "note: upgrade may be faster if all store files are ungzipped first"
7434
7267
msgstr ""
7435
7268
7436
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7269
#: breezy/plugins/weave_fmt/bzrdir.py:279
7437
7270
msgid "converting revision"
7438
7271
msgstr ""
7439
7272
7440
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7273
#: breezy/plugins/weave_fmt/bzrdir.py:284
7441
7274
msgid "upgraded to weaves:"
7442
7275
msgstr ""
7443
7276
7444
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7277
#: breezy/plugins/weave_fmt/bzrdir.py:285
7445
7278
#, python-format
7446
7279
msgid "%6d revisions and inventories"
7447
7280
msgstr ""
7448
7281
7449
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7282
#: breezy/plugins/weave_fmt/bzrdir.py:287
7450
7283
#, python-format
7451
7284
msgid "%6d revisions not present"
7452
7285
msgstr ""
7453
7286
7454
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7287
#: breezy/plugins/weave_fmt/bzrdir.py:289
7455
7288
#, python-format
7456
7289
msgid "%6d texts"
7457
7290
msgstr ""
7458
7291
7459
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7292
#: breezy/plugins/weave_fmt/bzrdir.py:325
7460
7293
msgid "writing weave"
7461
7294
msgstr ""
7462
7295
7463
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7464
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7296
#: breezy/plugins/weave_fmt/bzrdir.py:329
7297
#: breezy/plugins/weave_fmt/bzrdir.py:331
7465
7298
msgid "inventory"
7466
7299
msgstr ""
7467
7300
7468
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7301
#: breezy/plugins/weave_fmt/bzrdir.py:348
7469
7302
msgid "write revision"
7470
7303
msgstr ""
7471
7304
7472
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7305
#: breezy/plugins/weave_fmt/bzrdir.py:362
7473
7306
msgid "loading revision"
7474
7307
msgstr ""
7475
7308
7476
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7309
#: breezy/plugins/weave_fmt/bzrdir.py:367
7477
7310
#, python-format
7478
7311
msgid "revision {%s} not present in branch; will be converted as a ghost"
7479
7312
msgstr ""
7480
7313
7481
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7314
#: breezy/plugins/weave_fmt/bzrdir.py:507
7482
7315
msgid "starting upgrade from format 5 to 6"
7483
7316
msgstr ""
7484
7317
7485
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7318
#: breezy/plugins/weave_fmt/bzrdir.py:517
7486
7319
#, python-format
7487
7320
msgid "adding prefixes to %s"
7488
7321
msgstr ""
7489
7322
7490
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7323
#: breezy/plugins/weave_fmt/bzrdir.py:557
7491
7324
msgid "starting upgrade from format 6 to metadir"
7492
7325
msgstr ""
7493
7326
7494
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7327
#: breezy/plugins/weave_fmt/bzrdir.py:565
7495
7328
msgid "Removing ancestry.weave"
7496
7329
msgstr ""
7497
7330
7498
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7331
#: breezy/plugins/weave_fmt/bzrdir.py:570
7499
7332
msgid "Finding branch files"
7500
7333
msgstr ""
7501
7334
7502
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7335
#: breezy/plugins/weave_fmt/bzrdir.py:580
7503
7336
msgid "Upgrading repository"
7504
7337
msgstr ""
7505
7338
7506
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7339
#: breezy/plugins/weave_fmt/bzrdir.py:590
7507
7340
msgid "Upgrading branch"
7508
7341
msgstr ""
7509
7342
7510
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7343
#: breezy/plugins/weave_fmt/bzrdir.py:613
7511
7344
msgid "No working tree."
7512
7345
msgstr ""
7513
7346
7514
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7347
#: breezy/plugins/weave_fmt/bzrdir.py:620
7515
7348
msgid "Upgrading working tree"
7516
7349
msgstr ""
7517
7350
7518
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7351
#: breezy/plugins/weave_fmt/bzrdir.py:641
7519
7352
#, python-format
7520
7353
msgid "Make %s lock"
7521
7354
msgstr ""
7522
7355
7523
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7356
#: breezy/plugins/weave_fmt/bzrdir.py:652
7524
7357
#, python-format
7525
7358
msgid "Moving %s"
7526
7359
msgstr ""
7527
7360
7528
#: bzrlib/push.py:56
7361
#: breezy/push.py:56
7529
7362
msgid "Created new branch."
7530
7363
msgstr ""
7531
7364
7532
#: bzrlib/push.py:97
7365
#: breezy/push.py:97
7533
7366
#, python-format
7534
7367
msgid ""
7535
7368
"Target directory %s already contains a .bzr directory, but it is not valid."
7536
7369
msgstr ""
7537
7370
7538
#: bzrlib/push.py:101
7371
#: breezy/push.py:101
7539
7372
#, python-format
7540
7373
msgid ""
7541
7374
"Target directory %s already exists, but does not have a .bzr directory. "
7542
7375
"Supply --use-existing-dir to push there anyway."
7543
7376
msgstr ""
7544
7377
7545
#: bzrlib/push.py:122
7378
#: breezy/push.py:122
7546
7379
#, python-format
7547
7380
msgid "Too many redirections trying to make %s."
7548
7381
msgstr ""
7549
7382
7550
#: bzrlib/push.py:148
7383
#: breezy/push.py:148
7551
7384
msgid ""
7552
7385
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7553
7386
"information."
7554
7387
msgstr ""
7555
7388
7556
#: bzrlib/push.py:152
7389
#: breezy/push.py:152
7557
7390
#, python-format
7558
7391
msgid ""
7559
7392
"It is not possible to losslessly push to %s. You may want to use dpush "
7560
7393
"instead."
7561
7394
msgstr ""
7562
7395
7563
#: bzrlib/push.py:158
7396
#: breezy/push.py:158
7564
7397
#, python-format
7565
7398
msgid ""
7566
7399
"At %s you have a valid .bzr control directory, but not a branch or "
7568
7401
"directory out of the way and try again."
7569
7402
msgstr ""
7570
7403
7571
#: bzrlib/reconcile.py:97
7404
#: breezy/reconcile.py:97
7572
7405
#, python-format
7573
7406
msgid "Reconciling branch %s"
7574
7407
msgstr ""
7575
7408
7576
#: bzrlib/reconcile.py:103
7409
#: breezy/reconcile.py:103
7577
7410
#, python-format
7578
7411
msgid "Reconciling repository %s"
7579
7412
msgstr ""
7580
7413
7581
#: bzrlib/reconcile.py:105
7414
#: breezy/reconcile.py:105
7582
7415
msgid "Reconciling repository"
7583
7416
msgstr ""
7584
7417
7585
#: bzrlib/reconcile.py:111
7418
#: breezy/reconcile.py:111
7586
7419
#, python-format
7587
7420
msgid "%s cannot canonicalize CHKs."
7588
7421
msgstr ""
7589
7422
7590
#: bzrlib/reconcile.py:119
7423
#: breezy/reconcile.py:119
7591
7424
msgid "Reconcile aborted: revision index has inconsistent parents."
7592
7425
msgstr ""
7593
7426
7594
#: bzrlib/reconcile.py:121
7427
#: breezy/reconcile.py:121
7595
7428
msgid "Run \"bzr check\" for more details."
7596
7429
msgstr ""
7597
7430
7598
#: bzrlib/reconcile.py:123
7431
#: breezy/reconcile.py:123
7599
7432
msgid "Reconciliation complete."
7600
7433
msgstr ""
7601
7434
7602
#: bzrlib/reconcile.py:166
7435
#: breezy/reconcile.py:166
7436
#, python-brace-format
7603
7437
msgid "Fixing last revision info {0} => {1}"
7604
7438
msgstr ""
7605
7439
7606
#: bzrlib/reconcile.py:173
7440
#: breezy/reconcile.py:173
7607
7441
msgid "revision_history ok."
7608
7442
msgstr ""
7609
7443
7610
#: bzrlib/reconcile.py:234
7444
#: breezy/reconcile.py:234
7611
7445
msgid "Reading inventory data"
7612
7446
msgstr ""
7613
7447
7614
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7448
#: breezy/reconcile.py:254 breezy/reconcile.py:384
7615
7449
msgid "Inventory ok."
7616
7450
msgstr ""
7617
7451
7618
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7452
#: breezy/reconcile.py:256 breezy/reconcile.py:386
7619
7453
msgid "Backing up inventory"
7620
7454
msgstr ""
7621
7455
7622
#: bzrlib/reconcile.py:258
7456
#: breezy/reconcile.py:258
7623
7457
msgid "Backup inventory created."
7624
7458
msgstr ""
7625
7459
7626
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7460
#: breezy/reconcile.py:274 breezy/reconcile.py:405
7627
7461
msgid "Writing weave"
7628
7462
msgstr ""
7629
7463
7630
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7464
#: breezy/reconcile.py:277 breezy/reconcile.py:408
7631
7465
msgid "Inventory regenerated."
7632
7466
msgstr ""
7633
7467
7634
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7468
#: breezy/reconcile.py:371 breezy/reconcile.py:373 breezy/reconcile.py:376
7635
7469
msgid "Reading indexes"
7636
7470
msgstr ""
7637
7471
7638
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7472
#: breezy/reconcile.py:380 breezy/reconcile.py:382
7639
7473
msgid "Checking unused inventories"
7640
7474
msgstr ""
7641
7475
7642
#: bzrlib/reconcile.py:388
7476
#: breezy/reconcile.py:388
7643
7477
msgid "Backup Inventory created"
7644
7478
msgstr ""
7645
7479
7646
#: bzrlib/reconcile.py:446
7480
#: breezy/reconcile.py:446
7647
7481
msgid "Fixing text parents"
7648
7482
msgstr ""
7649
7483
7650
#: bzrlib/reconfigure.py:54
7484
#: breezy/reconfigure.py:54
7485
#, python-brace-format
7651
7486
msgid "{0} is now stacked on {1}\n"
7652
7487
msgstr ""
7653
7488
7654
#: bzrlib/reconfigure.py:69
7489
#: breezy/reconfigure.py:69
7655
7490
#, python-format
7656
7491
msgid "%s is now not stacked\n"
7657
7492
msgstr ""
7658
7493
7659
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7494
#: breezy/remote.py:1228 breezy/repository.py:289
7660
7495
#, python-format
7661
7496
msgid "bzr: ERROR (ignored): %s"
7662
7497
msgstr ""
7663
7498
7664
#: bzrlib/remote.py:2534
7499
#: breezy/remote.py:2534
7665
7500
msgid "Copying repository content as tarball..."
7666
7501
msgstr ""
7667
7502
7668
#: bzrlib/rename_map.py:69
7503
#: breezy/rename_map.py:69
7669
7504
msgid "Calculating hashes"
7670
7505
msgstr ""
7671
7506
7672
#: bzrlib/rename_map.py:107
7507
#: breezy/rename_map.py:107
7673
7508
msgid "Determining hash hits"
7674
7509
msgstr ""
7675
7510
7676
#: bzrlib/rename_map.py:242
7511
#: breezy/rename_map.py:242
7512
#, python-brace-format
7677
7513
msgid "{0} => {1}"
7678
7514
msgstr ""
7679
7515
7680
#: bzrlib/repository.py:1738
7516
#: breezy/repository.py:1738
7681
7517
msgid "Moving repository to repository.backup"
7682
7518
msgstr ""
7683
7519
7684
#: bzrlib/repository.py:1745
7520
#: breezy/repository.py:1745
7685
7521
msgid "Creating new repository"
7686
7522
msgstr ""
7687
7523
7688
#: bzrlib/repository.py:1750
7524
#: breezy/repository.py:1750
7689
7525
msgid "Copying content"
7690
7526
msgstr ""
7691
7527
7692
#: bzrlib/repository.py:1754
7528
#: breezy/repository.py:1754
7693
7529
msgid "Deleting old repository content"
7694
7530
msgstr ""
7695
7531
7696
#: bzrlib/repository.py:1756
7532
#: breezy/repository.py:1756
7697
7533
msgid "repository converted"
7698
7534
msgstr ""
7699
7535
7700
#: bzrlib/revisionspec.py:903
7536
#: breezy/revisionspec.py:903
7537
#, python-brace-format
7701
7538
msgid "Using {0} {1}"
7702
7539
msgstr ""
7703
7540
7704
#: bzrlib/send.py:59
7541
#: breezy/send.py:59
7705
7542
#, python-format
7706
7543
msgid "Mail client \"%s\" does not support specifying body"
7707
7544
msgstr ""
7708
7545
7709
#: bzrlib/send.py:63
7546
#: breezy/send.py:63
7710
7547
msgid "--remember requires a branch to be specified."
7711
7548
msgstr ""
7712
7549
7713
#: bzrlib/send.py:78
7550
#: breezy/send.py:78
7714
7551
msgid "No submit branch known or specified"
7715
7552
msgstr ""
7716
7553
7717
#: bzrlib/send.py:81
7554
#: breezy/send.py:81
7555
#, python-brace-format
7718
7556
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7719
7557
msgstr ""
7720
7558
7721
#: bzrlib/send.py:99
7559
#: breezy/send.py:99
7722
7560
#, python-format
7723
7561
msgid "No such send format '%s'."
7724
7562
msgstr ""
7725
7563
7726
#: bzrlib/send.py:115
7564
#: breezy/send.py:115
7727
7565
msgid "bzr send takes at most two one revision identifiers"
7728
7566
msgstr ""
7729
7567
7730
#: bzrlib/send.py:128
7568
#: breezy/send.py:128
7731
7569
msgid "No revisions to submit."
7732
7570
msgstr ""
7733
7571
7734
#: bzrlib/send.py:140
7572
#: breezy/send.py:140
7735
7573
msgid ""
7736
7574
"- not supported for merge directives that use more than one output file."
7737
7575
msgstr ""
7738
7576
7739
#: bzrlib/send.py:186
7577
#: breezy/send.py:186
7740
7578
msgid "Format 0.9 does not permit bundle with no patch"
7741
7579
msgstr ""
7742
7580
7743
#: bzrlib/shelf_ui.py:46
7581
#: breezy/shelf_ui.py:46
7744
7582
#, python-format
7745
7583
msgid "Shelve adding file \"%(path)s\"?"
7746
7584
msgstr ""
7747
7585
7748
#: bzrlib/shelf_ui.py:47
7586
#: breezy/shelf_ui.py:47
7749
7587
msgid "Shelve binary changes?"
7750
7588
msgstr ""
7751
7589
7752
#: bzrlib/shelf_ui.py:48
7590
#: breezy/shelf_ui.py:48
7753
7591
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7754
7592
msgstr ""
7755
7593
7756
#: bzrlib/shelf_ui.py:50
7594
#: breezy/shelf_ui.py:50
7757
7595
#, python-format
7758
7596
msgid "Shelve removing file \"%(path)s\"?"
7759
7597
msgstr ""
7760
7598
7761
#: bzrlib/shelf_ui.py:51
7599
#: breezy/shelf_ui.py:51
7762
7600
#, python-format
7763
7601
msgid "Shelve %d change(s)?"
7764
7602
msgstr ""
7765
7603
7766
#: bzrlib/shelf_ui.py:52
7604
#: breezy/shelf_ui.py:52
7767
7605
msgid "Shelve?"
7768
7606
msgstr ""
7769
7607
7770
#: bzrlib/shelf_ui.py:53
7608
#: breezy/shelf_ui.py:53
7771
7609
#, python-format
7772
7610
msgid ""
7773
7611
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7774
7612
msgstr ""
7775
7613
7776
#: bzrlib/shelf_ui.py:55
7614
#: breezy/shelf_ui.py:55
7777
7615
#, python-format
7778
7616
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7779
7617
msgstr ""
7780
7618
7781
#: bzrlib/shelf_ui.py:70
7619
#: breezy/shelf_ui.py:70
7782
7620
#, python-format
7783
7621
msgid "Changes shelved with id \"%d\"."
7784
7622
msgstr ""
7785
7623
7786
#: bzrlib/shelf_ui.py:74
7624
#: breezy/shelf_ui.py:74
7787
7625
msgid "Selected changes destroyed."
7788
7626
msgstr ""
7789
7627
7790
#: bzrlib/shelf_ui.py:78
7628
#: breezy/shelf_ui.py:78
7791
7629
msgid "Selected changes:"
7792
7630
msgstr ""
7793
7631
7794
#: bzrlib/shelf_ui.py:98
7632
#: breezy/shelf_ui.py:98
7795
7633
#, python-format
7796
7634
msgid "Delete file \"%(path)s\"?"
7797
7635
msgstr ""
7798
7636
7799
#: bzrlib/shelf_ui.py:99
7637
#: breezy/shelf_ui.py:99
7800
7638
msgid "Apply binary changes?"
7801
7639
msgstr ""
7802
7640
7803
#: bzrlib/shelf_ui.py:100
7641
#: breezy/shelf_ui.py:100
7804
7642
#, python-format
7805
7643
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7806
7644
msgstr ""
7807
7645
7808
#: bzrlib/shelf_ui.py:102
7646
#: breezy/shelf_ui.py:102
7809
7647
#, python-format
7810
7648
msgid "Add file \"%(path)s\"?"
7811
7649
msgstr ""
7812
7650
7813
#: bzrlib/shelf_ui.py:103
7651
#: breezy/shelf_ui.py:103
7814
7652
#, python-format
7815
7653
msgid "Apply %d change(s)?"
7816
7654
msgstr ""
7817
7655
7818
#: bzrlib/shelf_ui.py:104
7656
#: breezy/shelf_ui.py:104
7819
7657
msgid "Apply change?"
7820
7658
msgstr ""
7821
7659
7822
#: bzrlib/shelf_ui.py:105
7660
#: breezy/shelf_ui.py:105
7823
7661
#, python-format
7824
7662
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7825
7663
msgstr ""
7826
7664
7827
#: bzrlib/shelf_ui.py:107
7665
#: breezy/shelf_ui.py:107
7828
7666
#, python-format
7829
7667
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7830
7668
msgstr ""
7831
7669
7832
#: bzrlib/shelf_ui.py:402
7670
#: breezy/shelf_ui.py:402
7833
7671
msgid "No changes are shelved."
7834
7672
msgstr ""
7835
7673
7836
#: bzrlib/shelf_ui.py:460
7674
#: breezy/shelf_ui.py:460
7837
7675
#, python-format
7838
7676
msgid "Using changes with id \"%d\"."
7839
7677
msgstr ""
7840
7678
7841
#: bzrlib/shelf_ui.py:464
7679
#: breezy/shelf_ui.py:464
7842
7680
#, python-format
7843
7681
msgid "Message: %s"
7844
7682
msgstr ""
7845
7683
7846
#: bzrlib/shelf_ui.py:476
7684
#: breezy/shelf_ui.py:476
7847
7685
#, python-format
7848
7686
msgid "Deleted changes with id \"%d\"."
7849
7687
msgstr ""
7850
7688
7851
#: bzrlib/smart/medium.py:714
7689
#: breezy/smart/medium.py:714
7690
#, python-brace-format
7852
7691
msgid "HPSS calls: {0} ({1} vfs) {2}"
7853
7692
msgstr ""
7854
7693
7855
#: bzrlib/smart/server.py:169
7694
#: breezy/smart/ping.py:32
7695
msgid "Pings a Bazaar smart server."
7696
msgstr ""
7697
7698
#: breezy/smart/ping.py:34
7699
msgid ""
7700
"This command sends a 'hello' request to the given location using the bzr\n"
7701
"smart protocol, and reports the response."
7702
msgstr ""
7703
7704
#: breezy/smart/server.py:169
7856
7705
msgid "Requested to stop gracefully"
7857
7706
msgstr ""
7858
7707
7859
#: bzrlib/smart/server.py:179
7708
#: breezy/smart/server.py:179
7860
7709
#, python-format
7861
7710
msgid "Waiting for %d client(s) to finish"
7862
7711
msgstr ""
7863
7712
7864
#: bzrlib/smart/server.py:185
7713
#: breezy/smart/server.py:185
7865
7714
#, python-format
7866
7715
msgid "Still waiting for %d client(s) to finish"
7867
7716
msgstr ""
7868
7717
7869
#: bzrlib/smart/server.py:219
7718
#: breezy/smart/server.py:219
7870
7719
#, python-format
7871
7720
msgid "listening socket error: %s"
7872
7721
msgstr ""
7873
7722
7874
#: bzrlib/smart/server.py:452
7723
#: breezy/smart/server.py:452
7875
7724
#, python-format
7876
7725
msgid "listening on port: %s"
7877
7726
msgstr ""
7878
7727
7879
#: bzrlib/switch.py:73
7728
#: breezy/switch.py:84
7880
7729
msgid "Pending merges must be committed or reverted before using switch."
7881
7730
msgstr ""
7882
7731
7883
#: bzrlib/switch.py:100
7732
#: breezy/switch.py:111
7884
7733
msgid ""
7885
7734
"Cannot switch as local commits found in the checkout. Commit these to the "
7886
7735
"bound branch or use --force to throw them away."
7887
7736
msgstr ""
7888
7737
7889
#: bzrlib/switch.py:105
7738
#: breezy/switch.py:116
7890
7739
#, python-format
7891
7740
msgid ""
7892
7741
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7893
7742
"anyway, use --force."
7894
7743
msgstr ""
7895
7744
7896
#: bzrlib/switch.py:129
7745
#: breezy/switch.py:140
7897
7746
msgid "Cannot switch a branch, only a checkout."
7898
7747
msgstr ""
7899
7748
7900
#: bzrlib/switch.py:167
7749
#: breezy/switch.py:183
7901
7750
#, python-format
7902
7751
msgid "Tree is up to date at revision %d."
7903
7752
msgstr ""
7904
7753
7905
#: bzrlib/switch.py:173
7754
#: breezy/switch.py:190
7906
7755
#, python-format
7907
7756
msgid "Updated to revision %d."
7908
7757
msgstr ""
7909
7758
7910
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7759
#: breezy/transform.py:1723 breezy/transform.py:1734 breezy/transform.py:1736
7911
7760
msgid "Apply phase"
7912
7761
msgstr ""
7913
7762
7914
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7763
#: breezy/transform.py:1762 breezy/transform.py:1830
7915
7764
msgid "removing file"
7916
7765
msgstr ""
7917
7766
7918
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7767
#: breezy/transform.py:1780 breezy/transform.py:1865
7919
7768
msgid "adding file"
7920
7769
msgstr ""
7921
7770
7922
#: bzrlib/transform.py:2598
7771
#: breezy/transform.py:2598
7923
7772
msgid "Building tree"
7924
7773
msgstr ""
7925
7774
7926
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7775
#: breezy/transform.py:2688 breezy/transform.py:2715
7927
7776
msgid "Adding file contents"
7928
7777
msgstr ""
7929
7778
7930
#: bzrlib/transform.py:3017
7779
#: breezy/transform.py:3017
7931
7780
msgid "Resolution pass"
7932
7781
msgstr ""
7933
7782
7934
#: bzrlib/transport/ftp/_gssapi.py:88
7783
#: breezy/transport/ftp/_gssapi.py:88
7935
7784
#, python-format
7936
7785
msgid "Authenticated as %s"
7937
7786
msgstr ""
7938
7787
7939
#: bzrlib/tree.py:647
7788
#: breezy/tree.py:647
7940
7789
msgid "*** {0} content-filter: {1} => {2!r}"
7941
7790
msgstr ""
7942
7791
7943
#: bzrlib/upgrade.py:77
7792
#: breezy/upgrade.py:77
7944
7793
#, python-format
7945
7794
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7946
7795
msgstr ""
7947
7796
7948
#: bzrlib/upgrade.py:100
7797
#: breezy/upgrade.py:100
7949
7798
#, python-format
7950
7799
msgid "cannot upgrade from bzrdir format %s"
7951
7800
msgstr ""
7952
7801
7953
#: bzrlib/upgrade.py:103
7802
#: breezy/upgrade.py:103
7954
7803
#, python-format
7955
7804
msgid "starting upgrade of %s"
7956
7805
msgstr ""
7957
7806
7958
#: bzrlib/upgrade.py:110
7807
#: breezy/upgrade.py:110
7959
7808
msgid "finished"
7960
7809
msgstr ""
7961
7810
7962
#: bzrlib/upgrade.py:120
7811
#: breezy/upgrade.py:120
7963
7812
msgid "Deleting backup.bzr"
7964
7813
msgstr ""
7965
7814
7966
#: bzrlib/upgrade.py:151
7815
#: breezy/upgrade.py:151
7816
#, python-brace-format
7967
7817
msgid ""
7968
7818
"\n"
7969
7819
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7970
7820
msgstr ""
7971
7821
7972
#: bzrlib/upgrade.py:208
7822
#: breezy/upgrade.py:208
7973
7823
#, python-format
7974
7824
msgid "Found %d dependent branches - upgrading ..."
7975
7825
msgstr ""
7976
7826
7977
#: bzrlib/upgrade.py:276
7827
#: breezy/upgrade.py:276
7978
7828
msgid "Upgrading bzrdirs"
7979
7829
msgstr ""
7980
7830
7981
#: bzrlib/upgrade.py:282
7831
#: breezy/upgrade.py:282
7982
7832
#, python-format
7983
7833
msgid "Upgrading %s"
7984
7834
msgstr ""
7985
7835
7986
#: bzrlib/upgrade.py:283
7836
#: breezy/upgrade.py:283
7837
#, python-brace-format
7987
7838
msgid "Upgrading {0} {1} ..."
7988
7839
msgstr ""
7989
7840
7990
#: bzrlib/upgrade.py:301
7841
#: breezy/upgrade.py:301
7991
7842
msgid "Removing backup ..."
7992
7843
msgstr ""
7993
7844
7994
#: bzrlib/upgrade.py:305
7845
#: breezy/upgrade.py:305
7846
#, python-brace-format
7995
7847
msgid "failed to clean-up {0}: {1}"
7996
7848
msgstr ""
7997
7849
7998
#: bzrlib/vf_repository.py:1091
7850
#: breezy/vf_repository.py:1091
7999
7851
msgid "inventories"
8000
7852
msgstr ""
8001
7853
8002
#: bzrlib/vf_repository.py:1117
7854
#: breezy/vf_repository.py:1117
8003
7855
msgid "texts"
8004
7856
msgstr ""
8005
7857
8006
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7858
#: breezy/vf_repository.py:1622 breezy/vf_repository.py:1631
8007
7859
msgid "Calculating text parents"
8008
7860
msgstr ""
8009
7861
8010
#: bzrlib/vf_repository.py:1707
7862
#: breezy/vf_repository.py:1707
8011
7863
msgid "Fetch texts"
8012
7864
msgstr ""
8013
7865
8014
#: bzrlib/vf_repository.py:2536
7866
#: breezy/vf_repository.py:2536
8015
7867
msgid "loading text store"
8016
7868
msgstr ""
8017
7869
8018
#: bzrlib/vf_repository.py:2542
7870
#: breezy/vf_repository.py:2542
8019
7871
msgid "checking text graph"
8020
7872
msgstr ""
8021
7873
8022
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
8023
#: bzrlib/vf_repository.py:3127
7874
#: breezy/vf_repository.py:2998 breezy/vf_repository.py:3012
7875
#: breezy/vf_repository.py:3127
8024
7876
msgid "Transferring revisions"
8025
7877
msgstr ""
8026
7878
8027
#: bzrlib/win32utils.py:146
7879
#: breezy/win32utils.py:146
8028
7880
msgid "Failed to GetProcessMemoryInfo()"
8029
7881
msgstr ""
8030
7882
8031
#: bzrlib/win32utils.py:167
7883
#: breezy/win32utils.py:167
8032
7884
msgid "Cannot debug memory on win32 without ctypes or win32process"
8033
7885
msgstr ""
8034
7886
8035
#: bzrlib/win32utils.py:172
7887
#: breezy/win32utils.py:172
7888
#, python-brace-format
8036
7889
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
8037
7890
msgstr ""
8038
7891
8039
#: bzrlib/win32utils.py:180
7892
#: breezy/win32utils.py:180
8040
7893
#, python-format
8041
7894
msgid "WorkingSize %8d KiB"
8042
7895
msgstr ""
8043
7896
8044
#: bzrlib/win32utils.py:181
7897
#: breezy/win32utils.py:181
8045
7898
#, python-format
8046
7899
msgid "PeakWorking %8d KiB"
8047
7900
msgstr ""
8048
7901
8049
#: bzrlib/win32utils.py:182
7902
#: breezy/win32utils.py:182
8050
7903
#, python-format
8051
7904
msgid "PagefileUsage %8d KiB"
8052
7905
msgstr ""
8053
7906
8054
#: bzrlib/win32utils.py:183
7907
#: breezy/win32utils.py:183
8055
7908
#, python-format
8056
7909
msgid "PeakPagefileUsage %8d KiB"
8057
7910
msgstr ""
8058
7911
8059
#: bzrlib/win32utils.py:185
7912
#: breezy/win32utils.py:185
8060
7913
#, python-format
8061
7914
msgid "PrivateUsage %8d KiB"
8062
7915
msgstr ""
8063
7916
8064
#: bzrlib/win32utils.py:186
7917
#: breezy/win32utils.py:186
8065
7918
#, python-format
8066
7919
msgid "PageFaultCount %8d"
8067
7920
msgstr ""
8068
7921
8069
#: bzrlib/workingtree.py:1482
7922
#: breezy/workingtree.py:1516
8070
7923
msgid "Rerun update after fixing the conflicts."
8071
7924
msgstr ""
8072
7925
8076
7929
8077
7930
#: dummy/help_topics/basic/detail.txt:1
8078
7931
msgid ""
8079
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7932
"Bazaar 2.8.0dev1 -- a free distributed version-control tool\n"
8080
7933
"http://bazaar.canonical.com/"
8081
7934
msgstr ""
8082
7935
8185
8038
8186
8039
#: dummy/help_topics/checkouts/detail.txt:11
8187
8040
msgid ""
8188
"A checkout is created with the bzr checkout command (see \"help "
8189
"checkout\").\n"
8041
"A checkout is created with the bzr checkout command (see \"help checkout"
8042
"\").\n"
8190
8043
"You pass it a reference to another branch, and it will create a local copy\n"
8191
8044
"for you that still contains a reference to the branch you created the\n"
8192
8045
"checkout from (the master branch). Then if you make any commits they will "
8409
8262
#: dummy/help_topics/files/detail.txt:3
8410
8263
msgid ""
8411
8264
":On Unix: ~/.bazaar/bazaar.conf\n"
8412
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8413
"bazaar\\\\2.0\\\\bazaar.conf"
8265
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
8266
"\\bazaar\\\\2.0\\\\bazaar.conf"
8414
8267
msgstr ""
8415
8268
8416
8269
#: dummy/help_topics/files/detail.txt:6
8520
8373
"--profile Profile execution using the hotshot profiler.\n"
8521
8374
"--lsprof Profile execution using the lsprof profiler.\n"
8522
8375
"--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"
8376
" results to a specified file. If the filename ends with \".txt"
8377
"\",\n"
8525
8378
" text format will be used. If the filename either starts "
8526
8379
"with\n"
8527
8380
" \"callgrind.out\" or end with \".callgrind\", the output will "
8758
8611
"--verbose, -v Display more information.\n"
8759
8612
"--quiet, -q Only display errors and warnings."
8760
8613
msgstr ""
8761
"--help, -h ヘルプを表示します。\n"
8762
"--verbose, -v より詳細な情報を表示します。\n"
8763
"--quiet, -q エラーや警告だけを表示します。"
8764
8614
8765
8615
#: dummy/help_topics/standard-options/detail.txt:9
8766
8616
msgid "Unlike global options, standard options can be used in aliases.\n"
9008
8858
msgstr ""
9009
8859
9010
8860
#: en/help_topics/authentication.txt:27
9011
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8861
msgid " brz branch ftp://joe:secret@host.com/path/to/my/branch"
9012
8862
msgstr ""
9013
8863
9014
8864
#: en/help_topics/authentication.txt:29
9016
8866
msgstr ""
9017
8867
9018
8868
#: en/help_topics/authentication.txt:31
9019
msgid " bzr branch ftp://host.com/path/to/my/branch"
8869
msgid " brz branch ftp://host.com/path/to/my/branch"
9020
8870
msgstr ""
9021
8871
9022
8872
#: en/help_topics/authentication.txt:33
9023
msgid ""
9024
"provided you have created the following ``authentication.conf`` file::"
8873
msgid "provided you have created the following ``authentication.conf`` file::"
9025
8874
msgstr ""
9026
8875
9027
8876
#: en/help_topics/authentication.txt:35
9044
8893
msgid ""
9045
8894
"There are two kinds of authentication used by the various schemes supported "
9046
8895
"by\n"
9047
"bzr:"
8896
"brz:"
9048
8897
msgstr ""
9049
8898
9050
8899
#: en/help_topics/authentication.txt:48
9073
8922
"is\n"
9074
8923
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
9075
8924
"is\n"
9076
"not taken into account in the definitions, but will displayed if bzr "
8925
"not taken into account in the definitions, but will displayed if brz "
9077
8926
"prompts\n"
9078
8927
"you for a password."
9079
8928
msgstr ""
9122
8971
9123
8972
#: en/help_topics/authentication.txt:84
9124
8973
msgid ""
9125
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8974
" * ``user``: can be empty (``bzr`` will default to python's\n"
9126
8975
" ``getpass.get_user()``),"
9127
8976
msgstr ""
9128
8977
9134
8983
9135
8984
#: en/help_topics/authentication.txt:90
9136
8985
msgid ""
9137
"Multiple definitions can be provided and, for a given URL, bzr will select "
8986
"Multiple definitions can be provided and, for a given URL, brz will select "
9138
8987
"a\n"
9139
8988
"(``user`` [, ``password``]) based on the following rules :"
9140
8989
msgstr ""
9155
9004
#: en/help_topics/authentication.txt:99
9156
9005
msgid ""
9157
9006
" 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"
9007
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
9008
"net``\n"
9160
9009
" will not match ``bzr.sf.net``)."
9161
9010
msgstr ""
9162
9011
9241
9090
msgid ""
9242
9091
"All connections are done with the same ``user`` (the remote one for which "
9243
9092
"the\n"
9244
"default bzr one is not appropriate) and the password is always prompted "
9093
"default brz one is not appropriate) and the password is always prompted "
9245
9094
"with\n"
9246
9095
"some exceptions::"
9247
9096
msgstr ""
9286
9135
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9287
9136
" host=.shp.net\n"
9288
9137
" user=joe\n"
9289
" # bzr don't support supplying a password for sftp,\n"
9138
" # brz doesn't support supplying a password for sftp,\n"
9290
9139
" # consider using an ssh agent if you don't want to supply\n"
9291
9140
" # a password interactively. (pageant, ssh-agent, etc)"
9292
9141
msgstr ""
9465
9314
msgstr ""
9466
9315
9467
9316
#: en/help_topics/bugs.txt:54
9468
msgid ""
9469
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9317
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9470
9318
msgstr ""
9471
9319
9472
9320
#: en/help_topics/bugs.txt:56
9560
9408
9561
9409
#: en/help_topics/bugs.txt:103
9562
9410
msgid ""
9563
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9564
"1234\n"
9411
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
9412
"HUDSON-1234\n"
9565
9413
"in Hudson's JIRA bug tracker as fixed.\n"
9566
9414
msgstr ""
9567
9415
9597
9445
"export Export current or past revision to a destination directory "
9598
9446
"or\n"
9599
9447
" archive.\n"
9448
"grep Print lines matching PATTERN for specified files and\n"
9449
" revisions. [grep]\n"
9600
9450
"help Show help on a command or other topic.\n"
9601
9451
"ignore Ignore specified files or patterns.\n"
9602
9452
"ignored List ignored files and the patterns that matched them.\n"
9620
9470
"mv Move or rename a file.\n"
9621
9471
"nick Print or set the branch nickname.\n"
9622
9472
"pack Compress the data within a repository.\n"
9473
"ping Pings a Bazaar smart server.\n"
9623
9474
"plugins List the installed plugins.\n"
9624
9475
"pull Turn this branch into a mirror of another branch.\n"
9625
9476
"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"
9477
"reconcile Reconcile brz metadata in a branch.\n"
9478
"reconfigure Reconfigure the type of a brz directory.\n"
9628
9479
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9629
9480
"remerge Redo a merge.\n"
9630
9481
"remove Remove files or directories.\n"
9637
9488
"revno Show current revision number.\n"
9638
9489
"root Show the tree root directory.\n"
9639
9490
"send Mail or create a merge-directive for submitting changes.\n"
9640
"serve Run the bzr server.\n"
9491
"serve Run the brz server.\n"
9641
9492
"shelve Temporarily set aside some changes from the current tree.\n"
9642
9493
"sign-my-commits Sign all commits by a given committer.\n"
9643
9494
"split Split a subdirectory of a tree into a separate tree.\n"
9653
9504
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9654
9505
" format.\n"
9655
9506
"verify-signatures Verify all commit signatures.\n"
9656
"version Show version of bzr.\n"
9507
"version Show version of brz.\n"
9657
9508
"version-info Show version information about this tree.\n"
9658
9509
"view Manage filtered views.\n"
9659
"whoami Show or set bzr user id.\n"
9510
"whoami Show or set brz user id.\n"
9660
9511
msgstr ""
9661
9512
9662
9513
#: en/help_topics/configuration.txt:1
9679
9530
9680
9531
#: en/help_topics/configuration.txt:10
9681
9532
msgid ""
9682
"BZR_EMAIL\n"
9533
"BRZ_EMAIL\n"
9683
9534
"~~~~~~~~~"
9684
9535
msgstr ""
9685
9536
9697
9548
9698
9549
#: en/help_topics/configuration.txt:19
9699
9550
msgid ""
9700
"BZR_PROGRESS_BAR\n"
9551
"BRZ_PROGRESS_BAR\n"
9701
9552
"~~~~~~~~~~~~~~~~"
9702
9553
msgstr ""
9703
9554
9712
9563
9713
9564
#: en/help_topics/configuration.txt:26
9714
9565
msgid ""
9715
"BZR_SIGQUIT_PDB\n"
9566
"BRZ_SIGQUIT_PDB\n"
9716
9567
"~~~~~~~~~~~~~~~"
9717
9568
msgstr ""
9718
9569
9719
9570
#: en/help_topics/configuration.txt:29
9720
msgid ""
9721
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9571
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9722
9572
msgstr ""
9723
9573
9724
9574
#: en/help_topics/configuration.txt:31
9729
9579
9730
9580
#: en/help_topics/configuration.txt:34
9731
9581
msgid ""
9732
"BZR_HOME\n"
9582
"BRZ_HOME\n"
9733
9583
"~~~~~~~~"
9734
9584
msgstr ""
9735
9585
9739
9589
9740
9590
#: en/help_topics/configuration.txt:39
9741
9591
msgid ""
9742
"BZR_SSH\n"
9592
"BRZ_SSH\n"
9743
9593
"~~~~~~~"
9744
9594
msgstr ""
9745
9595
9749
9599
9750
9600
#: en/help_topics/configuration.txt:44
9751
9601
msgid ""
9752
"BZR_PDB\n"
9602
"BRZ_PDB\n"
9753
9603
"~~~~~~~"
9754
9604
msgstr ""
9755
9605
9779
9629
9780
9630
#: en/help_topics/configuration.txt:59
9781
9631
msgid ""
9782
"BZR_EDITOR\n"
9632
"BRZ_EDITOR\n"
9783
9633
"~~~~~~~~~~"
9784
9634
msgstr ""
9785
9635
9789
9639
9790
9640
#: en/help_topics/configuration.txt:64
9791
9641
msgid ""
9792
"BZR_LOG\n"
9642
"BRZ_LOG\n"
9793
9643
"~~~~~~~"
9794
9644
msgstr ""
9795
9645
9814
9664
#: en/help_topics/configuration.txt:76
9815
9665
msgid ""
9816
9666
"\n"
9817
"BZR_PLUGIN_PATH\n"
9667
"BRZ_PLUGIN_PATH\n"
9818
9668
"~~~~~~~~~~~~~~~"
9819
9669
msgstr ""
9820
9670
9825
9675
msgstr ""
9826
9676
9827
9677
#: en/help_topics/configuration.txt:83
9828
msgid ""
9829
"* the user specific plugin directory (containing the ``user`` plugins),"
9678
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
9830
9679
msgstr ""
9831
9680
9832
9681
#: en/help_topics/configuration.txt:85
9926
9775
9927
9776
#: en/help_topics/configuration.txt:135
9928
9777
msgid ""
9929
"BZR_DISABLE_PLUGINS\n"
9778
"BRZ_DISABLE_PLUGINS\n"
9930
9779
"~~~~~~~~~~~~~~~~~~~"
9931
9780
msgstr ""
9932
9781
9955
9804
9956
9805
#: en/help_topics/configuration.txt:151
9957
9806
msgid ""
9958
"BZR_PLUGINS_AT\n"
9807
"BRZ_PLUGINS_AT\n"
9959
9808
"~~~~~~~~~~~~~~"
9960
9809
msgstr ""
9961
9810
10000
9849
10001
9850
#: en/help_topics/configuration.txt:178
10002
9851
msgid ""
10003
"BZRPATH\n"
9852
"BRZPATH\n"
10004
9853
"~~~~~~~"
10005
9854
msgstr ""
10006
9855
10202
10051
10203
10052
#: en/help_topics/configuration.txt:287
10204
10053
msgid ""
10205
"Policies are specified by keys with names of the form "
10206
"\"<option_name>:policy\".\n"
10054
"Policies are specified by keys with names of the form \"<option_name>:policy"
10055
"\".\n"
10207
10056
"For example, to define the push location for a tree of branches, the\n"
10208
10057
"following could be used::"
10209
10058
msgstr ""
10958
10807
#: en/help_topics/configuration.txt:686
10959
10808
msgid ""
10960
10809
"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"
10810
"in recursive mode, with files larger than this value being skipped. You "
10811
"may \n"
10812
"specify this value as an integer (in which case it is interpreted as "
10813
"bytes), \n"
10965
10814
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10966
10815
"0 \n"
10967
10816
"will disable skipping."
11011
10860
11012
10861
#: en/help_topics/configuration.txt:716
11013
10862
msgid ""
10863
"Because ``mergetool`` and ``config`` itself both use curly braces as\n"
10864
"interpolation markers, trying to display the mergetool line results in the\n"
10865
"following problem::"
10866
msgstr ""
10867
10868
#: en/help_topics/configuration.txt:720
10869
msgid ""
10870
"\n"
10871
" $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "
10872
"{result}'\n"
10873
" $ bzr config bzr.mergetool.kdiff3\n"
10874
" bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "
10875
"{this} {other} -o {result}\"."
10876
msgstr ""
10877
10878
#: en/help_topics/configuration.txt:725
10879
msgid ""
10880
"To avoid this, ``config`` can be instructed not to try expanding variables::"
10881
msgstr ""
10882
10883
#: en/help_topics/configuration.txt:727
10884
msgid ""
10885
" $ bzr config --all bzr.mergetool.kdiff3\n"
10886
" branch:\n"
10887
" bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10888
msgstr ""
10889
10890
#: en/help_topics/configuration.txt:731
10891
msgid ""
10892
"\n"
11014
10893
"bzr.default_mergetool\n"
11015
10894
"~~~~~~~~~~~~~~~~~~~~~"
11016
10895
msgstr ""
11017
10896
11018
#: en/help_topics/configuration.txt:719
10897
#: en/help_topics/configuration.txt:735
11019
10898
msgid ""
11020
10899
"Specifies which external merge tool (as defined above) should be selected "
11021
10900
"by\n"
11022
10901
"default in tools such as ``bzr qconflicts``."
11023
10902
msgstr ""
11024
10903
11025
#: en/help_topics/configuration.txt:724
10904
#: en/help_topics/configuration.txt:740
11026
10905
msgid " bzr.default_mergetool = kdiff3\n"
11027
10906
msgstr ""
11028
10907
11042
10921
11043
10922
#: en/help_topics/conflict-types.txt:8
11044
10923
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 "
10924
"When conflicts are present in your working tree (as shown by ``brz\n"
10925
"conflicts``), you should resolve them and then inform brz that the "
11047
10926
"conflicts\n"
11048
10927
"have been resolved."
11049
10928
msgstr ""
11095
10974
#: en/help_topics/conflict-types.txt:34
11096
10975
msgid ""
11097
10976
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
11098
" remaining generated information (``bzr resolve <item>``)."
10977
" remaining generated information (``brz resolve <item>``)."
11099
10978
msgstr ""
11100
10979
11101
10980
#: en/help_topics/conflict-types.txt:37
11127
11006
msgstr ""
11128
11007
11129
11008
#: en/help_topics/conflict-types.txt:51
11130
msgid " ``bzr resolve FILE --action=done'"
11009
msgid " ``brz resolve FILE --action=done'"
11131
11010
msgstr ""
11132
11011
11133
11012
#: en/help_topics/conflict-types.txt:53
11138
11017
msgstr ""
11139
11018
11140
11019
#: en/help_topics/conflict-types.txt:56
11141
msgid " ``bzr resolve FILE``"
11020
msgid " ``brz resolve FILE``"
11142
11021
msgstr ""
11143
11022
11144
11023
#: en/help_topics/conflict-types.txt:58
11145
msgid "See ``bzr help resolve`` for more details."
11024
msgid "See ``brz help resolve`` for more details."
11146
11025
msgstr ""
11147
11026
11148
11027
#: en/help_topics/conflict-types.txt:60
11225
11104
11226
11105
#: en/help_topics/conflict-types.txt:100
11227
11106
msgid ""
11228
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
11107
"When you have resolved text conflicts, just run ``brz resolve --auto``, and\n"
11229
11108
"Bazaar will auto-detect which conflicts you have resolved."
11230
11109
msgstr ""
11231
11110
11239
11118
#: en/help_topics/conflict-types.txt:107
11240
11119
msgid ""
11241
11120
"\n"
11242
"When you want to pick one set of changes over the other, you can use ``bzr\n"
11121
"When you want to pick one set of changes over the other, you can use ``brz\n"
11243
11122
"resolve`` with one of the following actions:"
11244
11123
msgstr ""
11245
11124
11298
11177
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11299
11178
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11300
11179
#: en/help_topics/conflict-types.txt:361
11301
msgid "``bzr resolve`` recognizes the following actions:"
11180
msgid "``brz resolve`` recognizes the following actions:"
11302
11181
msgstr ""
11303
11182
11304
11183
#: en/help_topics/conflict-types.txt:139
11305
11184
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"
11185
"* ``--action=take-this`` will issue ``brz mv FILE.THIS FILE``,\n"
11186
"* ``--action=take-other`` will issue ``brz mv FILE.OTHER FILE``,\n"
11308
11187
"* ``--action=done`` will just mark the conflict as resolved."
11309
11188
msgstr ""
11310
11189
11348
11227
msgid ""
11349
11228
"To resolve the conflict, you must apply the correct tags to either the "
11350
11229
"target\n"
11351
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11230
"branch or the source branch as appropriate. Use \"brz tags --show-ids -d\n"
11352
11231
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11353
11232
"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"
11233
"``brz tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11355
11234
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11356
11235
"source\n"
11357
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11236
"branch. You need not call \"brz resolve\" after doing this. To resolve in\n"
11358
11237
"favor of the target branch, you need to similarly use ``tag --force`` in "
11359
11238
"the\n"
11360
11239
"source branch. (Note that pulling or pushing using --overwrite will "
11380
11259
11381
11260
#: en/help_topics/conflict-types.txt:187
11382
11261
msgid ""
11383
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11262
"* ``--action=take-this`` will issue ``brz rm FILE ; brz mv FILE.moved "
11384
11263
"FILE``,\n"
11385
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11264
"* ``--action=take-other`` will issue ``brz rm FILE.moved``,\n"
11386
11265
"* ``--action=done`` will just mark the conflict as resolved."
11387
11266
msgstr ""
11388
11267
11398
11277
msgstr ""
11399
11278
11400
11279
#: en/help_topics/conflict-types.txt:200
11401
msgid ""
11402
" Conflict because FILE is not versioned, but has versioned children."
11280
msgid " Conflict because FILE is not versioned, but has versioned children."
11403
11281
msgstr ""
11404
11282
11405
11283
#: en/help_topics/conflict-types.txt:202
11412
11290
"will version the parent directory as well. Resolving this issue depends\n"
11413
11291
"very much on the particular scenario. You may wish to rename or delete "
11414
11292
"either\n"
11415
"the file or the directory. When you are satisfied, you can run \"bzr "
11293
"the file or the directory. When you are satisfied, you can run \"brz "
11416
11294
"resolve\n"
11417
11295
"FILE\" to mark the conflict as resolved."
11418
11296
msgstr ""
11445
11323
11446
11324
#: en/help_topics/conflict-types.txt:228
11447
11325
msgid ""
11448
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11326
"* ``--action=take-this`` will issue ``brz rm directory`` including the\n"
11449
11327
" children,\n"
11450
11328
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11451
11329
"children\n"
11480
11358
11481
11359
#: en/help_topics/conflict-types.txt:256
11482
11360
msgid ""
11483
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11361
"* ``--action=take-other`` will issue ``brz rm directory`` including the \n"
11484
11362
" children,"
11485
11363
msgstr ""
11486
11364
11498
11376
#: en/help_topics/conflict-types.txt:265
11499
11377
msgid ""
11500
11378
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11501
"setting the ``bzr.transform.orphan_policy`` configuration option."
11379
"setting the ``brz.transform.orphan_policy`` configuration option."
11502
11380
msgstr ""
11503
11381
11504
11382
#: en/help_topics/conflict-types.txt:268
11513
11391
11514
11392
#: en/help_topics/conflict-types.txt:273
11515
11393
msgid ""
11516
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11394
"* ``move``: will move the orphans to a ``brz-orphans`` directory at the "
11517
11395
"root\n"
11518
11396
" of the working tree with names like ``<file>.~#~``."
11519
11397
msgstr ""
11545
11423
#: en/help_topics/conflict-types.txt:293
11546
11424
msgid ""
11547
11425
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11548
" issuing ``bzr mv PATH2 PATH1``,\n"
11426
" issuing ``brz mv PATH2 PATH1``,\n"
11549
11427
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11550
11428
"``PATH2``,\n"
11551
11429
"* ``--action=done`` will just mark the conflict as resolved."
11571
11449
11572
11450
#: en/help_topics/conflict-types.txt:311
11573
11451
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"
11452
" $ brz init\n"
11453
" $ brz mkdir white\n"
11454
" $ brz mkdir black\n"
11455
" $ brz commit -m \"BASE\"\n"
11456
" $ brz branch . ../other\n"
11457
" $ brz mv white black\n"
11458
" $ brz commit -m \"THIS\"\n"
11459
" $ brz mv ../other/black ../other/white\n"
11460
" $ brz commit ../other -m \"OTHER\"\n"
11461
" $ brz merge ../other"
11584
11462
msgstr ""
11585
11463
11586
11464
#: en/help_topics/conflict-types.txt:322
11592
11470
11593
11471
#: en/help_topics/conflict-types.txt:328
11594
11472
msgid ""
11595
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11596
"\n"
11473
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
11474
"``white`` \n"
11597
11475
" in ``black``,\n"
11598
11476
"* ``--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"
11477
" ``white`` by issuing ``brz mv black/white white ; brz mv black white``,\n"
11600
11478
"* ``--action=done`` will just mark the conflict as resolved."
11601
11479
msgstr ""
11602
11480
11621
11499
11622
11500
#: en/help_topics/conflict-types.txt:347
11623
11501
msgid ""
11624
" $ bzr init\n"
11625
" $ bzr mkdir foo\n"
11626
" $ bzr commit -m \"BASE\"\n"
11627
" $ bzr branch . ../other\n"
11502
" $ brz init\n"
11503
" $ brz mkdir foo\n"
11504
" $ brz commit -m \"BASE\"\n"
11505
" $ brz branch . ../other\n"
11628
11506
" $ rmdir foo\n"
11629
11507
" $ 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"
11508
" $ brz commit -m \"THIS\"\n"
11509
" $ brz mkdir ../other/foo/bar\n"
11510
" $ brz commit ../other -m \"OTHER\"\n"
11511
" $ brz merge ../other"
11634
11512
msgstr ""
11635
11513
11636
11514
#: en/help_topics/conflict-types.txt:358
11641
11519
11642
11520
#: en/help_topics/conflict-types.txt:363
11643
11521
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"
11522
"* ``--action=take-this`` will issue ``brz rm --force foo.new`` and \n"
11523
" ``brz add foo``,\n"
11524
"* ``--action=take-other`` will issue ``brz rm --force foo`` and \n"
11525
" ``brz mv foo.new foo``,\n"
11648
11526
"* ``--action=done`` will just mark the conflict as resolved."
11649
11527
msgstr ""
11650
11528
11742
11620
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11743
11621
"In other cases, the plugin may leave it in the user's hands to\n"
11744
11622
"define which files are to be filtered. This is typically done\n"
11745
"using rule-based preferences. See ``bzr help rules`` for general\n"
11623
"using rule-based preferences. See ``brz help rules`` for general\n"
11746
11624
"information about defining these."
11747
11625
msgstr ""
11748
11626
11756
11634
#: en/help_topics/content-filters.txt:55
11757
11635
msgid ""
11758
11636
"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"
11637
"a working tree, e.g. status, diff and commit. For example, ``brz diff``\n"
11760
11638
"will apply read converters to files in the working tree, then compare\n"
11761
11639
"the results to the content last committed."
11762
11640
msgstr ""
11765
11643
msgid ""
11766
11644
"Write converters are only applied by commands that **create files in a\n"
11767
11645
"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"
11646
"canonical format of a file or tree, use ``brz cat`` or ``brz export``\n"
11769
11647
"respectively."
11770
11648
msgstr ""
11771
11649
11772
11650
#: en/help_topics/content-filters.txt:65
11773
11651
msgid ""
11774
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11652
"Note: ``brz commit`` does not implicitly apply write converters after\n"
11775
11653
"comitting files. If this makes sense for a given plugin providing\n"
11776
11654
"a content filter, the plugin can usually achieve this effect by using a\n"
11777
11655
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11802
11680
#: en/help_topics/content-filters.txt:84
11803
11681
msgid ""
11804
11682
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11805
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11683
" timestamp. Operations like ``brz status`` should then reapply the\n"
11806
11684
" relevant read converters and compare the end result with the\n"
11807
11685
" canonical format."
11808
11686
msgstr ""
11810
11688
#: en/help_topics/content-filters.txt:89
11811
11689
msgid ""
11812
11690
" * To reapply write converters, ensure there are no local changes,\n"
11813
" delete the relevant files and run ``bzr revert`` on those files."
11691
" delete the relevant files and run ``brz revert`` on those files."
11814
11692
msgstr ""
11815
11693
11816
11694
#: en/help_topics/content-filters.txt:92
11845
11723
11846
11724
#: en/help_topics/debug-flags.txt:4
11847
11725
msgid ""
11848
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11726
"These flags can be passed on the brz command line or (without the ``-D``\n"
11849
11727
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11850
11728
msgstr ""
11851
11729
11936
11814
11937
11815
#: en/help_topics/diverged-branches.txt:20
11938
11816
msgid ""
11939
"The ``bzr missing`` command is used to find out what revisions are in "
11817
"The ``brz missing`` command is used to find out what revisions are in "
11940
11818
"another\n"
11941
11819
"branch that are not present in the current branch, and vice-versa. It shows "
11942
11820
"a\n"
11943
11821
"summary of which extra revisions exist in each branch. If you want to see "
11944
11822
"the\n"
11945
"precise effects of those revisions, you can use ``bzr diff --"
11823
"precise effects of those revisions, you can use ``brz diff --"
11946
11824
"old=other_branch``\n"
11947
11825
"to show the differences between other_branch and your current branch."
11948
11826
msgstr ""
11956
11834
#: en/help_topics/diverged-branches.txt:29
11957
11835
msgid ""
11958
11836
"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"
11837
"branch. To do so, use ``brz merge`` to get the new revisions from the\n"
11960
11838
"mainline. This merge may result in conflicts if the other developer's "
11961
11839
"changes\n"
11962
11840
"overlap with your changes. These conflicts should be resolved before\n"
11968
11846
"resulting working tree for correctness, since the merged revisions could "
11969
11847
"have\n"
11970
11848
"made arbitrary changes. After testing, you should commit the merge using\n"
11971
"``bzr commit``. This clears up the diverged branches situation. Your "
11849
"``brz commit``. This clears up the diverged branches situation. Your "
11972
11850
"local\n"
11973
11851
"branch can now be pushed to the mainline.\n"
11974
11852
msgstr ""
11978
11856
msgstr ""
11979
11857
11980
11858
#: en/help_topics/env-variables.txt:3
11859
msgid "See bzr help configuration for more details."
11860
msgstr ""
11861
11862
#: en/help_topics/env-variables.txt:5
11981
11863
msgid ""
11982
11864
"=================== "
11983
11865
"===========================================================\n"
11984
11866
"BZRPATH Path where bzr is to look for shell plugin external\n"
11985
11867
" commands.\n"
11986
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11868
"BRZ_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11987
11869
"EMAIL E-Mail address of the user.\n"
11988
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11870
"BRZ_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11989
11871
"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 "
11872
"BRZ_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11873
"BRZ_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11874
"BRZ_PLUGINS_AT Plugins to load from a directory not in "
11875
"BRZ_PLUGIN_PATH.\n"
11876
"BRZ_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11877
"BRZ_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11996
11878
"and\n"
11997
11879
" HOME.\n"
11998
11880
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11999
11881
"URLs).\n"
12000
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11882
"BRZ_SSH Path to SSH client, or one of paramiko, openssh, "
12001
11883
"sshcorp,\n"
12002
11884
" 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 "
11885
"BRZ_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11886
"BRZ_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11887
"BRZ_COLUMNS Override implicit terminal width.\n"
11888
"BRZ_CONCURRENCY Number of processes that can be run concurrently "
12007
11889
"(selftest)\n"
12008
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11890
"BRZ_PROGRESS_BAR Override the progress display. Values are 'none' or "
12009
11891
"'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"
11892
"BRZ_PDB Control whether to launch a debugger on error.\n"
11893
"BRZ_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
12012
11894
" breakin debugger.\n"
12013
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11895
"BRZ_TEXTUI_INPUT Force console input mode for prompts to line-based "
12014
11896
"(instead\n"
12015
11897
" of char-based).\n"
12016
11898
"=================== "
12027
11909
msgid ""
12028
11910
"EOL conversion is provided as a content filter where Bazaar internally\n"
12029
11911
"stores a canonical format but outputs a convenience format. See\n"
12030
"``bzr help content-filters`` for general information about using these."
11912
"``brz help content-filters`` for general information about using these."
12031
11913
msgstr ""
12032
11914
12033
11915
#: en/help_topics/eol.txt:8
12036
11918
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
12037
11919
"in a recent format. (Just setting the format on the repository\n"
12038
11920
"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"
11921
"'brz info -v' to confirm that the branch is using \"Working tree format 5\"\n"
12040
11922
"or later."
12041
11923
msgstr ""
12042
11924
12043
11925
#: en/help_topics/eol.txt:15
12044
11926
msgid ""
12045
11927
"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"
11928
"rules. See ``brz help rules`` for general information on defining rules.\n"
11929
"Currently, rules are only supported in $brz_HOME/.bazaar/rules (or\n"
11930
"%brz_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
12049
11931
"supported in a future verison of Bazaar."
12050
11932
msgstr ""
12051
11933
12173
12055
"======================\n"
12174
12056
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
12175
12057
" ``lf`` otherwise\n"
12176
" ---------------------------- ------------------------ ----------------------"
12177
"\n"
12058
" ---------------------------- ------------------------ "
12059
"----------------------\n"
12178
12060
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
12179
" ---------------------------- ------------------------ ----------------------"
12180
"\n"
12061
" ---------------------------- ------------------------ "
12062
"----------------------\n"
12181
12063
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
12182
12064
" ============================ ======================== ======================"
12183
12065
msgstr ""
12246
12128
"touching-revisions Return revision-ids which affected a particular file.\n"
12247
12129
"unknowns List unknown files.\n"
12248
12130
"wait-until-signalled Test helper for\n"
12249
" test_start_and_stop_bzr_subprocess_send_signal.\n"
12131
" test_start_and_stop_brz_subprocess_send_signal.\n"
12250
12132
msgstr ""
12251
12133
12252
12134
#: en/help_topics/hooks.txt:1
12280
12162
"The class that contains each hook is given before the hooks it supplies. "
12281
12163
"For\n"
12282
12164
"instance, BranchHooks as the class is the hooks class for\n"
12283
"`bzrlib.branch.Branch.hooks`."
12165
"`breezy.branch.Branch.hooks`."
12284
12166
msgstr ""
12285
12167
12286
12168
#: en/help_topics/hooks.txt:18
12362
12244
#: en/help_topics/hooks.txt:58
12363
12245
msgid ""
12364
12246
"Called after new branch initialization completes. post_branch_init is\n"
12365
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12247
"called with a breezy.branch.BranchInitHookParams. Note that init,\n"
12366
12248
"branch and checkout (both heavyweight and lightweight) will all\n"
12367
12249
"trigger this hook."
12368
12250
msgstr ""
12381
12263
msgid ""
12382
12264
"Called in bzr client and server after a change to the tip of a branch\n"
12383
12265
"is made. post_change_branch_tip is called with a\n"
12384
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12266
"breezy.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12385
12267
"uncommit will all trigger this hook."
12386
12268
msgstr ""
12387
12269
12413
12295
#: en/help_topics/hooks.txt:88
12414
12296
msgid ""
12415
12297
"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."
12298
"breezy.branch.PullResult object and only runs in the bzr client."
12417
12299
msgstr ""
12418
12300
12419
12301
#: en/help_topics/hooks.txt:91
12425
12307
#: en/help_topics/hooks.txt:96
12426
12308
msgid ""
12427
12309
"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."
12310
"breezy.branch.BranchPushResult object and only runs in the bzr client."
12429
12311
msgstr ""
12430
12312
12431
12313
#: en/help_topics/hooks.txt:99
12437
12319
#: en/help_topics/hooks.txt:104
12438
12320
msgid ""
12439
12321
"Called after a checkout switches branch. post_switch is called with a\n"
12440
"bzrlib.branch.SwitchHookParams."
12322
"breezy.branch.SwitchHookParams."
12441
12323
msgstr ""
12442
12324
12443
12325
#: en/help_topics/hooks.txt:107
12469
12351
msgid ""
12470
12352
"Called in bzr client and server before a change to the tip of a branch\n"
12471
12353
"is made. pre_change_branch_tip is called with a\n"
12472
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12354
"breezy.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12473
12355
"uncommit will all trigger this hook."
12474
12356
msgstr ""
12475
12357
12539
12421
msgid ""
12540
12422
"Called after creating a command object to allow modifications such as\n"
12541
12423
"adding or removing options, docs etc. Called with the new\n"
12542
"bzrlib.commands.Command object."
12424
"breezy.commands.Command object."
12543
12425
msgstr ""
12544
12426
12545
12427
#: en/help_topics/hooks.txt:170
12559
12441
"command_name). get_command should either return the cmd_or_None\n"
12560
12442
"parameter, or a replacement Command object that should be used for the\n"
12561
12443
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12562
"Many users will prefer to use bzrlib.commands.register_command or\n"
12444
"Many users will prefer to use breezy.commands.register_command or\n"
12563
12445
"plugin_cmds.register_lazy."
12564
12446
msgstr ""
12565
12447
12698
12580
#: en/help_topics/hooks.txt:264
12699
12581
msgid ""
12700
12582
"Invoked after a repository has been initialized. post_repo_init is\n"
12701
"called with a bzrlib.controldir.RepoInitHookParams."
12583
"called with a breezy.controldir.RepoInitHookParams."
12702
12584
msgstr ""
12703
12585
12704
12586
#: en/help_topics/hooks.txt:267
12754
12636
msgstr ""
12755
12637
12756
12638
#: en/help_topics/hooks.txt:295
12757
msgid ""
12758
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12639
msgid "Called with a breezy.lock.LockResult when a physical lock is acquired."
12759
12640
msgstr ""
12760
12641
12761
12642
#: en/help_topics/hooks.txt:297
12765
12646
msgstr ""
12766
12647
12767
12648
#: en/help_topics/hooks.txt:302
12768
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12649
msgid "Called with a breezy.lock.LockResult when a physical lock is broken."
12769
12650
msgstr ""
12770
12651
12771
12652
#: en/help_topics/hooks.txt:304
12775
12656
msgstr ""
12776
12657
12777
12658
#: en/help_topics/hooks.txt:309
12778
msgid ""
12779
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12659
msgid "Called with a breezy.lock.LockResult when a physical lock is released."
12780
12660
msgstr ""
12781
12661
12782
12662
#: en/help_topics/hooks.txt:311
12797
12677
12798
12678
#: en/help_topics/hooks.txt:319
12799
12679
msgid ""
12800
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12680
"Called with a breezy.merge.Merger object to create a per file merge\n"
12801
12681
"object when starting a merge. Should return either None or a subclass\n"
12802
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12682
"of ``breezy.merge.AbstractPerFileMerger``. Such objects will then be\n"
12803
12683
"called per file that needs to be merged (including when one side has\n"
12804
12684
"deleted the file and the other has changed it). See the\n"
12805
12685
"AbstractPerFileMerger API docs for details on how it is used by merge."
12877
12757
#: en/help_topics/hooks.txt:362
12878
12758
msgid ""
12879
12759
"Called when a commit message is being generated.\n"
12880
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12760
"commit_message_template is called with the breezy.commit.Commit object\n"
12881
12761
"and the message that is known so far. commit_message_template must\n"
12882
12762
"return a new message to use (which could be the same as it was given).\n"
12883
12763
"When there are multiple hooks registered for commit_message_template,\n"
12894
12774
#: en/help_topics/hooks.txt:375
12895
12775
msgid ""
12896
12776
"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"
12777
"breezy.commit.Commit object (so you can also change e.g. revision\n"
12898
12778
"properties by editing commit.builder._revprops) and the message so\n"
12899
12779
"far. set_commit_message must return the message to use or None if it\n"
12900
12780
"should use the message editor as normal."
12925
12805
#: en/help_topics/hooks.txt:397
12926
12806
msgid ""
12927
12807
"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"
12808
"a breezy.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12929
12809
"commit was performed on is available via the mutable_tree attribute of\n"
12930
12810
"that object."
12931
12811
msgstr ""
12964
12844
msgid ""
12965
12845
"Called before a commit is performed on a tree. The start commit hook\n"
12966
12846
"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"
12847
"is called with the breezy.mutabletree.MutableTree that the commit is\n"
12968
12848
"being performed on."
12969
12849
msgstr ""
12970
12850
12987
12867
#: en/help_topics/hooks.txt:436
12988
12868
msgid ""
12989
12869
"Called when the smart client is submitting a request to the smart\n"
12990
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12870
"server. Called with a breezy.smart.client.CallHookParams object.\n"
12991
12871
"Streaming request bodies, and responses, are not accessible."
12992
12872
msgstr ""
12993
12873
13303
13183
msgstr ""
13304
13184
13305
13185
#: en/help_topics/patterns.txt:30
13306
msgid ""
13307
"For example, a case insensitive match for ``foo`` may be specified as::"
13186
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
13308
13187
msgstr ""
13309
13188
13310
13189
#: en/help_topics/patterns.txt:32
13318
13197
msgstr ""
13319
13198
13320
13199
#: en/help_topics/patterns.txt:37
13321
msgid ""
13322
".. _Python regular expressions: http://docs.python.org/library/re.html"
13200
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
13323
13201
msgstr ""
13324
13202
13325
13203
#: en/help_topics/revisionspec.txt:1
13664
13542
#: en/help_topics/rules.txt:26
13665
13543
msgid ""
13666
13544
"Default rules for all branches are defined in the optional file\n"
13667
"``BZR_HOME/rules``. "
13545
"``BRZ_HOME/rules``. "
13668
13546
msgstr ""
13669
13547
13670
13548
#: en/help_topics/rules.txt:29
13751
13629
13752
13630
#: en/help_topics/url-special-chars.txt:10
13753
13631
msgid ""
13754
"Internally bzr treats all locations as URLs. For any file system paths\n"
13632
"Internally brz treats all locations as URLs. For any file system paths\n"
13755
13633
"that are specified it will automatically determine the appropriate URL\n"
13756
13634
"representation, and escape special characters where necessary."
13757
13635
msgstr ""
13787
13665
#: en/help_topics/url-special-chars.txt:27
13788
13666
msgid ""
13789
13667
" 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"
13668
" brz log /tmp/%2False\n"
13669
" brz log %2False\n"
13670
" brz log file:///tmp/%252False\n"
13671
" brz log file://localhost/tmp/%252False\n"
13672
" brz log file:%252False"
13795
13673
msgstr ""
13796
13674
13797
13675
#: en/help_topics/url-special-chars.txt:34
13800
13678
13801
13679
#: en/help_topics/url-special-chars.txt:36
13802
13680
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)"
13681
" brz log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13682
" brz log %252False (refers to a file called /tmp/%252False)"
13805
13683
msgstr ""
13806
13684
13807
13685
#: en/help_topics/url-special-chars.txt:39
13824
13702
13825
13703
#: en/help_topics/url-special-chars.txt:46
13826
13704
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"
13705
" brz log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
13706
"\" set to \"bla\"\n"
13707
" brz log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13708
" brz log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
13709
"\" set to \"bla\"\n"
13832
13710
msgstr ""
13833
13711
13834
13712
#: en/help_topics/urlspec.txt:1
13898
13776
"Many commands that accept URLs also accept location aliases too.\n"
13899
13777
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13900
13778
msgstr ""
13901
13902
#~ msgid ""
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 ""
13916
#~ "If unset, the tree root directory name is used as the nickname.\n"
13917
#~ "To print the current nickname, execute with no argument."
13918
#~ msgstr ""
13919
#~ "設定されていない場合は、ツリーのルートディレクトリの名前が\n"
13920
#~ "ニックネームとして扱われます。引数なしで実行すると、現在の\n"
13921
#~ "ニックネームを表示します。"
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
#~ "されます。"
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0