xorg: Changes to 'ubuntu'
debian/apport/xorg-server.py | 61 -
debian/apport/xserver-xorg-core.py | 61 +
debian/changelog | 177 ++++
debian/control | 43 -
debian/local/dexconf | 48 -
debian/po/ar.po | 563 +--------------
debian/po/bg.po | 83 +-
debian/po/bs.po | 89 +-
debian/po/ca.po | 616 +---------------
debian/po/cs.po | 195 ++---
debian/po/da.po | 90 +-
debian/po/de.po | 91 +-
debian/po/dz.po | 92 +-
debian/po/el.po | 95 +-
debian/po/es.po | 97 +-
debian/po/eu.po | 679 ++----------------
debian/po/fi.po | 90 +-
debian/po/fr.po | 624 +---------------
debian/po/gl.po | 80 +-
debian/po/he.po | 513 +------------
debian/po/hr.po | 88 +-
debian/po/hu.po | 75 +-
debian/po/it.po | 95 +-
debian/po/ja.po | 593 +---------------
debian/po/km.po | 90 +-
debian/po/ko.po | 73 +
debian/po/lt.po | 90 +-
debian/po/ml.po | 89 +-
debian/po/mr.po | 93 +-
debian/po/nb.po | 87 +-
debian/po/ne.po | 90 +-
debian/po/nl.po | 110 +-
debian/po/nn.po | 88 +-
debian/po/pl.po | 186 ++---
debian/po/pt.po | 83 +-
debian/po/pt_BR.po | 89 +-
debian/po/ro.po | 1371 +++----------------------------------
debian/po/ru.po | 85 +-
debian/po/sk.po | 78 +-
debian/po/sq.po | 94 +-
debian/po/sv.po | 97 +-
debian/po/ta.po | 78 +-
debian/po/templates.pot | 27
debian/po/th.po | 119 +--
debian/po/tr.po | 94 +-
debian/po/vi.po | 598 +---------------
debian/po/wo.po | 97 +-
debian/po/zh_CN.po | 72 +
debian/po/zh_TW.po | 86 +-
debian/rules | 11
debian/scripts/vars.alpha | 2
debian/scripts/vars.amd64 | 3
debian/scripts/vars.arm | 2
debian/scripts/vars.armeb | 2
debian/scripts/vars.armel | 2
debian/scripts/vars.hppa | 2
debian/scripts/vars.hurd-i386 | 2
debian/scripts/vars.i386 | 2
debian/scripts/vars.ia64 | 2
debian/scripts/vars.kfreebsd-amd64 | 2
debian/scripts/vars.kfreebsd-i386 | 2
debian/scripts/vars.m32r | 2
debian/scripts/vars.m68k | 2
debian/scripts/vars.mips | 2
debian/scripts/vars.mipsel | 2
debian/scripts/vars.powerpc | 2
debian/scripts/vars.ppc64 | 2
debian/scripts/vars.sparc | 2
debian/x11-common.init | 10
debian/x11-common.install | 2
debian/x11-common.manpages | 1
debian/x11-common.preinst.in | 12
debian/x11-common.templates | 13
debian/xserver-xorg.postinst.in | 15
debian/xserver-xorg.postrm.in | 8
debian/xserver-xorg.preinst.in | 8
debian/xserver-xorg.templates | 6
debian/xsfbs/xsfbs.mk | 82 --
debian/xsfbs/xsfbs.sh | 387 +++++-----
79 files changed, 3331 insertions(+), 6563 deletions(-)
New commits:
commit b06f5712d92bf4b51170b74f58bb65e1a60c4f5d
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Jun 24 20:57:09 2008 -0700
Merge with debian.
Rename apport script (it's not catching crashes so far)
diff --git a/debian/apport/xorg-server.py b/debian/apport/xorg-server.py
deleted file mode 100644
index b193df6..0000000
--- a/debian/apport/xorg-server.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/python
-
-'''Xorg Apport interface
-
-Copyright (C) 2007 Canonical Ltd.
-Author: Bryce Harrington <bryce.harrington@ubuntu.com>
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2 of the License, or (at your
-option) any later version. See http://www.gnu.org/copyleft/gpl.html for
-the full text of the license.
-'''
-
-import os.path
-import subprocess
-
-XORG_CONF = '/etc/X11/xorg.conf'
-XORG_LOG = '/var/log/Xorg.0.log'
-
-def add_info(report):
- # xorg.conf
- try:
- report['XorgConf'] = open(XORG_CONF).read()
- except IOError:
- pass
-
- # Xorg.0.log
- try:
- report['XorgLog'] = open(XORG_LOG).read()
- except IOError:
- pass
-
- try:
- report['ProcVersion'] = open('/proc/version').read()
- except IOError:
- pass
-
- try:
- script = subprocess.Popen(['lspci'], stdout=subprocess.PIPE)
- report['LsPci'] = script.communicate()[0]
- except OSError:
- pass
-
- try:
- script = subprocess.Popen(['lspci', '-vmm'], stdout=subprocess.PIPE)
- report['LsPciVVM'] = script.communicate()[0]
- except OSError:
- pass
-
- try:
- script = subprocess.Popen(['lsmod'], stdout=subprocess.PIPE)
- report['LsMod'] = script.communicate()[0]
- except OSError:
- pass
-
-# TODO:
-#
-# xrandr --verbose
-
-
diff --git a/debian/apport/xserver-xorg-core.py b/debian/apport/xserver-xorg-core.py
new file mode 100644
index 0000000..b193df6
--- /dev/null
+++ b/debian/apport/xserver-xorg-core.py
@@ -0,0 +1,61 @@
+#!/usr/bin/python
+
+'''Xorg Apport interface
+
+Copyright (C) 2007 Canonical Ltd.
+Author: Bryce Harrington <bryce.harrington@ubuntu.com>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version. See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+'''
+
+import os.path
+import subprocess
+
+XORG_CONF = '/etc/X11/xorg.conf'
+XORG_LOG = '/var/log/Xorg.0.log'
+
+def add_info(report):
+ # xorg.conf
+ try:
+ report['XorgConf'] = open(XORG_CONF).read()
+ except IOError:
+ pass
+
+ # Xorg.0.log
+ try:
+ report['XorgLog'] = open(XORG_LOG).read()
+ except IOError:
+ pass
+
+ try:
+ report['ProcVersion'] = open('/proc/version').read()
+ except IOError:
+ pass
+
+ try:
+ script = subprocess.Popen(['lspci'], stdout=subprocess.PIPE)
+ report['LsPci'] = script.communicate()[0]
+ except OSError:
+ pass
+
+ try:
+ script = subprocess.Popen(['lspci', '-vmm'], stdout=subprocess.PIPE)
+ report['LsPciVVM'] = script.communicate()[0]
+ except OSError:
+ pass
+
+ try:
+ script = subprocess.Popen(['lsmod'], stdout=subprocess.PIPE)
+ report['LsMod'] = script.communicate()[0]
+ except OSError:
+ pass
+
+# TODO:
+#
+# xrandr --verbose
+
+
diff --git a/debian/changelog b/debian/changelog
index 69752c7..d6b8bbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,173 @@
-xorg (1:7.3+10ubuntu12) intrepid; urgency=low
+xorg (1:7.3+12ubuntu1) intrepid; urgency=low
+
+ * Merge from debian unstable, remaining changes:
+ - apport/xorg-server-core.py, x11-common.install:
+ + apport hook for xorg-server crashes
+ - control:
+ + Change maintainer address.
+ + xserver-xorg: Recommends displayconfig-gtk and laptop-detect
+ + Move xorg-docs Recommends to Suggests, because xorg-docs is in
+ universe.
+ + Add a dependency to xserver-xorg for each binary built to save
+ disk/livecd space.
+ + Add xqbiff (<= 0.75-4) to the list of x11-common Conflicts.
+ + Add replaces for xinit since we now ship Xsession from x11-common.
+ Ditto for xrgb as we ship rgb.txt in x11-common.
+ + Add an epoch to the "x11-common Replaces xrgb" version.
+ (LP: #212672)
+ + xserver-xorg needs to Depend on mdetect instead of Recommends.
+ - local/Failsafe/*, x11-common.install:
+ + Bulletproof-X.
+ - local/Xsession:
+ + If ~/.xsession-errors is bigger than 0.5MiB, truncate it to the last
+ 0.5MiB to avoid having it grow indefinitively. (This does not happen
+ with gdm anyway since gdm cleans the file on login).
+ - local/dexconf:
+ + Added support for vmmouse_detect (if present) to override mouse
+ driver with vmware. Depends on mdetect.
+ (LP: #216667, #216276, #197337)
+ + Add extra bits for ps3fb xorg.conf. (LP: #230091)
+ + Add CorePointer to the default mouse section, otherwise
+ the server defaults are used. (LP: #197337)
+ + dexconf: Bring Device back to the Screen-section, nvidia-settings
+ and aticonfig need that. (LP: #181405)
+ + Add customizations to detect if running in KVM environment
+ (CPU = "QEMU") and specify the H/V rates, DefaultDepth, etc.
+ - local/xserver-wrapper.c:
+ + Stop handling -config specifically in the wrapper, as Xorg now
+ handles this itself.
+ - rules:
+ + Symlink the doc directories to xserver-xorg, explicitly remove the
+ doc directories on upgrade for the now symlinked doc
+ directories, to save disk/livecd space.
+ - scripts/vars.amd64:
+ + Add vmmouse.
+ - scripts/vars.i386:
+ + Add vmmouse.
+ + Add xserver-xorg-video-psb.
+ - scripts/vars.lpia:
+ + Copied from vars.i386.
+ - x11-common.install:
+ + Add installation of apport hooks and bulletproof-X scripts
+ - xserver-xorg.postinst.in:
+ + Skip video card autodetection if xforcevesa is set.
+ * control:
+ - Drop Ubuntu addition of xserver-xorg-driver-all (obsolete)
+ * local/dexconf:
+ + Drop synaptics section and ServerLayout line to re-enable
+ input-hotplug (Reverts LP: #173411)
+ * x11-common.preinst.in, x11-common.templates:
+ + Drop ubuntu addition to not fail if /usr/X11R6/bin is not empty
+ but move it away instead and tell the user about it
+ since it was only needed for Dapper->Hardy upgrades. (LP: 217724)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 24 Jun 2008 19:36:06 -0700
+
+xorg (1:7.3+12) unstable; urgency=low
+
+ [ Debconf translations]
+ * Belarusian. Closes: #483697
+ * French
+ * Basque. Closes: #485293
+ * Galician. Closes: #485292
+ * Tamil. Closes: #485376
+ * Thai. Closes: #485385
+ * Simplified Chinese. Closes: #485389
+ * Hebrew. Closes: #485390
+ * Bulgarian. Closes: #485391
+ * Catalan. Closes: #485394
+ * Vietnamese. Closes: #485404
+ * Belarusian. Closes: #485405
+ * German. Closes: #485461
+ * Portuguese. Closes: #485486
+ * Indonesian. Closes: #485746
+ * Arabic. Closes: #485865
+ * Russian. Closes: #485976
+ * Slovak. Closes: #486186
+ * Hungarian. Closes: #486189
+ * Korean. Closes: #486279
+ * Japanese. Closes: #486281
+ * Brazilian Portuguese. Closes: #486294
+ * Czech. Closes: #486358, #486456, #486472
+ * Dutch. Closes: #486459
+ * Turkish. Closes: #486462
- * scripts/vars.i386:
- - xserver-xorg-video-all should stop depending on the transitional
- -amd and instead depend on -geode.
- * local/dexconf:
- - Remove qemu/kvm quirking. (LP: #237164)
+ [ Julien Cristau ]
+ * Don't recommend the 'sun' xkb rule set, they're handled by 'xorg' now,
+ with the type4 and type5 models (closes: #483946). Thanks, Bernhard R.
+ Link!
+ * Re-add the xutils-dev dependency to xutils. There are still too many
+ packages build-depending on xutils and expecting imake to be available.
+ We'll drop it again after the lenny release (closes: #485184).
+ * Debconf translations:
+ * xserver-xorg-video-all: don't depend on the via driver on non-x86
+ architectures; change the via dependency on x86 to openchrome | via.
+
+ [ Brice Goglin ]
+ * Add SH4 support script, thanks Nobuhiro Iwamatsu, closes: #473582.
+
+ [ Christian Perrier ]
+ * Romanian. Closes: #486636
+
+ -- Brice Goglin <bgoglin@debian.org> Tue, 17 Jun 2008 21:56:20 +0200
+
+xorg (1:7.3+11) unstable; urgency=low
+
+ [ David Nusinow ]
+ * Add radeonhd to the -video-all depends
+
+ [ Brice Goglin ]
+ * Remove $named from the Should-Start/Stop LSB dependency info of the
+ x11-common init script, closes: #463630.
+ * Remove $remote_fs from Required-Start/Stop LSB dependency info of
+ the x11-common init script, closes: #470940.
+ * Remove the dependency of xutils against xutils-dev, it was only useful
+ for transitional purpose in Etch, closes: #418123.
+ * Remove the obsolete /etc/init.d/xserver-xorg, closes: #459507.
+ * Add xutils preinst to drop obsolete /etc/X11/rstart/ files,
+ closes: #382360.
- -- Bryce Harrington <bryce@ubuntu.com> Tue, 03 Jun 2008 12:53:55 -0700
+ [ David Nusinow ]
+ * Ship the X server wrapper in xserver-xorg rather than x11-common. This
+ avoids having an unnecessary SUID binary on some systems. Thanks Stephen
+ Frost. closes: #400632
+ + Have x11-common conflict with older xserver-xorg and vice-versa. Also
+ have xserver-xorg replace older x11-common
+ + Set x11-common to arch: all and xserver-xorg to arch: any
+ + Move ${shlib:Depends} from x11-common to xserver-xorg
+
+ [ Julien Cristau ]
+ * Use root:root instead of 0:0 in chown calls in x11-common's init script.
+ This should prevent remote nss lookups and timeouts in some environments.
+ Closes: #407788.
+ * Add Kurdish debconf translation from Erdal Ronahi (closes: #477492).
+ * Move dexconf and its manpage from x11-common to xserver-xorg.
+ * Remove pre-dependency on x11-common from xserver-xorg.
+ * Drop the xlibs-data and xlibs-static-dev transitional packages. These
+ were kept around for the sarge->etch upgrade, so it's past time they went
+ away (closes: #477547, #477550).
+ * xserver-xorg-video-newport is mips-only, don't depend on it on other
+ architectures.
+ * dexconf, xserver-xorg.postinst: the emulate3buttons question is gone,
+ don't ask about it and don't add the corresponding option in the generated
+ xorg.conf. The option is on by default, and the only thing we used to do
+ in dexconf is to explicitly enable it anyway.
+ * Run dh_installman in binary-indep as well, as x11-common is now built
+ there.
+ * Use the XSF shell library to remove obsolete conffiles. It seems less
+ fragile than the version recommended on
+ http://wiki.debian.org/DpkgConffileHandling and should handle failed
+ upgrades.
+
+ [ Christian Perrier ]
+ * Debconf translations:
+ - Indonesian added. Closes: #469972
+ - Polish. Closes: #478035
+
+ [ Raphael Geissert ]
+ * Fix bashism in xserver-xorg postinst script, closes: #473701.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 30 May 2008 15:15:33 +0200
xorg (1:7.3+10ubuntu11) intrepid; urgency=low
@@ -1482,6 +1643,7 @@ xorg (1:7.1.0-17) unstable; urgency=high
by Lennart Sorensen.
-- Julien Cristau <jcristau@debian.org> Fri, 06 Apr 2007 01:45:17 +0200
+
xorg (1:7.1.0-16) unstable; urgency=high
[ Christian Perrier ]
@@ -3002,3 +3164,4 @@ xorg (7.0.0-0ubuntu1) dapper; urgency=low
CAN-2004-0106, CAN-2003-0690, CAN-2003-0730, CAN-2003-0690, CAN-2003-0063,
CAN-2003-0071, CAN-2004-0093, CAN-2004-0094, CAN-2004-0093, CAN-2004-0094.
These should all be moved to their respective source packages. -daniels
+
diff --git a/debian/control b/debian/control
index 07fbd8b..bff877a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,11 +8,11 @@ Standards-Version: 3.7.3.0
Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 4.1.16)
Package: x11-common
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, debianutils (>= 1.13), lsb-base (>= 1.3-9ubuntu2)
+Architecture: all
+Depends: ${misc:Depends}, debianutils (>= 1.13), lsb-base (>= 1.3-9ubuntu2)
Pre-Depends: debconf | debconf-2.0
Conflicts: xfree86-common, xorg-common, xserver-common, x-common,
- xserver-xorg (<< 1:7.0.12), xserver-xfree86 (<< 1:7.0),
+ xserver-xorg (<< 1:7.3+11), xserver-xfree86 (<< 1:7.0),
libxft-dev (<= 2.1.8.2-5), aee (<= 2.2.15b-1), ascd (<= 0.13.2-3),
bibview (<= 2.2-8), fvwm1 (<= 1.24r-46), grace (<= 1:5.1.18-1),
groff (<= 1.18.1.1-7), hfsutils-tcltk (<= 3.2.6-7), login.app (<= 1.2.1-18),
@@ -79,11 +79,10 @@ Description: X Window System (X.Org) infrastructure
terms are functionally interchangeable in an Debian system.
Package: xserver-xorg
-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-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, mdetect
+Architecture: any
+Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common, x11-common (<< 1:7.3+11)
+Replaces: xserver-common, x11-common (<< 1:7.3+11)
+Depends: xserver-xorg-core (>= 2:1.4-3), xserver-xorg-video-all | xserver-xorg-video-2, xserver-xorg-input-all | xserver-xorg-input-2, ${shlibs:Depends}, ${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils, mdetect
Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends}, displayconfig-gtk, laptop-detect
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
@@ -100,14 +99,6 @@ Description: the X.Org X server -- output driver metapackage
(Xorg). It does not provide any drivers itself, and may be removed if you wish
to only have certain drivers installed.
-Package: xserver-xorg-driver-all
-Architecture: any
-Depends: ${F:XServer-Xorg-Video-Depends}
-Description: the X.Org X server -- output driver transitional metapackage
- This package depends on the full suite of output drivers for the X.Org X server
- (Xorg). It does not provide any drivers itself, and may be removed if you wish
- to only have certain drivers installed.
-
Package: xserver-xorg-input-all
Architecture: any
Depends: ${F:XServer-Xorg-Input-Depends}, x11-common
@@ -148,26 +139,6 @@ Description: the X.Org X Window System development libraries
Note that this is a convenience package for users and is not a package for
Debian developers to have their package depend on.
-Package: xlibs-data
-Architecture: all
-Section: libs
-Depends: xbitmaps, xcursor-themes, libx11-6 (>= 2:1.0.0-2), x11-common
-Description: transitional package for X11 client data
- This package is provided to ease upgrades from Debian 3.1 ("sarge"). It
- may be safely removed from your system.
-
-Package: xlibs-static-dev
-Architecture: all
-Section: oldlibs
-Depends: libxfont-dev, libfontenc-dev, x11-common
-Description: transitional metapackage
- This package depends on the individual libraries that used to be contained
- within the package of this name. These libraries used to be static
- libraries, but have since become shared libraries with their own packages
- and can be depended on by themselves. This package is for transitional
- purposes to prevent disruptions during automated package builds, and my be
- safely removed from your system.
-
Package: xlibmesa-gl
Section: libs
Architecture: all
diff --git a/debian/local/dexconf b/debian/local/dexconf
index ce5bad4..5f3beb2 100755
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -214,13 +214,6 @@ printf "EndSection\n" >&4
### MOUSE / INPUTDEVICE
-DO_EMULATE3BUTTONS=
-
-fetch xserver-$SERVER/config/inputdevice/mouse/emulate3buttons
-if [ "$RET" = "true" ]; then
- DO_EMULATE3BUTTONS=true
-fi
-
MOUSE_DRIVER=mouse
IS_VIRT=
if which vmmouse_detect >/dev/null 2>&1; then
@@ -237,28 +230,11 @@ Section "InputDevice"
Driver "$MOUSE_DRIVER"
Option "CorePointer"
SECTION
-if [ -n "$DO_EMULATE3BUTTONS" ]; then
- printf "\tOption\t\t\"Emulate3Buttons\"\t\"true\"\n" >&4
-fi
if [ -n "$IS_VIRT" ]; then
printf "\tOption\t\t\"Device\"\t\"/dev/input/mice\"\n" >&4
fi
printf "EndSection\n" >&4
-if [ -n "$LAPTOP" ]; then
- cat >&4 <<SECTION
-
-Section "InputDevice"
- Identifier "Synaptics Touchpad"
- Driver "synaptics"
- Option "SendCoreEvents" "true"
- Option "Device" "/dev/psaux"
- Option "Protocol" "auto-dev"
- Option "HorizEdgeScroll" "0"
-EndSection
-SECTION
-fi
-
### DEVICE
db_get xserver-$SERVER/config/device/driver
@@ -268,6 +244,11 @@ DEVICE_BUSID="$RET"
db_get xserver-$SERVER/config/device/use_fbdev
DEVICE_USE_FBDEV="$RET"
+QEMU_KVM=$(grep "QEMU Virtual CPU" /proc/cpuinfo || true)
+if [ -n "$QEMU_KVM" ]; then
+ DEVICE_DRIVER="cirrus"
+fi
+
exec 4>"$DEXCONFTMPDIR/Device"
cat >&4 <<SECTION
Section "Device"
@@ -296,6 +277,10 @@ Section "Monitor"
Identifier "Configured Monitor"
SECTION
+if [ -n "$QEMU_KVM" ]; then
+ printf "\tHorizSync\t30-70\n" >&4
+ printf "\tVertRefresh\t50-160\n" >&4
+fi
cat >&4 <<SECTION
EndSection
SECTION
@@ -312,6 +297,16 @@ SECTION
if [ -n "$PS3_FB" ]; then
printf "\tDefaultFbBpp 32\n" >&4
fi
+if [ -n "$QEMU_KVM" ]; then
+cat >&4 <<SUBSECTION
+ Device "Configured Video Device"
+ DefaultDepth 24
+ SubSection "Display"
+ Depth 24
+ Modes "1280x800" "1152x768" "1024x768" "800x600" "640x480"
+ EndSubSection
+SUBSECTION
+fi
printf "EndSection\n" >&4
### SERVERLAYOUT
@@ -321,11 +316,8 @@ cat >&4 <<SECTION
Section "ServerLayout"
Identifier "Default Layout"
Screen "Default Screen"
+EndSection
SECTION
-if [ -n "$LAPTOP" ]; then
- printf "\tInputDevice\t\"Synaptics Touchpad\"\n" >&4
-fi
-printf "EndSection\n" >&4
# Close file descriptor 4 before we delete temporary files
exec 4<&-
diff --git a/debian/po/ar.po b/debian/po/ar.po
index 81b17cc..217632e 100644
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -3,13 +3,13 @@
# Copyright (C) 2006 The Arabeyes Project
# This file is distributed under the same license as the xserver-xorg package.
#
-# Ossama M. Khayat <okhayat@yahoo.com>, 2006, 2007.
+# Ossama M. Khayat <okhayat@yahoo.com>, 2006, 2007, 2008.
msgid ""
msgstr ""
"Project-Id-Version: ar\n"
-"Report-Msgid-Bugs-To: Source: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-15 17:12+0200\n"
-"PO-Revision-Date: 2007-04-06 19:54+0300\n"
+"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2008-06-24 18:55-0700\n"
+"PO-Revision-Date: 2008-06-12 03:41+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
"MIME-Version: 1.0\n"
@@ -153,12 +153,8 @@ msgstr ""
#. Type: string
#. Description
#: ../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\"."
-msgstr ""
-"معظم مستخدمي لوحات المفاتيح يجب عليهم إدخال القيمة \"xorg\". أما مستخدمي "
-"لوحات المفاتيح من نوع Sun Type 4 وType 5 فعليهم إدخال القيمة \"sun\"."
+msgid "Users of most keyboards should enter \"xorg\"."
+msgstr "مستخدي معظم لوحات المفاتيح يجب أن يدخلوا الاسم \"xorg\"."
#. Type: string
#. Description
@@ -209,8 +205,7 @@ msgid ""
"key;\n"
" - macintosh: Macintosh keyboards using the new input layer with Linux\n"
" keycodes;\n"
-" - macintosh_old: Macintosh keyboards not using the new input layer.\n"
-" With the \"sun\" rule set:\n"
+" - macintosh_old: Macintosh keyboards not using the new input layer;\n"
" - type4: Sun Type4 keyboards;\n"
" - type5: Sun Type5 keyboards."
msgstr ""
@@ -224,7 +219,6 @@ msgstr ""
" - macintosh: لوحات مفاتيح ماكنتوش تستخدم طبقة الإدخال الجديدة مع رموز\n"
" مفاتيح لينكس;\n"
" - macintosh_old: لوحات مفاتيح ماكنتوش التي لا تستخدم طبقة الإدخال الجديدة.\n"
-" تستخدم مجموعة أحكام \"sun\":\n"
" - type4: لوحات مفاتيح Sun Type4;\n"
" - type5: لوحات مفاتيح Sun Type5."
@@ -605,17 +599,13 @@ msgstr ""
#. Type: note
#. Description
-#. Type: note
-#. Description
-#: ../x11-common.templates:7001 ../x11-common.templates:8001
+#: ../x11-common.templates:7001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "لا يمكن إزالة الدليل /usr/X11R6/bin"
#. Type: note
#. Description
-#. Type: note
-#. Description
-#: ../x11-common.templates:7001 ../x11-common.templates:8001
+#: ../x11-common.templates:7001
msgid ""
"This upgrade requires that the /usr/X11R6/bin directory be removed and "
"replaced with a symlink. An attempt was made to do so, but it failed, most "
@@ -640,500 +630,43 @@ msgstr ""
"ستفشل عملية تثبيت الحزمة هذه وتتوقف كي تستطيع القيام بهذا. الرجاء إعادة "
"تشغيل عملية الترقية بعد أن تنتهي من تنظيف الدليل."
-#. Type: note
-#. Description
-#: ../x11-common.templates:8001
-msgid ""
-"This package installation will now rename /usr/X11R6/bin to /usr/X11R6/bin-"
-"move-by-upgrade and continue the upgrade."
-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 "مُعرّف بطاقتك الفيديوية:"
-
-#~ 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:"
-
-#~ msgid ""
-#~ "Please keep only the resolutions you would like the X server to use. "
-#~ "Removing all of them is the same as removing none, since in both cases "
-#~ "the X server will attempt to use the highest possible resolution."
-#~ msgstr ""
-#~ "الرجاء إبقاء استبانات الشاشة فقط التي تود أن يقوم خادم X باستخدامها. كما "
-#~ "أن إزالتها كلها هو بمثابة عدم إزالة أي منها، حيث أنه في الحالتين سيقوم "
-#~ "خادم X بمحاولة استخدام أعلى استبانة ممكن."
-
-#~ msgid "Attempt monitor autodetection?"
-#~ msgstr "هل تريد محاولة التعرف الآلي على الشاشة؟"
-
-#~ msgid ""
-#~ "Many monitors (including LCD's) and video cards support a communication "
-#~ "protocol that allows the monitor's technical characteristics to be "
-#~ "communicated back to the computer. If the monitor and video card support "
-#~ "this protocol, further configuration questions about the monitor will be "
-#~ "pre-answered."
-#~ msgstr ""
-#~ "العديد من الشاشات (بما في ذلك LCD) وبطاقات الفيديو تدعم بروتوكول تواصل "
-#~ "يسمح بتوصيل صفات الشاشة التقنية إلى الحاسب. إن كانت الشاشة وبطاقة الفيديو "
-#~ "تدعم هذا البروتوكول، فسوف يتم الإجابة عن أية أسئلة إضافية حول تهيئة "
-#~ "الشاشة."
-
-#~ msgid ""
-#~ "If autodetection fails, you will be asked for information about the "
-#~ "monitor."
-#~ msgstr ""
-#~ "إن فشل الاكتشاف التلقائي، فسيطلب منك المزيد من المعلومات حول الشاشة."
-
-#~ msgid "Method for selecting the monitor characteristics:"
-#~ msgstr "طريقة اختيار مواصفات الشاشة:"
-
-#~ msgid ""
-#~ "For the X Window System graphical user interface to operate correctly, "
-#~ "certain characteristics of the monitor must be known."
-#~ msgstr ""
-#~ "كي تعمل واجهة المستخدم الرسومية لنظام نوافذ X بشكل صحيح، يجب معرفة "
-#~ "المواصفات الخاصة بشاشتك."
-
-#~ msgid ""
-#~ "The \"simple\" option will prompt about the monitor's physical size; this "
-#~ "will set some configuration values appropriate for a typical CRT of the "
-#~ "corresponding size, but may be suboptimal for high-quality CRT's."
-#~ msgstr ""
-#~ "يسألك الخيار \"بسيط\" حول حجم الشاشة الفعلي؛ ويقوم بعدها بتعيين بعض قيم "
-#~ "التهيئة الملائمة لشاشات CRT التي لها نفس الحجم،إلا أن هذا قد يكون دون "
-#~ "المستوى المطلوب لشاشات CRT ذات الجودة العالية."
-
-#~ msgid ""
-#~ "The \"medium\" option will present you with a list of resolutions and "
-#~ "refresh rates, such as \"800x600 @ 85Hz\"; you should choose the best "
-#~ "mode you wish to use (and that you know the monitor is capable of)."
-#~ msgstr ""
-#~ "يقدم لك الخيار \"متوسط\" قائمة باستبانات الشاشة و معدلات الإنعاش، مثال "
-#~ "\"800X600 @ 85Hz\"؛ عليك باختيار الوضع الأفضل الذي تود استخدامه (والذي "
-#~ "تعمله أن شاشاتك يمكنها استخدامه)."
-
-#~ msgid ""
-#~ "The \"advanced\" option will let you specify the monitor's horizontal "
-#~ "sync and vertical refresh tolerances directly."
-#~ msgstr ""
-#~ "يسمح لك الخيار \"متقدم\" بتحديد قيم مزامنة الشاشة الأفقية والعمودية بشكل "
-#~ "مباشر."
-
-#~ msgid "Up to 14 inches (355 mm)"
-#~ msgstr "حتى 14 إنش (355 مليمتر)"
-
-#~ msgid "15 inches (380 mm)"
-#~ msgstr "15 إنش (380 مليمتر)"
-
-#~ msgid "17 inches (430 mm)"
-#~ msgstr "17 إنش (430 مليمتر)"
-
-#~ msgid "19-20 inches (480-510 mm)"
-#~ msgstr "19-20 إنش (480-510 مليمتر)"
-
-#~ msgid "21 inches (530 mm) or more"
-#~ msgstr "21 إنش (530 مليمتر) أو أكثر"
-
-#~ msgid "Approximate monitor size:"
-#~ msgstr "حجم الشاشة التقريبي:"
-
-#~ msgid ""
-#~ "High-quality CRT's may be able to use the next highest size category."
-#~ msgstr ""
-#~ "شاشات CRT عالية الجودة قد تكون قادرة على استخدام فئة الحجم الأكبر التالية."
-
-#~ msgid "Monitor's best video mode:"
-#~ msgstr "أفضل وضع فيديو للشاشة:"
-
-#~ 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 perfectly acceptable to select a \"worse\" video mode than "
-#~ "the monitor's best if you wish. Users of LCD displays may also be able "
-#~ "to do this, but only if both the video chipset and the driver support it; "
-#~ "if in doubt, use the video mode recommended by the manufacturer of your "
-#~ "LCD."
-#~ msgstr ""
-#~ "اختر \"أفضل\" استبانة ومعدل إنعاش تستطيع الشاشة استخدامه. الاستبانات "
-#~ "الأكبر حجماً ومعدل إنعاش أكثر وضوحاً. عند استخدام شاشة CRT، من المقبول "
-#~ "تماماً اختيار وضع فيديو \"أسوأ\" من أفضل ما تستطيع الشاشة عرضه. قد يستطيع "
-#~ "مستخدمو شاشات LCD أيضاً قادرين على القيام بهذا، ولكن فقط إن كانت رقاقة "
-#~ "الفيديو وبرنامج التشغيل يدعمها. وإن كنت في شك، استخدم وضع الفيديو المقترح "
-#~ "من قبل مصنّع شاشة LCD الخاصة بك."
-
-#~ msgid "Generic Monitor"
-#~ msgstr "شاشة عامة"
-
-#~ msgid "Write monitor sync ranges to the configuration file?"
-#~ msgstr "كتابة قيم مدى مزامنة الشاشة إلى ملف التهيئة؟"
-
-#~ 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 users, and should be left at its default."
-#~ msgstr ""
-#~ "يجب اكتشاف مدى مزامنة الشاشة آلياً من قبل خادم X في معظم الحالات، إلا أنه "
-#~ "قد يحتاج إلى بعض المساعدة أحياناً. هذا الخيار مخصص للمستخدمين الخبراء، "
-#~ "ويجب تركه بقيمته الافتراضية."
-
-#~ msgid "Monitor's horizontal sync range:"
-#~ msgstr "مدى مزامنة الشاشة الأفقي:"
-
-#~ 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 "
-#~ "CRT's). This information should be available in the monitor's manual. "
-#~ "Values lower than 30 or higher than 130 are extremely rare."
-#~ msgstr ""
-#~ "الرجاء إدخال قائمة القيم الفريدة والمفصولة بفواصل (لأجهزة العرض ذات "
-#~ "التردد الثابت)، أو زوجاً من القيم مفصولة بشرطة (-) (جميع شاشات CRT "
-#~ "الحديثة). قد تجد هذه المعلومات متوفرة في كتيب تعليمات الشاشة. القيم التي "
-#~ "تقل عن 30 أو تزيد عن 130 هي نادرة جداً."
-
-#~ msgid "Monitor's vertical refresh range:"
-#~ msgstr "مدى إنعاش الشاشة الرأسي:"
-
-#~ 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 "
-#~ "CRT's). This information should be available in the monitor's manual. "
-#~ "Values lower than 50 or higher than 160 are extremely rare."
-#~ msgstr ""
-#~ "الرجاء إدخال قائمة القيم الفريدة والمفصولة بفواصل (لأجهزة العرض ذات "
-#~ "التردد الثابت)، أو زوجاً من القيم مفصولة بشرطة (-) (جميع شاشات CRT "
-#~ "الحديثة). قد تجد هذه المعلومات متوفرة في كتيب تعليمات الشاشة. القيم التي "
-#~ "تقل عن 50 أو تزيد عن 160 هي نادرة جداً."
-
-#~ msgid "Incorrect values entered"
-#~ msgstr "القيم المدخلة غير صحيحة:"
-
-#~ msgid ""
-#~ "The valid syntax is a comma-separated list of discrete values, or a pair "
-#~ "of values separated by a dash."
-#~ msgstr ""
-#~ "الصيغة الصحيحة هي لائحة بالقيم الفريدة والمفصولة بفواصل، أو زوجاً من القيم "
-#~ "مفصولاً بشرطة (-)."
-
-#~ msgid "Desired default color depth in bits:"
-#~ msgstr "عمق الألوان الافتراضي المرغوب بالبت:"
-
-#~ msgid ""
-#~ "Usually 24-bit color is desirable, but on graphics cards with limited "
-#~ "amounts of framebuffer memory, higher resolutions may be achieved at the "
-#~ "expense of higher color depth. Also, some cards support hardware 3D "
-#~ "acceleration only for certain depths. Consult your video card manual for "
-#~ "more information."
-#~ msgstr ""
-#~ "غالباً ما يرغب في ألوان 24-بت، ولكن في بطاقات الرسوميات ذات كميات الذاكرة "
-#~ "المحدودة أو ذاكرة framebuffer، يمكن الحصول على استبانات أعلى على حساب عمق "
-#~ "الألوان. كما أن بعض عتاد البطاقات تدعم التعزيز الثلاثي الأبعاد فقط في "
-#~ "عمق ألوان محدد. الرجاء الاطلاع على كتيب بطاقة الفيديو الخاص بك للمزيد من "
-#~ "المعلومات."
-
-#~ 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 both. If you want either, select 24 bits."
-#~ msgstr ""
-#~ "ما يسمى \"بألوان 32-بت\" هو في الحقيقة 24 بت من معلومات الألوان إضافة إلى "
-#~ "8 بت لقناة ألفا أو simple zero padding؛ يستطيع نظام نوافذ X التعامل مع كل "
-#~ "منهما. إن كنت تريد أياً منهما، فقم بانتقاء 24 بت."
-
-#~ msgid "Write default Files section to configuration file?"
-#~ msgstr "تريد كتابة قسم Files الافتراضي إلى ملف التهيئة؟"
-
-#~ msgid ""
-#~ "The Files section of the X server configuration file tells the X server "
-#~ "where to find server modules, the RGB color database, and font files. "
-#~ "This option is recommended to experienced users only. In most cases, it "
-#~ "should be enabled."
-#~ msgstr ""
-#~ "يبين قسم Files في ملف تهيئة خادم X المكان الذي يمكن للخادم العثور بداخله "
-#~ "على وحدات الخادم، وقواعد بيانات ألوان RGB، وملفات الخطوط. هذا الخيار "
-#~ "مستحسن للمستخدمين الخبراء فقط ويجب تمكينه في معظم الحالات."
-
-#~ msgid ""
-#~ "Disable this option if you want to maintain a custom Files section into "
-#~ "the X.Org server configuration file. This may be needed to remove the "
-#~ "reference to the local font server, add a reference to a different font "
-#~ "server, or rearrange the default set of local font paths."
-#~ msgstr ""
-#~ "عطل هذا الخيار إن كنت تريد المحافظة على قسم Files المخصص في ملف تهيئة "
-#~ "خادم X.Org. قد تحتاج لهذا لإزالة الرابط لخادم الخط المحلي، واستبداله "
-#~ "بخادم خط آخر، أو لإعادة ترتيب المجموعة الافتراضية لمسارات الخطوط المحلية."
-
-#~ msgid "No X server known for your video hardware"
-#~ msgstr "ليس هناك خادم X معروف لعتاد الفيديو خاصتك"
-
-#~ msgid ""
-#~ "There is either no video hardware installed on this machine (e.g. serial "
-#~ "console only), or the \"discover\" program was unable to determine which "
-#~ "X server is appropriate for the video hardware. This could be due to "
-#~ "incomplete information in discover's hardware database, or because your "
-#~ "video hardware is not supported by the available X servers."
-#~ msgstr ""
-#~ "يبدو أنه ليس هناك عتاد فيديو مثبت على هذا الجهاز (مثلاً بسبب أنه طرفية "
-#~ "تسلسلية فقط)، أو أن برنامج \"discover\" لم يستطع تحديد خادم X الملائم "
-#~ "لعتادك الفيديوي. قد يكون هذا بسبب المعلومات الغير كاملة في قاعدة بيانات "
-#~ "عتاد discover، أو بسبب أن عتاد الفيديو الخاص بك لا تدعمه خادمات X "
-#~ "المتوفرة."
-
-#~ msgid "Multiple potential default X servers for your hardware"
-#~ msgstr "هناك عدة خادمات X افتراضية محتملة لعتادك"
-
-#~ 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 "
Reply to: