--- a/i18n/ja.po Sun Oct 25 12:46:23 2009 +0100
+++ b/i18n/ja.po Sun Oct 25 12:47:48 2009 +0100
@@ -97,8 +97,8 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2009-07-01 11:25+0900\n"
-"PO-Revision-Date: 2009-07-01 18:00+0900\n"
+"POT-Creation-Date: 2009-10-25 12:38+0100\n"
+"PO-Revision-Date: 2009-10-25 12:47+0100\n"
"Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n"
"Language-Team: Japanese\n"
"MIME-Version: 1.0\n"
@@ -117,8 +117,11 @@
msgid "COMMANDS"
msgstr ""
-msgid " options:\n"
-msgstr ""
+#, fuzzy
+msgid ""
+" options:\n"
+"\n"
+msgstr "オプション:\n"
#, python-format
msgid ""
@@ -128,6 +131,897 @@
" 別名: %s\n"
"\n"
+#, fuzzy
+msgid ""
+"Some commands allow the user to specify a date, e.g.:\n"
+"\n"
+"- backout, commit, import, tag: Specify the commit date.\n"
+"- log, revert, update: Select revision(s) by date.\n"
+"\n"
+"Many date formats are valid. Here are some examples::\n"
+"\n"
+" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
+" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
+" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
+" \"Dec 6\" (midnight)\n"
+" \"13:18\" (today assumed)\n"
+" \"3:39\" (3:39AM assumed)\n"
+" \"3:39pm\" (15:39)\n"
+" \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
+" \"2006-12-6 13:18\"\n"
+" \"2006-12-6\"\n"
+" \"12-6\"\n"
+" \"12/6\"\n"
+" \"12/6/6\" (Dec 6 2006)\n"
+"\n"
+"Lastly, there is Mercurial's internal format::\n"
+"\n"
+" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
+"\n"
+"This is the internal representation format for dates. unixtime is the\n"
+"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
+"the offset of the local timezone, in seconds west of UTC (negative if\n"
+"the timezone is east of UTC).\n"
+"\n"
+"The log command also accepts date ranges::\n"
+"\n"
+" \"<{datetime}\" - at or before a given date/time\n"
+" \">{datetime}\" - on or after a given date/time\n"
+" \"{datetime} to {datetime}\" - a date range, inclusive\n"
+" \"-{days}\" - within a given number of days of today\n"
+msgstr ""
+"\n"
+" 以下のコマンドで日時指定が可能です:\n"
+" * backout, commit, import, tag: コミット日時の指定\n"
+" * log, revert, update: 日時によるリビジョンの指定\n"
+"\n"
+" 有効な日時指定形式は沢山あります。以下にいくつかの例を示します。\n"
+"\n"
+" \"Wed Dec 6 13:18:29 2006\" (「ローカルタイムゾーン」を想定)\n"
+" \"Dec 6 13:18 -0600\" (「今年」を想定、タイムゾーンはオフセット指定)\n"
+" \"Dec 6 13:18 UTC\" (UTC および GMT は +0000 の別名)\n"
+" \"Dec 6\" (「午前0時」を想定)\n"
+" \"13:18\" (「本日」を想定)\n"
+" \"3:39\" (「3:39AM」を想定)\n"
+" \"3:39pm\" (15:39)\n"
+" \"2006-12-06 13:18:29\" (ISO 8601 形式)\n"
+" \"2006-12-6 13:18\"\n"
+" \"2006-12-6\"\n"
+" \"12-6\"\n"
+" \"12/6\"\n"
+" \"12/6/6\" (2006年12月6日)\n"
+"\n"
+" 最後に、Mercurial 固有の内部形式を示します。\n"
+"\n"
+" \"1165432709 0\" (2006年12月6日 13:18:29 UTC)\n"
+"\n"
+" これは日時の内部表現形式です。基点となる 1970年1月1日 00:00 UTC からの\n"
+" 経過秒数を表す unixtime 形式部分と、ローカルタイムゾーンのオフセット値\n"
+" (UTC よりも東側の地域は負値)を表すオフセット部分から構成されています。\n"
+"\n"
+" log コマンドには、日時範囲指定可能です:\n"
+"\n"
+" \"<{date}\" - 指定日時以前(指定日時含む)\n"
+" \">{date}\" - 指定日時以後(指定日時含む)\n"
+" \"{date} to {date}\" - 指定日時範囲(指定日時含む)\n"
+" \"-{days}\" - 本日から指定日数以内\n"
+" "
+
+#, fuzzy
+msgid ""
+"Mercurial's default format for showing changes between two versions of\n"
+"a file is compatible with the unified format of GNU diff, which can be\n"
+"used by GNU patch and many other standard tools.\n"
+"\n"
+"While this standard format is often enough, it does not encode the\n"
+"following information:\n"
+"\n"
+"- executable status and other permission bits\n"
+"- copy or rename information\n"
+"- changes in binary files\n"
+"- creation or deletion of empty files\n"
+"\n"
+"Mercurial also supports the extended diff format from the git VCS\n"
+"which addresses these limitations. The git diff format is not produced\n"
+"by default because a few widespread tools still do not understand this\n"
+"format.\n"
+"\n"
+"This means that when generating diffs from a Mercurial repository\n"
+"(e.g. with \"hg export\"), you should be careful about things like file\n"
+"copies and renames or other things mentioned above, because when\n"
+"applying a standard diff to a different repository, this extra\n"
+"information is lost. Mercurial's internal operations (like push and\n"
+"pull) are not affected by this, because they use an internal binary\n"
+"format for communicating changes.\n"
+"\n"
+"To make Mercurial produce the git extended diff format, use the --git\n"
+"option available for many commands, or set 'git = True' in the [diff]\n"
+"section of your hgrc. You do not need to set this option when\n"
+"importing diffs in this format or using them in the mq extension.\n"
+msgstr ""
+"\n"
+" 無指定時に Mercurial が2つのリビジョンを比較して差分表示する際の形式は\n"
+" GNU diff の unified 形式互換のもので、GNU patch をはじめとする多くの\n"
+" 標準的なツールで使用できるものです。\n"
+"\n"
+" この標準的な形式は概ね十分なのですが、以下のような情報は含まれません:\n"
+"\n"
+" - 実行可否および権限設定\n"
+" - 複製／改名情報\n"
+" - バイナリファイルの変更\n"
+" - 空ファイルの作成／削除\n"
+"\n"
+" Mercurial は、別の構成管理ツールである git に由来する拡張差分形式にも\n"
+" 対応しており、この形式は従来の差分形式の持つ先の制限を解消しています。\n"
+" 但し、普及しているツールの幾つかが git 差分形式に対応していないため、\n"
+" Mercurial は指定が無い場合はこの形式では出力しません。\n"
+"\n"
+" つまり、Mercurial が(\"hg export\" 等で)生成した標準の差分形式は、\n"
+" 他のリポジトリに対して適用した場合、上述した情報の欠落があることから、\n"
+" ファイルの複製・改名をはじめとする上記の制限に類する操作に関しては、\n"
+" 十分注意する必要があります。push や pull のように、Mercurial の\n"
+" 内部形式で実施される操作に関しては、バイナリ形式で変更情報の授受を行う\n"
+" ことから、情報の欠落に関しては心配する必要はありません。\n"
+"\n"
+" Mercurial から git 拡張差分形式の出力を得るには、受理可能なコマンドに\n"
+" 対して --git を指定するか、設定ファイルの [diff] セクションに\n"
+" 'git = True' 記述を追加してください。hg import や mq エクステンションを\n"
+" 使用する場合は、この指定は不要です。\n"
+" "
+
+#, fuzzy
+msgid ""
+"HG\n"
+" Path to the 'hg' executable, automatically passed when running\n"
+" hooks, extensions or external tools. If unset or empty, this is\n"
+" the hg executable's name if it's frozen, or an executable named\n"
+" 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
+" Windows) is searched.\n"
+"\n"
+"HGEDITOR\n"
+" This is the name of the editor to run when committing. See EDITOR.\n"
+"\n"
+" (deprecated, use .hgrc)\n"
+"\n"
+"HGENCODING\n"
+" This overrides the default locale setting detected by Mercurial.\n"
+" This setting is used to convert data including usernames,\n"
+" changeset descriptions, tag names, and branches. This setting can\n"
+" be overridden with the --encoding command-line option.\n"
+"\n"
+"HGENCODINGMODE\n"
+" This sets Mercurial's behavior for handling unknown characters\n"
+" while transcoding user input. The default is \"strict\", which\n"
+" causes Mercurial to abort if it can't map a character. Other\n"
+" settings include \"replace\", which replaces unknown characters, and\n"
+" \"ignore\", which drops them. This setting can be overridden with\n"
+" the --encodingmode command-line option.\n"
+"\n"
+"HGMERGE\n"
+" An executable to use for resolving merge conflicts. The program\n"
+" will be executed with three arguments: local file, remote file,\n"
+" ancestor file.\n"
+"\n"
+" (deprecated, use .hgrc)\n"
+"\n"
+"HGRCPATH\n"
+" A list of files or directories to search for hgrc files. Item\n"
+" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
+" platform default search path is used. If empty, only the .hg/hgrc\n"
+" from the current repository is read.\n"
+"\n"
+" For each element in HGRCPATH:\n"
+"\n"
+" - if it's a directory, all files ending with .rc are added\n"
+" - otherwise, the file itself will be added\n"
+"\n"
+"HGUSER\n"
+" This is the string used as the author of a commit. If not set,\n"
+" available values will be considered in this order:\n"
+"\n"
+" - HGUSER (deprecated)\n"
+" - hgrc files from the HGRCPATH\n"
+" - EMAIL\n"
+" - interactive prompt\n"
+" - LOGNAME (with '@hostname' appended)\n"
+"\n"
+" (deprecated, use .hgrc)\n"
+"\n"
+"EMAIL\n"
+" May be used as the author of a commit; see HGUSER.\n"
+"\n"
+"LOGNAME\n"
+" May be used as the author of a commit; see HGUSER.\n"
+"\n"
+"VISUAL\n"
+" This is the name of the editor to use when committing. See EDITOR.\n"
+"\n"
+"EDITOR\n"
+" Sometimes Mercurial needs to open a text file in an editor for a\n"
+" user to modify, for example when writing commit messages. The\n"
+" editor it uses is determined by looking at the environment\n"
+" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
+" non-empty one is chosen. If all of them are empty, the editor\n"
+" defaults to 'vi'.\n"
+"\n"
+"PYTHONPATH\n"
+" This is used by Python to find imported modules and may need to be\n"
+" set appropriately if this Mercurial is not installed system-wide.\n"
+msgstr ""
+"\n"
+"HG::\n"
+" 'hg' コマンドへのパス。フック／エクステンションないし外部ツールの起動の\n"
+" 際に自動的に設定されます。未設定や空の場合は、frozen 形式の\n"
+" hg 実行可能ファイルの名前か設定されるか、'hg' という名前の実行可能\n"
+" ファイルが検索されます(Windows の場合、PATHEXT 環境変数に設定された\n"
+" COM/EXE/BAT/CMD 等の拡張子付き)。\n"
+"\n"
+"HGEDITOR::\n"
+" コミットの際のメッセージ入力を行うためのエディタの名前。EDITOR 環境変数\n"
+" についても参照してください。\n"
+"\n"
+" (推奨されない環境変数。設定ファイル経由で指定してください。)\n"
+"\n"
+"HGENCODING::\n"
+" Mercurial によるロケール自動検出の上書き。この設定は、ユーザ名、\n"
+" コミットメッセージ、タグ名およびブランチ名を内部データ形式に変換する\n"
+" 際に使用されます。この環境変数設定は、コマンドラインでの --encoding\n"
+" 使用により、更に上書きすることが出来ます。\n"
+"\n"
+"HGENCODINGMODE::\n"
+" ユーザからの指定値を内部データ形式に変換する際に、指定の符号化と\n"
+" 合致しない文字が検出された場合の Mercurial の挙動の指定。無指定時は、\n"
+" 「指定の符号化と合致しない場合は処理中断」を意味する \"strict\" が指定\n"
+" されたものとみなします。他には、「未知の文字の置き換え」を意味する\n"
+" \"replace\" と、「未知の文字の切り捨て」を意味する \"ignore\" が指定\n"
+" 出来ます。この環境変数設定は、コマンドラインでの --encodingmode\n"
+" 使用により、更に上書きすることが出来ます。\n"
+"\n"
+"HGMERGE::\n"
+" マージの際の衝突解消に使用するコマンド。指定されたコマンドの起動には、\n"
+" 作業領域のファイル、別リビジョンのファイル、両者の親リビジョンの\n"
+" ファイルを表す3つの引数が指定されます。\n"
+"\n"
+" (推奨されない環境変数。設定ファイル経由で指定してください。)\n"
+"\n"
+"HGRCPATH::\n"
+" 設定ファイル読込のための、ファイルないしディレクトリの一覧の指定。\n"
+" 一覧要素の区切り記号は、Unix なら \":\"、WIndows なら \";\" です。\n"
+" HGRCPATH 環境変数が設定されていない場合、各稼働環境に応じた\n"
+" 読み込み先から読み込まれます。空の値が設定されている場合、\n"
+" 現リポジトリの .hg/hgrc のみが読み込まれます。\n"
+"\n"
+" 指定された一覧の各要素に対して、以下のように振舞います:\n"
+" * ディレクトリなら、配下の \".rc\" で終わる名前のファイルを読み込む\n"
+" * ファイルなら、そのファイル自身を読み込む\n"
+"\n"
+"HGUSER::\n"
+" チェンジセット作成者としてコミット時に記録する名前の指定。\n"
+" 作成者名として採用される値の決定順序は以下の通りです。\n"
+"\n"
+" * HGUSER 環境変数値(推奨されません)\n"
+" * (HGRCPATH 環境変数で指定される)設定ファイル中の設定\n"
+" * EMAIL 環境変数値\n"
+" * 対話的な入力\n"
+" * LOGNAME 環境変数値('@hostname' が付与されます)\n"
+"\n"
+" (推奨されない環境変数。設定ファイル経由で指定してください。)\n"
+"\n"
+"EMAIL::\n"
+" チェンジセット作成者としてこの環境変数値が記録される可能性があります。\n"
+" 詳細は HGUSER の記述を参照してください。\n"
+"\n"
+"LOGNAME::\n"
+" チェンジセット作成者としてこの環境変数値が記録される可能性があります。\n"
+" 詳細は HGUSER の記述を参照してください。\n"
+"\n"
+"VISUAL::\n"
+" コミット時のメッセージを編集するエディタ名の指定。EDITOR 環境変数\n"
+" についても参照してください。\n"
+"\n"
+"EDITOR::\n"
+" コミット時のメッセージのように、エディタでファイルを開き、ユーザによる\n"
+" 編集を促す状況があります。そこで使用されるエディタは、HGEDITOR、VISUAL\n"
+" あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
+" 最初の空で無い値に設定された環境変数の値を使用します。いずれも未設定\n"
+" (あるいは空)の場合は、'vi' が使用されます。\n"
+"\n"
+"PYTHONPATH::\n"
+" Mercurial が当該システムの共有領域にインストールされていない場合、\n"
+" Python が必要なモジュールを読み込むためには、この環境変数の設定が\n"
+" 必要です。\n"
+" "
+
+#, fuzzy
+msgid ""
+"Mercurial has the ability to add new features through the use of\n"
+"extensions. Extensions may add new commands, add options to\n"
+"existing commands, change the default behavior of commands, or\n"
+"implement hooks.\n"
+"\n"
+"Extensions are not loaded by default for a variety of reasons:\n"
+"they can increase startup overhead; they may be meant for advanced\n"
+"usage only; they may provide potentially dangerous abilities (such\n"
+"as letting you destroy or modify history); they might not be ready\n"
+"for prime time; or they may alter some usual behaviors of stock\n"
+"Mercurial. It is thus up to the user to activate extensions as\n"
+"needed.\n"
+"\n"
+"To enable the \"foo\" extension, either shipped with Mercurial or in\n"
+"the Python search path, create an entry for it in your hgrc, like\n"
+"this::\n"
+"\n"
+" [extensions]\n"
+" foo =\n"
+"\n"
+"You may also specify the full path to an extension::\n"
+"\n"
+" [extensions]\n"
+" myfeature = ~/.hgext/myfeature.py\n"
+"\n"
+"To explicitly disable an extension enabled in an hgrc of broader\n"
+"scope, prepend its path with !::\n"
+"\n"
+" [extensions]\n"
+" # disabling extension bar residing in /path/to/extension/bar.py\n"
+" hgext.bar = !/path/to/extension/bar.py\n"
+" # ditto, but no path was supplied for extension baz\n"
+" hgext.baz = !\n"
+msgstr ""
+"\n"
+" Mercurial には、新規機能を「エクステンション」という機構を用いて\n"
+" 追加する仕組みが備わっています。エクステンションでは、コマンドの\n"
+" 新規追加、既存コマンドへのオプションの追加、コマンドの挙動の変更、\n"
+" フックの実装といったことが可能です。\n"
+"\n"
+" 様々な事情から、特に指定の無い場合にはエクステンションは読み込まれ\n"
+" ません。付加的な読み込みは、起動時間の増加を意味します。上級用途\n"
+" 限定のものもあります。(履歴の破壊や改変などの)潜在的な危険性を持つ\n"
+" 場合もあります。実験的なものであるかもしれません。これまでの\n"
+" Mercurial の振る舞いを変えてしまうかもしれません。エクステンションを\n"
+" 必要に応じて有効化するのは利用者の責務です。\n"
+"\n"
+" \"foo\" というエクステンションを有効化するには、Mercurial 同梱の\n"
+" ものであろうと、Python の検索パス中のものであろうと、設定ファイル\n"
+" において以下のような記述が必要です。\n"
+"\n"
+" [extensions]\n"
+" foo =\n"
+"\n"
+" エクステンションへのフルパスを記述することも可能です。\n"
+"\n"
+" [extensions]\n"
+" myfeature = ~/.hgext/myfeature.py\n"
+"\n"
+" 明示的にエクステンションを無効化する場合、適切な設定ファイルにおいて\n"
+" パス指定の冒頭に '!' を付与します。\n"
+"\n"
+" [extensions]\n"
+" # /path/to/extension/bar.py にあるエクステンション bar の無効化\n"
+" hgext.bar = !/path/to/extension/bar.py\n"
+" # こちらはパス指定無しでの baz エクステンションの無効化\n"
+" hgext.baz = !\n"
+" "
+
+#, fuzzy
+msgid ""
+"When Mercurial accepts more than one revision, they may be specified\n"
+"individually, or provided as a topologically continuous range,\n"
+"separated by the \":\" character.\n"
+"\n"
+"The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
+"revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n"
+"specified, it defaults to revision number 0. If END is not specified,\n"
+"it defaults to the tip. The range \":\" thus means \"all revisions\".\n"
+"\n"
+"If BEGIN is greater than END, revisions are treated in reverse order.\n"
+"\n"
+"A range acts as a closed interval. This means that a range of 3:5\n"
+"gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
+msgstr ""
+"\n"
+" Mercurial が複数のリビジョン指定を受け付ける場合の指定方法は、\n"
+" 個々のリビジョンをそれぞれ指定する方法以外にも、\":\" を区切り\n"
+" 記号にした範囲指定による方法があります。\n"
+"\n"
+" 範囲表記の文法は、\"[開始]:[終了]\" というもので、\"開始\"・\"終了\"\n"
+" 部分にはそれぞれリビジョン識別用の情報が記述されます。\n"
+" \"開始\"・\"終了\" はそれぞれ省略可能です。\"開始\" 部分が\n"
+" 記述されない場合、リビジョン番号 0 が記述されたものとみなされます。\n"
+" \"終了\" 部分が記述されない場合、tip が記述されたものとみなされます。\n"
+" 以上のことから、\":\" という記述は \"全リビジョン\" を指します。\n"
+"\n"
+" \"開始\" 指定が \"終了\" 指定よりも後のリビジョンである場合、逆順指定\n"
+" とみなされます。\n"
+"\n"
+" 範囲指定は \"閉区間\" とみなされます。つまり、3:5 という範囲指定は\n"
+" 3, 4, 5 の指定と等価です。同様に 9:6 という指定は 9, 8, 7, 6 の指定と\n"
+" 等価です。\n"
+" "
+
+#, fuzzy
+msgid ""
+"Mercurial accepts several notations for identifying one or more files\n"
+"at a time.\n"
+"\n"
+"By default, Mercurial treats filenames as shell-style extended glob\n"
+"patterns.\n"
+"\n"
+"Alternate pattern notations must be specified explicitly.\n"
+"\n"
+"To use a plain path name without any pattern matching, start it with\n"
+"``path:``. These path names must completely match starting at the\n"
+"current repository root.\n"
+"\n"
+"To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
+"at the current directory; a glob such as ``*.c`` will only match files\n"
+"in the current directory ending with ``.c``.\n"
+"\n"
+"The supported glob syntax extensions are ``**`` to match any string\n"
+"across path separators and ``{a,b}`` to mean \"a or b\".\n"
+"\n"
+"To use a Perl/Python regular expression, start a name with ``re:``.\n"
+"Regexp pattern matching is anchored at the root of the repository.\n"
+"\n"
+"Plain examples::\n"
+"\n"
+" path:foo/bar a name bar in a directory named foo in the root\n"
+" of the repository\n"
+" path:path:name a file or directory named \"path:name\"\n"
+"\n"
+"Glob examples::\n"
+"\n"
+" glob:*.c any name ending in \".c\" in the current directory\n"
+" *.c any name ending in \".c\" in the current directory\n"
+" **.c any name ending in \".c\" in any subdirectory of the\n"
+" current directory including itself.\n"
+" foo/*.c any name ending in \".c\" in the directory foo\n"
+" foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
+" including itself.\n"
+"\n"
+"Regexp examples::\n"
+"\n"
+" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
+msgstr ""
+"\n"
+" Mercurial には、ファイルを特定するパターン指定方法が複数あります。\n"
+"\n"
+" 特に指定の無い場合、Mercurial は指定されたファイル名に対して、\n"
+" shell 形式の拡張ワイルドカード合致を行います。\n"
+"\n"
+" 別な形式でのパターン記述の際には、明示的に種別を指定してください。\n"
+"\n"
+" パターン合致を行わずに、指定された名前をそのまま使用する場合、\n"
+" 名前の前に \"path:\" を記述します。この形式を使用する場合、\n"
+" リポジトリのルートからのパスと完全に一致しなければなりません。\n"
+"\n"
+" 拡張ワイルドカード合致の場合、名前の前に \"glob:\" を記述します。この\n"
+" 形式では、現ディレクトリからの相対になりますので、\"*.c\" パターンは\n"
+" 末尾が \"*.c\" で終わる現ディレクトリ中のファイルとのみ合致します。\n"
+"\n"
+" ワイルドカードの拡張文法には、パス区切りも含めた任意の文字列と合致する\n"
+" \"**\" と、\"a ないし b\" を意味する \"{a,b}\" という形式があります。\n"
+"\n"
+" Perl/Python 形式の正規表現の場合、名前の前に \"re:\" を記述します。\n"
+" 正規表現形式では、リポジトリのルートからの合致を意味する \"^\" 指定が\n"
+" パターン先頭に自動的に付与されます(訳注: .hgignore での指定では付与\n"
+" 「されません」ので注意が必要です)。\n"
+"\n"
+" パターン合致未使用例:\n"
+"\n"
+" path:foo/bar リポジトリルート直下の foo ディレクトリ中の bar\n"
+" path:path:name \"path:name\" という名前\n"
+"\n"
+" ワイルドカード指定例:\n"
+"\n"
+" glob:*.c 現ディレクトリ直下で、名前が \".c\" で終わるもの\n"
+" *.c 現ディレクトリ直下で、名前が \".c\" で終わるもの\n"
+" **.c 現ディレクトリないしその配下のディレクトリにおいて、\n"
+" 名前が \".c\" で終わるもの\n"
+" foo/*.c foo ディレクトリ直下で、名前が \".c\" で終わるもの\n"
+" foo/**.c foo ディレクトリないしその配下のディレクトリにおいて、\n"
+" 名前が \".c\" で終わるもの\n"
+"\n"
+" 正規表現指定例:\n"
+"\n"
+" re:.*\\.c$ 作業領域中の任意の位置で、名前が \".c\" で終わるもの\n"
+"\n"
+" "
+
+#, fuzzy
+msgid ""
+"Mercurial supports several ways to specify individual revisions.\n"
+"\n"
+"A plain integer is treated as a revision number. Negative integers are\n"
+"treated as sequential offsets from the tip, with -1 denoting the tip,\n"
+"-2 denoting the revision prior to the tip, and so forth.\n"
+"\n"
+"A 40-digit hexadecimal string is treated as a unique revision\n"
+"identifier.\n"
+"\n"
+"A hexadecimal string less than 40 characters long is treated as a\n"
+"unique revision identifier and is referred to as a short-form\n"
+"identifier. A short-form identifier is only valid if it is the prefix\n"
+"of exactly one full-length identifier.\n"
+"\n"
+"Any other string is treated as a tag or branch name. A tag name is a\n"
+"symbolic name associated with a revision identifier. A branch name\n"
+"denotes the tipmost revision of that branch. Tag and branch names must\n"
+"not contain the \":\" character.\n"
+"\n"
+"The reserved name \"tip\" is a special tag that always identifies the\n"
+"most recent revision.\n"
+"\n"
+"The reserved name \"null\" indicates the null revision. This is the\n"
+"revision of an empty repository, and the parent of revision 0.\n"
+"\n"
+"The reserved name \".\" indicates the working directory parent. If no\n"
+"working directory is checked out, it is equivalent to null. If an\n"
+"uncommitted merge is in progress, \".\" is the revision of the first\n"
+"parent.\n"
+msgstr ""
+"\n"
+" Mercurial は、個々のリビジョンを識別する記法を幾つか用意しています。\n"
+"\n"
+" 整数値は、「リビジョン番号」とみなされます。負値は、tip からの距離を\n"
+" 表し、-1 は tip 自身を表します。負値の指定は、手元のリポジトリ中の\n"
+" 履歴遷移を把握している際に、入力を省力化したい場合にのみ有効です。\n"
+" 負値の利用はあまりお勧めできません。\n"
+"\n"
+" 40桁の16進文字列は、一意な「リビジョン識別子」とみなされます。\n"
+"\n"
+" 40桁未満の16進文字列は、一意な「リビジョン識別子」の短縮形式と\n"
+" みなされます。短縮形式の識別子は、厳密に1つの完全長の識別子とだけ\n"
+" 前方一致する場合にのみ有効です。\n"
+"\n"
+" それ以外の文字列は、リビジョン識別子に関連付けられた「タグ名」と\n"
+" みなされます。タグ名は \":\" を含んでいないかもしれない。\n"
+"\n"
+" 「最新のリビジョン」を示すための名前 \"tip\" は、特別な名前として予約\n"
+" されています。\n"
+"\n"
+" 「空リビジョン」を示すための名前 \"null\" は、特別な名前として予約\n"
+" されており、リビジョン 0 の親は \"null\" リビジョンです。\n"
+"\n"
+" 「作業領域の親リビジョン」を示すための名前 \".\" は、特別な名前として\n"
+" 予約されています。作業領域が未更新の場合は、\"null\" 指定と等価です。\n"
+" 未コミットのマージ中の場合、\".\" は第1親リビジョンを指します。\n"
+" "
+
+#, fuzzy
+msgid ""
+"Mercurial allows you to customize output of commands through\n"
+"templates. You can either pass in a template from the command\n"
+"line, via the --template option, or select an existing\n"
+"template-style (--style).\n"
+"\n"
+"You can customize output for any \"log-like\" command: log,\n"
+"outgoing, incoming, tip, parents, heads and glog.\n"
+"\n"
+"Three styles are packaged with Mercurial: default (the style used\n"
+"when no explicit preference is passed), compact and changelog.\n"
+"Usage::\n"
+"\n"
+" $ hg log -r1 --style changelog\n"
+"\n"
+"A template is a piece of text, with markup to invoke variable\n"
+"expansion::\n"
+"\n"
+" $ hg log -r1 --template \"{node}\\n\"\n"
+" b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
+"\n"
+"Strings in curly braces are called keywords. The availability of\n"
+"keywords depends on the exact context of the templater. These\n"
+"keywords are usually available for templating a log-like command:\n"
+"\n"
+":author: String. The unmodified author of the changeset.\n"
+":branches: String. The name of the branch on which the changeset\n"
+" was committed. Will be empty if the branch name was\n"
+" default.\n"
+":date: Date information. The date when the changeset was\n"
+" committed.\n"
+":desc: String. The text of the changeset description.\n"
+":diffstat: String. Statistics of changes with the following\n"
+" format: \"modified files: +added/-removed lines\"\n"
+":files: List of strings. All files modified, added, or removed\n"
+" by this changeset.\n"
+":file_adds: List of strings. Files added by this changeset.\n"
+":file_mods: List of strings. Files modified by this changeset.\n"
+":file_dels: List of strings. Files removed by this changeset.\n"
+":node: String. The changeset identification hash, as a\n"
+" 40-character hexadecimal string.\n"
+":parents: List of strings. The parents of the changeset.\n"
+":rev: Integer. The repository-local changeset revision\n"
+" number.\n"
+":tags: List of strings. Any tags associated with the\n"
+" changeset.\n"
+":latesttag: String. Most recent global tag in the ancestors of this\n"
+" changeset.\n"
+":latesttagdistance: Integer. Longest path to the latest tag.\n"
+"\n"
+"The \"date\" keyword does not produce human-readable output. If you\n"
+"want to use a date in your output, you can use a filter to process\n"
+"it. Filters are functions which return a string based on the input\n"
+"variable. You can also use a chain of filters to get the desired\n"
+"output::\n"
+"\n"
+" $ hg tip --template \"{date|isodate}\\n\"\n"
+" 2008-08-21 18:22 +0000\n"
+"\n"
+"List of filters:\n"
+"\n"
+":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
+" every line except the last.\n"
+":age: Date. Returns a human-readable date/time difference\n"
+" between the given date/time and the current\n"
+" date/time.\n"
+":basename: Any text. Treats the text as a path, and returns the\n"
+" last component of the path after splitting by the\n"
+" path separator (ignoring trailing separators). For\n"
+" example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n"
+" becomes \"bar\".\n"
+":stripdir: Treat the text as path and strip a directory level,\n"
+" if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
+" \"foo\".\n"
+":date: Date. Returns a date in a Unix date format, including\n"
+" the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
+":domain: Any text. Finds the first string that looks like an\n"
+" email address, and extracts just the domain\n"
+" component. Example: 'User <user@example.com>' becomes\n"
+" 'example.com'.\n"
+":email: Any text. Extracts the first string that looks like\n"
+" an email address. Example: 'User <user@example.com>'\n"
+" becomes 'user@example.com'.\n"
+":escape: Any text. Replaces the special XML/XHTML characters\n"
+" \"&\", \"<\" and \">\" with XML entities.\n"
+":fill68: Any text. Wraps the text to fit in 68 columns.\n"
+":fill76: Any text. Wraps the text to fit in 76 columns.\n"
+":firstline: Any text. Returns the first line of text.\n"
+":nonempty: Any text. Returns '(none)' if the string is empty.\n"
+":hgdate: Date. Returns the date as a pair of numbers:\n"
+" \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
+":isodate: Date. Returns the date in ISO 8601 format:\n"
+" \"2009-08-18 13:00 +0200\".\n"
+":isodatesec: Date. Returns the date in ISO 8601 format, including\n"
+" seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
+" rfc3339date filter.\n"
+":localdate: Date. Converts a date to local date.\n"
+":obfuscate: Any text. Returns the input text rendered as a\n"
+" sequence of XML entities.\n"
+":person: Any text. Returns the text before an email address.\n"
+":rfc822date: Date. Returns a date using the same format used in\n"
+" email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
+":rfc3339date: Date. Returns a date using the Internet date format\n"
+" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
+":short: Changeset hash. Returns the short form of a changeset\n"
+" hash, i.e. a 12-byte hexadecimal string.\n"
+":shortdate: Date. Returns a date like \"2006-09-18\".\n"
+":strip: Any text. Strips all leading and trailing whitespace.\n"
+":tabindent: Any text. Returns the text, with every line except\n"
+" the first starting with a tab character.\n"
+":urlescape: Any text. Escapes all \"special\" characters. For\n"
+" example, \"foo bar\" becomes \"foo%20bar\".\n"
+":user: Any text. Returns the user portion of an email\n"
+" address.\n"
+msgstr ""
+"\n"
+" Mercurial では、テンプレート機能によってコマンドの出力をカスタマイズ\n"
+" することができます。コマンドラインからの指定では、--template による\n"
+" テンプレート指定と、--style によるスタイル指定の両方が使用できます。\n"
+"\n"
+" 「log 的」な出力を行う以下のコマンドの出力をカスタマイズ可能です:\n"
+" log, outgoing, incoming, tip, parents, heads, glog\n"
+"\n"
+" Mercurial には(明示的な指定が無い場合に使用される)default、compact\n"
+" および changelog の3つのスタイル設定が同梱されています。利用方法は:\n"
+"\n"
+" $ hg log -r1 --style changelog\n"
+"\n"
+" テンプレートとは、変数展開マークアップ機能を備えたテキストです。\n"
+"\n"
+" $ hg log -r1 --template \"{node}\\n\"\n"
+" b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
+"\n"
+" 波括弧で囲まれた部分は「キーワード」と呼ばれます。キーワード利用の\n"
+" 可否は、テンプレートの利用される状況に依存します。以下のキーワードは\n"
+" log 的なコマンドでのテンプレート利用の際には常に使用可能です。\n"
+"\n"
+" - author: 文字列。リビジョンの作者名(記録情報そのまま)。\n"
+" - branches: 文字列。リビジョンの属するブランチ名。所属ブランチが\n"
+" default の場合は空文字列。\n"
+" - date: 日時情報。リビジョンが記録された日時。\n"
+" - desc: 文字列。リビジョンのコミットメッセージ。\n"
+" - diffstat: 文字列。以下の形式での変更概要。\n"
+" \"変更対象ファイル: +追加行数/-削除行数\"\n"
+" - files: 文字列列挙。当該リビジョンでの、変更／追加登録ないし\n"
+" 登録除外ファイルの一覧。\n"
+" - file_adds: 文字列列挙。当該リビジョンでの追加ファイル一覧。\n"
+" - file_mods: 文字列列挙。当該リビジョンでの変更ファイル一覧。\n"
+" - file_dels: 文字列列挙。当該リビジョンでの登録除外ファイル一覧。\n"
+" - node: 文字列。リビジョン識別用の 40 桁 16 進数ハッシュ値。\n"
+" - parents: 文字列列挙。リビジョンの親。\n"
+" - rev: 整数。各リポジトリ固有のリビジョン番号。\n"
+" - tags: 文字列列挙。当該リビジョンに付与されたタグの一覧。\n"
+"\n"
+" \"date\" キーワードの出力は可読形式ではありません。出力に日時情報を\n"
+" 含めたい場合、可読化するために「フィルター」を使用します。\n"
+" 「フィルター」とは、指定値に基づいて文字列を生成する機能です。複数の\n"
+" フィルターを連ねることで、様々な出力を得ることができます。\n"
+"\n"
+" $ hg tip --template \"{date|isodate}\\n\"\n"
+" 2008-08-21 18:22 +0000\n"
+"\n"
+" フィルター一覧(入力と、それに対する出力):\n"
+"\n"
+" - addbreaks: 文字列。最終行を除く各行の行末に XHTML の \n"
+" \"<br />\" タグを追加します。\n"
+" - age: 日時情報。与えられた日時と、現在日時との差分を表す\n"
+" 可読形式の文字列を生成します。\n"
+" - basename: 文字列。与えられた文字列をパスとみなし、パス区切りで\n"
+" 区切られた最後の要素だけを取り出します(末尾パス\n"
+" 区切りは無視されます)。例えば、\"foo/bar/baz\" は\n"
+" \"baz\" に、\"foo/bar//\" は \"bar\" になります。\n"
+" - stripdir: 文字列。与えられた文字列をパスとみなし、ディレクトリ\n"
+" 要素があればそれを取り除きます。例えば、\"foo\"\n"
+" および \"foo/bar\" は \"foo\" となります。\n"
+" - date: 日時情報。タイムゾーンを含んだ、Unix の date コマンド\n"
+" 形式で可読化します: \"Mon Sep 04 15:13:13 2006 0700\"\n"
+" - domain: 文字列。メールアドレスと思しき最初の文字列部分から\n"
+" ドメイン部分だけを取り出します。例えば、\n"
+" 'User <user@example.com>' は 'example.com' です。\n"
+" - email: 文字列。メールアドレスと思しき最初の部分を取り出します。\n"
+" 例えば 'User <user@example.com>' は\n"
+" 'user@example.com' となります。\n"
+" - escape: 文字列。XML/XHTML の特殊文字である \"&\"、\"<\" および\n"
+" \">\" を XML のエンティティ形式に変換します。\n"
+" - fill68: 文字列。68 桁に収まるように文字列を折り返します。\n"
+" - fill76: 文字列。76 桁に収まるように文字列を折り返します。\n"
+" - firstline: 文字列。最初の行のみを取り出します。\n"
+" - nonempty: 文字列。与えられた文字列が空の場合 '(none)'となります。\n"
+" - hgdate: 日時情報。Unix タイムスタンプとタイムゾーンオフセット\n"
+" による数値対形式で可読化します: \"1157407993 25200\"\n"
+" - isodate: 日時情報。ISO 8601 形式で可読化します。\n"
+" - localdate: 日時情報。ローカル日時で可読化します。\n"
+" - obfuscate: 文字列。全ての文字を XML エンティティ形式に変換します。\n"
+" - person: 文字列。メールアドレス直前の部分だけを取り出します。\n"
+" - rfc822date:日時情報。メールのヘッダと同形式で可読化します。\n"
+" - short: リビジョンハッシュ 値。12 桁程度の短縮形式にします。\n"
+" - shortdate: 日時情報。\"2006-09-18\" 形式で可読化します。\n"
+" - strip: 文字列。先頭／末尾の空白文字を取り除きます。\n"
+" - tabindent: 文字列。先頭行以外をタブ文字で字下げします。\n"
+" - urlescape: 文字列。全ての「特殊」文字を変換します。\n"
+" 例えば \"foo bar\" は \"foo%20bar\" となります。\n"
+" - user: 文字列。メールアドレスのユーザ名部分を取り出します。\n"
+" "
+
+#, fuzzy
+msgid ""
+"Valid URLs are of the form::\n"
+"\n"
+" local/filesystem/path[#revision]\n"
+" file://local/filesystem/path[#revision]\n"
+" http://[user[:pass]@]host[:port]/[path][#revision]\n"
+" https://[user[:pass]@]host[:port]/[path][#revision]\n"
+" ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
+"\n"
+"Paths in the local filesystem can either point to Mercurial\n"
+"repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
+"incoming --bundle').\n"
+"\n"
+"An optional identifier after # indicates a particular branch, tag, or\n"
+"changeset to use from the remote repository. See also 'hg help\n"
+"revisions'.\n"
+"\n"
+"Some features, such as pushing to http:// and https:// URLs are only\n"
+"possible if the feature is explicitly enabled on the remote Mercurial\n"
+"server.\n"
+"\n"
+"Some notes about using SSH with Mercurial:\n"
+"\n"
+"- SSH requires an accessible shell account on the destination machine\n"
+" and a copy of hg in the remote path or specified with as remotecmd.\n"
+"- path is relative to the remote user's home directory by default. Use\n"
+" an extra slash at the start of a path to specify an absolute path::\n"
+"\n"
+" ssh://example.com//tmp/repository\n"
+"\n"
+"- Mercurial doesn't use its own compression via SSH; the right thing\n"
+" to do is to configure it in your ~/.ssh/config, e.g.::\n"
+"\n"
+" Host *.mylocalnetwork.example.com\n"
+" Compression no\n"
+" Host *\n"
+" Compression yes\n"
+"\n"
+" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
+" with the --ssh command line option.\n"
+"\n"
+"These URLs can all be stored in your hgrc with path aliases under the\n"
+"[paths] section like so::\n"
+"\n"
+" [paths]\n"
+" alias1 = URL1\n"
+" alias2 = URL2\n"
+" ...\n"
+"\n"
+"You can then use the alias for any command that uses a URL (for\n"
+"example 'hg pull alias1' would pull from the 'alias1' path).\n"
+"\n"
+"Two path aliases are special because they are used as defaults when\n"
+"you do not provide the URL to a command:\n"
+"\n"
+"default:\n"
+" When you create a repository with hg clone, the clone command saves\n"
+" the location of the source repository as the new repository's\n"
+" 'default' path. This is then used when you omit path from push- and\n"
+" pull-like commands (including incoming and outgoing).\n"
+"\n"
+"default-push:\n"
+" The push command will look for a path named 'default-push', and\n"
+" prefer it over 'default' if both are defined.\n"
+msgstr ""
+"\n"
+" 有効な URL 指定は以下の形式です:\n"
+"\n"
+" local/filesystem/path (ないし file://local/filesystem/path)\n"
+" http://[user[:pass]@]host[:port]/[path]\n"
+" https://[user[:pass]@]host[:port]/[path]\n"
+" ssh://[user[:pass]@]host[:port]/[path]\n"
+"\n"
+" ローカルファイルシステム上のパスが指す先は Mercurial のリポジトリでも、\n"
+" バンドルファイル('hg bundle' ないし 'hg incoming --bundle' で生成)でも\n"
+" 構いません。\n"
+"\n"
+" 遠隔ホスト上の連携先リポジトリ指定の場合、'#' 記号に続けて識別子を指定\n"
+" することで、特定のブランチ、タグないしチェンジセットを指定することが\n"
+" 出来ます。\n"
+"\n"
+" http:// や https:// 形式の URL で指定される連携先への push の様な\n"
+" 機能のうちの幾つかは、その機能が連携先の Mercurial サーバ側で明示的に\n"
+" 利用可能になっている場合に限り使用可能です。\n"
+"\n"
+" Mercurial と SSH を併用する場合の注意点:\n"
+" - SSH アクセス先ホスト上に、shell アカウントと hg コマンドが必要です。\n"
+" hg コマンドがアクセス先ホストの PATH 設定で利用可能になっていない\n"
+" 場合は、--remotecmd で明示的に指定してください。\n"
+" - URL 中のパス指定は、アクセス先ホスト上のユーザのホームディレクトリ\n"
+" からの相対パスとみなされます。絶対パスを指定する場合は、パスの先頭に\n"
+" 更にスラッシュ('/')を付与してください。\n"
+" 例: ssh://example.com//tmp/repository\n"
+" - SSH 連携の際には Mercurial は自身の圧縮処理を行いません。以下のように\n"
+" ~/.ssh/config 等で SSH の圧縮実施を指示することをお勧めします。\n"
+" Host *.mylocalnetwork.example.com\n"
+" Compression no\n"
+" Host *\n"
+" Compression yes\n"
+" あるいは、設定ファイルにおける ssh コマンド指定や、コマンドラインでの\n"
+" --ssh に対して、'ssh -C' を指定する方法もあります。\n"
+"\n"
+" 連携先 URL は、設定ファイルの [paths] セクションで、別名を付けて記述\n"
+" することが出来ます。\n"
+" [paths]\n"
+" alias1 = URL1\n"
+" alias2 = URL2\n"
+" ...\n"
+"\n"
+" URL 指定が必要なコマンドに対しては、別名を指定することが出来ます\n"
+" (例えば、'hg pull alias1' は alias1 の指す先から変更を取り込みます)。\n"
+"\n"
+" コマンドに URL を指定しなかった場合に、暗黙の連携先として使用される\n"
+" 重要な別名が2つあります。\n"
+"\n"
+" default:\n"
+" 'hg clone' によって複製した場合、新規リポジトリの 'default' として\n"
+" 複製元リポジトリの URL が保存されます。\n"
+" 以後、連携先を省略して 'hg push' や 'hg pull' に類するコマンドを\n"
+" 実行した際には、この URL が連携先として使用されます。\n"
+"\n"
+" default-push:\n"
+" 'hg push' は、'default-push' の別名で定義される URL を探します。\n"
+" 'default' が定義されている場合でも、'default-push' が定義されていれば\n"
+" こちらが優先されます。\n"
+" "
+
msgid ""
"hooks for controlling repository access\n"
"\n"
@@ -145,7 +1039,7 @@
"Nor is it safe if remote users share an account, because then there\n"
"is no way to distinguish them.\n"
"\n"
-"To use this hook, configure the acl extension in your hgrc like this:\n"
+"To use this hook, configure the acl extension in your hgrc like this::\n"
"\n"
" [extensions]\n"
" hgext.acl =\n"
@@ -158,10 +1052,10 @@
" # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
" sources = serve\n"
"\n"
-"The allow and deny sections take a subtree pattern as key (with a\n"
-"glob syntax by default), and a comma separated list of users as\n"
-"the corresponding value. The deny list is checked before the allow\n"
-"list is.\n"
+"The allow and deny sections take a subtree pattern as key (with a glob\n"
+"syntax by default), and a comma separated list of users as the\n"
+"corresponding value. The deny list is checked before the allow list\n"
+"is. ::\n"
"\n"
" [acl.allow]\n"
" # If acl.allow is not present, all users are allowed by default.\n"
@@ -177,52 +1071,28 @@
msgstr ""
#, python-format
-msgid "acl: %s not enabled\n"
-msgstr ""
-
-#, python-format
-msgid "acl: %s enabled, %d entries for user %s\n"
-msgstr ""
-
-#, python-format
msgid "config error - hook type \"%s\" cannot stop incoming changesets"
msgstr ""
#, python-format
-msgid "acl: changes have source \"%s\" - skipping\n"
-msgstr ""
-
-#, python-format
-msgid "acl: user %s denied on %s\n"
-msgstr "acl: ユーザ %s は %s に拒否されました\n"
-
-#, python-format
msgid "acl: access denied for changeset %s"
msgstr "acl: チェンジセット %s のアクセスは拒否されました"
-#, python-format
-msgid "acl: user %s not allowed on %s\n"
-msgstr "acl: ユーザ %s は %s で許可されていません\n"
-
-#, python-format
-msgid "acl: allowing changeset %s\n"
-msgstr "acl: 許可済みのチェンジセット %s\n"
-
msgid ""
"track a line of development with movable markers\n"
"\n"
"Bookmarks are local movable markers to changesets. Every bookmark\n"
"points to a changeset identified by its hash. If you commit a\n"
-"changeset that is based on a changeset that has a bookmark on it,\n"
-"the bookmark shifts to the new changeset.\n"
-"\n"
-"It is possible to use bookmark names in every revision lookup\n"
-"(e.g. hg merge, hg update).\n"
+"changeset that is based on a changeset that has a bookmark on it, the\n"
+"bookmark shifts to the new changeset.\n"
+"\n"
+"It is possible to use bookmark names in every revision lookup (e.g. hg\n"
+"merge, hg update).\n"
"\n"
"By default, when several bookmarks point to the same changeset, they\n"
"will all move forward together. It is possible to obtain a more\n"
"git-like experience by adding the following configuration option to\n"
-"your .hgrc:\n"
+"your .hgrc::\n"
"\n"
" [bookmarks]\n"
" track.current = True\n"
@@ -297,65 +1167,86 @@
"be run by Mercurial as the user pushing the change; you will need to\n"
"ensure the Bugzilla install file permissions are set appropriately.\n"
"\n"
-"Configuring the extension:\n"
-"\n"
-" [bugzilla]\n"
-"\n"
-" host Hostname of the MySQL server holding the Bugzilla\n"
-" database.\n"
-" db Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
-" user Username to use to access MySQL server. Default 'bugs'.\n"
-" password Password to use to access MySQL server.\n"
-" timeout Database connection timeout (seconds). Default 5.\n"
-" version Bugzilla version. Specify '3.0' for Bugzilla versions\n"
-" 3.0 and later, '2.18' for Bugzilla versions from 2.18\n"
-" and '2.16' for versions prior to 2.18.\n"
-" bzuser Fallback Bugzilla user name to record comments with, if\n"
-" changeset committer cannot be found as a Bugzilla user.\n"
-" bzdir Bugzilla install directory. Used by default notify.\n"
-" Default '/var/www/html/bugzilla'.\n"
-" notify The command to run to get Bugzilla to send bug change\n"
-" notification emails. Substitutes from a map with 3\n"
-" keys, 'bzdir', 'id' (bug id) and 'user' (committer\n"
-" bugzilla email). Default depends on version; from 2.18\n"
-" it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
-" %(id)s %(user)s\".\n"
-" regexp Regular expression to match bug IDs in changeset commit\n"
-" message. Must contain one \"()\" group. The default\n"
-" expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n"
-" number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n"
-" variations thereof. Matching is case insensitive.\n"
-" style The style file to use when formatting comments.\n"
-" template Template to use when formatting comments. Overrides\n"
-" style if specified. In addition to the usual Mercurial\n"
-" keywords, the extension specifies:\n"
-" {bug} The Bugzilla bug ID.\n"
-" {root} The full pathname of the Mercurial\n"
-" repository.\n"
-" {webroot} Stripped pathname of the Mercurial\n"
-" repository.\n"
-" {hgweb} Base URL for browsing Mercurial\n"
-" repositories.\n"
-" Default 'changeset {node|short} in repo {root} refers '\n"
-" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
-" strip The number of slashes to strip from the front of {root}\n"
-" to produce {webroot}. Default 0.\n"
-" usermap Path of file containing Mercurial committer ID to\n"
-" Bugzilla user ID mappings. If specified, the file\n"
-" should contain one mapping per line,\n"
-" \"committer\"=\"Bugzilla user\". See also the [usermap]\n"
-" section.\n"
-"\n"
-" [usermap]\n"
-" Any entries in this section specify mappings of Mercurial\n"
-" committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
-" \"committer\"=\"Bugzilla user\"\n"
-"\n"
-" [web]\n"
-" baseurl Base URL for browsing Mercurial repositories. Reference\n"
-" from templates as {hgweb}.\n"
-"\n"
-"Activating the extension:\n"
+"The extension is configured through three different configuration\n"
+"sections. These keys are recognized in the [bugzilla] section:\n"
+"\n"
+"host\n"
+" Hostname of the MySQL server holding the Bugzilla database.\n"
+"\n"
+"db\n"
+" Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
+"\n"
+"user\n"
+" Username to use to access MySQL server. Default 'bugs'.\n"
+"\n"
+"password\n"
+" Password to use to access MySQL server.\n"
+"\n"
+"timeout\n"
+" Database connection timeout (seconds). Default 5.\n"
+"\n"
+"version\n"
+" Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
+" '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
+" to 2.18.\n"
+"\n"
+"bzuser\n"
+" Fallback Bugzilla user name to record comments with, if changeset\n"
+" committer cannot be found as a Bugzilla user.\n"
+"\n"
+"bzdir\n"
+" Bugzilla install directory. Used by default notify. Default\n"
+" '/var/www/html/bugzilla'.\n"
+"\n"
+"notify\n"
+" The command to run to get Bugzilla to send bug change notification\n"
+" emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
+" and 'user' (committer bugzilla email). Default depends on version;\n"
+" from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
+" %(id)s %(user)s\".\n"
+"\n"
+"regexp\n"
+" Regular expression to match bug IDs in changeset commit message.\n"
+" Must contain one \"()\" group. The default expression matches 'Bug\n"
+" 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
+" 1234 and 5678' and variations thereof. Matching is case insensitive.\n"
+"\n"
+"style\n"
+" The style file to use when formatting comments.\n"
+"\n"
+"template\n"
+" Template to use when formatting comments. Overrides style if\n"
+" specified. In addition to the usual Mercurial keywords, the\n"
+" extension specifies::\n"
+"\n"
+" {bug} The Bugzilla bug ID.\n"
+" {root} The full pathname of the Mercurial repository.\n"
+" {webroot} Stripped pathname of the Mercurial repository.\n"
+" {hgweb} Base URL for browsing Mercurial repositories.\n"
+"\n"
+" Default 'changeset {node|short} in repo {root} refers '\n"
+" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
+"\n"
+"strip\n"
+" The number of slashes to strip from the front of {root} to produce\n"
+" {webroot}. Default 0.\n"
+"\n"
+"usermap\n"
+" Path of file containing Mercurial committer ID to Bugzilla user ID\n"
+" mappings. If specified, the file should contain one mapping per\n"
+" line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n"
+"\n"
+"The [usermap] section is used to specify mappings of Mercurial\n"
+"committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
+"\"committer\"=\"Bugzilla user\"\n"
+"\n"
+"Finally, the [web] section supports one entry:\n"
+"\n"
+"baseurl\n"
+" Base URL for browsing Mercurial repositories. Reference from\n"
+" templates as {hgweb}.\n"
+"\n"
+"Activating the extension::\n"
"\n"
" [extensions]\n"
" hgext.bugzilla =\n"
@@ -368,7 +1259,7 @@
"\n"
"This example configuration is for a collection of Mercurial\n"
"repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
-"installation in /opt/bugzilla-3.2.\n"
+"installation in /opt/bugzilla-3.2. ::\n"
"\n"
" [bugzilla]\n"
" host=localhost\n"
@@ -376,8 +1267,9 @@
" version=3.0\n"
" bzuser=unknown@domain.com\n"
" bzdir=/opt/bugzilla-3.2\n"
-" template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
-"rev/{node|short}\\n\\n{desc}\\n\n"
+" template=Changeset {node|short} in {root|basename}.\n"
+" {hgweb}/{webroot}/rev/{node|short}\\n\n"
+" {desc}\\n\n"
" strip=5\n"
"\n"
" [web]\n"
@@ -386,7 +1278,7 @@
" [usermap]\n"
" user@emaildomain.com=user.name@bugzilladomain.com\n"
"\n"
-"Commits add a comment to the Bugzilla bug record of the form:\n"
+"Commits add a comment to the Bugzilla bug record of the form::\n"
"\n"
" Changeset 3b16791d6642 in repository-name.\n"
" http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
@@ -504,6 +1396,7 @@
msgid "generating stats: %d%%"
msgstr "統計作業中: %d%%"
+#, fuzzy
msgid ""
"histogram of changes to the repository\n"
"\n"
@@ -517,7 +1410,7 @@
" alternatively the number of matching revisions if the\n"
" --changesets option is specified.\n"
"\n"
-" Examples:\n"
+" Examples::\n"
"\n"
" # display count of changed lines for every committer\n"
" hg churn -t '{author|email}'\n"
@@ -532,12 +1425,12 @@
" hg churn -f '%Y' -s\n"
"\n"
" It is possible to map alternate email addresses to a main address\n"
-" by providing a file using the following format:\n"
-"\n"
-" <alias email> <actual email>\n"
-"\n"
-" Such a file may be specified with the --aliases option, otherwise a\n"
-" .hgchurn file will be looked for in the working directory root.\n"
+" by providing a file using the following format::\n"
+"\n"
+" <alias email> <actual email>\n"
+"\n"
+" Such a file may be specified with the --aliases option, otherwise\n"
+" a .hgchurn file will be looked for in the working directory root.\n"
" "
msgstr ""
"リポジトリにおける変更の統計分布表示\n"
@@ -575,10 +1468,6 @@
" 直下に .hgchurn というファイルがあれば、これが使用されます。\n"
" "
-#, python-format
-msgid "assuming %i character terminal\n"
-msgstr "画面の横幅を %i 文字と仮定\n"
-
msgid "count rate for the specified revision or range"
msgstr "処理対象とする特定リビジョン／範囲の指定"
@@ -620,39 +1509,40 @@
"function (aka ANSI escape codes). This module also provides the\n"
"render_text function, which can be used to add effects to any text.\n"
"\n"
-"Default effects may be overridden from the .hgrc file:\n"
-"\n"
-"[color]\n"
-"status.modified = blue bold underline red_background\n"
-"status.added = green bold\n"
-"status.removed = red bold blue_background\n"
-"status.deleted = cyan bold underline\n"
-"status.unknown = magenta bold underline\n"
-"status.ignored = black bold\n"
-"\n"
-"# 'none' turns off all effects\n"
-"status.clean = none\n"
-"status.copied = none\n"
-"\n"
-"qseries.applied = blue bold underline\n"
-"qseries.unapplied = black bold\n"
-"qseries.missing = red bold\n"
-"\n"
-"diff.diffline = bold\n"
-"diff.extended = cyan bold\n"
-"diff.file_a = red bold\n"
-"diff.file_b = green bold\n"
-"diff.hunk = magenta\n"
-"diff.deleted = red\n"
-"diff.inserted = green\n"
-"diff.changed = white\n"
-"diff.trailingwhitespace = bold red_background\n"
+"Default effects may be overridden from the .hgrc file::\n"
+"\n"
+" [color]\n"
+" status.modified = blue bold underline red_background\n"
+" status.added = green bold\n"
+" status.removed = red bold blue_background\n"
+" status.deleted = cyan bold underline\n"
+" status.unknown = magenta bold underline\n"
+" status.ignored = black bold\n"
+"\n"
+" # 'none' turns off all effects\n"
+" status.clean = none\n"
+" status.copied = none\n"
+"\n"
+" qseries.applied = blue bold underline\n"
+" qseries.unapplied = black bold\n"
+" qseries.missing = red bold\n"
+"\n"
+" diff.diffline = bold\n"
+" diff.extended = cyan bold\n"
+" diff.file_a = red bold\n"
+" diff.file_b = green bold\n"
+" diff.hunk = magenta\n"
+" diff.deleted = red\n"
+" diff.inserted = green\n"
+" diff.changed = white\n"
+" diff.trailingwhitespace = bold red_background\n"
msgstr ""
msgid "when to colorize (always, auto, or never)"
msgstr ""
-msgid "don't colorize output"
+#, fuzzy
+msgid "don't colorize output (DEPRECATED)"
msgstr "出力を色づけ市内"
#, python-format
@@ -666,6 +1556,7 @@
"convert a foreign SCM repository to a Mercurial one.\n"
"\n"
" Accepted source formats [identifiers]:\n"
+"\n"
" - Mercurial [hg]\n"
" - CVS [cvs]\n"
" - Darcs [darcs]\n"
@@ -677,6 +1568,7 @@
" - Perforce [p4]\n"
"\n"
" Accepted destination formats [identifiers]:\n"
+"\n"
" - Mercurial [hg]\n"
" - Subversion [svn] (history on branches is not preserved)\n"
"\n"
@@ -688,23 +1580,28 @@
" basename of the source with '-hg' appended. If the destination\n"
" repository doesn't exist, it will be created.\n"
"\n"
-" By default, all sources except Mercurial will use\n"
-" --branchsort. Mercurial uses --sourcesort to preserve original\n"
-" revision numbers order. Sort modes have the following effects:\n"
-" --branchsort: convert from parent to child revision when\n"
-" possible, which means branches are usually converted one after\n"
-" the other. It generates more compact repositories.\n"
-" --datesort: sort revisions by date. Converted repositories have\n"
-" good-looking changelogs but are often an order of magnitude\n"
-" larger than the same ones generated by --branchsort.\n"
-" --sourcesort: try to preserve source revisions order, only\n"
-" supported by Mercurial sources.\n"
+" By default, all sources except Mercurial will use --branchsort.\n"
+" Mercurial uses --sourcesort to preserve original revision numbers\n"
+" order. Sort modes have the following effects:\n"
+"\n"
+" --branchsort convert from parent to child revision when possible,\n"
+" which means branches are usually converted one after\n"
+" the other. It generates more compact repositories.\n"
+"\n"
+" --datesort sort revisions by date. Converted repositories have\n"
+" good-looking changelogs but are often an order of\n"
+" magnitude larger than the same ones generated by\n"
+" --branchsort.\n"
+"\n"
+" --sourcesort try to preserve source revisions order, only\n"
+" supported by Mercurial sources.\n"
"\n"
" If <REVMAP> isn't given, it will be put in a default location\n"
" (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
" that maps each source commit ID to the destination ID for that\n"
-" revision, like so:\n"
-" <source ID> <destination ID>\n"
+" revision, like so::\n"
+"\n"
+" <source ID> <destination ID>\n"
"\n"
" If the file doesn't exist, it's automatically created. It's\n"
" updated on each commit copied, so convert-repo can be interrupted\n"
@@ -718,7 +1615,7 @@
"\n"
" The filemap is a file that allows filtering and remapping of files\n"
" and directories. Comment lines start with '#'. Each line can\n"
-" contain one of the following directives:\n"
+" contain one of the following directives::\n"
"\n"
" include path/to/file\n"
"\n"
@@ -728,11 +1625,11 @@
"\n"
" The 'include' directive causes a file, or all files under a\n"
" directory, to be included in the destination repository, and the\n"
-" exclusion of all other files and directories not explicitly included.\n"
-" The 'exclude' directive causes files or directories to be omitted.\n"
-" The 'rename' directive renames a file or directory. To rename from\n"
-" a subdirectory into the root of the repository, use '.' as the\n"
-" path to rename to.\n"
+" exclusion of all other files and directories not explicitly\n"
+" included. The 'exclude' directive causes files or directories to\n"
+" be omitted. The 'rename' directive renames a file or directory. To\n"
+" rename from a subdirectory into the root of the repository, use\n"
+" '.' as the path to rename to.\n"
"\n"
" The splicemap is a file that allows insertion of synthetic\n"
" history, letting you specify the parents of a revision. This is\n"
@@ -757,7 +1654,7 @@
" in one repository from \"default\" to a named branch.\n"
"\n"
" Mercurial Source\n"
-" -----------------\n"
+" ----------------\n"
"\n"
" --config convert.hg.ignoreerrors=False (boolean)\n"
" ignore integrity errors when reading. Use it to fix Mercurial\n"
@@ -782,43 +1679,31 @@
" converted, and that any directory reorganization in the CVS\n"
" sandbox is ignored.\n"
"\n"
-" Because CVS does not have changesets, it is necessary to collect\n"
-" individual commits to CVS and merge them into changesets. CVS\n"
-" source uses its internal changeset merging code by default but can\n"
-" be configured to call the external 'cvsps' program by setting:\n"
-" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
-" This option is deprecated and will be removed in Mercurial 1.4.\n"
-"\n"
" The options shown are the defaults.\n"
"\n"
-" Internal cvsps is selected by setting\n"
-" --config convert.cvsps=builtin\n"
-" and has a few more configurable options:\n"
-" --config convert.cvsps.cache=True (boolean)\n"
-" Set to False to disable remote log caching, for testing and\n"
-" debugging purposes.\n"
-" --config convert.cvsps.fuzz=60 (integer)\n"
-" Specify the maximum time (in seconds) that is allowed\n"
-" between commits with identical user and log message in a\n"
-" single changeset. When very large files were checked in as\n"
-" part of a changeset then the default may not be long\n"
-" enough.\n"
-" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
-" Specify a regular expression to which commit log messages\n"
-" are matched. If a match occurs, then the conversion\n"
-" process will insert a dummy revision merging the branch on\n"
-" which this log message occurs to the branch indicated in\n"
-" the regex.\n"
-" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
-" Specify a regular expression to which commit log messages\n"
-" are matched. If a match occurs, then the conversion\n"
-" process will add the most recent revision on the branch\n"
-" indicated in the regex as the second parent of the\n"
-" changeset.\n"
-"\n"
-" The hgext/convert/cvsps wrapper script allows the builtin\n"
+" --config convert.cvsps.cache=True (boolean)\n"
+" Set to False to disable remote log caching, for testing and\n"
+" debugging purposes.\n"
+" --config convert.cvsps.fuzz=60 (integer)\n"
+" Specify the maximum time (in seconds) that is allowed between\n"
+" commits with identical user and log message in a single\n"
+" changeset. When very large files were checked in as part of a\n"
+" changeset then the default may not be long enough.\n"
+" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
+" Specify a regular expression to which commit log messages are\n"
+" matched. If a match occurs, then the conversion process will\n"
+" insert a dummy revision merging the branch on which this log\n"
+" message occurs to the branch indicated in the regex.\n"
+" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
+" Specify a regular expression to which commit log messages are\n"
+" matched. If a match occurs, then the conversion process will\n"
+" add the most recent revision on the branch indicated in the\n"
+" regex as the second parent of the changeset.\n"
+"\n"
+" An additional \"debugcvsps\" Mercurial command allows the builtin\n"
" changeset merging code to be run without doing a conversion. Its\n"
-" parameters and output are similar to that of cvsps 2.1.\n"
+" parameters and output are similar to that of cvsps 2.1. Please see\n"
+" the command help for more details.\n"
"\n"
" Subversion Source\n"
" -----------------\n"
@@ -864,7 +1749,6 @@
" --config convert.p4.startrev=0 (perforce changelist number)\n"
" specify initial Perforce revision.\n"
"\n"
-"\n"
" Mercurial Destination\n"
" ---------------------\n"
"\n"
@@ -990,10 +1874,6 @@
msgstr "要求されたツール '%s' を見つけることができません"
#, python-format
-msgid "running: %s\n"
-msgstr "実行しています: %s\n"
-
-#, python-format
msgid "%s error:\n"
msgstr "%s エラー:\n"
@@ -1071,18 +1951,10 @@
msgid "--sourcesort is not supported by this data source"
msgstr "指定の変換元では --sourcesort を指定できません"
-msgid ""
-"warning: support for external cvsps is deprecated and will be removed in "
-"Mercurial 1.4\n"
-msgstr "警告: 外部 cvsps は Mercurial 1.4 でサポート打ち切り予定です\n"
-
-#, python-format
-msgid "revision %s is not a patchset number or date"
+#, fuzzy, python-format
+msgid "revision %s is not a patchset number"
msgstr "%s はリビジョン名でも日付でもありません"
-msgid "using builtin cvsps\n"
-msgstr "組み込み cvsps を使用します\n"
-
#, python-format
msgid "connecting to %s\n"
msgstr "%s へ接続中\n"
@@ -1090,8 +1962,10 @@
msgid "CVS pserver authentication failed"
msgstr "CVS pserver の認証に失敗"
-msgid "server sucks"
-msgstr "サーバ応答が不正です"
+#, python-format
+msgid ""
+"unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
+msgstr ""
#, python-format
msgid "%d bytes missing from remote file"
@@ -1124,10 +1998,6 @@
msgid "running %s\n"
msgstr "%s の実行中\n"
-#, python-format
-msgid "prefix=%r directory=%r root=%r\n"
-msgstr "接頭辞=%r ディレクトリ=%r ルート=%r\n"
-
msgid "RCS file must be followed by working file"
msgstr "RCS ファイルはワーキングファイル情報を伴う筈です"
@@ -1141,10 +2011,6 @@
msgstr "リビジョン情報は日付情報を伴う筈です"
#, python-format
-msgid "found synthetic revision in %s: %r\n"
-msgstr "%s で合成リビジョン %r を検出\n"
-
-#, python-format
msgid "writing cvs log cache %s\n"
msgstr "cvs ログキャッシュ %s の書き込み中\n"
@@ -1170,13 +2036,13 @@
msgid "%d changeset entries\n"
msgstr "%d 件のチェンジセットエントリ\n"
+#, python-format
+msgid "darcs version 2.1 or newer needed (found %r)"
+msgstr ""
+
msgid "Python ElementTree module is not available"
msgstr "Python の ElementTree モジュールが利用できません"
-#, python-format
-msgid "cleaning up %s\n"
-msgstr "%s を整理中\n"
-
msgid "internal calling inconsistency"
msgstr "内部不整合"
@@ -1211,22 +2077,6 @@
msgstr "未登録アーカイブ %s の参照によりツリー解析を中断...\n"
#, python-format
-msgid "applying revision %s...\n"
-msgstr "リビジョン %s の適用中...\n"
-
-#, python-format
-msgid "computing changeset between %s and %s...\n"
-msgstr "%s と %s との間のチェンジセットを算出中...\n"
-
-#, python-format
-msgid "obtaining revision %s...\n"
-msgstr "リビジョン %s の取得中...\n"
-
-#, python-format
-msgid "analyzing revision %s...\n"
-msgstr "リビジョン %s の解析中...\n"
-
-#, python-format
msgid "could not parse cat-log of %s"
msgstr "リビジョン %s の cat-log の解析に失敗"
@@ -1238,12 +2088,6 @@
msgid "initializing destination %s repository\n"
msgstr "変換先リポジトリ %s の初期化中\n"
-msgid "run hg sink pre-conversion action\n"
-msgstr "変換先での前処理を実施\n"
-
-msgid "run hg sink post-conversion action\n"
-msgstr "変換先での後処理を実施\n"
-
#, python-format
msgid "pulling from %s into %s\n"
msgstr "%s から %s に取り込み中\n"
@@ -1262,12 +2106,6 @@
msgid "ignoring: %s\n"
msgstr "例外を無視します: %s\n"
-msgid "run hg source pre-conversion action\n"
-msgstr "変換元での前処理を実施\n"
-
-msgid "run hg source post-conversion action\n"
-msgstr "変換元での後処理を実施\n"
-
#, python-format
msgid "%s does not look like a monotone repo"
msgstr "%s は monotone のリポジトリとは思われません"
@@ -1282,6 +2120,9 @@
msgid "collecting p4 changelists\n"
msgstr "p4 チェンジリストの収集中\n"
+msgid "Mercurial failed to run itself, check hg executable is in PATH"
+msgstr ""
+
msgid "Subversion python bindings could not be loaded"
msgstr "Subversion python バインディングが読み込めません"
@@ -1332,69 +2173,22 @@
msgstr "リビジョン %d にタグはありません\n"
#, python-format
-msgid "ignoring foreign branch %r\n"
-msgstr "外部ブランチ %r を無視します\n"
-
-#, python-format
msgid "%s not found up to revision %d"
msgstr "リビジョン %s は %d までのりビジョンに見当たりません"
#, python-format
-msgid "branch renamed from %s to %s at %d\n"
-msgstr "ブランチ %s から %s への %d における改名\n"
-
-#, python-format
-msgid "reparent to %s\n"
-msgstr "%s へのリペアレント\n"
-
-#, python-format
-msgid "copied to %s from %s@%s\n"
-msgstr "%s に %s@%s から複製\n"
-
-#, python-format
-msgid "gone from %s\n"
-msgstr "%s を去ります\n"
-
-#, python-format
-msgid "entry %s\n"
-msgstr "エントリ=%s\n"
-
-#, python-format
-msgid "unknown path in revision %d: %s\n"
-msgstr "リビジョン %d に未知のパス: %s\n"
-
-#, python-format
-msgid "mark %s came from %s:%d\n"
-msgstr "%s を %s:%d 由来とみなす\n"
-
-#, python-format
-msgid "parsing revision %d (%d changes)\n"
-msgstr "リビジョン %d の解析中(%d 件の変更)\n"
-
-#, python-format
msgid "found parent of branch %s at %d: %s\n"
msgstr "ブランチ %s の親を %d:%s で検出\n"
-msgid "no copyfrom path, don't know what to do.\n"
-msgstr "複製元パスが不明なため、対処不能\n"
-
#, python-format
msgid "fetching revision log for \"%s\" from %d to %d\n"
msgstr "\"%s\" の変更履歴(%d から %d)の先読み中\n"
#, python-format
-msgid "revision %d has no entries\n"
-msgstr "リビジョン %d はエントリを持っていません\n"
-
-#, python-format
msgid "svn: branch has no revision %s"
msgstr "svn: ブランチにはリビジョン %s がありません"
#, python-format
-msgid "%r is not under %r, ignoring\n"
-msgstr "%r は %r 配下にないため無視します\n"
-
-#, python-format
msgid "initializing svn repo %r\n"
msgstr "svn リポジトリ %r の初期化中\n"
@@ -1414,14 +2208,14 @@
msgid ""
"command to allow external programs to compare revisions\n"
"\n"
-"The `extdiff' Mercurial extension allows you to use external programs\n"
-"to compare revisions, or revision with working directory. The external diff\n"
-"programs are called with a configurable set of options and two\n"
+"The extdiff Mercurial extension allows you to use external programs\n"
+"to compare revisions, or revision with working directory. The external\n"
+"diff programs are called with a configurable set of options and two\n"
"non-option arguments: paths to directories containing snapshots of\n"
"files to compare.\n"
"\n"
-"The `extdiff' extension also allows to configure new diff commands, so\n"
-"you do not need to type \"hg extdiff -p kdiff3\" always.\n"
+"The extdiff extension also allows to configure new diff commands, so\n"
+"you do not need to type \"hg extdiff -p kdiff3\" always. ::\n"
"\n"
" [extdiff]\n"
" # add new command that runs GNU diff(1) in 'context diff' mode\n"
@@ -1437,14 +2231,13 @@
" meld =\n"
"\n"
" # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
-" # (see http://www.vim.org/scripts/script.php?script_id=102)\n"
-" # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
-"in\n"
+" # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
+" # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
" # your .vimrc\n"
" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
"\n"
"You can use -I/-X and list of file or directory names like normal \"hg\n"
-"diff\" command. The `extdiff' extension makes snapshots of only needed\n"
+"diff\" command. The extdiff extension makes snapshots of only needed\n"
"files, so running the external diff program will actually be pretty\n"
"fast (at least faster than having to compare the entire tree).\n"
msgstr ""
@@ -1460,14 +2253,6 @@
msgid "cannot specify --rev and --change at the same time"
msgstr "--rev と --change は同時には指定出来ません"
-#, python-format
-msgid "running %r in %s\n"
-msgstr ""
-
-#, python-format
-msgid "file changed while diffing. Overwriting: %s (src: %s)\n"
-msgstr ""
-
msgid "cleaning up temp directory\n"
msgstr "一時ディレクトリの整理をしています\n"
@@ -1503,6 +2288,21 @@
msgstr ""
#, python-format
+msgid ""
+"use %(path)s to diff repository (or selected files)\n"
+"\n"
+" Show differences between revisions for the specified files, using the\n"
+" %(path)s program.\n"
+"\n"
+" When two revision arguments are given, then changes are shown between\n"
+" those revisions. If only one revision is specified then that revision "
+"is\n"
+" compared to the working directory, and, when no revisions are "
+"specified,\n"
+" the working directory files are compared to its parent."
+msgstr ""
+
+#, python-format
msgid "hg %s [OPTION]... [FILE]..."
msgstr ""
@@ -1570,10 +2370,6 @@
msgstr "%d とマージしています:%s\n"
#, python-format
-msgid "Automated merge with %s"
-msgstr ""
-
-#, python-format
msgid "new changeset %d:%s merges remote changes with local\n"
msgstr ""
@@ -1645,10 +2441,6 @@
"force)"
msgstr ""
-#, python-format
-msgid "Added signature for changeset %s"
-msgstr "チェンジセット %s の署名を追加しました"
-
msgid "unknown signature version"
msgstr "未知の署名バージョン"
@@ -1735,38 +2527,38 @@
msgid ""
"hooks for integrating with the CIA.vc notification service\n"
"\n"
-"This is meant to be run as a changegroup or incoming hook.\n"
-"To configure it, set the following options in your hgrc:\n"
-"\n"
-"[cia]\n"
-"# your registered CIA user name\n"
-"user = foo\n"
-"# the name of the project in CIA\n"
-"project = foo\n"
-"# the module (subproject) (optional)\n"
-"#module = foo\n"
-"# Append a diffstat to the log message (optional)\n"
-"#diffstat = False\n"
-"# Template to use for log messages (optional)\n"
-"#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
-"# Style to use (optional)\n"
-"#style = foo\n"
-"# The URL of the CIA notification service (optional)\n"
-"# You can use mailto: URLs to send by email, eg\n"
-"# mailto:cia@cia.vc\n"
-"# Make sure to set email.from if you do this.\n"
-"#url = http://cia.vc/\n"
-"# print message instead of sending it (optional)\n"
-"#test = False\n"
-"\n"
-"[hooks]\n"
-"# one of these:\n"
-"changegroup.cia = python:hgcia.hook\n"
-"#incoming.cia = python:hgcia.hook\n"
-"\n"
-"[web]\n"
-"# If you want hyperlinks (optional)\n"
-"baseurl = http://server/path/to/repo\n"
+"This is meant to be run as a changegroup or incoming hook. To\n"
+"configure it, set the following options in your hgrc::\n"
+"\n"
+" [cia]\n"
+" # your registered CIA user name\n"
+" user = foo\n"
+" # the name of the project in CIA\n"
+" project = foo\n"
+" # the module (subproject) (optional)\n"
+" #module = foo\n"
+" # Append a diffstat to the log message (optional)\n"
+" #diffstat = False\n"
+" # Template to use for log messages (optional)\n"
+" #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
+" # Style to use (optional)\n"
+" #style = foo\n"
+" # The URL of the CIA notification service (optional)\n"
+" # You can use mailto: URLs to send by email, eg\n"
+" # mailto:cia@cia.vc\n"
+" # Make sure to set email.from if you do this.\n"
+" #url = http://cia.vc/\n"
+" # print message instead of sending it (optional)\n"
+" #test = False\n"
+"\n"
+" [hooks]\n"
+" # one of these:\n"
+" changegroup.cia = python:hgcia.hook\n"
+" #incoming.cia = python:hgcia.hook\n"
+"\n"
+" [web]\n"
+" # If you want hyperlinks (optional)\n"
+" baseurl = http://server/path/to/repo\n"
msgstr ""
#, python-format
@@ -1776,12 +2568,6 @@
msgid "email.from must be defined when sending by email"
msgstr ""
-msgid "cia: no user specified"
-msgstr "cia: ユーザが指定されていません"
-
-msgid "cia: no project specified"
-msgstr "cia: プロジェクトが指定されていません"
-
msgid ""
"browse the repository in a graphical way\n"
"\n"
@@ -1797,19 +2583,19 @@
"\n"
"The hg view command will launch the hgk Tcl script. For this command\n"
"to work, hgk must be in your search path. Alternately, you can specify\n"
-"the path to hgk in your .hgrc file:\n"
+"the path to hgk in your .hgrc file::\n"
"\n"
" [hgk]\n"
" path=/location/of/hgk\n"
"\n"
"hgk can make use of the extdiff extension to visualize revisions.\n"
-"Assuming you had already configured extdiff vdiff command, just add:\n"
+"Assuming you had already configured extdiff vdiff command, just add::\n"
"\n"
" [hgk]\n"
" vdiff=vdiff\n"
"\n"
"Revisions context menu will now display additional entries to fire\n"
-"vdiff on hovered and selected revisions."
+"vdiff on hovered and selected revisions.\n"
msgstr ""
msgid "diff trees from two commits"
@@ -1899,10 +2685,10 @@
"It depends on the Pygments syntax highlighting library:\n"
"http://pygments.org/\n"
"\n"
-"There is a single configuration option:\n"
-"\n"
-"[web]\n"
-"pygments_style = <style>\n"
+"There is a single configuration option::\n"
+"\n"
+" [web]\n"
+" pygments_style = <style>\n"
"\n"
"The default is 'colorful'.\n"
msgstr ""
@@ -1945,9 +2731,6 @@
msgid "(found dead inotify server socket; removing it)\n"
msgstr "(終了した inotify サーバのソケットを検出したので削除します)\n"
-msgid "(starting inotify server)\n"
-msgstr "(inotify サーバの起動中)\n"
-
#, python-format
msgid "could not start inotify server: %s\n"
msgstr "inotify サーバの起動に失敗: %s\n"
@@ -1956,9 +2739,6 @@
msgid "could not talk to new inotify server: %s\n"
msgstr "inotify サーバとの連携に失敗: %s\n"
-msgid "(inotify server not running)\n"
-msgstr "(inotify サーバは起動されていません)\n"
-
#, python-format
msgid "failed to contact inotify server: %s\n"
msgstr "inotify サーバとの連携に失敗: %s\n"
@@ -2016,10 +2796,6 @@
msgstr "%r 配下のディレクトリを監視\n"
#, python-format
-msgid "status: %r dir(%d) -> %s\n"
-msgstr "status: %r dir(%d) -> %s\n"
-
-#, python-format
msgid "status: %r %s -> %s\n"
msgstr "status: %r %s -> %s\n"
@@ -2085,15 +2861,16 @@
msgid "finished setup\n"
msgstr "セットアップを終了しました\n"
+#, fuzzy
msgid ""
"expand expressions into changelog and summaries\n"
"\n"
-"This extension allows the use of a special syntax in summaries,\n"
-"which will be automatically expanded into links or any other\n"
-"arbitrary expression, much like InterWiki does.\n"
-"\n"
-"A few example patterns (link to bug tracking, etc.) that may\n"
-"be used in your hgrc:\n"
+"This extension allows the use of a special syntax in summaries, which\n"
+"will be automatically expanded into links or any other arbitrary\n"
+"expression, much like InterWiki does.\n"
+"\n"
+"A few example patterns (link to bug tracking, etc.) that may be used\n"
+"in your hgrc::\n"
"\n"
" [interhg]\n"
" issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
@@ -2123,6 +2900,7 @@
msgid "interhg: invalid regexp for %s: %s\n"
msgstr "interhg: %s の正規表現が不正です: %s\n"
+#, fuzzy
msgid ""
"expand keywords in tracked files\n"
"\n"
@@ -2136,20 +2914,22 @@
"Configuration is done in the [keyword] and [keywordmaps] sections of\n"
"hgrc files.\n"
"\n"
-"Example:\n"
+"Example::\n"
"\n"
" [keyword]\n"
" # expand keywords in every python file except those matching \"x*\"\n"
" **.py =\n"
" x* = ignore\n"
"\n"
-"Note: the more specific you are in your filename patterns\n"
-" the less you lose speed in huge repositories.\n"
+"NOTE: the more specific you are in your filename patterns the less you\n"
+"lose speed in huge repositories.\n"
"\n"
"For [keywordmaps] template mapping and expansion demonstration and\n"
-"control run \"hg kwdemo\".\n"
-"\n"
-"An additional date template filter {date|utcdate} is provided.\n"
+"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
+"available templates and filters.\n"
+"\n"
+"An additional date template filter {date|utcdate} is provided. It\n"
+"returns a date like \"2006/09/18 15:13:13\".\n"
"\n"
"The default template mappings (view with \"hg kwdemo -d\") can be\n"
"replaced with customized keywords and templates. Again, run \"hg\n"
@@ -2168,8 +2948,8 @@
"have been checked in.\n"
"\n"
"Expansions spanning more than one line and incremental expansions,\n"
-"like CVS' $Log$, are not supported. A keyword template map\n"
-"\"Log = {desc}\" expands to the first line of the changeset description.\n"
+"like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
+"{desc}\" expands to the first line of the changeset description.\n"
msgstr ""
"構成管理対象ファイル中のキーワード展開\n"
"\n"
@@ -2230,16 +3010,19 @@
msgid "no [keyword] patterns configured"
msgstr "[keyword] でのパターン設定がありません"
+#, fuzzy
msgid ""
"print [keywordmaps] configuration and an expansion example\n"
"\n"
" Show current, custom, or default keyword template maps and their\n"
" expansions.\n"
"\n"
-" Extend current configuration by specifying maps as arguments and\n"
-" optionally by reading from an additional hgrc file.\n"
-"\n"
-" Override current keyword template maps with \"default\" option.\n"
+" Extend the current configuration by specifying maps as arguments\n"
+" and using -f/--rcfile to source an external hgrc file.\n"
+"\n"
+" Use -d/--default to disable current configuration.\n"
+"\n"
+" See \"hg help templates\" for information on templates and filters.\n"
" "
msgstr ""
"[keywordmaps] での設定内容および展開例の表示\n"
@@ -2257,18 +3040,50 @@
msgid "creating temporary repository at %s\n"
msgstr "一時リポジトリ %s の作成中\n"
-#, python-format
-msgid ""
-"\n"
-"\tconfig using %s keyword template maps\n"
+#, fuzzy
+msgid ""
+"\n"
+"\tconfiguration using custom keyword template maps\n"
+msgstr ""
+"\n"
+"\t%s をキーワードのテンプレートマップとして使用\n"
+
+#, fuzzy
+msgid "\textending current template maps\n"
msgstr ""
"\n"
"\t%s をキーワードのテンプレートマップとして使用\n"
-#, python-format
-msgid ""
-"\n"
-"%s keywords written to %s:\n"
+#, fuzzy
+msgid "\toverriding default template maps\n"
+msgstr "デフォルトのテンプレートマップで表示"
+
+#, fuzzy
+msgid ""
+"\n"
+"\tconfiguration using default keyword template maps\n"
+msgstr ""
+"\n"
+"\t%s をキーワードのテンプレートマップとして使用\n"
+
+#, fuzzy
+msgid "\tdisabling current template maps\n"
+msgstr ""
+"\n"
+"\t%s をキーワードのテンプレートマップとして使用\n"
+
+#, fuzzy
+msgid ""
+"\n"
+"\tconfiguration using current keyword template maps\n"
+msgstr ""
+"\n"
+"\t%s をキーワードのテンプレートマップとして使用\n"
+
+#, fuzzy, python-format
+msgid ""
+"\n"
+"keywords written to %s:\n"
msgstr ""
"\n"
"%sキーワードを %s に書き込みました:\n"
@@ -2276,22 +3091,14 @@
msgid "unhooked all commit hooks\n"
msgstr "全ての commit フックを無効化\n"
-#, python-format
-msgid ""
-"\n"
-"\t%s keywords expanded%s\n"
+#, fuzzy
+msgid ""
+"\n"
+"\tkeywords expanded\n"
msgstr ""
"\n"
"%s キーワードを展開: %s\n"
-#, python-format
-msgid ""
-"\n"
-"removing temporary repository %s\n"
-msgstr ""
-"\n"
-"一時リポジトリ %s の削除中\n"
-
msgid ""
"expand keywords in the working directory\n"
"\n"
@@ -2307,6 +3114,7 @@
" 指定されたファイルに未コミット変更がある場合、実行は中断されます。\n"
" "
+#, fuzzy
msgid ""
"show files configured for keyword expansion\n"
"\n"
@@ -2314,20 +3122,19 @@
" [keyword] configuration patterns.\n"
"\n"
" Useful to prevent inadvertent keyword expansion and to speed up\n"
-" execution by including only files that are actual candidates\n"
-" for expansion.\n"
+" execution by including only files that are actual candidates for\n"
+" expansion.\n"
"\n"
" See \"hg help keyword\" on how to construct patterns both for\n"
" inclusion and exclusion of files.\n"
"\n"
-" Use -u/--untracked to list untracked files as well.\n"
-"\n"
-" With -a/--all and -v/--verbose the codes used to show the status\n"
-" of files are:\n"
-" K = keyword expansion candidate\n"
-" k = keyword expansion candidate (untracked)\n"
-" I = ignored\n"
-" i = ignored (untracked)\n"
+" With -A/--all and -v/--verbose the codes used to show the status\n"
+" of files are::\n"
+"\n"
+" K = keyword expansion candidate\n"
+" k = keyword expansion candidate (not tracked)\n"
+" I = ignored\n"
+" i = ignored (not tracked)\n"
" "
msgstr ""
"キーワード展開設定のあるファイルの表示\n"
@@ -2387,7 +3194,16 @@
msgid "show files excluded from expansion"
msgstr "キーワード展開対象外のファイルを表示"
-msgid "additionally show untracked files"
+#, fuzzy
+msgid "only show unknown (not tracked) files"
+msgstr "構成管理対象外のファイルを表示"
+
+#, fuzzy
+msgid "show keyword status flags of all files (DEPRECATED)"
+msgstr "全ファイルのキーワード展開設定を表示"
+
+#, fuzzy
+msgid "only show untracked files (DEPRECATED)"
msgstr "未登録ファイルの表示"
msgid "hg kwfiles [OPTION]... [FILE]..."
@@ -2396,6 +3212,7 @@
msgid "hg kwshrink [OPTION]... [FILE]..."
msgstr "hg kwshrink [OPTION]... [FILE]..."
+#, fuzzy
msgid ""
"manage a stack of patches\n"
"\n"
@@ -2406,19 +3223,18 @@
"Known patches are represented as patch files in the .hg/patches\n"
"directory. Applied patches are both patch files and changesets.\n"
"\n"
-"Common tasks (use \"hg help command\" for more details):\n"
-"\n"
-"prepare repository to work with patches qinit\n"
-"create new patch qnew\n"
-"import existing patch qimport\n"
-"\n"
-"print patch series qseries\n"
-"print applied patches qapplied\n"
-"print name of top applied patch qtop\n"
-"\n"
-"add known patch to applied stack qpush\n"
-"remove patch from applied stack qpop\n"
-"refresh contents of top applied patch qrefresh\n"
+"Common tasks (use \"hg help command\" for more details)::\n"
+"\n"
+" prepare repository to work with patches qinit\n"
+" create new patch qnew\n"
+" import existing patch qimport\n"
+"\n"
+" print patch series qseries\n"
+" print applied patches qapplied\n"
+"\n"
+" add known patch to applied stack qpush\n"
+" remove patch from applied stack qpop\n"
+" refresh contents of top applied patch qrefresh\n"
msgstr ""
"パッチ併用の管理\n"
"\n"
@@ -2461,10 +3277,6 @@
msgstr "ガード %r 中に不適切な文字があります: %r"
#, python-format
-msgid "active guards: %s\n"
-msgstr "有効なガード: %s\n"
-
-#, python-format
msgid "guard %r too short"
msgstr "ガード名 %r は短過ぎます"
@@ -2677,6 +3489,10 @@
msgid "deletions found between repo revs"
msgstr "リビジョン間で削除が検出されました"
+#, fuzzy, python-format
+msgid "popping %s\n"
+msgstr "%s を適用中\n"
+
msgid "patch queue now empty\n"
msgstr "全てのパッチの適用が解除されました\n"
@@ -2801,9 +3617,15 @@
msgid "print the patches already applied"
msgstr "適用中のパッチ一覧の表示"
+msgid "only one patch applied\n"
+msgstr "単一のパッチだけが適用中です\n"
+
msgid "print the patches not yet applied"
msgstr "未適用のパッチ一覧の表示"
+msgid "all patches applied\n"
+msgstr "全てのパッチが適用中です\n"
+
msgid ""
"import a patch\n"
"\n"
@@ -2931,15 +3753,9 @@
msgid "print the name of the next patch"
msgstr "現行パッチの「次」の既知のパッチの名前表示"
-msgid "all patches applied\n"
-msgstr "全てのパッチが適用中です\n"
-
msgid "print the name of the previous patch"
msgstr "現行パッチの「前」の既知のパッチの名前表示"
-msgid "only one patch applied\n"
-msgstr "単一のパッチだけが適用中です\n"
-
msgid ""
"create a new patch\n"
"\n"
@@ -3379,7 +4195,12 @@
msgid "print first line of patch header"
msgstr "パッチヘッダの最初の行を表示"
-msgid "hg qapplied [-s] [PATCH]"
+#, fuzzy
+msgid "show only the last patch"
+msgstr "追加登録されたファイルを表示"
+
+#, fuzzy
+msgid "hg qapplied [-1] [-s] [PATCH]"
msgstr "hg qapplied [-s] [PATCH]"
msgid "use pull protocol to copy metadata"
@@ -3496,7 +4317,8 @@
msgid "queue name to pop"
msgstr "パッチ解除先のパッチ管理領域名"
-msgid "forget any local changes"
+#, fuzzy
+msgid "forget any local changes to patched files"
msgstr "作業領域中の変更を破棄"
msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
@@ -3523,16 +4345,18 @@
msgid "refresh only files already in the patch and specified files"
msgstr "パッチ対象か、明示指定のあったファイルのみを処理対象にする"
-msgid "add/update \"From: <current user>\" in patch"
-msgstr "パッチ中の \"From:\" を「現行ユーザ」で更新(ないし追加)"
-
-msgid "add/update \"From: <given user>\" in patch"
-msgstr "パッチ中の \"From:\" を指定ユーザで更新(ないし追加)"
-
-msgid "update \"Date: <current date>\" in patch (if present)"
-msgstr "パッチ中の \"Date:\" を現在日時で更新"
-
-msgid "update \"Date: <given date>\" in patch (if present)"
+msgid "add/update author field in patch with current user"
+msgstr ""
+
+msgid "add/update author field in patch with given user"
+msgstr ""
+
+#, fuzzy
+msgid "add/update date field in patch with current date"
+msgstr "パッチ中の \"Date:\" を指定日時で更新"
+
+#, fuzzy
+msgid "add/update date field in patch with given date"
msgstr "パッチ中の \"Date:\" を指定日時で更新"
msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
@@ -3601,7 +4425,12 @@
msgid "hg qtop [-s]"
msgstr "hg qtop [-s]"
-msgid "hg qunapplied [-s] [PATCH]"
+#, fuzzy
+msgid "show only the first patch"
+msgstr "追加登録されたファイルを表示"
+
+#, fuzzy
+msgid "hg qunapplied [-1] [-s] [PATCH]"
msgstr "hg qunapplied [-s] [PATCH]"
msgid "finish all applied changesets"
@@ -3613,65 +4442,67 @@
msgid ""
"hooks for sending email notifications at commit/push time\n"
"\n"
-"Subscriptions can be managed through hgrc. Default mode is to print\n"
-"messages to stdout, for testing and configuring.\n"
-"\n"
-"To use, configure notify extension and enable in hgrc like this:\n"
-"\n"
-" [extensions]\n"
-" hgext.notify =\n"
-"\n"
-" [hooks]\n"
-" # one email for each incoming changeset\n"
-" incoming.notify = python:hgext.notify.hook\n"
-" # batch emails when many changesets incoming at one time\n"
-" changegroup.notify = python:hgext.notify.hook\n"
-"\n"
-" [notify]\n"
-" # config items go in here\n"
-"\n"
-" config items:\n"
-"\n"
-" REQUIRED:\n"
-" config = /path/to/file # file containing subscriptions\n"
-"\n"
-" OPTIONAL:\n"
-" test = True # print messages to stdout for testing\n"
-" strip = 3 # number of slashes to strip for url paths\n"
-" domain = example.com # domain to use if committer missing domain\n"
-" style = ... # style file to use when formatting email\n"
-" template = ... # template to use when formatting email\n"
-" incoming = ... # template to use when run as incoming hook\n"
-" changegroup = ... # template when run as changegroup hook\n"
-" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
-" maxsubject = 67 # truncate subject line longer than this\n"
-" diffstat = True # add a diffstat before the diff content\n"
-" sources = serve # notify if source of incoming changes in this "
+"Subscriptions can be managed through a hgrc file. Default mode is to\n"
+"print messages to stdout, for testing and configuring.\n"
+"\n"
+"To use, configure the notify extension and enable it in hgrc like\n"
+"this::\n"
+"\n"
+" [extensions]\n"
+" hgext.notify =\n"
+"\n"
+" [hooks]\n"
+" # one email for each incoming changeset\n"
+" incoming.notify = python:hgext.notify.hook\n"
+" # batch emails when many changesets incoming at one time\n"
+" changegroup.notify = python:hgext.notify.hook\n"
+"\n"
+" [notify]\n"
+" # config items go here\n"
+"\n"
+"Required configuration items::\n"
+"\n"
+" config = /path/to/file # file containing subscriptions\n"
+"\n"
+"Optional configuration items::\n"
+"\n"
+" test = True # print messages to stdout for testing\n"
+" strip = 3 # number of slashes to strip for url paths\n"
+" domain = example.com # domain to use if committer missing domain\n"
+" style = ... # style file to use when formatting email\n"
+" template = ... # template to use when formatting email\n"
+" incoming = ... # template to use when run as incoming hook\n"
+" changegroup = ... # template when run as changegroup hook\n"
+" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
+" maxsubject = 67 # truncate subject line longer than this\n"
+" diffstat = True # add a diffstat before the diff content\n"
+" sources = serve # notify if source of incoming changes in this "
"list\n"
-" # (serve == ssh or http, push, pull, bundle)\n"
-" [email]\n"
-" from = user@host.com # email address to send as if none given\n"
-" [web]\n"
-" baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
-"\n"
-" notify config file has same format as regular hgrc. it has two\n"
-" sections so you can express subscriptions in whatever way is handier\n"
-" for you.\n"
-"\n"
-" [usersubs]\n"
-" # key is subscriber email, value is \",\"-separated list of glob "
-"patterns\n"
-" user@host = pattern\n"
-"\n"
-" [reposubs]\n"
-" # key is glob pattern, value is \",\"-separated list of subscriber "
-"emails\n"
-" pattern = user@host\n"
-"\n"
-" glob patterns are matched against path to repository root.\n"
-"\n"
-" if you like, you can put notify config file in repository that users\n"
-" can push changes to, they can manage their own subscriptions."
+" # (serve == ssh or http, push, pull, bundle)\n"
+" merge = False # send notification for merges (default True)\n"
+" [email]\n"
+" from = user@host.com # email address to send as if none given\n"
+" [web]\n"
+" baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
+"\n"
+"The notify config file has same format as a regular hgrc file. It has\n"
+"two sections so you can express subscriptions in whatever way is\n"
+"handier for you.\n"
+"\n"
+"::\n"
+"\n"
+" [usersubs]\n"
+" # key is subscriber email, value is \",\"-separated list of glob patterns\n"
+" user@host = pattern\n"
+"\n"
+" [reposubs]\n"
+" # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
+" pattern = user@host\n"
+"\n"
+"Glob patterns are matched against path to repository root.\n"
+"\n"
+"If you like, you can put notify config file in repository that users\n"
+"can push changes to, they can manage their own subscriptions.\n"
msgstr ""
#, python-format
@@ -3697,17 +4528,13 @@
msgstr ""
#, python-format
-msgid "notify: no subscribers to repository %s\n"
-msgstr ""
-
-#, python-format
-msgid "notify: changes have source \"%s\" - skipping\n"
+msgid "notify: suppressing notification for merge %d:%s\n"
msgstr ""
msgid ""
"browse command output with an external pager\n"
"\n"
-"To set the pager that should be used, set the application variable:\n"
+"To set the pager that should be used, set the application variable::\n"
"\n"
" [pager]\n"
" pager = LESS='FSRX' less\n"
@@ -3716,19 +4543,19 @@
"$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
"\n"
"If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
-"setting:\n"
+"setting::\n"
"\n"
" [pager]\n"
" quiet = True\n"
"\n"
"You can disable the pager for certain commands by adding them to the\n"
-"pager.ignore list:\n"
+"pager.ignore list::\n"
"\n"
" [pager]\n"
" ignore = version, help, update\n"
"\n"
"You can also enable the pager only for certain commands using\n"
-"pager.attend:\n"
+"pager.attend::\n"
"\n"
" [pager]\n"
" attend = log\n"
@@ -3745,20 +4572,21 @@
"This extension allows you to use git-style suffixes to refer to the\n"
"ancestors of a specific revision.\n"
"\n"
-"For example, if you can refer to a revision as \"foo\", then:\n"
-"\n"
-"- foo^N = Nth parent of foo\n"
+"For example, if you can refer to a revision as \"foo\", then::\n"
+"\n"
+" foo^N = Nth parent of foo\n"
" foo^0 = foo\n"
" foo^1 = first parent of foo\n"
" foo^2 = second parent of foo\n"
" foo^ = foo^1\n"
"\n"
-"- foo~N = Nth first grandparent of foo\n"
+" foo~N = Nth first grandparent of foo\n"
" foo~0 = foo\n"
" foo~1 = foo^1 = foo^ = first parent of foo\n"
" foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
msgstr ""
+#, fuzzy
msgid ""
"command to send changesets as (a series of) patch emails\n"
"\n"
@@ -3769,11 +4597,9 @@
"first line of the changeset description as the subject text. The\n"
"message contains two or three body parts:\n"
"\n"
-" The changeset description.\n"
-"\n"
-" [Optional] The result of running diffstat on the patch.\n"
-"\n"
-" The patch itself, as generated by \"hg export\".\n"
+"- The changeset description.\n"
+"- [Optional] The result of running diffstat on the patch.\n"
+"- The patch itself, as generated by \"hg export\".\n"
"\n"
"Each message refers to the first in the series using the In-Reply-To\n"
"and References headers, so they will show up as a sequence in threaded\n"
@@ -3784,7 +4610,7 @@
"you are sending the right changes.\n"
"\n"
"To configure other defaults, add a section like this to your hgrc\n"
-"file:\n"
+"file::\n"
"\n"
" [email]\n"
" from = My Name <my@email>\n"
@@ -3807,13 +4633,13 @@
"patchbomb message in a pager or sending the messages directly, it will\n"
"create a UNIX mailbox file with the patch emails. This mailbox file\n"
"can be previewed with any mail user agent which supports UNIX mbox\n"
-"files, e.g. with mutt:\n"
+"files, e.g. with mutt::\n"
"\n"
" % mutt -R -f mbox\n"
"\n"
-"When you are previewing the patchbomb messages, you can use `formail'\n"
+"When you are previewing the patchbomb messages, you can use ``formail``\n"
"(a utility that is commonly installed as part of the procmail\n"
-"package), to send each message out:\n"
+"package), to send each message out::\n"
"\n"
" % formail -s sendmail -bm -t < mbox\n"
"\n"
@@ -3823,7 +4649,7 @@
"to be a sendmail compatible mailer or fill out the [smtp] section so\n"
"that the patchbomb extension can automatically send patchbombs\n"
"directly from the commandline. See the [email] and [smtp] sections in\n"
-"hgrc(5) for details."
+"hgrc(5) for details.\n"
msgstr ""
"電子メールによる変更内容パッチ送付のコマンド\n"
"\n"
@@ -3888,6 +4714,10 @@
"直接パッチ爆弾を送信することも可能です。これらのセクションに関する詳細は\n"
"設定ファイルに関するドキュメント(hgrc(5))を参照してください。"
+#, fuzzy, python-format
+msgid "%sPlease enter a valid value"
+msgstr "適切な値を入力してください。\n"
+
msgid "Please enter a valid value.\n"
msgstr "適切な値を入力してください。\n"
@@ -3897,6 +4727,7 @@
msgid "diffstat rejected"
msgstr "差分統計が却下されました"
+#, fuzzy
msgid ""
"send changesets by email\n"
"\n"
@@ -3925,23 +4756,24 @@
" single email containing a binary Mercurial bundle as an attachment\n"
" will be sent.\n"
"\n"
-" Examples:\n"
-"\n"
-" hg email -r 3000 # send patch 3000 only\n"
-" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
-" hg email -r 3000:3005 # send patches 3000 through 3005\n"
-" hg email 3000 # send patch 3000 (deprecated)\n"
-"\n"
-" hg email -o # send all patches not in default\n"
-" hg email -o DEST # send all patches not in DEST\n"
-" hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
-" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
-"\n"
-" hg email -b # send bundle of all patches not in default\n"
-" hg email -b DEST # send bundle of all patches not in DEST\n"
-" hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
+" Examples::\n"
+"\n"
+" hg email -r 3000 # send patch 3000 only\n"
+" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
+" hg email -r 3000:3005 # send patches 3000 through 3005\n"
+" hg email 3000 # send patch 3000 (deprecated)\n"
+"\n"
+" hg email -o # send all patches not in default\n"
+" hg email -o DEST # send all patches not in DEST\n"
+" hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
+" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
+"\n"
+" hg email -b # send bundle of all patches not in default\n"
+" hg email -b DEST # send bundle of all patches not in DEST\n"
+" hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
"default\n"
-" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
+" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in "
+"DEST\n"
"\n"
" Before using this command, you will need to enable email in your\n"
" hgrc. See the [email] section in hgrc(5) for details.\n"
@@ -4072,6 +4904,9 @@
msgid "message identifier to reply to"
msgstr "返信対象のメッセージID"
+msgid "flags to add in subject prefixes"
+msgstr ""
+
msgid "email addresses of recipients"
msgstr "TO 宛先のメールアドレス"
@@ -4112,13 +4947,16 @@
" and uncommitted changes in an otherwise-clean source tree.\n"
"\n"
" This means that purge will delete:\n"
-" - Unknown files: files marked with \"?\" by \"hg status\"\n"
-" - Empty directories: in fact Mercurial ignores directories unless\n"
-" they contain files under source control management\n"
+"\n"
+" - Unknown files: files marked with \"?\" by \"hg status\"\n"
+" - Empty directories: in fact Mercurial ignores directories unless\n"
+" they contain files under source control management\n"
+"\n"
" But it will leave untouched:\n"
-" - Modified and unmodified tracked files\n"
-" - Ignored files (unless --all is specified)\n"
-" - New files added to the repository (with \"hg add\")\n"
+"\n"
+" - Modified and unmodified tracked files\n"
+" - Ignored files (unless --all is specified)\n"
+" - New files added to the repository (with \"hg add\")\n"
"\n"
" If directories are given on the command line, only files in these\n"
" directories are considered.\n"
@@ -4161,6 +4999,7 @@
msgid "hg purge [OPTION]... [DIR]..."
msgstr "hg purge [OPTION]... [DIR]...\""
+#, fuzzy
msgid ""
"command to move sets of revisions to a different ancestor\n"
"\n"
@@ -4168,7 +5007,7 @@
"repository.\n"
"\n"
"For more information:\n"
-"http://mercurial.selenic.com/wiki/RebaseProject\n"
+"http://mercurial.selenic.com/wiki/RebaseExtension\n"
msgstr ""
"一連のリビジョンを異なる履歴ツリー上の位置に移動させるコマンド\n"
"\n"
@@ -4178,9 +5017,6 @@
"詳細は以下を参照してください:\n"
"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n"
-msgid "first revision, do not change ancestor\n"
-msgstr "初期リビジョンのため、祖先を変更しません\n"
-
msgid ""
"move changeset (and descendants) to a different branch\n"
"\n"
@@ -4234,60 +5070,17 @@
msgid "%d revisions have been skipped\n"
msgstr "%d 個のリビジョンをスキップ\n"
-msgid " set parents\n"
-msgstr " 親リビジョンの設定\n"
-
-#, python-format
-msgid "rebasing %d:%s\n"
-msgstr " %d:%s のリベース中\n"
-
-#, python-format
-msgid " future parents are %d and %d\n"
-msgstr " リベース後の親リビジョンは %d と %d\n"
-
-#, python-format
-msgid " update to %d:%s\n"
-msgstr " %d:%s へと更新\n"
-
-msgid " already in target\n"
-msgstr " 既に対象内\n"
-
-#, python-format
-msgid " merge against %d:%s\n"
-msgstr " %d:%s に対してマージ\n"
-
msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
msgstr " 'hg resolve' で衝突解消してから 'hg rebase --continue' してください"
-msgid "resuming interrupted rebase\n"
-msgstr "中断されたリベースの再開中\n"
-
#, python-format
msgid "no changes, revision %d skipped\n"
msgstr "変更がないので、リビジョン %d をスキップ\n"
#, python-format
-msgid "next revision set to %s\n"
-msgstr "次のリビジョンを %s に設定\n"
-
-#, python-format
msgid "cannot use revision %d as base, result would have 3 parents"
msgstr "親リビジョンが 3 つになるので、リビジョン %d をベースにできません"
-#, python-format
-msgid "revision %d is an mq patch (%s), finalize it.\n"
-msgstr "リビジョン %d は MQ パッチ(%s)なので、通常リビジョン化\n"
-
-#, python-format
-msgid "import mq patch %d (%s)\n"
-msgstr "MQ パッチ %d(%s) の取り込み\n"
-
-msgid "rebase status stored\n"
-msgstr "リベース状態が保存されました\n"
-
-msgid "rebase status resumed\n"
-msgstr "リベース状態を復旧しました\n"
-
msgid "no rebase in progress"
msgstr "進行中のリベース状態はありません"
@@ -4300,28 +5093,17 @@
msgid "cannot rebase onto an applied mq patch"
msgstr "MQ パッチ上へのリベースはできません"
-msgid "cannot rebase an ancestor"
-msgstr "先祖へのリベースはできません"
-
-msgid "cannot rebase a descendant"
-msgstr "子孫へのリベースはできません"
-
-msgid "already working on current\n"
-msgstr "既に現行位置で作業中\n"
-
-msgid "already working on the current branch\n"
-msgstr "既に現行ブランチで作業中\n"
-
-#, python-format
-msgid "rebase onto %d starting from %d\n"
-msgstr "%d へのリベースを %d から開始\n"
+#, fuzzy
+msgid "source is ancestor of destination"
+msgstr "作業元もしくは作業先を指定していません"
+
+#, fuzzy
+msgid "source is descendant of destination"
+msgstr "リポジトリのルートを作成先に指定することはできません"
msgid "unable to collapse, there is more than one external parent"
msgstr "複数の親との関係から、--collapse は指定できません"
-msgid "--update and --rebase are not compatible, ignoring the update flag\n"
-msgstr "--update と --rebase は非互換のため、--update は無視します\n"
-
msgid "rebase working directory to branch head"
msgstr "作業領域をブランチヘッドにリベース"
@@ -4334,13 +5116,16 @@
msgid "rebase onto a given revision"
msgstr "リベース先リビジョンの指定"
-msgid "collapse the rebased revisions"
+#, fuzzy
+msgid "collapse the rebased changesets"
msgstr "リベース後にリビジョンを一体化"
-msgid "keep original revisions"
-msgstr "元リビジョンの維持"
-
-msgid "keep original branches"
+#, fuzzy
+msgid "keep original changesets"
+msgstr "元ブランチの維持"
+
+#, fuzzy
+msgid "keep original branch names"
msgstr "元ブランチの維持"
msgid "continue an interrupted rebase"
@@ -4396,30 +5181,9 @@
msgid "&?"
msgstr "&?"
-msgid "y"
-msgstr "y"
-
-msgid "?"
-msgstr "?"
-
msgid "y - record this change"
msgstr "y - この変更を記録します"
-msgid "s"
-msgstr "s"
-
-msgid "f"
-msgstr "f"
-
-msgid "d"
-msgstr "d"
-
-msgid "a"
-msgstr "a"
-
-msgid "q"
-msgstr "q"
-
msgid "user quit"
msgstr "ユーザの指示により終了します"
@@ -4430,6 +5194,9 @@
msgid " and "
msgstr " と "
+msgid "y"
+msgstr "y"
+
#, python-format
msgid "record this change to %r?"
msgstr "この変更を %r に記録しますか?"
@@ -4438,6 +5205,7 @@
msgid "record change %d/%d to %r?"
msgstr "この変更 (%d 件目 / %d 件中) を %r に記録しますか?"
+#, fuzzy
msgid ""
"interactively select changes to commit\n"
"\n"
@@ -4449,19 +5217,19 @@
" You will be prompted for whether to record changes to each\n"
" modified file, and for files with multiple changes, for each\n"
" change to use. For each query, the following responses are\n"
-" possible:\n"
-"\n"
-" y - record this change\n"
-" n - skip this change\n"
-"\n"
-" s - skip remaining changes to this file\n"
-" f - record remaining changes to this file\n"
-"\n"
-" d - done, skip remaining changes and files\n"
-" a - record all changes to all remaining files\n"
-" q - quit, recording no changes\n"
-"\n"
-" ? - display help"
+" possible::\n"
+"\n"
+" y - record this change\n"
+" n - skip this change\n"
+"\n"
+" s - skip remaining changes to this file\n"
+" f - record remaining changes to this file\n"
+"\n"
+" d - done, skip remaining changes and files\n"
+" a - record all changes to all remaining files\n"
+" q - quit, recording no changes\n"
+"\n"
+" ? - display help"
msgstr ""
"コミットする内容を対話的に選択します\n"
"\n"
@@ -4494,20 +5262,9 @@
msgid "no changes to record\n"
msgstr "記録可能な変更がありません\n"
-#, python-format
-msgid "backup %r as %r\n"
-msgstr "%r を %r としてバックアップします\n"
-
-msgid "applying patch\n"
-msgstr "パッチを適用中\n"
-
msgid "patch failed to apply"
msgstr "パッチの適用に失敗"
-#, python-format
-msgid "restoring %r to %r\n"
-msgstr "%r から %r に復元中\n"
-
msgid "hg record [OPTION]... [FILE]..."
msgstr "hg record [OPTION]... [FILE]..."
@@ -4600,14 +5357,15 @@
msgid "apply changeset? [ynmpcq?]:"
msgstr "チェンジセットを適用しますか? [ynmpcq?]:"
+#, fuzzy
msgid ""
"transplant changesets from another branch\n"
"\n"
" Selected changesets will be applied on top of the current working\n"
" directory with the log of the original changeset. If --log is\n"
-" specified, log messages will have a comment appended of the form:\n"
-"\n"
-" (transplanted from CHANGESETHASH)\n"
+" specified, log messages will have a comment appended of the form::\n"
+"\n"
+" (transplanted from CHANGESETHASH)\n"
"\n"
" You can rewrite the changelog message with the --filter option.\n"
" Its argument will be invoked with the current changelog message as\n"
@@ -4720,6 +5478,7 @@
msgstr ""
"hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
+#, fuzzy
msgid ""
"allow the use of MBCS paths with problematic encodings\n"
"\n"
@@ -4731,19 +5490,22 @@
"operation.\n"
"\n"
"This extension is useful for:\n"
-" * Japanese Windows users using shift_jis encoding.\n"
-" * Chinese Windows users using big5 encoding.\n"
-" * All users who use a repository with one of problematic encodings on\n"
-" case-insensitive file system.\n"
+"\n"
+"- Japanese Windows users using shift_jis encoding.\n"
+"- Chinese Windows users using big5 encoding.\n"
+"- All users who use a repository with one of problematic encodings on\n"
+" case-insensitive file system.\n"
"\n"
"This extension is not needed for:\n"
-" * Any user who use only ASCII chars in path.\n"
-" * Any user who do not use any of problematic encodings.\n"
+"\n"
+"- Any user who use only ASCII chars in path.\n"
+"- Any user who do not use any of problematic encodings.\n"
"\n"
"Note that there are some limitations on using this extension:\n"
-" * You should use single encoding in one repository.\n"
-" * You should set same encoding for the repository by locale or\n"
-" HGENCODING.\n"
+"\n"
+"- You should use single encoding in one repository.\n"
+"- You should set same encoding for the repository by locale or\n"
+" HGENCODING.\n"
"\n"
"Path encoding conversion are done between Unicode and\n"
"encoding.encoding which is decided by Mercurial from current locale\n"
@@ -4778,45 +5540,42 @@
"パス名の文字コード変換は、unicode と、ロケール設定ないし HGENCODING\n"
"環境変数によって Mercurial が決定する文字コードとの間で行なわれます。\n"
-#, python-format
-msgid "[win32mbcs] filename conversion fail with %s encoding\n"
+#, fuzzy, python-format
+msgid "[win32mbcs] filename conversion failed with %s encoding\n"
msgstr "[win32mbcs] 文字コード '%s' との間での変換に失敗\n"
msgid "[win32mbcs] cannot activate on this platform.\n"
msgstr "[win32mbcs] このプラットフォームでは実行できません。\n"
-#, python-format
-msgid "[win32mbcs] activated with encoding: %s\n"
-msgstr "[win32mbcs] 文字コード %s との間での変換を有効化\n"
-
+#, fuzzy
msgid ""
"perform automatic newline conversion\n"
"\n"
-"To perform automatic newline conversion, use:\n"
-"\n"
-"[extensions]\n"
-"hgext.win32text =\n"
-"[encode]\n"
-"** = cleverencode:\n"
-"# or ** = macencode:\n"
-"\n"
-"[decode]\n"
-"** = cleverdecode:\n"
-"# or ** = macdecode:\n"
+"To perform automatic newline conversion, use::\n"
+"\n"
+" [extensions]\n"
+" hgext.win32text =\n"
+" [encode]\n"
+" ** = cleverencode:\n"
+" # or ** = macencode:\n"
+"\n"
+" [decode]\n"
+" ** = cleverdecode:\n"
+" # or ** = macdecode:\n"
"\n"
"If not doing conversion, to make sure you do not commit CRLF/CR by "
-"accident:\n"
-"\n"
-"[hooks]\n"
-"pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
-"# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
+"accident::\n"
+"\n"
+" [hooks]\n"
+" pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
+" # or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
"\n"
"To do the same check on a server to prevent CRLF/CR from being\n"
-"pushed or pulled:\n"
-"\n"
-"[hooks]\n"
-"pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
-"# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
+"pushed or pulled::\n"
+"\n"
+" [hooks]\n"
+" pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
+" # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
msgstr ""
"改行形式の自動変換\n"
"\n"
@@ -4906,15 +5665,15 @@
"without knowing their actual IP address.\n"
"\n"
"To allow other people to discover your repository using run \"hg serve\"\n"
-"in your repository.\n"
-"\n"
-" $ cd test\n"
-" $ hg serve\n"
-"\n"
-"You can discover zeroconf enabled repositories by running \"hg paths\".\n"
-"\n"
-" $ hg paths\n"
-" zc-test = http://example.com:8000/test\n"
+"in your repository::\n"
+"\n"
+" $ cd test\n"
+" $ hg serve\n"
+"\n"
+"You can discover zeroconf enabled repositories by running \"hg paths\"::\n"
+"\n"
+" $ hg paths\n"
+" zc-test = http://example.com:8000/test\n"
msgstr ""
msgid "archive prefix contains illegal components"
@@ -5150,6 +5909,10 @@
msgid "HG: branch '%s'"
msgstr "HG: ブランチ '%s'"
+#, fuzzy, python-format
+msgid "HG: subrepo %s"
+msgstr "HG: %s を削除"
+
#, python-format
msgid "HG: added %s"
msgstr "HG: %s を追加"
@@ -5192,6 +5955,7 @@
" ファイル名指定が無い場合、作業領域中の全ファイルが対象となります。\n"
" "
+#, fuzzy
msgid ""
"add all new files, delete all missing files\n"
"\n"
@@ -5203,11 +5967,11 @@
" commit.\n"
"\n"
" Use the -s/--similarity option to detect renamed files. With a\n"
-" parameter > 0, this compares every removed file with every added\n"
-" file and records those similar enough as renames. This option\n"
-" takes a percentage between 0 (disabled) and 100 (files must be\n"
-" identical) as its parameter. Detecting renamed files this way can\n"
-" be expensive.\n"
+" parameter greater than 0, this compares every removed file with\n"
+" every added file and records those similar enough as renames. This\n"
+" option takes a percentage between 0 (disabled) and 100 (files must\n"
+" be identical) as its parameter. Detecting renamed files this way\n"
+" can be expensive.\n"
" "
msgstr ""
"新規ファイルの追加登録、および不在ファイルの登録除外\n"
@@ -5267,6 +6031,7 @@
msgid "%s: binary file\n"
msgstr "%s: バイナリファイルです\n"
+#, fuzzy
msgid ""
"create an unversioned archive of a repository revision\n"
"\n"
@@ -5274,14 +6039,14 @@
" directory; use -r/--rev to specify a different revision.\n"
"\n"
" To specify the type of archive to create, use -t/--type. Valid\n"
-" types are:\n"
-"\n"
-" \"files\" (default): a directory full of files\n"
-" \"tar\": tar archive, uncompressed\n"
-" \"tbz2\": tar archive, compressed using bzip2\n"
-" \"tgz\": tar archive, compressed using gzip\n"
-" \"uzip\": zip archive, uncompressed\n"
-" \"zip\": zip archive, compressed using deflate\n"
+" types are::\n"
+"\n"
+" \"files\" (default): a directory full of files\n"
+" \"tar\": tar archive, uncompressed\n"
+" \"tbz2\": tar archive, compressed using bzip2\n"
+" \"tgz\": tar archive, compressed using gzip\n"
+" \"uzip\": zip archive, uncompressed\n"
+" \"zip\": zip archive, compressed using deflate\n"
"\n"
" The exact name of the destination archive or directory is given\n"
" using a format string; see 'hg help export' for details.\n"
@@ -5384,10 +6149,6 @@
msgstr "非マージリビジョンには --parent を指定できません"
#, python-format
-msgid "Backed out changeset %s"
-msgstr "リビジョン %s の打ち消し"
-
-#, python-format
msgid "changeset %s backs out changeset %s\n"
msgstr "リビジョン %s はリビジョン %s を打ち消します\n"
@@ -5468,10 +6229,6 @@
msgstr "不正な引数の組み合わせです"
#, python-format
-msgid "cannot find executable: %s"
-msgstr "実行可能ファイル '%s' が見つかりません"
-
-#, python-format
msgid "failed to execute %s"
msgstr "%s の実行に失敗"
@@ -5483,10 +6240,11 @@
msgid "Changeset %d:%s: %s\n"
msgstr "リビジョン %d:%s: %s\n"
-#, python-format
-msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
+#, fuzzy, python-format
+msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
msgstr "リビジョン %s:%s を検証中(検証残 %s、検証済み %s)\n"
+#, fuzzy
msgid ""
"set or show the current branch name\n"
"\n"
@@ -5503,7 +6261,8 @@
" the parent of the working directory, negating a previous branch\n"
" change.\n"
"\n"
-" Use the command 'hg update' to switch to an existing branch.\n"
+" Use the command 'hg update' to switch to an existing branch. Use\n"
+" 'hg commit --close-branch' to mark this branch as closed.\n"
" "
msgstr ""
"ブランチ名の設定、ないし現ブランチ名の表示\n"
@@ -5534,13 +6293,16 @@
msgid "marked working directory as branch %s\n"
msgstr "作業領域をブランチ %s に設定\n"
+#, fuzzy
msgid ""
"list repository named branches\n"
"\n"
" List the repository's named branches, indicating which ones are\n"
-" inactive. If -a/--active is specified, only show active branches.\n"
-"\n"
-" A branch is considered active if it contains repository heads.\n"
+" inactive. If -c/--closed is specified, also list branches which have\n"
+" been marked closed (see hg commit --close-branch).\n"
+"\n"
+" If -a/--active is specified, only show active branches. A branch\n"
+" is considered active if it contains repository heads.\n"
"\n"
" Use the command 'hg update' to switch to an existing branch.\n"
" "
@@ -5609,6 +6371,7 @@
msgid "unknown bundle type specified with --type"
msgstr "--type に未知のバンドル種別が指定されました"
+#, fuzzy
msgid ""
"output the current or given revision of files\n"
"\n"
@@ -5618,11 +6381,11 @@
"\n"
" Output may be to a file, in which case the name of the file is\n"
" given using a format string. The formatting rules are the same as\n"
-" for the export command, with the following additions:\n"
-"\n"
-" %s basename of file being printed\n"
-" %d dirname of file being printed, or '.' if in repository root\n"
-" %p root-relative path name of file being printed\n"
+" for the export command, with the following additions::\n"
+"\n"
+" %s basename of file being printed\n"
+" %d dirname of file being printed, or '.' if in repository root\n"
+" %p root-relative path name of file being printed\n"
" "
msgstr ""
"指定されたリビジョン時点のファイル内容の出力\n"
@@ -5640,6 +6403,7 @@
" %p 対象ファイルのリポジトリルートからの相対パス\n"
" "
+#, fuzzy
msgid ""
"make a copy of an existing repository\n"
"\n"
@@ -5675,7 +6439,7 @@
" avoid hardlinking.\n"
"\n"
" In some cases, you can clone repositories and checked out files\n"
-" using full hardlinks with\n"
+" using full hardlinks with ::\n"
"\n"
" $ cp -al REPO REPOCLONE\n"
"\n"
@@ -5685,7 +6449,6 @@
" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
" this is not compatible with certain extensions that place their\n"
" metadata under the .hg directory, such as mq.\n"
-"\n"
" "
msgstr ""
"既存リポジトリの複製\n"
@@ -5772,6 +6535,9 @@
" -d/--date への指定に関しては、'hg help dates' を参照してください。\n"
" "
+msgid "nothing changed\n"
+msgstr "変更なし\n"
+
msgid "created new head\n"
msgstr "新規ヘッドが増えました\n"
@@ -6049,6 +6815,7 @@
" 'hg help diffs' を参照してください。\n"
" "
+#, fuzzy
msgid ""
"dump the header and diffs for one or more changesets\n"
"\n"
@@ -6062,16 +6829,16 @@
" first parent only.\n"
"\n"
" Output may be to a file, in which case the name of the file is\n"
-" given using a format string. The formatting rules are as follows:\n"
-"\n"
-" %% literal \"%\" character\n"
-" %H changeset hash (40 bytes of hexadecimal)\n"
-" %N number of patches being generated\n"
-" %R changeset revision number\n"
-" %b basename of the exporting repository\n"
-" %h short-form changeset hash (12 bytes of hexadecimal)\n"
-" %n zero-padded sequence number, starting at 1\n"
-" %r zero-padded changeset revision number\n"
+" given using a format string. The formatting rules are as follows::\n"
+"\n"
+" %% literal \"%\" character\n"
+" %H changeset hash (40 bytes of hexadecimal)\n"
+" %N number of patches being generated\n"
+" %R changeset revision number\n"
+" %b basename of the exporting repository\n"
+" %h short-form changeset hash (12 bytes of hexadecimal)\n"
+" %n zero-padded sequence number, starting at 1\n"
+" %r zero-padded changeset revision number\n"
"\n"
" Without the -a/--text option, export will avoid generating diffs\n"
" of files it detects as binary. With -a, export will generate a\n"
@@ -6192,27 +6959,31 @@
msgid "grep: invalid match pattern: %s\n"
msgstr "grep: '%s' は不正なパターンです\n"
+#, fuzzy
msgid ""
"show current repository heads or show branch heads\n"
"\n"
" With no arguments, show all repository head changesets.\n"
"\n"
-" Repository \"heads\" are changesets that don't have child\n"
-" changesets. They are where development generally takes place and\n"
-" are the usual targets for update and merge operations.\n"
+" Repository \"heads\" are changesets with no child changesets. They are\n"
+" where development generally takes place and are the usual targets\n"
+" for update and merge operations.\n"
"\n"
" If one or more REV is given, the \"branch heads\" will be shown for\n"
-" the named branch associated with that revision. The name of the\n"
-" branch is called the revision's branch tag.\n"
-"\n"
-" Branch heads are revisions on a given named branch that do not have\n"
-" any descendants on the same branch. A branch head could be a true head\n"
-" or it could be the last changeset on a branch before a new branch\n"
-" was created. If none of the branch heads are true heads, the branch\n"
-" is considered inactive.\n"
-"\n"
-" If STARTREV is specified only those heads (or branch heads) that\n"
-" are descendants of STARTREV will be displayed.\n"
+" the named branch associated with the specified changeset(s).\n"
+"\n"
+" Branch heads are changesets on a named branch with no descendants on\n"
+" the same branch. A branch head could be a \"true\" (repository) head,\n"
+" or it could be the last changeset on that branch before it was\n"
+" merged into another branch, or it could be the last changeset on the\n"
+" branch before a new branch was created. If none of the branch heads\n"
+" are true heads, the branch is considered inactive.\n"
+"\n"
+" If -c/--closed is specified, also show branch heads marked closed\n"
+" (see hg commit --close-branch).\n"
+"\n"
+" If STARTREV is specified, only those heads that are descendants of\n"
+" STARTREV will be displayed.\n"
" "
msgstr ""
"現時点でのリポジトリ(ないしブランチ)のヘッド表示\n"
@@ -6236,6 +7007,9 @@
" のみが表示されます。\n"
" "
+msgid "you must specify a branch to use --closed"
+msgstr ""
+
#, python-format
msgid "no open branch heads on branch %s\n"
msgstr "ブランチ %s にはオープンなヘッドがありません\n"
@@ -6310,8 +7084,10 @@
msgid "no help text available"
msgstr "ヘルプはありません"
-#, python-format
-msgid "%s extension - %s\n"
+#, fuzzy, python-format
+msgid ""
+"%s extension - %s\n"
+"\n"
msgstr "%s エクステンション - %s\n"
msgid "Mercurial Distributed SCM\n"
@@ -6435,14 +7211,6 @@
msgid "no diffs found"
msgstr "差分がありません"
-#, python-format
-msgid ""
-"message:\n"
-"%s\n"
-msgstr ""
-"メッセージ:\n"
-"%s\n"
-
msgid "not a Mercurial patch"
msgstr "Mercurial 向けのパッチではありません"
@@ -6851,6 +7619,7 @@
" 本コマンドの実行は、Mercurial が実行を促した場合のみで十分です。\n"
" "
+#, fuzzy
msgid ""
"remove the specified files on the next commit\n"
"\n"
@@ -6864,15 +7633,15 @@
"\n"
" The following table details the behavior of remove for different\n"
" file states (columns) and option combinations (rows). The file\n"
-" states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
-" (as reported by hg status). The actions are Warn, Remove (from\n"
-" branch) and Delete (from disk).\n"
-"\n"
-" A C M !\n"
-" none W RD W R\n"
-" -f R RD RD R\n"
-" -A W W W R\n"
-" -Af R R R R\n"
+" states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
+" reported by hg status). The actions are Warn, Remove (from branch)\n"
+" and Delete (from disk)::\n"
+"\n"
+" A C M !\n"
+" none W RD W R\n"
+" -f R RD RD R\n"
+" -A W W W R\n"
+" -Af R R R R\n"
"\n"
" This command schedules the files to be removed at the next commit.\n"
" To undo a remove before that, see hg revert.\n"
@@ -6951,6 +7720,7 @@
" 前に改名操作を取り消す方法は 'hg help revert' を参照してください。\n"
" "
+#, fuzzy
msgid ""
"retry file merges from a merge or update\n"
"\n"
@@ -6966,9 +7736,10 @@
" indicating whether or not files are resolved. All files must be\n"
" marked as resolved before a commit is permitted.\n"
"\n"
-" The codes used to show the status of files are:\n"
-" U = unresolved\n"
-" R = resolved\n"
+" The codes used to show the status of files are::\n"
+"\n"
+" U = unresolved\n"
+" R = resolved\n"
" "
msgstr ""
"merge や update におけるファイルマージの再実施\n"
@@ -7097,6 +7868,7 @@
msgid "no changes needed to %s\n"
msgstr "%s には改変の必要がありません\n"
+#, fuzzy
msgid ""
"roll back the last transaction\n"
"\n"
@@ -7109,7 +7881,7 @@
" Transactions are used to encapsulate the effects of all commands\n"
" that create new changesets or propagate existing changesets into a\n"
" repository. For example, the following commands are transactional,\n"
-" and their effects can be rolled back:\n"
+" and their effects can be rolled back::\n"
"\n"
" commit\n"
" import\n"
@@ -7185,6 +7957,7 @@
msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
msgstr "http://%s%s/%s で待ち受け開始(バインド先は %s:%d)\n"
+#, fuzzy
msgid ""
"show changed files in the working directory\n"
"\n"
@@ -7207,15 +7980,16 @@
" If two revisions are given, the differences between them are\n"
" shown.\n"
"\n"
-" The codes used to show the status of files are:\n"
-" M = modified\n"
-" A = added\n"
-" R = removed\n"
-" C = clean\n"
-" ! = missing (deleted by non-hg command, but still tracked)\n"
-" ? = not tracked\n"
-" I = ignored\n"
-" = origin of the previous file listed as A (added)\n"
+" The codes used to show the status of files are::\n"
+"\n"
+" M = modified\n"
+" A = added\n"
+" R = removed\n"
+" C = clean\n"
+" ! = missing (deleted by non-hg command, but still tracked)\n"
+" ? = not tracked\n"
+" I = ignored\n"
+" = origin of the previous file listed as A (added)\n"
" "
msgstr ""
"作業領域のファイル操作状況の表示\n"
@@ -7250,6 +8024,105 @@
" "
msgid ""
+"summarize working directory state\n"
+"\n"
+" This generates a brief summary of the working directory state,\n"
+" including parents, branch, commit status, and available updates.\n"
+"\n"
+" With the --remote option, this will check the default paths for\n"
+" incoming and outgoing changes. This can be time-consuming.\n"
+" "
+msgstr ""
+
+#, fuzzy
+msgid " (empty repository)"
+msgstr "パッチ管理リポジトリを複製中\n"
+
+#, fuzzy
+msgid " (no revision checked out)"
+msgstr "作業領域が未更新です"
+
+#, fuzzy, python-format
+msgid "parent: %d:%s %s\n"
+msgstr "親: %d:%s\n"
+
+#, fuzzy, python-format
+msgid "branch: %s\n"
+msgstr "ブランチ: %s\n"
+
+#, fuzzy, python-format
+msgid "%d added"
+msgstr "%s は追加登録されません\n"
+
+#, fuzzy, python-format
+msgid "%d modified"
+msgstr "ファイルが変更されています"
+
+#, fuzzy, python-format
+msgid "%d removed"
+msgstr "削除"
+
+#, fuzzy, python-format
+msgid "%d deleted"
+msgstr "&Deleted"
+
+#, fuzzy, python-format
+msgid "%d ignored"
+msgstr "無視しました"
+
+#, fuzzy, python-format
+msgid "%d unknown"
+msgstr "未知"
+
+#, fuzzy, python-format
+msgid "%d unresolved"
+msgstr "衝突未解決"
+
+#, fuzzy
+msgid " (merge)"
+msgstr "マージ"
+
+#, fuzzy
+msgid " (new branch)"
+msgstr "ブランチ名を表示"
+
+msgid " (clean)"
+msgstr ""
+
+msgid " (new branch head)"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "commit: %s\n"
+msgstr "変換: %s\n"
+
+msgid "update: (current)\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "update: %d new changesets (update)\n"
+msgstr "%s: %d 件の新しいチェンジセット"
+
+#, python-format
+msgid "update: %d new changesets, %d branch heads (merge)\n"
+msgstr ""
+
+msgid "1 or more incoming"
+msgstr ""
+
+#, python-format
+msgid "%d outgoing"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "remote: %s\n"
+msgstr "遠隔ホスト: "
+
+#, fuzzy
+msgid "remote: (synced)\n"
+msgstr "遠隔ホスト: "
+
+msgid ""
"add one or more tags for the current or given revision\n"
"\n"
" Name a particular revision using <name>.\n"
@@ -7312,17 +8185,9 @@
msgstr "タグ '%s' はローカルなタグではありません"
#, python-format
-msgid "Removed tag %s"
-msgstr "タグ %s の削除"
-
-#, python-format
msgid "tag '%s' already exists (use -f to force)"
msgstr "タグ '%s' は存在します(強行する場合は -f を指定してください)"
-#, python-format
-msgid "Added tag %s for changeset %s"
-msgstr "リビジョン %s へタグ %s を付与"
-
msgid ""
"list repository tags\n"
"\n"
@@ -7433,6 +8298,10 @@
" -d/--date への指定に関しては、'hg help dates' を参照してください。\n"
" "
+#, fuzzy
+msgid "cannot specify both -c/--check and -C/--clean"
+msgstr "--soruce と --base は併用できません"
+
msgid "uncommitted local changes"
msgstr "作業領域に未コミットの変更があります"
@@ -7474,7 +8343,8 @@
"本製品はフリーソフトウェアです。頒布／改変の際はライセンス条項をお読み\n"
"ください。市場適合性や特定用途への可否を含め、本製品は無保証です。\n"
-msgid "repository root directory or symbolic path name"
+#, fuzzy
+msgid "repository root directory or name of overlay bundle file"
msgstr "リポジトリのルート位置、ないしパス定義名"
msgid "change working directory"
@@ -7666,6 +8536,10 @@
msgid "show only branches that have unmerged heads"
msgstr "未マージなヘッドを持つブランチのみを表示"
+#, fuzzy
+msgid "show normal and closed branches"
+msgstr "通常の閉じたヘッドを表示"
+
msgid "[-a]"
msgstr "[-a]"
@@ -7810,10 +8684,12 @@
msgid "show only heads which are descendants of REV"
msgstr "当該リビジョンの子孫となるヘッドのみを表示"
-msgid "show only the active heads from open branches"
+#, fuzzy
+msgid "show only the active branch heads from open branches"
msgstr "アクティブなブランチのヘッドのみを表示"
-msgid "show normal and closed heads"
+#, fuzzy
+msgid "show normal and closed branch heads"
msgstr "通常の閉じたヘッドを表示"
msgid "[-r STARTREV] [REV]..."
@@ -8046,6 +8922,9 @@
msgid "[-u] [NAME]..."
msgstr "[-u] [NAME]..."
+msgid "check for push and pull"
+msgstr ""
+
msgid "show status of all files"
msgstr "全ての状態を表示"
@@ -8122,40 +9001,6 @@
msgid "branch name not in UTF-8!"
msgstr "ブランチ名が UTF-8 ではありません!"
-#, python-format
-msgid " searching for copies back to rev %d\n"
-msgstr "リビジョン %d まで遡ってコピーを探索中\n"
-
-#, python-format
-msgid ""
-" unmatched files in local:\n"
-" %s\n"
-msgstr ""
-" ローカルで照合に失敗したファイル:\n"
-" %s\n"
-
-#, python-format
-msgid ""
-" unmatched files in other:\n"
-" %s\n"
-msgstr ""
-" 連携先で照合に失敗したファイル:\n"
-" %s\n"
-
-msgid " all copies found (* = to merge, ! = divergent):\n"
-msgstr " 全コピー発見 (* = マージ, ! = 分岐):\n"
-
-msgid " checking for directory renames\n"
-msgstr " ディレクトリ名の変更を確認しています\n"
-
-#, python-format
-msgid " dir %s -> %s\n"
-msgstr " ディレクトリ %s -> %s\n"
-
-#, python-format
-msgid " file %s -> %s\n"
-msgstr " ファイル %s -> %s\n"
-
msgid "working directory state appears damaged!"
msgstr "作業領域の状態管理に問題があります!"
@@ -8202,6 +9047,10 @@
msgstr "中止: %s\n"
#, python-format
+msgid "hg: %s\n"
+msgstr "hg: %s\n"
+
+#, python-format
msgid ""
"hg: command '%s' is ambiguous:\n"
" %s\n"
@@ -8210,10 +9059,6 @@
" %s\n"
#, python-format
-msgid "hg: %s\n"
-msgstr "hg: %s\n"
-
-#, python-format
msgid "timed out waiting for lock held by %s"
msgstr "%s のロック解放待ちを断念"
@@ -8311,10 +9156,6 @@
msgstr "'%s' が曖昧なコマンド '%s' の別名とみなされました\n"
#, python-format
-msgid "alias '%s' shadows command\n"
-msgstr "別名 '%s' は既存のコマンドを隠します\n"
-
-#, python-format
msgid "malformed --config option: %s"
msgstr "不正な --config 指定: %s"
@@ -8380,10 +9221,6 @@
msgstr "ツール %s は GUI が必要です\n"
#, python-format
-msgid "picked tool '%s' for %s (binary %s symlink %s)\n"
-msgstr "%s のマージ用に '%s' が選択(バイナリ %s シンボリックリンク %s)\n"
-
-#, python-format
msgid ""
" no tool found to merge %s\n"
"keep (l)ocal or take (o)ther?"
@@ -8397,9 +9234,6 @@
msgid "&Other"
msgstr "&Other"
-msgid "l"
-msgstr "l"
-
#, python-format
msgid "merging %s and %s to %s\n"
msgstr "%s と %s を %s にマージ中\n"
@@ -8409,13 +9243,6 @@
msgstr "%s をマージ中\n"
#, python-format
-msgid "my %s other %s ancestor %s\n"
-msgstr "作業領域 %s マージ対象 %s 共通祖先 %s\n"
-
-msgid " premerge successful\n"
-msgstr " 事前マージ成功\n"
-
-#, python-format
msgid ""
" output file %s appears unchanged\n"
"was merge successful (yn)?"
@@ -8429,9 +9256,6 @@
msgid "&Yes"
msgstr "&Yes"
-msgid "n"
-msgstr "n"
-
#, python-format
msgid "merging %s failed!\n"
msgstr "%s のマージに失敗!\n"
@@ -8444,915 +9268,33 @@
msgid "unknown bisect kind %s"
msgstr "未知の分岐種類 %s"
-msgid ""
-"\n"
-" Mercurial has the ability to add new features through the use of\n"
-" extensions. Extensions may add new commands, add options to\n"
-" existing commands, change the default behavior of commands, or\n"
-" implement hooks.\n"
-"\n"
-" Extensions are not loaded by default for a variety of reasons:\n"
-" they can increase startup overhead; they may be meant for\n"
-" advanced usage only; they may provide potentially dangerous\n"
-" abilities (such as letting you destroy or modify history); they\n"
-" might not be ready for prime time; or they may alter some\n"
-" usual behaviors of stock Mercurial. It is thus up to the user to\n"
-" activate extensions as needed.\n"
-"\n"
-" To enable the \"foo\" extension, either shipped with Mercurial\n"
-" or in the Python search path, create an entry for it in your\n"
-" hgrc, like this:\n"
-"\n"
-" [extensions]\n"
-" foo =\n"
-"\n"
-" You may also specify the full path to an extension:\n"
-"\n"
-" [extensions]\n"
-" myfeature = ~/.hgext/myfeature.py\n"
-"\n"
-" To explicitly disable an extension enabled in an hgrc of broader\n"
-" scope, prepend its path with !:\n"
-"\n"
-" [extensions]\n"
-" # disabling extension bar residing in /path/to/extension/bar.py\n"
-" hgext.bar = !/path/to/extension/bar.py\n"
-" # ditto, but no path was supplied for extension baz\n"
-" hgext.baz = !\n"
-" "
-msgstr ""
-"\n"
-" Mercurial には、新規機能を「エクステンション」という機構を用いて\n"
-" 追加する仕組みが備わっています。エクステンションでは、コマンドの\n"
-" 新規追加、既存コマンドへのオプションの追加、コマンドの挙動の変更、\n"
-" フックの実装といったことが可能です。\n"
-"\n"
-" 様々な事情から、特に指定の無い場合にはエクステンションは読み込まれ\n"
-" ません。付加的な読み込みは、起動時間の増加を意味します。上級用途\n"
-" 限定のものもあります。(履歴の破壊や改変などの)潜在的な危険性を持つ\n"
-" 場合もあります。実験的なものであるかもしれません。これまでの\n"
-" Mercurial の振る舞いを変えてしまうかもしれません。エクステンションを\n"
-" 必要に応じて有効化するのは利用者の責務です。\n"
-"\n"
-" \"foo\" というエクステンションを有効化するには、Mercurial 同梱の\n"
-" ものであろうと、Python の検索パス中のものであろうと、設定ファイル\n"
-" において以下のような記述が必要です。\n"
-"\n"
-" [extensions]\n"
-" foo =\n"
-"\n"
-" エクステンションへのフルパスを記述することも可能です。\n"
-"\n"
-" [extensions]\n"
-" myfeature = ~/.hgext/myfeature.py\n"
-"\n"
-" 明示的にエクステンションを無効化する場合、適切な設定ファイルにおいて\n"
-" パス指定の冒頭に '!' を付与します。\n"
-"\n"
-" [extensions]\n"
-" # /path/to/extension/bar.py にあるエクステンション bar の無効化\n"
-" hgext.bar = !/path/to/extension/bar.py\n"
-" # こちらはパス指定無しでの baz エクステンションの無効化\n"
-" hgext.baz = !\n"
-" "
-
msgid "disabled extensions:"
msgstr "無効化されているエクステンション:"
msgid "Date Formats"
msgstr "日時表記"
-msgid ""
-"\n"
-" Some commands allow the user to specify a date, e.g.:\n"
-" * backout, commit, import, tag: Specify the commit date.\n"
-" * log, revert, update: Select revision(s) by date.\n"
-"\n"
-" Many date formats are valid. Here are some examples:\n"
-"\n"
-" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
-" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
-" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
-" \"Dec 6\" (midnight)\n"
-" \"13:18\" (today assumed)\n"
-" \"3:39\" (3:39AM assumed)\n"
-" \"3:39pm\" (15:39)\n"
-" \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
-" \"2006-12-6 13:18\"\n"
-" \"2006-12-6\"\n"
-" \"12-6\"\n"
-" \"12/6\"\n"
-" \"12/6/6\" (Dec 6 2006)\n"
-"\n"
-" Lastly, there is Mercurial's internal format:\n"
-"\n"
-" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
-"\n"
-" This is the internal representation format for dates. unixtime is\n"
-" the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
-" offset is the offset of the local timezone, in seconds west of UTC\n"
-" (negative if the timezone is east of UTC).\n"
-"\n"
-" The log command also accepts date ranges:\n"
-"\n"
-" \"<{datetime}\" - at or before a given date/time\n"
-" \">{datetime}\" - on or after a given date/time\n"
-" \"{datetime} to {datetime}\" - a date range, inclusive\n"
-" \"-{days}\" - within a given number of days of today\n"
-" "
-msgstr ""
-"\n"
-" 以下のコマンドで日時指定が可能です:\n"
-" * backout, commit, import, tag: コミット日時の指定\n"
-" * log, revert, update: 日時によるリビジョンの指定\n"
-"\n"
-" 有効な日時指定形式は沢山あります。以下にいくつかの例を示します。\n"
-"\n"
-" \"Wed Dec 6 13:18:29 2006\" (「ローカルタイムゾーン」を想定)\n"
-" \"Dec 6 13:18 -0600\" (「今年」を想定、タイムゾーンはオフセット指定)\n"
-" \"Dec 6 13:18 UTC\" (UTC および GMT は +0000 の別名)\n"
-" \"Dec 6\" (「午前0時」を想定)\n"
-" \"13:18\" (「本日」を想定)\n"
-" \"3:39\" (「3:39AM」を想定)\n"
-" \"3:39pm\" (15:39)\n"
-" \"2006-12-06 13:18:29\" (ISO 8601 形式)\n"
-" \"2006-12-6 13:18\"\n"
-" \"2006-12-6\"\n"
-" \"12-6\"\n"
-" \"12/6\"\n"
-" \"12/6/6\" (2006年12月6日)\n"
-"\n"
-" 最後に、Mercurial 固有の内部形式を示します。\n"
-"\n"
-" \"1165432709 0\" (2006年12月6日 13:18:29 UTC)\n"
-"\n"
-" これは日時の内部表現形式です。基点となる 1970年1月1日 00:00 UTC からの\n"
-" 経過秒数を表す unixtime 形式部分と、ローカルタイムゾーンのオフセット値\n"
-" (UTC よりも東側の地域は負値)を表すオフセット部分から構成されています。\n"
-"\n"
-" log コマンドには、日時範囲指定可能です:\n"
-"\n"
-" \"<{date}\" - 指定日時以前(指定日時含む)\n"
-" \">{date}\" - 指定日時以後(指定日時含む)\n"
-" \"{date} to {date}\" - 指定日時範囲(指定日時含む)\n"
-" \"-{days}\" - 本日から指定日数以内\n"
-" "
-
msgid "File Name Patterns"
msgstr "ファイル名パターン"
-msgid ""
-"\n"
-" Mercurial accepts several notations for identifying one or more\n"
-" files at a time.\n"
-"\n"
-" By default, Mercurial treats filenames as shell-style extended\n"
-" glob patterns.\n"
-"\n"
-" Alternate pattern notations must be specified explicitly.\n"
-"\n"
-" To use a plain path name without any pattern matching, start it\n"
-" with \"path:\". These path names must completely match starting at\n"
-" the current repository root.\n"
-"\n"
-" To use an extended glob, start a name with \"glob:\". Globs are\n"
-" rooted at the current directory; a glob such as \"*.c\" will only\n"
-" match files in the current directory ending with \".c\".\n"
-"\n"
-" The supported glob syntax extensions are \"**\" to match any string\n"
-" across path separators and \"{a,b}\" to mean \"a or b\".\n"
-"\n"
-" To use a Perl/Python regular expression, start a name with \"re:\".\n"
-" Regexp pattern matching is anchored at the root of the repository.\n"
-"\n"
-" Plain examples:\n"
-"\n"
-" path:foo/bar a name bar in a directory named foo in the root of\n"
-" the repository\n"
-" path:path:name a file or directory named \"path:name\"\n"
-"\n"
-" Glob examples:\n"
-"\n"
-" glob:*.c any name ending in \".c\" in the current directory\n"
-" *.c any name ending in \".c\" in the current directory\n"
-" **.c any name ending in \".c\" in any subdirectory of the\n"
-" current directory including itself.\n"
-" foo/*.c any name ending in \".c\" in the directory foo\n"
-" foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
-" including itself.\n"
-"\n"
-" Regexp examples:\n"
-"\n"
-" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
-"\n"
-" "
-msgstr ""
-"\n"
-" Mercurial には、ファイルを特定するパターン指定方法が複数あります。\n"
-"\n"
-" 特に指定の無い場合、Mercurial は指定されたファイル名に対して、\n"
-" shell 形式の拡張ワイルドカード合致を行います。\n"
-"\n"
-" 別な形式でのパターン記述の際には、明示的に種別を指定してください。\n"
-"\n"
-" パターン合致を行わずに、指定された名前をそのまま使用する場合、\n"
-" 名前の前に \"path:\" を記述します。この形式を使用する場合、\n"
-" リポジトリのルートからのパスと完全に一致しなければなりません。\n"
-"\n"
-" 拡張ワイルドカード合致の場合、名前の前に \"glob:\" を記述します。この\n"
-" 形式では、現ディレクトリからの相対になりますので、\"*.c\" パターンは\n"
-" 末尾が \"*.c\" で終わる現ディレクトリ中のファイルとのみ合致します。\n"
-"\n"
-" ワイルドカードの拡張文法には、パス区切りも含めた任意の文字列と合致する\n"
-" \"**\" と、\"a ないし b\" を意味する \"{a,b}\" という形式があります。\n"
-"\n"
-" Perl/Python 形式の正規表現の場合、名前の前に \"re:\" を記述します。\n"
-" 正規表現形式では、リポジトリのルートからの合致を意味する \"^\" 指定が\n"
-" パターン先頭に自動的に付与されます(訳注: .hgignore での指定では付与\n"
-" 「されません」ので注意が必要です)。\n"
-"\n"
-" パターン合致未使用例:\n"
-"\n"
-" path:foo/bar リポジトリルート直下の foo ディレクトリ中の bar\n"
-" path:path:name \"path:name\" という名前\n"
-"\n"
-" ワイルドカード指定例:\n"
-"\n"
-" glob:*.c 現ディレクトリ直下で、名前が \".c\" で終わるもの\n"
-" *.c 現ディレクトリ直下で、名前が \".c\" で終わるもの\n"
-" **.c 現ディレクトリないしその配下のディレクトリにおいて、\n"
-" 名前が \".c\" で終わるもの\n"
-" foo/*.c foo ディレクトリ直下で、名前が \".c\" で終わるもの\n"
-" foo/**.c foo ディレクトリないしその配下のディレクトリにおいて、\n"
-" 名前が \".c\" で終わるもの\n"
-"\n"
-" 正規表現指定例:\n"
-"\n"
-" re:.*\\.c$ 作業領域中の任意の位置で、名前が \".c\" で終わるもの\n"
-"\n"
-" "
-
msgid "Environment Variables"
msgstr "環境変数"
-msgid ""
-"\n"
-"HG::\n"
-" Path to the 'hg' executable, automatically passed when running\n"
-" hooks, extensions or external tools. If unset or empty, this is\n"
-" the hg executable's name if it's frozen, or an executable named\n"
-" 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
-" Windows) is searched.\n"
-"\n"
-"HGEDITOR::\n"
-" This is the name of the editor to run when committing. See EDITOR.\n"
-"\n"
-" (deprecated, use .hgrc)\n"
-"\n"
-"HGENCODING::\n"
-" This overrides the default locale setting detected by Mercurial.\n"
-" This setting is used to convert data including usernames,\n"
-" changeset descriptions, tag names, and branches. This setting can\n"
-" be overridden with the --encoding command-line option.\n"
-"\n"
-"HGENCODINGMODE::\n"
-" This sets Mercurial's behavior for handling unknown characters\n"
-" while transcoding user input. The default is \"strict\", which\n"
-" causes Mercurial to abort if it can't map a character. Other\n"
-" settings include \"replace\", which replaces unknown characters, and\n"
-" \"ignore\", which drops them. This setting can be overridden with\n"
-" the --encodingmode command-line option.\n"
-"\n"
-"HGMERGE::\n"
-" An executable to use for resolving merge conflicts. The program\n"
-" will be executed with three arguments: local file, remote file,\n"
-" ancestor file.\n"
-"\n"
-" (deprecated, use .hgrc)\n"
-"\n"
-"HGRCPATH::\n"
-" A list of files or directories to search for hgrc files. Item\n"
-" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
-" platform default search path is used. If empty, only the .hg/hgrc\n"
-" from the current repository is read.\n"
-"\n"
-" For each element in HGRCPATH:\n"
-" * if it's a directory, all files ending with .rc are added\n"
-" * otherwise, the file itself will be added\n"
-"\n"
-"HGUSER::\n"
-" This is the string used as the author of a commit. If not set,\n"
-" available values will be considered in this order:\n"
-"\n"
-" * HGUSER (deprecated)\n"
-" * hgrc files from the HGRCPATH\n"
-" * EMAIL\n"
-" * interactive prompt\n"
-" * LOGNAME (with '@hostname' appended)\n"
-"\n"
-" (deprecated, use .hgrc)\n"
-"\n"
-"EMAIL::\n"
-" May be used as the author of a commit; see HGUSER.\n"
-"\n"
-"LOGNAME::\n"
-" May be used as the author of a commit; see HGUSER.\n"
-"\n"
-"VISUAL::\n"
-" This is the name of the editor to use when committing. See EDITOR.\n"
-"\n"
-"EDITOR::\n"
-" Sometimes Mercurial needs to open a text file in an editor for a\n"
-" user to modify, for example when writing commit messages. The\n"
-" editor it uses is determined by looking at the environment\n"
-" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
-" non-empty one is chosen. If all of them are empty, the editor\n"
-" defaults to 'vi'.\n"
-"\n"
-"PYTHONPATH::\n"
-" This is used by Python to find imported modules and may need to be\n"
-" set appropriately if this Mercurial is not installed system-wide.\n"
-" "
-msgstr ""
-"\n"
-"HG::\n"
-" 'hg' コマンドへのパス。フック／エクステンションないし外部ツールの起動の\n"
-" 際に自動的に設定されます。未設定や空の場合は、frozen 形式の\n"
-" hg 実行可能ファイルの名前か設定されるか、'hg' という名前の実行可能\n"
-" ファイルが検索されます(Windows の場合、PATHEXT 環境変数に設定された\n"
-" COM/EXE/BAT/CMD 等の拡張子付き)。\n"
-"\n"
-"HGEDITOR::\n"
-" コミットの際のメッセージ入力を行うためのエディタの名前。EDITOR 環境変数\n"
-" についても参照してください。\n"
-"\n"
-" (推奨されない環境変数。設定ファイル経由で指定してください。)\n"
-"\n"
-"HGENCODING::\n"
-" Mercurial によるロケール自動検出の上書き。この設定は、ユーザ名、\n"
-" コミットメッセージ、タグ名およびブランチ名を内部データ形式に変換する\n"
-" 際に使用されます。この環境変数設定は、コマンドラインでの --encoding\n"
-" 使用により、更に上書きすることが出来ます。\n"
-"\n"
-"HGENCODINGMODE::\n"
-" ユーザからの指定値を内部データ形式に変換する際に、指定の符号化と\n"
-" 合致しない文字が検出された場合の Mercurial の挙動の指定。無指定時は、\n"
-" 「指定の符号化と合致しない場合は処理中断」を意味する \"strict\" が指定\n"
-" されたものとみなします。他には、「未知の文字の置き換え」を意味する\n"
-" \"replace\" と、「未知の文字の切り捨て」を意味する \"ignore\" が指定\n"
-" 出来ます。この環境変数設定は、コマンドラインでの --encodingmode\n"
-" 使用により、更に上書きすることが出来ます。\n"
-"\n"
-"HGMERGE::\n"
-" マージの際の衝突解消に使用するコマンド。指定されたコマンドの起動には、\n"
-" 作業領域のファイル、別リビジョンのファイル、両者の親リビジョンの\n"
-" ファイルを表す3つの引数が指定されます。\n"
-"\n"
-" (推奨されない環境変数。設定ファイル経由で指定してください。)\n"
-"\n"
-"HGRCPATH::\n"
-" 設定ファイル読込のための、ファイルないしディレクトリの一覧の指定。\n"
-" 一覧要素の区切り記号は、Unix なら \":\"、WIndows なら \";\" です。\n"
-" HGRCPATH 環境変数が設定されていない場合、各稼働環境に応じた\n"
-" 読み込み先から読み込まれます。空の値が設定されている場合、\n"
-" 現リポジトリの .hg/hgrc のみが読み込まれます。\n"
-"\n"
-" 指定された一覧の各要素に対して、以下のように振舞います:\n"
-" * ディレクトリなら、配下の \".rc\" で終わる名前のファイルを読み込む\n"
-" * ファイルなら、そのファイル自身を読み込む\n"
-"\n"
-"HGUSER::\n"
-" チェンジセット作成者としてコミット時に記録する名前の指定。\n"
-" 作成者名として採用される値の決定順序は以下の通りです。\n"
-"\n"
-" * HGUSER 環境変数値(推奨されません)\n"
-" * (HGRCPATH 環境変数で指定される)設定ファイル中の設定\n"
-" * EMAIL 環境変数値\n"
-" * 対話的な入力\n"
-" * LOGNAME 環境変数値('@hostname' が付与されます)\n"
-"\n"
-" (推奨されない環境変数。設定ファイル経由で指定してください。)\n"
-"\n"
-"EMAIL::\n"
-" チェンジセット作成者としてこの環境変数値が記録される可能性があります。\n"
-" 詳細は HGUSER の記述を参照してください。\n"
-"\n"
-"LOGNAME::\n"
-" チェンジセット作成者としてこの環境変数値が記録される可能性があります。\n"
-" 詳細は HGUSER の記述を参照してください。\n"
-"\n"
-"VISUAL::\n"
-" コミット時のメッセージを編集するエディタ名の指定。EDITOR 環境変数\n"
-" についても参照してください。\n"
-"\n"
-"EDITOR::\n"
-" コミット時のメッセージのように、エディタでファイルを開き、ユーザによる\n"
-" 編集を促す状況があります。そこで使用されるエディタは、HGEDITOR、VISUAL\n"
-" あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
-" 最初の空で無い値に設定された環境変数の値を使用します。いずれも未設定\n"
-" (あるいは空)の場合は、'vi' が使用されます。\n"
-"\n"
-"PYTHONPATH::\n"
-" Mercurial が当該システムの共有領域にインストールされていない場合、\n"
-" Python が必要なモジュールを読み込むためには、この環境変数の設定が\n"
-" 必要です。\n"
-" "
-
msgid "Specifying Single Revisions"
msgstr "単一リビジョンの指定"
-msgid ""
-"\n"
-" Mercurial supports several ways to specify individual revisions.\n"
-"\n"
-" A plain integer is treated as a revision number. Negative integers\n"
-" are treated as topological offsets from the tip, with -1 denoting\n"
-" the tip. As such, negative numbers are only useful if you've\n"
-" memorized your local tree numbers and want to save typing a single\n"
-" digit. This editor suggests copy and paste.\n"
-"\n"
-" A 40-digit hexadecimal string is treated as a unique revision\n"
-" identifier.\n"
-"\n"
-" A hexadecimal string less than 40 characters long is treated as a\n"
-" unique revision identifier, and referred to as a short-form\n"
-" identifier. A short-form identifier is only valid if it is the\n"
-" prefix of exactly one full-length identifier.\n"
-"\n"
-" Any other string is treated as a tag name, which is a symbolic\n"
-" name associated with a revision identifier. Tag names may not\n"
-" contain the \":\" character.\n"
-"\n"
-" The reserved name \"tip\" is a special tag that always identifies\n"
-" the most recent revision.\n"
-"\n"
-" The reserved name \"null\" indicates the null revision. This is the\n"
-" revision of an empty repository, and the parent of revision 0.\n"
-"\n"
-" The reserved name \".\" indicates the working directory parent. If\n"
-" no working directory is checked out, it is equivalent to null. If\n"
-" an uncommitted merge is in progress, \".\" is the revision of the\n"
-" first parent.\n"
-" "
-msgstr ""
-"\n"
-" Mercurial は、個々のリビジョンを識別する記法を幾つか用意しています。\n"
-"\n"
-" 整数値は、「リビジョン番号」とみなされます。負値は、tip からの距離を\n"
-" 表し、-1 は tip 自身を表します。負値の指定は、手元のリポジトリ中の\n"
-" 履歴遷移を把握している際に、入力を省力化したい場合にのみ有効です。\n"
-" 負値の利用はあまりお勧めできません。\n"
-"\n"
-" 40桁の16進文字列は、一意な「リビジョン識別子」とみなされます。\n"
-"\n"
-" 40桁未満の16進文字列は、一意な「リビジョン識別子」の短縮形式と\n"
-" みなされます。短縮形式の識別子は、厳密に1つの完全長の識別子とだけ\n"
-" 前方一致する場合にのみ有効です。\n"
-"\n"
-" それ以外の文字列は、リビジョン識別子に関連付けられた「タグ名」と\n"
-" みなされます。タグ名は \":\" を含んでいないかもしれない。\n"
-"\n"
-" 「最新のリビジョン」を示すための名前 \"tip\" は、特別な名前として予約\n"
-" されています。\n"
-"\n"
-" 「空リビジョン」を示すための名前 \"null\" は、特別な名前として予約\n"
-" されており、リビジョン 0 の親は \"null\" リビジョンです。\n"
-"\n"
-" 「作業領域の親リビジョン」を示すための名前 \".\" は、特別な名前として\n"
-" 予約されています。作業領域が未更新の場合は、\"null\" 指定と等価です。\n"
-" 未コミットのマージ中の場合、\".\" は第1親リビジョンを指します。\n"
-" "
-
msgid "Specifying Multiple Revisions"
msgstr "複数リビジョンの指定"
-msgid ""
-"\n"
-" When Mercurial accepts more than one revision, they may be\n"
-" specified individually, or provided as a topologically continuous\n"
-" range, separated by the \":\" character.\n"
-"\n"
-" The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
-" are revision identifiers. Both BEGIN and END are optional. If\n"
-" BEGIN is not specified, it defaults to revision number 0. If END\n"
-" is not specified, it defaults to the tip. The range \":\" thus means\n"
-" \"all revisions\".\n"
-"\n"
-" If BEGIN is greater than END, revisions are treated in reverse\n"
-" order.\n"
-"\n"
-" A range acts as a closed interval. This means that a range of 3:5\n"
-" gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
-" "
-msgstr ""
-"\n"
-" Mercurial が複数のリビジョン指定を受け付ける場合の指定方法は、\n"
-" 個々のリビジョンをそれぞれ指定する方法以外にも、\":\" を区切り\n"
-" 記号にした範囲指定による方法があります。\n"
-"\n"
-" 範囲表記の文法は、\"[開始]:[終了]\" というもので、\"開始\"・\"終了\"\n"
-" 部分にはそれぞれリビジョン識別用の情報が記述されます。\n"
-" \"開始\"・\"終了\" はそれぞれ省略可能です。\"開始\" 部分が\n"
-" 記述されない場合、リビジョン番号 0 が記述されたものとみなされます。\n"
-" \"終了\" 部分が記述されない場合、tip が記述されたものとみなされます。\n"
-" 以上のことから、\":\" という記述は \"全リビジョン\" を指します。\n"
-"\n"
-" \"開始\" 指定が \"終了\" 指定よりも後のリビジョンである場合、逆順指定\n"
-" とみなされます。\n"
-"\n"
-" 範囲指定は \"閉区間\" とみなされます。つまり、3:5 という範囲指定は\n"
-" 3, 4, 5 の指定と等価です。同様に 9:6 という指定は 9, 8, 7, 6 の指定と\n"
-" 等価です。\n"
-" "
-
msgid "Diff Formats"
msgstr "差分形式"
-msgid ""
-"\n"
-" Mercurial's default format for showing changes between two\n"
-" versions of a file is compatible with the unified format of GNU\n"
-" diff, which can be used by GNU patch and many other standard\n"
-" tools.\n"
-"\n"
-" While this standard format is often enough, it does not encode the\n"
-" following information:\n"
-"\n"
-" - executable status and other permission bits\n"
-" - copy or rename information\n"
-" - changes in binary files\n"
-" - creation or deletion of empty files\n"
-"\n"
-" Mercurial also supports the extended diff format from the git VCS\n"
-" which addresses these limitations. The git diff format is not\n"
-" produced by default because a few widespread tools still do not\n"
-" understand this format.\n"
-"\n"
-" This means that when generating diffs from a Mercurial repository\n"
-" (e.g. with \"hg export\"), you should be careful about things like\n"
-" file copies and renames or other things mentioned above, because\n"
-" when applying a standard diff to a different repository, this\n"
-" extra information is lost. Mercurial's internal operations (like\n"
-" push and pull) are not affected by this, because they use an\n"
-" internal binary format for communicating changes.\n"
-"\n"
-" To make Mercurial produce the git extended diff format, use the\n"
-" --git option available for many commands, or set 'git = True' in\n"
-" the [diff] section of your hgrc. You do not need to set this\n"
-" option when importing diffs in this format or using them in the mq\n"
-" extension.\n"
-" "
-msgstr ""
-"\n"
-" 無指定時に Mercurial が2つのリビジョンを比較して差分表示する際の形式は\n"
-" GNU diff の unified 形式互換のもので、GNU patch をはじめとする多くの\n"
-" 標準的なツールで使用できるものです。\n"
-"\n"
-" この標準的な形式は概ね十分なのですが、以下のような情報は含まれません:\n"
-"\n"
-" - 実行可否および権限設定\n"
-" - 複製／改名情報\n"
-" - バイナリファイルの変更\n"
-" - 空ファイルの作成／削除\n"
-"\n"
-" Mercurial は、別の構成管理ツールである git に由来する拡張差分形式にも\n"
-" 対応しており、この形式は従来の差分形式の持つ先の制限を解消しています。\n"
-" 但し、普及しているツールの幾つかが git 差分形式に対応していないため、\n"
-" Mercurial は指定が無い場合はこの形式では出力しません。\n"
-"\n"
-" つまり、Mercurial が(\"hg export\" 等で)生成した標準の差分形式は、\n"
-" 他のリポジトリに対して適用した場合、上述した情報の欠落があることから、\n"
-" ファイルの複製・改名をはじめとする上記の制限に類する操作に関しては、\n"
-" 十分注意する必要があります。push や pull のように、Mercurial の\n"
-" 内部形式で実施される操作に関しては、バイナリ形式で変更情報の授受を行う\n"
-" ことから、情報の欠落に関しては心配する必要はありません。\n"
-"\n"
-" Mercurial から git 拡張差分形式の出力を得るには、受理可能なコマンドに\n"
-" 対して --git を指定するか、設定ファイルの [diff] セクションに\n"
-" 'git = True' 記述を追加してください。hg import や mq エクステンションを\n"
-" 使用する場合は、この指定は不要です。\n"
-" "
-
msgid "Template Usage"
msgstr "テンプレートの利用"
-msgid ""
-"\n"
-" Mercurial allows you to customize output of commands through\n"
-" templates. You can either pass in a template from the command\n"
-" line, via the --template option, or select an existing\n"
-" template-style (--style).\n"
-"\n"
-" You can customize output for any \"log-like\" command: log,\n"
-" outgoing, incoming, tip, parents, heads and glog.\n"
-"\n"
-" Three styles are packaged with Mercurial: default (the style used\n"
-" when no explicit preference is passed), compact and changelog.\n"
-" Usage:\n"
-"\n"
-" $ hg log -r1 --style changelog\n"
-"\n"
-" A template is a piece of text, with markup to invoke variable\n"
-" expansion:\n"
-"\n"
-" $ hg log -r1 --template \"{node}\\n\"\n"
-" b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
-"\n"
-" Strings in curly braces are called keywords. The availability of\n"
-" keywords depends on the exact context of the templater. These\n"
-" keywords are usually available for templating a log-like command:\n"
-"\n"
-" - author: String. The unmodified author of the changeset.\n"
-" - branches: String. The name of the branch on which the changeset\n"
-" was committed. Will be empty if the branch name was default.\n"
-" - date: Date information. The date when the changeset was committed.\n"
-" - desc: String. The text of the changeset description.\n"
-" - diffstat: String. Statistics of changes with the following\n"
-" format: \"modified files: +added/-removed lines\"\n"
-" - files: List of strings. All files modified, added, or removed by\n"
-" this changeset.\n"
-" - file_adds: List of strings. Files added by this changeset.\n"
-" - file_mods: List of strings. Files modified by this changeset.\n"
-" - file_dels: List of strings. Files removed by this changeset.\n"
-" - node: String. The changeset identification hash, as a\n"
-" 40-character hexadecimal string.\n"
-" - parents: List of strings. The parents of the changeset.\n"
-" - rev: Integer. The repository-local changeset revision number.\n"
-" - tags: List of strings. Any tags associated with the changeset.\n"
-"\n"
-" The \"date\" keyword does not produce human-readable output. If you\n"
-" want to use a date in your output, you can use a filter to process\n"
-" it. Filters are functions which return a string based on the input\n"
-" variable. You can also use a chain of filters to get the desired\n"
-" output:\n"
-"\n"
-" $ hg tip --template \"{date|isodate}\\n\"\n"
-" 2008-08-21 18:22 +0000\n"
-"\n"
-" List of filters:\n"
-"\n"
-" - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
-" every line except the last.\n"
-" - age: Date. Returns a human-readable date/time difference between\n"
-" the given date/time and the current date/time.\n"
-" - basename: Any text. Treats the text as a path, and returns the\n"
-" last component of the path after splitting by the path\n"
-" separator (ignoring trailing separators). For example,\n"
-" \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
-"\".\n"
-" - stripdir: Treat the text as path and strip a directory level, if\n"
-" possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
-" - date: Date. Returns a date in a Unix date format, including\n"
-" the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
-" - domain: Any text. Finds the first string that looks like an\n"
-" email address, and extracts just the domain component.\n"
-" Example: 'User <user@example.com>' becomes 'example.com'.\n"
-" - email: Any text. Extracts the first string that looks like an\n"
-" email address. Example: 'User <user@example.com>' becomes\n"
-" 'user@example.com'.\n"
-" - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
-" \"<\" and \">\" with XML entities.\n"
-" - fill68: Any text. Wraps the text to fit in 68 columns.\n"
-" - fill76: Any text. Wraps the text to fit in 76 columns.\n"
-" - firstline: Any text. Returns the first line of text.\n"
-" - nonempty: Any text. Returns '(none)' if the string is empty.\n"
-" - hgdate: Date. Returns the date as a pair of numbers:\n"
-" \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
-" - isodate: Date. Returns the date in ISO 8601 format.\n"
-" - localdate: Date. Converts a date to local date.\n"
-" - obfuscate: Any text. Returns the input text rendered as a\n"
-" sequence of XML entities.\n"
-" - person: Any text. Returns the text before an email address.\n"
-" - rfc822date: Date. Returns a date using the same format used\n"
-" in email headers.\n"
-" - short: Changeset hash. Returns the short form of a changeset\n"
-" hash, i.e. a 12-byte hexadecimal string.\n"
-" - shortdate: Date. Returns a date like \"2006-09-18\".\n"
-" - strip: Any text. Strips all leading and trailing whitespace.\n"
-" - tabindent: Any text. Returns the text, with every line except\n"
-" the first starting with a tab character.\n"
-" - urlescape: Any text. Escapes all \"special\" characters. For\n"
-" example, \"foo bar\" becomes \"foo%20bar\".\n"
-" - user: Any text. Returns the user portion of an email address.\n"
-" "
-msgstr ""
-"\n"
-" Mercurial では、テンプレート機能によってコマンドの出力をカスタマイズ\n"
-" することができます。コマンドラインからの指定では、--template による\n"
-" テンプレート指定と、--style によるスタイル指定の両方が使用できます。\n"
-"\n"
-" 「log 的」な出力を行う以下のコマンドの出力をカスタマイズ可能です:\n"
-" log, outgoing, incoming, tip, parents, heads, glog\n"
-"\n"
-" Mercurial には(明示的な指定が無い場合に使用される)default、compact\n"
-" および changelog の3つのスタイル設定が同梱されています。利用方法は:\n"
-"\n"
-" $ hg log -r1 --style changelog\n"
-"\n"
-" テンプレートとは、変数展開マークアップ機能を備えたテキストです。\n"
-"\n"
-" $ hg log -r1 --template \"{node}\\n\"\n"
-" b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
-"\n"
-" 波括弧で囲まれた部分は「キーワード」と呼ばれます。キーワード利用の\n"
-" 可否は、テンプレートの利用される状況に依存します。以下のキーワードは\n"
-" log 的なコマンドでのテンプレート利用の際には常に使用可能です。\n"
-"\n"
-" - author: 文字列。リビジョンの作者名(記録情報そのまま)。\n"
-" - branches: 文字列。リビジョンの属するブランチ名。所属ブランチが\n"
-" default の場合は空文字列。\n"
-" - date: 日時情報。リビジョンが記録された日時。\n"
-" - desc: 文字列。リビジョンのコミットメッセージ。\n"
-" - diffstat: 文字列。以下の形式での変更概要。\n"
-" \"変更対象ファイル: +追加行数/-削除行数\"\n"
-" - files: 文字列列挙。当該リビジョンでの、変更／追加登録ないし\n"
-" 登録除外ファイルの一覧。\n"
-" - file_adds: 文字列列挙。当該リビジョンでの追加ファイル一覧。\n"
-" - file_mods: 文字列列挙。当該リビジョンでの変更ファイル一覧。\n"
-" - file_dels: 文字列列挙。当該リビジョンでの登録除外ファイル一覧。\n"
-" - node: 文字列。リビジョン識別用の 40 桁 16 進数ハッシュ値。\n"
-" - parents: 文字列列挙。リビジョンの親。\n"
-" - rev: 整数。各リポジトリ固有のリビジョン番号。\n"
-" - tags: 文字列列挙。当該リビジョンに付与されたタグの一覧。\n"
-"\n"
-" \"date\" キーワードの出力は可読形式ではありません。出力に日時情報を\n"
-" 含めたい場合、可読化するために「フィルター」を使用します。\n"
-" 「フィルター」とは、指定値に基づいて文字列を生成する機能です。複数の\n"
-" フィルターを連ねることで、様々な出力を得ることができます。\n"
-"\n"
-" $ hg tip --template \"{date|isodate}\\n\"\n"
-" 2008-08-21 18:22 +0000\n"
-"\n"
-" フィルター一覧(入力と、それに対する出力):\n"
-"\n"
-" - addbreaks: 文字列。最終行を除く各行の行末に XHTML の \n"
-" \"<br />\" タグを追加します。\n"
-" - age: 日時情報。与えられた日時と、現在日時との差分を表す\n"
-" 可読形式の文字列を生成します。\n"
-" - basename: 文字列。与えられた文字列をパスとみなし、パス区切りで\n"
-" 区切られた最後の要素だけを取り出します(末尾パス\n"
-" 区切りは無視されます)。例えば、\"foo/bar/baz\" は\n"
-" \"baz\" に、\"foo/bar//\" は \"bar\" になります。\n"
-" - stripdir: 文字列。与えられた文字列をパスとみなし、ディレクトリ\n"
-" 要素があればそれを取り除きます。例えば、\"foo\"\n"
-" および \"foo/bar\" は \"foo\" となります。\n"
-" - date: 日時情報。タイムゾーンを含んだ、Unix の date コマンド\n"
-" 形式で可読化します: \"Mon Sep 04 15:13:13 2006 0700\"\n"
-" - domain: 文字列。メールアドレスと思しき最初の文字列部分から\n"
-" ドメイン部分だけを取り出します。例えば、\n"
-" 'User <user@example.com>' は 'example.com' です。\n"
-" - email: 文字列。メールアドレスと思しき最初の部分を取り出します。\n"
-" 例えば 'User <user@example.com>' は\n"
-" 'user@example.com' となります。\n"
-" - escape: 文字列。XML/XHTML の特殊文字である \"&\"、\"<\" および\n"
-" \">\" を XML のエンティティ形式に変換します。\n"
-" - fill68: 文字列。68 桁に収まるように文字列を折り返します。\n"
-" - fill76: 文字列。76 桁に収まるように文字列を折り返します。\n"
-" - firstline: 文字列。最初の行のみを取り出します。\n"
-" - nonempty: 文字列。与えられた文字列が空の場合 '(none)'となります。\n"
-" - hgdate: 日時情報。Unix タイムスタンプとタイムゾーンオフセット\n"
-" による数値対形式で可読化します: \"1157407993 25200\"\n"
-" - isodate: 日時情報。ISO 8601 形式で可読化します。\n"
-" - localdate: 日時情報。ローカル日時で可読化します。\n"
-" - obfuscate: 文字列。全ての文字を XML エンティティ形式に変換します。\n"
-" - person: 文字列。メールアドレス直前の部分だけを取り出します。\n"
-" - rfc822date:日時情報。メールのヘッダと同形式で可読化します。\n"
-" - short: リビジョンハッシュ 値。12 桁程度の短縮形式にします。\n"
-" - shortdate: 日時情報。\"2006-09-18\" 形式で可読化します。\n"
-" - strip: 文字列。先頭／末尾の空白文字を取り除きます。\n"
-" - tabindent: 文字列。先頭行以外をタブ文字で字下げします。\n"
-" - urlescape: 文字列。全ての「特殊」文字を変換します。\n"
-" 例えば \"foo bar\" は \"foo%20bar\" となります。\n"
-" - user: 文字列。メールアドレスのユーザ名部分を取り出します。\n"
-" "
-
msgid "URL Paths"
msgstr "URLのパス指定"
-msgid ""
-"\n"
-" Valid URLs are of the form:\n"
-"\n"
-" local/filesystem/path (or file://local/filesystem/path)\n"
-" http://[user[:pass]@]host[:port]/[path]\n"
-" https://[user[:pass]@]host[:port]/[path]\n"
-" ssh://[user[:pass]@]host[:port]/[path]\n"
-"\n"
-" Paths in the local filesystem can either point to Mercurial\n"
-" repositories or to bundle files (as created by 'hg bundle' or\n"
-" 'hg incoming --bundle').\n"
-"\n"
-" An optional identifier after # indicates a particular branch, tag,\n"
-" or changeset to use from the remote repository.\n"
-"\n"
-" Some features, such as pushing to http:// and https:// URLs are\n"
-" only possible if the feature is explicitly enabled on the remote\n"
-" Mercurial server.\n"
-"\n"
-" Some notes about using SSH with Mercurial:\n"
-" - SSH requires an accessible shell account on the destination\n"
-" machine and a copy of hg in the remote path or specified with as\n"
-" remotecmd.\n"
-" - path is relative to the remote user's home directory by default.\n"
-" Use an extra slash at the start of a path to specify an absolute "
-"path:\n"
-" ssh://example.com//tmp/repository\n"
-" - Mercurial doesn't use its own compression via SSH; the right\n"
-" thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
-" Host *.mylocalnetwork.example.com\n"
-" Compression no\n"
-" Host *\n"
-" Compression yes\n"
-" Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
-" or with the --ssh command line option.\n"
-"\n"
-" These URLs can all be stored in your hgrc with path aliases under\n"
-" the [paths] section like so:\n"
-" [paths]\n"
-" alias1 = URL1\n"
-" alias2 = URL2\n"
-" ...\n"
-"\n"
-" You can then use the alias for any command that uses a URL (for\n"
-" example 'hg pull alias1' would pull from the 'alias1' path).\n"
-"\n"
-" Two path aliases are special because they are used as defaults\n"
-" when you do not provide the URL to a command:\n"
-"\n"
-" default:\n"
-" When you create a repository with hg clone, the clone command\n"
-" saves the location of the source repository as the new\n"
-" repository's 'default' path. This is then used when you omit\n"
-" path from push- and pull-like commands (including incoming and\n"
-" outgoing).\n"
-"\n"
-" default-push:\n"
-" The push command will look for a path named 'default-push', and\n"
-" prefer it over 'default' if both are defined.\n"
-" "
-msgstr ""
-"\n"
-" 有効な URL 指定は以下の形式です:\n"
-"\n"
-" local/filesystem/path (ないし file://local/filesystem/path)\n"
-" http://[user[:pass]@]host[:port]/[path]\n"
-" https://[user[:pass]@]host[:port]/[path]\n"
-" ssh://[user[:pass]@]host[:port]/[path]\n"
-"\n"
-" ローカルファイルシステム上のパスが指す先は Mercurial のリポジトリでも、\n"
-" バンドルファイル('hg bundle' ないし 'hg incoming --bundle' で生成)でも\n"
-" 構いません。\n"
-"\n"
-" 遠隔ホスト上の連携先リポジトリ指定の場合、'#' 記号に続けて識別子を指定\n"
-" することで、特定のブランチ、タグないしチェンジセットを指定することが\n"
-" 出来ます。\n"
-"\n"
-" http:// や https:// 形式の URL で指定される連携先への push の様な\n"
-" 機能のうちの幾つかは、その機能が連携先の Mercurial サーバ側で明示的に\n"
-" 利用可能になっている場合に限り使用可能です。\n"
-"\n"
-" Mercurial と SSH を併用する場合の注意点:\n"
-" - SSH アクセス先ホスト上に、shell アカウントと hg コマンドが必要です。\n"
-" hg コマンドがアクセス先ホストの PATH 設定で利用可能になっていない\n"
-" 場合は、--remotecmd で明示的に指定してください。\n"
-" - URL 中のパス指定は、アクセス先ホスト上のユーザのホームディレクトリ\n"
-" からの相対パスとみなされます。絶対パスを指定する場合は、パスの先頭に\n"
-" 更にスラッシュ('/')を付与してください。\n"
-" 例: ssh://example.com//tmp/repository\n"
-" - SSH 連携の際には Mercurial は自身の圧縮処理を行いません。以下のように\n"
-" ~/.ssh/config 等で SSH の圧縮実施を指示することをお勧めします。\n"
-" Host *.mylocalnetwork.example.com\n"
-" Compression no\n"
-" Host *\n"
-" Compression yes\n"
-" あるいは、設定ファイルにおける ssh コマンド指定や、コマンドラインでの\n"
-" --ssh に対して、'ssh -C' を指定する方法もあります。\n"
-"\n"
-" 連携先 URL は、設定ファイルの [paths] セクションで、別名を付けて記述\n"
-" することが出来ます。\n"
-" [paths]\n"
-" alias1 = URL1\n"
-" alias2 = URL2\n"
-" ...\n"
-"\n"
-" URL 指定が必要なコマンドに対しては、別名を指定することが出来ます\n"
-" (例えば、'hg pull alias1' は alias1 の指す先から変更を取り込みます)。\n"
-"\n"
-" コマンドに URL を指定しなかった場合に、暗黙の連携先として使用される\n"
-" 重要な別名が2つあります。\n"
-"\n"
-" default:\n"
-" 'hg clone' によって複製した場合、新規リポジトリの 'default' として\n"
-" 複製元リポジトリの URL が保存されます。\n"
-" 以後、連携先を省略して 'hg push' や 'hg pull' に類するコマンドを\n"
-" 実行した際には、この URL が連携先として使用されます。\n"
-"\n"
-" default-push:\n"
-" 'hg push' は、'default-push' の別名で定義される URL を探します。\n"
-" 'default' が定義されている場合でも、'default-push' が定義されていれば\n"
-" こちらが優先されます。\n"
-" "
-
msgid "Using additional features"
msgstr "付加機能の使用"
@@ -9385,27 +9327,21 @@
msgid "clone from remote to remote not supported"
msgstr "リモートからリモートの複製はサポートしていません"
-msgid "updated"
-msgstr "更新"
-
-msgid "merged"
-msgstr "マージ"
-
-msgid "removed"
-msgstr "削除"
-
-msgid "unresolved"
-msgstr "衝突未解決"
-
-#, python-format
-msgid "%d files %s"
-msgstr "%d 個のファイルが%s"
+#, fuzzy, python-format
+msgid "updating to branch %s\n"
+msgstr "ブランチのキャッシュを更新中\n"
+
+#, python-format
+msgid ""
+"%d files updated, %d files merged, %d files removed, %d files unresolved\n"
+msgstr ""
msgid "use 'hg resolve' to retry unresolved file merges\n"
msgstr "'hg resolve' でマージの衝突を解消してください\n"
-msgid ""
-"use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to "
+#, fuzzy
+msgid ""
+"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to "
"abandon\n"
msgstr "'hg resolve' で再度衝突解消するか、'hg up --clean' で変更破棄を。\n"
@@ -9481,32 +9417,12 @@
msgid "unsupported URL component: \"%s\""
msgstr "URL 要素 \"%s\" はサポートされていません"
-#, python-format
-msgid "using %s\n"
-msgstr "%s を用います\n"
-
-#, python-format
-msgid "capabilities: %s\n"
-msgstr "機能: %s\n"
-
msgid "operation not supported over http"
msgstr "http リポジトリでは使用できない機能を必要としています"
-#, python-format
-msgid "sending %s command\n"
-msgstr "コマンド %s 送信中\n"
-
-#, python-format
-msgid "sending %s bytes\n"
-msgstr "%s バイトのデータ送信中\n"
-
msgid "authorization failed"
msgstr "認証に失敗"
-#, python-format
-msgid "http error while sending %s command\n"
-msgstr "コマンド %s 送信中の HTTP エラー\n"
-
msgid "http error, possibly caused by proxy setting"
msgstr "HTTP エラー(おそらくプロキシー設定に起因)"
@@ -9515,10 +9431,6 @@
msgstr "実際の URL: %s\n"
#, python-format
-msgid "requested URL: '%s'\n"
-msgstr "要求 URL: '%s'\n"
-
-#, python-format
msgid "'%s' does not appear to be an hg repository"
msgstr "'%s' は Mercurial リポジトリ形式とは思われません"
@@ -9552,8 +9464,8 @@
msgid "cannot create new http repository"
msgstr "http リポジトリの新規作成はできません"
-#, python-format
-msgid "%s: ignoring invalid syntax '%s'\n"
+#, fuzzy, python-format
+msgid "ignoring invalid syntax '%s'"
msgstr "%s: 文法不正の '%s' を無視します\n"
#, python-format
@@ -9584,17 +9496,6 @@
msgstr "作業領域の .hgtags が変更されています（手動でコミットしてください）"
#, python-format
-msgid "%s, line %s: %s\n"
-msgstr "%s %s行目: %s\n"
-
-msgid "cannot parse entry"
-msgstr "エントリを読み込めません"
-
-#, python-format
-msgid "node '%s' is not well formed"
-msgstr "'%s' というノードはフォーマットが不適切です"
-
-#, python-format
msgid "working directory has unknown parent '%s'!"
msgstr "作業領域の親 '%s' が未知のディレクトリです!"
@@ -9602,10 +9503,6 @@
msgid "unknown revision '%s'"
msgstr "'%s' は未知のリビジョンです"
-#, python-format
-msgid "filtering %s through %s\n"
-msgstr "%s を %s で処理中\n"
-
msgid "journal already exists - run hg recover"
msgstr "ジャーナルが既に存在しています。 hg recoverを実行してください"
@@ -9637,14 +9534,6 @@
msgid "working directory of %s"
msgstr "%s の作業領域"
-#, python-format
-msgid " %s: searching for copy revision for %s\n"
-msgstr "%s: コピー時点の %s を検索中\n"
-
-#, python-format
-msgid " %s: copy %s:%s\n"
-msgstr "%s: コピー %s:%s\n"
-
msgid "cannot partially commit a merge (do not specify files or patterns)"
msgstr "マージの部分コミットはできません(ファイル名／パターンは指定できません)"
@@ -9657,9 +9546,6 @@
msgid "file not tracked!"
msgstr "ファイルは未登録です!"
-msgid "nothing changed\n"
-msgstr "変更なし\n"
-
msgid "unresolved merge conflicts (see hg resolve)"
msgstr "未解決の衝突が残っています （hg resolveを参照してください）"
@@ -9714,41 +9600,6 @@
msgid "searching for changes\n"
msgstr "変更点を探索中\n"
-#, python-format
-msgid "examining %s:%s\n"
-msgstr "%s:%s をチェックしています\n"
-
-msgid "branch already found\n"
-msgstr "ブランチはすでに見つかっています\n"
-
-#, python-format
-msgid "found incomplete branch %s:%s\n"
-msgstr "不完全なブランチ: %s:%s\n"
-
-#, python-format
-msgid "found new changeset %s\n"
-msgstr "新しいチェンジセット '%s' を発見\n"
-
-#, python-format
-msgid "request %d: %s\n"
-msgstr "リクエスト %d: %s\n"
-
-#, python-format
-msgid "received %s:%s\n"
-msgstr "%s:%s を受信\n"
-
-#, python-format
-msgid "narrowing %d:%d %s\n"
-msgstr "%d:%d %s を探索中\n"
-
-#, python-format
-msgid "found new branch changeset %s\n"
-msgstr "新しいブランチのチェンジセット %s を発見\n"
-
-#, python-format
-msgid "narrowed branch search to %s:%s\n"
-msgstr "ブランチの探索を %s:%s へ絞りました\n"
-
msgid "already have changeset "
msgstr "既にチェンジセットがあります "
@@ -9758,16 +9609,6 @@
msgid "repository is unrelated"
msgstr "無関係なリポジトリです"
-msgid "found new changesets starting at "
-msgstr "以下を起点とする新規変更の検出: "
-
-#, python-format
-msgid "%d total queries\n"
-msgstr "合計 %d のクエリ\n"
-
-msgid "common changesets up to "
-msgstr "以下を終点とする共通履歴: "
-
msgid "requesting all changes\n"
msgstr "全チェンジセットを取得中\n"
@@ -9793,17 +9634,10 @@
msgid "%d changesets found\n"
msgstr "%d 個のチェンジセット\n"
-msgid "list of changesets:\n"
-msgstr "チェンジセット一覧：\n"
-
#, python-format
msgid "empty or missing revlog for %s"
msgstr "%s に対するリビジョンログが空ないし不在です"
-#, python-format
-msgid "add changeset %s\n"
-msgstr "チェンジセット %s を追加\n"
-
msgid "adding changesets\n"
msgstr "チェンジセットを追加中\n"
@@ -9816,10 +9650,6 @@
msgid "adding file changes\n"
msgstr "ファイルの変更を追加中\n"
-#, python-format
-msgid "adding %s revisions\n"
-msgstr "%s 個のリビジョンを追加中\n"
-
msgid "received file revlog group is empty"
msgstr "ファイルのリビジョンログが空です"
@@ -9831,9 +9661,6 @@
msgid "added %d changesets with %d changes to %d files%s\n"
msgstr "%d のチェンジセット(%d の変更を %d ファイルに適用)を追加%s\n"
-msgid "updating the branch cache\n"
-msgstr "ブランチのキャッシュを更新中\n"
-
msgid "Unexpected response from remote server:"
msgstr "連携先のサーバから予期しない返信: "
@@ -9854,10 +9681,6 @@
msgstr "%d 個のファイル転送(データ量 %s)\n"
#, python-format
-msgid "adding %s (%s)\n"
-msgstr "%s を追加しています（%s）\n"
-
-#, python-format
msgid "transferred %s in %.1f seconds (%s/sec)\n"
msgstr "%s を %.1f 秒で送信しました（%s/秒）\n"
@@ -9940,14 +9763,6 @@
msgstr "管理ファイル一覧を解決しています\n"
#, python-format
-msgid " overwrite %s partial %s\n"
-msgstr " 上書き:%s, 対象限定:%s\n"
-
-#, python-format
-msgid " ancestor %s local %s remote %s\n"
-msgstr " 祖先 %s ローカル %s リモート %s\n"
-
-#, python-format
msgid ""
" local changed %s which remote deleted\n"
"use (c)hanged version or (d)elete?"
@@ -9961,9 +9776,6 @@
msgid "&Delete"
msgstr "&Delete"
-msgid "c"
-msgstr "c"
-
#, python-format
msgid ""
"remote changed %s which local deleted\n"
@@ -9976,10 +9788,6 @@
msgstr "&Deleted"
#, python-format
-msgid "preserving %s for resolve of %s\n"
-msgstr "%s の保存中(%s の衝突解消用)\n"
-
-#, python-format
msgid "update failed to remove %s: %s!\n"
msgstr "%s の削除に失敗: %s!\n"
@@ -10026,13 +9834,6 @@
msgstr "%s を作成できません: ディレクトリを作成できません"
#, python-format
-msgid "found patch at byte %d\n"
-msgstr "%d バイト目にパッチが見つかりました\n"
-
-msgid "patch generated by hg export\n"
-msgstr "hg export にてパッチを生成しました\n"
-
-#, python-format
msgid "unable to find '%s' for patching\n"
msgstr "パッチ適用対象の '%s' が不在です\n"
@@ -10102,9 +9903,9 @@
msgid "Unsupported line endings type: %s"
msgstr "未サポートの行末種別: %s"
-#, python-format
-msgid "no valid hunks found; trying with %r instead\n"
-msgstr "有効なハンクがありません: %r で再試行中\n"
+#, fuzzy, python-format
+msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
+msgstr "%d 個のファイル、%d 件のチェンジセット、合計 %d 件のリビジョン\n"
#, python-format
msgid "exited with status %d"
@@ -10115,13 +9916,6 @@
msgstr "%d のシグナルで強制終了しました"
#, python-format
-msgid "stopped by signal %d"
-msgstr "%d のシグナルで停止しました"
-
-msgid "invalid exit code"
-msgstr "終了コードが不正です"
-
-#, python-format
msgid "saving bundle to %s\n"
msgstr "バンドルを %s に保存中\n"
@@ -10192,12 +9986,12 @@
msgid "could not create remote repo"
msgstr "遠隔ホストとの連携に失敗"
+msgid "no suitable response from remote hg"
+msgstr "遠隔ホストの応答が不適切"
+
msgid "remote: "
msgstr "遠隔ホスト: "
-msgid "no suitable response from remote hg"
-msgstr "遠隔ホストの応答が不適切"
-
#, python-format
msgid "push refused: %s"
msgstr "履歴反映が拒否されました: %s"
@@ -10215,17 +10009,6 @@
msgid "invalid entry in fncache, line %s"
msgstr "ファイル名キャッシュに不正なエントリ: %s 行目"
-msgid "scanning\n"
-msgstr "走査中\n"
-
-#, python-format
-msgid "%d files, %d bytes to transfer\n"
-msgstr "%d 個のファイル、%d バイトの送信\n"
-
-#, python-format
-msgid "sending %s (%d bytes)\n"
-msgstr "%s の送信中(%d バイト)\n"
-
#, python-format
msgid ""
" subrepository sources for %s differ\n"
@@ -10235,9 +10018,6 @@
msgid "&Remote"
msgstr "&Remote"
-msgid "r"
-msgstr ""
-
#, python-format
msgid ""
" local changed subrepository %s which remote removed\n"
@@ -10266,6 +10046,17 @@
msgid "pushing subrepo %s\n"
msgstr "副リポジトリを %s へ反映中\n"
+#, python-format
+msgid "%s, line %s: %s\n"
+msgstr "%s %s行目: %s\n"
+
+msgid "cannot parse entry"
+msgstr "エントリを読み込めません"
+
+#, python-format
+msgid "node '%s' is not well formed"
+msgstr "'%s' というノードはフォーマットが不適切です"
+
msgid "unmatched quotes"
msgstr "引用符の対応関係が不正です"
@@ -10331,12 +10122,12 @@
msgid "username %s contains a newline\n"
msgstr "ユーザ名 %s は改行を含んでいます\n"
+msgid "response expected"
+msgstr "レスポンスがありません"
+
msgid "unrecognized response\n"
msgstr "認識できないレスポンス\n"
-msgid "response expected"
-msgstr "レスポンスがありません"
-
msgid "password: "
msgstr "パスワード: "
@@ -10365,10 +10156,6 @@
msgstr "HTTP 認証: ユーザ名 %s, パスワード %s\n"
#, python-format
-msgid "proxying through http://%s:%s\n"
-msgstr "プロキシ 'http://%s:%s' を経由しています\n"
-
-#, python-format
msgid "command '%s' failed: %s"
msgstr "コマンド '%s' 失敗: %s"
@@ -10565,12 +10352,16 @@
msgid "unpacking %s"
msgstr "%s の展開中"
+#, fuzzy, python-format
+msgid "warning: copy source of '%s' not in parents of %s"
+msgstr "警告: %s@%s: 複製元リビジョンが nullid %s:%s"
+
#, python-format
msgid "empty or missing copy source revlog %s:%s"
msgstr "複製元 revlog %s:%s は、空か見つかりません"
-#, python-format
-msgid "warning: %s@%s: copy source revision is nullid %s:%s"
+#, fuzzy, python-format
+msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"
msgstr "警告: %s@%s: 複製元リビジョンが nullid %s:%s"
#, python-format
@@ -10601,5 +10392,6 @@
msgid "(first damaged changeset appears to be %d)\n"
msgstr "(最初の不整合は %d の模様)\n"
+#, fuzzy
msgid "user name not available - set USERNAME environment variable"
msgstr "ユーザ名が利用できません - 環境変数 USERNAME を設定してください"