diff options
Diffstat (limited to 'po/ja.po')
| -rw-r--r-- | po/ja.po | 31 |
1 files changed, 16 insertions, 15 deletions
@@ -613,11 +613,12 @@ msgid "" "\tPatch filename to use inside quilt. This option can only be\n" "\tused when importing a single patch.\n" "\n" -"-d {o|a|n}\n" -"\tKeep the old (o), all (a), or new (n) patch header. If both patches\n" -"\tinclude headers, this option must be specified.\n" -"\n" "-f\tOverwite/update existing patches.\n" +"\n" +"-d {o|a|n}\n" +"\tWhen overwriting in existing patch, keep the old (o), all (a), or\n" +"\tnew (n) patch header. If both patches include headers, this option\n" +"\tmust be specified. This option is only effective when -f is used.\n" msgstr "" "\n" "外部パッチファイルを取り込む。パッチは最上位パッチの後に取り込まれるが、\n" @@ -632,49 +633,49 @@ msgstr "" "\n" "-f\t存在するパッチの上書き、またはアップデート。\n" -#: quilt/import.in:67 +#: quilt/import.in:68 msgid "Patch headers differ:\\n" msgstr "" -#: quilt/import.in:70 +#: quilt/import.in:71 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" -#: quilt/import.in:123 +#: quilt/import.in:124 msgid "Option \\`-n' can only be used when importing a single patch\\n" msgstr "オプション \\`-n'は、パッチを一つだけ取り込むときのみ有効です。\\n" -#: quilt/import.in:143 +#: quilt/import.in:144 msgid "Patch %s is applied\\n" msgstr "パッチ %s は、すでに適用されています\\n" -#: quilt/import.in:152 +#: quilt/import.in:153 #, fuzzy msgid "Patch %s already exists in series.\\n" msgstr "パッチ %s は seriesの中にありません\\n" -#: quilt/import.in:158 +#: quilt/import.in:159 msgid "Patch %s exists. Replace with -f.\\n" msgstr "パッチ %s は、すでに存在します。-fで置き換えることができます。\\n" -#: quilt/import.in:169 +#: quilt/import.in:170 msgid "Replacing patch %s with new version\\n" msgstr "パッチ %s を新しいバージョンに置き換えます\\n" -#: quilt/import.in:173 +#: quilt/import.in:174 #, fuzzy msgid "Importing patch %s\\n" msgstr "パッチ %s をはずします\\n" -#: quilt/import.in:175 +#: quilt/import.in:176 msgid "Importing patch %s (stored as %s)\\n" msgstr "パッチ %s を取り込んでいます (%s として保存されます)\\n" -#: quilt/import.in:185 +#: quilt/import.in:186 msgid "Failed to import patch %s\\n" msgstr "パッチ %s の取り込みに失敗しました\\n" -#: quilt/import.in:192 +#: quilt/import.in:193 msgid "Failed to insert patch %s into file series\\n" msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n" |