diff --git a/i18n/ja.po b/i18n/ja.po index 17c030014ddf253c28daf88a00710093aa882a25_aTE4bi9qYS5wbw==..1aab870bbedfe0b173a4d8c5edaeb2ce5ddf6eff_aTE4bi9qYS5wbw== 100644 --- a/i18n/ja.po +++ b/i18n/ja.po @@ -29,6 +29,13 @@ # Distributed SCM 分散構æˆç®¡ç†ãƒ„ール # # abort ä¸æ– +# active +# guard +# "hg qguard" å´ ã‚¬ãƒ¼ãƒ‰è¨å®š(状æ³) +# "hg qselect" å´ ã‚¬ãƒ¼ãƒ‰é¸æŠž(状æ³) +# queue ä½¿ç”¨ä¸ +# bookmark アクティブ +# branch アクティブ # add (構æˆç®¡ç†ã¸ã®)è¿½åŠ ç™»éŒ² # alias 別å # amend 改変 (※ ã€Žç ´å£Šçš„ä¿®æ£ã€ã®ãƒ‹ãƒ¥ã‚¢ãƒ³ã‚¹) @@ -128,7 +135,7 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2012-09-28 15:58+0900\n" +"POT-Creation-Date: 2012-10-31 18:16+0900\n" "PO-Revision-Date: 2009-11-16 21:24+0100\n" "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" @@ -677,7 +684,7 @@ "email to the Bugzilla email interface to submit comments to bugs.\n" "The From: address in the email is set to the email address of the Mercurial\n" "user, so the comment appears to come from the Mercurial user. In the event\n" -"that the Mercurial user email is not recognised by Bugzilla as a Bugzilla\n" +"that the Mercurial user email is not recognized by Bugzilla as a Bugzilla\n" "user, the email associated with the Bugzilla username used to log into\n" "Bugzilla is used instead as the source of the comment. Marking bugs fixed\n" "works on all supported Bugzilla versions." @@ -695,7 +702,7 @@ msgid "" "bugzilla.version\n" -" This access type to use. Values recognised are:" +" The access type to use. Values recognized are:" msgstr "" "bugzilla.version\n" " 連æºæ–¹å¼ã®é¸æŠžã€‚ 指定å¯èƒ½ãªå€¤ã¯ä»¥ä¸‹ã®é€šã‚Š:" @@ -1763,7 +1770,7 @@ msgid "" " The authormap is a simple text file that maps each source commit\n" " author to a destination commit author. It is handy for source SCMs\n" -" that use unix logins to identify authors (eg: CVS). One line per\n" +" that use unix logins to identify authors (e.g.: CVS). One line per\n" " author mapping and the line format is::" msgstr "" " authormap ã¯ã€ 変æ›å…ƒã¨å¤‰æ›å…ˆã®é–“ã§ã€ コミットã®ãƒ¦ãƒ¼ã‚¶åを変æ›ã—ã¾ã™ã€‚\n" @@ -3590,7 +3597,7 @@ " # 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" +" # You can use mailto: URLs to send by email, e.g.\n" " # mailto:cia@cia.vc\n" " # Make sure to set email.from if you do this.\n" " #url = http://cia.vc/\n" @@ -4128,16 +4135,6 @@ " # m, mess = 改変内容をç¶æŒã—ã¤ã¤ã€ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã‚’ä¿®æ£\n" " #\n" -msgid "cannot edit history that would orphan nodes" -msgstr "å±¥æ´ãƒ„リーãŒåˆ†æ–ã•ã‚Œã‚‹ã‚ˆã†ãªå±¥æ´æ”¹å¤‰ã¯ã§ãã¾ã›ã‚“" - -msgid "can't edit history with merges" -msgstr "マージã«é–¢ã‚ã‚‹å±¥æ´ã®æ”¹å¤‰ã¯ã§ãã¾ã›ã‚“" - -#, python-format -msgid "%s: empty changeset" -msgstr "%s: 空ã®ãƒªãƒ“ジョン" - msgid "Fix up the change and run hg histedit --continue" msgstr "è¡çªè§£æ¶ˆå¾Œã« \"hg histedit --continue\" ã—ã¦ãã ã•ã„" @@ -4141,6 +4138,10 @@ msgid "Fix up the change and run hg histedit --continue" msgstr "è¡çªè§£æ¶ˆå¾Œã« \"hg histedit --continue\" ã—ã¦ãã ã•ã„" +#, python-format +msgid "%s: empty changeset\n" +msgstr "%s: 空ã®ãƒªãƒ“ジョン\n" + msgid "" "Make changes as needed, you may commit or record as needed now.\n" "When you are finished, run hg histedit --continue to resume." @@ -4148,6 +4149,10 @@ "å¿…è¦ã«å¿œã˜ã¦å¤‰æ›´ï¼è¨˜éŒ²ã‚’è¡Œã£ã¦ãã ã•ã„。 作æ¥ãŒå®Œäº†ã—ãŸãªã‚‰ã°ã€\n" "改変å†é–‹ã®ãŸã‚ã« hg histedit --continue を実行ã—ã¦ãã ã•ã„。" +#, python-format +msgid "%s: empty changeset" +msgstr "%s: 空ã®ãƒªãƒ“ジョン" + msgid "Read history edits from the specified file." msgstr "å±¥æ´æ”¹å¤‰æ‰‹é †ã‚’指定ファイルã‹ã‚‰èªã¿è¾¼ã¿" @@ -4204,16 +4209,24 @@ msgid "histedit requires exactly one parent revision" msgstr "å±¥æ´æ”¹å¤‰ã«ã¯å˜ä¸€ã®è¦ªãƒªãƒ“ジョンを指定ã—ã¦ãã ã•ã„" -msgid "histedit: Should update metadata for the following changes:\n" -msgstr "histedit: 以下ã®ãƒªãƒ“ジョンã®ãŸã‚ã«ãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿ã®æ›´æ–°ãŒå¿…è¦ã§ã™:\n" - -#, python-format -msgid "histedit: %s to %s\n" -msgstr "histedit: %s ã‹ã‚‰ %s ã¸\n" - -#, python-format -msgid "histedit: moving bookmarks %s\n" -msgstr "histedit: ブックマーク %s ã®ç§»å‹•ä¸\n" +msgid "nothing to edit\n" +msgstr "改変ã®å¿…è¦ãªãƒªãƒ“ジョンãŒã‚ã‚Šã¾ã›ã‚“\n" + +#, python-format +msgid "working directory parent is not a descendant of %s" +msgstr "作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョン㯠%s ã®åå«ã§ã¯ã‚ã‚Šã¾ã›ã‚“" + +#, python-format +msgid "update to %s or descendant and run \"hg histedit --continue\" again" +msgstr "" +"%s ã‹ãã®åå«ã§ä½œæ¥é ˜åŸŸæ›´æ–°å¾Œã« \"hg histedit --continue\" ã—ã¦ãã ã•ã„" + +msgid "cannot edit history that would orphan nodes" +msgstr "å±¥æ´ãƒ„リーãŒåˆ†æ–ã•ã‚Œã‚‹ã‚ˆã†ãªå±¥æ´æ”¹å¤‰ã¯ã§ãã¾ã›ã‚“" + +#, python-format +msgid "cannot edit immutable changeset: %s" +msgstr "改変ä¸èƒ½ãªãƒªãƒ“ジョンãŒã‚ã‚Šã¾ã™: %s" msgid "must specify a rule for each changeset once" msgstr "1リビジョン毎ã«ï¼‘ã¤ã®ãƒ«ãƒ¼ãƒ«æŒ‡å®šãŒå¿…è¦ã§ã™" @@ -4233,6 +4246,10 @@ msgid "unknown action \"%s\"" msgstr "未知ã®æ“作 \"%s\" ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" +#, python-format +msgid "histedit: moving bookmarks %s from %s to %s\n" +msgstr "histedit: ブックマーク %s ã‚’ %s ã‹ã‚‰ %s ã«ç§»å‹•ä¸\n" + msgid "accelerate status report using Linux's inotify service" msgstr "Linux ã® inoitfy サービスã«ã‚ˆã‚‹çŠ¶æ…‹å ±å‘Šã®é«˜é€ŸåŒ–" @@ -5010,6 +5027,10 @@ msgstr "リビジョンã®å¤‰æ›ä¸" #, python-format +msgid "missing largefile '%s' from revision %s" +msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ« '%s' (リビジョン %s ç”±æ¥) ãŒã‚ã‚Šã¾ã›ã‚“" + +#, python-format msgid "renamed/copied largefile %s becomes symlink" msgstr "改åï¼è¤‡è£½å¯¾è±¡ã®å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ« %s ãŒã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯åŒ–ã•ã‚Œã¦ã„ã¾ã™" @@ -5219,6 +5240,9 @@ msgid "largefiles: No remote repo\n" msgstr "largefiles: 連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“\n" +msgid "largefiles: no files to upload\n" +msgstr "largefiles: 転é€äºˆå®šãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“\n" + msgid "largefiles to upload:\n" msgstr "転é€äºˆå®šå¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«:\n" @@ -5222,5 +5246,8 @@ msgid "largefiles to upload:\n" msgstr "転é€äºˆå®šå¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«:\n" +msgid "largefiles: (no files to upload)\n" +msgstr "largefiles : (転é€äºˆå®šãƒ•ã‚¡ã‚¤ãƒ«ãªã—)\n" + #, python-format msgid "largefiles: %d to upload\n" @@ -5225,6 +5252,6 @@ #, python-format msgid "largefiles: %d to upload\n" -msgstr "largefiles: 転é€äºˆå®šãƒ•ã‚¡ã‚¤ãƒ«æ•° %d\n" +msgstr "largefiles : 転é€äºˆå®šãƒ•ã‚¡ã‚¤ãƒ«æ•° %d\n" msgid "largefile contents do not match hash" msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®å†…容ãŒæƒ³å®šãƒãƒƒã‚·ãƒ¥å€¤ã¨ä¸€è‡´ã—ã¾ã›ã‚“" @@ -6399,8 +6426,8 @@ " With no arguments, print the currently active guards.\n" " With arguments, set guards for the named patch." msgstr "" -" 引数指定ãŒç„¡ã„å ´åˆã€ ç¾åœ¨ã®ã‚¬ãƒ¼ãƒ‰é¸æŠžçŠ¶æ³ã‚’表示ã—ã¾ã™ã€‚\n" -" 引数ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定パッãƒã«å¯¾ã™ã‚‹ã‚¬ãƒ¼ãƒ‰é¸æŠžã‚’è¨å®šã—ã¾ã™ã€‚" +" 引数指定ãŒç„¡ã„å ´åˆã€ ç¾åœ¨ã®ã‚¬ãƒ¼ãƒ‰è¨å®šã‚’表示ã—ã¾ã™ã€‚\n" +" 引数ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定パッãƒã«å¯¾ã—ã¦ã‚¬ãƒ¼ãƒ‰ã‚’è¨å®šã—ã¾ã™ã€‚" msgid "" " .. note::\n" @@ -6726,11 +6753,11 @@ " With no arguments, prints the currently active guards.\n" " With one argument, sets the active guard." msgstr "" -" 本コマンドãŒå¼•æ•°ç„¡ã—ã§å®Ÿè¡Œã•ã‚ŒãŸå ´åˆã€ ç¾åœ¨ã®ã‚¬ãƒ¼ãƒ‰é¸æŠžçŠ¶æ³ã‚’表示\n" -" ã—ã¾ã™ã€‚ 引数ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ガードé¸æŠžã‚’è¨å®šã—ã¾ã™ã€‚" +" 引数指定ãŒç„¡ã„å ´åˆã€ ç¾åœ¨ã®ã‚¬ãƒ¼ãƒ‰é¸æŠžçŠ¶æ³ã‚’表示ã—ã¾ã™ã€‚\n" +" 引数ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ガードé¸æŠžã‚’è¨å®šã—ã¾ã™ã€‚" msgid "" " Use -n/--none to deactivate guards (no other arguments needed).\n" " When no guards are active, patches with positive guards are\n" " skipped and patches with negative guards are pushed." msgstr "" @@ -6731,13 +6758,13 @@ msgid "" " Use -n/--none to deactivate guards (no other arguments needed).\n" " When no guards are active, patches with positive guards are\n" " skipped and patches with negative guards are pushed." msgstr "" -" -n/--none を指定ã™ã‚‹ã“ã¨ã§ã€ ガードé¸æŠžã‚’無効化ã—ã¾ã™(ä»–ã®å¼•æ•°ã¯å¿…è¦\n" -" ã‚ã‚Šã¾ã›ã‚“)。 ã„ãšã‚Œã®ã‚¬ãƒ¼ãƒ‰ã‚‚é¸æŠžã•ã‚Œã¦ã„ãªã„å ´åˆã€ 「æ£ã€ã®ã‚¬ãƒ¼ãƒ‰ãŒ\n" -" è¨å®šã•ã‚ŒãŸãƒ‘ッãƒã®é©ç”¨ã¯è¦‹é€ã‚‰ã‚Œã¾ã™ãŒã€ ã€Œè² ã€ã®ã‚¬ãƒ¼ãƒ‰ãŒè¨å®šã•ã‚ŒãŸ\n" -" パッãƒã¯é©ç”¨ã•ã‚Œã¾ã™ã€‚" +" -n/--none を指定ã™ã‚‹ã“ã¨ã§ã€ å…¨ã¦ã®ã‚¬ãƒ¼ãƒ‰é¸æŠžã‚’無効化ã—ã¾ã™\n" +" (ä»–ã®å¼•æ•°ã¯å¿…è¦ã‚ã‚Šã¾ã›ã‚“)。 ガードãŒå…¨ãé¸æŠžã•ã‚Œã¦ã„ãªã„å ´åˆã€\n" +" 「æ£ã€ã®ã‚¬ãƒ¼ãƒ‰ãŒè¨å®šã•ã‚ŒãŸãƒ‘ッãƒã¯é©ç”¨ã•ã‚Œã¾ã›ã‚“ãŒã€\n" +" ã€Œè² ã€ã®ã‚¬ãƒ¼ãƒ‰ãŒè¨å®šã•ã‚ŒãŸãƒ‘ッãƒã¯é©ç”¨ã•ã‚Œã¾ã™ã€‚" msgid "" " qselect can change the guards on applied patches. It does not pop\n" @@ -6835,9 +6862,9 @@ msgstr "有効ãªã‚ューã®ä¸€è¦§è¡¨ç¤º" msgid "print name of active queue" -msgstr "アクティブãªã‚ューåã®è¡¨ç¤º" +msgstr "使用ä¸ã®ã‚ューåã®è¡¨ç¤º" msgid "create new queue" msgstr "æ–°è¦ã‚ューã®ä½œæˆ" msgid "rename active queue" @@ -6839,9 +6866,9 @@ msgid "create new queue" msgstr "æ–°è¦ã‚ューã®ä½œæˆ" msgid "rename active queue" -msgstr "ç¾è¡Œã‚ューã®æ”¹å" +msgstr "使用ä¸ã®ã‚ューã®æ”¹å" msgid "delete reference to queue" msgstr "ã‚ューã¸ã®å‚ç…§ã®å‰Šé™¤" @@ -6871,11 +6898,10 @@ "print\n" " only the name of the active queue." msgstr "" -" ã‚ューå称を指定ã—ãªã„ã‹ã€ -l/--list ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 登録済ã¿ã®\n" -" ã‚ューã®ä¸€è¦§ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ - 通常㯠\"normal\" パッãƒã‚ューãŒç™»éŒ²\n" -" 済ã¿ã§ã™ã€‚ 当該時点ã§ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚ューã«ã¯ \"(アクティブ)\" ãŒè¡¨ç¤º\n" -" ã•ã‚Œã¾ã™ã€‚ --active ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 表示対象ã¨ãªã‚‹ã‚ューã¯ã€\n" -" アクティブãªã‚ューã®ã¿ã§ã™" +" ã‚ューå称ã®æŒ‡å®šãŒç„¡ã„ã‹ã€ -l/--list ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€\n" +" 登録済ã¿ã‚ューãŒä¸€è¦§è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ 通常㯠\"patches\" ãŒç™»éŒ²æ¸ˆã¿ã§ã™ã€‚\n" +" 実行時点ã§ä½¿ç”¨ä¸ã®ã‚ューã«ã¯ \"(使用ä¸)\" ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n" +" --active ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã€ 使用ä¸ã®ã‚ューã®ã¿ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚" msgid "" " To create a new queue, use -c/--create. The queue is automatically made\n" @@ -6883,10 +6909,10 @@ " currently active queue in the repository. Then the queue will only be\n" " created and switching will fail." msgstr "" -" -c/--create ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ æ–°è¦ã‚ューを作æˆã—ã¾ã™ã€‚ 当該時点ã§\n" -" アクティブãªã‚ューã‹ã‚‰ãƒ‘ッãƒãŒé©ç”¨ä¸ã®å ´åˆã‚’除ã〠新è¦ä½œæˆã•ã‚ŒãŸ\n" -" ã‚ューãŒè‡ªå‹•çš„ã«ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚ューã¨ãªã‚Šã¾ã™ã€‚ ã“ã®å ´åˆã€\n" -" æ–°è¦ã‚ューã¯ç”Ÿæˆã•ã‚Œã¾ã™ãŒã‚ューã®åˆ‡ã‚Šæ›¿ãˆã¯å®Ÿæ–½ã•ã‚Œã¾ã›ã‚“。" +" æ–°è¦ã‚ューã®ä½œæˆã«ã¯ -c/--create を指定ã—ã¾ã™ã€‚ æ–°è¦ä½œæˆã‚ューã¯ã€\n" +" 自動的ã«ä½¿ç”¨ã‚ューã¨ãªã‚Šã¾ã™ã€‚ ãŸã ã—〠新è¦ã‚ューã®ä½œæˆæ™‚点ã§ã€\n" +" æ—¢å˜ã®ã‚ューã‹ã‚‰ãƒ‘ッãƒãŒé©ç”¨ä¸ã®å ´åˆã¯ã€ æ–°è¦ã‚ューã¯ä½œæˆã•ã‚Œã¾ã™ãŒã€\n" +" 使用ã‚ューã®åˆ‡ã‚Šæ›¿ãˆã¯å®Ÿæ–½ã•ã‚Œã¾ã›ã‚“。" msgid "" " To delete an existing queue, use --delete. You cannot delete the " @@ -6894,12 +6920,12 @@ " active queue." msgstr "" " --delete ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ æ—¢å˜ã®ã‚ューを削除ã—ã¾ã™ã€‚\n" -" 当該時点ã§ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚ューã¯å‰Šé™¤ã§ãã¾ã›ã‚“。" - -msgid "patches applied - cannot set new queue active" -msgstr "パッãƒé©ç”¨ä¸ - æ–°è¦ã‚ューã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã«ã§ãã¾ã›ã‚“" +" ãã®æ™‚点ã§ä½¿ç”¨ä¸ã®ã‚ューã¯å‰Šé™¤ã§ãã¾ã›ã‚“。" + +msgid "new queue created, but cannot make active as patches are applied" +msgstr "パッãƒé©ç”¨ä¸ã«ã¤ã使用ã‚ューã¯åˆ‡ã‚Šæ›¿ãˆã¾ã›ã‚“(æ–°è¦ã‚ューã¯ç”Ÿæˆæ¸ˆã¿)" msgid "cannot delete queue that does not exist" msgstr "å˜åœ¨ã—ãªã„ã‚ューã¯å‰Šé™¤ã§ãã¾ã›ã‚“" msgid "cannot delete currently active queue" @@ -6901,8 +6927,8 @@ msgid "cannot delete queue that does not exist" msgstr "å˜åœ¨ã—ãªã„ã‚ューã¯å‰Šé™¤ã§ãã¾ã›ã‚“" msgid "cannot delete currently active queue" -msgstr "ç¾æ™‚点ã§ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚ューã¯å‰Šé™¤ã§ãã¾ã›ã‚“" +msgstr "ç¾æ™‚点ã§ä½¿ç”¨ä¸ã®ã‚ューã¯å‰Šé™¤ã§ãã¾ã›ã‚“" msgid " (active)\n" @@ -6907,6 +6933,6 @@ msgid " (active)\n" -msgstr " (アクティブ)\n" +msgstr " (使用ä¸)\n" msgid "invalid queue name, may not contain the characters \":\\/.\"" msgstr "\":\\/.\" ã‚’å«ã‚€ä¸æ£ãªã‚ューå称ã§ã™" @@ -6951,7 +6977,7 @@ #, python-format msgid "%d applied" -msgstr "é©ç”¨ãƒ‘ッãƒæ•° %d" +msgstr "é©ç”¨ãƒ‘ッãƒæ•° %d" #, python-format msgid "%d unapplied" @@ -6955,7 +6981,7 @@ #, python-format msgid "%d unapplied" -msgstr "未é©ç”¨ãƒ‘ッãƒæ•° %d" +msgstr "未é©ç”¨ãƒ‘ッãƒæ•° %d" msgid "mq: (empty queue)\n" msgstr "mq: (空ã‚ュー)\n" @@ -7027,9 +7053,9 @@ msgid "" " [usersubs]\n" -" # key is subscriber email, value is a comma-separated list of repo glob\n" -" # patterns\n" +" # key is subscriber email, value is a comma-separated list of repo " +"patterns\n" " user@host = pattern" msgstr "" " [usersubs]\n" " # 左辺ã«ã¯é€ä¿¡å…ˆãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã€å³è¾ºã«ã¯ã‚«ãƒ³ãƒžåŒºåˆ‡ã‚Šã®\n" @@ -7032,9 +7058,9 @@ " user@host = pattern" msgstr "" " [usersubs]\n" " # 左辺ã«ã¯é€ä¿¡å…ˆãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã€å³è¾ºã«ã¯ã‚«ãƒ³ãƒžåŒºåˆ‡ã‚Šã®\n" -" # リãƒã‚¸ãƒˆãƒªåˆè‡´(glob)パターンを記述ã—ã¦ãã ã•ã„\n" +" # リãƒã‚¸ãƒˆãƒªåˆè‡´åˆ¤å®šãƒ‘ターンを記述ã—ã¦ãã ã•ã„\n" " user@host = pattern" msgid "" " [reposubs]\n" @@ -7037,7 +7063,11 @@ " user@host = pattern" msgid "" " [reposubs]\n" -" # key is glob pattern, value is a comma-separated list of subscriber\n" -" # emails\n" +" # key is repo pattern, value is a comma-separated list of subscriber " +"emails\n" +" pattern = user@host" +msgstr "" +" # 左辺ã«ã¯ãƒªãƒã‚¸ãƒˆãƒªã®åˆè‡´åˆ¤å®šãƒ‘ターンã€å³è¾ºã«ã¯ã‚«ãƒ³ãƒžåŒºåˆ‡ã‚Šã®\n" +" # é€ä¿¡å…ˆãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’記述ã—ã¦ãã ã•ã„\n" " pattern = user@host" @@ -7043,13 +7073,28 @@ " pattern = user@host" -msgstr "" -" # 左辺ã«ã¯åˆè‡´ãƒ‘ターンã€å³è¾ºã«ã¯ã‚«ãƒ³ãƒžåŒºåˆ‡ã‚Šã®é€ä¿¡å…ˆãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’\n" -" # 記述ã—ã¦ãã ã•ã„\n" -" pattern = user@host" - -msgid "" -"Glob patterns are matched against absolute path to repository\n" -"root." -msgstr "åˆè‡´ãƒ‘ターンã®é©ç”¨å¯¾è±¡ã¯ã€ リãƒã‚¸ãƒˆãƒªãƒ«ãƒ¼ãƒˆã®çµ¶å¯¾ãƒ‘スã§ã™ã€‚" + +msgid "" +"A ``pattern`` is a ``glob`` matching the absolute path to a repository,\n" +"optionally combined with a revset expression. A revset expression, if\n" +"present, is separated from the glob by a hash. Example::" +msgstr "" +"``pattern`` 指定ã¯ã€ リãƒã‚¸ãƒˆãƒªã®çµ¶å¯¾ãƒ‘スã«å¯¾ã™ã‚‹ ``glob`` åˆè‡´åˆ¤å®šã§ã€\n" +"revset 表記ã¨çµ„ã¿åˆã‚ã›ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ revset 表記を記述ã™ã‚‹å ´åˆã¯ã€\n" +"``glob`` パターンã¨ãƒãƒƒã‚·ãƒ¥è¨˜å· (``#``) ã§åŒºåˆ‡ã‚Šã¾ã™ã€‚記述例::" + +msgid "" +" [reposubs]\n" +" */widgets#branch(release) = qa-team@example.com" +msgstr "" +" [reposubs]\n" +" */widgets#branch(release) = qa-team@example.com" + +msgid "" +"This sends to ``qa-team@example.com`` whenever a changeset on the " +"``release``\n" +"branch triggers a notification in any repository ending in ``widgets``." +msgstr "" +"ã“ã®è¨å®šä¾‹ã§ã¯ã€ ``widgets`` ã§çµ‚ã‚るリãƒã‚¸ãƒˆãƒªã® ``release``\n" +"ブランãƒã¸ã®å¤‰æ›´ã‚’契機㫠``qa-team@example.com`` ã¸ã®é€šçŸ¥ãŒå®Ÿæ–½ã•ã‚Œã¾ã™ã€‚" msgid "" "In order to place them under direct user management, ``[usersubs]`` and\n" @@ -7554,7 +7599,7 @@ msgstr " 最後ã®éƒ¨ä½ã«ã¯ :hg:`export` ãŒç”Ÿæˆã™ã‚‹å·®åˆ†ãŒé…ç½®ã•ã‚Œã¾ã™ã€‚" msgid "" -" With the -d/--diffstat or -c/--confirm options, you will be presented\n" +" With the -d/--diffstat or --confirm options, you will be presented\n" " with a final summary of all messages and asked for confirmation before\n" " the messages are sent." msgstr "" @@ -7558,7 +7603,7 @@ " with a final summary of all messages and asked for confirmation before\n" " the messages are sent." msgstr "" -" -d/--diffstat ãªã„ã— -c/--confirm ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€\n" +" -d/--diffstat ãªã„ã— --confirm ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€\n" " メッセージã®é€ä¿¡ã«å…ˆç«‹ã£ã¦ã€ 全メッセージã®ã¾ã¨ã‚ã‚’ä¼´ã£ã¦ã€\n" " 確èªã®å•ã„åˆã‚ã›ãŒã‚ã‚Šã¾ã™ã€‚" @@ -8155,9 +8200,6 @@ msgid "rebase merging completed\n" msgstr "移動ã®ãƒžãƒ¼ã‚¸å‡¦ç†ãŒå®Œäº†\n" -msgid "warning: new changesets detected on source branch, not stripping\n" -msgstr "è¦å‘Š: 移動元ã«æ–°è¦ãƒªãƒ“ジョンを検出ã—ãŸã®ã§ã€ ç ´æ£„ã—ã¾ã›ã‚“\n" - msgid "rebase completed\n" msgstr "移動完了\n" @@ -8197,6 +8239,9 @@ msgid "source is ancestor of destination" msgstr "移動元ã¯ç§»å‹•å…ˆã®ç¥–å…ˆã§ã™" +msgid "warning: new changesets detected on source branch, not stripping\n" +msgstr "è¦å‘Š: 移動元ã«æ–°è¦ãƒªãƒ“ジョンを検出ã—ãŸã®ã§ã€ ç ´æ£„ã—ã¾ã›ã‚“\n" + #, python-format msgid "updating bookmark %s\n" msgstr "ブックマーク %s ã®æ›´æ–°ä¸\n" @@ -8305,12 +8350,12 @@ msgstr " 㨠" #, python-format -msgid "record this change to %r?" -msgstr "ã“ã®å¤‰æ›´ã‚’ %r ã«è¨˜éŒ²ã—ã¾ã™ã‹ï¼Ÿ" - -#, python-format -msgid "record change %d/%d to %r?" -msgstr "ã“ã®å¤‰æ›´ (%d 件目 / %d 件ä¸) ã‚’ %r ã«è¨˜éŒ²ã—ã¾ã™ã‹ï¼Ÿ" +msgid "record this change to '%s'?" +msgstr "ã“ã®å¤‰æ›´ã‚’ '%s' ã«è¨˜éŒ²ã—ã¾ã™ã‹ï¼Ÿ" + +#, python-format +msgid "record change %d/%d to '%s'?" +msgstr "ã“ã®å¤‰æ›´ (%d 件目 / %d 件ä¸) ã‚’ '%s' ã«è¨˜éŒ²ã—ã¾ã™ã‹ï¼Ÿ" msgid "hg record [OPTION]... [FILE]..." msgstr "hg record [OPTION]... [FILE]..." @@ -9148,10 +9193,6 @@ msgstr "ä¸æ£ãª .hg/bookmarks 記述行: %r\n" #, python-format -msgid "bookmark '%s' contains illegal character" -msgstr "ブックマーク '%s' ã¯ä¸æ£ãªæ–‡å—ã‚’å«ã‚“ã§ã„ã¾ã™" - -#, python-format msgid "branch %s not found" msgstr "ブランム%s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" @@ -9195,6 +9236,9 @@ msgid "%s: unknown bundle version %s" msgstr "%s: 未知ã®ãƒãƒ³ãƒ‰ãƒ«å½¢å¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s" +msgid "no node" +msgstr "ノードãŒã‚ã‚Šã¾ã›ã‚“" + msgid "empty username" msgstr "ユーザåãŒç©ºã§ã™" @@ -10070,7 +10114,7 @@ " hg bisect --bad" msgid "" -" - mark the current revision, or a known revision, to be skipped (eg. " +" - mark the current revision, or a known revision, to be skipped (e.g. " "if\n" " that revision is not usable because of another issue)::" msgstr "" @@ -10267,6 +10311,6 @@ " current active bookmark will be marked inactive.\n" " " msgstr "" -" -i/--inactive 指定ã®ã‚ã‚‹å ´åˆã¯ã€ 作æˆã•ã‚ŒãŸæ–°è¦ãƒ–ックマークã¯ã€\n" -" アクティブã«ã¯ãªã‚Šã¾ã›ã‚“。 -r/--rev 指定ã®ã‚ã‚‹å ´åˆã¯ã€ -i/--inactive\n" +" -i/--inactive 指定ã®ã‚ã‚‹å ´åˆã€ 作æˆã•ã‚ŒãŸæ–°è¦ãƒ–ックマークã¯ã€\n" +" アクティブã«ã¯ãªã‚Šã¾ã›ã‚“。 -r/--rev 指定ã®ã‚ã‚‹å ´åˆã€ -i/--inactive\n" " 指定ãŒç„¡ãã¦ã‚‚〠新è¦ãƒ–ックマークã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã«ãªã‚Šã¾ã›ã‚“。\n" @@ -10272,6 +10316,26 @@ " 指定ãŒç„¡ãã¦ã‚‚〠新è¦ãƒ–ックマークã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã«ãªã‚Šã¾ã›ã‚“。\n" -" ブックマークå指定ãŒç„¡ã„å ´åˆã€ ç¾ãƒ–ックマークãŒéžã‚¢ã‚¯ãƒ†ã‚£ãƒ–化ã•ã‚Œã¾ã™ã€‚\n" -" " +" -i/--inactive 指定時ã«ã€ ブックマークå指定ãŒç„¡ã„å ´åˆã¯ã€\n" +" ç¾åœ¨ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªãƒ–ックマークãŒã€ éžã‚¢ã‚¯ãƒ†ã‚£ãƒ–化ã•ã‚Œã¾ã™ã€‚\n" +" " + +msgid "bookmark names cannot consist entirely of whitespace" +msgstr "空白文å—ã ã‘ã§æ§‹æˆã•ã‚ŒãŸã‚¿ã‚°åã¯ä¸æ£ã§ã™" + +#, python-format +msgid "bookmark '%s' already exists (use -f to force)" +msgstr "ブックマーク '%s' ã¯å˜åœ¨ã—ã¾ã™(強制実行ã™ã‚‹å ´åˆã¯ -f を指定)" + +msgid "a bookmark cannot have the name of an existing branch" +msgstr "æ—¢å˜ãƒ–ランãƒã¨åŒåã®ãƒ–ックマークã¯ä½œæˆã§ãã¾ã›ã‚“" + +msgid "--delete and --rename are incompatible" +msgstr "--delete 㨠--rename ã¯ä½µç”¨ã§ãã¾ã›ã‚“" + +msgid "--rev is incompatible with --delete" +msgstr "--rev 㨠--delete ã¯ä½µç”¨ã§ãã¾ã›ã‚“" + +msgid "--rev is incompatible with --rename" +msgstr "--rev 㨠--rename ã¯ä½µç”¨ã§ãã¾ã›ã‚“" msgid "bookmark name required" msgstr "ブックマークåã‚’è¦æ±‚ã—ã¾ã—ãŸ" @@ -10280,10 +10344,6 @@ msgid "bookmark '%s' does not exist" msgstr "ブックマーク '%s' ã¯å˜åœ¨ã—ã¾ã›ã‚“" -#, python-format -msgid "bookmark '%s' already exists (use -f to force)" -msgstr "ブックマーク '%s' ã¯å˜åœ¨ã—ã¾ã™(強制実行ã™ã‚‹å ´åˆã¯ -f を指定)" - msgid "new bookmark name required" msgstr "æ–°ã—ã„ブックマークåã‚’è¦æ±‚ã—ã¾ã—ãŸ" @@ -10287,15 +10347,6 @@ msgid "new bookmark name required" msgstr "æ–°ã—ã„ブックマークåã‚’è¦æ±‚ã—ã¾ã—ãŸ" -msgid "bookmark name cannot contain newlines" -msgstr "ブックマークåã«æ”¹è¡Œã‚’å«ã‚ã¾ã›ã‚“" - -msgid "bookmark names cannot consist entirely of whitespace" -msgstr "空白文å—ã ã‘ã§æ§‹æˆã•ã‚ŒãŸã‚¿ã‚°åã¯ä¸æ£ã§ã™" - -msgid "a bookmark cannot have the name of an existing branch" -msgstr "æ—¢å˜ãƒ–ランãƒã¨åŒåã®ãƒ–ックマークã¯ä½œæˆã§ãã¾ã›ã‚“" - msgid "no bookmarks set\n" msgstr "ブックマークã¯å˜åœ¨ã—ã¾ã›ã‚“\n" @@ -10299,6 +10350,9 @@ msgid "no bookmarks set\n" msgstr "ブックマークã¯å˜åœ¨ã—ã¾ã›ã‚“\n" +msgid "no active bookmark\n" +msgstr "アクティブãªãƒ–ックマークãŒã‚ã‚Šã¾ã›ã‚“\n" + msgid "set branch name even if it shadows an existing branch" msgstr "åŒåæ—¢å˜ãƒ–ランãƒãŒå˜åœ¨ã™ã‚‹å ´åˆã§ã‚‚ブランãƒä½œæˆã‚’実施" @@ -10403,8 +10457,8 @@ " If -a/--active is specified, only show active branches. A branch\n" " is considered active if it contains repository heads." msgstr "" -" -a/--active 指定時ã«ã¯ã€ 活性(active)ブランãƒã®ã¿ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n" -" リãƒã‚¸ãƒˆãƒªä¸ã«ãƒ˜ãƒƒãƒ‰ã‚’æŒã¤ã‚‚ã®ãŒæ´»æ€§ãƒ–ランãƒã¨ã¿ãªã•ã‚Œã¾ã™ã€‚" +" -a/--active 指定時ã«ã¯ã€ アクティブãªãƒ–ランãƒã®ã¿ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n" +" リãƒã‚¸ãƒˆãƒªä¸ã«ãƒ˜ãƒƒãƒ‰ã‚’æŒã¤ã‚‚ã®ãŒã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªãƒ–ランãƒã¨ã¿ãªã•ã‚Œã¾ã™ã€‚" msgid " Use the command :hg:`update` to switch to an existing branch." msgstr "" @@ -11060,7 +11114,7 @@ msgid "" " If you pass a revlog index, the revlog's DAG is emitted. If you list\n" -" revision numbers, they get labelled in the output as rN." +" revision numbers, they get labeled in the output as rN." msgstr "" " 差分インデックスファイル (revlog å½¢å¼) を指定ã—ãŸå ´åˆã€\n" " 当該ファイル㮠DAG ãŒå‡ºåŠ›ã•ã‚Œã¾ã™ã€‚ リビジョン番å·ã‚’指定ã—ãŸå ´åˆã€\n" @@ -11244,7 +11298,10 @@ " å„ ID 毎ã®æ—¢çŸ¥æ€§ã‚’〠0 㨠1 ã§è¡¨ç¾ã—ãŸãƒªã‚¹ãƒˆãŒå‡ºåŠ›ã•ã‚Œã¾ã™ã€‚\n" " " +msgid "markers flag" +msgstr "廃æ¢ãƒžãƒ¼ã‚«ç”¨ãƒ•ãƒ©ã‚°" + msgid "[OBSOLETED [REPLACEMENT] [REPL... ]" msgstr "[OBSOLETED [REPLACEMENT] [REPL... ]" msgid "create arbitrary obsolete marker" @@ -11247,8 +11304,8 @@ msgid "[OBSOLETED [REPLACEMENT] [REPL... ]" msgstr "[OBSOLETED [REPLACEMENT] [REPL... ]" msgid "create arbitrary obsolete marker" -msgstr "ä»»æ„ã®ã€Žå»ƒæ¢ã€çŠ¶æ…‹ã®è¨å®š" +msgstr "ä»»æ„ã®å»ƒæ¢çŠ¶æ…‹ã®è¨å®š" msgid "REPO NAMESPACE [KEY OLD NEW]" msgstr "REPO NAMESPACE [KEY OLD NEW]" @@ -11971,12 +12028,12 @@ "\"hg help %s\" ã§è©³ç´°ãªãƒ˜ãƒ«ãƒ—ãŒè¡¨ç¤ºã•ã‚Œã¾ã™\n" #, python-format -msgid "" -"\n" -"use \"hg -v help %s\" to show more info\n" -msgstr "" -"\n" -"\"hg -v help %s\" ã§è©³ç´°ãªæƒ…å ±ãŒè¡¨ç¤ºã•ã‚Œã¾ã™\n" +msgid "use \"hg -v help %s\" to show more complete help and the global options" +msgstr "çœç•¥ã•ã‚ŒãŸãƒ˜ãƒ«ãƒ—ã®è©³ç´°ã‚„ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ションã®è¡¨ç¤ºã¯ \"hg -v help %s\"" + +#, python-format +msgid "use \"hg -v help %s\" to show the global options" +msgstr "ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ションã®è¡¨ç¤ºã¯ \"hg -v help %s\"" msgid "basic commands:" msgstr "基本コマンド:" @@ -12006,10 +12063,10 @@ #, python-format msgid "use \"hg help %s\" to show the full help text" -msgstr "\"hg help %s\" ã§è©³ç´°ãªãƒ˜ãƒ«ãƒ—ãŒè¡¨ç¤ºã•ã‚Œã¾ã™" +msgstr "詳細ãªãƒ˜ãƒ«ãƒ—ã®è¡¨ç¤ºã¯ \"hg help %s\"" #, python-format msgid "use \"hg -v help%s\" to show builtin aliases and global options" msgstr "組ã¿è¾¼ã¿åˆ¥åãŠã‚ˆã³ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ションã®è¡¨ç¤ºã¯ \"hg -v help%s\"" #, python-format @@ -12010,9 +12067,13 @@ #, python-format msgid "use \"hg -v help%s\" to show builtin aliases and global options" msgstr "組ã¿è¾¼ã¿åˆ¥åãŠã‚ˆã³ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ションã®è¡¨ç¤ºã¯ \"hg -v help%s\"" #, python-format +msgid "use \"hg help -v %s\" to show more complete help" +msgstr "çœç•¥ã•ã‚ŒãŸãƒ˜ãƒ«ãƒ—ã®è©³ç´°ã®è¡¨ç¤ºã¯ \"hg help %s\"" + +#, python-format msgid "" "\n" "use \"hg help -c %s\" to see help for the %s command\n" @@ -13172,6 +13233,10 @@ " " #, python-format +msgid "not removing %s: no tracked files\n" +msgstr "%s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“: 登録済ã¿ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“\n" + +#, python-format msgid "not removing %s: file is untracked\n" msgstr "%s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“: 未登録ファイルã§ã™\n" @@ -13871,7 +13936,7 @@ msgstr "update 候補 : %d ã®æ–°è¦ãƒªãƒ“ジョン〠%d ã®ãƒ–ランãƒãƒ˜ãƒƒãƒ‰(マージ)\n" msgid "1 or more incoming" -msgstr "å–ã‚Šè¾¼ã¿å¯¾è±¡ãƒªãƒ“ジョン(incoming)ã‚ã‚Š" +msgstr "å–ã‚Šè¾¼ã¿å€™è£œ(incoming)リビジョンã‚ã‚Š" #, python-format msgid "%d outgoing" @@ -13875,7 +13940,7 @@ #, python-format msgid "%d outgoing" -msgstr "%d 個ã®åæ˜ å€™è£œãƒªãƒ“ã‚¸ãƒ§ãƒ³(outgoing)" +msgstr "%d 個ã®åæ˜ å€™è£œ(outgoing)リビジョン" #, python-format msgid "%d incoming bookmarks" @@ -13879,7 +13944,7 @@ #, python-format msgid "%d incoming bookmarks" -msgstr "%d 個ã®å–ã‚Šè¾¼ã¿å€™è£œãƒ–ックマーク(incoming)" +msgstr "%d 個ã®å–ã‚Šè¾¼ã¿å€™è£œ(incoming)ブックマーク" #, python-format msgid "%d outgoing bookmarks" @@ -13883,7 +13948,7 @@ #, python-format msgid "%d outgoing bookmarks" -msgstr "%d 個ã®æ›´æ–°å€™è£œãƒ–ックマーク(outgoing)" +msgstr "%d 個ã®åæ˜ å€™è£œ(outgoing)ブックマーク" #, python-format msgid "remote: %s\n" @@ -13976,7 +14041,7 @@ msgstr "空白文å—ã ã‘ã§æ§‹æˆã•ã‚ŒãŸã‚¿ã‚°åã¯ä¸æ£ã§ã™" msgid "--rev and --remove are incompatible" -msgstr "--rev 㨠--remove ã¯åŒæ™‚ã«ä½¿ç”¨ã§ãã¾ã›ã‚“" +msgstr "--rev 㨠--remove ã¯ä½µç”¨ã§ãã¾ã›ã‚“" #, python-format msgid "tag '%s' does not exist" @@ -14182,6 +14247,14 @@ " ãŠã‚ˆã³ãƒã‚§ãƒƒã‚¯ã‚µãƒ 〠相互関連付ã‘ãŠã‚ˆã³ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ç‰ã®æ•´åˆæ€§ãŒ\n" " 検証ã•ã‚Œã¾ã™ã€‚" +msgid "" +" Please see http://mercurial.selenic.com/wiki/RepositoryCorruption\n" +" for more information about recovery from corruption of the\n" +" repository." +msgstr "" +" リãƒã‚¸ãƒˆãƒªç ´æ時ã®å¾©æ—§ã«é–¢ã™ã‚‹è©³ç´°ã¯ã€ 以下㮠URL ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n" +" http://mercurial.selenic.com/wiki/JapaneseRepositoryCorruption" + msgid "output version and copyright information" msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŠã‚ˆã³è‘—ä½œæ¨©æƒ…å ±ã®è¡¨ç¤º" @@ -14580,6 +14653,10 @@ msgstr "è¦å‘Š: ファイル %s ã§ã®ã‚³ãƒžãƒ³ãƒ‰è§£æžä¸ã«ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ\n" #, python-format +msgid "invalid value %r for option %s, expected int" +msgstr "指定値 %r ã¯æ•´æ•°å€¤ã‚’想定ã—ã¦ã„るオプション %s ã«ã¯ä¸é©åˆ‡ã§ã™" + +#, python-format msgid "couldn't find merge tool %s\n" msgstr "マージツール %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“\n" @@ -16340,5 +16417,5 @@ "``post-<command>``\n" " Run after successful invocations of the associated command. The\n" " contents of the command line are passed as ``$HG_ARGS`` and the result\n" -" code in ``$HG_RESULT``. Parsed command line arguments are passed as \n" +" code in ``$HG_RESULT``. Parsed command line arguments are passed as\n" " ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of\n" @@ -16344,5 +16421,5 @@ " ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of\n" -" the python data internally passed to <command>. ``$HG_OPTS`` is a \n" +" the python data internally passed to <command>. ``$HG_OPTS`` is a\n" " dictionary of options (with unspecified options set to their defaults).\n" " ``$HG_PATS`` is a list of arguments. Hook failure is ignored." msgstr "" @@ -16364,7 +16441,7 @@ " are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string\n" " representations of the data internally passed to <command>. ``$HG_OPTS``\n" " is a dictionary of options (with unspecified options set to their\n" -" defaults). ``$HG_PATS`` is a list of arguments. If the hook returns \n" +" defaults). ``$HG_PATS`` is a list of arguments. If the hook returns\n" " failure, the command doesn't execute and Mercurial returns the failure\n" " code." msgstr "" @@ -17034,13 +17111,10 @@ "location of the repository. Default paths can be declared by setting\n" "the following entries." msgstr "" -"リãƒã‚¸ãƒˆãƒªã¸ã®ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãªåå‰ã®å‰²ã‚Šå½“ã¦è¨å®šã€‚\n" -"è¨å®šè¨˜è¿°ã®å·¦è¾ºã«ã‚·ãƒ³ãƒœãƒ«åã‚’ã€\n" -"å³è¾ºã«ãƒªãƒã‚¸ãƒˆãƒªä½ç½®ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã€\n" -"ãªã„ã— URL を記述ã—ã¾ã™ã€‚\n" -"連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªæŒ‡å®šãŒç„¡ã„å ´åˆã§ã‚‚ã€\n" -"以下ã®ã‚·ãƒ³ãƒœãƒ«ã‚’è¨å®šã™ã‚‹ã“ã¨ã§ã€\n" -"パス指定ãŒå¯èƒ½ã§ã™ã€‚ (※ 訳注: :hg:`help urls` ã‚‚å‚ç…§ã—ã¦ãã ã•ã„)" +"リãƒã‚¸ãƒˆãƒªä½ç½®ã¸ã®ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãªåå‰ã®å‰²ã‚Šå½“ã¦è¨å®šã€‚ 記述左辺ã«ã‚·ãƒ³ãƒœãƒ«ã€\n" +"å³è¾ºã«ãƒªãƒã‚¸ãƒˆãƒªä½ç½®ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã€ ãªã„ã— URL を記述ã—ã¾ã™ã€‚\n" +"以下ã®ã‚·ãƒ³ãƒœãƒ«ã‚’è¨å®šã™ã‚‹ã“ã¨ã§ã€ 連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªæŒ‡å®šãŒç„¡ã„å ´åˆã§ã‚‚ã€\n" +"æš—é»™ã®ãƒ‘ス指定ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚ (※ 訳注: :hg:`help urls` ã‚‚å‚ç…§)" msgid "" "``default``\n" @@ -17064,6 +17138,28 @@ " 連æºå¯¾è±¡ã¨ãªã‚‹ãƒªãƒã‚¸ãƒˆãƒªã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã€ ãªã„ã— URL。" msgid "" +"Custom paths can be defined by assigning the path to a name that later can " +"be\n" +"used from the command line. Example::" +msgstr "" +"ä»»æ„ã®åå‰ã¸ã®ãƒ‘ス割り当ã¦ã«ã‚ˆã‚Šã€ コマンドラインç‰ã§ã®ãƒªãƒã‚¸ãƒˆãƒªæŒ‡å®šã§ã€\n" +"URL 指定ã®ä»£ã‚ã‚Šã«ãã®åå‰ã‚’使用ã§ãã¾ã™ã€‚è¨å®šä¾‹::" + +msgid "" +" [paths]\n" +" my_path = http://example.com/path" +msgstr "" +" [paths]\n" +" my_path = http://example.com/path" + +msgid "To push to the path defined in ``my_path`` run the command::" +msgstr "以下ã®ã‚³ãƒžãƒ³ãƒ‰å®Ÿè¡Œã§ ``my_path`` リãƒã‚¸ãƒˆãƒªã«å±¥æ´ãŒåæ˜ ã•ã‚Œã¾ã™::" + +msgid " hg push my_path" +msgstr " hg push my_path" + +msgid "" +"\n" "``phases``\n" "----------" msgstr "" @@ -17067,6 +17163,7 @@ "``phases``\n" "----------" msgstr "" +"\n" "``phases``\n" "----------" @@ -18184,7 +18281,7 @@ msgid "" "``stripes``\n" -" How many lines a \"zebra stripe\" should span in multiline output.\n" +" How many lines a \"zebra stripe\" should span in multi-line output.\n" " Default is 1; set to 0 to disable." msgstr "" "``stripes``\n" @@ -19876,7 +19973,7 @@ " - paths\n" " - collections" -msgid "The ``web`` options are thorougly described in :hg:`help config`." +msgid "The ``web`` options are thoroughly described in :hg:`help config`." msgstr "``web`` ã§ã®è¨˜è¿°ã®è©³ç´°ã¯ :hg:`help config` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" msgid "" @@ -21373,6 +21470,13 @@ msgid "clone from remote to remote not supported" msgstr "リモートã‹ã‚‰ãƒªãƒ¢ãƒ¼ãƒˆã®è¤‡è£½ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™" +msgid "updating to bookmark @\n" +msgstr "ブックマーク @ ã¸ã®æ›´æ–°ä¸\n" + +#, python-format +msgid "updating to bookmark @ on branch %s\n" +msgstr "ブランム%s ã®ãƒ–ックマーク @ ã¸æ›´æ–°ä¸\n" + #, python-format msgid "updating to branch %s\n" msgstr "ブランム%s ã¸æ›´æ–°ä¸\n" @@ -21564,10 +21668,6 @@ msgstr "è¦å‘Š: 作æ¥é ˜åŸŸã®è¦ª '%s' ãŒæœªçŸ¥ã®ãƒªãƒ“ジョンã§ã™!\n" #, python-format -msgid "%r cannot be used in a tag name" -msgstr "%r ã¯ã‚¿ã‚°åã«ä½¿ç”¨ã§ãã¾ã›ã‚“" - -#, python-format msgid "warning: tag %s conflicts with existing branch name\n" msgstr "è¦å‘Š: ã‚¿ã‚° %s ãŒæ—¢å˜ã®ãƒ–ランãƒåã¨è¡çªã—ã¾ã™\n" @@ -21683,15 +21783,19 @@ msgstr "指定ã®é€£æºå…ˆã«ã¯å±¥æ´åæ˜ ãŒã§ãã¾ã›ã‚“" #, python-format -msgid "push includes an obsolete changeset: %s!" -msgstr "å±¥æ´åæ˜ å¯¾è±¡ã«ã€Žå»ƒæ¢ã€ãƒªãƒ“ジョンãŒå«ã¾ã‚Œã¾ã™ï¼: %s" - -#, python-format -msgid "push includes an unstable changeset: %s!" -msgstr "å±¥æ´åæ˜ å¯¾è±¡ã«ã€Žéžæ°¸ç¶šã€ãƒªãƒ“ジョンãŒå«ã¾ã‚Œã¾ã™ï¼: %s" +msgid "push includes obsolete changeset: %s!" +msgstr "å±¥æ´åæ˜ å¯¾è±¡ã«å»ƒæ¢ (obsolete) リビジョンãŒå«ã¾ã‚Œã¾ã™ï¼: %s" + +#, python-format +msgid "push includes unstable changeset: %s!" +msgstr "å±¥æ´åæ˜ å¯¾è±¡ã«éžæ°¸ç¶š (unstable) リビジョンãŒå«ã¾ã‚Œã¾ã™ï¼: %s" + +#, python-format +msgid "push includes bumped changeset: %s!" +msgstr "" #, python-format msgid "updating %s to public failed!\n" msgstr "%s ã®ãƒ•ã‚§ãƒ¼ã‚ºã® public 化ã«å¤±æ•—!\n" msgid "failed to push some obsolete markers!\n" @@ -21692,10 +21796,10 @@ #, python-format msgid "updating %s to public failed!\n" msgstr "%s ã®ãƒ•ã‚§ãƒ¼ã‚ºã® public 化ã«å¤±æ•—!\n" msgid "failed to push some obsolete markers!\n" -msgstr "リビジョンã®ã€Žå»ƒæ¢ã€æƒ…å ±ã®åæ˜ ã«å¤±æ•—ã—ã¾ã—ãŸï¼\n" +msgstr "リビジョンã®å»ƒæ¢æƒ…å ±ã®åæ˜ ã«å¤±æ•—ã—ã¾ã—ãŸï¼\n" #, python-format msgid "%d changesets found\n" @@ -21962,8 +22066,8 @@ #, python-format msgid "parsing obsolete marker: unknown version %r" -msgstr "『廃æ¢ã€æƒ…å ±è§£æž: 未知ã®ãƒªãƒ“ジョン %r" +msgstr "廃æ¢æƒ…å ±è§£æž: 未知ã®ãƒªãƒ“ジョン %r" #, python-format msgid "" "parsing obsolete marker: metadata is too short, %d bytes expected, got %d" @@ -21966,8 +22070,11 @@ #, python-format msgid "" "parsing obsolete marker: metadata is too short, %d bytes expected, got %d" -msgstr "『廃æ¢ã€æƒ…å ±è§£æž: メタデータã®æƒ³å®šã‚µã‚¤ã‚º %d ã«å¯¾ã—㦠%d ã—ã‹ã‚ã‚Šã¾ã›ã‚“" +msgstr "廃æ¢æƒ…å ±è§£æž: メタデータã®æƒ³å®šã‚µã‚¤ã‚º %d ã«å¯¾ã—㦠%d ã—ã‹ã‚ã‚Šã¾ã›ã‚“" + +msgid "bad obsolescence marker detected: invalid successors nullid" +msgstr "ä¸æ£ãªå»ƒæ¢æƒ…å ±ã‚’æ¤œå‡º: 後継ã¨ã—ã¦ã® null 指定ã¯ä¸æ£ã§ã™" #, python-format msgid "unknown key: %r" @@ -22151,9 +22258,6 @@ msgid "index %s is corrupted" msgstr "インデックス %s ã¯ç ´æã—ã¦ã„ã¾ã™" -msgid "no node" -msgstr "ノードãŒã‚ã‚Šã¾ã›ã‚“" - msgid "ambiguous identifier" msgstr "曖昧㪠ID ã§ã™" @@ -22234,7 +22338,7 @@ msgid "" " - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip\n" -" - ``goods``, ``bads`` : csets topologicaly good/bad\n" +" - ``goods``, ``bads`` : csets topologically good/bad\n" " - ``range`` : csets taking part in the bisection\n" " - ``pruned`` : csets that are goods, bads or skipped\n" " - ``untested`` : csets whose fate is yet unknown\n" @@ -22302,6 +22406,22 @@ " 付ãã§æŒ‡å®šã—ã¦ãã ã•ã„。" msgid "" +"``bumped()``\n" +" Mutable changesets marked as successors of public changesets." +msgstr "" +"``bumped()``\n" +" public フェーズãªãƒªãƒ“ジョンã®å¾Œç¶™ã§ã€ 且ã¤æ”¹å¤‰å¯èƒ½ãªãƒªãƒ“ジョン。" + +msgid " Only non-public and non-obsolete changesets can be `bumped`." +msgstr "" +" éž public ã§ã€ä¸”ã¤å»ƒæ¢è¨å®šã•ã‚Œã¦ã„ãªã„リビジョンã®ã¿ãŒ `bumped`\n" +" ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚" + +#. i18n: "bumped" is a keyword +msgid "bumped takes no arguments" +msgstr "bumped ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" "``children(set)``\n" " Child changesets of changesets in set." msgstr "" @@ -22408,7 +22528,7 @@ " Obsolete changesets with obsolete descendants only." msgstr "" "``extinct()``\n" -" åå«ãŒå…¨ã¦ã€Žå»ƒæ¢ã€ãƒªãƒ“ジョンãªã€ã€Žå»ƒæ¢ã€ãƒªãƒ“ジョン群。" +" åå«ãŒå…¨ã¦å»ƒæ¢ãƒªãƒ“ジョンãªã€å»ƒæ¢ãƒªãƒ“ジョン群。" #. i18n: "extinct" is a keyword msgid "extinct takes no arguments" @@ -22576,6 +22696,18 @@ " 指定リビジョンä¸ã®ã€ åリビジョンをæŒãŸãªã„リビジョン群。" msgid "" +"``hidden()``\n" +" Hidden changesets." +msgstr "" +"``hidden()``\n" +" ä¸å¯è¦–状態ã®ãƒªãƒ“ジョン群 (※ 訳注: 作æ¥é ˜åŸŸã‚„ブックマークç‰ã‹ã‚‰ã€\n" +" 到é”ã§ããªã„廃æ¢è¨å®šã®ãƒªãƒ“ジョン群ã®ã“ã¨)。" + +#. i18n: "hidden" is a keyword +msgid "hidden takes no arguments" +msgstr "hidden ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" "``keyword(string)``\n" " Search commit message, user name, and names of changed files for\n" " string. The match is case-insensitive." @@ -22645,6 +22777,17 @@ msgstr "merge ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" msgid "" +"``branchpoint()``\n" +" Changesets with more than one child." +msgstr "" +"``branchpoint()``\n" +" åリビジョンを1ã¤ä»¥ä¸ŠæŒã¤ãƒªãƒ“ジョン群。" + +#. i18n: "branchpoint" is a keyword +msgid "branchpoint takes no arguments" +msgstr "branchpoint ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" "``min(set)``\n" " Changeset with lowest revision number in set." msgstr "" @@ -22683,7 +22826,7 @@ msgstr "" "``obsolete()``\n" " æ–°è¦ãƒªãƒ“ジョンã«ã‚ˆã‚‹æ”¹å¤‰ãŒå¯èƒ½ãªãƒªãƒ“ジョン群。\n" -" (※ 訳注: 『廃æ¢ã€è¨å®šã•ã‚Œã¦ã„るリビジョン群ã®ã“ã¨)" +" (※ 訳注: 廃æ¢è¨å®šã•ã‚Œã¦ã„るリビジョン群ã®ã“ã¨)" #. i18n: "obsolete" is a keyword msgid "obsolete takes no arguments" @@ -22987,7 +23130,8 @@ " Non-obsolete changesets with obsolete ancestors." msgstr "" "``unstable()``\n" -" 祖先ã«ã€Žå»ƒæ¢ã€ãƒªãƒ“ジョンをæŒã¤ã€ã€Žéžå»ƒæ¢ã€ãƒªãƒ“ジョン群。" +" 祖先ã«å»ƒæ¢ãƒªãƒ“ジョンをæŒã¤ã€éžå»ƒæ¢ãƒªãƒ“ジョン群 (※ 訳注: 日本語訳ã§ã¯\n" +" unstable を『éžæ°¸ç¶šã€ã¨è¨³ã—ã¦ã„ã¾ã™)" #. i18n: "unstable" is a keyword msgid "unstable takes no arguments" @@ -23032,6 +23176,10 @@ msgstr "差分ã¯ã‚ã‚Šã¾ã›ã‚“ (secret フェーズ㮠%d 個ã®ãƒªãƒ“ジョンã¯ç„¡è¦–)\n" #, python-format +msgid "%r cannot be used in a name" +msgstr "%r ã¯åå‰å®šç¾©ã«ä½¿ç”¨ã§ãã¾ã›ã‚“" + +#, python-format msgid "ui.portablefilenames value is invalid ('%s')" msgstr "ui.portablefilenames 値ãŒä¸æ£ã§ã™ ('%s')" @@ -23431,6 +23579,6 @@ msgid "" ":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n" -" and \">\" with XML entities." +" and \">\" with XML entities, and filters out NUL characters." msgstr "" ":escape: æ–‡å—列。 XML/XHTML ã®ç‰¹æ®Šæ–‡å—ã§ã‚ã‚‹ \"&\"〠\"<\" ãŠã‚ˆã³\n" @@ -23435,6 +23583,6 @@ msgstr "" ":escape: æ–‡å—列。 XML/XHTML ã®ç‰¹æ®Šæ–‡å—ã§ã‚ã‚‹ \"&\"〠\"<\" ãŠã‚ˆã³\n" -" \">\" ã‚’ XML ã®ã‚¨ãƒ³ãƒ†ã‚£ãƒ†ã‚£å½¢å¼ã«å¤‰æ›ã—ã¾ã™ã€‚" +" \">\" ã‚’ XML ã®ã‚¨ãƒ³ãƒ†ã‚£ãƒ†ã‚£å½¢å¼ã«å¤‰æ›ã—〠NUL æ–‡å—を除外ã—ã¾ã™ã€‚" msgid ":fill68: Any text. Wraps the text to fit in 68 columns." msgstr ":fill68: æ–‡å—列。 68 æ¡ã«åŽã¾ã‚‹ã‚ˆã†ã«æ–‡å—列を折り返ã—ã¾ã™ã€‚" @@ -23594,6 +23742,15 @@ msgid ":emailuser: Any text. Returns the user portion of an email address." msgstr ":emailuser: æ–‡å—列。 メールアドレスã®ãƒ¦ãƒ¼ã‚¶å部分をå–り出ã—ã¾ã™ã€‚" +msgid "fill expects one or two arguments" +msgstr "fill ã®å¼•æ•°ã¯1ã¤ãªã„ã—2ã¤ã§ã™" + +msgid "fill expects an integer width" +msgstr "fill ã«ã¯æ•°å€¤ã‚’指定ã—ã¦ãã ã•ã„" + +msgid "date expects one or two arguments" +msgstr "date ã®å¼•æ•°ã¯1ã¤ãªã„ã—2ã¤ã§ã™" + msgid ":author: String. The unmodified author of the changeset." msgstr ":author: æ–‡å—列。 リビジョンã®ä½œè€…å(è¨˜éŒ²æƒ…å ±ãã®ã¾ã¾)。" @@ -23676,6 +23833,37 @@ " digit string." msgstr ":node: æ–‡å—列。 リビジョンè˜åˆ¥ç”¨ã® 40 æ¡ 16 進数ãƒãƒƒã‚·ãƒ¥å€¤ã€‚" +msgid "" +":p1rev: Integer. The repository-local revision number of the changeset's\n" +" first parent, or -1 if the changeset has no parents." +msgstr "" +":p1rev: 整数。 第1親リビジョンã®ã€ 当該リãƒã‚¸ãƒˆãƒªã«ãŠã‘るリビジョン番å·ã€‚\n" +" 親をæŒãŸãªã„リビジョンã®å ´åˆã¯ -1。" + +msgid "" +":p2rev: Integer. The repository-local revision number of the changeset's\n" +" second parent, or -1 if the changeset has no second parent." +msgstr "" +":p2rev: 整数。 第2親リビジョンã®ã€ 当該リãƒã‚¸ãƒˆãƒªã«ãŠã‘るリビジョン番å·ã€‚\n" +" 第2親をæŒãŸãªã„リビジョンã®å ´åˆã¯ -1。" + +msgid "" +":p1node: String. The identification hash of the changeset's first parent,\n" +" as a 40 digit hexadecimal string. If the changeset has no parents, all\n" +" digits are 0." +msgstr "" +":p1node: æ–‡å—列。 第1親リビジョン㮠40 æ¡ãƒãƒƒã‚·ãƒ¥å€¤ã®æ–‡å—列。\n" +" 親をæŒãŸãªã„リビジョンã®å ´åˆã¯ã€ å…¨æ¡ãŒ 0 ã®ãƒãƒƒã‚·ãƒ¥å€¤æ–‡å—列。" + +msgid "" +":p2node: String. The identification hash of the changeset's second\n" +" parent, as a 40 digit hexadecimal string. If the changeset has no " +"second\n" +" parent, all digits are 0." +msgstr "" +":p2node: æ–‡å—列。 第1親リビジョン㮠40 æ¡ãƒãƒƒã‚·ãƒ¥å€¤ã®æ–‡å—列。\n" +" 第2親をæŒãŸãªã„リビジョンã®å ´åˆã¯ã€ å…¨æ¡ãŒ 0 ã®ãƒãƒƒã‚·ãƒ¥å€¤æ–‡å—列。" + msgid ":phase: String. The changeset phase name." msgstr ":phase: æ–‡å—列。 当該リビジョンã®ãƒ•ã‚§ãƒ¼ã‚ºå。" @@ -23712,6 +23900,10 @@ msgstr "テンプレート指定ãŒå¿…è¦ã§ã™" #, python-format +msgid "template filter '%s' is not compatible with keyword '%s'" +msgstr "フィルタ指定 '%s' ã¯ã‚ーワード '%s' ã¨äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“" + +#, python-format msgid "filter %s expects one argument" msgstr "フィルタ %s ã¯å¼•æ•°ãŒ1ã¤å¿…è¦ã§ã™" @@ -23715,6 +23907,18 @@ msgid "filter %s expects one argument" msgstr "フィルタ %s ã¯å¼•æ•°ãŒ1ã¤å¿…è¦ã§ã™" +msgid "join expects one or two arguments" +msgstr "join ã®å¼•æ•°ã¯1ã¤ãªã„ã—2ã¤ã§ã™" + +msgid "sub expects three arguments" +msgstr "sub ã¯å¼•æ•°ãŒ3ã¤å¿…è¦ã§ã™" + +msgid "if expects two or three arguments" +msgstr "if ã¯2ãªã„ã—3ã®å¼•æ•°ãŒå¿…è¦ã§ã™" + +msgid "ifeq expects three or four arguments" +msgstr "ifeq ã¯3ãªã„ã—4ã®å¼•æ•°ãŒå¿…è¦ã§ã™" + msgid "unmatched quotes" msgstr "引用符ã®å¯¾å¿œé–¢ä¿‚ãŒä¸æ£ã§ã™" diff --git a/i18n/pt_BR.po b/i18n/pt_BR.po index 17c030014ddf253c28daf88a00710093aa882a25_aTE4bi9wdF9CUi5wbw==..1aab870bbedfe0b173a4d8c5edaeb2ce5ddf6eff_aTE4bi9wdF9CUi5wbw== 100644 --- a/i18n/pt_BR.po +++ b/i18n/pt_BR.po @@ -7646,7 +7646,7 @@ msgstr " Por fim, o próprio patch, como gerado por :hg:`export`." msgid "" -" With the -d/--diffstat or -c/--confirm options, you will be presented\n" +" With the -d/--diffstat or --confirm options, you will be presented\n" " with a final summary of all messages and asked for confirmation before\n" " the messages are sent." msgstr "" @@ -7650,7 +7650,7 @@ " with a final summary of all messages and asked for confirmation before\n" " the messages are sent." msgstr "" -" Com as opções -d/--diffstat ou -c/--confirm, será apresentado\n" +" Com as opções -d/--diffstat ou --confirm, será apresentado\n" " um resumo final de todas as mensagens, e haverá um pedido de\n" " confirmação antes do envio das mensagens." @@ -21928,6 +21928,13 @@ msgid "clone from remote to remote not supported" msgstr "clone de origem remota para destino remoto não suportado" +msgid "updating to bookmark @\n" +msgstr "atualizando para o marcador @\n" + +#, python-format +msgid "updating to bookmark @ on branch %s\n" +msgstr "atualizando para o marcador @ no ramo %s\n" + #, python-format msgid "updating to branch %s\n" msgstr "atualizando para o ramo %s\n"