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

1

# Japanese translation for bzr

2

3

# This file is distributed under the same license as the bzr package.

4

# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.

4

# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.

5

#

6

msgid ""

7

msgstr ""

8

"Project-Id-Version: bzr\n"

9

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

10

"POT-Creation-Date: 2012-02-02 17:39+0100\n"

11

"PO-Revision-Date: 2012-01-16 16:40+0000\n"

12

"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

10

"POT-Creation-Date: 2012-03-15 10:20+0100\n"

11

"PO-Revision-Date: 2012-01-26 15:16+0000\n"

12

"Last-Translator: IWATA Hidetaka <Unknown>\n"

13

"Language-Team: Japanese <ja@li.org>\n"

14

"MIME-Version: 1.0\n"

15

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

16

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

17

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

18

"X-Launchpad-Export-Date: 2012-02-04 06:20+0000\n"

19

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

18

"X-Launchpad-Export-Date: 2012-03-16 04:32+0000\n"

19

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

20

21

#: bzrlib/add.py:95

21

#: bzrlib/add.py:93

22

msgid "skipping {0} (larger than {1} of {2} bytes)"

23

msgstr "{0} をスキップ ({1} の {2} byte より大きいため)"

24

25

#: bzrlib/branch.py:872

25

#: bzrlib/branch.py:854

26

msgid "Unstacking"

27

msgstr "スタックの解除"

28

29

#: bzrlib/branch.py:3205

29

#: bzrlib/branch.py:3121

30

#, python-format

31

msgid "Pushed up to revision %d."

32

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

33

34

#: bzrlib/branch.py:3207

34

#: bzrlib/branch.py:3123

35

#, python-format

36

msgid "%d tag updated."

37

msgid_plural "%d tags updated."

38

msgstr[0] "%d 個のタグを更新しました"

39

40

#: bzrlib/branch.py:3210

40

#: bzrlib/branch.py:3126

41

msgid "No new revisions or tags to push."

42

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

43

44

#: bzrlib/branch.py:3212

44

#: bzrlib/branch.py:3128

45

msgid "No new revisions to push."

46

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

47

48

#: bzrlib/branch.py:3232

48

#: bzrlib/branch.py:3148

49

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

50

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

51

52

#: bzrlib/branch.py:3235

52

#: bzrlib/branch.py:3151

53

#, python-format

54

msgid "found error:%s"

55

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

56

57

#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315

57

#: bzrlib/builtins.py:251 bzrlib/builtins.py:3026 bzrlib/workingtree.py:323

58

#, python-format

59

msgid "Ignoring files outside view. View is %s"

60

msgstr "ビューに含まれないファイルは無視します。ビュー：%s"

61

62

#: bzrlib/builtins.py:218

62

#: bzrlib/builtins.py:260

63

#, python-format

64

msgid "bzr %s --revision takes exactly one revision identifier"

65

msgstr "bzr %s --revision には、リビジョンＩＤを一つだけ指定します。"

66

67

#: bzrlib/builtins.py:303

67

#: bzrlib/builtins.py:315

68

msgid "Display status summary."

69

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

70

71

#: bzrlib/builtins.py:305

71

#: bzrlib/builtins.py:317

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

80

#: bzrlib/builtins.py:320

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

89

#: bzrlib/builtins.py:323

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

98

#: bzrlib/builtins.py:327

99

msgid ""

100

"renamed\n"

101

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

107

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

108

" 含む。"

109

110

#: bzrlib/builtins.py:320

110

#: bzrlib/builtins.py:332

111

msgid ""

112

"modified\n"

113

" Text has changed since the previous revision."

115

"modified\n"

116

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

117

118

#: bzrlib/builtins.py:323

118

#: bzrlib/builtins.py:335

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

126

#: bzrlib/builtins.py:338

127

msgid ""

128

"unknown\n"

129

" Not versioned and not matching an ignore pattern."

131

"unknown\n"

132

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

133

134

#: bzrlib/builtins.py:329

134

#: bzrlib/builtins.py:341

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

145

#: bzrlib/builtins.py:346

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

153

#: bzrlib/builtins.py:349

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

164

#: bzrlib/builtins.py:353

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

176

#: bzrlib/builtins.py:358

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

188

#: bzrlib/builtins.py:363

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

196

#: bzrlib/builtins.py:366

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

206

#: bzrlib/builtins.py:375

207

msgid "Use short status indicators."

208

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

209

210

#: bzrlib/builtins.py:365

210

#: bzrlib/builtins.py:377

211

msgid "Only show versioned files."

212

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

213

214

#: bzrlib/builtins.py:367

214

#: bzrlib/builtins.py:379

215

msgid "Don't show pending merges."

216

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

217

218

#: bzrlib/builtins.py:370

218

#: bzrlib/builtins.py:382

219

msgid "Do not mark object type using indicator."

220

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

221

222

#: bzrlib/builtins.py:385

222

#: bzrlib/builtins.py:397

223

msgid "bzr status --revision takes exactly one or two revision specifiers"

224

msgstr "bzr status --revisionには、１つか２つのリビジョンを指定します。"

225

226

#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183

226

#: bzrlib/builtins.py:441 bzrlib/builtins.py:5197

227

msgid "You can only supply one of revision_id or --revision"

228

msgstr "リビジョンＩＤと--revisionのどちらか一つだけを指定してください。"

229

230

#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185

230

#: bzrlib/builtins.py:444 bzrlib/builtins.py:5199

231

msgid "You must supply either --revision or a revision_id"

232

msgstr "--revisionとリビジョンＩＤのどちらかを指定してください。"

233

234

#: bzrlib/builtins.py:439

234

#: bzrlib/builtins.py:451

235

#, python-format

236

msgid "Repository %r does not support access to raw revision texts"

237

msgstr "リポジトリ %r はリビジョンのtextへの直接アクセスをサポートしていません"

238

239

#: bzrlib/builtins.py:450

239

#: bzrlib/builtins.py:462

240

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

241

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

242

243

#: bzrlib/builtins.py:457

243

#: bzrlib/builtins.py:469

244

msgid "You cannot specify a NULL revision."

245

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

246

247

#: bzrlib/builtins.py:549

247

#: bzrlib/builtins.py:561

248

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

249

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

250

251

#: bzrlib/builtins.py:551

251

#: bzrlib/builtins.py:563

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

259

#: bzrlib/builtins.py:566

260

msgid "To re-create the working tree, use \"bzr checkout\"."

261

msgstr "作業ツリーを再作成するには、 \"bzr checkout\" をしてください。"

262

263

#: bzrlib/builtins.py:560

263

#: bzrlib/builtins.py:572

264

msgid ""

265

"Remove the working tree even if it has uncommitted or shelved changes."

266

msgstr "作業ツリーが変更されていたり、シェルフされた変更があっても、作業ツリーを削除します。"

267

268

#: bzrlib/builtins.py:574

268

#: bzrlib/builtins.py:586

269

msgid "No working tree to remove"

270

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

271

272

#: bzrlib/builtins.py:576

272

#: bzrlib/builtins.py:588

273

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

274

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

275

276

#: bzrlib/builtins.py:585

276

#: bzrlib/builtins.py:597

277

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

278

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

279

280

#: bzrlib/builtins.py:625

280

#: bzrlib/builtins.py:637

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

288

#: bzrlib/builtins.py:648

289

msgid ""

290

", the header appears corrupt, try passing -r -1 to set the state to the last "

291

"commit"

292

msgstr ", ヘッダーが壊れているようです。-r -1を指定して最終コミット時点の状態に戻してください。"

293

294

#: bzrlib/builtins.py:640

294

#: bzrlib/builtins.py:652

295

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

296

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

297

298

#: bzrlib/builtins.py:644

298

#: bzrlib/builtins.py:656

299

msgid "Show current revision number."

300

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

301

302

#: bzrlib/builtins.py:646

302

#: bzrlib/builtins.py:658

303

msgid "This is equal to the number of revisions on this branch."

304

msgstr "これは、ブランチ内のリビジョンの数と同じです。"

305

306

#: bzrlib/builtins.py:659

306

#: bzrlib/builtins.py:671

307

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

308

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

309

310

#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967

310

#: bzrlib/builtins.py:688 bzrlib/builtins.py:5953

311

msgid "Tags can only be placed on a single revision, not on a range"

312

msgstr "タグは1つのリビジョンにしか指定できません"

313

314

#: bzrlib/builtins.py:700

314

#: bzrlib/builtins.py:712

315

msgid "Show revno of working tree."

316

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

317

318

#: bzrlib/builtins.py:748

318

#: bzrlib/builtins.py:760

319

msgid "Add specified files or directories."

320

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

321

322

#: bzrlib/builtins.py:750

322

#: bzrlib/builtins.py:762

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

332

#: bzrlib/builtins.py:766

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

350

#: bzrlib/builtins.py:774

351

msgid ""

352

"A warning will be printed when nested trees are encountered,\n"

353

"unless they are explicitly ignored."

354

msgstr "ネストしたツリーがあった場合、明示的に無視しない限り警告を表示します。"

355

356

#: bzrlib/builtins.py:765

356

#: bzrlib/builtins.py:777

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

364

#: bzrlib/builtins.py:780

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

376

#: bzrlib/builtins.py:785

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

384

#: bzrlib/builtins.py:788

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

401

#: bzrlib/builtins.py:796

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

409

#: bzrlib/builtins.py:799

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

419

#: bzrlib/builtins.py:806

420

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

421

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

422

423

#: bzrlib/builtins.py:800

423

#: bzrlib/builtins.py:813

424

msgid "Lookup file ids from this tree."

425

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

426

427

#: bzrlib/builtins.py:836

427

#: bzrlib/builtins.py:849

428

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

429

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

430

431

#: bzrlib/builtins.py:841

431

#: bzrlib/builtins.py:854

432

msgid "Create a new versioned directory."

433

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

434

435

#: bzrlib/builtins.py:843

435

#: bzrlib/builtins.py:856

436

msgid "This is equivalent to creating the directory and then adding it."

437

msgstr "ディレクトリを作成して、バージョン管理に追加することと同じです。"

438

439

#: bzrlib/builtins.py:850

439

#: bzrlib/builtins.py:863

440

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

441

msgstr ""

442

443

#: bzrlib/builtins.py:884

443

#: bzrlib/builtins.py:897

444

#, python-format

445

msgid "added %s\n"

446

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

447

448

#: bzrlib/builtins.py:926

448

#: bzrlib/builtins.py:939

449

#, python-format

450

msgid "invalid kind %r specified"

451

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

452

453

#: bzrlib/builtins.py:963

453

#: bzrlib/builtins.py:976

454

msgid "Move or rename a file."

455

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

456

457

#: bzrlib/builtins.py:965

457

#: bzrlib/builtins.py:978

458

msgid " bzr mv SOURCE... DESTINATION"

459

msgstr " bzr mv SOURCE... DESTINATION"

460

461

#: bzrlib/builtins.py:967

461

#: bzrlib/builtins.py:980

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

471

#: bzrlib/builtins.py:984

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

485

#: bzrlib/builtins.py:990

486

msgid "Files cannot be moved between branches."

487

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

488

489

#: bzrlib/builtins.py:984

489

#: bzrlib/builtins.py:997

490

msgid ""

491

"Move only the bzr identifier of the file, because the file has already been "

492

"moved."

493

msgstr "ファイルは既に移動済みのため、ファイルのBazaar IDだけを移動します。"

494

495

#: bzrlib/builtins.py:986

495

#: bzrlib/builtins.py:999

496

msgid "Automatically guess renames."

497

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

498

499

#: bzrlib/builtins.py:987

499

#: bzrlib/builtins.py:1000

500

msgid "Avoid making changes when guessing renames."

501

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

502

503

#: bzrlib/builtins.py:996

503

#: bzrlib/builtins.py:1009

504

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

505

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

506

507

#: bzrlib/builtins.py:1000

507

#: bzrlib/builtins.py:1013

508

msgid "missing file argument"

509

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

510

511

#: bzrlib/builtins.py:1004

511

#: bzrlib/builtins.py:1017

512

msgid "can not move root of branch"

513

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

514

515

#: bzrlib/builtins.py:1010

515

#: bzrlib/builtins.py:1023

516

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

517

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

518

519

#: bzrlib/builtins.py:1013

519

#: bzrlib/builtins.py:1026

520

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

521

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

522

523

#: bzrlib/builtins.py:1050

523

#: bzrlib/builtins.py:1062

524

msgid "to mv multiple files the destination must be a versioned directory"

525

msgstr "複数のファイルを移動する時は、移動先はバージョン管理されていなければなりません。"

526

527

#: bzrlib/builtins.py:1102

527

#: bzrlib/builtins.py:1114

528

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

529

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

530

531

#: bzrlib/builtins.py:1104

531

#: bzrlib/builtins.py:1116

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

542

#: bzrlib/builtins.py:1121

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

552

#: bzrlib/builtins.py:1125

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

562

#: bzrlib/builtins.py:1129

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

575

#: bzrlib/builtins.py:1134

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

585

#: bzrlib/builtins.py:1138

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

594

#: bzrlib/builtins.py:1146

595

msgid "Show logs of pulled revisions."

596

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

597

598

#: bzrlib/builtins.py:1136

598

#: bzrlib/builtins.py:1148

599

msgid ""

600

"Branch to pull into, rather than the one containing the working directory."

601

msgstr "作業フォルダの代わりにpullを受け入れるブランチ"

602

603

#: bzrlib/builtins.py:1139

603

#: bzrlib/builtins.py:1151

604

msgid ""

605

"Perform a local pull in a bound branch. Local pulls are not applied to the "

606

"master branch."

607

msgstr "バインドブランチに対してpullする場合に、マスターブランチには反映しないようにします。"

608

609

#: bzrlib/builtins.py:1168

609

#: bzrlib/builtins.py:1180

610

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

611

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

612

613

#: bzrlib/builtins.py:1184

613

#: bzrlib/builtins.py:1196

614

msgid "No pull location known or specified."

615

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

616

617

#: bzrlib/builtins.py:1190

617

#: bzrlib/builtins.py:1202

618

#, python-format

619

msgid "Using saved parent location: %s\n"

620

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

621

622

#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393

622

#: bzrlib/builtins.py:1209 bzrlib/builtins.py:4406

623

msgid "Cannot use -r with merge directives or bundles"

624

msgstr "マージディレクティブやバンドルに対して-rを使用することはできません。"

625

626

#: bzrlib/builtins.py:1238

626

#: bzrlib/builtins.py:1252

627

msgid "Update a mirror of this branch."

628

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

629

630

#: bzrlib/builtins.py:1240

630

#: bzrlib/builtins.py:1254

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

638

#: bzrlib/builtins.py:1257

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

646

#: bzrlib/builtins.py:1260

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

656

#: bzrlib/builtins.py:1264

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

664

#: bzrlib/builtins.py:1267

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

674

#: bzrlib/builtins.py:1271

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

687

#: bzrlib/builtins.py:1276

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:1273 bzrlib/foreign.py:272

697

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

698

msgid ""

699

"Branch to push from, rather than the one containing the working directory."

700

msgstr "カレントディレクトリの代わりにpush元とするブランチを指定します。"

701

702

#: bzrlib/builtins.py:1276

702

#: bzrlib/builtins.py:1290

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

710

#: bzrlib/builtins.py:1295

711

msgid ""

712

"Create a stacked branch that references the public location of the parent "

713

"branch."

714

msgstr "親ブランチの公開された場所を参照するスタックドブランチを作成します。"

715

716

#: bzrlib/builtins.py:1284

716

#: bzrlib/builtins.py:1298

717

msgid ""

718

"Create a stacked branch that refers to another branch for the commit "

719

"history. Only the work not present in the referenced branch is included in "

720

"the branch created."

721

msgstr "コミットの履歴を別のブランチから参照するスタックドブランチを作成します。参照先のブランチにない変更だけがこのブランチに含まれます。"

722

723

#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279

723

#: bzrlib/builtins.py:1303 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:1292

731

#: bzrlib/builtins.py:1306

732

msgid "Don't populate the working tree, even for protocols that support it."

733

msgstr "作業コピーを更新できるプロトコルを使っている場合でも、更新しません。"

734

735

#: bzrlib/builtins.py:1336

735

#: bzrlib/builtins.py:1350

736

msgid "Could not determine branch to refer to."

737

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

738

739

#: bzrlib/builtins.py:1345

739

#: bzrlib/builtins.py:1359

740

#, python-format

741

msgid ""

742

"No push location known or specified. To push to the parent branch (at %s), "

743

"use 'bzr push :parent'."

744

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

745

746

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

746

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

747

msgid "No push location known or specified."

748

msgstr "push先のブランチが設定も指定もされていません。"

749

750

#: bzrlib/builtins.py:1355

750

#: bzrlib/builtins.py:1369

751

#, python-format

752

msgid "Using saved push location: %s"

753

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

754

755

#: bzrlib/builtins.py:1365

755

#: bzrlib/builtins.py:1379

756

msgid "Create a new branch that is a copy of an existing branch."

757

msgstr "既存のブランチをコピーして新しいブランチを作成します。"

758

759

#: bzrlib/builtins.py:1367

759

#: bzrlib/builtins.py:1381

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

775

#: bzrlib/builtins.py:1388

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

783

#: bzrlib/builtins.py:1391

784

msgid "The synonyms 'clone' and 'get' for this command are deprecated."

785

msgstr "このコマンドの別名である'clone'と'get'は廃止予定です。"

786

787

#: bzrlib/builtins.py:1387

787

#: bzrlib/builtins.py:1401

788

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

789

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

790

791

#: bzrlib/builtins.py:1389

791

#: bzrlib/builtins.py:1403

792

msgid "Switch the checkout in the current directory to the new branch."

793

msgstr "カレントディレクトリにあるチェックアウトの参照先を新しいブランチに切り替えます。"

794

795

#: bzrlib/builtins.py:1392

795

#: bzrlib/builtins.py:1406

796

msgid ""

797

"Create a stacked branch referring to the source branch. The new branch will "

798

"depend on the availability of the source branch for all operations."

799

msgstr "元のブランチを参照するスタックドブランチを作成します。新しいブランチでは、元のブランチにアクセスできるときしか操作できません。"

800

801

#: bzrlib/builtins.py:1396

801

#: bzrlib/builtins.py:1410

802

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

803

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

804

805

#: bzrlib/builtins.py:1398

805

#: bzrlib/builtins.py:1412

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

813

#: bzrlib/builtins.py:1417

814

msgid "Bind new branch to from location."

815

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

816

817

#: bzrlib/builtins.py:1450

817

#: bzrlib/builtins.py:1464

818

#, python-format

819

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

820

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

821

822

#: bzrlib/builtins.py:1462

822

#: bzrlib/builtins.py:1476

823

#, python-format

824

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

825

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

826

827

#: bzrlib/builtins.py:1481

827

#: bzrlib/builtins.py:1495

828

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

829

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

830

831

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

831

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

832

#, python-format

833

msgid "Created new stacked branch referring to %s."

834

msgstr "%s を参照するスタックドブランチを作成しました。"

835

836

#: bzrlib/builtins.py:1500

836

#: bzrlib/builtins.py:1514

837

#, python-format

838

msgid "Branched %d revision."

839

msgid_plural "Branched %d revisions."

840

msgstr[0] "%d個のリビジョンをブランチしました。"

841

842

#: bzrlib/builtins.py:1505

842

#: bzrlib/builtins.py:1519

843

#, python-format

844

msgid "New branch bound to %s"

845

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

846

847

#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256

847

#: bzrlib/builtins.py:1524 bzrlib/builtins.py:6247

848

#, python-format

849

msgid "Switched to branch: %s"

850

msgstr "バインド先をスイッチしました。: %s"

851

852

#: bzrlib/builtins.py:1515

852

#: bzrlib/builtins.py:1529

853

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

854

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

855

856

#: bzrlib/builtins.py:1517

856

#: bzrlib/builtins.py:1531

857

msgid ""

858

"This command will print the names of all the branches at the current\n"

859

"location."

860

msgstr "このコマンドは、現在の場所にある全てのブランチの名前を表示します。"

861

862

#: bzrlib/builtins.py:1524

862

#: bzrlib/builtins.py:1538

863

msgid ""

864

"Recursively scan for branches rather than just looking in the specified "

865

"location."

866

msgstr "指定された場所だけでなく、再帰的にブランチを探します。"

867

868

#: bzrlib/builtins.py:1554

868

#: bzrlib/builtins.py:1567

869

msgid "(default)"

870

msgstr "(デフォルト)"

871

872

#: bzrlib/builtins.py:1566

872

#: bzrlib/builtins.py:1579

873

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

874

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

875

876

#: bzrlib/builtins.py:1568

876

#: bzrlib/builtins.py:1581

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

889

#: bzrlib/builtins.py:1586

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

906

#: bzrlib/builtins.py:1593

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

920

#: bzrlib/builtins.py:1603

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

932

#: bzrlib/builtins.py:1610

933

msgid "Get file contents from this tree."

934

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

935

936

#: bzrlib/builtins.py:1599

936

#: bzrlib/builtins.py:1612

937

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

938

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

939

940

#: bzrlib/builtins.py:1640

940

#: bzrlib/builtins.py:1653

941

msgid ""

942

"Show list of renamed files.\n"

943

" "

945

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

946

" "

947

948

#: bzrlib/builtins.py:1670

948

#: bzrlib/builtins.py:1681

949

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

950

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

951

952

#: bzrlib/builtins.py:1672

952

#: bzrlib/builtins.py:1683

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

961

#: bzrlib/builtins.py:1687

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

969

#: bzrlib/builtins.py:1690

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

981

#: bzrlib/builtins.py:1695

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

989

#: bzrlib/builtins.py:1698

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

1005

#: bzrlib/builtins.py:1705

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

1014

#: bzrlib/builtins.py:1721

1015

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

1016

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

1017

1018

#: bzrlib/builtins.py:1718

1018

#: bzrlib/builtins.py:1729

1019

msgid "bzr update can only update a whole tree, not a file or subdirectory"

1020

msgstr "bzr updateは、個々のファイルやディレクトリではなく、作業ツリー全体を更新します。"

1021

1022

#: bzrlib/builtins.py:1749

1022

#: bzrlib/builtins.py:1760

1023

msgid "Tree is up to date at revision {0} of branch {1}"

1024

msgstr "ツリーはブランチ {1} のリビジョン {0} で最新の状態です。"

1025

1026

#: bzrlib/builtins.py:1765

1026

#: bzrlib/builtins.py:1776

1027

#, python-format

1028

msgid ""

1029

"branch has no revision %s\n"

1032

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

1033

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

1034

1035

#: bzrlib/builtins.py:1771

1035

#: bzrlib/builtins.py:1782

1036

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

1037

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

1038

1039

#: bzrlib/builtins.py:1775

1039

#: bzrlib/builtins.py:1786

1040

msgid ""

1041

"Your local commits will now show as pending merges with 'bzr status', and "

1042

"can be committed with 'bzr commit'."

1043

msgstr "ローカルで行った変更は、'bzr status'ではマージ中状態になっており、'bzr commit'でコミットできます。"

1044

1045

#: bzrlib/builtins.py:1784

1045

#: bzrlib/builtins.py:1795

1046

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

1047

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

1048

1049

#: bzrlib/builtins.py:1786

1049

#: bzrlib/builtins.py:1797

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

1057

#: bzrlib/builtins.py:1800

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

1067

#: bzrlib/builtins.py:1804

1068

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

1069

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

1070

1071

#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845

1072

#: bzrlib/builtins.py:6442

1071

#: bzrlib/builtins.py:1806 bzrlib/builtins.py:3725 bzrlib/builtins.py:4859

1072

#: bzrlib/builtins.py:6433

1073

msgid ":Examples:"

1074

msgstr ":例:"

1075

1076

#: bzrlib/builtins.py:1797

1076

#: bzrlib/builtins.py:1808

1077

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

1078

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

1079

1080

#: bzrlib/builtins.py:1799

1080

#: bzrlib/builtins.py:1810

1081

msgid " bzr info"

1082

msgstr " bzr info"

1083

1084

#: bzrlib/builtins.py:1801

1084

#: bzrlib/builtins.py:1812

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

1093

#: bzrlib/builtins.py:1816

1094

msgid " bzr info -v"

1095

msgstr " bzr info -v"

1096

1097

#: bzrlib/builtins.py:1807

1097

#: bzrlib/builtins.py:1818

1098

msgid " Display the above together with number of committers to the branch:"

1099

msgstr " さらに、このブランチにコミットした人の数も表示します。:"

1100

1101

#: bzrlib/builtins.py:1809

1101

#: bzrlib/builtins.py:1820

1102

msgid " bzr info -vv"

1103

msgstr " bzr info -vv"

1104

1105

#: bzrlib/builtins.py:1828

1105

#: bzrlib/builtins.py:1839

1106

msgid "Remove files or directories."

1107

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

1108

1109

#: bzrlib/builtins.py:1830

1109

#: bzrlib/builtins.py:1841

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

1123

#: bzrlib/builtins.py:1849

1124

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

1125

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

1126

1127

#: bzrlib/builtins.py:1840

1127

#: bzrlib/builtins.py:1851

1128

msgid "The file deletion mode to be used."

1129

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

1130

1131

#: bzrlib/builtins.py:1841

1131

#: bzrlib/builtins.py:1852

1132

msgid "Deletion Strategy"

1133

msgstr "削除モード"

1134

1135

#: bzrlib/builtins.py:1842

1135

#: bzrlib/builtins.py:1853

1136

msgid "Backup changed files (default)."

1137

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

1138

1139

#: bzrlib/builtins.py:1843

1139

#: bzrlib/builtins.py:1854

1140

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

1141

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

1142

1143

#: bzrlib/builtins.py:1844

1143

#: bzrlib/builtins.py:1855

1144

msgid "Don't backup changed files."

1145

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

1146

1147

#: bzrlib/builtins.py:1845

1147

#: bzrlib/builtins.py:1856

1148

msgid ""

1149

"Delete all the specified files, even if they can not be recovered and even "

1150

"if they are non-empty directories. (deprecated, use no-backup)"

1151

msgstr ""

1152

"元に戻せないファイル、空ではないディレクトリも含めて、指定されたアイテムを全て削除します。(廃止予定。no-backupを使用してください)"

1153

1154

#: bzrlib/builtins.py:1854

1154

#: bzrlib/builtins.py:1865

1155

msgid "(The --force option is deprecated, rather use --no-backup in future.)"

1156

msgstr "(--forceオプションは廃止予定です。今後は--no-backupを使用してください)"

1157

1158

#: bzrlib/builtins.py:1871

1158

#: bzrlib/builtins.py:1882

1159

msgid "No matching files."

1160

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

1161

1162

#: bzrlib/builtins.py:1932

1162

#: bzrlib/builtins.py:1943

1163

msgid "Reconcile bzr metadata in a branch."

1164

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

1165

1166

#: bzrlib/builtins.py:1934

1166

#: bzrlib/builtins.py:1945

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

1177

#: bzrlib/builtins.py:1950

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

1188

#: bzrlib/builtins.py:1955

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

1196

#: bzrlib/builtins.py:1958

1197

msgid "The branch *MUST* be on a listable system such as local disk or sftp."

1198

msgstr ""

1199

"ブランチは、ローカルディスクやsftpのような、リスト可能なシステム上に\n"

1200

"ある*必要があります*。"

1201

1202

#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750

1202

#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760

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:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750

1213

#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760

1214

msgid ""

1215

"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "

1216

"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "

1217

msgstr ""

1218

1219

#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750

1219

#: bzrlib/builtins.py:2025 bzrlib/builtins.py:2143 bzrlib/builtins.py:3760

1220

msgid "The 2a format with experimental support for colocated branches.\n"

1221

msgstr "colocated branch を実験的にサポートする 2a フォーマット。\n"

1222

1223

#: bzrlib/builtins.py:2015

1223

#: bzrlib/builtins.py:2026

1224

msgid "Make a directory into a versioned branch."

1225

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

1226

1227

#: bzrlib/builtins.py:2017

1227

#: bzrlib/builtins.py:2028

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

1235

#: bzrlib/builtins.py:2031

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

1246

#: bzrlib/builtins.py:2036

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

1254

#: bzrlib/builtins.py:2039

1255

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

1256

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

1257

1258

#: bzrlib/builtins.py:2030

1259

msgid ""

1260

" cd ~/project\n"

1261

" bzr init\n"

1262

" bzr add .\n"

1263

" bzr status\n"

1264

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

1265

msgstr ""

1266

" cd ~/project\n"

1267

" bzr init\n"

1268

" bzr add .\n"

1269

" bzr status\n"

1270

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

1271

1272

1258

#: bzrlib/builtins.py:2041

1273

1259

msgid ""

1260

" cd ~/project\n"

1261

" bzr init\n"

1262

" bzr add .\n"

1263

" bzr status\n"

1264

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

1265

msgstr ""

1266

" cd ~/project\n"

1267

" bzr init\n"

1268

" bzr add .\n"

1269

" bzr status\n"

1270

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

1271

1272

#: bzrlib/builtins.py:2052

1273

msgid ""

1274

"Create the path leading up to the branch if it does not already exist."

1275

msgstr "ブランチまでのパスが存在していなければ、作成します。"

1276

1277

#: bzrlib/builtins.py:2044

1277

#: bzrlib/builtins.py:2055

1278

msgid "Specify a format for this branch. See \"help formats\"."

1279

msgstr "ブランチのフォーマットを指定します。\"help formats\"をご覧ください。"

1280

1281

#: bzrlib/builtins.py:2052

1281

#: bzrlib/builtins.py:2063

1282

msgid ""

1283

"Never change revnos or the existing log. Append revisions to it only."

1284

msgstr "リビジョン番号や既存のログを変更せず、リビジョンの追加だけを行います。"

1285

1286

#: bzrlib/builtins.py:2055

1286

#: bzrlib/builtins.py:2066

1287

msgid "Create a branch without a working tree."

1288

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

1289

1290

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

1290

#: bzrlib/builtins.py:2086 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:2109

1299

#: bzrlib/builtins.py:2120

1300

msgid ""

1301

"This branch format cannot be set to append-revisions-only. Try --default."

1302

msgstr "このブランチフォーマットにappend-revisions-onlyは指定できません。--defaultを試してください。"

1303

1304

#: bzrlib/builtins.py:2120

1304

#: bzrlib/builtins.py:2131

1305

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

1306

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

1307

1308

#: bzrlib/builtins.py:2129

1308

#: bzrlib/builtins.py:2140

1309

#, python-format

1310

msgid "Using shared repository: %s\n"

1311

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

1312

1313

#: bzrlib/builtins.py:2133

1313

#: bzrlib/builtins.py:2144

1314

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

1315

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

1316

1317

#: bzrlib/builtins.py:2135

1317

#: bzrlib/builtins.py:2146

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

1329

#: bzrlib/builtins.py:2151

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

1344

#: bzrlib/builtins.py:2158

1345

msgid ""

1346

":Examples:\n"

1347

" Create a shared repository holding just branches::"

1349

":例:\n"

1350

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

1351

1352

#: bzrlib/builtins.py:2150

1352

#: bzrlib/builtins.py:2161

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

1360

#: bzrlib/builtins.py:2164

1361

msgid " Make a lightweight checkout elsewhere::"

1362

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

1363

1364

#: bzrlib/builtins.py:2155

1364

#: bzrlib/builtins.py:2166

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

1374

#: bzrlib/builtins.py:2174

1375

msgid ""

1376

"Specify a format for this repository. See \"bzr help formats\" for details."

1377

msgstr "リポジトリのフォーマットを指定します。詳しくは\"bzr help formats\"をご覧ください。"

1378

1379

#: bzrlib/builtins.py:2167

1379

#: bzrlib/builtins.py:2178

1380

msgid "Repository format"

1381

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

1382

1383

#: bzrlib/builtins.py:2169

1383

#: bzrlib/builtins.py:2180

1384

msgid "Branches in the repository will default to not having a working tree."

1385

msgstr "リポジトリ内のブランチにはデフォルトでは作業ツリーを持たせません。"

1386

1387

#: bzrlib/builtins.py:2195

1387

#: bzrlib/builtins.py:2206

1388

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

1389

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

1390

1391

#: bzrlib/builtins.py:2197

1391

#: bzrlib/builtins.py:2208

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

1406

#: bzrlib/builtins.py:2215

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

1414

#: bzrlib/builtins.py:2218

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

1428

#: bzrlib/builtins.py:2225

1429

msgid ""

1430

":Exit values:\n"

1431

" 1 - changed\n"

1439

" 3 - エラー\n"

1440

" 0 - 変更なし"

1441

1442

#: bzrlib/builtins.py:2220

1442

#: bzrlib/builtins.py:2231

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

1450

#: bzrlib/builtins.py:2234

1451

msgid " bzr diff"

1452

msgstr " bzr diff"

1453

1454

#: bzrlib/builtins.py:2225

1454

#: bzrlib/builtins.py:2236

1455

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

1456

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

1457

1458

#: bzrlib/builtins.py:2227

1458

#: bzrlib/builtins.py:2238

1459

msgid " bzr diff -r1"

1460

msgstr " bzr diff -r1"

1461

1462

#: bzrlib/builtins.py:2229

1462

#: bzrlib/builtins.py:2240

1463

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

1464

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

1465

1466

#: bzrlib/builtins.py:2231

1466

#: bzrlib/builtins.py:2242

1467

msgid " bzr diff -r1..3"

1468

msgstr " bzr diff -r1..3"

1469

1470

#: bzrlib/builtins.py:2233

1470

#: bzrlib/builtins.py:2244

1471

msgid " Difference between revision 3 and revision 1 for branch xxx::"

1472

msgstr " ブランチxxxのリビジョン３とリビジョン１を比較します。::"

1473

1474

#: bzrlib/builtins.py:2235

1474

#: bzrlib/builtins.py:2246

1475

msgid " bzr diff -r1..3 xxx"

1476

msgstr " bzr diff -r1..3 xxx"

1477

1478

#: bzrlib/builtins.py:2237

1478

#: bzrlib/builtins.py:2248

1479

msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"

1480

msgstr " リビジョン２での変更です。(-r1..2 と同じです。)::"

1481

1482

#: bzrlib/builtins.py:2239

1482

#: bzrlib/builtins.py:2250

1483

msgid " bzr diff -c2"

1484

msgstr " bzr diff -c2"

1485

1486

#: bzrlib/builtins.py:2241

1486

#: bzrlib/builtins.py:2252

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

1496

#: bzrlib/builtins.py:2256

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

1505

#: bzrlib/builtins.py:2260

1506

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

1507

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

1508

1509

#: bzrlib/builtins.py:2251

1509

#: bzrlib/builtins.py:2262

1510

msgid ""

1511

" The changes between the current revision and the previous revision\n"

1512

" (equivalent to -c-1 and -r-2..-1)"

1513

msgstr " 現在のリビジョンと一つ前のリビジョンとの差分です。(-c-1 、 -r-2..-1 と同じ)"

1514

1515

#: bzrlib/builtins.py:2254

1515

#: bzrlib/builtins.py:2265

1516

msgid " bzr diff -r-2.."

1517

msgstr " bzr diff -r-2.."

1518

1519

#: bzrlib/builtins.py:2256

1519

#: bzrlib/builtins.py:2267

1520

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

1521

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

1522

1523

#: bzrlib/builtins.py:2258

1523

#: bzrlib/builtins.py:2269

1524

msgid " bzr diff NEWS"

1525

msgstr " bzr diff NEWS"

1526

1527

#: bzrlib/builtins.py:2260

1527

#: bzrlib/builtins.py:2271

1528

msgid " Show the differences in working tree xxx for file NEWS::"

1529

msgstr " 作業ツリーxxxの、ファイルNEWSの変更内容を表示します。::"

1530

1531

#: bzrlib/builtins.py:2262

1531

#: bzrlib/builtins.py:2273

1532

msgid " bzr diff xxx/NEWS"

1533

msgstr " bzr diff xxx/NEWS"

1534

1535

#: bzrlib/builtins.py:2264

1535

#: bzrlib/builtins.py:2275

1536

msgid " Show the differences from branch xxx to this working tree:"

1537

msgstr " ブランチxxxと作業ツリーとの間の差分を表示します。::"

1538

1539

#: bzrlib/builtins.py:2266

1539

#: bzrlib/builtins.py:2277

1540

msgid " bzr diff --old xxx"

1541

msgstr " bzr diff --old xxx"

1542

1543

#: bzrlib/builtins.py:2268

1543

#: bzrlib/builtins.py:2279

1544

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

1545

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

1546

1547

#: bzrlib/builtins.py:2270

1547

#: bzrlib/builtins.py:2281

1548

msgid " bzr diff --old xxx --new yyy NEWS"

1549

msgstr " bzr diff --old xxx --new yyy NEWS"

1550

1551

#: bzrlib/builtins.py:2272

1551

#: bzrlib/builtins.py:2283

1552

msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"

1553

msgstr " 'bzr diff'と同じですが、プレフィックスold/、new/を付加します。::"

1554

1555

#: bzrlib/builtins.py:2274

1555

#: bzrlib/builtins.py:2285

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

1569

#: bzrlib/builtins.py:2295

1570

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

1571

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

1572

1573

#: bzrlib/builtins.py:2287

1573

#: bzrlib/builtins.py:2298

1574

msgid ""

1575

"Set prefixes added to old and new filenames, as two values separated by a "

1576

"colon. (eg \"old/:new/\")."

1577

msgstr "古いファイル名と新しいファイル名にプレフィックスを追加します。２つの値をコロンで区切って指定します。(例 \"old/:new/\")"

1578

1579

#: bzrlib/builtins.py:2290

1579

#: bzrlib/builtins.py:2301

1580

msgid "Branch/tree to compare from."

1581

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

1582

1583

#: bzrlib/builtins.py:2294

1583

#: bzrlib/builtins.py:2305

1584

msgid "Branch/tree to compare to."

1585

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

1586

1587

#: bzrlib/builtins.py:2300

1587

#: bzrlib/builtins.py:2311

1588

msgid "Use this command to compare files."

1589

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

1590

1591

#: bzrlib/builtins.py:2305

1591

#: bzrlib/builtins.py:2316

1592

msgid "Diff format to use."

1593

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

1594

1595

#: bzrlib/builtins.py:2307

1595

#: bzrlib/builtins.py:2318

1596

msgid "Diff format"

1597

msgstr "Diffフォーマット"

1598

1599

#: bzrlib/builtins.py:2329

1599

#: bzrlib/builtins.py:2340

1600

msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"

1601

msgstr "--prefix は２つの値をコロンで区切ったものにしてください。 (例 \"old/:new/\")"

1602

1603

#: bzrlib/builtins.py:2333

1603

#: bzrlib/builtins.py:2344

1604

msgid "bzr diff --revision takes exactly one or two revision specifiers"

1605

msgstr "bzr diff --revision には１つまたは２つのリビジョンを指定してください。"

1606

1607

#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749

1608

#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919

1607

#: bzrlib/builtins.py:2349 bzrlib/builtins.py:2746 bzrlib/builtins.py:2759

1608

#: bzrlib/builtins.py:2767 bzrlib/builtins.py:4933

1609

msgid "{0} and {1} are mutually exclusive"

1610

msgstr "{0} と {1} を同時に指定することはできません。"

1611

1612

#: bzrlib/builtins.py:2358

1612

#: bzrlib/builtins.py:2369

1613

msgid ""

1614

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

1615

" "

1617

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

1618

" "

1619

1620

#: bzrlib/builtins.py:2436

1620

#: bzrlib/builtins.py:2446

1621

msgid "Show the tree root directory."

1622

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

1623

1624

#: bzrlib/builtins.py:2438

1624

#: bzrlib/builtins.py:2448

1625

msgid ""

1626

"The root is the nearest enclosing directory with a .bzr control\n"

1627

"directory."

1628

msgstr "ルートとは、.bzr管理ディレクトリを持つ、一番近い上位ディレクトリのことです。"

1629

1630

#: bzrlib/builtins.py:2453

1630

#: bzrlib/builtins.py:2463

1631

msgid "The limit argument must be an integer."

1632

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

1633

1634

#: bzrlib/builtins.py:2461

1634

#: bzrlib/builtins.py:2471

1635

msgid "The levels argument must be an integer."

1636

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

1637

1638

#: bzrlib/builtins.py:2466

1638

#: bzrlib/builtins.py:2476

1639

msgid "Show historical log for a branch or subset of a branch."

1640

msgstr "ブランチ、もしくはブランチの一部の履歴ログを表示します。"

1641

1642

#: bzrlib/builtins.py:2468

1642

#: bzrlib/builtins.py:2478

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

1654

#: bzrlib/builtins.py:2483

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

1664

#: bzrlib/builtins.py:2487

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

1679

#: bzrlib/builtins.py:2494

1680

msgid ":Output control:"

1681

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

1682

1683

#: bzrlib/builtins.py:2486

1683

#: bzrlib/builtins.py:2496

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

1695

#: bzrlib/builtins.py:2501

1696

msgid ""

1697

" The following options can be used to control what information is\n"

1698

" displayed::"

1699

msgstr " 以下のオプションで、どの情報を表示するかをコントロールできます。"

1700

1701

#: bzrlib/builtins.py:2494

1701

#: bzrlib/builtins.py:2504

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

1715

#: bzrlib/builtins.py:2510

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

1725

#: bzrlib/builtins.py:2514

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

1734

#: bzrlib/builtins.py:2518

1735

msgid ":Ordering control:"

1736

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

1737

1738

#: bzrlib/builtins.py:2510

1738

#: bzrlib/builtins.py:2520

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

1749

#: bzrlib/builtins.py:2525

1750

msgid ":Revision filtering:"

1751

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

1752

1753

#: bzrlib/builtins.py:2517

1753

#: bzrlib/builtins.py:2527

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

1761

#: bzrlib/builtins.py:2530

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

1773

#: bzrlib/builtins.py:2535

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

1781

#: bzrlib/builtins.py:2538

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

1797

#: bzrlib/builtins.py:2545

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

1813

#: bzrlib/builtins.py:2552

1814

msgid ":Path filtering:"

1815

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

1816

1817

#: bzrlib/builtins.py:2544

1817

#: bzrlib/builtins.py:2554

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

1826

#: bzrlib/builtins.py:2558

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

1836

#: bzrlib/builtins.py:2562

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

1844

#: bzrlib/builtins.py:2565

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

1854

#: bzrlib/builtins.py:2569

1855

msgid " In this case:"

1856

msgstr " この場合:"

1857

1858

#: bzrlib/builtins.py:2561

1858

#: bzrlib/builtins.py:2571

1859

msgid " * ``bzr log guide.txt`` will log the file added in revision 1"

1860

msgstr " * ``bzr log guide.txt`` は、リビジョン1で追加されたファイルを表示します。"

1861

1862

#: bzrlib/builtins.py:2563

1862

#: bzrlib/builtins.py:2573

1863

msgid ""

1864

" * ``bzr log tutorial.txt`` will log the new file added in revision 3"

1865

msgstr " * ``bzr log tutorial.txt`` は、リビジョン3で追加された新しいファイルを表示します。"

1866

1867

#: bzrlib/builtins.py:2565

1867

#: bzrlib/builtins.py:2575

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

1875

#: bzrlib/builtins.py:2578

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

1883

#: bzrlib/builtins.py:2581

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

1892

#: bzrlib/builtins.py:2585

1893

msgid ":Other filtering:"

1894

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

1895

1896

#: bzrlib/builtins.py:2577

1896

#: bzrlib/builtins.py:2587

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

1910

#: bzrlib/builtins.py:2593

1911

msgid ":Tips & tricks:"

1912

msgstr ":Tips & tricks:"

1913

1914

#: bzrlib/builtins.py:2585

1914

#: bzrlib/builtins.py:2595

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

1928

#: bzrlib/builtins.py:2601

1929

msgid ""

1930

" You may find it useful to add the aliases below to ``bazaar.conf``::"

1931

msgstr " ``bazaar.conf`` に以下のようなエイリアスを追加しておくと便利です。::"

1932

1933

#: bzrlib/builtins.py:2593

1933

#: bzrlib/builtins.py:2603

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

1945

#: bzrlib/builtins.py:2608

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

1955

#: bzrlib/builtins.py:2612

1956

msgid ""

1957

" If you are interested in looking deeper into a particular merge X,\n"

1958

" use ``bzr log -n0 -rX``."

1959

msgstr " 特定のマージXについて詳しく見たい場合は、 ``bzr log -n0 -rX`` を使用します。"

1960

1961

#: bzrlib/builtins.py:2605

1961

#: bzrlib/builtins.py:2615

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

1973

#: bzrlib/builtins.py:2620

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

1985

#: bzrlib/builtins.py:2625

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

1997

#: bzrlib/builtins.py:2634

1998

msgid "Show from oldest to newest."

1999

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

2000

2001

#: bzrlib/builtins.py:2627

2001

#: bzrlib/builtins.py:2637

2002

msgid "Show files changed in each revision."

2003

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

2004

2005

#: bzrlib/builtins.py:2633

2005

#: bzrlib/builtins.py:2643

2006

msgid "Show just the specified revision. See also \"help revisionspec\"."

2007

msgstr "指定されたリビジョンだけを表示する。 ``help revisionspec``を参照"

2008

2009

#: bzrlib/builtins.py:2637

2009

#: bzrlib/builtins.py:2647

2010

msgid "What names to list as authors - first, all or committer."

2011

msgstr "誰を作者として表示するか - first、all、またはcommitter"

2012

2013

#: bzrlib/builtins.py:2638

2013

#: bzrlib/builtins.py:2648

2014

msgid "Authors"

2015

msgstr "作者"

2016

2017

#: bzrlib/builtins.py:2643

2017

#: bzrlib/builtins.py:2653

2018

msgid "Number of levels to display - 0 for all, 1 for flat."

2019

msgstr "表示するレベル。-0で全て、1で１階層"

2020

2021

#: bzrlib/builtins.py:2653

2021

#: bzrlib/builtins.py:2663

2022

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

2023

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

2024

2025

#: bzrlib/builtins.py:2658

2025

#: bzrlib/builtins.py:2668

2026

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

2027

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

2028

2029

#: bzrlib/builtins.py:2660

2029

#: bzrlib/builtins.py:2670

2030

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

2031

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

2032

2033

#: bzrlib/builtins.py:2664

2033

#: bzrlib/builtins.py:2674

2034

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

2035

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

2036

2037

#: bzrlib/builtins.py:2666

2037

#: bzrlib/builtins.py:2676

2038

msgid ""

2039

"Display only the revisions that are not part of both ancestries (require -"

2040

"rX..Y)."

2041

msgstr "共通の先祖に含まれないリビジョンだけを表示(-rX..Yを使用する必要がある)"

2042

2043

#: bzrlib/builtins.py:2670

2043

#: bzrlib/builtins.py:2680

2044

msgid "Show digital signature validity."

2045

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

2046

2047

#: bzrlib/builtins.py:2673

2047

#: bzrlib/builtins.py:2683

2048

msgid "Show revisions whose properties match this expression."

2049

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

2050

2051

#: bzrlib/builtins.py:2677

2051

#: bzrlib/builtins.py:2687

2052

msgid "Show revisions whose message matches this expression."

2053

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

2054

2055

#: bzrlib/builtins.py:2681

2055

#: bzrlib/builtins.py:2691

2056

msgid "Show revisions whose committer matches this expression."

2057

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

2058

2059

#: bzrlib/builtins.py:2685

2059

#: bzrlib/builtins.py:2695

2060

msgid "Show revisions whose authors match this expression."

2061

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

2062

2063

#: bzrlib/builtins.py:2689

2063

#: bzrlib/builtins.py:2699

2064

msgid "Show revisions whose bugs match this expression."

2065

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

2066

2067

#: bzrlib/builtins.py:2743

2067

#: bzrlib/builtins.py:2753

2068

msgid "--exclude-common-ancestry requires -r with two revisions"

2069

msgstr "--exclude-common-ancestryには、-rで2つのリビジョンを指定する必要があります。"

2070

2071

#: bzrlib/builtins.py:2771

2071

#: bzrlib/builtins.py:2781

2072

#, python-format

2073

msgid "Path unknown at end or start of revision range: %s"

2074

msgstr "最後のリビジョンにも最初のリビジョンにもパスが見つかりません: %s"

2075

2076

#: bzrlib/builtins.py:2888

2076

#: bzrlib/builtins.py:2898

2077

#, python-format

2078

msgid "bzr %s doesn't accept two revisions in different branches."

2079

msgstr "bzr %s には、異なるブランチ上の2つのリビジョンは指定できません。"

2080

2081

#: bzrlib/builtins.py:2904

2081

#: bzrlib/builtins.py:2914

2082

#, python-format

2083

msgid "bzr %s --revision takes one or two values."

2084

msgstr "bzr %s --revision は1つまたは2つの値を取ります。"

2085

2086

#: bzrlib/builtins.py:2949

2086

#: bzrlib/builtins.py:2959

2087

msgid ""

2088

"List files in a tree.\n"

2089

" "

2091

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

2092

" "

2093

2094

#: bzrlib/builtins.py:2958

2094

#: bzrlib/builtins.py:2968

2095

msgid "Recurse into subdirectories."

2096

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

2097

2098

#: bzrlib/builtins.py:2960

2098

#: bzrlib/builtins.py:2970

2099

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

2100

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

2101

2102

#: bzrlib/builtins.py:2962

2102

#: bzrlib/builtins.py:2972

2103

msgid "Print unknown files."

2104

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

2105

2106

#: bzrlib/builtins.py:2963

2106

#: bzrlib/builtins.py:2973

2107

msgid "Print versioned files."

2108

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

2109

2110

#: bzrlib/builtins.py:2966

2110

#: bzrlib/builtins.py:2976

2111

msgid "Print ignored files."

2112

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

2113

2114

#: bzrlib/builtins.py:2968

2114

#: bzrlib/builtins.py:2978

2115

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

2116

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

2117

2118

#: bzrlib/builtins.py:2981

2118

#: bzrlib/builtins.py:2991

2119

msgid "invalid kind specified"

2120

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

2121

2122

#: bzrlib/builtins.py:2984

2122

#: bzrlib/builtins.py:2994

2123

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

2124

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

2125

2126

#: bzrlib/builtins.py:2993

2126

#: bzrlib/builtins.py:3003

2127

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

2128

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

2129

2130

#: bzrlib/builtins.py:3080

2130

#: bzrlib/builtins.py:3090

2131

msgid "Ignore specified files or patterns."

2132

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

2133

2134

#: bzrlib/builtins.py:3082

2134

#: bzrlib/builtins.py:3092

2135

msgid "See ``bzr help patterns`` for details on the syntax of patterns."

2136

msgstr "パターンの書き方の詳細は ``bzr help patterns`` をご覧ください。"

2137

2138

#: bzrlib/builtins.py:3084

2138

#: bzrlib/builtins.py:3094

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

2152

#: bzrlib/builtins.py:3100

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

2163

#: bzrlib/builtins.py:3105

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

2177

#: bzrlib/builtins.py:3111

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

2187

#: bzrlib/builtins.py:3115

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

2195

#: bzrlib/builtins.py:3118

2196

msgid ""

2197

":Notes: \n"

2198

" \n"

2204

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

2205

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

2206

2207

#: bzrlib/builtins.py:3113

2207

#: bzrlib/builtins.py:3123

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

2215

#: bzrlib/builtins.py:3126

2216

msgid ""

2217

":Examples:\n"

2218

" Ignore the top level Makefile::"

2220

":例:\n"

2221

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

2222

2223

#: bzrlib/builtins.py:3119

2223

#: bzrlib/builtins.py:3129

2224

msgid " bzr ignore ./Makefile"

2225

msgstr " bzr ignore ./Makefile"

2226

2227

#: bzrlib/builtins.py:3121

2227

#: bzrlib/builtins.py:3131

2228

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

2229

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

2230

2231

#: bzrlib/builtins.py:3123

2231

#: bzrlib/builtins.py:3133

2232

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

2233

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

2234

2235

#: bzrlib/builtins.py:3125

2235

#: bzrlib/builtins.py:3135

2236

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

2237

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

2238

2239

#: bzrlib/builtins.py:3127

2239

#: bzrlib/builtins.py:3137

2240

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

2241

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

2242

2243

#: bzrlib/builtins.py:3129

2243

#: bzrlib/builtins.py:3139

2244

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

2245

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

2246

2247

#: bzrlib/builtins.py:3131

2247

#: bzrlib/builtins.py:3141

2248

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

2249

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

2250

2251

#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137

2251

#: bzrlib/builtins.py:3143 bzrlib/builtins.py:3147

2252

msgid " Ignore .o files under the lib directory::"

2253

msgstr " libディレクトリ配下の.oファイルを無視する::"

2254

2255

#: bzrlib/builtins.py:3135

2255

#: bzrlib/builtins.py:3145

2256

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

2257

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

2258

2259

#: bzrlib/builtins.py:3139

2259

#: bzrlib/builtins.py:3149

2260

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

2261

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

2262

2263

#: bzrlib/builtins.py:3141

2263

#: bzrlib/builtins.py:3151

2264

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

2265

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

2266

2267

#: bzrlib/builtins.py:3143

2267

#: bzrlib/builtins.py:3153

2268

msgid ""

2269

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

2270

" \n"

2284

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

2285

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

2286

2287

#: bzrlib/builtins.py:3157

2287

#: bzrlib/builtins.py:3167

2288

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

2289

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

2290

2291

#: bzrlib/builtins.py:3169

2291

#: bzrlib/builtins.py:3179

2292

msgid "ignore requires at least one NAME_PATTERN or --default-rules."

2293

msgstr "ignoreにはNAME_PATTERNか--default-rulesのどちらかは指定する必要があります。"

2294

2295

#: bzrlib/builtins.py:3180

2295

#: bzrlib/builtins.py:3190

2296

#, python-format

2297

msgid "Invalid ignore pattern found. %s"

2298

msgid_plural "Invalid ignore patterns found. %s"

2299

msgstr[0] "無効な無視パターンが見つかりました。 %s"

2300

2301

#: bzrlib/builtins.py:3189

2301

#: bzrlib/builtins.py:3199

2302

msgid "NAME_PATTERN should not be an absolute path"

2303

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

2304

2305

#: bzrlib/builtins.py:3202

2305

#: bzrlib/builtins.py:3212

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

2318

#: bzrlib/builtins.py:3219

2319

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

2320

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

2321

2322

#: bzrlib/builtins.py:3211

2322

#: bzrlib/builtins.py:3221

2323

msgid ""

2324

"List all the ignored files and the ignore pattern that caused the file to\n"

2325

"be ignored."

2326

msgstr "無視されるファイルと、それがどのパターンによって無視されているかを一覧で表示します。"

2327

2328

#: bzrlib/builtins.py:3214

2328

#: bzrlib/builtins.py:3224

2329

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

2330

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

2331

2332

#: bzrlib/builtins.py:3216

2332

#: bzrlib/builtins.py:3226

2333

msgid " bzr ls --ignored"

2334

msgstr " bzr ls --ignored"

2335

2336

#: bzrlib/builtins.py:3250

2336

#: bzrlib/builtins.py:3260

2337

#, python-format

2338

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

2339

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

2340

2341

#: bzrlib/builtins.py:3257

2341

#: bzrlib/builtins.py:3267

2342

msgid ""

2343

"Export current or past revision to a destination directory or archive."

2344

msgstr "最新、または過去のリビジョンを指定されたディレクトリもしくはアーカイブにエクスポートする。"

2345

2346

#: bzrlib/builtins.py:3259

2346

#: bzrlib/builtins.py:3269

2347

msgid "If no revision is specified this exports the last committed revision."

2348

msgstr "リビジョンが指定されなければ、最終コミットのリビジョンをエクスポートします。"

2349

2350

#: bzrlib/builtins.py:3261

2350

#: bzrlib/builtins.py:3271

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

2360

#: bzrlib/builtins.py:3275

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

2371

#: bzrlib/builtins.py:3279

2372

msgid ""

2373

"If branch is omitted then the branch containing the current working\n"

2374

"directory will be used."

2375

msgstr "ブランチが省略されると現在の作業ディレクトリを含むブランチが使用されます。"

2376

2377

#: bzrlib/builtins.py:3272

2377

#: bzrlib/builtins.py:3282

2378

msgid ""

2379

"Note: Export of tree with non-ASCII filenames to zip is not supported."

2380

msgstr "注: ASCIIではないファイルを含むツリーの、zipへのエクスポートはサポートされません。"

2381

2382

#: bzrlib/builtins.py:3274

2382

#: bzrlib/builtins.py:3284

2383

msgid ""

2384

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

2385

" Supported formats Autodetected by extension\n"

2401

" zip .zip\n"

2402

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

2403

2404

#: bzrlib/builtins.py:3288

2404

#: bzrlib/builtins.py:3298

2405

msgid "Type of file to export to."

2406

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

2407

2408

#: bzrlib/builtins.py:3291

2408

#: bzrlib/builtins.py:3301

2409

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

2410

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

2411

2412

#: bzrlib/builtins.py:3295

2412

#: bzrlib/builtins.py:3305

2413

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

2414

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

2415

2416

#: bzrlib/builtins.py:3297

2416

#: bzrlib/builtins.py:3307

2417

msgid ""

2418

"Set modification time of files to that of the last revision in which it was "

2419

"changed."

2420

msgstr "各ファイルの編集日時を、最後にそのファイルが変更されたリビジョンの日時に設定します。"

2421

2422

#: bzrlib/builtins.py:3300

2422

#: bzrlib/builtins.py:3310

2423

msgid ""

2424

"Export the working tree contents rather than that of the last revision."

2425

msgstr "最終リビジョンではなく、作業ツリーの内容をエクスポートします。"

2426

2427

#: bzrlib/builtins.py:3319

2427

#: bzrlib/builtins.py:3329

2428

msgid "--uncommitted requires a working tree"

2429

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

2430

2431

#: bzrlib/builtins.py:3328

2431

#: bzrlib/builtins.py:3338

2432

#, python-format

2433

msgid "Unsupported export format: %s"

2434

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

2435

2436

#: bzrlib/builtins.py:3332

2436

#: bzrlib/builtins.py:3342

2437

msgid ""

2438

"Write the contents of a file as of a given revision to standard output."

2439

msgstr "指定されたリビジョンのファイルの内容を標準出力に書き出します。"

2440

2441

#: bzrlib/builtins.py:3334

2441

#: bzrlib/builtins.py:3344

2442

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

2443

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

2444

2445

#: bzrlib/builtins.py:3336

2445

#: bzrlib/builtins.py:3346

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

2453

#: bzrlib/builtins.py:3352

2454

msgid "The path name in the old tree."

2455

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

2456

2457

#: bzrlib/builtins.py:3343

2457

#: bzrlib/builtins.py:3353

2458

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

2459

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

2460

2461

#: bzrlib/builtins.py:3354

2461

#: bzrlib/builtins.py:3364

2462

msgid "bzr cat --revision takes exactly one revision specifier"

2463

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

2464

2465

#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391

2465

#: bzrlib/builtins.py:3389 bzrlib/builtins.py:3401

2466

msgid "{0!r} is not present in revision {1}"

2467

msgstr "{0!r}はリビジョン{1}には存在しません。"

2468

2469

#: bzrlib/builtins.py:3414

2469

#: bzrlib/builtins.py:3424

2470

msgid "Commit changes into a new revision."

2471

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

2472

2473

#: bzrlib/builtins.py:3416

2473

#: bzrlib/builtins.py:3426

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

2489

#: bzrlib/builtins.py:3433

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

2498

#: bzrlib/builtins.py:3437

2499

msgid ":Selective commits:"

2500

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

2501

2502

#: bzrlib/builtins.py:3429

2502

#: bzrlib/builtins.py:3439

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

2512

#: bzrlib/builtins.py:3443

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

2522

#: bzrlib/builtins.py:3447

2523

msgid " bzr commit foo -x foo/bar"

2524

msgstr " bzr commit foo -x foo/bar"

2525

2526

#: bzrlib/builtins.py:3439

2526

#: bzrlib/builtins.py:3449

2527

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

2528

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

2529

2530

#: bzrlib/builtins.py:3441

2530

#: bzrlib/builtins.py:3451

2531

msgid ":Custom authors:"

2532

msgstr ":作者の変更:"

2533

2534

#: bzrlib/builtins.py:3443

2534

#: bzrlib/builtins.py:3453

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"

2545

" ように、コミッターのIDと同じフォーマットで指定するべきです。複数の作者が\n"

2546

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

2547

2548

#: bzrlib/builtins.py:3450

2548

#: bzrlib/builtins.py:3460

2549

msgid ":Checks:"

2550

msgstr ":チェック:"

2551

2552

#: bzrlib/builtins.py:3452

2552

#: bzrlib/builtins.py:3462

2553

msgid ""

2554

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

2555

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

2563

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

2564

" ご覧ください。"

2565

2566

#: bzrlib/builtins.py:3458

2566

#: bzrlib/builtins.py:3468

2567

msgid ":Things to note:"

2568

msgstr ":特記事項:"

2569

2570

#: bzrlib/builtins.py:3460

2570

#: bzrlib/builtins.py:3470

2571

msgid ""

2572

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

2573

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

2577

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

2578

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

2579

2580

#: bzrlib/builtins.py:3464

2580

#: bzrlib/builtins.py:3474

2581

msgid ""

2582

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

2583

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

2589

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

2590

" ください。"

2591

2592

#: bzrlib/builtins.py:3474

2592

#: bzrlib/builtins.py:3484

2593

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

2594

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

2595

2596

#: bzrlib/builtins.py:3477

2596

#: bzrlib/builtins.py:3487

2597

msgid "Description of the new revision."

2598

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

2599

2600

#: bzrlib/builtins.py:3480

2600

#: bzrlib/builtins.py:3490

2601

msgid "Commit even if nothing has changed."

2602

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

2603

2604

#: bzrlib/builtins.py:3484

2604

#: bzrlib/builtins.py:3494

2605

msgid "Take commit message from this file."

2606

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

2607

2608

#: bzrlib/builtins.py:3486

2608

#: bzrlib/builtins.py:3496

2609

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

2610

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

2611

2612

#: bzrlib/builtins.py:3489

2612

#: bzrlib/builtins.py:3499

2613

msgid ""

2614

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

2615

"08:00:00 +0100'."

2616

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

2617

2618

#: bzrlib/builtins.py:3492

2618

#: bzrlib/builtins.py:3502

2619

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

2620

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

2621

2622

#: bzrlib/builtins.py:3495

2622

#: bzrlib/builtins.py:3505

2623

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

2624

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

2625

2626

#: bzrlib/builtins.py:3498

2626

#: bzrlib/builtins.py:3508

2627

msgid ""

2628

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

2629

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

2630

msgstr ""

2631

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

2632

2633

#: bzrlib/builtins.py:3504

2633

#: bzrlib/builtins.py:3514

2634

msgid ""

2635

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

2636

"the message editor."

2637

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

2638

2639

#: bzrlib/builtins.py:3507

2639

#: bzrlib/builtins.py:3517

2640

msgid ""

2641

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

2642

"can not be natively represented."

2643

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

2644

2645

#: bzrlib/builtins.py:3525

2645

#: bzrlib/builtins.py:3535

2646

#, python-format

2647

msgid ""

2648

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

2653

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

2654

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

2655

2656

#: bzrlib/builtins.py:3534

2656

#: bzrlib/builtins.py:3544

2657

#, python-format

2658

msgid ""

2659

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

2663

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

2664

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

2665

2666

#: bzrlib/builtins.py:3543

2666

#: bzrlib/builtins.py:3553

2667

#, python-format

2668

msgid "Unrecognized bug %s. Commit refused."

2669

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

2670

2671

#: bzrlib/builtins.py:3546

2671

#: bzrlib/builtins.py:3556

2672

#, python-format

2673

msgid ""

2674

"%s\n"

2677

"%s\n"

2678

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

2679

2680

#: bzrlib/builtins.py:3570

2680

#: bzrlib/builtins.py:3580

2681

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

2682

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

2683

2684

#: bzrlib/builtins.py:3610

2684

#: bzrlib/builtins.py:3620

2685

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

2686

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

2687

2688

#: bzrlib/builtins.py:3639

2688

#: bzrlib/builtins.py:3649

2689

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

2690

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

2691

2692

#: bzrlib/builtins.py:3642

2692

#: bzrlib/builtins.py:3652

2693

msgid ""

2694

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

2695

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

2697

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

2698

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

2699

2700

#: bzrlib/builtins.py:3662

2700

#: bzrlib/builtins.py:3672

2701

msgid ""

2702

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

2703

"-unchanged to force an empty commit."

2704

msgstr ""

2705

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

2706

2707

#: bzrlib/builtins.py:3666

2707

#: bzrlib/builtins.py:3676

2708

msgid ""

2709

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

2710

"resolve FILE\" to resolve."

2711

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

2712

2713

#: bzrlib/builtins.py:3670

2713

#: bzrlib/builtins.py:3680

2714

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

2715

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

2716

2717

#: bzrlib/builtins.py:3673

2717

#: bzrlib/builtins.py:3683

2718

msgid ""

2719

"\n"

2720

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

2724

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

2725

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

2726

2727

#: bzrlib/builtins.py:3681

2727

#: bzrlib/builtins.py:3691

2728

msgid ""

2729

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

2730

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

2731

2732

#: bzrlib/builtins.py:3683

2732

#: bzrlib/builtins.py:3693

2733

msgid ""

2734

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

2735

"to detect data corruption or bzr bugs."

2737

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

2738

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

2739

2740

#: bzrlib/builtins.py:3686

2740

#: bzrlib/builtins.py:3696

2741

msgid ""

2742

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

2743

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

2745

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

2746

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

2747

2748

#: bzrlib/builtins.py:3689

2748

#: bzrlib/builtins.py:3699

2749

msgid ""

2750

"revisions\n"

2751

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

2754

"revisions\n"

2755

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

2756

2757

#: bzrlib/builtins.py:3693

2757

#: bzrlib/builtins.py:3703

2758

msgid ""

2759

"versionedfiles\n"

2760

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

2764

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

2765

" ありません。"

2766

2767

#: bzrlib/builtins.py:3697

2767

#: bzrlib/builtins.py:3707

2768

msgid ""

2769

"unreferenced ancestors\n"

2770

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

2776

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

2777

" 問題です。"

2778

2779

#: bzrlib/builtins.py:3702

2779

#: bzrlib/builtins.py:3712

2780

msgid ""

2781

"unique file texts\n"

2782

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

2786

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

2787

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

2788

2789

#: bzrlib/builtins.py:3706

2789

#: bzrlib/builtins.py:3716

2790

msgid ""

2791

"repeated file texts\n"

2792

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

2799

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

2800

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

2801

2802

#: bzrlib/builtins.py:3712

2802

#: bzrlib/builtins.py:3722

2803

msgid ""

2804

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

2805

"given\n"

2808

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

2809

"チェックされます。"

2810

2811

#: bzrlib/builtins.py:3717

2811

#: bzrlib/builtins.py:3727

2812

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

2813

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

2814

2815

#: bzrlib/builtins.py:3719

2815

#: bzrlib/builtins.py:3729

2816

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

2817

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

2818

2819

#: bzrlib/builtins.py:3721

2819

#: bzrlib/builtins.py:3731

2820

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

2821

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

2822

2823

#: bzrlib/builtins.py:3723

2823

#: bzrlib/builtins.py:3733

2824

msgid " bzr check --repo bar"

2825

msgstr " bzr check --repo bar"

2826

2827

#: bzrlib/builtins.py:3725

2827

#: bzrlib/builtins.py:3735

2828

msgid " Check everything at 'baz'::"

2829

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

2830

2831

#: bzrlib/builtins.py:3727

2831

#: bzrlib/builtins.py:3737

2832

msgid " bzr check baz"

2833

msgstr " bzr check baz"

2834

2835

#: bzrlib/builtins.py:3733

2835

#: bzrlib/builtins.py:3743

2836

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

2837

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

2838

2839

#: bzrlib/builtins.py:3735

2839

#: bzrlib/builtins.py:3745

2840

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

2841

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

2842

2843

#: bzrlib/builtins.py:3737

2843

#: bzrlib/builtins.py:3747

2844

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

2845

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

2846

2847

#: bzrlib/builtins.py:3751

2847

#: bzrlib/builtins.py:3761

2848

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

2849

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

2850

2851

#: bzrlib/builtins.py:3753

2851

#: bzrlib/builtins.py:3763

2852

msgid ""

2853

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

2854

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

2862

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

2863

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

2864

2865

#: bzrlib/builtins.py:3759

2865

#: bzrlib/builtins.py:3769

2866

msgid ""

2867

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

2868

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

2877

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

2878

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

2879

2880

#: bzrlib/builtins.py:3766

2880

#: bzrlib/builtins.py:3776

2881

msgid ""

2882

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

2883

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

2894

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

2895

"削除してください。"

2896

2897

#: bzrlib/builtins.py:3774

2897

#: bzrlib/builtins.py:3784

2898

msgid ""

2899

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

2900

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

2905

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

2906

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

2907

2908

#: bzrlib/builtins.py:3779

2908

#: bzrlib/builtins.py:3789

2909

msgid ""

2910

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

2911

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

2913

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

2914

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

2915

2916

#: bzrlib/builtins.py:3787

2916

#: bzrlib/builtins.py:3797

2917

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

2918

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

2919

2920

#: bzrlib/builtins.py:3791

2920

#: bzrlib/builtins.py:3801

2921

msgid "Branch format"

2922

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

2923

2924

#: bzrlib/builtins.py:3793

2924

#: bzrlib/builtins.py:3803

2925

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

2926

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

2927

2928

#: bzrlib/builtins.py:3795

2928

#: bzrlib/builtins.py:3805

2929

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

2930

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

2931

2932

#: bzrlib/builtins.py:3810

2932

#: bzrlib/builtins.py:3820

2933

msgid "Show or set bzr user id."

2934

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

2935

2936

#: bzrlib/builtins.py:3812

2936

#: bzrlib/builtins.py:3822

2937

msgid ""

2938

":Examples:\n"

2939

" Show the email of the current user::"

2941

":例:\n"

2942

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

2943

2944

#: bzrlib/builtins.py:3815

2944

#: bzrlib/builtins.py:3825

2945

msgid " bzr whoami --email"

2946

msgstr " bzr whoami --email"

2947

2948

#: bzrlib/builtins.py:3817

2948

#: bzrlib/builtins.py:3827

2949

msgid " Set the current user::"

2950

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

2951

2952

#: bzrlib/builtins.py:3819

2952

#: bzrlib/builtins.py:3829

2953

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

2954

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

2955

2956

#: bzrlib/builtins.py:3823

2956

#: bzrlib/builtins.py:3833

2957

msgid "Display email address only."

2958

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

2959

2960

#: bzrlib/builtins.py:3825

2960

#: bzrlib/builtins.py:3835

2961

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

2962

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

2963

2964

#: bzrlib/builtins.py:3851

2964

#: bzrlib/builtins.py:3861

2965

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

2966

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

2967

2968

#: bzrlib/builtins.py:3873

2968

#: bzrlib/builtins.py:3885

2969

msgid "Print or set the branch nickname."

2970

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

2971

2972

#: bzrlib/builtins.py:3875

2972

#: bzrlib/builtins.py:3887

2973

msgid ""

2974

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

2975

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

2974

"If unset, the colocated branch name is used for colocated branches, and\n"

2975

"the branch directory name is used for other branches. To print the\n"

2976

"current nickname, execute with no argument."

2976

2977

msgstr ""

2977

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

2978

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

2979

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

2980

2978

2981

#: bzrlib/builtins.py:3878

2979

#: bzrlib/builtins.py:3891

2982

2980

msgid ""

2983

2981

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

2984

2982

"locally."

2986

2984

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

2987

2985

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

2988

2986

2989

#: bzrlib/builtins.py:3898

2987

#: bzrlib/builtins.py:3911

2990

2988

msgid "Set/unset and display aliases."

2991

2989

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

2992

2990

2993

#: bzrlib/builtins.py:3900

2991

#: bzrlib/builtins.py:3913

2994

2992

msgid ""

2995

2993

":Examples:\n"

2996

2994

" Show the current aliases::"

2998

2996

":例:\n"

2999

2997

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

3000

2998

3001

#: bzrlib/builtins.py:3903

2999

#: bzrlib/builtins.py:3916

3002

3000

msgid " bzr alias"

3003

3001

msgstr " bzr alias"

3004

3002

3005

#: bzrlib/builtins.py:3905

3003

#: bzrlib/builtins.py:3918

3006

3004

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

3007

3005

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

3008

3006

3009

#: bzrlib/builtins.py:3907

3007

#: bzrlib/builtins.py:3920

3010

3008

msgid " bzr alias ll"

3011

3009

msgstr " bzr alias ll"

3012

3010

3013

#: bzrlib/builtins.py:3909

3011

#: bzrlib/builtins.py:3922

3014

3012

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

3015

3013

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

3016

3014

3017

#: bzrlib/builtins.py:3911

3015

#: bzrlib/builtins.py:3924

3018

3016

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

3019

3017

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

3020

3018

3021

#: bzrlib/builtins.py:3913

3019

#: bzrlib/builtins.py:3926

3022

3020

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

3023

3021

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

3024

3022

3025

#: bzrlib/builtins.py:3915

3023

#: bzrlib/builtins.py:3928

3026

3024

msgid " bzr alias --remove ll"

3027

3025

msgstr " bzr alias --remove ll"

3028

3026

3029

#: bzrlib/builtins.py:3920

3027

#: bzrlib/builtins.py:3933

3030

3028

msgid "Remove the alias."

3031

3029

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

3032

3030

3033

#: bzrlib/builtins.py:3938

3031

#: bzrlib/builtins.py:3951

3034

3032

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

3035

3033

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

3036

3034

3037

#: bzrlib/builtins.py:4119

3035

#: bzrlib/builtins.py:4132

3038

3036

msgid ""

3039

3037

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

3040

3038

msgstr ""

3041

3039

3042

#: bzrlib/builtins.py:4136

3040

#: bzrlib/builtins.py:4149

3043

3041

msgid ""

3044

3042

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

3045

3043

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

3046

3044

3047

#: bzrlib/builtins.py:4183

3045

#: bzrlib/builtins.py:4196

3048

3046

msgid "Show version of bzr."

3049

3047

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

3050

3048

3051

#: bzrlib/builtins.py:4187

3049

#: bzrlib/builtins.py:4200

3052

3050

msgid "Print just the version number."

3053

3051

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

3054

3052

3055

#: bzrlib/builtins.py:4206

3053

#: bzrlib/builtins.py:4219

3056

3054

msgid "It sure does!\n"

3057

3055

msgstr ""

3058

3056

3059

#: bzrlib/builtins.py:4230

3057

#: bzrlib/builtins.py:4243

3060

3058

#, python-format

3061

3059

msgid "merge base is revision %s\n"

3062

3060

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

3063

3061

3064

#: bzrlib/builtins.py:4234

3062

#: bzrlib/builtins.py:4247

3065

3063

msgid "Perform a three-way merge."

3066

3064

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

3067

3065

3068

#: bzrlib/builtins.py:4236

3066

#: bzrlib/builtins.py:4249

3069

3067

msgid ""

3070

3068

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

3071

3069

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

3081

3079

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

3082

3080

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

3083

3081

3084

#: bzrlib/builtins.py:4244

3082

#: bzrlib/builtins.py:4257

3085

3083

msgid ""

3086

3084

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

3087

3085

"work from the other branch, automatically determining an appropriate base\n"

3091

3089

"判定し、それ以降のすべての変更をマージしようとします。もしこれが失敗した場合は、\n"

3092

3090

"明示的にベースリビジョンを指定する必要があります。"

3093

3091

3094

#: bzrlib/builtins.py:4248

3092

#: bzrlib/builtins.py:4261

3095

3093

msgid ""

3096

3094

"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"

3097

3095

"try to merge in all new work up to and including revision OTHER."

3099

3097

"別の最終リビジョンを指定するには、\"-revision OTHER\"を指定します。この場合、\n"

3100

3098

"OTHERまで(OTHERも含む)の全ての変更がマージされます。"

3101

3099

3102

#: bzrlib/builtins.py:4251

3100

#: bzrlib/builtins.py:4264

3103

3101

msgid ""

3104

3102

"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"

3105

3103

"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"

3116

3114

"とはちがい、今のところBazaarではチェリーピックは追跡しません。変更は、普通の\n"

3117

3115

"コミットのように見え、マージ元での変更履歴は保存されません。"

3118

3116

3119

#: bzrlib/builtins.py:4259

3117

#: bzrlib/builtins.py:4272

3120

3118

msgid "Revision numbers are always relative to the source branch."

3121

3119

msgstr "リビジョン番号は常に元のブランチに関連します。"

3122

3120

3123

#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106

3121

#: bzrlib/builtins.py:4274 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106

3124

3122

msgid ""

3125

3123

"Merge will do its best to combine the changes in two branches, but there\n"

3126

3124

"are some kinds of problems only a human can fix. When it encounters those,\n"

3128

3126

"before you can commit."

3129

3127

msgstr ""

3130

3128

3131

#: bzrlib/builtins.py:4266

3129

#: bzrlib/builtins.py:4279

3132

3130

msgid ""

3133

3131

"Use bzr resolve when you have fixed a problem. See also bzr conflicts."

3134

3132

msgstr "問題を解消したら、bzr resolveを使用してください。bzr conflictsもご覧ください。"

3135

3133

3136

#: bzrlib/builtins.py:4268

3134

#: bzrlib/builtins.py:4281

3137

3135

msgid ""

3138

3136

"If there is no default branch set, the first merge will set it (use\n"

3139

3137

"--no-remember to avoid setting it). After that, you can omit the branch\n"

3146

3144

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

3147

3145

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

3148

3146

3149

#: bzrlib/builtins.py:4273

3147

#: bzrlib/builtins.py:4286

3150

3148

msgid ""

3151

3149

"The results of the merge are placed into the destination working\n"

3152

3150

"directory, where they can be reviewed (with bzr diff), tested, and then\n"

3155

3153

"マージの結果はマージ先の作業ツリー内に反映され、そこで(bzr diffを使って)\n"

3156

3154

"レビューしたり、テストをしたあとで、コミットによって記録することができます。"

3157

3155

3158

#: bzrlib/builtins.py:4277

3156

#: bzrlib/builtins.py:4290

3159

3157

msgid ""

3160

3158

"merge refuses to run if there are any uncommitted changes, unless\n"

3161

3159

"--force is given. If --force is given, then the changes from the source \n"

3168

3166

"マージ元の変更がマージされます。--forceオプションを使えば、２つ以上の親を持つ\n"

3169

3167

"マージリビジョンを作ることもできます。"

3170

3168

3171

#: bzrlib/builtins.py:4283

3169

#: bzrlib/builtins.py:4296

3172

3170

msgid ""

3173

3171

"If one would like to merge changes from the working tree of the other\n"

3174

3172

"branch without merging any committed revisions, the --uncommitted option\n"

3177

3175

"コミット済みの変更ではなく、作業ツリー上での変更を別のブランチにマージしたい\n"

3178

3176

"場合は、--uncommittedオプションを指定することができます。"

3179

3177

3180

#: bzrlib/builtins.py:4287

3178

#: bzrlib/builtins.py:4300

3181

3179

msgid ""

3182

3180

"To select only some changes to merge, use \"merge -i\", which will prompt\n"

3183

3181

"you to apply each diff hunk and file change, similar to \"shelve\"."

3185

3183

"変更を部分的にマージしたければ、\"merge -i\"を使用すれば、\"shelve\"と同じ\n"

3186

3184

"ようにそれぞれのハンクをプロンプトで選択して適用することができます。"

3187

3185

3188

#: bzrlib/builtins.py:4290

3186

#: bzrlib/builtins.py:4303

3189

3187

msgid ""

3190

3188

":Examples:\n"

3191

3189

" To merge all new revisions from bzr.dev::"

3193

3191

":例:\n"

3194

3192

" bzr.devから全ての新しいリビジョンをマージします。::"

3195

3193

3196

#: bzrlib/builtins.py:4293

3194

#: bzrlib/builtins.py:4306

3197

3195

msgid " bzr merge ../bzr.dev"

3198

3196

msgstr " bzr merge ../bzr.dev"

3199

3197

3200

#: bzrlib/builtins.py:4295

3198

#: bzrlib/builtins.py:4308

3201

3199

msgid " To merge changes up to and including revision 82 from bzr.dev::"

3202

3200

msgstr " bzr.devから、リビジョン82まで(82も含む)のリビジョンをマージします::"

3203

3201

3204

#: bzrlib/builtins.py:4297

3202

#: bzrlib/builtins.py:4310

3205

3203

msgid " bzr merge -r 82 ../bzr.dev"

3206

3204

msgstr " bzr merge -r 82 ../bzr.dev"

3207

3205

3208

#: bzrlib/builtins.py:4299

3206

#: bzrlib/builtins.py:4312

3209

3207

msgid " To merge the changes introduced by 82, without previous changes::"

3210

3208

msgstr " リビジョン82での変更をマージし、それ以前の変更はマージしません。::"

3211

3209

3212

#: bzrlib/builtins.py:4301

3210

#: bzrlib/builtins.py:4314

3213

3211

msgid " bzr merge -r 81..82 ../bzr.dev"

3214

3212

msgstr " bzr merge -r 81..82 ../bzr.dev"

3215

3213

3216

#: bzrlib/builtins.py:4303

3214

#: bzrlib/builtins.py:4316

3217

3215

msgid " To apply a merge directive contained in /tmp/merge::"

3218

3216

msgstr " /tmp/merge内のマージディレクティブを適用します。::"

3219

3217

3220

#: bzrlib/builtins.py:4305

3218

#: bzrlib/builtins.py:4318

3221

3219

msgid " bzr merge /tmp/merge"

3222

3220

msgstr " bzr merge /tmp/merge"

3223

3221

3224

#: bzrlib/builtins.py:4307

3222

#: bzrlib/builtins.py:4320

3225

3223

msgid ""

3226

3224

" To create a merge revision with three parents from two branches\n"

3227

3225

" feature1a and feature1b:"

3229

3227

" feature1a、feature1bの２つのブランチから、３つの親を持つマージ\n"

3230

3228

" リビジョンを作ります。::"

3231

3229

3232

#: bzrlib/builtins.py:4310

3230

#: bzrlib/builtins.py:4323

3233

3231

msgid ""

3234

3232

" bzr merge ../feature1a\n"

3235

3233

" bzr merge ../feature1b --force\n"

3239

3237

" bzr merge ../feature1b --force\n"

3240

3238

" bzr commit -m 'revision with three parents'"

3241

3239

3242

#: bzrlib/builtins.py:4322

3240

#: bzrlib/builtins.py:4335

3243

3241

msgid "Merge even if the destination tree has uncommitted changes."

3244

3242

msgstr "マージ先のツリーにコミットしていない変更があってもマージします。"

3245

3243

3246

#: bzrlib/builtins.py:4328

3244

#: bzrlib/builtins.py:4341

3247

3245

msgid ""

3248

3246

"Apply uncommitted changes from a working copy, instead of branch changes."

3249

3247

msgstr "ブランチの変更ではなく、作業コピー上のコミットしていない変更をマージします。"

3250

3248

3251

#: bzrlib/builtins.py:4330

3249

#: bzrlib/builtins.py:4343

3252

3250

msgid ""

3253

3251

"If the destination is already completely merged into the source, pull from "

3254

3252

"the source rather than merging. When this happens, you do not need to "

3257

3255

"マージ先のリビジョンがマージ元のブランチにすべて含まれている場合、マージの\n"

3258

3256

"かわりにpullを実行します。その場合は、コミットする必要はありません。"

3259

3257

3260

#: bzrlib/builtins.py:4335

3258

#: bzrlib/builtins.py:4348

3261

3259

msgid ""

3262

3260

"Branch to merge into, rather than the one containing the working directory."

3263

3261

msgstr "作業ディレクトリ以外にマージする場合の、マージ先のブランチ。"

3264

3262

3265

#: bzrlib/builtins.py:4337

3263

#: bzrlib/builtins.py:4350

3266

3264

msgid "Instead of merging, show a diff of the merge."

3267

3265

msgstr "マージを実行するかわりに、マージされる内容のdiffを表示します。"

3268

3266

3269

#: bzrlib/builtins.py:4339

3267

#: bzrlib/builtins.py:4352

3270

3268

msgid "Select changes interactively."

3271

3269

msgstr "変更をインタラクティブに選択します。"

3272

3270

3273

#: bzrlib/builtins.py:4361

3271

#: bzrlib/builtins.py:4374

3274

3272

msgid ""

3275

3273

"Merging into empty branches not currently supported, "

3276

3274

"https://bugs.launchpad.net/bzr/+bug/308562"

3277

3275

msgstr ""

3278

3276

"空ブランチへのマージは今のところサポートされていません。https://bugs.launchpad.net/bzr/+bug/308562"

3279

3277

3280

#: bzrlib/builtins.py:4388

3278

#: bzrlib/builtins.py:4401

3281

3279

msgid "Cannot use --uncommitted with bundles or merge directives."

3282

3280

msgstr "バンドル、マージディレクティブに対して--uncommittedを指定することはできません。"

3283

3281

3284

#: bzrlib/builtins.py:4399

3282

#: bzrlib/builtins.py:4412

3285

3283

msgid "Cannot use --uncommitted and --revision at the same time."

3286

3284

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

3287

3285

3288

#: bzrlib/builtins.py:4419

3286

#: bzrlib/builtins.py:4432

3289

3287

msgid "merger: "

3290

3288

msgstr ""

3291

3289

3292

#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71

3290

#: bzrlib/builtins.py:4434 bzrlib/bundle/apply_bundle.py:71

3293

3291

msgid "Nothing to do."

3294

3292

msgstr "なにもすることがありません。"

3295

3293

3296

#: bzrlib/builtins.py:4425

3294

#: bzrlib/builtins.py:4438

3297

3295

msgid "Cannot pull individual files"

3298

3296

msgstr "ファイルを個別にpullすることはできません。"

3299

3297

3300

#: bzrlib/builtins.py:4433

3298

#: bzrlib/builtins.py:4446

3301

3299

msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"

3302

3300

msgstr "ブランチにコミットがありません。('bzr pull'を使うべきかもしれません)"

3303

3301

3304

#: bzrlib/builtins.py:4491

3302

#: bzrlib/builtins.py:4504

3305

3303

#, python-format

3306

3304

msgid "Show-base is not supported for this merge type. %s"

3307

3305

msgstr "Show-baseはこのマージタイプではサポートされません。 %s"

3308

3306

3309

#: bzrlib/builtins.py:4500

3307

#: bzrlib/builtins.py:4513

3310

3308

#, python-format

3311

3309

msgid "Conflict reduction is not supported for merge type %s."

3312

3310

msgstr "衝突の縮小化は、このマージタイプではサポートされません。 %s"

3313

3311

3314

#: bzrlib/builtins.py:4504

3312

#: bzrlib/builtins.py:4517

3315

3313

msgid "Cannot do conflict reduction and show base."

3316

3314

msgstr "衝突の縮小化、ベースの表示ができませんでした。"

3317

3315

3318

#: bzrlib/builtins.py:4615

3316

#: bzrlib/builtins.py:4628

3319

3317

msgid "No location specified or remembered"

3320

3318

msgstr "対象の場所が設定も指定もされていません。"

3321

3319

3322

#: bzrlib/builtins.py:4617

3320

#: bzrlib/builtins.py:4630

3323

3321

msgid "{0} remembered {1} location {2}"

3324

3322

msgstr "{0} 設定された {1} の場所 {2}"

3325

3323

3326

#: bzrlib/builtins.py:4623

3324

#: bzrlib/builtins.py:4636

3327

3325

msgid "Redo a merge."

3328

3326

msgstr "マージをやりなおします。"

3329

3327

3330

#: bzrlib/builtins.py:4625

3328

#: bzrlib/builtins.py:4638

3331

3329

msgid ""

3332

3330

"Use this if you want to try a different merge technique while resolving\n"

3333

3331

"conflicts. Some merge techniques are better than others, and remerge\n"

3337

3335

"使用します。他のものより優れたマージ方法があり、remergeを使って個々の\n"

3338

3336

"ファイルに別のマージ方法を試すことができます。"

3339

3337

3340

#: bzrlib/builtins.py:4629

3338

#: bzrlib/builtins.py:4642

3341

3339

msgid ""

3342

3340

"The options for remerge have the same meaning and defaults as the ones for\n"

3343

3341

"merge. The difference is that remerge can (only) be run when there is a\n"

3347

3345

"remergeはマージ中状態のときだけ実行でき、特定のファイルを指定できる\n"

3348

3346

"ということです。"

3349

3347

3350

#: bzrlib/builtins.py:4633

3348

#: bzrlib/builtins.py:4646

3351

3349

msgid ""

3352

3350

":Examples:\n"

3353

3351

" Re-do the merge of all conflicted files, and show the base text in\n"

3357

3355

" すべての衝突したファイルのマージをやり直し、通常のTHIS、OTHERの\n"

3358

3356

" テキストにくわえて衝突した領域のベーステキストを表示します。::"

3359

3357

3360

#: bzrlib/builtins.py:4637

3358

#: bzrlib/builtins.py:4650

3361

3359

msgid " bzr remerge --show-base"

3362

3360

msgstr " bzr remerge --show-base"

3363

3361

3364

#: bzrlib/builtins.py:4639

3362

#: bzrlib/builtins.py:4652

3365

3363

msgid ""

3366

3364

" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"

3367

3365

" additional processing to reduce the size of conflict regions::"

3369

3367

" \"foobar\"のマージを、weaveマージアルゴリズムでやりなおし、衝突領域の\n"

3370

3368

" 縮小化処理も行います。::"

3371

3369

3372

#: bzrlib/builtins.py:4642

3370

#: bzrlib/builtins.py:4655

3373

3371

msgid " bzr remerge --merge-type weave --reprocess foobar"

3374

3372

msgstr " bzr remerge --merge-type weave --reprocess foobar"

3375

3373

3376

#: bzrlib/builtins.py:4649

3374

#: bzrlib/builtins.py:4662

3377

3375

msgid "Show base revision text in conflicts."

3378

3376

msgstr "衝突したベースリビジョンのテキストを表示します。"

3379

3377

3380

#: bzrlib/builtins.py:4661

3378

#: bzrlib/builtins.py:4674

3381

3379

msgid ""

3382

3380

"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"

3383

3381

"merges."

3385

3383

"remergeは通常のマージ後にだけ実行できます。チェリーピックや複数マージでは\r\n"

3386

3384

"利用できません。"

3387

3385

3388

#: bzrlib/builtins.py:4717

3386

#: bzrlib/builtins.py:4731

3389

3387

msgid "Revert files to a previous revision."

3390

3388

msgstr "ファイルを過去のリビジョンに戻します。"

3391

3389

3392

#: bzrlib/builtins.py:4719

3390

#: bzrlib/builtins.py:4733

3393

3391

msgid ""

3394

3392

"Giving a list of files will revert only those files. Otherwise, all files\n"

3395

3393

"will be reverted. If the revision is not specified with '--revision', the\n"

3400

3398

"リビジョンを指定しない場合は、最後にコミットされたリビジョンが使用\n"

3401

3399

"されます。"

3402

3400

3403

#: bzrlib/builtins.py:4723

3401

#: bzrlib/builtins.py:4737

3404

3402

msgid ""

3405

3403

"To remove only some changes, without reverting to a prior version, use\n"

3406

3404

"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"

3414

3412

"除くことができます。特定の変更をハンクごと取り除く方法は、shelveをご覧\n"

3415

3413

"ください。"

3416

3414

3417

#: bzrlib/builtins.py:4729

3415

#: bzrlib/builtins.py:4743

3418

3416

msgid ""

3419

3417

"By default, any files that have been manually changed will be backed up\n"

3420

3418

"first. (Files changed only by merge are not backed up.) Backup files have\n"

3424

3422

"コマンドで変更されただけのファイルはバックアップされません)バックアップ\n"

3425

3423

"ファイル名は、元の名前に「.~#~」(#は数字)を付け足したものになります。"

3426

3424

3427

#: bzrlib/builtins.py:4733

3425

#: bzrlib/builtins.py:4747

3428

3426

msgid ""

3429

3427

"When you provide files, you can use their current pathname or the pathname\n"

3430

3428

"from the target revision. So you can use revert to \"undelete\" a file by\n"

3436

3434

"revertを使うことができます。ディレクトリを指定した場合は、その配下のすべての\n"

3437

3435

"変更が取り消されます。"

3438

3436

3439

#: bzrlib/builtins.py:4738

3437

#: bzrlib/builtins.py:4752

3440

3438

msgid ""

3441

3439

"If you have newly added files since the target revision, they will be\n"

3442

3440

"removed. If the files to be removed have been changed, backups will be\n"

3448

3446

"バックアップされます。バージョン管理外のファイルを含むディレクトリは削除され\n"

3449

3447

"ません。"

3450

3448

3451

#: bzrlib/builtins.py:4743

3449

#: bzrlib/builtins.py:4757

3452

3450

msgid ""

3453

3451

"The working tree contains a list of revisions that have been merged but\n"

3454

3452

"not yet committed. These revisions will be included as additional parents\n"

3460

3458

"reverting any files."

3461

3459

msgstr ""

3462

3460

3463

#: bzrlib/builtins.py:4752

3461

#: bzrlib/builtins.py:4766

3464

3462

msgid ""

3465

3463

"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"

3466

3464

"changes from a branch in a single revision. To do this, perform the merge\n"

3474

3472

"target branches."

3475

3473

msgstr ""

3476

3474

3477

#: bzrlib/builtins.py:4766

3475

#: bzrlib/builtins.py:4780

3478

3476

msgid "Do not save backups of reverted files."

3479

3477

msgstr ""

3480

3478

3481

#: bzrlib/builtins.py:4768

3479

#: bzrlib/builtins.py:4782

3482

3480

msgid "Remove pending merge marker, without changing any files."

3483

3481

msgstr ""

3484

3482

3485

#: bzrlib/builtins.py:4799

3483

#: bzrlib/builtins.py:4813

3486

3484

msgid ""

3487

3485

"Show help on a command or other topic.\n"

3488

3486

" "

3490

3488

"コマンドもしくは他のトピックのヘルプを表示する。\n"

3491

3489

" "

3492

3490

3493

#: bzrlib/builtins.py:4804

3491

#: bzrlib/builtins.py:4818

3494

3492

msgid "Show help on all commands."

3495

3493

msgstr "全てのコマンドのヘルプを表示する。"

3496

3494

3497

#: bzrlib/builtins.py:4833

3495

#: bzrlib/builtins.py:4847

3498

3496

msgid "Show unmerged/unpulled revisions between two branches."

3499

3497

msgstr "2つのブランチの間のmergeされていない/pullされていないリビジョンを表示する。"

3500

3498

3501

#: bzrlib/builtins.py:4835

3499

#: bzrlib/builtins.py:4849

3502

3500

msgid "OTHER_BRANCH may be local or remote."

3503

3501

msgstr "OTHER_BRANCHはlocalもしくはremoteになります。"

3504

3502

3505

#: bzrlib/builtins.py:4837

3503

#: bzrlib/builtins.py:4851

3506

3504

msgid ""

3507

3505

"To filter on a range of revisions, you can use the command -r begin..end\n"

3508

3506

"-r revision requests a specific revision, -r ..end or -r begin.. are\n"

3513

3511

" 0 - no missing revisions"

3514

3512

msgstr ""

3515

3513

3516

#: bzrlib/builtins.py:4847

3514

#: bzrlib/builtins.py:4861

3517

3515

msgid ""

3518

3516

" Determine the missing revisions between this and the branch at the\n"

3519

3517

" remembered pull location::"

3520

3518

msgstr ""

3521

3519

3522

#: bzrlib/builtins.py:4850

3520

#: bzrlib/builtins.py:4864

3523

3521

msgid " bzr missing"

3524

3522

msgstr " bzr missing"

3525

3523

3526

#: bzrlib/builtins.py:4852

3524

#: bzrlib/builtins.py:4866

3527

3525

msgid " Determine the missing revisions between this and another branch::"

3528

3526

msgstr ""

3529

3527

3530

#: bzrlib/builtins.py:4854

3528

#: bzrlib/builtins.py:4868

3531

3529

msgid " bzr missing http://server/branch"

3532

3530

msgstr " bzr missing http://server/branch"

3533

3531

3534

#: bzrlib/builtins.py:4856

3532

#: bzrlib/builtins.py:4870

3535

3533

msgid ""

3536

3534

" Determine the missing revisions up to a specific revision on the other\n"

3537

3535

" branch::"

3538

3536

msgstr ""

3539

3537

3540

#: bzrlib/builtins.py:4859

3538

#: bzrlib/builtins.py:4873

3541

3539

msgid " bzr missing -r ..-10"

3542

3540

msgstr " bzr missing -r ..-10"

3543

3541

3544

#: bzrlib/builtins.py:4861

3542

#: bzrlib/builtins.py:4875

3545

3543

msgid ""

3546

3544

" Determine the missing revisions up to a specific revision on this\n"

3547

3545

" branch::"

3548

3546

msgstr ""

3549

3547

3550

#: bzrlib/builtins.py:4864

3548

#: bzrlib/builtins.py:4878

3551

3549

msgid " bzr missing --my-revision ..-10"

3552

3550

msgstr " bzr missing --my-revision ..-10"

3553

3551

3554

#: bzrlib/builtins.py:4871

3552

#: bzrlib/builtins.py:4885

3555

3553

msgid "Reverse the order of revisions."

3556

3554

msgstr "リビジョンの表示順を逆転する。"

3557

3555

3558

#: bzrlib/builtins.py:4873

3556

#: bzrlib/builtins.py:4887

3559

3557

msgid "Display changes in the local branch only."

3560

3558

msgstr "ローカルブランチの変更のみを表示する。"

3561

3559

3562

#: bzrlib/builtins.py:4874

3560

#: bzrlib/builtins.py:4888

3563

3561

msgid "Same as --mine-only."

3564

3562

msgstr "--mine-onlyと同じ。"

3565

3563

3566

#: bzrlib/builtins.py:4876

3564

#: bzrlib/builtins.py:4890

3567

3565

msgid "Display changes in the remote branch only."

3568

3566

msgstr "リモートブランチの変更のみを表示する。"

3569

3567

3570

#: bzrlib/builtins.py:4877

3568

#: bzrlib/builtins.py:4891

3571

3569

msgid "Same as --theirs-only."

3572

3570

msgstr "--theirs-onlyと同じ。"

3573

3571

3574

#: bzrlib/builtins.py:4882

3572

#: bzrlib/builtins.py:4896

3575

3573

msgid ""

3576

3574

"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "

3577

3575

"details."

3578

3576

msgstr ""

3579

3577

3580

#: bzrlib/builtins.py:4886

3578

#: bzrlib/builtins.py:4900

3581

3579

msgid ""

3582

3580

"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "

3583

3581

"details."

3584

3582

msgstr ""

3585

3583

3586

#: bzrlib/builtins.py:4889

3584

#: bzrlib/builtins.py:4903

3587

3585

msgid "Show all revisions in addition to the mainline ones."

3588

3586

msgstr ""

3589

3587

3590

#: bzrlib/builtins.py:4943

3588

#: bzrlib/builtins.py:4957

3591

3589

msgid "No peer location known or specified."

3592

3590

msgstr ""

3593

3591

3594

#: bzrlib/builtins.py:4947

3592

#: bzrlib/builtins.py:4961

3595

3593

msgid "Using saved parent location: {0}\n"

3596

3594

msgstr ""

3597

3595

3598

#: bzrlib/builtins.py:4980

3596

#: bzrlib/builtins.py:4994

3599

3597

#, python-format

3600

3598

msgid "You have %d extra revision:\n"

3601

3599

msgid_plural "You have %d extra revisions:\n"

3602

3600

msgstr[0] ""

3603

3601

msgstr[1] ""

3604

3602

3605

#: bzrlib/builtins.py:4996

3603

#: bzrlib/builtins.py:5010

3606

3604

#, python-format

3607

3605

msgid "You are missing %d revision:\n"

3608

3606

msgid_plural "You are missing %d revisions:\n"

3609

3607

msgstr[0] ""

3610

3608

msgstr[1] ""

3611

3609

3612

#: bzrlib/builtins.py:5008

3610

#: bzrlib/builtins.py:5022

3613

3611

msgid "This branch has no new revisions.\n"

3614

3612

msgstr ""

3615

3613

3616

#: bzrlib/builtins.py:5011

3614

#: bzrlib/builtins.py:5025

3617

3615

msgid "Other branch has no new revisions.\n"

3618

3616

msgstr ""

3619

3617

3620

#: bzrlib/builtins.py:5016

3618

#: bzrlib/builtins.py:5030

3621

3619

msgid "Branches are up to date.\n"

3622

3620

msgstr ""

3623

3621

3624

#: bzrlib/builtins.py:5027

3622

#: bzrlib/builtins.py:5041

3625

3623

msgid "Compress the data within a repository."

3626

3624

msgstr "リポジトリ内のデータを圧縮する。"

3627

3625

3628

#: bzrlib/builtins.py:5029

3626

#: bzrlib/builtins.py:5043

3629

3627

msgid ""

3630

3628

"This operation compresses the data within a bazaar repository. As\n"

3631

3629

"bazaar supports automatic packing of repository, this operation is\n"

3632

3630

"normally not required to be done manually."

3633

3631

msgstr ""

3634

3632

3635

#: bzrlib/builtins.py:5033

3633

#: bzrlib/builtins.py:5047

3636

3634

msgid ""

3637

3635

"During the pack operation, bazaar takes a backup of existing repository\n"

3638

3636

"data, i.e. pack files. This backup is eventually removed by bazaar\n"

3641

3639

"used."

3642

3640

msgstr ""

3643

3641

3644

#: bzrlib/builtins.py:5039

3642

#: bzrlib/builtins.py:5053

3645

3643

msgid ""

3646

3644

"Warning: If you use --clean-obsolete-packs and your machine crashes\n"

3647

3645

"during or immediately after repacking, you may be left with a state\n"

3649

3647

"been. In this case the repository may be unusable."

3650

3648

msgstr ""

3651

3649

3652

#: bzrlib/builtins.py:5048

3650

#: bzrlib/builtins.py:5062

3653

3651

msgid "Delete obsolete packs to save disk space."

3654

3652

msgstr ""

3655

3653

3656

#: bzrlib/builtins.py:5062

3654

#: bzrlib/builtins.py:5076

3657

3655

msgid "List the installed plugins."

3658

3656

msgstr "インストールされたプラグインの一覧を表示する。"

3659

3657

3660

#: bzrlib/builtins.py:5064

3658

#: bzrlib/builtins.py:5078

3661

3659

msgid ""

3662

3660

"This command displays the list of installed plugins including\n"

3663

3661

"version of plugin and a short description of each."

3665

3663

"このコマンドはインストールされたプラグインの一覧を簡単な説明や\n"

3666

3664

"バージョン情報とともに表示します。"

3667

3665

3668

#: bzrlib/builtins.py:5067

3666

#: bzrlib/builtins.py:5081

3669

3667

msgid "--verbose shows the path where each plugin is located."

3670

3668

msgstr "--verboseを指定すると各プラグインのインストール先のパスが表示されます。"

3671

3669

3672

#: bzrlib/builtins.py:5069

3670

#: bzrlib/builtins.py:5083

3673

3671

msgid ""

3674

3672

"A plugin is an external component for Bazaar that extends the\n"

3675

3673

"revision control system, by adding or replacing code in Bazaar.\n"

3678

3676

"customizing log output."

3679

3677

msgstr ""

3680

3678

3681

#: bzrlib/builtins.py:5075

3679

#: bzrlib/builtins.py:5089

3682

3680

msgid ""

3683

3681

"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"

3684

3682

"for further information on plugins including where to find them and how to\n"

3686

3684

"plugins using the Python programming language."

3687

3685

msgstr ""

3688

3686

3689

#: bzrlib/builtins.py:5091

3687

#: bzrlib/builtins.py:5105

3690

3688

msgid "Show testament (signing-form) of a revision."

3691

3689

msgstr ""

3692

3690

3693

#: bzrlib/builtins.py:5094

3691

#: bzrlib/builtins.py:5108

3694

3692

msgid "Produce long-format testament."

3695

3693

msgstr ""

3696

3694

3697

#: bzrlib/builtins.py:5096

3695

#: bzrlib/builtins.py:5110

3698

3696

msgid "Produce a strict-format testament."

3699

3697

msgstr ""

3700

3698

3701

#: bzrlib/builtins.py:5122

3699

#: bzrlib/builtins.py:5136

3702

3700

msgid "Show the origin of each line in a file."

3703

3701

msgstr ""

3704

3702

3705

#: bzrlib/builtins.py:5124

3703

#: bzrlib/builtins.py:5138

3706

3704

msgid ""

3707

3705

"This prints out the given file with an annotation on the left side\n"

3708

3706

"indicating which revision, author and date introduced the change."

3709

3707

msgstr ""

3710

3708

3711

#: bzrlib/builtins.py:5127

3709

#: bzrlib/builtins.py:5141

3712

3710

msgid ""

3713

3711

"If the origin is the same for a run of consecutive lines, it is\n"

3714

3712

"shown only at the top, unless the --all option is given."

3715

3713

msgstr ""

3716

3714

3717

#: bzrlib/builtins.py:5135

3715

#: bzrlib/builtins.py:5149

3718

3716

msgid "Show annotations on all lines."

3719

3717

msgstr ""

3720

3718

3721

#: bzrlib/builtins.py:5136

3719

#: bzrlib/builtins.py:5150

3722

3720

msgid "Show commit date in annotations."

3723

3721

msgstr ""

3724

3722

3725

#: bzrlib/builtins.py:5223

3723

#: bzrlib/builtins.py:5237

3726

3724

msgid "Cannot sign a range of non-revision-history revisions"

3727

3725

msgstr ""

3728

3726

3729

#: bzrlib/builtins.py:5235

3727

#: bzrlib/builtins.py:5249

3730

3728

msgid "Please supply either one revision, or a range."

3731

3729

msgstr ""

3732

3730

3733

#: bzrlib/builtins.py:5239

3731

#: bzrlib/builtins.py:5253

3734

3732

msgid ""

3735

3733

"Convert the current branch into a checkout of the supplied branch.\n"

3736

3734

"If no branch is supplied, rebind to the last bound location."

3737

3735

msgstr ""

3738

3736

3739

#: bzrlib/builtins.py:5242

3737

#: bzrlib/builtins.py:5256

3740

3738

msgid ""

3741

3739

"Once converted into a checkout, commits must succeed on the master branch\n"

3742

3740

"before they will be applied to the local branch."

3743

3741

msgstr ""

3744

3742

3745

#: bzrlib/builtins.py:5245

3743

#: bzrlib/builtins.py:5259

3746

3744

msgid ""

3747

3745

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

3748

3746

"locally, in which case binding will update the local nickname to be\n"

3749

3747

"that of the master."

3750

3748

msgstr ""

3751

3749

3752

#: bzrlib/builtins.py:5260

3750

#: bzrlib/builtins.py:5274

3753

3751

msgid "No location supplied. This format does not remember old locations."

3754

3752

msgstr ""

3755

3753

3756

#: bzrlib/builtins.py:5265

3754

#: bzrlib/builtins.py:5280

3757

3755

msgid "Branch is already bound"

3758

3756

msgstr ""

3759

3757

3760

#: bzrlib/builtins.py:5267

3758

#: bzrlib/builtins.py:5283

3761

3759

msgid "No location supplied and no previous location known"

3762

3760

msgstr ""

3763

3761

3764

#: bzrlib/builtins.py:5273

3762

#: bzrlib/builtins.py:5289

3765

3763

msgid "These branches have diverged. Try merging, and then bind again."

3766

3764

msgstr ""

3767

3765

3768

#: bzrlib/builtins.py:5280

3766

#: bzrlib/builtins.py:5296

3769

3767

msgid "Convert the current checkout into a regular branch."

3770

3768

msgstr ""

3771

3769

3772

#: bzrlib/builtins.py:5282

3770

#: bzrlib/builtins.py:5298

3773

3771

msgid ""

3774

3772

"After unbinding, the local branch is considered independent and subsequent\n"

3775

3773

"commits will be local only."

3776

3774

msgstr ""

3777

3775

3778

#: bzrlib/builtins.py:5293

3776

#: bzrlib/builtins.py:5309

3779

3777

msgid "Local branch is not bound"

3780

3778

msgstr ""

3781

3779

3782

#: bzrlib/builtins.py:5297

3780

#: bzrlib/builtins.py:5313

3783

3781

msgid "Remove the last committed revision."

3784

3782

msgstr ""

3785

3783

3786

#: bzrlib/builtins.py:5299

3784

#: bzrlib/builtins.py:5315

3787

3785

msgid ""

3788

3786

"--verbose will print out what is being removed.\n"

3789

3787

"--dry-run will go through all the motions, but not actually\n"

3790

3788

"remove anything."

3791

3789

msgstr ""

3792

3790

3793

#: bzrlib/builtins.py:5303

3791

#: bzrlib/builtins.py:5319

3794

3792

msgid ""

3795

3793

"If --revision is specified, uncommit revisions to leave the branch at the\n"

3796

3794

"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"

3797

3795

"branch at revision 15."

3798

3796

msgstr ""

3799

3797

3800

#: bzrlib/builtins.py:5307

3798

#: bzrlib/builtins.py:5323

3801

3799

msgid ""

3802

3800

"Uncommit leaves the working tree ready for a new commit. The only change\n"

3803

3801

"it may make is to restore any pending merges that were present before\n"

3804

3802

"the commit."

3805

3803

msgstr ""

3806

3804

3807

#: bzrlib/builtins.py:5318

3805

#: bzrlib/builtins.py:5334

3808

3806

msgid "Don't actually make changes."

3809

3807

msgstr ""

3810

3808

3811

#: bzrlib/builtins.py:5319

3809

#: bzrlib/builtins.py:5335

3812

3810

msgid "Say yes to all questions."

3813

3811

msgstr ""

3814

3812

3815

#: bzrlib/builtins.py:5321

3813

#: bzrlib/builtins.py:5337

3816

3814

msgid "Keep tags that point to removed revisions."

3817

3815

msgstr ""

3818

3816

3819

#: bzrlib/builtins.py:5323

3817

#: bzrlib/builtins.py:5339

3820

3818

msgid "Only remove the commits from the local branch when in a checkout."

3821

3819

msgstr ""

3822

3820

3823

#: bzrlib/builtins.py:5372

3821

#: bzrlib/builtins.py:5388

3824

3822

msgid "No revisions to uncommit.\n"

3825

3823

msgstr ""

3826

3824

3827

#: bzrlib/builtins.py:5387

3825

#: bzrlib/builtins.py:5403

3828

3826

msgid "Dry-run, pretending to remove the above revisions.\n"

3829

3827

msgstr ""

3830

3828

3831

#: bzrlib/builtins.py:5390

3829

#: bzrlib/builtins.py:5406

3832

3830

msgid "The above revision(s) will be removed.\n"

3833

3831

msgstr ""

3834

3832

3835

#: bzrlib/builtins.py:5394

3833

#: bzrlib/builtins.py:5410

3836

3834

msgid "Uncommit these revisions"

3837

3835

msgstr ""

3838

3836

3839

#: bzrlib/builtins.py:5397

3837

#: bzrlib/builtins.py:5413

3840

3838

msgid "Canceled\n"

3841

3839

msgstr ""

3842

3840

3843

#: bzrlib/builtins.py:5404

3841

#: bzrlib/builtins.py:5420

3844

3842

#, python-format

3845

3843

msgid ""

3846

3844

"You can restore the old tip by running:\n"

3847

3845

" bzr pull . -r revid:%s\n"

3848

3846

msgstr ""

3849

3847

3850

#: bzrlib/builtins.py:5409

3848

#: bzrlib/builtins.py:5425

3851

3849

msgid "Break a dead lock."

3852

3850

msgstr ""

3853

3851

3854

#: bzrlib/builtins.py:5411

3852

#: bzrlib/builtins.py:5427

3855

3853

msgid ""

3856

3854

"This command breaks a lock on a repository, branch, working directory or\n"

3857

3855

"config file."

3858

3856

msgstr ""

3859

3857

3860

#: bzrlib/builtins.py:5414

3858

#: bzrlib/builtins.py:5430

3861

3859

msgid ""

3862

3860

"CAUTION: Locks should only be broken when you are sure that the process\n"

3863

3861

"holding the lock has been stopped."

3864

3862

msgstr ""

3865

3863

3866

#: bzrlib/builtins.py:5417

3864

#: bzrlib/builtins.py:5433

3867

3865

msgid ""

3868

3866

"You can get information on what locks are open via the 'bzr info\n"

3869

3867

"[location]' command."

3870

3868

msgstr ""

3871

3869

3872

#: bzrlib/builtins.py:5420

3870

#: bzrlib/builtins.py:5436

3873

3871

msgid ""

3874

3872

":Examples:\n"

3875

3873

" bzr break-lock\n"

3877

3875

" bzr break-lock --conf ~/.bazaar"

3878

3876

msgstr ""

3879

3877

3880

#: bzrlib/builtins.py:5429

3878

#: bzrlib/builtins.py:5445

3881

3879

msgid "LOCATION is the directory where the config lock is."

3882

3880

msgstr ""

3883

3881

3884

#: bzrlib/builtins.py:5431

3882

#: bzrlib/builtins.py:5447

3885

3883

msgid "Do not ask for confirmation before breaking the lock."

3886

3884

msgstr ""

3887

3885

3888

#: bzrlib/builtins.py:5466

3886

#: bzrlib/builtins.py:5482

3889

3887

msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"

3890

3888

msgstr ""

3891

3889

3892

#: bzrlib/builtins.py:5467

3890

#: bzrlib/builtins.py:5483

3893

3891

msgid "Run the bzr server."

3894

3892

msgstr ""

3895

3893

3896

#: bzrlib/builtins.py:5473

3894

#: bzrlib/builtins.py:5489

3897

3895

msgid "Serve on stdin/out for use from inetd or sshd."

3898

3896

msgstr ""

3899

3897

3900

#: bzrlib/builtins.py:5474

3898

#: bzrlib/builtins.py:5490

3901

3899

msgid "protocol"

3902

3900

msgstr ""

3903

3901

3904

#: bzrlib/builtins.py:5475

3902

#: bzrlib/builtins.py:5491

3905

3903

msgid "Protocol to serve."

3906

3904

msgstr ""

3907

3905

3908

#: bzrlib/builtins.py:5479

3906

#: bzrlib/builtins.py:5495

3907

msgid "Listen for connections on nominated address."

3908

msgstr ""

3909

3910

#: bzrlib/builtins.py:5497

3909

3911

msgid ""

3910

"Listen for connections on nominated port of the form [hostname:]portnumber. "

3911

"Passing 0 as the port number will result in a dynamically allocated port. "

3912

"The default port depends on the protocol."

3912

"Listen for connections on nominated port. Passing 0 as the port number will "

3913

"result in a dynamically allocated port. The default port depends on the "

3914

"protocol."

3913

3915

msgstr ""

3914

3916

3915

#: bzrlib/builtins.py:5485

3917

#: bzrlib/builtins.py:5502

3916

3918

msgid "Serve contents of this directory."

3917

3919

msgstr ""

3918

3920

3919

#: bzrlib/builtins.py:5487

3921

#: bzrlib/builtins.py:5504

3920

3922

msgid ""

3921

3923

"By default the server is a readonly server. Supplying --allow-writes "

3922

3924

"enables write access to the contents of the served directory and below. "

3925

3927

"uncontrolled write access to your file system."

3926

3928

msgstr ""

3927

3929

3928

#: bzrlib/builtins.py:5496

3930

#: bzrlib/builtins.py:5513

3929

3931

msgid "Override the default idle client timeout (5min)."

3930

3932

msgstr ""

3931

3933

3932

#: bzrlib/builtins.py:5546

3934

#: bzrlib/builtins.py:5531

3933

3935

msgid "Combine a tree into its containing tree."

3934

3936

msgstr ""

3935

3937

3936

#: bzrlib/builtins.py:5548

3938

#: bzrlib/builtins.py:5533

3937

3939

msgid "This command requires the target tree to be in a rich-root format."

3938

3940

msgstr ""

3939

3941

3940

#: bzrlib/builtins.py:5550

3942

#: bzrlib/builtins.py:5535

3941

3943

msgid ""

3942

3944

"The TREE argument should be an independent tree, inside another tree, but\n"

3943

3945

"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"

3944

3946

"running \"bzr branch\" with the target inside a tree.)"

3945

3947

msgstr ""

3946

3948

3947

#: bzrlib/builtins.py:5554

3949

#: bzrlib/builtins.py:5539

3948

3950

msgid ""

3949

3951

"The result is a combined tree, with the subtree no longer an independent\n"

3950

3952

"part. This is marked as a merge of the subtree into the containing tree,\n"

3951

3953

"and all history is preserved."

3952

3954

msgstr ""

3953

3955

3954

#: bzrlib/builtins.py:5572

3956

#: bzrlib/builtins.py:5557

3955

3957

#, python-format

3956

3958

msgid ""

3957

3959

"Can't join trees because %s doesn't support rich root data.\n"

3958

3960

"You can use bzr upgrade on the repository."

3959

3961

msgstr ""

3960

3962

3961

#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588

3963

#: bzrlib/builtins.py:5567 bzrlib/builtins.py:5573

3962

3964

msgid "Cannot join {0}. {1}"

3963

3965

msgstr ""

3964

3966

3965

#: bzrlib/builtins.py:5592

3967

#: bzrlib/builtins.py:5577

3966

3968

msgid "Split a subdirectory of a tree into a separate tree."

3967

3969

msgstr ""

3968

3970

3969

#: bzrlib/builtins.py:5594

3971

#: bzrlib/builtins.py:5579

3970

3972

msgid ""

3971

3973

"This command will produce a target tree in a format that supports\n"

3972

3974

"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"

3973

3975

"converted into earlier formats like 'dirstate-tags'."

3974

3976

msgstr ""

3975

3977

3976

#: bzrlib/builtins.py:5598

3978

#: bzrlib/builtins.py:5583

3977

3979

msgid ""

3978

3980

"The TREE argument should be a subdirectory of a working tree. That\n"

3979

3981

"subdirectory will be converted into an independent tree, with its own\n"

3980

3982

"branch. Commits in the top-level tree will not apply to the new subtree."

3981

3983

msgstr ""

3982

3984

3983

#: bzrlib/builtins.py:5678

3985

#: bzrlib/builtins.py:5663

3984

3986

msgid "No submit branch specified or known"

3985

3987

msgstr ""

3986

3988

3987

#: bzrlib/builtins.py:5686 bzrlib/send.py:108

3989

#: bzrlib/builtins.py:5672 bzrlib/send.py:109

3988

3990

msgid "No public branch specified or known"

3989

3991

msgstr ""

3990

3992

3991

#: bzrlib/builtins.py:5691

3993

#: bzrlib/builtins.py:5677

3992

3994

msgid "bzr merge-directive takes at most two one revision identifiers"

3993

3995

msgstr ""

3994

3996

3995

#: bzrlib/builtins.py:5700

3997

#: bzrlib/builtins.py:5686

3996

3998

msgid "No revisions to bundle."

3997

3999

msgstr ""

3998

4000

3999

#: bzrlib/builtins.py:5719

4001

#: bzrlib/builtins.py:5705

4000

4002

msgid "Mail or create a merge-directive for submitting changes."

4001

4003

msgstr ""

4002

4004

4003

#: bzrlib/builtins.py:5721

4005

#: bzrlib/builtins.py:5707

4004

4006

msgid "A merge directive provides many things needed for requesting merges:"

4005

4007

msgstr ""

4006

4008

4007

#: bzrlib/builtins.py:5723

4009

#: bzrlib/builtins.py:5709

4008

4010

msgid "* A machine-readable description of the merge to perform"

4009

4011

msgstr ""

4010

4012

4011

#: bzrlib/builtins.py:5725

4013

#: bzrlib/builtins.py:5711

4012

4014

msgid "* An optional patch that is a preview of the changes requested"

4013

4015

msgstr ""

4014

4016

4015

#: bzrlib/builtins.py:5727

4017

#: bzrlib/builtins.py:5713

4016

4018

msgid ""

4017

4019

"* An optional bundle of revision data, so that the changes can be applied\n"

4018

4020

" directly from the merge directive, without retrieving data from a\n"

4019

4021

" branch."

4020

4022

msgstr ""

4021

4023

4022

#: bzrlib/builtins.py:5731

4024

#: bzrlib/builtins.py:5717

4023

4025

msgid ""

4024

4026

"`bzr send` creates a compact data set that, when applied using bzr\n"

4025

4027

"merge, has the same effect as merging from the source branch. "

4026

4028

msgstr ""

4027

4029

4028

#: bzrlib/builtins.py:5734

4030

#: bzrlib/builtins.py:5720

4029

4031

msgid ""

4030

4032

"By default the merge directive is self-contained and can be applied to any\n"

4031

4033

"branch containing submit_branch in its ancestory without needing access to\n"

4032

4034

"the source branch."

4033

4035

msgstr ""

4034

4036

4035

#: bzrlib/builtins.py:5738

4037

#: bzrlib/builtins.py:5724

4036

4038

msgid ""

4037

4039

"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"

4038

4040

"revisions, but only a structured request to merge from the\n"

4041

4043

"included if known, so that people can check it later."

4042

4044

msgstr ""

4043

4045

4044

#: bzrlib/builtins.py:5744

4046

#: bzrlib/builtins.py:5730

4045

4047

msgid ""

4046

4048

"The submit branch defaults to the parent of the source branch, but can be\n"

4047

4049

"overridden. Both submit branch and public branch will be remembered in\n"

4050

4052

"be changed using --from."

4051

4053

msgstr ""

4052

4054

4053

#: bzrlib/builtins.py:5750

4055

#: bzrlib/builtins.py:5736

4054

4056

msgid ""

4055

4057

"Both the submit branch and the public branch follow the usual behavior with\n"

4056

4058

"respect to --remember: If there is no default location set, the first send\n"

4059

4061

"--remember. The value will only be saved if the location can be accessed."

4060

4062

msgstr ""

4061

4063

4062

#: bzrlib/builtins.py:5756

4064

#: bzrlib/builtins.py:5742

4063

4065

msgid ""

4064

4066

"In order to calculate those changes, bzr must analyse the submit branch.\n"

4065

4067

"Therefore it is most efficient for the submit branch to be a local mirror.\n"

4067

4069

"in the merge directive."

4068

4070

msgstr ""

4069

4071

4070

#: bzrlib/builtins.py:5761

4072

#: bzrlib/builtins.py:5747

4071

4073

msgid ""

4072

4074

"The default behaviour is to send the merge directive by mail, unless -o is\n"

4073

4075

"given, in which case it is sent to a file."

4074

4076

msgstr ""

4075

4077

4076

#: bzrlib/builtins.py:5764

4078

#: bzrlib/builtins.py:5750

4077

4079

msgid ""

4078

4080

"Mail is sent using your preferred mail program. This should be transparent\n"

4079

4081

"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"

4080

4082

"If the preferred client can't be found (or used), your editor will be used."

4081

4083

msgstr ""

4082

4084

4083

#: bzrlib/builtins.py:5768

4085

#: bzrlib/builtins.py:5754

4084

4086

msgid ""

4085

4087

"To use a specific mail program, set the mail_client configuration option.\n"

4086

4088

"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"

4092

4094

"supported clients."

4093

4095

msgstr ""

4094

4096

4095

#: bzrlib/builtins.py:5775

4097

#: bzrlib/builtins.py:5761

4096

4098

msgid ""

4097

4099

"If mail is being sent, a to address is required. This can be supplied\n"

4098

4100

"either on the commandline, by setting the submit_to configuration\n"

4100

4102

"in the submit branch."

4101

4103

msgstr ""

4102

4104

4103

#: bzrlib/builtins.py:5780

4105

#: bzrlib/builtins.py:5766

4104

4106

msgid ""

4105

4107

"Two formats are currently supported: \"4\" uses revision bundle format 4 "

4106

4108

"and\n"

4110

4112

"format 1. It is compatible with Bazaar 0.12 - 0.18."

4111

4113

msgstr ""

4112

4114

4113

#: bzrlib/builtins.py:5786

4115

#: bzrlib/builtins.py:5772

4114

4116

msgid ""

4115

4117

"The merge directives created by bzr send may be applied using bzr merge or\n"

4116

4118

"bzr pull by specifying a file containing a merge directive as the location."

4117

4119

msgstr ""

4118

4120

4119

#: bzrlib/builtins.py:5789

4121

#: bzrlib/builtins.py:5775

4120

4122

msgid ""

4121

4123

"bzr send makes extensive use of public locations to map local locations "

4122

4124

"into\n"

4124

4126

"set them, and use `bzr info` to display them."

4125

4127

msgstr ""

4126

4128

4127

#: bzrlib/builtins.py:5813

4129

#: bzrlib/builtins.py:5799

4128

4130

msgid "Write merge directive to this file or directory; use - for stdout."

4129

4131

msgstr ""

4130

4132

4131

#: bzrlib/builtins.py:5817

4133

#: bzrlib/builtins.py:5803

4132

4134

msgid ""

4133

4135

"Refuse to send if there are uncommitted changes in the working tree, --no-"

4134

4136

"strict disables the check."

4135

4137

msgstr ""

4136

4138

4137

#: bzrlib/builtins.py:5819

4139

#: bzrlib/builtins.py:5805

4138

4140

msgid "Mail the request to this address."

4139

4141

msgstr ""

4140

4142

4141

#: bzrlib/builtins.py:5823

4143

#: bzrlib/builtins.py:5809

4142

4144

msgid "Body for the email."

4143

4145

msgstr ""

4144

4146

4145

#: bzrlib/builtins.py:5876

4147

#: bzrlib/builtins.py:5862

4146

4148

msgid "Do not include a bundle in the merge directive."

4147

4149

msgstr ""

4148

4150

4149

#: bzrlib/builtins.py:5877

4151

#: bzrlib/builtins.py:5863

4150

4152

msgid "Do not include a preview patch in the merge directive."

4151

4153

msgstr ""

4152

4154

4153

#: bzrlib/builtins.py:5880

4155

#: bzrlib/builtins.py:5866

4154

4156

msgid "Remember submit and public branch."

4155

4157

msgstr ""

4156

4158

4157

#: bzrlib/builtins.py:5882

4159

#: bzrlib/builtins.py:5868

4158

4160

msgid ""

4159

4161

"Branch to generate the submission from, rather than the one containing the "

4160

4162

"working directory."

4161

4163

msgstr ""

4162

4164

4163

#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76

4165

#: bzrlib/builtins.py:5878 bzrlib/cmd_version_info.py:76

4164

4166

msgid "format"

4165

4167

msgstr ""

4166

4168

4167

#: bzrlib/builtins.py:5893

4169

#: bzrlib/builtins.py:5879

4168

4170

msgid "Use the specified output format."

4169

4171

msgstr ""

4170

4172

4171

#: bzrlib/builtins.py:5915

4173

#: bzrlib/builtins.py:5901

4172

4174

msgid "Create, remove or modify a tag naming a revision."

4173

4175

msgstr ""

4174

4176

4175

#: bzrlib/builtins.py:5917

4177

#: bzrlib/builtins.py:5903

4176

4178

msgid ""

4177

4179

"Tags give human-meaningful names to revisions. Commands that take a -r\n"

4178

4180

"(--revision) option can be given -rtag:X, where X is any previously\n"

4179

4181

"created tag."

4180

4182

msgstr ""

4181

4183

4182

#: bzrlib/builtins.py:5921

4184

#: bzrlib/builtins.py:5907

4183

4185

msgid ""

4184

4186

"Tags are stored in the branch. Tags are copied from one branch to another\n"

4185

4187

"along when you branch, push, pull or merge."

4186

4188

msgstr ""

4187

4189

4188

#: bzrlib/builtins.py:5924

4190

#: bzrlib/builtins.py:5910

4189

4191

msgid ""

4190

4192

"It is an error to give a tag name that already exists unless you pass\n"

4191

4193

"--force, in which case the tag is moved to point to the new revision."

4192

4194

msgstr ""

4193

4195

4194

#: bzrlib/builtins.py:5927

4196

#: bzrlib/builtins.py:5913

4195

4197

msgid ""

4196

4198

"To rename a tag (change the name but keep it on the same revsion), run "

4197

4199

"``bzr\n"

4198

4200

"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."

4199

4201

msgstr ""

4200

4202

4201

#: bzrlib/builtins.py:5930

4203

#: bzrlib/builtins.py:5916

4202

4204

msgid ""

4203

4205

"If no tag name is specified it will be determined through the \n"

4204

4206

"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"

4206

4208

"details."

4207

4209

msgstr ""

4208

4210

4209

#: bzrlib/builtins.py:5940

4211

#: bzrlib/builtins.py:5926

4210

4212

msgid "Delete this tag rather than placing it."

4211

4213

msgstr ""

4212

4214

4213

#: bzrlib/builtins.py:5943

4215

#: bzrlib/builtins.py:5929

4214

4216

msgid "Branch in which to place the tag."

4215

4217

msgstr ""

4216

4218

4217

#: bzrlib/builtins.py:5945

4219

#: bzrlib/builtins.py:5931

4218

4220

msgid "Replace existing tags."

4219

4221

msgstr ""

4220

4222

4221

#: bzrlib/builtins.py:5960

4223

#: bzrlib/builtins.py:5946

4222

4224

msgid "No tag specified to delete."

4223

4225

msgstr ""

4224

4226

4227

#: bzrlib/builtins.py:5948

4228

#, python-format

4229

msgid "Deleted tag %s."

4230

msgstr ""

4231

4225

4232

#: bzrlib/builtins.py:5962

4226

#, python-format

4227

msgid "Deleted tag %s."

4228

msgstr ""

4229

4230

#: bzrlib/builtins.py:5976

4231

4233

msgid "Please specify a tag name."

4232

4234

msgstr ""

4233

4235

4234

#: bzrlib/builtins.py:5984

4236

#: bzrlib/builtins.py:5970

4235

4237

#, python-format

4236

4238

msgid "Tag %s already exists for that revision."

4237

4239

msgstr ""

4238

4240

4239

#: bzrlib/builtins.py:5988

4241

#: bzrlib/builtins.py:5974

4240

4242

#, python-format

4241

4243

msgid "Created tag %s."

4242

4244

msgstr ""

4243

4245

4244

#: bzrlib/builtins.py:5990

4246

#: bzrlib/builtins.py:5976

4245

4247

#, python-format

4246

4248

msgid "Updated tag %s."

4247

4249

msgstr ""

4248

4250

4249

#: bzrlib/builtins.py:5994

4251

#: bzrlib/builtins.py:5980

4250

4252

msgid "List tags."

4251

4253

msgstr ""

4252

4254

4253

#: bzrlib/builtins.py:5996

4255

#: bzrlib/builtins.py:5982

4254

4256

msgid ""

4255

4257

"This command shows a table of tag names and the revisions they reference."

4256

4258

msgstr ""

4257

4259

4258

#: bzrlib/builtins.py:6002

4260

#: bzrlib/builtins.py:5988

4259

4261

msgid "Branch whose tags should be displayed."

4260

4262

msgstr ""

4261

4263

4262

#: bzrlib/builtins.py:6004

4264

#: bzrlib/builtins.py:5990

4263

4265

msgid "Sort tags by different criteria."

4264

4266

msgstr ""

4265

4267

4266

#: bzrlib/builtins.py:6004

4268

#: bzrlib/builtins.py:5990

4267

4269

msgid "Sorting"

4268

4270

msgstr ""

4269

4271

4270

#: bzrlib/builtins.py:6073

4272

#: bzrlib/builtins.py:6059

4271

4273

msgid "Reconfigure the type of a bzr directory."

4272

4274

msgstr ""

4273

4275

4274

#: bzrlib/builtins.py:6075

4276

#: bzrlib/builtins.py:6061

4275

4277

msgid "A target configuration must be specified."

4276

4278

msgstr ""

4277

4279

4278

#: bzrlib/builtins.py:6077

4280

#: bzrlib/builtins.py:6063

4279

4281

msgid ""

4280

4282

"For checkouts, the bind-to location will be auto-detected if not specified.\n"

4281

4283

"The order of preference is\n"

4286

4288

"If none of these is available, --bind-to must be specified."

4287

4289

msgstr ""

4288

4290

4289

#: bzrlib/builtins.py:6091

4291

#: bzrlib/builtins.py:6077

4290

4292

msgid "Tree type"

4291

4293

msgstr ""

4292

4294

4293

#: bzrlib/builtins.py:6092

4295

#: bzrlib/builtins.py:6078

4294

4296

msgid "The relation between branch and tree."

4295

4297

msgstr ""

4296

4298

4297

#: bzrlib/builtins.py:6094

4299

#: bzrlib/builtins.py:6080

4298

4300

msgid "Reconfigure to be an unbound branch with no working tree."

4299

4301

msgstr ""

4300

4302

4301

#: bzrlib/builtins.py:6095

4303

#: bzrlib/builtins.py:6081

4302

4304

msgid "Reconfigure to be an unbound branch with a working tree."

4303

4305

msgstr ""

4304

4306

4305

#: bzrlib/builtins.py:6096

4307

#: bzrlib/builtins.py:6082

4306

4308

msgid "Reconfigure to be a bound branch with a working tree."

4307

4309

msgstr ""

4308

4310

4309

#: bzrlib/builtins.py:6097

4311

#: bzrlib/builtins.py:6083

4310

4312

msgid "Reconfigure to be a lightweight checkout (with no local history)."

4311

4313

msgstr ""

4312

4314

4313

#: bzrlib/builtins.py:6102

4315

#: bzrlib/builtins.py:6088

4314

4316

msgid "Repository type"

4315

4317

msgstr ""

4316

4318

4317

#: bzrlib/builtins.py:6103

4319

#: bzrlib/builtins.py:6089

4318

4320

msgid "Location fo the repository."

4319

4321

msgstr ""

4320

4322

4321

#: bzrlib/builtins.py:6105

4323

#: bzrlib/builtins.py:6091

4322

4324

msgid ""

4323

4325

"Reconfigure to be a standalone branch (i.e. stop using shared repository)."

4324

4326

msgstr ""

4325

4327

4326

#: bzrlib/builtins.py:6107

4328

#: bzrlib/builtins.py:6093

4327

4329

msgid "Reconfigure to use a shared repository."

4328

4330

msgstr ""

4329

4331

4330

#: bzrlib/builtins.py:6111

4332

#: bzrlib/builtins.py:6097

4331

4333

msgid "Trees in Repository"

4332

4334

msgstr ""

4333

4335

4334

#: bzrlib/builtins.py:6112

4336

#: bzrlib/builtins.py:6098

4335

4337

msgid "Whether new branches in the repository have trees."

4336

4338

msgstr ""

4337

4339

4338

#: bzrlib/builtins.py:6114

4340

#: bzrlib/builtins.py:6100

4339

4341

msgid ""

4340

4342

"Reconfigure repository to create working trees on branches by default."

4341

4343

msgstr ""

4342

4344

4343

#: bzrlib/builtins.py:6116

4345

#: bzrlib/builtins.py:6102

4344

4346

msgid ""

4345

4347

"Reconfigure repository to not create working trees on branches by default."

4346

4348

msgstr ""

4347

4349

4348

#: bzrlib/builtins.py:6119

4350

#: bzrlib/builtins.py:6105

4349

4351

msgid "Branch to bind checkout to."

4350

4352

msgstr ""

4351

4353

4352

#: bzrlib/builtins.py:6121

4354

#: bzrlib/builtins.py:6107

4353

4355

msgid "Perform reconfiguration even if local changes will be lost."

4354

4356

msgstr ""

4355

4357

4356

#: bzrlib/builtins.py:6124

4358

#: bzrlib/builtins.py:6110

4357

4359

msgid "Reconfigure a branch to be stacked on another branch."

4358

4360

msgstr ""

4359

4361

4360

#: bzrlib/builtins.py:6128

4362

#: bzrlib/builtins.py:6114

4361

4363

msgid ""

4362

4364

"Reconfigure a branch to be unstacked. This may require copying substantial "

4363

4365

"data into it."

4364

4366

msgstr ""

4365

4367

4368

#: bzrlib/builtins.py:6124

4369

msgid "Can't use both --stacked-on and --unstacked"

4370

msgstr ""

4371

4366

4372

#: bzrlib/builtins.py:6138

4367

msgid "Can't use both --stacked-on and --unstacked"

4368

msgstr ""

4369

4370

#: bzrlib/builtins.py:6152

4371

4373

msgid "No target configuration specified"

4372

4374

msgstr ""

4373

4375

4374

#: bzrlib/builtins.py:6187

4376

#: bzrlib/builtins.py:6173

4375

4377

msgid "Set the branch of a checkout and update."

4376

4378

msgstr ""

4377

4379

4378

#: bzrlib/builtins.py:6189

4380

#: bzrlib/builtins.py:6175

4379

4381

msgid ""

4380

4382

"For lightweight checkouts, this changes the branch being referenced.\n"

4381

4383

"For heavyweight checkouts, this checks that there are no local commits\n"

4383

4385

"of the new location and binds to it."

4384

4386

msgstr ""

4385

4387

4386

#: bzrlib/builtins.py:6194

4388

#: bzrlib/builtins.py:6180

4387

4389

msgid ""

4388

4390

"In both cases, the working tree is updated and uncommitted changes\n"

4389

4391

"are merged. The user can commit or revert these as they desire."

4390

4392

msgstr ""

4391

4393

4392

#: bzrlib/builtins.py:6197

4394

#: bzrlib/builtins.py:6183

4393

4395

msgid "Pending merges need to be committed or reverted before using switch."

4394

4396

msgstr ""

4395

4397

4396

#: bzrlib/builtins.py:6199

4398

#: bzrlib/builtins.py:6185

4397

4399

msgid ""

4398

4400

"The path to the branch to switch to can be specified relative to the parent\n"

4399

4401

"directory of the current branch. For example, if you are currently in a\n"

4401

4403

"/path/to/newbranch."

4402

4404

msgstr ""

4403

4405

4404

#: bzrlib/builtins.py:6204

4406

#: bzrlib/builtins.py:6190

4405

4407

msgid ""

4406

4408

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

4407

4409

"locally, in which case switching will update the local nickname to be\n"

4408

4410

"that of the master."

4409

4411

msgstr ""

4410

4412

4411

#: bzrlib/builtins.py:6212

4413

#: bzrlib/builtins.py:6198

4412

4414

msgid "Switch even if local commits will be lost."

4413

4415

msgstr ""

4414

4416

4417

#: bzrlib/builtins.py:6201

4418

msgid "Create the target branch from this one before switching to it."

4419

msgstr ""

4420

4415

4421

#: bzrlib/builtins.py:6215

4416

msgid "Create the target branch from this one before switching to it."

4417

msgstr ""

4418

4419

#: bzrlib/builtins.py:6229

4420

4422

msgid "You must supply either a revision or a location"

4421

4423

msgstr ""

4422

4424

4423

#: bzrlib/builtins.py:6242

4425

#: bzrlib/builtins.py:6228

4424

4426

msgid "cannot create branch without source branch"

4425

4427

msgstr ""

4426

4428

4427

#: bzrlib/builtins.py:6262

4429

#: bzrlib/builtins.py:6253

4428

4430

msgid "Manage filtered views."

4429

4431

msgstr ""

4430

4432

4431

#: bzrlib/builtins.py:6264

4433

#: bzrlib/builtins.py:6255

4432

4434

msgid ""

4433

4435

"Views provide a mask over the tree so that users can focus on\n"

4434

4436

"a subset of a tree when doing their work. After creating a view,\n"

4438

4440

"must be within the current view."

4439

4441

msgstr ""

4440

4442

4441

#: bzrlib/builtins.py:6271

4443

#: bzrlib/builtins.py:6262

4442

4444

msgid ""

4443

4445

"In most cases, a view has a short life-span: it is created to make\n"

4444

4446

"a selected change and is deleted once that change is committed.\n"

4446

4448

"and switch between them."

4447

4449

msgstr ""

4448

4450

4449

#: bzrlib/builtins.py:6276

4451

#: bzrlib/builtins.py:6267

4450

4452

msgid ""

4451

4453

"To disable the current view without deleting it, you can switch to\n"

4452

4454

"the pseudo view called ``off``. This can be useful when you need\n"

4454

4456

"want to switch back to your view after that."

4455

4457

msgstr ""

4456

4458

4457

#: bzrlib/builtins.py:6281

4459

#: bzrlib/builtins.py:6272

4458

4460

msgid ""

4459

4461

":Examples:\n"

4460

4462

" To define the current view::"

4461

4463

msgstr ""

4462

4464

4463

#: bzrlib/builtins.py:6284

4465

#: bzrlib/builtins.py:6275

4464

4466

msgid " bzr view file1 dir1 ..."

4465

4467

msgstr ""

4466

4468

4467

#: bzrlib/builtins.py:6286

4469

#: bzrlib/builtins.py:6277

4468

4470

msgid " To list the current view::"

4469

4471

msgstr ""

4470

4472

4471

#: bzrlib/builtins.py:6288

4473

#: bzrlib/builtins.py:6279

4472

4474

msgid " bzr view"

4473

4475

msgstr ""

4474

4476

4475

#: bzrlib/builtins.py:6290

4477

#: bzrlib/builtins.py:6281

4476

4478

msgid " To delete the current view::"

4477

4479

msgstr ""

4478

4480

4479

#: bzrlib/builtins.py:6292

4481

#: bzrlib/builtins.py:6283

4480

4482

msgid " bzr view --delete"

4481

4483

msgstr ""

4482

4484

4483

#: bzrlib/builtins.py:6294

4485

#: bzrlib/builtins.py:6285

4484

4486

msgid " To disable the current view without deleting it::"

4485

4487

msgstr ""

4486

4488

4487

#: bzrlib/builtins.py:6296

4489

#: bzrlib/builtins.py:6287

4488

4490

msgid " bzr view --switch off"

4489

4491

msgstr ""

4490

4492

4491

#: bzrlib/builtins.py:6298

4493

#: bzrlib/builtins.py:6289

4492

4494

msgid " To define a named view and switch to it::"

4493

4495

msgstr ""

4494

4496

4495

#: bzrlib/builtins.py:6300

4497

#: bzrlib/builtins.py:6291

4496

4498

msgid " bzr view --name view-name file1 dir1 ..."

4497

4499

msgstr ""

4498

4500

4499

#: bzrlib/builtins.py:6302

4501

#: bzrlib/builtins.py:6293

4500

4502

msgid " To list a named view::"

4501

4503

msgstr ""

4502

4504

4503

#: bzrlib/builtins.py:6304

4505

#: bzrlib/builtins.py:6295

4504

4506

msgid " bzr view --name view-name"

4505

4507

msgstr ""

4506

4508

4507

#: bzrlib/builtins.py:6306

4509

#: bzrlib/builtins.py:6297

4508

4510

msgid " To delete a named view::"

4509

4511

msgstr ""

4510

4512

4511

#: bzrlib/builtins.py:6308

4513

#: bzrlib/builtins.py:6299

4512

4514

msgid " bzr view --name view-name --delete"

4513

4515

msgstr ""

4514

4516

4515

#: bzrlib/builtins.py:6310

4517

#: bzrlib/builtins.py:6301

4516

4518

msgid " To switch to a named view::"

4517

4519

msgstr ""

4518

4520

4519

#: bzrlib/builtins.py:6312

4521

#: bzrlib/builtins.py:6303

4520

4522

msgid " bzr view --switch view-name"

4521

4523

msgstr ""

4522

4524

4523

#: bzrlib/builtins.py:6314

4525

#: bzrlib/builtins.py:6305

4524

4526

msgid " To list all views defined::"

4525

4527

msgstr ""

4526

4528

4527

#: bzrlib/builtins.py:6316

4529

#: bzrlib/builtins.py:6307

4528

4530

msgid " bzr view --all"

4529

4531

msgstr ""

4530

4532

4531

#: bzrlib/builtins.py:6318

4533

#: bzrlib/builtins.py:6309

4532

4534

msgid " To delete all views::"

4533

4535

msgstr ""

4534

4536

4535

#: bzrlib/builtins.py:6320

4537

#: bzrlib/builtins.py:6311

4536

4538

msgid " bzr view --delete --all"

4537

4539

msgstr ""

4538

4540

4539

#: bzrlib/builtins.py:6327

4541

#: bzrlib/builtins.py:6318

4540

4542

msgid "Apply list or delete action to all views."

4541

4543

msgstr ""

4542

4544

4543

#: bzrlib/builtins.py:6330

4545

#: bzrlib/builtins.py:6321

4544

4546

msgid "Delete the view."

4545

4547

msgstr ""

4546

4548

4547

#: bzrlib/builtins.py:6333

4549

#: bzrlib/builtins.py:6324

4548

4550

msgid "Name of the view to define, list or delete."

4549

4551

msgstr ""

4550

4552

4551

#: bzrlib/builtins.py:6337

4553

#: bzrlib/builtins.py:6328

4552

4554

msgid "Name of the view to switch to."

4553

4555

msgstr ""

4554

4556

4555

#: bzrlib/builtins.py:6356

4557

#: bzrlib/builtins.py:6347

4556

4558

msgid "Both --delete and a file list specified"

4557

4559

msgstr ""

4558

4560

4559

#: bzrlib/builtins.py:6359

4561

#: bzrlib/builtins.py:6350

4560

4562

msgid "Both --delete and --switch specified"

4561

4563

msgstr ""

4562

4564

4563

#: bzrlib/builtins.py:6362

4565

#: bzrlib/builtins.py:6353

4564

4566

msgid "Deleted all views.\n"

4565

4567

msgstr ""

4566

4568

4567

#: bzrlib/builtins.py:6364

4569

#: bzrlib/builtins.py:6355

4568

4570

msgid "No current view to delete"

4569

4571

msgstr ""

4570

4572

4571

#: bzrlib/builtins.py:6367

4573

#: bzrlib/builtins.py:6358

4572

4574

#, python-format

4573

4575

msgid "Deleted '%s' view.\n"

4574

4576

msgstr ""

4575

4577

4576

#: bzrlib/builtins.py:6371

4578

#: bzrlib/builtins.py:6362

4577

4579

msgid "Both --switch and a file list specified"

4578

4580

msgstr ""

4579

4581

4580

#: bzrlib/builtins.py:6374

4582

#: bzrlib/builtins.py:6365

4581

4583

msgid "Both --switch and --all specified"

4582

4584

msgstr ""

4583

4585

4584

#: bzrlib/builtins.py:6377

4586

#: bzrlib/builtins.py:6368

4585

4587

msgid "No current view to disable"

4586

4588

msgstr ""

4587

4589

4588

#: bzrlib/builtins.py:6379

4590

#: bzrlib/builtins.py:6370

4589

4591

#, python-format

4590

4592

msgid "Disabled '%s' view.\n"

4591

4593

msgstr ""

4592

4594

4593

#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405

4595

#: bzrlib/builtins.py:6374 bzrlib/builtins.py:6396

4594

4596

msgid "Using '{0}' view: {1}\n"

4595

4597

msgstr ""

4596

4598

4599

#: bzrlib/builtins.py:6377

4600

msgid "Views defined:\n"

4601

msgstr ""

4602

4597

4603

#: bzrlib/builtins.py:6386

4598

msgid "Views defined:\n"

4599

msgstr ""

4600

4601

#: bzrlib/builtins.py:6395

4602

4604

msgid "No views defined.\n"

4603

4605

msgstr ""

4604

4606

4605

#: bzrlib/builtins.py:6402

4607

#: bzrlib/builtins.py:6393

4606

4608

msgid "Cannot change the 'off' pseudo view"

4607

4609

msgstr ""

4608

4610

4609

#: bzrlib/builtins.py:6410

4611

#: bzrlib/builtins.py:6401

4610

4612

msgid "No current view.\n"

4611

4613

msgstr ""

4612

4614

4613

#: bzrlib/builtins.py:6413

4615

#: bzrlib/builtins.py:6404

4614

4616

msgid "'{0}' view is: {1}\n"

4615

4617

msgstr ""

4616

4618

4617

#: bzrlib/builtins.py:6433

4619

#: bzrlib/builtins.py:6424

4618

4620

msgid " <no hooks installed>\n"

4619

4621

msgstr ""

4620

4622

4621

#: bzrlib/builtins.py:6437

4623

#: bzrlib/builtins.py:6428

4622

4624

msgid "Remove a branch."

4623

4625

msgstr ""

4624

4626

4625

#: bzrlib/builtins.py:6439

4627

#: bzrlib/builtins.py:6430

4626

4628

msgid ""

4627

4629

"This will remove the branch from the specified location but \n"

4628

4630

"will keep any working tree or repository in place."

4629

4631

msgstr ""

4630

4632

4631

#: bzrlib/builtins.py:6444

4633

#: bzrlib/builtins.py:6435

4632

4634

msgid " Remove the branch at repo/trunk::"

4633

4635

msgstr ""

4634

4636

4635

#: bzrlib/builtins.py:6446

4637

#: bzrlib/builtins.py:6437

4636

4638

msgid " bzr remove-branch repo/trunk"

4637

4639

msgstr ""

4638

4640

4639

#: bzrlib/builtins.py:6461

4641

#: bzrlib/builtins.py:6444

4642

msgid "Remove branch even if it is the active branch."

4643

msgstr ""

4644

4645

#: bzrlib/builtins.py:6458

4646

msgid "Branch is active. Use --force to remove it."

4647

msgstr ""

4648

4649

#: bzrlib/builtins.py:6462

4640

4650

msgid "Plaintext diff output."

4641

4651

msgstr ""

4642

4652

4643

#: bzrlib/builtins.py:6462

4653

#: bzrlib/builtins.py:6463

4644

4654

msgid "Temporarily set aside some changes from the current tree."

4645

4655

msgstr ""

4646

4656

4647

#: bzrlib/builtins.py:6464

4657

#: bzrlib/builtins.py:6465

4648

4658

msgid ""

4649

4659

"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"

4650

4660

"ie. out of the way, until a later time when you can bring them back from\n"

4653

4663

"will they survive its deletion."

4654

4664

msgstr ""

4655

4665

4656

#: bzrlib/builtins.py:6470

4666

#: bzrlib/builtins.py:6471

4657

4667

msgid "If shelve --list is specified, previously-shelved changes are listed."

4658

4668

msgstr ""

4659

4669

4660

#: bzrlib/builtins.py:6472

4670

#: bzrlib/builtins.py:6473

4661

4671

msgid ""

4662

4672

"Shelve is intended to help separate several sets of changes that have\n"

4663

4673

"been inappropriately mingled. If you just want to get rid of all changes\n"

4665

4675

"shelve all text changes at once, use shelve --all."

4666

4676

msgstr ""

4667

4677

4668

#: bzrlib/builtins.py:6477

4678

#: bzrlib/builtins.py:6478

4669

4679

msgid ""

4670

4680

"If filenames are specified, only the changes to those files will be\n"

4671

4681

"shelved. Other files will be left untouched."

4672

4682

msgstr ""

4673

4683

4674

#: bzrlib/builtins.py:6480

4684

#: bzrlib/builtins.py:6481

4675

4685

msgid ""

4676

4686

"If a revision is specified, changes since that revision will be shelved."

4677

4687

msgstr ""

4678

4688

4679

#: bzrlib/builtins.py:6482

4689

#: bzrlib/builtins.py:6483

4680

4690

msgid ""

4681

4691

"You can put multiple items on the shelf, and by default, 'unshelve' will\n"

4682

4692

"restore the most recently shelved changes."

4683

4693

msgstr ""

4684

4694

4685

#: bzrlib/builtins.py:6485

4695

#: bzrlib/builtins.py:6486

4686

4696

msgid ""

4687

4697

"For complicated changes, it is possible to edit the changes in a separate\n"

4688

4698

"editor program to decide what the file remaining in the working copy\n"

4689

4699

"should look like. To do this, add the configuration option"

4690

4700

msgstr ""

4691

4701

4692

#: bzrlib/builtins.py:6489

4702

#: bzrlib/builtins.py:6490

4693

4703

msgid " change_editor = PROGRAM @new_path @old_path"

4694

4704

msgstr ""

4695

4705

4696

#: bzrlib/builtins.py:6491

4706

#: bzrlib/builtins.py:6492

4697

4707

msgid ""

4698

4708

"where @new_path is replaced with the path of the new version of the \n"

4699

4709

"file and @old_path is replaced with the path of the old version of \n"

4702

4712

" "

4703

4713

msgstr ""

4704

4714

4705

#: bzrlib/builtins.py:6503

4715

#: bzrlib/builtins.py:6504

4706

4716

msgid "Shelve all changes."

4707

4717

msgstr ""

4708

4718

4709

#: bzrlib/builtins.py:6505

4719

#: bzrlib/builtins.py:6506

4710

4720

msgid "Method to use for writing diffs."

4711

4721

msgstr ""

4712

4722

4713

#: bzrlib/builtins.py:6505

4723

#: bzrlib/builtins.py:6506

4714

4724

msgid "writer"

4715

4725

msgstr ""

4716

4726

4717

#: bzrlib/builtins.py:6509

4727

#: bzrlib/builtins.py:6510

4718

4728

msgid "List shelved changes."

4719

4729

msgstr ""

4720

4730

4721

#: bzrlib/builtins.py:6511

4731

#: bzrlib/builtins.py:6512

4722

4732

msgid "Destroy removed changes instead of shelving them."

4723

4733

msgstr ""

4724

4734

4725

#: bzrlib/builtins.py:6540

4735

#: bzrlib/builtins.py:6541

4726

4736

msgid "No shelved changes."

4727

4737

msgstr ""

4728

4738

4729

#: bzrlib/builtins.py:6551

4739

#: bzrlib/builtins.py:6552

4730

4740

msgid "Restore shelved changes."

4731

4741

msgstr ""

4732

4742

4733

#: bzrlib/builtins.py:6553

4743

#: bzrlib/builtins.py:6554

4734

4744

msgid ""

4735

4745

"By default, the most recently shelved changes are restored. However if you\n"

4736

4746

"specify a shelf by id those changes will be restored instead. This works\n"

4737

4747

"best when the changes don't depend on each other."

4738

4748

msgstr ""

4739

4749

4740

#: bzrlib/builtins.py:6562

4750

#: bzrlib/builtins.py:6563

4741

4751

msgid "The action to perform."

4742

4752

msgstr ""

4743

4753

4744

#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694

4754

#: bzrlib/builtins.py:6563 bzrlib/conflicts.py:694

4745

4755

msgid "action"

4746

4756

msgstr ""

4747

4757

4748

#: bzrlib/builtins.py:6564

4758

#: bzrlib/builtins.py:6565

4749

4759

msgid "Apply changes and remove from the shelf."

4750

4760

msgstr ""

4751

4761

4752

#: bzrlib/builtins.py:6565

4762

#: bzrlib/builtins.py:6566

4753

4763

msgid "Show changes, but do not apply or remove them."

4754

4764

msgstr ""

4755

4765

4756

#: bzrlib/builtins.py:6566

4766

#: bzrlib/builtins.py:6567

4757

4767

msgid ""

4758

4768

"Instead of unshelving the changes, show the diff that would result from "

4759

4769

"unshelving."

4760

4770

msgstr ""

4761

4771

4762

#: bzrlib/builtins.py:6568

4772

#: bzrlib/builtins.py:6569

4763

4773

msgid "Delete changes without applying them."

4764

4774

msgstr ""

4765

4775

4766

#: bzrlib/builtins.py:6569

4776

#: bzrlib/builtins.py:6570

4767

4777

msgid "Apply changes but don't delete them."

4768

4778

msgstr ""

4769

4779

4770

#: bzrlib/builtins.py:6584

4780

#: bzrlib/builtins.py:6585

4771

4781

msgid "Remove unwanted files from working tree."

4772

4782

msgstr ""

4773

4783

4774

#: bzrlib/builtins.py:6586

4784

#: bzrlib/builtins.py:6587

4775

4785

msgid ""

4776

4786

"By default, only unknown files, not ignored files, are deleted. Versioned\n"

4777

4787

"files are never deleted."

4778

4788

msgstr ""

4779

4789

4780

#: bzrlib/builtins.py:6589

4790

#: bzrlib/builtins.py:6590

4781

4791

msgid ""

4782

4792

"Another class is 'detritus', which includes files emitted by bzr during\n"

4783

4793

"normal operations and selftests. (The value of these files decreases with\n"

4784

4794

"time.)"

4785

4795

msgstr ""

4786

4796

4787

#: bzrlib/builtins.py:6593

4797

#: bzrlib/builtins.py:6594

4788

4798

msgid ""

4789

4799

"If no options are specified, unknown files are deleted. Otherwise, option\n"

4790

4800

"flags are respected, and may be combined."

4791

4801

msgstr ""

4792

4802

4793

#: bzrlib/builtins.py:6596

4803

#: bzrlib/builtins.py:6597

4794

4804

msgid "To check what clean-tree will do, use --dry-run."

4795

4805

msgstr ""

4796

4806

4797

#: bzrlib/builtins.py:6599

4807

#: bzrlib/builtins.py:6600

4798

4808

msgid "Delete all ignored files."

4799

4809

msgstr ""

4800

4810

4801

#: bzrlib/builtins.py:6600

4811

#: bzrlib/builtins.py:6601

4802

4812

msgid ""

4803

4813

"Delete conflict files, merge and revert backups, and failed selftest dirs."

4804

4814

msgstr ""

4805

4815

4806

#: bzrlib/builtins.py:6603

4816

#: bzrlib/builtins.py:6604

4807

4817

msgid "Delete files unknown to bzr (default)."

4808

4818

msgstr ""

4809

4819

4810

#: bzrlib/builtins.py:6604

4820

#: bzrlib/builtins.py:6605

4811

4821

msgid "Show files to delete instead of deleting them."

4812

4822

msgstr ""

4813

4823

4814

#: bzrlib/builtins.py:6606

4824

#: bzrlib/builtins.py:6607

4815

4825

msgid "Do not prompt before deleting."

4816

4826

msgstr ""

4817

4827

4871

4881

msgstr[0] ""

4872

4882

msgstr[1] ""

4873

4883

4874

#: bzrlib/bzrdir.py:490

4884

#: bzrlib/bzrdir.py:486

4875

4885

msgid ""

4876

4886

"making backup of {0}\n"

4877

4887

" to {1}"

4878

4888

msgstr ""

4879

4889

4880

#: bzrlib/bzrdir.py:513

4890

#: bzrlib/bzrdir.py:509

4881

4891

msgid "renamed {0} to {1}"

4882

4892

msgstr ""

4883

4893

4884

#: bzrlib/bzrdir.py:1652

4894

#: bzrlib/bzrdir.py:1638

4885

4895

#, python-format

4886

4896

msgid ""

4887

4897

"Source repository format does not support stacking, using format:\n"

4888

4898

" %s"

4889

4899

msgstr ""

4890

4900

4891

#: bzrlib/bzrdir.py:1672

4901

#: bzrlib/bzrdir.py:1658

4892

4902

#, python-format

4893

4903

msgid ""

4894

4904

"Source branch format does not support stacking, using format:\n"

4895

4905

" %s"

4896

4906

msgstr ""

4897

4907

4898

#: bzrlib/bzrdir.py:1818

4908

#: bzrlib/bzrdir.py:1804

4899

4909

msgid "starting repository conversion"

4900

4910

msgstr ""

4901

4911

4902

#: bzrlib/bzrdir.py:2039

4912

#: bzrlib/bzrdir.py:2025

4903

4913

msgid "Using default stacking branch {0} at {1}"

4904

4914

msgstr ""

4905

4915

5204

5214

msgid ":See also: %s"

5205

5215

msgstr ""

5206

5216

5207

#: bzrlib/commands.py:816 bzrlib/gpg.py:324

5217

#: bzrlib/commands.py:826 bzrlib/gpg.py:347

5208

5218

msgid "Only ASCII permitted in option names"

5209

5219

msgstr ""

5210

5220

5211

#: bzrlib/commands.py:841 bzrlib/commands.py:849

5221

#: bzrlib/commands.py:851 bzrlib/commands.py:859

5212

5222

msgid "command {0!r} needs one or more {1}"

5213

5223

msgstr ""

5214

5224

5215

#: bzrlib/commands.py:858

5225

#: bzrlib/commands.py:868

5216

5226

msgid "command {0!r} requires argument {1}"

5217

5227

msgstr ""

5218

5228

5219

#: bzrlib/commands.py:865

5229

#: bzrlib/commands.py:875

5220

5230

msgid "extra argument to command {0}: {1}"

5221

5231

msgstr ""

5222

5232

5223

#: bzrlib/commands.py:962

5233

#: bzrlib/commands.py:972

5224

5234

#, python-format

5225

5235

msgid "Profile data written to \"%s\"."

5226

5236

msgstr ""

5263

5273

msgid "renamed"

5264

5274

msgstr ""

5265

5275

5266

#: bzrlib/commit.py:977

5276

#: bzrlib/commit.py:976

5267

5277

msgid "unchanged"

5268

5278

msgstr ""

5269

5279

5270

#: bzrlib/commit.py:999

5280

#: bzrlib/commit.py:998

5271

5281

msgid "{0} [{1}] - Stage"

5272

5282

msgstr ""

5273

5283

5274

#: bzrlib/commit.py:1002

5284

#: bzrlib/commit.py:1001

5275

5285

#, python-format

5276

5286

msgid "%s - Stage"

5277

5287

msgstr ""

5278

5288

5289

#: bzrlib/commit_signature_commands.py:34

5290

msgid "Sign all commits by a given committer."

5291

msgstr ""

5292

5279

5293

#: bzrlib/commit_signature_commands.py:36

5280

msgid "Sign all commits by a given committer."

5281

msgstr ""

5282

5283

#: bzrlib/commit_signature_commands.py:38

5284

5294

msgid ""

5285

5295

"If location is not specified the local tree is used.\n"

5286

5296

"If committer is not specified the default committer is used."

5287

5297

msgstr ""

5288

5298

5289

#: bzrlib/commit_signature_commands.py:41

5299

#: bzrlib/commit_signature_commands.py:39

5290

5300

msgid "This does not sign commits that already have signatures."

5291

5301

msgstr ""

5292

5302

5293

#: bzrlib/commit_signature_commands.py:49

5303

#: bzrlib/commit_signature_commands.py:47

5294

5304

msgid ""

5295

5305

"Don't actually sign anything, just print the revisions that would be signed."

5296

5306

msgstr ""

5297

5307

5308

#: bzrlib/commit_signature_commands.py:98

5309

#, python-format

5310

msgid "Signed %d revision.\n"

5311

msgid_plural "Signed %d revisions.\n"

5312

msgstr[0] ""

5313

msgstr[1] ""

5314

5298

5315

#: bzrlib/commit_signature_commands.py:103

5299

5316

msgid "Verify all commit signatures."

5300

5317

msgstr ""

5310

5327

"verification."

5311

5328

msgstr ""

5312

5329

5313

#: bzrlib/commit_signature_commands.py:147

5330

#: bzrlib/commit_signature_commands.py:148

5314

5331

msgid "Cannot verify a range of non-revision-history revisions"

5315

5332

msgstr ""

5316

5333

5317

#: bzrlib/commit_signature_commands.py:168

5334

#: bzrlib/commit_signature_commands.py:166

5318

5335

msgid "All commits signed with verifiable keys"

5319

5336

msgstr ""

5320

5337

5321

#: bzrlib/config.py:475

5338

#: bzrlib/config.py:436

5322

5339

msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."

5323

5340

msgstr ""

5324

5341

5325

#: bzrlib/config.py:2485

5342

#: bzrlib/config.py:2451

5326

5343

msgid "{0} is not an SI unit."

5327

5344

msgstr ""

5328

5345

5329

#: bzrlib/config.py:2949

5346

#: bzrlib/config.py:2970

5330

5347

msgid ""

5331

5348

"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "

5332

5349

"will be saved."

5333

5350

msgstr ""

5334

5351

5335

#: bzrlib/config.py:3093

5352

#: bzrlib/config.py:3114

5336

5353

#, python-format

5337

5354

msgid "Invalid '%s', should be of the form 'name=value'"

5338

5355

msgstr ""

5339

5356

5340

#: bzrlib/config.py:3962

5357

#: bzrlib/config.py:4004

5341

5358

msgid "Display, set or remove a configuration option."

5342

5359

msgstr ""

5343

5360

5344

#: bzrlib/config.py:3964

5361

#: bzrlib/config.py:4006

5345

5362

msgid "Display the active value for a given option."

5346

5363

msgstr ""

5347

5364

5348

#: bzrlib/config.py:3966

5365

#: bzrlib/config.py:4008

5349

5366

msgid ""

5350

5367

"If --all is specified, NAME is interpreted as a regular expression and all\n"

5351

5368

"matching options are displayed mentioning their scope. The active value\n"

5352

5369

"that bzr will take into account is the first one displayed for each option."

5353

5370

msgstr ""

5354

5371

5355

#: bzrlib/config.py:3970

5372

#: bzrlib/config.py:4012

5356

5373

msgid "If no NAME is given, --all .* is implied."

5357

5374

msgstr ""

5358

5375

5359

#: bzrlib/config.py:3972

5376

#: bzrlib/config.py:4014

5360

5377

msgid ""

5361

5378

"Setting a value is achieved by using name=value without spaces. The value\n"

5362

5379

"is set in the most relevant scope and can be checked by displaying the\n"

5363

5380

"option again."

5364

5381

msgstr ""

5365

5382

5366

#: bzrlib/config.py:3984

5383

#: bzrlib/config.py:4026

5367

5384

msgid "Reduce the scope to the specified configuration file."

5368

5385

msgstr ""

5369

5386

5370

#: bzrlib/config.py:3988

5387

#: bzrlib/config.py:4030

5371

5388

msgid "Display all the defined values for the matching options."

5372

5389

msgstr ""

5373

5390

5374

#: bzrlib/config.py:3990

5391

#: bzrlib/config.py:4032

5375

5392

msgid "Remove the option from the configuration file."

5376

5393

msgstr ""

5377

5394

5451

5468

msgstr[0] ""

5452

5469

msgstr[1] ""

5453

5470

5454

#: bzrlib/controldir.py:710

5471

#: bzrlib/controldir.py:712

5455

5472

msgid "{0} is{1} redirected to {2}"

5456

5473

msgstr ""

5457

5474

5668

5685

msgstr ""

5669

5686

5670

5687

#: bzrlib/errors.py:715

5688

msgid "Invalid branch name: %(name)s"

5689

msgstr ""

5690

5691

#: bzrlib/errors.py:724

5671

5692

msgid "Parent branch already exists: \"%(path)s\"."

5672

5693

msgstr ""

5673

5694

5674

#: bzrlib/errors.py:721

5695

#: bzrlib/errors.py:730

5675

5696

msgid ""

5676

5697

"Directory contains a branch, but no working tree (use bzr checkout if you "

5677

5698

"wish to build a working tree): \"%(path)s\""

5678

5699

msgstr ""

5679

5700

5680

#: bzrlib/errors.py:726

5701

#: bzrlib/errors.py:735

5681

5702

msgid ""

5682

5703

"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""

5683

5704

msgstr ""

5684

5705

5685

#: bzrlib/errors.py:736

5706

#: bzrlib/errors.py:745

5686

5707

msgid ""

5687

5708

"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""

5688

5709

msgstr ""

5689

5710

5690

#: bzrlib/errors.py:746

5711

#: bzrlib/errors.py:755

5691

5712

msgid "No repository present: \"%(path)s\""

5692

5713

msgstr ""

5693

5714

5694

#: bzrlib/errors.py:753

5715

#: bzrlib/errors.py:762

5695

5716

msgid ""

5696

5717

"Unsupported branch format: %(format)s\n"

5697

5718

"Please run 'bzr upgrade'"

5698

5719

msgstr ""

5699

5720

5700

#: bzrlib/errors.py:759

5721

#: bzrlib/errors.py:768

5701

5722

msgid "Unknown %(kind)s format: %(format)r"

5702

5723

msgstr ""

5703

5724

5704

#: bzrlib/errors.py:768

5725

#: bzrlib/errors.py:777

5705

5726

msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."

5706

5727

msgstr ""

5707

5728

5708

#: bzrlib/errors.py:778

5729

#: bzrlib/errors.py:787

5709

5730

msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"

5710

5731

msgstr ""

5711

5732

5712

#: bzrlib/errors.py:793

5733

#: bzrlib/errors.py:802

5713

5734

msgid ""

5714

5735

"%(target)s\n"

5715

5736

"is not compatible with\n"

5717

5738

"%(details)s"

5718

5739

msgstr ""

5719

5740

5720

#: bzrlib/errors.py:809

5741

#: bzrlib/errors.py:818

5721

5742

msgid "Revision is not compatible with %(repo_format)s"

5722

5743

msgstr ""

5723

5744

5724

#: bzrlib/errors.py:819

5745

#: bzrlib/errors.py:828

5725

5746

msgid "%(context_info)s%(path)s is already versioned."

5726

5747

msgstr ""

5727

5748

5728

#: bzrlib/errors.py:840

5749

#: bzrlib/errors.py:849

5729

5750

msgid "%(context_info)s%(path)s is not versioned."

5730

5751

msgstr ""

5731

5752

5732

#: bzrlib/errors.py:861

5753

#: bzrlib/errors.py:870

5733

5754

msgid "Path(s) are not versioned: %(paths_as_string)s"

5734

5755

msgstr ""

5735

5756

5736

#: bzrlib/errors.py:872

5757

#: bzrlib/errors.py:881

5737

5758

msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"

5738

5759

msgstr ""

5739

5760

5740

#: bzrlib/errors.py:891

5761

#: bzrlib/errors.py:900

5741

5762

msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""

5742

5763

msgstr ""

5743

5764

5744

#: bzrlib/errors.py:899

5765

#: bzrlib/errors.py:908

5745

5766

msgid ""

5746

5767

"Filename %(filename)r is not valid in your current filesystem encoding "

5747

5768

"%(fs_encoding)s"

5748

5769

msgstr ""

5749

5770

5750

#: bzrlib/errors.py:910

5771

#: bzrlib/errors.py:919

5751

5772

msgid "Cannot operate on \"%(filename)s\" because it is a control file"

5752

5773

msgstr ""

5753

5774

5754

#: bzrlib/errors.py:928

5775

#: bzrlib/errors.py:937

5755

5776

msgid "The lock for '%(lock_description)s' is in use and cannot be broken."

5756

5777

msgstr ""

5757

5778

5758

#: bzrlib/errors.py:967

5779

#: bzrlib/errors.py:976

5759

5780

msgid "Cannot lock %(lock)s: %(why)s"

5760

5781

msgstr ""

5761

5782

5762

#: bzrlib/errors.py:977

5783

#: bzrlib/errors.py:986

5763

5784

msgid ""

5764

5785

"A transaction related operation was attempted after the transaction finished."

5765

5786

msgstr ""

5766

5787

5767

#: bzrlib/errors.py:1004

5788

#: bzrlib/errors.py:1013

5768

5789

msgid "Cannot lock: transport is read only: %(transport)s"

5769

5790

msgstr ""

5770

5791

5771

#: bzrlib/errors.py:1012

5792

#: bzrlib/errors.py:1021

5772

5793

msgid "Could not acquire lock \"%(lock)s\": %(msg)s"

5773

5794

msgstr ""

5774

5795

5775

#: bzrlib/errors.py:1023

5796

#: bzrlib/errors.py:1032

5776

5797

msgid ""

5777

5798

"Lock was broken while still open: %(lock)s - check storage consistency!"

5778

5799

msgstr ""

5779

5800

5780

#: bzrlib/errors.py:1034

5801

#: bzrlib/errors.py:1043

5781

5802

msgid ""

5782

5803

"Lock was released and re-acquired before being broken: %(lock)s: held by "

5783

5804

"%(holder)r, wanted to break %(target)r"

5784

5805

msgstr ""

5785

5806

5786

#: bzrlib/errors.py:1046

5807

#: bzrlib/errors.py:1055

5787

5808

msgid ""

5788

5809

"Lock is apparently held, but corrupted: %(corruption_info)s\n"

5789

5810

"Use 'bzr break-lock' to clear it"

5790

5811

msgstr ""

5791

5812

5792

#: bzrlib/errors.py:1059

5813

#: bzrlib/errors.py:1068

5793

5814

msgid "Lock not held: %(lock)s"

5794

5815

msgstr ""

5795

5816

5796

#: bzrlib/errors.py:1088

5817

#: bzrlib/errors.py:1097

5797

5818

msgid "No changes to commit"

5798

5819

msgstr ""

5799

5820

5800

#: bzrlib/errors.py:1093

5821

#: bzrlib/errors.py:1102

5801

5822

msgid ""

5802

5823

"Selected-file commit of merges is not supported yet: files %(files_str)s"

5803

5824

msgstr ""

5804

5825

5805

#: bzrlib/errors.py:1103

5826

#: bzrlib/errors.py:1112

5806

5827

msgid ""

5807

5828

"Excluding paths during commit is not supported by repository at "

5808

5829

"%(repository)r."

5809

5830

msgstr ""

5810

5831

5811

#: bzrlib/errors.py:1112

5832

#: bzrlib/errors.py:1121

5812

5833

msgid ""

5813

5834

"The specified commit message contains characters unsupported by the current "

5814

5835

"encoding."

5815

5836

msgstr ""

5816

5837

5817

#: bzrlib/errors.py:1118

5838

#: bzrlib/errors.py:1127

5818

5839

msgid "Upgrade URL cannot work with readonly URLs."

5819

5840

msgstr ""

5820

5841

5821

#: bzrlib/errors.py:1123

5842

#: bzrlib/errors.py:1132

5822

5843

msgid "The branch format %(format)s is already at the most recent format."

5823

5844

msgstr ""

5824

5845

5825

#: bzrlib/errors.py:1146

5846

#: bzrlib/errors.py:1155

5826

5847

msgid "Option --change does not accept revision ranges"

5827

5848

msgstr ""

5828

5849

5829

#: bzrlib/errors.py:1151

5850

#: bzrlib/errors.py:1160

5830

5851

msgid "No namespace registered for string: %(spec)r"

5831

5852

msgstr ""

5832

5853

5833

#: bzrlib/errors.py:1170

5854

#: bzrlib/errors.py:1179

5834

5855

msgid ""

5835

5856

"Requested revision: '%(spec)s' does not exist in branch: "

5836

5857

"%(branch_url)s%(extra)s"

5837

5858

msgstr ""

5838

5859

5839

#: bzrlib/errors.py:1184

5860

#: bzrlib/errors.py:1193

5840

5861

msgid ""

5841

5862

"Operation denied because it would change the main history, which is not "

5842

5863

"permitted by the append_revisions_only setting on branch \"%(location)s\"."

5843

5864

msgstr ""

5844

5865

5845

#: bzrlib/errors.py:1195

5866

#: bzrlib/errors.py:1204

5846

5867

msgid ""

5847

5868

"These branches have diverged. Use the missing command to see how.\n"

5848

5869

"Use the merge command to reconcile them."

5849

5870

msgstr ""

5850

5871

5851

#: bzrlib/errors.py:1215

5872

#: bzrlib/errors.py:1224

5852

5873

msgid ""

5853

5874

"Branches have no common ancestor, and no merge base revision was specified."

5854

5875

msgstr ""

5855

5876

5856

#: bzrlib/errors.py:1221

5877

#: bzrlib/errors.py:1230

5857

5878

msgid ""

5858

5879

"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."

5859

5880

msgstr ""

5860

5881

5861

#: bzrlib/errors.py:1227

5882

#: bzrlib/errors.py:1236

5862

5883

msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"

5863

5884

msgstr ""

5864

5885

5865

#: bzrlib/errors.py:1236

5886

#: bzrlib/errors.py:1245

5866

5887

msgid ""

5867

5888

"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."

5868

5889

msgstr ""

5869

5890

5870

#: bzrlib/errors.py:1245

5891

#: bzrlib/errors.py:1254

5871

5892

msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"

5872

5893

msgstr ""

5873

5894

5874

#: bzrlib/errors.py:1254

5895

#: bzrlib/errors.py:1263

5875

5896

msgid "Branch %(branch)s has no commits."

5876

5897

msgstr ""

5877

5898

5878

#: bzrlib/errors.py:1272

5899

#: bzrlib/errors.py:1281

5879

5900

msgid ""

5880

5901

"Bound branch %(branch)s is out of date with master branch "

5881

5902

"%(master)s.%(extra_help)s"

5882

5903

msgstr ""

5883

5904

5884

#: bzrlib/errors.py:1284

5905

#: bzrlib/errors.py:1293

5885

5906

msgid ""

5886

5907

"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "

5887

5908

"bound to %(remote)s."

5888

5909

msgstr ""

5889

5910

5890

#: bzrlib/errors.py:1296

5911

#: bzrlib/errors.py:1305

5891

5912

msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"

5892

5913

msgstr ""

5893

5914

5894

#: bzrlib/errors.py:1305

5915

#: bzrlib/errors.py:1314

5895

5916

msgid ""

5896

5917

"Unable to connect to target of bound branch %(branch)s => %(target)s: "

5897

5918

"%(error)s"

5898

5919

msgstr ""

5899

5920

5900

#: bzrlib/errors.py:1317

5921

#: bzrlib/errors.py:1326

5901

5922

msgid "Error in processing weave: %(msg)s"

5902

5923

msgstr ""

5903

5924

5904

#: bzrlib/errors.py:1326

5925

#: bzrlib/errors.py:1335

5905

5926

msgid "Revision {%(revision_id)s} already present in %(weave)s"

5906

5927

msgstr ""

5907

5928

5908

#: bzrlib/errors.py:1337

5929

#: bzrlib/errors.py:1346

5909

5930

msgid "Revision {%(revision_id)s} not present in %(weave)s"

5910

5931

msgstr ""

5911

5932

5912

#: bzrlib/errors.py:1347

5933

#: bzrlib/errors.py:1356

5913

5934

msgid "Weave invariant violated: %(what)s"

5914

5935

msgstr ""

5915

5936

5916

#: bzrlib/errors.py:1356

5937

#: bzrlib/errors.py:1365

5917

5938

msgid "Parents are mismatched between two revisions. %(msg)s"

5918

5939

msgstr ""

5919

5940

5920

#: bzrlib/errors.py:1378

5941

#: bzrlib/errors.py:1387

5921

5942

msgid ""

5922

5943

"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "

5923

5944

"%(weave_b)s"

5924

5945

msgstr ""

5925

5946

5926

#: bzrlib/errors.py:1390

5947

#: bzrlib/errors.py:1399

5927

5948

msgid "Versioned file error"

5928

5949

msgstr "バージョン管理されたファイルのエラー"

5929

5950

5930

#: bzrlib/errors.py:1395

5951

#: bzrlib/errors.py:1404

5931

5952

msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."

5932

5953

msgstr "\"%(file_id)s\" にはリビジョン {%(revision_id)s} がありません。"

5933

5954

5934

#: bzrlib/errors.py:1405

5955

#: bzrlib/errors.py:1414

5935

5956

msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."

5936

5957

msgstr "\"%(file_id)s\" にはすでにリビジョン {%(revision_id)s} が存在しています。"

5937

5958

5938

#: bzrlib/errors.py:1415

5959

#: bzrlib/errors.py:1424

5939

5960

msgid "Text did not match its checksum: %(msg)s"

5940

5961

msgstr "テキストがチェックサムと一致しません: %(msg)s"

5941

5962

5942

#: bzrlib/errors.py:1541

5963

#: bzrlib/errors.py:1550

5943

5964

msgid "Export format %(format)r not supported"

5944

5965

msgstr "エクスポートフォーマット %(format)r はサポートされていません"

5945

5966

5946

#: bzrlib/errors.py:1550

5967

#: bzrlib/errors.py:1559

5947

5968

msgid "Transport error: %(msg)s %(orig_error)s"

5948

5969

msgstr ""

5949

5970

5950

#: bzrlib/errors.py:1576

5971

#: bzrlib/errors.py:1585

5951

5972

msgid "Generic bzr smart protocol error: %(details)s"

5952

5973

msgstr ""

5953

5974

5954

#: bzrlib/errors.py:1584

5975

#: bzrlib/errors.py:1593

5955

5976

msgid "Received bad protocol version marker: %(marker)r"

5956

5977

msgstr ""

5957

5978

5958

#: bzrlib/errors.py:1616

5979

#: bzrlib/errors.py:1625

5959

5980

msgid "Transport operation not possible: %(msg)s %(orig_error)s"

5960

5981

msgstr ""

5961

5982

5962

#: bzrlib/errors.py:1621

5983

#: bzrlib/errors.py:1630

5963

5984

msgid "Connection error: %(msg)s %(orig_error)s"

5964

5985

msgstr ""

5965

5986

5966

#: bzrlib/errors.py:1626

5987

#: bzrlib/errors.py:1635

5967

5988

msgid "%(msg)s %(host)s%(port)s%(orig_error)s"

5968

5989

msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"

5969

5990

5970

#: bzrlib/errors.py:1647

5991

#: bzrlib/errors.py:1656

5971

5992

msgid "Connection closed: %(msg)s %(orig_error)s"

5972

5993

msgstr "接続が閉じられました: %(msg)s %(orig_error)s"

5973

5994

5974

#: bzrlib/errors.py:1652

5995

#: bzrlib/errors.py:1661

5975

5996

msgid "Connection Timeout: %(msg)s%(orig_error)s"

5976

5997

msgstr "接続がタイムアウトしました: %(msg)s%(orig_error)s"

5977

5998

5978

#: bzrlib/errors.py:1657

5999

#: bzrlib/errors.py:1666

5979

6000

msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"

5980

6001

msgstr "%(path)s の %(offset)s に対する不正な range アクセス: %(msg)s"

5981

6002

5982

#: bzrlib/errors.py:1667

6003

#: bzrlib/errors.py:1676

5983

6004

msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"

5984

6005

msgstr "%(path)s からの不正な HTTP レスポンス: %(msg)s%(orig_error)s"

5985

6006

5986

#: bzrlib/errors.py:1682

6007

#: bzrlib/errors.py:1691

5987

6008

msgid "Certificate error: %(error)s"

5988

6009

msgstr ""

5989

6010

5990

#: bzrlib/errors.py:1690

6011

#: bzrlib/errors.py:1699

5991

6012

msgid "Invalid http range %(range)r for %(path)s: %(msg)s"

5992

6013

msgstr "%(path) に対する不正な range %(range)r: %(msg)s"

5993

6014

5994

#: bzrlib/errors.py:1704

6015

#: bzrlib/errors.py:1713

5995

6016

msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"

5996

6017

msgstr "%(path)s に HTTP MIME 境界が見つかりません: %(msg)s"

5997

6018

5998

#: bzrlib/errors.py:1712

6019

#: bzrlib/errors.py:1721

5999

6020

msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"

6000

6021

msgstr ""

6001

6022

6002

#: bzrlib/errors.py:1721

6023

#: bzrlib/errors.py:1730

6003

6024

msgid "%(source)s is%(permanently)s redirected to %(target)s"

6004

6025

msgstr ""

6005

6026

6006

#: bzrlib/errors.py:1735

6027

#: bzrlib/errors.py:1744

6007

6028

msgid "Too many redirections"

6008

6029

msgstr "リダイレクションが多すぎます"

6009

6030

6010

#: bzrlib/errors.py:1740

6031

#: bzrlib/errors.py:1749

6011

6032

msgid "Working tree has conflicts."

6012

6033

msgstr "作業ツリーに衝突があります"

6013

6034

6014

#: bzrlib/errors.py:1744

6035

#: bzrlib/errors.py:1753

6015

6036

msgid "Config file %(filename)s is not UTF-8 encoded\n"

6016

6037

msgstr "設定ファイル %(filename)s が UTF-8 でエンコードされていません\n"

6017

6038

6018

#: bzrlib/errors.py:1753

6039

#: bzrlib/errors.py:1762

6019

6040

msgid ""

6020

6041

"Error(s) parsing config file %(filename)s:\n"

6021

6042

"%(errors)s"

6023

6044

"設定ファイル %(filename)s のパースエラー:\n"

6024

6045

"%(error)s"

6025

6046

6026

#: bzrlib/errors.py:1763

6047

#: bzrlib/errors.py:1772

6027

6048

msgid ""

6028

6049

"Bad value \"%(value)s\" for option \"%(name)s\".\n"

6029

6050

"See ``bzr help %(name)s``"

6030

6051

msgstr ""

6031

6052

6032

#: bzrlib/errors.py:1773

6053

#: bzrlib/errors.py:1782

6033

6054

msgid "%(username)r does not seem to contain a reasonable email address"

6034

6055

msgstr "%(username)r に有効な e-mail アドレスが含まれていないようです"

6035

6056

6036

#: bzrlib/errors.py:1782

6057

#: bzrlib/errors.py:1791

6037

6058

msgid "Failed to GPG sign data with command \"%(command_line)s\""

6038

6059

msgstr "\"%(command_line)s\" コマンドでのGPGサインに失敗しました"

6039

6060

6040

#: bzrlib/errors.py:1790

6061

#: bzrlib/errors.py:1799

6041

6062

msgid "Failed to verify GPG signature data with error \"%(error)s\""

6042

6063

msgstr "GPGシグネチャの検証に \"%(error)s\" で失敗しました。"

6043

6064

6044

#: bzrlib/errors.py:1798

6065

#: bzrlib/errors.py:1807

6045

6066

msgid "Unable to import library \"%(library)s\": %(error)s"

6046

6067

msgstr "ライブラリ \"%(library)s\" をインポートできません: %(error)s"

6047

6068

6048

#: bzrlib/errors.py:1806

6069

#: bzrlib/errors.py:1815

6049

6070

msgid "python-gpgme is not installed, it is needed to verify signatures"

6050

6071

msgstr "python-gpgme がインストールされていません。これはシグネチャの検証に必要です。"

6051

6072

6052

#: bzrlib/errors.py:1814

6073

#: bzrlib/errors.py:1823

6053

6074

msgid ""

6054

6075

"The working tree for %(basedir)s has changed since the last commit, but "

6055

6076

"weave merge requires that it be unchanged"

6056

6077

msgstr "作業ツリー %(basedir)s が最後のコミットから変更されています。作業ツリーが変更されている場合weaveマージはできません。"

6057

6078

6058

#: bzrlib/errors.py:1824

6079

#: bzrlib/errors.py:1833

6059

6080

msgid ""

6060

6081

"Can't reprocess and show base, because reprocessing obscures the "

6061

6082

"relationship of conflicting lines to the base"

6062

6083

msgstr ""

6063

6084

6064

#: bzrlib/errors.py:1830

6085

#: bzrlib/errors.py:1839

6065

6086

msgid "Cycle in graph %(graph)r"

6066

6087

msgstr "グラフ %(graph)r がループしています。"

6067

6088

6068

#: bzrlib/errors.py:1858

6089

#: bzrlib/errors.py:1867

6069

6090

msgid "File %(filename)s is not conflicted."

6070

6091

msgstr "%(filename)s は衝突していません"

6071

6092

6072

#: bzrlib/errors.py:1880

6093

#: bzrlib/errors.py:1889

6073

6094

msgid "No bundle was found in \"%(filename)s\"."

6074

6095

msgstr "\"%(filename)s\" にバンドルが見つかりません。"

6075

6096

6076

#: bzrlib/errors.py:1889

6097

#: bzrlib/errors.py:1898

6077

6098

msgid "Unable to handle bundle version %(version)s: %(msg)s"

6078

6099

msgstr ""

6079

6100

6080

#: bzrlib/errors.py:1899

6101

#: bzrlib/errors.py:1908

6081

6102

msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"

6082

6103

msgstr ""

6083

6104

6084

#: bzrlib/errors.py:1912

6105

#: bzrlib/errors.py:1921

6085

6106

msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"

6086

6107

msgstr ""

6087

6108

6088

#: bzrlib/errors.py:1922

6109

#: bzrlib/errors.py:1931

6089

6110

msgid "Key %(key)s is already present in map"

6090

6111

msgstr ""

6091

6112

6092

#: bzrlib/errors.py:1927

6113

#: bzrlib/errors.py:1936

6093

6114

msgid "The prefix %(prefix)s is in the help search path twice."

6094

6115

msgstr ""

6095

6116

6096

#: bzrlib/errors.py:1937

6117

#: bzrlib/errors.py:1946

6097

6118

msgid ""

6098

6119

"No final name for trans_id %(trans_id)r\n"

6099

6120

"file-id: %(file_id)r\n"

6100

6121

"root trans-id: %(root_trans_id)r\n"

6101

6122

msgstr ""

6102

6123

6103

#: bzrlib/errors.py:1969

6124

#: bzrlib/errors.py:1978

6104

6125

msgid "Attempt to reuse a transform that has already been applied."

6105

6126

msgstr ""

6106

6127

6107

#: bzrlib/errors.py:1974

6128

#: bzrlib/errors.py:1983

6108

6129

msgid "Moving the root directory is not supported at this time"

6109

6130

msgstr "いまのところ、ルートディレクトリの移動はサポートされていません"

6110

6131

6111

#: bzrlib/errors.py:1979

6132

#: bzrlib/errors.py:1988

6112

6133

msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"

6113

6134

msgstr "%(from_path)s から %(to_path)s へのリネームに失敗しました: %(why)s"

6114

6135

6115

#: bzrlib/errors.py:1990

6136

#: bzrlib/errors.py:1999

6116

6137

msgid ""

6117

6138

"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

6118

6139

msgstr ""

6119

6140

"移動できません。 %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

6120

6141

6121

#: bzrlib/errors.py:2026

6142

#: bzrlib/errors.py:2035

6122

6143

msgid ""

6123

6144

"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"

6124

6145

msgstr ""

6125

6146

"%(from_path)s%(operator)s から %(to_path)s%(_has_extra)s%(extra)s へリネームできません"

6126

6147

6127

#: bzrlib/errors.py:2056

6148

#: bzrlib/errors.py:2065

6128

6149

msgid "Unable to import paramiko (required for sftp support): %(error)s"

6129

6150

msgstr ""

6130

6151

6131

#: bzrlib/errors.py:2064

6152

#: bzrlib/errors.py:2073

6132

6153

msgid "Nothing to merge."

6133

6154

msgstr ""

6134

6155

6135

#: bzrlib/errors.py:2069

6156

#: bzrlib/errors.py:2078

6136

6157

msgid "Format %(format)s cannot be initialised by this version of bzr."

6137

6158

msgstr ""

6138

6159

6139

#: bzrlib/errors.py:2078

6160

#: bzrlib/errors.py:2087

6140

6161

msgid ""

6141

6162

"Cannot convert from format %(from_format)s to format %(format)s. "

6142

6163

"%(problem)s"

6143

6164

msgstr ""

6144

6165

6145

#: bzrlib/errors.py:2090

6166

#: bzrlib/errors.py:2099

6146

6167

msgid "Could not find an appropriate Differ for file \"%(path)s\""

6147

6168

msgstr ""

6148

6169

6149

#: bzrlib/errors.py:2098

6170

#: bzrlib/errors.py:2107

6150

6171

msgid "%(exe_name)s could not be found on this machine"

6151

6172

msgstr ""

6152

6173

6153

#: bzrlib/errors.py:2106

6174

#: bzrlib/errors.py:2115

6154

6175

msgid "Diff is not installed on this machine: %(msg)s"

6155

6176

msgstr ""

6156

6177

6157

#: bzrlib/errors.py:2114

6178

#: bzrlib/errors.py:2123

6158

6179

msgid "Diff3 is not installed on this machine."

6159

6180

msgstr ""

6160

6181

6161

#: bzrlib/errors.py:2120

6182

#: bzrlib/errors.py:2129

6162

6183

msgid "The content being inserted is already present."

6163

6184

msgstr ""

6164

6185

6165

#: bzrlib/errors.py:2125

6186

#: bzrlib/errors.py:2134

6166

6187

msgid ""

6167

6188

"This tree contains left-over files from a failed operation.\n"

6168

6189

" Please examine %(limbo_dir)s to see if it contains any files you wish "

6170

6191

" keep, and delete it when you are done."

6171

6192

msgstr ""

6172

6193

6173

#: bzrlib/errors.py:2136

6194

#: bzrlib/errors.py:2145

6174

6195

msgid ""

6175

6196

"This tree contains left-over files from a failed operation.\n"

6176

6197

" Please examine %(pending_deletion)s to see if it contains any files you\n"

6177

6198

" wish to keep, and delete it when you are done."

6178

6199

msgstr ""

6179

6200

6180

#: bzrlib/errors.py:2146

6201

#: bzrlib/errors.py:2155

6181

6202

msgid ""

6182

6203

"Unable to delete transform temporary directory %(limbo_dir)s.\n"

6183

6204

" Please examine %(limbo_dir)s to see if it contains any files you wish "

6185

6206

" keep, and delete it when you are done."

6186

6207

msgstr ""

6187

6208

6188

#: bzrlib/errors.py:2157

6209

#: bzrlib/errors.py:2166

6189

6210

msgid ""

6190

6211

"Unable to delete transform temporary directory %(pending_deletion)s. Please "

6191

6212

"examine %(pending_deletion)s to see if it contains any files you wish to "

6192

6213

"keep, and delete it when you are done."

6193

6214

msgstr ""

6194

6215

6195

#: bzrlib/errors.py:2167

6216

#: bzrlib/errors.py:2176

6196

6217

msgid "Working tree is out of date, please run 'bzr update'.%(more)s"

6197

6218

msgstr ""

6198

6219

6199

#: bzrlib/errors.py:2181

6220

#: bzrlib/errors.py:2190

6200

6221

msgid ""

6201

6222

"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."

6202

6223

msgstr ""

6203

6224

6204

#: bzrlib/errors.py:2194

6225

#: bzrlib/errors.py:2203

6205

6226

msgid "Error in merge modified format"

6206

6227

msgstr ""

6207

6228

6208

#: bzrlib/errors.py:2199

6229

#: bzrlib/errors.py:2208

6209

6230

msgid "Format error in conflict listings"

6210

6231

msgstr ""

6211

6232

6212

#: bzrlib/errors.py:2203

6233

#: bzrlib/errors.py:2212

6213

6234

msgid ""

6214

6235

"Inconsistency in dirstate file %(dirstate_path)s.\n"

6215

6236

"Error: %(description)s"

6216

6237

msgstr ""

6217

6238

6218

#: bzrlib/errors.py:2214

6239

#: bzrlib/errors.py:2223

6219

6240

msgid ""

6220

6241

"An error has been detected in the repository %(repo_path)s.\n"

6221

6242

"Please run bzr reconcile on this repository."

6222

6243

msgstr ""

6223

6244

6224

#: bzrlib/errors.py:2225

6245

#: bzrlib/errors.py:2234

6225

6246

msgid ""

6226

6247

"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"

6227

6248

"reason: %(reason)s"

6228

6249

msgstr ""

6229

6250

6230

#: bzrlib/errors.py:2238

6251

#: bzrlib/errors.py:2247

6231

6252

msgid ""

6232

6253

"An inconsistent delta was supplied: %(delta)r\n"

6233

6254

"reason: %(reason)s"

6234

6255

msgstr ""

6235

6256

6236

#: bzrlib/errors.py:2250

6257

#: bzrlib/errors.py:2259

6237

6258

msgid "To use this feature you must upgrade your branch at %(path)s."

6238

6259

msgstr ""

6239

6260

6240

#: bzrlib/errors.py:2259

6261

#: bzrlib/errors.py:2268

6241

6262

msgid "To use this feature you must upgrade your repository at %(path)s."

6242

6263

msgstr ""

6243

6264

6244

#: bzrlib/errors.py:2264

6265

#: bzrlib/errors.py:2273

6245

6266

msgid ""

6246

6267

"To use this feature you must upgrade your branch at %(path)s to a format "

6247

6268

"which supports rich roots."

6248

6269

msgstr ""

6249

6270

6250

#: bzrlib/errors.py:2270

6271

#: bzrlib/errors.py:2279

6251

6272

msgid "Cannot perform local-only commits on unbound branches."

6252

6273

msgstr ""

6253

6274

6254

#: bzrlib/errors.py:2275

6275

#: bzrlib/errors.py:2284

6255

6276

msgid "The method %(mname)s is not supported on objects of type %(tname)s."

6256

6277

msgstr ""

6257

6278

6258

#: bzrlib/errors.py:2296

6279

#: bzrlib/errors.py:2305

6259

6280

msgid "Ghost tags not supported by format %(format)r."

6260

6281

msgstr ""

6261

6282

6262

#: bzrlib/errors.py:2304

6283

#: bzrlib/errors.py:2313

6263

6284

msgid "File is binary but should be text."

6264

6285

msgstr ""

6265

6286

6266

#: bzrlib/errors.py:2309

6287

#: bzrlib/errors.py:2318

6267

6288

msgid "The path %(path)s is not permitted on this platform"

6268

6289

msgstr ""

6269

6290

6270

#: bzrlib/errors.py:2318

6291

#: bzrlib/errors.py:2327

6271

6292

msgid ""

6272

6293

"Testament did not match expected value.\n"

6273

6294

" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"

6274

6295

" {%(measured)s}"

6275

6296

msgstr ""

6276

6297

6277

#: bzrlib/errors.py:2330

6298

#: bzrlib/errors.py:2339

6278

6299

msgid "Not a bzr revision-bundle: %(text)r"

6279

6300

msgstr ""

6280

6301

6281

#: bzrlib/errors.py:2339

6302

#: bzrlib/errors.py:2348

6282

6303

msgid "Bad bzr revision-bundle: %(text)r"

6283

6304

msgstr ""

6284

6305

6285

#: bzrlib/errors.py:2348

6306

#: bzrlib/errors.py:2357

6286

6307

msgid "Malformed bzr revision-bundle header: %(text)r"

6287

6308

msgstr ""

6288

6309

6289

#: bzrlib/errors.py:2353

6310

#: bzrlib/errors.py:2362

6290

6311

msgid "Malformed patches in bzr revision-bundle: %(text)r"

6291

6312

msgstr ""

6292

6313

6293

#: bzrlib/errors.py:2358

6314

#: bzrlib/errors.py:2367

6294

6315

msgid "Malformed footer in bzr revision-bundle: %(text)r"

6295

6316

msgstr ""

6296

6317

6297

#: bzrlib/errors.py:2363

6318

#: bzrlib/errors.py:2372

6298

6319

msgid "End of line marker was not \\n in bzr revision-bundle"

6299

6320

msgstr ""

6300

6321

6301

#: bzrlib/errors.py:2373

6322

#: bzrlib/errors.py:2382

6302

6323

msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"

6303

6324

msgstr ""

6304

6325

6305

#: bzrlib/errors.py:2383

6326

#: bzrlib/errors.py:2392

6306

6327

msgid "Root class for inventory serialization errors"

6307

6328

msgstr ""

6308

6329

6309

#: bzrlib/errors.py:2387

6330

#: bzrlib/errors.py:2396

6310

6331

msgid ""

6311

6332

"The inventory was not in the expected format:\n"

6312

6333

" %(msg)s"

6313

6334

msgstr ""

6314

6335

6315

#: bzrlib/errors.py:2396

6336

#: bzrlib/errors.py:2405

6316

6337

msgid "This operation requires rich root data storage"

6317

6338

msgstr ""

6318

6339

6319

#: bzrlib/errors.py:2409

6340

#: bzrlib/errors.py:2418

6320

6341

msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"

6321

6342

msgstr ""

6322

6343

6323

#: bzrlib/errors.py:2418

6344

#: bzrlib/errors.py:2427

6324

6345

msgid ""

6325

6346

"Don't know how to handle SSH connections. Please set BZR_SSH environment "

6326

6347

"variable."

6327

6348

msgstr ""

6328

6349

6329

#: bzrlib/errors.py:2425

6350

#: bzrlib/errors.py:2434

6330

6351

msgid ""

6331

6352

"Could not determine revno for {%(revision_id)s} because its ancestry shows a "

6332

6353

"ghost at {%(ghost_revision_id)s}"

6333

6354

msgstr ""

6334

6355

6335

#: bzrlib/errors.py:2435

6356

#: bzrlib/errors.py:2444

6336

6357

msgid "Ghost revision {%(revision_id)s} cannot be used here."

6337

6358

msgstr ""

6338

6359

6339

#: bzrlib/errors.py:2486

6360

#: bzrlib/errors.py:2495

6340

6361

msgid ""

6341

6362

"A merge directive must provide either a bundle or a public branch location."

6342

6363

msgstr ""

6343

6364

6344

#: bzrlib/errors.py:2493

6365

#: bzrlib/errors.py:2502

6345

6366

msgid "Bad merge directive payload %(start)r"

6346

6367

msgstr ""

6347

6368

6348

#: bzrlib/errors.py:2503

6369

#: bzrlib/errors.py:2512

6349

6370

msgid "Preview patch does not match requested changes."

6350

6371

msgstr ""

6351

6372

6352

#: bzrlib/errors.py:2509

6373

#: bzrlib/errors.py:2518

6353

6374

msgid "Patch_type was %(patch_type)s, but no patch was supplied."

6354

6375

msgstr ""

6355

6376

6356

#: bzrlib/errors.py:2519

6377

#: bzrlib/errors.py:2528

6357

6378

msgid ""

6358

6379

"Your branch does not have all of the revisions required in order to merge "

6359

6380

"this merge directive and the target location specified in the merge "

6360

6381

"directive is not a branch: %(location)s."

6361

6382

msgstr ""

6362

6383

6363

#: bzrlib/errors.py:2531

6384

#: bzrlib/errors.py:2540

6364

6385

msgid "Unsupported entry kind %(kind)s"

6365

6386

msgstr ""

6366

6387

6367

#: bzrlib/errors.py:2539

6388

#: bzrlib/errors.py:2548

6368

6389

msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"

6369

6390

msgstr ""

6370

6391

6371

#: bzrlib/errors.py:2549

6392

#: bzrlib/errors.py:2558

6372

6393

msgid "Subsume target %(other_tree)s needs to be upgraded."

6373

6394

msgstr ""

6374

6395

6375

#: bzrlib/errors.py:2568

6396

#: bzrlib/errors.py:2577

6376

6397

msgid "No such tag: %(tag_name)s"

6377

6398

msgstr ""

6378

6399

6379

#: bzrlib/errors.py:2576

6400

#: bzrlib/errors.py:2585

6380

6401

msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."

6381

6402

msgstr ""

6382

6403

6383

#: bzrlib/errors.py:2585

6404

#: bzrlib/errors.py:2594

6384

6405

msgid "Tag %(tag_name)s already exists."

6385

6406

msgstr ""

6386

6407

6387

#: bzrlib/errors.py:2593

6408

#: bzrlib/errors.py:2602

6388

6409

msgid ""

6389

6410

"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "

6390

6411

"bugs\" for more information on this feature."

6391

6412

msgstr ""

6392

6413

6393

#: bzrlib/errors.py:2603

6414

#: bzrlib/errors.py:2612

6394

6415

msgid ""

6395

6416

"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"

6396

6417

msgstr ""

6397

6418

6398

#: bzrlib/errors.py:2613

6419

#: bzrlib/errors.py:2622

6399

6420

msgid ""

6400

6421

"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"

6401

6422

msgstr ""

6402

6423

6403

#: bzrlib/errors.py:2623

6424

#: bzrlib/errors.py:2632

6404

6425

msgid "Invalid line in bugs property: '%(line)s'"

6405

6426

msgstr ""

6406

6427

6407

#: bzrlib/errors.py:2631

6428

#: bzrlib/errors.py:2640

6408

6429

msgid "Invalid bug status: '%(status)s'"

6409

6430

msgstr ""

6410

6431

6411

#: bzrlib/errors.py:2639

6432

#: bzrlib/errors.py:2648

6412

6433

msgid "Could not understand response from smart server: %(response_tuple)r"

6413

6434

msgstr ""

6414

6435

6415

#: bzrlib/errors.py:2678

6436

#: bzrlib/errors.py:2687

6416

6437

msgid "Server sent an unexpected error: %(error_tuple)r"

6417

6438

msgstr ""

6418

6439

6419

#: bzrlib/errors.py:2697

6440

#: bzrlib/errors.py:2706

6420

6441

msgid "Unrecognised container format: %(container_format)r"

6421

6442

msgstr ""

6422

6443

6423

#: bzrlib/errors.py:2705

6444

#: bzrlib/errors.py:2714

6424

6445

msgid "Unexpected end of container stream"

6425

6446

msgstr ""

6426

6447

6427

#: bzrlib/errors.py:2710

6448

#: bzrlib/errors.py:2719

6428

6449

msgid "Unknown record type: %(record_type)r"

6429

6450

msgstr ""

6430

6451

6431

#: bzrlib/errors.py:2718

6452

#: bzrlib/errors.py:2727

6432

6453

msgid "Invalid record: %(reason)s"

6433

6454

msgstr ""

6434

6455

6435

#: bzrlib/errors.py:2726

6456

#: bzrlib/errors.py:2735

6436

6457

msgid "Container has data after end marker: %(excess)r"

6437

6458

msgstr ""

6438

6459

6439

#: bzrlib/errors.py:2734

6460

#: bzrlib/errors.py:2743

6440

6461

msgid "Container has multiple records with the same name: %(name)s"

6441

6462

msgstr ""

6442

6463

6443

#: bzrlib/errors.py:2747

6464

#: bzrlib/errors.py:2756

6444

6465

msgid "Corrupt or incompatible data stream: %(reason)s"

6445

6466

msgstr ""

6446

6467

6447

#: bzrlib/errors.py:2755

6468

#: bzrlib/errors.py:2764

6448

6469

msgid "SMTP error: %(error)s"

6449

6470

msgstr ""

6450

6471

6451

#: bzrlib/errors.py:2763

6472

#: bzrlib/errors.py:2772

6452

6473

msgid "No message supplied."

6453

6474

msgstr ""

6454

6475

6455

#: bzrlib/errors.py:2768

6476

#: bzrlib/errors.py:2777

6456

6477

msgid "No mail-to address (--mail-to) or output (-o) specified."

6457

6478

msgstr ""

6458

6479

6459

#: bzrlib/errors.py:2773

6460

msgid "Unknown mail client: %(mail_client)s"

6461

msgstr ""

6462

6463

#: bzrlib/errors.py:2781

6480

#: bzrlib/errors.py:2782

6464

6481

msgid ""

6465

6482

"Unable to find mail client with the following names: "

6466

6483

"%(mail_command_list_string)s"

6467

6484

msgstr ""

6468

6485

6469

#: bzrlib/errors.py:2791

6486

#: bzrlib/errors.py:2792

6470

6487

msgid "SMTP connection to %(host)s refused"

6471

6488

msgstr ""

6472

6489

6473

#: bzrlib/errors.py:2800

6490

#: bzrlib/errors.py:2801

6474

6491

msgid "Please specify smtp_server. No server at default %(host)s."

6475

6492

msgstr ""

6476

6493

6477

#: bzrlib/errors.py:2814

6494

#: bzrlib/errors.py:2815

6478

6495

msgid ""

6479

6496

"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"

6480

6497

"reconfigure."

6481

6498

msgstr ""

6482

6499

6483

#: bzrlib/errors.py:2826

6500

#: bzrlib/errors.py:2827

6484

6501

msgid "'%(display_url)s' is already a branch."

6485

6502

msgstr ""

6486

6503

6487

#: bzrlib/errors.py:2831

6504

#: bzrlib/errors.py:2832

6488

6505

msgid "'%(display_url)s' is already a tree."

6489

6506

msgstr ""

6490

6507

6491

#: bzrlib/errors.py:2836

6508

#: bzrlib/errors.py:2837

6492

6509

msgid "'%(display_url)s' is already a checkout."

6493

6510

msgstr ""

6494

6511

6495

#: bzrlib/errors.py:2841

6512

#: bzrlib/errors.py:2842

6496

6513

msgid "'%(display_url)s' is already a lightweight checkout."

6497

6514

msgstr ""

6498

6515

6499

#: bzrlib/errors.py:2846

6516

#: bzrlib/errors.py:2847

6500

6517

msgid "'%(display_url)s' is already using a shared repository."

6501

6518

msgstr ""

6502

6519

6503

#: bzrlib/errors.py:2851

6520

#: bzrlib/errors.py:2852

6504

6521

msgid "'%(display_url)s' is already standalone."

6505

6522

msgstr ""

6506

6523

6507

#: bzrlib/errors.py:2856

6524

#: bzrlib/errors.py:2857

6508

6525

msgid "Shared repository '%(display_url)s' already creates working trees."

6509

6526

msgstr ""

6510

6527

6511

#: bzrlib/errors.py:2862

6528

#: bzrlib/errors.py:2863

6512

6529

msgid ""

6513

6530

"Shared repository '%(display_url)s' already doesn't create working trees."

6514

6531

msgstr ""

6515

6532

6516

#: bzrlib/errors.py:2868

6533

#: bzrlib/errors.py:2869

6517

6534

msgid "Requested reconfiguration of '%(display_url)s' is not supported."

6518

6535

msgstr ""

6519

6536

6520

#: bzrlib/errors.py:2873

6537

#: bzrlib/errors.py:2874

6521

6538

msgid "No location could be found to bind to at %(display_url)s."

6522

6539

msgstr ""

6523

6540

6524

#: bzrlib/errors.py:2878

6541

#: bzrlib/errors.py:2879

6525

6542

msgid ""

6526

6543

"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "

6527

6544

"status).%(more)s"

6528

6545

msgstr ""

6529

6546

6530

#: bzrlib/errors.py:2897

6547

#: bzrlib/errors.py:2898

6531

6548

msgid ""

6532

6549

"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"

6533

6550

"list).%(more)s"

6534

6551

msgstr ""

6535

6552

6536

#: bzrlib/errors.py:2903

6553

#: bzrlib/errors.py:2904

6537

6554

msgid "Variable {%(name)s} is not available."

6538

6555

msgstr ""

6539

6556

6540

#: bzrlib/errors.py:2911

6557

#: bzrlib/errors.py:2912

6541

6558

msgid "No template specified."

6542

6559

msgstr ""

6543

6560

6544

#: bzrlib/errors.py:2916

6561

#: bzrlib/errors.py:2917

6545

6562

msgid "Unable to create symlink %(path_str)son this platform"

6546

6563

msgstr ""

6547

6564

6548

#: bzrlib/errors.py:2931

6565

#: bzrlib/errors.py:2932

6549

6566

msgid ""

6550

6567

"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "

6551

6568

"\"original\", \"local\"."

6552

6569

msgstr ""

6553

6570

6554

#: bzrlib/errors.py:2965

6571

#: bzrlib/errors.py:2966

6555

6572

msgid ""

6556

6573

"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"

6557

6574

msgstr ""

6558

6575

6559

#: bzrlib/errors.py:2977

6576

#: bzrlib/errors.py:2978

6560

6577

msgid "The \"%(config_id)s\" configuration does not exist."

6561

6578

msgstr ""

6562

6579

6563

#: bzrlib/errors.py:2985

6580

#: bzrlib/errors.py:2986

6564

6581

msgid "The \"%(option_name)s\" configuration option does not exist."

6565

6582

msgstr ""

6566

6583

6567

#: bzrlib/errors.py:2993

6584

#: bzrlib/errors.py:2994

6568

6585

msgid "The alias \"%(alias_name)s\" does not exist."

6569

6586

msgstr ""

6570

6587

6571

#: bzrlib/errors.py:3007

6588

#: bzrlib/errors.py:3008

6572

6589

msgid "\"%(alias_name)s\" is not a valid location alias."

6573

6590

msgstr ""

6574

6591

6575

#: bzrlib/errors.py:3015

6592

#: bzrlib/errors.py:3016

6576

6593

msgid "No %(alias_name)s location assigned."

6577

6594

msgstr ""

6578

6595

6579

#: bzrlib/errors.py:3023

6596

#: bzrlib/errors.py:3024

6580

6597

msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."

6581

6598

msgstr ""

6582

6599

6583

#: bzrlib/errors.py:3033

6600

#: bzrlib/errors.py:3034

6584

6601

msgid "Unknown rules detected: %(unknowns_str)s."

6585

6602

msgstr ""

6586

6603

6587

#: bzrlib/errors.py:3044

6604

#: bzrlib/errors.py:3045

6588

6605

msgid "Tip change rejected: %(msg)s"

6589

6606

msgstr ""

6590

6607

6591

#: bzrlib/errors.py:3052

6608

#: bzrlib/errors.py:3053

6592

6609

msgid "Shelf corrupt."

6593

6610

msgstr ""

6594

6611

6595

#: bzrlib/errors.py:3057

6612

#: bzrlib/errors.py:3058

6596

6613

msgid "Corruption while decompressing repository file%(orig_error)s"

6597

6614

msgstr ""

6598

6615

6599

#: bzrlib/errors.py:3069

6616

#: bzrlib/errors.py:3070

6600

6617

msgid "No changes are shelved with id \"%(shelf_id)d\"."

6601

6618

msgstr ""

6602

6619

6603

#: bzrlib/errors.py:3077

6620

#: bzrlib/errors.py:3078

6604

6621

msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."

6605

6622

msgstr ""

6606

6623

6607

#: bzrlib/errors.py:3085

6624

#: bzrlib/errors.py:3086

6608

6625

msgid ""

6609

6626

"An attempt to access a url outside the server jail was made: '%(url)s'."

6610

6627

msgstr ""

6611

6628

6612

#: bzrlib/errors.py:3093

6629

#: bzrlib/errors.py:3094

6613

6630

msgid "The user aborted the operation."

6614

6631

msgstr ""

6615

6632

6616

#: bzrlib/errors.py:3098

6633

#: bzrlib/errors.py:3099

6617

6634

msgid "Branching '%(url)s'(%(format)s) must create a working tree."

6618

6635

msgstr ""

6619

6636

6620

#: bzrlib/errors.py:3108

6637

#: bzrlib/errors.py:3109

6621

6638

msgid "No such view: %(view_name)s."

6622

6639

msgstr ""

6623

6640

6624

#: bzrlib/errors.py:3118

6641

#: bzrlib/errors.py:3119

6625

6642

msgid ""

6626

6643

"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "

6627

6644

"to a later format."

6628

6645

msgstr ""

6629

6646

6630

#: bzrlib/errors.py:3127

6647

#: bzrlib/errors.py:3128

6631

6648

msgid ""

6632

6649

"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"

6633

6650

msgstr ""

6634

6651

6635

#: bzrlib/errors.py:3194

6652

#: bzrlib/errors.py:3195

6636

6653

msgid "%(bzrdir)r does not support co-located branches."

6637

6654

msgstr ""

6638

6655

6639

#: bzrlib/errors.py:3200

6656

#: bzrlib/errors.py:3201

6640

6657

msgid ""

6641

6658

"Unable to determine your name.\n"

6642

6659

"Please, set your name with the 'whoami' command.\n"

6643

6660

"E.g. bzr whoami \"Your Name <name@example.com>\""

6644

6661

msgstr ""

6645

6662

6646

#: bzrlib/errors.py:3209

6663

#: bzrlib/errors.py:3210

6647

6664

msgid "Invalid pattern(s) found. %(msg)s"

6648

6665

msgstr ""

6649

6666

6650

#: bzrlib/errors.py:3217

6667

#: bzrlib/errors.py:3218

6651

6668

msgid ""

6652

6669

"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "

6653

6670

"unbind` to fix."

6654

6671

msgstr ""

6655

6672

6656

#: bzrlib/errors.py:3228

6673

#: bzrlib/errors.py:3229

6657

6674

msgid "Loop involving %(refs)r while expanding \"%(string)s\"."

6658

6675

msgstr ""

6659

6676

6660

#: bzrlib/errors.py:3237

6677

#: bzrlib/errors.py:3238

6661

6678

msgid "Option %(name)s is not defined while expanding \"%(string)s\"."

6662

6679

msgstr ""

6663

6680

6664

#: bzrlib/errors.py:3246

6681

#: bzrlib/errors.py:3247

6665

6682

msgid ""

6666

6683

"No compatible object available for operations from %(source)r to %(target)r."

6667

6684

msgstr ""

6668

6685

6669

#: bzrlib/errors.py:3256

6686

#: bzrlib/errors.py:3257

6670

6687

msgid ""

6671

6688

"VFS requests over the smart server are not allowed. Encountered: %(method)s, "

6672

6689

"%(arguments)s."

6673

6690

msgstr ""

6674

6691

6675

#: bzrlib/errors.py:3266

6692

#: bzrlib/errors.py:3267

6676

6693

msgid ""

6677

6694

"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "

6678

6695

"format %(format)r"

6679

6696

msgstr ""

6680

6697

6681

#: bzrlib/errors.py:3278

6698

#: bzrlib/errors.py:3279

6682

6699

msgid ""

6683

6700

"Missing feature %(feature)s not provided by this version of Bazaar or any "

6684

6701

"plugin."

6685

6702

msgstr ""

6686

6703

6687

#: bzrlib/errors.py:3291

6704

#: bzrlib/errors.py:3292

6688

6705

msgid "Binary files section encountered."

6689

6706

msgstr ""

6690

6707

6691

#: bzrlib/errors.py:3299

6708

#: bzrlib/errors.py:3300

6692

6709

msgid ""

6693

6710

"Malformed patch header. %(desc)s\n"

6694

6711

"%(line)r"

6695

6712

msgstr ""

6696

6713

6697

#: bzrlib/errors.py:3308

6714

#: bzrlib/errors.py:3309

6698

6715

msgid ""

6699

6716

"Malformed hunk header. %(desc)s\n"

6700

6717

"%(line)r"

6701

6718

msgstr ""

6702

6719

6703

#: bzrlib/errors.py:3317

6720

#: bzrlib/errors.py:3318

6704

6721

msgid ""

6705

6722

"Malformed line. %(desc)s\n"

6706

6723

"%(line)r"

6707

6724

msgstr ""

6708

6725

6709

#: bzrlib/errors.py:3327

6726

#: bzrlib/errors.py:3328

6710

6727

msgid ""

6711

6728

"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "

6712

6729

"but patch says it should be \"%(patch_line)s\""

6713

6730

msgstr ""

6714

6731

6715

#: bzrlib/errors.py:3338

6732

#: bzrlib/errors.py:3339

6716

6733

msgid "The feature %(feature)s has already been registered."

6717

6734

msgstr ""

6718

6735

6764

6781

"regular push."

6765

6782

msgstr ""

6766

6783

6767

#: bzrlib/gpg.py:119 bzrlib/gpg.py:460

6784

#: bzrlib/gpg.py:366

6785

msgid "No GnuPG key results for pattern: {0}"

6786

msgstr ""

6787

6788

#: bzrlib/gpg.py:439

6768

6789

msgid "{0} commits with valid signatures"

6769

6790

msgstr ""

6770

6791

6771

#: bzrlib/gpg.py:123 bzrlib/gpg.py:465

6792

#: bzrlib/gpg.py:445

6772

6793

msgid "{0} commit with unknown key"

6773

6794

msgid_plural "{0} commits with unknown keys"

6774

6795

msgstr[0] ""

6775

6796

msgstr[1] ""

6776

6797

6777

#: bzrlib/gpg.py:129 bzrlib/gpg.py:472

6798

#: bzrlib/gpg.py:453

6778

6799

msgid "{0} commit not valid"

6779

6800

msgid_plural "{0} commits not valid"

6780

6801

msgstr[0] ""

6781

6802

msgstr[1] ""

6782

6803

6783

#: bzrlib/gpg.py:135 bzrlib/gpg.py:479

6804

#: bzrlib/gpg.py:461

6784

6805

msgid "{0} commit not signed"

6785

6806

msgid_plural "{0} commits not signed"

6786

6807

msgstr[0] ""

6787

6808

msgstr[1] ""

6788

6809

6789

#: bzrlib/gpg.py:141 bzrlib/gpg.py:486

6810

#: bzrlib/gpg.py:469

6790

6811

msgid "{0} commit with key now expired"

6791

6812

msgid_plural "{0} commits with key now expired"

6792

6813

msgstr[0] ""

6793

6814

msgstr[1] ""

6794

6815

6795

#: bzrlib/gpg.py:343

6796

msgid "No GnuPG key results for pattern: {0}"

6797

msgstr ""

6816

#: bzrlib/gpg.py:489

6817

msgid "{0} commit by author {1} with key {2} now expired"

6818

msgid_plural "{0} commits by author {1} with key {2} now expired"

6819

msgstr[0] ""

6820

msgstr[1] ""

6798

6821

6799

#: bzrlib/gpg.py:386

6822

#: bzrlib/gpg.py:505

6800

6823

msgid "{0} signed {1} commit"

6801

6824

msgid_plural "{0} signed {1} commits"

6802

6825

msgstr[0] ""

6803

6826

msgstr[1] ""

6804

6827

6805

#: bzrlib/gpg.py:403 bzrlib/gpg.py:419

6828

#: bzrlib/gpg.py:522 bzrlib/gpg.py:539

6806

6829

msgid "{0} commit by author {1}"

6807

6830

msgid_plural "{0} commits by author {1}"

6808

6831

msgstr[0] ""

6809

6832

msgstr[1] ""

6810

6833

6811

#: bzrlib/gpg.py:433

6834

#: bzrlib/gpg.py:554

6812

6835

msgid "Unknown key {0} signed {1} commit"

6813

6836

msgid_plural "Unknown key {0} signed {1} commits"

6814

6837

msgstr[0] ""

6815

6838

msgstr[1] ""

6816

6839

6817

#: bzrlib/gpg.py:452

6818

msgid "{0} commit by author {1} with key {2} now expired"

6819

msgid_plural "{0} commits by author {1} with key {2} now expired"

6820

msgstr[0] ""

6821

msgstr[1] ""

6822

6823

6840

#: bzrlib/groupcompress.py:1739

6824

6841

#, python-format

6825

6842

msgid "Insert claimed random_id=True, but then inserted %r two times"

6826

6843

msgstr ""

6827

6844

6828

#: bzrlib/hooks.py:331

6845

#: bzrlib/hooks.py:313

6829

6846

#, python-format

6830

6847

msgid "Introduced in: %s"

6831

6848

msgstr ""

6832

6849

6833

#: bzrlib/hooks.py:334

6850

#: bzrlib/hooks.py:316

6834

6851

#, python-format

6835

6852

msgid "Deprecated in: %s"

6836

6853

msgstr ""

6879

6896

"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"

6880

6897

msgstr ""

6881

6898

6882

#: bzrlib/log.py:572

6899

#: bzrlib/log.py:563

6883

6900

msgid "--exclude-common-ancestry requires two different revisions"

6884

6901

msgstr ""

6885

6902

6886

#: bzrlib/log.py:574

6903

#: bzrlib/log.py:565

6887

6904

#, python-format

6888

6905

msgid "invalid direction %r"

6889

6906

msgstr ""

6890

6907

6891

#: bzrlib/log.py:662

6908

#: bzrlib/log.py:653

6892

6909

msgid "Start revision not found in history of end revision."

6893

6910

msgstr ""

6894

6911

6895

#: bzrlib/log.py:1080 bzrlib/log.py:1138

6912

#: bzrlib/log.py:1071 bzrlib/log.py:1129

6896

6913

msgid "Logging revision 0 is invalid."

6897

6914

msgstr ""

6898

6915

6899

#: bzrlib/log.py:1082 bzrlib/log.py:1140

6916

#: bzrlib/log.py:1073 bzrlib/log.py:1131

6900

6917

msgid "Start revision must be older than the end revision."

6901

6918

msgstr ""

6902

6919

6903

#: bzrlib/log.py:1827

6920

#: bzrlib/log.py:1818

6904

6921

#, python-format

6905

6922

msgid "unknown log formatter: %r"

6906

6923

msgstr ""

6907

6924

6908

#: bzrlib/log.py:2123

6925

#: bzrlib/log.py:2114

6909

6926

msgid "fixes bug"

6910

6927

msgid_plural "fixes bugs"

6911

6928

msgstr[0] ""

6920

6937

msgid "%d conflicts encountered."

6921

6938

msgstr ""

6922

6939

6923

#: bzrlib/merge.py:845 bzrlib/merge.py:1933

6940

#: bzrlib/merge.py:845 bzrlib/merge.py:1868

6924

6941

msgid "Preparing file merge"

6925

6942

msgstr ""

6926

6943

7042

7059

msgid "lstat/stat of ({0!r}): {1!r}"

7043

7060

msgstr ""

7044

7061

7045

#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019

7062

#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041

7046

7063

#, python-format

7047

7064

msgid "sorry, %r not allowed in path"

7048

7065

msgstr ""

7049

7066

7050

#: bzrlib/osutils.py:1237

7067

#: bzrlib/osutils.py:1259

7051

7068

#, python-format

7052

7069

msgid "%r is too short to calculate a relative path"

7053

7070

msgstr ""

7086

7103

msgid "Generate only the shell function, don't enable it"

7087

7104

msgstr ""

7088

7105

7089

#: bzrlib/plugins/launchpad/__init__.py:81

7106

#: bzrlib/plugins/launchpad/account.py:66

7107

msgid "Setting ssh/sftp usernames for launchpad.net."

7108

msgstr ""

7109

7110

#: bzrlib/plugins/launchpad/cmds.py:44

7090

7111

msgid "Register a branch with launchpad.net."

7091

7112

msgstr ""

7092

7113

7093

#: bzrlib/plugins/launchpad/__init__.py:83

7114

#: bzrlib/plugins/launchpad/cmds.py:46

7094

7115

msgid ""

7095

7116

"This command lists a bzr branch in the directory of branches on\n"

7096

7117

"launchpad.net. Registration allows the branch to be associated with\n"

7097

7118

"bugs or specifications."

7098

7119

msgstr ""

7099

7120

7100

#: bzrlib/plugins/launchpad/__init__.py:87

7121

#: bzrlib/plugins/launchpad/cmds.py:50

7101

7122

msgid ""

7102

7123

"Before using this command you must register the project to which the\n"

7103

7124

"branch belongs, and create an account for yourself on launchpad.net."

7104

7125

msgstr ""

7105

7126

7106

#: bzrlib/plugins/launchpad/__init__.py:90

7127

#: bzrlib/plugins/launchpad/cmds.py:53

7107

7128

msgid ""

7108

7129

"arguments:\n"

7109

7130

" public_url: The publicly visible url for the branch to register.\n"

7115

7136

" otherwise error."

7116

7137

msgstr ""

7117

7138

7118

#: bzrlib/plugins/launchpad/__init__.py:99

7139

#: bzrlib/plugins/launchpad/cmds.py:62

7119

7140

msgid ""

7120

7141

"example:\n"

7121

7142

" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"

7122

7143

" --project fooproject"

7123

7144

msgstr ""

7124

7145

7125

#: bzrlib/plugins/launchpad/__init__.py:106

7146

#: bzrlib/plugins/launchpad/cmds.py:69

7126

7147

msgid "Launchpad project short name to associate with the branch."

7127

7148

msgstr ""

7128

7149

7129

#: bzrlib/plugins/launchpad/__init__.py:113

7150

#: bzrlib/plugins/launchpad/cmds.py:76

7130

7151

msgid ""

7131

7152

"Short name for the branch; by default taken from the last component of the "

7132

7153

"url."

7133

7154

msgstr ""

7134

7155

7135

#: bzrlib/plugins/launchpad/__init__.py:117

7156

#: bzrlib/plugins/launchpad/cmds.py:80

7136

7157

msgid "One-sentence description of the branch."

7137

7158

msgstr ""

7138

7159

7139

#: bzrlib/plugins/launchpad/__init__.py:120

7160

#: bzrlib/plugins/launchpad/cmds.py:83

7140

7161

msgid "Longer description of the purpose or contents of the branch."

7141

7162

msgstr ""

7142

7163

7143

#: bzrlib/plugins/launchpad/__init__.py:123

7164

#: bzrlib/plugins/launchpad/cmds.py:86

7144

7165

msgid "Branch author's email address, if not yourself."

7145

7166

msgstr ""

7146

7167

7147

#: bzrlib/plugins/launchpad/__init__.py:126

7168

#: bzrlib/plugins/launchpad/cmds.py:89

7148

7169

msgid "The bug this branch fixes."

7149

7170

msgstr ""

7150

7171

7151

#: bzrlib/plugins/launchpad/__init__.py:129

7172

#: bzrlib/plugins/launchpad/cmds.py:92

7152

7173

msgid "Prepare the request but don't actually send it."

7153

7174

msgstr ""

7154

7175

7155

#: bzrlib/plugins/launchpad/__init__.py:151

7176

#: bzrlib/plugins/launchpad/cmds.py:114

7156

7177

msgid ""

7157

7178

"register-branch requires a public branch url - see bzr help register-branch."

7158

7179

msgstr ""

7159

7180

7160

#: bzrlib/plugins/launchpad/__init__.py:159

7181

#: bzrlib/plugins/launchpad/cmds.py:122

7161

7182

msgid "--product is deprecated; please use --project."

7162

7183

msgstr ""

7163

7184

7164

#: bzrlib/plugins/launchpad/__init__.py:191

7185

#: bzrlib/plugins/launchpad/cmds.py:152

7165

7186

msgid "Open a Launchpad branch page in your web browser."

7166

7187

msgstr ""

7167

7188

7168

#: bzrlib/plugins/launchpad/__init__.py:196

7189

#: bzrlib/plugins/launchpad/cmds.py:157

7169

7190

msgid "Do not actually open the browser. Just say the URL we would use."

7170

7191

msgstr ""

7171

7192

7172

#: bzrlib/plugins/launchpad/__init__.py:231

7193

#: bzrlib/plugins/launchpad/cmds.py:192

7173

7194

#, python-format

7174

7195

msgid "Opening %s in web browser"

7175

7196

msgstr ""

7176

7197

7177

#: bzrlib/plugins/launchpad/__init__.py:241

7198

#: bzrlib/plugins/launchpad/cmds.py:200

7178

7199

msgid "Show or set the Launchpad user ID."

7179

7200

msgstr ""

7180

7201

7181

#: bzrlib/plugins/launchpad/__init__.py:243

7202

#: bzrlib/plugins/launchpad/cmds.py:202

7182

7203

msgid ""

7183

7204

"When communicating with Launchpad, some commands need to know your\n"

7184

7205

"Launchpad user ID. This command can be used to set or show the\n"

7185

7206

"user ID that Bazaar will use for such communication."

7186

7207

msgstr ""

7187

7208

7188

#: bzrlib/plugins/launchpad/__init__.py:247

7209

#: bzrlib/plugins/launchpad/cmds.py:206

7189

7210

msgid ""

7190

7211

":Examples:\n"

7191

7212

" Show the Launchpad ID of the current user::"

7192

7213

msgstr ""

7193

7214

7194

#: bzrlib/plugins/launchpad/__init__.py:250

7215

#: bzrlib/plugins/launchpad/cmds.py:209

7195

7216

msgid " bzr launchpad-login"

7196

7217

msgstr ""

7197

7218

7198

#: bzrlib/plugins/launchpad/__init__.py:252

7219

#: bzrlib/plugins/launchpad/cmds.py:211

7199

7220

msgid " Set the Launchpad ID of the current user to 'bob'::"

7200

7221

msgstr ""

7201

7222

7202

#: bzrlib/plugins/launchpad/__init__.py:254

7223

#: bzrlib/plugins/launchpad/cmds.py:213

7203

7224

msgid " bzr launchpad-login bob"

7204

7225

msgstr ""

7205

7226

7206

#: bzrlib/plugins/launchpad/__init__.py:261

7227

#: bzrlib/plugins/launchpad/cmds.py:220

7207

7228

msgid "Don't check that the user name is valid."

7208

7229

msgstr ""

7209

7230

7210

#: bzrlib/plugins/launchpad/__init__.py:276

7211

#: bzrlib/plugins/launchpad/__init__.py:287

7231

#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246

7212

7232

msgid "Launchpad user ID exists and has SSH keys.\n"

7213

7233

msgstr ""

7214

7234

7215

#: bzrlib/plugins/launchpad/__init__.py:279

7235

#: bzrlib/plugins/launchpad/cmds.py:238

7216

7236

msgid "No Launchpad user ID configured.\n"

7217

7237

msgstr ""

7218

7238

7219

#: bzrlib/plugins/launchpad/__init__.py:290

7239

#: bzrlib/plugins/launchpad/cmds.py:249

7220

7240

#, python-format

7221

7241

msgid "Launchpad user ID set to '%s'.\n"

7222

7242

msgstr ""

7223

7243

7224

#: bzrlib/plugins/launchpad/__init__.py:298

7244

#: bzrlib/plugins/launchpad/cmds.py:255

7225

7245

msgid "Ask Launchpad to mirror a branch now."

7226

7246

msgstr ""

7227

7247

7228

#: bzrlib/plugins/launchpad/__init__.py:318

7248

#: bzrlib/plugins/launchpad/cmds.py:272

7229

7249

msgid "Propose merging a branch on Launchpad."

7230

7250

msgstr ""

7231

7251

7232

#: bzrlib/plugins/launchpad/__init__.py:320

7252

#: bzrlib/plugins/launchpad/cmds.py:274

7233

7253

msgid ""

7234

7254

"This will open your usual editor to provide the initial comment. When it\n"

7235

7255

"has created the proposal, it will open it in your default web browser."

7236

7256

msgstr ""

7237

7257

7238

#: bzrlib/plugins/launchpad/__init__.py:323

7258

#: bzrlib/plugins/launchpad/cmds.py:277

7239

7259

msgid ""

7240

7260

"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"

7241

7261

"is not supplied, the remembered submit branch will be used. If no submit\n"

7242

7262

"branch is remembered, the development focus will be used."

7243

7263

msgstr ""

7244

7264

7245

#: bzrlib/plugins/launchpad/__init__.py:327

7265

#: bzrlib/plugins/launchpad/cmds.py:281

7246

7266

msgid ""

7247

7267

"By default, the SUBMIT_BRANCH's review team will be requested to review\n"

7248

7268

"the merge proposal. This can be overriden by specifying --review (-R).\n"

7250

7270

"may optionally be followed by '=' and the review type. For example:"

7251

7271

msgstr ""

7252

7272

7253

#: bzrlib/plugins/launchpad/__init__.py:332

7273

#: bzrlib/plugins/launchpad/cmds.py:286

7254

7274

msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"

7255

7275

msgstr ""

7256

7276

7257

#: bzrlib/plugins/launchpad/__init__.py:334

7277

#: bzrlib/plugins/launchpad/cmds.py:288

7258

7278

msgid ""

7259

7279

"This will propose a merge, request \"jrandom\" to perform a review of\n"

7260

7280

"unspecified type, and request \"review-team\" to perform a \"qa\" review."

7261

7281

msgstr ""

7262

7282

7263

#: bzrlib/plugins/launchpad/__init__.py:339

7283

#: bzrlib/plugins/launchpad/cmds.py:293

7264

7284

msgid "Propose the merge on staging."

7265

7285

msgstr ""

7266

7286

7267

#: bzrlib/plugins/launchpad/__init__.py:341

7287

#: bzrlib/plugins/launchpad/cmds.py:295

7268

7288

msgid "Commit message."

7269

7289

msgstr ""

7270

7290

7271

#: bzrlib/plugins/launchpad/__init__.py:343

7291

#: bzrlib/plugins/launchpad/cmds.py:297

7272

7292

msgid "Mark the proposal as approved immediately."

7273

7293

msgstr ""

7274

7294

7275

#: bzrlib/plugins/launchpad/__init__.py:345

7295

#: bzrlib/plugins/launchpad/cmds.py:298

7296

msgid "The bug this proposal fixes."

7297

msgstr ""

7298

7299

#: bzrlib/plugins/launchpad/cmds.py:300

7276

7300

msgid "Requested reviewer and optional type."

7277

7301

msgstr ""

7278

7302

7279

#: bzrlib/plugins/launchpad/__init__.py:382

7303

#: bzrlib/plugins/launchpad/cmds.py:335

7280

7304

msgid "Find the proposal to merge this revision."

7281

7305

msgstr ""

7282

7306

7283

#: bzrlib/plugins/launchpad/__init__.py:384

7307

#: bzrlib/plugins/launchpad/cmds.py:337

7284

7308

msgid ""

7285

7309

"Finds the merge proposal(s) that discussed landing the specified revision.\n"

7286

7310

"This works only if the selected branch was the merge proposal target, and\n"

7288

7312

"are opened in a web browser."

7289

7313

msgstr ""

7290

7314

7291

#: bzrlib/plugins/launchpad/__init__.py:389

7315

#: bzrlib/plugins/launchpad/cmds.py:342

7292

7316

msgid ""

7293

7317

"Any revision involved in the merge may be specified-- the revision in\n"

7294

7318

"which the merge was performed, or one of the revisions that was merged."

7295

7319

msgstr ""

7296

7320

7297

#: bzrlib/plugins/launchpad/__init__.py:392

7321

#: bzrlib/plugins/launchpad/cmds.py:345

7298

7322

msgid "So, to find the merge proposal that reviewed line 1 of README::"

7299

7323

msgstr ""

7300

7324

7301

#: bzrlib/plugins/launchpad/__init__.py:394

7325

#: bzrlib/plugins/launchpad/cmds.py:347

7302

7326

msgid " bzr lp-find-proposal -r annotate:README:1"

7303

7327

msgstr ""

7304

7328

7305

#: bzrlib/plugins/launchpad/__init__.py:409

7329

#: bzrlib/plugins/launchpad/cmds.py:363

7306

7330

msgid "No review found."

7307

7331

msgstr ""

7308

7332

7309

#: bzrlib/plugins/launchpad/__init__.py:410

7333

#: bzrlib/plugins/launchpad/cmds.py:364

7310

7334

#, python-format

7311

7335

msgid "%d proposals(s) found."

7312

7336

msgstr ""

7313

7337

7314

#: bzrlib/plugins/launchpad/__init__.py:420

7338

#: bzrlib/plugins/launchpad/cmds.py:374

7315

7339

msgid "Finding revision-id"

7316

7340

msgstr ""

7317

7341

7318

#: bzrlib/plugins/launchpad/__init__.py:427

7342

#: bzrlib/plugins/launchpad/cmds.py:381

7319

7343

msgid "Finding merge"

7320

7344

msgstr ""

7321

7345

7322

#: bzrlib/plugins/launchpad/__init__.py:432

7346

#: bzrlib/plugins/launchpad/cmds.py:386

7323

7347

msgid "Finding revno"

7324

7348

msgstr ""

7325

7349

7326

#: bzrlib/plugins/launchpad/__init__.py:437

7350

#: bzrlib/plugins/launchpad/cmds.py:392

7327

7351

msgid "Finding Launchpad branch"

7328

7352

msgstr ""

7329

7353

7330

#: bzrlib/plugins/launchpad/__init__.py:440

7354

#: bzrlib/plugins/launchpad/cmds.py:395

7331

7355

msgid "Finding proposals"

7332

7356

msgstr ""

7333

7357

7334

#: bzrlib/plugins/launchpad/account.py:66

7335

msgid "Setting ssh/sftp usernames for launchpad.net."

7336

msgstr ""

7337

7338

7358

#: bzrlib/plugins/launchpad/lp_api.py:241

7339

7359

#: bzrlib/plugins/launchpad/lp_api.py:246

7340

7360

#, python-format

7378

7398

" remote: {2}"

7379

7399

msgstr ""

7380

7400

7381

#: bzrlib/plugins/launchpad/lp_propose.py:149

7401

#: bzrlib/plugins/launchpad/lp_propose.py:150

7382

7402

#, python-format

7383

7403

msgid "There is already a branch merge proposal: %s"

7384

7404

msgstr ""

7385

7405

7386

#: bzrlib/plugins/weave_fmt/bzrdir.py:236

7406

#: bzrlib/plugins/weave_fmt/bzrdir.py:237

7387

7407

msgid "pb parameter to convert() is deprecated"

7388

7408

msgstr ""

7389

7409

7390

#: bzrlib/plugins/weave_fmt/bzrdir.py:239

7410

#: bzrlib/plugins/weave_fmt/bzrdir.py:240

7391

7411

msgid "starting upgrade from format 4 to 5"

7392

7412

msgstr ""

7393

7413

7394

#: bzrlib/plugins/weave_fmt/bzrdir.py:249

7414

#: bzrlib/plugins/weave_fmt/bzrdir.py:250

7395

7415

msgid "note: upgrade may be faster if all store files are ungzipped first"

7396

7416

msgstr ""

7397

7417

7398

#: bzrlib/plugins/weave_fmt/bzrdir.py:278

7418

#: bzrlib/plugins/weave_fmt/bzrdir.py:279

7399

7419

msgid "converting revision"

7400

7420

msgstr ""

7401

7421

7402

#: bzrlib/plugins/weave_fmt/bzrdir.py:283

7422

#: bzrlib/plugins/weave_fmt/bzrdir.py:284

7403

7423

msgid "upgraded to weaves:"

7404

7424

msgstr ""

7405

7425

7406

#: bzrlib/plugins/weave_fmt/bzrdir.py:284

7426

#: bzrlib/plugins/weave_fmt/bzrdir.py:285

7407

7427

#, python-format

7408

7428

msgid "%6d revisions and inventories"

7409

7429

msgstr ""

7410

7430

7411

#: bzrlib/plugins/weave_fmt/bzrdir.py:286

7431

#: bzrlib/plugins/weave_fmt/bzrdir.py:287

7412

7432

#, python-format

7413

7433

msgid "%6d revisions not present"

7414

7434

msgstr ""

7415

7435

7416

#: bzrlib/plugins/weave_fmt/bzrdir.py:288

7436

#: bzrlib/plugins/weave_fmt/bzrdir.py:289

7417

7437

#, python-format

7418

7438

msgid "%6d texts"

7419

7439

msgstr ""

7420

7440

7421

#: bzrlib/plugins/weave_fmt/bzrdir.py:324

7441

#: bzrlib/plugins/weave_fmt/bzrdir.py:325

7422

7442

msgid "writing weave"

7423

7443

msgstr ""

7424

7444

7425

#: bzrlib/plugins/weave_fmt/bzrdir.py:328

7426

#: bzrlib/plugins/weave_fmt/bzrdir.py:330

7445

#: bzrlib/plugins/weave_fmt/bzrdir.py:329

7446

#: bzrlib/plugins/weave_fmt/bzrdir.py:331

7427

7447

msgid "inventory"

7428

7448

msgstr ""

7429

7449

7430

#: bzrlib/plugins/weave_fmt/bzrdir.py:347

7450

#: bzrlib/plugins/weave_fmt/bzrdir.py:348

7431

7451

msgid "write revision"

7432

7452

msgstr ""

7433

7453

7434

#: bzrlib/plugins/weave_fmt/bzrdir.py:361

7454

#: bzrlib/plugins/weave_fmt/bzrdir.py:362

7435

7455

msgid "loading revision"

7436

7456

msgstr ""

7437

7457

7438

#: bzrlib/plugins/weave_fmt/bzrdir.py:366

7458

#: bzrlib/plugins/weave_fmt/bzrdir.py:367

7439

7459

#, python-format

7440

7460

msgid "revision {%s} not present in branch; will be converted as a ghost"

7441

7461

msgstr ""

7442

7462

7443

#: bzrlib/plugins/weave_fmt/bzrdir.py:506

7463

#: bzrlib/plugins/weave_fmt/bzrdir.py:507

7444

7464

msgid "starting upgrade from format 5 to 6"

7445

7465

msgstr ""

7446

7466

7447

#: bzrlib/plugins/weave_fmt/bzrdir.py:516

7467

#: bzrlib/plugins/weave_fmt/bzrdir.py:517

7448

7468

#, python-format

7449

7469

msgid "adding prefixes to %s"

7450

7470

msgstr ""

7451

7471

7452

#: bzrlib/plugins/weave_fmt/bzrdir.py:556

7472

#: bzrlib/plugins/weave_fmt/bzrdir.py:557

7453

7473

msgid "starting upgrade from format 6 to metadir"

7454

7474

msgstr ""

7455

7475

7456

#: bzrlib/plugins/weave_fmt/bzrdir.py:564

7476

#: bzrlib/plugins/weave_fmt/bzrdir.py:565

7457

7477

msgid "Removing ancestry.weave"

7458

7478

msgstr ""

7459

7479

7460

#: bzrlib/plugins/weave_fmt/bzrdir.py:569

7480

#: bzrlib/plugins/weave_fmt/bzrdir.py:570

7461

7481

msgid "Finding branch files"

7462

7482

msgstr ""

7463

7483

7464

#: bzrlib/plugins/weave_fmt/bzrdir.py:579

7484

#: bzrlib/plugins/weave_fmt/bzrdir.py:580

7465

7485

msgid "Upgrading repository"

7466

7486

msgstr ""

7467

7487

7468

#: bzrlib/plugins/weave_fmt/bzrdir.py:589

7488

#: bzrlib/plugins/weave_fmt/bzrdir.py:590

7469

7489

msgid "Upgrading branch"

7470

7490

msgstr ""

7471

7491

7472

#: bzrlib/plugins/weave_fmt/bzrdir.py:612

7492

#: bzrlib/plugins/weave_fmt/bzrdir.py:613

7473

7493

msgid "No working tree."

7474

7494

msgstr ""

7475

7495

7476

#: bzrlib/plugins/weave_fmt/bzrdir.py:619

7496

#: bzrlib/plugins/weave_fmt/bzrdir.py:620

7477

7497

msgid "Upgrading working tree"

7478

7498

msgstr ""

7479

7499

7480

#: bzrlib/plugins/weave_fmt/bzrdir.py:640

7500

#: bzrlib/plugins/weave_fmt/bzrdir.py:641

7481

7501

#, python-format

7482

7502

msgid "Make %s lock"

7483

7503

msgstr ""

7484

7504

7485

#: bzrlib/plugins/weave_fmt/bzrdir.py:651

7505

#: bzrlib/plugins/weave_fmt/bzrdir.py:652

7486

7506

#, python-format

7487

7507

msgid "Moving %s"

7488

7508

msgstr ""

7509

7529

msgid "Too many redirections trying to make %s."

7510

7530

msgstr ""

7511

7531

7512

#: bzrlib/push.py:147

7532

#: bzrlib/push.py:148

7513

7533

msgid ""

7514

7534

"These branches have diverged. See \"bzr help diverged-branches\" for more "

7515

7535

"information."

7516

7536

msgstr ""

7517

7537

7518

#: bzrlib/push.py:151

7538

#: bzrlib/push.py:152

7519

7539

#, python-format

7520

7540

msgid ""

7521

7541

"It is not possible to losslessly push to %s. You may want to use dpush "

7522

7542

"instead."

7523

7543

msgstr ""

7524

7544

7525

#: bzrlib/push.py:157

7545

#: bzrlib/push.py:158

7526

7546

#, python-format

7527

7547

msgid ""

7528

7548

"At %s you have a valid .bzr control directory, but not a branch or "

7639

7659

msgid "{0} => {1}"

7640

7660

msgstr ""

7641

7661

7642

#: bzrlib/repository.py:1787

7662

#: bzrlib/repository.py:1799

7643

7663

msgid "Moving repository to repository.backup"

7644

7664

msgstr ""

7645

7665

7646

#: bzrlib/repository.py:1794

7666

#: bzrlib/repository.py:1806

7647

7667

msgid "Creating new repository"

7648

7668

msgstr ""

7649

7669

7650

#: bzrlib/repository.py:1799

7670

#: bzrlib/repository.py:1811

7651

7671

msgid "Copying content"

7652

7672

msgstr ""

7653

7673

7654

#: bzrlib/repository.py:1803

7674

#: bzrlib/repository.py:1815

7655

7675

msgid "Deleting old repository content"

7656

7676

msgstr ""

7657

7677

7658

#: bzrlib/repository.py:1805

7678

#: bzrlib/repository.py:1817

7659

7679

msgid "repository converted"

7660

7680

msgstr ""

7661

7681

7663

7683

msgid "Using {0} {1}"

7664

7684

msgstr ""

7665

7685

7666

#: bzrlib/send.py:58

7686

#: bzrlib/send.py:59

7667

7687

#, python-format

7668

7688

msgid "Mail client \"%s\" does not support specifying body"

7669

7689

msgstr ""

7670

7690

7671

#: bzrlib/send.py:62

7691

#: bzrlib/send.py:63

7672

7692

msgid "--remember requires a branch to be specified."

7673

7693

msgstr ""

7674

7694

7675

#: bzrlib/send.py:77

7695

#: bzrlib/send.py:78

7676

7696

msgid "No submit branch known or specified"

7677

7697

msgstr ""

7678

7698

7679

#: bzrlib/send.py:80

7699

#: bzrlib/send.py:81

7680

7700

msgid "Using saved {0} location \"{1}\" to determine what changes to submit."

7681

7701

msgstr ""

7682

7702

7683

#: bzrlib/send.py:98

7703

#: bzrlib/send.py:99

7684

7704

#, python-format

7685

7705

msgid "No such send format '%s'."

7686

7706

msgstr ""

7687

7707

7688

#: bzrlib/send.py:114

7708

#: bzrlib/send.py:115

7689

7709

msgid "bzr send takes at most two one revision identifiers"

7690

7710

msgstr ""

7691

7711

7692

#: bzrlib/send.py:127

7712

#: bzrlib/send.py:128

7693

7713

msgid "No revisions to submit."

7694

7714

msgstr ""

7695

7715

7696

#: bzrlib/send.py:139

7716

#: bzrlib/send.py:140

7697

7717

msgid ""

7698

7718

"- not supported for merge directives that use more than one output file."

7699

7719

msgstr ""

7700

7720

7701

#: bzrlib/send.py:185

7721

#: bzrlib/send.py:186

7702

7722

msgid "Format 0.9 does not permit bundle with no patch"

7703

7723

msgstr ""

7704

7724

7855

7875

"anyway, use --force."

7856

7876

msgstr ""

7857

7877

7858

#: bzrlib/switch.py:125

7878

#: bzrlib/switch.py:129

7859

7879

msgid "Cannot switch a branch, only a checkout."

7860

7880

msgstr ""

7861

7881

7862

#: bzrlib/switch.py:163

7882

#: bzrlib/switch.py:167

7863

7883

#, python-format

7864

7884

msgid "Tree is up to date at revision %d."

7865

7885

msgstr ""

7866

7886

7867

#: bzrlib/switch.py:169

7887

#: bzrlib/switch.py:173

7868

7888

#, python-format

7869

7889

msgid "Updated to revision %d."

7870

7890

msgstr ""

7871

7891

7872

#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747

7892

#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736

7873

7893

msgid "Apply phase"

7874

7894

msgstr ""

7875

7895

7876

#: bzrlib/transform.py:1773 bzrlib/transform.py:1841

7896

#: bzrlib/transform.py:1762 bzrlib/transform.py:1830

7877

7897

msgid "removing file"

7878

7898

msgstr ""

7879

7899

7880

#: bzrlib/transform.py:1791 bzrlib/transform.py:1876

7900

#: bzrlib/transform.py:1780 bzrlib/transform.py:1865

7881

7901

msgid "adding file"

7882

7902

msgstr ""

7883

7903

7884

#: bzrlib/transform.py:2591

7904

#: bzrlib/transform.py:2590

7885

7905

msgid "Building tree"

7886

7906

msgstr ""

7887

7907

7888

#: bzrlib/transform.py:2681 bzrlib/transform.py:2708

7908

#: bzrlib/transform.py:2680 bzrlib/transform.py:2707

7889

7909

msgid "Adding file contents"

7890

7910

msgstr ""

7891

7911

7892

#: bzrlib/transform.py:3028

7912

#: bzrlib/transform.py:3009

7893

7913

msgid "Resolution pass"

7894

7914

msgstr ""

7895

7915

7898

7918

msgid "Authenticated as %s"

7899

7919

msgstr ""

7900

7920

7901

#: bzrlib/tree.py:634

7921

#: bzrlib/tree.py:637

7902

7922

msgid "*** {0} content-filter: {1} => {2!r}"

7903

7923

msgstr ""

7904

7924

7957

7977

msgid "failed to clean-up {0}: {1}"

7958

7978

msgstr ""

7959

7979

7960

#: bzrlib/vf_repository.py:1090

7980

#: bzrlib/vf_repository.py:1091

7961

7981

msgid "inventories"

7962

7982

msgstr ""

7963

7983

7964

#: bzrlib/vf_repository.py:1116

7984

#: bzrlib/vf_repository.py:1117

7965

7985

msgid "texts"

7966

7986

msgstr ""

7967

7987

7968

#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630

7988

#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631

7969

7989

msgid "Calculating text parents"

7970

7990

msgstr ""

7971

7991

7972

#: bzrlib/vf_repository.py:1706

7992

#: bzrlib/vf_repository.py:1707

7973

7993

msgid "Fetch texts"

7974

7994

msgstr ""

7975

7995

7976

#: bzrlib/vf_repository.py:2535

7996

#: bzrlib/vf_repository.py:2536

7977

7997

msgid "loading text store"

7978

7998

msgstr ""

7979

7999

7980

#: bzrlib/vf_repository.py:2541

8000

#: bzrlib/vf_repository.py:2542

7981

8001

msgid "checking text graph"

7982

8002

msgstr ""

7983

8003

7984

#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009

7985

#: bzrlib/vf_repository.py:3124

8004

#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012

8005

#: bzrlib/vf_repository.py:3127

7986

8006

msgid "Transferring revisions"

7987

8007

msgstr ""

7988

8008

8028

8048

msgid "PageFaultCount %8d"

8029

8049

msgstr ""

8030

8050

8031

#: bzrlib/workingtree.py:1478

8051

#: bzrlib/workingtree.py:1482

8032

8052

msgid "Rerun update after fixing the conflicts."

8033

8053

msgstr ""

8034

8054

8038

8058

8039

8059

#: dummy/help_topics/basic/detail.txt:1

8040

8060

msgid ""

8041

"Bazaar 2.5b6 -- a free distributed version-control tool\n"

8061

"Bazaar 2.6.0dev1 -- a free distributed version-control tool\n"

8042

8062

"http://bazaar.canonical.com/"

8043

8063

msgstr ""

8044

8064

12258

12278

msgstr ""

12259

12279

12260

12280

#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56

12261

#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259

12281

#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262

12262

12282

msgid "Introduced in: 2.2"

12263

12283

msgstr ""

12264

12284

12276

12296

"~~~~"

12277

12297

msgstr ""

12278

12298

12279

#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290

12280

#: en/help_topics/hooks.txt:304

12299

#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293

12300

#: en/help_topics/hooks.txt:307

12281

12301

msgid "Introduced in: 1.8"

12282

12302

msgstr ""

12283

12303

12307

12327

"~~~~~~~~~~~~~~~~~~~~~~"

12308

12328

msgstr ""

12309

12329

12310

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418

12330

#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421

12311

12331

msgid "Introduced in: 1.4"

12312

12332

msgstr ""

12313

12333

12319

12339

"uncommit will all trigger this hook."

12320

12340

msgstr ""

12321

12341

12322

#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389

12342

#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392

12323

12343

msgid ""

12324

12344

"post_commit\n"

12325

12345

"~~~~~~~~~~~"

12327

12347

12328

12348

#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86

12329

12349

#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110

12330

#: en/help_topics/hooks.txt:145

12331

12350

msgid "Introduced in: 0.15"

12332

12351

msgstr ""

12333

12352

12432

12451

12433

12452

#: en/help_topics/hooks.txt:142

12434

12453

msgid ""

12435

"set_rh\n"

12436

"~~~~~~"

12437

msgstr ""

12438

12439

#: en/help_topics/hooks.txt:147

12440

msgid ""

12441

"Invoked whenever the revision history has been set via\n"

12442

"set_revision_history. The api signature is (branch, revision_history),\n"

12443

"and the branch will be write-locked. The set_rh hook can be expensive\n"

12444

"for bzr to trigger, a better hook to use is\n"

12445

"Branch.post_change_branch_tip."

12446

msgstr ""

12447

12448

#: en/help_topics/hooks.txt:153

12449

msgid ""

12450

12454

"transform_fallback_location\n"

12451

12455

"~~~~~~~~~~~~~~~~~~~~~~~~~~~"

12452

12456

msgstr ""

12453

12457

12454

#: en/help_topics/hooks.txt:156

12458

#: en/help_topics/hooks.txt:145

12455

12459

msgid "Introduced in: 1.9"

12456

12460

msgstr ""

12457

12461

12458

#: en/help_topics/hooks.txt:158

12462

#: en/help_topics/hooks.txt:147

12459

12463

msgid ""

12460

12464

"Called when a stacked branch is activating its fallback locations.\n"

12461

12465

"transform_fallback_location is called with (branch, url), and should\n"

12469

12473

"however undefined."

12470

12474

msgstr ""

12471

12475

12472

#: en/help_topics/hooks.txt:169

12476

#: en/help_topics/hooks.txt:158

12473

12477

msgid ""

12474

12478

"CommandHooks\n"

12475

12479

"------------"

12476

12480

msgstr ""

12477

12481

12478

#: en/help_topics/hooks.txt:172

12482

#: en/help_topics/hooks.txt:161

12479

12483

msgid ""

12480

12484

"extend_command\n"

12481

12485

"~~~~~~~~~~~~~~"

12482

12486

msgstr ""

12483

12487

12484

#: en/help_topics/hooks.txt:175

12488

#: en/help_topics/hooks.txt:164

12485

12489

msgid "Introduced in: 1.13"

12486

12490

msgstr ""

12487

12491

12488

#: en/help_topics/hooks.txt:177

12492

#: en/help_topics/hooks.txt:166

12489

12493

msgid ""

12490

12494

"Called after creating a command object to allow modifications such as\n"

12491

12495

"adding or removing options, docs etc. Called with the new\n"

12492

12496

"bzrlib.commands.Command object."

12493

12497

msgstr ""

12494

12498

12495

#: en/help_topics/hooks.txt:181

12499

#: en/help_topics/hooks.txt:170

12496

12500

msgid ""

12497

12501

"get_command\n"

12498

12502

"~~~~~~~~~~~"

12499

12503

msgstr ""

12500

12504

12501

#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196

12502

#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464

12505

#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185

12506

#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467

12503

12507

msgid "Introduced in: 1.17"

12504

12508

msgstr ""

12505

12509

12506

#: en/help_topics/hooks.txt:186

12510

#: en/help_topics/hooks.txt:175

12507

12511

msgid ""

12508

12512

"Called when creating a single command. Called with (cmd_or_None,\n"

12509

12513

"command_name). get_command should either return the cmd_or_None\n"

12513

12517

"plugin_cmds.register_lazy."

12514

12518

msgstr ""

12515

12519

12516

#: en/help_topics/hooks.txt:193

12520

#: en/help_topics/hooks.txt:182

12517

12521

msgid ""

12518

12522

"get_missing_command\n"

12519

12523

"~~~~~~~~~~~~~~~~~~~"

12520

12524

msgstr ""

12521

12525

12522

#: en/help_topics/hooks.txt:198

12526

#: en/help_topics/hooks.txt:187

12523

12527

msgid ""

12524

12528

"Called when creating a single command if no command could be found.\n"

12525

12529

"Called with (command_name). get_missing_command should either return\n"

12526

12530

"None, or a Command object to be used for the command."

12527

12531

msgstr ""

12528

12532

12529

#: en/help_topics/hooks.txt:202

12533

#: en/help_topics/hooks.txt:191

12530

12534

msgid ""

12531

12535

"list_commands\n"

12532

12536

"~~~~~~~~~~~~~"

12533

12537

msgstr ""

12534

12538

12535

#: en/help_topics/hooks.txt:207

12539

#: en/help_topics/hooks.txt:196

12536

12540

msgid ""

12537

12541

"Called when enumerating commands. Called with a set of cmd_name\n"

12538

12542

"strings for all the commands found so far. This set is safe to mutate\n"

12540

12544

"set of command names."

12541

12545

msgstr ""

12542

12546

12543

#: en/help_topics/hooks.txt:212

12547

#: en/help_topics/hooks.txt:201

12548

msgid ""

12549

"post_command\n"

12550

"~~~~~~~~~~~~"

12551

msgstr ""

12552

12553

#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211

12554

msgid "Introduced in: 2.6"

12555

msgstr ""

12556

12557

#: en/help_topics/hooks.txt:206

12558

msgid "Called after executing a command. Called with the command object."

12559

msgstr ""

12560

12561

#: en/help_topics/hooks.txt:208

12562

msgid ""

12563

"pre_command\n"

12564

"~~~~~~~~~~~"

12565

msgstr ""

12566

12567

#: en/help_topics/hooks.txt:213

12568

msgid "Called prior to executing a command. Called with the command object."

12569

msgstr ""

12570

12571

#: en/help_topics/hooks.txt:215

12544

12572

msgid ""

12545

12573

"_ConfigHooks\n"

12546

12574

"------------"

12547

12575

msgstr ""

12548

12576

12549

#: en/help_topics/hooks.txt:215

12577

#: en/help_topics/hooks.txt:218

12550

12578

msgid ""

12551

12579

"get\n"

12552

12580

"~~~"

12553

12581

msgstr ""

12554

12582

12555

#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226

12556

#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241

12557

#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370

12558

#: en/help_topics/hooks.txt:443

12583

#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229

12584

#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244

12585

#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373

12586

#: en/help_topics/hooks.txt:446

12559

12587

msgid "Introduced in: 2.4"

12560

12588

msgstr ""

12561

12589

12562

#: en/help_topics/hooks.txt:220

12590

#: en/help_topics/hooks.txt:223

12563

12591

msgid ""

12564

12592

"Invoked when a config option is read. The signature is (stack, name,\n"

12565

12593

"value)."

12566

12594

msgstr ""

12567

12595

12568

#: en/help_topics/hooks.txt:223

12596

#: en/help_topics/hooks.txt:226

12569

12597

msgid ""

12570

12598

"load\n"

12571

12599

"~~~~"

12572

12600

msgstr ""

12573

12601

12574

#: en/help_topics/hooks.txt:228

12602

#: en/help_topics/hooks.txt:231

12575

12603

msgid "Invoked when a config store is loaded. The signature is (store)."

12576

12604

msgstr ""

12577

12605

12578

#: en/help_topics/hooks.txt:230

12606

#: en/help_topics/hooks.txt:233

12579

12607

msgid ""

12580

12608

"remove\n"

12581

12609

"~~~~~~"

12582

12610

msgstr ""

12583

12611

12584

#: en/help_topics/hooks.txt:235

12612

#: en/help_topics/hooks.txt:238

12585

12613

msgid ""

12586

12614

"Invoked when a config option is removed. The signature is (stack,\n"

12587

12615

"name)."

12588

12616

msgstr ""

12589

12617

12590

#: en/help_topics/hooks.txt:238

12618

#: en/help_topics/hooks.txt:241

12591

12619

msgid ""

12592

12620

"save\n"

12593

12621

"~~~~"

12594

12622

msgstr ""

12595

12623

12596

#: en/help_topics/hooks.txt:243

12624

#: en/help_topics/hooks.txt:246

12597

12625

msgid "Invoked when a config store is saved. The signature is (store)."

12598

12626

msgstr ""

12599

12627

12600

#: en/help_topics/hooks.txt:245

12628

#: en/help_topics/hooks.txt:248

12601

12629

msgid ""

12602

12630

"set\n"

12603

12631

"~~~"

12604

12632

msgstr ""

12605

12633

12606

#: en/help_topics/hooks.txt:250

12634

#: en/help_topics/hooks.txt:253

12607

12635

msgid ""

12608

12636

"Invoked when a config option is set. The signature is (stack, name,\n"

12609

12637

"value)."

12610

12638

msgstr ""

12611

12639

12612

#: en/help_topics/hooks.txt:253

12640

#: en/help_topics/hooks.txt:256

12613

12641

msgid ""

12614

12642

"ControlDirHooks\n"

12615

12643

"---------------"

12616

12644

msgstr ""

12617

12645

12618

#: en/help_topics/hooks.txt:256

12646

#: en/help_topics/hooks.txt:259

12619

12647

msgid ""

12620

12648

"post_repo_init\n"

12621

12649

"~~~~~~~~~~~~~~"

12622

12650

msgstr ""

12623

12651

12624

#: en/help_topics/hooks.txt:261

12652

#: en/help_topics/hooks.txt:264

12625

12653

msgid ""

12626

12654

"Invoked after a repository has been initialized. post_repo_init is\n"

12627

12655

"called with a bzrlib.controldir.RepoInitHookParams."

12628

12656

msgstr ""

12629

12657

12630

#: en/help_topics/hooks.txt:264

12658

#: en/help_topics/hooks.txt:267

12631

12659

msgid ""

12632

12660

"pre_open\n"

12633

12661

"~~~~~~~~"

12634

12662

msgstr ""

12635

12663

12636

#: en/help_topics/hooks.txt:267

12664

#: en/help_topics/hooks.txt:270

12637

12665

msgid "Introduced in: 1.14"

12638

12666

msgstr ""

12639

12667

12640

#: en/help_topics/hooks.txt:269

12668

#: en/help_topics/hooks.txt:272

12641

12669

msgid ""

12642

12670

"Invoked before attempting to open a ControlDir with the transport that\n"

12643

12671

"the open will use."

12644

12672

msgstr ""

12645

12673

12646

#: en/help_topics/hooks.txt:272

12674

#: en/help_topics/hooks.txt:275

12647

12675

msgid ""

12648

12676

"InfoHooks\n"

12649

12677

"---------"

12650

12678

msgstr ""

12651

12679

12652

#: en/help_topics/hooks.txt:275

12680

#: en/help_topics/hooks.txt:278

12653

12681

msgid ""

12654

12682

"repository\n"

12655

12683

"~~~~~~~~~~"

12656

12684

msgstr ""

12657

12685

12658

#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297

12659

#: en/help_topics/hooks.txt:521

12686

#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300

12687

#: en/help_topics/hooks.txt:524

12660

12688

msgid "Introduced in: 1.15"

12661

12689

msgstr ""

12662

12690

12663

#: en/help_topics/hooks.txt:280

12691

#: en/help_topics/hooks.txt:283

12664

12692

msgid ""

12665

12693

"Invoked when displaying the statistics for a repository. repository is\n"

12666

12694

"called with a statistics dictionary as returned by the repository and\n"

12667

12695

"a file-like object to write to."

12668

12696

msgstr ""

12669

12697

12670

#: en/help_topics/hooks.txt:284

12698

#: en/help_topics/hooks.txt:287

12671

12699

msgid ""

12672

12700

"LockHooks\n"

12673

12701

"---------"

12674

12702

msgstr ""

12675

12703

12676

#: en/help_topics/hooks.txt:287

12704

#: en/help_topics/hooks.txt:290

12677

12705

msgid ""

12678

12706

"lock_acquired\n"

12679

12707

"~~~~~~~~~~~~~"

12680

12708

msgstr ""

12681

12709

12682

#: en/help_topics/hooks.txt:292

12710

#: en/help_topics/hooks.txt:295

12683

12711

msgid ""

12684

12712

"Called with a bzrlib.lock.LockResult when a physical lock is acquired."

12685

12713

msgstr ""

12686

12714

12687

#: en/help_topics/hooks.txt:294

12715

#: en/help_topics/hooks.txt:297

12688

12716

msgid ""

12689

12717

"lock_broken\n"

12690

12718

"~~~~~~~~~~~"

12691

12719

msgstr ""

12692

12720

12693

#: en/help_topics/hooks.txt:299

12721

#: en/help_topics/hooks.txt:302

12694

12722

msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."

12695

12723

msgstr ""

12696

12724

12697

#: en/help_topics/hooks.txt:301

12725

#: en/help_topics/hooks.txt:304

12698

12726

msgid ""

12699

12727

"lock_released\n"

12700

12728

"~~~~~~~~~~~~~"

12701

12729

msgstr ""

12702

12730

12703

#: en/help_topics/hooks.txt:306

12731

#: en/help_topics/hooks.txt:309

12704

12732

msgid ""

12705

12733

"Called with a bzrlib.lock.LockResult when a physical lock is released."

12706

12734

msgstr ""

12707

12735

12708

#: en/help_topics/hooks.txt:308

12736

#: en/help_topics/hooks.txt:311

12709

12737

msgid ""

12710

12738

"MergeHooks\n"

12711

12739

"----------"

12712

12740

msgstr ""

12713

12741

12714

#: en/help_topics/hooks.txt:311

12742

#: en/help_topics/hooks.txt:314

12715

12743

msgid ""

12716

12744

"merge_file_content\n"

12717

12745

"~~~~~~~~~~~~~~~~~~"

12718

12746

msgstr ""

12719

12747

12720

#: en/help_topics/hooks.txt:314

12748

#: en/help_topics/hooks.txt:317

12721

12749

msgid "Introduced in: 2.1"

12722

12750

msgstr ""

12723

12751

12724

#: en/help_topics/hooks.txt:316

12752

#: en/help_topics/hooks.txt:319

12725

12753

msgid ""

12726

12754

"Called with a bzrlib.merge.Merger object to create a per file merge\n"

12727

12755

"object when starting a merge. Should return either None or a subclass\n"

12731

12759

"AbstractPerFileMerger API docs for details on how it is used by merge."

12732

12760

msgstr ""

12733

12761

12734

#: en/help_topics/hooks.txt:323

12762

#: en/help_topics/hooks.txt:326

12735

12763

msgid ""

12736

12764

"post_merge\n"

12737

12765

"~~~~~~~~~~"

12738

12766

msgstr ""

12739

12767

12740

#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334

12741

#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402

12742

#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509

12768

#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337

12769

#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405

12770

#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512

12743

12771

msgid "Introduced in: 2.5"

12744

12772

msgstr ""

12745

12773

12746

#: en/help_topics/hooks.txt:328

12774

#: en/help_topics/hooks.txt:331

12747

12775

msgid ""

12748

12776

"Called after a merge. Receives a Merger object as the single argument.\n"

12749

12777

"The return value is ignored."

12750

12778

msgstr ""

12751

12779

12752

#: en/help_topics/hooks.txt:331

12780

#: en/help_topics/hooks.txt:334

12753

12781

msgid ""

12754

12782

"pre_merge\n"

12755

12783

"~~~~~~~~~"

12756

12784

msgstr ""

12757

12785

12758

#: en/help_topics/hooks.txt:336

12786

#: en/help_topics/hooks.txt:339

12759

12787

msgid ""

12760

12788

"Called before a merge. Receives a Merger object as the single\n"

12761

12789

"argument."

12762

12790

msgstr ""

12763

12791

12764

#: en/help_topics/hooks.txt:339

12792

#: en/help_topics/hooks.txt:342

12765

12793

msgid ""

12766

12794

"MergeDirectiveHooks\n"

12767

12795

"-------------------"

12768

12796

msgstr ""

12769

12797

12770

#: en/help_topics/hooks.txt:342

12798

#: en/help_topics/hooks.txt:345

12771

12799

msgid ""

12772

12800

"merge_request_body\n"

12773

12801

"~~~~~~~~~~~~~~~~~~"

12774

12802

msgstr ""

12775

12803

12776

#: en/help_topics/hooks.txt:345

12804

#: en/help_topics/hooks.txt:348

12777

12805

msgid "Introduced in: 1.15.0"

12778

12806

msgstr ""

12779

12807

12780

#: en/help_topics/hooks.txt:347

12808

#: en/help_topics/hooks.txt:350

12781

12809

msgid ""

12782

12810

"Called with a MergeRequestBodyParams when a body is needed for a merge\n"

12783

12811

"request. Callbacks must return a body. If more than one callback is\n"

12784

12812

"registered, the output of one callback is provided to the next."

12785

12813

msgstr ""

12786

12814

12787

#: en/help_topics/hooks.txt:351

12815

#: en/help_topics/hooks.txt:354

12788

12816

msgid ""

12789

12817

"MessageEditorHooks\n"

12790

12818

"------------------"

12791

12819

msgstr ""

12792

12820

12793

#: en/help_topics/hooks.txt:354

12821

#: en/help_topics/hooks.txt:357

12794

12822

msgid ""

12795

12823

"commit_message_template\n"

12796

12824

"~~~~~~~~~~~~~~~~~~~~~~~"

12797

12825

msgstr ""

12798

12826

12799

#: en/help_topics/hooks.txt:357

12827

#: en/help_topics/hooks.txt:360

12800

12828

msgid "Introduced in: 1.10"

12801

12829

msgstr ""

12802

12830

12803

#: en/help_topics/hooks.txt:359

12831

#: en/help_topics/hooks.txt:362

12804

12832

msgid ""

12805

12833

"Called when a commit message is being generated.\n"

12806

12834

"commit_message_template is called with the bzrlib.commit.Commit object\n"

12811

12839

"second, and so on."

12812

12840

msgstr ""

12813

12841

12814

#: en/help_topics/hooks.txt:367

12842

#: en/help_topics/hooks.txt:370

12815

12843

msgid ""

12816

12844

"set_commit_message\n"

12817

12845

"~~~~~~~~~~~~~~~~~~"

12818

12846

msgstr ""

12819

12847

12820

#: en/help_topics/hooks.txt:372

12848

#: en/help_topics/hooks.txt:375

12821

12849

msgid ""

12822

12850

"Set a fixed commit message. set_commit_message is called with the\n"

12823

12851

"bzrlib.commit.Commit object (so you can also change e.g. revision\n"

12826

12854

"should use the message editor as normal."

12827

12855

msgstr ""

12828

12856

12829

#: en/help_topics/hooks.txt:378

12857

#: en/help_topics/hooks.txt:381

12830

12858

msgid ""

12831

12859

"MutableTreeHooks\n"

12832

12860

"----------------"

12833

12861

msgstr ""

12834

12862

12835

#: en/help_topics/hooks.txt:381

12863

#: en/help_topics/hooks.txt:384

12836

12864

msgid ""

12837

12865

"post_build_tree\n"

12838

12866

"~~~~~~~~~~~~~~~"

12839

12867

msgstr ""

12840

12868

12841

#: en/help_topics/hooks.txt:386

12869

#: en/help_topics/hooks.txt:389

12842

12870

msgid ""

12843

12871

"Called after a completely new tree is built. The hook is called with\n"

12844

12872

"the tree as its only argument."

12845

12873

msgstr ""

12846

12874

12847

#: en/help_topics/hooks.txt:392

12875

#: en/help_topics/hooks.txt:395

12848

12876

msgid "Introduced in: 2.0"

12849

12877

msgstr ""

12850

12878

12851

#: en/help_topics/hooks.txt:394

12879

#: en/help_topics/hooks.txt:397

12852

12880

msgid ""

12853

12881

"Called after a commit is performed on a tree. The hook is called with\n"

12854

12882

"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"

12856

12884

"that object."

12857

12885

msgstr ""

12858

12886

12859

#: en/help_topics/hooks.txt:399

12887

#: en/help_topics/hooks.txt:402

12860

12888

msgid ""

12861

12889

"post_transform\n"

12862

12890

"~~~~~~~~~~~~~~"

12863

12891

msgstr ""

12864

12892

12865

#: en/help_topics/hooks.txt:404

12893

#: en/help_topics/hooks.txt:407

12866

12894

msgid ""

12867

12895

"Called after a tree transform has been performed on a tree. The hook\n"

12868

12896

"is called with the tree that is being transformed and the transform."

12869

12897

msgstr ""

12870

12898

12871

#: en/help_topics/hooks.txt:407

12899

#: en/help_topics/hooks.txt:410

12872

12900

msgid ""

12873

12901

"pre_transform\n"

12874

12902

"~~~~~~~~~~~~~"

12875

12903

msgstr ""

12876

12904

12877

#: en/help_topics/hooks.txt:412

12905

#: en/help_topics/hooks.txt:415

12878

12906

msgid ""

12879

12907

"Called before a tree transform on this tree. The hook is called with\n"

12880

12908

"the tree that is being transformed and the transform."

12881

12909

msgstr ""

12882

12910

12883

#: en/help_topics/hooks.txt:415

12911

#: en/help_topics/hooks.txt:418

12884

12912

msgid ""

12885

12913

"start_commit\n"

12886

12914

"~~~~~~~~~~~~"

12887

12915

msgstr ""

12888

12916

12889

#: en/help_topics/hooks.txt:420

12917

#: en/help_topics/hooks.txt:423

12890

12918

msgid ""

12891

12919

"Called before a commit is performed on a tree. The start commit hook\n"

12892

12920

"is able to change the tree before the commit takes place. start_commit\n"

12894

12922

"being performed on."

12895

12923

msgstr ""

12896

12924

12897

#: en/help_topics/hooks.txt:425

12925

#: en/help_topics/hooks.txt:428

12898

12926

msgid ""

12899

12927

"SmartClientHooks\n"

12900

12928

"----------------"

12901

12929

msgstr ""

12902

12930

12903

#: en/help_topics/hooks.txt:428

12931

#: en/help_topics/hooks.txt:431

12904

12932

msgid ""

12905

12933

"call\n"

12906

12934

"~~~~"

12907

12935

msgstr ""

12908

12936

12909

#: en/help_topics/hooks.txt:431

12937

#: en/help_topics/hooks.txt:434

12910

12938

msgid "Introduced in: unknown"

12911

12939

msgstr ""

12912

12940

12913

#: en/help_topics/hooks.txt:433

12941

#: en/help_topics/hooks.txt:436

12914

12942

msgid ""

12915

12943

"Called when the smart client is submitting a request to the smart\n"

12916

12944

"server. Called with a bzrlib.smart.client.CallHookParams object.\n"

12917

12945

"Streaming request bodies, and responses, are not accessible."

12918

12946

msgstr ""

12919

12947

12920

#: en/help_topics/hooks.txt:437

12948

#: en/help_topics/hooks.txt:440

12921

12949

msgid ""

12922

12950

"SmartServerHooks\n"

12923

12951

"----------------"

12924

12952

msgstr ""

12925

12953

12926

#: en/help_topics/hooks.txt:440

12954

#: en/help_topics/hooks.txt:443

12927

12955

msgid ""

12928

12956

"server_exception\n"

12929

12957

"~~~~~~~~~~~~~~~~"

12930

12958

msgstr ""

12931

12959

12932

#: en/help_topics/hooks.txt:445

12960

#: en/help_topics/hooks.txt:448

12933

12961

msgid ""

12934

12962

"Called by the bzr server when an exception occurs. server_exception is\n"

12935

12963

"called with the sys.exc_info() tuple return true for the hook if the\n"

12937

12965

"normally."

12938

12966

msgstr ""

12939

12967

12940

#: en/help_topics/hooks.txt:450

12968

#: en/help_topics/hooks.txt:453

12941

12969

msgid ""

12942

12970

"server_started\n"

12943

12971

"~~~~~~~~~~~~~~"

12944

12972

msgstr ""

12945

12973

12946

#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472

12974

#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475

12947

12975

msgid "Introduced in: 0.16"

12948

12976

msgstr ""

12949

12977

12950

#: en/help_topics/hooks.txt:455

12978

#: en/help_topics/hooks.txt:458

12951

12979

msgid ""

12952

12980

"Called by the bzr server when it starts serving a directory.\n"

12953

12981

"server_started is called with (backing urls, public url), where\n"

12956

12984

"served."

12957

12985

msgstr ""

12958

12986

12959

#: en/help_topics/hooks.txt:461

12987

#: en/help_topics/hooks.txt:464

12960

12988

msgid ""

12961

12989

"server_started_ex\n"

12962

12990

"~~~~~~~~~~~~~~~~~"

12963

12991

msgstr ""

12964

12992

12965

#: en/help_topics/hooks.txt:466

12993

#: en/help_topics/hooks.txt:469

12966

12994

msgid ""

12967

12995

"Called by the bzr server when it starts serving a directory.\n"

12968

12996

"server_started is called with (backing_urls, server_obj)."

12969

12997

msgstr ""

12970

12998

12971

#: en/help_topics/hooks.txt:469

12999

#: en/help_topics/hooks.txt:472

12972

13000

msgid ""

12973

13001

"server_stopped\n"

12974

13002

"~~~~~~~~~~~~~~"

12975

13003

msgstr ""

12976

13004

12977

#: en/help_topics/hooks.txt:474

13005

#: en/help_topics/hooks.txt:477

12978

13006

msgid ""

12979

13007

"Called by the bzr server when it stops serving a directory.\n"

12980

13008

"server_stopped is called with the same parameters as the\n"

12981

13009

"server_started hook: (backing_urls, public_url)."

12982

13010

msgstr ""

12983

13011

12984

#: en/help_topics/hooks.txt:478

13012

#: en/help_topics/hooks.txt:481

12985

13013

msgid ""

12986

13014

"StatusHooks\n"

12987

13015

"-----------"

12988

13016

msgstr ""

12989

13017

12990

#: en/help_topics/hooks.txt:481

13018

#: en/help_topics/hooks.txt:484

12991

13019

msgid ""

12992

13020

"post_status\n"

12993

13021

"~~~~~~~~~~~"

12994

13022

msgstr ""

12995

13023

12996

#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495

13024

#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498

12997

13025

msgid "Introduced in: 2.3"

12998

13026

msgstr ""

12999

13027

13000

#: en/help_topics/hooks.txt:486

13028

#: en/help_topics/hooks.txt:489

13001

13029

msgid ""

13002

13030

"Called with argument StatusHookParams after Bazaar has displayed the\n"

13003

13031

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

13006

13034

"status command. to_file is the output stream for writing."

13007

13035

msgstr ""

13008

13036

13009

#: en/help_topics/hooks.txt:492

13037

#: en/help_topics/hooks.txt:495

13010

13038

msgid ""

13011

13039

"pre_status\n"

13012

13040

"~~~~~~~~~~"

13013

13041

msgstr ""

13014

13042

13015

#: en/help_topics/hooks.txt:497

13043

#: en/help_topics/hooks.txt:500

13016

13044

msgid ""

13017

13045

"Called with argument StatusHookParams before Bazaar displays the\n"

13018

13046

"status. StatusHookParams has the attributes (old_tree, new_tree,\n"

13021

13049

"status command. to_file is the output stream for writing."

13022

13050

msgstr ""

13023

13051

13024

#: en/help_topics/hooks.txt:503

13052

#: en/help_topics/hooks.txt:506

13025

13053

msgid ""

13026

13054

"TransportHooks\n"

13027

13055

"--------------"

13028

13056

msgstr ""

13029

13057

13030

#: en/help_topics/hooks.txt:506

13058

#: en/help_topics/hooks.txt:509

13031

13059

msgid ""

13032

13060

"post_connect\n"

13033

13061

"~~~~~~~~~~~~"

13034

13062

msgstr ""

13035

13063

13036

#: en/help_topics/hooks.txt:511

13064

#: en/help_topics/hooks.txt:514

13037

13065

msgid ""

13038

13066

"Called after a new connection is established or a reconnect occurs.\n"

13039

13067

"The sole argument passed is either the connected transport or smart\n"

13040

13068

"medium instance."

13041

13069

msgstr ""

13042

13070

13043

#: en/help_topics/hooks.txt:515

13071

#: en/help_topics/hooks.txt:518

13044

13072

msgid ""

13045

13073

"RioVersionInfoBuilderHooks\n"

13046

13074

"--------------------------"

13047

13075

msgstr ""

13048

13076

13049

#: en/help_topics/hooks.txt:518

13077

#: en/help_topics/hooks.txt:521

13050

13078

msgid ""

13051

13079

"revision\n"

13052

13080

"~~~~~~~~"

13053

13081

msgstr ""

13054

13082

13055

#: en/help_topics/hooks.txt:523

13083

#: en/help_topics/hooks.txt:526

13056

13084

msgid ""

13057

13085

"Invoked when adding information about a revision to the RIO stanza\n"

13058

13086

"that is printed. revision is called with a revision object and a RIO\n"

13826

13854

msgstr ""

13827

13855

13828

13856

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

13857

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

13858

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

13833

13859

#~ msgstr ""

13834

#~ "マージ処理は、二つのブランチの変更を結合するために最善を尽くしますが、人にしか\n"

13835

#~ "解決できない問題もあります。そのような問題にあたった場合は、それを衝突として\n"

13836

#~ "マークします。その場合、コミット前に何かしら修正しなければならないということに\n"

13837

#~ "なります。"

13860

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

13861

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

13862

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