Mercurial > hg

changeset 20562:35ac807f941c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with i18n
author Matt Mackall <mpm@selenic.com>
date Mon, 24 Feb 2014 18:48:48 -0600
parents 5f683209f5b6 (current diff) 708009db9410 (diff)
children 0ad353831461 f1c3ba167b0c
files
diffstat 2 files changed, 74 insertions(+), 59 deletions(-) [+]
line wrap: on
line diff
--- a/i18n/ja.po	Wed Feb 19 13:11:24 2014 -0800
+++ b/i18n/ja.po	Mon Feb 24 18:48:48 2014 -0600
@@ -149,8 +149,8 @@
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2014-01-29 17:19+0900\n"
-"PO-Revision-Date: 2014-01-31 16:19+0900\n"
+"POT-Creation-Date: 2014-02-23 17:05+0900\n"
+"PO-Revision-Date: 2014-02-23 17:58+0900\n"
 "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n"
 "Language-Team: Japanese\n"
 "Language: ja\n"
@@ -2286,7 +2286,7 @@
 "    :convert.hg.clonebranches: dispatch source branches in separate\n"
 "        clones. The default is False."
 msgstr ""
-"    :convert.hg.clonebranches: 変換元ブランチの別複製への振り分けの要否。\n"
+"    :convert.hg.clonebranches: 変換元ブランチ毎に変換先リポジトリを作成。\n"
 "        デフォルト値は False。"
 
 msgid ""
@@ -2301,7 +2301,7 @@
 "        True.\n"
 "    "
 msgstr ""
-"    :convert.hg.usebranchnames: ブランチ名維持の要否。\n"
+"    :convert.hg.usebranchnames: 変換元におけるブランチ名の維持の要否。\n"
 "        デフォルト値は True。\n"
 "    "
 
@@ -8485,6 +8485,9 @@
 msgid "cannot use revision %d as base, result would have 3 parents"
 msgstr "親リビジョンが 3 つになるので、 リビジョン %d をベースにできません"
 
+msgid ".hg/rebasestate is incomplete"
+msgstr "管理情報 (.hg/rebasestate) が破損しています"
+
 msgid "no rebase in progress"
 msgstr "未完了な rebase による移動はありません"
 
@@ -17649,12 +17652,12 @@
 
 msgid ""
 "    [hostfingerprints]\n"
-"    hg.intevation.org = 44:ed:af:1f:97:11:b6:01:7a:48:45:fc:10:3c:b7:f9:"
-"d4:89:2a:9d"
+"    hg.intevation.org = fa:1f:d9:48:f1:e7:74:30:38:8d:d8:58:b6:94:"
+"b8:58:28:7d:8b:d0"
 msgstr ""
 "    [hostfingerprints]\n"
-"    hg.intevation.org = 44:ed:af:1f:97:11:b6:01:7a:48:45:fc:10:3c:b7:f9:"
-"d4:89:2a:9d"
+"    hg.intevation.org = fa:1f:d9:48:f1:e7:74:30:38:8d:d8:58:b6:94:"
+"b8:58:28:7d:8b:d0"
 
 msgid "This feature is only supported when using Python 2.6 or later."
 msgstr "本機能は、 Python 2.6 以降でのみ使用可能です。"
@@ -18079,31 +18082,38 @@
 "    新規作成されるリビジョンのフェーズ。\n"
 "    デフォルト値: draft"
 
-msgid "``checksubrepos``"
-msgstr "``checksubrepos``"
-
-msgid ""
-"    Check phase of state in each subrepositories, allowed values are\n"
-"    \"ignore\", \"follow\" or \"abort\". For settings other than \"ignore"
-"\",\n"
-"    the phase of each subrepository commit is checked before committing\n"
-"    in the parent repository. If there is any greater phase than the parent\n"
-"    (\"secret\" vs \"draft\", for example), the commit is either aborted\n"
-"    with \"abort\" or the higher phase is used with \"follow\". Default: "
-"\"follow\"."
-msgstr ""
-"    サブリポジトリのフェーズ確認の有無。\"ignore\"、 \"follow\" または\n"
+msgid ""
+"``checksubrepos``\n"
+"    Check the phase of the current revision of each subrepository. Allowed\n"
+"    values are \"ignore\", \"follow\" and \"abort\". For settings other "
+"than\n"
+"    \"ignore\", the phase of the current revision of each subrepository is\n"
+"    checked before committing the parent repository. If any of those phases "
+"is\n"
+"    greater than the phase of the parent repository (e.g. if a subrepo is in "
+"a\n"
+"    \"secret\" phase while the parent repo is in \"draft\" phase), the "
+"commit is\n"
+"    either aborted (if checksubrepos is set to \"abort\") or the higher "
+"phase is\n"
+"    used for the parent repository commit (if set to \"follow\").\n"
+"    Default: \"follow\""
+msgstr ""
+"``checksubrepos``\n"
+"    サブリポジトリのフェーズ確認の有無。 \"ignore\"、 \"follow\" または\n"
 "    \"abort\" が指定可能です。 \"ignore\" 以外が指定された場合、\n"
 "    親リポジトリのコミット前に、 サブリポジトリのフェーズを確認します。\n"
 "    親リポジトリ側フェーズよりも、サブリポジトリ側の公開度合が低い場合\n"
-"    (例: \"draft\" に対する \"secret\")、 \"abort\" ならコミット中断し、\n"
-"    \"follow\" ならコミット時にサブリポジトリ側フェーズ値に従います。    デ"
-"フォルト値: \"follow\""
-
-msgid ""
+"    (例: 親側の \"draft\" に対して、サブリポジトリ側が \"secret\")、\n"
+"    コミット中断 （\"abort\" 時）か、 サブリポジトリ側フェーズ値でコミット\n"
+"    （\"follow\" 時）します。 デフォルト値: \"follow\""
+
+msgid ""
+"\n"
 "``profiling``\n"
 "-------------"
 msgstr ""
+"\n"
 "``profiling``\n"
 "-------------"
 
@@ -21319,8 +21329,9 @@
 "  Please see :hg:`help patterns` for details."
 msgstr ""
 ".. note::\n"
-"  ``.hgignore`` 以外の記述では、 作業領域ルートからの相対パスに対して、\n"
-"  パス先頭からのパターン合致が要求されます。 詳細は :hg:`help patterns`\n"
+"  ``.hgignore`` 記述の場合、 作業領域ルートからの相対パスに対して、\n"
+"  途中要素の部分一致でも合致とみなされますが、 通常のパターン指定では、\n"
+"  相対パスの先頭からの合致が要求されます。 詳細は :hg:`help patterns`\n"
 "  を参照してください。"
 
 msgid ""
@@ -21864,15 +21875,13 @@
 
 msgid ""
 "All patterns, except for ``glob:`` specified in command line (not for\n"
-"``-I`` or ``-X`` options) or ``.hgignore`` file, can match also\n"
-"against directories: files under matched directories are treated as\n"
-"matched."
-msgstr ""
-"コマンドライン引数 (但し ``-I`` や ``-X`` 向けを除く) や ``.hgignore``\n"
-"ファイルでの ``glob:`` 形式以外のパターンは、 ディレクトリにも合致します:\n"
-"合致対象ディレクトリ配下のファイルも、 合致したのとみなされます。\n"
-"（※ 訳注: コマンドラインや ``.hgignore`` での ``glob:`` パターンは、\n"
-"ファイルにしか合致しません。 必要に応じて末尾 ``**`` 等を補ってください）"
+"``-I`` or ``-X`` options), can match also against directories: files\n"
+"under matched directories are treated as matched."
+msgstr ""
+"パターンはディレクトリにも合致します。 合致ディレクトリ配下のファイルも、\n"
+"パターンに合致したものとみなされます。但し（ ``-I`` や ``-X`` 向けを除く）\n"
+"コマンドライン引数での ``glob:`` 形式指定は、ファイルにしか合致しません。\n"
+"（※ 訳注: 必要に応じて末尾 ``**`` 等を補ってください）"
 
 msgid "Plain examples::"
 msgstr "パターン合致未使用例::"
--- a/i18n/pt_BR.po	Wed Feb 19 13:11:24 2014 -0800
+++ b/i18n/pt_BR.po	Mon Feb 24 18:48:48 2014 -0600
@@ -17978,10 +17978,10 @@
 
 msgid ""
 "    [hostfingerprints]\n"
-"    hg.intevation.org = 44:ed:af:1f:97:11:b6:01:7a:48:45:fc:10:3c:b7:f9:d4:89:2a:9d"
+"    hg.intevation.org = fa:1f:d9:48:f1:e7:74:30:38:8d:d8:58:b6:94:b8:58:28:7d:8b:d0"
 msgstr ""
 "    [hostfingerprints]\n"
-"    hg.intevation.org = 44:ed:af:1f:97:11:b6:01:7a:48:45:fc:10:3c:b7:f9:d4:89:2a:9d"
+"    hg.intevation.org = fa:1f:d9:48:f1:e7:74:30:38:8d:d8:58:b6:94:b8:58:28:7d:8b:d0"
 
 msgid "This feature is only supported when using Python 2.6 or later."
 msgstr ""
@@ -18414,30 +18414,36 @@
 "    Fase de revisões criadas usando commit.\n"
 "    Padrão: draft (rascunho)"
 
-msgid "``checksubrepos``"
-msgstr "``checksubrepos``"
-
-msgid ""
-"    Check phase of state in each subrepositories, allowed values are\n"
-"    \"ignore\", \"follow\" or \"abort\". For settings other than \"ignore\",\n"
-"    the phase of each subrepository commit is checked before committing\n"
-"    in the parent repository. If there is any greater phase than the parent\n"
-"    (\"secret\" vs \"draft\", for example), the commit is either aborted\n"
-"    with \"abort\" or the higher phase is used with \"follow\". Default: \"follow\"."
-msgstr ""
-"    Verifica a fase do estado de cada sub-repositório. Os valores\n"
+msgid ""
+"``checksubrepos``\n"
+"    Check the phase of the current revision of each subrepository. Allowed\n"
+"    values are \"ignore\", \"follow\" and \"abort\". For settings other than\n"
+"    \"ignore\", the phase of the current revision of each subrepository is\n"
+"    checked before committing the parent repository. If any of those phases is\n"
+"    greater than the phase of the parent repository (e.g. if a subrepo is in a\n"
+"    \"secret\" phase while the parent repo is in \"draft\" phase), the commit is\n"
+"    either aborted (if checksubrepos is set to \"abort\") or the higher phase is\n"
+"    used for the parent repository commit (if set to \"follow\").\n"
+"    Default: \"follow\""
+msgstr ""
+"``checksubrepos``\n"
+"    Verifica a fase da revisão atual de cada sub-repositório. Os valores\n"
 "    possíveis são \"ignore\", \"follow\" ou \"abort\". Para valores\n"
-"    diferentes de \"ignore\", a fase da consolidação de cada\n"
+"    diferentes de \"ignore\", a fase da revisão atual de cada\n"
 "    sub-repositório será verificada antes da consolidação no repositório\n"
-"    pai. Se houver qualquer fase maior que a do pai (\"secret\" versus\n"
-"    \"draft\", por exemplo), o valor \"abort\" faz com que a consolidação\n"
-"    seja abortada, e \"follow\" faz com que seja usada a fase mais\n"
-"    alta. O valor padrão é: \"follow\"."
-
-msgid ""
+"    pai. Se houver qualquer fase maior que a do pai (por exemplo, se um\n"
+"    sub-repositório estiver na fase \"secret\" e o repositório pai estiver\n"
+"    na fase \"draft\"), o valor \"abort\" faz com que a consolidação\n"
+"    seja abortada, e \"follow\" faz com que a fase mais alta seja usada\n"
+"    na consolidação do repositório pai.\n"
+"    O valor padrão é: \"follow\"."
+
+msgid ""
+"\n"
 "``profiling``\n"
 "-------------"
 msgstr ""
+"\n"
 "``profiling``\n"
 "-------------"