xorg: Changes to 'debian-unstable'
debian/changelog | 5
debian/po/ar.po | 221 ++++++++++++++++--------------------
debian/po/bg.po | 219 ++++++++++++++++--------------------
debian/po/bs.po | 232 +++++++++++++++++---------------------
debian/po/ca.po | 232 +++++++++++++++++---------------------
debian/po/cs.po | 226 +++++++++++++++++--------------------
debian/po/da.po | 231 +++++++++++++++++---------------------
debian/po/de.po | 235 +++++++++++++++++----------------------
debian/po/dz.po | 230 +++++++++++++++++---------------------
debian/po/el.po | 240 ++++++++++++++++++----------------------
debian/po/es.po | 237 ++++++++++++++++++---------------------
debian/po/eu.po | 237 ++++++++++++++++++---------------------
debian/po/fi.po | 235 +++++++++++++++++----------------------
debian/po/fr.po | 232 +++++++++++++++++---------------------
debian/po/gl.po | 234 ++++++++++++++++++---------------------
debian/po/he.po | 224 +++++++++++++++++--------------------
debian/po/hr.po | 232 +++++++++++++++++---------------------
debian/po/hu.po | 225 +++++++++++++++++--------------------
debian/po/it.po | 233 +++++++++++++++++---------------------
debian/po/ja.po | 234 +++++++++++++++++----------------------
debian/po/km.po | 223 ++++++++++++++++---------------------
debian/po/ko.po | 223 +++++++++++++++++--------------------
debian/po/lt.po | 234 +++++++++++++++++----------------------
debian/po/ml.po | 227 +++++++++++++++++--------------------
debian/po/mr.po | 224 +++++++++++++++++--------------------
debian/po/nb.po | 225 +++++++++++++++++--------------------
debian/po/ne.po | 225 +++++++++++++++++--------------------
debian/po/nl.po | 235 +++++++++++++++++----------------------
debian/po/nn.po | 227 +++++++++++++++++--------------------
debian/po/pl.po | 237 +++++++++++++++++----------------------
debian/po/pt.po | 237 ++++++++++++++++++---------------------
debian/po/pt_BR.po | 238 ++++++++++++++++++---------------------
debian/po/ro.po | 239 ++++++++++++++++++---------------------
debian/po/ru.po | 229 +++++++++++++++++---------------------
debian/po/sk.po | 228 +++++++++++++++++---------------------
debian/po/sq.po | 231 +++++++++++++++++---------------------
debian/po/sv.po | 233 +++++++++++++++++---------------------
debian/po/ta.po | 228 +++++++++++++++++---------------------
debian/po/templates.pot | 159 ++++++++------------------
debian/po/th.po | 224 +++++++++++++++++--------------------
debian/po/tr.po | 233 +++++++++++++++++---------------------
debian/po/vi.po | 232 +++++++++++++++++---------------------
debian/po/wo.po | 229 +++++++++++++++++---------------------
debian/po/zh_CN.po | 219 ++++++++++++++++--------------------
debian/po/zh_TW.po | 220 ++++++++++++++++--------------------
debian/xserver-xorg.postinst.in | 4
debian/xserver-xorg.templates | 29 ----
47 files changed, 4566 insertions(+), 5520 deletions(-)
New commits:
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?"
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 "
@@ -151,7 +81,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 "
@@ -164,13 +94,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-"
@@ -182,13 +112,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 "
@@ -200,7 +130,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."
@@ -210,7 +140,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."
@@ -220,19 +150,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 "Файл с правила за клавиатурата:"
#. 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."
@@ -242,7 +172,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\"."
@@ -252,7 +182,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 "
@@ -264,19 +194,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."
@@ -287,7 +217,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"
@@ -322,7 +252,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 "
@@ -334,7 +264,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 "
@@ -346,7 +276,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\"."
@@ -356,13 +286,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 "
@@ -373,7 +303,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/"
@@ -385,7 +315,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 "
@@ -400,13 +330,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 "
@@ -417,7 +347,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 "
@@ -429,7 +359,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/"
@@ -441,7 +371,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 ""
@@ -452,13 +382,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 "
@@ -469,7 +399,7 @@ msgstr ""
Reply to: