~bzr-pqm/bzr/bzr.dev : revision 6548.1.1

7

msgstr ""

8

"Project-Id-Version: bzr\n"

9

"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10

"POT-Creation-Date: 2012-01-16 15:18+0100\n"

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"

15

"Content-Type: text/plain; charset=UTF-8\n"

16

"Content-Transfer-Encoding: 8bit\n"

17

"Plural-Forms: nplurals=1; plural=0;\n"

18

"X-Launchpad-Export-Date: 2012-01-17 05:16+0000\n"

19

"X-Generator: Launchpad (build 14676)\n"

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)"

26

msgid "Unstacking"

27

msgstr "スタックの解除"

28

29

#: bzrlib/branch.py:3183

29

#: bzrlib/branch.py:3205

30

#, python-format

31

msgid "Pushed up to revision %d."

32

msgstr "リビジョン%dまでプッシュしました。"

33

34

#: bzrlib/branch.py:3185

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:3188

40

#: bzrlib/branch.py:3210

41

msgid "No new revisions or tags to push."

42

msgstr "プッシュする新しいリビジョンやタグはありません。"

43

44

#: bzrlib/branch.py:3190

44

#: bzrlib/branch.py:3212

45

msgid "No new revisions to push."

46

msgstr "プッシュする新しいリビジョンはありません。"

47

48

#: bzrlib/branch.py:3210

48

#: bzrlib/branch.py:3232

49

msgid "checked branch {0} format {1}"

50

msgstr "format {1} のブランチ {0} をチェックしました"

51

52

#: bzrlib/branch.py:3213

52

#: bzrlib/branch.py:3235

53

#, python-format

54

msgid "found error:%s"

55

msgstr "検出されたエラー: %s"

56

57

#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315

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:130

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:215

67

#: bzrlib/builtins.py:303

68

msgid "Display status summary."

69

msgstr "ステータスのサマリーを表示します。"

70

71

#: bzrlib/builtins.py:217

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:"

77

"について、ステータスごとにグルーピングして表示します。\n"

78

"表示されるステータスは以下の通りです。:"

79

80

#: bzrlib/builtins.py:220

80

#: bzrlib/builtins.py:308

81

msgid ""

82

"added\n"

83

" Versioned in the working copy but not in the previous revision."

86

" 作業コピー内ではバージョン管理されているが、一つ前のリビジョンでは管理\n"

87

" されていない。"

88

89

#: bzrlib/builtins.py:223

89

#: bzrlib/builtins.py:311

90

msgid ""

91

"removed\n"

92

" Versioned in the previous revision but removed or deleted\n"

95

"removed\n"

96

" 一つ前のリビジョンでは管理されているが、作業コピー内では削除されている。"

97

98

#: bzrlib/builtins.py:227

98

#: bzrlib/builtins.py:315

99

msgid ""

100

"renamed\n"

101

" Path of this file changed from the previous revision;\n"

107

" 内容も変更されている可能性がある。親ディレクトリが変更されたファイルも\n"

108

" 含む。"

109

110

#: bzrlib/builtins.py:232

110

#: bzrlib/builtins.py:320

111

msgid ""

112

"modified\n"

113

" Text has changed since the previous revision."

115

"modified\n"

116

" ファイルの内容が一つ前のリビジョンから変更されている。"

117

118

#: bzrlib/builtins.py:235

118

#: bzrlib/builtins.py:323

119

msgid ""

120

"kind changed\n"

121

" File kind has been changed (e.g. from file to directory)."

123

"kind changed\n"

124

" ファイルの種別が変更されている。(ファイルからディレクトリに変わったなど)"

125

126

#: bzrlib/builtins.py:238

126

#: bzrlib/builtins.py:326

127

msgid ""

128

"unknown\n"

129

" Not versioned and not matching an ignore pattern."

131

"unknown\n"

132

" バージョン管理されておらず、無視パターンにも一致していない。"

133

134

#: bzrlib/builtins.py:241

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"

142

"末尾に種別を現す文字としてそれぞれ'/'、'@'、'*'が付加されます。\n"

143

"これを表示しないようにするには、'--no-classify'オプションを指定してください。"

144

145

#: bzrlib/builtins.py:246

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'."

150

"無視ファイルを見るには'bzr ignored'を使ってください。\n"

151

"ファイルの内容の変更を詳しく見るには、'bzr diff'を使ってください。"

152

153

#: bzrlib/builtins.py:249

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"

161

"SVNで-qを指定した場合と同じような形式にするには、bzr status -SV を\n"

162

"使用してください。"

163

164

#: bzrlib/builtins.py:253

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"

173

"されます。ディレクトリを指定した場合は、そのディレクトリの配下の全ての\n"

174

"ファイルのステータスが表示されます。"

175

176

#: bzrlib/builtins.py:258

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"

185

"マージ中の情報を省略するには、no-pendingオプションを使用するか、\n"

186

"ファイルやディレクトリを指定してください。"

187

188

#: bzrlib/builtins.py:263

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."

193

"作業フォルダと指定リビジョンとを比較するには、リビジョンを一つだけ\n"

194

"引数に指定してください。"

195

196

#: bzrlib/builtins.py:266

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"

203

"変更されたかを見るには、２つのリビジョンを引数に指定してください。\n"

204

"'bzr diff --summarize' でも見ることができます。"

205

206

#: bzrlib/builtins.py:275

206

#: bzrlib/builtins.py:363

207

msgid "Use short status indicators."

208

msgstr "省略形式でステータスを表示します。"

209

210

#: bzrlib/builtins.py:277

210

#: bzrlib/builtins.py:365

211

msgid "Only show versioned files."

212

msgstr "バージョン管理されているファイルだけを表示します。"

213

214

#: bzrlib/builtins.py:279

214

#: bzrlib/builtins.py:367

215

msgid "Don't show pending merges."

216

msgstr "マージ中の情報を表示しません。"

217

218

#: bzrlib/builtins.py:282

218

#: bzrlib/builtins.py:370

219

msgid "Do not mark object type using indicator."

220

msgstr "オブジェクトの種別を表すマーカーを表示しません。"

221

222

#: bzrlib/builtins.py:297

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:341 bzrlib/builtins.py:5090

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:344 bzrlib/builtins.py:5092

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:351

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:362

239

#: bzrlib/builtins.py:450

240

msgid "The repository {0} contains no revision {1}."

241

msgstr "リポジトリ {0} にはリビジョン {1} はありません。"

242

243

#: bzrlib/builtins.py:369

243

#: bzrlib/builtins.py:457

244

msgid "You cannot specify a NULL revision."

245

msgstr "NULLリビジョンは指定できません。"

246

247

#: bzrlib/builtins.py:461

247

#: bzrlib/builtins.py:549

248

msgid "Remove the working tree from a given branch/checkout."

249

msgstr "指定されたブランチ/チェックアウトから作業ツリーを削除します。"

250

251

#: bzrlib/builtins.py:463

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."

256

"軽量チェックアウトは作業ツリーよりも小さいため、軽量チェック\n"

257

"アウトに対して実行することはできません。"

258

259

#: bzrlib/builtins.py:466

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:472

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:486

268

#: bzrlib/builtins.py:574

269

msgid "No working tree to remove"

270

msgstr "削除する作業ツリーがありません。"

271

272

#: bzrlib/builtins.py:488

272

#: bzrlib/builtins.py:576

273

msgid "You cannot remove the working tree of a remote path"

274

msgstr "リモートの作業ツリーを削除することはできません。"

275

276

#: bzrlib/builtins.py:497

276

#: bzrlib/builtins.py:585

277

msgid "You cannot remove the working tree from a lightweight checkout"

278

msgstr "軽量チェックアウトから作業ツリーを削除することはできません。"

279

280

#: bzrlib/builtins.py:537

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."

285

"ツリーは壊れていないようです。代わりに\"bzr revert\"を実行してください。もし、本当に作業ツリーをリセットしたいのであれば、\"--"

286

"force\"オプションを指定してください。"

287

288

#: bzrlib/builtins.py:548

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:552

294

#: bzrlib/builtins.py:640

295

msgid "failed to reset the tree state{0}"

296

msgstr "ツリーの状態をリセットできませんでした。{0}"

297

298

#: bzrlib/builtins.py:556

298

#: bzrlib/builtins.py:644

299

msgid "Show current revision number."

300

msgstr "現在のリビジョン番号を表示します。"

301

302

#: bzrlib/builtins.py:558

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:571

306

#: bzrlib/builtins.py:659

307

msgid "--tree and --revision can not be used together"

308

msgstr "--tree と --revision は同時に指定できません"

309

310

#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874

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:612

314

#: bzrlib/builtins.py:700

315

msgid "Show revno of working tree."

316

msgstr "作業ツリーのリビジョン番号を表示します。"

317

318

#: bzrlib/builtins.py:660

318

#: bzrlib/builtins.py:748

319

msgid "Add specified files or directories."

320

msgstr "指定されたファイルやディレクトリを追加します。"

321

322

#: bzrlib/builtins.py:662

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"

329

"アイテムが追加されます。指定されたファイルが既に追加されているものだった\n"

330

"場合は、警告が表示されます。"

331

332

#: bzrlib/builtins.py:666

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"

347

"この処理は、バージョン管理されたディレクトリに対して再帰的に実行されます。\n"

348

"何も指定されていない場合は、'.'が指定されたものとみなします。"

349

350

#: bzrlib/builtins.py:674

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:677

356

#: bzrlib/builtins.py:765

357

msgid ""

358

"Therefore simply saying 'bzr add' will version all files that\n"

359

"are currently unknown."

361

"つまり、単に 'bzr add' とした場合は、すべての不明なファイルがバージョン\n"

362

"管理に追加されます。"

363

364

#: bzrlib/builtins.py:680

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"

373

"ディレクトリを明示的に追加する必要はなく、その中にあるファイルを追加すれば\n"

374

"ディレクトリも追加されるということになります。"

375

376

#: bzrlib/builtins.py:685

376

#: bzrlib/builtins.py:773

377

msgid ""

378

"--dry-run will show which files would be added, but not actually\n"

379

"add them."

381

"--dry-run を指定すると、どのファイルが追加されるかを表示しますが、実際に追加は\n"

382

"しません。"

383

384

#: bzrlib/builtins.py:688

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"

398

"場合に便利です(マージの時の衝突を避けられます)。また、別のプロジェクトをサブ\n"

399

"ディレクトリとしてマージする時にも便利です。"

400

401

#: bzrlib/builtins.py:696

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."

406

"無視パターンにマッチするファイルは、明示的に指定されない限り追加は\n"

407

"されません。"

408

409

#: bzrlib/builtins.py:699

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"

416

"ファイルは追加されません。明示的に指定されたアイテムはファイルサイズに\n"

417

"かかわらず追加されます。"

418

419

#: bzrlib/builtins.py:706

419

#: bzrlib/builtins.py:794

420

msgid "Don't recursively add the contents of directories."

421

msgstr "ディレクトリの内容を再帰的に追加しません。"

422

423

#: bzrlib/builtins.py:712

423

#: bzrlib/builtins.py:800

424

msgid "Lookup file ids from this tree."

425

msgstr "このツリーからファイルIDを検索します。"

426

427

#: bzrlib/builtins.py:748

427

#: bzrlib/builtins.py:836

428

msgid "ignored {0} matching \"{1}\"\n"

429

msgstr "無視 {0} (\"{1}\"にマッチ)\n"

430

431

#: bzrlib/builtins.py:753

431

#: bzrlib/builtins.py:841

432

msgid "Create a new versioned directory."

433

msgstr "バージョン管理されたディレクトリを作成します。"

434

435

#: bzrlib/builtins.py:755

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:762

439

#: bzrlib/builtins.py:850

440

msgid "No error if existing, make parent directories as needed."

441

msgstr ""

442

443

#: bzrlib/builtins.py:796

443

#: bzrlib/builtins.py:884

444

#, python-format

445

msgid "added %s\n"

446

msgstr "%s が追加されました。\n"

447

448

#: bzrlib/builtins.py:838

448

#: bzrlib/builtins.py:926

449

#, python-format

450

msgid "invalid kind %r specified"

451

msgstr "kindが正しくありません。 %s"

452

453

#: bzrlib/builtins.py:875

453

#: bzrlib/builtins.py:963

454

msgid "Move or rename a file."

455

msgstr "ファイルの移動や名前の変更を行います。"

456

457

#: bzrlib/builtins.py:877

457

#: bzrlib/builtins.py:965

458

msgid " bzr mv SOURCE... DESTINATION"

459

msgstr " bzr mv SOURCE... DESTINATION"

460

461

#: bzrlib/builtins.py:879

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"

468

"すべてそのディレクトリの中に移動されます。そうでない場合は、引数の数は\n"

469

"２つでなければならず、ファイルは新しい名前に変更されます。"

470

471

#: bzrlib/builtins.py:883

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"

482

"内部データへの変更の反映だけを行います。\n"

483

"複数のSOURCEをひとつのDESTINATIONに移動する場合も同じです。"

484

485

#: bzrlib/builtins.py:889

485

#: bzrlib/builtins.py:977

486

msgid "Files cannot be moved between branches."

487

msgstr "ファイルを別のブランチに移動することはできません。"

488

489

#: bzrlib/builtins.py:896

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:898

495

#: bzrlib/builtins.py:986

496

msgid "Automatically guess renames."

497

msgstr "変名を自動的に推測します。"

498

499

#: bzrlib/builtins.py:899

499

#: bzrlib/builtins.py:987

500

msgid "Avoid making changes when guessing renames."

501

msgstr "変名を推測する時に、実際には変更を行いません。"

502

503

#: bzrlib/builtins.py:908

503

#: bzrlib/builtins.py:996

504

msgid "--dry-run requires --auto."

505

msgstr "--dry-runは--autoとともに指定してください。"

506

507

#: bzrlib/builtins.py:912

507

#: bzrlib/builtins.py:1000

508

msgid "missing file argument"

509

msgstr "ファイルが指定されていません。"

510

511

#: bzrlib/builtins.py:916

511

#: bzrlib/builtins.py:1004

512

msgid "can not move root of branch"

513

msgstr "ブランチの root は移動できません。"

514

515

#: bzrlib/builtins.py:922

515

#: bzrlib/builtins.py:1010

516

msgid "Only one path may be specified to --auto."

517

msgstr "--autoを指定する場合はパスはひとつだけ指定してください。"

518

519

#: bzrlib/builtins.py:925

519

#: bzrlib/builtins.py:1013

520

msgid "--after cannot be specified with --auto."

521

msgstr "--afterと--autoを同時に指定することはできません。"

522

523

#: bzrlib/builtins.py:962

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:1014

527

#: bzrlib/builtins.py:1102

528

msgid "Turn this branch into a mirror of another branch."

529

msgstr "このブランチを別のブランチのミラーにします。"

530

531

#: bzrlib/builtins.py:1016

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"

539

"対象のブランチの最新コミットがまだ(直接的または間接的に)親ブランチにマージ\n"

540

"されていなければ、ブランチが分岐しているとみなします。"

541

542

#: bzrlib/builtins.py:1021

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"

549

"'bzr merge'を使用することができます。ブランチをマージすれば、またpullできる\n"

550

"ようになるはずです。"

551

552

#: bzrlib/builtins.py:1025

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"

559

"pull --overwriteを使用してください。これは、ブランチ同士が分岐していても\n"

560

"実行できます。"

561

562

#: bzrlib/builtins.py:1029

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"

572

"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモート\n"

573

"ブランチにアクセスできた時だけ保存されます。"

574

575

#: bzrlib/builtins.py:1034

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"

582

"利用して表示します。 -Olog_format=<other_format> と指定することで、\n"

583

"別のフォーマットで表示できます。"

584

585

#: bzrlib/builtins.py:1038

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"

591

"ブランチだけでなく、bzr sendで生成されたマージディレクティブを含むファイル\n"

592

"もpull対象として指定できることに注意してください。"

593

594

#: bzrlib/builtins.py:1046

594

#: bzrlib/builtins.py:1134

595

msgid "Show logs of pulled revisions."

596

msgstr "pull対象リビジョンのログを表示します。"

597

598

#: bzrlib/builtins.py:1048

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:1051

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:1080

609

#: bzrlib/builtins.py:1168

610

msgid "Need working tree for --show-base."

611

msgstr "--show-baseオプションを使用するには作業ツリーが必要です。"

612

613

#: bzrlib/builtins.py:1096

613

#: bzrlib/builtins.py:1184

614

msgid "No pull location known or specified."

615

msgstr "pull対象ブランチが指定されていません。"

616

617

#: bzrlib/builtins.py:1102

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:1109 bzrlib/builtins.py:4300

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:1150

626

#: bzrlib/builtins.py:1238

627

msgid "Update a mirror of this branch."

628

msgstr "このブランチのミラーを更新します。"

629

630

#: bzrlib/builtins.py:1152

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."

635

"対象のブランチの作業ツリーの更新はコストが高く、リモートファイルシステムでは\n"

636

"サポートされていないため、作業ツリーの更新は行いません。"

637

638

#: bzrlib/builtins.py:1155

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."

643

"将来的に、作業ツリーの更新ができるようなスマートサーバやプロトコルがリリース\n"

644

"*かもしれません*。"

645

646

#: bzrlib/builtins.py:1158

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"

653

"の最新のコミットが(直接的、もしくは間接的に)push元のブランチにまだマージされて\n"

654

"いない状態の場合に、ブランチが分岐しているとみなされます。"

655

656

#: bzrlib/builtins.py:1162

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."

661

"ブランチ同士が分岐している場合、 'bzr push --overwrite' で、まだマージされて\n"

662

"いない変更を破棄してpush先のブランチを完全に置きかえることができます。"

663

664

#: bzrlib/builtins.py:1165

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"

671

"からマージして(bzr help mergeを参照)コミットしてください。そうすれば、\n"

672

"'--overwrite'の指定なしでpushできるようになります。"

673

674

#: bzrlib/builtins.py:1169

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"

684

"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモートの\n"

685

"ブランチにアクセスできた時だけ保存されます。"

686

687

#: bzrlib/builtins.py:1174

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"

694

"利用して表示します。 -Olog_format=<other_format> と指定することで、\n"

695

"別のフォーマットで表示できます。"

696

697

#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272

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:1188

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."

707

"デフォルトでは、push先のディレクトリが既に存在しているのにバージョン管理されていない状態の場合はpushできません。このフラグを指定すると、その場合で"

708

"もpushできるようになります。"

709

710

#: bzrlib/builtins.py:1193

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:1196

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:1201 bzrlib/foreign.py:279

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."

728

"作業コピーが変更されている場合はpushできませんが、--no-strictオプションを指定\n"

729

"するとpushできるようになります。"

730

731

#: bzrlib/builtins.py:1204

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:1248

735

#: bzrlib/builtins.py:1336

736

msgid "Could not determine branch to refer to."

737

msgstr "参照先のブランチを特定できません。"

738

739

#: bzrlib/builtins.py:1257

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 ""

744

msgstr "push先が設定も指定もされていません。親ブランチ(%s)にpushする場合は、'bzr push :parent'を使用してください。"

745

746

#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306

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:1267

750

#: bzrlib/builtins.py:1355

751

#, python-format

752

msgid "Using saved push location: %s"

753

msgstr "デフォルトのpush先ブランチを使用します。: %s"

754

755

#: bzrlib/builtins.py:1277

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:1279

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 "

772

"FROM_LOCATIONからスキーマやドライブのIDを取り除いたものがTO_LOCATIONになり\n"

773

"ます。例えば、\"branch lp:foo-bar\"とすると、./foo-barが作られます。"

774

775

#: bzrlib/builtins.py:1286

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\"."

780

"ブランチの特定のリビジョンで取り出したい場合は、\"branch foo/bar -r 5\"の\n"

781

"ように--revisionオプションを指定してください。"

782

783

#: bzrlib/builtins.py:1289

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:1299

787

#: bzrlib/builtins.py:1387

788

msgid "Create a branch without a working-tree."

789

msgstr "作業ツリーのないブランチを作成します。"

790

791

#: bzrlib/builtins.py:1301

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:1304

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:1308

801

#: bzrlib/builtins.py:1396

802

msgid "Do not use a shared repository, even if available."

803

msgstr "共有リポジトリが使える場合でも、共有リポジトリを使いません。"

804

805

#: bzrlib/builtins.py:1310

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."

810

"デフォルトでは、branch先のディレクトリが既に存在しているのにバージョン管理されていない場合はbranchできません。このフラグを指定すると、その場合"

811

"でもbranchできるようになります。"

812

813

#: bzrlib/builtins.py:1315

813

#: bzrlib/builtins.py:1403

814

msgid "Bind new branch to from location."

815

msgstr "新しいブランチを元のブランチにバインドします。"

816

817

#: bzrlib/builtins.py:1362

817

#: bzrlib/builtins.py:1450

818

#, python-format

819

msgid "Target directory \"%s\" already exists."

820

msgstr "対象のディレクトリ \"%s\" は既に存在します。"

821

822

#: bzrlib/builtins.py:1374

822

#: bzrlib/builtins.py:1462

823

#, python-format

824

msgid "Parent of \"%s\" does not exist."

825

msgstr "\"%s\" の親が見つかりません。"

826

827

#: bzrlib/builtins.py:1393

827

#: bzrlib/builtins.py:1481

828

msgid "The branch {0} has no revision {1}."

829

msgstr "ブランチ {0} にリビジョン {1} はありません。"

830

831

#: bzrlib/builtins.py:1403 bzrlib/push.py:53

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:1407

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:1412

842

#: bzrlib/builtins.py:1505

843

#, python-format

844

msgid "New branch bound to %s"

845

msgstr "新しいブランチは %s にバインドされています。"

846

847

#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187

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:1422

852

#: bzrlib/builtins.py:1515

853

msgid "List the branches available at the current location."

854

msgstr "カレントフォルダにある利用可能なブランチをリストアップします。"

855

856

#: bzrlib/builtins.py:1424

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:1431

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:1461

868

#: bzrlib/builtins.py:1554

869

msgid "(default)"

870

msgstr ""

870

msgstr "(デフォルト)"

871

872

#: bzrlib/builtins.py:1473

872

#: bzrlib/builtins.py:1566

873

msgid "Create a new checkout of an existing branch."

874

msgstr "既存のブランチのチェックアウトを新しく作成します。"

875

876

#: bzrlib/builtins.py:1475

876

#: bzrlib/builtins.py:1568

877

msgid ""

878

"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "

879

"for\n"

886

"これは、作業ツリーを消してしまった場合や、そもそも作業ツリーが作成されて\n"

887

"いない場合(例えば、SFTPでpushされたブランチなど)に役立ちます。"

888

889

#: bzrlib/builtins.py:1480

889

#: bzrlib/builtins.py:1573

890

msgid ""

891

"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "

892

"will\n"

903

"BRANCH_LOCATIONからスキーマやドライブのIDを取り除いたものがTO_LOCATIONになり\n"

904

"ます。例えば、\"branch lp:foo-bar\"とすると、./foo-barが作られます。"

905

906

#: bzrlib/builtins.py:1487

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 "

917

"なるため、コミットはできませんが、例えば古いコードをチェックする場合などに\n"

918

"役立ちます。"

919

920

#: bzrlib/builtins.py:1497

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 "

929

"場合は、diffやstatusのような一般的な操作ではその必要はありませんし、ローカル\n"

930

"コミットすることもできます。"

931

932

#: bzrlib/builtins.py:1504

932

#: bzrlib/builtins.py:1597

933

msgid "Get file contents from this tree."

934

msgstr "ファイルの内容をこのツリーから取得します。"

935

936

#: bzrlib/builtins.py:1506

936

#: bzrlib/builtins.py:1599

937

msgid "Hard-link working tree files where possible."

938

msgstr "可能なら、作業コピーをハードリンクします。"

939

940

#: bzrlib/builtins.py:1547

940

#: bzrlib/builtins.py:1640

941

msgid ""

942

"Show list of renamed files.\n"

943

" "

945

"変名されたファイルをリストアップします。\n"

946

" "

947

948

#: bzrlib/builtins.py:1577

948

#: bzrlib/builtins.py:1670

949

msgid "Update a working tree to a new revision."

950

msgstr "作業ツリーを新しいリビジョンに更新します。"

951

952

#: bzrlib/builtins.py:1579

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"

958

"移動先のリビジョン(ブランチのTipもしくは指定されたリビジョン)を作業ツリーに\n"

959

"マージして、そのリビジョンを作業ツリーのベースリビジョンに設定します。 "

960

961

#: bzrlib/builtins.py:1583

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."

966

"古いリビジョンに一時的に移動したり、ブランチより古くなってしまった作業ツリーを\n"

967

"最新の状態にしたりすることができます。"

968

969

#: bzrlib/builtins.py:1586

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"

978

"'bzr revert' コマンドを利用してください。コミットされていない変更は、ベース\n"

979

"リビジョンの更新による変更とコンフリクトする可能性があります。"

980

981

#: bzrlib/builtins.py:1591

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."

986

"作業ツリーのブランチがマスターブランチに束縛されている場合、bzrは\n"

987

"作業ツリーのブランチもマスターブランチの状態に更新します。"

988

989

#: bzrlib/builtins.py:1594

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"

1002

"'bzr revert'に -r オプションを指定するか、'bzr cat'を使って古い内容を書き出して\n"

1003

"ください。"

1004

1005

#: bzrlib/builtins.py:1601

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"

1011

"dir 引数を指定する場合は、作業ツリーのルートを指定する必要があります。\n"

1012

"デフォルトでは、カレントディレクトリを含む作業ツリーが選択されます。"

1013

1014

#: bzrlib/builtins.py:1617

1014

#: bzrlib/builtins.py:1710

1015

msgid "bzr update --revision takes exactly one revision"

1016

msgstr "bzr update --revisionには、リビジョンをひとつだけ指定します。"

1017

1018

#: bzrlib/builtins.py:1625

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:1656

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:1672

1026

#: bzrlib/builtins.py:1765

1027

#, python-format

1028

msgid ""

1029

"branch has no revision %s\n"

1032

"ブランチには%sというリビジョンはありません。\n"

1033

"bzr update --revisionには、ブランチ内のリビジョンを指定する必要があります。"

1034

1035

#: bzrlib/builtins.py:1678

1035

#: bzrlib/builtins.py:1771

1036

msgid "Updated to revision {0} of branch {1}"

1037

msgstr "ブランチ {1} のリビジョン {0} に更新されました。"

1038

1039

#: bzrlib/builtins.py:1682

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:1691

1045

#: bzrlib/builtins.py:1784

1046

msgid "Show information about a working tree, branch or repository."

1047

msgstr "作業コピー、ブランチ、リポジトリの情報を表示します。"

1048

1049

#: bzrlib/builtins.py:1693

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."

1054

"このコマンドは、ツリー、ブランチ、リポジトリに関連する所在やフォーマット\n"

1055

"のすべての情報を表示します。"

1056

1057

#: bzrlib/builtins.py:1696

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"

1064

"高度な統計情報を見るには、-vvのようにverboseオプションを複数回指定する\n"

1065

"ことによって、verboseレベル2以上を指定してください。"

1066

1067

#: bzrlib/builtins.py:1700

1067

#: bzrlib/builtins.py:1793

1068

msgid "Branches and working trees will also report any missing revisions."

1069

msgstr "ブランチと作業ツリーについては、存在しないリビジョンについても表示されます。"

1070

1071

#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752

1072

#: bzrlib/builtins.py:6389

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:1704

1076

#: bzrlib/builtins.py:1797

1077

msgid " Display information on the format and related locations:"

1078

msgstr " フォーマットと関連する場所についての情報を表示します。"

1079

1080

#: bzrlib/builtins.py:1706

1080

#: bzrlib/builtins.py:1799

1081

msgid " bzr info"

1082

msgstr " bzr info"

1083

1084

#: bzrlib/builtins.py:1708

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"

1090

" より詳細なフォーマット情報と、基本的な統計情報(作業ツリー内のファイルの\n"

1091

" 数、ブランチ、リポジトリ内のリビジョンの数など)を一緒に表示します。:"

1092

1093

#: bzrlib/builtins.py:1712

1093

#: bzrlib/builtins.py:1805

1094

msgid " bzr info -v"

1095

msgstr " bzr info -v"

1096

1097

#: bzrlib/builtins.py:1714

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:1716

1101

#: bzrlib/builtins.py:1809

1102

msgid " bzr info -vv"

1103

msgstr " bzr info -vv"

1104

1105

#: bzrlib/builtins.py:1735

1105

#: bzrlib/builtins.py:1828

1106

msgid "Remove files or directories."

1107

msgstr "ファイルやディレクトリを削除します。"

1108

1109

#: bzrlib/builtins.py:1737

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"

1120

"やパラメータが指定されていない場合は、バージョン管理されているけれどツリー\n"

1121

"削除されているファイルを探して、そのファイルのバージョン管理を止めます。"

1122

1123

#: bzrlib/builtins.py:1745

1123

#: bzrlib/builtins.py:1838

1124

msgid "Only remove files that have never been committed."

1125

msgstr "まだコミットされていないファイルだけを削除します。"

1126

1127

#: bzrlib/builtins.py:1747

1127

#: bzrlib/builtins.py:1840

1128

msgid "The file deletion mode to be used."

1129

msgstr "使用するファイル削除モードです。"

1130

1131

#: bzrlib/builtins.py:1748

1131

#: bzrlib/builtins.py:1841

1132

msgid "Deletion Strategy"

1133

msgstr "削除モード"

1134

1135

#: bzrlib/builtins.py:1749

1135

#: bzrlib/builtins.py:1842

1136

msgid "Backup changed files (default)."

1137

msgstr "変更したファイルをバックアップします。"

1138

1139

#: bzrlib/builtins.py:1750

1139

#: bzrlib/builtins.py:1843

1140

msgid "Delete from bzr but leave the working copy."

1141

msgstr "Bazaarからは削除しますが、作業ツリーには残します。"

1142

1143

#: bzrlib/builtins.py:1751

1143

#: bzrlib/builtins.py:1844

1144

msgid "Don't backup changed files."

1145

msgstr "変更されたファイルをバックアップしません。"

1146

1147

#: bzrlib/builtins.py:1752

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:1761

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:1778

1158

#: bzrlib/builtins.py:1871

1159

msgid "No matching files."

1160

msgstr "対象のファイルはありませんでした。"

1161

1162

#: bzrlib/builtins.py:1839

1162

#: bzrlib/builtins.py:1932

1163

msgid "Reconcile bzr metadata in a branch."

1164

msgstr "ブランチ内のBazaarのメタデータを修復します。"

1165

1166

#: bzrlib/builtins.py:1841

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"

1174

"と思われるデータの不整合を修正することができます。'bzr check'の結果や、\n"

1175

"Bzrの開発者からの指示があるとき以外は、実行する必要はありません。"

1176

1177

#: bzrlib/builtins.py:1846

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"

1185

"これは、ツリーのルートIDのような、非常に古いバージョンのBzrにはなかった\n"

1186

"データが、両方のブランチに正しく表現されているかをチェックします。"

1187

1188

#: bzrlib/builtins.py:1851

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."

1193

"同時に、ディスクスペースの節約やパフォーマンスの向上のために、データの\n"

1194

"再圧縮がかかる可能性があります。"

1195

1196

#: bzrlib/builtins.py:1854

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:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657

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"

1210

"rich root 機能を提供します。 rich root 機能を提供するフォーマットに変換すると、\n"

1211

"rich root 機能を持たないフォーマットに戻ることはできません。\n"

1212

1213

#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657

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:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657

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:1922

1223

#: bzrlib/builtins.py:2015

1224

msgid "Make a directory into a versioned branch."

1225

msgstr "ディレクトリを、バージョン管理されたブランチにします。"

1226

1227

#: bzrlib/builtins.py:1924

1227

#: bzrlib/builtins.py:2017

1228

msgid ""

1229

"Use this to create an empty branch, or before importing an\n"

1230

"existing project."

1232

"空のブランチを作る場合や、既存のプロジェクトをインポートする前にこの\n"

1233

"コマンドを使用します。"

1234

1235

#: bzrlib/builtins.py:1927

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"

1243

"保存されます。そうでない場合は、履歴を.bzrディレクトリ内に持つスタンド\n"

1244

"アロンブランチが作成されます。"

1245

1246

#: bzrlib/builtins.py:1932

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'."

1251

"既にブランチがあって、作業ツリーがない場合は、'bzr checkout'でツリーを\n"

1252

"生成することができます。"

1253

1254

#: bzrlib/builtins.py:1935

1254

#: bzrlib/builtins.py:2028

1255

msgid "Recipe for importing a tree of files::"

1256

msgstr "ファイルのツリーをインポートするためのレシピ::"

1257

1258

#: bzrlib/builtins.py:1937

1258

#: bzrlib/builtins.py:2030

1259

msgid ""

1260

" cd ~/project\n"

1261

" bzr init\n"

1269

" bzr status\n"

1270

" bzr commit -m \"imported project\""

1271

1272

#: bzrlib/builtins.py:1948

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:1951

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:1959

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:1962

1286

#: bzrlib/builtins.py:2055

1287

msgid "Create a branch without a working tree."

1288

msgstr "作業ツリーをもたないブランチを作成します。"

1289

1290

#: bzrlib/builtins.py:1982 bzrlib/push.py:110

1290

#: bzrlib/builtins.py:2075 bzrlib/push.py:110

1291

#, python-format

1292

msgid ""

1293

"Parent directory of %s does not exist.\n"

1296

"%s の親ディレクトリがありません。\n"

1297

"--create-prefixを指定すれば、親ディレクトリも作成されます。"

1298

1299

#: bzrlib/builtins.py:2016

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:2027

1304

#: bzrlib/builtins.py:2120

1305

msgid "Created a {0} (format: {1})\n"

1306

msgstr "{0}を作成しました。(フォーマット:{1})\n"

1307

1308

#: bzrlib/builtins.py:2036

1308

#: bzrlib/builtins.py:2129

1309

#, python-format

1310

msgid "Using shared repository: %s\n"

1311

msgstr "共有リポジトリを使用しました。: %s\n"

1312

1313

#: bzrlib/builtins.py:2040

1313

#: bzrlib/builtins.py:2133

1314

msgid "Create a shared repository for branches to share storage space."

1315

msgstr "ブランチのストレージを共有するための共有リポジトリを作成します。"

1316

1317

#: bzrlib/builtins.py:2042

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"

1326

"しているブランチ同士のストレージサイズが節約され、新しいブランチを作成\n"

1327

"するスピードも速くなります。"

1328

1329

#: bzrlib/builtins.py:2047

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"

1341

"これは、サーバー上のリポジトリなど、チェックアウトやリモートブランチとやりとり\n"

1342

"するリポジトリの場合に役立ちます。"

1343

1344

#: bzrlib/builtins.py:2054

1344

#: bzrlib/builtins.py:2147

1345

msgid ""

1346

":Examples:\n"

1347

" Create a shared repository holding just branches::"

1349

":例:\n"

1350

" ブランチだけをもつリポジトリを作成します。::"

1351

1352

#: bzrlib/builtins.py:2057

1352

#: bzrlib/builtins.py:2150

1353

msgid ""

1354

" bzr init-repo --no-trees repo\n"

1355

" bzr init repo/trunk"

1357

" bzr init-repo --no-trees repo\n"

1358

" bzr init repo/trunk"

1359

1360

#: bzrlib/builtins.py:2060

1360

#: bzrlib/builtins.py:2153

1361

msgid " Make a lightweight checkout elsewhere::"

1362

msgstr " 別の場所に軽量チェックアウトを作成します。::"

1363

1364

#: bzrlib/builtins.py:2062

1364

#: bzrlib/builtins.py:2155

1365

msgid ""

1366

" bzr checkout --lightweight repo/trunk trunk-checkout\n"

1367

" cd trunk-checkout\n"

1371

" cd trunk-checkout\n"

1372

" (ここでファイルを追加)"

1373

1374

#: bzrlib/builtins.py:2070

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:2074

1379

#: bzrlib/builtins.py:2167

1380

msgid "Repository format"

1381

msgstr "リポジトリフォーマット"

1382

1383

#: bzrlib/builtins.py:2076

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:2102

1387

#: bzrlib/builtins.py:2195

1388

msgid "Show differences in the working tree, between revisions or branches."

1389

msgstr "作業ツリーや、リビジョン、ブランチ間の差分を表示します。"

1390

1391

#: bzrlib/builtins.py:2104

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"

1403

"できます。これらが指定されていない場合は最初の引数が使われ、引数が無い\n"

1404

"場合は作業ツリーが対象になります。"

1405

1406

#: bzrlib/builtins.py:2111

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\"."

1411

"\"bzr dif -p1\"は、\"bzr diff --prefix old/:new/\" と同じで、\"patch -p1\"に\n"

1412

"準じたパッチを出力します。"

1413

1414

#: bzrlib/builtins.py:2114

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"

1425

"リビジョンでの変更は含まれません。これは、\"bzr log\"にリビジョンの範囲を\n"

1426

"指定した場合の動作(開始リビジョンも含む)とは異なります。"

1427

1428

#: bzrlib/builtins.py:2121

1428

#: bzrlib/builtins.py:2214

1429

msgid ""

1430

":Exit values:\n"

1431

" 1 - changed\n"

1439

" 3 - エラー\n"

1440

" 0 - 変更なし"

1441

1442

#: bzrlib/builtins.py:2127

1442

#: bzrlib/builtins.py:2220

1443

msgid ""

1444

":Examples:\n"

1445

" Shows the difference in the working tree versus the last commit::"

1447

":例:\n"

1448

" 最新のコミットと作業ツリーとの間の変更を表示します。::"

1449

1450

#: bzrlib/builtins.py:2130

1450

#: bzrlib/builtins.py:2223

1451

msgid " bzr diff"

1452

msgstr " bzr diff"

1453

1454

#: bzrlib/builtins.py:2132

1454

#: bzrlib/builtins.py:2225

1455

msgid " Difference between the working tree and revision 1::"

1456

msgstr " 作業ツリーとリビジョン１を比較します。::"

1457

1458

#: bzrlib/builtins.py:2134

1458

#: bzrlib/builtins.py:2227

1459

msgid " bzr diff -r1"

1460

msgstr " bzr diff -r1"

1461

1462

#: bzrlib/builtins.py:2136

1462

#: bzrlib/builtins.py:2229

1463

msgid " Difference between revision 3 and revision 1::"

1464

msgstr " リビジョン３とリビジョン１を比較します。::"

1465

1466

#: bzrlib/builtins.py:2138

1466

#: bzrlib/builtins.py:2231

1467

msgid " bzr diff -r1..3"

1468

msgstr " bzr diff -r1..3"

1469

1470

#: bzrlib/builtins.py:2140

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:2142

1474

#: bzrlib/builtins.py:2235

1475

msgid " bzr diff -r1..3 xxx"

1476

msgstr " bzr diff -r1..3 xxx"

1477

1478

#: bzrlib/builtins.py:2144

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:2146

1482

#: bzrlib/builtins.py:2239

1483

msgid " bzr diff -c2"

1484

msgstr " bzr diff -c2"

1485

1486

#: bzrlib/builtins.py:2148

1486

#: bzrlib/builtins.py:2241

1487

msgid ""

1488

" To see the changes introduced by revision X::\n"

1489

" \n"

1493

" \n"

1494

" bzr diff -cX"

1495

1496

#: bzrlib/builtins.py:2152

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"

1502

" マージされたリビジョンの場合は、-cオプションは左側の親からの変更を表示する\n"

1503

" ことに注意してください。他の親からの変更を見るには、以下のようにします。::"

1504

1505

#: bzrlib/builtins.py:2156

1505

#: bzrlib/builtins.py:2249

1506

msgid " bzr diff -r<chosen_parent>..X"

1507

msgstr " bzr diff -r<対象の親リビジョン>..X"

1508

1509

#: bzrlib/builtins.py:2158

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:2161

1515

#: bzrlib/builtins.py:2254

1516

msgid " bzr diff -r-2.."

1517

msgstr " bzr diff -r-2.."

1518

1519

#: bzrlib/builtins.py:2163

1519

#: bzrlib/builtins.py:2256

1520

msgid " Show just the differences for file NEWS::"

1521

msgstr " ファイルNEWSの変更だけを表示します。::"

1522

1523

#: bzrlib/builtins.py:2165

1523

#: bzrlib/builtins.py:2258

1524

msgid " bzr diff NEWS"

1525

msgstr " bzr diff NEWS"

1526

1527

#: bzrlib/builtins.py:2167

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:2169

1531

#: bzrlib/builtins.py:2262

1532

msgid " bzr diff xxx/NEWS"

1533

msgstr " bzr diff xxx/NEWS"

1534

1535

#: bzrlib/builtins.py:2171

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:2173

1539

#: bzrlib/builtins.py:2266

1540

msgid " bzr diff --old xxx"

1541

msgstr " bzr diff --old xxx"

1542

1543

#: bzrlib/builtins.py:2175

1543

#: bzrlib/builtins.py:2268

1544

msgid " Show the differences between two branches for file NEWS::"

1545

msgstr " ２つのブランチ間での、ファイルNEWSの差分を表示します。::"

1546

1547

#: bzrlib/builtins.py:2177

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:2179

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:2181

1555

#: bzrlib/builtins.py:2274

1556

msgid ""

1557

" bzr diff --prefix old/:new/\n"

1558

" \n"

1566

" \n"

1567

" bzr diff --using /usr/bin/diff --diff-options -wu"

1568

1569

#: bzrlib/builtins.py:2191

1569

#: bzrlib/builtins.py:2284

1570

msgid "Pass these options to the external diff program."

1571

msgstr "これらのオプションは外部のdiffプログラムに渡されます。"

1572

1573

#: bzrlib/builtins.py:2194

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:2197

1579

#: bzrlib/builtins.py:2290

1580

msgid "Branch/tree to compare from."

1581

msgstr "比較元のブランチ/作業ツリーです。"

1582

1583

#: bzrlib/builtins.py:2201

1583

#: bzrlib/builtins.py:2294

1584

msgid "Branch/tree to compare to."

1585

msgstr "比較先のブランチ/作業ツリーです。"

1586

1587

#: bzrlib/builtins.py:2207

1587

#: bzrlib/builtins.py:2300

1588

msgid "Use this command to compare files."

1589

msgstr "ファイル比較に使うコマンドです。"

1590

1591

#: bzrlib/builtins.py:2212

1591

#: bzrlib/builtins.py:2305

1592

msgid "Diff format to use."

1593

msgstr "使用するDiffフォーマットです。"

1594

1595

#: bzrlib/builtins.py:2214

1595

#: bzrlib/builtins.py:2307

1596

msgid "Diff format"

1597

msgstr "Diffフォーマット"

1598

1599

#: bzrlib/builtins.py:2236

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:2240

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:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656

1608

#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826

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:2265

1612

#: bzrlib/builtins.py:2358

1613

msgid ""

1614

"List files deleted in the working tree.\n"

1615

" "

1617

"作業ツリー上で削除されたファイルをリストアップします。\n"

1618

" "

1619

1620

#: bzrlib/builtins.py:2343

1620

#: bzrlib/builtins.py:2436

1621

msgid "Show the tree root directory."

1622

msgstr "ツリーのルートディレクトリを表示します。"

1623

1624

#: bzrlib/builtins.py:2345

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:2360

1630

#: bzrlib/builtins.py:2453

1631

msgid "The limit argument must be an integer."

1632

msgstr "limitは整数でなければなりません。"

1633

1634

#: bzrlib/builtins.py:2368

1634

#: bzrlib/builtins.py:2461

1635

msgid "The levels argument must be an integer."

1636

msgstr "levelsは整数でなければなりません。"

1637

1638

#: bzrlib/builtins.py:2373

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:2375

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"

1651

"作業ディレクトリを含むブランチの履歴が表示されます。\n"

1652

"簡単な例を以下に示します。::"

1653

1654

#: bzrlib/builtins.py:2380

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"

1661

" bzr log foo,py は、ブランチ内のファイルの履歴を表示します。\n"

1662

" bzr log http://server/branch は、サーバ上のブランチのログを表示します。"

1663

1664

#: bzrlib/builtins.py:2384

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"

1676

"されます。マージされたリビジョンを表示する場合は、マージ先のリビジョンよりも\n"

1677

"インデントされて表示されます。"

1678

1679

#: bzrlib/builtins.py:2391

1679

#: bzrlib/builtins.py:2484

1680

msgid ":Output control:"

1681

msgstr ":出力のコントロール:"

1682

1683

#: bzrlib/builtins.py:2393

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"

1692

" があります。デフォルトはlongです。ログフォーマットについての詳細は\n"

1693

" ``bzr help log-formats`` をご覧ください。"

1694

1695

#: bzrlib/builtins.py:2398

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:2401

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"

1712

" -p Diff(patch)を各リビジョンに表示します。\n"

1713

" --show-ids リビジョン番号だけでなく、リビジョンIDとファイルIDも表示します。」"

1714

1715

#: bzrlib/builtins.py:2407

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"

1722

" -nオプションが使用されない場合は、標準のログフォーマットはトップレベル(メイン\n"

1723

" ライン)だけを表示します。"

1724

1725

#: bzrlib/builtins.py:2411

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"

1731

" ステータスのサマリは、A、Mなどのフラグで表示されます。かわりに ``added``、\n"

1732

" ``modified`` などの単語で表示するには、-vvオプションを使用してください。"

1733

1734

#: bzrlib/builtins.py:2415

1734

#: bzrlib/builtins.py:2508

1735

msgid ":Ordering control:"

1736

msgstr ":表示順のコントロール:"

1737

1738

#: bzrlib/builtins.py:2417

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"

1746

" 使います。--forwardは、--reverseのようにログをインクリメンタルに表示はしません\n"

1747

"が、たいていの場合、ログ表示にかかる時間への影響はわずかです。"

1748

1749

#: bzrlib/builtins.py:2422

1749

#: bzrlib/builtins.py:2515

1750

msgid ":Revision filtering:"

1751

msgstr ":リビジョンのフィルタリング:"

1752

1753

#: bzrlib/builtins.py:2424

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::"

1758

" -rオプションで、どのリビジョン、もしくはリビジョンの範囲を表示するかを指定する\n"

1759

" ことができます。いろいろな例を以下に示します。::"

1760

1761

#: bzrlib/builtins.py:2427

1761

#: bzrlib/builtins.py:2520

1762

msgid ""

1763

" -rX display revision X\n"

1764

" -rX.. display revision X and later\n"

1770

" -r..Y リビジョンY以前(Yを含む)を表示\n"

1771

" -rX..Y リビジョンXからY(X、Yを含む)を表示"

1772

1773

#: bzrlib/builtins.py:2432

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::"

1778

" X、Yの指定方法の詳細は、 ``bzr help revisionspec`` を参照してください。\n"

1779

" よくある例を以下に示します。::"

1780

1781

#: bzrlib/builtins.py:2435

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"

1794

" 変更を表示\n"

1795

" -rdate:yesterday.. 昨日からの変更を表示"

1796

1797

#: bzrlib/builtins.py:2442

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"

1810

" リビジョンの中に見つかるかもしれません。その場合、ログは適切に切り捨て\n"

1811

" られます。"

1812

1813

#: bzrlib/builtins.py:2449

1813

#: bzrlib/builtins.py:2542

1814

msgid ":Path filtering:"

1815

msgstr ":パスのフィルタリング:"

1816

1817

#: bzrlib/builtins.py:2451

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"

1823

" パラメータが指定されていて、一つ目のパラメータがブランチではない場合、\n"

1824

" 指定されたファイル、ディレクトリが変更されたリビジョンだけが表示されます。"

1825

1826

#: bzrlib/builtins.py:2455

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"

1833

" ログを表示するには、そのファイルが存在したリビジョンを、リビジョンの範囲\n"

1834

" の最初か最後に指定してください。"

1835

1836

#: bzrlib/builtins.py:2459

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:"

1841

" 履歴のコンテキストは、変名されたファイルやディレクトリのパス名を解釈する\n"

1842

" 際にも重要になります。以下の例を考えてください。："

1843

1844

#: bzrlib/builtins.py:2462

1844

#: bzrlib/builtins.py:2555

1845

msgid ""

1846

" * revision 1: add tutorial.txt\n"

1847

" * revision 2: modify tutorial.txt\n"

1851

" * リビジョン 2: tutorial.txt\n"

1852

" * リビジョン 3: tutorial.txt を guide.txt に変名し、add tutorial.txt を追加"

1853

1854

#: bzrlib/builtins.py:2466

1854

#: bzrlib/builtins.py:2559

1855

msgid " In this case:"

1856

msgstr " この場合:"

1857

1858

#: bzrlib/builtins.py:2468

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:2470

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:2472

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."

1872

" * ``bzr log -r2 -p tutorial.txt`` は、元のファイルのリビジョン2での変更\n"

1873

" を表示します。"

1874

1875

#: bzrlib/builtins.py:2475

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."

1880

" * ``bzr log -r2 -p guide.txt`` は、リビジョン2にはguide.txtというファイルはない\n"

1881

" というエラーを表示します。"

1882

1883

#: bzrlib/builtins.py:2478

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"

1889

" 変名は常に履歴に表示されます。明示的に指定する必要はありません。(また、\n"

1890

" 最後に変名される以前のログを切り捨てる方法もありません)"

1891

1892

#: bzrlib/builtins.py:2482

1892

#: bzrlib/builtins.py:2575

1893

msgid ":Other filtering:"

1894

msgstr ":その他のフィルタリング:"

1895

1896

#: bzrlib/builtins.py:2484

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"

1907

" --match-bug、--match-committer、--match-messageで、指定したフィールド\n"

1908

" だけを検索対象にすることができます。"

1909

1910

#: bzrlib/builtins.py:2490

1910

#: bzrlib/builtins.py:2583

1911

msgid ":Tips & tricks:"

1912

msgstr ":Tips & tricks:"

1913

1914

#: bzrlib/builtins.py:2492

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"

1925

" <http://doc.bazaar.canonical.com/plugins/en/> や、\n"

1926

" <http://wiki.bazaar.canonical.com/IDEIntegration> をご覧ください。 "

1927

1928

#: bzrlib/builtins.py:2498

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:2500

1933

#: bzrlib/builtins.py:2593

1934

msgid ""

1935

" [ALIASES]\n"

1936

" tip = log -r-1\n"

1942

" top = log -l10 --line\n"

1943

" show = log -v -p"

1944

1945

#: bzrlib/builtins.py:2505

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"

1952

" 10リビジョンを表示します。特定のリビジョンXの詳細を見るには、 ``bzr show -X``\n"

1953

" を使用します。"

1954

1955

#: bzrlib/builtins.py:2509

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:2512

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"

1970

" しても、-vオプションを指定するときはリビジョンの範囲を指定することを\n"

1971

" おすすめします。"

1972

1973

#: bzrlib/builtins.py:2517

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"

1982

" 他の機能とはちがい、このプラグインでは単語のリストを含むすべての\n"

1983

" リビジョンを検索することができます。"

1984

1985

#: bzrlib/builtins.py:2522

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"

1994

" することができます。このプラグインは、履歴情報をキャッシュして、ディスク\n"

1995

" スペースと引き換えに高速なパフォーマンスをもたらします。"

1996

1997

#: bzrlib/builtins.py:2531

1997

#: bzrlib/builtins.py:2624

1998

msgid "Show from oldest to newest."

1999

msgstr "古い方から新しい方へ表示する"

2000

2001

#: bzrlib/builtins.py:2534

2001

#: bzrlib/builtins.py:2627

2002

msgid "Show files changed in each revision."

2003

msgstr "各リビジョンでのファイルの変更を表示する"

2004

2005

#: bzrlib/builtins.py:2540

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:2544

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:2545

2013

#: bzrlib/builtins.py:2638

2014

msgid "Authors"

2015

msgstr "作者"

2016

2017

#: bzrlib/builtins.py:2550

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:2560

2021

#: bzrlib/builtins.py:2653

2022

msgid "Limit the output to the first N revisions."

2023

msgstr "最初のNリビジョンだけを出力する"

2024

2025

#: bzrlib/builtins.py:2565

2025

#: bzrlib/builtins.py:2658

2026

msgid "Show changes made in each revision as a patch."

2027

msgstr "各リビジョンでの変更をパッチとして表示"

2028

2029

#: bzrlib/builtins.py:2567

2029

#: bzrlib/builtins.py:2660

2030

msgid "Show merged revisions like --levels 0 does."

2031

msgstr "--levels 0 と同じようにマージされたリビジョンを表示する"

2032

2033

#: bzrlib/builtins.py:2571

2033

#: bzrlib/builtins.py:2664

2034

msgid "Do not report commits with more than one parent."

2035

msgstr "複数の親を持つコミットを表示しない"

2036

2037

#: bzrlib/builtins.py:2573

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:2577

2043

#: bzrlib/builtins.py:2670

2044

msgid "Show digital signature validity."

2045

msgstr "デジタル署名を表示"

2046

2047

#: bzrlib/builtins.py:2580

2047

#: bzrlib/builtins.py:2673

2048

msgid "Show revisions whose properties match this expression."

2049

msgstr "この表現にマッチするプロパティのリビジョンを表示"

2050

2051

#: bzrlib/builtins.py:2584

2051

#: bzrlib/builtins.py:2677

2052

msgid "Show revisions whose message matches this expression."

2053

msgstr "この表現にマッチするメッセージのリビジョンを表示"

2054

2055

#: bzrlib/builtins.py:2588

2055

#: bzrlib/builtins.py:2681

2056

msgid "Show revisions whose committer matches this expression."

2057

msgstr "コミッタが指定された表現にマッチするリビジョンを表示する"

2058

2059

#: bzrlib/builtins.py:2592

2059

#: bzrlib/builtins.py:2685

2060

msgid "Show revisions whose authors match this expression."

2061

msgstr "作者が指定された表現にマッチするリビジョンを表示する"

2062

2063

#: bzrlib/builtins.py:2596

2063

#: bzrlib/builtins.py:2689

2064

msgid "Show revisions whose bugs match this expression."

2065

msgstr "バグ情報が指定された表現にマッチするリビジョンを表示します"

2066

2067

#: bzrlib/builtins.py:2650

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:2678

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:2795

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:2811

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:2856

2086

#: bzrlib/builtins.py:2949

2087

msgid ""

2088

"List files in a tree.\n"

2089

" "

2091

"ツリー内のファイルをリストアップします。\n"

2092

" "

2093

2094

#: bzrlib/builtins.py:2865

2094

#: bzrlib/builtins.py:2958

2095

msgid "Recurse into subdirectories."

2096

msgstr "サブディレクトリも再帰で処理します。"

2097

2098

#: bzrlib/builtins.py:2867

2098

#: bzrlib/builtins.py:2960

2099

msgid "Print paths relative to the root of the branch."

2100

msgstr "ブランチのルートからの相対パスを表示します。"

2101

2102

#: bzrlib/builtins.py:2869

2102

#: bzrlib/builtins.py:2962

2103

msgid "Print unknown files."

2104

msgstr "バージョン管理外のファイルを表示します。"

2105

2106

#: bzrlib/builtins.py:2870

2106

#: bzrlib/builtins.py:2963

2107

msgid "Print versioned files."

2108

msgstr "バージョン管理されたファイルを表示します。"

2109

2110

#: bzrlib/builtins.py:2873

2110

#: bzrlib/builtins.py:2966

2111

msgid "Print ignored files."

2112

msgstr "無視されたファイルを表示します。"

2113

2114

#: bzrlib/builtins.py:2875

2114

#: bzrlib/builtins.py:2968

2115

msgid "List entries of a particular kind: file, directory, symlink."

2116

msgstr "指定された種別のアイテム(ファイル、ディレクトリ、シンボリックリンク)を表示します。"

2117

2118

#: bzrlib/builtins.py:2888

2118

#: bzrlib/builtins.py:2981

2119

msgid "invalid kind specified"

2120

msgstr "無効な種別が指定されました。"

2121

2122

#: bzrlib/builtins.py:2891

2122

#: bzrlib/builtins.py:2984

2123

msgid "Cannot set both --verbose and --null"

2124

msgstr "--verboseと--nullを同時に指定することはできません。"

2125

2126

#: bzrlib/builtins.py:2900

2126

#: bzrlib/builtins.py:2993

2127

msgid "cannot specify both --from-root and PATH"

2128

msgstr "--from-rootとPATHを同時に指定することはできません。"

2129

2130

#: bzrlib/builtins.py:2987

2130

#: bzrlib/builtins.py:3080

2131

msgid "Ignore specified files or patterns."

2132

msgstr "指定されたファイルやパターンを無視します。"

2133

2134

#: bzrlib/builtins.py:2989

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:2991

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"

2149

"使わずに.bzrignoreファイルを手で作成した場合は、明示的にaddコマンドを\n"

2150

"呼ぶ必要があります。"

2151

2152

#: bzrlib/builtins.py:2997

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"

2160

"ignoreコマンドやエディタでこのファイルのエントリを追加、編集、削除した\n"

2161

"場合は、忘れずにコミットしてください。"

2162

2163

#: bzrlib/builtins.py:3002

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"

2174

"このファイルをこのコマンドで編集することはできないので、直接エディタで編集\n"

2175

"してください。"

2176

2177

#: bzrlib/builtins.py:3008

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"

2184

"優先されます。これは、普通なら無視されるはずのファイルをバージョン管理\n"

2185

"の対象とするために使います。"

2186

2187

#: bzrlib/builtins.py:3012

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."

2192

"!!で始まるパターンは、通常の無視指定として扱われますが、!による除外\n"

2193

"パターンよりも優先されます。"

2194

2195

#: bzrlib/builtins.py:3015

2195

#: bzrlib/builtins.py:3108

2196

msgid ""

2197

":Notes: \n"

2198

" \n"

2204

"*シェルのワイルドカードをふくむ無視パターンを指定するときには、Unixシェル\n"

2205

" による引用符でくくる必要があります。"

2206

2207

#: bzrlib/builtins.py:3020

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."

2212

"* #で始まる無視パターンは、無視ファイル中のコメントとして扱われます。\n"

2213

" #で始まるファイルを無視したい場合は、\"RE:\"プレフィックスを使ってください。"

2214

2215

#: bzrlib/builtins.py:3023

2215

#: bzrlib/builtins.py:3116

2216

msgid ""

2217

":Examples:\n"

2218

" Ignore the top level Makefile::"

2220

":例:\n"

2221

" トップレベルのMakefileを無視する::"

2222

2223

#: bzrlib/builtins.py:3026

2223

#: bzrlib/builtins.py:3119

2224

msgid " bzr ignore ./Makefile"

2225

msgstr " bzr ignore ./Makefile"

2226

2227

#: bzrlib/builtins.py:3028

2227

#: bzrlib/builtins.py:3121

2228

msgid " Ignore .class files in all directories...::"

2229

msgstr " すべてのディレクトリの.classファイルを無視するが...::"

2230

2231

#: bzrlib/builtins.py:3030

2231

#: bzrlib/builtins.py:3123

2232

msgid " bzr ignore \"*.class\""

2233

msgstr " bzr ignore \"*.class\""

2234

2235

#: bzrlib/builtins.py:3032

2235

#: bzrlib/builtins.py:3125

2236

msgid " ...but do not ignore \"special.class\"::"

2237

msgstr " ...\"special.class\" は無視しない::"

2238

2239

#: bzrlib/builtins.py:3034

2239

#: bzrlib/builtins.py:3127

2240

msgid " bzr ignore \"!special.class\""

2241

msgstr " bzr ignore \"!special.class\""

2242

2243

#: bzrlib/builtins.py:3036

2243

#: bzrlib/builtins.py:3129

2244

msgid " Ignore files whose name begins with the \"#\" character::"

2245

msgstr " #で始まるファイルを無視する::"

2246

2247

#: bzrlib/builtins.py:3038

2247

#: bzrlib/builtins.py:3131

2248

msgid " bzr ignore \"RE:^#\""

2249

msgstr " bzr ignore \"RE:^#\""

2250

2251

#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044

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:3042

2255

#: bzrlib/builtins.py:3135

2256

msgid " bzr ignore \"lib/**/*.o\""

2257

msgstr " bzr ignore \"lib/**/*.o\""

2258

2259

#: bzrlib/builtins.py:3046

2259

#: bzrlib/builtins.py:3139

2260

msgid " bzr ignore \"RE:lib/.*\\.o\""

2261

msgstr " bzr ignore \"RE:lib/.*\\.o\""

2262

2263

#: bzrlib/builtins.py:3048

2263

#: bzrlib/builtins.py:3141

2264

msgid " Ignore everything but the \"debian\" toplevel directory::"

2265

msgstr " \"debian\"トップレベルディレクトリ以外の全てを無視する::"

2266

2267

#: bzrlib/builtins.py:3050

2267

#: bzrlib/builtins.py:3143

2268

msgid ""

2269

" bzr ignore \"RE:(?!debian/).*\"\n"

2270

" \n"

2284

" bzr ignore \"!./local\"\n"

2285

" bzr ignore \"!!*~\""

2286

2287

#: bzrlib/builtins.py:3064

2287

#: bzrlib/builtins.py:3157

2288

msgid "Display the default ignore rules that bzr uses."

2289

msgstr "bzrが使用するデフォルトの無視ルールを表示します。"

2290

2291

#: bzrlib/builtins.py:3076

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:3087

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:3096

2301

#: bzrlib/builtins.py:3189

2302

msgid "NAME_PATTERN should not be an absolute path"

2303

msgstr "NAME_PATTERNに絶対パスは指定できません。"

2304

2305

#: bzrlib/builtins.py:3109

2305

#: bzrlib/builtins.py:3202

2306

#, python-format

2307

msgid ""

2308

"Warning: the following files are version controlled and match your ignore "

2315

"%s\n"

2316

"これらのファイルは、'bzr remove'しない限りはバージョン管理されたままです。\n"

2317

2318

#: bzrlib/builtins.py:3116

2318

#: bzrlib/builtins.py:3209

2319

msgid "List ignored files and the patterns that matched them."

2320

msgstr "無視するファイルとそれらにマッチするパターンの一覧を表示する。"

2321

2322

#: bzrlib/builtins.py:3118

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:3121

2328

#: bzrlib/builtins.py:3214

2329

msgid "Alternatively, to list just the files::"

2330

msgstr "代わりにファイルの一覧だけを表示するには::"

2331

2332

#: bzrlib/builtins.py:3123

2332

#: bzrlib/builtins.py:3216

2333

msgid " bzr ls --ignored"

2334

msgstr " bzr ls --ignored"

2335

2336

#: bzrlib/builtins.py:3157

2336

#: bzrlib/builtins.py:3250

2337

#, python-format

2338

msgid "not a valid revision-number: %r"

2339

msgstr "無効なリビジョン番号です。: %r"

2340

2341

#: bzrlib/builtins.py:3164

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:3166

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:3168

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"

2357

" 何も渡されなければ、拡張子のフォーマットを見つけようとします。拡張子がない\n"

2358

"場合は、ディレクトリにエクスポートします(–format=dirと同等)。"

2359

2360

#: bzrlib/builtins.py:3172

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"

2368

"ファイル名がデフォルトになります。rootオプションは、'dir'フォーマット\n"

2369

"に対しては作用しません。"

2370

2371

#: bzrlib/builtins.py:3176

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:3179

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:3181

2382

#: bzrlib/builtins.py:3274

2383

msgid ""

2384

" ================= =========================\n"

2385

" Supported formats Autodetected by extension\n"

2401

" zip .zip\n"

2402

" ==================== ===================="

2403

2404

#: bzrlib/builtins.py:3195

2404

#: bzrlib/builtins.py:3288

2405

msgid "Type of file to export to."

2406

msgstr "エクスポートするファイルの種類"

2407

2408

#: bzrlib/builtins.py:3198

2408

#: bzrlib/builtins.py:3291

2409

msgid "Apply content filters to export the convenient form."

2410

msgstr "使いやすい形でエクスポートするためのコンテンツフィルターを適用します。"

2411

2412

#: bzrlib/builtins.py:3202

2412

#: bzrlib/builtins.py:3295

2413

msgid "Name of the root directory inside the exported file."

2414

msgstr "エクスポートされたファイル内部のrootディレクトリの名前。"

2415

2416

#: bzrlib/builtins.py:3204

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:3207

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:3226

2427

#: bzrlib/builtins.py:3319

2428

msgid "--uncommitted requires a working tree"

2429

msgstr "作業ツリーに対しては--uncommittedを指定する必要があります。"

2430

2431

#: bzrlib/builtins.py:3235

2431

#: bzrlib/builtins.py:3328

2432

#, python-format

2433

msgid "Unsupported export format: %s"

2434

msgstr "サポートされていないエクスポートフォーマット: %s"

2435

2436

#: bzrlib/builtins.py:3239

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:3241

2441

#: bzrlib/builtins.py:3334

2442

msgid "If no revision is nominated, the last revision is used."

2443

msgstr "リビジョンが指定されなければ、最後のリビジョンが使用されます。"

2444

2445

#: bzrlib/builtins.py:3243

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."

2450

"バイナリファイルでこのコマンドを使用する際には標準出力をリダイレクトするように\n"

2451

"気をつけてください。"

2452

2453

#: bzrlib/builtins.py:3249

2453

#: bzrlib/builtins.py:3342

2454

msgid "The path name in the old tree."

2455

msgstr "古いツリーのパス名。"

2456

2457

#: bzrlib/builtins.py:3250

2457

#: bzrlib/builtins.py:3343

2458

msgid "Apply content filters to display the convenience form."

2459

msgstr "便利な形で表示するためのフィルタを適用します。"

2460

2461

#: bzrlib/builtins.py:3261

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:3286 bzrlib/builtins.py:3298

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:3321

2469

#: bzrlib/builtins.py:3414

2470

msgid "Commit changes into a new revision."

2471

msgstr "変更を新しいリビジョンにコミットする。"

2472

2473

#: bzrlib/builtins.py:3323

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"

2486

"エディタにロードされる定型文の中に変更されたファイルの情報を含めるためには、\n"

2487

"--show-diffオプションを使用します。"

2488

2489

#: bzrlib/builtins.py:3330

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"

2495

"デフォルトでは、ツリー全体がコミットされ、コミットを実行した人が著者になります。\n"

2496

"これは、以下のような方法で上書きすることができます。"

2497

2498

#: bzrlib/builtins.py:3334

2498

#: bzrlib/builtins.py:3427

2499

msgid ":Selective commits:"

2500

msgstr ":部分的なコミット:"

2501

2502

#: bzrlib/builtins.py:3336

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"

2509

" ディレクトリが指定された場合、そのディレクトリとその配下すべてが\n"

2510

" コミット対象になります。"

2511

2512

#: bzrlib/builtins.py:3340

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"

2519

" たとえば、foo配下の変更をコミットするが、foo/bar内はコミットしないという\n"

2520

" 場合は::"

2521

2522

#: bzrlib/builtins.py:3344

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:3346

2526

#: bzrlib/builtins.py:3439

2527

msgid " A selective commit after a merge is not yet supported."

2528

msgstr ""

2528

msgstr " マージ後の部分的なコミットはまだサポートされていません。"

2529

2530

#: bzrlib/builtins.py:3348

2530

#: bzrlib/builtins.py:3441

2531

msgid ":Custom authors:"

2532

msgstr ""

2532

msgstr ":作者の変更:"

2533

2534

#: bzrlib/builtins.py:3350

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"

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

" いるなら、このオプションを複数回指定することもできます。"

2543

2547

2544

#: bzrlib/builtins.py:3357

2548

#: bzrlib/builtins.py:3450

2545

2549

msgid ":Checks:"

2546

msgstr ""

2550

msgstr ":チェック:"

2547

2551

2548

#: bzrlib/builtins.py:3359

2552

#: bzrlib/builtins.py:3452

2549

2553

msgid ""

2550

2554

" A common mistake is to forget to add a new file or directory before\n"

2551

2555

" running the commit command. The --strict option checks for unknown\n"

2553

2557

" checks can be implemented by defining hooks. See ``bzr help hooks``\n"

2554

2558

" for details."

2555

2559

msgstr ""

2560

" よくあるミスとして、新しく作ったファイルやディレクトリをコミット前に追加するのを\n"

2561

" 忘れてしまうということがあります。--strictオプションを指定すると、バージョン管理\n"

2562

" 外のファイルがある場合はコミットが失敗するようになります。もっと高度なコミット\n"

2563

" 前チェックをフックとして実装することもできます。詳細は ``bzr help hooks`` を\n"

2564

" ご覧ください。"

2556

2565

2557

#: bzrlib/builtins.py:3365

2566

#: bzrlib/builtins.py:3458

2558

2567

msgid ":Things to note:"

2559

msgstr ""

2568

msgstr ":特記事項:"

2560

2569

2561

#: bzrlib/builtins.py:3367

2570

#: bzrlib/builtins.py:3460

2562

2571

msgid ""

2563

2572

" If you accidentially commit the wrong changes or make a spelling\n"

2564

2573

" mistake in the commit message say, you can use the uncommit command\n"

2565

2574

" to undo it. See ``bzr help uncommit`` for details."

2566

2575

msgstr ""

2576

" もし、間違ったファイルをコミットしてしまったり、コミットメッセージにスペル\n"

2577

" ミスがあった場合は、uncommitコマンドでコミットを取り消すことができます。\n"

2578

" 詳細は ``bzr help uncommit`` をご覧ください。"

2567

2579

2568

#: bzrlib/builtins.py:3371

2580

#: bzrlib/builtins.py:3464

2569

2581

msgid ""

2570

2582

" Hooks can also be configured to run after a commit. This allows you\n"

2571

2583

" to trigger updates to external systems like bug trackers. The --fixes\n"

2572

2584

" option can be used to record the association between a revision and\n"

2573

2585

" one or more bugs. See ``bzr help bugs`` for details."

2574

2586

msgstr ""

2587

" コミット後にフックを実行することもできます。これによって、バグトラッカーなどの\n"

2588

" 外部のシステムを更新することができます。 --fixesオプションで、リビジョンと\n"

2589

" バグとの関係を記録することができます。詳細は ``bzr help bugs`` を見て\n"

2590

" ください。"

2575

2591

2576

#: bzrlib/builtins.py:3381

2592

#: bzrlib/builtins.py:3474

2577

2593

msgid "Do not consider changes made to a given path."

2578

msgstr ""

2594

msgstr "指定されたパスの変更を無視します。"

2579

2595

2580

#: bzrlib/builtins.py:3384

2596

#: bzrlib/builtins.py:3477

2581

2597

msgid "Description of the new revision."

2582

2598

msgstr "新しいリビジョンの説明。"

2583

2599

2584

#: bzrlib/builtins.py:3387

2600

#: bzrlib/builtins.py:3480

2585

2601

msgid "Commit even if nothing has changed."

2586

2602

msgstr "何も変更されていなくてもコミットする。"

2587

2603

2588

#: bzrlib/builtins.py:3391

2604

#: bzrlib/builtins.py:3484

2589

2605

msgid "Take commit message from this file."

2590

2606

msgstr "このファイルからコミットメッセージを取得する。"

2591

2607

2592

#: bzrlib/builtins.py:3393

2608

#: bzrlib/builtins.py:3486

2593

2609

msgid "Refuse to commit if there are unknown files in the working tree."

2594

2610

msgstr "作業ツリーの中にバージョン管理外のファイルが存在する場合コミットを拒否する。"

2595

2611

2596

#: bzrlib/builtins.py:3396

2612

#: bzrlib/builtins.py:3489

2597

2613

msgid ""

2598

2614

"Manually set a commit time using commit date format, e.g. '2009-10-10 "

2599

2615

"08:00:00 +0100'."

2600

msgstr ""

2616

msgstr "コミット日時を決められたフォーマットで手動で指定します。例) '2009-10-10 08:00:00 +0100'"

2601

2617

2602

#: bzrlib/builtins.py:3399

2618

#: bzrlib/builtins.py:3492

2603

2619

msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."

2604

2620

msgstr "このリビジョンで修正されたバグをマークする(\"bzr help bugs\"を参照)。"

2605

2621

2606

#: bzrlib/builtins.py:3402

2622

#: bzrlib/builtins.py:3495

2607

2623

msgid "Set the author's name, if it's different from the committer."

2608

2624

msgstr "著者の名前がコミッターとは異なる場合、著者の名前を設定する。"

2609

2625

2610

#: bzrlib/builtins.py:3405

2626

#: bzrlib/builtins.py:3498

2611

2627

msgid ""

2612

2628

"Perform a local commit in a bound branch. Local commits are not pushed to "

2613

2629

"the master branch until a normal commit is performed."

2614

2630

msgstr ""

2615

2631

"バインドされたブランチにローカルコミットを実行する。通常のコミットが実行されるまでローカルコミットはマスターブランチにpushされません。"

2616

2632

2617

#: bzrlib/builtins.py:3411

2633

#: bzrlib/builtins.py:3504

2618

2634

msgid ""

2619

2635

"When no message is supplied, show the diff along with the status summary in "

2620

2636

"the message editor."

2621

2637

msgstr "メッセージが提供されないとき、メッセージエディタでステータスの要約と一緒に差分を表示する。"

2622

2638

2623

#: bzrlib/builtins.py:3414

2639

#: bzrlib/builtins.py:3507

2624

2640

msgid ""

2625

2641

"When committing to a foreign version control system do not push data that "

2626

2642

"can not be natively represented."

2627

msgstr ""

2643

msgstr "外部のバージョン管理システムにコミットするときに、ネイティブに表現できないデータをプッシュしません。"

2628

2644

2629

#: bzrlib/builtins.py:3432

2645

#: bzrlib/builtins.py:3525

2630

2646

#, python-format

2631

2647

msgid ""

2632

2648

"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "

2633

2649

"default bug tracker using the `bugtracker` option.\n"

2634

2650

"See \"bzr help bugs\" for more information on this feature. Commit refused."

2635

2651

msgstr ""

2652

"バグ %s のバグトラッカーが指定されていません。'トラッカー:id'の形式にするか、デフォルトのトラッカーを `bugtracker` "

2653

"オプションで指定してください。\n"

2654

"詳細は \"bzr help bugs\" をご覧ください。コミットは拒否されました。"

2636

2655

2637

#: bzrlib/builtins.py:3441

2656

#: bzrlib/builtins.py:3534

2638

2657

#, python-format

2639

2658

msgid ""

2640

2659

"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "

2641

2660

"for more information on this feature.\n"

2642

2661

"Commit refused."

2643

2662

msgstr ""

2663

"無効なバグです。 %s 'トラッカー:id' の形式で指定する必要があります。詳細は \"bzr help bugs\" をご覧ください。\n"

2664

"コミットは拒否されました。"

2644

2665

2645

#: bzrlib/builtins.py:3450

2666

#: bzrlib/builtins.py:3543

2646

2667

#, python-format

2647

2668

msgid "Unrecognized bug %s. Commit refused."

2648

msgstr ""

2669

msgstr "不明なバグです。 %s コミットは拒否されました。"

2649

2670

2650

#: bzrlib/builtins.py:3453

2671

#: bzrlib/builtins.py:3546

2651

2672

#, python-format

2652

2673

msgid ""

2653

2674

"%s\n"

2654

2675

"Commit refused."

2655

2676

msgstr ""

2677

"%s\n"

2678

"コミットは拒否されました。"

2656

2679

2657

#: bzrlib/builtins.py:3477

2680

#: bzrlib/builtins.py:3570

2658

2681

msgid "Could not parse --commit-time: "

2659

msgstr ""

2682

msgstr "--commit-timeをパースできません。: "

2660

2683

2661

#: bzrlib/builtins.py:3517

2684

#: bzrlib/builtins.py:3610

2662

2685

msgid "please specify either --message or --file"

2663

msgstr ""

2686

msgstr "--message か --file かどちらかを指定してください。"

2664

2687

2665

#: bzrlib/builtins.py:3546

2688

#: bzrlib/builtins.py:3639

2666

2689

msgid "please specify a commit message with either --message or --file"

2667

msgstr ""

2690

msgstr "--messageか--fileのどちらかでコミットメッセージを指定してください。"

2668

2691

2669

#: bzrlib/builtins.py:3549

2692

#: bzrlib/builtins.py:3642

2670

2693

msgid ""

2671

2694

"Empty commit message specified. Please specify a commit message with either -"

2672

2695

"-message or --file or leave a blank message with --message \"\"."

2673

2696

msgstr ""

2697

"空のコミットメッセージが指定されました。--messageか--fileでコミットメッセージを指定するか、--message "

2698

"\"\"で空メッセージを指定してください。"

2674

2699

2675

#: bzrlib/builtins.py:3569

2700

#: bzrlib/builtins.py:3662

2676

2701

msgid ""

2677

2702

"No changes to commit. Please 'bzr add' the files you want to commit, or use -"

2678

2703

"-unchanged to force an empty commit."

2679

2704

msgstr ""

2705

"コミットする変更がありません。コミットしたいファイルを'bzr add'で追加するか、--unchangedを指定して空のコミットを実行してください。"

2680

2706

2681

#: bzrlib/builtins.py:3573

2707

#: bzrlib/builtins.py:3666

2682

2708

msgid ""

2683

2709

"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "

2684

2710

"resolve FILE\" to resolve."

2685

msgstr ""

2711

msgstr "作業ツリーに競合があります。\"bzr conflicts\" で表示して、\"bzr resolve FILE\"で解消してください。"

2686

2712

2687

#: bzrlib/builtins.py:3577

2713

#: bzrlib/builtins.py:3670

2688

2714

msgid "Commit refused because there are unknown files in the working tree."

2689

msgstr ""

2715

msgstr "作業ツリーにバージョン管理外のファイルがあるため、コミットが拒否されました。"

2690

2716

2691

#: bzrlib/builtins.py:3580

2717

#: bzrlib/builtins.py:3673

2692

2718

msgid ""

2693

2719

"\n"

2694

2720

"To commit to master branch, run update and then commit.\n"

2695

2721

"You can also pass --local to commit to continue working disconnected."

2696

2722

msgstr ""

2723

"\n"

2724

"マスタブランチにコミットするには、先にupdateしてください。\n"

2725

"--localを指定してオフラインでコミットし、作業を続けることもできます。"

2697

2726

2698

#: bzrlib/builtins.py:3588

2727

#: bzrlib/builtins.py:3681

2699

2728

msgid ""

2700

2729

"Validate working tree structure, branch consistency and repository history."

2701

msgstr ""

2730

msgstr "作業ツリーの構造、ブランチの一貫性、リポジトリの履歴をチェックします。"

2702

2731

2703

#: bzrlib/builtins.py:3590

2732

#: bzrlib/builtins.py:3683

2704

2733

msgid ""

2705

2734

"This command checks various invariants about branch and repository storage\n"

2706

2735

"to detect data corruption or bzr bugs."

2707

2736

msgstr ""

2737

"このコマンドは、データの破損やbzrのバグを検出するために、ブランチとリポジトリ\n"

2738

"ストレージの不変条件をチェックします。"

2708

2739

2709

#: bzrlib/builtins.py:3593

2740

#: bzrlib/builtins.py:3686

2710

2741

msgid ""

2711

2742

"The working tree and branch checks will only give output if a problem is\n"

2712

2743

"detected. The output fields of the repository check are:"

2713

2744

msgstr ""

2745

"作業ツリーとブランチのチェック結果は、問題が見つかったときだけ表示\n"

2746

"されます。リポジトリチェックの出力は次の通りです。:"

2714

2747

2715

#: bzrlib/builtins.py:3596

2748

#: bzrlib/builtins.py:3689

2716

2749

msgid ""

2717

2750

"revisions\n"

2718

2751

" This is just the number of revisions checked. It doesn't\n"

2719

2752

" indicate a problem."

2720

2753

msgstr ""

2754

"revisions\n"

2755

" チェックしたリビジョンの数です。これは問題ではありません。"

2721

2756

2722

#: bzrlib/builtins.py:3600

2757

#: bzrlib/builtins.py:3693

2723

2758

msgid ""

2724

2759

"versionedfiles\n"

2725

2760

" This is just the number of versionedfiles checked. It\n"

2726

2761

" doesn't indicate a problem."

2727

2762

msgstr ""

2763

"versionedfiles\n"

2764

" チェックしたバージョン管理ファイルの数です。これは問題では\n"

2765

" ありません。"

2728

2766

2729

#: bzrlib/builtins.py:3604

2767

#: bzrlib/builtins.py:3697

2730

2768

msgid ""

2731

2769

"unreferenced ancestors\n"

2732

2770

" Texts that are ancestors of other texts, but\n"

2733

2771

" are not properly referenced by the revision ancestry. This is a\n"

2734

2772

" subtle problem that Bazaar can work around."

2735

2773

msgstr ""

2774

"unreferenced ancestors\n"

2775

" 他のテキストの先祖だが、上位のリビジョンから参照されていない\n"

2776

" と思われるテキストです。これは、Bazaarが対処できる軽微な\n"

2777

" 問題です。"

2736

2778

2737

#: bzrlib/builtins.py:3609

2779

#: bzrlib/builtins.py:3702

2738

2780

msgid ""

2739

2781

"unique file texts\n"

2740

2782

" This is the total number of unique file contents\n"

2741

2783

" seen in the checked revisions. It does not indicate a problem."

2742

2784

msgstr ""

2785

"unique file texts\n"

2786

" チェックしたリビジョンの中にある、一意なファイルコンテンツの数です。\n"

2787

" これは問題ではありません。"

2743

2788

2744

#: bzrlib/builtins.py:3613

2789

#: bzrlib/builtins.py:3706

2745

2790

msgid ""

2746

2791

"repeated file texts\n"

2747

2792

" This is the total number of repeated texts seen\n"

2749

2794

" entries are modified, but the file contents are not. It does not\n"

2750

2795

" indicate a problem."

2751

2796

msgstr ""

2797

"repeated file texts\n"

2798

" チェックしたリビジョンの中にある、重複したテキストの数です。\n"

2799

" ファイルのエントリが変更されたが、内容は変更されていない場合に、\n"

2800

" 重複が発生します。これは問題ではありません。"

2752

2801

2753

#: bzrlib/builtins.py:3619

2802

#: bzrlib/builtins.py:3712

2754

2803

msgid ""

2755

2804

"If no restrictions are specified, all Bazaar data that is found at the "

2756

2805

"given\n"

2757

2806

"location will be checked."

2758

2807

msgstr ""

2808

"条件が指定されなければ、指定された場所の全てのBazaarデータが\n"

2809

"チェックされます。"

2759

2810

2760

#: bzrlib/builtins.py:3624

2811

#: bzrlib/builtins.py:3717

2761

2812

msgid " Check the tree and branch at 'foo'::"

2762

2813

msgstr " ‘foo’ でのツリーとブランチをチェックする::"

2763

2814

2764

#: bzrlib/builtins.py:3626

2815

#: bzrlib/builtins.py:3719

2765

2816

msgid " bzr check --tree --branch foo"

2766

2817

msgstr " bzr check --tree --branch foo"

2767

2818

2768

#: bzrlib/builtins.py:3628

2819

#: bzrlib/builtins.py:3721

2769

2820

msgid " Check only the repository at 'bar'::"

2770

2821

msgstr " ‘bar’でのリポジトリのみをチェックする::"

2771

2822

2772

#: bzrlib/builtins.py:3630

2823

#: bzrlib/builtins.py:3723

2773

2824

msgid " bzr check --repo bar"

2774

2825

msgstr " bzr check --repo bar"

2775

2826

2776

#: bzrlib/builtins.py:3632

2827

#: bzrlib/builtins.py:3725

2777

2828

msgid " Check everything at 'baz'::"

2778

2829

msgstr " ‘baz’ ですべてをチェックする::"

2779

2830

2780

#: bzrlib/builtins.py:3634

2831

#: bzrlib/builtins.py:3727

2781

2832

msgid " bzr check baz"

2782

2833

msgstr " bzr check baz"

2783

2834

2784

#: bzrlib/builtins.py:3640

2835

#: bzrlib/builtins.py:3733

2785

2836

msgid "Check the branch related to the current directory."

2786

2837

msgstr "現在のディレクトリに関連したブランチをチェックする。"

2787

2838

2788

#: bzrlib/builtins.py:3642

2839

#: bzrlib/builtins.py:3735

2789

2840

msgid "Check the repository related to the current directory."

2790

2841

msgstr "現在のディレクトリに関連したリポジトリをチェックする。"

2791

2842

2792

#: bzrlib/builtins.py:3644

2843

#: bzrlib/builtins.py:3737

2793

2844

msgid "Check the working tree related to the current directory."

2794

2845

msgstr "現在のディレクトリに関連した作業ツリーをチェックする。"

2795

2846

2796

#: bzrlib/builtins.py:3658

2847

#: bzrlib/builtins.py:3751

2797

2848

msgid "Upgrade a repository, branch or working tree to a newer format."

2798

msgstr ""

2849

msgstr "リポジトリ、ブランチ、作業ツリーを新しいフォーマットにアップグレードします。"

2799

2850

2800

#: bzrlib/builtins.py:3660

2851

#: bzrlib/builtins.py:3753

2801

2852

msgid ""

2802

2853

"When the default format has changed after a major new release of\n"

2803

2854

"Bazaar, you may be informed during certain operations that you\n"

2805

2856

"or make new features available. It may however limit interoperability\n"

2806

2857

"with older repositories or with older versions of Bazaar."

2807

2858

msgstr ""

2859

"Bazaarのメジャーリリースの後にデフォルトのフォーマットが変更された場合、\n"

2860

"いくつかのオペレーションの際に、アップグレードすべきであると通知されます。\n"

2861

"新しいフォーマットへのアップグレードによって、パフォーマンスが改善されたり、\n"

2862

"新しい機能が使えるようになるでしょう。ただし、古いバージョンのリポジトリや\n"

2863

"Bazaarとの互換性には制限が発生するかもしれません。"

2808

2864

2809

#: bzrlib/builtins.py:3666

2865

#: bzrlib/builtins.py:3759

2810

2866

msgid ""

2811

2867

"If you wish to upgrade to a particular format rather than the\n"

2812

2868

"current default, that can be specified using the --format option.\n"

2815

2871

"a one way process (e.g. changing from the 1.x default to the\n"

2816

2872

"2.x default) so downgrading is not always possible."

2817

2873

msgstr ""

2874

"デフォルトではなく特定のフォーマットにアップグレードしたい場合は、--format\n"

2875

"オプションで指定します。これを利用して、upgradeコマンドで昔のフォーマットに\n"

2876

"*\"ダウングレード\"* することもできますが、変換処理によっては不可逆なものも\n"

2877

"あります。(たとえば、1.xのデフォルトから2.xのデフォルトへの変換は不可逆です)\n"

2878

"そのため、ダウングレードできない場合もあります。"

2818

2879

2819

#: bzrlib/builtins.py:3673

2880

#: bzrlib/builtins.py:3766

2820

2881

msgid ""

2821

2882

"A backup.bzr.~#~ directory is created at the start of the conversion\n"

2822

2883

"process (where # is a number). By default, this is left there on\n"

2826

2887

"Alternatively, you can delete it by hand if everything looks good\n"

2827

2888

"afterwards."

2828

2889

msgstr ""

2890

"変換を開始したときに、 backup.bzr.~#~ というディレクトリが作成されます。\n"

2891

"(#は連番です) デフォルトでは、このフォルダは変換後も残ります。もし変換が\n"

2892

"失敗したら、新しい.bzrフォルダを削除して、このフォルダを元の名前に戻して\n"

2893

"ください。--cleanオプションを指定すると、変換が成功したらbackup.bzr\n"

2894

"ディレクトリは削除されます。そうでない場合は、変換後特に問題がなければ手で\n"

2895

"削除してください。"

2829

2896

2830

#: bzrlib/builtins.py:3681

2897

#: bzrlib/builtins.py:3774

2831

2898

msgid ""

2832

2899

"If the location given is a shared repository, dependent branches\n"

2833

2900

"are also converted provided the repository converts successfully.\n"

2834

2901

"If the conversion of a branch fails, remaining branches are still\n"

2835

2902

"tried."

2836

2903

msgstr ""

2904

"指定された場所が共用リポジトリの場合、リポジトリの変換が成功したら\n"

2905

"配下のブランチも変換されます。もしブランチの変換に失敗しても、他の\n"

2906

"ブランチの変換は続行されます。"

2837

2907

2838

#: bzrlib/builtins.py:3686

2908

#: bzrlib/builtins.py:3779

2839

2909

msgid ""

2840

2910

"For more information on upgrades, see the Bazaar Upgrade Guide,\n"

2841

2911

"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."

2842

2912

msgstr ""

2913

"アップグレードに関する詳細な情報は、Bazaar Upgrade Guideをご覧ください。\n"

2914

"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."

2843

2915

2844

#: bzrlib/builtins.py:3694

2916

#: bzrlib/builtins.py:3787

2845

2917

msgid "Upgrade to a specific format. See \"bzr help formats\" for details."

2846

msgstr ""

2918

msgstr "指定されたフォーマットにアップグレードします。詳細は\"bzr help formats\"をご覧ください。"

2847

2919

2848

#: bzrlib/builtins.py:3698

2920

#: bzrlib/builtins.py:3791

2849

2921

msgid "Branch format"

2850

msgstr ""

2922

msgstr "ブランチフォーマット"

2851

2923

2852

#: bzrlib/builtins.py:3700

2924

#: bzrlib/builtins.py:3793

2853

2925

msgid "Remove the backup.bzr directory if successful."

2854

msgstr ""

2926

msgstr "変換に成功したらbackup.bzrディレクトリを削除します。"

2855

2927

2856

#: bzrlib/builtins.py:3702

2928

#: bzrlib/builtins.py:3795

2857

2929

msgid "Show what would be done, but don't actually do anything."

2858

msgstr ""

2930

msgstr "何が実行されるかを表示しますが、実際には何もしません。"

2859

2931

2860

#: bzrlib/builtins.py:3717

2932

#: bzrlib/builtins.py:3810

2861

2933

msgid "Show or set bzr user id."

2862

msgstr ""

2934

msgstr "bzrのユーザIDを表示、設定します。"

2863

2935

2864

#: bzrlib/builtins.py:3719

2936

#: bzrlib/builtins.py:3812

2865

2937

msgid ""

2866

2938

":Examples:\n"

2867

2939

" Show the email of the current user::"

2868

2940

msgstr ""

2941

":例:\n"

2942

" 現在のユーザのEメールを表示します。::"

2869

2943

2870

#: bzrlib/builtins.py:3722

2944

#: bzrlib/builtins.py:3815

2871

2945

msgid " bzr whoami --email"

2872

msgstr ""

2946

msgstr " bzr whoami --email"

2873

2947

2874

#: bzrlib/builtins.py:3724

2948

#: bzrlib/builtins.py:3817

2875

2949

msgid " Set the current user::"

2876

msgstr ""

2950

msgstr " ユーザを設定します。::"

2877

2951

2878

#: bzrlib/builtins.py:3726

2952

#: bzrlib/builtins.py:3819

2879

2953

msgid " bzr whoami \"Frank Chu <fchu@example.com>\""

2880

msgstr ""

2954

msgstr " bzr whoami \"Frank Chu <fchu@example.com>\""

2881

2955

2882

#: bzrlib/builtins.py:3730

2956

#: bzrlib/builtins.py:3823

2883

2957

msgid "Display email address only."

2884

msgstr ""

2958

msgstr "Eメールアドレスだけを表示します。"

2885

2959

2886

#: bzrlib/builtins.py:3732

2960

#: bzrlib/builtins.py:3825

2887

2961

msgid "Set identity for the current branch instead of globally."

2888

msgstr ""

2962

msgstr "全体設定ではなく、現在のブランチだけにIDを設定します。"

2889

2963

2890

#: bzrlib/builtins.py:3758

2964

#: bzrlib/builtins.py:3851

2891

2965

msgid "--email can only be used to display existing identity"

2892

msgstr ""

2966

msgstr "--emailは、現在のIDを表示するためだけに使用できます。"

2893

2967

2894

#: bzrlib/builtins.py:3780

2968

#: bzrlib/builtins.py:3873

2895

2969

msgid "Print or set the branch nickname."

2896

msgstr ""

2970

msgstr "ブランチのニックネームを表示または設定します。"

2897

2971

2898

#: bzrlib/builtins.py:3782

2972

#: bzrlib/builtins.py:3875

2899

2973

msgid ""

2900

2974

"If unset, the tree root directory name is used as the nickname.\n"

2901

2975

"To print the current nickname, execute with no argument."

2902

2976

msgstr ""

2977

"設定されていない場合は、ツリーのルートディレクトリの名前が\n"

2978

"ニックネームとして扱われます。引数なしで実行すると、現在の\n"

2979

"ニックネームを表示します。"

2903

2980

2904

#: bzrlib/builtins.py:3785

2981

#: bzrlib/builtins.py:3878

2905

2982

msgid ""

2906

2983

"Bound branches use the nickname of its master branch unless it is set\n"

2907

2984

"locally."

2908

2985

msgstr ""

2986

"バインドされたブランチは、ローカルでニックネームが設定されていなければ\n"

2987

"マスタブランチのニックネームを使用します。"

2909

2988

2910

#: bzrlib/builtins.py:3805

2989

#: bzrlib/builtins.py:3898

2911

2990

msgid "Set/unset and display aliases."

2912

msgstr ""

2991

msgstr "エイリアスの設定、解除、表示を行います。"

2913

2992

2914

#: bzrlib/builtins.py:3807

2993

#: bzrlib/builtins.py:3900

2915

2994

msgid ""

2916

2995

":Examples:\n"

2917

2996

" Show the current aliases::"

2918

2997

msgstr ""

2998

":例:\n"

2999

" 現在のエイリアスを表示します。::"

2919

3000

2920

#: bzrlib/builtins.py:3810

3001

#: bzrlib/builtins.py:3903

2921

3002

msgid " bzr alias"

2922

msgstr ""

3003

msgstr " bzr alias"

2923

3004

2924

#: bzrlib/builtins.py:3812

3005

#: bzrlib/builtins.py:3905

2925

3006

msgid " Show the alias specified for 'll'::"

2926

msgstr ""

3007

msgstr " 'll'に設定されているエイリアスを表示します。::"

2927

3008

2928

#: bzrlib/builtins.py:3814

3009

#: bzrlib/builtins.py:3907

2929

3010

msgid " bzr alias ll"

2930

msgstr ""

3011

msgstr " bzr alias ll"

2931

3012

2932

#: bzrlib/builtins.py:3816

3013

#: bzrlib/builtins.py:3909

2933

3014

msgid " Set an alias for 'll'::"

2934

msgstr ""

3015

msgstr " エイリアス'll'を設定します。::"

2935

3016

2936

#: bzrlib/builtins.py:3818

3017

#: bzrlib/builtins.py:3911

2937

3018

msgid " bzr alias ll=\"log --line -r-10..-1\""

2938

msgstr ""

3019

msgstr " bzr alias ll=\"log --line -r-10..-1\""

2939

3020

2940

#: bzrlib/builtins.py:3820

3021

#: bzrlib/builtins.py:3913

2941

3022

msgid " To remove an alias for 'll'::"

2942

msgstr ""

3023

msgstr " エイリアス'll'を解除します。::"

2943

3024

2944

#: bzrlib/builtins.py:3822

3025

#: bzrlib/builtins.py:3915

2945

3026

msgid " bzr alias --remove ll"

2946

msgstr ""

3027

msgstr " bzr alias --remove ll"

2947

3028

2948

#: bzrlib/builtins.py:3827

3029

#: bzrlib/builtins.py:3920

2949

3030

msgid "Remove the alias."

2950

msgstr ""

3031

msgstr "エイリアスを削除します。"

2951

3032

2952

#: bzrlib/builtins.py:3845

3033

#: bzrlib/builtins.py:3938

2953

3034

msgid "bzr alias --remove expects an alias to remove."

2954

msgstr ""

3035

msgstr "bzr alias --removeには、削除するエイリアス名を指定する必要があります。"

2955

3036

2956

#: bzrlib/builtins.py:4026

3037

#: bzrlib/builtins.py:4119

2957

3038

msgid ""

2958

3039

"subunit not available. subunit needs to be installed to use --subunit."

2959

3040

msgstr ""

2960

3041

2961

#: bzrlib/builtins.py:4043

3042

#: bzrlib/builtins.py:4136

2962

3043

msgid ""

2963

3044

"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"

2964

msgstr ""

3045

msgstr "--benchmarkは、bzr2.2以降はサポートしていません。かわりにbzr-usertestを使用してください。"

2965

3046

2966

#: bzrlib/builtins.py:4090

3047

#: bzrlib/builtins.py:4183

2967

3048

msgid "Show version of bzr."

2968

msgstr ""

3049

msgstr "Bazaarのバージョンを表示します。"

2969

3050

2970

#: bzrlib/builtins.py:4094

3051

#: bzrlib/builtins.py:4187

2971

3052

msgid "Print just the version number."

2972

msgstr ""

3053

msgstr "リビジョン番号を表示します。"

2973

3054

2974

#: bzrlib/builtins.py:4113

3055

#: bzrlib/builtins.py:4206

2975

3056

msgid "It sure does!\n"

2976

3057

msgstr ""

2977

3058

2978

#: bzrlib/builtins.py:4137

3059

#: bzrlib/builtins.py:4230

2979

3060

#, python-format

2980

3061

msgid "merge base is revision %s\n"

2981

msgstr ""

3062

msgstr "マージの起点はリビジョン %s です。\n"

2982

3063

2983

#: bzrlib/builtins.py:4141

3064

#: bzrlib/builtins.py:4234

2984

3065

msgid "Perform a three-way merge."

2985

msgstr ""

3066

msgstr "3wayマージを実行します。"

2986

3067

2987

#: bzrlib/builtins.py:4143

3068

#: bzrlib/builtins.py:4236

2988

3069

msgid ""

2989

3070

"The source of the merge can be specified either in the form of a branch,\n"

2990

3071

"or in the form of a path to a file containing a merge directive generated\n"

2994

3075

"branch: in this case, only the modifications to that file are merged into\n"

2995

3076

"the current working tree."

2996

3077

msgstr ""

3078

"マージ元には、ブランチか、bzr sendで作られたマージディレクティブファイル\n"

3079

"のパスを指定できます。どちらも指定されていない場合は、アップストリームブランチ\n"

3080

"か、一番最後に--remember指定でマージした時のマージ元がデフォルトになります。\n"

3081

"別のブランチ内のファイルパスをマージ元として指定することもでき、その場合は\n"

3082

"指定されたファイルの変更だけが現在のブランチにマージされます。"

2997

3083

2998

#: bzrlib/builtins.py:4151

3084

#: bzrlib/builtins.py:4244

2999

3085

msgid ""

3000

3086

"When merging from a branch, by default bzr will try to merge in all new\n"

3001

3087

"work from the other branch, automatically determining an appropriate base\n"

3002

3088

"revision. If this fails, you may need to give an explicit base."

3003

3089

msgstr ""

3090

"ブランチからマージする場合、デフォルトでbzrは自動的に妥当なベースリビジョンを\n"

3091

"判定し、それ以降のすべての変更をマージしようとします。もしこれが失敗した場合は、\n"

3092

"明示的にベースリビジョンを指定する必要があります。"

3004

3093

3005

#: bzrlib/builtins.py:4155

3094

#: bzrlib/builtins.py:4248

3006

3095

msgid ""

3007

3096

"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"

3008

3097

"try to merge in all new work up to and including revision OTHER."

3009

3098

msgstr ""

3099

"別の最終リビジョンを指定するには、\"-revision OTHER\"を指定します。この場合、\n"

3100

"OTHERまで(OTHERも含む)の全ての変更がマージされます。"

3010

3101

3011

#: bzrlib/builtins.py:4158

3102

#: bzrlib/builtins.py:4251

3012

3103

msgid ""

3013

3104

"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"

3014

3105

"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"

3018

3109

"cherrypicks. The changes look like a normal commit, and the history of the\n"

3019

3110

"changes from the other branch is not stored in the commit."

3020

3111

msgstr ""

3112

"もし、２つのリビジョンを指定した場合(\"--revision BASE..OTHER\")、BASEから\n"

3113

"OTHERの範囲(BASEは含まず、OTHERは含む)のリビジョンがマージされます。これに\n"

3114

"よってスキップされるリビジョンがある場合、つまりマージ先のリビジョンにBASE\n"

3115

"が含まれていない場合は、いわゆる\"チェリーピック\"が行われます。通常のマージ\n"

3116

"とはちがい、今のところBazaarではチェリーピックは追跡しません。変更は、普通の\n"

3117

"コミットのように見え、マージ元での変更履歴は保存されません。"

3021

3118

3022

#: bzrlib/builtins.py:4166

3119

#: bzrlib/builtins.py:4259

3023

3120

msgid "Revision numbers are always relative to the source branch."

3024

msgstr ""

3121

msgstr "リビジョン番号は常に元のブランチに関連します。"

3025

3122

3026

#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106

3123

#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106

3027

3124

msgid ""

3028

3125

"Merge will do its best to combine the changes in two branches, but there\n"

3029

3126

"are some kinds of problems only a human can fix. When it encounters those,\n"

3030

3127

"it will mark a conflict. A conflict means that you need to fix something,\n"

3031

"before you should commit."

3128

"before you can commit."

3032

3129

msgstr ""

3033

3130

3034

#: bzrlib/builtins.py:4173

3131

#: bzrlib/builtins.py:4266

3035

3132

msgid ""

3036

3133

"Use bzr resolve when you have fixed a problem. See also bzr conflicts."

3037

msgstr ""

3134

msgstr "問題を解消したら、bzr resolveを使用してください。bzr conflictsもご覧ください。"

3038

3135

3039

#: bzrlib/builtins.py:4175

3136

#: bzrlib/builtins.py:4268

3040

3137

msgid ""

3041

3138

"If there is no default branch set, the first merge will set it (use\n"

3042

3139

"--no-remember to avoid setting it). After that, you can omit the branch\n"

3043

3140

"to use the default. To change the default, use --remember. The value will\n"

3044

3141

"only be saved if the remote location can be accessed."

3045

3142

msgstr ""

3143

"デフォルトブランチが設定されていない場合、最初にマージを実行したときに\n"

3144

"設定されます。(これをしないようにするには、--no-rememberを指定します。)\n"

3145

"その後は、デフォルトのブランチを使用する時には指定を省略できるようになり\n"

3146

"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモートの\n"

3147

"ブランチにアクセスできた時だけ保存されます。"

3046

3148

3047

#: bzrlib/builtins.py:4180

3149

#: bzrlib/builtins.py:4273

3048

3150

msgid ""

3049

3151

"The results of the merge are placed into the destination working\n"

3050

3152

"directory, where they can be reviewed (with bzr diff), tested, and then\n"

3051

3153

"committed to record the result of the merge."

3052

3154

msgstr ""

3155

"マージの結果はマージ先の作業ツリー内に反映され、そこで(bzr diffを使って)\n"

3156

"レビューしたり、テストをしたあとで、コミットによって記録することができます。"

3053

3157

3054

#: bzrlib/builtins.py:4184

3158

#: bzrlib/builtins.py:4277

3055

3159

msgid ""

3056

3160

"merge refuses to run if there are any uncommitted changes, unless\n"

3057

3161

"--force is given. If --force is given, then the changes from the source \n"

3059

3163

"changes in the tree. The --force option can also be used to create a\n"

3060

3164

"merge revision which has more than two parents."

3061

3165

msgstr ""

3166

"コミットされていない変更がある場合は、--forceを指定しないとマージは拒否\n"

3167

"されます。--forceが指定された場合は、未コミットの変更を含む現在の作業ツリーに\n"

3168

"マージ元の変更がマージされます。--forceオプションを使えば、２つ以上の親を持つ\n"

3169

"マージリビジョンを作ることもできます。"

3062

3170

3063

#: bzrlib/builtins.py:4190

3171

#: bzrlib/builtins.py:4283

3064

3172

msgid ""

3065

3173

"If one would like to merge changes from the working tree of the other\n"

3066

3174

"branch without merging any committed revisions, the --uncommitted option\n"

3067

3175

"can be given."

3068

3176

msgstr ""

3177

"コミット済みの変更ではなく、作業ツリー上での変更を別のブランチにマージしたい\n"

3178

"場合は、--uncommittedオプションを指定することができます。"

3069

3179

3070

#: bzrlib/builtins.py:4194

3180

#: bzrlib/builtins.py:4287

3071

3181

msgid ""

3072

3182

"To select only some changes to merge, use \"merge -i\", which will prompt\n"

3073

3183

"you to apply each diff hunk and file change, similar to \"shelve\"."

3074

3184

msgstr ""

3185

"変更を部分的にマージしたければ、\"merge -i\"を使用すれば、\"shelve\"と同じ\n"

3186

"ようにそれぞれのハンクをプロンプトで選択して適用することができます。"

3075

3187

3076

#: bzrlib/builtins.py:4197

3188

#: bzrlib/builtins.py:4290

3077

3189

msgid ""

3078

3190

":Examples:\n"

3079

3191

" To merge all new revisions from bzr.dev::"

3080

3192

msgstr ""

3193

":例:\n"

3194

" bzr.devから全ての新しいリビジョンをマージします。::"

3081

3195

3082

#: bzrlib/builtins.py:4200

3196

#: bzrlib/builtins.py:4293

3083

3197

msgid " bzr merge ../bzr.dev"

3084

msgstr ""

3198

msgstr " bzr merge ../bzr.dev"

3085

3199

3086

#: bzrlib/builtins.py:4202

3200

#: bzrlib/builtins.py:4295

3087

3201

msgid " To merge changes up to and including revision 82 from bzr.dev::"

3088

msgstr ""

3202

msgstr " bzr.devから、リビジョン82まで(82も含む)のリビジョンをマージします::"

3089

3203

3090

#: bzrlib/builtins.py:4204

3204

#: bzrlib/builtins.py:4297

3091

3205

msgid " bzr merge -r 82 ../bzr.dev"

3092

msgstr ""

3206

msgstr " bzr merge -r 82 ../bzr.dev"

3093

3207

3094

#: bzrlib/builtins.py:4206

3208

#: bzrlib/builtins.py:4299

3095

3209

msgid " To merge the changes introduced by 82, without previous changes::"

3096

msgstr ""

3210

msgstr " リビジョン82での変更をマージし、それ以前の変更はマージしません。::"

3097

3211

3098

#: bzrlib/builtins.py:4208

3212

#: bzrlib/builtins.py:4301

3099

3213

msgid " bzr merge -r 81..82 ../bzr.dev"

3100

msgstr ""

3214

msgstr " bzr merge -r 81..82 ../bzr.dev"

3101

3215

3102

#: bzrlib/builtins.py:4210

3216

#: bzrlib/builtins.py:4303

3103

3217

msgid " To apply a merge directive contained in /tmp/merge::"

3104

msgstr ""

3218

msgstr " /tmp/merge内のマージディレクティブを適用します。::"

3105

3219

3106

#: bzrlib/builtins.py:4212

3220

#: bzrlib/builtins.py:4305

3107

3221

msgid " bzr merge /tmp/merge"

3108

msgstr ""

3222

msgstr " bzr merge /tmp/merge"

3109

3223

3110

#: bzrlib/builtins.py:4214

3224

#: bzrlib/builtins.py:4307

3111

3225

msgid ""

3112

3226

" To create a merge revision with three parents from two branches\n"

3113

3227

" feature1a and feature1b:"

3114

3228

msgstr ""

3229

" feature1a、feature1bの２つのブランチから、３つの親を持つマージ\n"

3230

" リビジョンを作ります。::"

3115

3231

3116

#: bzrlib/builtins.py:4217

3232

#: bzrlib/builtins.py:4310

3117

3233

msgid ""

3118

3234

" bzr merge ../feature1a\n"

3119

3235

" bzr merge ../feature1b --force\n"

3120

3236

" bzr commit -m 'revision with three parents'"

3121

3237

msgstr ""

3238

" bzr merge ../feature1a\n"

3239

" bzr merge ../feature1b --force\n"

3240

" bzr commit -m 'revision with three parents'"

3122

3241

3123

#: bzrlib/builtins.py:4229

3242

#: bzrlib/builtins.py:4322

3124

3243

msgid "Merge even if the destination tree has uncommitted changes."

3125

msgstr ""

3244

msgstr "マージ先のツリーにコミットしていない変更があってもマージします。"

3126

3245

3127

#: bzrlib/builtins.py:4235

3246

#: bzrlib/builtins.py:4328

3128

3247

msgid ""

3129

3248

"Apply uncommitted changes from a working copy, instead of branch changes."

3130

msgstr ""

3249

msgstr "ブランチの変更ではなく、作業コピー上のコミットしていない変更をマージします。"

3131

3250

3132

#: bzrlib/builtins.py:4237

3251

#: bzrlib/builtins.py:4330

3133

3252

msgid ""

3134

3253

"If the destination is already completely merged into the source, pull from "

3135

3254

"the source rather than merging. When this happens, you do not need to "

3136

3255

"commit the result."

3137

3256

msgstr ""

3257

"マージ先のリビジョンがマージ元のブランチにすべて含まれている場合、マージの\n"

3258

"かわりにpullを実行します。その場合は、コミットする必要はありません。"

3138

3259

3139

#: bzrlib/builtins.py:4242

3260

#: bzrlib/builtins.py:4335

3140

3261

msgid ""

3141

3262

"Branch to merge into, rather than the one containing the working directory."

3142

msgstr ""

3263

msgstr "作業ディレクトリ以外にマージする場合の、マージ先のブランチ。"

3143

3264

3144

#: bzrlib/builtins.py:4244

3265

#: bzrlib/builtins.py:4337

3145

3266

msgid "Instead of merging, show a diff of the merge."

3146

msgstr ""

3267

msgstr "マージを実行するかわりに、マージされる内容のdiffを表示します。"

3147

3268

3148

#: bzrlib/builtins.py:4246

3269

#: bzrlib/builtins.py:4339

3149

3270

msgid "Select changes interactively."

3150

msgstr ""

3271

msgstr "変更をインタラクティブに選択します。"

3151

3272

3152

#: bzrlib/builtins.py:4268

3273

#: bzrlib/builtins.py:4361

3153

3274

msgid ""

3154

3275

"Merging into empty branches not currently supported, "

3155

3276

"https://bugs.launchpad.net/bzr/+bug/308562"

3156

3277

msgstr ""

3278

"空ブランチへのマージは今のところサポートされていません。https://bugs.launchpad.net/bzr/+bug/308562"

3157

3279

3158

#: bzrlib/builtins.py:4295

3280

#: bzrlib/builtins.py:4388

3159

3281

msgid "Cannot use --uncommitted with bundles or merge directives."

3160

msgstr ""

3282

msgstr "バンドル、マージディレクティブに対して--uncommittedを指定することはできません。"

3161

3283

3162

#: bzrlib/builtins.py:4306

3284

#: bzrlib/builtins.py:4399

3163

3285

msgid "Cannot use --uncommitted and --revision at the same time."

3164

msgstr ""

3286

msgstr "--uncommittedと--revisionを同時に指定することはできません。"

3165

3287

3166

#: bzrlib/builtins.py:4326

3288

#: bzrlib/builtins.py:4419

3167

3289

msgid "merger: "

3168

3290

msgstr ""

3169

3291

3170

#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71

3292

#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71

3171

3293

msgid "Nothing to do."

3172

msgstr ""

3294

msgstr "なにもすることがありません。"

3173

3295

3174

#: bzrlib/builtins.py:4332

3296

#: bzrlib/builtins.py:4425

3175

3297

msgid "Cannot pull individual files"

3176

msgstr ""

3298

msgstr "ファイルを個別にpullすることはできません。"

3177

3299

3178

#: bzrlib/builtins.py:4340

3300

#: bzrlib/builtins.py:4433

3179

3301

msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"

3180

msgstr ""

3302

msgstr "ブランチにコミットがありません。('bzr pull'を使うべきかもしれません)"

3181

3303

3182

#: bzrlib/builtins.py:4398

3304

#: bzrlib/builtins.py:4491

3183

3305

#, python-format

3184

3306

msgid "Show-base is not supported for this merge type. %s"

3185

msgstr ""

3307

msgstr "Show-baseはこのマージタイプではサポートされません。 %s"

3186

3308

3187

#: bzrlib/builtins.py:4407

3309

#: bzrlib/builtins.py:4500

3188

3310

#, python-format

3189

3311

msgid "Conflict reduction is not supported for merge type %s."

3190

msgstr ""

3312

msgstr "衝突の縮小化は、このマージタイプではサポートされません。 %s"

3191

3313

3192

#: bzrlib/builtins.py:4411

3314

#: bzrlib/builtins.py:4504

3193

3315

msgid "Cannot do conflict reduction and show base."

3194

msgstr ""

3316

msgstr "衝突の縮小化、ベースの表示ができませんでした。"

3195

3317

3196

#: bzrlib/builtins.py:4522

3318

#: bzrlib/builtins.py:4615

3197

3319

msgid "No location specified or remembered"

3198

msgstr ""

3320

msgstr "対象の場所が設定も指定もされていません。"

3199

3321

3200

#: bzrlib/builtins.py:4524

3322

#: bzrlib/builtins.py:4617

3201

3323

msgid "{0} remembered {1} location {2}"

3202

msgstr ""

3324

msgstr "{0} 設定された {1} の場所 {2}"

3203

3325

3204

#: bzrlib/builtins.py:4530

3326

#: bzrlib/builtins.py:4623

3205

3327

msgid "Redo a merge."

3206

msgstr ""

3328

msgstr "マージをやりなおします。"

3207

3329

3208

#: bzrlib/builtins.py:4532

3330

#: bzrlib/builtins.py:4625

3209

3331

msgid ""

3210

3332

"Use this if you want to try a different merge technique while resolving\n"

3211

3333

"conflicts. Some merge techniques are better than others, and remerge\n"

3212

3334

"lets you try different ones on different files."

3213

3335

msgstr ""

3336

"衝突を解決するために、別のマージ方法を試したい場合に、このコマンドを\n"

3337

"使用します。他のものより優れたマージ方法があり、remergeを使って個々の\n"

3338

"ファイルに別のマージ方法を試すことができます。"

3214

3339

3215

#: bzrlib/builtins.py:4536

3340

#: bzrlib/builtins.py:4629

3216

3341

msgid ""

3217

3342

"The options for remerge have the same meaning and defaults as the ones for\n"

3218

3343

"merge. The difference is that remerge can (only) be run when there is a\n"

3219

3344

"pending merge, and it lets you specify particular files."

3220

3345

msgstr ""

3346

"remergeのオプションの意味とデフォルトはmergeと同じです。違いは、\n"

3347

"remergeはマージ中状態のときだけ実行でき、特定のファイルを指定できる\n"

3348

"ということです。"

3221

3349

3222

#: bzrlib/builtins.py:4540

3350

#: bzrlib/builtins.py:4633

3223

3351

msgid ""

3224

3352

":Examples:\n"

3225

3353

" Re-do the merge of all conflicted files, and show the base text in\n"

3226

3354

" conflict regions, in addition to the usual THIS and OTHER texts::"

3227

3355

msgstr ""

3356

":例:\n"

3357

" すべての衝突したファイルのマージをやり直し、通常のTHIS、OTHERの\n"

3358

" テキストにくわえて衝突した領域のベーステキストを表示します。::"

3228

3359

3229

#: bzrlib/builtins.py:4544

3360

#: bzrlib/builtins.py:4637

3230

3361

msgid " bzr remerge --show-base"

3231

msgstr ""

3362

msgstr " bzr remerge --show-base"

3232

3363

3233

#: bzrlib/builtins.py:4546

3364

#: bzrlib/builtins.py:4639

3234

3365

msgid ""

3235

3366

" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"

3236

3367

" additional processing to reduce the size of conflict regions::"

3237

3368

msgstr ""

3369

" \"foobar\"のマージを、weaveマージアルゴリズムでやりなおし、衝突領域の\n"

3370

" 縮小化処理も行います。::"

3238

3371

3239

#: bzrlib/builtins.py:4549

3372

#: bzrlib/builtins.py:4642

3240

3373

msgid " bzr remerge --merge-type weave --reprocess foobar"

3241

msgstr ""

3374

msgstr " bzr remerge --merge-type weave --reprocess foobar"

3242

3375

3243

#: bzrlib/builtins.py:4556

3376

#: bzrlib/builtins.py:4649

3244

3377

msgid "Show base revision text in conflicts."

3245

msgstr ""

3378

msgstr "衝突したベースリビジョンのテキストを表示します。"

3246

3379

3247

#: bzrlib/builtins.py:4568

3380

#: bzrlib/builtins.py:4661

3248

3381

msgid ""

3249

3382

"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"

3250

3383

"merges."

3251

3384

msgstr ""

3385

"remergeは通常のマージ後にだけ実行できます。チェリーピックや複数マージでは\r\n"

3386

"利用できません。"

3252

3387

3253

#: bzrlib/builtins.py:4624

3388

#: bzrlib/builtins.py:4717

3254

3389

msgid "Revert files to a previous revision."

3255

msgstr ""

3390

msgstr "ファイルを過去のリビジョンに戻します。"

3256

3391

3257

#: bzrlib/builtins.py:4626

3392

#: bzrlib/builtins.py:4719

3258

3393

msgid ""

3259

3394

"Giving a list of files will revert only those files. Otherwise, all files\n"

3260

3395

"will be reverted. If the revision is not specified with '--revision', the\n"

3261

3396

"last committed revision is used."

3262

3397

msgstr ""

3398

"ファイルのリストを指定すると、そのファイルだけが元に戻されます。\n"

3399

"そうでない場合は、全てのファイルが対象になります。--revisionで\n"

3400

"リビジョンを指定しない場合は、最後にコミットされたリビジョンが使用\n"

3401

"されます。"

3263

3402

3264

#: bzrlib/builtins.py:4630

3403

#: bzrlib/builtins.py:4723

3265

3404

msgid ""

3266

3405

"To remove only some changes, without reverting to a prior version, use\n"

3267

3406

"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"

3269

3408

"affecting the changes introduced by the last commit (-1). To remove\n"

3270

3409

"certain changes on a hunk-by-hunk basis, see the shelve command."

3271

3410

msgstr ""

3411

"以前のリビジョンに戻さずにいくつかの変更を取り除くには、mergeをかわりに\n"

3412

"使用します。例えば、\"merge . -r -2..-3\" (.を忘れないように)で、最終リビジョン\n"

3413

"(-1)での変更はそのままで、その一つ前のリビジョン(-2)での変更だけを取り\n"

3414

"除くことができます。特定の変更をハンクごと取り除く方法は、shelveをご覧\n"

3415

"ください。"

3272

3416

3273

#: bzrlib/builtins.py:4636

3417

#: bzrlib/builtins.py:4729

3274

3418

msgid ""

3275

3419

"By default, any files that have been manually changed will be backed up\n"

3276

3420

"first. (Files changed only by merge are not backed up.) Backup files have\n"

3277

3421

"'.~#~' appended to their name, where # is a number."

3278

3422

msgstr ""

3423

"デフォルトでは、手で変更されたファイルは最初にバックアップされます。(merge\n"

3424

"コマンドで変更されただけのファイルはバックアップされません)バックアップ\n"

3425

"ファイル名は、元の名前に「.~#~」(#は数字)を付け足したものになります。"

3279

3426

3280

#: bzrlib/builtins.py:4640

3427

#: bzrlib/builtins.py:4733

3281

3428

msgid ""

3282

3429

"When you provide files, you can use their current pathname or the pathname\n"

3283

3430

"from the target revision. So you can use revert to \"undelete\" a file by\n"

3284

3431

"name. If you name a directory, all the contents of that directory will be\n"

3285

3432

"reverted."

3286

3433

msgstr ""

3434

"ファイル名を指定するときは、現在のファイル名か、対象リビジョン時点でのファイル\n"

3435

"名かを使うことができます。つまり、ファイル名指定で「削除の取り消し」のために\n"

3436

"revertを使うことができます。ディレクトリを指定した場合は、その配下のすべての\n"

3437

"変更が取り消されます。"

3287

3438

3288

#: bzrlib/builtins.py:4645

3439

#: bzrlib/builtins.py:4738

3289

3440

msgid ""

3290

3441

"If you have newly added files since the target revision, they will be\n"

3291

3442

"removed. If the files to be removed have been changed, backups will be\n"

3292

3443

"created as above. Directories containing unknown files will not be\n"

3293

3444

"deleted."

3294

3445

msgstr ""

3446

"対象のリビジョン以降にファイルが新しく追加されている場合は、そのファイルは\n"

3447

"削除されます。削除されるファイルが変更されている場合は、上記の通りに\n"

3448

"バックアップされます。バージョン管理外のファイルを含むディレクトリは削除され\n"

3449

"ません。"

3295

3450

3296

#: bzrlib/builtins.py:4650

3451

#: bzrlib/builtins.py:4743

3297

3452

msgid ""

3298

3453

"The working tree contains a list of revisions that have been merged but\n"

3299

3454

"not yet committed. These revisions will be included as additional parents\n"

3305

3460

"reverting any files."

3306

3461

msgstr ""

3307

3462

3308

#: bzrlib/builtins.py:4659

3463

#: bzrlib/builtins.py:4752

3309

3464

msgid ""

3310

3465

"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"

3311

3466

"changes from a branch in a single revision. To do this, perform the merge\n"

3319

3474

"target branches."

3320

3475

msgstr ""

3321

3476

3322

#: bzrlib/builtins.py:4673

3477

#: bzrlib/builtins.py:4766

3323

3478

msgid "Do not save backups of reverted files."

3324

3479

msgstr ""

3325

3480

3326

#: bzrlib/builtins.py:4675

3481

#: bzrlib/builtins.py:4768

3327

3482

msgid "Remove pending merge marker, without changing any files."

3328

3483

msgstr ""

3329

3484

3330

#: bzrlib/builtins.py:4706

3485

#: bzrlib/builtins.py:4799

3331

3486

msgid ""

3332

3487

"Show help on a command or other topic.\n"

3333

3488

" "

3334

3489

msgstr ""

3490

"コマンドもしくは他のトピックのヘルプを表示する。\n"

3491

" "

3335

3492

3336

#: bzrlib/builtins.py:4711

3493

#: bzrlib/builtins.py:4804

3337

3494

msgid "Show help on all commands."

3338

msgstr ""

3495

msgstr "全てのコマンドのヘルプを表示する。"

3339

3496

3340

#: bzrlib/builtins.py:4740

3497

#: bzrlib/builtins.py:4833

3341

3498

msgid "Show unmerged/unpulled revisions between two branches."

3342

msgstr ""

3499

msgstr "2つのブランチの間のmergeされていない/pullされていないリビジョンを表示する。"

3343

3500

3344

#: bzrlib/builtins.py:4742

3501

#: bzrlib/builtins.py:4835

3345

3502

msgid "OTHER_BRANCH may be local or remote."

3346

msgstr ""

3503

msgstr "OTHER_BRANCHはlocalもしくはremoteになります。"

3347

3504

3348

#: bzrlib/builtins.py:4744

3505

#: bzrlib/builtins.py:4837

3349

3506

msgid ""

3350

3507

"To filter on a range of revisions, you can use the command -r begin..end\n"

3351

3508

"-r revision requests a specific revision, -r ..end or -r begin.. are\n"

3356

3513

" 0 - no missing revisions"

3357

3514

msgstr ""

3358

3515

3359

#: bzrlib/builtins.py:4754

3516

#: bzrlib/builtins.py:4847

3360

3517

msgid ""

3361

3518

" Determine the missing revisions between this and the branch at the\n"

3362

3519

" remembered pull location::"

3363

3520

msgstr ""

3364

3521

3365

#: bzrlib/builtins.py:4757

3522

#: bzrlib/builtins.py:4850

3366

3523

msgid " bzr missing"

3367

msgstr ""

3524

msgstr " bzr missing"

3368

3525

3369

#: bzrlib/builtins.py:4759

3526

#: bzrlib/builtins.py:4852

3370

3527

msgid " Determine the missing revisions between this and another branch::"

3371

3528

msgstr ""

3372

3529

3373

#: bzrlib/builtins.py:4761

3530

#: bzrlib/builtins.py:4854

3374

3531

msgid " bzr missing http://server/branch"

3375

msgstr ""

3532

msgstr " bzr missing http://server/branch"

3376

3533

3377

#: bzrlib/builtins.py:4763

3534

#: bzrlib/builtins.py:4856

3378

3535

msgid ""

3379

3536

" Determine the missing revisions up to a specific revision on the other\n"

3380

3537

" branch::"

3381

3538

msgstr ""

3382

3539

3383

#: bzrlib/builtins.py:4766

3540

#: bzrlib/builtins.py:4859

3384

3541

msgid " bzr missing -r ..-10"

3385

msgstr ""

3542

msgstr " bzr missing -r ..-10"

3386

3543

3387

#: bzrlib/builtins.py:4768

3544

#: bzrlib/builtins.py:4861

3388

3545

msgid ""

3389

3546

" Determine the missing revisions up to a specific revision on this\n"

3390

3547

" branch::"

3391

3548

msgstr ""

3392

3549

3393

#: bzrlib/builtins.py:4771

3550

#: bzrlib/builtins.py:4864

3394

3551

msgid " bzr missing --my-revision ..-10"

3395

msgstr ""

3552

msgstr " bzr missing --my-revision ..-10"

3396

3553

3397

#: bzrlib/builtins.py:4778

3554

#: bzrlib/builtins.py:4871

3398

3555

msgid "Reverse the order of revisions."

3399

msgstr ""

3556

msgstr "リビジョンの表示順を逆転する。"

3400

3557

3401

#: bzrlib/builtins.py:4780

3558

#: bzrlib/builtins.py:4873

3402

3559

msgid "Display changes in the local branch only."

3403

msgstr ""

3560

msgstr "ローカルブランチの変更のみを表示する。"

3404

3561

3405

#: bzrlib/builtins.py:4781

3562

#: bzrlib/builtins.py:4874

3406

3563

msgid "Same as --mine-only."

3407

msgstr ""

3564

msgstr "--mine-onlyと同じ。"

3408

3565

3409

#: bzrlib/builtins.py:4783

3566

#: bzrlib/builtins.py:4876

3410

3567

msgid "Display changes in the remote branch only."

3411

msgstr ""

3568

msgstr "リモートブランチの変更のみを表示する。"

3412

3569

3413

#: bzrlib/builtins.py:4784

3570

#: bzrlib/builtins.py:4877

3414

3571

msgid "Same as --theirs-only."

3415

msgstr ""

3572

msgstr "--theirs-onlyと同じ。"

3416

3573

3417

#: bzrlib/builtins.py:4789

3574

#: bzrlib/builtins.py:4882

3418

3575

msgid ""

3419

3576

"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "

3420

3577

"details."

3421

3578

msgstr ""

3422

3579

3423

#: bzrlib/builtins.py:4793

3580

#: bzrlib/builtins.py:4886

3424

3581

msgid ""

3425

3582

"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "

3426

3583

"details."

3427

3584

msgstr ""

3428

3585

3429

#: bzrlib/builtins.py:4796

3586

#: bzrlib/builtins.py:4889

3430

3587

msgid "Show all revisions in addition to the mainline ones."

3431

3588

msgstr ""

3432

3589

3433

#: bzrlib/builtins.py:4850

3590

#: bzrlib/builtins.py:4943

3434

3591

msgid "No peer location known or specified."

3435

3592

msgstr ""

3436

3593

3437

#: bzrlib/builtins.py:4854

3594

#: bzrlib/builtins.py:4947

3438

3595

msgid "Using saved parent location: {0}\n"

3439

3596

msgstr ""

3440

3597

3441

#: bzrlib/builtins.py:4887

3598

#: bzrlib/builtins.py:4980

3442

3599

#, python-format

3443

3600

msgid "You have %d extra revision:\n"

3444

3601

msgid_plural "You have %d extra revisions:\n"

3445

3602

msgstr[0] ""

3446

3603

msgstr[1] ""

3447

3604

3448

#: bzrlib/builtins.py:4903

3605

#: bzrlib/builtins.py:4996

3449

3606

#, python-format

3450

3607

msgid "You are missing %d revision:\n"

3451

3608

msgid_plural "You are missing %d revisions:\n"

3452

3609

msgstr[0] ""

3453

3610

msgstr[1] ""

3454

3611

3455

#: bzrlib/builtins.py:4915

3612

#: bzrlib/builtins.py:5008

3456

3613

msgid "This branch has no new revisions.\n"

3457

3614

msgstr ""

3458

3615

3459

#: bzrlib/builtins.py:4918

3616

#: bzrlib/builtins.py:5011

3460

3617

msgid "Other branch has no new revisions.\n"

3461

3618

msgstr ""

3462

3619

3463

#: bzrlib/builtins.py:4923

3620

#: bzrlib/builtins.py:5016

3464

3621

msgid "Branches are up to date.\n"

3465

3622

msgstr ""

3466

3623

3467

#: bzrlib/builtins.py:4934

3624

#: bzrlib/builtins.py:5027

3468

3625

msgid "Compress the data within a repository."

3469

msgstr ""

3626

msgstr "リポジトリ内のデータを圧縮する。"

3470

3627

3471

#: bzrlib/builtins.py:4936

3628

#: bzrlib/builtins.py:5029

3472

3629

msgid ""

3473

3630

"This operation compresses the data within a bazaar repository. As\n"

3474

3631

"bazaar supports automatic packing of repository, this operation is\n"

3475

3632

"normally not required to be done manually."

3476

3633

msgstr ""

3477

3634

3478

#: bzrlib/builtins.py:4940

3635

#: bzrlib/builtins.py:5033

3479

3636

msgid ""

3480

3637

"During the pack operation, bazaar takes a backup of existing repository\n"

3481

3638

"data, i.e. pack files. This backup is eventually removed by bazaar\n"

3484

3641

"used."

3485

3642

msgstr ""

3486

3643

3487

#: bzrlib/builtins.py:4946

3644

#: bzrlib/builtins.py:5039

3488

3645

msgid ""

3489

3646

"Warning: If you use --clean-obsolete-packs and your machine crashes\n"

3490

3647

"during or immediately after repacking, you may be left with a state\n"

3492

3649

"been. In this case the repository may be unusable."

3493

3650

msgstr ""

3494

3651

3495

#: bzrlib/builtins.py:4955

3652

#: bzrlib/builtins.py:5048

3496

3653

msgid "Delete obsolete packs to save disk space."

3497

3654

msgstr ""

3498

3655

3499

#: bzrlib/builtins.py:4969

3656

#: bzrlib/builtins.py:5062

3500

3657

msgid "List the installed plugins."

3501

msgstr ""

3658

msgstr "インストールされたプラグインの一覧を表示する。"

3502

3659

3503

#: bzrlib/builtins.py:4971

3660

#: bzrlib/builtins.py:5064

3504

3661

msgid ""

3505

3662

"This command displays the list of installed plugins including\n"

3506

3663

"version of plugin and a short description of each."

3507

3664

msgstr ""

3665

"このコマンドはインストールされたプラグインの一覧を簡単な説明や\n"

3666

"バージョン情報とともに表示します。"

3508

3667

3509

#: bzrlib/builtins.py:4974

3668

#: bzrlib/builtins.py:5067

3510

3669

msgid "--verbose shows the path where each plugin is located."

3511

msgstr ""

3670

msgstr "--verboseを指定すると各プラグインのインストール先のパスが表示されます。"

3512

3671

3513

#: bzrlib/builtins.py:4976

3672

#: bzrlib/builtins.py:5069

3514

3673

msgid ""

3515

3674

"A plugin is an external component for Bazaar that extends the\n"

3516

3675

"revision control system, by adding or replacing code in Bazaar.\n"

3519

3678

"customizing log output."

3520

3679

msgstr ""

3521

3680

3522

#: bzrlib/builtins.py:4982

3681

#: bzrlib/builtins.py:5075

3523

3682

msgid ""

3524

3683

"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"

3525

3684

"for further information on plugins including where to find them and how to\n"

3527

3686

"plugins using the Python programming language."

3528

3687

msgstr ""

3529

3688

3530

#: bzrlib/builtins.py:4998

3689

#: bzrlib/builtins.py:5091

3531

3690

msgid "Show testament (signing-form) of a revision."

3532

3691

msgstr ""

3533

3692

3534

#: bzrlib/builtins.py:5001

3693

#: bzrlib/builtins.py:5094

3535

3694

msgid "Produce long-format testament."

3536

3695

msgstr ""

3537

3696

3538

#: bzrlib/builtins.py:5003

3697

#: bzrlib/builtins.py:5096

3539

3698

msgid "Produce a strict-format testament."

3540

3699

msgstr ""

3541

3700

3542

#: bzrlib/builtins.py:5029

3701

#: bzrlib/builtins.py:5122

3543

3702

msgid "Show the origin of each line in a file."

3544

3703

msgstr ""

3545

3704

3546

#: bzrlib/builtins.py:5031

3705

#: bzrlib/builtins.py:5124

3547

3706

msgid ""

3548

3707

"This prints out the given file with an annotation on the left side\n"

3549

3708

"indicating which revision, author and date introduced the change."

3550

3709

msgstr ""

3551

3710

3552

#: bzrlib/builtins.py:5034

3711

#: bzrlib/builtins.py:5127

3553

3712

msgid ""

3554

3713

"If the origin is the same for a run of consecutive lines, it is\n"

3555

3714

"shown only at the top, unless the --all option is given."

3556

3715

msgstr ""

3557

3716

3558

#: bzrlib/builtins.py:5042

3717

#: bzrlib/builtins.py:5135

3559

3718

msgid "Show annotations on all lines."

3560

3719

msgstr ""

3561

3720

3562

#: bzrlib/builtins.py:5043

3721

#: bzrlib/builtins.py:5136

3563

3722

msgid "Show commit date in annotations."

3564

3723

msgstr ""

3565

3724

3566

#: bzrlib/builtins.py:5130

3725

#: bzrlib/builtins.py:5223

3567

3726

msgid "Cannot sign a range of non-revision-history revisions"

3568

3727

msgstr ""

3569

3728

3570

#: bzrlib/builtins.py:5142

3729

#: bzrlib/builtins.py:5235

3571

3730

msgid "Please supply either one revision, or a range."

3572

3731

msgstr ""

3573

3732

3574

#: bzrlib/builtins.py:5146

3733

#: bzrlib/builtins.py:5239

3575

3734

msgid ""

3576

3735

"Convert the current branch into a checkout of the supplied branch.\n"

3577

3736

"If no branch is supplied, rebind to the last bound location."

3578

3737

msgstr ""

3579

3738

3580

#: bzrlib/builtins.py:5149

3739

#: bzrlib/builtins.py:5242

3581

3740

msgid ""

3582

3741

"Once converted into a checkout, commits must succeed on the master branch\n"

3583

3742

"before they will be applied to the local branch."

3584

3743

msgstr ""

3585

3744

3586

#: bzrlib/builtins.py:5152

3745

#: bzrlib/builtins.py:5245

3587

3746

msgid ""

3588

3747

"Bound branches use the nickname of its master branch unless it is set\n"

3589

3748

"locally, in which case binding will update the local nickname to be\n"

3590

3749

"that of the master."

3591

3750

msgstr ""

3592

3751

3593

#: bzrlib/builtins.py:5167

3752

#: bzrlib/builtins.py:5260

3594

3753

msgid "No location supplied. This format does not remember old locations."

3595

3754

msgstr ""

3596

3755

3597

#: bzrlib/builtins.py:5172

3756

#: bzrlib/builtins.py:5265

3598

3757

msgid "Branch is already bound"

3599

3758

msgstr ""

3600

3759

3601

#: bzrlib/builtins.py:5174

3760

#: bzrlib/builtins.py:5267

3602

3761

msgid "No location supplied and no previous location known"

3603

3762

msgstr ""

3604

3763

3605

#: bzrlib/builtins.py:5180

3764

#: bzrlib/builtins.py:5273

3606

3765

msgid "These branches have diverged. Try merging, and then bind again."

3607

3766

msgstr ""

3608

3767

3609

#: bzrlib/builtins.py:5187

3768

#: bzrlib/builtins.py:5280

3610

3769

msgid "Convert the current checkout into a regular branch."

3611

3770

msgstr ""

3612

3771

3613

#: bzrlib/builtins.py:5189

3772

#: bzrlib/builtins.py:5282

3614

3773

msgid ""

3615

3774

"After unbinding, the local branch is considered independent and subsequent\n"

3616

3775

"commits will be local only."

3617

3776

msgstr ""

3618

3777

3619

#: bzrlib/builtins.py:5200

3778

#: bzrlib/builtins.py:5293

3620

3779

msgid "Local branch is not bound"

3621

3780

msgstr ""

3622

3781

3623

#: bzrlib/builtins.py:5204

3782

#: bzrlib/builtins.py:5297

3624

3783

msgid "Remove the last committed revision."

3625

3784

msgstr ""

3626

3785

3627

#: bzrlib/builtins.py:5206

3786

#: bzrlib/builtins.py:5299

3628

3787

msgid ""

3629

3788

"--verbose will print out what is being removed.\n"

3630

3789

"--dry-run will go through all the motions, but not actually\n"

3631

3790

"remove anything."

3632

3791

msgstr ""

3633

3792

3634

#: bzrlib/builtins.py:5210

3793

#: bzrlib/builtins.py:5303

3635

3794

msgid ""

3636

3795

"If --revision is specified, uncommit revisions to leave the branch at the\n"

3637

3796

"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"

3638

3797

"branch at revision 15."

3639

3798

msgstr ""

3640

3799

3641

#: bzrlib/builtins.py:5214

3800

#: bzrlib/builtins.py:5307

3642

3801

msgid ""

3643

3802

"Uncommit leaves the working tree ready for a new commit. The only change\n"

3644

3803

"it may make is to restore any pending merges that were present before\n"

3645

3804

"the commit."

3646

3805

msgstr ""

3647

3806

3648

#: bzrlib/builtins.py:5225

3807

#: bzrlib/builtins.py:5318

3649

3808

msgid "Don't actually make changes."

3650

3809

msgstr ""

3651

3810

3652

#: bzrlib/builtins.py:5226

3811

#: bzrlib/builtins.py:5319

3653

3812

msgid "Say yes to all questions."

3654

3813

msgstr ""

3655

3814

3656

#: bzrlib/builtins.py:5228

3815

#: bzrlib/builtins.py:5321

3657

3816

msgid "Keep tags that point to removed revisions."

3658

3817

msgstr ""

3659

3818

3660

#: bzrlib/builtins.py:5230

3819

#: bzrlib/builtins.py:5323

3661

3820

msgid "Only remove the commits from the local branch when in a checkout."

3662

3821

msgstr ""

3663

3822

3664

#: bzrlib/builtins.py:5279

3823

#: bzrlib/builtins.py:5372

3665

3824

msgid "No revisions to uncommit.\n"

3666

3825

msgstr ""

3667

3826

3668

#: bzrlib/builtins.py:5294

3827

#: bzrlib/builtins.py:5387

3669

3828

msgid "Dry-run, pretending to remove the above revisions.\n"

3670

3829

msgstr ""

3671

3830

3672

#: bzrlib/builtins.py:5297

3831

#: bzrlib/builtins.py:5390

3673

3832

msgid "The above revision(s) will be removed.\n"

3674

3833

msgstr ""

3675

3834

3676

#: bzrlib/builtins.py:5301

3835

#: bzrlib/builtins.py:5394

3677

3836

msgid "Uncommit these revisions"

3678

3837

msgstr ""

3679

3838

3680

#: bzrlib/builtins.py:5304

3839

#: bzrlib/builtins.py:5397

3681

3840

msgid "Canceled\n"

3682

3841

msgstr ""

3683

3842

3684

#: bzrlib/builtins.py:5311

3843

#: bzrlib/builtins.py:5404

3685

3844

#, python-format

3686

3845

msgid ""

3687

3846

"You can restore the old tip by running:\n"

3688

3847

" bzr pull . -r revid:%s\n"

3689

3848

msgstr ""

3690

3849

3691

#: bzrlib/builtins.py:5316

3850

#: bzrlib/builtins.py:5409

3692

3851

msgid "Break a dead lock."

3693

3852

msgstr ""

3694

3853

3695

#: bzrlib/builtins.py:5318

3854

#: bzrlib/builtins.py:5411

3696

3855

msgid ""

3697

3856

"This command breaks a lock on a repository, branch, working directory or\n"

3698

3857

"config file."

3699

3858

msgstr ""

3700

3859

3701

#: bzrlib/builtins.py:5321

3860

#: bzrlib/builtins.py:5414

3702

3861

msgid ""

3703

3862

"CAUTION: Locks should only be broken when you are sure that the process\n"

3704

3863

"holding the lock has been stopped."

3705

3864

msgstr ""

3706

3865

3707

#: bzrlib/builtins.py:5324

3866

#: bzrlib/builtins.py:5417

3708

3867

msgid ""

3709

3868

"You can get information on what locks are open via the 'bzr info\n"

3710

3869

"[location]' command."

3711

3870

msgstr ""

3712

3871

3713

#: bzrlib/builtins.py:5327

3872

#: bzrlib/builtins.py:5420

3714

3873

msgid ""

3715

3874

":Examples:\n"

3716

3875

" bzr break-lock\n"

3718

3877

" bzr break-lock --conf ~/.bazaar"

3719

3878

msgstr ""

3720

3879

3721

#: bzrlib/builtins.py:5336

3880

#: bzrlib/builtins.py:5429

3722

3881

msgid "LOCATION is the directory where the config lock is."

3723

3882

msgstr ""

3724

3883

3725

#: bzrlib/builtins.py:5338

3884

#: bzrlib/builtins.py:5431

3726

3885

msgid "Do not ask for confirmation before breaking the lock."

3727

3886

msgstr ""

3728

3887

3729

#: bzrlib/builtins.py:5373

3888

#: bzrlib/builtins.py:5466

3730

3889

msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"

3731

3890

msgstr ""

3732

3891

3733

#: bzrlib/builtins.py:5374

3892

#: bzrlib/builtins.py:5467

3734

3893

msgid "Run the bzr server."

3735

3894

msgstr ""

3736

3895

3737

#: bzrlib/builtins.py:5380

3896

#: bzrlib/builtins.py:5473

3738

3897

msgid "Serve on stdin/out for use from inetd or sshd."

3739

3898

msgstr ""

3740

3899

3741

#: bzrlib/builtins.py:5381

3900

#: bzrlib/builtins.py:5474

3742

3901

msgid "protocol"

3743

3902

msgstr ""

3744

3903

3745

#: bzrlib/builtins.py:5382

3904

#: bzrlib/builtins.py:5475

3746

3905

msgid "Protocol to serve."

3747

3906

msgstr ""

3748

3907

3749

#: bzrlib/builtins.py:5386

3908

#: bzrlib/builtins.py:5479

3750

3909

msgid ""

3751

3910

"Listen for connections on nominated port of the form [hostname:]portnumber. "

3752

3911

"Passing 0 as the port number will result in a dynamically allocated port. "

3753

3912

"The default port depends on the protocol."

3754

3913

msgstr ""

3755

3914

3756

#: bzrlib/builtins.py:5392

3915

#: bzrlib/builtins.py:5485

3757

3916

msgid "Serve contents of this directory."

3758

3917

msgstr ""

3759

3918

3760

#: bzrlib/builtins.py:5394

3919

#: bzrlib/builtins.py:5487

3761

3920

msgid ""

3762

3921

"By default the server is a readonly server. Supplying --allow-writes "

3763

3922

"enables write access to the contents of the served directory and below. "

3766

3925

"uncontrolled write access to your file system."

3767

3926

msgstr ""

3768

3927

3769

#: bzrlib/builtins.py:5403

3928

#: bzrlib/builtins.py:5496

3770

3929

msgid "Override the default idle client timeout (5min)."

3771

3930

msgstr ""

3772

3931

3773

#: bzrlib/builtins.py:5453

3932

#: bzrlib/builtins.py:5546

3774

3933

msgid "Combine a tree into its containing tree."

3775

3934

msgstr ""

3776

3935

3777

#: bzrlib/builtins.py:5455

3936

#: bzrlib/builtins.py:5548

3778

3937

msgid "This command requires the target tree to be in a rich-root format."

3779

3938

msgstr ""

3780

3939

3781

#: bzrlib/builtins.py:5457

3940

#: bzrlib/builtins.py:5550

3782

3941

msgid ""

3783

3942

"The TREE argument should be an independent tree, inside another tree, but\n"

3784

3943

"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"

3785

3944

"running \"bzr branch\" with the target inside a tree.)"

3786

3945

msgstr ""

3787

3946

3788

#: bzrlib/builtins.py:5461

3947

#: bzrlib/builtins.py:5554

3789

3948

msgid ""

3790

3949

"The result is a combined tree, with the subtree no longer an independent\n"

3791

3950

"part. This is marked as a merge of the subtree into the containing tree,\n"

3792

3951

"and all history is preserved."

3793

3952

msgstr ""

3794

3953

3795

#: bzrlib/builtins.py:5479

3954

#: bzrlib/builtins.py:5572

3796

3955

#, python-format

3797

3956

msgid ""

3798

3957

"Can't join trees because %s doesn't support rich root data.\n"

3799

3958

"You can use bzr upgrade on the repository."

3800

3959

msgstr ""

3801

3960

3802

#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495

3961

#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588

3803

3962

msgid "Cannot join {0}. {1}"

3804

3963

msgstr ""

3805

3964

3806

#: bzrlib/builtins.py:5499

3965

#: bzrlib/builtins.py:5592

3807

3966

msgid "Split a subdirectory of a tree into a separate tree."

3808

3967

msgstr ""

3809

3968

3810

#: bzrlib/builtins.py:5501

3969

#: bzrlib/builtins.py:5594

3811

3970

msgid ""

3812

3971

"This command will produce a target tree in a format that supports\n"

3813

3972

"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"

3814

3973

"converted into earlier formats like 'dirstate-tags'."

3815

3974

msgstr ""

3816

3975

3817

#: bzrlib/builtins.py:5505

3976

#: bzrlib/builtins.py:5598

3818

3977

msgid ""

3819

3978

"The TREE argument should be a subdirectory of a working tree. That\n"

3820

3979

"subdirectory will be converted into an independent tree, with its own\n"

3821

3980

"branch. Commits in the top-level tree will not apply to the new subtree."

3822

3981

msgstr ""

3823

3982

3824

#: bzrlib/builtins.py:5585

3983

#: bzrlib/builtins.py:5678

3825

3984

msgid "No submit branch specified or known"

3826

3985

msgstr ""

3827

3986

3828

#: bzrlib/builtins.py:5593 bzrlib/send.py:108

3987

#: bzrlib/builtins.py:5686 bzrlib/send.py:108

3829

3988

msgid "No public branch specified or known"

3830

3989

msgstr ""

3831

3990

3832

#: bzrlib/builtins.py:5598

3991

#: bzrlib/builtins.py:5691

3833

3992

msgid "bzr merge-directive takes at most two one revision identifiers"

3834

3993

msgstr ""

3835

3994

3836

#: bzrlib/builtins.py:5607

3995

#: bzrlib/builtins.py:5700

3837

3996

msgid "No revisions to bundle."

3838

3997

msgstr ""

3839

3998

3840

#: bzrlib/builtins.py:5626

3999

#: bzrlib/builtins.py:5719

3841

4000

msgid "Mail or create a merge-directive for submitting changes."

3842

4001

msgstr ""

3843

4002

3844

#: bzrlib/builtins.py:5628

4003

#: bzrlib/builtins.py:5721

3845

4004

msgid "A merge directive provides many things needed for requesting merges:"

3846

4005

msgstr ""

3847

4006

3848

#: bzrlib/builtins.py:5630

4007

#: bzrlib/builtins.py:5723

3849

4008

msgid "* A machine-readable description of the merge to perform"

3850

4009

msgstr ""

3851

4010

3852

#: bzrlib/builtins.py:5632

4011

#: bzrlib/builtins.py:5725

3853

4012

msgid "* An optional patch that is a preview of the changes requested"

3854

4013

msgstr ""

3855

4014

3856

#: bzrlib/builtins.py:5634

4015

#: bzrlib/builtins.py:5727

3857

4016

msgid ""

3858

4017

"* An optional bundle of revision data, so that the changes can be applied\n"

3859

4018

" directly from the merge directive, without retrieving data from a\n"

3860

4019

" branch."

3861

4020

msgstr ""

3862

4021

3863

#: bzrlib/builtins.py:5638

4022

#: bzrlib/builtins.py:5731

3864

4023

msgid ""

3865

4024

"`bzr send` creates a compact data set that, when applied using bzr\n"

3866

4025

"merge, has the same effect as merging from the source branch. "

3867

4026

msgstr ""

3868

4027

3869

#: bzrlib/builtins.py:5641

4028

#: bzrlib/builtins.py:5734

3870

4029

msgid ""

3871

4030

"By default the merge directive is self-contained and can be applied to any\n"

3872

4031

"branch containing submit_branch in its ancestory without needing access to\n"

3873

4032

"the source branch."

3874

4033

msgstr ""

3875

4034

3876

#: bzrlib/builtins.py:5645

4035

#: bzrlib/builtins.py:5738

3877

4036

msgid ""

3878

4037

"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"

3879

4038

"revisions, but only a structured request to merge from the\n"

3882

4041

"included if known, so that people can check it later."

3883

4042

msgstr ""

3884

4043

3885

#: bzrlib/builtins.py:5651

4044

#: bzrlib/builtins.py:5744

3886

4045

msgid ""

3887

4046

"The submit branch defaults to the parent of the source branch, but can be\n"

3888

4047

"overridden. Both submit branch and public branch will be remembered in\n"

3891

4050

"be changed using --from."

3892

4051

msgstr ""

3893

4052

3894

#: bzrlib/builtins.py:5657

4053

#: bzrlib/builtins.py:5750

3895

4054

msgid ""

3896

4055

"Both the submit branch and the public branch follow the usual behavior with\n"

3897

4056

"respect to --remember: If there is no default location set, the first send\n"

3900

4059

"--remember. The value will only be saved if the location can be accessed."

3901

4060

msgstr ""

3902

4061

3903

#: bzrlib/builtins.py:5663

4062

#: bzrlib/builtins.py:5756

3904

4063

msgid ""

3905

4064

"In order to calculate those changes, bzr must analyse the submit branch.\n"

3906

4065

"Therefore it is most efficient for the submit branch to be a local mirror.\n"

3908

4067

"in the merge directive."

3909

4068

msgstr ""

3910

4069

3911

#: bzrlib/builtins.py:5668

4070

#: bzrlib/builtins.py:5761

3912

4071

msgid ""

3913

4072

"The default behaviour is to send the merge directive by mail, unless -o is\n"

3914

4073

"given, in which case it is sent to a file."

3915

4074

msgstr ""

3916

4075

3917

#: bzrlib/builtins.py:5671

4076

#: bzrlib/builtins.py:5764

3918

4077

msgid ""

3919

4078

"Mail is sent using your preferred mail program. This should be transparent\n"

3920

4079

"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"

3921

4080

"If the preferred client can't be found (or used), your editor will be used."

3922

4081

msgstr ""

3923

4082

3924

#: bzrlib/builtins.py:5675

4083

#: bzrlib/builtins.py:5768

3925

4084

msgid ""

3926

4085

"To use a specific mail program, set the mail_client configuration option.\n"

3927

4086

"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"

3933

4092

"supported clients."

3934

4093

msgstr ""

3935

4094

3936

#: bzrlib/builtins.py:5682

4095

#: bzrlib/builtins.py:5775

3937

4096

msgid ""

3938

4097

"If mail is being sent, a to address is required. This can be supplied\n"

3939

4098

"either on the commandline, by setting the submit_to configuration\n"

3941

4100

"in the submit branch."

3942

4101

msgstr ""

3943

4102

3944

#: bzrlib/builtins.py:5687

4103

#: bzrlib/builtins.py:5780

3945

4104

msgid ""

3946

4105

"Two formats are currently supported: \"4\" uses revision bundle format 4 "

3947

4106

"and\n"

3951

4110

"format 1. It is compatible with Bazaar 0.12 - 0.18."

3952

4111

msgstr ""

3953

4112

3954

#: bzrlib/builtins.py:5693

4113

#: bzrlib/builtins.py:5786

3955

4114

msgid ""

3956

4115

"The merge directives created by bzr send may be applied using bzr merge or\n"

3957

4116

"bzr pull by specifying a file containing a merge directive as the location."

3958

4117

msgstr ""

3959

4118

3960

#: bzrlib/builtins.py:5696

4119

#: bzrlib/builtins.py:5789

3961

4120

msgid ""

3962

4121

"bzr send makes extensive use of public locations to map local locations "

3963

4122

"into\n"

3965

4124

"set them, and use `bzr info` to display them."

3966

4125

msgstr ""

3967

4126

3968

#: bzrlib/builtins.py:5720

4127

#: bzrlib/builtins.py:5813

3969

4128

msgid "Write merge directive to this file or directory; use - for stdout."

3970

4129

msgstr ""

3971

4130

3972

#: bzrlib/builtins.py:5724

4131

#: bzrlib/builtins.py:5817

3973

4132

msgid ""

3974

4133

"Refuse to send if there are uncommitted changes in the working tree, --no-"

3975

4134

"strict disables the check."

3976

4135

msgstr ""

3977

4136

3978

#: bzrlib/builtins.py:5726

4137

#: bzrlib/builtins.py:5819

3979

4138

msgid "Mail the request to this address."

3980

4139

msgstr ""

3981

4140

3982

#: bzrlib/builtins.py:5730

4141

#: bzrlib/builtins.py:5823

3983

4142

msgid "Body for the email."

3984

4143

msgstr ""

3985

4144

3986

#: bzrlib/builtins.py:5783

4145

#: bzrlib/builtins.py:5876

3987

4146

msgid "Do not include a bundle in the merge directive."

3988

4147

msgstr ""

3989

4148

3990

#: bzrlib/builtins.py:5784

4149

#: bzrlib/builtins.py:5877

3991

4150

msgid "Do not include a preview patch in the merge directive."

3992

4151

msgstr ""

3993

4152

3994

#: bzrlib/builtins.py:5787

4153

#: bzrlib/builtins.py:5880

3995

4154

msgid "Remember submit and public branch."

3996

4155

msgstr ""

3997

4156

3998

#: bzrlib/builtins.py:5789

4157

#: bzrlib/builtins.py:5882

3999

4158

msgid ""

4000

4159

"Branch to generate the submission from, rather than the one containing the "

4001

4160

"working directory."

4002

4161

msgstr ""

4003

4162

4004

#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76

4163

#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76

4005

4164

msgid "format"

4006

4165

msgstr ""

4007

4166

4008

#: bzrlib/builtins.py:5800

4167

#: bzrlib/builtins.py:5893

4009

4168

msgid "Use the specified output format."

4010

4169

msgstr ""

4011

4170

4012

#: bzrlib/builtins.py:5822

4171

#: bzrlib/builtins.py:5915

4013

4172

msgid "Create, remove or modify a tag naming a revision."

4014

4173

msgstr ""

4015

4174

4016

#: bzrlib/builtins.py:5824

4175

#: bzrlib/builtins.py:5917

4017

4176

msgid ""

4018

4177

"Tags give human-meaningful names to revisions. Commands that take a -r\n"

4019

4178

"(--revision) option can be given -rtag:X, where X is any previously\n"

4020

4179

"created tag."

4021

4180

msgstr ""

4022

4181

4023

#: bzrlib/builtins.py:5828

4182

#: bzrlib/builtins.py:5921

4024

4183

msgid ""

4025

4184

"Tags are stored in the branch. Tags are copied from one branch to another\n"

4026

4185

"along when you branch, push, pull or merge."

4027

4186

msgstr ""

4028

4187

4029

#: bzrlib/builtins.py:5831

4188

#: bzrlib/builtins.py:5924

4030

4189

msgid ""

4031

4190

"It is an error to give a tag name that already exists unless you pass\n"

4032

4191

"--force, in which case the tag is moved to point to the new revision."

4033

4192

msgstr ""

4034

4193

4035

#: bzrlib/builtins.py:5834

4194

#: bzrlib/builtins.py:5927

4036

4195

msgid ""

4037

4196

"To rename a tag (change the name but keep it on the same revsion), run "

4038

4197

"``bzr\n"

4039

4198

"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."

4040

4199

msgstr ""

4041

4200

4042

#: bzrlib/builtins.py:5837

4201

#: bzrlib/builtins.py:5930

4043

4202

msgid ""

4044

4203

"If no tag name is specified it will be determined through the \n"

4045

4204

"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"

4047

4206

"details."

4048

4207

msgstr ""

4049

4208

4050

#: bzrlib/builtins.py:5847

4209

#: bzrlib/builtins.py:5940

4051

4210

msgid "Delete this tag rather than placing it."

4052

4211

msgstr ""

4053

4212

4054

#: bzrlib/builtins.py:5850

4213

#: bzrlib/builtins.py:5943

4055

4214

msgid "Branch in which to place the tag."

4056

4215

msgstr ""

4057

4216

4058

#: bzrlib/builtins.py:5852

4217

#: bzrlib/builtins.py:5945

4059

4218

msgid "Replace existing tags."

4060

4219

msgstr ""

4061

4220

4062

#: bzrlib/builtins.py:5867

4221

#: bzrlib/builtins.py:5960

4063

4222

msgid "No tag specified to delete."

4064

4223

msgstr ""

4065

4224

4066

#: bzrlib/builtins.py:5869

4225

#: bzrlib/builtins.py:5962

4067

4226

#, python-format

4068

4227

msgid "Deleted tag %s."

4069

4228

msgstr ""

4070

4229

4071

#: bzrlib/builtins.py:5883

4230

#: bzrlib/builtins.py:5976

4072

4231

msgid "Please specify a tag name."

4073

4232

msgstr ""

4074

4233

4075

#: bzrlib/builtins.py:5891

4234

#: bzrlib/builtins.py:5984

4076

4235

#, python-format

4077

4236

msgid "Tag %s already exists for that revision."

4078

4237

msgstr ""

4079

4238

4080

#: bzrlib/builtins.py:5895

4239

#: bzrlib/builtins.py:5988

4081

4240

#, python-format

4082

4241

msgid "Created tag %s."

4083

4242

msgstr ""

4084

4243

4085

#: bzrlib/builtins.py:5897

4244

#: bzrlib/builtins.py:5990

4086

4245

#, python-format

4087

4246

msgid "Updated tag %s."

4088

4247

msgstr ""

4089

4248

4090

#: bzrlib/builtins.py:5901

4249

#: bzrlib/builtins.py:5994

4091

4250

msgid "List tags."

4092

4251

msgstr ""

4093

4252

4094

#: bzrlib/builtins.py:5903

4253

#: bzrlib/builtins.py:5996

4095

4254

msgid ""

4096

4255

"This command shows a table of tag names and the revisions they reference."

4097

4256

msgstr ""

4098

4257

4099

#: bzrlib/builtins.py:5909

4258

#: bzrlib/builtins.py:6002

4100

4259

msgid "Branch whose tags should be displayed."

4101

4260

msgstr ""

4102

4261

4103

#: bzrlib/builtins.py:5911

4262

#: bzrlib/builtins.py:6004

4104

4263

msgid "Sort tags by different criteria."

4105

4264

msgstr ""

4106

4265

4107

#: bzrlib/builtins.py:5911

4266

#: bzrlib/builtins.py:6004

4108

4267

msgid "Sorting"

4109

4268

msgstr ""

4110

4269

4111

#: bzrlib/builtins.py:5980

4270

#: bzrlib/builtins.py:6073

4112

4271

msgid "Reconfigure the type of a bzr directory."

4113

4272

msgstr ""

4114

4273

4115

#: bzrlib/builtins.py:5982

4274

#: bzrlib/builtins.py:6075

4116

4275

msgid "A target configuration must be specified."

4117

4276

msgstr ""

4118

4277

4119

#: bzrlib/builtins.py:5984

4278

#: bzrlib/builtins.py:6077

4120

4279

msgid ""

4121

4280

"For checkouts, the bind-to location will be auto-detected if not specified.\n"

4122

4281

"The order of preference is\n"

4127

4286

"If none of these is available, --bind-to must be specified."

4128

4287

msgstr ""

4129

4288

4130

#: bzrlib/builtins.py:5998

4289

#: bzrlib/builtins.py:6091

4131

4290

msgid "Tree type"

4132

4291

msgstr ""

4133

4292

4134

#: bzrlib/builtins.py:5999

4293

#: bzrlib/builtins.py:6092

4135

4294

msgid "The relation between branch and tree."

4136

4295

msgstr ""

4137

4296

4138

#: bzrlib/builtins.py:6001

4297

#: bzrlib/builtins.py:6094

4139

4298

msgid "Reconfigure to be an unbound branch with no working tree."

4140

4299

msgstr ""

4141

4300

4142

#: bzrlib/builtins.py:6002

4301

#: bzrlib/builtins.py:6095

4143

4302

msgid "Reconfigure to be an unbound branch with a working tree."

4144

4303

msgstr ""

4145

4304

4146

#: bzrlib/builtins.py:6003

4305

#: bzrlib/builtins.py:6096

4147

4306

msgid "Reconfigure to be a bound branch with a working tree."

4148

4307

msgstr ""

4149

4308

4150

#: bzrlib/builtins.py:6004

4309

#: bzrlib/builtins.py:6097

4151

4310

msgid "Reconfigure to be a lightweight checkout (with no local history)."

4152

4311

msgstr ""

4153

4312

4154

#: bzrlib/builtins.py:6009

4313

#: bzrlib/builtins.py:6102

4155

4314

msgid "Repository type"

4156

4315

msgstr ""

4157

4316

4158

#: bzrlib/builtins.py:6010

4317

#: bzrlib/builtins.py:6103

4159

4318

msgid "Location fo the repository."

4160

4319

msgstr ""

4161

4320

4162

#: bzrlib/builtins.py:6012

4321

#: bzrlib/builtins.py:6105

4163

4322

msgid ""

4164

4323

"Reconfigure to be a standalone branch (i.e. stop using shared repository)."

4165

4324

msgstr ""

4166

4325

4167

#: bzrlib/builtins.py:6014

4326

#: bzrlib/builtins.py:6107

4168

4327

msgid "Reconfigure to use a shared repository."

4169

4328

msgstr ""

4170

4329

4171

#: bzrlib/builtins.py:6018

4330

#: bzrlib/builtins.py:6111

4172

4331

msgid "Trees in Repository"

4173

4332

msgstr ""

4174

4333

4175

#: bzrlib/builtins.py:6019

4334

#: bzrlib/builtins.py:6112

4176

4335

msgid "Whether new branches in the repository have trees."

4177

4336

msgstr ""

4178

4337

4179

#: bzrlib/builtins.py:6021

4338

#: bzrlib/builtins.py:6114

4180

4339

msgid ""

4181

4340

"Reconfigure repository to create working trees on branches by default."

4182

4341

msgstr ""

4183

4342

4184

#: bzrlib/builtins.py:6023

4343

#: bzrlib/builtins.py:6116

4185

4344

msgid ""

4186

4345

"Reconfigure repository to not create working trees on branches by default."

4187

4346

msgstr ""

4188

4347

4189

#: bzrlib/builtins.py:6026

4348

#: bzrlib/builtins.py:6119

4190

4349

msgid "Branch to bind checkout to."

4191

4350

msgstr ""

4192

4351

4193

#: bzrlib/builtins.py:6028

4352

#: bzrlib/builtins.py:6121

4194

4353

msgid "Perform reconfiguration even if local changes will be lost."

4195

4354

msgstr ""

4196

4355

4197

#: bzrlib/builtins.py:6031

4356

#: bzrlib/builtins.py:6124

4198

4357

msgid "Reconfigure a branch to be stacked on another branch."

4199

4358

msgstr ""

4200

4359

4201

#: bzrlib/builtins.py:6035

4360

#: bzrlib/builtins.py:6128

4202

4361

msgid ""

4203

4362

"Reconfigure a branch to be unstacked. This may require copying substantial "

4204

4363

"data into it."

4205

4364

msgstr ""

4206

4365

4207

#: bzrlib/builtins.py:6045

4366

#: bzrlib/builtins.py:6138

4208

4367

msgid "Can't use both --stacked-on and --unstacked"

4209

4368

msgstr ""

4210

4369

4211

#: bzrlib/builtins.py:6059

4370

#: bzrlib/builtins.py:6152

4212

4371

msgid "No target configuration specified"

4213

4372

msgstr ""

4214

4373

4215

#: bzrlib/builtins.py:6094

4374

#: bzrlib/builtins.py:6187

4216

4375

msgid "Set the branch of a checkout and update."

4217

4376

msgstr ""

4218

4377

4219

#: bzrlib/builtins.py:6096

4378

#: bzrlib/builtins.py:6189

4220

4379

msgid ""

4221

4380

"For lightweight checkouts, this changes the branch being referenced.\n"

4222

4381

"For heavyweight checkouts, this checks that there are no local commits\n"

4224

4383

"of the new location and binds to it."

4225

4384

msgstr ""

4226

4385

4227

#: bzrlib/builtins.py:6101

4386

#: bzrlib/builtins.py:6194

4228

4387

msgid ""

4229

4388

"In both cases, the working tree is updated and uncommitted changes\n"

4230

4389

"are merged. The user can commit or revert these as they desire."

4231

4390

msgstr ""

4232

4391

4233

#: bzrlib/builtins.py:6104

4392

#: bzrlib/builtins.py:6197

4234

4393

msgid "Pending merges need to be committed or reverted before using switch."

4235

4394

msgstr ""

4236

4395

4237

#: bzrlib/builtins.py:6106

4396

#: bzrlib/builtins.py:6199

4238

4397

msgid ""

4239

4398

"The path to the branch to switch to can be specified relative to the parent\n"

4240

4399

"directory of the current branch. For example, if you are currently in a\n"

4242

4401

"/path/to/newbranch."

4243

4402

msgstr ""

4244

4403

4245

#: bzrlib/builtins.py:6111

4404

#: bzrlib/builtins.py:6204

4246

4405

msgid ""

4247

4406

"Bound branches use the nickname of its master branch unless it is set\n"

4248

4407

"locally, in which case switching will update the local nickname to be\n"

4249

4408

"that of the master."

4250

4409

msgstr ""

4251

4410

4252

#: bzrlib/builtins.py:6119

4411

#: bzrlib/builtins.py:6212

4253

4412

msgid "Switch even if local commits will be lost."

4254

4413

msgstr ""

4255

4414

4256

#: bzrlib/builtins.py:6122

4415

#: bzrlib/builtins.py:6215

4257

4416

msgid "Create the target branch from this one before switching to it."

4258

4417

msgstr ""

4259

4418

4260

#: bzrlib/builtins.py:6134

4419

#: bzrlib/builtins.py:6229

4261

4420

msgid "You must supply either a revision or a location"

4262

4421

msgstr ""

4263

4422

4264

#: bzrlib/builtins.py:6145

4423

#: bzrlib/builtins.py:6242

4265

4424

msgid "cannot create branch without source branch"

4266

4425

msgstr ""

4267

4426

4268

#: bzrlib/builtins.py:6209

4427

#: bzrlib/builtins.py:6262

4269

4428

msgid "Manage filtered views."

4270

4429

msgstr ""

4271

4430

4272

#: bzrlib/builtins.py:6211

4431

#: bzrlib/builtins.py:6264

4273

4432

msgid ""

4274

4433

"Views provide a mask over the tree so that users can focus on\n"

4275

4434

"a subset of a tree when doing their work. After creating a view,\n"

4279

4438

"must be within the current view."

4280

4439

msgstr ""

4281

4440

4282

#: bzrlib/builtins.py:6218

4441

#: bzrlib/builtins.py:6271

4283

4442

msgid ""

4284

4443

"In most cases, a view has a short life-span: it is created to make\n"

4285

4444

"a selected change and is deleted once that change is committed.\n"

4287

4446

"and switch between them."

4288

4447

msgstr ""

4289

4448

4290

#: bzrlib/builtins.py:6223

4449

#: bzrlib/builtins.py:6276

4291

4450

msgid ""

4292

4451

"To disable the current view without deleting it, you can switch to\n"

4293

4452

"the pseudo view called ``off``. This can be useful when you need\n"

4295

4454

"want to switch back to your view after that."

4296

4455

msgstr ""

4297

4456

4298

#: bzrlib/builtins.py:6228

4457

#: bzrlib/builtins.py:6281

4299

4458

msgid ""

4300

4459

":Examples:\n"

4301

4460

" To define the current view::"

4302

4461

msgstr ""

4303

4462

4304

#: bzrlib/builtins.py:6231

4463

#: bzrlib/builtins.py:6284

4305

4464

msgid " bzr view file1 dir1 ..."

4306

4465

msgstr ""

4307

4466

4308

#: bzrlib/builtins.py:6233

4467

#: bzrlib/builtins.py:6286

4309

4468

msgid " To list the current view::"

4310

4469

msgstr ""

4311

4470

4312

#: bzrlib/builtins.py:6235

4471

#: bzrlib/builtins.py:6288

4313

4472

msgid " bzr view"

4314

4473

msgstr ""

4315

4474

4316

#: bzrlib/builtins.py:6237

4475

#: bzrlib/builtins.py:6290

4317

4476

msgid " To delete the current view::"

4318

4477

msgstr ""

4319

4478

4320

#: bzrlib/builtins.py:6239

4479

#: bzrlib/builtins.py:6292

4321

4480

msgid " bzr view --delete"

4322

4481

msgstr ""

4323

4482

4324

#: bzrlib/builtins.py:6241

4483

#: bzrlib/builtins.py:6294

4325

4484

msgid " To disable the current view without deleting it::"

4326

4485

msgstr ""

4327

4486

4328

#: bzrlib/builtins.py:6243

4487

#: bzrlib/builtins.py:6296

4329

4488

msgid " bzr view --switch off"

4330

4489

msgstr ""

4331

4490

4332

#: bzrlib/builtins.py:6245

4491

#: bzrlib/builtins.py:6298

4333

4492

msgid " To define a named view and switch to it::"

4334

4493

msgstr ""

4335

4494

4336

#: bzrlib/builtins.py:6247

4495

#: bzrlib/builtins.py:6300

4337

4496

msgid " bzr view --name view-name file1 dir1 ..."

4338

4497

msgstr ""

4339

4498

4340

#: bzrlib/builtins.py:6249

4499

#: bzrlib/builtins.py:6302

4341

4500

msgid " To list a named view::"

4342

4501

msgstr ""

4343

4502

4344

#: bzrlib/builtins.py:6251

4503

#: bzrlib/builtins.py:6304

4345

4504

msgid " bzr view --name view-name"

4346

4505

msgstr ""

4347

4506

4348

#: bzrlib/builtins.py:6253

4507

#: bzrlib/builtins.py:6306

4349

4508

msgid " To delete a named view::"

4350

4509

msgstr ""

4351

4510

4352

#: bzrlib/builtins.py:6255

4511

#: bzrlib/builtins.py:6308

4353

4512

msgid " bzr view --name view-name --delete"

4354

4513

msgstr ""

4355

4514

4356

#: bzrlib/builtins.py:6257

4515

#: bzrlib/builtins.py:6310

4357

4516

msgid " To switch to a named view::"

4358

4517

msgstr ""

4359

4518

4360

#: bzrlib/builtins.py:6259

4519

#: bzrlib/builtins.py:6312

4361

4520

msgid " bzr view --switch view-name"

4362

4521

msgstr ""

4363

4522

4364

#: bzrlib/builtins.py:6261

4523

#: bzrlib/builtins.py:6314

4365

4524

msgid " To list all views defined::"

4366

4525

msgstr ""

4367

4526

4368

#: bzrlib/builtins.py:6263

4527

#: bzrlib/builtins.py:6316

4369

4528

msgid " bzr view --all"

4370

4529

msgstr ""

4371

4530

4372

#: bzrlib/builtins.py:6265

4531

#: bzrlib/builtins.py:6318

4373

4532

msgid " To delete all views::"

4374

4533

msgstr ""

4375

4534

4376

#: bzrlib/builtins.py:6267

4535

#: bzrlib/builtins.py:6320

4377

4536

msgid " bzr view --delete --all"

4378

4537

msgstr ""

4379

4538

4380

#: bzrlib/builtins.py:6274

4539

#: bzrlib/builtins.py:6327

4381

4540

msgid "Apply list or delete action to all views."

4382

4541

msgstr ""

4383

4542

4384

#: bzrlib/builtins.py:6277

4543

#: bzrlib/builtins.py:6330

4385

4544

msgid "Delete the view."

4386

4545

msgstr ""

4387

4546

4388

#: bzrlib/builtins.py:6280

4547

#: bzrlib/builtins.py:6333

4389

4548

msgid "Name of the view to define, list or delete."

4390

4549

msgstr ""

4391

4550

4392

#: bzrlib/builtins.py:6284

4551

#: bzrlib/builtins.py:6337

4393

4552

msgid "Name of the view to switch to."

4394

4553

msgstr ""

4395

4554

4396

#: bzrlib/builtins.py:6303

4555

#: bzrlib/builtins.py:6356

4397

4556

msgid "Both --delete and a file list specified"

4398

4557

msgstr ""

4399

4558

4400

#: bzrlib/builtins.py:6306

4559

#: bzrlib/builtins.py:6359

4401

4560

msgid "Both --delete and --switch specified"

4402

4561

msgstr ""

4403

4562

4404

#: bzrlib/builtins.py:6309

4563

#: bzrlib/builtins.py:6362

4405

4564

msgid "Deleted all views.\n"

4406

4565

msgstr ""

4407

4566

4408

#: bzrlib/builtins.py:6311

4567

#: bzrlib/builtins.py:6364

4409

4568

msgid "No current view to delete"

4410

4569

msgstr ""

4411

4570

4412

#: bzrlib/builtins.py:6314

4571

#: bzrlib/builtins.py:6367

4413

4572

#, python-format

4414

4573

msgid "Deleted '%s' view.\n"

4415

4574

msgstr ""

4416

4575

4417

#: bzrlib/builtins.py:6318

4576

#: bzrlib/builtins.py:6371

4418

4577

msgid "Both --switch and a file list specified"

4419

4578

msgstr ""

4420

4579

4421

#: bzrlib/builtins.py:6321

4580

#: bzrlib/builtins.py:6374

4422

4581

msgid "Both --switch and --all specified"

4423

4582

msgstr ""

4424

4583

4425

#: bzrlib/builtins.py:6324

4584

#: bzrlib/builtins.py:6377

4426

4585

msgid "No current view to disable"

4427

4586

msgstr ""

4428

4587

4429

#: bzrlib/builtins.py:6326

4588

#: bzrlib/builtins.py:6379

4430

4589

#, python-format

4431

4590

msgid "Disabled '%s' view.\n"

4432

4591

msgstr ""

4433

4592

4434

#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352

4593

#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405

4435

4594

msgid "Using '{0}' view: {1}\n"

4436

4595

msgstr ""

4437

4596

4438

#: bzrlib/builtins.py:6333

4597

#: bzrlib/builtins.py:6386

4439

4598

msgid "Views defined:\n"

4440

4599

msgstr ""

4441

4600

4442

#: bzrlib/builtins.py:6342

4601

#: bzrlib/builtins.py:6395

4443

4602

msgid "No views defined.\n"

4444

4603

msgstr ""

4445

4604

4446

#: bzrlib/builtins.py:6349

4605

#: bzrlib/builtins.py:6402

4447

4606

msgid "Cannot change the 'off' pseudo view"

4448

4607

msgstr ""

4449

4608

4450

#: bzrlib/builtins.py:6357

4609

#: bzrlib/builtins.py:6410

4451

4610

msgid "No current view.\n"

4452

4611

msgstr ""

4453

4612

4454

#: bzrlib/builtins.py:6360

4613

#: bzrlib/builtins.py:6413

4455

4614

msgid "'{0}' view is: {1}\n"

4456

4615

msgstr ""

4457

4616

4458

#: bzrlib/builtins.py:6380

4617

#: bzrlib/builtins.py:6433

4459

4618

msgid " <no hooks installed>\n"

4460

4619

msgstr ""

4461

4620

4462

#: bzrlib/builtins.py:6384

4621

#: bzrlib/builtins.py:6437

4463

4622

msgid "Remove a branch."

4464

4623

msgstr ""

4465

4624

4466

#: bzrlib/builtins.py:6386

4625

#: bzrlib/builtins.py:6439

4467

4626

msgid ""

4468

4627

"This will remove the branch from the specified location but \n"

4469

4628

"will keep any working tree or repository in place."

4470

4629

msgstr ""

4471

4630

4472

#: bzrlib/builtins.py:6391

4631

#: bzrlib/builtins.py:6444

4473

4632

msgid " Remove the branch at repo/trunk::"

4474

4633

msgstr ""

4475

4634

4476

#: bzrlib/builtins.py:6393

4635

#: bzrlib/builtins.py:6446

4477

4636

msgid " bzr remove-branch repo/trunk"

4478

4637

msgstr ""

4479

4638

4480

#: bzrlib/builtins.py:6408

4639

#: bzrlib/builtins.py:6461

4481

4640

msgid "Plaintext diff output."

4482

4641

msgstr ""

4483

4642

4484

#: bzrlib/builtins.py:6409

4643

#: bzrlib/builtins.py:6462

4485

4644

msgid "Temporarily set aside some changes from the current tree."

4486

4645

msgstr ""

4487

4646

4488

#: bzrlib/builtins.py:6411

4647

#: bzrlib/builtins.py:6464

4489

4648

msgid ""

4490

4649

"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"

4491

4650

"ie. out of the way, until a later time when you can bring them back from\n"

4494

4653

"will they survive its deletion."

4495

4654

msgstr ""

4496

4655

4497

#: bzrlib/builtins.py:6417

4656

#: bzrlib/builtins.py:6470

4498

4657

msgid "If shelve --list is specified, previously-shelved changes are listed."

4499

4658

msgstr ""

4500

4659

4501

#: bzrlib/builtins.py:6419

4660

#: bzrlib/builtins.py:6472

4502

4661

msgid ""

4503

4662

"Shelve is intended to help separate several sets of changes that have\n"

4504

4663

"been inappropriately mingled. If you just want to get rid of all changes\n"

4506

4665

"shelve all text changes at once, use shelve --all."

4507

4666

msgstr ""

4508

4667

4509

#: bzrlib/builtins.py:6424

4668

#: bzrlib/builtins.py:6477

4510

4669

msgid ""

4511

4670

"If filenames are specified, only the changes to those files will be\n"

4512

4671

"shelved. Other files will be left untouched."

4513

4672

msgstr ""

4514

4673

4515

#: bzrlib/builtins.py:6427

4674

#: bzrlib/builtins.py:6480

4516

4675

msgid ""

4517

4676

"If a revision is specified, changes since that revision will be shelved."

4518

4677

msgstr ""

4519

4678

4520

#: bzrlib/builtins.py:6429

4679

#: bzrlib/builtins.py:6482

4521

4680

msgid ""

4522

4681

"You can put multiple items on the shelf, and by default, 'unshelve' will\n"

4523

4682

"restore the most recently shelved changes."

4524

4683

msgstr ""

4525

4684

4526

#: bzrlib/builtins.py:6432

4685

#: bzrlib/builtins.py:6485

4527

4686

msgid ""

4528

4687

"For complicated changes, it is possible to edit the changes in a separate\n"

4529

4688

"editor program to decide what the file remaining in the working copy\n"

4530

4689

"should look like. To do this, add the configuration option"

4531

4690

msgstr ""

4532

4691

4533

#: bzrlib/builtins.py:6436

4692

#: bzrlib/builtins.py:6489

4534

4693

msgid " change_editor = PROGRAM @new_path @old_path"

4535

4694

msgstr ""

4536

4695

4537

#: bzrlib/builtins.py:6438

4696

#: bzrlib/builtins.py:6491

4538

4697

msgid ""

4539

4698

"where @new_path is replaced with the path of the new version of the \n"

4540

4699

"file and @old_path is replaced with the path of the old version of \n"

4543

4702

" "

4544

4703

msgstr ""

4545

4704

4546

#: bzrlib/builtins.py:6450

4705

#: bzrlib/builtins.py:6503

4547

4706

msgid "Shelve all changes."

4548

4707

msgstr ""

4549

4708

4550

#: bzrlib/builtins.py:6452

4709

#: bzrlib/builtins.py:6505

4551

4710

msgid "Method to use for writing diffs."

4552

4711

msgstr ""

4553

4712

4554

#: bzrlib/builtins.py:6452

4713

#: bzrlib/builtins.py:6505

4555

4714

msgid "writer"

4556

4715

msgstr ""

4557

4716

4558

#: bzrlib/builtins.py:6456

4717

#: bzrlib/builtins.py:6509

4559

4718

msgid "List shelved changes."

4560

4719

msgstr ""

4561

4720

4562

#: bzrlib/builtins.py:6458

4721

#: bzrlib/builtins.py:6511

4563

4722

msgid "Destroy removed changes instead of shelving them."

4564

4723

msgstr ""

4565

4724

4566

#: bzrlib/builtins.py:6487

4725

#: bzrlib/builtins.py:6540

4567

4726

msgid "No shelved changes."

4568

4727

msgstr ""

4569

4728

4570

#: bzrlib/builtins.py:6498

4729

#: bzrlib/builtins.py:6551

4571

4730

msgid "Restore shelved changes."

4572

4731

msgstr ""

4573

4732

4574

#: bzrlib/builtins.py:6500

4733

#: bzrlib/builtins.py:6553

4575

4734

msgid ""

4576

4735

"By default, the most recently shelved changes are restored. However if you\n"

4577

4736

"specify a shelf by id those changes will be restored instead. This works\n"

4578

4737

"best when the changes don't depend on each other."

4579

4738

msgstr ""

4580

4739

4581

#: bzrlib/builtins.py:6509

4740

#: bzrlib/builtins.py:6562

4582

4741

msgid "The action to perform."

4583

4742

msgstr ""

4584

4743

4585

#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694

4744

#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694

4586

4745

msgid "action"

4587

4746

msgstr ""

4588

4747

4589

#: bzrlib/builtins.py:6511

4748

#: bzrlib/builtins.py:6564

4590

4749

msgid "Apply changes and remove from the shelf."

4591

4750

msgstr ""

4592

4751

4593

#: bzrlib/builtins.py:6512

4752

#: bzrlib/builtins.py:6565

4594

4753

msgid "Show changes, but do not apply or remove them."

4595

4754

msgstr ""

4596

4755

4597

#: bzrlib/builtins.py:6513

4756

#: bzrlib/builtins.py:6566

4598

4757

msgid ""

4599

4758

"Instead of unshelving the changes, show the diff that would result from "

4600

4759

"unshelving."

4601

4760

msgstr ""

4602

4761

4603

#: bzrlib/builtins.py:6515

4762

#: bzrlib/builtins.py:6568

4604

4763

msgid "Delete changes without applying them."

4605

4764

msgstr ""

4606

4765

4607

#: bzrlib/builtins.py:6516

4766

#: bzrlib/builtins.py:6569

4608

4767

msgid "Apply changes but don't delete them."

4609

4768

msgstr ""

4610

4769

4611

#: bzrlib/builtins.py:6531

4770

#: bzrlib/builtins.py:6584

4612

4771

msgid "Remove unwanted files from working tree."

4613

4772

msgstr ""

4614

4773

4615

#: bzrlib/builtins.py:6533

4774

#: bzrlib/builtins.py:6586

4616

4775

msgid ""

4617

4776

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4618

4777

"files are never deleted."

4619

4778

msgstr ""

4620

4779

4621

#: bzrlib/builtins.py:6536

4780

#: bzrlib/builtins.py:6589

4622

4781

msgid ""

4623

4782

"Another class is 'detritus', which includes files emitted by bzr during\n"

4624

4783

"normal operations and selftests. (The value of these files decreases with\n"

4625

4784

"time.)"

4626

4785

msgstr ""

4627

4786

4628

#: bzrlib/builtins.py:6540

4787

#: bzrlib/builtins.py:6593

4629

4788

msgid ""

4630

4789

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4631

4790

"flags are respected, and may be combined."

4632

4791

msgstr ""

4633

4792

4634

#: bzrlib/builtins.py:6543

4793

#: bzrlib/builtins.py:6596

4635

4794

msgid "To check what clean-tree will do, use --dry-run."

4636

4795

msgstr ""

4637

4796

4638

#: bzrlib/builtins.py:6546

4797

#: bzrlib/builtins.py:6599

4639

4798

msgid "Delete all ignored files."

4640

4799

msgstr ""

4641

4800

4642

#: bzrlib/builtins.py:6547

4801

#: bzrlib/builtins.py:6600

4643

4802

msgid ""

4644

4803

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4645

4804

msgstr ""

4646

4805

4647

#: bzrlib/builtins.py:6550

4806

#: bzrlib/builtins.py:6603

4648

4807

msgid "Delete files unknown to bzr (default)."

4649

4808

msgstr ""

4650

4809

4651

#: bzrlib/builtins.py:6551

4810

#: bzrlib/builtins.py:6604

4652

4811

msgid "Show files to delete instead of deleting them."

4653

4812

msgstr ""

4654

4813

4655

#: bzrlib/builtins.py:6553

4814

#: bzrlib/builtins.py:6606

4656

4815

msgid "Do not prompt before deleting."

4657

4816

msgstr ""

4658

4817

4712

4871

msgstr[0] ""

4713

4872

msgstr[1] ""

4714

4873

4715

#: bzrlib/bzrdir.py:489

4874

#: bzrlib/bzrdir.py:490

4716

4875

msgid ""

4717

4876

"making backup of {0}\n"

4718

4877

" to {1}"

4719

4878

msgstr ""

4720

4879

4721

#: bzrlib/bzrdir.py:512

4880

#: bzrlib/bzrdir.py:513

4722

4881

msgid "renamed {0} to {1}"

4723

4882

msgstr ""

4724

4883

4725

#: bzrlib/bzrdir.py:1663

4884

#: bzrlib/bzrdir.py:1652

4726

4885

#, python-format

4727

4886

msgid ""

4728

4887

"Source repository format does not support stacking, using format:\n"

4729

4888

" %s"

4730

4889

msgstr ""

4731

4890

4732

#: bzrlib/bzrdir.py:1683

4891

#: bzrlib/bzrdir.py:1672

4733

4892

#, python-format

4734

4893

msgid ""

4735

4894

"Source branch format does not support stacking, using format:\n"

4736

4895

" %s"

4737

4896

msgstr ""

4738

4897

4739

#: bzrlib/bzrdir.py:1829

4898

#: bzrlib/bzrdir.py:1818

4740

4899

msgid "starting repository conversion"

4741

4900

msgstr ""

4742

4901

4743

#: bzrlib/bzrdir.py:2058

4902

#: bzrlib/bzrdir.py:2039

4744

4903

msgid "Using default stacking branch {0} at {1}"

4745

4904

msgstr ""

4746

4905

4979

5138

msgid "bzr version-info --revision takes exactly one revision specifier"

4980

5139

msgstr ""

4981

5140

4982

#: bzrlib/commands.py:228

5141

#: bzrlib/commands.py:229

4983

5142

#, python-format

4984

5143

msgid "unknown command \"%s\""

4985

5144

msgstr ""

4986

5145

4987

#: bzrlib/commands.py:475

5146

#: bzrlib/commands.py:476

4988

5147

msgid "No help for this command."

4989

5148

msgstr ""

4990

5149

4991

#: bzrlib/commands.py:488

5150

#: bzrlib/commands.py:489

4992

5151

#, python-format

4993

5152

msgid ":Purpose: %s\n"

4994

5153

msgstr ""

4995

5154

4996

#: bzrlib/commands.py:490

5155

#: bzrlib/commands.py:491

4997

5156

#, python-format

4998

5157

msgid ""

4999

5158

":Usage:\n"

5002

5161

":使い方:\n"

5003

5162

"%s\n"

5004

5163

5005

#: bzrlib/commands.py:492

5164

#: bzrlib/commands.py:493

5006

5165

#, python-format

5007

5166

msgid ":Usage: %s\n"

5008

5167

msgstr ":使い方: %s\n"

5009

5168

5010

#: bzrlib/commands.py:511

5169

#: bzrlib/commands.py:512

5011

5170

#, python-format

5012

5171

msgid ":Options:%s"

5013

5172

msgstr ""

5014

5173

5015

#: bzrlib/commands.py:522

5174

#: bzrlib/commands.py:523

5016

5175

#, python-format

5017

5176

msgid ""

5018

5177

":Description:\n"

5020

5179

"\n"

5021

5180

msgstr ""

5022

5181

5023

#: bzrlib/commands.py:532

5182

#: bzrlib/commands.py:533

5024

5183

#, python-format

5025

5184

msgid ""

5026

5185

"See bzr help %s for more details and examples.\n"

5027

5186

"\n"

5028

5187

msgstr ""

5029

5188

5030

#: bzrlib/commands.py:537

5189

#: bzrlib/commands.py:538

5031

5190

msgid ":Aliases: "

5032

5191

msgstr ""

5033

5192

5034

#: bzrlib/commands.py:541

5193

#: bzrlib/commands.py:542

5035

5194

#, python-format

5036

5195

msgid ":From: plugin \"%s\"\n"

5037

5196

msgstr ""

5038

5197

5039

#: bzrlib/commands.py:553

5198

#: bzrlib/commands.py:554

5040

5199

msgid ":doc:`{0} <{1}-help>`"

5041

5200

msgstr ""

5042

5201

5043

#: bzrlib/commands.py:557

5202

#: bzrlib/commands.py:558

5044

5203

#, python-format

5045

5204

msgid ":See also: %s"

5046

5205

msgstr ""

5047

5206

5048

#: bzrlib/commands.py:815 bzrlib/gpg.py:324

5207

#: bzrlib/commands.py:816 bzrlib/gpg.py:324

5049

5208

msgid "Only ASCII permitted in option names"

5050

5209

msgstr ""

5051

5210

5052

#: bzrlib/commands.py:840 bzrlib/commands.py:848

5211

#: bzrlib/commands.py:841 bzrlib/commands.py:849

5053

5212

msgid "command {0!r} needs one or more {1}"

5054

5213

msgstr ""

5055

5214

5056

#: bzrlib/commands.py:857

5215

#: bzrlib/commands.py:858

5057

5216

msgid "command {0!r} requires argument {1}"

5058

5217

msgstr ""

5059

5218

5060

#: bzrlib/commands.py:864

5219

#: bzrlib/commands.py:865

5061

5220

msgid "extra argument to command {0}: {1}"

5062

5221

msgstr ""

5063

5222

5064

#: bzrlib/commands.py:961

5223

#: bzrlib/commands.py:962

5065

5224

#, python-format

5066

5225

msgid "Profile data written to \"%s\"."

5067

5226

msgstr ""

5163

5322

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

5164

5323

msgstr ""

5165

5324

5166

#: bzrlib/config.py:2499

5325

#: bzrlib/config.py:2485

5167

5326

msgid "{0} is not an SI unit."

5168

5327

msgstr ""

5169

5328

5170

#: bzrlib/config.py:2956

5329

#: bzrlib/config.py:2949

5171

5330

msgid ""

5172

5331

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

5173

5332

"will be saved."

5174

5333

msgstr ""

5175

5334

5176

#: bzrlib/config.py:3100

5335

#: bzrlib/config.py:3093

5177

5336

#, python-format

5178

5337

msgid "Invalid '%s', should be of the form 'name=value'"

5179

5338

msgstr ""

5180

5339

5181

#: bzrlib/config.py:3969

5340

#: bzrlib/config.py:3962

5182

5341

msgid "Display, set or remove a configuration option."

5183

5342

msgstr ""

5184

5343

5185

#: bzrlib/config.py:3971

5344

#: bzrlib/config.py:3964

5186

5345

msgid "Display the active value for a given option."

5187

5346

msgstr ""

5188

5347

5189

#: bzrlib/config.py:3973

5348

#: bzrlib/config.py:3966

5190

5349

msgid ""

5191

5350

"If --all is specified, NAME is interpreted as a regular expression and all\n"

5192

5351

"matching options are displayed mentioning their scope. The active value\n"

5193

5352

"that bzr will take into account is the first one displayed for each option."

5194

5353

msgstr ""

5195

5354

5196

#: bzrlib/config.py:3977

5355

#: bzrlib/config.py:3970

5197

5356

msgid "If no NAME is given, --all .* is implied."

5198

5357

msgstr ""

5199

5358

5200

#: bzrlib/config.py:3979

5359

#: bzrlib/config.py:3972

5201

5360

msgid ""

5202

5361

"Setting a value is achieved by using name=value without spaces. The value\n"

5203

5362

"is set in the most relevant scope and can be checked by displaying the\n"

5204

5363

"option again."

5205

5364

msgstr ""

5206

5365

5207

#: bzrlib/config.py:3991

5366

#: bzrlib/config.py:3984

5208

5367

msgid "Reduce the scope to the specified configuration file."

5209

5368

msgstr ""

5210

5369

5211

#: bzrlib/config.py:3995

5370

#: bzrlib/config.py:3988

5212

5371

msgid "Display all the defined values for the matching options."

5213

5372

msgstr ""

5214

5373

5215

#: bzrlib/config.py:3997

5374

#: bzrlib/config.py:3990

5216

5375

msgid "Remove the option from the configuration file."

5217

5376

msgstr ""

5218

5377

5292

5451

msgstr[0] ""

5293

5452

msgstr[1] ""

5294

5453

5295

#: bzrlib/controldir.py:698

5454

#: bzrlib/controldir.py:710

5296

5455

msgid "{0} is{1} redirected to {2}"

5297

5456

msgstr ""

5298

5457

5398

5557

msgid "The value '%(value)s' is not a valid value."

5399

5558

msgstr ""

5400

5559

5560

#: bzrlib/errors.py:424

5561

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

5562

msgstr "オプション \"%(name)s\" に対する不正な値 \"%(value)s\""

5563

5401

5564

#: bzrlib/errors.py:443

5402

5565

msgid "Generic path error: %(path)r%(extra)s)"

5403

5566

msgstr ""

5497

5660

msgstr ""

5498

5661

5499

5662

#: bzrlib/errors.py:705

5663

msgid "A control directory already exists: \"%(path)s\"."

5664

msgstr ""

5665

5666

#: bzrlib/errors.py:710

5500

5667

msgid "Already a branch: \"%(path)s\"."

5501

5668

msgstr ""

5502

5669

5503

#: bzrlib/errors.py:711

5670

#: bzrlib/errors.py:715

5671

msgid "Parent branch already exists: \"%(path)s\"."

5672

msgstr ""

5673

5674

#: bzrlib/errors.py:721

5504

5675

msgid ""

5505

5676

"Directory contains a branch, but no working tree (use bzr checkout if you "

5506

5677

"wish to build a working tree): \"%(path)s\""

5507

5678

msgstr ""

5508

5679

5509

#: bzrlib/errors.py:716

5680

#: bzrlib/errors.py:726

5510

5681

msgid ""

5511

5682

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5512

5683

msgstr ""

5513

5684

5514

#: bzrlib/errors.py:726

5685

#: bzrlib/errors.py:736

5515

5686

msgid ""

5516

5687

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5517

5688

msgstr ""

5518

5689

5519

#: bzrlib/errors.py:736

5690

#: bzrlib/errors.py:746

5520

5691

msgid "No repository present: \"%(path)s\""

5521

5692

msgstr ""

5522

5693

5523

#: bzrlib/errors.py:743

5694

#: bzrlib/errors.py:753

5524

5695

msgid ""

5525

5696

"Unsupported branch format: %(format)s\n"

5526

5697

"Please run 'bzr upgrade'"

5527

5698

msgstr ""

5528

5699

5529

#: bzrlib/errors.py:749

5700

#: bzrlib/errors.py:759

5530

5701

msgid "Unknown %(kind)s format: %(format)r"

5531

5702

msgstr ""

5532

5703

5533

#: bzrlib/errors.py:758

5704

#: bzrlib/errors.py:768

5534

5705

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5535

5706

msgstr ""

5536

5707

5537

#: bzrlib/errors.py:768

5708

#: bzrlib/errors.py:778

5538

5709

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5539

5710

msgstr ""

5540

5711

5541

#: bzrlib/errors.py:783

5712

#: bzrlib/errors.py:793

5542

5713

msgid ""

5543

5714

"%(target)s\n"

5544

5715

"is not compatible with\n"

5546

5717

"%(details)s"

5547

5718

msgstr ""

5548

5719

5549

#: bzrlib/errors.py:799

5720

#: bzrlib/errors.py:809

5550

5721

msgid "Revision is not compatible with %(repo_format)s"

5551

5722

msgstr ""

5552

5723

5553

#: bzrlib/errors.py:809

5724

#: bzrlib/errors.py:819

5554

5725

msgid "%(context_info)s%(path)s is already versioned."

5555

5726

msgstr ""

5556

5727

5557

#: bzrlib/errors.py:830

5728

#: bzrlib/errors.py:840

5558

5729

msgid "%(context_info)s%(path)s is not versioned."

5559

5730

msgstr ""

5560

5731

5561

#: bzrlib/errors.py:851

5732

#: bzrlib/errors.py:861

5562

5733

msgid "Path(s) are not versioned: %(paths_as_string)s"

5563

5734

msgstr ""

5564

5735

5565

#: bzrlib/errors.py:862

5736

#: bzrlib/errors.py:872

5566

5737

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5567

5738

msgstr ""

5568

5739

5569

#: bzrlib/errors.py:881

5740

#: bzrlib/errors.py:891

5570

5741

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5571

5742

msgstr ""

5572

5743

5573

#: bzrlib/errors.py:889

5744

#: bzrlib/errors.py:899

5574

5745

msgid ""

5575

5746

"Filename %(filename)r is not valid in your current filesystem encoding "

5576

5747

"%(fs_encoding)s"

5577

5748

msgstr ""

5578

5749

5579

#: bzrlib/errors.py:900

5750

#: bzrlib/errors.py:910

5580

5751

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5581

5752

msgstr ""

5582

5753

5583

#: bzrlib/errors.py:918

5754

#: bzrlib/errors.py:928

5584

5755

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5585

5756

msgstr ""

5586

5757

5587

#: bzrlib/errors.py:957

5758

#: bzrlib/errors.py:967

5588

5759

msgid "Cannot lock %(lock)s: %(why)s"

5589

5760

msgstr ""

5590

5761

5591

#: bzrlib/errors.py:967

5762

#: bzrlib/errors.py:977

5592

5763

msgid ""

5593

5764

"A transaction related operation was attempted after the transaction finished."

5594

5765

msgstr ""

5595

5766

5596

#: bzrlib/errors.py:994

5767

#: bzrlib/errors.py:1004

5597

5768

msgid "Cannot lock: transport is read only: %(transport)s"

5598

5769

msgstr ""

5599

5770

5600

#: bzrlib/errors.py:1002

5771

#: bzrlib/errors.py:1012

5601

5772

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5602

5773

msgstr ""

5603

5774

5604

#: bzrlib/errors.py:1013

5775

#: bzrlib/errors.py:1023

5605

5776

msgid ""

5606

5777

"Lock was broken while still open: %(lock)s - check storage consistency!"

5607

5778

msgstr ""

5608

5779

5609

#: bzrlib/errors.py:1024

5780

#: bzrlib/errors.py:1034

5610

5781

msgid ""

5611

5782

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5612

5783

"%(holder)r, wanted to break %(target)r"

5613

5784

msgstr ""

5614

5785

5615

#: bzrlib/errors.py:1036

5786

#: bzrlib/errors.py:1046

5616

5787

msgid ""

5617

5788

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5618

5789

"Use 'bzr break-lock' to clear it"

5619

5790

msgstr ""

5620

5791

5621

#: bzrlib/errors.py:1049

5792

#: bzrlib/errors.py:1059

5622

5793

msgid "Lock not held: %(lock)s"

5623

5794

msgstr ""

5624

5795

5625

#: bzrlib/errors.py:1078

5796

#: bzrlib/errors.py:1088

5626

5797

msgid "No changes to commit"

5627

5798

msgstr ""

5628

5799

5629

#: bzrlib/errors.py:1083

5800

#: bzrlib/errors.py:1093

5630

5801

msgid ""

5631

5802

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5632

5803

msgstr ""

5633

5804

5634

#: bzrlib/errors.py:1093

5805

#: bzrlib/errors.py:1103

5635

5806

msgid ""

5636

5807

"Excluding paths during commit is not supported by repository at "

5637

5808

"%(repository)r."

5638

5809

msgstr ""

5639

5810

5640

#: bzrlib/errors.py:1102

5811

#: bzrlib/errors.py:1112

5641

5812

msgid ""

5642

5813

"The specified commit message contains characters unsupported by the current "

5643

5814

"encoding."

5644

5815

msgstr ""

5645

5816

5646

#: bzrlib/errors.py:1108

5817

#: bzrlib/errors.py:1118

5647

5818

msgid "Upgrade URL cannot work with readonly URLs."

5648

5819

msgstr ""

5649

5820

5650

#: bzrlib/errors.py:1113

5821

#: bzrlib/errors.py:1123

5651

5822

msgid "The branch format %(format)s is already at the most recent format."

5652

5823

msgstr ""

5653

5824

5654

#: bzrlib/errors.py:1136

5825

#: bzrlib/errors.py:1146

5655

5826

msgid "Option --change does not accept revision ranges"

5656

5827

msgstr ""

5657

5828

5658

#: bzrlib/errors.py:1141

5829

#: bzrlib/errors.py:1151

5659

5830

msgid "No namespace registered for string: %(spec)r"

5660

5831

msgstr ""

5661

5832

5662

#: bzrlib/errors.py:1160

5833

#: bzrlib/errors.py:1170

5663

5834

msgid ""

5664

5835

"Requested revision: '%(spec)s' does not exist in branch: "

5665

5836

"%(branch_url)s%(extra)s"

5666

5837

msgstr ""

5667

5838

5668

#: bzrlib/errors.py:1174

5839

#: bzrlib/errors.py:1184

5669

5840

msgid ""

5670

5841

"Operation denied because it would change the main history, which is not "

5671

5842

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5672

5843

msgstr ""

5673

5844

5674

#: bzrlib/errors.py:1185

5845

#: bzrlib/errors.py:1195

5675

5846

msgid ""

5676

5847

"These branches have diverged. Use the missing command to see how.\n"

5677

5848

"Use the merge command to reconcile them."

5678

5849

msgstr ""

5679

5850

5680

#: bzrlib/errors.py:1205

5851

#: bzrlib/errors.py:1215

5681

5852

msgid ""

5682

5853

"Branches have no common ancestor, and no merge base revision was specified."

5683

5854

msgstr ""

5684

5855

5685

#: bzrlib/errors.py:1211

5856

#: bzrlib/errors.py:1221

5686

5857

msgid ""

5687

5858

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5688

5859

msgstr ""

5689

5860

5690

#: bzrlib/errors.py:1217

5861

#: bzrlib/errors.py:1227

5691

5862

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5692

5863

msgstr ""

5693

5864

5694

#: bzrlib/errors.py:1226

5865

#: bzrlib/errors.py:1236

5695

5866

msgid ""

5696

5867

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5697

5868

msgstr ""

5698

5869

5699

#: bzrlib/errors.py:1235

5870

#: bzrlib/errors.py:1245

5700

5871

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5701

5872

msgstr ""

5702

5873

5703

#: bzrlib/errors.py:1244

5874

#: bzrlib/errors.py:1254

5704

5875

msgid "Branch %(branch)s has no commits."

5705

5876

msgstr ""

5706

5877

5707

#: bzrlib/errors.py:1262

5878

#: bzrlib/errors.py:1272

5708

5879

msgid ""

5709

5880

"Bound branch %(branch)s is out of date with master branch "

5710

5881

"%(master)s.%(extra_help)s"

5711

5882

msgstr ""

5712

5883

5713

#: bzrlib/errors.py:1274

5884

#: bzrlib/errors.py:1284

5714

5885

msgid ""

5715

5886

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5716

5887

"bound to %(remote)s."

5717

5888

msgstr ""

5718

5889

5719

#: bzrlib/errors.py:1286

5890

#: bzrlib/errors.py:1296

5720

5891

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5721

5892

msgstr ""

5722

5893

5723

#: bzrlib/errors.py:1295

5894

#: bzrlib/errors.py:1305

5724

5895

msgid ""

5725

5896

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5726

5897

"%(error)s"

5727

5898

msgstr ""

5728

5899

5729

#: bzrlib/errors.py:1307

5900

#: bzrlib/errors.py:1317

5730

5901

msgid "Error in processing weave: %(msg)s"

5731

5902

msgstr ""

5732

5903

5733

#: bzrlib/errors.py:1316

5904

#: bzrlib/errors.py:1326

5734

5905

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5735

5906

msgstr ""

5736

5907

5737

#: bzrlib/errors.py:1327

5908

#: bzrlib/errors.py:1337

5738

5909

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5739

5910

msgstr ""

5740

5911

5741

#: bzrlib/errors.py:1337

5912

#: bzrlib/errors.py:1347

5742

5913

msgid "Weave invariant violated: %(what)s"

5743

5914

msgstr ""

5744

5915

5745

#: bzrlib/errors.py:1346

5916

#: bzrlib/errors.py:1356

5746

5917

msgid "Parents are mismatched between two revisions. %(msg)s"

5747

5918

msgstr ""

5748

5919

5749

#: bzrlib/errors.py:1368

5920

#: bzrlib/errors.py:1378

5750

5921

msgid ""

5751

5922

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5752

5923

"%(weave_b)s"

5753

5924

msgstr ""

5754

5925

5755

#: bzrlib/errors.py:1380

5926

#: bzrlib/errors.py:1390

5756

5927

msgid "Versioned file error"

5757

5928

msgstr "バージョン管理されたファイルのエラー"

5758

5929

5759

#: bzrlib/errors.py:1385

5930

#: bzrlib/errors.py:1395

5760

5931

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5761

5932

msgstr "\"%(file_id)s\" にはリビジョン {%(revision_id)s} がありません。"

5762

5933

5763

#: bzrlib/errors.py:1395

5934

#: bzrlib/errors.py:1405

5764

5935

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5765

5936

msgstr "\"%(file_id)s\" にはすでにリビジョン {%(revision_id)s} が存在しています。"

5766

5937

5767

#: bzrlib/errors.py:1405

5938

#: bzrlib/errors.py:1415

5768

5939

msgid "Text did not match its checksum: %(msg)s"

5769

5940

msgstr "テキストがチェックサムと一致しません: %(msg)s"

5770

5941

5771

#: bzrlib/errors.py:1531

5942

#: bzrlib/errors.py:1541

5772

5943

msgid "Export format %(format)r not supported"

5773

5944

msgstr "エクスポートフォーマット %(format)r はサポートされていません"

5774

5945

5775

#: bzrlib/errors.py:1540

5946

#: bzrlib/errors.py:1550

5776

5947

msgid "Transport error: %(msg)s %(orig_error)s"

5777

5948

msgstr ""

5778

5949

5779

#: bzrlib/errors.py:1566

5950

#: bzrlib/errors.py:1576

5780

5951

msgid "Generic bzr smart protocol error: %(details)s"

5781

5952

msgstr ""

5782

5953

5783

#: bzrlib/errors.py:1574

5954

#: bzrlib/errors.py:1584

5784

5955

msgid "Received bad protocol version marker: %(marker)r"

5785

5956

msgstr ""

5786

5957

5787

#: bzrlib/errors.py:1606

5958

#: bzrlib/errors.py:1616

5788

5959

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5789

5960

msgstr ""

5790

5961

5791

#: bzrlib/errors.py:1611

5962

#: bzrlib/errors.py:1621

5792

5963

msgid "Connection error: %(msg)s %(orig_error)s"

5793

5964

msgstr ""

5794

5965

5795

#: bzrlib/errors.py:1616

5966

#: bzrlib/errors.py:1626

5796

5967

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5797

5968

msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"

5798

5969

5799

#: bzrlib/errors.py:1637

5970

#: bzrlib/errors.py:1647

5800

5971

msgid "Connection closed: %(msg)s %(orig_error)s"

5801

5972

msgstr "接続が閉じられました: %(msg)s %(orig_error)s"

5802

5973

5803

#: bzrlib/errors.py:1642

5974

#: bzrlib/errors.py:1652

5804

5975

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5805

5976

msgstr "接続がタイムアウトしました: %(msg)s%(orig_error)s"

5806

5977

5807

#: bzrlib/errors.py:1647

5978

#: bzrlib/errors.py:1657

5808

5979

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5809

5980

msgstr "%(path)s の %(offset)s に対する不正な range アクセス: %(msg)s"

5810

5981

5811

#: bzrlib/errors.py:1657

5982

#: bzrlib/errors.py:1667

5812

5983

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5813

5984

msgstr "%(path)s からの不正な HTTP レスポンス: %(msg)s%(orig_error)s"

5814

5985

5815

#: bzrlib/errors.py:1672

5986

#: bzrlib/errors.py:1682

5987

msgid "Certificate error: %(error)s"

5988

msgstr ""

5989

5990

#: bzrlib/errors.py:1690

5816

5991

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5817

5992

msgstr "%(path) に対する不正な range %(range)r: %(msg)s"

5818

5993

5819

#: bzrlib/errors.py:1686

5994

#: bzrlib/errors.py:1704

5820

5995

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5821

5996

msgstr "%(path)s に HTTP MIME 境界が見つかりません: %(msg)s"

5822

5997

5823

#: bzrlib/errors.py:1694

5998

#: bzrlib/errors.py:1712

5824

5999

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

5825

6000

msgstr ""

5826

6001

5827

#: bzrlib/errors.py:1703

6002

#: bzrlib/errors.py:1721

5828

6003

msgid "%(source)s is%(permanently)s redirected to %(target)s"

5829

6004

msgstr ""

5830

6005

5831

#: bzrlib/errors.py:1717

6006

#: bzrlib/errors.py:1735

5832

6007

msgid "Too many redirections"

5833

6008

msgstr "リダイレクションが多すぎます"

5834

6009

5835

#: bzrlib/errors.py:1722

6010

#: bzrlib/errors.py:1740

5836

6011

msgid "Working tree has conflicts."

5837

6012

msgstr "作業ツリーに衝突があります"

5838

6013

5839

#: bzrlib/errors.py:1726

6014

#: bzrlib/errors.py:1744

5840

6015

msgid "Config file %(filename)s is not UTF-8 encoded\n"

5841

6016

msgstr "設定ファイル %(filename)s が UTF-8 でエンコードされていません\n"

5842

6017

5843

#: bzrlib/errors.py:1735

6018

#: bzrlib/errors.py:1753

5844

6019

msgid ""

5845

6020

"Error(s) parsing config file %(filename)s:\n"

5846

6021

"%(errors)s"

5848

6023

"設定ファイル %(filename)s のパースエラー:\n"

5849

6024

"%(error)s"

5850

6025

5851

#: bzrlib/errors.py:1746

5852

msgid "Bad value \"%(value)s\" for option \"%(name)s\"."

5853

msgstr "オプション \"%(name)s\" に対する不正な値 \"%(value)s\""

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 ""

5854

6031

5855

#: bzrlib/errors.py:1754

6032

#: bzrlib/errors.py:1773

5856

6033

msgid "%(username)r does not seem to contain a reasonable email address"

5857

6034

msgstr "%(username)r に有効な e-mail アドレスが含まれていないようです"

5858

6035

5859

#: bzrlib/errors.py:1763

6036

#: bzrlib/errors.py:1782

5860

6037

msgid "Failed to GPG sign data with command \"%(command_line)s\""

5861

6038

msgstr "\"%(command_line)s\" コマンドでのGPGサインに失敗しました"

5862

6039

5863

#: bzrlib/errors.py:1771

6040

#: bzrlib/errors.py:1790

5864

6041

msgid "Failed to verify GPG signature data with error \"%(error)s\""

5865

6042

msgstr "GPGシグネチャの検証に \"%(error)s\" で失敗しました。"

5866

6043

5867

#: bzrlib/errors.py:1779

6044

#: bzrlib/errors.py:1798

5868

6045

msgid "Unable to import library \"%(library)s\": %(error)s"

5869

6046

msgstr "ライブラリ \"%(library)s\" をインポートできません: %(error)s"

5870

6047

5871

#: bzrlib/errors.py:1787

6048

#: bzrlib/errors.py:1806

5872

6049

msgid "python-gpgme is not installed, it is needed to verify signatures"

5873

6050

msgstr "python-gpgme がインストールされていません。これはシグネチャの検証に必要です。"

5874

6051

5875

#: bzrlib/errors.py:1795

6052

#: bzrlib/errors.py:1814

5876

6053

msgid ""

5877

6054

"The working tree for %(basedir)s has changed since the last commit, but "

5878

6055

"weave merge requires that it be unchanged"

5879

6056

msgstr "作業ツリー %(basedir)s が最後のコミットから変更されています。作業ツリーが変更されている場合weaveマージはできません。"

5880

6057

5881

#: bzrlib/errors.py:1805

6058

#: bzrlib/errors.py:1824

5882

6059

msgid ""

5883

6060

"Can't reprocess and show base, because reprocessing obscures the "

5884

6061

"relationship of conflicting lines to the base"

5885

6062

msgstr ""

5886

6063

5887

#: bzrlib/errors.py:1811

6064

#: bzrlib/errors.py:1830

5888

6065

msgid "Cycle in graph %(graph)r"

5889

6066

msgstr "グラフ %(graph)r がループしています。"

5890

6067

5891

#: bzrlib/errors.py:1839

6068

#: bzrlib/errors.py:1858

5892

6069

msgid "File %(filename)s is not conflicted."

5893

6070

msgstr "%(filename)s は衝突していません"

5894

6071

5895

#: bzrlib/errors.py:1861

6072

#: bzrlib/errors.py:1880

5896

6073

msgid "No bundle was found in \"%(filename)s\"."

5897

6074

msgstr "\"%(filename)s\" にバンドルが見つかりません。"

5898

6075

5899

#: bzrlib/errors.py:1870

6076

#: bzrlib/errors.py:1889

5900

6077

msgid "Unable to handle bundle version %(version)s: %(msg)s"

5901

6078

msgstr ""

5902

6079

5903

#: bzrlib/errors.py:1880

6080

#: bzrlib/errors.py:1899

5904

6081

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

5905

6082

msgstr ""

5906

6083

5907

#: bzrlib/errors.py:1893

6084

#: bzrlib/errors.py:1912

5908

6085

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

5909

6086

msgstr ""

5910

6087

5911

#: bzrlib/errors.py:1903

6088

#: bzrlib/errors.py:1922

5912

6089

msgid "Key %(key)s is already present in map"

5913

6090

msgstr ""

5914

6091

5915

#: bzrlib/errors.py:1908

6092

#: bzrlib/errors.py:1927

5916

6093

msgid "The prefix %(prefix)s is in the help search path twice."

5917

6094

msgstr ""

5918

6095

5919

#: bzrlib/errors.py:1918

6096

#: bzrlib/errors.py:1937

5920

6097

msgid ""

5921

6098

"No final name for trans_id %(trans_id)r\n"

5922

6099

"file-id: %(file_id)r\n"

5923

6100

"root trans-id: %(root_trans_id)r\n"

5924

6101

msgstr ""

5925

6102

5926

#: bzrlib/errors.py:1950

6103

#: bzrlib/errors.py:1969

5927

6104

msgid "Attempt to reuse a transform that has already been applied."

5928

6105

msgstr ""

5929

6106

5930

#: bzrlib/errors.py:1955

6107

#: bzrlib/errors.py:1974

5931

6108

msgid "Moving the root directory is not supported at this time"

5932

6109

msgstr "いまのところ、ルートディレクトリの移動はサポートされていません"

5933

6110

5934

#: bzrlib/errors.py:1960

6111

#: bzrlib/errors.py:1979

5935

6112

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

5936

6113

msgstr "%(from_path)s から %(to_path)s へのリネームに失敗しました: %(why)s"

5937

6114

5938

#: bzrlib/errors.py:1971

6115

#: bzrlib/errors.py:1990

5939

6116

msgid ""

5940

6117

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5941

6118

msgstr ""

5942

6119

"移動できません。 %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5943

6120

5944

#: bzrlib/errors.py:2007

6121

#: bzrlib/errors.py:2026

5945

6122

msgid ""

5946

6123

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

5947

6124

msgstr ""

5948

6125

"%(from_path)s%(operator)s から %(to_path)s%(_has_extra)s%(extra)s へリネームできません"

5949

6126

5950

#: bzrlib/errors.py:2037

6127

#: bzrlib/errors.py:2056

5951

6128

msgid "Unable to import paramiko (required for sftp support): %(error)s"

5952

6129

msgstr ""

5953

6130

5954

#: bzrlib/errors.py:2045

6131

#: bzrlib/errors.py:2064

5955

6132

msgid "Nothing to merge."

5956

6133

msgstr ""

5957

6134

5958

#: bzrlib/errors.py:2050

6135

#: bzrlib/errors.py:2069

5959

6136

msgid "Format %(format)s cannot be initialised by this version of bzr."

5960

6137

msgstr ""

5961

6138

5962

#: bzrlib/errors.py:2059

6139

#: bzrlib/errors.py:2078

5963

6140

msgid ""

5964

6141

"Cannot convert from format %(from_format)s to format %(format)s. "

5965

6142

"%(problem)s"

5966

6143

msgstr ""

5967

6144

5968

#: bzrlib/errors.py:2071

6145

#: bzrlib/errors.py:2090

5969

6146

msgid "Could not find an appropriate Differ for file \"%(path)s\""

5970

6147

msgstr ""

5971

6148

5972

#: bzrlib/errors.py:2079

6149

#: bzrlib/errors.py:2098

5973

6150

msgid "%(exe_name)s could not be found on this machine"

5974

6151

msgstr ""

5975

6152

5976

#: bzrlib/errors.py:2087

6153

#: bzrlib/errors.py:2106

5977

6154

msgid "Diff is not installed on this machine: %(msg)s"

5978

6155

msgstr ""

5979

6156

5980

#: bzrlib/errors.py:2095

6157

#: bzrlib/errors.py:2114

5981

6158

msgid "Diff3 is not installed on this machine."

5982

6159

msgstr ""

5983

6160

5984

#: bzrlib/errors.py:2101

6161

#: bzrlib/errors.py:2120

5985

6162

msgid "The content being inserted is already present."

5986

6163

msgstr ""

5987

6164

5988

#: bzrlib/errors.py:2106

6165

#: bzrlib/errors.py:2125

5989

6166

msgid ""

5990

6167

"This tree contains left-over files from a failed operation.\n"

5991

6168

" Please examine %(limbo_dir)s to see if it contains any files you wish "

5993

6170

" keep, and delete it when you are done."

5994

6171

msgstr ""

5995

6172

5996

#: bzrlib/errors.py:2117

6173

#: bzrlib/errors.py:2136

5997

6174

msgid ""

5998

6175

"This tree contains left-over files from a failed operation.\n"

5999

6176

" Please examine %(pending_deletion)s to see if it contains any files you\n"

6000

6177

" wish to keep, and delete it when you are done."

6001

6178

msgstr ""

6002

6179

6003

#: bzrlib/errors.py:2127

6180

#: bzrlib/errors.py:2146

6004

6181

msgid ""

6005

6182

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

6006

6183

" Please examine %(limbo_dir)s to see if it contains any files you wish "

6008

6185

" keep, and delete it when you are done."

6009

6186

msgstr ""

6010

6187

6011

#: bzrlib/errors.py:2138

6188

#: bzrlib/errors.py:2157

6012

6189

msgid ""

6013

6190

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

6014

6191

"examine %(pending_deletion)s to see if it contains any files you wish to "

6015

6192

"keep, and delete it when you are done."

6016

6193

msgstr ""

6017

6194

6018

#: bzrlib/errors.py:2148

6195

#: bzrlib/errors.py:2167

6019

6196

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

6020

6197

msgstr ""

6021

6198

6022

#: bzrlib/errors.py:2162

6199

#: bzrlib/errors.py:2181

6023

6200

msgid ""

6024

6201

"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

6025

6202

msgstr ""

6026

6203

6027

#: bzrlib/errors.py:2175

6204

#: bzrlib/errors.py:2194

6028

6205

msgid "Error in merge modified format"

6029

6206

msgstr ""

6030

6207

6031

#: bzrlib/errors.py:2180

6208

#: bzrlib/errors.py:2199

6032

6209

msgid "Format error in conflict listings"

6033

6210

msgstr ""

6034

6211

6035

#: bzrlib/errors.py:2184

6212

#: bzrlib/errors.py:2203

6036

6213

msgid ""

6037

6214

"Inconsistency in dirstate file %(dirstate_path)s.\n"

6038

6215

"Error: %(description)s"

6039

6216

msgstr ""

6040

6217

6041

#: bzrlib/errors.py:2195

6218

#: bzrlib/errors.py:2214

6042

6219

msgid ""

6043

6220

"An error has been detected in the repository %(repo_path)s.\n"

6044

6221

"Please run bzr reconcile on this repository."

6045

6222

msgstr ""

6046

6223

6047

#: bzrlib/errors.py:2206

6224

#: bzrlib/errors.py:2225

6048

6225

msgid ""

6049

6226

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

6050

6227

"reason: %(reason)s"

6051

6228

msgstr ""

6052

6229

6053

#: bzrlib/errors.py:2219

6230

#: bzrlib/errors.py:2238

6054

6231

msgid ""

6055

6232

"An inconsistent delta was supplied: %(delta)r\n"

6056

6233

"reason: %(reason)s"

6057

6234

msgstr ""

6058

6235

6059

#: bzrlib/errors.py:2231

6236

#: bzrlib/errors.py:2250

6060

6237

msgid "To use this feature you must upgrade your branch at %(path)s."

6061

6238

msgstr ""

6062

6239

6063

#: bzrlib/errors.py:2240

6240

#: bzrlib/errors.py:2259

6064

6241

msgid "To use this feature you must upgrade your repository at %(path)s."

6065

6242

msgstr ""

6066

6243

6067

#: bzrlib/errors.py:2245

6244

#: bzrlib/errors.py:2264

6068

6245

msgid ""

6069

6246

"To use this feature you must upgrade your branch at %(path)s to a format "

6070

6247

"which supports rich roots."

6071

6248

msgstr ""

6072

6249

6073

#: bzrlib/errors.py:2251

6250

#: bzrlib/errors.py:2270

6074

6251

msgid "Cannot perform local-only commits on unbound branches."

6075

6252

msgstr ""

6076

6253

6077

#: bzrlib/errors.py:2256

6254

#: bzrlib/errors.py:2275

6078

6255

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

6079

6256

msgstr ""

6080

6257

6081

#: bzrlib/errors.py:2277

6258

#: bzrlib/errors.py:2296

6082

6259

msgid "Ghost tags not supported by format %(format)r."

6083

6260

msgstr ""

6084

6261

6085

#: bzrlib/errors.py:2285

6262

#: bzrlib/errors.py:2304

6086

6263

msgid "File is binary but should be text."

6087

6264

msgstr ""

6088

6265

6089

#: bzrlib/errors.py:2290

6266

#: bzrlib/errors.py:2309

6090

6267

msgid "The path %(path)s is not permitted on this platform"

6091

6268

msgstr ""

6092

6269

6093

#: bzrlib/errors.py:2299

6270

#: bzrlib/errors.py:2318

6094

6271

msgid ""

6095

6272

"Testament did not match expected value.\n"

6096

6273

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

6097

6274

" {%(measured)s}"

6098

6275

msgstr ""

6099

6276

6100

#: bzrlib/errors.py:2311

6277

#: bzrlib/errors.py:2330

6101

6278

msgid "Not a bzr revision-bundle: %(text)r"

6102

6279

msgstr ""

6103

6280

6104

#: bzrlib/errors.py:2320

6281

#: bzrlib/errors.py:2339

6105

6282

msgid "Bad bzr revision-bundle: %(text)r"

6106

6283

msgstr ""

6107

6284

6108

#: bzrlib/errors.py:2329

6285

#: bzrlib/errors.py:2348

6109

6286

msgid "Malformed bzr revision-bundle header: %(text)r"

6110

6287

msgstr ""

6111

6288

6112

#: bzrlib/errors.py:2334

6289

#: bzrlib/errors.py:2353

6113

6290

msgid "Malformed patches in bzr revision-bundle: %(text)r"

6114

6291

msgstr ""

6115

6292

6116

#: bzrlib/errors.py:2339

6293

#: bzrlib/errors.py:2358

6117

6294

msgid "Malformed footer in bzr revision-bundle: %(text)r"

6118

6295

msgstr ""

6119

6296

6120

#: bzrlib/errors.py:2344

6297

#: bzrlib/errors.py:2363

6121

6298

msgid "End of line marker was not \\n in bzr revision-bundle"

6122

6299

msgstr ""

6123

6300

6124

#: bzrlib/errors.py:2354

6301

#: bzrlib/errors.py:2373

6125

6302

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

6126

6303

msgstr ""

6127

6304

6128

#: bzrlib/errors.py:2364

6305

#: bzrlib/errors.py:2383

6129

6306

msgid "Root class for inventory serialization errors"

6130

6307

msgstr ""

6131

6308

6132

#: bzrlib/errors.py:2368

6309

#: bzrlib/errors.py:2387

6133

6310

msgid ""

6134

6311

"The inventory was not in the expected format:\n"

6135

6312

" %(msg)s"

6136

6313

msgstr ""

6137

6314

6138

#: bzrlib/errors.py:2377

6315

#: bzrlib/errors.py:2396

6139

6316

msgid "This operation requires rich root data storage"

6140

6317

msgstr ""

6141

6318

6142

#: bzrlib/errors.py:2390

6319

#: bzrlib/errors.py:2409

6143

6320

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

6144

6321

msgstr ""

6145

6322

6146

#: bzrlib/errors.py:2399

6323

#: bzrlib/errors.py:2418

6147

6324

msgid ""

6148

6325

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

6149

6326

"variable."

6150

6327

msgstr ""

6151

6328

6152

#: bzrlib/errors.py:2406

6329

#: bzrlib/errors.py:2425

6153

6330

msgid ""

6154

6331

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

6155

6332

"ghost at {%(ghost_revision_id)s}"

6156

6333

msgstr ""

6157

6334

6158

#: bzrlib/errors.py:2416

6335

#: bzrlib/errors.py:2435

6159

6336

msgid "Ghost revision {%(revision_id)s} cannot be used here."

6160

6337

msgstr ""

6161

6338

6162

#: bzrlib/errors.py:2467

6339

#: bzrlib/errors.py:2486

6163

6340

msgid ""

6164

6341

"A merge directive must provide either a bundle or a public branch location."

6165

6342

msgstr ""

6166

6343

6167

#: bzrlib/errors.py:2474

6344

#: bzrlib/errors.py:2493

6168

6345

msgid "Bad merge directive payload %(start)r"

6169

6346

msgstr ""

6170

6347

6171

#: bzrlib/errors.py:2484

6348

#: bzrlib/errors.py:2503

6172

6349

msgid "Preview patch does not match requested changes."

6173

6350

msgstr ""

6174

6351

6175

#: bzrlib/errors.py:2490

6352

#: bzrlib/errors.py:2509

6176

6353

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

6177

6354

msgstr ""

6178

6355

6179

#: bzrlib/errors.py:2500

6356

#: bzrlib/errors.py:2519

6180

6357

msgid ""

6181

6358

"Your branch does not have all of the revisions required in order to merge "

6182

6359

"this merge directive and the target location specified in the merge "

6183

6360

"directive is not a branch: %(location)s."

6184

6361

msgstr ""

6185

6362

6186

#: bzrlib/errors.py:2512

6363

#: bzrlib/errors.py:2531

6187

6364

msgid "Unsupported entry kind %(kind)s"

6188

6365

msgstr ""

6189

6366

6190

#: bzrlib/errors.py:2520

6367

#: bzrlib/errors.py:2539

6191

6368

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

6192

6369

msgstr ""

6193

6370

6194

#: bzrlib/errors.py:2530

6371

#: bzrlib/errors.py:2549

6195

6372

msgid "Subsume target %(other_tree)s needs to be upgraded."

6196

6373

msgstr ""

6197

6374

6198

#: bzrlib/errors.py:2549

6375

#: bzrlib/errors.py:2568

6199

6376

msgid "No such tag: %(tag_name)s"

6200

6377

msgstr ""

6201

6378

6202

#: bzrlib/errors.py:2557

6379

#: bzrlib/errors.py:2576

6203

6380

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

6204

6381

msgstr ""

6205

6382

6206

#: bzrlib/errors.py:2566

6383

#: bzrlib/errors.py:2585

6207

6384

msgid "Tag %(tag_name)s already exists."

6208

6385

msgstr ""

6209

6386

6210

#: bzrlib/errors.py:2574

6387

#: bzrlib/errors.py:2593

6211

6388

msgid ""

6212

6389

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "

6213

6390

"bugs\" for more information on this feature."

6214

6391

msgstr ""

6215

6392

6216

#: bzrlib/errors.py:2584

6393

#: bzrlib/errors.py:2603

6217

6394

msgid ""

6218

6395

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

6219

6396

msgstr ""

6220

6397

6221

#: bzrlib/errors.py:2594

6398

#: bzrlib/errors.py:2613

6222

6399

msgid ""

6223

6400

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

6224

6401

msgstr ""

6225

6402

6226

#: bzrlib/errors.py:2604

6403

#: bzrlib/errors.py:2623

6227

6404

msgid "Invalid line in bugs property: '%(line)s'"

6228

6405

msgstr ""

6229

6406

6230

#: bzrlib/errors.py:2612

6407

#: bzrlib/errors.py:2631

6231

6408

msgid "Invalid bug status: '%(status)s'"

6232

6409

msgstr ""

6233

6410

6234

#: bzrlib/errors.py:2620

6411

#: bzrlib/errors.py:2639

6235

6412

msgid "Could not understand response from smart server: %(response_tuple)r"

6236

6413

msgstr ""

6237

6414

6238

#: bzrlib/errors.py:2659

6415

#: bzrlib/errors.py:2678

6239

6416

msgid "Server sent an unexpected error: %(error_tuple)r"

6240

6417

msgstr ""

6241

6418

6242

#: bzrlib/errors.py:2678

6419

#: bzrlib/errors.py:2697

6243

6420

msgid "Unrecognised container format: %(container_format)r"

6244

6421

msgstr ""

6245

6422

6246

#: bzrlib/errors.py:2686

6423

#: bzrlib/errors.py:2705

6247

6424

msgid "Unexpected end of container stream"

6248

6425

msgstr ""

6249

6426

6250

#: bzrlib/errors.py:2691

6427

#: bzrlib/errors.py:2710

6251

6428

msgid "Unknown record type: %(record_type)r"

6252

6429

msgstr ""

6253

6430

6254

#: bzrlib/errors.py:2699

6431

#: bzrlib/errors.py:2718

6255

6432

msgid "Invalid record: %(reason)s"

6256

6433

msgstr ""

6257

6434

6258

#: bzrlib/errors.py:2707

6435

#: bzrlib/errors.py:2726

6259

6436

msgid "Container has data after end marker: %(excess)r"

6260

6437

msgstr ""

6261

6438

6262

#: bzrlib/errors.py:2715

6439

#: bzrlib/errors.py:2734

6263

6440

msgid "Container has multiple records with the same name: %(name)s"

6264

6441

msgstr ""

6265

6442

6266

#: bzrlib/errors.py:2728

6443

#: bzrlib/errors.py:2747

6267

6444

msgid "Corrupt or incompatible data stream: %(reason)s"

6268

6445

msgstr ""

6269

6446

6270

#: bzrlib/errors.py:2736

6447

#: bzrlib/errors.py:2755

6271

6448

msgid "SMTP error: %(error)s"

6272

6449

msgstr ""

6273

6450

6274

#: bzrlib/errors.py:2744

6451

#: bzrlib/errors.py:2763

6275

6452

msgid "No message supplied."

6276

6453

msgstr ""

6277

6454

6278

#: bzrlib/errors.py:2749

6455

#: bzrlib/errors.py:2768

6279

6456

msgid "No mail-to address (--mail-to) or output (-o) specified."

6280

6457

msgstr ""

6281

6458

6282

#: bzrlib/errors.py:2754

6459

#: bzrlib/errors.py:2773

6283

6460

msgid "Unknown mail client: %(mail_client)s"

6284

6461

msgstr ""

6285

6462

6286

#: bzrlib/errors.py:2762

6463

#: bzrlib/errors.py:2781

6287

6464

msgid ""

6288

6465

"Unable to find mail client with the following names: "

6289

6466

"%(mail_command_list_string)s"

6290

6467

msgstr ""

6291

6468

6292

#: bzrlib/errors.py:2772

6469

#: bzrlib/errors.py:2791

6293

6470

msgid "SMTP connection to %(host)s refused"

6294

6471

msgstr ""

6295

6472

6296

#: bzrlib/errors.py:2781

6473

#: bzrlib/errors.py:2800

6297

6474

msgid "Please specify smtp_server. No server at default %(host)s."

6298

6475

msgstr ""

6299

6476

6300

#: bzrlib/errors.py:2795

6477

#: bzrlib/errors.py:2814

6301

6478

msgid ""

6302

6479

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

6303

6480

"reconfigure."

6304

6481

msgstr ""

6305

6482

6306

#: bzrlib/errors.py:2807

6483

#: bzrlib/errors.py:2826

6307

6484

msgid "'%(display_url)s' is already a branch."

6308

6485

msgstr ""

6309

6486

6310

#: bzrlib/errors.py:2812

6487

#: bzrlib/errors.py:2831

6311

6488

msgid "'%(display_url)s' is already a tree."

6312

6489

msgstr ""

6313

6490

6314

#: bzrlib/errors.py:2817

6491

#: bzrlib/errors.py:2836

6315

6492

msgid "'%(display_url)s' is already a checkout."

6316

6493

msgstr ""

6317

6494

6318

#: bzrlib/errors.py:2822

6495

#: bzrlib/errors.py:2841

6319

6496

msgid "'%(display_url)s' is already a lightweight checkout."

6320

6497

msgstr ""

6321

6498

6322

#: bzrlib/errors.py:2827

6499

#: bzrlib/errors.py:2846

6323

6500

msgid "'%(display_url)s' is already using a shared repository."

6324

6501

msgstr ""

6325

6502

6326

#: bzrlib/errors.py:2832

6503

#: bzrlib/errors.py:2851

6327

6504

msgid "'%(display_url)s' is already standalone."

6328

6505

msgstr ""

6329

6506

6330

#: bzrlib/errors.py:2837

6507

#: bzrlib/errors.py:2856

6331

6508

msgid "Shared repository '%(display_url)s' already creates working trees."

6332

6509

msgstr ""

6333

6510

6334

#: bzrlib/errors.py:2843

6511

#: bzrlib/errors.py:2862

6335

6512

msgid ""

6336

6513

"Shared repository '%(display_url)s' already doesn't create working trees."

6337

6514

msgstr ""

6338

6515

6339

#: bzrlib/errors.py:2849

6516

#: bzrlib/errors.py:2868

6340

6517

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

6341

6518

msgstr ""

6342

6519

6343

#: bzrlib/errors.py:2854

6520

#: bzrlib/errors.py:2873

6344

6521

msgid "No location could be found to bind to at %(display_url)s."

6345

6522

msgstr ""

6346

6523

6347

#: bzrlib/errors.py:2859

6524

#: bzrlib/errors.py:2878

6348

6525

msgid ""

6349

6526

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "

6350

6527

"status).%(more)s"

6351

6528

msgstr ""

6352

6529

6353

#: bzrlib/errors.py:2878

6530

#: bzrlib/errors.py:2897

6354

6531

msgid ""

6355

6532

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"

6356

6533

"list).%(more)s"

6357

6534

msgstr ""

6358

6535

6359

#: bzrlib/errors.py:2884

6536

#: bzrlib/errors.py:2903

6360

6537

msgid "Variable {%(name)s} is not available."

6361

6538

msgstr ""

6362

6539

6363

#: bzrlib/errors.py:2892

6540

#: bzrlib/errors.py:2911

6364

6541

msgid "No template specified."

6365

6542

msgstr ""

6366

6543

6367

#: bzrlib/errors.py:2897

6544

#: bzrlib/errors.py:2916

6368

6545

msgid "Unable to create symlink %(path_str)son this platform"

6369

6546

msgstr ""

6370

6547

6371

#: bzrlib/errors.py:2912

6548

#: bzrlib/errors.py:2931

6372

6549

msgid ""

6373

6550

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "

6374

6551

"\"original\", \"local\"."

6375

6552

msgstr ""

6376

6553

6377

#: bzrlib/errors.py:2946

6554

#: bzrlib/errors.py:2965

6378

6555

msgid ""

6379

6556

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

6380

6557

msgstr ""

6381

6558

6382

#: bzrlib/errors.py:2958

6559

#: bzrlib/errors.py:2977

6383

6560

msgid "The \"%(config_id)s\" configuration does not exist."

6384

6561

msgstr ""

6385

6562

6386

#: bzrlib/errors.py:2966

6563

#: bzrlib/errors.py:2985

6387

6564

msgid "The \"%(option_name)s\" configuration option does not exist."

6388

6565

msgstr ""

6389

6566

6390

#: bzrlib/errors.py:2974

6567

#: bzrlib/errors.py:2993

6391

6568

msgid "The alias \"%(alias_name)s\" does not exist."

6392

6569

msgstr ""

6393

6570

6394

#: bzrlib/errors.py:2988

6571

#: bzrlib/errors.py:3007

6395

6572

msgid "\"%(alias_name)s\" is not a valid location alias."

6396

6573

msgstr ""

6397

6574

6398

#: bzrlib/errors.py:2996

6575

#: bzrlib/errors.py:3015

6399

6576

msgid "No %(alias_name)s location assigned."

6400

6577

msgstr ""

6401

6578

6402

#: bzrlib/errors.py:3004

6579

#: bzrlib/errors.py:3023

6403

6580

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

6404

6581

msgstr ""

6405

6582

6406

#: bzrlib/errors.py:3014

6583

#: bzrlib/errors.py:3033

6407

6584

msgid "Unknown rules detected: %(unknowns_str)s."

6408

6585

msgstr ""

6409

6586

6410

#: bzrlib/errors.py:3025

6587

#: bzrlib/errors.py:3044

6411

6588

msgid "Tip change rejected: %(msg)s"

6412

6589

msgstr ""

6413

6590

6414

#: bzrlib/errors.py:3033

6591

#: bzrlib/errors.py:3052

6415

6592

msgid "Shelf corrupt."

6416

6593

msgstr ""

6417

6594

6418

#: bzrlib/errors.py:3038

6595

#: bzrlib/errors.py:3057

6419

6596

msgid "Corruption while decompressing repository file%(orig_error)s"

6420

6597

msgstr ""

6421

6598

6422

#: bzrlib/errors.py:3050

6599

#: bzrlib/errors.py:3069

6423

6600

msgid "No changes are shelved with id \"%(shelf_id)d\"."

6424

6601

msgstr ""

6425

6602

6426

#: bzrlib/errors.py:3058

6603

#: bzrlib/errors.py:3077

6427

6604

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6428

6605

msgstr ""

6429

6606

6430

#: bzrlib/errors.py:3066

6607

#: bzrlib/errors.py:3085

6431

6608

msgid ""

6432

6609

"An attempt to access a url outside the server jail was made: '%(url)s'."

6433

6610

msgstr ""

6434

6611

6435

#: bzrlib/errors.py:3074

6612

#: bzrlib/errors.py:3093

6436

6613

msgid "The user aborted the operation."

6437

6614

msgstr ""

6438

6615

6439

#: bzrlib/errors.py:3079

6616

#: bzrlib/errors.py:3098

6440

6617

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6441

6618

msgstr ""

6442

6619

6443

#: bzrlib/errors.py:3089

6620

#: bzrlib/errors.py:3108

6444

6621

msgid "No such view: %(view_name)s."

6445

6622

msgstr ""

6446

6623

6447

#: bzrlib/errors.py:3099

6624

#: bzrlib/errors.py:3118

6448

6625

msgid ""

6449

6626

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6450

6627

"to a later format."

6451

6628

msgstr ""

6452

6629

6453

#: bzrlib/errors.py:3108

6630

#: bzrlib/errors.py:3127

6454

6631

msgid ""

6455

6632

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6456

6633

msgstr ""

6457

6634

6458

#: bzrlib/errors.py:3175

6635

#: bzrlib/errors.py:3194

6459

6636

msgid "%(bzrdir)r does not support co-located branches."

6460

6637

msgstr ""

6461

6638

6462

#: bzrlib/errors.py:3181

6639

#: bzrlib/errors.py:3200

6463

6640

msgid ""

6464

6641

"Unable to determine your name.\n"

6465

6642

"Please, set your name with the 'whoami' command.\n"

6466

6643

"E.g. bzr whoami \"Your Name <name@example.com>\""

6467

6644

msgstr ""

6468

6645

6469

#: bzrlib/errors.py:3190

6646

#: bzrlib/errors.py:3209

6470

6647

msgid "Invalid pattern(s) found. %(msg)s"

6471

6648

msgstr ""

6472

6649

6473

#: bzrlib/errors.py:3198

6650

#: bzrlib/errors.py:3217

6474

6651

msgid ""

6475

6652

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6476

6653

"unbind` to fix."

6477

6654

msgstr ""

6478

6655

6479

#: bzrlib/errors.py:3209

6656

#: bzrlib/errors.py:3228

6480

6657

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6481

6658

msgstr ""

6482

6659

6483

#: bzrlib/errors.py:3218

6660

#: bzrlib/errors.py:3237

6484

6661

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6485

6662

msgstr ""

6486

6663

6487

#: bzrlib/errors.py:3227

6664

#: bzrlib/errors.py:3246

6488

6665

msgid ""

6489

6666

"No compatible object available for operations from %(source)r to %(target)r."

6490

6667

msgstr ""

6491

6668

6492

#: bzrlib/errors.py:3237

6669

#: bzrlib/errors.py:3256

6493

6670

msgid ""

6494

6671

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6495

6672

"%(arguments)s."

6496

6673

msgstr ""

6497

6674

6498

#: bzrlib/errors.py:3247

6675

#: bzrlib/errors.py:3266

6499

6676

msgid ""

6500

6677

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6501

6678

"format %(format)r"

6502

6679

msgstr ""

6503

6680

6504

#: bzrlib/errors.py:3259

6681

#: bzrlib/errors.py:3278

6505

6682

msgid ""

6506

6683

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6507

6684

"plugin."

6508

6685

msgstr ""

6509

6686

6510

#: bzrlib/errors.py:3272

6687

#: bzrlib/errors.py:3291

6511

6688

msgid "Binary files section encountered."

6512

6689

msgstr ""

6513

6690

6514

#: bzrlib/errors.py:3280

6691

#: bzrlib/errors.py:3299

6515

6692

msgid ""

6516

6693

"Malformed patch header. %(desc)s\n"

6517

6694

"%(line)r"

6518

6695

msgstr ""

6519

6696

6520

#: bzrlib/errors.py:3289

6697

#: bzrlib/errors.py:3308

6521

6698

msgid ""

6522

6699

"Malformed hunk header. %(desc)s\n"

6523

6700

"%(line)r"

6524

6701

msgstr ""

6525

6702

6526

#: bzrlib/errors.py:3298

6703

#: bzrlib/errors.py:3317

6527

6704

msgid ""

6528

6705

"Malformed line. %(desc)s\n"

6529

6706

"%(line)r"

6530

6707

msgstr ""

6531

6708

6532

#: bzrlib/errors.py:3308

6709

#: bzrlib/errors.py:3327

6533

6710

msgid ""

6534

6711

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6535

6712

"but patch says it should be \"%(patch_line)s\""

6536

6713

msgstr ""

6537

6714

6538

#: bzrlib/errors.py:3319

6715

#: bzrlib/errors.py:3338

6539

6716

msgid "The feature %(feature)s has already been registered."

6540

6717

msgstr ""

6541

6718

6865

7042

msgid "lstat/stat of ({0!r}): {1!r}"

6866

7043

msgstr ""

6867

7044

6868

#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008

7045

#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019

6869

7046

#, python-format

6870

7047

msgid "sorry, %r not allowed in path"

6871

7048

msgstr ""

6872

7049

6873

#: bzrlib/osutils.py:1226

7050

#: bzrlib/osutils.py:1237

6874

7051

#, python-format

6875

7052

msgid "%r is too short to calculate a relative path"

6876

7053

msgstr ""

7314

7491

msgid "Created new branch."

7315

7492

msgstr ""

7316

7493

7317

#: bzrlib/push.py:98

7494

#: bzrlib/push.py:97

7318

7495

#, python-format

7319

7496

msgid ""

7320

7497

"Target directory %s already contains a .bzr directory, but it is not valid."

7441

7618

msgid "%s is now not stacked\n"

7442

7619

msgstr ""

7443

7620

7444

#: bzrlib/remote.py:1180 bzrlib/repository.py:289

7621

#: bzrlib/remote.py:1228 bzrlib/repository.py:289

7445

7622

#, python-format

7446

7623

msgid "bzr: ERROR (ignored): %s"

7447

7624

msgstr ""

7448

7625

7449

#: bzrlib/remote.py:2493

7626

#: bzrlib/remote.py:2541

7450

7627

msgid "Copying repository content as tarball..."

7451

7628

msgstr ""

7452

7629

7661

7838

msgid "listening on port: %s"

7662

7839

msgstr ""

7663

7840

7664

#: bzrlib/switch.py:69

7841

#: bzrlib/switch.py:73

7665

7842

msgid "Pending merges must be committed or reverted before using switch."

7666

7843

msgstr ""

7667

7844

7668

#: bzrlib/switch.py:96

7845

#: bzrlib/switch.py:100

7669

7846

msgid ""

7670

7847

"Cannot switch as local commits found in the checkout. Commit these to the "

7671

7848

"bound branch or use --force to throw them away."

7672

7849

msgstr ""

7673

7850

7674

#: bzrlib/switch.py:101

7851

#: bzrlib/switch.py:105

7675

7852

#, python-format

7676

7853

msgid ""

7677

7854

"Unable to connect to current master branch %(target)s: %(error)s To switch "

7678

7855

"anyway, use --force."

7679

7856

msgstr ""

7680

7857

7681

#: bzrlib/switch.py:110

7858

#: bzrlib/switch.py:125

7682

7859

msgid "Cannot switch a branch, only a checkout."

7683

7860

msgstr ""

7684

7861

7685

#: bzrlib/switch.py:146

7862

#: bzrlib/switch.py:163

7686

7863

#, python-format

7687

7864

msgid "Tree is up to date at revision %d."

7688

7865

msgstr ""

7689

7866

7690

#: bzrlib/switch.py:152

7867

#: bzrlib/switch.py:169

7691

7868

#, python-format

7692

7869

msgid "Updated to revision %d."

7693

7870

msgstr ""

7694

7871

7695

#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743

7872

#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747

7696

7873

msgid "Apply phase"

7697

7874

msgstr ""

7698

7875

7699

#: bzrlib/transform.py:1769 bzrlib/transform.py:1837

7876

#: bzrlib/transform.py:1773 bzrlib/transform.py:1841

7700

7877

msgid "removing file"

7701

7878

msgstr ""

7702

7879

7703

#: bzrlib/transform.py:1787 bzrlib/transform.py:1872

7880

#: bzrlib/transform.py:1791 bzrlib/transform.py:1876

7704

7881

msgid "adding file"

7705

7882

msgstr ""

7706

7883

7707

#: bzrlib/transform.py:2587

7884

#: bzrlib/transform.py:2591

7708

7885

msgid "Building tree"

7709

7886

msgstr ""

7710

7887

7711

#: bzrlib/transform.py:2677 bzrlib/transform.py:2704

7888

#: bzrlib/transform.py:2681 bzrlib/transform.py:2708

7712

7889

msgid "Adding file contents"

7713

7890

msgstr ""

7714

7891

7715

#: bzrlib/transform.py:3024

7892

#: bzrlib/transform.py:3028

7716

7893

msgid "Resolution pass"

7717

7894

msgstr ""

7718

7895

7861

8038

7862

8039

#: dummy/help_topics/basic/detail.txt:1

7863

8040

msgid ""

7864

"Bazaar 2.5b5 -- a free distributed version-control tool\n"

8041

"Bazaar 2.5b6 -- a free distributed version-control tool\n"

7865

8042

"http://bazaar.canonical.com/"

7866

8043

msgstr ""

7867

8044

12130

12307

"~~~~~~~~~~~~~~~~~~~~~~"

12131

12308

msgstr ""

12132

12309

12133

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402

12310

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418

12134

12311

msgid "Introduced in: 1.4"

12135

12312

msgstr ""

12136

12313

12322

12499

msgstr ""

12323

12500

12324

12501

#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196

12325

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448

12502

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464

12326

12503

msgid "Introduced in: 1.17"

12327

12504

msgstr ""

12328

12505

12378

12555

#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226

12379

12556

#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241

12380

12557

#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370

12381

#: en/help_topics/hooks.txt:427

12558

#: en/help_topics/hooks.txt:443

12382

12559

msgid "Introduced in: 2.4"

12383

12560

msgstr ""

12384

12561

12479

12656

msgstr ""

12480

12657

12481

12658

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12482

#: en/help_topics/hooks.txt:505

12659

#: en/help_topics/hooks.txt:521

12483

12660

msgid "Introduced in: 1.15"

12484

12661

msgstr ""

12485

12662

12561

12738

msgstr ""

12562

12739

12563

12740

#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334

12564

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493

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

12565

12743

msgid "Introduced in: 2.5"

12566

12744

msgstr ""

12567

12745

12680

12858

12681

12859

#: en/help_topics/hooks.txt:399

12682

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 ""

12683

12885

"start_commit\n"

12684

12886

"~~~~~~~~~~~~"

12685

12887

msgstr ""

12686

12888

12687

#: en/help_topics/hooks.txt:404

12889

#: en/help_topics/hooks.txt:420

12688

12890

msgid ""

12689

12891

"Called before a commit is performed on a tree. The start commit hook\n"

12690

12892

"is able to change the tree before the commit takes place. start_commit\n"

12692

12894

"being performed on."

12693

12895

msgstr ""

12694

12896

12695

#: en/help_topics/hooks.txt:409

12897

#: en/help_topics/hooks.txt:425

12696

12898

msgid ""

12697

12899

"SmartClientHooks\n"

12698

12900

"----------------"

12699

12901

msgstr ""

12700

12902

12701

#: en/help_topics/hooks.txt:412

12903

#: en/help_topics/hooks.txt:428

12702

12904

msgid ""

12703

12905

"call\n"

12704

12906

"~~~~"

12705

12907

msgstr ""

12706

12908

12707

#: en/help_topics/hooks.txt:415

12909

#: en/help_topics/hooks.txt:431

12708

12910

msgid "Introduced in: unknown"

12709

12911

msgstr ""

12710

12912

12711

#: en/help_topics/hooks.txt:417

12913

#: en/help_topics/hooks.txt:433

12712

12914

msgid ""

12713

12915

"Called when the smart client is submitting a request to the smart\n"

12714

12916

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12715

12917

"Streaming request bodies, and responses, are not accessible."

12716

12918

msgstr ""

12717

12919

12718

#: en/help_topics/hooks.txt:421

12920

#: en/help_topics/hooks.txt:437

12719

12921

msgid ""

12720

12922

"SmartServerHooks\n"

12721

12923

"----------------"

12722

12924

msgstr ""

12723

12925

12724

#: en/help_topics/hooks.txt:424

12926

#: en/help_topics/hooks.txt:440

12725

12927

msgid ""

12726

12928

"server_exception\n"

12727

12929

"~~~~~~~~~~~~~~~~"

12728

12930

msgstr ""

12729

12931

12730

#: en/help_topics/hooks.txt:429

12932

#: en/help_topics/hooks.txt:445

12731

12933

msgid ""

12732

12934

"Called by the bzr server when an exception occurs. server_exception is\n"

12733

12935

"called with the sys.exc_info() tuple return true for the hook if the\n"

12735

12937

"normally."

12736

12938

msgstr ""

12737

12939

12738

#: en/help_topics/hooks.txt:434

12940

#: en/help_topics/hooks.txt:450

12739

12941

msgid ""

12740

12942

"server_started\n"

12741

12943

"~~~~~~~~~~~~~~"

12742

12944

msgstr ""

12743

12945

12744

#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456

12946

#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472

12745

12947

msgid "Introduced in: 0.16"

12746

12948

msgstr ""

12747

12949

12748

#: en/help_topics/hooks.txt:439

12950

#: en/help_topics/hooks.txt:455

12749

12951

msgid ""

12750

12952

"Called by the bzr server when it starts serving a directory.\n"

12751

12953

"server_started is called with (backing urls, public url), where\n"

12754

12956

"served."

12755

12957

msgstr ""

12756

12958

12757

#: en/help_topics/hooks.txt:445

12959

#: en/help_topics/hooks.txt:461

12758

12960

msgid ""

12759

12961

"server_started_ex\n"

12760

12962

"~~~~~~~~~~~~~~~~~"

12761

12963

msgstr ""

12762

12964

12763

#: en/help_topics/hooks.txt:450

12965

#: en/help_topics/hooks.txt:466

12764

12966

msgid ""

12765

12967

"Called by the bzr server when it starts serving a directory.\n"

12766

12968

"server_started is called with (backing_urls, server_obj)."

12767

12969

msgstr ""

12768

12970

12769

#: en/help_topics/hooks.txt:453

12971

#: en/help_topics/hooks.txt:469

12770

12972

msgid ""

12771

12973

"server_stopped\n"

12772

12974

"~~~~~~~~~~~~~~"

12773

12975

msgstr ""

12774

12976

12775

#: en/help_topics/hooks.txt:458

12977

#: en/help_topics/hooks.txt:474

12776

12978

msgid ""

12777

12979

"Called by the bzr server when it stops serving a directory.\n"

12778

12980

"server_stopped is called with the same parameters as the\n"

12779

12981

"server_started hook: (backing_urls, public_url)."

12780

12982

msgstr ""

12781

12983

12782

#: en/help_topics/hooks.txt:462

12984

#: en/help_topics/hooks.txt:478

12783

12985

msgid ""

12784

12986

"StatusHooks\n"

12785

12987

"-----------"

12786

12988

msgstr ""

12787

12989

12788

#: en/help_topics/hooks.txt:465

12990

#: en/help_topics/hooks.txt:481

12789

12991

msgid ""

12790

12992

"post_status\n"

12791

12993

"~~~~~~~~~~~"

12792

12994

msgstr ""

12793

12995

12794

#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479

12996

#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495

12795

12997

msgid "Introduced in: 2.3"

12796

12998

msgstr ""

12797

12999

12798

#: en/help_topics/hooks.txt:470

13000

#: en/help_topics/hooks.txt:486

12799

13001

msgid ""

12800

13002

"Called with argument StatusHookParams after Bazaar has displayed the\n"

12801

13003

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12804

13006

"status command. to_file is the output stream for writing."

12805

13007

msgstr ""

12806

13008

12807

#: en/help_topics/hooks.txt:476

13009

#: en/help_topics/hooks.txt:492

12808

13010

msgid ""

12809

13011

"pre_status\n"

12810

13012

"~~~~~~~~~~"

12811

13013

msgstr ""

12812

13014

12813

#: en/help_topics/hooks.txt:481

13015

#: en/help_topics/hooks.txt:497

12814

13016

msgid ""

12815

13017

"Called with argument StatusHookParams before Bazaar displays the\n"

12816

13018

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

12819

13021

"status command. to_file is the output stream for writing."

12820

13022

msgstr ""

12821

13023

12822

#: en/help_topics/hooks.txt:487

13024

#: en/help_topics/hooks.txt:503

12823

13025

msgid ""

12824

13026

"TransportHooks\n"

12825

13027

"--------------"

12826

13028

msgstr ""

12827

13029

12828

#: en/help_topics/hooks.txt:490

13030

#: en/help_topics/hooks.txt:506

12829

13031

msgid ""

12830

13032

"post_connect\n"

12831

13033

"~~~~~~~~~~~~"

12832

13034

msgstr ""

12833

13035

12834

#: en/help_topics/hooks.txt:495

13036

#: en/help_topics/hooks.txt:511

12835

13037

msgid ""

12836

13038

"Called after a new connection is established or a reconnect occurs.\n"

12837

13039

"The sole argument passed is either the connected transport or smart\n"

12838

13040

"medium instance."

12839

13041

msgstr ""

12840

13042

12841

#: en/help_topics/hooks.txt:499

13043

#: en/help_topics/hooks.txt:515

12842

13044

msgid ""

12843

13045

"RioVersionInfoBuilderHooks\n"

12844

13046

"--------------------------"

12845

13047

msgstr ""

12846

13048

12847

#: en/help_topics/hooks.txt:502

13049

#: en/help_topics/hooks.txt:518

12848

13050

msgid ""

12849

13051

"revision\n"

12850

13052

"~~~~~~~~"

12851

13053

msgstr ""

12852

13054

12853

#: en/help_topics/hooks.txt:507

13055

#: en/help_topics/hooks.txt:523

12854

13056

msgid ""

12855

13057

"Invoked when adding information about a revision to the RIO stanza\n"

12856

13058

"that is printed. revision is called with a revision object and a RIO\n"

13622

13824

"Many commands that accept URLs also accept location aliases too.\n"

13623

13825

"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"

13624

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

#~ "なります。"