[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r321 - trunk/debian/po



Author: dnusinow
Date: 2005-07-10 13:31:15 -0500 (Sun, 10 Jul 2005)
New Revision: 321

Modified:
   trunk/debian/po/ca.po
   trunk/debian/po/cs.po
   trunk/debian/po/da.po
   trunk/debian/po/de.po
   trunk/debian/po/el.po
   trunk/debian/po/es.po
   trunk/debian/po/fr.po
   trunk/debian/po/gl.po
   trunk/debian/po/it.po
   trunk/debian/po/ja.po
   trunk/debian/po/nl.po
   trunk/debian/po/pl.po
   trunk/debian/po/pt_BR.po
   trunk/debian/po/ru.po
   trunk/debian/po/sv.po
   trunk/debian/po/templates.pot
   trunk/debian/po/tr.po
   trunk/debian/po/vi.po
Log:
- Run debian/rules update-po to update translation templates


Modified: trunk/debian/po/ca.po
===================================================================
--- trunk/debian/po/ca.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/ca.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,7 +1,7 @@
 # debconf templates for xfree86 package
 # Catalan translation
 #
-# $Id: ca.po 1763M 2004-10-11 07:13:16Z (local) $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson, 2000--2004
@@ -25,8 +25,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfree86 4.3.0.dfsg.1-5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: 2004-06-09 20:08+0200\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -161,13 +161,13 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr "Versió experimental dels paquets d'XFree86."
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -181,7 +181,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -195,7 +195,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 #, fuzzy
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "

Modified: trunk/debian/po/cs.po
===================================================================
--- trunk/debian/po/cs.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/cs.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,7 +1,7 @@
 # debconf templates for xfree86 package
 # Czech translation
 #
-# $Id: cs.po 1763M 2004-10-11 07:13:16Z (local) $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson, 2000--2004
@@ -25,8 +25,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfree86\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: 2004-09-26 17:19+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <provoz@debian.cz>\n"
@@ -176,13 +176,13 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr "experimentální verze balíků XFree86"
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -195,7 +195,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -208,7 +208,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 #, fuzzy
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "

Modified: trunk/debian/po/da.po
===================================================================
--- trunk/debian/po/da.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/da.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,7 +1,7 @@
 # debconf templates for xfree86 package
 # Danish translation
 #
-# $Id: da.po 1763M 2004-10-11 07:13:16Z (local) $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson, 2000--2004
@@ -27,8 +27,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_4.3.0-3_da\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: 2004-09-29 21:45+0200\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -186,13 +186,13 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr "eksperimentel version af XFree86-pakkerne"
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -206,7 +206,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -220,7 +220,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 #, fuzzy
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "

Modified: trunk/debian/po/de.po
===================================================================
--- trunk/debian/po/de.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/de.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,7 +1,7 @@
 # debconf templates for xfree86 package
 # German translation
 #
-# $Id: de.po 1763M 2004-10-11 07:13:16Z (local) $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson, 2000--2004
@@ -33,8 +33,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: 2004-07-24 15:03+0200\n"
 "Last-Translator: Alwin Meschede <ameschede@gmx.de>\n"
 "Language-Team:  <gnome-de@gnome.org>\n"
@@ -171,13 +171,13 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr "experimentelle Version von XFree86-Paketen"
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -191,7 +191,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -205,7 +205,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 #, fuzzy
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "

Modified: trunk/debian/po/el.po
===================================================================
--- trunk/debian/po/el.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/el.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,7 +1,7 @@
 # debconf templates for xfree86 package
 # Greek translation
 #
-# $Id: el.po 1763M 2004-10-11 07:13:16Z (local) $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson, 2000--2004
@@ -25,8 +25,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: 2004-05-27 21:10EEST\n"
 "Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -164,13 +164,13 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr "πειραματική έκδοση των πακέτων XFree86"
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -184,7 +184,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -198,7 +198,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 #, fuzzy
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "

Modified: trunk/debian/po/es.po
===================================================================
--- trunk/debian/po/es.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/es.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,7 +1,7 @@
 # debconf templates for xfree86 package
 # Spanish translation
 #
-# $Id: es.po 1763M 2004-10-11 07:13:17Z (local) $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson 2000--2004
@@ -27,8 +27,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfree86 4.2.1-6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: 2003-03-24 20:21+0100\n"
 "Last-Translator: Javier Fernandez-Sanguino Pe�jfs@debian.org>\n"
 "Language-Team: ES <debian-l10n-spanish@lists.debian.org>\n"
@@ -163,13 +163,13 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr "versi�xperimental de los paquetes de XFree86"
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -183,7 +183,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -197,7 +197,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 #, fuzzy
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "

Modified: trunk/debian/po/fr.po
===================================================================
--- trunk/debian/po/fr.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/fr.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -2,7 +2,7 @@
 # debconf templates for xfree86 package
 # French translation
 #
-# $Id: fr.po 1763M 2004-10-11 07:13:17Z (local) $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson, 2000--2004
@@ -30,8 +30,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfree86 4.2.1-10\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: 2004-09-06 00:16+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -190,13 +190,13 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr "Version exp�mentale des paquets XFree86"
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -210,7 +210,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -225,7 +225,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 #, fuzzy
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "

Modified: trunk/debian/po/gl.po
===================================================================
--- trunk/debian/po/gl.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/gl.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,7 +1,7 @@
 # debconf templates for xfree86 package
 # Galician translation
 #
-# $Id: gl.po 1763M 2004-10-11 07:13:17Z (local) $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson, 2000--2004
@@ -25,8 +25,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -147,13 +147,13 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -163,7 +163,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -173,7 +173,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "
 "things:\n"

Modified: trunk/debian/po/it.po
===================================================================
--- trunk/debian/po/it.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/it.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,7 +1,7 @@
 # debconf templates for xfree86 package
 # Italian translation
 #
-# $Id: it.po 1763M 2004-10-11 07:13:17Z (local) $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson, 2000--2004
@@ -28,8 +28,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfree86 4.3.0.dfsg.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: 2004-09-05 18:34+0200\n"
 "Last-Translator: Danilo Piazzalunga <danilopiazza@libero.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -191,14 +191,14 @@
 # NEW-TRANSLATION
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr "Versione sperimentale dei pacchetti di XFree86"
 
 # NEW-TRANSLATION
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -213,7 +213,7 @@
 # NEW-TRANSLATION
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -228,7 +228,7 @@
 # NEW-TRANSLATION
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 #, fuzzy
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "

Modified: trunk/debian/po/ja.po
===================================================================
--- trunk/debian/po/ja.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/ja.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,7 +1,7 @@
 # debconf templates for xfree86 package
 # Japanese translation
 #
-# $Id: ja.po 1763M 2004-10-11 07:13:17Z (local) $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson, 2000--2004
@@ -28,8 +28,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfree86 4.3.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: 2004-09-18 15:41+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org> and ISHIKAWA Mutsumi "
 "<ishikawa@debian.org>\n"
@@ -180,13 +180,13 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr "�¸�Ū�ʥС�������XFree86 �ѥå�����"
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -200,7 +200,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -214,7 +214,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 #, fuzzy
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "

Modified: trunk/debian/po/nl.po
===================================================================
--- trunk/debian/po/nl.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/nl.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,7 +1,7 @@
 # debconf templates for xfree86 package
 # Dutch translation
 #
-# $Id: nl.po 1763M 2004-10-11 07:13:18Z (local) $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson, 2000--2004
@@ -27,8 +27,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfree86\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: 2004-07-04 20:22-0500\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -165,13 +165,13 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr "experimentele versie van de XFree86 pakketten"
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -185,7 +185,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -199,7 +199,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 #, fuzzy
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "

Modified: trunk/debian/po/pl.po
===================================================================
--- trunk/debian/po/pl.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/pl.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,7 +1,7 @@
 # debconf templates for xfree86 package
 # Polish translation
 #
-# $Id: pl.po 1763M 2004-10-11 07:13:18Z (local) $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson, 2000--2004
@@ -25,8 +25,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -155,13 +155,13 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -171,7 +171,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -181,7 +181,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "
 "things:\n"

Modified: trunk/debian/po/pt_BR.po
===================================================================
--- trunk/debian/po/pt_BR.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/pt_BR.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,7 +1,7 @@
 # debconf templates for xfree86 package
 # Brazilian Portuguese translation
 #
-# $Id: pt_BR.po 1763M 2004-10-11 07:13:18Z (local) $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson, 2000--2004
@@ -27,8 +27,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfree86\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: 2004-07-25 15:41-0300\n"
 "Last-Translator: Andr�u�Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -164,13 +164,13 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr "Vers�experimental do pacotes do XFree86"
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -184,7 +184,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -198,7 +198,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 #, fuzzy
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "

Modified: trunk/debian/po/ru.po
===================================================================
--- trunk/debian/po/ru.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/ru.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,7 +1,7 @@
 # debconf templates for xfree86 package
 # Russian translation
 #
-# $Id: ru.po 1763M 2004-10-11 07:13:18Z (local) $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson, 2000--2004
@@ -26,8 +26,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_4.2.1-11\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: 2003-10-05 16:57+0600\n"
 "Last-Translator: Ilgiz Kalmetev <translator@ilgiz.pp.ru>\n"
 "Language-Team: russian <debian-russian@lists.debian.org>\n"
@@ -162,13 +162,13 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr "������������ ����XFree86"
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -182,7 +182,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -196,7 +196,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 #, fuzzy
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "

Modified: trunk/debian/po/sv.po
===================================================================
--- trunk/debian/po/sv.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/sv.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,7 +1,7 @@
 # debconf templates for xfree86 package
 # Swedish translation
 #
-# $Id: sv.po 1763M 2004-10-11 07:13:18Z (local) $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson, 2000--2004
@@ -27,8 +27,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -156,13 +156,13 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -172,7 +172,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -182,7 +182,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "
 "things:\n"

Modified: trunk/debian/po/templates.pot
===================================================================
--- trunk/debian/po/templates.pot	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/templates.pot	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,25 +1,30 @@
+# debconf templates for xfree86 package
 #
+# $Id: pothead.in 189 2005-06-11 00:04:27Z branden $
+#
+# Copyright:
+# Branden Robinson, 2000--2004
+#
+# This file is distributed under the same license as the xfree86 package.
+# Please see debian/copyright.
+#
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
 #    this format, e.g. by running:
 #         info -n '(gettext)PO Files'
 #         info -n '(gettext)Header Entry'
 #
-#    Some information specific to po-debconf are available at
+#    Some information specific to po-debconf is 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: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Project-Id-Version: 6.8.2.dfsg.1-1\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -136,13 +141,13 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -152,7 +157,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -162,7 +167,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "
 "things:\n"

Modified: trunk/debian/po/tr.po
===================================================================
--- trunk/debian/po/tr.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/tr.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,7 +1,7 @@
 # debconf templates for xfree86 package
 # Turkish translation
 #
-# $Id: tr.po 1763M 2004-10-11 07:13:18Z (local) $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson, 2000--2004
@@ -26,8 +26,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xserver-xorg\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 14:37+1100\n"
+"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: 2004-06-26 16:54+0300\n"
 "Last-Translator: Osman Yüksel <yuxel@sonsuzdongu.com>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -161,13 +161,13 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr "XFree86 paketleri deneysel (experimental) sürümü"
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -180,7 +180,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -194,7 +194,7 @@
 
 #. Type: note
 #. Description
-#: ../xorg-common.templates:3
+#: ../x11-common.templates:3
 #, fuzzy
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "

Modified: trunk/debian/po/vi.po
===================================================================
--- trunk/debian/po/vi.po	2005-07-10 18:26:56 UTC (rev 320)
+++ trunk/debian/po/vi.po	2005-07-10 18:31:15 UTC (rev 321)
@@ -1,7 +1,7 @@
 # debconf templates for xfree86 package
 # Vietnamese translation
 #
-# $Id: vi.po 2251 2005-05-10 19:47:34Z branden $
+# $Id$
 #
 # Copyrights:
 # Branden Robinson, 2000--2004
@@ -26,7 +26,7 @@
 msgstr ""
 "Project-Id-Version: 4.3.0.dfsg.1-7+SVN\n"
 "Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2005-05-10 14:42:54-0500\n"
+"POT-Creation-Date: 2005-07-10 02:29:22 PM-0400\n"
 "PO-Revision-Date: 2005-05-10 14:43+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -177,13 +177,13 @@
 
 #. Type: note
 #. Description
-#: ../xfree86-common.templates:3
+#: ../x11-common.templates:3
 msgid "experimental version of XFree86 packages"
 msgstr "phiên bản thí nghiệm gói XFree86"
 
 #. Type: note
 #. Description
-#: ../xfree86-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "You are using an experimental version of XFree86 packages for Debian.  "
 "Please do not file bugs with the Debian Bug Tracking System against this "
@@ -197,7 +197,7 @@
 
 #. Type: note
 #. Description
-#: ../xfree86-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you experience problems with these packages or would like to submit "
 "patches, please send mail to the Debian X mailing list.  You can read more "
@@ -214,7 +214,7 @@
 
 #. Type: note
 #. Description
-#: ../xfree86-common.templates:3
+#: ../x11-common.templates:3
 msgid ""
 "If you do not want to be running experimental X packages, you need to do two "
 "things:\n"
@@ -331,13 +331,13 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:4
+#: ../xserver-xorg.templates:4
 msgid "Attempt to autodetect video hardware?"
 msgstr "Cố tự động phát hiện phần cứng ảnh động không?"
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:4
+#: ../xserver-xorg.templates:4
 msgid ""
 "Accept this option if you would like to attempt to autodetect the "
 "recommended X server and driver module for your video card.  If "
@@ -352,7 +352,7 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:4
+#: ../xserver-xorg.templates:4
 msgid ""
 "If you would rather select the X server and driver module yourself, decline "
 "this option.  You will not be asked to select the X server if there is only "
@@ -364,13 +364,13 @@
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:17
+#: ../xserver-xorg.templates:17
 msgid "No X server known for your video hardware."
 msgstr "Không biết trình hỗ trợ X cho phần cứng bạn."
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:17
+#: ../xserver-xorg.templates:17
 msgid ""
 "Either you have no video hardware installed on this machine (serial console "
 "only?), or the \"discover\" program was unable to determine which X server "
@@ -386,13 +386,13 @@
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:26
+#: ../xserver-xorg.templates:26
 msgid "Multiple potential default X servers for your hardware."
 msgstr "Có nhiều trình hô trợ X có thể mặc định cho phần cứng bạn."
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:26
+#: ../xserver-xorg.templates:26
 msgid ""
 "Multiple video cards have been detected, and different X servers are "
 "required to support the various devices.  It is thus not possible to "
@@ -408,13 +408,13 @@
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:40
+#: ../xserver-xorg.templates:40
 msgid "Select the desired default X server."
 msgstr "Hãy chọn trình hỗ trợ X mặc định đã muốn."
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:40
+#: ../xserver-xorg.templates:40
 msgid ""
 "The X server is the hardware interface of the X Window System.  Its job is "
 "to communicate with video display and input devices, providing a foundation "
@@ -426,7 +426,7 @@
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:40
+#: ../xserver-xorg.templates:40
 msgid ""
 "Several X servers may be available; the default is selected via the /etc/X11/"
 "X symbolic link.  Some X servers may not work with your particular graphics "
@@ -438,13 +438,13 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:52
+#: ../xserver-xorg.templates:52
 msgid "Write default Files section to configuration file?"
 msgstr "Ghi phần Tập tin mặc định vào tập tin cấu hình không?"
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:52
+#: ../xserver-xorg.templates:52
 msgid ""
 "The Files section of the X server configuration file tells the X server "
 "where to find server modules, the RGB color database, and font files.  This "
@@ -456,10 +456,11 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:52
+#: ../xserver-xorg.templates:52
+#, fuzzy
 msgid ""
 "Disable this option if you want to write your own \"Files\" section into the "
-"XFree86 server configuration file.  You may wish to do this if you need to "
+"X.Org server configuration file.  You may wish to do this if you need to "
 "remove the reference to the local font server, add a reference to a "
 "different font server, or rearrange the default set of local font paths."
 msgstr ""
@@ -471,13 +472,14 @@
 
 #. Type: multiselect
 #. Description
-#: ../xserver-xfree86.templates:66
-msgid "Select the XFree86 server modules that should be loaded by default."
+#: ../xserver-xorg.templates:66
+#, fuzzy
+msgid "Select the X.Org server modules that should be loaded by default."
 msgstr "Hãy chọn các mô-đun hỗ trợ XFree86 nên tải theo mặc định."
 
 #. Type: multiselect
 #. Description
-#: ../xserver-xfree86.templates:66
+#: ../xserver-xorg.templates:66
 msgid ""
 "It is possible to customize (or completely omit) the list of modules that "
 "the X server loads by default.  This option is for advanced users.  In most "
@@ -489,7 +491,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../xserver-xfree86.templates:66
+#: ../xserver-xorg.templates:66
 msgid ""
 "The GLCore and glx modules enable software OpenGL rendering.  The dri module "
 "enables support in the X server for Direct Rendering Infrastructure (DRI). "
@@ -507,7 +509,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../xserver-xfree86.templates:66
+#: ../xserver-xorg.templates:66
 msgid ""
 "The vbe and ddc modules enable support for VESA BIOS Extensions and Data "
 "Display Channel, respectively.  These modules are used to query monitor "
@@ -525,7 +527,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../xserver-xfree86.templates:66
+#: ../xserver-xorg.templates:66
 msgid ""
 "The dbe module enables the double-buffering extension in the server, and is "
 "useful for animation and video operations."
@@ -535,7 +537,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../xserver-xfree86.templates:66
+#: ../xserver-xorg.templates:66
 msgid ""
 "The extmod module enables many traditional and commonly used extensions, "
 "such as shaped windows, shared memory, video mode switching, DGA, and Xv.  "
@@ -549,7 +551,7 @@
 
 #. Type: multiselect
 #. Description
-#: ../xserver-xfree86.templates:66
+#: ../xserver-xorg.templates:66
 msgid ""
 "The bitmap, freetype, speedo, type1, and xtt modules are all font "
 "rasterizers."
@@ -559,16 +561,17 @@
 
 #. Type: multiselect
 #. Description
-#: ../xserver-xfree86.templates:66
+#: ../xserver-xorg.templates:66
+#, fuzzy
 msgid ""
-"For further information about these modules, please consult the XFree86 "
+"For further information about these modules, please consult the X.Org "
 "documentation."
 msgstr ""
 "Để tìm thông tin thêm về những mô-đun này thì hãy xem tài liệu XFree86."
 
 #. Type: multiselect
 #. Description
-#: ../xserver-xfree86.templates:66
+#: ../xserver-xorg.templates:66
 msgid ""
 "If you unsure what to do, leave all of the modules enabled.  Advanced users "
 "may wish to disable all modules -- in which case no Modules section will be "
@@ -582,21 +585,23 @@
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:106
-msgid "Multiple potential default XFree86 server drivers for your hardware."
+#: ../xserver-xorg.templates:106
+#, fuzzy
+msgid "Multiple potential default X.Org server drivers for your hardware."
 msgstr ""
 "Có nhiều trình điều khiển trình hỗ trợ XFree86 mặc định có thể dùng với phần "
 "cứng bạn."
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:106
+#: ../xserver-xorg.templates:106
+#, fuzzy
 msgid ""
 "Multiple video cards have been detected, and different drivers are required "
 "to support the various devices.  It is thus not possible to automatically "
-"select a default XFree86 server driver.  Please configure the device that "
-"will serve as your computer's \"primary head\"; this is generally the video "
-"card and monitor to which the computer displays when it first boots."
+"select a default X.Org server driver.  Please configure the device that will "
+"serve as your computer's \"primary head\"; this is generally the video card "
+"and monitor to which the computer displays when it first boots."
 msgstr ""
 "Đã phát hiện nhiều thẻ ảnh động thì cần phải nhiều trình điều khiển khác để "
 "hỗ trợ những thiết bị khác ấy. Như thế thì không thể tự đông chọn trình điều "
@@ -606,7 +611,7 @@
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:106
+#: ../xserver-xorg.templates:106
 msgid ""
 "At the present time, only a single-headed setup is supported by debconf; "
 "however, the X server configuration files can be edited to support a multi-"
@@ -618,13 +623,13 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:119
+#: ../xserver-xorg.templates:119
 msgid "Enter an identifier for your video card."
 msgstr "Hãy hỗ trợ dấu hiệu nhận diện cho thẻ ảnh động."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:119
+#: ../xserver-xorg.templates:119
 msgid ""
 "The X server configuration file associates your video card with a name that "
 "you may provide.  This is usually the vendor or brand name followed by the "
@@ -636,13 +641,13 @@
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:127
+#: ../xserver-xorg.templates:127
 msgid "Select the desired X server driver."
 msgstr "Hãy chọn trình điều khiển trình hỗ trợ mong muốn."
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:127
+#: ../xserver-xorg.templates:127
 msgid ""
 "For the X Window System graphical user interface to operate correctly, it is "
 "necessary to select a video card driver for the X server."
@@ -652,7 +657,7 @@
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:127
+#: ../xserver-xorg.templates:127
 msgid ""
 "Drivers are typically named for the video card or chipset manufacturer, or "
 "for a specific model or family of chipsets."
@@ -662,13 +667,13 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:136
+#: ../xserver-xorg.templates:136
 msgid "Use kernel framebuffer device interface?"
 msgstr "Dùng giao diện thiết bị đệm khung hạt nhân không?"
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:136
+#: ../xserver-xorg.templates:136
 msgid ""
 "Rather than communicating directly with the video hardware, the X server may "
 "be configured to perform some operations, such as video mode switching, via "
@@ -680,7 +685,7 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:136
+#: ../xserver-xorg.templates:136
 msgid ""
 "In theory, either approach should work, but in practice, sometimes one does "
 "and the other does not.  Enabling this option is the safe bet, but feel free "
@@ -693,13 +698,13 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:147
+#: ../xserver-xorg.templates:147
 msgid "Please enter the video card's bus identifier."
 msgstr "Hãy nhập dấu hiệu nhận diện của mạch nối thẻ ảnh động."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:147
+#: ../xserver-xorg.templates:147
 msgid ""
 "Users of PowerPC machines, and users of any computer with multiple video "
 "devices, should specify the BusID of the video card in an accepted bus-"
@@ -711,14 +716,14 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:147
+#: ../xserver-xorg.templates:147
 msgid "Examples:"
 msgstr "Lời thí dụ:"
 
 # No need to translate/không cần dịch.
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:147
+#: ../xserver-xorg.templates:147
 msgid ""
 " ISA:1\n"
 " PCI:0:16:0\n"
@@ -730,7 +735,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:147
+#: ../xserver-xorg.templates:147
 msgid ""
 "For users of multi-head setups, this option will configure only one of the "
 "heads.  Further configuration will have to be done manually in the X server "
@@ -742,7 +747,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:147
+#: ../xserver-xorg.templates:147
 msgid ""
 "Users of SGI Indigo2 XL machines, or machines with other buses not yet fully "
 "supported, should specify simply \"1\" here.  (This is not guaranteed to "
@@ -754,7 +759,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:147
+#: ../xserver-xorg.templates:147
 msgid ""
 "You may wish to use the \"lspci\" command to determine the bus location of "
 "your PCI or AGP video card.  Keep in mind that lspci reports the bus, "
@@ -767,7 +772,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:147
+#: ../xserver-xorg.templates:147
 msgid ""
 "When possible, this question has been pre-answered for you and you should "
 "accept the default unless you know it doesn't work."
@@ -777,7 +782,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:147
+#: ../xserver-xorg.templates:147
 msgid ""
 "Users of machines other than PowerPCs or SGI Indigo2 XLs with only one video "
 "card should leave this entry blank."
@@ -787,26 +792,26 @@
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:178
+#: ../xserver-xorg.templates:178
 msgid "Please enter a bus identifier in the proper format."
 msgstr "Hãy nhập dấu hiệu nhận diện mạch nối có dạng đúng."
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:178
+#: ../xserver-xorg.templates:178
 msgid "The BusID entered was not in a recognized format."
 msgstr ""
 "Bạn đã nhập BusID (dấu hiệu nhận diện mạch nối) có dạng không được nhận biết."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:183
+#: ../xserver-xorg.templates:183
 msgid "Enter the amount of memory (in kB) to be used by your video card."
 msgstr "Hãy nhập số lượng bộ nhớ (theo kB) mà thẻ ảnh động sẽ dùng."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:183
+#: ../xserver-xorg.templates:183
 msgid ""
 "Typically, the amount of dedicated memory your video card has is "
 "autodetected by the X server, but some integrated video chips (such as the "
@@ -819,7 +824,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:183
+#: ../xserver-xorg.templates:183
 msgid ""
 "It is perfectly acceptable to leave this parameter blank; only if your video "
 "card lacks RAM, or if the X server has trouble autodetecting the amount, is "
@@ -831,13 +836,13 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:200
+#: ../xserver-xorg.templates:200
 msgid "Please select the XKB rule set to use."
 msgstr "Hãy chọn bộ quy tắc XKB cần dùng."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:200
+#: ../xserver-xorg.templates:200
 msgid ""
 "For the X server to handle your keyboard correctly, an XKB rule set must be "
 "chosen."
@@ -847,17 +852,18 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:200
+#: ../xserver-xorg.templates:200
+#, fuzzy
 msgid ""
-"Users of most keyboards should enter \"xfree86\".  Users of Sun Type 4 and "
-"Type 5 keyboards, however, should enter \"sun\"."
+"Users of most keyboards should enter \"xorg\".  Users of Sun Type 4 and Type "
+"5 keyboards, however, should enter \"sun\"."
 msgstr ""
 "Người dùng hầu hết bàn phím nên nhập \"xfree86\". Chỉ người dùng bàn phím "
 "Sun Type 4 hay Type 5 (Kiểu 4 hay 5) nên nhập \"sun\"."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:200
+#: ../xserver-xorg.templates:200
 msgid ""
 "Advanced users can use any defined XKB rule set.  If the xlibs package has "
 "been unpacked, see the /etc/X11/xkb/rules directory for available rule sets."
@@ -868,19 +874,20 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:200
-msgid "If you don't know what rule set to use, enter \"xfree86\"."
+#: ../xserver-xorg.templates:200
+#, fuzzy
+msgid "If you don't know what rule set to use, enter \"xorg\"."
 msgstr "Nếu bạn không biết nên sử dụng bộ quy tắc nào, hãy nhập \"xfree86\"."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:214
+#: ../xserver-xorg.templates:214
 msgid "Please select your keyboard model."
 msgstr "Hãy chọn kiểu bàn phím của bạn."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:214
+#: ../xserver-xorg.templates:214
 msgid ""
 "For the X server to handle your keyboard correctly, a keyboard model must be "
 "entered.  Available models depend on which XKB rule set is in use."
@@ -890,7 +897,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:214
+#: ../xserver-xorg.templates:214
 msgid ""
 "The \"pc101\" keyboard is a traditional IBM PC/AT style keyboard with 101 "
 "keys, historically common in the United States.  It does not have the \"logo"
@@ -901,7 +908,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:214
+#: ../xserver-xorg.templates:214
 msgid ""
 "The \"pc104\" keyboard is like the pc101 model, with additional keys.  These "
 "keys are usually engraved with a \"logo\" symbol (there is typically a pair "
@@ -912,7 +919,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:214
+#: ../xserver-xorg.templates:214
 msgid ""
 "The \"pc102\" and \"pc105\" models are versions of the pc101 and pc104 "
 "keyboards, respectively, often found in Europe.  If your keyboard has a \"< >"
@@ -928,7 +935,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:214
+#: ../xserver-xorg.templates:214
 msgid ""
 "The \"macintosh\" model is for Macintosh keyboards where the kernel and "
 "console tools use the new input layer which uses Linux keycodes; "
@@ -941,13 +948,14 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:214
-msgid "All of the above models use the \"xfree86\" rule set."
+#: ../xserver-xorg.templates:214
+#, fuzzy
+msgid "All of the above models use the \"xorg\" rule set."
 msgstr "Tất cả những kiểu ở trên dùng bộ quy tắc \"xfree86\"."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:214
+#: ../xserver-xorg.templates:214
 msgid ""
 "The \"type4\" and \"type5\" models are for Sun Type4 and Type5 keyboards, "
 "respectively.  These models can only be used if the \"sun\" XKB rule set is "
@@ -958,7 +966,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:214
+#: ../xserver-xorg.templates:214
 msgid ""
 "Laptop keyboards often do not have as many keys as standalone models; laptop "
 "users should select the keyboard model most closely approximated by the "
@@ -969,7 +977,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:214
+#: ../xserver-xorg.templates:214
 msgid ""
 "Advanced users can use any model defined by the selected XKB rule set.  If "
 "the xlibs package has been unpacked, see the /etc/X11/xkb/rules directory "
@@ -981,19 +989,19 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:214
+#: ../xserver-xorg.templates:214
 msgid "Users of U.S. English keyboards should generally enter \"pc104\"."
 msgstr "Người dùng bàn phím tiếng Anh Mỹ nên thường nhập \"pc104\"."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:254
+#: ../xserver-xorg.templates:254
 msgid "Please select your keyboard layout."
 msgstr "Hãy chọn bố trí bàn phím."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:254
+#: ../xserver-xorg.templates:254
 msgid ""
 "For the X server to handle your keyboard correctly, a keyboard layout must "
 "be entered.  Available layouts depend on which XKB rule set and keyboard "
@@ -1005,7 +1013,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:254
+#: ../xserver-xorg.templates:254
 msgid ""
 "Advanced users can use any layout supported by the selected XKB rule set.  "
 "If the xlibs package has been unpacked, see the /etc/X11/xkb/rules directory "
@@ -1019,7 +1027,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:254
+#: ../xserver-xorg.templates:254
 msgid ""
 "Users of U.S. English keyboards should enter \"us\".  Users of keyboards "
 "localized for other countries should generally enter their ISO 3166 country "
@@ -1031,13 +1039,13 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:270
+#: ../xserver-xorg.templates:270
 msgid "Please select your keyboard variant."
 msgstr "Hãy chọn biến thể bàn phím."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:270
+#: ../xserver-xorg.templates:270
 msgid ""
 "For the X server to handle your keyboard as you desire, a keyboard variant "
 "may be entered.  Available variants depend on which XKB rule set, model, and "
@@ -1049,7 +1057,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:270
+#: ../xserver-xorg.templates:270
 msgid ""
 "Many keyboard layouts support an option to treat \"dead\" keys such as non-"
 "spacing accent marks and diaereses as normal spacing keys, and if this is "
@@ -1062,7 +1070,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:270
+#: ../xserver-xorg.templates:270
 msgid ""
 "Advanced users can use any variant supported by the selected XKB layout.  If "
 "the xlibs package has been unpacked, see the /etc/X11/xkb/symbols directory "
@@ -1075,20 +1083,20 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:270
+#: ../xserver-xorg.templates:270
 msgid ""
 "Users of U.S. English keyboards should generally leave this entry blank."
 msgstr "Người dùng bàn phím tiếng Anh Mỹ thường nên bỏ mục này rỗng."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:287
+#: ../xserver-xorg.templates:287
 msgid "Please select your keyboard options."
 msgstr "Hãy chọn tùy chọn bàn phím."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:287
+#: ../xserver-xorg.templates:287
 msgid ""
 "For the X server to handle your keyboard as you desire, keyboard options may "
 "be entered.  Available options depend on which XKB rule set was previously "
@@ -1101,7 +1109,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:287
+#: ../xserver-xorg.templates:287
 msgid ""
 "For example, if you wish the Caps Lock key to behave as an additional "
 "Control key, you may enter \"ctrl:nocaps\"; if you would like to switch the "
@@ -1113,7 +1121,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:287
+#: ../xserver-xorg.templates:287
 msgid ""
 "As another example, some people prefer having the Meta keys available on "
 "their keyboard's Alt keys (this is the default), while other people prefer "
@@ -1128,7 +1136,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:287
+#: ../xserver-xorg.templates:287
 msgid ""
 "You can combine options by separating them with a comma; for example, if you "
 "wish the Caps Lock key to behave as an additional Control key and you would "
@@ -1141,7 +1149,7 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:287
+#: ../xserver-xorg.templates:287
 msgid ""
 "Advanced users can use any options compatible with the selected XKB model, "
 "layout and variant.  If the xlibs package has been unpacked, see the /etc/"
@@ -1155,19 +1163,19 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:287
+#: ../xserver-xorg.templates:287
 msgid "If you don't know what options to use, leave this entry blank."
 msgstr "Nếu bạn không biết nhập gì, hãy để mục này rỗng."
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:317
+#: ../xserver-xorg.templates:317
 msgid "Attempt mouse device autodetection?"
 msgstr "Cố tự động phát hiện thiết bị con chuột không?"
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:317
+#: ../xserver-xorg.templates:317
 msgid ""
 "If you have a mouse attached to the computer, an attempt to detect it can be "
 "made; it may help to move the mouse while detection is attempted (also, the "
@@ -1185,7 +1193,7 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:317
+#: ../xserver-xorg.templates:317
 msgid ""
 "If you accept this option and autodetection fails, you will be asked this "
 "question again.  You may attempt autodetection as many times as desired.  If "
@@ -1199,13 +1207,13 @@
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:333
+#: ../xserver-xorg.templates:333
 msgid "Please choose your mouse port."
 msgstr "Hãy chọn cổng con chuột."
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:333
+#: ../xserver-xorg.templates:333
 msgid ""
 "For the X Window System graphical user interface to operate correctly, "
 "certain characteristics of your mouse (or other pointing device, such as a "
@@ -1217,7 +1225,7 @@
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:333
+#: ../xserver-xorg.templates:333
 msgid ""
 "It is necessary to determine which port (connection type) your mouse uses. "
 "Serial ports use D-shaped connectors with 9 or 25 pins (a.k.a. DB-9 or DB-"
@@ -1240,19 +1248,19 @@
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:351
+#: ../xserver-xorg.templates:351
 msgid "Please choose the entry that best describes your mouse."
 msgstr "Hãy chọn mục diễn tả con chuột bạn một cách tốt nhất."
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:356
+#: ../xserver-xorg.templates:356
 msgid "Emulate 3 button mouse?"
 msgstr "Mô phỏng con chuột ba nút không?"
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:356
+#: ../xserver-xorg.templates:356
 msgid ""
 "Most programs in the X Window System expect your mouse to have 3 buttons "
 "(left, right, and middle).  Mice with only 2 buttons can emulate the "
@@ -1266,7 +1274,7 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:356
+#: ../xserver-xorg.templates:356
 msgid ""
 "This option may also be used on mice with 3 or more buttons; the middle "
 "button will continue to work normally."
@@ -1276,13 +1284,13 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:372
+#: ../xserver-xorg.templates:372
 msgid "Enable scroll events from mouse wheel?"
 msgstr "Hiệu lực sự kiện cuộn từ bánh xe lăn nhỏ trên con chuột không?"
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:372
+#: ../xserver-xorg.templates:372
 msgid ""
 "Events from a wheeled mouse's wheel can be treated as clicks of additional "
 "buttons (buttons 4 and 5).  Some X applications treat buttons 4 and 5 as "
@@ -1300,7 +1308,7 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:372
+#: ../xserver-xorg.templates:372
 msgid "Enabling this option is harmless if your mouse has no scroll wheel."
 msgstr ""
 "Hiệu lực tùy chọn này là vô hại nếu con chuột bạn không có bánh xe lăn nhỏ "
@@ -1308,7 +1316,7 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:372
+#: ../xserver-xorg.templates:372
 msgid ""
 "Note that mouse buttons in excess of five (counting a scroll wheel as two "
 "buttons, one each for \"up\" and \"down\", and a third if the wheel \"clicks"
@@ -1320,13 +1328,13 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:389
+#: ../xserver-xorg.templates:389
 msgid "Attempt monitor autodetection?"
 msgstr "Cố tự động phát hiện màn hình không?"
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:389
+#: ../xserver-xorg.templates:389
 msgid ""
 "Many monitors (including LCD's) and video cards support a communication "
 "protocol that allows the monitor's technical characteristics to be "
@@ -1341,7 +1349,7 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:389
+#: ../xserver-xorg.templates:389
 msgid ""
 "If you have an NVidia video card, you may want to decline this option, as "
 "these cards' support for the DDC protocol is often so poor that attempts to "
@@ -1353,7 +1361,7 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:389
+#: ../xserver-xorg.templates:389
 msgid ""
 "If autodetection fails, you will be asked for information about your monitor."
 msgstr ""
@@ -1361,13 +1369,13 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:405
+#: ../xserver-xorg.templates:405
 msgid "Is your monitor an LCD device?"
 msgstr "Màn hình bạn là thiết bị LCD không? "
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:405
+#: ../xserver-xorg.templates:405
 msgid ""
 "If your monitor is a liquid-crystal display (which is the case with almost "
 "all laptops), you should set this option."
@@ -1378,7 +1386,7 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:405
+#: ../xserver-xorg.templates:405
 msgid ""
 "Users of traditional cathode-ray tube (CRT) monitors should not set this "
 "option."
@@ -1388,13 +1396,13 @@
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:415
+#: ../xserver-xorg.templates:415
 msgid "Please choose a method for selecting your monitor characteristics."
 msgstr "Hãy chọn phương pháp chọn các đặc tuyến của màn hình ban."
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:415
+#: ../xserver-xorg.templates:415
 msgid ""
 "For the X Window System graphical user interface to operate correctly, "
 "certain characteristics of your monitor must be known."
@@ -1404,7 +1412,7 @@
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:415
+#: ../xserver-xorg.templates:415
 msgid ""
 "For the \"simple\" option, you need only know the monitor's physical size; "
 "this will set some configuration values appropriate for a typical CRT of the "
@@ -1420,7 +1428,7 @@
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:415
+#: ../xserver-xorg.templates:415
 msgid ""
 "The \"medium\" option will present you with a list of resolutions and "
 "refresh rates, such as \"800x600 @ 85Hz\"; you should choose the best mode "
@@ -1432,7 +1440,7 @@
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:415
+#: ../xserver-xorg.templates:415
 msgid ""
 "The \"advanced\" option will let you specify your monitor's horizontal sync "
 "and vertical refresh tolerances directly."
@@ -1443,7 +1451,7 @@
 
 #. Type: select
 #. Choices
-#: ../xserver-xfree86.templates:434
+#: ../xserver-xorg.templates:434
 msgid ""
 "Up to 14 inches (355 mm), 15 inches (380 mm), 17 inches (430 mm), 19-20 "
 "inches (480-510 mm), 21 inches (530 mm) or more"
@@ -1453,26 +1461,26 @@
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:436
+#: ../xserver-xorg.templates:436
 msgid "Please choose your approximate monitor size."
 msgstr "Hãy chọn kích thước xấp xỉ màn hình bạn."
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:436
+#: ../xserver-xorg.templates:436
 msgid "High-quality CRT's may be able to use the next highest size category."
 msgstr ""
 "Màn hình CRT có chất lượng cao thì có lẽ sẽ dùng loại kích thước kế tiếp."
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:443
+#: ../xserver-xorg.templates:443
 msgid "Please select your monitor's best video mode."
 msgstr "Hãy chọn chế độ ảnh động tốt nhất của màn hình bạn."
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:443
+#: ../xserver-xorg.templates:443
 msgid ""
 "Choose the \"best\" resolution and refresh rate you believe your monitor "
 "capable of.  Larger resolutions and refresh rates are better.  If you use a "
@@ -1492,13 +1500,13 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:453
+#: ../xserver-xorg.templates:453
 msgid "Enter an identifier for your monitor."
 msgstr "Hãy nhập dấu hiệu nhận diện cho màn hình bạn."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:453
+#: ../xserver-xorg.templates:453
 msgid ""
 "The X server configuration file associates your monitor with a name that you "
 "may provide.  This is usually the vendor or brand name followed by the model "
@@ -1508,15 +1516,31 @@
 "bạn có lẽ cung cấp. Tên này thường là tên nhà bán hay tên nhãn hiệu, với tên "
 "kiểu theo sau, v.d. \"Sony E200\" hay \"Dell E770s\"."
 
+#. Type: boolean
+#. Description
+#: ../xserver-xorg.templates:460
+#, fuzzy
+msgid "Write monitor sync ranges to configuration file?"
+msgstr "Ghi phần DRI mặc định vào tập tin cấu hình không?"
+
+#. Type: boolean
+#. Description
+#: ../xserver-xorg.templates:460
+msgid ""
+"The monitor synchronization ranges should be autodetected by the X server in "
+"most cases, but sometimes it needs hinting.  This option is for advanced "
+"users, and should be left at its default."
+msgstr ""
+
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:460
+#: ../xserver-xorg.templates:467
 msgid "Enter your monitor's horizontal sync range."
 msgstr "Hãy nhập phạm vị đồng bộ ngang cho màn hình bạn."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:460
+#: ../xserver-xorg.templates:467
 msgid ""
 "Please enter either a comma-separated list of discrete values (for fixed-"
 "frequency displays), or a pair of values separated by a dash (all modern "
@@ -1531,13 +1555,13 @@
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:468
+#: ../xserver-xorg.templates:475
 msgid "Enter your monitor's vertical refresh range."
 msgstr "Hãy nhập phạm vị cập nhật dọc cho màn hình bạn."
 
 #. Type: string
 #. Description
-#: ../xserver-xfree86.templates:468
+#: ../xserver-xorg.templates:475
 msgid ""
 "Please enter either a comma-separated list of discrete values (for fixed-"
 "frequency displays), or a pair of values separated by a dash (all modern "
@@ -1552,13 +1576,13 @@
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:476
+#: ../xserver-xorg.templates:483
 msgid "Please enter a comma-separated list of ranges or values."
 msgstr "Hãy nhập danh sách phạm vị hay giá trị định giới bằng dấu phẩy."
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:476
+#: ../xserver-xorg.templates:483
 msgid ""
 "The valid syntax is a comma-separated list of discrete values, or a pair of "
 "values separated by a dash."
@@ -1568,13 +1592,13 @@
 
 #. Type: multiselect
 #. Description
-#: ../xserver-xfree86.templates:484
+#: ../xserver-xorg.templates:491
 msgid "Select the video modes you would like the X server to use."
 msgstr "Hãy chọn các chế độ ảnh động mà bạn muốn trình hỗ trợ X dùng."
 
 #. Type: multiselect
 #. Description
-#: ../xserver-xfree86.templates:484
+#: ../xserver-xorg.templates:491
 msgid ""
 "If there are some resolutions you would not like the X server to use even if "
 "your hardware is capable of them, remove them from the list below.  Removing "
@@ -1588,13 +1612,13 @@
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:494
+#: ../xserver-xorg.templates:501
 msgid "Please select your desired default color depth in bits."
 msgstr "Hãy chọn độ sâu màu mặc định đã muốn, theo bit."
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:494
+#: ../xserver-xorg.templates:501
 msgid ""
 "Usually 24-bit color is desirable, but on graphics cards with limited "
 "amounts of framebuffer memory, higher resolutions may be achieved at the "
@@ -1610,7 +1634,7 @@
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:494
+#: ../xserver-xorg.templates:501
 msgid ""
 "Note that on some old ATI hardware, such as the Mach8 (VGA Wonder), Mach32, "
 "and early Mach64 (\"GX\") chipsets, depths higher than 8 are unsupported."
@@ -1620,7 +1644,7 @@
 
 #. Type: select
 #. Description
-#: ../xserver-xfree86.templates:494
+#: ../xserver-xorg.templates:501
 msgid ""
 "(So-called \"32-bit color\" is actually 24 bits of color information plus 8 "
 "bits of alpha channel or simple zero padding; the X Window System can handle "
@@ -1632,13 +1656,13 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:510
+#: ../xserver-xorg.templates:517
 msgid "Write default DRI section to configuration file?"
 msgstr "Ghi phần DRI mặc định vào tập tin cấu hình không?"
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:510
+#: ../xserver-xorg.templates:517
 msgid ""
 "The DRI section of the X server configuration file determines the "
 "permissions of the DRI device.  This option is for advanced users.  In most "
@@ -1650,10 +1674,11 @@
 
 #. Type: boolean
 #. Description
-#: ../xserver-xfree86.templates:510
+#: ../xserver-xorg.templates:517
+#, fuzzy
 msgid ""
-"Disable this option if you want to write your own \"DRI\" section into the "
-"XFree86 server configuration file.  You may wish to do this if you want to "
+"Disable this option if you want to write your own \"DRI\" section into the X."
+"Org server configuration file.  You may wish to do this if you want to "
 "change the access privileges to the DRI port."
 msgstr ""
 "Hãy vô hiệu hóa tùy chọn này nếu bạn muốn ghi phần \"DRI\" tự chọn vào tập "
@@ -1662,36 +1687,36 @@
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:521
+#: ../xserver-xorg.templates:528
 msgid "Please enter a value for the entry."
 msgstr "Hãy nhập giá trị cho mục ấy."
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:521
+#: ../xserver-xorg.templates:528
 msgid "A null entry is not permitted."
 msgstr "Không cho phép mục rỗng."
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:526
+#: ../xserver-xorg.templates:533
 msgid "Please enter a value without double-quotes."
 msgstr "Hãy nhập giá trị không có dấu trích dẫn."
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:526
+#: ../xserver-xorg.templates:533
 msgid "Double-quote (\") characters are not permitted in the entry value."
 msgstr "Không cho phép \"dấu trích dẫn\" trong giá trị mục ấy."
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:531
+#: ../xserver-xorg.templates:538
 msgid "Please enter only a numeric value."
 msgstr "Hãy nhập chỉ giá trị thuộc số."
 
 #. Type: note
 #. Description
-#: ../xserver-xfree86.templates:531
+#: ../xserver-xorg.templates:538
 msgid "Characters other than digits are not allowed in the entry."
 msgstr "Không cho phép ký tự khác với số trong mục ấy."



Reply to: