« back to all changes in this revision
Viewing changes to po/ja.po
- browse files at revision 6437.2.3
- compare with another revision
- download diff
- download tarball
- view history from revision 6437.2.3
- Committer: Launchpad Translations on behalf of bzr-core
- Date: 2012-01-17 05:18:16 UTC
- mto: (6437.35.1 2.5.0-dev)
- mto: This revision was merged to the branch mainline in revision 6462.
- Revision ID: launchpad_translations_on_behalf_of_bzr-core-20120117051816-3rvg0pqi3nj76i1r
Launchpad automatic translations update.
added
removed
po/ja.po
1
# Japanese translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-01-16 15:18+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: Japanese <ja@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=1; plural=0;\n"
18
"X-Launchpad-Export-Date: 2012-01-17 05:16+0000\n"
19
"X-Generator: Launchpad (build 14676)\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "{0} をスキップ ({1} の {2} byte より大きいため)"
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr "スタックの解除"
28
29
#: bzrlib/branch.py:3183
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "リビジョン%dまでプッシュしました。"
33
34
#: bzrlib/branch.py:3185
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d 個のタグを更新しました"
39
40
#: bzrlib/branch.py:3188
41
msgid "No new revisions or tags to push."
42
msgstr "プッシュする新しいリビジョンやタグはありません。"
43
44
#: bzrlib/branch.py:3190
45
msgid "No new revisions to push."
46
msgstr "プッシュする新しいリビジョンはありません。"
47
48
#: bzrlib/branch.py:3210
49
msgid "checked branch {0} format {1}"
50
msgstr "format {1} のブランチ {0} をチェックしました"
51
52
#: bzrlib/branch.py:3213
53
#, python-format
54
msgid "found error:%s"
55
msgstr "検出されたエラー: %s"
56
57
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
58
#, python-format
59
msgid "Ignoring files outside view. View is %s"
60
msgstr "ビューに含まれないファイルは無視します。ビュー：%s"
61
62
#: bzrlib/builtins.py:130
63
#, python-format
64
msgid "bzr %s --revision takes exactly one revision identifier"
65
msgstr "bzr %s --revision には、リビジョンＩＤを一つだけ指定します。"
66
67
#: bzrlib/builtins.py:215
68
msgid "Display status summary."
69
msgstr "ステータスのサマリーを表示します。"
70
71
#: bzrlib/builtins.py:217
72
msgid ""
73
"This reports on versioned and unknown files, reporting them\n"
74
"grouped by state. Possible states are:"
75
msgstr ""
76
"このコマンドは、バージョン管理されたファイルやバージョン管理外ファイル\n"
77
"について、ステータスごとにグルーピングして表示します。\n"
78
"表示されるステータスは以下の通りです。:"
79
80
#: bzrlib/builtins.py:220
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"added\n"
86
" 作業コピー内ではバージョン管理されているが、一つ前のリビジョンでは管理\n"
87
" されていない。"
88
89
#: bzrlib/builtins.py:223
90
msgid ""
91
"removed\n"
92
" Versioned in the previous revision but removed or deleted\n"
93
" in the working copy."
94
msgstr ""
95
"removed\n"
96
" 一つ前のリビジョンでは管理されているが、作業コピー内では削除されている。"
97
98
#: bzrlib/builtins.py:227
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renamed\n"
106
" このファイルのパスは一つ前のリビジョンから変更されている。\n"
107
" 内容も変更されている可能性がある。親ディレクトリが変更されたファイルも\n"
108
" 含む。"
109
110
#: bzrlib/builtins.py:232
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"modified\n"
116
" ファイルの内容が一つ前のリビジョンから変更されている。"
117
118
#: bzrlib/builtins.py:235
119
msgid ""
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"kind changed\n"
124
" ファイルの種別が変更されている。(ファイルからディレクトリに変わったなど)"
125
126
#: bzrlib/builtins.py:238
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"unknown\n"
132
" バージョン管理されておらず、無視パターンにも一致していない。"
133
134
#: bzrlib/builtins.py:241
135
msgid ""
136
"Additionally for directories, symlinks and files with a changed\n"
137
"executable bit, Bazaar indicates their type using a trailing\n"
138
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
"disabled using the '--no-classify' option."
140
msgstr ""
141
"さらにディレクトリ、シンボリックリンク、実行可能ファイルについては、\n"
142
"末尾に種別を現す文字としてそれぞれ'/'、'@'、'*'が付加されます。\n"
143
"これを表示しないようにするには、'--no-classify'オプションを指定してください。"
144
145
#: bzrlib/builtins.py:246
146
msgid ""
147
"To see ignored files use 'bzr ignored'. For details on the\n"
148
"changes to file texts, use 'bzr diff'."
149
msgstr ""
150
"無視ファイルを見るには'bzr ignored'を使ってください。\n"
151
"ファイルの内容の変更を詳しく見るには、'bzr diff'を使ってください。"
152
153
#: bzrlib/builtins.py:249
154
msgid ""
155
"Note that --short or -S gives status flags for each item, similar\n"
156
"to Subversion's status command. To get output similar to svn -q,\n"
157
"use bzr status -SV."
158
msgstr ""
159
"--shortまたは-Sを指定した場合、Subversionのstatusコマンドと同じように\n"
160
"すべてのアイテムにマーカーが表示されることに注意してください。\n"
161
"SVNで-qを指定した場合と同じような形式にするには、bzr status -SV を\n"
162
"使用してください。"
163
164
#: bzrlib/builtins.py:253
165
msgid ""
166
"If no arguments are specified, the status of the entire working\n"
167
"directory is shown. Otherwise, only the status of the specified\n"
168
"files or directories is reported. If a directory is given, status\n"
169
"is reported for everything inside that directory."
170
msgstr ""
171
"何も引数を指定しない場合、作業コピー全体のステータスが表示されます。\n"
172
"指定した場合は、指定のファイルやディレクトリのステータスだけが表示\n"
173
"されます。ディレクトリを指定した場合は、そのディレクトリの配下の全ての\n"
174
"ファイルのステータスが表示されます。"
175
176
#: bzrlib/builtins.py:258
177
msgid ""
178
"Before merges are committed, the pending merge tip revisions are\n"
179
"shown. To see all pending merge revisions, use the -v option.\n"
180
"To skip the display of pending merge information altogether, use\n"
181
"the no-pending option or specify a file/directory."
182
msgstr ""
183
"マージがコミットされる前には、マージ中のTipリビジョンが表示されます。\n"
184
"すべてのマージ中リビジョンを表示するには、-vオプションを使用します。\n"
185
"マージ中の情報を省略するには、no-pendingオプションを使用するか、\n"
186
"ファイルやディレクトリを指定してください。"
187
188
#: bzrlib/builtins.py:263
189
msgid ""
190
"To compare the working directory to a specific revision, pass a\n"
191
"single revision to the revision argument."
192
msgstr ""
193
"作業フォルダと指定リビジョンとを比較するには、リビジョンを一つだけ\n"
194
"引数に指定してください。"
195
196
#: bzrlib/builtins.py:266
197
msgid ""
198
"To see which files have changed in a specific revision, or between\n"
199
"two revisions, pass a revision range to the revision argument.\n"
200
"This will produce the same results as calling 'bzr diff --summarize'."
201
msgstr ""
202
"指定されたリビジョンで、もしくは指定された２つのリビジョン間でどのファイルが\n"
203
"変更されたかを見るには、２つのリビジョンを引数に指定してください。\n"
204
"'bzr diff --summarize' でも見ることができます。"
205
206
#: bzrlib/builtins.py:275
207
msgid "Use short status indicators."
208
msgstr "省略形式でステータスを表示します。"
209
210
#: bzrlib/builtins.py:277
211
msgid "Only show versioned files."
212
msgstr "バージョン管理されているファイルだけを表示します。"
213
214
#: bzrlib/builtins.py:279
215
msgid "Don't show pending merges."
216
msgstr "マージ中の情報を表示しません。"
217
218
#: bzrlib/builtins.py:282
219
msgid "Do not mark object type using indicator."
220
msgstr "オブジェクトの種別を表すマーカーを表示しません。"
221
222
#: bzrlib/builtins.py:297
223
msgid "bzr status --revision takes exactly one or two revision specifiers"
224
msgstr "bzr status --revisionには、１つか２つのリビジョンを指定します。"
225
226
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
227
msgid "You can only supply one of revision_id or --revision"
228
msgstr "リビジョンＩＤと--revisionのどちらか一つだけを指定してください。"
229
230
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
231
msgid "You must supply either --revision or a revision_id"
232
msgstr "--revisionとリビジョンＩＤのどちらかを指定してください。"
233
234
#: bzrlib/builtins.py:351
235
#, python-format
236
msgid "Repository %r does not support access to raw revision texts"
237
msgstr "リポジトリ %r はリビジョンのtextへの直接アクセスをサポートしていません"
238
239
#: bzrlib/builtins.py:362
240
msgid "The repository {0} contains no revision {1}."
241
msgstr "リポジトリ {0} にはリビジョン {1} はありません。"
242
243
#: bzrlib/builtins.py:369
244
msgid "You cannot specify a NULL revision."
245
msgstr "NULLリビジョンは指定できません。"
246
247
#: bzrlib/builtins.py:461
248
msgid "Remove the working tree from a given branch/checkout."
249
msgstr "指定されたブランチ/チェックアウトから作業ツリーを削除します。"
250
251
#: bzrlib/builtins.py:463
252
msgid ""
253
"Since a lightweight checkout is little more than a working tree\n"
254
"this will refuse to run against one."
255
msgstr ""
256
"軽量チェックアウトは作業ツリーよりも小さいため、軽量チェック\n"
257
"アウトに対して実行することはできません。"
258
259
#: bzrlib/builtins.py:466
260
msgid "To re-create the working tree, use \"bzr checkout\"."
261
msgstr "作業ツリーを再作成するには、 \"bzr checkout\" をしてください。"
262
263
#: bzrlib/builtins.py:472
264
msgid ""
265
"Remove the working tree even if it has uncommitted or shelved changes."
266
msgstr "作業ツリーが変更されていたり、シェルフされた変更があっても、作業ツリーを削除します。"
267
268
#: bzrlib/builtins.py:486
269
msgid "No working tree to remove"
270
msgstr "削除する作業ツリーがありません。"
271
272
#: bzrlib/builtins.py:488
273
msgid "You cannot remove the working tree of a remote path"
274
msgstr "リモートの作業ツリーを削除することはできません。"
275
276
#: bzrlib/builtins.py:497
277
msgid "You cannot remove the working tree from a lightweight checkout"
278
msgstr "軽量チェックアウトから作業ツリーを削除することはできません。"
279
280
#: bzrlib/builtins.py:537
281
msgid ""
282
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
283
"instead. Use \"--force\" if you are sure you want to reset the working tree."
284
msgstr ""
285
"ツリーは壊れていないようです。代わりに\"bzr revert\"を実行してください。もし、本当に作業ツリーをリセットしたいのであれば、\"--"
286
"force\"オプションを指定してください。"
287
288
#: bzrlib/builtins.py:548
289
msgid ""
290
", the header appears corrupt, try passing -r -1 to set the state to the last "
291
"commit"
292
msgstr ", ヘッダーが壊れているようです。-r -1を指定して最終コミット時点の状態に戻してください。"
293
294
#: bzrlib/builtins.py:552
295
msgid "failed to reset the tree state{0}"
296
msgstr "ツリーの状態をリセットできませんでした。{0}"
297
298
#: bzrlib/builtins.py:556
299
msgid "Show current revision number."
300
msgstr "現在のリビジョン番号を表示します。"
301
302
#: bzrlib/builtins.py:558
303
msgid "This is equal to the number of revisions on this branch."
304
msgstr "これは、ブランチ内のリビジョンの数と同じです。"
305
306
#: bzrlib/builtins.py:571
307
msgid "--tree and --revision can not be used together"
308
msgstr "--tree と --revision は同時に指定できません"
309
310
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
311
msgid "Tags can only be placed on a single revision, not on a range"
312
msgstr "タグは1つのリビジョンにしか指定できません"
313
314
#: bzrlib/builtins.py:612
315
msgid "Show revno of working tree."
316
msgstr "作業ツリーのリビジョン番号を表示します。"
317
318
#: bzrlib/builtins.py:660
319
msgid "Add specified files or directories."
320
msgstr "指定されたファイルやディレクトリを追加します。"
321
322
#: bzrlib/builtins.py:662
323
msgid ""
324
"In non-recursive mode, all the named items are added, regardless\n"
325
"of whether they were previously ignored. A warning is given if\n"
326
"any of the named files are already versioned."
327
msgstr ""
328
"non-recursiveモードの場合、無視されていたものも含めて指定されたすべての\n"
329
"アイテムが追加されます。指定されたファイルが既に追加されているものだった\n"
330
"場合は、警告が表示されます。"
331
332
#: bzrlib/builtins.py:666
333
msgid ""
334
"In recursive mode (the default), files are treated the same way\n"
335
"but the behaviour for directories is different. Directories that\n"
336
"are already versioned do not give a warning. All directories,\n"
337
"whether already versioned or not, are searched for files or\n"
338
"subdirectories that are neither versioned or ignored, and these\n"
339
"are added. This search proceeds recursively into versioned\n"
340
"directories. If no names are given '.' is assumed."
341
msgstr ""
342
"recursiveモード(デフォルト)の場合は、ファイルの扱いは同じですが、\n"
343
"ディレクトリの扱いは変わります。既に追加されているディレクトリを指定\n"
344
"しても警告にはなりません。バージョン管理されているかどうかにかかわらず、\n"
345
"指定されたすべてのディレクトリ内のファイル、サブディレクトリをチェックして、\n"
346
"バージョン管理対象外でかつ無視されていないものを追加します。\n"
347
"この処理は、バージョン管理されたディレクトリに対して再帰的に実行されます。\n"
348
"何も指定されていない場合は、'.'が指定されたものとみなします。"
349
350
#: bzrlib/builtins.py:674
351
msgid ""
352
"A warning will be printed when nested trees are encountered,\n"
353
"unless they are explicitly ignored."
354
msgstr "ネストしたツリーがあった場合、明示的に無視しない限り警告を表示します。"
355
356
#: bzrlib/builtins.py:677
357
msgid ""
358
"Therefore simply saying 'bzr add' will version all files that\n"
359
"are currently unknown."
360
msgstr ""
361
"つまり、単に 'bzr add' とした場合は、すべての不明なファイルがバージョン\n"
362
"管理に追加されます。"
363
364
#: bzrlib/builtins.py:680
365
msgid ""
366
"Adding a file whose parent directory is not versioned will\n"
367
"implicitly add the parent, and so on up to the root. This means\n"
368
"you should never need to explicitly add a directory, they'll just\n"
369
"get added when you add a file in the directory."
370
msgstr ""
371
"親ディレクトリがバージョン管理外のファイルを追加しようとした場合、自動的に\n"
372
"親ディレクトリや、そのさらに上位のディレクトリも追加されます。つまり、\n"
373
"ディレクトリを明示的に追加する必要はなく、その中にあるファイルを追加すれば\n"
374
"ディレクトリも追加されるということになります。"
375
376
#: bzrlib/builtins.py:685
377
msgid ""
378
"--dry-run will show which files would be added, but not actually\n"
379
"add them."
380
msgstr ""
381
"--dry-run を指定すると、どのファイルが追加されるかを表示しますが、実際に追加は\n"
382
"しません。"
383
384
#: bzrlib/builtins.py:688
385
msgid ""
386
"--file-ids-from will try to use the file ids from the supplied path.\n"
387
"It looks up ids trying to find a matching parent directory with the\n"
388
"same filename, and then by pure path. This option is rarely needed\n"
389
"but can be useful when adding the same logical file into two\n"
390
"branches that will be merged later (without showing the two different\n"
391
"adds as a conflict). It is also useful when merging another project\n"
392
"into a subdirectory of this one."
393
msgstr ""
394
"--file-ids-fromを指定すると、指定されたパスから得たファイルIDを使おうと\n"
395
"します。対応する親ディレクトリ内の同じ名前のファイルからファイルIDを探し、\n"
396
"無ければ純粋なパスから生成します。このオプションが必要になることはほとんど\n"
397
"ありませんが、同じファイルを、いずれマージする予定の２つのブランチに追加する\n"
398
"場合に便利です(マージの時の衝突を避けられます)。また、別のプロジェクトをサブ\n"
399
"ディレクトリとしてマージする時にも便利です。"
400
401
#: bzrlib/builtins.py:696
402
msgid ""
403
"Any files matching patterns in the ignore list will not be added\n"
404
"unless they are explicitly mentioned."
405
msgstr ""
406
"無視パターンにマッチするファイルは、明示的に指定されない限り追加は\n"
407
"されません。"
408
409
#: bzrlib/builtins.py:699
410
msgid ""
411
"In recursive mode, files larger than the configuration option \n"
412
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
413
"to file size."
414
msgstr ""
415
"recursiveモードの場合、add.maximum_file_sizeの設定値より大きな\n"
416
"ファイルは追加されません。明示的に指定されたアイテムはファイルサイズに\n"
417
"かかわらず追加されます。"
418
419
#: bzrlib/builtins.py:706
420
msgid "Don't recursively add the contents of directories."
421
msgstr "ディレクトリの内容を再帰的に追加しません。"
422
423
#: bzrlib/builtins.py:712
424
msgid "Lookup file ids from this tree."
425
msgstr "このツリーからファイルIDを検索します。"
426
427
#: bzrlib/builtins.py:748
428
msgid "ignored {0} matching \"{1}\"\n"
429
msgstr "無視 {0} (\"{1}\"にマッチ)\n"
430
431
#: bzrlib/builtins.py:753
432
msgid "Create a new versioned directory."
433
msgstr "バージョン管理されたディレクトリを作成します。"
434
435
#: bzrlib/builtins.py:755
436
msgid "This is equivalent to creating the directory and then adding it."
437
msgstr "ディレクトリを作成して、バージョン管理に追加することと同じです。"
438
439
#: bzrlib/builtins.py:762
440
msgid "No error if existing, make parent directories as needed."
441
msgstr ""
442
443
#: bzrlib/builtins.py:796
444
#, python-format
445
msgid "added %s\n"
446
msgstr "%s が追加されました。\n"
447
448
#: bzrlib/builtins.py:838
449
#, python-format
450
msgid "invalid kind %r specified"
451
msgstr "kindが正しくありません。 %s"
452
453
#: bzrlib/builtins.py:875
454
msgid "Move or rename a file."
455
msgstr "ファイルの移動や名前の変更を行います。"
456
457
#: bzrlib/builtins.py:877
458
msgid " bzr mv SOURCE... DESTINATION"
459
msgstr " bzr mv SOURCE... DESTINATION"
460
461
#: bzrlib/builtins.py:879
462
msgid ""
463
"If the last argument is a versioned directory, all the other names\n"
464
"are moved into it. Otherwise, there must be exactly two arguments\n"
465
"and the file is changed to a new name."
466
msgstr ""
467
"最後の引数がバージョン管理対象ディレクトリの場合、指定された他の項目は\n"
468
"すべてそのディレクトリの中に移動されます。そうでない場合は、引数の数は\n"
469
"２つでなければならず、ファイルは新しい名前に変更されます。"
470
471
#: bzrlib/builtins.py:883
472
msgid ""
473
"If OLDNAME does not exist on the filesystem but is versioned and\n"
474
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
475
"assumes that the file has been manually moved and only updates\n"
476
"its internal inventory to reflect that change.\n"
477
"The same is valid when moving many SOURCE files to a DESTINATION."
478
msgstr ""
479
"OLDNAMEがファイルシステム上に存在せず、かつバージョン管理対象に\n"
480
"なっていて、NEWNAMEはファイルシステム上に存在しているがバージョン\n"
481
"管理対象にはなっていない場合は、ファイルは既に手動で移動済みだとみなし、\n"
482
"内部データへの変更の反映だけを行います。\n"
483
"複数のSOURCEをひとつのDESTINATIONに移動する場合も同じです。"
484
485
#: bzrlib/builtins.py:889
486
msgid "Files cannot be moved between branches."
487
msgstr "ファイルを別のブランチに移動することはできません。"
488
489
#: bzrlib/builtins.py:896
490
msgid ""
491
"Move only the bzr identifier of the file, because the file has already been "
492
"moved."
493
msgstr "ファイルは既に移動済みのため、ファイルのBazaar IDだけを移動します。"
494
495
#: bzrlib/builtins.py:898
496
msgid "Automatically guess renames."
497
msgstr "変名を自動的に推測します。"
498
499
#: bzrlib/builtins.py:899
500
msgid "Avoid making changes when guessing renames."
501
msgstr "変名を推測する時に、実際には変更を行いません。"
502
503
#: bzrlib/builtins.py:908
504
msgid "--dry-run requires --auto."
505
msgstr "--dry-runは--autoとともに指定してください。"
506
507
#: bzrlib/builtins.py:912
508
msgid "missing file argument"
509
msgstr "ファイルが指定されていません。"
510
511
#: bzrlib/builtins.py:916
512
msgid "can not move root of branch"
513
msgstr "ブランチの root は移動できません。"
514
515
#: bzrlib/builtins.py:922
516
msgid "Only one path may be specified to --auto."
517
msgstr "--autoを指定する場合はパスはひとつだけ指定してください。"
518
519
#: bzrlib/builtins.py:925
520
msgid "--after cannot be specified with --auto."
521
msgstr "--afterと--autoを同時に指定することはできません。"
522
523
#: bzrlib/builtins.py:962
524
msgid "to mv multiple files the destination must be a versioned directory"
525
msgstr "複数のファイルを移動する時は、移動先はバージョン管理されていなければなりません。"
526
527
#: bzrlib/builtins.py:1014
528
msgid "Turn this branch into a mirror of another branch."
529
msgstr "このブランチを別のブランチのミラーにします。"
530
531
#: bzrlib/builtins.py:1016
532
msgid ""
533
"By default, this command only works on branches that have not diverged.\n"
534
"Branches are considered diverged if the destination branch's most recent \n"
535
"commit is one that has not been merged (directly or indirectly) into the \n"
536
"parent."
537
msgstr ""
538
"デフォルトでは、このコマンドは分岐していないブランチでのみ実行できます。\n"
539
"対象のブランチの最新コミットがまだ(直接的または間接的に)親ブランチにマージ\n"
540
"されていなければ、ブランチが分岐しているとみなします。"
541
542
#: bzrlib/builtins.py:1021
543
msgid ""
544
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
545
"from one into the other. Once one branch has merged, the other should\n"
546
"be able to pull it again."
547
msgstr ""
548
"ブランチが分岐している場合、その変更を片方からもう片方に統合するために\n"
549
"'bzr merge'を使用することができます。ブランチをマージすれば、またpullできる\n"
550
"ようになるはずです。"
551
552
#: bzrlib/builtins.py:1025
553
msgid ""
554
"If you want to replace your local changes and just want your branch to\n"
555
"match the remote one, use pull --overwrite. This will work even if the two\n"
556
"branches have diverged."
557
msgstr ""
558
"もし、リモートの変更内容で手元での変更内容を単純に置き換えたい場合は、\n"
559
"pull --overwriteを使用してください。これは、ブランチ同士が分岐していても\n"
560
"実行できます。"
561
562
#: bzrlib/builtins.py:1029
563
msgid ""
564
"If there is no default location set, the first pull will set it (use\n"
565
"--no-remember to avoid setting it). After that, you can omit the\n"
566
"location to use the default. To change the default, use --remember. The\n"
567
"value will only be saved if the remote location can be accessed."
568
msgstr ""
569
"デフォルトのpull対象ブランチが設定されていない場合は、最初にpullした時に\n"
570
"設定されます。(これをしないようにするには、--no-rememberを指定します。)\n"
571
"その後は、デフォルトのブランチを使用する時には指定を省略できるようになり\n"
572
"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモート\n"
573
"ブランチにアクセスできた時だけ保存されます。"
574
575
#: bzrlib/builtins.py:1034
576
msgid ""
577
"The --verbose option will display the revisions pulled using the log_format\n"
578
"configuration option. You can use a different format by overriding it with\n"
579
"-Olog_format=<other_format>."
580
msgstr ""
581
"--verbose オプションは pull されたリビジョンを log_format 設定オプションを\n"
582
"利用して表示します。 -Olog_format=<other_format> と指定することで、\n"
583
"別のフォーマットで表示できます。"
584
585
#: bzrlib/builtins.py:1038
586
msgid ""
587
"Note: The location can be specified either in the form of a branch,\n"
588
"or in the form of a path to a file containing a merge directive generated\n"
589
"with bzr send."
590
msgstr ""
591
"ブランチだけでなく、bzr sendで生成されたマージディレクティブを含むファイル\n"
592
"もpull対象として指定できることに注意してください。"
593
594
#: bzrlib/builtins.py:1046
595
msgid "Show logs of pulled revisions."
596
msgstr "pull対象リビジョンのログを表示します。"
597
598
#: bzrlib/builtins.py:1048
599
msgid ""
600
"Branch to pull into, rather than the one containing the working directory."
601
msgstr "作業フォルダの代わりにpullを受け入れるブランチ"
602
603
#: bzrlib/builtins.py:1051
604
msgid ""
605
"Perform a local pull in a bound branch. Local pulls are not applied to the "
606
"master branch."
607
msgstr "バインドブランチに対してpullする場合に、マスターブランチには反映しないようにします。"
608
609
#: bzrlib/builtins.py:1080
610
msgid "Need working tree for --show-base."
611
msgstr "--show-baseオプションを使用するには作業ツリーが必要です。"
612
613
#: bzrlib/builtins.py:1096
614
msgid "No pull location known or specified."
615
msgstr "pull対象ブランチが指定されていません。"
616
617
#: bzrlib/builtins.py:1102
618
#, python-format
619
msgid "Using saved parent location: %s\n"
620
msgstr "デフォルトの親ブランチを使用します。: %s\n"
621
622
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
623
msgid "Cannot use -r with merge directives or bundles"
624
msgstr "マージディレクティブやバンドルに対して-rを使用することはできません。"
625
626
#: bzrlib/builtins.py:1150
627
msgid "Update a mirror of this branch."
628
msgstr "このブランチのミラーを更新します。"
629
630
#: bzrlib/builtins.py:1152
631
msgid ""
632
"The target branch will not have its working tree populated because this\n"
633
"is both expensive, and is not supported on remote file systems."
634
msgstr ""
635
"対象のブランチの作業ツリーの更新はコストが高く、リモートファイルシステムでは\n"
636
"サポートされていないため、作業ツリーの更新は行いません。"
637
638
#: bzrlib/builtins.py:1155
639
msgid ""
640
"Some smart servers or protocols *may* put the working tree in place in\n"
641
"the future."
642
msgstr ""
643
"将来的に、作業ツリーの更新ができるようなスマートサーバやプロトコルがリリース\n"
644
"*かもしれません*。"
645
646
#: bzrlib/builtins.py:1158
647
msgid ""
648
"This command only works on branches that have not diverged. Branches are\n"
649
"considered diverged if the destination branch's most recent commit is one\n"
650
"that has not been merged (directly or indirectly) by the source branch."
651
msgstr ""
652
"このコマンドは、分岐していないブランチ同士でのみ使用できます。push先ブランチ\n"
653
"の最新のコミットが(直接的、もしくは間接的に)push元のブランチにまだマージされて\n"
654
"いない状態の場合に、ブランチが分岐しているとみなされます。"
655
656
#: bzrlib/builtins.py:1162
657
msgid ""
658
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
659
"the other branch completely, discarding its unmerged changes."
660
msgstr ""
661
"ブランチ同士が分岐している場合、 'bzr push --overwrite' で、まだマージされて\n"
662
"いない変更を破棄してpush先のブランチを完全に置きかえることができます。"
663
664
#: bzrlib/builtins.py:1165
665
msgid ""
666
"If you want to ensure you have the different changes in the other branch,\n"
667
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
668
"After that you will be able to do a push without '--overwrite'."
669
msgstr ""
670
"push先のブランチに違う変更があって、それを残したいなら、まずpush先のブランチ\n"
671
"からマージして(bzr help mergeを参照)コミットしてください。そうすれば、\n"
672
"'--overwrite'の指定なしでpushできるようになります。"
673
674
#: bzrlib/builtins.py:1169
675
msgid ""
676
"If there is no default push location set, the first push will set it (use\n"
677
"--no-remember to avoid setting it). After that, you can omit the\n"
678
"location to use the default. To change the default, use --remember. The\n"
679
"value will only be saved if the remote location can be accessed."
680
msgstr ""
681
"デフォルトのpush対象ブランチが設定されていない場合は、最初にpushした時に\n"
682
"設定されます。(これをしないようにするには、--no-rememberを指定します。)\n"
683
"その後は、デフォルトのブランチを使用する時には指定を省略できるようになり\n"
684
"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモートの\n"
685
"ブランチにアクセスできた時だけ保存されます。"
686
687
#: bzrlib/builtins.py:1174
688
msgid ""
689
"The --verbose option will display the revisions pushed using the log_format\n"
690
"configuration option. You can use a different format by overriding it with\n"
691
"-Olog_format=<other_format>."
692
msgstr ""
693
"--verbose オプションは push されたリビジョンを log_format 設定オプションを\n"
694
"利用して表示します。 -Olog_format=<other_format> と指定することで、\n"
695
"別のフォーマットで表示できます。"
696
697
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
698
msgid ""
699
"Branch to push from, rather than the one containing the working directory."
700
msgstr "カレントディレクトリの代わりにpush元とするブランチを指定します。"
701
702
#: bzrlib/builtins.py:1188
703
msgid ""
704
"By default push will fail if the target directory exists, but does not "
705
"already have a control directory. This flag will allow push to proceed."
706
msgstr ""
707
"デフォルトでは、push先のディレクトリが既に存在しているのにバージョン管理されていない状態の場合はpushできません。このフラグを指定すると、その場合で"
708
"もpushできるようになります。"
709
710
#: bzrlib/builtins.py:1193
711
msgid ""
712
"Create a stacked branch that references the public location of the parent "
713
"branch."
714
msgstr "親ブランチの公開された場所を参照するスタックドブランチを作成します。"
715
716
#: bzrlib/builtins.py:1196
717
msgid ""
718
"Create a stacked branch that refers to another branch for the commit "
719
"history. Only the work not present in the referenced branch is included in "
720
"the branch created."
721
msgstr "コミットの履歴を別のブランチから参照するスタックドブランチを作成します。参照先のブランチにない変更だけがこのブランチに含まれます。"
722
723
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
724
msgid ""
725
"Refuse to push if there are uncommitted changes in the working tree, --no-"
726
"strict disables the check."
727
msgstr ""
728
"作業コピーが変更されている場合はpushできませんが、--no-strictオプションを指定\n"
729
"するとpushできるようになります。"
730
731
#: bzrlib/builtins.py:1204
732
msgid "Don't populate the working tree, even for protocols that support it."
733
msgstr "作業コピーを更新できるプロトコルを使っている場合でも、更新しません。"
734
735
#: bzrlib/builtins.py:1248
736
msgid "Could not determine branch to refer to."
737
msgstr "参照先のブランチを特定できません。"
738
739
#: bzrlib/builtins.py:1257
740
#, python-format
741
msgid ""
742
"No push location known or specified. To push to the parent branch (at %s), "
743
"use 'bzr push :parent'."
744
msgstr ""
745
746
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
747
msgid "No push location known or specified."
748
msgstr "push先のブランチが設定も指定もされていません。"
749
750
#: bzrlib/builtins.py:1267
751
#, python-format
752
msgid "Using saved push location: %s"
753
msgstr "デフォルトのpush先ブランチを使用します。: %s"
754
755
#: bzrlib/builtins.py:1277
756
msgid "Create a new branch that is a copy of an existing branch."
757
msgstr "既存のブランチをコピーして新しいブランチを作成します。"
758
759
#: bzrlib/builtins.py:1279
760
msgid ""
761
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
762
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
763
"./bar.\n"
764
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
765
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
766
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
767
"create ./foo-bar."
768
msgstr ""
769
"TO_LOCATIONが指定されていない場合は、FROM_LOCATIONの最後のパーツが使われます。\n"
770
"つまり、\"branch ../foo/bar\"とした場合は、./barが作られます。\n"
771
"FROM_LOCATIONに、スラッシュやその環境のパスセパレータが含まれていない場合は\n"
772
"FROM_LOCATIONからスキーマやドライブのIDを取り除いたものがTO_LOCATIONになり\n"
773
"ます。例えば、\"branch lp:foo-bar\"とすると、./foo-barが作られます。"
774
775
#: bzrlib/builtins.py:1286
776
msgid ""
777
"To retrieve the branch as of a particular revision, supply the --revision\n"
778
"parameter, as in \"branch foo/bar -r 5\"."
779
msgstr ""
780
"ブランチの特定のリビジョンで取り出したい場合は、\"branch foo/bar -r 5\"の\n"
781
"ように--revisionオプションを指定してください。"
782
783
#: bzrlib/builtins.py:1289
784
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
785
msgstr "このコマンドの別名である'clone'と'get'は廃止予定です。"
786
787
#: bzrlib/builtins.py:1299
788
msgid "Create a branch without a working-tree."
789
msgstr "作業ツリーのないブランチを作成します。"
790
791
#: bzrlib/builtins.py:1301
792
msgid "Switch the checkout in the current directory to the new branch."
793
msgstr "カレントディレクトリにあるチェックアウトの参照先を新しいブランチに切り替えます。"
794
795
#: bzrlib/builtins.py:1304
796
msgid ""
797
"Create a stacked branch referring to the source branch. The new branch will "
798
"depend on the availability of the source branch for all operations."
799
msgstr "元のブランチを参照するスタックドブランチを作成します。新しいブランチでは、元のブランチにアクセスできるときしか操作できません。"
800
801
#: bzrlib/builtins.py:1308
802
msgid "Do not use a shared repository, even if available."
803
msgstr "共有リポジトリが使える場合でも、共有リポジトリを使いません。"
804
805
#: bzrlib/builtins.py:1310
806
msgid ""
807
"By default branch will fail if the target directory exists, but does not "
808
"already have a control directory. This flag will allow branch to proceed."
809
msgstr ""
810
"デフォルトでは、branch先のディレクトリが既に存在しているのにバージョン管理されていない場合はbranchできません。このフラグを指定すると、その場合"
811
"でもbranchできるようになります。"
812
813
#: bzrlib/builtins.py:1315
814
msgid "Bind new branch to from location."
815
msgstr "新しいブランチを元のブランチにバインドします。"
816
817
#: bzrlib/builtins.py:1362
818
#, python-format
819
msgid "Target directory \"%s\" already exists."
820
msgstr "対象のディレクトリ \"%s\" は既に存在します。"
821
822
#: bzrlib/builtins.py:1374
823
#, python-format
824
msgid "Parent of \"%s\" does not exist."
825
msgstr "\"%s\" の親が見つかりません。"
826
827
#: bzrlib/builtins.py:1393
828
msgid "The branch {0} has no revision {1}."
829
msgstr "ブランチ {0} にリビジョン {1} はありません。"
830
831
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
832
#, python-format
833
msgid "Created new stacked branch referring to %s."
834
msgstr "%s を参照するスタックドブランチを作成しました。"
835
836
#: bzrlib/builtins.py:1407
837
#, python-format
838
msgid "Branched %d revision."
839
msgid_plural "Branched %d revisions."
840
msgstr[0] "%d個のリビジョンをブランチしました。"
841
842
#: bzrlib/builtins.py:1412
843
#, python-format
844
msgid "New branch bound to %s"
845
msgstr "新しいブランチは %s にバインドされています。"
846
847
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
848
#, python-format
849
msgid "Switched to branch: %s"
850
msgstr "バインド先をスイッチしました。: %s"
851
852
#: bzrlib/builtins.py:1422
853
msgid "List the branches available at the current location."
854
msgstr "カレントフォルダにある利用可能なブランチをリストアップします。"
855
856
#: bzrlib/builtins.py:1424
857
msgid ""
858
"This command will print the names of all the branches at the current\n"
859
"location."
860
msgstr "このコマンドは、現在の場所にある全てのブランチの名前を表示します。"
861
862
#: bzrlib/builtins.py:1431
863
msgid ""
864
"Recursively scan for branches rather than just looking in the specified "
865
"location."
866
msgstr "指定された場所だけでなく、再帰的にブランチを探します。"
867
868
#: bzrlib/builtins.py:1461
869
msgid "(default)"
870
msgstr ""
871
872
#: bzrlib/builtins.py:1473
873
msgid "Create a new checkout of an existing branch."
874
msgstr "既存のブランチのチェックアウトを新しく作成します。"
875
876
#: bzrlib/builtins.py:1475
877
msgid ""
878
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
879
"for\n"
880
"the branch found in '.'. This is useful if you have removed the working "
881
"tree\n"
882
"or if it was never created - i.e. if you pushed the branch to its current\n"
883
"location using SFTP."
884
msgstr ""
885
"BLANCH_LOCATIONが指定されていない場合は、'.'にあるブランチを再構成します。\n"
886
"これは、作業ツリーを消してしまった場合や、そもそも作業ツリーが作成されて\n"
887
"いない場合(例えば、SFTPでpushされたブランチなど)に役立ちます。"
888
889
#: bzrlib/builtins.py:1480
890
msgid ""
891
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
892
"will\n"
893
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
894
"./bar.\n"
895
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
896
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
897
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
898
"create ./foo-bar."
899
msgstr ""
900
"TO_LOCATIONが指定されていない場合は、BRANCH_LOCATIONの最後のパーツが使われ\n"
901
"ます。つまり、\"checkout ../foo/bar\"とした場合は、.barが作られます。\n"
902
"BRANCH_LOCATIONに、スラッシュやその環境のパスセパレータが含まれていない場合は\n"
903
"BRANCH_LOCATIONからスキーマやドライブのIDを取り除いたものがTO_LOCATIONになり\n"
904
"ます。例えば、\"branch lp:foo-bar\"とすると、./foo-barが作られます。"
905
906
#: bzrlib/builtins.py:1487
907
msgid ""
908
"To retrieve the branch as of a particular revision, supply the --revision\n"
909
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
910
"immediately\n"
911
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
912
"old\n"
913
"code.)"
914
msgstr ""
915
"ブランチの特定のリビジョンで取り出したい場合は、\"checkout foo/bar -r 5\"の\n"
916
"ように--revisionオプションを指定してください。その場合は作業コピーが古い状態に\n"
917
"なるため、コミットはできませんが、例えば古いコードをチェックする場合などに\n"
918
"役立ちます。"
919
920
#: bzrlib/builtins.py:1497
921
msgid ""
922
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
923
"the branch for every operation. Normal checkouts can perform common "
924
"operations like diff and status without such access, and also support local "
925
"commits."
926
msgstr ""
927
"軽量チェックアウトを作成します。軽量チェックアウト上での操作には、チェック\n"
928
"アウト元のブランチにアクセスできる必要があります。通常のチェックアウトの\n"
929
"場合は、diffやstatusのような一般的な操作ではその必要はありませんし、ローカル\n"
930
"コミットすることもできます。"
931
932
#: bzrlib/builtins.py:1504
933
msgid "Get file contents from this tree."
934
msgstr "ファイルの内容をこのツリーから取得します。"
935
936
#: bzrlib/builtins.py:1506
937
msgid "Hard-link working tree files where possible."
938
msgstr "可能なら、作業コピーをハードリンクします。"
939
940
#: bzrlib/builtins.py:1547
941
msgid ""
942
"Show list of renamed files.\n"
943
" "
944
msgstr ""
945
"変名されたファイルをリストアップします。\n"
946
" "
947
948
#: bzrlib/builtins.py:1577
949
msgid "Update a working tree to a new revision."
950
msgstr "作業ツリーを新しいリビジョンに更新します。"
951
952
#: bzrlib/builtins.py:1579
953
msgid ""
954
"This will perform a merge of the destination revision (the tip of the\n"
955
"branch, or the specified revision) into the working tree, and then make\n"
956
"that revision the basis revision for the working tree. "
957
msgstr ""
958
"移動先のリビジョン(ブランチのTipもしくは指定されたリビジョン)を作業ツリーに\n"
959
"マージして、そのリビジョンを作業ツリーのベースリビジョンに設定します。 "
960
961
#: bzrlib/builtins.py:1583
962
msgid ""
963
"You can use this to visit an older revision, or to update a working tree\n"
964
"that is out of date from its branch."
965
msgstr ""
966
"古いリビジョンに一時的に移動したり、ブランチより古くなってしまった作業ツリーを\n"
967
"最新の状態にしたりすることができます。"
968
969
#: bzrlib/builtins.py:1586
970
msgid ""
971
"If there are any uncommitted changes in the tree, they will be carried\n"
972
"across and remain as uncommitted changes after the update. To discard\n"
973
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
974
"with the changes brought in by the change in basis revision."
975
msgstr ""
976
"作業ツリーにコミットされていない変更があった場合、その変更は update 後も\n"
977
"コミットされていない変更として残ります。これらの変更を取り消すには、\n"
978
"'bzr revert' コマンドを利用してください。コミットされていない変更は、ベース\n"
979
"リビジョンの更新による変更とコンフリクトする可能性があります。"
980
981
#: bzrlib/builtins.py:1591
982
msgid ""
983
"If the tree's branch is bound to a master branch, bzr will also update\n"
984
"the branch from the master."
985
msgstr ""
986
"作業ツリーのブランチがマスターブランチに束縛されている場合、bzrは\n"
987
"作業ツリーのブランチもマスターブランチの状態に更新します。"
988
989
#: bzrlib/builtins.py:1594
990
msgid ""
991
"You cannot update just a single file or directory, because each Bazaar\n"
992
"working tree has just a single basis revision. If you want to restore a\n"
993
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
994
"update'. If you want to restore a file to its state in a previous\n"
995
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
996
"out the old content of that file to a new location."
997
msgstr ""
998
"Bazaarの作業ツリーはそれぞれベースリビジョンをひとつだけ持っているので、\n"
999
"ファイルやディレクトリを個別に更新することはできません。もし、手元で削除して\n"
1000
"しまったファイルを元に戻したいのであれば、'bzr update'ではなく'bzr revert'を\n"
1001
"使ってください。もし、ファイルを前のバージョンの状態に戻したいのであれば、\n"
1002
"'bzr revert'に -r オプションを指定するか、'bzr cat'を使って古い内容を書き出して\n"
1003
"ください。"
1004
1005
#: bzrlib/builtins.py:1601
1006
msgid ""
1007
"The 'dir' argument, if given, must be the location of the root of a\n"
1008
"working tree to update. By default, the working tree that contains the \n"
1009
"current working directory is used."
1010
msgstr ""
1011
"dir 引数を指定する場合は、作業ツリーのルートを指定する必要があります。\n"
1012
"デフォルトでは、カレントディレクトリを含む作業ツリーが選択されます。"
1013
1014
#: bzrlib/builtins.py:1617
1015
msgid "bzr update --revision takes exactly one revision"
1016
msgstr "bzr update --revisionには、リビジョンをひとつだけ指定します。"
1017
1018
#: bzrlib/builtins.py:1625
1019
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1020
msgstr "bzr updateは、個々のファイルやディレクトリではなく、作業ツリー全体を更新します。"
1021
1022
#: bzrlib/builtins.py:1656
1023
msgid "Tree is up to date at revision {0} of branch {1}"
1024
msgstr "ツリーはブランチ {1} のリビジョン {0} で最新の状態です。"
1025
1026
#: bzrlib/builtins.py:1672
1027
#, python-format
1028
msgid ""
1029
"branch has no revision %s\n"
1030
"bzr update --revision only works for a revision in the branch history"
1031
msgstr ""
1032
"ブランチには%sというリビジョンはありません。\n"
1033
"bzr update --revisionには、ブランチ内のリビジョンを指定する必要があります。"
1034
1035
#: bzrlib/builtins.py:1678
1036
msgid "Updated to revision {0} of branch {1}"
1037
msgstr "ブランチ {1} のリビジョン {0} に更新されました。"
1038
1039
#: bzrlib/builtins.py:1682
1040
msgid ""
1041
"Your local commits will now show as pending merges with 'bzr status', and "
1042
"can be committed with 'bzr commit'."
1043
msgstr "ローカルで行った変更は、'bzr status'ではマージ中状態になっており、'bzr commit'でコミットできます。"
1044
1045
#: bzrlib/builtins.py:1691
1046
msgid "Show information about a working tree, branch or repository."
1047
msgstr "作業コピー、ブランチ、リポジトリの情報を表示します。"
1048
1049
#: bzrlib/builtins.py:1693
1050
msgid ""
1051
"This command will show all known locations and formats associated to the\n"
1052
"tree, branch or repository."
1053
msgstr ""
1054
"このコマンドは、ツリー、ブランチ、リポジトリに関連する所在やフォーマット\n"
1055
"のすべての情報を表示します。"
1056
1057
#: bzrlib/builtins.py:1696
1058
msgid ""
1059
"In verbose mode, statistical information is included with each report.\n"
1060
"To see extended statistic information, use a verbosity level of 2 or\n"
1061
"higher by specifying the verbose option multiple times, e.g. -vv."
1062
msgstr ""
1063
"verboseモードでは、それぞれのレポートに統計情報が追加されます。さらに\n"
1064
"高度な統計情報を見るには、-vvのようにverboseオプションを複数回指定する\n"
1065
"ことによって、verboseレベル2以上を指定してください。"
1066
1067
#: bzrlib/builtins.py:1700
1068
msgid "Branches and working trees will also report any missing revisions."
1069
msgstr "ブランチと作業ツリーについては、存在しないリビジョンについても表示されます。"
1070
1071
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
1072
#: bzrlib/builtins.py:6389
1073
msgid ":Examples:"
1074
msgstr ":例:"
1075
1076
#: bzrlib/builtins.py:1704
1077
msgid " Display information on the format and related locations:"
1078
msgstr " フォーマットと関連する場所についての情報を表示します。"
1079
1080
#: bzrlib/builtins.py:1706
1081
msgid " bzr info"
1082
msgstr " bzr info"
1083
1084
#: bzrlib/builtins.py:1708
1085
msgid ""
1086
" Display the above together with extended format information and\n"
1087
" basic statistics (like the number of files in the working tree and\n"
1088
" number of revisions in the branch and repository):"
1089
msgstr ""
1090
" より詳細なフォーマット情報と、基本的な統計情報(作業ツリー内のファイルの\n"
1091
" 数、ブランチ、リポジトリ内のリビジョンの数など)を一緒に表示します。:"
1092
1093
#: bzrlib/builtins.py:1712
1094
msgid " bzr info -v"
1095
msgstr " bzr info -v"
1096
1097
#: bzrlib/builtins.py:1714
1098
msgid " Display the above together with number of committers to the branch:"
1099
msgstr " さらに、このブランチにコミットした人の数も表示します。:"
1100
1101
#: bzrlib/builtins.py:1716
1102
msgid " bzr info -vv"
1103
msgstr " bzr info -vv"
1104
1105
#: bzrlib/builtins.py:1735
1106
msgid "Remove files or directories."
1107
msgstr "ファイルやディレクトリを削除します。"
1108
1109
#: bzrlib/builtins.py:1737
1110
msgid ""
1111
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1112
"delete them if they can easily be recovered using revert otherwise they\n"
1113
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1114
"parameters are given Bazaar will scan for files that are being tracked by\n"
1115
"Bazaar but missing in your tree and stop tracking them for you."
1116
msgstr ""
1117
"このコマンドで指定されたファイルの変更をBazaarは管理しなくなります。\n"
1118
"revertでファイルが簡単に復活できる場合は、ファイルは削除されますし、そうで\n"
1119
"ない場合はバックアップ(.~#~という形式の拡張子がつきます)されます。オプション\n"
1120
"やパラメータが指定されていない場合は、バージョン管理されているけれどツリー\n"
1121
"削除されているファイルを探して、そのファイルのバージョン管理を止めます。"
1122
1123
#: bzrlib/builtins.py:1745
1124
msgid "Only remove files that have never been committed."
1125
msgstr "まだコミットされていないファイルだけを削除します。"
1126
1127
#: bzrlib/builtins.py:1747
1128
msgid "The file deletion mode to be used."
1129
msgstr "使用するファイル削除モードです。"
1130
1131
#: bzrlib/builtins.py:1748
1132
msgid "Deletion Strategy"
1133
msgstr "削除モード"
1134
1135
#: bzrlib/builtins.py:1749
1136
msgid "Backup changed files (default)."
1137
msgstr "変更したファイルをバックアップします。"
1138
1139
#: bzrlib/builtins.py:1750
1140
msgid "Delete from bzr but leave the working copy."
1141
msgstr "Bazaarからは削除しますが、作業ツリーには残します。"
1142
1143
#: bzrlib/builtins.py:1751
1144
msgid "Don't backup changed files."
1145
msgstr "変更されたファイルをバックアップしません。"
1146
1147
#: bzrlib/builtins.py:1752
1148
msgid ""
1149
"Delete all the specified files, even if they can not be recovered and even "
1150
"if they are non-empty directories. (deprecated, use no-backup)"
1151
msgstr ""
1152
"元に戻せないファイル、空ではないディレクトリも含めて、指定されたアイテムを全て削除します。(廃止予定。no-backupを使用してください)"
1153
1154
#: bzrlib/builtins.py:1761
1155
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1156
msgstr "(--forceオプションは廃止予定です。今後は--no-backupを使用してください)"
1157
1158
#: bzrlib/builtins.py:1778
1159
msgid "No matching files."
1160
msgstr "対象のファイルはありませんでした。"
1161
1162
#: bzrlib/builtins.py:1839
1163
msgid "Reconcile bzr metadata in a branch."
1164
msgstr "ブランチ内のBazaarのメタデータを修復します。"
1165
1166
#: bzrlib/builtins.py:1841
1167
msgid ""
1168
"This can correct data mismatches that may have been caused by\n"
1169
"previous ghost operations or bzr upgrades. You should only\n"
1170
"need to run this command if 'bzr check' or a bzr developer\n"
1171
"advises you to run it."
1172
msgstr ""
1173
"このコマンドで、オペレーションの失敗やBzrのアップグレードによってできた\n"
1174
"と思われるデータの不整合を修正することができます。'bzr check'の結果や、\n"
1175
"Bzrの開発者からの指示があるとき以外は、実行する必要はありません。"
1176
1177
#: bzrlib/builtins.py:1846
1178
msgid ""
1179
"If a second branch is provided, cross-branch reconciliation is\n"
1180
"also attempted, which will check that data like the tree root\n"
1181
"id which was not present in very early bzr versions is represented\n"
1182
"correctly in both branches."
1183
msgstr ""
1184
"２番目のブランチが指定された場合は、クロスブランチ修復を行います。\n"
1185
"これは、ツリーのルートIDのような、非常に古いバージョンのBzrにはなかった\n"
1186
"データが、両方のブランチに正しく表現されているかをチェックします。"
1187
1188
#: bzrlib/builtins.py:1851
1189
msgid ""
1190
"At the same time it is run it may recompress data resulting in\n"
1191
"a potential saving in disk space or performance gain."
1192
msgstr ""
1193
"同時に、ディスクスペースの節約やパフォーマンスの向上のために、データの\n"
1194
"再圧縮がかかる可能性があります。"
1195
1196
#: bzrlib/builtins.py:1854
1197
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1198
msgstr ""
1199
"ブランチは、ローカルディスクやsftpのような、リスト可能なシステム上に\n"
1200
"ある*必要があります*。"
1201
1202
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1203
msgid ""
1204
"Format for the bzr 2.0 series.\n"
1205
"Uses group-compress storage.\n"
1206
"Provides rich roots which are a one-way transition.\n"
1207
msgstr ""
1208
"bzr 2.0 シリーズのためのフォーマット。\n"
1209
"group-compress ストレージを利用します。\n"
1210
"rich root 機能を提供します。 rich root 機能を提供するフォーマットに変換すると、\n"
1211
"rich root 機能を持たないフォーマットに戻ることはできません。\n"
1212
1213
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1214
msgid ""
1215
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1216
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1217
msgstr ""
1218
1219
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1220
msgid "The 2a format with experimental support for colocated branches.\n"
1221
msgstr "colocated branch を実験的にサポートする 2a フォーマット。\n"
1222
1223
#: bzrlib/builtins.py:1922
1224
msgid "Make a directory into a versioned branch."
1225
msgstr "ディレクトリを、バージョン管理されたブランチにします。"
1226
1227
#: bzrlib/builtins.py:1924
1228
msgid ""
1229
"Use this to create an empty branch, or before importing an\n"
1230
"existing project."
1231
msgstr ""
1232
"空のブランチを作る場合や、既存のプロジェクトをインポートする前にこの\n"
1233
"コマンドを使用します。"
1234
1235
#: bzrlib/builtins.py:1927
1236
msgid ""
1237
"If there is a repository in a parent directory of the location, then\n"
1238
"the history of the branch will be stored in the repository. Otherwise\n"
1239
"init creates a standalone branch which carries its own history\n"
1240
"in the .bzr directory."
1241
msgstr ""
1242
"親ディレクトリにリポジトリがある場合は、ブランチ内の履歴はリポジトリに\n"
1243
"保存されます。そうでない場合は、履歴を.bzrディレクトリ内に持つスタンド\n"
1244
"アロンブランチが作成されます。"
1245
1246
#: bzrlib/builtins.py:1932
1247
msgid ""
1248
"If there is already a branch at the location but it has no working tree,\n"
1249
"the tree can be populated with 'bzr checkout'."
1250
msgstr ""
1251
"既にブランチがあって、作業ツリーがない場合は、'bzr checkout'でツリーを\n"
1252
"生成することができます。"
1253
1254
#: bzrlib/builtins.py:1935
1255
msgid "Recipe for importing a tree of files::"
1256
msgstr "ファイルのツリーをインポートするためのレシピ::"
1257
1258
#: bzrlib/builtins.py:1937
1259
msgid ""
1260
" cd ~/project\n"
1261
" bzr init\n"
1262
" bzr add .\n"
1263
" bzr status\n"
1264
" bzr commit -m \"imported project\""
1265
msgstr ""
1266
" cd ~/project\n"
1267
" bzr init\n"
1268
" bzr add .\n"
1269
" bzr status\n"
1270
" bzr commit -m \"imported project\""
1271
1272
#: bzrlib/builtins.py:1948
1273
msgid ""
1274
"Create the path leading up to the branch if it does not already exist."
1275
msgstr "ブランチまでのパスが存在していなければ、作成します。"
1276
1277
#: bzrlib/builtins.py:1951
1278
msgid "Specify a format for this branch. See \"help formats\"."
1279
msgstr "ブランチのフォーマットを指定します。\"help formats\"をご覧ください。"
1280
1281
#: bzrlib/builtins.py:1959
1282
msgid ""
1283
"Never change revnos or the existing log. Append revisions to it only."
1284
msgstr "リビジョン番号や既存のログを変更せず、リビジョンの追加だけを行います。"
1285
1286
#: bzrlib/builtins.py:1962
1287
msgid "Create a branch without a working tree."
1288
msgstr "作業ツリーをもたないブランチを作成します。"
1289
1290
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1291
#, python-format
1292
msgid ""
1293
"Parent directory of %s does not exist.\n"
1294
"You may supply --create-prefix to create all leading parent directories."
1295
msgstr ""
1296
"%s の親ディレクトリがありません。\n"
1297
"--create-prefixを指定すれば、親ディレクトリも作成されます。"
1298
1299
#: bzrlib/builtins.py:2016
1300
msgid ""
1301
"This branch format cannot be set to append-revisions-only. Try --default."
1302
msgstr "このブランチフォーマットにappend-revisions-onlyは指定できません。--defaultを試してください。"
1303
1304
#: bzrlib/builtins.py:2027
1305
msgid "Created a {0} (format: {1})\n"
1306
msgstr "{0}を作成しました。(フォーマット:{1})\n"
1307
1308
#: bzrlib/builtins.py:2036
1309
#, python-format
1310
msgid "Using shared repository: %s\n"
1311
msgstr "共有リポジトリを使用しました。: %s\n"
1312
1313
#: bzrlib/builtins.py:2040
1314
msgid "Create a shared repository for branches to share storage space."
1315
msgstr "ブランチのストレージを共有するための共有リポジトリを作成します。"
1316
1317
#: bzrlib/builtins.py:2042
1318
msgid ""
1319
"New branches created under the repository directory will store their\n"
1320
"revisions in the repository, not in the branch directory. For branches\n"
1321
"with shared history, this reduces the amount of storage needed and \n"
1322
"speeds up the creation of new branches."
1323
msgstr ""
1324
"リポジトリのディレクトリの配下に新しく作られたブランチは、リビジョンを\n"
1325
"ブランチのディレクトリではなくリポジトリに保存します。リビジョンを共有\n"
1326
"しているブランチ同士のストレージサイズが節約され、新しいブランチを作成\n"
1327
"するスピードも速くなります。"
1328
1329
#: bzrlib/builtins.py:2047
1330
msgid ""
1331
"If the --no-trees option is given then the branches in the repository\n"
1332
"will not have working trees by default. They will still exist as \n"
1333
"directories on disk, but they will not have separate copies of the \n"
1334
"files at a certain revision. This can be useful for repositories that\n"
1335
"store branches which are interacted with through checkouts or remote\n"
1336
"branches, such as on a server."
1337
msgstr ""
1338
"--no-treesオプションが指定された場合は、リポジトリ内に作成されたブランチ\n"
1339
"にはデフォルトでは作業ツリーができません。ディスク上にディレクトリとしては\n"
1340
"ありますが、特定リビジョンのファイルのコピーを個々に持つことはありません。\n"
1341
"これは、サーバー上のリポジトリなど、チェックアウトやリモートブランチとやりとり\n"
1342
"するリポジトリの場合に役立ちます。"
1343
1344
#: bzrlib/builtins.py:2054
1345
msgid ""
1346
":Examples:\n"
1347
" Create a shared repository holding just branches::"
1348
msgstr ""
1349
":例:\n"
1350
" ブランチだけをもつリポジトリを作成します。::"
1351
1352
#: bzrlib/builtins.py:2057
1353
msgid ""
1354
" bzr init-repo --no-trees repo\n"
1355
" bzr init repo/trunk"
1356
msgstr ""
1357
" bzr init-repo --no-trees repo\n"
1358
" bzr init repo/trunk"
1359
1360
#: bzrlib/builtins.py:2060
1361
msgid " Make a lightweight checkout elsewhere::"
1362
msgstr " 別の場所に軽量チェックアウトを作成します。::"
1363
1364
#: bzrlib/builtins.py:2062
1365
msgid ""
1366
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1367
" cd trunk-checkout\n"
1368
" (add files here)"
1369
msgstr ""
1370
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1371
" cd trunk-checkout\n"
1372
" (ここでファイルを追加)"
1373
1374
#: bzrlib/builtins.py:2070
1375
msgid ""
1376
"Specify a format for this repository. See \"bzr help formats\" for details."
1377
msgstr "リポジトリのフォーマットを指定します。詳しくは\"bzr help formats\"をご覧ください。"
1378
1379
#: bzrlib/builtins.py:2074
1380
msgid "Repository format"
1381
msgstr "リポジトリフォーマット"
1382
1383
#: bzrlib/builtins.py:2076
1384
msgid "Branches in the repository will default to not having a working tree."
1385
msgstr "リポジトリ内のブランチにはデフォルトでは作業ツリーを持たせません。"
1386
1387
#: bzrlib/builtins.py:2102
1388
msgid "Show differences in the working tree, between revisions or branches."
1389
msgstr "作業ツリーや、リビジョン、ブランチ間の差分を表示します。"
1390
1391
#: bzrlib/builtins.py:2104
1392
msgid ""
1393
"If no arguments are given, all changes for the current tree are listed.\n"
1394
"If files are given, only the changes in those files are listed.\n"
1395
"Remote and multiple branches can be compared by using the --old and\n"
1396
"--new options. If not provided, the default for both is derived from\n"
1397
"the first argument, if any, or the current tree if no arguments are\n"
1398
"given."
1399
msgstr ""
1400
"引数が指定されなかった場合は、現在のツリーのすべての変更が表示されます。\n"
1401
"ファイルが指定された場合は、そのファイルの変更だけが表示されます。\n"
1402
"リモートブランチや、複数のブランチを -oldと-newオプションで指定することが\n"
1403
"できます。これらが指定されていない場合は最初の引数が使われ、引数が無い\n"
1404
"場合は作業ツリーが対象になります。"
1405
1406
#: bzrlib/builtins.py:2111
1407
msgid ""
1408
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1409
"produces patches suitable for \"patch -p1\"."
1410
msgstr ""
1411
"\"bzr dif -p1\"は、\"bzr diff --prefix old/:new/\" と同じで、\"patch -p1\"に\n"
1412
"準じたパッチを出力します。"
1413
1414
#: bzrlib/builtins.py:2114
1415
msgid ""
1416
"Note that when using the -r argument with a range of revisions, the\n"
1417
"differences are computed between the two specified revisions. That\n"
1418
"is, the command does not show the changes introduced by the first \n"
1419
"revision in the range. This differs from the interpretation of \n"
1420
"revision ranges used by \"bzr log\" which includes the first revision\n"
1421
"in the range."
1422
msgstr ""
1423
"-rオプションでリビジョンの範囲を指定した場合は、その２つのリビジョン間での\n"
1424
"差分が取得されることに注意してください。つまり、リビジョンの範囲の開始\n"
1425
"リビジョンでの変更は含まれません。これは、\"bzr log\"にリビジョンの範囲を\n"
1426
"指定した場合の動作(開始リビジョンも含む)とは異なります。"
1427
1428
#: bzrlib/builtins.py:2121
1429
msgid ""
1430
":Exit values:\n"
1431
" 1 - changed\n"
1432
" 2 - unrepresentable changes\n"
1433
" 3 - error\n"
1434
" 0 - no change"
1435
msgstr ""
1436
":Exit values:\n"
1437
" 1 - 変更あり\n"
1438
" 2 - 表示できない変更\n"
1439
" 3 - エラー\n"
1440
" 0 - 変更なし"
1441
1442
#: bzrlib/builtins.py:2127
1443
msgid ""
1444
":Examples:\n"
1445
" Shows the difference in the working tree versus the last commit::"
1446
msgstr ""
1447
":例:\n"
1448
" 最新のコミットと作業ツリーとの間の変更を表示します。::"
1449
1450
#: bzrlib/builtins.py:2130
1451
msgid " bzr diff"
1452
msgstr " bzr diff"
1453
1454
#: bzrlib/builtins.py:2132
1455
msgid " Difference between the working tree and revision 1::"
1456
msgstr " 作業ツリーとリビジョン１を比較します。::"
1457
1458
#: bzrlib/builtins.py:2134
1459
msgid " bzr diff -r1"
1460
msgstr " bzr diff -r1"
1461
1462
#: bzrlib/builtins.py:2136
1463
msgid " Difference between revision 3 and revision 1::"
1464
msgstr " リビジョン３とリビジョン１を比較します。::"
1465
1466
#: bzrlib/builtins.py:2138
1467
msgid " bzr diff -r1..3"
1468
msgstr " bzr diff -r1..3"
1469
1470
#: bzrlib/builtins.py:2140
1471
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1472
msgstr " ブランチxxxのリビジョン３とリビジョン１を比較します。::"
1473
1474
#: bzrlib/builtins.py:2142
1475
msgid " bzr diff -r1..3 xxx"
1476
msgstr " bzr diff -r1..3 xxx"
1477
1478
#: bzrlib/builtins.py:2144
1479
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1480
msgstr " リビジョン２での変更です。(-r1..2 と同じです。)::"
1481
1482
#: bzrlib/builtins.py:2146
1483
msgid " bzr diff -c2"
1484
msgstr " bzr diff -c2"
1485
1486
#: bzrlib/builtins.py:2148
1487
msgid ""
1488
" To see the changes introduced by revision X::\n"
1489
" \n"
1490
" bzr diff -cX"
1491
msgstr ""
1492
" リビジョンXでの変更を見るには、::\n"
1493
" \n"
1494
" bzr diff -cX"
1495
1496
#: bzrlib/builtins.py:2152
1497
msgid ""
1498
" Note that in the case of a merge, the -c option shows the changes\n"
1499
" compared to the left hand parent. To see the changes against\n"
1500
" another parent, use::"
1501
msgstr ""
1502
" マージされたリビジョンの場合は、-cオプションは左側の親からの変更を表示する\n"
1503
" ことに注意してください。他の親からの変更を見るには、以下のようにします。::"
1504
1505
#: bzrlib/builtins.py:2156
1506
msgid " bzr diff -r<chosen_parent>..X"
1507
msgstr " bzr diff -r<対象の親リビジョン>..X"
1508
1509
#: bzrlib/builtins.py:2158
1510
msgid ""
1511
" The changes between the current revision and the previous revision\n"
1512
" (equivalent to -c-1 and -r-2..-1)"
1513
msgstr " 現在のリビジョンと一つ前のリビジョンとの差分です。(-c-1 、 -r-2..-1 と同じ)"
1514
1515
#: bzrlib/builtins.py:2161
1516
msgid " bzr diff -r-2.."
1517
msgstr " bzr diff -r-2.."
1518
1519
#: bzrlib/builtins.py:2163
1520
msgid " Show just the differences for file NEWS::"
1521
msgstr " ファイルNEWSの変更だけを表示します。::"
1522
1523
#: bzrlib/builtins.py:2165
1524
msgid " bzr diff NEWS"
1525
msgstr " bzr diff NEWS"
1526
1527
#: bzrlib/builtins.py:2167
1528
msgid " Show the differences in working tree xxx for file NEWS::"
1529
msgstr " 作業ツリーxxxの、ファイルNEWSの変更内容を表示します。::"
1530
1531
#: bzrlib/builtins.py:2169
1532
msgid " bzr diff xxx/NEWS"
1533
msgstr " bzr diff xxx/NEWS"
1534
1535
#: bzrlib/builtins.py:2171
1536
msgid " Show the differences from branch xxx to this working tree:"
1537
msgstr " ブランチxxxと作業ツリーとの間の差分を表示します。::"
1538
1539
#: bzrlib/builtins.py:2173
1540
msgid " bzr diff --old xxx"
1541
msgstr " bzr diff --old xxx"
1542
1543
#: bzrlib/builtins.py:2175
1544
msgid " Show the differences between two branches for file NEWS::"
1545
msgstr " ２つのブランチ間での、ファイルNEWSの差分を表示します。::"
1546
1547
#: bzrlib/builtins.py:2177
1548
msgid " bzr diff --old xxx --new yyy NEWS"
1549
msgstr " bzr diff --old xxx --new yyy NEWS"
1550
1551
#: bzrlib/builtins.py:2179
1552
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1553
msgstr " 'bzr diff'と同じですが、プレフィックスold/、new/を付加します。::"
1554
1555
#: bzrlib/builtins.py:2181
1556
msgid ""
1557
" bzr diff --prefix old/:new/\n"
1558
" \n"
1559
" Show the differences using a custom diff program with options::\n"
1560
" \n"
1561
" bzr diff --using /usr/bin/diff --diff-options -wu"
1562
msgstr ""
1563
" bzr diff --prefix old/:new/\n"
1564
" \n"
1565
" カスタムのdiffプログラムにオプションを指定して、差分を表示します。::\n"
1566
" \n"
1567
" bzr diff --using /usr/bin/diff --diff-options -wu"
1568
1569
#: bzrlib/builtins.py:2191
1570
msgid "Pass these options to the external diff program."
1571
msgstr "これらのオプションは外部のdiffプログラムに渡されます。"
1572
1573
#: bzrlib/builtins.py:2194
1574
msgid ""
1575
"Set prefixes added to old and new filenames, as two values separated by a "
1576
"colon. (eg \"old/:new/\")."
1577
msgstr "古いファイル名と新しいファイル名にプレフィックスを追加します。２つの値をコロンで区切って指定します。(例 \"old/:new/\")"
1578
1579
#: bzrlib/builtins.py:2197
1580
msgid "Branch/tree to compare from."
1581
msgstr "比較元のブランチ/作業ツリーです。"
1582
1583
#: bzrlib/builtins.py:2201
1584
msgid "Branch/tree to compare to."
1585
msgstr "比較先のブランチ/作業ツリーです。"
1586
1587
#: bzrlib/builtins.py:2207
1588
msgid "Use this command to compare files."
1589
msgstr "ファイル比較に使うコマンドです。"
1590
1591
#: bzrlib/builtins.py:2212
1592
msgid "Diff format to use."
1593
msgstr "使用するDiffフォーマットです。"
1594
1595
#: bzrlib/builtins.py:2214
1596
msgid "Diff format"
1597
msgstr "Diffフォーマット"
1598
1599
#: bzrlib/builtins.py:2236
1600
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1601
msgstr "--prefix は２つの値をコロンで区切ったものにしてください。 (例 \"old/:new/\")"
1602
1603
#: bzrlib/builtins.py:2240
1604
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1605
msgstr "bzr diff --revision には１つまたは２つのリビジョンを指定してください。"
1606
1607
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1608
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1609
msgid "{0} and {1} are mutually exclusive"
1610
msgstr "{0} と {1} を同時に指定することはできません。"
1611
1612
#: bzrlib/builtins.py:2265
1613
msgid ""
1614
"List files deleted in the working tree.\n"
1615
" "
1616
msgstr ""
1617
"作業ツリー上で削除されたファイルをリストアップします。\n"
1618
" "
1619
1620
#: bzrlib/builtins.py:2343
1621
msgid "Show the tree root directory."
1622
msgstr "ツリーのルートディレクトリを表示します。"
1623
1624
#: bzrlib/builtins.py:2345
1625
msgid ""
1626
"The root is the nearest enclosing directory with a .bzr control\n"
1627
"directory."
1628
msgstr "ルートとは、.bzr管理ディレクトリを持つ、一番近い上位ディレクトリのことです。"
1629
1630
#: bzrlib/builtins.py:2360
1631
msgid "The limit argument must be an integer."
1632
msgstr "limitは整数でなければなりません。"
1633
1634
#: bzrlib/builtins.py:2368
1635
msgid "The levels argument must be an integer."
1636
msgstr "levelsは整数でなければなりません。"
1637
1638
#: bzrlib/builtins.py:2373
1639
msgid "Show historical log for a branch or subset of a branch."
1640
msgstr "ブランチ、もしくはブランチの一部の履歴ログを表示します。"
1641
1642
#: bzrlib/builtins.py:2375
1643
msgid ""
1644
"log is bzr's default tool for exploring the history of a branch.\n"
1645
"The branch to use is taken from the first parameter. If no parameters\n"
1646
"are given, the branch containing the working directory is logged.\n"
1647
"Here are some simple examples::"
1648
msgstr ""
1649
"logは、ブランチの履歴を見るためのbzrのデフォルトのツールです。\n"
1650
"対象のブランチは１つ目の引数で指定します。引数が指定されていなければ、\n"
1651
"作業ディレクトリを含むブランチの履歴が表示されます。\n"
1652
"簡単な例を以下に示します。::"
1653
1654
#: bzrlib/builtins.py:2380
1655
msgid ""
1656
" bzr log log the current branch\n"
1657
" bzr log foo.py log a file in its branch\n"
1658
" bzr log http://server/branch log a branch on a server"
1659
msgstr ""
1660
" bzr log は、現在のブランチの履歴を表示します。\n"
1661
" bzr log foo,py は、ブランチ内のファイルの履歴を表示します。\n"
1662
" bzr log http://server/branch は、サーバ上のブランチのログを表示します。"
1663
1664
#: bzrlib/builtins.py:2384
1665
msgid ""
1666
"The filtering, ordering and information shown for each revision can\n"
1667
"be controlled as explained below. By default, all revisions are\n"
1668
"shown sorted (topologically) so that newer revisions appear before\n"
1669
"older ones and descendants always appear before ancestors. If displayed,\n"
1670
"merged revisions are shown indented under the revision in which they\n"
1671
"were merged."
1672
msgstr ""
1673
"フィルタリング、並び替え、各リビジョンに表示する情報については、以下のように\n"
1674
"変更できます。デフォルトでは、全てのリビジョンが(トポロジカルに)ソートされ、\n"
1675
"新しいリビジョンは古いリビジョンより前に、子孫のリビジョンは先祖より前に配置\n"
1676
"されます。マージされたリビジョンを表示する場合は、マージ先のリビジョンよりも\n"
1677
"インデントされて表示されます。"
1678
1679
#: bzrlib/builtins.py:2391
1680
msgid ":Output control:"
1681
msgstr ":出力のコントロール:"
1682
1683
#: bzrlib/builtins.py:2393
1684
msgid ""
1685
" The log format controls how information about each revision is\n"
1686
" displayed. The standard log formats are called ``long``, ``short``\n"
1687
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1688
" for more details on log formats."
1689
msgstr ""
1690
" ログフォーマットの指定によって、各リビジョンの情報がどう表示されるかを\n"
1691
" コントロールします。標準のログフォーマットには ``long`` 、``short`` 、 ``line``\n"
1692
" があります。デフォルトはlongです。ログフォーマットについての詳細は\n"
1693
" ``bzr help log-formats`` をご覧ください。"
1694
1695
#: bzrlib/builtins.py:2398
1696
msgid ""
1697
" The following options can be used to control what information is\n"
1698
" displayed::"
1699
msgstr " 以下のオプションで、どの情報を表示するかをコントロールできます。"
1700
1701
#: bzrlib/builtins.py:2401
1702
msgid ""
1703
" -l N display a maximum of N revisions\n"
1704
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1705
" -v display a status summary (delta) for each revision\n"
1706
" -p display a diff (patch) for each revision\n"
1707
" --show-ids display revision-ids (and file-ids), not just revnos"
1708
msgstr ""
1709
" -l N 最大N個のリビジョンを表示します。\n"
1710
" -n N Nレベルのリビジョンを表示します。(0で全て、1でメインラインのみ)\n"
1711
" -v ステータスのサマリ(差分)を各リビジョンに表示します。\n"
1712
" -p Diff(patch)を各リビジョンに表示します。\n"
1713
" --show-ids リビジョン番号だけでなく、リビジョンIDとファイルIDも表示します。」"
1714
1715
#: bzrlib/builtins.py:2407
1716
msgid ""
1717
" Note that the default number of levels to display is a function of the\n"
1718
" log format. If the -n option is not used, the standard log formats show\n"
1719
" just the top level (mainline)."
1720
msgstr ""
1721
" デフォルトの表示レベルは、ログフォーマットの機能であることに注意してください。\n"
1722
" -nオプションが使用されない場合は、標準のログフォーマットはトップレベル(メイン\n"
1723
" ライン)だけを表示します。"
1724
1725
#: bzrlib/builtins.py:2411
1726
msgid ""
1727
" Status summaries are shown using status flags like A, M, etc. To see\n"
1728
" the changes explained using words like ``added`` and ``modified``\n"
1729
" instead, use the -vv option."
1730
msgstr ""
1731
" ステータスのサマリは、A、Mなどのフラグで表示されます。 かわりに ``added``、\n"
1732
" ``modified`` などの単語で表示するには、-vvオプションを使用してください。"
1733
1734
#: bzrlib/builtins.py:2415
1735
msgid ":Ordering control:"
1736
msgstr ":表示順のコントロール:"
1737
1738
#: bzrlib/builtins.py:2417
1739
msgid ""
1740
" To display revisions from oldest to newest, use the --forward option.\n"
1741
" In most cases, using this option will have little impact on the total\n"
1742
" time taken to produce a log, though --forward does not incrementally\n"
1743
" display revisions like --reverse does when it can."
1744
msgstr ""
1745
" 古いリビジョンから新しいリビジョンの順で表示するには、 --forwardオプションを\n"
1746
" 使います。--forwardは、--reverseのようにログをインクリメンタルに表示はしません\n"
1747
"が、たいていの場合、ログ表示にかかる時間への影響はわずかです。"
1748
1749
#: bzrlib/builtins.py:2422
1750
msgid ":Revision filtering:"
1751
msgstr ":リビジョンのフィルタリング:"
1752
1753
#: bzrlib/builtins.py:2424
1754
msgid ""
1755
" The -r option can be used to specify what revision or range of revisions\n"
1756
" to filter against. The various forms are shown below::"
1757
msgstr ""
1758
" -rオプションで、どのリビジョン、もしくはリビジョンの範囲を表示するかを指定する\n"
1759
" ことができます。いろいろな例を以下に示します。::"
1760
1761
#: bzrlib/builtins.py:2427
1762
msgid ""
1763
" -rX display revision X\n"
1764
" -rX.. display revision X and later\n"
1765
" -r..Y display up to and including revision Y\n"
1766
" -rX..Y display from X to Y inclusive"
1767
msgstr ""
1768
" -rX リビジョンXを表示\n"
1769
" -rX.. リビジョンX以降を表示\n"
1770
" -r..Y リビジョンY以前(Yを含む)を表示\n"
1771
" -rX..Y リビジョンXからY(X、Yを含む)を表示"
1772
1773
#: bzrlib/builtins.py:2432
1774
msgid ""
1775
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1776
" Some common examples are given below::"
1777
msgstr ""
1778
" X、Yの指定方法の詳細は、 ``bzr help revisionspec`` を参照してください。\n"
1779
" よくある例を以下に示します。::"
1780
1781
#: bzrlib/builtins.py:2435
1782
msgid ""
1783
" -r-1 show just the tip\n"
1784
" -r-10.. show the last 10 mainline revisions\n"
1785
" -rsubmit:.. show what's new on this branch\n"
1786
" -rancestor:path.. show changes since the common ancestor of this\n"
1787
" branch and the one at location path\n"
1788
" -rdate:yesterday.. show changes since yesterday"
1789
msgstr ""
1790
" -r-1 Tipだけを表示\n"
1791
" -r-10.. メインラインの最新10リビジョンを表示\n"
1792
" -rsubmit:.. このブランチでの変更内容を表示\n"
1793
" -rancestor:path.. このブランチと別のブランチとの分岐点からの\n"
1794
" 変更を表示\n"
1795
" -rdate:yesterday.. 昨日からの変更を表示"
1796
1797
#: bzrlib/builtins.py:2442
1798
msgid ""
1799
" When logging a range of revisions using -rX..Y, log starts at\n"
1800
" revision Y and searches back in history through the primary\n"
1801
" (\"left-hand\") parents until it finds X. When logging just the\n"
1802
" top level (using -n1), an error is reported if X is not found\n"
1803
" along the way. If multi-level logging is used (-n0), X may be\n"
1804
" a nested merge revision and the log will be truncated accordingly."
1805
msgstr ""
1806
" -rX..Yでリビジョンの範囲を指定した場合、ログはリビジョンYから始まって\n"
1807
" メインの(左側の)親をXに到達するまで遡ります。トップレベルだけを表示\n"
1808
" する場合(-n1を使用)、Xがそのルート見つからなければエラーが発生します。\n"
1809
" 他段階のログ(-n0を使用)を表示する場合は、Xは入れ子になったマージ\n"
1810
" リビジョンの中に見つかるかもしれません。その場合、ログは適切に切り捨て\n"
1811
" られます。"
1812
1813
#: bzrlib/builtins.py:2449
1814
msgid ":Path filtering:"
1815
msgstr ":パスのフィルタリング:"
1816
1817
#: bzrlib/builtins.py:2451
1818
msgid ""
1819
" If parameters are given and the first one is not a branch, the log\n"
1820
" will be filtered to show only those revisions that changed the\n"
1821
" nominated files or directories."
1822
msgstr ""
1823
" パラメータが指定されていて、一つ目のパラメータがブランチではない場合、\n"
1824
" 指定されたファイル、ディレクトリが変更されたリビジョンだけが表示されます。"
1825
1826
#: bzrlib/builtins.py:2455
1827
msgid ""
1828
" Filenames are interpreted within their historical context. To log a\n"
1829
" deleted file, specify a revision range so that the file existed at\n"
1830
" the end or start of the range."
1831
msgstr ""
1832
" ファイル名は、履歴のコンテキスト内で解釈されます。削除されたファイルの\n"
1833
" ログを表示するには、そのファイルが存在したリビジョンを、リビジョンの範囲\n"
1834
" の最初か最後に指定してください。"
1835
1836
#: bzrlib/builtins.py:2459
1837
msgid ""
1838
" Historical context is also important when interpreting pathnames of\n"
1839
" renamed files/directories. Consider the following example:"
1840
msgstr ""
1841
" 履歴のコンテキストは、変名されたファイルやディレクトリのパス名を解釈する\n"
1842
" 際にも重要になります。以下の例を考えてください。："
1843
1844
#: bzrlib/builtins.py:2462
1845
msgid ""
1846
" * revision 1: add tutorial.txt\n"
1847
" * revision 2: modify tutorial.txt\n"
1848
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1849
msgstr ""
1850
" * リビジョン 1: tutorial.txt を追加\n"
1851
" * リビジョン 2: tutorial.txt\n"
1852
" * リビジョン 3: tutorial.txt を guide.txt に変名し、add tutorial.txt を追加"
1853
1854
#: bzrlib/builtins.py:2466
1855
msgid " In this case:"
1856
msgstr " この場合:"
1857
1858
#: bzrlib/builtins.py:2468
1859
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1860
msgstr " * ``bzr log guide.txt`` は、リビジョン1で追加されたファイルを表示します。"
1861
1862
#: bzrlib/builtins.py:2470
1863
msgid ""
1864
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1865
msgstr " * ``bzr log tutorial.txt`` は、リビジョン3で追加された新しいファイルを表示します。"
1866
1867
#: bzrlib/builtins.py:2472
1868
msgid ""
1869
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1870
" the original file in revision 2."
1871
msgstr ""
1872
" * ``bzr log -r2 -p tutorial.txt`` は、元のファイルのリビジョン2での変更\n"
1873
" を表示します。"
1874
1875
#: bzrlib/builtins.py:2475
1876
msgid ""
1877
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1878
" was no file called guide.txt in revision 2."
1879
msgstr ""
1880
" * ``bzr log -r2 -p guide.txt`` は、リビジョン2にはguide.txtというファイルはない\n"
1881
" というエラーを表示します。"
1882
1883
#: bzrlib/builtins.py:2478
1884
msgid ""
1885
" Renames are always followed by log. By design, there is no need to\n"
1886
" explicitly ask for this (and no way to stop logging a file back\n"
1887
" until it was last renamed)."
1888
msgstr ""
1889
" 変名は常に履歴に表示されます。明示的に指定する必要はありません。(また、\n"
1890
" 最後に変名される以前のログを切り捨てる方法もありません)"
1891
1892
#: bzrlib/builtins.py:2482
1893
msgid ":Other filtering:"
1894
msgstr ":その他のフィルタリング:"
1895
1896
#: bzrlib/builtins.py:2484
1897
msgid ""
1898
" The --match option can be used for finding revisions that match a\n"
1899
" regular expression in a commit message, committer, author or bug.\n"
1900
" Specifying the option several times will match any of the supplied\n"
1901
" expressions. --match-author, --match-bugs, --match-committer and\n"
1902
" --match-message can be used to only match a specific field."
1903
msgstr ""
1904
" --matchオプションで、正規表現にコミットメッセージ、コミッター、著者、バグが\n"
1905
" マッチするリビジョンを検索することができます。オプションを複数回指定した\n"
1906
" 場合は、どれかひとつにマッチすれば検索されます。--match-author、\n"
1907
" --match-bug、--match-committer、--match-messageで、指定したフィールド\n"
1908
" だけを検索対象にすることができます。"
1909
1910
#: bzrlib/builtins.py:2490
1911
msgid ":Tips & tricks:"
1912
msgstr ":Tips & tricks:"
1913
1914
#: bzrlib/builtins.py:2492
1915
msgid ""
1916
" GUI tools and IDEs are often better at exploring history than command\n"
1917
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1918
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1919
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1920
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1921
msgstr ""
1922
" 履歴を見るには、CUIよりもGUIやIDEの方がいいことも多いでしょう。qlog、\n"
1923
" qbzrやbzr-gtkのビジュアライゼーション、bzr-explorerシェル、LoggerHead\n"
1924
" のWebインターフェイスなどが気に入るかもしれまん。プラグインガイド\n"
1925
" <http://doc.bazaar.canonical.com/plugins/en/> や、\n"
1926
" <http://wiki.bazaar.canonical.com/IDEIntegration> をご覧ください。 "
1927
1928
#: bzrlib/builtins.py:2498
1929
msgid ""
1930
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1931
msgstr " ``bazaar.conf`` に以下のようなエイリアスを追加しておくと便利です。::"
1932
1933
#: bzrlib/builtins.py:2500
1934
msgid ""
1935
" [ALIASES]\n"
1936
" tip = log -r-1\n"
1937
" top = log -l10 --line\n"
1938
" show = log -v -p"
1939
msgstr ""
1940
" [ALIASES]\n"
1941
" tip = log -r-1\n"
1942
" top = log -l10 --line\n"
1943
" show = log -v -p"
1944
1945
#: bzrlib/builtins.py:2505
1946
msgid ""
1947
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1948
" will show the last 10 mainline revisions. To see the details of a\n"
1949
" particular revision X, ``bzr show -rX``."
1950
msgstr ""
1951
" ``bzr tip`` は最新のリビジョンを表示し、 ``bzr top`` はメインラインの最新の\n"
1952
" 10リビジョンを表示します。特定のリビジョンXの詳細を見るには、 ``bzr show -X``\n"
1953
" を使用します。"
1954
1955
#: bzrlib/builtins.py:2509
1956
msgid ""
1957
" If you are interested in looking deeper into a particular merge X,\n"
1958
" use ``bzr log -n0 -rX``."
1959
msgstr " 特定のマージXについて詳しく見たい場合は、 ``bzr log -n0 -rX`` を使用します。"
1960
1961
#: bzrlib/builtins.py:2512
1962
msgid ""
1963
" ``bzr log -v`` on a branch with lots of history is currently\n"
1964
" very slow. A fix for this issue is currently under development.\n"
1965
" With or without that fix, it is recommended that a revision range\n"
1966
" be given when using the -v option."
1967
msgstr ""
1968
" 多くのリビジョンを持つブランチで ``bzr log -v`` を実行するのは、今の\n"
1969
" ところ非常に遅いです。この問題の修正は現在対応中ですが、いずれに\n"
1970
" しても、-vオプションを指定するときはリビジョンの範囲を指定することを\n"
1971
" おすすめします。"
1972
1973
#: bzrlib/builtins.py:2517
1974
msgid ""
1975
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1976
" used to find revisions matching user names, commit messages, etc.\n"
1977
" Among other features, this plugin can find all revisions containing\n"
1978
" a list of words but not others."
1979
msgstr ""
1980
" bzrには、包括的な全文検索マッチをするbzr-searchというプラグインがあり、\n"
1981
" ユーザ名、コミットメッセージなどでリビジョンを検索することができます。\n"
1982
" 他の機能とはちがい、このプラグインでは単語のリストを含むすべての\n"
1983
" リビジョンを検索することができます。"
1984
1985
#: bzrlib/builtins.py:2522
1986
msgid ""
1987
" When exploring non-mainline history on large projects with deep\n"
1988
" history, the performance of log can be greatly improved by installing\n"
1989
" the historycache plugin. This plugin buffers historical information\n"
1990
" trading disk space for faster speed."
1991
msgstr ""
1992
" 深い履歴をもつ大規模なプロジェクトで、メインライン以外の履歴を見る場合は、\n"
1993
" historycacheプラグインをインストールすることでパフォーマンスを大きく改善\n"
1994
" することができます。このプラグインは、履歴情報をキャッシュして、ディスク\n"
1995
" スペースと引き換えに高速なパフォーマンスをもたらします。"
1996
1997
#: bzrlib/builtins.py:2531
1998
msgid "Show from oldest to newest."
1999
msgstr "古い方から新しい方へ表示する"
2000
2001
#: bzrlib/builtins.py:2534
2002
msgid "Show files changed in each revision."
2003
msgstr "各リビジョンでのファイルの変更を表示する"
2004
2005
#: bzrlib/builtins.py:2540
2006
msgid "Show just the specified revision. See also \"help revisionspec\"."
2007
msgstr "指定されたリビジョンだけを表示する。 ``help revisionspec``を参照"
2008
2009
#: bzrlib/builtins.py:2544
2010
msgid "What names to list as authors - first, all or committer."
2011
msgstr "誰を作者として表示するか - first、all、またはcommitter"
2012
2013
#: bzrlib/builtins.py:2545
2014
msgid "Authors"
2015
msgstr "作者"
2016
2017
#: bzrlib/builtins.py:2550
2018
msgid "Number of levels to display - 0 for all, 1 for flat."
2019
msgstr "表示するレベル。-0で全て、1で１階層"
2020
2021
#: bzrlib/builtins.py:2560
2022
msgid "Limit the output to the first N revisions."
2023
msgstr "最初のNリビジョンだけを出力する"
2024
2025
#: bzrlib/builtins.py:2565
2026
msgid "Show changes made in each revision as a patch."
2027
msgstr "各リビジョンでの変更をパッチとして表示"
2028
2029
#: bzrlib/builtins.py:2567
2030
msgid "Show merged revisions like --levels 0 does."
2031
msgstr "--levels 0 と同じようにマージされたリビジョンを表示する"
2032
2033
#: bzrlib/builtins.py:2571
2034
msgid "Do not report commits with more than one parent."
2035
msgstr "複数の親を持つコミットを表示しない"
2036
2037
#: bzrlib/builtins.py:2573
2038
msgid ""
2039
"Display only the revisions that are not part of both ancestries (require -"
2040
"rX..Y)."
2041
msgstr "共通の先祖に含まれないリビジョンだけを表示(-rX..Yを使用する必要がある)"
2042
2043
#: bzrlib/builtins.py:2577
2044
msgid "Show digital signature validity."
2045
msgstr "デジタル署名を表示"
2046
2047
#: bzrlib/builtins.py:2580
2048
msgid "Show revisions whose properties match this expression."
2049
msgstr "この表現にマッチするプロパティのリビジョンを表示"
2050
2051
#: bzrlib/builtins.py:2584
2052
msgid "Show revisions whose message matches this expression."
2053
msgstr "この表現にマッチするメッセージのリビジョンを表示"
2054
2055
#: bzrlib/builtins.py:2588
2056
msgid "Show revisions whose committer matches this expression."
2057
msgstr "コミッタが指定された表現にマッチするリビジョンを表示する"
2058
2059
#: bzrlib/builtins.py:2592
2060
msgid "Show revisions whose authors match this expression."
2061
msgstr "作者が指定された表現にマッチするリビジョンを表示する"
2062
2063
#: bzrlib/builtins.py:2596
2064
msgid "Show revisions whose bugs match this expression."
2065
msgstr "バグ情報が指定された表現にマッチするリビジョンを表示します"
2066
2067
#: bzrlib/builtins.py:2650
2068
msgid "--exclude-common-ancestry requires -r with two revisions"
2069
msgstr "--exclude-common-ancestryには、-rで2つのリビジョンを指定する必要があります。"
2070
2071
#: bzrlib/builtins.py:2678
2072
#, python-format
2073
msgid "Path unknown at end or start of revision range: %s"
2074
msgstr "最後のリビジョンにも最初のリビジョンにもパスが見つかりません: %s"
2075
2076
#: bzrlib/builtins.py:2795
2077
#, python-format
2078
msgid "bzr %s doesn't accept two revisions in different branches."
2079
msgstr "bzr %s には、異なるブランチ上の2つのリビジョンは指定できません。"
2080
2081
#: bzrlib/builtins.py:2811
2082
#, python-format
2083
msgid "bzr %s --revision takes one or two values."
2084
msgstr "bzr %s --revision は1つまたは2つの値を取ります。"
2085
2086
#: bzrlib/builtins.py:2856
2087
msgid ""
2088
"List files in a tree.\n"
2089
" "
2090
msgstr ""
2091
"ツリー内のファイルをリストアップします。\n"
2092
" "
2093
2094
#: bzrlib/builtins.py:2865
2095
msgid "Recurse into subdirectories."
2096
msgstr "サブディレクトリも再帰で処理します。"
2097
2098
#: bzrlib/builtins.py:2867
2099
msgid "Print paths relative to the root of the branch."
2100
msgstr "ブランチのルートからの相対パスを表示します。"
2101
2102
#: bzrlib/builtins.py:2869
2103
msgid "Print unknown files."
2104
msgstr "バージョン管理外のファイルを表示します。"
2105
2106
#: bzrlib/builtins.py:2870
2107
msgid "Print versioned files."
2108
msgstr "バージョン管理されたファイルを表示します。"
2109
2110
#: bzrlib/builtins.py:2873
2111
msgid "Print ignored files."
2112
msgstr "無視されたファイルを表示します。"
2113
2114
#: bzrlib/builtins.py:2875
2115
msgid "List entries of a particular kind: file, directory, symlink."
2116
msgstr "指定された種別のアイテム(ファイル、ディレクトリ、シンボリックリンク)を表示します。"
2117
2118
#: bzrlib/builtins.py:2888
2119
msgid "invalid kind specified"
2120
msgstr "無効な種別が指定されました。"
2121
2122
#: bzrlib/builtins.py:2891
2123
msgid "Cannot set both --verbose and --null"
2124
msgstr "--verboseと--nullを同時に指定することはできません。"
2125
2126
#: bzrlib/builtins.py:2900
2127
msgid "cannot specify both --from-root and PATH"
2128
msgstr "--from-rootとPATHを同時に指定することはできません。"
2129
2130
#: bzrlib/builtins.py:2987
2131
msgid "Ignore specified files or patterns."
2132
msgstr "指定されたファイルやパターンを無視します。"
2133
2134
#: bzrlib/builtins.py:2989
2135
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2136
msgstr "パターンの書き方の詳細は ``bzr help patterns`` をご覧ください。"
2137
2138
#: bzrlib/builtins.py:2991
2139
msgid ""
2140
"If a .bzrignore file does not exist, the ignore command\n"
2141
"will create one and add the specified files or patterns to the newly\n"
2142
"created file. The ignore command will also automatically add the \n"
2143
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2144
"the use of the ignore command will require an explicit add command."
2145
msgstr ""
2146
".bzrignoreファイルが存在しない場合は、ignoreコマンドはそれを作成して、\n"
2147
"指定されたファイルやパターンを追加します。また、.bzrignoreファイルは\n"
2148
"ignoreコマンドで自動的にバージョン管理に追加されます。ignoreコマンドを\n"
2149
"使わずに.bzrignoreファイルを手で作成した場合は、明示的にaddコマンドを\n"
2150
"呼ぶ必要があります。"
2151
2152
#: bzrlib/builtins.py:2997
2153
msgid ""
2154
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2155
"After adding, editing or deleting that file either indirectly by\n"
2156
"using this command or directly by using an editor, be sure to commit\n"
2157
"it."
2158
msgstr ""
2159
"無視リストからパターンを削除するには、.bzrignoreファイルを編集します。\n"
2160
"ignoreコマンドやエディタでこのファイルのエントリを追加、編集、削除した\n"
2161
"場合は、忘れずにコミットしてください。"
2162
2163
#: bzrlib/builtins.py:3002
2164
msgid ""
2165
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2166
"the global ignore file can be found in the application data directory as\n"
2167
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2168
"Global ignores are not touched by this command. The global ignore file\n"
2169
"can be edited directly using an editor."
2170
msgstr ""
2171
"Bazaarは、グローバルな無視ファイル ~/.bazaar/ignore もサポートしています。\n"
2172
"Windowsでは、このファイルはApplication Data ディレクトリにあります。\n"
2173
"(C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore)\n"
2174
"このファイルをこのコマンドで編集することはできないので、直接エディタで編集\n"
2175
"してください。"
2176
2177
#: bzrlib/builtins.py:3008
2178
msgid ""
2179
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2180
"precedence over regular ignores. Such exceptions are used to specify\n"
2181
"files that should be versioned which would otherwise be ignored."
2182
msgstr ""
2183
"!で始まるパターンは、無視指定からの除外を表し、通常の無視指定よりも\n"
2184
"優先されます。これは、普通なら無視されるはずのファイルをバージョン管理\n"
2185
"の対象とするために使います。"
2186
2187
#: bzrlib/builtins.py:3012
2188
msgid ""
2189
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2190
"precedence over the '!' exception patterns."
2191
msgstr ""
2192
"!!で始まるパターンは、通常の無視指定として扱われますが、!による除外\n"
2193
"パターンよりも優先されます。"
2194
2195
#: bzrlib/builtins.py:3015
2196
msgid ""
2197
":Notes: \n"
2198
" \n"
2199
"* Ignore patterns containing shell wildcards must be quoted from\n"
2200
" the shell on Unix."
2201
msgstr ""
2202
":注意: \n"
2203
" \n"
2204
"*シェルのワイルドカードをふくむ無視パターンを指定するときには、Unixシェル\n"
2205
" による引用符でくくる必要があります。"
2206
2207
#: bzrlib/builtins.py:3020
2208
msgid ""
2209
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2210
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2211
msgstr ""
2212
"* #で始まる無視パターンは、無視ファイル中のコメントとして扱われます。\n"
2213
" #で始まるファイルを無視したい場合は、\"RE:\"プレフィックスを使ってください。"
2214
2215
#: bzrlib/builtins.py:3023
2216
msgid ""
2217
":Examples:\n"
2218
" Ignore the top level Makefile::"
2219
msgstr ""
2220
":例:\n"
2221
" トップレベルのMakefileを無視する::"
2222
2223
#: bzrlib/builtins.py:3026
2224
msgid " bzr ignore ./Makefile"
2225
msgstr " bzr ignore ./Makefile"
2226
2227
#: bzrlib/builtins.py:3028
2228
msgid " Ignore .class files in all directories...::"
2229
msgstr " すべてのディレクトリの.classファイルを無視するが...::"
2230
2231
#: bzrlib/builtins.py:3030
2232
msgid " bzr ignore \"*.class\""
2233
msgstr " bzr ignore \"*.class\""
2234
2235
#: bzrlib/builtins.py:3032
2236
msgid " ...but do not ignore \"special.class\"::"
2237
msgstr " ...\"special.class\" は無視しない::"
2238
2239
#: bzrlib/builtins.py:3034
2240
msgid " bzr ignore \"!special.class\""
2241
msgstr " bzr ignore \"!special.class\""
2242
2243
#: bzrlib/builtins.py:3036
2244
msgid " Ignore files whose name begins with the \"#\" character::"
2245
msgstr " #で始まるファイルを無視する::"
2246
2247
#: bzrlib/builtins.py:3038
2248
msgid " bzr ignore \"RE:^#\""
2249
msgstr " bzr ignore \"RE:^#\""
2250
2251
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
2252
msgid " Ignore .o files under the lib directory::"
2253
msgstr " libディレクトリ配下の.oファイルを無視する::"
2254
2255
#: bzrlib/builtins.py:3042
2256
msgid " bzr ignore \"lib/**/*.o\""
2257
msgstr " bzr ignore \"lib/**/*.o\""
2258
2259
#: bzrlib/builtins.py:3046
2260
msgid " bzr ignore \"RE:lib/.*\\.o\""
2261
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2262
2263
#: bzrlib/builtins.py:3048
2264
msgid " Ignore everything but the \"debian\" toplevel directory::"
2265
msgstr " \"debian\"トップレベルディレクトリ以外の全てを無視する::"
2266
2267
#: bzrlib/builtins.py:3050
2268
msgid ""
2269
" bzr ignore \"RE:(?!debian/).*\"\n"
2270
" \n"
2271
" Ignore everything except the \"local\" toplevel directory,\n"
2272
" but always ignore autosave files ending in ~, even under local/::\n"
2273
" \n"
2274
" bzr ignore \"*\"\n"
2275
" bzr ignore \"!./local\"\n"
2276
" bzr ignore \"!!*~\""
2277
msgstr ""
2278
" bzr ignore \"RE:(?!debian/).*\"\n"
2279
" \n"
2280
" ”local”トップレベルディレクトリ配下以外の全てを無視する,\n"
2281
" ただし、~で終わる自動セーブファイルは、local/配下であっても無視する::\n"
2282
" \n"
2283
" bzr ignore \"*\"\n"
2284
" bzr ignore \"!./local\"\n"
2285
" bzr ignore \"!!*~\""
2286
2287
#: bzrlib/builtins.py:3064
2288
msgid "Display the default ignore rules that bzr uses."
2289
msgstr "bzrが使用するデフォルトの無視ルールを表示します。"
2290
2291
#: bzrlib/builtins.py:3076
2292
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2293
msgstr "ignoreにはNAME_PATTERNか--default-rulesのどちらかは指定する必要があります。"
2294
2295
#: bzrlib/builtins.py:3087
2296
#, python-format
2297
msgid "Invalid ignore pattern found. %s"
2298
msgid_plural "Invalid ignore patterns found. %s"
2299
msgstr[0] "無効な無視パターンが見つかりました。 %s"
2300
2301
#: bzrlib/builtins.py:3096
2302
msgid "NAME_PATTERN should not be an absolute path"
2303
msgstr "NAME_PATTERNに絶対パスは指定できません。"
2304
2305
#: bzrlib/builtins.py:3109
2306
#, python-format
2307
msgid ""
2308
"Warning: the following files are version controlled and match your ignore "
2309
"pattern:\n"
2310
"%s\n"
2311
"These files will continue to be version controlled unless you 'bzr remove' "
2312
"them.\n"
2313
msgstr ""
2314
"注意: 以下のファイルはバージョン管理されていますが、無視パターンにマッチしました。:\n"
2315
"%s\n"
2316
"これらのファイルは、'bzr remove'しない限りはバージョン管理されたままです。\n"
2317
2318
#: bzrlib/builtins.py:3116
2319
msgid "List ignored files and the patterns that matched them."
2320
msgstr "無視するファイルとそれらにマッチするパターンの一覧を表示する。"
2321
2322
#: bzrlib/builtins.py:3118
2323
msgid ""
2324
"List all the ignored files and the ignore pattern that caused the file to\n"
2325
"be ignored."
2326
msgstr "無視されるファイルと、それがどのパターンによって無視されているかを一覧で表示します。"
2327
2328
#: bzrlib/builtins.py:3121
2329
msgid "Alternatively, to list just the files::"
2330
msgstr "代わりにファイルの一覧だけを表示するには::"
2331
2332
#: bzrlib/builtins.py:3123
2333
msgid " bzr ls --ignored"
2334
msgstr " bzr ls --ignored"
2335
2336
#: bzrlib/builtins.py:3157
2337
#, python-format
2338
msgid "not a valid revision-number: %r"
2339
msgstr "無効なリビジョン番号です。: %r"
2340
2341
#: bzrlib/builtins.py:3164
2342
msgid ""
2343
"Export current or past revision to a destination directory or archive."
2344
msgstr "最新、または過去のリビジョンを指定されたディレクトリもしくはアーカイブにエクスポートする。"
2345
2346
#: bzrlib/builtins.py:3166
2347
msgid "If no revision is specified this exports the last committed revision."
2348
msgstr "リビジョンが指定されなければ、最終コミットのリビジョンをエクスポートします。"
2349
2350
#: bzrlib/builtins.py:3168
2351
msgid ""
2352
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2353
"given, try to find the format with the extension. If no extension\n"
2354
"is found exports to a directory (equivalent to --format=dir)."
2355
msgstr ""
2356
"フォーマットはtar、tgz、tbz2のような”exporter”の名前になることができます。\n"
2357
" 何も渡されなければ、拡張子のフォーマットを見つけようとします。 拡張子がない\n"
2358
"場合は、ディレクトリにエクスポートします(–format=dirと同等)。"
2359
2360
#: bzrlib/builtins.py:3172
2361
msgid ""
2362
"If root is supplied, it will be used as the root directory inside\n"
2363
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2364
"to the exported filename. The root option has no effect for 'dir' format."
2365
msgstr ""
2366
"rootが指定された場合は、コンテナフォーマット(tar、zipなど)のルート\n"
2367
"ディレクトリに使用されます。指定されていない場合は、エクスポート\n"
2368
"ファイル名がデフォルトになります。rootオプションは、'dir'フォーマット\n"
2369
"に対しては作用しません。"
2370
2371
#: bzrlib/builtins.py:3176
2372
msgid ""
2373
"If branch is omitted then the branch containing the current working\n"
2374
"directory will be used."
2375
msgstr "ブランチが省略されると現在の作業ディレクトリを含むブランチが使用されます。"
2376
2377
#: bzrlib/builtins.py:3179
2378
msgid ""
2379
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2380
msgstr "注: ASCIIではないファイルを含むツリーの、zipへのエクスポートはサポートされません。"
2381
2382
#: bzrlib/builtins.py:3181
2383
msgid ""
2384
" ================= =========================\n"
2385
" Supported formats Autodetected by extension\n"
2386
" ================= =========================\n"
2387
" dir (none)\n"
2388
" tar .tar\n"
2389
" tbz2 .tar.bz2, .tbz2\n"
2390
" tgz .tar.gz, .tgz\n"
2391
" zip .zip\n"
2392
" ================= ========================="
2393
msgstr ""
2394
" ==================== ====================\n"
2395
" サポートフォーマット 拡張子による自動検出\n"
2396
" ==================== ====================\n"
2397
" dir (none)\n"
2398
" tar .tar\n"
2399
" tbz2 .tar.bz2, .tbz2\n"
2400
" tgz .tar.gz, .tgz\n"
2401
" zip .zip\n"
2402
" ==================== ===================="
2403
2404
#: bzrlib/builtins.py:3195
2405
msgid "Type of file to export to."
2406
msgstr "エクスポートするファイルの種類"
2407
2408
#: bzrlib/builtins.py:3198
2409
msgid "Apply content filters to export the convenient form."
2410
msgstr "使いやすい形でエクスポートするためのコンテンツフィルターを適用します。"
2411
2412
#: bzrlib/builtins.py:3202
2413
msgid "Name of the root directory inside the exported file."
2414
msgstr "エクスポートされたファイル内部のrootディレクトリの名前。"
2415
2416
#: bzrlib/builtins.py:3204
2417
msgid ""
2418
"Set modification time of files to that of the last revision in which it was "
2419
"changed."
2420
msgstr "各ファイルの編集日時を、最後にそのファイルが変更されたリビジョンの日時に設定します。"
2421
2422
#: bzrlib/builtins.py:3207
2423
msgid ""
2424
"Export the working tree contents rather than that of the last revision."
2425
msgstr "最終リビジョンではなく、作業ツリーの内容をエクスポートします。"
2426
2427
#: bzrlib/builtins.py:3226
2428
msgid "--uncommitted requires a working tree"
2429
msgstr "作業ツリーに対しては--uncommittedを指定する必要があります。"
2430
2431
#: bzrlib/builtins.py:3235
2432
#, python-format
2433
msgid "Unsupported export format: %s"
2434
msgstr "サポートされていないエクスポートフォーマット: %s"
2435
2436
#: bzrlib/builtins.py:3239
2437
msgid ""
2438
"Write the contents of a file as of a given revision to standard output."
2439
msgstr "指定されたリビジョンのファイルの内容を標準出力に書き出します。"
2440
2441
#: bzrlib/builtins.py:3241
2442
msgid "If no revision is nominated, the last revision is used."
2443
msgstr "リビジョンが指定されなければ、最後のリビジョンが使用されます。"
2444
2445
#: bzrlib/builtins.py:3243
2446
msgid ""
2447
"Note: Take care to redirect standard output when using this command on a\n"
2448
"binary file."
2449
msgstr ""
2450
"バイナリファイルでこのコマンドを使用する際には標準出力をリダイレクトするように\n"
2451
"気をつけてください。"
2452
2453
#: bzrlib/builtins.py:3249
2454
msgid "The path name in the old tree."
2455
msgstr "古いツリーのパス名。"
2456
2457
#: bzrlib/builtins.py:3250
2458
msgid "Apply content filters to display the convenience form."
2459
msgstr "便利な形で表示するためのフィルタを適用します。"
2460
2461
#: bzrlib/builtins.py:3261
2462
msgid "bzr cat --revision takes exactly one revision specifier"
2463
msgstr "bzr cat --revisionにはリビジョンをひとつだけ指定します。"
2464
2465
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2466
msgid "{0!r} is not present in revision {1}"
2467
msgstr "{0!r}はリビジョン{1}には存在しません。"
2468
2469
#: bzrlib/builtins.py:3321
2470
msgid "Commit changes into a new revision."
2471
msgstr "変更を新しいリビジョンにコミットする。"
2472
2473
#: bzrlib/builtins.py:3323
2474
msgid ""
2475
"An explanatory message needs to be given for each commit. This is\n"
2476
"often done by using the --message option (getting the message from the\n"
2477
"command line) or by using the --file option (getting the message from\n"
2478
"a file). If neither of these options is given, an editor is opened for\n"
2479
"the user to enter the message. To see the changed files in the\n"
2480
"boilerplate text loaded into the editor, use the --show-diff option."
2481
msgstr ""
2482
"それぞれのコミットに、その内容を説明するメッセージを指定する必要があります。\n"
2483
"これは、--messageオプションで指定(コマンドラインからメッセージを取得)したり、\n"
2484
"--fileオプションで指定(ファイルからメッセージを取得)します。どちらのオプションも\n"
2485
"指定されていない場合は、メッセージを入力するためのエディタが起動します。\n"
2486
"エディタにロードされる定型文の中に変更されたファイルの情報を含めるためには、\n"
2487
"--show-diffオプションを使用します。"
2488
2489
#: bzrlib/builtins.py:3330
2490
msgid ""
2491
"By default, the entire tree is committed and the person doing the\n"
2492
"commit is assumed to be the author. These defaults can be overridden\n"
2493
"as explained below."
2494
msgstr ""
2495
"デフォルトでは、ツリー全体がコミットされ、コミットを実行した人が著者になります。\n"
2496
"これは、以下のような方法で上書きすることができます。"
2497
2498
#: bzrlib/builtins.py:3334
2499
msgid ":Selective commits:"
2500
msgstr ":部分的なコミット:"
2501
2502
#: bzrlib/builtins.py:3336
2503
msgid ""
2504
" If selected files are specified, only changes to those files are\n"
2505
" committed. If a directory is specified then the directory and\n"
2506
" everything within it is committed."
2507
msgstr ""
2508
" ファイルが指定された場合、そのファイルの変更だけがコミットされます。\n"
2509
" ディレクトリが指定された場合、そのディレクトリとその配下すべてが\n"
2510
" コミット対象になります。"
2511
2512
#: bzrlib/builtins.py:3340
2513
msgid ""
2514
" When excludes are given, they take precedence over selected files.\n"
2515
" For example, to commit only changes within foo, but not changes\n"
2516
" within foo/bar::"
2517
msgstr ""
2518
" excludesの指定は、コミット対象ファイルの指定よりも優先されます。\n"
2519
" たとえば、foo配下の変更をコミットするが、foo/bar内はコミットしないという\n"
2520
" 場合は::"
2521
2522
#: bzrlib/builtins.py:3344
2523
msgid " bzr commit foo -x foo/bar"
2524
msgstr " bzr commit foo -x foo/bar"
2525
2526
#: bzrlib/builtins.py:3346
2527
msgid " A selective commit after a merge is not yet supported."
2528
msgstr ""
2529
2530
#: bzrlib/builtins.py:3348
2531
msgid ":Custom authors:"
2532
msgstr ""
2533
2534
#: bzrlib/builtins.py:3350
2535
msgid ""
2536
" If the author of the change is not the same person as the committer,\n"
2537
" you can specify the author's name using the --author option. The\n"
2538
" name should be in the same format as a committer-id, e.g.\n"
2539
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2540
" the change you can specify the option multiple times, once for each\n"
2541
" author."
2542
msgstr ""
2543
2544
#: bzrlib/builtins.py:3357
2545
msgid ":Checks:"
2546
msgstr ""
2547
2548
#: bzrlib/builtins.py:3359
2549
msgid ""
2550
" A common mistake is to forget to add a new file or directory before\n"
2551
" running the commit command. The --strict option checks for unknown\n"
2552
" files and aborts the commit if any are found. More advanced pre-commit\n"
2553
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2554
" for details."
2555
msgstr ""
2556
2557
#: bzrlib/builtins.py:3365
2558
msgid ":Things to note:"
2559
msgstr ""
2560
2561
#: bzrlib/builtins.py:3367
2562
msgid ""
2563
" If you accidentially commit the wrong changes or make a spelling\n"
2564
" mistake in the commit message say, you can use the uncommit command\n"
2565
" to undo it. See ``bzr help uncommit`` for details."
2566
msgstr ""
2567
2568
#: bzrlib/builtins.py:3371
2569
msgid ""
2570
" Hooks can also be configured to run after a commit. This allows you\n"
2571
" to trigger updates to external systems like bug trackers. The --fixes\n"
2572
" option can be used to record the association between a revision and\n"
2573
" one or more bugs. See ``bzr help bugs`` for details."
2574
msgstr ""
2575
2576
#: bzrlib/builtins.py:3381
2577
msgid "Do not consider changes made to a given path."
2578
msgstr ""
2579
2580
#: bzrlib/builtins.py:3384
2581
msgid "Description of the new revision."
2582
msgstr "新しいリビジョンの説明。"
2583
2584
#: bzrlib/builtins.py:3387
2585
msgid "Commit even if nothing has changed."
2586
msgstr "何も変更されていなくてもコミットする。"
2587
2588
#: bzrlib/builtins.py:3391
2589
msgid "Take commit message from this file."
2590
msgstr "このファイルからコミットメッセージを取得する。"
2591
2592
#: bzrlib/builtins.py:3393
2593
msgid "Refuse to commit if there are unknown files in the working tree."
2594
msgstr "作業ツリーの中にバージョン管理外のファイルが存在する場合コミットを拒否する。"
2595
2596
#: bzrlib/builtins.py:3396
2597
msgid ""
2598
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2599
"08:00:00 +0100'."
2600
msgstr ""
2601
2602
#: bzrlib/builtins.py:3399
2603
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2604
msgstr "このリビジョンで修正されたバグをマークする(\"bzr help bugs\"を参照)。"
2605
2606
#: bzrlib/builtins.py:3402
2607
msgid "Set the author's name, if it's different from the committer."
2608
msgstr "著者の名前がコミッターとは異なる場合、著者の名前を設定する。"
2609
2610
#: bzrlib/builtins.py:3405
2611
msgid ""
2612
"Perform a local commit in a bound branch. Local commits are not pushed to "
2613
"the master branch until a normal commit is performed."
2614
msgstr ""
2615
"バインドされたブランチにローカルコミットを実行する。 通常のコミットが実行されるまで ローカルコミットはマスターブランチにpushされません。"
2616
2617
#: bzrlib/builtins.py:3411
2618
msgid ""
2619
"When no message is supplied, show the diff along with the status summary in "
2620
"the message editor."
2621
msgstr "メッセージが提供されないとき、 メッセージエディタでステータスの要約と一緒に差分を表示する。"
2622
2623
#: bzrlib/builtins.py:3414
2624
msgid ""
2625
"When committing to a foreign version control system do not push data that "
2626
"can not be natively represented."
2627
msgstr ""
2628
2629
#: bzrlib/builtins.py:3432
2630
#, python-format
2631
msgid ""
2632
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2633
"default bug tracker using the `bugtracker` option.\n"
2634
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2635
msgstr ""
2636
2637
#: bzrlib/builtins.py:3441
2638
#, python-format
2639
msgid ""
2640
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2641
"for more information on this feature.\n"
2642
"Commit refused."
2643
msgstr ""
2644
2645
#: bzrlib/builtins.py:3450
2646
#, python-format
2647
msgid "Unrecognized bug %s. Commit refused."
2648
msgstr ""
2649
2650
#: bzrlib/builtins.py:3453
2651
#, python-format
2652
msgid ""
2653
"%s\n"
2654
"Commit refused."
2655
msgstr ""
2656
2657
#: bzrlib/builtins.py:3477
2658
msgid "Could not parse --commit-time: "
2659
msgstr ""
2660
2661
#: bzrlib/builtins.py:3517
2662
msgid "please specify either --message or --file"
2663
msgstr ""
2664
2665
#: bzrlib/builtins.py:3546
2666
msgid "please specify a commit message with either --message or --file"
2667
msgstr ""
2668
2669
#: bzrlib/builtins.py:3549
2670
msgid ""
2671
"Empty commit message specified. Please specify a commit message with either -"
2672
"-message or --file or leave a blank message with --message \"\"."
2673
msgstr ""
2674
2675
#: bzrlib/builtins.py:3569
2676
msgid ""
2677
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2678
"-unchanged to force an empty commit."
2679
msgstr ""
2680
2681
#: bzrlib/builtins.py:3573
2682
msgid ""
2683
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2684
"resolve FILE\" to resolve."
2685
msgstr ""
2686
2687
#: bzrlib/builtins.py:3577
2688
msgid "Commit refused because there are unknown files in the working tree."
2689
msgstr ""
2690
2691
#: bzrlib/builtins.py:3580
2692
msgid ""
2693
"\n"
2694
"To commit to master branch, run update and then commit.\n"
2695
"You can also pass --local to commit to continue working disconnected."
2696
msgstr ""
2697
2698
#: bzrlib/builtins.py:3588
2699
msgid ""
2700
"Validate working tree structure, branch consistency and repository history."
2701
msgstr ""
2702
2703
#: bzrlib/builtins.py:3590
2704
msgid ""
2705
"This command checks various invariants about branch and repository storage\n"
2706
"to detect data corruption or bzr bugs."
2707
msgstr ""
2708
2709
#: bzrlib/builtins.py:3593
2710
msgid ""
2711
"The working tree and branch checks will only give output if a problem is\n"
2712
"detected. The output fields of the repository check are:"
2713
msgstr ""
2714
2715
#: bzrlib/builtins.py:3596
2716
msgid ""
2717
"revisions\n"
2718
" This is just the number of revisions checked. It doesn't\n"
2719
" indicate a problem."
2720
msgstr ""
2721
2722
#: bzrlib/builtins.py:3600
2723
msgid ""
2724
"versionedfiles\n"
2725
" This is just the number of versionedfiles checked. It\n"
2726
" doesn't indicate a problem."
2727
msgstr ""
2728
2729
#: bzrlib/builtins.py:3604
2730
msgid ""
2731
"unreferenced ancestors\n"
2732
" Texts that are ancestors of other texts, but\n"
2733
" are not properly referenced by the revision ancestry. This is a\n"
2734
" subtle problem that Bazaar can work around."
2735
msgstr ""
2736
2737
#: bzrlib/builtins.py:3609
2738
msgid ""
2739
"unique file texts\n"
2740
" This is the total number of unique file contents\n"
2741
" seen in the checked revisions. It does not indicate a problem."
2742
msgstr ""
2743
2744
#: bzrlib/builtins.py:3613
2745
msgid ""
2746
"repeated file texts\n"
2747
" This is the total number of repeated texts seen\n"
2748
" in the checked revisions. Texts can be repeated when their file\n"
2749
" entries are modified, but the file contents are not. It does not\n"
2750
" indicate a problem."
2751
msgstr ""
2752
2753
#: bzrlib/builtins.py:3619
2754
msgid ""
2755
"If no restrictions are specified, all Bazaar data that is found at the "
2756
"given\n"
2757
"location will be checked."
2758
msgstr ""
2759
2760
#: bzrlib/builtins.py:3624
2761
msgid " Check the tree and branch at 'foo'::"
2762
msgstr " ‘foo’ でのツリーとブランチをチェックする::"
2763
2764
#: bzrlib/builtins.py:3626
2765
msgid " bzr check --tree --branch foo"
2766
msgstr " bzr check --tree --branch foo"
2767
2768
#: bzrlib/builtins.py:3628
2769
msgid " Check only the repository at 'bar'::"
2770
msgstr " ‘bar’でのリポジトリのみをチェックする::"
2771
2772
#: bzrlib/builtins.py:3630
2773
msgid " bzr check --repo bar"
2774
msgstr " bzr check --repo bar"
2775
2776
#: bzrlib/builtins.py:3632
2777
msgid " Check everything at 'baz'::"
2778
msgstr " ‘baz’ ですべてをチェックする::"
2779
2780
#: bzrlib/builtins.py:3634
2781
msgid " bzr check baz"
2782
msgstr " bzr check baz"
2783
2784
#: bzrlib/builtins.py:3640
2785
msgid "Check the branch related to the current directory."
2786
msgstr "現在のディレクトリに関連したブランチをチェックする。"
2787
2788
#: bzrlib/builtins.py:3642
2789
msgid "Check the repository related to the current directory."
2790
msgstr "現在のディレクトリに関連したリポジトリをチェックする。"
2791
2792
#: bzrlib/builtins.py:3644
2793
msgid "Check the working tree related to the current directory."
2794
msgstr "現在のディレクトリに関連した作業ツリーをチェックする。"
2795
2796
#: bzrlib/builtins.py:3658
2797
msgid "Upgrade a repository, branch or working tree to a newer format."
2798
msgstr ""
2799
2800
#: bzrlib/builtins.py:3660
2801
msgid ""
2802
"When the default format has changed after a major new release of\n"
2803
"Bazaar, you may be informed during certain operations that you\n"
2804
"should upgrade. Upgrading to a newer format may improve performance\n"
2805
"or make new features available. It may however limit interoperability\n"
2806
"with older repositories or with older versions of Bazaar."
2807
msgstr ""
2808
2809
#: bzrlib/builtins.py:3666
2810
msgid ""
2811
"If you wish to upgrade to a particular format rather than the\n"
2812
"current default, that can be specified using the --format option.\n"
2813
"As a consequence, you can use the upgrade command this way to\n"
2814
"\"downgrade\" to an earlier format, though some conversions are\n"
2815
"a one way process (e.g. changing from the 1.x default to the\n"
2816
"2.x default) so downgrading is not always possible."
2817
msgstr ""
2818
2819
#: bzrlib/builtins.py:3673
2820
msgid ""
2821
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2822
"process (where # is a number). By default, this is left there on\n"
2823
"completion. If the conversion fails, delete the new .bzr directory\n"
2824
"and rename this one back in its place. Use the --clean option to ask\n"
2825
"for the backup.bzr directory to be removed on successful conversion.\n"
2826
"Alternatively, you can delete it by hand if everything looks good\n"
2827
"afterwards."
2828
msgstr ""
2829
2830
#: bzrlib/builtins.py:3681
2831
msgid ""
2832
"If the location given is a shared repository, dependent branches\n"
2833
"are also converted provided the repository converts successfully.\n"
2834
"If the conversion of a branch fails, remaining branches are still\n"
2835
"tried."
2836
msgstr ""
2837
2838
#: bzrlib/builtins.py:3686
2839
msgid ""
2840
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2841
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2842
msgstr ""
2843
2844
#: bzrlib/builtins.py:3694
2845
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2846
msgstr ""
2847
2848
#: bzrlib/builtins.py:3698
2849
msgid "Branch format"
2850
msgstr ""
2851
2852
#: bzrlib/builtins.py:3700
2853
msgid "Remove the backup.bzr directory if successful."
2854
msgstr ""
2855
2856
#: bzrlib/builtins.py:3702
2857
msgid "Show what would be done, but don't actually do anything."
2858
msgstr ""
2859
2860
#: bzrlib/builtins.py:3717
2861
msgid "Show or set bzr user id."
2862
msgstr ""
2863
2864
#: bzrlib/builtins.py:3719
2865
msgid ""
2866
":Examples:\n"
2867
" Show the email of the current user::"
2868
msgstr ""
2869
2870
#: bzrlib/builtins.py:3722
2871
msgid " bzr whoami --email"
2872
msgstr ""
2873
2874
#: bzrlib/builtins.py:3724
2875
msgid " Set the current user::"
2876
msgstr ""
2877
2878
#: bzrlib/builtins.py:3726
2879
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2880
msgstr ""
2881
2882
#: bzrlib/builtins.py:3730
2883
msgid "Display email address only."
2884
msgstr ""
2885
2886
#: bzrlib/builtins.py:3732
2887
msgid "Set identity for the current branch instead of globally."
2888
msgstr ""
2889
2890
#: bzrlib/builtins.py:3758
2891
msgid "--email can only be used to display existing identity"
2892
msgstr ""
2893
2894
#: bzrlib/builtins.py:3780
2895
msgid "Print or set the branch nickname."
2896
msgstr ""
2897
2898
#: bzrlib/builtins.py:3782
2899
msgid ""
2900
"If unset, the tree root directory name is used as the nickname.\n"
2901
"To print the current nickname, execute with no argument."
2902
msgstr ""
2903
2904
#: bzrlib/builtins.py:3785
2905
msgid ""
2906
"Bound branches use the nickname of its master branch unless it is set\n"
2907
"locally."
2908
msgstr ""
2909
2910
#: bzrlib/builtins.py:3805
2911
msgid "Set/unset and display aliases."
2912
msgstr ""
2913
2914
#: bzrlib/builtins.py:3807
2915
msgid ""
2916
":Examples:\n"
2917
" Show the current aliases::"
2918
msgstr ""
2919
2920
#: bzrlib/builtins.py:3810
2921
msgid " bzr alias"
2922
msgstr ""
2923
2924
#: bzrlib/builtins.py:3812
2925
msgid " Show the alias specified for 'll'::"
2926
msgstr ""
2927
2928
#: bzrlib/builtins.py:3814
2929
msgid " bzr alias ll"
2930
msgstr ""
2931
2932
#: bzrlib/builtins.py:3816
2933
msgid " Set an alias for 'll'::"
2934
msgstr ""
2935
2936
#: bzrlib/builtins.py:3818
2937
msgid " bzr alias ll=\"log --line -r-10..-1\""
2938
msgstr ""
2939
2940
#: bzrlib/builtins.py:3820
2941
msgid " To remove an alias for 'll'::"
2942
msgstr ""
2943
2944
#: bzrlib/builtins.py:3822
2945
msgid " bzr alias --remove ll"
2946
msgstr ""
2947
2948
#: bzrlib/builtins.py:3827
2949
msgid "Remove the alias."
2950
msgstr ""
2951
2952
#: bzrlib/builtins.py:3845
2953
msgid "bzr alias --remove expects an alias to remove."
2954
msgstr ""
2955
2956
#: bzrlib/builtins.py:4026
2957
msgid ""
2958
"subunit not available. subunit needs to be installed to use --subunit."
2959
msgstr ""
2960
2961
#: bzrlib/builtins.py:4043
2962
msgid ""
2963
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2964
msgstr ""
2965
2966
#: bzrlib/builtins.py:4090
2967
msgid "Show version of bzr."
2968
msgstr ""
2969
2970
#: bzrlib/builtins.py:4094
2971
msgid "Print just the version number."
2972
msgstr ""
2973
2974
#: bzrlib/builtins.py:4113
2975
msgid "It sure does!\n"
2976
msgstr ""
2977
2978
#: bzrlib/builtins.py:4137
2979
#, python-format
2980
msgid "merge base is revision %s\n"
2981
msgstr ""
2982
2983
#: bzrlib/builtins.py:4141
2984
msgid "Perform a three-way merge."
2985
msgstr ""
2986
2987
#: bzrlib/builtins.py:4143
2988
msgid ""
2989
"The source of the merge can be specified either in the form of a branch,\n"
2990
"or in the form of a path to a file containing a merge directive generated\n"
2991
"with bzr send. If neither is specified, the default is the upstream branch\n"
2992
"or the branch most recently merged using --remember. The source of the\n"
2993
"merge may also be specified in the form of a path to a file in another\n"
2994
"branch: in this case, only the modifications to that file are merged into\n"
2995
"the current working tree."
2996
msgstr ""
2997
2998
#: bzrlib/builtins.py:4151
2999
msgid ""
3000
"When merging from a branch, by default bzr will try to merge in all new\n"
3001
"work from the other branch, automatically determining an appropriate base\n"
3002
"revision. If this fails, you may need to give an explicit base."
3003
msgstr ""
3004
3005
#: bzrlib/builtins.py:4155
3006
msgid ""
3007
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3008
"try to merge in all new work up to and including revision OTHER."
3009
msgstr ""
3010
3011
#: bzrlib/builtins.py:4158
3012
msgid ""
3013
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3014
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3015
"causes some revisions to be skipped, i.e. if the destination branch does\n"
3016
"not already contain revision BASE, such a merge is commonly referred to as\n"
3017
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
3018
"cherrypicks. The changes look like a normal commit, and the history of the\n"
3019
"changes from the other branch is not stored in the commit."
3020
msgstr ""
3021
3022
#: bzrlib/builtins.py:4166
3023
msgid "Revision numbers are always relative to the source branch."
3024
msgstr ""
3025
3026
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3027
msgid ""
3028
"Merge will do its best to combine the changes in two branches, but there\n"
3029
"are some kinds of problems only a human can fix. When it encounters those,\n"
3030
"it will mark a conflict. A conflict means that you need to fix something,\n"
3031
"before you should commit."
3032
msgstr ""
3033
3034
#: bzrlib/builtins.py:4173
3035
msgid ""
3036
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3037
msgstr ""
3038
3039
#: bzrlib/builtins.py:4175
3040
msgid ""
3041
"If there is no default branch set, the first merge will set it (use\n"
3042
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3043
"to use the default. To change the default, use --remember. The value will\n"
3044
"only be saved if the remote location can be accessed."
3045
msgstr ""
3046
3047
#: bzrlib/builtins.py:4180
3048
msgid ""
3049
"The results of the merge are placed into the destination working\n"
3050
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3051
"committed to record the result of the merge."
3052
msgstr ""
3053
3054
#: bzrlib/builtins.py:4184
3055
msgid ""
3056
"merge refuses to run if there are any uncommitted changes, unless\n"
3057
"--force is given. If --force is given, then the changes from the source \n"
3058
"will be merged with the current working tree, including any uncommitted\n"
3059
"changes in the tree. The --force option can also be used to create a\n"
3060
"merge revision which has more than two parents."
3061
msgstr ""
3062
3063
#: bzrlib/builtins.py:4190
3064
msgid ""
3065
"If one would like to merge changes from the working tree of the other\n"
3066
"branch without merging any committed revisions, the --uncommitted option\n"
3067
"can be given."
3068
msgstr ""
3069
3070
#: bzrlib/builtins.py:4194
3071
msgid ""
3072
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3073
"you to apply each diff hunk and file change, similar to \"shelve\"."
3074
msgstr ""
3075
3076
#: bzrlib/builtins.py:4197
3077
msgid ""
3078
":Examples:\n"
3079
" To merge all new revisions from bzr.dev::"
3080
msgstr ""
3081
3082
#: bzrlib/builtins.py:4200
3083
msgid " bzr merge ../bzr.dev"
3084
msgstr ""
3085
3086
#: bzrlib/builtins.py:4202
3087
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3088
msgstr ""
3089
3090
#: bzrlib/builtins.py:4204
3091
msgid " bzr merge -r 82 ../bzr.dev"
3092
msgstr ""
3093
3094
#: bzrlib/builtins.py:4206
3095
msgid " To merge the changes introduced by 82, without previous changes::"
3096
msgstr ""
3097
3098
#: bzrlib/builtins.py:4208
3099
msgid " bzr merge -r 81..82 ../bzr.dev"
3100
msgstr ""
3101
3102
#: bzrlib/builtins.py:4210
3103
msgid " To apply a merge directive contained in /tmp/merge::"
3104
msgstr ""
3105
3106
#: bzrlib/builtins.py:4212
3107
msgid " bzr merge /tmp/merge"
3108
msgstr ""
3109
3110
#: bzrlib/builtins.py:4214
3111
msgid ""
3112
" To create a merge revision with three parents from two branches\n"
3113
" feature1a and feature1b:"
3114
msgstr ""
3115
3116
#: bzrlib/builtins.py:4217
3117
msgid ""
3118
" bzr merge ../feature1a\n"
3119
" bzr merge ../feature1b --force\n"
3120
" bzr commit -m 'revision with three parents'"
3121
msgstr ""
3122
3123
#: bzrlib/builtins.py:4229
3124
msgid "Merge even if the destination tree has uncommitted changes."
3125
msgstr ""
3126
3127
#: bzrlib/builtins.py:4235
3128
msgid ""
3129
"Apply uncommitted changes from a working copy, instead of branch changes."
3130
msgstr ""
3131
3132
#: bzrlib/builtins.py:4237
3133
msgid ""
3134
"If the destination is already completely merged into the source, pull from "
3135
"the source rather than merging. When this happens, you do not need to "
3136
"commit the result."
3137
msgstr ""
3138
3139
#: bzrlib/builtins.py:4242
3140
msgid ""
3141
"Branch to merge into, rather than the one containing the working directory."
3142
msgstr ""
3143
3144
#: bzrlib/builtins.py:4244
3145
msgid "Instead of merging, show a diff of the merge."
3146
msgstr ""
3147
3148
#: bzrlib/builtins.py:4246
3149
msgid "Select changes interactively."
3150
msgstr ""
3151
3152
#: bzrlib/builtins.py:4268
3153
msgid ""
3154
"Merging into empty branches not currently supported, "
3155
"https://bugs.launchpad.net/bzr/+bug/308562"
3156
msgstr ""
3157
3158
#: bzrlib/builtins.py:4295
3159
msgid "Cannot use --uncommitted with bundles or merge directives."
3160
msgstr ""
3161
3162
#: bzrlib/builtins.py:4306
3163
msgid "Cannot use --uncommitted and --revision at the same time."
3164
msgstr ""
3165
3166
#: bzrlib/builtins.py:4326
3167
msgid "merger: "
3168
msgstr ""
3169
3170
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
3171
msgid "Nothing to do."
3172
msgstr ""
3173
3174
#: bzrlib/builtins.py:4332
3175
msgid "Cannot pull individual files"
3176
msgstr ""
3177
3178
#: bzrlib/builtins.py:4340
3179
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3180
msgstr ""
3181
3182
#: bzrlib/builtins.py:4398
3183
#, python-format
3184
msgid "Show-base is not supported for this merge type. %s"
3185
msgstr ""
3186
3187
#: bzrlib/builtins.py:4407
3188
#, python-format
3189
msgid "Conflict reduction is not supported for merge type %s."
3190
msgstr ""
3191
3192
#: bzrlib/builtins.py:4411
3193
msgid "Cannot do conflict reduction and show base."
3194
msgstr ""
3195
3196
#: bzrlib/builtins.py:4522
3197
msgid "No location specified or remembered"
3198
msgstr ""
3199
3200
#: bzrlib/builtins.py:4524
3201
msgid "{0} remembered {1} location {2}"
3202
msgstr ""
3203
3204
#: bzrlib/builtins.py:4530
3205
msgid "Redo a merge."
3206
msgstr ""
3207
3208
#: bzrlib/builtins.py:4532
3209
msgid ""
3210
"Use this if you want to try a different merge technique while resolving\n"
3211
"conflicts. Some merge techniques are better than others, and remerge\n"
3212
"lets you try different ones on different files."
3213
msgstr ""
3214
3215
#: bzrlib/builtins.py:4536
3216
msgid ""
3217
"The options for remerge have the same meaning and defaults as the ones for\n"
3218
"merge. The difference is that remerge can (only) be run when there is a\n"
3219
"pending merge, and it lets you specify particular files."
3220
msgstr ""
3221
3222
#: bzrlib/builtins.py:4540
3223
msgid ""
3224
":Examples:\n"
3225
" Re-do the merge of all conflicted files, and show the base text in\n"
3226
" conflict regions, in addition to the usual THIS and OTHER texts::"
3227
msgstr ""
3228
3229
#: bzrlib/builtins.py:4544
3230
msgid " bzr remerge --show-base"
3231
msgstr ""
3232
3233
#: bzrlib/builtins.py:4546
3234
msgid ""
3235
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3236
" additional processing to reduce the size of conflict regions::"
3237
msgstr ""
3238
3239
#: bzrlib/builtins.py:4549
3240
msgid " bzr remerge --merge-type weave --reprocess foobar"
3241
msgstr ""
3242
3243
#: bzrlib/builtins.py:4556
3244
msgid "Show base revision text in conflicts."
3245
msgstr ""
3246
3247
#: bzrlib/builtins.py:4568
3248
msgid ""
3249
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3250
"merges."
3251
msgstr ""
3252
3253
#: bzrlib/builtins.py:4624
3254
msgid "Revert files to a previous revision."
3255
msgstr ""
3256
3257
#: bzrlib/builtins.py:4626
3258
msgid ""
3259
"Giving a list of files will revert only those files. Otherwise, all files\n"
3260
"will be reverted. If the revision is not specified with '--revision', the\n"
3261
"last committed revision is used."
3262
msgstr ""
3263
3264
#: bzrlib/builtins.py:4630
3265
msgid ""
3266
"To remove only some changes, without reverting to a prior version, use\n"
3267
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3268
"will remove the changes introduced by the second last commit (-2), without\n"
3269
"affecting the changes introduced by the last commit (-1). To remove\n"
3270
"certain changes on a hunk-by-hunk basis, see the shelve command."
3271
msgstr ""
3272
3273
#: bzrlib/builtins.py:4636
3274
msgid ""
3275
"By default, any files that have been manually changed will be backed up\n"
3276
"first. (Files changed only by merge are not backed up.) Backup files have\n"
3277
"'.~#~' appended to their name, where # is a number."
3278
msgstr ""
3279
3280
#: bzrlib/builtins.py:4640
3281
msgid ""
3282
"When you provide files, you can use their current pathname or the pathname\n"
3283
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3284
"name. If you name a directory, all the contents of that directory will be\n"
3285
"reverted."
3286
msgstr ""
3287
3288
#: bzrlib/builtins.py:4645
3289
msgid ""
3290
"If you have newly added files since the target revision, they will be\n"
3291
"removed. If the files to be removed have been changed, backups will be\n"
3292
"created as above. Directories containing unknown files will not be\n"
3293
"deleted."
3294
msgstr ""
3295
3296
#: bzrlib/builtins.py:4650
3297
msgid ""
3298
"The working tree contains a list of revisions that have been merged but\n"
3299
"not yet committed. These revisions will be included as additional parents\n"
3300
"of the next commit. Normally, using revert clears that list as well as\n"
3301
"reverting the files. If any files are specified, revert leaves the list\n"
3302
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3303
".`` in the tree root to revert all files but keep the recorded merges,\n"
3304
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3305
"reverting any files."
3306
msgstr ""
3307
3308
#: bzrlib/builtins.py:4659
3309
msgid ""
3310
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3311
"changes from a branch in a single revision. To do this, perform the merge\n"
3312
"as desired. Then doing revert with the \"--forget-merges\" option will "
3313
"keep\n"
3314
"the content of the tree as it was, but it will clear the list of pending\n"
3315
"merges. The next commit will then contain all of the changes that are\n"
3316
"present in the other branch, but without any other parent revisions.\n"
3317
"Because this technique forgets where these changes originated, it may\n"
3318
"cause additional conflicts on later merges involving the same source and\n"
3319
"target branches."
3320
msgstr ""
3321
3322
#: bzrlib/builtins.py:4673
3323
msgid "Do not save backups of reverted files."
3324
msgstr ""
3325
3326
#: bzrlib/builtins.py:4675
3327
msgid "Remove pending merge marker, without changing any files."
3328
msgstr ""
3329
3330
#: bzrlib/builtins.py:4706
3331
msgid ""
3332
"Show help on a command or other topic.\n"
3333
" "
3334
msgstr ""
3335
3336
#: bzrlib/builtins.py:4711
3337
msgid "Show help on all commands."
3338
msgstr ""
3339
3340
#: bzrlib/builtins.py:4740
3341
msgid "Show unmerged/unpulled revisions between two branches."
3342
msgstr ""
3343
3344
#: bzrlib/builtins.py:4742
3345
msgid "OTHER_BRANCH may be local or remote."
3346
msgstr ""
3347
3348
#: bzrlib/builtins.py:4744
3349
msgid ""
3350
"To filter on a range of revisions, you can use the command -r begin..end\n"
3351
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3352
"also valid.\n"
3353
" \n"
3354
":Exit values:\n"
3355
" 1 - some missing revisions\n"
3356
" 0 - no missing revisions"
3357
msgstr ""
3358
3359
#: bzrlib/builtins.py:4754
3360
msgid ""
3361
" Determine the missing revisions between this and the branch at the\n"
3362
" remembered pull location::"
3363
msgstr ""
3364
3365
#: bzrlib/builtins.py:4757
3366
msgid " bzr missing"
3367
msgstr ""
3368
3369
#: bzrlib/builtins.py:4759
3370
msgid " Determine the missing revisions between this and another branch::"
3371
msgstr ""
3372
3373
#: bzrlib/builtins.py:4761
3374
msgid " bzr missing http://server/branch"
3375
msgstr ""
3376
3377
#: bzrlib/builtins.py:4763
3378
msgid ""
3379
" Determine the missing revisions up to a specific revision on the other\n"
3380
" branch::"
3381
msgstr ""
3382
3383
#: bzrlib/builtins.py:4766
3384
msgid " bzr missing -r ..-10"
3385
msgstr ""
3386
3387
#: bzrlib/builtins.py:4768
3388
msgid ""
3389
" Determine the missing revisions up to a specific revision on this\n"
3390
" branch::"
3391
msgstr ""
3392
3393
#: bzrlib/builtins.py:4771
3394
msgid " bzr missing --my-revision ..-10"
3395
msgstr ""
3396
3397
#: bzrlib/builtins.py:4778
3398
msgid "Reverse the order of revisions."
3399
msgstr ""
3400
3401
#: bzrlib/builtins.py:4780
3402
msgid "Display changes in the local branch only."
3403
msgstr ""
3404
3405
#: bzrlib/builtins.py:4781
3406
msgid "Same as --mine-only."
3407
msgstr ""
3408
3409
#: bzrlib/builtins.py:4783
3410
msgid "Display changes in the remote branch only."
3411
msgstr ""
3412
3413
#: bzrlib/builtins.py:4784
3414
msgid "Same as --theirs-only."
3415
msgstr ""
3416
3417
#: bzrlib/builtins.py:4789
3418
msgid ""
3419
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3420
"details."
3421
msgstr ""
3422
3423
#: bzrlib/builtins.py:4793
3424
msgid ""
3425
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3426
"details."
3427
msgstr ""
3428
3429
#: bzrlib/builtins.py:4796
3430
msgid "Show all revisions in addition to the mainline ones."
3431
msgstr ""
3432
3433
#: bzrlib/builtins.py:4850
3434
msgid "No peer location known or specified."
3435
msgstr ""
3436
3437
#: bzrlib/builtins.py:4854
3438
msgid "Using saved parent location: {0}\n"
3439
msgstr ""
3440
3441
#: bzrlib/builtins.py:4887
3442
#, python-format
3443
msgid "You have %d extra revision:\n"
3444
msgid_plural "You have %d extra revisions:\n"
3445
msgstr[0] ""
3446
msgstr[1] ""
3447
3448
#: bzrlib/builtins.py:4903
3449
#, python-format
3450
msgid "You are missing %d revision:\n"
3451
msgid_plural "You are missing %d revisions:\n"
3452
msgstr[0] ""
3453
msgstr[1] ""
3454
3455
#: bzrlib/builtins.py:4915
3456
msgid "This branch has no new revisions.\n"
3457
msgstr ""
3458
3459
#: bzrlib/builtins.py:4918
3460
msgid "Other branch has no new revisions.\n"
3461
msgstr ""
3462
3463
#: bzrlib/builtins.py:4923
3464
msgid "Branches are up to date.\n"
3465
msgstr ""
3466
3467
#: bzrlib/builtins.py:4934
3468
msgid "Compress the data within a repository."
3469
msgstr ""
3470
3471
#: bzrlib/builtins.py:4936
3472
msgid ""
3473
"This operation compresses the data within a bazaar repository. As\n"
3474
"bazaar supports automatic packing of repository, this operation is\n"
3475
"normally not required to be done manually."
3476
msgstr ""
3477
3478
#: bzrlib/builtins.py:4940
3479
msgid ""
3480
"During the pack operation, bazaar takes a backup of existing repository\n"
3481
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3482
"automatically when it is safe to do so. To save disk space by removing\n"
3483
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3484
"used."
3485
msgstr ""
3486
3487
#: bzrlib/builtins.py:4946
3488
msgid ""
3489
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3490
"during or immediately after repacking, you may be left with a state\n"
3491
"where the deletion has been written to disk but the new packs have not\n"
3492
"been. In this case the repository may be unusable."
3493
msgstr ""
3494
3495
#: bzrlib/builtins.py:4955
3496
msgid "Delete obsolete packs to save disk space."
3497
msgstr ""
3498
3499
#: bzrlib/builtins.py:4969
3500
msgid "List the installed plugins."
3501
msgstr ""
3502
3503
#: bzrlib/builtins.py:4971
3504
msgid ""
3505
"This command displays the list of installed plugins including\n"
3506
"version of plugin and a short description of each."
3507
msgstr ""
3508
3509
#: bzrlib/builtins.py:4974
3510
msgid "--verbose shows the path where each plugin is located."
3511
msgstr ""
3512
3513
#: bzrlib/builtins.py:4976
3514
msgid ""
3515
"A plugin is an external component for Bazaar that extends the\n"
3516
"revision control system, by adding or replacing code in Bazaar.\n"
3517
"Plugins can do a variety of things, including overriding commands,\n"
3518
"adding new commands, providing additional network transports and\n"
3519
"customizing log output."
3520
msgstr ""
3521
3522
#: bzrlib/builtins.py:4982
3523
msgid ""
3524
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3525
"for further information on plugins including where to find them and how to\n"
3526
"install them. Instructions are also provided there on how to write new\n"
3527
"plugins using the Python programming language."
3528
msgstr ""
3529
3530
#: bzrlib/builtins.py:4998
3531
msgid "Show testament (signing-form) of a revision."
3532
msgstr ""
3533
3534
#: bzrlib/builtins.py:5001
3535
msgid "Produce long-format testament."
3536
msgstr ""
3537
3538
#: bzrlib/builtins.py:5003
3539
msgid "Produce a strict-format testament."
3540
msgstr ""
3541
3542
#: bzrlib/builtins.py:5029
3543
msgid "Show the origin of each line in a file."
3544
msgstr ""
3545
3546
#: bzrlib/builtins.py:5031
3547
msgid ""
3548
"This prints out the given file with an annotation on the left side\n"
3549
"indicating which revision, author and date introduced the change."
3550
msgstr ""
3551
3552
#: bzrlib/builtins.py:5034
3553
msgid ""
3554
"If the origin is the same for a run of consecutive lines, it is\n"
3555
"shown only at the top, unless the --all option is given."
3556
msgstr ""
3557
3558
#: bzrlib/builtins.py:5042
3559
msgid "Show annotations on all lines."
3560
msgstr ""
3561
3562
#: bzrlib/builtins.py:5043
3563
msgid "Show commit date in annotations."
3564
msgstr ""
3565
3566
#: bzrlib/builtins.py:5130
3567
msgid "Cannot sign a range of non-revision-history revisions"
3568
msgstr ""
3569
3570
#: bzrlib/builtins.py:5142
3571
msgid "Please supply either one revision, or a range."
3572
msgstr ""
3573
3574
#: bzrlib/builtins.py:5146
3575
msgid ""
3576
"Convert the current branch into a checkout of the supplied branch.\n"
3577
"If no branch is supplied, rebind to the last bound location."
3578
msgstr ""
3579
3580
#: bzrlib/builtins.py:5149
3581
msgid ""
3582
"Once converted into a checkout, commits must succeed on the master branch\n"
3583
"before they will be applied to the local branch."
3584
msgstr ""
3585
3586
#: bzrlib/builtins.py:5152
3587
msgid ""
3588
"Bound branches use the nickname of its master branch unless it is set\n"
3589
"locally, in which case binding will update the local nickname to be\n"
3590
"that of the master."
3591
msgstr ""
3592
3593
#: bzrlib/builtins.py:5167
3594
msgid "No location supplied. This format does not remember old locations."
3595
msgstr ""
3596
3597
#: bzrlib/builtins.py:5172
3598
msgid "Branch is already bound"
3599
msgstr ""
3600
3601
#: bzrlib/builtins.py:5174
3602
msgid "No location supplied and no previous location known"
3603
msgstr ""
3604
3605
#: bzrlib/builtins.py:5180
3606
msgid "These branches have diverged. Try merging, and then bind again."
3607
msgstr ""
3608
3609
#: bzrlib/builtins.py:5187
3610
msgid "Convert the current checkout into a regular branch."
3611
msgstr ""
3612
3613
#: bzrlib/builtins.py:5189
3614
msgid ""
3615
"After unbinding, the local branch is considered independent and subsequent\n"
3616
"commits will be local only."
3617
msgstr ""
3618
3619
#: bzrlib/builtins.py:5200
3620
msgid "Local branch is not bound"
3621
msgstr ""
3622
3623
#: bzrlib/builtins.py:5204
3624
msgid "Remove the last committed revision."
3625
msgstr ""
3626
3627
#: bzrlib/builtins.py:5206
3628
msgid ""
3629
"--verbose will print out what is being removed.\n"
3630
"--dry-run will go through all the motions, but not actually\n"
3631
"remove anything."
3632
msgstr ""
3633
3634
#: bzrlib/builtins.py:5210
3635
msgid ""
3636
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3637
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3638
"branch at revision 15."
3639
msgstr ""
3640
3641
#: bzrlib/builtins.py:5214
3642
msgid ""
3643
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3644
"it may make is to restore any pending merges that were present before\n"
3645
"the commit."
3646
msgstr ""
3647
3648
#: bzrlib/builtins.py:5225
3649
msgid "Don't actually make changes."
3650
msgstr ""
3651
3652
#: bzrlib/builtins.py:5226
3653
msgid "Say yes to all questions."
3654
msgstr ""
3655
3656
#: bzrlib/builtins.py:5228
3657
msgid "Keep tags that point to removed revisions."
3658
msgstr ""
3659
3660
#: bzrlib/builtins.py:5230
3661
msgid "Only remove the commits from the local branch when in a checkout."
3662
msgstr ""
3663
3664
#: bzrlib/builtins.py:5279
3665
msgid "No revisions to uncommit.\n"
3666
msgstr ""
3667
3668
#: bzrlib/builtins.py:5294
3669
msgid "Dry-run, pretending to remove the above revisions.\n"
3670
msgstr ""
3671
3672
#: bzrlib/builtins.py:5297
3673
msgid "The above revision(s) will be removed.\n"
3674
msgstr ""
3675
3676
#: bzrlib/builtins.py:5301
3677
msgid "Uncommit these revisions"
3678
msgstr ""
3679
3680
#: bzrlib/builtins.py:5304
3681
msgid "Canceled\n"
3682
msgstr ""
3683
3684
#: bzrlib/builtins.py:5311
3685
#, python-format
3686
msgid ""
3687
"You can restore the old tip by running:\n"
3688
" bzr pull . -r revid:%s\n"
3689
msgstr ""
3690
3691
#: bzrlib/builtins.py:5316
3692
msgid "Break a dead lock."
3693
msgstr ""
3694
3695
#: bzrlib/builtins.py:5318
3696
msgid ""
3697
"This command breaks a lock on a repository, branch, working directory or\n"
3698
"config file."
3699
msgstr ""
3700
3701
#: bzrlib/builtins.py:5321
3702
msgid ""
3703
"CAUTION: Locks should only be broken when you are sure that the process\n"
3704
"holding the lock has been stopped."
3705
msgstr ""
3706
3707
#: bzrlib/builtins.py:5324
3708
msgid ""
3709
"You can get information on what locks are open via the 'bzr info\n"
3710
"[location]' command."
3711
msgstr ""
3712
3713
#: bzrlib/builtins.py:5327
3714
msgid ""
3715
":Examples:\n"
3716
" bzr break-lock\n"
3717
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3718
" bzr break-lock --conf ~/.bazaar"
3719
msgstr ""
3720
3721
#: bzrlib/builtins.py:5336
3722
msgid "LOCATION is the directory where the config lock is."
3723
msgstr ""
3724
3725
#: bzrlib/builtins.py:5338
3726
msgid "Do not ask for confirmation before breaking the lock."
3727
msgstr ""
3728
3729
#: bzrlib/builtins.py:5373
3730
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3731
msgstr ""
3732
3733
#: bzrlib/builtins.py:5374
3734
msgid "Run the bzr server."
3735
msgstr ""
3736
3737
#: bzrlib/builtins.py:5380
3738
msgid "Serve on stdin/out for use from inetd or sshd."
3739
msgstr ""
3740
3741
#: bzrlib/builtins.py:5381
3742
msgid "protocol"
3743
msgstr ""
3744
3745
#: bzrlib/builtins.py:5382
3746
msgid "Protocol to serve."
3747
msgstr ""
3748
3749
#: bzrlib/builtins.py:5386
3750
msgid ""
3751
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3752
"Passing 0 as the port number will result in a dynamically allocated port. "
3753
"The default port depends on the protocol."
3754
msgstr ""
3755
3756
#: bzrlib/builtins.py:5392
3757
msgid "Serve contents of this directory."
3758
msgstr ""
3759
3760
#: bzrlib/builtins.py:5394
3761
msgid ""
3762
"By default the server is a readonly server. Supplying --allow-writes "
3763
"enables write access to the contents of the served directory and below. "
3764
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3765
"of external authentication is arranged supplying this option leads to global "
3766
"uncontrolled write access to your file system."
3767
msgstr ""
3768
3769
#: bzrlib/builtins.py:5403
3770
msgid "Override the default idle client timeout (5min)."
3771
msgstr ""
3772
3773
#: bzrlib/builtins.py:5453
3774
msgid "Combine a tree into its containing tree."
3775
msgstr ""
3776
3777
#: bzrlib/builtins.py:5455
3778
msgid "This command requires the target tree to be in a rich-root format."
3779
msgstr ""
3780
3781
#: bzrlib/builtins.py:5457
3782
msgid ""
3783
"The TREE argument should be an independent tree, inside another tree, but\n"
3784
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3785
"running \"bzr branch\" with the target inside a tree.)"
3786
msgstr ""
3787
3788
#: bzrlib/builtins.py:5461
3789
msgid ""
3790
"The result is a combined tree, with the subtree no longer an independent\n"
3791
"part. This is marked as a merge of the subtree into the containing tree,\n"
3792
"and all history is preserved."
3793
msgstr ""
3794
3795
#: bzrlib/builtins.py:5479
3796
#, python-format
3797
msgid ""
3798
"Can't join trees because %s doesn't support rich root data.\n"
3799
"You can use bzr upgrade on the repository."
3800
msgstr ""
3801
3802
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3803
msgid "Cannot join {0}. {1}"
3804
msgstr ""
3805
3806
#: bzrlib/builtins.py:5499
3807
msgid "Split a subdirectory of a tree into a separate tree."
3808
msgstr ""
3809
3810
#: bzrlib/builtins.py:5501
3811
msgid ""
3812
"This command will produce a target tree in a format that supports\n"
3813
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3814
"converted into earlier formats like 'dirstate-tags'."
3815
msgstr ""
3816
3817
#: bzrlib/builtins.py:5505
3818
msgid ""
3819
"The TREE argument should be a subdirectory of a working tree. That\n"
3820
"subdirectory will be converted into an independent tree, with its own\n"
3821
"branch. Commits in the top-level tree will not apply to the new subtree."
3822
msgstr ""
3823
3824
#: bzrlib/builtins.py:5585
3825
msgid "No submit branch specified or known"
3826
msgstr ""
3827
3828
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3829
msgid "No public branch specified or known"
3830
msgstr ""
3831
3832
#: bzrlib/builtins.py:5598
3833
msgid "bzr merge-directive takes at most two one revision identifiers"
3834
msgstr ""
3835
3836
#: bzrlib/builtins.py:5607
3837
msgid "No revisions to bundle."
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:5626
3841
msgid "Mail or create a merge-directive for submitting changes."
3842
msgstr ""
3843
3844
#: bzrlib/builtins.py:5628
3845
msgid "A merge directive provides many things needed for requesting merges:"
3846
msgstr ""
3847
3848
#: bzrlib/builtins.py:5630
3849
msgid "* A machine-readable description of the merge to perform"
3850
msgstr ""
3851
3852
#: bzrlib/builtins.py:5632
3853
msgid "* An optional patch that is a preview of the changes requested"
3854
msgstr ""
3855
3856
#: bzrlib/builtins.py:5634
3857
msgid ""
3858
"* An optional bundle of revision data, so that the changes can be applied\n"
3859
" directly from the merge directive, without retrieving data from a\n"
3860
" branch."
3861
msgstr ""
3862
3863
#: bzrlib/builtins.py:5638
3864
msgid ""
3865
"`bzr send` creates a compact data set that, when applied using bzr\n"
3866
"merge, has the same effect as merging from the source branch. "
3867
msgstr ""
3868
3869
#: bzrlib/builtins.py:5641
3870
msgid ""
3871
"By default the merge directive is self-contained and can be applied to any\n"
3872
"branch containing submit_branch in its ancestory without needing access to\n"
3873
"the source branch."
3874
msgstr ""
3875
3876
#: bzrlib/builtins.py:5645
3877
msgid ""
3878
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3879
"revisions, but only a structured request to merge from the\n"
3880
"public_location. In that case the public_branch is needed and it must be\n"
3881
"up-to-date and accessible to the recipient. The public_branch is always\n"
3882
"included if known, so that people can check it later."
3883
msgstr ""
3884
3885
#: bzrlib/builtins.py:5651
3886
msgid ""
3887
"The submit branch defaults to the parent of the source branch, but can be\n"
3888
"overridden. Both submit branch and public branch will be remembered in\n"
3889
"branch.conf the first time they are used for a particular branch. The\n"
3890
"source branch defaults to that containing the working directory, but can\n"
3891
"be changed using --from."
3892
msgstr ""
3893
3894
#: bzrlib/builtins.py:5657
3895
msgid ""
3896
"Both the submit branch and the public branch follow the usual behavior with\n"
3897
"respect to --remember: If there is no default location set, the first send\n"
3898
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3899
"omit the location to use the default. To change the default, use\n"
3900
"--remember. The value will only be saved if the location can be accessed."
3901
msgstr ""
3902
3903
#: bzrlib/builtins.py:5663
3904
msgid ""
3905
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3906
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3907
"If a public location is known for the submit_branch, that location is used\n"
3908
"in the merge directive."
3909
msgstr ""
3910
3911
#: bzrlib/builtins.py:5668
3912
msgid ""
3913
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3914
"given, in which case it is sent to a file."
3915
msgstr ""
3916
3917
#: bzrlib/builtins.py:5671
3918
msgid ""
3919
"Mail is sent using your preferred mail program. This should be transparent\n"
3920
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3921
"If the preferred client can't be found (or used), your editor will be used."
3922
msgstr ""
3923
3924
#: bzrlib/builtins.py:5675
3925
msgid ""
3926
"To use a specific mail program, set the mail_client configuration option.\n"
3927
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3928
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3929
"(MacOS X's\n"
3930
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3931
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3932
"add\n"
3933
"supported clients."
3934
msgstr ""
3935
3936
#: bzrlib/builtins.py:5682
3937
msgid ""
3938
"If mail is being sent, a to address is required. This can be supplied\n"
3939
"either on the commandline, by setting the submit_to configuration\n"
3940
"option in the branch itself or the child_submit_to configuration option\n"
3941
"in the submit branch."
3942
msgstr ""
3943
3944
#: bzrlib/builtins.py:5687
3945
msgid ""
3946
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3947
"and\n"
3948
"merge directive format 2. It is significantly faster and smaller than\n"
3949
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3950
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3951
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3952
msgstr ""
3953
3954
#: bzrlib/builtins.py:5693
3955
msgid ""
3956
"The merge directives created by bzr send may be applied using bzr merge or\n"
3957
"bzr pull by specifying a file containing a merge directive as the location."
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:5696
3961
msgid ""
3962
"bzr send makes extensive use of public locations to map local locations "
3963
"into\n"
3964
"URLs that can be used by other people. See `bzr help configuration` to\n"
3965
"set them, and use `bzr info` to display them."
3966
msgstr ""
3967
3968
#: bzrlib/builtins.py:5720
3969
msgid "Write merge directive to this file or directory; use - for stdout."
3970
msgstr ""
3971
3972
#: bzrlib/builtins.py:5724
3973
msgid ""
3974
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3975
"strict disables the check."
3976
msgstr ""
3977
3978
#: bzrlib/builtins.py:5726
3979
msgid "Mail the request to this address."
3980
msgstr ""
3981
3982
#: bzrlib/builtins.py:5730
3983
msgid "Body for the email."
3984
msgstr ""
3985
3986
#: bzrlib/builtins.py:5783
3987
msgid "Do not include a bundle in the merge directive."
3988
msgstr ""
3989
3990
#: bzrlib/builtins.py:5784
3991
msgid "Do not include a preview patch in the merge directive."
3992
msgstr ""
3993
3994
#: bzrlib/builtins.py:5787
3995
msgid "Remember submit and public branch."
3996
msgstr ""
3997
3998
#: bzrlib/builtins.py:5789
3999
msgid ""
4000
"Branch to generate the submission from, rather than the one containing the "
4001
"working directory."
4002
msgstr ""
4003
4004
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
4005
msgid "format"
4006
msgstr ""
4007
4008
#: bzrlib/builtins.py:5800
4009
msgid "Use the specified output format."
4010
msgstr ""
4011
4012
#: bzrlib/builtins.py:5822
4013
msgid "Create, remove or modify a tag naming a revision."
4014
msgstr ""
4015
4016
#: bzrlib/builtins.py:5824
4017
msgid ""
4018
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4019
"(--revision) option can be given -rtag:X, where X is any previously\n"
4020
"created tag."
4021
msgstr ""
4022
4023
#: bzrlib/builtins.py:5828
4024
msgid ""
4025
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4026
"along when you branch, push, pull or merge."
4027
msgstr ""
4028
4029
#: bzrlib/builtins.py:5831
4030
msgid ""
4031
"It is an error to give a tag name that already exists unless you pass\n"
4032
"--force, in which case the tag is moved to point to the new revision."
4033
msgstr ""
4034
4035
#: bzrlib/builtins.py:5834
4036
msgid ""
4037
"To rename a tag (change the name but keep it on the same revsion), run "
4038
"``bzr\n"
4039
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4040
msgstr ""
4041
4042
#: bzrlib/builtins.py:5837
4043
msgid ""
4044
"If no tag name is specified it will be determined through the \n"
4045
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4046
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4047
"details."
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:5847
4051
msgid "Delete this tag rather than placing it."
4052
msgstr ""
4053
4054
#: bzrlib/builtins.py:5850
4055
msgid "Branch in which to place the tag."
4056
msgstr ""
4057
4058
#: bzrlib/builtins.py:5852
4059
msgid "Replace existing tags."
4060
msgstr ""
4061
4062
#: bzrlib/builtins.py:5867
4063
msgid "No tag specified to delete."
4064
msgstr ""
4065
4066
#: bzrlib/builtins.py:5869
4067
#, python-format
4068
msgid "Deleted tag %s."
4069
msgstr ""
4070
4071
#: bzrlib/builtins.py:5883
4072
msgid "Please specify a tag name."
4073
msgstr ""
4074
4075
#: bzrlib/builtins.py:5891
4076
#, python-format
4077
msgid "Tag %s already exists for that revision."
4078
msgstr ""
4079
4080
#: bzrlib/builtins.py:5895
4081
#, python-format
4082
msgid "Created tag %s."
4083
msgstr ""
4084
4085
#: bzrlib/builtins.py:5897
4086
#, python-format
4087
msgid "Updated tag %s."
4088
msgstr ""
4089
4090
#: bzrlib/builtins.py:5901
4091
msgid "List tags."
4092
msgstr ""
4093
4094
#: bzrlib/builtins.py:5903
4095
msgid ""
4096
"This command shows a table of tag names and the revisions they reference."
4097
msgstr ""
4098
4099
#: bzrlib/builtins.py:5909
4100
msgid "Branch whose tags should be displayed."
4101
msgstr ""
4102
4103
#: bzrlib/builtins.py:5911
4104
msgid "Sort tags by different criteria."
4105
msgstr ""
4106
4107
#: bzrlib/builtins.py:5911
4108
msgid "Sorting"
4109
msgstr ""
4110
4111
#: bzrlib/builtins.py:5980
4112
msgid "Reconfigure the type of a bzr directory."
4113
msgstr ""
4114
4115
#: bzrlib/builtins.py:5982
4116
msgid "A target configuration must be specified."
4117
msgstr ""
4118
4119
#: bzrlib/builtins.py:5984
4120
msgid ""
4121
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4122
"The order of preference is\n"
4123
"1. For a lightweight checkout, the current bound location.\n"
4124
"2. For branches that used to be checkouts, the previously-bound location.\n"
4125
"3. The push location.\n"
4126
"4. The parent location.\n"
4127
"If none of these is available, --bind-to must be specified."
4128
msgstr ""
4129
4130
#: bzrlib/builtins.py:5998
4131
msgid "Tree type"
4132
msgstr ""
4133
4134
#: bzrlib/builtins.py:5999
4135
msgid "The relation between branch and tree."
4136
msgstr ""
4137
4138
#: bzrlib/builtins.py:6001
4139
msgid "Reconfigure to be an unbound branch with no working tree."
4140
msgstr ""
4141
4142
#: bzrlib/builtins.py:6002
4143
msgid "Reconfigure to be an unbound branch with a working tree."
4144
msgstr ""
4145
4146
#: bzrlib/builtins.py:6003
4147
msgid "Reconfigure to be a bound branch with a working tree."
4148
msgstr ""
4149
4150
#: bzrlib/builtins.py:6004
4151
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4152
msgstr ""
4153
4154
#: bzrlib/builtins.py:6009
4155
msgid "Repository type"
4156
msgstr ""
4157
4158
#: bzrlib/builtins.py:6010
4159
msgid "Location fo the repository."
4160
msgstr ""
4161
4162
#: bzrlib/builtins.py:6012
4163
msgid ""
4164
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4165
msgstr ""
4166
4167
#: bzrlib/builtins.py:6014
4168
msgid "Reconfigure to use a shared repository."
4169
msgstr ""
4170
4171
#: bzrlib/builtins.py:6018
4172
msgid "Trees in Repository"
4173
msgstr ""
4174
4175
#: bzrlib/builtins.py:6019
4176
msgid "Whether new branches in the repository have trees."
4177
msgstr ""
4178
4179
#: bzrlib/builtins.py:6021
4180
msgid ""
4181
"Reconfigure repository to create working trees on branches by default."
4182
msgstr ""
4183
4184
#: bzrlib/builtins.py:6023
4185
msgid ""
4186
"Reconfigure repository to not create working trees on branches by default."
4187
msgstr ""
4188
4189
#: bzrlib/builtins.py:6026
4190
msgid "Branch to bind checkout to."
4191
msgstr ""
4192
4193
#: bzrlib/builtins.py:6028
4194
msgid "Perform reconfiguration even if local changes will be lost."
4195
msgstr ""
4196
4197
#: bzrlib/builtins.py:6031
4198
msgid "Reconfigure a branch to be stacked on another branch."
4199
msgstr ""
4200
4201
#: bzrlib/builtins.py:6035
4202
msgid ""
4203
"Reconfigure a branch to be unstacked. This may require copying substantial "
4204
"data into it."
4205
msgstr ""
4206
4207
#: bzrlib/builtins.py:6045
4208
msgid "Can't use both --stacked-on and --unstacked"
4209
msgstr ""
4210
4211
#: bzrlib/builtins.py:6059
4212
msgid "No target configuration specified"
4213
msgstr ""
4214
4215
#: bzrlib/builtins.py:6094
4216
msgid "Set the branch of a checkout and update."
4217
msgstr ""
4218
4219
#: bzrlib/builtins.py:6096
4220
msgid ""
4221
"For lightweight checkouts, this changes the branch being referenced.\n"
4222
"For heavyweight checkouts, this checks that there are no local commits\n"
4223
"versus the current bound branch, then it makes the local branch a mirror\n"
4224
"of the new location and binds to it."
4225
msgstr ""
4226
4227
#: bzrlib/builtins.py:6101
4228
msgid ""
4229
"In both cases, the working tree is updated and uncommitted changes\n"
4230
"are merged. The user can commit or revert these as they desire."
4231
msgstr ""
4232
4233
#: bzrlib/builtins.py:6104
4234
msgid "Pending merges need to be committed or reverted before using switch."
4235
msgstr ""
4236
4237
#: bzrlib/builtins.py:6106
4238
msgid ""
4239
"The path to the branch to switch to can be specified relative to the parent\n"
4240
"directory of the current branch. For example, if you are currently in a\n"
4241
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4242
"/path/to/newbranch."
4243
msgstr ""
4244
4245
#: bzrlib/builtins.py:6111
4246
msgid ""
4247
"Bound branches use the nickname of its master branch unless it is set\n"
4248
"locally, in which case switching will update the local nickname to be\n"
4249
"that of the master."
4250
msgstr ""
4251
4252
#: bzrlib/builtins.py:6119
4253
msgid "Switch even if local commits will be lost."
4254
msgstr ""
4255
4256
#: bzrlib/builtins.py:6122
4257
msgid "Create the target branch from this one before switching to it."
4258
msgstr ""
4259
4260
#: bzrlib/builtins.py:6134
4261
msgid "You must supply either a revision or a location"
4262
msgstr ""
4263
4264
#: bzrlib/builtins.py:6145
4265
msgid "cannot create branch without source branch"
4266
msgstr ""
4267
4268
#: bzrlib/builtins.py:6209
4269
msgid "Manage filtered views."
4270
msgstr ""
4271
4272
#: bzrlib/builtins.py:6211
4273
msgid ""
4274
"Views provide a mask over the tree so that users can focus on\n"
4275
"a subset of a tree when doing their work. After creating a view,\n"
4276
"commands that support a list of files - status, diff, commit, etc -\n"
4277
"effectively have that list of files implicitly given each time.\n"
4278
"An explicit list of files can still be given but those files\n"
4279
"must be within the current view."
4280
msgstr ""
4281
4282
#: bzrlib/builtins.py:6218
4283
msgid ""
4284
"In most cases, a view has a short life-span: it is created to make\n"
4285
"a selected change and is deleted once that change is committed.\n"
4286
"At other times, you may wish to create one or more named views\n"
4287
"and switch between them."
4288
msgstr ""
4289
4290
#: bzrlib/builtins.py:6223
4291
msgid ""
4292
"To disable the current view without deleting it, you can switch to\n"
4293
"the pseudo view called ``off``. This can be useful when you need\n"
4294
"to see the whole tree for an operation or two (e.g. merge) but\n"
4295
"want to switch back to your view after that."
4296
msgstr ""
4297
4298
#: bzrlib/builtins.py:6228
4299
msgid ""
4300
":Examples:\n"
4301
" To define the current view::"
4302
msgstr ""
4303
4304
#: bzrlib/builtins.py:6231
4305
msgid " bzr view file1 dir1 ..."
4306
msgstr ""
4307
4308
#: bzrlib/builtins.py:6233
4309
msgid " To list the current view::"
4310
msgstr ""
4311
4312
#: bzrlib/builtins.py:6235
4313
msgid " bzr view"
4314
msgstr ""
4315
4316
#: bzrlib/builtins.py:6237
4317
msgid " To delete the current view::"
4318
msgstr ""
4319
4320
#: bzrlib/builtins.py:6239
4321
msgid " bzr view --delete"
4322
msgstr ""
4323
4324
#: bzrlib/builtins.py:6241
4325
msgid " To disable the current view without deleting it::"
4326
msgstr ""
4327
4328
#: bzrlib/builtins.py:6243
4329
msgid " bzr view --switch off"
4330
msgstr ""
4331
4332
#: bzrlib/builtins.py:6245
4333
msgid " To define a named view and switch to it::"
4334
msgstr ""
4335
4336
#: bzrlib/builtins.py:6247
4337
msgid " bzr view --name view-name file1 dir1 ..."
4338
msgstr ""
4339
4340
#: bzrlib/builtins.py:6249
4341
msgid " To list a named view::"
4342
msgstr ""
4343
4344
#: bzrlib/builtins.py:6251
4345
msgid " bzr view --name view-name"
4346
msgstr ""
4347
4348
#: bzrlib/builtins.py:6253
4349
msgid " To delete a named view::"
4350
msgstr ""
4351
4352
#: bzrlib/builtins.py:6255
4353
msgid " bzr view --name view-name --delete"
4354
msgstr ""
4355
4356
#: bzrlib/builtins.py:6257
4357
msgid " To switch to a named view::"
4358
msgstr ""
4359
4360
#: bzrlib/builtins.py:6259
4361
msgid " bzr view --switch view-name"
4362
msgstr ""
4363
4364
#: bzrlib/builtins.py:6261
4365
msgid " To list all views defined::"
4366
msgstr ""
4367
4368
#: bzrlib/builtins.py:6263
4369
msgid " bzr view --all"
4370
msgstr ""
4371
4372
#: bzrlib/builtins.py:6265
4373
msgid " To delete all views::"
4374
msgstr ""
4375
4376
#: bzrlib/builtins.py:6267
4377
msgid " bzr view --delete --all"
4378
msgstr ""
4379
4380
#: bzrlib/builtins.py:6274
4381
msgid "Apply list or delete action to all views."
4382
msgstr ""
4383
4384
#: bzrlib/builtins.py:6277
4385
msgid "Delete the view."
4386
msgstr ""
4387
4388
#: bzrlib/builtins.py:6280
4389
msgid "Name of the view to define, list or delete."
4390
msgstr ""
4391
4392
#: bzrlib/builtins.py:6284
4393
msgid "Name of the view to switch to."
4394
msgstr ""
4395
4396
#: bzrlib/builtins.py:6303
4397
msgid "Both --delete and a file list specified"
4398
msgstr ""
4399
4400
#: bzrlib/builtins.py:6306
4401
msgid "Both --delete and --switch specified"
4402
msgstr ""
4403
4404
#: bzrlib/builtins.py:6309
4405
msgid "Deleted all views.\n"
4406
msgstr ""
4407
4408
#: bzrlib/builtins.py:6311
4409
msgid "No current view to delete"
4410
msgstr ""
4411
4412
#: bzrlib/builtins.py:6314
4413
#, python-format
4414
msgid "Deleted '%s' view.\n"
4415
msgstr ""
4416
4417
#: bzrlib/builtins.py:6318
4418
msgid "Both --switch and a file list specified"
4419
msgstr ""
4420
4421
#: bzrlib/builtins.py:6321
4422
msgid "Both --switch and --all specified"
4423
msgstr ""
4424
4425
#: bzrlib/builtins.py:6324
4426
msgid "No current view to disable"
4427
msgstr ""
4428
4429
#: bzrlib/builtins.py:6326
4430
#, python-format
4431
msgid "Disabled '%s' view.\n"
4432
msgstr ""
4433
4434
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4435
msgid "Using '{0}' view: {1}\n"
4436
msgstr ""
4437
4438
#: bzrlib/builtins.py:6333
4439
msgid "Views defined:\n"
4440
msgstr ""
4441
4442
#: bzrlib/builtins.py:6342
4443
msgid "No views defined.\n"
4444
msgstr ""
4445
4446
#: bzrlib/builtins.py:6349
4447
msgid "Cannot change the 'off' pseudo view"
4448
msgstr ""
4449
4450
#: bzrlib/builtins.py:6357
4451
msgid "No current view.\n"
4452
msgstr ""
4453
4454
#: bzrlib/builtins.py:6360
4455
msgid "'{0}' view is: {1}\n"
4456
msgstr ""
4457
4458
#: bzrlib/builtins.py:6380
4459
msgid " <no hooks installed>\n"
4460
msgstr ""
4461
4462
#: bzrlib/builtins.py:6384
4463
msgid "Remove a branch."
4464
msgstr ""
4465
4466
#: bzrlib/builtins.py:6386
4467
msgid ""
4468
"This will remove the branch from the specified location but \n"
4469
"will keep any working tree or repository in place."
4470
msgstr ""
4471
4472
#: bzrlib/builtins.py:6391
4473
msgid " Remove the branch at repo/trunk::"
4474
msgstr ""
4475
4476
#: bzrlib/builtins.py:6393
4477
msgid " bzr remove-branch repo/trunk"
4478
msgstr ""
4479
4480
#: bzrlib/builtins.py:6408
4481
msgid "Plaintext diff output."
4482
msgstr ""
4483
4484
#: bzrlib/builtins.py:6409
4485
msgid "Temporarily set aside some changes from the current tree."
4486
msgstr ""
4487
4488
#: bzrlib/builtins.py:6411
4489
msgid ""
4490
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4491
"ie. out of the way, until a later time when you can bring them back from\n"
4492
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4493
"your working tree, and so they aren't propagated along with your branch nor\n"
4494
"will they survive its deletion."
4495
msgstr ""
4496
4497
#: bzrlib/builtins.py:6417
4498
msgid "If shelve --list is specified, previously-shelved changes are listed."
4499
msgstr ""
4500
4501
#: bzrlib/builtins.py:6419
4502
msgid ""
4503
"Shelve is intended to help separate several sets of changes that have\n"
4504
"been inappropriately mingled. If you just want to get rid of all changes\n"
4505
"and you don't need to restore them later, use revert. If you want to\n"
4506
"shelve all text changes at once, use shelve --all."
4507
msgstr ""
4508
4509
#: bzrlib/builtins.py:6424
4510
msgid ""
4511
"If filenames are specified, only the changes to those files will be\n"
4512
"shelved. Other files will be left untouched."
4513
msgstr ""
4514
4515
#: bzrlib/builtins.py:6427
4516
msgid ""
4517
"If a revision is specified, changes since that revision will be shelved."
4518
msgstr ""
4519
4520
#: bzrlib/builtins.py:6429
4521
msgid ""
4522
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4523
"restore the most recently shelved changes."
4524
msgstr ""
4525
4526
#: bzrlib/builtins.py:6432
4527
msgid ""
4528
"For complicated changes, it is possible to edit the changes in a separate\n"
4529
"editor program to decide what the file remaining in the working copy\n"
4530
"should look like. To do this, add the configuration option"
4531
msgstr ""
4532
4533
#: bzrlib/builtins.py:6436
4534
msgid " change_editor = PROGRAM @new_path @old_path"
4535
msgstr ""
4536
4537
#: bzrlib/builtins.py:6438
4538
msgid ""
4539
"where @new_path is replaced with the path of the new version of the \n"
4540
"file and @old_path is replaced with the path of the old version of \n"
4541
"the file. The PROGRAM should save the new file with the desired \n"
4542
"contents of the file in the working tree.\n"
4543
" "
4544
msgstr ""
4545
4546
#: bzrlib/builtins.py:6450
4547
msgid "Shelve all changes."
4548
msgstr ""
4549
4550
#: bzrlib/builtins.py:6452
4551
msgid "Method to use for writing diffs."
4552
msgstr ""
4553
4554
#: bzrlib/builtins.py:6452
4555
msgid "writer"
4556
msgstr ""
4557
4558
#: bzrlib/builtins.py:6456
4559
msgid "List shelved changes."
4560
msgstr ""
4561
4562
#: bzrlib/builtins.py:6458
4563
msgid "Destroy removed changes instead of shelving them."
4564
msgstr ""
4565
4566
#: bzrlib/builtins.py:6487
4567
msgid "No shelved changes."
4568
msgstr ""
4569
4570
#: bzrlib/builtins.py:6498
4571
msgid "Restore shelved changes."
4572
msgstr ""
4573
4574
#: bzrlib/builtins.py:6500
4575
msgid ""
4576
"By default, the most recently shelved changes are restored. However if you\n"
4577
"specify a shelf by id those changes will be restored instead. This works\n"
4578
"best when the changes don't depend on each other."
4579
msgstr ""
4580
4581
#: bzrlib/builtins.py:6509
4582
msgid "The action to perform."
4583
msgstr ""
4584
4585
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4586
msgid "action"
4587
msgstr ""
4588
4589
#: bzrlib/builtins.py:6511
4590
msgid "Apply changes and remove from the shelf."
4591
msgstr ""
4592
4593
#: bzrlib/builtins.py:6512
4594
msgid "Show changes, but do not apply or remove them."
4595
msgstr ""
4596
4597
#: bzrlib/builtins.py:6513
4598
msgid ""
4599
"Instead of unshelving the changes, show the diff that would result from "
4600
"unshelving."
4601
msgstr ""
4602
4603
#: bzrlib/builtins.py:6515
4604
msgid "Delete changes without applying them."
4605
msgstr ""
4606
4607
#: bzrlib/builtins.py:6516
4608
msgid "Apply changes but don't delete them."
4609
msgstr ""
4610
4611
#: bzrlib/builtins.py:6531
4612
msgid "Remove unwanted files from working tree."
4613
msgstr ""
4614
4615
#: bzrlib/builtins.py:6533
4616
msgid ""
4617
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4618
"files are never deleted."
4619
msgstr ""
4620
4621
#: bzrlib/builtins.py:6536
4622
msgid ""
4623
"Another class is 'detritus', which includes files emitted by bzr during\n"
4624
"normal operations and selftests. (The value of these files decreases with\n"
4625
"time.)"
4626
msgstr ""
4627
4628
#: bzrlib/builtins.py:6540
4629
msgid ""
4630
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4631
"flags are respected, and may be combined."
4632
msgstr ""
4633
4634
#: bzrlib/builtins.py:6543
4635
msgid "To check what clean-tree will do, use --dry-run."
4636
msgstr ""
4637
4638
#: bzrlib/builtins.py:6546
4639
msgid "Delete all ignored files."
4640
msgstr ""
4641
4642
#: bzrlib/builtins.py:6547
4643
msgid ""
4644
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4645
msgstr ""
4646
4647
#: bzrlib/builtins.py:6550
4648
msgid "Delete files unknown to bzr (default)."
4649
msgstr ""
4650
4651
#: bzrlib/builtins.py:6551
4652
msgid "Show files to delete instead of deleting them."
4653
msgstr ""
4654
4655
#: bzrlib/builtins.py:6553
4656
msgid "Do not prompt before deleting."
4657
msgstr ""
4658
4659
#: bzrlib/bundle/__init__.py:59
4660
msgid "A directory cannot be a bundle"
4661
msgstr ""
4662
4663
#: bzrlib/bundle/apply_bundle.py:40
4664
msgid "Install revisions"
4665
msgstr ""
4666
4667
#: bzrlib/bundle/commands.py:64
4668
msgid "--verbose requires a merge directive"
4669
msgstr ""
4670
4671
#: bzrlib/bundle/commands.py:67
4672
msgid "Bundle format not supported"
4673
msgstr ""
4674
4675
#: bzrlib/bundle/commands.py:77
4676
msgid "Records\n"
4677
msgstr ""
4678
4679
#: bzrlib/bundle/commands.py:81
4680
msgid "{0}: {1} ({2} multiparent)\n"
4681
msgstr ""
4682
4683
#: bzrlib/bundle/commands.py:83
4684
#, python-format
4685
msgid "unique files: %d\n"
4686
msgstr ""
4687
4688
#: bzrlib/bundle/commands.py:92
4689
msgid "Revisions\n"
4690
msgstr ""
4691
4692
#: bzrlib/bundle/commands.py:93
4693
#, python-format
4694
msgid "nicks: %s\n"
4695
msgstr ""
4696
4697
#: bzrlib/bundle/commands.py:95
4698
#, python-format
4699
msgid ""
4700
"committers: \n"
4701
"%s\n"
4702
msgstr ""
4703
4704
#: bzrlib/bundle/commands.py:103
4705
msgid "Decoded contents\n"
4706
msgstr ""
4707
4708
#: bzrlib/bundle/serializer/v4.py:327
4709
#, python-format
4710
msgid "Bundling %d revision."
4711
msgid_plural "Bundling %d revisions."
4712
msgstr[0] ""
4713
msgstr[1] ""
4714
4715
#: bzrlib/bzrdir.py:489
4716
msgid ""
4717
"making backup of {0}\n"
4718
" to {1}"
4719
msgstr ""
4720
4721
#: bzrlib/bzrdir.py:512
4722
msgid "renamed {0} to {1}"
4723
msgstr ""
4724
4725
#: bzrlib/bzrdir.py:1663
4726
#, python-format
4727
msgid ""
4728
"Source repository format does not support stacking, using format:\n"
4729
" %s"
4730
msgstr ""
4731
4732
#: bzrlib/bzrdir.py:1683
4733
#, python-format
4734
msgid ""
4735
"Source branch format does not support stacking, using format:\n"
4736
" %s"
4737
msgstr ""
4738
4739
#: bzrlib/bzrdir.py:1829
4740
msgid "starting repository conversion"
4741
msgstr ""
4742
4743
#: bzrlib/bzrdir.py:2058
4744
msgid "Using default stacking branch {0} at {1}"
4745
msgstr ""
4746
4747
#: bzrlib/check.py:108
4748
msgid "check"
4749
msgstr ""
4750
4751
#: bzrlib/check.py:110
4752
msgid "checking revisions"
4753
msgstr ""
4754
4755
#: bzrlib/check.py:112
4756
msgid "checking commit contents"
4757
msgstr ""
4758
4759
#: bzrlib/check.py:114
4760
msgid "checking file graphs"
4761
msgstr ""
4762
4763
#: bzrlib/check.py:118
4764
msgid "checking branches and trees"
4765
msgstr ""
4766
4767
#: bzrlib/check.py:205
4768
msgid "checked repository {0} format {1}"
4769
msgstr ""
4770
4771
#: bzrlib/check.py:208
4772
#, python-format
4773
msgid "%6d revisions"
4774
msgstr ""
4775
4776
#: bzrlib/check.py:209
4777
#, python-format
4778
msgid "%6d file-ids"
4779
msgstr ""
4780
4781
#: bzrlib/check.py:211
4782
#, python-format
4783
msgid "%6d unreferenced text versions"
4784
msgstr ""
4785
4786
#: bzrlib/check.py:215
4787
msgid "unreferenced version: {{{0}}} in {1}"
4788
msgstr ""
4789
4790
#: bzrlib/check.py:218
4791
#, python-format
4792
msgid "%6d revisions are missing inventory_sha1"
4793
msgstr ""
4794
4795
#: bzrlib/check.py:221
4796
#, python-format
4797
msgid "%6d revisions are mentioned but not present"
4798
msgstr ""
4799
4800
#: bzrlib/check.py:224
4801
#, python-format
4802
msgid "%6d ghost revisions"
4803
msgstr ""
4804
4805
#: bzrlib/check.py:229
4806
#, python-format
4807
msgid "%6d revisions missing parents in ancestry"
4808
msgstr ""
4809
4810
#: bzrlib/check.py:233
4811
#, python-format
4812
msgid " %s should be in the ancestry for:"
4813
msgstr ""
4814
4815
#: bzrlib/check.py:237
4816
#, python-format
4817
msgid "%6d inconsistent parents"
4818
msgstr ""
4819
4820
#: bzrlib/check.py:241
4821
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4822
msgstr ""
4823
4824
#: bzrlib/check.py:247
4825
#, python-format
4826
msgid "%6d revisions have incorrect parents in the revision index"
4827
msgstr ""
4828
4829
#: bzrlib/check.py:253
4830
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4831
msgstr ""
4832
4833
#: bzrlib/check.py:267
4834
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4835
msgstr ""
4836
4837
#: bzrlib/check.py:296
4838
msgid ""
4839
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4840
"{{{4}}}"
4841
msgstr ""
4842
4843
#: bzrlib/check.py:354
4844
#, python-format
4845
msgid "Checking branch at '%s'."
4846
msgstr ""
4847
4848
#: bzrlib/check.py:374
4849
#, python-format
4850
msgid "Checking working tree at '%s'."
4851
msgstr ""
4852
4853
#: bzrlib/check.py:427 bzrlib/check.py:441
4854
msgid "No branch found at specified location."
4855
msgstr ""
4856
4857
#: bzrlib/check.py:429 bzrlib/check.py:439
4858
msgid "No working tree found at specified location."
4859
msgstr ""
4860
4861
#: bzrlib/check.py:432
4862
#, python-format
4863
msgid "Checking repository at '%s'."
4864
msgstr ""
4865
4866
#: bzrlib/check.py:443
4867
msgid "No repository found at specified location."
4868
msgstr ""
4869
4870
#: bzrlib/clean_tree.py:63
4871
msgid "Nothing to delete."
4872
msgstr ""
4873
4874
#: bzrlib/clean_tree.py:68
4875
msgid "Are you sure you wish to delete these"
4876
msgstr ""
4877
4878
#: bzrlib/clean_tree.py:70
4879
msgid "Canceled"
4880
msgstr ""
4881
4882
#: bzrlib/clean_tree.py:107
4883
#, python-format
4884
msgid "unable to remove %s"
4885
msgstr ""
4886
4887
#: bzrlib/clean_tree.py:111
4888
msgid "deleting paths:"
4889
msgstr ""
4890
4891
#: bzrlib/clean_tree.py:125
4892
msgid "unable to remove \"{0}\": {1}."
4893
msgstr ""
4894
4895
#: bzrlib/clean_tree.py:130
4896
msgid "No files deleted."
4897
msgstr ""
4898
4899
#: bzrlib/cmd_version_info.py:47
4900
msgid "No known version info format {0}. Supported types are: {1}"
4901
msgstr ""
4902
4903
#: bzrlib/cmd_version_info.py:52
4904
msgid "Version info in Custom template-based format."
4905
msgstr ""
4906
4907
#: bzrlib/cmd_version_info.py:52
4908
msgid "Version info in Python format."
4909
msgstr ""
4910
4911
#: bzrlib/cmd_version_info.py:52
4912
msgid "Version info in RIO (simple text) format (default)."
4913
msgstr ""
4914
4915
#: bzrlib/cmd_version_info.py:53
4916
msgid "Show version information about this tree."
4917
msgstr ""
4918
4919
#: bzrlib/cmd_version_info.py:55
4920
msgid ""
4921
"You can use this command to add information about version into\n"
4922
"source code of an application. The output can be in one of the\n"
4923
"supported formats or in a custom format based on a template."
4924
msgstr ""
4925
4926
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4927
#: en/help_topics/configuration.txt:710
4928
msgid "For example::"
4929
msgstr ""
4930
4931
#: bzrlib/cmd_version_info.py:61
4932
msgid ""
4933
" bzr version-info --custom \\\n"
4934
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4935
msgstr ""
4936
4937
#: bzrlib/cmd_version_info.py:64
4938
msgid ""
4939
"will produce a C header file with formatted string containing the\n"
4940
"current revision number. Other supported variables in templates are:"
4941
msgstr ""
4942
4943
#: bzrlib/cmd_version_info.py:67
4944
msgid ""
4945
" * {date} - date of the last revision\n"
4946
" * {build_date} - current date\n"
4947
" * {revno} - revision number\n"
4948
" * {revision_id} - revision id\n"
4949
" * {branch_nick} - branch nickname\n"
4950
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4951
" otherwise 1"
4952
msgstr ""
4953
4954
#: bzrlib/cmd_version_info.py:77
4955
msgid "Select the output format."
4956
msgstr ""
4957
4958
#: bzrlib/cmd_version_info.py:81
4959
msgid "Include all possible information."
4960
msgstr ""
4961
4962
#: bzrlib/cmd_version_info.py:82
4963
msgid "Check if tree is clean."
4964
msgstr ""
4965
4966
#: bzrlib/cmd_version_info.py:84
4967
msgid "Include the revision-history."
4968
msgstr ""
4969
4970
#: bzrlib/cmd_version_info.py:86
4971
msgid "Include the last revision for each file."
4972
msgstr ""
4973
4974
#: bzrlib/cmd_version_info.py:87
4975
msgid "Template for the output."
4976
msgstr ""
4977
4978
#: bzrlib/cmd_version_info.py:101
4979
msgid "bzr version-info --revision takes exactly one revision specifier"
4980
msgstr ""
4981
4982
#: bzrlib/commands.py:228
4983
#, python-format
4984
msgid "unknown command \"%s\""
4985
msgstr ""
4986
4987
#: bzrlib/commands.py:475
4988
msgid "No help for this command."
4989
msgstr ""
4990
4991
#: bzrlib/commands.py:488
4992
#, python-format
4993
msgid ":Purpose: %s\n"
4994
msgstr ""
4995
4996
#: bzrlib/commands.py:490
4997
#, python-format
4998
msgid ""
4999
":Usage:\n"
5000
"%s\n"
5001
msgstr ""
5002
":使い方:\n"
5003
"%s\n"
5004
5005
#: bzrlib/commands.py:492
5006
#, python-format
5007
msgid ":Usage: %s\n"
5008
msgstr ":使い方: %s\n"
5009
5010
#: bzrlib/commands.py:511
5011
#, python-format
5012
msgid ":Options:%s"
5013
msgstr ""
5014
5015
#: bzrlib/commands.py:522
5016
#, python-format
5017
msgid ""
5018
":Description:\n"
5019
" %s\n"
5020
"\n"
5021
msgstr ""
5022
5023
#: bzrlib/commands.py:532
5024
#, python-format
5025
msgid ""
5026
"See bzr help %s for more details and examples.\n"
5027
"\n"
5028
msgstr ""
5029
5030
#: bzrlib/commands.py:537
5031
msgid ":Aliases: "
5032
msgstr ""
5033
5034
#: bzrlib/commands.py:541
5035
#, python-format
5036
msgid ":From: plugin \"%s\"\n"
5037
msgstr ""
5038
5039
#: bzrlib/commands.py:553
5040
msgid ":doc:`{0} <{1}-help>`"
5041
msgstr ""
5042
5043
#: bzrlib/commands.py:557
5044
#, python-format
5045
msgid ":See also: %s"
5046
msgstr ""
5047
5048
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
5049
msgid "Only ASCII permitted in option names"
5050
msgstr ""
5051
5052
#: bzrlib/commands.py:840 bzrlib/commands.py:848
5053
msgid "command {0!r} needs one or more {1}"
5054
msgstr ""
5055
5056
#: bzrlib/commands.py:857
5057
msgid "command {0!r} requires argument {1}"
5058
msgstr ""
5059
5060
#: bzrlib/commands.py:864
5061
msgid "extra argument to command {0}: {1}"
5062
msgstr ""
5063
5064
#: bzrlib/commands.py:961
5065
#, python-format
5066
msgid "Profile data written to \"%s\"."
5067
msgstr ""
5068
5069
#: bzrlib/commit.py:117 bzrlib/commit.py:740
5070
msgid "added"
5071
msgstr ""
5072
5073
#: bzrlib/commit.py:117 bzrlib/commit.py:748
5074
msgid "modified"
5075
msgstr ""
5076
5077
#: bzrlib/commit.py:131
5078
#, python-format
5079
msgid "Committing%s"
5080
msgstr ""
5081
5082
#: bzrlib/commit.py:134
5083
#, python-format
5084
msgid "Committed revision %d."
5085
msgstr ""
5086
5087
#: bzrlib/commit.py:143
5088
#, python-format
5089
msgid "deleted %s"
5090
msgstr ""
5091
5092
#: bzrlib/commit.py:146
5093
#, python-format
5094
msgid "missing %s"
5095
msgstr ""
5096
5097
#: bzrlib/commit.py:511
5098
msgid ""
5099
"Conflicting tags in bound branch:\n"
5100
"{0}"
5101
msgstr ""
5102
5103
#: bzrlib/commit.py:742
5104
msgid "renamed"
5105
msgstr ""
5106
5107
#: bzrlib/commit.py:977
5108
msgid "unchanged"
5109
msgstr ""
5110
5111
#: bzrlib/commit.py:999
5112
msgid "{0} [{1}] - Stage"
5113
msgstr ""
5114
5115
#: bzrlib/commit.py:1002
5116
#, python-format
5117
msgid "%s - Stage"
5118
msgstr ""
5119
5120
#: bzrlib/commit_signature_commands.py:36
5121
msgid "Sign all commits by a given committer."
5122
msgstr ""
5123
5124
#: bzrlib/commit_signature_commands.py:38
5125
msgid ""
5126
"If location is not specified the local tree is used.\n"
5127
"If committer is not specified the default committer is used."
5128
msgstr ""
5129
5130
#: bzrlib/commit_signature_commands.py:41
5131
msgid "This does not sign commits that already have signatures."
5132
msgstr ""
5133
5134
#: bzrlib/commit_signature_commands.py:49
5135
msgid ""
5136
"Don't actually sign anything, just print the revisions that would be signed."
5137
msgstr ""
5138
5139
#: bzrlib/commit_signature_commands.py:103
5140
msgid "Verify all commit signatures."
5141
msgstr ""
5142
5143
#: bzrlib/commit_signature_commands.py:105
5144
msgid ""
5145
"Verifies that all commits in the branch are signed by known GnuPG keys."
5146
msgstr ""
5147
5148
#: bzrlib/commit_signature_commands.py:110
5149
msgid ""
5150
"Comma separated list of GPG key patterns which are acceptable for "
5151
"verification."
5152
msgstr ""
5153
5154
#: bzrlib/commit_signature_commands.py:147
5155
msgid "Cannot verify a range of non-revision-history revisions"
5156
msgstr ""
5157
5158
#: bzrlib/commit_signature_commands.py:168
5159
msgid "All commits signed with verifiable keys"
5160
msgstr ""
5161
5162
#: bzrlib/config.py:475
5163
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5164
msgstr ""
5165
5166
#: bzrlib/config.py:2499
5167
msgid "{0} is not an SI unit."
5168
msgstr ""
5169
5170
#: bzrlib/config.py:2956
5171
msgid ""
5172
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5173
"will be saved."
5174
msgstr ""
5175
5176
#: bzrlib/config.py:3100
5177
#, python-format
5178
msgid "Invalid '%s', should be of the form 'name=value'"
5179
msgstr ""
5180
5181
#: bzrlib/config.py:3969
5182
msgid "Display, set or remove a configuration option."
5183
msgstr ""
5184
5185
#: bzrlib/config.py:3971
5186
msgid "Display the active value for a given option."
5187
msgstr ""
5188
5189
#: bzrlib/config.py:3973
5190
msgid ""
5191
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5192
"matching options are displayed mentioning their scope. The active value\n"
5193
"that bzr will take into account is the first one displayed for each option."
5194
msgstr ""
5195
5196
#: bzrlib/config.py:3977
5197
msgid "If no NAME is given, --all .* is implied."
5198
msgstr ""
5199
5200
#: bzrlib/config.py:3979
5201
msgid ""
5202
"Setting a value is achieved by using name=value without spaces. The value\n"
5203
"is set in the most relevant scope and can be checked by displaying the\n"
5204
"option again."
5205
msgstr ""
5206
5207
#: bzrlib/config.py:3991
5208
msgid "Reduce the scope to the specified configuration file."
5209
msgstr ""
5210
5211
#: bzrlib/config.py:3995
5212
msgid "Display all the defined values for the matching options."
5213
msgstr ""
5214
5215
#: bzrlib/config.py:3997
5216
msgid "Remove the option from the configuration file."
5217
msgstr ""
5218
5219
#: bzrlib/conflicts.py:50
5220
msgid "List files with conflicts."
5221
msgstr ""
5222
5223
#: bzrlib/conflicts.py:57
5224
msgid ""
5225
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5226
"is supplied, the pathnames of files with text conflicts are listed,\n"
5227
"instead. (This is useful for editing all files with text conflicts.)"
5228
msgstr ""
5229
5230
#: bzrlib/conflicts.py:61
5231
msgid "Use bzr resolve when you have fixed a problem."
5232
msgstr ""
5233
5234
#: bzrlib/conflicts.py:66
5235
msgid "List paths of files with text conflicts."
5236
msgstr ""
5237
5238
#: bzrlib/conflicts.py:85
5239
msgid "Marks the conflict as resolved."
5240
msgstr ""
5241
5242
#: bzrlib/conflicts.py:88
5243
msgid "Resolve the conflict preserving the version in the working tree."
5244
msgstr ""
5245
5246
#: bzrlib/conflicts.py:91
5247
msgid "Resolve the conflict taking the merged version into account."
5248
msgstr ""
5249
5250
#: bzrlib/conflicts.py:98
5251
msgid "How to resolve the conflict."
5252
msgstr ""
5253
5254
#: bzrlib/conflicts.py:104
5255
msgid "Mark a conflict as resolved."
5256
msgstr ""
5257
5258
#: bzrlib/conflicts.py:111
5259
msgid ""
5260
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5261
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5262
"as\n"
5263
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5264
msgstr ""
5265
5266
#: bzrlib/conflicts.py:119
5267
msgid "Resolve all conflicts in this tree."
5268
msgstr ""
5269
5270
#: bzrlib/conflicts.py:126
5271
msgid "If --all is specified, no FILE may be provided"
5272
msgstr ""
5273
5274
#: bzrlib/conflicts.py:151
5275
#, python-format
5276
msgid "%d conflict auto-resolved."
5277
msgid_plural "%d conflicts auto-resolved."
5278
msgstr[0] ""
5279
msgstr[1] ""
5280
5281
#: bzrlib/conflicts.py:154
5282
msgid "Remaining conflicts:"
5283
msgstr ""
5284
5285
#: bzrlib/conflicts.py:159
5286
msgid "All conflicts resolved."
5287
msgstr ""
5288
5289
#: bzrlib/conflicts.py:168
5290
msgid "{0} conflict resolved, {1} remaining"
5291
msgid_plural "{0} conflicts resolved, {1} remaining"
5292
msgstr[0] ""
5293
msgstr[1] ""
5294
5295
#: bzrlib/controldir.py:698
5296
msgid "{0} is{1} redirected to {2}"
5297
msgstr ""
5298
5299
#: bzrlib/diff.py:399
5300
#, python-format
5301
msgid "*** Ignoring files outside view. View is %s"
5302
msgstr ""
5303
5304
#: bzrlib/errors.py:157
5305
msgid "The tree builder is already building a tree."
5306
msgstr ""
5307
5308
#: bzrlib/errors.py:178
5309
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5310
msgstr ""
5311
5312
#: bzrlib/errors.py:197
5313
msgid ""
5314
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5315
"versions \"%(minimum)s\" to \"%(current)s\"."
5316
msgstr ""
5317
5318
#: bzrlib/errors.py:209
5319
msgid "The transport '%(transport)s' is only accessible within this process."
5320
msgstr ""
5321
5322
#: bzrlib/errors.py:227
5323
msgid "Invalid revision number %(revno)s"
5324
msgstr ""
5325
5326
#: bzrlib/errors.py:236
5327
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5328
msgstr ""
5329
5330
#: bzrlib/errors.py:247
5331
msgid "Reserved revision-id {%(revision_id)s}"
5332
msgstr ""
5333
5334
#: bzrlib/errors.py:261
5335
msgid "There is no public branch set for \"%(branch_url)s\"."
5336
msgstr ""
5337
5338
#: bzrlib/errors.py:271
5339
msgid ""
5340
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5341
"obtain a list of topics."
5342
msgstr ""
5343
5344
#: bzrlib/errors.py:280
5345
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5346
msgstr ""
5347
5348
#: bzrlib/errors.py:290
5349
msgid ""
5350
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5351
msgstr ""
5352
5353
#: bzrlib/errors.py:299
5354
msgid "The branch '%(branch)s' is not stacked."
5355
msgstr ""
5356
5357
#: bzrlib/errors.py:313
5358
msgid "No WorkingTree exists for \"%(base)s\"."
5359
msgstr ""
5360
5361
#: bzrlib/errors.py:322
5362
msgid "Not currently building a tree."
5363
msgstr ""
5364
5365
#: bzrlib/errors.py:327
5366
msgid "%(url)s is not a local path."
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:355
5370
msgid "%(not_locked)r is not write locked but needs to be."
5371
msgstr ""
5372
5373
#: bzrlib/errors.py:363
5374
msgid "Error in command line options"
5375
msgstr ""
5376
5377
#: bzrlib/errors.py:368
5378
msgid "%(value)s is not an index of type %(_type)s."
5379
msgstr ""
5380
5381
#: bzrlib/errors.py:378
5382
msgid "Error in data for index %(value)s."
5383
msgstr ""
5384
5385
#: bzrlib/errors.py:387
5386
msgid "The key '%(key)s' is already in index '%(index)s'."
5387
msgstr ""
5388
5389
#: bzrlib/errors.py:397
5390
msgid "The key '%(key)s' is not a valid key."
5391
msgstr ""
5392
5393
#: bzrlib/errors.py:406
5394
msgid "Could not parse options for index %(value)s."
5395
msgstr ""
5396
5397
#: bzrlib/errors.py:415
5398
msgid "The value '%(value)s' is not a valid value."
5399
msgstr ""
5400
5401
#: bzrlib/errors.py:443
5402
msgid "Generic path error: %(path)r%(extra)s)"
5403
msgstr ""
5404
5405
#: bzrlib/errors.py:456
5406
msgid "No such file: %(path)r%(extra)s"
5407
msgstr ""
5408
5409
#: bzrlib/errors.py:461
5410
msgid "File exists: %(path)r%(extra)s"
5411
msgstr ""
5412
5413
#: bzrlib/errors.py:467
5414
msgid ""
5415
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5416
"after to tell bzr about a rename that has already happened)%(extra)s"
5417
msgstr ""
5418
5419
#: bzrlib/errors.py:483
5420
msgid "\"%(path)s\" is not a directory %(extra)s"
5421
msgstr ""
5422
5423
#: bzrlib/errors.py:488
5424
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5425
msgstr ""
5426
5427
#: bzrlib/errors.py:493
5428
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5429
msgstr ""
5430
5431
#: bzrlib/errors.py:498
5432
msgid "Hard-linking \"%(path)s\" is not supported"
5433
msgstr ""
5434
5435
#: bzrlib/errors.py:513
5436
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5437
msgstr ""
5438
5439
#: bzrlib/errors.py:518
5440
msgid "Permission denied: \"%(path)s\"%(extra)s"
5441
msgstr ""
5442
5443
#: bzrlib/errors.py:523
5444
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5445
msgstr ""
5446
5447
#: bzrlib/errors.py:528
5448
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5449
msgstr ""
5450
5451
#: bzrlib/errors.py:539
5452
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5453
msgstr ""
5454
5455
#: bzrlib/errors.py:561
5456
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5457
msgstr ""
5458
5459
#: bzrlib/errors.py:571
5460
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5461
msgstr ""
5462
5463
#: bzrlib/errors.py:579
5464
msgid ""
5465
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5466
"upgrade the branch to permit branch stacking."
5467
msgstr ""
5468
5469
#: bzrlib/errors.py:590
5470
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5471
msgstr ""
5472
5473
#: bzrlib/errors.py:600
5474
msgid ""
5475
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5476
"need to upgrade the repository to permit branch stacking."
5477
msgstr ""
5478
5479
#: bzrlib/errors.py:611
5480
msgid "Error reading from %(path)r."
5481
msgstr ""
5482
5483
#: bzrlib/errors.py:630
5484
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5485
msgstr ""
5486
5487
#: bzrlib/errors.py:646
5488
msgid "Path \"%(path)s\" is not unicode normalized"
5489
msgstr ""
5490
5491
#: bzrlib/errors.py:654
5492
msgid "Not a branch: \"%(path)s\"%(detail)s."
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:696
5496
msgid "No submit branch available for branch \"%(path)s\""
5497
msgstr ""
5498
5499
#: bzrlib/errors.py:705
5500
msgid "Already a branch: \"%(path)s\"."
5501
msgstr ""
5502
5503
#: bzrlib/errors.py:711
5504
msgid ""
5505
"Directory contains a branch, but no working tree (use bzr checkout if you "
5506
"wish to build a working tree): \"%(path)s\""
5507
msgstr ""
5508
5509
#: bzrlib/errors.py:716
5510
msgid ""
5511
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5512
msgstr ""
5513
5514
#: bzrlib/errors.py:726
5515
msgid ""
5516
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5517
msgstr ""
5518
5519
#: bzrlib/errors.py:736
5520
msgid "No repository present: \"%(path)s\""
5521
msgstr ""
5522
5523
#: bzrlib/errors.py:743
5524
msgid ""
5525
"Unsupported branch format: %(format)s\n"
5526
"Please run 'bzr upgrade'"
5527
msgstr ""
5528
5529
#: bzrlib/errors.py:749
5530
msgid "Unknown %(kind)s format: %(format)r"
5531
msgstr ""
5532
5533
#: bzrlib/errors.py:758
5534
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5535
msgstr ""
5536
5537
#: bzrlib/errors.py:768
5538
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5539
msgstr ""
5540
5541
#: bzrlib/errors.py:783
5542
msgid ""
5543
"%(target)s\n"
5544
"is not compatible with\n"
5545
"%(source)s\n"
5546
"%(details)s"
5547
msgstr ""
5548
5549
#: bzrlib/errors.py:799
5550
msgid "Revision is not compatible with %(repo_format)s"
5551
msgstr ""
5552
5553
#: bzrlib/errors.py:809
5554
msgid "%(context_info)s%(path)s is already versioned."
5555
msgstr ""
5556
5557
#: bzrlib/errors.py:830
5558
msgid "%(context_info)s%(path)s is not versioned."
5559
msgstr ""
5560
5561
#: bzrlib/errors.py:851
5562
msgid "Path(s) are not versioned: %(paths_as_string)s"
5563
msgstr ""
5564
5565
#: bzrlib/errors.py:862
5566
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5567
msgstr ""
5568
5569
#: bzrlib/errors.py:881
5570
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5571
msgstr ""
5572
5573
#: bzrlib/errors.py:889
5574
msgid ""
5575
"Filename %(filename)r is not valid in your current filesystem encoding "
5576
"%(fs_encoding)s"
5577
msgstr ""
5578
5579
#: bzrlib/errors.py:900
5580
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5581
msgstr ""
5582
5583
#: bzrlib/errors.py:918
5584
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5585
msgstr ""
5586
5587
#: bzrlib/errors.py:957
5588
msgid "Cannot lock %(lock)s: %(why)s"
5589
msgstr ""
5590
5591
#: bzrlib/errors.py:967
5592
msgid ""
5593
"A transaction related operation was attempted after the transaction finished."
5594
msgstr ""
5595
5596
#: bzrlib/errors.py:994
5597
msgid "Cannot lock: transport is read only: %(transport)s"
5598
msgstr ""
5599
5600
#: bzrlib/errors.py:1002
5601
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5602
msgstr ""
5603
5604
#: bzrlib/errors.py:1013
5605
msgid ""
5606
"Lock was broken while still open: %(lock)s - check storage consistency!"
5607
msgstr ""
5608
5609
#: bzrlib/errors.py:1024
5610
msgid ""
5611
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5612
"%(holder)r, wanted to break %(target)r"
5613
msgstr ""
5614
5615
#: bzrlib/errors.py:1036
5616
msgid ""
5617
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5618
"Use 'bzr break-lock' to clear it"
5619
msgstr ""
5620
5621
#: bzrlib/errors.py:1049
5622
msgid "Lock not held: %(lock)s"
5623
msgstr ""
5624
5625
#: bzrlib/errors.py:1078
5626
msgid "No changes to commit"
5627
msgstr ""
5628
5629
#: bzrlib/errors.py:1083
5630
msgid ""
5631
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5632
msgstr ""
5633
5634
#: bzrlib/errors.py:1093
5635
msgid ""
5636
"Excluding paths during commit is not supported by repository at "
5637
"%(repository)r."
5638
msgstr ""
5639
5640
#: bzrlib/errors.py:1102
5641
msgid ""
5642
"The specified commit message contains characters unsupported by the current "
5643
"encoding."
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:1108
5647
msgid "Upgrade URL cannot work with readonly URLs."
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:1113
5651
msgid "The branch format %(format)s is already at the most recent format."
5652
msgstr ""
5653
5654
#: bzrlib/errors.py:1136
5655
msgid "Option --change does not accept revision ranges"
5656
msgstr ""
5657
5658
#: bzrlib/errors.py:1141
5659
msgid "No namespace registered for string: %(spec)r"
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:1160
5663
msgid ""
5664
"Requested revision: '%(spec)s' does not exist in branch: "
5665
"%(branch_url)s%(extra)s"
5666
msgstr ""
5667
5668
#: bzrlib/errors.py:1174
5669
msgid ""
5670
"Operation denied because it would change the main history, which is not "
5671
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5672
msgstr ""
5673
5674
#: bzrlib/errors.py:1185
5675
msgid ""
5676
"These branches have diverged. Use the missing command to see how.\n"
5677
"Use the merge command to reconcile them."
5678
msgstr ""
5679
5680
#: bzrlib/errors.py:1205
5681
msgid ""
5682
"Branches have no common ancestor, and no merge base revision was specified."
5683
msgstr ""
5684
5685
#: bzrlib/errors.py:1211
5686
msgid ""
5687
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5688
msgstr ""
5689
5690
#: bzrlib/errors.py:1217
5691
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:1226
5695
msgid ""
5696
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5697
msgstr ""
5698
5699
#: bzrlib/errors.py:1235
5700
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5701
msgstr ""
5702
5703
#: bzrlib/errors.py:1244
5704
msgid "Branch %(branch)s has no commits."
5705
msgstr ""
5706
5707
#: bzrlib/errors.py:1262
5708
msgid ""
5709
"Bound branch %(branch)s is out of date with master branch "
5710
"%(master)s.%(extra_help)s"
5711
msgstr ""
5712
5713
#: bzrlib/errors.py:1274
5714
msgid ""
5715
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5716
"bound to %(remote)s."
5717
msgstr ""
5718
5719
#: bzrlib/errors.py:1286
5720
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5721
msgstr ""
5722
5723
#: bzrlib/errors.py:1295
5724
msgid ""
5725
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5726
"%(error)s"
5727
msgstr ""
5728
5729
#: bzrlib/errors.py:1307
5730
msgid "Error in processing weave: %(msg)s"
5731
msgstr ""
5732
5733
#: bzrlib/errors.py:1316
5734
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5735
msgstr ""
5736
5737
#: bzrlib/errors.py:1327
5738
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5739
msgstr ""
5740
5741
#: bzrlib/errors.py:1337
5742
msgid "Weave invariant violated: %(what)s"
5743
msgstr ""
5744
5745
#: bzrlib/errors.py:1346
5746
msgid "Parents are mismatched between two revisions. %(msg)s"
5747
msgstr ""
5748
5749
#: bzrlib/errors.py:1368
5750
msgid ""
5751
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5752
"%(weave_b)s"
5753
msgstr ""
5754
5755
#: bzrlib/errors.py:1380
5756
msgid "Versioned file error"
5757
msgstr "バージョン管理されたファイルのエラー"
5758
5759
#: bzrlib/errors.py:1385
5760
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5761
msgstr "\"%(file_id)s\" にはリビジョン {%(revision_id)s} がありません。"
5762
5763
#: bzrlib/errors.py:1395
5764
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5765
msgstr "\"%(file_id)s\" にはすでにリビジョン {%(revision_id)s} が存在しています。"
5766
5767
#: bzrlib/errors.py:1405
5768
msgid "Text did not match its checksum: %(msg)s"
5769
msgstr "テキストがチェックサムと一致しません: %(msg)s"
5770
5771
#: bzrlib/errors.py:1531
5772
msgid "Export format %(format)r not supported"
5773
msgstr "エクスポートフォーマット %(format)r はサポートされていません"
5774
5775
#: bzrlib/errors.py:1540
5776
msgid "Transport error: %(msg)s %(orig_error)s"
5777
msgstr ""
5778
5779
#: bzrlib/errors.py:1566
5780
msgid "Generic bzr smart protocol error: %(details)s"
5781
msgstr ""
5782
5783
#: bzrlib/errors.py:1574
5784
msgid "Received bad protocol version marker: %(marker)r"
5785
msgstr ""
5786
5787
#: bzrlib/errors.py:1606
5788
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5789
msgstr ""
5790
5791
#: bzrlib/errors.py:1611
5792
msgid "Connection error: %(msg)s %(orig_error)s"
5793
msgstr ""
5794
5795
#: bzrlib/errors.py:1616
5796
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5797
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
5798
5799
#: bzrlib/errors.py:1637
5800
msgid "Connection closed: %(msg)s %(orig_error)s"
5801
msgstr "接続が閉じられました: %(msg)s %(orig_error)s"
5802
5803
#: bzrlib/errors.py:1642
5804
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5805
msgstr "接続がタイムアウトしました: %(msg)s%(orig_error)s"
5806
5807
#: bzrlib/errors.py:1647
5808
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5809
msgstr "%(path)s の %(offset)s に対する不正な range アクセス: %(msg)s"
5810
5811
#: bzrlib/errors.py:1657
5812
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5813
msgstr "%(path)s からの不正な HTTP レスポンス: %(msg)s%(orig_error)s"
5814
5815
#: bzrlib/errors.py:1672
5816
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5817
msgstr "%(path) に対する不正な range %(range)r: %(msg)s"
5818
5819
#: bzrlib/errors.py:1686
5820
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5821
msgstr "%(path)s に HTTP MIME 境界が見つかりません: %(msg)s"
5822
5823
#: bzrlib/errors.py:1694
5824
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5825
msgstr ""
5826
5827
#: bzrlib/errors.py:1703
5828
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5829
msgstr ""
5830
5831
#: bzrlib/errors.py:1717
5832
msgid "Too many redirections"
5833
msgstr "リダイレクションが多すぎます"
5834
5835
#: bzrlib/errors.py:1722
5836
msgid "Working tree has conflicts."
5837
msgstr "作業ツリーに衝突があります"
5838
5839
#: bzrlib/errors.py:1726
5840
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5841
msgstr "設定ファイル %(filename)s が UTF-8 でエンコードされていません\n"
5842
5843
#: bzrlib/errors.py:1735
5844
msgid ""
5845
"Error(s) parsing config file %(filename)s:\n"
5846
"%(errors)s"
5847
msgstr ""
5848
"設定ファイル %(filename)s のパースエラー:\n"
5849
"%(error)s"
5850
5851
#: bzrlib/errors.py:1746
5852
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5853
msgstr "オプション \"%(name)s\" に対する不正な値 \"%(value)s\""
5854
5855
#: bzrlib/errors.py:1754
5856
msgid "%(username)r does not seem to contain a reasonable email address"
5857
msgstr "%(username)r に有効な e-mail アドレスが含まれていないようです"
5858
5859
#: bzrlib/errors.py:1763
5860
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5861
msgstr "\"%(command_line)s\" コマンドでのGPGサインに失敗しました"
5862
5863
#: bzrlib/errors.py:1771
5864
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5865
msgstr "GPGシグネチャの検証に \"%(error)s\" で失敗しました。"
5866
5867
#: bzrlib/errors.py:1779
5868
msgid "Unable to import library \"%(library)s\": %(error)s"
5869
msgstr "ライブラリ \"%(library)s\" をインポートできません: %(error)s"
5870
5871
#: bzrlib/errors.py:1787
5872
msgid "python-gpgme is not installed, it is needed to verify signatures"
5873
msgstr "python-gpgme がインストールされていません。これはシグネチャの検証に必要です。"
5874
5875
#: bzrlib/errors.py:1795
5876
msgid ""
5877
"The working tree for %(basedir)s has changed since the last commit, but "
5878
"weave merge requires that it be unchanged"
5879
msgstr "作業ツリー %(basedir)s が最後のコミットから変更されています。 作業ツリーが変更されている場合weaveマージはできません。"
5880
5881
#: bzrlib/errors.py:1805
5882
msgid ""
5883
"Can't reprocess and show base, because reprocessing obscures the "
5884
"relationship of conflicting lines to the base"
5885
msgstr ""
5886
5887
#: bzrlib/errors.py:1811
5888
msgid "Cycle in graph %(graph)r"
5889
msgstr "グラフ %(graph)r がループしています。"
5890
5891
#: bzrlib/errors.py:1839
5892
msgid "File %(filename)s is not conflicted."
5893
msgstr "%(filename)s は衝突していません"
5894
5895
#: bzrlib/errors.py:1861
5896
msgid "No bundle was found in \"%(filename)s\"."
5897
msgstr "\"%(filename)s\" にバンドルが見つかりません。"
5898
5899
#: bzrlib/errors.py:1870
5900
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5901
msgstr ""
5902
5903
#: bzrlib/errors.py:1880
5904
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5905
msgstr ""
5906
5907
#: bzrlib/errors.py:1893
5908
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5909
msgstr ""
5910
5911
#: bzrlib/errors.py:1903
5912
msgid "Key %(key)s is already present in map"
5913
msgstr ""
5914
5915
#: bzrlib/errors.py:1908
5916
msgid "The prefix %(prefix)s is in the help search path twice."
5917
msgstr ""
5918
5919
#: bzrlib/errors.py:1918
5920
msgid ""
5921
"No final name for trans_id %(trans_id)r\n"
5922
"file-id: %(file_id)r\n"
5923
"root trans-id: %(root_trans_id)r\n"
5924
msgstr ""
5925
5926
#: bzrlib/errors.py:1950
5927
msgid "Attempt to reuse a transform that has already been applied."
5928
msgstr ""
5929
5930
#: bzrlib/errors.py:1955
5931
msgid "Moving the root directory is not supported at this time"
5932
msgstr "いまのところ、ルートディレクトリの移動はサポートされていません"
5933
5934
#: bzrlib/errors.py:1960
5935
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5936
msgstr "%(from_path)s から %(to_path)s へのリネームに失敗しました: %(why)s"
5937
5938
#: bzrlib/errors.py:1971
5939
msgid ""
5940
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5941
msgstr ""
5942
"移動できません。 %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5943
5944
#: bzrlib/errors.py:2007
5945
msgid ""
5946
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5947
msgstr ""
5948
"%(from_path)s%(operator)s から %(to_path)s%(_has_extra)s%(extra)s へリネームできません"
5949
5950
#: bzrlib/errors.py:2037
5951
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5952
msgstr ""
5953
5954
#: bzrlib/errors.py:2045
5955
msgid "Nothing to merge."
5956
msgstr ""
5957
5958
#: bzrlib/errors.py:2050
5959
msgid "Format %(format)s cannot be initialised by this version of bzr."
5960
msgstr ""
5961
5962
#: bzrlib/errors.py:2059
5963
msgid ""
5964
"Cannot convert from format %(from_format)s to format %(format)s. "
5965
"%(problem)s"
5966
msgstr ""
5967
5968
#: bzrlib/errors.py:2071
5969
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5970
msgstr ""
5971
5972
#: bzrlib/errors.py:2079
5973
msgid "%(exe_name)s could not be found on this machine"
5974
msgstr ""
5975
5976
#: bzrlib/errors.py:2087
5977
msgid "Diff is not installed on this machine: %(msg)s"
5978
msgstr ""
5979
5980
#: bzrlib/errors.py:2095
5981
msgid "Diff3 is not installed on this machine."
5982
msgstr ""
5983
5984
#: bzrlib/errors.py:2101
5985
msgid "The content being inserted is already present."
5986
msgstr ""
5987
5988
#: bzrlib/errors.py:2106
5989
msgid ""
5990
"This tree contains left-over files from a failed operation.\n"
5991
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5992
"to\n"
5993
" keep, and delete it when you are done."
5994
msgstr ""
5995
5996
#: bzrlib/errors.py:2117
5997
msgid ""
5998
"This tree contains left-over files from a failed operation.\n"
5999
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6000
" wish to keep, and delete it when you are done."
6001
msgstr ""
6002
6003
#: bzrlib/errors.py:2127
6004
msgid ""
6005
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6006
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6007
"to\n"
6008
" keep, and delete it when you are done."
6009
msgstr ""
6010
6011
#: bzrlib/errors.py:2138
6012
msgid ""
6013
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6014
"examine %(pending_deletion)s to see if it contains any files you wish to "
6015
"keep, and delete it when you are done."
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:2148
6019
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6020
msgstr ""
6021
6022
#: bzrlib/errors.py:2162
6023
msgid ""
6024
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6025
msgstr ""
6026
6027
#: bzrlib/errors.py:2175
6028
msgid "Error in merge modified format"
6029
msgstr ""
6030
6031
#: bzrlib/errors.py:2180
6032
msgid "Format error in conflict listings"
6033
msgstr ""
6034
6035
#: bzrlib/errors.py:2184
6036
msgid ""
6037
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6038
"Error: %(description)s"
6039
msgstr ""
6040
6041
#: bzrlib/errors.py:2195
6042
msgid ""
6043
"An error has been detected in the repository %(repo_path)s.\n"
6044
"Please run bzr reconcile on this repository."
6045
msgstr ""
6046
6047
#: bzrlib/errors.py:2206
6048
msgid ""
6049
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6050
"reason: %(reason)s"
6051
msgstr ""
6052
6053
#: bzrlib/errors.py:2219
6054
msgid ""
6055
"An inconsistent delta was supplied: %(delta)r\n"
6056
"reason: %(reason)s"
6057
msgstr ""
6058
6059
#: bzrlib/errors.py:2231
6060
msgid "To use this feature you must upgrade your branch at %(path)s."
6061
msgstr ""
6062
6063
#: bzrlib/errors.py:2240
6064
msgid "To use this feature you must upgrade your repository at %(path)s."
6065
msgstr ""
6066
6067
#: bzrlib/errors.py:2245
6068
msgid ""
6069
"To use this feature you must upgrade your branch at %(path)s to a format "
6070
"which supports rich roots."
6071
msgstr ""
6072
6073
#: bzrlib/errors.py:2251
6074
msgid "Cannot perform local-only commits on unbound branches."
6075
msgstr ""
6076
6077
#: bzrlib/errors.py:2256
6078
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6079
msgstr ""
6080
6081
#: bzrlib/errors.py:2277
6082
msgid "Ghost tags not supported by format %(format)r."
6083
msgstr ""
6084
6085
#: bzrlib/errors.py:2285
6086
msgid "File is binary but should be text."
6087
msgstr ""
6088
6089
#: bzrlib/errors.py:2290
6090
msgid "The path %(path)s is not permitted on this platform"
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:2299
6094
msgid ""
6095
"Testament did not match expected value.\n"
6096
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6097
" {%(measured)s}"
6098
msgstr ""
6099
6100
#: bzrlib/errors.py:2311
6101
msgid "Not a bzr revision-bundle: %(text)r"
6102
msgstr ""
6103
6104
#: bzrlib/errors.py:2320
6105
msgid "Bad bzr revision-bundle: %(text)r"
6106
msgstr ""
6107
6108
#: bzrlib/errors.py:2329
6109
msgid "Malformed bzr revision-bundle header: %(text)r"
6110
msgstr ""
6111
6112
#: bzrlib/errors.py:2334
6113
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6114
msgstr ""
6115
6116
#: bzrlib/errors.py:2339
6117
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6118
msgstr ""
6119
6120
#: bzrlib/errors.py:2344
6121
msgid "End of line marker was not \\n in bzr revision-bundle"
6122
msgstr ""
6123
6124
#: bzrlib/errors.py:2354
6125
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6126
msgstr ""
6127
6128
#: bzrlib/errors.py:2364
6129
msgid "Root class for inventory serialization errors"
6130
msgstr ""
6131
6132
#: bzrlib/errors.py:2368
6133
msgid ""
6134
"The inventory was not in the expected format:\n"
6135
" %(msg)s"
6136
msgstr ""
6137
6138
#: bzrlib/errors.py:2377
6139
msgid "This operation requires rich root data storage"
6140
msgstr ""
6141
6142
#: bzrlib/errors.py:2390
6143
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6144
msgstr ""
6145
6146
#: bzrlib/errors.py:2399
6147
msgid ""
6148
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6149
"variable."
6150
msgstr ""
6151
6152
#: bzrlib/errors.py:2406
6153
msgid ""
6154
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6155
"ghost at {%(ghost_revision_id)s}"
6156
msgstr ""
6157
6158
#: bzrlib/errors.py:2416
6159
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6160
msgstr ""
6161
6162
#: bzrlib/errors.py:2467
6163
msgid ""
6164
"A merge directive must provide either a bundle or a public branch location."
6165
msgstr ""
6166
6167
#: bzrlib/errors.py:2474
6168
msgid "Bad merge directive payload %(start)r"
6169
msgstr ""
6170
6171
#: bzrlib/errors.py:2484
6172
msgid "Preview patch does not match requested changes."
6173
msgstr ""
6174
6175
#: bzrlib/errors.py:2490
6176
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6177
msgstr ""
6178
6179
#: bzrlib/errors.py:2500
6180
msgid ""
6181
"Your branch does not have all of the revisions required in order to merge "
6182
"this merge directive and the target location specified in the merge "
6183
"directive is not a branch: %(location)s."
6184
msgstr ""
6185
6186
#: bzrlib/errors.py:2512
6187
msgid "Unsupported entry kind %(kind)s"
6188
msgstr ""
6189
6190
#: bzrlib/errors.py:2520
6191
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6192
msgstr ""
6193
6194
#: bzrlib/errors.py:2530
6195
msgid "Subsume target %(other_tree)s needs to be upgraded."
6196
msgstr ""
6197
6198
#: bzrlib/errors.py:2549
6199
msgid "No such tag: %(tag_name)s"
6200
msgstr ""
6201
6202
#: bzrlib/errors.py:2557
6203
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6204
msgstr ""
6205
6206
#: bzrlib/errors.py:2566
6207
msgid "Tag %(tag_name)s already exists."
6208
msgstr ""
6209
6210
#: bzrlib/errors.py:2574
6211
msgid ""
6212
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6213
"bugs\" for more information on this feature."
6214
msgstr ""
6215
6216
#: bzrlib/errors.py:2584
6217
msgid ""
6218
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6219
msgstr ""
6220
6221
#: bzrlib/errors.py:2594
6222
msgid ""
6223
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6224
msgstr ""
6225
6226
#: bzrlib/errors.py:2604
6227
msgid "Invalid line in bugs property: '%(line)s'"
6228
msgstr ""
6229
6230
#: bzrlib/errors.py:2612
6231
msgid "Invalid bug status: '%(status)s'"
6232
msgstr ""
6233
6234
#: bzrlib/errors.py:2620
6235
msgid "Could not understand response from smart server: %(response_tuple)r"
6236
msgstr ""
6237
6238
#: bzrlib/errors.py:2659
6239
msgid "Server sent an unexpected error: %(error_tuple)r"
6240
msgstr ""
6241
6242
#: bzrlib/errors.py:2678
6243
msgid "Unrecognised container format: %(container_format)r"
6244
msgstr ""
6245
6246
#: bzrlib/errors.py:2686
6247
msgid "Unexpected end of container stream"
6248
msgstr ""
6249
6250
#: bzrlib/errors.py:2691
6251
msgid "Unknown record type: %(record_type)r"
6252
msgstr ""
6253
6254
#: bzrlib/errors.py:2699
6255
msgid "Invalid record: %(reason)s"
6256
msgstr ""
6257
6258
#: bzrlib/errors.py:2707
6259
msgid "Container has data after end marker: %(excess)r"
6260
msgstr ""
6261
6262
#: bzrlib/errors.py:2715
6263
msgid "Container has multiple records with the same name: %(name)s"
6264
msgstr ""
6265
6266
#: bzrlib/errors.py:2728
6267
msgid "Corrupt or incompatible data stream: %(reason)s"
6268
msgstr ""
6269
6270
#: bzrlib/errors.py:2736
6271
msgid "SMTP error: %(error)s"
6272
msgstr ""
6273
6274
#: bzrlib/errors.py:2744
6275
msgid "No message supplied."
6276
msgstr ""
6277
6278
#: bzrlib/errors.py:2749
6279
msgid "No mail-to address (--mail-to) or output (-o) specified."
6280
msgstr ""
6281
6282
#: bzrlib/errors.py:2754
6283
msgid "Unknown mail client: %(mail_client)s"
6284
msgstr ""
6285
6286
#: bzrlib/errors.py:2762
6287
msgid ""
6288
"Unable to find mail client with the following names: "
6289
"%(mail_command_list_string)s"
6290
msgstr ""
6291
6292
#: bzrlib/errors.py:2772
6293
msgid "SMTP connection to %(host)s refused"
6294
msgstr ""
6295
6296
#: bzrlib/errors.py:2781
6297
msgid "Please specify smtp_server. No server at default %(host)s."
6298
msgstr ""
6299
6300
#: bzrlib/errors.py:2795
6301
msgid ""
6302
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6303
"reconfigure."
6304
msgstr ""
6305
6306
#: bzrlib/errors.py:2807
6307
msgid "'%(display_url)s' is already a branch."
6308
msgstr ""
6309
6310
#: bzrlib/errors.py:2812
6311
msgid "'%(display_url)s' is already a tree."
6312
msgstr ""
6313
6314
#: bzrlib/errors.py:2817
6315
msgid "'%(display_url)s' is already a checkout."
6316
msgstr ""
6317
6318
#: bzrlib/errors.py:2822
6319
msgid "'%(display_url)s' is already a lightweight checkout."
6320
msgstr ""
6321
6322
#: bzrlib/errors.py:2827
6323
msgid "'%(display_url)s' is already using a shared repository."
6324
msgstr ""
6325
6326
#: bzrlib/errors.py:2832
6327
msgid "'%(display_url)s' is already standalone."
6328
msgstr ""
6329
6330
#: bzrlib/errors.py:2837
6331
msgid "Shared repository '%(display_url)s' already creates working trees."
6332
msgstr ""
6333
6334
#: bzrlib/errors.py:2843
6335
msgid ""
6336
"Shared repository '%(display_url)s' already doesn't create working trees."
6337
msgstr ""
6338
6339
#: bzrlib/errors.py:2849
6340
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6341
msgstr ""
6342
6343
#: bzrlib/errors.py:2854
6344
msgid "No location could be found to bind to at %(display_url)s."
6345
msgstr ""
6346
6347
#: bzrlib/errors.py:2859
6348
msgid ""
6349
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6350
"status).%(more)s"
6351
msgstr ""
6352
6353
#: bzrlib/errors.py:2878
6354
msgid ""
6355
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6356
"list).%(more)s"
6357
msgstr ""
6358
6359
#: bzrlib/errors.py:2884
6360
msgid "Variable {%(name)s} is not available."
6361
msgstr ""
6362
6363
#: bzrlib/errors.py:2892
6364
msgid "No template specified."
6365
msgstr ""
6366
6367
#: bzrlib/errors.py:2897
6368
msgid "Unable to create symlink %(path_str)son this platform"
6369
msgstr ""
6370
6371
#: bzrlib/errors.py:2912
6372
msgid ""
6373
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6374
"\"original\", \"local\"."
6375
msgstr ""
6376
6377
#: bzrlib/errors.py:2946
6378
msgid ""
6379
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6380
msgstr ""
6381
6382
#: bzrlib/errors.py:2958
6383
msgid "The \"%(config_id)s\" configuration does not exist."
6384
msgstr ""
6385
6386
#: bzrlib/errors.py:2966
6387
msgid "The \"%(option_name)s\" configuration option does not exist."
6388
msgstr ""
6389
6390
#: bzrlib/errors.py:2974
6391
msgid "The alias \"%(alias_name)s\" does not exist."
6392
msgstr ""
6393
6394
#: bzrlib/errors.py:2988
6395
msgid "\"%(alias_name)s\" is not a valid location alias."
6396
msgstr ""
6397
6398
#: bzrlib/errors.py:2996
6399
msgid "No %(alias_name)s location assigned."
6400
msgstr ""
6401
6402
#: bzrlib/errors.py:3004
6403
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6404
msgstr ""
6405
6406
#: bzrlib/errors.py:3014
6407
msgid "Unknown rules detected: %(unknowns_str)s."
6408
msgstr ""
6409
6410
#: bzrlib/errors.py:3025
6411
msgid "Tip change rejected: %(msg)s"
6412
msgstr ""
6413
6414
#: bzrlib/errors.py:3033
6415
msgid "Shelf corrupt."
6416
msgstr ""
6417
6418
#: bzrlib/errors.py:3038
6419
msgid "Corruption while decompressing repository file%(orig_error)s"
6420
msgstr ""
6421
6422
#: bzrlib/errors.py:3050
6423
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6424
msgstr ""
6425
6426
#: bzrlib/errors.py:3058
6427
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6428
msgstr ""
6429
6430
#: bzrlib/errors.py:3066
6431
msgid ""
6432
"An attempt to access a url outside the server jail was made: '%(url)s'."
6433
msgstr ""
6434
6435
#: bzrlib/errors.py:3074
6436
msgid "The user aborted the operation."
6437
msgstr ""
6438
6439
#: bzrlib/errors.py:3079
6440
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6441
msgstr ""
6442
6443
#: bzrlib/errors.py:3089
6444
msgid "No such view: %(view_name)s."
6445
msgstr ""
6446
6447
#: bzrlib/errors.py:3099
6448
msgid ""
6449
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6450
"to a later format."
6451
msgstr ""
6452
6453
#: bzrlib/errors.py:3108
6454
msgid ""
6455
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6456
msgstr ""
6457
6458
#: bzrlib/errors.py:3175
6459
msgid "%(bzrdir)r does not support co-located branches."
6460
msgstr ""
6461
6462
#: bzrlib/errors.py:3181
6463
msgid ""
6464
"Unable to determine your name.\n"
6465
"Please, set your name with the 'whoami' command.\n"
6466
"E.g. bzr whoami \"Your Name <name@example.com>\""
6467
msgstr ""
6468
6469
#: bzrlib/errors.py:3190
6470
msgid "Invalid pattern(s) found. %(msg)s"
6471
msgstr ""
6472
6473
#: bzrlib/errors.py:3198
6474
msgid ""
6475
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6476
"unbind` to fix."
6477
msgstr ""
6478
6479
#: bzrlib/errors.py:3209
6480
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6481
msgstr ""
6482
6483
#: bzrlib/errors.py:3218
6484
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6485
msgstr ""
6486
6487
#: bzrlib/errors.py:3227
6488
msgid ""
6489
"No compatible object available for operations from %(source)r to %(target)r."
6490
msgstr ""
6491
6492
#: bzrlib/errors.py:3237
6493
msgid ""
6494
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6495
"%(arguments)s."
6496
msgstr ""
6497
6498
#: bzrlib/errors.py:3247
6499
msgid ""
6500
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6501
"format %(format)r"
6502
msgstr ""
6503
6504
#: bzrlib/errors.py:3259
6505
msgid ""
6506
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6507
"plugin."
6508
msgstr ""
6509
6510
#: bzrlib/errors.py:3272
6511
msgid "Binary files section encountered."
6512
msgstr ""
6513
6514
#: bzrlib/errors.py:3280
6515
msgid ""
6516
"Malformed patch header. %(desc)s\n"
6517
"%(line)r"
6518
msgstr ""
6519
6520
#: bzrlib/errors.py:3289
6521
msgid ""
6522
"Malformed hunk header. %(desc)s\n"
6523
"%(line)r"
6524
msgstr ""
6525
6526
#: bzrlib/errors.py:3298
6527
msgid ""
6528
"Malformed line. %(desc)s\n"
6529
"%(line)r"
6530
msgstr ""
6531
6532
#: bzrlib/errors.py:3308
6533
msgid ""
6534
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6535
"but patch says it should be \"%(patch_line)s\""
6536
msgstr ""
6537
6538
#: bzrlib/errors.py:3319
6539
msgid "The feature %(feature)s has already been registered."
6540
msgstr ""
6541
6542
#: bzrlib/export_pot.py:252
6543
#, python-format
6544
msgid "Exporting messages from builtin command: %s"
6545
msgstr ""
6546
6547
#: bzrlib/export_pot.py:271
6548
msgid "Exporting messages from plugin command: {0} in {1}"
6549
msgstr ""
6550
6551
#: bzrlib/export_pot.py:292
6552
#, python-format
6553
msgid "Exporting message from error: %s"
6554
msgstr ""
6555
6556
#: bzrlib/fetch.py:98
6557
msgid "Finding revisions"
6558
msgstr ""
6559
6560
#: bzrlib/fetch.py:103
6561
msgid "Fetching revisions"
6562
msgstr ""
6563
6564
#: bzrlib/foreign.py:262
6565
msgid "Push into a different VCS without any custom bzr metadata."
6566
msgstr ""
6567
6568
#: bzrlib/foreign.py:264
6569
msgid ""
6570
"This will afterwards rebase the local branch on the remote\n"
6571
"branch unless the --no-rebase option is used, in which case \n"
6572
"the two branches will be out of sync after the push. "
6573
msgstr ""
6574
6575
#: bzrlib/foreign.py:277
6576
msgid "Do not rebase after push."
6577
msgstr ""
6578
6579
#: bzrlib/foreign.py:311
6580
#, python-format
6581
msgid "Using saved location: %s\n"
6582
msgstr ""
6583
6584
#: bzrlib/foreign.py:321
6585
msgid ""
6586
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6587
"regular push."
6588
msgstr ""
6589
6590
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6591
msgid "{0} commits with valid signatures"
6592
msgstr ""
6593
6594
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6595
msgid "{0} commit with unknown key"
6596
msgid_plural "{0} commits with unknown keys"
6597
msgstr[0] ""
6598
msgstr[1] ""
6599
6600
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6601
msgid "{0} commit not valid"
6602
msgid_plural "{0} commits not valid"
6603
msgstr[0] ""
6604
msgstr[1] ""
6605
6606
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6607
msgid "{0} commit not signed"
6608
msgid_plural "{0} commits not signed"
6609
msgstr[0] ""
6610
msgstr[1] ""
6611
6612
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6613
msgid "{0} commit with key now expired"
6614
msgid_plural "{0} commits with key now expired"
6615
msgstr[0] ""
6616
msgstr[1] ""
6617
6618
#: bzrlib/gpg.py:343
6619
msgid "No GnuPG key results for pattern: {0}"
6620
msgstr ""
6621
6622
#: bzrlib/gpg.py:386
6623
msgid "{0} signed {1} commit"
6624
msgid_plural "{0} signed {1} commits"
6625
msgstr[0] ""
6626
msgstr[1] ""
6627
6628
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6629
msgid "{0} commit by author {1}"
6630
msgid_plural "{0} commits by author {1}"
6631
msgstr[0] ""
6632
msgstr[1] ""
6633
6634
#: bzrlib/gpg.py:433
6635
msgid "Unknown key {0} signed {1} commit"
6636
msgid_plural "Unknown key {0} signed {1} commits"
6637
msgstr[0] ""
6638
msgstr[1] ""
6639
6640
#: bzrlib/gpg.py:452
6641
msgid "{0} commit by author {1} with key {2} now expired"
6642
msgid_plural "{0} commits by author {1} with key {2} now expired"
6643
msgstr[0] ""
6644
msgstr[1] ""
6645
6646
#: bzrlib/groupcompress.py:1739
6647
#, python-format
6648
msgid "Insert claimed random_id=True, but then inserted %r two times"
6649
msgstr ""
6650
6651
#: bzrlib/hooks.py:331
6652
#, python-format
6653
msgid "Introduced in: %s"
6654
msgstr ""
6655
6656
#: bzrlib/hooks.py:334
6657
#, python-format
6658
msgid "Deprecated in: %s"
6659
msgstr ""
6660
6661
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6662
msgid "Walking content"
6663
msgstr ""
6664
6665
#: bzrlib/knit.py:3330
6666
msgid "annotating"
6667
msgstr ""
6668
6669
#: bzrlib/lock.py:548
6670
msgid "{0!r} was {1} locked again"
6671
msgstr ""
6672
6673
#: bzrlib/lockdir.py:321
6674
#, python-format
6675
msgid "error removing pending lock: %s"
6676
msgstr ""
6677
6678
#: bzrlib/lockdir.py:616
6679
msgid "Unable to obtain"
6680
msgstr ""
6681
6682
#: bzrlib/lockdir.py:618
6683
msgid "Lock owner changed for"
6684
msgstr ""
6685
6686
#: bzrlib/lockdir.py:620
6687
msgid "{0} lock {1} {2}."
6688
msgstr ""
6689
6690
#: bzrlib/lockdir.py:627
6691
#, python-format
6692
msgid "Will continue to try until %s, unless you press Ctrl-C."
6693
msgstr ""
6694
6695
#: bzrlib/lockdir.py:629
6696
msgid "See \"bzr help break-lock\" for more."
6697
msgstr ""
6698
6699
#: bzrlib/lockdir.py:739
6700
#, python-format
6701
msgid ""
6702
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6703
msgstr ""
6704
6705
#: bzrlib/log.py:572
6706
msgid "--exclude-common-ancestry requires two different revisions"
6707
msgstr ""
6708
6709
#: bzrlib/log.py:574
6710
#, python-format
6711
msgid "invalid direction %r"
6712
msgstr ""
6713
6714
#: bzrlib/log.py:662
6715
msgid "Start revision not found in history of end revision."
6716
msgstr ""
6717
6718
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6719
msgid "Logging revision 0 is invalid."
6720
msgstr ""
6721
6722
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6723
msgid "Start revision must be older than the end revision."
6724
msgstr ""
6725
6726
#: bzrlib/log.py:1827
6727
#, python-format
6728
msgid "unknown log formatter: %r"
6729
msgstr ""
6730
6731
#: bzrlib/log.py:2123
6732
msgid "fixes bug"
6733
msgid_plural "fixes bugs"
6734
msgstr[0] ""
6735
msgstr[1] ""
6736
6737
#: bzrlib/merge.py:689
6738
msgid "All changes applied successfully."
6739
msgstr ""
6740
6741
#: bzrlib/merge.py:691
6742
#, python-format
6743
msgid "%d conflicts encountered."
6744
msgstr ""
6745
6746
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6747
msgid "Preparing file merge"
6748
msgstr ""
6749
6750
#: bzrlib/multiparent.py:426
6751
msgid "Importing revisions"
6752
msgstr ""
6753
6754
#: bzrlib/option.py:526
6755
msgid "Show help message."
6756
msgstr ""
6757
6758
#: bzrlib/option.py:528
6759
msgid "Only display errors and warnings."
6760
msgstr "エラーや警告だけを表示します。"
6761
6762
#: bzrlib/option.py:531
6763
msgid "Show usage message and options."
6764
msgstr "使い方とオプションを表示します。"
6765
6766
#: bzrlib/option.py:533
6767
msgid "Display more information."
6768
msgstr "より詳細な情報を表示します。"
6769
6770
#: bzrlib/option.py:541
6771
msgid ""
6772
"Select changes introduced by the specified revision. See also \"help "
6773
"revisionspec\"."
6774
msgstr ""
6775
6776
#: bzrlib/option.py:543
6777
msgid "Branch to operate on, instead of working directory."
6778
msgstr ""
6779
6780
#: bzrlib/option.py:545
6781
msgid "Detailed log format."
6782
msgstr ""
6783
6784
#: bzrlib/option.py:545
6785
msgid "Format used by GNU ChangeLog files."
6786
msgstr ""
6787
6788
#: bzrlib/option.py:545
6789
msgid "Log format with one line per revision."
6790
msgstr ""
6791
6792
#: bzrlib/option.py:545
6793
msgid "Moderately short log format."
6794
msgstr ""
6795
6796
#: bzrlib/option.py:545
6797
msgid "Use specified log format."
6798
msgstr ""
6799
6800
#: bzrlib/option.py:547
6801
msgid "Log format"
6802
msgstr ""
6803
6804
#: bzrlib/option.py:549
6805
msgid "LCA-newness merge."
6806
msgstr ""
6807
6808
#: bzrlib/option.py:549
6809
msgid "Merge using external diff3."
6810
msgstr ""
6811
6812
#: bzrlib/option.py:549
6813
msgid "Native diff3-style merge."
6814
msgstr ""
6815
6816
#: bzrlib/option.py:549
6817
msgid "Select a particular merge algorithm."
6818
msgstr ""
6819
6820
#: bzrlib/option.py:549
6821
msgid "Weave-based merge."
6822
msgstr ""
6823
6824
#: bzrlib/option.py:551
6825
msgid "Merge algorithm"
6826
msgstr ""
6827
6828
#: bzrlib/option.py:554
6829
msgid "Message string."
6830
msgstr ""
6831
6832
#: bzrlib/option.py:556
6833
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6834
msgstr ""
6835
6836
#: bzrlib/option.py:558
6837
msgid "Ignore differences between branches and overwrite unconditionally."
6838
msgstr ""
6839
6840
#: bzrlib/option.py:560
6841
msgid "Remember the specified location as a default."
6842
msgstr ""
6843
6844
#: bzrlib/option.py:562
6845
msgid "Reprocess to reduce spurious conflicts."
6846
msgstr ""
6847
6848
#: bzrlib/option.py:566
6849
msgid "See \"help revisionspec\" for details."
6850
msgstr "詳細は \"help revisionspec\" を参照してください。"
6851
6852
#: bzrlib/option.py:568
6853
msgid "Show internal object ids."
6854
msgstr ""
6855
6856
#: bzrlib/option.py:571
6857
msgid "Display timezone as local, original, or utc."
6858
msgstr ""
6859
6860
#: bzrlib/osutils.py:100
6861
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6862
msgstr ""
6863
6864
#: bzrlib/osutils.py:220
6865
msgid "lstat/stat of ({0!r}): {1!r}"
6866
msgstr ""
6867
6868
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6869
#, python-format
6870
msgid "sorry, %r not allowed in path"
6871
msgstr ""
6872
6873
#: bzrlib/osutils.py:1226
6874
#, python-format
6875
msgid "%r is too short to calculate a relative path"
6876
msgstr ""
6877
6878
#: bzrlib/plugin.py:143
6879
#, python-format
6880
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6881
msgstr ""
6882
6883
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6884
msgid "Enable completions for the selected plugin (default: all plugins)"
6885
msgstr ""
6886
6887
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6888
msgid "Generate a shell function for bash command line completion."
6889
msgstr ""
6890
6891
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6892
msgid ""
6893
"This command generates a shell function which can be used by bash to\n"
6894
"automatically complete the currently typed command when the user presses\n"
6895
"the completion key (usually tab)."
6896
msgstr ""
6897
6898
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6899
msgid ""
6900
"Commonly used like this:\n"
6901
" eval \"`bzr bash-completion`\""
6902
msgstr ""
6903
6904
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6905
msgid "Name of the generated function (default: _bzr)"
6906
msgstr ""
6907
6908
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6909
msgid "Generate only the shell function, don't enable it"
6910
msgstr ""
6911
6912
#: bzrlib/plugins/launchpad/__init__.py:81
6913
msgid "Register a branch with launchpad.net."
6914
msgstr ""
6915
6916
#: bzrlib/plugins/launchpad/__init__.py:83
6917
msgid ""
6918
"This command lists a bzr branch in the directory of branches on\n"
6919
"launchpad.net. Registration allows the branch to be associated with\n"
6920
"bugs or specifications."
6921
msgstr ""
6922
6923
#: bzrlib/plugins/launchpad/__init__.py:87
6924
msgid ""
6925
"Before using this command you must register the project to which the\n"
6926
"branch belongs, and create an account for yourself on launchpad.net."
6927
msgstr ""
6928
6929
#: bzrlib/plugins/launchpad/__init__.py:90
6930
msgid ""
6931
"arguments:\n"
6932
" public_url: The publicly visible url for the branch to register.\n"
6933
" This must be an http or https url (which Launchpad can read\n"
6934
" from to access the branch). Local file urls, SFTP urls, and\n"
6935
" bzr+ssh urls will not work.\n"
6936
" If no public_url is provided, bzr will use the configured\n"
6937
" public_url if there is one for the current branch, and\n"
6938
" otherwise error."
6939
msgstr ""
6940
6941
#: bzrlib/plugins/launchpad/__init__.py:99
6942
msgid ""
6943
"example:\n"
6944
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6945
" --project fooproject"
6946
msgstr ""
6947
6948
#: bzrlib/plugins/launchpad/__init__.py:106
6949
msgid "Launchpad project short name to associate with the branch."
6950
msgstr ""
6951
6952
#: bzrlib/plugins/launchpad/__init__.py:113
6953
msgid ""
6954
"Short name for the branch; by default taken from the last component of the "
6955
"url."
6956
msgstr ""
6957
6958
#: bzrlib/plugins/launchpad/__init__.py:117
6959
msgid "One-sentence description of the branch."
6960
msgstr ""
6961
6962
#: bzrlib/plugins/launchpad/__init__.py:120
6963
msgid "Longer description of the purpose or contents of the branch."
6964
msgstr ""
6965
6966
#: bzrlib/plugins/launchpad/__init__.py:123
6967
msgid "Branch author's email address, if not yourself."
6968
msgstr ""
6969
6970
#: bzrlib/plugins/launchpad/__init__.py:126
6971
msgid "The bug this branch fixes."
6972
msgstr ""
6973
6974
#: bzrlib/plugins/launchpad/__init__.py:129
6975
msgid "Prepare the request but don't actually send it."
6976
msgstr ""
6977
6978
#: bzrlib/plugins/launchpad/__init__.py:151
6979
msgid ""
6980
"register-branch requires a public branch url - see bzr help register-branch."
6981
msgstr ""
6982
6983
#: bzrlib/plugins/launchpad/__init__.py:159
6984
msgid "--product is deprecated; please use --project."
6985
msgstr ""
6986
6987
#: bzrlib/plugins/launchpad/__init__.py:191
6988
msgid "Open a Launchpad branch page in your web browser."
6989
msgstr ""
6990
6991
#: bzrlib/plugins/launchpad/__init__.py:196
6992
msgid "Do not actually open the browser. Just say the URL we would use."
6993
msgstr ""
6994
6995
#: bzrlib/plugins/launchpad/__init__.py:231
6996
#, python-format
6997
msgid "Opening %s in web browser"
6998
msgstr ""
6999
7000
#: bzrlib/plugins/launchpad/__init__.py:241
7001
msgid "Show or set the Launchpad user ID."
7002
msgstr ""
7003
7004
#: bzrlib/plugins/launchpad/__init__.py:243
7005
msgid ""
7006
"When communicating with Launchpad, some commands need to know your\n"
7007
"Launchpad user ID. This command can be used to set or show the\n"
7008
"user ID that Bazaar will use for such communication."
7009
msgstr ""
7010
7011
#: bzrlib/plugins/launchpad/__init__.py:247
7012
msgid ""
7013
":Examples:\n"
7014
" Show the Launchpad ID of the current user::"
7015
msgstr ""
7016
7017
#: bzrlib/plugins/launchpad/__init__.py:250
7018
msgid " bzr launchpad-login"
7019
msgstr ""
7020
7021
#: bzrlib/plugins/launchpad/__init__.py:252
7022
msgid " Set the Launchpad ID of the current user to 'bob'::"
7023
msgstr ""
7024
7025
#: bzrlib/plugins/launchpad/__init__.py:254
7026
msgid " bzr launchpad-login bob"
7027
msgstr ""
7028
7029
#: bzrlib/plugins/launchpad/__init__.py:261
7030
msgid "Don't check that the user name is valid."
7031
msgstr ""
7032
7033
#: bzrlib/plugins/launchpad/__init__.py:276
7034
#: bzrlib/plugins/launchpad/__init__.py:287
7035
msgid "Launchpad user ID exists and has SSH keys.\n"
7036
msgstr ""
7037
7038
#: bzrlib/plugins/launchpad/__init__.py:279
7039
msgid "No Launchpad user ID configured.\n"
7040
msgstr ""
7041
7042
#: bzrlib/plugins/launchpad/__init__.py:290
7043
#, python-format
7044
msgid "Launchpad user ID set to '%s'.\n"
7045
msgstr ""
7046
7047
#: bzrlib/plugins/launchpad/__init__.py:298
7048
msgid "Ask Launchpad to mirror a branch now."
7049
msgstr ""
7050
7051
#: bzrlib/plugins/launchpad/__init__.py:318
7052
msgid "Propose merging a branch on Launchpad."
7053
msgstr ""
7054
7055
#: bzrlib/plugins/launchpad/__init__.py:320
7056
msgid ""
7057
"This will open your usual editor to provide the initial comment. When it\n"
7058
"has created the proposal, it will open it in your default web browser."
7059
msgstr ""
7060
7061
#: bzrlib/plugins/launchpad/__init__.py:323
7062
msgid ""
7063
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7064
"is not supplied, the remembered submit branch will be used. If no submit\n"
7065
"branch is remembered, the development focus will be used."
7066
msgstr ""
7067
7068
#: bzrlib/plugins/launchpad/__init__.py:327
7069
msgid ""
7070
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7071
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7072
"The parameter the launchpad account name of the desired reviewer. This\n"
7073
"may optionally be followed by '=' and the review type. For example:"
7074
msgstr ""
7075
7076
#: bzrlib/plugins/launchpad/__init__.py:332
7077
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7078
msgstr ""
7079
7080
#: bzrlib/plugins/launchpad/__init__.py:334
7081
msgid ""
7082
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7083
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7084
msgstr ""
7085
7086
#: bzrlib/plugins/launchpad/__init__.py:339
7087
msgid "Propose the merge on staging."
7088
msgstr ""
7089
7090
#: bzrlib/plugins/launchpad/__init__.py:341
7091
msgid "Commit message."
7092
msgstr ""
7093
7094
#: bzrlib/plugins/launchpad/__init__.py:343
7095
msgid "Mark the proposal as approved immediately."
7096
msgstr ""
7097
7098
#: bzrlib/plugins/launchpad/__init__.py:345
7099
msgid "Requested reviewer and optional type."
7100
msgstr ""
7101
7102
#: bzrlib/plugins/launchpad/__init__.py:382
7103
msgid "Find the proposal to merge this revision."
7104
msgstr ""
7105
7106
#: bzrlib/plugins/launchpad/__init__.py:384
7107
msgid ""
7108
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7109
"This works only if the selected branch was the merge proposal target, and\n"
7110
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7111
"are opened in a web browser."
7112
msgstr ""
7113
7114
#: bzrlib/plugins/launchpad/__init__.py:389
7115
msgid ""
7116
"Any revision involved in the merge may be specified-- the revision in\n"
7117
"which the merge was performed, or one of the revisions that was merged."
7118
msgstr ""
7119
7120
#: bzrlib/plugins/launchpad/__init__.py:392
7121
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7122
msgstr ""
7123
7124
#: bzrlib/plugins/launchpad/__init__.py:394
7125
msgid " bzr lp-find-proposal -r annotate:README:1"
7126
msgstr ""
7127
7128
#: bzrlib/plugins/launchpad/__init__.py:409
7129
msgid "No review found."
7130
msgstr ""
7131
7132
#: bzrlib/plugins/launchpad/__init__.py:410
7133
#, python-format
7134
msgid "%d proposals(s) found."
7135
msgstr ""
7136
7137
#: bzrlib/plugins/launchpad/__init__.py:420
7138
msgid "Finding revision-id"
7139
msgstr ""
7140
7141
#: bzrlib/plugins/launchpad/__init__.py:427
7142
msgid "Finding merge"
7143
msgstr ""
7144
7145
#: bzrlib/plugins/launchpad/__init__.py:432
7146
msgid "Finding revno"
7147
msgstr ""
7148
7149
#: bzrlib/plugins/launchpad/__init__.py:437
7150
msgid "Finding Launchpad branch"
7151
msgstr ""
7152
7153
#: bzrlib/plugins/launchpad/__init__.py:440
7154
msgid "Finding proposals"
7155
msgstr ""
7156
7157
#: bzrlib/plugins/launchpad/account.py:66
7158
msgid "Setting ssh/sftp usernames for launchpad.net."
7159
msgstr ""
7160
7161
#: bzrlib/plugins/launchpad/lp_api.py:241
7162
#: bzrlib/plugins/launchpad/lp_api.py:246
7163
#, python-format
7164
msgid "%s is not registered on Launchpad"
7165
msgstr ""
7166
7167
#: bzrlib/plugins/launchpad/lp_api.py:256
7168
#, python-format
7169
msgid "%s has no development focus."
7170
msgstr ""
7171
7172
#: bzrlib/plugins/launchpad/lp_api.py:261
7173
#, python-format
7174
msgid "development focus %s has no branch."
7175
msgstr ""
7176
7177
#: bzrlib/plugins/launchpad/lp_api.py:266
7178
#, python-format
7179
msgid "source package %s has no branch."
7180
msgstr ""
7181
7182
#: bzrlib/plugins/launchpad/lp_api.py:270
7183
#, python-format
7184
msgid "%s has no associated product or source package."
7185
msgstr ""
7186
7187
#: bzrlib/plugins/launchpad/lp_api.py:282
7188
#, python-format
7189
msgid "%s is already up-to-date."
7190
msgstr ""
7191
7192
#: bzrlib/plugins/launchpad/lp_api.py:289
7193
#, python-format
7194
msgid "Pushing to %s"
7195
msgstr ""
7196
7197
#: bzrlib/plugins/launchpad/lp_directory.py:170
7198
msgid ""
7199
"resolution for {0}\n"
7200
" local: {1}\n"
7201
" remote: {2}"
7202
msgstr ""
7203
7204
#: bzrlib/plugins/launchpad/lp_propose.py:149
7205
#, python-format
7206
msgid "There is already a branch merge proposal: %s"
7207
msgstr ""
7208
7209
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7210
msgid "pb parameter to convert() is deprecated"
7211
msgstr ""
7212
7213
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7214
msgid "starting upgrade from format 4 to 5"
7215
msgstr ""
7216
7217
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7218
msgid "note: upgrade may be faster if all store files are ungzipped first"
7219
msgstr ""
7220
7221
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7222
msgid "converting revision"
7223
msgstr ""
7224
7225
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7226
msgid "upgraded to weaves:"
7227
msgstr ""
7228
7229
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7230
#, python-format
7231
msgid "%6d revisions and inventories"
7232
msgstr ""
7233
7234
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7235
#, python-format
7236
msgid "%6d revisions not present"
7237
msgstr ""
7238
7239
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7240
#, python-format
7241
msgid "%6d texts"
7242
msgstr ""
7243
7244
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7245
msgid "writing weave"
7246
msgstr ""
7247
7248
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7249
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7250
msgid "inventory"
7251
msgstr ""
7252
7253
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7254
msgid "write revision"
7255
msgstr ""
7256
7257
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7258
msgid "loading revision"
7259
msgstr ""
7260
7261
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7262
#, python-format
7263
msgid "revision {%s} not present in branch; will be converted as a ghost"
7264
msgstr ""
7265
7266
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7267
msgid "starting upgrade from format 5 to 6"
7268
msgstr ""
7269
7270
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7271
#, python-format
7272
msgid "adding prefixes to %s"
7273
msgstr ""
7274
7275
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7276
msgid "starting upgrade from format 6 to metadir"
7277
msgstr ""
7278
7279
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7280
msgid "Removing ancestry.weave"
7281
msgstr ""
7282
7283
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7284
msgid "Finding branch files"
7285
msgstr ""
7286
7287
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7288
msgid "Upgrading repository"
7289
msgstr ""
7290
7291
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7292
msgid "Upgrading branch"
7293
msgstr ""
7294
7295
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7296
msgid "No working tree."
7297
msgstr ""
7298
7299
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7300
msgid "Upgrading working tree"
7301
msgstr ""
7302
7303
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7304
#, python-format
7305
msgid "Make %s lock"
7306
msgstr ""
7307
7308
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7309
#, python-format
7310
msgid "Moving %s"
7311
msgstr ""
7312
7313
#: bzrlib/push.py:56
7314
msgid "Created new branch."
7315
msgstr ""
7316
7317
#: bzrlib/push.py:98
7318
#, python-format
7319
msgid ""
7320
"Target directory %s already contains a .bzr directory, but it is not valid."
7321
msgstr ""
7322
7323
#: bzrlib/push.py:101
7324
#, python-format
7325
msgid ""
7326
"Target directory %s already exists, but does not have a .bzr directory. "
7327
"Supply --use-existing-dir to push there anyway."
7328
msgstr ""
7329
7330
#: bzrlib/push.py:122
7331
#, python-format
7332
msgid "Too many redirections trying to make %s."
7333
msgstr ""
7334
7335
#: bzrlib/push.py:147
7336
msgid ""
7337
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7338
"information."
7339
msgstr ""
7340
7341
#: bzrlib/push.py:151
7342
#, python-format
7343
msgid ""
7344
"It is not possible to losslessly push to %s. You may want to use dpush "
7345
"instead."
7346
msgstr ""
7347
7348
#: bzrlib/push.py:157
7349
#, python-format
7350
msgid ""
7351
"At %s you have a valid .bzr control directory, but not a branch or "
7352
"repository. This is an unsupported configuration. Please move the target "
7353
"directory out of the way and try again."
7354
msgstr ""
7355
7356
#: bzrlib/reconcile.py:97
7357
#, python-format
7358
msgid "Reconciling branch %s"
7359
msgstr ""
7360
7361
#: bzrlib/reconcile.py:103
7362
#, python-format
7363
msgid "Reconciling repository %s"
7364
msgstr ""
7365
7366
#: bzrlib/reconcile.py:105
7367
msgid "Reconciling repository"
7368
msgstr ""
7369
7370
#: bzrlib/reconcile.py:111
7371
#, python-format
7372
msgid "%s cannot canonicalize CHKs."
7373
msgstr ""
7374
7375
#: bzrlib/reconcile.py:119
7376
msgid "Reconcile aborted: revision index has inconsistent parents."
7377
msgstr ""
7378
7379
#: bzrlib/reconcile.py:121
7380
msgid "Run \"bzr check\" for more details."
7381
msgstr ""
7382
7383
#: bzrlib/reconcile.py:123
7384
msgid "Reconciliation complete."
7385
msgstr ""
7386
7387
#: bzrlib/reconcile.py:166
7388
msgid "Fixing last revision info {0} => {1}"
7389
msgstr ""
7390
7391
#: bzrlib/reconcile.py:173
7392
msgid "revision_history ok."
7393
msgstr ""
7394
7395
#: bzrlib/reconcile.py:234
7396
msgid "Reading inventory data"
7397
msgstr ""
7398
7399
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7400
msgid "Inventory ok."
7401
msgstr ""
7402
7403
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7404
msgid "Backing up inventory"
7405
msgstr ""
7406
7407
#: bzrlib/reconcile.py:258
7408
msgid "Backup inventory created."
7409
msgstr ""
7410
7411
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7412
msgid "Writing weave"
7413
msgstr ""
7414
7415
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7416
msgid "Inventory regenerated."
7417
msgstr ""
7418
7419
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7420
msgid "Reading indexes"
7421
msgstr ""
7422
7423
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7424
msgid "Checking unused inventories"
7425
msgstr ""
7426
7427
#: bzrlib/reconcile.py:388
7428
msgid "Backup Inventory created"
7429
msgstr ""
7430
7431
#: bzrlib/reconcile.py:446
7432
msgid "Fixing text parents"
7433
msgstr ""
7434
7435
#: bzrlib/reconfigure.py:54
7436
msgid "{0} is now stacked on {1}\n"
7437
msgstr ""
7438
7439
#: bzrlib/reconfigure.py:69
7440
#, python-format
7441
msgid "%s is now not stacked\n"
7442
msgstr ""
7443
7444
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7445
#, python-format
7446
msgid "bzr: ERROR (ignored): %s"
7447
msgstr ""
7448
7449
#: bzrlib/remote.py:2493
7450
msgid "Copying repository content as tarball..."
7451
msgstr ""
7452
7453
#: bzrlib/rename_map.py:69
7454
msgid "Calculating hashes"
7455
msgstr ""
7456
7457
#: bzrlib/rename_map.py:107
7458
msgid "Determining hash hits"
7459
msgstr ""
7460
7461
#: bzrlib/rename_map.py:242
7462
msgid "{0} => {1}"
7463
msgstr ""
7464
7465
#: bzrlib/repository.py:1787
7466
msgid "Moving repository to repository.backup"
7467
msgstr ""
7468
7469
#: bzrlib/repository.py:1794
7470
msgid "Creating new repository"
7471
msgstr ""
7472
7473
#: bzrlib/repository.py:1799
7474
msgid "Copying content"
7475
msgstr ""
7476
7477
#: bzrlib/repository.py:1803
7478
msgid "Deleting old repository content"
7479
msgstr ""
7480
7481
#: bzrlib/repository.py:1805
7482
msgid "repository converted"
7483
msgstr ""
7484
7485
#: bzrlib/revisionspec.py:903
7486
msgid "Using {0} {1}"
7487
msgstr ""
7488
7489
#: bzrlib/send.py:58
7490
#, python-format
7491
msgid "Mail client \"%s\" does not support specifying body"
7492
msgstr ""
7493
7494
#: bzrlib/send.py:62
7495
msgid "--remember requires a branch to be specified."
7496
msgstr ""
7497
7498
#: bzrlib/send.py:77
7499
msgid "No submit branch known or specified"
7500
msgstr ""
7501
7502
#: bzrlib/send.py:80
7503
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7504
msgstr ""
7505
7506
#: bzrlib/send.py:98
7507
#, python-format
7508
msgid "No such send format '%s'."
7509
msgstr ""
7510
7511
#: bzrlib/send.py:114
7512
msgid "bzr send takes at most two one revision identifiers"
7513
msgstr ""
7514
7515
#: bzrlib/send.py:127
7516
msgid "No revisions to submit."
7517
msgstr ""
7518
7519
#: bzrlib/send.py:139
7520
msgid ""
7521
"- not supported for merge directives that use more than one output file."
7522
msgstr ""
7523
7524
#: bzrlib/send.py:185
7525
msgid "Format 0.9 does not permit bundle with no patch"
7526
msgstr ""
7527
7528
#: bzrlib/shelf_ui.py:46
7529
#, python-format
7530
msgid "Shelve adding file \"%(path)s\"?"
7531
msgstr ""
7532
7533
#: bzrlib/shelf_ui.py:47
7534
msgid "Shelve binary changes?"
7535
msgstr ""
7536
7537
#: bzrlib/shelf_ui.py:48
7538
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7539
msgstr ""
7540
7541
#: bzrlib/shelf_ui.py:50
7542
#, python-format
7543
msgid "Shelve removing file \"%(path)s\"?"
7544
msgstr ""
7545
7546
#: bzrlib/shelf_ui.py:51
7547
#, python-format
7548
msgid "Shelve %d change(s)?"
7549
msgstr ""
7550
7551
#: bzrlib/shelf_ui.py:52
7552
msgid "Shelve?"
7553
msgstr ""
7554
7555
#: bzrlib/shelf_ui.py:53
7556
#, python-format
7557
msgid ""
7558
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7559
msgstr ""
7560
7561
#: bzrlib/shelf_ui.py:55
7562
#, python-format
7563
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7564
msgstr ""
7565
7566
#: bzrlib/shelf_ui.py:70
7567
#, python-format
7568
msgid "Changes shelved with id \"%d\"."
7569
msgstr ""
7570
7571
#: bzrlib/shelf_ui.py:74
7572
msgid "Selected changes destroyed."
7573
msgstr ""
7574
7575
#: bzrlib/shelf_ui.py:78
7576
msgid "Selected changes:"
7577
msgstr ""
7578
7579
#: bzrlib/shelf_ui.py:98
7580
#, python-format
7581
msgid "Delete file \"%(path)s\"?"
7582
msgstr ""
7583
7584
#: bzrlib/shelf_ui.py:99
7585
msgid "Apply binary changes?"
7586
msgstr ""
7587
7588
#: bzrlib/shelf_ui.py:100
7589
#, python-format
7590
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7591
msgstr ""
7592
7593
#: bzrlib/shelf_ui.py:102
7594
#, python-format
7595
msgid "Add file \"%(path)s\"?"
7596
msgstr ""
7597
7598
#: bzrlib/shelf_ui.py:103
7599
#, python-format
7600
msgid "Apply %d change(s)?"
7601
msgstr ""
7602
7603
#: bzrlib/shelf_ui.py:104
7604
msgid "Apply change?"
7605
msgstr ""
7606
7607
#: bzrlib/shelf_ui.py:105
7608
#, python-format
7609
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7610
msgstr ""
7611
7612
#: bzrlib/shelf_ui.py:107
7613
#, python-format
7614
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7615
msgstr ""
7616
7617
#: bzrlib/shelf_ui.py:402
7618
msgid "No changes are shelved."
7619
msgstr ""
7620
7621
#: bzrlib/shelf_ui.py:460
7622
#, python-format
7623
msgid "Using changes with id \"%d\"."
7624
msgstr ""
7625
7626
#: bzrlib/shelf_ui.py:464
7627
#, python-format
7628
msgid "Message: %s"
7629
msgstr ""
7630
7631
#: bzrlib/shelf_ui.py:476
7632
#, python-format
7633
msgid "Deleted changes with id \"%d\"."
7634
msgstr ""
7635
7636
#: bzrlib/smart/medium.py:714
7637
msgid "HPSS calls: {0} ({1} vfs) {2}"
7638
msgstr ""
7639
7640
#: bzrlib/smart/server.py:169
7641
msgid "Requested to stop gracefully"
7642
msgstr ""
7643
7644
#: bzrlib/smart/server.py:179
7645
#, python-format
7646
msgid "Waiting for %d client(s) to finish"
7647
msgstr ""
7648
7649
#: bzrlib/smart/server.py:185
7650
#, python-format
7651
msgid "Still waiting for %d client(s) to finish"
7652
msgstr ""
7653
7654
#: bzrlib/smart/server.py:219
7655
#, python-format
7656
msgid "listening socket error: %s"
7657
msgstr ""
7658
7659
#: bzrlib/smart/server.py:452
7660
#, python-format
7661
msgid "listening on port: %s"
7662
msgstr ""
7663
7664
#: bzrlib/switch.py:69
7665
msgid "Pending merges must be committed or reverted before using switch."
7666
msgstr ""
7667
7668
#: bzrlib/switch.py:96
7669
msgid ""
7670
"Cannot switch as local commits found in the checkout. Commit these to the "
7671
"bound branch or use --force to throw them away."
7672
msgstr ""
7673
7674
#: bzrlib/switch.py:101
7675
#, python-format
7676
msgid ""
7677
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7678
"anyway, use --force."
7679
msgstr ""
7680
7681
#: bzrlib/switch.py:110
7682
msgid "Cannot switch a branch, only a checkout."
7683
msgstr ""
7684
7685
#: bzrlib/switch.py:146
7686
#, python-format
7687
msgid "Tree is up to date at revision %d."
7688
msgstr ""
7689
7690
#: bzrlib/switch.py:152
7691
#, python-format
7692
msgid "Updated to revision %d."
7693
msgstr ""
7694
7695
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7696
msgid "Apply phase"
7697
msgstr ""
7698
7699
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7700
msgid "removing file"
7701
msgstr ""
7702
7703
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7704
msgid "adding file"
7705
msgstr ""
7706
7707
#: bzrlib/transform.py:2587
7708
msgid "Building tree"
7709
msgstr ""
7710
7711
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7712
msgid "Adding file contents"
7713
msgstr ""
7714
7715
#: bzrlib/transform.py:3024
7716
msgid "Resolution pass"
7717
msgstr ""
7718
7719
#: bzrlib/transport/ftp/_gssapi.py:88
7720
#, python-format
7721
msgid "Authenticated as %s"
7722
msgstr ""
7723
7724
#: bzrlib/tree.py:634
7725
msgid "*** {0} content-filter: {1} => {2!r}"
7726
msgstr ""
7727
7728
#: bzrlib/upgrade.py:77
7729
#, python-format
7730
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7731
msgstr ""
7732
7733
#: bzrlib/upgrade.py:100
7734
#, python-format
7735
msgid "cannot upgrade from bzrdir format %s"
7736
msgstr ""
7737
7738
#: bzrlib/upgrade.py:103
7739
#, python-format
7740
msgid "starting upgrade of %s"
7741
msgstr ""
7742
7743
#: bzrlib/upgrade.py:110
7744
msgid "finished"
7745
msgstr ""
7746
7747
#: bzrlib/upgrade.py:120
7748
msgid "Deleting backup.bzr"
7749
msgstr ""
7750
7751
#: bzrlib/upgrade.py:151
7752
msgid ""
7753
"\n"
7754
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7755
msgstr ""
7756
7757
#: bzrlib/upgrade.py:208
7758
#, python-format
7759
msgid "Found %d dependent branches - upgrading ..."
7760
msgstr ""
7761
7762
#: bzrlib/upgrade.py:276
7763
msgid "Upgrading bzrdirs"
7764
msgstr ""
7765
7766
#: bzrlib/upgrade.py:282
7767
#, python-format
7768
msgid "Upgrading %s"
7769
msgstr ""
7770
7771
#: bzrlib/upgrade.py:283
7772
msgid "Upgrading {0} {1} ..."
7773
msgstr ""
7774
7775
#: bzrlib/upgrade.py:301
7776
msgid "Removing backup ..."
7777
msgstr ""
7778
7779
#: bzrlib/upgrade.py:305
7780
msgid "failed to clean-up {0}: {1}"
7781
msgstr ""
7782
7783
#: bzrlib/vf_repository.py:1090
7784
msgid "inventories"
7785
msgstr ""
7786
7787
#: bzrlib/vf_repository.py:1116
7788
msgid "texts"
7789
msgstr ""
7790
7791
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7792
msgid "Calculating text parents"
7793
msgstr ""
7794
7795
#: bzrlib/vf_repository.py:1706
7796
msgid "Fetch texts"
7797
msgstr ""
7798
7799
#: bzrlib/vf_repository.py:2535
7800
msgid "loading text store"
7801
msgstr ""
7802
7803
#: bzrlib/vf_repository.py:2541
7804
msgid "checking text graph"
7805
msgstr ""
7806
7807
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7808
#: bzrlib/vf_repository.py:3124
7809
msgid "Transferring revisions"
7810
msgstr ""
7811
7812
#: bzrlib/win32utils.py:146
7813
msgid "Failed to GetProcessMemoryInfo()"
7814
msgstr ""
7815
7816
#: bzrlib/win32utils.py:167
7817
msgid "Cannot debug memory on win32 without ctypes or win32process"
7818
msgstr ""
7819
7820
#: bzrlib/win32utils.py:172
7821
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7822
msgstr ""
7823
7824
#: bzrlib/win32utils.py:180
7825
#, python-format
7826
msgid "WorkingSize %8d KiB"
7827
msgstr ""
7828
7829
#: bzrlib/win32utils.py:181
7830
#, python-format
7831
msgid "PeakWorking %8d KiB"
7832
msgstr ""
7833
7834
#: bzrlib/win32utils.py:182
7835
#, python-format
7836
msgid "PagefileUsage %8d KiB"
7837
msgstr ""
7838
7839
#: bzrlib/win32utils.py:183
7840
#, python-format
7841
msgid "PeakPagefileUsage %8d KiB"
7842
msgstr ""
7843
7844
#: bzrlib/win32utils.py:185
7845
#, python-format
7846
msgid "PrivateUsage %8d KiB"
7847
msgstr ""
7848
7849
#: bzrlib/win32utils.py:186
7850
#, python-format
7851
msgid "PageFaultCount %8d"
7852
msgstr ""
7853
7854
#: bzrlib/workingtree.py:1478
7855
msgid "Rerun update after fixing the conflicts."
7856
msgstr ""
7857
7858
#: dummy/help_topics/authentication/summary.txt:1
7859
msgid "Information on configuring authentication"
7860
msgstr ""
7861
7862
#: dummy/help_topics/basic/detail.txt:1
7863
msgid ""
7864
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7865
"http://bazaar.canonical.com/"
7866
msgstr ""
7867
7868
#: dummy/help_topics/basic/detail.txt:4
7869
msgid ""
7870
"Basic commands:\n"
7871
" bzr init makes this directory a versioned branch\n"
7872
" bzr branch make a copy of another branch"
7873
msgstr ""
7874
7875
#: dummy/help_topics/basic/detail.txt:8
7876
msgid ""
7877
" bzr add make files or directories versioned\n"
7878
" bzr ignore ignore a file or pattern\n"
7879
" bzr mv move or rename a versioned file"
7880
msgstr ""
7881
7882
#: dummy/help_topics/basic/detail.txt:12
7883
msgid ""
7884
" bzr status summarize changes in working copy\n"
7885
" bzr diff show detailed diffs"
7886
msgstr ""
7887
7888
#: dummy/help_topics/basic/detail.txt:15
7889
msgid ""
7890
" bzr merge pull in changes from another branch\n"
7891
" bzr commit save some or all changes\n"
7892
" bzr send send changes via email"
7893
msgstr ""
7894
7895
#: dummy/help_topics/basic/detail.txt:19
7896
msgid ""
7897
" bzr log show history of changes\n"
7898
" bzr check validate storage"
7899
msgstr ""
7900
7901
#: dummy/help_topics/basic/detail.txt:22
7902
msgid ""
7903
" bzr help init more help on e.g. init command\n"
7904
" bzr help commands list all commands\n"
7905
" bzr help topics list all help topics\n"
7906
msgstr ""
7907
7908
#: dummy/help_topics/basic/summary.txt:1
7909
msgid "Basic commands"
7910
msgstr ""
7911
7912
#: dummy/help_topics/branches/detail.txt:1
7913
msgid "Branches"
7914
msgstr ""
7915
7916
#: dummy/help_topics/branches/detail.txt:3
7917
msgid ""
7918
"A branch consists of the state of a project, including all of its\n"
7919
"history. All branches have a repository associated (which is where the\n"
7920
"branch history is stored), but multiple branches may share the same\n"
7921
"repository (a shared repository). Branches can be copied and merged."
7922
msgstr ""
7923
7924
#: dummy/help_topics/branches/detail.txt:8
7925
msgid ""
7926
"In addition, one branch may be bound to another one. Binding to another\n"
7927
"branch indicates that commits which happen in this branch must also \n"
7928
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7929
"commits when the two branches are out of date. In order for a commit \n"
7930
"to succeed, it may be necessary to update the current branch using \n"
7931
"``bzr update``."
7932
msgstr ""
7933
7934
#: dummy/help_topics/branches/detail.txt:15
7935
#: dummy/help_topics/checkouts/detail.txt:66
7936
#: dummy/help_topics/repositories/detail.txt:36
7937
msgid "Related commands::"
7938
msgstr ""
7939
7940
#: dummy/help_topics/branches/detail.txt:17
7941
msgid ""
7942
" init Change a directory into a versioned branch.\n"
7943
" branch Create a new branch that is a copy of an existing branch.\n"
7944
" merge Perform a three-way merge.\n"
7945
" bind Bind a branch to another one.\n"
7946
msgstr ""
7947
7948
#: dummy/help_topics/branches/summary.txt:1
7949
msgid "Information on what a branch is"
7950
msgstr ""
7951
7952
#: dummy/help_topics/bugs/summary.txt:1
7953
msgid "Bug tracker settings"
7954
msgstr ""
7955
7956
#: dummy/help_topics/checkouts/detail.txt:1
7957
msgid "Checkouts"
7958
msgstr ""
7959
7960
#: dummy/help_topics/checkouts/detail.txt:3
7961
msgid ""
7962
"Checkouts are source trees that are connected to a branch, so that when\n"
7963
"you commit in the source tree, the commit goes into that branch. They\n"
7964
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7965
"Bazaar's decentralized features until you want them. Using checkouts\n"
7966
"with shared repositories is very similar to working with SVN or CVS, but\n"
7967
"doesn't have the same restrictions. And using checkouts still allows\n"
7968
"others working on the project to use whatever workflow they like."
7969
msgstr ""
7970
7971
#: dummy/help_topics/checkouts/detail.txt:11
7972
msgid ""
7973
"A checkout is created with the bzr checkout command (see \"help "
7974
"checkout\").\n"
7975
"You pass it a reference to another branch, and it will create a local copy\n"
7976
"for you that still contains a reference to the branch you created the\n"
7977
"checkout from (the master branch). Then if you make any commits they will "
7978
"be\n"
7979
"made on the other branch first. This creates an instant mirror of your work, "
7980
"or\n"
7981
"facilitates lockstep development, where each developer is working together,\n"
7982
"continuously integrating the changes of others."
7983
msgstr ""
7984
7985
#: dummy/help_topics/checkouts/detail.txt:19
7986
msgid ""
7987
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7988
"you have the full history locally. As you have a first class branch you "
7989
"can\n"
7990
"also commit locally if you want, for instance due to the temporary loss af "
7991
"a\n"
7992
"network connection. Use the --local option to commit to do this. All the "
7993
"local\n"
7994
"commits will then be made on the master branch the next time you do a non-"
7995
"local\n"
7996
"commit."
7997
msgstr ""
7998
7999
#: dummy/help_topics/checkouts/detail.txt:26
8000
msgid ""
8001
"If you are using a checkout from a shared branch you will periodically want "
8002
"to\n"
8003
"pull in all the changes made by others. This is done using the \"update\"\n"
8004
"command. The changes need to be applied before any non-local commit, but\n"
8005
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8006
"command when needed."
8007
msgstr ""
8008
8009
#: dummy/help_topics/checkouts/detail.txt:32
8010
msgid ""
8011
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8012
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8013
"SVN checkout in that it is not a first class branch, it mainly consists of "
8014
"the\n"
8015
"working tree. This means that any history operations must query the master\n"
8016
"branch, which could be slow if a network connection is involved. Also, as "
8017
"you\n"
8018
"don't have a local branch, then you cannot commit locally."
8019
msgstr ""
8020
8021
#: dummy/help_topics/checkouts/detail.txt:39
8022
msgid ""
8023
"Lightweight checkouts work best when you have fast reliable access to the\n"
8024
"master branch. This means that if the master branch is on the same disk or "
8025
"LAN\n"
8026
"a lightweight checkout will be faster than a heavyweight one for any "
8027
"commands\n"
8028
"that modify the revision history (as only one copy of the branch needs to\n"
8029
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8030
"that uses the history but does not change it, but if the master branch is "
8031
"on\n"
8032
"the same disk then there won't be a noticeable difference."
8033
msgstr ""
8034
8035
#: dummy/help_topics/checkouts/detail.txt:47
8036
msgid ""
8037
"Another possible use for a checkout is to use it with a treeless repository\n"
8038
"containing your branches, where you maintain only one working tree by\n"
8039
"switching the master branch that the checkout points to when you want to\n"
8040
"work on a different branch."
8041
msgstr ""
8042
8043
#: dummy/help_topics/checkouts/detail.txt:52
8044
msgid ""
8045
"Obviously to commit on a checkout you need to be able to write to the "
8046
"master\n"
8047
"branch. This means that the master branch must be accessible over a "
8048
"writeable\n"
8049
"protocol , such as sftp://, and that you have write permissions at the "
8050
"other\n"
8051
"end. Checkouts also work on the local file system, so that all that matters "
8052
"is\n"
8053
"file permissions."
8054
msgstr ""
8055
8056
#: dummy/help_topics/checkouts/detail.txt:58
8057
msgid ""
8058
"You can change the master of a checkout by using the \"switch\" command "
8059
"(see\n"
8060
"\"help switch\"). This will change the location that the commits are sent "
8061
"to.\n"
8062
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8063
"checkout. If you would like to convert your heavy checkout into a normal\n"
8064
"branch so that every commit is local, you can use the \"unbind\" command. To "
8065
"see\n"
8066
"whether or not a branch is bound or not you can use the \"info\" command. If "
8067
"the\n"
8068
"branch is bound it will tell you the location of the bound branch."
8069
msgstr ""
8070
8071
#: dummy/help_topics/checkouts/detail.txt:68
8072
msgid ""
8073
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
8074
" checkout\n"
8075
" update Pull any changes in the master branch in to your checkout\n"
8076
" commit Make a commit that is sent to the master branch. If you have\n"
8077
" a heavy checkout then the --local option will commit to the\n"
8078
" checkout without sending the commit to the master\n"
8079
" switch Change the master branch that the commits in the checkout "
8080
"will\n"
8081
" be sent to\n"
8082
" bind Turn a standalone branch into a heavy checkout so that any\n"
8083
" commits will be sent to the master branch\n"
8084
" unbind Turn a heavy checkout into a standalone branch so that any\n"
8085
" commits are only made locally\n"
8086
" info Displays whether a branch is bound or unbound. If the branch "
8087
"is\n"
8088
" bound, then it will also display the location of the bound "
8089
"branch\n"
8090
msgstr ""
8091
8092
#: dummy/help_topics/checkouts/summary.txt:1
8093
msgid "Information on what a checkout is"
8094
msgstr ""
8095
8096
#: dummy/help_topics/commands/summary.txt:1
8097
msgid "Basic help for all commands"
8098
msgstr ""
8099
8100
#: dummy/help_topics/configuration/summary.txt:1
8101
msgid "Details on the configuration settings available"
8102
msgstr ""
8103
8104
#: dummy/help_topics/conflict-types/summary.txt:1
8105
msgid "Types of conflicts and what to do about them"
8106
msgstr ""
8107
8108
#: dummy/help_topics/content-filters/summary.txt:1
8109
msgid "Conversion of content into/from working trees"
8110
msgstr ""
8111
8112
#: dummy/help_topics/criss-cross/detail.txt:1
8113
msgid "Criss-Cross"
8114
msgstr ""
8115
8116
#: dummy/help_topics/criss-cross/detail.txt:3
8117
msgid ""
8118
"A criss-cross in the branch history can cause the default merge technique\n"
8119
"to emit more conflicts than would normally be expected."
8120
msgstr ""
8121
8122
#: dummy/help_topics/criss-cross/detail.txt:6
8123
msgid ""
8124
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
8125
"give\n"
8126
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
8127
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
8128
msgstr ""
8129
8130
#: dummy/help_topics/criss-cross/detail.txt:10
8131
msgid ""
8132
"Criss-crosses occur in a branch's history if two branches merge the same "
8133
"thing\n"
8134
"and then merge one another, or if two branches merge one another at the "
8135
"same\n"
8136
"time. They can be avoided by having each branch only merge from or into a\n"
8137
"designated central branch (a \"star topology\")."
8138
msgstr ""
8139
8140
#: dummy/help_topics/criss-cross/detail.txt:15
8141
msgid ""
8142
"Criss-crosses cause problems because of the way merge works. Bazaar's "
8143
"default\n"
8144
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8145
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
8146
"differences between THIS and OTHER are due to one side adding lines, or\n"
8147
"from another side removing lines."
8148
msgstr ""
8149
8150
#: dummy/help_topics/criss-cross/detail.txt:21
8151
msgid ""
8152
"Criss-crosses mean there is no good choice for a base. Selecting the "
8153
"recent\n"
8154
"merge points could cause one side's changes to be silently discarded.\n"
8155
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8156
"are emitted."
8157
msgstr ""
8158
8159
#: dummy/help_topics/criss-cross/detail.txt:26
8160
msgid ""
8161
"The ``weave`` merge type is not affected by this problem because it uses\n"
8162
"line-origin detection instead of a basis revision to determine the cause of\n"
8163
"differences.\n"
8164
msgstr ""
8165
8166
#: dummy/help_topics/criss-cross/summary.txt:1
8167
msgid "Information on criss-cross merging"
8168
msgstr ""
8169
8170
#: dummy/help_topics/current-formats/summary.txt:1
8171
msgid "Current storage formats"
8172
msgstr ""
8173
8174
#: dummy/help_topics/debug-flags/summary.txt:1
8175
msgid "Options to show or record debug information"
8176
msgstr ""
8177
8178
#: dummy/help_topics/diverged-branches/summary.txt:1
8179
msgid "How to fix diverged branches"
8180
msgstr ""
8181
8182
#: dummy/help_topics/env-variables/detail.txt:1
8183
msgid "Environment Variables"
8184
msgstr ""
8185
8186
#: dummy/help_topics/env-variables/detail.txt:3
8187
msgid ""
8188
"=================== "
8189
"===========================================================\n"
8190
"BZRPATH Path where bzr is to look for shell plugin external\n"
8191
" commands.\n"
8192
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8193
"EMAIL E-Mail address of the user.\n"
8194
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8195
"EDITOR Editor for editing commit messages.\n"
8196
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8197
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8198
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8199
"BZR_PLUGIN_PATH.\n"
8200
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8201
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8202
"and\n"
8203
" HOME.\n"
8204
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8205
"URLs).\n"
8206
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8207
"sshcorp,\n"
8208
" plink or lsh.\n"
8209
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8210
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8211
"BZR_COLUMNS Override implicit terminal width.\n"
8212
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8213
"(selftest)\n"
8214
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8215
"'text'.\n"
8216
"BZR_PDB Control whether to launch a debugger on error.\n"
8217
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8218
" breakin debugger.\n"
8219
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8220
"(instead\n"
8221
" of char-based).\n"
8222
"=================== "
8223
"===========================================================\n"
8224
msgstr ""
8225
8226
#: dummy/help_topics/env-variables/summary.txt:1
8227
msgid "Environment variable names and values"
8228
msgstr ""
8229
8230
#: dummy/help_topics/eol/summary.txt:1
8231
msgid "Information on end-of-line handling"
8232
msgstr ""
8233
8234
#: dummy/help_topics/files/detail.txt:1
8235
msgid "Files"
8236
msgstr ""
8237
8238
#: dummy/help_topics/files/detail.txt:3
8239
msgid ""
8240
":On Unix: ~/.bazaar/bazaar.conf\n"
8241
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8242
"bazaar\\\\2.0\\\\bazaar.conf"
8243
msgstr ""
8244
8245
#: dummy/help_topics/files/detail.txt:6
8246
msgid ""
8247
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8248
"used to define general configuration that will be applied everywhere.\n"
8249
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8250
"commonly used options."
8251
msgstr ""
8252
8253
#: dummy/help_topics/files/detail.txt:11
8254
msgid "A typical config file might look something like::"
8255
msgstr ""
8256
8257
#: dummy/help_topics/files/detail.txt:13
8258
msgid ""
8259
" [DEFAULT]\n"
8260
" email=John Doe <jdoe@isp.com>"
8261
msgstr ""
8262
8263
#: dummy/help_topics/files/detail.txt:16
8264
msgid ""
8265
" [ALIASES]\n"
8266
" commit = commit --strict\n"
8267
" log10 = log --short -r -10..-1\n"
8268
msgstr ""
8269
8270
#: dummy/help_topics/files/summary.txt:1
8271
msgid "Information on configuration and log files"
8272
msgstr ""
8273
8274
#: dummy/help_topics/formats/detail.txt:1
8275
msgid "Storage Formats"
8276
msgstr ""
8277
8278
#: dummy/help_topics/formats/detail.txt:3
8279
msgid ""
8280
"To ensure that older clients do not access data incorrectly,\n"
8281
"Bazaar's policy is to introduce a new storage format whenever\n"
8282
"new features requiring new metadata are added. New storage\n"
8283
"formats may also be introduced to improve performance and\n"
8284
"scalability."
8285
msgstr ""
8286
8287
#: dummy/help_topics/formats/detail.txt:9
8288
msgid ""
8289
"The newest format, 2a, is highly recommended. If your\n"
8290
"project is not using 2a, then you should suggest to the\n"
8291
"project owner to upgrade."
8292
msgstr ""
8293
8294
#: dummy/help_topics/formats/detail.txt:13
8295
msgid ""
8296
"\n"
8297
".. note::"
8298
msgstr ""
8299
8300
#: dummy/help_topics/formats/detail.txt:16
8301
msgid ""
8302
" Some of the older formats have two variants:\n"
8303
" a plain one and a rich-root one. The latter include an additional\n"
8304
" field about the root of the tree. There is no performance cost\n"
8305
" for using a rich-root format but you cannot easily merge changes\n"
8306
" from a rich-root format into a plain format. As a consequence,\n"
8307
" moving a project to a rich-root format takes some co-ordination\n"
8308
" in that all contributors need to upgrade their repositories\n"
8309
" around the same time. 2a and all future formats will be\n"
8310
" implicitly rich-root."
8311
msgstr ""
8312
8313
#: dummy/help_topics/formats/detail.txt:26
8314
msgid ""
8315
"See :doc:`current-formats-help` for the complete list of\n"
8316
"currently supported formats. See :doc:`other-formats-help` for\n"
8317
"descriptions of any available experimental and deprecated formats.\n"
8318
msgstr ""
8319
8320
#: dummy/help_topics/formats/summary.txt:1
8321
msgid "Information on choosing a storage format"
8322
msgstr ""
8323
8324
#: dummy/help_topics/global-options/detail.txt:1
8325
msgid "Global Options"
8326
msgstr ""
8327
8328
#: dummy/help_topics/global-options/detail.txt:3
8329
msgid ""
8330
"These options may be used with any command, and may appear in front of any\n"
8331
"command. (e.g. ``bzr --profile help``)."
8332
msgstr ""
8333
8334
#: dummy/help_topics/global-options/detail.txt:6
8335
msgid ""
8336
"--version Print the version number. Must be supplied before the "
8337
"command.\n"
8338
"--no-aliases Do not process command aliases when running this command.\n"
8339
"--builtin Use the built-in version of a command, not the plugin "
8340
"version.\n"
8341
" This does not suppress other plugin effects.\n"
8342
"--no-plugins Do not process any plugins.\n"
8343
"--no-l10n Do not translate messages.\n"
8344
"--concurrency Number of processes that can be run concurrently (selftest)."
8345
msgstr ""
8346
8347
#: dummy/help_topics/global-options/detail.txt:14
8348
msgid ""
8349
"--profile Profile execution using the hotshot profiler.\n"
8350
"--lsprof Profile execution using the lsprof profiler.\n"
8351
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8352
" results to a specified file. If the filename ends with "
8353
"\".txt\",\n"
8354
" text format will be used. If the filename either starts "
8355
"with\n"
8356
" \"callgrind.out\" or end with \".callgrind\", the output will "
8357
"be\n"
8358
" formatted for use with KCacheGrind. Otherwise, the output\n"
8359
" will be a pickle.\n"
8360
"--coverage Generate line coverage report in the specified directory."
8361
msgstr ""
8362
8363
#: dummy/help_topics/global-options/detail.txt:24
8364
msgid ""
8365
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8366
"for\n"
8367
" the duration of the command. This can be used multiple times "
8368
"if\n"
8369
" several options need to be overridden."
8370
msgstr ""
8371
8372
#: dummy/help_topics/global-options/detail.txt:28
8373
msgid ""
8374
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8375
"information on profiling."
8376
msgstr ""
8377
8378
#: dummy/help_topics/global-options/detail.txt:31
8379
msgid ""
8380
"A number of debug flags are also available to assist troubleshooting and\n"
8381
"development. See :doc:`debug-flags-help`.\n"
8382
msgstr ""
8383
8384
#: dummy/help_topics/global-options/summary.txt:1
8385
msgid "Options that control how Bazaar runs"
8386
msgstr ""
8387
8388
#: dummy/help_topics/hidden-commands/summary.txt:1
8389
msgid "All hidden commands"
8390
msgstr ""
8391
8392
#: dummy/help_topics/hooks/summary.txt:1
8393
msgid "Points at which custom processing can be added"
8394
msgstr ""
8395
8396
#: dummy/help_topics/launchpad/detail.txt:1
8397
msgid "Integration with Launchpad.net"
8398
msgstr ""
8399
8400
#: dummy/help_topics/launchpad/detail.txt:3
8401
msgid ""
8402
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8403
"specification tracking."
8404
msgstr ""
8405
8406
#: dummy/help_topics/launchpad/detail.txt:6
8407
msgid ""
8408
"The bzr client (through the plugin called 'launchpad') has special\n"
8409
"features to communicate with Launchpad:"
8410
msgstr ""
8411
8412
#: dummy/help_topics/launchpad/detail.txt:9
8413
msgid ""
8414
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8415
"This\n"
8416
" is then used by the 'lp:' transport to download your branches using\n"
8417
" bzr+ssh://."
8418
msgstr ""
8419
8420
#: dummy/help_topics/launchpad/detail.txt:13
8421
msgid ""
8422
" * The 'lp:' transport uses Launchpad as a directory service: for "
8423
"example\n"
8424
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8425
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8426
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8427
msgstr ""
8428
8429
#: dummy/help_topics/launchpad/detail.txt:18
8430
msgid ""
8431
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8432
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8433
"lp:12345'\n"
8434
" will record a revision property that marks that revision as fixing\n"
8435
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8436
" automatically be linked to the bug report."
8437
msgstr ""
8438
8439
#: dummy/help_topics/launchpad/detail.txt:24
8440
msgid ""
8441
" * The register-branch command tells Launchpad about the url of a\n"
8442
" public branch. Launchpad will then mirror the branch, display\n"
8443
" its contents and allow it to be attached to bugs and other\n"
8444
" objects."
8445
msgstr ""
8446
8447
#: dummy/help_topics/launchpad/detail.txt:29
8448
msgid "For more information see http://help.launchpad.net/\n"
8449
msgstr ""
8450
8451
#: dummy/help_topics/launchpad/summary.txt:1
8452
msgid "Using Bazaar with Launchpad.net"
8453
msgstr ""
8454
8455
#: dummy/help_topics/location-alias/summary.txt:1
8456
msgid "Aliases for remembered locations"
8457
msgstr ""
8458
8459
#: dummy/help_topics/log-formats/summary.txt:1
8460
msgid "Details on the logging formats available"
8461
msgstr ""
8462
8463
#: dummy/help_topics/other-formats/summary.txt:1
8464
msgid "Experimental and deprecated storage formats"
8465
msgstr ""
8466
8467
#: dummy/help_topics/patterns/summary.txt:1
8468
msgid "Information on the pattern syntax"
8469
msgstr ""
8470
8471
#: dummy/help_topics/repositories/detail.txt:1
8472
msgid "Repositories"
8473
msgstr ""
8474
8475
#: dummy/help_topics/repositories/detail.txt:3
8476
msgid ""
8477
"Repositories in Bazaar are where committed information is stored. There is\n"
8478
"a repository associated with every branch."
8479
msgstr ""
8480
8481
#: dummy/help_topics/repositories/detail.txt:6
8482
msgid ""
8483
"Repositories are a form of database. Bzr will usually maintain this for\n"
8484
"good performance automatically, but in some situations (e.g. when doing\n"
8485
"very many commits in a short time period) you may want to ask bzr to\n"
8486
"optimise the database indices. This can be done by the 'bzr pack' command."
8487
msgstr ""
8488
8489
#: dummy/help_topics/repositories/detail.txt:11
8490
msgid ""
8491
"By default just running 'bzr init' will create a repository within the new\n"
8492
"branch but it is possible to create a shared repository which allows "
8493
"multiple\n"
8494
"branches to share their information in the same location. When a new branch "
8495
"is\n"
8496
"created it will first look to see if there is a containing shared repository "
8497
"it\n"
8498
"can use."
8499
msgstr ""
8500
8501
#: dummy/help_topics/repositories/detail.txt:17
8502
msgid ""
8503
"When two branches of the same project share a repository, there is\n"
8504
"generally a large space saving. For some operations (e.g. branching\n"
8505
"within the repository) this translates in to a large time saving."
8506
msgstr ""
8507
8508
#: dummy/help_topics/repositories/detail.txt:21
8509
msgid ""
8510
"To create a shared repository use the init-repository command (or the alias\n"
8511
"init-repo). This command takes the location of the repository to create. "
8512
"This\n"
8513
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8514
"which contains a shared repository. Any new branches that are created in "
8515
"this\n"
8516
"directory will then use it for storage."
8517
msgstr ""
8518
8519
#: dummy/help_topics/repositories/detail.txt:27
8520
msgid ""
8521
"It is a good idea to create a repository whenever you might create more\n"
8522
"than one branch of a project. This is true for both working areas where you\n"
8523
"are doing the development, and any server areas that you use for hosting\n"
8524
"projects. In the latter case, it is common to want branches without working\n"
8525
"trees. Since the files in the branch will not be edited directly there is "
8526
"no\n"
8527
"need to use up disk space for a working tree. To create a repository in "
8528
"which\n"
8529
"the branches will not have working trees pass the '--no-trees' option to\n"
8530
"'init-repository'."
8531
msgstr ""
8532
8533
#: dummy/help_topics/repositories/detail.txt:38
8534
msgid ""
8535
" init-repository Create a shared repository. Use --no-trees to create "
8536
"one\n"
8537
" in which new branches won't get a working tree.\n"
8538
msgstr ""
8539
8540
#: dummy/help_topics/repositories/summary.txt:1
8541
msgid "Basic information on shared repositories."
8542
msgstr ""
8543
8544
#: dummy/help_topics/revisionspec/summary.txt:1
8545
msgid "Explain how to use --revision"
8546
msgstr ""
8547
8548
#: dummy/help_topics/rules/summary.txt:1
8549
msgid "Information on defining rule-based preferences"
8550
msgstr ""
8551
8552
#: dummy/help_topics/standalone-trees/detail.txt:1
8553
msgid "Standalone Trees"
8554
msgstr ""
8555
8556
#: dummy/help_topics/standalone-trees/detail.txt:3
8557
msgid ""
8558
"A standalone tree is a working tree with an associated repository. It\n"
8559
"is an independently usable branch, with no dependencies on any other.\n"
8560
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8561
"an existing project under version control."
8562
msgstr ""
8563
8564
#: dummy/help_topics/standalone-trees/detail.txt:8
8565
msgid "Related Commands::"
8566
msgstr ""
8567
8568
#: dummy/help_topics/standalone-trees/detail.txt:10
8569
msgid " init Make a directory into a versioned branch.\n"
8570
msgstr ""
8571
8572
#: dummy/help_topics/standalone-trees/summary.txt:1
8573
msgid "Information on what a standalone tree is"
8574
msgstr ""
8575
8576
#: dummy/help_topics/standard-options/detail.txt:1
8577
msgid "Standard Options"
8578
msgstr ""
8579
8580
#: dummy/help_topics/standard-options/detail.txt:3
8581
msgid "Standard options are legal for all commands."
8582
msgstr ""
8583
8584
#: dummy/help_topics/standard-options/detail.txt:5
8585
msgid ""
8586
"--help, -h Show help message.\n"
8587
"--verbose, -v Display more information.\n"
8588
"--quiet, -q Only display errors and warnings."
8589
msgstr ""
8590
"--help, -h ヘルプを表示します。\n"
8591
"--verbose, -v より詳細な情報を表示します。\n"
8592
"--quiet, -q エラーや警告だけを表示します。"
8593
8594
#: dummy/help_topics/standard-options/detail.txt:9
8595
msgid "Unlike global options, standard options can be used in aliases.\n"
8596
msgstr ""
8597
8598
#: dummy/help_topics/standard-options/summary.txt:1
8599
msgid "Options that can be used with any command"
8600
msgstr ""
8601
8602
#: dummy/help_topics/status-flags/detail.txt:1
8603
msgid "Status Flags"
8604
msgstr ""
8605
8606
#: dummy/help_topics/status-flags/detail.txt:3
8607
msgid ""
8608
"Status flags are used to summarise changes to the working tree in a concise\n"
8609
"manner. They are in the form::"
8610
msgstr ""
8611
8612
#: dummy/help_topics/status-flags/detail.txt:6
8613
msgid " xxx <filename>"
8614
msgstr ""
8615
8616
#: dummy/help_topics/status-flags/detail.txt:8
8617
msgid "where the columns' meanings are as follows."
8618
msgstr ""
8619
8620
#: dummy/help_topics/status-flags/detail.txt:10
8621
msgid "Column 1 - versioning/renames::"
8622
msgstr ""
8623
8624
#: dummy/help_topics/status-flags/detail.txt:12
8625
msgid ""
8626
" + File versioned\n"
8627
" - File unversioned\n"
8628
" R File renamed\n"
8629
" ? File unknown\n"
8630
" X File nonexistent (and unknown to bzr)\n"
8631
" C File has conflicts\n"
8632
" P Entry for a pending merge (not a file)"
8633
msgstr ""
8634
8635
#: dummy/help_topics/status-flags/detail.txt:20
8636
msgid "Column 2 - contents::"
8637
msgstr ""
8638
8639
#: dummy/help_topics/status-flags/detail.txt:22
8640
msgid ""
8641
" N File created\n"
8642
" D File deleted\n"
8643
" K File kind changed\n"
8644
" M File modified"
8645
msgstr ""
8646
8647
#: dummy/help_topics/status-flags/detail.txt:27
8648
msgid "Column 3 - execute::"
8649
msgstr ""
8650
8651
#: dummy/help_topics/status-flags/detail.txt:29
8652
msgid " * The execute bit was changed\n"
8653
msgstr ""
8654
8655
#: dummy/help_topics/status-flags/summary.txt:1
8656
msgid "Help on status flags"
8657
msgstr ""
8658
8659
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8660
msgid "Branches Out of Sync"
8661
msgstr ""
8662
8663
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8664
msgid ""
8665
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8666
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8667
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8668
"have the same last revision as the new reference branch for the lightweight\n"
8669
"checkout, data could be lost, so Bazaar refuses."
8670
msgstr ""
8671
8672
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8673
msgid "How you deal with this depends on *why* the branches are out of sync."
8674
msgstr ""
8675
8676
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8677
msgid ""
8678
"If you have a checkout and have done local commits, you can get back in "
8679
"sync\n"
8680
"by running \"bzr update\" (and possibly \"bzr commit\")."
8681
msgstr ""
8682
8683
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8684
msgid ""
8685
"If you have a branch and the remote branch is out-of-date, you can push\n"
8686
"the local changes using \"bzr push\". If the local branch is out of date, "
8687
"you\n"
8688
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8689
"commit\n"
8690
"and then push your changes. If you decide that some of the changes aren't\n"
8691
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8692
msgstr ""
8693
8694
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8695
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8696
msgstr ""
8697
8698
#: dummy/help_topics/topics/summary.txt:1
8699
msgid "Topics list"
8700
msgstr ""
8701
8702
#: dummy/help_topics/url-special-chars/summary.txt:1
8703
msgid "Special character handling in URLs"
8704
msgstr ""
8705
8706
#: dummy/help_topics/urlspec/summary.txt:1
8707
msgid "Supported transport protocols"
8708
msgstr ""
8709
8710
#: dummy/help_topics/working-trees/detail.txt:1
8711
msgid "Working Trees"
8712
msgstr ""
8713
8714
#: dummy/help_topics/working-trees/detail.txt:3
8715
msgid ""
8716
"A working tree is the contents of a branch placed on disk so that you can\n"
8717
"see the files and edit them. The working tree is where you make changes to "
8718
"a\n"
8719
"branch, and when you commit the current state of the working tree is the\n"
8720
"snapshot that is recorded in the commit."
8721
msgstr ""
8722
8723
#: dummy/help_topics/working-trees/detail.txt:8
8724
msgid ""
8725
"When you push a branch to a remote system, a working tree will not be\n"
8726
"created. If one is already present the files will not be updated. The\n"
8727
"branch information will be updated and the working tree will be marked\n"
8728
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8729
"may be uncommitted changes or the update may cause content conflicts that "
8730
"are\n"
8731
"difficult to deal with remotely."
8732
msgstr ""
8733
8734
#: dummy/help_topics/working-trees/detail.txt:15
8735
msgid ""
8736
"If you have a branch with no working tree you can use the 'checkout' "
8737
"command\n"
8738
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8739
"will\n"
8740
"create the working tree. If the branch is updated remotely, you can update "
8741
"the\n"
8742
"working tree by running 'bzr update' in that directory."
8743
msgstr ""
8744
8745
#: dummy/help_topics/working-trees/detail.txt:20
8746
msgid ""
8747
"If you have a branch with a working tree that you do not want the 'remove-"
8748
"tree'\n"
8749
"command will remove the tree if it is safe. This can be done to avoid the\n"
8750
"warning about the remote working tree not being updated when pushing to the\n"
8751
"branch. It can also be useful when working with a '--no-trees' repository\n"
8752
"(see 'bzr help repositories')."
8753
msgstr ""
8754
8755
#: dummy/help_topics/working-trees/detail.txt:26
8756
msgid ""
8757
"If you want to have a working tree on a remote machine that you push to you\n"
8758
"can either run 'bzr update' in the remote branch after each push, or use "
8759
"some\n"
8760
"other method to update the tree during the push. There is an 'rspush' "
8761
"plugin\n"
8762
"that will update the working tree using rsync as well as doing a push. "
8763
"There\n"
8764
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8765
"SSH\n"
8766
"after each push."
8767
msgstr ""
8768
8769
#: dummy/help_topics/working-trees/detail.txt:33
8770
msgid "Useful commands::"
8771
msgstr ""
8772
8773
#: dummy/help_topics/working-trees/detail.txt:35
8774
msgid ""
8775
" checkout Create a working tree when a branch does not have one.\n"
8776
" remove-tree Removes the working tree from a branch when it is safe to do "
8777
"so.\n"
8778
" update When a working tree is out of sync with its associated "
8779
"branch\n"
8780
" this will update the tree to match the branch.\n"
8781
msgstr ""
8782
8783
#: dummy/help_topics/working-trees/summary.txt:1
8784
msgid "Information on working trees"
8785
msgstr ""
8786
8787
#: en/help_topics/authentication.txt:1
8788
msgid ""
8789
"Authentication Settings\n"
8790
"======================="
8791
msgstr ""
8792
8793
#: en/help_topics/authentication.txt:4
8794
msgid ""
8795
"\n"
8796
"Intent\n"
8797
"------"
8798
msgstr ""
8799
8800
#: en/help_topics/authentication.txt:8
8801
msgid ""
8802
"Many different authentication policies can be described in the\n"
8803
"``authentication.conf`` file but a particular user should need only a few\n"
8804
"definitions to cover his needs without having to specify a user and a "
8805
"password\n"
8806
"for every branch he uses."
8807
msgstr ""
8808
8809
#: en/help_topics/authentication.txt:13
8810
msgid ""
8811
"The definitions found in this file are used to find the credentials to use "
8812
"for\n"
8813
"a given url. The same credentials can generally be used for as many branches "
8814
"as\n"
8815
"possible by grouping their declaration around the remote servers that need\n"
8816
"them. It's even possible to declare credentials that will be used by "
8817
"different\n"
8818
"servers."
8819
msgstr ""
8820
8821
#: en/help_topics/authentication.txt:19
8822
msgid ""
8823
"The intent is to make this file as small as possible to minimize maintenance."
8824
msgstr ""
8825
8826
#: en/help_topics/authentication.txt:21
8827
msgid ""
8828
"Once the relevant credentials are declared in this file you may use branch "
8829
"urls\n"
8830
"without embedding passwords (security hazard) or even users (enabling "
8831
"sharing\n"
8832
"of your urls with others)."
8833
msgstr ""
8834
8835
#: en/help_topics/authentication.txt:25
8836
msgid "Instead of using::"
8837
msgstr ""
8838
8839
#: en/help_topics/authentication.txt:27
8840
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8841
msgstr ""
8842
8843
#: en/help_topics/authentication.txt:29
8844
msgid "you simply use::"
8845
msgstr ""
8846
8847
#: en/help_topics/authentication.txt:31
8848
msgid " bzr branch ftp://host.com/path/to/my/branch"
8849
msgstr ""
8850
8851
#: en/help_topics/authentication.txt:33
8852
msgid ""
8853
"provided you have created the following ``authentication.conf`` file::"
8854
msgstr ""
8855
8856
#: en/help_topics/authentication.txt:35
8857
msgid ""
8858
" [myprojects]\n"
8859
" scheme=ftp\n"
8860
" host=host.com\n"
8861
" user=joe\n"
8862
" password=secret\n"
8863
" "
8864
msgstr ""
8865
8866
#: en/help_topics/authentication.txt:42
8867
msgid ""
8868
"Authentication definitions\n"
8869
"--------------------------"
8870
msgstr ""
8871
8872
#: en/help_topics/authentication.txt:45
8873
msgid ""
8874
"There are two kinds of authentication used by the various schemes supported "
8875
"by\n"
8876
"bzr:"
8877
msgstr ""
8878
8879
#: en/help_topics/authentication.txt:48
8880
msgid "1. user and password"
8881
msgstr ""
8882
8883
#: en/help_topics/authentication.txt:50
8884
msgid ""
8885
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8886
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8887
"ssh agents are a better, more secure solution. So we have chosen to not "
8888
"provide\n"
8889
"our own less secure method."
8890
msgstr ""
8891
8892
#: en/help_topics/authentication.txt:55
8893
msgid "2. user, realm and password"
8894
msgstr ""
8895
8896
#: en/help_topics/authentication.txt:57
8897
msgid ""
8898
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8899
"against a host. But, by using ``.htaccess`` files, for example, it is "
8900
"possible\n"
8901
"to define several (``user, realm, password``) for a given ``host``. So what "
8902
"is\n"
8903
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8904
"is\n"
8905
"not taken into account in the definitions, but will displayed if bzr "
8906
"prompts\n"
8907
"you for a password."
8908
msgstr ""
8909
8910
#: en/help_topics/authentication.txt:64
8911
msgid ""
8912
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8913
"specifying the appropriate port."
8914
msgstr ""
8915
8916
#: en/help_topics/authentication.txt:67
8917
msgid ""
8918
"To take all schemes into account, the password will be deduced from a set "
8919
"of\n"
8920
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8921
"``user``,\n"
8922
"``password``)."
8923
msgstr ""
8924
8925
#: en/help_topics/authentication.txt:71
8926
msgid ""
8927
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8928
"used\n"
8929
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8930
"``ssh``\n"
8931
" should be used instead since this is the real scheme regarding\n"
8932
" authentication,"
8933
msgstr ""
8934
8935
#: en/help_topics/authentication.txt:76
8936
msgid " * ``host``: can be empty (to act as a default for any host),"
8937
msgstr ""
8938
8939
#: en/help_topics/authentication.txt:78
8940
msgid ""
8941
" * ``port`` can be empty (useful when an host provides several servers for "
8942
"the\n"
8943
" same scheme), only numerical values are allowed, this should be used "
8944
"only\n"
8945
" when the server uses a port different than the scheme standard port,"
8946
msgstr ""
8947
8948
#: en/help_topics/authentication.txt:82
8949
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8950
msgstr ""
8951
8952
#: en/help_topics/authentication.txt:84
8953
msgid ""
8954
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8955
" ``getpass.get_user()``),"
8956
msgstr ""
8957
8958
#: en/help_topics/authentication.txt:87
8959
msgid ""
8960
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8961
" password."
8962
msgstr ""
8963
8964
#: en/help_topics/authentication.txt:90
8965
msgid ""
8966
"Multiple definitions can be provided and, for a given URL, bzr will select "
8967
"a\n"
8968
"(``user`` [, ``password``]) based on the following rules :"
8969
msgstr ""
8970
8971
#: en/help_topics/authentication.txt:93
8972
msgid " 1. the first match wins,"
8973
msgstr ""
8974
8975
#: en/help_topics/authentication.txt:95
8976
msgid " 2. empty fields match everything,"
8977
msgstr ""
8978
8979
#: en/help_topics/authentication.txt:97
8980
msgid ""
8981
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8982
msgstr ""
8983
8984
#: en/help_topics/authentication.txt:99
8985
msgid ""
8986
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8987
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8988
"``projectbzr.sf.net``\n"
8989
" will not match ``bzr.sf.net``)."
8990
msgstr ""
8991
8992
#: en/help_topics/authentication.txt:103
8993
msgid ""
8994
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8995
msgstr ""
8996
8997
#: en/help_topics/authentication.txt:105
8998
msgid ""
8999
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
9000
"above,\n"
9001
" empty paths will match any provided path)."
9002
msgstr ""
9003
9004
#: en/help_topics/authentication.txt:110
9005
msgid ""
9006
"File format\n"
9007
"-----------"
9008
msgstr ""
9009
9010
#: en/help_topics/authentication.txt:113
9011
msgid ""
9012
"The general rules for :doc:`configuration files <configuration-help>`\n"
9013
"apply except for the variable policies."
9014
msgstr ""
9015
9016
#: en/help_topics/authentication.txt:116
9017
msgid "Each section describes an authentication definition."
9018
msgstr ""
9019
9020
#: en/help_topics/authentication.txt:118
9021
msgid ""
9022
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9023
"reserved\n"
9024
"and should appear as the *last* section."
9025
msgstr ""
9026
9027
#: en/help_topics/authentication.txt:121
9028
msgid "Each section should define:"
9029
msgstr ""
9030
9031
#: en/help_topics/authentication.txt:123
9032
msgid "* ``user``: the login to be used,"
9033
msgstr ""
9034
9035
#: en/help_topics/authentication.txt:125
9036
msgid "Each section could define:"
9037
msgstr ""
9038
9039
#: en/help_topics/authentication.txt:127
9040
msgid "* ``host``: the remote server,"
9041
msgstr ""
9042
9043
#: en/help_topics/authentication.txt:129
9044
msgid "* ``port``: the port the server is listening,"
9045
msgstr ""
9046
9047
#: en/help_topics/authentication.txt:131
9048
msgid "* ``path``: the branch location,"
9049
msgstr ""
9050
9051
#: en/help_topics/authentication.txt:133
9052
msgid "* ``password``: the password."
9053
msgstr ""
9054
9055
#: en/help_topics/authentication.txt:135
9056
msgid ""
9057
"\n"
9058
"Examples\n"
9059
"--------"
9060
msgstr ""
9061
9062
#: en/help_topics/authentication.txt:139
9063
msgid ""
9064
"\n"
9065
"Personal projects hosted outside\n"
9066
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9067
msgstr ""
9068
9069
#: en/help_topics/authentication.txt:143
9070
msgid ""
9071
"All connections are done with the same ``user`` (the remote one for which "
9072
"the\n"
9073
"default bzr one is not appropriate) and the password is always prompted "
9074
"with\n"
9075
"some exceptions::"
9076
msgstr ""
9077
9078
#: en/help_topics/authentication.txt:147
9079
msgid ""
9080
" # Pet projects on hobby.net\n"
9081
" [hobby]\n"
9082
" host=r.hobby.net\n"
9083
" user=jim\n"
9084
" password=obvious1234\n"
9085
" \n"
9086
" # Home server\n"
9087
" [home]\n"
9088
" scheme=https\n"
9089
" host=home.net\n"
9090
" user=joe\n"
9091
" password=1essobV10us\n"
9092
" \n"
9093
" [DEFAULT]\n"
9094
" # Our local user is barbaz, on all remote sites we're known as "
9095
"foobar\n"
9096
" user=foobar"
9097
msgstr ""
9098
9099
#: en/help_topics/authentication.txt:164
9100
msgid ""
9101
"\n"
9102
"Source hosting provider\n"
9103
"~~~~~~~~~~~~~~~~~~~~~~~"
9104
msgstr ""
9105
9106
#: en/help_topics/authentication.txt:168
9107
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9108
msgstr ""
9109
9110
#: en/help_topics/authentication.txt:170
9111
msgid ""
9112
" [shpnet domain]\n"
9113
" # we use sftp, but ssh is the scheme used for authentication\n"
9114
" scheme=ssh\n"
9115
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9116
" host=.shp.net\n"
9117
" user=joe\n"
9118
" # bzr don't support supplying a password for sftp,\n"
9119
" # consider using an ssh agent if you don't want to supply\n"
9120
" # a password interactively. (pageant, ssh-agent, etc)"
9121
msgstr ""
9122
9123
#: en/help_topics/authentication.txt:180
9124
msgid ""
9125
"HTTPS, SFTP servers and their proxy\n"
9126
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9127
msgstr ""
9128
9129
#: en/help_topics/authentication.txt:183
9130
msgid ""
9131
"At company.com, the server hosting release and integration branches is "
9132
"behind a\n"
9133
"proxy, and the two branches use different authentication policies::"
9134
msgstr ""
9135
9136
#: en/help_topics/authentication.txt:186
9137
msgid ""
9138
" [reference code]\n"
9139
" scheme=https\n"
9140
" host=dev.company.com\n"
9141
" path=/dev\n"
9142
" user=user1\n"
9143
" password=pass1"
9144
msgstr ""
9145
9146
#: en/help_topics/authentication.txt:193
9147
msgid ""
9148
" # development branches on dev server\n"
9149
" [dev]\n"
9150
" scheme=ssh # bzr+ssh and sftp are available here\n"
9151
" host=dev.company.com\n"
9152
" path=/dev/integration\n"
9153
" user=user2\n"
9154
" \n"
9155
" # proxy\n"
9156
" [proxy]\n"
9157
" scheme=http\n"
9158
" host=proxy.company.com\n"
9159
" port=3128\n"
9160
" user=proxyuser1\n"
9161
" password=proxypass1"
9162
msgstr ""
9163
9164
#: en/help_topics/authentication.txt:208
9165
msgid ""
9166
"\n"
9167
"Planned enhancements\n"
9168
"--------------------"
9169
msgstr ""
9170
9171
#: en/help_topics/authentication.txt:212
9172
msgid ""
9173
"The following are not yet implemented but planned as parts of a work in\n"
9174
"progress:"
9175
msgstr ""
9176
9177
#: en/help_topics/authentication.txt:215
9178
msgid "* add a ``password_encoding`` field allowing:"
9179
msgstr ""
9180
9181
#: en/help_topics/authentication.txt:217
9182
msgid ""
9183
" - storing the passwords in various obfuscating encodings (base64 for one),"
9184
msgstr ""
9185
9186
#: en/help_topics/authentication.txt:219
9187
msgid " - delegate password storage to plugins (.netrc for example)."
9188
msgstr ""
9189
9190
#: en/help_topics/authentication.txt:221
9191
msgid ""
9192
"* update the credentials when the user is prompted for user or password,"
9193
msgstr ""
9194
9195
#: en/help_topics/authentication.txt:223
9196
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9197
msgstr ""
9198
9199
#: en/help_topics/authentication.txt:225
9200
msgid ""
9201
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9202
"but\n"
9203
"ignored in the actual implementation.\n"
9204
msgstr ""
9205
9206
#: en/help_topics/bugs.txt:1
9207
msgid "Bug Tracker Settings"
9208
msgstr ""
9209
9210
#: en/help_topics/bugs.txt:3
9211
msgid ""
9212
"When making a commit, metadata about bugs fixed by that change can be\n"
9213
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9214
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9215
"(The only ``status`` value currently supported is ``fixed.``)"
9216
msgstr ""
9217
9218
#: en/help_topics/bugs.txt:8
9219
msgid ""
9220
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9221
"identifier\n"
9222
"rather than a full URL. This looks like::"
9223
msgstr ""
9224
9225
#: en/help_topics/bugs.txt:11
9226
msgid " bzr commit --fixes <tracker>:<id>"
9227
msgstr ""
9228
9229
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9230
msgid "or::"
9231
msgstr ""
9232
9233
#: en/help_topics/bugs.txt:15
9234
msgid " bzr commit --fixes <id>"
9235
msgstr ""
9236
9237
#: en/help_topics/bugs.txt:17
9238
msgid ""
9239
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9240
"the\n"
9241
"identifier for that bug within the bugtracker, usually the bug number.\n"
9242
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9243
"or global configuration is used."
9244
msgstr ""
9245
9246
#: en/help_topics/bugs.txt:22
9247
msgid ""
9248
"Bazaar knows about a few bug trackers that have many users. If\n"
9249
"you use one of these bug trackers then there is no setup required to\n"
9250
"use this feature, you just need to know the tracker identifier to use.\n"
9251
"These are the bugtrackers that are built in:"
9252
msgstr ""
9253
9254
#: en/help_topics/bugs.txt:27
9255
msgid ""
9256
" ============================ ============ ============\n"
9257
" URL Abbreviation Example\n"
9258
" ============================ ============ ============\n"
9259
" https://bugs.launchpad.net/ lp lp:12345\n"
9260
" http://bugs.debian.org/ deb deb:12345\n"
9261
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9262
" ============================ ============ ============"
9263
msgstr ""
9264
9265
#: en/help_topics/bugs.txt:35
9266
msgid ""
9267
"For the bug trackers not listed above configuration is required.\n"
9268
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9269
"is built in, along with a template mechanism for other bugtrackers with\n"
9270
"simple URL schemes. If your bug tracker can't be described by one\n"
9271
"of the schemes described below then you can write a plugin to support\n"
9272
"it."
9273
msgstr ""
9274
9275
#: en/help_topics/bugs.txt:42
9276
msgid ""
9277
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9278
"variable which contains the base URL of the bug tracker. These options\n"
9279
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9280
"configuration section in ``locations.conf``. You can set up these values\n"
9281
"for each of the projects you work on."
9282
msgstr ""
9283
9284
#: en/help_topics/bugs.txt:48
9285
msgid ""
9286
"Note: As you provide a short name for each tracker, you can specify one or\n"
9287
"more bugs in one or more trackers at commit time if you wish."
9288
msgstr ""
9289
9290
#: en/help_topics/bugs.txt:51
9291
msgid ""
9292
"Launchpad\n"
9293
"---------"
9294
msgstr ""
9295
9296
#: en/help_topics/bugs.txt:54
9297
msgid ""
9298
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9299
msgstr ""
9300
9301
#: en/help_topics/bugs.txt:56
9302
msgid ""
9303
"bugzilla_<tracker>_url\n"
9304
"----------------------"
9305
msgstr ""
9306
9307
#: en/help_topics/bugs.txt:59
9308
msgid ""
9309
"If present, the location of the Bugzilla bug tracker referred to by\n"
9310
"<tracker>. This option can then be used together with ``bzr commit\n"
9311
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9312
"example::"
9313
msgstr ""
9314
9315
#: en/help_topics/bugs.txt:64
9316
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9317
msgstr ""
9318
9319
#: en/help_topics/bugs.txt:66
9320
msgid ""
9321
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9322
"fixed."
9323
msgstr ""
9324
9325
#: en/help_topics/bugs.txt:69
9326
msgid ""
9327
"trac_<tracker>_url\n"
9328
"------------------"
9329
msgstr ""
9330
9331
#: en/help_topics/bugs.txt:72
9332
msgid ""
9333
"If present, the location of the Trac instance referred to by\n"
9334
"<tracker>. This option can then be used together with ``bzr commit\n"
9335
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9336
"example::"
9337
msgstr ""
9338
9339
#: en/help_topics/bugs.txt:77
9340
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9341
msgstr ""
9342
9343
#: en/help_topics/bugs.txt:79
9344
msgid ""
9345
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9346
"as\n"
9347
"fixed."
9348
msgstr ""
9349
9350
#: en/help_topics/bugs.txt:82
9351
msgid ""
9352
"bugtracker_<tracker>_url\n"
9353
"------------------------"
9354
msgstr ""
9355
9356
#: en/help_topics/bugs.txt:85
9357
msgid ""
9358
"If present, the location of a generic bug tracker instance referred to by\n"
9359
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9360
"which will be replaced by a specific bug ID. This option can then be used\n"
9361
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9362
"fixed by that commit. For example::"
9363
msgstr ""
9364
9365
#: en/help_topics/bugs.txt:91
9366
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9367
msgstr ""
9368
9369
#: en/help_topics/bugs.txt:93
9370
msgid ""
9371
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9372
"Roundup bug tracker as fixed, or::"
9373
msgstr ""
9374
9375
#: en/help_topics/bugs.txt:96
9376
msgid ""
9377
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9378
msgstr ""
9379
9380
#: en/help_topics/bugs.txt:98
9381
msgid ""
9382
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9383
"RT bug tracker as fixed, or::"
9384
msgstr ""
9385
9386
#: en/help_topics/bugs.txt:101
9387
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9388
msgstr ""
9389
9390
#: en/help_topics/bugs.txt:103
9391
msgid ""
9392
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9393
"1234\n"
9394
"in Hudson's JIRA bug tracker as fixed.\n"
9395
msgstr ""
9396
9397
#: en/help_topics/commands.txt:1
9398
msgid ""
9399
"add Add specified files or directories.\n"
9400
"alias Set/unset and display aliases.\n"
9401
"annotate Show the origin of each line in a file.\n"
9402
"bash-completion Generate a shell function for bash command line "
9403
"completion.\n"
9404
" [bash_completion]\n"
9405
"bind Convert the current branch into a checkout of the "
9406
"supplied\n"
9407
" branch.\n"
9408
"branch Create a new branch that is a copy of an existing branch.\n"
9409
"branches List the branches available at the current location.\n"
9410
"break-lock Break a dead lock.\n"
9411
"cat Write the contents of a file as of a given revision to\n"
9412
" standard output.\n"
9413
"check Validate working tree structure, branch consistency and\n"
9414
" repository history.\n"
9415
"checkout Create a new checkout of an existing branch.\n"
9416
"clean-tree Remove unwanted files from working tree.\n"
9417
"commit Commit changes into a new revision.\n"
9418
"config Display, set or remove a configuration option.\n"
9419
"conflicts List files with conflicts.\n"
9420
"deleted List files deleted in the working tree.\n"
9421
"diff Show differences in the working tree, between revisions "
9422
"or\n"
9423
" branches.\n"
9424
"dpush Push into a different VCS without any custom bzr "
9425
"metadata.\n"
9426
"export Export current or past revision to a destination directory "
9427
"or\n"
9428
" archive.\n"
9429
"help Show help on a command or other topic.\n"
9430
"ignore Ignore specified files or patterns.\n"
9431
"ignored List ignored files and the patterns that matched them.\n"
9432
"info Show information about a working tree, branch or "
9433
"repository.\n"
9434
"init Make a directory into a versioned branch.\n"
9435
"init-repository Create a shared repository for branches to share storage\n"
9436
" space.\n"
9437
"join Combine a tree into its containing tree.\n"
9438
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9439
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9440
"launchpad-open Open a Launchpad branch page in your web browser. "
9441
"[launchpad]\n"
9442
"log Show historical log for a branch or subset of a branch.\n"
9443
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9444
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9445
"ls List files in a tree.\n"
9446
"merge Perform a three-way merge.\n"
9447
"missing Show unmerged/unpulled revisions between two branches.\n"
9448
"mkdir Create a new versioned directory.\n"
9449
"mv Move or rename a file.\n"
9450
"nick Print or set the branch nickname.\n"
9451
"pack Compress the data within a repository.\n"
9452
"plugins List the installed plugins.\n"
9453
"pull Turn this branch into a mirror of another branch.\n"
9454
"push Update a mirror of this branch.\n"
9455
"reconcile Reconcile bzr metadata in a branch.\n"
9456
"reconfigure Reconfigure the type of a bzr directory.\n"
9457
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9458
"remerge Redo a merge.\n"
9459
"remove Remove files or directories.\n"
9460
"remove-branch Remove a branch.\n"
9461
"remove-tree Remove the working tree from a given branch/checkout.\n"
9462
"renames Show list of renamed files.\n"
9463
"resolve Mark a conflict as resolved.\n"
9464
"revert Revert files to a previous revision.\n"
9465
"revno Show current revision number.\n"
9466
"root Show the tree root directory.\n"
9467
"send Mail or create a merge-directive for submitting changes.\n"
9468
"serve Run the bzr server.\n"
9469
"shelve Temporarily set aside some changes from the current tree.\n"
9470
"sign-my-commits Sign all commits by a given committer.\n"
9471
"split Split a subdirectory of a tree into a separate tree.\n"
9472
"status Display status summary.\n"
9473
"switch Set the branch of a checkout and update.\n"
9474
"tag Create, remove or modify a tag naming a revision.\n"
9475
"tags List tags.\n"
9476
"testament Show testament (signing-form) of a revision.\n"
9477
"unbind Convert the current checkout into a regular branch.\n"
9478
"uncommit Remove the last committed revision.\n"
9479
"unshelve Restore shelved changes.\n"
9480
"update Update a working tree to a new revision.\n"
9481
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9482
" format.\n"
9483
"verify-signatures Verify all commit signatures.\n"
9484
"version Show version of bzr.\n"
9485
"version-info Show version information about this tree.\n"
9486
"view Manage filtered views.\n"
9487
"whoami Show or set bzr user id.\n"
9488
msgstr ""
9489
9490
#: en/help_topics/configuration.txt:1
9491
msgid ""
9492
"Configuration Settings\n"
9493
"======================="
9494
msgstr ""
9495
9496
#: en/help_topics/configuration.txt:4
9497
msgid ""
9498
"Environment settings\n"
9499
"---------------------"
9500
msgstr ""
9501
9502
#: en/help_topics/configuration.txt:7
9503
msgid ""
9504
"While most configuration is handled by configuration files, some options\n"
9505
"which may be semi-permanent can also be controlled through the environment."
9506
msgstr ""
9507
9508
#: en/help_topics/configuration.txt:10
9509
msgid ""
9510
"BZR_EMAIL\n"
9511
"~~~~~~~~~"
9512
msgstr ""
9513
9514
#: en/help_topics/configuration.txt:13
9515
msgid "Override the email id used by Bazaar. Typical format::"
9516
msgstr ""
9517
9518
#: en/help_topics/configuration.txt:15
9519
msgid " \"John Doe <jdoe@example.com>\""
9520
msgstr ""
9521
9522
#: en/help_topics/configuration.txt:17
9523
msgid "See also the ``email`` configuration option."
9524
msgstr ""
9525
9526
#: en/help_topics/configuration.txt:19
9527
msgid ""
9528
"BZR_PROGRESS_BAR\n"
9529
"~~~~~~~~~~~~~~~~"
9530
msgstr ""
9531
9532
#: en/help_topics/configuration.txt:22
9533
msgid ""
9534
"Override the progress display. Possible values are \"none\" or \"text\". "
9535
"If\n"
9536
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9537
"draws\n"
9538
"the ordinary command line progress bar."
9539
msgstr ""
9540
9541
#: en/help_topics/configuration.txt:26
9542
msgid ""
9543
"BZR_SIGQUIT_PDB\n"
9544
"~~~~~~~~~~~~~~~"
9545
msgstr ""
9546
9547
#: en/help_topics/configuration.txt:29
9548
msgid ""
9549
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9550
msgstr ""
9551
9552
#: en/help_topics/configuration.txt:31
9553
msgid ""
9554
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9555
"* 1 = Invoke breakin debugger (default)"
9556
msgstr ""
9557
9558
#: en/help_topics/configuration.txt:34
9559
msgid ""
9560
"BZR_HOME\n"
9561
"~~~~~~~~"
9562
msgstr ""
9563
9564
#: en/help_topics/configuration.txt:37
9565
msgid "Override the home directory used by Bazaar."
9566
msgstr ""
9567
9568
#: en/help_topics/configuration.txt:39
9569
msgid ""
9570
"BZR_SSH\n"
9571
"~~~~~~~"
9572
msgstr ""
9573
9574
#: en/help_topics/configuration.txt:42
9575
msgid "Select a different SSH implementation."
9576
msgstr ""
9577
9578
#: en/help_topics/configuration.txt:44
9579
msgid ""
9580
"BZR_PDB\n"
9581
"~~~~~~~"
9582
msgstr ""
9583
9584
#: en/help_topics/configuration.txt:47
9585
msgid "Control whether to launch a debugger on error."
9586
msgstr ""
9587
9588
#: en/help_topics/configuration.txt:49
9589
msgid ""
9590
"* 0 = Standard behavior\n"
9591
"* 1 = Launch debugger"
9592
msgstr ""
9593
9594
#: en/help_topics/configuration.txt:52
9595
msgid ""
9596
"BZR_REMOTE_PATH\n"
9597
"~~~~~~~~~~~~~~~"
9598
msgstr ""
9599
9600
#: en/help_topics/configuration.txt:55
9601
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9602
msgstr ""
9603
9604
#: en/help_topics/configuration.txt:57
9605
msgid "See also the ``bzr_remote_path`` configuration option."
9606
msgstr ""
9607
9608
#: en/help_topics/configuration.txt:59
9609
msgid ""
9610
"BZR_EDITOR\n"
9611
"~~~~~~~~~~"
9612
msgstr ""
9613
9614
#: en/help_topics/configuration.txt:62
9615
msgid "Path to the editor Bazaar should use for commit messages, etc."
9616
msgstr ""
9617
9618
#: en/help_topics/configuration.txt:64
9619
msgid ""
9620
"BZR_LOG\n"
9621
"~~~~~~~"
9622
msgstr ""
9623
9624
#: en/help_topics/configuration.txt:67
9625
msgid ""
9626
"Location of the Bazaar log file. You can check the current location by\n"
9627
"running ``bzr version``."
9628
msgstr ""
9629
9630
#: en/help_topics/configuration.txt:70
9631
msgid ""
9632
"The log file contains debug information that is useful for diagnosing or\n"
9633
"reporting problems with Bazaar."
9634
msgstr ""
9635
9636
#: en/help_topics/configuration.txt:73
9637
msgid ""
9638
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9639
"will disable logging."
9640
msgstr ""
9641
9642
#: en/help_topics/configuration.txt:76
9643
msgid ""
9644
"\n"
9645
"BZR_PLUGIN_PATH\n"
9646
"~~~~~~~~~~~~~~~"
9647
msgstr ""
9648
9649
#: en/help_topics/configuration.txt:80
9650
msgid ""
9651
"The path to the plugins directory that Bazaar should use.\n"
9652
"If not set, Bazaar will search for plugins in:"
9653
msgstr ""
9654
9655
#: en/help_topics/configuration.txt:83
9656
msgid ""
9657
"* the user specific plugin directory (containing the ``user`` plugins),"
9658
msgstr ""
9659
9660
#: en/help_topics/configuration.txt:85
9661
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9662
msgstr ""
9663
9664
#: en/help_topics/configuration.txt:87
9665
msgid ""
9666
"* the site specific plugin directory if applicable (containing\n"
9667
" the ``site`` plugins)."
9668
msgstr ""
9669
9670
#: en/help_topics/configuration.txt:90
9671
msgid ""
9672
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9673
"the way the plugin are searched. "
9674
msgstr ""
9675
9676
#: en/help_topics/configuration.txt:93
9677
msgid ""
9678
"As for the ``PATH`` variables, if multiple directories are\n"
9679
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9680
"platform specific appropriate character (':' on Unix,\n"
9681
"';' on windows)"
9682
msgstr ""
9683
9684
#: en/help_topics/configuration.txt:98
9685
msgid ""
9686
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9687
"in ``user``. However it will continue to search in ``core`` and\n"
9688
"``site`` unless they are explicitly removed."
9689
msgstr ""
9690
9691
#: en/help_topics/configuration.txt:102
9692
msgid ""
9693
"If you need to change the order or remove one of these\n"
9694
"directories, you should use special values:"
9695
msgstr ""
9696
9697
#: en/help_topics/configuration.txt:105
9698
msgid ""
9699
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9700
" path from the default values,"
9701
msgstr ""
9702
9703
#: en/help_topics/configuration.txt:108
9704
msgid ""
9705
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9706
" before the remaining default values (and also remove it from\n"
9707
" the default values)."
9708
msgstr ""
9709
9710
#: en/help_topics/configuration.txt:112
9711
msgid ""
9712
"Note that the special values 'user', 'core' and 'site' should be\n"
9713
"used literally, they will be substituted by the corresponding,\n"
9714
"platform specific, values."
9715
msgstr ""
9716
9717
#: en/help_topics/configuration.txt:116
9718
msgid ""
9719
"The examples below use ':' as the separator, windows users\n"
9720
"should use ';'."
9721
msgstr ""
9722
9723
#: en/help_topics/configuration.txt:119
9724
msgid "Overriding the default user plugin directory::"
9725
msgstr ""
9726
9727
#: en/help_topics/configuration.txt:121
9728
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9729
msgstr ""
9730
9731
#: en/help_topics/configuration.txt:123
9732
msgid "Disabling the site directory while retaining the user directory::"
9733
msgstr ""
9734
9735
#: en/help_topics/configuration.txt:125
9736
msgid " BZR_PLUGIN_PATH='-site:+user'"
9737
msgstr ""
9738
9739
#: en/help_topics/configuration.txt:127
9740
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9741
msgstr ""
9742
9743
#: en/help_topics/configuration.txt:129
9744
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9745
msgstr ""
9746
9747
#: en/help_topics/configuration.txt:131
9748
msgid "Overriding the default site plugin directory::"
9749
msgstr ""
9750
9751
#: en/help_topics/configuration.txt:133
9752
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9753
msgstr ""
9754
9755
#: en/help_topics/configuration.txt:135
9756
msgid ""
9757
"BZR_DISABLE_PLUGINS\n"
9758
"~~~~~~~~~~~~~~~~~~~"
9759
msgstr ""
9760
9761
#: en/help_topics/configuration.txt:138
9762
msgid ""
9763
"Under special circumstances (mostly when trying to diagnose a\n"
9764
"bug), it's better to disable a plugin (or several) rather than\n"
9765
"uninstalling them completely. Such plugins can be specified in\n"
9766
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9767
msgstr ""
9768
9769
#: en/help_topics/configuration.txt:143
9770
msgid ""
9771
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9772
"will raise an import error if they are explicitly imported (by\n"
9773
"another plugin that depends on them for example)."
9774
msgstr ""
9775
9776
#: en/help_topics/configuration.txt:147
9777
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9778
msgstr ""
9779
9780
#: en/help_topics/configuration.txt:149
9781
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9782
msgstr ""
9783
9784
#: en/help_topics/configuration.txt:151
9785
msgid ""
9786
"BZR_PLUGINS_AT\n"
9787
"~~~~~~~~~~~~~~"
9788
msgstr ""
9789
9790
#: en/help_topics/configuration.txt:154
9791
msgid ""
9792
"When adding a new feature or working on a bug in a plugin,\n"
9793
"developers often need to use a specific version of a given\n"
9794
"plugin. Since python requires that the directory containing the\n"
9795
"code is named like the plugin itself this make it impossible to\n"
9796
"use arbitrary directory names (using a two-level directory scheme\n"
9797
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9798
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9799
msgstr ""
9800
9801
#: en/help_topics/configuration.txt:162
9802
msgid ""
9803
"Plugins specified in this environment variable takes precedence\n"
9804
"over the ones in ``BZR_PLUGIN_PATH``."
9805
msgstr ""
9806
9807
#: en/help_topics/configuration.txt:165
9808
msgid ""
9809
"The variable specified a list of ``plugin_name@plugin path``,\n"
9810
"``plugin_name`` being the name of the plugin as it appears in\n"
9811
"python module paths, ``plugin_path`` being the path to the\n"
9812
"directory containing the plugin code itself\n"
9813
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9814
"separator, use ';' on windows."
9815
msgstr ""
9816
9817
#: en/help_topics/configuration.txt:172
9818
msgid ""
9819
"Example:\n"
9820
"~~~~~~~~"
9821
msgstr ""
9822
9823
#: en/help_topics/configuration.txt:175
9824
msgid ""
9825
"Using a specific version of ``myplugin``:\n"
9826
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9827
msgstr ""
9828
9829
#: en/help_topics/configuration.txt:178
9830
msgid ""
9831
"BZRPATH\n"
9832
"~~~~~~~"
9833
msgstr ""
9834
9835
#: en/help_topics/configuration.txt:181
9836
msgid "The path where Bazaar should look for shell plugin external commands."
9837
msgstr ""
9838
9839
#: en/help_topics/configuration.txt:183
9840
msgid ""
9841
"\n"
9842
"http_proxy, https_proxy\n"
9843
"~~~~~~~~~~~~~~~~~~~~~~~"
9844
msgstr ""
9845
9846
#: en/help_topics/configuration.txt:187
9847
msgid "Specifies the network proxy for outgoing connections, for example::"
9848
msgstr ""
9849
9850
#: en/help_topics/configuration.txt:189
9851
msgid ""
9852
" http_proxy=http://proxy.example.com:3128/ \n"
9853
" https_proxy=http://proxy.example.com:3128/"
9854
msgstr ""
9855
9856
#: en/help_topics/configuration.txt:192
9857
msgid ""
9858
"\n"
9859
"Configuration files\n"
9860
"-------------------"
9861
msgstr ""
9862
9863
#: en/help_topics/configuration.txt:196
9864
msgid ""
9865
"Location\n"
9866
"~~~~~~~~"
9867
msgstr ""
9868
9869
#: en/help_topics/configuration.txt:199
9870
msgid ""
9871
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9872
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9873
"on\n"
9874
"Windows. (You can check the location for your system by using\n"
9875
"``bzr version``.)"
9876
msgstr ""
9877
9878
#: en/help_topics/configuration.txt:204
9879
msgid "There are three primary configuration files in this location:"
9880
msgstr ""
9881
9882
#: en/help_topics/configuration.txt:206
9883
msgid "* ``bazaar.conf`` describes default configuration options,"
9884
msgstr ""
9885
9886
#: en/help_topics/configuration.txt:208
9887
msgid ""
9888
"* ``locations.conf`` describes configuration information for\n"
9889
" specific branch locations,"
9890
msgstr ""
9891
9892
#: en/help_topics/configuration.txt:211
9893
msgid ""
9894
"* ``authentication.conf`` describes credential information for\n"
9895
" remote servers."
9896
msgstr ""
9897
9898
#: en/help_topics/configuration.txt:214
9899
msgid ""
9900
"Each branch can also contain a configuration file that sets values specific\n"
9901
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9902
"the\n"
9903
"branch. This file is visible to all users of a branch, if you wish to "
9904
"override\n"
9905
"one of the values for a branch with a setting that is specific to you then "
9906
"you\n"
9907
"can do so in ``locations.conf``."
9908
msgstr ""
9909
9910
#: en/help_topics/configuration.txt:220
9911
msgid ""
9912
"General format\n"
9913
"~~~~~~~~~~~~~~"
9914
msgstr ""
9915
9916
#: en/help_topics/configuration.txt:223
9917
msgid ""
9918
"An ini file has three types of contructs: section headers, section\n"
9919
"options and comments."
9920
msgstr ""
9921
9922
#: en/help_topics/configuration.txt:226
9923
msgid ""
9924
"Comments\n"
9925
"^^^^^^^^"
9926
msgstr ""
9927
9928
#: en/help_topics/configuration.txt:229
9929
msgid ""
9930
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9931
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9932
"Bazaar when parsing ini files."
9933
msgstr ""
9934
9935
#: en/help_topics/configuration.txt:233
9936
msgid ""
9937
"Section headers\n"
9938
"^^^^^^^^^^^^^^^"
9939
msgstr ""
9940
9941
#: en/help_topics/configuration.txt:236
9942
msgid ""
9943
"A section header is a word enclosed in brackets that starts at the begining\n"
9944
"of a line. A typical section header looks like this::"
9945
msgstr ""
9946
9947
#: en/help_topics/configuration.txt:239
9948
msgid " [DEFAULT]"
9949
msgstr ""
9950
9951
#: en/help_topics/configuration.txt:241
9952
msgid ""
9953
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9954
"[ALIASES]. Section headers are case sensitive. The default section provides "
9955
"for\n"
9956
"setting options which can be overridden with the branch config file."
9957
msgstr ""
9958
9959
#: en/help_topics/configuration.txt:245
9960
msgid ""
9961
"For ``locations.conf``, the options from the section with the\n"
9962
"longest matching section header are used to the exclusion of other\n"
9963
"potentially valid section headers. A section header uses the path for\n"
9964
"the branch as the section header. Some examples include::"
9965
msgstr ""
9966
9967
#: en/help_topics/configuration.txt:250
9968
msgid ""
9969
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9970
" [/home/jdoe/branches/]"
9971
msgstr ""
9972
9973
#: en/help_topics/configuration.txt:253
9974
msgid ""
9975
"\n"
9976
"Section options\n"
9977
"^^^^^^^^^^^^^^^"
9978
msgstr ""
9979
9980
#: en/help_topics/configuration.txt:257
9981
msgid ""
9982
"A section option resides within a section. A section option contains an\n"
9983
"option name, an equals sign and a value. For example::"
9984
msgstr ""
9985
9986
#: en/help_topics/configuration.txt:260
9987
msgid ""
9988
" email = John Doe <jdoe@isp.com>\n"
9989
" gpg_signing_key = Amy Pond <amy@example.com>"
9990
msgstr ""
9991
9992
#: en/help_topics/configuration.txt:263
9993
msgid ""
9994
"A option can reference other options by enclosing them in curly brackets::"
9995
msgstr ""
9996
9997
#: en/help_topics/configuration.txt:265
9998
msgid ""
9999
" my_branch_name = feature_x\n"
10000
" my_server = bzr+ssh://example.com\n"
10001
" push_location = {my_server}/project/{my_branch_name}"
10002
msgstr ""
10003
10004
#: en/help_topics/configuration.txt:269
10005
msgid ""
10006
"Option policies\n"
10007
"^^^^^^^^^^^^^^^"
10008
msgstr ""
10009
10010
#: en/help_topics/configuration.txt:272
10011
msgid ""
10012
"Options defined in a section affect the named directory or URL plus\n"
10013
"any locations they contain. Policies can be used to change how an\n"
10014
"option value is interpreted for contained locations. Currently\n"
10015
"there are three policies available:"
10016
msgstr ""
10017
10018
#: en/help_topics/configuration.txt:277
10019
msgid ""
10020
" none:\n"
10021
" the value is interpreted the same for contained locations. This is\n"
10022
" the default behaviour.\n"
10023
" norecurse:\n"
10024
" the value is only used for the exact location specified by the\n"
10025
" section name.\n"
10026
" appendpath:\n"
10027
" for contained locations, any additional path components are\n"
10028
" appended to the value."
10029
msgstr ""
10030
10031
#: en/help_topics/configuration.txt:287
10032
msgid ""
10033
"Policies are specified by keys with names of the form "
10034
"\"<option_name>:policy\".\n"
10035
"For example, to define the push location for a tree of branches, the\n"
10036
"following could be used::"
10037
msgstr ""
10038
10039
#: en/help_topics/configuration.txt:291
10040
msgid ""
10041
" [/top/location]\n"
10042
" push_location = sftp://example.com/location\n"
10043
" push_location:policy = appendpath"
10044
msgstr ""
10045
10046
#: en/help_topics/configuration.txt:295
10047
msgid ""
10048
"With this configuration, the push location for ``/top/location/branch1``\n"
10049
"would be ``sftp://example.com/location/branch1``."
10050
msgstr ""
10051
10052
#: en/help_topics/configuration.txt:298
10053
msgid ""
10054
"Section local options\n"
10055
"^^^^^^^^^^^^^^^^^^^^^"
10056
msgstr ""
10057
10058
#: en/help_topics/configuration.txt:301
10059
msgid ""
10060
"Some options are defined automatically inside a given section and can be\n"
10061
"refered to in this section only. "
10062
msgstr ""
10063
10064
#: en/help_topics/configuration.txt:304
10065
msgid "For example, the ``appendpath`` policy can be used like this::"
10066
msgstr ""
10067
10068
#: en/help_topics/configuration.txt:306
10069
msgid ""
10070
" [/home/vila/src/bzr/bugs]\n"
10071
" mypush = lp:~vila/bzr\n"
10072
" mypush:policy=appendpath"
10073
msgstr ""
10074
10075
#: en/help_topics/configuration.txt:310
10076
msgid "Using ``relpath`` to achieve the same result is done like this::"
10077
msgstr ""
10078
10079
#: en/help_topics/configuration.txt:312
10080
msgid ""
10081
" [/home/vila/src/bzr/bugs]\n"
10082
" mypush = lp:~vila/bzr/{relpath}"
10083
msgstr ""
10084
10085
#: en/help_topics/configuration.txt:315
10086
msgid ""
10087
"In both cases, when used in a directory like\n"
10088
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10089
msgstr ""
10090
10091
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
10092
msgid ""
10093
" $ bzr config mypush\n"
10094
" lp:~vila/bzr/832013-expand-in-stack"
10095
msgstr ""
10096
10097
#: en/help_topics/configuration.txt:321
10098
msgid "Another such option is ``basename`` which can be used like this::"
10099
msgstr ""
10100
10101
#: en/help_topics/configuration.txt:323
10102
msgid ""
10103
" [/home/vila/src/bzr]\n"
10104
" mypush = lp:~vila/bzr/{basename}"
10105
msgstr ""
10106
10107
#: en/help_topics/configuration.txt:326
10108
msgid ""
10109
"When used in a directory like\n"
10110
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10111
msgstr ""
10112
10113
#: en/help_topics/configuration.txt:332
10114
msgid ""
10115
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10116
"itself is defined as the relative path between the section name and the\n"
10117
"location it matches."
10118
msgstr ""
10119
10120
#: en/help_topics/configuration.txt:336
10121
msgid ""
10122
"When an option is local to a Section, it cannot be referred to from option\n"
10123
"values in any other section from the same ``Store`` nor from any other\n"
10124
"``Store``."
10125
msgstr ""
10126
10127
#: en/help_topics/configuration.txt:340
10128
msgid ""
10129
"\n"
10130
"The main configuration file, bazaar.conf\n"
10131
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10132
msgstr ""
10133
10134
#: en/help_topics/configuration.txt:344
10135
msgid ""
10136
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10137
"The default section contains the default\n"
10138
"configuration options for all branches. The default section can be\n"
10139
"overriden by providing a branch-specific section in ``locations.conf``."
10140
msgstr ""
10141
10142
#: en/help_topics/configuration.txt:349
10143
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10144
msgstr ""
10145
10146
#: en/help_topics/configuration.txt:351
10147
msgid ""
10148
" [DEFAULT]\n"
10149
" email = John Doe <jdoe@isp.com>\n"
10150
" editor = /usr/bin/vim\n"
10151
" create_signatures = when-required"
10152
msgstr ""
10153
10154
#: en/help_topics/configuration.txt:356
10155
msgid ""
10156
"\n"
10157
"The branch location configuration file, locations.conf\n"
10158
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10159
msgstr ""
10160
10161
#: en/help_topics/configuration.txt:360
10162
msgid ""
10163
"``locations.conf`` allows one to specify overriding settings for\n"
10164
"a specific branch. The format is almost identical to the default section in\n"
10165
"bazaar.conf with one significant change: The section header, instead of "
10166
"saying\n"
10167
"default, will be the path to a branch that you wish to override a value\n"
10168
"for. The '?' and '*' wildcards are supported::"
10169
msgstr ""
10170
10171
#: en/help_topics/configuration.txt:366
10172
msgid ""
10173
" [/home/jdoe/branches/nethack]\n"
10174
" email = Nethack Admin <nethack@nethack.com>"
10175
msgstr ""
10176
10177
#: en/help_topics/configuration.txt:369
10178
msgid ""
10179
" [http://hypothetical.site.com/branches/devel-branch]\n"
10180
" create_signatures = always"
10181
msgstr ""
10182
10183
#: en/help_topics/configuration.txt:372
10184
msgid ""
10185
"The authentication configuration file, authentication.conf\n"
10186
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10187
msgstr ""
10188
10189
#: en/help_topics/configuration.txt:375
10190
msgid ""
10191
"``authentication.conf`` allows one to specify credentials for\n"
10192
"remote servers. This can be used for all the supported transports and any "
10193
"part\n"
10194
"of bzr that requires authentication (smtp for example)."
10195
msgstr ""
10196
10197
#: en/help_topics/configuration.txt:379
10198
msgid ""
10199
"The syntax of the file obeys the same rules as the others except for the\n"
10200
"option policies which don't apply."
10201
msgstr ""
10202
10203
#: en/help_topics/configuration.txt:382
10204
msgid ""
10205
"For more information on the possible uses of the authentication "
10206
"configuration\n"
10207
"file see :doc:`authentication-help`."
10208
msgstr ""
10209
10210
#: en/help_topics/configuration.txt:385
10211
msgid ""
10212
"\n"
10213
"Common options\n"
10214
"--------------"
10215
msgstr ""
10216
10217
#: en/help_topics/configuration.txt:389
10218
msgid ""
10219
"debug_flags\n"
10220
"~~~~~~~~~~~"
10221
msgstr ""
10222
10223
#: en/help_topics/configuration.txt:392
10224
msgid ""
10225
"A comma-separated list of debugging options to turn on. The same values\n"
10226
"can be used as with the -D command-line option (see `help global-options`).\n"
10227
"For example::"
10228
msgstr ""
10229
10230
#: en/help_topics/configuration.txt:396
10231
msgid " debug_flags = hpss"
10232
msgstr ""
10233
10234
#: en/help_topics/configuration.txt:400
10235
msgid " debug_flags = hpss,evil"
10236
msgstr ""
10237
10238
#: en/help_topics/configuration.txt:402
10239
msgid ""
10240
"email\n"
10241
"~~~~~"
10242
msgstr ""
10243
10244
#: en/help_topics/configuration.txt:405
10245
msgid ""
10246
"The email address to use when committing a branch. Typically takes the form\n"
10247
"of::"
10248
msgstr ""
10249
10250
#: en/help_topics/configuration.txt:408
10251
msgid " email = Full Name <account@hostname.tld>"
10252
msgstr ""
10253
10254
#: en/help_topics/configuration.txt:410
10255
msgid ""
10256
"editor\n"
10257
"~~~~~~"
10258
msgstr ""
10259
10260
#: en/help_topics/configuration.txt:413
10261
msgid ""
10262
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10263
"a commit message. This setting is trumped by the environment variable\n"
10264
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10265
"variables."
10266
msgstr ""
10267
10268
#: en/help_topics/configuration.txt:418
10269
msgid ""
10270
"log_format\n"
10271
"~~~~~~~~~~"
10272
msgstr ""
10273
10274
#: en/help_topics/configuration.txt:421
10275
msgid ""
10276
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10277
"and ``line``. Additional formats may be provided by plugins. The default\n"
10278
"value is ``long``."
10279
msgstr ""
10280
10281
#: en/help_topics/configuration.txt:425
10282
msgid ""
10283
"check_signatures\n"
10284
"~~~~~~~~~~~~~~~~"
10285
msgstr ""
10286
10287
#: en/help_topics/configuration.txt:428
10288
msgid ""
10289
"Reserved for future use. These options will allow a policy for branches to\n"
10290
"require signatures."
10291
msgstr ""
10292
10293
#: en/help_topics/configuration.txt:431
10294
msgid ""
10295
"require\n"
10296
" The gnupg signature for revisions must be present and must be valid."
10297
msgstr ""
10298
10299
#: en/help_topics/configuration.txt:434
10300
msgid ""
10301
"ignore\n"
10302
" Do not check gnupg signatures of revisions."
10303
msgstr ""
10304
10305
#: en/help_topics/configuration.txt:437
10306
msgid ""
10307
"check-available\n"
10308
" (default) If gnupg signatures for revisions are present, check them.\n"
10309
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10310
" no signature is present."
10311
msgstr ""
10312
10313
#: en/help_topics/configuration.txt:442
10314
msgid ""
10315
"create_signatures\n"
10316
"~~~~~~~~~~~~~~~~~"
10317
msgstr ""
10318
10319
#: en/help_topics/configuration.txt:445
10320
msgid ""
10321
"Defines the behaviour of signing revisions on commits. By default bzr will "
10322
"not\n"
10323
"sign new commits."
10324
msgstr ""
10325
10326
#: en/help_topics/configuration.txt:448
10327
msgid ""
10328
"always\n"
10329
" Sign every new revision that is committed. If the signing fails then "
10330
"the\n"
10331
" commit will not be made."
10332
msgstr ""
10333
10334
#: en/help_topics/configuration.txt:452
10335
msgid ""
10336
"when-required\n"
10337
" Reserved for future use."
10338
msgstr ""
10339
10340
#: en/help_topics/configuration.txt:455
10341
msgid ""
10342
"never\n"
10343
" Reserved for future use."
10344
msgstr ""
10345
10346
#: en/help_topics/configuration.txt:458
10347
msgid ""
10348
"In future it is planned that ``when-required`` will sign newly\n"
10349
"committed revisions only when the branch requires them. ``never`` will "
10350
"refuse\n"
10351
"to sign newly committed revisions, even if the branch requires signatures."
10352
msgstr ""
10353
10354
#: en/help_topics/configuration.txt:462
10355
msgid ""
10356
"dirstate.fdatasync\n"
10357
"~~~~~~~~~~~~~~~~~~"
10358
msgstr ""
10359
10360
#: en/help_topics/configuration.txt:465
10361
msgid ""
10362
"If true (default), working tree metadata changes are flushed through the\n"
10363
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10364
"should not be lost if the machine crashes. See also repository.fdatasync."
10365
msgstr ""
10366
10367
#: en/help_topics/configuration.txt:469
10368
msgid ""
10369
"gpg_signing_key\n"
10370
"~~~~~~~~~~~~~~~"
10371
msgstr ""
10372
10373
#: en/help_topics/configuration.txt:472
10374
msgid ""
10375
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10376
"address, key fingerprint or full key ID. When unset or when set to\n"
10377
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10378
msgstr ""
10379
10380
#: en/help_topics/configuration.txt:476
10381
msgid ""
10382
"recurse\n"
10383
"~~~~~~~"
10384
msgstr ""
10385
10386
#: en/help_topics/configuration.txt:479
10387
msgid ""
10388
"Only useful in ``locations.conf``. Defines whether or not the\n"
10389
"configuration for this section applies to subdirectories:"
10390
msgstr ""
10391
10392
#: en/help_topics/configuration.txt:482
10393
msgid ""
10394
"true\n"
10395
" (default) This section applies to subdirectories as well."
10396
msgstr ""
10397
10398
#: en/help_topics/configuration.txt:485
10399
msgid ""
10400
"false\n"
10401
" This section only applies to the branch at this directory and not\n"
10402
" branches below it."
10403
msgstr ""
10404
10405
#: en/help_topics/configuration.txt:489
10406
msgid ""
10407
"gpg_signing_command\n"
10408
"~~~~~~~~~~~~~~~~~~~"
10409
msgstr ""
10410
10411
#: en/help_topics/configuration.txt:492
10412
msgid ""
10413
"(Default: \"gpg\"). Which program should be used to sign and check "
10414
"revisions.\n"
10415
"For example::"
10416
msgstr ""
10417
10418
#: en/help_topics/configuration.txt:495
10419
msgid " gpg_signing_command = /usr/bin/gnpg"
10420
msgstr ""
10421
10422
#: en/help_topics/configuration.txt:497
10423
msgid ""
10424
"The specified command must accept the options \"--clearsign\" and \"-u "
10425
"<email>\"."
10426
msgstr ""
10427
10428
#: en/help_topics/configuration.txt:499
10429
msgid ""
10430
"bzr_remote_path\n"
10431
"~~~~~~~~~~~~~~~"
10432
msgstr ""
10433
10434
#: en/help_topics/configuration.txt:502
10435
msgid ""
10436
"(Default: \"bzr\"). The path to the command that should be used to run the "
10437
"smart\n"
10438
"server for bzr. This value may only be specified in locations.conf, because:"
10439
msgstr ""
10440
10441
#: en/help_topics/configuration.txt:505
10442
msgid ""
10443
"- it's needed before branch.conf is accessible\n"
10444
"- allowing remote branch.conf files to specify commands would be a security\n"
10445
" risk"
10446
msgstr ""
10447
10448
#: en/help_topics/configuration.txt:509
10449
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10450
msgstr ""
10451
10452
#: en/help_topics/configuration.txt:511
10453
msgid ""
10454
"smtp_server\n"
10455
"~~~~~~~~~~~"
10456
msgstr ""
10457
10458
#: en/help_topics/configuration.txt:514
10459
msgid ""
10460
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10461
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10462
msgstr ""
10463
10464
#: en/help_topics/configuration.txt:517
10465
msgid ""
10466
"smtp_username, smtp_password\n"
10467
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10468
msgstr ""
10469
10470
#: en/help_topics/configuration.txt:520
10471
msgid ""
10472
"User and password to authenticate to the SMTP server. If smtp_username\n"
10473
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10474
"These settings are only needed if the SMTP server requires authentication\n"
10475
"to send mail."
10476
msgstr ""
10477
10478
#: en/help_topics/configuration.txt:525
10479
msgid ""
10480
"locks.steal_dead\n"
10481
"~~~~~~~~~~~~~~~~"
10482
msgstr ""
10483
10484
#: en/help_topics/configuration.txt:528
10485
msgid ""
10486
"If set to true, bzr will automatically break locks held by processes from\n"
10487
"the same machine and user that are no longer alive. Otherwise, it will\n"
10488
"print a message and you can break the lock manually, if you are satisfied\n"
10489
"the object is no longer in use."
10490
msgstr ""
10491
10492
#: en/help_topics/configuration.txt:533
10493
msgid ""
10494
"mail_client\n"
10495
"~~~~~~~~~~~"
10496
msgstr ""
10497
10498
#: en/help_topics/configuration.txt:536
10499
msgid ""
10500
"A mail client to use for sending merge requests.\n"
10501
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10502
"it\n"
10503
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10504
"``editor``."
10505
msgstr ""
10506
10507
#: en/help_topics/configuration.txt:541
10508
msgid "Supported values for specific clients:"
10509
msgstr ""
10510
10511
#: en/help_topics/configuration.txt:543
10512
msgid ""
10513
":claws: Use Claws. This skips a dialog for attaching files.\n"
10514
":evolution: Use Evolution.\n"
10515
":kmail: Use KMail.\n"
10516
":mutt: Use Mutt.\n"
10517
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10518
"1.5,\n"
10519
" this works around some bugs that xdg-email doesn't handle."
10520
msgstr ""
10521
10522
#: en/help_topics/configuration.txt:550
10523
msgid "Supported generic values are:"
10524
msgstr ""
10525
10526
#: en/help_topics/configuration.txt:552
10527
msgid ""
10528
":default: See above.\n"
10529
":editor: Use your editor to compose the merge request. This also uses\n"
10530
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10531
" smtp_username and smtp_password.\n"
10532
":mapi: Use your preferred e-mail client on Windows.\n"
10533
":xdg-email: Use xdg-email to run your preferred mail program"
10534
msgstr ""
10535
10536
#: en/help_topics/configuration.txt:559
10537
msgid ""
10538
"repository.fdatasync\n"
10539
"~~~~~~~~~~~~~~~~~~~~"
10540
msgstr ""
10541
10542
#: en/help_topics/configuration.txt:562
10543
msgid ""
10544
"If true (default), repository changes are flushed through the OS buffers\n"
10545
"to physical disk. This is somewhat slower, but means data should not be\n"
10546
"lost if the machine crashes. See also dirstate.fdatasync."
10547
msgstr ""
10548
10549
#: en/help_topics/configuration.txt:566
10550
msgid ""
10551
"submit_branch\n"
10552
"~~~~~~~~~~~~~"
10553
msgstr ""
10554
10555
#: en/help_topics/configuration.txt:569
10556
msgid ""
10557
"The branch you intend to submit your current work to. This is "
10558
"automatically\n"
10559
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10560
"This\n"
10561
"should usually be set on a per-branch or per-location basis."
10562
msgstr ""
10563
10564
#: en/help_topics/configuration.txt:573
10565
msgid ""
10566
"public_branch\n"
10567
"~~~~~~~~~~~~~"
10568
msgstr ""
10569
10570
#: en/help_topics/configuration.txt:576
10571
msgid ""
10572
"A publically-accessible version of this branch (implying that this version "
10573
"is\n"
10574
"not publically-accessible). Used (and set) by ``bzr send``."
10575
msgstr ""
10576
10577
#: en/help_topics/configuration.txt:579
10578
msgid ""
10579
"suppress_warnings\n"
10580
"~~~~~~~~~~~~~~~~~"
10581
msgstr ""
10582
10583
#: en/help_topics/configuration.txt:582
10584
msgid ""
10585
"A list of strings, each string represent a warning that can be emitted by\n"
10586
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10587
msgstr ""
10588
10589
#: en/help_topics/configuration.txt:585
10590
msgid "Valid values:"
10591
msgstr ""
10592
10593
#: en/help_topics/configuration.txt:587
10594
msgid ""
10595
"* ``format_deprecation``:\n"
10596
" whether the format deprecation warning is shown on repositories that "
10597
"are\n"
10598
" using deprecated formats."
10599
msgstr ""
10600
10601
#: en/help_topics/configuration.txt:591
10602
msgid ""
10603
"default_format\n"
10604
"~~~~~~~~~~~~~~"
10605
msgstr ""
10606
10607
#: en/help_topics/configuration.txt:594
10608
msgid ""
10609
"A format name for the default format used when creating branches. See "
10610
"``bzr\n"
10611
"help formats`` for possible values."
10612
msgstr ""
10613
10614
#: en/help_topics/configuration.txt:597
10615
msgid ""
10616
"\n"
10617
"Unicode options\n"
10618
"---------------"
10619
msgstr ""
10620
10621
#: en/help_topics/configuration.txt:601
10622
msgid ""
10623
"output_encoding\n"
10624
"~~~~~~~~~~~~~~~"
10625
msgstr ""
10626
10627
#: en/help_topics/configuration.txt:604
10628
msgid ""
10629
"A Python unicode encoding name for text output from bzr, such as log\n"
10630
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10631
"is the terminal encoding prefered by the operating system."
10632
msgstr ""
10633
10634
#: en/help_topics/configuration.txt:608
10635
msgid ""
10636
"\n"
10637
"Branch type specific options\n"
10638
"----------------------------"
10639
msgstr ""
10640
10641
#: en/help_topics/configuration.txt:612
10642
msgid ""
10643
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10644
"later format. They\n"
10645
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10646
"manually set in ``locations.conf`` or ``bazaar.conf``."
10647
msgstr ""
10648
10649
#: en/help_topics/configuration.txt:617
10650
msgid ""
10651
"append_revisions_only\n"
10652
"~~~~~~~~~~~~~~~~~~~~~"
10653
msgstr ""
10654
10655
#: en/help_topics/configuration.txt:620
10656
msgid ""
10657
"If set to \"True\" then revisions can only be appended to the log, not\n"
10658
"removed. A branch with this setting enabled can only pull from another\n"
10659
"branch if the other branch's log is a longer version of its own. This is\n"
10660
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10661
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10662
"compatibility with previous bzr versions (older than 2.2)."
10663
msgstr ""
10664
10665
#: en/help_topics/configuration.txt:627
10666
msgid ""
10667
"parent_location\n"
10668
"~~~~~~~~~~~~~~~"
10669
msgstr ""
10670
10671
#: en/help_topics/configuration.txt:630
10672
msgid ""
10673
"If present, the location of the default branch for pull or merge. This "
10674
"option\n"
10675
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10676
"--remember``."
10677
msgstr ""
10678
10679
#: en/help_topics/configuration.txt:634
10680
msgid ""
10681
"push_location\n"
10682
"~~~~~~~~~~~~~"
10683
msgstr ""
10684
10685
#: en/help_topics/configuration.txt:637
10686
msgid ""
10687
"If present, the location of the default branch for push. This option\n"
10688
"is normally set by the first ``push`` or ``push --remember``."
10689
msgstr ""
10690
10691
#: en/help_topics/configuration.txt:640
10692
msgid ""
10693
"push_strict\n"
10694
"~~~~~~~~~~~"
10695
msgstr ""
10696
10697
#: en/help_topics/configuration.txt:643
10698
msgid ""
10699
"If present, defines the ``--strict`` option default value for checking\n"
10700
"uncommitted changes before pushing."
10701
msgstr ""
10702
10703
#: en/help_topics/configuration.txt:646
10704
msgid ""
10705
"dpush_strict\n"
10706
"~~~~~~~~~~~~"
10707
msgstr ""
10708
10709
#: en/help_topics/configuration.txt:649
10710
msgid ""
10711
"If present, defines the ``--strict`` option default value for checking\n"
10712
"uncommitted changes before pushing into a different VCS without any\n"
10713
"custom bzr metadata."
10714
msgstr ""
10715
10716
#: en/help_topics/configuration.txt:653
10717
msgid ""
10718
"bound_location\n"
10719
"~~~~~~~~~~~~~~"
10720
msgstr ""
10721
10722
#: en/help_topics/configuration.txt:656
10723
msgid ""
10724
"The location that commits should go to when acting as a checkout.\n"
10725
"This option is normally set by ``bind``."
10726
msgstr ""
10727
10728
#: en/help_topics/configuration.txt:659
10729
msgid ""
10730
"bound\n"
10731
"~~~~~"
10732
msgstr ""
10733
10734
#: en/help_topics/configuration.txt:662
10735
msgid ""
10736
"If set to \"True\", the branch should act as a checkout, and push each "
10737
"commit to\n"
10738
"the bound_location. This option is normally set by ``bind``/``unbind``."
10739
msgstr ""
10740
10741
#: en/help_topics/configuration.txt:665
10742
msgid ""
10743
"send_strict\n"
10744
"~~~~~~~~~~~"
10745
msgstr ""
10746
10747
#: en/help_topics/configuration.txt:668
10748
msgid ""
10749
"If present, defines the ``--strict`` option default value for checking\n"
10750
"uncommitted changes before sending a merge directive."
10751
msgstr ""
10752
10753
#: en/help_topics/configuration.txt:671
10754
msgid ""
10755
"add.maximum_file_size\n"
10756
"~~~~~~~~~~~~~~~~~~~~~"
10757
msgstr ""
10758
10759
#: en/help_topics/configuration.txt:674
10760
msgid ""
10761
"Defines the maximum file size the command line \"add\" operation will allow\n"
10762
"in recursive mode, with files larger than this value being skipped. You may "
10763
"\n"
10764
"specify this value as an integer (in which case it is interpreted as bytes), "
10765
"\n"
10766
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10767
"0 \n"
10768
"will disable skipping."
10769
msgstr ""
10770
10771
#: en/help_topics/configuration.txt:680
10772
msgid ""
10773
"External Merge Tools\n"
10774
"--------------------"
10775
msgstr ""
10776
10777
#: en/help_topics/configuration.txt:683
10778
msgid ""
10779
"bzr.mergetool.<name>\n"
10780
"~~~~~~~~~~~~~~~~~~~~"
10781
msgstr ""
10782
10783
#: en/help_topics/configuration.txt:686
10784
msgid ""
10785
"Defines an external merge tool called <name> with the given command-line.\n"
10786
"Arguments containing spaces should be quoted using single or double quotes. "
10787
"The\n"
10788
"executable may omit its path if it can be found on the PATH."
10789
msgstr ""
10790
10791
#: en/help_topics/configuration.txt:690
10792
msgid ""
10793
"The following markers can be used in the command-line to substitute "
10794
"filenames\n"
10795
"involved in the merge conflict::"
10796
msgstr ""
10797
10798
#: en/help_topics/configuration.txt:693
10799
msgid ""
10800
" {base} file.BASE\n"
10801
" {this} file.THIS\n"
10802
" {other} file.OTHER\n"
10803
" {result} output file\n"
10804
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10805
"merge\n"
10806
" succeeds."
10807
msgstr ""
10808
10809
#: en/help_topics/configuration.txt:702
10810
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10811
msgstr ""
10812
10813
#: en/help_topics/configuration.txt:704
10814
msgid ""
10815
"bzr.default_mergetool\n"
10816
"~~~~~~~~~~~~~~~~~~~~~"
10817
msgstr ""
10818
10819
#: en/help_topics/configuration.txt:707
10820
msgid ""
10821
"Specifies which external merge tool (as defined above) should be selected "
10822
"by\n"
10823
"default in tools such as ``bzr qconflicts``."
10824
msgstr ""
10825
10826
#: en/help_topics/configuration.txt:712
10827
msgid " bzr.default_mergetool = kdiff3\n"
10828
msgstr ""
10829
10830
#: en/help_topics/conflict-types.txt:1
10831
msgid ""
10832
"Conflict Types\n"
10833
"=============="
10834
msgstr ""
10835
10836
#: en/help_topics/conflict-types.txt:4
10837
msgid ""
10838
"Some operations, like merge, revert and pull, modify the contents of your\n"
10839
"working tree. These modifications are programmatically generated, and so "
10840
"they\n"
10841
"may conflict with the current state of your working tree. "
10842
msgstr ""
10843
10844
#: en/help_topics/conflict-types.txt:8
10845
msgid ""
10846
"When conflicts are present in your working tree (as shown by ``bzr\n"
10847
"conflicts``), you should resolve them and then inform bzr that the "
10848
"conflicts\n"
10849
"have been resolved."
10850
msgstr ""
10851
10852
#: en/help_topics/conflict-types.txt:12
10853
msgid ""
10854
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10855
"should resolve them is not the one responsible for their occurrence, as is "
10856
"the\n"
10857
"case when merging other people's work or because some conflicts are "
10858
"presented\n"
10859
"in a way that is not easy to understand."
10860
msgstr ""
10861
10862
#: en/help_topics/conflict-types.txt:17
10863
msgid ""
10864
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10865
"conflict if and only if there's an actual conceptual conflict in the source\n"
10866
"tree. Because Bazaar doesn't understand the real meaning of the files "
10867
"being\n"
10868
"versioned, it can, when faced with ambiguities, fall short in either "
10869
"direction\n"
10870
"trying to resolve the conflict itself. Many kinds of changes can be "
10871
"combined\n"
10872
"programmatically, but sometimes only a human can determine the right thing "
10873
"to\n"
10874
"do."
10875
msgstr ""
10876
10877
#: en/help_topics/conflict-types.txt:25
10878
msgid ""
10879
"When Bazaar generates a conflict, it adds information into the working tree "
10880
"to\n"
10881
"present the conflicting versions, and it's up to you to find the correct\n"
10882
"resolution."
10883
msgstr ""
10884
10885
#: en/help_topics/conflict-types.txt:29
10886
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10887
msgstr ""
10888
10889
#: en/help_topics/conflict-types.txt:31
10890
msgid ""
10891
"1. Modify the working tree content so that the conflicted item is now in "
10892
"the\n"
10893
" state you want to keep, then"
10894
msgstr ""
10895
10896
#: en/help_topics/conflict-types.txt:34
10897
msgid ""
10898
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10899
" remaining generated information (``bzr resolve <item>``)."
10900
msgstr ""
10901
10902
#: en/help_topics/conflict-types.txt:37
10903
msgid ""
10904
"For most conflict types, there are some obvious ways to modify the working\n"
10905
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10906
"itself already made a choice, when possible."
10907
msgstr ""
10908
10909
#: en/help_topics/conflict-types.txt:41
10910
msgid ""
10911
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10912
"different ways to resolve the conflict."
10913
msgstr ""
10914
10915
#: en/help_topics/conflict-types.txt:44
10916
msgid ""
10917
"Each type of conflict is explained below, and the action which must be done "
10918
"to\n"
10919
"resolve the conflict is outlined."
10920
msgstr ""
10921
10922
#: en/help_topics/conflict-types.txt:47
10923
msgid ""
10924
"Various actions are available depending on the kind of conflict, for some "
10925
"of\n"
10926
"these actions, Bazaar can provide some help. In the end you should at least\n"
10927
"inform Bazaar that you're done with the conflict with::"
10928
msgstr ""
10929
10930
#: en/help_topics/conflict-types.txt:51
10931
msgid " ``bzr resolve FILE --action=done'"
10932
msgstr ""
10933
10934
#: en/help_topics/conflict-types.txt:53
10935
msgid ""
10936
"Note that this is the default action when a single file is involved so you "
10937
"can\n"
10938
"simply use::"
10939
msgstr ""
10940
10941
#: en/help_topics/conflict-types.txt:56
10942
msgid " ``bzr resolve FILE``"
10943
msgstr ""
10944
10945
#: en/help_topics/conflict-types.txt:58
10946
msgid "See ``bzr help resolve`` for more details."
10947
msgstr ""
10948
10949
#: en/help_topics/conflict-types.txt:60
10950
msgid ""
10951
"Text conflicts\n"
10952
"--------------"
10953
msgstr ""
10954
10955
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10956
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10957
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10958
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10959
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10960
msgid "Typical message::"
10961
msgstr ""
10962
10963
#: en/help_topics/conflict-types.txt:65
10964
msgid " Text conflict in FILE"
10965
msgstr ""
10966
10967
#: en/help_topics/conflict-types.txt:67
10968
msgid ""
10969
"These are produced when a text merge cannot completely reconcile two sets "
10970
"of\n"
10971
"text changes. Bazaar will emit files for each version with the extensions\n"
10972
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10973
"tree,\n"
10974
"i.e. the tree that you are merging changes into. OTHER is the version that "
10975
"you\n"
10976
"are merging into the target. BASE is an older version that is used as a "
10977
"basis\n"
10978
"for comparison."
10979
msgstr ""
10980
10981
#: en/help_topics/conflict-types.txt:74
10982
msgid ""
10983
"In the main copy of the file, Bazaar will include all the changes that it\n"
10984
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10985
"\"herringbone\" markers like ``<<<<<<<``."
10986
msgstr ""
10987
10988
#: en/help_topics/conflict-types.txt:78
10989
msgid ""
10990
"Say the initial text is \"The project leader released it.\", and THIS "
10991
"modifies it\n"
10992
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10993
"leader\n"
10994
"released Bazaar.\" A conflict would look like this::"
10995
msgstr ""
10996
10997
#: en/help_topics/conflict-types.txt:82
10998
msgid ""
10999
" <<<<<<< TREE\n"
11000
" Martin Pool released it.\n"
11001
" =======\n"
11002
" The project leader released Bazaar.\n"
11003
" >>>>>>> MERGE-SOURCE"
11004
msgstr ""
11005
11006
#: en/help_topics/conflict-types.txt:88
11007
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11008
msgstr ""
11009
11010
#: en/help_topics/conflict-types.txt:90
11011
msgid ""
11012
"You can handle text conflicts either by editing the main copy of the file,\n"
11013
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
11014
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11015
"set of changes over the other (but see below when you encounter these\n"
11016
"cases). More often, the two sets of changes must be intelligently combined."
11017
msgstr ""
11018
11019
#: en/help_topics/conflict-types.txt:96
11020
msgid ""
11021
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
11022
"you are done editing, the file should look like it never had a conflict, and "
11023
"be\n"
11024
"ready to commit."
11025
msgstr ""
11026
11027
#: en/help_topics/conflict-types.txt:100
11028
msgid ""
11029
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
11030
"Bazaar will auto-detect which conflicts you have resolved."
11031
msgstr ""
11032
11033
#: en/help_topics/conflict-types.txt:103
11034
msgid ""
11035
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11036
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11037
"working tree."
11038
msgstr ""
11039
11040
#: en/help_topics/conflict-types.txt:107
11041
msgid ""
11042
"\n"
11043
"When you want to pick one set of changes over the other, you can use ``bzr\n"
11044
"resolve`` with one of the following actions:"
11045
msgstr ""
11046
11047
#: en/help_topics/conflict-types.txt:111
11048
msgid ""
11049
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11050
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11051
msgstr ""
11052
11053
#: en/help_topics/conflict-types.txt:114
11054
msgid ""
11055
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11056
"modifications will be taken into account."
11057
msgstr ""
11058
11059
#: en/help_topics/conflict-types.txt:117
11060
msgid ""
11061
"Content conflicts\n"
11062
"-----------------"
11063
msgstr ""
11064
11065
#: en/help_topics/conflict-types.txt:122
11066
msgid " Contents conflict in FILE"
11067
msgstr ""
11068
11069
#: en/help_topics/conflict-types.txt:124
11070
msgid ""
11071
"This conflict happens when there are conflicting changes in the working "
11072
"tree\n"
11073
"and the merge source, but the conflicted items are not text files. They "
11074
"may\n"
11075
"be binary files, or symlinks, or directories. It can even happen with "
11076
"files\n"
11077
"that are deleted on one side, and modified on the other."
11078
msgstr ""
11079
11080
#: en/help_topics/conflict-types.txt:129
11081
msgid ""
11082
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
11083
"be\n"
11084
"regular files, symlinks or directories). But it will not include a \"main "
11085
"copy\"\n"
11086
"of the file with herringbone conflict markers. It will appear that the "
11087
"\"main\n"
11088
"copy\" has been renamed to THIS or OTHER."
11089
msgstr ""
11090
11091
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11092
msgid ""
11093
"To resolve that kind of conflict, you should rebuild FILE from either "
11094
"version\n"
11095
"or a combination of both."
11096
msgstr ""
11097
11098
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11099
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11100
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11101
#: en/help_topics/conflict-types.txt:361
11102
msgid "``bzr resolve`` recognizes the following actions:"
11103
msgstr ""
11104
11105
#: en/help_topics/conflict-types.txt:139
11106
msgid ""
11107
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
11108
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11109
"* ``--action=done`` will just mark the conflict as resolved."
11110
msgstr ""
11111
11112
#: en/help_topics/conflict-types.txt:143
11113
msgid ""
11114
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11115
"and\n"
11116
"``.OTHER`` files if they are still present in the working tree."
11117
msgstr ""
11118
11119
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11120
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11121
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11122
#: en/help_topics/conflict-types.txt:369
11123
msgid ""
11124
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11125
msgstr ""
11126
11127
#: en/help_topics/conflict-types.txt:148
11128
msgid ""
11129
"Tag conflicts\n"
11130
"-------------"
11131
msgstr ""
11132
11133
#: en/help_topics/conflict-types.txt:153
11134
msgid ""
11135
" Conflicting tags:\n"
11136
" version-0.1"
11137
msgstr ""
11138
11139
#: en/help_topics/conflict-types.txt:156
11140
msgid ""
11141
"When pulling from or pushing to another branch, Bazaar informs you about "
11142
"tags\n"
11143
"that conflict between the two branches; that is the same tag points to two\n"
11144
"different revisions. You need not resolve these conflicts, but subsequent\n"
11145
"uses of pull or push will result in the same message."
11146
msgstr ""
11147
11148
#: en/help_topics/conflict-types.txt:161
11149
msgid ""
11150
"To resolve the conflict, you must apply the correct tags to either the "
11151
"target\n"
11152
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11153
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11154
"target branch's tags match the source branch, then in the target branch do\n"
11155
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11156
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11157
"source\n"
11158
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11159
"favor of the target branch, you need to similarly use ``tag --force`` in "
11160
"the\n"
11161
"source branch. (Note that pulling or pushing using --overwrite will "
11162
"overwrite\n"
11163
"all tags as well.)"
11164
msgstr ""
11165
11166
#: en/help_topics/conflict-types.txt:172
11167
msgid ""
11168
"Duplicate paths\n"
11169
"---------------"
11170
msgstr ""
11171
11172
#: en/help_topics/conflict-types.txt:177
11173
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11174
msgstr ""
11175
11176
#: en/help_topics/conflict-types.txt:179
11177
msgid ""
11178
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11179
"already been used. The existing file will be renamed to \"FILE.moved\". "
11180
msgstr ""
11181
11182
#: en/help_topics/conflict-types.txt:187
11183
msgid ""
11184
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11185
"FILE``,\n"
11186
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11187
"* ``--action=done`` will just mark the conflict as resolved."
11188
msgstr ""
11189
11190
#: en/help_topics/conflict-types.txt:191
11191
msgid ""
11192
"Note that you must get rid of FILE.moved before using ``--action=done``."
11193
msgstr ""
11194
11195
#: en/help_topics/conflict-types.txt:195
11196
msgid ""
11197
"Unversioned parent\n"
11198
"------------------"
11199
msgstr ""
11200
11201
#: en/help_topics/conflict-types.txt:200
11202
msgid ""
11203
" Conflict because FILE is not versioned, but has versioned children."
11204
msgstr ""
11205
11206
#: en/help_topics/conflict-types.txt:202
11207
msgid ""
11208
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11209
"not\n"
11210
"versioned. This happens when the directory has been deleted in the target,\n"
11211
"but has a new child in the source, or vice versa. In this situation, "
11212
"Bazaar\n"
11213
"will version the parent directory as well. Resolving this issue depends\n"
11214
"very much on the particular scenario. You may wish to rename or delete "
11215
"either\n"
11216
"the file or the directory. When you are satisfied, you can run \"bzr "
11217
"resolve\n"
11218
"FILE\" to mark the conflict as resolved."
11219
msgstr ""
11220
11221
#: en/help_topics/conflict-types.txt:210
11222
msgid ""
11223
"Missing parent\n"
11224
"--------------"
11225
msgstr ""
11226
11227
#: en/help_topics/conflict-types.txt:215
11228
msgid " Conflict adding files to FILE. Created directory."
11229
msgstr ""
11230
11231
#: en/help_topics/conflict-types.txt:217
11232
msgid ""
11233
"This happens when a directory has been deleted in the target, but has new\n"
11234
"children in the source. This is similar to the \"unversioned parent\" "
11235
"conflict,\n"
11236
"except that the parent directory does not *exist*, instead of just being\n"
11237
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11238
"Resolving this issue depends very much on the particular scenario."
11239
msgstr ""
11240
11241
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11242
msgid ""
11243
"To resolve that kind of conflict, you should either remove or rename the\n"
11244
"children or the directory or a combination of both."
11245
msgstr ""
11246
11247
#: en/help_topics/conflict-types.txt:228
11248
msgid ""
11249
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11250
" children,\n"
11251
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11252
"children\n"
11253
" and restoring the directory,\n"
11254
"* ``--action=done`` will just mark the conflict as resolved."
11255
msgstr ""
11256
11257
#: en/help_topics/conflict-types.txt:236
11258
msgid ""
11259
"Deleting parent\n"
11260
"---------------"
11261
msgstr ""
11262
11263
#: en/help_topics/conflict-types.txt:241
11264
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11265
msgstr ""
11266
11267
#: en/help_topics/conflict-types.txt:243
11268
msgid ""
11269
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11270
"source, but has new children in the target (either because a directory\n"
11271
"deletion is merged or because the merge introduce new children). Bazaar\n"
11272
"will retain the directory. Resolving this issue depends very much on the\n"
11273
"particular scenario."
11274
msgstr ""
11275
11276
#: en/help_topics/conflict-types.txt:254
11277
msgid ""
11278
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11279
"directory,"
11280
msgstr ""
11281
11282
#: en/help_topics/conflict-types.txt:256
11283
msgid ""
11284
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11285
" children,"
11286
msgstr ""
11287
11288
#: en/help_topics/conflict-types.txt:259
11289
msgid "* ``--action=done`` will just mark the conflict as resolved."
11290
msgstr ""
11291
11292
#: en/help_topics/conflict-types.txt:261
11293
msgid ""
11294
"Note that when merging a directory deletion, if unversioned files are\n"
11295
"present, they become potential orphans has they don't have a directory\n"
11296
"parent anymore."
11297
msgstr ""
11298
11299
#: en/help_topics/conflict-types.txt:265
11300
msgid ""
11301
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11302
"setting the ``bzr.transform.orphan_policy`` configuration option."
11303
msgstr ""
11304
11305
#: en/help_topics/conflict-types.txt:268
11306
msgid "There are two possible values for this option:"
11307
msgstr ""
11308
11309
#: en/help_topics/conflict-types.txt:270
11310
msgid ""
11311
"* ``conflict`` (the default): will leave the orphans in place and\n"
11312
" generate a conflicts,"
11313
msgstr ""
11314
11315
#: en/help_topics/conflict-types.txt:273
11316
msgid ""
11317
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11318
"root\n"
11319
" of the working tree with names like ``<file>.~#~``."
11320
msgstr ""
11321
11322
#: en/help_topics/conflict-types.txt:278
11323
msgid ""
11324
"Path conflict\n"
11325
"-------------"
11326
msgstr ""
11327
11328
#: en/help_topics/conflict-types.txt:283
11329
msgid " Path conflict: PATH1 / PATH2"
11330
msgstr ""
11331
11332
#: en/help_topics/conflict-types.txt:285
11333
msgid ""
11334
"This happens when the source and target have each modified the name or "
11335
"parent\n"
11336
"directory of a file. Bazaar will use the path elements from the source."
11337
msgstr ""
11338
11339
#: en/help_topics/conflict-types.txt:288
11340
msgid ""
11341
"To resolve that kind of conflict, you just have to decide what name should "
11342
"be\n"
11343
"retained for the file involved."
11344
msgstr ""
11345
11346
#: en/help_topics/conflict-types.txt:293
11347
msgid ""
11348
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11349
" issuing ``bzr mv PATH2 PATH1``,\n"
11350
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11351
"``PATH2``,\n"
11352
"* ``--action=done`` will just mark the conflict as resolved."
11353
msgstr ""
11354
11355
#: en/help_topics/conflict-types.txt:300
11356
msgid ""
11357
"Parent loop\n"
11358
"-----------"
11359
msgstr ""
11360
11361
#: en/help_topics/conflict-types.txt:305
11362
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11363
msgstr ""
11364
11365
#: en/help_topics/conflict-types.txt:307
11366
msgid ""
11367
"This happens when the source and the target have each moved directories, so\n"
11368
"that, if the change could be applied, a directory would be contained by "
11369
"itself.\n"
11370
"For example::"
11371
msgstr ""
11372
11373
#: en/help_topics/conflict-types.txt:311
11374
msgid ""
11375
" $ bzr init\n"
11376
" $ bzr mkdir white\n"
11377
" $ bzr mkdir black\n"
11378
" $ bzr commit -m \"BASE\"\n"
11379
" $ bzr branch . ../other\n"
11380
" $ bzr mv white black\n"
11381
" $ bzr commit -m \"THIS\"\n"
11382
" $ bzr mv ../other/black ../other/white\n"
11383
" $ bzr commit ../other -m \"OTHER\"\n"
11384
" $ bzr merge ../other"
11385
msgstr ""
11386
11387
#: en/help_topics/conflict-types.txt:322
11388
msgid ""
11389
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11390
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11391
"name should be retained for the directories involved."
11392
msgstr ""
11393
11394
#: en/help_topics/conflict-types.txt:328
11395
msgid ""
11396
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11397
"\n"
11398
" in ``black``,\n"
11399
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11400
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11401
"* ``--action=done`` will just mark the conflict as resolved."
11402
msgstr ""
11403
11404
#: en/help_topics/conflict-types.txt:336
11405
msgid ""
11406
"Non-directory parent\n"
11407
"--------------------"
11408
msgstr ""
11409
11410
#: en/help_topics/conflict-types.txt:341
11411
msgid ""
11412
" Conflict: foo.new is not a directory, but has files in it.\n"
11413
" Created directory."
11414
msgstr ""
11415
11416
#: en/help_topics/conflict-types.txt:344
11417
msgid ""
11418
"This happens when one side has added files to a directory, and the other "
11419
"side\n"
11420
"has changed the directory into a file or symlink. For example::"
11421
msgstr ""
11422
11423
#: en/help_topics/conflict-types.txt:347
11424
msgid ""
11425
" $ bzr init\n"
11426
" $ bzr mkdir foo\n"
11427
" $ bzr commit -m \"BASE\"\n"
11428
" $ bzr branch . ../other\n"
11429
" $ rmdir foo\n"
11430
" $ touch foo\n"
11431
" $ bzr commit -m \"THIS\"\n"
11432
" $ bzr mkdir ../other/foo/bar\n"
11433
" $ bzr commit ../other -m \"OTHER\"\n"
11434
" $ bzr merge ../other"
11435
msgstr ""
11436
11437
#: en/help_topics/conflict-types.txt:358
11438
msgid ""
11439
"To resolve that kind of conflict, you have to decide what name should be\n"
11440
"retained for the file, directory or symlink involved."
11441
msgstr ""
11442
11443
#: en/help_topics/conflict-types.txt:363
11444
msgid ""
11445
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11446
" ``bzr add foo``,\n"
11447
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11448
" ``bzr mv foo.new foo``,\n"
11449
"* ``--action=done`` will just mark the conflict as resolved."
11450
msgstr ""
11451
11452
#: en/help_topics/conflict-types.txt:371
11453
msgid ""
11454
"MalformedTransform\n"
11455
"------------------"
11456
msgstr ""
11457
11458
#: en/help_topics/conflict-types.txt:374
11459
msgid ""
11460
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11461
"exception. This means that Bazaar encountered a filesystem conflict that it "
11462
"was\n"
11463
"unable to resolve. This usually indicates a bug. Please let us know if "
11464
"you\n"
11465
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11466
msgstr ""
11467
11468
#: en/help_topics/content-filters.txt:1
11469
msgid ""
11470
"Content Filters\n"
11471
"==============="
11472
msgstr ""
11473
11474
#: en/help_topics/content-filters.txt:4
11475
msgid ""
11476
"Content formats\n"
11477
"---------------"
11478
msgstr ""
11479
11480
#: en/help_topics/content-filters.txt:7
11481
msgid ""
11482
"Bazaar's content filtering allows you to store files in a different\n"
11483
"format from the copy in your working tree. This lets you, or your\n"
11484
"co-developers, use Windows development tools that expect CRLF files\n"
11485
"on projects that use other line-ending conventions. Among other things,\n"
11486
"content filters also let Unix developers more easily work on projects\n"
11487
"using Windows line-ending conventions, keyword expansion/compression,\n"
11488
"and trailing spaces on lines in text files to be implicitly stripped\n"
11489
"when committed."
11490
msgstr ""
11491
11492
#: en/help_topics/content-filters.txt:16
11493
msgid "To generalize, there are two content formats supported by Bazaar:"
11494
msgstr ""
11495
11496
#: en/help_topics/content-filters.txt:18
11497
msgid ""
11498
"* a canonical format - how files are stored internally\n"
11499
"* a convenience format - how files are created in a working tree."
11500
msgstr ""
11501
11502
#: en/help_topics/content-filters.txt:21
11503
msgid ""
11504
"\n"
11505
"Format conversion\n"
11506
"-----------------"
11507
msgstr ""
11508
11509
#: en/help_topics/content-filters.txt:25
11510
msgid ""
11511
"The conversion between these formats is done by content filters.\n"
11512
"A content filter has two parts:"
11513
msgstr ""
11514
11515
#: en/help_topics/content-filters.txt:28
11516
msgid ""
11517
"* a read converter - converts from convenience to canonical format\n"
11518
"* a write converter - converts from canonical to convenience format."
11519
msgstr ""
11520
11521
#: en/help_topics/content-filters.txt:31
11522
msgid ""
11523
"Many of these converters will provide *round-trip* conversion,\n"
11524
"i.e. applying the read converter followed by the write converter\n"
11525
"gives back the original content. However, others may provide an\n"
11526
"asymmetric conversion. For example, a read converter might strip\n"
11527
"trailing whitespace off lines in source code while the matching\n"
11528
"write converter might pass content through unchanged."
11529
msgstr ""
11530
11531
#: en/help_topics/content-filters.txt:38
11532
msgid ""
11533
"\n"
11534
"Enabling content filters\n"
11535
"------------------------"
11536
msgstr ""
11537
11538
#: en/help_topics/content-filters.txt:42
11539
msgid ""
11540
"Content filters are typically provided by plugins, so the first step\n"
11541
"in using them is to install the relevant plugins and read their\n"
11542
"documentation. Some plugins may be very specific about which files\n"
11543
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11544
"In other cases, the plugin may leave it in the user's hands to\n"
11545
"define which files are to be filtered. This is typically done\n"
11546
"using rule-based preferences. See ``bzr help rules`` for general\n"
11547
"information about defining these."
11548
msgstr ""
11549
11550
#: en/help_topics/content-filters.txt:51
11551
msgid ""
11552
"\n"
11553
"Impact on commands\n"
11554
"------------------"
11555
msgstr ""
11556
11557
#: en/help_topics/content-filters.txt:55
11558
msgid ""
11559
"Read converters are only applied to commands that read content from\n"
11560
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11561
"will apply read converters to files in the working tree, then compare\n"
11562
"the results to the content last committed."
11563
msgstr ""
11564
11565
#: en/help_topics/content-filters.txt:60
11566
msgid ""
11567
"Write converters are only applied by commands that **create files in a\n"
11568
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11569
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11570
"respectively."
11571
msgstr ""
11572
11573
#: en/help_topics/content-filters.txt:65
11574
msgid ""
11575
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11576
"comitting files. If this makes sense for a given plugin providing\n"
11577
"a content filter, the plugin can usually achieve this effect by using a\n"
11578
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11579
"for more information on hooks."
11580
msgstr ""
11581
11582
#: en/help_topics/content-filters.txt:71
11583
msgid ""
11584
"\n"
11585
"Refreshing your working tree\n"
11586
"----------------------------"
11587
msgstr ""
11588
11589
#: en/help_topics/content-filters.txt:75
11590
msgid ""
11591
"For performance reasons, Bazaar caches the timestamps of files in\n"
11592
"a working tree, and assumes files are unchanged if their timestamps\n"
11593
"match the cached values. As a consequence, there are times when\n"
11594
"you may need to explicitly ask for content filtering to be reapplied\n"
11595
"in one or both directions, e.g. after installing or reconfiguring\n"
11596
"plugins providing it."
11597
msgstr ""
11598
11599
#: en/help_topics/content-filters.txt:82
11600
msgid "Here are some general guidelines for doing this:"
11601
msgstr ""
11602
11603
#: en/help_topics/content-filters.txt:84
11604
msgid ""
11605
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11606
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11607
" relevant read converters and compare the end result with the\n"
11608
" canonical format."
11609
msgstr ""
11610
11611
#: en/help_topics/content-filters.txt:89
11612
msgid ""
11613
" * To reapply write converters, ensure there are no local changes,\n"
11614
" delete the relevant files and run ``bzr revert`` on those files."
11615
msgstr ""
11616
11617
#: en/help_topics/content-filters.txt:92
11618
msgid ""
11619
"Note: In the future, it is likely that additional options will be added\n"
11620
"to commands to make this refreshing process faster and safer.\n"
11621
msgstr ""
11622
11623
#: en/help_topics/current-formats.txt:1
11624
msgid "Current Storage Formats"
11625
msgstr ""
11626
11627
#: en/help_topics/current-formats.txt:3
11628
msgid ""
11629
":2a:\n"
11630
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11631
" compress storage. Provides rich roots which are a one-way\n"
11632
" transition."
11633
msgstr ""
11634
11635
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11636
msgid ""
11637
"\n"
11638
"See :doc:`formats-help` for more about storage formats."
11639
msgstr ""
11640
11641
#: en/help_topics/debug-flags.txt:1
11642
msgid ""
11643
"Debug Flags\n"
11644
"==========="
11645
msgstr ""
11646
11647
#: en/help_topics/debug-flags.txt:4
11648
msgid ""
11649
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11650
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11651
msgstr ""
11652
11653
#: en/help_topics/debug-flags.txt:7
11654
msgid ""
11655
"-Dauth Trace authentication sections used.\n"
11656
"-Dbytes Print out how many bytes were transferred\n"
11657
"-Ddirstate Trace dirstate activity (verbose!)\n"
11658
"-Derror Instead of normal error handling, always print a "
11659
"traceback\n"
11660
" on error.\n"
11661
"-Devil Capture call sites that do expensive or badly-scaling\n"
11662
" operations.\n"
11663
"-Dfetch Trace history copying between repositories.\n"
11664
"-Dfilters Emit information for debugging content filtering.\n"
11665
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11666
"fetch.\n"
11667
"-Dgraph Trace graph traversal.\n"
11668
"-Dhashcache Log every time a working file is read to determine its "
11669
"hash.\n"
11670
"-Dhooks Trace hook execution.\n"
11671
"-Dhpss Trace smart protocol requests and responses.\n"
11672
"-Dhpssdetail More hpss details.\n"
11673
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11674
"-Dhttp Trace http connections, requests and responses.\n"
11675
"-Dindex Trace major index operations.\n"
11676
"-Dknit Trace knit operations.\n"
11677
"-Dlock Trace when lockdir locks are taken or released.\n"
11678
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11679
" retrying the request.\n"
11680
"-Dprogress Trace progress bar operations.\n"
11681
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11682
"-Dmerge Emit information for debugging merges.\n"
11683
"-Dno_apport Don't use apport to report crashes.\n"
11684
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11685
"-Dpack Emit information about pack operations.\n"
11686
"-Drelock Emit a message every time a branch or repository object "
11687
"is\n"
11688
" unlocked then relocked the same way.\n"
11689
"-Dsftp Trace SFTP internals.\n"
11690
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11691
"expected\n"
11692
"-Dstream Trace fetch streams.\n"
11693
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11694
"portable\n"
11695
" manner.\n"
11696
"-Dunlock Some errors during unlock are treated as warnings.\n"
11697
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11698
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11699
"appropriate\n"
11700
" for the format, even for non-local fetches.\n"
11701
msgstr ""
11702
11703
#: en/help_topics/diverged-branches.txt:1
11704
msgid ""
11705
"Diverged Branches\n"
11706
"================="
11707
msgstr ""
11708
11709
#: en/help_topics/diverged-branches.txt:4
11710
msgid ""
11711
"When Bazaar tries to push one branch onto another, it requires that the\n"
11712
"destination branch must be ready to receive the source branch. If this "
11713
"isn't\n"
11714
"the case, then we say that the branches have ``diverged``. Branches are\n"
11715
"considered diverged if the destination branch's most recent commit is one "
11716
"that\n"
11717
"has not been merged (directly or indirectly) by the source branch. To "
11718
"recover\n"
11719
"from diverged branches, one must merge the missing revisions into the "
11720
"source\n"
11721
"branch."
11722
msgstr ""
11723
11724
#: en/help_topics/diverged-branches.txt:12
11725
msgid ""
11726
"This situation commonly arises when using a centralized workflow with local\n"
11727
"commits. If someone else has committed new work to the mainline since your\n"
11728
"last pull and you have local commits that have not yet been pushed to the\n"
11729
"mainline, then your local branch and the mainline have diverged."
11730
msgstr ""
11731
11732
#: en/help_topics/diverged-branches.txt:17
11733
msgid ""
11734
"Discovering What Has Diverged\n"
11735
"-----------------------------"
11736
msgstr ""
11737
11738
#: en/help_topics/diverged-branches.txt:20
11739
msgid ""
11740
"The ``bzr missing`` command is used to find out what revisions are in "
11741
"another\n"
11742
"branch that are not present in the current branch, and vice-versa. It shows "
11743
"a\n"
11744
"summary of which extra revisions exist in each branch. If you want to see "
11745
"the\n"
11746
"precise effects of those revisions, you can use ``bzr diff --"
11747
"old=other_branch``\n"
11748
"to show the differences between other_branch and your current branch."
11749
msgstr ""
11750
11751
#: en/help_topics/diverged-branches.txt:26
11752
msgid ""
11753
"A Solution\n"
11754
"----------"
11755
msgstr ""
11756
11757
#: en/help_topics/diverged-branches.txt:29
11758
msgid ""
11759
"The solution is to merge the revisions from the mainline into your local\n"
11760
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11761
"mainline. This merge may result in conflicts if the other developer's "
11762
"changes\n"
11763
"overlap with your changes. These conflicts should be resolved before\n"
11764
"continuing. After any conflicts have been resolved, or even if there were "
11765
"no\n"
11766
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11767
"to your local branch. This requirement gives you an opportunity to test "
11768
"the\n"
11769
"resulting working tree for correctness, since the merged revisions could "
11770
"have\n"
11771
"made arbitrary changes. After testing, you should commit the merge using\n"
11772
"``bzr commit``. This clears up the diverged branches situation. Your "
11773
"local\n"
11774
"branch can now be pushed to the mainline.\n"
11775
msgstr ""
11776
11777
#: en/help_topics/eol.txt:1
11778
msgid ""
11779
"End of Line Conversion\n"
11780
"======================"
11781
msgstr ""
11782
11783
#: en/help_topics/eol.txt:4
11784
msgid ""
11785
"EOL conversion is provided as a content filter where Bazaar internally\n"
11786
"stores a canonical format but outputs a convenience format. See\n"
11787
"``bzr help content-filters`` for general information about using these."
11788
msgstr ""
11789
11790
#: en/help_topics/eol.txt:8
11791
msgid ""
11792
"Note: Content filtering is only supported in recently added formats,\n"
11793
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11794
"in a recent format. (Just setting the format on the repository\n"
11795
"is not enough.) If content filtering does not appear to be working, use\n"
11796
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11797
"or later."
11798
msgstr ""
11799
11800
#: en/help_topics/eol.txt:15
11801
msgid ""
11802
"EOL conversion needs to be enabled for selected file patterns using\n"
11803
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11804
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11805
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11806
"supported in a future verison of Bazaar."
11807
msgstr ""
11808
11809
#: en/help_topics/eol.txt:21
11810
msgid ""
11811
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11812
"(If a value is not set, ``exact`` is the default.)"
11813
msgstr ""
11814
11815
#: en/help_topics/eol.txt:24
11816
msgid ""
11817
" ========== ===================================== ======================\n"
11818
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11819
" ========== ===================================== ======================\n"
11820
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11821
" ---------- ------------------------------------- ----------------------\n"
11822
" ``lf`` ``lf`` ``lf``\n"
11823
" ---------- ------------------------------------- ----------------------\n"
11824
" ``crlf`` ``crlf`` ``lf``\n"
11825
" ---------- ------------------------------------- ----------------------\n"
11826
" ``exact`` No conversion Exactly as in file\n"
11827
" ========== ===================================== ======================"
11828
msgstr ""
11829
11830
#: en/help_topics/eol.txt:36
11831
msgid ""
11832
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11833
"byte is detected in the file."
11834
msgstr ""
11835
11836
#: en/help_topics/eol.txt:39
11837
msgid ""
11838
"For users working on a cross-platform project, here is a suggested rule\n"
11839
"to use as a starting point::"
11840
msgstr ""
11841
11842
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11843
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11844
msgid ""
11845
" [name *]\n"
11846
" eol = native"
11847
msgstr ""
11848
11849
#: en/help_topics/eol.txt:45
11850
msgid ""
11851
"If you have binary files that do not contain a null byte though, be\n"
11852
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11853
"by giving more explicit patterns earlier in the rules file. For example::"
11854
msgstr ""
11855
11856
#: en/help_topics/eol.txt:49
11857
msgid ""
11858
" [name *.png]\n"
11859
" eol = exact"
11860
msgstr ""
11861
11862
#: en/help_topics/eol.txt:55
11863
msgid ""
11864
"If your working tree is on a network drive shared by users on different\n"
11865
"operating systems, you typically want to force certain conventions for\n"
11866
"certain files. In that way, if a file is created with the wrong line\n"
11867
"endings or line endings get mixed during editing, it gets committed\n"
11868
"correctly and gets checked out correctly. For example::"
11869
msgstr ""
11870
11871
#: en/help_topics/eol.txt:61
11872
msgid ""
11873
" [name *.bat]\n"
11874
" eol = crlf"
11875
msgstr ""
11876
11877
#: en/help_topics/eol.txt:64
11878
msgid ""
11879
" [name *.sh]\n"
11880
" eol = lf"
11881
msgstr ""
11882
11883
#: en/help_topics/eol.txt:70
11884
msgid ""
11885
"If you take the care to create files with their required endings, you can\n"
11886
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11887
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11888
"introducing mixed line endings will be corrected during commit for files\n"
11889
"with those settings."
11890
msgstr ""
11891
11892
#: en/help_topics/eol.txt:76
11893
msgid ""
11894
"If you have sample test data that deliberately has text files with mixed\n"
11895
"newline conventions, you can ask for those to be left alone like this::"
11896
msgstr ""
11897
11898
#: en/help_topics/eol.txt:79
11899
msgid ""
11900
" [name test_data/]\n"
11901
" eol = exact"
11902
msgstr ""
11903
11904
#: en/help_topics/eol.txt:85
11905
msgid ""
11906
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11907
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11908
"of content analysis to detect binary files for commands like ``diff``.\n"
11909
"In the future, a ``binary = true`` rule may be added but it is not\n"
11910
"supported yet.)"
11911
msgstr ""
11912
11913
#: en/help_topics/eol.txt:91
11914
msgid ""
11915
"If you have an existing repository with text files already stored using\n"
11916
"Windows newline conventions (``crlf``), then you may want to keep using "
11917
"that\n"
11918
"convention in the repository. Forcing certain files to this convention\n"
11919
"may also help users who do not have rules configured. To do this, set\n"
11920
"``eol`` to one of the values below."
11921
msgstr ""
11922
11923
#: en/help_topics/eol.txt:97
11924
msgid ""
11925
" ============================ ======================== "
11926
"======================\n"
11927
" Value Checkout end-of-lines as Commit end-of-lines "
11928
"as\n"
11929
" ============================ ======================== "
11930
"======================\n"
11931
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11932
" ``lf`` otherwise\n"
11933
" ---------------------------- ------------------------ ----------------------"
11934
"\n"
11935
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11936
" ---------------------------- ------------------------ ----------------------"
11937
"\n"
11938
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11939
" ============================ ======================== ======================"
11940
msgstr ""
11941
11942
#: en/help_topics/eol.txt:108
11943
msgid ""
11944
"For users working on an existing project that uses Windows newline\n"
11945
"conventions in their Bazaar repository, this rule is suggested as a\n"
11946
"starting point::"
11947
msgstr ""
11948
11949
#: en/help_topics/eol.txt:112
11950
msgid ""
11951
" [name *]\n"
11952
" eol = native-with-crlf-in-repo"
11953
msgstr ""
11954
11955
#: en/help_topics/eol.txt:115
11956
msgid ""
11957
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11958
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11959
"``crlf`` and ``exact``."
11960
msgstr ""
11961
11962
#: en/help_topics/eol.txt:119
11963
msgid ""
11964
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11965
"never reject files because a given line ending or mixed line endings\n"
11966
"are found. A precommit hook should be used if you wish to validate\n"
11967
"(and not just convert) content before committing.\n"
11968
msgstr ""
11969
11970
#: en/help_topics/hidden-commands.txt:1
11971
msgid ""
11972
"added List files added in working tree.\n"
11973
"ancestry List all revisions merged into this branch.\n"
11974
"assert-fail Test reporting of assertion failures\n"
11975
"bundle-info Output interesting stats about a bundle\n"
11976
"bundle-revisions Create a merge-directive for submitting changes.\n"
11977
"cat-revision Write out metadata for a revision.\n"
11978
"dump-btree Dump the contents of a btree index file to stdout.\n"
11979
"export-pot Export command helps and error messages in po format.\n"
11980
"file-id Print file_id of a particular file or directory.\n"
11981
"file-path Print path of file_ids to a file or directory.\n"
11982
"find-merge-base Find and print a base revision for merging two "
11983
"branches.\n"
11984
"hooks Show hooks.\n"
11985
"inventory Show inventory of the current working copy or a "
11986
"revision.\n"
11987
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11988
"lookup-revision Lookup the revision-id from a revision-number\n"
11989
"merge-directive Generate a merge directive for auto-merge tools.\n"
11990
"modified List files modified in working tree.\n"
11991
"re-sign Create a digital signature for an existing revision.\n"
11992
"reference list, view and set branch locations for nested trees.\n"
11993
"relpath Show path of a file relative to root\n"
11994
"repair-workingtree Reset the working tree state file.\n"
11995
"revision-history Display the list of revision ids on a branch.\n"
11996
"revision-info Show revision number and revision id for a given "
11997
"revision\n"
11998
" identifier.\n"
11999
"rocks Statement of optimism.\n"
12000
"selftest Run internal test suite.\n"
12001
"shell-complete Show appropriate completions for context.\n"
12002
"test-script Run a shell-like test from a file.\n"
12003
"touching-revisions Return revision-ids which affected a particular file.\n"
12004
"unknowns List unknown files.\n"
12005
"wait-until-signalled Test helper for\n"
12006
" test_start_and_stop_bzr_subprocess_send_signal.\n"
12007
msgstr ""
12008
12009
#: en/help_topics/hooks.txt:1
12010
msgid ""
12011
"\n"
12012
"Hooks\n"
12013
"====="
12014
msgstr ""
12015
12016
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
12017
msgid ""
12018
"Introduction\n"
12019
"------------"
12020
msgstr ""
12021
12022
#: en/help_topics/hooks.txt:8
12023
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12024
msgstr ""
12025
12026
#: en/help_topics/hooks.txt:10
12027
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
12028
msgstr ""
12029
12030
#: en/help_topics/hooks.txt:12
12031
msgid ""
12032
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12033
msgstr ""
12034
12035
#: en/help_topics/hooks.txt:14
12036
msgid ""
12037
"The class that contains each hook is given before the hooks it supplies. "
12038
"For\n"
12039
"instance, BranchHooks as the class is the hooks class for\n"
12040
"`bzrlib.branch.Branch.hooks`."
12041
msgstr ""
12042
12043
#: en/help_topics/hooks.txt:18
12044
msgid ""
12045
"Each description also indicates whether the hook runs on the client (the\n"
12046
"machine where bzr was invoked) or the server (the machine addressed by\n"
12047
"the branch URL). These may be, but are not necessarily, the same machine."
12048
msgstr ""
12049
12050
#: en/help_topics/hooks.txt:22
12051
msgid ""
12052
"Plugins (including hooks) are run on the server if all of these is true:"
12053
msgstr ""
12054
12055
#: en/help_topics/hooks.txt:24
12056
msgid ""
12057
" * The connection is via a smart server (accessed with a URL starting with\n"
12058
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12059
"\"http://\"\n"
12060
" URL when a smart server is available via HTTP)."
12061
msgstr ""
12062
12063
#: en/help_topics/hooks.txt:28
12064
msgid ""
12065
" * The hook is either server specific or part of general infrastructure "
12066
"rather\n"
12067
" than client specific code (such as commit)."
12068
msgstr ""
12069
12070
#: en/help_topics/hooks.txt:31
12071
msgid ""
12072
"\n"
12073
"BranchHooks\n"
12074
"-----------"
12075
msgstr ""
12076
12077
#: en/help_topics/hooks.txt:35
12078
msgid ""
12079
"automatic_tag_name\n"
12080
"~~~~~~~~~~~~~~~~~~"
12081
msgstr ""
12082
12083
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12084
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
12085
msgid "Introduced in: 2.2"
12086
msgstr ""
12087
12088
#: en/help_topics/hooks.txt:40
12089
msgid ""
12090
"Called to determine an automatic tag name for a revision.\n"
12091
"automatic_tag_name is called with (branch, revision_id) and should\n"
12092
"return a tag name or None if no tag name could be determined. The\n"
12093
"first non-None tag name returned will be used."
12094
msgstr ""
12095
12096
#: en/help_topics/hooks.txt:45
12097
msgid ""
12098
"open\n"
12099
"~~~~"
12100
msgstr ""
12101
12102
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
12103
#: en/help_topics/hooks.txt:304
12104
msgid "Introduced in: 1.8"
12105
msgstr ""
12106
12107
#: en/help_topics/hooks.txt:50
12108
msgid ""
12109
"Called with the Branch object that has been opened after a branch is\n"
12110
"opened."
12111
msgstr ""
12112
12113
#: en/help_topics/hooks.txt:53
12114
msgid ""
12115
"post_branch_init\n"
12116
"~~~~~~~~~~~~~~~~"
12117
msgstr ""
12118
12119
#: en/help_topics/hooks.txt:58
12120
msgid ""
12121
"Called after new branch initialization completes. post_branch_init is\n"
12122
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12123
"branch and checkout (both heavyweight and lightweight) will all\n"
12124
"trigger this hook."
12125
msgstr ""
12126
12127
#: en/help_topics/hooks.txt:63
12128
msgid ""
12129
"post_change_branch_tip\n"
12130
"~~~~~~~~~~~~~~~~~~~~~~"
12131
msgstr ""
12132
12133
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
12134
msgid "Introduced in: 1.4"
12135
msgstr ""
12136
12137
#: en/help_topics/hooks.txt:68
12138
msgid ""
12139
"Called in bzr client and server after a change to the tip of a branch\n"
12140
"is made. post_change_branch_tip is called with a\n"
12141
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12142
"uncommit will all trigger this hook."
12143
msgstr ""
12144
12145
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12146
msgid ""
12147
"post_commit\n"
12148
"~~~~~~~~~~~"
12149
msgstr ""
12150
12151
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12152
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12153
#: en/help_topics/hooks.txt:145
12154
msgid "Introduced in: 0.15"
12155
msgstr ""
12156
12157
#: en/help_topics/hooks.txt:78
12158
msgid ""
12159
"Called in the bzr client after a commit has completed. post_commit is\n"
12160
"called with (local, master, old_revno, old_revid, new_revno,\n"
12161
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12162
"branch."
12163
msgstr ""
12164
12165
#: en/help_topics/hooks.txt:83
12166
msgid ""
12167
"post_pull\n"
12168
"~~~~~~~~~"
12169
msgstr ""
12170
12171
#: en/help_topics/hooks.txt:88
12172
msgid ""
12173
"Called after a pull operation completes. post_pull is called with a\n"
12174
"bzrlib.branch.PullResult object and only runs in the bzr client."
12175
msgstr ""
12176
12177
#: en/help_topics/hooks.txt:91
12178
msgid ""
12179
"post_push\n"
12180
"~~~~~~~~~"
12181
msgstr ""
12182
12183
#: en/help_topics/hooks.txt:96
12184
msgid ""
12185
"Called after a push operation completes. post_push is called with a\n"
12186
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12187
msgstr ""
12188
12189
#: en/help_topics/hooks.txt:99
12190
msgid ""
12191
"post_switch\n"
12192
"~~~~~~~~~~~"
12193
msgstr ""
12194
12195
#: en/help_topics/hooks.txt:104
12196
msgid ""
12197
"Called after a checkout switches branch. post_switch is called with a\n"
12198
"bzrlib.branch.SwitchHookParams."
12199
msgstr ""
12200
12201
#: en/help_topics/hooks.txt:107
12202
msgid ""
12203
"post_uncommit\n"
12204
"~~~~~~~~~~~~~"
12205
msgstr ""
12206
12207
#: en/help_topics/hooks.txt:112
12208
msgid ""
12209
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12210
"called with (local, master, old_revno, old_revid, new_revno,\n"
12211
"new_revid) where local is the local branch or None, master is the\n"
12212
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12213
"of None."
12214
msgstr ""
12215
12216
#: en/help_topics/hooks.txt:118
12217
msgid ""
12218
"pre_change_branch_tip\n"
12219
"~~~~~~~~~~~~~~~~~~~~~"
12220
msgstr ""
12221
12222
#: en/help_topics/hooks.txt:121
12223
msgid "Introduced in: 1.6"
12224
msgstr ""
12225
12226
#: en/help_topics/hooks.txt:123
12227
msgid ""
12228
"Called in bzr client and server before a change to the tip of a branch\n"
12229
"is made. pre_change_branch_tip is called with a\n"
12230
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12231
"uncommit will all trigger this hook."
12232
msgstr ""
12233
12234
#: en/help_topics/hooks.txt:128
12235
msgid ""
12236
"pre_commit\n"
12237
"~~~~~~~~~~"
12238
msgstr ""
12239
12240
#: en/help_topics/hooks.txt:131
12241
msgid "Introduced in: 0.91"
12242
msgstr ""
12243
12244
#: en/help_topics/hooks.txt:133
12245
msgid ""
12246
"Called after a commit is calculated but before it is completed.\n"
12247
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12248
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12249
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12250
"TreeDelta object describing changes from the basis revision. hooks\n"
12251
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12252
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12253
"tree."
12254
msgstr ""
12255
12256
#: en/help_topics/hooks.txt:142
12257
msgid ""
12258
"set_rh\n"
12259
"~~~~~~"
12260
msgstr ""
12261
12262
#: en/help_topics/hooks.txt:147
12263
msgid ""
12264
"Invoked whenever the revision history has been set via\n"
12265
"set_revision_history. The api signature is (branch, revision_history),\n"
12266
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12267
"for bzr to trigger, a better hook to use is\n"
12268
"Branch.post_change_branch_tip."
12269
msgstr ""
12270
12271
#: en/help_topics/hooks.txt:153
12272
msgid ""
12273
"transform_fallback_location\n"
12274
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12275
msgstr ""
12276
12277
#: en/help_topics/hooks.txt:156
12278
msgid "Introduced in: 1.9"
12279
msgstr ""
12280
12281
#: en/help_topics/hooks.txt:158
12282
msgid ""
12283
"Called when a stacked branch is activating its fallback locations.\n"
12284
"transform_fallback_location is called with (branch, url), and should\n"
12285
"return a new url. Returning the same url allows it to be used as-is,\n"
12286
"returning a different one can be used to cause the branch to stack on\n"
12287
"a closer copy of that fallback_location. Note that the branch cannot\n"
12288
"have history accessing methods called on it during this hook because\n"
12289
"the fallback locations have not been activated. When there are\n"
12290
"multiple hooks installed for transform_fallback_location, all are\n"
12291
"called with the url returned from the previous hook.The order is\n"
12292
"however undefined."
12293
msgstr ""
12294
12295
#: en/help_topics/hooks.txt:169
12296
msgid ""
12297
"CommandHooks\n"
12298
"------------"
12299
msgstr ""
12300
12301
#: en/help_topics/hooks.txt:172
12302
msgid ""
12303
"extend_command\n"
12304
"~~~~~~~~~~~~~~"
12305
msgstr ""
12306
12307
#: en/help_topics/hooks.txt:175
12308
msgid "Introduced in: 1.13"
12309
msgstr ""
12310
12311
#: en/help_topics/hooks.txt:177
12312
msgid ""
12313
"Called after creating a command object to allow modifications such as\n"
12314
"adding or removing options, docs etc. Called with the new\n"
12315
"bzrlib.commands.Command object."
12316
msgstr ""
12317
12318
#: en/help_topics/hooks.txt:181
12319
msgid ""
12320
"get_command\n"
12321
"~~~~~~~~~~~"
12322
msgstr ""
12323
12324
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12325
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
12326
msgid "Introduced in: 1.17"
12327
msgstr ""
12328
12329
#: en/help_topics/hooks.txt:186
12330
msgid ""
12331
"Called when creating a single command. Called with (cmd_or_None,\n"
12332
"command_name). get_command should either return the cmd_or_None\n"
12333
"parameter, or a replacement Command object that should be used for the\n"
12334
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12335
"Many users will prefer to use bzrlib.commands.register_command or\n"
12336
"plugin_cmds.register_lazy."
12337
msgstr ""
12338
12339
#: en/help_topics/hooks.txt:193
12340
msgid ""
12341
"get_missing_command\n"
12342
"~~~~~~~~~~~~~~~~~~~"
12343
msgstr ""
12344
12345
#: en/help_topics/hooks.txt:198
12346
msgid ""
12347
"Called when creating a single command if no command could be found.\n"
12348
"Called with (command_name). get_missing_command should either return\n"
12349
"None, or a Command object to be used for the command."
12350
msgstr ""
12351
12352
#: en/help_topics/hooks.txt:202
12353
msgid ""
12354
"list_commands\n"
12355
"~~~~~~~~~~~~~"
12356
msgstr ""
12357
12358
#: en/help_topics/hooks.txt:207
12359
msgid ""
12360
"Called when enumerating commands. Called with a set of cmd_name\n"
12361
"strings for all the commands found so far. This set is safe to mutate\n"
12362
"- e.g. to remove a command. list_commands should return the updated\n"
12363
"set of command names."
12364
msgstr ""
12365
12366
#: en/help_topics/hooks.txt:212
12367
msgid ""
12368
"_ConfigHooks\n"
12369
"------------"
12370
msgstr ""
12371
12372
#: en/help_topics/hooks.txt:215
12373
msgid ""
12374
"get\n"
12375
"~~~"
12376
msgstr ""
12377
12378
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12379
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12380
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12381
#: en/help_topics/hooks.txt:427
12382
msgid "Introduced in: 2.4"
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:220
12386
msgid ""
12387
"Invoked when a config option is read. The signature is (stack, name,\n"
12388
"value)."
12389
msgstr ""
12390
12391
#: en/help_topics/hooks.txt:223
12392
msgid ""
12393
"load\n"
12394
"~~~~"
12395
msgstr ""
12396
12397
#: en/help_topics/hooks.txt:228
12398
msgid "Invoked when a config store is loaded. The signature is (store)."
12399
msgstr ""
12400
12401
#: en/help_topics/hooks.txt:230
12402
msgid ""
12403
"remove\n"
12404
"~~~~~~"
12405
msgstr ""
12406
12407
#: en/help_topics/hooks.txt:235
12408
msgid ""
12409
"Invoked when a config option is removed. The signature is (stack,\n"
12410
"name)."
12411
msgstr ""
12412
12413
#: en/help_topics/hooks.txt:238
12414
msgid ""
12415
"save\n"
12416
"~~~~"
12417
msgstr ""
12418
12419
#: en/help_topics/hooks.txt:243
12420
msgid "Invoked when a config store is saved. The signature is (store)."
12421
msgstr ""
12422
12423
#: en/help_topics/hooks.txt:245
12424
msgid ""
12425
"set\n"
12426
"~~~"
12427
msgstr ""
12428
12429
#: en/help_topics/hooks.txt:250
12430
msgid ""
12431
"Invoked when a config option is set. The signature is (stack, name,\n"
12432
"value)."
12433
msgstr ""
12434
12435
#: en/help_topics/hooks.txt:253
12436
msgid ""
12437
"ControlDirHooks\n"
12438
"---------------"
12439
msgstr ""
12440
12441
#: en/help_topics/hooks.txt:256
12442
msgid ""
12443
"post_repo_init\n"
12444
"~~~~~~~~~~~~~~"
12445
msgstr ""
12446
12447
#: en/help_topics/hooks.txt:261
12448
msgid ""
12449
"Invoked after a repository has been initialized. post_repo_init is\n"
12450
"called with a bzrlib.controldir.RepoInitHookParams."
12451
msgstr ""
12452
12453
#: en/help_topics/hooks.txt:264
12454
msgid ""
12455
"pre_open\n"
12456
"~~~~~~~~"
12457
msgstr ""
12458
12459
#: en/help_topics/hooks.txt:267
12460
msgid "Introduced in: 1.14"
12461
msgstr ""
12462
12463
#: en/help_topics/hooks.txt:269
12464
msgid ""
12465
"Invoked before attempting to open a ControlDir with the transport that\n"
12466
"the open will use."
12467
msgstr ""
12468
12469
#: en/help_topics/hooks.txt:272
12470
msgid ""
12471
"InfoHooks\n"
12472
"---------"
12473
msgstr ""
12474
12475
#: en/help_topics/hooks.txt:275
12476
msgid ""
12477
"repository\n"
12478
"~~~~~~~~~~"
12479
msgstr ""
12480
12481
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12482
#: en/help_topics/hooks.txt:505
12483
msgid "Introduced in: 1.15"
12484
msgstr ""
12485
12486
#: en/help_topics/hooks.txt:280
12487
msgid ""
12488
"Invoked when displaying the statistics for a repository. repository is\n"
12489
"called with a statistics dictionary as returned by the repository and\n"
12490
"a file-like object to write to."
12491
msgstr ""
12492
12493
#: en/help_topics/hooks.txt:284
12494
msgid ""
12495
"LockHooks\n"
12496
"---------"
12497
msgstr ""
12498
12499
#: en/help_topics/hooks.txt:287
12500
msgid ""
12501
"lock_acquired\n"
12502
"~~~~~~~~~~~~~"
12503
msgstr ""
12504
12505
#: en/help_topics/hooks.txt:292
12506
msgid ""
12507
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12508
msgstr ""
12509
12510
#: en/help_topics/hooks.txt:294
12511
msgid ""
12512
"lock_broken\n"
12513
"~~~~~~~~~~~"
12514
msgstr ""
12515
12516
#: en/help_topics/hooks.txt:299
12517
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12518
msgstr ""
12519
12520
#: en/help_topics/hooks.txt:301
12521
msgid ""
12522
"lock_released\n"
12523
"~~~~~~~~~~~~~"
12524
msgstr ""
12525
12526
#: en/help_topics/hooks.txt:306
12527
msgid ""
12528
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12529
msgstr ""
12530
12531
#: en/help_topics/hooks.txt:308
12532
msgid ""
12533
"MergeHooks\n"
12534
"----------"
12535
msgstr ""
12536
12537
#: en/help_topics/hooks.txt:311
12538
msgid ""
12539
"merge_file_content\n"
12540
"~~~~~~~~~~~~~~~~~~"
12541
msgstr ""
12542
12543
#: en/help_topics/hooks.txt:314
12544
msgid "Introduced in: 2.1"
12545
msgstr ""
12546
12547
#: en/help_topics/hooks.txt:316
12548
msgid ""
12549
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12550
"object when starting a merge. Should return either None or a subclass\n"
12551
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12552
"called per file that needs to be merged (including when one side has\n"
12553
"deleted the file and the other has changed it). See the\n"
12554
"AbstractPerFileMerger API docs for details on how it is used by merge."
12555
msgstr ""
12556
12557
#: en/help_topics/hooks.txt:323
12558
msgid ""
12559
"post_merge\n"
12560
"~~~~~~~~~~"
12561
msgstr ""
12562
12563
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12564
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
12565
msgid "Introduced in: 2.5"
12566
msgstr ""
12567
12568
#: en/help_topics/hooks.txt:328
12569
msgid ""
12570
"Called after a merge. Receives a Merger object as the single argument.\n"
12571
"The return value is ignored."
12572
msgstr ""
12573
12574
#: en/help_topics/hooks.txt:331
12575
msgid ""
12576
"pre_merge\n"
12577
"~~~~~~~~~"
12578
msgstr ""
12579
12580
#: en/help_topics/hooks.txt:336
12581
msgid ""
12582
"Called before a merge. Receives a Merger object as the single\n"
12583
"argument."
12584
msgstr ""
12585
12586
#: en/help_topics/hooks.txt:339
12587
msgid ""
12588
"MergeDirectiveHooks\n"
12589
"-------------------"
12590
msgstr ""
12591
12592
#: en/help_topics/hooks.txt:342
12593
msgid ""
12594
"merge_request_body\n"
12595
"~~~~~~~~~~~~~~~~~~"
12596
msgstr ""
12597
12598
#: en/help_topics/hooks.txt:345
12599
msgid "Introduced in: 1.15.0"
12600
msgstr ""
12601
12602
#: en/help_topics/hooks.txt:347
12603
msgid ""
12604
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12605
"request. Callbacks must return a body. If more than one callback is\n"
12606
"registered, the output of one callback is provided to the next."
12607
msgstr ""
12608
12609
#: en/help_topics/hooks.txt:351
12610
msgid ""
12611
"MessageEditorHooks\n"
12612
"------------------"
12613
msgstr ""
12614
12615
#: en/help_topics/hooks.txt:354
12616
msgid ""
12617
"commit_message_template\n"
12618
"~~~~~~~~~~~~~~~~~~~~~~~"
12619
msgstr ""
12620
12621
#: en/help_topics/hooks.txt:357
12622
msgid "Introduced in: 1.10"
12623
msgstr ""
12624
12625
#: en/help_topics/hooks.txt:359
12626
msgid ""
12627
"Called when a commit message is being generated.\n"
12628
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12629
"and the message that is known so far. commit_message_template must\n"
12630
"return a new message to use (which could be the same as it was given).\n"
12631
"When there are multiple hooks registered for commit_message_template,\n"
12632
"they are chained with the result from the first passed into the\n"
12633
"second, and so on."
12634
msgstr ""
12635
12636
#: en/help_topics/hooks.txt:367
12637
msgid ""
12638
"set_commit_message\n"
12639
"~~~~~~~~~~~~~~~~~~"
12640
msgstr ""
12641
12642
#: en/help_topics/hooks.txt:372
12643
msgid ""
12644
"Set a fixed commit message. set_commit_message is called with the\n"
12645
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12646
"properties by editing commit.builder._revprops) and the message so\n"
12647
"far. set_commit_message must return the message to use or None if it\n"
12648
"should use the message editor as normal."
12649
msgstr ""
12650
12651
#: en/help_topics/hooks.txt:378
12652
msgid ""
12653
"MutableTreeHooks\n"
12654
"----------------"
12655
msgstr ""
12656
12657
#: en/help_topics/hooks.txt:381
12658
msgid ""
12659
"post_build_tree\n"
12660
"~~~~~~~~~~~~~~~"
12661
msgstr ""
12662
12663
#: en/help_topics/hooks.txt:386
12664
msgid ""
12665
"Called after a completely new tree is built. The hook is called with\n"
12666
"the tree as its only argument."
12667
msgstr ""
12668
12669
#: en/help_topics/hooks.txt:392
12670
msgid "Introduced in: 2.0"
12671
msgstr ""
12672
12673
#: en/help_topics/hooks.txt:394
12674
msgid ""
12675
"Called after a commit is performed on a tree. The hook is called with\n"
12676
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12677
"commit was performed on is available via the mutable_tree attribute of\n"
12678
"that object."
12679
msgstr ""
12680
12681
#: en/help_topics/hooks.txt:399
12682
msgid ""
12683
"start_commit\n"
12684
"~~~~~~~~~~~~"
12685
msgstr ""
12686
12687
#: en/help_topics/hooks.txt:404
12688
msgid ""
12689
"Called before a commit is performed on a tree. The start commit hook\n"
12690
"is able to change the tree before the commit takes place. start_commit\n"
12691
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12692
"being performed on."
12693
msgstr ""
12694
12695
#: en/help_topics/hooks.txt:409
12696
msgid ""
12697
"SmartClientHooks\n"
12698
"----------------"
12699
msgstr ""
12700
12701
#: en/help_topics/hooks.txt:412
12702
msgid ""
12703
"call\n"
12704
"~~~~"
12705
msgstr ""
12706
12707
#: en/help_topics/hooks.txt:415
12708
msgid "Introduced in: unknown"
12709
msgstr ""
12710
12711
#: en/help_topics/hooks.txt:417
12712
msgid ""
12713
"Called when the smart client is submitting a request to the smart\n"
12714
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12715
"Streaming request bodies, and responses, are not accessible."
12716
msgstr ""
12717
12718
#: en/help_topics/hooks.txt:421
12719
msgid ""
12720
"SmartServerHooks\n"
12721
"----------------"
12722
msgstr ""
12723
12724
#: en/help_topics/hooks.txt:424
12725
msgid ""
12726
"server_exception\n"
12727
"~~~~~~~~~~~~~~~~"
12728
msgstr ""
12729
12730
#: en/help_topics/hooks.txt:429
12731
msgid ""
12732
"Called by the bzr server when an exception occurs. server_exception is\n"
12733
"called with the sys.exc_info() tuple return true for the hook if the\n"
12734
"exception has been handled, in which case the server will exit\n"
12735
"normally."
12736
msgstr ""
12737
12738
#: en/help_topics/hooks.txt:434
12739
msgid ""
12740
"server_started\n"
12741
"~~~~~~~~~~~~~~"
12742
msgstr ""
12743
12744
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12745
msgid "Introduced in: 0.16"
12746
msgstr ""
12747
12748
#: en/help_topics/hooks.txt:439
12749
msgid ""
12750
"Called by the bzr server when it starts serving a directory.\n"
12751
"server_started is called with (backing urls, public url), where\n"
12752
"backing_url is a list of URLs giving the server-specific directory\n"
12753
"locations, and public_url is the public URL for the directory being\n"
12754
"served."
12755
msgstr ""
12756
12757
#: en/help_topics/hooks.txt:445
12758
msgid ""
12759
"server_started_ex\n"
12760
"~~~~~~~~~~~~~~~~~"
12761
msgstr ""
12762
12763
#: en/help_topics/hooks.txt:450
12764
msgid ""
12765
"Called by the bzr server when it starts serving a directory.\n"
12766
"server_started is called with (backing_urls, server_obj)."
12767
msgstr ""
12768
12769
#: en/help_topics/hooks.txt:453
12770
msgid ""
12771
"server_stopped\n"
12772
"~~~~~~~~~~~~~~"
12773
msgstr ""
12774
12775
#: en/help_topics/hooks.txt:458
12776
msgid ""
12777
"Called by the bzr server when it stops serving a directory.\n"
12778
"server_stopped is called with the same parameters as the\n"
12779
"server_started hook: (backing_urls, public_url)."
12780
msgstr ""
12781
12782
#: en/help_topics/hooks.txt:462
12783
msgid ""
12784
"StatusHooks\n"
12785
"-----------"
12786
msgstr ""
12787
12788
#: en/help_topics/hooks.txt:465
12789
msgid ""
12790
"post_status\n"
12791
"~~~~~~~~~~~"
12792
msgstr ""
12793
12794
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
12795
msgid "Introduced in: 2.3"
12796
msgstr ""
12797
12798
#: en/help_topics/hooks.txt:470
12799
msgid ""
12800
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12801
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12802
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12803
"correspond to the command line options specified by the user for the\n"
12804
"status command. to_file is the output stream for writing."
12805
msgstr ""
12806
12807
#: en/help_topics/hooks.txt:476
12808
msgid ""
12809
"pre_status\n"
12810
"~~~~~~~~~~"
12811
msgstr ""
12812
12813
#: en/help_topics/hooks.txt:481
12814
msgid ""
12815
"Called with argument StatusHookParams before Bazaar displays the\n"
12816
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12817
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12818
"correspond to the command line options specified by the user for the\n"
12819
"status command. to_file is the output stream for writing."
12820
msgstr ""
12821
12822
#: en/help_topics/hooks.txt:487
12823
msgid ""
12824
"TransportHooks\n"
12825
"--------------"
12826
msgstr ""
12827
12828
#: en/help_topics/hooks.txt:490
12829
msgid ""
12830
"post_connect\n"
12831
"~~~~~~~~~~~~"
12832
msgstr ""
12833
12834
#: en/help_topics/hooks.txt:495
12835
msgid ""
12836
"Called after a new connection is established or a reconnect occurs.\n"
12837
"The sole argument passed is either the connected transport or smart\n"
12838
"medium instance."
12839
msgstr ""
12840
12841
#: en/help_topics/hooks.txt:499
12842
msgid ""
12843
"RioVersionInfoBuilderHooks\n"
12844
"--------------------------"
12845
msgstr ""
12846
12847
#: en/help_topics/hooks.txt:502
12848
msgid ""
12849
"revision\n"
12850
"~~~~~~~~"
12851
msgstr ""
12852
12853
#: en/help_topics/hooks.txt:507
12854
msgid ""
12855
"Invoked when adding information about a revision to the RIO stanza\n"
12856
"that is printed. revision is called with a revision object and a RIO\n"
12857
"stanza.\n"
12858
msgstr ""
12859
12860
#: en/help_topics/location-alias.txt:1
12861
msgid ""
12862
"Location aliases\n"
12863
"================"
12864
msgstr ""
12865
12866
#: en/help_topics/location-alias.txt:4
12867
msgid ""
12868
"Bazaar defines several aliases for locations associated with a branch. "
12869
"These\n"
12870
"can be used with most commands that expect a location, such as `bzr push`."
12871
msgstr ""
12872
12873
#: en/help_topics/location-alias.txt:7
12874
msgid "The aliases are::"
12875
msgstr ""
12876
12877
#: en/help_topics/location-alias.txt:9
12878
msgid ""
12879
" :bound The branch this branch is bound to, for bound branches.\n"
12880
" :parent The parent of this branch.\n"
12881
" :public The public location of this branch.\n"
12882
" :push The saved location used for `bzr push` with no arguments.\n"
12883
" :submit The submit branch for this branch.\n"
12884
" :this This branch."
12885
msgstr ""
12886
12887
#: en/help_topics/location-alias.txt:16
12888
msgid "For example, to push to the parent location::"
12889
msgstr ""
12890
12891
#: en/help_topics/location-alias.txt:18
12892
msgid " bzr push :parent\n"
12893
msgstr ""
12894
12895
#: en/help_topics/log-formats.txt:1
12896
msgid ""
12897
"Log Formats\n"
12898
"==========="
12899
msgstr ""
12900
12901
#: en/help_topics/log-formats.txt:4
12902
msgid ""
12903
"A log format controls how information about each revision is displayed.\n"
12904
"The standard log formats are compared below::"
12905
msgstr ""
12906
12907
#: en/help_topics/log-formats.txt:7
12908
msgid ""
12909
" Feature long short line\n"
12910
" ---------------------- ------------- ------------ -------------------\n"
12911
" design goal detailed view concise view 1 revision per line\n"
12912
" committer name+email name only name only\n"
12913
" author name+email - -\n"
12914
" date-time format full date only date only\n"
12915
" commit message full full top line\n"
12916
" tags yes yes yes\n"
12917
" merges indicator - yes -\n"
12918
" status/delta optional optional -\n"
12919
" diff/patch optional optional -\n"
12920
" revision-id optional optional -\n"
12921
" branch nick yes - -\n"
12922
" foreign vcs properties yes yes -\n"
12923
" preferred levels all 1 1\n"
12924
" digital signature optional - -"
12925
msgstr ""
12926
12927
#: en/help_topics/log-formats.txt:24
12928
msgid ""
12929
"The default format is ``long``. To change this, define the ``log_format``\n"
12930
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12931
msgstr ""
12932
12933
#: en/help_topics/log-formats.txt:27
12934
msgid ""
12935
" [DEFAULT]\n"
12936
" log_format = short"
12937
msgstr ""
12938
12939
#: en/help_topics/log-formats.txt:30
12940
msgid ""
12941
"Alternatively, to change the log format used for a given query, use the\n"
12942
"--long, --short or --line options."
12943
msgstr ""
12944
12945
#: en/help_topics/log-formats.txt:33
12946
msgid ""
12947
"If one of the standard log formats does not meet your needs, additional\n"
12948
"formats can be provided by plugins.\n"
12949
msgstr ""
12950
12951
#: en/help_topics/other-formats.txt:1
12952
msgid "Other Storage Formats"
12953
msgstr ""
12954
12955
#: en/help_topics/other-formats.txt:3
12956
msgid "Experimental formats are shown below."
12957
msgstr ""
12958
12959
#: en/help_topics/other-formats.txt:5
12960
msgid ""
12961
":development-colo:\n"
12962
" (native) The 2a format with experimental support for colocated\n"
12963
" branches."
12964
msgstr ""
12965
12966
#: en/help_topics/other-formats.txt:9
12967
msgid ""
12968
"\n"
12969
"Deprecated formats are shown below."
12970
msgstr ""
12971
12972
#: en/help_topics/other-formats.txt:12
12973
msgid ""
12974
":pack-0.92:\n"
12975
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12976
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12977
" by bzr < 0.92."
12978
msgstr ""
12979
12980
#: en/help_topics/patterns.txt:1
12981
msgid ""
12982
"Patterns\n"
12983
"========"
12984
msgstr ""
12985
12986
#: en/help_topics/patterns.txt:4
12987
msgid ""
12988
"Bazaar uses patterns to match files at various times. For example,\n"
12989
"the ``add`` command skips over files that match ignore patterns\n"
12990
"and preferences can be associated with files using rule patterns.\n"
12991
"The pattern syntax is described below."
12992
msgstr ""
12993
12994
#: en/help_topics/patterns.txt:9
12995
msgid ""
12996
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12997
"slash or is a regular expression, it is compared to the whole path\n"
12998
"from the branch root. Otherwise, it is compared to only the last\n"
12999
"component of the path. To match a file only in the root directory,\n"
13000
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13001
msgstr ""
13002
13003
#: en/help_topics/patterns.txt:15
13004
msgid "Patterns may include globbing wildcards such as::"
13005
msgstr ""
13006
13007
#: en/help_topics/patterns.txt:17
13008
msgid ""
13009
" ? - Matches any single character except '/'\n"
13010
" * - Matches 0 or more characters except '/'\n"
13011
" /**/ - Matches 0 or more directories in a path\n"
13012
" [a-z] - Matches a single character from within a group of characters"
13013
msgstr ""
13014
13015
#: en/help_topics/patterns.txt:22
13016
msgid ""
13017
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13018
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13019
"expression. Regular expression patterns may not include named or\n"
13020
"numbered groups."
13021
msgstr ""
13022
13023
#: en/help_topics/patterns.txt:27
13024
msgid ""
13025
"Case insensitive ignore patterns can be specified with regular expressions\n"
13026
"by using the ``i`` (for ignore case) flag in the pattern."
13027
msgstr ""
13028
13029
#: en/help_topics/patterns.txt:30
13030
msgid ""
13031
"For example, a case insensitive match for ``foo`` may be specified as::"
13032
msgstr ""
13033
13034
#: en/help_topics/patterns.txt:32
13035
msgid " RE:(?i)foo"
13036
msgstr ""
13037
13038
#: en/help_topics/patterns.txt:34
13039
msgid ""
13040
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13041
"matched by that pattern will not be ignored."
13042
msgstr ""
13043
13044
#: en/help_topics/patterns.txt:37
13045
msgid ""
13046
".. _Python regular expressions: http://docs.python.org/library/re.html"
13047
msgstr ""
13048
13049
#: en/help_topics/revisionspec.txt:1
13050
msgid "Revision Identifiers"
13051
msgstr ""
13052
13053
#: en/help_topics/revisionspec.txt:3
13054
msgid ""
13055
"A revision identifier refers to a specific state of a branch's history. It\n"
13056
"can be expressed in several ways. It can begin with a keyword to\n"
13057
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13058
"'before:yesterday' and 'submit:'."
13059
msgstr ""
13060
13061
#: en/help_topics/revisionspec.txt:8
13062
msgid ""
13063
"Alternately, it can be given without a keyword, in which case it will be\n"
13064
"checked as a revision number, a tag, a revision id, a date specification, or "
13065
"a\n"
13066
"branch specification, in that order. For example, 'date:today' could be\n"
13067
"written as simply 'today', though if you have a tag called 'today' that "
13068
"will\n"
13069
"be found first."
13070
msgstr ""
13071
13072
#: en/help_topics/revisionspec.txt:14
13073
msgid ""
13074
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13075
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13076
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13077
"or\n"
13078
"spaces around the '..')."
13079
msgstr ""
13080
13081
#: en/help_topics/revisionspec.txt:19
13082
msgid ""
13083
"Ranges are interpreted differently by different commands. To the \"log\" "
13084
"command,\n"
13085
"a range is a sequence of log messages, but to the \"diff\" command, the "
13086
"range\n"
13087
"denotes a change between revisions (and not a sequence of changes). In\n"
13088
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13089
"consider it\n"
13090
"to be open-ended, that is, they include one end but not the other. For "
13091
"example:\n"
13092
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13093
"3649,\n"
13094
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13095
"and\n"
13096
"3649, but not 3647."
13097
msgstr ""
13098
13099
#: en/help_topics/revisionspec.txt:28
13100
msgid "The keywords used as revision selection methods are the following:"
13101
msgstr ""
13102
13103
#: en/help_topics/revisionspec.txt:30
13104
msgid ""
13105
":revid:\n"
13106
"\tSelects a revision using the revision id.\n"
13107
":submit:\n"
13108
"\tSelects a common ancestor with the submit branch.\n"
13109
":ancestor:\n"
13110
"\tSelects a common ancestor with a second branch.\n"
13111
":date:\n"
13112
"\tSelects a revision on the basis of a datestamp.\n"
13113
":branch:\n"
13114
"\tSelects the last revision of a specified branch.\n"
13115
":tag:\n"
13116
"\tSelects a revision identified by a tag name.\n"
13117
":revno:\n"
13118
"\tSelects a revision using a number.\n"
13119
":before:\n"
13120
"\tSelects the parent of the revision specified.\n"
13121
":annotate:\n"
13122
"\tSelect the revision that last modified the specified line.\n"
13123
":mainline:\n"
13124
"\tSelect mainline revision that merged the specified revision.\n"
13125
":last:\n"
13126
"\tSelects the nth revision from the end."
13127
msgstr ""
13128
13129
#: en/help_topics/revisionspec.txt:53
13130
msgid "In addition, plugins can provide other keywords."
13131
msgstr ""
13132
13133
#: en/help_topics/revisionspec.txt:55
13134
msgid "A detailed description of each keyword is given below."
13135
msgstr ""
13136
13137
#: en/help_topics/revisionspec.txt:57
13138
msgid ":revid:"
13139
msgstr ""
13140
13141
#: en/help_topics/revisionspec.txt:59
13142
msgid ""
13143
" Supply a specific revision id, that can be used to specify any\n"
13144
" revision id in the ancestry of the branch.\n"
13145
" Including merges, and pending merges.\n"
13146
" Examples::"
13147
msgstr ""
13148
13149
#: en/help_topics/revisionspec.txt:64
13150
msgid ""
13151
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13152
msgstr ""
13153
13154
#: en/help_topics/revisionspec.txt:66
13155
msgid ":submit:"
13156
msgstr ""
13157
13158
#: en/help_topics/revisionspec.txt:68
13159
msgid ""
13160
" Diffing against this shows all the changes that were made in this "
13161
"branch,\n"
13162
" and is a good predictor of what merge will do. The submit branch is\n"
13163
" used by the bundle and merge directive commands. If no submit branch\n"
13164
" is specified, the parent branch is used instead."
13165
msgstr ""
13166
13167
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13168
msgid ""
13169
" The common ancestor is the last revision that existed in both\n"
13170
" branches. Usually this is the branch point, but it could also be\n"
13171
" a revision that was merged."
13172
msgstr ""
13173
13174
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13175
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13176
#: en/help_topics/revisionspec.txt:153
13177
msgid " Examples::"
13178
msgstr ""
13179
13180
#: en/help_topics/revisionspec.txt:79
13181
msgid " $ bzr diff -r submit:"
13182
msgstr ""
13183
13184
#: en/help_topics/revisionspec.txt:81
13185
msgid ":ancestor:"
13186
msgstr ""
13187
13188
#: en/help_topics/revisionspec.txt:83
13189
msgid " Supply the path to a branch to select the common ancestor."
13190
msgstr ""
13191
13192
#: en/help_topics/revisionspec.txt:89
13193
msgid ""
13194
" This is frequently used with 'diff' to return all of the changes\n"
13195
" that your branch introduces, while excluding the changes that you\n"
13196
" have not merged from the remote branch."
13197
msgstr ""
13198
13199
#: en/help_topics/revisionspec.txt:95
13200
msgid ""
13201
" ancestor:/path/to/branch\n"
13202
" $ bzr diff -r ancestor:../../mainline/branch"
13203
msgstr ""
13204
13205
#: en/help_topics/revisionspec.txt:98
13206
msgid ":date:"
13207
msgstr ""
13208
13209
#: en/help_topics/revisionspec.txt:100
13210
msgid ""
13211
" Supply a datestamp to select the first revision that matches the date.\n"
13212
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13213
" Matches the first entry after a given date (either at midnight or\n"
13214
" at a specified time)."
13215
msgstr ""
13216
13217
#: en/help_topics/revisionspec.txt:105
13218
msgid " One way to display all the changes since yesterday would be::"
13219
msgstr ""
13220
13221
#: en/help_topics/revisionspec.txt:107
13222
msgid " bzr log -r date:yesterday.."
13223
msgstr ""
13224
13225
#: en/help_topics/revisionspec.txt:111
13226
msgid ""
13227
" date:yesterday -> select the first revision since "
13228
"yesterday\n"
13229
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13230
" August 14th, 2006 at 5:10pm."
13231
msgstr ""
13232
13233
#: en/help_topics/revisionspec.txt:115
13234
msgid ":branch:"
13235
msgstr ""
13236
13237
#: en/help_topics/revisionspec.txt:117
13238
msgid " Supply the path to a branch to select its last revision."
13239
msgstr ""
13240
13241
#: en/help_topics/revisionspec.txt:121
13242
msgid " branch:/path/to/branch"
13243
msgstr ""
13244
13245
#: en/help_topics/revisionspec.txt:123
13246
msgid ":tag:"
13247
msgstr ""
13248
13249
#: en/help_topics/revisionspec.txt:125
13250
msgid " Tags are stored in the branch and created by the 'tag' command."
13251
msgstr ""
13252
13253
#: en/help_topics/revisionspec.txt:127
13254
msgid ":revno:"
13255
msgstr ""
13256
13257
#: en/help_topics/revisionspec.txt:129
13258
msgid ""
13259
" Use an integer to specify a revision in the history of the branch.\n"
13260
" Optionally a branch can be specified. A negative number will count\n"
13261
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13262
" one). If the negative number is larger than the branch's history, the\n"
13263
" first revision is returned.\n"
13264
" Examples::"
13265
msgstr ""
13266
13267
#: en/help_topics/revisionspec.txt:136
13268
msgid ""
13269
" revno:1 -> return the first revision of this branch\n"
13270
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13271
" the branch '/path/to/branch'\n"
13272
" revno:-1 -> The last revision in a branch.\n"
13273
" -2:http://other/branch -> The second to last revision in the\n"
13274
" remote branch.\n"
13275
" -1000000 -> Most likely the first revision, unless\n"
13276
" your history is very long."
13277
msgstr ""
13278
13279
#: en/help_topics/revisionspec.txt:145
13280
msgid ":before:"
13281
msgstr ""
13282
13283
#: en/help_topics/revisionspec.txt:147
13284
msgid ""
13285
" Supply any revision spec to return the parent of that revision. This "
13286
"is\n"
13287
" mostly useful when inspecting revisions that are not in the revision "
13288
"history\n"
13289
" of a branch."
13290
msgstr ""
13291
13292
#: en/help_topics/revisionspec.txt:151
13293
msgid ""
13294
" It is an error to request the parent of the null revision (before:0)."
13295
msgstr ""
13296
13297
#: en/help_topics/revisionspec.txt:155
13298
msgid ""
13299
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13300
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13301
" aaaa@bbbb-1234567890\n"
13302
" bzr diff -r before:1913..1913\n"
13303
" -> Find the changes between revision 1913 and its parent "
13304
"(1912).\n"
13305
" (What changes did revision 1913 introduce).\n"
13306
" This is equivalent to: bzr diff -c 1913"
13307
msgstr ""
13308
13309
#: en/help_topics/revisionspec.txt:163
13310
msgid ":annotate:"
13311
msgstr ""
13312
13313
#: en/help_topics/revisionspec.txt:165
13314
msgid ""
13315
" Select the revision that last modified the specified line. Line is\n"
13316
" specified as path:number. Path is a relative path to the file. "
13317
"Numbers\n"
13318
" start at 1, and are relative to the current version, not the last-\n"
13319
" committed version of the file."
13320
msgstr ""
13321
13322
#: en/help_topics/revisionspec.txt:170
13323
msgid ":mainline:"
13324
msgstr ""
13325
13326
#: en/help_topics/revisionspec.txt:172
13327
msgid ""
13328
" Select the revision that merged the specified revision into mainline."
13329
msgstr ""
13330
13331
#: en/help_topics/revisionspec.txt:174
13332
msgid ":last:"
13333
msgstr ""
13334
13335
#: en/help_topics/revisionspec.txt:176
13336
msgid ""
13337
" Supply a positive number to get the nth revision from the end.\n"
13338
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13339
" Examples::"
13340
msgstr ""
13341
13342
#: en/help_topics/revisionspec.txt:180
13343
msgid ""
13344
" last:1 -> return the last revision\n"
13345
" last:3 -> return the revision 2 before the end.\n"
13346
msgstr ""
13347
13348
#: en/help_topics/rules.txt:1
13349
msgid ""
13350
"Rules\n"
13351
"====="
13352
msgstr ""
13353
13354
#: en/help_topics/rules.txt:7
13355
msgid ""
13356
"Rules are defined in ini file format where the sections are file glob\n"
13357
"patterns and the contents of each section are the preferences for files\n"
13358
"matching that pattern(s). For example::"
13359
msgstr ""
13360
13361
#: en/help_topics/rules.txt:11
13362
msgid ""
13363
" [name *.bat]\n"
13364
" eol = native"
13365
msgstr ""
13366
13367
#: en/help_topics/rules.txt:14
13368
msgid ""
13369
" [name *.html *.xml]\n"
13370
" keywords = xml_escape"
13371
msgstr ""
13372
13373
#: en/help_topics/rules.txt:17
13374
msgid ""
13375
"Preferences like these are useful for commands and plugins wishing to\n"
13376
"provide custom behaviour for selected files. For more information on \n"
13377
"end of line conversion see :doc:`eol-help`.\n"
13378
"Keyword support is provided by the `keywords plugin\n"
13379
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13380
msgstr ""
13381
13382
#: en/help_topics/rules.txt:23
13383
msgid ""
13384
"Files\n"
13385
"-----"
13386
msgstr ""
13387
13388
#: en/help_topics/rules.txt:26
13389
msgid ""
13390
"Default rules for all branches are defined in the optional file\n"
13391
"``BZR_HOME/rules``. "
13392
msgstr ""
13393
13394
#: en/help_topics/rules.txt:29
13395
msgid ""
13396
"Rule Patterns\n"
13397
"-------------"
13398
msgstr ""
13399
13400
#: en/help_topics/rules.txt:32
13401
msgid ""
13402
"Patterns are ordered and searching stops as soon as one matches.\n"
13403
"As a consequence, more explicit patterns should be placed towards\n"
13404
"the top of the file. Rule patterns use exactly the same conventions\n"
13405
"as ignore patterns. See :doc:`patterns-help` for details."
13406
msgstr ""
13407
13408
#: en/help_topics/rules.txt:37
13409
msgid ".. note::"
13410
msgstr ""
13411
13412
#: en/help_topics/rules.txt:39
13413
msgid ""
13414
" Patterns containing square brackets or spaces should be\n"
13415
" surrounded in quotes to ensure they are correctly parsed.\n"
13416
msgstr ""
13417
13418
#: en/help_topics/topics.txt:1
13419
msgid ""
13420
"authentication Information on configuring authentication\n"
13421
"basic Basic commands\n"
13422
"branches Information on what a branch is\n"
13423
"bugs Bug tracker settings\n"
13424
"checkouts Information on what a checkout is\n"
13425
"commands Basic help for all commands\n"
13426
"configuration Details on the configuration settings available\n"
13427
"conflict-types Types of conflicts and what to do about them\n"
13428
"content-filters Conversion of content into/from working trees\n"
13429
"criss-cross Information on criss-cross merging\n"
13430
"current-formats Current storage formats\n"
13431
"debug-flags Options to show or record debug information\n"
13432
"diverged-branches How to fix diverged branches\n"
13433
"env-variables Environment variable names and values\n"
13434
"eol Information on end-of-line handling\n"
13435
"files Information on configuration and log files\n"
13436
"formats Information on choosing a storage format\n"
13437
"global-options Options that control how Bazaar runs\n"
13438
"hidden-commands All hidden commands\n"
13439
"hooks Points at which custom processing can be added\n"
13440
"launchpad Using Bazaar with Launchpad.net\n"
13441
"location-alias Aliases for remembered locations\n"
13442
"log-formats Details on the logging formats available\n"
13443
"other-formats Experimental and deprecated storage formats\n"
13444
"patterns Information on the pattern syntax\n"
13445
"repositories Basic information on shared repositories.\n"
13446
"revisionspec Explain how to use --revision\n"
13447
"rules Information on defining rule-based preferences\n"
13448
"standalone-trees Information on what a standalone tree is\n"
13449
"standard-options Options that can be used with any command\n"
13450
"status-flags Help on status flags\n"
13451
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13452
"topics Topics list\n"
13453
"url-special-chars Special character handling in URLs\n"
13454
"urlspec Supported transport protocols\n"
13455
"working-trees Information on working trees\n"
13456
msgstr ""
13457
13458
#: en/help_topics/url-special-chars.txt:1
13459
msgid ""
13460
"Special character handling in URLs\n"
13461
"=================================="
13462
msgstr ""
13463
13464
#: en/help_topics/url-special-chars.txt:4
13465
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13466
msgstr ""
13467
13468
#: en/help_topics/url-special-chars.txt:6
13469
msgid " * Fully qualified URLs"
13470
msgstr ""
13471
13472
#: en/help_topics/url-special-chars.txt:8
13473
msgid " * File system paths, relative or absolute"
13474
msgstr ""
13475
13476
#: en/help_topics/url-special-chars.txt:10
13477
msgid ""
13478
"Internally bzr treats all locations as URLs. For any file system paths\n"
13479
"that are specified it will automatically determine the appropriate URL\n"
13480
"representation, and escape special characters where necessary."
13481
msgstr ""
13482
13483
#: en/help_topics/url-special-chars.txt:14
13484
msgid ""
13485
"There are a few characters which have special meaning in URLs and need "
13486
"careful\n"
13487
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13488
"value in URLs. Any non-ASCII characters in a file path will automatically "
13489
"be\n"
13490
"urlencoded when the path is converted to a URL."
13491
msgstr ""
13492
13493
#: en/help_topics/url-special-chars.txt:19
13494
msgid ""
13495
"URLs represent non-ASCII characters in an encoding defined by the server, "
13496
"but\n"
13497
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13498
"be\n"
13499
"generous in what it accepts as a URL and to print them in a way that\n"
13500
"will be readable."
13501
msgstr ""
13502
13503
#: en/help_topics/url-special-chars.txt:24
13504
msgid ""
13505
"For example, if you have a directory named '/tmp/%2False' these are all "
13506
"valid\n"
13507
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13508
"slash)::"
13509
msgstr ""
13510
13511
#: en/help_topics/url-special-chars.txt:27
13512
msgid ""
13513
" cd /tmp\n"
13514
" bzr log /tmp/%2False\n"
13515
" bzr log %2False\n"
13516
" bzr log file:///tmp/%252False\n"
13517
" bzr log file://localhost/tmp/%252False\n"
13518
" bzr log file:%252False"
13519
msgstr ""
13520
13521
#: en/help_topics/url-special-chars.txt:34
13522
msgid "These are valid but do not refer to the same file::"
13523
msgstr ""
13524
13525
#: en/help_topics/url-special-chars.txt:36
13526
msgid ""
13527
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13528
" bzr log %252False (refers to a file called /tmp/%252False)"
13529
msgstr ""
13530
13531
#: en/help_topics/url-special-chars.txt:39
13532
msgid ""
13533
"Comma also has special meaning in URLs, because it denotes `segment "
13534
"parameters`_"
13535
msgstr ""
13536
13537
#: en/help_topics/url-special-chars.txt:41
13538
msgid ""
13539
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13540
msgstr ""
13541
13542
#: en/help_topics/url-special-chars.txt:43
13543
msgid ""
13544
"Comma is also special in any file system paths that are specified. To use a "
13545
"literal\n"
13546
"comma in a file system path, specify a URL and URL encode the comma::"
13547
msgstr ""
13548
13549
#: en/help_topics/url-special-chars.txt:46
13550
msgid ""
13551
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13552
"\"branch\" set to \"bla\"\n"
13553
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13554
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13555
"\"branch\" set to \"bla\"\n"
13556
msgstr ""
13557
13558
#: en/help_topics/urlspec.txt:1
13559
msgid "URL Identifiers"
13560
msgstr ""
13561
13562
#: en/help_topics/urlspec.txt:3
13563
msgid "Supported URL prefixes::"
13564
msgstr ""
13565
13566
#: en/help_topics/urlspec.txt:5
13567
msgid ""
13568
" aftp:// Access using active FTP.\n"
13569
" bzr:// Fast access using the Bazaar smart server.\n"
13570
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13571
" file:// Access using the standard filesystem (default)\n"
13572
" ftp:// Access using passive FTP.\n"
13573
" http:// Read-only access of branches exported on the web.\n"
13574
" https:// Read-only access of branches exported on the web using "
13575
"SSL.\n"
13576
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13577
msgstr ""
13578
13579
#: en/help_topics/urlspec.txt:14
13580
msgid "Supported modifiers::"
13581
msgstr ""
13582
13583
#: en/help_topics/urlspec.txt:16
13584
msgid " gio+ Access using any GIO supported protocols."
13585
msgstr ""
13586
13587
#: en/help_topics/urlspec.txt:18
13588
msgid "Bazaar supports all of the standard parts within the URL::"
13589
msgstr ""
13590
13591
#: en/help_topics/urlspec.txt:20
13592
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13593
msgstr ""
13594
13595
#: en/help_topics/urlspec.txt:22
13596
msgid "allowing URLs such as::"
13597
msgstr ""
13598
13599
#: en/help_topics/urlspec.txt:24
13600
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13601
msgstr ""
13602
13603
#: en/help_topics/urlspec.txt:26
13604
msgid ""
13605
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13606
"with '~' as meaning that the rest of the path should be interpreted\n"
13607
"relative to the remote user's home directory. For example if the user\n"
13608
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13609
"shell.example.com, then::"
13610
msgstr ""
13611
13612
#: en/help_topics/urlspec.txt:32
13613
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13614
msgstr ""
13615
13616
#: en/help_topics/urlspec.txt:34
13617
msgid "would refer to ``/home/remote/myproject/trunk``."
13618
msgstr ""
13619
13620
#: en/help_topics/urlspec.txt:36
13621
msgid ""
13622
"Many commands that accept URLs also accept location aliases too.\n"
13623
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13624
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1