Updated translations.

author: Bruno Haible <bruno@clisp.org> 2003-11-30 14:34:36 +0000
committer: Bruno Haible <bruno@clisp.org> 2009-06-23 12:11:22 +0200
commit: e4f81cb78ce64afd8eb83a941fda1e647d00ca34 (patch)
tree: e809052c7ece30b3aab8f1037abdc6998fadc225 /gettext-tools/po
parent: 400064ea39716c38f4cd7df99fce01653eeb86fa (diff)
download: external_gettext-e4f81cb78ce64afd8eb83a941fda1e647d00ca34.zip
external_gettext-e4f81cb78ce64afd8eb83a941fda1e647d00ca34.tar.gz
external_gettext-e4f81cb78ce64afd8eb83a941fda1e647d00ca34.tar.bz2
3 files changed, 2173 insertions, 1024 deletions
diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index ea7397b..393b12a 100644
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,10 @@
+2003-11-30  Bruno Haible  <bruno@clisp.org>
+
+	* es.po: Update from Max de MendizÃ¡bal <max@upn.mx>.
+	* sk.po: Update from Marcel Telka <marcel@telka.sk>.
+	* sr.po: New file, from Danilo Segan <dsegan@gmx.net>.
+	* LINGUAS: Add sr.
+
 2003-11-24  Bruno Haible  <bruno@clisp.org>
 
 	* ca.po: Update from Ivan Vilata i Balaguer <ivan@selidor.net>.
diff --git a/gettext-tools/po/es.po b/gettext-tools/po/es.po
index 181b884..6829ca6 100644
--- a/gettext-tools/po/es.po
+++ b/gettext-tools/po/es.po
@@ -4,15 +4,15 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.12-pre4\n"
+"Project-Id-Version: GNU gettext-tools 0.13-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-05-22 16:06+0200\n"
-"PO-Revision-Date: 2003-05-09 12:49-0500\n"
+"POT-Creation-Date: 2003-11-28 20:31+0100\n"
+"PO-Revision-Date: 2003-11-24 19:21-0600\n"
 "Last-Translator: Max de Mendizábal <max@upn.mx>\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"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/argmatch.c:120
@@ -26,32 +26,37 @@ msgid "ambiguous argument `%s' for `%s'"
 msgstr "el argumento `%s' es ambiguo para `%s'"
 
 #: lib/argmatch.c:139
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Los argumentos válidos son:"
 
-#: lib/copy-file.c:64 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:121 src/urlget.c:195 src/xgettext.c:935 src/xgettext.c:948
-#: src/xgettext.c:958
+#: lib/closeout.c:66
+msgid "write error"
+msgstr "error de escritura"
+
+#: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
+#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
+#: src/xgettext.c:1512
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error al abrir el fichero \"%s\" para lectura"
 
-#: lib/copy-file.c:71
+#: lib/copy-file.c:72
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "no se puede abrir el fichero de respaldo \"%s\" para escritura"
 
-#: lib/copy-file.c:79 src/urlget.c:207
+#: lib/copy-file.c:80 src/urlget.c:212
 #, c-format
 msgid "error reading \"%s\""
 msgstr "error al leer \"%s\""
 
-#: lib/copy-file.c:84 lib/copy-file.c:88
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, c-format
 msgid "error writing \"%s\""
 msgstr "error al escribir \"%s\""
 
-#: lib/copy-file.c:90 src/urlget.c:217
+#: lib/copy-file.c:91 src/urlget.c:222
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "error después de leer \"%s\""
@@ -62,10 +67,10 @@ msgstr "error después de leer \"%s\""
 msgid "Unknown system error"
 msgstr "Error del sistema desconocido"
 
-#: lib/execute.c:176 lib/execute.c:229 lib/execute.c:264 lib/pipe-bidi.c:174
-#: lib/pipe-bidi.c:239 lib/pipe-bidi.c:274 lib/pipe-in.c:190 lib/pipe-in.c:248
-#: lib/pipe-in.c:284 lib/pipe-out.c:190 lib/pipe-out.c:248 lib/pipe-out.c:284
-#: lib/wait-process.c:147
+#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
+#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
+#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
+#: lib/wait-process.c:332 lib/wait-process.c:395
 #, c-format
 msgid "%s subprocess failed"
 msgstr "fallo en el subproceso %s"
@@ -127,41 +132,57 @@ msgstr "%s: la opción `-W %s' es ambigua\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: la opción `-W %s' no admite ningún argumento\n"
 
-#: lib/javacomp.c:455
+#: lib/javacomp.c:457
+#, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "No se encuentró al compilador de Java, intente instalar gcj o poner $JAVAC"
 
-#: lib/javaexec.c:404
+#: lib/javaexec.c:407
+#, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "No se encontró a la máquina virtual de Java, intente instalar gij o poner "
 "$JAVA"
 
-#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:50 lib/xmalloc.c:41
-#: lib/xsetenv.c:40 src/po-lex.c:87 src/po-lex.c:116 src/x-glade.c:348
+#: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:51 lib/xmalloc.c:41
+#: lib/xsetenv.c:40 src/po-lex.c:89 src/po-lex.c:118 src/x-glade.c:390
+#, c-format
 msgid "memory exhausted"
 msgstr "Memoria agotada"
 
-#: lib/pipe-bidi.c:126 lib/pipe-bidi.c:128 lib/pipe-bidi.c:202
-#: lib/pipe-bidi.c:204 lib/pipe-in.c:139 lib/pipe-in.c:215 lib/pipe-out.c:139
-#: lib/pipe-out.c:215
+#: lib/pipe-bidi.c:129 lib/pipe-bidi.c:131 lib/pipe-bidi.c:206
+#: lib/pipe-bidi.c:208 lib/pipe-in.c:142 lib/pipe-in.c:219 lib/pipe-out.c:142
+#: lib/pipe-out.c:219
+#, c-format
 msgid "cannot create pipe"
 msgstr "no se puede crear la tubería"
 
-#: lib/wait-process.c:125
+#: lib/w32spawn.h:48
+#, c-format
+msgid "DuplicateHandle failed with error code 0x%08x"
+msgstr ""
+"fallo de duplicación de manejador (DuplicateHandle) con código de error 0x%"
+"08x"
+
+#: lib/w32spawn.h:53
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "fallo en _open_osfhandle"
+
+#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:365
 #, c-format
 msgid "%s subprocess"
 msgstr "subproceso %s"
 
-#: lib/wait-process.c:139
+#: lib/wait-process.c:324 lib/wait-process.c:387
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "el subproceso %s tiene una señal fatal %d"
 
 #: src/format-awk.c:493 src/format-elisp.c:341 src/format-librep.c:305
-#: src/format-pascal.c:394 src/format-php.c:341 src/format-tcl.c:380
-#: src/format-ycp.c:137
+#: src/format-pascal.c:394 src/format-perl.c:571 src/format-php.c:341
+#: src/format-qt.c:136 src/format-tcl.c:380 src/format-ycp.c:137
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
@@ -170,14 +191,15 @@ msgstr ""
 "en 'msgid'"
 
 #: src/format-awk.c:508 src/format-elisp.c:356 src/format-librep.c:320
-#: src/format-pascal.c:409 src/format-php.c:356 src/format-tcl.c:395
-#: src/format-ycp.c:136
+#: src/format-pascal.c:409 src/format-perl.c:586 src/format-php.c:356
+#: src/format-qt.c:135 src/format-tcl.c:395 src/format-ycp.c:136
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "una especificación de formato para el argumento %u no existe en '%s'"
 
-#: src/format-awk.c:533 src/format-c.c:825 src/format-elisp.c:381
-#: src/format-librep.c:345 src/format-pascal.c:434 src/format-php.c:381
+#: src/format-awk.c:533 src/format-c.c:846 src/format-elisp.c:381
+#: src/format-gcc-internal.c:283 src/format-librep.c:345
+#: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
 #: src/format-python.c:530 src/format-tcl.c:420
 #, c-format
 msgid ""
@@ -186,7 +208,7 @@ msgstr ""
 "las especificaciones de formato en 'msgid' y '%s' para el argumento %u no "
 "son las mismas"
 
-#: src/format-c.c:176
+#: src/format-c.c:177
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -196,25 +218,31 @@ msgstr ""
 "macro especificador de formato. Los nombres de macro válidos están listados "
 "en el ISO C 99 sección 7.8.1."
 
-#: src/format-c.c:545
+#: src/format-c.c:546
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 "En la instrucción número %u, el token posterior a '<' no está seguido por "
 "'>'."
 
-#: src/format-c.c:744
+#: src/format-c.c:753
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "La cadena se refiere al argumento número %u, pero ignora el argumento número "
 "%u."
 
-#: src/format-c.c:811 src/format-python.c:516
+#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "el número de especificaciones de formato en `msgid' y '%s' no coincide"
 
+#: src/format-gcc-internal.c:204
+#, c-format
+msgid "In the directive number %u, flags are not allowed before '%c'."
+msgstr ""
+"En la instrucción número %u, las banderas no están permitidas antes de '%c'."
+
 #: src/format-invalid.h:23
 msgid "The string ends in the middle of a directive."
 msgstr "La cadena termina en medio de una instrucción."
@@ -375,40 +403,46 @@ msgstr ""
 "requiere de un parámetro de tipo '%s'."
 
 #: src/format-lisp.c:2389
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
+"u parameter."
+msgid_plural ""
+"In the directive number %u, too many parameters are given; expected at most %"
 "u parameters."
-msgstr ""
+msgstr[0] ""
+"En la instrucción número %u se dieron demasiados parámetros; se esperan a lo "
+"más %u parámetros."
+msgstr[1] ""
 "En la instrucción número %u se dieron demasiados parámetros; se esperan a lo "
 "más %u parámetros."
 
-#: src/format-lisp.c:2501
+#: src/format-lisp.c:2504
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "En la instrucción número %u, '%c' no está seguida de un dígito."
 
-#: src/format-lisp.c:2699
+#: src/format-lisp.c:2702
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "En la instrucción número %u, el argumento %d es negativo."
 
-#: src/format-lisp.c:2761
+#: src/format-lisp.c:2764
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "La cadena termina en medio de una instrucción ~/.../."
 
-#: src/format-lisp.c:2791 src/format-lisp.c:3014 src/format-lisp.c:3120
-#: src/format-lisp.c:3169 src/format-lisp.c:3255
+#: src/format-lisp.c:2794 src/format-lisp.c:3017 src/format-lisp.c:3123
+#: src/format-lisp.c:3172 src/format-lisp.c:3258
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "Se encontró '~%c' sin su '~%c' correspondiente."
 
-#: src/format-lisp.c:2807
+#: src/format-lisp.c:2810
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "En la instrucción número %u, deben darse los modificadores @ y :."
 
-#: src/format-lisp.c:2905
+#: src/format-lisp.c:2908
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
@@ -417,27 +451,41 @@ msgstr ""
 "En la instrucción número %u, '~:[' no está seguido de dos cláusulas "
 "separadas por '~;'."
 
-#: src/format-lisp.c:3203
+#: src/format-lisp.c:3206
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "En la instrucción número %u, '~;' se utilizó en una posición inválida."
 
-#: src/format-lisp.c:3289
+#: src/format-lisp.c:3292
 msgid "The string refers to some argument in incompatible ways."
 msgstr "La cadena se refiere a algún argumento de forma incompatible."
 
-#: src/format-lisp.c:3333
+#: src/format-lisp.c:3336
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "las especificaciones de formato en `msgid' y '%s' no son equivalentes"
 
-#: src/format-lisp.c:3354
+#: src/format-lisp.c:3357
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr ""
 "las especificaciones de formato en '%s' no son un subconjunto de aquellas en "
 "'msgid'"
 
+#: src/format-perl.c:428
+#, c-format
+msgid ""
+"In the directive number %u, the size specifier is incompatible with the "
+"conversion specifier '%c'."
+msgstr ""
+"En la instrucción número %u, el  tamaño del especificador es incompatible "
+"con el especificador de conversión '%c'."
+
+#: src/format-perl-brace.c:198 src/format-python.c:462 src/format-sh.c:304
+#, c-format
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
+msgstr "una especificación de formato para el argumento '%s' no existe en '%s'"
+
 #: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
@@ -470,7 +518,7 @@ msgstr ""
 "las especificaciones de formato en `msgid' requieren una tupla y aquellas en "
 "'%s' requieren un mapeo"
 
-#: src/format-python.c:447
+#: src/format-python.c:447 src/format-sh.c:289
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
@@ -479,11 +527,6 @@ msgstr ""
 "una especificación de formato para el argumento '%s', como en '%s', no "
 "existe en 'msgid'"
 
-#: src/format-python.c:462
-#, c-format
-msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "una especificación de formato para el argumento '%s' no existe en '%s'"
-
 #: src/format-python.c:488
 #, c-format
 msgid ""
@@ -492,6 +535,36 @@ msgstr ""
 "las especificaciones de formato en 'msgid' y '%s' para el argumento '%s' no "
 "son las mismas"
 
+#: src/format-qt.c:80
+#, c-format
+msgid "Multiple references to %%%c."
+msgstr "Referencias múltiples a %%%c."
+
+#: src/format-sh.c:82
+msgid "The string refers to a shell variable with a non-ASCII name."
+msgstr ""
+"La cadena se refiere a una variable de entorno con un nombre que no es ASCII."
+
+#: src/format-sh.c:84
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"La cadena se refiere a una variable de entorno con una sintáxis compleja. "
+"Esta sintáxis no se admite aquí debido a potenciales problemas de seguridad."
+
+#: src/format-sh.c:86
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"La cadena se refiere a una variable de entorno cuyo valor podría ser "
+"distinto dentro de las funciones del intérprete de comandos."
+
+#: src/format-sh.c:88
+msgid "The string refers to a shell variable with an empty name."
+msgstr "La cadena se refiere a una variable de entrono con un nombre vacío."
+
 #: src/format-ycp.c:85
 #, c-format
 msgid ""
@@ -508,11 +581,11 @@ msgid ""
 msgstr ""
 "El carácter que termina la instrucción número %u no es un dígito entre 1 y 9."
 
-#: src/hostname.c:172 src/msgattrib.c:296 src/msgcat.c:248 src/msgcmp.c:130
-#: src/msgcomm.c:245 src/msgconv.c:202 src/msgen.c:188 src/msgexec.c:166
-#: src/msgfilter.c:253 src/msgfmt.c:321 src/msggrep.c:296 src/msginit.c:250
-#: src/msgmerge.c:278 src/msgunfmt.c:211 src/msguniq.c:224 src/urlget.c:129
-#: src/xgettext.c:415
+#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
+#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
+#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
+#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
+#: src/xgettext.c:492
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -524,46 +597,51 @@ msgstr ""
 "No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n"
 "FIN DETERMINADO.\n"
 
-#: src/hostname.c:177 src/msgattrib.c:301 src/msgcat.c:253 src/msgcmp.c:135
-#: src/msgcomm.c:250 src/msgconv.c:207 src/msgen.c:193 src/msgexec.c:171
-#: src/msgfilter.c:258 src/msgfmt.c:326 src/msggrep.c:301 src/msginit.c:255
-#: src/msgmerge.c:283 src/msgunfmt.c:216 src/msguniq.c:229 src/urlget.c:134
-#: src/xgettext.c:420
+#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
+#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
+#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
+#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
+#: src/xgettext.c:497
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
-#: src/hostname.c:187 src/msginit.c:265
+#: src/hostname.c:197 src/msginit.c:280
+#, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/hostname.c:200 src/msgattrib.c:357 src/msgcat.c:311 src/msgcmp.c:166
-#: src/msgcomm.c:318 src/msgconv.c:264 src/msgen.c:243 src/msgexec.c:223
-#: src/msgfilter.c:350 src/msgfmt.c:496 src/msggrep.c:415 src/msginit.c:340
-#: src/msgmerge.c:399 src/msgunfmt.c:320 src/msguniq.c:285 src/urlget.c:157
-#: src/xgettext.c:611
+#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
+#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
+#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
+#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
+#: src/xgettext.c:704
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pruebe `%s --help' para más información.\n"
 
-#: src/hostname.c:204 src/msginit.c:344
+#: src/hostname.c:214 src/msginit.c:360
 #, c-format
 msgid "Usage: %s [OPTION]\n"
 msgstr "Modo de empleo: %s [OPCIÓN]\n"
 
-#: src/hostname.c:208
+#: src/hostname.c:218
+#, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Muestra el nombre de la máquina.\n"
 
-#: src/hostname.c:211
+#: src/hostname.c:221
+#, c-format
 msgid "Output format:\n"
 msgstr "Formato de salida:\n"
 
-#: src/hostname.c:213
+#: src/hostname.c:223
+#, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 nombre de corto de la máquina\n"
 
-#: src/hostname.c:215
+#: src/hostname.c:225
+#, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
 "domain\n"
@@ -573,70 +651,76 @@ msgstr ""
 "nombre\n"
 "                               completo del dominio calificado,\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:228
+#, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 "  -i, --ip-address            direcciones para el nombre de la máquina\n"
 
-#: src/hostname.c:221 src/msgattrib.c:457 src/msgcat.c:404 src/msgcmp.c:206
-#: src/msgcomm.c:407 src/msgconv.c:336 src/msgen.c:312 src/msgexec.c:263
-#: src/msgfilter.c:432 src/msgfmt.c:597 src/msggrep.c:513 src/msginit.c:392
-#: src/msgmerge.c:509 src/msgunfmt.c:400 src/msguniq.c:370 src/urlget.c:171
-#: src/xgettext.c:733
+#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
+#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
+#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
+#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
+#: src/xgettext.c:850
+#, c-format
 msgid "Informative output:\n"
 msgstr "Salida informativa:\n"
 
-#: src/hostname.c:223 src/msgattrib.c:459 src/msgcat.c:406 src/msgcmp.c:208
-#: src/msgcomm.c:409 src/msgconv.c:338 src/msgen.c:314 src/msgexec.c:265
-#: src/msgfilter.c:434 src/msgfmt.c:599 src/msggrep.c:515 src/msginit.c:394
-#: src/msgmerge.c:511 src/msgunfmt.c:402 src/msguniq.c:372 src/urlget.c:173
-#: src/xgettext.c:735
+#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
+#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
+#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
+#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
+#: src/xgettext.c:852
+#, c-format
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  muestra esta ayuda y finaliza\n"
 
-#: src/hostname.c:225 src/msgattrib.c:461 src/msgcat.c:408 src/msgcmp.c:210
-#: src/msgcomm.c:411 src/msgconv.c:340 src/msgen.c:316 src/msgexec.c:267
-#: src/msgfilter.c:436 src/msgfmt.c:601 src/msggrep.c:517 src/msginit.c:396
-#: src/msgmerge.c:513 src/msgunfmt.c:404 src/msguniq.c:374 src/urlget.c:175
-#: src/xgettext.c:737
+#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
+#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
+#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
+#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
+#: src/xgettext.c:854
+#, c-format
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               muestra la versión y finaliza\n"
 
-#: src/hostname.c:228 src/msgattrib.c:464 src/msgcat.c:411 src/msgcmp.c:213
-#: src/msgcomm.c:414 src/msgconv.c:343 src/msgen.c:319 src/msgexec.c:270
-#: src/msgfilter.c:439 src/msgfmt.c:608 src/msggrep.c:520 src/msginit.c:399
-#: src/msgmerge.c:520 src/msgunfmt.c:409 src/msguniq.c:377 src/urlget.c:178
-#: src/xgettext.c:740
+#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
+#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
+#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
+#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
+#: src/xgettext.c:857
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Comunicar los `bugs' a <bug-gnu-gettext@gnu.org>.\n"
 
-#: src/hostname.c:243 src/hostname.c:250
+#: src/hostname.c:254 src/hostname.c:260 src/hostname.c:267
+#, c-format
 msgid "could not get host name"
 msgstr "no se pudo obtener el nombre de la máquina"
 
-#: src/msgattrib.c:316 src/msgconv.c:222 src/msgexec.c:142 src/msgfilter.c:191
-#: src/msggrep.c:316 src/msginit.c:196 src/msguniq.c:244
+#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
+#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#, c-format
 msgid "at most one input file allowed"
 msgstr "sólo se permite un fichero de entrada máximo"
 
-#: src/msgattrib.c:322 src/msgattrib.c:326 src/msgcat.c:263 src/msgcat.c:267
-#: src/msgcomm.c:260 src/msgcomm.c:264 src/msgconv.c:228 src/msgconv.c:232
-#: src/msgen.c:215 src/msgen.c:219 src/msgfilter.c:273 src/msgfilter.c:277
-#: src/msgfmt.c:343 src/msgfmt.c:349 src/msgfmt.c:364 src/msggrep.c:322
-#: src/msggrep.c:326 src/msgmerge.c:308 src/msgmerge.c:329 src/msgmerge.c:333
-#: src/msgunfmt.c:226 src/msguniq.c:250 src/msguniq.c:254 src/xgettext.c:430
-#: src/xgettext.c:434
+#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
+#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
+#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
+#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
+#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
+#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
+#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s y %s son mutuamente excluyentes"
 
-#: src/msgattrib.c:361 src/msgconv.c:268 src/msggrep.c:419 src/msguniq.c:289
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]\n"
 
-#: src/msgattrib.c:366
-#, no-wrap
+#: src/msgattrib.c:381
+#, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
@@ -644,10 +728,11 @@ msgstr ""
 "Filtra los mensajes de un catálogo de traducción de acuerdo con sus\n"
 "atributos, y luego manipula los atributos.\n"
 
-#: src/msgattrib.c:370 src/msgcat.c:332 src/msgcmp.c:184 src/msgcomm.c:338
-#: src/msgconv.c:276 src/msgen.c:259 src/msgexec.c:246 src/msgfilter.c:362
-#: src/msggrep.c:429 src/msginit.c:354 src/msgmerge.c:420 src/msgunfmt.c:332
-#: src/msguniq.c:305
+#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
+#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
+#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
+#: src/msguniq.c:320
+#, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
@@ -655,21 +740,24 @@ msgstr ""
 "obligatorios para las opciones cortas.\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/msgattrib.c:373 src/msgcat.c:335 src/msgcmp.c:187 src/msgcomm.c:341
-#: src/msgconv.c:279 src/msgen.c:262 src/msgexec.c:249 src/msgfilter.c:365
-#: src/msgfmt.c:514 src/msggrep.c:432 src/msginit.c:357 src/msgmerge.c:423
-#: src/msgunfmt.c:342 src/msguniq.c:308 src/xgettext.c:629
+#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
+#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
+#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
+#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#, c-format
 msgid "Input file location:\n"
 msgstr "Localización del fichero de entrada:\n"
 
-#: src/msgattrib.c:375 src/msgconv.c:281 src/msggrep.c:434 src/msguniq.c:310
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FICHERODEENTRADA            fichero PO de entrada\n"
 
-#: src/msgattrib.c:377 src/msgcat.c:341 src/msgcmp.c:193 src/msgcomm.c:347
-#: src/msgconv.c:283 src/msgen.c:266 src/msgexec.c:253 src/msgfilter.c:369
-#: src/msgfmt.c:518 src/msggrep.c:436 src/msgmerge.c:429 src/msguniq.c:312
-#: src/xgettext.c:635
+#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
+#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
+#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
+#: src/xgettext.c:728
+#, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
@@ -677,30 +765,34 @@ msgstr ""
 "ficheros\n"
 "                              de entrada\n"
 
-#: src/msgattrib.c:379 src/msgconv.c:285 src/msgexec.c:255 src/msgfilter.c:371
-#: src/msggrep.c:438 src/msgunfmt.c:346 src/msguniq.c:314
+#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
+#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Si no se especifica un fichero de entrada o si es -, se lee la entrada "
 "estándar.\n"
 
-#: src/msgattrib.c:382 src/msgcat.c:346 src/msgcomm.c:352 src/msgconv.c:288
-#: src/msgen.c:271 src/msgfilter.c:374 src/msgfmt.c:532 src/msggrep.c:441
-#: src/msginit.c:365 src/msgmerge.c:441 src/msgunfmt.c:370 src/msguniq.c:317
-#: src/xgettext.c:640
+#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
+#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
+#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
+#: src/xgettext.c:733
+#, c-format
 msgid "Output file location:\n"
 msgstr "Localización del fichero de salida:\n"
 
-#: src/msgattrib.c:384 src/msgcat.c:348 src/msgcomm.c:354 src/msgconv.c:290
-#: src/msgen.c:273 src/msgfilter.c:376 src/msgfmt.c:534 src/msggrep.c:443
-#: src/msgmerge.c:443 src/msgunfmt.c:372 src/msguniq.c:319
+#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
+#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
+#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=FICHERO   escribe la salida al FICHERO especificado\n"
 
-#: src/msgattrib.c:386 src/msgcat.c:350 src/msgcomm.c:356 src/msgconv.c:292
-#: src/msgen.c:275 src/msgfilter.c:378 src/msggrep.c:445 src/msgmerge.c:445
-#: src/msgunfmt.c:374 src/msguniq.c:321
+#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
+#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
+#: src/msgunfmt.c:384 src/msguniq.c:336
+#, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
@@ -708,182 +800,231 @@ msgstr ""
 "Los resultados se escriben a la salida estándar si no se especifica ningún\n"
 "fichero de salida o si es -.\n"
 
-#: src/msgattrib.c:390 src/msgcat.c:354 src/msgcomm.c:360 src/msguniq.c:325
+#: src/msgattrib.c:405 src/msgcat.c:370 src/msgcomm.c:375 src/msguniq.c:340
+#, c-format
 msgid "Message selection:\n"
 msgstr "Selección de mensaje:\n"
 
-#: src/msgattrib.c:392
+#: src/msgattrib.c:407
+#, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "     --translated             mantiene lo traducido, elimina los mensajes "
 "sin traducir\n"
 
-#: src/msgattrib.c:394
+#: src/msgattrib.c:409
+#, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          mantiene lo no traducido, elimina los mensajes "
 "traducidos\n"
 
-#: src/msgattrib.c:396
+#: src/msgattrib.c:411
+#, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              elimina los mensajes difusos marcados como "
 "'fuzzy'\n"
 
-#: src/msgattrib.c:398
+#: src/msgattrib.c:413
+#, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            mantiene los mensajes difusos marcados con "
 "'fuzzy'\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:415
+#, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           elimina los mensajes obsoletos #~\n"
 
-#: src/msgattrib.c:402
+#: src/msgattrib.c:417
+#, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         mantiene los mensajes obsoletos #~\n"
 
-#: src/msgattrib.c:405
+#: src/msgattrib.c:420
+#, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulación de atributos:\n"
 
-#: src/msgattrib.c:407
+#: src/msgattrib.c:422
+#, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 "      --set-fuzzy             marca todos los mensajes como difusos 'fuzzy'\n"
 
-#: src/msgattrib.c:409
+#: src/msgattrib.c:424
+#, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           marca todos los mensajes como no difusos "
 "(no-'fuzzy')\n"
 
-#: src/msgattrib.c:411
+#: src/msgattrib.c:426
+#, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 "      --set-obsolete          marca todos los mensajes como obsoletos\n"
 
-#: src/msgattrib.c:413
+#: src/msgattrib.c:428
+#, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        marca todos los mensajes como no-obsoletos\n"
 
-#: src/msgattrib.c:415
+#: src/msgattrib.c:430
+#, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=FICHERO.po  manipula sólo las entradas enlistadas en el "
 "FICHERO.po\n"
 
-#: src/msgattrib.c:417
+#: src/msgattrib.c:432
+#, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=FICHERO.po  manipula sólo las entradas no listadas en "
 "FICHERO.po\n"
 
-#: src/msgattrib.c:419
+#: src/msgattrib.c:434
+#, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 sinónimo de --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:421
+#: src/msgattrib.c:436
+#, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              sinónimo de --only-obsolete --clean-obsolete\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:366 src/msgcmp.c:201 src/msgcomm.c:372
-#: src/msgconv.c:303 src/msgen.c:279 src/msgexec.c:258 src/msgfilter.c:397
-#: src/msgfmt.c:565 src/msggrep.c:480 src/msginit.c:373 src/msgmerge.c:476
-#: src/msguniq.c:332
+#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
+#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
+#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
+#: src/msguniq.c:347
+#, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintáxis del fichero de entrada:\n"
 
-#: src/msgattrib.c:426 src/msgconv.c:305 src/msgen.c:281 src/msgexec.c:260
-#: src/msgfilter.c:399 src/msggrep.c:482 src/msginit.c:375 src/msguniq.c:334
+#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
+#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      el fichero de entrada está en la sintáxis de ."
 "properties de Java\n"
 
-#: src/msgattrib.c:429 src/msgcat.c:371 src/msgcomm.c:377 src/msgconv.c:308
-#: src/msgen.c:284 src/msgfilter.c:402 src/msgfmt.c:590 src/msggrep.c:485
-#: src/msginit.c:378 src/msgmerge.c:481 src/msgunfmt.c:378 src/msguniq.c:337
-#: src/xgettext.c:693
+#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
+#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#, c-format
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"    --stringtable-input     el fichero de entrada está en la sintáxis de ."
+"strings de NeXTstep/GNUstep\n"
+
+#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
+#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
+#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
+#: src/xgettext.c:808
+#, c-format
 msgid "Output details:\n"
 msgstr "Detalles de salida:\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:378 src/msgcomm.c:379 src/msgconv.c:310
-#: src/msgen.c:286 src/msgmerge.c:483 src/msgunfmt.c:380 src/msguniq.c:344
-#: src/xgettext.c:695
+#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
+#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
+#: src/xgettext.c:810
+#, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             no utiliza escapes de C en la salida (por "
 "defecto)\n"
 
-#: src/msgattrib.c:433 src/msgcat.c:380 src/msgcomm.c:381 src/msgconv.c:312
-#: src/msgen.c:288 src/msgfilter.c:406 src/msgmerge.c:485 src/msgunfmt.c:382
-#: src/msguniq.c:346 src/xgettext.c:697
+#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
+#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
+#: src/msguniq.c:363 src/xgettext.c:812
+#, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                utiliza escapes de C en la salida, sin "
 "carácteres extendidos\n"
 
-#: src/msgattrib.c:435 src/msgcat.c:382 src/msgcomm.c:383 src/msgconv.c:314
-#: src/msgen.c:290 src/msgfilter.c:408 src/msggrep.c:491 src/msgmerge.c:487
-#: src/msgunfmt.c:384 src/msguniq.c:348 src/xgettext.c:699
+#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
+#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
+#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po              escribe un fichero PO aún si está vacío\n"
 
-#: src/msgattrib.c:437 src/msgcat.c:384 src/msgcomm.c:385 src/msguniq.c:350
-#: src/xgettext.c:701
+#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
+#: src/xgettext.c:816
+#, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                escribe el fichero .po utilizando estilo con "
 "sangrados\n"
 
-#: src/msgattrib.c:439 src/msgcat.c:386 src/msgcomm.c:387 src/msguniq.c:352
-#: src/xgettext.c:703
+#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
+#: src/xgettext.c:818
+#, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           no escribe las líneas '#: fichero:línea'\n"
 
-#: src/msgattrib.c:441 src/msgcat.c:388 src/msgcomm.c:389 src/msguniq.c:354
-#: src/xgettext.c:705
+#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
+#: src/xgettext.c:820
+#, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location       genera líneas '#: fichero:línea' (por defecto)\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:390 src/msgcomm.c:391 src/msguniq.c:356
-#: src/xgettext.c:707
+#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
+#: src/xgettext.c:822
+#, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                escribe un fichero .po con Uniforum estricto\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:392 src/msgcomm.c:393 src/msgconv.c:324
-#: src/msgen.c:300 src/msgfilter.c:420 src/msggrep.c:501 src/msginit.c:384
-#: src/msgmerge.c:497 src/msgunfmt.c:390 src/msguniq.c:358
+#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
+#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
+#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     escribe un fichero .properties de Java\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:394 src/msgcomm.c:395 src/msgconv.c:326
-#: src/msgen.c:302 src/msgfilter.c:422 src/msggrep.c:503 src/msginit.c:386
-#: src/msgmerge.c:499 src/msgunfmt.c:392 src/msguniq.c:360 src/xgettext.c:711
+#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
+#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
+#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#, c-format
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"     --stringtable-output     escribe un fichero .strings de NeXTstep/"
+"GNUstep\n"
+
+#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
+#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
+#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NÚMERO          pone la anchura de la página de salida\n"
 
-#: src/msgattrib.c:449 src/msgcat.c:396 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:304 src/msgfilter.c:424 src/msggrep.c:505 src/msginit.c:388
-#: src/msgmerge.c:501 src/msgunfmt.c:394 src/msguniq.c:362 src/xgettext.c:713
+#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
+#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
+#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
@@ -893,31 +1034,33 @@ msgstr ""
 "                              sean mayores a la anchura de la página de "
 "salida\n"
 
-#: src/msgattrib.c:452 src/msgcat.c:399 src/msgcomm.c:400 src/msgconv.c:331
-#: src/msgen.c:307 src/msgfilter.c:427 src/msgmerge.c:504 src/msgunfmt.c:397
-#: src/msguniq.c:365 src/xgettext.c:716
+#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
+#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
+#: src/msguniq.c:384 src/xgettext.c:833
+#, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genera una salida ordenada\n"
 
-#: src/msgattrib.c:454 src/msgcat.c:401 src/msgcomm.c:402 src/msgconv.c:333
-#: src/msgen.c:309 src/msgfilter.c:429 src/msgmerge.c:506 src/msguniq.c:367
-#: src/xgettext.c:718
+#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
+#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
+#: src/xgettext.c:835
+#, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          ordena la salida por ubicación de fichero\n"
 
-#: src/msgcat.c:273 src/msgcomm.c:290
+#: src/msgcat.c:288 src/msgcomm.c:305
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "se especificó un criterio de selección imposible (%d < n < %d)"
 
-#: src/msgcat.c:315 src/msgcomm.c:322 src/xgettext.c:615
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]...\n"
 
-#: src/msgcat.c:320
-#, no-wrap
+#: src/msgcat.c:336
+#, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -942,22 +1085,26 @@ msgstr ""
 "fichero PO para definirlos. Las posiciones dentro del fichero de todos\n"
 "los ficheros PO se conservarán.  \n"
 
-#: src/msgcat.c:337 src/msgcomm.c:343 src/xgettext.c:631
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
+#, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FICHERODEENTRADA ...        ficheros de entrada\n"
 
-#: src/msgcat.c:339 src/msgcomm.c:345 src/xgettext.c:633
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=FICHERO    obtiene una lista de ficheros de entrada del "
 "FICHERO\n"
 
-#: src/msgcat.c:343 src/msgcomm.c:349 src/msgen.c:268 src/msgfmt.c:520
-#: src/xgettext.c:637
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
+#: src/xgettext.c:730
+#, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Si el fichero de entrada es -, se lee la entrada estándar.\n"
 
-#: src/msgcat.c:356 src/msgcomm.c:362
+#: src/msgcat.c:372 src/msgcomm.c:377
+#, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
@@ -967,7 +1114,8 @@ msgstr ""
 "                              definiciones, si no se especifica, es "
 "infinito\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:375
+#, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
@@ -976,7 +1124,8 @@ msgstr ""
 "de\n"
 "                              definiciones, si no se pone, utiliza 0\n"
 
-#: src/msgcat.c:362 src/msgcomm.c:368
+#: src/msgcat.c:378 src/msgcomm.c:383
+#, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
@@ -984,19 +1133,32 @@ msgstr ""
 "  -u, --unique                abreviatura de --less-than=2, solicita\n"
 "                              que sólo se impriman los mensajes únicos\n"
 
-#: src/msgcat.c:368 src/msgcmp.c:203 src/msgcomm.c:374 src/msgfmt.c:567
-#: src/msgmerge.c:478
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
+#: src/msgmerge.c:496
+#, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      los ficheros de entrada están en la sintáxis ."
 "properties de Java\n"
 
-#: src/msgcat.c:373 src/msgconv.c:298 src/msguniq.c:339
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
+#: src/msgmerge.c:498
+#, c-format
+msgid ""
+"      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
+"                              syntax\n"
+msgstr ""
+"      --stringtable-input     los ficheros de entrada están en la sintáxis\n"
+"                              .strings de NeXTstep/GNUstep.\n"
+
+#: src/msgcat.c:392 src/msgconv.c:314 src/msguniq.c:356
+#, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NOMBRE        codifica para la salida\n"
 
-#: src/msgcat.c:375 src/msguniq.c:341
+#: src/msgcat.c:394 src/msguniq.c:358
+#, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
@@ -1004,15 +1166,17 @@ msgstr ""
 "      -use-first              utiliza la primera traducción disponible para\n"
 "                              cada mensaje, no mezcla varias traducciones\n"
 
-#: src/msgcmp.c:146 src/msgmerge.c:294
+#: src/msgcmp.c:156 src/msgmerge.c:309
+#, c-format
 msgid "no input files given"
 msgstr "no se especificaron ficheros de entrada"
 
-#: src/msgcmp.c:151 src/msgmerge.c:299
+#: src/msgcmp.c:161 src/msgmerge.c:314
+#, c-format
 msgid "exactly 2 input files required"
 msgstr "se requieren exactamente 2 ficheros de entrada"
 
-#: src/msgcmp.c:170 src/msgmerge.c:403
+#: src/msgcmp.c:180 src/msgmerge.c:421
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Modo de empleo: %s [OPCIÓN] def.po ref.pot\n"
@@ -1077,8 +1241,8 @@ msgstr "Modo de empleo: %s [OPCIÓN] def.po ref.pot\n"
 # y en otros de otra (la frase no era exactamente igual).
 # 11061996mm: En particular en gettext el letrero es estándar, por lo que
 # prefiero "también son" que, creo suena mejor. Homogeinizo todo.
-#: src/msgcmp.c:175
-#, no-wrap
+#: src/msgcmp.c:185
+#, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
 "set of msgid strings.  The def.po file is an existing PO file with the\n"
@@ -1096,19 +1260,23 @@ msgstr ""
 "se encuentre un resultado exacto, se utilizará coincidencia difusa, de\n"
 "tal forma que la precisión del diagnóstico sea mejor.\n"
 
-#: src/msgcmp.c:189
+#: src/msgcmp.c:199
+#, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      traducciones\n"
 
-#: src/msgcmp.c:191
+#: src/msgcmp.c:201
+#, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.po                      referencias a las fuentes\n"
 
-#: src/msgcmp.c:196 src/msgmerge.c:469
+#: src/msgcmp.c:206 src/msgmerge.c:487
+#, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificadores de operación:\n"
 
-#: src/msgcmp.c:198 src/msgmerge.c:471
+#: src/msgcmp.c:208 src/msgmerge.c:489
+#, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
@@ -1116,20 +1284,23 @@ msgstr ""
 "  -m, --multi-domain          aplica ref.pot a cada uno de los dominios en\n"
 "                              def.po\n"
 
-#: src/msgcmp.c:272 src/msgmerge.c:922
+#: src/msgcmp.c:285 src/msgmerge.c:945
+#, c-format
 msgid "this message is used but not defined..."
 msgstr "este mensaje se usa pero no está definido..."
 
-#: src/msgcmp.c:274 src/msgmerge.c:924
+#: src/msgcmp.c:287 src/msgmerge.c:947
+#, c-format
 msgid "...but this definition is similar"
 msgstr "...pero esta definición es parecida"
 
-#: src/msgcmp.c:279 src/msgmerge.c:951
+#: src/msgcmp.c:292 src/msgmerge.c:974
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "este mensaje se usa pero no está definido en %s"
 
-#: src/msgcmp.c:383
+#: src/msgcmp.c:396
+#, c-format
 msgid "warning: this message is not used"
 msgstr "atención: este mensaje no se utiliza"
 
@@ -1154,19 +1325,20 @@ msgstr "atención: este mensaje no se utiliza"
 #
 # 07061996mm: Mujer fatal es menos que mortal, menos que peligroso e incita a la
 # aventura. Quizá no sea tan malo como dice Enrique, a menos que...
-#: src/msgcmp.c:390
+#: src/msgcmp.c:403
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "se encontró el error fatal %d"
 msgstr[1] "se encontraron %d errores fatales"
 
-#: src/msgcomm.c:279
+#: src/msgcomm.c:294
+#, c-format
 msgid "at least two files must be specified"
 msgstr "se deben especificar por lo menos dos ficheros"
 
-#: src/msgcomm.c:327
-#, no-wrap
+#: src/msgcomm.c:342
+#, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
@@ -1188,7 +1360,8 @@ msgstr ""
 "defina. Las posiciones dentro del fichero de todos los ficheros PO se\n"
 "conservarán.\n"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:380
+#, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
@@ -1197,66 +1370,76 @@ msgstr ""
 "                              número de definiciones, si no se pone,\n"
 "                              el valor por defecto es 0\n"
 
-#: src/msgcomm.c:404 src/xgettext.c:720
+#: src/msgcomm.c:424 src/xgettext.c:837
+#, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "     --omit-header          no escribe la línea de encabezado `msgid \"\"'\n"
 
-#: src/msgconv.c:272
+#: src/msgconv.c:288
+#, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "Convierte un catálogo de traducción a una codificación de carácteres "
 "distinta.\n"
 
-#: src/msgconv.c:296
+#: src/msgconv.c:312
+#, c-format
 msgid "Conversion target:\n"
 msgstr "Blanco de conversión:\n"
 
-#: src/msgconv.c:300
+#: src/msgconv.c:316
+#, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 "La codificación por defecto es la que está en uso por la funcion locale.\n"
 
-#: src/msgconv.c:316 src/msgen.c:292 src/msgmerge.c:489
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                estilo de salida con sangrías\n"
 
-#: src/msgconv.c:318 src/msgen.c:294 src/msgfilter.c:414 src/msggrep.c:495
-#: src/msgmerge.c:491
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
+#: src/msgmerge.c:512
+#, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           no escribe las líneas '#: fichero:línea'\n"
 
-#: src/msgconv.c:320 src/msgen.c:296 src/msgfilter.c:416 src/msggrep.c:497
-#: src/msgmerge.c:493
+#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
+#: src/msgmerge.c:514
+#, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location          genera líneas '#: fichero:línea' (por "
 "defecto)\n"
 
-#: src/msgconv.c:322 src/msgen.c:298 src/msgfilter.c:418 src/msggrep.c:499
-#: src/msgmerge.c:495
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
+#: src/msgmerge.c:516
+#, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/msgen.c:204 src/msgfmt.c:337 src/xgettext.c:451
+#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#, c-format
 msgid "no input file given"
 msgstr "no se especificó el fichero de entrada"
 
-#: src/msgen.c:209
+#: src/msgen.c:224
+#, c-format
 msgid "exactly one input file required"
 msgstr "se requieren exactamente un ficheros de entrada"
 
-#: src/msgen.c:247
+#: src/msgen.c:262
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Modo de empleo: %s [OPCIÓN] FICHEROENTRADA\n"
 
-#: src/msgen.c:252
-#, no-wrap
+#: src/msgen.c:267
+#, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
 "created English PO file, or a PO Template file (generally created by\n"
@@ -1268,21 +1451,23 @@ msgstr ""
 "(generalmente creado por xgettext). Las entradas no traducidas son\n"
 "asignadas a una traducción que es idéntica a la del msgid.\n"
 
-#: src/msgen.c:264
+#: src/msgen.c:279
+#, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  FICHEROENTRADA              fichero de entrada PO o POT\n"
 
-#: src/msgexec.c:181
+#: src/msgexec.c:192
+#, c-format
 msgid "missing command name"
 msgstr "Se omitió el nombre de la instrucción"
 
-#: src/msgexec.c:227
+#: src/msgexec.c:238
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Modo de empleo: %s [OPCIÓN] INSTRUCCIÓN [OPCIONES-DE-LA-INSTRUCCIÓN]\n"
 
-#: src/msgexec.c:232
-#, no-wrap
+#: src/msgexec.c:243
+#, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
 "The COMMAND can be any program that reads a translation from standard\n"
@@ -1297,8 +1482,8 @@ msgstr ""
 "msgexec es el máximo de los códigos de retornos obtenidos a lo largo de \n"
 "todas las invocaciones.\n"
 
-#: src/msgexec.c:241
-#, no-wrap
+#: src/msgexec.c:252
+#, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
@@ -1307,38 +1492,44 @@ msgstr ""
 "traducción, seguido por un byte nulo. La salida de \"msgexec 0\" se puede \n"
 "utilizar como entrada para \"xargs -0\".\n"
 
-#: src/msgexec.c:251 src/msgfilter.c:367
+#: src/msgexec.c:262 src/msgfilter.c:384
+#, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=FICHEROENTRADA  fichero PO de entrada\n"
 
-#: src/msgexec.c:309
+#: src/msgexec.c:322
+#, c-format
 msgid "write to stdout failed"
 msgstr "fallo en la escritura a la salida estándar"
 
-#: src/msgexec.c:332 src/msgfilter.c:615
+#: src/msgexec.c:345 src/msgfilter.c:637
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "fallo en la escritura la subproceso %s"
 
-#: src/msgfilter.c:268
+#: src/msgfilter.c:285
+#, c-format
 msgid "missing filter name"
 msgstr "falta el nombre del filtro"
 
-#: src/msgfilter.c:292
+#: src/msgfilter.c:309
+#, c-format
 msgid "at least one sed script must be specified"
 msgstr "se debe especificar al menos un guión de sed"
 
-#: src/msgfilter.c:354
+#: src/msgfilter.c:371
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Modo de empleo: %s [OPCIÓN] FILTRO [OPCIONES-DEL-FILTRO]\n"
 
-#: src/msgfilter.c:358
+#: src/msgfilter.c:375
+#, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 "Aplica un filtro a todas las traducciones de un catálogo de traducción.\n"
 
-#: src/msgfilter.c:382
+#: src/msgfilter.c:399
+#, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
@@ -1346,18 +1537,21 @@ msgstr ""
 "El FILTRO puede ser cualquier programa que lea una traducción de la entrada\n"
 "estándar y escriba una traducción modificada a la salida estándar.\n"
 
-#: src/msgfilter.c:387
+#: src/msgfilter.c:404
+#, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Algunas OPCIONES-DEL-FILTRO cuando el FILTRO es 'sed':\n"
 
-#: src/msgfilter.c:389
+#: src/msgfilter.c:406
+#, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=GUIÓN       añade un GUIÓN a las instrucciones que serán\n"
 "                               ejecutadas\n"
 
-#: src/msgfilter.c:391
+#: src/msgfilter.c:408
+#, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
 "commands\n"
@@ -1366,26 +1560,30 @@ msgstr ""
 "  -f, --file=FICHEROGUIÓN     añade el contenido del FICHEROGUIÓN a las\n"
 "                              instrucciones que serán ejecutadas\n"
 
-#: src/msgfilter.c:394
+#: src/msgfilter.c:411
+#, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent        elimina la impresión automática del espacio\n"
 "                               de patrones\n"
 
-#: src/msgfilter.c:404 src/msggrep.c:487
+#: src/msgfilter.c:423 src/msggrep.c:506
+#, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             no utiliza las secuencias de escape tipo C\n"
 "                              en la salida (por defecto)\n"
 
-#: src/msgfilter.c:410 src/msggrep.c:493
+#: src/msgfilter.c:429 src/msggrep.c:512
+#, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 "      --indent                escribe el fichero .po utilizando sangrías\n"
 
-#: src/msgfilter.c:412
+#: src/msgfilter.c:431
+#, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
@@ -1393,90 +1591,92 @@ msgstr ""
 "modificación,\n"
 "                              es decir, no la filtra\n"
 
-#: src/msgfilter.c:539
+#: src/msgfilter.c:560
+#, c-format
 msgid "Not yet implemented."
 msgstr "Aún no está implementado."
 
-#: src/msgfilter.c:567
+#: src/msgfilter.c:589
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "no se puede eliminar el bloqueo de la E/S del subproceso %s"
 
-#: src/msgfilter.c:595
+#: src/msgfilter.c:617
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "fallo en la comunicación con el subproceso %s"
 
-#: src/msgfilter.c:646
+#: src/msgfilter.c:668
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "fallo en la lectura del subproceso %s"
 
-#: src/msgfilter.c:662
+#: src/msgfilter.c:684
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "el subproceso %s terminó con un código de salida %d"
 
-#: src/msgfmt.c:288
+#: src/msgfmt.c:299
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "el argumento a %s debe ser un solo carácter de puntuación"
 
-#: src/msgfmt.c:355 src/msgfmt.c:377 src/msgunfmt.c:255
+#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s requiere que se especifique un \"-d directorio\""
 
-#: src/msgfmt.c:370 src/msgunfmt.c:248
+#: src/msgfmt.c:393 src/msgunfmt.c:258
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s requiere que se especifique un \"-l local\""
 
-#: src/msgfmt.c:386 src/msgmerge.c:316 src/msgmerge.c:322 src/msgunfmt.c:264
-#: src/msgunfmt.c:270
+#: src/msgfmt.c:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
+#: src/msgunfmt.c:280
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s sólo es válido con %s"
 
-#: src/msgfmt.c:392 src/msgfmt.c:398
+#: src/msgfmt.c:415 src/msgfmt.c:421
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s sólo es válido con %s o %s"
 
-#: src/msgfmt.c:470
+#: src/msgfmt.c:503
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensaje traducido"
 msgstr[1] "%d mensajes traducidos"
 
-#: src/msgfmt.c:475
+#: src/msgfmt.c:508
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traducción difusa"
 msgstr[1] ", %d traducciones difusas"
 
-#: src/msgfmt.c:480
+#: src/msgfmt.c:513
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mensaje sin traducir"
 msgstr[1] ", %d mensajes sin traducir"
 
-#: src/msgfmt.c:500
+#: src/msgfmt.c:533
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Modo de empleo: %s [OPCIÓN] fichero.po ...\n"
 
-#: src/msgfmt.c:504
+#: src/msgfmt.c:537
+#, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Genera un catálogo binario de mensajes a partir de la descripción de la "
 "traducción textual.\n"
 
-#: src/msgfmt.c:509 src/xgettext.c:624
-#, no-wrap
+#: src/msgfmt.c:542 src/xgettext.c:717
+#, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
@@ -1484,15 +1684,18 @@ msgstr ""
 "Los argumentos obligatorios en las opciones largas también lo son para las \n"
 "opciones cortas. De forma similar se comportan los argumentos opcionales.\n"
 
-#: src/msgfmt.c:516
+#: src/msgfmt.c:549
+#, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  fichero.po ...             ficheros de entrada\n"
 
-#: src/msgfmt.c:523 src/msgmerge.c:435 src/msgunfmt.c:335 src/xgettext.c:671
+#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#, c-format
 msgid "Operation mode:\n"
 msgstr "Modo de operación:\n"
 
-#: src/msgfmt.c:525
+#: src/msgfmt.c:558
+#, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
@@ -1500,7 +1703,8 @@ msgstr ""
 "  -j, --java                  Modo Java: la entrada es una clase de Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:527
+#: src/msgfmt.c:560
+#, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
@@ -1508,42 +1712,55 @@ msgstr ""
 "      --java2                 como --java, y supone el uso de Java2\n"
 "                              (JDK 1.2 o superior)\n"
 
-#: src/msgfmt.c:529
+#: src/msgfmt.c:562
+#, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Modo tcl: genera un fichero .msg tcl/msgcat\n"
 
-#: src/msgfmt.c:536
+#: src/msgfmt.c:564
+#, c-format
+msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgstr "      --qt                    Modo Qt: genera un fichero .qm de Qt\n"
+
+#: src/msgfmt.c:571
+#, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
-#: src/msgfmt.c:538 src/xgettext.c:648
+#: src/msgfmt.c:573 src/xgettext.c:741
+#, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Si el fichero de salida es -,  se escribe en la salida estándar.\n"
 
-#: src/msgfmt.c:541
+#: src/msgfmt.c:576
+#, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Localización del fichero de salida en modo Java:\n"
 
-#: src/msgfmt.c:543 src/msgunfmt.c:351
+#: src/msgfmt.c:578 src/msgunfmt.c:361
+#, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RECURSO      nombre del recurso\n"
 
-#: src/msgfmt.c:545 src/msgfmt.c:557 src/msgunfmt.c:353 src/msgunfmt.c:362
+#: src/msgfmt.c:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 "  -l, --locale=LOCAL          nombre local, ya sea idioma o idioma_PAIS\n"
 
-#: src/msgfmt.c:547
+#: src/msgfmt.c:582
+#, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRECTORIO               directorio base de la jerarquía de clases\n"
 
-#: src/msgfmt.c:549
+#: src/msgfmt.c:584
+#, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
 "name,\n"
@@ -1554,17 +1771,20 @@ msgstr ""
 "recurso, separados por un guión bajo. La opción -d es obligatoria. La clase\n"
 "se escribe bajo el directorio especificado.\n"
 
-#: src/msgfmt.c:555
+#: src/msgfmt.c:590
+#, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Localización del fichero de salida en modo Tcl:\n"
 
-#: src/msgfmt.c:559 src/msgunfmt.c:364
+#: src/msgfmt.c:594 src/msgunfmt.c:374
+#, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORIO               directorio base de los catálogos de\n"
 "                              mensajes .msg\n"
 
-#: src/msgfmt.c:561
+#: src/msgfmt.c:596
+#, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
@@ -1572,11 +1792,13 @@ msgstr ""
 "Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n"
 "el directorio especificado.\n"
 
-#: src/msgfmt.c:570 src/xgettext.c:663
+#: src/msgfmt.c:608 src/xgettext.c:757
+#, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretación del fichero de entrada:\n"
 
-#: src/msgfmt.c:572
+#: src/msgfmt.c:610
+#, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
 "                                --check-format, --check-header, --check-"
@@ -1586,14 +1808,16 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:575
+#: src/msgfmt.c:613
+#, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          revisa las cadenas de formato dependientes "
 "del\n"
 "                              idioma\n"
 
-#: src/msgfmt.c:577
+#: src/msgfmt.c:615
+#, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
@@ -1601,7 +1825,8 @@ msgstr ""
 "      --check-header          verifica la presencia y contenido de la\n"
 "                              línea de encabezado\n"
 
-#: src/msgfmt.c:579
+#: src/msgfmt.c:617
+#, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
@@ -1610,7 +1835,8 @@ msgstr ""
 "instrucciones\n"
 "                              del dominio y la opción --output-file\n"
 
-#: src/msgfmt.c:582
+#: src/msgfmt.c:620
+#, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
@@ -1619,7 +1845,8 @@ msgstr ""
 "el\n"
 "                              msgfmt de X/Open\n"
 
-#: src/msgfmt.c:584
+#: src/msgfmt.c:622
+#, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
 "for\n"
@@ -1628,12 +1855,13 @@ msgstr ""
 "       --check-accelerators[=CAR]  revisa la presencia de aceleradores de\n"
 "                                   teclado para los elementos del menú\n"
 
-#: src/msgfmt.c:587
+#: src/msgfmt.c:625
+#, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             utiliza entradas difusas para la salida\n"
 
-#: src/msgfmt.c:592
+#: src/msgfmt.c:630
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -1641,43 +1869,50 @@ msgstr ""
 "   -a, --alignment=NÚMERO      alínea las cadenas al NÚMERO de bytes\n"
 "                               (por defecto es: %d)\n"
 
-#: src/msgfmt.c:594
+#: src/msgfmt.c:632
+#, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               el fichero binario no incluirá la tabla de "
 "hash\n"
 
-#: src/msgfmt.c:603
+#: src/msgfmt.c:641
+#, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            muestra las estadísticas sobre las "
 "traducciones\n"
 
-#: src/msgfmt.c:605 src/msgmerge.c:515 src/msgunfmt.c:406
+#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
+#, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               aumenta el cantidad de mensajes\n"
 
-#: src/msgfmt.c:743
+#: src/msgfmt.c:781
+#, c-format
 msgid "plural expression can produce negative values"
 msgstr "la expresión plural puede producir resultados negativos"
 
-#: src/msgfmt.c:756
+#: src/msgfmt.c:794
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu pero las expresiones plurales pueden producir valores tan "
 "grades como %lu"
 
-#: src/msgfmt.c:782
+#: src/msgfmt.c:821
+#, c-format
 msgid "plural expression can produce division by zero"
 msgstr "la expresión plural puede producir una división por cero"
 
-#: src/msgfmt.c:787
+#: src/msgfmt.c:827
+#, c-format
 msgid "plural expression can produce integer overflow"
 msgstr "la expresión plural puede producir un sobreflujo entero"
 
-#: src/msgfmt.c:792
+#: src/msgfmt.c:833
+#, c-format
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -1685,51 +1920,57 @@ msgstr ""
 "la expresión plural puede producir excepciones aritméticas, posiblemente una "
 "división por cero"
 
-#: src/msgfmt.c:870 src/msgfmt.c:882
+#: src/msgfmt.c:911 src/msgfmt.c:923
+#, c-format
 msgid "message catalog has plural form translations..."
 msgstr "el catálogo de mensajes tiene formas plurales en las traducciones..."
 
-#: src/msgfmt.c:873
+#: src/msgfmt.c:914
+#, c-format
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "... pero el encabezado no tiene el atributo \"plural=EXPRESIÓN\""
 
-#: src/msgfmt.c:885
+#: src/msgfmt.c:926
+#, c-format
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "... pero el encabezado no tiene el atributo \"nplurals=ENTERO\""
 
-#: src/msgfmt.c:910
+#: src/msgfmt.c:951
+#, c-format
 msgid "invalid nplurals value"
 msgstr "valor inválido de nplurals"
 
-#: src/msgfmt.c:924
+#: src/msgfmt.c:965
+#, c-format
 msgid "invalid plural expression"
 msgstr "expresión plural inválida"
 
-#: src/msgfmt.c:943 src/msgfmt.c:958
+#: src/msgfmt.c:984 src/msgfmt.c:999
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu ..."
 
-#: src/msgfmt.c:946
+#: src/msgfmt.c:987
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
 msgstr[0] "... pero algunos mensajes sólo tienen solo una forma plural"
 msgstr[1] "... pero algunos mensajes sólo tienen %lu formas plurales"
 
-#: src/msgfmt.c:961
+#: src/msgfmt.c:1002
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
 msgstr[0] "... pero algunos mensajes tienen solo una forma plural"
 msgstr[1] "... pero algunos mensajes tienen %lu formas plurales"
 
-#: src/msgfmt.c:991
+#: src/msgfmt.c:1032
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr "Pruebe utilizando lo siguiente, válido para %s:\n"
 
-#: src/msgfmt.c:1004
+#: src/msgfmt.c:1045
+#, c-format
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1753,7 +1994,8 @@ msgstr ""
 # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
 # Si no se te ocurre nada mejor, sugerencia:
 # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgfmt.c:1038
+#: src/msgfmt.c:1079
+#, c-format
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "a alguna de las líneas `msgid' y `msgid_plural' les falta el `\\n' inicial"
@@ -1774,7 +2016,7 @@ msgstr ""
 # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
 # Si no se te ocurre nada mejor, sugerencia:
 # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgfmt.c:1048
+#: src/msgfmt.c:1089
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
@@ -1796,99 +2038,107 @@ msgstr ""
 # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
 # Si no se te ocurre nada mejor, sugerencia:
 # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1101
+#, c-format
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' inicial"
 
 # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
 # y la otra no, así de sencillo. sv+
-#: src/msgfmt.c:1077
+#: src/msgfmt.c:1118
+#, c-format
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "a alguna de las líneas `msgid' y `msgid_plural' les falta el `\\n' final"
 
 # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
 # y la otra no, así de sencillo. sv+
-#: src/msgfmt.c:1087
+#: src/msgfmt.c:1128
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "a alguna de las líneas `msgid' y `msgstr[%u]' les falta el `\\n' final"
 
 # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
 # y la otra no, así de sencillo. sv+
-#: src/msgfmt.c:1099
+#: src/msgfmt.c:1140
+#, c-format
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' final"
 
-#: src/msgfmt.c:1111
+#: src/msgfmt.c:1152
+#, c-format
 msgid "plural handling is a GNU gettext extension"
 msgstr "el manejo del plural es una extensión del gettext de GNU"
 
-#: src/msgfmt.c:1178
+#: src/msgfmt.c:1219
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 "'%s' no es un formato de cadena válido %s, a diferencia de 'msgid'. Razón: %s"
 
-#: src/msgfmt.c:1220
+#: src/msgfmt.c:1261
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr no tiene la marca del acelerador de teclado '%c'"
 
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr tiene demasiadas marcas de aceleración de teclado '%c'"
 
-#: src/msgfmt.c:1262
+#: src/msgfmt.c:1303
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "no existe el campo `%s' en la cabecera\n"
 
-#: src/msgfmt.c:1266
+#: src/msgfmt.c:1307
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "el campo de encabezado `%s' debe comenzar al principio de la línea\n"
 
-#: src/msgfmt.c:1277
+#: src/msgfmt.c:1318
 msgid "some header fields still have the initial default value\n"
 msgstr "algunos campos de cabecera aún tienen el valor inicial por defecto\n"
 
-#: src/msgfmt.c:1289
+#: src/msgfmt.c:1330
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "el campo `%s' aún tiene el valor inicial por defecto\n"
 
-#: src/msgfmt.c:1347
+#: src/msgfmt.c:1388
+#, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "atención: el encabezado del fichero PO no existe o es inválido\n"
 
-#: src/msgfmt.c:1350
+#: src/msgfmt.c:1391
+#, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "atención: la conversión del conjunto de caracteres no funcionará\n"
 
-#: src/msgfmt.c:1360
+#: src/msgfmt.c:1401
+#, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "atención: el encabezado del fichero PO está difuso\n"
 
-#: src/msgfmt.c:1362
+#: src/msgfmt.c:1403
+#, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "atención: las versiones anteriores de msgfmt producirán un error en esto\n"
 
-#: src/msgfmt.c:1385
+#: src/msgfmt.c:1426
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "el nombre de dominio \"%s\" no es válido como nombre de fichero"
 
-#: src/msgfmt.c:1390
+#: src/msgfmt.c:1431
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "el nombre del dominio \"%s\" no es válido como nombre de fichero:\n"
 "se utilizará un prefijo"
 
-#: src/msgfmt.c:1404
+#: src/msgfmt.c:1445
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "la instrucción `domain %s' no tiene efecto"
@@ -1897,30 +2147,32 @@ msgstr "la instrucción `domain %s' no tiene efecto"
 # Ignorar es no saber (not to know). "to ignore" es "no hacer caso".
 # Sugerencia: Descartar. sv
 # Excelente palabreja. Me gusta mucho. mm
-#: src/msgfmt.c:1458
+#: src/msgfmt.c:1499
+#, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "se descarta la línea vacía `msgstr'"
 
 # Lo mismo. sv
 # Ok. mm
-#: src/msgfmt.c:1459
+#: src/msgfmt.c:1500
+#, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "se descarta la línea difusa `msgstr'"
 
-#: src/msgfmt.c:1517
+#: src/msgfmt.c:1558
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
 
-#: src/msggrep.c:404
+#: src/msggrep.c:421
 #, c-format
 msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
 msgstr ""
 "la opción '%c' no se puede usar antes de que 'K', 'T' o 'C' hayan sido "
 "especificadas"
 
-#: src/msggrep.c:424
-#, no-wrap
+#: src/msggrep.c:441
+#, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
@@ -1928,8 +2180,8 @@ msgstr ""
 "Extrae todos los mensajes de un catálogo de traducción que coincidan con un\n"
 "patrón dado o pertenezcan a algunos de los ficheros fuente dados.\n"
 
-#: src/msggrep.c:450
-#, no-wrap
+#: src/msggrep.c:467
+#, c-format, no-wrap
 msgid ""
 "Message selection:\n"
 "  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
@@ -1993,7 +2245,8 @@ msgstr ""
 "-f, --file=FICHERO           obtiene al PATRÓN del FICHERO\n"
 "-i, --ignore-case            indistingue si es mayúsculas o minúsculas\n"
 
-#: src/msggrep.c:489
+#: src/msggrep.c:508
+#, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
@@ -2001,20 +2254,23 @@ msgstr ""
 "caracteres\n"
 "                              extendidos\n"
 
-#: src/msggrep.c:508
+#: src/msggrep.c:529
+#, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           genera una salida ordenada\n"
 
-#: src/msggrep.c:510
+#: src/msggrep.c:531
+#, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          ordena la salida por localización de ficheros\n"
 
-#: src/msggrep.c:581
+#: src/msggrep.c:602
+#, c-format
 msgid "write to grep subprocess failed"
 msgstr "fallo en la escritura al subproceso grep"
 
-#: src/msginit.c:278
+#: src/msginit.c:293
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2024,7 +2280,7 @@ msgstr ""
 "de entorno LANG, tal como se describe en el fichero ABOUT-NLS. Esto\n"
 "es necesario para que se puedan probar las traducciones.\n"
 
-#: src/msginit.c:306
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2035,13 +2291,13 @@ msgstr ""
 "Favor de especificar el formato local a través de la opción --locale o\n"
 "el fichero de salida .po a través de la opción --output-file.\n"
 
-#: src/msginit.c:329
+#: src/msginit.c:345
 #, c-format
 msgid "Created %s.\n"
 msgstr "Creado %s.\n"
 
-#: src/msginit.c:349
-#, no-wrap
+#: src/msginit.c:365
+#, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
@@ -2049,11 +2305,13 @@ msgstr ""
 "Crea un nuevo fichero PO, inicializando la metainformación con valores\n"
 "tomados del entorno del usuario.\n"
 
-#: src/msginit.c:359
+#: src/msginit.c:375
+#, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=FICHEROENTRADA  fichero de entrada POT\n"
 
-#: src/msginit.c:361
+#: src/msginit.c:377
+#, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
 "file.\n"
@@ -2062,12 +2320,14 @@ msgstr ""
 "Si no se da el fichero de entrada, el fichero POT se busca en el directorio\n"
 "actual. Si es -, se lee la entrada estándar.\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:383
+#, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=FICHERO   escribe la salida al fichero PO especificado\n"
 
-#: src/msginit.c:369
+#: src/msginit.c:385
+#, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
@@ -2076,19 +2336,21 @@ msgstr ""
 "de la selección local del usuario. Si es -, los resultados se escriben en\n"
 "la salida estándar.\n"
 
-#: src/msginit.c:380
+#: src/msginit.c:398
+#, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 "   -o, --output-file=FICHERO   escribe la salida al fichero PO especificado\n"
 
-#: src/msginit.c:382
+#: src/msginit.c:400
+#, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         supone que el fichero PO será generado\n"
 "                              automáticamente\n"
 
-#: src/msginit.c:436
+#: src/msginit.c:456
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2097,11 +2359,12 @@ msgstr ""
 "Favor de especificar el fichero .pot de entrada utilizando la opción --"
 "input\n"
 
-#: src/msginit.c:444 src/msginit.c:449
+#: src/msginit.c:464 src/msginit.c:469
+#, c-format
 msgid "error reading current directory"
 msgstr "error en la lectura del directorio actual"
 
-#: src/msginit.c:457
+#: src/msginit.c:477
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2110,23 +2373,24 @@ msgstr ""
 "Favor de especificar el fichero .pot de entrada utilizando la opción --"
 "input\n"
 
-#: src/msginit.c:905 src/msginit.c:957 src/msginit.c:1100 src/msginit.c:1167
-#: src/read-java.c:71 src/read-tcl.c:107
+#: src/msginit.c:937 src/msginit.c:1004 src/msginit.c:1162 src/msginit.c:1244
+#: src/read-java.c:71 src/read-tcl.c:108
+#, c-format
 msgid "fdopen() failed"
 msgstr "fallo en fdopen()"
 
-#: src/msginit.c:910 src/msginit.c:962 src/msginit.c:1105
+#: src/msginit.c:945 src/msginit.c:1012 src/msginit.c:1170
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "error de E/S en el subproceso %s"
 
-#: src/msginit.c:919 src/msginit.c:971 src/msginit.c:1114 src/msginit.c:1181
-#: src/read-java.c:81 src/read-tcl.c:123
+#: src/msginit.c:957 src/msginit.c:1024 src/msginit.c:1182 src/msginit.c:1261
+#: src/read-java.c:81 src/read-tcl.c:124
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "fallo en el subproceso %s con código de salida %d"
 
-#: src/msginit.c:1090
+#: src/msginit.c:1148
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2142,7 +2406,7 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1449
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traducciones al español para el paquete %s"
@@ -2178,7 +2442,7 @@ msgstr ""
 "el dominio \"%s\" en el fichero de entrada `%s' no contiene una línea de\n"
 "encabezado con la especificación del conjunto de caracteres"
 
-#: src/msgl-cat.c:380 src/msgl-iconv.c:392
+#: src/msgl-cat.c:380 src/msgl-iconv.c:403
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
@@ -2186,12 +2450,14 @@ msgstr ""
 "portátil."
 
 #: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:837 src/write-po.c:903
-#: src/xgettext.c:1306
+#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
+#: src/xgettext.c:1989
+#, c-format
 msgid "warning: "
 msgstr "atención: "
 
 #: src/msgl-cat.c:431
+#, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
@@ -2266,16 +2532,18 @@ msgstr ""
 "Una alternativa posible s poner LC_ALL=C.\n"
 
 #: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#, c-format
 msgid "conversion failure"
 msgstr "falla de conversión"
 
 #: src/msgl-iconv.c:337
+#, c-format
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "El fichero de entrada no contiene una línea de encabezado que especifique el "
 "conjunto de caracteres"
 
-#: src/msgl-iconv.c:355 src/xgettext.c:505
+#: src/msgl-iconv.c:356 src/xgettext.c:586
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2284,7 +2552,16 @@ msgstr ""
 "No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(), e iconv()\n"
 "no soporta este tipo de conversión."
 
-#: src/msgl-iconv.c:372 src/xgettext.c:512
+#: src/msgl-iconv.c:378
+#, c-format
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"La conversión de \"%s\" a \"%s\" introduce duplicados: algunos msgid "
+"distintos se vuelven iguales."
+
+#: src/msgl-iconv.c:383 src/xgettext.c:593
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2293,12 +2570,12 @@ msgstr ""
 "No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv().\n"
 "Esta versión fue construida sin iconv()."
 
-#: src/msgmerge.c:373
+#: src/msgmerge.c:391
 msgid "backup type"
 msgstr "tipo de respaldo"
 
-#: src/msgmerge.c:408
-#, no-wrap
+#: src/msgmerge.c:426
+#, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
 "existing PO file with translations which will be taken over to the newly\n"
@@ -2320,17 +2597,20 @@ msgstr ""
 "haya una coincidencia exacta, se utilizará el método de comparación difusa\n"
 "para obtener mejores resultados.\n"
 
-#: src/msgmerge.c:425
+#: src/msgmerge.c:443
+#, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      traducciones que se refieren a las viejas "
 "fuentes\n"
 
-#: src/msgmerge.c:427
+#: src/msgmerge.c:445
+#, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referencias a las nuevas fuentes\n"
 
-#: src/msgmerge.c:431
+#: src/msgmerge.c:449
+#, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
@@ -2339,7 +2619,8 @@ msgstr ""
 "mensajes,\n"
 "                              puede ser especificada más de una vez\n"
 
-#: src/msgmerge.c:437
+#: src/msgmerge.c:455
+#, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
@@ -2347,23 +2628,28 @@ msgstr ""
 "   -U, --update                actualiza def.po,\n"
 "                               no hace nada si def.po ya está actualizado\n"
 
-#: src/msgmerge.c:449
+#: src/msgmerge.c:467
+#, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Localización del fichero de salida en modo de actualización:\n"
 
-#: src/msgmerge.c:451
+#: src/msgmerge.c:469
+#, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "El resultado se escribió sobre def.po.\n"
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:471
+#, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        hace un respado de def.po\n"
 
-#: src/msgmerge.c:455
+#: src/msgmerge.c:473
+#, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFIJO         sobreescribe el sufijo de respaldo\n"
 
-#: src/msgmerge.c:457
+#: src/msgmerge.c:475
+#, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
 "through\n"
@@ -2383,7 +2669,8 @@ msgstr ""
 "                   no es así\n"
 "   simple, never   siempre hace backups sencillos\n"
 
-#: src/msgmerge.c:464
+#: src/msgmerge.c:482
+#, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
@@ -2392,23 +2679,27 @@ msgstr ""
 "El sufijo del respaldo es `~', a menos que se modifique con --suffix o con\n"
 "la variable de entorno SIMPLE_BACKUP_SUFFIX\n"
 
-#: src/msgmerge.c:473
+#: src/msgmerge.c:491
+#, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     no utiliza la coincidencia difusa\n"
 
-#: src/msgmerge.c:517
+#: src/msgmerge.c:540
+#, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       suprime los indicadores de progreso\n"
 
-#: src/msgmerge.c:1004
+#: src/msgmerge.c:1024
+#, c-format
 msgid "this message should define plural forms"
 msgstr "este mensaje debería definir las formas plurales"
 
-#: src/msgmerge.c:1027
+#: src/msgmerge.c:1047
+#, c-format
 msgid "this message should not define plural forms"
 msgstr "este mensaje no debería definir las formas plurales"
 
-#: src/msgmerge.c:1193
+#: src/msgmerge.c:1213
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2418,27 +2709,29 @@ msgstr ""
 "incorporados %ld, convertidos en difusos %ld, faltan %ld, obsoletos %ld.\n"
 
 # Porque no mejor poner simplemente 'fin'? mm++
-#: src/msgmerge.c:1201
+#: src/msgmerge.c:1221
 msgid " done.\n"
 msgstr " terminado.\n"
 
-#: src/msgunfmt.c:233 src/msgunfmt.c:242
+#: src/msgunfmt.c:243 src/msgunfmt.c:252
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s y los nombres de ficheros explícitos son mutuamente excluyentes"
 
-#: src/msgunfmt.c:324
+#: src/msgunfmt.c:334
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [FICHERO]...\n"
 
-#: src/msgunfmt.c:328
+#: src/msgunfmt.c:338
+#, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 "Convierte el catálogo de mensajes binarios al fichero de estilo Uniforum ."
 "po.\n"
 
-#: src/msgunfmt.c:337
+#: src/msgunfmt.c:347
+#, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
@@ -2446,22 +2739,26 @@ msgstr ""
 "  -j, --java                  Modo Java: la entrada es una clase de Java \n"
 "                              ResourceBundle\n"
 
-#: src/msgunfmt.c:339
+#: src/msgunfmt.c:349
+#, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Modo Tcl: la entrada es un fichero .msg tcl/"
 "msgcat\n"
 
-#: src/msgunfmt.c:344
+#: src/msgunfmt.c:354
+#, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FICHERO ...                 ficheros .mo de entrada\n"
 
-#: src/msgunfmt.c:349
+#: src/msgunfmt.c:359
+#, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Localización del fichero de entrada en modo Java:\n"
 
-#: src/msgunfmt.c:355
+#: src/msgunfmt.c:365
+#, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
 "name,\n"
@@ -2471,11 +2768,13 @@ msgstr ""
 "recurso, separado por un guión bajo. La clase se localiza utilizando la\n"
 "variable de entorno CLASSPATH.\n"
 
-#: src/msgunfmt.c:360
+#: src/msgunfmt.c:370
+#, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Localización del fichero de entrada en modo Tcl:\n"
 
-#: src/msgunfmt.c:366
+#: src/msgunfmt.c:376
+#, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
@@ -2483,17 +2782,19 @@ msgstr ""
 "Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n"
 "el directorio especificado.\n"
 
-#: src/msgunfmt.c:386
+#: src/msgunfmt.c:396
+#, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 "  -i, --indent                escribe el fichero .po utilizando sangrías\n"
 
-#: src/msgunfmt.c:388
+#: src/msgunfmt.c:398
+#, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
-#: src/msguniq.c:294
-#, no-wrap
+#: src/msguniq.c:309
+#, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
 "Finds duplicate translations of the same message ID.  Such duplicates are\n"
@@ -2515,11 +2816,13 @@ msgstr ""
 "ficheros serán acumuladas. Cuando se utiliza la opción --unique, los \n"
 "duplicados se descartan.\n"
 
-#: src/msguniq.c:327
+#: src/msguniq.c:342
+#, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              muestra únicamente los duplicados\n"
 
-#: src/msguniq.c:329
+#: src/msguniq.c:344
+#, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
@@ -2566,6 +2869,7 @@ msgstr ""
 "e iconv() no soporta \"%s\".\n"
 
 #: src/po-charset.c:304 src/po-charset.c:330
+#, c-format
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2588,6 +2892,7 @@ msgstr ""
 "Esta versión fue construida sin iconv().\n"
 
 #: src/po-charset.c:349
+#, c-format
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2597,26 +2902,32 @@ msgstr ""
 "funcionará.\n"
 
 #: src/po-gram-gen.y:94
+#, c-format
 msgid "inconsistent use of #~"
 msgstr "uso inconsistente de #~"
 
 #: src/po-gram-gen.y:198
+#, c-format
 msgid "missing `msgstr[]' section"
 msgstr "no hay sección `msgstr'"
 
 #: src/po-gram-gen.y:206
+#, c-format
 msgid "missing `msgid_plural' section"
 msgstr "no hay sección `msgstr'"
 
 #: src/po-gram-gen.y:213
+#, c-format
 msgid "missing `msgstr' section"
 msgstr "no hay sección `msgstr'"
 
 #: src/po-gram-gen.y:258
+#, c-format
 msgid "first plural form has nonzero index"
 msgstr "la primera forma del plural tiene un índice distinto a cero"
 
 #: src/po-gram-gen.y:260
+#, c-format
 msgid "plural form has wrong index"
 msgstr "la primera forma del plural tiene un índice incorrecto"
 
@@ -2653,49 +2964,59 @@ msgstr "la primera forma del plural tiene un índice incorrecto"
 # 20071996sv: Eso no seguiría la regla implícita de que el programa no debe
 # hablar en primera persona sino en estilo impersonal.
 # (Esta regla estará en el manual de Enrique, con toda seguridad).
-#: src/po-lex.h:86 src/po-lex.h:101 src/po-lex.h:121 src/po-lex.h:136
-#: src/po-lex.c:101 src/po-lex.c:130
+#: src/po-lex.h:92 src/po-lex.h:107 src/po-lex.h:127 src/po-lex.h:142
+#: src/po-lex.c:103 src/po-lex.c:132
+#, c-format
 msgid "too many errors, aborting"
 msgstr "demasiados errores, programa interrumpido"
 
-#: src/po-lex.c:454 src/write-po.c:541 src/write-po.c:647
+#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
+#, c-format
 msgid "invalid multibyte sequence"
 msgstr "sucesión de multibyte inválida"
 
-#: src/po-lex.c:480
+#: src/po-lex.c:486
+#, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "sucesión de multibyte inválida al final del fichero"
 
-#: src/po-lex.c:490
+#: src/po-lex.c:496
+#, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "sucesión de multibyte inválida al final de la línea"
 
-#: src/po-lex.c:498
+#: src/po-lex.c:504
+#, c-format
 msgid "iconv failure"
 msgstr "fallo en iconv"
 
-#: src/po-lex.c:643 src/read-mo.c:79 src/x-awk.c:155 src/x-c.c:260
-#: src/x-elisp.c:142 src/x-glade.c:362 src/x-librep.c:144 src/x-lisp.c:204
-#: src/x-php.c:160 src/x-python.c:178 src/x-rst.c:225 src/x-smalltalk.c:106
-#: src/x-tcl.c:145 src/x-ycp.c:94
+#: src/po-lex.c:666 src/read-mo.c:79 src/read-properties.c:80
+#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:352 src/x-elisp.c:149
+#: src/x-glade.c:406 src/x-java.c:174 src/x-librep.c:151 src/x-lisp.c:214
+#: src/x-perl.c:230 src/x-perl.c:304 src/x-perl.c:397 src/x-php.c:161
+#: src/x-python.c:167 src/x-rst.c:232 src/x-sh.c:156 src/x-smalltalk.c:88
+#: src/x-tcl.c:150 src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error al leer \"%s\""
 
-#: src/po-lex.c:707
+#: src/po-lex.c:737
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palabra clave \"%s\" desconocida"
 
-#: src/po-lex.c:817
+#: src/po-lex.c:847
+#, c-format
 msgid "invalid control sequence"
 msgstr "secuencia de control ilegal"
 
-#: src/po-lex.c:925
+#: src/po-lex.c:955
+#, c-format
 msgid "end-of-file within string"
 msgstr "fin de fichero dentro de una cadena"
 
-#: src/po-lex.c:931
+#: src/po-lex.c:961
+#, c-format
 msgid "end-of-line within string"
 msgstr "fin de línea dentro de una cadena"
 
@@ -2750,30 +3071,67 @@ msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL en %s"
 # mente el verbo poder en Castellano es mucho más flexible que en otros
 # idiomas. De todas maneras siempre se puede mirar otras traducciones.  em
 # ok. Acepto en 'no puede' a reserva de encontrar nuevos argumentos. mm
-#: src/read-po.c:318 src/xgettext.c:752
+#: src/read-po.c:318 src/xgettext.c:869
+#, c-format
 msgid "this file may not contain domain directives"
 msgstr "este fichero no puede contener instrucciones de dominio"
 
 # Nota: es la definición la que está duplicada.
 #: src/read-po.c:357
+#, c-format
 msgid "duplicate message definition"
 msgstr "definición del mensaje duplicada"
 
 #: src/read-po.c:358
+#, c-format
 msgid "...this is the location of the first definition"
 msgstr "...aquí está la primera definición"
 
-#: src/urlget.c:144
+#: src/read-properties.c:215
+#, c-format
+msgid "%s:%lu: warning: invalid \\uxxxx syntax for Unicode character"
+msgstr "%s:%lu: atención: \\uxxxx sintáxis no válida para carácter Unicode"
+
+#: src/read-stringtable.c:804
+#, c-format
+msgid "%s:%lu: warning: unterminated string"
+msgstr "%s:%lu: atención: cadena no finalizada"
+
+#: src/read-stringtable.c:815
+#, c-format
+msgid "%s:%lu: warning: syntax error"
+msgstr "%s%lu: atención: error de sintáxis"
+
+#: src/read-stringtable.c:878 src/read-stringtable.c:900
+#, c-format
+msgid "%s:%lu: warning: unterminated key/value pair"
+msgstr "%s:%lu: atención: par llave/valor no finalizado"
+
+#: src/read-stringtable.c:946
+#, c-format
+msgid "%s:%lu: warning: syntax error, expected ';' after string"
+msgstr ""
+"%s:%lu: atención: error de sintáxis, se espera un ';' después de la cadena"
+
+#: src/read-stringtable.c:956
+#, c-format
+msgid "%s:%lu: warning: syntax error, expected '=' or ';' after string"
+msgstr ""
+"%s:%lu: atención: error de sintáxis, se espera un '=' o un ';' después de la "
+"cadena"
+
+#: src/urlget.c:149
+#, c-format
 msgid "expected two arguments"
 msgstr "se esperan dos argumentos"
 
-#: src/urlget.c:161
+#: src/urlget.c:166
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Modo de empleo: %s [OPCIÓN] URL FICHEROENTRADA\n"
 
-#: src/urlget.c:166
-#, no-wrap
+#: src/urlget.c:171
+#, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
@@ -2781,46 +3139,49 @@ msgstr ""
 "Trae y muestra el contenido de una URL. Si la URL no puede ser accesada,\n"
 "se utiliza el FICHERO local.\n"
 
-#: src/urlget.c:213
+#: src/urlget.c:218
+#, c-format
 msgid "error writing stdout"
 msgstr "error al escribir la salida estándar"
 
-#: src/write-java.c:1055
+#: src/write-java.c:977
+#, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "no se puede encontrar un directorio temporal, pruebe poner $TMPDIR"
 
-#: src/write-java.c:1065
+#: src/write-java.c:987
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "no se puede crear un directorio temporal utilizando el formato \"%s\""
 
-#: src/write-java.c:1078
+#: src/write-java.c:1000
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "no es un nombre de clase Java válido: %s"
 
-#: src/write-java.c:1135 src/write-java.c:1148
+#: src/write-java.c:1057 src/write-java.c:1070
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "fallo al crear \"%s\""
 
-#: src/write-java.c:1156 src/write-mo.c:705 src/write-po.c:1095
-#: src/write-tcl.c:201
+#: src/write-java.c:1078 src/write-mo.c:707 src/write-po.c:1120
+#: src/write-qt.c:530 src/write-tcl.c:202
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "hubo un error al escribir el fichero \"%s\""
 
-#: src/write-java.c:1170
+#: src/write-java.c:1092
+#, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "fallo en la compilación de la clase Java, intente --verbose o poner $JAVAC"
 
-#: src/write-mo.c:693 src/write-tcl.c:192
+#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "error al abrir el fichero \"%s\" para escritura"
 
-#: src/write-po.c:592
+#: src/write-po.c:605
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -2828,7 +3189,7 @@ msgstr ""
 "Los mensajes internacionalizados no deben contener la secuencia de escape `\\"
 "%c'"
 
-#: src/write-po.c:838 src/write-po.c:904
+#: src/write-po.c:851 src/write-po.c:917
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2841,7 +3202,8 @@ msgstr ""
 "caracteres diferente a la suya. Considere la opción de utilizar un msgid\n"
 "en ASCII puro. %s\n"
 
-#: src/write-po.c:1042
+#: src/write-po.c:1057
+#, c-format
 msgid ""
 "Cannot output multiple translation domains into a single file with Java ."
 "properties syntax. Try using PO file syntax instead."
@@ -2849,7 +3211,17 @@ msgstr ""
 "No se pueden mostrar varios dominios de traducción en un sólo fichero en la\n"
 "sintáxis .properties de Java. Intente usar la sintáxis de los ficheros PO."
 
-#: src/write-po.c:1066
+#: src/write-po.c:1059
+#, c-format
+msgid ""
+"Cannot output multiple translation domains into a single file with NeXTstep/"
+"GNUstep .strings syntax."
+msgstr ""
+"No se pueden mostrar varios dominios de traducción en un sólo fichero en la\n"
+"sintáxis .strings de NeXTstep/GNUstep."
+
+#: src/write-po.c:1085
+#, c-format
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
@@ -2859,17 +3231,45 @@ msgstr ""
 "de salida no lo soporta. Se puede intentar generar una clase Java utilizando "
 "\"msgfmt --java\" en vez del fichero de propiedades."
 
-#: src/write-po.c:1078
+#: src/write-po.c:1089
+#, c-format
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"el catálogo de mensajes tiene traducciones con formas plurales, pero el "
+"catálogo de mensajes no admite el trato plural"
+
+#: src/write-po.c:1101
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "no se puede crear el fichero de salida \"%s\""
 
-#: src/write-po.c:1085
+#: src/write-po.c:1108
 #, no-c-format
 msgid "standard output"
 msgstr "salida estándar"
 
-#: src/write-tcl.c:156
+#: src/write-qt.c:475
+msgid ""
+"message catalog has plural form translations\n"
+"but the Qt message catalog format doesn't support plural handling\n"
+msgstr ""
+"el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
+"catálogo de mensajes de Qt no soporta el trato plural\n"
+
+#: src/write-qt.c:499
+msgid ""
+"message catalog has msgid strings containing characters outside ISO-8859-1\n"
+"but the Qt message catalog format supports Unicode only in the translated\n"
+"strings, not in the untranslated strings\n"
+msgstr ""
+"el catálogo de mensajes tiene cadenas msgid que contienen caracteres\n"
+"fuera del ISO-8859-1, pero el formato del catálogo de mensajes de Qt\n"
+"admite Unicode sólo en las cadenas traducidas, pero no en las que aún\n"
+"no lo están\n"
+
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -2877,32 +3277,32 @@ msgstr ""
 "el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
 "catálogo de mensajes de Tcl no soporta el trato plural\n"
 
-#: src/x-awk.c:325 src/x-python.c:369
+#: src/x-awk.c:343 src/x-python.c:388
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: atención: cadena no finalizada"
 
-#: src/x-awk.c:569
+#: src/x-awk.c:594
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: atención: expresión regular no finalizada"
 
-#: src/x-c.c:906
+#: src/x-c.c:1079 src/x-java.c:901
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: atención: constante de tipo carácter no finalizada"
 
-#: src/x-c.c:930
+#: src/x-c.c:1103
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: atención: literal de cadena no finalizada"
 
-#: src/x-glade.c:369 src/x-glade.c:376
+#: src/x-glade.c:413 src/x-glade.c:420
 #, c-format
 msgid "%s:%d:%d: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:402
+#: src/x-glade.c:447
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -2911,49 +3311,116 @@ msgstr ""
 "El lenguaje \"glade\" no está soportado. %s se basa en expat.\n"
 "Esta versión fue construida sin expat.\n"
 
-#: src/x-python.c:569
+#: src/x-java.c:1387
+#, c-format
+msgid "%s:%d: warning: ')' found where '}' was expected"
+msgstr "%s:%d: cuidado: se encontró un ')' en donde se esperaba un '}'"
+
+#: src/x-java.c:1411
+#, c-format
+msgid "%s:%d: warning: '}' found where ')' was expected"
+msgstr "%s:%d: cuidado: se encontró un '}' en donde se esperaba un ')'"
+
+#: src/x-perl.c:310
+#, c-format
+msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
+msgstr ""
+"%s:%d: no se puede encontrar el terminador de cadena \"%s\" en ningún lugar "
+"antes del fin del fichero"
+
+#: src/x-perl.c:1036
+#, c-format
+msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
+msgstr "%s:%d: falta una llave derecha en \\x{NÚMEROHEX}"
+
+#: src/x-perl.c:1156
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
+msgstr "%s:%d: interpolación no válida (\"\\l\") del caracter de 8 bits \"%c\""
+
+#: src/x-perl.c:1176
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
+msgstr "%s:%d: interpolación no válida (\"\\u\") del caracter de 8 bits \"%c\""
+
+#: src/x-perl.c:1210
+#, c-format
+msgid "%s:%d: invalid variable interpolation at \"%c\""
+msgstr "%s:%d: interpolación de variable no válida en \"%c\""
+
+#: src/x-perl.c:1223
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
+msgstr "%s%d: interpolación no válida (\"\\L\") del caracter de 8 bits \"%c\""
+
+#: src/x-perl.c:1240
+#, c-format
+msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
+msgstr "%s:%d: interpolación no válida (\"\\U\") del caracter de 8 bits \"%c\""
+
+#: src/x-perl.c:2997
+#, c-format
+msgid "%s:%d: fatal: plural message seen before singular message\n"
+msgstr ""
+"%s:%d: error grave: el mensaje en plural se vió antes del mensaje en "
+"singular\n"
+
+#: src/x-python.c:588
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: atención: carácter Unicode inválido"
 
-#: src/x-rst.c:106
+#: src/x-rst.c:107
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: definición de cadena inválida"
 
-#: src/x-rst.c:166
+#: src/x-rst.c:171
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: falta un número después del símbolo #"
 
-#: src/x-rst.c:201
+#: src/x-rst.c:206
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: expresión de cadena inválida"
 
-#: src/xgettext.c:438
+#: src/x-sh.c:1012
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: cuidado: la sintáxis $\"...\" se desaconseja debido a cuestiones de "
+"seguiridad; mejor utilice eval_gettext"
+
+#: src/xgettext.c:515
+#, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "no se puede utilizar --join-existing cuando el resultado se escribe en la\n"
 "salida estándar (stdout)"
 
-#: src/xgettext.c:443
+#: src/xgettext.c:520
+#, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext no puede funcionar sin palabras claves que buscar"
 
-#: src/xgettext.c:570
+#: src/xgettext.c:661
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "atención: el fichero `%s' con extensión `%s'\n"
 "es desconocido; se intentará tipo C"
 
-#: src/xgettext.c:619
+#: src/xgettext.c:712
+#, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Extrae las cadenas traducibles a partir de un grupo de ficheros dados.\n"
 
-#: src/xgettext.c:642
+#: src/xgettext.c:735
+#, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
@@ -2961,12 +3428,14 @@ msgstr ""
 "  -d, --default-domain=NOMBRE   utiliza NOMBRE.po para la salida (en vez de\n"
 "                                mensajes.po)\n"
 
-#: src/xgettext.c:644
+#: src/xgettext.c:737
+#, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=FICHERO        escribe la salida al fichero especificado\n"
 
-#: src/xgettext.c:646
+#: src/xgettext.c:739
+#, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
@@ -2974,29 +3443,35 @@ msgstr ""
 "                              directorio DIR\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/xgettext.c:651
+#: src/xgettext.c:744
+#, c-format
 msgid "Choice of input file language:\n"
 msgstr "Selección del lenguaje del fichero de entrada:\n"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:746
+#, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
-"                                (C, C++, ObjectiveC, PO, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Smalltalk, Java,\n"
-"                                JavaProperties, awk, YCP, Tcl, PHP, RST, "
-"Glade)\n"
+"                                JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
-"   -L, --language=NOMBRE          reconoce el lenguaje especificado\n"
-"                                     (C, C++, ObjectiveC, PO, Python, Lisp,\n"
-"                                     EmacsLisp, librep, Smalltalk, Java,\n"
-"                                     JavaProperties, awk, YCP, Tcl, PHP,\n"
-"                                     RST, Glade)\n"
+"   -L, --language=NOMBRE        reconoce el lenguaje especificado\n"
+"                                  (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+"                                  EmacsLisp, librep, Smalltalk, Java,\n"
+"                                  JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+"                                  fuente-GCC, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:658
+#: src/xgettext.c:752
+#, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   abreviatura de --language=C++\n"
 
-#: src/xgettext.c:660
+#: src/xgettext.c:754
+#, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
@@ -3004,7 +3479,8 @@ msgstr ""
 "Por defecto, el lenguaje se adivina dependiendo de la extensión del fichero "
 "de entrada.\n"
 
-#: src/xgettext.c:665
+#: src/xgettext.c:759
+#, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
@@ -3012,22 +3488,26 @@ msgstr ""
 "      --from-code=NOMBRE      codifica a partir de los ficheros de entrada\n"
 "                                (excepto para Python, Tcl y Glade)\n"
 
-#: src/xgettext.c:668
+#: src/xgettext.c:762
+#, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 "Por defecto, los ficheros de entrada se presupone que están en ASCII.\n"
 
-#: src/xgettext.c:673
+#: src/xgettext.c:767
+#, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         une los mensajes con un fichero existente\n"
 
-#: src/xgettext.c:675
+#: src/xgettext.c:769
+#, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FICHERO.po  las líneas del FICHERO.po no son extraidas\n"
 
-#: src/xgettext.c:677
+#: src/xgettext.c:771
+#, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
@@ -3036,15 +3516,31 @@ msgstr ""
 "                                 aquellas líneas que preceden a la palabra\n"
 "                                 clave) en el fichero de salida\n"
 
-#: src/xgettext.c:681
-msgid "Language=C/C++ specific options:\n"
-msgstr "Opciones específicas de Language=C/C++:\n"
+#: src/xgettext.c:775
+#, c-format
+msgid "Language specific options:\n"
+msgstr "Opciones específicas del lenguaje:\n"
 
-#: src/xgettext.c:683
+#: src/xgettext.c:777
+#, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrae todas las cadenas\n"
 
-#: src/xgettext.c:685
+#: src/xgettext.c:779 src/xgettext.c:786
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+"                                Tcl, Perl, PHP, GCC-source, Glade)\n"
+msgstr ""
+"                                 (sólo los lenguajes C, C++, ObjectiveC, "
+"Shell,\n"
+"                                 Python, Lisp, EmacsLisp, librep, Java, "
+"awk,\n"
+"                                 Tcl, Perl, PHP, fuente-GCC, Glade)\n"
+
+#: src/xgettext.c:783
+#, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
@@ -3054,43 +3550,91 @@ msgstr ""
 "                               se deben utilizar las palabras clave por\n"
 "                               defecto)\n"
 
-#: src/xgettext.c:688
+#: src/xgettext.c:790
+#, c-format
+msgid ""
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
+"                              number ARG of keyword WORD\n"
+msgstr ""
+"      --flag=PALABRA:ARG:BANDERA  bandera adicional para las cadenas que "
+"están\n"
+"                                  dentro del argumento número ARG de la "
+"palabra\n"
+"                                  clave PALABRA\n"
+
+#: src/xgettext.c:793
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+"                                YCP, Tcl, Perl, PHP, GCC-source)\n"
+msgstr ""
+"                                (Sólo los lenguajes C, C++, ObjectiveC, "
+"Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+"                                YCP, Tcl, Perl, PHP, fuente-GCC)\n"
+
+#: src/xgettext.c:797
+#, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs              entiende los trígrafos de ANSI C para la\n"
 "                               entrada\n"
 
-#: src/xgettext.c:690
+#: src/xgettext.c:799
+#, c-format
+msgid "                                (only languages C, C++, ObjectiveC)\n"
+msgstr ""
+"                                (sólo en lenguajes C, C++, ObjectiveC)\n"
+
+#: src/xgettext.c:801
+#, c-format
+msgid "      --qt                    recognize Qt format strings\n"
+msgstr "      --qt                    reconoce los formatos de cadena Qt\n"
+
+#: src/xgettext.c:803
+#, c-format
+msgid "                                (only language C++)\n"
+msgstr "                                (sólo lenguaje C++)\n"
+
+#: src/xgettext.c:805
+#, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                  muestra con más detalle el reconocimiento\n"
 "                               de las cadenas de formato\n"
 
-#: src/xgettext.c:709
+#: src/xgettext.c:824
+#, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     escribe un fichero .properties de Java\n"
 
-#: src/xgettext.c:722
+#: src/xgettext.c:839
+#, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=CADENA  pone al dueño del copyright en la salida\n"
 
-#: src/xgettext.c:724
+#: src/xgettext.c:841
+#, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          omite el copyright de la FSF en la salida\n"
 "                              para los usuarios extranjeros\n"
 
-#: src/xgettext.c:726
+#: src/xgettext.c:843
+#, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=DIRECCION@DECORREO  pone la dirección de correo \n"
 "                                               para reportar los errores\n"
 
-#: src/xgettext.c:728
+#: src/xgettext.c:845
+#, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
@@ -3099,7 +3643,8 @@ msgstr ""
 "las\n"
 "                                  líneas del msgstr\n"
 
-#: src/xgettext.c:730
+#: src/xgettext.c:847
+#, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
@@ -3108,25 +3653,52 @@ msgstr ""
 "las\n"
 "                                líneas del msgstr\n"
 
-#: src/xgettext.c:926
+#: src/xgettext.c:1434
+#, c-format
+msgid ""
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
+"s"
+msgstr ""
+"Un argumento --flag no tiene la sintáxis <palabraclave>:<númarg>:[pass-]"
+"<bandera>: %s"
+
+#: src/xgettext.c:1480
 msgid "standard input"
 msgstr "entrada estándar"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:1592
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code."
+"Please specify the source encoding through --from-code.\n"
 msgstr ""
 "Hay una cadena que no está en ASCII en %s%s.\n"
-"Especifique la codificación de la fuente utilizando --from-code."
+"Especifique la codificación de la fuente utilizando --from-code.\n"
 
-#: src/xgettext.c:1074
+#: src/xgettext.c:1651 src/xgettext.c:1706
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: atención: "
 
-#: src/xgettext.c:1076
+#: src/xgettext.c:1653
+#, c-format
+msgid ""
+"Although being used in a format string position, the %s is not a valid %s "
+"format string. Reason: %s\n"
+msgstr ""
+"Aunque se utilizó en una posición de formato de cadena, el %s no se un "
+"formato de cadena válido %s. La razón es: %s\n"
+
+#: src/xgettext.c:1653
+#, c-format
+msgid ""
+"Although declared as such, the %s is not a valid %s format string. Reason: %"
+"s\n"
+msgstr ""
+"Aunque así esté declarado, '%s' no es un formato de cadena válido %s. Razón: "
+"%s\n"
+
+#: src/xgettext.c:1708
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3136,7 +3708,7 @@ msgstr ""
 "gettext(\"\") regresa la línea de encabezado con la\n"
 "metainformación, no una cadena vacía.\n"
 
-#: src/xgettext.c:1307
+#: src/xgettext.c:1990
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3148,7 +3720,46 @@ msgstr ""
 "allí la variable MSGID_BUGS_ADDRESS; si no lo hace,\n"
 "debe se poner la opción --msgid-bugs-address\n"
 
-#: src/xgettext.c:1479
+#: src/xgettext.c:2179
 #, c-format
 msgid "language `%s' unknown"
 msgstr "idioma `%s' desconocido"
+
+#: src/user-email.sh.in:340
+msgid "Which is your email address?"
+msgstr "¿Cuál es tu dirección de correo electrónico?"
+
+#: src/user-email.sh.in:342
+msgid "Please choose the number, or enter your email address."
+msgstr "Selecciona el número, o escribe tu dirección de correo electrónico."
+
+#: src/user-email.sh.in:360 src/user-email.sh.in:384 src/user-email.sh.in:403
+msgid "Invalid email address: invalid character."
+msgstr "Dirección de correo electrónico incorrecta: caracter inválido."
+
+#: src/user-email.sh.in:362 src/user-email.sh.in:386 src/user-email.sh.in:405
+msgid "Invalid email address: need a fully qualified host name or domain name."
+msgstr ""
+"Dirección de correo electrónico inválido: se necesita un nombre de máquina o "
+"dominio totalmente calificado."
+
+#: src/user-email.sh.in:363 src/user-email.sh.in:387 src/user-email.sh.in:406
+msgid "Invalid email address: missing @"
+msgstr "Dirección de correo electrónico incorrecta: falta la @"
+
+#: src/user-email.sh.in:372
+msgid "Is the following your email address?"
+msgstr "¿Es ésta tu dirección de correo electrónico?"
+
+#: src/user-email.sh.in:374
+msgid "Please confirm by pressing Return, or enter your email address."
+msgstr ""
+"Confirma presionando Return, o escribe tu dirección de correo electrónico."
+
+#: src/user-email.sh.in:395
+msgid "Couldn't find out about your email address."
+msgstr "No se puede encontrar tu dirección de correo electrónico."
+
+#: src/user-email.sh.in:397
+msgid "Please enter your email address."
+msgstr "Por favor escribe tu dirección de correo electrónico."
diff --git a/gettext-tools/po/sk.po b/gettext-tools/po/sk.po
index 4b91a96..0159f11 100644
--- a/gettext-tools/po/sk.po
+++ b/gettext-tools/po/sk.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.12.1\n"
+"Project-Id-Version: GNU gettext-tools 0.13-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2003-09-03 16:21+0200\n"
-"PO-Revision-Date: 2003-09-05 07:02+0200\n"
+"POT-Creation-Date: 2003-11-28 20:31+0100\n"
+"PO-Revision-Date: 2003-11-29 10:03+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
@@ -27,12 +27,17 @@ msgid "ambiguous argument `%s' for `%s'"
 msgstr "nejednoznaÄnÃ½ parameter \"%s\" pre \"%s\""
 
 #: lib/argmatch.c:139
+#, c-format
 msgid "Valid arguments are:"
 msgstr "PlatnÃ© parametre sÃº:"
 
+#: lib/closeout.c:66
+msgid "write error"
+msgstr "chyba zÃ¡pisu"
+
 #: lib/copy-file.c:65 src/file-list.c:56 src/open-po.c:118 src/read-mo.c:241
-#: src/read-tcl.c:121 src/urlget.c:196 src/xgettext.c:951 src/xgettext.c:964
-#: src/xgettext.c:974
+#: src/read-tcl.c:122 src/urlget.c:200 src/xgettext.c:1489 src/xgettext.c:1502
+#: src/xgettext.c:1512
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "chyba pri otvÃ¡ranÃ sÃºboru \"%s\" na ÄÃtanie"
@@ -42,7 +47,7 @@ msgstr "chyba pri otvÃ¡ranÃ sÃºboru \"%s\" na ÄÃtanie"
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "nemÃ´Å¾em otvoriÅ¥ sÃºbor  \"%s\" na zÃ¡pis"
 
-#: lib/copy-file.c:80 src/urlget.c:208
+#: lib/copy-file.c:80 src/urlget.c:212
 #, c-format
 msgid "error reading \"%s\""
 msgstr "chyba pri ÄÃtanÃ \"%s\""
@@ -52,7 +57,7 @@ msgstr "chyba pri ÄÃtanÃ \"%s\""
 msgid "error writing \"%s\""
 msgstr "chyba pri zÃ¡pise \"%s\""
 
-#: lib/copy-file.c:91 src/urlget.c:218
+#: lib/copy-file.c:91 src/urlget.c:222
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "chyba po ÄÃtanÃ \"%s\""
@@ -61,10 +66,10 @@ msgstr "chyba po ÄÃtanÃ \"%s\""
 msgid "Unknown system error"
 msgstr "NeznÃ¡ma systÃ©movÃ¡ chyba"
 
-#: lib/execute.c:177 lib/execute.c:230 lib/execute.c:265 lib/pipe-bidi.c:175
-#: lib/pipe-bidi.c:238 lib/pipe-bidi.c:271 lib/pipe-in.c:191 lib/pipe-in.c:247
-#: lib/pipe-in.c:281 lib/pipe-out.c:191 lib/pipe-out.c:247 lib/pipe-out.c:281
-#: lib/wait-process.c:149
+#: lib/execute.c:181 lib/execute.c:257 lib/execute.c:299 lib/pipe-bidi.c:178
+#: lib/pipe-bidi.c:265 lib/pipe-bidi.c:305 lib/pipe-in.c:194 lib/pipe-in.c:274
+#: lib/pipe-in.c:315 lib/pipe-out.c:194 lib/pipe-out.c:274 lib/pipe-out.c:315
+#: lib/wait-process.c:332 lib/wait-process.c:395
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s podproces zlyhal"
@@ -124,50 +129,55 @@ msgstr "%s: voÄ¾ba `-W %s' nie je jednoznaÄnÃ¡\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: voÄ¾ba `-W %s' nedovoÄ¾uje pouÅ¾itie parametra\n"
 
-#: lib/javacomp.c:455
+#: lib/javacomp.c:457
+#, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
 "KompilÃ¡tor Javy nebol nÃ¡jdenÃ½. SkÃºste nainÅ¡talovaÅ¥ gcj alebo nastavte $JAVAC"
 
-#: lib/javaexec.c:404
+#: lib/javaexec.c:407
+#, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "VirtuÃ¡lny stroj Javy nebol nÃ¡jdenÃ½. SkÃºste nainÅ¡talovaÅ¥ gij alebo nastavte "
 "$JAVA"
 
 #: lib/obstack.c:491 lib/obstack.c:494 lib/xerror.c:51 lib/xmalloc.c:41
-#: lib/xsetenv.c:40 src/po-lex.c:89 src/po-lex.c:118 src/x-glade.c:389
+#: lib/xsetenv.c:40 src/po-lex.c:89 src/po-lex.c:118 src/x-glade.c:390
+#, c-format
 msgid "memory exhausted"
 msgstr "pamÃ¤Å¥ je vyÄerpanÃ¡"
 
-#: lib/pipe-bidi.c:126 lib/pipe-bidi.c:128 lib/pipe-bidi.c:200
-#: lib/pipe-bidi.c:202 lib/pipe-in.c:139 lib/pipe-in.c:213 lib/pipe-out.c:139
-#: lib/pipe-out.c:213
+#: lib/pipe-bidi.c:129 lib/pipe-bidi.c:131 lib/pipe-bidi.c:206
+#: lib/pipe-bidi.c:208 lib/pipe-in.c:142 lib/pipe-in.c:219 lib/pipe-out.c:142
+#: lib/pipe-out.c:219
+#, c-format
 msgid "cannot create pipe"
 msgstr "nemÃ´Å¾em vytvoriÅ¥ rÃºru"
 
 #: lib/w32spawn.h:48
-#, fuzzy, c-format
+#, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "podproces %s zlyhal s ukonÄovacÃm kÃ³dom %d"
+msgstr "DuplicateHandle zlyhal s chybovÃ½m kÃ³dom 0x%08x"
 
 #: lib/w32spawn.h:53
+#, c-format
 msgid "_open_osfhandle failed"
-msgstr ""
+msgstr "zlyhalo _open_osfhandle"
 
-#: lib/wait-process.c:127
+#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:365
 #, c-format
 msgid "%s subprocess"
 msgstr "%s podproces"
 
-#: lib/wait-process.c:141
+#: lib/wait-process.c:324 lib/wait-process.c:387
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s podproces dostal kritickÃ½ signÃ¡l %d"
 
 #: src/format-awk.c:493 src/format-elisp.c:341 src/format-librep.c:305
 #: src/format-pascal.c:394 src/format-perl.c:571 src/format-php.c:341
-#: src/format-tcl.c:380 src/format-ycp.c:137
+#: src/format-qt.c:136 src/format-tcl.c:380 src/format-ycp.c:137
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
@@ -175,12 +185,12 @@ msgstr "formÃ¡tovacia znaÄka pre parameter %u v '%s' nie je v 'msgid'"
 
 #: src/format-awk.c:508 src/format-elisp.c:356 src/format-librep.c:320
 #: src/format-pascal.c:409 src/format-perl.c:586 src/format-php.c:356
-#: src/format-tcl.c:395 src/format-ycp.c:136
+#: src/format-qt.c:135 src/format-tcl.c:395 src/format-ycp.c:136
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "formÃ¡tovacia znaÄka pre parameter %u nie je v '%s'"
 
-#: src/format-awk.c:533 src/format-c.c:825 src/format-elisp.c:381
+#: src/format-awk.c:533 src/format-c.c:846 src/format-elisp.c:381
 #: src/format-gcc-internal.c:283 src/format-librep.c:345
 #: src/format-pascal.c:434 src/format-perl.c:611 src/format-php.c:381
 #: src/format-python.c:530 src/format-tcl.c:420
@@ -189,7 +199,7 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "formÃ¡tovacie znaÄky v 'msgid' a '%s' pre parameter %u nie sÃº rovnakÃ©"
 
-#: src/format-c.c:176
+#: src/format-c.c:177
 #, c-format
 msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
@@ -198,26 +208,26 @@ msgstr ""
 "V direktÃve ÄÃslo %u, token za '<' nie je nÃ¡zov makra Å¡pecifikujÃºceho "
 "formÃ¡t. PlatnÃ© nÃ¡zvy makier sÃº uvedenÃ© v ISO C 99 kapitola 7.8.1."
 
-#: src/format-c.c:545
+#: src/format-c.c:546
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "V direktÃve ÄÃslo %u, token za '<' nie je nasledovanÃ½ znakom '>'."
 
-#: src/format-c.c:744
+#: src/format-c.c:753
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "ReÅ¥azec sa odkazuje na parameter ÄÃslo %u, ale ignoruje parameter ÄÃslo %u."
 
-#: src/format-c.c:811 src/format-gcc-internal.c:269 src/format-python.c:516
+#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
 #, c-format
 msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "poÄet formÃ¡tovacÃch znaÄiek v 'msgid' a '%s' sa nezhoduje"
 
 #: src/format-gcc-internal.c:204
-#, fuzzy, c-format
+#, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr "V direktÃve ÄÃslo %u, \"%s\" nie je nasledovanÃ© Äiarkou."
+msgstr "V direktÃve ÄÃslo %u, prÃznaky nie sÃº povolenÃ© pred '%c'."
 
 #: src/format-invalid.h:23
 msgid "The string ends in the middle of a directive."
@@ -358,40 +368,49 @@ msgstr ""
 "oÄakÃ¡vanÃ½."
 
 #: src/format-lisp.c:2389
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "In the directive number %u, too many parameters are given; expected at most %"
+"u parameter."
+msgid_plural ""
+"In the directive number %u, too many parameters are given; expected at most %"
 "u parameters."
-msgstr ""
+msgstr[0] ""
+"V direktÃve ÄÃslo %u, je zadanÃ½ch prÃliÅ¡ veÄ¾a parametrov. OÄakÃ¡vanÃ½ch "
+"najviac %u parametrov."
+msgstr[1] ""
+"V direktÃve ÄÃslo %u, je zadanÃ½ch prÃliÅ¡ veÄ¾a parametrov. OÄakÃ¡vanÃ½ch "
+"najviac %u parametrov."
+msgstr[2] ""
 "V direktÃve ÄÃslo %u, je zadanÃ½ch prÃliÅ¡ veÄ¾a parametrov. OÄakÃ¡vanÃ½ch "
 "najviac %u parametrov."
 
-#: src/format-lisp.c:2501
+#: src/format-lisp.c:2504
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
 msgstr "V direktÃve ÄÃslo %u, '%c' nie je nasledovanÃ© ÄÃslicou."
 
-#: src/format-lisp.c:2699
+#: src/format-lisp.c:2702
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "V direktÃve ÄÃslo %u, parameter %d je negatÃvny."
 
-#: src/format-lisp.c:2761
+#: src/format-lisp.c:2764
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "ReÅ¥azec konÄÃ v strede direktÃvy ~/.../."
 
-#: src/format-lisp.c:2791 src/format-lisp.c:3014 src/format-lisp.c:3120
-#: src/format-lisp.c:3169 src/format-lisp.c:3255
+#: src/format-lisp.c:2794 src/format-lisp.c:3017 src/format-lisp.c:3123
+#: src/format-lisp.c:3172 src/format-lisp.c:3258
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "NÃ¡jdenÃ© '~%c' bez zodpovedajÃºvceho '~%c'."
 
-#: src/format-lisp.c:2807
+#: src/format-lisp.c:2810
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "V direktÃve ÄÃslo %u, obidva modifikÃ¡tory @ a : sÃº zadanÃ©."
 
-#: src/format-lisp.c:2905
+#: src/format-lisp.c:2908
 #, c-format
 msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
@@ -400,33 +419,35 @@ msgstr ""
 "V direktÃve ÄÃslo %u, '~:[' nie je nasledovanÃ© dvoma klauzulami oddelenÃ½mi "
 "'~;'."
 
-#: src/format-lisp.c:3203
+#: src/format-lisp.c:3206
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
 msgstr "V direktÃve ÄÃslo %u, '~;' je pouÅ¾itÃ© na neplatnej pozÃcii."
 
-#: src/format-lisp.c:3289
+#: src/format-lisp.c:3292
 msgid "The string refers to some argument in incompatible ways."
 msgstr "ReÅ¥azec sa odkazuje na nejakÃ½ parameter nekompatibilnÃ½mi spÃ´sobmi."
 
-#: src/format-lisp.c:3333
+#: src/format-lisp.c:3336
 #, c-format
 msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "formÃ¡tovacie znaÄky v 'msgid' a '%s' nie sÃº ekvivalentnÃ©"
 
-#: src/format-lisp.c:3354
+#: src/format-lisp.c:3357
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "formÃ¡tovacie znaÄky v '%s' nie sÃº podmnoÅ¾inou znaÄiek z 'msgid'"
 
 #: src/format-perl.c:428
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
-msgstr "V direktÃve ÄÃslo %u, znak '%c' nie je platnÃ½ Å¡pecifikÃ¡tor konverzie."
+msgstr ""
+"V direktÃve ÄÃslo %u, urÄenie veÄ¾kosti nie je kompatibilnÃ© so zadanou "
+"konverziou '%c'."
 
-#: src/format-perl-brace.c:198 src/format-python.c:462
+#: src/format-perl-brace.c:198 src/format-python.c:462 src/format-sh.c:304
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "formÃ¡tovacia znaÄka pre parameter '%s' nie je v '%s'"
@@ -463,7 +484,7 @@ msgstr ""
 "formÃ¡tovacie znaÄky v 'msgid' predpokladajÃº tuple, ale znaÄky v '%s' "
 "predpokladajÃº mapovanie"
 
-#: src/format-python.c:447
+#: src/format-python.c:447 src/format-sh.c:289
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in "
@@ -476,6 +497,37 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "formÃ¡tovacie znaÄky v 'msgid' a '%s' pre parameter '%s' nie sÃº rovnakÃ©"
 
+#: src/format-qt.c:80
+#, c-format
+msgid "Multiple references to %%%c."
+msgstr "ViacnÃ¡sobnÃ© odkazy na %%%c."
+
+#: src/format-sh.c:82
+msgid "The string refers to a shell variable with a non-ASCII name."
+msgstr ""
+"ReÅ¥azec sa odkazuje na premennÃº prostredia s nÃ¡zvom, ktorÃ½ obsahuje aj nie "
+"ASCII znaky."
+
+#: src/format-sh.c:84
+msgid ""
+"The string refers to a shell variable with complex shell brace syntax. This "
+"syntax is unsupported here due to security reasons."
+msgstr ""
+"ReÅ¥azec sa odkazuje na premennÃº prostredia s komplexnou syntaxou zÃ¡tvoriek. "
+"TÃ¡to syntax je tu nepodporovanÃ¡ z bezpeÄnostnÃ½ch dÃ´vodov."
+
+#: src/format-sh.c:86
+msgid ""
+"The string refers to a shell variable whose value may be different inside "
+"shell functions."
+msgstr ""
+"ReÅ¥azec sa odkazuje na premennÃº prostredia, ktorej hodnota mÃ´Å¾e byÅ¥ "
+"rozdielna vo vnÃºtri funkciÃ shellu."
+
+#: src/format-sh.c:88
+msgid "The string refers to a shell variable with an empty name."
+msgstr "ReÅ¥azec sa odkazuje na premennÃº prostredia s prÃ¡zdnym nÃ¡zvom."
+
 #: src/format-ycp.c:85
 #, c-format
 msgid ""
@@ -490,11 +542,11 @@ msgid ""
 "1 and 9."
 msgstr "Znak, ktorÃ½ ukonÄuje direktÃvu ÄÃslo %u nie je ÄÃslica medzi 1 a 9."
 
-#: src/hostname.c:173 src/msgattrib.c:297 src/msgcat.c:249 src/msgcmp.c:131
-#: src/msgcomm.c:246 src/msgconv.c:203 src/msgen.c:189 src/msgexec.c:167
-#: src/msgfilter.c:256 src/msgfmt.c:322 src/msggrep.c:299 src/msginit.c:251
-#: src/msgmerge.c:279 src/msgunfmt.c:212 src/msguniq.c:225 src/urlget.c:130
-#: src/xgettext.c:430
+#: src/hostname.c:182 src/msgattrib.c:311 src/msgcat.c:263 src/msgcmp.c:140
+#: src/msgcomm.c:260 src/msgconv.c:217 src/msgen.c:203 src/msgexec.c:177
+#: src/msgfilter.c:270 src/msgfmt.c:338 src/msggrep.c:313 src/msginit.c:265
+#: src/msgmerge.c:293 src/msgunfmt.c:221 src/msguniq.c:239 src/urlget.c:134
+#: src/xgettext.c:492
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -506,46 +558,51 @@ msgstr ""
 "Neposkytuje sa Å½IADNA zÃ¡ruka; ani Äo sa tÃ½ka OBCHODOVATEÄ½NOSTI alebo VHODNOSTI\n"
 "NA KONKRÃ‰TNY ÃšÄŒEL.\n"
 
-#: src/hostname.c:178 src/msgattrib.c:302 src/msgcat.c:254 src/msgcmp.c:136
-#: src/msgcomm.c:251 src/msgconv.c:208 src/msgen.c:194 src/msgexec.c:172
-#: src/msgfilter.c:261 src/msgfmt.c:327 src/msggrep.c:304 src/msginit.c:256
-#: src/msgmerge.c:284 src/msgunfmt.c:217 src/msguniq.c:230 src/urlget.c:135
-#: src/xgettext.c:435
+#: src/hostname.c:187 src/msgattrib.c:316 src/msgcat.c:268 src/msgcmp.c:145
+#: src/msgcomm.c:265 src/msgconv.c:222 src/msgen.c:208 src/msgexec.c:182
+#: src/msgfilter.c:275 src/msgfmt.c:343 src/msggrep.c:318 src/msginit.c:270
+#: src/msgmerge.c:298 src/msgunfmt.c:226 src/msguniq.c:244 src/urlget.c:139
+#: src/xgettext.c:497
 #, c-format
 msgid "Written by %s.\n"
 msgstr "NapÃsal %s.\n"
 
-#: src/hostname.c:188 src/msginit.c:266
+#: src/hostname.c:197 src/msginit.c:280
+#, c-format
 msgid "too many arguments"
 msgstr "prÃliÅ¡ veÄ¾a parametrov"
 
-#: src/hostname.c:201 src/msgattrib.c:358 src/msgcat.c:312 src/msgcmp.c:167
-#: src/msgcomm.c:319 src/msgconv.c:265 src/msgen.c:244 src/msgexec.c:224
-#: src/msgfilter.c:353 src/msgfmt.c:497 src/msggrep.c:418 src/msginit.c:341
-#: src/msgmerge.c:400 src/msgunfmt.c:321 src/msguniq.c:286 src/urlget.c:158
-#: src/xgettext.c:626
+#: src/hostname.c:210 src/msgattrib.c:372 src/msgcat.c:327 src/msgcmp.c:176
+#: src/msgcomm.c:333 src/msgconv.c:280 src/msgen.c:258 src/msgexec.c:234
+#: src/msgfilter.c:367 src/msgfmt.c:529 src/msggrep.c:432 src/msginit.c:356
+#: src/msgmerge.c:417 src/msgunfmt.c:330 src/msguniq.c:300 src/urlget.c:162
+#: src/xgettext.c:704
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "SkÃºste `%s --help' a dozviete sa viac informÃ¡ciÃ.\n"
 
-#: src/hostname.c:205 src/msginit.c:345
+#: src/hostname.c:214 src/msginit.c:360
 #, c-format
 msgid "Usage: %s [OPTION]\n"
 msgstr "PouÅ¾itie: %s [VOÄ½BA]\n"
 
-#: src/hostname.c:209
+#: src/hostname.c:218
+#, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "ZobraziÅ¥ hostiteÄ¾skÃ© meno stroja.\n"
 
-#: src/hostname.c:212
+#: src/hostname.c:221
+#, c-format
 msgid "Output format:\n"
 msgstr "VÃ½stupnÃ½ formÃ¡t:\n"
 
-#: src/hostname.c:214
+#: src/hostname.c:223
+#, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 krÃ¡tke meno hostiteÄ¾a\n"
 
-#: src/hostname.c:216
+#: src/hostname.c:225
+#, c-format
 msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
 "domain\n"
@@ -555,39 +612,43 @@ msgstr ""
 "kvalifikovanÃ©ho\n"
 "                                domÃ©novÃ©ho mena a prezÃ½vok\n"
 
-#: src/hostname.c:219
+#: src/hostname.c:228
+#, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresy pre meno hostiteÄ¾a\n"
 
-#: src/hostname.c:222 src/msgattrib.c:458 src/msgcat.c:405 src/msgcmp.c:207
-#: src/msgcomm.c:408 src/msgconv.c:337 src/msgen.c:313 src/msgexec.c:264
-#: src/msgfilter.c:435 src/msgfmt.c:598 src/msggrep.c:516 src/msginit.c:393
-#: src/msgmerge.c:510 src/msgunfmt.c:401 src/msguniq.c:371 src/urlget.c:172
-#: src/xgettext.c:749
+#: src/hostname.c:231 src/msgattrib.c:476 src/msgcat.c:425 src/msgcmp.c:219
+#: src/msgcomm.c:427 src/msgconv.c:356 src/msgen.c:331 src/msgexec.c:276
+#: src/msgfilter.c:453 src/msgfmt.c:635 src/msggrep.c:534 src/msginit.c:412
+#: src/msgmerge.c:532 src/msgunfmt.c:412 src/msguniq.c:389 src/urlget.c:176
+#: src/xgettext.c:850
+#, c-format
 msgid "Informative output:\n"
 msgstr "InformatÃvny vÃ½stup:\n"
 
-#: src/hostname.c:224 src/msgattrib.c:460 src/msgcat.c:407 src/msgcmp.c:209
-#: src/msgcomm.c:410 src/msgconv.c:339 src/msgen.c:315 src/msgexec.c:266
-#: src/msgfilter.c:437 src/msgfmt.c:600 src/msggrep.c:518 src/msginit.c:395
-#: src/msgmerge.c:512 src/msgunfmt.c:403 src/msguniq.c:373 src/urlget.c:174
-#: src/xgettext.c:751
+#: src/hostname.c:233 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
+#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:278
+#: src/msgfilter.c:455 src/msgfmt.c:637 src/msggrep.c:536 src/msginit.c:414
+#: src/msgmerge.c:534 src/msgunfmt.c:414 src/msguniq.c:391 src/urlget.c:178
+#: src/xgettext.c:852
+#, c-format
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  zobraziÅ¥ tÃºto nÃ¡povedu a skonÄiÅ¥\n"
 
-#: src/hostname.c:226 src/msgattrib.c:462 src/msgcat.c:409 src/msgcmp.c:211
-#: src/msgcomm.c:412 src/msgconv.c:341 src/msgen.c:317 src/msgexec.c:268
-#: src/msgfilter.c:439 src/msgfmt.c:602 src/msggrep.c:520 src/msginit.c:397
-#: src/msgmerge.c:514 src/msgunfmt.c:405 src/msguniq.c:375 src/urlget.c:176
-#: src/xgettext.c:753
+#: src/hostname.c:235 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
+#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:280
+#: src/msgfilter.c:457 src/msgfmt.c:639 src/msggrep.c:538 src/msginit.c:416
+#: src/msgmerge.c:536 src/msgunfmt.c:416 src/msguniq.c:393 src/urlget.c:180
+#: src/xgettext.c:854
+#, c-format
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               zobraziÅ¥ informÃ¡ciu o verzii a skonÄiÅ¥\n"
 
-#: src/hostname.c:229 src/msgattrib.c:465 src/msgcat.c:412 src/msgcmp.c:214
-#: src/msgcomm.c:415 src/msgconv.c:344 src/msgen.c:320 src/msgexec.c:271
-#: src/msgfilter.c:442 src/msgfmt.c:609 src/msggrep.c:523 src/msginit.c:400
-#: src/msgmerge.c:521 src/msgunfmt.c:410 src/msguniq.c:378 src/urlget.c:179
-#: src/xgettext.c:756
+#: src/hostname.c:238 src/msgattrib.c:483 src/msgcat.c:432 src/msgcmp.c:226
+#: src/msgcomm.c:434 src/msgconv.c:363 src/msgen.c:338 src/msgexec.c:283
+#: src/msgfilter.c:460 src/msgfmt.c:646 src/msggrep.c:541 src/msginit.c:419
+#: src/msgmerge.c:543 src/msgunfmt.c:421 src/msguniq.c:396 src/urlget.c:183
+#: src/xgettext.c:857
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "SprÃ¡vy o chybÃ¡ch zasielajte na adresu <bug-gnu-gettext@gnu.org> (iba "
@@ -595,33 +656,35 @@ msgstr ""
 "KomentÃ¡re k slovenskÃ©mu prekladu zasielajte na adresu <sk-i18n@lists.linux."
 "sk>.\n"
 
-#: src/hostname.c:244 src/hostname.c:251
+#: src/hostname.c:254 src/hostname.c:260 src/hostname.c:267
+#, c-format
 msgid "could not get host name"
 msgstr "NemÃ´Å¾em zÃskaÅ¥ meno hostiteÄ¾a"
 
-#: src/msgattrib.c:317 src/msgconv.c:223 src/msgexec.c:143 src/msgfilter.c:194
-#: src/msggrep.c:319 src/msginit.c:197 src/msguniq.c:245
+#: src/msgattrib.c:331 src/msgconv.c:237 src/msgexec.c:149 src/msgfilter.c:200
+#: src/msggrep.c:333 src/msginit.c:203 src/msguniq.c:259
+#, c-format
 msgid "at most one input file allowed"
 msgstr "povolenÃ½ najviac jeden vstupnÃ½ sÃºbor"
 
-#: src/msgattrib.c:323 src/msgattrib.c:327 src/msgcat.c:264 src/msgcat.c:268
-#: src/msgcomm.c:261 src/msgcomm.c:265 src/msgconv.c:229 src/msgconv.c:233
-#: src/msgen.c:216 src/msgen.c:220 src/msgfilter.c:276 src/msgfilter.c:280
-#: src/msgfmt.c:344 src/msgfmt.c:350 src/msgfmt.c:365 src/msggrep.c:325
-#: src/msggrep.c:329 src/msgmerge.c:309 src/msgmerge.c:330 src/msgmerge.c:334
-#: src/msgunfmt.c:227 src/msguniq.c:251 src/msguniq.c:255 src/xgettext.c:445
-#: src/xgettext.c:449
+#: src/msgattrib.c:337 src/msgattrib.c:341 src/msgcat.c:278 src/msgcat.c:282
+#: src/msgcomm.c:275 src/msgcomm.c:279 src/msgconv.c:243 src/msgconv.c:247
+#: src/msgen.c:230 src/msgen.c:234 src/msgfilter.c:290 src/msgfilter.c:294
+#: src/msgfmt.c:360 src/msgfmt.c:363 src/msgfmt.c:366 src/msgfmt.c:372
+#: src/msgfmt.c:387 src/msggrep.c:339 src/msggrep.c:343 src/msgmerge.c:323
+#: src/msgmerge.c:344 src/msgmerge.c:348 src/msgunfmt.c:236 src/msguniq.c:265
+#: src/msguniq.c:269 src/xgettext.c:507 src/xgettext.c:511
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s a %s sa navzÃ¡jom vyluÄujÃº"
 
-#: src/msgattrib.c:362 src/msgconv.c:269 src/msggrep.c:422 src/msguniq.c:290
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "PouÅ¾itie: %s [VOÄ½BA] [VSTUPNÃSÃšBOR]\n"
 
-#: src/msgattrib.c:367
-#, no-wrap
+#: src/msgattrib.c:381
+#, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
@@ -629,57 +692,65 @@ msgstr ""
 "Filtruje sprÃ¡vy z prekladovÃ©ho katalÃ³gu podÄ¾a ich vlastnostÃ a menÃ tieto\n"
 "vlastnosti.\n"
 
-#: src/msgattrib.c:371 src/msgcat.c:333 src/msgcmp.c:185 src/msgcomm.c:339
-#: src/msgconv.c:277 src/msgen.c:260 src/msgexec.c:247 src/msgfilter.c:365
-#: src/msggrep.c:432 src/msginit.c:355 src/msgmerge.c:421 src/msgunfmt.c:333
-#: src/msguniq.c:306
+#: src/msgattrib.c:385 src/msgcat.c:348 src/msgcmp.c:194 src/msgcomm.c:353
+#: src/msgconv.c:292 src/msgen.c:274 src/msgexec.c:257 src/msgfilter.c:379
+#: src/msggrep.c:446 src/msginit.c:370 src/msgmerge.c:438 src/msgunfmt.c:342
+#: src/msguniq.c:320
+#, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "PovinnÃ© parametre pre dlhÃ© voÄ¾by sÃº povinnÃ½mi aj pre skrÃ¡tenÃ© voÄ¾by.\n"
 
-#: src/msgattrib.c:374 src/msgcat.c:336 src/msgcmp.c:188 src/msgcomm.c:342
-#: src/msgconv.c:280 src/msgen.c:263 src/msgexec.c:250 src/msgfilter.c:368
-#: src/msgfmt.c:515 src/msggrep.c:435 src/msginit.c:358 src/msgmerge.c:424
-#: src/msgunfmt.c:343 src/msguniq.c:309 src/xgettext.c:644
+#: src/msgattrib.c:388 src/msgcat.c:351 src/msgcmp.c:197 src/msgcomm.c:356
+#: src/msgconv.c:295 src/msgen.c:277 src/msgexec.c:260 src/msgfilter.c:382
+#: src/msgfmt.c:547 src/msggrep.c:449 src/msginit.c:373 src/msgmerge.c:441
+#: src/msgunfmt.c:352 src/msguniq.c:323 src/xgettext.c:722
+#, c-format
 msgid "Input file location:\n"
 msgstr "Umiestnenie vstupnÃ©ho sÃºboru:\n"
 
-#: src/msgattrib.c:376 src/msgconv.c:282 src/msggrep.c:437 src/msguniq.c:311
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
+#, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  VSTUPNÃSÃšBOR                vstupnÃ½ PO sÃºbor\n"
 
-#: src/msgattrib.c:378 src/msgcat.c:342 src/msgcmp.c:194 src/msgcomm.c:348
-#: src/msgconv.c:284 src/msgen.c:267 src/msgexec.c:254 src/msgfilter.c:372
-#: src/msgfmt.c:519 src/msggrep.c:439 src/msgmerge.c:430 src/msguniq.c:313
-#: src/xgettext.c:650
+#: src/msgattrib.c:392 src/msgcat.c:357 src/msgcmp.c:203 src/msgcomm.c:362
+#: src/msgconv.c:299 src/msgen.c:281 src/msgexec.c:264 src/msgfilter.c:386
+#: src/msgfmt.c:551 src/msggrep.c:453 src/msgmerge.c:447 src/msguniq.c:327
+#: src/xgettext.c:728
+#, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=ADRESÃR     pridaÅ¥ ADRESÃR do zoznamu pre vyhÄ¾adÃ¡vanÃ©\n"
 "                              vstupnÃ© sÃºbory\n"
 
-#: src/msgattrib.c:380 src/msgconv.c:286 src/msgexec.c:256 src/msgfilter.c:374
-#: src/msggrep.c:441 src/msgunfmt.c:347 src/msguniq.c:315
+#: src/msgattrib.c:394 src/msgconv.c:301 src/msgexec.c:266 src/msgfilter.c:388
+#: src/msggrep.c:455 src/msgunfmt.c:356 src/msguniq.c:329
+#, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Ak nie je zadanÃ½ vstupnÃ½ sÃºbor alebo je -, je naÄÃtanÃ½ Å¡tandardnÃ½ vstup.\n"
 
-#: src/msgattrib.c:383 src/msgcat.c:347 src/msgcomm.c:353 src/msgconv.c:289
-#: src/msgen.c:272 src/msgfilter.c:377 src/msgfmt.c:533 src/msggrep.c:444
-#: src/msginit.c:366 src/msgmerge.c:442 src/msgunfmt.c:371 src/msguniq.c:318
-#: src/xgettext.c:655
+#: src/msgattrib.c:397 src/msgcat.c:362 src/msgcomm.c:367 src/msgconv.c:304
+#: src/msgen.c:286 src/msgfilter.c:391 src/msgfmt.c:567 src/msggrep.c:458
+#: src/msginit.c:381 src/msgmerge.c:459 src/msgunfmt.c:380 src/msguniq.c:332
+#: src/xgettext.c:733
+#, c-format
 msgid "Output file location:\n"
 msgstr "Umiestnenie vÃ½stupnÃ©ho sÃºboru:\n"
 
-#: src/msgattrib.c:385 src/msgcat.c:349 src/msgcomm.c:355 src/msgconv.c:291
-#: src/msgen.c:274 src/msgfilter.c:379 src/msgfmt.c:535 src/msggrep.c:446
-#: src/msgmerge.c:444 src/msgunfmt.c:373 src/msguniq.c:320
+#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
+#: src/msgen.c:288 src/msgfilter.c:393 src/msgfmt.c:569 src/msggrep.c:460
+#: src/msgmerge.c:461 src/msgunfmt.c:382 src/msguniq.c:334
+#, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=SÃšBOR     zapÃsaÅ¥ vÃ½stup do zadanÃ©ho sÃºboru\n"
 
-#: src/msgattrib.c:387 src/msgcat.c:351 src/msgcomm.c:357 src/msgconv.c:293
-#: src/msgen.c:276 src/msgfilter.c:381 src/msggrep.c:448 src/msgmerge.c:446
-#: src/msgunfmt.c:375 src/msguniq.c:322
+#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
+#: src/msgen.c:290 src/msgfilter.c:395 src/msggrep.c:462 src/msgmerge.c:463
+#: src/msgunfmt.c:384 src/msguniq.c:336
+#, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
@@ -687,119 +758,150 @@ msgstr ""
 "VÃ½sledky sÃº zapÃsanÃ© na Å¡tandardnÃ½ vÃ½stup ak nie je zadanÃ½ vÃ½stupnÃ½ sÃºbor\n"
 "alebo ak je -.\n"
 
-#: src/msgattrib.c:391 src/msgcat.c:355 src/msgcomm.c:361 src/msguniq.c:326
+#: src/msgattrib.c:405 src/msgcat.c:370 src/msgcomm.c:375 src/msguniq.c:340
+#, c-format
 msgid "Message selection:\n"
 msgstr "VÃ½ber sprÃ¡vy:\n"
 
-#: src/msgattrib.c:393
+#: src/msgattrib.c:407
+#, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            zachovaÅ¥ preloÅ¾enÃ©, odstrÃ¡niÅ¥ nepreloÅ¾enÃ© "
 "sprÃ¡vy\n"
 
-#: src/msgattrib.c:395
+#: src/msgattrib.c:409
+#, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          zachovaÅ¥ nepreloÅ¾enÃ©, odstrÃ¡niÅ¥ preloÅ¾enÃ© "
 "sprÃ¡vy\n"
 
-#: src/msgattrib.c:397
+#: src/msgattrib.c:411
+#, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              odstrÃ¡niÅ¥ nepresnÃ© preklady\n"
 
-#: src/msgattrib.c:399
+#: src/msgattrib.c:413
+#, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            zachovaÅ¥ nepresnÃ© preklady\n"
 
-#: src/msgattrib.c:401
+#: src/msgattrib.c:415
+#, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           odstrÃ¡niÅ¥ zastaranÃ© sprÃ¡vy oznaÄenÃ© #~\n"
 
-#: src/msgattrib.c:403
+#: src/msgattrib.c:417
+#, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         zachovaÅ¥ zastaranÃ© sprÃ¡vy oznaÄenÃ© #~\n"
 
-#: src/msgattrib.c:406
+#: src/msgattrib.c:420
+#, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Ãšprava vlastnostÃ:\n"
 
-#: src/msgattrib.c:408
+#: src/msgattrib.c:422
+#, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             nastaviÅ¥ vÅ¡etky sprÃ¡vy ako nepresnÃ©\n"
 
-#: src/msgattrib.c:410
+#: src/msgattrib.c:424
+#, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           nastaviÅ¥ vÅ¡etky sprÃ¡vy ako nie nepresnÃ©\n"
 
-#: src/msgattrib.c:412
+#: src/msgattrib.c:426
+#, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          nastaviÅ¥ vÅ¡etky sprÃ¡vy ako zastaranÃ©\n"
 
-#: src/msgattrib.c:414
+#: src/msgattrib.c:428
+#, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        nastaviÅ¥ vÅ¡etky sprÃ¡vy ako nie zastaranÃ©\n"
 
-#: src/msgattrib.c:416
+#: src/msgattrib.c:430
+#, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=SÃšBOR.po    spracovaÅ¥ len poloÅ¾ky uvedenÃ© v SÃšBOR.po\n"
 
-#: src/msgattrib.c:418
+#: src/msgattrib.c:432
+#, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=SÃšBOR.po  spracovaÅ¥ len poloÅ¾ky neuvedenÃ© v SÃšBOR.po\n"
 
-#: src/msgattrib.c:420
+#: src/msgattrib.c:434
+#, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 synonymum pre --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:422
+#: src/msgattrib.c:436
+#, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              synonymum pre --only-obsolete --clear-"
 "obsolete\n"
 
-#: src/msgattrib.c:425 src/msgcat.c:367 src/msgcmp.c:202 src/msgcomm.c:373
-#: src/msgconv.c:304 src/msgen.c:280 src/msgexec.c:259 src/msgfilter.c:400
-#: src/msgfmt.c:566 src/msggrep.c:483 src/msginit.c:374 src/msgmerge.c:477
-#: src/msguniq.c:333
+#: src/msgattrib.c:439 src/msgcat.c:382 src/msgcmp.c:211 src/msgcomm.c:387
+#: src/msgconv.c:319 src/msgen.c:294 src/msgexec.c:269 src/msgfilter.c:414
+#: src/msgfmt.c:600 src/msggrep.c:497 src/msginit.c:389 src/msgmerge.c:494
+#: src/msguniq.c:347
+#, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntax vstupnÃ©ho sÃºboru:\n"
 
-#: src/msgattrib.c:427 src/msgconv.c:306 src/msgen.c:282 src/msgexec.c:261
-#: src/msgfilter.c:402 src/msggrep.c:485 src/msginit.c:376 src/msguniq.c:335
+#: src/msgattrib.c:441 src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:271
+#: src/msgfilter.c:416 src/msggrep.c:499 src/msginit.c:391 src/msguniq.c:349
+#, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      vstupnÃ½ sÃºbor mÃ¡ syntax Java .properties\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:372 src/msgcomm.c:378 src/msgconv.c:309
-#: src/msgen.c:285 src/msgfilter.c:405 src/msgfmt.c:591 src/msggrep.c:488
-#: src/msginit.c:379 src/msgmerge.c:482 src/msgunfmt.c:379 src/msguniq.c:338
-#: src/xgettext.c:709
+#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:273
+#: src/msgfilter.c:418 src/msggrep.c:501 src/msginit.c:393 src/msguniq.c:351
+#, c-format
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     vstupnÃ½ sÃºbor mÃ¡ syntax NeXTstep/GNUstep ."
+"strings\n"
+
+#: src/msgattrib.c:446 src/msgcat.c:390 src/msgcomm.c:395 src/msgconv.c:326
+#: src/msgen.c:301 src/msgfilter.c:421 src/msgfmt.c:628 src/msggrep.c:504
+#: src/msginit.c:396 src/msgmerge.c:502 src/msgunfmt.c:388 src/msguniq.c:354
+#: src/xgettext.c:808
+#, c-format
 msgid "Output details:\n"
 msgstr "Podrobnosti vÃ½stupu:\n"
 
-#: src/msgattrib.c:432 src/msgcat.c:379 src/msgcomm.c:380 src/msgconv.c:311
-#: src/msgen.c:287 src/msgmerge.c:484 src/msgunfmt.c:381 src/msguniq.c:345
-#: src/xgettext.c:711
+#: src/msgattrib.c:448 src/msgcat.c:397 src/msgcomm.c:397 src/msgconv.c:328
+#: src/msgen.c:303 src/msgmerge.c:504 src/msgunfmt.c:390 src/msguniq.c:361
+#: src/xgettext.c:810
+#, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             nepouÅ¾iÅ¥ na vÃ½stupe riadiace sekvencie\n"
 "                              jazyka C (predvolenÃ©)\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:381 src/msgcomm.c:382 src/msgconv.c:313
-#: src/msgen.c:289 src/msgfilter.c:409 src/msgmerge.c:486 src/msgunfmt.c:383
-#: src/msguniq.c:347 src/xgettext.c:713
+#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
+#: src/msgen.c:305 src/msgfilter.c:425 src/msgmerge.c:506 src/msgunfmt.c:392
+#: src/msguniq.c:363 src/xgettext.c:812
+#, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
@@ -807,55 +909,72 @@ msgstr ""
 "C,\n"
 "                              bez rozÅ¡ÃrenÃ½ch znakov\n"
 
-#: src/msgattrib.c:436 src/msgcat.c:383 src/msgcomm.c:384 src/msgconv.c:315
-#: src/msgen.c:291 src/msgfilter.c:411 src/msggrep.c:494 src/msgmerge.c:488
-#: src/msgunfmt.c:385 src/msguniq.c:349 src/xgettext.c:715
+#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
+#: src/msgen.c:307 src/msgfilter.c:427 src/msggrep.c:510 src/msgmerge.c:508
+#: src/msgunfmt.c:394 src/msguniq.c:365 src/xgettext.c:814
+#, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              zapÃsaÅ¥ sÃºbor PO, aj keÄ bude prÃ¡zdny\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:385 src/msgcomm.c:386 src/msguniq.c:351
-#: src/xgettext.c:717
+#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
+#: src/xgettext.c:816
+#, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                zapÃsaÅ¥ .po sÃºbor s pouÅ¾itÃm odsadzovania\n"
 
-#: src/msgattrib.c:440 src/msgcat.c:387 src/msgcomm.c:388 src/msguniq.c:353
-#: src/xgettext.c:719
+#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
+#: src/xgettext.c:818
+#, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           nezapisovaÅ¥ riadky '#: meno_sÃºboru:riadok'\n"
 
-#: src/msgattrib.c:442 src/msgcat.c:389 src/msgcomm.c:390 src/msguniq.c:355
-#: src/xgettext.c:721
+#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
+#: src/xgettext.c:820
+#, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          generovaÅ¥ riadky '#: meno_sÃºboru:riadok'\n"
 "                              (predvolenÃ©)\n"
 
-#: src/msgattrib.c:444 src/msgcat.c:391 src/msgcomm.c:392 src/msguniq.c:357
-#: src/xgettext.c:723
+#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
+#: src/xgettext.c:822
+#, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                zapÃsaÅ¥ .po sÃºbor presne dorÅ¾iavajÃºci Å¡tÃ½l\n"
 "                              Uniforum\n"
 
-#: src/msgattrib.c:446 src/msgcat.c:393 src/msgcomm.c:394 src/msgconv.c:325
-#: src/msgen.c:301 src/msgfilter.c:423 src/msggrep.c:504 src/msginit.c:385
-#: src/msgmerge.c:498 src/msgunfmt.c:391 src/msguniq.c:359
+#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msgconv.c:342
+#: src/msgen.c:317 src/msgfilter.c:439 src/msggrep.c:520 src/msginit.c:402
+#: src/msgmerge.c:518 src/msgunfmt.c:400 src/msguniq.c:375
+#, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     zapÃsaÅ¥ Java sÃºbor .properties\n"
 
-#: src/msgattrib.c:448 src/msgcat.c:395 src/msgcomm.c:396 src/msgconv.c:327
-#: src/msgen.c:303 src/msgfilter.c:425 src/msggrep.c:506 src/msginit.c:387
-#: src/msgmerge.c:500 src/msgunfmt.c:393 src/msguniq.c:361 src/xgettext.c:727
+#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
+#: src/msgen.c:319 src/msgfilter.c:441 src/msggrep.c:522 src/msginit.c:404
+#: src/msgmerge.c:520 src/msgunfmt.c:402 src/msguniq.c:377 src/xgettext.c:826
+#, c-format
+msgid ""
+"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr ""
+"      --stringtable-output    zapÃsaÅ¥ sÃºbor NeXTstep/GNUstep .strings\n"
+
+#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
+#: src/msgen.c:321 src/msgfilter.c:443 src/msggrep.c:524 src/msginit.c:406
+#: src/msgmerge.c:522 src/msgunfmt.c:404 src/msguniq.c:379 src/xgettext.c:828
+#, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ÄŒÃSLO           nastaviÅ¥ Å¡Ãrku vÃ½stupnej strany\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:397 src/msgcomm.c:398 src/msgconv.c:329
-#: src/msgen.c:305 src/msgfilter.c:427 src/msggrep.c:508 src/msginit.c:389
-#: src/msgmerge.c:502 src/msgunfmt.c:395 src/msguniq.c:363 src/xgettext.c:729
+#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
+#: src/msgen.c:323 src/msgfilter.c:445 src/msggrep.c:526 src/msginit.c:408
+#: src/msgmerge.c:524 src/msgunfmt.c:406 src/msguniq.c:381 src/xgettext.c:830
+#, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
@@ -863,31 +982,33 @@ msgstr ""
 "      --no-wrap               nezalamovaÅ¥ dlhÃ© riadky srÃ¡v, dlhÅ¡ie ako\n"
 "                              Å¡Ãrka vÃ½stupnej strany, do viacerÃ½ch riadkov\n"
 
-#: src/msgattrib.c:453 src/msgcat.c:400 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:308 src/msgfilter.c:430 src/msgmerge.c:505 src/msgunfmt.c:398
-#: src/msguniq.c:366 src/xgettext.c:732
+#: src/msgattrib.c:471 src/msgcat.c:420 src/msgcomm.c:420 src/msgconv.c:351
+#: src/msgen.c:326 src/msgfilter.c:448 src/msgmerge.c:527 src/msgunfmt.c:409
+#: src/msguniq.c:384 src/xgettext.c:833
+#, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generovaÅ¥ utriedenÃ½ vÃ½stup\n"
 
-#: src/msgattrib.c:455 src/msgcat.c:402 src/msgcomm.c:403 src/msgconv.c:334
-#: src/msgen.c:310 src/msgfilter.c:432 src/msgmerge.c:507 src/msguniq.c:368
-#: src/xgettext.c:734
+#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
+#: src/msgen.c:328 src/msgfilter.c:450 src/msgmerge.c:529 src/msguniq.c:386
+#: src/xgettext.c:835
+#, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          utriediÅ¥ vÃ½stup podÄ¾a umiestnenia v sÃºboroch\n"
 
-#: src/msgcat.c:274 src/msgcomm.c:291
+#: src/msgcat.c:288 src/msgcomm.c:305
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "je uvedenÃ© nepovolenÃ© kritÃ©rium vÃ½beru (%d < n < %d)"
 
-#: src/msgcat.c:316 src/msgcomm.c:323 src/xgettext.c:630
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "PouÅ¾itie: %s [VOÄ½BA] [VSTUPNÃSÃšBOR]...\n"
 
-#: src/msgcat.c:321
-#, no-wrap
+#: src/msgcat.c:336
+#, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -909,21 +1030,25 @@ msgstr ""
 "zabezpeÄÃ ich zachovanie iba z prvÃ©ho PO sÃºboru, ktorÃ½ ich definuje.\n"
 "PozÃcie v zdrojovÃ½ch sÃºboroch budÃº zlÃºÄenÃ© zo vÅ¡etkÃ½ch PO sÃºborov.\n"
 
-#: src/msgcat.c:338 src/msgcomm.c:344 src/xgettext.c:646
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
+#, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  VSTUPNÃSÃšBOR ...            vstupnÃ© sÃºbory\n"
 
-#: src/msgcat.c:340 src/msgcomm.c:346 src/xgettext.c:648
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
+#, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=SÃšBOR      zÃskaÅ¥ zoznam vstupnÃ½ch sÃºborov zo SÃšBORu\n"
 
-#: src/msgcat.c:344 src/msgcomm.c:350 src/msgen.c:269 src/msgfmt.c:521
-#: src/xgettext.c:652
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
+#: src/xgettext.c:730
+#, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Ak je vstupnÃ½ sÃºbor -, naÄÃtanÃ½ je Å¡tandardnÃ½ vstup.\n"
 
-#: src/msgcat.c:357 src/msgcomm.c:363
+#: src/msgcat.c:372 src/msgcomm.c:377
+#, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
@@ -931,7 +1056,8 @@ msgstr ""
 "  -<, --less-than=POÄŒET       vypÃsaÅ¥ sprÃ¡vy, ktorÃ© sÃº definovanÃ© menej ako\n"
 "                              POÄŒET-krÃ¡t, Å¡tandardne nastavenÃ© na nekoneÄno\n"
 
-#: src/msgcat.c:360
+#: src/msgcat.c:375
+#, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
@@ -939,7 +1065,8 @@ msgstr ""
 "  ->, --more-than=POÄŒET       vypÃsaÅ¥ sprÃ¡vy, ktorÃ© sÃº defineovanÃ© viac\n"
 "                              ako POÄŒET-krÃ¡t, Å¡tandardne nastavenÃ© na 0\n"
 
-#: src/msgcat.c:363 src/msgcomm.c:369
+#: src/msgcat.c:378 src/msgcomm.c:383
+#, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
@@ -947,18 +1074,31 @@ msgstr ""
 "  -u, --unique                skratka pre --less-than=2, nastavuje vÃ½pis\n"
 "                              len unikÃ¡tnych sprÃ¡v\n"
 
-#: src/msgcat.c:369 src/msgcmp.c:204 src/msgcomm.c:375 src/msgfmt.c:568
-#: src/msgmerge.c:479
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
+#: src/msgmerge.c:496
+#, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      vstupnÃ© sÃºbory mÃ¡jÃº syntax Java .properties\n"
 
-#: src/msgcat.c:374 src/msgconv.c:299 src/msguniq.c:340
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
+#: src/msgmerge.c:498
+#, c-format
+msgid ""
+"      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
+"                              syntax\n"
+msgstr ""
+"      --stringtable-input     vstupnÃ© sÃºbory majÃº syntax NeXTstep-GNUstep\n"
+"                              .strings\n"
+
+#: src/msgcat.c:392 src/msgconv.c:314 src/msguniq.c:356
+#, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NÃZOV         kÃ³dovanie pre vÃ½stup\n"
 
-#: src/msgcat.c:376 src/msguniq.c:342
+#: src/msgcat.c:394 src/msguniq.c:358
+#, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
@@ -967,21 +1107,23 @@ msgstr ""
 "sprÃ¡vu,\n"
 "                              nezluÄovaÅ¥ viacero prekladov\n"
 
-#: src/msgcmp.c:147 src/msgmerge.c:295
+#: src/msgcmp.c:156 src/msgmerge.c:309
+#, c-format
 msgid "no input files given"
 msgstr "neboli zadanÃ© vstupnÃ© sÃºbory"
 
-#: src/msgcmp.c:152 src/msgmerge.c:300
+#: src/msgcmp.c:161 src/msgmerge.c:314
+#, c-format
 msgid "exactly 2 input files required"
 msgstr "potrebnÃ© sÃº presne 2 vstupnÃ© sÃºbory"
 
-#: src/msgcmp.c:171 src/msgmerge.c:404
+#: src/msgcmp.c:180 src/msgmerge.c:421
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "PouÅ¾itie: %s [VOÄ½BA] def.po ref.pot\n"
 
-#: src/msgcmp.c:176
-#, no-wrap
+#: src/msgcmp.c:185
+#, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
 "set of msgid strings.  The def.po file is an existing PO file with the\n"
@@ -997,43 +1139,50 @@ msgstr ""
 "KeÄ nie je moÅ¾nÃ© nÃ¡jsÅ¥ presnÃº zhodu, je pouÅ¾itÃ½ fuzzy algoritmus, ktorÃ½\n"
 "umoÅ¾Åˆuje lepÅ¡iu kontrolu zhody.\n"
 
-#: src/msgcmp.c:190
+#: src/msgcmp.c:199
+#, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      preklady\n"
 
-#: src/msgcmp.c:192
+#: src/msgcmp.c:201
+#, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     odkazy na zdrojovÃ© sÃºbory\n"
 
-#: src/msgcmp.c:197 src/msgmerge.c:470
+#: src/msgcmp.c:206 src/msgmerge.c:487
+#, c-format
 msgid "Operation modifiers:\n"
 msgstr "ModifikÃ¡tory operÃ¡cie:\n"
 
-#: src/msgcmp.c:199 src/msgmerge.c:472
+#: src/msgcmp.c:208 src/msgmerge.c:489
+#, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 "  -m, --multi-domain          pouÅ¾ije ref.pot na vÅ¡etky domÃ©ny v def.po\n"
 
-#: src/msgcmp.c:273 src/msgmerge.c:923
+#: src/msgcmp.c:285 src/msgmerge.c:945
+#, c-format
 msgid "this message is used but not defined..."
 msgstr "tÃ¡to sprÃ¡va je pouÅ¾itÃ¡, ale nie je definovanÃ¡..."
 
-#: src/msgcmp.c:275 src/msgmerge.c:925
+#: src/msgcmp.c:287 src/msgmerge.c:947
+#, c-format
 msgid "...but this definition is similar"
 msgstr "...ale tÃ¡to definÃcia je podobnÃ¡"
 
-#: src/msgcmp.c:280 src/msgmerge.c:952
+#: src/msgcmp.c:292 src/msgmerge.c:974
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "tÃ¡to sprÃ¡va je pouÅ¾itÃ¡, ale nie je definovanÃ¡ v %s"
 
-#: src/msgcmp.c:384
+#: src/msgcmp.c:396
+#, c-format
 msgid "warning: this message is not used"
 msgstr "upozornenie: tÃ¡to sprÃ¡va nie je pouÅ¾itÃ¡"
 
-#: src/msgcmp.c:391
+#: src/msgcmp.c:403
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1041,12 +1190,13 @@ msgstr[0] "nÃ¡jdenÃ½ch %d zÃ¡vaÅ¾nÃ½ch chÃ½b"
 msgstr[1] "nÃ¡jdenÃ¡ %d zÃ¡vaÅ¾nÃ¡ chyba"
 msgstr[2] "nÃ¡jdenÃ© %d zÃ¡vaÅ¾nÃ© chyby"
 
-#: src/msgcomm.c:280
+#: src/msgcomm.c:294
+#, c-format
 msgid "at least two files must be specified"
 msgstr "musia byÅ¥ uvedenÃ© minimÃ¡lne dva sÃºbory"
 
-#: src/msgcomm.c:328
-#, no-wrap
+#: src/msgcomm.c:342
+#, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
 "By using the --more-than option, greater commonality may be requested\n"
@@ -1065,7 +1215,8 @@ msgstr ""
 "komentÃ¡re budÃº zachovanÃ© iba z prvÃ©ho PO sÃºboru, v ktorom sÃº definovanÃ©.\n"
 "PozÃcie v zdrojovÃ½ch sÃºboroch budÃº zlÃºÄenÃ© zo vÅ¡etkÃ½ch PO sÃºborov.\n"
 
-#: src/msgcomm.c:366
+#: src/msgcomm.c:380
+#, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
@@ -1073,62 +1224,72 @@ msgstr ""
 "  ->, --more-than=POÄŒET       vypÃsaÅ¥ sprÃ¡vy, ktorÃ© sÃº defineovanÃ© viac\n"
 "                              ako POÄŒET-krÃ¡t, Å¡tandardne nastavenÃ© na 1\n"
 
-#: src/msgcomm.c:405 src/xgettext.c:736
+#: src/msgcomm.c:424 src/xgettext.c:837
+#, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           nezapisovaÅ¥ hlaviÄku s poloÅ¾kou `msgid \"\"'\n"
 
-#: src/msgconv.c:273
+#: src/msgconv.c:288
+#, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "KonvertovaÅ¥ prekladovÃ½ katalÃ³g do inÃ©ho kÃ³dovania znakov.\n"
 
-#: src/msgconv.c:297
+#: src/msgconv.c:312
+#, c-format
 msgid "Conversion target:\n"
 msgstr "CieÄ¾ konverzie:\n"
 
-#: src/msgconv.c:301
+#: src/msgconv.c:316
+#, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "PredvolenÃ© kÃ³dovanie je kÃ³dovanie aktuÃ¡lneho nÃ¡rodnÃ©ho prostreda.\n"
 
-#: src/msgconv.c:317 src/msgen.c:293 src/msgmerge.c:490
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
+#, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                vÃ½stup s pouÅ¾itÃm odsadzovania\n"
 
-#: src/msgconv.c:319 src/msgen.c:295 src/msgfilter.c:417 src/msggrep.c:498
-#: src/msgmerge.c:492
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
+#: src/msgmerge.c:512
+#, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           nezapisovaÅ¥ riadky '#: meno_sÃºboru:riadok'\n"
 
-#: src/msgconv.c:321 src/msgen.c:297 src/msgfilter.c:419 src/msggrep.c:500
-#: src/msgmerge.c:494
+#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:435 src/msggrep.c:516
+#: src/msgmerge.c:514
+#, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location          zachovaÅ¥ riadky '#: meno_sÃºboru:riadok'\n"
 "                              (predvolenÃ©)\n"
 
-#: src/msgconv.c:323 src/msgen.c:299 src/msgfilter.c:421 src/msggrep.c:502
-#: src/msgmerge.c:496
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
+#: src/msgmerge.c:516
+#, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                presnÃ© dodrÅ¾iavanie Å¡tÃ½lu Uniforum\n"
 
-#: src/msgen.c:205 src/msgfmt.c:338 src/xgettext.c:466
+#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
+#, c-format
 msgid "no input file given"
 msgstr "nie sÃº zadanÃ© vstupnÃ© sÃºbory"
 
-#: src/msgen.c:210
+#: src/msgen.c:224
+#, c-format
 msgid "exactly one input file required"
 msgstr "potrebnÃ© je presne jeden vstupnÃ½ sÃºbor"
 
-#: src/msgen.c:248
+#: src/msgen.c:262
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "PouÅ¾itie: %s [VOÄ½BA] VSTUPNÃSÃšBOR\n"
 
-#: src/msgen.c:253
-#, no-wrap
+#: src/msgen.c:267
+#, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
 "created English PO file, or a PO Template file (generally created by\n"
@@ -1140,21 +1301,23 @@ msgstr ""
 "programom xgettext). NepreloÅ¾enÃ½m poloÅ¾kÃ¡m je priradenÃ½ preklad\n"
 "zhodnÃ½ s msgid.\n"
 
-#: src/msgen.c:265
+#: src/msgen.c:279
+#, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  VSTUPNÃSÃšBOR                vstupnÃ½ PO alebo POT sÃºbor\n"
 
-#: src/msgexec.c:182
+#: src/msgexec.c:192
+#, c-format
 msgid "missing command name"
 msgstr "chÃ½bajÃºci nÃ¡zov prÃkazu"
 
-#: src/msgexec.c:228
+#: src/msgexec.c:238
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "PouÅ¾itie: %s [VOÄ½BA] PRÃKAZ [VOÄ½BA-PRÃKAZU]\n"
 
-#: src/msgexec.c:233
-#, no-wrap
+#: src/msgexec.c:243
+#, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
 "The COMMAND can be any program that reads a translation from standard\n"
@@ -1168,8 +1331,8 @@ msgstr ""
 "bude aj vÃ½stupom programu msgexec. NÃ¡vratovÃ¡ hodnota programu msgexec je\n"
 "maximum nÃ¡vratovÃ½ch hodnÃ´t vÅ¡etkÃ½ch spustenÃ prÃkazu.\n"
 
-#: src/msgexec.c:242
-#, no-wrap
+#: src/msgexec.c:252
+#, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
@@ -1177,37 +1340,43 @@ msgstr ""
 "Å peciÃ¡lny vstavanÃ½ prÃkaz s nÃ¡zvom '0' vypisuje preklad nasledovanÃ½ nulovÃ½m\n"
 "bajtom. VÃ½stup prÃkazu \"msgexec 0\" je pouÅ¾iteÄ¾nÃ½ ako vstup pre \"xargs -0\".\n"
 
-#: src/msgexec.c:252 src/msgfilter.c:370
+#: src/msgexec.c:262 src/msgfilter.c:384
+#, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=VSTUPNÃSÃšBOR    vstupnÃ½ PO sÃºbor\n"
 
-#: src/msgexec.c:310
+#: src/msgexec.c:322
+#, c-format
 msgid "write to stdout failed"
 msgstr "zÃ¡pis na Å¡tandardnÃ½ vÃ½stup zlyhal"
 
-#: src/msgexec.c:333 src/msgfilter.c:618
+#: src/msgexec.c:345 src/msgfilter.c:637
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "zÃ¡pis do podprocesu %s zlyhal"
 
-#: src/msgfilter.c:271
+#: src/msgfilter.c:285
+#, c-format
 msgid "missing filter name"
 msgstr "chÃ½bajÃºci nÃ¡zov filtra"
 
-#: src/msgfilter.c:295
+#: src/msgfilter.c:309
+#, c-format
 msgid "at least one sed script must be specified"
 msgstr "musÃ byÅ¥ uvedenÃ½ aspoÅˆ jeden sed skript"
 
-#: src/msgfilter.c:357
+#: src/msgfilter.c:371
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "PouÅ¾itie: %s [VOÄ½BA] FILTER [VOÄ½BA-FILTRA]\n"
 
-#: src/msgfilter.c:361
+#: src/msgfilter.c:375
+#, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "AplikovaÅ¥ filter na vÅ¡etky preklady prekladovÃ©ho katalÃ³gu.\n"
 
-#: src/msgfilter.c:385
+#: src/msgfilter.c:399
+#, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
@@ -1216,16 +1385,19 @@ msgstr ""
 "vstupu\n"
 "a zapisuje upravenÃ© preklady na Å¡tandardnÃ½ vÃ½stup.\n"
 
-#: src/msgfilter.c:390
+#: src/msgfilter.c:404
+#, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "UÅ¾itoÄnÃ© VOÄ½BY-FILTRA keÄ je pouÅ¾itÃ½ FILTER 'sed':\n"
 
-#: src/msgfilter.c:392
+#: src/msgfilter.c:406
+#, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=SKRIPT     pridaÅ¥ SKRIPT k vykonÃ¡vanÃ½m prÃkazom\n"
 
-#: src/msgfilter.c:394
+#: src/msgfilter.c:408
+#, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
 "commands\n"
@@ -1235,81 +1407,86 @@ msgstr ""
 "vÃ½konÃ¡vanÃ½m\n"
 "                                prÃkazom\n"
 
-#: src/msgfilter.c:397
+#: src/msgfilter.c:411
+#, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       potlaÄiÅ¥ automatickÃº tlaÄ priestoru vzorov\n"
 
-#: src/msgfilter.c:407 src/msggrep.c:490
+#: src/msgfilter.c:423 src/msggrep.c:506
+#, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             nepouÅ¾iÅ¥ na vÃ½stupe riadiace sekvencie\n"
 "                              jazyka C (predvolenÃ©)\n"
 
-#: src/msgfilter.c:413 src/msggrep.c:496
+#: src/msgfilter.c:429 src/msggrep.c:512
+#, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                vÃ½stup s pouÅ¾itÃm odsadzovania\n"
 
-#: src/msgfilter.c:415
+#: src/msgfilter.c:431
+#, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           zachovaÅ¥ poloÅ¾ku hlaviÄky nezmenenÃº,\n"
 "                              neodfiltrovaÅ¥ ju\n"
 
-#: src/msgfilter.c:542
+#: src/msgfilter.c:560
+#, c-format
 msgid "Not yet implemented."
 msgstr "EÅ¡te nie je implementovanÃ©."
 
-#: src/msgfilter.c:570
+#: src/msgfilter.c:589
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "nemÃ´Å¾em nastaviÅ¥ neblokujÃºce V/V na podproces %s"
 
-#: src/msgfilter.c:598
+#: src/msgfilter.c:617
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "komunikÃ¡cia s podprocesom %s zlyhala"
 
-#: src/msgfilter.c:649
+#: src/msgfilter.c:668
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "ÄÃtanie z podprocesu %s zlyhalo"
 
-#: src/msgfilter.c:665
+#: src/msgfilter.c:684
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "podproces %s bol ukonÄenÃ½ s ukonÄovacÃm kÃ³dom %d"
 
-#: src/msgfmt.c:289
+#: src/msgfmt.c:299
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "parameter pre %s by malo byÅ¥ len jedno interpunkÄnÃ© znamienko"
 
-#: src/msgfmt.c:356 src/msgfmt.c:378 src/msgunfmt.c:256
+#: src/msgfmt.c:378 src/msgfmt.c:400 src/msgunfmt.c:265
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s vyÅ¾aduje Å¡pecifikÃ¡ciu \"-d adresÃ¡r\""
 
-#: src/msgfmt.c:371 src/msgunfmt.c:249
+#: src/msgfmt.c:393 src/msgunfmt.c:258
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s vyÅ¾aduje Å¡pecifikÃ¡ciu \"-l nÃ¡rodnÃ© prostredie\""
 
-#: src/msgfmt.c:387 src/msgmerge.c:317 src/msgmerge.c:323 src/msgunfmt.c:265
-#: src/msgunfmt.c:271
+#: src/msgfmt.c:409 src/msgmerge.c:331 src/msgmerge.c:337 src/msgunfmt.c:274
+#: src/msgunfmt.c:280
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s je platnÃ© len s %s"
 
-#: src/msgfmt.c:393 src/msgfmt.c:399
+#: src/msgfmt.c:415 src/msgfmt.c:421
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s je platnÃ© len s %s alebo %s"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:503
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1317,7 +1494,7 @@ msgstr[0] "%d preloÅ¾enÃ½ch sprÃ¡v"
 msgstr[1] "%d preloÅ¾enÃ¡ sprÃ¡va"
 msgstr[2] "%d preloÅ¾enÃ© sprÃ¡vy"
 
-#: src/msgfmt.c:476
+#: src/msgfmt.c:508
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1325,7 +1502,7 @@ msgstr[0] ", %d nepresnÃ½ch prekladov"
 msgstr[1] ", %d nepresnÃ½ preklad"
 msgstr[2] ", %d nepresnÃ© preklady"
 
-#: src/msgfmt.c:481
+#: src/msgfmt.c:513
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1333,17 +1510,18 @@ msgstr[0] ", %d nepreloÅ¾enÃ½ch sprÃ¡v"
 msgstr[1] ", %d nepreloÅ¾enÃ¡ sprÃ¡va"
 msgstr[2] ", %d nepreloÅ¾enÃ© sprÃ¡vy"
 
-#: src/msgfmt.c:501
+#: src/msgfmt.c:533
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "PouÅ¾itie: %s [VOÄ½BA] menosÃºboru.po ...\n"
 
-#: src/msgfmt.c:505
+#: src/msgfmt.c:537
+#, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "GenerovaÅ¥ binÃ¡rny katalÃ³g sprÃ¡v z textovÃ©ho popisu prekladu.\n"
 
-#: src/msgfmt.c:510 src/xgettext.c:639
-#, no-wrap
+#: src/msgfmt.c:542 src/xgettext.c:717
+#, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
@@ -1351,15 +1529,18 @@ msgstr ""
 "PovinnÃ© parametre dlhÃ½ch volieb sÃº povinnÃ© aj pre krÃ¡tke voÄ¾by.\n"
 "Podobne aj pre voliteÄ¾nÃ© parametre.\n"
 
-#: src/msgfmt.c:517
+#: src/msgfmt.c:549
+#, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  menosÃºboru.po ...           vstupnÃ© sÃºbory\n"
 
-#: src/msgfmt.c:524 src/msgmerge.c:436 src/msgunfmt.c:336 src/xgettext.c:687
+#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
+#, c-format
 msgid "Operation mode:\n"
 msgstr "MÃ³d Äinnosti:\n"
 
-#: src/msgfmt.c:526
+#: src/msgfmt.c:558
+#, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
@@ -1367,7 +1548,8 @@ msgstr ""
 "  -j, --java                  mÃ³d Java: generovaÅ¥ triedu Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:528
+#: src/msgfmt.c:560
+#, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
@@ -1376,29 +1558,40 @@ msgstr ""
 "alebo\n"
 "                              vyÅ¡Å¡ie)\n"
 
-#: src/msgfmt.c:530
+#: src/msgfmt.c:562
+#, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   mÃ³d Tcl: generovaÅ¥ sÃºbor .msg tcl/msgcat\n"
 
-#: src/msgfmt.c:537
+#: src/msgfmt.c:564
+#, c-format
+msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
+msgstr "      --qt                    mÃ³d Qt: generovaÅ¥ Qt sÃºbor .qm\n"
+
+#: src/msgfmt.c:571
+#, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                povoliÅ¥ presne dodrÅ¾anÃ½ mÃ³d Uniforum\n"
 
-#: src/msgfmt.c:539 src/xgettext.c:663
+#: src/msgfmt.c:573 src/xgettext.c:741
+#, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Ak je vÃ½stupnÃ½ sÃºbor -, vÃ½stup je zapÃsanÃ½ na Å¡tandardnÃ½ vÃ½stup.\n"
 
-#: src/msgfmt.c:542
+#: src/msgfmt.c:576
+#, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Umiestnenie vÃ½stupnÃ©ho sÃºboru v mÃ³de Java:\n"
 
-#: src/msgfmt.c:544 src/msgunfmt.c:352
+#: src/msgfmt.c:578 src/msgunfmt.c:361
+#, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=ZDROJ        nÃ¡zov zdroja\n"
 
-#: src/msgfmt.c:546 src/msgfmt.c:558 src/msgunfmt.c:354 src/msgunfmt.c:363
+#: src/msgfmt.c:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
+#, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
@@ -1406,13 +1599,15 @@ msgstr ""
 "  -l, --locale=N_PROSTREDIE   nÃ¡zov nÃ¡rodnÃ©ho prostredia, buÄ jazyk alebo\n"
 "                              jazyk_KRAJINA\n"
 
-#: src/msgfmt.c:548
+#: src/msgfmt.c:582
+#, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d ADRESÃR                  zÃ¡kladnÃ½ adresÃ¡r adresÃ¡rov hierarchie tried\n"
 
-#: src/msgfmt.c:550
+#: src/msgfmt.c:584
+#, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
 "name,\n"
@@ -1423,26 +1618,31 @@ msgstr ""
 "oddelenÃ© znakom \"_\". VoÄ¾ba -d je povinnÃ¡. Trieda je zapÃsanÃ¡ do zadanÃ©ho\n"
 "adresÃ¡ra.\n"
 
-#: src/msgfmt.c:556
+#: src/msgfmt.c:590
+#, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Umiestnenie vÃ½stupnÃ©ho sÃºboru v mÃ³de Tcl:\n"
 
-#: src/msgfmt.c:560 src/msgunfmt.c:365
+#: src/msgfmt.c:594 src/msgunfmt.c:374
+#, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d ADRESÃR                  zÃ¡kladnÃ½ adresÃ¡r katalÃ³gov sprÃ¡v .msg\n"
 
-#: src/msgfmt.c:562
+#: src/msgfmt.c:596
+#, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 "VoÄ¾by -l a -d sÃº povinnÃ©. SÃºbor .msg je zapÃsanÃ½ do zadanÃ©ho adresÃ¡ra.\n"
 
-#: src/msgfmt.c:571 src/xgettext.c:679
+#: src/msgfmt.c:608 src/xgettext.c:757
+#, c-format
 msgid "Input file interpretation:\n"
 msgstr "InterpretÃ¡cia vstupnÃ©ho sÃºboru:\n"
 
-#: src/msgfmt.c:573
+#: src/msgfmt.c:610
+#, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
 "                                --check-format, --check-header, --check-"
@@ -1452,20 +1652,23 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:576
+#: src/msgfmt.c:613
+#, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          kontrolovaÅ¥ jazykovo zÃ¡vislÃ© formÃ¡tovanÃ© "
 "reÅ¥azce\n"
 
-#: src/msgfmt.c:578
+#: src/msgfmt.c:615
+#, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 "      --check-header          overiÅ¥ prÃtomnosÅ¥ a obsah poloÅ¾ky hlaviÄky\n"
 
-#: src/msgfmt.c:580
+#: src/msgfmt.c:617
+#, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
@@ -1474,7 +1677,8 @@ msgstr ""
 "domÃ©ny\n"
 "                                a voÄ¾bou --output-file\n"
 
-#: src/msgfmt.c:583
+#: src/msgfmt.c:620
+#, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
@@ -1482,7 +1686,8 @@ msgstr ""
 "  -C, --check-compatibility   kontrolovaÅ¥, Äi sa GNU msgfmt sprÃ¡va tak ako\n"
 "                                X/Open msgfmt\n"
 
-#: src/msgfmt.c:585
+#: src/msgfmt.c:622
+#, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
 "for\n"
@@ -1492,11 +1697,12 @@ msgstr ""
 "skratiek\n"
 "                                pre poloÅ¾ky menu\n"
 
-#: src/msgfmt.c:588
+#: src/msgfmt.c:625
+#, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             pouÅ¾iÅ¥ nepresnÃ© preklady vo vÃ½stupe\n"
 
-#: src/msgfmt.c:593
+#: src/msgfmt.c:630
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -1504,41 +1710,48 @@ msgstr ""
 "  -a, --alignment=POÄŒET       zarovnaÅ¥ reÅ¥azce na POÄŒET bajtov (Å¡tandardne: %"
 "d)\n"
 
-#: src/msgfmt.c:595
+#: src/msgfmt.c:632
+#, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               binÃ¡rny sÃºbor nebude obsahovaÅ¥ haÅ¡ovaciu "
 "tabuÄ¾ku\n"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:641
+#, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            zobraziÅ¥ Å¡tatistiky prekladov\n"
 
-#: src/msgfmt.c:606 src/msgmerge.c:516 src/msgunfmt.c:407
+#: src/msgfmt.c:643 src/msgmerge.c:538 src/msgunfmt.c:418
+#, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               zvÃ½Å¡iÅ¥ ÃºroveÅˆ tÃ¡ravosti\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:781
+#, c-format
 msgid "plural expression can produce negative values"
 msgstr "vÃ½raz pre mnoÅ¾nÃ© ÄÃslo mÃ´Å¾e nadobÃºdaÅ¥ zÃ¡pornÃ© hodnoty"
 
-#: src/msgfmt.c:757
+#: src/msgfmt.c:794
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, ale vÃ½raz pre mnoÅ¾nÃ© ÄÃslo mÃ´Å¾e nadobÃºdaÅ¥ hodnoty vÃ¤ÄÅ¡ie ako "
 "%lu"
 
-#: src/msgfmt.c:783
+#: src/msgfmt.c:821
+#, c-format
 msgid "plural expression can produce division by zero"
 msgstr "vÃ½raz pre mnoÅ¾nÃ© ÄÃslo mÃ´Å¾e spÃ´sobiÅ¥ delenie nulou"
 
-#: src/msgfmt.c:788
+#: src/msgfmt.c:827
+#, c-format
 msgid "plural expression can produce integer overflow"
 msgstr "vÃ½raz pre mnoÅ¾nÃ© ÄÃslo mÃ´Å¾e spÃ´sobiÅ¥ celoÄÃselnÃ© preteÄenie"
 
-#: src/msgfmt.c:793
+#: src/msgfmt.c:833
+#, c-format
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -1546,32 +1759,37 @@ msgstr ""
 "vÃ½raz pre mnoÅ¾nÃ© ÄÃslo mÃ´Å¾e spÃ´sobiÅ¥ aritmetickÃº vÃ½nimku, pravdepodobne "
 "delenie nulou"
 
-#: src/msgfmt.c:871 src/msgfmt.c:883
+#: src/msgfmt.c:911 src/msgfmt.c:923
+#, c-format
 msgid "message catalog has plural form translations..."
 msgstr "katalÃ³g sprÃ¡v mÃ¡ preklady s mnoÅ¾nÃ½mi ÄÃslami..."
 
-#: src/msgfmt.c:874
+#: src/msgfmt.c:914
+#, c-format
 msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...ale v hlaviÄke chÃ½ba \"plural=VÃRAZ\""
 
-#: src/msgfmt.c:886
+#: src/msgfmt.c:926
+#, c-format
 msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...ale v hlaviÄke chÃ½ba \"nplurals=ÄŒÃSLO\""
 
-#: src/msgfmt.c:911
+#: src/msgfmt.c:951
+#, c-format
 msgid "invalid nplurals value"
 msgstr "neplatnÃ¡ hodnota nplurals"
 
-#: src/msgfmt.c:925
+#: src/msgfmt.c:965
+#, c-format
 msgid "invalid plural expression"
 msgstr "neplatnÃ½ vÃ½raz pre mnoÅ¾nÃ© ÄÃslo"
 
-#: src/msgfmt.c:944 src/msgfmt.c:959
+#: src/msgfmt.c:984 src/msgfmt.c:999
 #, c-format
 msgid "nplurals = %lu..."
 msgstr "nplurals = %lu..."
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:987
 #, c-format
 msgid "...but some messages have only one plural form"
 msgid_plural "...but some messages have only %lu plural forms"
@@ -1579,7 +1797,7 @@ msgstr[0] "...ale niektorÃ© sprÃ¡vy majÃº len %lu tvarov mnoÅ¾nÃ½ch ÄÃsel"
 msgstr[1] "...ale niektorÃ© sprÃ¡vy majÃº len %lu tvar mnoÅ¾nÃ©ho ÄÃsla"
 msgstr[2] "...ale niektorÃ© sprÃ¡vy majÃº len %lu tvary mnoÅ¾nÃ½ch ÄÃsel"
 
-#: src/msgfmt.c:962
+#: src/msgfmt.c:1002
 #, c-format
 msgid "...but some messages have one plural form"
 msgid_plural "...but some messages have %lu plural forms"
@@ -1587,12 +1805,13 @@ msgstr[0] "...ale niektorÃ© sprÃ¡vy majÃº %lu tvarov mnoÅ¾nÃ½ch ÄÃsel"
 msgstr[1] "...ale niektorÃ© sprÃ¡vy majÃº %lu tvar mnoÅ¾nÃ©ho ÄÃsla"
 msgstr[2] "...ale niektorÃ© sprÃ¡vy majÃº %lu tvary mnoÅ¾nÃ½ch ÄÃsel"
 
-#: src/msgfmt.c:992
+#: src/msgfmt.c:1032
 #, c-format
 msgid "Try using the following, valid for %s:\n"
 msgstr "SkÃºste pouÅ¾iÅ¥ nasledujÃºce, platnÃ© pre %s:\n"
 
-#: src/msgfmt.c:1005
+#: src/msgfmt.c:1045
+#, c-format
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -1600,124 +1819,135 @@ msgstr ""
 "katalÃ³g sprÃ¡v mÃ¡ preklady s mnoÅ¾nÃ½mi ÄÃslami, ale v hlaviÄke chÃ½ba \"Plural-"
 "Forms: nplurals=ÄŒÃSLO; plural=VÃRAZ;\""
 
-#: src/msgfmt.c:1039
+#: src/msgfmt.c:1079
+#, c-format
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "poloÅ¾ky `msgid' a `msgid_plural' nezaÄÃnajÃº obe s '\\n'"
 
-#: src/msgfmt.c:1049
+#: src/msgfmt.c:1089
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "poloÅ¾ky `msgid' a `msgstr[%u]' nezaÄÃnajÃº obe s '\\n'"
 
-#: src/msgfmt.c:1061
+#: src/msgfmt.c:1101
+#, c-format
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "poloÅ¾ky `msgid' a `msgstr' nezaÄÃnajÃº obe s '\\n'"
 
-#: src/msgfmt.c:1078
+#: src/msgfmt.c:1118
+#, c-format
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "poloÅ¾ky `msgid' a `msgid_plural' nie sÃº obe ukonÄenÃ© s '\\n'"
 
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1128
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "poloÅ¾ky `msgid' a `msgstr[%u]' nie sÃº obe ukonÄenÃ© s '\\n'"
 
-#: src/msgfmt.c:1100
+#: src/msgfmt.c:1140
+#, c-format
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "poloÅ¾ky `msgid' a `msgstr' nie sÃº obe ukonÄenÃ© s '\\n'"
 
-#: src/msgfmt.c:1112
+#: src/msgfmt.c:1152
+#, c-format
 msgid "plural handling is a GNU gettext extension"
 msgstr "spracovanie mnoÅ¾nÃ½ch ÄÃsel je rozÅ¡ÃrenÃm GNU"
 
-#: src/msgfmt.c:1179
+#: src/msgfmt.c:1219
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 "'%s' nie je platnÃ½ formÃ¡tovacÃ reÅ¥azec %s, na rozdiel od 'msgid'. DÃ´vod: %s"
 
-#: src/msgfmt.c:1221
+#: src/msgfmt.c:1261
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "v msgstr chÃ½ba znaÄka klÃ¡vesovej skratky '%c'"
 
-#: src/msgfmt.c:1229
+#: src/msgfmt.c:1269
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr obsahuje prÃliÅ¡ veÄ¾a znaÄiek klÃ¡vesovÃ½ch skratiek '%c'"
 
-#: src/msgfmt.c:1263
+#: src/msgfmt.c:1303
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "hlaviÄkovÃ¡ poloÅ¾ka `%s' chÃ½ba v hlaviÄke\n"
 
-#: src/msgfmt.c:1267
+#: src/msgfmt.c:1307
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "hlaviÄkovÃ¡ poloÅ¾ka `%s' mÃ¡ zaÄÃnaÅ¥ na zaÄiatku riadku\n"
 
-#: src/msgfmt.c:1278
+#: src/msgfmt.c:1318
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 "niektorÃ© poloÅ¾ky hlaviÄky eÅ¡te obsahujÃº poÄiatoÄnÃ© Å¡tandardnÃ© hodnoty\n"
 
-#: src/msgfmt.c:1290
+#: src/msgfmt.c:1330
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "poloÅ¾ka `%s' eÅ¡te obsahuje poÄiatoÄnÃº Å¡tandardnÃº hodnotu\n"
 
-#: src/msgfmt.c:1348
+#: src/msgfmt.c:1388
+#, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "upozornenie: hlaviÄka sÃºboru PO chÃ½ba alebo je neplatnÃ¡\n"
 
-#: src/msgfmt.c:1351
+#: src/msgfmt.c:1391
+#, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "upozornenie: konverzia znakovej sady nebude fungovaÅ¥\n"
 
-#: src/msgfmt.c:1361
+#: src/msgfmt.c:1401
+#, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "upozornenie: hlaviÄka sÃºboru PO je nepresnÃ¡\n"
 
-#: src/msgfmt.c:1363
+#: src/msgfmt.c:1403
+#, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "upozornenie: starÅ¡ie verzie msgfmt vrÃ¡tia pri tomto chybu\n"
 
-#: src/msgfmt.c:1386
+#: src/msgfmt.c:1426
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "meno domÃ©ny \"%s\" nie je pouÅ¾itelnÃ© ako meno sÃºboru"
 
-#: src/msgfmt.c:1391
+#: src/msgfmt.c:1431
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "meno domÃ©ny \"%s\" nie je pouÅ¾itelnÃ© ako meno sÃºboru: pouÅ¾ije sa predpona"
 
-#: src/msgfmt.c:1405
+#: src/msgfmt.c:1445
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "direktÃva `domain %s' bola ignorovanÃ¡"
 
-#: src/msgfmt.c:1459
+#: src/msgfmt.c:1499
+#, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "prÃ¡zdna poloÅ¾ka `msgstr' bola ignorovanÃ¡"
 
-#: src/msgfmt.c:1460
+#: src/msgfmt.c:1500
+#, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "nepresnÃ¡ poloÅ¾ka `msgstr' bola ignorovanÃ¡"
 
-#: src/msgfmt.c:1518
+#: src/msgfmt.c:1558
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: upozornenie: zdrojovÃ½ sÃºbor obsahuje nepresnÃ© preklady"
 
-#: src/msggrep.c:407
+#: src/msggrep.c:421
 #, c-format
 msgid "option '%c' cannot be used before 'K' or 'T' or 'C' has been specified"
 msgstr "voÄ¾ba '%c' nemÃ´Å¾e byÅ¥ pouÅ¾itÃ¡ pred Å¡pecifikovanÃ½m 'K', 'T' alebo 'C'"
 
-#: src/msggrep.c:427
-#, no-wrap
+#: src/msggrep.c:441
+#, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
@@ -1725,8 +1955,8 @@ msgstr ""
 "Vyberie vÅ¡etky sprÃ¡vy z prekladovÃ©ho katalÃ³gu, ktorÃ© vyhovujÃº zadanÃ©mu\n"
 "vzoru alebo sÃº v zadanÃ½ch zdrojovÃ½ch sÃºboroch.\n"
 
-#: src/msggrep.c:453
-#, no-wrap
+#: src/msggrep.c:467
+#, c-format, no-wrap
 msgid ""
 "Message selection:\n"
 "  [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
@@ -1785,7 +2015,8 @@ msgstr ""
 "  -f, --file=SÃšBOR            zÃskaÅ¥ VZOR zo SÃšBORu\n"
 "  -i, --ignore-case           ignorovaÅ¥ rozlÃÅ¡enie veÄ¾kÃ½ch a malÃ½ch pÃsmen\n"
 
-#: src/msggrep.c:492
+#: src/msggrep.c:508
+#, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
@@ -1793,20 +2024,23 @@ msgstr ""
 "C,\n"
 "                              bez rozÅ¡ÃrenÃ½ch znakov\n"
 
-#: src/msggrep.c:511
+#: src/msggrep.c:529
+#, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           generovaÅ¥ utriedenÃ½ vÃ½stup\n"
 
-#: src/msggrep.c:513
+#: src/msggrep.c:531
+#, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          utriediÅ¥ vÃ½stup podÄ¾a umiestnenia v sÃºboroch\n"
 
-#: src/msggrep.c:584
+#: src/msggrep.c:602
+#, c-format
 msgid "write to grep subprocess failed"
 msgstr "zlyhal zÃ¡pis do podprocesu grep"
 
-#: src/msginit.c:279
+#: src/msginit.c:293
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -1817,7 +2051,7 @@ msgstr ""
 "ABOUT-NLS. Toto je potrebnÃ© na to, aby ste mohli otestovaÅ¥\n"
 "vaÅ¡e preklady.\n"
 
-#: src/msginit.c:307
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1828,13 +2062,13 @@ msgstr ""
 "Zadajte, prosÃm, nÃ¡rodnÃ© prostredie pomocou voÄ¾by --locale alebo\n"
 "vÃ½stupnÃ½ .po sÃºbor pomocou voÄ¾by --output-file.\n"
 
-#: src/msginit.c:330
+#: src/msginit.c:345
 #, c-format
 msgid "Created %s.\n"
 msgstr "VytvorenÃ½ %s.\n"
 
-#: src/msginit.c:350
-#, no-wrap
+#: src/msginit.c:365
+#, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
@@ -1842,11 +2076,13 @@ msgstr ""
 "VytvorÃ novÃ½ PO sÃºbor, inicializuje meta informÃ¡cie podÄ¾a hodnÃ´t z prostredia\n"
 "pouÅ¾ÃvateÄ¾a.\n"
 
-#: src/msginit.c:360
+#: src/msginit.c:375
+#, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=VSTUPNÃSÃšBOR    vstupnÃ½ POT sÃºbor\n"
 
-#: src/msginit.c:362
+#: src/msginit.c:377
+#, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
 "file.\n"
@@ -1856,11 +2092,13 @@ msgstr ""
 "adresÃ¡ri.\n"
 "Ak je -, naÄÃtanÃ½ je Å¡tandardnÃ½ vstup.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:383
+#, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=SÃšBOR     zapÃsaÅ¥ vÃ½stup do zadanÃ©ho PO sÃºboru\n"
 
-#: src/msginit.c:370
+#: src/msginit.c:385
+#, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
@@ -1869,18 +2107,20 @@ msgstr ""
 "nastavenia nÃ¡rodnÃ©ho prostredia pouÅ¾ÃvateÄ¾a. Ak je -, vÃ½stup je zapÃsanÃ½ na\n"
 "Å¡tandardnÃ½ vÃ½stup.\n"
 
-#: src/msginit.c:381
+#: src/msginit.c:398
+#, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          nastaviÅ¥ cieÄ¾ovÃ© nÃ¡rodnÃ© prostredie\n"
 
-#: src/msginit.c:383
+#: src/msginit.c:400
+#, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         oznaÄiÅ¥, Å¾e PO sÃºbor je generovanÃ½ "
 "automaticky\n"
 
-#: src/msginit.c:437
+#: src/msginit.c:456
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -1888,11 +2128,12 @@ msgstr ""
 "NÃ¡jdenÃ½ch viac ako jeden .pot sÃºbor.\n"
 "ProsÃm zadajte vstupnÃ½ .pot sÃºbor pomocou voÄ¾by --input.\n"
 
-#: src/msginit.c:445 src/msginit.c:450
+#: src/msginit.c:464 src/msginit.c:469
+#, c-format
 msgid "error reading current directory"
 msgstr "chyba pri ÄÃtanÃ adresÃ¡ra"
 
-#: src/msginit.c:458
+#: src/msginit.c:477
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -1900,23 +2141,24 @@ msgstr ""
 "V aktuÃ¡lnom adresÃ¡ri nebol nÃ¡jdenÃ½ Å¾iaden .pot sÃºbor.\n"
 "ProsÃm zadajte vstupnÃ½ .pot sÃºbor pomocou voÄ¾by --input.\n"
 
-#: src/msginit.c:917 src/msginit.c:983 src/msginit.c:1140 src/msginit.c:1221
-#: src/read-java.c:71 src/read-tcl.c:107
+#: src/msginit.c:937 src/msginit.c:1004 src/msginit.c:1162 src/msginit.c:1244
+#: src/read-java.c:71 src/read-tcl.c:108
+#, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() zlyhalo"
 
-#: src/msginit.c:925 src/msginit.c:991 src/msginit.c:1148
+#: src/msginit.c:945 src/msginit.c:1012 src/msginit.c:1170
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "V/V chyba podprocesu %s"
 
-#: src/msginit.c:937 src/msginit.c:1003 src/msginit.c:1160 src/msginit.c:1238
-#: src/read-java.c:81 src/read-tcl.c:123
+#: src/msginit.c:957 src/msginit.c:1024 src/msginit.c:1182 src/msginit.c:1261
+#: src/read-java.c:81 src/read-tcl.c:124
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "podproces %s zlyhal s ukonÄovacÃm kÃ³dom %d"
 
-#: src/msginit.c:1127
+#: src/msginit.c:1148
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -1933,7 +2175,7 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1511
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "SlovenskÃ© preklady pre balÃk %s"
@@ -1962,18 +2204,20 @@ msgid ""
 msgstr ""
 "domÃ©na \"%s\" vo vstupnom sÃºbore \"%s\" nemÃ¡ v hlaviÄke uvedenÃº znakovÃº sadu"
 
-#: src/msgl-cat.c:380 src/msgl-iconv.c:392
+#: src/msgl-cat.c:380 src/msgl-iconv.c:403
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "cieÄ¾ovÃ¡ znakovÃ¡ sada \"%s\" nie je prenositeÄ¾nÃ© meno kÃ³dovania."
 
 #: src/msgl-cat.c:430 src/msgl-cat.c:436 src/msgl-charset.c:90
-#: src/msgl-charset.c:125 src/write-po.c:837 src/write-po.c:903
-#: src/xgettext.c:1338
+#: src/msgl-charset.c:125 src/write-po.c:850 src/write-po.c:916
+#: src/xgettext.c:1989
+#, c-format
 msgid "warning: "
 msgstr "upozornenie: "
 
 #: src/msgl-cat.c:431
+#, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
@@ -2050,14 +2294,16 @@ msgstr ""
 "MoÅ¾nou obchÃ¡dzkou je nastavenie LC_ALL=C.\n"
 
 #: src/msgl-iconv.c:186 src/msgl-iconv.c:244
+#, c-format
 msgid "conversion failure"
 msgstr "konverzia zlyhala"
 
 #: src/msgl-iconv.c:337
+#, c-format
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "vstupnÃ½ sÃºbor nemÃ¡ v hlaviÄke uvedenÃº znakovÃº sadu"
 
-#: src/msgl-iconv.c:355 src/xgettext.c:520
+#: src/msgl-iconv.c:356 src/xgettext.c:586
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2066,7 +2312,16 @@ msgstr ""
 "NemÃ´Å¾em konvertovaÅ¥ z \"%s\" do \"%s\". %s spolieha na iconv() a iconv() "
 "nepodporuje takÃºto konverziu."
 
-#: src/msgl-iconv.c:372 src/xgettext.c:527
+#: src/msgl-iconv.c:378
+#, c-format
+msgid ""
+"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
+"msgids become equal."
+msgstr ""
+"Konverzia z \"%s\" do \"%s\" zavedie duplicity: niektorÃ© rozdielne msgid sa "
+"stanÃº rovnakÃ½mi."
+
+#: src/msgl-iconv.c:383 src/xgettext.c:593
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2075,12 +2330,12 @@ msgstr ""
 "NemÃ´Å¾em konvertovaÅ¥ z \"%s\" do \"%s\". %s spolieha na iconv(). TÃ¡to verzia "
 "bola preloÅ¾enÃ¡ bez iconv()."
 
-#: src/msgmerge.c:374
+#: src/msgmerge.c:391
 msgid "backup type"
 msgstr "typ zÃ¡lohy"
 
-#: src/msgmerge.c:409
-#, no-wrap
+#: src/msgmerge.c:426
+#, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
 "existing PO file with translations which will be taken over to the newly\n"
@@ -2103,16 +2358,19 @@ msgstr ""
 "pri ktorÃ½ch nie je moÅ¾nÃ© nÃ¡jsÅ¥ presnÃº zhodu, bude pouÅ¾itÃ½ fuzzy algoritmus,\n"
 "ktorÃ½ dosahuje lepÅ¡ie vÃ½sledky.\n"
 
-#: src/msgmerge.c:426
+#: src/msgmerge.c:443
+#, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      preklady podÄ¾a starÃ½ch zdrojovÃ½ch sÃºborov\n"
 
-#: src/msgmerge.c:428
+#: src/msgmerge.c:445
+#, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     odkazy na novÃ© zdrojovÃ© sÃºbory\n"
 
-#: src/msgmerge.c:432
+#: src/msgmerge.c:449
+#, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
@@ -2120,7 +2378,8 @@ msgstr ""
 "  -C, --compendium=SÃšBOR      prÃdavnÃ¡ kniÅ¾nica prekladov sprÃ¡v, mÃ´Å¾e byÅ¥\n"
 "                              zadanÃ¡ viac ako raz\n"
 
-#: src/msgmerge.c:438
+#: src/msgmerge.c:455
+#, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
@@ -2128,23 +2387,28 @@ msgstr ""
 "  -U, --update                aktualizovaÅ¥ def.po,\n"
 "                              nerobiÅ¥ niÄ, ak def.po je aktuÃ¡lny\n"
 
-#: src/msgmerge.c:450
+#: src/msgmerge.c:467
+#, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Umiestnenie vÃ½stupnÃ©ho sÃºboru v mÃ³de aktualizÃ¡cie:\n"
 
-#: src/msgmerge.c:452
+#: src/msgmerge.c:469
+#, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "VÃ½sledok je zapÃsanÃ½ spÃ¤Å¥ do def.po.\n"
 
-#: src/msgmerge.c:454
+#: src/msgmerge.c:471
+#, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        vytvoriÅ¥ zÃ¡lohu sÃºboru def.po\n"
 
-#: src/msgmerge.c:456
+#: src/msgmerge.c:473
+#, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=PRÃPONA        prekryÅ¥ obvyklÃº prÃponu zÃ¡lohy\n"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:475
+#, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
 "through\n"
@@ -2161,7 +2425,8 @@ msgstr ""
 "  existing, nil   numbered, ak existuje ÄÃslovanÃ¡ zÃ¡loha, inak simple\n"
 "  simple, never   vÅ¾dy vytvoriÅ¥ jednoduchÃº zÃ¡lohu\n"
 
-#: src/msgmerge.c:465
+#: src/msgmerge.c:482
+#, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
@@ -2170,25 +2435,29 @@ msgstr ""
 "PrÃpona zÃ¡lohy je '~', pokiaÄ¾ nie je zadanÃ¡ voÄ¾ba --suffix alebo nastavenÃ¡\n"
 "premennÃ¡ prostredia SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:474
+#: src/msgmerge.c:491
+#, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
 "  -N, --no-fuzzy-matching     nepouÅ¾iÅ¥ algoritmus pre nÃ¡jdenie nepresnÃ½ch\n"
 "                              prekladov\n"
 
-#: src/msgmerge.c:518
+#: src/msgmerge.c:540
+#, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       potlaÄiÅ¥ indikÃ¡tory postupu\n"
 
-#: src/msgmerge.c:1002
+#: src/msgmerge.c:1024
+#, c-format
 msgid "this message should define plural forms"
 msgstr "tÃ¡to sprÃ¡va by mala definovaÅ¥ tvary mnoÅ¾nÃ©ho ÄÃsla"
 
-#: src/msgmerge.c:1025
+#: src/msgmerge.c:1047
+#, c-format
 msgid "this message should not define plural forms"
 msgstr "tÃ¡to sprÃ¡va by nemala definovaÅ¥ tvary mnoÅ¾nÃ©ho ÄÃsla"
 
-#: src/msgmerge.c:1191
+#: src/msgmerge.c:1213
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2197,46 +2466,52 @@ msgstr ""
 "%sNaÄÃtanÃ© %ld starÃ½ch + %ld odkazov, %ld zluÄenÃ½ch, %ld nepresnÃ½ch, %ld "
 "chÃ½bajucich, %ld zruÅ¡enÃ½ch.\n"
 
-#: src/msgmerge.c:1199
+#: src/msgmerge.c:1221
 msgid " done.\n"
 msgstr " hotovo.\n"
 
-#: src/msgunfmt.c:234 src/msgunfmt.c:243
+#: src/msgunfmt.c:243 src/msgunfmt.c:252
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s a explicitnÃ© menÃ¡ sÃºborov sa navzÃ¡jom vyluÄujÃº"
 
-#: src/msgunfmt.c:325
+#: src/msgunfmt.c:334
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "PouÅ¾itie: %s [VOÄ½BA] [SÃšBOR]...\n"
 
-#: src/msgunfmt.c:329
+#: src/msgunfmt.c:338
+#, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "KonvertovaÅ¥ binÃ¡rny katalÃ³g sprÃ¡v na .po sÃºbor v Uniforum Å¡tÃ½le.\n"
 
-#: src/msgunfmt.c:338
+#: src/msgunfmt.c:347
+#, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 "  -j, --java                  mÃ³d Java: vstup je trieda Java ResourceBundle\n"
 
-#: src/msgunfmt.c:340
+#: src/msgunfmt.c:349
+#, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   mÃ³d Tcl: vstup je sÃºbor .msg tcl/msgcat\n"
 
-#: src/msgunfmt.c:345
+#: src/msgunfmt.c:354
+#, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  SÃšBOR ...                   vstupnÃ© .mo sÃºbory\n"
 
-#: src/msgunfmt.c:350
+#: src/msgunfmt.c:359
+#, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Umiestnenie vstupnÃ©ho sÃºboru v mÃ³de Java:\n"
 
-#: src/msgunfmt.c:356
+#: src/msgunfmt.c:365
+#, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
 "name,\n"
@@ -2245,30 +2520,34 @@ msgstr ""
 "NÃ¡zov triedy je zÃskanÃ½ pridanÃm nÃ¡zvu nÃ¡rodnÃ©ho prostredia k nÃ¡zvu zdroja,\n"
 "oddelenÃ½ch znakom \"_\". Trieda je umiestnenÃ¡ pomocou CLASSPATH.\n"
 
-#: src/msgunfmt.c:361
+#: src/msgunfmt.c:370
+#, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Umiestnenie vstupnÃ©ho sÃºboru v mÃ³de Tcl:\n"
 
-#: src/msgunfmt.c:367
+#: src/msgunfmt.c:376
+#, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 "VoÄ¾by -l a -d sÃº povinnÃ©. SÃºbor .msg je umiestnenÃ½ v zadanom adresÃ¡ri.\n"
 
-#: src/msgunfmt.c:387
+#: src/msgunfmt.c:396
+#, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 "  -i, --indent                zapÃsaÅ¥ pomocou odsadenÃ©ho vÃ½stupnÃ©ho Å¡tÃ½lu\n"
 
-#: src/msgunfmt.c:389
+#: src/msgunfmt.c:398
+#, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 "      --strict                zapÃsaÅ¥ sÃºbor s presne dorÅ¾anÃ½m Å¡tÃ½lom "
 "uniforum\n"
 
-#: src/msguniq.c:295
-#, no-wrap
+#: src/msguniq.c:309
+#, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
 "Finds duplicate translations of the same message ID.  Such duplicates are\n"
@@ -2288,11 +2567,13 @@ msgstr ""
 "z prvÃ©ho prekladu. PozÃcie v sÃºboroch budÃº zlÃºÄenÃ©. Pri pouÅ¾itÃ voÄ¾by\n"
 "--unique budÃº duplikÃ¡ty potlaÄenÃ©.\n"
 
-#: src/msguniq.c:328
+#: src/msguniq.c:342
+#, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              zobraziÅ¥ len duplikÃ¡ty\n"
 
-#: src/msguniq.c:330
+#: src/msguniq.c:344
+#, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
@@ -2337,6 +2618,7 @@ msgstr ""
 "a iconv() nepodporuje \"%s\".\n"
 
 #: src/po-charset.c:304 src/po-charset.c:330
+#, c-format
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2359,6 +2641,7 @@ msgstr ""
 "TÃ¡to verzia bola preloÅ¾enÃ¡ bez iconv().\n"
 
 #: src/po-charset.c:349
+#, c-format
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2367,73 +2650,88 @@ msgstr ""
 "Konverzia hlÃ¡senÃ do znakovej sady pouÅ¾ÃvateÄ¾a nebude fungovaÅ¥.\n"
 
 #: src/po-gram-gen.y:94
+#, c-format
 msgid "inconsistent use of #~"
 msgstr "nekonzistentnÃ© pouÅ¾itie #~"
 
 #: src/po-gram-gen.y:198
+#, c-format
 msgid "missing `msgstr[]' section"
 msgstr "chÃ½ba sekcia `msgstr[]'"
 
 #: src/po-gram-gen.y:206
+#, c-format
 msgid "missing `msgid_plural' section"
 msgstr "chÃ½ba sekcia `msgid_plural'"
 
 #: src/po-gram-gen.y:213
+#, c-format
 msgid "missing `msgstr' section"
 msgstr "chÃ½ba sekcia `msgstr'"
 
 #: src/po-gram-gen.y:258
+#, c-format
 msgid "first plural form has nonzero index"
 msgstr "prvÃ© mnoÅ¾nÃ© ÄÃslo mÃ¡ nenulovÃ½ index"
 
 #: src/po-gram-gen.y:260
+#, c-format
 msgid "plural form has wrong index"
 msgstr "mnoÅ¾nÃ© ÄÃslo mÃ¡ nesprÃ¡vny index"
 
 #: src/po-lex.h:92 src/po-lex.h:107 src/po-lex.h:127 src/po-lex.h:142
 #: src/po-lex.c:103 src/po-lex.c:132
+#, c-format
 msgid "too many errors, aborting"
 msgstr "vyskytlo sa prÃliÅ¡ veÄ¾a chÃ½b, ukonÄuje sa program"
 
-#: src/po-lex.c:456 src/write-po.c:541 src/write-po.c:647
+#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
+#, c-format
 msgid "invalid multibyte sequence"
 msgstr "neplatnÃ¡ viacznakovÃ¡ sekvencia"
 
-#: src/po-lex.c:482
+#: src/po-lex.c:486
+#, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "nekompletnÃ¡ viacznakovÃ¡ sekvencia na konci sÃºboru"
 
-#: src/po-lex.c:492
+#: src/po-lex.c:496
+#, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "nekompletnÃ¡ viacznakovÃ¡ sekvencia na konci riadku"
 
-#: src/po-lex.c:500
+#: src/po-lex.c:504
+#, c-format
 msgid "iconv failure"
 msgstr "iconv zlyhal"
 
-#: src/po-lex.c:645 src/read-mo.c:79 src/read-properties.c:80 src/x-awk.c:134
-#: src/x-c.c:203 src/x-elisp.c:142 src/x-glade.c:403 src/x-librep.c:144
-#: src/x-lisp.c:204 src/x-perl.c:168 src/x-perl.c:242 src/x-perl.c:335
-#: src/x-php.c:144 src/x-python.c:153 src/x-rst.c:225 src/x-smalltalk.c:88
-#: src/x-tcl.c:145 src/x-ycp.c:76
+#: src/po-lex.c:666 src/read-mo.c:79 src/read-properties.c:80
+#: src/read-stringtable.c:96 src/x-awk.c:143 src/x-c.c:352 src/x-elisp.c:149
+#: src/x-glade.c:406 src/x-java.c:174 src/x-librep.c:151 src/x-lisp.c:214
+#: src/x-perl.c:230 src/x-perl.c:304 src/x-perl.c:397 src/x-php.c:161
+#: src/x-python.c:167 src/x-rst.c:232 src/x-sh.c:156 src/x-smalltalk.c:88
+#: src/x-tcl.c:150 src/x-ycp.c:89
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "chyba pri ÄÃtanÃ sÃºboru \"%s\""
 
-#: src/po-lex.c:709
+#: src/po-lex.c:737
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "neznÃ¡me kÄ¾ÃºÄovÃ© slovo \"%s\""
 
-#: src/po-lex.c:819
+#: src/po-lex.c:847
+#, c-format
 msgid "invalid control sequence"
 msgstr "neplatnÃ¡ riadiaca sekvencia"
 
-#: src/po-lex.c:927
+#: src/po-lex.c:955
+#, c-format
 msgid "end-of-file within string"
 msgstr "koniec sÃºboru uprostred reÅ¥azca"
 
-#: src/po-lex.c:933
+#: src/po-lex.c:961
+#, c-format
 msgid "end-of-line within string"
 msgstr "koniec riadku uprostred reÅ¥azca"
 
@@ -2457,34 +2755,63 @@ msgstr "sÃºbor \"%s\" nie je vo formÃ¡te GNU .mo"
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "sÃºbor \"%s\" obsahuje reÅ¥azec, ktorÃ½ nie je ukonÄenÃ½ nulou, na %s"
 
-#: src/read-po.c:318 src/xgettext.c:768
+#: src/read-po.c:318 src/xgettext.c:869
+#, c-format
 msgid "this file may not contain domain directives"
 msgstr "tento sÃºbor nesmie obsahovaÅ¥ direktÃvy pre domÃ©nu"
 
 #: src/read-po.c:357
+#, c-format
 msgid "duplicate message definition"
 msgstr "duplicitnÃ¡ definÃcia sprÃ¡vy"
 
 #: src/read-po.c:358
+#, c-format
 msgid "...this is the location of the first definition"
 msgstr "...toto je miesto prvÃ©ho definovania"
 
 #: src/read-properties.c:215
-#, fuzzy, c-format
-msgid "%s:%d: warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "%s:%d: upozornenie: neplatnÃ½ znam Unicode"
+#, c-format
+msgid "%s:%lu: warning: invalid \\uxxxx syntax for Unicode character"
+msgstr "%s:%lu: upozornenie: neplatnÃ¡ syntax \\uxxxx pre znak Unicode"
+
+#: src/read-stringtable.c:804
+#, c-format
+msgid "%s:%lu: warning: unterminated string"
+msgstr "%s:%lu: upozornenie: neukonÄenÃ½ reÅ¥azec"
+
+#: src/read-stringtable.c:815
+#, c-format
+msgid "%s:%lu: warning: syntax error"
+msgstr "%s:%lu: upozornenie: chyba syntaxe"
+
+#: src/read-stringtable.c:878 src/read-stringtable.c:900
+#, c-format
+msgid "%s:%lu: warning: unterminated key/value pair"
+msgstr "%s:%lu: upozornenie: neukonÄenÃ½ pÃ¡r kÄ¾ÃºÄ/hodnota"
 
-#: src/urlget.c:145
+#: src/read-stringtable.c:946
+#, c-format
+msgid "%s:%lu: warning: syntax error, expected ';' after string"
+msgstr "%s:%lu: upozornenie: chyba syntaxe, oÄakÃ¡vanÃ© ';' po reÅ¥azci"
+
+#: src/read-stringtable.c:956
+#, c-format
+msgid "%s:%lu: warning: syntax error, expected '=' or ';' after string"
+msgstr "%s:%lu: upozornenie: chyba syntaxe, oÄakÃ¡vanÃ© '=' alebo ';' po reÅ¥azci"
+
+#: src/urlget.c:149
+#, c-format
 msgid "expected two arguments"
 msgstr "oÄakÃ¡vanÃ© dva parametre"
 
-#: src/urlget.c:162
+#: src/urlget.c:166
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "PouÅ¾itie: %s [VOÄ½BA] URL SÃšBOR\n"
 
-#: src/urlget.c:167
-#, no-wrap
+#: src/urlget.c:171
+#, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
@@ -2492,52 +2819,55 @@ msgstr ""
 "Stiahne a zobrazÃ obsah z URL. Ak URL nie je dostupnÃ©, pouÅ¾ije sa SÃšBOR\n"
 "z lokÃ¡lneho disku.\n"
 
-#: src/urlget.c:214
+#: src/urlget.c:218
+#, c-format
 msgid "error writing stdout"
 msgstr "chyba pri zÃ¡pise na Å¡tandardnÃ½ vÃ½stup"
 
-#: src/write-java.c:1055
+#: src/write-java.c:977
+#, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "nemÃ´Å¾em nÃ¡jsÅ¥ doÄasnÃ½ adresÃ¡r, skÃºste nastaviÅ¥ $TMPDIR"
 
-#: src/write-java.c:1065
+#: src/write-java.c:987
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "nemÃ´Å¾em vytvoriÅ¥ doÄasnÃ½ adresÃ¡r so Å¡ablÃ³nou \"%s\""
 
-#: src/write-java.c:1078
+#: src/write-java.c:1000
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "nie je platnÃ½m nÃ¡zvom triedy Java: %s"
 
-#: src/write-java.c:1135 src/write-java.c:1148
+#: src/write-java.c:1057 src/write-java.c:1070
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "zlyhalo vytvorenie \"%s\""
 
-#: src/write-java.c:1156 src/write-mo.c:705 src/write-po.c:1095
-#: src/write-tcl.c:201
+#: src/write-java.c:1078 src/write-mo.c:707 src/write-po.c:1120
+#: src/write-qt.c:530 src/write-tcl.c:202
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "chyba poÄas zÃ¡pisu do sÃºboru \"%s\""
 
-#: src/write-java.c:1170
+#: src/write-java.c:1092
+#, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "kompilÃ¡cia triedy Java zlyhalo, prosÃm skÃºste --verbose alebo nastavte $JAVAC"
 
-#: src/write-mo.c:693 src/write-tcl.c:192
+#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "chyba pri otvÃ¡ranÃ sÃºboru  \"%s\" na zÃ¡pis"
 
-#: src/write-po.c:592
+#: src/write-po.c:605
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "internacionalizovanÃ© sprÃ¡vy nesmÃº obsahovaÅ¥ riadiacu sekvenciu `\\%c'"
 
-#: src/write-po.c:838 src/write-po.c:904
+#: src/write-po.c:851 src/write-po.c:917
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2550,7 +2880,8 @@ msgstr ""
 "ako vy. ZvÃ¡Å¾te namiesto to pouÅ¾itie msgid len s ASCII znakmi.\n"
 "%s\n"
 
-#: src/write-po.c:1042
+#: src/write-po.c:1057
+#, c-format
 msgid ""
 "Cannot output multiple translation domains into a single file with Java ."
 "properties syntax. Try using PO file syntax instead."
@@ -2558,7 +2889,17 @@ msgstr ""
 "Nie je moÅ¾nÃ© zapÃsaÅ¥ viacnÃ¡sobnÃ© prekladovÃ© domÃ©ny do jednÃ©ho sÃºboru so "
 "syntaxou Java .properties. SkÃºste pouÅ¾iÅ¥ namiesto toho syntax PO."
 
-#: src/write-po.c:1066
+#: src/write-po.c:1059
+#, c-format
+msgid ""
+"Cannot output multiple translation domains into a single file with NeXTstep/"
+"GNUstep .strings syntax."
+msgstr ""
+"Nie je moÅ¾nÃ© zapÃsaÅ¥ viacnÃ¡sobnÃ© prekladovÃ© domÃ©ny do jednÃ©ho sÃºboru so "
+"syntaxou NeXTstep/GNUstep .strings."
+
+#: src/write-po.c:1085
+#, c-format
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
@@ -2568,17 +2909,44 @@ msgstr ""
 "nepodporuje. SkÃºste pregenerovaÅ¥ Java triedu pomocou \"msgfmt --java\", "
 "namiesto sÃºboru vlastnostÃ."
 
-#: src/write-po.c:1078
+#: src/write-po.c:1089
+#, c-format
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"katalÃ³g sprÃ¡v mÃ¡ preklady s mnoÅ¾nÃ½mi ÄÃslami, ale vÃ½stupnÃ½ formÃ¡t ich "
+"nepodporuje."
+
+#: src/write-po.c:1101
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "nie je moÅ¾nÃ© vytvoriÅ¥ vÃ½stupnÃ½ sÃºbor \"%s\""
 
-#: src/write-po.c:1085
+#: src/write-po.c:1108
 #, no-c-format
 msgid "standard output"
 msgstr "Å¡tandardnÃ½ vÃ½stup"
 
-#: src/write-tcl.c:156
+#: src/write-qt.c:475
+msgid ""
+"message catalog has plural form translations\n"
+"but the Qt message catalog format doesn't support plural handling\n"
+msgstr ""
+"katalÃ³g sprÃ¡v mÃ¡ preklady s mnoÅ¾nÃ½mi ÄÃslami,\n"
+"ale formÃ¡t katalÃ³gu sprÃ¡v Qt nepodporuje mnoÅ¾nÃ© ÄÃsla\n"
+
+#: src/write-qt.c:499
+msgid ""
+"message catalog has msgid strings containing characters outside ISO-8859-1\n"
+"but the Qt message catalog format supports Unicode only in the translated\n"
+"strings, not in the untranslated strings\n"
+msgstr ""
+"katalÃ³g sprÃ¡v mÃ¡ reÅ¥azce msgid obsahujÃºce znaky mimo ISO-8859-1 ale\n"
+"formÃ¡t katalÃ³gu sprÃ¡v Qt podporuje Unicode len v preloÅ¾enÃ½ch reÅ¥azcoch\n"
+"a nie v nepreloÅ¾enÃ½ch reÅ¥azcoch\n"
+
+#: src/write-tcl.c:157
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -2586,32 +2954,32 @@ msgstr ""
 "katalÃ³g sprÃ¡v mÃ¡ preklady s mnoÅ¾nÃ½mi ÄÃslami,\n"
 "ale formÃ¡t katalÃ³gu sprÃ¡v Tcl nepodporuje mnoÅ¾nÃ© ÄÃsla\n"
 
-#: src/x-awk.c:329 src/x-python.c:373
+#: src/x-awk.c:343 src/x-python.c:388
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: upozornenie: neukonÄenÃ½ reÅ¥azec"
 
-#: src/x-awk.c:573
+#: src/x-awk.c:594
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: upozornenie: neukonÄenÃ½ regulÃ¡rny vÃ½raz"
 
-#: src/x-c.c:879
+#: src/x-c.c:1079 src/x-java.c:901
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: upozornenie: neukonÄenÃ¡ znakovÃ¡ konÅ¡tanta"
 
-#: src/x-c.c:903
+#: src/x-c.c:1103
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: upozornenie: neukonÄenÃ½ znakovÃ½ reÅ¥azec"
 
-#: src/x-glade.c:410 src/x-glade.c:417
+#: src/x-glade.c:413 src/x-glade.c:420
 #, c-format
 msgid "%s:%d:%d: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:443
+#: src/x-glade.c:447
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -2620,86 +2988,111 @@ msgstr ""
 "Jazyk \"glade\" je nepodporovanÃ½. %s spolieha na expat.\n"
 "TÃ¡to verzia bola preloÅ¾enÃ¡ bez expat.\n"
 
-#: src/x-perl.c:248
+#: src/x-java.c:1387
+#, c-format
+msgid "%s:%d: warning: ')' found where '}' was expected"
+msgstr "%s:%d: upozornenie: nÃ¡jdenÃ© ')' tam, kde bolo oÄakÃ¡vanÃ© '}'"
+
+#: src/x-java.c:1411
+#, c-format
+msgid "%s:%d: warning: '}' found where ')' was expected"
+msgstr "%s:%d: upozornenie: nÃ¡jdenÃ© '}' tam, kde bolo oÄakÃ¡vanÃ© ')'"
+
+#: src/x-perl.c:310
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr ""
+msgstr "%s:%d: nepodarilo sa nÃ¡jsÅ¥ ukonÄenie reÅ¥azca \"%s\" pred koncom sÃºboru"
 
-#: src/x-perl.c:946
+#: src/x-perl.c:1036
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr ""
+msgstr "%s:%d: chÃ½bajÃºca pravÃ¡ zÃ¡tvorka v \\x{Å ESTNÃSTKOVÃ‰ÄŒÃSLO}"
 
-#: src/x-perl.c:1053
+#: src/x-perl.c:1156
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr ""
+msgstr "%s:%d: neplatnÃ¡ interpolÃ¡cia (\"\\l\") 8-bitovÃ©ho znaku \"%c\""
 
-#: src/x-perl.c:1069
+#: src/x-perl.c:1176
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr ""
+msgstr "%s:%d: neplatnÃ¡ interpolÃ¡cia (\"\\u\") 8-bitovÃ©ho znaku \"%c\""
 
-#: src/x-perl.c:1091
-#, fuzzy, c-format
+#: src/x-perl.c:1210
+#, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d: neplatnÃ¡ definÃcia reÅ¥azca"
+msgstr "%s:%d: neplatnÃ¡ interpolÃ¡cia premennej na \"%c\""
 
-#: src/x-perl.c:1104
+#: src/x-perl.c:1223
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr ""
+msgstr "%s:%d: neplatnÃ¡ interpolÃ¡cia (\"\\L\") 8-bitovÃ©ho znaku \"%c\""
 
-#: src/x-perl.c:1121
+#: src/x-perl.c:1240
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr ""
+msgstr "%s:%d: neplatnÃ¡ interpolÃ¡cia (\"\\U\") 8-bitovÃ©ho znaku \"%c\""
 
-#: src/x-perl.c:2763
+#: src/x-perl.c:2997
 #, c-format
 msgid "%s:%d: fatal: plural message seen before singular message\n"
 msgstr ""
+"%s:%d: zÃ¡vaÅ¾nÃ©: sprÃ¡va v mnoÅ¾nom ÄÃsle je uvedenÃ¡ pred sprÃ¡vou v jednotnom "
+"ÄÃsle\n"
 
-#: src/x-python.c:573
+#: src/x-python.c:588
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: upozornenie: neplatnÃ½ znam Unicode"
+msgstr "%s:%d: upozornenie: neplatnÃ½ znak Unicode"
 
-#: src/x-rst.c:106
+#: src/x-rst.c:107
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: neplatnÃ¡ definÃcia reÅ¥azca"
 
-#: src/x-rst.c:166
+#: src/x-rst.c:171
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: chÃ½bajÃºce ÄÃslo za #"
 
-#: src/x-rst.c:201
+#: src/x-rst.c:206
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: neplatnÃ½ vÃ½raz reÅ¥azca"
 
-#: src/xgettext.c:453
+#: src/x-sh.c:1012
+#, c-format
+msgid ""
+"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
+"use eval_gettext instead"
+msgstr ""
+"%s:%lu: upozornenie: syntax $\"...\" je neodporÃºÄanÃ¡ z bezpeÄnostnÃ½ch "
+"dÃ´vodov; pouÅ¾ite namiesto toho eval_gettext"
+
+#: src/xgettext.c:515
+#, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing nesmie byÅ¥ pouÅ¾itÃ© ak je vÃ½stup posielanÃ½ na Å¡tandardnÃ½ "
 "vÃ½stup"
 
-#: src/xgettext.c:458
+#: src/xgettext.c:520
+#, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext nemÃ´Å¾e pracovaÅ¥ bez kÄ¾ÃºÄovÃ½ch slov, ktorÃ© mÃ¡ hÄ¾adaÅ¥"
 
-#: src/xgettext.c:585
+#: src/xgettext.c:661
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "upozornenie: sÃºbor `%s' s prÃponou `%s' je neznÃ¡my; skÃºsim C"
 
-#: src/xgettext.c:634
+#: src/xgettext.c:712
+#, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "ExtrahovaÅ¥ preloÅ¾iteÄ¾nÃ© reÅ¥azce zo zadanÃ½ch vstupnÃ½ch sÃºborov.\n"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:735
+#, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
@@ -2707,48 +3100,55 @@ msgstr ""
 "  -d, --default-domain=NÃZOV  pouÅ¾iÅ¥ NÃZOV.po pre vÃ½stup (namiesto messages."
 "po)\n"
 
-#: src/xgettext.c:659
+#: src/xgettext.c:737
+#, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=SÃšBOR          zapÃsaÅ¥ vÃ½stup do zadanÃ©ho sÃºboru\n"
 
-#: src/xgettext.c:661
+#: src/xgettext.c:739
+#, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=ADRESÃR    vÃ½stupnÃ© sÃºbory budÃº umiestnenÃ© v adresÃ¡ri "
 "ADRESÃR\n"
 
-#: src/xgettext.c:666
+#: src/xgettext.c:744
+#, c-format
 msgid "Choice of input file language:\n"
 msgstr "VoÄ¾ba jazyka vstupnÃ©ho sÃºboru:\n"
 
-#: src/xgettext.c:668
-#, fuzzy
+#: src/xgettext.c:746
+#, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
 "Lisp,\n"
 "                                EmacsLisp, librep, Smalltalk, Java,\n"
 "                                JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
-"                                GCC-source, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 "  -L, --language=NÃZOV        pouÅ¾iÅ¥ zadanÃ½ jazyk\n"
-"                                (C, C++, ObjectiveC, PO, Python, Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
 "                                EmacsLisp, librep, Smalltalk, Java,\n"
-"                                JavaProperties, awk, YCP, Tcl, PHP, RST, "
-"Glade)\n"
+"                                JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:674
+#: src/xgettext.c:752
+#, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr "  -C, --c++                   skratka pre 00language=C++\n"
+msgstr "  -C, --c++                   skratka pre --language=C++\n"
 
-#: src/xgettext.c:676
+#: src/xgettext.c:754
+#, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Å tandardne je jazyk odhadnutÃ½ podÄ¾a prÃpony vstupnÃ©ho sÃºboru\n"
 
-#: src/xgettext.c:681
+#: src/xgettext.c:759
+#, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
@@ -2756,21 +3156,25 @@ msgstr ""
 "      --from-code=NÃZOV       kÃ³dovanie vstupnÃ½ch sÃºborov\n"
 "                                (s vÃ½nimkou pre Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:684
+#: src/xgettext.c:762
+#, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Å tandardne sa predpokladÃ¡, Å¾e vstupnÃ© sÃºbory sÃº v kÃ³dovanÃ ASCII.\n"
 
-#: src/xgettext.c:689
+#: src/xgettext.c:767
+#, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         spojiÅ¥ sprÃ¡vy s existujÃºcim sÃºborom\n"
 
-#: src/xgettext.c:691
+#: src/xgettext.c:769
+#, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=SÃšBOR.po  poloÅ¾ky zo sÃºboru SÃšBOR.po nie sÃº "
 "extrahovanÃ©\n"
 
-#: src/xgettext.c:693
+#: src/xgettext.c:771
+#, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
@@ -2780,15 +3184,29 @@ msgstr ""
 "riadky)\n"
 "                              do vÃ½stupnÃ©ho sÃºboru\n"
 
-#: src/xgettext.c:697
-msgid "Language=C/C++ specific options:\n"
-msgstr "Å pecifickÃ© voÄ¾by pre Language=C/C++:\n"
+#: src/xgettext.c:775
+#, c-format
+msgid "Language specific options:\n"
+msgstr "Å pecifickÃ© voÄ¾by jazyk:\n"
 
-#: src/xgettext.c:699
+#: src/xgettext.c:777
+#, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrahovaÅ¥ vÅ¡etky reÅ¥azce\n"
 
-#: src/xgettext.c:701
+#: src/xgettext.c:779 src/xgettext.c:786
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+"                                Tcl, Perl, PHP, GCC-source, Glade)\n"
+msgstr ""
+"                                (len jazyky C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+"                                Tcl, Perl, PHP, GCC-source, Glade)\n"
+
+#: src/xgettext.c:783
+#, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
@@ -2797,11 +3215,52 @@ msgstr ""
 "                              (bez SLOVO znamenÃ¡: nepouÅ¾iÅ¥ predvolenÃ©\n"
 "                              kÄ¾ÃºÄovÃ© slovÃ¡)\n"
 
-#: src/xgettext.c:704
+#: src/xgettext.c:790
+#, c-format
+msgid ""
+"      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
+"argument\n"
+"                              number ARG of keyword WORD\n"
+msgstr ""
+"      --flag=SLOVO:PAR:PRÃZN  prÃdavnÃ½ prÃznak pre reÅ¥azce v parametri "
+"ÄÃslo\n"
+"                              ARG kÄ¾ÃºÄovÃ©ho slova SLOVO\n"
+
+#: src/xgettext.c:793
+#, c-format
+msgid ""
+"                                (only languages C, C++, ObjectiveC, Shell,\n"
+"                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+"                                YCP, Tcl, Perl, PHP, GCC-source)\n"
+msgstr ""
+"                                (len jazyky C, C++, ObjectiveC, Shell, "
+"Python,\n"
+"                                Lisp, EmacsLisp, librep, Java, awk, YCP, "
+"Tcl,\n"
+"                                Perl, PHP, GCC-source)\n"
+
+#: src/xgettext.c:797
+#, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             poznaÅ¥ ANSI C trojznaky na vstupe\n"
 
-#: src/xgettext.c:706
+#: src/xgettext.c:799
+#, c-format
+msgid "                                (only languages C, C++, ObjectiveC)\n"
+msgstr "                                (len jazyky C, C++, ObjectiveC)\n"
+
+#: src/xgettext.c:801
+#, c-format
+msgid "      --qt                    recognize Qt format strings\n"
+msgstr "      --qt                    rozoznaÅ¥ formÃ¡t reÅ¥azcov Qt\n"
+
+#: src/xgettext.c:803
+#, c-format
+msgid "                                (only language C++)\n"
+msgstr "                                (len jazyk C++)\n"
+
+#: src/xgettext.c:805
+#, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
@@ -2809,24 +3268,28 @@ msgstr ""
 "formÃ¡tovacÃch\n"
 "                              reÅ¥azcov\n"
 
-#: src/xgettext.c:725
+#: src/xgettext.c:824
+#, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     zapÃsaÅ¥ Java sÃºbor .properties\n"
 
-#: src/xgettext.c:738
+#: src/xgettext.c:839
+#, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=REÅ¤AZEC nastaviÅ¥ drÅ¾iteÄ¾a autorskÃ½ch prÃ¡v vo "
 "vÃ½stupe\n"
 
-#: src/xgettext.c:740
+#: src/xgettext.c:841
+#, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          vynechaÅ¥ informÃ¡ciu o autorskÃ½ch prÃ¡vach FSF\n"
 "                              pre cudzieho pouÅ¾ÃvateÄ¾a\n"
 
-#: src/xgettext.c:742
+#: src/xgettext.c:843
+#, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
@@ -2834,7 +3297,8 @@ msgstr ""
 "chÃ½b\n"
 "                                   v msgid\n"
 
-#: src/xgettext.c:744
+#: src/xgettext.c:845
+#, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
@@ -2842,7 +3306,8 @@ msgstr ""
 "  -m, --msgstr-prefix[=REÅ¤AZEC] pouÅ¾iÅ¥ REÅ¤AZEC alebo \"\" ako predponu pre\n"
 "                                poloÅ¾ky msgstr\n"
 
-#: src/xgettext.c:746
+#: src/xgettext.c:847
+#, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
@@ -2850,25 +3315,51 @@ msgstr ""
 "  -M, --msgstr-suffix[=REÅ¤AZEC] pouÅ¾iÅ¥ REÅ¤AZEC alebo \"\" ako prÃponu pre\n"
 "                                poloÅ¾ky msgstr\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:1434
+#, c-format
+msgid ""
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
+"s"
+msgstr ""
+"Parameter pre --flag nemÃ¡ tvar <kÄ¾ÃºÄovÃ©_slovo>:<Ä_param>:[pass-]<prÃznak>: %s"
+
+#: src/xgettext.c:1480
 msgid "standard input"
 msgstr "Å¡tandardnÃ½ vstup"
 
-#: src/xgettext.c:1050
+#: src/xgettext.c:1592
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code."
+"Please specify the source encoding through --from-code.\n"
 msgstr ""
 "Nie ASCII reÅ¥azec na %s%s.\n"
-"PresÃm zadajte kÃ³dovanie zdroja pomocou --from-code."
+"PresÃm zadajte kÃ³dovanie zdroja pomocou --from-code.\n"
 
-#: src/xgettext.c:1104
+#: src/xgettext.c:1651 src/xgettext.c:1706
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: upozornenie: "
 
-#: src/xgettext.c:1106
+#: src/xgettext.c:1653
+#, c-format
+msgid ""
+"Although being used in a format string position, the %s is not a valid %s "
+"format string. Reason: %s\n"
+msgstr ""
+"Aj keÄ je pouÅ¾itÃ© v pozÃcii formÃ¡tovacieho reÅ¥azca, %s nie je platnÃ½ "
+"formÃ¡tovacÃ reÅ¥azec %s. DÃ´vod: %s\n"
+
+#: src/xgettext.c:1653
+#, c-format
+msgid ""
+"Although declared as such, the %s is not a valid %s format string. Reason: %"
+"s\n"
+msgstr ""
+"Aj keÄ je to tak deklarovanÃ©, %s nie je platnÃ½ formÃ¡tovacÃ reÅ¥azec %s. "
+"DÃ´vod: %s\n"
+
+#: src/xgettext.c:1708
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -2878,7 +3369,7 @@ msgstr ""
 "gettext(\"\") vrÃ¡ti hlaviÄku s meta informÃ¡ciami\n"
 "a nie prÃ¡zdny reÅ¥azec.\n"
 
-#: src/xgettext.c:1339
+#: src/xgettext.c:1990
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -2891,7 +3382,47 @@ msgstr ""
 "MSGID_BUGS_ADDRESS; inak prosÃm zadajte voÄ¾bu prÃkazovÃ©ho\n"
 "riadku --msgid-bugs-address.\n"
 
-#: src/xgettext.c:1515
+#: src/xgettext.c:2179
 #, c-format
 msgid "language `%s' unknown"
 msgstr "jazyk `%s' je neznÃ¡my"
+
+#: src/user-email.sh.in:340
+msgid "Which is your email address?"
+msgstr "AkÃ¡ je vaÅ¡a adresa elektronickej poÅ¡ty?"
+
+#: src/user-email.sh.in:342
+msgid "Please choose the number, or enter your email address."
+msgstr "ProsÃm zvoÄ¾te ÄÃslo, alebo zadajte vaÅ¡u adresu elektronickej poÅ¡ty."
+
+#: src/user-email.sh.in:360 src/user-email.sh.in:384 src/user-email.sh.in:403
+msgid "Invalid email address: invalid character."
+msgstr "NeplatnÃ¡ adresa elektronickej poÅ¡ty: neplatnÃ½ znak."
+
+#: src/user-email.sh.in:362 src/user-email.sh.in:386 src/user-email.sh.in:405
+msgid "Invalid email address: need a fully qualified host name or domain name."
+msgstr ""
+"NeplatnÃ¡ adresa elektronickej poÅ¡ty: je potrebnÃ© zadaÅ¥ plnÃ© meno hostiteÄ¾a "
+"alebo domÃ©ny."
+
+#: src/user-email.sh.in:363 src/user-email.sh.in:387 src/user-email.sh.in:406
+msgid "Invalid email address: missing @"
+msgstr "NeplatnÃ¡ adresa elektronickej poÅ¡ty: chÃ½bajÃºci @"
+
+#: src/user-email.sh.in:372
+msgid "Is the following your email address?"
+msgstr "Je toto vaÅ¡a adresa elektronickej poÅ¡ty?"
+
+#: src/user-email.sh.in:374
+msgid "Please confirm by pressing Return, or enter your email address."
+msgstr ""
+"ProsÃm potvrÄte stlaÄenÃm klÃ¡vesy Enter, alebo zadajte vaÅ¡u adresu "
+"elektronickej poÅ¡ty."
+
+#: src/user-email.sh.in:395
+msgid "Couldn't find out about your email address."
+msgstr "Nepodarilo sa nÃ¡jsÅ¥ vaÅ¡u adresu elektronickej poÅ¡ty."
+
+#: src/user-email.sh.in:397
+msgid "Please enter your email address."
+msgstr "ProsÃm zadajte vaÅ¡u adresu elektronickej poÅ¡ty."
author	Bruno Haible <bruno@clisp.org>	2003-11-30 14:34:36 +0000
committer	Bruno Haible <bruno@clisp.org>	2009-06-23 12:11:22 +0200
commit	e4f81cb78ce64afd8eb83a941fda1e647d00ca34 (patch)
tree	e809052c7ece30b3aab8f1037abdc6998fadc225 /gettext-tools/po
parent	400064ea39716c38f4cd7df99fce01653eeb86fa (diff)
download	external_gettext-e4f81cb78ce64afd8eb83a941fda1e647d00ca34.zip external_gettext-e4f81cb78ce64afd8eb83a941fda1e647d00ca34.tar.gz external_gettext-e4f81cb78ce64afd8eb83a941fda1e647d00ca34.tar.bz2