Merge strings

1 files changed, 8 insertions, 9 deletions

diff --git a/po/ja.po b/po/ja.po
index 06b42148..dd8c2d4f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-21 14:52+0200\n"
+"POT-Creation-Date: 2005-04-21 15:09+0200\n"
 "PO-Revision-Date: 2005-02-13 14:00+0900\n"
 "Last-Translator: BANDO Yukiko <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese\n"
@@ -1435,7 +1435,7 @@ msgstr ""
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --install-src  - ソースのみをインストール(バイナリなし)\n"
 
-#: ../urpmi:88
+#: ../urpmi:88 ../urpmq:52
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -2100,13 +2100,6 @@ msgstr ""
 "\n"
 "使い方:\n"
 
-#: ../urpmq:52
-#, fuzzy, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr "  --keep         - 既存のパッケージを維持し、削除要求は拒否する\n"
-
 #: ../urpmq:54
 #, c-format
 msgid "  --list         - list available packages.\n"
@@ -2253,6 +2246,12 @@ msgstr "ファイルリストがありません\n"
 msgid "No changelog found\n"
 msgstr "チェンジログはありません\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "  --keep         - keep existing packages if possible, reject requested\n"
+#~ "                   packages that leads to remove.\n"
+#~ msgstr "  --keep         - 既存のパッケージを維持し、削除要求は拒否する\n"
+
 #~ msgid "unable to write file [%s]"
 #~ msgstr "ファイル[%s]を作成できません"