xorg: Changes to 'ubuntu'
debian/changelog | 69 +++++++++
debian/control | 2
debian/local/dexconf | 14 -
debian/po/ar.po | 264 ++++++++++++++++--------------------
debian/po/bg.po | 262 ++++++++++++++++--------------------
debian/po/bs.po | 276 +++++++++++++++++---------------------
debian/po/ca.po | 277 +++++++++++++++++---------------------
debian/po/cs.po | 271 +++++++++++++++++--------------------
debian/po/da.po | 276 +++++++++++++++++---------------------
debian/po/de.po | 280 +++++++++++++++++----------------------
debian/po/dz.po | 274 +++++++++++++++++---------------------
debian/po/el.po | 285 +++++++++++++++++----------------------
debian/po/es.po | 282 +++++++++++++++++----------------------
debian/po/eu.po | 282 +++++++++++++++++----------------------
debian/po/fi.po | 279 +++++++++++++++++----------------------
debian/po/fr.po | 277 +++++++++++++++++---------------------
debian/po/gl.po | 278 +++++++++++++++++---------------------
debian/po/he.po | 267 ++++++++++++++++---------------------
debian/po/hr.po | 275 +++++++++++++++++---------------------
debian/po/hu.po | 269 ++++++++++++++++---------------------
debian/po/it.po | 276 +++++++++++++++++---------------------
debian/po/ja.po | 277 +++++++++++++++++---------------------
debian/po/km.po | 266 ++++++++++++++++---------------------
debian/po/ko.po | 267 ++++++++++++++++---------------------
debian/po/lt.po | 279 +++++++++++++++++----------------------
debian/po/ml.po | 272 ++++++++++++++++----------------------
debian/po/mr.po | 268 ++++++++++++++++---------------------
debian/po/nb.po | 269 ++++++++++++++++---------------------
debian/po/ne.po | 269 ++++++++++++++++---------------------
debian/po/nl.po | 279 +++++++++++++++++----------------------
debian/po/nn.po | 271 ++++++++++++++++---------------------
debian/po/pl.po | 266 +++++++++++++++----------------------
debian/po/pt.po | 282 +++++++++++++++++----------------------
debian/po/pt_BR.po | 283 +++++++++++++++++----------------------
debian/po/ro.po | 286 ++++++++++++++++++----------------------
debian/po/ru.po | 274 +++++++++++++++++---------------------
debian/po/sk.po | 272 +++++++++++++++++---------------------
debian/po/sq.po | 276 +++++++++++++++++---------------------
debian/po/sv.po | 278 +++++++++++++++++---------------------
debian/po/ta.po | 271 ++++++++++++++++---------------------
debian/po/templates.pot | 183 +++++++------------------
debian/po/th.po | 267 ++++++++++++++++---------------------
debian/po/tr.po | 278 +++++++++++++++++---------------------
debian/po/vi.po | 277 +++++++++++++++++---------------------
debian/po/wo.po | 274 +++++++++++++++++---------------------
debian/po/zh_CN.po | 261 ++++++++++++++++--------------------
debian/po/zh_TW.po | 263 ++++++++++++++++--------------------
debian/scripts/vars.amd64 | 4
debian/scripts/vars.i386 | 4
debian/xserver-xorg.postinst.in | 256 +++++------------------------------
debian/xserver-xorg.templates | 40 -----
51 files changed, 5434 insertions(+), 6913 deletions(-)
New commits:
commit d60cb1fc248cb609e9f634a751ad7af29247eb18
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue Jan 8 10:25:09 2008 +0200
vars.{i386,amd64}: add vmmouse.
diff --git a/debian/changelog b/debian/changelog
index 3fb6d37..7376ce3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.3+10ubuntu2) hardy; urgency=low
+
+ * vars.{i386,amd64}: add vmmouse.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 08 Jan 2008 10:21:31 +0200
+
xorg (1:7.3+10ubuntu1) hardy; urgency=low
* Merge with Debian unstable, remaining changes:
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index b9080e5..a7342ba 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -6,6 +6,6 @@
XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-intel, xserver-xorg-video-i810, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-nv, xserver-xorg-video-openchrome, xserver-xorg-video-rendition, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-siliconmotion, xserver-xorg-video-sis, xserver-xorg-video-sisusb, xserver-xorg-video-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vga, xserver-xorg-video-v4l, xserver-xorg-video-vmware"
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-vmmouse, xserver-xorg-input-wacom"
XSERVER_XORG_DETECT_DEPENDS="dmidecode"
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 91301ce..4dfeaa1 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -7,7 +7,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-amd, xserver-xorg-video-apm, xser
# xserver-xorg-video-glide,
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-vmmouse, xserver-xorg-input-wacom"
XSERVER_XORG_DETECT_DEPENDS="dmidecode"
commit 83272c358dad64788aedd80f8998c588f708af6d
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Mon Jan 7 18:10:46 2008 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index b39fe9b..3fb6d37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.3+10ubuntu1) UNRELEASED; urgency=low
+xorg (1:7.3+10ubuntu1) hardy; urgency=low
* Merge with Debian unstable, remaining changes:
- apport/xorg-server.py, debian/x11-common.install:
@@ -40,7 +40,7 @@ xorg (1:7.3+10ubuntu1) UNRELEASED; urgency=low
+ Skip video card autodetection if xforcevesa is set.
* vars.{i386,amd64}: add openchrome.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Mon, 07 Jan 2008 17:12:03 +0200
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Mon, 07 Jan 2008 18:10:18 +0200
xorg (1:7.3+10) unstable; urgency=low
commit e6231d781e1eee7311de23d40243cf2fe66b6cda
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Mon Jan 7 18:10:05 2008 +0200
vars.{i386,amd64}: add openchrome.
diff --git a/debian/changelog b/debian/changelog
index 4f6c5cb..b39fe9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,8 +38,9 @@ xorg (1:7.3+10ubuntu1) UNRELEASED; urgency=low
with gdm anyway since gdm cleans the file on login).
- xserver-xorg.postinst.in:
+ Skip video card autodetection if xforcevesa is set.
+ * vars.{i386,amd64}: add openchrome.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Sat, 05 Jan 2008 10:06:24 +0200
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Mon, 07 Jan 2008 17:12:03 +0200
xorg (1:7.3+10) unstable; urgency=low
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 5ccb1aa..b9080e5 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -3,7 +3,7 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-intel, xserver-xorg-video-i810, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-nv, xserver-xorg-video-rendition, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-siliconmotion, xserver-xorg-video-sis, xserver-xorg-video-sisusb, xserver-xorg-video-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vga, xserver-xorg-video-v4l, xserver-xorg-video-vmware"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-intel, xserver-xorg-video-i810, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-nv, xserver-xorg-video-openchrome, xserver-xorg-video-rendition, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-siliconmotion, xserver-xorg-video-sis, xserver-xorg-video-sisusb, xserver-xorg-video-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vga, xserver-xorg-video-v4l, xserver-xorg-video-vmware"
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 301d4a6..91301ce 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -3,7 +3,7 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-amd, xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-intel, xserver-xorg-video-i810, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, xserver-xorg-video-psb, xserver-xorg-video-rendition, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-siliconmotion, xserver-xorg-video-sis, xserver-xorg-video-sisusb, xserver-xorg-video-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vmware, xserver-xorg-video-v4l"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-amd, xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-intel, xserver-xorg-video-i810, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, xserver-xorg-video-openchrome, xserver-xorg-video-psb, xserver-xorg-video-rendition, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-siliconmotion, xserver-xorg-video-sis, xserver-xorg-video-sisusb, xserver-xorg-video-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vmware, xserver-xorg-video-v4l"
# xserver-xorg-video-glide,
commit dc9545e9b6e31989c6133779309735f6e43b8128
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Jan 6 15:48:06 2008 -0500
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index b0f714d..9cd3db3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.3+10) UNRELEASED; urgency=low
+xorg (1:7.3+10) unstable; urgency=low
* Just write a default video card identifier
* Only run driver autodetection on sparc hardware
@@ -15,7 +15,7 @@ xorg (1:7.3+10) UNRELEASED; urgency=low
* Don't write the DPMS option to the monitor section of xorg.conf.
The xserver already defaults to enabling DPMS
- -- David Nusinow <dnusinow@debian.org> Sun, 06 Jan 2008 14:27:42 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 06 Jan 2008 15:17:14 -0500
xorg (1:7.3+9) unstable; urgency=low
commit ee160422c097bbe4fab6ef8b5df0b7bc312d4753
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Jan 6 15:16:58 2008 -0500
* Don't write the DPMS option to the monitor section of xorg.conf.
The xserver already defaults to enabling DPMS
diff --git a/debian/changelog b/debian/changelog
index 0c65d60..b0f714d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,10 @@ xorg (1:7.3+10) UNRELEASED; urgency=low
and more to figure out which PCI ID's have video cards, so don't replicate
it. Currently we only ask people who have ppc, SGI indigos, and multiple
heads on sparc.
+ * Don't write the DPMS option to the monitor section of xorg.conf.
+ The xserver already defaults to enabling DPMS
- -- David Nusinow <dnusinow@debian.org> Sun, 06 Jan 2008 13:40:33 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 06 Jan 2008 14:27:42 -0500
xorg (1:7.3+9) unstable; urgency=low
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 749c99c..fae07a5 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -256,9 +256,8 @@ exec 4>"$DEXCONFTMPDIR/Monitor"
cat >&4 <<SECTION
Section "Monitor"
Identifier "Configured Monitor"
- Option "DPMS"
+EndSection
SECTION
-printf "EndSection\n" >&4
### SCREEN
commit 628b7dacad6e864715438826547b753b6b06d24a
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Jan 6 13:49:16 2008 -0500
* Don't ask the bus ID question to anyone who it's not necessary for
Hardcoding the bus ID is bad. The server already uses the same algorithm
and more to figure out which PCI ID's have video cards, so don't replicate
it. Currently we only ask people who have ppc, SGI indigos, and multiple
heads on sparc.
diff --git a/debian/changelog b/debian/changelog
index 9a8bbeb..0c65d60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,13 @@ xorg (1:7.3+10) UNRELEASED; urgency=low
Closes: #442892, #448845, #410889, #443397, #242952, #271599
+ Remove discover and discover1 from the xserver-xorg recommends
+ Remove autodetect_video_card and multiple_possible_x-driver templates
+ * Don't ask the bus ID question to anyone who it's not necessary for
+ Hardcoding the bus ID is bad. The server already uses the same algorithm
+ and more to figure out which PCI ID's have video cards, so don't replicate
+ it. Currently we only ask people who have ppc, SGI indigos, and multiple
+ heads on sparc.
- -- David Nusinow <dnusinow@debian.org> Sat, 05 Jan 2008 19:02:39 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 06 Jan 2008 13:40:33 -0500
xorg (1:7.3+9) unstable; urgency=low
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index d8c2236..14c50cf 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -559,15 +559,8 @@ if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
# only one in the machine (broken PCI bus code in the XFree86 X server, most
# likely). If there are multiple video cards, we need to configure one as the
# primary head.
- # Warty: always feed this info.
- MULTIHEAD=yes
if [ "$ARCH" = "powerpc" ] || [ "$MULTIHEAD" = "yes" ]; then
- if [ "$ARCH" = "powerpc" ]; then
- PRIORITY=medium
- fi
- if [ "$MULTIHEAD" = "yes" ]; then
- PRIORITY=medium
- fi
+ PRIORITY=medium
if which lspci > /dev/null 2>&1; then
# Try to guess the correct BusID.
VIDEO_CARD=$(LC_ALL=C lspci -n | grep -E "(Class )?0300:" | sort -n | head -n 1 \
@@ -605,11 +598,17 @@ if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
fi
fi
- # this question requires input validation
- if [ -n "$DEFAULT" ]; then
- auto_answer validate_bus_id_db_input "$(priority_ceil $PRIORITY)" xserver-xorg/config/device/bus_id "$DEFAULT"
+ # For most people, asking this question at all is a bad idea. Only do it
+ # if we have a need to do so, as defined by setting the priority
+ if [ "$PRIORITY" = "medium" ]; then
+ # this question requires input validation
+ if [ -n "$DEFAULT" ]; then
+ auto_answer validate_bus_id_db_input "$(priority_ceil $PRIORITY)" xserver-xorg/config/device/bus_id "$DEFAULT"
+ else
+ validate_bus_id_db_input "$(priority_ceil $PRIORITY)" xserver-xorg/config/device/bus_id || debug_report_status "validate_bus_id_db_input $(priority_ceil $PRIORITY) xserver-xorg/config/device/bus_id" "$?"
+ fi
else
- validate_bus_id_db_input "$(priority_ceil $PRIORITY)" xserver-xorg/config/device/bus_id || debug_report_status "validate_bus_id_db_input $(priority_ceil $PRIORITY) xserver-xorg/config/device/bus_id" "$?"
+ db_set xserver-xorg/config/device/bus_id ""
fi
# use fbcon kernel functions?
commit 91a3a6384739a342f18635baa4c440f6cc495556
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Jan 5 19:11:53 2008 -0500
Remove autodetect_video_card and multiple_possible_x-driver templates
diff --git a/debian/changelog b/debian/changelog
index 9ee64e2..9a8bbeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,12 @@ xorg (1:7.3+10) UNRELEASED; urgency=low
* Just write a default video card identifier
* Only run driver autodetection on sparc hardware
All other archictectures should be better supported by having the server
- do it at startup.
+ do it at startup.
Closes: #442892, #448845, #410889, #443397, #242952, #271599
+ Remove discover and discover1 from the xserver-xorg recommends
+ + Remove autodetect_video_card and multiple_possible_x-driver templates
- -- David Nusinow <dnusinow@debian.org> Sat, 05 Jan 2008 17:38:10 -0500
+ -- David Nusinow <dnusinow@debian.org> Sat, 05 Jan 2008 19:02:39 -0500
xorg (1:7.3+9) unstable; urgency=low
diff --git a/debian/po/ar.po b/debian/po/ar.po
index 72739b1..a3d0e48 100644
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ar\n"
"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 17:07-0500\n"
+"POT-Creation-Date: 2008-01-05 19:04-0500\n"
"PO-Revision-Date: 2007-04-06 19:54+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -19,86 +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: boolean
-#. Description
-#: ../xserver-xorg.templates:2001
-msgid "Attempt to autodetect video hardware?"
-msgstr "تريد محاولة التعرف الآلي على عتاد الفيديو؟"
-
-#. Type: boolean
-#. Description
-#: ../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 "
-"autodetection fails, you will be asked to specify the desired X server and/"
-"or driver module. If it succeeds, further configuration questions about "
-"your video hardware will be pre-answered."
-msgstr ""
-"عليك بانتقاء هذا الخيار إن أردت تجربة الاكتشاف الآلي لخادم X المقترح ووحدة "
-"تشغيل بطاقتك الفيديوية. إن فشلت عملية الاكتشاف الآلي، فسيطلب منك تحديد خادم "
-"X المطلوب و/أو وحدة التشغيل. أما إن نجحت العملية، فستتم الإجابة عن الأسئلة "
-"الإضافية حول تهيئة عتادك الفيديوي."
-
-#. Type: boolean
-#. Description
-#: ../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 "
-"is only one available."
-msgstr ""
-"إن كنت تفضل اختيار خادم X ووحدة تشغيله بنفسك، لا تقم بانتقاء هذا الخيار. لن "
-"يطلب منك اختيار خادم X إن كان هناك واحد فقط متوفر."
-
-#. Type: note
-#. Description
-#: ../xserver-xorg.templates:3001
-msgid "Multiple potential default X.Org server drivers for the hardware"
-msgstr "هناك عدة مُشغّلات افتراضية محتملة لخادم X.Org لهذا العتاد"
-
-#. Type: note
-#. Description
-#: ../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 "
-"automatically select a default X server."
-msgstr ""
-"لقد تم اكتشاف عدة بطاقات فيديو، وهناك حاجة إلى خادمات X مختلفة لدعم هذه "
-"الأجهزة المتعددة. لذا فليس من الممكن اختيار خادم X افتراضي تلقائياً."
-
-#. Type: note
-#. Description
-#: ../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 "
-"computer is booted up."
-msgstr ""
-"الرجاء تهيئة الجهاز الذي سيخدم \"الرأس الأولي\" لحاسبك؛ يكون هذا عادة بطاقة "
-"الفيديو والشاشة التي تستخدم للعرض عند إقلاع حاسبك."
-
-#. Type: note
-#. Description
-#: ../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 "
-"multi-head configuration."
-msgstr ""
-"تدعم عملية التهيئة حالياً فقط إعدادات الرأس الواحد؛ على أي حال، يمكنك تعديل "
-"ملفات تهيئة خادم X لاحقاً لدعم تهيئة الرؤوس المتعددة."
-
#. Type: select
#. Description
-#: ../xserver-xorg.templates:4001
+#: ../xserver-xorg.templates:2001
msgid "X server driver:"
msgstr "مُشغّل خادم X:"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:4001
+#: ../xserver-xorg.templates:2001
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."
@@ -108,7 +37,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:4001
+#: ../xserver-xorg.templates:2001
msgid ""
"Drivers are typically named for the video card or chipset manufacturer, or "
"for a specific model or family of chipsets."
@@ -118,13 +47,13 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:5001
+#: ../xserver-xorg.templates:3001
msgid "Use kernel framebuffer device interface?"
msgstr "استخدام واجهة جهاز framebuffer الخاصة بالنواة؟"
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:5001
+#: ../xserver-xorg.templates:3001
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 "
@@ -135,7 +64,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:5001
+#: ../xserver-xorg.templates:3001
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 "
@@ -147,13 +76,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:6001
+#: ../xserver-xorg.templates:4001
msgid "Video card's bus identifier:"
msgstr "مُعرّف ناقل بطاقة الفيديو:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:6001
+#: ../xserver-xorg.templates:4001
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-"
@@ -164,13 +93,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:6001
+#: ../xserver-xorg.templates:4001
msgid "Examples:"
msgstr "أمثلة:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:6001
+#: ../xserver-xorg.templates:4001
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 "
@@ -181,7 +110,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:6001
+#: ../xserver-xorg.templates:4001
msgid ""
"You may wish to use the \"lspci\" command to determine the bus location of "
"your PCI, AGP, or PCI-Express video card."
@@ -191,7 +120,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:6001
+#: ../xserver-xorg.templates:4001
msgid ""
"When possible, this question has been pre-answered for you and you should "
"accept the default unless you know it doesn't work."
@@ -201,19 +130,19 @@ msgstr ""
#. Type: note
#. Description
-#: ../xserver-xorg.templates:7001
+#: ../xserver-xorg.templates:5001
msgid "Incorrect format for the bus identifier"
msgstr "نسق مُعرّف الناقل غير صحيح"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
msgid "XKB rule set to use:"
msgstr "مجموعة أحكام XKB المطلوب استخدامها:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
msgid ""
"For the X server to handle the keyboard correctly, an XKB rule set must be "
"chosen."
@@ -223,7 +152,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
msgid ""
"Users of most keyboards should enter \"xorg\". Users of Sun Type 4 and Type "
"5 keyboards, however, should enter \"sun\"."
@@ -233,7 +162,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
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 "
@@ -245,19 +174,19 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
msgid "When in doubt, this value should be set to \"xorg\"."
msgstr "عندما تكون في شك، يجب تحديد القيمة بـ\"xorg\"."
#. Type: string
#. Description
-#: ../xserver-xorg.templates:9001
+#: ../xserver-xorg.templates:7001
msgid "Keyboard model:"
msgstr "طراز لوحة المفاتيح:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:9001
+#: ../xserver-xorg.templates:7001
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."
@@ -267,7 +196,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:9001
+#: ../xserver-xorg.templates:7001
msgid ""
" With the \"xorg\" rule set:\n"
" - pc101: traditional IBM PC/AT style keyboard with 101 keys, common in\n"
@@ -301,7 +230,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:9001
+#: ../xserver-xorg.templates:7001
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 "
@@ -313,7 +242,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:9001
+#: ../xserver-xorg.templates:7001
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 "
@@ -325,7 +254,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:9001
+#: ../xserver-xorg.templates:7001
msgid ""
"Users of U.S. English keyboards should generally enter \"pc104\". Users of "
"most other keyboards should generally enter \"pc105\"."
@@ -336,13 +265,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:10001
+#: ../xserver-xorg.templates:8001
msgid "Keyboard layout:"
msgstr "تخطيط لوحة المفاتيح:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:10001
+#: ../xserver-xorg.templates:8001
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 "
@@ -354,7 +283,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:10001
+#: ../xserver-xorg.templates:8001
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/"
@@ -366,7 +295,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:10001
+#: ../xserver-xorg.templates:8001
msgid ""
"Users of U.S. English keyboards should enter \"us\". Users of keyboards "
"localized for other countries should generally enter their ISO 3166 country "
@@ -378,13 +307,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:9001
msgid "Keyboard variant:"
msgstr "بديل لوحة المفاتيح:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:9001
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 "
@@ -396,7 +325,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:9001
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 "
@@ -407,7 +336,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:9001
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/"
@@ -420,7 +349,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:9001
msgid ""
"Users of U.S. English keyboards should generally leave this entry blank."
msgstr ""
@@ -429,13 +358,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:10001
msgid "Keyboard options:"
msgstr "خيارات لوحة المفاتيح:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:10001
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 "
@@ -447,7 +376,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:10001
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 "
@@ -459,7 +388,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:10001
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 "
@@ -474,7 +403,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:10001
msgid ""
"You can combine options by separating them with a comma, for instance \"ctrl:"
"nocaps,altwin:meta_win\"."
@@ -484,7 +413,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:10001
msgid ""
"Experienced users can use any options compatible with the selected XKB "
"model, layout and variant."
@@ -494,55 +423,55 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:10001
msgid "When in doubt, this value should be left blank."
msgstr "عندما تكون في شك، يجب ترك هذه القيمة فارغة."
#. Type: note
#. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:11001
msgid "Empty value"
msgstr "قيمة فارغة"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:11001
msgid "A null entry is not permitted for this value."
msgstr "لا يسمح بترك القيمة فارغة هنا"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:14001
+#: ../xserver-xorg.templates:12001
msgid "Invalid double-quote characters"
msgstr "علامتا تنصيص غير صالحتين"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:14001
+#: ../xserver-xorg.templates:12001
msgid "Double-quote (\") characters are not permitted in the entry value."
msgstr "علامات التنصيص المزدوجة (\") غير مسموحة هنا."
#. Type: note
#. Description
-#: ../xserver-xorg.templates:15001
+#: ../xserver-xorg.templates:13001
msgid "Numerical value needed"
msgstr "بحاجة إلى قيمة رقمية"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:15001
+#: ../xserver-xorg.templates:13001
msgid "Characters other than digits are not allowed in the entry."
msgstr "لا يسمح بأي أحرف هنا سوى الأرقام."
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:16001
+#: ../xserver-xorg.templates:14001
msgid "Autodetect keyboard layout?"
msgstr "هل تريد اكتشاف تخطيط لوحة المفاتيح آلياً؟"
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:16001
+#: ../xserver-xorg.templates:14001
msgid ""
"The default keyboard layout selection for the Xorg server will be based on a "
"combination of the language and the keyboard layout selected in the "
@@ -553,7 +482,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:16001
+#: ../xserver-xorg.templates:14001
msgid ""
"Choose this option if you want the keyboard layout to be redetected. Do not "
"choose it if you want to keep your current layout."
@@ -707,6 +636,56 @@ msgstr ""
"ستفشل عملية تثبيت الحزمة هذه وتتوقف كي تستطيع القيام بهذا. الرجاء إعادة "
"تشغيل عملية الترقية بعد أن تنتهي من تنظيف الدليل."
+#~ msgid "Attempt to autodetect video hardware?"
+#~ msgstr "تريد محاولة التعرف الآلي على عتاد الفيديو؟"
+
+#~ 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 "
+#~ "autodetection fails, you will be asked to specify the desired X server "
+#~ "and/or driver module. If it succeeds, further configuration questions "
+#~ "about your video hardware will be pre-answered."
+#~ msgstr ""
+#~ "عليك بانتقاء هذا الخيار إن أردت تجربة الاكتشاف الآلي لخادم X المقترح "
+#~ "ووحدة تشغيل بطاقتك الفيديوية. إن فشلت عملية الاكتشاف الآلي، فسيطلب منك "
+#~ "تحديد خادم X المطلوب و/أو وحدة التشغيل. أما إن نجحت العملية، فستتم "
+#~ "الإجابة عن الأسئلة الإضافية حول تهيئة عتادك الفيديوي."
+
+#~ 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 is only one available."
+#~ msgstr ""
+#~ "إن كنت تفضل اختيار خادم X ووحدة تشغيله بنفسك، لا تقم بانتقاء هذا الخيار. "
+#~ "لن يطلب منك اختيار خادم X إن كان هناك واحد فقط متوفر."
+
+#~ msgid "Multiple potential default X.Org server drivers for the hardware"
+#~ msgstr "هناك عدة مُشغّلات افتراضية محتملة لخادم X.Org لهذا العتاد"
+
+#~ msgid ""
+#~ "Multiple video cards have been detected, and different X servers are "
+#~ "required to support the various devices. It is thus not possible to "
+#~ "automatically select a default X server."
+#~ msgstr ""
+#~ "لقد تم اكتشاف عدة بطاقات فيديو، وهناك حاجة إلى خادمات X مختلفة لدعم هذه "
+#~ "الأجهزة المتعددة. لذا فليس من الممكن اختيار خادم X افتراضي تلقائياً."
+
+#~ 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 computer is booted up."
+#~ msgstr ""
+#~ "الرجاء تهيئة الجهاز الذي سيخدم \"الرأس الأولي\" لحاسبك؛ يكون هذا عادة "
+#~ "بطاقة الفيديو والشاشة التي تستخدم للعرض عند إقلاع حاسبك."
+
+#~ msgid ""
+#~ "The configuration process currently only supports single-headed setups; "
+#~ "however, the X server configuration files can be edited later to support "
+#~ "a multi-head configuration."
+#~ msgstr ""
+#~ "تدعم عملية التهيئة حالياً فقط إعدادات الرأس الواحد؛ على أي حال، يمكنك "
+#~ "تعديل ملفات تهيئة خادم X لاحقاً لدعم تهيئة الرؤوس المتعددة."
+
#~ msgid "Identifier for your video card:"
#~ msgstr "مُعرّف بطاقتك الفيديوية:"
diff --git a/debian/po/bg.po b/debian/po/bg.po
index aaacc55..ac0e4d6 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -26,7 +26,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xserver-xorg_debian_po_bg\n"
"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 17:07-0500\n"
+"POT-Creation-Date: 2008-01-05 19:04-0500\n"
"PO-Revision-Date: 2007-04-06 14:09+0300\n"
"Last-Translator: Damyan Ivanov <dam@modsoftsys.com>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -35,85 +35,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#. Type: boolean
-#. Description
-#: ../xserver-xorg.templates:2001
-msgid "Attempt to autodetect video hardware?"
-msgstr "Автоматично откриване на видео-картата?"
-
-#. Type: boolean
-#. Description
-#: ../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 "
-"autodetection fails, you will be asked to specify the desired X server and/"
-"or driver module. If it succeeds, further configuration questions about "
-"your video hardware will be pre-answered."
-msgstr ""
-"Ако видео-картата бъде открита автоматично, по-нататъшната настройка ще "
-"използва по подразбиране откритите стойности. "
-
-#. Type: boolean
-#. Description
-#: ../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 "
-"is only one available."
-msgstr ""
-"Ако предпочитате сами да изберете X-сървър и драйвер, отклонете "
-"предложението."
-
-#. Type: note
-#. Description
-#: ../xserver-xorg.templates:3001
-msgid "Multiple potential default X.Org server drivers for the hardware"
-msgstr "Видео-картата се поддържа от няколко драйвера на X.Org"
-
-#. Type: note
-#. Description
-#: ../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 "
-"automatically select a default X server."
-msgstr ""
-"Открити са няколко видео-карти, поддържани от различни X-сървъри. "
-"Автоматичното избиране на X-сървър е невъзможно."
-
-#. Type: note
-#. Description
-#: ../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 "
-"computer is booted up."
-msgstr ""
-"Изберете видео-картата, която е „главна“. Обикновено това е видео-картата, "
-"която се използва при стартиране на компютъра."
-
-#. Type: note
-#. Description
-#: ../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 "
-"multi-head configuration."
-msgstr ""
-"Този помощник за настройка на X-сървъра поддържа само варианти с един "
-"монитор. Това не пречи по-късно да редактирате ръчно файла с настройките и "
-"да добавите поддръжка на повече монитори."
-
#. Type: select
#. Description
-#: ../xserver-xorg.templates:4001
+#: ../xserver-xorg.templates:2001
msgid "X server driver:"
msgstr "Драйвер за видео-картата:"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:4001
+#: ../xserver-xorg.templates:2001
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."
@@ -123,7 +53,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:4001
+#: ../xserver-xorg.templates:2001
msgid ""
"Drivers are typically named for the video card or chipset manufacturer, or "
"for a specific model or family of chipsets."
@@ -133,13 +63,13 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:5001
+#: ../xserver-xorg.templates:3001
msgid "Use kernel framebuffer device interface?"
Reply to: