diff --git a/po/es.po b/po/es.po
line changes: +63/-70
index 563b6ad..146d613
--- a/po/es.po
+++ b/po/es.po

@@ -1,71 +1,45 @@
 # Mensajes en espa�ol para GNU hello.
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 # Javier Roma�ach <jromanac@dial.eunet.es>, 1996.
-# Santiago Vila Doncel <sanvila@unex.es>, 1997, 1998, 1999, 2000, 2001, 2002.
+# Santiago Vila Doncel <sanvila@unex.es>, 1997, 1998, 1999, 2000, 2001, 2002, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello 2.1.1\n"
+"Project-Id-Version: GNU hello 2.1.93\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-18 15:40-0700\n"
-"PO-Revision-Date: 2002-06-20 16:02+0200\n"
+"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"PO-Revision-Date: 2006-10-19 18:23+0200\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:88
+#: src/hello.c:84
 msgid "Too many arguments\n"
 msgstr "Demasiados argumentos\n"
 
-#: src/hello.c:89
+#: src/hello.c:85
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pruebe `%s --help' para m�s informaci�n.\n"
 
-#: src/hello.c:96
-#, c-format
-msgid "hello, world\n"
-msgstr "hola mundo\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:105
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"| �Hola, mundo! |\n"
-"+---------------+\n"
-
-#: src/hello.c:114
-msgid "Hello, world!"
-msgstr "�Hola mundo!"
-
-#. TRANSLATORS: --help output 1 (synopsis)
+#. TRANSLATORS: --help output 1
 #. no-wrap
-#: src/hello.c:149
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Modo de empleo: %s [OPCI�N]\n"
+#: src/hello.c:99
+msgid "GNU hello, THE greeting printing program.\n"
+msgstr "GNU hello, EL programa que imprime un saludo.\n"
 
-#. TRANSLATORS: --help output 2 (brief description)
+#. TRANSLATORS: --help output 2
 #. no-wrap
-#: src/hello.c:154
-msgid "Print a friendly, customizable greeting.\n"
-msgstr ""
+#: src/hello.c:104
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Modo de empleo: %s [OPCI�N]...\n"
 
-#. TRANSLATORS: --help output 3: options 1/2
+#. TRANSLATORS: --help output 3 : options 1/2
 #. no-wrap
-#: src/hello.c:160
+#: src/hello.c:110
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -73,10 +47,9 @@ msgstr ""
 "  -h, --help          muestra esta ayuda y finaliza\n"
 "  -v, --version       muestra informaci�n sobre la versi�n y termina\n"
 
-#. TRANSLATORS: --help output 4: options 2/2
+#. TRANSLATORS: --help output 4 : options 2/2
 #. no-wrap
-#: src/hello.c:167
-#, fuzzy
+#: src/hello.c:117
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -84,33 +57,61 @@ msgid ""
 msgstr ""
 "  -t, --traditional       utiliza el formato de saludo tradicional\n"
 "  -n, --next-generation   utiliza el formato de saludo m�s novedoso\n"
-"  -m, --mail              imprime su correo\n"
+"  -g, --greeting=TEXTO    utiliza TEXTO como mensaje de saludo\n"
 
 # V�ase "A bug's life".
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application.  Please add _another line_ with the
+#. for this application. Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:178
+#: src/hello.c:128
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Comunicar bichos a <%s>.\n"
 "Comunicar errores de traducci�n a <es@li.org>.\n"
 
-#: src/hello.c:196
+#: src/hello.c:138
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
 "License: GNU GPL v2+ <http://www.gnu.org/licenses/gpl.html>\n"
-"This is free software.  There is NO WARRANTY, to the extent permitted by "
-"law.\n"
+"This is free software.  There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Licencia: GNU GPL v2+ <http://www.gnu.org/licenses/gpl.html>\n"
+"Esto es software libre. No hay NINGUNA GARANT�A, hasta donde permite la ley.\n"
+
+#: src/hello.c:149
+#, c-format
+msgid "hello, world\n"
+msgstr "hola mundo\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:157
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
+"+---------------+\n"
+"| �Hola, mundo! |\n"
+"+---------------+\n"
+
+#: src/hello.c:165
+msgid "Hello, world!"
+msgstr "�Hola mundo!"
 
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
-msgstr ""
+msgstr "Error del sistema desconocido"
 
 #: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
 #, c-format

@@ -171,7 +172,7 @@ msgstr "%s: la opci
 
 #: gnulib/lib/closeout.c:74
 msgid "write error"
-msgstr ""
+msgstr "error de escritura"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.

@@ -194,36 +195,28 @@ msgstr ""
 #. and use glyphs suitable for your language.
 #: gnulib/lib/quotearg.c:245
 msgid "`"
-msgstr ""
+msgstr "�"
 
 #: gnulib/lib/quotearg.c:246
 msgid "'"
-msgstr ""
+msgstr "�"
 
 #: gnulib/lib/xalloc-die.c:37
-#, fuzzy
 msgid "memory exhausted"
-msgstr "%s: Memoria agotada\n"
-
-#~ msgid "GNU hello, THE greeting printing program.\n"
-#~ msgstr "GNU hello, EL programa que imprime un saludo.\n"
+msgstr "memoria agotada"
 
-#, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
-#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
-#~ "under the terms of the GNU General Public License.\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s under the terms\n"
+#~ "of the GNU General Public License.\n"
 #~ "For more information about these matters, see the file named COPYING.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "No hay NINGUNA garant�a; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA "
-#~ "UN\n"
-#~ "FIN DETERMINADO. Se pueden redistribuir copias de GNU %s bajo los "
-#~ "t�rminos\n"
+#~ "No hay NINGUNA garant�a; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n"
+#~ "FIN DETERMINADO. Se pueden redistribuir copias de GNU %s bajo los t�rminos\n"
 #~ "de la Licencia P�blica General de GNU.\n"
-#~ "Para m�s informaci�n sobre estas cuestiones, vea el fichero llamado "
-#~ "COPYING.\n"
+#~ "Para m�s informaci�n sobre estas cuestiones, vea el fichero llamado COPYING.\n"
 
 #~ msgid "%s: Incompatible flags: -m and -t\n"
 #~ msgstr "%s: Opciones incompatibles: -m y -t\n"