diff options
Diffstat (limited to 'po/ja.po')
-rw-r--r-- | po/ja.po | 46 |
1 files changed, 26 insertions, 20 deletions
@@ -73,20 +73,20 @@ msgstr "ファイル \\`%s'は、\\`%s'以下にあります\\n" #: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76 #: ../quilt/diff.in:160 ../quilt/diff.in:171 ../quilt/graph.in:116 -#: ../quilt/next.in:62 ../quilt/pop.in:239 ../quilt/previous.in:62 -#: ../quilt/push.in:311 ../quilt/refresh.in:148 ../quilt/remove.in:53 +#: ../quilt/next.in:62 ../quilt/pop.in:246 ../quilt/previous.in:62 +#: ../quilt/push.in:312 ../quilt/refresh.in:148 ../quilt/remove.in:53 #: ../quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "パッチ %s は seriesの中にありません\\n" #: ../quilt/add.in:99 ../quilt/diff.in:239 ../quilt/graph.in:121 -#: ../quilt/pop.in:254 ../quilt/refresh.in:154 ../quilt/remove.in:74 +#: ../quilt/pop.in:261 ../quilt/refresh.in:154 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "パッチ %s は適用されていません\\n" #: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:247 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:72 -#: ../quilt/graph.in:131 ../quilt/pop.in:288 ../quilt/push.in:349 +#: ../quilt/graph.in:131 ../quilt/pop.in:295 ../quilt/push.in:350 #: ../quilt/refresh.in:162 ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "適用されているパッチはありません\\n" @@ -712,19 +712,24 @@ msgstr "" "パッチ %s を、正常にはずすことができません (リフレッシュするか -fを付\n" "けてはずしてください)\\n" -#: ../quilt/pop.in:178 +#: ../quilt/pop.in:181 +#, fuzzy +msgid "Patch %s appears to be empty, removing\\n" +msgstr "パッチ %sは、空のようです\\n" + +#: ../quilt/pop.in:185 msgid "Removing patch %s\\n" msgstr "パッチ %s を削除します\\n" -#: ../quilt/pop.in:262 +#: ../quilt/pop.in:269 msgid "Patch %s needs to be refreshed first.\\n" msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n" -#: ../quilt/pop.in:272 +#: ../quilt/pop.in:279 msgid "No patch removed\\n" msgstr "適用されているパッチはありません\\n" -#: ../quilt/pop.in:295 ../quilt/push.in:371 +#: ../quilt/pop.in:302 ../quilt/push.in:372 msgid "Now at patch %s\\n" msgstr "現在位置はパッチ %s です" @@ -808,40 +813,41 @@ msgstr "" msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "ユーザによって中断されました。パッチ % は適用されていません。\\n" -#: ../quilt/push.in:96 -msgid "Patch %s appears to be empty\\n" -msgstr "パッチ %sは、空のようです\\n" - -#: ../quilt/push.in:160 +#: ../quilt/push.in:157 msgid "Applying patch %s\\n" msgstr "パッチ %s を適用しています\\n" -#: ../quilt/push.in:192 +#: ../quilt/push.in:189 +#, fuzzy +msgid "Patch %s does not exist, applied\\n" +msgstr "パッチ %s は適用されていません\\n" + +#: ../quilt/push.in:193 msgid "Patch %s appears to be empty, applied\\n" msgstr "パッチ %s は空のようですが、適用しました\\n" -#: ../quilt/push.in:196 +#: ../quilt/push.in:197 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "" "パッチ % を適用しました (強制適用したために、リフレッシュが必要です)\\n" -#: ../quilt/push.in:201 +#: ../quilt/push.in:202 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "パッチ %sが適用できません (強制適用する場合は -fを付けてください)\\n" -#: ../quilt/push.in:240 +#: ../quilt/push.in:241 msgid "Patch %s not found in file series\\n" msgstr "パッチ %s が seriesファイル内で見つかりません。\\n" -#: ../quilt/push.in:328 +#: ../quilt/push.in:329 msgid "Patch %s is already applied\\n" msgstr "パッチ %s は、すでに適用済です\\n" -#: ../quilt/push.in:337 +#: ../quilt/push.in:338 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "最上位パッチのリフレッシュが最初に必要です。\\n" -#: ../quilt/push.in:351 +#: ../quilt/push.in:352 msgid "File series fully applied, ends at patch %s\\n" msgstr "" "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n" |