debian/changelog | 93 +++++
debian/control | 6
debian/local/dexconf | 35 --
debian/po/ar.po | 586 +++++++++++++++---------------------
debian/po/bg.po | 606 ++++++++++++++++---------------------
debian/po/bs.po | 594 +++++++++++++++---------------------
debian/po/ca.po | 636 ++++++++++++++++-----------------------
debian/po/cs.po | 586 +++++++++++++++---------------------
debian/po/da.po | 597 +++++++++++++++---------------------
debian/po/de.po | 627 ++++++++++++++++----------------------
debian/po/dz.po | 580 +++++++++++++++--------------------
debian/po/el.po | 619 ++++++++++++++++----------------------
debian/po/es.po | 622 ++++++++++++++++----------------------
debian/po/eu.po | 606 +++++++++++++++----------------------
debian/po/fi.po | 600 +++++++++++++++----------------------
debian/po/fr.po | 646 +++++++++++++++++-----------------------
debian/po/gl.po | 604 +++++++++++++++----------------------
debian/po/he.po | 581 +++++++++++++++--------------------
debian/po/hr.po | 594 +++++++++++++++---------------------
debian/po/hu.po | 585 +++++++++++++++---------------------
debian/po/it.po | 622 ++++++++++++++++----------------------
debian/po/ja.po | 584 +++++++++++++++---------------------
debian/po/km.po | 570 ++++++++++++++---------------------
debian/po/ko.po | 580 +++++++++++++++--------------------
debian/po/lt.po | 577 +++++++++++++++--------------------
debian/po/ml.po | 592 +++++++++++++++---------------------
debian/po/mr.po | 581 +++++++++++++++--------------------
debian/po/nb.po | 625 ++++++++++++++++----------------------
debian/po/ne.po | 584 +++++++++++++++---------------------
debian/po/nl.po | 614 ++++++++++++++++----------------------
debian/po/nn.po | 616 ++++++++++++++++----------------------
debian/po/pl.po | 643 ++++++++++++++++-----------------------
debian/po/pt.po | 609 ++++++++++++++++---------------------
debian/po/pt_BR.po | 613 ++++++++++++++++---------------------
debian/po/ro.po | 616 ++++++++++++++++----------------------
debian/po/ru.po | 602 +++++++++++++++----------------------
debian/po/sk.po | 586 +++++++++++++++---------------------
debian/po/sq.po | 600 +++++++++++++++----------------------
debian/po/sv.po | 598 +++++++++++++++----------------------
debian/po/ta.po | 581 +++++++++++++++--------------------
debian/po/templates.pot | 354 +++------------------
debian/po/th.po | 565 ++++++++++++++--------------------
debian/po/tr.po | 601 +++++++++++++++----------------------
debian/po/vi.po | 623 ++++++++++++++++----------------------
debian/po/wo.po | 603 +++++++++++++++----------------------
debian/po/zh_CN.po | 560 ++++++++++++++--------------------
debian/po/zh_TW.po | 560 ++++++++++++++--------------------
debian/rules | 11
debian/scripts/vars.sparc | 1
debian/xserver-xorg.postinst.in | 637 +--------------------------------------
debian/xserver-xorg.templates | 106 ------
51 files changed, 11190 insertions(+), 15827 deletions(-)
New commits:
commit 7637478ee88a209360b38a9f4590efc27abb035c
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Tue Dec 18 01:20:46 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 4e2eb87..5177364 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.3+8ubuntu1) UNRELEASED; urgency=low
+xorg (1:7.3+8ubuntu1) hardy; urgency=low
* Merge with Debian unstable, remaining changes:
- apport/xorg-server.py, debian/x11-common.install:
@@ -48,7 +48,7 @@ xorg (1:7.3+8ubuntu1) UNRELEASED; urgency=low
effect above the dexconf call in debian/xserver-xorg.postinst.in, to try
to prevent future mistakes. Thanks, Michael Vogt!
- -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 27 Nov 2007 11:53:49 +0200
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 18 Dec 2007 01:19:37 +0200
xorg (1:7.3+8) unstable; urgency=low
commit 5db2bb10c2724a393fcba71e0e31eb87e747df45
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Tue Dec 18 00:08:50 2007 +0100
Don't try to interact with debconf after db_stop.
Deregister old debconf questions before calling dexconf. dexconf calls
db_stop, and we can't use debconf after that. Add a comment to that
effect above the dexconf call in debian/xserver-xorg.postinst.in, to try
to prevent future mistakes. Thanks, Michael Vogt!
diff --git a/debian/changelog b/debian/changelog
index fcb2bab..0f8611d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.3+9) UNRELEASED; urgency=low
+
+ * Deregister old debconf questions before calling dexconf. dexconf calls
+ db_stop, and we can't use debconf after that. Add a comment to that
+ effect above the dexconf call in debian/xserver-xorg.postinst.in, to try
+ to prevent future mistakes. Thanks, Michael Vogt!
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Mon, 17 Dec 2007 23:21:35 +0100
+
xorg (1:7.3+8) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index abb9e20..83ac0b4 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -1064,6 +1064,35 @@ elif [ `readlink "$SERVER_SYMLINK"` = "/bin/true" ]; then
ln -s "$THIS_SERVER" "$SERVER_SYMLINK"
fi
+if [ -n "$UPGRADE" ] && dpkg --compare-versions "$2" le "1:7.3+5"; then
+ # Clean up our old crap
+ rm -f "$SERVER_SYMLINK_CHECKSUM" "$SERVER_SYMLINK_ROSTER"
+ for QUESTION in "shared/default-x-server" \
+ "xserver-xorg/autodetect_mouse" \
+ "xserver-xorg/autodetect_monitor" \
+ "xserver-xorg/config/monitor/selection-method" \
+ "xserver-xorg/config/monitor/screen-size" \
+ "xserver-xorg/config/monitor/mode-list" \
+ "xserver-xorg/config/monitor/default-identifier" \
+ "xserver-xorg/config/monitor/horiz-sync" \
+ "xserver-xorg/config/monitor/vert-refresh" \
+ "xserver-xorg/config/monitor/range_input_error" \
+ "xserver-xorg/config/display/modes" \
+ "xserver-xorg/config/device/video_ram" \
+ "xserver-xorg/config/display/default_depth" \
+ "xserver-xorg/config/inputdevice/mouse/port" \
+ "xserver-xorg/config/inputdevice/mouse/protocol" \
+ "xserver-xorg/config/modules" \
+ "xserver-xorg/config/monitor/default-identifier" \
+ "xserver-xorg/config/monitor/identifier" \
+ "xserver-xorg/config/write_files_section"; do
+ db_unregister "$QUESTION" || true
+ done
+fi
+
+# no debconf interaction should be done after this point
+# (the dexconf call below invokes db_stop)
+
# Don't touch the config on upgrades except to deal with known issues with old
# configs.
if [ -z "$UPGRADE" ] || dpkg --compare-versions "$2" le "1:7.0.14"; then
@@ -1141,32 +1170,6 @@ else
debug_echo "not updating $XORGCONFIG; we're upgrading"
fi
-if [ -n "$UPGRADE" ] && dpkg --compare-versions "$2" le "1:7.3+5"; then
- # Clean up our old crap
- rm -f "$SERVER_SYMLINK_CHECKSUM" "$SERVER_SYMLINK_ROSTER"
- for QUESTION in "shared/default-x-server" \
- "xserver-xorg/autodetect_mouse" \
- "xserver-xorg/autodetect_monitor" \
- "xserver-xorg/config/monitor/selection-method" \
- "xserver-xorg/config/monitor/screen-size" \
- "xserver-xorg/config/monitor/mode-list" \
- "xserver-xorg/config/monitor/default-identifier" \
- "xserver-xorg/config/monitor/horiz-sync" \
- "xserver-xorg/config/monitor/vert-refresh" \
- "xserver-xorg/config/monitor/range_input_error" \
- "xserver-xorg/config/display/modes" \
- "xserver-xorg/config/device/video_ram" \
- "xserver-xorg/config/display/default_depth" \
- "xserver-xorg/config/inputdevice/mouse/port" \
- "xserver-xorg/config/inputdevice/mouse/protocol" \
- "xserver-xorg/config/modules" \
- "xserver-xorg/config/monitor/default-identifier" \
- "xserver-xorg/config/monitor/identifier" \
- "xserver-xorg/config/write_files_section"; do
- db_unregister "$QUESTION" || true
- done
-fi
-
exit 0
# vim:set ai et sts=2 sw=2 tw=0:
commit 84bfe06c03f38b2cca03df8249d186a572810382
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Mon Dec 17 17:00:08 2007 +0200
Drop laptop-detect from recommends, leftover by a merge mistake.
diff --git a/debian/control b/debian/control
index 75277c3..bb9182b 100644
--- a/debian/control
+++ b/debian/control
@@ -84,7 +84,7 @@ Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
Replaces: xserver-common
Pre-Depends: x11-common (>= 1:7.3+3)
Depends: xserver-xorg-core (>= 2:1.4-3), xserver-xorg-video-all |
xserver-xorg-video-2, xserver-xorg-input-all | xserver-xorg-input-2,
${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils
-Recommends: libgl1-mesa-dri, udev, laptop-detect, discover1 | discover,
${F:XServer-Xorg-Detect-Depends}, displayconfig-gtk, mdetect
+Recommends: libgl1-mesa-dri, udev, discover1 | discover,
${F:XServer-Xorg-Detect-Depends}, displayconfig-gtk, mdetect
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server, as well as providing a configuration infrastructure to manage
commit 1072b68ec2c1b9c527ec4aba740b06cab8eb13ca
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Sun Dec 16 10:35:16 2007 -0500
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 4144f04..fcb2bab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.3+8) UNRELEASED; urgency=low
+xorg (1:7.3+8) unstable; urgency=low
[ Julien Cristau ]
* Make xorg Architecture: any. Depend on sparc-utils [sparc] instead of
@@ -33,7 +33,7 @@ xorg (1:7.3+8) UNRELEASED; urgency=low
* Allow cross-building. Thanks Neil Williams. Closes: #451293
* Bump standards version to 3.7.3.0. No changes needed.
- -- David Nusinow <[EMAIL PROTECTED]> Sun, 16 Dec 2007 10:34:50 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Sun, 16 Dec 2007 10:35:08 -0500
xorg (1:7.3+7) unstable; urgency=low
commit de09511be7fc812c9cab96472015d2432fec42ad
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Sun Dec 16 10:35:06 2007 -0500
* Bump standards version to 3.7.3.0. No changes needed.
diff --git a/debian/changelog b/debian/changelog
index 39305ef..4144f04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,8 +31,9 @@ xorg (1:7.3+8) UNRELEASED; urgency=low
* Don't set fbdev in the postinst for r128 on ppc.
The driver will do this automatically if no option is specified by the user
* Allow cross-building. Thanks Neil Williams. Closes: #451293
+ * Bump standards version to 3.7.3.0. No changes needed.
- -- David Nusinow <[EMAIL PROTECTED]> Sun, 16 Dec 2007 10:15:47 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Sun, 16 Dec 2007 10:34:50 -0500
xorg (1:7.3+7) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e9658ab..0207145 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Drew Parsons <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL
PROTECTED]>
-Standards-Version: 3.7.2.0
+Standards-Version: 3.7.3.0
Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 4.1.16)
Package: x11-common
commit efe2abcfcd7971b5eb8e339d43488f35c5b970ca
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Sun Dec 16 10:19:33 2007 -0500
* Allow cross-building. Thanks Neil Williams. Closes: #451293
diff --git a/debian/changelog b/debian/changelog
index 4318b37..39305ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,8 +30,9 @@ xorg (1:7.3+8) UNRELEASED; urgency=low
+ Don't recommend laptop-detect any more or look for it in server postinst
* Don't set fbdev in the postinst for r128 on ppc.
The driver will do this automatically if no option is specified by the user
+ * Allow cross-building. Thanks Neil Williams. Closes: #451293
- -- David Nusinow <[EMAIL PROTECTED]> Wed, 12 Dec 2007 21:51:26 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Sun, 16 Dec 2007 10:15:47 -0500
xorg (1:7.3+7) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index c81241f..0ecc843 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,14 @@
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CC=$(DEB_HOST_GNU_TYPE)-gcc
+else
+CC ?=gcc
+endif
+
# debhelper
export DH_OPTIONS
commit bc74cec927578873eacc292a2fbacc1eeba1d876
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Wed Dec 12 21:53:03 2007 -0500
Don't recommend laptop-detect any more or look for it in server postinst
diff --git a/debian/changelog b/debian/changelog
index e5d0645..4318b37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,10 +27,11 @@ xorg (1:7.3+8) UNRELEASED; urgency=low
undoubtedly be bugs uncovered by this change, but we need to find and fix
the actual bugs in the drivers and server in order to move forward.
+ Don't recommend xresprobe any more
- * Don't set fbdev in the postinst for r128 on ppc.
+ + Don't recommend laptop-detect any more or look for it in server postinst
+ * Don't set fbdev in the postinst for r128 on ppc.
The driver will do this automatically if no option is specified by the user
- -- David Nusinow <[EMAIL PROTECTED]> Wed, 12 Dec 2007 21:46:58 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Wed, 12 Dec 2007 21:51:26 -0500
xorg (1:7.3+7) unstable; urgency=low
diff --git a/debian/control b/debian/control
index a860259..e9658ab 100644
--- a/debian/control
+++ b/debian/control
@@ -83,7 +83,7 @@ Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
Replaces: xserver-common
Pre-Depends: x11-common (>= 1:7.3+3)
Depends: xserver-xorg-core (>= 2:1.4-3), xserver-xorg-video-all |
xserver-xorg-video-2, xserver-xorg-input-all | xserver-xorg-input-2,
${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils
-Recommends: libgl1-mesa-dri, udev, laptop-detect, discover1 | discover,
${F:XServer-Xorg-Detect-Depends}
+Recommends: libgl1-mesa-dri, udev, discover1 | discover,
${F:XServer-Xorg-Detect-Depends}
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server, as well as providing a configuration infrastructure to manage
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 5ad19be..abb9e20 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -14,13 +14,6 @@ set -e
THIS_PACKAGE=xserver-xorg
THIS_SCRIPT=postinst
-LAPTOP=""
-if [ -n "$(which laptop-detect)" ]; then
- if laptop-detect >/dev/null; then
- LAPTOP=true
- fi
-fi
-
#INCLUDE_SHELL_LIB#
if [ -e /etc/default/xorg ]; then
commit f9811a8f57a8578a1787098d24e39282c4611c03
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Wed Dec 12 21:47:37 2007 -0500
* Don't set fbdev in the postinst for r128 on ppc.
The driver will do this automatically if no option is specified by the
user
diff --git a/debian/changelog b/debian/changelog
index c3e2510..e5d0645 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,10 @@ xorg (1:7.3+8) UNRELEASED; urgency=low
undoubtedly be bugs uncovered by this change, but we need to find and fix
the actual bugs in the drivers and server in order to move forward.
+ Don't recommend xresprobe any more
+ * Don't set fbdev in the postinst for r128 on ppc.
+ The driver will do this automatically if no option is specified by the user
- -- David Nusinow <[EMAIL PROTECTED]> Sun, 09 Dec 2007 22:32:27 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Wed, 12 Dec 2007 21:46:58 -0500
xorg (1:7.3+7) unstable; urgency=low
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 602295c..5ad19be 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -814,11 +814,6 @@ if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
USE_FBDEV=true
fi
fi
- # Make sure to force UseFBDev with Rage 128 or stuff will go bad in some
- # old Macs.
- if echo "$DEVICE_IDENTIFIER" | grep -q "Rage 128"; then
- USE_FBDEV=true
- fi
fi
if [ -n "$XORG_USE_FBDEV" ] && [ "$XORG_USE_FBDEV" = "no" ]; then
commit 96afe5dbfce524607fbfbb011f3d2492208c922b
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Mon Dec 10 23:47:35 2007 +0200
Prepare the changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 5ba3a93..0977c78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.3+7ubuntu3) UNRELEASED; urgency=low
+xorg (1:7.3+7ubuntu3) hardy; urgency=low
[ Michael Vogt ]
* Add "xserver-xorg-driver-all" transitional package to make
@@ -8,7 +8,7 @@ xorg (1:7.3+7ubuntu3) UNRELEASED; urgency=low
* xserver-xorg.postinst.in: Narrow down the drivers to filter from the list,
because otherwise radeonhd would not be selectable. (LP: #174311)
- -- Timo Aaltonen <[EMAIL PROTECTED]> Thu, 06 Dec 2007 19:33:18 +0200
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Mon, 10 Dec 2007 23:43:37 +0200
xorg (1:7.3+7ubuntu2) hardy; urgency=low
commit 3d0ca693f473afd3711436e4de2deafb4b73b022
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Sun Dec 9 22:47:10 2007 -0500
Commmit template translation changes from last commit
diff --git a/debian/po/ar.po b/debian/po/ar.po
index d71c926..b98ef1e 100644
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: ar\n"
-"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2007-10-31 17:28-0400\n"
+"Report-Msgid-Bugs-To: Source: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2007-12-09 22:41-0500\n"
"PO-Revision-Date: 2007-04-06 19:54+0300\n"
"Last-Translator: Ossama M. Khayat <[EMAIL PROTECTED]>\n"
"Language-Team: Arabic <[EMAIL PROTECTED]>\n"
@@ -19,33 +19,15 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=n%100==1 || n==0 ? 0 : n%100==2 ? 2 : n%"
"100>=3 && n%100<=10 ? 2 : 3;\n"
-#. Type: multiselect
-#. Description
-#: ../xserver-xorg.templates:2001
-msgid "Video modes to be used by the X server:"
-msgstr "أوضاع الفيديو التي يجب أن يستخدمها خادم X:"
-
-#. Type: multiselect
-#. Description
-#: ../xserver-xorg.templates:2001
-msgid ""
-"Please keep only the resolutions you would like the X server to use. "
-"Removing all of them is the same as removing none, since in both cases the X "
-"server will attempt to use the highest possible resolution."
-msgstr ""
-"الرجاء إبقاء استبانات الشاشة فقط التي تود أن يقوم خادم X باستخدامها. كما أن "
-"إزالتها كلها هو بمثابة عدم إزالة أي منها، حيث أنه في الحالتين سيقوم خادم X "
-"بمحاولة استخدام أعلى استبانة ممكن."
-
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:3001
+#: ../xserver-xorg.templates:2001
msgid "Attempt to autodetect video hardware?"
msgstr "تريد محاولة التعرف الآلي على عتاد الفيديو؟"
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:3001
+#: ../xserver-xorg.templates:2001
msgid ""
"You should choose this option if you would like to attempt to autodetect the "
"recommended X server and driver module for your video card. If the "
@@ -60,7 +42,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:3001
+#: ../xserver-xorg.templates:2001
msgid ""
"If you would rather select the X server and driver module yourself, do not "
"choose this option. You will not be asked to select the X server if there "
@@ -71,13 +53,13 @@ msgstr ""
#. Type: note
#. Description
-#: ../xserver-xorg.templates:4001
+#: ../xserver-xorg.templates:3001
msgid "Multiple potential default X.Org server drivers for the hardware"
msgstr "هناك عدة مُشغّلات افتراضية محتملة لخادم X.Org لهذا العتاد"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:4001
+#: ../xserver-xorg.templates:3001
msgid ""
"Multiple video cards have been detected, and different X servers are "
"required to support the various devices. It is thus not possible to "
@@ -88,7 +70,7 @@ msgstr ""
#. Type: note
#. Description
-#: ../xserver-xorg.templates:4001
+#: ../xserver-xorg.templates:3001
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 "
@@ -99,7 +81,7 @@ msgstr ""
#. Type: note
#. Description
-#: ../xserver-xorg.templates:4001
+#: ../xserver-xorg.templates:3001
msgid ""
"The configuration process currently only supports single-headed setups; "
"however, the X server configuration files can be edited later to support a "
@@ -110,13 +92,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:5001
+#: ../xserver-xorg.templates:4001
msgid "Identifier for your video card:"
msgstr "مُعرّف بطاقتك الفيديوية:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:5001
+#: ../xserver-xorg.templates:4001
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 "
@@ -129,19 +111,19 @@ msgstr ""
#. Type: text
#. Description
-#: ../xserver-xorg.templates:6001
+#: ../xserver-xorg.templates:5001
msgid "Generic Video Card"
msgstr "بطاقة فيديو عامة"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:7001
+#: ../xserver-xorg.templates:6001
msgid "X server driver:"
msgstr "مُشغّل خادم X:"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:7001
+#: ../xserver-xorg.templates:6001
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."
@@ -151,7 +133,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:7001
+#: ../xserver-xorg.templates:6001
msgid ""
"Drivers are typically named for the video card or chipset manufacturer, or "
"for a specific model or family of chipsets."
@@ -161,13 +143,13 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:7001
msgid "Use kernel framebuffer device interface?"
msgstr "استخدام واجهة جهاز framebuffer الخاصة بالنواة؟"
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:7001
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 "
@@ -178,7 +160,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:7001
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 "
@@ -190,13 +172,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:9001
+#: ../xserver-xorg.templates:8001
msgid "Video card's bus identifier:"
msgstr "مُعرّف ناقل بطاقة الفيديو:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:9001
+#: ../xserver-xorg.templates:8001
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-"
@@ -207,13 +189,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:9001
+#: ../xserver-xorg.templates:8001
msgid "Examples:"
msgstr "أمثلة:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:9001
+#: ../xserver-xorg.templates:8001
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 "
@@ -224,7 +206,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:9001
+#: ../xserver-xorg.templates:8001
msgid ""
"You may wish to use the \"lspci\" command to determine the bus location of "
"your PCI, AGP, or PCI-Express video card."
@@ -234,7 +216,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:9001
+#: ../xserver-xorg.templates:8001
msgid ""
"When possible, this question has been pre-answered for you and you should "
"accept the default unless you know it doesn't work."
@@ -244,19 +226,19 @@ msgstr ""
#. Type: note
#. Description
-#: ../xserver-xorg.templates:10001
+#: ../xserver-xorg.templates:9001
msgid "Incorrect format for the bus identifier"
msgstr "نسق مُعرّف الناقل غير صحيح"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:10001
msgid "XKB rule set to use:"
msgstr "مجموعة أحكام XKB المطلوب استخدامها:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:10001
msgid ""
"For the X server to handle the keyboard correctly, an XKB rule set must be "
"chosen."
@@ -266,7 +248,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:10001
msgid ""
"Users of most keyboards should enter \"xorg\". Users of Sun Type 4 and Type "
"5 keyboards, however, should enter \"sun\"."
@@ -276,7 +258,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:10001
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 "
@@ -288,19 +270,19 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:10001
msgid "When in doubt, this value should be set to \"xorg\"."
msgstr "عندما تكون في شك، يجب تحديد القيمة بـ\"xorg\"."
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:11001
msgid "Keyboard model:"
msgstr "طراز لوحة المفاتيح:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:11001
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."
@@ -310,7 +292,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:11001
msgid ""
" With the \"xorg\" rule set:\n"
" - pc101: traditional IBM PC/AT style keyboard with 101 keys, common in\n"
@@ -344,7 +326,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:11001
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 "
@@ -356,7 +338,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:11001
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 "
@@ -368,7 +350,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:11001
msgid ""
"Users of U.S. English keyboards should generally enter \"pc104\". Users of "
"most other keyboards should generally enter \"pc105\"."
@@ -379,13 +361,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:12001
msgid "Keyboard layout:"
msgstr "تخطيط لوحة المفاتيح:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:12001
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 "
@@ -397,7 +379,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:12001
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/"
@@ -409,7 +391,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:12001
msgid ""
"Users of U.S. English keyboards should enter \"us\". Users of keyboards "
"localized for other countries should generally enter their ISO 3166 country "
@@ -421,13 +403,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:14001
+#: ../xserver-xorg.templates:13001
msgid "Keyboard variant:"
msgstr "بديل لوحة المفاتيح:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:14001
+#: ../xserver-xorg.templates:13001
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 "
@@ -439,7 +421,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:14001
+#: ../xserver-xorg.templates:13001
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 "
@@ -450,7 +432,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:14001
+#: ../xserver-xorg.templates:13001
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/"
@@ -463,7 +445,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:14001
+#: ../xserver-xorg.templates:13001
msgid ""
"Users of U.S. English keyboards should generally leave this entry blank."
msgstr ""
@@ -472,13 +454,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:15001
+#: ../xserver-xorg.templates:14001
msgid "Keyboard options:"
msgstr "خيارات لوحة المفاتيح:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:15001
+#: ../xserver-xorg.templates:14001
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 "
@@ -490,7 +472,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:15001
+#: ../xserver-xorg.templates:14001
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 "
@@ -502,7 +484,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:15001
+#: ../xserver-xorg.templates:14001
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 "
@@ -517,7 +499,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:15001
+#: ../xserver-xorg.templates:14001
msgid ""
"You can combine options by separating them with a comma, for instance \"ctrl:"
"nocaps,altwin:meta_win\"."
@@ -527,7 +509,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:15001
+#: ../xserver-xorg.templates:14001
msgid ""
"Experienced users can use any options compatible with the selected XKB "
"model, layout and variant."
@@ -537,313 +519,55 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:15001
+#: ../xserver-xorg.templates:14001
msgid "When in doubt, this value should be left blank."
msgstr "عندما تكون في شك، يجب ترك هذه القيمة فارغة."
-#. Type: boolean
-#. Description
-#: ../xserver-xorg.templates:16001
-msgid "Attempt monitor autodetection?"
-msgstr "هل تريد محاولة التعرف الآلي على الشاشة؟"
-
-#. Type: boolean
-#. Description
-#: ../xserver-xorg.templates:16001
-msgid ""
-"Many monitors (including LCD's) and video cards support a communication "
-"protocol that allows the monitor's technical characteristics to be "
-"communicated back to the computer. If the monitor and video card support "
-"this protocol, further configuration questions about the monitor will be pre-"
-"answered."
-msgstr ""
-"العديد من الشاشات (بما في ذلك LCD) وبطاقات الفيديو تدعم بروتوكول تواصل يسمح "
-"بتوصيل صفات الشاشة التقنية إلى الحاسب. إن كانت الشاشة وبطاقة الفيديو تدعم "
-"هذا البروتوكول، فسوف يتم الإجابة عن أية أسئلة إضافية حول تهيئة الشاشة."
-
-#. Type: boolean
-#. Description
-#: ../xserver-xorg.templates:16001
-msgid ""
-"If autodetection fails, you will be asked for information about the monitor."
-msgstr "إن فشل الاكتشاف التلقائي، فسيطلب منك المزيد من المعلومات حول الشاشة."
-
-#. Type: select
-#. Description
-#: ../xserver-xorg.templates:17001
-msgid "Method for selecting the monitor characteristics:"
-msgstr "طريقة اختيار مواصفات الشاشة:"
-
-#. Type: select
-#. Description
-#: ../xserver-xorg.templates:17001
-msgid ""
-"For the X Window System graphical user interface to operate correctly, "
-"certain characteristics of the monitor must be known."
-msgstr ""
-"كي تعمل واجهة المستخدم الرسومية لنظام نوافذ X بشكل صحيح، يجب معرفة المواصفات "
-"الخاصة بشاشتك."
-
-#. Type: select
-#. Description
-#: ../xserver-xorg.templates:17001
-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 "
-"corresponding size, but may be suboptimal for high-quality CRT's."
-msgstr ""
-"يسألك الخيار \"بسيط\" حول حجم الشاشة الفعلي؛ ويقوم بعدها بتعيين بعض قيم "
-"التهيئة الملائمة لشاشات CRT التي لها نفس الحجم،إلا أن هذا قد يكون دون "
-"المستوى المطلوب لشاشات CRT ذات الجودة العالية."
-
-#. Type: select
-#. Description
-#: ../xserver-xorg.templates:17001
-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 "
-"you wish to use (and that you know the monitor is capable of)."
-msgstr ""
-"يقدم لك الخيار \"متوسط\" قائمة باستبانات الشاشة و معدلات الإنعاش، مثال "
-"\"800X600 @ 85Hz\"؛ عليك باختيار الوضع الأفضل الذي تود استخدامه (والذي تعمله "
-"أن شاشاتك يمكنها استخدامه)."
-
-#. Type: select
-#. Description
-#: ../xserver-xorg.templates:17001
-msgid ""
-"The \"advanced\" option will let you specify the monitor's horizontal sync "
-"and vertical refresh tolerances directly."
-msgstr ""
-"يسمح لك الخيار \"متقدم\" بتحديد قيم مزامنة الشاشة الأفقية والعمودية بشكل "
-"مباشر."
-
-#. Type: select
-#. Choices
-#: ../xserver-xorg.templates:18001
-msgid "Up to 14 inches (355 mm)"
-msgstr "حتى 14 إنش (355 مليمتر)"
-
-#. Type: select
-#. Choices
-#: ../xserver-xorg.templates:18001
-msgid "15 inches (380 mm)"
-msgstr "15 إنش (380 مليمتر)"
-
-#. Type: select
-#. Choices
-#: ../xserver-xorg.templates:18001
-msgid "17 inches (430 mm)"
-msgstr "17 إنش (430 مليمتر)"
-
-#. Type: select
-#. Choices
-#: ../xserver-xorg.templates:18001
-msgid "19-20 inches (480-510 mm)"
-msgstr "19-20 إنش (480-510 مليمتر)"
-
-#. Type: select
-#. Choices
-#: ../xserver-xorg.templates:18001
-msgid "21 inches (530 mm) or more"
-msgstr "21 إنش (530 مليمتر) أو أكثر"
-
-#. Type: select
-#. Description
-#: ../xserver-xorg.templates:18002
-msgid "Approximate monitor size:"
-msgstr "حجم الشاشة التقريبي:"
-
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
