summaryrefslogtreecommitdiffstats
path: root/po/ja.po
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2006-04-15 12:43:15 +0000
committerJean Delvare <khali@linux-fr.org>2006-04-15 12:43:15 +0000
commit785167244689ec57f068011b9390be509f58e1fb (patch)
tree83804971f0173dda7d13e8a4be6cd98fe4d01646 /po/ja.po
parentb91802032a0ab98fc306a02f6c70ccb1be0edc67 (diff)
downloadquilt-785167244689ec57f068011b9390be509f58e1fb.tar.gz
- quilt/scripts/patchfns.in: Fix broken return in function
find_applied_patch, which was causing a bogus error message on failed pop. - test/three.test: Test failed pop.
Diffstat (limited to 'po/ja.po')
-rw-r--r--po/ja.po12
1 files changed, 6 insertions, 6 deletions
diff --git a/po/ja.po b/po/ja.po
index 8c3337f..5b657a2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -178,7 +178,7 @@ msgstr "次のパッチはありません\\n"
msgid "No patches in series\\n"
msgstr "シリーズに登録されているパッチがありません\\n"
-#: quilt/delete.in:101 quilt/scripts/patchfns.in:539
+#: quilt/delete.in:101 quilt/scripts/patchfns.in:540
msgid "Patch %s is currently applied\\n"
msgstr "パッチ %s は現在適用されています\\n"
@@ -1253,20 +1253,20 @@ msgstr "パッチ %s から %sへの名前の変更に失敗しました: %s\n"
msgid "Patch %s is not in series\\n"
msgstr "パッチ %s は seriesの中にありません\\n"
-#: quilt/scripts/patchfns.in:518
+#: quilt/scripts/patchfns.in:519
msgid "Patch %s is not applied\\n"
msgstr "パッチ %s は適用されていません\\n"
-#: quilt/scripts/patchfns.in:555
+#: quilt/scripts/patchfns.in:556
msgid "File series fully applied, ends at patch %s\\n"
msgstr ""
"seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n"
-#: quilt/scripts/patchfns.in:577
+#: quilt/scripts/patchfns.in:578
msgid "Patch %s does not exist\\n"
msgstr "パッチ %s が存在しません\\n"
-#: quilt/scripts/patchfns.in:832
+#: quilt/scripts/patchfns.in:833
msgid ""
"The quilt meta-data in this tree has version %s, but this version of quilt "
"can only handle meta-data formats up to and including version %s. Please pop "
@@ -1278,7 +1278,7 @@ msgstr ""
"ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
"すべてのパッチを pop してください。\\n"
-#: quilt/scripts/patchfns.in:917
+#: quilt/scripts/patchfns.in:918
msgid ""
"The working tree was created by an older version of quilt. Please run 'quilt "
"upgrade'.\\n"