« back to all changes in this revision
Viewing changes to po/ja.po
- browse files at revision 6581.1.1
- compare with another revision
- compare with revision 6578
- download diff
- download tarball
- view history from revision 6581.1.1
- Committer: Vincent Ladeuil
- Date: 2013-07-27 10:54:05 UTC
- mfrom: (6093.4.218 bzr)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: v.ladeuil+lp@free.fr-20130727105405-387zagx5ek6yprb1
Update translations
added
removed
po/ja.po
1
1
# Japanese translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5
5
#
6
6
msgid ""
7
7
msgstr ""
8
8
"Project-Id-Version: bzr\n"
9
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: 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
13
"Language-Team: Japanese <ja@li.org>\n"
14
14
"MIME-Version: 1.0\n"
15
15
"Content-Type: text/plain; charset=UTF-8\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
17
"Plural-Forms: nplurals=1; plural=0;\n"
18
"X-Launchpad-Export-Date: 2012-02-04 06:20+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
18
"X-Launchpad-Export-Date: 2013-05-22 04:30+0000\n"
19
"X-Generator: Launchpad (build 16626)\n"
20
20
21
#: bzrlib/add.py:95
21
#: bzrlib/add.py:93
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
23
msgstr "{0} をスキップ ({1} の {2} byte より大きいため)"
24
24
25
#: bzrlib/branch.py:872
25
#: bzrlib/branch.py:854
26
26
msgid "Unstacking"
27
27
msgstr "スタックの解除"
28
28
29
#: bzrlib/branch.py:3205
29
#: bzrlib/branch.py:2955
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr "リビジョン%dまでプッシュしました。"
33
33
34
#: bzrlib/branch.py:3207
34
#: bzrlib/branch.py:2957
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
38
msgstr[0] "%d 個のタグを更新しました"
39
39
40
#: bzrlib/branch.py:3210
40
#: bzrlib/branch.py:2960
41
41
msgid "No new revisions or tags to push."
42
42
msgstr "プッシュする新しいリビジョンやタグはありません。"
43
43
44
#: bzrlib/branch.py:3212
44
#: bzrlib/branch.py:2962
45
45
msgid "No new revisions to push."
46
46
msgstr "プッシュする新しいリビジョンはありません。"
47
47
48
#: bzrlib/branch.py:3232
48
#: bzrlib/branch.py:2982
49
49
msgid "checked branch {0} format {1}"
50
50
msgstr "format {1} のブランチ {0} をチェックしました"
51
51
52
#: bzrlib/branch.py:3235
52
#: bzrlib/branch.py:2985
53
53
#, python-format
54
54
msgid "found error:%s"
55
55
msgstr "検出されたエラー: %s"
56
56
57
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
57
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
58
58
#, python-format
59
59
msgid "Ignoring files outside view. View is %s"
60
60
msgstr "ビューに含まれないファイルは無視します。ビュー：%s"
61
61
62
#: bzrlib/builtins.py:218
62
#: bzrlib/builtins.py:260
63
63
#, python-format
64
64
msgid "bzr %s --revision takes exactly one revision identifier"
65
65
msgstr "bzr %s --revision には、リビジョンＩＤを一つだけ指定します。"
66
66
67
#: bzrlib/builtins.py:303
67
#: bzrlib/builtins.py:315
68
68
msgid "Display status summary."
69
69
msgstr "ステータスのサマリーを表示します。"
70
70
71
#: bzrlib/builtins.py:305
71
#: bzrlib/builtins.py:317
72
72
msgid ""
73
73
"This reports on versioned and unknown files, reporting them\n"
74
74
"grouped by state. Possible states are:"
77
77
"について、ステータスごとにグルーピングして表示します。\n"
78
78
"表示されるステータスは以下の通りです。:"
79
79
80
#: bzrlib/builtins.py:308
80
#: bzrlib/builtins.py:320
81
81
msgid ""
82
82
"added\n"
83
83
" Versioned in the working copy but not in the previous revision."
86
86
" 作業コピー内ではバージョン管理されているが、一つ前のリビジョンでは管理\n"
87
87
" されていない。"
88
88
89
#: bzrlib/builtins.py:311
89
#: bzrlib/builtins.py:323
90
90
msgid ""
91
91
"removed\n"
92
92
" Versioned in the previous revision but removed or deleted\n"
95
95
"removed\n"
96
96
" 一つ前のリビジョンでは管理されているが、作業コピー内では削除されている。"
97
97
98
#: bzrlib/builtins.py:315
98
#: bzrlib/builtins.py:327
99
99
msgid ""
100
100
"renamed\n"
101
101
" Path of this file changed from the previous revision;\n"
107
107
" 内容も変更されている可能性がある。親ディレクトリが変更されたファイルも\n"
108
108
" 含む。"
109
109
110
#: bzrlib/builtins.py:320
110
#: bzrlib/builtins.py:332
111
111
msgid ""
112
112
"modified\n"
113
113
" Text has changed since the previous revision."
115
115
"modified\n"
116
116
" ファイルの内容が一つ前のリビジョンから変更されている。"
117
117
118
#: bzrlib/builtins.py:323
118
#: bzrlib/builtins.py:335
119
119
msgid ""
120
120
"kind changed\n"
121
121
" File kind has been changed (e.g. from file to directory)."
123
123
"kind changed\n"
124
124
" ファイルの種別が変更されている。(ファイルからディレクトリに変わったなど)"
125
125
126
#: bzrlib/builtins.py:326
126
#: bzrlib/builtins.py:338
127
127
msgid ""
128
128
"unknown\n"
129
129
" Not versioned and not matching an ignore pattern."
131
131
"unknown\n"
132
132
" バージョン管理されておらず、無視パターンにも一致していない。"
133
133
134
#: bzrlib/builtins.py:329
134
#: bzrlib/builtins.py:341
135
135
msgid ""
136
136
"Additionally for directories, symlinks and files with a changed\n"
137
137
"executable bit, Bazaar indicates their type using a trailing\n"
142
142
"末尾に種別を現す文字としてそれぞれ'/'、'@'、'*'が付加されます。\n"
143
143
"これを表示しないようにするには、'--no-classify'オプションを指定してください。"
144
144
145
#: bzrlib/builtins.py:334
145
#: bzrlib/builtins.py:346
146
146
msgid ""
147
147
"To see ignored files use 'bzr ignored'. For details on the\n"
148
148
"changes to file texts, use 'bzr diff'."
150
150
"無視ファイルを見るには'bzr ignored'を使ってください。\n"
151
151
"ファイルの内容の変更を詳しく見るには、'bzr diff'を使ってください。"
152
152
153
#: bzrlib/builtins.py:337
153
#: bzrlib/builtins.py:349
154
154
msgid ""
155
155
"Note that --short or -S gives status flags for each item, similar\n"
156
156
"to Subversion's status command. To get output similar to svn -q,\n"
161
161
"SVNで-qを指定した場合と同じような形式にするには、bzr status -SV を\n"
162
162
"使用してください。"
163
163
164
#: bzrlib/builtins.py:341
164
#: bzrlib/builtins.py:353
165
165
msgid ""
166
166
"If no arguments are specified, the status of the entire working\n"
167
167
"directory is shown. Otherwise, only the status of the specified\n"
173
173
"されます。ディレクトリを指定した場合は、そのディレクトリの配下の全ての\n"
174
174
"ファイルのステータスが表示されます。"
175
175
176
#: bzrlib/builtins.py:346
176
#: bzrlib/builtins.py:358
177
177
msgid ""
178
178
"Before merges are committed, the pending merge tip revisions are\n"
179
179
"shown. To see all pending merge revisions, use the -v option.\n"
185
185
"マージ中の情報を省略するには、no-pendingオプションを使用するか、\n"
186
186
"ファイルやディレクトリを指定してください。"
187
187
188
#: bzrlib/builtins.py:351
188
#: bzrlib/builtins.py:363
189
189
msgid ""
190
190
"To compare the working directory to a specific revision, pass a\n"
191
191
"single revision to the revision argument."
193
193
"作業フォルダと指定リビジョンとを比較するには、リビジョンを一つだけ\n"
194
194
"引数に指定してください。"
195
195
196
#: bzrlib/builtins.py:354
196
#: bzrlib/builtins.py:366
197
197
msgid ""
198
198
"To see which files have changed in a specific revision, or between\n"
199
199
"two revisions, pass a revision range to the revision argument.\n"
203
203
"変更されたかを見るには、２つのリビジョンを引数に指定してください。\n"
204
204
"'bzr diff --summarize' でも見ることができます。"
205
205
206
#: bzrlib/builtins.py:363
206
#: bzrlib/builtins.py:375
207
207
msgid "Use short status indicators."
208
208
msgstr "省略形式でステータスを表示します。"
209
209
210
#: bzrlib/builtins.py:365
210
#: bzrlib/builtins.py:377
211
211
msgid "Only show versioned files."
212
212
msgstr "バージョン管理されているファイルだけを表示します。"
213
213
214
#: bzrlib/builtins.py:367
214
#: bzrlib/builtins.py:379
215
215
msgid "Don't show pending merges."
216
216
msgstr "マージ中の情報を表示しません。"
217
217
218
#: bzrlib/builtins.py:370
218
#: bzrlib/builtins.py:382
219
219
msgid "Do not mark object type using indicator."
220
220
msgstr "オブジェクトの種別を表すマーカーを表示しません。"
221
221
222
#: bzrlib/builtins.py:385
222
#: bzrlib/builtins.py:397
223
223
msgid "bzr status --revision takes exactly one or two revision specifiers"
224
224
msgstr "bzr status --revisionには、１つか２つのリビジョンを指定します。"
225
225
226
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
226
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
227
227
msgid "You can only supply one of revision_id or --revision"
228
228
msgstr "リビジョンＩＤと--revisionのどちらか一つだけを指定してください。"
229
229
230
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
230
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
231
231
msgid "You must supply either --revision or a revision_id"
232
232
msgstr "--revisionとリビジョンＩＤのどちらかを指定してください。"
233
233
234
#: bzrlib/builtins.py:439
234
#: bzrlib/builtins.py:451
235
235
#, python-format
236
236
msgid "Repository %r does not support access to raw revision texts"
237
237
msgstr "リポジトリ %r はリビジョンのtextへの直接アクセスをサポートしていません"
238
238
239
#: bzrlib/builtins.py:450
239
#: bzrlib/builtins.py:462
240
240
msgid "The repository {0} contains no revision {1}."
241
241
msgstr "リポジトリ {0} にはリビジョン {1} はありません。"
242
242
243
#: bzrlib/builtins.py:457
243
#: bzrlib/builtins.py:469
244
244
msgid "You cannot specify a NULL revision."
245
245
msgstr "NULLリビジョンは指定できません。"
246
246
247
#: bzrlib/builtins.py:549
247
#: bzrlib/builtins.py:561
248
248
msgid "Remove the working tree from a given branch/checkout."
249
249
msgstr "指定されたブランチ/チェックアウトから作業ツリーを削除します。"
250
250
251
#: bzrlib/builtins.py:551
251
#: bzrlib/builtins.py:563
252
252
msgid ""
253
253
"Since a lightweight checkout is little more than a working tree\n"
254
254
"this will refuse to run against one."
256
256
"軽量チェックアウトは作業ツリーよりも小さいため、軽量チェック\n"
257
257
"アウトに対して実行することはできません。"
258
258
259
#: bzrlib/builtins.py:554
259
#: bzrlib/builtins.py:566
260
260
msgid "To re-create the working tree, use \"bzr checkout\"."
261
261
msgstr "作業ツリーを再作成するには、 \"bzr checkout\" をしてください。"
262
262
263
#: bzrlib/builtins.py:560
263
#: bzrlib/builtins.py:572
264
264
msgid ""
265
265
"Remove the working tree even if it has uncommitted or shelved changes."
266
266
msgstr "作業ツリーが変更されていたり、シェルフされた変更があっても、作業ツリーを削除します。"
267
267
268
#: bzrlib/builtins.py:574
268
#: bzrlib/builtins.py:586
269
269
msgid "No working tree to remove"
270
270
msgstr "削除する作業ツリーがありません。"
271
271
272
#: bzrlib/builtins.py:576
272
#: bzrlib/builtins.py:588
273
273
msgid "You cannot remove the working tree of a remote path"
274
274
msgstr "リモートの作業ツリーを削除することはできません。"
275
275
276
#: bzrlib/builtins.py:585
276
#: bzrlib/builtins.py:597
277
277
msgid "You cannot remove the working tree from a lightweight checkout"
278
278
msgstr "軽量チェックアウトから作業ツリーを削除することはできません。"
279
279
280
#: bzrlib/builtins.py:625
280
#: bzrlib/builtins.py:637
281
281
msgid ""
282
282
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
283
283
"instead. Use \"--force\" if you are sure you want to reset the working tree."
285
285
"ツリーは壊れていないようです。代わりに\"bzr revert\"を実行してください。もし、本当に作業ツリーをリセットしたいのであれば、\"--"
286
286
"force\"オプションを指定してください。"
287
287
288
#: bzrlib/builtins.py:636
288
#: bzrlib/builtins.py:648
289
289
msgid ""
290
290
", the header appears corrupt, try passing -r -1 to set the state to the last "
291
291
"commit"
292
292
msgstr ", ヘッダーが壊れているようです。-r -1を指定して最終コミット時点の状態に戻してください。"
293
293
294
#: bzrlib/builtins.py:640
294
#: bzrlib/builtins.py:652
295
295
msgid "failed to reset the tree state{0}"
296
296
msgstr "ツリーの状態をリセットできませんでした。{0}"
297
297
298
#: bzrlib/builtins.py:644
298
#: bzrlib/builtins.py:656
299
299
msgid "Show current revision number."
300
300
msgstr "現在のリビジョン番号を表示します。"
301
301
302
#: bzrlib/builtins.py:646
302
#: bzrlib/builtins.py:658
303
303
msgid "This is equal to the number of revisions on this branch."
304
304
msgstr "これは、ブランチ内のリビジョンの数と同じです。"
305
305
306
#: bzrlib/builtins.py:659
306
#: bzrlib/builtins.py:671
307
307
msgid "--tree and --revision can not be used together"
308
308
msgstr "--tree と --revision は同時に指定できません"
309
309
310
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
310
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
311
311
msgid "Tags can only be placed on a single revision, not on a range"
312
312
msgstr "タグは1つのリビジョンにしか指定できません"
313
313
314
#: bzrlib/builtins.py:700
314
#: bzrlib/builtins.py:712
315
315
msgid "Show revno of working tree."
316
316
msgstr "作業ツリーのリビジョン番号を表示します。"
317
317
318
#: bzrlib/builtins.py:748
318
#: bzrlib/builtins.py:760
319
319
msgid "Add specified files or directories."
320
320
msgstr "指定されたファイルやディレクトリを追加します。"
321
321
322
#: bzrlib/builtins.py:750
322
#: bzrlib/builtins.py:762
323
323
msgid ""
324
324
"In non-recursive mode, all the named items are added, regardless\n"
325
325
"of whether they were previously ignored. A warning is given if\n"
329
329
"アイテムが追加されます。指定されたファイルが既に追加されているものだった\n"
330
330
"場合は、警告が表示されます。"
331
331
332
#: bzrlib/builtins.py:754
332
#: bzrlib/builtins.py:766
333
333
msgid ""
334
334
"In recursive mode (the default), files are treated the same way\n"
335
335
"but the behaviour for directories is different. Directories that\n"
347
347
"この処理は、バージョン管理されたディレクトリに対して再帰的に実行されます。\n"
348
348
"何も指定されていない場合は、'.'が指定されたものとみなします。"
349
349
350
#: bzrlib/builtins.py:762
350
#: bzrlib/builtins.py:774
351
351
msgid ""
352
352
"A warning will be printed when nested trees are encountered,\n"
353
353
"unless they are explicitly ignored."
354
354
msgstr "ネストしたツリーがあった場合、明示的に無視しない限り警告を表示します。"
355
355
356
#: bzrlib/builtins.py:765
356
#: bzrlib/builtins.py:777
357
357
msgid ""
358
358
"Therefore simply saying 'bzr add' will version all files that\n"
359
359
"are currently unknown."
361
361
"つまり、単に 'bzr add' とした場合は、すべての不明なファイルがバージョン\n"
362
362
"管理に追加されます。"
363
363
364
#: bzrlib/builtins.py:768
364
#: bzrlib/builtins.py:780
365
365
msgid ""
366
366
"Adding a file whose parent directory is not versioned will\n"
367
367
"implicitly add the parent, and so on up to the root. This means\n"
373
373
"ディレクトリを明示的に追加する必要はなく、その中にあるファイルを追加すれば\n"
374
374
"ディレクトリも追加されるということになります。"
375
375
376
#: bzrlib/builtins.py:773
376
#: bzrlib/builtins.py:785
377
377
msgid ""
378
378
"--dry-run will show which files would be added, but not actually\n"
379
379
"add them."
381
381
"--dry-run を指定すると、どのファイルが追加されるかを表示しますが、実際に追加は\n"
382
382
"しません。"
383
383
384
#: bzrlib/builtins.py:776
384
#: bzrlib/builtins.py:788
385
385
msgid ""
386
386
"--file-ids-from will try to use the file ids from the supplied path.\n"
387
387
"It looks up ids trying to find a matching parent directory with the\n"
398
398
"場合に便利です(マージの時の衝突を避けられます)。また、別のプロジェクトをサブ\n"
399
399
"ディレクトリとしてマージする時にも便利です。"
400
400
401
#: bzrlib/builtins.py:784
401
#: bzrlib/builtins.py:796
402
402
msgid ""
403
403
"Any files matching patterns in the ignore list will not be added\n"
404
404
"unless they are explicitly mentioned."
406
406
"無視パターンにマッチするファイルは、明示的に指定されない限り追加は\n"
407
407
"されません。"
408
408
409
#: bzrlib/builtins.py:787
409
#: bzrlib/builtins.py:799
410
410
msgid ""
411
411
"In recursive mode, files larger than the configuration option \n"
412
412
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
416
416
"ファイルは追加されません。明示的に指定されたアイテムはファイルサイズに\n"
417
417
"かかわらず追加されます。"
418
418
419
#: bzrlib/builtins.py:794
419
#: bzrlib/builtins.py:806
420
420
msgid "Don't recursively add the contents of directories."
421
421
msgstr "ディレクトリの内容を再帰的に追加しません。"
422
422
423
#: bzrlib/builtins.py:800
423
#: bzrlib/builtins.py:813
424
424
msgid "Lookup file ids from this tree."
425
425
msgstr "このツリーからファイルIDを検索します。"
426
426
427
#: bzrlib/builtins.py:836
427
#: bzrlib/builtins.py:849
428
428
msgid "ignored {0} matching \"{1}\"\n"
429
429
msgstr "無視 {0} (\"{1}\"にマッチ)\n"
430
430
431
#: bzrlib/builtins.py:841
431
#: bzrlib/builtins.py:854
432
432
msgid "Create a new versioned directory."
433
433
msgstr "バージョン管理されたディレクトリを作成します。"
434
434
435
#: bzrlib/builtins.py:843
435
#: bzrlib/builtins.py:856
436
436
msgid "This is equivalent to creating the directory and then adding it."
437
437
msgstr "ディレクトリを作成して、バージョン管理に追加することと同じです。"
438
438
439
#: bzrlib/builtins.py:850
439
#: bzrlib/builtins.py:863
440
440
msgid "No error if existing, make parent directories as needed."
441
441
msgstr ""
442
442
443
#: bzrlib/builtins.py:884
443
#: bzrlib/builtins.py:897
444
444
#, python-format
445
445
msgid "added %s\n"
446
446
msgstr "%s が追加されました。\n"
447
447
448
#: bzrlib/builtins.py:926
448
#: bzrlib/builtins.py:939
449
449
#, python-format
450
450
msgid "invalid kind %r specified"
451
451
msgstr "kindが正しくありません。 %s"
452
452
453
#: bzrlib/builtins.py:963
453
#: bzrlib/builtins.py:976
454
454
msgid "Move or rename a file."
455
455
msgstr "ファイルの移動や名前の変更を行います。"
456
456
457
#: bzrlib/builtins.py:965
457
#: bzrlib/builtins.py:978
458
458
msgid " bzr mv SOURCE... DESTINATION"
459
459
msgstr " bzr mv SOURCE... DESTINATION"
460
460
461
#: bzrlib/builtins.py:967
461
#: bzrlib/builtins.py:980
462
462
msgid ""
463
463
"If the last argument is a versioned directory, all the other names\n"
464
464
"are moved into it. Otherwise, there must be exactly two arguments\n"
468
468
"すべてそのディレクトリの中に移動されます。そうでない場合は、引数の数は\n"
469
469
"２つでなければならず、ファイルは新しい名前に変更されます。"
470
470
471
#: bzrlib/builtins.py:971
471
#: bzrlib/builtins.py:984
472
472
msgid ""
473
473
"If OLDNAME does not exist on the filesystem but is versioned and\n"
474
474
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
482
482
"内部データへの変更の反映だけを行います。\n"
483
483
"複数のSOURCEをひとつのDESTINATIONに移動する場合も同じです。"
484
484
485
#: bzrlib/builtins.py:977
485
#: bzrlib/builtins.py:990
486
486
msgid "Files cannot be moved between branches."
487
487
msgstr "ファイルを別のブランチに移動することはできません。"
488
488
489
#: bzrlib/builtins.py:984
489
#: bzrlib/builtins.py:997
490
490
msgid ""
491
491
"Move only the bzr identifier of the file, because the file has already been "
492
492
"moved."
493
493
msgstr "ファイルは既に移動済みのため、ファイルのBazaar IDだけを移動します。"
494
494
495
#: bzrlib/builtins.py:986
495
#: bzrlib/builtins.py:999
496
496
msgid "Automatically guess renames."
497
497
msgstr "変名を自動的に推測します。"
498
498
499
#: bzrlib/builtins.py:987
499
#: bzrlib/builtins.py:1000
500
500
msgid "Avoid making changes when guessing renames."
501
501
msgstr "変名を推測する時に、実際には変更を行いません。"
502
502
503
#: bzrlib/builtins.py:996
503
#: bzrlib/builtins.py:1009
504
504
msgid "--dry-run requires --auto."
505
505
msgstr "--dry-runは--autoとともに指定してください。"
506
506
507
#: bzrlib/builtins.py:1000
507
#: bzrlib/builtins.py:1013
508
508
msgid "missing file argument"
509
509
msgstr "ファイルが指定されていません。"
510
510
511
#: bzrlib/builtins.py:1004
511
#: bzrlib/builtins.py:1017
512
512
msgid "can not move root of branch"
513
513
msgstr "ブランチの root は移動できません。"
514
514
515
#: bzrlib/builtins.py:1010
515
#: bzrlib/builtins.py:1023
516
516
msgid "Only one path may be specified to --auto."
517
517
msgstr "--autoを指定する場合はパスはひとつだけ指定してください。"
518
518
519
#: bzrlib/builtins.py:1013
519
#: bzrlib/builtins.py:1026
520
520
msgid "--after cannot be specified with --auto."
521
521
msgstr "--afterと--autoを同時に指定することはできません。"
522
522
523
#: bzrlib/builtins.py:1050
523
#: bzrlib/builtins.py:1062
524
524
msgid "to mv multiple files the destination must be a versioned directory"
525
525
msgstr "複数のファイルを移動する時は、移動先はバージョン管理されていなければなりません。"
526
526
527
#: bzrlib/builtins.py:1102
527
#: bzrlib/builtins.py:1114
528
528
msgid "Turn this branch into a mirror of another branch."
529
529
msgstr "このブランチを別のブランチのミラーにします。"
530
530
531
#: bzrlib/builtins.py:1104
531
#: bzrlib/builtins.py:1116
532
532
msgid ""
533
533
"By default, this command only works on branches that have not diverged.\n"
534
534
"Branches are considered diverged if the destination branch's most recent \n"
539
539
"対象のブランチの最新コミットがまだ(直接的または間接的に)親ブランチにマージ\n"
540
540
"されていなければ、ブランチが分岐しているとみなします。"
541
541
542
#: bzrlib/builtins.py:1109
542
#: bzrlib/builtins.py:1121
543
543
msgid ""
544
544
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
545
545
"from one into the other. Once one branch has merged, the other should\n"
549
549
"'bzr merge'を使用することができます。ブランチをマージすれば、またpullできる\n"
550
550
"ようになるはずです。"
551
551
552
#: bzrlib/builtins.py:1113
552
#: bzrlib/builtins.py:1125
553
553
msgid ""
554
554
"If you want to replace your local changes and just want your branch to\n"
555
555
"match the remote one, use pull --overwrite. This will work even if the two\n"
559
559
"pull --overwriteを使用してください。これは、ブランチ同士が分岐していても\n"
560
560
"実行できます。"
561
561
562
#: bzrlib/builtins.py:1117
562
#: bzrlib/builtins.py:1129
563
563
msgid ""
564
564
"If there is no default location set, the first pull will set it (use\n"
565
565
"--no-remember to avoid setting it). After that, you can omit the\n"
572
572
"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモート\n"
573
573
"ブランチにアクセスできた時だけ保存されます。"
574
574
575
#: bzrlib/builtins.py:1122
575
#: bzrlib/builtins.py:1134
576
576
msgid ""
577
577
"The --verbose option will display the revisions pulled using the log_format\n"
578
578
"configuration option. You can use a different format by overriding it with\n"
582
582
"利用して表示します。 -Olog_format=<other_format> と指定することで、\n"
583
583
"別のフォーマットで表示できます。"
584
584
585
#: bzrlib/builtins.py:1126
585
#: bzrlib/builtins.py:1138
586
586
msgid ""
587
587
"Note: The location can be specified either in the form of a branch,\n"
588
588
"or in the form of a path to a file containing a merge directive generated\n"
591
591
"ブランチだけでなく、bzr sendで生成されたマージディレクティブを含むファイル\n"
592
592
"もpull対象として指定できることに注意してください。"
593
593
594
#: bzrlib/builtins.py:1134
594
#: bzrlib/builtins.py:1146
595
595
msgid "Show logs of pulled revisions."
596
596
msgstr "pull対象リビジョンのログを表示します。"
597
597
598
#: bzrlib/builtins.py:1136
598
#: bzrlib/builtins.py:1148
599
599
msgid ""
600
600
"Branch to pull into, rather than the one containing the working directory."
601
601
msgstr "作業フォルダの代わりにpullを受け入れるブランチ"
602
602
603
#: bzrlib/builtins.py:1139
603
#: bzrlib/builtins.py:1151
604
604
msgid ""
605
605
"Perform a local pull in a bound branch. Local pulls are not applied to the "
606
606
"master branch."
607
607
msgstr "バインドブランチに対してpullする場合に、マスターブランチには反映しないようにします。"
608
608
609
#: bzrlib/builtins.py:1168
609
#: bzrlib/builtins.py:1189
610
610
msgid "Need working tree for --show-base."
611
611
msgstr "--show-baseオプションを使用するには作業ツリーが必要です。"
612
612
613
#: bzrlib/builtins.py:1184
613
#: bzrlib/builtins.py:1205
614
614
msgid "No pull location known or specified."
615
615
msgstr "pull対象ブランチが指定されていません。"
616
616
617
#: bzrlib/builtins.py:1190
617
#: bzrlib/builtins.py:1211
618
618
#, python-format
619
619
msgid "Using saved parent location: %s\n"
620
620
msgstr "デフォルトの親ブランチを使用します。: %s\n"
621
621
622
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
622
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
623
623
msgid "Cannot use -r with merge directives or bundles"
624
624
msgstr "マージディレクティブやバンドルに対して-rを使用することはできません。"
625
625
626
#: bzrlib/builtins.py:1238
626
#: bzrlib/builtins.py:1261
627
627
msgid "Update a mirror of this branch."
628
628
msgstr "このブランチのミラーを更新します。"
629
629
630
#: bzrlib/builtins.py:1240
630
#: bzrlib/builtins.py:1263
631
631
msgid ""
632
632
"The target branch will not have its working tree populated because this\n"
633
633
"is both expensive, and is not supported on remote file systems."
635
635
"対象のブランチの作業ツリーの更新はコストが高く、リモートファイルシステムでは\n"
636
636
"サポートされていないため、作業ツリーの更新は行いません。"
637
637
638
#: bzrlib/builtins.py:1243
638
#: bzrlib/builtins.py:1266
639
639
msgid ""
640
640
"Some smart servers or protocols *may* put the working tree in place in\n"
641
641
"the future."
643
643
"将来的に、作業ツリーの更新ができるようなスマートサーバやプロトコルがリリース\n"
644
644
"*かもしれません*。"
645
645
646
#: bzrlib/builtins.py:1246
646
#: bzrlib/builtins.py:1269
647
647
msgid ""
648
648
"This command only works on branches that have not diverged. Branches are\n"
649
649
"considered diverged if the destination branch's most recent commit is one\n"
653
653
"の最新のコミットが(直接的、もしくは間接的に)push元のブランチにまだマージされて\n"
654
654
"いない状態の場合に、ブランチが分岐しているとみなされます。"
655
655
656
#: bzrlib/builtins.py:1250
656
#: bzrlib/builtins.py:1273
657
657
msgid ""
658
658
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
659
659
"the other branch completely, discarding its unmerged changes."
661
661
"ブランチ同士が分岐している場合、 'bzr push --overwrite' で、まだマージされて\n"
662
662
"いない変更を破棄してpush先のブランチを完全に置きかえることができます。"
663
663
664
#: bzrlib/builtins.py:1253
664
#: bzrlib/builtins.py:1276
665
665
msgid ""
666
666
"If you want to ensure you have the different changes in the other branch,\n"
667
667
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
671
671
"からマージして(bzr help mergeを参照)コミットしてください。そうすれば、\n"
672
672
"'--overwrite'の指定なしでpushできるようになります。"
673
673
674
#: bzrlib/builtins.py:1257
674
#: bzrlib/builtins.py:1280
675
675
msgid ""
676
676
"If there is no default push location set, the first push will set it (use\n"
677
677
"--no-remember to avoid setting it). After that, you can omit the\n"
684
684
"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモートの\n"
685
685
"ブランチにアクセスできた時だけ保存されます。"
686
686
687
#: bzrlib/builtins.py:1262
687
#: bzrlib/builtins.py:1285
688
688
msgid ""
689
689
"The --verbose option will display the revisions pushed using the log_format\n"
690
690
"configuration option. You can use a different format by overriding it with\n"
694
694
"利用して表示します。 -Olog_format=<other_format> と指定することで、\n"
695
695
"別のフォーマットで表示できます。"
696
696
697
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
697
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
698
698
msgid ""
699
699
"Branch to push from, rather than the one containing the working directory."
700
700
msgstr "カレントディレクトリの代わりにpush元とするブランチを指定します。"
701
701
702
#: bzrlib/builtins.py:1276
702
#: bzrlib/builtins.py:1299
703
703
msgid ""
704
704
"By default push will fail if the target directory exists, but does not "
705
705
"already have a control directory. This flag will allow push to proceed."
707
707
"デフォルトでは、push先のディレクトリが既に存在しているのにバージョン管理されていない状態の場合はpushできません。このフラグを指定すると、その場合で"
708
708
"もpushできるようになります。"
709
709
710
#: bzrlib/builtins.py:1281
710
#: bzrlib/builtins.py:1304
711
711
msgid ""
712
712
"Create a stacked branch that references the public location of the parent "
713
713
"branch."
714
714
msgstr "親ブランチの公開された場所を参照するスタックドブランチを作成します。"
715
715
716
#: bzrlib/builtins.py:1284
716
#: bzrlib/builtins.py:1307
717
717
msgid ""
718
718
"Create a stacked branch that refers to another branch for the commit "
719
719
"history. Only the work not present in the referenced branch is included in "
720
720
"the branch created."
721
721
msgstr "コミットの履歴を別のブランチから参照するスタックドブランチを作成します。参照先のブランチにない変更だけがこのブランチに含まれます。"
722
722
723
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
723
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
724
724
msgid ""
725
725
"Refuse to push if there are uncommitted changes in the working tree, --no-"
726
726
"strict disables the check."
728
728
"作業コピーが変更されている場合はpushできませんが、--no-strictオプションを指定\n"
729
729
"するとpushできるようになります。"
730
730
731
#: bzrlib/builtins.py:1292
731
#: bzrlib/builtins.py:1315
732
732
msgid "Don't populate the working tree, even for protocols that support it."
733
733
msgstr "作業コピーを更新できるプロトコルを使っている場合でも、更新しません。"
734
734
735
#: bzrlib/builtins.py:1336
735
#: bzrlib/builtins.py:1318
736
msgid "Overwrite tags only."
737
msgstr ""
738
739
#: bzrlib/builtins.py:1369
736
740
msgid "Could not determine branch to refer to."
737
741
msgstr "参照先のブランチを特定できません。"
738
742
739
#: bzrlib/builtins.py:1345
743
#: bzrlib/builtins.py:1378
740
744
#, python-format
741
745
msgid ""
742
746
"No push location known or specified. To push to the parent branch (at %s), "
743
747
"use 'bzr push :parent'."
744
748
msgstr "push先が設定も指定もされていません。親ブランチ(%s)にpushする場合は、'bzr push :parent'を使用してください。"
745
749
746
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
750
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
747
751
msgid "No push location known or specified."
748
752
msgstr "push先のブランチが設定も指定もされていません。"
749
753
750
#: bzrlib/builtins.py:1355
754
#: bzrlib/builtins.py:1388
751
755
#, python-format
752
756
msgid "Using saved push location: %s"
753
757
msgstr "デフォルトのpush先ブランチを使用します。: %s"
754
758
755
#: bzrlib/builtins.py:1365
759
#: bzrlib/builtins.py:1398
756
760
msgid "Create a new branch that is a copy of an existing branch."
757
761
msgstr "既存のブランチをコピーして新しいブランチを作成します。"
758
762
759
#: bzrlib/builtins.py:1367
763
#: bzrlib/builtins.py:1400
760
764
msgid ""
761
765
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
762
766
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
772
776
"FROM_LOCATIONからスキーマやドライブのIDを取り除いたものがTO_LOCATIONになり\n"
773
777
"ます。例えば、\"branch lp:foo-bar\"とすると、./foo-barが作られます。"
774
778
775
#: bzrlib/builtins.py:1374
779
#: bzrlib/builtins.py:1407
776
780
msgid ""
777
781
"To retrieve the branch as of a particular revision, supply the --revision\n"
778
782
"parameter, as in \"branch foo/bar -r 5\"."
780
784
"ブランチの特定のリビジョンで取り出したい場合は、\"branch foo/bar -r 5\"の\n"
781
785
"ように--revisionオプションを指定してください。"
782
786
783
#: bzrlib/builtins.py:1377
787
#: bzrlib/builtins.py:1410
784
788
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
785
789
msgstr "このコマンドの別名である'clone'と'get'は廃止予定です。"
786
790
787
#: bzrlib/builtins.py:1387
791
#: bzrlib/builtins.py:1420
788
792
msgid "Create a branch without a working-tree."
789
793
msgstr "作業ツリーのないブランチを作成します。"
790
794
791
#: bzrlib/builtins.py:1389
795
#: bzrlib/builtins.py:1422
792
796
msgid "Switch the checkout in the current directory to the new branch."
793
797
msgstr "カレントディレクトリにあるチェックアウトの参照先を新しいブランチに切り替えます。"
794
798
795
#: bzrlib/builtins.py:1392
799
#: bzrlib/builtins.py:1425
796
800
msgid ""
797
801
"Create a stacked branch referring to the source branch. The new branch will "
798
802
"depend on the availability of the source branch for all operations."
799
803
msgstr "元のブランチを参照するスタックドブランチを作成します。新しいブランチでは、元のブランチにアクセスできるときしか操作できません。"
800
804
801
#: bzrlib/builtins.py:1396
805
#: bzrlib/builtins.py:1429
802
806
msgid "Do not use a shared repository, even if available."
803
807
msgstr "共有リポジトリが使える場合でも、共有リポジトリを使いません。"
804
808
805
#: bzrlib/builtins.py:1398
809
#: bzrlib/builtins.py:1431
806
810
msgid ""
807
811
"By default branch will fail if the target directory exists, but does not "
808
812
"already have a control directory. This flag will allow branch to proceed."
810
814
"デフォルトでは、branch先のディレクトリが既に存在しているのにバージョン管理されていない場合はbranchできません。このフラグを指定すると、その場合"
811
815
"でもbranchできるようになります。"
812
816
813
#: bzrlib/builtins.py:1403
817
#: bzrlib/builtins.py:1436
814
818
msgid "Bind new branch to from location."
815
819
msgstr "新しいブランチを元のブランチにバインドします。"
816
820
817
#: bzrlib/builtins.py:1450
821
#: bzrlib/builtins.py:1483
818
822
#, python-format
819
823
msgid "Target directory \"%s\" already exists."
820
824
msgstr "対象のディレクトリ \"%s\" は既に存在します。"
821
825
822
#: bzrlib/builtins.py:1462
826
#: bzrlib/builtins.py:1495
823
827
#, python-format
824
828
msgid "Parent of \"%s\" does not exist."
825
829
msgstr "\"%s\" の親が見つかりません。"
826
830
827
#: bzrlib/builtins.py:1481
831
#: bzrlib/builtins.py:1514
828
832
msgid "The branch {0} has no revision {1}."
829
833
msgstr "ブランチ {0} にリビジョン {1} はありません。"
830
834
831
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
835
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
832
836
#, python-format
833
837
msgid "Created new stacked branch referring to %s."
834
838
msgstr "%s を参照するスタックドブランチを作成しました。"
835
839
836
#: bzrlib/builtins.py:1500
840
#: bzrlib/builtins.py:1533
837
841
#, python-format
838
842
msgid "Branched %d revision."
839
843
msgid_plural "Branched %d revisions."
840
844
msgstr[0] "%d個のリビジョンをブランチしました。"
841
845
842
#: bzrlib/builtins.py:1505
846
#: bzrlib/builtins.py:1538
843
847
#, python-format
844
848
msgid "New branch bound to %s"
845
849
msgstr "新しいブランチは %s にバインドされています。"
846
850
847
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
851
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
848
852
#, python-format
849
853
msgid "Switched to branch: %s"
850
854
msgstr "バインド先をスイッチしました。: %s"
851
855
852
#: bzrlib/builtins.py:1515
856
#: bzrlib/builtins.py:1548
853
857
msgid "List the branches available at the current location."
854
858
msgstr "カレントフォルダにある利用可能なブランチをリストアップします。"
855
859
856
#: bzrlib/builtins.py:1517
860
#: bzrlib/builtins.py:1550
857
861
msgid ""
858
862
"This command will print the names of all the branches at the current\n"
859
863
"location."
860
864
msgstr "このコマンドは、現在の場所にある全てのブランチの名前を表示します。"
861
865
862
#: bzrlib/builtins.py:1524
866
#: bzrlib/builtins.py:1557
863
867
msgid ""
864
868
"Recursively scan for branches rather than just looking in the specified "
865
869
"location."
866
870
msgstr "指定された場所だけでなく、再帰的にブランチを探します。"
867
871
868
#: bzrlib/builtins.py:1554
872
#: bzrlib/builtins.py:1586
869
873
msgid "(default)"
870
874
msgstr "(デフォルト)"
871
875
872
#: bzrlib/builtins.py:1566
876
#: bzrlib/builtins.py:1598
873
877
msgid "Create a new checkout of an existing branch."
874
878
msgstr "既存のブランチのチェックアウトを新しく作成します。"
875
879
876
#: bzrlib/builtins.py:1568
880
#: bzrlib/builtins.py:1600
877
881
msgid ""
878
882
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
879
883
"for\n"
882
886
"or if it was never created - i.e. if you pushed the branch to its current\n"
883
887
"location using SFTP."
884
888
msgstr ""
885
"BLANCH_LOCATIONが指定されていない場合は、'.'にあるブランチを再構成します。\n"
889
"BRANCH_LOCATIONが指定されていない場合は、'.'にあるブランチを再構成します。\n"
886
890
"これは、作業ツリーを消してしまった場合や、そもそも作業ツリーが作成されて\n"
887
891
"いない場合(例えば、SFTPでpushされたブランチなど)に役立ちます。"
888
892
889
#: bzrlib/builtins.py:1573
893
#: bzrlib/builtins.py:1605
890
894
msgid ""
891
895
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
892
896
"will\n"
903
907
"BRANCH_LOCATIONからスキーマやドライブのIDを取り除いたものがTO_LOCATIONになり\n"
904
908
"ます。例えば、\"branch lp:foo-bar\"とすると、./foo-barが作られます。"
905
909
906
#: bzrlib/builtins.py:1580
910
#: bzrlib/builtins.py:1612
907
911
msgid ""
908
912
"To retrieve the branch as of a particular revision, supply the --revision\n"
909
913
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
917
921
"なるため、コミットはできませんが、例えば古いコードをチェックする場合などに\n"
918
922
"役立ちます。"
919
923
920
#: bzrlib/builtins.py:1590
924
#: bzrlib/builtins.py:1622
921
925
msgid ""
922
926
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
923
927
"the branch for every operation. Normal checkouts can perform common "
929
933
"場合は、diffやstatusのような一般的な操作ではその必要はありませんし、ローカル\n"
930
934
"コミットすることもできます。"
931
935
932
#: bzrlib/builtins.py:1597
936
#: bzrlib/builtins.py:1629
933
937
msgid "Get file contents from this tree."
934
938
msgstr "ファイルの内容をこのツリーから取得します。"
935
939
936
#: bzrlib/builtins.py:1599
940
#: bzrlib/builtins.py:1631
937
941
msgid "Hard-link working tree files where possible."
938
942
msgstr "可能なら、作業コピーをハードリンクします。"
939
943
940
#: bzrlib/builtins.py:1640
944
#: bzrlib/builtins.py:1672
941
945
msgid ""
942
946
"Show list of renamed files.\n"
943
947
" "
945
949
"変名されたファイルをリストアップします。\n"
946
950
" "
947
951
948
#: bzrlib/builtins.py:1670
952
#: bzrlib/builtins.py:1700
949
953
msgid "Update a working tree to a new revision."
950
954
msgstr "作業ツリーを新しいリビジョンに更新します。"
951
955
952
#: bzrlib/builtins.py:1672
956
#: bzrlib/builtins.py:1702
953
957
msgid ""
954
958
"This will perform a merge of the destination revision (the tip of the\n"
955
959
"branch, or the specified revision) into the working tree, and then make\n"
958
962
"移動先のリビジョン(ブランチのTipもしくは指定されたリビジョン)を作業ツリーに\n"
959
963
"マージして、そのリビジョンを作業ツリーのベースリビジョンに設定します。 "
960
964
961
#: bzrlib/builtins.py:1676
965
#: bzrlib/builtins.py:1706
962
966
msgid ""
963
967
"You can use this to visit an older revision, or to update a working tree\n"
964
968
"that is out of date from its branch."
966
970
"古いリビジョンに一時的に移動したり、ブランチより古くなってしまった作業ツリーを\n"
967
971
"最新の状態にしたりすることができます。"
968
972
969
#: bzrlib/builtins.py:1679
973
#: bzrlib/builtins.py:1709
970
974
msgid ""
971
975
"If there are any uncommitted changes in the tree, they will be carried\n"
972
976
"across and remain as uncommitted changes after the update. To discard\n"
978
982
"'bzr revert' コマンドを利用してください。コミットされていない変更は、ベース\n"
979
983
"リビジョンの更新による変更とコンフリクトする可能性があります。"
980
984
981
#: bzrlib/builtins.py:1684
985
#: bzrlib/builtins.py:1714
982
986
msgid ""
983
987
"If the tree's branch is bound to a master branch, bzr will also update\n"
984
988
"the branch from the master."
986
990
"作業ツリーのブランチがマスターブランチに束縛されている場合、bzrは\n"
987
991
"作業ツリーのブランチもマスターブランチの状態に更新します。"
988
992
989
#: bzrlib/builtins.py:1687
993
#: bzrlib/builtins.py:1717
990
994
msgid ""
991
995
"You cannot update just a single file or directory, because each Bazaar\n"
992
996
"working tree has just a single basis revision. If you want to restore a\n"
1002
1006
"'bzr revert'に -r オプションを指定するか、'bzr cat'を使って古い内容を書き出して\n"
1003
1007
"ください。"
1004
1008
1005
#: bzrlib/builtins.py:1694
1009
#: bzrlib/builtins.py:1724
1006
1010
msgid ""
1007
1011
"The 'dir' argument, if given, must be the location of the root of a\n"
1008
1012
"working tree to update. By default, the working tree that contains the \n"
1011
1015
"dir 引数を指定する場合は、作業ツリーのルートを指定する必要があります。\n"
1012
1016
"デフォルトでは、カレントディレクトリを含む作業ツリーが選択されます。"
1013
1017
1014
#: bzrlib/builtins.py:1710
1018
#: bzrlib/builtins.py:1740
1015
1019
msgid "bzr update --revision takes exactly one revision"
1016
1020
msgstr "bzr update --revisionには、リビジョンをひとつだけ指定します。"
1017
1021
1018
#: bzrlib/builtins.py:1718
1022
#: bzrlib/builtins.py:1748
1019
1023
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1020
1024
msgstr "bzr updateは、個々のファイルやディレクトリではなく、作業ツリー全体を更新します。"
1021
1025
1022
#: bzrlib/builtins.py:1749
1026
#: bzrlib/builtins.py:1779
1023
1027
msgid "Tree is up to date at revision {0} of branch {1}"
1024
1028
msgstr "ツリーはブランチ {1} のリビジョン {0} で最新の状態です。"
1025
1029
1026
#: bzrlib/builtins.py:1765
1030
#: bzrlib/builtins.py:1795
1027
1031
#, python-format
1028
1032
msgid ""
1029
1033
"branch has no revision %s\n"
1032
1036
"ブランチには%sというリビジョンはありません。\n"
1033
1037
"bzr update --revisionには、ブランチ内のリビジョンを指定する必要があります。"
1034
1038
1035
#: bzrlib/builtins.py:1771
1039
#: bzrlib/builtins.py:1801
1036
1040
msgid "Updated to revision {0} of branch {1}"
1037
1041
msgstr "ブランチ {1} のリビジョン {0} に更新されました。"
1038
1042
1039
#: bzrlib/builtins.py:1775
1043
#: bzrlib/builtins.py:1805
1040
1044
msgid ""
1041
1045
"Your local commits will now show as pending merges with 'bzr status', and "
1042
1046
"can be committed with 'bzr commit'."
1043
1047
msgstr "ローカルで行った変更は、'bzr status'ではマージ中状態になっており、'bzr commit'でコミットできます。"
1044
1048
1045
#: bzrlib/builtins.py:1784
1049
#: bzrlib/builtins.py:1814
1046
1050
msgid "Show information about a working tree, branch or repository."
1047
1051
msgstr "作業コピー、ブランチ、リポジトリの情報を表示します。"
1048
1052
1049
#: bzrlib/builtins.py:1786
1053
#: bzrlib/builtins.py:1816
1050
1054
msgid ""
1051
1055
"This command will show all known locations and formats associated to the\n"
1052
1056
"tree, branch or repository."
1054
1058
"このコマンドは、ツリー、ブランチ、リポジトリに関連する所在やフォーマット\n"
1055
1059
"のすべての情報を表示します。"
1056
1060
1057
#: bzrlib/builtins.py:1789
1061
#: bzrlib/builtins.py:1819
1058
1062
msgid ""
1059
1063
"In verbose mode, statistical information is included with each report.\n"
1060
1064
"To see extended statistic information, use a verbosity level of 2 or\n"
1064
1068
"高度な統計情報を見るには、-vvのようにverboseオプションを複数回指定する\n"
1065
1069
"ことによって、verboseレベル2以上を指定してください。"
1066
1070
1067
#: bzrlib/builtins.py:1793
1071
#: bzrlib/builtins.py:1823
1068
1072
msgid "Branches and working trees will also report any missing revisions."
1069
1073
msgstr "ブランチと作業ツリーについては、存在しないリビジョンについても表示されます。"
1070
1074
1071
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1072
#: bzrlib/builtins.py:6442
1075
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1076
#: bzrlib/builtins.py:6466
1073
1077
msgid ":Examples:"
1074
1078
msgstr ":例:"
1075
1079
1076
#: bzrlib/builtins.py:1797
1080
#: bzrlib/builtins.py:1827
1077
1081
msgid " Display information on the format and related locations:"
1078
1082
msgstr " フォーマットと関連する場所についての情報を表示します。"
1079
1083
1080
#: bzrlib/builtins.py:1799
1084
#: bzrlib/builtins.py:1829
1081
1085
msgid " bzr info"
1082
1086
msgstr " bzr info"
1083
1087
1084
#: bzrlib/builtins.py:1801
1088
#: bzrlib/builtins.py:1831
1085
1089
msgid ""
1086
1090
" Display the above together with extended format information and\n"
1087
1091
" basic statistics (like the number of files in the working tree and\n"
1090
1094
" より詳細なフォーマット情報と、基本的な統計情報(作業ツリー内のファイルの\n"
1091
1095
" 数、ブランチ、リポジトリ内のリビジョンの数など)を一緒に表示します。:"
1092
1096
1093
#: bzrlib/builtins.py:1805
1097
#: bzrlib/builtins.py:1835
1094
1098
msgid " bzr info -v"
1095
1099
msgstr " bzr info -v"
1096
1100
1097
#: bzrlib/builtins.py:1807
1101
#: bzrlib/builtins.py:1837
1098
1102
msgid " Display the above together with number of committers to the branch:"
1099
1103
msgstr " さらに、このブランチにコミットした人の数も表示します。:"
1100
1104
1101
#: bzrlib/builtins.py:1809
1105
#: bzrlib/builtins.py:1839
1102
1106
msgid " bzr info -vv"
1103
1107
msgstr " bzr info -vv"
1104
1108
1105
#: bzrlib/builtins.py:1828
1109
#: bzrlib/builtins.py:1858
1106
1110
msgid "Remove files or directories."
1107
1111
msgstr "ファイルやディレクトリを削除します。"
1108
1112
1109
#: bzrlib/builtins.py:1830
1113
#: bzrlib/builtins.py:1860
1110
1114
msgid ""
1111
1115
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1112
1116
"delete them if they can easily be recovered using revert otherwise they\n"
1113
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1117
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1114
1118
"parameters are given Bazaar will scan for files that are being tracked by\n"
1115
1119
"Bazaar but missing in your tree and stop tracking them for you."
1116
1120
msgstr ""
1117
"このコマンドで指定されたファイルの変更をBazaarは管理しなくなります。\n"
1118
"revertでファイルが簡単に復活できる場合は、ファイルは削除されますし、そうで\n"
1119
"ない場合はバックアップ(.~#~という形式の拡張子がつきます)されます。オプション\n"
1120
"やパラメータが指定されていない場合は、バージョン管理されているけれどツリー\n"
1121
"削除されているファイルを探して、そのファイルのバージョン管理を止めます。"
1121
"これを行うと Bazaar は指定されたファイルの変更のトラックを停止します。\n"
1122
"これらのファイルが revert を用いて簡単に復元できる場合には削除を\n"
1123
"行いますが、そうでない場合にはバックアップが作られます (.~#~ という\n"
1124
"形の拡張子を付加します)。オプションやパラメータが指定されなかった\n"
1125
"場合には、Bazaar がトラックしているファイルのうち、現在のワーキング\n"
1126
"ツリーに存在しないファイルを検索し、これらのトラックを中止します。"
1122
1127
1123
#: bzrlib/builtins.py:1838
1128
#: bzrlib/builtins.py:1868
1124
1129
msgid "Only remove files that have never been committed."
1125
1130
msgstr "まだコミットされていないファイルだけを削除します。"
1126
1131
1127
#: bzrlib/builtins.py:1840
1132
#: bzrlib/builtins.py:1870
1128
1133
msgid "The file deletion mode to be used."
1129
1134
msgstr "使用するファイル削除モードです。"
1130
1135
1131
#: bzrlib/builtins.py:1841
1136
#: bzrlib/builtins.py:1871
1132
1137
msgid "Deletion Strategy"
1133
1138
msgstr "削除モード"
1134
1139
1135
#: bzrlib/builtins.py:1842
1140
#: bzrlib/builtins.py:1872
1136
1141
msgid "Backup changed files (default)."
1137
1142
msgstr "変更したファイルをバックアップします。"
1138
1143
1139
#: bzrlib/builtins.py:1843
1144
#: bzrlib/builtins.py:1873
1140
1145
msgid "Delete from bzr but leave the working copy."
1141
1146
msgstr "Bazaarからは削除しますが、作業ツリーには残します。"
1142
1147
1143
#: bzrlib/builtins.py:1844
1148
#: bzrlib/builtins.py:1874
1144
1149
msgid "Don't backup changed files."
1145
1150
msgstr "変更されたファイルをバックアップしません。"
1146
1151
1147
#: bzrlib/builtins.py:1845
1152
#: bzrlib/builtins.py:1875
1148
1153
msgid ""
1149
1154
"Delete all the specified files, even if they can not be recovered and even "
1150
1155
"if they are non-empty directories. (deprecated, use no-backup)"
1151
1156
msgstr ""
1152
1157
"元に戻せないファイル、空ではないディレクトリも含めて、指定されたアイテムを全て削除します。(廃止予定。no-backupを使用してください)"
1153
1158
1154
#: bzrlib/builtins.py:1854
1159
#: bzrlib/builtins.py:1884
1155
1160
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1156
1161
msgstr "(--forceオプションは廃止予定です。今後は--no-backupを使用してください)"
1157
1162
1158
#: bzrlib/builtins.py:1871
1163
#: bzrlib/builtins.py:1901
1159
1164
msgid "No matching files."
1160
1165
msgstr "対象のファイルはありませんでした。"
1161
1166
1162
#: bzrlib/builtins.py:1932
1167
#: bzrlib/builtins.py:1962
1163
1168
msgid "Reconcile bzr metadata in a branch."
1164
1169
msgstr "ブランチ内のBazaarのメタデータを修復します。"
1165
1170
1166
#: bzrlib/builtins.py:1934
1171
#: bzrlib/builtins.py:1964
1167
1172
msgid ""
1168
1173
"This can correct data mismatches that may have been caused by\n"
1169
1174
"previous ghost operations or bzr upgrades. You should only\n"
1174
1179
"と思われるデータの不整合を修正することができます。'bzr check'の結果や、\n"
1175
1180
"Bzrの開発者からの指示があるとき以外は、実行する必要はありません。"
1176
1181
1177
#: bzrlib/builtins.py:1939
1182
#: bzrlib/builtins.py:1969
1178
1183
msgid ""
1179
1184
"If a second branch is provided, cross-branch reconciliation is\n"
1180
1185
"also attempted, which will check that data like the tree root\n"
1185
1190
"これは、ツリーのルートIDのような、非常に古いバージョンのBzrにはなかった\n"
1186
1191
"データが、両方のブランチに正しく表現されているかをチェックします。"
1187
1192
1188
#: bzrlib/builtins.py:1944
1193
#: bzrlib/builtins.py:1974
1189
1194
msgid ""
1190
1195
"At the same time it is run it may recompress data resulting in\n"
1191
1196
"a potential saving in disk space or performance gain."
1193
1198
"同時に、ディスクスペースの節約やパフォーマンスの向上のために、データの\n"
1194
1199
"再圧縮がかかる可能性があります。"
1195
1200
1196
#: bzrlib/builtins.py:1947
1201
#: bzrlib/builtins.py:1977
1197
1202
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1198
1203
msgstr ""
1199
1204
"ブランチは、ローカルディスクやsftpのような、リスト可能なシステム上に\n"
1200
1205
"ある*必要があります*。"
1201
1206
1202
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1207
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1203
1208
msgid ""
1204
1209
"Format for the bzr 2.0 series.\n"
1205
1210
"Uses group-compress storage.\n"
1210
1215
"rich root 機能を提供します。 rich root 機能を提供するフォーマットに変換すると、\n"
1211
1216
"rich root 機能を持たないフォーマットに戻ることはできません。\n"
1212
1217
1213
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1218
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1214
1219
msgid ""
1215
1220
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1216
1221
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1217
1222
msgstr ""
1223
"1.x シリーズで使われているパックベースのフォーマット。0.92 で導入されました。0.92 以前の bzr リポジトリと相互運用可能ですが、0.92 "
1224
"より前の bzr からは読み込むことができません。 "
1218
1225
1219
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1226
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1220
1227
msgid "The 2a format with experimental support for colocated branches.\n"
1221
1228
msgstr "colocated branch を実験的にサポートする 2a フォーマット。\n"
1222
1229
1223
#: bzrlib/builtins.py:2015
1230
#: bzrlib/builtins.py:2045
1224
1231
msgid "Make a directory into a versioned branch."
1225
1232
msgstr "ディレクトリを、バージョン管理されたブランチにします。"
1226
1233
1227
#: bzrlib/builtins.py:2017
1234
#: bzrlib/builtins.py:2047
1228
1235
msgid ""
1229
1236
"Use this to create an empty branch, or before importing an\n"
1230
1237
"existing project."
1232
1239
"空のブランチを作る場合や、既存のプロジェクトをインポートする前にこの\n"
1233
1240
"コマンドを使用します。"
1234
1241
1235
#: bzrlib/builtins.py:2020
1242
#: bzrlib/builtins.py:2050
1236
1243
msgid ""
1237
1244
"If there is a repository in a parent directory of the location, then\n"
1238
1245
"the history of the branch will be stored in the repository. Otherwise\n"
1243
1250
"保存されます。そうでない場合は、履歴を.bzrディレクトリ内に持つスタンド\n"
1244
1251
"アロンブランチが作成されます。"
1245
1252
1246
#: bzrlib/builtins.py:2025
1253
#: bzrlib/builtins.py:2055
1247
1254
msgid ""
1248
1255
"If there is already a branch at the location but it has no working tree,\n"
1249
1256
"the tree can be populated with 'bzr checkout'."
1251
1258
"既にブランチがあって、作業ツリーがない場合は、'bzr checkout'でツリーを\n"
1252
1259
"生成することができます。"
1253
1260
1254
#: bzrlib/builtins.py:2028
1261
#: bzrlib/builtins.py:2058
1255
1262
msgid "Recipe for importing a tree of files::"
1256
1263
msgstr "ファイルのツリーをインポートするためのレシピ::"
1257
1264
1258
#: bzrlib/builtins.py:2030
1265
#: bzrlib/builtins.py:2060
1259
1266
msgid ""
1260
1267
" cd ~/project\n"
1261
1268
" bzr init\n"
1269
1276
" bzr status\n"
1270
1277
" bzr commit -m \"imported project\""
1271
1278
1272
#: bzrlib/builtins.py:2041
1279
#: bzrlib/builtins.py:2071
1273
1280
msgid ""
1274
1281
"Create the path leading up to the branch if it does not already exist."
1275
1282
msgstr "ブランチまでのパスが存在していなければ、作成します。"
1276
1283
1277
#: bzrlib/builtins.py:2044
1284
#: bzrlib/builtins.py:2074
1278
1285
msgid "Specify a format for this branch. See \"help formats\"."
1279
1286
msgstr "ブランチのフォーマットを指定します。\"help formats\"をご覧ください。"
1280
1287
1281
#: bzrlib/builtins.py:2052
1288
#: bzrlib/builtins.py:2082
1282
1289
msgid ""
1283
1290
"Never change revnos or the existing log. Append revisions to it only."
1284
1291
msgstr "リビジョン番号や既存のログを変更せず、リビジョンの追加だけを行います。"
1285
1292
1286
#: bzrlib/builtins.py:2055
1293
#: bzrlib/builtins.py:2085
1287
1294
msgid "Create a branch without a working tree."
1288
1295
msgstr "作業ツリーをもたないブランチを作成します。"
1289
1296
1290
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1297
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1291
1298
#, python-format
1292
1299
msgid ""
1293
1300
"Parent directory of %s does not exist.\n"
1296
1303
"%s の親ディレクトリがありません。\n"
1297
1304
"--create-prefixを指定すれば、親ディレクトリも作成されます。"
1298
1305
1299
#: bzrlib/builtins.py:2109
1306
#: bzrlib/builtins.py:2139
1300
1307
msgid ""
1301
1308
"This branch format cannot be set to append-revisions-only. Try --default."
1302
1309
msgstr "このブランチフォーマットにappend-revisions-onlyは指定できません。--defaultを試してください。"
1303
1310
1304
#: bzrlib/builtins.py:2120
1311
#: bzrlib/builtins.py:2150
1305
1312
msgid "Created a {0} (format: {1})\n"
1306
1313
msgstr "{0}を作成しました。(フォーマット:{1})\n"
1307
1314
1308
#: bzrlib/builtins.py:2129
1315
#: bzrlib/builtins.py:2159
1309
1316
#, python-format
1310
1317
msgid "Using shared repository: %s\n"
1311
1318
msgstr "共有リポジトリを使用しました。: %s\n"
1312
1319
1313
#: bzrlib/builtins.py:2133
1320
#: bzrlib/builtins.py:2163
1314
1321
msgid "Create a shared repository for branches to share storage space."
1315
1322
msgstr "ブランチのストレージを共有するための共有リポジトリを作成します。"
1316
1323
1317
#: bzrlib/builtins.py:2135
1324
#: bzrlib/builtins.py:2165
1318
1325
msgid ""
1319
1326
"New branches created under the repository directory will store their\n"
1320
1327
"revisions in the repository, not in the branch directory. For branches\n"
1326
1333
"しているブランチ同士のストレージサイズが節約され、新しいブランチを作成\n"
1327
1334
"するスピードも速くなります。"
1328
1335
1329
#: bzrlib/builtins.py:2140
1336
#: bzrlib/builtins.py:2170
1330
1337
msgid ""
1331
1338
"If the --no-trees option is given then the branches in the repository\n"
1332
1339
"will not have working trees by default. They will still exist as \n"
1341
1348
"これは、サーバー上のリポジトリなど、チェックアウトやリモートブランチとやりとり\n"
1342
1349
"するリポジトリの場合に役立ちます。"
1343
1350
1344
#: bzrlib/builtins.py:2147
1351
#: bzrlib/builtins.py:2177
1345
1352
msgid ""
1346
1353
":Examples:\n"
1347
1354
" Create a shared repository holding just branches::"
1349
1356
":例:\n"
1350
1357
" ブランチだけをもつリポジトリを作成します。::"
1351
1358
1352
#: bzrlib/builtins.py:2150
1359
#: bzrlib/builtins.py:2180
1353
1360
msgid ""
1354
1361
" bzr init-repo --no-trees repo\n"
1355
1362
" bzr init repo/trunk"
1357
1364
" bzr init-repo --no-trees repo\n"
1358
1365
" bzr init repo/trunk"
1359
1366
1360
#: bzrlib/builtins.py:2153
1367
#: bzrlib/builtins.py:2183
1361
1368
msgid " Make a lightweight checkout elsewhere::"
1362
1369
msgstr " 別の場所に軽量チェックアウトを作成します。::"
1363
1370
1364
#: bzrlib/builtins.py:2155
1371
#: bzrlib/builtins.py:2185
1365
1372
msgid ""
1366
1373
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1367
1374
" cd trunk-checkout\n"
1371
1378
" cd trunk-checkout\n"
1372
1379
" (ここでファイルを追加)"
1373
1380
1374
#: bzrlib/builtins.py:2163
1381
#: bzrlib/builtins.py:2193
1375
1382
msgid ""
1376
1383
"Specify a format for this repository. See \"bzr help formats\" for details."
1377
1384
msgstr "リポジトリのフォーマットを指定します。詳しくは\"bzr help formats\"をご覧ください。"
1378
1385
1379
#: bzrlib/builtins.py:2167
1386
#: bzrlib/builtins.py:2197
1380
1387
msgid "Repository format"
1381
1388
msgstr "リポジトリフォーマット"
1382
1389
1383
#: bzrlib/builtins.py:2169
1390
#: bzrlib/builtins.py:2199
1384
1391
msgid "Branches in the repository will default to not having a working tree."
1385
1392
msgstr "リポジトリ内のブランチにはデフォルトでは作業ツリーを持たせません。"
1386
1393
1387
#: bzrlib/builtins.py:2195
1394
#: bzrlib/builtins.py:2225
1388
1395
msgid "Show differences in the working tree, between revisions or branches."
1389
1396
msgstr "作業ツリーや、リビジョン、ブランチ間の差分を表示します。"
1390
1397
1391
#: bzrlib/builtins.py:2197
1398
#: bzrlib/builtins.py:2227
1392
1399
msgid ""
1393
1400
"If no arguments are given, all changes for the current tree are listed.\n"
1394
1401
"If files are given, only the changes in those files are listed.\n"
1403
1410
"できます。これらが指定されていない場合は最初の引数が使われ、引数が無い\n"
1404
1411
"場合は作業ツリーが対象になります。"
1405
1412
1406
#: bzrlib/builtins.py:2204
1413
#: bzrlib/builtins.py:2234
1407
1414
msgid ""
1408
1415
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1409
1416
"produces patches suitable for \"patch -p1\"."
1410
1417
msgstr ""
1411
"\"bzr dif -p1\"は、\"bzr diff --prefix old/:new/\" と同じで、\"patch -p1\"に\n"
1418
"\"bzr diff -p1\"は、\"bzr diff --prefix old/:new/\" と同じで、\"patch -p1\"に\n"
1412
1419
"準じたパッチを出力します。"
1413
1420
1414
#: bzrlib/builtins.py:2207
1421
#: bzrlib/builtins.py:2237
1415
1422
msgid ""
1416
1423
"Note that when using the -r argument with a range of revisions, the\n"
1417
1424
"differences are computed between the two specified revisions. That\n"
1425
1432
"リビジョンでの変更は含まれません。これは、\"bzr log\"にリビジョンの範囲を\n"
1426
1433
"指定した場合の動作(開始リビジョンも含む)とは異なります。"
1427
1434
1428
#: bzrlib/builtins.py:2214
1435
#: bzrlib/builtins.py:2244
1429
1436
msgid ""
1430
1437
":Exit values:\n"
1431
1438
" 1 - changed\n"
1439
1446
" 3 - エラー\n"
1440
1447
" 0 - 変更なし"
1441
1448
1442
#: bzrlib/builtins.py:2220
1449
#: bzrlib/builtins.py:2250
1443
1450
msgid ""
1444
1451
":Examples:\n"
1445
1452
" Shows the difference in the working tree versus the last commit::"
1447
1454
":例:\n"
1448
1455
" 最新のコミットと作業ツリーとの間の変更を表示します。::"
1449
1456
1450
#: bzrlib/builtins.py:2223
1457
#: bzrlib/builtins.py:2253
1451
1458
msgid " bzr diff"
1452
1459
msgstr " bzr diff"
1453
1460
1454
#: bzrlib/builtins.py:2225
1461
#: bzrlib/builtins.py:2255
1455
1462
msgid " Difference between the working tree and revision 1::"
1456
1463
msgstr " 作業ツリーとリビジョン１を比較します。::"
1457
1464
1458
#: bzrlib/builtins.py:2227
1465
#: bzrlib/builtins.py:2257
1459
1466
msgid " bzr diff -r1"
1460
1467
msgstr " bzr diff -r1"
1461
1468
1462
#: bzrlib/builtins.py:2229
1469
#: bzrlib/builtins.py:2259
1463
1470
msgid " Difference between revision 3 and revision 1::"
1464
1471
msgstr " リビジョン３とリビジョン１を比較します。::"
1465
1472
1466
#: bzrlib/builtins.py:2231
1473
#: bzrlib/builtins.py:2261
1467
1474
msgid " bzr diff -r1..3"
1468
1475
msgstr " bzr diff -r1..3"
1469
1476
1470
#: bzrlib/builtins.py:2233
1477
#: bzrlib/builtins.py:2263
1471
1478
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1472
1479
msgstr " ブランチxxxのリビジョン３とリビジョン１を比較します。::"
1473
1480
1474
#: bzrlib/builtins.py:2235
1481
#: bzrlib/builtins.py:2265
1475
1482
msgid " bzr diff -r1..3 xxx"
1476
1483
msgstr " bzr diff -r1..3 xxx"
1477
1484
1478
#: bzrlib/builtins.py:2237
1485
#: bzrlib/builtins.py:2267
1479
1486
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1480
1487
msgstr " リビジョン２での変更です。(-r1..2 と同じです。)::"
1481
1488
1482
#: bzrlib/builtins.py:2239
1489
#: bzrlib/builtins.py:2269
1483
1490
msgid " bzr diff -c2"
1484
1491
msgstr " bzr diff -c2"
1485
1492
1486
#: bzrlib/builtins.py:2241
1493
#: bzrlib/builtins.py:2271
1487
1494
msgid ""
1488
1495
" To see the changes introduced by revision X::\n"
1489
1496
" \n"
1493
1500
" \n"
1494
1501
" bzr diff -cX"
1495
1502
1496
#: bzrlib/builtins.py:2245
1503
#: bzrlib/builtins.py:2275
1497
1504
msgid ""
1498
1505
" Note that in the case of a merge, the -c option shows the changes\n"
1499
1506
" compared to the left hand parent. To see the changes against\n"
1502
1509
" マージされたリビジョンの場合は、-cオプションは左側の親からの変更を表示する\n"
1503
1510
" ことに注意してください。他の親からの変更を見るには、以下のようにします。::"
1504
1511
1505
#: bzrlib/builtins.py:2249
1512
#: bzrlib/builtins.py:2279
1506
1513
msgid " bzr diff -r<chosen_parent>..X"
1507
1514
msgstr " bzr diff -r<対象の親リビジョン>..X"
1508
1515
1509
#: bzrlib/builtins.py:2251
1516
#: bzrlib/builtins.py:2281
1510
1517
msgid ""
1511
1518
" The changes between the current revision and the previous revision\n"
1512
1519
" (equivalent to -c-1 and -r-2..-1)"
1513
1520
msgstr " 現在のリビジョンと一つ前のリビジョンとの差分です。(-c-1 、 -r-2..-1 と同じ)"
1514
1521
1515
#: bzrlib/builtins.py:2254
1522
#: bzrlib/builtins.py:2284
1516
1523
msgid " bzr diff -r-2.."
1517
1524
msgstr " bzr diff -r-2.."
1518
1525
1519
#: bzrlib/builtins.py:2256
1526
#: bzrlib/builtins.py:2286
1520
1527
msgid " Show just the differences for file NEWS::"
1521
1528
msgstr " ファイルNEWSの変更だけを表示します。::"
1522
1529
1523
#: bzrlib/builtins.py:2258
1530
#: bzrlib/builtins.py:2288
1524
1531
msgid " bzr diff NEWS"
1525
1532
msgstr " bzr diff NEWS"
1526
1533
1527
#: bzrlib/builtins.py:2260
1534
#: bzrlib/builtins.py:2290
1528
1535
msgid " Show the differences in working tree xxx for file NEWS::"
1529
1536
msgstr " 作業ツリーxxxの、ファイルNEWSの変更内容を表示します。::"
1530
1537
1531
#: bzrlib/builtins.py:2262
1538
#: bzrlib/builtins.py:2292
1532
1539
msgid " bzr diff xxx/NEWS"
1533
1540
msgstr " bzr diff xxx/NEWS"
1534
1541
1535
#: bzrlib/builtins.py:2264
1542
#: bzrlib/builtins.py:2294
1536
1543
msgid " Show the differences from branch xxx to this working tree:"
1537
1544
msgstr " ブランチxxxと作業ツリーとの間の差分を表示します。::"
1538
1545
1539
#: bzrlib/builtins.py:2266
1546
#: bzrlib/builtins.py:2296
1540
1547
msgid " bzr diff --old xxx"
1541
1548
msgstr " bzr diff --old xxx"
1542
1549
1543
#: bzrlib/builtins.py:2268
1550
#: bzrlib/builtins.py:2298
1544
1551
msgid " Show the differences between two branches for file NEWS::"
1545
1552
msgstr " ２つのブランチ間での、ファイルNEWSの差分を表示します。::"
1546
1553
1547
#: bzrlib/builtins.py:2270
1554
#: bzrlib/builtins.py:2300
1548
1555
msgid " bzr diff --old xxx --new yyy NEWS"
1549
1556
msgstr " bzr diff --old xxx --new yyy NEWS"
1550
1557
1551
#: bzrlib/builtins.py:2272
1558
#: bzrlib/builtins.py:2302
1552
1559
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1553
1560
msgstr " 'bzr diff'と同じですが、プレフィックスold/、new/を付加します。::"
1554
1561
1555
#: bzrlib/builtins.py:2274
1562
#: bzrlib/builtins.py:2304
1556
1563
msgid ""
1557
1564
" bzr diff --prefix old/:new/\n"
1558
1565
" \n"
1566
1573
" \n"
1567
1574
" bzr diff --using /usr/bin/diff --diff-options -wu"
1568
1575
1569
#: bzrlib/builtins.py:2284
1576
#: bzrlib/builtins.py:2314
1570
1577
msgid "Pass these options to the external diff program."
1571
1578
msgstr "これらのオプションは外部のdiffプログラムに渡されます。"
1572
1579
1573
#: bzrlib/builtins.py:2287
1580
#: bzrlib/builtins.py:2317
1574
1581
msgid ""
1575
1582
"Set prefixes added to old and new filenames, as two values separated by a "
1576
1583
"colon. (eg \"old/:new/\")."
1577
1584
msgstr "古いファイル名と新しいファイル名にプレフィックスを追加します。２つの値をコロンで区切って指定します。(例 \"old/:new/\")"
1578
1585
1579
#: bzrlib/builtins.py:2290
1586
#: bzrlib/builtins.py:2320
1580
1587
msgid "Branch/tree to compare from."
1581
1588
msgstr "比較元のブランチ/作業ツリーです。"
1582
1589
1583
#: bzrlib/builtins.py:2294
1590
#: bzrlib/builtins.py:2324
1584
1591
msgid "Branch/tree to compare to."
1585
1592
msgstr "比較先のブランチ/作業ツリーです。"
1586
1593
1587
#: bzrlib/builtins.py:2300
1594
#: bzrlib/builtins.py:2330
1588
1595
msgid "Use this command to compare files."
1589
1596
msgstr "ファイル比較に使うコマンドです。"
1590
1597
1591
#: bzrlib/builtins.py:2305
1598
#: bzrlib/builtins.py:2335
1592
1599
msgid "Diff format to use."
1593
1600
msgstr "使用するDiffフォーマットです。"
1594
1601
1595
#: bzrlib/builtins.py:2307
1602
#: bzrlib/builtins.py:2337
1596
1603
msgid "Diff format"
1597
1604
msgstr "Diffフォーマット"
1598
1605
1599
#: bzrlib/builtins.py:2329
1606
#: bzrlib/builtins.py:2359
1600
1607
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1601
1608
msgstr "--prefix は２つの値をコロンで区切ったものにしてください。 (例 \"old/:new/\")"
1602
1609
1603
#: bzrlib/builtins.py:2333
1610
#: bzrlib/builtins.py:2363
1604
1611
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1605
1612
msgstr "bzr diff --revision には１つまたは２つのリビジョンを指定してください。"
1606
1613
1607
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1608
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1614
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1615
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1609
1616
msgid "{0} and {1} are mutually exclusive"
1610
1617
msgstr "{0} と {1} を同時に指定することはできません。"
1611
1618
1612
#: bzrlib/builtins.py:2358
1619
#: bzrlib/builtins.py:2388
1613
1620
msgid ""
1614
1621
"List files deleted in the working tree.\n"
1615
1622
" "
1617
1624
"作業ツリー上で削除されたファイルをリストアップします。\n"
1618
1625
" "
1619
1626
1620
#: bzrlib/builtins.py:2436
1627
#: bzrlib/builtins.py:2465
1621
1628
msgid "Show the tree root directory."
1622
1629
msgstr "ツリーのルートディレクトリを表示します。"
1623
1630
1624
#: bzrlib/builtins.py:2438
1631
#: bzrlib/builtins.py:2467
1625
1632
msgid ""
1626
1633
"The root is the nearest enclosing directory with a .bzr control\n"
1627
1634
"directory."
1628
1635
msgstr "ルートとは、.bzr管理ディレクトリを持つ、一番近い上位ディレクトリのことです。"
1629
1636
1630
#: bzrlib/builtins.py:2453
1637
#: bzrlib/builtins.py:2482
1631
1638
msgid "The limit argument must be an integer."
1632
1639
msgstr "limitは整数でなければなりません。"
1633
1640
1634
#: bzrlib/builtins.py:2461
1641
#: bzrlib/builtins.py:2490
1635
1642
msgid "The levels argument must be an integer."
1636
1643
msgstr "levelsは整数でなければなりません。"
1637
1644
1638
#: bzrlib/builtins.py:2466
1645
#: bzrlib/builtins.py:2495
1639
1646
msgid "Show historical log for a branch or subset of a branch."
1640
1647
msgstr "ブランチ、もしくはブランチの一部の履歴ログを表示します。"
1641
1648
1642
#: bzrlib/builtins.py:2468
1649
#: bzrlib/builtins.py:2497
1643
1650
msgid ""
1644
1651
"log is bzr's default tool for exploring the history of a branch.\n"
1645
1652
"The branch to use is taken from the first parameter. If no parameters\n"
1651
1658
"作業ディレクトリを含むブランチの履歴が表示されます。\n"
1652
1659
"簡単な例を以下に示します。::"
1653
1660
1654
#: bzrlib/builtins.py:2473
1661
#: bzrlib/builtins.py:2502
1655
1662
msgid ""
1656
1663
" bzr log log the current branch\n"
1657
1664
" bzr log foo.py log a file in its branch\n"
1661
1668
" bzr log foo,py は、ブランチ内のファイルの履歴を表示します。\n"
1662
1669
" bzr log http://server/branch は、サーバ上のブランチのログを表示します。"
1663
1670
1664
#: bzrlib/builtins.py:2477
1671
#: bzrlib/builtins.py:2506
1665
1672
msgid ""
1666
1673
"The filtering, ordering and information shown for each revision can\n"
1667
1674
"be controlled as explained below. By default, all revisions are\n"
1676
1683
"されます。マージされたリビジョンを表示する場合は、マージ先のリビジョンよりも\n"
1677
1684
"インデントされて表示されます。"
1678
1685
1679
#: bzrlib/builtins.py:2484
1686
#: bzrlib/builtins.py:2513
1680
1687
msgid ":Output control:"
1681
1688
msgstr ":出力のコントロール:"
1682
1689
1683
#: bzrlib/builtins.py:2486
1690
#: bzrlib/builtins.py:2515
1684
1691
msgid ""
1685
1692
" The log format controls how information about each revision is\n"
1686
1693
" displayed. The standard log formats are called ``long``, ``short``\n"
1692
1699
" があります。デフォルトはlongです。ログフォーマットについての詳細は\n"
1693
1700
" ``bzr help log-formats`` をご覧ください。"
1694
1701
1695
#: bzrlib/builtins.py:2491
1702
#: bzrlib/builtins.py:2520
1696
1703
msgid ""
1697
1704
" The following options can be used to control what information is\n"
1698
1705
" displayed::"
1699
1706
msgstr " 以下のオプションで、どの情報を表示するかをコントロールできます。"
1700
1707
1701
#: bzrlib/builtins.py:2494
1708
#: bzrlib/builtins.py:2523
1702
1709
msgid ""
1703
1710
" -l N display a maximum of N revisions\n"
1704
1711
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1712
1719
" -p Diff(patch)を各リビジョンに表示します。\n"
1713
1720
" --show-ids リビジョン番号だけでなく、リビジョンIDとファイルIDも表示します。」"
1714
1721
1715
#: bzrlib/builtins.py:2500
1722
#: bzrlib/builtins.py:2529
1716
1723
msgid ""
1717
1724
" Note that the default number of levels to display is a function of the\n"
1718
1725
" log format. If the -n option is not used, the standard log formats show\n"
1722
1729
" -nオプションが使用されない場合は、標準のログフォーマットはトップレベル(メイン\n"
1723
1730
" ライン)だけを表示します。"
1724
1731
1725
#: bzrlib/builtins.py:2504
1732
#: bzrlib/builtins.py:2533
1726
1733
msgid ""
1727
1734
" Status summaries are shown using status flags like A, M, etc. To see\n"
1728
1735
" the changes explained using words like ``added`` and ``modified``\n"
1731
1738
" ステータスのサマリは、A、Mなどのフラグで表示されます。 かわりに ``added``、\n"
1732
1739
" ``modified`` などの単語で表示するには、-vvオプションを使用してください。"
1733
1740
1734
#: bzrlib/builtins.py:2508
1741
#: bzrlib/builtins.py:2537
1735
1742
msgid ":Ordering control:"
1736
1743
msgstr ":表示順のコントロール:"
1737
1744
1738
#: bzrlib/builtins.py:2510
1745
#: bzrlib/builtins.py:2539
1739
1746
msgid ""
1740
1747
" To display revisions from oldest to newest, use the --forward option.\n"
1741
1748
" In most cases, using this option will have little impact on the total\n"
1746
1753
" 使います。--forwardは、--reverseのようにログをインクリメンタルに表示はしません\n"
1747
1754
"が、たいていの場合、ログ表示にかかる時間への影響はわずかです。"
1748
1755
1749
#: bzrlib/builtins.py:2515
1756
#: bzrlib/builtins.py:2544
1750
1757
msgid ":Revision filtering:"
1751
1758
msgstr ":リビジョンのフィルタリング:"
1752
1759
1753
#: bzrlib/builtins.py:2517
1760
#: bzrlib/builtins.py:2546
1754
1761
msgid ""
1755
1762
" The -r option can be used to specify what revision or range of revisions\n"
1756
1763
" to filter against. The various forms are shown below::"
1758
1765
" -rオプションで、どのリビジョン、もしくはリビジョンの範囲を表示するかを指定する\n"
1759
1766
" ことができます。いろいろな例を以下に示します。::"
1760
1767
1761
#: bzrlib/builtins.py:2520
1768
#: bzrlib/builtins.py:2549
1762
1769
msgid ""
1763
1770
" -rX display revision X\n"
1764
1771
" -rX.. display revision X and later\n"
1770
1777
" -r..Y リビジョンY以前(Yを含む)を表示\n"
1771
1778
" -rX..Y リビジョンXからY(X、Yを含む)を表示"
1772
1779
1773
#: bzrlib/builtins.py:2525
1780
#: bzrlib/builtins.py:2554
1774
1781
msgid ""
1775
1782
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1776
1783
" Some common examples are given below::"
1778
1785
" X、Yの指定方法の詳細は、 ``bzr help revisionspec`` を参照してください。\n"
1779
1786
" よくある例を以下に示します。::"
1780
1787
1781
#: bzrlib/builtins.py:2528
1788
#: bzrlib/builtins.py:2557
1782
1789
msgid ""
1783
1790
" -r-1 show just the tip\n"
1784
1791
" -r-10.. show the last 10 mainline revisions\n"
1794
1801
" 変更を表示\n"
1795
1802
" -rdate:yesterday.. 昨日からの変更を表示"
1796
1803
1797
#: bzrlib/builtins.py:2535
1804
#: bzrlib/builtins.py:2564
1798
1805
msgid ""
1799
1806
" When logging a range of revisions using -rX..Y, log starts at\n"
1800
1807
" revision Y and searches back in history through the primary\n"
1805
1812
msgstr ""
1806
1813
" -rX..Yでリビジョンの範囲を指定した場合、ログはリビジョンYから始まって\n"
1807
1814
" メインの(左側の)親をXに到達するまで遡ります。トップレベルだけを表示\n"
1808
" する場合(-n1を使用)、Xがそのルート見つからなければエラーが発生します。\n"
1815
" する場合(-n1を使用)、Xがそのルートに見つからなければエラーが発生します。\n"
1809
1816
" 他段階のログ(-n0を使用)を表示する場合は、Xは入れ子になったマージ\n"
1810
1817
" リビジョンの中に見つかるかもしれません。その場合、ログは適切に切り捨て\n"
1811
1818
" られます。"
1812
1819
1813
#: bzrlib/builtins.py:2542
1820
#: bzrlib/builtins.py:2571
1814
1821
msgid ":Path filtering:"
1815
1822
msgstr ":パスのフィルタリング:"
1816
1823
1817
#: bzrlib/builtins.py:2544
1824
#: bzrlib/builtins.py:2573
1818
1825
msgid ""
1819
1826
" If parameters are given and the first one is not a branch, the log\n"
1820
1827
" will be filtered to show only those revisions that changed the\n"
1823
1830
" パラメータが指定されていて、一つ目のパラメータがブランチではない場合、\n"
1824
1831
" 指定されたファイル、ディレクトリが変更されたリビジョンだけが表示されます。"
1825
1832
1826
#: bzrlib/builtins.py:2548
1833
#: bzrlib/builtins.py:2577
1827
1834
msgid ""
1828
1835
" Filenames are interpreted within their historical context. To log a\n"
1829
1836
" deleted file, specify a revision range so that the file existed at\n"
1833
1840
" ログを表示するには、そのファイルが存在したリビジョンを、リビジョンの範囲\n"
1834
1841
" の最初か最後に指定してください。"
1835
1842
1836
#: bzrlib/builtins.py:2552
1843
#: bzrlib/builtins.py:2581
1837
1844
msgid ""
1838
1845
" Historical context is also important when interpreting pathnames of\n"
1839
1846
" renamed files/directories. Consider the following example:"
1841
1848
" 履歴のコンテキストは、変名されたファイルやディレクトリのパス名を解釈する\n"
1842
1849
" 際にも重要になります。以下の例を考えてください。："
1843
1850
1844
#: bzrlib/builtins.py:2555
1851
#: bzrlib/builtins.py:2584
1845
1852
msgid ""
1846
1853
" * revision 1: add tutorial.txt\n"
1847
1854
" * revision 2: modify tutorial.txt\n"
1851
1858
" * リビジョン 2: tutorial.txt\n"
1852
1859
" * リビジョン 3: tutorial.txt を guide.txt に変名し、add tutorial.txt を追加"
1853
1860
1854
#: bzrlib/builtins.py:2559
1861
#: bzrlib/builtins.py:2588
1855
1862
msgid " In this case:"
1856
1863
msgstr " この場合:"
1857
1864
1858
#: bzrlib/builtins.py:2561
1865
#: bzrlib/builtins.py:2590
1859
1866
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1860
1867
msgstr " * ``bzr log guide.txt`` は、リビジョン1で追加されたファイルを表示します。"
1861
1868
1862
#: bzrlib/builtins.py:2563
1869
#: bzrlib/builtins.py:2592
1863
1870
msgid ""
1864
1871
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1865
1872
msgstr " * ``bzr log tutorial.txt`` は、リビジョン3で追加された新しいファイルを表示します。"
1866
1873
1867
#: bzrlib/builtins.py:2565
1874
#: bzrlib/builtins.py:2594
1868
1875
msgid ""
1869
1876
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1870
1877
" the original file in revision 2."
1872
1879
" * ``bzr log -r2 -p tutorial.txt`` は、元のファイルのリビジョン2での変更\n"
1873
1880
" を表示します。"
1874
1881
1875
#: bzrlib/builtins.py:2568
1882
#: bzrlib/builtins.py:2597
1876
1883
msgid ""
1877
1884
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1878
1885
" was no file called guide.txt in revision 2."
1880
1887
" * ``bzr log -r2 -p guide.txt`` は、リビジョン2にはguide.txtというファイルはない\n"
1881
1888
" というエラーを表示します。"
1882
1889
1883
#: bzrlib/builtins.py:2571
1890
#: bzrlib/builtins.py:2600
1884
1891
msgid ""
1885
1892
" Renames are always followed by log. By design, there is no need to\n"
1886
1893
" explicitly ask for this (and no way to stop logging a file back\n"
1889
1896
" 変名は常に履歴に表示されます。明示的に指定する必要はありません。(また、\n"
1890
1897
" 最後に変名される以前のログを切り捨てる方法もありません)"
1891
1898
1892
#: bzrlib/builtins.py:2575
1899
#: bzrlib/builtins.py:2604
1893
1900
msgid ":Other filtering:"
1894
1901
msgstr ":その他のフィルタリング:"
1895
1902
1896
#: bzrlib/builtins.py:2577
1903
#: bzrlib/builtins.py:2606
1897
1904
msgid ""
1898
1905
" The --match option can be used for finding revisions that match a\n"
1899
1906
" regular expression in a commit message, committer, author or bug.\n"
1907
1914
" --match-bug、--match-committer、--match-messageで、指定したフィールド\n"
1908
1915
" だけを検索対象にすることができます。"
1909
1916
1910
#: bzrlib/builtins.py:2583
1917
#: bzrlib/builtins.py:2612
1911
1918
msgid ":Tips & tricks:"
1912
1919
msgstr ":Tips & tricks:"
1913
1920
1914
#: bzrlib/builtins.py:2585
1921
#: bzrlib/builtins.py:2614
1915
1922
msgid ""
1916
1923
" GUI tools and IDEs are often better at exploring history than command\n"
1917
1924
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1925
1932
" <http://doc.bazaar.canonical.com/plugins/en/> や、\n"
1926
1933
" <http://wiki.bazaar.canonical.com/IDEIntegration> をご覧ください。 "
1927
1934
1928
#: bzrlib/builtins.py:2591
1935
#: bzrlib/builtins.py:2620
1929
1936
msgid ""
1930
1937
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1931
1938
msgstr " ``bazaar.conf`` に以下のようなエイリアスを追加しておくと便利です。::"
1932
1939
1933
#: bzrlib/builtins.py:2593
1940
#: bzrlib/builtins.py:2622
1934
1941
msgid ""
1935
1942
" [ALIASES]\n"
1936
1943
" tip = log -r-1\n"
1942
1949
" top = log -l10 --line\n"
1943
1950
" show = log -v -p"
1944
1951
1945
#: bzrlib/builtins.py:2598
1952
#: bzrlib/builtins.py:2627
1946
1953
msgid ""
1947
1954
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1948
1955
" will show the last 10 mainline revisions. To see the details of a\n"
1952
1959
" 10リビジョンを表示します。特定のリビジョンXの詳細を見るには、 ``bzr show -X``\n"
1953
1960
" を使用します。"
1954
1961
1955
#: bzrlib/builtins.py:2602
1962
#: bzrlib/builtins.py:2631
1956
1963
msgid ""
1957
1964
" If you are interested in looking deeper into a particular merge X,\n"
1958
1965
" use ``bzr log -n0 -rX``."
1959
1966
msgstr " 特定のマージXについて詳しく見たい場合は、 ``bzr log -n0 -rX`` を使用します。"
1960
1967
1961
#: bzrlib/builtins.py:2605
1968
#: bzrlib/builtins.py:2634
1962
1969
msgid ""
1963
1970
" ``bzr log -v`` on a branch with lots of history is currently\n"
1964
1971
" very slow. A fix for this issue is currently under development.\n"
1970
1977
" しても、-vオプションを指定するときはリビジョンの範囲を指定することを\n"
1971
1978
" おすすめします。"
1972
1979
1973
#: bzrlib/builtins.py:2610
1980
#: bzrlib/builtins.py:2639
1974
1981
msgid ""
1975
1982
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1976
1983
" used to find revisions matching user names, commit messages, etc.\n"
1982
1989
" 他の機能とはちがい、このプラグインでは単語のリストを含むすべての\n"
1983
1990
" リビジョンを検索することができます。"
1984
1991
1985
#: bzrlib/builtins.py:2615
1992
#: bzrlib/builtins.py:2644
1986
1993
msgid ""
1987
1994
" When exploring non-mainline history on large projects with deep\n"
1988
1995
" history, the performance of log can be greatly improved by installing\n"
1994
2001
" することができます。このプラグインは、履歴情報をキャッシュして、ディスク\n"
1995
2002
" スペースと引き換えに高速なパフォーマンスをもたらします。"
1996
2003
1997
#: bzrlib/builtins.py:2624
2004
#: bzrlib/builtins.py:2653
1998
2005
msgid "Show from oldest to newest."
1999
2006
msgstr "古い方から新しい方へ表示する"
2000
2007
2001
#: bzrlib/builtins.py:2627
2008
#: bzrlib/builtins.py:2656
2002
2009
msgid "Show files changed in each revision."
2003
2010
msgstr "各リビジョンでのファイルの変更を表示する"
2004
2011
2005
#: bzrlib/builtins.py:2633
2012
#: bzrlib/builtins.py:2662
2006
2013
msgid "Show just the specified revision. See also \"help revisionspec\"."
2007
2014
msgstr "指定されたリビジョンだけを表示する。 ``help revisionspec``を参照"
2008
2015
2009
#: bzrlib/builtins.py:2637
2016
#: bzrlib/builtins.py:2666
2010
2017
msgid "What names to list as authors - first, all or committer."
2011
2018
msgstr "誰を作者として表示するか - first、all、またはcommitter"
2012
2019
2013
#: bzrlib/builtins.py:2638
2020
#: bzrlib/builtins.py:2667
2014
2021
msgid "Authors"
2015
2022
msgstr "作者"
2016
2023
2017
#: bzrlib/builtins.py:2643
2024
#: bzrlib/builtins.py:2672
2018
2025
msgid "Number of levels to display - 0 for all, 1 for flat."
2019
2026
msgstr "表示するレベル。-0で全て、1で１階層"
2020
2027
2021
#: bzrlib/builtins.py:2653
2028
#: bzrlib/builtins.py:2682
2022
2029
msgid "Limit the output to the first N revisions."
2023
2030
msgstr "最初のNリビジョンだけを出力する"
2024
2031
2025
#: bzrlib/builtins.py:2658
2032
#: bzrlib/builtins.py:2687
2026
2033
msgid "Show changes made in each revision as a patch."
2027
2034
msgstr "各リビジョンでの変更をパッチとして表示"
2028
2035
2029
#: bzrlib/builtins.py:2660
2036
#: bzrlib/builtins.py:2689
2030
2037
msgid "Show merged revisions like --levels 0 does."
2031
2038
msgstr "--levels 0 と同じようにマージされたリビジョンを表示する"
2032
2039
2033
#: bzrlib/builtins.py:2664
2040
#: bzrlib/builtins.py:2693
2034
2041
msgid "Do not report commits with more than one parent."
2035
2042
msgstr "複数の親を持つコミットを表示しない"
2036
2043
2037
#: bzrlib/builtins.py:2666
2044
#: bzrlib/builtins.py:2695
2038
2045
msgid ""
2039
2046
"Display only the revisions that are not part of both ancestries (require -"
2040
2047
"rX..Y)."
2041
2048
msgstr "共通の先祖に含まれないリビジョンだけを表示(-rX..Yを使用する必要がある)"
2042
2049
2043
#: bzrlib/builtins.py:2670
2050
#: bzrlib/builtins.py:2699
2044
2051
msgid "Show digital signature validity."
2045
2052
msgstr "デジタル署名を表示"
2046
2053
2047
#: bzrlib/builtins.py:2673
2054
#: bzrlib/builtins.py:2702
2048
2055
msgid "Show revisions whose properties match this expression."
2049
2056
msgstr "この表現にマッチするプロパティのリビジョンを表示"
2050
2057
2051
#: bzrlib/builtins.py:2677
2058
#: bzrlib/builtins.py:2706
2052
2059
msgid "Show revisions whose message matches this expression."
2053
2060
msgstr "この表現にマッチするメッセージのリビジョンを表示"
2054
2061
2055
#: bzrlib/builtins.py:2681
2062
#: bzrlib/builtins.py:2710
2056
2063
msgid "Show revisions whose committer matches this expression."
2057
2064
msgstr "コミッタが指定された表現にマッチするリビジョンを表示する"
2058
2065
2059
#: bzrlib/builtins.py:2685
2066
#: bzrlib/builtins.py:2714
2060
2067
msgid "Show revisions whose authors match this expression."
2061
2068
msgstr "作者が指定された表現にマッチするリビジョンを表示する"
2062
2069
2063
#: bzrlib/builtins.py:2689
2070
#: bzrlib/builtins.py:2718
2064
2071
msgid "Show revisions whose bugs match this expression."
2065
2072
msgstr "バグ情報が指定された表現にマッチするリビジョンを表示します"
2066
2073
2067
#: bzrlib/builtins.py:2743
2074
#: bzrlib/builtins.py:2772
2068
2075
msgid "--exclude-common-ancestry requires -r with two revisions"
2069
2076
msgstr "--exclude-common-ancestryには、-rで2つのリビジョンを指定する必要があります。"
2070
2077
2071
#: bzrlib/builtins.py:2771
2078
#: bzrlib/builtins.py:2800
2072
2079
#, python-format
2073
2080
msgid "Path unknown at end or start of revision range: %s"
2074
2081
msgstr "最後のリビジョンにも最初のリビジョンにもパスが見つかりません: %s"
2075
2082
2076
#: bzrlib/builtins.py:2888
2083
#: bzrlib/builtins.py:2917
2077
2084
#, python-format
2078
2085
msgid "bzr %s doesn't accept two revisions in different branches."
2079
2086
msgstr "bzr %s には、異なるブランチ上の2つのリビジョンは指定できません。"
2080
2087
2081
#: bzrlib/builtins.py:2904
2088
#: bzrlib/builtins.py:2933
2082
2089
#, python-format
2083
2090
msgid "bzr %s --revision takes one or two values."
2084
2091
msgstr "bzr %s --revision は1つまたは2つの値を取ります。"
2085
2092
2086
#: bzrlib/builtins.py:2949
2093
#: bzrlib/builtins.py:2978
2087
2094
msgid ""
2088
2095
"List files in a tree.\n"
2089
2096
" "
2091
2098
"ツリー内のファイルをリストアップします。\n"
2092
2099
" "
2093
2100
2094
#: bzrlib/builtins.py:2958
2101
#: bzrlib/builtins.py:2987
2095
2102
msgid "Recurse into subdirectories."
2096
2103
msgstr "サブディレクトリも再帰で処理します。"
2097
2104
2098
#: bzrlib/builtins.py:2960
2105
#: bzrlib/builtins.py:2989
2099
2106
msgid "Print paths relative to the root of the branch."
2100
2107
msgstr "ブランチのルートからの相対パスを表示します。"
2101
2108
2102
#: bzrlib/builtins.py:2962
2109
#: bzrlib/builtins.py:2991
2103
2110
msgid "Print unknown files."
2104
2111
msgstr "バージョン管理外のファイルを表示します。"
2105
2112
2106
#: bzrlib/builtins.py:2963
2113
#: bzrlib/builtins.py:2992
2107
2114
msgid "Print versioned files."
2108
2115
msgstr "バージョン管理されたファイルを表示します。"
2109
2116
2110
#: bzrlib/builtins.py:2966
2117
#: bzrlib/builtins.py:2995
2111
2118
msgid "Print ignored files."
2112
2119
msgstr "無視されたファイルを表示します。"
2113
2120
2114
#: bzrlib/builtins.py:2968
2121
#: bzrlib/builtins.py:2997
2115
2122
msgid "List entries of a particular kind: file, directory, symlink."
2116
2123
msgstr "指定された種別のアイテム(ファイル、ディレクトリ、シンボリックリンク)を表示します。"
2117
2124
2118
#: bzrlib/builtins.py:2981
2125
#: bzrlib/builtins.py:3010
2119
2126
msgid "invalid kind specified"
2120
2127
msgstr "無効な種別が指定されました。"
2121
2128
2122
#: bzrlib/builtins.py:2984
2129
#: bzrlib/builtins.py:3013
2123
2130
msgid "Cannot set both --verbose and --null"
2124
2131
msgstr "--verboseと--nullを同時に指定することはできません。"
2125
2132
2126
#: bzrlib/builtins.py:2993
2133
#: bzrlib/builtins.py:3022
2127
2134
msgid "cannot specify both --from-root and PATH"
2128
2135
msgstr "--from-rootとPATHを同時に指定することはできません。"
2129
2136
2130
#: bzrlib/builtins.py:3080
2137
#: bzrlib/builtins.py:3109
2131
2138
msgid "Ignore specified files or patterns."
2132
2139
msgstr "指定されたファイルやパターンを無視します。"
2133
2140
2134
#: bzrlib/builtins.py:3082
2141
#: bzrlib/builtins.py:3111
2135
2142
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2136
2143
msgstr "パターンの書き方の詳細は ``bzr help patterns`` をご覧ください。"
2137
2144
2138
#: bzrlib/builtins.py:3084
2145
#: bzrlib/builtins.py:3113
2139
2146
msgid ""
2140
2147
"If a .bzrignore file does not exist, the ignore command\n"
2141
2148
"will create one and add the specified files or patterns to the newly\n"
2149
2156
"使わずに.bzrignoreファイルを手で作成した場合は、明示的にaddコマンドを\n"
2150
2157
"呼ぶ必要があります。"
2151
2158
2152
#: bzrlib/builtins.py:3090
2159
#: bzrlib/builtins.py:3119
2153
2160
msgid ""
2154
2161
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2155
2162
"After adding, editing or deleting that file either indirectly by\n"
2160
2167
"ignoreコマンドやエディタでこのファイルのエントリを追加、編集、削除した\n"
2161
2168
"場合は、忘れずにコミットしてください。"
2162
2169
2163
#: bzrlib/builtins.py:3095
2170
#: bzrlib/builtins.py:3124
2164
2171
msgid ""
2165
2172
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2166
2173
"the global ignore file can be found in the application data directory as\n"
2174
2181
"このファイルをこのコマンドで編集することはできないので、直接エディタで編集\n"
2175
2182
"してください。"
2176
2183
2177
#: bzrlib/builtins.py:3101
2184
#: bzrlib/builtins.py:3130
2178
2185
msgid ""
2179
2186
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2180
2187
"precedence over regular ignores. Such exceptions are used to specify\n"
2184
2191
"優先されます。これは、普通なら無視されるはずのファイルをバージョン管理\n"
2185
2192
"の対象とするために使います。"
2186
2193
2187
#: bzrlib/builtins.py:3105
2194
#: bzrlib/builtins.py:3134
2188
2195
msgid ""
2189
2196
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2190
2197
"precedence over the '!' exception patterns."
2192
2199
"!!で始まるパターンは、通常の無視指定として扱われますが、!による除外\n"
2193
2200
"パターンよりも優先されます。"
2194
2201
2195
#: bzrlib/builtins.py:3108
2202
#: bzrlib/builtins.py:3137
2196
2203
msgid ""
2197
2204
":Notes: \n"
2198
2205
" \n"
2204
2211
"*シェルのワイルドカードをふくむ無視パターンを指定するときには、Unixシェル\n"
2205
2212
" による引用符でくくる必要があります。"
2206
2213
2207
#: bzrlib/builtins.py:3113
2214
#: bzrlib/builtins.py:3142
2208
2215
msgid ""
2209
2216
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2210
2217
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2212
2219
"* #で始まる無視パターンは、無視ファイル中のコメントとして扱われます。\n"
2213
2220
" #で始まるファイルを無視したい場合は、\"RE:\"プレフィックスを使ってください。"
2214
2221
2215
#: bzrlib/builtins.py:3116
2222
#: bzrlib/builtins.py:3145
2216
2223
msgid ""
2217
2224
":Examples:\n"
2218
2225
" Ignore the top level Makefile::"
2220
2227
":例:\n"
2221
2228
" トップレベルのMakefileを無視する::"
2222
2229
2223
#: bzrlib/builtins.py:3119
2230
#: bzrlib/builtins.py:3148
2224
2231
msgid " bzr ignore ./Makefile"
2225
2232
msgstr " bzr ignore ./Makefile"
2226
2233
2227
#: bzrlib/builtins.py:3121
2234
#: bzrlib/builtins.py:3150
2228
2235
msgid " Ignore .class files in all directories...::"
2229
2236
msgstr " すべてのディレクトリの.classファイルを無視するが...::"
2230
2237
2231
#: bzrlib/builtins.py:3123
2238
#: bzrlib/builtins.py:3152
2232
2239
msgid " bzr ignore \"*.class\""
2233
2240
msgstr " bzr ignore \"*.class\""
2234
2241
2235
#: bzrlib/builtins.py:3125
2242
#: bzrlib/builtins.py:3154
2236
2243
msgid " ...but do not ignore \"special.class\"::"
2237
2244
msgstr " ...\"special.class\" は無視しない::"
2238
2245
2239
#: bzrlib/builtins.py:3127
2246
#: bzrlib/builtins.py:3156
2240
2247
msgid " bzr ignore \"!special.class\""
2241
2248
msgstr " bzr ignore \"!special.class\""
2242
2249
2243
#: bzrlib/builtins.py:3129
2250
#: bzrlib/builtins.py:3158
2244
2251
msgid " Ignore files whose name begins with the \"#\" character::"
2245
2252
msgstr " #で始まるファイルを無視する::"
2246
2253
2247
#: bzrlib/builtins.py:3131
2254
#: bzrlib/builtins.py:3160
2248
2255
msgid " bzr ignore \"RE:^#\""
2249
2256
msgstr " bzr ignore \"RE:^#\""
2250
2257
2251
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2258
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2252
2259
msgid " Ignore .o files under the lib directory::"
2253
2260
msgstr " libディレクトリ配下の.oファイルを無視する::"
2254
2261
2255
#: bzrlib/builtins.py:3135
2262
#: bzrlib/builtins.py:3164
2256
2263
msgid " bzr ignore \"lib/**/*.o\""
2257
2264
msgstr " bzr ignore \"lib/**/*.o\""
2258
2265
2259
#: bzrlib/builtins.py:3139
2266
#: bzrlib/builtins.py:3168
2260
2267
msgid " bzr ignore \"RE:lib/.*\\.o\""
2261
2268
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2262
2269
2263
#: bzrlib/builtins.py:3141
2270
#: bzrlib/builtins.py:3170
2264
2271
msgid " Ignore everything but the \"debian\" toplevel directory::"
2265
2272
msgstr " \"debian\"トップレベルディレクトリ以外の全てを無視する::"
2266
2273
2267
#: bzrlib/builtins.py:3143
2274
#: bzrlib/builtins.py:3172
2268
2275
msgid ""
2269
2276
" bzr ignore \"RE:(?!debian/).*\"\n"
2270
2277
" \n"
2284
2291
" bzr ignore \"!./local\"\n"
2285
2292
" bzr ignore \"!!*~\""
2286
2293
2287
#: bzrlib/builtins.py:3157
2294
#: bzrlib/builtins.py:3186
2288
2295
msgid "Display the default ignore rules that bzr uses."
2289
2296
msgstr "bzrが使用するデフォルトの無視ルールを表示します。"
2290
2297
2291
#: bzrlib/builtins.py:3169
2298
#: bzrlib/builtins.py:3198
2292
2299
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2293
2300
msgstr "ignoreにはNAME_PATTERNか--default-rulesのどちらかは指定する必要があります。"
2294
2301
2295
#: bzrlib/builtins.py:3180
2302
#: bzrlib/builtins.py:3209
2296
2303
#, python-format
2297
2304
msgid "Invalid ignore pattern found. %s"
2298
2305
msgid_plural "Invalid ignore patterns found. %s"
2299
2306
msgstr[0] "無効な無視パターンが見つかりました。 %s"
2300
2307
2301
#: bzrlib/builtins.py:3189
2308
#: bzrlib/builtins.py:3218
2302
2309
msgid "NAME_PATTERN should not be an absolute path"
2303
2310
msgstr "NAME_PATTERNに絶対パスは指定できません。"
2304
2311
2305
#: bzrlib/builtins.py:3202
2312
#: bzrlib/builtins.py:3231
2306
2313
#, python-format
2307
2314
msgid ""
2308
2315
"Warning: the following files are version controlled and match your ignore "
2315
2322
"%s\n"
2316
2323
"これらのファイルは、'bzr remove'しない限りはバージョン管理されたままです。\n"
2317
2324
2318
#: bzrlib/builtins.py:3209
2325
#: bzrlib/builtins.py:3238
2319
2326
msgid "List ignored files and the patterns that matched them."
2320
2327
msgstr "無視するファイルとそれらにマッチするパターンの一覧を表示する。"
2321
2328
2322
#: bzrlib/builtins.py:3211
2329
#: bzrlib/builtins.py:3240
2323
2330
msgid ""
2324
2331
"List all the ignored files and the ignore pattern that caused the file to\n"
2325
2332
"be ignored."
2326
2333
msgstr "無視されるファイルと、それがどのパターンによって無視されているかを一覧で表示します。"
2327
2334
2328
#: bzrlib/builtins.py:3214
2335
#: bzrlib/builtins.py:3243
2329
2336
msgid "Alternatively, to list just the files::"
2330
2337
msgstr "代わりにファイルの一覧だけを表示するには::"
2331
2338
2332
#: bzrlib/builtins.py:3216
2339
#: bzrlib/builtins.py:3245
2333
2340
msgid " bzr ls --ignored"
2334
2341
msgstr " bzr ls --ignored"
2335
2342
2336
#: bzrlib/builtins.py:3250
2343
#: bzrlib/builtins.py:3279
2337
2344
#, python-format
2338
2345
msgid "not a valid revision-number: %r"
2339
2346
msgstr "無効なリビジョン番号です。: %r"
2340
2347
2341
#: bzrlib/builtins.py:3257
2348
#: bzrlib/builtins.py:3286
2342
2349
msgid ""
2343
2350
"Export current or past revision to a destination directory or archive."
2344
2351
msgstr "最新、または過去のリビジョンを指定されたディレクトリもしくはアーカイブにエクスポートする。"
2345
2352
2346
#: bzrlib/builtins.py:3259
2353
#: bzrlib/builtins.py:3288
2347
2354
msgid "If no revision is specified this exports the last committed revision."
2348
2355
msgstr "リビジョンが指定されなければ、最終コミットのリビジョンをエクスポートします。"
2349
2356
2350
#: bzrlib/builtins.py:3261
2357
#: bzrlib/builtins.py:3290
2351
2358
msgid ""
2352
2359
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2353
2360
"given, try to find the format with the extension. If no extension\n"
2357
2364
" 何も渡されなければ、拡張子のフォーマットを見つけようとします。 拡張子がない\n"
2358
2365
"場合は、ディレクトリにエクスポートします(–format=dirと同等)。"
2359
2366
2360
#: bzrlib/builtins.py:3265
2367
#: bzrlib/builtins.py:3294
2361
2368
msgid ""
2362
2369
"If root is supplied, it will be used as the root directory inside\n"
2363
2370
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2368
2375
"ファイル名がデフォルトになります。rootオプションは、'dir'フォーマット\n"
2369
2376
"に対しては作用しません。"
2370
2377
2371
#: bzrlib/builtins.py:3269
2378
#: bzrlib/builtins.py:3298
2372
2379
msgid ""
2373
2380
"If branch is omitted then the branch containing the current working\n"
2374
2381
"directory will be used."
2375
2382
msgstr "ブランチが省略されると現在の作業ディレクトリを含むブランチが使用されます。"
2376
2383
2377
#: bzrlib/builtins.py:3272
2384
#: bzrlib/builtins.py:3301
2378
2385
msgid ""
2379
2386
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2380
2387
msgstr "注: ASCIIではないファイルを含むツリーの、zipへのエクスポートはサポートされません。"
2381
2388
2382
#: bzrlib/builtins.py:3274
2389
#: bzrlib/builtins.py:3303
2383
2390
msgid ""
2384
2391
" ================= =========================\n"
2385
2392
" Supported formats Autodetected by extension\n"
2401
2408
" zip .zip\n"
2402
2409
" ==================== ===================="
2403
2410
2404
#: bzrlib/builtins.py:3288
2411
#: bzrlib/builtins.py:3317
2405
2412
msgid "Type of file to export to."
2406
2413
msgstr "エクスポートするファイルの種類"
2407
2414
2408
#: bzrlib/builtins.py:3291
2415
#: bzrlib/builtins.py:3320
2409
2416
msgid "Apply content filters to export the convenient form."
2410
2417
msgstr "使いやすい形でエクスポートするためのコンテンツフィルターを適用します。"
2411
2418
2412
#: bzrlib/builtins.py:3295
2419
#: bzrlib/builtins.py:3324
2413
2420
msgid "Name of the root directory inside the exported file."
2414
2421
msgstr "エクスポートされたファイル内部のrootディレクトリの名前。"
2415
2422
2416
#: bzrlib/builtins.py:3297
2423
#: bzrlib/builtins.py:3326
2417
2424
msgid ""
2418
2425
"Set modification time of files to that of the last revision in which it was "
2419
2426
"changed."
2420
2427
msgstr "各ファイルの編集日時を、最後にそのファイルが変更されたリビジョンの日時に設定します。"
2421
2428
2422
#: bzrlib/builtins.py:3300
2429
#: bzrlib/builtins.py:3329
2423
2430
msgid ""
2424
2431
"Export the working tree contents rather than that of the last revision."
2425
2432
msgstr "最終リビジョンではなく、作業ツリーの内容をエクスポートします。"
2426
2433
2427
#: bzrlib/builtins.py:3319
2434
#: bzrlib/builtins.py:3348
2428
2435
msgid "--uncommitted requires a working tree"
2429
2436
msgstr "作業ツリーに対しては--uncommittedを指定する必要があります。"
2430
2437
2431
#: bzrlib/builtins.py:3328
2438
#: bzrlib/builtins.py:3357
2432
2439
#, python-format
2433
2440
msgid "Unsupported export format: %s"
2434
2441
msgstr "サポートされていないエクスポートフォーマット: %s"
2435
2442
2436
#: bzrlib/builtins.py:3332
2443
#: bzrlib/builtins.py:3361
2437
2444
msgid ""
2438
2445
"Write the contents of a file as of a given revision to standard output."
2439
2446
msgstr "指定されたリビジョンのファイルの内容を標準出力に書き出します。"
2440
2447
2441
#: bzrlib/builtins.py:3334
2448
#: bzrlib/builtins.py:3363
2442
2449
msgid "If no revision is nominated, the last revision is used."
2443
2450
msgstr "リビジョンが指定されなければ、最後のリビジョンが使用されます。"
2444
2451
2445
#: bzrlib/builtins.py:3336
2452
#: bzrlib/builtins.py:3365
2446
2453
msgid ""
2447
2454
"Note: Take care to redirect standard output when using this command on a\n"
2448
2455
"binary file."
2450
2457
"バイナリファイルでこのコマンドを使用する際には標準出力をリダイレクトするように\n"
2451
2458
"気をつけてください。"
2452
2459
2453
#: bzrlib/builtins.py:3342
2460
#: bzrlib/builtins.py:3371
2454
2461
msgid "The path name in the old tree."
2455
2462
msgstr "古いツリーのパス名。"
2456
2463
2457
#: bzrlib/builtins.py:3343
2464
#: bzrlib/builtins.py:3372
2458
2465
msgid "Apply content filters to display the convenience form."
2459
2466
msgstr "便利な形で表示するためのフィルタを適用します。"
2460
2467
2461
#: bzrlib/builtins.py:3354
2468
#: bzrlib/builtins.py:3383
2462
2469
msgid "bzr cat --revision takes exactly one revision specifier"
2463
2470
msgstr "bzr cat --revisionにはリビジョンをひとつだけ指定します。"
2464
2471
2465
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2472
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2466
2473
msgid "{0!r} is not present in revision {1}"
2467
2474
msgstr "{0!r}はリビジョン{1}には存在しません。"
2468
2475
2469
#: bzrlib/builtins.py:3414
2476
#: bzrlib/builtins.py:3443
2470
2477
msgid "Commit changes into a new revision."
2471
2478
msgstr "変更を新しいリビジョンにコミットする。"
2472
2479
2473
#: bzrlib/builtins.py:3416
2480
#: bzrlib/builtins.py:3445
2474
2481
msgid ""
2475
2482
"An explanatory message needs to be given for each commit. This is\n"
2476
2483
"often done by using the --message option (getting the message from the\n"
2486
2493
"エディタにロードされる定型文の中に変更されたファイルの情報を含めるためには、\n"
2487
2494
"--show-diffオプションを使用します。"
2488
2495
2489
#: bzrlib/builtins.py:3423
2496
#: bzrlib/builtins.py:3452
2490
2497
msgid ""
2491
2498
"By default, the entire tree is committed and the person doing the\n"
2492
2499
"commit is assumed to be the author. These defaults can be overridden\n"
2495
2502
"デフォルトでは、ツリー全体がコミットされ、コミットを実行した人が著者になります。\n"
2496
2503
"これは、以下のような方法で上書きすることができます。"
2497
2504
2498
#: bzrlib/builtins.py:3427
2505
#: bzrlib/builtins.py:3456
2499
2506
msgid ":Selective commits:"
2500
2507
msgstr ":部分的なコミット:"
2501
2508
2502
#: bzrlib/builtins.py:3429
2509
#: bzrlib/builtins.py:3458
2503
2510
msgid ""
2504
2511
" If selected files are specified, only changes to those files are\n"
2505
2512
" committed. If a directory is specified then the directory and\n"
2509
2516
" ディレクトリが指定された場合、そのディレクトリとその配下すべてが\n"
2510
2517
" コミット対象になります。"
2511
2518
2512
#: bzrlib/builtins.py:3433
2519
#: bzrlib/builtins.py:3462
2513
2520
msgid ""
2514
2521
" When excludes are given, they take precedence over selected files.\n"
2515
2522
" For example, to commit only changes within foo, but not changes\n"
2519
2526
" たとえば、foo配下の変更をコミットするが、foo/bar内はコミットしないという\n"
2520
2527
" 場合は::"
2521
2528
2522
#: bzrlib/builtins.py:3437
2529
#: bzrlib/builtins.py:3466
2523
2530
msgid " bzr commit foo -x foo/bar"
2524
2531
msgstr " bzr commit foo -x foo/bar"
2525
2532
2526
#: bzrlib/builtins.py:3439
2533
#: bzrlib/builtins.py:3468
2527
2534
msgid " A selective commit after a merge is not yet supported."
2528
2535
msgstr " マージ後の部分的なコミットはまだサポートされていません。"
2529
2536
2530
#: bzrlib/builtins.py:3441
2537
#: bzrlib/builtins.py:3470
2531
2538
msgid ":Custom authors:"
2532
2539
msgstr ":作者の変更:"
2533
2540
2534
#: bzrlib/builtins.py:3443
2541
#: bzrlib/builtins.py:3472
2535
2542
msgid ""
2536
2543
" If the author of the change is not the same person as the committer,\n"
2537
2544
" you can specify the author's name using the --author option. The\n"
2545
2552
" ように、コミッターのIDと同じフォーマットで指定するべきです。複数の作者が\n"
2546
2553
" いるなら、このオプションを複数回指定することもできます。"
2547
2554
2548
#: bzrlib/builtins.py:3450
2555
#: bzrlib/builtins.py:3479
2549
2556
msgid ":Checks:"
2550
2557
msgstr ":チェック:"
2551
2558
2552
#: bzrlib/builtins.py:3452
2559
#: bzrlib/builtins.py:3481
2553
2560
msgid ""
2554
2561
" A common mistake is to forget to add a new file or directory before\n"
2555
2562
" running the commit command. The --strict option checks for unknown\n"
2563
2570
" 前チェックをフックとして実装することもできます。詳細は ``bzr help hooks`` を\n"
2564
2571
" ご覧ください。"
2565
2572
2566
#: bzrlib/builtins.py:3458
2573
#: bzrlib/builtins.py:3487
2567
2574
msgid ":Things to note:"
2568
2575
msgstr ":特記事項:"
2569
2576
2570
#: bzrlib/builtins.py:3460
2577
#: bzrlib/builtins.py:3489
2571
2578
msgid ""
2572
2579
" If you accidentially commit the wrong changes or make a spelling\n"
2573
2580
" mistake in the commit message say, you can use the uncommit command\n"
2577
2584
" ミスがあった場合は、uncommitコマンドでコミットを取り消すことができます。\n"
2578
2585
" 詳細は ``bzr help uncommit`` をご覧ください。"
2579
2586
2580
#: bzrlib/builtins.py:3464
2587
#: bzrlib/builtins.py:3493
2581
2588
msgid ""
2582
2589
" Hooks can also be configured to run after a commit. This allows you\n"
2583
2590
" to trigger updates to external systems like bug trackers. The --fixes\n"
2589
2596
" バグとの関係を記録することができます。詳細は ``bzr help bugs`` を見て\n"
2590
2597
" ください。"
2591
2598
2592
#: bzrlib/builtins.py:3474
2599
#: bzrlib/builtins.py:3503
2593
2600
msgid "Do not consider changes made to a given path."
2594
2601
msgstr "指定されたパスの変更を無視します。"
2595
2602
2596
#: bzrlib/builtins.py:3477
2603
#: bzrlib/builtins.py:3506
2597
2604
msgid "Description of the new revision."
2598
2605
msgstr "新しいリビジョンの説明。"
2599
2606
2600
#: bzrlib/builtins.py:3480
2607
#: bzrlib/builtins.py:3509
2601
2608
msgid "Commit even if nothing has changed."
2602
2609
msgstr "何も変更されていなくてもコミットする。"
2603
2610
2604
#: bzrlib/builtins.py:3484
2611
#: bzrlib/builtins.py:3513
2605
2612
msgid "Take commit message from this file."
2606
2613
msgstr "このファイルからコミットメッセージを取得する。"
2607
2614
2608
#: bzrlib/builtins.py:3486
2615
#: bzrlib/builtins.py:3515
2609
2616
msgid "Refuse to commit if there are unknown files in the working tree."
2610
2617
msgstr "作業ツリーの中にバージョン管理外のファイルが存在する場合コミットを拒否する。"
2611
2618
2612
#: bzrlib/builtins.py:3489
2619
#: bzrlib/builtins.py:3518
2613
2620
msgid ""
2614
2621
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2615
2622
"08:00:00 +0100'."
2616
2623
msgstr "コミット日時を決められたフォーマットで手動で指定します。例) '2009-10-10 08:00:00 +0100'"
2617
2624
2618
#: bzrlib/builtins.py:3492
2625
#: bzrlib/builtins.py:3521
2619
2626
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2620
2627
msgstr "このリビジョンで修正されたバグをマークする(\"bzr help bugs\"を参照)。"
2621
2628
2622
#: bzrlib/builtins.py:3495
2629
#: bzrlib/builtins.py:3524
2623
2630
msgid "Set the author's name, if it's different from the committer."
2624
2631
msgstr "著者の名前がコミッターとは異なる場合、著者の名前を設定する。"
2625
2632
2626
#: bzrlib/builtins.py:3498
2633
#: bzrlib/builtins.py:3527
2627
2634
msgid ""
2628
2635
"Perform a local commit in a bound branch. Local commits are not pushed to "
2629
2636
"the master branch until a normal commit is performed."
2630
2637
msgstr ""
2631
2638
"バインドされたブランチにローカルコミットを実行する。 通常のコミットが実行されるまで ローカルコミットはマスターブランチにpushされません。"
2632
2639
2633
#: bzrlib/builtins.py:3504
2640
#: bzrlib/builtins.py:3533
2634
2641
msgid ""
2635
2642
"When no message is supplied, show the diff along with the status summary in "
2636
2643
"the message editor."
2637
2644
msgstr "メッセージが提供されないとき、 メッセージエディタでステータスの要約と一緒に差分を表示する。"
2638
2645
2639
#: bzrlib/builtins.py:3507
2646
#: bzrlib/builtins.py:3536
2640
2647
msgid ""
2641
2648
"When committing to a foreign version control system do not push data that "
2642
2649
"can not be natively represented."
2643
2650
msgstr "外部のバージョン管理システムにコミットするときに、ネイティブに表現できないデータをプッシュしません。"
2644
2651
2645
#: bzrlib/builtins.py:3525
2652
#: bzrlib/builtins.py:3554
2646
2653
#, python-format
2647
2654
msgid ""
2648
2655
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2653
2660
"オプションで指定してください。\n"
2654
2661
"詳細は \"bzr help bugs\" をご覧ください。コミットは拒否されました。"
2655
2662
2656
#: bzrlib/builtins.py:3534
2663
#: bzrlib/builtins.py:3563
2657
2664
#, python-format
2658
2665
msgid ""
2659
2666
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2663
2670
"無効なバグです。 %s 'トラッカー:id' の形式で指定する必要があります。詳細は \"bzr help bugs\" をご覧ください。\n"
2664
2671
"コミットは拒否されました。"
2665
2672
2666
#: bzrlib/builtins.py:3543
2673
#: bzrlib/builtins.py:3572
2667
2674
#, python-format
2668
2675
msgid "Unrecognized bug %s. Commit refused."
2669
2676
msgstr "不明なバグです。 %s コミットは拒否されました。"
2670
2677
2671
#: bzrlib/builtins.py:3546
2678
#: bzrlib/builtins.py:3575
2672
2679
#, python-format
2673
2680
msgid ""
2674
2681
"%s\n"
2677
2684
"%s\n"
2678
2685
"コミットは拒否されました。"
2679
2686
2680
#: bzrlib/builtins.py:3570
2687
#: bzrlib/builtins.py:3599
2681
2688
msgid "Could not parse --commit-time: "
2682
2689
msgstr "--commit-timeをパースできません。: "
2683
2690
2684
#: bzrlib/builtins.py:3610
2691
#: bzrlib/builtins.py:3639
2685
2692
msgid "please specify either --message or --file"
2686
2693
msgstr "--message か --file かどちらかを指定してください。"
2687
2694
2688
#: bzrlib/builtins.py:3639
2695
#: bzrlib/builtins.py:3668
2689
2696
msgid "please specify a commit message with either --message or --file"
2690
2697
msgstr "--messageか--fileのどちらかでコミットメッセージを指定してください。"
2691
2698
2692
#: bzrlib/builtins.py:3642
2699
#: bzrlib/builtins.py:3671
2693
2700
msgid ""
2694
2701
"Empty commit message specified. Please specify a commit message with either -"
2695
2702
"-message or --file or leave a blank message with --message \"\"."
2697
2704
"空のコミットメッセージが指定されました。--messageか--fileでコミットメッセージを指定するか、--message "
2698
2705
"\"\"で空メッセージを指定してください。"
2699
2706
2700
#: bzrlib/builtins.py:3662
2707
#: bzrlib/builtins.py:3691
2701
2708
msgid ""
2702
2709
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2703
2710
"-unchanged to force an empty commit."
2704
2711
msgstr ""
2705
2712
"コミットする変更がありません。コミットしたいファイルを'bzr add'で追加するか、--unchangedを指定して空のコミットを実行してください。"
2706
2713
2707
#: bzrlib/builtins.py:3666
2714
#: bzrlib/builtins.py:3695
2708
2715
msgid ""
2709
2716
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2710
2717
"resolve FILE\" to resolve."
2711
2718
msgstr "作業ツリーに競合があります。\"bzr conflicts\" で表示して、\"bzr resolve FILE\"で解消してください。"
2712
2719
2713
#: bzrlib/builtins.py:3670
2720
#: bzrlib/builtins.py:3699
2714
2721
msgid "Commit refused because there are unknown files in the working tree."
2715
2722
msgstr "作業ツリーにバージョン管理外のファイルがあるため、コミットが拒否されました。"
2716
2723
2717
#: bzrlib/builtins.py:3673
2724
#: bzrlib/builtins.py:3702
2718
2725
msgid ""
2719
2726
"\n"
2720
2727
"To commit to master branch, run update and then commit.\n"
2724
2731
"マスタブランチにコミットするには、先にupdateしてください。\n"
2725
2732
"--localを指定してオフラインでコミットし、作業を続けることもできます。"
2726
2733
2727
#: bzrlib/builtins.py:3681
2734
#: bzrlib/builtins.py:3710
2728
2735
msgid ""
2729
2736
"Validate working tree structure, branch consistency and repository history."
2730
2737
msgstr "作業ツリーの構造、ブランチの一貫性、リポジトリの履歴をチェックします。"
2731
2738
2732
#: bzrlib/builtins.py:3683
2739
#: bzrlib/builtins.py:3712
2733
2740
msgid ""
2734
2741
"This command checks various invariants about branch and repository storage\n"
2735
2742
"to detect data corruption or bzr bugs."
2737
2744
"このコマンドは、データの破損やbzrのバグを検出するために、ブランチとリポジトリ\n"
2738
2745
"ストレージの不変条件をチェックします。"
2739
2746
2740
#: bzrlib/builtins.py:3686
2747
#: bzrlib/builtins.py:3715
2741
2748
msgid ""
2742
2749
"The working tree and branch checks will only give output if a problem is\n"
2743
2750
"detected. The output fields of the repository check are:"
2745
2752
"作業ツリーとブランチのチェック結果は、問題が見つかったときだけ表示\n"
2746
2753
"されます。リポジトリチェックの出力は次の通りです。:"
2747
2754
2748
#: bzrlib/builtins.py:3689
2755
#: bzrlib/builtins.py:3718
2749
2756
msgid ""
2750
2757
"revisions\n"
2751
2758
" This is just the number of revisions checked. It doesn't\n"
2754
2761
"revisions\n"
2755
2762
" チェックしたリビジョンの数です。これは問題ではありません。"
2756
2763
2757
#: bzrlib/builtins.py:3693
2764
#: bzrlib/builtins.py:3722
2758
2765
msgid ""
2759
2766
"versionedfiles\n"
2760
2767
" This is just the number of versionedfiles checked. It\n"
2764
2771
" チェックしたバージョン管理ファイルの数です。これは問題では\n"
2765
2772
" ありません。"
2766
2773
2767
#: bzrlib/builtins.py:3697
2774
#: bzrlib/builtins.py:3726
2768
2775
msgid ""
2769
2776
"unreferenced ancestors\n"
2770
2777
" Texts that are ancestors of other texts, but\n"
2776
2783
" と思われるテキストです。これは、Bazaarが対処できる軽微な\n"
2777
2784
" 問題です。"
2778
2785
2779
#: bzrlib/builtins.py:3702
2786
#: bzrlib/builtins.py:3731
2780
2787
msgid ""
2781
2788
"unique file texts\n"
2782
2789
" This is the total number of unique file contents\n"
2786
2793
" チェックしたリビジョンの中にある、一意なファイルコンテンツの数です。\n"
2787
2794
" これは問題ではありません。"
2788
2795
2789
#: bzrlib/builtins.py:3706
2796
#: bzrlib/builtins.py:3735
2790
2797
msgid ""
2791
2798
"repeated file texts\n"
2792
2799
" This is the total number of repeated texts seen\n"
2799
2806
" ファイルのエントリが変更されたが、内容は変更されていない場合に、\n"
2800
2807
" 重複が発生します。これは問題ではありません。"
2801
2808
2802
#: bzrlib/builtins.py:3712
2809
#: bzrlib/builtins.py:3741
2803
2810
msgid ""
2804
2811
"If no restrictions are specified, all Bazaar data that is found at the "
2805
2812
"given\n"
2808
2815
"条件が指定されなければ、指定された場所の全てのBazaarデータが\n"
2809
2816
"チェックされます。"
2810
2817
2811
#: bzrlib/builtins.py:3717
2818
#: bzrlib/builtins.py:3746
2812
2819
msgid " Check the tree and branch at 'foo'::"
2813
2820
msgstr " ‘foo’ でのツリーとブランチをチェックする::"
2814
2821
2815
#: bzrlib/builtins.py:3719
2822
#: bzrlib/builtins.py:3748
2816
2823
msgid " bzr check --tree --branch foo"
2817
2824
msgstr " bzr check --tree --branch foo"
2818
2825
2819
#: bzrlib/builtins.py:3721
2826
#: bzrlib/builtins.py:3750
2820
2827
msgid " Check only the repository at 'bar'::"
2821
2828
msgstr " ‘bar’でのリポジトリのみをチェックする::"
2822
2829
2823
#: bzrlib/builtins.py:3723
2830
#: bzrlib/builtins.py:3752
2824
2831
msgid " bzr check --repo bar"
2825
2832
msgstr " bzr check --repo bar"
2826
2833
2827
#: bzrlib/builtins.py:3725
2834
#: bzrlib/builtins.py:3754
2828
2835
msgid " Check everything at 'baz'::"
2829
2836
msgstr " ‘baz’ ですべてをチェックする::"
2830
2837
2831
#: bzrlib/builtins.py:3727
2838
#: bzrlib/builtins.py:3756
2832
2839
msgid " bzr check baz"
2833
2840
msgstr " bzr check baz"
2834
2841
2835
#: bzrlib/builtins.py:3733
2842
#: bzrlib/builtins.py:3762
2836
2843
msgid "Check the branch related to the current directory."
2837
2844
msgstr "現在のディレクトリに関連したブランチをチェックする。"
2838
2845
2839
#: bzrlib/builtins.py:3735
2846
#: bzrlib/builtins.py:3764
2840
2847
msgid "Check the repository related to the current directory."
2841
2848
msgstr "現在のディレクトリに関連したリポジトリをチェックする。"
2842
2849
2843
#: bzrlib/builtins.py:3737
2850
#: bzrlib/builtins.py:3766
2844
2851
msgid "Check the working tree related to the current directory."
2845
2852
msgstr "現在のディレクトリに関連した作業ツリーをチェックする。"
2846
2853
2847
#: bzrlib/builtins.py:3751
2854
#: bzrlib/builtins.py:3780
2848
2855
msgid "Upgrade a repository, branch or working tree to a newer format."
2849
2856
msgstr "リポジトリ、ブランチ、作業ツリーを新しいフォーマットにアップグレードします。"
2850
2857
2851
#: bzrlib/builtins.py:3753
2858
#: bzrlib/builtins.py:3782
2852
2859
msgid ""
2853
2860
"When the default format has changed after a major new release of\n"
2854
2861
"Bazaar, you may be informed during certain operations that you\n"
2862
2869
"新しい機能が使えるようになるでしょう。ただし、古いバージョンのリポジトリや\n"
2863
2870
"Bazaarとの互換性には制限が発生するかもしれません。"
2864
2871
2865
#: bzrlib/builtins.py:3759
2872
#: bzrlib/builtins.py:3788
2866
2873
msgid ""
2867
2874
"If you wish to upgrade to a particular format rather than the\n"
2868
2875
"current default, that can be specified using the --format option.\n"
2877
2884
"あります。(たとえば、1.xのデフォルトから2.xのデフォルトへの変換は不可逆です)\n"
2878
2885
"そのため、ダウングレードできない場合もあります。"
2879
2886
2880
#: bzrlib/builtins.py:3766
2887
#: bzrlib/builtins.py:3795
2881
2888
msgid ""
2882
2889
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2883
2890
"process (where # is a number). By default, this is left there on\n"
2894
2901
"ディレクトリは削除されます。そうでない場合は、変換後特に問題がなければ手で\n"
2895
2902
"削除してください。"
2896
2903
2897
#: bzrlib/builtins.py:3774
2904
#: bzrlib/builtins.py:3803
2898
2905
msgid ""
2899
2906
"If the location given is a shared repository, dependent branches\n"
2900
2907
"are also converted provided the repository converts successfully.\n"
2905
2912
"配下のブランチも変換されます。もしブランチの変換に失敗しても、他の\n"
2906
2913
"ブランチの変換は続行されます。"
2907
2914
2908
#: bzrlib/builtins.py:3779
2915
#: bzrlib/builtins.py:3808
2909
2916
msgid ""
2910
2917
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2911
2918
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2913
2920
"アップグレードに関する詳細な情報は、Bazaar Upgrade Guideをご覧ください。\n"
2914
2921
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2915
2922
2916
#: bzrlib/builtins.py:3787
2923
#: bzrlib/builtins.py:3816
2917
2924
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2918
2925
msgstr "指定されたフォーマットにアップグレードします。詳細は\"bzr help formats\"をご覧ください。"
2919
2926
2920
#: bzrlib/builtins.py:3791
2927
#: bzrlib/builtins.py:3820
2921
2928
msgid "Branch format"
2922
2929
msgstr "ブランチフォーマット"
2923
2930
2924
#: bzrlib/builtins.py:3793
2931
#: bzrlib/builtins.py:3822
2925
2932
msgid "Remove the backup.bzr directory if successful."
2926
2933
msgstr "変換に成功したらbackup.bzrディレクトリを削除します。"
2927
2934
2928
#: bzrlib/builtins.py:3795
2935
#: bzrlib/builtins.py:3824
2929
2936
msgid "Show what would be done, but don't actually do anything."
2930
2937
msgstr "何が実行されるかを表示しますが、実際には何もしません。"
2931
2938
2932
#: bzrlib/builtins.py:3810
2939
#: bzrlib/builtins.py:3839
2933
2940
msgid "Show or set bzr user id."
2934
2941
msgstr "bzrのユーザIDを表示、設定します。"
2935
2942
2936
#: bzrlib/builtins.py:3812
2943
#: bzrlib/builtins.py:3841
2937
2944
msgid ""
2938
2945
":Examples:\n"
2939
2946
" Show the email of the current user::"
2941
2948
":例:\n"
2942
2949
" 現在のユーザのEメールを表示します。::"
2943
2950
2944
#: bzrlib/builtins.py:3815
2951
#: bzrlib/builtins.py:3844
2945
2952
msgid " bzr whoami --email"
2946
2953
msgstr " bzr whoami --email"
2947
2954
2948
#: bzrlib/builtins.py:3817
2955
#: bzrlib/builtins.py:3846
2949
2956
msgid " Set the current user::"
2950
2957
msgstr " ユーザを設定します。::"
2951
2958
2952
#: bzrlib/builtins.py:3819
2959
#: bzrlib/builtins.py:3848
2953
2960
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2954
2961
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
2955
2962
2956
#: bzrlib/builtins.py:3823
2963
#: bzrlib/builtins.py:3852
2957
2964
msgid "Display email address only."
2958
2965
msgstr "Eメールアドレスだけを表示します。"
2959
2966
2960
#: bzrlib/builtins.py:3825
2967
#: bzrlib/builtins.py:3854
2961
2968
msgid "Set identity for the current branch instead of globally."
2962
2969
msgstr "全体設定ではなく、現在のブランチだけにIDを設定します。"
2963
2970
2964
#: bzrlib/builtins.py:3851
2971
#: bzrlib/builtins.py:3880
2965
2972
msgid "--email can only be used to display existing identity"
2966
2973
msgstr "--emailは、現在のIDを表示するためだけに使用できます。"
2967
2974
2968
#: bzrlib/builtins.py:3873
2975
#: bzrlib/builtins.py:3904
2969
2976
msgid "Print or set the branch nickname."
2970
2977
msgstr "ブランチのニックネームを表示または設定します。"
2971
2978
2972
#: bzrlib/builtins.py:3875
2979
#: bzrlib/builtins.py:3906
2973
2980
msgid ""
2974
"If unset, the tree root directory name is used as the nickname.\n"
2975
"To print the current nickname, execute with no argument."
2981
"If unset, the colocated branch name is used for colocated branches, and\n"
2982
"the branch directory name is used for other branches. To print the\n"
2983
"current nickname, execute with no argument."
2976
2984
msgstr ""
2977
"設定されていない場合は、ツリーのルートディレクトリの名前が\n"
2978
"ニックネームとして扱われます。引数なしで実行すると、現在の\n"
2979
"ニックネームを表示します。"
2980
2985
2981
#: bzrlib/builtins.py:3878
2986
#: bzrlib/builtins.py:3910
2982
2987
msgid ""
2983
2988
"Bound branches use the nickname of its master branch unless it is set\n"
2984
2989
"locally."
2986
2991
"バインドされたブランチは、ローカルでニックネームが設定されていなければ\n"
2987
2992
"マスタブランチのニックネームを使用します。"
2988
2993
2989
#: bzrlib/builtins.py:3898
2994
#: bzrlib/builtins.py:3930
2990
2995
msgid "Set/unset and display aliases."
2991
2996
msgstr "エイリアスの設定、解除、表示を行います。"
2992
2997
2993
#: bzrlib/builtins.py:3900
2998
#: bzrlib/builtins.py:3932
2994
2999
msgid ""
2995
3000
":Examples:\n"
2996
3001
" Show the current aliases::"
2998
3003
":例:\n"
2999
3004
" 現在のエイリアスを表示します。::"
3000
3005
3001
#: bzrlib/builtins.py:3903
3006
#: bzrlib/builtins.py:3935
3002
3007
msgid " bzr alias"
3003
3008
msgstr " bzr alias"
3004
3009
3005
#: bzrlib/builtins.py:3905
3010
#: bzrlib/builtins.py:3937
3006
3011
msgid " Show the alias specified for 'll'::"
3007
3012
msgstr " 'll'に設定されているエイリアスを表示します。::"
3008
3013
3009
#: bzrlib/builtins.py:3907
3014
#: bzrlib/builtins.py:3939
3010
3015
msgid " bzr alias ll"
3011
3016
msgstr " bzr alias ll"
3012
3017
3013
#: bzrlib/builtins.py:3909
3018
#: bzrlib/builtins.py:3941
3014
3019
msgid " Set an alias for 'll'::"
3015
3020
msgstr " エイリアス'll'を設定します。::"
3016
3021
3017
#: bzrlib/builtins.py:3911
3022
#: bzrlib/builtins.py:3943
3018
3023
msgid " bzr alias ll=\"log --line -r-10..-1\""
3019
3024
msgstr " bzr alias ll=\"log --line -r-10..-1\""
3020
3025
3021
#: bzrlib/builtins.py:3913
3026
#: bzrlib/builtins.py:3945
3022
3027
msgid " To remove an alias for 'll'::"
3023
3028
msgstr " エイリアス'll'を解除します。::"
3024
3029
3025
#: bzrlib/builtins.py:3915
3030
#: bzrlib/builtins.py:3947
3026
3031
msgid " bzr alias --remove ll"
3027
3032
msgstr " bzr alias --remove ll"
3028
3033
3029
#: bzrlib/builtins.py:3920
3034
#: bzrlib/builtins.py:3952
3030
3035
msgid "Remove the alias."
3031
3036
msgstr "エイリアスを削除します。"
3032
3037
3033
#: bzrlib/builtins.py:3938
3038
#: bzrlib/builtins.py:3970
3034
3039
msgid "bzr alias --remove expects an alias to remove."
3035
3040
msgstr "bzr alias --removeには、削除するエイリアス名を指定する必要があります。"
3036
3041
3037
#: bzrlib/builtins.py:4119
3042
#: bzrlib/builtins.py:4151
3038
3043
msgid ""
3039
3044
"subunit not available. subunit needs to be installed to use --subunit."
3040
3045
msgstr ""
3041
3046
3042
#: bzrlib/builtins.py:4136
3047
#: bzrlib/builtins.py:4168
3043
3048
msgid ""
3044
3049
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3045
3050
msgstr "--benchmarkは、bzr2.2以降はサポートしていません。かわりにbzr-usertestを使用してください。"
3046
3051
3047
#: bzrlib/builtins.py:4183
3052
#: bzrlib/builtins.py:4215
3048
3053
msgid "Show version of bzr."
3049
3054
msgstr "Bazaarのバージョンを表示します。"
3050
3055
3051
#: bzrlib/builtins.py:4187
3056
#: bzrlib/builtins.py:4219
3052
3057
msgid "Print just the version number."
3053
3058
msgstr "リビジョン番号を表示します。"
3054
3059
3055
#: bzrlib/builtins.py:4206
3060
#: bzrlib/builtins.py:4238
3056
3061
msgid "It sure does!\n"
3057
3062
msgstr ""
3058
3063
3059
#: bzrlib/builtins.py:4230
3064
#: bzrlib/builtins.py:4262
3060
3065
#, python-format
3061
3066
msgid "merge base is revision %s\n"
3062
3067
msgstr "マージの起点はリビジョン %s です。\n"
3063
3068
3064
#: bzrlib/builtins.py:4234
3069
#: bzrlib/builtins.py:4266
3065
3070
msgid "Perform a three-way merge."
3066
3071
msgstr "3wayマージを実行します。"
3067
3072
3068
#: bzrlib/builtins.py:4236
3073
#: bzrlib/builtins.py:4268
3069
3074
msgid ""
3070
3075
"The source of the merge can be specified either in the form of a branch,\n"
3071
3076
"or in the form of a path to a file containing a merge directive generated\n"
3081
3086
"別のブランチ内のファイルパスをマージ元として指定することもでき、その場合は\n"
3082
3087
"指定されたファイルの変更だけが現在のブランチにマージされます。"
3083
3088
3084
#: bzrlib/builtins.py:4244
3089
#: bzrlib/builtins.py:4276
3085
3090
msgid ""
3086
3091
"When merging from a branch, by default bzr will try to merge in all new\n"
3087
3092
"work from the other branch, automatically determining an appropriate base\n"
3091
3096
"判定し、それ以降のすべての変更をマージしようとします。もしこれが失敗した場合は、\n"
3092
3097
"明示的にベースリビジョンを指定する必要があります。"
3093
3098
3094
#: bzrlib/builtins.py:4248
3099
#: bzrlib/builtins.py:4280
3095
3100
msgid ""
3096
3101
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3097
3102
"try to merge in all new work up to and including revision OTHER."
3099
3104
"別の最終リビジョンを指定するには、\"-revision OTHER\"を指定します。この場合、\n"
3100
3105
"OTHERまで(OTHERも含む)の全ての変更がマージされます。"
3101
3106
3102
#: bzrlib/builtins.py:4251
3107
#: bzrlib/builtins.py:4283
3103
3108
msgid ""
3104
3109
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3105
3110
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3116
3121
"とはちがい、今のところBazaarではチェリーピックは追跡しません。変更は、普通の\n"
3117
3122
"コミットのように見え、マージ元での変更履歴は保存されません。"
3118
3123
3119
#: bzrlib/builtins.py:4259
3124
#: bzrlib/builtins.py:4291
3120
3125
msgid "Revision numbers are always relative to the source branch."
3121
3126
msgstr "リビジョン番号は常に元のブランチに関連します。"
3122
3127
3123
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3128
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3124
3129
msgid ""
3125
3130
"Merge will do its best to combine the changes in two branches, but there\n"
3126
3131
"are some kinds of problems only a human can fix. When it encounters those,\n"
3128
3133
"before you can commit."
3129
3134
msgstr ""
3130
3135
3131
#: bzrlib/builtins.py:4266
3136
#: bzrlib/builtins.py:4298
3132
3137
msgid ""
3133
3138
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3134
3139
msgstr "問題を解消したら、bzr resolveを使用してください。bzr conflictsもご覧ください。"
3135
3140
3136
#: bzrlib/builtins.py:4268
3141
#: bzrlib/builtins.py:4300
3137
3142
msgid ""
3138
3143
"If there is no default branch set, the first merge will set it (use\n"
3139
3144
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3146
3151
"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモートの\n"
3147
3152
"ブランチにアクセスできた時だけ保存されます。"
3148
3153
3149
#: bzrlib/builtins.py:4273
3154
#: bzrlib/builtins.py:4305
3150
3155
msgid ""
3151
3156
"The results of the merge are placed into the destination working\n"
3152
3157
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3155
3160
"マージの結果はマージ先の作業ツリー内に反映され、そこで(bzr diffを使って)\n"
3156
3161
"レビューしたり、テストをしたあとで、コミットによって記録することができます。"
3157
3162
3158
#: bzrlib/builtins.py:4277
3163
#: bzrlib/builtins.py:4309
3159
3164
msgid ""
3160
3165
"merge refuses to run if there are any uncommitted changes, unless\n"
3161
3166
"--force is given. If --force is given, then the changes from the source \n"
3168
3173
"マージ元の変更がマージされます。--forceオプションを使えば、２つ以上の親を持つ\n"
3169
3174
"マージリビジョンを作ることもできます。"
3170
3175
3171
#: bzrlib/builtins.py:4283
3176
#: bzrlib/builtins.py:4315
3172
3177
msgid ""
3173
3178
"If one would like to merge changes from the working tree of the other\n"
3174
3179
"branch without merging any committed revisions, the --uncommitted option\n"
3177
3182
"コミット済みの変更ではなく、作業ツリー上での変更を別のブランチにマージしたい\n"
3178
3183
"場合は、--uncommittedオプションを指定することができます。"
3179
3184
3180
#: bzrlib/builtins.py:4287
3185
#: bzrlib/builtins.py:4319
3181
3186
msgid ""
3182
3187
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3183
3188
"you to apply each diff hunk and file change, similar to \"shelve\"."
3185
3190
"変更を部分的にマージしたければ、\"merge -i\"を使用すれば、\"shelve\"と同じ\n"
3186
3191
"ようにそれぞれのハンクをプロンプトで選択して適用することができます。"
3187
3192
3188
#: bzrlib/builtins.py:4290
3193
#: bzrlib/builtins.py:4322
3189
3194
msgid ""
3190
3195
":Examples:\n"
3191
3196
" To merge all new revisions from bzr.dev::"
3193
3198
":例:\n"
3194
3199
" bzr.devから全ての新しいリビジョンをマージします。::"
3195
3200
3196
#: bzrlib/builtins.py:4293
3201
#: bzrlib/builtins.py:4325
3197
3202
msgid " bzr merge ../bzr.dev"
3198
3203
msgstr " bzr merge ../bzr.dev"
3199
3204
3200
#: bzrlib/builtins.py:4295
3205
#: bzrlib/builtins.py:4327
3201
3206
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3202
3207
msgstr " bzr.devから、リビジョン82まで(82も含む)のリビジョンをマージします::"
3203
3208
3204
#: bzrlib/builtins.py:4297
3209
#: bzrlib/builtins.py:4329
3205
3210
msgid " bzr merge -r 82 ../bzr.dev"
3206
3211
msgstr " bzr merge -r 82 ../bzr.dev"
3207
3212
3208
#: bzrlib/builtins.py:4299
3213
#: bzrlib/builtins.py:4331
3209
3214
msgid " To merge the changes introduced by 82, without previous changes::"
3210
3215
msgstr " リビジョン82での変更をマージし、それ以前の変更はマージしません。::"
3211
3216
3212
#: bzrlib/builtins.py:4301
3217
#: bzrlib/builtins.py:4333
3213
3218
msgid " bzr merge -r 81..82 ../bzr.dev"
3214
3219
msgstr " bzr merge -r 81..82 ../bzr.dev"
3215
3220
3216
#: bzrlib/builtins.py:4303
3221
#: bzrlib/builtins.py:4335
3217
3222
msgid " To apply a merge directive contained in /tmp/merge::"
3218
3223
msgstr " /tmp/merge内のマージディレクティブを適用します。::"
3219
3224
3220
#: bzrlib/builtins.py:4305
3225
#: bzrlib/builtins.py:4337
3221
3226
msgid " bzr merge /tmp/merge"
3222
3227
msgstr " bzr merge /tmp/merge"
3223
3228
3224
#: bzrlib/builtins.py:4307
3229
#: bzrlib/builtins.py:4339
3225
3230
msgid ""
3226
3231
" To create a merge revision with three parents from two branches\n"
3227
3232
" feature1a and feature1b:"
3229
3234
" feature1a、feature1bの２つのブランチから、３つの親を持つマージ\n"
3230
3235
" リビジョンを作ります。::"
3231
3236
3232
#: bzrlib/builtins.py:4310
3237
#: bzrlib/builtins.py:4342
3233
3238
msgid ""
3234
3239
" bzr merge ../feature1a\n"
3235
3240
" bzr merge ../feature1b --force\n"
3239
3244
" bzr merge ../feature1b --force\n"
3240
3245
" bzr commit -m 'revision with three parents'"
3241
3246
3242
#: bzrlib/builtins.py:4322
3247
#: bzrlib/builtins.py:4354
3243
3248
msgid "Merge even if the destination tree has uncommitted changes."
3244
3249
msgstr "マージ先のツリーにコミットしていない変更があってもマージします。"
3245
3250
3246
#: bzrlib/builtins.py:4328
3251
#: bzrlib/builtins.py:4360
3247
3252
msgid ""
3248
3253
"Apply uncommitted changes from a working copy, instead of branch changes."
3249
3254
msgstr "ブランチの変更ではなく、作業コピー上のコミットしていない変更をマージします。"
3250
3255
3251
#: bzrlib/builtins.py:4330
3256
#: bzrlib/builtins.py:4362
3252
3257
msgid ""
3253
3258
"If the destination is already completely merged into the source, pull from "
3254
3259
"the source rather than merging. When this happens, you do not need to "
3257
3262
"マージ先のリビジョンがマージ元のブランチにすべて含まれている場合、マージの\n"
3258
3263
"かわりにpullを実行します。その場合は、コミットする必要はありません。"
3259
3264
3260
#: bzrlib/builtins.py:4335
3265
#: bzrlib/builtins.py:4367
3261
3266
msgid ""
3262
3267
"Branch to merge into, rather than the one containing the working directory."
3263
3268
msgstr "作業ディレクトリ以外にマージする場合の、マージ先のブランチ。"
3264
3269
3265
#: bzrlib/builtins.py:4337
3270
#: bzrlib/builtins.py:4369
3266
3271
msgid "Instead of merging, show a diff of the merge."
3267
3272
msgstr "マージを実行するかわりに、マージされる内容のdiffを表示します。"
3268
3273
3269
#: bzrlib/builtins.py:4339
3274
#: bzrlib/builtins.py:4371
3270
3275
msgid "Select changes interactively."
3271
3276
msgstr "変更をインタラクティブに選択します。"
3272
3277
3273
#: bzrlib/builtins.py:4361
3278
#: bzrlib/builtins.py:4393
3274
3279
msgid ""
3275
3280
"Merging into empty branches not currently supported, "
3276
3281
"https://bugs.launchpad.net/bzr/+bug/308562"
3277
3282
msgstr ""
3278
3283
"空ブランチへのマージは今のところサポートされていません。https://bugs.launchpad.net/bzr/+bug/308562"
3279
3284
3280
#: bzrlib/builtins.py:4388
3285
#: bzrlib/builtins.py:4420
3281
3286
msgid "Cannot use --uncommitted with bundles or merge directives."
3282
3287
msgstr "バンドル、マージディレクティブに対して--uncommittedを指定することはできません。"
3283
3288
3284
#: bzrlib/builtins.py:4399
3289
#: bzrlib/builtins.py:4431
3285
3290
msgid "Cannot use --uncommitted and --revision at the same time."
3286
3291
msgstr "--uncommittedと--revisionを同時に指定することはできません。"
3287
3292
3288
#: bzrlib/builtins.py:4419
3293
#: bzrlib/builtins.py:4451
3289
3294
msgid "merger: "
3290
msgstr ""
3295
msgstr "マージした人: "
3291
3296
3292
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
3297
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
3293
3298
msgid "Nothing to do."
3294
3299
msgstr "なにもすることがありません。"
3295
3300
3296
#: bzrlib/builtins.py:4425
3301
#: bzrlib/builtins.py:4457
3297
3302
msgid "Cannot pull individual files"
3298
3303
msgstr "ファイルを個別にpullすることはできません。"
3299
3304
3300
#: bzrlib/builtins.py:4433
3305
#: bzrlib/builtins.py:4465
3301
3306
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3302
3307
msgstr "ブランチにコミットがありません。('bzr pull'を使うべきかもしれません)"
3303
3308
3304
#: bzrlib/builtins.py:4491
3309
#: bzrlib/builtins.py:4523
3305
3310
#, python-format
3306
3311
msgid "Show-base is not supported for this merge type. %s"
3307
3312
msgstr "Show-baseはこのマージタイプではサポートされません。 %s"
3308
3313
3309
#: bzrlib/builtins.py:4500
3314
#: bzrlib/builtins.py:4532
3310
3315
#, python-format
3311
3316
msgid "Conflict reduction is not supported for merge type %s."
3312
3317
msgstr "衝突の縮小化は、このマージタイプではサポートされません。 %s"
3313
3318
3314
#: bzrlib/builtins.py:4504
3319
#: bzrlib/builtins.py:4536
3315
3320
msgid "Cannot do conflict reduction and show base."
3316
3321
msgstr "衝突の縮小化、ベースの表示ができませんでした。"
3317
3322
3318
#: bzrlib/builtins.py:4615
3323
#: bzrlib/builtins.py:4647
3319
3324
msgid "No location specified or remembered"
3320
3325
msgstr "対象の場所が設定も指定もされていません。"
3321
3326
3322
#: bzrlib/builtins.py:4617
3327
#: bzrlib/builtins.py:4649
3323
3328
msgid "{0} remembered {1} location {2}"
3324
3329
msgstr "{0} 設定された {1} の場所 {2}"
3325
3330
3326
#: bzrlib/builtins.py:4623
3331
#: bzrlib/builtins.py:4655
3327
3332
msgid "Redo a merge."
3328
3333
msgstr "マージをやりなおします。"
3329
3334
3330
#: bzrlib/builtins.py:4625
3335
#: bzrlib/builtins.py:4657
3331
3336
msgid ""
3332
3337
"Use this if you want to try a different merge technique while resolving\n"
3333
3338
"conflicts. Some merge techniques are better than others, and remerge\n"
3337
3342
"使用します。他のものより優れたマージ方法があり、remergeを使って個々の\n"
3338
3343
"ファイルに別のマージ方法を試すことができます。"
3339
3344
3340
#: bzrlib/builtins.py:4629
3345
#: bzrlib/builtins.py:4661
3341
3346
msgid ""
3342
3347
"The options for remerge have the same meaning and defaults as the ones for\n"
3343
3348
"merge. The difference is that remerge can (only) be run when there is a\n"
3347
3352
"remergeはマージ中状態のときだけ実行でき、特定のファイルを指定できる\n"
3348
3353
"ということです。"
3349
3354
3350
#: bzrlib/builtins.py:4633
3355
#: bzrlib/builtins.py:4665
3351
3356
msgid ""
3352
3357
":Examples:\n"
3353
3358
" Re-do the merge of all conflicted files, and show the base text in\n"
3357
3362
" すべての衝突したファイルのマージをやり直し、通常のTHIS、OTHERの\n"
3358
3363
" テキストにくわえて衝突した領域のベーステキストを表示します。::"
3359
3364
3360
#: bzrlib/builtins.py:4637
3365
#: bzrlib/builtins.py:4669
3361
3366
msgid " bzr remerge --show-base"
3362
3367
msgstr " bzr remerge --show-base"
3363
3368
3364
#: bzrlib/builtins.py:4639
3369
#: bzrlib/builtins.py:4671
3365
3370
msgid ""
3366
3371
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3367
3372
" additional processing to reduce the size of conflict regions::"
3369
3374
" \"foobar\"のマージを、weaveマージアルゴリズムでやりなおし、衝突領域の\n"
3370
3375
" 縮小化処理も行います。::"
3371
3376
3372
#: bzrlib/builtins.py:4642
3377
#: bzrlib/builtins.py:4674
3373
3378
msgid " bzr remerge --merge-type weave --reprocess foobar"
3374
3379
msgstr " bzr remerge --merge-type weave --reprocess foobar"
3375
3380
3376
#: bzrlib/builtins.py:4649
3381
#: bzrlib/builtins.py:4681
3377
3382
msgid "Show base revision text in conflicts."
3378
3383
msgstr "衝突したベースリビジョンのテキストを表示します。"
3379
3384
3380
#: bzrlib/builtins.py:4661
3385
#: bzrlib/builtins.py:4693
3381
3386
msgid ""
3382
3387
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3383
3388
"merges."
3385
3390
"remergeは通常のマージ後にだけ実行できます。チェリーピックや複数マージでは\r\n"
3386
3391
"利用できません。"
3387
3392
3388
#: bzrlib/builtins.py:4717
3389
msgid "Revert files to a previous revision."
3390
msgstr "ファイルを過去のリビジョンに戻します。"
3393
#: bzrlib/builtins.py:4751
3394
msgid ""
3395
"Set files in the working tree back to the contents of a previous revision."
3396
msgstr ""
3391
3397
3392
#: bzrlib/builtins.py:4719
3398
#: bzrlib/builtins.py:4753
3393
3399
msgid ""
3394
3400
"Giving a list of files will revert only those files. Otherwise, all files\n"
3395
3401
"will be reverted. If the revision is not specified with '--revision', the\n"
3396
"last committed revision is used."
3402
"working tree basis revision is used. A revert operation affects only the\n"
3403
"working tree, not any revision history like the branch and repository or\n"
3404
"the working tree basis revision."
3397
3405
msgstr ""
3398
"ファイルのリストを指定すると、そのファイルだけが元に戻されます。\n"
3399
"そうでない場合は、全てのファイルが対象になります。--revisionで\n"
3400
"リビジョンを指定しない場合は、最後にコミットされたリビジョンが使用\n"
3401
"されます。"
3402
3406
3403
#: bzrlib/builtins.py:4723
3407
#: bzrlib/builtins.py:4759
3404
3408
msgid ""
3405
3409
"To remove only some changes, without reverting to a prior version, use\n"
3406
3410
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3407
3411
"will remove the changes introduced by the second last commit (-2), without\n"
3408
3412
"affecting the changes introduced by the last commit (-1). To remove\n"
3409
"certain changes on a hunk-by-hunk basis, see the shelve command."
3413
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3414
"To update the branch to a specific revision or the latest revision and\n"
3415
"update the working tree accordingly while preserving local changes, see the\n"
3416
"update command."
3410
3417
msgstr ""
3411
"以前のリビジョンに戻さずにいくつかの変更を取り除くには、mergeをかわりに\n"
3412
"使用します。例えば、\"merge . -r -2..-3\" (.を忘れないように)で、最終リビジョン\n"
3413
"(-1)での変更はそのままで、その一つ前のリビジョン(-2)での変更だけを取り\n"
3414
"除くことができます。特定の変更をハンクごと取り除く方法は、shelveをご覧\n"
3415
"ください。"
3416
3418
3417
#: bzrlib/builtins.py:4729
3419
#: bzrlib/builtins.py:4768
3418
3420
msgid ""
3419
"By default, any files that have been manually changed will be backed up\n"
3420
"first. (Files changed only by merge are not backed up.) Backup files have\n"
3421
"'.~#~' appended to their name, where # is a number."
3421
"Uncommitted changes to files that are reverted will be discarded.\n"
3422
"Howver, by default, any files that have been manually changed will be\n"
3423
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3424
"files have '.~#~' appended to their name, where # is a number."
3422
3425
msgstr ""
3423
"デフォルトでは、手で変更されたファイルは最初にバックアップされます。(merge\n"
3424
"コマンドで変更されただけのファイルはバックアップされません)バックアップ\n"
3425
"ファイル名は、元の名前に「.~#~」(#は数字)を付け足したものになります。"
3426
3426
3427
#: bzrlib/builtins.py:4733
3427
#: bzrlib/builtins.py:4773
3428
3428
msgid ""
3429
3429
"When you provide files, you can use their current pathname or the pathname\n"
3430
3430
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3436
3436
"revertを使うことができます。ディレクトリを指定した場合は、その配下のすべての\n"
3437
3437
"変更が取り消されます。"
3438
3438
3439
#: bzrlib/builtins.py:4738
3439
#: bzrlib/builtins.py:4778
3440
3440
msgid ""
3441
3441
"If you have newly added files since the target revision, they will be\n"
3442
3442
"removed. If the files to be removed have been changed, backups will be\n"
3448
3448
"バックアップされます。バージョン管理外のファイルを含むディレクトリは削除され\n"
3449
3449
"ません。"
3450
3450
3451
#: bzrlib/builtins.py:4743
3451
#: bzrlib/builtins.py:4783
3452
3452
msgid ""
3453
3453
"The working tree contains a list of revisions that have been merged but\n"
3454
3454
"not yet committed. These revisions will be included as additional parents\n"
3460
3460
"reverting any files."
3461
3461
msgstr ""
3462
3462
3463
#: bzrlib/builtins.py:4752
3463
#: bzrlib/builtins.py:4792
3464
3464
msgid ""
3465
3465
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3466
3466
"changes from a branch in a single revision. To do this, perform the merge\n"
3474
3474
"target branches."
3475
3475
msgstr ""
3476
3476
3477
#: bzrlib/builtins.py:4766
3477
#: bzrlib/builtins.py:4806
3478
3478
msgid "Do not save backups of reverted files."
3479
msgstr ""
3479
msgstr "リバートされたファイルのバックアップを作成しない。"
3480
3480
3481
#: bzrlib/builtins.py:4768
3481
#: bzrlib/builtins.py:4808
3482
3482
msgid "Remove pending merge marker, without changing any files."
3483
msgstr ""
3483
msgstr "ファイルを一切変更せずに、未解決のマージマーカを削除する。"
3484
3484
3485
#: bzrlib/builtins.py:4799
3485
#: bzrlib/builtins.py:4839
3486
3486
msgid ""
3487
3487
"Show help on a command or other topic.\n"
3488
3488
" "
3490
3490
"コマンドもしくは他のトピックのヘルプを表示する。\n"
3491
3491
" "
3492
3492
3493
#: bzrlib/builtins.py:4804
3493
#: bzrlib/builtins.py:4844
3494
3494
msgid "Show help on all commands."
3495
3495
msgstr "全てのコマンドのヘルプを表示する。"
3496
3496
3497
#: bzrlib/builtins.py:4833
3497
#: bzrlib/builtins.py:4873
3498
3498
msgid "Show unmerged/unpulled revisions between two branches."
3499
3499
msgstr "2つのブランチの間のmergeされていない/pullされていない リビジョンを表示する。"
3500
3500
3501
#: bzrlib/builtins.py:4835
3501
#: bzrlib/builtins.py:4875
3502
3502
msgid "OTHER_BRANCH may be local or remote."
3503
3503
msgstr "OTHER_BRANCHはlocalもしくはremoteになります。"
3504
3504
3505
#: bzrlib/builtins.py:4837
3505
#: bzrlib/builtins.py:4877
3506
3506
msgid ""
3507
3507
"To filter on a range of revisions, you can use the command -r begin..end\n"
3508
3508
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3513
3513
" 0 - no missing revisions"
3514
3514
msgstr ""
3515
3515
3516
#: bzrlib/builtins.py:4847
3516
#: bzrlib/builtins.py:4887
3517
3517
msgid ""
3518
3518
" Determine the missing revisions between this and the branch at the\n"
3519
3519
" remembered pull location::"
3520
3520
msgstr ""
3521
3521
3522
#: bzrlib/builtins.py:4850
3522
#: bzrlib/builtins.py:4890
3523
3523
msgid " bzr missing"
3524
3524
msgstr " bzr missing"
3525
3525
3526
#: bzrlib/builtins.py:4852
3526
#: bzrlib/builtins.py:4892
3527
3527
msgid " Determine the missing revisions between this and another branch::"
3528
3528
msgstr ""
3529
3529
3530
#: bzrlib/builtins.py:4854
3530
#: bzrlib/builtins.py:4894
3531
3531
msgid " bzr missing http://server/branch"
3532
3532
msgstr " bzr missing http://server/branch"
3533
3533
3534
#: bzrlib/builtins.py:4856
3534
#: bzrlib/builtins.py:4896
3535
3535
msgid ""
3536
3536
" Determine the missing revisions up to a specific revision on the other\n"
3537
3537
" branch::"
3538
3538
msgstr ""
3539
3539
3540
#: bzrlib/builtins.py:4859
3540
#: bzrlib/builtins.py:4899
3541
3541
msgid " bzr missing -r ..-10"
3542
3542
msgstr " bzr missing -r ..-10"
3543
3543
3544
#: bzrlib/builtins.py:4861
3544
#: bzrlib/builtins.py:4901
3545
3545
msgid ""
3546
3546
" Determine the missing revisions up to a specific revision on this\n"
3547
3547
" branch::"
3548
3548
msgstr ""
3549
3549
3550
#: bzrlib/builtins.py:4864
3550
#: bzrlib/builtins.py:4904
3551
3551
msgid " bzr missing --my-revision ..-10"
3552
3552
msgstr " bzr missing --my-revision ..-10"
3553
3553
3554
#: bzrlib/builtins.py:4871
3554
#: bzrlib/builtins.py:4911
3555
3555
msgid "Reverse the order of revisions."
3556
3556
msgstr "リビジョンの表示順を逆転する。"
3557
3557
3558
#: bzrlib/builtins.py:4873
3558
#: bzrlib/builtins.py:4913
3559
3559
msgid "Display changes in the local branch only."
3560
3560
msgstr "ローカルブランチの変更のみを表示する。"
3561
3561
3562
#: bzrlib/builtins.py:4874
3562
#: bzrlib/builtins.py:4914
3563
3563
msgid "Same as --mine-only."
3564
3564
msgstr "--mine-onlyと同じ。"
3565
3565
3566
#: bzrlib/builtins.py:4876
3566
#: bzrlib/builtins.py:4916
3567
3567
msgid "Display changes in the remote branch only."
3568
3568
msgstr "リモートブランチの変更のみを表示する。"
3569
3569
3570
#: bzrlib/builtins.py:4877
3570
#: bzrlib/builtins.py:4917
3571
3571
msgid "Same as --theirs-only."
3572
3572
msgstr "--theirs-onlyと同じ。"
3573
3573
3574
#: bzrlib/builtins.py:4882
3574
#: bzrlib/builtins.py:4922
3575
3575
msgid ""
3576
3576
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3577
3577
"details."
3578
3578
msgstr ""
3579
3579
3580
#: bzrlib/builtins.py:4886
3580
#: bzrlib/builtins.py:4926
3581
3581
msgid ""
3582
3582
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3583
3583
"details."
3584
3584
msgstr ""
3585
3585
3586
#: bzrlib/builtins.py:4889
3586
#: bzrlib/builtins.py:4929
3587
3587
msgid "Show all revisions in addition to the mainline ones."
3588
3588
msgstr ""
3589
3589
3590
#: bzrlib/builtins.py:4943
3590
#: bzrlib/builtins.py:4983
3591
3591
msgid "No peer location known or specified."
3592
3592
msgstr ""
3593
3593
3594
#: bzrlib/builtins.py:4947
3594
#: bzrlib/builtins.py:4987
3595
3595
msgid "Using saved parent location: {0}\n"
3596
msgstr ""
3596
msgstr "保存済みの親ロケーションを使用する: {0}\n"
3597
3597
3598
#: bzrlib/builtins.py:4980
3598
#: bzrlib/builtins.py:5020
3599
3599
#, python-format
3600
3600
msgid "You have %d extra revision:\n"
3601
3601
msgid_plural "You have %d extra revisions:\n"
3602
3602
msgstr[0] ""
3603
3603
msgstr[1] ""
3604
3604
3605
#: bzrlib/builtins.py:4996
3605
#: bzrlib/builtins.py:5040
3606
3606
#, python-format
3607
3607
msgid "You are missing %d revision:\n"
3608
3608
msgid_plural "You are missing %d revisions:\n"
3609
3609
msgstr[0] ""
3610
3610
msgstr[1] ""
3611
3611
3612
#: bzrlib/builtins.py:5008
3612
#: bzrlib/builtins.py:5055
3613
3613
msgid "This branch has no new revisions.\n"
3614
msgstr ""
3614
msgstr "このブランチには新しいリビジョンはありません。\n"
3615
3615
3616
#: bzrlib/builtins.py:5011
3616
#: bzrlib/builtins.py:5058
3617
3617
msgid "Other branch has no new revisions.\n"
3618
msgstr ""
3618
msgstr "他のブランチには新しいリビジョンはありません。\n"
3619
3619
3620
#: bzrlib/builtins.py:5016
3620
#: bzrlib/builtins.py:5063
3621
3621
msgid "Branches are up to date.\n"
3622
msgstr ""
3622
msgstr "ブランチは最新です。\n"
3623
3623
3624
#: bzrlib/builtins.py:5027
3624
#: bzrlib/builtins.py:5074
3625
3625
msgid "Compress the data within a repository."
3626
3626
msgstr "リポジトリ内のデータを圧縮する。"
3627
3627
3628
#: bzrlib/builtins.py:5029
3628
#: bzrlib/builtins.py:5076
3629
3629
msgid ""
3630
3630
"This operation compresses the data within a bazaar repository. As\n"
3631
3631
"bazaar supports automatic packing of repository, this operation is\n"
3632
3632
"normally not required to be done manually."
3633
3633
msgstr ""
3634
"この操作では bazaar リポジトリ内のデータを圧縮します。\n"
3635
"Bazaar はリポジトリの自動パック機能を備えているため、\n"
3636
"通常はこの操作を手動で行う必要はありません。"
3634
3637
3635
#: bzrlib/builtins.py:5033
3638
#: bzrlib/builtins.py:5080
3636
3639
msgid ""
3637
3640
"During the pack operation, bazaar takes a backup of existing repository\n"
3638
3641
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3640
3643
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3641
3644
"used."
3642
3645
msgstr ""
3646
"パック操作中に bazaar は既存のリポジトリデータ、\n"
3647
"すなわちパックファイルのバックアップをとります。\n"
3648
"このバックアップは安全に削除できるようになると、\n"
3649
"bazaar によって最終的には自動的に削除されます。\n"
3650
"バックアップされたパックファイルを削除し、\n"
3651
"ディスク容量を節約したい場合には --clean-obsolete-packs\n"
3652
"オプションをご利用ください。"
3643
3653
3644
#: bzrlib/builtins.py:5039
3654
#: bzrlib/builtins.py:5086
3645
3655
msgid ""
3646
3656
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3647
3657
"during or immediately after repacking, you may be left with a state\n"
3648
3658
"where the deletion has been written to disk but the new packs have not\n"
3649
3659
"been. In this case the repository may be unusable."
3650
3660
msgstr ""
3661
"警告: --clean-obsolete-packs を使っている最中、\n"
3662
"もしくは再パック直後にマシンがクラッシュした\n"
3663
"場合、削除結果はディスクに書き込まれたものの、\n"
3664
"新しいパックが書き込まれていない状態になって\n"
3665
"しまいます。この場合にはリポジトリは使用不可能と\n"
3666
"なってしまいます。"
3651
3667
3652
#: bzrlib/builtins.py:5048
3668
#: bzrlib/builtins.py:5095
3653
3669
msgid "Delete obsolete packs to save disk space."
3654
msgstr ""
3670
msgstr "古いパックファイルを削除し、ディスク容量を節約する。"
3655
3671
3656
#: bzrlib/builtins.py:5062
3672
#: bzrlib/builtins.py:5109
3657
3673
msgid "List the installed plugins."
3658
3674
msgstr "インストールされたプラグインの一覧を表示する。"
3659
3675
3660
#: bzrlib/builtins.py:5064
3676
#: bzrlib/builtins.py:5111
3661
3677
msgid ""
3662
3678
"This command displays the list of installed plugins including\n"
3663
3679
"version of plugin and a short description of each."
3665
3681
"このコマンドは インストールされたプラグインの一覧を簡単な説明や\n"
3666
3682
"バージョン情報とともに表示します。"
3667
3683
3668
#: bzrlib/builtins.py:5067
3684
#: bzrlib/builtins.py:5114
3669
3685
msgid "--verbose shows the path where each plugin is located."
3670
3686
msgstr "--verboseを指定すると各プラグインのインストール先のパスが表示されます。"
3671
3687
3672
#: bzrlib/builtins.py:5069
3688
#: bzrlib/builtins.py:5116
3673
3689
msgid ""
3674
3690
"A plugin is an external component for Bazaar that extends the\n"
3675
3691
"revision control system, by adding or replacing code in Bazaar.\n"
3678
3694
"customizing log output."
3679
3695
msgstr ""
3680
3696
3681
#: bzrlib/builtins.py:5075
3697
#: bzrlib/builtins.py:5122
3682
3698
msgid ""
3683
3699
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3684
3700
"for further information on plugins including where to find them and how to\n"
3686
3702
"plugins using the Python programming language."
3687
3703
msgstr ""
3688
3704
3689
#: bzrlib/builtins.py:5091
3705
#: bzrlib/builtins.py:5138
3690
3706
msgid "Show testament (signing-form) of a revision."
3691
3707
msgstr ""
3692
3708
3693
#: bzrlib/builtins.py:5094
3709
#: bzrlib/builtins.py:5141
3694
3710
msgid "Produce long-format testament."
3695
3711
msgstr ""
3696
3712
3697
#: bzrlib/builtins.py:5096
3713
#: bzrlib/builtins.py:5143
3698
3714
msgid "Produce a strict-format testament."
3699
3715
msgstr ""
3700
3716
3701
#: bzrlib/builtins.py:5122
3717
#: bzrlib/builtins.py:5169
3702
3718
msgid "Show the origin of each line in a file."
3703
3719
msgstr ""
3704
3720
3705
#: bzrlib/builtins.py:5124
3721
#: bzrlib/builtins.py:5171
3706
3722
msgid ""
3707
3723
"This prints out the given file with an annotation on the left side\n"
3708
3724
"indicating which revision, author and date introduced the change."
3709
3725
msgstr ""
3710
3726
3711
#: bzrlib/builtins.py:5127
3727
#: bzrlib/builtins.py:5174
3712
3728
msgid ""
3713
3729
"If the origin is the same for a run of consecutive lines, it is\n"
3714
3730
"shown only at the top, unless the --all option is given."
3715
3731
msgstr ""
3716
3732
3717
#: bzrlib/builtins.py:5135
3733
#: bzrlib/builtins.py:5182
3718
3734
msgid "Show annotations on all lines."
3719
3735
msgstr ""
3720
3736
3721
#: bzrlib/builtins.py:5136
3737
#: bzrlib/builtins.py:5183
3722
3738
msgid "Show commit date in annotations."
3723
3739
msgstr ""
3724
3740
3725
#: bzrlib/builtins.py:5223
3741
#: bzrlib/builtins.py:5270
3726
3742
msgid "Cannot sign a range of non-revision-history revisions"
3727
3743
msgstr ""
3728
3744
3729
#: bzrlib/builtins.py:5235
3745
#: bzrlib/builtins.py:5282
3730
3746
msgid "Please supply either one revision, or a range."
3731
3747
msgstr ""
3732
3748
3733
#: bzrlib/builtins.py:5239
3749
#: bzrlib/builtins.py:5286
3734
3750
msgid ""
3735
3751
"Convert the current branch into a checkout of the supplied branch.\n"
3736
3752
"If no branch is supplied, rebind to the last bound location."
3737
3753
msgstr ""
3738
3754
3739
#: bzrlib/builtins.py:5242
3755
#: bzrlib/builtins.py:5289
3740
3756
msgid ""
3741
3757
"Once converted into a checkout, commits must succeed on the master branch\n"
3742
3758
"before they will be applied to the local branch."
3743
3759
msgstr ""
3744
3760
3745
#: bzrlib/builtins.py:5245
3761
#: bzrlib/builtins.py:5292
3746
3762
msgid ""
3747
3763
"Bound branches use the nickname of its master branch unless it is set\n"
3748
3764
"locally, in which case binding will update the local nickname to be\n"
3749
3765
"that of the master."
3750
3766
msgstr ""
3751
3767
3752
#: bzrlib/builtins.py:5260
3768
#: bzrlib/builtins.py:5307
3753
3769
msgid "No location supplied. This format does not remember old locations."
3754
3770
msgstr ""
3755
3771
3756
#: bzrlib/builtins.py:5265
3772
#: bzrlib/builtins.py:5313
3757
3773
msgid "Branch is already bound"
3758
3774
msgstr ""
3759
3775
3760
#: bzrlib/builtins.py:5267
3776
#: bzrlib/builtins.py:5316
3761
3777
msgid "No location supplied and no previous location known"
3762
3778
msgstr ""
3763
3779
3764
#: bzrlib/builtins.py:5273
3780
#: bzrlib/builtins.py:5322
3765
3781
msgid "These branches have diverged. Try merging, and then bind again."
3766
3782
msgstr ""
3767
3783
3768
#: bzrlib/builtins.py:5280
3784
#: bzrlib/builtins.py:5329
3769
3785
msgid "Convert the current checkout into a regular branch."
3770
3786
msgstr ""
3771
3787
3772
#: bzrlib/builtins.py:5282
3788
#: bzrlib/builtins.py:5331
3773
3789
msgid ""
3774
3790
"After unbinding, the local branch is considered independent and subsequent\n"
3775
3791
"commits will be local only."
3776
3792
msgstr ""
3777
3793
3778
#: bzrlib/builtins.py:5293
3794
#: bzrlib/builtins.py:5342
3779
3795
msgid "Local branch is not bound"
3780
3796
msgstr ""
3781
3797
3782
#: bzrlib/builtins.py:5297
3798
#: bzrlib/builtins.py:5346
3783
3799
msgid "Remove the last committed revision."
3784
3800
msgstr ""
3785
3801
3786
#: bzrlib/builtins.py:5299
3802
#: bzrlib/builtins.py:5348
3787
3803
msgid ""
3788
3804
"--verbose will print out what is being removed.\n"
3789
3805
"--dry-run will go through all the motions, but not actually\n"
3790
3806
"remove anything."
3791
3807
msgstr ""
3792
3808
3793
#: bzrlib/builtins.py:5303
3809
#: bzrlib/builtins.py:5352
3794
3810
msgid ""
3795
3811
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3796
3812
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3797
3813
"branch at revision 15."
3798
3814
msgstr ""
3799
3815
3800
#: bzrlib/builtins.py:5307
3816
#: bzrlib/builtins.py:5356
3801
3817
msgid ""
3802
3818
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3803
3819
"it may make is to restore any pending merges that were present before\n"
3804
3820
"the commit."
3805
3821
msgstr ""
3806
3822
3807
#: bzrlib/builtins.py:5318
3823
#: bzrlib/builtins.py:5367
3808
3824
msgid "Don't actually make changes."
3809
3825
msgstr ""
3810
3826
3811
#: bzrlib/builtins.py:5319
3827
#: bzrlib/builtins.py:5368
3812
3828
msgid "Say yes to all questions."
3813
3829
msgstr ""
3814
3830
3815
#: bzrlib/builtins.py:5321
3831
#: bzrlib/builtins.py:5370
3816
3832
msgid "Keep tags that point to removed revisions."
3817
3833
msgstr ""
3818
3834
3819
#: bzrlib/builtins.py:5323
3835
#: bzrlib/builtins.py:5372
3820
3836
msgid "Only remove the commits from the local branch when in a checkout."
3821
3837
msgstr ""
3822
3838
3823
#: bzrlib/builtins.py:5372
3839
#: bzrlib/builtins.py:5421
3824
3840
msgid "No revisions to uncommit.\n"
3825
3841
msgstr ""
3826
3842
3827
#: bzrlib/builtins.py:5387
3843
#: bzrlib/builtins.py:5436
3828
3844
msgid "Dry-run, pretending to remove the above revisions.\n"
3829
3845
msgstr ""
3830
3846
3831
#: bzrlib/builtins.py:5390
3847
#: bzrlib/builtins.py:5439
3832
3848
msgid "The above revision(s) will be removed.\n"
3833
3849
msgstr ""
3834
3850
3835
#: bzrlib/builtins.py:5394
3851
#: bzrlib/builtins.py:5443
3836
3852
msgid "Uncommit these revisions"
3837
3853
msgstr ""
3838
3854
3839
#: bzrlib/builtins.py:5397
3855
#: bzrlib/builtins.py:5446
3840
3856
msgid "Canceled\n"
3841
3857
msgstr ""
3842
3858
3843
#: bzrlib/builtins.py:5404
3859
#: bzrlib/builtins.py:5453
3844
3860
#, python-format
3845
3861
msgid ""
3846
3862
"You can restore the old tip by running:\n"
3847
3863
" bzr pull . -r revid:%s\n"
3848
3864
msgstr ""
3849
3865
3850
#: bzrlib/builtins.py:5409
3866
#: bzrlib/builtins.py:5458
3851
3867
msgid "Break a dead lock."
3852
3868
msgstr ""
3853
3869
3854
#: bzrlib/builtins.py:5411
3870
#: bzrlib/builtins.py:5460
3855
3871
msgid ""
3856
3872
"This command breaks a lock on a repository, branch, working directory or\n"
3857
3873
"config file."
3858
3874
msgstr ""
3859
3875
3860
#: bzrlib/builtins.py:5414
3876
#: bzrlib/builtins.py:5463
3861
3877
msgid ""
3862
3878
"CAUTION: Locks should only be broken when you are sure that the process\n"
3863
3879
"holding the lock has been stopped."
3864
3880
msgstr ""
3865
3881
3866
#: bzrlib/builtins.py:5417
3882
#: bzrlib/builtins.py:5466
3867
3883
msgid ""
3868
3884
"You can get information on what locks are open via the 'bzr info\n"
3869
3885
"[location]' command."
3870
3886
msgstr ""
3871
3887
3872
#: bzrlib/builtins.py:5420
3888
#: bzrlib/builtins.py:5469
3873
3889
msgid ""
3874
3890
":Examples:\n"
3875
3891
" bzr break-lock\n"
3877
3893
" bzr break-lock --conf ~/.bazaar"
3878
3894
msgstr ""
3879
3895
3880
#: bzrlib/builtins.py:5429
3896
#: bzrlib/builtins.py:5478
3881
3897
msgid "LOCATION is the directory where the config lock is."
3882
3898
msgstr ""
3883
3899
3884
#: bzrlib/builtins.py:5431
3900
#: bzrlib/builtins.py:5480
3885
3901
msgid "Do not ask for confirmation before breaking the lock."
3886
3902
msgstr ""
3887
3903
3888
#: bzrlib/builtins.py:5466
3904
#: bzrlib/builtins.py:5515
3889
3905
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3890
3906
msgstr ""
3891
3907
3892
#: bzrlib/builtins.py:5467
3908
#: bzrlib/builtins.py:5516
3893
3909
msgid "Run the bzr server."
3894
3910
msgstr ""
3895
3911
3896
#: bzrlib/builtins.py:5473
3912
#: bzrlib/builtins.py:5522
3897
3913
msgid "Serve on stdin/out for use from inetd or sshd."
3898
3914
msgstr ""
3899
3915
3900
#: bzrlib/builtins.py:5474
3916
#: bzrlib/builtins.py:5523
3901
3917
msgid "protocol"
3902
3918
msgstr ""
3903
3919
3904
#: bzrlib/builtins.py:5475
3920
#: bzrlib/builtins.py:5524
3905
3921
msgid "Protocol to serve."
3906
3922
msgstr ""
3907
3923
3908
#: bzrlib/builtins.py:5479
3924
#: bzrlib/builtins.py:5528
3925
msgid "Listen for connections on nominated address."
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:5530
3909
3929
msgid ""
3910
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3911
"Passing 0 as the port number will result in a dynamically allocated port. "
3912
"The default port depends on the protocol."
3930
"Listen for connections on nominated port. Passing 0 as the port number will "
3931
"result in a dynamically allocated port. The default port depends on the "
3932
"protocol."
3913
3933
msgstr ""
3914
3934
3915
#: bzrlib/builtins.py:5485
3935
#: bzrlib/builtins.py:5535
3916
3936
msgid "Serve contents of this directory."
3917
3937
msgstr ""
3918
3938
3919
#: bzrlib/builtins.py:5487
3939
#: bzrlib/builtins.py:5537
3920
3940
msgid ""
3921
3941
"By default the server is a readonly server. Supplying --allow-writes "
3922
3942
"enables write access to the contents of the served directory and below. "
3925
3945
"uncontrolled write access to your file system."
3926
3946
msgstr ""
3927
3947
3928
#: bzrlib/builtins.py:5496
3948
#: bzrlib/builtins.py:5546
3929
3949
msgid "Override the default idle client timeout (5min)."
3930
3950
msgstr ""
3931
3951
3932
#: bzrlib/builtins.py:5546
3952
#: bzrlib/builtins.py:5564
3933
3953
msgid "Combine a tree into its containing tree."
3934
3954
msgstr ""
3935
3955
3936
#: bzrlib/builtins.py:5548
3956
#: bzrlib/builtins.py:5566
3937
3957
msgid "This command requires the target tree to be in a rich-root format."
3938
3958
msgstr ""
3939
3959
3940
#: bzrlib/builtins.py:5550
3960
#: bzrlib/builtins.py:5568
3941
3961
msgid ""
3942
3962
"The TREE argument should be an independent tree, inside another tree, but\n"
3943
3963
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3944
3964
"running \"bzr branch\" with the target inside a tree.)"
3945
3965
msgstr ""
3946
3966
3947
#: bzrlib/builtins.py:5554
3967
#: bzrlib/builtins.py:5572
3948
3968
msgid ""
3949
3969
"The result is a combined tree, with the subtree no longer an independent\n"
3950
3970
"part. This is marked as a merge of the subtree into the containing tree,\n"
3951
3971
"and all history is preserved."
3952
3972
msgstr ""
3953
3973
3954
#: bzrlib/builtins.py:5572
3974
#: bzrlib/builtins.py:5590
3955
3975
#, python-format
3956
3976
msgid ""
3957
3977
"Can't join trees because %s doesn't support rich root data.\n"
3958
3978
"You can use bzr upgrade on the repository."
3959
3979
msgstr ""
3960
3980
3961
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3981
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3962
3982
msgid "Cannot join {0}. {1}"
3963
3983
msgstr ""
3964
3984
3965
#: bzrlib/builtins.py:5592
3985
#: bzrlib/builtins.py:5610
3966
3986
msgid "Split a subdirectory of a tree into a separate tree."
3967
3987
msgstr ""
3968
3988
3969
#: bzrlib/builtins.py:5594
3989
#: bzrlib/builtins.py:5612
3970
3990
msgid ""
3971
3991
"This command will produce a target tree in a format that supports\n"
3972
3992
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3973
3993
"converted into earlier formats like 'dirstate-tags'."
3974
3994
msgstr ""
3975
3995
3976
#: bzrlib/builtins.py:5598
3996
#: bzrlib/builtins.py:5616
3977
3997
msgid ""
3978
3998
"The TREE argument should be a subdirectory of a working tree. That\n"
3979
3999
"subdirectory will be converted into an independent tree, with its own\n"
3980
4000
"branch. Commits in the top-level tree will not apply to the new subtree."
3981
4001
msgstr ""
3982
4002
3983
#: bzrlib/builtins.py:5678
4003
#: bzrlib/builtins.py:5696
3984
4004
msgid "No submit branch specified or known"
3985
4005
msgstr ""
3986
4006
3987
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
4007
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3988
4008
msgid "No public branch specified or known"
3989
4009
msgstr ""
3990
4010
3991
#: bzrlib/builtins.py:5691
4011
#: bzrlib/builtins.py:5710
3992
4012
msgid "bzr merge-directive takes at most two one revision identifiers"
3993
4013
msgstr ""
3994
4014
3995
#: bzrlib/builtins.py:5700
4015
#: bzrlib/builtins.py:5719
3996
4016
msgid "No revisions to bundle."
3997
4017
msgstr ""
3998
4018
3999
#: bzrlib/builtins.py:5719
4019
#: bzrlib/builtins.py:5738
4000
4020
msgid "Mail or create a merge-directive for submitting changes."
4001
4021
msgstr ""
4002
4022
4003
#: bzrlib/builtins.py:5721
4023
#: bzrlib/builtins.py:5740
4004
4024
msgid "A merge directive provides many things needed for requesting merges:"
4005
4025
msgstr ""
4006
4026
4007
#: bzrlib/builtins.py:5723
4027
#: bzrlib/builtins.py:5742
4008
4028
msgid "* A machine-readable description of the merge to perform"
4009
4029
msgstr ""
4010
4030
4011
#: bzrlib/builtins.py:5725
4031
#: bzrlib/builtins.py:5744
4012
4032
msgid "* An optional patch that is a preview of the changes requested"
4013
4033
msgstr ""
4014
4034
4015
#: bzrlib/builtins.py:5727
4035
#: bzrlib/builtins.py:5746
4016
4036
msgid ""
4017
4037
"* An optional bundle of revision data, so that the changes can be applied\n"
4018
4038
" directly from the merge directive, without retrieving data from a\n"
4019
4039
" branch."
4020
4040
msgstr ""
4021
4041
4022
#: bzrlib/builtins.py:5731
4042
#: bzrlib/builtins.py:5750
4023
4043
msgid ""
4024
4044
"`bzr send` creates a compact data set that, when applied using bzr\n"
4025
4045
"merge, has the same effect as merging from the source branch. "
4026
4046
msgstr ""
4027
4047
4028
#: bzrlib/builtins.py:5734
4048
#: bzrlib/builtins.py:5753
4029
4049
msgid ""
4030
4050
"By default the merge directive is self-contained and can be applied to any\n"
4031
4051
"branch containing submit_branch in its ancestory without needing access to\n"
4032
4052
"the source branch."
4033
4053
msgstr ""
4034
4054
4035
#: bzrlib/builtins.py:5738
4055
#: bzrlib/builtins.py:5757
4036
4056
msgid ""
4037
4057
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4038
4058
"revisions, but only a structured request to merge from the\n"
4041
4061
"included if known, so that people can check it later."
4042
4062
msgstr ""
4043
4063
4044
#: bzrlib/builtins.py:5744
4064
#: bzrlib/builtins.py:5763
4045
4065
msgid ""
4046
4066
"The submit branch defaults to the parent of the source branch, but can be\n"
4047
4067
"overridden. Both submit branch and public branch will be remembered in\n"
4050
4070
"be changed using --from."
4051
4071
msgstr ""
4052
4072
4053
#: bzrlib/builtins.py:5750
4073
#: bzrlib/builtins.py:5769
4054
4074
msgid ""
4055
4075
"Both the submit branch and the public branch follow the usual behavior with\n"
4056
4076
"respect to --remember: If there is no default location set, the first send\n"
4059
4079
"--remember. The value will only be saved if the location can be accessed."
4060
4080
msgstr ""
4061
4081
4062
#: bzrlib/builtins.py:5756
4082
#: bzrlib/builtins.py:5775
4063
4083
msgid ""
4064
4084
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4065
4085
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4067
4087
"in the merge directive."
4068
4088
msgstr ""
4069
4089
4070
#: bzrlib/builtins.py:5761
4090
#: bzrlib/builtins.py:5780
4071
4091
msgid ""
4072
4092
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4073
4093
"given, in which case it is sent to a file."
4074
4094
msgstr ""
4075
4095
4076
#: bzrlib/builtins.py:5764
4096
#: bzrlib/builtins.py:5783
4077
4097
msgid ""
4078
4098
"Mail is sent using your preferred mail program. This should be transparent\n"
4079
4099
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4080
4100
"If the preferred client can't be found (or used), your editor will be used."
4081
4101
msgstr ""
4082
4102
4083
#: bzrlib/builtins.py:5768
4103
#: bzrlib/builtins.py:5787
4084
4104
msgid ""
4085
4105
"To use a specific mail program, set the mail_client configuration option.\n"
4086
4106
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4092
4112
"supported clients."
4093
4113
msgstr ""
4094
4114
4095
#: bzrlib/builtins.py:5775
4115
#: bzrlib/builtins.py:5794
4096
4116
msgid ""
4097
4117
"If mail is being sent, a to address is required. This can be supplied\n"
4098
4118
"either on the commandline, by setting the submit_to configuration\n"
4100
4120
"in the submit branch."
4101
4121
msgstr ""
4102
4122
4103
#: bzrlib/builtins.py:5780
4123
#: bzrlib/builtins.py:5799
4104
4124
msgid ""
4105
4125
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4106
4126
"and\n"
4110
4130
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4111
4131
msgstr ""
4112
4132
4113
#: bzrlib/builtins.py:5786
4133
#: bzrlib/builtins.py:5805
4114
4134
msgid ""
4115
4135
"The merge directives created by bzr send may be applied using bzr merge or\n"
4116
4136
"bzr pull by specifying a file containing a merge directive as the location."
4117
4137
msgstr ""
4118
4138
4119
#: bzrlib/builtins.py:5789
4139
#: bzrlib/builtins.py:5808
4120
4140
msgid ""
4121
4141
"bzr send makes extensive use of public locations to map local locations "
4122
4142
"into\n"
4124
4144
"set them, and use `bzr info` to display them."
4125
4145
msgstr ""
4126
4146
4127
#: bzrlib/builtins.py:5813
4147
#: bzrlib/builtins.py:5832
4128
4148
msgid "Write merge directive to this file or directory; use - for stdout."
4129
4149
msgstr ""
4130
4150
4131
#: bzrlib/builtins.py:5817
4151
#: bzrlib/builtins.py:5836
4132
4152
msgid ""
4133
4153
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4134
4154
"strict disables the check."
4135
4155
msgstr ""
4136
4156
4137
#: bzrlib/builtins.py:5819
4157
#: bzrlib/builtins.py:5838
4138
4158
msgid "Mail the request to this address."
4139
4159
msgstr ""
4140
4160
4141
#: bzrlib/builtins.py:5823
4161
#: bzrlib/builtins.py:5842
4142
4162
msgid "Body for the email."
4143
4163
msgstr ""
4144
4164
4145
#: bzrlib/builtins.py:5876
4165
#: bzrlib/builtins.py:5895
4146
4166
msgid "Do not include a bundle in the merge directive."
4147
4167
msgstr ""
4148
4168
4149
#: bzrlib/builtins.py:5877
4169
#: bzrlib/builtins.py:5896
4150
4170
msgid "Do not include a preview patch in the merge directive."
4151
4171
msgstr ""
4152
4172
4153
#: bzrlib/builtins.py:5880
4173
#: bzrlib/builtins.py:5899
4154
4174
msgid "Remember submit and public branch."
4155
4175
msgstr ""
4156
4176
4157
#: bzrlib/builtins.py:5882
4177
#: bzrlib/builtins.py:5901
4158
4178
msgid ""
4159
4179
"Branch to generate the submission from, rather than the one containing the "
4160
4180
"working directory."
4161
4181
msgstr ""
4162
4182
4163
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
4183
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
4164
4184
msgid "format"
4165
4185
msgstr ""
4166
4186
4167
#: bzrlib/builtins.py:5893
4187
#: bzrlib/builtins.py:5912
4168
4188
msgid "Use the specified output format."
4169
4189
msgstr ""
4170
4190
4171
#: bzrlib/builtins.py:5915
4191
#: bzrlib/builtins.py:5934
4172
4192
msgid "Create, remove or modify a tag naming a revision."
4173
4193
msgstr ""
4174
4194
4175
#: bzrlib/builtins.py:5917
4195
#: bzrlib/builtins.py:5936
4176
4196
msgid ""
4177
4197
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4178
4198
"(--revision) option can be given -rtag:X, where X is any previously\n"
4179
4199
"created tag."
4180
4200
msgstr ""
4181
4201
4182
#: bzrlib/builtins.py:5921
4202
#: bzrlib/builtins.py:5940
4183
4203
msgid ""
4184
4204
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4185
4205
"along when you branch, push, pull or merge."
4186
4206
msgstr ""
4187
4207
4188
#: bzrlib/builtins.py:5924
4208
#: bzrlib/builtins.py:5943
4189
4209
msgid ""
4190
4210
"It is an error to give a tag name that already exists unless you pass\n"
4191
4211
"--force, in which case the tag is moved to point to the new revision."
4192
4212
msgstr ""
4193
4213
4194
#: bzrlib/builtins.py:5927
4214
#: bzrlib/builtins.py:5946
4195
4215
msgid ""
4196
4216
"To rename a tag (change the name but keep it on the same revsion), run "
4197
4217
"``bzr\n"
4198
4218
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4199
4219
msgstr ""
4200
4220
4201
#: bzrlib/builtins.py:5930
4221
#: bzrlib/builtins.py:5949
4202
4222
msgid ""
4203
4223
"If no tag name is specified it will be determined through the \n"
4204
4224
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4206
4226
"details."
4207
4227
msgstr ""
4208
4228
4209
#: bzrlib/builtins.py:5940
4229
#: bzrlib/builtins.py:5959
4210
4230
msgid "Delete this tag rather than placing it."
4211
4231
msgstr ""
4212
4232
4213
#: bzrlib/builtins.py:5943
4233
#: bzrlib/builtins.py:5962
4214
4234
msgid "Branch in which to place the tag."
4215
4235
msgstr ""
4216
4236
4217
#: bzrlib/builtins.py:5945
4237
#: bzrlib/builtins.py:5964
4218
4238
msgid "Replace existing tags."
4219
4239
msgstr ""
4220
4240
4221
#: bzrlib/builtins.py:5960
4241
#: bzrlib/builtins.py:5979
4222
4242
msgid "No tag specified to delete."
4223
4243
msgstr ""
4224
4244
4225
#: bzrlib/builtins.py:5962
4245
#: bzrlib/builtins.py:5981
4226
4246
#, python-format
4227
4247
msgid "Deleted tag %s."
4228
4248
msgstr ""
4229
4249
4230
#: bzrlib/builtins.py:5976
4250
#: bzrlib/builtins.py:5995
4231
4251
msgid "Please specify a tag name."
4232
4252
msgstr ""
4233
4253
4234
#: bzrlib/builtins.py:5984
4254
#: bzrlib/builtins.py:6003
4235
4255
#, python-format
4236
4256
msgid "Tag %s already exists for that revision."
4237
4257
msgstr ""
4238
4258
4239
#: bzrlib/builtins.py:5988
4259
#: bzrlib/builtins.py:6007
4240
4260
#, python-format
4241
4261
msgid "Created tag %s."
4242
4262
msgstr ""
4243
4263
4244
#: bzrlib/builtins.py:5990
4264
#: bzrlib/builtins.py:6009
4245
4265
#, python-format
4246
4266
msgid "Updated tag %s."
4247
4267
msgstr ""
4248
4268
4249
#: bzrlib/builtins.py:5994
4269
#: bzrlib/builtins.py:6013
4250
4270
msgid "List tags."
4251
4271
msgstr ""
4252
4272
4253
#: bzrlib/builtins.py:5996
4273
#: bzrlib/builtins.py:6015
4254
4274
msgid ""
4255
4275
"This command shows a table of tag names and the revisions they reference."
4256
4276
msgstr ""
4257
4277
4258
#: bzrlib/builtins.py:6002
4278
#: bzrlib/builtins.py:6021
4259
4279
msgid "Branch whose tags should be displayed."
4260
4280
msgstr ""
4261
4281
4262
#: bzrlib/builtins.py:6004
4282
#: bzrlib/builtins.py:6023
4263
4283
msgid "Sort tags by different criteria."
4264
4284
msgstr ""
4265
4285
4266
#: bzrlib/builtins.py:6004
4286
#: bzrlib/builtins.py:6023
4267
4287
msgid "Sorting"
4268
4288
msgstr ""
4269
4289
4270
#: bzrlib/builtins.py:6073
4290
#: bzrlib/builtins.py:6092
4271
4291
msgid "Reconfigure the type of a bzr directory."
4272
4292
msgstr ""
4273
4293
4274
#: bzrlib/builtins.py:6075
4294
#: bzrlib/builtins.py:6094
4275
4295
msgid "A target configuration must be specified."
4276
4296
msgstr ""
4277
4297
4278
#: bzrlib/builtins.py:6077
4298
#: bzrlib/builtins.py:6096
4279
4299
msgid ""
4280
4300
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4281
4301
"The order of preference is\n"
4286
4306
"If none of these is available, --bind-to must be specified."
4287
4307
msgstr ""
4288
4308
4289
#: bzrlib/builtins.py:6091
4309
#: bzrlib/builtins.py:6110
4290
4310
msgid "Tree type"
4291
4311
msgstr ""
4292
4312
4293
#: bzrlib/builtins.py:6092
4313
#: bzrlib/builtins.py:6111
4294
4314
msgid "The relation between branch and tree."
4295
4315
msgstr ""
4296
4316
4297
#: bzrlib/builtins.py:6094
4317
#: bzrlib/builtins.py:6113
4298
4318
msgid "Reconfigure to be an unbound branch with no working tree."
4299
4319
msgstr ""
4300
4320
4301
#: bzrlib/builtins.py:6095
4321
#: bzrlib/builtins.py:6114
4302
4322
msgid "Reconfigure to be an unbound branch with a working tree."
4303
4323
msgstr ""
4304
4324
4305
#: bzrlib/builtins.py:6096
4325
#: bzrlib/builtins.py:6115
4306
4326
msgid "Reconfigure to be a bound branch with a working tree."
4307
4327
msgstr ""
4308
4328
4309
#: bzrlib/builtins.py:6097
4329
#: bzrlib/builtins.py:6116
4310
4330
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4311
4331
msgstr ""
4312
4332
4313
#: bzrlib/builtins.py:6102
4333
#: bzrlib/builtins.py:6121
4314
4334
msgid "Repository type"
4315
4335
msgstr ""
4316
4336
4317
#: bzrlib/builtins.py:6103
4337
#: bzrlib/builtins.py:6122
4318
4338
msgid "Location fo the repository."
4319
4339
msgstr ""
4320
4340
4321
#: bzrlib/builtins.py:6105
4341
#: bzrlib/builtins.py:6124
4322
4342
msgid ""
4323
4343
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4324
4344
msgstr ""
4325
4345
4326
#: bzrlib/builtins.py:6107
4346
#: bzrlib/builtins.py:6126
4327
4347
msgid "Reconfigure to use a shared repository."
4328
4348
msgstr ""
4329
4349
4330
#: bzrlib/builtins.py:6111
4350
#: bzrlib/builtins.py:6130
4331
4351
msgid "Trees in Repository"
4332
4352
msgstr ""
4333
4353
4334
#: bzrlib/builtins.py:6112
4354
#: bzrlib/builtins.py:6131
4335
4355
msgid "Whether new branches in the repository have trees."
4336
4356
msgstr ""
4337
4357
4338
#: bzrlib/builtins.py:6114
4358
#: bzrlib/builtins.py:6133
4339
4359
msgid ""
4340
4360
"Reconfigure repository to create working trees on branches by default."
4341
4361
msgstr ""
4342
4362
4343
#: bzrlib/builtins.py:6116
4363
#: bzrlib/builtins.py:6135
4344
4364
msgid ""
4345
4365
"Reconfigure repository to not create working trees on branches by default."
4346
4366
msgstr ""
4347
4367
4348
#: bzrlib/builtins.py:6119
4368
#: bzrlib/builtins.py:6138
4349
4369
msgid "Branch to bind checkout to."
4350
4370
msgstr ""
4351
4371
4352
#: bzrlib/builtins.py:6121
4372
#: bzrlib/builtins.py:6140
4353
4373
msgid "Perform reconfiguration even if local changes will be lost."
4354
4374
msgstr ""
4355
4375
4356
#: bzrlib/builtins.py:6124
4376
#: bzrlib/builtins.py:6143
4357
4377
msgid "Reconfigure a branch to be stacked on another branch."
4358
4378
msgstr ""
4359
4379
4360
#: bzrlib/builtins.py:6128
4380
#: bzrlib/builtins.py:6147
4361
4381
msgid ""
4362
4382
"Reconfigure a branch to be unstacked. This may require copying substantial "
4363
4383
"data into it."
4364
4384
msgstr ""
4365
4385
4366
#: bzrlib/builtins.py:6138
4386
#: bzrlib/builtins.py:6157
4367
4387
msgid "Can't use both --stacked-on and --unstacked"
4368
4388
msgstr ""
4369
4389
4370
#: bzrlib/builtins.py:6152
4390
#: bzrlib/builtins.py:6171
4371
4391
msgid "No target configuration specified"
4372
4392
msgstr ""
4373
4393
4374
#: bzrlib/builtins.py:6187
4394
#: bzrlib/builtins.py:6206
4375
4395
msgid "Set the branch of a checkout and update."
4376
4396
msgstr ""
4377
4397
4378
#: bzrlib/builtins.py:6189
4398
#: bzrlib/builtins.py:6208
4379
4399
msgid ""
4380
4400
"For lightweight checkouts, this changes the branch being referenced.\n"
4381
4401
"For heavyweight checkouts, this checks that there are no local commits\n"
4383
4403
"of the new location and binds to it."
4384
4404
msgstr ""
4385
4405
4386
#: bzrlib/builtins.py:6194
4406
#: bzrlib/builtins.py:6213
4387
4407
msgid ""
4388
4408
"In both cases, the working tree is updated and uncommitted changes\n"
4389
4409
"are merged. The user can commit or revert these as they desire."
4390
4410
msgstr ""
4391
4411
4392
#: bzrlib/builtins.py:6197
4412
#: bzrlib/builtins.py:6216
4393
4413
msgid "Pending merges need to be committed or reverted before using switch."
4394
4414
msgstr ""
4395
4415
4396
#: bzrlib/builtins.py:6199
4416
#: bzrlib/builtins.py:6218
4397
4417
msgid ""
4398
4418
"The path to the branch to switch to can be specified relative to the parent\n"
4399
4419
"directory of the current branch. For example, if you are currently in a\n"
4401
4421
"/path/to/newbranch."
4402
4422
msgstr ""
4403
4423
4404
#: bzrlib/builtins.py:6204
4424
#: bzrlib/builtins.py:6223
4405
4425
msgid ""
4406
4426
"Bound branches use the nickname of its master branch unless it is set\n"
4407
4427
"locally, in which case switching will update the local nickname to be\n"
4408
4428
"that of the master."
4409
4429
msgstr ""
4410
4430
4411
#: bzrlib/builtins.py:6212
4431
#: bzrlib/builtins.py:6231
4412
4432
msgid "Switch even if local commits will be lost."
4413
4433
msgstr ""
4414
4434
4415
#: bzrlib/builtins.py:6215
4435
#: bzrlib/builtins.py:6234
4416
4436
msgid "Create the target branch from this one before switching to it."
4417
4437
msgstr ""
4418
4438
4419
#: bzrlib/builtins.py:6229
4439
#: bzrlib/builtins.py:6248
4420
4440
msgid "You must supply either a revision or a location"
4421
4441
msgstr ""
4422
4442
4423
#: bzrlib/builtins.py:6242
4443
#: bzrlib/builtins.py:6261
4424
4444
msgid "cannot create branch without source branch"
4425
4445
msgstr ""
4426
4446
4427
#: bzrlib/builtins.py:6262
4447
#: bzrlib/builtins.py:6286
4428
4448
msgid "Manage filtered views."
4429
4449
msgstr ""
4430
4450
4431
#: bzrlib/builtins.py:6264
4451
#: bzrlib/builtins.py:6288
4432
4452
msgid ""
4433
4453
"Views provide a mask over the tree so that users can focus on\n"
4434
4454
"a subset of a tree when doing their work. After creating a view,\n"
4438
4458
"must be within the current view."
4439
4459
msgstr ""
4440
4460
4441
#: bzrlib/builtins.py:6271
4461
#: bzrlib/builtins.py:6295
4442
4462
msgid ""
4443
4463
"In most cases, a view has a short life-span: it is created to make\n"
4444
4464
"a selected change and is deleted once that change is committed.\n"
4446
4466
"and switch between them."
4447
4467
msgstr ""
4448
4468
4449
#: bzrlib/builtins.py:6276
4469
#: bzrlib/builtins.py:6300
4450
4470
msgid ""
4451
4471
"To disable the current view without deleting it, you can switch to\n"
4452
4472
"the pseudo view called ``off``. This can be useful when you need\n"
4454
4474
"want to switch back to your view after that."
4455
4475
msgstr ""
4456
4476
4457
#: bzrlib/builtins.py:6281
4477
#: bzrlib/builtins.py:6305
4458
4478
msgid ""
4459
4479
":Examples:\n"
4460
4480
" To define the current view::"
4461
4481
msgstr ""
4462
4482
4463
#: bzrlib/builtins.py:6284
4483
#: bzrlib/builtins.py:6308
4464
4484
msgid " bzr view file1 dir1 ..."
4465
4485
msgstr ""
4466
4486
4467
#: bzrlib/builtins.py:6286
4487
#: bzrlib/builtins.py:6310
4468
4488
msgid " To list the current view::"
4469
4489
msgstr ""
4470
4490
4471
#: bzrlib/builtins.py:6288
4491
#: bzrlib/builtins.py:6312
4472
4492
msgid " bzr view"
4473
4493
msgstr ""
4474
4494
4475
#: bzrlib/builtins.py:6290
4495
#: bzrlib/builtins.py:6314
4476
4496
msgid " To delete the current view::"
4477
4497
msgstr ""
4478
4498
4479
#: bzrlib/builtins.py:6292
4499
#: bzrlib/builtins.py:6316
4480
4500
msgid " bzr view --delete"
4481
4501
msgstr ""
4482
4502
4483
#: bzrlib/builtins.py:6294
4503
#: bzrlib/builtins.py:6318
4484
4504
msgid " To disable the current view without deleting it::"
4485
4505
msgstr ""
4486
4506
4487
#: bzrlib/builtins.py:6296
4507
#: bzrlib/builtins.py:6320
4488
4508
msgid " bzr view --switch off"
4489
4509
msgstr ""
4490
4510
4491
#: bzrlib/builtins.py:6298
4511
#: bzrlib/builtins.py:6322
4492
4512
msgid " To define a named view and switch to it::"
4493
4513
msgstr ""
4494
4514
4495
#: bzrlib/builtins.py:6300
4515
#: bzrlib/builtins.py:6324
4496
4516
msgid " bzr view --name view-name file1 dir1 ..."
4497
4517
msgstr ""
4498
4518
4499
#: bzrlib/builtins.py:6302
4519
#: bzrlib/builtins.py:6326
4500
4520
msgid " To list a named view::"
4501
4521
msgstr ""
4502
4522
4503
#: bzrlib/builtins.py:6304
4523
#: bzrlib/builtins.py:6328
4504
4524
msgid " bzr view --name view-name"
4505
4525
msgstr ""
4506
4526
4507
#: bzrlib/builtins.py:6306
4527
#: bzrlib/builtins.py:6330
4508
4528
msgid " To delete a named view::"
4509
4529
msgstr ""
4510
4530
4511
#: bzrlib/builtins.py:6308
4531
#: bzrlib/builtins.py:6332
4512
4532
msgid " bzr view --name view-name --delete"
4513
4533
msgstr ""
4514
4534
4515
#: bzrlib/builtins.py:6310
4535
#: bzrlib/builtins.py:6334
4516
4536
msgid " To switch to a named view::"
4517
4537
msgstr ""
4518
4538
4519
#: bzrlib/builtins.py:6312
4539
#: bzrlib/builtins.py:6336
4520
4540
msgid " bzr view --switch view-name"
4521
4541
msgstr ""
4522
4542
4523
#: bzrlib/builtins.py:6314
4543
#: bzrlib/builtins.py:6338
4524
4544
msgid " To list all views defined::"
4525
4545
msgstr ""
4526
4546
4527
#: bzrlib/builtins.py:6316
4547
#: bzrlib/builtins.py:6340
4528
4548
msgid " bzr view --all"
4529
4549
msgstr ""
4530
4550
4531
#: bzrlib/builtins.py:6318
4551
#: bzrlib/builtins.py:6342
4532
4552
msgid " To delete all views::"
4533
4553
msgstr ""
4534
4554
4535
#: bzrlib/builtins.py:6320
4555
#: bzrlib/builtins.py:6344
4536
4556
msgid " bzr view --delete --all"
4537
4557
msgstr ""
4538
4558
4539
#: bzrlib/builtins.py:6327
4559
#: bzrlib/builtins.py:6351
4540
4560
msgid "Apply list or delete action to all views."
4541
4561
msgstr ""
4542
4562
4543
#: bzrlib/builtins.py:6330
4563
#: bzrlib/builtins.py:6354
4544
4564
msgid "Delete the view."
4545
4565
msgstr ""
4546
4566
4547
#: bzrlib/builtins.py:6333
4567
#: bzrlib/builtins.py:6357
4548
4568
msgid "Name of the view to define, list or delete."
4549
4569
msgstr ""
4550
4570
4551
#: bzrlib/builtins.py:6337
4571
#: bzrlib/builtins.py:6361
4552
4572
msgid "Name of the view to switch to."
4553
4573
msgstr ""
4554
4574
4555
#: bzrlib/builtins.py:6356
4575
#: bzrlib/builtins.py:6380
4556
4576
msgid "Both --delete and a file list specified"
4557
4577
msgstr ""
4558
4578
4559
#: bzrlib/builtins.py:6359
4579
#: bzrlib/builtins.py:6383
4560
4580
msgid "Both --delete and --switch specified"
4561
4581
msgstr ""
4562
4582
4563
#: bzrlib/builtins.py:6362
4583
#: bzrlib/builtins.py:6386
4564
4584
msgid "Deleted all views.\n"
4565
4585
msgstr ""
4566
4586
4567
#: bzrlib/builtins.py:6364
4587
#: bzrlib/builtins.py:6388
4568
4588
msgid "No current view to delete"
4569
4589
msgstr ""
4570
4590
4571
#: bzrlib/builtins.py:6367
4591
#: bzrlib/builtins.py:6391
4572
4592
#, python-format
4573
4593
msgid "Deleted '%s' view.\n"
4574
4594
msgstr ""
4575
4595
4576
#: bzrlib/builtins.py:6371
4596
#: bzrlib/builtins.py:6395
4577
4597
msgid "Both --switch and a file list specified"
4578
4598
msgstr ""
4579
4599
4580
#: bzrlib/builtins.py:6374
4600
#: bzrlib/builtins.py:6398
4581
4601
msgid "Both --switch and --all specified"
4582
4602
msgstr ""
4583
4603
4584
#: bzrlib/builtins.py:6377
4604
#: bzrlib/builtins.py:6401
4585
4605
msgid "No current view to disable"
4586
4606
msgstr ""
4587
4607
4588
#: bzrlib/builtins.py:6379
4608
#: bzrlib/builtins.py:6403
4589
4609
#, python-format
4590
4610
msgid "Disabled '%s' view.\n"
4591
4611
msgstr ""
4592
4612
4593
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4613
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4594
4614
msgid "Using '{0}' view: {1}\n"
4595
4615
msgstr ""
4596
4616
4597
#: bzrlib/builtins.py:6386
4617
#: bzrlib/builtins.py:6410
4598
4618
msgid "Views defined:\n"
4599
4619
msgstr ""
4600
4620
4601
#: bzrlib/builtins.py:6395
4621
#: bzrlib/builtins.py:6419
4602
4622
msgid "No views defined.\n"
4603
4623
msgstr ""
4604
4624
4605
#: bzrlib/builtins.py:6402
4625
#: bzrlib/builtins.py:6426
4606
4626
msgid "Cannot change the 'off' pseudo view"
4607
4627
msgstr ""
4608
4628
4609
#: bzrlib/builtins.py:6410
4629
#: bzrlib/builtins.py:6434
4610
4630
msgid "No current view.\n"
4611
4631
msgstr ""
4612
4632
4613
#: bzrlib/builtins.py:6413
4633
#: bzrlib/builtins.py:6437
4614
4634
msgid "'{0}' view is: {1}\n"
4615
4635
msgstr ""
4616
4636
4617
#: bzrlib/builtins.py:6433
4637
#: bzrlib/builtins.py:6457
4618
4638
msgid " <no hooks installed>\n"
4619
4639
msgstr ""
4620
4640
4621
#: bzrlib/builtins.py:6437
4641
#: bzrlib/builtins.py:6461
4622
4642
msgid "Remove a branch."
4623
4643
msgstr ""
4624
4644
4625
#: bzrlib/builtins.py:6439
4645
#: bzrlib/builtins.py:6463
4626
4646
msgid ""
4627
4647
"This will remove the branch from the specified location but \n"
4628
4648
"will keep any working tree or repository in place."
4629
4649
msgstr ""
4630
4650
4631
#: bzrlib/builtins.py:6444
4651
#: bzrlib/builtins.py:6468
4632
4652
msgid " Remove the branch at repo/trunk::"
4633
4653
msgstr ""
4634
4654
4635
#: bzrlib/builtins.py:6446
4655
#: bzrlib/builtins.py:6470
4636
4656
msgid " bzr remove-branch repo/trunk"
4637
4657
msgstr ""
4638
4658
4639
#: bzrlib/builtins.py:6461
4659
#: bzrlib/builtins.py:6477
4660
msgid "Remove branch even if it is the active branch."
4661
msgstr ""
4662
4663
#: bzrlib/builtins.py:6491
4664
msgid "Branch is active. Use --force to remove it."
4665
msgstr ""
4666
4667
#: bzrlib/builtins.py:6495
4640
4668
msgid "Plaintext diff output."
4641
4669
msgstr ""
4642
4670
4643
#: bzrlib/builtins.py:6462
4671
#: bzrlib/builtins.py:6496
4644
4672
msgid "Temporarily set aside some changes from the current tree."
4645
4673
msgstr ""
4646
4674
4647
#: bzrlib/builtins.py:6464
4675
#: bzrlib/builtins.py:6498
4648
4676
msgid ""
4649
4677
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4650
4678
"ie. out of the way, until a later time when you can bring them back from\n"
4653
4681
"will they survive its deletion."
4654
4682
msgstr ""
4655
4683
4656
#: bzrlib/builtins.py:6470
4684
#: bzrlib/builtins.py:6504
4657
4685
msgid "If shelve --list is specified, previously-shelved changes are listed."
4658
4686
msgstr ""
4659
4687
4660
#: bzrlib/builtins.py:6472
4688
#: bzrlib/builtins.py:6506
4661
4689
msgid ""
4662
4690
"Shelve is intended to help separate several sets of changes that have\n"
4663
4691
"been inappropriately mingled. If you just want to get rid of all changes\n"
4665
4693
"shelve all text changes at once, use shelve --all."
4666
4694
msgstr ""
4667
4695
4668
#: bzrlib/builtins.py:6477
4696
#: bzrlib/builtins.py:6511
4669
4697
msgid ""
4670
4698
"If filenames are specified, only the changes to those files will be\n"
4671
4699
"shelved. Other files will be left untouched."
4672
4700
msgstr ""
4673
4701
4674
#: bzrlib/builtins.py:6480
4702
#: bzrlib/builtins.py:6514
4675
4703
msgid ""
4676
4704
"If a revision is specified, changes since that revision will be shelved."
4677
4705
msgstr ""
4678
4706
4679
#: bzrlib/builtins.py:6482
4707
#: bzrlib/builtins.py:6516
4680
4708
msgid ""
4681
4709
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4682
4710
"restore the most recently shelved changes."
4683
4711
msgstr ""
4684
4712
4685
#: bzrlib/builtins.py:6485
4713
#: bzrlib/builtins.py:6519
4686
4714
msgid ""
4687
4715
"For complicated changes, it is possible to edit the changes in a separate\n"
4688
4716
"editor program to decide what the file remaining in the working copy\n"
4689
4717
"should look like. To do this, add the configuration option"
4690
4718
msgstr ""
4691
4719
4692
#: bzrlib/builtins.py:6489
4720
#: bzrlib/builtins.py:6523
4693
4721
msgid " change_editor = PROGRAM @new_path @old_path"
4694
4722
msgstr ""
4695
4723
4696
#: bzrlib/builtins.py:6491
4724
#: bzrlib/builtins.py:6525
4697
4725
msgid ""
4698
4726
"where @new_path is replaced with the path of the new version of the \n"
4699
4727
"file and @old_path is replaced with the path of the old version of \n"
4702
4730
" "
4703
4731
msgstr ""
4704
4732
4705
#: bzrlib/builtins.py:6503
4733
#: bzrlib/builtins.py:6537
4706
4734
msgid "Shelve all changes."
4707
4735
msgstr ""
4708
4736
4709
#: bzrlib/builtins.py:6505
4737
#: bzrlib/builtins.py:6539
4710
4738
msgid "Method to use for writing diffs."
4711
4739
msgstr ""
4712
4740
4713
#: bzrlib/builtins.py:6505
4741
#: bzrlib/builtins.py:6539
4714
4742
msgid "writer"
4715
4743
msgstr ""
4716
4744
4717
#: bzrlib/builtins.py:6509
4745
#: bzrlib/builtins.py:6543
4718
4746
msgid "List shelved changes."
4719
4747
msgstr ""
4720
4748
4721
#: bzrlib/builtins.py:6511
4749
#: bzrlib/builtins.py:6545
4722
4750
msgid "Destroy removed changes instead of shelving them."
4723
4751
msgstr ""
4724
4752
4725
#: bzrlib/builtins.py:6540
4753
#: bzrlib/builtins.py:6574
4726
4754
msgid "No shelved changes."
4727
4755
msgstr ""
4728
4756
4729
#: bzrlib/builtins.py:6551
4757
#: bzrlib/builtins.py:6585
4730
4758
msgid "Restore shelved changes."
4731
4759
msgstr ""
4732
4760
4733
#: bzrlib/builtins.py:6553
4761
#: bzrlib/builtins.py:6587
4734
4762
msgid ""
4735
4763
"By default, the most recently shelved changes are restored. However if you\n"
4736
4764
"specify a shelf by id those changes will be restored instead. This works\n"
4737
4765
"best when the changes don't depend on each other."
4738
4766
msgstr ""
4739
4767
4740
#: bzrlib/builtins.py:6562
4768
#: bzrlib/builtins.py:6596
4741
4769
msgid "The action to perform."
4742
4770
msgstr ""
4743
4771
4744
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4772
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4745
4773
msgid "action"
4746
4774
msgstr ""
4747
4775
4748
#: bzrlib/builtins.py:6564
4776
#: bzrlib/builtins.py:6598
4749
4777
msgid "Apply changes and remove from the shelf."
4750
4778
msgstr ""
4751
4779
4752
#: bzrlib/builtins.py:6565
4780
#: bzrlib/builtins.py:6599
4753
4781
msgid "Show changes, but do not apply or remove them."
4754
4782
msgstr ""
4755
4783
4756
#: bzrlib/builtins.py:6566
4784
#: bzrlib/builtins.py:6600
4757
4785
msgid ""
4758
4786
"Instead of unshelving the changes, show the diff that would result from "
4759
4787
"unshelving."
4760
4788
msgstr ""
4761
4789
4762
#: bzrlib/builtins.py:6568
4790
#: bzrlib/builtins.py:6602
4763
4791
msgid "Delete changes without applying them."
4764
4792
msgstr ""
4765
4793
4766
#: bzrlib/builtins.py:6569
4794
#: bzrlib/builtins.py:6603
4767
4795
msgid "Apply changes but don't delete them."
4768
4796
msgstr ""
4769
4797
4770
#: bzrlib/builtins.py:6584
4798
#: bzrlib/builtins.py:6618
4771
4799
msgid "Remove unwanted files from working tree."
4772
4800
msgstr ""
4773
4801
4774
#: bzrlib/builtins.py:6586
4802
#: bzrlib/builtins.py:6620
4775
4803
msgid ""
4776
4804
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4777
4805
"files are never deleted."
4778
4806
msgstr ""
4779
4807
4780
#: bzrlib/builtins.py:6589
4808
#: bzrlib/builtins.py:6623
4781
4809
msgid ""
4782
4810
"Another class is 'detritus', which includes files emitted by bzr during\n"
4783
4811
"normal operations and selftests. (The value of these files decreases with\n"
4784
4812
"time.)"
4785
4813
msgstr ""
4786
4814
4787
#: bzrlib/builtins.py:6593
4815
#: bzrlib/builtins.py:6627
4788
4816
msgid ""
4789
4817
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4790
4818
"flags are respected, and may be combined."
4791
4819
msgstr ""
4792
4820
4793
#: bzrlib/builtins.py:6596
4821
#: bzrlib/builtins.py:6630
4794
4822
msgid "To check what clean-tree will do, use --dry-run."
4795
4823
msgstr ""
4796
4824
4797
#: bzrlib/builtins.py:6599
4825
#: bzrlib/builtins.py:6633
4798
4826
msgid "Delete all ignored files."
4799
4827
msgstr ""
4800
4828
4801
#: bzrlib/builtins.py:6600
4829
#: bzrlib/builtins.py:6634
4802
4830
msgid ""
4803
4831
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4804
4832
msgstr ""
4805
4833
4806
#: bzrlib/builtins.py:6603
4834
#: bzrlib/builtins.py:6637
4807
4835
msgid "Delete files unknown to bzr (default)."
4808
4836
msgstr ""
4809
4837
4810
#: bzrlib/builtins.py:6604
4838
#: bzrlib/builtins.py:6638
4811
4839
msgid "Show files to delete instead of deleting them."
4812
4840
msgstr ""
4813
4841
4814
#: bzrlib/builtins.py:6606
4842
#: bzrlib/builtins.py:6640
4815
4843
msgid "Do not prompt before deleting."
4816
4844
msgstr ""
4817
4845
4871
4899
msgstr[0] ""
4872
4900
msgstr[1] ""
4873
4901
4874
#: bzrlib/bzrdir.py:490
4902
#: bzrlib/bzrdir.py:487
4875
4903
msgid ""
4876
4904
"making backup of {0}\n"
4877
4905
" to {1}"
4878
4906
msgstr ""
4879
4907
4880
#: bzrlib/bzrdir.py:513
4908
#: bzrlib/bzrdir.py:510
4881
4909
msgid "renamed {0} to {1}"
4882
4910
msgstr ""
4883
4911
4884
#: bzrlib/bzrdir.py:1652
4912
#: bzrlib/bzrdir.py:1639
4885
4913
#, python-format
4886
4914
msgid ""
4887
4915
"Source repository format does not support stacking, using format:\n"
4888
4916
" %s"
4889
4917
msgstr ""
4890
4918
4891
#: bzrlib/bzrdir.py:1672
4919
#: bzrlib/bzrdir.py:1659
4892
4920
#, python-format
4893
4921
msgid ""
4894
4922
"Source branch format does not support stacking, using format:\n"
4895
4923
" %s"
4896
4924
msgstr ""
4897
4925
4898
#: bzrlib/bzrdir.py:1818
4926
#: bzrlib/bzrdir.py:1805
4899
4927
msgid "starting repository conversion"
4900
4928
msgstr ""
4901
4929
4902
#: bzrlib/bzrdir.py:2039
4930
#: bzrlib/bzrdir.py:2026
4903
4931
msgid "Using default stacking branch {0} at {1}"
4904
4932
msgstr ""
4905
4933
5082
5110
"supported formats or in a custom format based on a template."
5083
5111
msgstr ""
5084
5112
5085
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
5086
#: en/help_topics/configuration.txt:710
5113
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
5114
#: en/help_topics/configuration.txt:722
5087
5115
msgid "For example::"
5088
5116
msgstr ""
5089
5117
5204
5232
msgid ":See also: %s"
5205
5233
msgstr ""
5206
5234
5207
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
5235
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
5208
5236
msgid "Only ASCII permitted in option names"
5209
5237
msgstr ""
5210
5238
5211
#: bzrlib/commands.py:841 bzrlib/commands.py:849
5239
#: bzrlib/commands.py:851 bzrlib/commands.py:859
5212
5240
msgid "command {0!r} needs one or more {1}"
5213
5241
msgstr ""
5214
5242
5215
#: bzrlib/commands.py:858
5243
#: bzrlib/commands.py:868
5216
5244
msgid "command {0!r} requires argument {1}"
5217
5245
msgstr ""
5218
5246
5219
#: bzrlib/commands.py:865
5247
#: bzrlib/commands.py:875
5220
5248
msgid "extra argument to command {0}: {1}"
5221
5249
msgstr ""
5222
5250
5223
#: bzrlib/commands.py:962
5251
#: bzrlib/commands.py:972
5224
5252
#, python-format
5225
5253
msgid "Profile data written to \"%s\"."
5226
5254
msgstr ""
5231
5259
5232
5260
#: bzrlib/commit.py:117 bzrlib/commit.py:748
5233
5261
msgid "modified"
5234
msgstr ""
5262
msgstr "変更あり"
5235
5263
5236
5264
#: bzrlib/commit.py:131
5237
5265
#, python-format
5263
5291
msgid "renamed"
5264
5292
msgstr ""
5265
5293
5266
#: bzrlib/commit.py:977
5294
#: bzrlib/commit.py:976
5267
5295
msgid "unchanged"
5268
5296
msgstr ""
5269
5297
5270
#: bzrlib/commit.py:999
5298
#: bzrlib/commit.py:998
5271
5299
msgid "{0} [{1}] - Stage"
5272
5300
msgstr ""
5273
5301
5274
#: bzrlib/commit.py:1002
5302
#: bzrlib/commit.py:1001
5275
5303
#, python-format
5276
5304
msgid "%s - Stage"
5277
5305
msgstr ""
5278
5306
5307
#: bzrlib/commit_signature_commands.py:34
5308
msgid "Sign all commits by a given committer."
5309
msgstr ""
5310
5279
5311
#: bzrlib/commit_signature_commands.py:36
5280
msgid "Sign all commits by a given committer."
5281
msgstr ""
5282
5283
#: bzrlib/commit_signature_commands.py:38
5284
5312
msgid ""
5285
5313
"If location is not specified the local tree is used.\n"
5286
5314
"If committer is not specified the default committer is used."
5287
5315
msgstr ""
5288
5316
5289
#: bzrlib/commit_signature_commands.py:41
5317
#: bzrlib/commit_signature_commands.py:39
5290
5318
msgid "This does not sign commits that already have signatures."
5291
5319
msgstr ""
5292
5320
5293
#: bzrlib/commit_signature_commands.py:49
5321
#: bzrlib/commit_signature_commands.py:47
5294
5322
msgid ""
5295
5323
"Don't actually sign anything, just print the revisions that would be signed."
5296
5324
msgstr ""
5297
5325
5326
#: bzrlib/commit_signature_commands.py:98
5327
#, python-format
5328
msgid "Signed %d revision.\n"
5329
msgid_plural "Signed %d revisions.\n"
5330
msgstr[0] ""
5331
msgstr[1] ""
5332
5298
5333
#: bzrlib/commit_signature_commands.py:103
5299
5334
msgid "Verify all commit signatures."
5300
5335
msgstr ""
5310
5345
"verification."
5311
5346
msgstr ""
5312
5347
5313
#: bzrlib/commit_signature_commands.py:147
5348
#: bzrlib/commit_signature_commands.py:148
5314
5349
msgid "Cannot verify a range of non-revision-history revisions"
5315
5350
msgstr ""
5316
5351
5317
#: bzrlib/commit_signature_commands.py:168
5352
#: bzrlib/commit_signature_commands.py:166
5318
5353
msgid "All commits signed with verifiable keys"
5319
5354
msgstr ""
5320
5355
5321
#: bzrlib/config.py:475
5356
#: bzrlib/config.py:436
5322
5357
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5323
5358
msgstr ""
5324
5359
5325
#: bzrlib/config.py:2485
5360
#: bzrlib/config.py:2452
5326
5361
msgid "{0} is not an SI unit."
5327
5362
msgstr ""
5328
5363
5329
#: bzrlib/config.py:2949
5364
#: bzrlib/config.py:2971
5330
5365
msgid ""
5331
5366
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5332
5367
"will be saved."
5333
5368
msgstr ""
5334
5369
5335
#: bzrlib/config.py:3093
5370
#: bzrlib/config.py:3116
5336
5371
#, python-format
5337
5372
msgid "Invalid '%s', should be of the form 'name=value'"
5338
5373
msgstr ""
5339
5374
5340
#: bzrlib/config.py:3962
5375
#: bzrlib/config.py:4018
5341
5376
msgid "Display, set or remove a configuration option."
5342
5377
msgstr ""
5343
5378
5344
#: bzrlib/config.py:3964
5379
#: bzrlib/config.py:4020
5345
5380
msgid "Display the active value for a given option."
5346
5381
msgstr ""
5347
5382
5348
#: bzrlib/config.py:3966
5383
#: bzrlib/config.py:4022
5349
5384
msgid ""
5350
5385
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5351
5386
"matching options are displayed mentioning their scope. The active value\n"
5352
5387
"that bzr will take into account is the first one displayed for each option."
5353
5388
msgstr ""
5354
5389
5355
#: bzrlib/config.py:3970
5390
#: bzrlib/config.py:4026
5356
5391
msgid "If no NAME is given, --all .* is implied."
5357
5392
msgstr ""
5358
5393
5359
#: bzrlib/config.py:3972
5394
#: bzrlib/config.py:4028
5360
5395
msgid ""
5361
5396
"Setting a value is achieved by using name=value without spaces. The value\n"
5362
5397
"is set in the most relevant scope and can be checked by displaying the\n"
5363
5398
"option again."
5364
5399
msgstr ""
5365
5400
5366
#: bzrlib/config.py:3984
5401
#: bzrlib/config.py:4040
5367
5402
msgid "Reduce the scope to the specified configuration file."
5368
5403
msgstr ""
5369
5404
5370
#: bzrlib/config.py:3988
5405
#: bzrlib/config.py:4044
5371
5406
msgid "Display all the defined values for the matching options."
5372
5407
msgstr ""
5373
5408
5374
#: bzrlib/config.py:3990
5409
#: bzrlib/config.py:4046
5375
5410
msgid "Remove the option from the configuration file."
5376
5411
msgstr ""
5377
5412
5451
5486
msgstr[0] ""
5452
5487
msgstr[1] ""
5453
5488
5454
#: bzrlib/controldir.py:710
5489
#: bzrlib/controldir.py:712
5455
5490
msgid "{0} is{1} redirected to {2}"
5456
5491
msgstr ""
5457
5492
5668
5703
msgstr ""
5669
5704
5670
5705
#: bzrlib/errors.py:715
5706
msgid "Invalid branch name: %(name)s"
5707
msgstr ""
5708
5709
#: bzrlib/errors.py:724
5671
5710
msgid "Parent branch already exists: \"%(path)s\"."
5672
5711
msgstr ""
5673
5712
5674
#: bzrlib/errors.py:721
5713
#: bzrlib/errors.py:730
5675
5714
msgid ""
5676
5715
"Directory contains a branch, but no working tree (use bzr checkout if you "
5677
5716
"wish to build a working tree): \"%(path)s\""
5678
5717
msgstr ""
5679
5718
5680
#: bzrlib/errors.py:726
5719
#: bzrlib/errors.py:735
5681
5720
msgid ""
5682
5721
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5683
5722
msgstr ""
5684
5723
5685
#: bzrlib/errors.py:736
5724
#: bzrlib/errors.py:745
5686
5725
msgid ""
5687
5726
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5688
5727
msgstr ""
5689
5728
5690
#: bzrlib/errors.py:746
5729
#: bzrlib/errors.py:755
5691
5730
msgid "No repository present: \"%(path)s\""
5692
5731
msgstr ""
5693
5732
5694
#: bzrlib/errors.py:753
5733
#: bzrlib/errors.py:762
5695
5734
msgid ""
5696
5735
"Unsupported branch format: %(format)s\n"
5697
5736
"Please run 'bzr upgrade'"
5698
5737
msgstr ""
5699
5738
5700
#: bzrlib/errors.py:759
5739
#: bzrlib/errors.py:768
5701
5740
msgid "Unknown %(kind)s format: %(format)r"
5702
5741
msgstr ""
5703
5742
5704
#: bzrlib/errors.py:768
5743
#: bzrlib/errors.py:777
5705
5744
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5706
5745
msgstr ""
5707
5746
5708
#: bzrlib/errors.py:778
5747
#: bzrlib/errors.py:787
5709
5748
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5710
5749
msgstr ""
5711
5750
5712
#: bzrlib/errors.py:793
5751
#: bzrlib/errors.py:802
5713
5752
msgid ""
5714
5753
"%(target)s\n"
5715
5754
"is not compatible with\n"
5717
5756
"%(details)s"
5718
5757
msgstr ""
5719
5758
5720
#: bzrlib/errors.py:809
5759
#: bzrlib/errors.py:818
5721
5760
msgid "Revision is not compatible with %(repo_format)s"
5722
5761
msgstr ""
5723
5762
5724
#: bzrlib/errors.py:819
5763
#: bzrlib/errors.py:828
5725
5764
msgid "%(context_info)s%(path)s is already versioned."
5726
5765
msgstr ""
5727
5766
5728
#: bzrlib/errors.py:840
5767
#: bzrlib/errors.py:849
5729
5768
msgid "%(context_info)s%(path)s is not versioned."
5730
5769
msgstr ""
5731
5770
5732
#: bzrlib/errors.py:861
5771
#: bzrlib/errors.py:870
5733
5772
msgid "Path(s) are not versioned: %(paths_as_string)s"
5734
5773
msgstr ""
5735
5774
5736
#: bzrlib/errors.py:872
5775
#: bzrlib/errors.py:881
5737
5776
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5738
5777
msgstr ""
5739
5778
5740
#: bzrlib/errors.py:891
5779
#: bzrlib/errors.py:900
5741
5780
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5742
5781
msgstr ""
5743
5782
5744
#: bzrlib/errors.py:899
5783
#: bzrlib/errors.py:908
5745
5784
msgid ""
5746
5785
"Filename %(filename)r is not valid in your current filesystem encoding "
5747
5786
"%(fs_encoding)s"
5748
5787
msgstr ""
5749
5788
5750
#: bzrlib/errors.py:910
5789
#: bzrlib/errors.py:919
5751
5790
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5752
5791
msgstr ""
5753
5792
5754
#: bzrlib/errors.py:928
5793
#: bzrlib/errors.py:937
5755
5794
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5756
5795
msgstr ""
5757
5796
5758
#: bzrlib/errors.py:967
5797
#: bzrlib/errors.py:976
5759
5798
msgid "Cannot lock %(lock)s: %(why)s"
5760
5799
msgstr ""
5761
5800
5762
#: bzrlib/errors.py:977
5801
#: bzrlib/errors.py:986
5763
5802
msgid ""
5764
5803
"A transaction related operation was attempted after the transaction finished."
5765
5804
msgstr ""
5766
5805
5767
#: bzrlib/errors.py:1004
5806
#: bzrlib/errors.py:1013
5768
5807
msgid "Cannot lock: transport is read only: %(transport)s"
5769
5808
msgstr ""
5770
5809
5771
#: bzrlib/errors.py:1012
5810
#: bzrlib/errors.py:1021
5772
5811
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5773
5812
msgstr ""
5774
5813
5775
#: bzrlib/errors.py:1023
5814
#: bzrlib/errors.py:1032
5776
5815
msgid ""
5777
5816
"Lock was broken while still open: %(lock)s - check storage consistency!"
5778
5817
msgstr ""
5779
5818
5780
#: bzrlib/errors.py:1034
5819
#: bzrlib/errors.py:1043
5781
5820
msgid ""
5782
5821
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5783
5822
"%(holder)r, wanted to break %(target)r"
5784
5823
msgstr ""
5785
5824
5786
#: bzrlib/errors.py:1046
5825
#: bzrlib/errors.py:1055
5787
5826
msgid ""
5788
5827
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5789
5828
"Use 'bzr break-lock' to clear it"
5790
5829
msgstr ""
5791
5830
5792
#: bzrlib/errors.py:1059
5831
#: bzrlib/errors.py:1068
5793
5832
msgid "Lock not held: %(lock)s"
5794
5833
msgstr ""
5795
5834
5796
#: bzrlib/errors.py:1088
5835
#: bzrlib/errors.py:1097
5797
5836
msgid "No changes to commit"
5798
5837
msgstr ""
5799
5838
5800
#: bzrlib/errors.py:1093
5839
#: bzrlib/errors.py:1102
5801
5840
msgid ""
5802
5841
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5803
5842
msgstr ""
5804
5843
5805
#: bzrlib/errors.py:1103
5844
#: bzrlib/errors.py:1112
5806
5845
msgid ""
5807
5846
"Excluding paths during commit is not supported by repository at "
5808
5847
"%(repository)r."
5809
5848
msgstr ""
5810
5849
5811
#: bzrlib/errors.py:1112
5850
#: bzrlib/errors.py:1121
5812
5851
msgid ""
5813
5852
"The specified commit message contains characters unsupported by the current "
5814
5853
"encoding."
5815
5854
msgstr ""
5816
5855
5817
#: bzrlib/errors.py:1118
5856
#: bzrlib/errors.py:1127
5818
5857
msgid "Upgrade URL cannot work with readonly URLs."
5819
5858
msgstr ""
5820
5859
5821
#: bzrlib/errors.py:1123
5860
#: bzrlib/errors.py:1132
5822
5861
msgid "The branch format %(format)s is already at the most recent format."
5823
5862
msgstr ""
5824
5863
5825
#: bzrlib/errors.py:1146
5864
#: bzrlib/errors.py:1155
5826
5865
msgid "Option --change does not accept revision ranges"
5827
5866
msgstr ""
5828
5867
5829
#: bzrlib/errors.py:1151
5868
#: bzrlib/errors.py:1160
5830
5869
msgid "No namespace registered for string: %(spec)r"
5831
5870
msgstr ""
5832
5871
5833
#: bzrlib/errors.py:1170
5872
#: bzrlib/errors.py:1179
5834
5873
msgid ""
5835
5874
"Requested revision: '%(spec)s' does not exist in branch: "
5836
5875
"%(branch_url)s%(extra)s"
5837
5876
msgstr ""
5838
5877
5839
#: bzrlib/errors.py:1184
5878
#: bzrlib/errors.py:1193
5840
5879
msgid ""
5841
5880
"Operation denied because it would change the main history, which is not "
5842
5881
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5843
5882
msgstr ""
5844
5883
5845
#: bzrlib/errors.py:1195
5884
#: bzrlib/errors.py:1204
5846
5885
msgid ""
5847
5886
"These branches have diverged. Use the missing command to see how.\n"
5848
5887
"Use the merge command to reconcile them."
5849
5888
msgstr ""
5850
5889
5851
#: bzrlib/errors.py:1215
5890
#: bzrlib/errors.py:1224
5852
5891
msgid ""
5853
5892
"Branches have no common ancestor, and no merge base revision was specified."
5854
5893
msgstr ""
5855
5894
5856
#: bzrlib/errors.py:1221
5895
#: bzrlib/errors.py:1230
5857
5896
msgid ""
5858
5897
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5859
5898
msgstr ""
5860
5899
5861
#: bzrlib/errors.py:1227
5900
#: bzrlib/errors.py:1236
5862
5901
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5863
5902
msgstr ""
5864
5903
5865
#: bzrlib/errors.py:1236
5904
#: bzrlib/errors.py:1245
5866
5905
msgid ""
5867
5906
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5868
5907
msgstr ""
5869
5908
5870
#: bzrlib/errors.py:1245
5909
#: bzrlib/errors.py:1254
5871
5910
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5872
5911
msgstr ""
5873
5912
5874
#: bzrlib/errors.py:1254
5913
#: bzrlib/errors.py:1263
5875
5914
msgid "Branch %(branch)s has no commits."
5876
5915
msgstr ""
5877
5916
5878
#: bzrlib/errors.py:1272
5917
#: bzrlib/errors.py:1281
5879
5918
msgid ""
5880
5919
"Bound branch %(branch)s is out of date with master branch "
5881
5920
"%(master)s.%(extra_help)s"
5882
5921
msgstr ""
5883
5922
5884
#: bzrlib/errors.py:1284
5923
#: bzrlib/errors.py:1293
5885
5924
msgid ""
5886
5925
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5887
5926
"bound to %(remote)s."
5888
5927
msgstr ""
5889
5928
5890
#: bzrlib/errors.py:1296
5929
#: bzrlib/errors.py:1305
5891
5930
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5892
5931
msgstr ""
5893
5932
5894
#: bzrlib/errors.py:1305
5933
#: bzrlib/errors.py:1314
5895
5934
msgid ""
5896
5935
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5897
5936
"%(error)s"
5898
5937
msgstr ""
5899
5938
5900
#: bzrlib/errors.py:1317
5939
#: bzrlib/errors.py:1326
5901
5940
msgid "Error in processing weave: %(msg)s"
5902
5941
msgstr ""
5903
5942
5904
#: bzrlib/errors.py:1326
5943
#: bzrlib/errors.py:1335
5905
5944
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5906
5945
msgstr ""
5907
5946
5908
#: bzrlib/errors.py:1337
5947
#: bzrlib/errors.py:1346
5909
5948
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5910
5949
msgstr ""
5911
5950
5912
#: bzrlib/errors.py:1347
5951
#: bzrlib/errors.py:1356
5913
5952
msgid "Weave invariant violated: %(what)s"
5914
5953
msgstr ""
5915
5954
5916
#: bzrlib/errors.py:1356
5955
#: bzrlib/errors.py:1365
5917
5956
msgid "Parents are mismatched between two revisions. %(msg)s"
5918
5957
msgstr ""
5919
5958
5920
#: bzrlib/errors.py:1378
5959
#: bzrlib/errors.py:1387
5921
5960
msgid ""
5922
5961
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5923
5962
"%(weave_b)s"
5924
5963
msgstr ""
5925
5964
5926
#: bzrlib/errors.py:1390
5965
#: bzrlib/errors.py:1399
5927
5966
msgid "Versioned file error"
5928
5967
msgstr "バージョン管理されたファイルのエラー"
5929
5968
5930
#: bzrlib/errors.py:1395
5969
#: bzrlib/errors.py:1404
5931
5970
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5932
5971
msgstr "\"%(file_id)s\" にはリビジョン {%(revision_id)s} がありません。"
5933
5972
5934
#: bzrlib/errors.py:1405
5973
#: bzrlib/errors.py:1414
5935
5974
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5936
5975
msgstr "\"%(file_id)s\" にはすでにリビジョン {%(revision_id)s} が存在しています。"
5937
5976
5938
#: bzrlib/errors.py:1415
5977
#: bzrlib/errors.py:1424
5939
5978
msgid "Text did not match its checksum: %(msg)s"
5940
5979
msgstr "テキストがチェックサムと一致しません: %(msg)s"
5941
5980
5942
#: bzrlib/errors.py:1541
5981
#: bzrlib/errors.py:1550
5943
5982
msgid "Export format %(format)r not supported"
5944
5983
msgstr "エクスポートフォーマット %(format)r はサポートされていません"
5945
5984
5946
#: bzrlib/errors.py:1550
5985
#: bzrlib/errors.py:1559
5947
5986
msgid "Transport error: %(msg)s %(orig_error)s"
5948
5987
msgstr ""
5949
5988
5950
#: bzrlib/errors.py:1576
5989
#: bzrlib/errors.py:1585
5951
5990
msgid "Generic bzr smart protocol error: %(details)s"
5952
5991
msgstr ""
5953
5992
5954
#: bzrlib/errors.py:1584
5993
#: bzrlib/errors.py:1593
5955
5994
msgid "Received bad protocol version marker: %(marker)r"
5956
5995
msgstr ""
5957
5996
5958
#: bzrlib/errors.py:1616
5997
#: bzrlib/errors.py:1625
5959
5998
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5960
5999
msgstr ""
5961
6000
5962
#: bzrlib/errors.py:1621
6001
#: bzrlib/errors.py:1630
5963
6002
msgid "Connection error: %(msg)s %(orig_error)s"
5964
6003
msgstr ""
5965
6004
5966
#: bzrlib/errors.py:1626
6005
#: bzrlib/errors.py:1635
5967
6006
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5968
6007
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
5969
6008
5970
#: bzrlib/errors.py:1647
6009
#: bzrlib/errors.py:1656
5971
6010
msgid "Connection closed: %(msg)s %(orig_error)s"
5972
6011
msgstr "接続が閉じられました: %(msg)s %(orig_error)s"
5973
6012
5974
#: bzrlib/errors.py:1652
6013
#: bzrlib/errors.py:1661
5975
6014
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5976
6015
msgstr "接続がタイムアウトしました: %(msg)s%(orig_error)s"
5977
6016
5978
#: bzrlib/errors.py:1657
6017
#: bzrlib/errors.py:1666
5979
6018
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5980
6019
msgstr "%(path)s の %(offset)s に対する不正な range アクセス: %(msg)s"
5981
6020
5982
#: bzrlib/errors.py:1667
6021
#: bzrlib/errors.py:1676
5983
6022
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5984
6023
msgstr "%(path)s からの不正な HTTP レスポンス: %(msg)s%(orig_error)s"
5985
6024
5986
#: bzrlib/errors.py:1682
6025
#: bzrlib/errors.py:1691
5987
6026
msgid "Certificate error: %(error)s"
5988
6027
msgstr ""
5989
6028
5990
#: bzrlib/errors.py:1690
6029
#: bzrlib/errors.py:1699
5991
6030
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5992
msgstr "%(path) に対する不正な range %(range)r: %(msg)s"
6031
msgstr "%(path)s に対する不正な range %(range)r: %(msg)s"
5993
6032
5994
#: bzrlib/errors.py:1704
6033
#: bzrlib/errors.py:1713
5995
6034
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5996
6035
msgstr "%(path)s に HTTP MIME 境界が見つかりません: %(msg)s"
5997
6036
5998
#: bzrlib/errors.py:1712
6037
#: bzrlib/errors.py:1721
5999
6038
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
6000
6039
msgstr ""
6001
6040
6002
#: bzrlib/errors.py:1721
6041
#: bzrlib/errors.py:1730
6003
6042
msgid "%(source)s is%(permanently)s redirected to %(target)s"
6004
6043
msgstr ""
6005
6044
6006
#: bzrlib/errors.py:1735
6045
#: bzrlib/errors.py:1744
6007
6046
msgid "Too many redirections"
6008
6047
msgstr "リダイレクションが多すぎます"
6009
6048
6010
#: bzrlib/errors.py:1740
6049
#: bzrlib/errors.py:1749
6011
6050
msgid "Working tree has conflicts."
6012
6051
msgstr "作業ツリーに衝突があります"
6013
6052
6014
#: bzrlib/errors.py:1744
6053
#: bzrlib/errors.py:1753
6015
6054
msgid "Config file %(filename)s is not UTF-8 encoded\n"
6016
6055
msgstr "設定ファイル %(filename)s が UTF-8 でエンコードされていません\n"
6017
6056
6018
#: bzrlib/errors.py:1753
6057
#: bzrlib/errors.py:1762
6019
6058
msgid ""
6020
6059
"Error(s) parsing config file %(filename)s:\n"
6021
6060
"%(errors)s"
6022
6061
msgstr ""
6023
6062
"設定ファイル %(filename)s のパースエラー:\n"
6024
"%(error)s"
6063
"%(errors)s"
6025
6064
6026
#: bzrlib/errors.py:1763
6065
#: bzrlib/errors.py:1772
6027
6066
msgid ""
6028
6067
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6029
6068
"See ``bzr help %(name)s``"
6030
6069
msgstr ""
6031
6070
6032
#: bzrlib/errors.py:1773
6071
#: bzrlib/errors.py:1782
6033
6072
msgid "%(username)r does not seem to contain a reasonable email address"
6034
6073
msgstr "%(username)r に有効な e-mail アドレスが含まれていないようです"
6035
6074
6036
#: bzrlib/errors.py:1782
6075
#: bzrlib/errors.py:1791
6037
6076
msgid "Failed to GPG sign data with command \"%(command_line)s\""
6038
6077
msgstr "\"%(command_line)s\" コマンドでのGPGサインに失敗しました"
6039
6078
6040
#: bzrlib/errors.py:1790
6079
#: bzrlib/errors.py:1799
6041
6080
msgid "Failed to verify GPG signature data with error \"%(error)s\""
6042
6081
msgstr "GPGシグネチャの検証に \"%(error)s\" で失敗しました。"
6043
6082
6044
#: bzrlib/errors.py:1798
6083
#: bzrlib/errors.py:1807
6045
6084
msgid "Unable to import library \"%(library)s\": %(error)s"
6046
6085
msgstr "ライブラリ \"%(library)s\" をインポートできません: %(error)s"
6047
6086
6048
#: bzrlib/errors.py:1806
6087
#: bzrlib/errors.py:1815
6049
6088
msgid "python-gpgme is not installed, it is needed to verify signatures"
6050
6089
msgstr "python-gpgme がインストールされていません。これはシグネチャの検証に必要です。"
6051
6090
6052
#: bzrlib/errors.py:1814
6091
#: bzrlib/errors.py:1823
6053
6092
msgid ""
6054
6093
"The working tree for %(basedir)s has changed since the last commit, but "
6055
6094
"weave merge requires that it be unchanged"
6056
6095
msgstr "作業ツリー %(basedir)s が最後のコミットから変更されています。 作業ツリーが変更されている場合weaveマージはできません。"
6057
6096
6058
#: bzrlib/errors.py:1824
6097
#: bzrlib/errors.py:1833
6059
6098
msgid ""
6060
6099
"Can't reprocess and show base, because reprocessing obscures the "
6061
6100
"relationship of conflicting lines to the base"
6062
6101
msgstr ""
6063
6102
6064
#: bzrlib/errors.py:1830
6103
#: bzrlib/errors.py:1839
6065
6104
msgid "Cycle in graph %(graph)r"
6066
6105
msgstr "グラフ %(graph)r がループしています。"
6067
6106
6068
#: bzrlib/errors.py:1858
6107
#: bzrlib/errors.py:1867
6069
6108
msgid "File %(filename)s is not conflicted."
6070
6109
msgstr "%(filename)s は衝突していません"
6071
6110
6072
#: bzrlib/errors.py:1880
6111
#: bzrlib/errors.py:1889
6073
6112
msgid "No bundle was found in \"%(filename)s\"."
6074
6113
msgstr "\"%(filename)s\" にバンドルが見つかりません。"
6075
6114
6076
#: bzrlib/errors.py:1889
6115
#: bzrlib/errors.py:1898
6077
6116
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6078
6117
msgstr ""
6079
6118
6080
#: bzrlib/errors.py:1899
6119
#: bzrlib/errors.py:1908
6081
6120
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6082
6121
msgstr ""
6083
6122
6084
#: bzrlib/errors.py:1912
6123
#: bzrlib/errors.py:1921
6085
6124
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6086
6125
msgstr ""
6087
6126
6088
#: bzrlib/errors.py:1922
6127
#: bzrlib/errors.py:1931
6089
6128
msgid "Key %(key)s is already present in map"
6090
6129
msgstr ""
6091
6130
6092
#: bzrlib/errors.py:1927
6131
#: bzrlib/errors.py:1936
6093
6132
msgid "The prefix %(prefix)s is in the help search path twice."
6094
6133
msgstr ""
6095
6134
6096
#: bzrlib/errors.py:1937
6135
#: bzrlib/errors.py:1946
6097
6136
msgid ""
6098
6137
"No final name for trans_id %(trans_id)r\n"
6099
6138
"file-id: %(file_id)r\n"
6100
6139
"root trans-id: %(root_trans_id)r\n"
6101
6140
msgstr ""
6102
6141
6103
#: bzrlib/errors.py:1969
6142
#: bzrlib/errors.py:1978
6104
6143
msgid "Attempt to reuse a transform that has already been applied."
6105
6144
msgstr ""
6106
6145
6107
#: bzrlib/errors.py:1974
6146
#: bzrlib/errors.py:1983
6108
6147
msgid "Moving the root directory is not supported at this time"
6109
6148
msgstr "いまのところ、ルートディレクトリの移動はサポートされていません"
6110
6149
6111
#: bzrlib/errors.py:1979
6150
#: bzrlib/errors.py:1988
6112
6151
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6113
6152
msgstr "%(from_path)s から %(to_path)s へのリネームに失敗しました: %(why)s"
6114
6153
6115
#: bzrlib/errors.py:1990
6154
#: bzrlib/errors.py:1999
6116
6155
msgid ""
6117
6156
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6118
6157
msgstr ""
6119
6158
"移動できません。 %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6120
6159
6121
#: bzrlib/errors.py:2026
6160
#: bzrlib/errors.py:2035
6122
6161
msgid ""
6123
6162
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6124
6163
msgstr ""
6125
6164
"%(from_path)s%(operator)s から %(to_path)s%(_has_extra)s%(extra)s へリネームできません"
6126
6165
6127
#: bzrlib/errors.py:2056
6166
#: bzrlib/errors.py:2065
6128
6167
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6129
6168
msgstr ""
6130
6169
6131
#: bzrlib/errors.py:2064
6170
#: bzrlib/errors.py:2073
6132
6171
msgid "Nothing to merge."
6133
6172
msgstr ""
6134
6173
6135
#: bzrlib/errors.py:2069
6174
#: bzrlib/errors.py:2078
6136
6175
msgid "Format %(format)s cannot be initialised by this version of bzr."
6137
6176
msgstr ""
6138
6177
6139
#: bzrlib/errors.py:2078
6178
#: bzrlib/errors.py:2087
6140
6179
msgid ""
6141
6180
"Cannot convert from format %(from_format)s to format %(format)s. "
6142
6181
"%(problem)s"
6143
6182
msgstr ""
6144
6183
6145
#: bzrlib/errors.py:2090
6184
#: bzrlib/errors.py:2099
6146
6185
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6147
6186
msgstr ""
6148
6187
6149
#: bzrlib/errors.py:2098
6188
#: bzrlib/errors.py:2107
6150
6189
msgid "%(exe_name)s could not be found on this machine"
6151
6190
msgstr ""
6152
6191
6153
#: bzrlib/errors.py:2106
6192
#: bzrlib/errors.py:2115
6154
6193
msgid "Diff is not installed on this machine: %(msg)s"
6155
6194
msgstr ""
6156
6195
6157
#: bzrlib/errors.py:2114
6196
#: bzrlib/errors.py:2123
6158
6197
msgid "Diff3 is not installed on this machine."
6159
6198
msgstr ""
6160
6199
6161
#: bzrlib/errors.py:2120
6200
#: bzrlib/errors.py:2129
6162
6201
msgid "The content being inserted is already present."
6163
6202
msgstr ""
6164
6203
6165
#: bzrlib/errors.py:2125
6204
#: bzrlib/errors.py:2134
6166
6205
msgid ""
6167
6206
"This tree contains left-over files from a failed operation.\n"
6168
6207
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6170
6209
" keep, and delete it when you are done."
6171
6210
msgstr ""
6172
6211
6173
#: bzrlib/errors.py:2136
6212
#: bzrlib/errors.py:2145
6174
6213
msgid ""
6175
6214
"This tree contains left-over files from a failed operation.\n"
6176
6215
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6177
6216
" wish to keep, and delete it when you are done."
6178
6217
msgstr ""
6179
6218
6180
#: bzrlib/errors.py:2146
6219
#: bzrlib/errors.py:2155
6181
6220
msgid ""
6182
6221
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6183
6222
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6185
6224
" keep, and delete it when you are done."
6186
6225
msgstr ""
6187
6226
6188
#: bzrlib/errors.py:2157
6227
#: bzrlib/errors.py:2166
6189
6228
msgid ""
6190
6229
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6191
6230
"examine %(pending_deletion)s to see if it contains any files you wish to "
6192
6231
"keep, and delete it when you are done."
6193
6232
msgstr ""
6194
6233
6195
#: bzrlib/errors.py:2167
6234
#: bzrlib/errors.py:2176
6196
6235
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6197
6236
msgstr ""
6198
6237
6199
#: bzrlib/errors.py:2181
6238
#: bzrlib/errors.py:2190
6200
6239
msgid ""
6201
6240
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6202
6241
msgstr ""
6203
6242
6204
#: bzrlib/errors.py:2194
6243
#: bzrlib/errors.py:2203
6205
6244
msgid "Error in merge modified format"
6206
6245
msgstr ""
6207
6246
6208
#: bzrlib/errors.py:2199
6247
#: bzrlib/errors.py:2208
6209
6248
msgid "Format error in conflict listings"
6210
6249
msgstr ""
6211
6250
6212
#: bzrlib/errors.py:2203
6251
#: bzrlib/errors.py:2212
6213
6252
msgid ""
6214
6253
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6215
6254
"Error: %(description)s"
6216
6255
msgstr ""
6217
6256
6218
#: bzrlib/errors.py:2214
6257
#: bzrlib/errors.py:2223
6219
6258
msgid ""
6220
6259
"An error has been detected in the repository %(repo_path)s.\n"
6221
6260
"Please run bzr reconcile on this repository."
6222
6261
msgstr ""
6223
6262
6224
#: bzrlib/errors.py:2225
6263
#: bzrlib/errors.py:2234
6225
6264
msgid ""
6226
6265
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6227
6266
"reason: %(reason)s"
6228
6267
msgstr ""
6229
6268
6230
#: bzrlib/errors.py:2238
6269
#: bzrlib/errors.py:2247
6231
6270
msgid ""
6232
6271
"An inconsistent delta was supplied: %(delta)r\n"
6233
6272
"reason: %(reason)s"
6234
6273
msgstr ""
6235
6274
6236
#: bzrlib/errors.py:2250
6275
#: bzrlib/errors.py:2259
6237
6276
msgid "To use this feature you must upgrade your branch at %(path)s."
6238
6277
msgstr ""
6239
6278
6240
#: bzrlib/errors.py:2259
6279
#: bzrlib/errors.py:2268
6241
6280
msgid "To use this feature you must upgrade your repository at %(path)s."
6242
6281
msgstr ""
6243
6282
6244
#: bzrlib/errors.py:2264
6283
#: bzrlib/errors.py:2273
6245
6284
msgid ""
6246
6285
"To use this feature you must upgrade your branch at %(path)s to a format "
6247
6286
"which supports rich roots."
6248
6287
msgstr ""
6249
6288
6250
#: bzrlib/errors.py:2270
6289
#: bzrlib/errors.py:2279
6251
6290
msgid "Cannot perform local-only commits on unbound branches."
6252
6291
msgstr ""
6253
6292
6254
#: bzrlib/errors.py:2275
6293
#: bzrlib/errors.py:2284
6255
6294
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6256
6295
msgstr ""
6257
6296
6258
#: bzrlib/errors.py:2296
6297
#: bzrlib/errors.py:2305
6259
6298
msgid "Ghost tags not supported by format %(format)r."
6260
6299
msgstr ""
6261
6300
6262
#: bzrlib/errors.py:2304
6301
#: bzrlib/errors.py:2313
6263
6302
msgid "File is binary but should be text."
6264
6303
msgstr ""
6265
6304
6266
#: bzrlib/errors.py:2309
6305
#: bzrlib/errors.py:2318
6267
6306
msgid "The path %(path)s is not permitted on this platform"
6268
6307
msgstr ""
6269
6308
6270
#: bzrlib/errors.py:2318
6309
#: bzrlib/errors.py:2327
6271
6310
msgid ""
6272
6311
"Testament did not match expected value.\n"
6273
6312
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6274
6313
" {%(measured)s}"
6275
6314
msgstr ""
6276
6315
6277
#: bzrlib/errors.py:2330
6316
#: bzrlib/errors.py:2339
6278
6317
msgid "Not a bzr revision-bundle: %(text)r"
6279
6318
msgstr ""
6280
6319
6281
#: bzrlib/errors.py:2339
6320
#: bzrlib/errors.py:2348
6282
6321
msgid "Bad bzr revision-bundle: %(text)r"
6283
6322
msgstr ""
6284
6323
6285
#: bzrlib/errors.py:2348
6324
#: bzrlib/errors.py:2357
6286
6325
msgid "Malformed bzr revision-bundle header: %(text)r"
6287
6326
msgstr ""
6288
6327
6289
#: bzrlib/errors.py:2353
6328
#: bzrlib/errors.py:2362
6290
6329
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6291
6330
msgstr ""
6292
6331
6293
#: bzrlib/errors.py:2358
6332
#: bzrlib/errors.py:2367
6294
6333
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6295
6334
msgstr ""
6296
6335
6297
#: bzrlib/errors.py:2363
6336
#: bzrlib/errors.py:2372
6298
6337
msgid "End of line marker was not \\n in bzr revision-bundle"
6299
6338
msgstr ""
6300
6339
6301
#: bzrlib/errors.py:2373
6340
#: bzrlib/errors.py:2382
6302
6341
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6303
6342
msgstr ""
6304
6343
6305
#: bzrlib/errors.py:2383
6344
#: bzrlib/errors.py:2392
6306
6345
msgid "Root class for inventory serialization errors"
6307
6346
msgstr ""
6308
6347
6309
#: bzrlib/errors.py:2387
6348
#: bzrlib/errors.py:2396
6310
6349
msgid ""
6311
6350
"The inventory was not in the expected format:\n"
6312
6351
" %(msg)s"
6313
6352
msgstr ""
6314
6353
6315
#: bzrlib/errors.py:2396
6354
#: bzrlib/errors.py:2405
6316
6355
msgid "This operation requires rich root data storage"
6317
6356
msgstr ""
6318
6357
6319
#: bzrlib/errors.py:2409
6358
#: bzrlib/errors.py:2418
6320
6359
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6321
6360
msgstr ""
6322
6361
6323
#: bzrlib/errors.py:2418
6362
#: bzrlib/errors.py:2427
6324
6363
msgid ""
6325
6364
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6326
6365
"variable."
6327
6366
msgstr ""
6328
6367
6329
#: bzrlib/errors.py:2425
6368
#: bzrlib/errors.py:2434
6330
6369
msgid ""
6331
6370
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6332
6371
"ghost at {%(ghost_revision_id)s}"
6333
6372
msgstr ""
6334
6373
6335
#: bzrlib/errors.py:2435
6374
#: bzrlib/errors.py:2444
6336
6375
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6337
6376
msgstr ""
6338
6377
6339
#: bzrlib/errors.py:2486
6378
#: bzrlib/errors.py:2495
6340
6379
msgid ""
6341
6380
"A merge directive must provide either a bundle or a public branch location."
6342
6381
msgstr ""
6343
6382
6344
#: bzrlib/errors.py:2493
6383
#: bzrlib/errors.py:2502
6345
6384
msgid "Bad merge directive payload %(start)r"
6346
6385
msgstr ""
6347
6386
6348
#: bzrlib/errors.py:2503
6387
#: bzrlib/errors.py:2512
6349
6388
msgid "Preview patch does not match requested changes."
6350
6389
msgstr ""
6351
6390
6352
#: bzrlib/errors.py:2509
6391
#: bzrlib/errors.py:2518
6353
6392
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6354
6393
msgstr ""
6355
6394
6356
#: bzrlib/errors.py:2519
6395
#: bzrlib/errors.py:2528
6357
6396
msgid ""
6358
6397
"Your branch does not have all of the revisions required in order to merge "
6359
6398
"this merge directive and the target location specified in the merge "
6360
6399
"directive is not a branch: %(location)s."
6361
6400
msgstr ""
6362
6401
6363
#: bzrlib/errors.py:2531
6402
#: bzrlib/errors.py:2540
6364
6403
msgid "Unsupported entry kind %(kind)s"
6365
6404
msgstr ""
6366
6405
6367
#: bzrlib/errors.py:2539
6406
#: bzrlib/errors.py:2548
6368
6407
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6369
6408
msgstr ""
6370
6409
6371
#: bzrlib/errors.py:2549
6410
#: bzrlib/errors.py:2558
6372
6411
msgid "Subsume target %(other_tree)s needs to be upgraded."
6373
6412
msgstr ""
6374
6413
6375
#: bzrlib/errors.py:2568
6414
#: bzrlib/errors.py:2577
6376
6415
msgid "No such tag: %(tag_name)s"
6377
6416
msgstr ""
6378
6417
6379
#: bzrlib/errors.py:2576
6418
#: bzrlib/errors.py:2585
6380
6419
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6381
6420
msgstr ""
6382
6421
6383
#: bzrlib/errors.py:2585
6422
#: bzrlib/errors.py:2594
6384
6423
msgid "Tag %(tag_name)s already exists."
6385
6424
msgstr ""
6386
6425
6387
#: bzrlib/errors.py:2593
6426
#: bzrlib/errors.py:2602
6388
6427
msgid ""
6389
6428
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6390
6429
"bugs\" for more information on this feature."
6391
6430
msgstr ""
6392
6431
6393
#: bzrlib/errors.py:2603
6432
#: bzrlib/errors.py:2612
6394
6433
msgid ""
6395
6434
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6396
6435
msgstr ""
6397
6436
6398
#: bzrlib/errors.py:2613
6437
#: bzrlib/errors.py:2622
6399
6438
msgid ""
6400
6439
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6401
6440
msgstr ""
6402
6441
6403
#: bzrlib/errors.py:2623
6442
#: bzrlib/errors.py:2632
6404
6443
msgid "Invalid line in bugs property: '%(line)s'"
6405
6444
msgstr ""
6406
6445
6407
#: bzrlib/errors.py:2631
6446
#: bzrlib/errors.py:2640
6408
6447
msgid "Invalid bug status: '%(status)s'"
6409
6448
msgstr ""
6410
6449
6411
#: bzrlib/errors.py:2639
6450
#: bzrlib/errors.py:2648
6412
6451
msgid "Could not understand response from smart server: %(response_tuple)r"
6413
6452
msgstr ""
6414
6453
6415
#: bzrlib/errors.py:2678
6454
#: bzrlib/errors.py:2687
6416
6455
msgid "Server sent an unexpected error: %(error_tuple)r"
6417
6456
msgstr ""
6418
6457
6419
#: bzrlib/errors.py:2697
6458
#: bzrlib/errors.py:2706
6420
6459
msgid "Unrecognised container format: %(container_format)r"
6421
6460
msgstr ""
6422
6461
6423
#: bzrlib/errors.py:2705
6462
#: bzrlib/errors.py:2714
6424
6463
msgid "Unexpected end of container stream"
6425
6464
msgstr ""
6426
6465
6427
#: bzrlib/errors.py:2710
6466
#: bzrlib/errors.py:2719
6428
6467
msgid "Unknown record type: %(record_type)r"
6429
6468
msgstr ""
6430
6469
6431
#: bzrlib/errors.py:2718
6470
#: bzrlib/errors.py:2727
6432
6471
msgid "Invalid record: %(reason)s"
6433
6472
msgstr ""
6434
6473
6435
#: bzrlib/errors.py:2726
6474
#: bzrlib/errors.py:2735
6436
6475
msgid "Container has data after end marker: %(excess)r"
6437
6476
msgstr ""
6438
6477
6439
#: bzrlib/errors.py:2734
6478
#: bzrlib/errors.py:2743
6440
6479
msgid "Container has multiple records with the same name: %(name)s"
6441
6480
msgstr ""
6442
6481
6443
#: bzrlib/errors.py:2747
6482
#: bzrlib/errors.py:2756
6444
6483
msgid "Corrupt or incompatible data stream: %(reason)s"
6445
6484
msgstr ""
6446
6485
6447
#: bzrlib/errors.py:2755
6486
#: bzrlib/errors.py:2764
6448
6487
msgid "SMTP error: %(error)s"
6449
6488
msgstr ""
6450
6489
6451
#: bzrlib/errors.py:2763
6490
#: bzrlib/errors.py:2772
6452
6491
msgid "No message supplied."
6453
6492
msgstr ""
6454
6493
6455
#: bzrlib/errors.py:2768
6494
#: bzrlib/errors.py:2777
6456
6495
msgid "No mail-to address (--mail-to) or output (-o) specified."
6457
6496
msgstr ""
6458
6497
6459
#: bzrlib/errors.py:2773
6460
msgid "Unknown mail client: %(mail_client)s"
6461
msgstr ""
6462
6463
#: bzrlib/errors.py:2781
6498
#: bzrlib/errors.py:2782
6464
6499
msgid ""
6465
6500
"Unable to find mail client with the following names: "
6466
6501
"%(mail_command_list_string)s"
6467
6502
msgstr ""
6468
6503
6469
#: bzrlib/errors.py:2791
6504
#: bzrlib/errors.py:2792
6470
6505
msgid "SMTP connection to %(host)s refused"
6471
6506
msgstr ""
6472
6507
6473
#: bzrlib/errors.py:2800
6508
#: bzrlib/errors.py:2801
6474
6509
msgid "Please specify smtp_server. No server at default %(host)s."
6475
6510
msgstr ""
6476
6511
6477
#: bzrlib/errors.py:2814
6512
#: bzrlib/errors.py:2815
6478
6513
msgid ""
6479
6514
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6480
6515
"reconfigure."
6481
6516
msgstr ""
6482
6517
6483
#: bzrlib/errors.py:2826
6518
#: bzrlib/errors.py:2827
6484
6519
msgid "'%(display_url)s' is already a branch."
6485
6520
msgstr ""
6486
6521
6487
#: bzrlib/errors.py:2831
6522
#: bzrlib/errors.py:2832
6488
6523
msgid "'%(display_url)s' is already a tree."
6489
6524
msgstr ""
6490
6525
6491
#: bzrlib/errors.py:2836
6526
#: bzrlib/errors.py:2837
6492
6527
msgid "'%(display_url)s' is already a checkout."
6493
6528
msgstr ""
6494
6529
6495
#: bzrlib/errors.py:2841
6530
#: bzrlib/errors.py:2842
6496
6531
msgid "'%(display_url)s' is already a lightweight checkout."
6497
6532
msgstr ""
6498
6533
6499
#: bzrlib/errors.py:2846
6534
#: bzrlib/errors.py:2847
6500
6535
msgid "'%(display_url)s' is already using a shared repository."
6501
6536
msgstr ""
6502
6537
6503
#: bzrlib/errors.py:2851
6538
#: bzrlib/errors.py:2852
6504
6539
msgid "'%(display_url)s' is already standalone."
6505
6540
msgstr ""
6506
6541
6507
#: bzrlib/errors.py:2856
6542
#: bzrlib/errors.py:2857
6508
6543
msgid "Shared repository '%(display_url)s' already creates working trees."
6509
6544
msgstr ""
6510
6545
6511
#: bzrlib/errors.py:2862
6546
#: bzrlib/errors.py:2863
6512
6547
msgid ""
6513
6548
"Shared repository '%(display_url)s' already doesn't create working trees."
6514
6549
msgstr ""
6515
6550
6516
#: bzrlib/errors.py:2868
6551
#: bzrlib/errors.py:2869
6517
6552
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6518
6553
msgstr ""
6519
6554
6520
#: bzrlib/errors.py:2873
6555
#: bzrlib/errors.py:2874
6521
6556
msgid "No location could be found to bind to at %(display_url)s."
6522
6557
msgstr ""
6523
6558
6524
#: bzrlib/errors.py:2878
6559
#: bzrlib/errors.py:2879
6525
6560
msgid ""
6526
6561
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6527
6562
"status).%(more)s"
6528
6563
msgstr ""
6529
6564
6530
#: bzrlib/errors.py:2897
6565
#: bzrlib/errors.py:2898
6531
6566
msgid ""
6532
6567
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6533
6568
"list).%(more)s"
6534
6569
msgstr ""
6535
6570
6536
#: bzrlib/errors.py:2903
6571
#: bzrlib/errors.py:2904
6537
6572
msgid "Variable {%(name)s} is not available."
6538
6573
msgstr ""
6539
6574
6540
#: bzrlib/errors.py:2911
6575
#: bzrlib/errors.py:2912
6541
6576
msgid "No template specified."
6542
6577
msgstr ""
6543
6578
6544
#: bzrlib/errors.py:2916
6579
#: bzrlib/errors.py:2917
6545
6580
msgid "Unable to create symlink %(path_str)son this platform"
6546
6581
msgstr ""
6547
6582
6548
#: bzrlib/errors.py:2931
6583
#: bzrlib/errors.py:2932
6549
6584
msgid ""
6550
6585
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6551
6586
"\"original\", \"local\"."
6552
6587
msgstr ""
6553
6588
6554
#: bzrlib/errors.py:2965
6589
#: bzrlib/errors.py:2966
6555
6590
msgid ""
6556
6591
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6557
6592
msgstr ""
6558
6593
6559
#: bzrlib/errors.py:2977
6594
#: bzrlib/errors.py:2978
6560
6595
msgid "The \"%(config_id)s\" configuration does not exist."
6561
6596
msgstr ""
6562
6597
6563
#: bzrlib/errors.py:2985
6598
#: bzrlib/errors.py:2986
6564
6599
msgid "The \"%(option_name)s\" configuration option does not exist."
6565
6600
msgstr ""
6566
6601
6567
#: bzrlib/errors.py:2993
6602
#: bzrlib/errors.py:2994
6568
6603
msgid "The alias \"%(alias_name)s\" does not exist."
6569
6604
msgstr ""
6570
6605
6571
#: bzrlib/errors.py:3007
6606
#: bzrlib/errors.py:3008
6572
6607
msgid "\"%(alias_name)s\" is not a valid location alias."
6573
6608
msgstr ""
6574
6609
6575
#: bzrlib/errors.py:3015
6610
#: bzrlib/errors.py:3016
6576
6611
msgid "No %(alias_name)s location assigned."
6577
6612
msgstr ""
6578
6613
6579
#: bzrlib/errors.py:3023
6614
#: bzrlib/errors.py:3024
6580
6615
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6581
6616
msgstr ""
6582
6617
6583
#: bzrlib/errors.py:3033
6618
#: bzrlib/errors.py:3034
6584
6619
msgid "Unknown rules detected: %(unknowns_str)s."
6585
6620
msgstr ""
6586
6621
6587
#: bzrlib/errors.py:3044
6622
#: bzrlib/errors.py:3045
6588
6623
msgid "Tip change rejected: %(msg)s"
6589
6624
msgstr ""
6590
6625
6591
#: bzrlib/errors.py:3052
6626
#: bzrlib/errors.py:3053
6592
6627
msgid "Shelf corrupt."
6593
6628
msgstr ""
6594
6629
6595
#: bzrlib/errors.py:3057
6630
#: bzrlib/errors.py:3058
6596
6631
msgid "Corruption while decompressing repository file%(orig_error)s"
6597
6632
msgstr ""
6598
6633
6599
#: bzrlib/errors.py:3069
6634
#: bzrlib/errors.py:3070
6600
6635
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6601
6636
msgstr ""
6602
6637
6603
#: bzrlib/errors.py:3077
6638
#: bzrlib/errors.py:3078
6604
6639
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6605
6640
msgstr ""
6606
6641
6607
#: bzrlib/errors.py:3085
6642
#: bzrlib/errors.py:3086
6608
6643
msgid ""
6609
6644
"An attempt to access a url outside the server jail was made: '%(url)s'."
6610
6645
msgstr ""
6611
6646
6612
#: bzrlib/errors.py:3093
6647
#: bzrlib/errors.py:3094
6613
6648
msgid "The user aborted the operation."
6614
6649
msgstr ""
6615
6650
6616
#: bzrlib/errors.py:3098
6651
#: bzrlib/errors.py:3099
6617
6652
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6618
6653
msgstr ""
6619
6654
6620
#: bzrlib/errors.py:3108
6655
#: bzrlib/errors.py:3109
6621
6656
msgid "No such view: %(view_name)s."
6622
6657
msgstr ""
6623
6658
6624
#: bzrlib/errors.py:3118
6659
#: bzrlib/errors.py:3119
6625
6660
msgid ""
6626
6661
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6627
6662
"to a later format."
6628
6663
msgstr ""
6629
6664
6630
#: bzrlib/errors.py:3127
6665
#: bzrlib/errors.py:3128
6631
6666
msgid ""
6632
6667
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6633
6668
msgstr ""
6634
6669
6635
#: bzrlib/errors.py:3194
6670
#: bzrlib/errors.py:3195
6636
6671
msgid "%(bzrdir)r does not support co-located branches."
6637
6672
msgstr ""
6638
6673
6639
#: bzrlib/errors.py:3200
6674
#: bzrlib/errors.py:3201
6640
6675
msgid ""
6641
6676
"Unable to determine your name.\n"
6642
6677
"Please, set your name with the 'whoami' command.\n"
6643
6678
"E.g. bzr whoami \"Your Name <name@example.com>\""
6644
6679
msgstr ""
6645
6680
6646
#: bzrlib/errors.py:3209
6681
#: bzrlib/errors.py:3210
6647
6682
msgid "Invalid pattern(s) found. %(msg)s"
6648
6683
msgstr ""
6649
6684
6650
#: bzrlib/errors.py:3217
6685
#: bzrlib/errors.py:3218
6651
6686
msgid ""
6652
6687
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6653
6688
"unbind` to fix."
6654
6689
msgstr ""
6655
6690
6656
#: bzrlib/errors.py:3228
6691
#: bzrlib/errors.py:3229
6657
6692
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6658
6693
msgstr ""
6659
6694
6660
#: bzrlib/errors.py:3237
6695
#: bzrlib/errors.py:3238
6661
6696
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6662
6697
msgstr ""
6663
6698
6664
#: bzrlib/errors.py:3246
6699
#: bzrlib/errors.py:3247
6665
6700
msgid ""
6666
6701
"No compatible object available for operations from %(source)r to %(target)r."
6667
6702
msgstr ""
6668
6703
6669
#: bzrlib/errors.py:3256
6704
#: bzrlib/errors.py:3257
6670
6705
msgid ""
6671
6706
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6672
6707
"%(arguments)s."
6673
6708
msgstr ""
6674
6709
6675
#: bzrlib/errors.py:3266
6710
#: bzrlib/errors.py:3267
6676
6711
msgid ""
6677
6712
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6678
6713
"format %(format)r"
6679
6714
msgstr ""
6680
6715
6681
#: bzrlib/errors.py:3278
6716
#: bzrlib/errors.py:3279
6682
6717
msgid ""
6683
6718
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6684
6719
"plugin."
6685
6720
msgstr ""
6686
6721
6687
#: bzrlib/errors.py:3291
6722
#: bzrlib/errors.py:3292
6688
6723
msgid "Binary files section encountered."
6689
6724
msgstr ""
6690
6725
6691
#: bzrlib/errors.py:3299
6726
#: bzrlib/errors.py:3300
6692
6727
msgid ""
6693
6728
"Malformed patch header. %(desc)s\n"
6694
6729
"%(line)r"
6695
6730
msgstr ""
6696
6731
6697
#: bzrlib/errors.py:3308
6732
#: bzrlib/errors.py:3309
6698
6733
msgid ""
6699
6734
"Malformed hunk header. %(desc)s\n"
6700
6735
"%(line)r"
6701
6736
msgstr ""
6702
6737
6703
#: bzrlib/errors.py:3317
6738
#: bzrlib/errors.py:3318
6704
6739
msgid ""
6705
6740
"Malformed line. %(desc)s\n"
6706
6741
"%(line)r"
6707
6742
msgstr ""
6708
6743
6709
#: bzrlib/errors.py:3327
6744
#: bzrlib/errors.py:3328
6710
6745
msgid ""
6711
6746
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6712
6747
"but patch says it should be \"%(patch_line)s\""
6713
6748
msgstr ""
6714
6749
6715
#: bzrlib/errors.py:3338
6750
#: bzrlib/errors.py:3339
6716
6751
msgid "The feature %(feature)s has already been registered."
6717
6752
msgstr ""
6718
6753
6764
6799
"regular push."
6765
6800
msgstr ""
6766
6801
6767
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6802
#: bzrlib/gpg.py:366
6803
msgid "No GnuPG key results for pattern: {0}"
6804
msgstr ""
6805
6806
#: bzrlib/gpg.py:439
6768
6807
msgid "{0} commits with valid signatures"
6769
6808
msgstr ""
6770
6809
6771
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6810
#: bzrlib/gpg.py:445
6772
6811
msgid "{0} commit with unknown key"
6773
6812
msgid_plural "{0} commits with unknown keys"
6774
6813
msgstr[0] ""
6775
6814
msgstr[1] ""
6776
6815
6777
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6816
#: bzrlib/gpg.py:453
6778
6817
msgid "{0} commit not valid"
6779
6818
msgid_plural "{0} commits not valid"
6780
6819
msgstr[0] ""
6781
6820
msgstr[1] ""
6782
6821
6783
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6822
#: bzrlib/gpg.py:461
6784
6823
msgid "{0} commit not signed"
6785
6824
msgid_plural "{0} commits not signed"
6786
6825
msgstr[0] ""
6787
6826
msgstr[1] ""
6788
6827
6789
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6828
#: bzrlib/gpg.py:469
6790
6829
msgid "{0} commit with key now expired"
6791
6830
msgid_plural "{0} commits with key now expired"
6792
6831
msgstr[0] ""
6793
6832
msgstr[1] ""
6794
6833
6795
#: bzrlib/gpg.py:343
6796
msgid "No GnuPG key results for pattern: {0}"
6797
msgstr ""
6834
#: bzrlib/gpg.py:489
6835
msgid "{0} commit by author {1} with key {2} now expired"
6836
msgid_plural "{0} commits by author {1} with key {2} now expired"
6837
msgstr[0] ""
6838
msgstr[1] ""
6798
6839
6799
#: bzrlib/gpg.py:386
6840
#: bzrlib/gpg.py:505
6800
6841
msgid "{0} signed {1} commit"
6801
6842
msgid_plural "{0} signed {1} commits"
6802
6843
msgstr[0] ""
6803
6844
msgstr[1] ""
6804
6845
6805
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6846
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6806
6847
msgid "{0} commit by author {1}"
6807
6848
msgid_plural "{0} commits by author {1}"
6808
6849
msgstr[0] ""
6809
6850
msgstr[1] ""
6810
6851
6811
#: bzrlib/gpg.py:433
6852
#: bzrlib/gpg.py:554
6812
6853
msgid "Unknown key {0} signed {1} commit"
6813
6854
msgid_plural "Unknown key {0} signed {1} commits"
6814
6855
msgstr[0] ""
6815
6856
msgstr[1] ""
6816
6857
6817
#: bzrlib/gpg.py:452
6818
msgid "{0} commit by author {1} with key {2} now expired"
6819
msgid_plural "{0} commits by author {1} with key {2} now expired"
6820
msgstr[0] ""
6821
msgstr[1] ""
6822
6823
6858
#: bzrlib/groupcompress.py:1739
6824
6859
#, python-format
6825
6860
msgid "Insert claimed random_id=True, but then inserted %r two times"
6826
6861
msgstr ""
6827
6862
6828
#: bzrlib/hooks.py:331
6863
#: bzrlib/hooks.py:313
6829
6864
#, python-format
6830
6865
msgid "Introduced in: %s"
6831
6866
msgstr ""
6832
6867
6833
#: bzrlib/hooks.py:334
6868
#: bzrlib/hooks.py:316
6834
6869
#, python-format
6835
6870
msgid "Deprecated in: %s"
6836
6871
msgstr ""
6879
6914
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6880
6915
msgstr ""
6881
6916
6882
#: bzrlib/log.py:572
6917
#: bzrlib/log.py:563
6883
6918
msgid "--exclude-common-ancestry requires two different revisions"
6884
6919
msgstr ""
6885
6920
6886
#: bzrlib/log.py:574
6921
#: bzrlib/log.py:565
6887
6922
#, python-format
6888
6923
msgid "invalid direction %r"
6889
6924
msgstr ""
6890
6925
6891
#: bzrlib/log.py:662
6926
#: bzrlib/log.py:653
6892
6927
msgid "Start revision not found in history of end revision."
6893
6928
msgstr ""
6894
6929
6895
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6930
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6896
6931
msgid "Logging revision 0 is invalid."
6897
6932
msgstr ""
6898
6933
6899
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6934
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6900
6935
msgid "Start revision must be older than the end revision."
6901
6936
msgstr ""
6902
6937
6903
#: bzrlib/log.py:1827
6938
#: bzrlib/log.py:1818
6904
6939
#, python-format
6905
6940
msgid "unknown log formatter: %r"
6906
6941
msgstr ""
6907
6942
6908
#: bzrlib/log.py:2123
6943
#: bzrlib/log.py:2114
6909
6944
msgid "fixes bug"
6910
6945
msgid_plural "fixes bugs"
6911
6946
msgstr[0] ""
6920
6955
msgid "%d conflicts encountered."
6921
6956
msgstr ""
6922
6957
6923
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6958
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6924
6959
msgid "Preparing file merge"
6925
6960
msgstr ""
6926
6961
7042
7077
msgid "lstat/stat of ({0!r}): {1!r}"
7043
7078
msgstr ""
7044
7079
7045
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
7080
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
7046
7081
#, python-format
7047
7082
msgid "sorry, %r not allowed in path"
7048
7083
msgstr ""
7049
7084
7050
#: bzrlib/osutils.py:1237
7085
#: bzrlib/osutils.py:1259
7051
7086
#, python-format
7052
7087
msgid "%r is too short to calculate a relative path"
7053
7088
msgstr ""
7086
7121
msgid "Generate only the shell function, don't enable it"
7087
7122
msgstr ""
7088
7123
7089
#: bzrlib/plugins/launchpad/__init__.py:81
7124
#: bzrlib/plugins/launchpad/account.py:66
7125
msgid "Setting ssh/sftp usernames for launchpad.net."
7126
msgstr ""
7127
7128
#: bzrlib/plugins/launchpad/cmds.py:44
7090
7129
msgid "Register a branch with launchpad.net."
7091
7130
msgstr ""
7092
7131
7093
#: bzrlib/plugins/launchpad/__init__.py:83
7132
#: bzrlib/plugins/launchpad/cmds.py:46
7094
7133
msgid ""
7095
7134
"This command lists a bzr branch in the directory of branches on\n"
7096
7135
"launchpad.net. Registration allows the branch to be associated with\n"
7097
7136
"bugs or specifications."
7098
7137
msgstr ""
7099
7138
7100
#: bzrlib/plugins/launchpad/__init__.py:87
7139
#: bzrlib/plugins/launchpad/cmds.py:50
7101
7140
msgid ""
7102
7141
"Before using this command you must register the project to which the\n"
7103
7142
"branch belongs, and create an account for yourself on launchpad.net."
7104
7143
msgstr ""
7105
7144
7106
#: bzrlib/plugins/launchpad/__init__.py:90
7145
#: bzrlib/plugins/launchpad/cmds.py:53
7107
7146
msgid ""
7108
7147
"arguments:\n"
7109
7148
" public_url: The publicly visible url for the branch to register.\n"
7115
7154
" otherwise error."
7116
7155
msgstr ""
7117
7156
7118
#: bzrlib/plugins/launchpad/__init__.py:99
7157
#: bzrlib/plugins/launchpad/cmds.py:62
7119
7158
msgid ""
7120
7159
"example:\n"
7121
7160
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7122
7161
" --project fooproject"
7123
7162
msgstr ""
7124
7163
7125
#: bzrlib/plugins/launchpad/__init__.py:106
7164
#: bzrlib/plugins/launchpad/cmds.py:69
7126
7165
msgid "Launchpad project short name to associate with the branch."
7127
7166
msgstr ""
7128
7167
7129
#: bzrlib/plugins/launchpad/__init__.py:113
7168
#: bzrlib/plugins/launchpad/cmds.py:76
7130
7169
msgid ""
7131
7170
"Short name for the branch; by default taken from the last component of the "
7132
7171
"url."
7133
7172
msgstr ""
7134
7173
7135
#: bzrlib/plugins/launchpad/__init__.py:117
7174
#: bzrlib/plugins/launchpad/cmds.py:80
7136
7175
msgid "One-sentence description of the branch."
7137
7176
msgstr ""
7138
7177
7139
#: bzrlib/plugins/launchpad/__init__.py:120
7178
#: bzrlib/plugins/launchpad/cmds.py:83
7140
7179
msgid "Longer description of the purpose or contents of the branch."
7141
7180
msgstr ""
7142
7181
7143
#: bzrlib/plugins/launchpad/__init__.py:123
7182
#: bzrlib/plugins/launchpad/cmds.py:86
7144
7183
msgid "Branch author's email address, if not yourself."
7145
7184
msgstr ""
7146
7185
7147
#: bzrlib/plugins/launchpad/__init__.py:126
7186
#: bzrlib/plugins/launchpad/cmds.py:89
7148
7187
msgid "The bug this branch fixes."
7149
7188
msgstr ""
7150
7189
7151
#: bzrlib/plugins/launchpad/__init__.py:129
7190
#: bzrlib/plugins/launchpad/cmds.py:92
7152
7191
msgid "Prepare the request but don't actually send it."
7153
7192
msgstr ""
7154
7193
7155
#: bzrlib/plugins/launchpad/__init__.py:151
7194
#: bzrlib/plugins/launchpad/cmds.py:114
7156
7195
msgid ""
7157
7196
"register-branch requires a public branch url - see bzr help register-branch."
7158
7197
msgstr ""
7159
7198
7160
#: bzrlib/plugins/launchpad/__init__.py:159
7199
#: bzrlib/plugins/launchpad/cmds.py:122
7161
7200
msgid "--product is deprecated; please use --project."
7162
7201
msgstr ""
7163
7202
7164
#: bzrlib/plugins/launchpad/__init__.py:191
7203
#: bzrlib/plugins/launchpad/cmds.py:152
7165
7204
msgid "Open a Launchpad branch page in your web browser."
7166
7205
msgstr ""
7167
7206
7168
#: bzrlib/plugins/launchpad/__init__.py:196
7207
#: bzrlib/plugins/launchpad/cmds.py:157
7169
7208
msgid "Do not actually open the browser. Just say the URL we would use."
7170
7209
msgstr ""
7171
7210
7172
#: bzrlib/plugins/launchpad/__init__.py:231
7211
#: bzrlib/plugins/launchpad/cmds.py:192
7173
7212
#, python-format
7174
7213
msgid "Opening %s in web browser"
7175
7214
msgstr ""
7176
7215
7177
#: bzrlib/plugins/launchpad/__init__.py:241
7216
#: bzrlib/plugins/launchpad/cmds.py:200
7178
7217
msgid "Show or set the Launchpad user ID."
7179
7218
msgstr ""
7180
7219
7181
#: bzrlib/plugins/launchpad/__init__.py:243
7220
#: bzrlib/plugins/launchpad/cmds.py:202
7182
7221
msgid ""
7183
7222
"When communicating with Launchpad, some commands need to know your\n"
7184
7223
"Launchpad user ID. This command can be used to set or show the\n"
7185
7224
"user ID that Bazaar will use for such communication."
7186
7225
msgstr ""
7187
7226
7188
#: bzrlib/plugins/launchpad/__init__.py:247
7227
#: bzrlib/plugins/launchpad/cmds.py:206
7189
7228
msgid ""
7190
7229
":Examples:\n"
7191
7230
" Show the Launchpad ID of the current user::"
7192
7231
msgstr ""
7193
7232
7194
#: bzrlib/plugins/launchpad/__init__.py:250
7233
#: bzrlib/plugins/launchpad/cmds.py:209
7195
7234
msgid " bzr launchpad-login"
7196
7235
msgstr ""
7197
7236
7198
#: bzrlib/plugins/launchpad/__init__.py:252
7237
#: bzrlib/plugins/launchpad/cmds.py:211
7199
7238
msgid " Set the Launchpad ID of the current user to 'bob'::"
7200
7239
msgstr ""
7201
7240
7202
#: bzrlib/plugins/launchpad/__init__.py:254
7241
#: bzrlib/plugins/launchpad/cmds.py:213
7203
7242
msgid " bzr launchpad-login bob"
7204
7243
msgstr ""
7205
7244
7206
#: bzrlib/plugins/launchpad/__init__.py:261
7245
#: bzrlib/plugins/launchpad/cmds.py:220
7207
7246
msgid "Don't check that the user name is valid."
7208
7247
msgstr ""
7209
7248
7210
#: bzrlib/plugins/launchpad/__init__.py:276
7211
#: bzrlib/plugins/launchpad/__init__.py:287
7249
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
7212
7250
msgid "Launchpad user ID exists and has SSH keys.\n"
7213
7251
msgstr ""
7214
7252
7215
#: bzrlib/plugins/launchpad/__init__.py:279
7253
#: bzrlib/plugins/launchpad/cmds.py:238
7216
7254
msgid "No Launchpad user ID configured.\n"
7217
7255
msgstr ""
7218
7256
7219
#: bzrlib/plugins/launchpad/__init__.py:290
7257
#: bzrlib/plugins/launchpad/cmds.py:249
7220
7258
#, python-format
7221
7259
msgid "Launchpad user ID set to '%s'.\n"
7222
7260
msgstr ""
7223
7261
7224
#: bzrlib/plugins/launchpad/__init__.py:298
7262
#: bzrlib/plugins/launchpad/cmds.py:255
7225
7263
msgid "Ask Launchpad to mirror a branch now."
7226
7264
msgstr ""
7227
7265
7228
#: bzrlib/plugins/launchpad/__init__.py:318
7266
#: bzrlib/plugins/launchpad/cmds.py:272
7229
7267
msgid "Propose merging a branch on Launchpad."
7230
7268
msgstr ""
7231
7269
7232
#: bzrlib/plugins/launchpad/__init__.py:320
7270
#: bzrlib/plugins/launchpad/cmds.py:274
7233
7271
msgid ""
7234
7272
"This will open your usual editor to provide the initial comment. When it\n"
7235
7273
"has created the proposal, it will open it in your default web browser."
7236
7274
msgstr ""
7237
7275
7238
#: bzrlib/plugins/launchpad/__init__.py:323
7276
#: bzrlib/plugins/launchpad/cmds.py:277
7239
7277
msgid ""
7240
7278
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7241
7279
"is not supplied, the remembered submit branch will be used. If no submit\n"
7242
7280
"branch is remembered, the development focus will be used."
7243
7281
msgstr ""
7244
7282
7245
#: bzrlib/plugins/launchpad/__init__.py:327
7283
#: bzrlib/plugins/launchpad/cmds.py:281
7246
7284
msgid ""
7247
7285
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7248
7286
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7250
7288
"may optionally be followed by '=' and the review type. For example:"
7251
7289
msgstr ""
7252
7290
7253
#: bzrlib/plugins/launchpad/__init__.py:332
7291
#: bzrlib/plugins/launchpad/cmds.py:286
7254
7292
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7255
7293
msgstr ""
7256
7294
7257
#: bzrlib/plugins/launchpad/__init__.py:334
7295
#: bzrlib/plugins/launchpad/cmds.py:288
7258
7296
msgid ""
7259
7297
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7260
7298
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7261
7299
msgstr ""
7262
7300
7263
#: bzrlib/plugins/launchpad/__init__.py:339
7301
#: bzrlib/plugins/launchpad/cmds.py:293
7264
7302
msgid "Propose the merge on staging."
7265
7303
msgstr ""
7266
7304
7267
#: bzrlib/plugins/launchpad/__init__.py:341
7305
#: bzrlib/plugins/launchpad/cmds.py:295
7268
7306
msgid "Commit message."
7269
7307
msgstr ""
7270
7308
7271
#: bzrlib/plugins/launchpad/__init__.py:343
7309
#: bzrlib/plugins/launchpad/cmds.py:297
7272
7310
msgid "Mark the proposal as approved immediately."
7273
7311
msgstr ""
7274
7312
7275
#: bzrlib/plugins/launchpad/__init__.py:345
7313
#: bzrlib/plugins/launchpad/cmds.py:298
7314
msgid "The bug this proposal fixes."
7315
msgstr ""
7316
7317
#: bzrlib/plugins/launchpad/cmds.py:300
7276
7318
msgid "Requested reviewer and optional type."
7277
7319
msgstr ""
7278
7320
7279
#: bzrlib/plugins/launchpad/__init__.py:382
7321
#: bzrlib/plugins/launchpad/cmds.py:335
7280
7322
msgid "Find the proposal to merge this revision."
7281
7323
msgstr ""
7282
7324
7283
#: bzrlib/plugins/launchpad/__init__.py:384
7325
#: bzrlib/plugins/launchpad/cmds.py:337
7284
7326
msgid ""
7285
7327
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7286
7328
"This works only if the selected branch was the merge proposal target, and\n"
7288
7330
"are opened in a web browser."
7289
7331
msgstr ""
7290
7332
7291
#: bzrlib/plugins/launchpad/__init__.py:389
7333
#: bzrlib/plugins/launchpad/cmds.py:342
7292
7334
msgid ""
7293
7335
"Any revision involved in the merge may be specified-- the revision in\n"
7294
7336
"which the merge was performed, or one of the revisions that was merged."
7295
7337
msgstr ""
7296
7338
7297
#: bzrlib/plugins/launchpad/__init__.py:392
7339
#: bzrlib/plugins/launchpad/cmds.py:345
7298
7340
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7299
7341
msgstr ""
7300
7342
7301
#: bzrlib/plugins/launchpad/__init__.py:394
7343
#: bzrlib/plugins/launchpad/cmds.py:347
7302
7344
msgid " bzr lp-find-proposal -r annotate:README:1"
7303
7345
msgstr ""
7304
7346
7305
#: bzrlib/plugins/launchpad/__init__.py:409
7347
#: bzrlib/plugins/launchpad/cmds.py:363
7306
7348
msgid "No review found."
7307
7349
msgstr ""
7308
7350
7309
#: bzrlib/plugins/launchpad/__init__.py:410
7351
#: bzrlib/plugins/launchpad/cmds.py:364
7310
7352
#, python-format
7311
7353
msgid "%d proposals(s) found."
7312
7354
msgstr ""
7313
7355
7314
#: bzrlib/plugins/launchpad/__init__.py:420
7356
#: bzrlib/plugins/launchpad/cmds.py:374
7315
7357
msgid "Finding revision-id"
7316
7358
msgstr ""
7317
7359
7318
#: bzrlib/plugins/launchpad/__init__.py:427
7360
#: bzrlib/plugins/launchpad/cmds.py:381
7319
7361
msgid "Finding merge"
7320
7362
msgstr ""
7321
7363
7322
#: bzrlib/plugins/launchpad/__init__.py:432
7364
#: bzrlib/plugins/launchpad/cmds.py:386
7323
7365
msgid "Finding revno"
7324
7366
msgstr ""
7325
7367
7326
#: bzrlib/plugins/launchpad/__init__.py:437
7368
#: bzrlib/plugins/launchpad/cmds.py:392
7327
7369
msgid "Finding Launchpad branch"
7328
7370
msgstr ""
7329
7371
7330
#: bzrlib/plugins/launchpad/__init__.py:440
7372
#: bzrlib/plugins/launchpad/cmds.py:395
7331
7373
msgid "Finding proposals"
7332
7374
msgstr ""
7333
7375
7334
#: bzrlib/plugins/launchpad/account.py:66
7335
msgid "Setting ssh/sftp usernames for launchpad.net."
7336
msgstr ""
7337
7338
7376
#: bzrlib/plugins/launchpad/lp_api.py:241
7339
7377
#: bzrlib/plugins/launchpad/lp_api.py:246
7340
7378
#, python-format
7378
7416
" remote: {2}"
7379
7417
msgstr ""
7380
7418
7381
#: bzrlib/plugins/launchpad/lp_propose.py:149
7419
#: bzrlib/plugins/launchpad/lp_propose.py:150
7382
7420
#, python-format
7383
7421
msgid "There is already a branch merge proposal: %s"
7384
7422
msgstr ""
7385
7423
7386
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7424
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7387
7425
msgid "pb parameter to convert() is deprecated"
7388
7426
msgstr ""
7389
7427
7390
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7428
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7391
7429
msgid "starting upgrade from format 4 to 5"
7392
7430
msgstr ""
7393
7431
7394
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7432
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7395
7433
msgid "note: upgrade may be faster if all store files are ungzipped first"
7396
7434
msgstr ""
7397
7435
7398
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7436
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7399
7437
msgid "converting revision"
7400
7438
msgstr ""
7401
7439
7402
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7440
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7403
7441
msgid "upgraded to weaves:"
7404
7442
msgstr ""
7405
7443
7406
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7444
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7407
7445
#, python-format
7408
7446
msgid "%6d revisions and inventories"
7409
7447
msgstr ""
7410
7448
7411
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7449
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7412
7450
#, python-format
7413
7451
msgid "%6d revisions not present"
7414
7452
msgstr ""
7415
7453
7416
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7454
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7417
7455
#, python-format
7418
7456
msgid "%6d texts"
7419
7457
msgstr ""
7420
7458
7421
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7459
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7422
7460
msgid "writing weave"
7423
7461
msgstr ""
7424
7462
7425
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7426
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7463
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7464
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7427
7465
msgid "inventory"
7428
7466
msgstr ""
7429
7467
7430
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7468
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7431
7469
msgid "write revision"
7432
7470
msgstr ""
7433
7471
7434
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7472
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7435
7473
msgid "loading revision"
7436
7474
msgstr ""
7437
7475
7438
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7476
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7439
7477
#, python-format
7440
7478
msgid "revision {%s} not present in branch; will be converted as a ghost"
7441
7479
msgstr ""
7442
7480
7443
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7481
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7444
7482
msgid "starting upgrade from format 5 to 6"
7445
7483
msgstr ""
7446
7484
7447
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7485
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7448
7486
#, python-format
7449
7487
msgid "adding prefixes to %s"
7450
7488
msgstr ""
7451
7489
7452
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7490
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7453
7491
msgid "starting upgrade from format 6 to metadir"
7454
7492
msgstr ""
7455
7493
7456
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7494
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7457
7495
msgid "Removing ancestry.weave"
7458
7496
msgstr ""
7459
7497
7460
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7498
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7461
7499
msgid "Finding branch files"
7462
7500
msgstr ""
7463
7501
7464
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7502
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7465
7503
msgid "Upgrading repository"
7466
7504
msgstr ""
7467
7505
7468
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7506
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7469
7507
msgid "Upgrading branch"
7470
7508
msgstr ""
7471
7509
7472
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7510
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7473
7511
msgid "No working tree."
7474
7512
msgstr ""
7475
7513
7476
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7514
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7477
7515
msgid "Upgrading working tree"
7478
7516
msgstr ""
7479
7517
7480
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7518
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7481
7519
#, python-format
7482
7520
msgid "Make %s lock"
7483
7521
msgstr ""
7484
7522
7485
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7523
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7486
7524
#, python-format
7487
7525
msgid "Moving %s"
7488
7526
msgstr ""
7509
7547
msgid "Too many redirections trying to make %s."
7510
7548
msgstr ""
7511
7549
7512
#: bzrlib/push.py:147
7550
#: bzrlib/push.py:148
7513
7551
msgid ""
7514
7552
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7515
7553
"information."
7516
7554
msgstr ""
7517
7555
7518
#: bzrlib/push.py:151
7556
#: bzrlib/push.py:152
7519
7557
#, python-format
7520
7558
msgid ""
7521
7559
"It is not possible to losslessly push to %s. You may want to use dpush "
7522
7560
"instead."
7523
7561
msgstr ""
7524
7562
7525
#: bzrlib/push.py:157
7563
#: bzrlib/push.py:158
7526
7564
#, python-format
7527
7565
msgid ""
7528
7566
"At %s you have a valid .bzr control directory, but not a branch or "
7623
7661
msgid "bzr: ERROR (ignored): %s"
7624
7662
msgstr ""
7625
7663
7626
#: bzrlib/remote.py:2541
7664
#: bzrlib/remote.py:2534
7627
7665
msgid "Copying repository content as tarball..."
7628
7666
msgstr ""
7629
7667
7639
7677
msgid "{0} => {1}"
7640
7678
msgstr ""
7641
7679
7642
#: bzrlib/repository.py:1787
7680
#: bzrlib/repository.py:1738
7643
7681
msgid "Moving repository to repository.backup"
7644
7682
msgstr ""
7645
7683
7646
#: bzrlib/repository.py:1794
7684
#: bzrlib/repository.py:1745
7647
7685
msgid "Creating new repository"
7648
7686
msgstr ""
7649
7687
7650
#: bzrlib/repository.py:1799
7688
#: bzrlib/repository.py:1750
7651
7689
msgid "Copying content"
7652
7690
msgstr ""
7653
7691
7654
#: bzrlib/repository.py:1803
7692
#: bzrlib/repository.py:1754
7655
7693
msgid "Deleting old repository content"
7656
7694
msgstr ""
7657
7695
7658
#: bzrlib/repository.py:1805
7696
#: bzrlib/repository.py:1756
7659
7697
msgid "repository converted"
7660
7698
msgstr ""
7661
7699
7663
7701
msgid "Using {0} {1}"
7664
7702
msgstr ""
7665
7703
7666
#: bzrlib/send.py:58
7704
#: bzrlib/send.py:59
7667
7705
#, python-format
7668
7706
msgid "Mail client \"%s\" does not support specifying body"
7669
7707
msgstr ""
7670
7708
7671
#: bzrlib/send.py:62
7709
#: bzrlib/send.py:63
7672
7710
msgid "--remember requires a branch to be specified."
7673
7711
msgstr ""
7674
7712
7675
#: bzrlib/send.py:77
7713
#: bzrlib/send.py:78
7676
7714
msgid "No submit branch known or specified"
7677
7715
msgstr ""
7678
7716
7679
#: bzrlib/send.py:80
7717
#: bzrlib/send.py:81
7680
7718
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7681
7719
msgstr ""
7682
7720
7683
#: bzrlib/send.py:98
7721
#: bzrlib/send.py:99
7684
7722
#, python-format
7685
7723
msgid "No such send format '%s'."
7686
7724
msgstr ""
7687
7725
7688
#: bzrlib/send.py:114
7726
#: bzrlib/send.py:115
7689
7727
msgid "bzr send takes at most two one revision identifiers"
7690
7728
msgstr ""
7691
7729
7692
#: bzrlib/send.py:127
7730
#: bzrlib/send.py:128
7693
7731
msgid "No revisions to submit."
7694
7732
msgstr ""
7695
7733
7696
#: bzrlib/send.py:139
7734
#: bzrlib/send.py:140
7697
7735
msgid ""
7698
7736
"- not supported for merge directives that use more than one output file."
7699
7737
msgstr ""
7700
7738
7701
#: bzrlib/send.py:185
7739
#: bzrlib/send.py:186
7702
7740
msgid "Format 0.9 does not permit bundle with no patch"
7703
7741
msgstr ""
7704
7742
7855
7893
"anyway, use --force."
7856
7894
msgstr ""
7857
7895
7858
#: bzrlib/switch.py:125
7896
#: bzrlib/switch.py:129
7859
7897
msgid "Cannot switch a branch, only a checkout."
7860
7898
msgstr ""
7861
7899
7862
#: bzrlib/switch.py:163
7900
#: bzrlib/switch.py:167
7863
7901
#, python-format
7864
7902
msgid "Tree is up to date at revision %d."
7865
7903
msgstr ""
7866
7904
7867
#: bzrlib/switch.py:169
7905
#: bzrlib/switch.py:173
7868
7906
#, python-format
7869
7907
msgid "Updated to revision %d."
7870
7908
msgstr ""
7871
7909
7872
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7910
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7873
7911
msgid "Apply phase"
7874
7912
msgstr ""
7875
7913
7876
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7914
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7877
7915
msgid "removing file"
7878
7916
msgstr ""
7879
7917
7880
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7918
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7881
7919
msgid "adding file"
7882
7920
msgstr ""
7883
7921
7884
#: bzrlib/transform.py:2591
7922
#: bzrlib/transform.py:2598
7885
7923
msgid "Building tree"
7886
7924
msgstr ""
7887
7925
7888
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7926
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7889
7927
msgid "Adding file contents"
7890
7928
msgstr ""
7891
7929
7892
#: bzrlib/transform.py:3028
7930
#: bzrlib/transform.py:3017
7893
7931
msgid "Resolution pass"
7894
7932
msgstr ""
7895
7933
7898
7936
msgid "Authenticated as %s"
7899
7937
msgstr ""
7900
7938
7901
#: bzrlib/tree.py:634
7939
#: bzrlib/tree.py:647
7902
7940
msgid "*** {0} content-filter: {1} => {2!r}"
7903
7941
msgstr ""
7904
7942
7957
7995
msgid "failed to clean-up {0}: {1}"
7958
7996
msgstr ""
7959
7997
7960
#: bzrlib/vf_repository.py:1090
7998
#: bzrlib/vf_repository.py:1091
7961
7999
msgid "inventories"
7962
8000
msgstr ""
7963
8001
7964
#: bzrlib/vf_repository.py:1116
8002
#: bzrlib/vf_repository.py:1117
7965
8003
msgid "texts"
7966
8004
msgstr ""
7967
8005
7968
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
8006
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7969
8007
msgid "Calculating text parents"
7970
8008
msgstr ""
7971
8009
7972
#: bzrlib/vf_repository.py:1706
8010
#: bzrlib/vf_repository.py:1707
7973
8011
msgid "Fetch texts"
7974
8012
msgstr ""
7975
8013
7976
#: bzrlib/vf_repository.py:2535
8014
#: bzrlib/vf_repository.py:2536
7977
8015
msgid "loading text store"
7978
8016
msgstr ""
7979
8017
7980
#: bzrlib/vf_repository.py:2541
8018
#: bzrlib/vf_repository.py:2542
7981
8019
msgid "checking text graph"
7982
8020
msgstr ""
7983
8021
7984
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7985
#: bzrlib/vf_repository.py:3124
8022
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
8023
#: bzrlib/vf_repository.py:3127
7986
8024
msgid "Transferring revisions"
7987
8025
msgstr ""
7988
8026
8028
8066
msgid "PageFaultCount %8d"
8029
8067
msgstr ""
8030
8068
8031
#: bzrlib/workingtree.py:1478
8069
#: bzrlib/workingtree.py:1482
8032
8070
msgid "Rerun update after fixing the conflicts."
8033
8071
msgstr ""
8034
8072
8038
8076
8039
8077
#: dummy/help_topics/basic/detail.txt:1
8040
8078
msgid ""
8041
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
8079
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
8042
8080
"http://bazaar.canonical.com/"
8043
8081
msgstr ""
8044
8082
8356
8394
msgid "How to fix diverged branches"
8357
8395
msgstr ""
8358
8396
8359
#: dummy/help_topics/env-variables/detail.txt:1
8360
msgid "Environment Variables"
8361
msgstr ""
8362
8363
#: dummy/help_topics/env-variables/detail.txt:3
8364
msgid ""
8365
"=================== "
8366
"===========================================================\n"
8367
"BZRPATH Path where bzr is to look for shell plugin external\n"
8368
" commands.\n"
8369
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8370
"EMAIL E-Mail address of the user.\n"
8371
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8372
"EDITOR Editor for editing commit messages.\n"
8373
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8374
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8375
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8376
"BZR_PLUGIN_PATH.\n"
8377
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8378
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8379
"and\n"
8380
" HOME.\n"
8381
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8382
"URLs).\n"
8383
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8384
"sshcorp,\n"
8385
" plink or lsh.\n"
8386
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8387
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8388
"BZR_COLUMNS Override implicit terminal width.\n"
8389
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8390
"(selftest)\n"
8391
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8392
"'text'.\n"
8393
"BZR_PDB Control whether to launch a debugger on error.\n"
8394
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8395
" breakin debugger.\n"
8396
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8397
"(instead\n"
8398
" of char-based).\n"
8399
"=================== "
8400
"===========================================================\n"
8401
msgstr ""
8402
8403
8397
#: dummy/help_topics/env-variables/summary.txt:1
8404
8398
msgid "Environment variable names and values"
8405
8399
msgstr ""
9403
9397
msgid " bzr commit --fixes <tracker>:<id>"
9404
9398
msgstr ""
9405
9399
9406
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9400
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9407
9401
msgid "or::"
9408
9402
msgstr ""
9409
9403
9638
9632
"remove-tree Remove the working tree from a given branch/checkout.\n"
9639
9633
"renames Show list of renamed files.\n"
9640
9634
"resolve Mark a conflict as resolved.\n"
9641
"revert Revert files to a previous revision.\n"
9635
"revert Set files in the working tree back to the contents of a\n"
9636
" previous revision.\n"
9642
9637
"revno Show current revision number.\n"
9643
9638
"root Show the tree root directory.\n"
9644
9639
"send Mail or create a merge-directive for submitting changes.\n"
10296
10291
10297
10292
#: en/help_topics/configuration.txt:336
10298
10293
msgid ""
10294
"Another such option is ``branchname``, which refers to the name of a "
10295
"colocated\n"
10296
"branch. For non-colocated branches, it behaves like basename. It can be "
10297
"used\n"
10298
"like this::"
10299
msgstr ""
10300
10301
#: en/help_topics/configuration.txt:340
10302
msgid ""
10303
" [/home/vila/src/bzr/bugs]\n"
10304
" mypush = lp:~vila/bzr/{branchname}"
10305
msgstr ""
10306
10307
#: en/help_topics/configuration.txt:343
10308
msgid ""
10309
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10310
"get::"
10311
msgstr ""
10312
10313
#: en/help_topics/configuration.txt:345
10314
msgid ""
10315
" bzr config mypush\n"
10316
" lp:~vila/bzr/832013-expand-in-stack"
10317
msgstr ""
10318
10319
#: en/help_topics/configuration.txt:348
10320
msgid ""
10299
10321
"When an option is local to a Section, it cannot be referred to from option\n"
10300
10322
"values in any other section from the same ``Store`` nor from any other\n"
10301
10323
"``Store``."
10302
10324
msgstr ""
10303
10325
10304
#: en/help_topics/configuration.txt:340
10326
#: en/help_topics/configuration.txt:352
10305
10327
msgid ""
10306
10328
"\n"
10307
10329
"The main configuration file, bazaar.conf\n"
10308
10330
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10309
10331
msgstr ""
10310
10332
10311
#: en/help_topics/configuration.txt:344
10333
#: en/help_topics/configuration.txt:356
10312
10334
msgid ""
10313
10335
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10314
10336
"The default section contains the default\n"
10316
10338
"overriden by providing a branch-specific section in ``locations.conf``."
10317
10339
msgstr ""
10318
10340
10319
#: en/help_topics/configuration.txt:349
10341
#: en/help_topics/configuration.txt:361
10320
10342
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10321
10343
msgstr ""
10322
10344
10323
#: en/help_topics/configuration.txt:351
10345
#: en/help_topics/configuration.txt:363
10324
10346
msgid ""
10325
10347
" [DEFAULT]\n"
10326
10348
" email = John Doe <jdoe@isp.com>\n"
10328
10350
" create_signatures = when-required"
10329
10351
msgstr ""
10330
10352
10331
#: en/help_topics/configuration.txt:356
10353
#: en/help_topics/configuration.txt:368
10332
10354
msgid ""
10333
10355
"\n"
10334
10356
"The branch location configuration file, locations.conf\n"
10335
10357
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10336
10358
msgstr ""
10337
10359
10338
#: en/help_topics/configuration.txt:360
10360
#: en/help_topics/configuration.txt:372
10339
10361
msgid ""
10340
10362
"``locations.conf`` allows one to specify overriding settings for\n"
10341
10363
"a specific branch. The format is almost identical to the default section in\n"
10345
10367
"for. The '?' and '*' wildcards are supported::"
10346
10368
msgstr ""
10347
10369
10348
#: en/help_topics/configuration.txt:366
10370
#: en/help_topics/configuration.txt:378
10349
10371
msgid ""
10350
10372
" [/home/jdoe/branches/nethack]\n"
10351
10373
" email = Nethack Admin <nethack@nethack.com>"
10352
10374
msgstr ""
10353
10375
10354
#: en/help_topics/configuration.txt:369
10376
#: en/help_topics/configuration.txt:381
10355
10377
msgid ""
10356
10378
" [http://hypothetical.site.com/branches/devel-branch]\n"
10357
10379
" create_signatures = always"
10358
10380
msgstr ""
10359
10381
10360
#: en/help_topics/configuration.txt:372
10382
#: en/help_topics/configuration.txt:384
10361
10383
msgid ""
10362
10384
"The authentication configuration file, authentication.conf\n"
10363
10385
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10364
10386
msgstr ""
10365
10387
10366
#: en/help_topics/configuration.txt:375
10388
#: en/help_topics/configuration.txt:387
10367
10389
msgid ""
10368
10390
"``authentication.conf`` allows one to specify credentials for\n"
10369
10391
"remote servers. This can be used for all the supported transports and any "
10371
10393
"of bzr that requires authentication (smtp for example)."
10372
10394
msgstr ""
10373
10395
10374
#: en/help_topics/configuration.txt:379
10396
#: en/help_topics/configuration.txt:391
10375
10397
msgid ""
10376
10398
"The syntax of the file obeys the same rules as the others except for the\n"
10377
10399
"option policies which don't apply."
10378
10400
msgstr ""
10379
10401
10380
#: en/help_topics/configuration.txt:382
10402
#: en/help_topics/configuration.txt:394
10381
10403
msgid ""
10382
10404
"For more information on the possible uses of the authentication "
10383
10405
"configuration\n"
10384
10406
"file see :doc:`authentication-help`."
10385
10407
msgstr ""
10386
10408
10387
#: en/help_topics/configuration.txt:385
10409
#: en/help_topics/configuration.txt:397
10388
10410
msgid ""
10389
10411
"\n"
10390
10412
"Common options\n"
10391
10413
"--------------"
10392
10414
msgstr ""
10393
10415
10394
#: en/help_topics/configuration.txt:389
10416
#: en/help_topics/configuration.txt:401
10395
10417
msgid ""
10396
10418
"debug_flags\n"
10397
10419
"~~~~~~~~~~~"
10398
10420
msgstr ""
10399
10421
10400
#: en/help_topics/configuration.txt:392
10422
#: en/help_topics/configuration.txt:404
10401
10423
msgid ""
10402
10424
"A comma-separated list of debugging options to turn on. The same values\n"
10403
10425
"can be used as with the -D command-line option (see `help global-options`).\n"
10404
10426
"For example::"
10405
10427
msgstr ""
10406
10428
10407
#: en/help_topics/configuration.txt:396
10429
#: en/help_topics/configuration.txt:408
10408
10430
msgid " debug_flags = hpss"
10409
10431
msgstr ""
10410
10432
10411
#: en/help_topics/configuration.txt:400
10433
#: en/help_topics/configuration.txt:412
10412
10434
msgid " debug_flags = hpss,evil"
10413
10435
msgstr ""
10414
10436
10415
#: en/help_topics/configuration.txt:402
10437
#: en/help_topics/configuration.txt:414
10416
10438
msgid ""
10417
10439
"email\n"
10418
10440
"~~~~~"
10419
10441
msgstr ""
10420
10442
10421
#: en/help_topics/configuration.txt:405
10443
#: en/help_topics/configuration.txt:417
10422
10444
msgid ""
10423
10445
"The email address to use when committing a branch. Typically takes the form\n"
10424
10446
"of::"
10425
10447
msgstr ""
10426
10448
10427
#: en/help_topics/configuration.txt:408
10449
#: en/help_topics/configuration.txt:420
10428
10450
msgid " email = Full Name <account@hostname.tld>"
10429
10451
msgstr ""
10430
10452
10431
#: en/help_topics/configuration.txt:410
10453
#: en/help_topics/configuration.txt:422
10432
10454
msgid ""
10433
10455
"editor\n"
10434
10456
"~~~~~~"
10435
10457
msgstr ""
10436
10458
10437
#: en/help_topics/configuration.txt:413
10459
#: en/help_topics/configuration.txt:425
10438
10460
msgid ""
10439
10461
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10440
10462
"a commit message. This setting is trumped by the environment variable\n"
10442
10464
"variables."
10443
10465
msgstr ""
10444
10466
10445
#: en/help_topics/configuration.txt:418
10467
#: en/help_topics/configuration.txt:430
10446
10468
msgid ""
10447
10469
"log_format\n"
10448
10470
"~~~~~~~~~~"
10449
10471
msgstr ""
10450
10472
10451
#: en/help_topics/configuration.txt:421
10473
#: en/help_topics/configuration.txt:433
10452
10474
msgid ""
10453
10475
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10454
10476
"and ``line``. Additional formats may be provided by plugins. The default\n"
10455
10477
"value is ``long``."
10456
10478
msgstr ""
10457
10479
10458
#: en/help_topics/configuration.txt:425
10480
#: en/help_topics/configuration.txt:437
10459
10481
msgid ""
10460
10482
"check_signatures\n"
10461
10483
"~~~~~~~~~~~~~~~~"
10462
10484
msgstr ""
10463
10485
10464
#: en/help_topics/configuration.txt:428
10486
#: en/help_topics/configuration.txt:440
10465
10487
msgid ""
10466
10488
"Reserved for future use. These options will allow a policy for branches to\n"
10467
10489
"require signatures."
10468
10490
msgstr ""
10469
10491
10470
#: en/help_topics/configuration.txt:431
10492
#: en/help_topics/configuration.txt:443
10471
10493
msgid ""
10472
10494
"require\n"
10473
10495
" The gnupg signature for revisions must be present and must be valid."
10474
10496
msgstr ""
10475
10497
10476
#: en/help_topics/configuration.txt:434
10498
#: en/help_topics/configuration.txt:446
10477
10499
msgid ""
10478
10500
"ignore\n"
10479
10501
" Do not check gnupg signatures of revisions."
10480
10502
msgstr ""
10481
10503
10482
#: en/help_topics/configuration.txt:437
10504
#: en/help_topics/configuration.txt:449
10483
10505
msgid ""
10484
10506
"check-available\n"
10485
10507
" (default) If gnupg signatures for revisions are present, check them.\n"
10487
10509
" no signature is present."
10488
10510
msgstr ""
10489
10511
10490
#: en/help_topics/configuration.txt:442
10512
#: en/help_topics/configuration.txt:454
10491
10513
msgid ""
10492
10514
"create_signatures\n"
10493
10515
"~~~~~~~~~~~~~~~~~"
10494
10516
msgstr ""
10495
10517
10496
#: en/help_topics/configuration.txt:445
10518
#: en/help_topics/configuration.txt:457
10497
10519
msgid ""
10498
10520
"Defines the behaviour of signing revisions on commits. By default bzr will "
10499
10521
"not\n"
10500
10522
"sign new commits."
10501
10523
msgstr ""
10502
10524
10503
#: en/help_topics/configuration.txt:448
10525
#: en/help_topics/configuration.txt:460
10504
10526
msgid ""
10505
10527
"always\n"
10506
10528
" Sign every new revision that is committed. If the signing fails then "
10508
10530
" commit will not be made."
10509
10531
msgstr ""
10510
10532
10511
#: en/help_topics/configuration.txt:452
10533
#: en/help_topics/configuration.txt:464
10512
10534
msgid ""
10513
10535
"when-required\n"
10514
10536
" Reserved for future use."
10515
10537
msgstr ""
10516
10538
10517
#: en/help_topics/configuration.txt:455
10539
#: en/help_topics/configuration.txt:467
10518
10540
msgid ""
10519
10541
"never\n"
10520
10542
" Reserved for future use."
10521
10543
msgstr ""
10522
10544
10523
#: en/help_topics/configuration.txt:458
10545
#: en/help_topics/configuration.txt:470
10524
10546
msgid ""
10525
10547
"In future it is planned that ``when-required`` will sign newly\n"
10526
10548
"committed revisions only when the branch requires them. ``never`` will "
10528
10550
"to sign newly committed revisions, even if the branch requires signatures."
10529
10551
msgstr ""
10530
10552
10531
#: en/help_topics/configuration.txt:462
10553
#: en/help_topics/configuration.txt:474
10532
10554
msgid ""
10533
10555
"dirstate.fdatasync\n"
10534
10556
"~~~~~~~~~~~~~~~~~~"
10535
10557
msgstr ""
10536
10558
10537
#: en/help_topics/configuration.txt:465
10559
#: en/help_topics/configuration.txt:477
10538
10560
msgid ""
10539
10561
"If true (default), working tree metadata changes are flushed through the\n"
10540
10562
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10541
10563
"should not be lost if the machine crashes. See also repository.fdatasync."
10542
10564
msgstr ""
10543
10565
10544
#: en/help_topics/configuration.txt:469
10566
#: en/help_topics/configuration.txt:481
10545
10567
msgid ""
10546
10568
"gpg_signing_key\n"
10547
10569
"~~~~~~~~~~~~~~~"
10548
10570
msgstr ""
10549
10571
10550
#: en/help_topics/configuration.txt:472
10572
#: en/help_topics/configuration.txt:484
10551
10573
msgid ""
10552
10574
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10553
10575
"address, key fingerprint or full key ID. When unset or when set to\n"
10554
10576
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10555
10577
msgstr ""
10556
10578
10557
#: en/help_topics/configuration.txt:476
10579
#: en/help_topics/configuration.txt:488
10558
10580
msgid ""
10559
10581
"recurse\n"
10560
10582
"~~~~~~~"
10561
10583
msgstr ""
10562
10584
10563
#: en/help_topics/configuration.txt:479
10585
#: en/help_topics/configuration.txt:491
10564
10586
msgid ""
10565
10587
"Only useful in ``locations.conf``. Defines whether or not the\n"
10566
10588
"configuration for this section applies to subdirectories:"
10567
10589
msgstr ""
10568
10590
10569
#: en/help_topics/configuration.txt:482
10591
#: en/help_topics/configuration.txt:494
10570
10592
msgid ""
10571
10593
"true\n"
10572
10594
" (default) This section applies to subdirectories as well."
10573
10595
msgstr ""
10574
10596
10575
#: en/help_topics/configuration.txt:485
10597
#: en/help_topics/configuration.txt:497
10576
10598
msgid ""
10577
10599
"false\n"
10578
10600
" This section only applies to the branch at this directory and not\n"
10579
10601
" branches below it."
10580
10602
msgstr ""
10581
10603
10582
#: en/help_topics/configuration.txt:489
10604
#: en/help_topics/configuration.txt:501
10583
10605
msgid ""
10584
10606
"gpg_signing_command\n"
10585
10607
"~~~~~~~~~~~~~~~~~~~"
10586
10608
msgstr ""
10587
10609
10588
#: en/help_topics/configuration.txt:492
10610
#: en/help_topics/configuration.txt:504
10589
10611
msgid ""
10590
10612
"(Default: \"gpg\"). Which program should be used to sign and check "
10591
10613
"revisions.\n"
10592
10614
"For example::"
10593
10615
msgstr ""
10594
10616
10595
#: en/help_topics/configuration.txt:495
10617
#: en/help_topics/configuration.txt:507
10596
10618
msgid " gpg_signing_command = /usr/bin/gnpg"
10597
10619
msgstr ""
10598
10620
10599
#: en/help_topics/configuration.txt:497
10621
#: en/help_topics/configuration.txt:509
10600
10622
msgid ""
10601
10623
"The specified command must accept the options \"--clearsign\" and \"-u "
10602
10624
"<email>\"."
10603
10625
msgstr ""
10604
10626
10605
#: en/help_topics/configuration.txt:499
10627
#: en/help_topics/configuration.txt:511
10606
10628
msgid ""
10607
10629
"bzr_remote_path\n"
10608
10630
"~~~~~~~~~~~~~~~"
10609
10631
msgstr ""
10610
10632
10611
#: en/help_topics/configuration.txt:502
10633
#: en/help_topics/configuration.txt:514
10612
10634
msgid ""
10613
10635
"(Default: \"bzr\"). The path to the command that should be used to run the "
10614
10636
"smart\n"
10615
10637
"server for bzr. This value may only be specified in locations.conf, because:"
10616
10638
msgstr ""
10617
10639
10618
#: en/help_topics/configuration.txt:505
10640
#: en/help_topics/configuration.txt:517
10619
10641
msgid ""
10620
10642
"- it's needed before branch.conf is accessible\n"
10621
10643
"- allowing remote branch.conf files to specify commands would be a security\n"
10622
10644
" risk"
10623
10645
msgstr ""
10624
10646
10625
#: en/help_topics/configuration.txt:509
10647
#: en/help_topics/configuration.txt:521
10626
10648
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10627
10649
msgstr ""
10628
10650
10629
#: en/help_topics/configuration.txt:511
10651
#: en/help_topics/configuration.txt:523
10630
10652
msgid ""
10631
10653
"smtp_server\n"
10632
10654
"~~~~~~~~~~~"
10633
10655
msgstr ""
10634
10656
10635
#: en/help_topics/configuration.txt:514
10657
#: en/help_topics/configuration.txt:526
10636
10658
msgid ""
10637
10659
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10638
10660
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10639
10661
msgstr ""
10640
10662
10641
#: en/help_topics/configuration.txt:517
10663
#: en/help_topics/configuration.txt:529
10642
10664
msgid ""
10643
10665
"smtp_username, smtp_password\n"
10644
10666
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10645
10667
msgstr ""
10646
10668
10647
#: en/help_topics/configuration.txt:520
10669
#: en/help_topics/configuration.txt:532
10648
10670
msgid ""
10649
10671
"User and password to authenticate to the SMTP server. If smtp_username\n"
10650
10672
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10652
10674
"to send mail."
10653
10675
msgstr ""
10654
10676
10655
#: en/help_topics/configuration.txt:525
10677
#: en/help_topics/configuration.txt:537
10656
10678
msgid ""
10657
10679
"locks.steal_dead\n"
10658
10680
"~~~~~~~~~~~~~~~~"
10659
10681
msgstr ""
10660
10682
10661
#: en/help_topics/configuration.txt:528
10683
#: en/help_topics/configuration.txt:540
10662
10684
msgid ""
10663
10685
"If set to true, bzr will automatically break locks held by processes from\n"
10664
10686
"the same machine and user that are no longer alive. Otherwise, it will\n"
10666
10688
"the object is no longer in use."
10667
10689
msgstr ""
10668
10690
10669
#: en/help_topics/configuration.txt:533
10691
#: en/help_topics/configuration.txt:545
10670
10692
msgid ""
10671
10693
"mail_client\n"
10672
10694
"~~~~~~~~~~~"
10673
10695
msgstr ""
10674
10696
10675
#: en/help_topics/configuration.txt:536
10697
#: en/help_topics/configuration.txt:548
10676
10698
msgid ""
10677
10699
"A mail client to use for sending merge requests.\n"
10678
10700
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10681
10703
"``editor``."
10682
10704
msgstr ""
10683
10705
10684
#: en/help_topics/configuration.txt:541
10706
#: en/help_topics/configuration.txt:553
10685
10707
msgid "Supported values for specific clients:"
10686
10708
msgstr ""
10687
10709
10688
#: en/help_topics/configuration.txt:543
10710
#: en/help_topics/configuration.txt:555
10689
10711
msgid ""
10690
10712
":claws: Use Claws. This skips a dialog for attaching files.\n"
10691
10713
":evolution: Use Evolution.\n"
10696
10718
" this works around some bugs that xdg-email doesn't handle."
10697
10719
msgstr ""
10698
10720
10699
#: en/help_topics/configuration.txt:550
10721
#: en/help_topics/configuration.txt:562
10700
10722
msgid "Supported generic values are:"
10701
10723
msgstr ""
10702
10724
10703
#: en/help_topics/configuration.txt:552
10725
#: en/help_topics/configuration.txt:564
10704
10726
msgid ""
10705
10727
":default: See above.\n"
10706
10728
":editor: Use your editor to compose the merge request. This also uses\n"
10710
10732
":xdg-email: Use xdg-email to run your preferred mail program"
10711
10733
msgstr ""
10712
10734
10713
#: en/help_topics/configuration.txt:559
10735
#: en/help_topics/configuration.txt:571
10714
10736
msgid ""
10715
10737
"repository.fdatasync\n"
10716
10738
"~~~~~~~~~~~~~~~~~~~~"
10717
10739
msgstr ""
10718
10740
10719
#: en/help_topics/configuration.txt:562
10741
#: en/help_topics/configuration.txt:574
10720
10742
msgid ""
10721
10743
"If true (default), repository changes are flushed through the OS buffers\n"
10722
10744
"to physical disk. This is somewhat slower, but means data should not be\n"
10723
10745
"lost if the machine crashes. See also dirstate.fdatasync."
10724
10746
msgstr ""
10725
10747
10726
#: en/help_topics/configuration.txt:566
10748
#: en/help_topics/configuration.txt:578
10727
10749
msgid ""
10728
10750
"submit_branch\n"
10729
10751
"~~~~~~~~~~~~~"
10730
10752
msgstr ""
10731
10753
10732
#: en/help_topics/configuration.txt:569
10754
#: en/help_topics/configuration.txt:581
10733
10755
msgid ""
10734
10756
"The branch you intend to submit your current work to. This is "
10735
10757
"automatically\n"
10738
10760
"should usually be set on a per-branch or per-location basis."
10739
10761
msgstr ""
10740
10762
10741
#: en/help_topics/configuration.txt:573
10763
#: en/help_topics/configuration.txt:585
10742
10764
msgid ""
10743
10765
"public_branch\n"
10744
10766
"~~~~~~~~~~~~~"
10745
10767
msgstr ""
10746
10768
10747
#: en/help_topics/configuration.txt:576
10769
#: en/help_topics/configuration.txt:588
10748
10770
msgid ""
10749
10771
"A publically-accessible version of this branch (implying that this version "
10750
10772
"is\n"
10751
10773
"not publically-accessible). Used (and set) by ``bzr send``."
10752
10774
msgstr ""
10753
10775
10754
#: en/help_topics/configuration.txt:579
10776
#: en/help_topics/configuration.txt:591
10755
10777
msgid ""
10756
10778
"suppress_warnings\n"
10757
10779
"~~~~~~~~~~~~~~~~~"
10758
10780
msgstr ""
10759
10781
10760
#: en/help_topics/configuration.txt:582
10782
#: en/help_topics/configuration.txt:594
10761
10783
msgid ""
10762
10784
"A list of strings, each string represent a warning that can be emitted by\n"
10763
10785
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10764
10786
msgstr ""
10765
10787
10766
#: en/help_topics/configuration.txt:585
10788
#: en/help_topics/configuration.txt:597
10767
10789
msgid "Valid values:"
10768
10790
msgstr ""
10769
10791
10770
#: en/help_topics/configuration.txt:587
10792
#: en/help_topics/configuration.txt:599
10771
10793
msgid ""
10772
10794
"* ``format_deprecation``:\n"
10773
10795
" whether the format deprecation warning is shown on repositories that "
10775
10797
" using deprecated formats."
10776
10798
msgstr ""
10777
10799
10778
#: en/help_topics/configuration.txt:591
10800
#: en/help_topics/configuration.txt:603
10779
10801
msgid ""
10780
10802
"default_format\n"
10781
10803
"~~~~~~~~~~~~~~"
10782
10804
msgstr ""
10783
10805
10784
#: en/help_topics/configuration.txt:594
10806
#: en/help_topics/configuration.txt:606
10785
10807
msgid ""
10786
10808
"A format name for the default format used when creating branches. See "
10787
10809
"``bzr\n"
10788
10810
"help formats`` for possible values."
10789
10811
msgstr ""
10790
10812
10791
#: en/help_topics/configuration.txt:597
10813
#: en/help_topics/configuration.txt:609
10792
10814
msgid ""
10793
10815
"\n"
10794
10816
"Unicode options\n"
10795
10817
"---------------"
10796
10818
msgstr ""
10797
10819
10798
#: en/help_topics/configuration.txt:601
10820
#: en/help_topics/configuration.txt:613
10799
10821
msgid ""
10800
10822
"output_encoding\n"
10801
10823
"~~~~~~~~~~~~~~~"
10802
10824
msgstr ""
10803
10825
10804
#: en/help_topics/configuration.txt:604
10826
#: en/help_topics/configuration.txt:616
10805
10827
msgid ""
10806
10828
"A Python unicode encoding name for text output from bzr, such as log\n"
10807
10829
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10808
10830
"is the terminal encoding prefered by the operating system."
10809
10831
msgstr ""
10810
10832
10811
#: en/help_topics/configuration.txt:608
10833
#: en/help_topics/configuration.txt:620
10812
10834
msgid ""
10813
10835
"\n"
10814
10836
"Branch type specific options\n"
10815
10837
"----------------------------"
10816
10838
msgstr ""
10817
10839
10818
#: en/help_topics/configuration.txt:612
10840
#: en/help_topics/configuration.txt:624
10819
10841
msgid ""
10820
10842
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10821
10843
"later format. They\n"
10823
10845
"manually set in ``locations.conf`` or ``bazaar.conf``."
10824
10846
msgstr ""
10825
10847
10826
#: en/help_topics/configuration.txt:617
10848
#: en/help_topics/configuration.txt:629
10827
10849
msgid ""
10828
10850
"append_revisions_only\n"
10829
10851
"~~~~~~~~~~~~~~~~~~~~~"
10830
10852
msgstr ""
10831
10853
10832
#: en/help_topics/configuration.txt:620
10854
#: en/help_topics/configuration.txt:632
10833
10855
msgid ""
10834
10856
"If set to \"True\" then revisions can only be appended to the log, not\n"
10835
10857
"removed. A branch with this setting enabled can only pull from another\n"
10839
10861
"compatibility with previous bzr versions (older than 2.2)."
10840
10862
msgstr ""
10841
10863
10842
#: en/help_topics/configuration.txt:627
10864
#: en/help_topics/configuration.txt:639
10843
10865
msgid ""
10844
10866
"parent_location\n"
10845
10867
"~~~~~~~~~~~~~~~"
10846
10868
msgstr ""
10847
10869
10848
#: en/help_topics/configuration.txt:630
10870
#: en/help_topics/configuration.txt:642
10849
10871
msgid ""
10850
10872
"If present, the location of the default branch for pull or merge. This "
10851
10873
"option\n"
10853
10875
"--remember``."
10854
10876
msgstr ""
10855
10877
10856
#: en/help_topics/configuration.txt:634
10878
#: en/help_topics/configuration.txt:646
10857
10879
msgid ""
10858
10880
"push_location\n"
10859
10881
"~~~~~~~~~~~~~"
10860
10882
msgstr ""
10861
10883
10862
#: en/help_topics/configuration.txt:637
10884
#: en/help_topics/configuration.txt:649
10863
10885
msgid ""
10864
10886
"If present, the location of the default branch for push. This option\n"
10865
10887
"is normally set by the first ``push`` or ``push --remember``."
10866
10888
msgstr ""
10867
10889
10868
#: en/help_topics/configuration.txt:640
10890
#: en/help_topics/configuration.txt:652
10869
10891
msgid ""
10870
10892
"push_strict\n"
10871
10893
"~~~~~~~~~~~"
10872
10894
msgstr ""
10873
10895
10874
#: en/help_topics/configuration.txt:643
10896
#: en/help_topics/configuration.txt:655
10875
10897
msgid ""
10876
10898
"If present, defines the ``--strict`` option default value for checking\n"
10877
10899
"uncommitted changes before pushing."
10878
10900
msgstr ""
10879
10901
10880
#: en/help_topics/configuration.txt:646
10902
#: en/help_topics/configuration.txt:658
10881
10903
msgid ""
10882
10904
"dpush_strict\n"
10883
10905
"~~~~~~~~~~~~"
10884
10906
msgstr ""
10885
10907
10886
#: en/help_topics/configuration.txt:649
10908
#: en/help_topics/configuration.txt:661
10887
10909
msgid ""
10888
10910
"If present, defines the ``--strict`` option default value for checking\n"
10889
10911
"uncommitted changes before pushing into a different VCS without any\n"
10890
10912
"custom bzr metadata."
10891
10913
msgstr ""
10892
10914
10893
#: en/help_topics/configuration.txt:653
10915
#: en/help_topics/configuration.txt:665
10894
10916
msgid ""
10895
10917
"bound_location\n"
10896
10918
"~~~~~~~~~~~~~~"
10897
10919
msgstr ""
10898
10920
10899
#: en/help_topics/configuration.txt:656
10921
#: en/help_topics/configuration.txt:668
10900
10922
msgid ""
10901
10923
"The location that commits should go to when acting as a checkout.\n"
10902
10924
"This option is normally set by ``bind``."
10903
10925
msgstr ""
10904
10926
10905
#: en/help_topics/configuration.txt:659
10927
#: en/help_topics/configuration.txt:671
10906
10928
msgid ""
10907
10929
"bound\n"
10908
10930
"~~~~~"
10909
10931
msgstr ""
10910
10932
10911
#: en/help_topics/configuration.txt:662
10933
#: en/help_topics/configuration.txt:674
10912
10934
msgid ""
10913
10935
"If set to \"True\", the branch should act as a checkout, and push each "
10914
10936
"commit to\n"
10915
10937
"the bound_location. This option is normally set by ``bind``/``unbind``."
10916
10938
msgstr ""
10917
10939
10918
#: en/help_topics/configuration.txt:665
10940
#: en/help_topics/configuration.txt:677
10919
10941
msgid ""
10920
10942
"send_strict\n"
10921
10943
"~~~~~~~~~~~"
10922
10944
msgstr ""
10923
10945
10924
#: en/help_topics/configuration.txt:668
10946
#: en/help_topics/configuration.txt:680
10925
10947
msgid ""
10926
10948
"If present, defines the ``--strict`` option default value for checking\n"
10927
10949
"uncommitted changes before sending a merge directive."
10928
10950
msgstr ""
10929
10951
10930
#: en/help_topics/configuration.txt:671
10952
#: en/help_topics/configuration.txt:683
10931
10953
msgid ""
10932
10954
"add.maximum_file_size\n"
10933
10955
"~~~~~~~~~~~~~~~~~~~~~"
10934
10956
msgstr ""
10935
10957
10936
#: en/help_topics/configuration.txt:674
10958
#: en/help_topics/configuration.txt:686
10937
10959
msgid ""
10938
10960
"Defines the maximum file size the command line \"add\" operation will allow\n"
10939
10961
"in recursive mode, with files larger than this value being skipped. You may "
10945
10967
"will disable skipping."
10946
10968
msgstr ""
10947
10969
10948
#: en/help_topics/configuration.txt:680
10970
#: en/help_topics/configuration.txt:692
10949
10971
msgid ""
10950
10972
"External Merge Tools\n"
10951
10973
"--------------------"
10952
10974
msgstr ""
10953
10975
10954
#: en/help_topics/configuration.txt:683
10976
#: en/help_topics/configuration.txt:695
10955
10977
msgid ""
10956
10978
"bzr.mergetool.<name>\n"
10957
10979
"~~~~~~~~~~~~~~~~~~~~"
10958
10980
msgstr ""
10959
10981
10960
#: en/help_topics/configuration.txt:686
10982
#: en/help_topics/configuration.txt:698
10961
10983
msgid ""
10962
10984
"Defines an external merge tool called <name> with the given command-line.\n"
10963
10985
"Arguments containing spaces should be quoted using single or double quotes. "
10965
10987
"executable may omit its path if it can be found on the PATH."
10966
10988
msgstr ""
10967
10989
10968
#: en/help_topics/configuration.txt:690
10990
#: en/help_topics/configuration.txt:702
10969
10991
msgid ""
10970
10992
"The following markers can be used in the command-line to substitute "
10971
10993
"filenames\n"
10972
10994
"involved in the merge conflict::"
10973
10995
msgstr ""
10974
10996
10975
#: en/help_topics/configuration.txt:693
10997
#: en/help_topics/configuration.txt:705
10976
10998
msgid ""
10977
10999
" {base} file.BASE\n"
10978
11000
" {this} file.THIS\n"
10983
11005
" succeeds."
10984
11006
msgstr ""
10985
11007
10986
#: en/help_topics/configuration.txt:702
11008
#: en/help_topics/configuration.txt:714
10987
11009
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10988
11010
msgstr ""
10989
11011
10990
#: en/help_topics/configuration.txt:704
11012
#: en/help_topics/configuration.txt:716
10991
11013
msgid ""
10992
11014
"bzr.default_mergetool\n"
10993
11015
"~~~~~~~~~~~~~~~~~~~~~"
10994
11016
msgstr ""
10995
11017
10996
#: en/help_topics/configuration.txt:707
11018
#: en/help_topics/configuration.txt:719
10997
11019
msgid ""
10998
11020
"Specifies which external merge tool (as defined above) should be selected "
10999
11021
"by\n"
11000
11022
"default in tools such as ``bzr qconflicts``."
11001
11023
msgstr ""
11002
11024
11003
#: en/help_topics/configuration.txt:712
11025
#: en/help_topics/configuration.txt:724
11004
11026
msgid " bzr.default_mergetool = kdiff3\n"
11005
11027
msgstr ""
11006
11028
11951
11973
"branch can now be pushed to the mainline.\n"
11952
11974
msgstr ""
11953
11975
11976
#: en/help_topics/env-variables.txt:1
11977
msgid "Environment Variables"
11978
msgstr ""
11979
11980
#: en/help_topics/env-variables.txt:3
11981
msgid ""
11982
"=================== "
11983
"===========================================================\n"
11984
"BZRPATH Path where bzr is to look for shell plugin external\n"
11985
" commands.\n"
11986
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11987
"EMAIL E-Mail address of the user.\n"
11988
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11989
"EDITOR Editor for editing commit messages.\n"
11990
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11991
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11992
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11993
"BZR_PLUGIN_PATH.\n"
11994
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11995
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11996
"and\n"
11997
" HOME.\n"
11998
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11999
"URLs).\n"
12000
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
12001
"sshcorp,\n"
12002
" plink or lsh.\n"
12003
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
12004
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
12005
"BZR_COLUMNS Override implicit terminal width.\n"
12006
"BZR_CONCURRENCY Number of processes that can be run concurrently "
12007
"(selftest)\n"
12008
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
12009
"'text'.\n"
12010
"BZR_PDB Control whether to launch a debugger on error.\n"
12011
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
12012
" breakin debugger.\n"
12013
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
12014
"(instead\n"
12015
" of char-based).\n"
12016
"=================== "
12017
"===========================================================\n"
12018
msgstr ""
12019
11954
12020
#: en/help_topics/eol.txt:1
11955
12021
msgid ""
11956
12022
"End of Line Conversion\n"
12258
12324
msgstr ""
12259
12325
12260
12326
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12261
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
12327
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
12262
12328
msgid "Introduced in: 2.2"
12263
12329
msgstr ""
12264
12330
12276
12342
"~~~~"
12277
12343
msgstr ""
12278
12344
12279
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
12280
#: en/help_topics/hooks.txt:304
12345
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12346
#: en/help_topics/hooks.txt:307
12281
12347
msgid "Introduced in: 1.8"
12282
12348
msgstr ""
12283
12349
12307
12373
"~~~~~~~~~~~~~~~~~~~~~~"
12308
12374
msgstr ""
12309
12375
12310
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
12376
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
12311
12377
msgid "Introduced in: 1.4"
12312
12378
msgstr ""
12313
12379
12319
12385
"uncommit will all trigger this hook."
12320
12386
msgstr ""
12321
12387
12322
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12388
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
12323
12389
msgid ""
12324
12390
"post_commit\n"
12325
12391
"~~~~~~~~~~~"
12327
12393
12328
12394
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12329
12395
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12330
#: en/help_topics/hooks.txt:145
12331
12396
msgid "Introduced in: 0.15"
12332
12397
msgstr ""
12333
12398
12432
12497
12433
12498
#: en/help_topics/hooks.txt:142
12434
12499
msgid ""
12435
"set_rh\n"
12436
"~~~~~~"
12437
msgstr ""
12438
12439
#: en/help_topics/hooks.txt:147
12440
msgid ""
12441
"Invoked whenever the revision history has been set via\n"
12442
"set_revision_history. The api signature is (branch, revision_history),\n"
12443
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12444
"for bzr to trigger, a better hook to use is\n"
12445
"Branch.post_change_branch_tip."
12446
msgstr ""
12447
12448
#: en/help_topics/hooks.txt:153
12449
msgid ""
12450
12500
"transform_fallback_location\n"
12451
12501
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12452
12502
msgstr ""
12453
12503
12454
#: en/help_topics/hooks.txt:156
12504
#: en/help_topics/hooks.txt:145
12455
12505
msgid "Introduced in: 1.9"
12456
12506
msgstr ""
12457
12507
12458
#: en/help_topics/hooks.txt:158
12508
#: en/help_topics/hooks.txt:147
12459
12509
msgid ""
12460
12510
"Called when a stacked branch is activating its fallback locations.\n"
12461
12511
"transform_fallback_location is called with (branch, url), and should\n"
12469
12519
"however undefined."
12470
12520
msgstr ""
12471
12521
12472
#: en/help_topics/hooks.txt:169
12522
#: en/help_topics/hooks.txt:158
12473
12523
msgid ""
12474
12524
"CommandHooks\n"
12475
12525
"------------"
12476
12526
msgstr ""
12477
12527
12478
#: en/help_topics/hooks.txt:172
12528
#: en/help_topics/hooks.txt:161
12479
12529
msgid ""
12480
12530
"extend_command\n"
12481
12531
"~~~~~~~~~~~~~~"
12482
12532
msgstr ""
12483
12533
12484
#: en/help_topics/hooks.txt:175
12534
#: en/help_topics/hooks.txt:164
12485
12535
msgid "Introduced in: 1.13"
12486
12536
msgstr ""
12487
12537
12488
#: en/help_topics/hooks.txt:177
12538
#: en/help_topics/hooks.txt:166
12489
12539
msgid ""
12490
12540
"Called after creating a command object to allow modifications such as\n"
12491
12541
"adding or removing options, docs etc. Called with the new\n"
12492
12542
"bzrlib.commands.Command object."
12493
12543
msgstr ""
12494
12544
12495
#: en/help_topics/hooks.txt:181
12545
#: en/help_topics/hooks.txt:170
12496
12546
msgid ""
12497
12547
"get_command\n"
12498
12548
"~~~~~~~~~~~"
12499
12549
msgstr ""
12500
12550
12501
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12502
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12551
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12552
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12503
12553
msgid "Introduced in: 1.17"
12504
12554
msgstr ""
12505
12555
12506
#: en/help_topics/hooks.txt:186
12556
#: en/help_topics/hooks.txt:175
12507
12557
msgid ""
12508
12558
"Called when creating a single command. Called with (cmd_or_None,\n"
12509
12559
"command_name). get_command should either return the cmd_or_None\n"
12513
12563
"plugin_cmds.register_lazy."
12514
12564
msgstr ""
12515
12565
12516
#: en/help_topics/hooks.txt:193
12566
#: en/help_topics/hooks.txt:182
12517
12567
msgid ""
12518
12568
"get_missing_command\n"
12519
12569
"~~~~~~~~~~~~~~~~~~~"
12520
12570
msgstr ""
12521
12571
12522
#: en/help_topics/hooks.txt:198
12572
#: en/help_topics/hooks.txt:187
12523
12573
msgid ""
12524
12574
"Called when creating a single command if no command could be found.\n"
12525
12575
"Called with (command_name). get_missing_command should either return\n"
12526
12576
"None, or a Command object to be used for the command."
12527
12577
msgstr ""
12528
12578
12529
#: en/help_topics/hooks.txt:202
12579
#: en/help_topics/hooks.txt:191
12530
12580
msgid ""
12531
12581
"list_commands\n"
12532
12582
"~~~~~~~~~~~~~"
12533
12583
msgstr ""
12534
12584
12535
#: en/help_topics/hooks.txt:207
12585
#: en/help_topics/hooks.txt:196
12536
12586
msgid ""
12537
12587
"Called when enumerating commands. Called with a set of cmd_name\n"
12538
12588
"strings for all the commands found so far. This set is safe to mutate\n"
12540
12590
"set of command names."
12541
12591
msgstr ""
12542
12592
12543
#: en/help_topics/hooks.txt:212
12593
#: en/help_topics/hooks.txt:201
12594
msgid ""
12595
"post_command\n"
12596
"~~~~~~~~~~~~"
12597
msgstr ""
12598
12599
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12600
msgid "Introduced in: 2.6"
12601
msgstr ""
12602
12603
#: en/help_topics/hooks.txt:206
12604
msgid "Called after executing a command. Called with the command object."
12605
msgstr ""
12606
12607
#: en/help_topics/hooks.txt:208
12608
msgid ""
12609
"pre_command\n"
12610
"~~~~~~~~~~~"
12611
msgstr ""
12612
12613
#: en/help_topics/hooks.txt:213
12614
msgid "Called prior to executing a command. Called with the command object."
12615
msgstr ""
12616
12617
#: en/help_topics/hooks.txt:215
12544
12618
msgid ""
12545
12619
"_ConfigHooks\n"
12546
12620
"------------"
12547
12621
msgstr ""
12548
12622
12549
#: en/help_topics/hooks.txt:215
12623
#: en/help_topics/hooks.txt:218
12550
12624
msgid ""
12551
12625
"get\n"
12552
12626
"~~~"
12553
12627
msgstr ""
12554
12628
12555
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12556
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12557
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12558
#: en/help_topics/hooks.txt:443
12629
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12630
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12631
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12632
#: en/help_topics/hooks.txt:446
12559
12633
msgid "Introduced in: 2.4"
12560
12634
msgstr ""
12561
12635
12562
#: en/help_topics/hooks.txt:220
12636
#: en/help_topics/hooks.txt:223
12563
12637
msgid ""
12564
12638
"Invoked when a config option is read. The signature is (stack, name,\n"
12565
12639
"value)."
12566
12640
msgstr ""
12567
12641
12568
#: en/help_topics/hooks.txt:223
12642
#: en/help_topics/hooks.txt:226
12569
12643
msgid ""
12570
12644
"load\n"
12571
12645
"~~~~"
12572
12646
msgstr ""
12573
12647
12574
#: en/help_topics/hooks.txt:228
12648
#: en/help_topics/hooks.txt:231
12575
12649
msgid "Invoked when a config store is loaded. The signature is (store)."
12576
12650
msgstr ""
12577
12651
12578
#: en/help_topics/hooks.txt:230
12652
#: en/help_topics/hooks.txt:233
12579
12653
msgid ""
12580
12654
"remove\n"
12581
12655
"~~~~~~"
12582
12656
msgstr ""
12583
12657
12584
#: en/help_topics/hooks.txt:235
12658
#: en/help_topics/hooks.txt:238
12585
12659
msgid ""
12586
12660
"Invoked when a config option is removed. The signature is (stack,\n"
12587
12661
"name)."
12588
12662
msgstr ""
12589
12663
12590
#: en/help_topics/hooks.txt:238
12664
#: en/help_topics/hooks.txt:241
12591
12665
msgid ""
12592
12666
"save\n"
12593
12667
"~~~~"
12594
12668
msgstr ""
12595
12669
12596
#: en/help_topics/hooks.txt:243
12670
#: en/help_topics/hooks.txt:246
12597
12671
msgid "Invoked when a config store is saved. The signature is (store)."
12598
12672
msgstr ""
12599
12673
12600
#: en/help_topics/hooks.txt:245
12674
#: en/help_topics/hooks.txt:248
12601
12675
msgid ""
12602
12676
"set\n"
12603
12677
"~~~"
12604
12678
msgstr ""
12605
12679
12606
#: en/help_topics/hooks.txt:250
12680
#: en/help_topics/hooks.txt:253
12607
12681
msgid ""
12608
12682
"Invoked when a config option is set. The signature is (stack, name,\n"
12609
12683
"value)."
12610
12684
msgstr ""
12611
12685
12612
#: en/help_topics/hooks.txt:253
12686
#: en/help_topics/hooks.txt:256
12613
12687
msgid ""
12614
12688
"ControlDirHooks\n"
12615
12689
"---------------"
12616
12690
msgstr ""
12617
12691
12618
#: en/help_topics/hooks.txt:256
12692
#: en/help_topics/hooks.txt:259
12619
12693
msgid ""
12620
12694
"post_repo_init\n"
12621
12695
"~~~~~~~~~~~~~~"
12622
12696
msgstr ""
12623
12697
12624
#: en/help_topics/hooks.txt:261
12698
#: en/help_topics/hooks.txt:264
12625
12699
msgid ""
12626
12700
"Invoked after a repository has been initialized. post_repo_init is\n"
12627
12701
"called with a bzrlib.controldir.RepoInitHookParams."
12628
12702
msgstr ""
12629
12703
12630
#: en/help_topics/hooks.txt:264
12704
#: en/help_topics/hooks.txt:267
12631
12705
msgid ""
12632
12706
"pre_open\n"
12633
12707
"~~~~~~~~"
12634
12708
msgstr ""
12635
12709
12636
#: en/help_topics/hooks.txt:267
12710
#: en/help_topics/hooks.txt:270
12637
12711
msgid "Introduced in: 1.14"
12638
12712
msgstr ""
12639
12713
12640
#: en/help_topics/hooks.txt:269
12714
#: en/help_topics/hooks.txt:272
12641
12715
msgid ""
12642
12716
"Invoked before attempting to open a ControlDir with the transport that\n"
12643
12717
"the open will use."
12644
12718
msgstr ""
12645
12719
12646
#: en/help_topics/hooks.txt:272
12720
#: en/help_topics/hooks.txt:275
12647
12721
msgid ""
12648
12722
"InfoHooks\n"
12649
12723
"---------"
12650
12724
msgstr ""
12651
12725
12652
#: en/help_topics/hooks.txt:275
12726
#: en/help_topics/hooks.txt:278
12653
12727
msgid ""
12654
12728
"repository\n"
12655
12729
"~~~~~~~~~~"
12656
12730
msgstr ""
12657
12731
12658
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12659
#: en/help_topics/hooks.txt:521
12732
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12733
#: en/help_topics/hooks.txt:524
12660
12734
msgid "Introduced in: 1.15"
12661
12735
msgstr ""
12662
12736
12663
#: en/help_topics/hooks.txt:280
12737
#: en/help_topics/hooks.txt:283
12664
12738
msgid ""
12665
12739
"Invoked when displaying the statistics for a repository. repository is\n"
12666
12740
"called with a statistics dictionary as returned by the repository and\n"
12667
12741
"a file-like object to write to."
12668
12742
msgstr ""
12669
12743
12670
#: en/help_topics/hooks.txt:284
12744
#: en/help_topics/hooks.txt:287
12671
12745
msgid ""
12672
12746
"LockHooks\n"
12673
12747
"---------"
12674
12748
msgstr ""
12675
12749
12676
#: en/help_topics/hooks.txt:287
12750
#: en/help_topics/hooks.txt:290
12677
12751
msgid ""
12678
12752
"lock_acquired\n"
12679
12753
"~~~~~~~~~~~~~"
12680
12754
msgstr ""
12681
12755
12682
#: en/help_topics/hooks.txt:292
12756
#: en/help_topics/hooks.txt:295
12683
12757
msgid ""
12684
12758
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12685
12759
msgstr ""
12686
12760
12687
#: en/help_topics/hooks.txt:294
12761
#: en/help_topics/hooks.txt:297
12688
12762
msgid ""
12689
12763
"lock_broken\n"
12690
12764
"~~~~~~~~~~~"
12691
12765
msgstr ""
12692
12766
12693
#: en/help_topics/hooks.txt:299
12767
#: en/help_topics/hooks.txt:302
12694
12768
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12695
12769
msgstr ""
12696
12770
12697
#: en/help_topics/hooks.txt:301
12771
#: en/help_topics/hooks.txt:304
12698
12772
msgid ""
12699
12773
"lock_released\n"
12700
12774
"~~~~~~~~~~~~~"
12701
12775
msgstr ""
12702
12776
12703
#: en/help_topics/hooks.txt:306
12777
#: en/help_topics/hooks.txt:309
12704
12778
msgid ""
12705
12779
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12706
12780
msgstr ""
12707
12781
12708
#: en/help_topics/hooks.txt:308
12782
#: en/help_topics/hooks.txt:311
12709
12783
msgid ""
12710
12784
"MergeHooks\n"
12711
12785
"----------"
12712
12786
msgstr ""
12713
12787
12714
#: en/help_topics/hooks.txt:311
12788
#: en/help_topics/hooks.txt:314
12715
12789
msgid ""
12716
12790
"merge_file_content\n"
12717
12791
"~~~~~~~~~~~~~~~~~~"
12718
12792
msgstr ""
12719
12793
12720
#: en/help_topics/hooks.txt:314
12794
#: en/help_topics/hooks.txt:317
12721
12795
msgid "Introduced in: 2.1"
12722
12796
msgstr ""
12723
12797
12724
#: en/help_topics/hooks.txt:316
12798
#: en/help_topics/hooks.txt:319
12725
12799
msgid ""
12726
12800
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12727
12801
"object when starting a merge. Should return either None or a subclass\n"
12731
12805
"AbstractPerFileMerger API docs for details on how it is used by merge."
12732
12806
msgstr ""
12733
12807
12734
#: en/help_topics/hooks.txt:323
12808
#: en/help_topics/hooks.txt:326
12735
12809
msgid ""
12736
12810
"post_merge\n"
12737
12811
"~~~~~~~~~~"
12738
12812
msgstr ""
12739
12813
12740
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12741
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12742
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12814
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12815
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12816
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12743
12817
msgid "Introduced in: 2.5"
12744
12818
msgstr ""
12745
12819
12746
#: en/help_topics/hooks.txt:328
12820
#: en/help_topics/hooks.txt:331
12747
12821
msgid ""
12748
12822
"Called after a merge. Receives a Merger object as the single argument.\n"
12749
12823
"The return value is ignored."
12750
12824
msgstr ""
12751
12825
12752
#: en/help_topics/hooks.txt:331
12826
#: en/help_topics/hooks.txt:334
12753
12827
msgid ""
12754
12828
"pre_merge\n"
12755
12829
"~~~~~~~~~"
12756
12830
msgstr ""
12757
12831
12758
#: en/help_topics/hooks.txt:336
12832
#: en/help_topics/hooks.txt:339
12759
12833
msgid ""
12760
12834
"Called before a merge. Receives a Merger object as the single\n"
12761
12835
"argument."
12762
12836
msgstr ""
12763
12837
12764
#: en/help_topics/hooks.txt:339
12838
#: en/help_topics/hooks.txt:342
12765
12839
msgid ""
12766
12840
"MergeDirectiveHooks\n"
12767
12841
"-------------------"
12768
12842
msgstr ""
12769
12843
12770
#: en/help_topics/hooks.txt:342
12844
#: en/help_topics/hooks.txt:345
12771
12845
msgid ""
12772
12846
"merge_request_body\n"
12773
12847
"~~~~~~~~~~~~~~~~~~"
12774
12848
msgstr ""
12775
12849
12776
#: en/help_topics/hooks.txt:345
12850
#: en/help_topics/hooks.txt:348
12777
12851
msgid "Introduced in: 1.15.0"
12778
12852
msgstr ""
12779
12853
12780
#: en/help_topics/hooks.txt:347
12854
#: en/help_topics/hooks.txt:350
12781
12855
msgid ""
12782
12856
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12783
12857
"request. Callbacks must return a body. If more than one callback is\n"
12784
12858
"registered, the output of one callback is provided to the next."
12785
12859
msgstr ""
12786
12860
12787
#: en/help_topics/hooks.txt:351
12861
#: en/help_topics/hooks.txt:354
12788
12862
msgid ""
12789
12863
"MessageEditorHooks\n"
12790
12864
"------------------"
12791
12865
msgstr ""
12792
12866
12793
#: en/help_topics/hooks.txt:354
12867
#: en/help_topics/hooks.txt:357
12794
12868
msgid ""
12795
12869
"commit_message_template\n"
12796
12870
"~~~~~~~~~~~~~~~~~~~~~~~"
12797
12871
msgstr ""
12798
12872
12799
#: en/help_topics/hooks.txt:357
12873
#: en/help_topics/hooks.txt:360
12800
12874
msgid "Introduced in: 1.10"
12801
12875
msgstr ""
12802
12876
12803
#: en/help_topics/hooks.txt:359
12877
#: en/help_topics/hooks.txt:362
12804
12878
msgid ""
12805
12879
"Called when a commit message is being generated.\n"
12806
12880
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12811
12885
"second, and so on."
12812
12886
msgstr ""
12813
12887
12814
#: en/help_topics/hooks.txt:367
12888
#: en/help_topics/hooks.txt:370
12815
12889
msgid ""
12816
12890
"set_commit_message\n"
12817
12891
"~~~~~~~~~~~~~~~~~~"
12818
12892
msgstr ""
12819
12893
12820
#: en/help_topics/hooks.txt:372
12894
#: en/help_topics/hooks.txt:375
12821
12895
msgid ""
12822
12896
"Set a fixed commit message. set_commit_message is called with the\n"
12823
12897
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12826
12900
"should use the message editor as normal."
12827
12901
msgstr ""
12828
12902
12829
#: en/help_topics/hooks.txt:378
12903
#: en/help_topics/hooks.txt:381
12830
12904
msgid ""
12831
12905
"MutableTreeHooks\n"
12832
12906
"----------------"
12833
12907
msgstr ""
12834
12908
12835
#: en/help_topics/hooks.txt:381
12909
#: en/help_topics/hooks.txt:384
12836
12910
msgid ""
12837
12911
"post_build_tree\n"
12838
12912
"~~~~~~~~~~~~~~~"
12839
12913
msgstr ""
12840
12914
12841
#: en/help_topics/hooks.txt:386
12915
#: en/help_topics/hooks.txt:389
12842
12916
msgid ""
12843
12917
"Called after a completely new tree is built. The hook is called with\n"
12844
12918
"the tree as its only argument."
12845
12919
msgstr ""
12846
12920
12847
#: en/help_topics/hooks.txt:392
12921
#: en/help_topics/hooks.txt:395
12848
12922
msgid "Introduced in: 2.0"
12849
12923
msgstr ""
12850
12924
12851
#: en/help_topics/hooks.txt:394
12925
#: en/help_topics/hooks.txt:397
12852
12926
msgid ""
12853
12927
"Called after a commit is performed on a tree. The hook is called with\n"
12854
12928
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12856
12930
"that object."
12857
12931
msgstr ""
12858
12932
12859
#: en/help_topics/hooks.txt:399
12933
#: en/help_topics/hooks.txt:402
12860
12934
msgid ""
12861
12935
"post_transform\n"
12862
12936
"~~~~~~~~~~~~~~"
12863
12937
msgstr ""
12864
12938
12865
#: en/help_topics/hooks.txt:404
12939
#: en/help_topics/hooks.txt:407
12866
12940
msgid ""
12867
12941
"Called after a tree transform has been performed on a tree. The hook\n"
12868
12942
"is called with the tree that is being transformed and the transform."
12869
12943
msgstr ""
12870
12944
12871
#: en/help_topics/hooks.txt:407
12945
#: en/help_topics/hooks.txt:410
12872
12946
msgid ""
12873
12947
"pre_transform\n"
12874
12948
"~~~~~~~~~~~~~"
12875
12949
msgstr ""
12876
12950
12877
#: en/help_topics/hooks.txt:412
12951
#: en/help_topics/hooks.txt:415
12878
12952
msgid ""
12879
12953
"Called before a tree transform on this tree. The hook is called with\n"
12880
12954
"the tree that is being transformed and the transform."
12881
12955
msgstr ""
12882
12956
12883
#: en/help_topics/hooks.txt:415
12957
#: en/help_topics/hooks.txt:418
12884
12958
msgid ""
12885
12959
"start_commit\n"
12886
12960
"~~~~~~~~~~~~"
12887
12961
msgstr ""
12888
12962
12889
#: en/help_topics/hooks.txt:420
12963
#: en/help_topics/hooks.txt:423
12890
12964
msgid ""
12891
12965
"Called before a commit is performed on a tree. The start commit hook\n"
12892
12966
"is able to change the tree before the commit takes place. start_commit\n"
12894
12968
"being performed on."
12895
12969
msgstr ""
12896
12970
12897
#: en/help_topics/hooks.txt:425
12971
#: en/help_topics/hooks.txt:428
12898
12972
msgid ""
12899
12973
"SmartClientHooks\n"
12900
12974
"----------------"
12901
12975
msgstr ""
12902
12976
12903
#: en/help_topics/hooks.txt:428
12977
#: en/help_topics/hooks.txt:431
12904
12978
msgid ""
12905
12979
"call\n"
12906
12980
"~~~~"
12907
12981
msgstr ""
12908
12982
12909
#: en/help_topics/hooks.txt:431
12983
#: en/help_topics/hooks.txt:434
12910
12984
msgid "Introduced in: unknown"
12911
12985
msgstr ""
12912
12986
12913
#: en/help_topics/hooks.txt:433
12987
#: en/help_topics/hooks.txt:436
12914
12988
msgid ""
12915
12989
"Called when the smart client is submitting a request to the smart\n"
12916
12990
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12917
12991
"Streaming request bodies, and responses, are not accessible."
12918
12992
msgstr ""
12919
12993
12920
#: en/help_topics/hooks.txt:437
12994
#: en/help_topics/hooks.txt:440
12921
12995
msgid ""
12922
12996
"SmartServerHooks\n"
12923
12997
"----------------"
12924
12998
msgstr ""
12925
12999
12926
#: en/help_topics/hooks.txt:440
13000
#: en/help_topics/hooks.txt:443
12927
13001
msgid ""
12928
13002
"server_exception\n"
12929
13003
"~~~~~~~~~~~~~~~~"
12930
13004
msgstr ""
12931
13005
12932
#: en/help_topics/hooks.txt:445
13006
#: en/help_topics/hooks.txt:448
12933
13007
msgid ""
12934
13008
"Called by the bzr server when an exception occurs. server_exception is\n"
12935
13009
"called with the sys.exc_info() tuple return true for the hook if the\n"
12937
13011
"normally."
12938
13012
msgstr ""
12939
13013
12940
#: en/help_topics/hooks.txt:450
13014
#: en/help_topics/hooks.txt:453
12941
13015
msgid ""
12942
13016
"server_started\n"
12943
13017
"~~~~~~~~~~~~~~"
12944
13018
msgstr ""
12945
13019
12946
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
13020
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12947
13021
msgid "Introduced in: 0.16"
12948
13022
msgstr ""
12949
13023
12950
#: en/help_topics/hooks.txt:455
13024
#: en/help_topics/hooks.txt:458
12951
13025
msgid ""
12952
13026
"Called by the bzr server when it starts serving a directory.\n"
12953
13027
"server_started is called with (backing urls, public url), where\n"
12956
13030
"served."
12957
13031
msgstr ""
12958
13032
12959
#: en/help_topics/hooks.txt:461
13033
#: en/help_topics/hooks.txt:464
12960
13034
msgid ""
12961
13035
"server_started_ex\n"
12962
13036
"~~~~~~~~~~~~~~~~~"
12963
13037
msgstr ""
12964
13038
12965
#: en/help_topics/hooks.txt:466
13039
#: en/help_topics/hooks.txt:469
12966
13040
msgid ""
12967
13041
"Called by the bzr server when it starts serving a directory.\n"
12968
13042
"server_started is called with (backing_urls, server_obj)."
12969
13043
msgstr ""
12970
13044
12971
#: en/help_topics/hooks.txt:469
13045
#: en/help_topics/hooks.txt:472
12972
13046
msgid ""
12973
13047
"server_stopped\n"
12974
13048
"~~~~~~~~~~~~~~"
12975
13049
msgstr ""
12976
13050
12977
#: en/help_topics/hooks.txt:474
13051
#: en/help_topics/hooks.txt:477
12978
13052
msgid ""
12979
13053
"Called by the bzr server when it stops serving a directory.\n"
12980
13054
"server_stopped is called with the same parameters as the\n"
12981
13055
"server_started hook: (backing_urls, public_url)."
12982
13056
msgstr ""
12983
13057
12984
#: en/help_topics/hooks.txt:478
13058
#: en/help_topics/hooks.txt:481
12985
13059
msgid ""
12986
13060
"StatusHooks\n"
12987
13061
"-----------"
12988
13062
msgstr ""
12989
13063
12990
#: en/help_topics/hooks.txt:481
13064
#: en/help_topics/hooks.txt:484
12991
13065
msgid ""
12992
13066
"post_status\n"
12993
13067
"~~~~~~~~~~~"
12994
13068
msgstr ""
12995
13069
12996
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
13070
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12997
13071
msgid "Introduced in: 2.3"
12998
13072
msgstr ""
12999
13073
13000
#: en/help_topics/hooks.txt:486
13074
#: en/help_topics/hooks.txt:489
13001
13075
msgid ""
13002
13076
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13003
13077
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13006
13080
"status command. to_file is the output stream for writing."
13007
13081
msgstr ""
13008
13082
13009
#: en/help_topics/hooks.txt:492
13083
#: en/help_topics/hooks.txt:495
13010
13084
msgid ""
13011
13085
"pre_status\n"
13012
13086
"~~~~~~~~~~"
13013
13087
msgstr ""
13014
13088
13015
#: en/help_topics/hooks.txt:497
13089
#: en/help_topics/hooks.txt:500
13016
13090
msgid ""
13017
13091
"Called with argument StatusHookParams before Bazaar displays the\n"
13018
13092
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13021
13095
"status command. to_file is the output stream for writing."
13022
13096
msgstr ""
13023
13097
13024
#: en/help_topics/hooks.txt:503
13098
#: en/help_topics/hooks.txt:506
13025
13099
msgid ""
13026
13100
"TransportHooks\n"
13027
13101
"--------------"
13028
13102
msgstr ""
13029
13103
13030
#: en/help_topics/hooks.txt:506
13104
#: en/help_topics/hooks.txt:509
13031
13105
msgid ""
13032
13106
"post_connect\n"
13033
13107
"~~~~~~~~~~~~"
13034
13108
msgstr ""
13035
13109
13036
#: en/help_topics/hooks.txt:511
13110
#: en/help_topics/hooks.txt:514
13037
13111
msgid ""
13038
13112
"Called after a new connection is established or a reconnect occurs.\n"
13039
13113
"The sole argument passed is either the connected transport or smart\n"
13040
13114
"medium instance."
13041
13115
msgstr ""
13042
13116
13043
#: en/help_topics/hooks.txt:515
13117
#: en/help_topics/hooks.txt:518
13044
13118
msgid ""
13045
13119
"RioVersionInfoBuilderHooks\n"
13046
13120
"--------------------------"
13047
13121
msgstr ""
13048
13122
13049
#: en/help_topics/hooks.txt:518
13123
#: en/help_topics/hooks.txt:521
13050
13124
msgid ""
13051
13125
"revision\n"
13052
13126
"~~~~~~~~"
13053
13127
msgstr ""
13054
13128
13055
#: en/help_topics/hooks.txt:523
13129
#: en/help_topics/hooks.txt:526
13056
13130
msgid ""
13057
13131
"Invoked when adding information about a revision to the RIO stanza\n"
13058
13132
"that is printed. revision is called with a revision object and a RIO\n"
13826
13900
msgstr ""
13827
13901
13828
13902
#~ msgid ""
13829
#~ "Merge will do its best to combine the changes in two branches, but there\n"
13830
#~ "are some kinds of problems only a human can fix. When it encounters those,\n"
13831
#~ "it will mark a conflict. A conflict means that you need to fix something,\n"
13832
#~ "before you should commit."
13833
#~ msgstr ""
13834
#~ "マージ処理は、二つのブランチの変更を結合するために最善を尽くしますが、人にしか\n"
13835
#~ "解決できない問題もあります。そのような問題にあたった場合は、それを衝突として\n"
13836
#~ "マークします。その場合、コミット前に何かしら修正しなければならないということに\n"
13837
#~ "なります。"
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.1