summaryrefslogtreecommitdiffstats
path: root/po/ja.po
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2006-04-26 10:33:32 +0000
committerJean Delvare <khali@linux-fr.org>2006-04-26 10:33:32 +0000
commit14a8982f98baaa99205bc62cf272a596fcd693f3 (patch)
tree3ed42e6a6e32b79a313f98ceb3dc09f3e9e69cb8 /po/ja.po
parent968586bd01386d198f7fa8d1dfa5e49e539a0bbf (diff)
downloadquilt-14a8982f98baaa99205bc62cf272a596fcd693f3.tar.gz
- quilt/pop.in: Delete .pc/$patch directory when popping empty
patches. Report and original patch by Arnaud Patard. - quilt/push.in: Create .pc/$patch directory when pushing missing or empty patches. If we don't, some commands such as rename can fail later. - test/missing.test: Test rename command on missing patches. - test/empty.test: New test case similar to missing.test, but for empty patches. Somewhat based on a contribution by Arnaud Patard.
Diffstat (limited to 'po/ja.po')
-rw-r--r--po/ja.po22
1 files changed, 11 insertions, 11 deletions
diff --git a/po/ja.po b/po/ja.po
index 5b2c4b7..6aef672 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -907,23 +907,23 @@ msgstr ""
msgid "Patch %s appears to be empty, removing\\n"
msgstr "パッチ %s は、空のようです。はずします\\n"
-#: quilt/pop.in:169
+#: quilt/pop.in:170
msgid "Removing patch %s\\n"
msgstr "パッチ %s をはずします\\n"
-#: quilt/pop.in:240
+#: quilt/pop.in:241
msgid "Patch %s needs to be refreshed first.\\n"
msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n"
-#: quilt/pop.in:250
+#: quilt/pop.in:251
msgid "No patch removed\\n"
msgstr "適用されているパッチはありません\\n"
-#: quilt/pop.in:266 quilt/scripts/patchfns.in:455
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:455
msgid "No patches applied\\n"
msgstr "適用されているパッチはありません\\n"
-#: quilt/pop.in:273 quilt/push.in:371
+#: quilt/pop.in:274 quilt/push.in:373
msgid "Now at patch %s\\n"
msgstr "現在位置はパッチ %s です\\n"
@@ -1015,28 +1015,28 @@ msgstr "ユーザによって中断されました。パッチ %s は適用さ
msgid "Applying patch %s\\n"
msgstr "パッチ %s を適用しています\\n"
-#: quilt/push.in:209
+#: quilt/push.in:211
msgid "Patch %s does not exist; applied empty patch\\n"
msgstr "パッチ %s は存在しません。空のパッチを適用しました\\n"
-#: quilt/push.in:213
+#: quilt/push.in:215
msgid "Patch %s appears to be empty; applied\\n"
msgstr "パッチ %s は空のようですが、適用しました\\n"
-#: quilt/push.in:217
+#: quilt/push.in:219
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr ""
"パッチ %s を適用しました (強制適用したために、リフレッシュが必要です)\\n"
-#: quilt/push.in:227
+#: quilt/push.in:229
msgid "Patch %s can be reverse-applied\\n"
msgstr "パッチ %s は、反転して適用することができます\\n"
-#: quilt/push.in:230
+#: quilt/push.in:232
msgid "Patch %s does not apply (enforce with -f)\\n"
msgstr "パッチ %s が適用できません (強制適用する場合は -fを付けてください)\\n"
-#: quilt/push.in:351
+#: quilt/push.in:353
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr "最上位パッチのリフレッシュが最初に必要です。\\n"