Author: branden
Date: 2004-08-30 14:32:31 -0500 (Mon, 30 Aug 2004)
New Revision: 1770
Modified:
branches/debconf-overhaul/debian/CHANGESETS
branches/debconf-overhaul/debian/TODO
branches/debconf-overhaul/debian/changelog
branches/debconf-overhaul/debian/po/POTFILES.in
branches/debconf-overhaul/debian/po/ca.po
branches/debconf-overhaul/debian/po/cs.po
branches/debconf-overhaul/debian/po/da.po
branches/debconf-overhaul/debian/po/de.po
branches/debconf-overhaul/debian/po/el.po
branches/debconf-overhaul/debian/po/es.po
branches/debconf-overhaul/debian/po/fr.po
branches/debconf-overhaul/debian/po/gl.po
branches/debconf-overhaul/debian/po/it.po
branches/debconf-overhaul/debian/po/ja.po
branches/debconf-overhaul/debian/po/nl.po
branches/debconf-overhaul/debian/po/pl.po
branches/debconf-overhaul/debian/po/pt_BR.po
branches/debconf-overhaul/debian/po/ru.po
branches/debconf-overhaul/debian/po/sv.po
branches/debconf-overhaul/debian/po/templates.pot
branches/debconf-overhaul/debian/po/tr.po
branches/debconf-overhaul/debian/rules
branches/debconf-overhaul/debian/shell-lib.sh
branches/debconf-overhaul/debian/xserver-xfree86.config.in
Log:
Merge revisions 1755 to HEAD from trunk.
Modified: branches/debconf-overhaul/debian/CHANGESETS
===================================================================
--- branches/debconf-overhaul/debian/CHANGESETS 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/CHANGESETS 2004-08-30 19:32:31 UTC (rev
1770)
@@ -14,7 +14,7 @@
Miscellaneous cosmetic fixes.
1607, 1608, 1624, 1626, 1627, 1636, 1651, 1654, 1663, 1664, 1675, 1685,
- 1690, 1713, 1715, 1716, 1718, 1736, 1737, 1743
+ 1690, 1713, 1715, 1716, 1718, 1736, 1737, 1743, 1761, 1768
Grab latest version of XTerm (#191) from Thomas Dickey's website.
1609
@@ -143,7 +143,7 @@
+ Reduce the build time by 20 to 30 percent when the "binary-arch" target
is used (ccache users might see even more improvement).
+ Make the buildd admins hate us less.
- 1658, 1659, 1661, 1670, 1671, 1679, 1681
+ 1658, 1659, 1661, 1670, 1671, 1679, 1681, 1756
Fix missing element of Debian X FAQ conversion to XHTML; correct
s390-specific version of xfree86-common dh_installdocs file to recognize
@@ -435,4 +435,63 @@
xserver-xfree86 (<< 4.3.0.dfsg.1-7)'!"
1746, 1747, 1748, 1749, 1750
+Rewrite migration of app-defaults (in libxt6) and xkb (in libx11-6)
+directories.
++ Enhance the shell libary with new functions:
+ - Implement check_symlink() and change check_symlinks_and_warn() and
+ check_symlinks_and_bomb() to use it.
+ - Implement make_symlink_sane(). Ensure that the specified symbolic
+ link symlink exists, and points to the specified target. If symlink
+ does not exist, create it and point it at target. If symlink exists
+ but is not a symbolic link, back it up. If symlink exists, is a
+ symbolic link, but points to the wrong location, fix it. If symlink
+ exists, is a symbolic link, and already points to target, do nothing.
+ This function wouldn't be needed if ln had an -I, --idempotent option.
+ - Implement migrate_dir_to_symlink(). Per Debian Policy section 6.5.4,
+ "A directory will never be replaced by a symbolic link to a directory
+ or vice versa; instead, the existing state (symlink or not) will be
+ left alone and dpkg will follow the symlink if there is one." We have
+ to do it ourselves. This function moves the contents of old_location,
+ a directory, into new_location, a directory, then makes old_location a
+ symbolic link to new_location. old_location need not exist, but if it
+ does, it must be a directory (or a symlink to a directory). If it is
+ not, it is backed up. If new_location exists already and is not a
+ directory, it is backed up.
++ Add config scripts for libx11-6 and libxt6, which detect if
+ /usr/X11R6/lib/X11/{app-defaults,xkb} is a directory but not a symlink,
+ and use debconf to prompt the user (at low priority) whether the
+ directories should be moved. If the user says no, abort the script. If
+ the user says yes (default), start the migration with
+ migrate_dir_to_symlink().
++ Update preinst scripts to use debconf as the configs script do; this is
+ unusual but necessary because if we're going to do the migration we need
+ to start before any other packages (which may use the old directories)
+ are unpacked.
++ In the preinst scripts, call check_symlink(), and if that fails, call
+ make_symlink_sane(). Stop calling check_symlinks_and_warn().
++ Update postinst scripts to indicate that migration is completed.
++ Update postrm scripts to run migration in reverse if it had been started
+ and the package installation or upgrade is aborted.
++ We keep shipping /etc/X11/{app-defaults,xkb} symlinks as part of the
+ package payloads, because manipulating them in the preinst isn't enough
+ -- dpkg will remove "disappearing" files from the system *after* the
+ preinst runs but before the postinst does, leaving a window for packages
+ using the legacy paths to unpack to the old location with no symlink to
+ redirect them, which is precisely what we don't want (see section 6.5 of
+ the Debian Policy Manual).
+ 1753, 1757, 1760, 1763
+
+* Add French and Danish translation of "Generic Monitor" to
+ xserver-xfree86.config.in. Thanks to Christian Perrier and Anders Dybdal.
+ 1762
+
+* Add Danish translation of "Generic Video Card" to
+ xserver-xfree86.config.in. Thanks to Anders Dybdal.
+ 1764
+
+Make xserver-xfree86 config script's validate_monitor_frequency_db_input()
+function more strict, so it doesn't regard open-ended ranges like "40-" as
+valid.
+ 1766, 1769
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: branches/debconf-overhaul/debian/TODO
===================================================================
--- branches/debconf-overhaul/debian/TODO 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/TODO 2004-08-30 19:32:31 UTC (rev
1770)
@@ -47,6 +47,8 @@
done about this [BR]
+ #257515: xserver-xfree86: [debconf] keyboard layout template should tell
U.K.
users to use 'gb' [BR]
+ + Use /proc/hardware on m68k architecture to set a reasonable default mouse
+ port. See <URL: http://lists.debian.org/debian-68k/2004/08/msg00392.html>.
* Add FAQ entry describing Debian's plans in the X department.
* #256706: keep swatting away at the keyboard modifer issue; Ivan Pascal told
BR:
Modified: branches/debconf-overhaul/debian/changelog
===================================================================
--- branches/debconf-overhaul/debian/changelog 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/changelog 2004-08-30 19:32:31 UTC (rev
1770)
@@ -342,6 +342,34 @@
person, of *course* dpkg and apt accept 'Conflicts: (4.3.0.dfsg.1-4 <<)
xserver-xfree86 (<< 4.3.0.dfsg.1-7)'!"
+ Changes by Fabio M. Di Nitto and Branden Robinson:
+
+ * Support building only the parts of the source tree needed by
+ architecture-specific packages.
+ + Modify Debian Imake configuration to support building with fonts and
+ specs docs turned off (patch #003). Resynchronize GNU/Hurd,
+ GNU/FreeBSD, and GNU/NetBSD Imake configurations with Debian
+ configuration (patches #800, #820, #842, #900). Resync diffs in patches
+ #004, #099c, #600.
+ + Modify Imakefiles to build and install the font utilities even if the
+ fonts themselves are not being shipped (patch #095).
+ + Make the "build" target a dummy target, replacing it with
+ "build-arch-only" and "build-all" targets. Target-specific variable
+ values are used to invoke a "real-build" target, turning off the
+ building of fonts and "specs docs" as needed.
+ + Add comments to rules file, update $(stampdir_targets) and .PHONY
+ target.
+ + Split MANIFEST files into arch-specific and arch-independent parts.
+ Update the README to explain how these files work now and how to update
+ them.
+ + Ship the XTerm control sequences document only in the xspecs package.
+ Consequences:
+ + Reduce the disk space required to build the package by ~520MB when the
+ "binary-arch" target is used (e.g., by "dpkg-buildpackage -B".)
+ + Reduce the build time by 20 to 30 percent when the "binary-arch" target
+ is used (ccache users might see even more improvement).
+ + Make the buildd admins hate us less.
+
* Rewrite migration of app-defaults (in libxt6) and xkb (in libx11-6)
directories.
+ Enhance the shell libary with new functions:
@@ -387,34 +415,10 @@
redirect them, which is precisely what we don't want (see section 6.5 of
the Debian Policy Manual).
- Changes by Fabio M. Di Nitto and Branden Robinson:
+ * Make xserver-xfree86 config script's validate_monitor_frequency_db_input()
+ function more strict, so it doesn't regard open-ended ranges like "40-" as
+ valid.
- * Support building only the parts of the source tree needed by
- architecture-specific packages.
- + Modify Debian Imake configuration to support building with fonts and
- specs docs turned off (patch #003). Resynchronize GNU/Hurd,
- GNU/FreeBSD, and GNU/NetBSD Imake configurations with Debian
- configuration (patches #800, #820, #842, #900). Resync diffs in patches
- #004, #099c, #600.
- + Modify Imakefiles to build and install the font utilities even if the
- fonts themselves are not being shipped (patch #095).
- + Make the "build" target a dummy target, replacing it with
- "build-arch-only" and "build-all" targets. Target-specific variable
- values are used to invoke a "real-build" target, turning off the
- building of fonts and "specs docs" as needed.
- + Add comments to rules file, update $(stampdir_targets) and .PHONY
- target.
- + Split MANIFEST files into arch-specific and arch-independent parts.
- Update the README to explain how these files work now and how to update
- them.
- + Ship the XTerm control sequences document only in the xspecs package.
- Consequences:
- + Reduce the disk space required to build the package by ~520MB when the
- "binary-arch" target is used (e.g., by "dpkg-buildpackage -B".)
- + Reduce the build time by 20 to 30 percent when the "binary-arch" target
- is used (ccache users might see even more improvement).
- + Make the buildd admins hate us less.
-
Changes by Robert Millan:
* Get glxinfo to link properly with g++ (instead of adding -lstdc++).
@@ -428,8 +432,14 @@
autodetection would cause the script to think it had detected one X server
or XFree86 video driver instead ($(echo "" | wc -l) is "1", not "0").
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 25 Aug 2004 11:41:15 -0500
+ * Add French and Danish translation of "Generic Monitor" to
+ xserver-xfree86.config.in. Thanks to Christian Perrier and Anders Dybdal.
+ * Add Danish translation of "Generic Video Card" to
+ xserver-xfree86.config.in. Thanks to Anders Dybdal.
+
+ -- Branden Robinson <[EMAIL PROTECTED]> Mon, 30 Aug 2004 14:22:49 -0500
+
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Changes by Branden Robinson:
Modified: branches/debconf-overhaul/debian/po/POTFILES.in
===================================================================
--- branches/debconf-overhaul/debian/po/POTFILES.in 2004-08-30 19:24:01 UTC
(rev 1769)
+++ branches/debconf-overhaul/debian/po/POTFILES.in 2004-08-30 19:32:31 UTC
(rev 1770)
@@ -1,3 +1,5 @@
+[type: gettext/rfc822deb] libx11-6.templates
+[type: gettext/rfc822deb] libxt6.templates
[type: gettext/rfc822deb] xdm.templates
[type: gettext/rfc822deb] xfree86-common.templates
[type: gettext/rfc822deb] xserver-common.templates
Modified: branches/debconf-overhaul/debian/po/ca.po
===================================================================
--- branches/debconf-overhaul/debian/po/ca.po 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/po/ca.po 2004-08-30 19:32:31 UTC (rev
1770)
@@ -26,7 +26,7 @@
msgstr ""
"Project-Id-Version: xfree86 4.3.0.dfsg.1-5\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-08-10 23:47:18-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
"PO-Revision-Date: 2004-06-09 20:08+0200\n"
"Last-Translator: Ivan Vilata i Balaguer <[EMAIL PROTECTED]>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -34,6 +34,66 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/po/cs.po
===================================================================
--- branches/debconf-overhaul/debian/po/cs.po 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/po/cs.po 2004-08-30 19:32:31 UTC (rev
1770)
@@ -26,7 +26,7 @@
msgstr ""
"Project-Id-Version: xfree86\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-07-29 02:25:12-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
"PO-Revision-Date: 2004-05-29 17:03+0200\n"
"Last-Translator: Miroslav Kure <[EMAIL PROTECTED]>\n"
"Language-Team: Czech <[EMAIL PROTECTED]>\n"
@@ -34,6 +34,66 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/po/da.po
===================================================================
--- branches/debconf-overhaul/debian/po/da.po 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/po/da.po 2004-08-30 19:32:31 UTC (rev
1770)
@@ -28,7 +28,7 @@
msgstr ""
"Project-Id-Version: xfree86_4.3.0-3_da\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-07-29 02:25:12-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
"PO-Revision-Date: 2004-03-02 21:22+0100\n"
"Last-Translator: Claus Hindsgaul <[EMAIL PROTECTED]>\n"
"Language-Team: Danish <[EMAIL PROTECTED]>\n"
@@ -37,6 +37,66 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0.2\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/po/de.po
===================================================================
--- branches/debconf-overhaul/debian/po/de.po 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/po/de.po 2004-08-30 19:32:31 UTC (rev
1770)
@@ -34,7 +34,7 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-07-29 02:25:12-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
"PO-Revision-Date: 2004-07-24 15:03+0200\n"
"Last-Translator: Alwin Meschede <[EMAIL PROTECTED]>\n"
"Language-Team: <gnome-de@gnome.org>\n"
@@ -43,6 +43,66 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0.2\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/po/el.po
===================================================================
--- branches/debconf-overhaul/debian/po/el.po 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/po/el.po 2004-08-30 19:32:31 UTC (rev
1770)
@@ -26,7 +26,7 @@
msgstr ""
"Project-Id-Version: el\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-07-29 02:25:12-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
"PO-Revision-Date: 2004-05-27 21:10EEST\n"
"Last-Translator: Konstantinos Margaritis <[EMAIL PROTECTED]>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -35,6 +35,66 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3.1\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/po/es.po
===================================================================
--- branches/debconf-overhaul/debian/po/es.po 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/po/es.po 2004-08-30 19:32:31 UTC (rev
1770)
@@ -28,7 +28,7 @@
msgstr ""
"Project-Id-Version: xfree86 4.2.1-6\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-07-29 02:25:12-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
"PO-Revision-Date: 2003-03-24 20:21+0100\n"
"Last-Translator: Javier Fernandez-Sanguino Pe�a <[EMAIL PROTECTED]>\n"
"Language-Team: ES <debian-l10n-spanish@lists.debian.org>\n"
@@ -36,6 +36,66 @@
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/po/fr.po
===================================================================
--- branches/debconf-overhaul/debian/po/fr.po 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/po/fr.po 2004-08-30 19:32:31 UTC (rev
1770)
@@ -31,7 +31,7 @@
msgstr ""
"Project-Id-Version: xfree86 4.2.1-10\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-07-29 02:25:12-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
"PO-Revision-Date: 2004-06-21 08:55+0200\n"
"Last-Translator: Christian Perrier <[EMAIL PROTECTED]>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -42,6 +42,66 @@
"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
"\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/po/gl.po
===================================================================
--- branches/debconf-overhaul/debian/po/gl.po 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/po/gl.po 2004-08-30 19:32:31 UTC (rev
1770)
@@ -26,7 +26,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-07-29 02:25:12-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -34,6 +34,66 @@
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/po/it.po
===================================================================
--- branches/debconf-overhaul/debian/po/it.po 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/po/it.po 2004-08-30 19:32:31 UTC (rev
1770)
@@ -27,7 +27,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-07-29 02:25:12-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -35,6 +35,66 @@
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/po/ja.po
===================================================================
--- branches/debconf-overhaul/debian/po/ja.po 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/po/ja.po 2004-08-30 19:32:31 UTC (rev
1770)
@@ -29,7 +29,7 @@
msgstr ""
"Project-Id-Version: xfree86 4.3.0\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-07-29 02:25:12-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
"PO-Revision-Date: 2004-06-25 09:21+0900\n"
"Last-Translator: Kenshi Muto <[EMAIL PROTECTED]> and ISHIKAWA Mutsumi "
"<[EMAIL PROTECTED]>\n"
@@ -38,6 +38,66 @@
"Content-Type: text/plain; charset=EUC-JP\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/po/nl.po
===================================================================
--- branches/debconf-overhaul/debian/po/nl.po 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/po/nl.po 2004-08-30 19:32:31 UTC (rev
1770)
@@ -28,7 +28,7 @@
msgstr ""
"Project-Id-Version: xfree86\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-07-29 02:25:12-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
"PO-Revision-Date: 2004-07-04 20:22-0500\n"
"Last-Translator: Bart Cornelis <[EMAIL PROTECTED]>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -36,6 +36,66 @@
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/po/pl.po
===================================================================
--- branches/debconf-overhaul/debian/po/pl.po 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/po/pl.po 2004-08-30 19:32:31 UTC (rev
1770)
@@ -26,7 +26,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-07-29 02:25:12-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -34,6 +34,66 @@
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/po/pt_BR.po
===================================================================
--- branches/debconf-overhaul/debian/po/pt_BR.po 2004-08-30 19:24:01 UTC
(rev 1769)
+++ branches/debconf-overhaul/debian/po/pt_BR.po 2004-08-30 19:32:31 UTC
(rev 1770)
@@ -28,7 +28,7 @@
msgstr ""
"Project-Id-Version: xfree86\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-07-29 02:25:12-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
"PO-Revision-Date: 2004-07-25 15:41-0300\n"
"Last-Translator: Andr� Lu�s Lopes <[EMAIL PROTECTED]>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -36,6 +36,66 @@
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/po/ru.po
===================================================================
--- branches/debconf-overhaul/debian/po/ru.po 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/po/ru.po 2004-08-30 19:32:31 UTC (rev
1770)
@@ -27,7 +27,7 @@
msgstr ""
"Project-Id-Version: xfree86_4.2.1-11\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-07-29 02:25:12-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
"PO-Revision-Date: 2003-10-05 16:57+0600\n"
"Last-Translator: Ilgiz Kalmetev <[EMAIL PROTECTED]>\n"
"Language-Team: russian <debian-russian@lists.debian.org>\n"
@@ -36,6 +36,66 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0.1\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/po/sv.po
===================================================================
--- branches/debconf-overhaul/debian/po/sv.po 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/po/sv.po 2004-08-30 19:32:31 UTC (rev
1770)
@@ -28,7 +28,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-07-29 02:25:12-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -36,6 +36,66 @@
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/po/templates.pot
===================================================================
--- branches/debconf-overhaul/debian/po/templates.pot 2004-08-30 19:24:01 UTC
(rev 1769)
+++ branches/debconf-overhaul/debian/po/templates.pot 2004-08-30 19:32:31 UTC
(rev 1770)
@@ -14,21 +14,85 @@
# info -n '(gettext)PO Files'
# info -n '(gettext)Header Entry'
#
-# Some information specific to po-debconf is available at
+# Some information specific to po-debconf are available at
# /usr/share/doc/po-debconf/README-trans
# or http://www.debian.org/intl/l10n/po-debconf/README-trans
#
# Developers do not need to manually edit POT or PO files.
#
+#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 4.3.0.dfsg.1-6+SVN\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-07-29 02:25:12-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
+"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/po/tr.po
===================================================================
--- branches/debconf-overhaul/debian/po/tr.po 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/po/tr.po 2004-08-30 19:32:31 UTC (rev
1770)
@@ -27,7 +27,7 @@
msgstr ""
"Project-Id-Version: xserver-xfree86\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2004-07-29 02:25:12-0500\n"
+"POT-Creation-Date: 2004-08-30 07:42+0000\n"
"PO-Revision-Date: 2004-06-26 16:54+0300\n"
"Last-Translator: Osman Yüksel <[EMAIL PROTECTED]>\n"
"Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -35,6 +35,66 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid "Migrate XKB configuration directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"The directory where configuration information (including keyboard data) for "
+"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
+"lib/X11/xkb to /etc/X11/xkb."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4 ../libxt6.templates:4
+msgid ""
+"Your system is using the old location, and some programs, such as those from "
+"old or unofficial Debian packages, may continue to install files there."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libx11-6.templates:4
+msgid ""
+"Would you like the XKB configuration files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid "Migrate Xt application defaults directory?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"The directory where application defaults for X Window System client programs "
+"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
+"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../libxt6.templates:4
+msgid ""
+"Would you like the app-defaults files on the system to be automatically "
+"migrated from the old location to the new one? Any existing files in the "
+"new location that have the same name will be backed up and replaced by the "
+"files from the old location. A symbolic link from the old location to the "
+"new one will be created to prevent legacy applications from breaking."
+msgstr ""
+
#. Type: select
#. Description
#: ../xdm.templates:4
Modified: branches/debconf-overhaul/debian/rules
===================================================================
--- branches/debconf-overhaul/debian/rules 2004-08-30 19:24:01 UTC (rev
1769)
+++ branches/debconf-overhaul/debian/rules 2004-08-30 19:32:31 UTC (rev
1770)
@@ -352,12 +352,12 @@
# Construct MANIFEST files from MANIFEST.$(ARCH).in and
# MANIFEST.$(ARCH).all or MANIFEST.all.
if expr "$(findstring -DBuildFonts=NO,$(IMAKE_DEFINES))" :
"-DBuildFonts=NO" >/dev/null 2>&1; then \
- sort -u debian/MANIFEST.$(ARCH).in >debian/MANIFEST.$(ARCH); \
+ LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in >debian/MANIFEST.$(ARCH);
\
else \
if [ -e debian/MANIFEST.$(ARCH).all ]; then \
- sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH).all
>debian/MANIFEST.$(ARCH); \
+ LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in
debian/MANIFEST.$(ARCH).all >debian/MANIFEST.$(ARCH); \
else \
- sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all
>debian/MANIFEST.$(ARCH); \
+ LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all
>debian/MANIFEST.$(ARCH); \
fi; \
fi
# confirm that the installed file list has not changed
Modified: branches/debconf-overhaul/debian/shell-lib.sh
===================================================================
--- branches/debconf-overhaul/debian/shell-lib.sh 2004-08-30 19:24:01 UTC
(rev 1769)
+++ branches/debconf-overhaul/debian/shell-lib.sh 2004-08-30 19:32:31 UTC
(rev 1770)
@@ -655,6 +655,7 @@
observe "link from $symlink to $target already exists"
else
observe "creating symbolic link from $symlink to $target"
+ mkdir -p "${target%/*}" "${symlink%/*}"
ln -s -b -S ".dpkg-old" "$target" "$symlink"
fi
}
Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in
===================================================================
--- branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-08-30
19:24:01 UTC (rev 1769)
+++ branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-08-30
19:32:31 UTC (rev 1770)
@@ -274,10 +274,12 @@
fi
db_go
db_get "$TEMPLATE"
- # string, needs input validation; a simple regex match will have to do;
- # force first character to be a number to avoid hideous problems in the
- # debconf dialog frontend in 0.3.83 (it needs to be one anyway)
- if expr "$RET" : "^[0-9][-0-9,. ]\+$" > /dev/null 2>&1; then
+ # This is a string, and needs input validation; a regex match will have to
+ # do. We force the first character to be a number to avoid hideous
problems
+ # in the debconf dialog frontend in 0.3.83 (it needs to be one anyway).
+ # We don't allow values less than 10.
+ if echo "$RET" | grep -qE \
+ '^[0-9]{2,3}(\.[0-9]+)?(-[0-9]{2,3}(\.[0-9]+)?)?'; then
break # valid input
fi
# we only get to this point if the input was invalid; restore the known
@@ -725,7 +727,7 @@
# fall back to some language-specific generic text
case "${LC_ALL:-${LC_MESSAGES:-$LANG}}" in
ca_*) DEFAULT="Targeta de v�deo gen�rica" ;;
- # da
+ da_*) DEFAULT="Standard Video Kort" ;;
de_*) DEFAULT="Standardgrafikkarte" ;;
es_*) DEFAULT="Tarjeta de v�deo gen�rica" ;;
fr_*) DEFAULT="Carte vid�o g�n�rique" ;;
@@ -1083,10 +1085,10 @@
# fall back to some language-specific generic text
case "${LC_ALL:-${LC_MESSAGES:-$LANG}}" in
ca_*) DEFAULT="Monitor gen�ric" ;;
- # da
+ da_*) DEFAULT="Standard Sk�rm" ;;
de_*) DEFAULT="Standardbildschirm" ;;
es_*) DEFAULT="Monitor gen�rico" ;;
- # fr
+ fr_*) DEFAULT="�cran g�n�rique" ;;
# gl
it_*) DEFAULT="Monitor Generico" ;;
# ja
