debian/changelog | 17 ++
debian/control | 4
debian/local/dexconf | 7
debian/po/ar.po | 291 ++++++++++++++++--------------------
debian/po/bg.po | 297 ++++++++++++++++---------------------
debian/po/bs.po | 298 ++++++++++++++++---------------------
debian/po/ca.po | 308 +++++++++++++++++---------------------
debian/po/cs.po | 293 ++++++++++++++++---------------------
debian/po/da.po | 295 ++++++++++++++++---------------------
debian/po/de.po | 316 +++++++++++++++++-----------------------
debian/po/dz.po | 299 ++++++++++++++++---------------------
debian/po/el.po | 313 +++++++++++++++++----------------------
debian/po/es.po | 309 +++++++++++++++++----------------------
debian/po/eu.po | 299 ++++++++++++++++---------------------
debian/po/fi.po | 300 ++++++++++++++++---------------------
debian/po/fr.po | 315 +++++++++++++++++----------------------
debian/po/gl.po | 299 ++++++++++++++++---------------------
debian/po/he.po | 292 ++++++++++++++++--------------------
debian/po/hr.po | 300 ++++++++++++++++---------------------
debian/po/hu.po | 294 ++++++++++++++++---------------------
debian/po/it.po | 309 +++++++++++++++++----------------------
debian/po/ja.po | 302 ++++++++++++++++----------------------
debian/po/km.po | 284 +++++++++++++++--------------------
debian/po/ko.po | 297 ++++++++++++++++---------------------
debian/po/lt.po | 296 ++++++++++++++++---------------------
debian/po/ml.po | 304 +++++++++++++++++---------------------
debian/po/mr.po | 292 ++++++++++++++++--------------------
debian/po/nb.po | 299 ++++++++++++++++---------------------
debian/po/ne.po | 297 ++++++++++++++++---------------------
debian/po/nl.po | 311 +++++++++++++++++----------------------
debian/po/nn.po | 299 ++++++++++++++++---------------------
debian/po/pl.po | 286 ++++++++++++++----------------------
debian/po/pt.po | 305 +++++++++++++++++---------------------
debian/po/pt_BR.po | 309 +++++++++++++++++----------------------
debian/po/ro.po | 309 +++++++++++++++++----------------------
debian/po/ru.po | 304 +++++++++++++++++---------------------
debian/po/sk.po | 291 ++++++++++++++++--------------------
debian/po/sq.po | 301 ++++++++++++++++----------------------
debian/po/sv.po | 301 ++++++++++++++++----------------------
debian/po/ta.po | 298 ++++++++++++++++---------------------
debian/po/templates.pot | 177 ++++------------------
debian/po/th.po | 284 +++++++++++++++--------------------
debian/po/tr.po | 300 ++++++++++++++++---------------------
debian/po/vi.po | 307 +++++++++++++++++---------------------
debian/po/wo.po | 309 +++++++++++++++++----------------------
debian/po/zh_CN.po | 279 +++++++++++++++--------------------
debian/po/zh_TW.po | 281 +++++++++++++++--------------------
debian/xserver-xorg.postinst.in | 47 -----
debian/xserver-xorg.templates | 56 -------
49 files changed, 5751 insertions(+), 7429 deletions(-)
New commits:
commit b00740f9ae557a6e69c1d496e6284d9686692add
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Wed Oct 31 16:58:54 2007 -0400
* Don't specify the device section to use in the screen section
+ xserver-xorg-core 2:1.4-3 and above will use the first device section
listed when none is specified. We only write one device with this script
anyway.
+ Have xserver-xorg depend on -core >= 2:1.4-3
diff --git a/debian/changelog b/debian/changelog
index 1749c80..322f6a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,11 @@ xorg (1:7.3+3) UNRELEASED; urgency=low
different protocols through the same /dev/input/mice device file,
allowing this. Only in pathological cases will you need to work around
it.
+ * Don't specify the device section to use in the screen section
+ + xserver-xorg-core 2:1.4-3 and above will use the first device section
+ listed when none is specified. We only write one device with this script
+ anyway.
+ + Have xserver-xorg depend on -core >= 2:1.4-3
[ Christian Perrier ]
* Hebrew. Closes: #447308
@@ -56,7 +61,7 @@ xorg (1:7.3+3) UNRELEASED; urgency=low
* dexconf: don't generate two mouse sections. Touchpads will be handled
through input-hotplug.
- -- David Nusinow <[EMAIL PROTECTED]> Wed, 31 Oct 2007 16:39:51 -0400
+ -- David Nusinow <[EMAIL PROTECTED]> Wed, 31 Oct 2007 16:51:14 -0400
xorg (1:7.3+2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 122ddfd..0ea0ad4 100644
--- a/debian/control
+++ b/debian/control
@@ -82,7 +82,7 @@ Architecture: all
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), xserver-xorg-video-all |
xserver-xorg-video-2, xserver-xorg-input-all | xserver-xorg-input-2,
${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
+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, xbase-clients
Recommends: libgl1-mesa-dri, udev, laptop-detect, xresprobe, 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
diff --git a/debian/local/dexconf b/debian/local/dexconf
index e1fc5d5..c872e35 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -314,7 +314,6 @@ exec 4>"$DEXCONFTMPDIR/Screen"
cat >&4 <<SECTION
Section "Screen"
Identifier "Default Screen"
- Device "$DEVICE_IDENTIFIER"
Monitor "Configured Monitor"
DefaultDepth $DISPLAY_DEFAULT_DEPTH
SECTION
commit 3d6183b1227a7bf98969c7a34a0a8eba759ed2f1
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Wed Oct 31 16:46:00 2007 -0400
* Don't ask for the mouse port or protocol any more
+ Will be set to /dev/input/mice by default.
+ Add udev to xserver-xorg recommends to make sure this device file is
present on normal systems
+ Will be set to "auto" protocol by default. This will let the driver
choose the correct protocol automatically. The kernel driver multiplexes
different protocols through the same /dev/input/mice device file,
allowing this. Only in pathological cases will you need to work around
it.
diff --git a/debian/changelog b/debian/changelog
index a21d275..1749c80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,15 @@ xorg (1:7.3+3) UNRELEASED; urgency=low
* dexconf: Set SERVER to xorg
* Don't ask for the monitor identifier, just use a generic name
* Delete the obsolete template question for autodetect mouse
+ * Don't ask for the mouse port or protocol any more
+ + Will be set to /dev/input/mice by default.
+ + Add udev to xserver-xorg recommends to make sure this device file is
+ present on normal systems
+ + Will be set to "auto" protocol by default. This will let the driver
+ choose the correct protocol automatically. The kernel driver multiplexes
+ different protocols through the same /dev/input/mice device file,
+ allowing this. Only in pathological cases will you need to work around
+ it.
[ Christian Perrier ]
* Hebrew. Closes: #447308
@@ -47,7 +56,7 @@ xorg (1:7.3+3) UNRELEASED; urgency=low
* dexconf: don't generate two mouse sections. Touchpads will be handled
through input-hotplug.
- -- David Nusinow <[EMAIL PROTECTED]> Wed, 31 Oct 2007 16:34:18 -0400
+ -- David Nusinow <[EMAIL PROTECTED]> Wed, 31 Oct 2007 16:39:51 -0400
xorg (1:7.3+2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 7f2a6ed..122ddfd 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), xserver-xorg-video-all |
xserver-xorg-video-2, xserver-xorg-input-all | xserver-xorg-input-2,
${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
-Recommends: libgl1-mesa-dri, laptop-detect, xresprobe, discover1 | discover,
${F:XServer-Xorg-Detect-Depends}
+Recommends: libgl1-mesa-dri, udev, laptop-detect, xresprobe, 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/local/dexconf b/debian/local/dexconf
index 211f435..e1fc5d5 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -237,10 +237,6 @@ printf "EndSection\n" >&4
DO_EMULATE3BUTTONS=
-fetch xserver-$SERVER/config/inputdevice/mouse/port
-MOUSE_PORT="$RET"
-fetch xserver-$SERVER/config/inputdevice/mouse/protocol
-MOUSE_PROTOCOL="$RET"
fetch xserver-$SERVER/config/inputdevice/mouse/emulate3buttons
if [ "$RET" = "true" ]; then
DO_EMULATE3BUTTONS=true
@@ -251,8 +247,6 @@ cat >&4 <<SECTION
Section "InputDevice"
Identifier "Configured Mouse"
Driver "mouse"
- Option "Device" "$MOUSE_PORT"
- Option "Protocol" "$MOUSE_PROTOCOL"
SECTION
if [ -n "$DO_EMULATE3BUTTONS" ]; then
printf "\tOption\t\t\"Emulate3Buttons\"\t\"true\"\n" >&4
diff --git a/debian/po/ar.po b/debian/po/ar.po
index 4410573..7addbba 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: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2007-10-31 16:27-0400\n"
+"POT-Creation-Date: 2007-10-31 16:42-0400\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"
@@ -606,102 +606,15 @@ msgstr ""
msgid "When in doubt, this value should be left blank."
msgstr "عندما تكون في شك، يجب ترك هذه القيمة فارغة."
-#. Type: select
-#. Description
-#: ../xserver-xorg.templates:19001
-msgid "Mouse port:"
-msgstr "منفذ الماوس:"
-
-#. Type: select
-#. Description
-#: ../xserver-xorg.templates:19001
-msgid ""
-"For the X Window System graphical user interface to operate correctly, "
-"certain characteristics of the mouse (or other pointing device, such as a "
-"trackball) must be known."
-msgstr ""
-"كي تتمكن من تشغيل واجهة المستخدم الرسومية لنظام نوافذ X بشكل صحيح، فيجب "
-"معرفة صفات معينة عن الماوس (أو أي جهاز إشارة آخر، مثل trackball)."
-
-#. Type: select
-#. Description
-#: ../xserver-xorg.templates:19001
-msgid ""
-"It is necessary to determine which port (connection type) is used by the "
-"mouse. Serial ports use D-shaped connectors with 9 or 25 pins (a.k.a. DB-9 "
-"or DB-25); the mouse connector is female (has holes) and the computer "
-"connector is male (has pins). PS/2 ports are small round connectors (DIN) "
-"with 6 pins; the mouse connector is male and the computer side female. You "
-"may alternatively use a USB mouse, a bus/inport (very old) mouse, or be "
-"using the gpm program as a repeater. If you need to attach or remove PS/2 "
-"or bus/inport devices from your computer, please do so with the computer's "
-"power off."
-msgstr ""
-"من الضروري معرفة المنفذ (نوع الوصلة) التي تستخدمها الماوس. تستخدم المنافذ "
-"المتوالية وصلات على شكل D لها 9 أو 25 دبوساً (يرمز لها بالرمز DB-9 أو DB-25)؛
"
-"حيث أن وصلة الماوس لها ثقوب ووصلة الحاسب لها دبابيس. أما منافذ PS/2 فهي "
-"وصلات مدورة (DIN) لها 6 دبابيس؛ بحيث تكون وصلة الماوس لها دبابيس ووصلة "
-"الحاسب لها ثقوب مطابقة. يمكنك عوضاً عن ذلك أن تستخدم ماوس USB، أو bus/inport "
-"(قديمة جداً)، أو أن تستخدم برنامج gpm كمُكرّر. إن احتجت إلى وصل أو إزالة
أجهزة "
-"PS/2 أو bus/inport من حاسبك، الرجاء القيام بذلك عندما يكون الجهاز متوقفاً عن "
-"العمل."
-
-#. Type: select
-#. Description
-#: ../xserver-xorg.templates:20001
-msgid "Mouse protocol:"
-msgstr "بروتوكول الماوس:"
-
-#. Type: boolean
-#. Description
-#: ../xserver-xorg.templates:21001
-msgid "Emulate 3 button mouse?"
-msgstr "محاكاة الماوس ذات 3 أزرار؟"
-
-#. Type: boolean
-#. Description
-#: ../xserver-xorg.templates:21001
-msgid ""
-"Most programs in the X Window System expect the mouse to have 3 buttons "
-"(left, right, and middle). Mice with only 2 buttons can emulate the "
-"presence of a middle button by treating simultaneous clicks or drags of the "
-"left and right buttons as middle button events."
-msgstr ""
-"معظم البرامج في نظام نوافذ X تتوقع أن تكون الماوس ذات 3 أزرار (يسار، يمين، "
-"ووسط). أما الماوس ذات الزرين فيمكنها محاكاة وجود الزر الأوسط بمعاملة النقر "
-"على الزرين أو السحب بهما كأحداث للزر الأوسط."
-
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:21001
-msgid ""
-"This option may also be used on mice with 3 or more buttons; the middle "
-"button will continue to work normally."
-msgstr ""
-"يمكن استخدام هذا الخيار أيضاً مع الماوس ذات 3 أزرار أو أكثر؛ بحيث يبقى الزر "
-"الأوسط يعمل بشكل طبيعي."
-
-#. Type: boolean
-#. Description
-#: ../xserver-xorg.templates:21001
-msgid ""
-"Note that mouse buttons in excess of five (counting a scroll wheel as two "
-"buttons, one each for \"up\" and \"down\", and a third if the wheel \"clicks"
-"\") are not yet supported with this configuration tool."
-msgstr ""
-"لاحظ أن أزرار الماوس التي تتعدى خمسة (بعدّ إطار التمرير كزرين، واحد \"للأعلى"
-"\" والآخر \"للأسفل\"، وزر ثالث إن كان بالإمكان \"النقر\") ليست بعد مدعومة من "
-"قبل أداة التهيئة هذه."
-
-#. Type: boolean
-#. Description
-#: ../xserver-xorg.templates:22001
+#: ../xserver-xorg.templates:19001
msgid "Attempt monitor autodetection?"
msgstr "هل تريد محاولة التعرف الآلي على الشاشة؟"
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:22001
+#: ../xserver-xorg.templates:19001
msgid ""
"Many monitors (including LCD's) and video cards support a communication "
"protocol that allows the monitor's technical characteristics to be "
@@ -715,20 +628,20 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:22001
+#: ../xserver-xorg.templates:19001
msgid ""
"If autodetection fails, you will be asked for information about the monitor."
msgstr "إن فشل الاكتشاف التلقائي، فسيطلب منك المزيد من المعلومات حول الشاشة."
#. Type: select
#. Description
-#: ../xserver-xorg.templates:23001
+#: ../xserver-xorg.templates:20001
msgid "Method for selecting the monitor characteristics:"
msgstr "طريقة اختيار مواصفات الشاشة:"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:23001
+#: ../xserver-xorg.templates:20001
msgid ""
"For the X Window System graphical user interface to operate correctly, "
"certain characteristics of the monitor must be known."
@@ -738,7 +651,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:23001
+#: ../xserver-xorg.templates:20001
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 "
@@ -750,7 +663,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:23001
+#: ../xserver-xorg.templates:20001
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 "
@@ -762,7 +675,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:23001
+#: ../xserver-xorg.templates:20001
msgid ""
"The \"advanced\" option will let you specify the monitor's horizontal sync "
"and vertical refresh tolerances directly."
@@ -772,56 +685,56 @@ msgstr ""
#. Type: select
#. Choices
-#: ../xserver-xorg.templates:24001
+#: ../xserver-xorg.templates:21001
msgid "Up to 14 inches (355 mm)"
msgstr "حتى 14 إنش (355 مليمتر)"
#. Type: select
#. Choices
-#: ../xserver-xorg.templates:24001
+#: ../xserver-xorg.templates:21001
msgid "15 inches (380 mm)"
msgstr "15 إنش (380 مليمتر)"
#. Type: select
#. Choices
-#: ../xserver-xorg.templates:24001
+#: ../xserver-xorg.templates:21001
msgid "17 inches (430 mm)"
msgstr "17 إنش (430 مليمتر)"
#. Type: select
#. Choices
-#: ../xserver-xorg.templates:24001
+#: ../xserver-xorg.templates:21001
msgid "19-20 inches (480-510 mm)"
msgstr "19-20 إنش (480-510 مليمتر)"
#. Type: select
#. Choices
-#: ../xserver-xorg.templates:24001
+#: ../xserver-xorg.templates:21001
msgid "21 inches (530 mm) or more"
msgstr "21 إنش (530 مليمتر) أو أكثر"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:24002
+#: ../xserver-xorg.templates:21002
msgid "Approximate monitor size:"
msgstr "حجم الشاشة التقريبي:"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:24002
+#: ../xserver-xorg.templates:21002
msgid "High-quality CRT's may be able to use the next highest size category."
msgstr ""
"شاشات CRT عالية الجودة قد تكون قادرة على استخدام فئة الحجم الأكبر التالية."
#. Type: select
#. Description
-#: ../xserver-xorg.templates:25001
+#: ../xserver-xorg.templates:22001
msgid "Monitor's best video mode:"
msgstr "أفضل وضع فيديو للشاشة:"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:25001
+#: ../xserver-xorg.templates:22001
msgid ""
"Choose the \"best\" resolution and refresh rate the monitor is capable of. "
"Larger resolutions and refresh rates are better. With a CRT monitor, it is "
@@ -839,19 +752,19 @@ msgstr ""
#. Type: text
#. Description
-#: ../xserver-xorg.templates:26001
+#: ../xserver-xorg.templates:23001
msgid "Generic Monitor"
msgstr "شاشة عامة"
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:27001
+#: ../xserver-xorg.templates:24001
msgid "Write monitor sync ranges to the configuration file?"
msgstr "كتابة قيم مدى مزامنة الشاشة إلى ملف التهيئة؟"
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:27001
+#: ../xserver-xorg.templates:24001
msgid ""
"The monitor synchronization ranges should be autodetected by the X server in "
"most cases, but sometimes it needs hinting. This option is for experienced "
@@ -863,13 +776,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:28001
+#: ../xserver-xorg.templates:25001
msgid "Monitor's horizontal sync range:"
msgstr "مدى مزامنة الشاشة الأفقي:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:28001
+#: ../xserver-xorg.templates:25001
msgid ""
"Please enter either a comma-separated list of discrete values (for fixed-"
"frequency displays), or a pair of values separated by a dash (all modern "
@@ -883,13 +796,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:29001
+#: ../xserver-xorg.templates:26001
msgid "Monitor's vertical refresh range:"
msgstr "مدى إنعاش الشاشة الرأسي:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:29001
+#: ../xserver-xorg.templates:26001
msgid ""
"Please enter either a comma-separated list of discrete values (for fixed-"
"frequency displays), or a pair of values separated by a dash (all modern "
@@ -903,13 +816,13 @@ msgstr ""
#. Type: note
#. Description
-#: ../xserver-xorg.templates:30001
+#: ../xserver-xorg.templates:27001
msgid "Incorrect values entered"
msgstr "القيم المدخلة غير صحيحة:"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:30001
+#: ../xserver-xorg.templates:27001
msgid ""
"The valid syntax is a comma-separated list of discrete values, or a pair of "
"values separated by a dash."
@@ -919,13 +832,13 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:31001
+#: ../xserver-xorg.templates:28001
msgid "Desired default color depth in bits:"
msgstr "عمق الألوان الافتراضي المرغوب بالبت:"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:31001
+#: ../xserver-xorg.templates:28001
msgid ""
"Usually 24-bit color is desirable, but on graphics cards with limited "
"amounts of framebuffer memory, higher resolutions may be achieved at the "
@@ -941,7 +854,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:31001
+#: ../xserver-xorg.templates:28001
msgid ""
"So-called \"32-bit color\" is actually 24 bits of color information plus 8 "
"bits of alpha channel or simple zero padding; the X Window System can handle "
@@ -953,49 +866,49 @@ msgstr ""
#. Type: note
#. Description
-#: ../xserver-xorg.templates:32001
+#: ../xserver-xorg.templates:29001
msgid "Empty value"
msgstr "قيمة فارغة"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:32001
+#: ../xserver-xorg.templates:29001
msgid "A null entry is not permitted for this value."
msgstr "لا يسمح بترك القيمة فارغة هنا"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:33001
+#: ../xserver-xorg.templates:30001
msgid "Invalid double-quote characters"
msgstr "علامتا تنصيص غير صالحتين"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:33001
+#: ../xserver-xorg.templates:30001
msgid "Double-quote (\") characters are not permitted in the entry value."
msgstr "علامات التنصيص المزدوجة (\") غير مسموحة هنا."
#. Type: note
#. Description
-#: ../xserver-xorg.templates:34001
+#: ../xserver-xorg.templates:31001
msgid "Numerical value needed"
msgstr "بحاجة إلى قيمة رقمية"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:34001
+#: ../xserver-xorg.templates:31001
msgid "Characters other than digits are not allowed in the entry."
msgstr "لا يسمح بأي أحرف هنا سوى الأرقام."
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:35001
+#: ../xserver-xorg.templates:32001
msgid "Autodetect keyboard layout?"
msgstr "هل تريد اكتشاف تخطيط لوحة المفاتيح آلياً؟"
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:35001
+#: ../xserver-xorg.templates:32001
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 "
@@ -1006,7 +919,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:35001
+#: ../xserver-xorg.templates:32001
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."
@@ -1160,6 +1073,69 @@ msgstr ""
"ستفشل عملية تثبيت الحزمة هذه وتتوقف كي تستطيع القيام بهذا. الرجاء إعادة "
"تشغيل عملية الترقية بعد أن تنتهي من تنظيف الدليل."
+#~ msgid "Mouse port:"
+#~ msgstr "منفذ الماوس:"
+
+#~ msgid ""
+#~ "For the X Window System graphical user interface to operate correctly, "
+#~ "certain characteristics of the mouse (or other pointing device, such as a "
+#~ "trackball) must be known."
+#~ msgstr ""
+#~ "كي تتمكن من تشغيل واجهة المستخدم الرسومية لنظام نوافذ X بشكل صحيح، فيجب "
+#~ "معرفة صفات معينة عن الماوس (أو أي جهاز إشارة آخر، مثل trackball)."
+
+#~ msgid ""
+#~ "It is necessary to determine which port (connection type) is used by the "
+#~ "mouse. Serial ports use D-shaped connectors with 9 or 25 pins (a.k.a. DB-"
+#~ "9 or DB-25); the mouse connector is female (has holes) and the computer "
+#~ "connector is male (has pins). PS/2 ports are small round connectors "
+#~ "(DIN) with 6 pins; the mouse connector is male and the computer side "
+#~ "female. You may alternatively use a USB mouse, a bus/inport (very old) "
+#~ "mouse, or be using the gpm program as a repeater. If you need to attach "
+#~ "or remove PS/2 or bus/inport devices from your computer, please do so "
+#~ "with the computer's power off."
+#~ msgstr ""
+#~ "من الضروري معرفة المنفذ (نوع الوصلة) التي تستخدمها الماوس. تستخدم المنافذ "
+#~ "المتوالية وصلات على شكل D لها 9 أو 25 دبوساً (يرمز لها بالرمز DB-9 أو DB-"
+#~ "25)؛ حيث أن وصلة الماوس لها ثقوب ووصلة الحاسب لها دبابيس. أما منافذ PS/2 "
+#~ "فهي وصلات مدورة (DIN) لها 6 دبابيس؛ بحيث تكون وصلة الماوس لها دبابيس "
+#~ "ووصلة الحاسب لها ثقوب مطابقة. يمكنك عوضاً عن ذلك أن تستخدم ماوس USB، أو "
+#~ "bus/inport (قديمة جداً)، أو أن تستخدم برنامج gpm كمُكرّر. إن احتجت إلى وصل
"
+#~ "أو إزالة أجهزة PS/2 أو bus/inport من حاسبك، الرجاء القيام بذلك عندما يكون "
+#~ "الجهاز متوقفاً عن العمل."
+
+#~ msgid "Mouse protocol:"
+#~ msgstr "بروتوكول الماوس:"
+
+#~ msgid "Emulate 3 button mouse?"
+#~ msgstr "محاكاة الماوس ذات 3 أزرار؟"
+
+#~ msgid ""
+#~ "Most programs in the X Window System expect the mouse to have 3 buttons "
+#~ "(left, right, and middle). Mice with only 2 buttons can emulate the "
+#~ "presence of a middle button by treating simultaneous clicks or drags of "
+#~ "the left and right buttons as middle button events."
+#~ msgstr ""
+#~ "معظم البرامج في نظام نوافذ X تتوقع أن تكون الماوس ذات 3 أزرار (يسار، "
+#~ "يمين، ووسط). أما الماوس ذات الزرين فيمكنها محاكاة وجود الزر الأوسط "
+#~ "بمعاملة النقر على الزرين أو السحب بهما كأحداث للزر الأوسط."
+
+#~ msgid ""
+#~ "This option may also be used on mice with 3 or more buttons; the middle "
+#~ "button will continue to work normally."
+#~ msgstr ""
+#~ "يمكن استخدام هذا الخيار أيضاً مع الماوس ذات 3 أزرار أو أكثر؛ بحيث يبقى "
+#~ "الزر الأوسط يعمل بشكل طبيعي."
+
+#~ msgid ""
+#~ "Note that mouse buttons in excess of five (counting a scroll wheel as two "
+#~ "buttons, one each for \"up\" and \"down\", and a third if the wheel "
+#~ "\"clicks\") are not yet supported with this configuration tool."
+#~ msgstr ""
+#~ "لاحظ أن أزرار الماوس التي تتعدى خمسة (بعدّ إطار التمرير كزرين، واحد "
+#~ "\"للأعلى\" والآخر \"للأسفل\"، وزر ثالث إن كان بالإمكان \"النقر\") ليست "
+#~ "بعد مدعومة من قبل أداة التهيئة هذه."
+
#~ msgid "Attempt mouse device autodetection?"
#~ msgstr "هل تريد محاولة التعرف الآلي على جهاز الماوس؟"
diff --git a/debian/po/bg.po b/debian/po/bg.po
index 5a82ff7..521385f 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: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2007-10-31 16:27-0400\n"
+"POT-Creation-Date: 2007-10-31 16:42-0400\n"
"PO-Revision-Date: 2007-04-06 14:09+0300\n"
"Last-Translator: Damyan Ivanov <[EMAIL PROTECTED]>\n"
"Language-Team: Bulgarian <[EMAIL PROTECTED]>\n"
@@ -643,100 +643,15 @@ msgstr ""
msgid "When in doubt, this value should be left blank."
msgstr "Ако се колебаете какво да напишете, най-добре оставете полето празно."
-#. Type: select
-#. Description
-#: ../xserver-xorg.templates:19001
-msgid "Mouse port:"
-msgstr "Порт за връзка с мишката:"
-
-#. Type: select
-#. Description
-#: ../xserver-xorg.templates:19001
-msgid ""
-"For the X Window System graphical user interface to operate correctly, "
-"certain characteristics of the mouse (or other pointing device, such as a "
-"trackball) must be known."
-msgstr ""
-"За правилната работа на мишката е необходимо указването на някои "
-"характеристики."
-
-#. Type: select
-#. Description
-#: ../xserver-xorg.templates:19001
-msgid ""
-"It is necessary to determine which port (connection type) is used by the "
-"mouse. Serial ports use D-shaped connectors with 9 or 25 pins (a.k.a. DB-9 "
-"or DB-25); the mouse connector is female (has holes) and the computer "
-"connector is male (has pins). PS/2 ports are small round connectors (DIN) "
-"with 6 pins; the mouse connector is male and the computer side female. You "
-"may alternatively use a USB mouse, a bus/inport (very old) mouse, or be "
-"using the gpm program as a repeater. If you need to attach or remove PS/2 "
-"or bus/inport devices from your computer, please do so with the computer's "
-"power off."
-msgstr ""
-"Нужно е да се определи видът връзка (порт), който се използва. Серийните "
-"мишки използват конектор с 9 или 25 игли с формата на буква „D“ (познат като "
-"DB-9 или DB-25); конекторът на мишката е „женски“ (с дупчици), а от страна "
-"на компютъра е „мъжки“ (с игли). PS/2-портовете са малки кръгли конектори "
-"(DIN) с шест контакта."
-
-#. Type: select
-#. Description
-#: ../xserver-xorg.templates:20001
-msgid "Mouse protocol:"
-msgstr "Протокол:"
-
-#. Type: boolean
-#. Description
-#: ../xserver-xorg.templates:21001
-msgid "Emulate 3 button mouse?"
-msgstr "Симулиране на трети бутон?"
-
-#. Type: boolean
-#. Description
-#: ../xserver-xorg.templates:21001
-msgid ""
-"Most programs in the X Window System expect the mouse to have 3 buttons "
-"(left, right, and middle). Mice with only 2 buttons can emulate the "
-"presence of a middle button by treating simultaneous clicks or drags of the "
-"left and right buttons as middle button events."
-msgstr ""
-"Повечето програми в системата X Window очакват мишката да има три бутона "
-"(ляв, десен и среден). Мишките, които имат само два бутона могат да "
-"симулират наличието на трети бутон, като третират едновременното натискане "
-"или влачене на левия и десния бутон като натискане или влачене на средния."
-
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:21001
-msgid ""
-"This option may also be used on mice with 3 or more buttons; the middle "
-"button will continue to work normally."
-msgstr ""
-"Симулирането на трети бутон може да се използва и на мишки с три бутона, при "
-"които средният бутон ще продължи да работи нормално."
-
-#. Type: boolean
-#. Description
-#: ../xserver-xorg.templates:21001
-msgid ""
-"Note that mouse buttons in excess of five (counting a scroll wheel as two "
-"buttons, one each for \"up\" and \"down\", and a third if the wheel \"clicks"
-"\") are not yet supported with this configuration tool."
-msgstr ""
-"Мишките с повече от пет бутона не се поддържат от автоматичната настройка. "
-"Колелцето се брои за два бутона - един за нагоре и един за надолу, плюс още "
-"един, ако колелцето функционира и като нормален бутон."
-
-#. Type: boolean
-#. Description
-#: ../xserver-xorg.templates:22001
+#: ../xserver-xorg.templates:19001
msgid "Attempt monitor autodetection?"
msgstr "Автоматично откриване на параметрите на монитора?"
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:22001
+#: ../xserver-xorg.templates:19001
msgid ""
"Many monitors (including LCD's) and video cards support a communication "
"protocol that allows the monitor's technical characteristics to be "
@@ -751,7 +666,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:22001
+#: ../xserver-xorg.templates:19001
msgid ""
"If autodetection fails, you will be asked for information about the monitor."
msgstr ""
@@ -760,13 +675,13 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:23001
+#: ../xserver-xorg.templates:20001
msgid "Method for selecting the monitor characteristics:"
msgstr "Начин на въвеждане на характеристиките на монитора:"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:23001
+#: ../xserver-xorg.templates:20001
msgid ""
"For the X Window System graphical user interface to operate correctly, "
"certain characteristics of the monitor must be known."
@@ -776,7 +691,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:23001
+#: ../xserver-xorg.templates:20001
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 "
@@ -788,7 +703,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:23001
+#: ../xserver-xorg.templates:20001
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 "
@@ -800,7 +715,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:23001
+#: ../xserver-xorg.templates:20001
msgid ""
"The \"advanced\" option will let you specify the monitor's horizontal sync "
"and vertical refresh tolerances directly."
@@ -810,43 +725,43 @@ msgstr ""
#. Type: select
#. Choices
-#: ../xserver-xorg.templates:24001
+#: ../xserver-xorg.templates:21001
msgid "Up to 14 inches (355 mm)"
msgstr "До 14 инча (355 мм)"
#. Type: select
#. Choices
-#: ../xserver-xorg.templates:24001
+#: ../xserver-xorg.templates:21001
msgid "15 inches (380 mm)"
msgstr "15 инча (380 мм)"
#. Type: select
#. Choices
-#: ../xserver-xorg.templates:24001
+#: ../xserver-xorg.templates:21001
msgid "17 inches (430 mm)"
msgstr "17 инча (430 мм)"
#. Type: select
#. Choices
-#: ../xserver-xorg.templates:24001
+#: ../xserver-xorg.templates:21001
msgid "19-20 inches (480-510 mm)"
msgstr "19-20 инча (480-510 мм)"
#. Type: select
#. Choices
-#: ../xserver-xorg.templates:24001
+#: ../xserver-xorg.templates:21001
msgid "21 inches (530 mm) or more"
msgstr "21 инча (530 мм) или по-голям"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:24002
+#: ../xserver-xorg.templates:21002
msgid "Approximate monitor size:"
msgstr "Приблизителен размер на монитора:"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:24002
+#: ../xserver-xorg.templates:21002
msgid "High-quality CRT's may be able to use the next highest size category."
msgstr ""
"Възможно е професионален монитор да може да работи при избор на размер, по-"
@@ -854,13 +769,13 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:25001
+#: ../xserver-xorg.templates:22001
msgid "Monitor's best video mode:"
msgstr "Най-добрия видео-режим на монитора:"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:25001
+#: ../xserver-xorg.templates:22001
msgid ""
"Choose the \"best\" resolution and refresh rate the monitor is capable of. "
"Larger resolutions and refresh rates are better. With a CRT monitor, it is "
@@ -880,19 +795,19 @@ msgstr ""
#. Type: text
#. Description
-#: ../xserver-xorg.templates:26001
+#: ../xserver-xorg.templates:23001
msgid "Generic Monitor"
msgstr "Generic Monitor"
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:27001
+#: ../xserver-xorg.templates:24001
msgid "Write monitor sync ranges to the configuration file?"
msgstr "Да се запишат ли честотните интервали за синхронизация?"
#. Type: boolean
#. Description
-#: ../xserver-xorg.templates:27001
+#: ../xserver-xorg.templates:24001
msgid ""
"The monitor synchronization ranges should be autodetected by the X server in "
"most cases, but sometimes it needs hinting. This option is for experienced "
@@ -904,13 +819,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:28001
+#: ../xserver-xorg.templates:25001
msgid "Monitor's horizontal sync range:"
msgstr "Честотен интервал за хоризонтална синхронизация:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:28001
+#: ../xserver-xorg.templates:25001
msgid ""
"Please enter either a comma-separated list of discrete values (for fixed-"
"frequency displays), or a pair of values separated by a dash (all modern "
@@ -925,13 +840,13 @@ msgstr ""
#. Type: string
#. Description
-#: ../xserver-xorg.templates:29001
+#: ../xserver-xorg.templates:26001
msgid "Monitor's vertical refresh range:"
msgstr "Честотен интервал за вертикална синхронизация:"
#. Type: string
#. Description
-#: ../xserver-xorg.templates:29001
+#: ../xserver-xorg.templates:26001
msgid ""
"Please enter either a comma-separated list of discrete values (for fixed-"
"frequency displays), or a pair of values separated by a dash (all modern "
@@ -946,13 +861,13 @@ msgstr ""
#. Type: note
#. Description
-#: ../xserver-xorg.templates:30001
+#: ../xserver-xorg.templates:27001
msgid "Incorrect values entered"
msgstr "Въведените данни са некоректни"
#. Type: note
#. Description
-#: ../xserver-xorg.templates:30001
+#: ../xserver-xorg.templates:27001
msgid ""
"The valid syntax is a comma-separated list of discrete values, or a pair of "
"values separated by a dash."
@@ -962,13 +877,13 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:31001
+#: ../xserver-xorg.templates:28001
msgid "Desired default color depth in bits:"
msgstr "Цветност по подразбиране (битове):"
#. Type: select
#. Description
-#: ../xserver-xorg.templates:31001
+#: ../xserver-xorg.templates:28001
msgid ""
"Usually 24-bit color is desirable, but on graphics cards with limited "
"amounts of framebuffer memory, higher resolutions may be achieved at the "
@@ -984,7 +899,7 @@ msgstr ""
#. Type: select
#. Description
-#: ../xserver-xorg.templates:31001
+#: ../xserver-xorg.templates:28001
msgid ""
"So-called \"32-bit color\" is actually 24 bits of color information plus 8 "
"bits of alpha channel or simple zero padding; the X Window System can handle "
@@ -997,49 +912,49 @@ msgstr ""
#. Type: note
#. Description
-#: ../xserver-xorg.templates:32001
+#: ../xserver-xorg.templates:29001
msgid "Empty value"
msgstr "Празна стойност"
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
