« back to all changes in this revision
Viewing changes to po/ja.po
- browse files at revision 6574
- compare with another revision
- download diff
- download tarball
- view history from revision 6574
- Committer: Patch Queue Manager
- Date: 2013-05-20 17:46:29 UTC
- mfrom: (6573.1.1 bzr)
- Revision ID: pqm@pqm.ubuntu.com-20130520174629-dp7zujtuclvomuzd
(jameinel) Fix CVE 2013-2009. Avoid allowing multiple wildcards in a single
SSL cert hostname segment. (Andrew Starr-Bochicchio)
SSL cert hostname segment. (Andrew Starr-Bochicchio)
- files added:
- NEWS
- bzrlib/branchfmt
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_repository_vf
- po
- files removed:
- bzrlib/deprecated_graph.py
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- bzrlib/sign_my_commits.py => bzrlib/commit_signature_commands.py
- bzrlib/repofmt/weaverepo.py => bzrlib/plugins/weave_fmt/repository.py
- bzrlib/xml4.py => bzrlib/plugins/weave_fmt/xml4.py
- bzrlib/tests/per_repository/test_is_write_locked.py => bzrlib/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/helpers.py => bzrlib/tests/per_repository_vf/helpers.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => bzrlib/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_check_reconcile.py => bzrlib/tests/per_repository_vf/test_check_reconcile.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => bzrlib/tests/per_repository_vf/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- NEWS => doc/en/release-notes/bzr-2.3.txt
- NEWS-template.txt => doc/en/release-notes/release-template.txt
- files modified:
- .bzrignore
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-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"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-02-04 06:20+0000\n"
19
"X-Generator: Launchpad (build 14738)\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:3205
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "リビジョン%dまでプッシュしました。"
33
34
#: bzrlib/branch.py:3207
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d 個のタグを更新しました"
39
40
#: bzrlib/branch.py:3210
41
msgid "No new revisions or tags to push."
42
msgstr "プッシュする新しいリビジョンやタグはありません。"
43
44
#: bzrlib/branch.py:3212
45
msgid "No new revisions to push."
46
msgstr "プッシュする新しいリビジョンはありません。"
47
48
#: bzrlib/branch.py:3232
49
msgid "checked branch {0} format {1}"
50
msgstr "format {1} のブランチ {0} をチェックしました"
51
52
#: bzrlib/branch.py:3235
53
#, python-format
54
msgid "found error:%s"
55
msgstr "検出されたエラー: %s"
56
57
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
58
#, python-format
59
msgid "Ignoring files outside view. View is %s"
60
msgstr "ビューに含まれないファイルは無視します。ビュー：%s"
61
62
#: bzrlib/builtins.py:218
63
#, python-format
64
msgid "bzr %s --revision takes exactly one revision identifier"
65
msgstr "bzr %s --revision には、リビジョンＩＤを一つだけ指定します。"
66
67
#: bzrlib/builtins.py:303
68
msgid "Display status summary."
69
msgstr "ステータスのサマリーを表示します。"
70
71
#: bzrlib/builtins.py:305
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:308
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:311
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:315
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:320
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"modified\n"
116
" ファイルの内容が一つ前のリビジョンから変更されている。"
117
118
#: bzrlib/builtins.py:323
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:326
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:329
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:334
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:337
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:341
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:346
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:351
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:354
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:363
207
msgid "Use short status indicators."
208
msgstr "省略形式でステータスを表示します。"
209
210
#: bzrlib/builtins.py:365
211
msgid "Only show versioned files."
212
msgstr "バージョン管理されているファイルだけを表示します。"
213
214
#: bzrlib/builtins.py:367
215
msgid "Don't show pending merges."
216
msgstr "マージ中の情報を表示しません。"
217
218
#: bzrlib/builtins.py:370
219
msgid "Do not mark object type using indicator."
220
msgstr "オブジェクトの種別を表すマーカーを表示しません。"
221
222
#: bzrlib/builtins.py:385
223
msgid "bzr status --revision takes exactly one or two revision specifiers"
224
msgstr "bzr status --revisionには、１つか２つのリビジョンを指定します。"
225
226
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
227
msgid "You can only supply one of revision_id or --revision"
228
msgstr "リビジョンＩＤと--revisionのどちらか一つだけを指定してください。"
229
230
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
231
msgid "You must supply either --revision or a revision_id"
232
msgstr "--revisionとリビジョンＩＤのどちらかを指定してください。"
233
234
#: bzrlib/builtins.py:439
235
#, python-format
236
msgid "Repository %r does not support access to raw revision texts"
237
msgstr "リポジトリ %r はリビジョンのtextへの直接アクセスをサポートしていません"
238
239
#: bzrlib/builtins.py:450
240
msgid "The repository {0} contains no revision {1}."
241
msgstr "リポジトリ {0} にはリビジョン {1} はありません。"
242
243
#: bzrlib/builtins.py:457
244
msgid "You cannot specify a NULL revision."
245
msgstr "NULLリビジョンは指定できません。"
246
247
#: bzrlib/builtins.py:549
248
msgid "Remove the working tree from a given branch/checkout."
249
msgstr "指定されたブランチ/チェックアウトから作業ツリーを削除します。"
250
251
#: bzrlib/builtins.py:551
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:554
260
msgid "To re-create the working tree, use \"bzr checkout\"."
261
msgstr "作業ツリーを再作成するには、 \"bzr checkout\" をしてください。"
262
263
#: bzrlib/builtins.py:560
264
msgid ""
265
"Remove the working tree even if it has uncommitted or shelved changes."
266
msgstr "作業ツリーが変更されていたり、シェルフされた変更があっても、作業ツリーを削除します。"
267
268
#: bzrlib/builtins.py:574
269
msgid "No working tree to remove"
270
msgstr "削除する作業ツリーがありません。"
271
272
#: bzrlib/builtins.py:576
273
msgid "You cannot remove the working tree of a remote path"
274
msgstr "リモートの作業ツリーを削除することはできません。"
275
276
#: bzrlib/builtins.py:585
277
msgid "You cannot remove the working tree from a lightweight checkout"
278
msgstr "軽量チェックアウトから作業ツリーを削除することはできません。"
279
280
#: bzrlib/builtins.py:625
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:636
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:640
295
msgid "failed to reset the tree state{0}"
296
msgstr "ツリーの状態をリセットできませんでした。{0}"
297
298
#: bzrlib/builtins.py:644
299
msgid "Show current revision number."
300
msgstr "現在のリビジョン番号を表示します。"
301
302
#: bzrlib/builtins.py:646
303
msgid "This is equal to the number of revisions on this branch."
304
msgstr "これは、ブランチ内のリビジョンの数と同じです。"
305
306
#: bzrlib/builtins.py:659
307
msgid "--tree and --revision can not be used together"
308
msgstr "--tree と --revision は同時に指定できません"
309
310
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
311
msgid "Tags can only be placed on a single revision, not on a range"
312
msgstr "タグは1つのリビジョンにしか指定できません"
313
314
#: bzrlib/builtins.py:700
315
msgid "Show revno of working tree."
316
msgstr "作業ツリーのリビジョン番号を表示します。"
317
318
#: bzrlib/builtins.py:748
319
msgid "Add specified files or directories."
320
msgstr "指定されたファイルやディレクトリを追加します。"
321
322
#: bzrlib/builtins.py:750
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:754
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:762
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:765
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:768
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:773
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:776
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:784
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:787
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:794
420
msgid "Don't recursively add the contents of directories."
421
msgstr "ディレクトリの内容を再帰的に追加しません。"
422
423
#: bzrlib/builtins.py:800
424
msgid "Lookup file ids from this tree."
425
msgstr "このツリーからファイルIDを検索します。"
426
427
#: bzrlib/builtins.py:836
428
msgid "ignored {0} matching \"{1}\"\n"
429
msgstr "無視 {0} (\"{1}\"にマッチ)\n"
430
431
#: bzrlib/builtins.py:841
432
msgid "Create a new versioned directory."
433
msgstr "バージョン管理されたディレクトリを作成します。"
434
435
#: bzrlib/builtins.py:843
436
msgid "This is equivalent to creating the directory and then adding it."
437
msgstr "ディレクトリを作成して、バージョン管理に追加することと同じです。"
438
439
#: bzrlib/builtins.py:850
440
msgid "No error if existing, make parent directories as needed."
441
msgstr ""
442
443
#: bzrlib/builtins.py:884
444
#, python-format
445
msgid "added %s\n"
446
msgstr "%s が追加されました。\n"
447
448
#: bzrlib/builtins.py:926
449
#, python-format
450
msgid "invalid kind %r specified"
451
msgstr "kindが正しくありません。 %s"
452
453
#: bzrlib/builtins.py:963
454
msgid "Move or rename a file."
455
msgstr "ファイルの移動や名前の変更を行います。"
456
457
#: bzrlib/builtins.py:965
458
msgid " bzr mv SOURCE... DESTINATION"
459
msgstr " bzr mv SOURCE... DESTINATION"
460
461
#: bzrlib/builtins.py:967
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:971
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:977
486
msgid "Files cannot be moved between branches."
487
msgstr "ファイルを別のブランチに移動することはできません。"
488
489
#: bzrlib/builtins.py:984
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:986
496
msgid "Automatically guess renames."
497
msgstr "変名を自動的に推測します。"
498
499
#: bzrlib/builtins.py:987
500
msgid "Avoid making changes when guessing renames."
501
msgstr "変名を推測する時に、実際には変更を行いません。"
502
503
#: bzrlib/builtins.py:996
504
msgid "--dry-run requires --auto."
505
msgstr "--dry-runは--autoとともに指定してください。"
506
507
#: bzrlib/builtins.py:1000
508
msgid "missing file argument"
509
msgstr "ファイルが指定されていません。"
510
511
#: bzrlib/builtins.py:1004
512
msgid "can not move root of branch"
513
msgstr "ブランチの root は移動できません。"
514
515
#: bzrlib/builtins.py:1010
516
msgid "Only one path may be specified to --auto."
517
msgstr "--autoを指定する場合はパスはひとつだけ指定してください。"
518
519
#: bzrlib/builtins.py:1013
520
msgid "--after cannot be specified with --auto."
521
msgstr "--afterと--autoを同時に指定することはできません。"
522
523
#: bzrlib/builtins.py:1050
524
msgid "to mv multiple files the destination must be a versioned directory"
525
msgstr "複数のファイルを移動する時は、移動先はバージョン管理されていなければなりません。"
526
527
#: bzrlib/builtins.py:1102
528
msgid "Turn this branch into a mirror of another branch."
529
msgstr "このブランチを別のブランチのミラーにします。"
530
531
#: bzrlib/builtins.py:1104
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:1109
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:1113
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:1117
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:1122
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:1126
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:1134
595
msgid "Show logs of pulled revisions."
596
msgstr "pull対象リビジョンのログを表示します。"
597
598
#: bzrlib/builtins.py:1136
599
msgid ""
600
"Branch to pull into, rather than the one containing the working directory."
601
msgstr "作業フォルダの代わりにpullを受け入れるブランチ"
602
603
#: bzrlib/builtins.py:1139
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:1168
610
msgid "Need working tree for --show-base."
611
msgstr "--show-baseオプションを使用するには作業ツリーが必要です。"
612
613
#: bzrlib/builtins.py:1184
614
msgid "No pull location known or specified."
615
msgstr "pull対象ブランチが指定されていません。"
616
617
#: bzrlib/builtins.py:1190
618
#, python-format
619
msgid "Using saved parent location: %s\n"
620
msgstr "デフォルトの親ブランチを使用します。: %s\n"
621
622
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
623
msgid "Cannot use -r with merge directives or bundles"
624
msgstr "マージディレクティブやバンドルに対して-rを使用することはできません。"
625
626
#: bzrlib/builtins.py:1238
627
msgid "Update a mirror of this branch."
628
msgstr "このブランチのミラーを更新します。"
629
630
#: bzrlib/builtins.py:1240
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:1243
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:1246
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:1250
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:1253
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:1257
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:1262
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:1273 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:1276
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:1281
711
msgid ""
712
"Create a stacked branch that references the public location of the parent "
713
"branch."
714
msgstr "親ブランチの公開された場所を参照するスタックドブランチを作成します。"
715
716
#: bzrlib/builtins.py:1284
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:1289 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:1292
732
msgid "Don't populate the working tree, even for protocols that support it."
733
msgstr "作業コピーを更新できるプロトコルを使っている場合でも、更新しません。"
734
735
#: bzrlib/builtins.py:1336
736
msgid "Could not determine branch to refer to."
737
msgstr "参照先のブランチを特定できません。"
738
739
#: bzrlib/builtins.py:1345
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 "push先が設定も指定もされていません。親ブランチ(%s)にpushする場合は、'bzr push :parent'を使用してください。"
745
746
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
747
msgid "No push location known or specified."
748
msgstr "push先のブランチが設定も指定もされていません。"
749
750
#: bzrlib/builtins.py:1355
751
#, python-format
752
msgid "Using saved push location: %s"
753
msgstr "デフォルトのpush先ブランチを使用します。: %s"
754
755
#: bzrlib/builtins.py:1365
756
msgid "Create a new branch that is a copy of an existing branch."
757
msgstr "既存のブランチをコピーして新しいブランチを作成します。"
758
759
#: bzrlib/builtins.py:1367
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:1374
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:1377
784
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
785
msgstr "このコマンドの別名である'clone'と'get'は廃止予定です。"
786
787
#: bzrlib/builtins.py:1387
788
msgid "Create a branch without a working-tree."
789
msgstr "作業ツリーのないブランチを作成します。"
790
791
#: bzrlib/builtins.py:1389
792
msgid "Switch the checkout in the current directory to the new branch."
793
msgstr "カレントディレクトリにあるチェックアウトの参照先を新しいブランチに切り替えます。"
794
795
#: bzrlib/builtins.py:1392
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:1396
802
msgid "Do not use a shared repository, even if available."
803
msgstr "共有リポジトリが使える場合でも、共有リポジトリを使いません。"
804
805
#: bzrlib/builtins.py:1398
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:1403
814
msgid "Bind new branch to from location."
815
msgstr "新しいブランチを元のブランチにバインドします。"
816
817
#: bzrlib/builtins.py:1450
818
#, python-format
819
msgid "Target directory \"%s\" already exists."
820
msgstr "対象のディレクトリ \"%s\" は既に存在します。"
821
822
#: bzrlib/builtins.py:1462
823
#, python-format
824
msgid "Parent of \"%s\" does not exist."
825
msgstr "\"%s\" の親が見つかりません。"
826
827
#: bzrlib/builtins.py:1481
828
msgid "The branch {0} has no revision {1}."
829
msgstr "ブランチ {0} にリビジョン {1} はありません。"
830
831
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
832
#, python-format
833
msgid "Created new stacked branch referring to %s."
834
msgstr "%s を参照するスタックドブランチを作成しました。"
835
836
#: bzrlib/builtins.py:1500
837
#, python-format
838
msgid "Branched %d revision."
839
msgid_plural "Branched %d revisions."
840
msgstr[0] "%d個のリビジョンをブランチしました。"
841
842
#: bzrlib/builtins.py:1505
843
#, python-format
844
msgid "New branch bound to %s"
845
msgstr "新しいブランチは %s にバインドされています。"
846
847
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
848
#, python-format
849
msgid "Switched to branch: %s"
850
msgstr "バインド先をスイッチしました。: %s"
851
852
#: bzrlib/builtins.py:1515
853
msgid "List the branches available at the current location."
854
msgstr "カレントフォルダにある利用可能なブランチをリストアップします。"
855
856
#: bzrlib/builtins.py:1517
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:1524
863
msgid ""
864
"Recursively scan for branches rather than just looking in the specified "
865
"location."
866
msgstr "指定された場所だけでなく、再帰的にブランチを探します。"
867
868
#: bzrlib/builtins.py:1554
869
msgid "(default)"
870
msgstr "(デフォルト)"
871
872
#: bzrlib/builtins.py:1566
873
msgid "Create a new checkout of an existing branch."
874
msgstr "既存のブランチのチェックアウトを新しく作成します。"
875
876
#: bzrlib/builtins.py:1568
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:1573
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:1580
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:1590
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:1597
933
msgid "Get file contents from this tree."
934
msgstr "ファイルの内容をこのツリーから取得します。"
935
936
#: bzrlib/builtins.py:1599
937
msgid "Hard-link working tree files where possible."
938
msgstr "可能なら、作業コピーをハードリンクします。"
939
940
#: bzrlib/builtins.py:1640
941
msgid ""
942
"Show list of renamed files.\n"
943
" "
944
msgstr ""
945
"変名されたファイルをリストアップします。\n"
946
" "
947
948
#: bzrlib/builtins.py:1670
949
msgid "Update a working tree to a new revision."
950
msgstr "作業ツリーを新しいリビジョンに更新します。"
951
952
#: bzrlib/builtins.py:1672
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:1676
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:1679
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:1684
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:1687
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:1694
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:1710
1015
msgid "bzr update --revision takes exactly one revision"
1016
msgstr "bzr update --revisionには、リビジョンをひとつだけ指定します。"
1017
1018
#: bzrlib/builtins.py:1718
1019
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1020
msgstr "bzr updateは、個々のファイルやディレクトリではなく、作業ツリー全体を更新します。"
1021
1022
#: bzrlib/builtins.py:1749
1023
msgid "Tree is up to date at revision {0} of branch {1}"
1024
msgstr "ツリーはブランチ {1} のリビジョン {0} で最新の状態です。"
1025
1026
#: bzrlib/builtins.py:1765
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:1771
1036
msgid "Updated to revision {0} of branch {1}"
1037
msgstr "ブランチ {1} のリビジョン {0} に更新されました。"
1038
1039
#: bzrlib/builtins.py:1775
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:1784
1046
msgid "Show information about a working tree, branch or repository."
1047
msgstr "作業コピー、ブランチ、リポジトリの情報を表示します。"
1048
1049
#: bzrlib/builtins.py:1786
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:1789
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:1793
1068
msgid "Branches and working trees will also report any missing revisions."
1069
msgstr "ブランチと作業ツリーについては、存在しないリビジョンについても表示されます。"
1070
1071
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1072
#: bzrlib/builtins.py:6442
1073
msgid ":Examples:"
1074
msgstr ":例:"
1075
1076
#: bzrlib/builtins.py:1797
1077
msgid " Display information on the format and related locations:"
1078
msgstr " フォーマットと関連する場所についての情報を表示します。"
1079
1080
#: bzrlib/builtins.py:1799
1081
msgid " bzr info"
1082
msgstr " bzr info"
1083
1084
#: bzrlib/builtins.py:1801
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:1805
1094
msgid " bzr info -v"
1095
msgstr " bzr info -v"
1096
1097
#: bzrlib/builtins.py:1807
1098
msgid " Display the above together with number of committers to the branch:"
1099
msgstr " さらに、このブランチにコミットした人の数も表示します。:"
1100
1101
#: bzrlib/builtins.py:1809
1102
msgid " bzr info -vv"
1103
msgstr " bzr info -vv"
1104
1105
#: bzrlib/builtins.py:1828
1106
msgid "Remove files or directories."
1107
msgstr "ファイルやディレクトリを削除します。"
1108
1109
#: bzrlib/builtins.py:1830
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:1838
1124
msgid "Only remove files that have never been committed."
1125
msgstr "まだコミットされていないファイルだけを削除します。"
1126
1127
#: bzrlib/builtins.py:1840
1128
msgid "The file deletion mode to be used."
1129
msgstr "使用するファイル削除モードです。"
1130
1131
#: bzrlib/builtins.py:1841
1132
msgid "Deletion Strategy"
1133
msgstr "削除モード"
1134
1135
#: bzrlib/builtins.py:1842
1136
msgid "Backup changed files (default)."
1137
msgstr "変更したファイルをバックアップします。"
1138
1139
#: bzrlib/builtins.py:1843
1140
msgid "Delete from bzr but leave the working copy."
1141
msgstr "Bazaarからは削除しますが、作業ツリーには残します。"
1142
1143
#: bzrlib/builtins.py:1844
1144
msgid "Don't backup changed files."
1145
msgstr "変更されたファイルをバックアップしません。"
1146
1147
#: bzrlib/builtins.py:1845
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:1854
1155
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1156
msgstr "(--forceオプションは廃止予定です。今後は--no-backupを使用してください)"
1157
1158
#: bzrlib/builtins.py:1871
1159
msgid "No matching files."
1160
msgstr "対象のファイルはありませんでした。"
1161
1162
#: bzrlib/builtins.py:1932
1163
msgid "Reconcile bzr metadata in a branch."
1164
msgstr "ブランチ内のBazaarのメタデータを修復します。"
1165
1166
#: bzrlib/builtins.py:1934
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:1939
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:1944
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:1947
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:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
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:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
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:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1220
msgid "The 2a format with experimental support for colocated branches.\n"
1221
msgstr "colocated branch を実験的にサポートする 2a フォーマット。\n"
1222
1223
#: bzrlib/builtins.py:2015
1224
msgid "Make a directory into a versioned branch."
1225
msgstr "ディレクトリを、バージョン管理されたブランチにします。"
1226
1227
#: bzrlib/builtins.py:2017
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:2020
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:2025
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:2028
1255
msgid "Recipe for importing a tree of files::"
1256
msgstr "ファイルのツリーをインポートするためのレシピ::"
1257
1258
#: bzrlib/builtins.py:2030
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:2041
1273
msgid ""
1274
"Create the path leading up to the branch if it does not already exist."
1275
msgstr "ブランチまでのパスが存在していなければ、作成します。"
1276
1277
#: bzrlib/builtins.py:2044
1278
msgid "Specify a format for this branch. See \"help formats\"."
1279
msgstr "ブランチのフォーマットを指定します。\"help formats\"をご覧ください。"
1280
1281
#: bzrlib/builtins.py:2052
1282
msgid ""
1283
"Never change revnos or the existing log. Append revisions to it only."
1284
msgstr "リビジョン番号や既存のログを変更せず、リビジョンの追加だけを行います。"
1285
1286
#: bzrlib/builtins.py:2055
1287
msgid "Create a branch without a working tree."
1288
msgstr "作業ツリーをもたないブランチを作成します。"
1289
1290
#: bzrlib/builtins.py:2075 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:2109
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:2120
1305
msgid "Created a {0} (format: {1})\n"
1306
msgstr "{0}を作成しました。(フォーマット:{1})\n"
1307
1308
#: bzrlib/builtins.py:2129
1309
#, python-format
1310
msgid "Using shared repository: %s\n"
1311
msgstr "共有リポジトリを使用しました。: %s\n"
1312
1313
#: bzrlib/builtins.py:2133
1314
msgid "Create a shared repository for branches to share storage space."
1315
msgstr "ブランチのストレージを共有するための共有リポジトリを作成します。"
1316
1317
#: bzrlib/builtins.py:2135
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:2140
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:2147
1345
msgid ""
1346
":Examples:\n"
1347
" Create a shared repository holding just branches::"
1348
msgstr ""
1349
":例:\n"
1350
" ブランチだけをもつリポジトリを作成します。::"
1351
1352
#: bzrlib/builtins.py:2150
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:2153
1361
msgid " Make a lightweight checkout elsewhere::"
1362
msgstr " 別の場所に軽量チェックアウトを作成します。::"
1363
1364
#: bzrlib/builtins.py:2155
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:2163
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:2167
1380
msgid "Repository format"
1381
msgstr "リポジトリフォーマット"
1382
1383
#: bzrlib/builtins.py:2169
1384
msgid "Branches in the repository will default to not having a working tree."
1385
msgstr "リポジトリ内のブランチにはデフォルトでは作業ツリーを持たせません。"
1386
1387
#: bzrlib/builtins.py:2195
1388
msgid "Show differences in the working tree, between revisions or branches."
1389
msgstr "作業ツリーや、リビジョン、ブランチ間の差分を表示します。"
1390
1391
#: bzrlib/builtins.py:2197
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:2204
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:2207
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:2214
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:2220
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:2223
1451
msgid " bzr diff"
1452
msgstr " bzr diff"
1453
1454
#: bzrlib/builtins.py:2225
1455
msgid " Difference between the working tree and revision 1::"
1456
msgstr " 作業ツリーとリビジョン１を比較します。::"
1457
1458
#: bzrlib/builtins.py:2227
1459
msgid " bzr diff -r1"
1460
msgstr " bzr diff -r1"
1461
1462
#: bzrlib/builtins.py:2229
1463
msgid " Difference between revision 3 and revision 1::"
1464
msgstr " リビジョン３とリビジョン１を比較します。::"
1465
1466
#: bzrlib/builtins.py:2231
1467
msgid " bzr diff -r1..3"
1468
msgstr " bzr diff -r1..3"
1469
1470
#: bzrlib/builtins.py:2233
1471
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1472
msgstr " ブランチxxxのリビジョン３とリビジョン１を比較します。::"
1473
1474
#: bzrlib/builtins.py:2235
1475
msgid " bzr diff -r1..3 xxx"
1476
msgstr " bzr diff -r1..3 xxx"
1477
1478
#: bzrlib/builtins.py:2237
1479
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1480
msgstr " リビジョン２での変更です。(-r1..2 と同じです。)::"
1481
1482
#: bzrlib/builtins.py:2239
1483
msgid " bzr diff -c2"
1484
msgstr " bzr diff -c2"
1485
1486
#: bzrlib/builtins.py:2241
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:2245
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:2249
1506
msgid " bzr diff -r<chosen_parent>..X"
1507
msgstr " bzr diff -r<対象の親リビジョン>..X"
1508
1509
#: bzrlib/builtins.py:2251
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:2254
1516
msgid " bzr diff -r-2.."
1517
msgstr " bzr diff -r-2.."
1518
1519
#: bzrlib/builtins.py:2256
1520
msgid " Show just the differences for file NEWS::"
1521
msgstr " ファイルNEWSの変更だけを表示します。::"
1522
1523
#: bzrlib/builtins.py:2258
1524
msgid " bzr diff NEWS"
1525
msgstr " bzr diff NEWS"
1526
1527
#: bzrlib/builtins.py:2260
1528
msgid " Show the differences in working tree xxx for file NEWS::"
1529
msgstr " 作業ツリーxxxの、ファイルNEWSの変更内容を表示します。::"
1530
1531
#: bzrlib/builtins.py:2262
1532
msgid " bzr diff xxx/NEWS"
1533
msgstr " bzr diff xxx/NEWS"
1534
1535
#: bzrlib/builtins.py:2264
1536
msgid " Show the differences from branch xxx to this working tree:"
1537
msgstr " ブランチxxxと作業ツリーとの間の差分を表示します。::"
1538
1539
#: bzrlib/builtins.py:2266
1540
msgid " bzr diff --old xxx"
1541
msgstr " bzr diff --old xxx"
1542
1543
#: bzrlib/builtins.py:2268
1544
msgid " Show the differences between two branches for file NEWS::"
1545
msgstr " ２つのブランチ間での、ファイルNEWSの差分を表示します。::"
1546
1547
#: bzrlib/builtins.py:2270
1548
msgid " bzr diff --old xxx --new yyy NEWS"
1549
msgstr " bzr diff --old xxx --new yyy NEWS"
1550
1551
#: bzrlib/builtins.py:2272
1552
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1553
msgstr " 'bzr diff'と同じですが、プレフィックスold/、new/を付加します。::"
1554
1555
#: bzrlib/builtins.py:2274
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:2284
1570
msgid "Pass these options to the external diff program."
1571
msgstr "これらのオプションは外部のdiffプログラムに渡されます。"
1572
1573
#: bzrlib/builtins.py:2287
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:2290
1580
msgid "Branch/tree to compare from."
1581
msgstr "比較元のブランチ/作業ツリーです。"
1582
1583
#: bzrlib/builtins.py:2294
1584
msgid "Branch/tree to compare to."
1585
msgstr "比較先のブランチ/作業ツリーです。"
1586
1587
#: bzrlib/builtins.py:2300
1588
msgid "Use this command to compare files."
1589
msgstr "ファイル比較に使うコマンドです。"
1590
1591
#: bzrlib/builtins.py:2305
1592
msgid "Diff format to use."
1593
msgstr "使用するDiffフォーマットです。"
1594
1595
#: bzrlib/builtins.py:2307
1596
msgid "Diff format"
1597
msgstr "Diffフォーマット"
1598
1599
#: bzrlib/builtins.py:2329
1600
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1601
msgstr "--prefix は２つの値をコロンで区切ったものにしてください。 (例 \"old/:new/\")"
1602
1603
#: bzrlib/builtins.py:2333
1604
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1605
msgstr "bzr diff --revision には１つまたは２つのリビジョンを指定してください。"
1606
1607
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1608
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1609
msgid "{0} and {1} are mutually exclusive"
1610
msgstr "{0} と {1} を同時に指定することはできません。"
1611
1612
#: bzrlib/builtins.py:2358
1613
msgid ""
1614
"List files deleted in the working tree.\n"
1615
" "
1616
msgstr ""
1617
"作業ツリー上で削除されたファイルをリストアップします。\n"
1618
" "
1619
1620
#: bzrlib/builtins.py:2436
1621
msgid "Show the tree root directory."
1622
msgstr "ツリーのルートディレクトリを表示します。"
1623
1624
#: bzrlib/builtins.py:2438
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:2453
1631
msgid "The limit argument must be an integer."
1632
msgstr "limitは整数でなければなりません。"
1633
1634
#: bzrlib/builtins.py:2461
1635
msgid "The levels argument must be an integer."
1636
msgstr "levelsは整数でなければなりません。"
1637
1638
#: bzrlib/builtins.py:2466
1639
msgid "Show historical log for a branch or subset of a branch."
1640
msgstr "ブランチ、もしくはブランチの一部の履歴ログを表示します。"
1641
1642
#: bzrlib/builtins.py:2468
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:2473
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:2477
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:2484
1680
msgid ":Output control:"
1681
msgstr ":出力のコントロール:"
1682
1683
#: bzrlib/builtins.py:2486
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:2491
1696
msgid ""
1697
" The following options can be used to control what information is\n"
1698
" displayed::"
1699
msgstr " 以下のオプションで、どの情報を表示するかをコントロールできます。"
1700
1701
#: bzrlib/builtins.py:2494
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:2500
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:2504
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:2508
1735
msgid ":Ordering control:"
1736
msgstr ":表示順のコントロール:"
1737
1738
#: bzrlib/builtins.py:2510
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:2515
1750
msgid ":Revision filtering:"
1751
msgstr ":リビジョンのフィルタリング:"
1752
1753
#: bzrlib/builtins.py:2517
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:2520
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:2525
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:2528
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:2535
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:2542
1814
msgid ":Path filtering:"
1815
msgstr ":パスのフィルタリング:"
1816
1817
#: bzrlib/builtins.py:2544
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:2548
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:2552
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:2555
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:2559
1855
msgid " In this case:"
1856
msgstr " この場合:"
1857
1858
#: bzrlib/builtins.py:2561
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:2563
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:2565
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:2568
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:2571
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:2575
1893
msgid ":Other filtering:"
1894
msgstr ":その他のフィルタリング:"
1895
1896
#: bzrlib/builtins.py:2577
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:2583
1911
msgid ":Tips & tricks:"
1912
msgstr ":Tips & tricks:"
1913
1914
#: bzrlib/builtins.py:2585
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:2591
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:2593
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:2598
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:2602
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:2605
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:2610
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:2615
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:2624
1998
msgid "Show from oldest to newest."
1999
msgstr "古い方から新しい方へ表示する"
2000
2001
#: bzrlib/builtins.py:2627
2002
msgid "Show files changed in each revision."
2003
msgstr "各リビジョンでのファイルの変更を表示する"
2004
2005
#: bzrlib/builtins.py:2633
2006
msgid "Show just the specified revision. See also \"help revisionspec\"."
2007
msgstr "指定されたリビジョンだけを表示する。 ``help revisionspec``を参照"
2008
2009
#: bzrlib/builtins.py:2637
2010
msgid "What names to list as authors - first, all or committer."
2011
msgstr "誰を作者として表示するか - first、all、またはcommitter"
2012
2013
#: bzrlib/builtins.py:2638
2014
msgid "Authors"
2015
msgstr "作者"
2016
2017
#: bzrlib/builtins.py:2643
2018
msgid "Number of levels to display - 0 for all, 1 for flat."
2019
msgstr "表示するレベル。-0で全て、1で１階層"
2020
2021
#: bzrlib/builtins.py:2653
2022
msgid "Limit the output to the first N revisions."
2023
msgstr "最初のNリビジョンだけを出力する"
2024
2025
#: bzrlib/builtins.py:2658
2026
msgid "Show changes made in each revision as a patch."
2027
msgstr "各リビジョンでの変更をパッチとして表示"
2028
2029
#: bzrlib/builtins.py:2660
2030
msgid "Show merged revisions like --levels 0 does."
2031
msgstr "--levels 0 と同じようにマージされたリビジョンを表示する"
2032
2033
#: bzrlib/builtins.py:2664
2034
msgid "Do not report commits with more than one parent."
2035
msgstr "複数の親を持つコミットを表示しない"
2036
2037
#: bzrlib/builtins.py:2666
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:2670
2044
msgid "Show digital signature validity."
2045
msgstr "デジタル署名を表示"
2046
2047
#: bzrlib/builtins.py:2673
2048
msgid "Show revisions whose properties match this expression."
2049
msgstr "この表現にマッチするプロパティのリビジョンを表示"
2050
2051
#: bzrlib/builtins.py:2677
2052
msgid "Show revisions whose message matches this expression."
2053
msgstr "この表現にマッチするメッセージのリビジョンを表示"
2054
2055
#: bzrlib/builtins.py:2681
2056
msgid "Show revisions whose committer matches this expression."
2057
msgstr "コミッタが指定された表現にマッチするリビジョンを表示する"
2058
2059
#: bzrlib/builtins.py:2685
2060
msgid "Show revisions whose authors match this expression."
2061
msgstr "作者が指定された表現にマッチするリビジョンを表示する"
2062
2063
#: bzrlib/builtins.py:2689
2064
msgid "Show revisions whose bugs match this expression."
2065
msgstr "バグ情報が指定された表現にマッチするリビジョンを表示します"
2066
2067
#: bzrlib/builtins.py:2743
2068
msgid "--exclude-common-ancestry requires -r with two revisions"
2069
msgstr "--exclude-common-ancestryには、-rで2つのリビジョンを指定する必要があります。"
2070
2071
#: bzrlib/builtins.py:2771
2072
#, python-format
2073
msgid "Path unknown at end or start of revision range: %s"
2074
msgstr "最後のリビジョンにも最初のリビジョンにもパスが見つかりません: %s"
2075
2076
#: bzrlib/builtins.py:2888
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:2904
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:2949
2087
msgid ""
2088
"List files in a tree.\n"
2089
" "
2090
msgstr ""
2091
"ツリー内のファイルをリストアップします。\n"
2092
" "
2093
2094
#: bzrlib/builtins.py:2958
2095
msgid "Recurse into subdirectories."
2096
msgstr "サブディレクトリも再帰で処理します。"
2097
2098
#: bzrlib/builtins.py:2960
2099
msgid "Print paths relative to the root of the branch."
2100
msgstr "ブランチのルートからの相対パスを表示します。"
2101
2102
#: bzrlib/builtins.py:2962
2103
msgid "Print unknown files."
2104
msgstr "バージョン管理外のファイルを表示します。"
2105
2106
#: bzrlib/builtins.py:2963
2107
msgid "Print versioned files."
2108
msgstr "バージョン管理されたファイルを表示します。"
2109
2110
#: bzrlib/builtins.py:2966
2111
msgid "Print ignored files."
2112
msgstr "無視されたファイルを表示します。"
2113
2114
#: bzrlib/builtins.py:2968
2115
msgid "List entries of a particular kind: file, directory, symlink."
2116
msgstr "指定された種別のアイテム(ファイル、ディレクトリ、シンボリックリンク)を表示します。"
2117
2118
#: bzrlib/builtins.py:2981
2119
msgid "invalid kind specified"
2120
msgstr "無効な種別が指定されました。"
2121
2122
#: bzrlib/builtins.py:2984
2123
msgid "Cannot set both --verbose and --null"
2124
msgstr "--verboseと--nullを同時に指定することはできません。"
2125
2126
#: bzrlib/builtins.py:2993
2127
msgid "cannot specify both --from-root and PATH"
2128
msgstr "--from-rootとPATHを同時に指定することはできません。"
2129
2130
#: bzrlib/builtins.py:3080
2131
msgid "Ignore specified files or patterns."
2132
msgstr "指定されたファイルやパターンを無視します。"
2133
2134
#: bzrlib/builtins.py:3082
2135
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2136
msgstr "パターンの書き方の詳細は ``bzr help patterns`` をご覧ください。"
2137
2138
#: bzrlib/builtins.py:3084
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:3090
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:3095
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:3101
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:3105
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:3108
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:3113
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:3116
2216
msgid ""
2217
":Examples:\n"
2218
" Ignore the top level Makefile::"
2219
msgstr ""
2220
":例:\n"
2221
" トップレベルのMakefileを無視する::"
2222
2223
#: bzrlib/builtins.py:3119
2224
msgid " bzr ignore ./Makefile"
2225
msgstr " bzr ignore ./Makefile"
2226
2227
#: bzrlib/builtins.py:3121
2228
msgid " Ignore .class files in all directories...::"
2229
msgstr " すべてのディレクトリの.classファイルを無視するが...::"
2230
2231
#: bzrlib/builtins.py:3123
2232
msgid " bzr ignore \"*.class\""
2233
msgstr " bzr ignore \"*.class\""
2234
2235
#: bzrlib/builtins.py:3125
2236
msgid " ...but do not ignore \"special.class\"::"
2237
msgstr " ...\"special.class\" は無視しない::"
2238
2239
#: bzrlib/builtins.py:3127
2240
msgid " bzr ignore \"!special.class\""
2241
msgstr " bzr ignore \"!special.class\""
2242
2243
#: bzrlib/builtins.py:3129
2244
msgid " Ignore files whose name begins with the \"#\" character::"
2245
msgstr " #で始まるファイルを無視する::"
2246
2247
#: bzrlib/builtins.py:3131
2248
msgid " bzr ignore \"RE:^#\""
2249
msgstr " bzr ignore \"RE:^#\""
2250
2251
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2252
msgid " Ignore .o files under the lib directory::"
2253
msgstr " libディレクトリ配下の.oファイルを無視する::"
2254
2255
#: bzrlib/builtins.py:3135
2256
msgid " bzr ignore \"lib/**/*.o\""
2257
msgstr " bzr ignore \"lib/**/*.o\""
2258
2259
#: bzrlib/builtins.py:3139
2260
msgid " bzr ignore \"RE:lib/.*\\.o\""
2261
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2262
2263
#: bzrlib/builtins.py:3141
2264
msgid " Ignore everything but the \"debian\" toplevel directory::"
2265
msgstr " \"debian\"トップレベルディレクトリ以外の全てを無視する::"
2266
2267
#: bzrlib/builtins.py:3143
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:3157
2288
msgid "Display the default ignore rules that bzr uses."
2289
msgstr "bzrが使用するデフォルトの無視ルールを表示します。"
2290
2291
#: bzrlib/builtins.py:3169
2292
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2293
msgstr "ignoreにはNAME_PATTERNか--default-rulesのどちらかは指定する必要があります。"
2294
2295
#: bzrlib/builtins.py:3180
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:3189
2302
msgid "NAME_PATTERN should not be an absolute path"
2303
msgstr "NAME_PATTERNに絶対パスは指定できません。"
2304
2305
#: bzrlib/builtins.py:3202
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:3209
2319
msgid "List ignored files and the patterns that matched them."
2320
msgstr "無視するファイルとそれらにマッチするパターンの一覧を表示する。"
2321
2322
#: bzrlib/builtins.py:3211
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:3214
2329
msgid "Alternatively, to list just the files::"
2330
msgstr "代わりにファイルの一覧だけを表示するには::"
2331
2332
#: bzrlib/builtins.py:3216
2333
msgid " bzr ls --ignored"
2334
msgstr " bzr ls --ignored"
2335
2336
#: bzrlib/builtins.py:3250
2337
#, python-format
2338
msgid "not a valid revision-number: %r"
2339
msgstr "無効なリビジョン番号です。: %r"
2340
2341
#: bzrlib/builtins.py:3257
2342
msgid ""
2343
"Export current or past revision to a destination directory or archive."
2344
msgstr "最新、または過去のリビジョンを指定されたディレクトリもしくはアーカイブにエクスポートする。"
2345
2346
#: bzrlib/builtins.py:3259
2347
msgid "If no revision is specified this exports the last committed revision."
2348
msgstr "リビジョンが指定されなければ、最終コミットのリビジョンをエクスポートします。"
2349
2350
#: bzrlib/builtins.py:3261
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:3265
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:3269
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:3272
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:3274
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:3288
2405
msgid "Type of file to export to."
2406
msgstr "エクスポートするファイルの種類"
2407
2408
#: bzrlib/builtins.py:3291
2409
msgid "Apply content filters to export the convenient form."
2410
msgstr "使いやすい形でエクスポートするためのコンテンツフィルターを適用します。"
2411
2412
#: bzrlib/builtins.py:3295
2413
msgid "Name of the root directory inside the exported file."
2414
msgstr "エクスポートされたファイル内部のrootディレクトリの名前。"
2415
2416
#: bzrlib/builtins.py:3297
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:3300
2423
msgid ""
2424
"Export the working tree contents rather than that of the last revision."
2425
msgstr "最終リビジョンではなく、作業ツリーの内容をエクスポートします。"
2426
2427
#: bzrlib/builtins.py:3319
2428
msgid "--uncommitted requires a working tree"
2429
msgstr "作業ツリーに対しては--uncommittedを指定する必要があります。"
2430
2431
#: bzrlib/builtins.py:3328
2432
#, python-format
2433
msgid "Unsupported export format: %s"
2434
msgstr "サポートされていないエクスポートフォーマット: %s"
2435
2436
#: bzrlib/builtins.py:3332
2437
msgid ""
2438
"Write the contents of a file as of a given revision to standard output."
2439
msgstr "指定されたリビジョンのファイルの内容を標準出力に書き出します。"
2440
2441
#: bzrlib/builtins.py:3334
2442
msgid "If no revision is nominated, the last revision is used."
2443
msgstr "リビジョンが指定されなければ、最後のリビジョンが使用されます。"
2444
2445
#: bzrlib/builtins.py:3336
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:3342
2454
msgid "The path name in the old tree."
2455
msgstr "古いツリーのパス名。"
2456
2457
#: bzrlib/builtins.py:3343
2458
msgid "Apply content filters to display the convenience form."
2459
msgstr "便利な形で表示するためのフィルタを適用します。"
2460
2461
#: bzrlib/builtins.py:3354
2462
msgid "bzr cat --revision takes exactly one revision specifier"
2463
msgstr "bzr cat --revisionにはリビジョンをひとつだけ指定します。"
2464
2465
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2466
msgid "{0!r} is not present in revision {1}"
2467
msgstr "{0!r}はリビジョン{1}には存在しません。"
2468
2469
#: bzrlib/builtins.py:3414
2470
msgid "Commit changes into a new revision."
2471
msgstr "変更を新しいリビジョンにコミットする。"
2472
2473
#: bzrlib/builtins.py:3416
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:3423
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:3427
2499
msgid ":Selective commits:"
2500
msgstr ":部分的なコミット:"
2501
2502
#: bzrlib/builtins.py:3429
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:3433
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:3437
2523
msgid " bzr commit foo -x foo/bar"
2524
msgstr " bzr commit foo -x foo/bar"
2525
2526
#: bzrlib/builtins.py:3439
2527
msgid " A selective commit after a merge is not yet supported."
2528
msgstr " マージ後の部分的なコミットはまだサポートされていません。"
2529
2530
#: bzrlib/builtins.py:3441
2531
msgid ":Custom authors:"
2532
msgstr ":作者の変更:"
2533
2534
#: bzrlib/builtins.py:3443
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
" もし、変更を行った人とコミットする人がちがう場合は、作者の名前を--author\n"
2544
" オプションで指定することができます。\"John Doe <jdoe@example.com>\"の\n"
2545
" ように、コミッターのIDと同じフォーマットで指定するべきです。複数の作者が\n"
2546
" いるなら、このオプションを複数回指定することもできます。"
2547
2548
#: bzrlib/builtins.py:3450
2549
msgid ":Checks:"
2550
msgstr ":チェック:"
2551
2552
#: bzrlib/builtins.py:3452
2553
msgid ""
2554
" A common mistake is to forget to add a new file or directory before\n"
2555
" running the commit command. The --strict option checks for unknown\n"
2556
" files and aborts the commit if any are found. More advanced pre-commit\n"
2557
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2558
" for details."
2559
msgstr ""
2560
" よくあるミスとして、新しく作ったファイルやディレクトリをコミット前に追加するのを\n"
2561
" 忘れてしまうということがあります。--strictオプションを指定すると、バージョン管理\n"
2562
" 外のファイルがある場合はコミットが失敗するようになります。もっと高度なコミット\n"
2563
" 前チェックをフックとして実装することもできます。詳細は ``bzr help hooks`` を\n"
2564
" ご覧ください。"
2565
2566
#: bzrlib/builtins.py:3458
2567
msgid ":Things to note:"
2568
msgstr ":特記事項:"
2569
2570
#: bzrlib/builtins.py:3460
2571
msgid ""
2572
" If you accidentially commit the wrong changes or make a spelling\n"
2573
" mistake in the commit message say, you can use the uncommit command\n"
2574
" to undo it. See ``bzr help uncommit`` for details."
2575
msgstr ""
2576
" もし、間違ったファイルをコミットしてしまったり、コミットメッセージにスペル\n"
2577
" ミスがあった場合は、uncommitコマンドでコミットを取り消すことができます。\n"
2578
" 詳細は ``bzr help uncommit`` をご覧ください。"
2579
2580
#: bzrlib/builtins.py:3464
2581
msgid ""
2582
" Hooks can also be configured to run after a commit. This allows you\n"
2583
" to trigger updates to external systems like bug trackers. The --fixes\n"
2584
" option can be used to record the association between a revision and\n"
2585
" one or more bugs. See ``bzr help bugs`` for details."
2586
msgstr ""
2587
" コミット後にフックを実行することもできます。これによって、バグトラッカーなどの\n"
2588
" 外部のシステムを更新することができます。 --fixesオプションで、リビジョンと\n"
2589
" バグとの関係を記録することができます。詳細は ``bzr help bugs`` を見て\n"
2590
" ください。"
2591
2592
#: bzrlib/builtins.py:3474
2593
msgid "Do not consider changes made to a given path."
2594
msgstr "指定されたパスの変更を無視します。"
2595
2596
#: bzrlib/builtins.py:3477
2597
msgid "Description of the new revision."
2598
msgstr "新しいリビジョンの説明。"
2599
2600
#: bzrlib/builtins.py:3480
2601
msgid "Commit even if nothing has changed."
2602
msgstr "何も変更されていなくてもコミットする。"
2603
2604
#: bzrlib/builtins.py:3484
2605
msgid "Take commit message from this file."
2606
msgstr "このファイルからコミットメッセージを取得する。"
2607
2608
#: bzrlib/builtins.py:3486
2609
msgid "Refuse to commit if there are unknown files in the working tree."
2610
msgstr "作業ツリーの中にバージョン管理外のファイルが存在する場合コミットを拒否する。"
2611
2612
#: bzrlib/builtins.py:3489
2613
msgid ""
2614
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2615
"08:00:00 +0100'."
2616
msgstr "コミット日時を決められたフォーマットで手動で指定します。例) '2009-10-10 08:00:00 +0100'"
2617
2618
#: bzrlib/builtins.py:3492
2619
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2620
msgstr "このリビジョンで修正されたバグをマークする(\"bzr help bugs\"を参照)。"
2621
2622
#: bzrlib/builtins.py:3495
2623
msgid "Set the author's name, if it's different from the committer."
2624
msgstr "著者の名前がコミッターとは異なる場合、著者の名前を設定する。"
2625
2626
#: bzrlib/builtins.py:3498
2627
msgid ""
2628
"Perform a local commit in a bound branch. Local commits are not pushed to "
2629
"the master branch until a normal commit is performed."
2630
msgstr ""
2631
"バインドされたブランチにローカルコミットを実行する。 通常のコミットが実行されるまで ローカルコミットはマスターブランチにpushされません。"
2632
2633
#: bzrlib/builtins.py:3504
2634
msgid ""
2635
"When no message is supplied, show the diff along with the status summary in "
2636
"the message editor."
2637
msgstr "メッセージが提供されないとき、 メッセージエディタでステータスの要約と一緒に差分を表示する。"
2638
2639
#: bzrlib/builtins.py:3507
2640
msgid ""
2641
"When committing to a foreign version control system do not push data that "
2642
"can not be natively represented."
2643
msgstr "外部のバージョン管理システムにコミットするときに、ネイティブに表現できないデータをプッシュしません。"
2644
2645
#: bzrlib/builtins.py:3525
2646
#, python-format
2647
msgid ""
2648
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2649
"default bug tracker using the `bugtracker` option.\n"
2650
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2651
msgstr ""
2652
"バグ %s のバグトラッカーが指定されていません。'トラッカー:id'の形式にするか、デフォルトのトラッカーを `bugtracker` "
2653
"オプションで指定してください。\n"
2654
"詳細は \"bzr help bugs\" をご覧ください。コミットは拒否されました。"
2655
2656
#: bzrlib/builtins.py:3534
2657
#, python-format
2658
msgid ""
2659
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2660
"for more information on this feature.\n"
2661
"Commit refused."
2662
msgstr ""
2663
"無効なバグです。 %s 'トラッカー:id' の形式で指定する必要があります。詳細は \"bzr help bugs\" をご覧ください。\n"
2664
"コミットは拒否されました。"
2665
2666
#: bzrlib/builtins.py:3543
2667
#, python-format
2668
msgid "Unrecognized bug %s. Commit refused."
2669
msgstr "不明なバグです。 %s コミットは拒否されました。"
2670
2671
#: bzrlib/builtins.py:3546
2672
#, python-format
2673
msgid ""
2674
"%s\n"
2675
"Commit refused."
2676
msgstr ""
2677
"%s\n"
2678
"コミットは拒否されました。"
2679
2680
#: bzrlib/builtins.py:3570
2681
msgid "Could not parse --commit-time: "
2682
msgstr "--commit-timeをパースできません。: "
2683
2684
#: bzrlib/builtins.py:3610
2685
msgid "please specify either --message or --file"
2686
msgstr "--message か --file かどちらかを指定してください。"
2687
2688
#: bzrlib/builtins.py:3639
2689
msgid "please specify a commit message with either --message or --file"
2690
msgstr "--messageか--fileのどちらかでコミットメッセージを指定してください。"
2691
2692
#: bzrlib/builtins.py:3642
2693
msgid ""
2694
"Empty commit message specified. Please specify a commit message with either -"
2695
"-message or --file or leave a blank message with --message \"\"."
2696
msgstr ""
2697
"空のコミットメッセージが指定されました。--messageか--fileでコミットメッセージを指定するか、--message "
2698
"\"\"で空メッセージを指定してください。"
2699
2700
#: bzrlib/builtins.py:3662
2701
msgid ""
2702
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2703
"-unchanged to force an empty commit."
2704
msgstr ""
2705
"コミットする変更がありません。コミットしたいファイルを'bzr add'で追加するか、--unchangedを指定して空のコミットを実行してください。"
2706
2707
#: bzrlib/builtins.py:3666
2708
msgid ""
2709
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2710
"resolve FILE\" to resolve."
2711
msgstr "作業ツリーに競合があります。\"bzr conflicts\" で表示して、\"bzr resolve FILE\"で解消してください。"
2712
2713
#: bzrlib/builtins.py:3670
2714
msgid "Commit refused because there are unknown files in the working tree."
2715
msgstr "作業ツリーにバージョン管理外のファイルがあるため、コミットが拒否されました。"
2716
2717
#: bzrlib/builtins.py:3673
2718
msgid ""
2719
"\n"
2720
"To commit to master branch, run update and then commit.\n"
2721
"You can also pass --local to commit to continue working disconnected."
2722
msgstr ""
2723
"\n"
2724
"マスタブランチにコミットするには、先にupdateしてください。\n"
2725
"--localを指定してオフラインでコミットし、作業を続けることもできます。"
2726
2727
#: bzrlib/builtins.py:3681
2728
msgid ""
2729
"Validate working tree structure, branch consistency and repository history."
2730
msgstr "作業ツリーの構造、ブランチの一貫性、リポジトリの履歴をチェックします。"
2731
2732
#: bzrlib/builtins.py:3683
2733
msgid ""
2734
"This command checks various invariants about branch and repository storage\n"
2735
"to detect data corruption or bzr bugs."
2736
msgstr ""
2737
"このコマンドは、データの破損やbzrのバグを検出するために、ブランチとリポジトリ\n"
2738
"ストレージの不変条件をチェックします。"
2739
2740
#: bzrlib/builtins.py:3686
2741
msgid ""
2742
"The working tree and branch checks will only give output if a problem is\n"
2743
"detected. The output fields of the repository check are:"
2744
msgstr ""
2745
"作業ツリーとブランチのチェック結果は、問題が見つかったときだけ表示\n"
2746
"されます。リポジトリチェックの出力は次の通りです。:"
2747
2748
#: bzrlib/builtins.py:3689
2749
msgid ""
2750
"revisions\n"
2751
" This is just the number of revisions checked. It doesn't\n"
2752
" indicate a problem."
2753
msgstr ""
2754
"revisions\n"
2755
" チェックしたリビジョンの数です。これは問題ではありません。"
2756
2757
#: bzrlib/builtins.py:3693
2758
msgid ""
2759
"versionedfiles\n"
2760
" This is just the number of versionedfiles checked. It\n"
2761
" doesn't indicate a problem."
2762
msgstr ""
2763
"versionedfiles\n"
2764
" チェックしたバージョン管理ファイルの数です。これは問題では\n"
2765
" ありません。"
2766
2767
#: bzrlib/builtins.py:3697
2768
msgid ""
2769
"unreferenced ancestors\n"
2770
" Texts that are ancestors of other texts, but\n"
2771
" are not properly referenced by the revision ancestry. This is a\n"
2772
" subtle problem that Bazaar can work around."
2773
msgstr ""
2774
"unreferenced ancestors\n"
2775
" 他のテキストの先祖だが、上位のリビジョンから参照されていない\n"
2776
" と思われるテキストです。これは、Bazaarが対処できる軽微な\n"
2777
" 問題です。"
2778
2779
#: bzrlib/builtins.py:3702
2780
msgid ""
2781
"unique file texts\n"
2782
" This is the total number of unique file contents\n"
2783
" seen in the checked revisions. It does not indicate a problem."
2784
msgstr ""
2785
"unique file texts\n"
2786
" チェックしたリビジョンの中にある、一意なファイルコンテンツの数です。\n"
2787
" これは問題ではありません。"
2788
2789
#: bzrlib/builtins.py:3706
2790
msgid ""
2791
"repeated file texts\n"
2792
" This is the total number of repeated texts seen\n"
2793
" in the checked revisions. Texts can be repeated when their file\n"
2794
" entries are modified, but the file contents are not. It does not\n"
2795
" indicate a problem."
2796
msgstr ""
2797
"repeated file texts\n"
2798
" チェックしたリビジョンの中にある、重複したテキストの数です。\n"
2799
" ファイルのエントリが変更されたが、内容は変更されていない場合に、\n"
2800
" 重複が発生します。これは問題ではありません。"
2801
2802
#: bzrlib/builtins.py:3712
2803
msgid ""
2804
"If no restrictions are specified, all Bazaar data that is found at the "
2805
"given\n"
2806
"location will be checked."
2807
msgstr ""
2808
"条件が指定されなければ、指定された場所の全てのBazaarデータが\n"
2809
"チェックされます。"
2810
2811
#: bzrlib/builtins.py:3717
2812
msgid " Check the tree and branch at 'foo'::"
2813
msgstr " ‘foo’ でのツリーとブランチをチェックする::"
2814
2815
#: bzrlib/builtins.py:3719
2816
msgid " bzr check --tree --branch foo"
2817
msgstr " bzr check --tree --branch foo"
2818
2819
#: bzrlib/builtins.py:3721
2820
msgid " Check only the repository at 'bar'::"
2821
msgstr " ‘bar’でのリポジトリのみをチェックする::"
2822
2823
#: bzrlib/builtins.py:3723
2824
msgid " bzr check --repo bar"
2825
msgstr " bzr check --repo bar"
2826
2827
#: bzrlib/builtins.py:3725
2828
msgid " Check everything at 'baz'::"
2829
msgstr " ‘baz’ ですべてをチェックする::"
2830
2831
#: bzrlib/builtins.py:3727
2832
msgid " bzr check baz"
2833
msgstr " bzr check baz"
2834
2835
#: bzrlib/builtins.py:3733
2836
msgid "Check the branch related to the current directory."
2837
msgstr "現在のディレクトリに関連したブランチをチェックする。"
2838
2839
#: bzrlib/builtins.py:3735
2840
msgid "Check the repository related to the current directory."
2841
msgstr "現在のディレクトリに関連したリポジトリをチェックする。"
2842
2843
#: bzrlib/builtins.py:3737
2844
msgid "Check the working tree related to the current directory."
2845
msgstr "現在のディレクトリに関連した作業ツリーをチェックする。"
2846
2847
#: bzrlib/builtins.py:3751
2848
msgid "Upgrade a repository, branch or working tree to a newer format."
2849
msgstr "リポジトリ、ブランチ、作業ツリーを新しいフォーマットにアップグレードします。"
2850
2851
#: bzrlib/builtins.py:3753
2852
msgid ""
2853
"When the default format has changed after a major new release of\n"
2854
"Bazaar, you may be informed during certain operations that you\n"
2855
"should upgrade. Upgrading to a newer format may improve performance\n"
2856
"or make new features available. It may however limit interoperability\n"
2857
"with older repositories or with older versions of Bazaar."
2858
msgstr ""
2859
"Bazaarのメジャーリリースの後にデフォルトのフォーマットが変更された場合、\n"
2860
"いくつかのオペレーションの際に、アップグレードすべきであると通知されます。\n"
2861
"新しいフォーマットへのアップグレードによって、パフォーマンスが改善されたり、\n"
2862
"新しい機能が使えるようになるでしょう。ただし、古いバージョンのリポジトリや\n"
2863
"Bazaarとの互換性には制限が発生するかもしれません。"
2864
2865
#: bzrlib/builtins.py:3759
2866
msgid ""
2867
"If you wish to upgrade to a particular format rather than the\n"
2868
"current default, that can be specified using the --format option.\n"
2869
"As a consequence, you can use the upgrade command this way to\n"
2870
"\"downgrade\" to an earlier format, though some conversions are\n"
2871
"a one way process (e.g. changing from the 1.x default to the\n"
2872
"2.x default) so downgrading is not always possible."
2873
msgstr ""
2874
"デフォルトではなく特定のフォーマットにアップグレードしたい場合は、--format\n"
2875
"オプションで指定します。これを利用して、upgradeコマンドで昔のフォーマットに\n"
2876
"*\"ダウングレード\"* することもできますが、変換処理によっては不可逆なものも\n"
2877
"あります。(たとえば、1.xのデフォルトから2.xのデフォルトへの変換は不可逆です)\n"
2878
"そのため、ダウングレードできない場合もあります。"
2879
2880
#: bzrlib/builtins.py:3766
2881
msgid ""
2882
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2883
"process (where # is a number). By default, this is left there on\n"
2884
"completion. If the conversion fails, delete the new .bzr directory\n"
2885
"and rename this one back in its place. Use the --clean option to ask\n"
2886
"for the backup.bzr directory to be removed on successful conversion.\n"
2887
"Alternatively, you can delete it by hand if everything looks good\n"
2888
"afterwards."
2889
msgstr ""
2890
"変換を開始したときに、 backup.bzr.~#~ というディレクトリが作成されます。\n"
2891
"(#は連番です) デフォルトでは、このフォルダは変換後も残ります。もし変換が\n"
2892
"失敗したら、新しい.bzrフォルダを削除して、このフォルダを元の名前に戻して\n"
2893
"ください。--cleanオプションを指定すると、変換が成功したらbackup.bzr\n"
2894
"ディレクトリは削除されます。そうでない場合は、変換後特に問題がなければ手で\n"
2895
"削除してください。"
2896
2897
#: bzrlib/builtins.py:3774
2898
msgid ""
2899
"If the location given is a shared repository, dependent branches\n"
2900
"are also converted provided the repository converts successfully.\n"
2901
"If the conversion of a branch fails, remaining branches are still\n"
2902
"tried."
2903
msgstr ""
2904
"指定された場所が共用リポジトリの場合、リポジトリの変換が成功したら\n"
2905
"配下のブランチも変換されます。もしブランチの変換に失敗しても、他の\n"
2906
"ブランチの変換は続行されます。"
2907
2908
#: bzrlib/builtins.py:3779
2909
msgid ""
2910
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2911
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2912
msgstr ""
2913
"アップグレードに関する詳細な情報は、Bazaar Upgrade Guideをご覧ください。\n"
2914
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2915
2916
#: bzrlib/builtins.py:3787
2917
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2918
msgstr "指定されたフォーマットにアップグレードします。詳細は\"bzr help formats\"をご覧ください。"
2919
2920
#: bzrlib/builtins.py:3791
2921
msgid "Branch format"
2922
msgstr "ブランチフォーマット"
2923
2924
#: bzrlib/builtins.py:3793
2925
msgid "Remove the backup.bzr directory if successful."
2926
msgstr "変換に成功したらbackup.bzrディレクトリを削除します。"
2927
2928
#: bzrlib/builtins.py:3795
2929
msgid "Show what would be done, but don't actually do anything."
2930
msgstr "何が実行されるかを表示しますが、実際には何もしません。"
2931
2932
#: bzrlib/builtins.py:3810
2933
msgid "Show or set bzr user id."
2934
msgstr "bzrのユーザIDを表示、設定します。"
2935
2936
#: bzrlib/builtins.py:3812
2937
msgid ""
2938
":Examples:\n"
2939
" Show the email of the current user::"
2940
msgstr ""
2941
":例:\n"
2942
" 現在のユーザのEメールを表示します。::"
2943
2944
#: bzrlib/builtins.py:3815
2945
msgid " bzr whoami --email"
2946
msgstr " bzr whoami --email"
2947
2948
#: bzrlib/builtins.py:3817
2949
msgid " Set the current user::"
2950
msgstr " ユーザを設定します。::"
2951
2952
#: bzrlib/builtins.py:3819
2953
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2954
msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""
2955
2956
#: bzrlib/builtins.py:3823
2957
msgid "Display email address only."
2958
msgstr "Eメールアドレスだけを表示します。"
2959
2960
#: bzrlib/builtins.py:3825
2961
msgid "Set identity for the current branch instead of globally."
2962
msgstr "全体設定ではなく、現在のブランチだけにIDを設定します。"
2963
2964
#: bzrlib/builtins.py:3851
2965
msgid "--email can only be used to display existing identity"
2966
msgstr "--emailは、現在のIDを表示するためだけに使用できます。"
2967
2968
#: bzrlib/builtins.py:3873
2969
msgid "Print or set the branch nickname."
2970
msgstr "ブランチのニックネームを表示または設定します。"
2971
2972
#: bzrlib/builtins.py:3875
2973
msgid ""
2974
"If unset, the tree root directory name is used as the nickname.\n"
2975
"To print the current nickname, execute with no argument."
2976
msgstr ""
2977
"設定されていない場合は、ツリーのルートディレクトリの名前が\n"
2978
"ニックネームとして扱われます。引数なしで実行すると、現在の\n"
2979
"ニックネームを表示します。"
2980
2981
#: bzrlib/builtins.py:3878
2982
msgid ""
2983
"Bound branches use the nickname of its master branch unless it is set\n"
2984
"locally."
2985
msgstr ""
2986
"バインドされたブランチは、ローカルでニックネームが設定されていなければ\n"
2987
"マスタブランチのニックネームを使用します。"
2988
2989
#: bzrlib/builtins.py:3898
2990
msgid "Set/unset and display aliases."
2991
msgstr "エイリアスの設定、解除、表示を行います。"
2992
2993
#: bzrlib/builtins.py:3900
2994
msgid ""
2995
":Examples:\n"
2996
" Show the current aliases::"
2997
msgstr ""
2998
":例:\n"
2999
" 現在のエイリアスを表示します。::"
3000
3001
#: bzrlib/builtins.py:3903
3002
msgid " bzr alias"
3003
msgstr " bzr alias"
3004
3005
#: bzrlib/builtins.py:3905
3006
msgid " Show the alias specified for 'll'::"
3007
msgstr " 'll'に設定されているエイリアスを表示します。::"
3008
3009
#: bzrlib/builtins.py:3907
3010
msgid " bzr alias ll"
3011
msgstr " bzr alias ll"
3012
3013
#: bzrlib/builtins.py:3909
3014
msgid " Set an alias for 'll'::"
3015
msgstr " エイリアス'll'を設定します。::"
3016
3017
#: bzrlib/builtins.py:3911
3018
msgid " bzr alias ll=\"log --line -r-10..-1\""
3019
msgstr " bzr alias ll=\"log --line -r-10..-1\""
3020
3021
#: bzrlib/builtins.py:3913
3022
msgid " To remove an alias for 'll'::"
3023
msgstr " エイリアス'll'を解除します。::"
3024
3025
#: bzrlib/builtins.py:3915
3026
msgid " bzr alias --remove ll"
3027
msgstr " bzr alias --remove ll"
3028
3029
#: bzrlib/builtins.py:3920
3030
msgid "Remove the alias."
3031
msgstr "エイリアスを削除します。"
3032
3033
#: bzrlib/builtins.py:3938
3034
msgid "bzr alias --remove expects an alias to remove."
3035
msgstr "bzr alias --removeには、削除するエイリアス名を指定する必要があります。"
3036
3037
#: bzrlib/builtins.py:4119
3038
msgid ""
3039
"subunit not available. subunit needs to be installed to use --subunit."
3040
msgstr ""
3041
3042
#: bzrlib/builtins.py:4136
3043
msgid ""
3044
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3045
msgstr "--benchmarkは、bzr2.2以降はサポートしていません。かわりにbzr-usertestを使用してください。"
3046
3047
#: bzrlib/builtins.py:4183
3048
msgid "Show version of bzr."
3049
msgstr "Bazaarのバージョンを表示します。"
3050
3051
#: bzrlib/builtins.py:4187
3052
msgid "Print just the version number."
3053
msgstr "リビジョン番号を表示します。"
3054
3055
#: bzrlib/builtins.py:4206
3056
msgid "It sure does!\n"
3057
msgstr ""
3058
3059
#: bzrlib/builtins.py:4230
3060
#, python-format
3061
msgid "merge base is revision %s\n"
3062
msgstr "マージの起点はリビジョン %s です。\n"
3063
3064
#: bzrlib/builtins.py:4234
3065
msgid "Perform a three-way merge."
3066
msgstr "3wayマージを実行します。"
3067
3068
#: bzrlib/builtins.py:4236
3069
msgid ""
3070
"The source of the merge can be specified either in the form of a branch,\n"
3071
"or in the form of a path to a file containing a merge directive generated\n"
3072
"with bzr send. If neither is specified, the default is the upstream branch\n"
3073
"or the branch most recently merged using --remember. The source of the\n"
3074
"merge may also be specified in the form of a path to a file in another\n"
3075
"branch: in this case, only the modifications to that file are merged into\n"
3076
"the current working tree."
3077
msgstr ""
3078
"マージ元には、ブランチか、bzr sendで作られたマージディレクティブファイル\n"
3079
"のパスを指定できます。どちらも指定されていない場合は、アップストリームブランチ\n"
3080
"か、一番最後に--remember指定でマージした時のマージ元がデフォルトになります。\n"
3081
"別のブランチ内のファイルパスをマージ元として指定することもでき、その場合は\n"
3082
"指定されたファイルの変更だけが現在のブランチにマージされます。"
3083
3084
#: bzrlib/builtins.py:4244
3085
msgid ""
3086
"When merging from a branch, by default bzr will try to merge in all new\n"
3087
"work from the other branch, automatically determining an appropriate base\n"
3088
"revision. If this fails, you may need to give an explicit base."
3089
msgstr ""
3090
"ブランチからマージする場合、デフォルトでbzrは自動的に妥当なベースリビジョンを\n"
3091
"判定し、それ以降のすべての変更をマージしようとします。もしこれが失敗した場合は、\n"
3092
"明示的にベースリビジョンを指定する必要があります。"
3093
3094
#: bzrlib/builtins.py:4248
3095
msgid ""
3096
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3097
"try to merge in all new work up to and including revision OTHER."
3098
msgstr ""
3099
"別の最終リビジョンを指定するには、\"-revision OTHER\"を指定します。この場合、\n"
3100
"OTHERまで(OTHERも含む)の全ての変更がマージされます。"
3101
3102
#: bzrlib/builtins.py:4251
3103
msgid ""
3104
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3105
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3106
"causes some revisions to be skipped, i.e. if the destination branch does\n"
3107
"not already contain revision BASE, such a merge is commonly referred to as\n"
3108
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
3109
"cherrypicks. The changes look like a normal commit, and the history of the\n"
3110
"changes from the other branch is not stored in the commit."
3111
msgstr ""
3112
"もし、２つのリビジョンを指定した場合(\"--revision BASE..OTHER\")、BASEから\n"
3113
"OTHERの範囲(BASEは含まず、OTHERは含む)のリビジョンがマージされます。これに\n"
3114
"よってスキップされるリビジョンがある場合、つまりマージ先のリビジョンにBASE\n"
3115
"が含まれていない場合は、いわゆる\"チェリーピック\"が行われます。通常のマージ\n"
3116
"とはちがい、今のところBazaarではチェリーピックは追跡しません。変更は、普通の\n"
3117
"コミットのように見え、マージ元での変更履歴は保存されません。"
3118
3119
#: bzrlib/builtins.py:4259
3120
msgid "Revision numbers are always relative to the source branch."
3121
msgstr "リビジョン番号は常に元のブランチに関連します。"
3122
3123
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3124
msgid ""
3125
"Merge will do its best to combine the changes in two branches, but there\n"
3126
"are some kinds of problems only a human can fix. When it encounters those,\n"
3127
"it will mark a conflict. A conflict means that you need to fix something,\n"
3128
"before you can commit."
3129
msgstr ""
3130
3131
#: bzrlib/builtins.py:4266
3132
msgid ""
3133
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3134
msgstr "問題を解消したら、bzr resolveを使用してください。bzr conflictsもご覧ください。"
3135
3136
#: bzrlib/builtins.py:4268
3137
msgid ""
3138
"If there is no default branch set, the first merge will set it (use\n"
3139
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3140
"to use the default. To change the default, use --remember. The value will\n"
3141
"only be saved if the remote location can be accessed."
3142
msgstr ""
3143
"デフォルトブランチが設定されていない場合、最初にマージを実行したときに\n"
3144
"設定されます。(これをしないようにするには、--no-rememberを指定します。)\n"
3145
"その後は、デフォルトのブランチを使用する時には指定を省略できるようになり\n"
3146
"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモートの\n"
3147
"ブランチにアクセスできた時だけ保存されます。"
3148
3149
#: bzrlib/builtins.py:4273
3150
msgid ""
3151
"The results of the merge are placed into the destination working\n"
3152
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3153
"committed to record the result of the merge."
3154
msgstr ""
3155
"マージの結果はマージ先の作業ツリー内に反映され、そこで(bzr diffを使って)\n"
3156
"レビューしたり、テストをしたあとで、コミットによって記録することができます。"
3157
3158
#: bzrlib/builtins.py:4277
3159
msgid ""
3160
"merge refuses to run if there are any uncommitted changes, unless\n"
3161
"--force is given. If --force is given, then the changes from the source \n"
3162
"will be merged with the current working tree, including any uncommitted\n"
3163
"changes in the tree. The --force option can also be used to create a\n"
3164
"merge revision which has more than two parents."
3165
msgstr ""
3166
"コミットされていない変更がある場合は、--forceを指定しないとマージは拒否\n"
3167
"されます。--forceが指定された場合は、未コミットの変更を含む現在の作業ツリーに\n"
3168
"マージ元の変更がマージされます。--forceオプションを使えば、２つ以上の親を持つ\n"
3169
"マージリビジョンを作ることもできます。"
3170
3171
#: bzrlib/builtins.py:4283
3172
msgid ""
3173
"If one would like to merge changes from the working tree of the other\n"
3174
"branch without merging any committed revisions, the --uncommitted option\n"
3175
"can be given."
3176
msgstr ""
3177
"コミット済みの変更ではなく、作業ツリー上での変更を別のブランチにマージしたい\n"
3178
"場合は、--uncommittedオプションを指定することができます。"
3179
3180
#: bzrlib/builtins.py:4287
3181
msgid ""
3182
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3183
"you to apply each diff hunk and file change, similar to \"shelve\"."
3184
msgstr ""
3185
"変更を部分的にマージしたければ、\"merge -i\"を使用すれば、\"shelve\"と同じ\n"
3186
"ようにそれぞれのハンクをプロンプトで選択して適用することができます。"
3187
3188
#: bzrlib/builtins.py:4290
3189
msgid ""
3190
":Examples:\n"
3191
" To merge all new revisions from bzr.dev::"
3192
msgstr ""
3193
":例:\n"
3194
" bzr.devから全ての新しいリビジョンをマージします。::"
3195
3196
#: bzrlib/builtins.py:4293
3197
msgid " bzr merge ../bzr.dev"
3198
msgstr " bzr merge ../bzr.dev"
3199
3200
#: bzrlib/builtins.py:4295
3201
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3202
msgstr " bzr.devから、リビジョン82まで(82も含む)のリビジョンをマージします::"
3203
3204
#: bzrlib/builtins.py:4297
3205
msgid " bzr merge -r 82 ../bzr.dev"
3206
msgstr " bzr merge -r 82 ../bzr.dev"
3207
3208
#: bzrlib/builtins.py:4299
3209
msgid " To merge the changes introduced by 82, without previous changes::"
3210
msgstr " リビジョン82での変更をマージし、それ以前の変更はマージしません。::"
3211
3212
#: bzrlib/builtins.py:4301
3213
msgid " bzr merge -r 81..82 ../bzr.dev"
3214
msgstr " bzr merge -r 81..82 ../bzr.dev"
3215
3216
#: bzrlib/builtins.py:4303
3217
msgid " To apply a merge directive contained in /tmp/merge::"
3218
msgstr " /tmp/merge内のマージディレクティブを適用します。::"
3219
3220
#: bzrlib/builtins.py:4305
3221
msgid " bzr merge /tmp/merge"
3222
msgstr " bzr merge /tmp/merge"
3223
3224
#: bzrlib/builtins.py:4307
3225
msgid ""
3226
" To create a merge revision with three parents from two branches\n"
3227
" feature1a and feature1b:"
3228
msgstr ""
3229
" feature1a、feature1bの２つのブランチから、３つの親を持つマージ\n"
3230
" リビジョンを作ります。::"
3231
3232
#: bzrlib/builtins.py:4310
3233
msgid ""
3234
" bzr merge ../feature1a\n"
3235
" bzr merge ../feature1b --force\n"
3236
" bzr commit -m 'revision with three parents'"
3237
msgstr ""
3238
" bzr merge ../feature1a\n"
3239
" bzr merge ../feature1b --force\n"
3240
" bzr commit -m 'revision with three parents'"
3241
3242
#: bzrlib/builtins.py:4322
3243
msgid "Merge even if the destination tree has uncommitted changes."
3244
msgstr "マージ先のツリーにコミットしていない変更があってもマージします。"
3245
3246
#: bzrlib/builtins.py:4328
3247
msgid ""
3248
"Apply uncommitted changes from a working copy, instead of branch changes."
3249
msgstr "ブランチの変更ではなく、作業コピー上のコミットしていない変更をマージします。"
3250
3251
#: bzrlib/builtins.py:4330
3252
msgid ""
3253
"If the destination is already completely merged into the source, pull from "
3254
"the source rather than merging. When this happens, you do not need to "
3255
"commit the result."
3256
msgstr ""
3257
"マージ先のリビジョンがマージ元のブランチにすべて含まれている場合、マージの\n"
3258
"かわりにpullを実行します。その場合は、コミットする必要はありません。"
3259
3260
#: bzrlib/builtins.py:4335
3261
msgid ""
3262
"Branch to merge into, rather than the one containing the working directory."
3263
msgstr "作業ディレクトリ以外にマージする場合の、マージ先のブランチ。"
3264
3265
#: bzrlib/builtins.py:4337
3266
msgid "Instead of merging, show a diff of the merge."
3267
msgstr "マージを実行するかわりに、マージされる内容のdiffを表示します。"
3268
3269
#: bzrlib/builtins.py:4339
3270
msgid "Select changes interactively."
3271
msgstr "変更をインタラクティブに選択します。"
3272
3273
#: bzrlib/builtins.py:4361
3274
msgid ""
3275
"Merging into empty branches not currently supported, "
3276
"https://bugs.launchpad.net/bzr/+bug/308562"
3277
msgstr ""
3278
"空ブランチへのマージは今のところサポートされていません。https://bugs.launchpad.net/bzr/+bug/308562"
3279
3280
#: bzrlib/builtins.py:4388
3281
msgid "Cannot use --uncommitted with bundles or merge directives."
3282
msgstr "バンドル、マージディレクティブに対して--uncommittedを指定することはできません。"
3283
3284
#: bzrlib/builtins.py:4399
3285
msgid "Cannot use --uncommitted and --revision at the same time."
3286
msgstr "--uncommittedと--revisionを同時に指定することはできません。"
3287
3288
#: bzrlib/builtins.py:4419
3289
msgid "merger: "
3290
msgstr ""
3291
3292
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
3293
msgid "Nothing to do."
3294
msgstr "なにもすることがありません。"
3295
3296
#: bzrlib/builtins.py:4425
3297
msgid "Cannot pull individual files"
3298
msgstr "ファイルを個別にpullすることはできません。"
3299
3300
#: bzrlib/builtins.py:4433
3301
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3302
msgstr "ブランチにコミットがありません。('bzr pull'を使うべきかもしれません)"
3303
3304
#: bzrlib/builtins.py:4491
3305
#, python-format
3306
msgid "Show-base is not supported for this merge type. %s"
3307
msgstr "Show-baseはこのマージタイプではサポートされません。 %s"
3308
3309
#: bzrlib/builtins.py:4500
3310
#, python-format
3311
msgid "Conflict reduction is not supported for merge type %s."
3312
msgstr "衝突の縮小化は、このマージタイプではサポートされません。 %s"
3313
3314
#: bzrlib/builtins.py:4504
3315
msgid "Cannot do conflict reduction and show base."
3316
msgstr "衝突の縮小化、ベースの表示ができませんでした。"
3317
3318
#: bzrlib/builtins.py:4615
3319
msgid "No location specified or remembered"
3320
msgstr "対象の場所が設定も指定もされていません。"
3321
3322
#: bzrlib/builtins.py:4617
3323
msgid "{0} remembered {1} location {2}"
3324
msgstr "{0} 設定された {1} の場所 {2}"
3325
3326
#: bzrlib/builtins.py:4623
3327
msgid "Redo a merge."
3328
msgstr "マージをやりなおします。"
3329
3330
#: bzrlib/builtins.py:4625
3331
msgid ""
3332
"Use this if you want to try a different merge technique while resolving\n"
3333
"conflicts. Some merge techniques are better than others, and remerge\n"
3334
"lets you try different ones on different files."
3335
msgstr ""
3336
"衝突を解決するために、別のマージ方法を試したい場合に、このコマンドを\n"
3337
"使用します。他のものより優れたマージ方法があり、remergeを使って個々の\n"
3338
"ファイルに別のマージ方法を試すことができます。"
3339
3340
#: bzrlib/builtins.py:4629
3341
msgid ""
3342
"The options for remerge have the same meaning and defaults as the ones for\n"
3343
"merge. The difference is that remerge can (only) be run when there is a\n"
3344
"pending merge, and it lets you specify particular files."
3345
msgstr ""
3346
"remergeのオプションの意味とデフォルトはmergeと同じです。違いは、\n"
3347
"remergeはマージ中状態のときだけ実行でき、特定のファイルを指定できる\n"
3348
"ということです。"
3349
3350
#: bzrlib/builtins.py:4633
3351
msgid ""
3352
":Examples:\n"
3353
" Re-do the merge of all conflicted files, and show the base text in\n"
3354
" conflict regions, in addition to the usual THIS and OTHER texts::"
3355
msgstr ""
3356
":例:\n"
3357
" すべての衝突したファイルのマージをやり直し、通常のTHIS、OTHERの\n"
3358
" テキストにくわえて衝突した領域のベーステキストを表示します。::"
3359
3360
#: bzrlib/builtins.py:4637
3361
msgid " bzr remerge --show-base"
3362
msgstr " bzr remerge --show-base"
3363
3364
#: bzrlib/builtins.py:4639
3365
msgid ""
3366
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3367
" additional processing to reduce the size of conflict regions::"
3368
msgstr ""
3369
" \"foobar\"のマージを、weaveマージアルゴリズムでやりなおし、衝突領域の\n"
3370
" 縮小化処理も行います。::"
3371
3372
#: bzrlib/builtins.py:4642
3373
msgid " bzr remerge --merge-type weave --reprocess foobar"
3374
msgstr " bzr remerge --merge-type weave --reprocess foobar"
3375
3376
#: bzrlib/builtins.py:4649
3377
msgid "Show base revision text in conflicts."
3378
msgstr "衝突したベースリビジョンのテキストを表示します。"
3379
3380
#: bzrlib/builtins.py:4661
3381
msgid ""
3382
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3383
"merges."
3384
msgstr ""
3385
"remergeは通常のマージ後にだけ実行できます。チェリーピックや複数マージでは\r\n"
3386
"利用できません。"
3387
3388
#: bzrlib/builtins.py:4717
3389
msgid "Revert files to a previous revision."
3390
msgstr "ファイルを過去のリビジョンに戻します。"
3391
3392
#: bzrlib/builtins.py:4719
3393
msgid ""
3394
"Giving a list of files will revert only those files. Otherwise, all files\n"
3395
"will be reverted. If the revision is not specified with '--revision', the\n"
3396
"last committed revision is used."
3397
msgstr ""
3398
"ファイルのリストを指定すると、そのファイルだけが元に戻されます。\n"
3399
"そうでない場合は、全てのファイルが対象になります。--revisionで\n"
3400
"リビジョンを指定しない場合は、最後にコミットされたリビジョンが使用\n"
3401
"されます。"
3402
3403
#: bzrlib/builtins.py:4723
3404
msgid ""
3405
"To remove only some changes, without reverting to a prior version, use\n"
3406
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3407
"will remove the changes introduced by the second last commit (-2), without\n"
3408
"affecting the changes introduced by the last commit (-1). To remove\n"
3409
"certain changes on a hunk-by-hunk basis, see the shelve command."
3410
msgstr ""
3411
"以前のリビジョンに戻さずにいくつかの変更を取り除くには、mergeをかわりに\n"
3412
"使用します。例えば、\"merge . -r -2..-3\" (.を忘れないように)で、最終リビジョン\n"
3413
"(-1)での変更はそのままで、その一つ前のリビジョン(-2)での変更だけを取り\n"
3414
"除くことができます。特定の変更をハンクごと取り除く方法は、shelveをご覧\n"
3415
"ください。"
3416
3417
#: bzrlib/builtins.py:4729
3418
msgid ""
3419
"By default, any files that have been manually changed will be backed up\n"
3420
"first. (Files changed only by merge are not backed up.) Backup files have\n"
3421
"'.~#~' appended to their name, where # is a number."
3422
msgstr ""
3423
"デフォルトでは、手で変更されたファイルは最初にバックアップされます。(merge\n"
3424
"コマンドで変更されただけのファイルはバックアップされません)バックアップ\n"
3425
"ファイル名は、元の名前に「.~#~」(#は数字)を付け足したものになります。"
3426
3427
#: bzrlib/builtins.py:4733
3428
msgid ""
3429
"When you provide files, you can use their current pathname or the pathname\n"
3430
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3431
"name. If you name a directory, all the contents of that directory will be\n"
3432
"reverted."
3433
msgstr ""
3434
"ファイル名を指定するときは、現在のファイル名か、対象リビジョン時点でのファイル\n"
3435
"名かを使うことができます。つまり、ファイル名指定で「削除の取り消し」のために\n"
3436
"revertを使うことができます。ディレクトリを指定した場合は、その配下のすべての\n"
3437
"変更が取り消されます。"
3438
3439
#: bzrlib/builtins.py:4738
3440
msgid ""
3441
"If you have newly added files since the target revision, they will be\n"
3442
"removed. If the files to be removed have been changed, backups will be\n"
3443
"created as above. Directories containing unknown files will not be\n"
3444
"deleted."
3445
msgstr ""
3446
"対象のリビジョン以降にファイルが新しく追加されている場合は、そのファイルは\n"
3447
"削除されます。削除されるファイルが変更されている場合は、上記の通りに\n"
3448
"バックアップされます。バージョン管理外のファイルを含むディレクトリは削除され\n"
3449
"ません。"
3450
3451
#: bzrlib/builtins.py:4743
3452
msgid ""
3453
"The working tree contains a list of revisions that have been merged but\n"
3454
"not yet committed. These revisions will be included as additional parents\n"
3455
"of the next commit. Normally, using revert clears that list as well as\n"
3456
"reverting the files. If any files are specified, revert leaves the list\n"
3457
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3458
".`` in the tree root to revert all files but keep the recorded merges,\n"
3459
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3460
"reverting any files."
3461
msgstr ""
3462
3463
#: bzrlib/builtins.py:4752
3464
msgid ""
3465
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3466
"changes from a branch in a single revision. To do this, perform the merge\n"
3467
"as desired. Then doing revert with the \"--forget-merges\" option will "
3468
"keep\n"
3469
"the content of the tree as it was, but it will clear the list of pending\n"
3470
"merges. The next commit will then contain all of the changes that are\n"
3471
"present in the other branch, but without any other parent revisions.\n"
3472
"Because this technique forgets where these changes originated, it may\n"
3473
"cause additional conflicts on later merges involving the same source and\n"
3474
"target branches."
3475
msgstr ""
3476
3477
#: bzrlib/builtins.py:4766
3478
msgid "Do not save backups of reverted files."
3479
msgstr ""
3480
3481
#: bzrlib/builtins.py:4768
3482
msgid "Remove pending merge marker, without changing any files."
3483
msgstr ""
3484
3485
#: bzrlib/builtins.py:4799
3486
msgid ""
3487
"Show help on a command or other topic.\n"
3488
" "
3489
msgstr ""
3490
"コマンドもしくは他のトピックのヘルプを表示する。\n"
3491
" "
3492
3493
#: bzrlib/builtins.py:4804
3494
msgid "Show help on all commands."
3495
msgstr "全てのコマンドのヘルプを表示する。"
3496
3497
#: bzrlib/builtins.py:4833
3498
msgid "Show unmerged/unpulled revisions between two branches."
3499
msgstr "2つのブランチの間のmergeされていない/pullされていない リビジョンを表示する。"
3500
3501
#: bzrlib/builtins.py:4835
3502
msgid "OTHER_BRANCH may be local or remote."
3503
msgstr "OTHER_BRANCHはlocalもしくはremoteになります。"
3504
3505
#: bzrlib/builtins.py:4837
3506
msgid ""
3507
"To filter on a range of revisions, you can use the command -r begin..end\n"
3508
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3509
"also valid.\n"
3510
" \n"
3511
":Exit values:\n"
3512
" 1 - some missing revisions\n"
3513
" 0 - no missing revisions"
3514
msgstr ""
3515
3516
#: bzrlib/builtins.py:4847
3517
msgid ""
3518
" Determine the missing revisions between this and the branch at the\n"
3519
" remembered pull location::"
3520
msgstr ""
3521
3522
#: bzrlib/builtins.py:4850
3523
msgid " bzr missing"
3524
msgstr " bzr missing"
3525
3526
#: bzrlib/builtins.py:4852
3527
msgid " Determine the missing revisions between this and another branch::"
3528
msgstr ""
3529
3530
#: bzrlib/builtins.py:4854
3531
msgid " bzr missing http://server/branch"
3532
msgstr " bzr missing http://server/branch"
3533
3534
#: bzrlib/builtins.py:4856
3535
msgid ""
3536
" Determine the missing revisions up to a specific revision on the other\n"
3537
" branch::"
3538
msgstr ""
3539
3540
#: bzrlib/builtins.py:4859
3541
msgid " bzr missing -r ..-10"
3542
msgstr " bzr missing -r ..-10"
3543
3544
#: bzrlib/builtins.py:4861
3545
msgid ""
3546
" Determine the missing revisions up to a specific revision on this\n"
3547
" branch::"
3548
msgstr ""
3549
3550
#: bzrlib/builtins.py:4864
3551
msgid " bzr missing --my-revision ..-10"
3552
msgstr " bzr missing --my-revision ..-10"
3553
3554
#: bzrlib/builtins.py:4871
3555
msgid "Reverse the order of revisions."
3556
msgstr "リビジョンの表示順を逆転する。"
3557
3558
#: bzrlib/builtins.py:4873
3559
msgid "Display changes in the local branch only."
3560
msgstr "ローカルブランチの変更のみを表示する。"
3561
3562
#: bzrlib/builtins.py:4874
3563
msgid "Same as --mine-only."
3564
msgstr "--mine-onlyと同じ。"
3565
3566
#: bzrlib/builtins.py:4876
3567
msgid "Display changes in the remote branch only."
3568
msgstr "リモートブランチの変更のみを表示する。"
3569
3570
#: bzrlib/builtins.py:4877
3571
msgid "Same as --theirs-only."
3572
msgstr "--theirs-onlyと同じ。"
3573
3574
#: bzrlib/builtins.py:4882
3575
msgid ""
3576
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3577
"details."
3578
msgstr ""
3579
3580
#: bzrlib/builtins.py:4886
3581
msgid ""
3582
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3583
"details."
3584
msgstr ""
3585
3586
#: bzrlib/builtins.py:4889
3587
msgid "Show all revisions in addition to the mainline ones."
3588
msgstr ""
3589
3590
#: bzrlib/builtins.py:4943
3591
msgid "No peer location known or specified."
3592
msgstr ""
3593
3594
#: bzrlib/builtins.py:4947
3595
msgid "Using saved parent location: {0}\n"
3596
msgstr ""
3597
3598
#: bzrlib/builtins.py:4980
3599
#, python-format
3600
msgid "You have %d extra revision:\n"
3601
msgid_plural "You have %d extra revisions:\n"
3602
msgstr[0] ""
3603
msgstr[1] ""
3604
3605
#: bzrlib/builtins.py:4996
3606
#, python-format
3607
msgid "You are missing %d revision:\n"
3608
msgid_plural "You are missing %d revisions:\n"
3609
msgstr[0] ""
3610
msgstr[1] ""
3611
3612
#: bzrlib/builtins.py:5008
3613
msgid "This branch has no new revisions.\n"
3614
msgstr ""
3615
3616
#: bzrlib/builtins.py:5011
3617
msgid "Other branch has no new revisions.\n"
3618
msgstr ""
3619
3620
#: bzrlib/builtins.py:5016
3621
msgid "Branches are up to date.\n"
3622
msgstr ""
3623
3624
#: bzrlib/builtins.py:5027
3625
msgid "Compress the data within a repository."
3626
msgstr "リポジトリ内のデータを圧縮する。"
3627
3628
#: bzrlib/builtins.py:5029
3629
msgid ""
3630
"This operation compresses the data within a bazaar repository. As\n"
3631
"bazaar supports automatic packing of repository, this operation is\n"
3632
"normally not required to be done manually."
3633
msgstr ""
3634
3635
#: bzrlib/builtins.py:5033
3636
msgid ""
3637
"During the pack operation, bazaar takes a backup of existing repository\n"
3638
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3639
"automatically when it is safe to do so. To save disk space by removing\n"
3640
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3641
"used."
3642
msgstr ""
3643
3644
#: bzrlib/builtins.py:5039
3645
msgid ""
3646
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3647
"during or immediately after repacking, you may be left with a state\n"
3648
"where the deletion has been written to disk but the new packs have not\n"
3649
"been. In this case the repository may be unusable."
3650
msgstr ""
3651
3652
#: bzrlib/builtins.py:5048
3653
msgid "Delete obsolete packs to save disk space."
3654
msgstr ""
3655
3656
#: bzrlib/builtins.py:5062
3657
msgid "List the installed plugins."
3658
msgstr "インストールされたプラグインの一覧を表示する。"
3659
3660
#: bzrlib/builtins.py:5064
3661
msgid ""
3662
"This command displays the list of installed plugins including\n"
3663
"version of plugin and a short description of each."
3664
msgstr ""
3665
"このコマンドは インストールされたプラグインの一覧を簡単な説明や\n"
3666
"バージョン情報とともに表示します。"
3667
3668
#: bzrlib/builtins.py:5067
3669
msgid "--verbose shows the path where each plugin is located."
3670
msgstr "--verboseを指定すると各プラグインのインストール先のパスが表示されます。"
3671
3672
#: bzrlib/builtins.py:5069
3673
msgid ""
3674
"A plugin is an external component for Bazaar that extends the\n"
3675
"revision control system, by adding or replacing code in Bazaar.\n"
3676
"Plugins can do a variety of things, including overriding commands,\n"
3677
"adding new commands, providing additional network transports and\n"
3678
"customizing log output."
3679
msgstr ""
3680
3681
#: bzrlib/builtins.py:5075
3682
msgid ""
3683
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3684
"for further information on plugins including where to find them and how to\n"
3685
"install them. Instructions are also provided there on how to write new\n"
3686
"plugins using the Python programming language."
3687
msgstr ""
3688
3689
#: bzrlib/builtins.py:5091
3690
msgid "Show testament (signing-form) of a revision."
3691
msgstr ""
3692
3693
#: bzrlib/builtins.py:5094
3694
msgid "Produce long-format testament."
3695
msgstr ""
3696
3697
#: bzrlib/builtins.py:5096
3698
msgid "Produce a strict-format testament."
3699
msgstr ""
3700
3701
#: bzrlib/builtins.py:5122
3702
msgid "Show the origin of each line in a file."
3703
msgstr ""
3704
3705
#: bzrlib/builtins.py:5124
3706
msgid ""
3707
"This prints out the given file with an annotation on the left side\n"
3708
"indicating which revision, author and date introduced the change."
3709
msgstr ""
3710
3711
#: bzrlib/builtins.py:5127
3712
msgid ""
3713
"If the origin is the same for a run of consecutive lines, it is\n"
3714
"shown only at the top, unless the --all option is given."
3715
msgstr ""
3716
3717
#: bzrlib/builtins.py:5135
3718
msgid "Show annotations on all lines."
3719
msgstr ""
3720
3721
#: bzrlib/builtins.py:5136
3722
msgid "Show commit date in annotations."
3723
msgstr ""
3724
3725
#: bzrlib/builtins.py:5223
3726
msgid "Cannot sign a range of non-revision-history revisions"
3727
msgstr ""
3728
3729
#: bzrlib/builtins.py:5235
3730
msgid "Please supply either one revision, or a range."
3731
msgstr ""
3732
3733
#: bzrlib/builtins.py:5239
3734
msgid ""
3735
"Convert the current branch into a checkout of the supplied branch.\n"
3736
"If no branch is supplied, rebind to the last bound location."
3737
msgstr ""
3738
3739
#: bzrlib/builtins.py:5242
3740
msgid ""
3741
"Once converted into a checkout, commits must succeed on the master branch\n"
3742
"before they will be applied to the local branch."
3743
msgstr ""
3744
3745
#: bzrlib/builtins.py:5245
3746
msgid ""
3747
"Bound branches use the nickname of its master branch unless it is set\n"
3748
"locally, in which case binding will update the local nickname to be\n"
3749
"that of the master."
3750
msgstr ""
3751
3752
#: bzrlib/builtins.py:5260
3753
msgid "No location supplied. This format does not remember old locations."
3754
msgstr ""
3755
3756
#: bzrlib/builtins.py:5265
3757
msgid "Branch is already bound"
3758
msgstr ""
3759
3760
#: bzrlib/builtins.py:5267
3761
msgid "No location supplied and no previous location known"
3762
msgstr ""
3763
3764
#: bzrlib/builtins.py:5273
3765
msgid "These branches have diverged. Try merging, and then bind again."
3766
msgstr ""
3767
3768
#: bzrlib/builtins.py:5280
3769
msgid "Convert the current checkout into a regular branch."
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:5282
3773
msgid ""
3774
"After unbinding, the local branch is considered independent and subsequent\n"
3775
"commits will be local only."
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:5293
3779
msgid "Local branch is not bound"
3780
msgstr ""
3781
3782
#: bzrlib/builtins.py:5297
3783
msgid "Remove the last committed revision."
3784
msgstr ""
3785
3786
#: bzrlib/builtins.py:5299
3787
msgid ""
3788
"--verbose will print out what is being removed.\n"
3789
"--dry-run will go through all the motions, but not actually\n"
3790
"remove anything."
3791
msgstr ""
3792
3793
#: bzrlib/builtins.py:5303
3794
msgid ""
3795
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3796
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3797
"branch at revision 15."
3798
msgstr ""
3799
3800
#: bzrlib/builtins.py:5307
3801
msgid ""
3802
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3803
"it may make is to restore any pending merges that were present before\n"
3804
"the commit."
3805
msgstr ""
3806
3807
#: bzrlib/builtins.py:5318
3808
msgid "Don't actually make changes."
3809
msgstr ""
3810
3811
#: bzrlib/builtins.py:5319
3812
msgid "Say yes to all questions."
3813
msgstr ""
3814
3815
#: bzrlib/builtins.py:5321
3816
msgid "Keep tags that point to removed revisions."
3817
msgstr ""
3818
3819
#: bzrlib/builtins.py:5323
3820
msgid "Only remove the commits from the local branch when in a checkout."
3821
msgstr ""
3822
3823
#: bzrlib/builtins.py:5372
3824
msgid "No revisions to uncommit.\n"
3825
msgstr ""
3826
3827
#: bzrlib/builtins.py:5387
3828
msgid "Dry-run, pretending to remove the above revisions.\n"
3829
msgstr ""
3830
3831
#: bzrlib/builtins.py:5390
3832
msgid "The above revision(s) will be removed.\n"
3833
msgstr ""
3834
3835
#: bzrlib/builtins.py:5394
3836
msgid "Uncommit these revisions"
3837
msgstr ""
3838
3839
#: bzrlib/builtins.py:5397
3840
msgid "Canceled\n"
3841
msgstr ""
3842
3843
#: bzrlib/builtins.py:5404
3844
#, python-format
3845
msgid ""
3846
"You can restore the old tip by running:\n"
3847
" bzr pull . -r revid:%s\n"
3848
msgstr ""
3849
3850
#: bzrlib/builtins.py:5409
3851
msgid "Break a dead lock."
3852
msgstr ""
3853
3854
#: bzrlib/builtins.py:5411
3855
msgid ""
3856
"This command breaks a lock on a repository, branch, working directory or\n"
3857
"config file."
3858
msgstr ""
3859
3860
#: bzrlib/builtins.py:5414
3861
msgid ""
3862
"CAUTION: Locks should only be broken when you are sure that the process\n"
3863
"holding the lock has been stopped."
3864
msgstr ""
3865
3866
#: bzrlib/builtins.py:5417
3867
msgid ""
3868
"You can get information on what locks are open via the 'bzr info\n"
3869
"[location]' command."
3870
msgstr ""
3871
3872
#: bzrlib/builtins.py:5420
3873
msgid ""
3874
":Examples:\n"
3875
" bzr break-lock\n"
3876
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3877
" bzr break-lock --conf ~/.bazaar"
3878
msgstr ""
3879
3880
#: bzrlib/builtins.py:5429
3881
msgid "LOCATION is the directory where the config lock is."
3882
msgstr ""
3883
3884
#: bzrlib/builtins.py:5431
3885
msgid "Do not ask for confirmation before breaking the lock."
3886
msgstr ""
3887
3888
#: bzrlib/builtins.py:5466
3889
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3890
msgstr ""
3891
3892
#: bzrlib/builtins.py:5467
3893
msgid "Run the bzr server."
3894
msgstr ""
3895
3896
#: bzrlib/builtins.py:5473
3897
msgid "Serve on stdin/out for use from inetd or sshd."
3898
msgstr ""
3899
3900
#: bzrlib/builtins.py:5474
3901
msgid "protocol"
3902
msgstr ""
3903
3904
#: bzrlib/builtins.py:5475
3905
msgid "Protocol to serve."
3906
msgstr ""
3907
3908
#: bzrlib/builtins.py:5479
3909
msgid ""
3910
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3911
"Passing 0 as the port number will result in a dynamically allocated port. "
3912
"The default port depends on the protocol."
3913
msgstr ""
3914
3915
#: bzrlib/builtins.py:5485
3916
msgid "Serve contents of this directory."
3917
msgstr ""
3918
3919
#: bzrlib/builtins.py:5487
3920
msgid ""
3921
"By default the server is a readonly server. Supplying --allow-writes "
3922
"enables write access to the contents of the served directory and below. "
3923
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3924
"of external authentication is arranged supplying this option leads to global "
3925
"uncontrolled write access to your file system."
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:5496
3929
msgid "Override the default idle client timeout (5min)."
3930
msgstr ""
3931
3932
#: bzrlib/builtins.py:5546
3933
msgid "Combine a tree into its containing tree."
3934
msgstr ""
3935
3936
#: bzrlib/builtins.py:5548
3937
msgid "This command requires the target tree to be in a rich-root format."
3938
msgstr ""
3939
3940
#: bzrlib/builtins.py:5550
3941
msgid ""
3942
"The TREE argument should be an independent tree, inside another tree, but\n"
3943
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3944
"running \"bzr branch\" with the target inside a tree.)"
3945
msgstr ""
3946
3947
#: bzrlib/builtins.py:5554
3948
msgid ""
3949
"The result is a combined tree, with the subtree no longer an independent\n"
3950
"part. This is marked as a merge of the subtree into the containing tree,\n"
3951
"and all history is preserved."
3952
msgstr ""
3953
3954
#: bzrlib/builtins.py:5572
3955
#, python-format
3956
msgid ""
3957
"Can't join trees because %s doesn't support rich root data.\n"
3958
"You can use bzr upgrade on the repository."
3959
msgstr ""
3960
3961
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3962
msgid "Cannot join {0}. {1}"
3963
msgstr ""
3964
3965
#: bzrlib/builtins.py:5592
3966
msgid "Split a subdirectory of a tree into a separate tree."
3967
msgstr ""
3968
3969
#: bzrlib/builtins.py:5594
3970
msgid ""
3971
"This command will produce a target tree in a format that supports\n"
3972
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3973
"converted into earlier formats like 'dirstate-tags'."
3974
msgstr ""
3975
3976
#: bzrlib/builtins.py:5598
3977
msgid ""
3978
"The TREE argument should be a subdirectory of a working tree. That\n"
3979
"subdirectory will be converted into an independent tree, with its own\n"
3980
"branch. Commits in the top-level tree will not apply to the new subtree."
3981
msgstr ""
3982
3983
#: bzrlib/builtins.py:5678
3984
msgid "No submit branch specified or known"
3985
msgstr ""
3986
3987
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3988
msgid "No public branch specified or known"
3989
msgstr ""
3990
3991
#: bzrlib/builtins.py:5691
3992
msgid "bzr merge-directive takes at most two one revision identifiers"
3993
msgstr ""
3994
3995
#: bzrlib/builtins.py:5700
3996
msgid "No revisions to bundle."
3997
msgstr ""
3998
3999
#: bzrlib/builtins.py:5719
4000
msgid "Mail or create a merge-directive for submitting changes."
4001
msgstr ""
4002
4003
#: bzrlib/builtins.py:5721
4004
msgid "A merge directive provides many things needed for requesting merges:"
4005
msgstr ""
4006
4007
#: bzrlib/builtins.py:5723
4008
msgid "* A machine-readable description of the merge to perform"
4009
msgstr ""
4010
4011
#: bzrlib/builtins.py:5725
4012
msgid "* An optional patch that is a preview of the changes requested"
4013
msgstr ""
4014
4015
#: bzrlib/builtins.py:5727
4016
msgid ""
4017
"* An optional bundle of revision data, so that the changes can be applied\n"
4018
" directly from the merge directive, without retrieving data from a\n"
4019
" branch."
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:5731
4023
msgid ""
4024
"`bzr send` creates a compact data set that, when applied using bzr\n"
4025
"merge, has the same effect as merging from the source branch. "
4026
msgstr ""
4027
4028
#: bzrlib/builtins.py:5734
4029
msgid ""
4030
"By default the merge directive is self-contained and can be applied to any\n"
4031
"branch containing submit_branch in its ancestory without needing access to\n"
4032
"the source branch."
4033
msgstr ""
4034
4035
#: bzrlib/builtins.py:5738
4036
msgid ""
4037
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4038
"revisions, but only a structured request to merge from the\n"
4039
"public_location. In that case the public_branch is needed and it must be\n"
4040
"up-to-date and accessible to the recipient. The public_branch is always\n"
4041
"included if known, so that people can check it later."
4042
msgstr ""
4043
4044
#: bzrlib/builtins.py:5744
4045
msgid ""
4046
"The submit branch defaults to the parent of the source branch, but can be\n"
4047
"overridden. Both submit branch and public branch will be remembered in\n"
4048
"branch.conf the first time they are used for a particular branch. The\n"
4049
"source branch defaults to that containing the working directory, but can\n"
4050
"be changed using --from."
4051
msgstr ""
4052
4053
#: bzrlib/builtins.py:5750
4054
msgid ""
4055
"Both the submit branch and the public branch follow the usual behavior with\n"
4056
"respect to --remember: If there is no default location set, the first send\n"
4057
"will set it (use --no-remember to avoid setting it). After that, you can\n"
4058
"omit the location to use the default. To change the default, use\n"
4059
"--remember. The value will only be saved if the location can be accessed."
4060
msgstr ""
4061
4062
#: bzrlib/builtins.py:5756
4063
msgid ""
4064
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4065
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4066
"If a public location is known for the submit_branch, that location is used\n"
4067
"in the merge directive."
4068
msgstr ""
4069
4070
#: bzrlib/builtins.py:5761
4071
msgid ""
4072
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4073
"given, in which case it is sent to a file."
4074
msgstr ""
4075
4076
#: bzrlib/builtins.py:5764
4077
msgid ""
4078
"Mail is sent using your preferred mail program. This should be transparent\n"
4079
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4080
"If the preferred client can't be found (or used), your editor will be used."
4081
msgstr ""
4082
4083
#: bzrlib/builtins.py:5768
4084
msgid ""
4085
"To use a specific mail program, set the mail_client configuration option.\n"
4086
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4087
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
4088
"(MacOS X's\n"
4089
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
4090
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
4091
"add\n"
4092
"supported clients."
4093
msgstr ""
4094
4095
#: bzrlib/builtins.py:5775
4096
msgid ""
4097
"If mail is being sent, a to address is required. This can be supplied\n"
4098
"either on the commandline, by setting the submit_to configuration\n"
4099
"option in the branch itself or the child_submit_to configuration option\n"
4100
"in the submit branch."
4101
msgstr ""
4102
4103
#: bzrlib/builtins.py:5780
4104
msgid ""
4105
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4106
"and\n"
4107
"merge directive format 2. It is significantly faster and smaller than\n"
4108
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
4109
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
4110
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4111
msgstr ""
4112
4113
#: bzrlib/builtins.py:5786
4114
msgid ""
4115
"The merge directives created by bzr send may be applied using bzr merge or\n"
4116
"bzr pull by specifying a file containing a merge directive as the location."
4117
msgstr ""
4118
4119
#: bzrlib/builtins.py:5789
4120
msgid ""
4121
"bzr send makes extensive use of public locations to map local locations "
4122
"into\n"
4123
"URLs that can be used by other people. See `bzr help configuration` to\n"
4124
"set them, and use `bzr info` to display them."
4125
msgstr ""
4126
4127
#: bzrlib/builtins.py:5813
4128
msgid "Write merge directive to this file or directory; use - for stdout."
4129
msgstr ""
4130
4131
#: bzrlib/builtins.py:5817
4132
msgid ""
4133
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4134
"strict disables the check."
4135
msgstr ""
4136
4137
#: bzrlib/builtins.py:5819
4138
msgid "Mail the request to this address."
4139
msgstr ""
4140
4141
#: bzrlib/builtins.py:5823
4142
msgid "Body for the email."
4143
msgstr ""
4144
4145
#: bzrlib/builtins.py:5876
4146
msgid "Do not include a bundle in the merge directive."
4147
msgstr ""
4148
4149
#: bzrlib/builtins.py:5877
4150
msgid "Do not include a preview patch in the merge directive."
4151
msgstr ""
4152
4153
#: bzrlib/builtins.py:5880
4154
msgid "Remember submit and public branch."
4155
msgstr ""
4156
4157
#: bzrlib/builtins.py:5882
4158
msgid ""
4159
"Branch to generate the submission from, rather than the one containing the "
4160
"working directory."
4161
msgstr ""
4162
4163
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
4164
msgid "format"
4165
msgstr ""
4166
4167
#: bzrlib/builtins.py:5893
4168
msgid "Use the specified output format."
4169
msgstr ""
4170
4171
#: bzrlib/builtins.py:5915
4172
msgid "Create, remove or modify a tag naming a revision."
4173
msgstr ""
4174
4175
#: bzrlib/builtins.py:5917
4176
msgid ""
4177
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4178
"(--revision) option can be given -rtag:X, where X is any previously\n"
4179
"created tag."
4180
msgstr ""
4181
4182
#: bzrlib/builtins.py:5921
4183
msgid ""
4184
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4185
"along when you branch, push, pull or merge."
4186
msgstr ""
4187
4188
#: bzrlib/builtins.py:5924
4189
msgid ""
4190
"It is an error to give a tag name that already exists unless you pass\n"
4191
"--force, in which case the tag is moved to point to the new revision."
4192
msgstr ""
4193
4194
#: bzrlib/builtins.py:5927
4195
msgid ""
4196
"To rename a tag (change the name but keep it on the same revsion), run "
4197
"``bzr\n"
4198
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4199
msgstr ""
4200
4201
#: bzrlib/builtins.py:5930
4202
msgid ""
4203
"If no tag name is specified it will be determined through the \n"
4204
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4205
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4206
"details."
4207
msgstr ""
4208
4209
#: bzrlib/builtins.py:5940
4210
msgid "Delete this tag rather than placing it."
4211
msgstr ""
4212
4213
#: bzrlib/builtins.py:5943
4214
msgid "Branch in which to place the tag."
4215
msgstr ""
4216
4217
#: bzrlib/builtins.py:5945
4218
msgid "Replace existing tags."
4219
msgstr ""
4220
4221
#: bzrlib/builtins.py:5960
4222
msgid "No tag specified to delete."
4223
msgstr ""
4224
4225
#: bzrlib/builtins.py:5962
4226
#, python-format
4227
msgid "Deleted tag %s."
4228
msgstr ""
4229
4230
#: bzrlib/builtins.py:5976
4231
msgid "Please specify a tag name."
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:5984
4235
#, python-format
4236
msgid "Tag %s already exists for that revision."
4237
msgstr ""
4238
4239
#: bzrlib/builtins.py:5988
4240
#, python-format
4241
msgid "Created tag %s."
4242
msgstr ""
4243
4244
#: bzrlib/builtins.py:5990
4245
#, python-format
4246
msgid "Updated tag %s."
4247
msgstr ""
4248
4249
#: bzrlib/builtins.py:5994
4250
msgid "List tags."
4251
msgstr ""
4252
4253
#: bzrlib/builtins.py:5996
4254
msgid ""
4255
"This command shows a table of tag names and the revisions they reference."
4256
msgstr ""
4257
4258
#: bzrlib/builtins.py:6002
4259
msgid "Branch whose tags should be displayed."
4260
msgstr ""
4261
4262
#: bzrlib/builtins.py:6004
4263
msgid "Sort tags by different criteria."
4264
msgstr ""
4265
4266
#: bzrlib/builtins.py:6004
4267
msgid "Sorting"
4268
msgstr ""
4269
4270
#: bzrlib/builtins.py:6073
4271
msgid "Reconfigure the type of a bzr directory."
4272
msgstr ""
4273
4274
#: bzrlib/builtins.py:6075
4275
msgid "A target configuration must be specified."
4276
msgstr ""
4277
4278
#: bzrlib/builtins.py:6077
4279
msgid ""
4280
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4281
"The order of preference is\n"
4282
"1. For a lightweight checkout, the current bound location.\n"
4283
"2. For branches that used to be checkouts, the previously-bound location.\n"
4284
"3. The push location.\n"
4285
"4. The parent location.\n"
4286
"If none of these is available, --bind-to must be specified."
4287
msgstr ""
4288
4289
#: bzrlib/builtins.py:6091
4290
msgid "Tree type"
4291
msgstr ""
4292
4293
#: bzrlib/builtins.py:6092
4294
msgid "The relation between branch and tree."
4295
msgstr ""
4296
4297
#: bzrlib/builtins.py:6094
4298
msgid "Reconfigure to be an unbound branch with no working tree."
4299
msgstr ""
4300
4301
#: bzrlib/builtins.py:6095
4302
msgid "Reconfigure to be an unbound branch with a working tree."
4303
msgstr ""
4304
4305
#: bzrlib/builtins.py:6096
4306
msgid "Reconfigure to be a bound branch with a working tree."
4307
msgstr ""
4308
4309
#: bzrlib/builtins.py:6097
4310
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4311
msgstr ""
4312
4313
#: bzrlib/builtins.py:6102
4314
msgid "Repository type"
4315
msgstr ""
4316
4317
#: bzrlib/builtins.py:6103
4318
msgid "Location fo the repository."
4319
msgstr ""
4320
4321
#: bzrlib/builtins.py:6105
4322
msgid ""
4323
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4324
msgstr ""
4325
4326
#: bzrlib/builtins.py:6107
4327
msgid "Reconfigure to use a shared repository."
4328
msgstr ""
4329
4330
#: bzrlib/builtins.py:6111
4331
msgid "Trees in Repository"
4332
msgstr ""
4333
4334
#: bzrlib/builtins.py:6112
4335
msgid "Whether new branches in the repository have trees."
4336
msgstr ""
4337
4338
#: bzrlib/builtins.py:6114
4339
msgid ""
4340
"Reconfigure repository to create working trees on branches by default."
4341
msgstr ""
4342
4343
#: bzrlib/builtins.py:6116
4344
msgid ""
4345
"Reconfigure repository to not create working trees on branches by default."
4346
msgstr ""
4347
4348
#: bzrlib/builtins.py:6119
4349
msgid "Branch to bind checkout to."
4350
msgstr ""
4351
4352
#: bzrlib/builtins.py:6121
4353
msgid "Perform reconfiguration even if local changes will be lost."
4354
msgstr ""
4355
4356
#: bzrlib/builtins.py:6124
4357
msgid "Reconfigure a branch to be stacked on another branch."
4358
msgstr ""
4359
4360
#: bzrlib/builtins.py:6128
4361
msgid ""
4362
"Reconfigure a branch to be unstacked. This may require copying substantial "
4363
"data into it."
4364
msgstr ""
4365
4366
#: bzrlib/builtins.py:6138
4367
msgid "Can't use both --stacked-on and --unstacked"
4368
msgstr ""
4369
4370
#: bzrlib/builtins.py:6152
4371
msgid "No target configuration specified"
4372
msgstr ""
4373
4374
#: bzrlib/builtins.py:6187
4375
msgid "Set the branch of a checkout and update."
4376
msgstr ""
4377
4378
#: bzrlib/builtins.py:6189
4379
msgid ""
4380
"For lightweight checkouts, this changes the branch being referenced.\n"
4381
"For heavyweight checkouts, this checks that there are no local commits\n"
4382
"versus the current bound branch, then it makes the local branch a mirror\n"
4383
"of the new location and binds to it."
4384
msgstr ""
4385
4386
#: bzrlib/builtins.py:6194
4387
msgid ""
4388
"In both cases, the working tree is updated and uncommitted changes\n"
4389
"are merged. The user can commit or revert these as they desire."
4390
msgstr ""
4391
4392
#: bzrlib/builtins.py:6197
4393
msgid "Pending merges need to be committed or reverted before using switch."
4394
msgstr ""
4395
4396
#: bzrlib/builtins.py:6199
4397
msgid ""
4398
"The path to the branch to switch to can be specified relative to the parent\n"
4399
"directory of the current branch. For example, if you are currently in a\n"
4400
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4401
"/path/to/newbranch."
4402
msgstr ""
4403
4404
#: bzrlib/builtins.py:6204
4405
msgid ""
4406
"Bound branches use the nickname of its master branch unless it is set\n"
4407
"locally, in which case switching will update the local nickname to be\n"
4408
"that of the master."
4409
msgstr ""
4410
4411
#: bzrlib/builtins.py:6212
4412
msgid "Switch even if local commits will be lost."
4413
msgstr ""
4414
4415
#: bzrlib/builtins.py:6215
4416
msgid "Create the target branch from this one before switching to it."
4417
msgstr ""
4418
4419
#: bzrlib/builtins.py:6229
4420
msgid "You must supply either a revision or a location"
4421
msgstr ""
4422
4423
#: bzrlib/builtins.py:6242
4424
msgid "cannot create branch without source branch"
4425
msgstr ""
4426
4427
#: bzrlib/builtins.py:6262
4428
msgid "Manage filtered views."
4429
msgstr ""
4430
4431
#: bzrlib/builtins.py:6264
4432
msgid ""
4433
"Views provide a mask over the tree so that users can focus on\n"
4434
"a subset of a tree when doing their work. After creating a view,\n"
4435
"commands that support a list of files - status, diff, commit, etc -\n"
4436
"effectively have that list of files implicitly given each time.\n"
4437
"An explicit list of files can still be given but those files\n"
4438
"must be within the current view."
4439
msgstr ""
4440
4441
#: bzrlib/builtins.py:6271
4442
msgid ""
4443
"In most cases, a view has a short life-span: it is created to make\n"
4444
"a selected change and is deleted once that change is committed.\n"
4445
"At other times, you may wish to create one or more named views\n"
4446
"and switch between them."
4447
msgstr ""
4448
4449
#: bzrlib/builtins.py:6276
4450
msgid ""
4451
"To disable the current view without deleting it, you can switch to\n"
4452
"the pseudo view called ``off``. This can be useful when you need\n"
4453
"to see the whole tree for an operation or two (e.g. merge) but\n"
4454
"want to switch back to your view after that."
4455
msgstr ""
4456
4457
#: bzrlib/builtins.py:6281
4458
msgid ""
4459
":Examples:\n"
4460
" To define the current view::"
4461
msgstr ""
4462
4463
#: bzrlib/builtins.py:6284
4464
msgid " bzr view file1 dir1 ..."
4465
msgstr ""
4466
4467
#: bzrlib/builtins.py:6286
4468
msgid " To list the current view::"
4469
msgstr ""
4470
4471
#: bzrlib/builtins.py:6288
4472
msgid " bzr view"
4473
msgstr ""
4474
4475
#: bzrlib/builtins.py:6290
4476
msgid " To delete the current view::"
4477
msgstr ""
4478
4479
#: bzrlib/builtins.py:6292
4480
msgid " bzr view --delete"
4481
msgstr ""
4482
4483
#: bzrlib/builtins.py:6294
4484
msgid " To disable the current view without deleting it::"
4485
msgstr ""
4486
4487
#: bzrlib/builtins.py:6296
4488
msgid " bzr view --switch off"
4489
msgstr ""
4490
4491
#: bzrlib/builtins.py:6298
4492
msgid " To define a named view and switch to it::"
4493
msgstr ""
4494
4495
#: bzrlib/builtins.py:6300
4496
msgid " bzr view --name view-name file1 dir1 ..."
4497
msgstr ""
4498
4499
#: bzrlib/builtins.py:6302
4500
msgid " To list a named view::"
4501
msgstr ""
4502
4503
#: bzrlib/builtins.py:6304
4504
msgid " bzr view --name view-name"
4505
msgstr ""
4506
4507
#: bzrlib/builtins.py:6306
4508
msgid " To delete a named view::"
4509
msgstr ""
4510
4511
#: bzrlib/builtins.py:6308
4512
msgid " bzr view --name view-name --delete"
4513
msgstr ""
4514
4515
#: bzrlib/builtins.py:6310
4516
msgid " To switch to a named view::"
4517
msgstr ""
4518
4519
#: bzrlib/builtins.py:6312
4520
msgid " bzr view --switch view-name"
4521
msgstr ""
4522
4523
#: bzrlib/builtins.py:6314
4524
msgid " To list all views defined::"
4525
msgstr ""
4526
4527
#: bzrlib/builtins.py:6316
4528
msgid " bzr view --all"
4529
msgstr ""
4530
4531
#: bzrlib/builtins.py:6318
4532
msgid " To delete all views::"
4533
msgstr ""
4534
4535
#: bzrlib/builtins.py:6320
4536
msgid " bzr view --delete --all"
4537
msgstr ""
4538
4539
#: bzrlib/builtins.py:6327
4540
msgid "Apply list or delete action to all views."
4541
msgstr ""
4542
4543
#: bzrlib/builtins.py:6330
4544
msgid "Delete the view."
4545
msgstr ""
4546
4547
#: bzrlib/builtins.py:6333
4548
msgid "Name of the view to define, list or delete."
4549
msgstr ""
4550
4551
#: bzrlib/builtins.py:6337
4552
msgid "Name of the view to switch to."
4553
msgstr ""
4554
4555
#: bzrlib/builtins.py:6356
4556
msgid "Both --delete and a file list specified"
4557
msgstr ""
4558
4559
#: bzrlib/builtins.py:6359
4560
msgid "Both --delete and --switch specified"
4561
msgstr ""
4562
4563
#: bzrlib/builtins.py:6362
4564
msgid "Deleted all views.\n"
4565
msgstr ""
4566
4567
#: bzrlib/builtins.py:6364
4568
msgid "No current view to delete"
4569
msgstr ""
4570
4571
#: bzrlib/builtins.py:6367
4572
#, python-format
4573
msgid "Deleted '%s' view.\n"
4574
msgstr ""
4575
4576
#: bzrlib/builtins.py:6371
4577
msgid "Both --switch and a file list specified"
4578
msgstr ""
4579
4580
#: bzrlib/builtins.py:6374
4581
msgid "Both --switch and --all specified"
4582
msgstr ""
4583
4584
#: bzrlib/builtins.py:6377
4585
msgid "No current view to disable"
4586
msgstr ""
4587
4588
#: bzrlib/builtins.py:6379
4589
#, python-format
4590
msgid "Disabled '%s' view.\n"
4591
msgstr ""
4592
4593
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4594
msgid "Using '{0}' view: {1}\n"
4595
msgstr ""
4596
4597
#: bzrlib/builtins.py:6386
4598
msgid "Views defined:\n"
4599
msgstr ""
4600
4601
#: bzrlib/builtins.py:6395
4602
msgid "No views defined.\n"
4603
msgstr ""
4604
4605
#: bzrlib/builtins.py:6402
4606
msgid "Cannot change the 'off' pseudo view"
4607
msgstr ""
4608
4609
#: bzrlib/builtins.py:6410
4610
msgid "No current view.\n"
4611
msgstr ""
4612
4613
#: bzrlib/builtins.py:6413
4614
msgid "'{0}' view is: {1}\n"
4615
msgstr ""
4616
4617
#: bzrlib/builtins.py:6433
4618
msgid " <no hooks installed>\n"
4619
msgstr ""
4620
4621
#: bzrlib/builtins.py:6437
4622
msgid "Remove a branch."
4623
msgstr ""
4624
4625
#: bzrlib/builtins.py:6439
4626
msgid ""
4627
"This will remove the branch from the specified location but \n"
4628
"will keep any working tree or repository in place."
4629
msgstr ""
4630
4631
#: bzrlib/builtins.py:6444
4632
msgid " Remove the branch at repo/trunk::"
4633
msgstr ""
4634
4635
#: bzrlib/builtins.py:6446
4636
msgid " bzr remove-branch repo/trunk"
4637
msgstr ""
4638
4639
#: bzrlib/builtins.py:6461
4640
msgid "Plaintext diff output."
4641
msgstr ""
4642
4643
#: bzrlib/builtins.py:6462
4644
msgid "Temporarily set aside some changes from the current tree."
4645
msgstr ""
4646
4647
#: bzrlib/builtins.py:6464
4648
msgid ""
4649
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4650
"ie. out of the way, until a later time when you can bring them back from\n"
4651
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4652
"your working tree, and so they aren't propagated along with your branch nor\n"
4653
"will they survive its deletion."
4654
msgstr ""
4655
4656
#: bzrlib/builtins.py:6470
4657
msgid "If shelve --list is specified, previously-shelved changes are listed."
4658
msgstr ""
4659
4660
#: bzrlib/builtins.py:6472
4661
msgid ""
4662
"Shelve is intended to help separate several sets of changes that have\n"
4663
"been inappropriately mingled. If you just want to get rid of all changes\n"
4664
"and you don't need to restore them later, use revert. If you want to\n"
4665
"shelve all text changes at once, use shelve --all."
4666
msgstr ""
4667
4668
#: bzrlib/builtins.py:6477
4669
msgid ""
4670
"If filenames are specified, only the changes to those files will be\n"
4671
"shelved. Other files will be left untouched."
4672
msgstr ""
4673
4674
#: bzrlib/builtins.py:6480
4675
msgid ""
4676
"If a revision is specified, changes since that revision will be shelved."
4677
msgstr ""
4678
4679
#: bzrlib/builtins.py:6482
4680
msgid ""
4681
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4682
"restore the most recently shelved changes."
4683
msgstr ""
4684
4685
#: bzrlib/builtins.py:6485
4686
msgid ""
4687
"For complicated changes, it is possible to edit the changes in a separate\n"
4688
"editor program to decide what the file remaining in the working copy\n"
4689
"should look like. To do this, add the configuration option"
4690
msgstr ""
4691
4692
#: bzrlib/builtins.py:6489
4693
msgid " change_editor = PROGRAM @new_path @old_path"
4694
msgstr ""
4695
4696
#: bzrlib/builtins.py:6491
4697
msgid ""
4698
"where @new_path is replaced with the path of the new version of the \n"
4699
"file and @old_path is replaced with the path of the old version of \n"
4700
"the file. The PROGRAM should save the new file with the desired \n"
4701
"contents of the file in the working tree.\n"
4702
" "
4703
msgstr ""
4704
4705
#: bzrlib/builtins.py:6503
4706
msgid "Shelve all changes."
4707
msgstr ""
4708
4709
#: bzrlib/builtins.py:6505
4710
msgid "Method to use for writing diffs."
4711
msgstr ""
4712
4713
#: bzrlib/builtins.py:6505
4714
msgid "writer"
4715
msgstr ""
4716
4717
#: bzrlib/builtins.py:6509
4718
msgid "List shelved changes."
4719
msgstr ""
4720
4721
#: bzrlib/builtins.py:6511
4722
msgid "Destroy removed changes instead of shelving them."
4723
msgstr ""
4724
4725
#: bzrlib/builtins.py:6540
4726
msgid "No shelved changes."
4727
msgstr ""
4728
4729
#: bzrlib/builtins.py:6551
4730
msgid "Restore shelved changes."
4731
msgstr ""
4732
4733
#: bzrlib/builtins.py:6553
4734
msgid ""
4735
"By default, the most recently shelved changes are restored. However if you\n"
4736
"specify a shelf by id those changes will be restored instead. This works\n"
4737
"best when the changes don't depend on each other."
4738
msgstr ""
4739
4740
#: bzrlib/builtins.py:6562
4741
msgid "The action to perform."
4742
msgstr ""
4743
4744
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4745
msgid "action"
4746
msgstr ""
4747
4748
#: bzrlib/builtins.py:6564
4749
msgid "Apply changes and remove from the shelf."
4750
msgstr ""
4751
4752
#: bzrlib/builtins.py:6565
4753
msgid "Show changes, but do not apply or remove them."
4754
msgstr ""
4755
4756
#: bzrlib/builtins.py:6566
4757
msgid ""
4758
"Instead of unshelving the changes, show the diff that would result from "
4759
"unshelving."
4760
msgstr ""
4761
4762
#: bzrlib/builtins.py:6568
4763
msgid "Delete changes without applying them."
4764
msgstr ""
4765
4766
#: bzrlib/builtins.py:6569
4767
msgid "Apply changes but don't delete them."
4768
msgstr ""
4769
4770
#: bzrlib/builtins.py:6584
4771
msgid "Remove unwanted files from working tree."
4772
msgstr ""
4773
4774
#: bzrlib/builtins.py:6586
4775
msgid ""
4776
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4777
"files are never deleted."
4778
msgstr ""
4779
4780
#: bzrlib/builtins.py:6589
4781
msgid ""
4782
"Another class is 'detritus', which includes files emitted by bzr during\n"
4783
"normal operations and selftests. (The value of these files decreases with\n"
4784
"time.)"
4785
msgstr ""
4786
4787
#: bzrlib/builtins.py:6593
4788
msgid ""
4789
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4790
"flags are respected, and may be combined."
4791
msgstr ""
4792
4793
#: bzrlib/builtins.py:6596
4794
msgid "To check what clean-tree will do, use --dry-run."
4795
msgstr ""
4796
4797
#: bzrlib/builtins.py:6599
4798
msgid "Delete all ignored files."
4799
msgstr ""
4800
4801
#: bzrlib/builtins.py:6600
4802
msgid ""
4803
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4804
msgstr ""
4805
4806
#: bzrlib/builtins.py:6603
4807
msgid "Delete files unknown to bzr (default)."
4808
msgstr ""
4809
4810
#: bzrlib/builtins.py:6604
4811
msgid "Show files to delete instead of deleting them."
4812
msgstr ""
4813
4814
#: bzrlib/builtins.py:6606
4815
msgid "Do not prompt before deleting."
4816
msgstr ""
4817
4818
#: bzrlib/bundle/__init__.py:59
4819
msgid "A directory cannot be a bundle"
4820
msgstr ""
4821
4822
#: bzrlib/bundle/apply_bundle.py:40
4823
msgid "Install revisions"
4824
msgstr ""
4825
4826
#: bzrlib/bundle/commands.py:64
4827
msgid "--verbose requires a merge directive"
4828
msgstr ""
4829
4830
#: bzrlib/bundle/commands.py:67
4831
msgid "Bundle format not supported"
4832
msgstr ""
4833
4834
#: bzrlib/bundle/commands.py:77
4835
msgid "Records\n"
4836
msgstr ""
4837
4838
#: bzrlib/bundle/commands.py:81
4839
msgid "{0}: {1} ({2} multiparent)\n"
4840
msgstr ""
4841
4842
#: bzrlib/bundle/commands.py:83
4843
#, python-format
4844
msgid "unique files: %d\n"
4845
msgstr ""
4846
4847
#: bzrlib/bundle/commands.py:92
4848
msgid "Revisions\n"
4849
msgstr ""
4850
4851
#: bzrlib/bundle/commands.py:93
4852
#, python-format
4853
msgid "nicks: %s\n"
4854
msgstr ""
4855
4856
#: bzrlib/bundle/commands.py:95
4857
#, python-format
4858
msgid ""
4859
"committers: \n"
4860
"%s\n"
4861
msgstr ""
4862
4863
#: bzrlib/bundle/commands.py:103
4864
msgid "Decoded contents\n"
4865
msgstr ""
4866
4867
#: bzrlib/bundle/serializer/v4.py:327
4868
#, python-format
4869
msgid "Bundling %d revision."
4870
msgid_plural "Bundling %d revisions."
4871
msgstr[0] ""
4872
msgstr[1] ""
4873
4874
#: bzrlib/bzrdir.py:490
4875
msgid ""
4876
"making backup of {0}\n"
4877
" to {1}"
4878
msgstr ""
4879
4880
#: bzrlib/bzrdir.py:513
4881
msgid "renamed {0} to {1}"
4882
msgstr ""
4883
4884
#: bzrlib/bzrdir.py:1652
4885
#, python-format
4886
msgid ""
4887
"Source repository format does not support stacking, using format:\n"
4888
" %s"
4889
msgstr ""
4890
4891
#: bzrlib/bzrdir.py:1672
4892
#, python-format
4893
msgid ""
4894
"Source branch format does not support stacking, using format:\n"
4895
" %s"
4896
msgstr ""
4897
4898
#: bzrlib/bzrdir.py:1818
4899
msgid "starting repository conversion"
4900
msgstr ""
4901
4902
#: bzrlib/bzrdir.py:2039
4903
msgid "Using default stacking branch {0} at {1}"
4904
msgstr ""
4905
4906
#: bzrlib/check.py:108
4907
msgid "check"
4908
msgstr ""
4909
4910
#: bzrlib/check.py:110
4911
msgid "checking revisions"
4912
msgstr ""
4913
4914
#: bzrlib/check.py:112
4915
msgid "checking commit contents"
4916
msgstr ""
4917
4918
#: bzrlib/check.py:114
4919
msgid "checking file graphs"
4920
msgstr ""
4921
4922
#: bzrlib/check.py:118
4923
msgid "checking branches and trees"
4924
msgstr ""
4925
4926
#: bzrlib/check.py:205
4927
msgid "checked repository {0} format {1}"
4928
msgstr ""
4929
4930
#: bzrlib/check.py:208
4931
#, python-format
4932
msgid "%6d revisions"
4933
msgstr ""
4934
4935
#: bzrlib/check.py:209
4936
#, python-format
4937
msgid "%6d file-ids"
4938
msgstr ""
4939
4940
#: bzrlib/check.py:211
4941
#, python-format
4942
msgid "%6d unreferenced text versions"
4943
msgstr ""
4944
4945
#: bzrlib/check.py:215
4946
msgid "unreferenced version: {{{0}}} in {1}"
4947
msgstr ""
4948
4949
#: bzrlib/check.py:218
4950
#, python-format
4951
msgid "%6d revisions are missing inventory_sha1"
4952
msgstr ""
4953
4954
#: bzrlib/check.py:221
4955
#, python-format
4956
msgid "%6d revisions are mentioned but not present"
4957
msgstr ""
4958
4959
#: bzrlib/check.py:224
4960
#, python-format
4961
msgid "%6d ghost revisions"
4962
msgstr ""
4963
4964
#: bzrlib/check.py:229
4965
#, python-format
4966
msgid "%6d revisions missing parents in ancestry"
4967
msgstr ""
4968
4969
#: bzrlib/check.py:233
4970
#, python-format
4971
msgid " %s should be in the ancestry for:"
4972
msgstr ""
4973
4974
#: bzrlib/check.py:237
4975
#, python-format
4976
msgid "%6d inconsistent parents"
4977
msgstr ""
4978
4979
#: bzrlib/check.py:241
4980
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4981
msgstr ""
4982
4983
#: bzrlib/check.py:247
4984
#, python-format
4985
msgid "%6d revisions have incorrect parents in the revision index"
4986
msgstr ""
4987
4988
#: bzrlib/check.py:253
4989
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4990
msgstr ""
4991
4992
#: bzrlib/check.py:267
4993
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4994
msgstr ""
4995
4996
#: bzrlib/check.py:296
4997
msgid ""
4998
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4999
"{{{4}}}"
5000
msgstr ""
5001
5002
#: bzrlib/check.py:354
5003
#, python-format
5004
msgid "Checking branch at '%s'."
5005
msgstr ""
5006
5007
#: bzrlib/check.py:374
5008
#, python-format
5009
msgid "Checking working tree at '%s'."
5010
msgstr ""
5011
5012
#: bzrlib/check.py:427 bzrlib/check.py:441
5013
msgid "No branch found at specified location."
5014
msgstr ""
5015
5016
#: bzrlib/check.py:429 bzrlib/check.py:439
5017
msgid "No working tree found at specified location."
5018
msgstr ""
5019
5020
#: bzrlib/check.py:432
5021
#, python-format
5022
msgid "Checking repository at '%s'."
5023
msgstr ""
5024
5025
#: bzrlib/check.py:443
5026
msgid "No repository found at specified location."
5027
msgstr ""
5028
5029
#: bzrlib/clean_tree.py:63
5030
msgid "Nothing to delete."
5031
msgstr ""
5032
5033
#: bzrlib/clean_tree.py:68
5034
msgid "Are you sure you wish to delete these"
5035
msgstr ""
5036
5037
#: bzrlib/clean_tree.py:70
5038
msgid "Canceled"
5039
msgstr ""
5040
5041
#: bzrlib/clean_tree.py:107
5042
#, python-format
5043
msgid "unable to remove %s"
5044
msgstr ""
5045
5046
#: bzrlib/clean_tree.py:111
5047
msgid "deleting paths:"
5048
msgstr ""
5049
5050
#: bzrlib/clean_tree.py:125
5051
msgid "unable to remove \"{0}\": {1}."
5052
msgstr ""
5053
5054
#: bzrlib/clean_tree.py:130
5055
msgid "No files deleted."
5056
msgstr ""
5057
5058
#: bzrlib/cmd_version_info.py:47
5059
msgid "No known version info format {0}. Supported types are: {1}"
5060
msgstr ""
5061
5062
#: bzrlib/cmd_version_info.py:52
5063
msgid "Version info in Custom template-based format."
5064
msgstr ""
5065
5066
#: bzrlib/cmd_version_info.py:52
5067
msgid "Version info in Python format."
5068
msgstr ""
5069
5070
#: bzrlib/cmd_version_info.py:52
5071
msgid "Version info in RIO (simple text) format (default)."
5072
msgstr ""
5073
5074
#: bzrlib/cmd_version_info.py:53
5075
msgid "Show version information about this tree."
5076
msgstr ""
5077
5078
#: bzrlib/cmd_version_info.py:55
5079
msgid ""
5080
"You can use this command to add information about version into\n"
5081
"source code of an application. The output can be in one of the\n"
5082
"supported formats or in a custom format based on a template."
5083
msgstr ""
5084
5085
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
5086
#: en/help_topics/configuration.txt:710
5087
msgid "For example::"
5088
msgstr ""
5089
5090
#: bzrlib/cmd_version_info.py:61
5091
msgid ""
5092
" bzr version-info --custom \\\n"
5093
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
5094
msgstr ""
5095
5096
#: bzrlib/cmd_version_info.py:64
5097
msgid ""
5098
"will produce a C header file with formatted string containing the\n"
5099
"current revision number. Other supported variables in templates are:"
5100
msgstr ""
5101
5102
#: bzrlib/cmd_version_info.py:67
5103
msgid ""
5104
" * {date} - date of the last revision\n"
5105
" * {build_date} - current date\n"
5106
" * {revno} - revision number\n"
5107
" * {revision_id} - revision id\n"
5108
" * {branch_nick} - branch nickname\n"
5109
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
5110
" otherwise 1"
5111
msgstr ""
5112
5113
#: bzrlib/cmd_version_info.py:77
5114
msgid "Select the output format."
5115
msgstr ""
5116
5117
#: bzrlib/cmd_version_info.py:81
5118
msgid "Include all possible information."
5119
msgstr ""
5120
5121
#: bzrlib/cmd_version_info.py:82
5122
msgid "Check if tree is clean."
5123
msgstr ""
5124
5125
#: bzrlib/cmd_version_info.py:84
5126
msgid "Include the revision-history."
5127
msgstr ""
5128
5129
#: bzrlib/cmd_version_info.py:86
5130
msgid "Include the last revision for each file."
5131
msgstr ""
5132
5133
#: bzrlib/cmd_version_info.py:87
5134
msgid "Template for the output."
5135
msgstr ""
5136
5137
#: bzrlib/cmd_version_info.py:101
5138
msgid "bzr version-info --revision takes exactly one revision specifier"
5139
msgstr ""
5140
5141
#: bzrlib/commands.py:229
5142
#, python-format
5143
msgid "unknown command \"%s\""
5144
msgstr ""
5145
5146
#: bzrlib/commands.py:476
5147
msgid "No help for this command."
5148
msgstr ""
5149
5150
#: bzrlib/commands.py:489
5151
#, python-format
5152
msgid ":Purpose: %s\n"
5153
msgstr ""
5154
5155
#: bzrlib/commands.py:491
5156
#, python-format
5157
msgid ""
5158
":Usage:\n"
5159
"%s\n"
5160
msgstr ""
5161
":使い方:\n"
5162
"%s\n"
5163
5164
#: bzrlib/commands.py:493
5165
#, python-format
5166
msgid ":Usage: %s\n"
5167
msgstr ":使い方: %s\n"
5168
5169
#: bzrlib/commands.py:512
5170
#, python-format
5171
msgid ":Options:%s"
5172
msgstr ""
5173
5174
#: bzrlib/commands.py:523
5175
#, python-format
5176
msgid ""
5177
":Description:\n"
5178
" %s\n"
5179
"\n"
5180
msgstr ""
5181
5182
#: bzrlib/commands.py:533
5183
#, python-format
5184
msgid ""
5185
"See bzr help %s for more details and examples.\n"
5186
"\n"
5187
msgstr ""
5188
5189
#: bzrlib/commands.py:538
5190
msgid ":Aliases: "
5191
msgstr ""
5192
5193
#: bzrlib/commands.py:542
5194
#, python-format
5195
msgid ":From: plugin \"%s\"\n"
5196
msgstr ""
5197
5198
#: bzrlib/commands.py:554
5199
msgid ":doc:`{0} <{1}-help>`"
5200
msgstr ""
5201
5202
#: bzrlib/commands.py:558
5203
#, python-format
5204
msgid ":See also: %s"
5205
msgstr ""
5206
5207
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
5208
msgid "Only ASCII permitted in option names"
5209
msgstr ""
5210
5211
#: bzrlib/commands.py:841 bzrlib/commands.py:849
5212
msgid "command {0!r} needs one or more {1}"
5213
msgstr ""
5214
5215
#: bzrlib/commands.py:858
5216
msgid "command {0!r} requires argument {1}"
5217
msgstr ""
5218
5219
#: bzrlib/commands.py:865
5220
msgid "extra argument to command {0}: {1}"
5221
msgstr ""
5222
5223
#: bzrlib/commands.py:962
5224
#, python-format
5225
msgid "Profile data written to \"%s\"."
5226
msgstr ""
5227
5228
#: bzrlib/commit.py:117 bzrlib/commit.py:740
5229
msgid "added"
5230
msgstr ""
5231
5232
#: bzrlib/commit.py:117 bzrlib/commit.py:748
5233
msgid "modified"
5234
msgstr ""
5235
5236
#: bzrlib/commit.py:131
5237
#, python-format
5238
msgid "Committing%s"
5239
msgstr ""
5240
5241
#: bzrlib/commit.py:134
5242
#, python-format
5243
msgid "Committed revision %d."
5244
msgstr ""
5245
5246
#: bzrlib/commit.py:143
5247
#, python-format
5248
msgid "deleted %s"
5249
msgstr ""
5250
5251
#: bzrlib/commit.py:146
5252
#, python-format
5253
msgid "missing %s"
5254
msgstr ""
5255
5256
#: bzrlib/commit.py:511
5257
msgid ""
5258
"Conflicting tags in bound branch:\n"
5259
"{0}"
5260
msgstr ""
5261
5262
#: bzrlib/commit.py:742
5263
msgid "renamed"
5264
msgstr ""
5265
5266
#: bzrlib/commit.py:977
5267
msgid "unchanged"
5268
msgstr ""
5269
5270
#: bzrlib/commit.py:999
5271
msgid "{0} [{1}] - Stage"
5272
msgstr ""
5273
5274
#: bzrlib/commit.py:1002
5275
#, python-format
5276
msgid "%s - Stage"
5277
msgstr ""
5278
5279
#: bzrlib/commit_signature_commands.py:36
5280
msgid "Sign all commits by a given committer."
5281
msgstr ""
5282
5283
#: bzrlib/commit_signature_commands.py:38
5284
msgid ""
5285
"If location is not specified the local tree is used.\n"
5286
"If committer is not specified the default committer is used."
5287
msgstr ""
5288
5289
#: bzrlib/commit_signature_commands.py:41
5290
msgid "This does not sign commits that already have signatures."
5291
msgstr ""
5292
5293
#: bzrlib/commit_signature_commands.py:49
5294
msgid ""
5295
"Don't actually sign anything, just print the revisions that would be signed."
5296
msgstr ""
5297
5298
#: bzrlib/commit_signature_commands.py:103
5299
msgid "Verify all commit signatures."
5300
msgstr ""
5301
5302
#: bzrlib/commit_signature_commands.py:105
5303
msgid ""
5304
"Verifies that all commits in the branch are signed by known GnuPG keys."
5305
msgstr ""
5306
5307
#: bzrlib/commit_signature_commands.py:110
5308
msgid ""
5309
"Comma separated list of GPG key patterns which are acceptable for "
5310
"verification."
5311
msgstr ""
5312
5313
#: bzrlib/commit_signature_commands.py:147
5314
msgid "Cannot verify a range of non-revision-history revisions"
5315
msgstr ""
5316
5317
#: bzrlib/commit_signature_commands.py:168
5318
msgid "All commits signed with verifiable keys"
5319
msgstr ""
5320
5321
#: bzrlib/config.py:475
5322
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5323
msgstr ""
5324
5325
#: bzrlib/config.py:2485
5326
msgid "{0} is not an SI unit."
5327
msgstr ""
5328
5329
#: bzrlib/config.py:2949
5330
msgid ""
5331
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5332
"will be saved."
5333
msgstr ""
5334
5335
#: bzrlib/config.py:3093
5336
#, python-format
5337
msgid "Invalid '%s', should be of the form 'name=value'"
5338
msgstr ""
5339
5340
#: bzrlib/config.py:3962
5341
msgid "Display, set or remove a configuration option."
5342
msgstr ""
5343
5344
#: bzrlib/config.py:3964
5345
msgid "Display the active value for a given option."
5346
msgstr ""
5347
5348
#: bzrlib/config.py:3966
5349
msgid ""
5350
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5351
"matching options are displayed mentioning their scope. The active value\n"
5352
"that bzr will take into account is the first one displayed for each option."
5353
msgstr ""
5354
5355
#: bzrlib/config.py:3970
5356
msgid "If no NAME is given, --all .* is implied."
5357
msgstr ""
5358
5359
#: bzrlib/config.py:3972
5360
msgid ""
5361
"Setting a value is achieved by using name=value without spaces. The value\n"
5362
"is set in the most relevant scope and can be checked by displaying the\n"
5363
"option again."
5364
msgstr ""
5365
5366
#: bzrlib/config.py:3984
5367
msgid "Reduce the scope to the specified configuration file."
5368
msgstr ""
5369
5370
#: bzrlib/config.py:3988
5371
msgid "Display all the defined values for the matching options."
5372
msgstr ""
5373
5374
#: bzrlib/config.py:3990
5375
msgid "Remove the option from the configuration file."
5376
msgstr ""
5377
5378
#: bzrlib/conflicts.py:50
5379
msgid "List files with conflicts."
5380
msgstr ""
5381
5382
#: bzrlib/conflicts.py:57
5383
msgid ""
5384
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5385
"is supplied, the pathnames of files with text conflicts are listed,\n"
5386
"instead. (This is useful for editing all files with text conflicts.)"
5387
msgstr ""
5388
5389
#: bzrlib/conflicts.py:61
5390
msgid "Use bzr resolve when you have fixed a problem."
5391
msgstr ""
5392
5393
#: bzrlib/conflicts.py:66
5394
msgid "List paths of files with text conflicts."
5395
msgstr ""
5396
5397
#: bzrlib/conflicts.py:85
5398
msgid "Marks the conflict as resolved."
5399
msgstr ""
5400
5401
#: bzrlib/conflicts.py:88
5402
msgid "Resolve the conflict preserving the version in the working tree."
5403
msgstr ""
5404
5405
#: bzrlib/conflicts.py:91
5406
msgid "Resolve the conflict taking the merged version into account."
5407
msgstr ""
5408
5409
#: bzrlib/conflicts.py:98
5410
msgid "How to resolve the conflict."
5411
msgstr ""
5412
5413
#: bzrlib/conflicts.py:104
5414
msgid "Mark a conflict as resolved."
5415
msgstr ""
5416
5417
#: bzrlib/conflicts.py:111
5418
msgid ""
5419
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5420
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5421
"as\n"
5422
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5423
msgstr ""
5424
5425
#: bzrlib/conflicts.py:119
5426
msgid "Resolve all conflicts in this tree."
5427
msgstr ""
5428
5429
#: bzrlib/conflicts.py:126
5430
msgid "If --all is specified, no FILE may be provided"
5431
msgstr ""
5432
5433
#: bzrlib/conflicts.py:151
5434
#, python-format
5435
msgid "%d conflict auto-resolved."
5436
msgid_plural "%d conflicts auto-resolved."
5437
msgstr[0] ""
5438
msgstr[1] ""
5439
5440
#: bzrlib/conflicts.py:154
5441
msgid "Remaining conflicts:"
5442
msgstr ""
5443
5444
#: bzrlib/conflicts.py:159
5445
msgid "All conflicts resolved."
5446
msgstr ""
5447
5448
#: bzrlib/conflicts.py:168
5449
msgid "{0} conflict resolved, {1} remaining"
5450
msgid_plural "{0} conflicts resolved, {1} remaining"
5451
msgstr[0] ""
5452
msgstr[1] ""
5453
5454
#: bzrlib/controldir.py:710
5455
msgid "{0} is{1} redirected to {2}"
5456
msgstr ""
5457
5458
#: bzrlib/diff.py:399
5459
#, python-format
5460
msgid "*** Ignoring files outside view. View is %s"
5461
msgstr ""
5462
5463
#: bzrlib/errors.py:157
5464
msgid "The tree builder is already building a tree."
5465
msgstr ""
5466
5467
#: bzrlib/errors.py:178
5468
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5469
msgstr ""
5470
5471
#: bzrlib/errors.py:197
5472
msgid ""
5473
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5474
"versions \"%(minimum)s\" to \"%(current)s\"."
5475
msgstr ""
5476
5477
#: bzrlib/errors.py:209
5478
msgid "The transport '%(transport)s' is only accessible within this process."
5479
msgstr ""
5480
5481
#: bzrlib/errors.py:227
5482
msgid "Invalid revision number %(revno)s"
5483
msgstr ""
5484
5485
#: bzrlib/errors.py:236
5486
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5487
msgstr ""
5488
5489
#: bzrlib/errors.py:247
5490
msgid "Reserved revision-id {%(revision_id)s}"
5491
msgstr ""
5492
5493
#: bzrlib/errors.py:261
5494
msgid "There is no public branch set for \"%(branch_url)s\"."
5495
msgstr ""
5496
5497
#: bzrlib/errors.py:271
5498
msgid ""
5499
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5500
"obtain a list of topics."
5501
msgstr ""
5502
5503
#: bzrlib/errors.py:280
5504
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5505
msgstr ""
5506
5507
#: bzrlib/errors.py:290
5508
msgid ""
5509
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5510
msgstr ""
5511
5512
#: bzrlib/errors.py:299
5513
msgid "The branch '%(branch)s' is not stacked."
5514
msgstr ""
5515
5516
#: bzrlib/errors.py:313
5517
msgid "No WorkingTree exists for \"%(base)s\"."
5518
msgstr ""
5519
5520
#: bzrlib/errors.py:322
5521
msgid "Not currently building a tree."
5522
msgstr ""
5523
5524
#: bzrlib/errors.py:327
5525
msgid "%(url)s is not a local path."
5526
msgstr ""
5527
5528
#: bzrlib/errors.py:355
5529
msgid "%(not_locked)r is not write locked but needs to be."
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:363
5533
msgid "Error in command line options"
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:368
5537
msgid "%(value)s is not an index of type %(_type)s."
5538
msgstr ""
5539
5540
#: bzrlib/errors.py:378
5541
msgid "Error in data for index %(value)s."
5542
msgstr ""
5543
5544
#: bzrlib/errors.py:387
5545
msgid "The key '%(key)s' is already in index '%(index)s'."
5546
msgstr ""
5547
5548
#: bzrlib/errors.py:397
5549
msgid "The key '%(key)s' is not a valid key."
5550
msgstr ""
5551
5552
#: bzrlib/errors.py:406
5553
msgid "Could not parse options for index %(value)s."
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:415
5557
msgid "The value '%(value)s' is not a valid value."
5558
msgstr ""
5559
5560
#: bzrlib/errors.py:424
5561
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5562
msgstr "オプション \"%(name)s\" に対する不正な値 \"%(value)s\""
5563
5564
#: bzrlib/errors.py:443
5565
msgid "Generic path error: %(path)r%(extra)s)"
5566
msgstr ""
5567
5568
#: bzrlib/errors.py:456
5569
msgid "No such file: %(path)r%(extra)s"
5570
msgstr ""
5571
5572
#: bzrlib/errors.py:461
5573
msgid "File exists: %(path)r%(extra)s"
5574
msgstr ""
5575
5576
#: bzrlib/errors.py:467
5577
msgid ""
5578
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5579
"after to tell bzr about a rename that has already happened)%(extra)s"
5580
msgstr ""
5581
5582
#: bzrlib/errors.py:483
5583
msgid "\"%(path)s\" is not a directory %(extra)s"
5584
msgstr ""
5585
5586
#: bzrlib/errors.py:488
5587
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5588
msgstr ""
5589
5590
#: bzrlib/errors.py:493
5591
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5592
msgstr ""
5593
5594
#: bzrlib/errors.py:498
5595
msgid "Hard-linking \"%(path)s\" is not supported"
5596
msgstr ""
5597
5598
#: bzrlib/errors.py:513
5599
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5600
msgstr ""
5601
5602
#: bzrlib/errors.py:518
5603
msgid "Permission denied: \"%(path)s\"%(extra)s"
5604
msgstr ""
5605
5606
#: bzrlib/errors.py:523
5607
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5608
msgstr ""
5609
5610
#: bzrlib/errors.py:528
5611
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5612
msgstr ""
5613
5614
#: bzrlib/errors.py:539
5615
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5616
msgstr ""
5617
5618
#: bzrlib/errors.py:561
5619
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5620
msgstr ""
5621
5622
#: bzrlib/errors.py:571
5623
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5624
msgstr ""
5625
5626
#: bzrlib/errors.py:579
5627
msgid ""
5628
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5629
"upgrade the branch to permit branch stacking."
5630
msgstr ""
5631
5632
#: bzrlib/errors.py:590
5633
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5634
msgstr ""
5635
5636
#: bzrlib/errors.py:600
5637
msgid ""
5638
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5639
"need to upgrade the repository to permit branch stacking."
5640
msgstr ""
5641
5642
#: bzrlib/errors.py:611
5643
msgid "Error reading from %(path)r."
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:630
5647
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:646
5651
msgid "Path \"%(path)s\" is not unicode normalized"
5652
msgstr ""
5653
5654
#: bzrlib/errors.py:654
5655
msgid "Not a branch: \"%(path)s\"%(detail)s."
5656
msgstr ""
5657
5658
#: bzrlib/errors.py:696
5659
msgid "No submit branch available for branch \"%(path)s\""
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:705
5663
msgid "A control directory already exists: \"%(path)s\"."
5664
msgstr ""
5665
5666
#: bzrlib/errors.py:710
5667
msgid "Already a branch: \"%(path)s\"."
5668
msgstr ""
5669
5670
#: bzrlib/errors.py:715
5671
msgid "Parent branch already exists: \"%(path)s\"."
5672
msgstr ""
5673
5674
#: bzrlib/errors.py:721
5675
msgid ""
5676
"Directory contains a branch, but no working tree (use bzr checkout if you "
5677
"wish to build a working tree): \"%(path)s\""
5678
msgstr ""
5679
5680
#: bzrlib/errors.py:726
5681
msgid ""
5682
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5683
msgstr ""
5684
5685
#: bzrlib/errors.py:736
5686
msgid ""
5687
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5688
msgstr ""
5689
5690
#: bzrlib/errors.py:746
5691
msgid "No repository present: \"%(path)s\""
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:753
5695
msgid ""
5696
"Unsupported branch format: %(format)s\n"
5697
"Please run 'bzr upgrade'"
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:759
5701
msgid "Unknown %(kind)s format: %(format)r"
5702
msgstr ""
5703
5704
#: bzrlib/errors.py:768
5705
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5706
msgstr ""
5707
5708
#: bzrlib/errors.py:778
5709
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5710
msgstr ""
5711
5712
#: bzrlib/errors.py:793
5713
msgid ""
5714
"%(target)s\n"
5715
"is not compatible with\n"
5716
"%(source)s\n"
5717
"%(details)s"
5718
msgstr ""
5719
5720
#: bzrlib/errors.py:809
5721
msgid "Revision is not compatible with %(repo_format)s"
5722
msgstr ""
5723
5724
#: bzrlib/errors.py:819
5725
msgid "%(context_info)s%(path)s is already versioned."
5726
msgstr ""
5727
5728
#: bzrlib/errors.py:840
5729
msgid "%(context_info)s%(path)s is not versioned."
5730
msgstr ""
5731
5732
#: bzrlib/errors.py:861
5733
msgid "Path(s) are not versioned: %(paths_as_string)s"
5734
msgstr ""
5735
5736
#: bzrlib/errors.py:872
5737
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5738
msgstr ""
5739
5740
#: bzrlib/errors.py:891
5741
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5742
msgstr ""
5743
5744
#: bzrlib/errors.py:899
5745
msgid ""
5746
"Filename %(filename)r is not valid in your current filesystem encoding "
5747
"%(fs_encoding)s"
5748
msgstr ""
5749
5750
#: bzrlib/errors.py:910
5751
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5752
msgstr ""
5753
5754
#: bzrlib/errors.py:928
5755
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5756
msgstr ""
5757
5758
#: bzrlib/errors.py:967
5759
msgid "Cannot lock %(lock)s: %(why)s"
5760
msgstr ""
5761
5762
#: bzrlib/errors.py:977
5763
msgid ""
5764
"A transaction related operation was attempted after the transaction finished."
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:1004
5768
msgid "Cannot lock: transport is read only: %(transport)s"
5769
msgstr ""
5770
5771
#: bzrlib/errors.py:1012
5772
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5773
msgstr ""
5774
5775
#: bzrlib/errors.py:1023
5776
msgid ""
5777
"Lock was broken while still open: %(lock)s - check storage consistency!"
5778
msgstr ""
5779
5780
#: bzrlib/errors.py:1034
5781
msgid ""
5782
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5783
"%(holder)r, wanted to break %(target)r"
5784
msgstr ""
5785
5786
#: bzrlib/errors.py:1046
5787
msgid ""
5788
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5789
"Use 'bzr break-lock' to clear it"
5790
msgstr ""
5791
5792
#: bzrlib/errors.py:1059
5793
msgid "Lock not held: %(lock)s"
5794
msgstr ""
5795
5796
#: bzrlib/errors.py:1088
5797
msgid "No changes to commit"
5798
msgstr ""
5799
5800
#: bzrlib/errors.py:1093
5801
msgid ""
5802
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5803
msgstr ""
5804
5805
#: bzrlib/errors.py:1103
5806
msgid ""
5807
"Excluding paths during commit is not supported by repository at "
5808
"%(repository)r."
5809
msgstr ""
5810
5811
#: bzrlib/errors.py:1112
5812
msgid ""
5813
"The specified commit message contains characters unsupported by the current "
5814
"encoding."
5815
msgstr ""
5816
5817
#: bzrlib/errors.py:1118
5818
msgid "Upgrade URL cannot work with readonly URLs."
5819
msgstr ""
5820
5821
#: bzrlib/errors.py:1123
5822
msgid "The branch format %(format)s is already at the most recent format."
5823
msgstr ""
5824
5825
#: bzrlib/errors.py:1146
5826
msgid "Option --change does not accept revision ranges"
5827
msgstr ""
5828
5829
#: bzrlib/errors.py:1151
5830
msgid "No namespace registered for string: %(spec)r"
5831
msgstr ""
5832
5833
#: bzrlib/errors.py:1170
5834
msgid ""
5835
"Requested revision: '%(spec)s' does not exist in branch: "
5836
"%(branch_url)s%(extra)s"
5837
msgstr ""
5838
5839
#: bzrlib/errors.py:1184
5840
msgid ""
5841
"Operation denied because it would change the main history, which is not "
5842
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5843
msgstr ""
5844
5845
#: bzrlib/errors.py:1195
5846
msgid ""
5847
"These branches have diverged. Use the missing command to see how.\n"
5848
"Use the merge command to reconcile them."
5849
msgstr ""
5850
5851
#: bzrlib/errors.py:1215
5852
msgid ""
5853
"Branches have no common ancestor, and no merge base revision was specified."
5854
msgstr ""
5855
5856
#: bzrlib/errors.py:1221
5857
msgid ""
5858
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5859
msgstr ""
5860
5861
#: bzrlib/errors.py:1227
5862
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5863
msgstr ""
5864
5865
#: bzrlib/errors.py:1236
5866
msgid ""
5867
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5868
msgstr ""
5869
5870
#: bzrlib/errors.py:1245
5871
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:1254
5875
msgid "Branch %(branch)s has no commits."
5876
msgstr ""
5877
5878
#: bzrlib/errors.py:1272
5879
msgid ""
5880
"Bound branch %(branch)s is out of date with master branch "
5881
"%(master)s.%(extra_help)s"
5882
msgstr ""
5883
5884
#: bzrlib/errors.py:1284
5885
msgid ""
5886
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5887
"bound to %(remote)s."
5888
msgstr ""
5889
5890
#: bzrlib/errors.py:1296
5891
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5892
msgstr ""
5893
5894
#: bzrlib/errors.py:1305
5895
msgid ""
5896
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5897
"%(error)s"
5898
msgstr ""
5899
5900
#: bzrlib/errors.py:1317
5901
msgid "Error in processing weave: %(msg)s"
5902
msgstr ""
5903
5904
#: bzrlib/errors.py:1326
5905
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5906
msgstr ""
5907
5908
#: bzrlib/errors.py:1337
5909
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5910
msgstr ""
5911
5912
#: bzrlib/errors.py:1347
5913
msgid "Weave invariant violated: %(what)s"
5914
msgstr ""
5915
5916
#: bzrlib/errors.py:1356
5917
msgid "Parents are mismatched between two revisions. %(msg)s"
5918
msgstr ""
5919
5920
#: bzrlib/errors.py:1378
5921
msgid ""
5922
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5923
"%(weave_b)s"
5924
msgstr ""
5925
5926
#: bzrlib/errors.py:1390
5927
msgid "Versioned file error"
5928
msgstr "バージョン管理されたファイルのエラー"
5929
5930
#: bzrlib/errors.py:1395
5931
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5932
msgstr "\"%(file_id)s\" にはリビジョン {%(revision_id)s} がありません。"
5933
5934
#: bzrlib/errors.py:1405
5935
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5936
msgstr "\"%(file_id)s\" にはすでにリビジョン {%(revision_id)s} が存在しています。"
5937
5938
#: bzrlib/errors.py:1415
5939
msgid "Text did not match its checksum: %(msg)s"
5940
msgstr "テキストがチェックサムと一致しません: %(msg)s"
5941
5942
#: bzrlib/errors.py:1541
5943
msgid "Export format %(format)r not supported"
5944
msgstr "エクスポートフォーマット %(format)r はサポートされていません"
5945
5946
#: bzrlib/errors.py:1550
5947
msgid "Transport error: %(msg)s %(orig_error)s"
5948
msgstr ""
5949
5950
#: bzrlib/errors.py:1576
5951
msgid "Generic bzr smart protocol error: %(details)s"
5952
msgstr ""
5953
5954
#: bzrlib/errors.py:1584
5955
msgid "Received bad protocol version marker: %(marker)r"
5956
msgstr ""
5957
5958
#: bzrlib/errors.py:1616
5959
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5960
msgstr ""
5961
5962
#: bzrlib/errors.py:1621
5963
msgid "Connection error: %(msg)s %(orig_error)s"
5964
msgstr ""
5965
5966
#: bzrlib/errors.py:1626
5967
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5968
msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
5969
5970
#: bzrlib/errors.py:1647
5971
msgid "Connection closed: %(msg)s %(orig_error)s"
5972
msgstr "接続が閉じられました: %(msg)s %(orig_error)s"
5973
5974
#: bzrlib/errors.py:1652
5975
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5976
msgstr "接続がタイムアウトしました: %(msg)s%(orig_error)s"
5977
5978
#: bzrlib/errors.py:1657
5979
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5980
msgstr "%(path)s の %(offset)s に対する不正な range アクセス: %(msg)s"
5981
5982
#: bzrlib/errors.py:1667
5983
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5984
msgstr "%(path)s からの不正な HTTP レスポンス: %(msg)s%(orig_error)s"
5985
5986
#: bzrlib/errors.py:1682
5987
msgid "Certificate error: %(error)s"
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:1690
5991
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5992
msgstr "%(path) に対する不正な range %(range)r: %(msg)s"
5993
5994
#: bzrlib/errors.py:1704
5995
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5996
msgstr "%(path)s に HTTP MIME 境界が見つかりません: %(msg)s"
5997
5998
#: bzrlib/errors.py:1712
5999
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
6000
msgstr ""
6001
6002
#: bzrlib/errors.py:1721
6003
msgid "%(source)s is%(permanently)s redirected to %(target)s"
6004
msgstr ""
6005
6006
#: bzrlib/errors.py:1735
6007
msgid "Too many redirections"
6008
msgstr "リダイレクションが多すぎます"
6009
6010
#: bzrlib/errors.py:1740
6011
msgid "Working tree has conflicts."
6012
msgstr "作業ツリーに衝突があります"
6013
6014
#: bzrlib/errors.py:1744
6015
msgid "Config file %(filename)s is not UTF-8 encoded\n"
6016
msgstr "設定ファイル %(filename)s が UTF-8 でエンコードされていません\n"
6017
6018
#: bzrlib/errors.py:1753
6019
msgid ""
6020
"Error(s) parsing config file %(filename)s:\n"
6021
"%(errors)s"
6022
msgstr ""
6023
"設定ファイル %(filename)s のパースエラー:\n"
6024
"%(error)s"
6025
6026
#: bzrlib/errors.py:1763
6027
msgid ""
6028
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
6029
"See ``bzr help %(name)s``"
6030
msgstr ""
6031
6032
#: bzrlib/errors.py:1773
6033
msgid "%(username)r does not seem to contain a reasonable email address"
6034
msgstr "%(username)r に有効な e-mail アドレスが含まれていないようです"
6035
6036
#: bzrlib/errors.py:1782
6037
msgid "Failed to GPG sign data with command \"%(command_line)s\""
6038
msgstr "\"%(command_line)s\" コマンドでのGPGサインに失敗しました"
6039
6040
#: bzrlib/errors.py:1790
6041
msgid "Failed to verify GPG signature data with error \"%(error)s\""
6042
msgstr "GPGシグネチャの検証に \"%(error)s\" で失敗しました。"
6043
6044
#: bzrlib/errors.py:1798
6045
msgid "Unable to import library \"%(library)s\": %(error)s"
6046
msgstr "ライブラリ \"%(library)s\" をインポートできません: %(error)s"
6047
6048
#: bzrlib/errors.py:1806
6049
msgid "python-gpgme is not installed, it is needed to verify signatures"
6050
msgstr "python-gpgme がインストールされていません。これはシグネチャの検証に必要です。"
6051
6052
#: bzrlib/errors.py:1814
6053
msgid ""
6054
"The working tree for %(basedir)s has changed since the last commit, but "
6055
"weave merge requires that it be unchanged"
6056
msgstr "作業ツリー %(basedir)s が最後のコミットから変更されています。 作業ツリーが変更されている場合weaveマージはできません。"
6057
6058
#: bzrlib/errors.py:1824
6059
msgid ""
6060
"Can't reprocess and show base, because reprocessing obscures the "
6061
"relationship of conflicting lines to the base"
6062
msgstr ""
6063
6064
#: bzrlib/errors.py:1830
6065
msgid "Cycle in graph %(graph)r"
6066
msgstr "グラフ %(graph)r がループしています。"
6067
6068
#: bzrlib/errors.py:1858
6069
msgid "File %(filename)s is not conflicted."
6070
msgstr "%(filename)s は衝突していません"
6071
6072
#: bzrlib/errors.py:1880
6073
msgid "No bundle was found in \"%(filename)s\"."
6074
msgstr "\"%(filename)s\" にバンドルが見つかりません。"
6075
6076
#: bzrlib/errors.py:1889
6077
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6078
msgstr ""
6079
6080
#: bzrlib/errors.py:1899
6081
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6082
msgstr ""
6083
6084
#: bzrlib/errors.py:1912
6085
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6086
msgstr ""
6087
6088
#: bzrlib/errors.py:1922
6089
msgid "Key %(key)s is already present in map"
6090
msgstr ""
6091
6092
#: bzrlib/errors.py:1927
6093
msgid "The prefix %(prefix)s is in the help search path twice."
6094
msgstr ""
6095
6096
#: bzrlib/errors.py:1937
6097
msgid ""
6098
"No final name for trans_id %(trans_id)r\n"
6099
"file-id: %(file_id)r\n"
6100
"root trans-id: %(root_trans_id)r\n"
6101
msgstr ""
6102
6103
#: bzrlib/errors.py:1969
6104
msgid "Attempt to reuse a transform that has already been applied."
6105
msgstr ""
6106
6107
#: bzrlib/errors.py:1974
6108
msgid "Moving the root directory is not supported at this time"
6109
msgstr "いまのところ、ルートディレクトリの移動はサポートされていません"
6110
6111
#: bzrlib/errors.py:1979
6112
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6113
msgstr "%(from_path)s から %(to_path)s へのリネームに失敗しました: %(why)s"
6114
6115
#: bzrlib/errors.py:1990
6116
msgid ""
6117
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6118
msgstr ""
6119
"移動できません。 %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6120
6121
#: bzrlib/errors.py:2026
6122
msgid ""
6123
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6124
msgstr ""
6125
"%(from_path)s%(operator)s から %(to_path)s%(_has_extra)s%(extra)s へリネームできません"
6126
6127
#: bzrlib/errors.py:2056
6128
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6129
msgstr ""
6130
6131
#: bzrlib/errors.py:2064
6132
msgid "Nothing to merge."
6133
msgstr ""
6134
6135
#: bzrlib/errors.py:2069
6136
msgid "Format %(format)s cannot be initialised by this version of bzr."
6137
msgstr ""
6138
6139
#: bzrlib/errors.py:2078
6140
msgid ""
6141
"Cannot convert from format %(from_format)s to format %(format)s. "
6142
"%(problem)s"
6143
msgstr ""
6144
6145
#: bzrlib/errors.py:2090
6146
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6147
msgstr ""
6148
6149
#: bzrlib/errors.py:2098
6150
msgid "%(exe_name)s could not be found on this machine"
6151
msgstr ""
6152
6153
#: bzrlib/errors.py:2106
6154
msgid "Diff is not installed on this machine: %(msg)s"
6155
msgstr ""
6156
6157
#: bzrlib/errors.py:2114
6158
msgid "Diff3 is not installed on this machine."
6159
msgstr ""
6160
6161
#: bzrlib/errors.py:2120
6162
msgid "The content being inserted is already present."
6163
msgstr ""
6164
6165
#: bzrlib/errors.py:2125
6166
msgid ""
6167
"This tree contains left-over files from a failed operation.\n"
6168
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6169
"to\n"
6170
" keep, and delete it when you are done."
6171
msgstr ""
6172
6173
#: bzrlib/errors.py:2136
6174
msgid ""
6175
"This tree contains left-over files from a failed operation.\n"
6176
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6177
" wish to keep, and delete it when you are done."
6178
msgstr ""
6179
6180
#: bzrlib/errors.py:2146
6181
msgid ""
6182
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6183
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6184
"to\n"
6185
" keep, and delete it when you are done."
6186
msgstr ""
6187
6188
#: bzrlib/errors.py:2157
6189
msgid ""
6190
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6191
"examine %(pending_deletion)s to see if it contains any files you wish to "
6192
"keep, and delete it when you are done."
6193
msgstr ""
6194
6195
#: bzrlib/errors.py:2167
6196
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6197
msgstr ""
6198
6199
#: bzrlib/errors.py:2181
6200
msgid ""
6201
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6202
msgstr ""
6203
6204
#: bzrlib/errors.py:2194
6205
msgid "Error in merge modified format"
6206
msgstr ""
6207
6208
#: bzrlib/errors.py:2199
6209
msgid "Format error in conflict listings"
6210
msgstr ""
6211
6212
#: bzrlib/errors.py:2203
6213
msgid ""
6214
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6215
"Error: %(description)s"
6216
msgstr ""
6217
6218
#: bzrlib/errors.py:2214
6219
msgid ""
6220
"An error has been detected in the repository %(repo_path)s.\n"
6221
"Please run bzr reconcile on this repository."
6222
msgstr ""
6223
6224
#: bzrlib/errors.py:2225
6225
msgid ""
6226
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6227
"reason: %(reason)s"
6228
msgstr ""
6229
6230
#: bzrlib/errors.py:2238
6231
msgid ""
6232
"An inconsistent delta was supplied: %(delta)r\n"
6233
"reason: %(reason)s"
6234
msgstr ""
6235
6236
#: bzrlib/errors.py:2250
6237
msgid "To use this feature you must upgrade your branch at %(path)s."
6238
msgstr ""
6239
6240
#: bzrlib/errors.py:2259
6241
msgid "To use this feature you must upgrade your repository at %(path)s."
6242
msgstr ""
6243
6244
#: bzrlib/errors.py:2264
6245
msgid ""
6246
"To use this feature you must upgrade your branch at %(path)s to a format "
6247
"which supports rich roots."
6248
msgstr ""
6249
6250
#: bzrlib/errors.py:2270
6251
msgid "Cannot perform local-only commits on unbound branches."
6252
msgstr ""
6253
6254
#: bzrlib/errors.py:2275
6255
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6256
msgstr ""
6257
6258
#: bzrlib/errors.py:2296
6259
msgid "Ghost tags not supported by format %(format)r."
6260
msgstr ""
6261
6262
#: bzrlib/errors.py:2304
6263
msgid "File is binary but should be text."
6264
msgstr ""
6265
6266
#: bzrlib/errors.py:2309
6267
msgid "The path %(path)s is not permitted on this platform"
6268
msgstr ""
6269
6270
#: bzrlib/errors.py:2318
6271
msgid ""
6272
"Testament did not match expected value.\n"
6273
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6274
" {%(measured)s}"
6275
msgstr ""
6276
6277
#: bzrlib/errors.py:2330
6278
msgid "Not a bzr revision-bundle: %(text)r"
6279
msgstr ""
6280
6281
#: bzrlib/errors.py:2339
6282
msgid "Bad bzr revision-bundle: %(text)r"
6283
msgstr ""
6284
6285
#: bzrlib/errors.py:2348
6286
msgid "Malformed bzr revision-bundle header: %(text)r"
6287
msgstr ""
6288
6289
#: bzrlib/errors.py:2353
6290
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6291
msgstr ""
6292
6293
#: bzrlib/errors.py:2358
6294
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6295
msgstr ""
6296
6297
#: bzrlib/errors.py:2363
6298
msgid "End of line marker was not \\n in bzr revision-bundle"
6299
msgstr ""
6300
6301
#: bzrlib/errors.py:2373
6302
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6303
msgstr ""
6304
6305
#: bzrlib/errors.py:2383
6306
msgid "Root class for inventory serialization errors"
6307
msgstr ""
6308
6309
#: bzrlib/errors.py:2387
6310
msgid ""
6311
"The inventory was not in the expected format:\n"
6312
" %(msg)s"
6313
msgstr ""
6314
6315
#: bzrlib/errors.py:2396
6316
msgid "This operation requires rich root data storage"
6317
msgstr ""
6318
6319
#: bzrlib/errors.py:2409
6320
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6321
msgstr ""
6322
6323
#: bzrlib/errors.py:2418
6324
msgid ""
6325
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6326
"variable."
6327
msgstr ""
6328
6329
#: bzrlib/errors.py:2425
6330
msgid ""
6331
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6332
"ghost at {%(ghost_revision_id)s}"
6333
msgstr ""
6334
6335
#: bzrlib/errors.py:2435
6336
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6337
msgstr ""
6338
6339
#: bzrlib/errors.py:2486
6340
msgid ""
6341
"A merge directive must provide either a bundle or a public branch location."
6342
msgstr ""
6343
6344
#: bzrlib/errors.py:2493
6345
msgid "Bad merge directive payload %(start)r"
6346
msgstr ""
6347
6348
#: bzrlib/errors.py:2503
6349
msgid "Preview patch does not match requested changes."
6350
msgstr ""
6351
6352
#: bzrlib/errors.py:2509
6353
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6354
msgstr ""
6355
6356
#: bzrlib/errors.py:2519
6357
msgid ""
6358
"Your branch does not have all of the revisions required in order to merge "
6359
"this merge directive and the target location specified in the merge "
6360
"directive is not a branch: %(location)s."
6361
msgstr ""
6362
6363
#: bzrlib/errors.py:2531
6364
msgid "Unsupported entry kind %(kind)s"
6365
msgstr ""
6366
6367
#: bzrlib/errors.py:2539
6368
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6369
msgstr ""
6370
6371
#: bzrlib/errors.py:2549
6372
msgid "Subsume target %(other_tree)s needs to be upgraded."
6373
msgstr ""
6374
6375
#: bzrlib/errors.py:2568
6376
msgid "No such tag: %(tag_name)s"
6377
msgstr ""
6378
6379
#: bzrlib/errors.py:2576
6380
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6381
msgstr ""
6382
6383
#: bzrlib/errors.py:2585
6384
msgid "Tag %(tag_name)s already exists."
6385
msgstr ""
6386
6387
#: bzrlib/errors.py:2593
6388
msgid ""
6389
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6390
"bugs\" for more information on this feature."
6391
msgstr ""
6392
6393
#: bzrlib/errors.py:2603
6394
msgid ""
6395
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6396
msgstr ""
6397
6398
#: bzrlib/errors.py:2613
6399
msgid ""
6400
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6401
msgstr ""
6402
6403
#: bzrlib/errors.py:2623
6404
msgid "Invalid line in bugs property: '%(line)s'"
6405
msgstr ""
6406
6407
#: bzrlib/errors.py:2631
6408
msgid "Invalid bug status: '%(status)s'"
6409
msgstr ""
6410
6411
#: bzrlib/errors.py:2639
6412
msgid "Could not understand response from smart server: %(response_tuple)r"
6413
msgstr ""
6414
6415
#: bzrlib/errors.py:2678
6416
msgid "Server sent an unexpected error: %(error_tuple)r"
6417
msgstr ""
6418
6419
#: bzrlib/errors.py:2697
6420
msgid "Unrecognised container format: %(container_format)r"
6421
msgstr ""
6422
6423
#: bzrlib/errors.py:2705
6424
msgid "Unexpected end of container stream"
6425
msgstr ""
6426
6427
#: bzrlib/errors.py:2710
6428
msgid "Unknown record type: %(record_type)r"
6429
msgstr ""
6430
6431
#: bzrlib/errors.py:2718
6432
msgid "Invalid record: %(reason)s"
6433
msgstr ""
6434
6435
#: bzrlib/errors.py:2726
6436
msgid "Container has data after end marker: %(excess)r"
6437
msgstr ""
6438
6439
#: bzrlib/errors.py:2734
6440
msgid "Container has multiple records with the same name: %(name)s"
6441
msgstr ""
6442
6443
#: bzrlib/errors.py:2747
6444
msgid "Corrupt or incompatible data stream: %(reason)s"
6445
msgstr ""
6446
6447
#: bzrlib/errors.py:2755
6448
msgid "SMTP error: %(error)s"
6449
msgstr ""
6450
6451
#: bzrlib/errors.py:2763
6452
msgid "No message supplied."
6453
msgstr ""
6454
6455
#: bzrlib/errors.py:2768
6456
msgid "No mail-to address (--mail-to) or output (-o) specified."
6457
msgstr ""
6458
6459
#: bzrlib/errors.py:2773
6460
msgid "Unknown mail client: %(mail_client)s"
6461
msgstr ""
6462
6463
#: bzrlib/errors.py:2781
6464
msgid ""
6465
"Unable to find mail client with the following names: "
6466
"%(mail_command_list_string)s"
6467
msgstr ""
6468
6469
#: bzrlib/errors.py:2791
6470
msgid "SMTP connection to %(host)s refused"
6471
msgstr ""
6472
6473
#: bzrlib/errors.py:2800
6474
msgid "Please specify smtp_server. No server at default %(host)s."
6475
msgstr ""
6476
6477
#: bzrlib/errors.py:2814
6478
msgid ""
6479
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6480
"reconfigure."
6481
msgstr ""
6482
6483
#: bzrlib/errors.py:2826
6484
msgid "'%(display_url)s' is already a branch."
6485
msgstr ""
6486
6487
#: bzrlib/errors.py:2831
6488
msgid "'%(display_url)s' is already a tree."
6489
msgstr ""
6490
6491
#: bzrlib/errors.py:2836
6492
msgid "'%(display_url)s' is already a checkout."
6493
msgstr ""
6494
6495
#: bzrlib/errors.py:2841
6496
msgid "'%(display_url)s' is already a lightweight checkout."
6497
msgstr ""
6498
6499
#: bzrlib/errors.py:2846
6500
msgid "'%(display_url)s' is already using a shared repository."
6501
msgstr ""
6502
6503
#: bzrlib/errors.py:2851
6504
msgid "'%(display_url)s' is already standalone."
6505
msgstr ""
6506
6507
#: bzrlib/errors.py:2856
6508
msgid "Shared repository '%(display_url)s' already creates working trees."
6509
msgstr ""
6510
6511
#: bzrlib/errors.py:2862
6512
msgid ""
6513
"Shared repository '%(display_url)s' already doesn't create working trees."
6514
msgstr ""
6515
6516
#: bzrlib/errors.py:2868
6517
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6518
msgstr ""
6519
6520
#: bzrlib/errors.py:2873
6521
msgid "No location could be found to bind to at %(display_url)s."
6522
msgstr ""
6523
6524
#: bzrlib/errors.py:2878
6525
msgid ""
6526
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6527
"status).%(more)s"
6528
msgstr ""
6529
6530
#: bzrlib/errors.py:2897
6531
msgid ""
6532
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6533
"list).%(more)s"
6534
msgstr ""
6535
6536
#: bzrlib/errors.py:2903
6537
msgid "Variable {%(name)s} is not available."
6538
msgstr ""
6539
6540
#: bzrlib/errors.py:2911
6541
msgid "No template specified."
6542
msgstr ""
6543
6544
#: bzrlib/errors.py:2916
6545
msgid "Unable to create symlink %(path_str)son this platform"
6546
msgstr ""
6547
6548
#: bzrlib/errors.py:2931
6549
msgid ""
6550
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6551
"\"original\", \"local\"."
6552
msgstr ""
6553
6554
#: bzrlib/errors.py:2965
6555
msgid ""
6556
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6557
msgstr ""
6558
6559
#: bzrlib/errors.py:2977
6560
msgid "The \"%(config_id)s\" configuration does not exist."
6561
msgstr ""
6562
6563
#: bzrlib/errors.py:2985
6564
msgid "The \"%(option_name)s\" configuration option does not exist."
6565
msgstr ""
6566
6567
#: bzrlib/errors.py:2993
6568
msgid "The alias \"%(alias_name)s\" does not exist."
6569
msgstr ""
6570
6571
#: bzrlib/errors.py:3007
6572
msgid "\"%(alias_name)s\" is not a valid location alias."
6573
msgstr ""
6574
6575
#: bzrlib/errors.py:3015
6576
msgid "No %(alias_name)s location assigned."
6577
msgstr ""
6578
6579
#: bzrlib/errors.py:3023
6580
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6581
msgstr ""
6582
6583
#: bzrlib/errors.py:3033
6584
msgid "Unknown rules detected: %(unknowns_str)s."
6585
msgstr ""
6586
6587
#: bzrlib/errors.py:3044
6588
msgid "Tip change rejected: %(msg)s"
6589
msgstr ""
6590
6591
#: bzrlib/errors.py:3052
6592
msgid "Shelf corrupt."
6593
msgstr ""
6594
6595
#: bzrlib/errors.py:3057
6596
msgid "Corruption while decompressing repository file%(orig_error)s"
6597
msgstr ""
6598
6599
#: bzrlib/errors.py:3069
6600
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6601
msgstr ""
6602
6603
#: bzrlib/errors.py:3077
6604
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6605
msgstr ""
6606
6607
#: bzrlib/errors.py:3085
6608
msgid ""
6609
"An attempt to access a url outside the server jail was made: '%(url)s'."
6610
msgstr ""
6611
6612
#: bzrlib/errors.py:3093
6613
msgid "The user aborted the operation."
6614
msgstr ""
6615
6616
#: bzrlib/errors.py:3098
6617
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6618
msgstr ""
6619
6620
#: bzrlib/errors.py:3108
6621
msgid "No such view: %(view_name)s."
6622
msgstr ""
6623
6624
#: bzrlib/errors.py:3118
6625
msgid ""
6626
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6627
"to a later format."
6628
msgstr ""
6629
6630
#: bzrlib/errors.py:3127
6631
msgid ""
6632
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6633
msgstr ""
6634
6635
#: bzrlib/errors.py:3194
6636
msgid "%(bzrdir)r does not support co-located branches."
6637
msgstr ""
6638
6639
#: bzrlib/errors.py:3200
6640
msgid ""
6641
"Unable to determine your name.\n"
6642
"Please, set your name with the 'whoami' command.\n"
6643
"E.g. bzr whoami \"Your Name <name@example.com>\""
6644
msgstr ""
6645
6646
#: bzrlib/errors.py:3209
6647
msgid "Invalid pattern(s) found. %(msg)s"
6648
msgstr ""
6649
6650
#: bzrlib/errors.py:3217
6651
msgid ""
6652
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6653
"unbind` to fix."
6654
msgstr ""
6655
6656
#: bzrlib/errors.py:3228
6657
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6658
msgstr ""
6659
6660
#: bzrlib/errors.py:3237
6661
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6662
msgstr ""
6663
6664
#: bzrlib/errors.py:3246
6665
msgid ""
6666
"No compatible object available for operations from %(source)r to %(target)r."
6667
msgstr ""
6668
6669
#: bzrlib/errors.py:3256
6670
msgid ""
6671
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6672
"%(arguments)s."
6673
msgstr ""
6674
6675
#: bzrlib/errors.py:3266
6676
msgid ""
6677
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6678
"format %(format)r"
6679
msgstr ""
6680
6681
#: bzrlib/errors.py:3278
6682
msgid ""
6683
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6684
"plugin."
6685
msgstr ""
6686
6687
#: bzrlib/errors.py:3291
6688
msgid "Binary files section encountered."
6689
msgstr ""
6690
6691
#: bzrlib/errors.py:3299
6692
msgid ""
6693
"Malformed patch header. %(desc)s\n"
6694
"%(line)r"
6695
msgstr ""
6696
6697
#: bzrlib/errors.py:3308
6698
msgid ""
6699
"Malformed hunk header. %(desc)s\n"
6700
"%(line)r"
6701
msgstr ""
6702
6703
#: bzrlib/errors.py:3317
6704
msgid ""
6705
"Malformed line. %(desc)s\n"
6706
"%(line)r"
6707
msgstr ""
6708
6709
#: bzrlib/errors.py:3327
6710
msgid ""
6711
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6712
"but patch says it should be \"%(patch_line)s\""
6713
msgstr ""
6714
6715
#: bzrlib/errors.py:3338
6716
msgid "The feature %(feature)s has already been registered."
6717
msgstr ""
6718
6719
#: bzrlib/export_pot.py:252
6720
#, python-format
6721
msgid "Exporting messages from builtin command: %s"
6722
msgstr ""
6723
6724
#: bzrlib/export_pot.py:271
6725
msgid "Exporting messages from plugin command: {0} in {1}"
6726
msgstr ""
6727
6728
#: bzrlib/export_pot.py:292
6729
#, python-format
6730
msgid "Exporting message from error: %s"
6731
msgstr ""
6732
6733
#: bzrlib/fetch.py:98
6734
msgid "Finding revisions"
6735
msgstr ""
6736
6737
#: bzrlib/fetch.py:103
6738
msgid "Fetching revisions"
6739
msgstr ""
6740
6741
#: bzrlib/foreign.py:262
6742
msgid "Push into a different VCS without any custom bzr metadata."
6743
msgstr ""
6744
6745
#: bzrlib/foreign.py:264
6746
msgid ""
6747
"This will afterwards rebase the local branch on the remote\n"
6748
"branch unless the --no-rebase option is used, in which case \n"
6749
"the two branches will be out of sync after the push. "
6750
msgstr ""
6751
6752
#: bzrlib/foreign.py:277
6753
msgid "Do not rebase after push."
6754
msgstr ""
6755
6756
#: bzrlib/foreign.py:311
6757
#, python-format
6758
msgid "Using saved location: %s\n"
6759
msgstr ""
6760
6761
#: bzrlib/foreign.py:321
6762
msgid ""
6763
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6764
"regular push."
6765
msgstr ""
6766
6767
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6768
msgid "{0} commits with valid signatures"
6769
msgstr ""
6770
6771
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6772
msgid "{0} commit with unknown key"
6773
msgid_plural "{0} commits with unknown keys"
6774
msgstr[0] ""
6775
msgstr[1] ""
6776
6777
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6778
msgid "{0} commit not valid"
6779
msgid_plural "{0} commits not valid"
6780
msgstr[0] ""
6781
msgstr[1] ""
6782
6783
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6784
msgid "{0} commit not signed"
6785
msgid_plural "{0} commits not signed"
6786
msgstr[0] ""
6787
msgstr[1] ""
6788
6789
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6790
msgid "{0} commit with key now expired"
6791
msgid_plural "{0} commits with key now expired"
6792
msgstr[0] ""
6793
msgstr[1] ""
6794
6795
#: bzrlib/gpg.py:343
6796
msgid "No GnuPG key results for pattern: {0}"
6797
msgstr ""
6798
6799
#: bzrlib/gpg.py:386
6800
msgid "{0} signed {1} commit"
6801
msgid_plural "{0} signed {1} commits"
6802
msgstr[0] ""
6803
msgstr[1] ""
6804
6805
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6806
msgid "{0} commit by author {1}"
6807
msgid_plural "{0} commits by author {1}"
6808
msgstr[0] ""
6809
msgstr[1] ""
6810
6811
#: bzrlib/gpg.py:433
6812
msgid "Unknown key {0} signed {1} commit"
6813
msgid_plural "Unknown key {0} signed {1} commits"
6814
msgstr[0] ""
6815
msgstr[1] ""
6816
6817
#: bzrlib/gpg.py:452
6818
msgid "{0} commit by author {1} with key {2} now expired"
6819
msgid_plural "{0} commits by author {1} with key {2} now expired"
6820
msgstr[0] ""
6821
msgstr[1] ""
6822
6823
#: bzrlib/groupcompress.py:1739
6824
#, python-format
6825
msgid "Insert claimed random_id=True, but then inserted %r two times"
6826
msgstr ""
6827
6828
#: bzrlib/hooks.py:331
6829
#, python-format
6830
msgid "Introduced in: %s"
6831
msgstr ""
6832
6833
#: bzrlib/hooks.py:334
6834
#, python-format
6835
msgid "Deprecated in: %s"
6836
msgstr ""
6837
6838
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6839
msgid "Walking content"
6840
msgstr ""
6841
6842
#: bzrlib/knit.py:3330
6843
msgid "annotating"
6844
msgstr ""
6845
6846
#: bzrlib/lock.py:548
6847
msgid "{0!r} was {1} locked again"
6848
msgstr ""
6849
6850
#: bzrlib/lockdir.py:321
6851
#, python-format
6852
msgid "error removing pending lock: %s"
6853
msgstr ""
6854
6855
#: bzrlib/lockdir.py:616
6856
msgid "Unable to obtain"
6857
msgstr ""
6858
6859
#: bzrlib/lockdir.py:618
6860
msgid "Lock owner changed for"
6861
msgstr ""
6862
6863
#: bzrlib/lockdir.py:620
6864
msgid "{0} lock {1} {2}."
6865
msgstr ""
6866
6867
#: bzrlib/lockdir.py:627
6868
#, python-format
6869
msgid "Will continue to try until %s, unless you press Ctrl-C."
6870
msgstr ""
6871
6872
#: bzrlib/lockdir.py:629
6873
msgid "See \"bzr help break-lock\" for more."
6874
msgstr ""
6875
6876
#: bzrlib/lockdir.py:739
6877
#, python-format
6878
msgid ""
6879
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6880
msgstr ""
6881
6882
#: bzrlib/log.py:572
6883
msgid "--exclude-common-ancestry requires two different revisions"
6884
msgstr ""
6885
6886
#: bzrlib/log.py:574
6887
#, python-format
6888
msgid "invalid direction %r"
6889
msgstr ""
6890
6891
#: bzrlib/log.py:662
6892
msgid "Start revision not found in history of end revision."
6893
msgstr ""
6894
6895
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6896
msgid "Logging revision 0 is invalid."
6897
msgstr ""
6898
6899
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6900
msgid "Start revision must be older than the end revision."
6901
msgstr ""
6902
6903
#: bzrlib/log.py:1827
6904
#, python-format
6905
msgid "unknown log formatter: %r"
6906
msgstr ""
6907
6908
#: bzrlib/log.py:2123
6909
msgid "fixes bug"
6910
msgid_plural "fixes bugs"
6911
msgstr[0] ""
6912
msgstr[1] ""
6913
6914
#: bzrlib/merge.py:689
6915
msgid "All changes applied successfully."
6916
msgstr ""
6917
6918
#: bzrlib/merge.py:691
6919
#, python-format
6920
msgid "%d conflicts encountered."
6921
msgstr ""
6922
6923
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6924
msgid "Preparing file merge"
6925
msgstr ""
6926
6927
#: bzrlib/multiparent.py:426
6928
msgid "Importing revisions"
6929
msgstr ""
6930
6931
#: bzrlib/option.py:526
6932
msgid "Show help message."
6933
msgstr ""
6934
6935
#: bzrlib/option.py:528
6936
msgid "Only display errors and warnings."
6937
msgstr "エラーや警告だけを表示します。"
6938
6939
#: bzrlib/option.py:531
6940
msgid "Show usage message and options."
6941
msgstr "使い方とオプションを表示します。"
6942
6943
#: bzrlib/option.py:533
6944
msgid "Display more information."
6945
msgstr "より詳細な情報を表示します。"
6946
6947
#: bzrlib/option.py:541
6948
msgid ""
6949
"Select changes introduced by the specified revision. See also \"help "
6950
"revisionspec\"."
6951
msgstr ""
6952
6953
#: bzrlib/option.py:543
6954
msgid "Branch to operate on, instead of working directory."
6955
msgstr ""
6956
6957
#: bzrlib/option.py:545
6958
msgid "Detailed log format."
6959
msgstr ""
6960
6961
#: bzrlib/option.py:545
6962
msgid "Format used by GNU ChangeLog files."
6963
msgstr ""
6964
6965
#: bzrlib/option.py:545
6966
msgid "Log format with one line per revision."
6967
msgstr ""
6968
6969
#: bzrlib/option.py:545
6970
msgid "Moderately short log format."
6971
msgstr ""
6972
6973
#: bzrlib/option.py:545
6974
msgid "Use specified log format."
6975
msgstr ""
6976
6977
#: bzrlib/option.py:547
6978
msgid "Log format"
6979
msgstr ""
6980
6981
#: bzrlib/option.py:549
6982
msgid "LCA-newness merge."
6983
msgstr ""
6984
6985
#: bzrlib/option.py:549
6986
msgid "Merge using external diff3."
6987
msgstr ""
6988
6989
#: bzrlib/option.py:549
6990
msgid "Native diff3-style merge."
6991
msgstr ""
6992
6993
#: bzrlib/option.py:549
6994
msgid "Select a particular merge algorithm."
6995
msgstr ""
6996
6997
#: bzrlib/option.py:549
6998
msgid "Weave-based merge."
6999
msgstr ""
7000
7001
#: bzrlib/option.py:551
7002
msgid "Merge algorithm"
7003
msgstr ""
7004
7005
#: bzrlib/option.py:554
7006
msgid "Message string."
7007
msgstr ""
7008
7009
#: bzrlib/option.py:556
7010
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
7011
msgstr ""
7012
7013
#: bzrlib/option.py:558
7014
msgid "Ignore differences between branches and overwrite unconditionally."
7015
msgstr ""
7016
7017
#: bzrlib/option.py:560
7018
msgid "Remember the specified location as a default."
7019
msgstr ""
7020
7021
#: bzrlib/option.py:562
7022
msgid "Reprocess to reduce spurious conflicts."
7023
msgstr ""
7024
7025
#: bzrlib/option.py:566
7026
msgid "See \"help revisionspec\" for details."
7027
msgstr "詳細は \"help revisionspec\" を参照してください。"
7028
7029
#: bzrlib/option.py:568
7030
msgid "Show internal object ids."
7031
msgstr ""
7032
7033
#: bzrlib/option.py:571
7034
msgid "Display timezone as local, original, or utc."
7035
msgstr ""
7036
7037
#: bzrlib/osutils.py:100
7038
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
7039
msgstr ""
7040
7041
#: bzrlib/osutils.py:220
7042
msgid "lstat/stat of ({0!r}): {1!r}"
7043
msgstr ""
7044
7045
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
7046
#, python-format
7047
msgid "sorry, %r not allowed in path"
7048
msgstr ""
7049
7050
#: bzrlib/osutils.py:1237
7051
#, python-format
7052
msgid "%r is too short to calculate a relative path"
7053
msgstr ""
7054
7055
#: bzrlib/plugin.py:143
7056
#, python-format
7057
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
7058
msgstr ""
7059
7060
#: bzrlib/plugins/bash_completion/bashcomp.py:411
7061
msgid "Enable completions for the selected plugin (default: all plugins)"
7062
msgstr ""
7063
7064
#: bzrlib/plugins/bash_completion/bashcomp.py:412
7065
msgid "Generate a shell function for bash command line completion."
7066
msgstr ""
7067
7068
#: bzrlib/plugins/bash_completion/bashcomp.py:414
7069
msgid ""
7070
"This command generates a shell function which can be used by bash to\n"
7071
"automatically complete the currently typed command when the user presses\n"
7072
"the completion key (usually tab)."
7073
msgstr ""
7074
7075
#: bzrlib/plugins/bash_completion/bashcomp.py:418
7076
msgid ""
7077
"Commonly used like this:\n"
7078
" eval \"`bzr bash-completion`\""
7079
msgstr ""
7080
7081
#: bzrlib/plugins/bash_completion/bashcomp.py:424
7082
msgid "Name of the generated function (default: _bzr)"
7083
msgstr ""
7084
7085
#: bzrlib/plugins/bash_completion/bashcomp.py:426
7086
msgid "Generate only the shell function, don't enable it"
7087
msgstr ""
7088
7089
#: bzrlib/plugins/launchpad/__init__.py:81
7090
msgid "Register a branch with launchpad.net."
7091
msgstr ""
7092
7093
#: bzrlib/plugins/launchpad/__init__.py:83
7094
msgid ""
7095
"This command lists a bzr branch in the directory of branches on\n"
7096
"launchpad.net. Registration allows the branch to be associated with\n"
7097
"bugs or specifications."
7098
msgstr ""
7099
7100
#: bzrlib/plugins/launchpad/__init__.py:87
7101
msgid ""
7102
"Before using this command you must register the project to which the\n"
7103
"branch belongs, and create an account for yourself on launchpad.net."
7104
msgstr ""
7105
7106
#: bzrlib/plugins/launchpad/__init__.py:90
7107
msgid ""
7108
"arguments:\n"
7109
" public_url: The publicly visible url for the branch to register.\n"
7110
" This must be an http or https url (which Launchpad can read\n"
7111
" from to access the branch). Local file urls, SFTP urls, and\n"
7112
" bzr+ssh urls will not work.\n"
7113
" If no public_url is provided, bzr will use the configured\n"
7114
" public_url if there is one for the current branch, and\n"
7115
" otherwise error."
7116
msgstr ""
7117
7118
#: bzrlib/plugins/launchpad/__init__.py:99
7119
msgid ""
7120
"example:\n"
7121
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7122
" --project fooproject"
7123
msgstr ""
7124
7125
#: bzrlib/plugins/launchpad/__init__.py:106
7126
msgid "Launchpad project short name to associate with the branch."
7127
msgstr ""
7128
7129
#: bzrlib/plugins/launchpad/__init__.py:113
7130
msgid ""
7131
"Short name for the branch; by default taken from the last component of the "
7132
"url."
7133
msgstr ""
7134
7135
#: bzrlib/plugins/launchpad/__init__.py:117
7136
msgid "One-sentence description of the branch."
7137
msgstr ""
7138
7139
#: bzrlib/plugins/launchpad/__init__.py:120
7140
msgid "Longer description of the purpose or contents of the branch."
7141
msgstr ""
7142
7143
#: bzrlib/plugins/launchpad/__init__.py:123
7144
msgid "Branch author's email address, if not yourself."
7145
msgstr ""
7146
7147
#: bzrlib/plugins/launchpad/__init__.py:126
7148
msgid "The bug this branch fixes."
7149
msgstr ""
7150
7151
#: bzrlib/plugins/launchpad/__init__.py:129
7152
msgid "Prepare the request but don't actually send it."
7153
msgstr ""
7154
7155
#: bzrlib/plugins/launchpad/__init__.py:151
7156
msgid ""
7157
"register-branch requires a public branch url - see bzr help register-branch."
7158
msgstr ""
7159
7160
#: bzrlib/plugins/launchpad/__init__.py:159
7161
msgid "--product is deprecated; please use --project."
7162
msgstr ""
7163
7164
#: bzrlib/plugins/launchpad/__init__.py:191
7165
msgid "Open a Launchpad branch page in your web browser."
7166
msgstr ""
7167
7168
#: bzrlib/plugins/launchpad/__init__.py:196
7169
msgid "Do not actually open the browser. Just say the URL we would use."
7170
msgstr ""
7171
7172
#: bzrlib/plugins/launchpad/__init__.py:231
7173
#, python-format
7174
msgid "Opening %s in web browser"
7175
msgstr ""
7176
7177
#: bzrlib/plugins/launchpad/__init__.py:241
7178
msgid "Show or set the Launchpad user ID."
7179
msgstr ""
7180
7181
#: bzrlib/plugins/launchpad/__init__.py:243
7182
msgid ""
7183
"When communicating with Launchpad, some commands need to know your\n"
7184
"Launchpad user ID. This command can be used to set or show the\n"
7185
"user ID that Bazaar will use for such communication."
7186
msgstr ""
7187
7188
#: bzrlib/plugins/launchpad/__init__.py:247
7189
msgid ""
7190
":Examples:\n"
7191
" Show the Launchpad ID of the current user::"
7192
msgstr ""
7193
7194
#: bzrlib/plugins/launchpad/__init__.py:250
7195
msgid " bzr launchpad-login"
7196
msgstr ""
7197
7198
#: bzrlib/plugins/launchpad/__init__.py:252
7199
msgid " Set the Launchpad ID of the current user to 'bob'::"
7200
msgstr ""
7201
7202
#: bzrlib/plugins/launchpad/__init__.py:254
7203
msgid " bzr launchpad-login bob"
7204
msgstr ""
7205
7206
#: bzrlib/plugins/launchpad/__init__.py:261
7207
msgid "Don't check that the user name is valid."
7208
msgstr ""
7209
7210
#: bzrlib/plugins/launchpad/__init__.py:276
7211
#: bzrlib/plugins/launchpad/__init__.py:287
7212
msgid "Launchpad user ID exists and has SSH keys.\n"
7213
msgstr ""
7214
7215
#: bzrlib/plugins/launchpad/__init__.py:279
7216
msgid "No Launchpad user ID configured.\n"
7217
msgstr ""
7218
7219
#: bzrlib/plugins/launchpad/__init__.py:290
7220
#, python-format
7221
msgid "Launchpad user ID set to '%s'.\n"
7222
msgstr ""
7223
7224
#: bzrlib/plugins/launchpad/__init__.py:298
7225
msgid "Ask Launchpad to mirror a branch now."
7226
msgstr ""
7227
7228
#: bzrlib/plugins/launchpad/__init__.py:318
7229
msgid "Propose merging a branch on Launchpad."
7230
msgstr ""
7231
7232
#: bzrlib/plugins/launchpad/__init__.py:320
7233
msgid ""
7234
"This will open your usual editor to provide the initial comment. When it\n"
7235
"has created the proposal, it will open it in your default web browser."
7236
msgstr ""
7237
7238
#: bzrlib/plugins/launchpad/__init__.py:323
7239
msgid ""
7240
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7241
"is not supplied, the remembered submit branch will be used. If no submit\n"
7242
"branch is remembered, the development focus will be used."
7243
msgstr ""
7244
7245
#: bzrlib/plugins/launchpad/__init__.py:327
7246
msgid ""
7247
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7248
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7249
"The parameter the launchpad account name of the desired reviewer. This\n"
7250
"may optionally be followed by '=' and the review type. For example:"
7251
msgstr ""
7252
7253
#: bzrlib/plugins/launchpad/__init__.py:332
7254
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7255
msgstr ""
7256
7257
#: bzrlib/plugins/launchpad/__init__.py:334
7258
msgid ""
7259
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7260
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7261
msgstr ""
7262
7263
#: bzrlib/plugins/launchpad/__init__.py:339
7264
msgid "Propose the merge on staging."
7265
msgstr ""
7266
7267
#: bzrlib/plugins/launchpad/__init__.py:341
7268
msgid "Commit message."
7269
msgstr ""
7270
7271
#: bzrlib/plugins/launchpad/__init__.py:343
7272
msgid "Mark the proposal as approved immediately."
7273
msgstr ""
7274
7275
#: bzrlib/plugins/launchpad/__init__.py:345
7276
msgid "Requested reviewer and optional type."
7277
msgstr ""
7278
7279
#: bzrlib/plugins/launchpad/__init__.py:382
7280
msgid "Find the proposal to merge this revision."
7281
msgstr ""
7282
7283
#: bzrlib/plugins/launchpad/__init__.py:384
7284
msgid ""
7285
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7286
"This works only if the selected branch was the merge proposal target, and\n"
7287
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
7288
"are opened in a web browser."
7289
msgstr ""
7290
7291
#: bzrlib/plugins/launchpad/__init__.py:389
7292
msgid ""
7293
"Any revision involved in the merge may be specified-- the revision in\n"
7294
"which the merge was performed, or one of the revisions that was merged."
7295
msgstr ""
7296
7297
#: bzrlib/plugins/launchpad/__init__.py:392
7298
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7299
msgstr ""
7300
7301
#: bzrlib/plugins/launchpad/__init__.py:394
7302
msgid " bzr lp-find-proposal -r annotate:README:1"
7303
msgstr ""
7304
7305
#: bzrlib/plugins/launchpad/__init__.py:409
7306
msgid "No review found."
7307
msgstr ""
7308
7309
#: bzrlib/plugins/launchpad/__init__.py:410
7310
#, python-format
7311
msgid "%d proposals(s) found."
7312
msgstr ""
7313
7314
#: bzrlib/plugins/launchpad/__init__.py:420
7315
msgid "Finding revision-id"
7316
msgstr ""
7317
7318
#: bzrlib/plugins/launchpad/__init__.py:427
7319
msgid "Finding merge"
7320
msgstr ""
7321
7322
#: bzrlib/plugins/launchpad/__init__.py:432
7323
msgid "Finding revno"
7324
msgstr ""
7325
7326
#: bzrlib/plugins/launchpad/__init__.py:437
7327
msgid "Finding Launchpad branch"
7328
msgstr ""
7329
7330
#: bzrlib/plugins/launchpad/__init__.py:440
7331
msgid "Finding proposals"
7332
msgstr ""
7333
7334
#: bzrlib/plugins/launchpad/account.py:66
7335
msgid "Setting ssh/sftp usernames for launchpad.net."
7336
msgstr ""
7337
7338
#: bzrlib/plugins/launchpad/lp_api.py:241
7339
#: bzrlib/plugins/launchpad/lp_api.py:246
7340
#, python-format
7341
msgid "%s is not registered on Launchpad"
7342
msgstr ""
7343
7344
#: bzrlib/plugins/launchpad/lp_api.py:256
7345
#, python-format
7346
msgid "%s has no development focus."
7347
msgstr ""
7348
7349
#: bzrlib/plugins/launchpad/lp_api.py:261
7350
#, python-format
7351
msgid "development focus %s has no branch."
7352
msgstr ""
7353
7354
#: bzrlib/plugins/launchpad/lp_api.py:266
7355
#, python-format
7356
msgid "source package %s has no branch."
7357
msgstr ""
7358
7359
#: bzrlib/plugins/launchpad/lp_api.py:270
7360
#, python-format
7361
msgid "%s has no associated product or source package."
7362
msgstr ""
7363
7364
#: bzrlib/plugins/launchpad/lp_api.py:282
7365
#, python-format
7366
msgid "%s is already up-to-date."
7367
msgstr ""
7368
7369
#: bzrlib/plugins/launchpad/lp_api.py:289
7370
#, python-format
7371
msgid "Pushing to %s"
7372
msgstr ""
7373
7374
#: bzrlib/plugins/launchpad/lp_directory.py:170
7375
msgid ""
7376
"resolution for {0}\n"
7377
" local: {1}\n"
7378
" remote: {2}"
7379
msgstr ""
7380
7381
#: bzrlib/plugins/launchpad/lp_propose.py:149
7382
#, python-format
7383
msgid "There is already a branch merge proposal: %s"
7384
msgstr ""
7385
7386
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7387
msgid "pb parameter to convert() is deprecated"
7388
msgstr ""
7389
7390
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7391
msgid "starting upgrade from format 4 to 5"
7392
msgstr ""
7393
7394
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7395
msgid "note: upgrade may be faster if all store files are ungzipped first"
7396
msgstr ""
7397
7398
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7399
msgid "converting revision"
7400
msgstr ""
7401
7402
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7403
msgid "upgraded to weaves:"
7404
msgstr ""
7405
7406
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7407
#, python-format
7408
msgid "%6d revisions and inventories"
7409
msgstr ""
7410
7411
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7412
#, python-format
7413
msgid "%6d revisions not present"
7414
msgstr ""
7415
7416
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7417
#, python-format
7418
msgid "%6d texts"
7419
msgstr ""
7420
7421
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7422
msgid "writing weave"
7423
msgstr ""
7424
7425
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7426
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7427
msgid "inventory"
7428
msgstr ""
7429
7430
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7431
msgid "write revision"
7432
msgstr ""
7433
7434
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7435
msgid "loading revision"
7436
msgstr ""
7437
7438
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7439
#, python-format
7440
msgid "revision {%s} not present in branch; will be converted as a ghost"
7441
msgstr ""
7442
7443
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7444
msgid "starting upgrade from format 5 to 6"
7445
msgstr ""
7446
7447
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7448
#, python-format
7449
msgid "adding prefixes to %s"
7450
msgstr ""
7451
7452
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7453
msgid "starting upgrade from format 6 to metadir"
7454
msgstr ""
7455
7456
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7457
msgid "Removing ancestry.weave"
7458
msgstr ""
7459
7460
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7461
msgid "Finding branch files"
7462
msgstr ""
7463
7464
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7465
msgid "Upgrading repository"
7466
msgstr ""
7467
7468
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7469
msgid "Upgrading branch"
7470
msgstr ""
7471
7472
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7473
msgid "No working tree."
7474
msgstr ""
7475
7476
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7477
msgid "Upgrading working tree"
7478
msgstr ""
7479
7480
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7481
#, python-format
7482
msgid "Make %s lock"
7483
msgstr ""
7484
7485
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7486
#, python-format
7487
msgid "Moving %s"
7488
msgstr ""
7489
7490
#: bzrlib/push.py:56
7491
msgid "Created new branch."
7492
msgstr ""
7493
7494
#: bzrlib/push.py:97
7495
#, python-format
7496
msgid ""
7497
"Target directory %s already contains a .bzr directory, but it is not valid."
7498
msgstr ""
7499
7500
#: bzrlib/push.py:101
7501
#, python-format
7502
msgid ""
7503
"Target directory %s already exists, but does not have a .bzr directory. "
7504
"Supply --use-existing-dir to push there anyway."
7505
msgstr ""
7506
7507
#: bzrlib/push.py:122
7508
#, python-format
7509
msgid "Too many redirections trying to make %s."
7510
msgstr ""
7511
7512
#: bzrlib/push.py:147
7513
msgid ""
7514
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7515
"information."
7516
msgstr ""
7517
7518
#: bzrlib/push.py:151
7519
#, python-format
7520
msgid ""
7521
"It is not possible to losslessly push to %s. You may want to use dpush "
7522
"instead."
7523
msgstr ""
7524
7525
#: bzrlib/push.py:157
7526
#, python-format
7527
msgid ""
7528
"At %s you have a valid .bzr control directory, but not a branch or "
7529
"repository. This is an unsupported configuration. Please move the target "
7530
"directory out of the way and try again."
7531
msgstr ""
7532
7533
#: bzrlib/reconcile.py:97
7534
#, python-format
7535
msgid "Reconciling branch %s"
7536
msgstr ""
7537
7538
#: bzrlib/reconcile.py:103
7539
#, python-format
7540
msgid "Reconciling repository %s"
7541
msgstr ""
7542
7543
#: bzrlib/reconcile.py:105
7544
msgid "Reconciling repository"
7545
msgstr ""
7546
7547
#: bzrlib/reconcile.py:111
7548
#, python-format
7549
msgid "%s cannot canonicalize CHKs."
7550
msgstr ""
7551
7552
#: bzrlib/reconcile.py:119
7553
msgid "Reconcile aborted: revision index has inconsistent parents."
7554
msgstr ""
7555
7556
#: bzrlib/reconcile.py:121
7557
msgid "Run \"bzr check\" for more details."
7558
msgstr ""
7559
7560
#: bzrlib/reconcile.py:123
7561
msgid "Reconciliation complete."
7562
msgstr ""
7563
7564
#: bzrlib/reconcile.py:166
7565
msgid "Fixing last revision info {0} => {1}"
7566
msgstr ""
7567
7568
#: bzrlib/reconcile.py:173
7569
msgid "revision_history ok."
7570
msgstr ""
7571
7572
#: bzrlib/reconcile.py:234
7573
msgid "Reading inventory data"
7574
msgstr ""
7575
7576
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7577
msgid "Inventory ok."
7578
msgstr ""
7579
7580
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7581
msgid "Backing up inventory"
7582
msgstr ""
7583
7584
#: bzrlib/reconcile.py:258
7585
msgid "Backup inventory created."
7586
msgstr ""
7587
7588
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7589
msgid "Writing weave"
7590
msgstr ""
7591
7592
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7593
msgid "Inventory regenerated."
7594
msgstr ""
7595
7596
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7597
msgid "Reading indexes"
7598
msgstr ""
7599
7600
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7601
msgid "Checking unused inventories"
7602
msgstr ""
7603
7604
#: bzrlib/reconcile.py:388
7605
msgid "Backup Inventory created"
7606
msgstr ""
7607
7608
#: bzrlib/reconcile.py:446
7609
msgid "Fixing text parents"
7610
msgstr ""
7611
7612
#: bzrlib/reconfigure.py:54
7613
msgid "{0} is now stacked on {1}\n"
7614
msgstr ""
7615
7616
#: bzrlib/reconfigure.py:69
7617
#, python-format
7618
msgid "%s is now not stacked\n"
7619
msgstr ""
7620
7621
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7622
#, python-format
7623
msgid "bzr: ERROR (ignored): %s"
7624
msgstr ""
7625
7626
#: bzrlib/remote.py:2541
7627
msgid "Copying repository content as tarball..."
7628
msgstr ""
7629
7630
#: bzrlib/rename_map.py:69
7631
msgid "Calculating hashes"
7632
msgstr ""
7633
7634
#: bzrlib/rename_map.py:107
7635
msgid "Determining hash hits"
7636
msgstr ""
7637
7638
#: bzrlib/rename_map.py:242
7639
msgid "{0} => {1}"
7640
msgstr ""
7641
7642
#: bzrlib/repository.py:1787
7643
msgid "Moving repository to repository.backup"
7644
msgstr ""
7645
7646
#: bzrlib/repository.py:1794
7647
msgid "Creating new repository"
7648
msgstr ""
7649
7650
#: bzrlib/repository.py:1799
7651
msgid "Copying content"
7652
msgstr ""
7653
7654
#: bzrlib/repository.py:1803
7655
msgid "Deleting old repository content"
7656
msgstr ""
7657
7658
#: bzrlib/repository.py:1805
7659
msgid "repository converted"
7660
msgstr ""
7661
7662
#: bzrlib/revisionspec.py:903
7663
msgid "Using {0} {1}"
7664
msgstr ""
7665
7666
#: bzrlib/send.py:58
7667
#, python-format
7668
msgid "Mail client \"%s\" does not support specifying body"
7669
msgstr ""
7670
7671
#: bzrlib/send.py:62
7672
msgid "--remember requires a branch to be specified."
7673
msgstr ""
7674
7675
#: bzrlib/send.py:77
7676
msgid "No submit branch known or specified"
7677
msgstr ""
7678
7679
#: bzrlib/send.py:80
7680
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7681
msgstr ""
7682
7683
#: bzrlib/send.py:98
7684
#, python-format
7685
msgid "No such send format '%s'."
7686
msgstr ""
7687
7688
#: bzrlib/send.py:114
7689
msgid "bzr send takes at most two one revision identifiers"
7690
msgstr ""
7691
7692
#: bzrlib/send.py:127
7693
msgid "No revisions to submit."
7694
msgstr ""
7695
7696
#: bzrlib/send.py:139
7697
msgid ""
7698
"- not supported for merge directives that use more than one output file."
7699
msgstr ""
7700
7701
#: bzrlib/send.py:185
7702
msgid "Format 0.9 does not permit bundle with no patch"
7703
msgstr ""
7704
7705
#: bzrlib/shelf_ui.py:46
7706
#, python-format
7707
msgid "Shelve adding file \"%(path)s\"?"
7708
msgstr ""
7709
7710
#: bzrlib/shelf_ui.py:47
7711
msgid "Shelve binary changes?"
7712
msgstr ""
7713
7714
#: bzrlib/shelf_ui.py:48
7715
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7716
msgstr ""
7717
7718
#: bzrlib/shelf_ui.py:50
7719
#, python-format
7720
msgid "Shelve removing file \"%(path)s\"?"
7721
msgstr ""
7722
7723
#: bzrlib/shelf_ui.py:51
7724
#, python-format
7725
msgid "Shelve %d change(s)?"
7726
msgstr ""
7727
7728
#: bzrlib/shelf_ui.py:52
7729
msgid "Shelve?"
7730
msgstr ""
7731
7732
#: bzrlib/shelf_ui.py:53
7733
#, python-format
7734
msgid ""
7735
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7736
msgstr ""
7737
7738
#: bzrlib/shelf_ui.py:55
7739
#, python-format
7740
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7741
msgstr ""
7742
7743
#: bzrlib/shelf_ui.py:70
7744
#, python-format
7745
msgid "Changes shelved with id \"%d\"."
7746
msgstr ""
7747
7748
#: bzrlib/shelf_ui.py:74
7749
msgid "Selected changes destroyed."
7750
msgstr ""
7751
7752
#: bzrlib/shelf_ui.py:78
7753
msgid "Selected changes:"
7754
msgstr ""
7755
7756
#: bzrlib/shelf_ui.py:98
7757
#, python-format
7758
msgid "Delete file \"%(path)s\"?"
7759
msgstr ""
7760
7761
#: bzrlib/shelf_ui.py:99
7762
msgid "Apply binary changes?"
7763
msgstr ""
7764
7765
#: bzrlib/shelf_ui.py:100
7766
#, python-format
7767
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7768
msgstr ""
7769
7770
#: bzrlib/shelf_ui.py:102
7771
#, python-format
7772
msgid "Add file \"%(path)s\"?"
7773
msgstr ""
7774
7775
#: bzrlib/shelf_ui.py:103
7776
#, python-format
7777
msgid "Apply %d change(s)?"
7778
msgstr ""
7779
7780
#: bzrlib/shelf_ui.py:104
7781
msgid "Apply change?"
7782
msgstr ""
7783
7784
#: bzrlib/shelf_ui.py:105
7785
#, python-format
7786
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7787
msgstr ""
7788
7789
#: bzrlib/shelf_ui.py:107
7790
#, python-format
7791
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7792
msgstr ""
7793
7794
#: bzrlib/shelf_ui.py:402
7795
msgid "No changes are shelved."
7796
msgstr ""
7797
7798
#: bzrlib/shelf_ui.py:460
7799
#, python-format
7800
msgid "Using changes with id \"%d\"."
7801
msgstr ""
7802
7803
#: bzrlib/shelf_ui.py:464
7804
#, python-format
7805
msgid "Message: %s"
7806
msgstr ""
7807
7808
#: bzrlib/shelf_ui.py:476
7809
#, python-format
7810
msgid "Deleted changes with id \"%d\"."
7811
msgstr ""
7812
7813
#: bzrlib/smart/medium.py:714
7814
msgid "HPSS calls: {0} ({1} vfs) {2}"
7815
msgstr ""
7816
7817
#: bzrlib/smart/server.py:169
7818
msgid "Requested to stop gracefully"
7819
msgstr ""
7820
7821
#: bzrlib/smart/server.py:179
7822
#, python-format
7823
msgid "Waiting for %d client(s) to finish"
7824
msgstr ""
7825
7826
#: bzrlib/smart/server.py:185
7827
#, python-format
7828
msgid "Still waiting for %d client(s) to finish"
7829
msgstr ""
7830
7831
#: bzrlib/smart/server.py:219
7832
#, python-format
7833
msgid "listening socket error: %s"
7834
msgstr ""
7835
7836
#: bzrlib/smart/server.py:452
7837
#, python-format
7838
msgid "listening on port: %s"
7839
msgstr ""
7840
7841
#: bzrlib/switch.py:73
7842
msgid "Pending merges must be committed or reverted before using switch."
7843
msgstr ""
7844
7845
#: bzrlib/switch.py:100
7846
msgid ""
7847
"Cannot switch as local commits found in the checkout. Commit these to the "
7848
"bound branch or use --force to throw them away."
7849
msgstr ""
7850
7851
#: bzrlib/switch.py:105
7852
#, python-format
7853
msgid ""
7854
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7855
"anyway, use --force."
7856
msgstr ""
7857
7858
#: bzrlib/switch.py:125
7859
msgid "Cannot switch a branch, only a checkout."
7860
msgstr ""
7861
7862
#: bzrlib/switch.py:163
7863
#, python-format
7864
msgid "Tree is up to date at revision %d."
7865
msgstr ""
7866
7867
#: bzrlib/switch.py:169
7868
#, python-format
7869
msgid "Updated to revision %d."
7870
msgstr ""
7871
7872
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7873
msgid "Apply phase"
7874
msgstr ""
7875
7876
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7877
msgid "removing file"
7878
msgstr ""
7879
7880
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7881
msgid "adding file"
7882
msgstr ""
7883
7884
#: bzrlib/transform.py:2591
7885
msgid "Building tree"
7886
msgstr ""
7887
7888
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7889
msgid "Adding file contents"
7890
msgstr ""
7891
7892
#: bzrlib/transform.py:3028
7893
msgid "Resolution pass"
7894
msgstr ""
7895
7896
#: bzrlib/transport/ftp/_gssapi.py:88
7897
#, python-format
7898
msgid "Authenticated as %s"
7899
msgstr ""
7900
7901
#: bzrlib/tree.py:634
7902
msgid "*** {0} content-filter: {1} => {2!r}"
7903
msgstr ""
7904
7905
#: bzrlib/upgrade.py:77
7906
#, python-format
7907
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7908
msgstr ""
7909
7910
#: bzrlib/upgrade.py:100
7911
#, python-format
7912
msgid "cannot upgrade from bzrdir format %s"
7913
msgstr ""
7914
7915
#: bzrlib/upgrade.py:103
7916
#, python-format
7917
msgid "starting upgrade of %s"
7918
msgstr ""
7919
7920
#: bzrlib/upgrade.py:110
7921
msgid "finished"
7922
msgstr ""
7923
7924
#: bzrlib/upgrade.py:120
7925
msgid "Deleting backup.bzr"
7926
msgstr ""
7927
7928
#: bzrlib/upgrade.py:151
7929
msgid ""
7930
"\n"
7931
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7932
msgstr ""
7933
7934
#: bzrlib/upgrade.py:208
7935
#, python-format
7936
msgid "Found %d dependent branches - upgrading ..."
7937
msgstr ""
7938
7939
#: bzrlib/upgrade.py:276
7940
msgid "Upgrading bzrdirs"
7941
msgstr ""
7942
7943
#: bzrlib/upgrade.py:282
7944
#, python-format
7945
msgid "Upgrading %s"
7946
msgstr ""
7947
7948
#: bzrlib/upgrade.py:283
7949
msgid "Upgrading {0} {1} ..."
7950
msgstr ""
7951
7952
#: bzrlib/upgrade.py:301
7953
msgid "Removing backup ..."
7954
msgstr ""
7955
7956
#: bzrlib/upgrade.py:305
7957
msgid "failed to clean-up {0}: {1}"
7958
msgstr ""
7959
7960
#: bzrlib/vf_repository.py:1090
7961
msgid "inventories"
7962
msgstr ""
7963
7964
#: bzrlib/vf_repository.py:1116
7965
msgid "texts"
7966
msgstr ""
7967
7968
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7969
msgid "Calculating text parents"
7970
msgstr ""
7971
7972
#: bzrlib/vf_repository.py:1706
7973
msgid "Fetch texts"
7974
msgstr ""
7975
7976
#: bzrlib/vf_repository.py:2535
7977
msgid "loading text store"
7978
msgstr ""
7979
7980
#: bzrlib/vf_repository.py:2541
7981
msgid "checking text graph"
7982
msgstr ""
7983
7984
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7985
#: bzrlib/vf_repository.py:3124
7986
msgid "Transferring revisions"
7987
msgstr ""
7988
7989
#: bzrlib/win32utils.py:146
7990
msgid "Failed to GetProcessMemoryInfo()"
7991
msgstr ""
7992
7993
#: bzrlib/win32utils.py:167
7994
msgid "Cannot debug memory on win32 without ctypes or win32process"
7995
msgstr ""
7996
7997
#: bzrlib/win32utils.py:172
7998
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7999
msgstr ""
8000
8001
#: bzrlib/win32utils.py:180
8002
#, python-format
8003
msgid "WorkingSize %8d KiB"
8004
msgstr ""
8005
8006
#: bzrlib/win32utils.py:181
8007
#, python-format
8008
msgid "PeakWorking %8d KiB"
8009
msgstr ""
8010
8011
#: bzrlib/win32utils.py:182
8012
#, python-format
8013
msgid "PagefileUsage %8d KiB"
8014
msgstr ""
8015
8016
#: bzrlib/win32utils.py:183
8017
#, python-format
8018
msgid "PeakPagefileUsage %8d KiB"
8019
msgstr ""
8020
8021
#: bzrlib/win32utils.py:185
8022
#, python-format
8023
msgid "PrivateUsage %8d KiB"
8024
msgstr ""
8025
8026
#: bzrlib/win32utils.py:186
8027
#, python-format
8028
msgid "PageFaultCount %8d"
8029
msgstr ""
8030
8031
#: bzrlib/workingtree.py:1478
8032
msgid "Rerun update after fixing the conflicts."
8033
msgstr ""
8034
8035
#: dummy/help_topics/authentication/summary.txt:1
8036
msgid "Information on configuring authentication"
8037
msgstr ""
8038
8039
#: dummy/help_topics/basic/detail.txt:1
8040
msgid ""
8041
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
8042
"http://bazaar.canonical.com/"
8043
msgstr ""
8044
8045
#: dummy/help_topics/basic/detail.txt:4
8046
msgid ""
8047
"Basic commands:\n"
8048
" bzr init makes this directory a versioned branch\n"
8049
" bzr branch make a copy of another branch"
8050
msgstr ""
8051
8052
#: dummy/help_topics/basic/detail.txt:8
8053
msgid ""
8054
" bzr add make files or directories versioned\n"
8055
" bzr ignore ignore a file or pattern\n"
8056
" bzr mv move or rename a versioned file"
8057
msgstr ""
8058
8059
#: dummy/help_topics/basic/detail.txt:12
8060
msgid ""
8061
" bzr status summarize changes in working copy\n"
8062
" bzr diff show detailed diffs"
8063
msgstr ""
8064
8065
#: dummy/help_topics/basic/detail.txt:15
8066
msgid ""
8067
" bzr merge pull in changes from another branch\n"
8068
" bzr commit save some or all changes\n"
8069
" bzr send send changes via email"
8070
msgstr ""
8071
8072
#: dummy/help_topics/basic/detail.txt:19
8073
msgid ""
8074
" bzr log show history of changes\n"
8075
" bzr check validate storage"
8076
msgstr ""
8077
8078
#: dummy/help_topics/basic/detail.txt:22
8079
msgid ""
8080
" bzr help init more help on e.g. init command\n"
8081
" bzr help commands list all commands\n"
8082
" bzr help topics list all help topics\n"
8083
msgstr ""
8084
8085
#: dummy/help_topics/basic/summary.txt:1
8086
msgid "Basic commands"
8087
msgstr ""
8088
8089
#: dummy/help_topics/branches/detail.txt:1
8090
msgid "Branches"
8091
msgstr ""
8092
8093
#: dummy/help_topics/branches/detail.txt:3
8094
msgid ""
8095
"A branch consists of the state of a project, including all of its\n"
8096
"history. All branches have a repository associated (which is where the\n"
8097
"branch history is stored), but multiple branches may share the same\n"
8098
"repository (a shared repository). Branches can be copied and merged."
8099
msgstr ""
8100
8101
#: dummy/help_topics/branches/detail.txt:8
8102
msgid ""
8103
"In addition, one branch may be bound to another one. Binding to another\n"
8104
"branch indicates that commits which happen in this branch must also \n"
8105
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
8106
"commits when the two branches are out of date. In order for a commit \n"
8107
"to succeed, it may be necessary to update the current branch using \n"
8108
"``bzr update``."
8109
msgstr ""
8110
8111
#: dummy/help_topics/branches/detail.txt:15
8112
#: dummy/help_topics/checkouts/detail.txt:66
8113
#: dummy/help_topics/repositories/detail.txt:36
8114
msgid "Related commands::"
8115
msgstr ""
8116
8117
#: dummy/help_topics/branches/detail.txt:17
8118
msgid ""
8119
" init Change a directory into a versioned branch.\n"
8120
" branch Create a new branch that is a copy of an existing branch.\n"
8121
" merge Perform a three-way merge.\n"
8122
" bind Bind a branch to another one.\n"
8123
msgstr ""
8124
8125
#: dummy/help_topics/branches/summary.txt:1
8126
msgid "Information on what a branch is"
8127
msgstr ""
8128
8129
#: dummy/help_topics/bugs/summary.txt:1
8130
msgid "Bug tracker settings"
8131
msgstr ""
8132
8133
#: dummy/help_topics/checkouts/detail.txt:1
8134
msgid "Checkouts"
8135
msgstr ""
8136
8137
#: dummy/help_topics/checkouts/detail.txt:3
8138
msgid ""
8139
"Checkouts are source trees that are connected to a branch, so that when\n"
8140
"you commit in the source tree, the commit goes into that branch. They\n"
8141
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
8142
"Bazaar's decentralized features until you want them. Using checkouts\n"
8143
"with shared repositories is very similar to working with SVN or CVS, but\n"
8144
"doesn't have the same restrictions. And using checkouts still allows\n"
8145
"others working on the project to use whatever workflow they like."
8146
msgstr ""
8147
8148
#: dummy/help_topics/checkouts/detail.txt:11
8149
msgid ""
8150
"A checkout is created with the bzr checkout command (see \"help "
8151
"checkout\").\n"
8152
"You pass it a reference to another branch, and it will create a local copy\n"
8153
"for you that still contains a reference to the branch you created the\n"
8154
"checkout from (the master branch). Then if you make any commits they will "
8155
"be\n"
8156
"made on the other branch first. This creates an instant mirror of your work, "
8157
"or\n"
8158
"facilitates lockstep development, where each developer is working together,\n"
8159
"continuously integrating the changes of others."
8160
msgstr ""
8161
8162
#: dummy/help_topics/checkouts/detail.txt:19
8163
msgid ""
8164
"However the checkout is still a first class branch in Bazaar terms, so that\n"
8165
"you have the full history locally. As you have a first class branch you "
8166
"can\n"
8167
"also commit locally if you want, for instance due to the temporary loss af "
8168
"a\n"
8169
"network connection. Use the --local option to commit to do this. All the "
8170
"local\n"
8171
"commits will then be made on the master branch the next time you do a non-"
8172
"local\n"
8173
"commit."
8174
msgstr ""
8175
8176
#: dummy/help_topics/checkouts/detail.txt:26
8177
msgid ""
8178
"If you are using a checkout from a shared branch you will periodically want "
8179
"to\n"
8180
"pull in all the changes made by others. This is done using the \"update\"\n"
8181
"command. The changes need to be applied before any non-local commit, but\n"
8182
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8183
"command when needed."
8184
msgstr ""
8185
8186
#: dummy/help_topics/checkouts/detail.txt:32
8187
msgid ""
8188
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8189
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8190
"SVN checkout in that it is not a first class branch, it mainly consists of "
8191
"the\n"
8192
"working tree. This means that any history operations must query the master\n"
8193
"branch, which could be slow if a network connection is involved. Also, as "
8194
"you\n"
8195
"don't have a local branch, then you cannot commit locally."
8196
msgstr ""
8197
8198
#: dummy/help_topics/checkouts/detail.txt:39
8199
msgid ""
8200
"Lightweight checkouts work best when you have fast reliable access to the\n"
8201
"master branch. This means that if the master branch is on the same disk or "
8202
"LAN\n"
8203
"a lightweight checkout will be faster than a heavyweight one for any "
8204
"commands\n"
8205
"that modify the revision history (as only one copy of the branch needs to\n"
8206
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8207
"that uses the history but does not change it, but if the master branch is "
8208
"on\n"
8209
"the same disk then there won't be a noticeable difference."
8210
msgstr ""
8211
8212
#: dummy/help_topics/checkouts/detail.txt:47
8213
msgid ""
8214
"Another possible use for a checkout is to use it with a treeless repository\n"
8215
"containing your branches, where you maintain only one working tree by\n"
8216
"switching the master branch that the checkout points to when you want to\n"
8217
"work on a different branch."
8218
msgstr ""
8219
8220
#: dummy/help_topics/checkouts/detail.txt:52
8221
msgid ""
8222
"Obviously to commit on a checkout you need to be able to write to the "
8223
"master\n"
8224
"branch. This means that the master branch must be accessible over a "
8225
"writeable\n"
8226
"protocol , such as sftp://, and that you have write permissions at the "
8227
"other\n"
8228
"end. Checkouts also work on the local file system, so that all that matters "
8229
"is\n"
8230
"file permissions."
8231
msgstr ""
8232
8233
#: dummy/help_topics/checkouts/detail.txt:58
8234
msgid ""
8235
"You can change the master of a checkout by using the \"switch\" command "
8236
"(see\n"
8237
"\"help switch\"). This will change the location that the commits are sent "
8238
"to.\n"
8239
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8240
"checkout. If you would like to convert your heavy checkout into a normal\n"
8241
"branch so that every commit is local, you can use the \"unbind\" command. To "
8242
"see\n"
8243
"whether or not a branch is bound or not you can use the \"info\" command. If "
8244
"the\n"
8245
"branch is bound it will tell you the location of the bound branch."
8246
msgstr ""
8247
8248
#: dummy/help_topics/checkouts/detail.txt:68
8249
msgid ""
8250
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
8251
" checkout\n"
8252
" update Pull any changes in the master branch in to your checkout\n"
8253
" commit Make a commit that is sent to the master branch. If you have\n"
8254
" a heavy checkout then the --local option will commit to the\n"
8255
" checkout without sending the commit to the master\n"
8256
" switch Change the master branch that the commits in the checkout "
8257
"will\n"
8258
" be sent to\n"
8259
" bind Turn a standalone branch into a heavy checkout so that any\n"
8260
" commits will be sent to the master branch\n"
8261
" unbind Turn a heavy checkout into a standalone branch so that any\n"
8262
" commits are only made locally\n"
8263
" info Displays whether a branch is bound or unbound. If the branch "
8264
"is\n"
8265
" bound, then it will also display the location of the bound "
8266
"branch\n"
8267
msgstr ""
8268
8269
#: dummy/help_topics/checkouts/summary.txt:1
8270
msgid "Information on what a checkout is"
8271
msgstr ""
8272
8273
#: dummy/help_topics/commands/summary.txt:1
8274
msgid "Basic help for all commands"
8275
msgstr ""
8276
8277
#: dummy/help_topics/configuration/summary.txt:1
8278
msgid "Details on the configuration settings available"
8279
msgstr ""
8280
8281
#: dummy/help_topics/conflict-types/summary.txt:1
8282
msgid "Types of conflicts and what to do about them"
8283
msgstr ""
8284
8285
#: dummy/help_topics/content-filters/summary.txt:1
8286
msgid "Conversion of content into/from working trees"
8287
msgstr ""
8288
8289
#: dummy/help_topics/criss-cross/detail.txt:1
8290
msgid "Criss-Cross"
8291
msgstr ""
8292
8293
#: dummy/help_topics/criss-cross/detail.txt:3
8294
msgid ""
8295
"A criss-cross in the branch history can cause the default merge technique\n"
8296
"to emit more conflicts than would normally be expected."
8297
msgstr ""
8298
8299
#: dummy/help_topics/criss-cross/detail.txt:6
8300
msgid ""
8301
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
8302
"give\n"
8303
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
8304
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
8305
msgstr ""
8306
8307
#: dummy/help_topics/criss-cross/detail.txt:10
8308
msgid ""
8309
"Criss-crosses occur in a branch's history if two branches merge the same "
8310
"thing\n"
8311
"and then merge one another, or if two branches merge one another at the "
8312
"same\n"
8313
"time. They can be avoided by having each branch only merge from or into a\n"
8314
"designated central branch (a \"star topology\")."
8315
msgstr ""
8316
8317
#: dummy/help_topics/criss-cross/detail.txt:15
8318
msgid ""
8319
"Criss-crosses cause problems because of the way merge works. Bazaar's "
8320
"default\n"
8321
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8322
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
8323
"differences between THIS and OTHER are due to one side adding lines, or\n"
8324
"from another side removing lines."
8325
msgstr ""
8326
8327
#: dummy/help_topics/criss-cross/detail.txt:21
8328
msgid ""
8329
"Criss-crosses mean there is no good choice for a base. Selecting the "
8330
"recent\n"
8331
"merge points could cause one side's changes to be silently discarded.\n"
8332
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8333
"are emitted."
8334
msgstr ""
8335
8336
#: dummy/help_topics/criss-cross/detail.txt:26
8337
msgid ""
8338
"The ``weave`` merge type is not affected by this problem because it uses\n"
8339
"line-origin detection instead of a basis revision to determine the cause of\n"
8340
"differences.\n"
8341
msgstr ""
8342
8343
#: dummy/help_topics/criss-cross/summary.txt:1
8344
msgid "Information on criss-cross merging"
8345
msgstr ""
8346
8347
#: dummy/help_topics/current-formats/summary.txt:1
8348
msgid "Current storage formats"
8349
msgstr ""
8350
8351
#: dummy/help_topics/debug-flags/summary.txt:1
8352
msgid "Options to show or record debug information"
8353
msgstr ""
8354
8355
#: dummy/help_topics/diverged-branches/summary.txt:1
8356
msgid "How to fix diverged branches"
8357
msgstr ""
8358
8359
#: dummy/help_topics/env-variables/detail.txt:1
8360
msgid "Environment Variables"
8361
msgstr ""
8362
8363
#: dummy/help_topics/env-variables/detail.txt:3
8364
msgid ""
8365
"=================== "
8366
"===========================================================\n"
8367
"BZRPATH Path where bzr is to look for shell plugin external\n"
8368
" commands.\n"
8369
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8370
"EMAIL E-Mail address of the user.\n"
8371
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8372
"EDITOR Editor for editing commit messages.\n"
8373
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8374
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8375
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8376
"BZR_PLUGIN_PATH.\n"
8377
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8378
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8379
"and\n"
8380
" HOME.\n"
8381
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8382
"URLs).\n"
8383
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8384
"sshcorp,\n"
8385
" plink or lsh.\n"
8386
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8387
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8388
"BZR_COLUMNS Override implicit terminal width.\n"
8389
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8390
"(selftest)\n"
8391
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8392
"'text'.\n"
8393
"BZR_PDB Control whether to launch a debugger on error.\n"
8394
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8395
" breakin debugger.\n"
8396
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8397
"(instead\n"
8398
" of char-based).\n"
8399
"=================== "
8400
"===========================================================\n"
8401
msgstr ""
8402
8403
#: dummy/help_topics/env-variables/summary.txt:1
8404
msgid "Environment variable names and values"
8405
msgstr ""
8406
8407
#: dummy/help_topics/eol/summary.txt:1
8408
msgid "Information on end-of-line handling"
8409
msgstr ""
8410
8411
#: dummy/help_topics/files/detail.txt:1
8412
msgid "Files"
8413
msgstr ""
8414
8415
#: dummy/help_topics/files/detail.txt:3
8416
msgid ""
8417
":On Unix: ~/.bazaar/bazaar.conf\n"
8418
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
8419
"bazaar\\\\2.0\\\\bazaar.conf"
8420
msgstr ""
8421
8422
#: dummy/help_topics/files/detail.txt:6
8423
msgid ""
8424
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8425
"used to define general configuration that will be applied everywhere.\n"
8426
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8427
"commonly used options."
8428
msgstr ""
8429
8430
#: dummy/help_topics/files/detail.txt:11
8431
msgid "A typical config file might look something like::"
8432
msgstr ""
8433
8434
#: dummy/help_topics/files/detail.txt:13
8435
msgid ""
8436
" [DEFAULT]\n"
8437
" email=John Doe <jdoe@isp.com>"
8438
msgstr ""
8439
8440
#: dummy/help_topics/files/detail.txt:16
8441
msgid ""
8442
" [ALIASES]\n"
8443
" commit = commit --strict\n"
8444
" log10 = log --short -r -10..-1\n"
8445
msgstr ""
8446
8447
#: dummy/help_topics/files/summary.txt:1
8448
msgid "Information on configuration and log files"
8449
msgstr ""
8450
8451
#: dummy/help_topics/formats/detail.txt:1
8452
msgid "Storage Formats"
8453
msgstr ""
8454
8455
#: dummy/help_topics/formats/detail.txt:3
8456
msgid ""
8457
"To ensure that older clients do not access data incorrectly,\n"
8458
"Bazaar's policy is to introduce a new storage format whenever\n"
8459
"new features requiring new metadata are added. New storage\n"
8460
"formats may also be introduced to improve performance and\n"
8461
"scalability."
8462
msgstr ""
8463
8464
#: dummy/help_topics/formats/detail.txt:9
8465
msgid ""
8466
"The newest format, 2a, is highly recommended. If your\n"
8467
"project is not using 2a, then you should suggest to the\n"
8468
"project owner to upgrade."
8469
msgstr ""
8470
8471
#: dummy/help_topics/formats/detail.txt:13
8472
msgid ""
8473
"\n"
8474
".. note::"
8475
msgstr ""
8476
8477
#: dummy/help_topics/formats/detail.txt:16
8478
msgid ""
8479
" Some of the older formats have two variants:\n"
8480
" a plain one and a rich-root one. The latter include an additional\n"
8481
" field about the root of the tree. There is no performance cost\n"
8482
" for using a rich-root format but you cannot easily merge changes\n"
8483
" from a rich-root format into a plain format. As a consequence,\n"
8484
" moving a project to a rich-root format takes some co-ordination\n"
8485
" in that all contributors need to upgrade their repositories\n"
8486
" around the same time. 2a and all future formats will be\n"
8487
" implicitly rich-root."
8488
msgstr ""
8489
8490
#: dummy/help_topics/formats/detail.txt:26
8491
msgid ""
8492
"See :doc:`current-formats-help` for the complete list of\n"
8493
"currently supported formats. See :doc:`other-formats-help` for\n"
8494
"descriptions of any available experimental and deprecated formats.\n"
8495
msgstr ""
8496
8497
#: dummy/help_topics/formats/summary.txt:1
8498
msgid "Information on choosing a storage format"
8499
msgstr ""
8500
8501
#: dummy/help_topics/global-options/detail.txt:1
8502
msgid "Global Options"
8503
msgstr ""
8504
8505
#: dummy/help_topics/global-options/detail.txt:3
8506
msgid ""
8507
"These options may be used with any command, and may appear in front of any\n"
8508
"command. (e.g. ``bzr --profile help``)."
8509
msgstr ""
8510
8511
#: dummy/help_topics/global-options/detail.txt:6
8512
msgid ""
8513
"--version Print the version number. Must be supplied before the "
8514
"command.\n"
8515
"--no-aliases Do not process command aliases when running this command.\n"
8516
"--builtin Use the built-in version of a command, not the plugin "
8517
"version.\n"
8518
" This does not suppress other plugin effects.\n"
8519
"--no-plugins Do not process any plugins.\n"
8520
"--no-l10n Do not translate messages.\n"
8521
"--concurrency Number of processes that can be run concurrently (selftest)."
8522
msgstr ""
8523
8524
#: dummy/help_topics/global-options/detail.txt:14
8525
msgid ""
8526
"--profile Profile execution using the hotshot profiler.\n"
8527
"--lsprof Profile execution using the lsprof profiler.\n"
8528
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8529
" results to a specified file. If the filename ends with "
8530
"\".txt\",\n"
8531
" text format will be used. If the filename either starts "
8532
"with\n"
8533
" \"callgrind.out\" or end with \".callgrind\", the output will "
8534
"be\n"
8535
" formatted for use with KCacheGrind. Otherwise, the output\n"
8536
" will be a pickle.\n"
8537
"--coverage Generate line coverage report in the specified directory."
8538
msgstr ""
8539
8540
#: dummy/help_topics/global-options/detail.txt:24
8541
msgid ""
8542
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8543
"for\n"
8544
" the duration of the command. This can be used multiple times "
8545
"if\n"
8546
" several options need to be overridden."
8547
msgstr ""
8548
8549
#: dummy/help_topics/global-options/detail.txt:28
8550
msgid ""
8551
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8552
"information on profiling."
8553
msgstr ""
8554
8555
#: dummy/help_topics/global-options/detail.txt:31
8556
msgid ""
8557
"A number of debug flags are also available to assist troubleshooting and\n"
8558
"development. See :doc:`debug-flags-help`.\n"
8559
msgstr ""
8560
8561
#: dummy/help_topics/global-options/summary.txt:1
8562
msgid "Options that control how Bazaar runs"
8563
msgstr ""
8564
8565
#: dummy/help_topics/hidden-commands/summary.txt:1
8566
msgid "All hidden commands"
8567
msgstr ""
8568
8569
#: dummy/help_topics/hooks/summary.txt:1
8570
msgid "Points at which custom processing can be added"
8571
msgstr ""
8572
8573
#: dummy/help_topics/launchpad/detail.txt:1
8574
msgid "Integration with Launchpad.net"
8575
msgstr ""
8576
8577
#: dummy/help_topics/launchpad/detail.txt:3
8578
msgid ""
8579
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8580
"specification tracking."
8581
msgstr ""
8582
8583
#: dummy/help_topics/launchpad/detail.txt:6
8584
msgid ""
8585
"The bzr client (through the plugin called 'launchpad') has special\n"
8586
"features to communicate with Launchpad:"
8587
msgstr ""
8588
8589
#: dummy/help_topics/launchpad/detail.txt:9
8590
msgid ""
8591
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8592
"This\n"
8593
" is then used by the 'lp:' transport to download your branches using\n"
8594
" bzr+ssh://."
8595
msgstr ""
8596
8597
#: dummy/help_topics/launchpad/detail.txt:13
8598
msgid ""
8599
" * The 'lp:' transport uses Launchpad as a directory service: for "
8600
"example\n"
8601
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8602
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8603
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8604
msgstr ""
8605
8606
#: dummy/help_topics/launchpad/detail.txt:18
8607
msgid ""
8608
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8609
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8610
"lp:12345'\n"
8611
" will record a revision property that marks that revision as fixing\n"
8612
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8613
" automatically be linked to the bug report."
8614
msgstr ""
8615
8616
#: dummy/help_topics/launchpad/detail.txt:24
8617
msgid ""
8618
" * The register-branch command tells Launchpad about the url of a\n"
8619
" public branch. Launchpad will then mirror the branch, display\n"
8620
" its contents and allow it to be attached to bugs and other\n"
8621
" objects."
8622
msgstr ""
8623
8624
#: dummy/help_topics/launchpad/detail.txt:29
8625
msgid "For more information see http://help.launchpad.net/\n"
8626
msgstr ""
8627
8628
#: dummy/help_topics/launchpad/summary.txt:1
8629
msgid "Using Bazaar with Launchpad.net"
8630
msgstr ""
8631
8632
#: dummy/help_topics/location-alias/summary.txt:1
8633
msgid "Aliases for remembered locations"
8634
msgstr ""
8635
8636
#: dummy/help_topics/log-formats/summary.txt:1
8637
msgid "Details on the logging formats available"
8638
msgstr ""
8639
8640
#: dummy/help_topics/other-formats/summary.txt:1
8641
msgid "Experimental and deprecated storage formats"
8642
msgstr ""
8643
8644
#: dummy/help_topics/patterns/summary.txt:1
8645
msgid "Information on the pattern syntax"
8646
msgstr ""
8647
8648
#: dummy/help_topics/repositories/detail.txt:1
8649
msgid "Repositories"
8650
msgstr ""
8651
8652
#: dummy/help_topics/repositories/detail.txt:3
8653
msgid ""
8654
"Repositories in Bazaar are where committed information is stored. There is\n"
8655
"a repository associated with every branch."
8656
msgstr ""
8657
8658
#: dummy/help_topics/repositories/detail.txt:6
8659
msgid ""
8660
"Repositories are a form of database. Bzr will usually maintain this for\n"
8661
"good performance automatically, but in some situations (e.g. when doing\n"
8662
"very many commits in a short time period) you may want to ask bzr to\n"
8663
"optimise the database indices. This can be done by the 'bzr pack' command."
8664
msgstr ""
8665
8666
#: dummy/help_topics/repositories/detail.txt:11
8667
msgid ""
8668
"By default just running 'bzr init' will create a repository within the new\n"
8669
"branch but it is possible to create a shared repository which allows "
8670
"multiple\n"
8671
"branches to share their information in the same location. When a new branch "
8672
"is\n"
8673
"created it will first look to see if there is a containing shared repository "
8674
"it\n"
8675
"can use."
8676
msgstr ""
8677
8678
#: dummy/help_topics/repositories/detail.txt:17
8679
msgid ""
8680
"When two branches of the same project share a repository, there is\n"
8681
"generally a large space saving. For some operations (e.g. branching\n"
8682
"within the repository) this translates in to a large time saving."
8683
msgstr ""
8684
8685
#: dummy/help_topics/repositories/detail.txt:21
8686
msgid ""
8687
"To create a shared repository use the init-repository command (or the alias\n"
8688
"init-repo). This command takes the location of the repository to create. "
8689
"This\n"
8690
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8691
"which contains a shared repository. Any new branches that are created in "
8692
"this\n"
8693
"directory will then use it for storage."
8694
msgstr ""
8695
8696
#: dummy/help_topics/repositories/detail.txt:27
8697
msgid ""
8698
"It is a good idea to create a repository whenever you might create more\n"
8699
"than one branch of a project. This is true for both working areas where you\n"
8700
"are doing the development, and any server areas that you use for hosting\n"
8701
"projects. In the latter case, it is common to want branches without working\n"
8702
"trees. Since the files in the branch will not be edited directly there is "
8703
"no\n"
8704
"need to use up disk space for a working tree. To create a repository in "
8705
"which\n"
8706
"the branches will not have working trees pass the '--no-trees' option to\n"
8707
"'init-repository'."
8708
msgstr ""
8709
8710
#: dummy/help_topics/repositories/detail.txt:38
8711
msgid ""
8712
" init-repository Create a shared repository. Use --no-trees to create "
8713
"one\n"
8714
" in which new branches won't get a working tree.\n"
8715
msgstr ""
8716
8717
#: dummy/help_topics/repositories/summary.txt:1
8718
msgid "Basic information on shared repositories."
8719
msgstr ""
8720
8721
#: dummy/help_topics/revisionspec/summary.txt:1
8722
msgid "Explain how to use --revision"
8723
msgstr ""
8724
8725
#: dummy/help_topics/rules/summary.txt:1
8726
msgid "Information on defining rule-based preferences"
8727
msgstr ""
8728
8729
#: dummy/help_topics/standalone-trees/detail.txt:1
8730
msgid "Standalone Trees"
8731
msgstr ""
8732
8733
#: dummy/help_topics/standalone-trees/detail.txt:3
8734
msgid ""
8735
"A standalone tree is a working tree with an associated repository. It\n"
8736
"is an independently usable branch, with no dependencies on any other.\n"
8737
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8738
"an existing project under version control."
8739
msgstr ""
8740
8741
#: dummy/help_topics/standalone-trees/detail.txt:8
8742
msgid "Related Commands::"
8743
msgstr ""
8744
8745
#: dummy/help_topics/standalone-trees/detail.txt:10
8746
msgid " init Make a directory into a versioned branch.\n"
8747
msgstr ""
8748
8749
#: dummy/help_topics/standalone-trees/summary.txt:1
8750
msgid "Information on what a standalone tree is"
8751
msgstr ""
8752
8753
#: dummy/help_topics/standard-options/detail.txt:1
8754
msgid "Standard Options"
8755
msgstr ""
8756
8757
#: dummy/help_topics/standard-options/detail.txt:3
8758
msgid "Standard options are legal for all commands."
8759
msgstr ""
8760
8761
#: dummy/help_topics/standard-options/detail.txt:5
8762
msgid ""
8763
"--help, -h Show help message.\n"
8764
"--verbose, -v Display more information.\n"
8765
"--quiet, -q Only display errors and warnings."
8766
msgstr ""
8767
"--help, -h ヘルプを表示します。\n"
8768
"--verbose, -v より詳細な情報を表示します。\n"
8769
"--quiet, -q エラーや警告だけを表示します。"
8770
8771
#: dummy/help_topics/standard-options/detail.txt:9
8772
msgid "Unlike global options, standard options can be used in aliases.\n"
8773
msgstr ""
8774
8775
#: dummy/help_topics/standard-options/summary.txt:1
8776
msgid "Options that can be used with any command"
8777
msgstr ""
8778
8779
#: dummy/help_topics/status-flags/detail.txt:1
8780
msgid "Status Flags"
8781
msgstr ""
8782
8783
#: dummy/help_topics/status-flags/detail.txt:3
8784
msgid ""
8785
"Status flags are used to summarise changes to the working tree in a concise\n"
8786
"manner. They are in the form::"
8787
msgstr ""
8788
8789
#: dummy/help_topics/status-flags/detail.txt:6
8790
msgid " xxx <filename>"
8791
msgstr ""
8792
8793
#: dummy/help_topics/status-flags/detail.txt:8
8794
msgid "where the columns' meanings are as follows."
8795
msgstr ""
8796
8797
#: dummy/help_topics/status-flags/detail.txt:10
8798
msgid "Column 1 - versioning/renames::"
8799
msgstr ""
8800
8801
#: dummy/help_topics/status-flags/detail.txt:12
8802
msgid ""
8803
" + File versioned\n"
8804
" - File unversioned\n"
8805
" R File renamed\n"
8806
" ? File unknown\n"
8807
" X File nonexistent (and unknown to bzr)\n"
8808
" C File has conflicts\n"
8809
" P Entry for a pending merge (not a file)"
8810
msgstr ""
8811
8812
#: dummy/help_topics/status-flags/detail.txt:20
8813
msgid "Column 2 - contents::"
8814
msgstr ""
8815
8816
#: dummy/help_topics/status-flags/detail.txt:22
8817
msgid ""
8818
" N File created\n"
8819
" D File deleted\n"
8820
" K File kind changed\n"
8821
" M File modified"
8822
msgstr ""
8823
8824
#: dummy/help_topics/status-flags/detail.txt:27
8825
msgid "Column 3 - execute::"
8826
msgstr ""
8827
8828
#: dummy/help_topics/status-flags/detail.txt:29
8829
msgid " * The execute bit was changed\n"
8830
msgstr ""
8831
8832
#: dummy/help_topics/status-flags/summary.txt:1
8833
msgid "Help on status flags"
8834
msgstr ""
8835
8836
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8837
msgid "Branches Out of Sync"
8838
msgstr ""
8839
8840
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8841
msgid ""
8842
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8843
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8844
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8845
"have the same last revision as the new reference branch for the lightweight\n"
8846
"checkout, data could be lost, so Bazaar refuses."
8847
msgstr ""
8848
8849
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8850
msgid "How you deal with this depends on *why* the branches are out of sync."
8851
msgstr ""
8852
8853
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8854
msgid ""
8855
"If you have a checkout and have done local commits, you can get back in "
8856
"sync\n"
8857
"by running \"bzr update\" (and possibly \"bzr commit\")."
8858
msgstr ""
8859
8860
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8861
msgid ""
8862
"If you have a branch and the remote branch is out-of-date, you can push\n"
8863
"the local changes using \"bzr push\". If the local branch is out of date, "
8864
"you\n"
8865
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8866
"commit\n"
8867
"and then push your changes. If you decide that some of the changes aren't\n"
8868
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8869
msgstr ""
8870
8871
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8872
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8873
msgstr ""
8874
8875
#: dummy/help_topics/topics/summary.txt:1
8876
msgid "Topics list"
8877
msgstr ""
8878
8879
#: dummy/help_topics/url-special-chars/summary.txt:1
8880
msgid "Special character handling in URLs"
8881
msgstr ""
8882
8883
#: dummy/help_topics/urlspec/summary.txt:1
8884
msgid "Supported transport protocols"
8885
msgstr ""
8886
8887
#: dummy/help_topics/working-trees/detail.txt:1
8888
msgid "Working Trees"
8889
msgstr ""
8890
8891
#: dummy/help_topics/working-trees/detail.txt:3
8892
msgid ""
8893
"A working tree is the contents of a branch placed on disk so that you can\n"
8894
"see the files and edit them. The working tree is where you make changes to "
8895
"a\n"
8896
"branch, and when you commit the current state of the working tree is the\n"
8897
"snapshot that is recorded in the commit."
8898
msgstr ""
8899
8900
#: dummy/help_topics/working-trees/detail.txt:8
8901
msgid ""
8902
"When you push a branch to a remote system, a working tree will not be\n"
8903
"created. If one is already present the files will not be updated. The\n"
8904
"branch information will be updated and the working tree will be marked\n"
8905
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8906
"may be uncommitted changes or the update may cause content conflicts that "
8907
"are\n"
8908
"difficult to deal with remotely."
8909
msgstr ""
8910
8911
#: dummy/help_topics/working-trees/detail.txt:15
8912
msgid ""
8913
"If you have a branch with no working tree you can use the 'checkout' "
8914
"command\n"
8915
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8916
"will\n"
8917
"create the working tree. If the branch is updated remotely, you can update "
8918
"the\n"
8919
"working tree by running 'bzr update' in that directory."
8920
msgstr ""
8921
8922
#: dummy/help_topics/working-trees/detail.txt:20
8923
msgid ""
8924
"If you have a branch with a working tree that you do not want the 'remove-"
8925
"tree'\n"
8926
"command will remove the tree if it is safe. This can be done to avoid the\n"
8927
"warning about the remote working tree not being updated when pushing to the\n"
8928
"branch. It can also be useful when working with a '--no-trees' repository\n"
8929
"(see 'bzr help repositories')."
8930
msgstr ""
8931
8932
#: dummy/help_topics/working-trees/detail.txt:26
8933
msgid ""
8934
"If you want to have a working tree on a remote machine that you push to you\n"
8935
"can either run 'bzr update' in the remote branch after each push, or use "
8936
"some\n"
8937
"other method to update the tree during the push. There is an 'rspush' "
8938
"plugin\n"
8939
"that will update the working tree using rsync as well as doing a push. "
8940
"There\n"
8941
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8942
"SSH\n"
8943
"after each push."
8944
msgstr ""
8945
8946
#: dummy/help_topics/working-trees/detail.txt:33
8947
msgid "Useful commands::"
8948
msgstr ""
8949
8950
#: dummy/help_topics/working-trees/detail.txt:35
8951
msgid ""
8952
" checkout Create a working tree when a branch does not have one.\n"
8953
" remove-tree Removes the working tree from a branch when it is safe to do "
8954
"so.\n"
8955
" update When a working tree is out of sync with its associated "
8956
"branch\n"
8957
" this will update the tree to match the branch.\n"
8958
msgstr ""
8959
8960
#: dummy/help_topics/working-trees/summary.txt:1
8961
msgid "Information on working trees"
8962
msgstr ""
8963
8964
#: en/help_topics/authentication.txt:1
8965
msgid ""
8966
"Authentication Settings\n"
8967
"======================="
8968
msgstr ""
8969
8970
#: en/help_topics/authentication.txt:4
8971
msgid ""
8972
"\n"
8973
"Intent\n"
8974
"------"
8975
msgstr ""
8976
8977
#: en/help_topics/authentication.txt:8
8978
msgid ""
8979
"Many different authentication policies can be described in the\n"
8980
"``authentication.conf`` file but a particular user should need only a few\n"
8981
"definitions to cover his needs without having to specify a user and a "
8982
"password\n"
8983
"for every branch he uses."
8984
msgstr ""
8985
8986
#: en/help_topics/authentication.txt:13
8987
msgid ""
8988
"The definitions found in this file are used to find the credentials to use "
8989
"for\n"
8990
"a given url. The same credentials can generally be used for as many branches "
8991
"as\n"
8992
"possible by grouping their declaration around the remote servers that need\n"
8993
"them. It's even possible to declare credentials that will be used by "
8994
"different\n"
8995
"servers."
8996
msgstr ""
8997
8998
#: en/help_topics/authentication.txt:19
8999
msgid ""
9000
"The intent is to make this file as small as possible to minimize maintenance."
9001
msgstr ""
9002
9003
#: en/help_topics/authentication.txt:21
9004
msgid ""
9005
"Once the relevant credentials are declared in this file you may use branch "
9006
"urls\n"
9007
"without embedding passwords (security hazard) or even users (enabling "
9008
"sharing\n"
9009
"of your urls with others)."
9010
msgstr ""
9011
9012
#: en/help_topics/authentication.txt:25
9013
msgid "Instead of using::"
9014
msgstr ""
9015
9016
#: en/help_topics/authentication.txt:27
9017
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
9018
msgstr ""
9019
9020
#: en/help_topics/authentication.txt:29
9021
msgid "you simply use::"
9022
msgstr ""
9023
9024
#: en/help_topics/authentication.txt:31
9025
msgid " bzr branch ftp://host.com/path/to/my/branch"
9026
msgstr ""
9027
9028
#: en/help_topics/authentication.txt:33
9029
msgid ""
9030
"provided you have created the following ``authentication.conf`` file::"
9031
msgstr ""
9032
9033
#: en/help_topics/authentication.txt:35
9034
msgid ""
9035
" [myprojects]\n"
9036
" scheme=ftp\n"
9037
" host=host.com\n"
9038
" user=joe\n"
9039
" password=secret\n"
9040
" "
9041
msgstr ""
9042
9043
#: en/help_topics/authentication.txt:42
9044
msgid ""
9045
"Authentication definitions\n"
9046
"--------------------------"
9047
msgstr ""
9048
9049
#: en/help_topics/authentication.txt:45
9050
msgid ""
9051
"There are two kinds of authentication used by the various schemes supported "
9052
"by\n"
9053
"bzr:"
9054
msgstr ""
9055
9056
#: en/help_topics/authentication.txt:48
9057
msgid "1. user and password"
9058
msgstr ""
9059
9060
#: en/help_topics/authentication.txt:50
9061
msgid ""
9062
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
9063
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
9064
"ssh agents are a better, more secure solution. So we have chosen to not "
9065
"provide\n"
9066
"our own less secure method."
9067
msgstr ""
9068
9069
#: en/help_topics/authentication.txt:55
9070
msgid "2. user, realm and password"
9071
msgstr ""
9072
9073
#: en/help_topics/authentication.txt:57
9074
msgid ""
9075
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
9076
"against a host. But, by using ``.htaccess`` files, for example, it is "
9077
"possible\n"
9078
"to define several (``user, realm, password``) for a given ``host``. So what "
9079
"is\n"
9080
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
9081
"is\n"
9082
"not taken into account in the definitions, but will displayed if bzr "
9083
"prompts\n"
9084
"you for a password."
9085
msgstr ""
9086
9087
#: en/help_topics/authentication.txt:64
9088
msgid ""
9089
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
9090
"specifying the appropriate port."
9091
msgstr ""
9092
9093
#: en/help_topics/authentication.txt:67
9094
msgid ""
9095
"To take all schemes into account, the password will be deduced from a set "
9096
"of\n"
9097
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
9098
"``user``,\n"
9099
"``password``)."
9100
msgstr ""
9101
9102
#: en/help_topics/authentication.txt:71
9103
msgid ""
9104
" * ``scheme``: can be empty (meaning the rest of the definition can be "
9105
"used\n"
9106
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
9107
"``ssh``\n"
9108
" should be used instead since this is the real scheme regarding\n"
9109
" authentication,"
9110
msgstr ""
9111
9112
#: en/help_topics/authentication.txt:76
9113
msgid " * ``host``: can be empty (to act as a default for any host),"
9114
msgstr ""
9115
9116
#: en/help_topics/authentication.txt:78
9117
msgid ""
9118
" * ``port`` can be empty (useful when an host provides several servers for "
9119
"the\n"
9120
" same scheme), only numerical values are allowed, this should be used "
9121
"only\n"
9122
" when the server uses a port different than the scheme standard port,"
9123
msgstr ""
9124
9125
#: en/help_topics/authentication.txt:82
9126
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
9127
msgstr ""
9128
9129
#: en/help_topics/authentication.txt:84
9130
msgid ""
9131
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
9132
" ``getpass.get_user()``),"
9133
msgstr ""
9134
9135
#: en/help_topics/authentication.txt:87
9136
msgid ""
9137
" * ``password``: can be empty if you prefer to always be prompted for your\n"
9138
" password."
9139
msgstr ""
9140
9141
#: en/help_topics/authentication.txt:90
9142
msgid ""
9143
"Multiple definitions can be provided and, for a given URL, bzr will select "
9144
"a\n"
9145
"(``user`` [, ``password``]) based on the following rules :"
9146
msgstr ""
9147
9148
#: en/help_topics/authentication.txt:93
9149
msgid " 1. the first match wins,"
9150
msgstr ""
9151
9152
#: en/help_topics/authentication.txt:95
9153
msgid " 2. empty fields match everything,"
9154
msgstr ""
9155
9156
#: en/help_topics/authentication.txt:97
9157
msgid ""
9158
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
9159
msgstr ""
9160
9161
#: en/help_topics/authentication.txt:99
9162
msgid ""
9163
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
9164
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
9165
"``projectbzr.sf.net``\n"
9166
" will not match ``bzr.sf.net``)."
9167
msgstr ""
9168
9169
#: en/help_topics/authentication.txt:103
9170
msgid ""
9171
" 5. ``port`` matches if included in the requested URL (exact matches only)"
9172
msgstr ""
9173
9174
#: en/help_topics/authentication.txt:105
9175
msgid ""
9176
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
9177
"above,\n"
9178
" empty paths will match any provided path)."
9179
msgstr ""
9180
9181
#: en/help_topics/authentication.txt:110
9182
msgid ""
9183
"File format\n"
9184
"-----------"
9185
msgstr ""
9186
9187
#: en/help_topics/authentication.txt:113
9188
msgid ""
9189
"The general rules for :doc:`configuration files <configuration-help>`\n"
9190
"apply except for the variable policies."
9191
msgstr ""
9192
9193
#: en/help_topics/authentication.txt:116
9194
msgid "Each section describes an authentication definition."
9195
msgstr ""
9196
9197
#: en/help_topics/authentication.txt:118
9198
msgid ""
9199
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9200
"reserved\n"
9201
"and should appear as the *last* section."
9202
msgstr ""
9203
9204
#: en/help_topics/authentication.txt:121
9205
msgid "Each section should define:"
9206
msgstr ""
9207
9208
#: en/help_topics/authentication.txt:123
9209
msgid "* ``user``: the login to be used,"
9210
msgstr ""
9211
9212
#: en/help_topics/authentication.txt:125
9213
msgid "Each section could define:"
9214
msgstr ""
9215
9216
#: en/help_topics/authentication.txt:127
9217
msgid "* ``host``: the remote server,"
9218
msgstr ""
9219
9220
#: en/help_topics/authentication.txt:129
9221
msgid "* ``port``: the port the server is listening,"
9222
msgstr ""
9223
9224
#: en/help_topics/authentication.txt:131
9225
msgid "* ``path``: the branch location,"
9226
msgstr ""
9227
9228
#: en/help_topics/authentication.txt:133
9229
msgid "* ``password``: the password."
9230
msgstr ""
9231
9232
#: en/help_topics/authentication.txt:135
9233
msgid ""
9234
"\n"
9235
"Examples\n"
9236
"--------"
9237
msgstr ""
9238
9239
#: en/help_topics/authentication.txt:139
9240
msgid ""
9241
"\n"
9242
"Personal projects hosted outside\n"
9243
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9244
msgstr ""
9245
9246
#: en/help_topics/authentication.txt:143
9247
msgid ""
9248
"All connections are done with the same ``user`` (the remote one for which "
9249
"the\n"
9250
"default bzr one is not appropriate) and the password is always prompted "
9251
"with\n"
9252
"some exceptions::"
9253
msgstr ""
9254
9255
#: en/help_topics/authentication.txt:147
9256
msgid ""
9257
" # Pet projects on hobby.net\n"
9258
" [hobby]\n"
9259
" host=r.hobby.net\n"
9260
" user=jim\n"
9261
" password=obvious1234\n"
9262
" \n"
9263
" # Home server\n"
9264
" [home]\n"
9265
" scheme=https\n"
9266
" host=home.net\n"
9267
" user=joe\n"
9268
" password=1essobV10us\n"
9269
" \n"
9270
" [DEFAULT]\n"
9271
" # Our local user is barbaz, on all remote sites we're known as "
9272
"foobar\n"
9273
" user=foobar"
9274
msgstr ""
9275
9276
#: en/help_topics/authentication.txt:164
9277
msgid ""
9278
"\n"
9279
"Source hosting provider\n"
9280
"~~~~~~~~~~~~~~~~~~~~~~~"
9281
msgstr ""
9282
9283
#: en/help_topics/authentication.txt:168
9284
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9285
msgstr ""
9286
9287
#: en/help_topics/authentication.txt:170
9288
msgid ""
9289
" [shpnet domain]\n"
9290
" # we use sftp, but ssh is the scheme used for authentication\n"
9291
" scheme=ssh\n"
9292
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9293
" host=.shp.net\n"
9294
" user=joe\n"
9295
" # bzr don't support supplying a password for sftp,\n"
9296
" # consider using an ssh agent if you don't want to supply\n"
9297
" # a password interactively. (pageant, ssh-agent, etc)"
9298
msgstr ""
9299
9300
#: en/help_topics/authentication.txt:180
9301
msgid ""
9302
"HTTPS, SFTP servers and their proxy\n"
9303
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9304
msgstr ""
9305
9306
#: en/help_topics/authentication.txt:183
9307
msgid ""
9308
"At company.com, the server hosting release and integration branches is "
9309
"behind a\n"
9310
"proxy, and the two branches use different authentication policies::"
9311
msgstr ""
9312
9313
#: en/help_topics/authentication.txt:186
9314
msgid ""
9315
" [reference code]\n"
9316
" scheme=https\n"
9317
" host=dev.company.com\n"
9318
" path=/dev\n"
9319
" user=user1\n"
9320
" password=pass1"
9321
msgstr ""
9322
9323
#: en/help_topics/authentication.txt:193
9324
msgid ""
9325
" # development branches on dev server\n"
9326
" [dev]\n"
9327
" scheme=ssh # bzr+ssh and sftp are available here\n"
9328
" host=dev.company.com\n"
9329
" path=/dev/integration\n"
9330
" user=user2\n"
9331
" \n"
9332
" # proxy\n"
9333
" [proxy]\n"
9334
" scheme=http\n"
9335
" host=proxy.company.com\n"
9336
" port=3128\n"
9337
" user=proxyuser1\n"
9338
" password=proxypass1"
9339
msgstr ""
9340
9341
#: en/help_topics/authentication.txt:208
9342
msgid ""
9343
"\n"
9344
"Planned enhancements\n"
9345
"--------------------"
9346
msgstr ""
9347
9348
#: en/help_topics/authentication.txt:212
9349
msgid ""
9350
"The following are not yet implemented but planned as parts of a work in\n"
9351
"progress:"
9352
msgstr ""
9353
9354
#: en/help_topics/authentication.txt:215
9355
msgid "* add a ``password_encoding`` field allowing:"
9356
msgstr ""
9357
9358
#: en/help_topics/authentication.txt:217
9359
msgid ""
9360
" - storing the passwords in various obfuscating encodings (base64 for one),"
9361
msgstr ""
9362
9363
#: en/help_topics/authentication.txt:219
9364
msgid " - delegate password storage to plugins (.netrc for example)."
9365
msgstr ""
9366
9367
#: en/help_topics/authentication.txt:221
9368
msgid ""
9369
"* update the credentials when the user is prompted for user or password,"
9370
msgstr ""
9371
9372
#: en/help_topics/authentication.txt:223
9373
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9374
msgstr ""
9375
9376
#: en/help_topics/authentication.txt:225
9377
msgid ""
9378
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9379
"but\n"
9380
"ignored in the actual implementation.\n"
9381
msgstr ""
9382
9383
#: en/help_topics/bugs.txt:1
9384
msgid "Bug Tracker Settings"
9385
msgstr ""
9386
9387
#: en/help_topics/bugs.txt:3
9388
msgid ""
9389
"When making a commit, metadata about bugs fixed by that change can be\n"
9390
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9391
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9392
"(The only ``status`` value currently supported is ``fixed.``)"
9393
msgstr ""
9394
9395
#: en/help_topics/bugs.txt:8
9396
msgid ""
9397
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9398
"identifier\n"
9399
"rather than a full URL. This looks like::"
9400
msgstr ""
9401
9402
#: en/help_topics/bugs.txt:11
9403
msgid " bzr commit --fixes <tracker>:<id>"
9404
msgstr ""
9405
9406
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9407
msgid "or::"
9408
msgstr ""
9409
9410
#: en/help_topics/bugs.txt:15
9411
msgid " bzr commit --fixes <id>"
9412
msgstr ""
9413
9414
#: en/help_topics/bugs.txt:17
9415
msgid ""
9416
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9417
"the\n"
9418
"identifier for that bug within the bugtracker, usually the bug number.\n"
9419
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9420
"or global configuration is used."
9421
msgstr ""
9422
9423
#: en/help_topics/bugs.txt:22
9424
msgid ""
9425
"Bazaar knows about a few bug trackers that have many users. If\n"
9426
"you use one of these bug trackers then there is no setup required to\n"
9427
"use this feature, you just need to know the tracker identifier to use.\n"
9428
"These are the bugtrackers that are built in:"
9429
msgstr ""
9430
9431
#: en/help_topics/bugs.txt:27
9432
msgid ""
9433
" ============================ ============ ============\n"
9434
" URL Abbreviation Example\n"
9435
" ============================ ============ ============\n"
9436
" https://bugs.launchpad.net/ lp lp:12345\n"
9437
" http://bugs.debian.org/ deb deb:12345\n"
9438
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9439
" ============================ ============ ============"
9440
msgstr ""
9441
9442
#: en/help_topics/bugs.txt:35
9443
msgid ""
9444
"For the bug trackers not listed above configuration is required.\n"
9445
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9446
"is built in, along with a template mechanism for other bugtrackers with\n"
9447
"simple URL schemes. If your bug tracker can't be described by one\n"
9448
"of the schemes described below then you can write a plugin to support\n"
9449
"it."
9450
msgstr ""
9451
9452
#: en/help_topics/bugs.txt:42
9453
msgid ""
9454
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9455
"variable which contains the base URL of the bug tracker. These options\n"
9456
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9457
"configuration section in ``locations.conf``. You can set up these values\n"
9458
"for each of the projects you work on."
9459
msgstr ""
9460
9461
#: en/help_topics/bugs.txt:48
9462
msgid ""
9463
"Note: As you provide a short name for each tracker, you can specify one or\n"
9464
"more bugs in one or more trackers at commit time if you wish."
9465
msgstr ""
9466
9467
#: en/help_topics/bugs.txt:51
9468
msgid ""
9469
"Launchpad\n"
9470
"---------"
9471
msgstr ""
9472
9473
#: en/help_topics/bugs.txt:54
9474
msgid ""
9475
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9476
msgstr ""
9477
9478
#: en/help_topics/bugs.txt:56
9479
msgid ""
9480
"bugzilla_<tracker>_url\n"
9481
"----------------------"
9482
msgstr ""
9483
9484
#: en/help_topics/bugs.txt:59
9485
msgid ""
9486
"If present, the location of the Bugzilla bug tracker referred to by\n"
9487
"<tracker>. This option can then be used together with ``bzr commit\n"
9488
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9489
"example::"
9490
msgstr ""
9491
9492
#: en/help_topics/bugs.txt:64
9493
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9494
msgstr ""
9495
9496
#: en/help_topics/bugs.txt:66
9497
msgid ""
9498
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9499
"fixed."
9500
msgstr ""
9501
9502
#: en/help_topics/bugs.txt:69
9503
msgid ""
9504
"trac_<tracker>_url\n"
9505
"------------------"
9506
msgstr ""
9507
9508
#: en/help_topics/bugs.txt:72
9509
msgid ""
9510
"If present, the location of the Trac instance referred to by\n"
9511
"<tracker>. This option can then be used together with ``bzr commit\n"
9512
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9513
"example::"
9514
msgstr ""
9515
9516
#: en/help_topics/bugs.txt:77
9517
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9518
msgstr ""
9519
9520
#: en/help_topics/bugs.txt:79
9521
msgid ""
9522
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9523
"as\n"
9524
"fixed."
9525
msgstr ""
9526
9527
#: en/help_topics/bugs.txt:82
9528
msgid ""
9529
"bugtracker_<tracker>_url\n"
9530
"------------------------"
9531
msgstr ""
9532
9533
#: en/help_topics/bugs.txt:85
9534
msgid ""
9535
"If present, the location of a generic bug tracker instance referred to by\n"
9536
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9537
"which will be replaced by a specific bug ID. This option can then be used\n"
9538
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9539
"fixed by that commit. For example::"
9540
msgstr ""
9541
9542
#: en/help_topics/bugs.txt:91
9543
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9544
msgstr ""
9545
9546
#: en/help_topics/bugs.txt:93
9547
msgid ""
9548
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9549
"Roundup bug tracker as fixed, or::"
9550
msgstr ""
9551
9552
#: en/help_topics/bugs.txt:96
9553
msgid ""
9554
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9555
msgstr ""
9556
9557
#: en/help_topics/bugs.txt:98
9558
msgid ""
9559
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9560
"RT bug tracker as fixed, or::"
9561
msgstr ""
9562
9563
#: en/help_topics/bugs.txt:101
9564
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9565
msgstr ""
9566
9567
#: en/help_topics/bugs.txt:103
9568
msgid ""
9569
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9570
"1234\n"
9571
"in Hudson's JIRA bug tracker as fixed.\n"
9572
msgstr ""
9573
9574
#: en/help_topics/commands.txt:1
9575
msgid ""
9576
"add Add specified files or directories.\n"
9577
"alias Set/unset and display aliases.\n"
9578
"annotate Show the origin of each line in a file.\n"
9579
"bash-completion Generate a shell function for bash command line "
9580
"completion.\n"
9581
" [bash_completion]\n"
9582
"bind Convert the current branch into a checkout of the "
9583
"supplied\n"
9584
" branch.\n"
9585
"branch Create a new branch that is a copy of an existing branch.\n"
9586
"branches List the branches available at the current location.\n"
9587
"break-lock Break a dead lock.\n"
9588
"cat Write the contents of a file as of a given revision to\n"
9589
" standard output.\n"
9590
"check Validate working tree structure, branch consistency and\n"
9591
" repository history.\n"
9592
"checkout Create a new checkout of an existing branch.\n"
9593
"clean-tree Remove unwanted files from working tree.\n"
9594
"commit Commit changes into a new revision.\n"
9595
"config Display, set or remove a configuration option.\n"
9596
"conflicts List files with conflicts.\n"
9597
"deleted List files deleted in the working tree.\n"
9598
"diff Show differences in the working tree, between revisions "
9599
"or\n"
9600
" branches.\n"
9601
"dpush Push into a different VCS without any custom bzr "
9602
"metadata.\n"
9603
"export Export current or past revision to a destination directory "
9604
"or\n"
9605
" archive.\n"
9606
"help Show help on a command or other topic.\n"
9607
"ignore Ignore specified files or patterns.\n"
9608
"ignored List ignored files and the patterns that matched them.\n"
9609
"info Show information about a working tree, branch or "
9610
"repository.\n"
9611
"init Make a directory into a versioned branch.\n"
9612
"init-repository Create a shared repository for branches to share storage\n"
9613
" space.\n"
9614
"join Combine a tree into its containing tree.\n"
9615
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9616
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9617
"launchpad-open Open a Launchpad branch page in your web browser. "
9618
"[launchpad]\n"
9619
"log Show historical log for a branch or subset of a branch.\n"
9620
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9621
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9622
"ls List files in a tree.\n"
9623
"merge Perform a three-way merge.\n"
9624
"missing Show unmerged/unpulled revisions between two branches.\n"
9625
"mkdir Create a new versioned directory.\n"
9626
"mv Move or rename a file.\n"
9627
"nick Print or set the branch nickname.\n"
9628
"pack Compress the data within a repository.\n"
9629
"plugins List the installed plugins.\n"
9630
"pull Turn this branch into a mirror of another branch.\n"
9631
"push Update a mirror of this branch.\n"
9632
"reconcile Reconcile bzr metadata in a branch.\n"
9633
"reconfigure Reconfigure the type of a bzr directory.\n"
9634
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9635
"remerge Redo a merge.\n"
9636
"remove Remove files or directories.\n"
9637
"remove-branch Remove a branch.\n"
9638
"remove-tree Remove the working tree from a given branch/checkout.\n"
9639
"renames Show list of renamed files.\n"
9640
"resolve Mark a conflict as resolved.\n"
9641
"revert Revert files to a previous revision.\n"
9642
"revno Show current revision number.\n"
9643
"root Show the tree root directory.\n"
9644
"send Mail or create a merge-directive for submitting changes.\n"
9645
"serve Run the bzr server.\n"
9646
"shelve Temporarily set aside some changes from the current tree.\n"
9647
"sign-my-commits Sign all commits by a given committer.\n"
9648
"split Split a subdirectory of a tree into a separate tree.\n"
9649
"status Display status summary.\n"
9650
"switch Set the branch of a checkout and update.\n"
9651
"tag Create, remove or modify a tag naming a revision.\n"
9652
"tags List tags.\n"
9653
"testament Show testament (signing-form) of a revision.\n"
9654
"unbind Convert the current checkout into a regular branch.\n"
9655
"uncommit Remove the last committed revision.\n"
9656
"unshelve Restore shelved changes.\n"
9657
"update Update a working tree to a new revision.\n"
9658
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9659
" format.\n"
9660
"verify-signatures Verify all commit signatures.\n"
9661
"version Show version of bzr.\n"
9662
"version-info Show version information about this tree.\n"
9663
"view Manage filtered views.\n"
9664
"whoami Show or set bzr user id.\n"
9665
msgstr ""
9666
9667
#: en/help_topics/configuration.txt:1
9668
msgid ""
9669
"Configuration Settings\n"
9670
"======================="
9671
msgstr ""
9672
9673
#: en/help_topics/configuration.txt:4
9674
msgid ""
9675
"Environment settings\n"
9676
"---------------------"
9677
msgstr ""
9678
9679
#: en/help_topics/configuration.txt:7
9680
msgid ""
9681
"While most configuration is handled by configuration files, some options\n"
9682
"which may be semi-permanent can also be controlled through the environment."
9683
msgstr ""
9684
9685
#: en/help_topics/configuration.txt:10
9686
msgid ""
9687
"BZR_EMAIL\n"
9688
"~~~~~~~~~"
9689
msgstr ""
9690
9691
#: en/help_topics/configuration.txt:13
9692
msgid "Override the email id used by Bazaar. Typical format::"
9693
msgstr ""
9694
9695
#: en/help_topics/configuration.txt:15
9696
msgid " \"John Doe <jdoe@example.com>\""
9697
msgstr ""
9698
9699
#: en/help_topics/configuration.txt:17
9700
msgid "See also the ``email`` configuration option."
9701
msgstr ""
9702
9703
#: en/help_topics/configuration.txt:19
9704
msgid ""
9705
"BZR_PROGRESS_BAR\n"
9706
"~~~~~~~~~~~~~~~~"
9707
msgstr ""
9708
9709
#: en/help_topics/configuration.txt:22
9710
msgid ""
9711
"Override the progress display. Possible values are \"none\" or \"text\". "
9712
"If\n"
9713
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9714
"draws\n"
9715
"the ordinary command line progress bar."
9716
msgstr ""
9717
9718
#: en/help_topics/configuration.txt:26
9719
msgid ""
9720
"BZR_SIGQUIT_PDB\n"
9721
"~~~~~~~~~~~~~~~"
9722
msgstr ""
9723
9724
#: en/help_topics/configuration.txt:29
9725
msgid ""
9726
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9727
msgstr ""
9728
9729
#: en/help_topics/configuration.txt:31
9730
msgid ""
9731
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9732
"* 1 = Invoke breakin debugger (default)"
9733
msgstr ""
9734
9735
#: en/help_topics/configuration.txt:34
9736
msgid ""
9737
"BZR_HOME\n"
9738
"~~~~~~~~"
9739
msgstr ""
9740
9741
#: en/help_topics/configuration.txt:37
9742
msgid "Override the home directory used by Bazaar."
9743
msgstr ""
9744
9745
#: en/help_topics/configuration.txt:39
9746
msgid ""
9747
"BZR_SSH\n"
9748
"~~~~~~~"
9749
msgstr ""
9750
9751
#: en/help_topics/configuration.txt:42
9752
msgid "Select a different SSH implementation."
9753
msgstr ""
9754
9755
#: en/help_topics/configuration.txt:44
9756
msgid ""
9757
"BZR_PDB\n"
9758
"~~~~~~~"
9759
msgstr ""
9760
9761
#: en/help_topics/configuration.txt:47
9762
msgid "Control whether to launch a debugger on error."
9763
msgstr ""
9764
9765
#: en/help_topics/configuration.txt:49
9766
msgid ""
9767
"* 0 = Standard behavior\n"
9768
"* 1 = Launch debugger"
9769
msgstr ""
9770
9771
#: en/help_topics/configuration.txt:52
9772
msgid ""
9773
"BZR_REMOTE_PATH\n"
9774
"~~~~~~~~~~~~~~~"
9775
msgstr ""
9776
9777
#: en/help_topics/configuration.txt:55
9778
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9779
msgstr ""
9780
9781
#: en/help_topics/configuration.txt:57
9782
msgid "See also the ``bzr_remote_path`` configuration option."
9783
msgstr ""
9784
9785
#: en/help_topics/configuration.txt:59
9786
msgid ""
9787
"BZR_EDITOR\n"
9788
"~~~~~~~~~~"
9789
msgstr ""
9790
9791
#: en/help_topics/configuration.txt:62
9792
msgid "Path to the editor Bazaar should use for commit messages, etc."
9793
msgstr ""
9794
9795
#: en/help_topics/configuration.txt:64
9796
msgid ""
9797
"BZR_LOG\n"
9798
"~~~~~~~"
9799
msgstr ""
9800
9801
#: en/help_topics/configuration.txt:67
9802
msgid ""
9803
"Location of the Bazaar log file. You can check the current location by\n"
9804
"running ``bzr version``."
9805
msgstr ""
9806
9807
#: en/help_topics/configuration.txt:70
9808
msgid ""
9809
"The log file contains debug information that is useful for diagnosing or\n"
9810
"reporting problems with Bazaar."
9811
msgstr ""
9812
9813
#: en/help_topics/configuration.txt:73
9814
msgid ""
9815
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9816
"will disable logging."
9817
msgstr ""
9818
9819
#: en/help_topics/configuration.txt:76
9820
msgid ""
9821
"\n"
9822
"BZR_PLUGIN_PATH\n"
9823
"~~~~~~~~~~~~~~~"
9824
msgstr ""
9825
9826
#: en/help_topics/configuration.txt:80
9827
msgid ""
9828
"The path to the plugins directory that Bazaar should use.\n"
9829
"If not set, Bazaar will search for plugins in:"
9830
msgstr ""
9831
9832
#: en/help_topics/configuration.txt:83
9833
msgid ""
9834
"* the user specific plugin directory (containing the ``user`` plugins),"
9835
msgstr ""
9836
9837
#: en/help_topics/configuration.txt:85
9838
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9839
msgstr ""
9840
9841
#: en/help_topics/configuration.txt:87
9842
msgid ""
9843
"* the site specific plugin directory if applicable (containing\n"
9844
" the ``site`` plugins)."
9845
msgstr ""
9846
9847
#: en/help_topics/configuration.txt:90
9848
msgid ""
9849
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9850
"the way the plugin are searched. "
9851
msgstr ""
9852
9853
#: en/help_topics/configuration.txt:93
9854
msgid ""
9855
"As for the ``PATH`` variables, if multiple directories are\n"
9856
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9857
"platform specific appropriate character (':' on Unix,\n"
9858
"';' on windows)"
9859
msgstr ""
9860
9861
#: en/help_topics/configuration.txt:98
9862
msgid ""
9863
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9864
"in ``user``. However it will continue to search in ``core`` and\n"
9865
"``site`` unless they are explicitly removed."
9866
msgstr ""
9867
9868
#: en/help_topics/configuration.txt:102
9869
msgid ""
9870
"If you need to change the order or remove one of these\n"
9871
"directories, you should use special values:"
9872
msgstr ""
9873
9874
#: en/help_topics/configuration.txt:105
9875
msgid ""
9876
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9877
" path from the default values,"
9878
msgstr ""
9879
9880
#: en/help_topics/configuration.txt:108
9881
msgid ""
9882
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9883
" before the remaining default values (and also remove it from\n"
9884
" the default values)."
9885
msgstr ""
9886
9887
#: en/help_topics/configuration.txt:112
9888
msgid ""
9889
"Note that the special values 'user', 'core' and 'site' should be\n"
9890
"used literally, they will be substituted by the corresponding,\n"
9891
"platform specific, values."
9892
msgstr ""
9893
9894
#: en/help_topics/configuration.txt:116
9895
msgid ""
9896
"The examples below use ':' as the separator, windows users\n"
9897
"should use ';'."
9898
msgstr ""
9899
9900
#: en/help_topics/configuration.txt:119
9901
msgid "Overriding the default user plugin directory::"
9902
msgstr ""
9903
9904
#: en/help_topics/configuration.txt:121
9905
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9906
msgstr ""
9907
9908
#: en/help_topics/configuration.txt:123
9909
msgid "Disabling the site directory while retaining the user directory::"
9910
msgstr ""
9911
9912
#: en/help_topics/configuration.txt:125
9913
msgid " BZR_PLUGIN_PATH='-site:+user'"
9914
msgstr ""
9915
9916
#: en/help_topics/configuration.txt:127
9917
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9918
msgstr ""
9919
9920
#: en/help_topics/configuration.txt:129
9921
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9922
msgstr ""
9923
9924
#: en/help_topics/configuration.txt:131
9925
msgid "Overriding the default site plugin directory::"
9926
msgstr ""
9927
9928
#: en/help_topics/configuration.txt:133
9929
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9930
msgstr ""
9931
9932
#: en/help_topics/configuration.txt:135
9933
msgid ""
9934
"BZR_DISABLE_PLUGINS\n"
9935
"~~~~~~~~~~~~~~~~~~~"
9936
msgstr ""
9937
9938
#: en/help_topics/configuration.txt:138
9939
msgid ""
9940
"Under special circumstances (mostly when trying to diagnose a\n"
9941
"bug), it's better to disable a plugin (or several) rather than\n"
9942
"uninstalling them completely. Such plugins can be specified in\n"
9943
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9944
msgstr ""
9945
9946
#: en/help_topics/configuration.txt:143
9947
msgid ""
9948
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9949
"will raise an import error if they are explicitly imported (by\n"
9950
"another plugin that depends on them for example)."
9951
msgstr ""
9952
9953
#: en/help_topics/configuration.txt:147
9954
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9955
msgstr ""
9956
9957
#: en/help_topics/configuration.txt:149
9958
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9959
msgstr ""
9960
9961
#: en/help_topics/configuration.txt:151
9962
msgid ""
9963
"BZR_PLUGINS_AT\n"
9964
"~~~~~~~~~~~~~~"
9965
msgstr ""
9966
9967
#: en/help_topics/configuration.txt:154
9968
msgid ""
9969
"When adding a new feature or working on a bug in a plugin,\n"
9970
"developers often need to use a specific version of a given\n"
9971
"plugin. Since python requires that the directory containing the\n"
9972
"code is named like the plugin itself this make it impossible to\n"
9973
"use arbitrary directory names (using a two-level directory scheme\n"
9974
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9975
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9976
msgstr ""
9977
9978
#: en/help_topics/configuration.txt:162
9979
msgid ""
9980
"Plugins specified in this environment variable takes precedence\n"
9981
"over the ones in ``BZR_PLUGIN_PATH``."
9982
msgstr ""
9983
9984
#: en/help_topics/configuration.txt:165
9985
msgid ""
9986
"The variable specified a list of ``plugin_name@plugin path``,\n"
9987
"``plugin_name`` being the name of the plugin as it appears in\n"
9988
"python module paths, ``plugin_path`` being the path to the\n"
9989
"directory containing the plugin code itself\n"
9990
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9991
"separator, use ';' on windows."
9992
msgstr ""
9993
9994
#: en/help_topics/configuration.txt:172
9995
msgid ""
9996
"Example:\n"
9997
"~~~~~~~~"
9998
msgstr ""
9999
10000
#: en/help_topics/configuration.txt:175
10001
msgid ""
10002
"Using a specific version of ``myplugin``:\n"
10003
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
10004
msgstr ""
10005
10006
#: en/help_topics/configuration.txt:178
10007
msgid ""
10008
"BZRPATH\n"
10009
"~~~~~~~"
10010
msgstr ""
10011
10012
#: en/help_topics/configuration.txt:181
10013
msgid "The path where Bazaar should look for shell plugin external commands."
10014
msgstr ""
10015
10016
#: en/help_topics/configuration.txt:183
10017
msgid ""
10018
"\n"
10019
"http_proxy, https_proxy\n"
10020
"~~~~~~~~~~~~~~~~~~~~~~~"
10021
msgstr ""
10022
10023
#: en/help_topics/configuration.txt:187
10024
msgid "Specifies the network proxy for outgoing connections, for example::"
10025
msgstr ""
10026
10027
#: en/help_topics/configuration.txt:189
10028
msgid ""
10029
" http_proxy=http://proxy.example.com:3128/ \n"
10030
" https_proxy=http://proxy.example.com:3128/"
10031
msgstr ""
10032
10033
#: en/help_topics/configuration.txt:192
10034
msgid ""
10035
"\n"
10036
"Configuration files\n"
10037
"-------------------"
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:196
10041
msgid ""
10042
"Location\n"
10043
"~~~~~~~~"
10044
msgstr ""
10045
10046
#: en/help_topics/configuration.txt:199
10047
msgid ""
10048
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
10049
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
10050
"on\n"
10051
"Windows. (You can check the location for your system by using\n"
10052
"``bzr version``.)"
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:204
10056
msgid "There are three primary configuration files in this location:"
10057
msgstr ""
10058
10059
#: en/help_topics/configuration.txt:206
10060
msgid "* ``bazaar.conf`` describes default configuration options,"
10061
msgstr ""
10062
10063
#: en/help_topics/configuration.txt:208
10064
msgid ""
10065
"* ``locations.conf`` describes configuration information for\n"
10066
" specific branch locations,"
10067
msgstr ""
10068
10069
#: en/help_topics/configuration.txt:211
10070
msgid ""
10071
"* ``authentication.conf`` describes credential information for\n"
10072
" remote servers."
10073
msgstr ""
10074
10075
#: en/help_topics/configuration.txt:214
10076
msgid ""
10077
"Each branch can also contain a configuration file that sets values specific\n"
10078
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
10079
"the\n"
10080
"branch. This file is visible to all users of a branch, if you wish to "
10081
"override\n"
10082
"one of the values for a branch with a setting that is specific to you then "
10083
"you\n"
10084
"can do so in ``locations.conf``."
10085
msgstr ""
10086
10087
#: en/help_topics/configuration.txt:220
10088
msgid ""
10089
"General format\n"
10090
"~~~~~~~~~~~~~~"
10091
msgstr ""
10092
10093
#: en/help_topics/configuration.txt:223
10094
msgid ""
10095
"An ini file has three types of contructs: section headers, section\n"
10096
"options and comments."
10097
msgstr ""
10098
10099
#: en/help_topics/configuration.txt:226
10100
msgid ""
10101
"Comments\n"
10102
"^^^^^^^^"
10103
msgstr ""
10104
10105
#: en/help_topics/configuration.txt:229
10106
msgid ""
10107
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
10108
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
10109
"Bazaar when parsing ini files."
10110
msgstr ""
10111
10112
#: en/help_topics/configuration.txt:233
10113
msgid ""
10114
"Section headers\n"
10115
"^^^^^^^^^^^^^^^"
10116
msgstr ""
10117
10118
#: en/help_topics/configuration.txt:236
10119
msgid ""
10120
"A section header is a word enclosed in brackets that starts at the begining\n"
10121
"of a line. A typical section header looks like this::"
10122
msgstr ""
10123
10124
#: en/help_topics/configuration.txt:239
10125
msgid " [DEFAULT]"
10126
msgstr ""
10127
10128
#: en/help_topics/configuration.txt:241
10129
msgid ""
10130
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
10131
"[ALIASES]. Section headers are case sensitive. The default section provides "
10132
"for\n"
10133
"setting options which can be overridden with the branch config file."
10134
msgstr ""
10135
10136
#: en/help_topics/configuration.txt:245
10137
msgid ""
10138
"For ``locations.conf``, the options from the section with the\n"
10139
"longest matching section header are used to the exclusion of other\n"
10140
"potentially valid section headers. A section header uses the path for\n"
10141
"the branch as the section header. Some examples include::"
10142
msgstr ""
10143
10144
#: en/help_topics/configuration.txt:250
10145
msgid ""
10146
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
10147
" [/home/jdoe/branches/]"
10148
msgstr ""
10149
10150
#: en/help_topics/configuration.txt:253
10151
msgid ""
10152
"\n"
10153
"Section options\n"
10154
"^^^^^^^^^^^^^^^"
10155
msgstr ""
10156
10157
#: en/help_topics/configuration.txt:257
10158
msgid ""
10159
"A section option resides within a section. A section option contains an\n"
10160
"option name, an equals sign and a value. For example::"
10161
msgstr ""
10162
10163
#: en/help_topics/configuration.txt:260
10164
msgid ""
10165
" email = John Doe <jdoe@isp.com>\n"
10166
" gpg_signing_key = Amy Pond <amy@example.com>"
10167
msgstr ""
10168
10169
#: en/help_topics/configuration.txt:263
10170
msgid ""
10171
"A option can reference other options by enclosing them in curly brackets::"
10172
msgstr ""
10173
10174
#: en/help_topics/configuration.txt:265
10175
msgid ""
10176
" my_branch_name = feature_x\n"
10177
" my_server = bzr+ssh://example.com\n"
10178
" push_location = {my_server}/project/{my_branch_name}"
10179
msgstr ""
10180
10181
#: en/help_topics/configuration.txt:269
10182
msgid ""
10183
"Option policies\n"
10184
"^^^^^^^^^^^^^^^"
10185
msgstr ""
10186
10187
#: en/help_topics/configuration.txt:272
10188
msgid ""
10189
"Options defined in a section affect the named directory or URL plus\n"
10190
"any locations they contain. Policies can be used to change how an\n"
10191
"option value is interpreted for contained locations. Currently\n"
10192
"there are three policies available:"
10193
msgstr ""
10194
10195
#: en/help_topics/configuration.txt:277
10196
msgid ""
10197
" none:\n"
10198
" the value is interpreted the same for contained locations. This is\n"
10199
" the default behaviour.\n"
10200
" norecurse:\n"
10201
" the value is only used for the exact location specified by the\n"
10202
" section name.\n"
10203
" appendpath:\n"
10204
" for contained locations, any additional path components are\n"
10205
" appended to the value."
10206
msgstr ""
10207
10208
#: en/help_topics/configuration.txt:287
10209
msgid ""
10210
"Policies are specified by keys with names of the form "
10211
"\"<option_name>:policy\".\n"
10212
"For example, to define the push location for a tree of branches, the\n"
10213
"following could be used::"
10214
msgstr ""
10215
10216
#: en/help_topics/configuration.txt:291
10217
msgid ""
10218
" [/top/location]\n"
10219
" push_location = sftp://example.com/location\n"
10220
" push_location:policy = appendpath"
10221
msgstr ""
10222
10223
#: en/help_topics/configuration.txt:295
10224
msgid ""
10225
"With this configuration, the push location for ``/top/location/branch1``\n"
10226
"would be ``sftp://example.com/location/branch1``."
10227
msgstr ""
10228
10229
#: en/help_topics/configuration.txt:298
10230
msgid ""
10231
"Section local options\n"
10232
"^^^^^^^^^^^^^^^^^^^^^"
10233
msgstr ""
10234
10235
#: en/help_topics/configuration.txt:301
10236
msgid ""
10237
"Some options are defined automatically inside a given section and can be\n"
10238
"refered to in this section only. "
10239
msgstr ""
10240
10241
#: en/help_topics/configuration.txt:304
10242
msgid "For example, the ``appendpath`` policy can be used like this::"
10243
msgstr ""
10244
10245
#: en/help_topics/configuration.txt:306
10246
msgid ""
10247
" [/home/vila/src/bzr/bugs]\n"
10248
" mypush = lp:~vila/bzr\n"
10249
" mypush:policy=appendpath"
10250
msgstr ""
10251
10252
#: en/help_topics/configuration.txt:310
10253
msgid "Using ``relpath`` to achieve the same result is done like this::"
10254
msgstr ""
10255
10256
#: en/help_topics/configuration.txt:312
10257
msgid ""
10258
" [/home/vila/src/bzr/bugs]\n"
10259
" mypush = lp:~vila/bzr/{relpath}"
10260
msgstr ""
10261
10262
#: en/help_topics/configuration.txt:315
10263
msgid ""
10264
"In both cases, when used in a directory like\n"
10265
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10266
msgstr ""
10267
10268
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
10269
msgid ""
10270
" $ bzr config mypush\n"
10271
" lp:~vila/bzr/832013-expand-in-stack"
10272
msgstr ""
10273
10274
#: en/help_topics/configuration.txt:321
10275
msgid "Another such option is ``basename`` which can be used like this::"
10276
msgstr ""
10277
10278
#: en/help_topics/configuration.txt:323
10279
msgid ""
10280
" [/home/vila/src/bzr]\n"
10281
" mypush = lp:~vila/bzr/{basename}"
10282
msgstr ""
10283
10284
#: en/help_topics/configuration.txt:326
10285
msgid ""
10286
"When used in a directory like\n"
10287
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10288
msgstr ""
10289
10290
#: en/help_topics/configuration.txt:332
10291
msgid ""
10292
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10293
"itself is defined as the relative path between the section name and the\n"
10294
"location it matches."
10295
msgstr ""
10296
10297
#: en/help_topics/configuration.txt:336
10298
msgid ""
10299
"When an option is local to a Section, it cannot be referred to from option\n"
10300
"values in any other section from the same ``Store`` nor from any other\n"
10301
"``Store``."
10302
msgstr ""
10303
10304
#: en/help_topics/configuration.txt:340
10305
msgid ""
10306
"\n"
10307
"The main configuration file, bazaar.conf\n"
10308
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10309
msgstr ""
10310
10311
#: en/help_topics/configuration.txt:344
10312
msgid ""
10313
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10314
"The default section contains the default\n"
10315
"configuration options for all branches. The default section can be\n"
10316
"overriden by providing a branch-specific section in ``locations.conf``."
10317
msgstr ""
10318
10319
#: en/help_topics/configuration.txt:349
10320
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10321
msgstr ""
10322
10323
#: en/help_topics/configuration.txt:351
10324
msgid ""
10325
" [DEFAULT]\n"
10326
" email = John Doe <jdoe@isp.com>\n"
10327
" editor = /usr/bin/vim\n"
10328
" create_signatures = when-required"
10329
msgstr ""
10330
10331
#: en/help_topics/configuration.txt:356
10332
msgid ""
10333
"\n"
10334
"The branch location configuration file, locations.conf\n"
10335
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10336
msgstr ""
10337
10338
#: en/help_topics/configuration.txt:360
10339
msgid ""
10340
"``locations.conf`` allows one to specify overriding settings for\n"
10341
"a specific branch. The format is almost identical to the default section in\n"
10342
"bazaar.conf with one significant change: The section header, instead of "
10343
"saying\n"
10344
"default, will be the path to a branch that you wish to override a value\n"
10345
"for. The '?' and '*' wildcards are supported::"
10346
msgstr ""
10347
10348
#: en/help_topics/configuration.txt:366
10349
msgid ""
10350
" [/home/jdoe/branches/nethack]\n"
10351
" email = Nethack Admin <nethack@nethack.com>"
10352
msgstr ""
10353
10354
#: en/help_topics/configuration.txt:369
10355
msgid ""
10356
" [http://hypothetical.site.com/branches/devel-branch]\n"
10357
" create_signatures = always"
10358
msgstr ""
10359
10360
#: en/help_topics/configuration.txt:372
10361
msgid ""
10362
"The authentication configuration file, authentication.conf\n"
10363
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10364
msgstr ""
10365
10366
#: en/help_topics/configuration.txt:375
10367
msgid ""
10368
"``authentication.conf`` allows one to specify credentials for\n"
10369
"remote servers. This can be used for all the supported transports and any "
10370
"part\n"
10371
"of bzr that requires authentication (smtp for example)."
10372
msgstr ""
10373
10374
#: en/help_topics/configuration.txt:379
10375
msgid ""
10376
"The syntax of the file obeys the same rules as the others except for the\n"
10377
"option policies which don't apply."
10378
msgstr ""
10379
10380
#: en/help_topics/configuration.txt:382
10381
msgid ""
10382
"For more information on the possible uses of the authentication "
10383
"configuration\n"
10384
"file see :doc:`authentication-help`."
10385
msgstr ""
10386
10387
#: en/help_topics/configuration.txt:385
10388
msgid ""
10389
"\n"
10390
"Common options\n"
10391
"--------------"
10392
msgstr ""
10393
10394
#: en/help_topics/configuration.txt:389
10395
msgid ""
10396
"debug_flags\n"
10397
"~~~~~~~~~~~"
10398
msgstr ""
10399
10400
#: en/help_topics/configuration.txt:392
10401
msgid ""
10402
"A comma-separated list of debugging options to turn on. The same values\n"
10403
"can be used as with the -D command-line option (see `help global-options`).\n"
10404
"For example::"
10405
msgstr ""
10406
10407
#: en/help_topics/configuration.txt:396
10408
msgid " debug_flags = hpss"
10409
msgstr ""
10410
10411
#: en/help_topics/configuration.txt:400
10412
msgid " debug_flags = hpss,evil"
10413
msgstr ""
10414
10415
#: en/help_topics/configuration.txt:402
10416
msgid ""
10417
"email\n"
10418
"~~~~~"
10419
msgstr ""
10420
10421
#: en/help_topics/configuration.txt:405
10422
msgid ""
10423
"The email address to use when committing a branch. Typically takes the form\n"
10424
"of::"
10425
msgstr ""
10426
10427
#: en/help_topics/configuration.txt:408
10428
msgid " email = Full Name <account@hostname.tld>"
10429
msgstr ""
10430
10431
#: en/help_topics/configuration.txt:410
10432
msgid ""
10433
"editor\n"
10434
"~~~~~~"
10435
msgstr ""
10436
10437
#: en/help_topics/configuration.txt:413
10438
msgid ""
10439
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10440
"a commit message. This setting is trumped by the environment variable\n"
10441
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10442
"variables."
10443
msgstr ""
10444
10445
#: en/help_topics/configuration.txt:418
10446
msgid ""
10447
"log_format\n"
10448
"~~~~~~~~~~"
10449
msgstr ""
10450
10451
#: en/help_topics/configuration.txt:421
10452
msgid ""
10453
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10454
"and ``line``. Additional formats may be provided by plugins. The default\n"
10455
"value is ``long``."
10456
msgstr ""
10457
10458
#: en/help_topics/configuration.txt:425
10459
msgid ""
10460
"check_signatures\n"
10461
"~~~~~~~~~~~~~~~~"
10462
msgstr ""
10463
10464
#: en/help_topics/configuration.txt:428
10465
msgid ""
10466
"Reserved for future use. These options will allow a policy for branches to\n"
10467
"require signatures."
10468
msgstr ""
10469
10470
#: en/help_topics/configuration.txt:431
10471
msgid ""
10472
"require\n"
10473
" The gnupg signature for revisions must be present and must be valid."
10474
msgstr ""
10475
10476
#: en/help_topics/configuration.txt:434
10477
msgid ""
10478
"ignore\n"
10479
" Do not check gnupg signatures of revisions."
10480
msgstr ""
10481
10482
#: en/help_topics/configuration.txt:437
10483
msgid ""
10484
"check-available\n"
10485
" (default) If gnupg signatures for revisions are present, check them.\n"
10486
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10487
" no signature is present."
10488
msgstr ""
10489
10490
#: en/help_topics/configuration.txt:442
10491
msgid ""
10492
"create_signatures\n"
10493
"~~~~~~~~~~~~~~~~~"
10494
msgstr ""
10495
10496
#: en/help_topics/configuration.txt:445
10497
msgid ""
10498
"Defines the behaviour of signing revisions on commits. By default bzr will "
10499
"not\n"
10500
"sign new commits."
10501
msgstr ""
10502
10503
#: en/help_topics/configuration.txt:448
10504
msgid ""
10505
"always\n"
10506
" Sign every new revision that is committed. If the signing fails then "
10507
"the\n"
10508
" commit will not be made."
10509
msgstr ""
10510
10511
#: en/help_topics/configuration.txt:452
10512
msgid ""
10513
"when-required\n"
10514
" Reserved for future use."
10515
msgstr ""
10516
10517
#: en/help_topics/configuration.txt:455
10518
msgid ""
10519
"never\n"
10520
" Reserved for future use."
10521
msgstr ""
10522
10523
#: en/help_topics/configuration.txt:458
10524
msgid ""
10525
"In future it is planned that ``when-required`` will sign newly\n"
10526
"committed revisions only when the branch requires them. ``never`` will "
10527
"refuse\n"
10528
"to sign newly committed revisions, even if the branch requires signatures."
10529
msgstr ""
10530
10531
#: en/help_topics/configuration.txt:462
10532
msgid ""
10533
"dirstate.fdatasync\n"
10534
"~~~~~~~~~~~~~~~~~~"
10535
msgstr ""
10536
10537
#: en/help_topics/configuration.txt:465
10538
msgid ""
10539
"If true (default), working tree metadata changes are flushed through the\n"
10540
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10541
"should not be lost if the machine crashes. See also repository.fdatasync."
10542
msgstr ""
10543
10544
#: en/help_topics/configuration.txt:469
10545
msgid ""
10546
"gpg_signing_key\n"
10547
"~~~~~~~~~~~~~~~"
10548
msgstr ""
10549
10550
#: en/help_topics/configuration.txt:472
10551
msgid ""
10552
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10553
"address, key fingerprint or full key ID. When unset or when set to\n"
10554
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10555
msgstr ""
10556
10557
#: en/help_topics/configuration.txt:476
10558
msgid ""
10559
"recurse\n"
10560
"~~~~~~~"
10561
msgstr ""
10562
10563
#: en/help_topics/configuration.txt:479
10564
msgid ""
10565
"Only useful in ``locations.conf``. Defines whether or not the\n"
10566
"configuration for this section applies to subdirectories:"
10567
msgstr ""
10568
10569
#: en/help_topics/configuration.txt:482
10570
msgid ""
10571
"true\n"
10572
" (default) This section applies to subdirectories as well."
10573
msgstr ""
10574
10575
#: en/help_topics/configuration.txt:485
10576
msgid ""
10577
"false\n"
10578
" This section only applies to the branch at this directory and not\n"
10579
" branches below it."
10580
msgstr ""
10581
10582
#: en/help_topics/configuration.txt:489
10583
msgid ""
10584
"gpg_signing_command\n"
10585
"~~~~~~~~~~~~~~~~~~~"
10586
msgstr ""
10587
10588
#: en/help_topics/configuration.txt:492
10589
msgid ""
10590
"(Default: \"gpg\"). Which program should be used to sign and check "
10591
"revisions.\n"
10592
"For example::"
10593
msgstr ""
10594
10595
#: en/help_topics/configuration.txt:495
10596
msgid " gpg_signing_command = /usr/bin/gnpg"
10597
msgstr ""
10598
10599
#: en/help_topics/configuration.txt:497
10600
msgid ""
10601
"The specified command must accept the options \"--clearsign\" and \"-u "
10602
"<email>\"."
10603
msgstr ""
10604
10605
#: en/help_topics/configuration.txt:499
10606
msgid ""
10607
"bzr_remote_path\n"
10608
"~~~~~~~~~~~~~~~"
10609
msgstr ""
10610
10611
#: en/help_topics/configuration.txt:502
10612
msgid ""
10613
"(Default: \"bzr\"). The path to the command that should be used to run the "
10614
"smart\n"
10615
"server for bzr. This value may only be specified in locations.conf, because:"
10616
msgstr ""
10617
10618
#: en/help_topics/configuration.txt:505
10619
msgid ""
10620
"- it's needed before branch.conf is accessible\n"
10621
"- allowing remote branch.conf files to specify commands would be a security\n"
10622
" risk"
10623
msgstr ""
10624
10625
#: en/help_topics/configuration.txt:509
10626
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10627
msgstr ""
10628
10629
#: en/help_topics/configuration.txt:511
10630
msgid ""
10631
"smtp_server\n"
10632
"~~~~~~~~~~~"
10633
msgstr ""
10634
10635
#: en/help_topics/configuration.txt:514
10636
msgid ""
10637
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10638
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10639
msgstr ""
10640
10641
#: en/help_topics/configuration.txt:517
10642
msgid ""
10643
"smtp_username, smtp_password\n"
10644
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10645
msgstr ""
10646
10647
#: en/help_topics/configuration.txt:520
10648
msgid ""
10649
"User and password to authenticate to the SMTP server. If smtp_username\n"
10650
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10651
"These settings are only needed if the SMTP server requires authentication\n"
10652
"to send mail."
10653
msgstr ""
10654
10655
#: en/help_topics/configuration.txt:525
10656
msgid ""
10657
"locks.steal_dead\n"
10658
"~~~~~~~~~~~~~~~~"
10659
msgstr ""
10660
10661
#: en/help_topics/configuration.txt:528
10662
msgid ""
10663
"If set to true, bzr will automatically break locks held by processes from\n"
10664
"the same machine and user that are no longer alive. Otherwise, it will\n"
10665
"print a message and you can break the lock manually, if you are satisfied\n"
10666
"the object is no longer in use."
10667
msgstr ""
10668
10669
#: en/help_topics/configuration.txt:533
10670
msgid ""
10671
"mail_client\n"
10672
"~~~~~~~~~~~"
10673
msgstr ""
10674
10675
#: en/help_topics/configuration.txt:536
10676
msgid ""
10677
"A mail client to use for sending merge requests.\n"
10678
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10679
"it\n"
10680
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10681
"``editor``."
10682
msgstr ""
10683
10684
#: en/help_topics/configuration.txt:541
10685
msgid "Supported values for specific clients:"
10686
msgstr ""
10687
10688
#: en/help_topics/configuration.txt:543
10689
msgid ""
10690
":claws: Use Claws. This skips a dialog for attaching files.\n"
10691
":evolution: Use Evolution.\n"
10692
":kmail: Use KMail.\n"
10693
":mutt: Use Mutt.\n"
10694
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10695
"1.5,\n"
10696
" this works around some bugs that xdg-email doesn't handle."
10697
msgstr ""
10698
10699
#: en/help_topics/configuration.txt:550
10700
msgid "Supported generic values are:"
10701
msgstr ""
10702
10703
#: en/help_topics/configuration.txt:552
10704
msgid ""
10705
":default: See above.\n"
10706
":editor: Use your editor to compose the merge request. This also uses\n"
10707
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10708
" smtp_username and smtp_password.\n"
10709
":mapi: Use your preferred e-mail client on Windows.\n"
10710
":xdg-email: Use xdg-email to run your preferred mail program"
10711
msgstr ""
10712
10713
#: en/help_topics/configuration.txt:559
10714
msgid ""
10715
"repository.fdatasync\n"
10716
"~~~~~~~~~~~~~~~~~~~~"
10717
msgstr ""
10718
10719
#: en/help_topics/configuration.txt:562
10720
msgid ""
10721
"If true (default), repository changes are flushed through the OS buffers\n"
10722
"to physical disk. This is somewhat slower, but means data should not be\n"
10723
"lost if the machine crashes. See also dirstate.fdatasync."
10724
msgstr ""
10725
10726
#: en/help_topics/configuration.txt:566
10727
msgid ""
10728
"submit_branch\n"
10729
"~~~~~~~~~~~~~"
10730
msgstr ""
10731
10732
#: en/help_topics/configuration.txt:569
10733
msgid ""
10734
"The branch you intend to submit your current work to. This is "
10735
"automatically\n"
10736
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10737
"This\n"
10738
"should usually be set on a per-branch or per-location basis."
10739
msgstr ""
10740
10741
#: en/help_topics/configuration.txt:573
10742
msgid ""
10743
"public_branch\n"
10744
"~~~~~~~~~~~~~"
10745
msgstr ""
10746
10747
#: en/help_topics/configuration.txt:576
10748
msgid ""
10749
"A publically-accessible version of this branch (implying that this version "
10750
"is\n"
10751
"not publically-accessible). Used (and set) by ``bzr send``."
10752
msgstr ""
10753
10754
#: en/help_topics/configuration.txt:579
10755
msgid ""
10756
"suppress_warnings\n"
10757
"~~~~~~~~~~~~~~~~~"
10758
msgstr ""
10759
10760
#: en/help_topics/configuration.txt:582
10761
msgid ""
10762
"A list of strings, each string represent a warning that can be emitted by\n"
10763
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10764
msgstr ""
10765
10766
#: en/help_topics/configuration.txt:585
10767
msgid "Valid values:"
10768
msgstr ""
10769
10770
#: en/help_topics/configuration.txt:587
10771
msgid ""
10772
"* ``format_deprecation``:\n"
10773
" whether the format deprecation warning is shown on repositories that "
10774
"are\n"
10775
" using deprecated formats."
10776
msgstr ""
10777
10778
#: en/help_topics/configuration.txt:591
10779
msgid ""
10780
"default_format\n"
10781
"~~~~~~~~~~~~~~"
10782
msgstr ""
10783
10784
#: en/help_topics/configuration.txt:594
10785
msgid ""
10786
"A format name for the default format used when creating branches. See "
10787
"``bzr\n"
10788
"help formats`` for possible values."
10789
msgstr ""
10790
10791
#: en/help_topics/configuration.txt:597
10792
msgid ""
10793
"\n"
10794
"Unicode options\n"
10795
"---------------"
10796
msgstr ""
10797
10798
#: en/help_topics/configuration.txt:601
10799
msgid ""
10800
"output_encoding\n"
10801
"~~~~~~~~~~~~~~~"
10802
msgstr ""
10803
10804
#: en/help_topics/configuration.txt:604
10805
msgid ""
10806
"A Python unicode encoding name for text output from bzr, such as log\n"
10807
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10808
"is the terminal encoding prefered by the operating system."
10809
msgstr ""
10810
10811
#: en/help_topics/configuration.txt:608
10812
msgid ""
10813
"\n"
10814
"Branch type specific options\n"
10815
"----------------------------"
10816
msgstr ""
10817
10818
#: en/help_topics/configuration.txt:612
10819
msgid ""
10820
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10821
"later format. They\n"
10822
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10823
"manually set in ``locations.conf`` or ``bazaar.conf``."
10824
msgstr ""
10825
10826
#: en/help_topics/configuration.txt:617
10827
msgid ""
10828
"append_revisions_only\n"
10829
"~~~~~~~~~~~~~~~~~~~~~"
10830
msgstr ""
10831
10832
#: en/help_topics/configuration.txt:620
10833
msgid ""
10834
"If set to \"True\" then revisions can only be appended to the log, not\n"
10835
"removed. A branch with this setting enabled can only pull from another\n"
10836
"branch if the other branch's log is a longer version of its own. This is\n"
10837
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10838
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10839
"compatibility with previous bzr versions (older than 2.2)."
10840
msgstr ""
10841
10842
#: en/help_topics/configuration.txt:627
10843
msgid ""
10844
"parent_location\n"
10845
"~~~~~~~~~~~~~~~"
10846
msgstr ""
10847
10848
#: en/help_topics/configuration.txt:630
10849
msgid ""
10850
"If present, the location of the default branch for pull or merge. This "
10851
"option\n"
10852
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10853
"--remember``."
10854
msgstr ""
10855
10856
#: en/help_topics/configuration.txt:634
10857
msgid ""
10858
"push_location\n"
10859
"~~~~~~~~~~~~~"
10860
msgstr ""
10861
10862
#: en/help_topics/configuration.txt:637
10863
msgid ""
10864
"If present, the location of the default branch for push. This option\n"
10865
"is normally set by the first ``push`` or ``push --remember``."
10866
msgstr ""
10867
10868
#: en/help_topics/configuration.txt:640
10869
msgid ""
10870
"push_strict\n"
10871
"~~~~~~~~~~~"
10872
msgstr ""
10873
10874
#: en/help_topics/configuration.txt:643
10875
msgid ""
10876
"If present, defines the ``--strict`` option default value for checking\n"
10877
"uncommitted changes before pushing."
10878
msgstr ""
10879
10880
#: en/help_topics/configuration.txt:646
10881
msgid ""
10882
"dpush_strict\n"
10883
"~~~~~~~~~~~~"
10884
msgstr ""
10885
10886
#: en/help_topics/configuration.txt:649
10887
msgid ""
10888
"If present, defines the ``--strict`` option default value for checking\n"
10889
"uncommitted changes before pushing into a different VCS without any\n"
10890
"custom bzr metadata."
10891
msgstr ""
10892
10893
#: en/help_topics/configuration.txt:653
10894
msgid ""
10895
"bound_location\n"
10896
"~~~~~~~~~~~~~~"
10897
msgstr ""
10898
10899
#: en/help_topics/configuration.txt:656
10900
msgid ""
10901
"The location that commits should go to when acting as a checkout.\n"
10902
"This option is normally set by ``bind``."
10903
msgstr ""
10904
10905
#: en/help_topics/configuration.txt:659
10906
msgid ""
10907
"bound\n"
10908
"~~~~~"
10909
msgstr ""
10910
10911
#: en/help_topics/configuration.txt:662
10912
msgid ""
10913
"If set to \"True\", the branch should act as a checkout, and push each "
10914
"commit to\n"
10915
"the bound_location. This option is normally set by ``bind``/``unbind``."
10916
msgstr ""
10917
10918
#: en/help_topics/configuration.txt:665
10919
msgid ""
10920
"send_strict\n"
10921
"~~~~~~~~~~~"
10922
msgstr ""
10923
10924
#: en/help_topics/configuration.txt:668
10925
msgid ""
10926
"If present, defines the ``--strict`` option default value for checking\n"
10927
"uncommitted changes before sending a merge directive."
10928
msgstr ""
10929
10930
#: en/help_topics/configuration.txt:671
10931
msgid ""
10932
"add.maximum_file_size\n"
10933
"~~~~~~~~~~~~~~~~~~~~~"
10934
msgstr ""
10935
10936
#: en/help_topics/configuration.txt:674
10937
msgid ""
10938
"Defines the maximum file size the command line \"add\" operation will allow\n"
10939
"in recursive mode, with files larger than this value being skipped. You may "
10940
"\n"
10941
"specify this value as an integer (in which case it is interpreted as bytes), "
10942
"\n"
10943
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10944
"0 \n"
10945
"will disable skipping."
10946
msgstr ""
10947
10948
#: en/help_topics/configuration.txt:680
10949
msgid ""
10950
"External Merge Tools\n"
10951
"--------------------"
10952
msgstr ""
10953
10954
#: en/help_topics/configuration.txt:683
10955
msgid ""
10956
"bzr.mergetool.<name>\n"
10957
"~~~~~~~~~~~~~~~~~~~~"
10958
msgstr ""
10959
10960
#: en/help_topics/configuration.txt:686
10961
msgid ""
10962
"Defines an external merge tool called <name> with the given command-line.\n"
10963
"Arguments containing spaces should be quoted using single or double quotes. "
10964
"The\n"
10965
"executable may omit its path if it can be found on the PATH."
10966
msgstr ""
10967
10968
#: en/help_topics/configuration.txt:690
10969
msgid ""
10970
"The following markers can be used in the command-line to substitute "
10971
"filenames\n"
10972
"involved in the merge conflict::"
10973
msgstr ""
10974
10975
#: en/help_topics/configuration.txt:693
10976
msgid ""
10977
" {base} file.BASE\n"
10978
" {this} file.THIS\n"
10979
" {other} file.OTHER\n"
10980
" {result} output file\n"
10981
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10982
"merge\n"
10983
" succeeds."
10984
msgstr ""
10985
10986
#: en/help_topics/configuration.txt:702
10987
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10988
msgstr ""
10989
10990
#: en/help_topics/configuration.txt:704
10991
msgid ""
10992
"bzr.default_mergetool\n"
10993
"~~~~~~~~~~~~~~~~~~~~~"
10994
msgstr ""
10995
10996
#: en/help_topics/configuration.txt:707
10997
msgid ""
10998
"Specifies which external merge tool (as defined above) should be selected "
10999
"by\n"
11000
"default in tools such as ``bzr qconflicts``."
11001
msgstr ""
11002
11003
#: en/help_topics/configuration.txt:712
11004
msgid " bzr.default_mergetool = kdiff3\n"
11005
msgstr ""
11006
11007
#: en/help_topics/conflict-types.txt:1
11008
msgid ""
11009
"Conflict Types\n"
11010
"=============="
11011
msgstr ""
11012
11013
#: en/help_topics/conflict-types.txt:4
11014
msgid ""
11015
"Some operations, like merge, revert and pull, modify the contents of your\n"
11016
"working tree. These modifications are programmatically generated, and so "
11017
"they\n"
11018
"may conflict with the current state of your working tree. "
11019
msgstr ""
11020
11021
#: en/help_topics/conflict-types.txt:8
11022
msgid ""
11023
"When conflicts are present in your working tree (as shown by ``bzr\n"
11024
"conflicts``), you should resolve them and then inform bzr that the "
11025
"conflicts\n"
11026
"have been resolved."
11027
msgstr ""
11028
11029
#: en/help_topics/conflict-types.txt:12
11030
msgid ""
11031
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
11032
"should resolve them is not the one responsible for their occurrence, as is "
11033
"the\n"
11034
"case when merging other people's work or because some conflicts are "
11035
"presented\n"
11036
"in a way that is not easy to understand."
11037
msgstr ""
11038
11039
#: en/help_topics/conflict-types.txt:17
11040
msgid ""
11041
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
11042
"conflict if and only if there's an actual conceptual conflict in the source\n"
11043
"tree. Because Bazaar doesn't understand the real meaning of the files "
11044
"being\n"
11045
"versioned, it can, when faced with ambiguities, fall short in either "
11046
"direction\n"
11047
"trying to resolve the conflict itself. Many kinds of changes can be "
11048
"combined\n"
11049
"programmatically, but sometimes only a human can determine the right thing "
11050
"to\n"
11051
"do."
11052
msgstr ""
11053
11054
#: en/help_topics/conflict-types.txt:25
11055
msgid ""
11056
"When Bazaar generates a conflict, it adds information into the working tree "
11057
"to\n"
11058
"present the conflicting versions, and it's up to you to find the correct\n"
11059
"resolution."
11060
msgstr ""
11061
11062
#: en/help_topics/conflict-types.txt:29
11063
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
11064
msgstr ""
11065
11066
#: en/help_topics/conflict-types.txt:31
11067
msgid ""
11068
"1. Modify the working tree content so that the conflicted item is now in "
11069
"the\n"
11070
" state you want to keep, then"
11071
msgstr ""
11072
11073
#: en/help_topics/conflict-types.txt:34
11074
msgid ""
11075
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
11076
" remaining generated information (``bzr resolve <item>``)."
11077
msgstr ""
11078
11079
#: en/help_topics/conflict-types.txt:37
11080
msgid ""
11081
"For most conflict types, there are some obvious ways to modify the working\n"
11082
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
11083
"itself already made a choice, when possible."
11084
msgstr ""
11085
11086
#: en/help_topics/conflict-types.txt:41
11087
msgid ""
11088
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
11089
"different ways to resolve the conflict."
11090
msgstr ""
11091
11092
#: en/help_topics/conflict-types.txt:44
11093
msgid ""
11094
"Each type of conflict is explained below, and the action which must be done "
11095
"to\n"
11096
"resolve the conflict is outlined."
11097
msgstr ""
11098
11099
#: en/help_topics/conflict-types.txt:47
11100
msgid ""
11101
"Various actions are available depending on the kind of conflict, for some "
11102
"of\n"
11103
"these actions, Bazaar can provide some help. In the end you should at least\n"
11104
"inform Bazaar that you're done with the conflict with::"
11105
msgstr ""
11106
11107
#: en/help_topics/conflict-types.txt:51
11108
msgid " ``bzr resolve FILE --action=done'"
11109
msgstr ""
11110
11111
#: en/help_topics/conflict-types.txt:53
11112
msgid ""
11113
"Note that this is the default action when a single file is involved so you "
11114
"can\n"
11115
"simply use::"
11116
msgstr ""
11117
11118
#: en/help_topics/conflict-types.txt:56
11119
msgid " ``bzr resolve FILE``"
11120
msgstr ""
11121
11122
#: en/help_topics/conflict-types.txt:58
11123
msgid "See ``bzr help resolve`` for more details."
11124
msgstr ""
11125
11126
#: en/help_topics/conflict-types.txt:60
11127
msgid ""
11128
"Text conflicts\n"
11129
"--------------"
11130
msgstr ""
11131
11132
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
11133
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
11134
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11135
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11136
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
11137
msgid "Typical message::"
11138
msgstr ""
11139
11140
#: en/help_topics/conflict-types.txt:65
11141
msgid " Text conflict in FILE"
11142
msgstr ""
11143
11144
#: en/help_topics/conflict-types.txt:67
11145
msgid ""
11146
"These are produced when a text merge cannot completely reconcile two sets "
11147
"of\n"
11148
"text changes. Bazaar will emit files for each version with the extensions\n"
11149
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
11150
"tree,\n"
11151
"i.e. the tree that you are merging changes into. OTHER is the version that "
11152
"you\n"
11153
"are merging into the target. BASE is an older version that is used as a "
11154
"basis\n"
11155
"for comparison."
11156
msgstr ""
11157
11158
#: en/help_topics/conflict-types.txt:74
11159
msgid ""
11160
"In the main copy of the file, Bazaar will include all the changes that it\n"
11161
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11162
"\"herringbone\" markers like ``<<<<<<<``."
11163
msgstr ""
11164
11165
#: en/help_topics/conflict-types.txt:78
11166
msgid ""
11167
"Say the initial text is \"The project leader released it.\", and THIS "
11168
"modifies it\n"
11169
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11170
"leader\n"
11171
"released Bazaar.\" A conflict would look like this::"
11172
msgstr ""
11173
11174
#: en/help_topics/conflict-types.txt:82
11175
msgid ""
11176
" <<<<<<< TREE\n"
11177
" Martin Pool released it.\n"
11178
" =======\n"
11179
" The project leader released Bazaar.\n"
11180
" >>>>>>> MERGE-SOURCE"
11181
msgstr ""
11182
11183
#: en/help_topics/conflict-types.txt:88
11184
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11185
msgstr ""
11186
11187
#: en/help_topics/conflict-types.txt:90
11188
msgid ""
11189
"You can handle text conflicts either by editing the main copy of the file,\n"
11190
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
11191
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11192
"set of changes over the other (but see below when you encounter these\n"
11193
"cases). More often, the two sets of changes must be intelligently combined."
11194
msgstr ""
11195
11196
#: en/help_topics/conflict-types.txt:96
11197
msgid ""
11198
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
11199
"you are done editing, the file should look like it never had a conflict, and "
11200
"be\n"
11201
"ready to commit."
11202
msgstr ""
11203
11204
#: en/help_topics/conflict-types.txt:100
11205
msgid ""
11206
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
11207
"Bazaar will auto-detect which conflicts you have resolved."
11208
msgstr ""
11209
11210
#: en/help_topics/conflict-types.txt:103
11211
msgid ""
11212
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11213
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11214
"working tree."
11215
msgstr ""
11216
11217
#: en/help_topics/conflict-types.txt:107
11218
msgid ""
11219
"\n"
11220
"When you want to pick one set of changes over the other, you can use ``bzr\n"
11221
"resolve`` with one of the following actions:"
11222
msgstr ""
11223
11224
#: en/help_topics/conflict-types.txt:111
11225
msgid ""
11226
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11227
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11228
msgstr ""
11229
11230
#: en/help_topics/conflict-types.txt:114
11231
msgid ""
11232
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11233
"modifications will be taken into account."
11234
msgstr ""
11235
11236
#: en/help_topics/conflict-types.txt:117
11237
msgid ""
11238
"Content conflicts\n"
11239
"-----------------"
11240
msgstr ""
11241
11242
#: en/help_topics/conflict-types.txt:122
11243
msgid " Contents conflict in FILE"
11244
msgstr ""
11245
11246
#: en/help_topics/conflict-types.txt:124
11247
msgid ""
11248
"This conflict happens when there are conflicting changes in the working "
11249
"tree\n"
11250
"and the merge source, but the conflicted items are not text files. They "
11251
"may\n"
11252
"be binary files, or symlinks, or directories. It can even happen with "
11253
"files\n"
11254
"that are deleted on one side, and modified on the other."
11255
msgstr ""
11256
11257
#: en/help_topics/conflict-types.txt:129
11258
msgid ""
11259
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
11260
"be\n"
11261
"regular files, symlinks or directories). But it will not include a \"main "
11262
"copy\"\n"
11263
"of the file with herringbone conflict markers. It will appear that the "
11264
"\"main\n"
11265
"copy\" has been renamed to THIS or OTHER."
11266
msgstr ""
11267
11268
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11269
msgid ""
11270
"To resolve that kind of conflict, you should rebuild FILE from either "
11271
"version\n"
11272
"or a combination of both."
11273
msgstr ""
11274
11275
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11276
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11277
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11278
#: en/help_topics/conflict-types.txt:361
11279
msgid "``bzr resolve`` recognizes the following actions:"
11280
msgstr ""
11281
11282
#: en/help_topics/conflict-types.txt:139
11283
msgid ""
11284
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
11285
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11286
"* ``--action=done`` will just mark the conflict as resolved."
11287
msgstr ""
11288
11289
#: en/help_topics/conflict-types.txt:143
11290
msgid ""
11291
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11292
"and\n"
11293
"``.OTHER`` files if they are still present in the working tree."
11294
msgstr ""
11295
11296
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11297
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11298
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11299
#: en/help_topics/conflict-types.txt:369
11300
msgid ""
11301
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11302
msgstr ""
11303
11304
#: en/help_topics/conflict-types.txt:148
11305
msgid ""
11306
"Tag conflicts\n"
11307
"-------------"
11308
msgstr ""
11309
11310
#: en/help_topics/conflict-types.txt:153
11311
msgid ""
11312
" Conflicting tags:\n"
11313
" version-0.1"
11314
msgstr ""
11315
11316
#: en/help_topics/conflict-types.txt:156
11317
msgid ""
11318
"When pulling from or pushing to another branch, Bazaar informs you about "
11319
"tags\n"
11320
"that conflict between the two branches; that is the same tag points to two\n"
11321
"different revisions. You need not resolve these conflicts, but subsequent\n"
11322
"uses of pull or push will result in the same message."
11323
msgstr ""
11324
11325
#: en/help_topics/conflict-types.txt:161
11326
msgid ""
11327
"To resolve the conflict, you must apply the correct tags to either the "
11328
"target\n"
11329
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11330
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11331
"target branch's tags match the source branch, then in the target branch do\n"
11332
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11333
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11334
"source\n"
11335
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11336
"favor of the target branch, you need to similarly use ``tag --force`` in "
11337
"the\n"
11338
"source branch. (Note that pulling or pushing using --overwrite will "
11339
"overwrite\n"
11340
"all tags as well.)"
11341
msgstr ""
11342
11343
#: en/help_topics/conflict-types.txt:172
11344
msgid ""
11345
"Duplicate paths\n"
11346
"---------------"
11347
msgstr ""
11348
11349
#: en/help_topics/conflict-types.txt:177
11350
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11351
msgstr ""
11352
11353
#: en/help_topics/conflict-types.txt:179
11354
msgid ""
11355
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11356
"already been used. The existing file will be renamed to \"FILE.moved\". "
11357
msgstr ""
11358
11359
#: en/help_topics/conflict-types.txt:187
11360
msgid ""
11361
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11362
"FILE``,\n"
11363
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11364
"* ``--action=done`` will just mark the conflict as resolved."
11365
msgstr ""
11366
11367
#: en/help_topics/conflict-types.txt:191
11368
msgid ""
11369
"Note that you must get rid of FILE.moved before using ``--action=done``."
11370
msgstr ""
11371
11372
#: en/help_topics/conflict-types.txt:195
11373
msgid ""
11374
"Unversioned parent\n"
11375
"------------------"
11376
msgstr ""
11377
11378
#: en/help_topics/conflict-types.txt:200
11379
msgid ""
11380
" Conflict because FILE is not versioned, but has versioned children."
11381
msgstr ""
11382
11383
#: en/help_topics/conflict-types.txt:202
11384
msgid ""
11385
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11386
"not\n"
11387
"versioned. This happens when the directory has been deleted in the target,\n"
11388
"but has a new child in the source, or vice versa. In this situation, "
11389
"Bazaar\n"
11390
"will version the parent directory as well. Resolving this issue depends\n"
11391
"very much on the particular scenario. You may wish to rename or delete "
11392
"either\n"
11393
"the file or the directory. When you are satisfied, you can run \"bzr "
11394
"resolve\n"
11395
"FILE\" to mark the conflict as resolved."
11396
msgstr ""
11397
11398
#: en/help_topics/conflict-types.txt:210
11399
msgid ""
11400
"Missing parent\n"
11401
"--------------"
11402
msgstr ""
11403
11404
#: en/help_topics/conflict-types.txt:215
11405
msgid " Conflict adding files to FILE. Created directory."
11406
msgstr ""
11407
11408
#: en/help_topics/conflict-types.txt:217
11409
msgid ""
11410
"This happens when a directory has been deleted in the target, but has new\n"
11411
"children in the source. This is similar to the \"unversioned parent\" "
11412
"conflict,\n"
11413
"except that the parent directory does not *exist*, instead of just being\n"
11414
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11415
"Resolving this issue depends very much on the particular scenario."
11416
msgstr ""
11417
11418
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11419
msgid ""
11420
"To resolve that kind of conflict, you should either remove or rename the\n"
11421
"children or the directory or a combination of both."
11422
msgstr ""
11423
11424
#: en/help_topics/conflict-types.txt:228
11425
msgid ""
11426
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11427
" children,\n"
11428
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11429
"children\n"
11430
" and restoring the directory,\n"
11431
"* ``--action=done`` will just mark the conflict as resolved."
11432
msgstr ""
11433
11434
#: en/help_topics/conflict-types.txt:236
11435
msgid ""
11436
"Deleting parent\n"
11437
"---------------"
11438
msgstr ""
11439
11440
#: en/help_topics/conflict-types.txt:241
11441
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11442
msgstr ""
11443
11444
#: en/help_topics/conflict-types.txt:243
11445
msgid ""
11446
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11447
"source, but has new children in the target (either because a directory\n"
11448
"deletion is merged or because the merge introduce new children). Bazaar\n"
11449
"will retain the directory. Resolving this issue depends very much on the\n"
11450
"particular scenario."
11451
msgstr ""
11452
11453
#: en/help_topics/conflict-types.txt:254
11454
msgid ""
11455
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11456
"directory,"
11457
msgstr ""
11458
11459
#: en/help_topics/conflict-types.txt:256
11460
msgid ""
11461
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11462
" children,"
11463
msgstr ""
11464
11465
#: en/help_topics/conflict-types.txt:259
11466
msgid "* ``--action=done`` will just mark the conflict as resolved."
11467
msgstr ""
11468
11469
#: en/help_topics/conflict-types.txt:261
11470
msgid ""
11471
"Note that when merging a directory deletion, if unversioned files are\n"
11472
"present, they become potential orphans has they don't have a directory\n"
11473
"parent anymore."
11474
msgstr ""
11475
11476
#: en/help_topics/conflict-types.txt:265
11477
msgid ""
11478
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11479
"setting the ``bzr.transform.orphan_policy`` configuration option."
11480
msgstr ""
11481
11482
#: en/help_topics/conflict-types.txt:268
11483
msgid "There are two possible values for this option:"
11484
msgstr ""
11485
11486
#: en/help_topics/conflict-types.txt:270
11487
msgid ""
11488
"* ``conflict`` (the default): will leave the orphans in place and\n"
11489
" generate a conflicts,"
11490
msgstr ""
11491
11492
#: en/help_topics/conflict-types.txt:273
11493
msgid ""
11494
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11495
"root\n"
11496
" of the working tree with names like ``<file>.~#~``."
11497
msgstr ""
11498
11499
#: en/help_topics/conflict-types.txt:278
11500
msgid ""
11501
"Path conflict\n"
11502
"-------------"
11503
msgstr ""
11504
11505
#: en/help_topics/conflict-types.txt:283
11506
msgid " Path conflict: PATH1 / PATH2"
11507
msgstr ""
11508
11509
#: en/help_topics/conflict-types.txt:285
11510
msgid ""
11511
"This happens when the source and target have each modified the name or "
11512
"parent\n"
11513
"directory of a file. Bazaar will use the path elements from the source."
11514
msgstr ""
11515
11516
#: en/help_topics/conflict-types.txt:288
11517
msgid ""
11518
"To resolve that kind of conflict, you just have to decide what name should "
11519
"be\n"
11520
"retained for the file involved."
11521
msgstr ""
11522
11523
#: en/help_topics/conflict-types.txt:293
11524
msgid ""
11525
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11526
" issuing ``bzr mv PATH2 PATH1``,\n"
11527
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11528
"``PATH2``,\n"
11529
"* ``--action=done`` will just mark the conflict as resolved."
11530
msgstr ""
11531
11532
#: en/help_topics/conflict-types.txt:300
11533
msgid ""
11534
"Parent loop\n"
11535
"-----------"
11536
msgstr ""
11537
11538
#: en/help_topics/conflict-types.txt:305
11539
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11540
msgstr ""
11541
11542
#: en/help_topics/conflict-types.txt:307
11543
msgid ""
11544
"This happens when the source and the target have each moved directories, so\n"
11545
"that, if the change could be applied, a directory would be contained by "
11546
"itself.\n"
11547
"For example::"
11548
msgstr ""
11549
11550
#: en/help_topics/conflict-types.txt:311
11551
msgid ""
11552
" $ bzr init\n"
11553
" $ bzr mkdir white\n"
11554
" $ bzr mkdir black\n"
11555
" $ bzr commit -m \"BASE\"\n"
11556
" $ bzr branch . ../other\n"
11557
" $ bzr mv white black\n"
11558
" $ bzr commit -m \"THIS\"\n"
11559
" $ bzr mv ../other/black ../other/white\n"
11560
" $ bzr commit ../other -m \"OTHER\"\n"
11561
" $ bzr merge ../other"
11562
msgstr ""
11563
11564
#: en/help_topics/conflict-types.txt:322
11565
msgid ""
11566
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11567
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11568
"name should be retained for the directories involved."
11569
msgstr ""
11570
11571
#: en/help_topics/conflict-types.txt:328
11572
msgid ""
11573
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11574
"\n"
11575
" in ``black``,\n"
11576
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11577
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11578
"* ``--action=done`` will just mark the conflict as resolved."
11579
msgstr ""
11580
11581
#: en/help_topics/conflict-types.txt:336
11582
msgid ""
11583
"Non-directory parent\n"
11584
"--------------------"
11585
msgstr ""
11586
11587
#: en/help_topics/conflict-types.txt:341
11588
msgid ""
11589
" Conflict: foo.new is not a directory, but has files in it.\n"
11590
" Created directory."
11591
msgstr ""
11592
11593
#: en/help_topics/conflict-types.txt:344
11594
msgid ""
11595
"This happens when one side has added files to a directory, and the other "
11596
"side\n"
11597
"has changed the directory into a file or symlink. For example::"
11598
msgstr ""
11599
11600
#: en/help_topics/conflict-types.txt:347
11601
msgid ""
11602
" $ bzr init\n"
11603
" $ bzr mkdir foo\n"
11604
" $ bzr commit -m \"BASE\"\n"
11605
" $ bzr branch . ../other\n"
11606
" $ rmdir foo\n"
11607
" $ touch foo\n"
11608
" $ bzr commit -m \"THIS\"\n"
11609
" $ bzr mkdir ../other/foo/bar\n"
11610
" $ bzr commit ../other -m \"OTHER\"\n"
11611
" $ bzr merge ../other"
11612
msgstr ""
11613
11614
#: en/help_topics/conflict-types.txt:358
11615
msgid ""
11616
"To resolve that kind of conflict, you have to decide what name should be\n"
11617
"retained for the file, directory or symlink involved."
11618
msgstr ""
11619
11620
#: en/help_topics/conflict-types.txt:363
11621
msgid ""
11622
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11623
" ``bzr add foo``,\n"
11624
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11625
" ``bzr mv foo.new foo``,\n"
11626
"* ``--action=done`` will just mark the conflict as resolved."
11627
msgstr ""
11628
11629
#: en/help_topics/conflict-types.txt:371
11630
msgid ""
11631
"MalformedTransform\n"
11632
"------------------"
11633
msgstr ""
11634
11635
#: en/help_topics/conflict-types.txt:374
11636
msgid ""
11637
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11638
"exception. This means that Bazaar encountered a filesystem conflict that it "
11639
"was\n"
11640
"unable to resolve. This usually indicates a bug. Please let us know if "
11641
"you\n"
11642
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11643
msgstr ""
11644
11645
#: en/help_topics/content-filters.txt:1
11646
msgid ""
11647
"Content Filters\n"
11648
"==============="
11649
msgstr ""
11650
11651
#: en/help_topics/content-filters.txt:4
11652
msgid ""
11653
"Content formats\n"
11654
"---------------"
11655
msgstr ""
11656
11657
#: en/help_topics/content-filters.txt:7
11658
msgid ""
11659
"Bazaar's content filtering allows you to store files in a different\n"
11660
"format from the copy in your working tree. This lets you, or your\n"
11661
"co-developers, use Windows development tools that expect CRLF files\n"
11662
"on projects that use other line-ending conventions. Among other things,\n"
11663
"content filters also let Unix developers more easily work on projects\n"
11664
"using Windows line-ending conventions, keyword expansion/compression,\n"
11665
"and trailing spaces on lines in text files to be implicitly stripped\n"
11666
"when committed."
11667
msgstr ""
11668
11669
#: en/help_topics/content-filters.txt:16
11670
msgid "To generalize, there are two content formats supported by Bazaar:"
11671
msgstr ""
11672
11673
#: en/help_topics/content-filters.txt:18
11674
msgid ""
11675
"* a canonical format - how files are stored internally\n"
11676
"* a convenience format - how files are created in a working tree."
11677
msgstr ""
11678
11679
#: en/help_topics/content-filters.txt:21
11680
msgid ""
11681
"\n"
11682
"Format conversion\n"
11683
"-----------------"
11684
msgstr ""
11685
11686
#: en/help_topics/content-filters.txt:25
11687
msgid ""
11688
"The conversion between these formats is done by content filters.\n"
11689
"A content filter has two parts:"
11690
msgstr ""
11691
11692
#: en/help_topics/content-filters.txt:28
11693
msgid ""
11694
"* a read converter - converts from convenience to canonical format\n"
11695
"* a write converter - converts from canonical to convenience format."
11696
msgstr ""
11697
11698
#: en/help_topics/content-filters.txt:31
11699
msgid ""
11700
"Many of these converters will provide *round-trip* conversion,\n"
11701
"i.e. applying the read converter followed by the write converter\n"
11702
"gives back the original content. However, others may provide an\n"
11703
"asymmetric conversion. For example, a read converter might strip\n"
11704
"trailing whitespace off lines in source code while the matching\n"
11705
"write converter might pass content through unchanged."
11706
msgstr ""
11707
11708
#: en/help_topics/content-filters.txt:38
11709
msgid ""
11710
"\n"
11711
"Enabling content filters\n"
11712
"------------------------"
11713
msgstr ""
11714
11715
#: en/help_topics/content-filters.txt:42
11716
msgid ""
11717
"Content filters are typically provided by plugins, so the first step\n"
11718
"in using them is to install the relevant plugins and read their\n"
11719
"documentation. Some plugins may be very specific about which files\n"
11720
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11721
"In other cases, the plugin may leave it in the user's hands to\n"
11722
"define which files are to be filtered. This is typically done\n"
11723
"using rule-based preferences. See ``bzr help rules`` for general\n"
11724
"information about defining these."
11725
msgstr ""
11726
11727
#: en/help_topics/content-filters.txt:51
11728
msgid ""
11729
"\n"
11730
"Impact on commands\n"
11731
"------------------"
11732
msgstr ""
11733
11734
#: en/help_topics/content-filters.txt:55
11735
msgid ""
11736
"Read converters are only applied to commands that read content from\n"
11737
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11738
"will apply read converters to files in the working tree, then compare\n"
11739
"the results to the content last committed."
11740
msgstr ""
11741
11742
#: en/help_topics/content-filters.txt:60
11743
msgid ""
11744
"Write converters are only applied by commands that **create files in a\n"
11745
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11746
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11747
"respectively."
11748
msgstr ""
11749
11750
#: en/help_topics/content-filters.txt:65
11751
msgid ""
11752
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11753
"comitting files. If this makes sense for a given plugin providing\n"
11754
"a content filter, the plugin can usually achieve this effect by using a\n"
11755
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11756
"for more information on hooks."
11757
msgstr ""
11758
11759
#: en/help_topics/content-filters.txt:71
11760
msgid ""
11761
"\n"
11762
"Refreshing your working tree\n"
11763
"----------------------------"
11764
msgstr ""
11765
11766
#: en/help_topics/content-filters.txt:75
11767
msgid ""
11768
"For performance reasons, Bazaar caches the timestamps of files in\n"
11769
"a working tree, and assumes files are unchanged if their timestamps\n"
11770
"match the cached values. As a consequence, there are times when\n"
11771
"you may need to explicitly ask for content filtering to be reapplied\n"
11772
"in one or both directions, e.g. after installing or reconfiguring\n"
11773
"plugins providing it."
11774
msgstr ""
11775
11776
#: en/help_topics/content-filters.txt:82
11777
msgid "Here are some general guidelines for doing this:"
11778
msgstr ""
11779
11780
#: en/help_topics/content-filters.txt:84
11781
msgid ""
11782
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11783
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11784
" relevant read converters and compare the end result with the\n"
11785
" canonical format."
11786
msgstr ""
11787
11788
#: en/help_topics/content-filters.txt:89
11789
msgid ""
11790
" * To reapply write converters, ensure there are no local changes,\n"
11791
" delete the relevant files and run ``bzr revert`` on those files."
11792
msgstr ""
11793
11794
#: en/help_topics/content-filters.txt:92
11795
msgid ""
11796
"Note: In the future, it is likely that additional options will be added\n"
11797
"to commands to make this refreshing process faster and safer.\n"
11798
msgstr ""
11799
11800
#: en/help_topics/current-formats.txt:1
11801
msgid "Current Storage Formats"
11802
msgstr ""
11803
11804
#: en/help_topics/current-formats.txt:3
11805
msgid ""
11806
":2a:\n"
11807
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11808
" compress storage. Provides rich roots which are a one-way\n"
11809
" transition."
11810
msgstr ""
11811
11812
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11813
msgid ""
11814
"\n"
11815
"See :doc:`formats-help` for more about storage formats."
11816
msgstr ""
11817
11818
#: en/help_topics/debug-flags.txt:1
11819
msgid ""
11820
"Debug Flags\n"
11821
"==========="
11822
msgstr ""
11823
11824
#: en/help_topics/debug-flags.txt:4
11825
msgid ""
11826
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11827
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11828
msgstr ""
11829
11830
#: en/help_topics/debug-flags.txt:7
11831
msgid ""
11832
"-Dauth Trace authentication sections used.\n"
11833
"-Dbytes Print out how many bytes were transferred\n"
11834
"-Ddirstate Trace dirstate activity (verbose!)\n"
11835
"-Derror Instead of normal error handling, always print a "
11836
"traceback\n"
11837
" on error.\n"
11838
"-Devil Capture call sites that do expensive or badly-scaling\n"
11839
" operations.\n"
11840
"-Dfetch Trace history copying between repositories.\n"
11841
"-Dfilters Emit information for debugging content filtering.\n"
11842
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11843
"fetch.\n"
11844
"-Dgraph Trace graph traversal.\n"
11845
"-Dhashcache Log every time a working file is read to determine its "
11846
"hash.\n"
11847
"-Dhooks Trace hook execution.\n"
11848
"-Dhpss Trace smart protocol requests and responses.\n"
11849
"-Dhpssdetail More hpss details.\n"
11850
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11851
"-Dhttp Trace http connections, requests and responses.\n"
11852
"-Dindex Trace major index operations.\n"
11853
"-Dknit Trace knit operations.\n"
11854
"-Dlock Trace when lockdir locks are taken or released.\n"
11855
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11856
" retrying the request.\n"
11857
"-Dprogress Trace progress bar operations.\n"
11858
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11859
"-Dmerge Emit information for debugging merges.\n"
11860
"-Dno_apport Don't use apport to report crashes.\n"
11861
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11862
"-Dpack Emit information about pack operations.\n"
11863
"-Drelock Emit a message every time a branch or repository object "
11864
"is\n"
11865
" unlocked then relocked the same way.\n"
11866
"-Dsftp Trace SFTP internals.\n"
11867
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11868
"expected\n"
11869
"-Dstream Trace fetch streams.\n"
11870
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11871
"portable\n"
11872
" manner.\n"
11873
"-Dunlock Some errors during unlock are treated as warnings.\n"
11874
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11875
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11876
"appropriate\n"
11877
" for the format, even for non-local fetches.\n"
11878
msgstr ""
11879
11880
#: en/help_topics/diverged-branches.txt:1
11881
msgid ""
11882
"Diverged Branches\n"
11883
"================="
11884
msgstr ""
11885
11886
#: en/help_topics/diverged-branches.txt:4
11887
msgid ""
11888
"When Bazaar tries to push one branch onto another, it requires that the\n"
11889
"destination branch must be ready to receive the source branch. If this "
11890
"isn't\n"
11891
"the case, then we say that the branches have ``diverged``. Branches are\n"
11892
"considered diverged if the destination branch's most recent commit is one "
11893
"that\n"
11894
"has not been merged (directly or indirectly) by the source branch. To "
11895
"recover\n"
11896
"from diverged branches, one must merge the missing revisions into the "
11897
"source\n"
11898
"branch."
11899
msgstr ""
11900
11901
#: en/help_topics/diverged-branches.txt:12
11902
msgid ""
11903
"This situation commonly arises when using a centralized workflow with local\n"
11904
"commits. If someone else has committed new work to the mainline since your\n"
11905
"last pull and you have local commits that have not yet been pushed to the\n"
11906
"mainline, then your local branch and the mainline have diverged."
11907
msgstr ""
11908
11909
#: en/help_topics/diverged-branches.txt:17
11910
msgid ""
11911
"Discovering What Has Diverged\n"
11912
"-----------------------------"
11913
msgstr ""
11914
11915
#: en/help_topics/diverged-branches.txt:20
11916
msgid ""
11917
"The ``bzr missing`` command is used to find out what revisions are in "
11918
"another\n"
11919
"branch that are not present in the current branch, and vice-versa. It shows "
11920
"a\n"
11921
"summary of which extra revisions exist in each branch. If you want to see "
11922
"the\n"
11923
"precise effects of those revisions, you can use ``bzr diff --"
11924
"old=other_branch``\n"
11925
"to show the differences between other_branch and your current branch."
11926
msgstr ""
11927
11928
#: en/help_topics/diverged-branches.txt:26
11929
msgid ""
11930
"A Solution\n"
11931
"----------"
11932
msgstr ""
11933
11934
#: en/help_topics/diverged-branches.txt:29
11935
msgid ""
11936
"The solution is to merge the revisions from the mainline into your local\n"
11937
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11938
"mainline. This merge may result in conflicts if the other developer's "
11939
"changes\n"
11940
"overlap with your changes. These conflicts should be resolved before\n"
11941
"continuing. After any conflicts have been resolved, or even if there were "
11942
"no\n"
11943
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11944
"to your local branch. This requirement gives you an opportunity to test "
11945
"the\n"
11946
"resulting working tree for correctness, since the merged revisions could "
11947
"have\n"
11948
"made arbitrary changes. After testing, you should commit the merge using\n"
11949
"``bzr commit``. This clears up the diverged branches situation. Your "
11950
"local\n"
11951
"branch can now be pushed to the mainline.\n"
11952
msgstr ""
11953
11954
#: en/help_topics/eol.txt:1
11955
msgid ""
11956
"End of Line Conversion\n"
11957
"======================"
11958
msgstr ""
11959
11960
#: en/help_topics/eol.txt:4
11961
msgid ""
11962
"EOL conversion is provided as a content filter where Bazaar internally\n"
11963
"stores a canonical format but outputs a convenience format. See\n"
11964
"``bzr help content-filters`` for general information about using these."
11965
msgstr ""
11966
11967
#: en/help_topics/eol.txt:8
11968
msgid ""
11969
"Note: Content filtering is only supported in recently added formats,\n"
11970
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11971
"in a recent format. (Just setting the format on the repository\n"
11972
"is not enough.) If content filtering does not appear to be working, use\n"
11973
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11974
"or later."
11975
msgstr ""
11976
11977
#: en/help_topics/eol.txt:15
11978
msgid ""
11979
"EOL conversion needs to be enabled for selected file patterns using\n"
11980
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11981
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11982
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11983
"supported in a future verison of Bazaar."
11984
msgstr ""
11985
11986
#: en/help_topics/eol.txt:21
11987
msgid ""
11988
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11989
"(If a value is not set, ``exact`` is the default.)"
11990
msgstr ""
11991
11992
#: en/help_topics/eol.txt:24
11993
msgid ""
11994
" ========== ===================================== ======================\n"
11995
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11996
" ========== ===================================== ======================\n"
11997
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11998
" ---------- ------------------------------------- ----------------------\n"
11999
" ``lf`` ``lf`` ``lf``\n"
12000
" ---------- ------------------------------------- ----------------------\n"
12001
" ``crlf`` ``crlf`` ``lf``\n"
12002
" ---------- ------------------------------------- ----------------------\n"
12003
" ``exact`` No conversion Exactly as in file\n"
12004
" ========== ===================================== ======================"
12005
msgstr ""
12006
12007
#: en/help_topics/eol.txt:36
12008
msgid ""
12009
"Note: For safety reasons, no conversion is applied to any file where a null\n"
12010
"byte is detected in the file."
12011
msgstr ""
12012
12013
#: en/help_topics/eol.txt:39
12014
msgid ""
12015
"For users working on a cross-platform project, here is a suggested rule\n"
12016
"to use as a starting point::"
12017
msgstr ""
12018
12019
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
12020
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
12021
msgid ""
12022
" [name *]\n"
12023
" eol = native"
12024
msgstr ""
12025
12026
#: en/help_topics/eol.txt:45
12027
msgid ""
12028
"If you have binary files that do not contain a null byte though, be\n"
12029
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
12030
"by giving more explicit patterns earlier in the rules file. For example::"
12031
msgstr ""
12032
12033
#: en/help_topics/eol.txt:49
12034
msgid ""
12035
" [name *.png]\n"
12036
" eol = exact"
12037
msgstr ""
12038
12039
#: en/help_topics/eol.txt:55
12040
msgid ""
12041
"If your working tree is on a network drive shared by users on different\n"
12042
"operating systems, you typically want to force certain conventions for\n"
12043
"certain files. In that way, if a file is created with the wrong line\n"
12044
"endings or line endings get mixed during editing, it gets committed\n"
12045
"correctly and gets checked out correctly. For example::"
12046
msgstr ""
12047
12048
#: en/help_topics/eol.txt:61
12049
msgid ""
12050
" [name *.bat]\n"
12051
" eol = crlf"
12052
msgstr ""
12053
12054
#: en/help_topics/eol.txt:64
12055
msgid ""
12056
" [name *.sh]\n"
12057
" eol = lf"
12058
msgstr ""
12059
12060
#: en/help_topics/eol.txt:70
12061
msgid ""
12062
"If you take the care to create files with their required endings, you can\n"
12063
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
12064
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
12065
"introducing mixed line endings will be corrected during commit for files\n"
12066
"with those settings."
12067
msgstr ""
12068
12069
#: en/help_topics/eol.txt:76
12070
msgid ""
12071
"If you have sample test data that deliberately has text files with mixed\n"
12072
"newline conventions, you can ask for those to be left alone like this::"
12073
msgstr ""
12074
12075
#: en/help_topics/eol.txt:79
12076
msgid ""
12077
" [name test_data/]\n"
12078
" eol = exact"
12079
msgstr ""
12080
12081
#: en/help_topics/eol.txt:85
12082
msgid ""
12083
"Note that ``exact`` does not imply the file is binary but it does mean\n"
12084
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
12085
"of content analysis to detect binary files for commands like ``diff``.\n"
12086
"In the future, a ``binary = true`` rule may be added but it is not\n"
12087
"supported yet.)"
12088
msgstr ""
12089
12090
#: en/help_topics/eol.txt:91
12091
msgid ""
12092
"If you have an existing repository with text files already stored using\n"
12093
"Windows newline conventions (``crlf``), then you may want to keep using "
12094
"that\n"
12095
"convention in the repository. Forcing certain files to this convention\n"
12096
"may also help users who do not have rules configured. To do this, set\n"
12097
"``eol`` to one of the values below."
12098
msgstr ""
12099
12100
#: en/help_topics/eol.txt:97
12101
msgid ""
12102
" ============================ ======================== "
12103
"======================\n"
12104
" Value Checkout end-of-lines as Commit end-of-lines "
12105
"as\n"
12106
" ============================ ======================== "
12107
"======================\n"
12108
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
12109
" ``lf`` otherwise\n"
12110
" ---------------------------- ------------------------ ----------------------"
12111
"\n"
12112
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
12113
" ---------------------------- ------------------------ ----------------------"
12114
"\n"
12115
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
12116
" ============================ ======================== ======================"
12117
msgstr ""
12118
12119
#: en/help_topics/eol.txt:108
12120
msgid ""
12121
"For users working on an existing project that uses Windows newline\n"
12122
"conventions in their Bazaar repository, this rule is suggested as a\n"
12123
"starting point::"
12124
msgstr ""
12125
12126
#: en/help_topics/eol.txt:112
12127
msgid ""
12128
" [name *]\n"
12129
" eol = native-with-crlf-in-repo"
12130
msgstr ""
12131
12132
#: en/help_topics/eol.txt:115
12133
msgid ""
12134
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12135
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12136
"``crlf`` and ``exact``."
12137
msgstr ""
12138
12139
#: en/help_topics/eol.txt:119
12140
msgid ""
12141
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12142
"never reject files because a given line ending or mixed line endings\n"
12143
"are found. A precommit hook should be used if you wish to validate\n"
12144
"(and not just convert) content before committing.\n"
12145
msgstr ""
12146
12147
#: en/help_topics/hidden-commands.txt:1
12148
msgid ""
12149
"added List files added in working tree.\n"
12150
"ancestry List all revisions merged into this branch.\n"
12151
"assert-fail Test reporting of assertion failures\n"
12152
"bundle-info Output interesting stats about a bundle\n"
12153
"bundle-revisions Create a merge-directive for submitting changes.\n"
12154
"cat-revision Write out metadata for a revision.\n"
12155
"dump-btree Dump the contents of a btree index file to stdout.\n"
12156
"export-pot Export command helps and error messages in po format.\n"
12157
"file-id Print file_id of a particular file or directory.\n"
12158
"file-path Print path of file_ids to a file or directory.\n"
12159
"find-merge-base Find and print a base revision for merging two "
12160
"branches.\n"
12161
"hooks Show hooks.\n"
12162
"inventory Show inventory of the current working copy or a "
12163
"revision.\n"
12164
"local-time-offset Show the offset in seconds from GMT to local time.\n"
12165
"lookup-revision Lookup the revision-id from a revision-number\n"
12166
"merge-directive Generate a merge directive for auto-merge tools.\n"
12167
"modified List files modified in working tree.\n"
12168
"re-sign Create a digital signature for an existing revision.\n"
12169
"reference list, view and set branch locations for nested trees.\n"
12170
"relpath Show path of a file relative to root\n"
12171
"repair-workingtree Reset the working tree state file.\n"
12172
"revision-history Display the list of revision ids on a branch.\n"
12173
"revision-info Show revision number and revision id for a given "
12174
"revision\n"
12175
" identifier.\n"
12176
"rocks Statement of optimism.\n"
12177
"selftest Run internal test suite.\n"
12178
"shell-complete Show appropriate completions for context.\n"
12179
"test-script Run a shell-like test from a file.\n"
12180
"touching-revisions Return revision-ids which affected a particular file.\n"
12181
"unknowns List unknown files.\n"
12182
"wait-until-signalled Test helper for\n"
12183
" test_start_and_stop_bzr_subprocess_send_signal.\n"
12184
msgstr ""
12185
12186
#: en/help_topics/hooks.txt:1
12187
msgid ""
12188
"\n"
12189
"Hooks\n"
12190
"====="
12191
msgstr ""
12192
12193
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
12194
msgid ""
12195
"Introduction\n"
12196
"------------"
12197
msgstr ""
12198
12199
#: en/help_topics/hooks.txt:8
12200
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12201
msgstr ""
12202
12203
#: en/help_topics/hooks.txt:10
12204
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
12205
msgstr ""
12206
12207
#: en/help_topics/hooks.txt:12
12208
msgid ""
12209
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12210
msgstr ""
12211
12212
#: en/help_topics/hooks.txt:14
12213
msgid ""
12214
"The class that contains each hook is given before the hooks it supplies. "
12215
"For\n"
12216
"instance, BranchHooks as the class is the hooks class for\n"
12217
"`bzrlib.branch.Branch.hooks`."
12218
msgstr ""
12219
12220
#: en/help_topics/hooks.txt:18
12221
msgid ""
12222
"Each description also indicates whether the hook runs on the client (the\n"
12223
"machine where bzr was invoked) or the server (the machine addressed by\n"
12224
"the branch URL). These may be, but are not necessarily, the same machine."
12225
msgstr ""
12226
12227
#: en/help_topics/hooks.txt:22
12228
msgid ""
12229
"Plugins (including hooks) are run on the server if all of these is true:"
12230
msgstr ""
12231
12232
#: en/help_topics/hooks.txt:24
12233
msgid ""
12234
" * The connection is via a smart server (accessed with a URL starting with\n"
12235
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12236
"\"http://\"\n"
12237
" URL when a smart server is available via HTTP)."
12238
msgstr ""
12239
12240
#: en/help_topics/hooks.txt:28
12241
msgid ""
12242
" * The hook is either server specific or part of general infrastructure "
12243
"rather\n"
12244
" than client specific code (such as commit)."
12245
msgstr ""
12246
12247
#: en/help_topics/hooks.txt:31
12248
msgid ""
12249
"\n"
12250
"BranchHooks\n"
12251
"-----------"
12252
msgstr ""
12253
12254
#: en/help_topics/hooks.txt:35
12255
msgid ""
12256
"automatic_tag_name\n"
12257
"~~~~~~~~~~~~~~~~~~"
12258
msgstr ""
12259
12260
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12261
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
12262
msgid "Introduced in: 2.2"
12263
msgstr ""
12264
12265
#: en/help_topics/hooks.txt:40
12266
msgid ""
12267
"Called to determine an automatic tag name for a revision.\n"
12268
"automatic_tag_name is called with (branch, revision_id) and should\n"
12269
"return a tag name or None if no tag name could be determined. The\n"
12270
"first non-None tag name returned will be used."
12271
msgstr ""
12272
12273
#: en/help_topics/hooks.txt:45
12274
msgid ""
12275
"open\n"
12276
"~~~~"
12277
msgstr ""
12278
12279
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
12280
#: en/help_topics/hooks.txt:304
12281
msgid "Introduced in: 1.8"
12282
msgstr ""
12283
12284
#: en/help_topics/hooks.txt:50
12285
msgid ""
12286
"Called with the Branch object that has been opened after a branch is\n"
12287
"opened."
12288
msgstr ""
12289
12290
#: en/help_topics/hooks.txt:53
12291
msgid ""
12292
"post_branch_init\n"
12293
"~~~~~~~~~~~~~~~~"
12294
msgstr ""
12295
12296
#: en/help_topics/hooks.txt:58
12297
msgid ""
12298
"Called after new branch initialization completes. post_branch_init is\n"
12299
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12300
"branch and checkout (both heavyweight and lightweight) will all\n"
12301
"trigger this hook."
12302
msgstr ""
12303
12304
#: en/help_topics/hooks.txt:63
12305
msgid ""
12306
"post_change_branch_tip\n"
12307
"~~~~~~~~~~~~~~~~~~~~~~"
12308
msgstr ""
12309
12310
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
12311
msgid "Introduced in: 1.4"
12312
msgstr ""
12313
12314
#: en/help_topics/hooks.txt:68
12315
msgid ""
12316
"Called in bzr client and server after a change to the tip of a branch\n"
12317
"is made. post_change_branch_tip is called with a\n"
12318
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12319
"uncommit will all trigger this hook."
12320
msgstr ""
12321
12322
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12323
msgid ""
12324
"post_commit\n"
12325
"~~~~~~~~~~~"
12326
msgstr ""
12327
12328
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12329
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12330
#: en/help_topics/hooks.txt:145
12331
msgid "Introduced in: 0.15"
12332
msgstr ""
12333
12334
#: en/help_topics/hooks.txt:78
12335
msgid ""
12336
"Called in the bzr client after a commit has completed. post_commit is\n"
12337
"called with (local, master, old_revno, old_revid, new_revno,\n"
12338
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12339
"branch."
12340
msgstr ""
12341
12342
#: en/help_topics/hooks.txt:83
12343
msgid ""
12344
"post_pull\n"
12345
"~~~~~~~~~"
12346
msgstr ""
12347
12348
#: en/help_topics/hooks.txt:88
12349
msgid ""
12350
"Called after a pull operation completes. post_pull is called with a\n"
12351
"bzrlib.branch.PullResult object and only runs in the bzr client."
12352
msgstr ""
12353
12354
#: en/help_topics/hooks.txt:91
12355
msgid ""
12356
"post_push\n"
12357
"~~~~~~~~~"
12358
msgstr ""
12359
12360
#: en/help_topics/hooks.txt:96
12361
msgid ""
12362
"Called after a push operation completes. post_push is called with a\n"
12363
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12364
msgstr ""
12365
12366
#: en/help_topics/hooks.txt:99
12367
msgid ""
12368
"post_switch\n"
12369
"~~~~~~~~~~~"
12370
msgstr ""
12371
12372
#: en/help_topics/hooks.txt:104
12373
msgid ""
12374
"Called after a checkout switches branch. post_switch is called with a\n"
12375
"bzrlib.branch.SwitchHookParams."
12376
msgstr ""
12377
12378
#: en/help_topics/hooks.txt:107
12379
msgid ""
12380
"post_uncommit\n"
12381
"~~~~~~~~~~~~~"
12382
msgstr ""
12383
12384
#: en/help_topics/hooks.txt:112
12385
msgid ""
12386
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12387
"called with (local, master, old_revno, old_revid, new_revno,\n"
12388
"new_revid) where local is the local branch or None, master is the\n"
12389
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12390
"of None."
12391
msgstr ""
12392
12393
#: en/help_topics/hooks.txt:118
12394
msgid ""
12395
"pre_change_branch_tip\n"
12396
"~~~~~~~~~~~~~~~~~~~~~"
12397
msgstr ""
12398
12399
#: en/help_topics/hooks.txt:121
12400
msgid "Introduced in: 1.6"
12401
msgstr ""
12402
12403
#: en/help_topics/hooks.txt:123
12404
msgid ""
12405
"Called in bzr client and server before a change to the tip of a branch\n"
12406
"is made. pre_change_branch_tip is called with a\n"
12407
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12408
"uncommit will all trigger this hook."
12409
msgstr ""
12410
12411
#: en/help_topics/hooks.txt:128
12412
msgid ""
12413
"pre_commit\n"
12414
"~~~~~~~~~~"
12415
msgstr ""
12416
12417
#: en/help_topics/hooks.txt:131
12418
msgid "Introduced in: 0.91"
12419
msgstr ""
12420
12421
#: en/help_topics/hooks.txt:133
12422
msgid ""
12423
"Called after a commit is calculated but before it is completed.\n"
12424
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12425
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12426
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12427
"TreeDelta object describing changes from the basis revision. hooks\n"
12428
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12429
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12430
"tree."
12431
msgstr ""
12432
12433
#: en/help_topics/hooks.txt:142
12434
msgid ""
12435
"set_rh\n"
12436
"~~~~~~"
12437
msgstr ""
12438
12439
#: en/help_topics/hooks.txt:147
12440
msgid ""
12441
"Invoked whenever the revision history has been set via\n"
12442
"set_revision_history. The api signature is (branch, revision_history),\n"
12443
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12444
"for bzr to trigger, a better hook to use is\n"
12445
"Branch.post_change_branch_tip."
12446
msgstr ""
12447
12448
#: en/help_topics/hooks.txt:153
12449
msgid ""
12450
"transform_fallback_location\n"
12451
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12452
msgstr ""
12453
12454
#: en/help_topics/hooks.txt:156
12455
msgid "Introduced in: 1.9"
12456
msgstr ""
12457
12458
#: en/help_topics/hooks.txt:158
12459
msgid ""
12460
"Called when a stacked branch is activating its fallback locations.\n"
12461
"transform_fallback_location is called with (branch, url), and should\n"
12462
"return a new url. Returning the same url allows it to be used as-is,\n"
12463
"returning a different one can be used to cause the branch to stack on\n"
12464
"a closer copy of that fallback_location. Note that the branch cannot\n"
12465
"have history accessing methods called on it during this hook because\n"
12466
"the fallback locations have not been activated. When there are\n"
12467
"multiple hooks installed for transform_fallback_location, all are\n"
12468
"called with the url returned from the previous hook.The order is\n"
12469
"however undefined."
12470
msgstr ""
12471
12472
#: en/help_topics/hooks.txt:169
12473
msgid ""
12474
"CommandHooks\n"
12475
"------------"
12476
msgstr ""
12477
12478
#: en/help_topics/hooks.txt:172
12479
msgid ""
12480
"extend_command\n"
12481
"~~~~~~~~~~~~~~"
12482
msgstr ""
12483
12484
#: en/help_topics/hooks.txt:175
12485
msgid "Introduced in: 1.13"
12486
msgstr ""
12487
12488
#: en/help_topics/hooks.txt:177
12489
msgid ""
12490
"Called after creating a command object to allow modifications such as\n"
12491
"adding or removing options, docs etc. Called with the new\n"
12492
"bzrlib.commands.Command object."
12493
msgstr ""
12494
12495
#: en/help_topics/hooks.txt:181
12496
msgid ""
12497
"get_command\n"
12498
"~~~~~~~~~~~"
12499
msgstr ""
12500
12501
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12502
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12503
msgid "Introduced in: 1.17"
12504
msgstr ""
12505
12506
#: en/help_topics/hooks.txt:186
12507
msgid ""
12508
"Called when creating a single command. Called with (cmd_or_None,\n"
12509
"command_name). get_command should either return the cmd_or_None\n"
12510
"parameter, or a replacement Command object that should be used for the\n"
12511
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12512
"Many users will prefer to use bzrlib.commands.register_command or\n"
12513
"plugin_cmds.register_lazy."
12514
msgstr ""
12515
12516
#: en/help_topics/hooks.txt:193
12517
msgid ""
12518
"get_missing_command\n"
12519
"~~~~~~~~~~~~~~~~~~~"
12520
msgstr ""
12521
12522
#: en/help_topics/hooks.txt:198
12523
msgid ""
12524
"Called when creating a single command if no command could be found.\n"
12525
"Called with (command_name). get_missing_command should either return\n"
12526
"None, or a Command object to be used for the command."
12527
msgstr ""
12528
12529
#: en/help_topics/hooks.txt:202
12530
msgid ""
12531
"list_commands\n"
12532
"~~~~~~~~~~~~~"
12533
msgstr ""
12534
12535
#: en/help_topics/hooks.txt:207
12536
msgid ""
12537
"Called when enumerating commands. Called with a set of cmd_name\n"
12538
"strings for all the commands found so far. This set is safe to mutate\n"
12539
"- e.g. to remove a command. list_commands should return the updated\n"
12540
"set of command names."
12541
msgstr ""
12542
12543
#: en/help_topics/hooks.txt:212
12544
msgid ""
12545
"_ConfigHooks\n"
12546
"------------"
12547
msgstr ""
12548
12549
#: en/help_topics/hooks.txt:215
12550
msgid ""
12551
"get\n"
12552
"~~~"
12553
msgstr ""
12554
12555
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12556
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12557
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12558
#: en/help_topics/hooks.txt:443
12559
msgid "Introduced in: 2.4"
12560
msgstr ""
12561
12562
#: en/help_topics/hooks.txt:220
12563
msgid ""
12564
"Invoked when a config option is read. The signature is (stack, name,\n"
12565
"value)."
12566
msgstr ""
12567
12568
#: en/help_topics/hooks.txt:223
12569
msgid ""
12570
"load\n"
12571
"~~~~"
12572
msgstr ""
12573
12574
#: en/help_topics/hooks.txt:228
12575
msgid "Invoked when a config store is loaded. The signature is (store)."
12576
msgstr ""
12577
12578
#: en/help_topics/hooks.txt:230
12579
msgid ""
12580
"remove\n"
12581
"~~~~~~"
12582
msgstr ""
12583
12584
#: en/help_topics/hooks.txt:235
12585
msgid ""
12586
"Invoked when a config option is removed. The signature is (stack,\n"
12587
"name)."
12588
msgstr ""
12589
12590
#: en/help_topics/hooks.txt:238
12591
msgid ""
12592
"save\n"
12593
"~~~~"
12594
msgstr ""
12595
12596
#: en/help_topics/hooks.txt:243
12597
msgid "Invoked when a config store is saved. The signature is (store)."
12598
msgstr ""
12599
12600
#: en/help_topics/hooks.txt:245
12601
msgid ""
12602
"set\n"
12603
"~~~"
12604
msgstr ""
12605
12606
#: en/help_topics/hooks.txt:250
12607
msgid ""
12608
"Invoked when a config option is set. The signature is (stack, name,\n"
12609
"value)."
12610
msgstr ""
12611
12612
#: en/help_topics/hooks.txt:253
12613
msgid ""
12614
"ControlDirHooks\n"
12615
"---------------"
12616
msgstr ""
12617
12618
#: en/help_topics/hooks.txt:256
12619
msgid ""
12620
"post_repo_init\n"
12621
"~~~~~~~~~~~~~~"
12622
msgstr ""
12623
12624
#: en/help_topics/hooks.txt:261
12625
msgid ""
12626
"Invoked after a repository has been initialized. post_repo_init is\n"
12627
"called with a bzrlib.controldir.RepoInitHookParams."
12628
msgstr ""
12629
12630
#: en/help_topics/hooks.txt:264
12631
msgid ""
12632
"pre_open\n"
12633
"~~~~~~~~"
12634
msgstr ""
12635
12636
#: en/help_topics/hooks.txt:267
12637
msgid "Introduced in: 1.14"
12638
msgstr ""
12639
12640
#: en/help_topics/hooks.txt:269
12641
msgid ""
12642
"Invoked before attempting to open a ControlDir with the transport that\n"
12643
"the open will use."
12644
msgstr ""
12645
12646
#: en/help_topics/hooks.txt:272
12647
msgid ""
12648
"InfoHooks\n"
12649
"---------"
12650
msgstr ""
12651
12652
#: en/help_topics/hooks.txt:275
12653
msgid ""
12654
"repository\n"
12655
"~~~~~~~~~~"
12656
msgstr ""
12657
12658
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12659
#: en/help_topics/hooks.txt:521
12660
msgid "Introduced in: 1.15"
12661
msgstr ""
12662
12663
#: en/help_topics/hooks.txt:280
12664
msgid ""
12665
"Invoked when displaying the statistics for a repository. repository is\n"
12666
"called with a statistics dictionary as returned by the repository and\n"
12667
"a file-like object to write to."
12668
msgstr ""
12669
12670
#: en/help_topics/hooks.txt:284
12671
msgid ""
12672
"LockHooks\n"
12673
"---------"
12674
msgstr ""
12675
12676
#: en/help_topics/hooks.txt:287
12677
msgid ""
12678
"lock_acquired\n"
12679
"~~~~~~~~~~~~~"
12680
msgstr ""
12681
12682
#: en/help_topics/hooks.txt:292
12683
msgid ""
12684
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12685
msgstr ""
12686
12687
#: en/help_topics/hooks.txt:294
12688
msgid ""
12689
"lock_broken\n"
12690
"~~~~~~~~~~~"
12691
msgstr ""
12692
12693
#: en/help_topics/hooks.txt:299
12694
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12695
msgstr ""
12696
12697
#: en/help_topics/hooks.txt:301
12698
msgid ""
12699
"lock_released\n"
12700
"~~~~~~~~~~~~~"
12701
msgstr ""
12702
12703
#: en/help_topics/hooks.txt:306
12704
msgid ""
12705
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12706
msgstr ""
12707
12708
#: en/help_topics/hooks.txt:308
12709
msgid ""
12710
"MergeHooks\n"
12711
"----------"
12712
msgstr ""
12713
12714
#: en/help_topics/hooks.txt:311
12715
msgid ""
12716
"merge_file_content\n"
12717
"~~~~~~~~~~~~~~~~~~"
12718
msgstr ""
12719
12720
#: en/help_topics/hooks.txt:314
12721
msgid "Introduced in: 2.1"
12722
msgstr ""
12723
12724
#: en/help_topics/hooks.txt:316
12725
msgid ""
12726
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12727
"object when starting a merge. Should return either None or a subclass\n"
12728
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12729
"called per file that needs to be merged (including when one side has\n"
12730
"deleted the file and the other has changed it). See the\n"
12731
"AbstractPerFileMerger API docs for details on how it is used by merge."
12732
msgstr ""
12733
12734
#: en/help_topics/hooks.txt:323
12735
msgid ""
12736
"post_merge\n"
12737
"~~~~~~~~~~"
12738
msgstr ""
12739
12740
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12741
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12742
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12743
msgid "Introduced in: 2.5"
12744
msgstr ""
12745
12746
#: en/help_topics/hooks.txt:328
12747
msgid ""
12748
"Called after a merge. Receives a Merger object as the single argument.\n"
12749
"The return value is ignored."
12750
msgstr ""
12751
12752
#: en/help_topics/hooks.txt:331
12753
msgid ""
12754
"pre_merge\n"
12755
"~~~~~~~~~"
12756
msgstr ""
12757
12758
#: en/help_topics/hooks.txt:336
12759
msgid ""
12760
"Called before a merge. Receives a Merger object as the single\n"
12761
"argument."
12762
msgstr ""
12763
12764
#: en/help_topics/hooks.txt:339
12765
msgid ""
12766
"MergeDirectiveHooks\n"
12767
"-------------------"
12768
msgstr ""
12769
12770
#: en/help_topics/hooks.txt:342
12771
msgid ""
12772
"merge_request_body\n"
12773
"~~~~~~~~~~~~~~~~~~"
12774
msgstr ""
12775
12776
#: en/help_topics/hooks.txt:345
12777
msgid "Introduced in: 1.15.0"
12778
msgstr ""
12779
12780
#: en/help_topics/hooks.txt:347
12781
msgid ""
12782
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12783
"request. Callbacks must return a body. If more than one callback is\n"
12784
"registered, the output of one callback is provided to the next."
12785
msgstr ""
12786
12787
#: en/help_topics/hooks.txt:351
12788
msgid ""
12789
"MessageEditorHooks\n"
12790
"------------------"
12791
msgstr ""
12792
12793
#: en/help_topics/hooks.txt:354
12794
msgid ""
12795
"commit_message_template\n"
12796
"~~~~~~~~~~~~~~~~~~~~~~~"
12797
msgstr ""
12798
12799
#: en/help_topics/hooks.txt:357
12800
msgid "Introduced in: 1.10"
12801
msgstr ""
12802
12803
#: en/help_topics/hooks.txt:359
12804
msgid ""
12805
"Called when a commit message is being generated.\n"
12806
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12807
"and the message that is known so far. commit_message_template must\n"
12808
"return a new message to use (which could be the same as it was given).\n"
12809
"When there are multiple hooks registered for commit_message_template,\n"
12810
"they are chained with the result from the first passed into the\n"
12811
"second, and so on."
12812
msgstr ""
12813
12814
#: en/help_topics/hooks.txt:367
12815
msgid ""
12816
"set_commit_message\n"
12817
"~~~~~~~~~~~~~~~~~~"
12818
msgstr ""
12819
12820
#: en/help_topics/hooks.txt:372
12821
msgid ""
12822
"Set a fixed commit message. set_commit_message is called with the\n"
12823
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12824
"properties by editing commit.builder._revprops) and the message so\n"
12825
"far. set_commit_message must return the message to use or None if it\n"
12826
"should use the message editor as normal."
12827
msgstr ""
12828
12829
#: en/help_topics/hooks.txt:378
12830
msgid ""
12831
"MutableTreeHooks\n"
12832
"----------------"
12833
msgstr ""
12834
12835
#: en/help_topics/hooks.txt:381
12836
msgid ""
12837
"post_build_tree\n"
12838
"~~~~~~~~~~~~~~~"
12839
msgstr ""
12840
12841
#: en/help_topics/hooks.txt:386
12842
msgid ""
12843
"Called after a completely new tree is built. The hook is called with\n"
12844
"the tree as its only argument."
12845
msgstr ""
12846
12847
#: en/help_topics/hooks.txt:392
12848
msgid "Introduced in: 2.0"
12849
msgstr ""
12850
12851
#: en/help_topics/hooks.txt:394
12852
msgid ""
12853
"Called after a commit is performed on a tree. The hook is called with\n"
12854
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12855
"commit was performed on is available via the mutable_tree attribute of\n"
12856
"that object."
12857
msgstr ""
12858
12859
#: en/help_topics/hooks.txt:399
12860
msgid ""
12861
"post_transform\n"
12862
"~~~~~~~~~~~~~~"
12863
msgstr ""
12864
12865
#: en/help_topics/hooks.txt:404
12866
msgid ""
12867
"Called after a tree transform has been performed on a tree. The hook\n"
12868
"is called with the tree that is being transformed and the transform."
12869
msgstr ""
12870
12871
#: en/help_topics/hooks.txt:407
12872
msgid ""
12873
"pre_transform\n"
12874
"~~~~~~~~~~~~~"
12875
msgstr ""
12876
12877
#: en/help_topics/hooks.txt:412
12878
msgid ""
12879
"Called before a tree transform on this tree. The hook is called with\n"
12880
"the tree that is being transformed and the transform."
12881
msgstr ""
12882
12883
#: en/help_topics/hooks.txt:415
12884
msgid ""
12885
"start_commit\n"
12886
"~~~~~~~~~~~~"
12887
msgstr ""
12888
12889
#: en/help_topics/hooks.txt:420
12890
msgid ""
12891
"Called before a commit is performed on a tree. The start commit hook\n"
12892
"is able to change the tree before the commit takes place. start_commit\n"
12893
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12894
"being performed on."
12895
msgstr ""
12896
12897
#: en/help_topics/hooks.txt:425
12898
msgid ""
12899
"SmartClientHooks\n"
12900
"----------------"
12901
msgstr ""
12902
12903
#: en/help_topics/hooks.txt:428
12904
msgid ""
12905
"call\n"
12906
"~~~~"
12907
msgstr ""
12908
12909
#: en/help_topics/hooks.txt:431
12910
msgid "Introduced in: unknown"
12911
msgstr ""
12912
12913
#: en/help_topics/hooks.txt:433
12914
msgid ""
12915
"Called when the smart client is submitting a request to the smart\n"
12916
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12917
"Streaming request bodies, and responses, are not accessible."
12918
msgstr ""
12919
12920
#: en/help_topics/hooks.txt:437
12921
msgid ""
12922
"SmartServerHooks\n"
12923
"----------------"
12924
msgstr ""
12925
12926
#: en/help_topics/hooks.txt:440
12927
msgid ""
12928
"server_exception\n"
12929
"~~~~~~~~~~~~~~~~"
12930
msgstr ""
12931
12932
#: en/help_topics/hooks.txt:445
12933
msgid ""
12934
"Called by the bzr server when an exception occurs. server_exception is\n"
12935
"called with the sys.exc_info() tuple return true for the hook if the\n"
12936
"exception has been handled, in which case the server will exit\n"
12937
"normally."
12938
msgstr ""
12939
12940
#: en/help_topics/hooks.txt:450
12941
msgid ""
12942
"server_started\n"
12943
"~~~~~~~~~~~~~~"
12944
msgstr ""
12945
12946
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12947
msgid "Introduced in: 0.16"
12948
msgstr ""
12949
12950
#: en/help_topics/hooks.txt:455
12951
msgid ""
12952
"Called by the bzr server when it starts serving a directory.\n"
12953
"server_started is called with (backing urls, public url), where\n"
12954
"backing_url is a list of URLs giving the server-specific directory\n"
12955
"locations, and public_url is the public URL for the directory being\n"
12956
"served."
12957
msgstr ""
12958
12959
#: en/help_topics/hooks.txt:461
12960
msgid ""
12961
"server_started_ex\n"
12962
"~~~~~~~~~~~~~~~~~"
12963
msgstr ""
12964
12965
#: en/help_topics/hooks.txt:466
12966
msgid ""
12967
"Called by the bzr server when it starts serving a directory.\n"
12968
"server_started is called with (backing_urls, server_obj)."
12969
msgstr ""
12970
12971
#: en/help_topics/hooks.txt:469
12972
msgid ""
12973
"server_stopped\n"
12974
"~~~~~~~~~~~~~~"
12975
msgstr ""
12976
12977
#: en/help_topics/hooks.txt:474
12978
msgid ""
12979
"Called by the bzr server when it stops serving a directory.\n"
12980
"server_stopped is called with the same parameters as the\n"
12981
"server_started hook: (backing_urls, public_url)."
12982
msgstr ""
12983
12984
#: en/help_topics/hooks.txt:478
12985
msgid ""
12986
"StatusHooks\n"
12987
"-----------"
12988
msgstr ""
12989
12990
#: en/help_topics/hooks.txt:481
12991
msgid ""
12992
"post_status\n"
12993
"~~~~~~~~~~~"
12994
msgstr ""
12995
12996
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12997
msgid "Introduced in: 2.3"
12998
msgstr ""
12999
13000
#: en/help_topics/hooks.txt:486
13001
msgid ""
13002
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13003
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13004
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13005
"correspond to the command line options specified by the user for the\n"
13006
"status command. to_file is the output stream for writing."
13007
msgstr ""
13008
13009
#: en/help_topics/hooks.txt:492
13010
msgid ""
13011
"pre_status\n"
13012
"~~~~~~~~~~"
13013
msgstr ""
13014
13015
#: en/help_topics/hooks.txt:497
13016
msgid ""
13017
"Called with argument StatusHookParams before Bazaar displays the\n"
13018
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13019
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
13020
"correspond to the command line options specified by the user for the\n"
13021
"status command. to_file is the output stream for writing."
13022
msgstr ""
13023
13024
#: en/help_topics/hooks.txt:503
13025
msgid ""
13026
"TransportHooks\n"
13027
"--------------"
13028
msgstr ""
13029
13030
#: en/help_topics/hooks.txt:506
13031
msgid ""
13032
"post_connect\n"
13033
"~~~~~~~~~~~~"
13034
msgstr ""
13035
13036
#: en/help_topics/hooks.txt:511
13037
msgid ""
13038
"Called after a new connection is established or a reconnect occurs.\n"
13039
"The sole argument passed is either the connected transport or smart\n"
13040
"medium instance."
13041
msgstr ""
13042
13043
#: en/help_topics/hooks.txt:515
13044
msgid ""
13045
"RioVersionInfoBuilderHooks\n"
13046
"--------------------------"
13047
msgstr ""
13048
13049
#: en/help_topics/hooks.txt:518
13050
msgid ""
13051
"revision\n"
13052
"~~~~~~~~"
13053
msgstr ""
13054
13055
#: en/help_topics/hooks.txt:523
13056
msgid ""
13057
"Invoked when adding information about a revision to the RIO stanza\n"
13058
"that is printed. revision is called with a revision object and a RIO\n"
13059
"stanza.\n"
13060
msgstr ""
13061
13062
#: en/help_topics/location-alias.txt:1
13063
msgid ""
13064
"Location aliases\n"
13065
"================"
13066
msgstr ""
13067
13068
#: en/help_topics/location-alias.txt:4
13069
msgid ""
13070
"Bazaar defines several aliases for locations associated with a branch. "
13071
"These\n"
13072
"can be used with most commands that expect a location, such as `bzr push`."
13073
msgstr ""
13074
13075
#: en/help_topics/location-alias.txt:7
13076
msgid "The aliases are::"
13077
msgstr ""
13078
13079
#: en/help_topics/location-alias.txt:9
13080
msgid ""
13081
" :bound The branch this branch is bound to, for bound branches.\n"
13082
" :parent The parent of this branch.\n"
13083
" :public The public location of this branch.\n"
13084
" :push The saved location used for `bzr push` with no arguments.\n"
13085
" :submit The submit branch for this branch.\n"
13086
" :this This branch."
13087
msgstr ""
13088
13089
#: en/help_topics/location-alias.txt:16
13090
msgid "For example, to push to the parent location::"
13091
msgstr ""
13092
13093
#: en/help_topics/location-alias.txt:18
13094
msgid " bzr push :parent\n"
13095
msgstr ""
13096
13097
#: en/help_topics/log-formats.txt:1
13098
msgid ""
13099
"Log Formats\n"
13100
"==========="
13101
msgstr ""
13102
13103
#: en/help_topics/log-formats.txt:4
13104
msgid ""
13105
"A log format controls how information about each revision is displayed.\n"
13106
"The standard log formats are compared below::"
13107
msgstr ""
13108
13109
#: en/help_topics/log-formats.txt:7
13110
msgid ""
13111
" Feature long short line\n"
13112
" ---------------------- ------------- ------------ -------------------\n"
13113
" design goal detailed view concise view 1 revision per line\n"
13114
" committer name+email name only name only\n"
13115
" author name+email - -\n"
13116
" date-time format full date only date only\n"
13117
" commit message full full top line\n"
13118
" tags yes yes yes\n"
13119
" merges indicator - yes -\n"
13120
" status/delta optional optional -\n"
13121
" diff/patch optional optional -\n"
13122
" revision-id optional optional -\n"
13123
" branch nick yes - -\n"
13124
" foreign vcs properties yes yes -\n"
13125
" preferred levels all 1 1\n"
13126
" digital signature optional - -"
13127
msgstr ""
13128
13129
#: en/help_topics/log-formats.txt:24
13130
msgid ""
13131
"The default format is ``long``. To change this, define the ``log_format``\n"
13132
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
13133
msgstr ""
13134
13135
#: en/help_topics/log-formats.txt:27
13136
msgid ""
13137
" [DEFAULT]\n"
13138
" log_format = short"
13139
msgstr ""
13140
13141
#: en/help_topics/log-formats.txt:30
13142
msgid ""
13143
"Alternatively, to change the log format used for a given query, use the\n"
13144
"--long, --short or --line options."
13145
msgstr ""
13146
13147
#: en/help_topics/log-formats.txt:33
13148
msgid ""
13149
"If one of the standard log formats does not meet your needs, additional\n"
13150
"formats can be provided by plugins.\n"
13151
msgstr ""
13152
13153
#: en/help_topics/other-formats.txt:1
13154
msgid "Other Storage Formats"
13155
msgstr ""
13156
13157
#: en/help_topics/other-formats.txt:3
13158
msgid "Experimental formats are shown below."
13159
msgstr ""
13160
13161
#: en/help_topics/other-formats.txt:5
13162
msgid ""
13163
":development-colo:\n"
13164
" (native) The 2a format with experimental support for colocated\n"
13165
" branches."
13166
msgstr ""
13167
13168
#: en/help_topics/other-formats.txt:9
13169
msgid ""
13170
"\n"
13171
"Deprecated formats are shown below."
13172
msgstr ""
13173
13174
#: en/help_topics/other-formats.txt:12
13175
msgid ""
13176
":pack-0.92:\n"
13177
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
13178
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
13179
" by bzr < 0.92."
13180
msgstr ""
13181
13182
#: en/help_topics/patterns.txt:1
13183
msgid ""
13184
"Patterns\n"
13185
"========"
13186
msgstr ""
13187
13188
#: en/help_topics/patterns.txt:4
13189
msgid ""
13190
"Bazaar uses patterns to match files at various times. For example,\n"
13191
"the ``add`` command skips over files that match ignore patterns\n"
13192
"and preferences can be associated with files using rule patterns.\n"
13193
"The pattern syntax is described below."
13194
msgstr ""
13195
13196
#: en/help_topics/patterns.txt:9
13197
msgid ""
13198
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13199
"slash or is a regular expression, it is compared to the whole path\n"
13200
"from the branch root. Otherwise, it is compared to only the last\n"
13201
"component of the path. To match a file only in the root directory,\n"
13202
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13203
msgstr ""
13204
13205
#: en/help_topics/patterns.txt:15
13206
msgid "Patterns may include globbing wildcards such as::"
13207
msgstr ""
13208
13209
#: en/help_topics/patterns.txt:17
13210
msgid ""
13211
" ? - Matches any single character except '/'\n"
13212
" * - Matches 0 or more characters except '/'\n"
13213
" /**/ - Matches 0 or more directories in a path\n"
13214
" [a-z] - Matches a single character from within a group of characters"
13215
msgstr ""
13216
13217
#: en/help_topics/patterns.txt:22
13218
msgid ""
13219
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13220
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13221
"expression. Regular expression patterns may not include named or\n"
13222
"numbered groups."
13223
msgstr ""
13224
13225
#: en/help_topics/patterns.txt:27
13226
msgid ""
13227
"Case insensitive ignore patterns can be specified with regular expressions\n"
13228
"by using the ``i`` (for ignore case) flag in the pattern."
13229
msgstr ""
13230
13231
#: en/help_topics/patterns.txt:30
13232
msgid ""
13233
"For example, a case insensitive match for ``foo`` may be specified as::"
13234
msgstr ""
13235
13236
#: en/help_topics/patterns.txt:32
13237
msgid " RE:(?i)foo"
13238
msgstr ""
13239
13240
#: en/help_topics/patterns.txt:34
13241
msgid ""
13242
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13243
"matched by that pattern will not be ignored."
13244
msgstr ""
13245
13246
#: en/help_topics/patterns.txt:37
13247
msgid ""
13248
".. _Python regular expressions: http://docs.python.org/library/re.html"
13249
msgstr ""
13250
13251
#: en/help_topics/revisionspec.txt:1
13252
msgid "Revision Identifiers"
13253
msgstr ""
13254
13255
#: en/help_topics/revisionspec.txt:3
13256
msgid ""
13257
"A revision identifier refers to a specific state of a branch's history. It\n"
13258
"can be expressed in several ways. It can begin with a keyword to\n"
13259
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13260
"'before:yesterday' and 'submit:'."
13261
msgstr ""
13262
13263
#: en/help_topics/revisionspec.txt:8
13264
msgid ""
13265
"Alternately, it can be given without a keyword, in which case it will be\n"
13266
"checked as a revision number, a tag, a revision id, a date specification, or "
13267
"a\n"
13268
"branch specification, in that order. For example, 'date:today' could be\n"
13269
"written as simply 'today', though if you have a tag called 'today' that "
13270
"will\n"
13271
"be found first."
13272
msgstr ""
13273
13274
#: en/help_topics/revisionspec.txt:14
13275
msgid ""
13276
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13277
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13278
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13279
"or\n"
13280
"spaces around the '..')."
13281
msgstr ""
13282
13283
#: en/help_topics/revisionspec.txt:19
13284
msgid ""
13285
"Ranges are interpreted differently by different commands. To the \"log\" "
13286
"command,\n"
13287
"a range is a sequence of log messages, but to the \"diff\" command, the "
13288
"range\n"
13289
"denotes a change between revisions (and not a sequence of changes). In\n"
13290
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13291
"consider it\n"
13292
"to be open-ended, that is, they include one end but not the other. For "
13293
"example:\n"
13294
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13295
"3649,\n"
13296
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13297
"and\n"
13298
"3649, but not 3647."
13299
msgstr ""
13300
13301
#: en/help_topics/revisionspec.txt:28
13302
msgid "The keywords used as revision selection methods are the following:"
13303
msgstr ""
13304
13305
#: en/help_topics/revisionspec.txt:30
13306
msgid ""
13307
":revid:\n"
13308
"\tSelects a revision using the revision id.\n"
13309
":submit:\n"
13310
"\tSelects a common ancestor with the submit branch.\n"
13311
":ancestor:\n"
13312
"\tSelects a common ancestor with a second branch.\n"
13313
":date:\n"
13314
"\tSelects a revision on the basis of a datestamp.\n"
13315
":branch:\n"
13316
"\tSelects the last revision of a specified branch.\n"
13317
":tag:\n"
13318
"\tSelects a revision identified by a tag name.\n"
13319
":revno:\n"
13320
"\tSelects a revision using a number.\n"
13321
":before:\n"
13322
"\tSelects the parent of the revision specified.\n"
13323
":annotate:\n"
13324
"\tSelect the revision that last modified the specified line.\n"
13325
":mainline:\n"
13326
"\tSelect mainline revision that merged the specified revision.\n"
13327
":last:\n"
13328
"\tSelects the nth revision from the end."
13329
msgstr ""
13330
13331
#: en/help_topics/revisionspec.txt:53
13332
msgid "In addition, plugins can provide other keywords."
13333
msgstr ""
13334
13335
#: en/help_topics/revisionspec.txt:55
13336
msgid "A detailed description of each keyword is given below."
13337
msgstr ""
13338
13339
#: en/help_topics/revisionspec.txt:57
13340
msgid ":revid:"
13341
msgstr ""
13342
13343
#: en/help_topics/revisionspec.txt:59
13344
msgid ""
13345
" Supply a specific revision id, that can be used to specify any\n"
13346
" revision id in the ancestry of the branch.\n"
13347
" Including merges, and pending merges.\n"
13348
" Examples::"
13349
msgstr ""
13350
13351
#: en/help_topics/revisionspec.txt:64
13352
msgid ""
13353
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13354
msgstr ""
13355
13356
#: en/help_topics/revisionspec.txt:66
13357
msgid ":submit:"
13358
msgstr ""
13359
13360
#: en/help_topics/revisionspec.txt:68
13361
msgid ""
13362
" Diffing against this shows all the changes that were made in this "
13363
"branch,\n"
13364
" and is a good predictor of what merge will do. The submit branch is\n"
13365
" used by the bundle and merge directive commands. If no submit branch\n"
13366
" is specified, the parent branch is used instead."
13367
msgstr ""
13368
13369
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13370
msgid ""
13371
" The common ancestor is the last revision that existed in both\n"
13372
" branches. Usually this is the branch point, but it could also be\n"
13373
" a revision that was merged."
13374
msgstr ""
13375
13376
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13377
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13378
#: en/help_topics/revisionspec.txt:153
13379
msgid " Examples::"
13380
msgstr ""
13381
13382
#: en/help_topics/revisionspec.txt:79
13383
msgid " $ bzr diff -r submit:"
13384
msgstr ""
13385
13386
#: en/help_topics/revisionspec.txt:81
13387
msgid ":ancestor:"
13388
msgstr ""
13389
13390
#: en/help_topics/revisionspec.txt:83
13391
msgid " Supply the path to a branch to select the common ancestor."
13392
msgstr ""
13393
13394
#: en/help_topics/revisionspec.txt:89
13395
msgid ""
13396
" This is frequently used with 'diff' to return all of the changes\n"
13397
" that your branch introduces, while excluding the changes that you\n"
13398
" have not merged from the remote branch."
13399
msgstr ""
13400
13401
#: en/help_topics/revisionspec.txt:95
13402
msgid ""
13403
" ancestor:/path/to/branch\n"
13404
" $ bzr diff -r ancestor:../../mainline/branch"
13405
msgstr ""
13406
13407
#: en/help_topics/revisionspec.txt:98
13408
msgid ":date:"
13409
msgstr ""
13410
13411
#: en/help_topics/revisionspec.txt:100
13412
msgid ""
13413
" Supply a datestamp to select the first revision that matches the date.\n"
13414
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13415
" Matches the first entry after a given date (either at midnight or\n"
13416
" at a specified time)."
13417
msgstr ""
13418
13419
#: en/help_topics/revisionspec.txt:105
13420
msgid " One way to display all the changes since yesterday would be::"
13421
msgstr ""
13422
13423
#: en/help_topics/revisionspec.txt:107
13424
msgid " bzr log -r date:yesterday.."
13425
msgstr ""
13426
13427
#: en/help_topics/revisionspec.txt:111
13428
msgid ""
13429
" date:yesterday -> select the first revision since "
13430
"yesterday\n"
13431
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13432
" August 14th, 2006 at 5:10pm."
13433
msgstr ""
13434
13435
#: en/help_topics/revisionspec.txt:115
13436
msgid ":branch:"
13437
msgstr ""
13438
13439
#: en/help_topics/revisionspec.txt:117
13440
msgid " Supply the path to a branch to select its last revision."
13441
msgstr ""
13442
13443
#: en/help_topics/revisionspec.txt:121
13444
msgid " branch:/path/to/branch"
13445
msgstr ""
13446
13447
#: en/help_topics/revisionspec.txt:123
13448
msgid ":tag:"
13449
msgstr ""
13450
13451
#: en/help_topics/revisionspec.txt:125
13452
msgid " Tags are stored in the branch and created by the 'tag' command."
13453
msgstr ""
13454
13455
#: en/help_topics/revisionspec.txt:127
13456
msgid ":revno:"
13457
msgstr ""
13458
13459
#: en/help_topics/revisionspec.txt:129
13460
msgid ""
13461
" Use an integer to specify a revision in the history of the branch.\n"
13462
" Optionally a branch can be specified. A negative number will count\n"
13463
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13464
" one). If the negative number is larger than the branch's history, the\n"
13465
" first revision is returned.\n"
13466
" Examples::"
13467
msgstr ""
13468
13469
#: en/help_topics/revisionspec.txt:136
13470
msgid ""
13471
" revno:1 -> return the first revision of this branch\n"
13472
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13473
" the branch '/path/to/branch'\n"
13474
" revno:-1 -> The last revision in a branch.\n"
13475
" -2:http://other/branch -> The second to last revision in the\n"
13476
" remote branch.\n"
13477
" -1000000 -> Most likely the first revision, unless\n"
13478
" your history is very long."
13479
msgstr ""
13480
13481
#: en/help_topics/revisionspec.txt:145
13482
msgid ":before:"
13483
msgstr ""
13484
13485
#: en/help_topics/revisionspec.txt:147
13486
msgid ""
13487
" Supply any revision spec to return the parent of that revision. This "
13488
"is\n"
13489
" mostly useful when inspecting revisions that are not in the revision "
13490
"history\n"
13491
" of a branch."
13492
msgstr ""
13493
13494
#: en/help_topics/revisionspec.txt:151
13495
msgid ""
13496
" It is an error to request the parent of the null revision (before:0)."
13497
msgstr ""
13498
13499
#: en/help_topics/revisionspec.txt:155
13500
msgid ""
13501
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13502
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13503
" aaaa@bbbb-1234567890\n"
13504
" bzr diff -r before:1913..1913\n"
13505
" -> Find the changes between revision 1913 and its parent "
13506
"(1912).\n"
13507
" (What changes did revision 1913 introduce).\n"
13508
" This is equivalent to: bzr diff -c 1913"
13509
msgstr ""
13510
13511
#: en/help_topics/revisionspec.txt:163
13512
msgid ":annotate:"
13513
msgstr ""
13514
13515
#: en/help_topics/revisionspec.txt:165
13516
msgid ""
13517
" Select the revision that last modified the specified line. Line is\n"
13518
" specified as path:number. Path is a relative path to the file. "
13519
"Numbers\n"
13520
" start at 1, and are relative to the current version, not the last-\n"
13521
" committed version of the file."
13522
msgstr ""
13523
13524
#: en/help_topics/revisionspec.txt:170
13525
msgid ":mainline:"
13526
msgstr ""
13527
13528
#: en/help_topics/revisionspec.txt:172
13529
msgid ""
13530
" Select the revision that merged the specified revision into mainline."
13531
msgstr ""
13532
13533
#: en/help_topics/revisionspec.txt:174
13534
msgid ":last:"
13535
msgstr ""
13536
13537
#: en/help_topics/revisionspec.txt:176
13538
msgid ""
13539
" Supply a positive number to get the nth revision from the end.\n"
13540
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13541
" Examples::"
13542
msgstr ""
13543
13544
#: en/help_topics/revisionspec.txt:180
13545
msgid ""
13546
" last:1 -> return the last revision\n"
13547
" last:3 -> return the revision 2 before the end.\n"
13548
msgstr ""
13549
13550
#: en/help_topics/rules.txt:1
13551
msgid ""
13552
"Rules\n"
13553
"====="
13554
msgstr ""
13555
13556
#: en/help_topics/rules.txt:7
13557
msgid ""
13558
"Rules are defined in ini file format where the sections are file glob\n"
13559
"patterns and the contents of each section are the preferences for files\n"
13560
"matching that pattern(s). For example::"
13561
msgstr ""
13562
13563
#: en/help_topics/rules.txt:11
13564
msgid ""
13565
" [name *.bat]\n"
13566
" eol = native"
13567
msgstr ""
13568
13569
#: en/help_topics/rules.txt:14
13570
msgid ""
13571
" [name *.html *.xml]\n"
13572
" keywords = xml_escape"
13573
msgstr ""
13574
13575
#: en/help_topics/rules.txt:17
13576
msgid ""
13577
"Preferences like these are useful for commands and plugins wishing to\n"
13578
"provide custom behaviour for selected files. For more information on \n"
13579
"end of line conversion see :doc:`eol-help`.\n"
13580
"Keyword support is provided by the `keywords plugin\n"
13581
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13582
msgstr ""
13583
13584
#: en/help_topics/rules.txt:23
13585
msgid ""
13586
"Files\n"
13587
"-----"
13588
msgstr ""
13589
13590
#: en/help_topics/rules.txt:26
13591
msgid ""
13592
"Default rules for all branches are defined in the optional file\n"
13593
"``BZR_HOME/rules``. "
13594
msgstr ""
13595
13596
#: en/help_topics/rules.txt:29
13597
msgid ""
13598
"Rule Patterns\n"
13599
"-------------"
13600
msgstr ""
13601
13602
#: en/help_topics/rules.txt:32
13603
msgid ""
13604
"Patterns are ordered and searching stops as soon as one matches.\n"
13605
"As a consequence, more explicit patterns should be placed towards\n"
13606
"the top of the file. Rule patterns use exactly the same conventions\n"
13607
"as ignore patterns. See :doc:`patterns-help` for details."
13608
msgstr ""
13609
13610
#: en/help_topics/rules.txt:37
13611
msgid ".. note::"
13612
msgstr ""
13613
13614
#: en/help_topics/rules.txt:39
13615
msgid ""
13616
" Patterns containing square brackets or spaces should be\n"
13617
" surrounded in quotes to ensure they are correctly parsed.\n"
13618
msgstr ""
13619
13620
#: en/help_topics/topics.txt:1
13621
msgid ""
13622
"authentication Information on configuring authentication\n"
13623
"basic Basic commands\n"
13624
"branches Information on what a branch is\n"
13625
"bugs Bug tracker settings\n"
13626
"checkouts Information on what a checkout is\n"
13627
"commands Basic help for all commands\n"
13628
"configuration Details on the configuration settings available\n"
13629
"conflict-types Types of conflicts and what to do about them\n"
13630
"content-filters Conversion of content into/from working trees\n"
13631
"criss-cross Information on criss-cross merging\n"
13632
"current-formats Current storage formats\n"
13633
"debug-flags Options to show or record debug information\n"
13634
"diverged-branches How to fix diverged branches\n"
13635
"env-variables Environment variable names and values\n"
13636
"eol Information on end-of-line handling\n"
13637
"files Information on configuration and log files\n"
13638
"formats Information on choosing a storage format\n"
13639
"global-options Options that control how Bazaar runs\n"
13640
"hidden-commands All hidden commands\n"
13641
"hooks Points at which custom processing can be added\n"
13642
"launchpad Using Bazaar with Launchpad.net\n"
13643
"location-alias Aliases for remembered locations\n"
13644
"log-formats Details on the logging formats available\n"
13645
"other-formats Experimental and deprecated storage formats\n"
13646
"patterns Information on the pattern syntax\n"
13647
"repositories Basic information on shared repositories.\n"
13648
"revisionspec Explain how to use --revision\n"
13649
"rules Information on defining rule-based preferences\n"
13650
"standalone-trees Information on what a standalone tree is\n"
13651
"standard-options Options that can be used with any command\n"
13652
"status-flags Help on status flags\n"
13653
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13654
"topics Topics list\n"
13655
"url-special-chars Special character handling in URLs\n"
13656
"urlspec Supported transport protocols\n"
13657
"working-trees Information on working trees\n"
13658
msgstr ""
13659
13660
#: en/help_topics/url-special-chars.txt:1
13661
msgid ""
13662
"Special character handling in URLs\n"
13663
"=================================="
13664
msgstr ""
13665
13666
#: en/help_topics/url-special-chars.txt:4
13667
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13668
msgstr ""
13669
13670
#: en/help_topics/url-special-chars.txt:6
13671
msgid " * Fully qualified URLs"
13672
msgstr ""
13673
13674
#: en/help_topics/url-special-chars.txt:8
13675
msgid " * File system paths, relative or absolute"
13676
msgstr ""
13677
13678
#: en/help_topics/url-special-chars.txt:10
13679
msgid ""
13680
"Internally bzr treats all locations as URLs. For any file system paths\n"
13681
"that are specified it will automatically determine the appropriate URL\n"
13682
"representation, and escape special characters where necessary."
13683
msgstr ""
13684
13685
#: en/help_topics/url-special-chars.txt:14
13686
msgid ""
13687
"There are a few characters which have special meaning in URLs and need "
13688
"careful\n"
13689
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13690
"value in URLs. Any non-ASCII characters in a file path will automatically "
13691
"be\n"
13692
"urlencoded when the path is converted to a URL."
13693
msgstr ""
13694
13695
#: en/help_topics/url-special-chars.txt:19
13696
msgid ""
13697
"URLs represent non-ASCII characters in an encoding defined by the server, "
13698
"but\n"
13699
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13700
"be\n"
13701
"generous in what it accepts as a URL and to print them in a way that\n"
13702
"will be readable."
13703
msgstr ""
13704
13705
#: en/help_topics/url-special-chars.txt:24
13706
msgid ""
13707
"For example, if you have a directory named '/tmp/%2False' these are all "
13708
"valid\n"
13709
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13710
"slash)::"
13711
msgstr ""
13712
13713
#: en/help_topics/url-special-chars.txt:27
13714
msgid ""
13715
" cd /tmp\n"
13716
" bzr log /tmp/%2False\n"
13717
" bzr log %2False\n"
13718
" bzr log file:///tmp/%252False\n"
13719
" bzr log file://localhost/tmp/%252False\n"
13720
" bzr log file:%252False"
13721
msgstr ""
13722
13723
#: en/help_topics/url-special-chars.txt:34
13724
msgid "These are valid but do not refer to the same file::"
13725
msgstr ""
13726
13727
#: en/help_topics/url-special-chars.txt:36
13728
msgid ""
13729
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13730
" bzr log %252False (refers to a file called /tmp/%252False)"
13731
msgstr ""
13732
13733
#: en/help_topics/url-special-chars.txt:39
13734
msgid ""
13735
"Comma also has special meaning in URLs, because it denotes `segment "
13736
"parameters`_"
13737
msgstr ""
13738
13739
#: en/help_topics/url-special-chars.txt:41
13740
msgid ""
13741
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13742
msgstr ""
13743
13744
#: en/help_topics/url-special-chars.txt:43
13745
msgid ""
13746
"Comma is also special in any file system paths that are specified. To use a "
13747
"literal\n"
13748
"comma in a file system path, specify a URL and URL encode the comma::"
13749
msgstr ""
13750
13751
#: en/help_topics/url-special-chars.txt:46
13752
msgid ""
13753
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13754
"\"branch\" set to \"bla\"\n"
13755
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13756
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13757
"\"branch\" set to \"bla\"\n"
13758
msgstr ""
13759
13760
#: en/help_topics/urlspec.txt:1
13761
msgid "URL Identifiers"
13762
msgstr ""
13763
13764
#: en/help_topics/urlspec.txt:3
13765
msgid "Supported URL prefixes::"
13766
msgstr ""
13767
13768
#: en/help_topics/urlspec.txt:5
13769
msgid ""
13770
" aftp:// Access using active FTP.\n"
13771
" bzr:// Fast access using the Bazaar smart server.\n"
13772
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13773
" file:// Access using the standard filesystem (default)\n"
13774
" ftp:// Access using passive FTP.\n"
13775
" http:// Read-only access of branches exported on the web.\n"
13776
" https:// Read-only access of branches exported on the web using "
13777
"SSL.\n"
13778
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13779
msgstr ""
13780
13781
#: en/help_topics/urlspec.txt:14
13782
msgid "Supported modifiers::"
13783
msgstr ""
13784
13785
#: en/help_topics/urlspec.txt:16
13786
msgid " gio+ Access using any GIO supported protocols."
13787
msgstr ""
13788
13789
#: en/help_topics/urlspec.txt:18
13790
msgid "Bazaar supports all of the standard parts within the URL::"
13791
msgstr ""
13792
13793
#: en/help_topics/urlspec.txt:20
13794
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13795
msgstr ""
13796
13797
#: en/help_topics/urlspec.txt:22
13798
msgid "allowing URLs such as::"
13799
msgstr ""
13800
13801
#: en/help_topics/urlspec.txt:24
13802
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13803
msgstr ""
13804
13805
#: en/help_topics/urlspec.txt:26
13806
msgid ""
13807
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13808
"with '~' as meaning that the rest of the path should be interpreted\n"
13809
"relative to the remote user's home directory. For example if the user\n"
13810
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13811
"shell.example.com, then::"
13812
msgstr ""
13813
13814
#: en/help_topics/urlspec.txt:32
13815
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13816
msgstr ""
13817
13818
#: en/help_topics/urlspec.txt:34
13819
msgid "would refer to ``/home/remote/myproject/trunk``."
13820
msgstr ""
13821
13822
#: en/help_topics/urlspec.txt:36
13823
msgid ""
13824
"Many commands that accept URLs also accept location aliases too.\n"
13825
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13826
msgstr ""
13827
13828
#~ msgid ""
13829
#~ "Merge will do its best to combine the changes in two branches, but there\n"
13830
#~ "are some kinds of problems only a human can fix. When it encounters those,\n"
13831
#~ "it will mark a conflict. A conflict means that you need to fix something,\n"
13832
#~ "before you should commit."
13833
#~ msgstr ""
13834
#~ "マージ処理は、二つのブランチの変更を結合するために最善を尽くしますが、人にしか\n"
13835
#~ "解決できない問題もあります。そのような問題にあたった場合は、それを衝突として\n"
13836
#~ "マークします。その場合、コミット前に何かしら修正しなければならないということに\n"
13837
#~ "なります。"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1