Mercurial > public > mercurial-scm > hg-stable

comparison i18n/ja.po @ 30263:e69874dc1f4e stable 4.0.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n-ja: synchronized with 5f33116cd787
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 31 Dec 2016 17:19:09 +0900
parents 819f96b82fa4
children 13d94304c8da
comparison
equal deleted inserted replaced
30262:5f33116cd787 30263:e69874dc1f4e
163 # 163 #
164 msgid "" 164 msgid ""
165 msgstr "" 165 msgstr ""
166 "Project-Id-Version: Mercurial\n" 166 "Project-Id-Version: Mercurial\n"
167 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" 167 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
168 "POT-Creation-Date: 2016-10-30 20:25+0900\n" 168 "POT-Creation-Date: 2016-12-31 13:29+0900\n"
169 "PO-Revision-Date: 2016-11-01 03:50+0900\n" 169 "PO-Revision-Date: 2016-12-31 17:09+0900\n"
170 "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" 170 "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n"
171 "Language-Team: Japanese\n" 171 "Language-Team: Japanese\n"
172 "Language: ja\n" 172 "Language: ja\n"
173 "MIME-Version: 1.0\n" 173 "MIME-Version: 1.0\n"
174 "Content-Type: text/plain; charset=UTF-8\n" 174 "Content-Type: text/plain; charset=UTF-8\n"
644 644
645 msgid "" 645 msgid ""
646 "This extension checks at commit/amend time if any of the committed files\n" 646 "This extension checks at commit/amend time if any of the committed files\n"
647 "comes from an unrecorded mv." 647 "comes from an unrecorded mv."
648 msgstr "" 648 msgstr ""
649 "本エクステンションは、 Mercurial を介さずに改名されたファイルでも、\n"
650 ":hg:`commit` の際に自動判定して、 改名扱いにします。"
649 651
650 msgid "" 652 msgid ""
651 "The threshold at which a file is considered a move can be set with the\n" 653 "The threshold at which a file is considered a move can be set with the\n"
652 "``automv.similarity`` config option. This option takes a percentage between " 654 "``automv.similarity`` config option. This option takes a percentage between "
653 "0\n" 655 "0\n"
654 "(disabled) and 100 (files must be identical), the default is 95." 656 "(disabled) and 100 (files must be identical), the default is 95."
655 msgstr "" 657 msgstr ""
658 "改名はファイルの類似度で判定され、 改名判定の閾値は ``automv.similarity``\n"
659 "で設定します。 この設定値は 0 (= 判定無効化) から 100 (= 厳密一致時のみ、\n"
660 "改名と判定) の間の、 類似度のパーセンテージを表します。 デフォルト値は 95。"
656 661
657 msgid "disable automatic file move detection" 662 msgid "disable automatic file move detection"
658 msgstr "" 663 msgstr "自動改名判定の無効化"
659 664
660 #, fuzzy
661 msgid "automv.similarity must be between 0 and 100" 665 msgid "automv.similarity must be between 0 and 100"
662 msgstr "類似度には0から100の間を指定してください" 666 msgstr "automv.similarity には0から100の間を指定してください"
663 667
664 #, fuzzy, python-format 668 #, python-format
665 msgid "detected move of %s as %s (%d%% similar)\n" 669 msgid "detected move of %s as %s (%d%% similar)\n"
666 msgstr "%s の削除を %s へのファイル名変更として記録中 (類似度 %d%%)\n" 670 msgstr "%s から %s への改名を検出 (類似度 %d%%)\n"
667 671
668 #, python-format 672 #, python-format
669 msgid "detected move of %d files\n" 673 msgid "detected move of %d files\n"
670 msgstr "" 674 msgstr "%d ファイルの改名を検出\n"
671 675
672 msgid "log repository events to a blackbox for debugging" 676 msgid "log repository events to a blackbox for debugging"
673 msgstr "リポジトリにおけるイベントの記録(デバッグ用)" 677 msgstr "リポジトリにおけるイベントの記録(デバッグ用)"
674 678
675 msgid "" 679 msgid ""
4379 "fsmonitor requires no configuration -- it will tell Watchman about your\n" 4383 "fsmonitor requires no configuration -- it will tell Watchman about your\n"
4380 "repository as necessary. You'll need to install Watchman from\n" 4384 "repository as necessary. You'll need to install Watchman from\n"
4381 "https://facebook.github.io/watchman/ and make sure it is in your PATH." 4385 "https://facebook.github.io/watchman/ and make sure it is in your PATH."
4382 msgstr "" 4386 msgstr ""
4383 4387
4384 #, fuzzy
4385 msgid "The following configuration options exist:" 4388 msgid "The following configuration options exist:"
4386 msgstr "本エクステンションに対しては、以下の設定のみが可能です::" 4389 msgstr ""
4387 4390
4388 msgid "" 4391 msgid ""
4389 " [fsmonitor]\n" 4392 " [fsmonitor]\n"
4390 " mode = {off, on, paranoid}" 4393 " mode = {off, on, paranoid}"
4391 msgstr "" 4394 msgstr ""
4463 4466
4464 #, python-format 4467 #, python-format
4465 msgid "unsupported file type (type is %s)" 4468 msgid "unsupported file type (type is %s)"
4466 msgstr "未サポートのファイル種別(%s)" 4469 msgstr "未サポートのファイル種別(%s)"
4467 4470
4468 #, fuzzy, python-format 4471 #, python-format
4469 msgid "warning: unable to write to %s\n" 4472 msgid "warning: unable to write to %s\n"
4470 msgstr "警告: %s における .gitmodules の解析に失敗\n" 4473 msgstr ""
4471 4474
4472 #, fuzzy, python-format 4475 #, python-format
4473 msgid "" 4476 msgid ""
4474 "The fsmonitor extension is incompatible with the %s extension and has been " 4477 "The fsmonitor extension is incompatible with the %s extension and has been "
4475 "disabled.\n" 4478 "disabled.\n"
4476 msgstr "eol エクステンションと win32text エクステンションは併用できません\n" 4479 msgstr ""
4477 4480
4478 #, python-format 4481 #, python-format
4479 msgid "type '%s' has no property '%s'" 4482 msgid "type '%s' has no property '%s'"
4480 msgstr "" 4483 msgstr ""
4481 4484
4482 #, fuzzy
4483 msgid "warning: unable to write out fsmonitor state\n" 4485 msgid "warning: unable to write out fsmonitor state\n"
4484 msgstr "警告: %s における .gitmodules の解析に失敗\n" 4486 msgstr ""
4485 4487
4486 msgid "commands to sign and verify changesets" 4488 msgid "commands to sign and verify changesets"
4487 msgstr "リビジョンへの署名および検証コマンド" 4489 msgstr "リビジョンへの署名および検証コマンド"
4488 4490
4489 #, python-format 4491 #, python-format
5626 msgid "" 5628 msgid ""
5627 "This extension adds a new command: `hg journal`, which shows you where\n" 5629 "This extension adds a new command: `hg journal`, which shows you where\n"
5628 "bookmarks were previously located." 5630 "bookmarks were previously located."
5629 msgstr "" 5631 msgstr ""
5630 5632
5631 #, fuzzy
5632 msgid "journal lock does not support nesting" 5633 msgid "journal lock does not support nesting"
5633 msgstr "指定の連携先には履歴を反映できません" 5634 msgstr ""
5634 5635
5635 #, python-format 5636 #, python-format
5636 msgid "journal of %s" 5637 msgid "journal of %s"
5637 msgstr "" 5638 msgstr ""
5638 5639
5642 5643
5643 #, python-format 5644 #, python-format
5644 msgid "got lock after %s seconds\n" 5645 msgid "got lock after %s seconds\n"
5645 msgstr "%s 秒遅れでロックを獲得\n" 5646 msgstr "%s 秒遅れでロックを獲得\n"
5646 5647
5647 #, fuzzy, python-format 5648 #, python-format
5648 msgid "unsupported journal file version '%s'\n" 5649 msgid "unsupported journal file version '%s'\n"
5649 msgstr "未サポートなバンドルファイルバージョンです: %s" 5650 msgstr ""
5650 5651
5651 #, fuzzy
5652 msgid "not available" 5652 msgid "not available"
5653 msgstr "ヘルプはありません" 5653 msgstr ""
5654 5654
5655 #, fuzzy, python-format 5655 #, python-format
5656 msgid "unknown journal file version '%s'" 5656 msgid "unknown journal file version '%s'"
5657 msgstr "未知のバンドル形式バージョン %s" 5657 msgstr ""
5658 5658
5659 msgid "show the previous position of bookmarks and the working copy" 5659 msgid "show the previous position of bookmarks and the working copy"
5660 msgstr "" 5660 msgstr ""
5661 5661
5662 msgid "" 5662 msgid ""
5668 " bookmarks and the working copy; each line will then include the " 5668 " bookmarks and the working copy; each line will then include the "
5669 "bookmark\n" 5669 "bookmark\n"
5670 " name, or '.' for the working copy, as well." 5670 " name, or '.' for the working copy, as well."
5671 msgstr "" 5671 msgstr ""
5672 5672
5673 #, fuzzy
5674 msgid "" 5673 msgid ""
5675 " If `name` starts with `re:`, the remainder of the name is treated as\n" 5674 " If `name` starts with `re:`, the remainder of the name is treated as\n"
5676 " a regular expression. To match a name that actually starts with `re:`,\n" 5675 " a regular expression. To match a name that actually starts with `re:`,\n"
5677 " use the prefix `literal:`." 5676 " use the prefix `literal:`."
5678 msgstr "" 5677 msgstr ""
5679 " `name` が `re:` で始まる場合、 残りは正規表現として扱われます。\n"
5680 " タグ名そのものが `re:` で始まる場合は、 名前を `literal:`\n"
5681 " 付きで指定してください。"
5682 5678
5683 msgid "" 5679 msgid ""
5684 " By default hg journal only shows the commit hash and the command that " 5680 " By default hg journal only shows the commit hash and the command that "
5685 "was\n" 5681 "was\n"
5686 " running at that time. -v/--verbose will show the prior hash, the user, " 5682 " running at that time. -v/--verbose will show the prior hash, the user, "
5700 msgstr "" 5696 msgstr ""
5701 5697
5702 msgid "You can't combine --all and filtering on a name" 5698 msgid "You can't combine --all and filtering on a name"
5703 msgstr "" 5699 msgstr ""
5704 5700
5705 #, fuzzy
5706 msgid "the working copy and bookmarks" 5701 msgid "the working copy and bookmarks"
5707 msgstr "変更されたブックマークを探索中\n" 5702 msgstr ""
5708 5703
5709 #, fuzzy, python-format 5704 #, python-format
5710 msgid "previous locations of %s:\n" 5705 msgid "previous locations of %s:\n"
5711 msgstr " 読み込み元: %s\n" 5706 msgstr ""
5712 5707
5713 #, fuzzy
5714 msgid "no recorded locations\n" 5708 msgid "no recorded locations\n"
5715 msgstr " 読み込み元: %s\n" 5709 msgstr ""
5716 5710
5717 msgid "expand keywords in tracked files" 5711 msgid "expand keywords in tracked files"
5718 msgstr "構成管理対象ファイル中のキーワード展開" 5712 msgstr "構成管理対象ファイル中のキーワード展開"
5719 5713
5720 msgid "" 5714 msgid ""
13285 " 詳細は :hg:`help -e clonebundles` を参照してください。" 13279 " 詳細は :hg:`help -e clonebundles` を参照してください。"
13286 13280
13287 msgid " - clone a remote repository to a new directory named hg/::" 13281 msgid " - clone a remote repository to a new directory named hg/::"
13288 msgstr " - 遠隔ホストのリポジトリを、 新規 hg/ ディレクトリ配下に複製::" 13282 msgstr " - 遠隔ホストのリポジトリを、 新規 hg/ ディレクトリ配下に複製::"
13289 13283
13290 msgid " hg clone http://selenic.com/hg" 13284 msgid " hg clone https://www.mercurial-scm.org/repo/hg/"
13291 msgstr " hg clone http://selenic.com/hg" 13285 msgstr " hg clone https://www.mercurial-scm.org/repo/hg/"
13292 13286
13293 msgid " - create a lightweight local clone::" 13287 msgid " - create a lightweight local clone::"
13294 msgstr " - 同一ホスト上のリポジトリを軽量複製::" 13288 msgstr " - 同一ホスト上のリポジトリを軽量複製::"
13295 13289
13296 msgid " hg clone project/ project-feature/" 13290 msgid " hg clone project/ project-feature/"
13319 msgstr " hg clone -r 04e544 experimental/ good/" 13313 msgstr " hg clone -r 04e544 experimental/ good/"
13320 13314
13321 msgid " - clone (and track) a particular named branch::" 13315 msgid " - clone (and track) a particular named branch::"
13322 msgstr " - 特定の名前付きブランチ限定での複製::" 13316 msgstr " - 特定の名前付きブランチ限定での複製::"
13323 13317
13324 msgid " hg clone http://selenic.com/hg#stable" 13318 msgid " hg clone https://www.mercurial-scm.org/repo/hg/#stable"
13325 msgstr " hg clone http://selenic.com/hg#stable" 13319 msgstr " hg clone https://www.mercurial-scm.org/repo/hg/#stable"
13326 13320
13327 msgid " See :hg:`help urls` for details on specifying URLs." 13321 msgid " See :hg:`help urls` for details on specifying URLs."
13328 msgstr " URL 記述の詳細は :hg:`help urls` を参照してください。" 13322 msgstr " URL 記述の詳細は :hg:`help urls` を参照してください。"
13329 13323
13330 msgid "cannot specify both --noupdate and --updaterev" 13324 msgid "cannot specify both --noupdate and --updaterev"
15297 msgstr " hg id -n -r 1.3" 15291 msgstr " hg id -n -r 1.3"
15298 15292
15299 msgid " - check the most recent revision of a remote repository::" 15293 msgid " - check the most recent revision of a remote repository::"
15300 msgstr " - 連携先リポジトリにおける最新リビジョンの確認::" 15294 msgstr " - 連携先リポジトリにおける最新リビジョンの確認::"
15301 15295
15302 msgid " hg id -r tip http://selenic.com/hg/" 15296 msgid " hg id -r tip https://www.mercurial-scm.org/repo/hg/"
15303 msgstr " hg id -r tip http://selenic.com/hg/" 15297 msgstr " hg id -r tip https://www.mercurial-scm.org/repo/hg/"
15304 15298
15305 msgid "" 15299 msgid ""
15306 " See :hg:`log` for generating more information about specific revisions,\n" 15300 " See :hg:`log` for generating more information about specific revisions,\n"
15307 " including full hash identifiers." 15301 " including full hash identifiers."
15308 msgstr "" 15302 msgstr ""
15470 msgstr " hg import -s 80 http://example.com/bugfix.patch" 15464 msgstr " hg import -s 80 http://example.com/bugfix.patch"
15471 15465
15472 msgid " - import a changeset from an hgweb server::" 15466 msgid " - import a changeset from an hgweb server::"
15473 msgstr " - hgweb サーバからの指定リビジョンの取り込み::" 15467 msgstr " - hgweb サーバからの指定リビジョンの取り込み::"
15474 15468
15475 msgid " hg import http://www.selenic.com/hg/rev/5ca8c111e9aa" 15469 msgid ""
15476 msgstr " hg import http://www.selenic.com/hg/rev/5ca8c111e9aa" 15470 " hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa"
15471 msgstr ""
15472 " hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa"
15477 15473
15478 msgid " - import all the patches in an Unix-style mbox::" 15474 msgid " - import all the patches in an Unix-style mbox::"
15479 msgstr " - Unix 形式 mbox ファイル中の全パッチの取り込み::" 15475 msgstr " - Unix 形式 mbox ファイル中の全パッチの取り込み::"
15480 15476
15481 msgid " hg import incoming-patches.mbox" 15477 msgid " hg import incoming-patches.mbox"
16110 msgid "" 16106 msgid ""
16111 " hg log -r \"p1()+p2()\" or\n" 16107 " hg log -r \"p1()+p2()\" or\n"
16112 " hg log -r \"p1(REV)+p2(REV)\" or\n" 16108 " hg log -r \"p1(REV)+p2(REV)\" or\n"
16113 " hg log -r \"max(::p1() and file(FILE))+max(::p2() and file(FILE))\" " 16109 " hg log -r \"max(::p1() and file(FILE))+max(::p2() and file(FILE))\" "
16114 "or\n" 16110 "or\n"
16115 " hg log -r \"max(::p1(REV) and file(FILE))+max(::p2(REV) and file" 16111 " hg log -r \"max(::p1(REV) and file(FILE))+max(::p2(REV) and "
16116 "(FILE))\"" 16112 "file(FILE))\""
16117 msgstr "" 16113 msgstr ""
16118 " hg log -r \"p1()+p2()\"\n" 16114 " hg log -r \"p1()+p2()\"\n"
16119 " hg log -r \"p1(REV)+p2(REV)\"\n" 16115 " hg log -r \"p1(REV)+p2(REV)\"\n"
16120 " hg log -r \"max(::p1() and file(FILE))+max(::p2() and file(FILE))\"\n" 16116 " hg log -r \"max(::p1() and file(FILE))+max(::p2() and file(FILE))\"\n"
16121 " hg log -r \"max(::p1(REV) and file(FILE))+max(::p2(REV) and file" 16117 " hg log -r \"max(::p1(REV) and file(FILE))+max(::p2(REV) and "
16122 "(FILE))\"" 16118 "file(FILE))\""
16123 16119
16124 msgid " See :hg:`summary` and :hg:`help revsets` for related information." 16120 msgid " See :hg:`summary` and :hg:`help revsets` for related information."
16125 msgstr "" 16121 msgstr ""
16126 " 関連情報は :hg:`summary` や :hg:`help revsets` を参照してください。" 16122 " 関連情報は :hg:`summary` や :hg:`help revsets` を参照してください。"
16127 16123
17400 msgstr "タグ '%s' は存在します(強制実行する場合は -f を指定してください)" 17396 msgstr "タグ '%s' は存在します(強制実行する場合は -f を指定してください)"
17401 17397
17402 msgid "uncommitted merge" 17398 msgid "uncommitted merge"
17403 msgstr "マージが未コミットです" 17399 msgstr "マージが未コミットです"
17404 17400
17405 msgid "not at a branch head (use -f to force)" 17401 msgid "working directory is not at a branch head (use -f to force)"
17406 msgstr "親リビジョンがブランチのヘッドではありません(強制実行は -f 指定)" 17402 msgstr "親リビジョンがブランチのヘッドではありません(強制実行は -f 指定)"
17407 17403
17408 msgid "cannot tag null revision" 17404 msgid "cannot tag null revision"
17409 msgstr "null リビジョンにはタグ付けできません" 17405 msgstr "null リビジョンにはタグ付けできません"
17410 17406
22418 msgid " (default: topic bar number estimate)" 22414 msgid " (default: topic bar number estimate)"
22419 msgstr " (デフォルト値: topic bar number estimate)" 22415 msgstr " (デフォルト値: topic bar number estimate)"
22420 22416
22421 msgid "" 22417 msgid ""
22422 "``width``\n" 22418 "``width``\n"
22423 " If set, the maximum width of the progress information (that is, min" 22419 " If set, the maximum width of the progress information (that is, "
22424 "(width,\n" 22420 "min(width,\n"
22425 " term width) will be used)." 22421 " term width) will be used)."
22426 msgstr "" 22422 msgstr ""
22427 "``width``\n" 22423 "``width``\n"
22428 " 進捗情報表示の最大幅 (画面幅と比較して、 小さい方の値を採用)" 22424 " 進捗情報表示の最大幅 (画面幅と比較して、 小さい方の値を採用)"
22429 22425
22742 "-------------" 22738 "-------------"
22743 msgstr "" 22739 msgstr ""
22744 "``templates``\n" 22740 "``templates``\n"
22745 "-------------" 22741 "-------------"
22746 22742
22747 #, fuzzy
22748 msgid "" 22743 msgid ""
22749 "Use the ``[templates]`` section to define template strings.\n" 22744 "Use the ``[templates]`` section to define template strings.\n"
22750 "See :hg:`help templates` for details." 22745 "See :hg:`help templates` for details."
22751 msgstr "" 22746 msgstr ""
22752 "テンプレート文字列の定義は ``[templates]`` セクションで行います。\n" 22747 "``[templates]`` セクションはテンプレート文字列の定義を行います。\n"
22753 "詳細は :hg:`help templates` を参照してください。" 22748 "詳細は :hg:`help templates` を参照してください。"
22754 22749
22755 msgid "" 22750 msgid ""
22756 "``trusted``\n" 22751 "``trusted``\n"
22757 "-----------" 22752 "-----------"
25558 "\"\"\"\"\n" 25553 "\"\"\"\"\n"
25559 "**hg-ssh** は、 ssh アクセスを Mercurial リポジトリ操作に限定する、\n" 25554 "**hg-ssh** は、 ssh アクセスを Mercurial リポジトリ操作に限定する、\n"
25560 "ラッパースクリプトです。" 25555 "ラッパースクリプトです。"
25561 25556
25562 msgid "" 25557 msgid ""
25563 "To be used in ~/.ssh/authorized_keys with the \"command\" option, see sshd" 25558 "To be used in ~/.ssh/authorized_keys with the \"command\" option, see "
25564 "(8):\n" 25559 "sshd(8):\n"
25565 "command=\"hg-ssh path/to/repo1 /path/to/repo2 ~/repo3 ~user/repo4\" ssh-" 25560 "command=\"hg-ssh path/to/repo1 /path/to/repo2 ~/repo3 ~user/repo4\" ssh-"
25566 "dss ...\n" 25561 "dss ...\n"
25567 "(probably together with these other useful options:\n" 25562 "(probably together with these other useful options:\n"
25568 "no-port-forwarding,no-X11-forwarding,no-agent-forwarding)" 25563 "no-port-forwarding,no-X11-forwarding,no-agent-forwarding)"
25569 msgstr "" 25564 msgstr ""
25645 msgstr "" 25640 msgstr ""
25646 "各種情報\n" 25641 "各種情報\n"
25647 "\"\"\"\"\"\"\"\"\n" 25642 "\"\"\"\"\"\"\"\"\n"
25648 "ウェブサイト: http://mercurial-scm.org/" 25643 "ウェブサイト: http://mercurial-scm.org/"
25649 25644
25650 msgid "Source code repository: http://selenic.com/hg" 25645 msgid "Source code repository: https://www.mercurial-scm.org/repo/hg"
25651 msgstr "ソースコードリポジトリ: http://selenic.com/hg" 25646 msgstr "ソースコードリポジトリ: https://www.mercurial-scm.org/repo/hg"
25652 25647
25653 msgid "Mailing list: http://selenic.com/mailman/listinfo/mercurial" 25648 msgid "Mailing list: https://www.mercurial-scm.org/mailman/listinfo/mercurial/"
25654 msgstr "メーリングリスト: http://selenic.com/mailman/listinfo/mercurial" 25649 msgstr ""
25650 "メーリングリスト: https://www.mercurial-scm.org/mailman/listinfo/mercurial/"
25655 25651
25656 msgid "" 25652 msgid ""
25657 "Copying\n" 25653 "Copying\n"
25658 "\"\"\"\"\"\"\"\n" 25654 "\"\"\"\"\"\"\"\n"
25659 "Copyright (C) 2005-2016 Matt Mackall.\n" 25655 "Copyright (C) 2005-2016 Matt Mackall.\n"
26912 "Sometimes it may be desirable to push and pull changesets in the draft\n" 26908 "Sometimes it may be desirable to push and pull changesets in the draft\n"
26913 "phase to share unfinished work. This can be done by setting a\n" 26909 "phase to share unfinished work. This can be done by setting a\n"
26914 "repository to disable publishing in its configuration file::" 26910 "repository to disable publishing in its configuration file::"
26915 msgstr "" 26911 msgstr ""
26916 "未完の作業を共有するために、 リビジョンのフェーズを draft のままで\n" 26912 "未完の作業を共有するために、 リビジョンのフェーズを draft のままで\n"
26917 "push/pull したい場合もあるでしょう。 publishing を無効化するには、\n" 26913 "push/pull したい場合もあるでしょう。 publishing 処理を無効化するには、\n"
26918 "サーバ側で以下の設定を行ってください::" 26914 "各リポジトリで以下の設定を行ってください::"
26919 26915
26920 msgid "" 26916 msgid ""
26921 " [phases]\n" 26917 " [phases]\n"
26922 " publish = False" 26918 " publish = False"
26923 msgstr "" 26919 msgstr ""
31782 "(M)erge, keep (l)ocal%(l)s or keep (r)emote%(o)s?$$ &Merge $$ &Local $$ " 31778 "(M)erge, keep (l)ocal%(l)s or keep (r)emote%(o)s?$$ &Merge $$ &Local $$ "
31783 "&Remote" 31779 "&Remote"
31784 msgstr "" 31780 msgstr ""
31785 " サブリポジトリ %(s)s の参照先が異なっています (現行側: %(sl)s, 他方側: " 31781 " サブリポジトリ %(s)s の参照先が異なっています (現行側: %(sl)s, 他方側: "
31786 "%(sr)s)\n" 31782 "%(sr)s)\n"
31787 "両者のマージ:(m)erge, 現行側%(l)s 参照先:(l)ocal, 他方側%(o)s 参照先:(r)" 31783 "両者のマージ:(m)erge, 現行側%(l)s 参照先:(l)ocal, 他方側%(o)s 参照先:"
31788 "emote のいずれを採用しますか？$$ &Merge $$ &Local $$ &Remote" 31784 "(r)emote のいずれを採用しますか？$$ &Merge $$ &Local $$ &Remote"
31789 31785
31790 #, python-format 31786 #, python-format
31791 msgid "" 31787 msgid ""
31792 " local%(l)s changed subrepository %(s)s which remote%(o)s removed\n" 31788 " local%(l)s changed subrepository %(s)s which remote%(o)s removed\n"
31793 "use (c)hanged version or (d)elete?$$ &Changed $$ &Delete" 31789 "use (c)hanged version or (d)elete?$$ &Changed $$ &Delete"