xorg: Changes to 'debian-experimental'
debian/changelog | 7
debian/control | 5
debian/local/dexconf | 16 -
debian/po/ar.po | 316 ++++++++++++++++++-------------------
debian/po/bg.po | 328 ++++++++++++++++++--------------------
debian/po/bs.po | 324 ++++++++++++++++++--------------------
debian/po/ca.po | 339 +++++++++++++++++++---------------------
debian/po/cs.po | 317 ++++++++++++++++++-------------------
debian/po/da.po | 328 ++++++++++++++++++--------------------
debian/po/de.po | 326 ++++++++++++++++++--------------------
debian/po/dz.po | 326 ++++++++++++++++++--------------------
debian/po/el.po | 338 +++++++++++++++++++--------------------
debian/po/es.po | 326 ++++++++++++++++++--------------------
debian/po/eu.po | 325 ++++++++++++++++++--------------------
debian/po/fi.po | 320 ++++++++++++++++++-------------------
debian/po/fr.po | 322 ++++++++++++++++++-------------------
debian/po/gl.po | 336 +++++++++++++++++++--------------------
debian/po/hr.po | 320 ++++++++++++++++++-------------------
debian/po/hu.po | 317 ++++++++++++++++++-------------------
debian/po/it.po | 324 ++++++++++++++++++--------------------
debian/po/ja.po | 322 ++++++++++++++++++-------------------
debian/po/km.po | 315 ++++++++++++++++++-------------------
debian/po/ko.po | 319 ++++++++++++++++++-------------------
debian/po/lt.po | 324 ++++++++++++++++++--------------------
debian/po/ml.po | 321 ++++++++++++++++++-------------------
debian/po/nb.po | 321 ++++++++++++++++++-------------------
debian/po/ne.po | 321 ++++++++++++++++++-------------------
debian/po/nl.po | 323 ++++++++++++++++++--------------------
debian/po/pl.po | 262 +++++++++++++-----------------
debian/po/pt.po | 331 +++++++++++++++++++--------------------
debian/po/pt_BR.po | 328 ++++++++++++++++++--------------------
debian/po/ro.po | 325 ++++++++++++++++++--------------------
debian/po/ru.po | 319 ++++++++++++++++++-------------------
debian/po/sk.po | 323 ++++++++++++++++++--------------------
debian/po/sq.po | 325 ++++++++++++++++++--------------------
debian/po/sv.po | 320 ++++++++++++++++++-------------------
debian/po/ta.po | 318 ++++++++++++++++++-------------------
debian/po/templates.pot | 248 ++++++++++++-----------------
debian/po/th.po | 312 +++++++++++++++++-------------------
debian/po/tr.po | 326 ++++++++++++++++++--------------------
debian/po/vi.po | 322 ++++++++++++++++++-------------------
debian/po/wo.po | 326 ++++++++++++++++++--------------------
debian/po/zh_CN.po | 314 ++++++++++++++++++-------------------
debian/po/zh_TW.po | 317 ++++++++++++++++++-------------------
debian/xserver-xorg.postinst.in | 47 -----
debian/xserver-xorg.templates | 24 --
46 files changed, 6360 insertions(+), 6853 deletions(-)
New commits:
commit 200301f5de14eb6d4e63edd0b00b6e399959dbf7
Author: David Nusinow <dnusinow@debian.org>
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 <dnusinow@debian.org> Sun, 01 Apr 2007 21:53:18 -0400
+ -- David Nusinow <dnusinow@debian.org> 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: debian-x@lists.debian.org\n"
-"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 <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\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
msgid "Monitor's best video mode:"
msgstr "Ø£Ù?ضÙ? Ù?ضع Ù?Ù?دÙ?Ù? Ù?Ù?شاشة:"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:28001
+#: ../xserver-xorg.templates:27001
msgid ""
"Choose the \"best\" resolution and refresh rate the monitor is capable of. "
"Larger resolutions and refresh rates are better. With a CRT monitor, it is "
@@ -995,13 +935,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:29001
+#: ../xserver-xorg.templates:28001
msgid "Identifier for the monitor:"
msgstr "Ù?Ù?عرÙ?Ù? اÙ?شاشة:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:29001
+#: ../xserver-xorg.templates:28001
msgid ""
"The X server configuration file associates the monitor with a name that you "
"may provide. This is usually the vendor or brand name followed by the model "
@@ -1013,19 +953,19 @@ msgstr ""
#. Type: text
#. Description
-#: ../xserver-xorg.templates:30001
+#: ../xserver-xorg.templates:29001
msgid "Generic Monitor"
msgstr "شاشة عاÙ?Ø©"
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:31001
+#: ../xserver-xorg.templates:30001
msgid "Write monitor sync ranges to the configuration file?"
msgstr "Ù?تابة Ù?Ù?Ù? Ù?دÙ? Ù?زاÙ?Ù?Ø© اÙ?شاشة Ø¥Ù?Ù? Ù?Ù?Ù? اÙ?تÙ?Ù?ئةØ?"
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:31001
+#: ../xserver-xorg.templates:30001
msgid ""
"The monitor synchronization ranges should be autodetected by the X server in "
"most cases, but sometimes it needs hinting. This option is for experienced "
@@ -1037,13 +977,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:32001
+#: ../xserver-xorg.templates:31001
msgid "Monitor's horizontal sync range:"
msgstr "Ù?دÙ? Ù?زاÙ?Ù?Ø© اÙ?شاشة اÙ?Ø£Ù?Ù?Ù?:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:32001
+#: ../xserver-xorg.templates:31001
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 "
@@ -1057,13 +997,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:33001
+#: ../xserver-xorg.templates:32001
msgid "Monitor's vertical refresh range:"
msgstr "Ù?دÙ? Ø¥Ù?عاش اÙ?شاشة اÙ?رأسÙ?:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:33001
+#: ../xserver-xorg.templates:32001
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 "
@@ -1077,13 +1017,13 @@ msgstr ""
#. Type: note
#. Description
-#: ../xserver-xorg.templates:34001
+#: ../xserver-xorg.templates:33001
msgid "Incorrect values entered"
msgstr "اÙ?Ù?Ù?Ù? اÙ?Ù?دخÙ?Ø© غÙ?ر صØÙ?ØØ©:"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:34001
+#: ../xserver-xorg.templates:33001
msgid ""
"The valid syntax is a comma-separated list of discrete values, or a pair of "
"values separated by a dash."
@@ -1093,13 +1033,13 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:35001
+#: ../xserver-xorg.templates:34001
msgid "Desired default color depth in bits:"
msgstr "عÙ?Ù? اÙ?Ø£Ù?Ù?اÙ? اÙ?اÙ?تراضÙ? اÙ?Ù?رغÙ?ب باÙ?بت:"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:35001
+#: ../xserver-xorg.templates:34001
msgid ""
"Usually 24-bit color is desirable, but on graphics cards with limited "
"amounts of framebuffer memory, higher resolutions may be achieved at the "
@@ -1115,7 +1055,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:35001
+#: ../xserver-xorg.templates:34001
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 "
@@ -1127,49 +1067,49 @@ msgstr ""
#. Type: note
#. Description
-#: ../xserver-xorg.templates:36001
+#: ../xserver-xorg.templates:35001
msgid "Empty value"
msgstr "Ù?Ù?Ù?Ø© Ù?ارغة"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:36001
+#: ../xserver-xorg.templates:35001
msgid "A null entry is not permitted for this value."
msgstr "Ù?ا Ù?سÙ?Ø Ø¨ØªØ±Ù? اÙ?Ù?Ù?Ù?Ø© Ù?ارغة Ù?Ù?ا"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:37001
+#: ../xserver-xorg.templates:36001
msgid "Invalid double-quote characters"
msgstr "عÙ?اÙ?تا تÙ?صÙ?ص غÙ?ر صاÙ?ØتÙ?Ù?"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:37001
+#: ../xserver-xorg.templates:36001
msgid "Double-quote (\") characters are not permitted in the entry value."
msgstr "عÙ?اÙ?ات اÙ?تÙ?صÙ?ص اÙ?Ù?زدÙ?جة (\") غÙ?ر Ù?سÙ?Ù?ØØ© Ù?Ù?ا."
Reply to: