Merge branch 'master' into buildsystems

Conflicts:
	debian/changelog

1 files changed, 80 insertions, 82 deletions

diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index 7285bf90..93cba841 100644
--- a/man/po4a/po/es.po
+++ b/man/po4a/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-05-12 14:52-0300\n"
+"POT-Creation-Date: 2009-06-10 17:14-0300\n"
 "PO-Revision-Date: 2005-09-18 00:11+0200\n"
 "Last-Translator: Rubén Porras Campo <debian-l10n-spanish@lists.debian.org>\n"
 "Language-Team: SPANISH <debian-l10n-spanish@lists.debian.org>\n"
@@ -502,7 +502,7 @@ msgstr "No modificar los scripts postinst/postrm/etc."
 
 # type: =item
 #. type: =item
-#: debhelper.pod:165 dh_compress:42 dh_makeshlibs:66 dh_md5sums:37
+#: debhelper.pod:165 dh_compress:43 dh_makeshlibs:66 dh_md5sums:37
 #: dh_shlibdeps:36 dh_strip:39
 msgid "B<-X>I<item>, B<--exclude=>I<item>"
 msgstr "B<-X>I<elemento>, B<--exclude=>I<elemento>"
@@ -519,7 +519,7 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: debhelper.pod:170 dh_compress:50 dh_installdirs:32 dh_installdocs:53
+#: debhelper.pod:170 dh_compress:51 dh_installdirs:32 dh_installdocs:53
 #: dh_installexamples:33 dh_installinfo:41 dh_installman:62 dh_link:52
 msgid "B<-A>, B<--all>"
 msgstr "B<-A>, B<--all>"
@@ -539,8 +539,8 @@ msgstr ""
 #: debhelper.pod:177 dh_installcatalogs:52 dh_installdocs:81
 #: dh_installemacsen:54 dh_installexamples:50 dh_installinfo:57
 #: dh_installinit:110 dh_installman:79 dh_installmime:41 dh_installmodules:60
-#: dh_installwm:53 dh_installxfonts:37 dh_movefiles:58 dh_scrollkeeper:42
-#: dh_strip:68 dh_usrlocal:49
+#: dh_installwm:53 dh_installxfonts:37 dh_movefiles:58 dh_strip:68
+#: dh_usrlocal:49
 msgid "NOTES"
 msgstr "NOTAS"
 
@@ -1333,8 +1333,8 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:517 dh_builddeb:87 dh_clean:130 dh_compress:190 dh_desktop:27
-#: dh_fixperms:122 dh_gconf:106 dh_gencontrol:79 dh_installcatalogs:109
+#: debhelper.pod:517 dh_builddeb:87 dh_clean:130 dh_compress:192 dh_desktop:27
+#: dh_fixperms:122 dh_gconf:105 dh_gencontrol:79 dh_installcatalogs:109
 #: dh_installchangelogs:147 dh_installcron:61 dh_installdebconf:118
 #: dh_installdeb:94 dh_installdirs:83 dh_installdocs:223 dh_installemacsen:111
 #: dh_installexamples:103 dh_installinfo:103 dh_installinit:224
@@ -1342,8 +1342,8 @@ msgstr ""
 #: dh_installman:251 dh_installmenu:80 dh_installmime:85 dh_installmodules:124
 #: dh_installpam:52 dh_install:272 dh_installppp:56 dh_installwm:107
 #: dh_installxfonts:86 dh_link:223 dh_listpackages:29 dh_makeshlibs:227
-#: dh_md5sums:89 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:76
-#: dh_shlibdeps:163 dh_strip:226 dh_suidregister:117 dh_testdir:44
+#: dh_md5sums:89 dh_movefiles:162 dh_perl:152 dh_python:282 dh_scrollkeeper:28
+#: dh_shlibdeps:163 dh_strip:227 dh_suidregister:117 dh_testdir:44
 #: dh_testroot:27 dh_testversion:75 dh_undocumented:28 dh_usrlocal:114
 msgid "SEE ALSO"
 msgstr "VÉASE ADEMÁS"
@@ -1374,8 +1374,8 @@ msgstr "Web de Debhelper."
 
 # type: =head1
 #. type: =head1
-#: debhelper.pod:531 dh_builddeb:93 dh_clean:136 dh_compress:196 dh_desktop:33
-#: dh_fixperms:128 dh_gconf:112 dh_gencontrol:85 dh_installcatalogs:115
+#: debhelper.pod:531 dh_builddeb:93 dh_clean:136 dh_compress:198 dh_desktop:33
+#: dh_fixperms:128 dh_gconf:111 dh_gencontrol:85 dh_installcatalogs:115
 #: dh_installchangelogs:153 dh_installcron:67 dh_installdebconf:124
 #: dh_installdeb:100 dh_installdirs:89 dh_installdocs:229
 #: dh_installemacsen:117 dh_installexamples:109 dh_installinfo:109
@@ -1384,7 +1384,7 @@ msgstr "Web de Debhelper."
 #: dh_installmime:91 dh_installmodules:130 dh_installpam:58 dh_install:278
 #: dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229
 #: dh_listpackages:35 dh_makeshlibs:233 dh_md5sums:95 dh_movefiles:168
-#: dh_perl:158 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:169 dh_strip:232
+#: dh_perl:158 dh_python:288 dh_scrollkeeper:34 dh_shlibdeps:169 dh_strip:233
 #: dh_suidregister:123 dh_testdir:50 dh_testroot:33 dh_testversion:81
 #: dh_undocumented:34 dh_usrlocal:120
 msgid "AUTHOR"
@@ -1392,7 +1392,7 @@ msgstr "AUTOR"
 
 # type: textblock
 #. type: textblock
-#: debhelper.pod:533 dh_builddeb:95 dh_clean:138 dh_compress:198
+#: debhelper.pod:533 dh_builddeb:95 dh_clean:138 dh_compress:200
 #: dh_fixperms:130 dh_gencontrol:87 dh_installchangelogs:155 dh_installcron:69
 #: dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91
 #: dh_installdocs:231 dh_installemacsen:119 dh_installexamples:111
@@ -1401,7 +1401,7 @@ msgstr "AUTOR"
 #: dh_installmime:93 dh_installmodules:132 dh_installpam:60 dh_install:280
 #: dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231
 #: dh_listpackages:37 dh_makeshlibs:235 dh_md5sums:97 dh_movefiles:170
-#: dh_shlibdeps:171 dh_strip:234 dh_suidregister:125 dh_testdir:52
+#: dh_shlibdeps:171 dh_strip:235 dh_suidregister:125 dh_testdir:52
 #: dh_testroot:35 dh_testversion:83 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -1435,7 +1435,7 @@ msgstr ""
 
 # type: =head1
 #. type: =head1
-#: dh_builddeb:21 dh_clean:33 dh_compress:38 dh_fixperms:31 dh_gconf:39
+#: dh_builddeb:21 dh_clean:33 dh_compress:39 dh_fixperms:31 dh_gconf:39
 #: dh_gencontrol:26 dh_installcatalogs:42 dh_installchangelogs:44
 #: dh_installcron:24 dh_installdebconf:50 dh_installdirs:28 dh_installdocs:49
 #: dh_installemacsen:35 dh_installexamples:29 dh_installinfo:37
@@ -1443,8 +1443,7 @@ msgstr ""
 #: dh_installman:58 dh_installmenu:34 dh_installmime:31 dh_installmodules:43
 #: dh_installpam:24 dh_install:47 dh_installppp:26 dh_installwm:32 dh_link:48
 #: dh_makeshlibs:28 dh_md5sums:28 dh_movefiles:32 dh_perl:31 dh_python:39
-#: dh_scrollkeeper:32 dh_shlibdeps:26 dh_strip:35 dh_testdir:23
-#: dh_testversion:34 dh_usrlocal:39
+#: dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_testversion:34 dh_usrlocal:39
 msgid "OPTIONS"
 msgstr "OPCIONES"
 
@@ -1501,7 +1500,7 @@ msgstr "Pasa I<parámetros> a L<dpkg-deb(1)> cuando se construye el paquete."
 
 # type: textblock
 #. type: textblock
-#: dh_builddeb:89 dh_clean:132 dh_compress:192 dh_fixperms:124 dh_gconf:108
+#: dh_builddeb:89 dh_clean:132 dh_compress:194 dh_fixperms:124 dh_gconf:107
 #: dh_gencontrol:81 dh_installcatalogs:111 dh_installchangelogs:149
 #: dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85
 #: dh_installdocs:225 dh_installemacsen:113 dh_installexamples:105
@@ -1510,23 +1509,23 @@ msgstr "Pasa I<parámetros> a L<dpkg-deb(1)> cuando se construye el paquete."
 #: dh_installmime:87 dh_installmodules:126 dh_installpam:54 dh_install:274
 #: dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225
 #: dh_listpackages:31 dh_makeshlibs:229 dh_md5sums:91 dh_movefiles:164
-#: dh_perl:154 dh_python:284 dh_strip:228 dh_suidregister:119 dh_testdir:46
+#: dh_perl:154 dh_python:284 dh_strip:229 dh_suidregister:119 dh_testdir:46
 #: dh_testroot:29 dh_testversion:77 dh_undocumented:30 dh_usrlocal:116
 msgid "L<debhelper(7)>"
 msgstr "L<debhelper(7)>"
 
 # type: textblock
 #. type: textblock
-#: dh_builddeb:91 dh_clean:134 dh_compress:194 dh_desktop:31 dh_fixperms:126
-#: dh_gconf:110 dh_gencontrol:83 dh_installchangelogs:151 dh_installcron:65
+#: dh_builddeb:91 dh_clean:134 dh_compress:196 dh_desktop:31 dh_fixperms:126
+#: dh_gconf:109 dh_gencontrol:83 dh_installchangelogs:151 dh_installcron:65
 #: dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:227
 #: dh_installemacsen:115 dh_installexamples:107 dh_installinfo:107
 #: dh_installinit:228 dh_installlogrotate:54 dh_installmanpages:201
 #: dh_installman:255 dh_installmenu:86 dh_installmime:89 dh_installmodules:128
 #: dh_installpam:56 dh_install:276 dh_installppp:60 dh_installwm:111
 #: dh_installxfonts:90 dh_link:227 dh_listpackages:33 dh_makeshlibs:231
-#: dh_md5sums:93 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:80
-#: dh_shlibdeps:167 dh_strip:230 dh_suidregister:121 dh_testdir:48
+#: dh_md5sums:93 dh_movefiles:166 dh_perl:156 dh_python:286 dh_scrollkeeper:32
+#: dh_shlibdeps:167 dh_strip:231 dh_suidregister:121 dh_testdir:48
 #: dh_testroot:31 dh_testversion:79 dh_undocumented:32 dh_usrlocal:118
 msgid "This program is a part of debhelper."
 msgstr "Este programa es parte de debhelper."
@@ -1642,7 +1641,7 @@ msgstr ""
 
 # type: =item
 #. type: =item
-#: dh_clean:52 dh_compress:55 dh_installdocs:63 dh_installexamples:38
+#: dh_clean:52 dh_compress:56 dh_installdocs:63 dh_installexamples:38
 #: dh_installinfo:50 dh_installmanpages:44 dh_movefiles:49 dh_testdir:27
 msgid "I<file ...>"
 msgstr "I<fichero ...>"
@@ -1694,9 +1693,9 @@ msgid ""
 "By default, dh_compress compresses files that debian policy mandates should "
 "be compressed, namely all files in usr/share/info, usr/share/man, usr/X11R6/"
 "man, files in usr/share/doc that are larger than 4k in size, (except the "
-"copyright file, .html and .css files, and files that appear to be already "
-"compressed based on their extensions), and all changelog files. Plus PCF "
-"fonts underneath usr/X11R6/lib/X11/fonts/ and usr/share/fonts/X11/"
+"copyright file, .html and .css files, image files, and files that appear to "
+"be already compressed based on their extensions), and all changelog files. "
+"Plus PCF fonts underneath usr/X11R6/lib/X11/fonts/ and usr/share/fonts/X11/"
 msgstr ""
 "Por omisión, dh_compress comprime los ficheros que las normas de Debian "
 "obligan a comprimir, es decir, todos los ficheros en usr/share/info, usr/"
@@ -1708,7 +1707,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_compress:31
+#: dh_compress:32
 #, fuzzy
 msgid ""
 "If a debian/package.compress file exists, the default files are not "
@@ -1727,10 +1726,11 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_compress:44
+#: dh_compress:45
+#, fuzzy
 msgid ""
 "Exclude files that contain \"item\" anywhere in their filename from being "
-"compressed. For example, -X.jpeg will exclude jpeg files from compression.  "
+"compressed. For example, -X.tiff will exclude tiff files from compression.  "
 "You may use this option multiple times to build up a list of things to "
 "exclude. You can accomplish the same thing by using a debian/compress file, "
 "but this is easier."
@@ -1742,7 +1742,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_compress:52
+#: dh_compress:53
 msgid ""
 "Compress all files specified by command line parameters in ALL packages "
 "acted on."
@@ -1752,19 +1752,19 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_compress:57
+#: dh_compress:58
 msgid "Add these files to the list of files to compress."
 msgstr "Añade estos ficheros a la lista de ficheros a comprimir."
 
 # type: =head1
 #. type: =head1
-#: dh_compress:61 dh_perl:61 dh_python:66 dh_strip:74 dh_usrlocal:55
+#: dh_compress:62 dh_perl:61 dh_python:66 dh_strip:74 dh_usrlocal:55
 msgid "CONFORMS TO"
 msgstr "CONFORME A"
 
 # type: textblock
 #. type: textblock
-#: dh_compress:63
+#: dh_compress:64
 msgid "Debian policy, version 3.0"
 msgstr "Normas de Debian, versión 3.0"
 
@@ -1789,13 +1789,13 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_desktop:29 dh_scrollkeeper:78
+#: dh_desktop:29 dh_scrollkeeper:30
 msgid "L<debhelper>"
 msgstr "L<debhelper(7)>"
 
 # type: textblock
 #. type: textblock
-#: dh_desktop:35 dh_scrollkeeper:84
+#: dh_desktop:35 dh_scrollkeeper:36
 msgid "Ross Burton <ross@burtonini.com>"
 msgstr "Ross Burton <ross@burtonini.com>"
 
@@ -1835,9 +1835,9 @@ msgid ""
 "the permissions of all man pages to mode 644. It makes all files be owned by "
 "root, and it removes group and other write permission from all files. It "
 "removes execute permissions from any libraries, headers, perl modules, or "
-"desktop files that have it set. It makes all files in bin/ directories, /usr/"
-"games/ and etc/init.d executable (since v4). Finally, it removes the setuid "
-"and setgid bits from all files in the package."
+"desktop files that have it set. It makes all files in the standard bin and "
+"sbin directories, usr/games/ and etc/init.d executable (since v4). Finally, "
+"it removes the setuid and setgid bits from all files in the package."
 msgstr ""
 "dh_fixperms hace que el modo de todos los ficheros en usr/share/doc en el "
 "directorio de construcción del paquete (excluyendo los ficheros en el "
@@ -1956,7 +1956,7 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_gconf:114
+#: dh_gconf:113
 #, fuzzy
 msgid "Ross Burton <ross@burtonini.com> Josselin Mouette <joss@debian.org>"
 msgstr "Josselin Mouette <joss@debian.org>"
@@ -2094,7 +2094,7 @@ msgstr ""
 #: dh_installcatalogs:46 dh_installdebconf:54 dh_installemacsen:39
 #: dh_installinfo:46 dh_installinit:37 dh_installmenu:38 dh_installmime:35
 #: dh_installmodules:47 dh_installwm:42 dh_makeshlibs:62 dh_python:60
-#: dh_scrollkeeper:36 dh_usrlocal:43
+#: dh_usrlocal:43
 msgid "B<-n>, B<--noscripts>"
 msgstr "B<-n>, B<--noscripts>"
 
@@ -2108,7 +2108,7 @@ msgstr "No modifica los scripts de F<postinst>/F<postrm>/F<prerm>."
 #. type: textblock
 #: dh_installcatalogs:54 dh_installdocs:87 dh_installemacsen:56
 #: dh_installinfo:59 dh_installinit:112 dh_installmime:43 dh_installmodules:62
-#: dh_installwm:55 dh_scrollkeeper:44 dh_usrlocal:51
+#: dh_installwm:55 dh_usrlocal:51
 #, fuzzy
 msgid ""
 "Note that this command is not idempotent. L<dh_prep(1)> should be called "
@@ -5419,11 +5419,10 @@ msgstr "Josselin Mouette <joss@debian.org>"
 msgid "most ideas stolen from Brendan O'Dea <bod@debian.org>"
 msgstr "muchas de las ideas tomadas de Brendan O'Dea <bod@debian.org>"
 
-# type: textblock
 #. type: textblock
 #: dh_scrollkeeper:5
-msgid "dh_scrollkeeper - generate ScrollKeeper registration scripts"
-msgstr "dh_scrollkeeper - genera programas de registro de ScrollKeeper"
+msgid "dh_scrollkeeper - deprecated no-op"
+msgstr ""
 
 # type: textblock
 #. type: textblock
@@ -5435,9 +5434,10 @@ msgstr ""
 # type: textblock
 #. type: textblock
 #: dh_scrollkeeper:18
+#, fuzzy
 msgid ""
-"B<dh_scrollkeeper> is a debhelper program that handles correctly registering "
-"OMF files that it finds in package build trees with ScrollKeeper."
+"dh_scrollkeeper was a debhelper program that handled registering OMF files "
+"for ScrollKeeper. However, it no longer does anything, and is now deprecated."
 msgstr ""
 "B<dh_scrollkeeper> es un programa de debhelper que maneja el registro "
 "adecuado de ficheros OMF que encuentra en los arboles de construcción de "
@@ -5445,41 +5445,6 @@ msgstr ""
 
 # type: textblock
 #. type: textblock
-#: dh_scrollkeeper:22
-#, fuzzy
-msgid ""
-"This command automatically adds maintainer script snippets for registering "
-"and unregistering files with ScrollKeeper (unless B<-n> is used). These "
-"snippets are inserted into the maintainer scripts by dh_installdeb. See "
-"L<dh_installdeb(1)> for an explanation of Debhelper maintainer script "
-"snippets."
-msgstr ""
-"Esta orden añade automáticamente partes del programa de desarrollador para "
-"registro y de-registro de ficheros con ScrollKeeper (a menos que se use la "
-"opción B<-n>). Vea L<dh_installdeb(1)> para explicación sobre las partes del "
-"programa Debhelper de desarrollador."
-
-# type: textblock
-#. type: textblock
-#: dh_scrollkeeper:28
-msgid ""
-"It will also change any DTD declarations in the OMF and DocBook files to "
-"refer to local files instead of remote URLs. This change does not modify the "
-"source files, but the files in the package build tree."
-msgstr ""
-"También cambiará cualquier declaración DTD en los ficheros OMF y DocBook que "
-"se refieran a ficheros locales en lugar de URLs remotas. Este cambio no "
-"modifica los ficheros de origen, a excepción de los ficheros en el árbol de "
-"construcción del paquete."
-
-# type: textblock
-#. type: textblock
-#: dh_scrollkeeper:38
-msgid "Do not modify F<postinst>/F<postrm> scripts."
-msgstr "No modifica programas F<postinst>/F<postrm>."
-
-# type: textblock
-#. type: textblock
 #: dh_shlibdeps:5
 msgid "dh_shlibdeps - calculate shared library dependencies"
 msgstr "dh_shlibdeps - calcula dependencias de bibliotecas compartidas"
@@ -6137,6 +6102,39 @@ msgid "Andrew Stribblehill <ads@debian.org>"
 msgstr "Andrew Stribblehill <ads@debian.org>"
 
 # type: textblock
+#~ msgid "dh_scrollkeeper - generate ScrollKeeper registration scripts"
+#~ msgstr "dh_scrollkeeper - genera programas de registro de ScrollKeeper"
+
+# type: textblock
+#, fuzzy
+#~ msgid ""
+#~ "This command automatically adds maintainer script snippets for "
+#~ "registering and unregistering files with ScrollKeeper (unless B<-n> is "
+#~ "used). These snippets are inserted into the maintainer scripts by "
+#~ "dh_installdeb. See L<dh_installdeb(1)> for an explanation of Debhelper "
+#~ "maintainer script snippets."
+#~ msgstr ""
+#~ "Esta orden añade automáticamente partes del programa de desarrollador "
+#~ "para registro y de-registro de ficheros con ScrollKeeper (a menos que se "
+#~ "use la opción B<-n>). Vea L<dh_installdeb(1)> para explicación sobre las "
+#~ "partes del programa Debhelper de desarrollador."
+
+# type: textblock
+#~ msgid ""
+#~ "It will also change any DTD declarations in the OMF and DocBook files to "
+#~ "refer to local files instead of remote URLs. This change does not modify "
+#~ "the source files, but the files in the package build tree."
+#~ msgstr ""
+#~ "También cambiará cualquier declaración DTD en los ficheros OMF y DocBook "
+#~ "que se refieran a ficheros locales en lugar de URLs remotas. Este cambio "
+#~ "no modifica los ficheros de origen, a excepción de los ficheros en el "
+#~ "árbol de construcción del paquete."
+
+# type: textblock
+#~ msgid "Do not modify F<postinst>/F<postrm> scripts."
+#~ msgstr "No modifica programas F<postinst>/F<postrm>."
+
+# type: textblock
 #~ msgid "dh_desktop - Register .desktop files"
 #~ msgstr "dh_desktop - Registra ficheros .desktop"