xorg: Changes to 'debian-unstable'

David Nusinow Mon, 23 Apr 2007 21:30:11 -0700

 debian/changelog                   |   59 +++++++++++++++++++++++++++++++++++--
 debian/control                     |    8 ++---
 debian/local/dexconf               |   39 +++---------------------
 debian/local/xserver-wrapper.c     |   49 +++++++++++++++++++++++-------
 debian/scripts/vars                |    2 -
 debian/scripts/vars.alpha          |    2 -
 debian/scripts/vars.amd64          |    2 -
 debian/scripts/vars.arm            |    2 -
 debian/scripts/vars.armeb          |    2 -
 debian/scripts/vars.hurd-i386      |    2 -
 debian/scripts/vars.i386           |    2 -
 debian/scripts/vars.kfreebsd-amd64 |    9 +++++
 debian/scripts/vars.kfreebsd-i386  |   10 ++++++
 debian/scripts/vars.m32r           |    2 -
 debian/scripts/vars.m68k           |    2 -
 debian/scripts/vars.mips           |    2 -
 debian/scripts/vars.mipsel         |    2 -
 debian/x11-common.config.in        |    4 +-
 debian/xserver-xorg.postinst.in    |   50 -------------------------------
 debian/xserver-xorg.templates      |   26 ----------------
 20 files changed, 136 insertions(+), 140 deletions(-)


New commits:
commit ac48e719241f2901b3e995794b59f94c33800f2c
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Apr 24 00:14:25 2007 -0400

    Merge changelog entries in to 7.2

diff --git a/debian/changelog b/debian/changelog
index 900289e..9ef8c2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg (1:7.1.0-19) UNRELEASED; urgency=low
+xorg (1:7.2-3) UNRELEASED; urgency=low
 
+  [ Christian Perrier ]
   * Debconf templates proofread by the debian-l10n-english team
     Closes: #418007
   * Debconf translations:
@@ -26,10 +27,6 @@ xorg (1:7.1.0-19) UNRELEASED; urgency=low
     - Hungarian. Closes: #420116
     - German
 
- -- Christian Perrier <[EMAIL PROTECTED]>  Tue, 10 Apr 2007 14:28:36 +0200
-
-xorg (1:7.2-3) UNRELEASED; urgency=low
-
   [ David Nusinow ]
   * Don't write the DRI section to xorg.conf. We now ship a default mode in
     libdrm as of libdrm 2.3.0-3, so we don't need to do this. Users can still
@@ -38,7 +35,7 @@ xorg (1:7.2-3) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * xorg recommends libgl1-mesa-dri instead of depending on it.
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Sat, 21 Apr 2007 23:13:17 +0200
+ -- David Nusinow <[EMAIL PROTECTED]>  Tue, 24 Apr 2007 00:13:52 -0400
 
 xorg (1:7.2-2) experimental; urgency=low
 

commit 99b68691d8c903fbc459cf1f8233481cdaab4fed
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Apr 21 23:14:46 2007 +0200

    xorg recommends libgl1-mesa-dri instead of depending on it.

diff --git a/debian/changelog b/debian/changelog
index 01d30ac..4a8bca5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 xorg (1:7.2-3) UNRELEASED; urgency=low
 
+  [ David Nusinow ]
   * Don't write the DRI section to xorg.conf. We now ship a default mode in
     libdrm as of libdrm 2.3.0-3, so we don't need to do this. Users can still
     override the default mode in their xorg.conf's if they choose
 
- -- David Nusinow <[EMAIL PROTECTED]>  Sun, 15 Apr 2007 13:42:02 -0400
+  [ Julien Cristau ]
+  * xorg recommends libgl1-mesa-dri instead of depending on it.
+
+ -- Julien Cristau <[EMAIL PROTECTED]>  Sat, 21 Apr 2007 23:13:17 +0200
 
 xorg (1:7.2-2) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index f9e7540..ba3f6a8 100644
--- a/debian/control
+++ b/debian/control
@@ -114,7 +114,8 @@ Description: the X.Org X server -- input driver metapackage
 
 Package: xorg
 Architecture: all
-Depends: xserver-xorg, libgl1-mesa-glx, libgl1-mesa-dri, libglu1-mesa, 
xfonts-base (>= 1:1.0.0-1), xfonts-100dpi (>= 1:1.0.0-1), xfonts-75dpi (>= 
1:1.0.0-1), xfonts-scalable (>= 1:1.0.0-1), xbase-clients (>= 1:1.0.1-1), 
xutils (>= 1:1.0.1-1), xkb-data, xterm | x-terminal-emulator, sparc-utils | 
not+sparc, xorg-docs
+Depends: xserver-xorg, libgl1-mesa-glx, libglu1-mesa, xfonts-base (>= 
1:1.0.0-1), xfonts-100dpi (>= 1:1.0.0-1), xfonts-75dpi (>= 1:1.0.0-1), 
xfonts-scalable (>= 1:1.0.0-1), xbase-clients (>= 1:1.0.1-1), xutils (>= 
1:1.0.1-1), xkb-data, xterm | x-terminal-emulator, sparc-utils | not+sparc, 
xorg-docs
+Recommends: libgl1-mesa-dri
 Provides: x-window-system, x-window-system-core
 Description: X.Org X Window System
  This metapackage provides the components for a standalone

commit ac3bb8a797b09ed7530f082149052671bb31c54b
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Apr 15 13:43:16 2007 -0400

    * Don't write the DRI section to xorg.conf. We now ship a default mode in
      libdrm as of libdrm 2.3.0-3, so we don't need to do this. Users can still
      override the default mode in their xorg.conf's if they choose

diff --git a/debian/changelog b/debian/changelog
index e67d317..01d30ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.2-3) UNRELEASED; urgency=low
+
+  * Don't write the DRI section to xorg.conf. We now ship a default mode in
+    libdrm as of libdrm 2.3.0-3, so we don't need to do this. Users can still
+    override the default mode in their xorg.conf's if they choose
+
+ -- David Nusinow <[EMAIL PROTECTED]>  Sun, 15 Apr 2007 13:42:02 -0400
+
 xorg (1:7.2-2) experimental; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/local/dexconf b/debian/local/dexconf
index e835e21..48e0b27 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -160,7 +160,7 @@ fi
 # xorg.conf sections:
 #   Files          File pathnames
 #   ServerFlags    Server flags                      NOT USED BY DEXCONF
-#   Module         Dynamic module loading
+#   Module         Dynamic module loading            NOT USED BY DEXCONF
 #   InputDevice    Input device description
 #   Device         Graphics device description
 #   VideoAdaptor   Xv video adaptor description      NOT USED BY DEXCONF
@@ -168,7 +168,7 @@ fi
 #   Modes          Video modes descriptions          NOT USED BY DEXCONF
 #   Screen         Screen configuration
 #   ServerLayout   Overall layout
-#   DRI            DRI-specific configuration
+#   DRI            DRI-specific configuration        NOT USED BY DEXCONF
 #   Vendor         Vendor-specific configuration     NOT USED BY DEXCONF
 
 ### HEADER
@@ -399,14 +399,6 @@ if [ -n "$LAPTOP" ]; then
 fi
 printf "EndSection\n" >&4
 
-### DRI
-exec 4>"$DEXCONFTMPDIR/DRI"
-cat >&4 <<SECTION
-Section "DRI"
-       Mode    0666
-EndSection
-SECTION
-
 # Close file descriptor 4 before we delete temporary files
 exec 4<&-
 
@@ -422,7 +414,7 @@ umask 022
 
 SPACER=
 for SECTION in Header Files InputDeviceKeyboard InputDeviceMouse \
-               Device Monitor Screen ServerLayout DRI; do
+               Device Monitor Screen ServerLayout; do
   if [ -e "$DEXCONFTMPDIR/$SECTION" ]; then
     eval $SPACER
     cat "$DEXCONFTMPDIR/$SECTION" >>"$OUTFILE"

commit d6d092980fba60e8dd6693508806377a35555c14
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Apr 15 11:48:06 2007 -0400

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index d014d6a..e67d317 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.2-2) UNRELEASED; urgency=low
+xorg (1:7.2-2) experimental; urgency=low
 
   [ Julien Cristau ]
   * Add support for kfreebsd-{amd64,i386} (closes: #363910).  Thanks,
@@ -30,7 +30,7 @@ xorg (1:7.2-2) UNRELEASED; urgency=low
     disabled in xorg.conf. This will require xserver-xorg-core 2:1.2.99.905-3
     so bump the versioned dependency to it.
 
- -- David Nusinow <[EMAIL PROTECTED]>  Sat, 14 Apr 2007 12:55:21 -0400
+ -- David Nusinow <[EMAIL PROTECTED]>  Sun, 15 Apr 2007 11:44:28 -0400
 
 xorg (1:7.2-1) experimental; urgency=low
 

commit 200301f5de14eb6d4e63edd0b00b6e399959dbf7
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Apr 15 11:13:18 2007 -0400

    * Remove code from dexconf, xserver-xorg.templates, and
      xserver-xorg.postinst to process the module list. The server will now have
      a default set of modules to be loaded and those can be added to or
      disabled in xorg.conf. This will require xserver-xorg-core 2:1.2.99.905-3
      so bump the versioned dependency to it.

diff --git a/debian/changelog b/debian/changelog
index cb229ab..d014d6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,8 +24,13 @@ xorg (1:7.2-2) UNRELEASED; urgency=low
   [ David Nusinow ]
   * Add xserver-xorg-input-evtouch to the dependency list for
     xserver-xorg-input-all
+  * Remove code from dexconf, xserver-xorg.templates, and
+    xserver-xorg.postinst to process the module list. The server will now have
+    a default set of modules to be loaded and those can be added to or
+    disabled in xorg.conf. This will require xserver-xorg-core 2:1.2.99.905-3
+    so bump the versioned dependency to it.
 
- -- David Nusinow <[EMAIL PROTECTED]>  Sun, 01 Apr 2007 21:53:18 -0400
+ -- David Nusinow <[EMAIL PROTECTED]>  Sat, 14 Apr 2007 12:55:21 -0400
 
 xorg (1:7.2-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 21ac362..f9e7540 100644
--- a/debian/control
+++ b/debian/control
@@ -79,7 +79,7 @@ Architecture: all
 Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
 Replaces: xserver-common
 Pre-Depends: x11-common (>= 7.0.0-0ubuntu3)
-Depends: xserver-xorg-core (>= 2:1.1.1-11), xserver-xorg-video-all | 
xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input, 
${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
+Depends: xserver-xorg-core (>= 2:1.2.99.905-3), xserver-xorg-video-all | 
xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input, 
${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
 Recommends: xserver-xorg-video-all, xserver-xorg-input-all, laptop-detect, 
xresprobe, mdetect, discover1 | discover
 Description: the X.Org X server
  This package depends on the full suite of the server and drivers for the
@@ -87,8 +87,7 @@ Description: the X.Org X server
  xorg.conf.  It does not provide the actual server itself, but removing it
  is strongly discouraged.
 # versioned dependency on xserver-xorg-core needed because xserver-xorg
-# contains a symlink to the reportbug script shipped in that package starting
-# with 2:1.1.1-11
+# contains a patch to allow in-server module defaults in 2:1.2.99.905-3
 
 
 Package: xserver-xfree86
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 5bbdb5f..e835e21 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -229,20 +229,6 @@ EndSection
 SECTION
 fi
 
-### MODULE
-
-# The module list is permitted to be null.
-db_get xserver-$SERVER/config/modules || true
-if [ -n "$RET" ]; then
-  MODULES=$(list_convert "$RET")
-  exec 4>"$DEXCONFTMPDIR/Module"
-  printf "Section \"Module\"\n" >&4
-  for MODULE in $MODULES; do
-    printf "\tLoad\t$MODULE\n" >&4
-  done
-  printf "EndSection\n" >&4
-fi
-
 ### KEYBOARD / INPUTDEVICE
 
 fetch xserver-$SERVER/config/inputdevice/keyboard/rules
@@ -435,7 +421,7 @@ umask 022
 : >"$OUTFILE"
 
 SPACER=
-for SECTION in Header Files Module InputDeviceKeyboard InputDeviceMouse \
+for SECTION in Header Files InputDeviceKeyboard InputDeviceMouse \
                Device Monitor Screen ServerLayout DRI; do
   if [ -e "$DEXCONFTMPDIR/$SECTION" ]; then
     eval $SPACER
diff --git a/debian/po/ar.po b/debian/po/ar.po
index 2abd3c8..424e2ce 100644
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xserver-xorg_po\n"
 "Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2007-03-29 21:29+0200\n"
+"POT-Creation-Date: 2007-04-15 11:02-0400\n"
 "PO-Revision-Date: 2006-11-06 01:00+0300\n"
 "Last-Translator: Ossama M. Khayat <[EMAIL PROTECTED]>\n"
 "Language-Team: Arabic <[EMAIL PROTECTED]>\n"
@@ -100,7 +100,7 @@ msgstr "ÙÙØ§Ù Ø¹Ø¯Ø© Ø®Ø§Ø¯ÙØ§Øª X Ø§ÙØªØ±Ø§Ø¶ÙØ© 
ÙØØªÙÙØ© ÙØ¹ØªØ§Ø¯Ù
 #. Description
 #. Type: note
 #. Description
-#: ../xserver-xorg.templates:4001 ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:4001 ../xserver-xorg.templates:7001
 msgid ""
 "Multiple video cards have been detected, and different X servers are "
 "required to support the various devices.  It is thus not possible to "
@@ -113,7 +113,7 @@ msgstr ""
 #. Description
 #. Type: note
 #. Description
-#: ../xserver-xorg.templates:4001 ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:4001 ../xserver-xorg.templates:7001
 msgid ""
 "Please configure the device that will serve as this computer's \"primary head"
 "\"; this is generally the video card and monitor used for display when the "
@@ -126,7 +126,7 @@ msgstr ""
 #. Description
 #. Type: note
 #. Description
-#: ../xserver-xorg.templates:4001 ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:4001 ../xserver-xorg.templates:7001
 msgid ""
 "The configuration process currently only supports single-headed setups; "
 "however, the X server configuration files can be edited later to support a "
@@ -195,81 +195,21 @@ msgstr ""
 "Org.  ÙØ¯ ØªØØªØ§Ø¬ ÙÙØ°Ø§ ÙØ¥Ø²Ø§ÙØ© Ø§ÙØ±Ø§Ø¨Ø· ÙØ®Ø§Ø¯Ù Ø§ÙØ®Ø· 
Ø§ÙÙØÙÙØ ÙØ§Ø³ØªØ¨Ø¯Ø§ÙÙ Ø¨Ø®Ø§Ø¯Ù Ø®Ø· Ø¢Ø®Ø±Ø "
 "Ø£Ù ÙØ¥Ø¹Ø§Ø¯Ø© ØªØ±ØªÙØ¨ Ø§ÙÙØ¬ÙÙØ¹Ø© Ø§ÙØ§ÙØªØ±Ø§Ø¶ÙØ© 
ÙÙØ³Ø§Ø±Ø§Øª Ø§ÙØ®Ø·ÙØ· Ø§ÙÙØÙÙØ©."
 
-#. Type: multiselect
-#. Description
-#: ../xserver-xorg.templates:7001
-msgid "X.Org server modules that should be loaded by default:"
-msgstr "ÙØØ¯Ø§Øª Ø®Ø§Ø¯Ù X.Org Ø§ÙØªÙ ÙØ¬Ø¨ ØªØÙÙÙÙØ§ Ø¨Ø´ÙÙ 
ÙÙØªØ±Ø¶:"
-
-#. Type: multiselect
-#. Description
-#: ../xserver-xorg.templates:7001
-msgid ""
-"This option is recommended to experienced users only.  In most cases, all of "
-"these modules should be enabled."
-msgstr ""
-"ÙØ°Ø§ Ø§ÙØ®ÙØ§Ø± ÙØ³ØªØØ³Ù ÙÙØ· ÙÙÙØ³ØªØ®Ø¯ÙÙÙ Ø§ÙØ®Ø¨Ø±Ø§Ø¡ 
ÙÙØ·. ÙÙ ÙØ¹Ø¸Ù Ø§ÙØØ§ÙØ§Øª. Ø¬ÙÙØ¹ ÙØ°Ù "
-"Ø§ÙÙØØ¯Ø§Øª ÙØ¬Ø¨ ØªÙÙÙÙÙØ§."
-
-#. Type: multiselect
-#. Description
-#: ../xserver-xorg.templates:7001
-#, fuzzy
-msgid ""
-" - glx   : support for OpenGL rendering;\n"
-" - dri   : support in the X server for DRI (Direct Rendering "
-"Infrastructure);\n"
-" - vbe   : support for VESA BIOS Extensions. Allows to query\n"
-"           the monitor capabilities via the video card;\n"
-" - int10 : real-mode x86 emulator used to softboot secondary VGA cards.\n"
-"           Should be enabled if vbe is enabled;\n"
-" - dbe   : enables the double-buffering extension in the server.\n"
-"           Useful for animation and video operations;\n"
-" - extmod: enables many traditional and commonly used extensions, such as\n"
-"           shaped windows, shared memory, video mode switching, DGA, and "
-"Xv;\n"
-" - record: implements the RECORD extension, often used in server testing;\n"
-" - freetype: font rasterizer."
-msgstr ""
-" - glx   : Ø¯Ø¹Ù ØªØµÙÙØ± OpenGL;\n"
-" - dri   : Ø¯Ø¹Ù Ø®Ø§Ø¯Ù X ÙØªÙÙÙØ© DRI (Direct Rendering 
Infrastructure);\n"
-" - vbe   : Ø¯Ø¹Ù Ø§ÙØªØ¯Ø§Ø¯Ø§Øª VESA BIOS. ØªÙÙÙ ÙÙ 
Ø§ÙØ§Ø³ØªØ¹ÙØ§Ù Ø¹Ù\n"
-"           Ø¥ÙÙØ§ÙØ§Øª Ø§ÙØ´Ø§Ø´Ø© Ø¹Ø¨Ø± Ø¨Ø·Ø§ÙØ© Ø§ÙÙÙØ¯ÙÙ;\n"
-" - ddc   : Ø¯Ø¹Ù ÙÙØ§Ø© Ø¹Ø±Ø¶ Ø§ÙØ¨ÙØ§ÙØ§ØªØ ÙØ§ÙØªÙ ØªØ³ÙØ 
Ø¨Ø§ÙØ§Ø³ØªØ¹ÙØ§Ù\n"
-"           Ø¹Ù Ø¥ÙÙØ§ÙØ§Øª Ø§ÙØ´Ø§Ø´Ø© Ø¹Ø¨Ø± Ø¨Ø·Ø§ÙØ© 
Ø§ÙÙÙØ¯ÙÙ;\n"
-" - int10 : ÙØØ§ÙÙ real-mode x86 Ø§ÙÙØ³ØªØ®Ø¯Ù ÙÙ ØªØ´ØºÙ 
Ø¨Ø·Ø§ÙØ§Øª VGA Ø§ÙØ«Ø§ÙÙÙØ©..\n"
-"           ÙØ¬Ø¨ ØªÙÙÙÙÙ Ø¥Ù ÙØ§ÙØª vbe ÙÙÙÙØ©;\n"
-" - dbe   : ØªÙÙÙÙ Ø§ÙØªØ¯Ø§Ø¯ double-buffering ÙÙ Ø§ÙØ®Ø§Ø¯Ù.\n"
-"           ÙÙÙØ¯Ø© ÙÙØ±Ø³ÙÙ Ø§ÙÙØªØØ±ÙØ© ÙØ¹ÙÙÙØ§Øª 
Ø§ÙÙÙØ¯ÙÙ;\n"
-" - extmod: ØªÙÙÙÙ Ø§ÙØ¹Ø¯ÙØ¯ ÙÙ Ø§ÙØ§ÙØªØ¯Ø§Ø¯Ø§Øª 
Ø§ÙØªÙÙÙØ¯ÙØ© ÙØ§ÙØ£ÙØ«Ø± Ø§Ø³ØªØ®Ø¯Ø§ÙØ§ÙØ ÙØ«Ù\n"
-"           Ø§ÙÙÙØ§ÙØ° Ø§ÙÙØ´ÙÙÙØ©Ø ÙØ§ÙØ°Ø§ÙØ±Ø© 
Ø§ÙÙØªØ´Ø§Ø±ÙØ©Ø ÙØªØ¨Ø¯ÙÙ Ø£ÙØ¶Ø§Ø¹ Ø§ÙÙÙØ¯ÙÙØ ÙDGAØ "
-"ÙXv;\n"
-" - record: ØªØ·Ø¨ÙÙ Ø§ÙØªØ¯Ø§Ø¯ RECORDØ ÙØ§ÙÙØ³ØªØ®Ø¯Ù ØºØ§ÙØ¨Ø§Ù 
ÙÙ Ø§Ø®ØªØ¨Ø§Ø± Ø§ÙØ®Ø§Ø¯Ù;\n"
-" - bitmap: ÙØÙÙ Ø§ÙØ®Ø· Ø¥ÙÙ Ø±Ø³ÙÙ ÙÙØ·ÙØ© (ÙØ°ÙÙ ÙØØ¯Ø§Øª 
freetypeØ Ùtype1)."
-
-#. Type: multiselect
-#. Description
-#: ../xserver-xorg.templates:7001
-msgid ""
-"For further information about these modules, please consult the X.Org "
-"documentation."
-msgstr "ÙÙÙØ²ÙØ¯ ÙÙ Ø§ÙÙØ¹ÙÙÙØ§Øª ØÙÙ ÙØ°Ù Ø§ÙÙØØ¯Ø§ØªØ 
Ø§ÙØ±Ø¬Ø§Ø¡ ÙØ±Ø§Ø¬Ø¹Ø© ØªÙØ«ÙÙ X.Org."
-
 #. Type: note
 #. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:7001
 msgid "Multiple potential default X.Org server drivers for the hardware"
 msgstr "ÙÙØ§Ù Ø¹Ø¯Ø© ÙÙØ´ØºÙÙØ§Øª Ø§ÙØªØ±Ø§Ø¶ÙØ© ÙØØªÙÙØ© 
ÙØ®Ø§Ø¯Ù X.Org ÙÙØ°Ø§ Ø§ÙØ¹ØªØ§Ø¯"
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:9001
+#: ../xserver-xorg.templates:8001
 msgid "Identifier for your video card:"
 msgstr "ÙÙØ¹Ø±ÙÙ Ø¨Ø·Ø§ÙØªÙ Ø§ÙÙÙØ¯ÙÙÙØ©:"
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:9001
+#: ../xserver-xorg.templates:8001
 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 "
@@ -282,19 +222,19 @@ msgstr ""
 
 #. Type: text
 #. Description
-#: ../xserver-xorg.templates:10001
+#: ../xserver-xorg.templates:9001
 msgid "Generic Video Card"
 msgstr "Ø¨Ø·Ø§ÙØ© ÙÙØ¯ÙÙ Ø¹Ø§ÙØ©"
 
 #. Type: select
 #. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:10001
 msgid "X server driver:"
 msgstr "ÙÙØ´ØºÙÙ Ø®Ø§Ø¯Ù X:"
 
 #. Type: select
 #. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:10001
 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."
@@ -304,7 +244,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:10001
 msgid ""
 "Drivers are typically named for the video card or chipset manufacturer, or "
 "for a specific model or family of chipsets."
@@ -314,13 +254,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:11001
 msgid "Use kernel framebuffer device interface?"
 msgstr "Ø§Ø³ØªØ®Ø¯Ø§Ù ÙØ§Ø¬ÙØ© Ø¬ÙØ§Ø² framebuffer Ø§ÙØ®Ø§ØµØ© 
Ø¨Ø§ÙÙÙØ§Ø©Ø"
 
 #. Type: boolean
 #. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:11001
 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 "
@@ -331,7 +271,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:11001
 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 "
@@ -343,13 +283,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:12001
 msgid "Video card's bus identifier:"
 msgstr "ÙÙØ¹Ø±ÙÙ ÙØ§ÙÙ Ø¨Ø·Ø§ÙØ© Ø§ÙÙÙØ¯ÙÙ:"
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:12001
 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-"
@@ -360,13 +300,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:12001
 msgid "Examples:"
 msgstr "Ø£ÙØ«ÙØ©:"
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:12001
 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 "
@@ -377,7 +317,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:12001
 msgid ""
 "You may wish to use the \"lspci\" command to determine the bus location of "
 "your PCI, AGP, or PCI-Express video card."
@@ -387,7 +327,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:12001
 msgid ""
 "When possible, this question has been pre-answered for you and you should "
 "accept the default unless you know it doesn't work."
@@ -397,19 +337,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../xserver-xorg.templates:14001
+#: ../xserver-xorg.templates:13001
 msgid "Incorrect format for the bus identifier"
 msgstr "ÙØ³Ù ÙÙØ¹Ø±ÙÙ Ø§ÙÙØ§ÙÙ ØºÙØ± ØµØÙØ"
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:15001
+#: ../xserver-xorg.templates:14001
 msgid "Amount of memory (kB) to be used by the video card:"
 msgstr "ØØ¬Ù Ø§ÙØ°Ø§ÙØ±Ø© Ø¨Ø§ÙÙÙÙÙØ¨Ø§ÙØª Ø§ÙÙØ³ØªØ®Ø¯Ù ÙÙ 
ÙØ¨Ù Ø¨Ø·Ø§ÙØ© Ø§ÙÙÙØ¯ÙÙ:"
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:15001
+#: ../xserver-xorg.templates:14001
 msgid ""
 "Typically, the amount of dedicated memory used by the video card is "
 "autodetected by the X server, but some integrated video chips (such as the "
@@ -423,7 +363,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:15001
+#: ../xserver-xorg.templates:14001
 msgid ""
 "This parameter should usually be left blank and specified only if the video "
 "card lacks RAM, or if the X server has trouble autodetecting the RAM size."
@@ -433,13 +373,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:16001
+#: ../xserver-xorg.templates:15001
 msgid "XKB rule set to use:"
 msgstr "ÙØ¬ÙÙØ¹Ø© Ø£ØÙØ§Ù XKB Ø§ÙÙØ·ÙÙØ¨ Ø§Ø³ØªØ®Ø¯Ø§ÙÙØ§:"
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:16001
+#: ../xserver-xorg.templates:15001
 msgid ""
 "For the X server to handle the keyboard correctly, an XKB rule set must be "
 "chosen."
@@ -449,7 +389,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:16001
+#: ../xserver-xorg.templates:15001
 msgid ""
 "Users of most keyboards should enter \"xorg\".  Users of Sun Type 4 and Type "
 "5 keyboards, however, should enter \"sun\"."
@@ -459,7 +399,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:16001
+#: ../xserver-xorg.templates:15001
 msgid ""
 "Experienced users can use any defined XKB rule set.  If the xkb-data package "
 "has been unpacked, see the /usr/share/X11/xkb/rules directory for available "
@@ -471,19 +411,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:16001
+#: ../xserver-xorg.templates:15001
 msgid "When in doubt, this value should be set to \"xorg\"."
 msgstr "Ø¹ÙØ¯ÙØ§ ØªÙÙÙ ÙÙ Ø´ÙØ ÙØ¬Ø¨ ØªØØ¯ÙØ¯ Ø§ÙÙÙÙØ© 
Ø¨Ù\"xorg\"."
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:17001
+#: ../xserver-xorg.templates:16001
 msgid "Keyboard model:"
 msgstr "Ø·Ø±Ø§Ø² ÙÙØØ© Ø§ÙÙÙØ§ØªÙØ:"
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:17001
+#: ../xserver-xorg.templates:16001
 msgid ""
 "For the X server to handle the keyboard correctly, a keyboard model must be "
 "entered.  Available models depend on which XKB rule set is in use."
@@ -493,7 +433,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:17001
+#: ../xserver-xorg.templates:16001
 msgid ""
 " With the \"xorg\" rule set:\n"
 " - pc101: traditional IBM PC/AT style keyboard with 101 keys, common in\n"
@@ -527,7 +467,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:17001
+#: ../xserver-xorg.templates:16001
 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 "
@@ -539,7 +479,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:17001
+#: ../xserver-xorg.templates:16001
 msgid ""
 "Experienced users can use any model defined by the selected XKB rule set.  "
 "If the xkb-data package has been unpacked, see the /usr/share/X11/xkb/rules "
@@ -551,7 +491,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:17001
+#: ../xserver-xorg.templates:16001
 msgid ""
 "Users of U.S. English keyboards should generally enter \"pc104\".  Users of "
 "most other keyboards should generally enter \"pc105\"."
@@ -562,13 +502,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:18001
+#: ../xserver-xorg.templates:17001
 msgid "Keyboard layout:"
 msgstr "ØªØ®Ø·ÙØ· ÙÙØØ© Ø§ÙÙÙØ§ØªÙØ:"
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:18001
+#: ../xserver-xorg.templates:17001
 msgid ""
 "For the X server to handle the keyboard correctly, a keyboard layout must be "
 "entered.  Available layouts depend on which XKB rule set and keyboard model "
@@ -580,7 +520,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:18001
+#: ../xserver-xorg.templates:17001
 msgid ""
 "Experienced users can use any layout supported by the selected XKB rule "
 "set.  If the xkb-data package has been unpacked, see the /usr/share/X11/xkb/"
@@ -592,7 +532,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:18001
+#: ../xserver-xorg.templates:17001
 msgid ""
 "Users of U.S. English keyboards should enter \"us\".  Users of keyboards "
 "localized for other countries should generally enter their ISO 3166 country "
@@ -604,13 +544,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:19001
+#: ../xserver-xorg.templates:18001
 msgid "Keyboard variant:"
 msgstr "Ø¨Ø¯ÙÙ ÙÙØØ© Ø§ÙÙÙØ§ØªÙØ:"
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:19001
+#: ../xserver-xorg.templates:18001
 msgid ""
 "For the X server to handle the keyboard as desired, a keyboard variant may "
 "be entered.  Available variants depend on which XKB rule set, model, and "
@@ -622,7 +562,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:19001
+#: ../xserver-xorg.templates:18001
 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 "
@@ -633,7 +573,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:19001
+#: ../xserver-xorg.templates:18001
 msgid ""
 "Experienced users can use any variant supported by the selected XKB layout.  "
 "If the xkb-data package has been unpacked, see the /usr/share/X11/xkb/"
@@ -646,7 +586,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:19001
+#: ../xserver-xorg.templates:18001
 msgid ""
 "Users of U.S. English keyboards should generally leave this entry blank."
 msgstr ""
@@ -655,13 +595,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:20001
+#: ../xserver-xorg.templates:19001
 msgid "Keyboard options:"
 msgstr "Ø®ÙØ§Ø±Ø§Øª ÙÙØØ© Ø§ÙÙÙØ§ØªÙØ:"
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:20001
+#: ../xserver-xorg.templates:19001
 msgid ""
 "For the X server to handle the keyboard as desired, keyboard options may be "
 "entered.  Available options depend on which XKB rule set was previously "
@@ -673,7 +613,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:20001
+#: ../xserver-xorg.templates:19001
 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 "
@@ -685,7 +625,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:20001
+#: ../xserver-xorg.templates:19001
 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 "
@@ -700,7 +640,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:20001
+#: ../xserver-xorg.templates:19001
 msgid ""
 "You can combine options by separating them with a comma, for instance \"ctrl:"
 "nocaps,altwin:meta_win\"."
@@ -710,7 +650,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:20001
+#: ../xserver-xorg.templates:19001
 msgid ""
 "Experienced users can use any options compatible with the selected XKB "
 "model, layout and variant."
@@ -720,19 +660,19 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../xserver-xorg.templates:20001
+#: ../xserver-xorg.templates:19001
 msgid "When in doubt, this value should be left blank."
 msgstr "Ø¹ÙØ¯ÙØ§ ØªÙÙÙ ÙÙ Ø´ÙØ ÙØ¬Ø¨ ØªØ±Ù ÙØ°Ù Ø§ÙÙÙÙØ© 
ÙØ§Ø±ØºØ©."
 
 #. Type: boolean
 #. Description
-#: ../xserver-xorg.templates:21001
+#: ../xserver-xorg.templates:20001
 msgid "Attempt mouse device autodetection?"
 msgstr "ÙÙ ØªØ±ÙØ¯ ÙØØ§ÙÙØ© Ø§ÙØªØ¹Ø±Ù Ø§ÙØ¢ÙÙ Ø¹ÙÙ Ø¬ÙØ§Ø² 
Ø§ÙÙØ§ÙØ³Ø"
 
 #. Type: boolean
 #. Description
-#: ../xserver-xorg.templates:21001
+#: ../xserver-xorg.templates:20001
 msgid ""
 "If a mouse is attached to the computer, autodetection can be attempted; it "
 "may help to move the mouse while detection is attempted (the gpm program "
@@ -745,13 +685,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../xserver-xorg.templates:21001
+#: ../xserver-xorg.templates:20001
 msgid "Do not choose this option if you wish to select a mouse type manually."
 msgstr "ÙØ§ ØªÙÙ Ø¨Ø§ÙØªÙØ§Ø¡ ÙØ°Ø§ Ø§ÙØ®ÙØ§Ø± Ø¥Ù ÙÙØª ØªØ±ØºØ¨ 
ÙÙ Ø§Ø®ØªÙØ§Ø± ÙÙØ¹ Ø§ÙÙØ§ÙØ³ ÙØ¯ÙÙØ§Ù."
 
 #. Type: boolean
 #. Description
-#: ../xserver-xorg.templates:21001
+#: ../xserver-xorg.templates:20001
 msgid ""
 "If you choose it and autodetection fails, you will be asked this question "
 "again.  Autodetection can be attempted as many times as desired.  If it "
@@ -764,13 +704,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../xserver-xorg.templates:22001
+#: ../xserver-xorg.templates:21001
 msgid "Mouse port:"
 msgstr "ÙÙÙØ° Ø§ÙÙØ§ÙØ³:"
 
 #. Type: select
 #. Description
-#: ../xserver-xorg.templates:22001
+#: ../xserver-xorg.templates:21001
 msgid ""
 "For the X Window System graphical user interface to operate correctly, "
 "certain characteristics of the mouse (or other pointing device, such as a "
@@ -781,7 +721,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../xserver-xorg.templates:22001
+#: ../xserver-xorg.templates:21001
 msgid ""
 "It is necessary to determine which port (connection type) is used by the "
 "mouse. Serial ports use D-shaped connectors with 9 or 25 pins (a.k.a. DB-9 "
@@ -804,19 +744,19 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../xserver-xorg.templates:23001
+#: ../xserver-xorg.templates:22001
 msgid "Mouse protocol:"
 msgstr "Ø¨Ø±ÙØªÙÙÙÙ Ø§ÙÙØ§ÙØ³:"
 
 #. Type: boolean
 #. Description
-#: ../xserver-xorg.templates:24001
+#: ../xserver-xorg.templates:23001
 msgid "Emulate 3 button mouse?"
 msgstr "ÙØØ§ÙØ§Ø© Ø§ÙÙØ§ÙØ³ Ø°Ø§Øª 3 Ø£Ø²Ø±Ø§Ø±Ø"
 
 #. Type: boolean
 #. Description
-#: ../xserver-xorg.templates:24001
+#: ../xserver-xorg.templates:23001
 msgid ""
 "Most programs in the X Window System expect the mouse to have 3 buttons "
 "(left, right, and middle).  Mice with only 2 buttons can emulate the "
@@ -829,7 +769,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../xserver-xorg.templates:24001
+#: ../xserver-xorg.templates:23001
 msgid ""
 "This option may also be used on mice with 3 or more buttons; the middle "
 "button will continue to work normally."
@@ -839,7 +779,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../xserver-xorg.templates:24001
+#: ../xserver-xorg.templates:23001
 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"
@@ -851,13 +791,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../xserver-xorg.templates:25001
+#: ../xserver-xorg.templates:24001
 msgid "Attempt monitor autodetection?"
 msgstr "ÙÙ ØªØ±ÙØ¯ ÙØØ§ÙÙØ© Ø§ÙØªØ¹Ø±Ù Ø§ÙØ¢ÙÙ Ø¹ÙÙ 
Ø§ÙØ´Ø§Ø´Ø©Ø"
 
 #. Type: boolean
 #. Description
-#: ../xserver-xorg.templates:25001
+#: ../xserver-xorg.templates:24001
 msgid ""
 "Many monitors (including LCD's) and video cards support a communication "
 "protocol that allows the monitor's technical characteristics to be "
@@ -871,20 +811,20 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../xserver-xorg.templates:25001
+#: ../xserver-xorg.templates:24001
 msgid ""
 "If autodetection fails, you will be asked for information about the monitor."
 msgstr "Ø¥Ù ÙØ´Ù Ø§ÙØ§ÙØªØ´Ø§Ù Ø§ÙØªÙÙØ§Ø¦ÙØ ÙØ³ÙØ·ÙØ¨ ÙÙÙ 
Ø§ÙÙØ²ÙØ¯ ÙÙ Ø§ÙÙØ¹ÙÙÙØ§Øª ØÙÙ Ø§ÙØ´Ø§Ø´Ø©."
 
 #. Type: select
 #. Description
-#: ../xserver-xorg.templates:26001
+#: ../xserver-xorg.templates:25001
 msgid "Method for selecting the monitor characteristics:"
 msgstr "Ø·Ø±ÙÙØ© Ø§Ø®ØªÙØ§Ø± ÙÙØ§ØµÙØ§Øª Ø§ÙØ´Ø§Ø´Ø©:"
 
 #. Type: select
 #. Description
-#: ../xserver-xorg.templates:26001
+#: ../xserver-xorg.templates:25001
 msgid ""
 "For the X Window System graphical user interface to operate correctly, "
 "certain characteristics of the monitor must be known."
@@ -894,7 +834,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../xserver-xorg.templates:26001
+#: ../xserver-xorg.templates:25001
 msgid ""
 "The \"simple\" option will prompt about the monitor's physical size; this "
 "will set some configuration values appropriate for a typical CRT of the "
@@ -906,7 +846,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../xserver-xorg.templates:26001
+#: ../xserver-xorg.templates:25001
 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 "
@@ -918,7 +858,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../xserver-xorg.templates:26001
+#: ../xserver-xorg.templates:25001
 msgid ""
 "The \"advanced\" option will let you specify the monitor's horizontal sync "
 "and vertical refresh tolerances directly."
@@ -928,56 +868,56 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../xserver-xorg.templates:27001
+#: ../xserver-xorg.templates:26001
 msgid "Up to 14 inches (355 mm)"
 msgstr "ØØªÙ 14 Ø¥ÙØ´ (355 ÙÙÙÙØªØ±)"
 
 #. Type: select
 #. Choices
-#: ../xserver-xorg.templates:27001
+#: ../xserver-xorg.templates:26001
 msgid "15 inches (380 mm)"
 msgstr "15 Ø¥ÙØ´ (380 ÙÙÙÙØªØ±)"
 
 #. Type: select
 #. Choices
-#: ../xserver-xorg.templates:27001
+#: ../xserver-xorg.templates:26001
 msgid "17 inches (430 mm)"
 msgstr "17 Ø¥ÙØ´ (430 ÙÙÙÙØªØ±)"
 
 #. Type: select
 #. Choices
-#: ../xserver-xorg.templates:27001
+#: ../xserver-xorg.templates:26001
 msgid "19-20 inches (480-510 mm)"
 msgstr "19-20 Ø¥ÙØ´ (480-510 ÙÙÙÙØªØ±)"
 
 #. Type: select
 #. Choices
-#: ../xserver-xorg.templates:27001
+#: ../xserver-xorg.templates:26001
 msgid "21 inches (530 mm) or more"
 msgstr "21 Ø¥ÙØ´ (530 ÙÙÙÙØªØ±) Ø£Ù Ø£ÙØ«Ø±"
 
 #. Type: select
 #. Description
-#: ../xserver-xorg.templates:27002
+#: ../xserver-xorg.templates:26002
 msgid "Approximate monitor size:"
 msgstr "ØØ¬Ù Ø§ÙØ´Ø§Ø´Ø© Ø§ÙØªÙØ±ÙØ¨Ù:"
 
 #. Type: select
 #. Description
-#: ../xserver-xorg.templates:27002
+#: ../xserver-xorg.templates:26002
 msgid "High-quality CRT's may be able to use the next highest size category."
 msgstr ""
 "Ø´Ø§Ø´Ø§Øª CRT Ø¹Ø§ÙÙØ© Ø§ÙØ¬ÙØ¯Ø© ÙØ¯ ØªÙÙÙ ÙØ§Ø¯Ø±Ø© Ø¹ÙÙ 
Ø§Ø³ØªØ®Ø¯Ø§Ù ÙØ¦Ø© Ø§ÙØØ¬Ù Ø§ÙØ£ÙØ¨Ø± Ø§ÙØªØ§ÙÙØ©."
 
 #. Type: select
 #. Description
-#: ../xserver-xorg.templates:28001
+#: ../xserver-xorg.templates:27001


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

xorg: Changes to 'debian-unstable'

Reply via email to