diff --git a/i18n/ja.po b/i18n/ja.po index 5f683209f5b6f012919a7c5e3bb37f8829146652_aTE4bi9qYS5wbw==..35ac807f941c514470de2c2708a5886f8b61f089_aTE4bi9qYS5wbw== 100644 --- a/i18n/ja.po +++ b/i18n/ja.po @@ -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,7 +17652,7 @@ 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" @@ -17654,7 +17657,7 @@ 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,20 +18082,25 @@ " æ–°è¦ä½œæˆã•ã‚Œã‚‹ãƒªãƒ“ジョンã®ãƒ•ã‚§ãƒ¼ã‚ºã€‚\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" @@ -18096,11 +18104,12 @@ " \"abort\" ãŒæŒ‡å®šå¯èƒ½ã§ã™ã€‚ \"ignore\" 以外ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€\n" " 親リãƒã‚¸ãƒˆãƒªã®ã‚³ãƒŸãƒƒãƒˆå‰ã«ã€ サブリãƒã‚¸ãƒˆãƒªã®ãƒ•ã‚§ãƒ¼ã‚ºã‚’確èªã—ã¾ã™ã€‚\n" " 親リãƒã‚¸ãƒˆãƒªå´ãƒ•ã‚§ãƒ¼ã‚ºã‚ˆã‚Šã‚‚ã€ã‚µãƒ–リãƒã‚¸ãƒˆãƒªå´ã®å…¬é–‹åº¦åˆãŒä½Žã„å ´åˆ\n" -" (例: \"draft\" ã«å¯¾ã™ã‚‹ \"secret\")〠\"abort\" ãªã‚‰ã‚³ãƒŸãƒƒãƒˆä¸æ–ã—ã€\n" -" \"follow\" ãªã‚‰ã‚³ãƒŸãƒƒãƒˆæ™‚ã«ã‚µãƒ–リãƒã‚¸ãƒˆãƒªå´ãƒ•ã‚§ãƒ¼ã‚ºå€¤ã«å¾“ã„ã¾ã™ã€‚ デ" -"フォルト値: \"follow\"" - -msgid "" +" (例: 親å´ã® \"draft\" ã«å¯¾ã—ã¦ã€ã‚µãƒ–リãƒã‚¸ãƒˆãƒªå´ãŒ \"secret\")ã€\n" +" コミットä¸æ– (\"abort\" 時)ã‹ã€ サブリãƒã‚¸ãƒˆãƒªå´ãƒ•ã‚§ãƒ¼ã‚ºå€¤ã§ã‚³ãƒŸãƒƒãƒˆ\n" +" (\"follow\" 時)ã—ã¾ã™ã€‚ デフォルト値: \"follow\"" + +msgid "" +"\n" "``profiling``\n" "-------------" msgstr "" @@ -18104,6 +18113,7 @@ "``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 "パターンåˆè‡´æœªä½¿ç”¨ä¾‹::" diff --git a/i18n/pt_BR.po b/i18n/pt_BR.po index 5f683209f5b6f012919a7c5e3bb37f8829146652_aTE4bi9wdF9CUi5wbw==..35ac807f941c514470de2c2708a5886f8b61f089_aTE4bi9wdF9CUi5wbw== 100644 --- a/i18n/pt_BR.po +++ b/i18n/pt_BR.po @@ -17978,6 +17978,6 @@ 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" @@ -17982,6 +17982,6 @@ 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,16 +18414,18 @@ " 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" @@ -18429,3 +18431,3 @@ " 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" @@ -18431,10 +18433,13 @@ " 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 "" @@ -18438,6 +18443,7 @@ "``profiling``\n" "-------------" msgstr "" +"\n" "``profiling``\n" "-------------"