diff --git a/i18n/ja.po b/i18n/ja.po index 9dba55369cd874e6389fc1857fe7c033ef3a051b_aTE4bi9qYS5wbw==..038b389d80f5a31520c454d78245968de1ecf655_aTE4bi9qYS5wbw== 100644 --- a/i18n/ja.po +++ b/i18n/ja.po @@ -121,7 +121,7 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2012-04-28 14:09+0900\n" +"POT-Creation-Date: 2012-04-29 15:46+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" @@ -20907,6 +20907,9 @@ msgid "file not tracked!" msgstr "ファイルã¯æœªç™»éŒ²ã§ã™!" +msgid "cannot commit merge with missing files" +msgstr "管ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ãŒä¸åœ¨ã®çŠ¶æ³ã§ã¯ã€ãƒžãƒ¼ã‚¸çµæžœã‚’コミットã§ãã¾ã›ã‚“" + msgid "unresolved merge conflicts (see hg help resolve)" msgstr "未解消ã®è¡çªãŒæ®‹ã£ã¦ã„ã¾ã™ (hg help resolveã‚’å‚ç…§ã—ã¦ãã ã•ã„)" @@ -21250,12 +21253,17 @@ msgid "bad hunk #%d old text line %d" msgstr "ä¸æ£ãªãƒãƒ³ã‚¯: #%d 元テã‚スト %d 行目" -msgid "could not extract binary patch" -msgstr "ãƒã‚¤ãƒŠãƒªãƒ‘ッãƒã®é©ç”¨ã«å¤±æ•—" - -#, python-format -msgid "binary patch is %d bytes, not %d" -msgstr "ãƒã‚¤ãƒŠãƒªãƒ‘ッãƒã®ã‚µã‚¤ã‚ºä¸æ£: 実サイズ %d, 想定サイズ %d" +#, python-format +msgid "could not extract \"%s\" binary data" +msgstr "ãƒã‚¤ãƒŠãƒªãƒ‡ãƒ¼ã‚¿ \"%s\" ãŒå±•é–‹ã§ãã¾ã›ã‚“" + +#, python-format +msgid "could not decode \"%s\" binary patch: %s" +msgstr "ãƒã‚¤ãƒŠãƒªãƒ‘ッム\"%s\" ã®è§£æžã«å¤±æ•—ã—ã¾ã—ãŸ: %s" + +#, python-format +msgid "\"%s\" length is %d bytes, should be %d" +msgstr "ãƒã‚¤ãƒŠãƒªãƒ‘ッム\"%s\" ã®å®Ÿã‚µã‚¤ã‚º %d ã¨æƒ³å®šã‚µã‚¤ã‚º %d ãŒç•°ãªã‚Šã¾ã™" #, python-format msgid "unable to strip away %d of %d dirs from %s" @@ -21886,20 +21894,6 @@ "``matching(revision [, field])``\n" " Changesets in which a given set of fields match the set of fields in " "the\n" -" selected revision or set.\n" -" To match more than one field pass the list of fields to match separated\n" -" by spaces (e.g. 'author description').\n" -" Valid fields are most regular revision fields and some special fields:\n" -" * regular fields:\n" -" - description, author, branch, date, files, phase, parents,\n" -" substate, user.\n" -" Note that author and user are synonyms.\n" -" * special fields: summary, metadata.\n" -" - summary: matches the first line of the description.\n" -" - metatadata: It is equivalent to matching 'description user date'\n" -" (i.e. it matches the main metadata fields).\n" -" metadata is the default field which is used when no fields are " -"specified.\n" -" You can match more than one field at a time." +" selected revision or set." msgstr "" "``matching(revision [, field])``\n" @@ -21904,19 +21898,45 @@ msgstr "" "``matching(revision [, field])``\n" -" 指定リビジョン群 (revision) ã®æŒ‡å®šãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ (field) 値ã¨ã€\n" -" åˆè‡´ã™ã‚‹ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰å€¤ã‚’æŒã¤ãƒªãƒ“ジョン群ã®æŠ½å‡ºã€‚ (※ 訳注: 抽出対象ãŒ\n" -" ``and`` çµåˆç‰ã§æŒ‡å®šã•ã‚Œãªã„å ´åˆã€ 全リビジョンãŒæŠ½å‡ºå…ƒã«ãªã‚Šã¾ã™)\n" -" 複数フィールドã®åˆè‡´åˆ¤å®šã¯ã€ 対象フィールドを空白区切りã§æŒ‡å®šã—ã¾ã™\n" -" (例: 'author description')。 通常リビジョンã®æŒã¤ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ä»¥å¤–ã«ã€\n" -" 特別ãªãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚‚指定ã§ãã¾ã™:\n" -" * 通常フィールド(user 㨠author ã¯åŒæ„):\n" -" - description, author, branch, date, files, phase, parents,\n" -" substate, user.\n" -" * 特殊フィールド: summary, metadata.\n" -" - summary: description ã®å†’é è¡Œã«ç›¸å½“。\n" -" - metatadata: 'description user date' ã¸ã®åˆè‡´ã¨ç‰ä¾¡ã€‚\n" -" (主ãªãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿é …ç›®ã¨åˆè‡´åˆ¤å®šã™ã‚‹ãŸã‚)\n" -" フィールド指定ãŒç„¡ã„å ´åˆã€ metadata フィールドãŒå¯¾è±¡ã¨ãªã‚Šã¾ã™ã€‚\n" +" 指定リビジョン群 (revision) ã¨ã€æŒ‡å®šé …ç›® (field) 値ãŒåŒä¸€ãªã€\n" +" リビジョンã®æŠ½å‡º (※ 訳注: ``and`` çµåˆç‰ã§ã®æŠ½å‡ºå…ƒæŒ‡å®šãŒç„¡ã„å ´åˆã€\n" +" 全リビジョンãŒæŠ½å‡ºå…ƒã«ãªã‚Šã¾ã™)。" + +msgid "" +" To match more than one field pass the list of fields to match separated\n" +" by spaces (e.g. ``author description``)." +msgstr "" +" è¤‡æ•°é …ç›®ã®åˆè‡´åˆ¤å®šã¯ã€ å¯¾è±¡é …ç›®ã‚’ç©ºç™½åŒºåˆ‡ã‚Šã§æŒ‡å®šã—ã¾ã™\n" +" (例: 'author description')。" + +msgid "" +" Valid fields are most regular revision fields and some special fields." +msgstr " リビジョンã®ä¸€èˆ¬çš„ãªé …目以外ã«ã€ 特別ãªé …目も指定ã§ãã¾ã™ã€‚" + +msgid "" +" Regular revision fields are ``description``, ``author``, ``branch``,\n" +" ``date``, ``files``, ``phase``, ``parents``, ``substate`` and ``user``.\n" +" Note that ``author`` and ``user`` are synonyms." +msgstr "" +" 一般的ãªé …ç›®ã«ã¯ã€``description``〠``author``〠``branch``ã€\n" +" ``date``〠``files``〠``phase``〠``parents``〠``substate`` ãŠã‚ˆã³\n" +" ``user`` ãŒã‚ã‚Šã¾ã™ã€‚ ``author`` 㨠``user`` ã¯åŒä¸€é …ç›®ã§ã™ã€‚" + +msgid "" +" Special fields are ``summary`` and ``metadata``:\n" +" ``summary`` matches the first line of the description.\n" +" ``metatadata`` is equivalent to matching ``description user date``\n" +" (i.e. it matches the main metadata fields)." +msgstr "" +" ç‰¹æ®Šé …ç›®ã«ã¯ ``summary`` ãŠã‚ˆã³ ``metadata`` ãŒã‚ã‚Šã¾ã™: ``summary``\n" +" 㯠``description`` ã®ï¼‘行目ã«ç›¸å½“ã—ã¾ã™ã€‚ ``metadata`` ã¯\n" +" ``description user date`` ã¨ã®åˆè‡´ã«ç›¸å½“ã—ã¾ã™ (ã“ã®å称ã¯ã€\n" +" 「主ãªãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿é …ç›®ã¨ã®åˆè‡´ã€åˆ¤å®šã«ç”±æ¥ã—ã¾ã™)" + +msgid "" +" ``metadata`` is the default field which is used when no fields are\n" +" specified. You can match more than one field at a time." +msgstr "" +" フィールド指定ãŒç„¡ã„å ´åˆã€ ``metadata`` フィールドãŒå¯¾è±¡ã¨ãªã‚Šã¾ã™ã€‚\n" " åŒæ™‚ã«è¤‡æ•°ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã®åˆè‡´åˆ¤å®šãŒå¯èƒ½ã§ã™ã€‚" msgid "matching takes 1 or 2 arguments" @@ -22315,6 +22335,12 @@ msgid "cannot commit svn externals" msgstr "svn 外部リãƒã‚¸ãƒˆãƒªã« commit ã§ãã¾ã›ã‚“" +msgid "cannot commit missing svn entries" +msgstr "svn 管ç†å¯¾è±¡ã«ä¸åœ¨ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚る状態ã§ã¯ commit ã§ãã¾ã›ã‚“" + +msgid "failed to commit svn changes" +msgstr "svn ã¸ã®å¤‰æ›´ã‚³ãƒŸãƒƒãƒˆã«å¤±æ•—ã—ã¾ã—ãŸ" + #, python-format msgid "not removing repo %s because it has changes.\n" msgstr "変更ãŒå«ã¾ã‚Œã¦ã„ã‚‹ãŸã‚〠リãƒã‚¸ãƒˆãƒª %s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“\n"