xorg: Changes to 'debian-unstable'
debian/changelog | 10 +
debian/control | 2
debian/local/dexconf | 11 --
debian/po/ar.po | 143 +++++++++++++--------------
debian/po/bg.po | 143 +++++++++++++--------------
debian/po/bs.po | 144 +++++++++++++--------------
debian/po/ca.po | 145 +++++++++++++---------------
debian/po/cs.po | 145 +++++++++++++---------------
debian/po/da.po | 145 +++++++++++++---------------
debian/po/de.po | 145 +++++++++++++---------------
debian/po/dz.po | 144 +++++++++++++--------------
debian/po/el.po | 145 +++++++++++++---------------
debian/po/es.po | 145 +++++++++++++---------------
debian/po/eu.po | 145 +++++++++++++---------------
debian/po/fi.po | 144 +++++++++++++--------------
debian/po/fr.po | 145 +++++++++++++---------------
debian/po/gl.po | 144 +++++++++++++--------------
debian/po/he.po | 143 +++++++++++++--------------
debian/po/hr.po | 143 +++++++++++++--------------
debian/po/hu.po | 144 +++++++++++++--------------
debian/po/it.po | 143 +++++++++++++--------------
debian/po/ja.po | 143 +++++++++++++--------------
debian/po/km.po | 143 +++++++++++++--------------
debian/po/ko.po | 144 +++++++++++++--------------
debian/po/lt.po | 145 +++++++++++++---------------
debian/po/ml.po | 145 +++++++++++++---------------
debian/po/mr.po | 144 +++++++++++++--------------
debian/po/nb.po | 144 +++++++++++++--------------
debian/po/ne.po | 144 +++++++++++++--------------
debian/po/nl.po | 144 +++++++++++++--------------
debian/po/nn.po | 144 +++++++++++++--------------
debian/po/pl.po | 129 ++++++++++---------------
debian/po/pt.po | 145 +++++++++++++---------------
debian/po/pt_BR.po | 145 +++++++++++++---------------
debian/po/ro.po | 147 +++++++++++++---------------
debian/po/ru.po | 145 +++++++++++++---------------
debian/po/sk.po | 144 +++++++++++++--------------
debian/po/sq.po | 145 +++++++++++++---------------
debian/po/sv.po | 145 +++++++++++++---------------
debian/po/ta.po | 143 +++++++++++++--------------
debian/po/templates.pot | 124 +++++++++---------------
debian/po/th.po | 143 +++++++++++++--------------
debian/po/tr.po | 145 +++++++++++++---------------
debian/po/vi.po | 145 +++++++++++++---------------
debian/po/wo.po | 145 +++++++++++++---------------
debian/po/zh_CN.po | 142 +++++++++++++--------------
debian/po/zh_TW.po | 143 +++++++++++++--------------
debian/xserver-xorg.postinst.in | 206 ++++------------------------------------
debian/xserver-xorg.templates | 11 --
49 files changed, 2992 insertions(+), 3558 deletions(-)
New commits:
commit 1d649db215c1e7e5013157ada0fca6c2f79840ab
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Jan 5 18:01:12 2008 -0500
Remove now useless comment in dexconf
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 7da3e5d..749c99c 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -230,7 +230,6 @@ printf "EndSection\n" >&4
db_get xserver-$SERVER/config/device/driver
DEVICE_DRIVER="$RET"
-# BusID, VideoRam, and UseFBDev are permitted to be null.
db_get xserver-$SERVER/config/device/bus_id
DEVICE_BUSID="$RET"
db_get xserver-$SERVER/config/device/use_fbdev
commit 9829464fb86f4c782a5f57d61004bf2c1a6de0ee
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Jan 5 17:59:47 2008 -0500
* Only run driver autodetection on sparc hardware
All other archictectures should be better supported by having the server
do it at startup
+ Remove discover and discover1 from the xserver-xorg recommends
diff --git a/debian/changelog b/debian/changelog
index 714cb4c..8e0cac2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,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
+ + Remove discover and discover1 from the xserver-xorg recommends
- -- David Nusinow <dnusinow@debian.org> Sat, 05 Jan 2008 17:05:31 -0500
+ -- David Nusinow <dnusinow@debian.org> Sat, 05 Jan 2008 17:38:10 -0500
xorg (1:7.3+9) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0207145..e4a90c0 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, discover1 | discover, ${F:XServer-Xorg-Detect-Depends}
+Recommends: libgl1-mesa-dri, udev, ${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/local/dexconf b/debian/local/dexconf
index 8a3c544..7da3e5d 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -228,7 +228,7 @@ printf "EndSection\n" >&4
### DEVICE
-fetch xserver-$SERVER/config/device/driver
+db_get xserver-$SERVER/config/device/driver
DEVICE_DRIVER="$RET"
# BusID, VideoRam, and UseFBDev are permitted to be null.
db_get xserver-$SERVER/config/device/bus_id
@@ -239,8 +239,10 @@ exec 4>"$DEXCONFTMPDIR/Device"
cat >&4 <<SECTION
Section "Device"
Identifier "Configured Video Device"
- Driver "$DEVICE_DRIVER"
SECTION
+if [ -n "$DEVICE_DRIVER" ]; then
+ printf "\tDriver\t\t\"$DEVICE_DRIVER\"\n" >&4
+fi
if [ -n "$DEVICE_BUSID" ]; then
printf "\tBusID\t\t\"$DEVICE_BUSID\"\n" >&4
fi
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index c34eed6..2d2ddcf 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -203,54 +203,6 @@ discover_sparc_video () {
done
}
-discover_video () {
- # wrapper for discover command that can distinguish Discover 1.x and 2.x
-
- # Ugh, Discover 1.x didn't exit with nonzero status if given an unrecongized option!
- # Double ugh! Discover is crashy. People blame X when it crashes (but then,
- # people blame X when *anything* crashes).
- DISCOVER_ERRORFILE=$(tempfile)
- if DISCOVER_TEST=$(discover --version 2>>"$DISCOVER_ERRORFILE"); then
- if expr "$DISCOVER_TEST" : 'discover 2.*' > /dev/null 2>&1; then
- # Discover 2.x
- # XXX: this is sort of nasty
- VENDOR_MODEL_FILE=$(tempfile)
- SERVER_FILE=$(tempfile)
- DRIVER_FILE=$(tempfile)
-
- # Munge the source package version into the upstream version so we can
- # tell Discover what to look for. Discover's data is based on the
- # upstream version number, not the Debian package's, so strip the Debian
- # revision and the (ugh!) epoch. Note: do *not* do greedy matching.
- # Also, parameter expansions aren't nestable. No respect, I tell ya.
- _JUNK=${SOURCE_VERSION%-*}
- UPSTREAM_VERSION=${_JUNK#*:}
-
- CMD="discover --type-summary display"
- eval $CMD >>$VENDOR_MODEL_FILE || debug_report_status "$CMD" "$?"
- CMD="discover --data-path=xfree86/server/name \
- --data-version=$UPSTREAM_VERSION display"
- eval $CMD >>$SERVER_FILE || debug_report_status "$CMD" "$?"
- CMD="discover --data-path=xfree86/server/device/driver \
- --data-version=$UPSTREAM_VERSION display"
- eval $CMD >>$DRIVER_FILE || debug_report_status "$CMD" "$?"
-
- DISCOVERED_VIDEO=$(paste $VENDOR_MODEL_FILE $SERVER_FILE $DRIVER_FILE)
- rm -f $VENDOR_MODEL_FILE $SERVER_FILE $DRIVER_FILE
- else
- # must be Discover 1.x
- DISCOVERED_VIDEO=$(discover --disable=serial,parallel,usb,ide,scsi \
- --format="%V %M\t%S\t%D\n" video 2>/dev/null)
- fi
- echo "$DISCOVERED_VIDEO"
- else
- warn "cannot use discover; failed with error message:" \
- "$(cat "$DISCOVER_ERRORFILE")"
- fi
- rm "$DISCOVER_ERRORFILE" || warn "discover error file never created, or" \
- "already removed"
-}
-
validate_string_db_input () {
# Syntax: validate_string_db_input priority template
#
@@ -567,130 +519,38 @@ fi
debug_echo "Configuring $THIS_PACKAGE."
# collect information about installed video card(s), if possible
-case "$ARCH" in
- sparc)
- DISCOVER_PROG='prtconf'
- DISCOVER_FUNC='discover_sparc_video'
- ;;
- *)
- DISCOVER_PROG='discover'
- DISCOVER_FUNC='discover_video'
- ;;
-esac
-if which $DISCOVER_PROG > /dev/null 2>&1; then
- DISCOVERED_VIDEO=$($DISCOVER_FUNC)
- MULTIHEAD=$(echo "$DISCOVERED_VIDEO" | wc -l)
- DISCOVERED_VIDEO=$(echo "$DISCOVERED_VIDEO" | head -n 1)
- if [ -n "$DISCOVERED_VIDEO" ]; then
- NCARDS=$(echo "$DISCOVERED_VIDEO" | wc -l)
- SERVERS=$(echo "$DISCOVERED_VIDEO" | awk 'BEGIN { FS="\t" } {print $2}' | grep -v unknown | sort | uniq)
- if [ -n "$SERVERS" ]; then
- NSERVERS=$(echo "$SERVERS" | wc -l)
- fi
- DRIVERS=$(echo "$DISCOVERED_VIDEO" | awk 'BEGIN { FS="\t" } {print $NF}' | grep -v unknown | sort | uniq)
- if [ -n "$DRIVERS" ]; then
- NDRIVERS=$(echo "$DRIVERS" | wc -l)
- fi
- if [ $MULTIHEAD -gt 1 ]; then
- MULTIHEAD=yes
- fi
- fi
-fi
+if [ "$ARCH" == "sparc" ]; then
+ DISCOVER_PROG='prtconf'
+ DISCOVER_FUNC='discover_sparc_video'
-if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
if which $DISCOVER_PROG > /dev/null 2>&1; then
- PRIORITY="medium"
- if [ -n "$RECONFIGURE" ]; then
- PRIORITY="high"
- fi
- auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xorg/autodetect_video_card "true"
- db_get xserver-xorg/autodetect_video_card
- AUTODETECT_VIDEO_CARD="$RET"
- if [ "$AUTODETECT_VIDEO_CARD" = "true" ]; then
- # We're going to autodetect, so clear out the old values
- for param in use_fbdev driver bus_id; do
- db_reset xserver-xorg/config/device/$param
- done
-
- # priority of xserver-xorg/config/device/driver
- PRIORITY=medium
- if [ -n "$RECONFIGURE" ]; then
- PRIORITY=high
- fi
-
- DRIVER_DIRS="/usr/lib/xorg/modules/drivers"
- for i in $DRIVER_DIRS; do
- if [ -d $i ]; then
- REAL_DRIVER_DIRS="$REAL_DRIVER_DIRS $i "
- fi
- done
-
- if [ -n "$REAL_DRIVER_DIRS" ]; then
- # Build list of available video drivers, omitting the atimisc, r128, and
- # radeon sub-modules (the ati driver knows when and how to load these).
- # v4l is not a display driver, and dummy is for advanced users.
- DRIVER_LIST="$(find $REAL_DRIVER_DIRS -name '*_drv.*' \
- | sed 's|^.*/\([^/]*\)_drv\.[^\._]*|\1|g' \
- | egrep -v '^(atimisc|dummy|r128|radeon|v4l)$' | sort -u | xargs \
- | sed 's/ /, /g' 2>/dev/null) "
+ DISCOVERED_VIDEO=$($DISCOVER_FUNC)
+ MULTIHEAD=$(echo "$DISCOVERED_VIDEO" | wc -l)
+ DISCOVERED_VIDEO=$(echo "$DISCOVERED_VIDEO" | head -n 1)
+ if [ -n "$DISCOVERED_VIDEO" ]; then
+ NCARDS=$(echo "$DISCOVERED_VIDEO" | wc -l)
+ SERVERS=$(echo "$DISCOVERED_VIDEO" | awk 'BEGIN { FS="\t" } {print $2}' | grep -v unknown | sort | uniq)
+ if [ -n "$SERVERS" ]; then
+ NSERVERS=$(echo "$SERVERS" | wc -l)
fi
-
- # Set a hard-coded module list (if necessary) and default driver module on an
- # architecture-specific basis.
- case "$ARCH" in
- alpha)
- DEFAULT_DRIVER=vga
- ;;
- amd64|hurd-i386|i386)
- DEFAULT_DRIVER=vesa
- ;;
- sparc)
- DEFAULT_DRIVER=sunffb
- ;;
- *)
- DEFAULT_DRIVER=fbdev
- ;;
- esac
-
- if [ -z "$DRIVER_LIST" ] || [ "$DRIVER_LIST" = " " ]; then
- warn "no video driver modules found in $DRIVER_DIRS; defaulting to $DEFAULT_DRIVER"
- DRIVER_LIST="$DEFAULT_DRIVER"
+ DRIVERS=$(echo "$DISCOVERED_VIDEO" | awk 'BEGIN { FS="\t" } {print $NF}' | grep -v unknown | sort | uniq)
+ if [ -n "$DRIVERS" ]; then
+ NDRIVERS=$(echo "$DRIVERS" | wc -l)
fi
-
- observe "available video driver list set to \"$DRIVER_LIST\""
-
- if [ $NDRIVERS -eq 0 ]; then
- observe "could not autodetect X server driver: no video card" \
- "detected, or no driver known for it"
- elif [ $NDRIVERS -eq 1 ]; then
- observe "autodetected X server driver: $DRIVERS"
- PRIORITY=low
- DEFAULT_DRIVER="$DRIVERS"
- elif [ $NDRIVERS -gt 1 ]; then
- observe "could not autodetect X server driver: multiple drivers for" \
- "video cards"
- VIDEOCARD_DRIVER_REPORT=$(echo "$DISCOVERED_VIDEO" \
- | awk 'BEGIN { FS="\t"; printf " %-30s%30s\n .\n", "Detected Video Card", "Suggested driver module" } { printf " %-50s%10s\n", $1, $3 } END { printf " .\n" }')
- # can't do this until there is a way to embed newlines into debconf
- # command streams :(
- # db_subst shared/multiple_possible_x-drivers detected_cards \
- # "$VIDEOCARD_DRIVER_REPORT"
- observe "$VIDEOCARD_DRIVER_REPORT"
- PRIORITY=high
- db_input "$(priority_ceil high)" xserver-xorg/multiple_possible_x-drivers || debug_report_status "db_input $(priority_ceil high) xserver-xorg/multiple_possible_x-drivers" "$?"
- db_go
+ if [ $MULTIHEAD -gt 1 ]; then
+ MULTIHEAD=yes
fi
- else
- observe "user declined video card autodetection (driver)"
fi
else
- observe "could not autodetect X server driver: $DISCOVER_PROG not found"
+ DISCOVERED_VIDEO=""
fi
+else
+ DISCOVERED_VIDEO=""
+fi
+db_subst xserver-xorg/config/device/driver choices "$DISCOVERED_VIDEO"
+auto_answer db_input low xserver-xorg/config/device/driver "$DISCOVERED_VIDEO"
- db_subst xserver-xorg/config/device/driver choices "$DRIVER_LIST"
- auto_answer db_input "$PRIORITY" \
- xserver-xorg/config/device/driver "$DEFAULT_DRIVER"
-
+if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
# BusID
PRIORITY=low
DEFAULT=
commit 48fc287b8be190d970c80e5a08a9ef449d394b08
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Jan 5 17:17:43 2008 -0500
Commit templates for last change
diff --git a/debian/po/ar.po b/debian/po/ar.po
index b98ef1e..72739b1 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: Source: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2007-12-09 22:41-0500\n"
+"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-05 17:07-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"
@@ -90,40 +90,15 @@ msgstr ""
"تدعم عملية التهيئة حالياً فقط إعدادات الرأس الواحد؛ على أي حال، يمكنك تعديل "
"ملفات تهيئة خادم X لاحقاً لدعم تهيئة الرؤوس المتعددة."
-#. Type: string
-#. Description
-#: ../xserver-xorg.templates:4001
-msgid "Identifier for your video card:"
-msgstr "مُعرّف بطاقتك الفيديوية:"
-
-#. Type: string
-#. Description
-#: ../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 "
-"model name, e.g., \"Intel i915\", \"ATI RADEON X800\", or \"NVIDIA GeForce "
-"6600\"."
-msgstr ""
-"يقوم ملف تهيئة خادم X يتعيين اسم لبطاقة الفيديو يمكنك تحديده. ويكون هذا "
-"الاسم عادة اسم المصنّع أو الماركة يتبعها رقم الطراز، مثلاً، \"Intel i915\"، "
-"\"ATI RADEON X800\" أو \"NVIDIA GeForce 6600\"."
-
-#. Type: text
-#. Description
-#: ../xserver-xorg.templates:5001
-msgid "Generic Video Card"
-msgstr "بطاقة فيديو عامة"
-
#. Type: select
#. Description
-#: ../xserver-xorg.templates:6001
+#: ../xserver-xorg.templates:4001
msgid "X server driver:"
msgstr "مُشغّل خادم X:"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:6001
+#: ../xserver-xorg.templates:4001
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."
@@ -133,7 +108,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:6001
+#: ../xserver-xorg.templates:4001
msgid ""
"Drivers are typically named for the video card or chipset manufacturer, or "
"for a specific model or family of chipsets."
@@ -143,13 +118,13 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:7001
+#: ../xserver-xorg.templates:5001
msgid "Use kernel framebuffer device interface?"
msgstr "استخدام واجهة جهاز framebuffer الخاصة بالنواة؟"
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:7001
+#: ../xserver-xorg.templates:5001
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 "
@@ -160,7 +135,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:7001
+#: ../xserver-xorg.templates:5001
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 "
@@ -172,13 +147,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
msgid "Video card's bus identifier:"
msgstr "مُعرّف ناقل بطاقة الفيديو:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
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-"
@@ -189,13 +164,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
msgid "Examples:"
msgstr "أمثلة:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
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 "
@@ -206,7 +181,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
msgid ""
"You may wish to use the \"lspci\" command to determine the bus location of "
"your PCI, AGP, or PCI-Express video card."
@@ -216,7 +191,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
msgid ""
"When possible, this question has been pre-answered for you and you should "
"accept the default unless you know it doesn't work."
@@ -226,19 +201,19 @@ msgstr ""
#. Type: note
#. Description
-#: ../xserver-xorg.templates:9001
+#: ../xserver-xorg.templates:7001
msgid "Incorrect format for the bus identifier"
msgstr "نسق مُعرّف الناقل غير صحيح"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:10001
+#: ../xserver-xorg.templates:8001
msgid "XKB rule set to use:"
msgstr "مجموعة أحكام XKB المطلوب استخدامها:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:10001
+#: ../xserver-xorg.templates:8001
msgid ""
"For the X server to handle the keyboard correctly, an XKB rule set must be "
"chosen."
@@ -248,7 +223,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:10001
+#: ../xserver-xorg.templates:8001
msgid ""
"Users of most keyboards should enter \"xorg\". Users of Sun Type 4 and Type "
"5 keyboards, however, should enter \"sun\"."
@@ -258,7 +233,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:10001
+#: ../xserver-xorg.templates:8001
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 "
@@ -270,19 +245,19 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:10001
+#: ../xserver-xorg.templates:8001
msgid "When in doubt, this value should be set to \"xorg\"."
msgstr "عندما تكون في شك، يجب تحديد القيمة بـ\"xorg\"."
#. Type: string
#. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:9001
msgid "Keyboard model:"
msgstr "طراز لوحة المفاتيح:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:9001
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."
@@ -292,7 +267,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:9001
msgid ""
" With the \"xorg\" rule set:\n"
" - pc101: traditional IBM PC/AT style keyboard with 101 keys, common in\n"
@@ -326,7 +301,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:9001
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 "
@@ -338,7 +313,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:9001
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 "
@@ -350,7 +325,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:11001
+#: ../xserver-xorg.templates:9001
msgid ""
"Users of U.S. English keyboards should generally enter \"pc104\". Users of "
"most other keyboards should generally enter \"pc105\"."
@@ -361,13 +336,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:10001
msgid "Keyboard layout:"
msgstr "تخطيط لوحة المفاتيح:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:10001
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 "
@@ -379,7 +354,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:10001
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/"
@@ -391,7 +366,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:12001
+#: ../xserver-xorg.templates:10001
msgid ""
"Users of U.S. English keyboards should enter \"us\". Users of keyboards "
"localized for other countries should generally enter their ISO 3166 country "
@@ -403,13 +378,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:11001
msgid "Keyboard variant:"
msgstr "بديل لوحة المفاتيح:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:11001
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 "
@@ -421,7 +396,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:11001
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 "
@@ -432,7 +407,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:11001
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/"
@@ -445,7 +420,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:13001
+#: ../xserver-xorg.templates:11001
msgid ""
"Users of U.S. English keyboards should generally leave this entry blank."
msgstr ""
@@ -454,13 +429,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:14001
+#: ../xserver-xorg.templates:12001
msgid "Keyboard options:"
msgstr "خيارات لوحة المفاتيح:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:14001
+#: ../xserver-xorg.templates:12001
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 "
@@ -472,7 +447,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:14001
+#: ../xserver-xorg.templates:12001
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 "
@@ -484,7 +459,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:14001
+#: ../xserver-xorg.templates:12001
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 "
@@ -499,7 +474,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:14001
+#: ../xserver-xorg.templates:12001
msgid ""
"You can combine options by separating them with a comma, for instance \"ctrl:"
"nocaps,altwin:meta_win\"."
@@ -509,7 +484,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:14001
+#: ../xserver-xorg.templates:12001
msgid ""
"Experienced users can use any options compatible with the selected XKB "
"model, layout and variant."
@@ -519,55 +494,55 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:14001
+#: ../xserver-xorg.templates:12001
msgid "When in doubt, this value should be left blank."
msgstr "عندما تكون في شك، يجب ترك هذه القيمة فارغة."
#. Type: note
#. Description
-#: ../xserver-xorg.templates:15001
+#: ../xserver-xorg.templates:13001
msgid "Empty value"
msgstr "قيمة فارغة"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:15001
+#: ../xserver-xorg.templates:13001
msgid "A null entry is not permitted for this value."
msgstr "لا يسمح بترك القيمة فارغة هنا"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:16001
+#: ../xserver-xorg.templates:14001
msgid "Invalid double-quote characters"
msgstr "علامتا تنصيص غير صالحتين"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:16001
+#: ../xserver-xorg.templates:14001
msgid "Double-quote (\") characters are not permitted in the entry value."
msgstr "علامات التنصيص المزدوجة (\") غير مسموحة هنا."
#. Type: note
#. Description
-#: ../xserver-xorg.templates:17001
+#: ../xserver-xorg.templates:15001
msgid "Numerical value needed"
msgstr "بحاجة إلى قيمة رقمية"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:17001
+#: ../xserver-xorg.templates:15001
msgid "Characters other than digits are not allowed in the entry."
msgstr "لا يسمح بأي أحرف هنا سوى الأرقام."
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:18001
+#: ../xserver-xorg.templates:16001
msgid "Autodetect keyboard layout?"
msgstr "هل تريد اكتشاف تخطيط لوحة المفاتيح آلياً؟"
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:18001
+#: ../xserver-xorg.templates:16001
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 "
@@ -578,7 +553,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:18001
+#: ../xserver-xorg.templates:16001
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."
@@ -732,6 +707,22 @@ msgstr ""
"ستفشل عملية تثبيت الحزمة هذه وتتوقف كي تستطيع القيام بهذا. الرجاء إعادة "
"تشغيل عملية الترقية بعد أن تنتهي من تنظيف الدليل."
+#~ msgid "Identifier for your video card:"
+#~ msgstr "مُعرّف بطاقتك الفيديوية:"
+
+#~ 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 model name, e.g., \"Intel i915\", \"ATI RADEON X800\", or \"NVIDIA "
+#~ "GeForce 6600\"."
+#~ msgstr ""
+#~ "يقوم ملف تهيئة خادم X يتعيين اسم لبطاقة الفيديو يمكنك تحديده. ويكون هذا "
+#~ "الاسم عادة اسم المصنّع أو الماركة يتبعها رقم الطراز، مثلاً، \"Intel i915\"، "
+#~ "\"ATI RADEON X800\" أو \"NVIDIA GeForce 6600\"."
+
+#~ msgid "Generic Video Card"
+#~ msgstr "بطاقة فيديو عامة"
+
#~ msgid "Video modes to be used by the X server:"
#~ msgstr "أوضاع الفيديو التي يجب أن يستخدمها خادم X:"
diff --git a/debian/po/bg.po b/debian/po/bg.po
index aecd0b0..aaacc55 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -25,8 +25,8 @@
msgid ""
msgstr ""
"Project-Id-Version: xserver-xorg_debian_po_bg\n"
-"Report-Msgid-Bugs-To: Source: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2007-12-09 22:41-0500\n"
+"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2008-01-05 17:07-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"
@@ -105,40 +105,15 @@ msgstr ""
"монитор. Това не пречи по-късно да редактирате ръчно файла с настройките и "
"да добавите поддръжка на повече монитори."
-#. Type: string
-#. Description
-#: ../xserver-xorg.templates:4001
-msgid "Identifier for your video card:"
-msgstr "Име на видео-картата:"
-
-#. Type: string
-#. Description
-#: ../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 "
-"model name, e.g., \"Intel i915\", \"ATI RADEON X800\", or \"NVIDIA GeForce "
-"6600\"."
-msgstr ""
-"Файлът с настройки асоциира видео-картите с име, избрано от Вас. Името "
-"обикновено включва производителя и модела на видео-картата, например „Intel "
-"i915“, „ATI RADEON X800“ или „NVIDIA GeForce 6600“."
-
-#. Type: text
-#. Description
-#: ../xserver-xorg.templates:5001
-msgid "Generic Video Card"
-msgstr "Generic Video Card"
-
#. Type: select
#. Description
-#: ../xserver-xorg.templates:6001
+#: ../xserver-xorg.templates:4001
msgid "X server driver:"
msgstr "Драйвер за видео-картата:"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:6001
+#: ../xserver-xorg.templates:4001
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."
@@ -148,7 +123,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:6001
+#: ../xserver-xorg.templates:4001
msgid ""
"Drivers are typically named for the video card or chipset manufacturer, or "
"for a specific model or family of chipsets."
@@ -158,13 +133,13 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:7001
+#: ../xserver-xorg.templates:5001
msgid "Use kernel framebuffer device interface?"
msgstr "Използване на драйвера за framebuffer на ядрото?"
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:7001
+#: ../xserver-xorg.templates:5001
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 "
@@ -176,7 +151,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:7001
+#: ../xserver-xorg.templates:5001
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 "
@@ -189,13 +164,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
msgid "Video card's bus identifier:"
msgstr "Шина на видео-картата:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
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 +182,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
msgid "Examples:"
msgstr "Примери:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
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 "
@@ -225,7 +200,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
msgid ""
"You may wish to use the \"lspci\" command to determine the bus location of "
"your PCI, AGP, or PCI-Express video card."
@@ -235,7 +210,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:8001
+#: ../xserver-xorg.templates:6001
msgid ""
"When possible, this question has been pre-answered for you and you should "
"accept the default unless you know it doesn't work."
@@ -245,19 +220,19 @@ msgstr ""
#. Type: note
#. Description
-#: ../xserver-xorg.templates:9001
+#: ../xserver-xorg.templates:7001
msgid "Incorrect format for the bus identifier"
msgstr "Неправилен формат на шината"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:10001
+#: ../xserver-xorg.templates:8001
msgid "XKB rule set to use:"
msgstr "Файл с правила за клавиатурата:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:10001
+#: ../xserver-xorg.templates:8001
msgid ""
"For the X server to handle the keyboard correctly, an XKB rule set must be "
"chosen."
@@ -267,7 +242,7 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:10001
+#: ../xserver-xorg.templates:8001
msgid ""
"Users of most keyboards should enter \"xorg\". Users of Sun Type 4 and Type "
"5 keyboards, however, should enter \"sun\"."
@@ -277,7 +252,7 @@ msgstr ""
Reply to: