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