« back to all changes in this revision
Viewing changes to po/ja.po
- browse files at revision 6093.4.177
- compare with another revision
- download diff
- download tarball
- view history from revision 6093.4.177
- Committer: Launchpad Translations on behalf of bzr-core
- Date: 2012-12-17 04:30:37 UTC
- mto: (6581.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: launchpad_translations_on_behalf_of_bzr-core-20121217043037-gdkzkow6s9fsa4o0
Launchpad automatic translations update.
- files added:
- po/el.po
- files removed:
- bzrlib/_termcolor.py
- bzrlib/plugins/grep
- files modified:
- .bzrignore
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: 2012-10-21 10:12+0000\n"
12
"Last-Translator: OKANO Takayoshi <Unknown>\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: 2012-10-22 04:30+0000\n"
19
"X-Generator: Launchpad (build 16165)\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
"削除されているファイルを探して、そのファイルのバージョン管理を止めます。"
1122
1121
1123
#: bzrlib/builtins.py:1838
1122
#: bzrlib/builtins.py:1868
1124
1123
msgid "Only remove files that have never been committed."
1125
1124
msgstr "まだコミットされていないファイルだけを削除します。"
1126
1125
1127
#: bzrlib/builtins.py:1840
1126
#: bzrlib/builtins.py:1870
1128
1127
msgid "The file deletion mode to be used."
1129
1128
msgstr "使用するファイル削除モードです。"
1130
1129
1131
#: bzrlib/builtins.py:1841
1130
#: bzrlib/builtins.py:1871
1132
1131
msgid "Deletion Strategy"
1133
1132
msgstr "削除モード"
1134
1133
1135
#: bzrlib/builtins.py:1842
1134
#: bzrlib/builtins.py:1872
1136
1135
msgid "Backup changed files (default)."
1137
1136
msgstr "変更したファイルをバックアップします。"
1138
1137
1139
#: bzrlib/builtins.py:1843
1138
#: bzrlib/builtins.py:1873
1140
1139
msgid "Delete from bzr but leave the working copy."
1141
1140
msgstr "Bazaarからは削除しますが、作業ツリーには残します。"
1142
1141
1143
#: bzrlib/builtins.py:1844
1142
#: bzrlib/builtins.py:1874
1144
1143
msgid "Don't backup changed files."
1145
1144
msgstr "変更されたファイルをバックアップしません。"
1146
1145
1147
#: bzrlib/builtins.py:1845
1146
#: bzrlib/builtins.py:1875
1148
1147
msgid ""
1149
1148
"Delete all the specified files, even if they can not be recovered and even "
1150
1149
"if they are non-empty directories. (deprecated, use no-backup)"
1151
1150
msgstr ""
1152
1151
"元に戻せないファイル、空ではないディレクトリも含めて、指定されたアイテムを全て削除します。(廃止予定。no-backupを使用してください)"
1153
1152
1154
#: bzrlib/builtins.py:1854
1153
#: bzrlib/builtins.py:1884
1155
1154
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1156
1155
msgstr "(--forceオプションは廃止予定です。今後は--no-backupを使用してください)"
1157
1156
1158
#: bzrlib/builtins.py:1871
1157
#: bzrlib/builtins.py:1901
1159
1158
msgid "No matching files."
1160
1159
msgstr "対象のファイルはありませんでした。"
1161
1160
1162
#: bzrlib/builtins.py:1932
1161
#: bzrlib/builtins.py:1962
1163
1162
msgid "Reconcile bzr metadata in a branch."
1164
1163
msgstr "ブランチ内のBazaarのメタデータを修復します。"
1165
1164
1166
#: bzrlib/builtins.py:1934
1165
#: bzrlib/builtins.py:1964
1167
1166
msgid ""
1168
1167
"This can correct data mismatches that may have been caused by\n"
1169
1168
"previous ghost operations or bzr upgrades. You should only\n"
1174
1173
"と思われるデータの不整合を修正することができます。'bzr check'の結果や、\n"
1175
1174
"Bzrの開発者からの指示があるとき以外は、実行する必要はありません。"
1176
1175
1177
#: bzrlib/builtins.py:1939
1176
#: bzrlib/builtins.py:1969
1178
1177
msgid ""
1179
1178
"If a second branch is provided, cross-branch reconciliation is\n"
1180
1179
"also attempted, which will check that data like the tree root\n"
1185
1184
"これは、ツリーのルートIDのような、非常に古いバージョンのBzrにはなかった\n"
1186
1185
"データが、両方のブランチに正しく表現されているかをチェックします。"
1187
1186
1188
#: bzrlib/builtins.py:1944
1187
#: bzrlib/builtins.py:1974
1189
1188
msgid ""
1190
1189
"At the same time it is run it may recompress data resulting in\n"
1191
1190
"a potential saving in disk space or performance gain."
1193
1192
"同時に、ディスクスペースの節約やパフォーマンスの向上のために、データの\n"
1194
1193
"再圧縮がかかる可能性があります。"
1195
1194
1196
#: bzrlib/builtins.py:1947
1195
#: bzrlib/builtins.py:1977
1197
1196
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1198
1197
msgstr ""
1199
1198
"ブランチは、ローカルディスクやsftpのような、リスト可能なシステム上に\n"
1200
1199
"ある*必要があります*。"
1201
1200
1202
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1201
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1203
1202
msgid ""
1204
1203
"Format for the bzr 2.0 series.\n"
1205
1204
"Uses group-compress storage.\n"
1210
1209
"rich root 機能を提供します。 rich root 機能を提供するフォーマットに変換すると、\n"
1211
1210
"rich root 機能を持たないフォーマットに戻ることはできません。\n"
1212
1211
1213
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1212
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1214
1213
msgid ""
1215
1214
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1216
1215
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1217
1216
msgstr ""
1218
1217
1219
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1218
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1220
1219
msgid "The 2a format with experimental support for colocated branches.\n"
1221
1220
msgstr "colocated branch を実験的にサポートする 2a フォーマット。\n"
1222
1221
1223
#: bzrlib/builtins.py:2015
1222
#: bzrlib/builtins.py:2045
1224
1223
msgid "Make a directory into a versioned branch."
1225
1224
msgstr "ディレクトリを、バージョン管理されたブランチにします。"
1226
1225
1227
#: bzrlib/builtins.py:2017
1226
#: bzrlib/builtins.py:2047
1228
1227
msgid ""
1229
1228
"Use this to create an empty branch, or before importing an\n"
1230
1229
"existing project."
1232
1231
"空のブランチを作る場合や、既存のプロジェクトをインポートする前にこの\n"
1233
1232
"コマンドを使用します。"
1234
1233
1235
#: bzrlib/builtins.py:2020
1234
#: bzrlib/builtins.py:2050
1236
1235
msgid ""
1237
1236
"If there is a repository in a parent directory of the location, then\n"
1238
1237
"the history of the branch will be stored in the repository. Otherwise\n"
1243
1242
"保存されます。そうでない場合は、履歴を.bzrディレクトリ内に持つスタンド\n"
1244
1243
"アロンブランチが作成されます。"
1245
1244
1246
#: bzrlib/builtins.py:2025
1245
#: bzrlib/builtins.py:2055
1247
1246
msgid ""
1248
1247
"If there is already a branch at the location but it has no working tree,\n"
1249
1248
"the tree can be populated with 'bzr checkout'."
1251
1250
"既にブランチがあって、作業ツリーがない場合は、'bzr checkout'でツリーを\n"
1252
1251
"生成することができます。"
1253
1252
1254
#: bzrlib/builtins.py:2028
1253
#: bzrlib/builtins.py:2058
1255
1254
msgid "Recipe for importing a tree of files::"
1256
1255
msgstr "ファイルのツリーをインポートするためのレシピ::"
1257
1256
1258
#: bzrlib/builtins.py:2030
1257
#: bzrlib/builtins.py:2060
1259
1258
msgid ""
1260
1259
" cd ~/project\n"
1261
1260
" bzr init\n"
1269
1268
" bzr status\n"
1270
1269
" bzr commit -m \"imported project\""
1271
1270
1272
#: bzrlib/builtins.py:2041
1271
#: bzrlib/builtins.py:2071
1273
1272
msgid ""
1274
1273
"Create the path leading up to the branch if it does not already exist."
1275
1274
msgstr "ブランチまでのパスが存在していなければ、作成します。"
1276
1275
1277
#: bzrlib/builtins.py:2044
1276
#: bzrlib/builtins.py:2074
1278
1277
msgid "Specify a format for this branch. See \"help formats\"."
1279
1278
msgstr "ブランチのフォーマットを指定します。\"help formats\"をご覧ください。"
1280
1279
1281
#: bzrlib/builtins.py:2052
1280
#: bzrlib/builtins.py:2082
1282
1281
msgid ""
1283
1282
"Never change revnos or the existing log. Append revisions to it only."
1284
1283
msgstr "リビジョン番号や既存のログを変更せず、リビジョンの追加だけを行います。"
1285
1284
1286
#: bzrlib/builtins.py:2055
1285
#: bzrlib/builtins.py:2085
1287
1286
msgid "Create a branch without a working tree."
1288
1287
msgstr "作業ツリーをもたないブランチを作成します。"
1289
1288
1290
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1289
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1291
1290
#, python-format
1292
1291
msgid ""
1293
1292
"Parent directory of %s does not exist.\n"
1296
1295
"%s の親ディレクトリがありません。\n"
1297
1296
"--create-prefixを指定すれば、親ディレクトリも作成されます。"
1298
1297
1299
#: bzrlib/builtins.py:2109
1298
#: bzrlib/builtins.py:2139
1300
1299
msgid ""
1301
1300
"This branch format cannot be set to append-revisions-only. Try --default."
1302
1301
msgstr "このブランチフォーマットにappend-revisions-onlyは指定できません。--defaultを試してください。"
1303
1302
1304
#: bzrlib/builtins.py:2120
1303
#: bzrlib/builtins.py:2150
1305
1304
msgid "Created a {0} (format: {1})\n"
1306
1305
msgstr "{0}を作成しました。(フォーマット:{1})\n"
1307
1306
1308
#: bzrlib/builtins.py:2129
1307
#: bzrlib/builtins.py:2159
1309
1308
#, python-format
1310
1309
msgid "Using shared repository: %s\n"
1311
1310
msgstr "共有リポジトリを使用しました。: %s\n"
1312
1311
1313
#: bzrlib/builtins.py:2133
1312
#: bzrlib/builtins.py:2163
1314
1313
msgid "Create a shared repository for branches to share storage space."
1315
1314
msgstr "ブランチのストレージを共有するための共有リポジトリを作成します。"
1316
1315
1317
#: bzrlib/builtins.py:2135
1316
#: bzrlib/builtins.py:2165
1318
1317
msgid ""
1319
1318
"New branches created under the repository directory will store their\n"
1320
1319
"revisions in the repository, not in the branch directory. For branches\n"
1326
1325
"しているブランチ同士のストレージサイズが節約され、新しいブランチを作成\n"
1327
1326
"するスピードも速くなります。"
1328
1327
1329
#: bzrlib/builtins.py:2140
1328
#: bzrlib/builtins.py:2170
1330
1329
msgid ""
1331
1330
"If the --no-trees option is given then the branches in the repository\n"
1332
1331
"will not have working trees by default. They will still exist as \n"
1341
1340
"これは、サーバー上のリポジトリなど、チェックアウトやリモートブランチとやりとり\n"
1342
1341
"するリポジトリの場合に役立ちます。"
1343
1342
1344
#: bzrlib/builtins.py:2147
1343
#: bzrlib/builtins.py:2177
1345
1344
msgid ""
1346
1345
":Examples:\n"
1347
1346
" Create a shared repository holding just branches::"
1349
1348
":例:\n"
1350
1349
" ブランチだけをもつリポジトリを作成します。::"
1351
1350
1352
#: bzrlib/builtins.py:2150
1351
#: bzrlib/builtins.py:2180
1353
1352
msgid ""
1354
1353
" bzr init-repo --no-trees repo\n"
1355
1354
" bzr init repo/trunk"
1357
1356
" bzr init-repo --no-trees repo\n"
1358
1357
" bzr init repo/trunk"
1359
1358
1360
#: bzrlib/builtins.py:2153
1359
#: bzrlib/builtins.py:2183
1361
1360
msgid " Make a lightweight checkout elsewhere::"
1362
1361
msgstr " 別の場所に軽量チェックアウトを作成します。::"
1363
1362
1364
#: bzrlib/builtins.py:2155
1363
#: bzrlib/builtins.py:2185
1365
1364
msgid ""
1366
1365
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1367
1366
" cd trunk-checkout\n"
1371
1370
" cd trunk-checkout\n"
1372
1371
" (ここでファイルを追加)"
1373
1372
1374
#: bzrlib/builtins.py:2163
1373
#: bzrlib/builtins.py:2193
1375
1374
msgid ""
1376
1375
"Specify a format for this repository. See \"bzr help formats\" for details."
1377
1376
msgstr "リポジトリのフォーマットを指定します。詳しくは\"bzr help formats\"をご覧ください。"
1378
1377
1379
#: bzrlib/builtins.py:2167
1378
#: bzrlib/builtins.py:2197
1380
1379
msgid "Repository format"
1381
1380
msgstr "リポジトリフォーマット"
1382
1381
1383
#: bzrlib/builtins.py:2169
1382
#: bzrlib/builtins.py:2199
1384
1383
msgid "Branches in the repository will default to not having a working tree."
1385
1384
msgstr "リポジトリ内のブランチにはデフォルトでは作業ツリーを持たせません。"
1386
1385
1387
#: bzrlib/builtins.py:2195
1386
#: bzrlib/builtins.py:2225
1388
1387
msgid "Show differences in the working tree, between revisions or branches."
1389
1388
msgstr "作業ツリーや、リビジョン、ブランチ間の差分を表示します。"
1390
1389
1391
#: bzrlib/builtins.py:2197
1390
#: bzrlib/builtins.py:2227
1392
1391
msgid ""
1393
1392
"If no arguments are given, all changes for the current tree are listed.\n"
1394
1393
"If files are given, only the changes in those files are listed.\n"
1403
1402
"できます。これらが指定されていない場合は最初の引数が使われ、引数が無い\n"
1404
1403
"場合は作業ツリーが対象になります。"
1405
1404
1406
#: bzrlib/builtins.py:2204
1405
#: bzrlib/builtins.py:2234
1407
1406
msgid ""
1408
1407
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1409
1408
"produces patches suitable for \"patch -p1\"."
1411
1410
"\"bzr dif -p1\"は、\"bzr diff --prefix old/:new/\" と同じで、\"patch -p1\"に\n"
1412
1411
"準じたパッチを出力します。"
1413
1412
1414
#: bzrlib/builtins.py:2207
1413
#: bzrlib/builtins.py:2237
1415
1414
msgid ""
1416
1415
"Note that when using the -r argument with a range of revisions, the\n"
1417
1416
"differences are computed between the two specified revisions. That\n"
1425
1424
"リビジョンでの変更は含まれません。これは、\"bzr log\"にリビジョンの範囲を\n"
1426
1425
"指定した場合の動作(開始リビジョンも含む)とは異なります。"
1427
1426
1428
#: bzrlib/builtins.py:2214
1427
#: bzrlib/builtins.py:2244
1429
1428
msgid ""
1430
1429
":Exit values:\n"
1431
1430
" 1 - changed\n"
1439
1438
" 3 - エラー\n"
1440
1439
" 0 - 変更なし"
1441
1440
1442
#: bzrlib/builtins.py:2220
1441
#: bzrlib/builtins.py:2250
1443
1442
msgid ""
1444
1443
":Examples:\n"
1445
1444
" Shows the difference in the working tree versus the last commit::"
1447
1446
":例:\n"
1448
1447
" 最新のコミットと作業ツリーとの間の変更を表示します。::"
1449
1448
1450
#: bzrlib/builtins.py:2223
1449
#: bzrlib/builtins.py:2253
1451
1450
msgid " bzr diff"
1452
1451
msgstr " bzr diff"
1453
1452
1454
#: bzrlib/builtins.py:2225
1453
#: bzrlib/builtins.py:2255
1455
1454
msgid " Difference between the working tree and revision 1::"
1456
1455
msgstr " 作業ツリーとリビジョン１を比較します。::"
1457
1456
1458
#: bzrlib/builtins.py:2227
1457
#: bzrlib/builtins.py:2257
1459
1458
msgid " bzr diff -r1"
1460
1459
msgstr " bzr diff -r1"
1461
1460
1462
#: bzrlib/builtins.py:2229
1461
#: bzrlib/builtins.py:2259
1463
1462
msgid " Difference between revision 3 and revision 1::"
1464
1463
msgstr " リビジョン３とリビジョン１を比較します。::"
1465
1464
1466
#: bzrlib/builtins.py:2231
1465
#: bzrlib/builtins.py:2261
1467
1466
msgid " bzr diff -r1..3"
1468
1467
msgstr " bzr diff -r1..3"
1469
1468
1470
#: bzrlib/builtins.py:2233
1469
#: bzrlib/builtins.py:2263
1471
1470
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1472
1471
msgstr " ブランチxxxのリビジョン３とリビジョン１を比較します。::"
1473
1472
1474
#: bzrlib/builtins.py:2235
1473
#: bzrlib/builtins.py:2265
1475
1474
msgid " bzr diff -r1..3 xxx"
1476
1475
msgstr " bzr diff -r1..3 xxx"
1477
1476
1478
#: bzrlib/builtins.py:2237
1477
#: bzrlib/builtins.py:2267
1479
1478
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1480
1479
msgstr " リビジョン２での変更です。(-r1..2 と同じです。)::"
1481
1480
1482
#: bzrlib/builtins.py:2239
1481
#: bzrlib/builtins.py:2269
1483
1482
msgid " bzr diff -c2"
1484
1483
msgstr " bzr diff -c2"
1485
1484
1486
#: bzrlib/builtins.py:2241
1485
#: bzrlib/builtins.py:2271
1487
1486
msgid ""
1488
1487
" To see the changes introduced by revision X::\n"
1489
1488
" \n"
1493
1492
" \n"
1494
1493
" bzr diff -cX"
1495
1494
1496
#: bzrlib/builtins.py:2245
1495
#: bzrlib/builtins.py:2275
1497
1496
msgid ""
1498
1497
" Note that in the case of a merge, the -c option shows the changes\n"
1499
1498
" compared to the left hand parent. To see the changes against\n"
1502
1501
" マージされたリビジョンの場合は、-cオプションは左側の親からの変更を表示する\n"
1503
1502
" ことに注意してください。他の親からの変更を見るには、以下のようにします。::"
1504
1503
1505
#: bzrlib/builtins.py:2249
1504
#: bzrlib/builtins.py:2279
1506
1505
msgid " bzr diff -r<chosen_parent>..X"
1507
1506
msgstr " bzr diff -r<対象の親リビジョン>..X"
1508
1507
1509
#: bzrlib/builtins.py:2251
1508
#: bzrlib/builtins.py:2281
1510
1509
msgid ""
1511
1510
" The changes between the current revision and the previous revision\n"
1512
1511
" (equivalent to -c-1 and -r-2..-1)"
1513
1512
msgstr " 現在のリビジョンと一つ前のリビジョンとの差分です。(-c-1 、 -r-2..-1 と同じ)"
1514
1513
1515
#: bzrlib/builtins.py:2254
1514
#: bzrlib/builtins.py:2284
1516
1515
msgid " bzr diff -r-2.."
1517
1516
msgstr " bzr diff -r-2.."
1518
1517
1519
#: bzrlib/builtins.py:2256
1518
#: bzrlib/builtins.py:2286
1520
1519
msgid " Show just the differences for file NEWS::"
1521
1520
msgstr " ファイルNEWSの変更だけを表示します。::"
1522
1521
1523
#: bzrlib/builtins.py:2258
1522
#: bzrlib/builtins.py:2288
1524
1523
msgid " bzr diff NEWS"
1525
1524
msgstr " bzr diff NEWS"
1526
1525
1527
#: bzrlib/builtins.py:2260
1526
#: bzrlib/builtins.py:2290
1528
1527
msgid " Show the differences in working tree xxx for file NEWS::"
1529
1528
msgstr " 作業ツリーxxxの、ファイルNEWSの変更内容を表示します。::"
1530
1529
1531
#: bzrlib/builtins.py:2262
1530
#: bzrlib/builtins.py:2292
1532
1531
msgid " bzr diff xxx/NEWS"
1533
1532
msgstr " bzr diff xxx/NEWS"
1534
1533
1535
#: bzrlib/builtins.py:2264
1534
#: bzrlib/builtins.py:2294
1536
1535
msgid " Show the differences from branch xxx to this working tree:"
1537
1536
msgstr " ブランチxxxと作業ツリーとの間の差分を表示します。::"
1538
1537
1539
#: bzrlib/builtins.py:2266
1538
#: bzrlib/builtins.py:2296
1540
1539
msgid " bzr diff --old xxx"
1541
1540
msgstr " bzr diff --old xxx"
1542
1541
1543
#: bzrlib/builtins.py:2268
1542
#: bzrlib/builtins.py:2298
1544
1543
msgid " Show the differences between two branches for file NEWS::"
1545
1544
msgstr " ２つのブランチ間での、ファイルNEWSの差分を表示します。::"
1546
1545
1547
#: bzrlib/builtins.py:2270
1546
#: bzrlib/builtins.py:2300
1548
1547
msgid " bzr diff --old xxx --new yyy NEWS"
1549
1548
msgstr " bzr diff --old xxx --new yyy NEWS"
1550
1549
1551
#: bzrlib/builtins.py:2272
1550
#: bzrlib/builtins.py:2302
1552
1551
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1553
1552
msgstr " 'bzr diff'と同じですが、プレフィックスold/、new/を付加します。::"
1554
1553
1555
#: bzrlib/builtins.py:2274
1554
#: bzrlib/builtins.py:2304
1556
1555
msgid ""
1557
1556
" bzr diff --prefix old/:new/\n"
1558
1557
" \n"
1566
1565
" \n"
1567
1566
" bzr diff --using /usr/bin/diff --diff-options -wu"
1568
1567
1569
#: bzrlib/builtins.py:2284
1568
#: bzrlib/builtins.py:2314
1570
1569
msgid "Pass these options to the external diff program."
1571
1570
msgstr "これらのオプションは外部のdiffプログラムに渡されます。"
1572
1571
1573
#: bzrlib/builtins.py:2287
1572
#: bzrlib/builtins.py:2317
1574
1573
msgid ""
1575
1574
"Set prefixes added to old and new filenames, as two values separated by a "
1576
1575
"colon. (eg \"old/:new/\")."
1577
1576
msgstr "古いファイル名と新しいファイル名にプレフィックスを追加します。２つの値をコロンで区切って指定します。(例 \"old/:new/\")"
1578
1577
1579
#: bzrlib/builtins.py:2290
1578
#: bzrlib/builtins.py:2320
1580
1579
msgid "Branch/tree to compare from."
1581
1580
msgstr "比較元のブランチ/作業ツリーです。"
1582
1581
1583
#: bzrlib/builtins.py:2294
1582
#: bzrlib/builtins.py:2324
1584
1583
msgid "Branch/tree to compare to."
1585
1584
msgstr "比較先のブランチ/作業ツリーです。"
1586
1585
1587
#: bzrlib/builtins.py:2300
1586
#: bzrlib/builtins.py:2330
1588
1587
msgid "Use this command to compare files."
1589
1588
msgstr "ファイル比較に使うコマンドです。"
1590
1589
1591
#: bzrlib/builtins.py:2305
1590
#: bzrlib/builtins.py:2335
1592
1591
msgid "Diff format to use."
1593
1592
msgstr "使用するDiffフォーマットです。"
1594
1593
1595
#: bzrlib/builtins.py:2307
1594
#: bzrlib/builtins.py:2337
1596
1595
msgid "Diff format"
1597
1596
msgstr "Diffフォーマット"
1598
1597
1599
#: bzrlib/builtins.py:2329
1598
#: bzrlib/builtins.py:2359
1600
1599
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1601
1600
msgstr "--prefix は２つの値をコロンで区切ったものにしてください。 (例 \"old/:new/\")"
1602
1601
1603
#: bzrlib/builtins.py:2333
1602
#: bzrlib/builtins.py:2363
1604
1603
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1605
1604
msgstr "bzr diff --revision には１つまたは２つのリビジョンを指定してください。"
1606
1605
1607
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1608
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1606
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1607
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1609
1608
msgid "{0} and {1} are mutually exclusive"
1610
1609
msgstr "{0} と {1} を同時に指定することはできません。"
1611
1610
1612
#: bzrlib/builtins.py:2358
1611
#: bzrlib/builtins.py:2388
1613
1612
msgid ""
1614
1613
"List files deleted in the working tree.\n"
1615
1614
" "
1617
1616
"作業ツリー上で削除されたファイルをリストアップします。\n"
1618
1617
" "
1619
1618
1620
#: bzrlib/builtins.py:2436
1619
#: bzrlib/builtins.py:2465
1621
1620
msgid "Show the tree root directory."
1622
1621
msgstr "ツリーのルートディレクトリを表示します。"
1623
1622
1624
#: bzrlib/builtins.py:2438
1623
#: bzrlib/builtins.py:2467
1625
1624
msgid ""
1626
1625
"The root is the nearest enclosing directory with a .bzr control\n"
1627
1626
"directory."
1628
1627
msgstr "ルートとは、.bzr管理ディレクトリを持つ、一番近い上位ディレクトリのことです。"
1629
1628
1630
#: bzrlib/builtins.py:2453
1629
#: bzrlib/builtins.py:2482
1631
1630
msgid "The limit argument must be an integer."
1632
1631
msgstr "limitは整数でなければなりません。"
1633
1632
1634
#: bzrlib/builtins.py:2461
1633
#: bzrlib/builtins.py:2490
1635
1634
msgid "The levels argument must be an integer."
1636
1635
msgstr "levelsは整数でなければなりません。"
1637
1636
1638
#: bzrlib/builtins.py:2466
1637
#: bzrlib/builtins.py:2495
1639
1638
msgid "Show historical log for a branch or subset of a branch."
1640
1639
msgstr "ブランチ、もしくはブランチの一部の履歴ログを表示します。"
1641
1640
1642
#: bzrlib/builtins.py:2468
1641
#: bzrlib/builtins.py:2497
1643
1642
msgid ""
1644
1643
"log is bzr's default tool for exploring the history of a branch.\n"
1645
1644
"The branch to use is taken from the first parameter. If no parameters\n"
1651
1650
"作業ディレクトリを含むブランチの履歴が表示されます。\n"
1652
1651
"簡単な例を以下に示します。::"
1653
1652
1654
#: bzrlib/builtins.py:2473
1653
#: bzrlib/builtins.py:2502
1655
1654
msgid ""
1656
1655
" bzr log log the current branch\n"
1657
1656
" bzr log foo.py log a file in its branch\n"
1661
1660
" bzr log foo,py は、ブランチ内のファイルの履歴を表示します。\n"
1662
1661
" bzr log http://server/branch は、サーバ上のブランチのログを表示します。"
1663
1662
1664
#: bzrlib/builtins.py:2477
1663
#: bzrlib/builtins.py:2506
1665
1664
msgid ""
1666
1665
"The filtering, ordering and information shown for each revision can\n"
1667
1666
"be controlled as explained below. By default, all revisions are\n"
1676
1675
"されます。マージされたリビジョンを表示する場合は、マージ先のリビジョンよりも\n"
1677
1676
"インデントされて表示されます。"
1678
1677
1679
#: bzrlib/builtins.py:2484
1678
#: bzrlib/builtins.py:2513
1680
1679
msgid ":Output control:"
1681
1680
msgstr ":出力のコントロール:"
1682
1681
1683
#: bzrlib/builtins.py:2486
1682
#: bzrlib/builtins.py:2515
1684
1683
msgid ""
1685
1684
" The log format controls how information about each revision is\n"
1686
1685
" displayed. The standard log formats are called ``long``, ``short``\n"
1692
1691
" があります。デフォルトはlongです。ログフォーマットについての詳細は\n"
1693
1692
" ``bzr help log-formats`` をご覧ください。"
1694
1693
1695
#: bzrlib/builtins.py:2491
1694
#: bzrlib/builtins.py:2520
1696
1695
msgid ""
1697
1696
" The following options can be used to control what information is\n"
1698
1697
" displayed::"
1699
1698
msgstr " 以下のオプションで、どの情報を表示するかをコントロールできます。"
1700
1699
1701
#: bzrlib/builtins.py:2494
1700
#: bzrlib/builtins.py:2523
1702
1701
msgid ""
1703
1702
" -l N display a maximum of N revisions\n"
1704
1703
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1712
1711
" -p Diff(patch)を各リビジョンに表示します。\n"
1713
1712
" --show-ids リビジョン番号だけでなく、リビジョンIDとファイルIDも表示します。」"
1714
1713
1715
#: bzrlib/builtins.py:2500
1714
#: bzrlib/builtins.py:2529
1716
1715
msgid ""
1717
1716
" Note that the default number of levels to display is a function of the\n"
1718
1717
" log format. If the -n option is not used, the standard log formats show\n"
1722
1721
" -nオプションが使用されない場合は、標準のログフォーマットはトップレベル(メイン\n"
1723
1722
" ライン)だけを表示します。"
1724
1723
1725
#: bzrlib/builtins.py:2504
1724
#: bzrlib/builtins.py:2533
1726
1725
msgid ""
1727
1726
" Status summaries are shown using status flags like A, M, etc. To see\n"
1728
1727
" the changes explained using words like ``added`` and ``modified``\n"
1731
1730
" ステータスのサマリは、A、Mなどのフラグで表示されます。 かわりに ``added``、\n"
1732
1731
" ``modified`` などの単語で表示するには、-vvオプションを使用してください。"
1733
1732
1734
#: bzrlib/builtins.py:2508
1733
#: bzrlib/builtins.py:2537
1735
1734
msgid ":Ordering control:"
1736
1735
msgstr ":表示順のコントロール:"
1737
1736
1738
#: bzrlib/builtins.py:2510
1737
#: bzrlib/builtins.py:2539
1739
1738
msgid ""
1740
1739
" To display revisions from oldest to newest, use the --forward option.\n"
1741
1740
" In most cases, using this option will have little impact on the total\n"
1746
1745
" 使います。--forwardは、--reverseのようにログをインクリメンタルに表示はしません\n"
1747
1746
"が、たいていの場合、ログ表示にかかる時間への影響はわずかです。"
1748
1747
1749
#: bzrlib/builtins.py:2515
1748
#: bzrlib/builtins.py:2544
1750
1749
msgid ":Revision filtering:"
1751
1750
msgstr ":リビジョンのフィルタリング:"
1752
1751
1753
#: bzrlib/builtins.py:2517
1752
#: bzrlib/builtins.py:2546
1754
1753
msgid ""
1755
1754
" The -r option can be used to specify what revision or range of revisions\n"
1756
1755
" to filter against. The various forms are shown below::"
1758
1757
" -rオプションで、どのリビジョン、もしくはリビジョンの範囲を表示するかを指定する\n"
1759
1758
" ことができます。いろいろな例を以下に示します。::"
1760
1759
1761
#: bzrlib/builtins.py:2520
1760
#: bzrlib/builtins.py:2549
1762
1761
msgid ""
1763
1762
" -rX display revision X\n"
1764
1763
" -rX.. display revision X and later\n"
1770
1769
" -r..Y リビジョンY以前(Yを含む)を表示\n"
1771
1770
" -rX..Y リビジョンXからY(X、Yを含む)を表示"
1772
1771
1773
#: bzrlib/builtins.py:2525
1772
#: bzrlib/builtins.py:2554
1774
1773
msgid ""
1775
1774
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1776
1775
" Some common examples are given below::"
1778
1777
" X、Yの指定方法の詳細は、 ``bzr help revisionspec`` を参照してください。\n"
1779
1778
" よくある例を以下に示します。::"
1780
1779
1781
#: bzrlib/builtins.py:2528
1780
#: bzrlib/builtins.py:2557
1782
1781
msgid ""
1783
1782
" -r-1 show just the tip\n"
1784
1783
" -r-10.. show the last 10 mainline revisions\n"
1794
1793
" 変更を表示\n"
1795
1794
" -rdate:yesterday.. 昨日からの変更を表示"
1796
1795
1797
#: bzrlib/builtins.py:2535
1796
#: bzrlib/builtins.py:2564
1798
1797
msgid ""
1799
1798
" When logging a range of revisions using -rX..Y, log starts at\n"
1800
1799
" revision Y and searches back in history through the primary\n"
1805
1804
msgstr ""
1806
1805
" -rX..Yでリビジョンの範囲を指定した場合、ログはリビジョンYから始まって\n"
1807
1806
" メインの(左側の)親をXに到達するまで遡ります。トップレベルだけを表示\n"
1808
" する場合(-n1を使用)、Xがそのルート見つからなければエラーが発生します。\n"
1807
" する場合(-n1を使用)、Xがそのルートに見つからなければエラーが発生します。\n"
1809
1808
" 他段階のログ(-n0を使用)を表示する場合は、Xは入れ子になったマージ\n"
1810
1809
" リビジョンの中に見つかるかもしれません。その場合、ログは適切に切り捨て\n"
1811
1810
" られます。"
1812
1811
1813
#: bzrlib/builtins.py:2542
1812
#: bzrlib/builtins.py:2571
1814
1813
msgid ":Path filtering:"
1815
1814
msgstr ":パスのフィルタリング:"
1816
1815
1817
#: bzrlib/builtins.py:2544
1816
#: bzrlib/builtins.py:2573
1818
1817
msgid ""
1819
1818
" If parameters are given and the first one is not a branch, the log\n"
1820
1819
" will be filtered to show only those revisions that changed the\n"
1823
1822
" パラメータが指定されていて、一つ目のパラメータがブランチではない場合、\n"
1824
1823
" 指定されたファイル、ディレクトリが変更されたリビジョンだけが表示されます。"
1825
1824
1826
#: bzrlib/builtins.py:2548
1825
#: bzrlib/builtins.py:2577
1827
1826
msgid ""
1828
1827
" Filenames are interpreted within their historical context. To log a\n"
1829
1828
" deleted file, specify a revision range so that the file existed at\n"
1833
1832
" ログを表示するには、そのファイルが存在したリビジョンを、リビジョンの範囲\n"
1834
1833
" の最初か最後に指定してください。"
1835
1834
1836
#: bzrlib/builtins.py:2552
1835
#: bzrlib/builtins.py:2581
1837
1836
msgid ""
1838
1837
" Historical context is also important when interpreting pathnames of\n"
1839
1838
" renamed files/directories. Consider the following example:"
1841
1840
" 履歴のコンテキストは、変名されたファイルやディレクトリのパス名を解釈する\n"
1842
1841
" 際にも重要になります。以下の例を考えてください。："
1843
1842
1844
#: bzrlib/builtins.py:2555
1843
#: bzrlib/builtins.py:2584
1845
1844
msgid ""
1846
1845
" * revision 1: add tutorial.txt\n"
1847
1846
" * revision 2: modify tutorial.txt\n"
1851
1850
" * リビジョン 2: tutorial.txt\n"
1852
1851
" * リビジョン 3: tutorial.txt を guide.txt に変名し、add tutorial.txt を追加"
1853
1852
1854
#: bzrlib/builtins.py:2559
1853
#: bzrlib/builtins.py:2588
1855
1854
msgid " In this case:"
1856
1855
msgstr " この場合:"
1857
1856
1858
#: bzrlib/builtins.py:2561
1857
#: bzrlib/builtins.py:2590
1859
1858
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1860
1859
msgstr " * ``bzr log guide.txt`` は、リビジョン1で追加されたファイルを表示します。"
1861
1860
1862
#: bzrlib/builtins.py:2563
1861
#: bzrlib/builtins.py:2592
1863
1862
msgid ""
1864
1863
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1865
1864
msgstr " * ``bzr log tutorial.txt`` は、リビジョン3で追加された新しいファイルを表示します。"
1866
1865
1867
#: bzrlib/builtins.py:2565
1866
#: bzrlib/builtins.py:2594
1868
1867
msgid ""
1869
1868
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1870
1869
" the original file in revision 2."
1872
1871
" * ``bzr log -r2 -p tutorial.txt`` は、元のファイルのリビジョン2での変更\n"
1873
1872
" を表示します。"
1874
1873
1875
#: bzrlib/builtins.py:2568
1874
#: bzrlib/builtins.py:2597
1876
1875
msgid ""
1877
1876
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1878
1877
" was no file called guide.txt in revision 2."
1880
1879
" * ``bzr log -r2 -p guide.txt`` は、リビジョン2にはguide.txtというファイルはない\n"
1881
1880
" というエラーを表示します。"
1882
1881
1883
#: bzrlib/builtins.py:2571
1882
#: bzrlib/builtins.py:2600
1884
1883
msgid ""
1885
1884
" Renames are always followed by log. By design, there is no need to\n"
1886
1885
" explicitly ask for this (and no way to stop logging a file back\n"
1889
1888
" 変名は常に履歴に表示されます。明示的に指定する必要はありません。(また、\n"
1890
1889
" 最後に変名される以前のログを切り捨てる方法もありません)"
1891
1890
1892
#: bzrlib/builtins.py:2575
1891
#: bzrlib/builtins.py:2604
1893
1892
msgid ":Other filtering:"
1894
1893
msgstr ":その他のフィルタリング:"
1895
1894
1896
#: bzrlib/builtins.py:2577
1895
#: bzrlib/builtins.py:2606
1897
1896
msgid ""
1898
1897
" The --match option can be used for finding revisions that match a\n"
1899
1898
" regular expression in a commit message, committer, author or bug.\n"
1907
1906
" --match-bug、--match-committer、--match-messageで、指定したフィールド\n"
1908
1907
" だけを検索対象にすることができます。"
1909
1908
1910
#: bzrlib/builtins.py:2583
1909
#: bzrlib/builtins.py:2612
1911
1910
msgid ":Tips & tricks:"
1912
1911
msgstr ":Tips & tricks:"
1913
1912
1914
#: bzrlib/builtins.py:2585
1913
#: bzrlib/builtins.py:2614
1915
1914
msgid ""
1916
1915
" GUI tools and IDEs are often better at exploring history than command\n"
1917
1916
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1925
1924
" <http://doc.bazaar.canonical.com/plugins/en/> や、\n"
1926
1925
" <http://wiki.bazaar.canonical.com/IDEIntegration> をご覧ください。 "
1927
1926
1928
#: bzrlib/builtins.py:2591
1927
#: bzrlib/builtins.py:2620
1929
1928
msgid ""
1930
1929
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1931
1930
msgstr " ``bazaar.conf`` に以下のようなエイリアスを追加しておくと便利です。::"
1932
1931
1933
#: bzrlib/builtins.py:2593
1932
#: bzrlib/builtins.py:2622
1934
1933
msgid ""
1935
1934
" [ALIASES]\n"
1936
1935
" tip = log -r-1\n"
1942
1941
" top = log -l10 --line\n"
1943
1942
" show = log -v -p"
1944
1943
1945
#: bzrlib/builtins.py:2598
1944
#: bzrlib/builtins.py:2627
1946
1945
msgid ""
1947
1946
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1948
1947
" will show the last 10 mainline revisions. To see the details of a\n"
1952
1951
" 10リビジョンを表示します。特定のリビジョンXの詳細を見るには、 ``bzr show -X``\n"
1953
1952
" を使用します。"
1954
1953
1955
#: bzrlib/builtins.py:2602
1954
#: bzrlib/builtins.py:2631
1956
1955
msgid ""
1957
1956
" If you are interested in looking deeper into a particular merge X,\n"
1958
1957
" use ``bzr log -n0 -rX``."
1959
1958
msgstr " 特定のマージXについて詳しく見たい場合は、 ``bzr log -n0 -rX`` を使用します。"
1960
1959
1961
#: bzrlib/builtins.py:2605
1960
#: bzrlib/builtins.py:2634
1962
1961
msgid ""
1963
1962
" ``bzr log -v`` on a branch with lots of history is currently\n"
1964
1963
" very slow. A fix for this issue is currently under development.\n"
1970
1969
" しても、-vオプションを指定するときはリビジョンの範囲を指定することを\n"
1971
1970
" おすすめします。"
1972
1971
1973
#: bzrlib/builtins.py:2610
1972
#: bzrlib/builtins.py:2639
1974
1973
msgid ""
1975
1974
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1976
1975
" used to find revisions matching user names, commit messages, etc.\n"
1982
1981
" 他の機能とはちがい、このプラグインでは単語のリストを含むすべての\n"
1983
1982
" リビジョンを検索することができます。"
1984
1983
1985
#: bzrlib/builtins.py:2615
1984
#: bzrlib/builtins.py:2644
1986
1985
msgid ""
1987
1986
" When exploring non-mainline history on large projects with deep\n"
1988
1987
" history, the performance of log can be greatly improved by installing\n"
1994
1993
" することができます。このプラグインは、履歴情報をキャッシュして、ディスク\n"
1995
1994
" スペースと引き換えに高速なパフォーマンスをもたらします。"
1996
1995
1997
#: bzrlib/builtins.py:2624
1996
#: bzrlib/builtins.py:2653
1998
1997
msgid "Show from oldest to newest."
1999
1998
msgstr "古い方から新しい方へ表示する"
2000
1999
2001
#: bzrlib/builtins.py:2627
2000
#: bzrlib/builtins.py:2656
2002
2001
msgid "Show files changed in each revision."
2003
2002
msgstr "各リビジョンでのファイルの変更を表示する"
2004
2003
2005
#: bzrlib/builtins.py:2633
2004
#: bzrlib/builtins.py:2662
2006
2005
msgid "Show just the specified revision. See also \"help revisionspec\"."
2007
2006
msgstr "指定されたリビジョンだけを表示する。 ``help revisionspec``を参照"
2008
2007
2009
#: bzrlib/builtins.py:2637
2008
#: bzrlib/builtins.py:2666
2010
2009
msgid "What names to list as authors - first, all or committer."
2011
2010
msgstr "誰を作者として表示するか - first、all、またはcommitter"
2012
2011
2013
#: bzrlib/builtins.py:2638
2012
#: bzrlib/builtins.py:2667
2014
2013
msgid "Authors"
2015
2014
msgstr "作者"
2016
2015
2017
#: bzrlib/builtins.py:2643
2016
#: bzrlib/builtins.py:2672
2018
2017
msgid "Number of levels to display - 0 for all, 1 for flat."
2019
2018
msgstr "表示するレベル。-0で全て、1で１階層"
2020
2019
2021
#: bzrlib/builtins.py:2653
2020
#: bzrlib/builtins.py:2682
2022
2021
msgid "Limit the output to the first N revisions."
2023
2022
msgstr "最初のNリビジョンだけを出力する"
2024
2023
2025
#: bzrlib/builtins.py:2658
2024
#: bzrlib/builtins.py:2687
2026
2025
msgid "Show changes made in each revision as a patch."
2027
2026
msgstr "各リビジョンでの変更をパッチとして表示"
2028
2027
2029
#: bzrlib/builtins.py:2660
2028
#: bzrlib/builtins.py:2689
2030
2029
msgid "Show merged revisions like --levels 0 does."
2031
2030
msgstr "--levels 0 と同じようにマージされたリビジョンを表示する"
2032
2031
2033
#: bzrlib/builtins.py:2664
2032
#: bzrlib/builtins.py:2693
2034
2033
msgid "Do not report commits with more than one parent."
2035
2034
msgstr "複数の親を持つコミットを表示しない"
2036
2035
2037
#: bzrlib/builtins.py:2666
2036
#: bzrlib/builtins.py:2695
2038
2037
msgid ""
2039
2038
"Display only the revisions that are not part of both ancestries (require -"
2040
2039
"rX..Y)."
2041
2040
msgstr "共通の先祖に含まれないリビジョンだけを表示(-rX..Yを使用する必要がある)"
2042
2041
2043
#: bzrlib/builtins.py:2670
2042
#: bzrlib/builtins.py:2699
2044
2043
msgid "Show digital signature validity."
2045
2044
msgstr "デジタル署名を表示"
2046
2045
2047
#: bzrlib/builtins.py:2673
2046
#: bzrlib/builtins.py:2702
2048
2047
msgid "Show revisions whose properties match this expression."
2049
2048
msgstr "この表現にマッチするプロパティのリビジョンを表示"
2050
2049
2051
#: bzrlib/builtins.py:2677
2050
#: bzrlib/builtins.py:2706
2052
2051
msgid "Show revisions whose message matches this expression."
2053
2052
msgstr "この表現にマッチするメッセージのリビジョンを表示"
2054
2053
2055
#: bzrlib/builtins.py:2681
2054
#: bzrlib/builtins.py:2710
2056
2055
msgid "Show revisions whose committer matches this expression."
2057
2056
msgstr "コミッタが指定された表現にマッチするリビジョンを表示する"
2058
2057
2059
#: bzrlib/builtins.py:2685
2058
#: bzrlib/builtins.py:2714
2060
2059
msgid "Show revisions whose authors match this expression."
2061
2060
msgstr "作者が指定された表現にマッチするリビジョンを表示する"
2062
2061
2063
#: bzrlib/builtins.py:2689
2062
#: bzrlib/builtins.py:2718
2064
2063
msgid "Show revisions whose bugs match this expression."
2065
2064
msgstr "バグ情報が指定された表現にマッチするリビジョンを表示します"
2066
2065
2067
#: bzrlib/builtins.py:2743
2066
#: bzrlib/builtins.py:2772
2068
2067
msgid "--exclude-common-ancestry requires -r with two revisions"
2069
2068
msgstr "--exclude-common-ancestryには、-rで2つのリビジョンを指定する必要があります。"
2070
2069
2071
#: bzrlib/builtins.py:2771
2070
#: bzrlib/builtins.py:2800
2072
2071
#, python-format
2073
2072
msgid "Path unknown at end or start of revision range: %s"
2074
2073
msgstr "最後のリビジョンにも最初のリビジョンにもパスが見つかりません: %s"
2075
2074
2076
#: bzrlib/builtins.py:2888
2075
#: bzrlib/builtins.py:2917
2077
2076
#, python-format
2078
2077
msgid "bzr %s doesn't accept two revisions in different branches."
2079
2078
msgstr "bzr %s には、異なるブランチ上の2つのリビジョンは指定できません。"
2080
2079
2081
#: bzrlib/builtins.py:2904
2080
#: bzrlib/builtins.py:2933
2082
2081
#, python-format
2083
2082
msgid "bzr %s --revision takes one or two values."
2084
2083
msgstr "bzr %s --revision は1つまたは2つの値を取ります。"
2085
2084
2086
#: bzrlib/builtins.py:2949
2085
#: bzrlib/builtins.py:2978
2087
2086
msgid ""
2088
2087
"List files in a tree.\n"
2089
2088
" "
2091
2090
"ツリー内のファイルをリストアップします。\n"
2092
2091
" "
2093
2092
2094
#: bzrlib/builtins.py:2958
2093
#: bzrlib/builtins.py:2987
2095
2094
msgid "Recurse into subdirectories."
2096
2095
msgstr "サブディレクトリも再帰で処理します。"
2097
2096
2098
#: bzrlib/builtins.py:2960
2097
#: bzrlib/builtins.py:2989
2099
2098
msgid "Print paths relative to the root of the branch."
2100
2099
msgstr "ブランチのルートからの相対パスを表示します。"
2101
2100
2102
#: bzrlib/builtins.py:2962
2101
#: bzrlib/builtins.py:2991
2103
2102
msgid "Print unknown files."
2104
2103
msgstr "バージョン管理外のファイルを表示します。"
2105
2104
2106
#: bzrlib/builtins.py:2963
2105
#: bzrlib/builtins.py:2992
2107
2106
msgid "Print versioned files."
2108
2107
msgstr "バージョン管理されたファイルを表示します。"
2109
2108
2110
#: bzrlib/builtins.py:2966
2109
#: bzrlib/builtins.py:2995
2111
2110
msgid "Print ignored files."
2112
2111
msgstr "無視されたファイルを表示します。"
2113
2112
2114
#: bzrlib/builtins.py:2968
2113
#: bzrlib/builtins.py:2997
2115
2114
msgid "List entries of a particular kind: file, directory, symlink."
2116
2115
msgstr "指定された種別のアイテム(ファイル、ディレクトリ、シンボリックリンク)を表示します。"
2117
2116
2118
#: bzrlib/builtins.py:2981
2117
#: bzrlib/builtins.py:3010
2119
2118
msgid "invalid kind specified"
2120
2119
msgstr "無効な種別が指定されました。"
2121
2120
2122
#: bzrlib/builtins.py:2984
2121
#: bzrlib/builtins.py:3013
2123
2122
msgid "Cannot set both --verbose and --null"
2124
2123
msgstr "--verboseと--nullを同時に指定することはできません。"
2125
2124
2126
#: bzrlib/builtins.py:2993
2125
#: bzrlib/builtins.py:3022
2127
2126
msgid "cannot specify both --from-root and PATH"
2128
2127
msgstr "--from-rootとPATHを同時に指定することはできません。"
2129
2128
2130
#: bzrlib/builtins.py:3080
2129
#: bzrlib/builtins.py:3109
2131
2130
msgid "Ignore specified files or patterns."
2132
2131
msgstr "指定されたファイルやパターンを無視します。"
2133
2132
2134
#: bzrlib/builtins.py:3082
2133
#: bzrlib/builtins.py:3111
2135
2134
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2136
2135
msgstr "パターンの書き方の詳細は ``bzr help patterns`` をご覧ください。"
2137
2136
2138
#: bzrlib/builtins.py:3084
2137
#: bzrlib/builtins.py:3113
2139
2138
msgid ""
2140
2139
"If a .bzrignore file does not exist, the ignore command\n"
2141
2140
"will create one and add the specified files or patterns to the newly\n"
2149
2148
"使わずに.bzrignoreファイルを手で作成した場合は、明示的にaddコマンドを\n"
2150
2149
"呼ぶ必要があります。"
2151
2150
2152
#: bzrlib/builtins.py:3090
2151
#: bzrlib/builtins.py:3119
2153
2152
msgid ""
2154
2153
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2155
2154
"After adding, editing or deleting that file either indirectly by\n"
2160
2159
"ignoreコマンドやエディタでこのファイルのエントリを追加、編集、削除した\n"
2161
2160
"場合は、忘れずにコミットしてください。"
2162
2161
2163
#: bzrlib/builtins.py:3095
2162
#: bzrlib/builtins.py:3124
2164
2163
msgid ""
2165
2164
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2166
2165
"the global ignore file can be found in the application data directory as\n"
2174
2173
"このファイルをこのコマンドで編集することはできないので、直接エディタで編集\n"
2175
2174
"してください。"
2176
2175
2177
#: bzrlib/builtins.py:3101
2176
#: bzrlib/builtins.py:3130
2178
2177
msgid ""
2179
2178
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2180
2179
"precedence over regular ignores. Such exceptions are used to specify\n"
2184
2183
"優先されます。これは、普通なら無視されるはずのファイルをバージョン管理\n"
2185
2184
"の対象とするために使います。"
2186
2185
2187
#: bzrlib/builtins.py:3105
2186
#: bzrlib/builtins.py:3134
2188
2187
msgid ""
2189
2188
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2190
2189
"precedence over the '!' exception patterns."
2192
2191
"!!で始まるパターンは、通常の無視指定として扱われますが、!による除外\n"
2193
2192
"パターンよりも優先されます。"
2194
2193
2195
#: bzrlib/builtins.py:3108
2194
#: bzrlib/builtins.py:3137
2196
2195
msgid ""
2197
2196
":Notes: \n"
2198
2197
" \n"
2204
2203
"*シェルのワイルドカードをふくむ無視パターンを指定するときには、Unixシェル\n"
2205
2204
" による引用符でくくる必要があります。"
2206
2205
2207
#: bzrlib/builtins.py:3113
2206
#: bzrlib/builtins.py:3142
2208
2207
msgid ""
2209
2208
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2210
2209
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2212
2211
"* #で始まる無視パターンは、無視ファイル中のコメントとして扱われます。\n"
2213
2212
" #で始まるファイルを無視したい場合は、\"RE:\"プレフィックスを使ってください。"
2214
2213
2215
#: bzrlib/builtins.py:3116
2214
#: bzrlib/builtins.py:3145
2216
2215
msgid ""
2217
2216
":Examples:\n"
2218
2217
" Ignore the top level Makefile::"
2220
2219
":例:\n"
2221
2220
" トップレベルのMakefileを無視する::"
2222
2221
2223
#: bzrlib/builtins.py:3119
2222
#: bzrlib/builtins.py:3148
2224
2223
msgid " bzr ignore ./Makefile"
2225
2224
msgstr " bzr ignore ./Makefile"
2226
2225
2227
#: bzrlib/builtins.py:3121
2226
#: bzrlib/builtins.py:3150
2228
2227
msgid " Ignore .class files in all directories...::"
2229
2228
msgstr " すべてのディレクトリの.classファイルを無視するが...::"
2230
2229
2231
#: bzrlib/builtins.py:3123
2230
#: bzrlib/builtins.py:3152
2232
2231
msgid " bzr ignore \"*.class\""
2233
2232
msgstr " bzr ignore \"*.class\""
2234
2233
2235
#: bzrlib/builtins.py:3125
2234
#: bzrlib/builtins.py:3154
2236
2235
msgid " ...but do not ignore \"special.class\"::"
2237
2236
msgstr " ...\"special.class\" は無視しない::"
2238
2237
2239
#: bzrlib/builtins.py:3127
2238
#: bzrlib/builtins.py:3156
2240
2239
msgid " bzr ignore \"!special.class\""
2241
2240
msgstr " bzr ignore \"!special.class\""
2242
2241
2243
#: bzrlib/builtins.py:3129
2242
#: bzrlib/builtins.py:3158
2244
2243
msgid " Ignore files whose name begins with the \"#\" character::"
2245
2244
msgstr " #で始まるファイルを無視する::"
2246
2245
2247
#: bzrlib/builtins.py:3131
2246
#: bzrlib/builtins.py:3160
2248
2247
msgid " bzr ignore \"RE:^#\""
2249
2248
msgstr " bzr ignore \"RE:^#\""
2250
2249
2251
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2250
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2252
2251
msgid " Ignore .o files under the lib directory::"
2253
2252
msgstr " libディレクトリ配下の.oファイルを無視する::"
2254
2253
2255
#: bzrlib/builtins.py:3135
2254
#: bzrlib/builtins.py:3164
2256
2255
msgid " bzr ignore \"lib/**/*.o\""
2257
2256
msgstr " bzr ignore \"lib/**/*.o\""
2258
2257
2259
#: bzrlib/builtins.py:3139
2258
#: bzrlib/builtins.py:3168
2260
2259
msgid " bzr ignore \"RE:lib/.*\\.o\""
2261
2260
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2262
2261
2263
#: bzrlib/builtins.py:3141
2262
#: bzrlib/builtins.py:3170
2264
2263
msgid " Ignore everything but the \"debian\" toplevel directory::"
2265
2264
msgstr " \"debian\"トップレベルディレクトリ以外の全てを無視する::"
2266
2265
2267
#: bzrlib/builtins.py:3143
2266
#: bzrlib/builtins.py:3172
2268
2267
msgid ""
2269
2268
" bzr ignore \"RE:(?!debian/).*\"\n"
2270
2269
" \n"
2284
2283
" bzr ignore \"!./local\"\n"
2285
2284
" bzr ignore \"!!*~\""
2286
2285
2287
#: bzrlib/builtins.py:3157
2286
#: bzrlib/builtins.py:3186
2288
2287
msgid "Display the default ignore rules that bzr uses."
2289
2288
msgstr "bzrが使用するデフォルトの無視ルールを表示します。"
2290
2289
2291
#: bzrlib/builtins.py:3169
2290
#: bzrlib/builtins.py:3198
2292
2291
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2293
2292
msgstr "ignoreにはNAME_PATTERNか--default-rulesのどちらかは指定する必要があります。"
2294
2293
2295
#: bzrlib/builtins.py:3180
2294
#: bzrlib/builtins.py:3209
2296
2295
#, python-format
2297
2296
msgid "Invalid ignore pattern found. %s"
2298
2297
msgid_plural "Invalid ignore patterns found. %s"
2299
2298
msgstr[0] "無効な無視パターンが見つかりました。 %s"
2300
2299
2301
#: bzrlib/builtins.py:3189
2300
#: bzrlib/builtins.py:3218
2302
2301
msgid "NAME_PATTERN should not be an absolute path"
2303
2302
msgstr "NAME_PATTERNに絶対パスは指定できません。"
2304
2303
2305
#: bzrlib/builtins.py:3202
2304
#: bzrlib/builtins.py:3231
2306
2305
#, python-format
2307
2306
msgid ""
2308
2307
"Warning: the following files are version controlled and match your ignore "
2315
2314
"%s\n"
2316
2315
"これらのファイルは、'bzr remove'しない限りはバージョン管理されたままです。\n"
2317
2316
2318
#: bzrlib/builtins.py:3209
2317
#: bzrlib/builtins.py:3238
2319
2318
msgid "List ignored files and the patterns that matched them."
2320
2319
msgstr "無視するファイルとそれらにマッチするパターンの一覧を表示する。"
2321
2320
2322
#: bzrlib/builtins.py:3211
2321
#: bzrlib/builtins.py:3240
2323
2322
msgid ""
2324
2323
"List all the ignored files and the ignore pattern that caused the file to\n"
2325
2324
"be ignored."
2326
2325
msgstr "無視されるファイルと、それがどのパターンによって無視されているかを一覧で表示します。"
2327
2326
2328
#: bzrlib/builtins.py:3214
2327
#: bzrlib/builtins.py:3243
2329
2328
msgid "Alternatively, to list just the files::"
2330
2329
msgstr "代わりにファイルの一覧だけを表示するには::"
2331
2330
2332
#: bzrlib/builtins.py:3216
2331
#: bzrlib/builtins.py:3245
2333
2332
msgid " bzr ls --ignored"
2334
2333
msgstr " bzr ls --ignored"
2335
2334
2336
#: bzrlib/builtins.py:3250
2335
#: bzrlib/builtins.py:3279
2337
2336
#, python-format
2338
2337
msgid "not a valid revision-number: %r"
2339
2338
msgstr "無効なリビジョン番号です。: %r"
2340
2339
2341
#: bzrlib/builtins.py:3257
2340
#: bzrlib/builtins.py:3286
2342
2341
msgid ""
2343
2342
"Export current or past revision to a destination directory or archive."
2344
2343
msgstr "最新、または過去のリビジョンを指定されたディレクトリもしくはアーカイブにエクスポートする。"
2345
2344
2346
#: bzrlib/builtins.py:3259
2345
#: bzrlib/builtins.py:3288
2347
2346
msgid "If no revision is specified this exports the last committed revision."
2348
2347
msgstr "リビジョンが指定されなければ、最終コミットのリビジョンをエクスポートします。"
2349
2348
2350
#: bzrlib/builtins.py:3261
2349
#: bzrlib/builtins.py:3290
2351
2350
msgid ""
2352
2351
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2353
2352
"given, try to find the format with the extension. If no extension\n"
2357
2356
" 何も渡されなければ、拡張子のフォーマットを見つけようとします。 拡張子がない\n"
2358
2357
"場合は、ディレクトリにエクスポートします(–format=dirと同等)。"
2359
2358
2360
#: bzrlib/builtins.py:3265
2359
#: bzrlib/builtins.py:3294
2361
2360
msgid ""
2362
2361
"If root is supplied, it will be used as the root directory inside\n"
2363
2362
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2368
2367
"ファイル名がデフォルトになります。rootオプションは、'dir'フォーマット\n"
2369
2368
"に対しては作用しません。"
2370
2369
2371
#: bzrlib/builtins.py:3269
2370
#: bzrlib/builtins.py:3298
2372
2371
msgid ""
2373
2372
"If branch is omitted then the branch containing the current working\n"
2374
2373
"directory will be used."
2375
2374
msgstr "ブランチが省略されると現在の作業ディレクトリを含むブランチが使用されます。"
2376
2375
2377
#: bzrlib/builtins.py:3272
2376
#: bzrlib/builtins.py:3301
2378
2377
msgid ""
2379
2378
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2380
2379
msgstr "注: ASCIIではないファイルを含むツリーの、zipへのエクスポートはサポートされません。"
2381
2380
2382
#: bzrlib/builtins.py:3274
2381
#: bzrlib/builtins.py:3303
2383
2382
msgid ""
2384
2383
" ================= =========================\n"
2385
2384
" Supported formats Autodetected by extension\n"
2401
2400
" zip .zip\n"
2402
2401
" ==================== ===================="
2403
2402
2404
#: bzrlib/builtins.py:3288
2403
#: bzrlib/builtins.py:3317
2405
2404
msgid "Type of file to export to."
2406
2405
msgstr "エクスポートするファイルの種類"
2407
2406
2408
#: bzrlib/builtins.py:3291
2407
#: bzrlib/builtins.py:3320
2409
2408
msgid "Apply content filters to export the convenient form."
2410
2409
msgstr "使いやすい形でエクスポートするためのコンテンツフィルターを適用します。"
2411
2410
2412
#: bzrlib/builtins.py:3295
2411
#: bzrlib/builtins.py:3324
2413
2412
msgid "Name of the root directory inside the exported file."
2414
2413
msgstr "エクスポートされたファイル内部のrootディレクトリの名前。"
2415
2414
2416
#: bzrlib/builtins.py:3297
2415
#: bzrlib/builtins.py:3326
2417
2416
msgid ""
2418
2417
"Set modification time of files to that of the last revision in which it was "
2419
2418
"changed."
2420
2419
msgstr "各ファイルの編集日時を、最後にそのファイルが変更されたリビジョンの日時に設定します。"
2421
2420
2422
#: bzrlib/builtins.py:3300
2421
#: bzrlib/builtins.py:3329
2423
2422
msgid ""
2424
2423
"Export the working tree contents rather than that of the last revision."
2425
2424
msgstr "最終リビジョンではなく、作業ツリーの内容をエクスポートします。"
2426
2425
2427
#: bzrlib/builtins.py:3319
2426
#: bzrlib/builtins.py:3348
2428
2427
msgid "--uncommitted requires a working tree"
2429
2428
msgstr "作業ツリーに対しては--uncommittedを指定する必要があります。"
2430
2429
2431
#: bzrlib/builtins.py:3328
2430
#: bzrlib/builtins.py:3357
2432
2431
#, python-format
2433
2432
msgid "Unsupported export format: %s"
2434
2433
msgstr "サポートされていないエクスポートフォーマット: %s"
2435
2434
2436
#: bzrlib/builtins.py:3332
2435
#: bzrlib/builtins.py:3361
2437
2436
msgid ""
2438
2437
"Write the contents of a file as of a given revision to standard output."
2439
2438
msgstr "指定されたリビジョンのファイルの内容を標準出力に書き出します。"
2440
2439
2441
#: bzrlib/builtins.py:3334
2440
#: bzrlib/builtins.py:3363
2442
2441
msgid "If no revision is nominated, the last revision is used."
2443
2442
msgstr "リビジョンが指定されなければ、最後のリビジョンが使用されます。"
2444
2443
2445
#: bzrlib/builtins.py:3336
2444
#: bzrlib/builtins.py:3365
2446
2445
msgid ""
2447
2446
"Note: Take care to redirect standard output when using this command on a\n"
2448
2447
"binary file."
2450
2449
"バイナリファイルでこのコマンドを使用する際には標準出力をリダイレクトするように\n"
2451
2450
"気をつけてください。"
2452
2451
2453
#: bzrlib/builtins.py:3342
2452
#: bzrlib/builtins.py:3371
2454
2453
msgid "The path name in the old tree."
2455
2454
msgstr "古いツリーのパス名。"
2456
2455
2457
#: bzrlib/builtins.py:3343
2456
#: bzrlib/builtins.py:3372
2458
2457
msgid "Apply content filters to display the convenience form."
2459
2458
msgstr "便利な形で表示するためのフィルタを適用します。"
2460
2459
2461
#: bzrlib/builtins.py:3354
2460
#: bzrlib/builtins.py:3383
2462
2461
msgid "bzr cat --revision takes exactly one revision specifier"
2463
2462
msgstr "bzr cat --revisionにはリビジョンをひとつだけ指定します。"
2464
2463
2465
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2464
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2466
2465
msgid "{0!r} is not present in revision {1}"
2467
2466
msgstr "{0!r}はリビジョン{1}には存在しません。"
2468
2467
2469
#: bzrlib/builtins.py:3414
2468
#: bzrlib/builtins.py:3443
2470
2469
msgid "Commit changes into a new revision."
2471
2470
msgstr "変更を新しいリビジョンにコミットする。"
2472
2471
2473
#: bzrlib/builtins.py:3416
2472
#: bzrlib/builtins.py:3445
2474
2473
msgid ""
2475
2474
"An explanatory message needs to be given for each commit. This is\n"
2476
2475
"often done by using the --message option (getting the message from the\n"
2486
2485
"エディタにロードされる定型文の中に変更されたファイルの情報を含めるためには、\n"
2487
2486
"--show-diffオプションを使用します。"
2488
2487
2489
#: bzrlib/builtins.py:3423
2488
#: bzrlib/builtins.py:3452
2490
2489
msgid ""
2491
2490
"By default, the entire tree is committed and the person doing the\n"
2492
2491
"commit is assumed to be the author. These defaults can be overridden\n"
2495
2494
"デフォルトでは、ツリー全体がコミットされ、コミットを実行した人が著者になります。\n"
2496
2495
"これは、以下のような方法で上書きすることができます。"
2497
2496
2498
#: bzrlib/builtins.py:3427
2497
#: bzrlib/builtins.py:3456
2499
2498
msgid ":Selective commits:"
2500
2499
msgstr ":部分的なコミット:"
2501
2500
2502
#: bzrlib/builtins.py:3429
2501
#: bzrlib/builtins.py:3458
2503
2502
msgid ""
2504
2503
" If selected files are specified, only changes to those files are\n"
2505
2504
" committed. If a directory is specified then the directory and\n"
2509
2508
" ディレクトリが指定された場合、そのディレクトリとその配下すべてが\n"
2510
2509
" コミット対象になります。"
2511
2510
2512
#: bzrlib/builtins.py:3433
2511
#: bzrlib/builtins.py:3462
2513
2512
msgid ""
2514
2513
" When excludes are given, they take precedence over selected files.\n"
2515
2514
" For example, to commit only changes within foo, but not changes\n"
2519
2518
" たとえば、foo配下の変更をコミットするが、foo/bar内はコミットしないという\n"
2520
2519
" 場合は::"
2521
2520
2522
#: bzrlib/builtins.py:3437
2521
#: bzrlib/builtins.py:3466
2523
2522
msgid " bzr commit foo -x foo/bar"
2524
2523
msgstr " bzr commit foo -x foo/bar"
2525
2524
2526
#: bzrlib/builtins.py:3439
2525
#: bzrlib/builtins.py:3468
2527
2526
msgid " A selective commit after a merge is not yet supported."
2528
2527
msgstr " マージ後の部分的なコミットはまだサポートされていません。"
2529
2528
2530
#: bzrlib/builtins.py:3441
2529
#: bzrlib/builtins.py:3470
2531
2530
msgid ":Custom authors:"
2532
2531
msgstr ":作者の変更:"
2533
2532
2534
#: bzrlib/builtins.py:3443
2533
#: bzrlib/builtins.py:3472
2535
2534
msgid ""
2536
2535
" If the author of the change is not the same person as the committer,\n"
2537
2536
" you can specify the author's name using the --author option. The\n"
2545
2544
" ように、コミッターのIDと同じフォーマットで指定するべきです。複数の作者が\n"
2546
2545
" いるなら、このオプションを複数回指定することもできます。"
2547
2546
2548
#: bzrlib/builtins.py:3450
2547
#: bzrlib/builtins.py:3479
2549
2548
msgid ":Checks:"
2550
2549
msgstr ":チェック:"
2551
2550
2552
#: bzrlib/builtins.py:3452
2551
#: bzrlib/builtins.py:3481
2553
2552
msgid ""
2554
2553
" A common mistake is to forget to add a new file or directory before\n"
2555
2554
" running the commit command. The --strict option checks for unknown\n"
2563
2562
" 前チェックをフックとして実装することもできます。詳細は ``bzr help hooks`` を\n"
2564
2563
" ご覧ください。"
2565
2564
2566
#: bzrlib/builtins.py:3458
2565
#: bzrlib/builtins.py:3487
2567
2566
msgid ":Things to note:"
2568
2567
msgstr ":特記事項:"
2569
2568
2570
#: bzrlib/builtins.py:3460
2569
#: bzrlib/builtins.py:3489
2571
2570
msgid ""
2572
2571
" If you accidentially commit the wrong changes or make a spelling\n"
2573
2572
" mistake in the commit message say, you can use the uncommit command\n"
2577
2576
" ミスがあった場合は、uncommitコマンドでコミットを取り消すことができます。\n"
2578
2577
" 詳細は ``bzr help uncommit`` をご覧ください。"
2579
2578
2580
#: bzrlib/builtins.py:3464
2579
#: bzrlib/builtins.py:3493
2581
2580
msgid ""
2582
2581
" Hooks can also be configured to run after a commit. This allows you\n"
2583
2582
" to trigger updates to external systems like bug trackers. The --fixes\n"
2589
2588
" バグとの関係を記録することができます。詳細は ``bzr help bugs`` を見て\n"
2590
2589
" ください。"
2591
2590
2592
#: bzrlib/builtins.py:3474
2591
#: bzrlib/builtins.py:3503
2593
2592
msgid "Do not consider changes made to a given path."
2594
2593
msgstr "指定されたパスの変更を無視します。"
2595
2594
2596
#: bzrlib/builtins.py:3477
2595
#: bzrlib/builtins.py:3506
2597
2596
msgid "Description of the new revision."
2598
2597
msgstr "新しいリビジョンの説明。"
2599
2598
2600
#: bzrlib/builtins.py:3480
2599
#: bzrlib/builtins.py:3509
2601
2600
msgid "Commit even if nothing has changed."
2602
2601
msgstr "何も変更されていなくてもコミットする。"
2603
2602
2604
#: bzrlib/builtins.py:3484
2603
#: bzrlib/builtins.py:3513
2605
2604
msgid "Take commit message from this file."
2606
2605
msgstr "このファイルからコミットメッセージを取得する。"
2607
2606
2608
#: bzrlib/builtins.py:3486
2607
#: bzrlib/builtins.py:3515
2609
2608
msgid "Refuse to commit if there are unknown files in the working tree."
2610
2609
msgstr "作業ツリーの中にバージョン管理外のファイルが存在する場合コミットを拒否する。"
2611
2610
2612
#: bzrlib/builtins.py:3489
2611
#: bzrlib/builtins.py:3518
2613
2612
msgid ""
2614
2613
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2615
2614
"08:00:00 +0100'."
2616
2615
msgstr "コミット日時を決められたフォーマットで手動で指定します。例) '2009-10-10 08:00:00 +0100'"
2617
2616
2618
#: bzrlib/builtins.py:3492
2617
#: bzrlib/builtins.py:3521
2619
2618
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2620
2619
msgstr "このリビジョンで修正されたバグをマークする(\"bzr help bugs\"を参照)。"
2621
2620
2622
#: bzrlib/builtins.py:3495
2621
#: bzrlib/builtins.py:3524
2623
2622
msgid "Set the author's name, if it's different from the committer."
2624
2623
msgstr "著者の名前がコミッターとは異なる場合、著者の名前を設定する。"
2625
2624
2626
#: bzrlib/builtins.py:3498
2625
#: bzrlib/builtins.py:3527
2627
2626
msgid ""
2628
2627
"Perform a local commit in a bound branch. Local commits are not pushed to "
2629
2628
"the master branch until a normal commit is performed."
2630
2629
msgstr ""
2631
2630
"バインドされたブランチにローカルコミットを実行する。 通常のコミットが実行されるまで ローカルコミットはマスターブランチにpushされません。"
2632
2631
2633
#: bzrlib/builtins.py:3504
2632
#: bzrlib/builtins.py:3533
2634
2633
msgid ""
2635
2634
"When no message is supplied, show the diff along with the status summary in "
2636
2635
"the message editor."
2637
2636
msgstr "メッセージが提供されないとき、 メッセージエディタでステータスの要約と一緒に差分を表示する。"
2638
2637
2639
#: bzrlib/builtins.py:3507
2638
#: bzrlib/builtins.py:3536
2640
2639
msgid ""
2641
2640
"When committing to a foreign version control system do not push data that "
2642
2641
"can not be natively represented."
2643
2642
msgstr "外部のバージョン管理システムにコミットするときに、ネイティブに表現できないデータをプッシュしません。"
2644
2643
2645
#: bzrlib/builtins.py:3525
2644
#: bzrlib/builtins.py:3554
2646
2645
#, python-format
2647
2646
msgid ""
2648
2647
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2653
2652
"オプションで指定してください。\n"
2654
2653
"詳細は \"bzr help bugs\" をご覧ください。コミットは拒否されました。"
2655
2654
2656
#: bzrlib/builtins.py:3534
2655
#: bzrlib/builtins.py:3563
2657
2656
#, python-format
2658
2657
msgid ""
2659
2658
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2663
2662
"無効なバグです。 %s 'トラッカー:id' の形式で指定する必要があります。詳細は \"bzr help bugs\" をご覧ください。\n"
2664
2663
"コミットは拒否されました。"
2665
2664
2666
#: bzrlib/builtins.py:3543
2665
#: bzrlib/builtins.py:3572
2667
2666
#, python-format
2668
2667
msgid "Unrecognized bug %s. Commit refused."
2669
2668
msgstr "不明なバグです。 %s コミットは拒否されました。"
2670
2669
2671
#: bzrlib/builtins.py:3546
2670
#: bzrlib/builtins.py:3575
2672
2671
#, python-format
2673
2672
msgid ""
2674
2673
"%s\n"
2677
2676
"%s\n"
2678
2677
"コミットは拒否されました。"
2679
2678
2680
#: bzrlib/builtins.py:3570
2679
#: bzrlib/builtins.py:3599
2681
2680
msgid "Could not parse --commit-time: "
2682
2681
msgstr "--commit-timeをパースできません。: "
2683
2682
2684
#: bzrlib/builtins.py:3610
2683
#: bzrlib/builtins.py:3639
2685
2684
msgid "please specify either --message or --file"
2686
2685
msgstr "--message か --file かどちらかを指定してください。"
2687
2686
2688
#: bzrlib/builtins.py:3639
2687
#: bzrlib/builtins.py:3668
2689
2688
msgid "please specify a commit message with either --message or --file"
2690
2689
msgstr "--messageか--fileのどちらかでコミットメッセージを指定してください。"
2691
2690
2692
#: bzrlib/builtins.py:3642
2691
#: bzrlib/builtins.py:3671
2693
2692
msgid ""
2694
2693
"Empty commit message specified. Please specify a commit message with either -"
2695
2694
"-message or --file or leave a blank message with --message \"\"."
2697
2696
"空のコミットメッセージが指定されました。--messageか--fileでコミットメッセージを指定するか、--message "
2698
2697
"\"\"で空メッセージを指定してください。"
2699
2698
2700
#: bzrlib/builtins.py:3662
2699
#: bzrlib/builtins.py:3691
2701
2700
msgid ""
2702
2701
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2703
2702
"-unchanged to force an empty commit."
2704
2703
msgstr ""
2705
2704
"コミットする変更がありません。コミットしたいファイルを'bzr add'で追加するか、--unchangedを指定して空のコミットを実行してください。"
2706
2705
2707
#: bzrlib/builtins.py:3666
2706
#: bzrlib/builtins.py:3695
2708
2707
msgid ""
2709
2708
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2710
2709
"resolve FILE\" to resolve."
2711
2710
msgstr "作業ツリーに競合があります。\"bzr conflicts\" で表示して、\"bzr resolve FILE\"で解消してください。"
2712
2711
2713
#: bzrlib/builtins.py:3670
2712
#: bzrlib/builtins.py:3699
2714
2713
msgid "Commit refused because there are unknown files in the working tree."
2715
2714
msgstr "作業ツリーにバージョン管理外のファイルがあるため、コミットが拒否されました。"
2716
2715
2717
#: bzrlib/builtins.py:3673
2716
#: bzrlib/builtins.py:3702
2718
2717
msgid ""
2719
2718
"\n"
2720
2719
"To commit to master branch, run update and then commit.\n"
2724
2723
"マスタブランチにコミットするには、先にupdateしてください。\n"
2725
2724
"--localを指定してオフラインでコミットし、作業を続けることもできます。"
2726
2725
2727
#: bzrlib/builtins.py:3681
2726
#: bzrlib/builtins.py:3710
2728
2727
msgid ""
2729
2728
"Validate working tree structure, branch consistency and repository history."
2730
2729
msgstr "作業ツリーの構造、ブランチの一貫性、リポジトリの履歴をチェックします。"
2731
2730
2732
#: bzrlib/builtins.py:3683
2731
#: bzrlib/builtins.py:3712
2733
2732
msgid ""
2734
2733
"This command checks various invariants about branch and repository storage\n"
2735
2734
"to detect data corruption or bzr bugs."
2737
2736
"このコマンドは、データの破損やbzrのバグを検出するために、ブランチとリポジトリ\n"
2738
2737
"ストレージの不変条件をチェックします。"
2739
2738
2740
#: bzrlib/builtins.py:3686
2739
#: bzrlib/builtins.py:3715
2741
2740
msgid ""
2742
2741
"The working tree and branch checks will only give output if a problem is\n"
2743
2742
"detected. The output fields of the repository check are:"
2745
2744
"作業ツリーとブランチのチェック結果は、問題が見つかったときだけ表示\n"
2746
2745
"されます。リポジトリチェックの出力は次の通りです。:"
2747
2746
2748
#: bzrlib/builtins.py:3689
2747
#: bzrlib/builtins.py:3718
2749
2748
msgid ""
2750
2749
"revisions\n"
2751
2750
" This is just the number of revisions checked. It doesn't\n"
2754
2753
"revisions\n"
2755
2754
" チェックしたリビジョンの数です。これは問題ではありません。"
2756
2755
2757
#: bzrlib/builtins.py:3693
2756
#: bzrlib/builtins.py:3722
2758
2757
msgid ""
2759
2758
"versionedfiles\n"
2760
2759
" This is just the number of versionedfiles checked. It\n"
2764
2763
" チェックしたバージョン管理ファイルの数です。これは問題では\n"
2765
2764
" ありません。"
2766
2765
2767
#: bzrlib/builtins.py:3697
2766
#: bzrlib/builtins.py:3726
2768
2767
msgid ""
2769
2768
"unreferenced ancestors\n"
2770
2769
" Texts that are ancestors of other texts, but\n"
2776
2775
" と思われるテキストです。これは、Bazaarが対処できる軽微な\n"
2777
2776
" 問題です。"
2778
2777
2779
#: bzrlib/builtins.py:3702
2778
#: bzrlib/builtins.py:3731
2780
2779
msgid ""
2781
2780
"unique file texts\n"
2782
2781
" This is the total number of unique file contents\n"
2786
2785
" チェックしたリビジョンの中にある、一意なファイルコンテンツの数です。\n"
2787
2786
" これは問題ではありません。"
2788
2787
2789
#: bzrlib/builtins.py:3706
2788
#: bzrlib/builtins.py:3735
2790
2789
msgid ""
2791
2790
"repeated file texts\n"
2792
2791
" This is the total number of repeated texts seen\n"
2799
2798
" ファイルのエントリが変更されたが、内容は変更されていない場合に、\n"
2800
2799
" 重複が発生します。これは問題ではありません。"
2801
2800
2802
#: bzrlib/builtins.py:3712
2801
#: bzrlib/builtins.py:3741
2803
2802
msgid ""
2804
2803
"If no restrictions are specified, all Bazaar data that is found at the "
2805
2804
"given\n"
2808
2807
"条件が指定されなければ、指定された場所の全てのBazaarデータが\n"
2809
2808
"チェックされます。"
2810
2809
2811
#: bzrlib/builtins.py:3717
2810
#: bzrlib/builtins.py:3746
2812
2811
msgid " Check the tree and branch at 'foo'::"
2813
2812
msgstr " ‘foo’ でのツリーとブランチをチェックする::"
2814
2813
2815
#: bzrlib/builtins.py:3719
2814
#: bzrlib/builtins.py:3748
2816
2815
msgid " bzr check --tree --branch foo"
2817
2816
msgstr " bzr check --tree --branch foo"
2818
2817
2819
#: bzrlib/builtins.py:3721
2818
#: bzrlib/builtins.py:3750
2820
2819
msgid " Check only the repository at 'bar'::"
2821
2820
msgstr " ‘bar’でのリポジトリのみをチェックする::"
2822
2821
2823
#: bzrlib/builtins.py:3723
2822
#: bzrlib/builtins.py:3752
2824
2823
msgid " bzr check --repo bar"
2825
2824
msgstr " bzr check --repo bar"
2826
2825
2827
#: bzrlib/builtins.py:3725
2826
#: bzrlib/builtins.py:3754
2828
2827
msgid " Check everything at 'baz'::"
2829
2828
msgstr " ‘baz’ ですべてをチェックする::"
2830
2829
2831
#: bzrlib/builtins.py:3727
2830
#: bzrlib/builtins.py:3756
2832
2831
msgid " bzr check baz"
2833
2832
msgstr " bzr check baz"
2834
2833
2835
#: bzrlib/builtins.py:3733
2834
#: bzrlib/builtins.py:3762
2836
2835
msgid "Check the branch related to the current directory."
2837
2836
msgstr "現在のディレクトリに関連したブランチをチェックする。"
2838
2837
2839
#: bzrlib/builtins.py:3735
2838
#: bzrlib/builtins.py:3764
2840
2839
msgid "Check the repository related to the current directory."
2841
2840
msgstr "現在のディレクトリに関連したリポジトリをチェックする。"
2842
2841
2843
#: bzrlib/builtins.py:3737
2842
#: bzrlib/builtins.py:3766
2844
2843
msgid "Check the working tree related to the current directory."
2845
2844
msgstr "現在のディレクトリに関連した作業ツリーをチェックする。"
2846
2845
2847
#: bzrlib/builtins.py:3751
2846
#: bzrlib/builtins.py:3780
2848
2847
msgid "Upgrade a repository, branch or working tree to a newer format."
2849
2848
msgstr "リポジトリ、ブランチ、作業ツリーを新しいフォーマットにアップグレードします。"
2850
2849
2851
#: bzrlib/builtins.py:3753
2850
#: bzrlib/builtins.py:3782
2852
2851
msgid ""
2853
2852
"When the default format has changed after a major new release of\n"
2854
2853
"Bazaar, you may be informed during certain operations that you\n"
2862
2861
"新しい機能が使えるようになるでしょう。ただし、古いバージョンのリポジトリや\n"
2863
2862
"Bazaarとの互換性には制限が発生するかもしれません。"
2864
2863
2865
#: bzrlib/builtins.py:3759
2864
#: bzrlib/builtins.py:3788
2866
2865
msgid ""
2867
2866
"If you wish to upgrade to a particular format rather than the\n"
2868
2867
"current default, that can be specified using the --format option.\n"
2877
2876
"あります。(たとえば、1.xのデフォルトから2.xのデフォルトへの変換は不可逆です)\n"
2878
2877
"そのため、ダウングレードできない場合もあります。"
2879
2878
2880
#: bzrlib/builtins.py:3766
2879
#: bzrlib/builtins.py:3795
2881
2880
msgid ""
2882
2881
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2883
2882
"process (where # is a number). By default, this is left there on\n"
2894
2893
"ディレクトリは削除されます。そうでない場合は、変換後特に問題がなければ手で\n"
2895
2894
"削除してください。"
2896
2895
2897
#: bzrlib/builtins.py:3774
2896
#: bzrlib/builtins.py:3803
2898
2897
msgid ""
2899
2898
"If the location given is a shared repository, dependent branches\n"
2900
2899
"are also converted provided the repository converts successfully.\n"
2905
2904
"配下のブランチも変換されます。もしブランチの変換に失敗しても、他の\n"
2906
2905
"ブランチの変換は続行されます。"
2907
2906
2908
#: bzrlib/builtins.py:3779
2907
#: bzrlib/builtins.py:3808
2909
2908
msgid ""
2910
2909
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2911
2910
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2913
2912
"アップグレードに関する詳細な情報は、Bazaar Upgrade Guideをご覧ください。\n"
2914
2913
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2915
2914
2916
#: bzrlib/builtins.py:3787
2915
#: bzrlib/builtins.py:3816
2917
2916
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2918
2917
msgstr "指定されたフォーマットにアップグレードします。詳細は\"bzr help formats\"をご覧ください。"
2919
2918
2920
#: bzrlib/builtins.py:3791
2919
#: bzrlib/builtins.py:3820
2921
2920
msgid "Branch format"
2922
2921
msgstr "ブランチフォーマット"
2923
2922
2924
#: bzrlib/builtins.py:3793
2923
#: bzrlib/builtins.py:3822
2925
2924
msgid "Remove the backup.bzr directory if successful."
2926
2925
msgstr "変換に成功したらbackup.bzrディレクトリを削除します。"
2927
2926
2928
#: bzrlib/builtins.py:3795
2927
#: bzrlib/builtins.py:3824
2929
2928
msgid "Show what would be done, but don't actually do anything."
2930
2929
msgstr "何が実行されるかを表示しますが、実際には何もしません。"
2931
2930
2932
#: bzrlib/builtins.py:3810
2931
#: bzrlib/builtins.py:3839
2933
2932
msgid "Show or set bzr user id."
2934
2933
msgstr "bzrのユーザIDを表示、設定します。"
2935
2934
2936
#: bzrlib/builtins.py:3812
2935
#: bzrlib/builtins.py:3841
2937
2936
msgid ""
2938
2937
":Examples:\n"
2939
2938
" Show the email of the current user::"
2941
2940
":例:\n"
2942
2941
" 現在のユーザのEメールを表示します。::"
2943
2942
2944
#: bzrlib/builtins.py:3815
2943
#: bzrlib/builtins.py:3844
2945
2944
msgid " bzr whoami --email"
2946
2945
msgstr " bzr whoami --email"
2947
2946
2948
#: bzrlib/builtins.py:3817
2947
#: bzrlib/builtins.py:3846
2949
2948
msgid " Set the current user::"
2950
2949
msgstr " ユーザを設定します。::"
2951
2950
2952
#: bzrlib/builtins.py:3819
2951
#: bzrlib/builtins.py:3848
2953
2952
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2954
2953
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
2955
2954
2956
#: bzrlib/builtins.py:3823
2955
#: bzrlib/builtins.py:3852
2957
2956
msgid "Display email address only."
2958
2957
msgstr "Eメールアドレスだけを表示します。"
2959
2958
2960
#: bzrlib/builtins.py:3825
2959
#: bzrlib/builtins.py:3854
2961
2960
msgid "Set identity for the current branch instead of globally."
2962
2961
msgstr "全体設定ではなく、現在のブランチだけにIDを設定します。"
2963
2962
2964
#: bzrlib/builtins.py:3851
2963
#: bzrlib/builtins.py:3880
2965
2964
msgid "--email can only be used to display existing identity"
2966
2965
msgstr "--emailは、現在のIDを表示するためだけに使用できます。"
2967
2966
2968
#: bzrlib/builtins.py:3873
2967
#: bzrlib/builtins.py:3904
2969
2968
msgid "Print or set the branch nickname."
2970
2969
msgstr "ブランチのニックネームを表示または設定します。"
2971
2970
2972
#: bzrlib/builtins.py:3875
2971
#: bzrlib/builtins.py:3906
2973
2972
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."
2973
"If unset, the colocated branch name is used for colocated branches, and\n"
2974
"the branch directory name is used for other branches. To print the\n"
2975
"current nickname, execute with no argument."
2976
2976
msgstr ""
2977
"設定されていない場合は、ツリーのルートディレクトリの名前が\n"
2978
"ニックネームとして扱われます。引数なしで実行すると、現在の\n"
2979
"ニックネームを表示します。"
2980
2977
2981
#: bzrlib/builtins.py:3878
2978
#: bzrlib/builtins.py:3910
2982
2979
msgid ""
2983
2980
"Bound branches use the nickname of its master branch unless it is set\n"
2984
2981
"locally."
2986
2983
"バインドされたブランチは、ローカルでニックネームが設定されていなければ\n"
2987
2984
"マスタブランチのニックネームを使用します。"
2988
2985
2989
#: bzrlib/builtins.py:3898
2986
#: bzrlib/builtins.py:3930
2990
2987
msgid "Set/unset and display aliases."
2991
2988
msgstr "エイリアスの設定、解除、表示を行います。"
2992
2989
2993
#: bzrlib/builtins.py:3900
2990
#: bzrlib/builtins.py:3932
2994
2991
msgid ""
2995
2992
":Examples:\n"
2996
2993
" Show the current aliases::"
2998
2995
":例:\n"
2999
2996
" 現在のエイリアスを表示します。::"
3000
2997
3001
#: bzrlib/builtins.py:3903
2998
#: bzrlib/builtins.py:3935
3002
2999
msgid " bzr alias"
3003
3000
msgstr " bzr alias"
3004
3001
3005
#: bzrlib/builtins.py:3905
3002
#: bzrlib/builtins.py:3937
3006
3003
msgid " Show the alias specified for 'll'::"
3007
3004
msgstr " 'll'に設定されているエイリアスを表示します。::"
3008
3005
3009
#: bzrlib/builtins.py:3907
3006
#: bzrlib/builtins.py:3939
3010
3007
msgid " bzr alias ll"
3011
3008
msgstr " bzr alias ll"
3012
3009
3013
#: bzrlib/builtins.py:3909
3010
#: bzrlib/builtins.py:3941
3014
3011
msgid " Set an alias for 'll'::"
3015
3012
msgstr " エイリアス'll'を設定します。::"
3016
3013
3017
#: bzrlib/builtins.py:3911
3014
#: bzrlib/builtins.py:3943
3018
3015
msgid " bzr alias ll=\"log --line -r-10..-1\""
3019
3016
msgstr " bzr alias ll=\"log --line -r-10..-1\""
3020
3017
3021
#: bzrlib/builtins.py:3913
3018
#: bzrlib/builtins.py:3945
3022
3019
msgid " To remove an alias for 'll'::"
3023
3020
msgstr " エイリアス'll'を解除します。::"
3024
3021
3025
#: bzrlib/builtins.py:3915
3022
#: bzrlib/builtins.py:3947
3026
3023
msgid " bzr alias --remove ll"
3027
3024
msgstr " bzr alias --remove ll"
3028
3025
3029
#: bzrlib/builtins.py:3920
3026
#: bzrlib/builtins.py:3952
3030
3027
msgid "Remove the alias."
3031
3028
msgstr "エイリアスを削除します。"
3032
3029
3033
#: bzrlib/builtins.py:3938
3030
#: bzrlib/builtins.py:3970
3034
3031
msgid "bzr alias --remove expects an alias to remove."
3035
3032
msgstr "bzr alias --removeには、削除するエイリアス名を指定する必要があります。"
3036
3033
3037
#: bzrlib/builtins.py:4119
3034
#: bzrlib/builtins.py:4151
3038
3035
msgid ""
3039
3036
"subunit not available. subunit needs to be installed to use --subunit."
3040
3037
msgstr ""
3041
3038
3042
#: bzrlib/builtins.py:4136
3039
#: bzrlib/builtins.py:4168
3043
3040
msgid ""
3044
3041
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3045
3042
msgstr "--benchmarkは、bzr2.2以降はサポートしていません。かわりにbzr-usertestを使用してください。"
3046
3043
3047
#: bzrlib/builtins.py:4183
3044
#: bzrlib/builtins.py:4215
3048
3045
msgid "Show version of bzr."
3049
3046
msgstr "Bazaarのバージョンを表示します。"
3050
3047
3051
#: bzrlib/builtins.py:4187
3048
#: bzrlib/builtins.py:4219
3052
3049
msgid "Print just the version number."
3053
3050
msgstr "リビジョン番号を表示します。"
3054
3051
3055
#: bzrlib/builtins.py:4206
3052
#: bzrlib/builtins.py:4238
3056
3053
msgid "It sure does!\n"
3057
3054
msgstr ""
3058
3055
3059
#: bzrlib/builtins.py:4230
3056
#: bzrlib/builtins.py:4262
3060
3057
#, python-format
3061
3058
msgid "merge base is revision %s\n"
3062
3059
msgstr "マージの起点はリビジョン %s です。\n"
3063
3060
3064
#: bzrlib/builtins.py:4234
3061
#: bzrlib/builtins.py:4266
3065
3062
msgid "Perform a three-way merge."
3066
3063
msgstr "3wayマージを実行します。"
3067
3064
3068
#: bzrlib/builtins.py:4236
3065
#: bzrlib/builtins.py:4268
3069
3066
msgid ""
3070
3067
"The source of the merge can be specified either in the form of a branch,\n"
3071
3068
"or in the form of a path to a file containing a merge directive generated\n"
3081
3078
"別のブランチ内のファイルパスをマージ元として指定することもでき、その場合は\n"
3082
3079
"指定されたファイルの変更だけが現在のブランチにマージされます。"
3083
3080
3084
#: bzrlib/builtins.py:4244
3081
#: bzrlib/builtins.py:4276
3085
3082
msgid ""
3086
3083
"When merging from a branch, by default bzr will try to merge in all new\n"
3087
3084
"work from the other branch, automatically determining an appropriate base\n"
3091
3088
"判定し、それ以降のすべての変更をマージしようとします。もしこれが失敗した場合は、\n"
3092
3089
"明示的にベースリビジョンを指定する必要があります。"
3093
3090
3094
#: bzrlib/builtins.py:4248
3091
#: bzrlib/builtins.py:4280
3095
3092
msgid ""
3096
3093
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3097
3094
"try to merge in all new work up to and including revision OTHER."
3099
3096
"別の最終リビジョンを指定するには、\"-revision OTHER\"を指定します。この場合、\n"
3100
3097
"OTHERまで(OTHERも含む)の全ての変更がマージされます。"
3101
3098
3102
#: bzrlib/builtins.py:4251
3099
#: bzrlib/builtins.py:4283
3103
3100
msgid ""
3104
3101
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3105
3102
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3116
3113
"とはちがい、今のところBazaarではチェリーピックは追跡しません。変更は、普通の\n"
3117
3114
"コミットのように見え、マージ元での変更履歴は保存されません。"
3118
3115
3119
#: bzrlib/builtins.py:4259
3116
#: bzrlib/builtins.py:4291
3120
3117
msgid "Revision numbers are always relative to the source branch."
3121
3118
msgstr "リビジョン番号は常に元のブランチに関連します。"
3122
3119
3123
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3120
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3124
3121
msgid ""
3125
3122
"Merge will do its best to combine the changes in two branches, but there\n"
3126
3123
"are some kinds of problems only a human can fix. When it encounters those,\n"
3128
3125
"before you can commit."
3129
3126
msgstr ""
3130
3127
3131
#: bzrlib/builtins.py:4266
3128
#: bzrlib/builtins.py:4298
3132
3129
msgid ""
3133
3130
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3134
3131
msgstr "問題を解消したら、bzr resolveを使用してください。bzr conflictsもご覧ください。"
3135
3132
3136
#: bzrlib/builtins.py:4268
3133
#: bzrlib/builtins.py:4300
3137
3134
msgid ""
3138
3135
"If there is no default branch set, the first merge will set it (use\n"
3139
3136
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3146
3143
"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモートの\n"
3147
3144
"ブランチにアクセスできた時だけ保存されます。"
3148
3145
3149
#: bzrlib/builtins.py:4273
3146
#: bzrlib/builtins.py:4305
3150
3147
msgid ""
3151
3148
"The results of the merge are placed into the destination working\n"
3152
3149
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3155
3152
"マージの結果はマージ先の作業ツリー内に反映され、そこで(bzr diffを使って)\n"
3156
3153
"レビューしたり、テストをしたあとで、コミットによって記録することができます。"
3157
3154
3158
#: bzrlib/builtins.py:4277
3155
#: bzrlib/builtins.py:4309
3159
3156
msgid ""
3160
3157
"merge refuses to run if there are any uncommitted changes, unless\n"
3161
3158
"--force is given. If --force is given, then the changes from the source \n"
3168
3165
"マージ元の変更がマージされます。--forceオプションを使えば、２つ以上の親を持つ\n"
3169
3166
"マージリビジョンを作ることもできます。"
3170
3167
3171
#: bzrlib/builtins.py:4283
3168
#: bzrlib/builtins.py:4315
3172
3169
msgid ""
3173
3170
"If one would like to merge changes from the working tree of the other\n"
3174
3171
"branch without merging any committed revisions, the --uncommitted option\n"
3177
3174
"コミット済みの変更ではなく、作業ツリー上での変更を別のブランチにマージしたい\n"
3178
3175
"場合は、--uncommittedオプションを指定することができます。"
3179
3176
3180
#: bzrlib/builtins.py:4287
3177
#: bzrlib/builtins.py:4319
3181
3178
msgid ""
3182
3179
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3183
3180
"you to apply each diff hunk and file change, similar to \"shelve\"."
3185
3182
"変更を部分的にマージしたければ、\"merge -i\"を使用すれば、\"shelve\"と同じ\n"
3186
3183
"ようにそれぞれのハンクをプロンプトで選択して適用することができます。"
3187
3184
3188
#: bzrlib/builtins.py:4290
3185
#: bzrlib/builtins.py:4322
3189
3186
msgid ""
3190
3187
":Examples:\n"
3191
3188
" To merge all new revisions from bzr.dev::"
3193
3190
":例:\n"
3194
3191
" bzr.devから全ての新しいリビジョンをマージします。::"
3195
3192
3196
#: bzrlib/builtins.py:4293
3193
#: bzrlib/builtins.py:4325
3197
3194
msgid " bzr merge ../bzr.dev"
3198
3195
msgstr " bzr merge ../bzr.dev"
3199
3196
3200
#: bzrlib/builtins.py:4295
3197
#: bzrlib/builtins.py:4327
3201
3198
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3202
3199
msgstr " bzr.devから、リビジョン82まで(82も含む)のリビジョンをマージします::"
3203
3200
3204
#: bzrlib/builtins.py:4297
3201
#: bzrlib/builtins.py:4329
3205
3202
msgid " bzr merge -r 82 ../bzr.dev"
3206
3203
msgstr " bzr merge -r 82 ../bzr.dev"
3207
3204
3208
#: bzrlib/builtins.py:4299
3205
#: bzrlib/builtins.py:4331
3209
3206
msgid " To merge the changes introduced by 82, without previous changes::"
3210
3207
msgstr " リビジョン82での変更をマージし、それ以前の変更はマージしません。::"
3211
3208
3212
#: bzrlib/builtins.py:4301
3209
#: bzrlib/builtins.py:4333
3213
3210
msgid " bzr merge -r 81..82 ../bzr.dev"
3214
3211
msgstr " bzr merge -r 81..82 ../bzr.dev"
3215
3212
3216
#: bzrlib/builtins.py:4303
3213
#: bzrlib/builtins.py:4335
3217
3214
msgid " To apply a merge directive contained in /tmp/merge::"
3218
3215
msgstr " /tmp/merge内のマージディレクティブを適用します。::"
3219
3216
3220
#: bzrlib/builtins.py:4305
3217
#: bzrlib/builtins.py:4337
3221
3218
msgid " bzr merge /tmp/merge"
3222
3219
msgstr " bzr merge /tmp/merge"
3223
3220
3224
#: bzrlib/builtins.py:4307
3221
#: bzrlib/builtins.py:4339
3225
3222
msgid ""
3226
3223
" To create a merge revision with three parents from two branches\n"
3227
3224
" feature1a and feature1b:"
3229
3226
" feature1a、feature1bの２つのブランチから、３つの親を持つマージ\n"
3230
3227
" リビジョンを作ります。::"
3231
3228
3232
#: bzrlib/builtins.py:4310
3229
#: bzrlib/builtins.py:4342
3233
3230
msgid ""
3234
3231
" bzr merge ../feature1a\n"
3235
3232
" bzr merge ../feature1b --force\n"
3239
3236
" bzr merge ../feature1b --force\n"
3240
3237
" bzr commit -m 'revision with three parents'"
3241
3238
3242
#: bzrlib/builtins.py:4322
3239
#: bzrlib/builtins.py:4354
3243
3240
msgid "Merge even if the destination tree has uncommitted changes."
3244
3241
msgstr "マージ先のツリーにコミットしていない変更があってもマージします。"
3245
3242
3246
#: bzrlib/builtins.py:4328
3243
#: bzrlib/builtins.py:4360
3247
3244
msgid ""
3248
3245
"Apply uncommitted changes from a working copy, instead of branch changes."
3249
3246
msgstr "ブランチの変更ではなく、作業コピー上のコミットしていない変更をマージします。"
3250
3247
3251
#: bzrlib/builtins.py:4330
3248
#: bzrlib/builtins.py:4362
3252
3249
msgid ""
3253
3250
"If the destination is already completely merged into the source, pull from "
3254
3251
"the source rather than merging. When this happens, you do not need to "
3257
3254
"マージ先のリビジョンがマージ元のブランチにすべて含まれている場合、マージの\n"
3258
3255
"かわりにpullを実行します。その場合は、コミットする必要はありません。"
3259
3256
3260
#: bzrlib/builtins.py:4335
3257
#: bzrlib/builtins.py:4367
3261
3258
msgid ""
3262
3259
"Branch to merge into, rather than the one containing the working directory."
3263
3260
msgstr "作業ディレクトリ以外にマージする場合の、マージ先のブランチ。"
3264
3261
3265
#: bzrlib/builtins.py:4337
3262
#: bzrlib/builtins.py:4369
3266
3263
msgid "Instead of merging, show a diff of the merge."
3267
3264
msgstr "マージを実行するかわりに、マージされる内容のdiffを表示します。"
3268
3265
3269
#: bzrlib/builtins.py:4339
3266
#: bzrlib/builtins.py:4371
3270
3267
msgid "Select changes interactively."
3271
3268
msgstr "変更をインタラクティブに選択します。"
3272
3269
3273
#: bzrlib/builtins.py:4361
3270
#: bzrlib/builtins.py:4393
3274
3271
msgid ""
3275
3272
"Merging into empty branches not currently supported, "
3276
3273
"https://bugs.launchpad.net/bzr/+bug/308562"
3277
3274
msgstr ""
3278
3275
"空ブランチへのマージは今のところサポートされていません。https://bugs.launchpad.net/bzr/+bug/308562"
3279
3276
3280
#: bzrlib/builtins.py:4388
3277
#: bzrlib/builtins.py:4420
3281
3278
msgid "Cannot use --uncommitted with bundles or merge directives."
3282
3279
msgstr "バンドル、マージディレクティブに対して--uncommittedを指定することはできません。"
3283
3280
3284
#: bzrlib/builtins.py:4399
3281
#: bzrlib/builtins.py:4431
3285
3282
msgid "Cannot use --uncommitted and --revision at the same time."
3286
3283
msgstr "--uncommittedと--revisionを同時に指定することはできません。"
3287
3284
3288
#: bzrlib/builtins.py:4419
3285
#: bzrlib/builtins.py:4451
3289
3286
msgid "merger: "
3290
3287
msgstr ""
3291
3288
3292
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
3289
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
3293
3290
msgid "Nothing to do."
3294
3291
msgstr "なにもすることがありません。"
3295
3292
3296
#: bzrlib/builtins.py:4425
3293
#: bzrlib/builtins.py:4457
3297
3294
msgid "Cannot pull individual files"
3298
3295
msgstr "ファイルを個別にpullすることはできません。"
3299
3296
3300
#: bzrlib/builtins.py:4433
3297
#: bzrlib/builtins.py:4465
3301
3298
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3302
3299
msgstr "ブランチにコミットがありません。('bzr pull'を使うべきかもしれません)"
3303
3300
3304
#: bzrlib/builtins.py:4491
3301
#: bzrlib/builtins.py:4523
3305
3302
#, python-format
3306
3303
msgid "Show-base is not supported for this merge type. %s"
3307
3304
msgstr "Show-baseはこのマージタイプではサポートされません。 %s"
3308
3305
3309
#: bzrlib/builtins.py:4500
3306
#: bzrlib/builtins.py:4532
3310
3307
#, python-format
3311
3308
msgid "Conflict reduction is not supported for merge type %s."
3312
3309
msgstr "衝突の縮小化は、このマージタイプではサポートされません。 %s"
3313
3310
3314
#: bzrlib/builtins.py:4504
3311
#: bzrlib/builtins.py:4536
3315
3312
msgid "Cannot do conflict reduction and show base."
3316
3313
msgstr "衝突の縮小化、ベースの表示ができませんでした。"
3317
3314
3318
#: bzrlib/builtins.py:4615
3315
#: bzrlib/builtins.py:4647
3319
3316
msgid "No location specified or remembered"
3320
3317
msgstr "対象の場所が設定も指定もされていません。"
3321
3318
3322
#: bzrlib/builtins.py:4617
3319
#: bzrlib/builtins.py:4649
3323
3320
msgid "{0} remembered {1} location {2}"
3324
3321
msgstr "{0} 設定された {1} の場所 {2}"
3325
3322
3326
#: bzrlib/builtins.py:4623
3323
#: bzrlib/builtins.py:4655
3327
3324
msgid "Redo a merge."
3328
3325
msgstr "マージをやりなおします。"
3329
3326
3330
#: bzrlib/builtins.py:4625
3327
#: bzrlib/builtins.py:4657
3331
3328
msgid ""
3332
3329
"Use this if you want to try a different merge technique while resolving\n"
3333
3330
"conflicts. Some merge techniques are better than others, and remerge\n"
3337
3334
"使用します。他のものより優れたマージ方法があり、remergeを使って個々の\n"
3338
3335
"ファイルに別のマージ方法を試すことができます。"
3339
3336
3340
#: bzrlib/builtins.py:4629
3337
#: bzrlib/builtins.py:4661
3341
3338
msgid ""
3342
3339
"The options for remerge have the same meaning and defaults as the ones for\n"
3343
3340
"merge. The difference is that remerge can (only) be run when there is a\n"
3347
3344
"remergeはマージ中状態のときだけ実行でき、特定のファイルを指定できる\n"
3348
3345
"ということです。"
3349
3346
3350
#: bzrlib/builtins.py:4633
3347
#: bzrlib/builtins.py:4665
3351
3348
msgid ""
3352
3349
":Examples:\n"
3353
3350
" Re-do the merge of all conflicted files, and show the base text in\n"
3357
3354
" すべての衝突したファイルのマージをやり直し、通常のTHIS、OTHERの\n"
3358
3355
" テキストにくわえて衝突した領域のベーステキストを表示します。::"
3359
3356
3360
#: bzrlib/builtins.py:4637
3357
#: bzrlib/builtins.py:4669
3361
3358
msgid " bzr remerge --show-base"
3362
3359
msgstr " bzr remerge --show-base"
3363
3360
3364
#: bzrlib/builtins.py:4639
3361
#: bzrlib/builtins.py:4671
3365
3362
msgid ""
3366
3363
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3367
3364
" additional processing to reduce the size of conflict regions::"
3369
3366
" \"foobar\"のマージを、weaveマージアルゴリズムでやりなおし、衝突領域の\n"
3370
3367
" 縮小化処理も行います。::"
3371
3368
3372
#: bzrlib/builtins.py:4642
3369
#: bzrlib/builtins.py:4674
3373
3370
msgid " bzr remerge --merge-type weave --reprocess foobar"
3374
3371
msgstr " bzr remerge --merge-type weave --reprocess foobar"
3375
3372
3376
#: bzrlib/builtins.py:4649
3373
#: bzrlib/builtins.py:4681
3377
3374
msgid "Show base revision text in conflicts."
3378
3375
msgstr "衝突したベースリビジョンのテキストを表示します。"
3379
3376
3380
#: bzrlib/builtins.py:4661
3377
#: bzrlib/builtins.py:4693
3381
3378
msgid ""
3382
3379
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3383
3380
"merges."
3385
3382
"remergeは通常のマージ後にだけ実行できます。チェリーピックや複数マージでは\r\n"
3386
3383
"利用できません。"
3387
3384
3388
#: bzrlib/builtins.py:4717
3389
msgid "Revert files to a previous revision."
3390
msgstr "ファイルを過去のリビジョンに戻します。"
3385
#: bzrlib/builtins.py:4751
3386
msgid ""
3387
"Set files in the working tree back to the contents of a previous revision."
3388
msgstr ""
3391
3389
3392
#: bzrlib/builtins.py:4719
3390
#: bzrlib/builtins.py:4753
3393
3391
msgid ""
3394
3392
"Giving a list of files will revert only those files. Otherwise, all files\n"
3395
3393
"will be reverted. If the revision is not specified with '--revision', the\n"
3396
"last committed revision is used."
3394
"working tree basis revision is used. A revert operation affects only the\n"
3395
"working tree, not any revision history like the branch and repository or\n"
3396
"the working tree basis revision."
3397
3397
msgstr ""
3398
"ファイルのリストを指定すると、そのファイルだけが元に戻されます。\n"
3399
"そうでない場合は、全てのファイルが対象になります。--revisionで\n"
3400
"リビジョンを指定しない場合は、最後にコミットされたリビジョンが使用\n"
3401
"されます。"
3402
3398
3403
#: bzrlib/builtins.py:4723
3399
#: bzrlib/builtins.py:4759
3404
3400
msgid ""
3405
3401
"To remove only some changes, without reverting to a prior version, use\n"
3406
3402
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3407
3403
"will remove the changes introduced by the second last commit (-2), without\n"
3408
3404
"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."
3405
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3406
"To update the branch to a specific revision or the latest revision and\n"
3407
"update the working tree accordingly while preserving local changes, see the\n"
3408
"update command."
3410
3409
msgstr ""
3411
"以前のリビジョンに戻さずにいくつかの変更を取り除くには、mergeをかわりに\n"
3412
"使用します。例えば、\"merge . -r -2..-3\" (.を忘れないように)で、最終リビジョン\n"
3413
"(-1)での変更はそのままで、その一つ前のリビジョン(-2)での変更だけを取り\n"
3414
"除くことができます。特定の変更をハンクごと取り除く方法は、shelveをご覧\n"
3415
"ください。"
3416
3410
3417
#: bzrlib/builtins.py:4729
3411
#: bzrlib/builtins.py:4768
3418
3412
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."
3413
"Uncommitted changes to files that are reverted will be discarded.\n"
3414
"Howver, by default, any files that have been manually changed will be\n"
3415
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3416
"files have '.~#~' appended to their name, where # is a number."
3422
3417
msgstr ""
3423
"デフォルトでは、手で変更されたファイルは最初にバックアップされます。(merge\n"
3424
"コマンドで変更されただけのファイルはバックアップされません)バックアップ\n"
3425
"ファイル名は、元の名前に「.~#~」(#は数字)を付け足したものになります。"
3426
3418
3427
#: bzrlib/builtins.py:4733
3419
#: bzrlib/builtins.py:4773
3428
3420
msgid ""
3429
3421
"When you provide files, you can use their current pathname or the pathname\n"
3430
3422
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3436
3428
"revertを使うことができます。ディレクトリを指定した場合は、その配下のすべての\n"
3437
3429
"変更が取り消されます。"
3438
3430
3439
#: bzrlib/builtins.py:4738
3431
#: bzrlib/builtins.py:4778
3440
3432
msgid ""
3441
3433
"If you have newly added files since the target revision, they will be\n"
3442
3434
"removed. If the files to be removed have been changed, backups will be\n"
3448
3440
"バックアップされます。バージョン管理外のファイルを含むディレクトリは削除され\n"
3449
3441
"ません。"
3450
3442
3451
#: bzrlib/builtins.py:4743
3443
#: bzrlib/builtins.py:4783
3452
3444
msgid ""
3453
3445
"The working tree contains a list of revisions that have been merged but\n"
3454
3446
"not yet committed. These revisions will be included as additional parents\n"
3460
3452
"reverting any files."
3461
3453
msgstr ""
3462
3454
3463
#: bzrlib/builtins.py:4752
3455
#: bzrlib/builtins.py:4792
3464
3456
msgid ""
3465
3457
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3466
3458
"changes from a branch in a single revision. To do this, perform the merge\n"
3474
3466
"target branches."
3475
3467
msgstr ""
3476
3468
3477
#: bzrlib/builtins.py:4766
3469
#: bzrlib/builtins.py:4806
3478
3470
msgid "Do not save backups of reverted files."
3479
3471
msgstr ""
3480
3472
3481
#: bzrlib/builtins.py:4768
3473
#: bzrlib/builtins.py:4808
3482
3474
msgid "Remove pending merge marker, without changing any files."
3483
3475
msgstr ""
3484
3476
3485
#: bzrlib/builtins.py:4799
3477
#: bzrlib/builtins.py:4839
3486
3478
msgid ""
3487
3479
"Show help on a command or other topic.\n"
3488
3480
" "
3490
3482
"コマンドもしくは他のトピックのヘルプを表示する。\n"
3491
3483
" "
3492
3484
3493
#: bzrlib/builtins.py:4804
3485
#: bzrlib/builtins.py:4844
3494
3486
msgid "Show help on all commands."
3495
3487
msgstr "全てのコマンドのヘルプを表示する。"
3496
3488
3497
#: bzrlib/builtins.py:4833
3489
#: bzrlib/builtins.py:4873
3498
3490
msgid "Show unmerged/unpulled revisions between two branches."
3499
3491
msgstr "2つのブランチの間のmergeされていない/pullされていない リビジョンを表示する。"
3500
3492
3501
#: bzrlib/builtins.py:4835
3493
#: bzrlib/builtins.py:4875
3502
3494
msgid "OTHER_BRANCH may be local or remote."
3503
3495
msgstr "OTHER_BRANCHはlocalもしくはremoteになります。"
3504
3496
3505
#: bzrlib/builtins.py:4837
3497
#: bzrlib/builtins.py:4877
3506
3498
msgid ""
3507
3499
"To filter on a range of revisions, you can use the command -r begin..end\n"
3508
3500
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3513
3505
" 0 - no missing revisions"
3514
3506
msgstr ""
3515
3507
3516
#: bzrlib/builtins.py:4847
3508
#: bzrlib/builtins.py:4887
3517
3509
msgid ""
3518
3510
" Determine the missing revisions between this and the branch at the\n"
3519
3511
" remembered pull location::"
3520
3512
msgstr ""
3521
3513
3522
#: bzrlib/builtins.py:4850
3514
#: bzrlib/builtins.py:4890
3523
3515
msgid " bzr missing"
3524
3516
msgstr " bzr missing"
3525
3517
3526
#: bzrlib/builtins.py:4852
3518
#: bzrlib/builtins.py:4892
3527
3519
msgid " Determine the missing revisions between this and another branch::"
3528
3520
msgstr ""
3529
3521
3530
#: bzrlib/builtins.py:4854
3522
#: bzrlib/builtins.py:4894
3531
3523
msgid " bzr missing http://server/branch"
3532
3524
msgstr " bzr missing http://server/branch"
3533
3525
3534
#: bzrlib/builtins.py:4856
3526
#: bzrlib/builtins.py:4896
3535
3527
msgid ""
3536
3528
" Determine the missing revisions up to a specific revision on the other\n"
3537
3529
" branch::"
3538
3530
msgstr ""
3539
3531
3540
#: bzrlib/builtins.py:4859
3532
#: bzrlib/builtins.py:4899
3541
3533
msgid " bzr missing -r ..-10"
3542
3534
msgstr " bzr missing -r ..-10"
3543
3535
3544
#: bzrlib/builtins.py:4861
3536
#: bzrlib/builtins.py:4901
3545
3537
msgid ""
3546
3538
" Determine the missing revisions up to a specific revision on this\n"
3547
3539
" branch::"
3548
3540
msgstr ""
3549
3541
3550
#: bzrlib/builtins.py:4864
3542
#: bzrlib/builtins.py:4904
3551
3543
msgid " bzr missing --my-revision ..-10"
3552
3544
msgstr " bzr missing --my-revision ..-10"
3553
3545
3554
#: bzrlib/builtins.py:4871
3546
#: bzrlib/builtins.py:4911
3555
3547
msgid "Reverse the order of revisions."
3556
3548
msgstr "リビジョンの表示順を逆転する。"
3557
3549
3558
#: bzrlib/builtins.py:4873
3550
#: bzrlib/builtins.py:4913
3559
3551
msgid "Display changes in the local branch only."
3560
3552
msgstr "ローカルブランチの変更のみを表示する。"
3561
3553
3562
#: bzrlib/builtins.py:4874
3554
#: bzrlib/builtins.py:4914
3563
3555
msgid "Same as --mine-only."
3564
3556
msgstr "--mine-onlyと同じ。"
3565
3557
3566
#: bzrlib/builtins.py:4876
3558
#: bzrlib/builtins.py:4916
3567
3559
msgid "Display changes in the remote branch only."
3568
3560
msgstr "リモートブランチの変更のみを表示する。"
3569
3561
3570
#: bzrlib/builtins.py:4877
3562
#: bzrlib/builtins.py:4917
3571
3563
msgid "Same as --theirs-only."
3572
3564
msgstr "--theirs-onlyと同じ。"
3573
3565
3574
#: bzrlib/builtins.py:4882
3566
#: bzrlib/builtins.py:4922
3575
3567
msgid ""
3576
3568
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3577
3569
"details."
3578
3570
msgstr ""
3579
3571
3580
#: bzrlib/builtins.py:4886
3572
#: bzrlib/builtins.py:4926
3581
3573
msgid ""
3582
3574
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3583
3575
"details."
3584
3576
msgstr ""
3585
3577
3586
#: bzrlib/builtins.py:4889
3578
#: bzrlib/builtins.py:4929
3587
3579
msgid "Show all revisions in addition to the mainline ones."
3588
3580
msgstr ""
3589
3581
3590
#: bzrlib/builtins.py:4943
3582
#: bzrlib/builtins.py:4983
3591
3583
msgid "No peer location known or specified."
3592
3584
msgstr ""
3593
3585
3594
#: bzrlib/builtins.py:4947
3586
#: bzrlib/builtins.py:4987
3595
3587
msgid "Using saved parent location: {0}\n"
3596
3588
msgstr ""
3597
3589
3598
#: bzrlib/builtins.py:4980
3590
#: bzrlib/builtins.py:5020
3599
3591
#, python-format
3600
3592
msgid "You have %d extra revision:\n"
3601
3593
msgid_plural "You have %d extra revisions:\n"
3602
3594
msgstr[0] ""
3603
3595
msgstr[1] ""
3604
3596
3605
#: bzrlib/builtins.py:4996
3597
#: bzrlib/builtins.py:5040
3606
3598
#, python-format
3607
3599
msgid "You are missing %d revision:\n"
3608
3600
msgid_plural "You are missing %d revisions:\n"
3609
3601
msgstr[0] ""
3610
3602
msgstr[1] ""
3611
3603
3612
#: bzrlib/builtins.py:5008
3604
#: bzrlib/builtins.py:5055
3613
3605
msgid "This branch has no new revisions.\n"
3614
3606
msgstr ""
3615
3607
3616
#: bzrlib/builtins.py:5011
3608
#: bzrlib/builtins.py:5058
3617
3609
msgid "Other branch has no new revisions.\n"
3618
3610
msgstr ""
3619
3611
3620
#: bzrlib/builtins.py:5016
3612
#: bzrlib/builtins.py:5063
3621
3613
msgid "Branches are up to date.\n"
3622
3614
msgstr ""
3623
3615
3624
#: bzrlib/builtins.py:5027
3616
#: bzrlib/builtins.py:5074
3625
3617
msgid "Compress the data within a repository."
3626
3618
msgstr "リポジトリ内のデータを圧縮する。"
3627
3619
3628
#: bzrlib/builtins.py:5029
3620
#: bzrlib/builtins.py:5076
3629
3621
msgid ""
3630
3622
"This operation compresses the data within a bazaar repository. As\n"
3631
3623
"bazaar supports automatic packing of repository, this operation is\n"
3632
3624
"normally not required to be done manually."
3633
3625
msgstr ""
3634
3626
3635
#: bzrlib/builtins.py:5033
3627
#: bzrlib/builtins.py:5080
3636
3628
msgid ""
3637
3629
"During the pack operation, bazaar takes a backup of existing repository\n"
3638
3630
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3641
3633
"used."
3642
3634
msgstr ""
3643
3635
3644
#: bzrlib/builtins.py:5039
3636
#: bzrlib/builtins.py:5086
3645
3637
msgid ""
3646
3638
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3647
3639
"during or immediately after repacking, you may be left with a state\n"
3649
3641
"been. In this case the repository may be unusable."
3650
3642
msgstr ""
3651
3643
3652
#: bzrlib/builtins.py:5048
3644
#: bzrlib/builtins.py:5095
3653
3645
msgid "Delete obsolete packs to save disk space."
3654
3646
msgstr ""
3655
3647
3656
#: bzrlib/builtins.py:5062
3648
#: bzrlib/builtins.py:5109
3657
3649
msgid "List the installed plugins."
3658
3650
msgstr "インストールされたプラグインの一覧を表示する。"
3659
3651
3660
#: bzrlib/builtins.py:5064
3652
#: bzrlib/builtins.py:5111
3661
3653
msgid ""
3662
3654
"This command displays the list of installed plugins including\n"
3663
3655
"version of plugin and a short description of each."
3665
3657
"このコマンドは インストールされたプラグインの一覧を簡単な説明や\n"
3666
3658
"バージョン情報とともに表示します。"
3667
3659
3668
#: bzrlib/builtins.py:5067
3660
#: bzrlib/builtins.py:5114
3669
3661
msgid "--verbose shows the path where each plugin is located."
3670
3662
msgstr "--verboseを指定すると各プラグインのインストール先のパスが表示されます。"
3671
3663
3672
#: bzrlib/builtins.py:5069
3664
#: bzrlib/builtins.py:5116
3673
3665
msgid ""
3674
3666
"A plugin is an external component for Bazaar that extends the\n"
3675
3667
"revision control system, by adding or replacing code in Bazaar.\n"
3678
3670
"customizing log output."
3679
3671
msgstr ""
3680
3672
3681
#: bzrlib/builtins.py:5075
3673
#: bzrlib/builtins.py:5122
3682
3674
msgid ""
3683
3675
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3684
3676
"for further information on plugins including where to find them and how to\n"
3686
3678
"plugins using the Python programming language."
3687
3679
msgstr ""
3688
3680
3689
#: bzrlib/builtins.py:5091
3681
#: bzrlib/builtins.py:5138
3690
3682
msgid "Show testament (signing-form) of a revision."
3691
3683
msgstr ""
3692
3684
3693
#: bzrlib/builtins.py:5094
3685
#: bzrlib/builtins.py:5141
3694
3686
msgid "Produce long-format testament."
3695
3687
msgstr ""
3696
3688
3697
#: bzrlib/builtins.py:5096
3689
#: bzrlib/builtins.py:5143
3698
3690
msgid "Produce a strict-format testament."
3699
3691
msgstr ""
3700
3692
3701
#: bzrlib/builtins.py:5122
3693
#: bzrlib/builtins.py:5169
3702
3694
msgid "Show the origin of each line in a file."
3703
3695
msgstr ""
3704
3696
3705
#: bzrlib/builtins.py:5124
3697
#: bzrlib/builtins.py:5171
3706
3698
msgid ""
3707
3699
"This prints out the given file with an annotation on the left side\n"
3708
3700
"indicating which revision, author and date introduced the change."
3709
3701
msgstr ""
3710
3702
3711
#: bzrlib/builtins.py:5127
3703
#: bzrlib/builtins.py:5174
3712
3704
msgid ""
3713
3705
"If the origin is the same for a run of consecutive lines, it is\n"
3714
3706
"shown only at the top, unless the --all option is given."
3715
3707
msgstr ""
3716
3708
3717
#: bzrlib/builtins.py:5135
3709
#: bzrlib/builtins.py:5182
3718
3710
msgid "Show annotations on all lines."
3719
3711
msgstr ""
3720
3712
3721
#: bzrlib/builtins.py:5136
3713
#: bzrlib/builtins.py:5183
3722
3714
msgid "Show commit date in annotations."
3723
3715
msgstr ""
3724
3716
3725
#: bzrlib/builtins.py:5223
3717
#: bzrlib/builtins.py:5270
3726
3718
msgid "Cannot sign a range of non-revision-history revisions"
3727
3719
msgstr ""
3728
3720
3729
#: bzrlib/builtins.py:5235
3721
#: bzrlib/builtins.py:5282
3730
3722
msgid "Please supply either one revision, or a range."
3731
3723
msgstr ""
3732
3724
3733
#: bzrlib/builtins.py:5239
3725
#: bzrlib/builtins.py:5286
3734
3726
msgid ""
3735
3727
"Convert the current branch into a checkout of the supplied branch.\n"
3736
3728
"If no branch is supplied, rebind to the last bound location."
3737
3729
msgstr ""
3738
3730
3739
#: bzrlib/builtins.py:5242
3731
#: bzrlib/builtins.py:5289
3740
3732
msgid ""
3741
3733
"Once converted into a checkout, commits must succeed on the master branch\n"
3742
3734
"before they will be applied to the local branch."
3743
3735
msgstr ""
3744
3736
3745
#: bzrlib/builtins.py:5245
3737
#: bzrlib/builtins.py:5292
3746
3738
msgid ""
3747
3739
"Bound branches use the nickname of its master branch unless it is set\n"
3748
3740
"locally, in which case binding will update the local nickname to be\n"
3749
3741
"that of the master."
3750
3742
msgstr ""
3751
3743
3752
#: bzrlib/builtins.py:5260
3744
#: bzrlib/builtins.py:5307
3753
3745
msgid "No location supplied. This format does not remember old locations."
3754
3746
msgstr ""
3755
3747
3756
#: bzrlib/builtins.py:5265
3748
#: bzrlib/builtins.py:5313
3757
3749
msgid "Branch is already bound"
3758
3750
msgstr ""
3759
3751
3760
#: bzrlib/builtins.py:5267
3752
#: bzrlib/builtins.py:5316
3761
3753
msgid "No location supplied and no previous location known"
3762
3754
msgstr ""
3763
3755
3764
#: bzrlib/builtins.py:5273
3756
#: bzrlib/builtins.py:5322
3765
3757
msgid "These branches have diverged. Try merging, and then bind again."
3766
3758
msgstr ""
3767
3759
3768
#: bzrlib/builtins.py:5280
3760
#: bzrlib/builtins.py:5329
3769
3761
msgid "Convert the current checkout into a regular branch."
3770
3762
msgstr ""
3771
3763
3772
#: bzrlib/builtins.py:5282
3764
#: bzrlib/builtins.py:5331
3773
3765
msgid ""
3774
3766
"After unbinding, the local branch is considered independent and subsequent\n"
3775
3767
"commits will be local only."
3776
3768
msgstr ""
3777
3769
3778
#: bzrlib/builtins.py:5293
3770
#: bzrlib/builtins.py:5342
3779
3771
msgid "Local branch is not bound"
3780
3772
msgstr ""
3781
3773
3782
#: bzrlib/builtins.py:5297
3774
#: bzrlib/builtins.py:5346
3783
3775
msgid "Remove the last committed revision."
3784
3776
msgstr ""
3785
3777
3786
#: bzrlib/builtins.py:5299
3778
#: bzrlib/builtins.py:5348
3787
3779
msgid ""
3788
3780
"--verbose will print out what is being removed.\n"
3789
3781
"--dry-run will go through all the motions, but not actually\n"
3790
3782
"remove anything."
3791
3783
msgstr ""
3792
3784
3793
#: bzrlib/builtins.py:5303
3785
#: bzrlib/builtins.py:5352
3794
3786
msgid ""
3795
3787
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3796
3788
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3797
3789
"branch at revision 15."
3798
3790
msgstr ""
3799
3791
3800
#: bzrlib/builtins.py:5307
3792
#: bzrlib/builtins.py:5356
3801
3793
msgid ""
3802
3794
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3803
3795
"it may make is to restore any pending merges that were present before\n"
3804
3796
"the commit."
3805
3797
msgstr ""
3806
3798
3807
#: bzrlib/builtins.py:5318
3799
#: bzrlib/builtins.py:5367
3808
3800
msgid "Don't actually make changes."
3809
3801
msgstr ""
3810
3802
3811
#: bzrlib/builtins.py:5319
3803
#: bzrlib/builtins.py:5368
3812
3804
msgid "Say yes to all questions."
3813
3805
msgstr ""
3814
3806
3815
#: bzrlib/builtins.py:5321
3807
#: bzrlib/builtins.py:5370
3816
3808
msgid "Keep tags that point to removed revisions."
3817
3809
msgstr ""
3818
3810
3819
#: bzrlib/builtins.py:5323
3811
#: bzrlib/builtins.py:5372
3820
3812
msgid "Only remove the commits from the local branch when in a checkout."
3821
3813
msgstr ""
3822
3814
3823
#: bzrlib/builtins.py:5372
3815
#: bzrlib/builtins.py:5421
3824
3816
msgid "No revisions to uncommit.\n"
3825
3817
msgstr ""
3826
3818
3827
#: bzrlib/builtins.py:5387
3819
#: bzrlib/builtins.py:5436
3828
3820
msgid "Dry-run, pretending to remove the above revisions.\n"
3829
3821
msgstr ""
3830
3822
3831
#: bzrlib/builtins.py:5390
3823
#: bzrlib/builtins.py:5439
3832
3824
msgid "The above revision(s) will be removed.\n"
3833
3825
msgstr ""
3834
3826
3835
#: bzrlib/builtins.py:5394
3827
#: bzrlib/builtins.py:5443
3836
3828
msgid "Uncommit these revisions"
3837
3829
msgstr ""
3838
3830
3839
#: bzrlib/builtins.py:5397
3831
#: bzrlib/builtins.py:5446
3840
3832
msgid "Canceled\n"
3841
3833
msgstr ""
3842
3834
3843
#: bzrlib/builtins.py:5404
3835
#: bzrlib/builtins.py:5453
3844
3836
#, python-format
3845
3837
msgid ""
3846
3838
"You can restore the old tip by running:\n"
3847
3839
" bzr pull . -r revid:%s\n"
3848
3840
msgstr ""
3849
3841
3850
#: bzrlib/builtins.py:5409
3842
#: bzrlib/builtins.py:5458
3851
3843
msgid "Break a dead lock."
3852
3844
msgstr ""
3853
3845
3854
#: bzrlib/builtins.py:5411
3846
#: bzrlib/builtins.py:5460
3855
3847
msgid ""
3856
3848
"This command breaks a lock on a repository, branch, working directory or\n"
3857
3849
"config file."
3858
3850
msgstr ""
3859
3851
3860
#: bzrlib/builtins.py:5414
3852
#: bzrlib/builtins.py:5463
3861
3853
msgid ""
3862
3854
"CAUTION: Locks should only be broken when you are sure that the process\n"
3863
3855
"holding the lock has been stopped."
3864
3856
msgstr ""
3865
3857
3866
#: bzrlib/builtins.py:5417
3858
#: bzrlib/builtins.py:5466
3867
3859
msgid ""
3868
3860
"You can get information on what locks are open via the 'bzr info\n"
3869
3861
"[location]' command."
3870
3862
msgstr ""
3871
3863
3872
#: bzrlib/builtins.py:5420
3864
#: bzrlib/builtins.py:5469
3873
3865
msgid ""
3874
3866
":Examples:\n"
3875
3867
" bzr break-lock\n"
3877
3869
" bzr break-lock --conf ~/.bazaar"
3878
3870
msgstr ""
3879
3871
3880
#: bzrlib/builtins.py:5429
3872
#: bzrlib/builtins.py:5478
3881
3873
msgid "LOCATION is the directory where the config lock is."
3882
3874
msgstr ""
3883
3875
3884
#: bzrlib/builtins.py:5431
3876
#: bzrlib/builtins.py:5480
3885
3877
msgid "Do not ask for confirmation before breaking the lock."
3886
3878
msgstr ""
3887
3879
3888
#: bzrlib/builtins.py:5466
3880
#: bzrlib/builtins.py:5515
3889
3881
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3890
3882
msgstr ""
3891
3883
3892
#: bzrlib/builtins.py:5467
3884
#: bzrlib/builtins.py:5516
3893
3885
msgid "Run the bzr server."
3894
3886
msgstr ""
3895
3887
3896
#: bzrlib/builtins.py:5473
3888
#: bzrlib/builtins.py:5522
3897
3889
msgid "Serve on stdin/out for use from inetd or sshd."
3898
3890
msgstr ""
3899
3891
3900
#: bzrlib/builtins.py:5474
3892
#: bzrlib/builtins.py:5523
3901
3893
msgid "protocol"
3902
3894
msgstr ""
3903
3895
3904
#: bzrlib/builtins.py:5475
3896
#: bzrlib/builtins.py:5524
3905
3897
msgid "Protocol to serve."
3906
3898
msgstr ""
3907
3899
3908
#: bzrlib/builtins.py:5479
3900
#: bzrlib/builtins.py:5528
3901
msgid "Listen for connections on nominated address."
3902
msgstr ""
3903
3904
#: bzrlib/builtins.py:5530
3909
3905
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."
3906
"Listen for connections on nominated port. Passing 0 as the port number will "
3907
"result in a dynamically allocated port. The default port depends on the "
3908
"protocol."
3913
3909
msgstr ""
3914
3910
3915
#: bzrlib/builtins.py:5485
3911
#: bzrlib/builtins.py:5535
3916
3912
msgid "Serve contents of this directory."
3917
3913
msgstr ""
3918
3914
3919
#: bzrlib/builtins.py:5487
3915
#: bzrlib/builtins.py:5537
3920
3916
msgid ""
3921
3917
"By default the server is a readonly server. Supplying --allow-writes "
3922
3918
"enables write access to the contents of the served directory and below. "
3925
3921
"uncontrolled write access to your file system."
3926
3922
msgstr ""
3927
3923
3928
#: bzrlib/builtins.py:5496
3924
#: bzrlib/builtins.py:5546
3929
3925
msgid "Override the default idle client timeout (5min)."
3930
3926
msgstr ""
3931
3927
3932
#: bzrlib/builtins.py:5546
3928
#: bzrlib/builtins.py:5564
3933
3929
msgid "Combine a tree into its containing tree."
3934
3930
msgstr ""
3935
3931
3936
#: bzrlib/builtins.py:5548
3932
#: bzrlib/builtins.py:5566
3937
3933
msgid "This command requires the target tree to be in a rich-root format."
3938
3934
msgstr ""
3939
3935
3940
#: bzrlib/builtins.py:5550
3936
#: bzrlib/builtins.py:5568
3941
3937
msgid ""
3942
3938
"The TREE argument should be an independent tree, inside another tree, but\n"
3943
3939
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3944
3940
"running \"bzr branch\" with the target inside a tree.)"
3945
3941
msgstr ""
3946
3942
3947
#: bzrlib/builtins.py:5554
3943
#: bzrlib/builtins.py:5572
3948
3944
msgid ""
3949
3945
"The result is a combined tree, with the subtree no longer an independent\n"
3950
3946
"part. This is marked as a merge of the subtree into the containing tree,\n"
3951
3947
"and all history is preserved."
3952
3948
msgstr ""
3953
3949
3954
#: bzrlib/builtins.py:5572
3950
#: bzrlib/builtins.py:5590
3955
3951
#, python-format
3956
3952
msgid ""
3957
3953
"Can't join trees because %s doesn't support rich root data.\n"
3958
3954
"You can use bzr upgrade on the repository."
3959
3955
msgstr ""
3960
3956
3961
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3957
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3962
3958
msgid "Cannot join {0}. {1}"
3963
3959
msgstr ""
3964
3960
3965
#: bzrlib/builtins.py:5592
3961
#: bzrlib/builtins.py:5610
3966
3962
msgid "Split a subdirectory of a tree into a separate tree."
3967
3963
msgstr ""
3968
3964
3969
#: bzrlib/builtins.py:5594
3965
#: bzrlib/builtins.py:5612
3970
3966
msgid ""
3971
3967
"This command will produce a target tree in a format that supports\n"
3972
3968
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3973
3969
"converted into earlier formats like 'dirstate-tags'."
3974
3970
msgstr ""
3975
3971
3976
#: bzrlib/builtins.py:5598
3972
#: bzrlib/builtins.py:5616
3977
3973
msgid ""
3978
3974
"The TREE argument should be a subdirectory of a working tree. That\n"
3979
3975
"subdirectory will be converted into an independent tree, with its own\n"
3980
3976
"branch. Commits in the top-level tree will not apply to the new subtree."
3981
3977
msgstr ""
3982
3978
3983
#: bzrlib/builtins.py:5678
3979
#: bzrlib/builtins.py:5696
3984
3980
msgid "No submit branch specified or known"
3985
3981
msgstr ""
3986
3982
3987
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3983
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3988
3984
msgid "No public branch specified or known"
3989
3985
msgstr ""
3990
3986
3991
#: bzrlib/builtins.py:5691
3987
#: bzrlib/builtins.py:5710
3992
3988
msgid "bzr merge-directive takes at most two one revision identifiers"
3993
3989
msgstr ""
3994
3990
3995
#: bzrlib/builtins.py:5700
3991
#: bzrlib/builtins.py:5719
3996
3992
msgid "No revisions to bundle."
3997
3993
msgstr ""
3998
3994
3999
#: bzrlib/builtins.py:5719
3995
#: bzrlib/builtins.py:5738
4000
3996
msgid "Mail or create a merge-directive for submitting changes."
4001
3997
msgstr ""
4002
3998
4003
#: bzrlib/builtins.py:5721
3999
#: bzrlib/builtins.py:5740
4004
4000
msgid "A merge directive provides many things needed for requesting merges:"
4005
4001
msgstr ""
4006
4002
4007
#: bzrlib/builtins.py:5723
4003
#: bzrlib/builtins.py:5742
4008
4004
msgid "* A machine-readable description of the merge to perform"
4009
4005
msgstr ""
4010
4006
4011
#: bzrlib/builtins.py:5725
4007
#: bzrlib/builtins.py:5744
4012
4008
msgid "* An optional patch that is a preview of the changes requested"
4013
4009
msgstr ""
4014
4010
4015
#: bzrlib/builtins.py:5727
4011
#: bzrlib/builtins.py:5746
4016
4012
msgid ""
4017
4013
"* An optional bundle of revision data, so that the changes can be applied\n"
4018
4014
" directly from the merge directive, without retrieving data from a\n"
4019
4015
" branch."
4020
4016
msgstr ""
4021
4017
4022
#: bzrlib/builtins.py:5731
4018
#: bzrlib/builtins.py:5750
4023
4019
msgid ""
4024
4020
"`bzr send` creates a compact data set that, when applied using bzr\n"
4025
4021
"merge, has the same effect as merging from the source branch. "
4026
4022
msgstr ""
4027
4023
4028
#: bzrlib/builtins.py:5734
4024
#: bzrlib/builtins.py:5753
4029
4025
msgid ""
4030
4026
"By default the merge directive is self-contained and can be applied to any\n"
4031
4027
"branch containing submit_branch in its ancestory without needing access to\n"
4032
4028
"the source branch."
4033
4029
msgstr ""
4034
4030
4035
#: bzrlib/builtins.py:5738
4031
#: bzrlib/builtins.py:5757
4036
4032
msgid ""
4037
4033
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4038
4034
"revisions, but only a structured request to merge from the\n"
4041
4037
"included if known, so that people can check it later."
4042
4038
msgstr ""
4043
4039
4044
#: bzrlib/builtins.py:5744
4040
#: bzrlib/builtins.py:5763
4045
4041
msgid ""
4046
4042
"The submit branch defaults to the parent of the source branch, but can be\n"
4047
4043
"overridden. Both submit branch and public branch will be remembered in\n"
4050
4046
"be changed using --from."
4051
4047
msgstr ""
4052
4048
4053
#: bzrlib/builtins.py:5750
4049
#: bzrlib/builtins.py:5769
4054
4050
msgid ""
4055
4051
"Both the submit branch and the public branch follow the usual behavior with\n"
4056
4052
"respect to --remember: If there is no default location set, the first send\n"
4059
4055
"--remember. The value will only be saved if the location can be accessed."
4060
4056
msgstr ""
4061
4057
4062
#: bzrlib/builtins.py:5756
4058
#: bzrlib/builtins.py:5775
4063
4059
msgid ""
4064
4060
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4065
4061
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4067
4063
"in the merge directive."
4068
4064
msgstr ""
4069
4065
4070
#: bzrlib/builtins.py:5761
4066
#: bzrlib/builtins.py:5780
4071
4067
msgid ""
4072
4068
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4073
4069
"given, in which case it is sent to a file."
4074
4070
msgstr ""
4075
4071
4076
#: bzrlib/builtins.py:5764
4072
#: bzrlib/builtins.py:5783
4077
4073
msgid ""
4078
4074
"Mail is sent using your preferred mail program. This should be transparent\n"
4079
4075
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4080
4076
"If the preferred client can't be found (or used), your editor will be used."
4081
4077
msgstr ""
4082
4078
4083
#: bzrlib/builtins.py:5768
4079
#: bzrlib/builtins.py:5787
4084
4080
msgid ""
4085
4081
"To use a specific mail program, set the mail_client configuration option.\n"
4086
4082
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4092
4088
"supported clients."
4093
4089
msgstr ""
4094
4090
4095
#: bzrlib/builtins.py:5775
4091
#: bzrlib/builtins.py:5794
4096
4092
msgid ""
4097
4093
"If mail is being sent, a to address is required. This can be supplied\n"
4098
4094
"either on the commandline, by setting the submit_to configuration\n"
4100
4096
"in the submit branch."
4101
4097
msgstr ""
4102
4098
4103
#: bzrlib/builtins.py:5780
4099
#: bzrlib/builtins.py:5799
4104
4100
msgid ""
4105
4101
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4106
4102
"and\n"
4110
4106
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4111
4107
msgstr ""
4112
4108
4113
#: bzrlib/builtins.py:5786
4109
#: bzrlib/builtins.py:5805
4114
4110
msgid ""
4115
4111
"The merge directives created by bzr send may be applied using bzr merge or\n"
4116
4112
"bzr pull by specifying a file containing a merge directive as the location."
4117
4113
msgstr ""
4118
4114
4119
#: bzrlib/builtins.py:5789
4115
#: bzrlib/builtins.py:5808
4120
4116
msgid ""
4121
4117
"bzr send makes extensive use of public locations to map local locations "
4122
4118
"into\n"
4124
4120
"set them, and use `bzr info` to display them."
4125
4121
msgstr ""
4126
4122
4127
#: bzrlib/builtins.py:5813
4123
#: bzrlib/builtins.py:5832
4128
4124
msgid "Write merge directive to this file or directory; use - for stdout."
4129
4125
msgstr ""
4130
4126
4131
#: bzrlib/builtins.py:5817
4127
#: bzrlib/builtins.py:5836
4132
4128
msgid ""
4133
4129
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4134
4130
"strict disables the check."
4135
4131
msgstr ""
4136
4132
4137
#: bzrlib/builtins.py:5819
4133
#: bzrlib/builtins.py:5838
4138
4134
msgid "Mail the request to this address."
4139
4135
msgstr ""
4140
4136
4141
#: bzrlib/builtins.py:5823
4137
#: bzrlib/builtins.py:5842
4142
4138
msgid "Body for the email."
4143
4139
msgstr ""
4144
4140
4145
#: bzrlib/builtins.py:5876
4141
#: bzrlib/builtins.py:5895
4146
4142
msgid "Do not include a bundle in the merge directive."
4147
4143
msgstr ""
4148
4144
4149
#: bzrlib/builtins.py:5877
4145
#: bzrlib/builtins.py:5896
4150
4146
msgid "Do not include a preview patch in the merge directive."
4151
4147
msgstr ""
4152
4148
4153
#: bzrlib/builtins.py:5880
4149
#: bzrlib/builtins.py:5899
4154
4150
msgid "Remember submit and public branch."
4155
4151
msgstr ""
4156
4152
4157
#: bzrlib/builtins.py:5882
4153
#: bzrlib/builtins.py:5901
4158
4154
msgid ""
4159
4155
"Branch to generate the submission from, rather than the one containing the "
4160
4156
"working directory."
4161
4157
msgstr ""
4162
4158
4163
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
4159
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
4164
4160
msgid "format"
4165
4161
msgstr ""
4166
4162
4167
#: bzrlib/builtins.py:5893
4163
#: bzrlib/builtins.py:5912
4168
4164
msgid "Use the specified output format."
4169
4165
msgstr ""
4170
4166
4171
#: bzrlib/builtins.py:5915
4167
#: bzrlib/builtins.py:5934
4172
4168
msgid "Create, remove or modify a tag naming a revision."
4173
4169
msgstr ""
4174
4170
4175
#: bzrlib/builtins.py:5917
4171
#: bzrlib/builtins.py:5936
4176
4172
msgid ""
4177
4173
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4178
4174
"(--revision) option can be given -rtag:X, where X is any previously\n"
4179
4175
"created tag."
4180
4176
msgstr ""
4181
4177
4182
#: bzrlib/builtins.py:5921
4178
#: bzrlib/builtins.py:5940
4183
4179
msgid ""
4184
4180
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4185
4181
"along when you branch, push, pull or merge."
4186
4182
msgstr ""
4187
4183
4188
#: bzrlib/builtins.py:5924
4184
#: bzrlib/builtins.py:5943
4189
4185
msgid ""
4190
4186
"It is an error to give a tag name that already exists unless you pass\n"
4191
4187
"--force, in which case the tag is moved to point to the new revision."
4192
4188
msgstr ""
4193
4189
4194
#: bzrlib/builtins.py:5927
4190
#: bzrlib/builtins.py:5946
4195
4191
msgid ""
4196
4192
"To rename a tag (change the name but keep it on the same revsion), run "
4197
4193
"``bzr\n"
4198
4194
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4199
4195
msgstr ""
4200
4196
4201
#: bzrlib/builtins.py:5930
4197
#: bzrlib/builtins.py:5949
4202
4198
msgid ""
4203
4199
"If no tag name is specified it will be determined through the \n"
4204
4200
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4206
4202
"details."
4207
4203
msgstr ""
4208
4204
4209
#: bzrlib/builtins.py:5940
4205
#: bzrlib/builtins.py:5959
4210
4206
msgid "Delete this tag rather than placing it."
4211
4207
msgstr ""
4212
4208
4213
#: bzrlib/builtins.py:5943
4209
#: bzrlib/builtins.py:5962
4214
4210
msgid "Branch in which to place the tag."
4215
4211
msgstr ""
4216
4212
4217
#: bzrlib/builtins.py:5945
4213
#: bzrlib/builtins.py:5964
4218
4214
msgid "Replace existing tags."
4219
4215
msgstr ""
4220
4216
4221
#: bzrlib/builtins.py:5960
4217
#: bzrlib/builtins.py:5979
4222
4218
msgid "No tag specified to delete."
4223
4219
msgstr ""
4224
4220
4225
#: bzrlib/builtins.py:5962
4221
#: bzrlib/builtins.py:5981
4226
4222
#, python-format
4227
4223
msgid "Deleted tag %s."
4228
4224
msgstr ""
4229
4225
4230
#: bzrlib/builtins.py:5976
4226
#: bzrlib/builtins.py:5995
4231
4227
msgid "Please specify a tag name."
4232
4228
msgstr ""
4233
4229
4234
#: bzrlib/builtins.py:5984
4230
#: bzrlib/builtins.py:6003
4235
4231
#, python-format
4236
4232
msgid "Tag %s already exists for that revision."
4237
4233
msgstr ""
4238
4234
4239
#: bzrlib/builtins.py:5988
4235
#: bzrlib/builtins.py:6007
4240
4236
#, python-format
4241
4237
msgid "Created tag %s."
4242
4238
msgstr ""
4243
4239
4244
#: bzrlib/builtins.py:5990
4240
#: bzrlib/builtins.py:6009
4245
4241
#, python-format
4246
4242
msgid "Updated tag %s."
4247
4243
msgstr ""
4248
4244
4249
#: bzrlib/builtins.py:5994
4245
#: bzrlib/builtins.py:6013
4250
4246
msgid "List tags."
4251
4247
msgstr ""
4252
4248
4253
#: bzrlib/builtins.py:5996
4249
#: bzrlib/builtins.py:6015
4254
4250
msgid ""
4255
4251
"This command shows a table of tag names and the revisions they reference."
4256
4252
msgstr ""
4257
4253
4258
#: bzrlib/builtins.py:6002
4254
#: bzrlib/builtins.py:6021
4259
4255
msgid "Branch whose tags should be displayed."
4260
4256
msgstr ""
4261
4257
4262
#: bzrlib/builtins.py:6004
4258
#: bzrlib/builtins.py:6023
4263
4259
msgid "Sort tags by different criteria."
4264
4260
msgstr ""
4265
4261
4266
#: bzrlib/builtins.py:6004
4262
#: bzrlib/builtins.py:6023
4267
4263
msgid "Sorting"
4268
4264
msgstr ""
4269
4265
4270
#: bzrlib/builtins.py:6073
4266
#: bzrlib/builtins.py:6092
4271
4267
msgid "Reconfigure the type of a bzr directory."
4272
4268
msgstr ""
4273
4269
4274
#: bzrlib/builtins.py:6075
4270
#: bzrlib/builtins.py:6094
4275
4271
msgid "A target configuration must be specified."
4276
4272
msgstr ""
4277
4273
4278
#: bzrlib/builtins.py:6077
4274
#: bzrlib/builtins.py:6096
4279
4275
msgid ""
4280
4276
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4281
4277
"The order of preference is\n"
4286
4282
"If none of these is available, --bind-to must be specified."
4287
4283
msgstr ""
4288
4284
4289
#: bzrlib/builtins.py:6091
4285
#: bzrlib/builtins.py:6110
4290
4286
msgid "Tree type"
4291
4287
msgstr ""
4292
4288
4293
#: bzrlib/builtins.py:6092
4289
#: bzrlib/builtins.py:6111
4294
4290
msgid "The relation between branch and tree."
4295
4291
msgstr ""
4296
4292
4297
#: bzrlib/builtins.py:6094
4293
#: bzrlib/builtins.py:6113
4298
4294
msgid "Reconfigure to be an unbound branch with no working tree."
4299
4295
msgstr ""
4300
4296
4301
#: bzrlib/builtins.py:6095
4297
#: bzrlib/builtins.py:6114
4302
4298
msgid "Reconfigure to be an unbound branch with a working tree."
4303
4299
msgstr ""
4304
4300
4305
#: bzrlib/builtins.py:6096
4301
#: bzrlib/builtins.py:6115
4306
4302
msgid "Reconfigure to be a bound branch with a working tree."
4307
4303
msgstr ""
4308
4304
4309
#: bzrlib/builtins.py:6097
4305
#: bzrlib/builtins.py:6116
4310
4306
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4311
4307
msgstr ""
4312
4308
4313
#: bzrlib/builtins.py:6102
4309
#: bzrlib/builtins.py:6121
4314
4310
msgid "Repository type"
4315
4311
msgstr ""
4316
4312
4317
#: bzrlib/builtins.py:6103
4313
#: bzrlib/builtins.py:6122
4318
4314
msgid "Location fo the repository."
4319
4315
msgstr ""
4320
4316
4321
#: bzrlib/builtins.py:6105
4317
#: bzrlib/builtins.py:6124
4322
4318
msgid ""
4323
4319
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4324
4320
msgstr ""
4325
4321
4326
#: bzrlib/builtins.py:6107
4322
#: bzrlib/builtins.py:6126
4327
4323
msgid "Reconfigure to use a shared repository."
4328
4324
msgstr ""
4329
4325
4330
#: bzrlib/builtins.py:6111
4326
#: bzrlib/builtins.py:6130
4331
4327
msgid "Trees in Repository"
4332
4328
msgstr ""
4333
4329
4334
#: bzrlib/builtins.py:6112
4330
#: bzrlib/builtins.py:6131
4335
4331
msgid "Whether new branches in the repository have trees."
4336
4332
msgstr ""
4337
4333
4338
#: bzrlib/builtins.py:6114
4334
#: bzrlib/builtins.py:6133
4339
4335
msgid ""
4340
4336
"Reconfigure repository to create working trees on branches by default."
4341
4337
msgstr ""
4342
4338
4343
#: bzrlib/builtins.py:6116
4339
#: bzrlib/builtins.py:6135
4344
4340
msgid ""
4345
4341
"Reconfigure repository to not create working trees on branches by default."
4346
4342
msgstr ""
4347
4343
4348
#: bzrlib/builtins.py:6119
4344
#: bzrlib/builtins.py:6138
4349
4345
msgid "Branch to bind checkout to."
4350
4346
msgstr ""
4351
4347
4352
#: bzrlib/builtins.py:6121
4348
#: bzrlib/builtins.py:6140
4353
4349
msgid "Perform reconfiguration even if local changes will be lost."
4354
4350
msgstr ""
4355
4351
4356
#: bzrlib/builtins.py:6124
4352
#: bzrlib/builtins.py:6143
4357
4353
msgid "Reconfigure a branch to be stacked on another branch."
4358
4354
msgstr ""
4359
4355
4360
#: bzrlib/builtins.py:6128
4356
#: bzrlib/builtins.py:6147
4361
4357
msgid ""
4362
4358
"Reconfigure a branch to be unstacked. This may require copying substantial "
4363
4359
"data into it."
4364
4360
msgstr ""
4365
4361
4366
#: bzrlib/builtins.py:6138
4362
#: bzrlib/builtins.py:6157
4367
4363
msgid "Can't use both --stacked-on and --unstacked"
4368
4364
msgstr ""
4369
4365
4370
#: bzrlib/builtins.py:6152
4366
#: bzrlib/builtins.py:6171
4371
4367
msgid "No target configuration specified"
4372
4368
msgstr ""
4373
4369
4374
#: bzrlib/builtins.py:6187
4370
#: bzrlib/builtins.py:6206
4375
4371
msgid "Set the branch of a checkout and update."
4376
4372
msgstr ""
4377
4373
4378
#: bzrlib/builtins.py:6189
4374
#: bzrlib/builtins.py:6208
4379
4375
msgid ""
4380
4376
"For lightweight checkouts, this changes the branch being referenced.\n"
4381
4377
"For heavyweight checkouts, this checks that there are no local commits\n"
4383
4379
"of the new location and binds to it."
4384
4380
msgstr ""
4385
4381
4386
#: bzrlib/builtins.py:6194
4382
#: bzrlib/builtins.py:6213
4387
4383
msgid ""
4388
4384
"In both cases, the working tree is updated and uncommitted changes\n"
4389
4385
"are merged. The user can commit or revert these as they desire."
4390
4386
msgstr ""
4391
4387
4392
#: bzrlib/builtins.py:6197
4388
#: bzrlib/builtins.py:6216
4393
4389
msgid "Pending merges need to be committed or reverted before using switch."
4394
4390
msgstr ""
4395
4391
4396
#: bzrlib/builtins.py:6199
4392
#: bzrlib/builtins.py:6218
4397
4393
msgid ""
4398
4394
"The path to the branch to switch to can be specified relative to the parent\n"
4399
4395
"directory of the current branch. For example, if you are currently in a\n"
4401
4397
"/path/to/newbranch."
4402
4398
msgstr ""
4403
4399
4404
#: bzrlib/builtins.py:6204
4400
#: bzrlib/builtins.py:6223
4405
4401
msgid ""
4406
4402
"Bound branches use the nickname of its master branch unless it is set\n"
4407
4403
"locally, in which case switching will update the local nickname to be\n"
4408
4404
"that of the master."
4409
4405
msgstr ""
4410
4406
4411
#: bzrlib/builtins.py:6212
4407
#: bzrlib/builtins.py:6231
4412
4408
msgid "Switch even if local commits will be lost."
4413
4409
msgstr ""
4414
4410
4415
#: bzrlib/builtins.py:6215
4411
#: bzrlib/builtins.py:6234
4416
4412
msgid "Create the target branch from this one before switching to it."
4417
4413
msgstr ""
4418
4414
4419
#: bzrlib/builtins.py:6229
4415
#: bzrlib/builtins.py:6248
4420
4416
msgid "You must supply either a revision or a location"
4421
4417
msgstr ""
4422
4418
4423
#: bzrlib/builtins.py:6242
4419
#: bzrlib/builtins.py:6261
4424
4420
msgid "cannot create branch without source branch"
4425
4421
msgstr ""
4426
4422
4427
#: bzrlib/builtins.py:6262
4423
#: bzrlib/builtins.py:6286
4428
4424
msgid "Manage filtered views."
4429
4425
msgstr ""
4430
4426
4431
#: bzrlib/builtins.py:6264
4427
#: bzrlib/builtins.py:6288
4432
4428
msgid ""
4433
4429
"Views provide a mask over the tree so that users can focus on\n"
4434
4430
"a subset of a tree when doing their work. After creating a view,\n"
4438
4434
"must be within the current view."
4439
4435
msgstr ""
4440
4436
4441
#: bzrlib/builtins.py:6271
4437
#: bzrlib/builtins.py:6295
4442
4438
msgid ""
4443
4439
"In most cases, a view has a short life-span: it is created to make\n"
4444
4440
"a selected change and is deleted once that change is committed.\n"
4446
4442
"and switch between them."
4447
4443
msgstr ""
4448
4444
4449
#: bzrlib/builtins.py:6276
4445
#: bzrlib/builtins.py:6300
4450
4446
msgid ""
4451
4447
"To disable the current view without deleting it, you can switch to\n"
4452
4448
"the pseudo view called ``off``. This can be useful when you need\n"
4454
4450
"want to switch back to your view after that."
4455
4451
msgstr ""
4456
4452
4457
#: bzrlib/builtins.py:6281
4453
#: bzrlib/builtins.py:6305
4458
4454
msgid ""
4459
4455
":Examples:\n"
4460
4456
" To define the current view::"
4461
4457
msgstr ""
4462
4458
4463
#: bzrlib/builtins.py:6284
4459
#: bzrlib/builtins.py:6308
4464
4460
msgid " bzr view file1 dir1 ..."
4465
4461
msgstr ""
4466
4462
4467
#: bzrlib/builtins.py:6286
4463
#: bzrlib/builtins.py:6310
4468
4464
msgid " To list the current view::"
4469
4465
msgstr ""
4470
4466
4471
#: bzrlib/builtins.py:6288
4467
#: bzrlib/builtins.py:6312
4472
4468
msgid " bzr view"
4473
4469
msgstr ""
4474
4470
4475
#: bzrlib/builtins.py:6290
4471
#: bzrlib/builtins.py:6314
4476
4472
msgid " To delete the current view::"
4477
4473
msgstr ""
4478
4474
4479
#: bzrlib/builtins.py:6292
4475
#: bzrlib/builtins.py:6316
4480
4476
msgid " bzr view --delete"
4481
4477
msgstr ""
4482
4478
4483
#: bzrlib/builtins.py:6294
4479
#: bzrlib/builtins.py:6318
4484
4480
msgid " To disable the current view without deleting it::"
4485
4481
msgstr ""
4486
4482
4487
#: bzrlib/builtins.py:6296
4483
#: bzrlib/builtins.py:6320
4488
4484
msgid " bzr view --switch off"
4489
4485
msgstr ""
4490
4486
4491
#: bzrlib/builtins.py:6298
4487
#: bzrlib/builtins.py:6322
4492
4488
msgid " To define a named view and switch to it::"
4493
4489
msgstr ""
4494
4490
4495
#: bzrlib/builtins.py:6300
4491
#: bzrlib/builtins.py:6324
4496
4492
msgid " bzr view --name view-name file1 dir1 ..."
4497
4493
msgstr ""
4498
4494
4499
#: bzrlib/builtins.py:6302
4495
#: bzrlib/builtins.py:6326
4500
4496
msgid " To list a named view::"
4501
4497
msgstr ""
4502
4498
4503
#: bzrlib/builtins.py:6304
4499
#: bzrlib/builtins.py:6328
4504
4500
msgid " bzr view --name view-name"
4505
4501
msgstr ""
4506
4502
4507
#: bzrlib/builtins.py:6306
4503
#: bzrlib/builtins.py:6330
4508
4504
msgid " To delete a named view::"
4509
4505
msgstr ""
4510
4506
4511
#: bzrlib/builtins.py:6308
4507
#: bzrlib/builtins.py:6332
4512
4508
msgid " bzr view --name view-name --delete"
4513
4509
msgstr ""
4514
4510
4515
#: bzrlib/builtins.py:6310
4511
#: bzrlib/builtins.py:6334
4516
4512
msgid " To switch to a named view::"
4517
4513
msgstr ""
4518
4514
4519
#: bzrlib/builtins.py:6312
4515
#: bzrlib/builtins.py:6336
4520
4516
msgid " bzr view --switch view-name"
4521
4517
msgstr ""
4522
4518
4523
#: bzrlib/builtins.py:6314
4519
#: bzrlib/builtins.py:6338
4524
4520
msgid " To list all views defined::"
4525
4521
msgstr ""
4526
4522
4527
#: bzrlib/builtins.py:6316
4523
#: bzrlib/builtins.py:6340
4528
4524
msgid " bzr view --all"
4529
4525
msgstr ""
4530
4526
4531
#: bzrlib/builtins.py:6318
4527
#: bzrlib/builtins.py:6342
4532
4528
msgid " To delete all views::"
4533
4529
msgstr ""
4534
4530
4535
#: bzrlib/builtins.py:6320
4531
#: bzrlib/builtins.py:6344
4536
4532
msgid " bzr view --delete --all"
4537
4533
msgstr ""
4538
4534
4539
#: bzrlib/builtins.py:6327
4535
#: bzrlib/builtins.py:6351
4540
4536
msgid "Apply list or delete action to all views."
4541
4537
msgstr ""
4542
4538
4543
#: bzrlib/builtins.py:6330
4539
#: bzrlib/builtins.py:6354
4544
4540
msgid "Delete the view."
4545
4541
msgstr ""
4546
4542
4547
#: bzrlib/builtins.py:6333
4543
#: bzrlib/builtins.py:6357
4548
4544
msgid "Name of the view to define, list or delete."
4549
4545
msgstr ""
4550
4546
4551
#: bzrlib/builtins.py:6337
4547
#: bzrlib/builtins.py:6361
4552
4548
msgid "Name of the view to switch to."
4553
4549
msgstr ""
4554
4550
4555
#: bzrlib/builtins.py:6356
4551
#: bzrlib/builtins.py:6380
4556
4552
msgid "Both --delete and a file list specified"
4557
4553
msgstr ""
4558
4554
4559
#: bzrlib/builtins.py:6359
4555
#: bzrlib/builtins.py:6383
4560
4556
msgid "Both --delete and --switch specified"
4561
4557
msgstr ""
4562
4558
4563
#: bzrlib/builtins.py:6362
4559
#: bzrlib/builtins.py:6386
4564
4560
msgid "Deleted all views.\n"
4565
4561
msgstr ""
4566
4562
4567
#: bzrlib/builtins.py:6364
4563
#: bzrlib/builtins.py:6388
4568
4564
msgid "No current view to delete"
4569
4565
msgstr ""
4570
4566
4571
#: bzrlib/builtins.py:6367
4567
#: bzrlib/builtins.py:6391
4572
4568
#, python-format
4573
4569
msgid "Deleted '%s' view.\n"
4574
4570
msgstr ""
4575
4571
4576
#: bzrlib/builtins.py:6371
4572
#: bzrlib/builtins.py:6395
4577
4573
msgid "Both --switch and a file list specified"
4578
4574
msgstr ""
4579
4575
4580
#: bzrlib/builtins.py:6374
4576
#: bzrlib/builtins.py:6398
4581
4577
msgid "Both --switch and --all specified"
4582
4578
msgstr ""
4583
4579
4584
#: bzrlib/builtins.py:6377
4580
#: bzrlib/builtins.py:6401
4585
4581
msgid "No current view to disable"
4586
4582
msgstr ""
4587
4583
4588
#: bzrlib/builtins.py:6379
4584
#: bzrlib/builtins.py:6403
4589
4585
#, python-format
4590
4586
msgid "Disabled '%s' view.\n"
4591
4587
msgstr ""
4592
4588
4593
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4589
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4594
4590
msgid "Using '{0}' view: {1}\n"
4595
4591
msgstr ""
4596
4592
4597
#: bzrlib/builtins.py:6386
4593
#: bzrlib/builtins.py:6410
4598
4594
msgid "Views defined:\n"
4599
4595
msgstr ""
4600
4596
4601
#: bzrlib/builtins.py:6395
4597
#: bzrlib/builtins.py:6419
4602
4598
msgid "No views defined.\n"
4603
4599
msgstr ""
4604
4600
4605
#: bzrlib/builtins.py:6402
4601
#: bzrlib/builtins.py:6426
4606
4602
msgid "Cannot change the 'off' pseudo view"
4607
4603
msgstr ""
4608
4604
4609
#: bzrlib/builtins.py:6410
4605
#: bzrlib/builtins.py:6434
4610
4606
msgid "No current view.\n"
4611
4607
msgstr ""
4612
4608
4613
#: bzrlib/builtins.py:6413
4609
#: bzrlib/builtins.py:6437
4614
4610
msgid "'{0}' view is: {1}\n"
4615
4611
msgstr ""
4616
4612
4617
#: bzrlib/builtins.py:6433
4613
#: bzrlib/builtins.py:6457
4618
4614
msgid " <no hooks installed>\n"
4619
4615
msgstr ""
4620
4616
4621
#: bzrlib/builtins.py:6437
4617
#: bzrlib/builtins.py:6461
4622
4618
msgid "Remove a branch."
4623
4619
msgstr ""
4624
4620
4625
#: bzrlib/builtins.py:6439
4621
#: bzrlib/builtins.py:6463
4626
4622
msgid ""
4627
4623
"This will remove the branch from the specified location but \n"
4628
4624
"will keep any working tree or repository in place."
4629
4625
msgstr ""
4630
4626
4631
#: bzrlib/builtins.py:6444
4627
#: bzrlib/builtins.py:6468
4632
4628
msgid " Remove the branch at repo/trunk::"
4633
4629
msgstr ""
4634
4630
4635
#: bzrlib/builtins.py:6446
4631
#: bzrlib/builtins.py:6470
4636
4632
msgid " bzr remove-branch repo/trunk"
4637
4633
msgstr ""
4638
4634
4639
#: bzrlib/builtins.py:6461
4635
#: bzrlib/builtins.py:6477
4636
msgid "Remove branch even if it is the active branch."
4637
msgstr ""
4638
4639
#: bzrlib/builtins.py:6491
4640
msgid "Branch is active. Use --force to remove it."
4641
msgstr ""
4642
4643
#: bzrlib/builtins.py:6495
4640
4644
msgid "Plaintext diff output."
4641
4645
msgstr ""
4642
4646
4643
#: bzrlib/builtins.py:6462
4647
#: bzrlib/builtins.py:6496
4644
4648
msgid "Temporarily set aside some changes from the current tree."
4645
4649
msgstr ""
4646
4650
4647
#: bzrlib/builtins.py:6464
4651
#: bzrlib/builtins.py:6498
4648
4652
msgid ""
4649
4653
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4650
4654
"ie. out of the way, until a later time when you can bring them back from\n"
4653
4657
"will they survive its deletion."
4654
4658
msgstr ""
4655
4659
4656
#: bzrlib/builtins.py:6470
4660
#: bzrlib/builtins.py:6504
4657
4661
msgid "If shelve --list is specified, previously-shelved changes are listed."
4658
4662
msgstr ""
4659
4663
4660
#: bzrlib/builtins.py:6472
4664
#: bzrlib/builtins.py:6506
4661
4665
msgid ""
4662
4666
"Shelve is intended to help separate several sets of changes that have\n"
4663
4667
"been inappropriately mingled. If you just want to get rid of all changes\n"
4665
4669
"shelve all text changes at once, use shelve --all."
4666
4670
msgstr ""
4667
4671
4668
#: bzrlib/builtins.py:6477
4672
#: bzrlib/builtins.py:6511
4669
4673
msgid ""
4670
4674
"If filenames are specified, only the changes to those files will be\n"
4671
4675
"shelved. Other files will be left untouched."
4672
4676
msgstr ""
4673
4677
4674
#: bzrlib/builtins.py:6480
4678
#: bzrlib/builtins.py:6514
4675
4679
msgid ""
4676
4680
"If a revision is specified, changes since that revision will be shelved."
4677
4681
msgstr ""
4678
4682
4679
#: bzrlib/builtins.py:6482
4683
#: bzrlib/builtins.py:6516
4680
4684
msgid ""
4681
4685
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4682
4686
"restore the most recently shelved changes."
4683
4687
msgstr ""
4684
4688
4685
#: bzrlib/builtins.py:6485
4689
#: bzrlib/builtins.py:6519
4686
4690
msgid ""
4687
4691
"For complicated changes, it is possible to edit the changes in a separate\n"
4688
4692
"editor program to decide what the file remaining in the working copy\n"
4689
4693
"should look like. To do this, add the configuration option"
4690
4694
msgstr ""
4691
4695
4692
#: bzrlib/builtins.py:6489
4696
#: bzrlib/builtins.py:6523
4693
4697
msgid " change_editor = PROGRAM @new_path @old_path"
4694
4698
msgstr ""
4695
4699
4696
#: bzrlib/builtins.py:6491
4700
#: bzrlib/builtins.py:6525
4697
4701
msgid ""
4698
4702
"where @new_path is replaced with the path of the new version of the \n"
4699
4703
"file and @old_path is replaced with the path of the old version of \n"
4702
4706
" "
4703
4707
msgstr ""
4704
4708
4705
#: bzrlib/builtins.py:6503
4709
#: bzrlib/builtins.py:6537
4706
4710
msgid "Shelve all changes."
4707
4711
msgstr ""
4708
4712
4709
#: bzrlib/builtins.py:6505
4713
#: bzrlib/builtins.py:6539
4710
4714
msgid "Method to use for writing diffs."
4711
4715
msgstr ""
4712
4716
4713
#: bzrlib/builtins.py:6505
4717
#: bzrlib/builtins.py:6539
4714
4718
msgid "writer"
4715
4719
msgstr ""
4716
4720
4717
#: bzrlib/builtins.py:6509
4721
#: bzrlib/builtins.py:6543
4718
4722
msgid "List shelved changes."
4719
4723
msgstr ""
4720
4724
4721
#: bzrlib/builtins.py:6511
4725
#: bzrlib/builtins.py:6545
4722
4726
msgid "Destroy removed changes instead of shelving them."
4723
4727
msgstr ""
4724
4728
4725
#: bzrlib/builtins.py:6540
4729
#: bzrlib/builtins.py:6574
4726
4730
msgid "No shelved changes."
4727
4731
msgstr ""
4728
4732
4729
#: bzrlib/builtins.py:6551
4733
#: bzrlib/builtins.py:6585
4730
4734
msgid "Restore shelved changes."
4731
4735
msgstr ""
4732
4736
4733
#: bzrlib/builtins.py:6553
4737
#: bzrlib/builtins.py:6587
4734
4738
msgid ""
4735
4739
"By default, the most recently shelved changes are restored. However if you\n"
4736
4740
"specify a shelf by id those changes will be restored instead. This works\n"
4737
4741
"best when the changes don't depend on each other."
4738
4742
msgstr ""
4739
4743
4740
#: bzrlib/builtins.py:6562
4744
#: bzrlib/builtins.py:6596
4741
4745
msgid "The action to perform."
4742
4746
msgstr ""
4743
4747
4744
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4748
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4745
4749
msgid "action"
4746
4750
msgstr ""
4747
4751
4748
#: bzrlib/builtins.py:6564
4752
#: bzrlib/builtins.py:6598
4749
4753
msgid "Apply changes and remove from the shelf."
4750
4754
msgstr ""
4751
4755
4752
#: bzrlib/builtins.py:6565
4756
#: bzrlib/builtins.py:6599
4753
4757
msgid "Show changes, but do not apply or remove them."
4754
4758
msgstr ""
4755
4759
4756
#: bzrlib/builtins.py:6566
4760
#: bzrlib/builtins.py:6600
4757
4761
msgid ""
4758
4762
"Instead of unshelving the changes, show the diff that would result from "
4759
4763
"unshelving."
4760
4764
msgstr ""
4761
4765
4762
#: bzrlib/builtins.py:6568
4766
#: bzrlib/builtins.py:6602
4763
4767
msgid "Delete changes without applying them."
4764
4768
msgstr ""
4765
4769
4766
#: bzrlib/builtins.py:6569
4770
#: bzrlib/builtins.py:6603
4767
4771
msgid "Apply changes but don't delete them."
4768
4772
msgstr ""
4769
4773
4770
#: bzrlib/builtins.py:6584
4774
#: bzrlib/builtins.py:6618
4771
4775
msgid "Remove unwanted files from working tree."
4772
4776
msgstr ""
4773
4777
4774
#: bzrlib/builtins.py:6586
4778
#: bzrlib/builtins.py:6620
4775
4779
msgid ""
4776
4780
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4777
4781
"files are never deleted."
4778
4782
msgstr ""
4779
4783
4780
#: bzrlib/builtins.py:6589
4784
#: bzrlib/builtins.py:6623
4781
4785
msgid ""
4782
4786
"Another class is 'detritus', which includes files emitted by bzr during\n"
4783
4787
"normal operations and selftests. (The value of these files decreases with\n"
4784
4788
"time.)"
4785
4789
msgstr ""
4786
4790
4787
#: bzrlib/builtins.py:6593
4791
#: bzrlib/builtins.py:6627
4788
4792
msgid ""
4789
4793
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4790
4794
"flags are respected, and may be combined."
4791
4795
msgstr ""
4792
4796
4793
#: bzrlib/builtins.py:6596
4797
#: bzrlib/builtins.py:6630
4794
4798
msgid "To check what clean-tree will do, use --dry-run."
4795
4799
msgstr ""
4796
4800
4797
#: bzrlib/builtins.py:6599
4801
#: bzrlib/builtins.py:6633
4798
4802
msgid "Delete all ignored files."
4799
4803
msgstr ""
4800
4804
4801
#: bzrlib/builtins.py:6600
4805
#: bzrlib/builtins.py:6634
4802
4806
msgid ""
4803
4807
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4804
4808
msgstr ""
4805
4809
4806
#: bzrlib/builtins.py:6603
4810
#: bzrlib/builtins.py:6637
4807
4811
msgid "Delete files unknown to bzr (default)."
4808
4812
msgstr ""
4809
4813
4810
#: bzrlib/builtins.py:6604
4814
#: bzrlib/builtins.py:6638
4811
4815
msgid "Show files to delete instead of deleting them."
4812
4816
msgstr ""
4813
4817
4814
#: bzrlib/builtins.py:6606
4818
#: bzrlib/builtins.py:6640
4815
4819
msgid "Do not prompt before deleting."
4816
4820
msgstr ""
4817
4821
4871
4875
msgstr[0] ""
4872
4876
msgstr[1] ""
4873
4877
4874
#: bzrlib/bzrdir.py:490
4878
#: bzrlib/bzrdir.py:487
4875
4879
msgid ""
4876
4880
"making backup of {0}\n"
4877
4881
" to {1}"
4878
4882
msgstr ""
4879
4883
4880
#: bzrlib/bzrdir.py:513
4884
#: bzrlib/bzrdir.py:510
4881
4885
msgid "renamed {0} to {1}"
4882
4886
msgstr ""
4883
4887
4884
#: bzrlib/bzrdir.py:1652
4888
#: bzrlib/bzrdir.py:1639
4885
4889
#, python-format
4886
4890
msgid ""
4887
4891
"Source repository format does not support stacking, using format:\n"
4888
4892
" %s"
4889
4893
msgstr ""
4890
4894
4891
#: bzrlib/bzrdir.py:1672
4895
#: bzrlib/bzrdir.py:1659
4892
4896
#, python-format
4893
4897
msgid ""
4894
4898
"Source branch format does not support stacking, using format:\n"
4895
4899
" %s"
4896
4900
msgstr ""
4897
4901
4898
#: bzrlib/bzrdir.py:1818
4902
#: bzrlib/bzrdir.py:1805
4899
4903
msgid "starting repository conversion"
4900
4904
msgstr ""
4901
4905
4902
#: bzrlib/bzrdir.py:2039
4906
#: bzrlib/bzrdir.py:2026
4903
4907
msgid "Using default stacking branch {0} at {1}"
4904
4908
msgstr ""
4905
4909
5082
5086
"supported formats or in a custom format based on a template."
5083
5087
msgstr ""
5084
5088
5085
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
5086
#: en/help_topics/configuration.txt:710
5089
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
5090
#: en/help_topics/configuration.txt:722
5087
5091
msgid "For example::"
5088
5092
msgstr ""
5089
5093
5204
5208
msgid ":See also: %s"
5205
5209
msgstr ""
5206
5210
5207
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
5211
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
5208
5212
msgid "Only ASCII permitted in option names"
5209
5213
msgstr ""
5210
5214
5211
#: bzrlib/commands.py:841 bzrlib/commands.py:849
5215
#: bzrlib/commands.py:851 bzrlib/commands.py:859
5212
5216
msgid "command {0!r} needs one or more {1}"
5213
5217
msgstr ""
5214
5218
5215
#: bzrlib/commands.py:858
5219
#: bzrlib/commands.py:868
5216
5220
msgid "command {0!r} requires argument {1}"
5217
5221
msgstr ""
5218
5222
5219
#: bzrlib/commands.py:865
5223
#: bzrlib/commands.py:875
5220
5224
msgid "extra argument to command {0}: {1}"
5221
5225
msgstr ""
5222
5226
5223
#: bzrlib/commands.py:962
5227
#: bzrlib/commands.py:972
5224
5228
#, python-format
5225
5229
msgid "Profile data written to \"%s\"."
5226
5230
msgstr ""
5263
5267
msgid "renamed"
5264
5268
msgstr ""
5265
5269
5266
#: bzrlib/commit.py:977
5270
#: bzrlib/commit.py:976
5267
5271
msgid "unchanged"
5268
5272
msgstr ""
5269
5273
5270
#: bzrlib/commit.py:999
5274
#: bzrlib/commit.py:998
5271
5275
msgid "{0} [{1}] - Stage"
5272
5276
msgstr ""
5273
5277
5274
#: bzrlib/commit.py:1002
5278
#: bzrlib/commit.py:1001
5275
5279
#, python-format
5276
5280
msgid "%s - Stage"
5277
5281
msgstr ""
5278
5282
5283
#: bzrlib/commit_signature_commands.py:34
5284
msgid "Sign all commits by a given committer."
5285
msgstr ""
5286
5279
5287
#: 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
5288
msgid ""
5285
5289
"If location is not specified the local tree is used.\n"
5286
5290
"If committer is not specified the default committer is used."
5287
5291
msgstr ""
5288
5292
5289
#: bzrlib/commit_signature_commands.py:41
5293
#: bzrlib/commit_signature_commands.py:39
5290
5294
msgid "This does not sign commits that already have signatures."
5291
5295
msgstr ""
5292
5296
5293
#: bzrlib/commit_signature_commands.py:49
5297
#: bzrlib/commit_signature_commands.py:47
5294
5298
msgid ""
5295
5299
"Don't actually sign anything, just print the revisions that would be signed."
5296
5300
msgstr ""
5297
5301
5302
#: bzrlib/commit_signature_commands.py:98
5303
#, python-format
5304
msgid "Signed %d revision.\n"
5305
msgid_plural "Signed %d revisions.\n"
5306
msgstr[0] ""
5307
msgstr[1] ""
5308
5298
5309
#: bzrlib/commit_signature_commands.py:103
5299
5310
msgid "Verify all commit signatures."
5300
5311
msgstr ""
5310
5321
"verification."
5311
5322
msgstr ""
5312
5323
5313
#: bzrlib/commit_signature_commands.py:147
5324
#: bzrlib/commit_signature_commands.py:148
5314
5325
msgid "Cannot verify a range of non-revision-history revisions"
5315
5326
msgstr ""
5316
5327
5317
#: bzrlib/commit_signature_commands.py:168
5328
#: bzrlib/commit_signature_commands.py:166
5318
5329
msgid "All commits signed with verifiable keys"
5319
5330
msgstr ""
5320
5331
5321
#: bzrlib/config.py:475
5332
#: bzrlib/config.py:436
5322
5333
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5323
5334
msgstr ""
5324
5335
5325
#: bzrlib/config.py:2485
5336
#: bzrlib/config.py:2452
5326
5337
msgid "{0} is not an SI unit."
5327
5338
msgstr ""
5328
5339
5329
#: bzrlib/config.py:2949
5340
#: bzrlib/config.py:2971
5330
5341
msgid ""
5331
5342
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5332
5343
"will be saved."
5333
5344
msgstr ""
5334
5345
5335
#: bzrlib/config.py:3093
5346
#: bzrlib/config.py:3116
5336
5347
#, python-format
5337
5348
msgid "Invalid '%s', should be of the form 'name=value'"
5338
5349
msgstr ""
5339
5350
5340
#: bzrlib/config.py:3962
5351
#: bzrlib/config.py:4018
5341
5352
msgid "Display, set or remove a configuration option."
5342
5353
msgstr ""
5343
5354
5344
#: bzrlib/config.py:3964
5355
#: bzrlib/config.py:4020
5345
5356
msgid "Display the active value for a given option."
5346
5357
msgstr ""
5347
5358
5348
#: bzrlib/config.py:3966
5359
#: bzrlib/config.py:4022
5349
5360
msgid ""
5350
5361
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5351
5362
"matching options are displayed mentioning their scope. The active value\n"
5352
5363
"that bzr will take into account is the first one displayed for each option."
5353
5364
msgstr ""
5354
5365
5355
#: bzrlib/config.py:3970
5366
#: bzrlib/config.py:4026
5356
5367
msgid "If no NAME is given, --all .* is implied."
5357
5368
msgstr ""
5358
5369
5359
#: bzrlib/config.py:3972
5370
#: bzrlib/config.py:4028
5360
5371
msgid ""
5361
5372
"Setting a value is achieved by using name=value without spaces. The value\n"
5362
5373
"is set in the most relevant scope and can be checked by displaying the\n"
5363
5374
"option again."
5364
5375
msgstr ""
5365
5376
5366
#: bzrlib/config.py:3984
5377
#: bzrlib/config.py:4040
5367
5378
msgid "Reduce the scope to the specified configuration file."
5368
5379
msgstr ""
5369
5380
5370
#: bzrlib/config.py:3988
5381
#: bzrlib/config.py:4044
5371
5382
msgid "Display all the defined values for the matching options."
5372
5383
msgstr ""
5373
5384
5374
#: bzrlib/config.py:3990
5385
#: bzrlib/config.py:4046
5375
5386
msgid "Remove the option from the configuration file."
5376
5387
msgstr ""
5377
5388
5451
5462
msgstr[0] ""
5452
5463
msgstr[1] ""
5453
5464
5454
#: bzrlib/controldir.py:710
5465
#: bzrlib/controldir.py:712
5455
5466
msgid "{0} is{1} redirected to {2}"
5456
5467
msgstr ""
5457
5468
5668
5679
msgstr ""
5669
5680
5670
5681
#: bzrlib/errors.py:715
5682
msgid "Invalid branch name: %(name)s"
5683
msgstr ""
5684
5685
#: bzrlib/errors.py:724
5671
5686
msgid "Parent branch already exists: \"%(path)s\"."
5672
5687
msgstr ""
5673
5688
5674
#: bzrlib/errors.py:721
5689
#: bzrlib/errors.py:730
5675
5690
msgid ""
5676
5691
"Directory contains a branch, but no working tree (use bzr checkout if you "
5677
5692
"wish to build a working tree): \"%(path)s\""
5678
5693
msgstr ""
5679
5694
5680
#: bzrlib/errors.py:726
5695
#: bzrlib/errors.py:735
5681
5696
msgid ""
5682
5697
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5683
5698
msgstr ""
5684
5699
5685
#: bzrlib/errors.py:736
5700
#: bzrlib/errors.py:745
5686
5701
msgid ""
5687
5702
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5688
5703
msgstr ""
5689
5704
5690
#: bzrlib/errors.py:746
5705
#: bzrlib/errors.py:755
5691
5706
msgid "No repository present: \"%(path)s\""
5692
5707
msgstr ""
5693
5708
5694
#: bzrlib/errors.py:753
5709
#: bzrlib/errors.py:762
5695
5710
msgid ""
5696
5711
"Unsupported branch format: %(format)s\n"
5697
5712
"Please run 'bzr upgrade'"
5698
5713
msgstr ""
5699
5714
5700
#: bzrlib/errors.py:759
5715
#: bzrlib/errors.py:768
5701
5716
msgid "Unknown %(kind)s format: %(format)r"
5702
5717
msgstr ""
5703
5718
5704
#: bzrlib/errors.py:768
5719
#: bzrlib/errors.py:777
5705
5720
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5706
5721
msgstr ""
5707
5722
5708
#: bzrlib/errors.py:778
5723
#: bzrlib/errors.py:787
5709
5724
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5710
5725
msgstr ""
5711
5726
5712
#: bzrlib/errors.py:793
5727
#: bzrlib/errors.py:802
5713
5728
msgid ""
5714
5729
"%(target)s\n"
5715
5730
"is not compatible with\n"
5717
5732
"%(details)s"
5718
5733
msgstr ""
5719
5734
5720
#: bzrlib/errors.py:809
5735
#: bzrlib/errors.py:818
5721
5736
msgid "Revision is not compatible with %(repo_format)s"
5722
5737
msgstr ""
5723
5738
5724
#: bzrlib/errors.py:819
5739
#: bzrlib/errors.py:828
5725
5740
msgid "%(context_info)s%(path)s is already versioned."
5726
5741
msgstr ""
5727
5742
5728
#: bzrlib/errors.py:840
5743
#: bzrlib/errors.py:849
5729
5744
msgid "%(context_info)s%(path)s is not versioned."
5730
5745
msgstr ""
5731
5746
5732
#: bzrlib/errors.py:861
5747
#: bzrlib/errors.py:870
5733
5748
msgid "Path(s) are not versioned: %(paths_as_string)s"
5734
5749
msgstr ""
5735
5750
5736
#: bzrlib/errors.py:872
5751
#: bzrlib/errors.py:881
5737
5752
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5738
5753
msgstr ""
5739
5754
5740
#: bzrlib/errors.py:891
5755
#: bzrlib/errors.py:900
5741
5756
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5742
5757
msgstr ""
5743
5758
5744
#: bzrlib/errors.py:899
5759
#: bzrlib/errors.py:908
5745
5760
msgid ""
5746
5761
"Filename %(filename)r is not valid in your current filesystem encoding "
5747
5762
"%(fs_encoding)s"
5748
5763
msgstr ""
5749
5764
5750
#: bzrlib/errors.py:910
5765
#: bzrlib/errors.py:919
5751
5766
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5752
5767
msgstr ""
5753
5768
5754
#: bzrlib/errors.py:928
5769
#: bzrlib/errors.py:937
5755
5770
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5756
5771
msgstr ""
5757
5772
5758
#: bzrlib/errors.py:967
5773
#: bzrlib/errors.py:976
5759
5774
msgid "Cannot lock %(lock)s: %(why)s"
5760
5775
msgstr ""
5761
5776
5762
#: bzrlib/errors.py:977
5777
#: bzrlib/errors.py:986
5763
5778
msgid ""
5764
5779
"A transaction related operation was attempted after the transaction finished."
5765
5780
msgstr ""
5766
5781
5767
#: bzrlib/errors.py:1004
5782
#: bzrlib/errors.py:1013
5768
5783
msgid "Cannot lock: transport is read only: %(transport)s"
5769
5784
msgstr ""
5770
5785
5771
#: bzrlib/errors.py:1012
5786
#: bzrlib/errors.py:1021
5772
5787
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5773
5788
msgstr ""
5774
5789
5775
#: bzrlib/errors.py:1023
5790
#: bzrlib/errors.py:1032
5776
5791
msgid ""
5777
5792
"Lock was broken while still open: %(lock)s - check storage consistency!"
5778
5793
msgstr ""
5779
5794
5780
#: bzrlib/errors.py:1034
5795
#: bzrlib/errors.py:1043
5781
5796
msgid ""
5782
5797
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5783
5798
"%(holder)r, wanted to break %(target)r"
5784
5799
msgstr ""
5785
5800
5786
#: bzrlib/errors.py:1046
5801
#: bzrlib/errors.py:1055
5787
5802
msgid ""
5788
5803
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5789
5804
"Use 'bzr break-lock' to clear it"
5790
5805
msgstr ""
5791
5806
5792
#: bzrlib/errors.py:1059
5807
#: bzrlib/errors.py:1068
5793
5808
msgid "Lock not held: %(lock)s"
5794
5809
msgstr ""
5795
5810
5796
#: bzrlib/errors.py:1088
5811
#: bzrlib/errors.py:1097
5797
5812
msgid "No changes to commit"
5798
5813
msgstr ""
5799
5814
5800
#: bzrlib/errors.py:1093
5815
#: bzrlib/errors.py:1102
5801
5816
msgid ""
5802
5817
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5803
5818
msgstr ""
5804
5819
5805
#: bzrlib/errors.py:1103
5820
#: bzrlib/errors.py:1112
5806
5821
msgid ""
5807
5822
"Excluding paths during commit is not supported by repository at "
5808
5823
"%(repository)r."
5809
5824
msgstr ""
5810
5825
5811
#: bzrlib/errors.py:1112
5826
#: bzrlib/errors.py:1121
5812
5827
msgid ""
5813
5828
"The specified commit message contains characters unsupported by the current "
5814
5829
"encoding."
5815
5830
msgstr ""
5816
5831
5817
#: bzrlib/errors.py:1118
5832
#: bzrlib/errors.py:1127
5818
5833
msgid "Upgrade URL cannot work with readonly URLs."
5819
5834
msgstr ""
5820
5835
5821
#: bzrlib/errors.py:1123
5836
#: bzrlib/errors.py:1132
5822
5837
msgid "The branch format %(format)s is already at the most recent format."
5823
5838
msgstr ""
5824
5839
5825
#: bzrlib/errors.py:1146
5840
#: bzrlib/errors.py:1155
5826
5841
msgid "Option --change does not accept revision ranges"
5827
5842
msgstr ""
5828
5843
5829
#: bzrlib/errors.py:1151
5844
#: bzrlib/errors.py:1160
5830
5845
msgid "No namespace registered for string: %(spec)r"
5831
5846
msgstr ""
5832
5847
5833
#: bzrlib/errors.py:1170
5848
#: bzrlib/errors.py:1179
5834
5849
msgid ""
5835
5850
"Requested revision: '%(spec)s' does not exist in branch: "
5836
5851
"%(branch_url)s%(extra)s"
5837
5852
msgstr ""
5838
5853
5839
#: bzrlib/errors.py:1184
5854
#: bzrlib/errors.py:1193
5840
5855
msgid ""
5841
5856
"Operation denied because it would change the main history, which is not "
5842
5857
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5843
5858
msgstr ""
5844
5859
5845
#: bzrlib/errors.py:1195
5860
#: bzrlib/errors.py:1204
5846
5861
msgid ""
5847
5862
"These branches have diverged. Use the missing command to see how.\n"
5848
5863
"Use the merge command to reconcile them."
5849
5864
msgstr ""
5850
5865
5851
#: bzrlib/errors.py:1215
5866
#: bzrlib/errors.py:1224
5852
5867
msgid ""
5853
5868
"Branches have no common ancestor, and no merge base revision was specified."
5854
5869
msgstr ""
5855
5870
5856
#: bzrlib/errors.py:1221
5871
#: bzrlib/errors.py:1230
5857
5872
msgid ""
5858
5873
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5859
5874
msgstr ""
5860
5875
5861
#: bzrlib/errors.py:1227
5876
#: bzrlib/errors.py:1236
5862
5877
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5863
5878
msgstr ""
5864
5879
5865
#: bzrlib/errors.py:1236
5880
#: bzrlib/errors.py:1245
5866
5881
msgid ""
5867
5882
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5868
5883
msgstr ""
5869
5884
5870
#: bzrlib/errors.py:1245
5885
#: bzrlib/errors.py:1254
5871
5886
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5872
5887
msgstr ""
5873
5888
5874
#: bzrlib/errors.py:1254
5889
#: bzrlib/errors.py:1263
5875
5890
msgid "Branch %(branch)s has no commits."
5876
5891
msgstr ""
5877
5892
5878
#: bzrlib/errors.py:1272
5893
#: bzrlib/errors.py:1281
5879
5894
msgid ""
5880
5895
"Bound branch %(branch)s is out of date with master branch "
5881
5896
"%(master)s.%(extra_help)s"
5882
5897
msgstr ""
5883
5898
5884
#: bzrlib/errors.py:1284
5899
#: bzrlib/errors.py:1293
5885
5900
msgid ""
5886
5901
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5887
5902
"bound to %(remote)s."
5888
5903
msgstr ""
5889
5904
5890
#: bzrlib/errors.py:1296
5905
#: bzrlib/errors.py:1305
5891
5906
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5892
5907
msgstr ""
5893
5908
5894
#: bzrlib/errors.py:1305
5909
#: bzrlib/errors.py:1314
5895
5910
msgid ""
5896
5911
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5897
5912
"%(error)s"
5898
5913
msgstr ""
5899
5914
5900
#: bzrlib/errors.py:1317
5915
#: bzrlib/errors.py:1326
5901
5916
msgid "Error in processing weave: %(msg)s"
5902
5917
msgstr ""
5903
5918
5904
#: bzrlib/errors.py:1326
5919
#: bzrlib/errors.py:1335
5905
5920
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5906
5921
msgstr ""
5907
5922
5908
#: bzrlib/errors.py:1337
5923
#: bzrlib/errors.py:1346
5909
5924
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5910
5925
msgstr ""
5911
5926
5912
#: bzrlib/errors.py:1347
5927
#: bzrlib/errors.py:1356
5913
5928
msgid "Weave invariant violated: %(what)s"
5914
5929
msgstr ""
5915
5930
5916
#: bzrlib/errors.py:1356
5931
#: bzrlib/errors.py:1365
5917
5932
msgid "Parents are mismatched between two revisions. %(msg)s"
5918
5933
msgstr ""
5919
5934
5920
#: bzrlib/errors.py:1378
5935
#: bzrlib/errors.py:1387
5921
5936
msgid ""
5922
5937
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5923
5938
"%(weave_b)s"
5924
5939
msgstr ""
5925
5940
5926
#: bzrlib/errors.py:1390
5941
#: bzrlib/errors.py:1399
5927
5942
msgid "Versioned file error"
5928
5943
msgstr "バージョン管理されたファイルのエラー"
5929
5944
5930
#: bzrlib/errors.py:1395
5945
#: bzrlib/errors.py:1404
5931
5946
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5932
5947
msgstr "\"%(file_id)s\" にはリビジョン {%(revision_id)s} がありません。"
5933
5948
5934
#: bzrlib/errors.py:1405
5949
#: bzrlib/errors.py:1414
5935
5950
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5936
5951
msgstr "\"%(file_id)s\" にはすでにリビジョン {%(revision_id)s} が存在しています。"
5937
5952
5938
#: bzrlib/errors.py:1415
5953
#: bzrlib/errors.py:1424
5939
5954
msgid "Text did not match its checksum: %(msg)s"
5940
5955
msgstr "テキストがチェックサムと一致しません: %(msg)s"
5941
5956
5942
#: bzrlib/errors.py:1541
5957
#: bzrlib/errors.py:1550
5943
5958
msgid "Export format %(format)r not supported"
5944
5959
msgstr "エクスポートフォーマット %(format)r はサポートされていません"
5945
5960
5946
#: bzrlib/errors.py:1550
5961
#: bzrlib/errors.py:1559
5947
5962
msgid "Transport error: %(msg)s %(orig_error)s"
5948
5963
msgstr ""
5949
5964
5950
#: bzrlib/errors.py:1576
5965
#: bzrlib/errors.py:1585
5951
5966
msgid "Generic bzr smart protocol error: %(details)s"
5952
5967
msgstr ""
5953
5968
5954
#: bzrlib/errors.py:1584
5969
#: bzrlib/errors.py:1593
5955
5970
msgid "Received bad protocol version marker: %(marker)r"
5956
5971
msgstr ""
5957
5972
5958
#: bzrlib/errors.py:1616
5973
#: bzrlib/errors.py:1625
5959
5974
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5960
5975
msgstr ""
5961
5976
5962
#: bzrlib/errors.py:1621
5977
#: bzrlib/errors.py:1630
5963
5978
msgid "Connection error: %(msg)s %(orig_error)s"
5964
5979
msgstr ""
5965
5980
5966
#: bzrlib/errors.py:1626
5981
#: bzrlib/errors.py:1635
5967
5982
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5968
5983
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
5969
5984
5970
#: bzrlib/errors.py:1647
5985
#: bzrlib/errors.py:1656
5971
5986
msgid "Connection closed: %(msg)s %(orig_error)s"
5972
5987
msgstr "接続が閉じられました: %(msg)s %(orig_error)s"
5973
5988
5974
#: bzrlib/errors.py:1652
5989
#: bzrlib/errors.py:1661
5975
5990
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5976
5991
msgstr "接続がタイムアウトしました: %(msg)s%(orig_error)s"
5977
5992
5978
#: bzrlib/errors.py:1657
5993
#: bzrlib/errors.py:1666
5979
5994
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5980
5995
msgstr "%(path)s の %(offset)s に対する不正な range アクセス: %(msg)s"
5981
5996
5982
#: bzrlib/errors.py:1667
5997
#: bzrlib/errors.py:1676
5983
5998
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5984
5999
msgstr "%(path)s からの不正な HTTP レスポンス: %(msg)s%(orig_error)s"
5985
6000
5986
#: bzrlib/errors.py:1682
6001
#: bzrlib/errors.py:1691
5987
6002
msgid "Certificate error: %(error)s"
5988
6003
msgstr ""
5989
6004
5990
#: bzrlib/errors.py:1690
6005
#: bzrlib/errors.py:1699
5991
6006
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5992
msgstr "%(path) に対する不正な range %(range)r: %(msg)s"
6007
msgstr "%(path)s に対する不正な range %(range)r: %(msg)s"
5993
6008
5994
#: bzrlib/errors.py:1704
6009
#: bzrlib/errors.py:1713
5995
6010
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5996
6011
msgstr "%(path)s に HTTP MIME 境界が見つかりません: %(msg)s"
5997
6012
5998
#: bzrlib/errors.py:1712
6013
#: bzrlib/errors.py:1721
5999
6014
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
6000
6015
msgstr ""
6001
6016
6002
#: bzrlib/errors.py:1721
6017
#: bzrlib/errors.py:1730
6003
6018
msgid "%(source)s is%(permanently)s redirected to %(target)s"
6004
6019
msgstr ""
6005
6020
6006
#: bzrlib/errors.py:1735
6021
#: bzrlib/errors.py:1744
6007
6022
msgid "Too many redirections"
6008
6023
msgstr "リダイレクションが多すぎます"
6009
6024
6010
#: bzrlib/errors.py:1740
6025
#: bzrlib/errors.py:1749
6011
6026
msgid "Working tree has conflicts."
6012
6027
msgstr "作業ツリーに衝突があります"
6013
6028
6014
#: bzrlib/errors.py:1744
6029
#: bzrlib/errors.py:1753
6015
6030
msgid "Config file %(filename)s is not UTF-8 encoded\n"
6016
6031
msgstr "設定ファイル %(filename)s が UTF-8 でエンコードされていません\n"
6017
6032
6018
#: bzrlib/errors.py:1753
6033
#: bzrlib/errors.py:1762
6019
6034
msgid ""
6020
6035
"Error(s) parsing config file %(filename)s:\n"
6021
6036
"%(errors)s"
6022
6037
msgstr ""
6023
6038
"設定ファイル %(filename)s のパースエラー:\n"
6024
"%(error)s"
6039
"%(errors)s"
6025
6040
6026
#: bzrlib/errors.py:1763
6041
#: bzrlib/errors.py:1772
6027
6042
msgid ""
6028
6043
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6029
6044
"See ``bzr help %(name)s``"
6030
6045
msgstr ""
6031
6046
6032
#: bzrlib/errors.py:1773
6047
#: bzrlib/errors.py:1782
6033
6048
msgid "%(username)r does not seem to contain a reasonable email address"
6034
6049
msgstr "%(username)r に有効な e-mail アドレスが含まれていないようです"
6035
6050
6036
#: bzrlib/errors.py:1782
6051
#: bzrlib/errors.py:1791
6037
6052
msgid "Failed to GPG sign data with command \"%(command_line)s\""
6038
6053
msgstr "\"%(command_line)s\" コマンドでのGPGサインに失敗しました"
6039
6054
6040
#: bzrlib/errors.py:1790
6055
#: bzrlib/errors.py:1799
6041
6056
msgid "Failed to verify GPG signature data with error \"%(error)s\""
6042
6057
msgstr "GPGシグネチャの検証に \"%(error)s\" で失敗しました。"
6043
6058
6044
#: bzrlib/errors.py:1798
6059
#: bzrlib/errors.py:1807
6045
6060
msgid "Unable to import library \"%(library)s\": %(error)s"
6046
6061
msgstr "ライブラリ \"%(library)s\" をインポートできません: %(error)s"
6047
6062
6048
#: bzrlib/errors.py:1806
6063
#: bzrlib/errors.py:1815
6049
6064
msgid "python-gpgme is not installed, it is needed to verify signatures"
6050
6065
msgstr "python-gpgme がインストールされていません。これはシグネチャの検証に必要です。"
6051
6066
6052
#: bzrlib/errors.py:1814
6067
#: bzrlib/errors.py:1823
6053
6068
msgid ""
6054
6069
"The working tree for %(basedir)s has changed since the last commit, but "
6055
6070
"weave merge requires that it be unchanged"
6056
6071
msgstr "作業ツリー %(basedir)s が最後のコミットから変更されています。 作業ツリーが変更されている場合weaveマージはできません。"
6057
6072
6058
#: bzrlib/errors.py:1824
6073
#: bzrlib/errors.py:1833
6059
6074
msgid ""
6060
6075
"Can't reprocess and show base, because reprocessing obscures the "
6061
6076
"relationship of conflicting lines to the base"
6062
6077
msgstr ""
6063
6078
6064
#: bzrlib/errors.py:1830
6079
#: bzrlib/errors.py:1839
6065
6080
msgid "Cycle in graph %(graph)r"
6066
6081
msgstr "グラフ %(graph)r がループしています。"
6067
6082
6068
#: bzrlib/errors.py:1858
6083
#: bzrlib/errors.py:1867
6069
6084
msgid "File %(filename)s is not conflicted."
6070
6085
msgstr "%(filename)s は衝突していません"
6071
6086
6072
#: bzrlib/errors.py:1880
6087
#: bzrlib/errors.py:1889
6073
6088
msgid "No bundle was found in \"%(filename)s\"."
6074
6089
msgstr "\"%(filename)s\" にバンドルが見つかりません。"
6075
6090
6076
#: bzrlib/errors.py:1889
6091
#: bzrlib/errors.py:1898
6077
6092
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6078
6093
msgstr ""
6079
6094
6080
#: bzrlib/errors.py:1899
6095
#: bzrlib/errors.py:1908
6081
6096
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6082
6097
msgstr ""
6083
6098
6084
#: bzrlib/errors.py:1912
6099
#: bzrlib/errors.py:1921
6085
6100
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6086
6101
msgstr ""
6087
6102
6088
#: bzrlib/errors.py:1922
6103
#: bzrlib/errors.py:1931
6089
6104
msgid "Key %(key)s is already present in map"
6090
6105
msgstr ""
6091
6106
6092
#: bzrlib/errors.py:1927
6107
#: bzrlib/errors.py:1936
6093
6108
msgid "The prefix %(prefix)s is in the help search path twice."
6094
6109
msgstr ""
6095
6110
6096
#: bzrlib/errors.py:1937
6111
#: bzrlib/errors.py:1946
6097
6112
msgid ""
6098
6113
"No final name for trans_id %(trans_id)r\n"
6099
6114
"file-id: %(file_id)r\n"
6100
6115
"root trans-id: %(root_trans_id)r\n"
6101
6116
msgstr ""
6102
6117
6103
#: bzrlib/errors.py:1969
6118
#: bzrlib/errors.py:1978
6104
6119
msgid "Attempt to reuse a transform that has already been applied."
6105
6120
msgstr ""
6106
6121
6107
#: bzrlib/errors.py:1974
6122
#: bzrlib/errors.py:1983
6108
6123
msgid "Moving the root directory is not supported at this time"
6109
6124
msgstr "いまのところ、ルートディレクトリの移動はサポートされていません"
6110
6125
6111
#: bzrlib/errors.py:1979
6126
#: bzrlib/errors.py:1988
6112
6127
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6113
6128
msgstr "%(from_path)s から %(to_path)s へのリネームに失敗しました: %(why)s"
6114
6129
6115
#: bzrlib/errors.py:1990
6130
#: bzrlib/errors.py:1999
6116
6131
msgid ""
6117
6132
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6118
6133
msgstr ""
6119
6134
"移動できません。 %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6120
6135
6121
#: bzrlib/errors.py:2026
6136
#: bzrlib/errors.py:2035
6122
6137
msgid ""
6123
6138
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6124
6139
msgstr ""
6125
6140
"%(from_path)s%(operator)s から %(to_path)s%(_has_extra)s%(extra)s へリネームできません"
6126
6141
6127
#: bzrlib/errors.py:2056
6142
#: bzrlib/errors.py:2065
6128
6143
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6129
6144
msgstr ""
6130
6145
6131
#: bzrlib/errors.py:2064
6146
#: bzrlib/errors.py:2073
6132
6147
msgid "Nothing to merge."
6133
6148
msgstr ""
6134
6149
6135
#: bzrlib/errors.py:2069
6150
#: bzrlib/errors.py:2078
6136
6151
msgid "Format %(format)s cannot be initialised by this version of bzr."
6137
6152
msgstr ""
6138
6153
6139
#: bzrlib/errors.py:2078
6154
#: bzrlib/errors.py:2087
6140
6155
msgid ""
6141
6156
"Cannot convert from format %(from_format)s to format %(format)s. "
6142
6157
"%(problem)s"
6143
6158
msgstr ""
6144
6159
6145
#: bzrlib/errors.py:2090
6160
#: bzrlib/errors.py:2099
6146
6161
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6147
6162
msgstr ""
6148
6163
6149
#: bzrlib/errors.py:2098
6164
#: bzrlib/errors.py:2107
6150
6165
msgid "%(exe_name)s could not be found on this machine"
6151
6166
msgstr ""
6152
6167
6153
#: bzrlib/errors.py:2106
6168
#: bzrlib/errors.py:2115
6154
6169
msgid "Diff is not installed on this machine: %(msg)s"
6155
6170
msgstr ""
6156
6171
6157
#: bzrlib/errors.py:2114
6172
#: bzrlib/errors.py:2123
6158
6173
msgid "Diff3 is not installed on this machine."
6159
6174
msgstr ""
6160
6175
6161
#: bzrlib/errors.py:2120
6176
#: bzrlib/errors.py:2129
6162
6177
msgid "The content being inserted is already present."
6163
6178
msgstr ""
6164
6179
6165
#: bzrlib/errors.py:2125
6180
#: bzrlib/errors.py:2134
6166
6181
msgid ""
6167
6182
"This tree contains left-over files from a failed operation.\n"
6168
6183
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6170
6185
" keep, and delete it when you are done."
6171
6186
msgstr ""
6172
6187
6173
#: bzrlib/errors.py:2136
6188
#: bzrlib/errors.py:2145
6174
6189
msgid ""
6175
6190
"This tree contains left-over files from a failed operation.\n"
6176
6191
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6177
6192
" wish to keep, and delete it when you are done."
6178
6193
msgstr ""
6179
6194
6180
#: bzrlib/errors.py:2146
6195
#: bzrlib/errors.py:2155
6181
6196
msgid ""
6182
6197
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6183
6198
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6185
6200
" keep, and delete it when you are done."
6186
6201
msgstr ""
6187
6202
6188
#: bzrlib/errors.py:2157
6203
#: bzrlib/errors.py:2166
6189
6204
msgid ""
6190
6205
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6191
6206
"examine %(pending_deletion)s to see if it contains any files you wish to "
6192
6207
"keep, and delete it when you are done."
6193
6208
msgstr ""
6194
6209
6195
#: bzrlib/errors.py:2167
6210
#: bzrlib/errors.py:2176
6196
6211
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6197
6212
msgstr ""
6198
6213
6199
#: bzrlib/errors.py:2181
6214
#: bzrlib/errors.py:2190
6200
6215
msgid ""
6201
6216
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6202
6217
msgstr ""
6203
6218
6204
#: bzrlib/errors.py:2194
6219
#: bzrlib/errors.py:2203
6205
6220
msgid "Error in merge modified format"
6206
6221
msgstr ""
6207
6222
6208
#: bzrlib/errors.py:2199
6223
#: bzrlib/errors.py:2208
6209
6224
msgid "Format error in conflict listings"
6210
6225
msgstr ""
6211
6226
6212
#: bzrlib/errors.py:2203
6227
#: bzrlib/errors.py:2212
6213
6228
msgid ""
6214
6229
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6215
6230
"Error: %(description)s"
6216
6231
msgstr ""
6217
6232
6218
#: bzrlib/errors.py:2214
6233
#: bzrlib/errors.py:2223
6219
6234
msgid ""
6220
6235
"An error has been detected in the repository %(repo_path)s.\n"
6221
6236
"Please run bzr reconcile on this repository."
6222
6237
msgstr ""
6223
6238
6224
#: bzrlib/errors.py:2225
6239
#: bzrlib/errors.py:2234
6225
6240
msgid ""
6226
6241
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6227
6242
"reason: %(reason)s"
6228
6243
msgstr ""
6229
6244
6230
#: bzrlib/errors.py:2238
6245
#: bzrlib/errors.py:2247
6231
6246
msgid ""
6232
6247
"An inconsistent delta was supplied: %(delta)r\n"
6233
6248
"reason: %(reason)s"
6234
6249
msgstr ""
6235
6250
6236
#: bzrlib/errors.py:2250
6251
#: bzrlib/errors.py:2259
6237
6252
msgid "To use this feature you must upgrade your branch at %(path)s."
6238
6253
msgstr ""
6239
6254
6240
#: bzrlib/errors.py:2259
6255
#: bzrlib/errors.py:2268
6241
6256
msgid "To use this feature you must upgrade your repository at %(path)s."
6242
6257
msgstr ""
6243
6258
6244
#: bzrlib/errors.py:2264
6259
#: bzrlib/errors.py:2273
6245
6260
msgid ""
6246
6261
"To use this feature you must upgrade your branch at %(path)s to a format "
6247
6262
"which supports rich roots."
6248
6263
msgstr ""
6249
6264
6250
#: bzrlib/errors.py:2270
6265
#: bzrlib/errors.py:2279
6251
6266
msgid "Cannot perform local-only commits on unbound branches."
6252
6267
msgstr ""
6253
6268
6254
#: bzrlib/errors.py:2275
6269
#: bzrlib/errors.py:2284
6255
6270
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6256
6271
msgstr ""
6257
6272
6258
#: bzrlib/errors.py:2296
6273
#: bzrlib/errors.py:2305
6259
6274
msgid "Ghost tags not supported by format %(format)r."
6260
6275
msgstr ""
6261
6276
6262
#: bzrlib/errors.py:2304
6277
#: bzrlib/errors.py:2313
6263
6278
msgid "File is binary but should be text."
6264
6279
msgstr ""
6265
6280
6266
#: bzrlib/errors.py:2309
6281
#: bzrlib/errors.py:2318
6267
6282
msgid "The path %(path)s is not permitted on this platform"
6268
6283
msgstr ""
6269
6284
6270
#: bzrlib/errors.py:2318
6285
#: bzrlib/errors.py:2327
6271
6286
msgid ""
6272
6287
"Testament did not match expected value.\n"
6273
6288
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6274
6289
" {%(measured)s}"
6275
6290
msgstr ""
6276
6291
6277
#: bzrlib/errors.py:2330
6292
#: bzrlib/errors.py:2339
6278
6293
msgid "Not a bzr revision-bundle: %(text)r"
6279
6294
msgstr ""
6280
6295
6281
#: bzrlib/errors.py:2339
6296
#: bzrlib/errors.py:2348
6282
6297
msgid "Bad bzr revision-bundle: %(text)r"
6283
6298
msgstr ""
6284
6299
6285
#: bzrlib/errors.py:2348
6300
#: bzrlib/errors.py:2357
6286
6301
msgid "Malformed bzr revision-bundle header: %(text)r"
6287
6302
msgstr ""
6288
6303
6289
#: bzrlib/errors.py:2353
6304
#: bzrlib/errors.py:2362
6290
6305
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6291
6306
msgstr ""
6292
6307
6293
#: bzrlib/errors.py:2358
6308
#: bzrlib/errors.py:2367
6294
6309
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6295
6310
msgstr ""
6296
6311
6297
#: bzrlib/errors.py:2363
6312
#: bzrlib/errors.py:2372
6298
6313
msgid "End of line marker was not \\n in bzr revision-bundle"
6299
6314
msgstr ""
6300
6315
6301
#: bzrlib/errors.py:2373
6316
#: bzrlib/errors.py:2382
6302
6317
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6303
6318
msgstr ""
6304
6319
6305
#: bzrlib/errors.py:2383
6320
#: bzrlib/errors.py:2392
6306
6321
msgid "Root class for inventory serialization errors"
6307
6322
msgstr ""
6308
6323
6309
#: bzrlib/errors.py:2387
6324
#: bzrlib/errors.py:2396
6310
6325
msgid ""
6311
6326
"The inventory was not in the expected format:\n"
6312
6327
" %(msg)s"
6313
6328
msgstr ""
6314
6329
6315
#: bzrlib/errors.py:2396
6330
#: bzrlib/errors.py:2405
6316
6331
msgid "This operation requires rich root data storage"
6317
6332
msgstr ""
6318
6333
6319
#: bzrlib/errors.py:2409
6334
#: bzrlib/errors.py:2418
6320
6335
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6321
6336
msgstr ""
6322
6337
6323
#: bzrlib/errors.py:2418
6338
#: bzrlib/errors.py:2427
6324
6339
msgid ""
6325
6340
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6326
6341
"variable."
6327
6342
msgstr ""
6328
6343
6329
#: bzrlib/errors.py:2425
6344
#: bzrlib/errors.py:2434
6330
6345
msgid ""
6331
6346
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6332
6347
"ghost at {%(ghost_revision_id)s}"
6333
6348
msgstr ""
6334
6349
6335
#: bzrlib/errors.py:2435
6350
#: bzrlib/errors.py:2444
6336
6351
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6337
6352
msgstr ""
6338
6353
6339
#: bzrlib/errors.py:2486
6354
#: bzrlib/errors.py:2495
6340
6355
msgid ""
6341
6356
"A merge directive must provide either a bundle or a public branch location."
6342
6357
msgstr ""
6343
6358
6344
#: bzrlib/errors.py:2493
6359
#: bzrlib/errors.py:2502
6345
6360
msgid "Bad merge directive payload %(start)r"
6346
6361
msgstr ""
6347
6362
6348
#: bzrlib/errors.py:2503
6363
#: bzrlib/errors.py:2512
6349
6364
msgid "Preview patch does not match requested changes."
6350
6365
msgstr ""
6351
6366
6352
#: bzrlib/errors.py:2509
6367
#: bzrlib/errors.py:2518
6353
6368
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6354
6369
msgstr ""
6355
6370
6356
#: bzrlib/errors.py:2519
6371
#: bzrlib/errors.py:2528
6357
6372
msgid ""
6358
6373
"Your branch does not have all of the revisions required in order to merge "
6359
6374
"this merge directive and the target location specified in the merge "
6360
6375
"directive is not a branch: %(location)s."
6361
6376
msgstr ""
6362
6377
6363
#: bzrlib/errors.py:2531
6378
#: bzrlib/errors.py:2540
6364
6379
msgid "Unsupported entry kind %(kind)s"
6365
6380
msgstr ""
6366
6381
6367
#: bzrlib/errors.py:2539
6382
#: bzrlib/errors.py:2548
6368
6383
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6369
6384
msgstr ""
6370
6385
6371
#: bzrlib/errors.py:2549
6386
#: bzrlib/errors.py:2558
6372
6387
msgid "Subsume target %(other_tree)s needs to be upgraded."
6373
6388
msgstr ""
6374
6389
6375
#: bzrlib/errors.py:2568
6390
#: bzrlib/errors.py:2577
6376
6391
msgid "No such tag: %(tag_name)s"
6377
6392
msgstr ""
6378
6393
6379
#: bzrlib/errors.py:2576
6394
#: bzrlib/errors.py:2585
6380
6395
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6381
6396
msgstr ""
6382
6397
6383
#: bzrlib/errors.py:2585
6398
#: bzrlib/errors.py:2594
6384
6399
msgid "Tag %(tag_name)s already exists."
6385
6400
msgstr ""
6386
6401
6387
#: bzrlib/errors.py:2593
6402
#: bzrlib/errors.py:2602
6388
6403
msgid ""
6389
6404
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6390
6405
"bugs\" for more information on this feature."
6391
6406
msgstr ""
6392
6407
6393
#: bzrlib/errors.py:2603
6408
#: bzrlib/errors.py:2612
6394
6409
msgid ""
6395
6410
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6396
6411
msgstr ""
6397
6412
6398
#: bzrlib/errors.py:2613
6413
#: bzrlib/errors.py:2622
6399
6414
msgid ""
6400
6415
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6401
6416
msgstr ""
6402
6417
6403
#: bzrlib/errors.py:2623
6418
#: bzrlib/errors.py:2632
6404
6419
msgid "Invalid line in bugs property: '%(line)s'"
6405
6420
msgstr ""
6406
6421
6407
#: bzrlib/errors.py:2631
6422
#: bzrlib/errors.py:2640
6408
6423
msgid "Invalid bug status: '%(status)s'"
6409
6424
msgstr ""
6410
6425
6411
#: bzrlib/errors.py:2639
6426
#: bzrlib/errors.py:2648
6412
6427
msgid "Could not understand response from smart server: %(response_tuple)r"
6413
6428
msgstr ""
6414
6429
6415
#: bzrlib/errors.py:2678
6430
#: bzrlib/errors.py:2687
6416
6431
msgid "Server sent an unexpected error: %(error_tuple)r"
6417
6432
msgstr ""
6418
6433
6419
#: bzrlib/errors.py:2697
6434
#: bzrlib/errors.py:2706
6420
6435
msgid "Unrecognised container format: %(container_format)r"
6421
6436
msgstr ""
6422
6437
6423
#: bzrlib/errors.py:2705
6438
#: bzrlib/errors.py:2714
6424
6439
msgid "Unexpected end of container stream"
6425
6440
msgstr ""
6426
6441
6427
#: bzrlib/errors.py:2710
6442
#: bzrlib/errors.py:2719
6428
6443
msgid "Unknown record type: %(record_type)r"
6429
6444
msgstr ""
6430
6445
6431
#: bzrlib/errors.py:2718
6446
#: bzrlib/errors.py:2727
6432
6447
msgid "Invalid record: %(reason)s"
6433
6448
msgstr ""
6434
6449
6435
#: bzrlib/errors.py:2726
6450
#: bzrlib/errors.py:2735
6436
6451
msgid "Container has data after end marker: %(excess)r"
6437
6452
msgstr ""
6438
6453
6439
#: bzrlib/errors.py:2734
6454
#: bzrlib/errors.py:2743
6440
6455
msgid "Container has multiple records with the same name: %(name)s"
6441
6456
msgstr ""
6442
6457
6443
#: bzrlib/errors.py:2747
6458
#: bzrlib/errors.py:2756
6444
6459
msgid "Corrupt or incompatible data stream: %(reason)s"
6445
6460
msgstr ""
6446
6461
6447
#: bzrlib/errors.py:2755
6462
#: bzrlib/errors.py:2764
6448
6463
msgid "SMTP error: %(error)s"
6449
6464
msgstr ""
6450
6465
6451
#: bzrlib/errors.py:2763
6466
#: bzrlib/errors.py:2772
6452
6467
msgid "No message supplied."
6453
6468
msgstr ""
6454
6469
6455
#: bzrlib/errors.py:2768
6470
#: bzrlib/errors.py:2777
6456
6471
msgid "No mail-to address (--mail-to) or output (-o) specified."
6457
6472
msgstr ""
6458
6473
6459
#: bzrlib/errors.py:2773
6460
msgid "Unknown mail client: %(mail_client)s"
6461
msgstr ""
6462
6463
#: bzrlib/errors.py:2781
6474
#: bzrlib/errors.py:2782
6464
6475
msgid ""
6465
6476
"Unable to find mail client with the following names: "
6466
6477
"%(mail_command_list_string)s"
6467
6478
msgstr ""
6468
6479
6469
#: bzrlib/errors.py:2791
6480
#: bzrlib/errors.py:2792
6470
6481
msgid "SMTP connection to %(host)s refused"
6471
6482
msgstr ""
6472
6483
6473
#: bzrlib/errors.py:2800
6484
#: bzrlib/errors.py:2801
6474
6485
msgid "Please specify smtp_server. No server at default %(host)s."
6475
6486
msgstr ""
6476
6487
6477
#: bzrlib/errors.py:2814
6488
#: bzrlib/errors.py:2815
6478
6489
msgid ""
6479
6490
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6480
6491
"reconfigure."
6481
6492
msgstr ""
6482
6493
6483
#: bzrlib/errors.py:2826
6494
#: bzrlib/errors.py:2827
6484
6495
msgid "'%(display_url)s' is already a branch."
6485
6496
msgstr ""
6486
6497
6487
#: bzrlib/errors.py:2831
6498
#: bzrlib/errors.py:2832
6488
6499
msgid "'%(display_url)s' is already a tree."
6489
6500
msgstr ""
6490
6501
6491
#: bzrlib/errors.py:2836
6502
#: bzrlib/errors.py:2837
6492
6503
msgid "'%(display_url)s' is already a checkout."
6493
6504
msgstr ""
6494
6505
6495
#: bzrlib/errors.py:2841
6506
#: bzrlib/errors.py:2842
6496
6507
msgid "'%(display_url)s' is already a lightweight checkout."
6497
6508
msgstr ""
6498
6509
6499
#: bzrlib/errors.py:2846
6510
#: bzrlib/errors.py:2847
6500
6511
msgid "'%(display_url)s' is already using a shared repository."
6501
6512
msgstr ""
6502
6513
6503
#: bzrlib/errors.py:2851
6514
#: bzrlib/errors.py:2852
6504
6515
msgid "'%(display_url)s' is already standalone."
6505
6516
msgstr ""
6506
6517
6507
#: bzrlib/errors.py:2856
6518
#: bzrlib/errors.py:2857
6508
6519
msgid "Shared repository '%(display_url)s' already creates working trees."
6509
6520
msgstr ""
6510
6521
6511
#: bzrlib/errors.py:2862
6522
#: bzrlib/errors.py:2863
6512
6523
msgid ""
6513
6524
"Shared repository '%(display_url)s' already doesn't create working trees."
6514
6525
msgstr ""
6515
6526
6516
#: bzrlib/errors.py:2868
6527
#: bzrlib/errors.py:2869
6517
6528
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6518
6529
msgstr ""
6519
6530
6520
#: bzrlib/errors.py:2873
6531
#: bzrlib/errors.py:2874
6521
6532
msgid "No location could be found to bind to at %(display_url)s."
6522
6533
msgstr ""
6523
6534
6524
#: bzrlib/errors.py:2878
6535
#: bzrlib/errors.py:2879
6525
6536
msgid ""
6526
6537
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6527
6538
"status).%(more)s"
6528
6539
msgstr ""
6529
6540
6530
#: bzrlib/errors.py:2897
6541
#: bzrlib/errors.py:2898
6531
6542
msgid ""
6532
6543
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6533
6544
"list).%(more)s"
6534
6545
msgstr ""
6535
6546
6536
#: bzrlib/errors.py:2903
6547
#: bzrlib/errors.py:2904
6537
6548
msgid "Variable {%(name)s} is not available."
6538
6549
msgstr ""
6539
6550
6540
#: bzrlib/errors.py:2911
6551
#: bzrlib/errors.py:2912
6541
6552
msgid "No template specified."
6542
6553
msgstr ""
6543
6554
6544
#: bzrlib/errors.py:2916
6555
#: bzrlib/errors.py:2917
6545
6556
msgid "Unable to create symlink %(path_str)son this platform"
6546
6557
msgstr ""
6547
6558
6548
#: bzrlib/errors.py:2931
6559
#: bzrlib/errors.py:2932
6549
6560
msgid ""
6550
6561
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6551
6562
"\"original\", \"local\"."
6552
6563
msgstr ""
6553
6564
6554
#: bzrlib/errors.py:2965
6565
#: bzrlib/errors.py:2966
6555
6566
msgid ""
6556
6567
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6557
6568
msgstr ""
6558
6569
6559
#: bzrlib/errors.py:2977
6570
#: bzrlib/errors.py:2978
6560
6571
msgid "The \"%(config_id)s\" configuration does not exist."
6561
6572
msgstr ""
6562
6573
6563
#: bzrlib/errors.py:2985
6574
#: bzrlib/errors.py:2986
6564
6575
msgid "The \"%(option_name)s\" configuration option does not exist."
6565
6576
msgstr ""
6566
6577
6567
#: bzrlib/errors.py:2993
6578
#: bzrlib/errors.py:2994
6568
6579
msgid "The alias \"%(alias_name)s\" does not exist."
6569
6580
msgstr ""
6570
6581
6571
#: bzrlib/errors.py:3007
6582
#: bzrlib/errors.py:3008
6572
6583
msgid "\"%(alias_name)s\" is not a valid location alias."
6573
6584
msgstr ""
6574
6585
6575
#: bzrlib/errors.py:3015
6586
#: bzrlib/errors.py:3016
6576
6587
msgid "No %(alias_name)s location assigned."
6577
6588
msgstr ""
6578
6589
6579
#: bzrlib/errors.py:3023
6590
#: bzrlib/errors.py:3024
6580
6591
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6581
6592
msgstr ""
6582
6593
6583
#: bzrlib/errors.py:3033
6594
#: bzrlib/errors.py:3034
6584
6595
msgid "Unknown rules detected: %(unknowns_str)s."
6585
6596
msgstr ""
6586
6597
6587
#: bzrlib/errors.py:3044
6598
#: bzrlib/errors.py:3045
6588
6599
msgid "Tip change rejected: %(msg)s"
6589
6600
msgstr ""
6590
6601
6591
#: bzrlib/errors.py:3052
6602
#: bzrlib/errors.py:3053
6592
6603
msgid "Shelf corrupt."
6593
6604
msgstr ""
6594
6605
6595
#: bzrlib/errors.py:3057
6606
#: bzrlib/errors.py:3058
6596
6607
msgid "Corruption while decompressing repository file%(orig_error)s"
6597
6608
msgstr ""
6598
6609
6599
#: bzrlib/errors.py:3069
6610
#: bzrlib/errors.py:3070
6600
6611
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6601
6612
msgstr ""
6602
6613
6603
#: bzrlib/errors.py:3077
6614
#: bzrlib/errors.py:3078
6604
6615
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6605
6616
msgstr ""
6606
6617
6607
#: bzrlib/errors.py:3085
6618
#: bzrlib/errors.py:3086
6608
6619
msgid ""
6609
6620
"An attempt to access a url outside the server jail was made: '%(url)s'."
6610
6621
msgstr ""
6611
6622
6612
#: bzrlib/errors.py:3093
6623
#: bzrlib/errors.py:3094
6613
6624
msgid "The user aborted the operation."
6614
6625
msgstr ""
6615
6626
6616
#: bzrlib/errors.py:3098
6627
#: bzrlib/errors.py:3099
6617
6628
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6618
6629
msgstr ""
6619
6630
6620
#: bzrlib/errors.py:3108
6631
#: bzrlib/errors.py:3109
6621
6632
msgid "No such view: %(view_name)s."
6622
6633
msgstr ""
6623
6634
6624
#: bzrlib/errors.py:3118
6635
#: bzrlib/errors.py:3119
6625
6636
msgid ""
6626
6637
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6627
6638
"to a later format."
6628
6639
msgstr ""
6629
6640
6630
#: bzrlib/errors.py:3127
6641
#: bzrlib/errors.py:3128
6631
6642
msgid ""
6632
6643
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6633
6644
msgstr ""
6634
6645
6635
#: bzrlib/errors.py:3194
6646
#: bzrlib/errors.py:3195
6636
6647
msgid "%(bzrdir)r does not support co-located branches."
6637
6648
msgstr ""
6638
6649
6639
#: bzrlib/errors.py:3200
6650
#: bzrlib/errors.py:3201
6640
6651
msgid ""
6641
6652
"Unable to determine your name.\n"
6642
6653
"Please, set your name with the 'whoami' command.\n"
6643
6654
"E.g. bzr whoami \"Your Name <name@example.com>\""
6644
6655
msgstr ""
6645
6656
6646
#: bzrlib/errors.py:3209
6657
#: bzrlib/errors.py:3210
6647
6658
msgid "Invalid pattern(s) found. %(msg)s"
6648
6659
msgstr ""
6649
6660
6650
#: bzrlib/errors.py:3217
6661
#: bzrlib/errors.py:3218
6651
6662
msgid ""
6652
6663
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6653
6664
"unbind` to fix."
6654
6665
msgstr ""
6655
6666
6656
#: bzrlib/errors.py:3228
6667
#: bzrlib/errors.py:3229
6657
6668
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6658
6669
msgstr ""
6659
6670
6660
#: bzrlib/errors.py:3237
6671
#: bzrlib/errors.py:3238
6661
6672
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6662
6673
msgstr ""
6663
6674
6664
#: bzrlib/errors.py:3246
6675
#: bzrlib/errors.py:3247
6665
6676
msgid ""
6666
6677
"No compatible object available for operations from %(source)r to %(target)r."
6667
6678
msgstr ""
6668
6679
6669
#: bzrlib/errors.py:3256
6680
#: bzrlib/errors.py:3257
6670
6681
msgid ""
6671
6682
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6672
6683
"%(arguments)s."
6673
6684
msgstr ""
6674
6685
6675
#: bzrlib/errors.py:3266
6686
#: bzrlib/errors.py:3267
6676
6687
msgid ""
6677
6688
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6678
6689
"format %(format)r"
6679
6690
msgstr ""
6680
6691
6681
#: bzrlib/errors.py:3278
6692
#: bzrlib/errors.py:3279
6682
6693
msgid ""
6683
6694
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6684
6695
"plugin."
6685
6696
msgstr ""
6686
6697
6687
#: bzrlib/errors.py:3291
6698
#: bzrlib/errors.py:3292
6688
6699
msgid "Binary files section encountered."
6689
6700
msgstr ""
6690
6701
6691
#: bzrlib/errors.py:3299
6702
#: bzrlib/errors.py:3300
6692
6703
msgid ""
6693
6704
"Malformed patch header. %(desc)s\n"
6694
6705
"%(line)r"
6695
6706
msgstr ""
6696
6707
6697
#: bzrlib/errors.py:3308
6708
#: bzrlib/errors.py:3309
6698
6709
msgid ""
6699
6710
"Malformed hunk header. %(desc)s\n"
6700
6711
"%(line)r"
6701
6712
msgstr ""
6702
6713
6703
#: bzrlib/errors.py:3317
6714
#: bzrlib/errors.py:3318
6704
6715
msgid ""
6705
6716
"Malformed line. %(desc)s\n"
6706
6717
"%(line)r"
6707
6718
msgstr ""
6708
6719
6709
#: bzrlib/errors.py:3327
6720
#: bzrlib/errors.py:3328
6710
6721
msgid ""
6711
6722
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6712
6723
"but patch says it should be \"%(patch_line)s\""
6713
6724
msgstr ""
6714
6725
6715
#: bzrlib/errors.py:3338
6726
#: bzrlib/errors.py:3339
6716
6727
msgid "The feature %(feature)s has already been registered."
6717
6728
msgstr ""
6718
6729
6764
6775
"regular push."
6765
6776
msgstr ""
6766
6777
6767
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6778
#: bzrlib/gpg.py:366
6779
msgid "No GnuPG key results for pattern: {0}"
6780
msgstr ""
6781
6782
#: bzrlib/gpg.py:439
6768
6783
msgid "{0} commits with valid signatures"
6769
6784
msgstr ""
6770
6785
6771
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6786
#: bzrlib/gpg.py:445
6772
6787
msgid "{0} commit with unknown key"
6773
6788
msgid_plural "{0} commits with unknown keys"
6774
6789
msgstr[0] ""
6775
6790
msgstr[1] ""
6776
6791
6777
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6792
#: bzrlib/gpg.py:453
6778
6793
msgid "{0} commit not valid"
6779
6794
msgid_plural "{0} commits not valid"
6780
6795
msgstr[0] ""
6781
6796
msgstr[1] ""
6782
6797
6783
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6798
#: bzrlib/gpg.py:461
6784
6799
msgid "{0} commit not signed"
6785
6800
msgid_plural "{0} commits not signed"
6786
6801
msgstr[0] ""
6787
6802
msgstr[1] ""
6788
6803
6789
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6804
#: bzrlib/gpg.py:469
6790
6805
msgid "{0} commit with key now expired"
6791
6806
msgid_plural "{0} commits with key now expired"
6792
6807
msgstr[0] ""
6793
6808
msgstr[1] ""
6794
6809
6795
#: bzrlib/gpg.py:343
6796
msgid "No GnuPG key results for pattern: {0}"
6797
msgstr ""
6810
#: bzrlib/gpg.py:489
6811
msgid "{0} commit by author {1} with key {2} now expired"
6812
msgid_plural "{0} commits by author {1} with key {2} now expired"
6813
msgstr[0] ""
6814
msgstr[1] ""
6798
6815
6799
#: bzrlib/gpg.py:386
6816
#: bzrlib/gpg.py:505
6800
6817
msgid "{0} signed {1} commit"
6801
6818
msgid_plural "{0} signed {1} commits"
6802
6819
msgstr[0] ""
6803
6820
msgstr[1] ""
6804
6821
6805
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6822
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6806
6823
msgid "{0} commit by author {1}"
6807
6824
msgid_plural "{0} commits by author {1}"
6808
6825
msgstr[0] ""
6809
6826
msgstr[1] ""
6810
6827
6811
#: bzrlib/gpg.py:433
6828
#: bzrlib/gpg.py:554
6812
6829
msgid "Unknown key {0} signed {1} commit"
6813
6830
msgid_plural "Unknown key {0} signed {1} commits"
6814
6831
msgstr[0] ""
6815
6832
msgstr[1] ""
6816
6833
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
6834
#: bzrlib/groupcompress.py:1739
6824
6835
#, python-format
6825
6836
msgid "Insert claimed random_id=True, but then inserted %r two times"
6826
6837
msgstr ""
6827
6838
6828
#: bzrlib/hooks.py:331
6839
#: bzrlib/hooks.py:313
6829
6840
#, python-format
6830
6841
msgid "Introduced in: %s"
6831
6842
msgstr ""
6832
6843
6833
#: bzrlib/hooks.py:334
6844
#: bzrlib/hooks.py:316
6834
6845
#, python-format
6835
6846
msgid "Deprecated in: %s"
6836
6847
msgstr ""
6879
6890
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6880
6891
msgstr ""
6881
6892
6882
#: bzrlib/log.py:572
6893
#: bzrlib/log.py:563
6883
6894
msgid "--exclude-common-ancestry requires two different revisions"
6884
6895
msgstr ""
6885
6896
6886
#: bzrlib/log.py:574
6897
#: bzrlib/log.py:565
6887
6898
#, python-format
6888
6899
msgid "invalid direction %r"
6889
6900
msgstr ""
6890
6901
6891
#: bzrlib/log.py:662
6902
#: bzrlib/log.py:653
6892
6903
msgid "Start revision not found in history of end revision."
6893
6904
msgstr ""
6894
6905
6895
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6906
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6896
6907
msgid "Logging revision 0 is invalid."
6897
6908
msgstr ""
6898
6909
6899
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6910
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6900
6911
msgid "Start revision must be older than the end revision."
6901
6912
msgstr ""
6902
6913
6903
#: bzrlib/log.py:1827
6914
#: bzrlib/log.py:1818
6904
6915
#, python-format
6905
6916
msgid "unknown log formatter: %r"
6906
6917
msgstr ""
6907
6918
6908
#: bzrlib/log.py:2123
6919
#: bzrlib/log.py:2114
6909
6920
msgid "fixes bug"
6910
6921
msgid_plural "fixes bugs"
6911
6922
msgstr[0] ""
6920
6931
msgid "%d conflicts encountered."
6921
6932
msgstr ""
6922
6933
6923
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6934
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6924
6935
msgid "Preparing file merge"
6925
6936
msgstr ""
6926
6937
7042
7053
msgid "lstat/stat of ({0!r}): {1!r}"
7043
7054
msgstr ""
7044
7055
7045
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
7056
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
7046
7057
#, python-format
7047
7058
msgid "sorry, %r not allowed in path"
7048
7059
msgstr ""
7049
7060
7050
#: bzrlib/osutils.py:1237
7061
#: bzrlib/osutils.py:1259
7051
7062
#, python-format
7052
7063
msgid "%r is too short to calculate a relative path"
7053
7064
msgstr ""
7086
7097
msgid "Generate only the shell function, don't enable it"
7087
7098
msgstr ""
7088
7099
7089
#: bzrlib/plugins/launchpad/__init__.py:81
7100
#: bzrlib/plugins/launchpad/account.py:66
7101
msgid "Setting ssh/sftp usernames for launchpad.net."
7102
msgstr ""
7103
7104
#: bzrlib/plugins/launchpad/cmds.py:44
7090
7105
msgid "Register a branch with launchpad.net."
7091
7106
msgstr ""
7092
7107
7093
#: bzrlib/plugins/launchpad/__init__.py:83
7108
#: bzrlib/plugins/launchpad/cmds.py:46
7094
7109
msgid ""
7095
7110
"This command lists a bzr branch in the directory of branches on\n"
7096
7111
"launchpad.net. Registration allows the branch to be associated with\n"
7097
7112
"bugs or specifications."
7098
7113
msgstr ""
7099
7114
7100
#: bzrlib/plugins/launchpad/__init__.py:87
7115
#: bzrlib/plugins/launchpad/cmds.py:50
7101
7116
msgid ""
7102
7117
"Before using this command you must register the project to which the\n"
7103
7118
"branch belongs, and create an account for yourself on launchpad.net."
7104
7119
msgstr ""
7105
7120
7106
#: bzrlib/plugins/launchpad/__init__.py:90
7121
#: bzrlib/plugins/launchpad/cmds.py:53
7107
7122
msgid ""
7108
7123
"arguments:\n"
7109
7124
" public_url: The publicly visible url for the branch to register.\n"
7115
7130
" otherwise error."
7116
7131
msgstr ""
7117
7132
7118
#: bzrlib/plugins/launchpad/__init__.py:99
7133
#: bzrlib/plugins/launchpad/cmds.py:62
7119
7134
msgid ""
7120
7135
"example:\n"
7121
7136
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7122
7137
" --project fooproject"
7123
7138
msgstr ""
7124
7139
7125
#: bzrlib/plugins/launchpad/__init__.py:106
7140
#: bzrlib/plugins/launchpad/cmds.py:69
7126
7141
msgid "Launchpad project short name to associate with the branch."
7127
7142
msgstr ""
7128
7143
7129
#: bzrlib/plugins/launchpad/__init__.py:113
7144
#: bzrlib/plugins/launchpad/cmds.py:76
7130
7145
msgid ""
7131
7146
"Short name for the branch; by default taken from the last component of the "
7132
7147
"url."
7133
7148
msgstr ""
7134
7149
7135
#: bzrlib/plugins/launchpad/__init__.py:117
7150
#: bzrlib/plugins/launchpad/cmds.py:80
7136
7151
msgid "One-sentence description of the branch."
7137
7152
msgstr ""
7138
7153
7139
#: bzrlib/plugins/launchpad/__init__.py:120
7154
#: bzrlib/plugins/launchpad/cmds.py:83
7140
7155
msgid "Longer description of the purpose or contents of the branch."
7141
7156
msgstr ""
7142
7157
7143
#: bzrlib/plugins/launchpad/__init__.py:123
7158
#: bzrlib/plugins/launchpad/cmds.py:86
7144
7159
msgid "Branch author's email address, if not yourself."
7145
7160
msgstr ""
7146
7161
7147
#: bzrlib/plugins/launchpad/__init__.py:126
7162
#: bzrlib/plugins/launchpad/cmds.py:89
7148
7163
msgid "The bug this branch fixes."
7149
7164
msgstr ""
7150
7165
7151
#: bzrlib/plugins/launchpad/__init__.py:129
7166
#: bzrlib/plugins/launchpad/cmds.py:92
7152
7167
msgid "Prepare the request but don't actually send it."
7153
7168
msgstr ""
7154
7169
7155
#: bzrlib/plugins/launchpad/__init__.py:151
7170
#: bzrlib/plugins/launchpad/cmds.py:114
7156
7171
msgid ""
7157
7172
"register-branch requires a public branch url - see bzr help register-branch."
7158
7173
msgstr ""
7159
7174
7160
#: bzrlib/plugins/launchpad/__init__.py:159
7175
#: bzrlib/plugins/launchpad/cmds.py:122
7161
7176
msgid "--product is deprecated; please use --project."
7162
7177
msgstr ""
7163
7178
7164
#: bzrlib/plugins/launchpad/__init__.py:191
7179
#: bzrlib/plugins/launchpad/cmds.py:152
7165
7180
msgid "Open a Launchpad branch page in your web browser."
7166
7181
msgstr ""
7167
7182
7168
#: bzrlib/plugins/launchpad/__init__.py:196
7183
#: bzrlib/plugins/launchpad/cmds.py:157
7169
7184
msgid "Do not actually open the browser. Just say the URL we would use."
7170
7185
msgstr ""
7171
7186
7172
#: bzrlib/plugins/launchpad/__init__.py:231
7187
#: bzrlib/plugins/launchpad/cmds.py:192
7173
7188
#, python-format
7174
7189
msgid "Opening %s in web browser"
7175
7190
msgstr ""
7176
7191
7177
#: bzrlib/plugins/launchpad/__init__.py:241
7192
#: bzrlib/plugins/launchpad/cmds.py:200
7178
7193
msgid "Show or set the Launchpad user ID."
7179
7194
msgstr ""
7180
7195
7181
#: bzrlib/plugins/launchpad/__init__.py:243
7196
#: bzrlib/plugins/launchpad/cmds.py:202
7182
7197
msgid ""
7183
7198
"When communicating with Launchpad, some commands need to know your\n"
7184
7199
"Launchpad user ID. This command can be used to set or show the\n"
7185
7200
"user ID that Bazaar will use for such communication."
7186
7201
msgstr ""
7187
7202
7188
#: bzrlib/plugins/launchpad/__init__.py:247
7203
#: bzrlib/plugins/launchpad/cmds.py:206
7189
7204
msgid ""
7190
7205
":Examples:\n"
7191
7206
" Show the Launchpad ID of the current user::"
7192
7207
msgstr ""
7193
7208
7194
#: bzrlib/plugins/launchpad/__init__.py:250
7209
#: bzrlib/plugins/launchpad/cmds.py:209
7195
7210
msgid " bzr launchpad-login"
7196
7211
msgstr ""
7197
7212
7198
#: bzrlib/plugins/launchpad/__init__.py:252
7213
#: bzrlib/plugins/launchpad/cmds.py:211
7199
7214
msgid " Set the Launchpad ID of the current user to 'bob'::"
7200
7215
msgstr ""
7201
7216
7202
#: bzrlib/plugins/launchpad/__init__.py:254
7217
#: bzrlib/plugins/launchpad/cmds.py:213
7203
7218
msgid " bzr launchpad-login bob"
7204
7219
msgstr ""
7205
7220
7206
#: bzrlib/plugins/launchpad/__init__.py:261
7221
#: bzrlib/plugins/launchpad/cmds.py:220
7207
7222
msgid "Don't check that the user name is valid."
7208
7223
msgstr ""
7209
7224
7210
#: bzrlib/plugins/launchpad/__init__.py:276
7211
#: bzrlib/plugins/launchpad/__init__.py:287
7225
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
7212
7226
msgid "Launchpad user ID exists and has SSH keys.\n"
7213
7227
msgstr ""
7214
7228
7215
#: bzrlib/plugins/launchpad/__init__.py:279
7229
#: bzrlib/plugins/launchpad/cmds.py:238
7216
7230
msgid "No Launchpad user ID configured.\n"
7217
7231
msgstr ""
7218
7232
7219
#: bzrlib/plugins/launchpad/__init__.py:290
7233
#: bzrlib/plugins/launchpad/cmds.py:249
7220
7234
#, python-format
7221
7235
msgid "Launchpad user ID set to '%s'.\n"
7222
7236
msgstr ""
7223
7237
7224
#: bzrlib/plugins/launchpad/__init__.py:298
7238
#: bzrlib/plugins/launchpad/cmds.py:255
7225
7239
msgid "Ask Launchpad to mirror a branch now."
7226
7240
msgstr ""
7227
7241
7228
#: bzrlib/plugins/launchpad/__init__.py:318
7242
#: bzrlib/plugins/launchpad/cmds.py:272
7229
7243
msgid "Propose merging a branch on Launchpad."
7230
7244
msgstr ""
7231
7245
7232
#: bzrlib/plugins/launchpad/__init__.py:320
7246
#: bzrlib/plugins/launchpad/cmds.py:274
7233
7247
msgid ""
7234
7248
"This will open your usual editor to provide the initial comment. When it\n"
7235
7249
"has created the proposal, it will open it in your default web browser."
7236
7250
msgstr ""
7237
7251
7238
#: bzrlib/plugins/launchpad/__init__.py:323
7252
#: bzrlib/plugins/launchpad/cmds.py:277
7239
7253
msgid ""
7240
7254
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7241
7255
"is not supplied, the remembered submit branch will be used. If no submit\n"
7242
7256
"branch is remembered, the development focus will be used."
7243
7257
msgstr ""
7244
7258
7245
#: bzrlib/plugins/launchpad/__init__.py:327
7259
#: bzrlib/plugins/launchpad/cmds.py:281
7246
7260
msgid ""
7247
7261
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7248
7262
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7250
7264
"may optionally be followed by '=' and the review type. For example:"
7251
7265
msgstr ""
7252
7266
7253
#: bzrlib/plugins/launchpad/__init__.py:332
7267
#: bzrlib/plugins/launchpad/cmds.py:286
7254
7268
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7255
7269
msgstr ""
7256
7270
7257
#: bzrlib/plugins/launchpad/__init__.py:334
7271
#: bzrlib/plugins/launchpad/cmds.py:288
7258
7272
msgid ""
7259
7273
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7260
7274
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7261
7275
msgstr ""
7262
7276
7263
#: bzrlib/plugins/launchpad/__init__.py:339
7277
#: bzrlib/plugins/launchpad/cmds.py:293
7264
7278
msgid "Propose the merge on staging."
7265
7279
msgstr ""
7266
7280
7267
#: bzrlib/plugins/launchpad/__init__.py:341
7281
#: bzrlib/plugins/launchpad/cmds.py:295
7268
7282
msgid "Commit message."
7269
7283
msgstr ""
7270
7284
7271
#: bzrlib/plugins/launchpad/__init__.py:343
7285
#: bzrlib/plugins/launchpad/cmds.py:297
7272
7286
msgid "Mark the proposal as approved immediately."
7273
7287
msgstr ""
7274
7288
7275
#: bzrlib/plugins/launchpad/__init__.py:345
7289
#: bzrlib/plugins/launchpad/cmds.py:298
7290
msgid "The bug this proposal fixes."
7291
msgstr ""
7292
7293
#: bzrlib/plugins/launchpad/cmds.py:300
7276
7294
msgid "Requested reviewer and optional type."
7277
7295
msgstr ""
7278
7296
7279
#: bzrlib/plugins/launchpad/__init__.py:382
7297
#: bzrlib/plugins/launchpad/cmds.py:335
7280
7298
msgid "Find the proposal to merge this revision."
7281
7299
msgstr ""
7282
7300
7283
#: bzrlib/plugins/launchpad/__init__.py:384
7301
#: bzrlib/plugins/launchpad/cmds.py:337
7284
7302
msgid ""
7285
7303
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7286
7304
"This works only if the selected branch was the merge proposal target, and\n"
7288
7306
"are opened in a web browser."
7289
7307
msgstr ""
7290
7308
7291
#: bzrlib/plugins/launchpad/__init__.py:389
7309
#: bzrlib/plugins/launchpad/cmds.py:342
7292
7310
msgid ""
7293
7311
"Any revision involved in the merge may be specified-- the revision in\n"
7294
7312
"which the merge was performed, or one of the revisions that was merged."
7295
7313
msgstr ""
7296
7314
7297
#: bzrlib/plugins/launchpad/__init__.py:392
7315
#: bzrlib/plugins/launchpad/cmds.py:345
7298
7316
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7299
7317
msgstr ""
7300
7318
7301
#: bzrlib/plugins/launchpad/__init__.py:394
7319
#: bzrlib/plugins/launchpad/cmds.py:347
7302
7320
msgid " bzr lp-find-proposal -r annotate:README:1"
7303
7321
msgstr ""
7304
7322
7305
#: bzrlib/plugins/launchpad/__init__.py:409
7323
#: bzrlib/plugins/launchpad/cmds.py:363
7306
7324
msgid "No review found."
7307
7325
msgstr ""
7308
7326
7309
#: bzrlib/plugins/launchpad/__init__.py:410
7327
#: bzrlib/plugins/launchpad/cmds.py:364
7310
7328
#, python-format
7311
7329
msgid "%d proposals(s) found."
7312
7330
msgstr ""
7313
7331
7314
#: bzrlib/plugins/launchpad/__init__.py:420
7332
#: bzrlib/plugins/launchpad/cmds.py:374
7315
7333
msgid "Finding revision-id"
7316
7334
msgstr ""
7317
7335
7318
#: bzrlib/plugins/launchpad/__init__.py:427
7336
#: bzrlib/plugins/launchpad/cmds.py:381
7319
7337
msgid "Finding merge"
7320
7338
msgstr ""
7321
7339
7322
#: bzrlib/plugins/launchpad/__init__.py:432
7340
#: bzrlib/plugins/launchpad/cmds.py:386
7323
7341
msgid "Finding revno"
7324
7342
msgstr ""
7325
7343
7326
#: bzrlib/plugins/launchpad/__init__.py:437
7344
#: bzrlib/plugins/launchpad/cmds.py:392
7327
7345
msgid "Finding Launchpad branch"
7328
7346
msgstr ""
7329
7347
7330
#: bzrlib/plugins/launchpad/__init__.py:440
7348
#: bzrlib/plugins/launchpad/cmds.py:395
7331
7349
msgid "Finding proposals"
7332
7350
msgstr ""
7333
7351
7334
#: bzrlib/plugins/launchpad/account.py:66
7335
msgid "Setting ssh/sftp usernames for launchpad.net."
7336
msgstr ""
7337
7338
7352
#: bzrlib/plugins/launchpad/lp_api.py:241
7339
7353
#: bzrlib/plugins/launchpad/lp_api.py:246
7340
7354
#, python-format
7378
7392
" remote: {2}"
7379
7393
msgstr ""
7380
7394
7381
#: bzrlib/plugins/launchpad/lp_propose.py:149
7395
#: bzrlib/plugins/launchpad/lp_propose.py:150
7382
7396
#, python-format
7383
7397
msgid "There is already a branch merge proposal: %s"
7384
7398
msgstr ""
7385
7399
7386
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7400
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7387
7401
msgid "pb parameter to convert() is deprecated"
7388
7402
msgstr ""
7389
7403
7390
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7404
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7391
7405
msgid "starting upgrade from format 4 to 5"
7392
7406
msgstr ""
7393
7407
7394
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7408
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7395
7409
msgid "note: upgrade may be faster if all store files are ungzipped first"
7396
7410
msgstr ""
7397
7411
7398
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7412
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7399
7413
msgid "converting revision"
7400
7414
msgstr ""
7401
7415
7402
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7416
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7403
7417
msgid "upgraded to weaves:"
7404
7418
msgstr ""
7405
7419
7406
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7420
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7407
7421
#, python-format
7408
7422
msgid "%6d revisions and inventories"
7409
7423
msgstr ""
7410
7424
7411
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7425
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7412
7426
#, python-format
7413
7427
msgid "%6d revisions not present"
7414
7428
msgstr ""
7415
7429
7416
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7430
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7417
7431
#, python-format
7418
7432
msgid "%6d texts"
7419
7433
msgstr ""
7420
7434
7421
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7435
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7422
7436
msgid "writing weave"
7423
7437
msgstr ""
7424
7438
7425
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7426
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7439
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7440
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7427
7441
msgid "inventory"
7428
7442
msgstr ""
7429
7443
7430
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7444
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7431
7445
msgid "write revision"
7432
7446
msgstr ""
7433
7447
7434
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7448
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7435
7449
msgid "loading revision"
7436
7450
msgstr ""
7437
7451
7438
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7452
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7439
7453
#, python-format
7440
7454
msgid "revision {%s} not present in branch; will be converted as a ghost"
7441
7455
msgstr ""
7442
7456
7443
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7457
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7444
7458
msgid "starting upgrade from format 5 to 6"
7445
7459
msgstr ""
7446
7460
7447
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7461
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7448
7462
#, python-format
7449
7463
msgid "adding prefixes to %s"
7450
7464
msgstr ""
7451
7465
7452
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7466
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7453
7467
msgid "starting upgrade from format 6 to metadir"
7454
7468
msgstr ""
7455
7469
7456
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7470
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7457
7471
msgid "Removing ancestry.weave"
7458
7472
msgstr ""
7459
7473
7460
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7474
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7461
7475
msgid "Finding branch files"
7462
7476
msgstr ""
7463
7477
7464
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7478
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7465
7479
msgid "Upgrading repository"
7466
7480
msgstr ""
7467
7481
7468
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7482
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7469
7483
msgid "Upgrading branch"
7470
7484
msgstr ""
7471
7485
7472
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7486
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7473
7487
msgid "No working tree."
7474
7488
msgstr ""
7475
7489
7476
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7490
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7477
7491
msgid "Upgrading working tree"
7478
7492
msgstr ""
7479
7493
7480
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7494
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7481
7495
#, python-format
7482
7496
msgid "Make %s lock"
7483
7497
msgstr ""
7484
7498
7485
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7499
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7486
7500
#, python-format
7487
7501
msgid "Moving %s"
7488
7502
msgstr ""
7509
7523
msgid "Too many redirections trying to make %s."
7510
7524
msgstr ""
7511
7525
7512
#: bzrlib/push.py:147
7526
#: bzrlib/push.py:148
7513
7527
msgid ""
7514
7528
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7515
7529
"information."
7516
7530
msgstr ""
7517
7531
7518
#: bzrlib/push.py:151
7532
#: bzrlib/push.py:152
7519
7533
#, python-format
7520
7534
msgid ""
7521
7535
"It is not possible to losslessly push to %s. You may want to use dpush "
7522
7536
"instead."
7523
7537
msgstr ""
7524
7538
7525
#: bzrlib/push.py:157
7539
#: bzrlib/push.py:158
7526
7540
#, python-format
7527
7541
msgid ""
7528
7542
"At %s you have a valid .bzr control directory, but not a branch or "
7623
7637
msgid "bzr: ERROR (ignored): %s"
7624
7638
msgstr ""
7625
7639
7626
#: bzrlib/remote.py:2541
7640
#: bzrlib/remote.py:2534
7627
7641
msgid "Copying repository content as tarball..."
7628
7642
msgstr ""
7629
7643
7639
7653
msgid "{0} => {1}"
7640
7654
msgstr ""
7641
7655
7642
#: bzrlib/repository.py:1787
7656
#: bzrlib/repository.py:1738
7643
7657
msgid "Moving repository to repository.backup"
7644
7658
msgstr ""
7645
7659
7646
#: bzrlib/repository.py:1794
7660
#: bzrlib/repository.py:1745
7647
7661
msgid "Creating new repository"
7648
7662
msgstr ""
7649
7663
7650
#: bzrlib/repository.py:1799
7664
#: bzrlib/repository.py:1750
7651
7665
msgid "Copying content"
7652
7666
msgstr ""
7653
7667
7654
#: bzrlib/repository.py:1803
7668
#: bzrlib/repository.py:1754
7655
7669
msgid "Deleting old repository content"
7656
7670
msgstr ""
7657
7671
7658
#: bzrlib/repository.py:1805
7672
#: bzrlib/repository.py:1756
7659
7673
msgid "repository converted"
7660
7674
msgstr ""
7661
7675
7663
7677
msgid "Using {0} {1}"
7664
7678
msgstr ""
7665
7679
7666
#: bzrlib/send.py:58
7680
#: bzrlib/send.py:59
7667
7681
#, python-format
7668
7682
msgid "Mail client \"%s\" does not support specifying body"
7669
7683
msgstr ""
7670
7684
7671
#: bzrlib/send.py:62
7685
#: bzrlib/send.py:63
7672
7686
msgid "--remember requires a branch to be specified."
7673
7687
msgstr ""
7674
7688
7675
#: bzrlib/send.py:77
7689
#: bzrlib/send.py:78
7676
7690
msgid "No submit branch known or specified"
7677
7691
msgstr ""
7678
7692
7679
#: bzrlib/send.py:80
7693
#: bzrlib/send.py:81
7680
7694
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7681
7695
msgstr ""
7682
7696
7683
#: bzrlib/send.py:98
7697
#: bzrlib/send.py:99
7684
7698
#, python-format
7685
7699
msgid "No such send format '%s'."
7686
7700
msgstr ""
7687
7701
7688
#: bzrlib/send.py:114
7702
#: bzrlib/send.py:115
7689
7703
msgid "bzr send takes at most two one revision identifiers"
7690
7704
msgstr ""
7691
7705
7692
#: bzrlib/send.py:127
7706
#: bzrlib/send.py:128
7693
7707
msgid "No revisions to submit."
7694
7708
msgstr ""
7695
7709
7696
#: bzrlib/send.py:139
7710
#: bzrlib/send.py:140
7697
7711
msgid ""
7698
7712
"- not supported for merge directives that use more than one output file."
7699
7713
msgstr ""
7700
7714
7701
#: bzrlib/send.py:185
7715
#: bzrlib/send.py:186
7702
7716
msgid "Format 0.9 does not permit bundle with no patch"
7703
7717
msgstr ""
7704
7718
7855
7869
"anyway, use --force."
7856
7870
msgstr ""
7857
7871
7858
#: bzrlib/switch.py:125
7872
#: bzrlib/switch.py:129
7859
7873
msgid "Cannot switch a branch, only a checkout."
7860
7874
msgstr ""
7861
7875
7862
#: bzrlib/switch.py:163
7876
#: bzrlib/switch.py:167
7863
7877
#, python-format
7864
7878
msgid "Tree is up to date at revision %d."
7865
7879
msgstr ""
7866
7880
7867
#: bzrlib/switch.py:169
7881
#: bzrlib/switch.py:173
7868
7882
#, python-format
7869
7883
msgid "Updated to revision %d."
7870
7884
msgstr ""
7871
7885
7872
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7886
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7873
7887
msgid "Apply phase"
7874
7888
msgstr ""
7875
7889
7876
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7890
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7877
7891
msgid "removing file"
7878
7892
msgstr ""
7879
7893
7880
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7894
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7881
7895
msgid "adding file"
7882
7896
msgstr ""
7883
7897
7884
#: bzrlib/transform.py:2591
7898
#: bzrlib/transform.py:2598
7885
7899
msgid "Building tree"
7886
7900
msgstr ""
7887
7901
7888
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7902
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7889
7903
msgid "Adding file contents"
7890
7904
msgstr ""
7891
7905
7892
#: bzrlib/transform.py:3028
7906
#: bzrlib/transform.py:3017
7893
7907
msgid "Resolution pass"
7894
7908
msgstr ""
7895
7909
7898
7912
msgid "Authenticated as %s"
7899
7913
msgstr ""
7900
7914
7901
#: bzrlib/tree.py:634
7915
#: bzrlib/tree.py:647
7902
7916
msgid "*** {0} content-filter: {1} => {2!r}"
7903
7917
msgstr ""
7904
7918
7957
7971
msgid "failed to clean-up {0}: {1}"
7958
7972
msgstr ""
7959
7973
7960
#: bzrlib/vf_repository.py:1090
7974
#: bzrlib/vf_repository.py:1091
7961
7975
msgid "inventories"
7962
7976
msgstr ""
7963
7977
7964
#: bzrlib/vf_repository.py:1116
7978
#: bzrlib/vf_repository.py:1117
7965
7979
msgid "texts"
7966
7980
msgstr ""
7967
7981
7968
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7982
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7969
7983
msgid "Calculating text parents"
7970
7984
msgstr ""
7971
7985
7972
#: bzrlib/vf_repository.py:1706
7986
#: bzrlib/vf_repository.py:1707
7973
7987
msgid "Fetch texts"
7974
7988
msgstr ""
7975
7989
7976
#: bzrlib/vf_repository.py:2535
7990
#: bzrlib/vf_repository.py:2536
7977
7991
msgid "loading text store"
7978
7992
msgstr ""
7979
7993
7980
#: bzrlib/vf_repository.py:2541
7994
#: bzrlib/vf_repository.py:2542
7981
7995
msgid "checking text graph"
7982
7996
msgstr ""
7983
7997
7984
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7985
#: bzrlib/vf_repository.py:3124
7998
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7999
#: bzrlib/vf_repository.py:3127
7986
8000
msgid "Transferring revisions"
7987
8001
msgstr ""
7988
8002
8028
8042
msgid "PageFaultCount %8d"
8029
8043
msgstr ""
8030
8044
8031
#: bzrlib/workingtree.py:1478
8045
#: bzrlib/workingtree.py:1482
8032
8046
msgid "Rerun update after fixing the conflicts."
8033
8047
msgstr ""
8034
8048
8038
8052
8039
8053
#: dummy/help_topics/basic/detail.txt:1
8040
8054
msgid ""
8041
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
8055
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
8042
8056
"http://bazaar.canonical.com/"
8043
8057
msgstr ""
8044
8058
8356
8370
msgid "How to fix diverged branches"
8357
8371
msgstr ""
8358
8372
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
8373
#: dummy/help_topics/env-variables/summary.txt:1
8404
8374
msgid "Environment variable names and values"
8405
8375
msgstr ""
9403
9373
msgid " bzr commit --fixes <tracker>:<id>"
9404
9374
msgstr ""
9405
9375
9406
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9376
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9407
9377
msgid "or::"
9408
9378
msgstr ""
9409
9379
9638
9608
"remove-tree Remove the working tree from a given branch/checkout.\n"
9639
9609
"renames Show list of renamed files.\n"
9640
9610
"resolve Mark a conflict as resolved.\n"
9641
"revert Revert files to a previous revision.\n"
9611
"revert Set files in the working tree back to the contents of a\n"
9612
" previous revision.\n"
9642
9613
"revno Show current revision number.\n"
9643
9614
"root Show the tree root directory.\n"
9644
9615
"send Mail or create a merge-directive for submitting changes.\n"
10296
10267
10297
10268
#: en/help_topics/configuration.txt:336
10298
10269
msgid ""
10270
"Another such option is ``branchname``, which refers to the name of a "
10271
"colocated\n"
10272
"branch. For non-colocated branches, it behaves like basename. It can be "
10273
"used\n"
10274
"like this::"
10275
msgstr ""
10276
10277
#: en/help_topics/configuration.txt:340
10278
msgid ""
10279
" [/home/vila/src/bzr/bugs]\n"
10280
" mypush = lp:~vila/bzr/{branchname}"
10281
msgstr ""
10282
10283
#: en/help_topics/configuration.txt:343
10284
msgid ""
10285
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10286
"get::"
10287
msgstr ""
10288
10289
#: en/help_topics/configuration.txt:345
10290
msgid ""
10291
" bzr config mypush\n"
10292
" lp:~vila/bzr/832013-expand-in-stack"
10293
msgstr ""
10294
10295
#: en/help_topics/configuration.txt:348
10296
msgid ""
10299
10297
"When an option is local to a Section, it cannot be referred to from option\n"
10300
10298
"values in any other section from the same ``Store`` nor from any other\n"
10301
10299
"``Store``."
10302
10300
msgstr ""
10303
10301
10304
#: en/help_topics/configuration.txt:340
10302
#: en/help_topics/configuration.txt:352
10305
10303
msgid ""
10306
10304
"\n"
10307
10305
"The main configuration file, bazaar.conf\n"
10308
10306
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10309
10307
msgstr ""
10310
10308
10311
#: en/help_topics/configuration.txt:344
10309
#: en/help_topics/configuration.txt:356
10312
10310
msgid ""
10313
10311
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10314
10312
"The default section contains the default\n"
10316
10314
"overriden by providing a branch-specific section in ``locations.conf``."
10317
10315
msgstr ""
10318
10316
10319
#: en/help_topics/configuration.txt:349
10317
#: en/help_topics/configuration.txt:361
10320
10318
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10321
10319
msgstr ""
10322
10320
10323
#: en/help_topics/configuration.txt:351
10321
#: en/help_topics/configuration.txt:363
10324
10322
msgid ""
10325
10323
" [DEFAULT]\n"
10326
10324
" email = John Doe <jdoe@isp.com>\n"
10328
10326
" create_signatures = when-required"
10329
10327
msgstr ""
10330
10328
10331
#: en/help_topics/configuration.txt:356
10329
#: en/help_topics/configuration.txt:368
10332
10330
msgid ""
10333
10331
"\n"
10334
10332
"The branch location configuration file, locations.conf\n"
10335
10333
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10336
10334
msgstr ""
10337
10335
10338
#: en/help_topics/configuration.txt:360
10336
#: en/help_topics/configuration.txt:372
10339
10337
msgid ""
10340
10338
"``locations.conf`` allows one to specify overriding settings for\n"
10341
10339
"a specific branch. The format is almost identical to the default section in\n"
10345
10343
"for. The '?' and '*' wildcards are supported::"
10346
10344
msgstr ""
10347
10345
10348
#: en/help_topics/configuration.txt:366
10346
#: en/help_topics/configuration.txt:378
10349
10347
msgid ""
10350
10348
" [/home/jdoe/branches/nethack]\n"
10351
10349
" email = Nethack Admin <nethack@nethack.com>"
10352
10350
msgstr ""
10353
10351
10354
#: en/help_topics/configuration.txt:369
10352
#: en/help_topics/configuration.txt:381
10355
10353
msgid ""
10356
10354
" [http://hypothetical.site.com/branches/devel-branch]\n"
10357
10355
" create_signatures = always"
10358
10356
msgstr ""
10359
10357
10360
#: en/help_topics/configuration.txt:372
10358
#: en/help_topics/configuration.txt:384
10361
10359
msgid ""
10362
10360
"The authentication configuration file, authentication.conf\n"
10363
10361
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10364
10362
msgstr ""
10365
10363
10366
#: en/help_topics/configuration.txt:375
10364
#: en/help_topics/configuration.txt:387
10367
10365
msgid ""
10368
10366
"``authentication.conf`` allows one to specify credentials for\n"
10369
10367
"remote servers. This can be used for all the supported transports and any "
10371
10369
"of bzr that requires authentication (smtp for example)."
10372
10370
msgstr ""
10373
10371
10374
#: en/help_topics/configuration.txt:379
10372
#: en/help_topics/configuration.txt:391
10375
10373
msgid ""
10376
10374
"The syntax of the file obeys the same rules as the others except for the\n"
10377
10375
"option policies which don't apply."
10378
10376
msgstr ""
10379
10377
10380
#: en/help_topics/configuration.txt:382
10378
#: en/help_topics/configuration.txt:394
10381
10379
msgid ""
10382
10380
"For more information on the possible uses of the authentication "
10383
10381
"configuration\n"
10384
10382
"file see :doc:`authentication-help`."
10385
10383
msgstr ""
10386
10384
10387
#: en/help_topics/configuration.txt:385
10385
#: en/help_topics/configuration.txt:397
10388
10386
msgid ""
10389
10387
"\n"
10390
10388
"Common options\n"
10391
10389
"--------------"
10392
10390
msgstr ""
10393
10391
10394
#: en/help_topics/configuration.txt:389
10392
#: en/help_topics/configuration.txt:401
10395
10393
msgid ""
10396
10394
"debug_flags\n"
10397
10395
"~~~~~~~~~~~"
10398
10396
msgstr ""
10399
10397
10400
#: en/help_topics/configuration.txt:392
10398
#: en/help_topics/configuration.txt:404
10401
10399
msgid ""
10402
10400
"A comma-separated list of debugging options to turn on. The same values\n"
10403
10401
"can be used as with the -D command-line option (see `help global-options`).\n"
10404
10402
"For example::"
10405
10403
msgstr ""
10406
10404
10407
#: en/help_topics/configuration.txt:396
10405
#: en/help_topics/configuration.txt:408
10408
10406
msgid " debug_flags = hpss"
10409
10407
msgstr ""
10410
10408
10411
#: en/help_topics/configuration.txt:400
10409
#: en/help_topics/configuration.txt:412
10412
10410
msgid " debug_flags = hpss,evil"
10413
10411
msgstr ""
10414
10412
10415
#: en/help_topics/configuration.txt:402
10413
#: en/help_topics/configuration.txt:414
10416
10414
msgid ""
10417
10415
"email\n"
10418
10416
"~~~~~"
10419
10417
msgstr ""
10420
10418
10421
#: en/help_topics/configuration.txt:405
10419
#: en/help_topics/configuration.txt:417
10422
10420
msgid ""
10423
10421
"The email address to use when committing a branch. Typically takes the form\n"
10424
10422
"of::"
10425
10423
msgstr ""
10426
10424
10427
#: en/help_topics/configuration.txt:408
10425
#: en/help_topics/configuration.txt:420
10428
10426
msgid " email = Full Name <account@hostname.tld>"
10429
10427
msgstr ""
10430
10428
10431
#: en/help_topics/configuration.txt:410
10429
#: en/help_topics/configuration.txt:422
10432
10430
msgid ""
10433
10431
"editor\n"
10434
10432
"~~~~~~"
10435
10433
msgstr ""
10436
10434
10437
#: en/help_topics/configuration.txt:413
10435
#: en/help_topics/configuration.txt:425
10438
10436
msgid ""
10439
10437
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10440
10438
"a commit message. This setting is trumped by the environment variable\n"
10442
10440
"variables."
10443
10441
msgstr ""
10444
10442
10445
#: en/help_topics/configuration.txt:418
10443
#: en/help_topics/configuration.txt:430
10446
10444
msgid ""
10447
10445
"log_format\n"
10448
10446
"~~~~~~~~~~"
10449
10447
msgstr ""
10450
10448
10451
#: en/help_topics/configuration.txt:421
10449
#: en/help_topics/configuration.txt:433
10452
10450
msgid ""
10453
10451
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10454
10452
"and ``line``. Additional formats may be provided by plugins. The default\n"
10455
10453
"value is ``long``."
10456
10454
msgstr ""
10457
10455
10458
#: en/help_topics/configuration.txt:425
10456
#: en/help_topics/configuration.txt:437
10459
10457
msgid ""
10460
10458
"check_signatures\n"
10461
10459
"~~~~~~~~~~~~~~~~"
10462
10460
msgstr ""
10463
10461
10464
#: en/help_topics/configuration.txt:428
10462
#: en/help_topics/configuration.txt:440
10465
10463
msgid ""
10466
10464
"Reserved for future use. These options will allow a policy for branches to\n"
10467
10465
"require signatures."
10468
10466
msgstr ""
10469
10467
10470
#: en/help_topics/configuration.txt:431
10468
#: en/help_topics/configuration.txt:443
10471
10469
msgid ""
10472
10470
"require\n"
10473
10471
" The gnupg signature for revisions must be present and must be valid."
10474
10472
msgstr ""
10475
10473
10476
#: en/help_topics/configuration.txt:434
10474
#: en/help_topics/configuration.txt:446
10477
10475
msgid ""
10478
10476
"ignore\n"
10479
10477
" Do not check gnupg signatures of revisions."
10480
10478
msgstr ""
10481
10479
10482
#: en/help_topics/configuration.txt:437
10480
#: en/help_topics/configuration.txt:449
10483
10481
msgid ""
10484
10482
"check-available\n"
10485
10483
" (default) If gnupg signatures for revisions are present, check them.\n"
10487
10485
" no signature is present."
10488
10486
msgstr ""
10489
10487
10490
#: en/help_topics/configuration.txt:442
10488
#: en/help_topics/configuration.txt:454
10491
10489
msgid ""
10492
10490
"create_signatures\n"
10493
10491
"~~~~~~~~~~~~~~~~~"
10494
10492
msgstr ""
10495
10493
10496
#: en/help_topics/configuration.txt:445
10494
#: en/help_topics/configuration.txt:457
10497
10495
msgid ""
10498
10496
"Defines the behaviour of signing revisions on commits. By default bzr will "
10499
10497
"not\n"
10500
10498
"sign new commits."
10501
10499
msgstr ""
10502
10500
10503
#: en/help_topics/configuration.txt:448
10501
#: en/help_topics/configuration.txt:460
10504
10502
msgid ""
10505
10503
"always\n"
10506
10504
" Sign every new revision that is committed. If the signing fails then "
10508
10506
" commit will not be made."
10509
10507
msgstr ""
10510
10508
10511
#: en/help_topics/configuration.txt:452
10509
#: en/help_topics/configuration.txt:464
10512
10510
msgid ""
10513
10511
"when-required\n"
10514
10512
" Reserved for future use."
10515
10513
msgstr ""
10516
10514
10517
#: en/help_topics/configuration.txt:455
10515
#: en/help_topics/configuration.txt:467
10518
10516
msgid ""
10519
10517
"never\n"
10520
10518
" Reserved for future use."
10521
10519
msgstr ""
10522
10520
10523
#: en/help_topics/configuration.txt:458
10521
#: en/help_topics/configuration.txt:470
10524
10522
msgid ""
10525
10523
"In future it is planned that ``when-required`` will sign newly\n"
10526
10524
"committed revisions only when the branch requires them. ``never`` will "
10528
10526
"to sign newly committed revisions, even if the branch requires signatures."
10529
10527
msgstr ""
10530
10528
10531
#: en/help_topics/configuration.txt:462
10529
#: en/help_topics/configuration.txt:474
10532
10530
msgid ""
10533
10531
"dirstate.fdatasync\n"
10534
10532
"~~~~~~~~~~~~~~~~~~"
10535
10533
msgstr ""
10536
10534
10537
#: en/help_topics/configuration.txt:465
10535
#: en/help_topics/configuration.txt:477
10538
10536
msgid ""
10539
10537
"If true (default), working tree metadata changes are flushed through the\n"
10540
10538
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10541
10539
"should not be lost if the machine crashes. See also repository.fdatasync."
10542
10540
msgstr ""
10543
10541
10544
#: en/help_topics/configuration.txt:469
10542
#: en/help_topics/configuration.txt:481
10545
10543
msgid ""
10546
10544
"gpg_signing_key\n"
10547
10545
"~~~~~~~~~~~~~~~"
10548
10546
msgstr ""
10549
10547
10550
#: en/help_topics/configuration.txt:472
10548
#: en/help_topics/configuration.txt:484
10551
10549
msgid ""
10552
10550
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10553
10551
"address, key fingerprint or full key ID. When unset or when set to\n"
10554
10552
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10555
10553
msgstr ""
10556
10554
10557
#: en/help_topics/configuration.txt:476
10555
#: en/help_topics/configuration.txt:488
10558
10556
msgid ""
10559
10557
"recurse\n"
10560
10558
"~~~~~~~"
10561
10559
msgstr ""
10562
10560
10563
#: en/help_topics/configuration.txt:479
10561
#: en/help_topics/configuration.txt:491
10564
10562
msgid ""
10565
10563
"Only useful in ``locations.conf``. Defines whether or not the\n"
10566
10564
"configuration for this section applies to subdirectories:"
10567
10565
msgstr ""
10568
10566
10569
#: en/help_topics/configuration.txt:482
10567
#: en/help_topics/configuration.txt:494
10570
10568
msgid ""
10571
10569
"true\n"
10572
10570
" (default) This section applies to subdirectories as well."
10573
10571
msgstr ""
10574
10572
10575
#: en/help_topics/configuration.txt:485
10573
#: en/help_topics/configuration.txt:497
10576
10574
msgid ""
10577
10575
"false\n"
10578
10576
" This section only applies to the branch at this directory and not\n"
10579
10577
" branches below it."
10580
10578
msgstr ""
10581
10579
10582
#: en/help_topics/configuration.txt:489
10580
#: en/help_topics/configuration.txt:501
10583
10581
msgid ""
10584
10582
"gpg_signing_command\n"
10585
10583
"~~~~~~~~~~~~~~~~~~~"
10586
10584
msgstr ""
10587
10585
10588
#: en/help_topics/configuration.txt:492
10586
#: en/help_topics/configuration.txt:504
10589
10587
msgid ""
10590
10588
"(Default: \"gpg\"). Which program should be used to sign and check "
10591
10589
"revisions.\n"
10592
10590
"For example::"
10593
10591
msgstr ""
10594
10592
10595
#: en/help_topics/configuration.txt:495
10593
#: en/help_topics/configuration.txt:507
10596
10594
msgid " gpg_signing_command = /usr/bin/gnpg"
10597
10595
msgstr ""
10598
10596
10599
#: en/help_topics/configuration.txt:497
10597
#: en/help_topics/configuration.txt:509
10600
10598
msgid ""
10601
10599
"The specified command must accept the options \"--clearsign\" and \"-u "
10602
10600
"<email>\"."
10603
10601
msgstr ""
10604
10602
10605
#: en/help_topics/configuration.txt:499
10603
#: en/help_topics/configuration.txt:511
10606
10604
msgid ""
10607
10605
"bzr_remote_path\n"
10608
10606
"~~~~~~~~~~~~~~~"
10609
10607
msgstr ""
10610
10608
10611
#: en/help_topics/configuration.txt:502
10609
#: en/help_topics/configuration.txt:514
10612
10610
msgid ""
10613
10611
"(Default: \"bzr\"). The path to the command that should be used to run the "
10614
10612
"smart\n"
10615
10613
"server for bzr. This value may only be specified in locations.conf, because:"
10616
10614
msgstr ""
10617
10615
10618
#: en/help_topics/configuration.txt:505
10616
#: en/help_topics/configuration.txt:517
10619
10617
msgid ""
10620
10618
"- it's needed before branch.conf is accessible\n"
10621
10619
"- allowing remote branch.conf files to specify commands would be a security\n"
10622
10620
" risk"
10623
10621
msgstr ""
10624
10622
10625
#: en/help_topics/configuration.txt:509
10623
#: en/help_topics/configuration.txt:521
10626
10624
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10627
10625
msgstr ""
10628
10626
10629
#: en/help_topics/configuration.txt:511
10627
#: en/help_topics/configuration.txt:523
10630
10628
msgid ""
10631
10629
"smtp_server\n"
10632
10630
"~~~~~~~~~~~"
10633
10631
msgstr ""
10634
10632
10635
#: en/help_topics/configuration.txt:514
10633
#: en/help_topics/configuration.txt:526
10636
10634
msgid ""
10637
10635
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10638
10636
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10639
10637
msgstr ""
10640
10638
10641
#: en/help_topics/configuration.txt:517
10639
#: en/help_topics/configuration.txt:529
10642
10640
msgid ""
10643
10641
"smtp_username, smtp_password\n"
10644
10642
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10645
10643
msgstr ""
10646
10644
10647
#: en/help_topics/configuration.txt:520
10645
#: en/help_topics/configuration.txt:532
10648
10646
msgid ""
10649
10647
"User and password to authenticate to the SMTP server. If smtp_username\n"
10650
10648
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10652
10650
"to send mail."
10653
10651
msgstr ""
10654
10652
10655
#: en/help_topics/configuration.txt:525
10653
#: en/help_topics/configuration.txt:537
10656
10654
msgid ""
10657
10655
"locks.steal_dead\n"
10658
10656
"~~~~~~~~~~~~~~~~"
10659
10657
msgstr ""
10660
10658
10661
#: en/help_topics/configuration.txt:528
10659
#: en/help_topics/configuration.txt:540
10662
10660
msgid ""
10663
10661
"If set to true, bzr will automatically break locks held by processes from\n"
10664
10662
"the same machine and user that are no longer alive. Otherwise, it will\n"
10666
10664
"the object is no longer in use."
10667
10665
msgstr ""
10668
10666
10669
#: en/help_topics/configuration.txt:533
10667
#: en/help_topics/configuration.txt:545
10670
10668
msgid ""
10671
10669
"mail_client\n"
10672
10670
"~~~~~~~~~~~"
10673
10671
msgstr ""
10674
10672
10675
#: en/help_topics/configuration.txt:536
10673
#: en/help_topics/configuration.txt:548
10676
10674
msgid ""
10677
10675
"A mail client to use for sending merge requests.\n"
10678
10676
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10681
10679
"``editor``."
10682
10680
msgstr ""
10683
10681
10684
#: en/help_topics/configuration.txt:541
10682
#: en/help_topics/configuration.txt:553
10685
10683
msgid "Supported values for specific clients:"
10686
10684
msgstr ""
10687
10685
10688
#: en/help_topics/configuration.txt:543
10686
#: en/help_topics/configuration.txt:555
10689
10687
msgid ""
10690
10688
":claws: Use Claws. This skips a dialog for attaching files.\n"
10691
10689
":evolution: Use Evolution.\n"
10696
10694
" this works around some bugs that xdg-email doesn't handle."
10697
10695
msgstr ""
10698
10696
10699
#: en/help_topics/configuration.txt:550
10697
#: en/help_topics/configuration.txt:562
10700
10698
msgid "Supported generic values are:"
10701
10699
msgstr ""
10702
10700
10703
#: en/help_topics/configuration.txt:552
10701
#: en/help_topics/configuration.txt:564
10704
10702
msgid ""
10705
10703
":default: See above.\n"
10706
10704
":editor: Use your editor to compose the merge request. This also uses\n"
10710
10708
":xdg-email: Use xdg-email to run your preferred mail program"
10711
10709
msgstr ""
10712
10710
10713
#: en/help_topics/configuration.txt:559
10711
#: en/help_topics/configuration.txt:571
10714
10712
msgid ""
10715
10713
"repository.fdatasync\n"
10716
10714
"~~~~~~~~~~~~~~~~~~~~"
10717
10715
msgstr ""
10718
10716
10719
#: en/help_topics/configuration.txt:562
10717
#: en/help_topics/configuration.txt:574
10720
10718
msgid ""
10721
10719
"If true (default), repository changes are flushed through the OS buffers\n"
10722
10720
"to physical disk. This is somewhat slower, but means data should not be\n"
10723
10721
"lost if the machine crashes. See also dirstate.fdatasync."
10724
10722
msgstr ""
10725
10723
10726
#: en/help_topics/configuration.txt:566
10724
#: en/help_topics/configuration.txt:578
10727
10725
msgid ""
10728
10726
"submit_branch\n"
10729
10727
"~~~~~~~~~~~~~"
10730
10728
msgstr ""
10731
10729
10732
#: en/help_topics/configuration.txt:569
10730
#: en/help_topics/configuration.txt:581
10733
10731
msgid ""
10734
10732
"The branch you intend to submit your current work to. This is "
10735
10733
"automatically\n"
10738
10736
"should usually be set on a per-branch or per-location basis."
10739
10737
msgstr ""
10740
10738
10741
#: en/help_topics/configuration.txt:573
10739
#: en/help_topics/configuration.txt:585
10742
10740
msgid ""
10743
10741
"public_branch\n"
10744
10742
"~~~~~~~~~~~~~"
10745
10743
msgstr ""
10746
10744
10747
#: en/help_topics/configuration.txt:576
10745
#: en/help_topics/configuration.txt:588
10748
10746
msgid ""
10749
10747
"A publically-accessible version of this branch (implying that this version "
10750
10748
"is\n"
10751
10749
"not publically-accessible). Used (and set) by ``bzr send``."
10752
10750
msgstr ""
10753
10751
10754
#: en/help_topics/configuration.txt:579
10752
#: en/help_topics/configuration.txt:591
10755
10753
msgid ""
10756
10754
"suppress_warnings\n"
10757
10755
"~~~~~~~~~~~~~~~~~"
10758
10756
msgstr ""
10759
10757
10760
#: en/help_topics/configuration.txt:582
10758
#: en/help_topics/configuration.txt:594
10761
10759
msgid ""
10762
10760
"A list of strings, each string represent a warning that can be emitted by\n"
10763
10761
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10764
10762
msgstr ""
10765
10763
10766
#: en/help_topics/configuration.txt:585
10764
#: en/help_topics/configuration.txt:597
10767
10765
msgid "Valid values:"
10768
10766
msgstr ""
10769
10767
10770
#: en/help_topics/configuration.txt:587
10768
#: en/help_topics/configuration.txt:599
10771
10769
msgid ""
10772
10770
"* ``format_deprecation``:\n"
10773
10771
" whether the format deprecation warning is shown on repositories that "
10775
10773
" using deprecated formats."
10776
10774
msgstr ""
10777
10775
10778
#: en/help_topics/configuration.txt:591
10776
#: en/help_topics/configuration.txt:603
10779
10777
msgid ""
10780
10778
"default_format\n"
10781
10779
"~~~~~~~~~~~~~~"
10782
10780
msgstr ""
10783
10781
10784
#: en/help_topics/configuration.txt:594
10782
#: en/help_topics/configuration.txt:606
10785
10783
msgid ""
10786
10784
"A format name for the default format used when creating branches. See "
10787
10785
"``bzr\n"
10788
10786
"help formats`` for possible values."
10789
10787
msgstr ""
10790
10788
10791
#: en/help_topics/configuration.txt:597
10789
#: en/help_topics/configuration.txt:609
10792
10790
msgid ""
10793
10791
"\n"
10794
10792
"Unicode options\n"
10795
10793
"---------------"
10796
10794
msgstr ""
10797
10795
10798
#: en/help_topics/configuration.txt:601
10796
#: en/help_topics/configuration.txt:613
10799
10797
msgid ""
10800
10798
"output_encoding\n"
10801
10799
"~~~~~~~~~~~~~~~"
10802
10800
msgstr ""
10803
10801
10804
#: en/help_topics/configuration.txt:604
10802
#: en/help_topics/configuration.txt:616
10805
10803
msgid ""
10806
10804
"A Python unicode encoding name for text output from bzr, such as log\n"
10807
10805
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10808
10806
"is the terminal encoding prefered by the operating system."
10809
10807
msgstr ""
10810
10808
10811
#: en/help_topics/configuration.txt:608
10809
#: en/help_topics/configuration.txt:620
10812
10810
msgid ""
10813
10811
"\n"
10814
10812
"Branch type specific options\n"
10815
10813
"----------------------------"
10816
10814
msgstr ""
10817
10815
10818
#: en/help_topics/configuration.txt:612
10816
#: en/help_topics/configuration.txt:624
10819
10817
msgid ""
10820
10818
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10821
10819
"later format. They\n"
10823
10821
"manually set in ``locations.conf`` or ``bazaar.conf``."
10824
10822
msgstr ""
10825
10823
10826
#: en/help_topics/configuration.txt:617
10824
#: en/help_topics/configuration.txt:629
10827
10825
msgid ""
10828
10826
"append_revisions_only\n"
10829
10827
"~~~~~~~~~~~~~~~~~~~~~"
10830
10828
msgstr ""
10831
10829
10832
#: en/help_topics/configuration.txt:620
10830
#: en/help_topics/configuration.txt:632
10833
10831
msgid ""
10834
10832
"If set to \"True\" then revisions can only be appended to the log, not\n"
10835
10833
"removed. A branch with this setting enabled can only pull from another\n"
10839
10837
"compatibility with previous bzr versions (older than 2.2)."
10840
10838
msgstr ""
10841
10839
10842
#: en/help_topics/configuration.txt:627
10840
#: en/help_topics/configuration.txt:639
10843
10841
msgid ""
10844
10842
"parent_location\n"
10845
10843
"~~~~~~~~~~~~~~~"
10846
10844
msgstr ""
10847
10845
10848
#: en/help_topics/configuration.txt:630
10846
#: en/help_topics/configuration.txt:642
10849
10847
msgid ""
10850
10848
"If present, the location of the default branch for pull or merge. This "
10851
10849
"option\n"
10853
10851
"--remember``."
10854
10852
msgstr ""
10855
10853
10856
#: en/help_topics/configuration.txt:634
10854
#: en/help_topics/configuration.txt:646
10857
10855
msgid ""
10858
10856
"push_location\n"
10859
10857
"~~~~~~~~~~~~~"
10860
10858
msgstr ""
10861
10859
10862
#: en/help_topics/configuration.txt:637
10860
#: en/help_topics/configuration.txt:649
10863
10861
msgid ""
10864
10862
"If present, the location of the default branch for push. This option\n"
10865
10863
"is normally set by the first ``push`` or ``push --remember``."
10866
10864
msgstr ""
10867
10865
10868
#: en/help_topics/configuration.txt:640
10866
#: en/help_topics/configuration.txt:652
10869
10867
msgid ""
10870
10868
"push_strict\n"
10871
10869
"~~~~~~~~~~~"
10872
10870
msgstr ""
10873
10871
10874
#: en/help_topics/configuration.txt:643
10872
#: en/help_topics/configuration.txt:655
10875
10873
msgid ""
10876
10874
"If present, defines the ``--strict`` option default value for checking\n"
10877
10875
"uncommitted changes before pushing."
10878
10876
msgstr ""
10879
10877
10880
#: en/help_topics/configuration.txt:646
10878
#: en/help_topics/configuration.txt:658
10881
10879
msgid ""
10882
10880
"dpush_strict\n"
10883
10881
"~~~~~~~~~~~~"
10884
10882
msgstr ""
10885
10883
10886
#: en/help_topics/configuration.txt:649
10884
#: en/help_topics/configuration.txt:661
10887
10885
msgid ""
10888
10886
"If present, defines the ``--strict`` option default value for checking\n"
10889
10887
"uncommitted changes before pushing into a different VCS without any\n"
10890
10888
"custom bzr metadata."
10891
10889
msgstr ""
10892
10890
10893
#: en/help_topics/configuration.txt:653
10891
#: en/help_topics/configuration.txt:665
10894
10892
msgid ""
10895
10893
"bound_location\n"
10896
10894
"~~~~~~~~~~~~~~"
10897
10895
msgstr ""
10898
10896
10899
#: en/help_topics/configuration.txt:656
10897
#: en/help_topics/configuration.txt:668
10900
10898
msgid ""
10901
10899
"The location that commits should go to when acting as a checkout.\n"
10902
10900
"This option is normally set by ``bind``."
10903
10901
msgstr ""
10904
10902
10905
#: en/help_topics/configuration.txt:659
10903
#: en/help_topics/configuration.txt:671
10906
10904
msgid ""
10907
10905
"bound\n"
10908
10906
"~~~~~"
10909
10907
msgstr ""
10910
10908
10911
#: en/help_topics/configuration.txt:662
10909
#: en/help_topics/configuration.txt:674
10912
10910
msgid ""
10913
10911
"If set to \"True\", the branch should act as a checkout, and push each "
10914
10912
"commit to\n"
10915
10913
"the bound_location. This option is normally set by ``bind``/``unbind``."
10916
10914
msgstr ""
10917
10915
10918
#: en/help_topics/configuration.txt:665
10916
#: en/help_topics/configuration.txt:677
10919
10917
msgid ""
10920
10918
"send_strict\n"
10921
10919
"~~~~~~~~~~~"
10922
10920
msgstr ""
10923
10921
10924
#: en/help_topics/configuration.txt:668
10922
#: en/help_topics/configuration.txt:680
10925
10923
msgid ""
10926
10924
"If present, defines the ``--strict`` option default value for checking\n"
10927
10925
"uncommitted changes before sending a merge directive."
10928
10926
msgstr ""
10929
10927
10930
#: en/help_topics/configuration.txt:671
10928
#: en/help_topics/configuration.txt:683
10931
10929
msgid ""
10932
10930
"add.maximum_file_size\n"
10933
10931
"~~~~~~~~~~~~~~~~~~~~~"
10934
10932
msgstr ""
10935
10933
10936
#: en/help_topics/configuration.txt:674
10934
#: en/help_topics/configuration.txt:686
10937
10935
msgid ""
10938
10936
"Defines the maximum file size the command line \"add\" operation will allow\n"
10939
10937
"in recursive mode, with files larger than this value being skipped. You may "
10945
10943
"will disable skipping."
10946
10944
msgstr ""
10947
10945
10948
#: en/help_topics/configuration.txt:680
10946
#: en/help_topics/configuration.txt:692
10949
10947
msgid ""
10950
10948
"External Merge Tools\n"
10951
10949
"--------------------"
10952
10950
msgstr ""
10953
10951
10954
#: en/help_topics/configuration.txt:683
10952
#: en/help_topics/configuration.txt:695
10955
10953
msgid ""
10956
10954
"bzr.mergetool.<name>\n"
10957
10955
"~~~~~~~~~~~~~~~~~~~~"
10958
10956
msgstr ""
10959
10957
10960
#: en/help_topics/configuration.txt:686
10958
#: en/help_topics/configuration.txt:698
10961
10959
msgid ""
10962
10960
"Defines an external merge tool called <name> with the given command-line.\n"
10963
10961
"Arguments containing spaces should be quoted using single or double quotes. "
10965
10963
"executable may omit its path if it can be found on the PATH."
10966
10964
msgstr ""
10967
10965
10968
#: en/help_topics/configuration.txt:690
10966
#: en/help_topics/configuration.txt:702
10969
10967
msgid ""
10970
10968
"The following markers can be used in the command-line to substitute "
10971
10969
"filenames\n"
10972
10970
"involved in the merge conflict::"
10973
10971
msgstr ""
10974
10972
10975
#: en/help_topics/configuration.txt:693
10973
#: en/help_topics/configuration.txt:705
10976
10974
msgid ""
10977
10975
" {base} file.BASE\n"
10978
10976
" {this} file.THIS\n"
10983
10981
" succeeds."
10984
10982
msgstr ""
10985
10983
10986
#: en/help_topics/configuration.txt:702
10984
#: en/help_topics/configuration.txt:714
10987
10985
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10988
10986
msgstr ""
10989
10987
10990
#: en/help_topics/configuration.txt:704
10988
#: en/help_topics/configuration.txt:716
10991
10989
msgid ""
10992
10990
"bzr.default_mergetool\n"
10993
10991
"~~~~~~~~~~~~~~~~~~~~~"
10994
10992
msgstr ""
10995
10993
10996
#: en/help_topics/configuration.txt:707
10994
#: en/help_topics/configuration.txt:719
10997
10995
msgid ""
10998
10996
"Specifies which external merge tool (as defined above) should be selected "
10999
10997
"by\n"
11000
10998
"default in tools such as ``bzr qconflicts``."
11001
10999
msgstr ""
11002
11000
11003
#: en/help_topics/configuration.txt:712
11001
#: en/help_topics/configuration.txt:724
11004
11002
msgid " bzr.default_mergetool = kdiff3\n"
11005
11003
msgstr ""
11006
11004
11951
11949
"branch can now be pushed to the mainline.\n"
11952
11950
msgstr ""
11953
11951
11952
#: en/help_topics/env-variables.txt:1
11953
msgid "Environment Variables"
11954
msgstr ""
11955
11956
#: en/help_topics/env-variables.txt:3
11957
msgid ""
11958
"=================== "
11959
"===========================================================\n"
11960
"BZRPATH Path where bzr is to look for shell plugin external\n"
11961
" commands.\n"
11962
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11963
"EMAIL E-Mail address of the user.\n"
11964
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11965
"EDITOR Editor for editing commit messages.\n"
11966
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11967
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11968
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11969
"BZR_PLUGIN_PATH.\n"
11970
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11971
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11972
"and\n"
11973
" HOME.\n"
11974
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11975
"URLs).\n"
11976
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11977
"sshcorp,\n"
11978
" plink or lsh.\n"
11979
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11980
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11981
"BZR_COLUMNS Override implicit terminal width.\n"
11982
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11983
"(selftest)\n"
11984
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11985
"'text'.\n"
11986
"BZR_PDB Control whether to launch a debugger on error.\n"
11987
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11988
" breakin debugger.\n"
11989
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11990
"(instead\n"
11991
" of char-based).\n"
11992
"=================== "
11993
"===========================================================\n"
11994
msgstr ""
11995
11954
11996
#: en/help_topics/eol.txt:1
11955
11997
msgid ""
11956
11998
"End of Line Conversion\n"
12258
12300
msgstr ""
12259
12301
12260
12302
#: 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
12303
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
12262
12304
msgid "Introduced in: 2.2"
12263
12305
msgstr ""
12264
12306
12276
12318
"~~~~"
12277
12319
msgstr ""
12278
12320
12279
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
12280
#: en/help_topics/hooks.txt:304
12321
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12322
#: en/help_topics/hooks.txt:307
12281
12323
msgid "Introduced in: 1.8"
12282
12324
msgstr ""
12283
12325
12307
12349
"~~~~~~~~~~~~~~~~~~~~~~"
12308
12350
msgstr ""
12309
12351
12310
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
12352
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
12311
12353
msgid "Introduced in: 1.4"
12312
12354
msgstr ""
12313
12355
12319
12361
"uncommit will all trigger this hook."
12320
12362
msgstr ""
12321
12363
12322
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12364
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
12323
12365
msgid ""
12324
12366
"post_commit\n"
12325
12367
"~~~~~~~~~~~"
12327
12369
12328
12370
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12329
12371
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12330
#: en/help_topics/hooks.txt:145
12331
12372
msgid "Introduced in: 0.15"
12332
12373
msgstr ""
12333
12374
12432
12473
12433
12474
#: en/help_topics/hooks.txt:142
12434
12475
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
12476
"transform_fallback_location\n"
12451
12477
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12452
12478
msgstr ""
12453
12479
12454
#: en/help_topics/hooks.txt:156
12480
#: en/help_topics/hooks.txt:145
12455
12481
msgid "Introduced in: 1.9"
12456
12482
msgstr ""
12457
12483
12458
#: en/help_topics/hooks.txt:158
12484
#: en/help_topics/hooks.txt:147
12459
12485
msgid ""
12460
12486
"Called when a stacked branch is activating its fallback locations.\n"
12461
12487
"transform_fallback_location is called with (branch, url), and should\n"
12469
12495
"however undefined."
12470
12496
msgstr ""
12471
12497
12472
#: en/help_topics/hooks.txt:169
12498
#: en/help_topics/hooks.txt:158
12473
12499
msgid ""
12474
12500
"CommandHooks\n"
12475
12501
"------------"
12476
12502
msgstr ""
12477
12503
12478
#: en/help_topics/hooks.txt:172
12504
#: en/help_topics/hooks.txt:161
12479
12505
msgid ""
12480
12506
"extend_command\n"
12481
12507
"~~~~~~~~~~~~~~"
12482
12508
msgstr ""
12483
12509
12484
#: en/help_topics/hooks.txt:175
12510
#: en/help_topics/hooks.txt:164
12485
12511
msgid "Introduced in: 1.13"
12486
12512
msgstr ""
12487
12513
12488
#: en/help_topics/hooks.txt:177
12514
#: en/help_topics/hooks.txt:166
12489
12515
msgid ""
12490
12516
"Called after creating a command object to allow modifications such as\n"
12491
12517
"adding or removing options, docs etc. Called with the new\n"
12492
12518
"bzrlib.commands.Command object."
12493
12519
msgstr ""
12494
12520
12495
#: en/help_topics/hooks.txt:181
12521
#: en/help_topics/hooks.txt:170
12496
12522
msgid ""
12497
12523
"get_command\n"
12498
12524
"~~~~~~~~~~~"
12499
12525
msgstr ""
12500
12526
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
12527
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12528
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12503
12529
msgid "Introduced in: 1.17"
12504
12530
msgstr ""
12505
12531
12506
#: en/help_topics/hooks.txt:186
12532
#: en/help_topics/hooks.txt:175
12507
12533
msgid ""
12508
12534
"Called when creating a single command. Called with (cmd_or_None,\n"
12509
12535
"command_name). get_command should either return the cmd_or_None\n"
12513
12539
"plugin_cmds.register_lazy."
12514
12540
msgstr ""
12515
12541
12516
#: en/help_topics/hooks.txt:193
12542
#: en/help_topics/hooks.txt:182
12517
12543
msgid ""
12518
12544
"get_missing_command\n"
12519
12545
"~~~~~~~~~~~~~~~~~~~"
12520
12546
msgstr ""
12521
12547
12522
#: en/help_topics/hooks.txt:198
12548
#: en/help_topics/hooks.txt:187
12523
12549
msgid ""
12524
12550
"Called when creating a single command if no command could be found.\n"
12525
12551
"Called with (command_name). get_missing_command should either return\n"
12526
12552
"None, or a Command object to be used for the command."
12527
12553
msgstr ""
12528
12554
12529
#: en/help_topics/hooks.txt:202
12555
#: en/help_topics/hooks.txt:191
12530
12556
msgid ""
12531
12557
"list_commands\n"
12532
12558
"~~~~~~~~~~~~~"
12533
12559
msgstr ""
12534
12560
12535
#: en/help_topics/hooks.txt:207
12561
#: en/help_topics/hooks.txt:196
12536
12562
msgid ""
12537
12563
"Called when enumerating commands. Called with a set of cmd_name\n"
12538
12564
"strings for all the commands found so far. This set is safe to mutate\n"
12540
12566
"set of command names."
12541
12567
msgstr ""
12542
12568
12543
#: en/help_topics/hooks.txt:212
12569
#: en/help_topics/hooks.txt:201
12570
msgid ""
12571
"post_command\n"
12572
"~~~~~~~~~~~~"
12573
msgstr ""
12574
12575
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12576
msgid "Introduced in: 2.6"
12577
msgstr ""
12578
12579
#: en/help_topics/hooks.txt:206
12580
msgid "Called after executing a command. Called with the command object."
12581
msgstr ""
12582
12583
#: en/help_topics/hooks.txt:208
12584
msgid ""
12585
"pre_command\n"
12586
"~~~~~~~~~~~"
12587
msgstr ""
12588
12589
#: en/help_topics/hooks.txt:213
12590
msgid "Called prior to executing a command. Called with the command object."
12591
msgstr ""
12592
12593
#: en/help_topics/hooks.txt:215
12544
12594
msgid ""
12545
12595
"_ConfigHooks\n"
12546
12596
"------------"
12547
12597
msgstr ""
12548
12598
12549
#: en/help_topics/hooks.txt:215
12599
#: en/help_topics/hooks.txt:218
12550
12600
msgid ""
12551
12601
"get\n"
12552
12602
"~~~"
12553
12603
msgstr ""
12554
12604
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
12605
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12606
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12607
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12608
#: en/help_topics/hooks.txt:446
12559
12609
msgid "Introduced in: 2.4"
12560
12610
msgstr ""
12561
12611
12562
#: en/help_topics/hooks.txt:220
12612
#: en/help_topics/hooks.txt:223
12563
12613
msgid ""
12564
12614
"Invoked when a config option is read. The signature is (stack, name,\n"
12565
12615
"value)."
12566
12616
msgstr ""
12567
12617
12568
#: en/help_topics/hooks.txt:223
12618
#: en/help_topics/hooks.txt:226
12569
12619
msgid ""
12570
12620
"load\n"
12571
12621
"~~~~"
12572
12622
msgstr ""
12573
12623
12574
#: en/help_topics/hooks.txt:228
12624
#: en/help_topics/hooks.txt:231
12575
12625
msgid "Invoked when a config store is loaded. The signature is (store)."
12576
12626
msgstr ""
12577
12627
12578
#: en/help_topics/hooks.txt:230
12628
#: en/help_topics/hooks.txt:233
12579
12629
msgid ""
12580
12630
"remove\n"
12581
12631
"~~~~~~"
12582
12632
msgstr ""
12583
12633
12584
#: en/help_topics/hooks.txt:235
12634
#: en/help_topics/hooks.txt:238
12585
12635
msgid ""
12586
12636
"Invoked when a config option is removed. The signature is (stack,\n"
12587
12637
"name)."
12588
12638
msgstr ""
12589
12639
12590
#: en/help_topics/hooks.txt:238
12640
#: en/help_topics/hooks.txt:241
12591
12641
msgid ""
12592
12642
"save\n"
12593
12643
"~~~~"
12594
12644
msgstr ""
12595
12645
12596
#: en/help_topics/hooks.txt:243
12646
#: en/help_topics/hooks.txt:246
12597
12647
msgid "Invoked when a config store is saved. The signature is (store)."
12598
12648
msgstr ""
12599
12649
12600
#: en/help_topics/hooks.txt:245
12650
#: en/help_topics/hooks.txt:248
12601
12651
msgid ""
12602
12652
"set\n"
12603
12653
"~~~"
12604
12654
msgstr ""
12605
12655
12606
#: en/help_topics/hooks.txt:250
12656
#: en/help_topics/hooks.txt:253
12607
12657
msgid ""
12608
12658
"Invoked when a config option is set. The signature is (stack, name,\n"
12609
12659
"value)."
12610
12660
msgstr ""
12611
12661
12612
#: en/help_topics/hooks.txt:253
12662
#: en/help_topics/hooks.txt:256
12613
12663
msgid ""
12614
12664
"ControlDirHooks\n"
12615
12665
"---------------"
12616
12666
msgstr ""
12617
12667
12618
#: en/help_topics/hooks.txt:256
12668
#: en/help_topics/hooks.txt:259
12619
12669
msgid ""
12620
12670
"post_repo_init\n"
12621
12671
"~~~~~~~~~~~~~~"
12622
12672
msgstr ""
12623
12673
12624
#: en/help_topics/hooks.txt:261
12674
#: en/help_topics/hooks.txt:264
12625
12675
msgid ""
12626
12676
"Invoked after a repository has been initialized. post_repo_init is\n"
12627
12677
"called with a bzrlib.controldir.RepoInitHookParams."
12628
12678
msgstr ""
12629
12679
12630
#: en/help_topics/hooks.txt:264
12680
#: en/help_topics/hooks.txt:267
12631
12681
msgid ""
12632
12682
"pre_open\n"
12633
12683
"~~~~~~~~"
12634
12684
msgstr ""
12635
12685
12636
#: en/help_topics/hooks.txt:267
12686
#: en/help_topics/hooks.txt:270
12637
12687
msgid "Introduced in: 1.14"
12638
12688
msgstr ""
12639
12689
12640
#: en/help_topics/hooks.txt:269
12690
#: en/help_topics/hooks.txt:272
12641
12691
msgid ""
12642
12692
"Invoked before attempting to open a ControlDir with the transport that\n"
12643
12693
"the open will use."
12644
12694
msgstr ""
12645
12695
12646
#: en/help_topics/hooks.txt:272
12696
#: en/help_topics/hooks.txt:275
12647
12697
msgid ""
12648
12698
"InfoHooks\n"
12649
12699
"---------"
12650
12700
msgstr ""
12651
12701
12652
#: en/help_topics/hooks.txt:275
12702
#: en/help_topics/hooks.txt:278
12653
12703
msgid ""
12654
12704
"repository\n"
12655
12705
"~~~~~~~~~~"
12656
12706
msgstr ""
12657
12707
12658
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12659
#: en/help_topics/hooks.txt:521
12708
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12709
#: en/help_topics/hooks.txt:524
12660
12710
msgid "Introduced in: 1.15"
12661
12711
msgstr ""
12662
12712
12663
#: en/help_topics/hooks.txt:280
12713
#: en/help_topics/hooks.txt:283
12664
12714
msgid ""
12665
12715
"Invoked when displaying the statistics for a repository. repository is\n"
12666
12716
"called with a statistics dictionary as returned by the repository and\n"
12667
12717
"a file-like object to write to."
12668
12718
msgstr ""
12669
12719
12670
#: en/help_topics/hooks.txt:284
12720
#: en/help_topics/hooks.txt:287
12671
12721
msgid ""
12672
12722
"LockHooks\n"
12673
12723
"---------"
12674
12724
msgstr ""
12675
12725
12676
#: en/help_topics/hooks.txt:287
12726
#: en/help_topics/hooks.txt:290
12677
12727
msgid ""
12678
12728
"lock_acquired\n"
12679
12729
"~~~~~~~~~~~~~"
12680
12730
msgstr ""
12681
12731
12682
#: en/help_topics/hooks.txt:292
12732
#: en/help_topics/hooks.txt:295
12683
12733
msgid ""
12684
12734
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12685
12735
msgstr ""
12686
12736
12687
#: en/help_topics/hooks.txt:294
12737
#: en/help_topics/hooks.txt:297
12688
12738
msgid ""
12689
12739
"lock_broken\n"
12690
12740
"~~~~~~~~~~~"
12691
12741
msgstr ""
12692
12742
12693
#: en/help_topics/hooks.txt:299
12743
#: en/help_topics/hooks.txt:302
12694
12744
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12695
12745
msgstr ""
12696
12746
12697
#: en/help_topics/hooks.txt:301
12747
#: en/help_topics/hooks.txt:304
12698
12748
msgid ""
12699
12749
"lock_released\n"
12700
12750
"~~~~~~~~~~~~~"
12701
12751
msgstr ""
12702
12752
12703
#: en/help_topics/hooks.txt:306
12753
#: en/help_topics/hooks.txt:309
12704
12754
msgid ""
12705
12755
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12706
12756
msgstr ""
12707
12757
12708
#: en/help_topics/hooks.txt:308
12758
#: en/help_topics/hooks.txt:311
12709
12759
msgid ""
12710
12760
"MergeHooks\n"
12711
12761
"----------"
12712
12762
msgstr ""
12713
12763
12714
#: en/help_topics/hooks.txt:311
12764
#: en/help_topics/hooks.txt:314
12715
12765
msgid ""
12716
12766
"merge_file_content\n"
12717
12767
"~~~~~~~~~~~~~~~~~~"
12718
12768
msgstr ""
12719
12769
12720
#: en/help_topics/hooks.txt:314
12770
#: en/help_topics/hooks.txt:317
12721
12771
msgid "Introduced in: 2.1"
12722
12772
msgstr ""
12723
12773
12724
#: en/help_topics/hooks.txt:316
12774
#: en/help_topics/hooks.txt:319
12725
12775
msgid ""
12726
12776
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12727
12777
"object when starting a merge. Should return either None or a subclass\n"
12731
12781
"AbstractPerFileMerger API docs for details on how it is used by merge."
12732
12782
msgstr ""
12733
12783
12734
#: en/help_topics/hooks.txt:323
12784
#: en/help_topics/hooks.txt:326
12735
12785
msgid ""
12736
12786
"post_merge\n"
12737
12787
"~~~~~~~~~~"
12738
12788
msgstr ""
12739
12789
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
12790
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12791
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12792
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12743
12793
msgid "Introduced in: 2.5"
12744
12794
msgstr ""
12745
12795
12746
#: en/help_topics/hooks.txt:328
12796
#: en/help_topics/hooks.txt:331
12747
12797
msgid ""
12748
12798
"Called after a merge. Receives a Merger object as the single argument.\n"
12749
12799
"The return value is ignored."
12750
12800
msgstr ""
12751
12801
12752
#: en/help_topics/hooks.txt:331
12802
#: en/help_topics/hooks.txt:334
12753
12803
msgid ""
12754
12804
"pre_merge\n"
12755
12805
"~~~~~~~~~"
12756
12806
msgstr ""
12757
12807
12758
#: en/help_topics/hooks.txt:336
12808
#: en/help_topics/hooks.txt:339
12759
12809
msgid ""
12760
12810
"Called before a merge. Receives a Merger object as the single\n"
12761
12811
"argument."
12762
12812
msgstr ""
12763
12813
12764
#: en/help_topics/hooks.txt:339
12814
#: en/help_topics/hooks.txt:342
12765
12815
msgid ""
12766
12816
"MergeDirectiveHooks\n"
12767
12817
"-------------------"
12768
12818
msgstr ""
12769
12819
12770
#: en/help_topics/hooks.txt:342
12820
#: en/help_topics/hooks.txt:345
12771
12821
msgid ""
12772
12822
"merge_request_body\n"
12773
12823
"~~~~~~~~~~~~~~~~~~"
12774
12824
msgstr ""
12775
12825
12776
#: en/help_topics/hooks.txt:345
12826
#: en/help_topics/hooks.txt:348
12777
12827
msgid "Introduced in: 1.15.0"
12778
12828
msgstr ""
12779
12829
12780
#: en/help_topics/hooks.txt:347
12830
#: en/help_topics/hooks.txt:350
12781
12831
msgid ""
12782
12832
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12783
12833
"request. Callbacks must return a body. If more than one callback is\n"
12784
12834
"registered, the output of one callback is provided to the next."
12785
12835
msgstr ""
12786
12836
12787
#: en/help_topics/hooks.txt:351
12837
#: en/help_topics/hooks.txt:354
12788
12838
msgid ""
12789
12839
"MessageEditorHooks\n"
12790
12840
"------------------"
12791
12841
msgstr ""
12792
12842
12793
#: en/help_topics/hooks.txt:354
12843
#: en/help_topics/hooks.txt:357
12794
12844
msgid ""
12795
12845
"commit_message_template\n"
12796
12846
"~~~~~~~~~~~~~~~~~~~~~~~"
12797
12847
msgstr ""
12798
12848
12799
#: en/help_topics/hooks.txt:357
12849
#: en/help_topics/hooks.txt:360
12800
12850
msgid "Introduced in: 1.10"
12801
12851
msgstr ""
12802
12852
12803
#: en/help_topics/hooks.txt:359
12853
#: en/help_topics/hooks.txt:362
12804
12854
msgid ""
12805
12855
"Called when a commit message is being generated.\n"
12806
12856
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12811
12861
"second, and so on."
12812
12862
msgstr ""
12813
12863
12814
#: en/help_topics/hooks.txt:367
12864
#: en/help_topics/hooks.txt:370
12815
12865
msgid ""
12816
12866
"set_commit_message\n"
12817
12867
"~~~~~~~~~~~~~~~~~~"
12818
12868
msgstr ""
12819
12869
12820
#: en/help_topics/hooks.txt:372
12870
#: en/help_topics/hooks.txt:375
12821
12871
msgid ""
12822
12872
"Set a fixed commit message. set_commit_message is called with the\n"
12823
12873
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12826
12876
"should use the message editor as normal."
12827
12877
msgstr ""
12828
12878
12829
#: en/help_topics/hooks.txt:378
12879
#: en/help_topics/hooks.txt:381
12830
12880
msgid ""
12831
12881
"MutableTreeHooks\n"
12832
12882
"----------------"
12833
12883
msgstr ""
12834
12884
12835
#: en/help_topics/hooks.txt:381
12885
#: en/help_topics/hooks.txt:384
12836
12886
msgid ""
12837
12887
"post_build_tree\n"
12838
12888
"~~~~~~~~~~~~~~~"
12839
12889
msgstr ""
12840
12890
12841
#: en/help_topics/hooks.txt:386
12891
#: en/help_topics/hooks.txt:389
12842
12892
msgid ""
12843
12893
"Called after a completely new tree is built. The hook is called with\n"
12844
12894
"the tree as its only argument."
12845
12895
msgstr ""
12846
12896
12847
#: en/help_topics/hooks.txt:392
12897
#: en/help_topics/hooks.txt:395
12848
12898
msgid "Introduced in: 2.0"
12849
12899
msgstr ""
12850
12900
12851
#: en/help_topics/hooks.txt:394
12901
#: en/help_topics/hooks.txt:397
12852
12902
msgid ""
12853
12903
"Called after a commit is performed on a tree. The hook is called with\n"
12854
12904
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12856
12906
"that object."
12857
12907
msgstr ""
12858
12908
12859
#: en/help_topics/hooks.txt:399
12909
#: en/help_topics/hooks.txt:402
12860
12910
msgid ""
12861
12911
"post_transform\n"
12862
12912
"~~~~~~~~~~~~~~"
12863
12913
msgstr ""
12864
12914
12865
#: en/help_topics/hooks.txt:404
12915
#: en/help_topics/hooks.txt:407
12866
12916
msgid ""
12867
12917
"Called after a tree transform has been performed on a tree. The hook\n"
12868
12918
"is called with the tree that is being transformed and the transform."
12869
12919
msgstr ""
12870
12920
12871
#: en/help_topics/hooks.txt:407
12921
#: en/help_topics/hooks.txt:410
12872
12922
msgid ""
12873
12923
"pre_transform\n"
12874
12924
"~~~~~~~~~~~~~"
12875
12925
msgstr ""
12876
12926
12877
#: en/help_topics/hooks.txt:412
12927
#: en/help_topics/hooks.txt:415
12878
12928
msgid ""
12879
12929
"Called before a tree transform on this tree. The hook is called with\n"
12880
12930
"the tree that is being transformed and the transform."
12881
12931
msgstr ""
12882
12932
12883
#: en/help_topics/hooks.txt:415
12933
#: en/help_topics/hooks.txt:418
12884
12934
msgid ""
12885
12935
"start_commit\n"
12886
12936
"~~~~~~~~~~~~"
12887
12937
msgstr ""
12888
12938
12889
#: en/help_topics/hooks.txt:420
12939
#: en/help_topics/hooks.txt:423
12890
12940
msgid ""
12891
12941
"Called before a commit is performed on a tree. The start commit hook\n"
12892
12942
"is able to change the tree before the commit takes place. start_commit\n"
12894
12944
"being performed on."
12895
12945
msgstr ""
12896
12946
12897
#: en/help_topics/hooks.txt:425
12947
#: en/help_topics/hooks.txt:428
12898
12948
msgid ""
12899
12949
"SmartClientHooks\n"
12900
12950
"----------------"
12901
12951
msgstr ""
12902
12952
12903
#: en/help_topics/hooks.txt:428
12953
#: en/help_topics/hooks.txt:431
12904
12954
msgid ""
12905
12955
"call\n"
12906
12956
"~~~~"
12907
12957
msgstr ""
12908
12958
12909
#: en/help_topics/hooks.txt:431
12959
#: en/help_topics/hooks.txt:434
12910
12960
msgid "Introduced in: unknown"
12911
12961
msgstr ""
12912
12962
12913
#: en/help_topics/hooks.txt:433
12963
#: en/help_topics/hooks.txt:436
12914
12964
msgid ""
12915
12965
"Called when the smart client is submitting a request to the smart\n"
12916
12966
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12917
12967
"Streaming request bodies, and responses, are not accessible."
12918
12968
msgstr ""
12919
12969
12920
#: en/help_topics/hooks.txt:437
12970
#: en/help_topics/hooks.txt:440
12921
12971
msgid ""
12922
12972
"SmartServerHooks\n"
12923
12973
"----------------"
12924
12974
msgstr ""
12925
12975
12926
#: en/help_topics/hooks.txt:440
12976
#: en/help_topics/hooks.txt:443
12927
12977
msgid ""
12928
12978
"server_exception\n"
12929
12979
"~~~~~~~~~~~~~~~~"
12930
12980
msgstr ""
12931
12981
12932
#: en/help_topics/hooks.txt:445
12982
#: en/help_topics/hooks.txt:448
12933
12983
msgid ""
12934
12984
"Called by the bzr server when an exception occurs. server_exception is\n"
12935
12985
"called with the sys.exc_info() tuple return true for the hook if the\n"
12937
12987
"normally."
12938
12988
msgstr ""
12939
12989
12940
#: en/help_topics/hooks.txt:450
12990
#: en/help_topics/hooks.txt:453
12941
12991
msgid ""
12942
12992
"server_started\n"
12943
12993
"~~~~~~~~~~~~~~"
12944
12994
msgstr ""
12945
12995
12946
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12996
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12947
12997
msgid "Introduced in: 0.16"
12948
12998
msgstr ""
12949
12999
12950
#: en/help_topics/hooks.txt:455
13000
#: en/help_topics/hooks.txt:458
12951
13001
msgid ""
12952
13002
"Called by the bzr server when it starts serving a directory.\n"
12953
13003
"server_started is called with (backing urls, public url), where\n"
12956
13006
"served."
12957
13007
msgstr ""
12958
13008
12959
#: en/help_topics/hooks.txt:461
13009
#: en/help_topics/hooks.txt:464
12960
13010
msgid ""
12961
13011
"server_started_ex\n"
12962
13012
"~~~~~~~~~~~~~~~~~"
12963
13013
msgstr ""
12964
13014
12965
#: en/help_topics/hooks.txt:466
13015
#: en/help_topics/hooks.txt:469
12966
13016
msgid ""
12967
13017
"Called by the bzr server when it starts serving a directory.\n"
12968
13018
"server_started is called with (backing_urls, server_obj)."
12969
13019
msgstr ""
12970
13020
12971
#: en/help_topics/hooks.txt:469
13021
#: en/help_topics/hooks.txt:472
12972
13022
msgid ""
12973
13023
"server_stopped\n"
12974
13024
"~~~~~~~~~~~~~~"
12975
13025
msgstr ""
12976
13026
12977
#: en/help_topics/hooks.txt:474
13027
#: en/help_topics/hooks.txt:477
12978
13028
msgid ""
12979
13029
"Called by the bzr server when it stops serving a directory.\n"
12980
13030
"server_stopped is called with the same parameters as the\n"
12981
13031
"server_started hook: (backing_urls, public_url)."
12982
13032
msgstr ""
12983
13033
12984
#: en/help_topics/hooks.txt:478
13034
#: en/help_topics/hooks.txt:481
12985
13035
msgid ""
12986
13036
"StatusHooks\n"
12987
13037
"-----------"
12988
13038
msgstr ""
12989
13039
12990
#: en/help_topics/hooks.txt:481
13040
#: en/help_topics/hooks.txt:484
12991
13041
msgid ""
12992
13042
"post_status\n"
12993
13043
"~~~~~~~~~~~"
12994
13044
msgstr ""
12995
13045
12996
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
13046
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12997
13047
msgid "Introduced in: 2.3"
12998
13048
msgstr ""
12999
13049
13000
#: en/help_topics/hooks.txt:486
13050
#: en/help_topics/hooks.txt:489
13001
13051
msgid ""
13002
13052
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13003
13053
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13006
13056
"status command. to_file is the output stream for writing."
13007
13057
msgstr ""
13008
13058
13009
#: en/help_topics/hooks.txt:492
13059
#: en/help_topics/hooks.txt:495
13010
13060
msgid ""
13011
13061
"pre_status\n"
13012
13062
"~~~~~~~~~~"
13013
13063
msgstr ""
13014
13064
13015
#: en/help_topics/hooks.txt:497
13065
#: en/help_topics/hooks.txt:500
13016
13066
msgid ""
13017
13067
"Called with argument StatusHookParams before Bazaar displays the\n"
13018
13068
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13021
13071
"status command. to_file is the output stream for writing."
13022
13072
msgstr ""
13023
13073
13024
#: en/help_topics/hooks.txt:503
13074
#: en/help_topics/hooks.txt:506
13025
13075
msgid ""
13026
13076
"TransportHooks\n"
13027
13077
"--------------"
13028
13078
msgstr ""
13029
13079
13030
#: en/help_topics/hooks.txt:506
13080
#: en/help_topics/hooks.txt:509
13031
13081
msgid ""
13032
13082
"post_connect\n"
13033
13083
"~~~~~~~~~~~~"
13034
13084
msgstr ""
13035
13085
13036
#: en/help_topics/hooks.txt:511
13086
#: en/help_topics/hooks.txt:514
13037
13087
msgid ""
13038
13088
"Called after a new connection is established or a reconnect occurs.\n"
13039
13089
"The sole argument passed is either the connected transport or smart\n"
13040
13090
"medium instance."
13041
13091
msgstr ""
13042
13092
13043
#: en/help_topics/hooks.txt:515
13093
#: en/help_topics/hooks.txt:518
13044
13094
msgid ""
13045
13095
"RioVersionInfoBuilderHooks\n"
13046
13096
"--------------------------"
13047
13097
msgstr ""
13048
13098
13049
#: en/help_topics/hooks.txt:518
13099
#: en/help_topics/hooks.txt:521
13050
13100
msgid ""
13051
13101
"revision\n"
13052
13102
"~~~~~~~~"
13053
13103
msgstr ""
13054
13104
13055
#: en/help_topics/hooks.txt:523
13105
#: en/help_topics/hooks.txt:526
13056
13106
msgid ""
13057
13107
"Invoked when adding information about a revision to the RIO stanza\n"
13058
13108
"that is printed. revision is called with a revision object and a RIO\n"
13826
13876
msgstr ""
13827
13877
13828
13878
#~ 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
#~ "なります。"
13879
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
13880
#~ "delete them if they can easily be recovered using revert otherwise they\n"
13881
#~ "will be backed up (adding an extention of the form .~#~). If no options or\n"
13882
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
13883
#~ "Bazaar but missing in your tree and stop tracking them for you."
13884
#~ msgstr ""
13885
#~ "このコマンドで指定されたファイルの変更をBazaarは管理しなくなります。\n"
13886
#~ "revertでファイルが簡単に復活できる場合は、ファイルは削除されますし、そうで\n"
13887
#~ "ない場合はバックアップ(.~#~という形式の拡張子がつきます)されます。オプション\n"
13888
#~ "やパラメータが指定されていない場合は、バージョン管理されているけれどツリー\n"
13889
#~ "削除されているファイルを探して、そのファイルのバージョン管理を止めます。"
13890
13891
#~ msgid ""
13892
#~ "If unset, the tree root directory name is used as the nickname.\n"
13893
#~ "To print the current nickname, execute with no argument."
13894
#~ msgstr ""
13895
#~ "設定されていない場合は、ツリーのルートディレクトリの名前が\n"
13896
#~ "ニックネームとして扱われます。引数なしで実行すると、現在の\n"
13897
#~ "ニックネームを表示します。"
13898
13899
#~ msgid "Revert files to a previous revision."
13900
#~ msgstr "ファイルを過去のリビジョンに戻します。"
13901
13902
#~ msgid ""
13903
#~ "To remove only some changes, without reverting to a prior version, use\n"
13904
#~ "merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
13905
#~ "will remove the changes introduced by the second last commit (-2), without\n"
13906
#~ "affecting the changes introduced by the last commit (-1). To remove\n"
13907
#~ "certain changes on a hunk-by-hunk basis, see the shelve command."
13908
#~ msgstr ""
13909
#~ "以前のリビジョンに戻さずにいくつかの変更を取り除くには、mergeをかわりに\n"
13910
#~ "使用します。例えば、\"merge . -r -2..-3\" (.を忘れないように)で、最終リビジョン\n"
13911
#~ "(-1)での変更はそのままで、その一つ前のリビジョン(-2)での変更だけを取り\n"
13912
#~ "除くことができます。特定の変更をハンクごと取り除く方法は、shelveをご覧\n"
13913
#~ "ください。"
13914
13915
#~ msgid ""
13916
#~ "By default, any files that have been manually changed will be backed up\n"
13917
#~ "first. (Files changed only by merge are not backed up.) Backup files have\n"
13918
#~ "'.~#~' appended to their name, where # is a number."
13919
#~ msgstr ""
13920
#~ "デフォルトでは、手で変更されたファイルは最初にバックアップされます。(merge\n"
13921
#~ "コマンドで変更されただけのファイルはバックアップされません)バックアップ\n"
13922
#~ "ファイル名は、元の名前に「.~#~」(#は数字)を付け足したものになります。"
13923
13924
#~ msgid ""
13925
#~ "Giving a list of files will revert only those files. Otherwise, all files\n"
13926
#~ "will be reverted. If the revision is not specified with '--revision', the\n"
13927
#~ "last committed revision is used."
13928
#~ msgstr ""
13929
#~ "ファイルのリストを指定すると、そのファイルだけが元に戻されます。\n"
13930
#~ "そうでない場合は、全てのファイルが対象になります。--revisionで\n"
13931
#~ "リビジョンを指定しない場合は、最後にコミットされたリビジョンが使用\n"
13932
#~ "されます。"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1