Merge strings

1 files changed, 11 insertions, 12 deletions

diff --git a/po/es.po b/po/es.po
index 26a6dde5..b7892182 100644
--- a/po/es.po
+++ b/po/es.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-es\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-01-21 23:57+0100\n"
 "Last-Translator: Jaime Crespo <505201@unizar.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -1469,7 +1469,7 @@ msgstr ""
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --install-src  - instalar sólo paquete de fuentes (ningún binario)\n"
 
-#: ../urpmi:88
+#: ../urpmi:88 ../urpmq:52
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -2155,16 +2155,6 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpmq:52
-#, fuzzy, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - mantener paquetes existentes si es posible, descartar "
-"pedidos\n"
-"                   de paquetes que lleven a quitarlos.\n"
-
 #: ../urpmq:54
 #, c-format
 msgid "  --list         - list available packages.\n"
@@ -2323,6 +2313,15 @@ msgstr "No se encontró filelist\n"
 msgid "No changelog found\n"
 msgstr "No se encontró changelog\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "  --keep         - keep existing packages if possible, reject requested\n"
+#~ "                   packages that leads to remove.\n"
+#~ msgstr ""
+#~ "  --keep         - mantener paquetes existentes si es posible, descartar "
+#~ "pedidos\n"
+#~ "                   de paquetes que lleven a quitarlos.\n"
+
 #~ msgid "unable to write file [%s]"
 #~ msgstr "no se puede escribir archivo [%s]"