xorg: Changes to 'debian-unstable'
debian/TODO | 4
debian/changelog | 13 ++
debian/control | 1
debian/local/Xwrapper.config.5 | 9 -
debian/local/xserver-wrapper.c | 37 -------
debian/po/ar.po | 165 ++++++++++++++--------------------
debian/po/ast.po | 177 +++++++++++++++----------------------
debian/po/be.po | 166 ++++++++++++++---------------------
debian/po/bg.po | 164 ++++++++++++++--------------------
debian/po/bn.po | 165 ++++++++++++++--------------------
debian/po/bs.po | 177 +++++++++++++++----------------------
debian/po/ca.po | 178 +++++++++++++++----------------------
debian/po/cs.po | 170 +++++++++++++++--------------------
debian/po/da.po | 170 +++++++++++++++--------------------
debian/po/de.po | 181 ++++++++++++++++----------------------
debian/po/dz.po | 169 ++++++++++++++---------------------
debian/po/el.po | 189 ++++++++++++++++------------------------
debian/po/eo.po | 174 +++++++++++++++---------------------
debian/po/es.po | 182 ++++++++++++++++----------------------
debian/po/eu.po | 174 +++++++++++++++---------------------
debian/po/fi.po | 175 +++++++++++++++----------------------
debian/po/fr.po | 180 ++++++++++++++++----------------------
debian/po/gl.po | 177 +++++++++++++++----------------------
debian/po/gu.po | 162 ++++++++++++++--------------------
debian/po/he.po | 158 +++++++++++++--------------------
debian/po/hr.po | 177 +++++++++++++++----------------------
debian/po/hu.po | 163 ++++++++++++++--------------------
debian/po/id.po | 176 +++++++++++++++----------------------
debian/po/it.po | 189 ++++++++++++++++------------------------
debian/po/ja.po | 176 +++++++++++++++----------------------
debian/po/kk.po | 166 ++++++++++++++---------------------
debian/po/km.po | 160 +++++++++++++--------------------
debian/po/ko.po | 165 ++++++++++++++--------------------
debian/po/ku.po | 89 +-----------------
debian/po/lt.po | 159 +++++++++++++--------------------
debian/po/ml.po | 169 ++++++++++++++---------------------
debian/po/mr.po | 166 ++++++++++++++---------------------
debian/po/nb.po | 167 ++++++++++++++---------------------
debian/po/ne.po | 165 ++++++++++++++--------------------
debian/po/nl.po | 178 +++++++++++++++----------------------
debian/po/nn.po | 168 ++++++++++++++---------------------
debian/po/pl.po | 171 +++++++++++++++---------------------
debian/po/pt.po | 181 ++++++++++++++++----------------------
debian/po/pt_BR.po | 183 ++++++++++++++++----------------------
debian/po/ro.po | 180 ++++++++++++++++----------------------
debian/po/ru.po | 173 +++++++++++++++---------------------
debian/po/sk.po | 168 ++++++++++++++---------------------
debian/po/sq.po | 171 +++++++++++++++---------------------
debian/po/sv.po | 179 +++++++++++++++----------------------
debian/po/ta.po | 169 +++++++++++++++--------------------
debian/po/templates.pot | 86 ------------------
debian/po/th.po | 162 ++++++++++++++--------------------
debian/po/tr.po | 176 +++++++++++++++----------------------
debian/po/vi.po | 173 +++++++++++++++---------------------
debian/po/wo.po | 177 +++++++++++++++----------------------
debian/po/zh_CN.po | 154 +++++++++++++-------------------
debian/po/zh_TW.po | 155 +++++++++++++-------------------
debian/x11-common.config.in | 77 ----------------
debian/x11-common.links | 1
debian/x11-common.postinst.in | 37 +------
debian/x11-common.preinst.in | 76 ----------------
debian/x11-common.templates | 44 ---------
debian/xserver-xorg.postinst.in | 25 -----
debian/xserver-xorg.postrm.in | 40 --------
debian/xserver-xorg.preinst.in | 77 ----------------
65 files changed, 3623 insertions(+), 5562 deletions(-)
New commits:
commit c32d88eb6a321ea5a6490b58335c2b70e5a2b9ae
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 9 16:09:15 2009 +0200
xserver-xorg.{preinst,postinst,postrm}: stop using /var/lib/x11.
The server symlink is not managed by multiple packages anymore, so
keeping a checksum and list of handlers is unnecessary. We also don't
manage xorg.conf anymore, so we can remove this stuff on upgrade and
purge.
diff --git a/debian/changelog b/debian/changelog
index 8e5656e..96b436f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
creating an empty xorg.conf in preinst. Now that we don't run dexconf, we
don't need to keep a checksum of the config file to know whether the user
customized it.
+ * xserver-xorg.{preinst,postinst,postrm}: stop using /var/lib/x11.
[ Debconf translations ]
* Bengali added
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index e00c621..b37cdb0 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -54,13 +54,8 @@ debug_echo "Configuring $THIS_PACKAGE."
#DEBHELPER#
-# register this package as a (potential) handler of the X server symlink
-if ! fgrep -qsx "$THIS_PACKAGE" "$SERVER_SYMLINK_ROSTER"; then
- echo "$THIS_PACKAGE" >> "$SERVER_SYMLINK_ROSTER"
-fi
-
-# only mess with the server symlink file if it is a symbolic link or does
-# not exist. otherwise, assume that's the way the user wants it.
+# only mess with the server symlink file if it does not exist. otherwise,
+# assume that's the way the user wants it.
if ! [ -e "$SERVER_SYMLINK" ]; then
ln -s "$THIS_SERVER" "$SERVER_SYMLINK"
# recover from an old bug
@@ -72,7 +67,6 @@ fi
if [ -n "$UPGRADE" ]; then
if dpkg --compare-versions "$2" le "1:7.3+5"; then
# Clean up our old crap
- rm -f "$SERVER_SYMLINK_CHECKSUM" "$SERVER_SYMLINK_ROSTER"
for QUESTION in "shared/default-x-server" \
"xserver-xorg/autodetect_mouse" \
"xserver-xorg/autodetect_monitor" \
@@ -119,6 +113,7 @@ if [ -n "$UPGRADE" ]; then
db_unregister xserver-xorg/config/device/bus_id || true
db_unregister xserver-xorg/config/device/bus_id_error || true
rm -f "$XORGCONFIG_ROSTER" "$XORGCONFIG_CHECKSUM"
+ rm -f "$SERVER_SYMLINK_CHECKSUM" "$SERVER_SYMLINK_ROSTER"
fi
fi
diff --git a/debian/xserver-xorg.postrm.in b/debian/xserver-xorg.postrm.in
index 6fd7df4..4fd7aca 100644
--- a/debian/xserver-xorg.postrm.in
+++ b/debian/xserver-xorg.postrm.in
@@ -29,43 +29,9 @@ THIS_SERVER=/usr/bin/Xorg
# clean up non-conffile configuration files and related materials on purge
if [ "$1" = "purge" ]; then
rm -f "$SERVER_SYMLINK"
-
- # de-register this file as a handler of the Xorg 4.x X server configuration
- # file
- if [ -e "$XORGCONFIG_ROSTER" ]; then
- # check existing roster file for our package name
- if fgrep -qx "$THIS_PACKAGE" "$XORGCONFIG_ROSTER"; then
- # construct temporary roster file with our package name removed, ignoring
- # failure
- fgrep -vx "$THIS_PACKAGE" "$XORGCONFIG_ROSTER" > \
- "$XORGCONFIG_ROSTER.dpkg-tmp" || true
- # is there anything left?
- if [ -s "$XORGCONFIG_ROSTER.dpkg-tmp" ]; then
- # yes, replace the roster file
- mv "$XORGCONFIG_ROSTER.dpkg-tmp" "$XORGCONFIG_ROSTER"
- else
- # no; remove both the roster and our temporary copy
- rm -f "$XORGCONFIG_ROSTER" "$XORGCONFIG_ROSTER.dpkg-tmp"
- # remove Xorg X server configuration file if it was still
- # managed by the package
- if [ -e "$XORGCONFIG_CHECKSUM" ]; then
- # does it exist?
- if [ -e "$XORGCONFIG" ]; then
- # does the current MD5 checksum match the stored checksum?
- if [ "$(md5sum "$XORGCONFIG")" \
- = "$(cat "$XORGCONFIG_CHECKSUM")" ]; then
- # yes; remove the config file
- rm -f "$XORGCONFIG"
- fi
- fi
- # remove the checksum file; any remaining XFree86 4.x X server
- # configuration file still on the system at this point is no longer
- # being managed (local user customization)
- rm -f "$XORGCONFIG_CHECKSUM"
- fi
- fi
- fi
- fi
+ rm -f "$XORGCONFIG_CHECKSUM" "$XORGCONFIG_ROSTER"
+ rm -f "$SERVER_SYMLINK_CHECKSUM" "$SERVER_SYMLINK_ROSTER"
+ rm -f "$XORGCONFIG"
for DIR in "$CONFIG_DIR" "$CONFIG_AUX_DIR"; do
rmdir "$DIR" 2> /dev/null || true
diff --git a/debian/xserver-xorg.preinst.in b/debian/xserver-xorg.preinst.in
index eae0d2b..ac45c24 100644
--- a/debian/xserver-xorg.preinst.in
+++ b/debian/xserver-xorg.preinst.in
@@ -15,22 +15,14 @@ THIS_SCRIPT=preinst
CONFIG_DIR=/etc/X11
SERVER_SYMLINK="$CONFIG_DIR/X"
CONFIG_AUX_DIR=/var/lib/x11
-SERVER_SYMLINK_CHECKSUM_BASE="${SERVER_SYMLINK##*/}.md5sum"
-SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/$SERVER_SYMLINK_CHECKSUM_BASE"
-SERVER_SYMLINK_ROSTER_BASE="${SERVER_SYMLINK##*/}.roster"
-SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/$SERVER_SYMLINK_ROSTER_BASE"
THIS_SERVER=/usr/bin/Xorg
-UNCONFIGURED_LINK_TARGET=$(which true)
if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
- # create the configuration files' main and auxiliary directories if they
- # don't exist
- for DIR in "$CONFIG_DIR" "$CONFIG_AUX_DIR"; do
- if ! [ -e "$DIR" ]; then
- observe "creating $DIR"
- mkdir --mode=755 --parents "$DIR"
- fi
- done
+ # create the configuration files directory if it doesn't exist
+ if ! [ -e "$CONFIG_DIR" ]; then
+ observe "creating $CONFIG_DIR"
+ mkdir --mode=755 --parents "$CONFIG_DIR"
+ fi
fi
case "$1" in
commit 43ae9085fa728bca9c2bd49d4dd762af95a6f60c
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 9 15:51:05 2009 +0200
xserver-xorg.{pre,post}inst: drop xorg.conf checksum handling.
Stop creating an empty xorg.conf in preinst. Now that we don't run
dexconf, we don't need to keep a checksum of the config file to know
whether the user customized it.
diff --git a/debian/changelog b/debian/changelog
index a3a82a3..8e5656e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,10 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
2.20.7-5.
* xserver-xorg.preinst: drop migration code from /var/lib/xfree86 to
/var/lib/x11.
+ * xserver-xorg.{pre,post}inst: drop xorg.conf checksum handling. Stop
+ creating an empty xorg.conf in preinst. Now that we don't run dexconf, we
+ don't need to keep a checksum of the config file to know whether the user
+ customized it.
[ Debconf translations ]
* Bengali added
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 3c01a09..e00c621 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -54,13 +54,10 @@ debug_echo "Configuring $THIS_PACKAGE."
#DEBHELPER#
-# register this package as a (potential) handler of the X server symlink and
-# X.Org X server configuration file
-for ROSTER in "$SERVER_SYMLINK_ROSTER" "$XORGCONFIG_ROSTER"; do
- if ! fgrep -qsx "$THIS_PACKAGE" "$ROSTER"; then
- echo "$THIS_PACKAGE" >> "$ROSTER"
- fi
-done
+# register this package as a (potential) handler of the X server symlink
+if ! fgrep -qsx "$THIS_PACKAGE" "$SERVER_SYMLINK_ROSTER"; then
+ echo "$THIS_PACKAGE" >> "$SERVER_SYMLINK_ROSTER"
+fi
# only mess with the server symlink file if it is a symbolic link or does
# not exist. otherwise, assume that's the way the user wants it.
@@ -121,6 +118,7 @@ if [ -n "$UPGRADE" ]; then
if dpkg --compare-versions "$2" lt-nl 1:7.4+2; then
db_unregister xserver-xorg/config/device/bus_id || true
db_unregister xserver-xorg/config/device/bus_id_error || true
+ rm -f "$XORGCONFIG_ROSTER" "$XORGCONFIG_CHECKSUM"
fi
fi
@@ -135,16 +133,6 @@ if dpkg --compare-versions "$2" lt-nl "1:7.4~3"; then
}
' $XORGCONFIG > ${XORGCONFIG}.madwizard-new
if ! cmp -s $XORGCONFIG ${XORGCONFIG}.madwizard-new; then
- # compare the current and stored checksums; if they do not match, assume
- # that's the way the user wants it.
- if [ "$(md5sum "$XORGCONFIG")" != "$(cat "$XORGCONFIG_CHECKSUM")" ]; then
- BACKUP_XORGCONFIG="$XORGCONFIG.$(date '+%Y%m%d%H%M%S')"
- warn "$XORGCONFIG has been customized, but we need to make updates. Backing up your config to $BACKUP_XORGCONFIG. If we screw something up, restore using this file."
- cp "$XORGCONFIG" "$BACKUP_XORGCONFIG"
- else
- # checksums match, update the checksum
- md5sum "${XORGCONFIG}.madwizard-new" > "$XORGCONFIG_CHECKSUM"
- fi
chown --reference=$XORGCONFIG ${XORGCONFIG}.madwizard-new
chmod --reference=$XORGCONFIG ${XORGCONFIG}.madwizard-new
mv ${XORGCONFIG}.madwizard-new $XORGCONFIG
diff --git a/debian/xserver-xorg.preinst.in b/debian/xserver-xorg.preinst.in
index a17d2d0..eae0d2b 100644
--- a/debian/xserver-xorg.preinst.in
+++ b/debian/xserver-xorg.preinst.in
@@ -14,17 +14,11 @@ THIS_SCRIPT=preinst
CONFIG_DIR=/etc/X11
SERVER_SYMLINK="$CONFIG_DIR/X"
-XF86CONFIG="$CONFIG_DIR/XF86Config-4"
-XORGCONFIG="$CONFIG_DIR/xorg.conf"
CONFIG_AUX_DIR=/var/lib/x11
SERVER_SYMLINK_CHECKSUM_BASE="${SERVER_SYMLINK##*/}.md5sum"
SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/$SERVER_SYMLINK_CHECKSUM_BASE"
SERVER_SYMLINK_ROSTER_BASE="${SERVER_SYMLINK##*/}.roster"
SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/$SERVER_SYMLINK_ROSTER_BASE"
-XORGCONFIG_CHECKSUM_BASE="${XORGCONFIG##*/}.md5sum"
-XORGCONFIG_CHECKSUM="$CONFIG_AUX_DIR/$XORGCONFIG_CHECKSUM_BASE"
-XORGCONFIG_ROSTER_BASE="${XORGCONFIG##*/}.roster"
-XORGCONFIG_ROSTER="$CONFIG_AUX_DIR/$XORGCONFIG_ROSTER_BASE"
THIS_SERVER=/usr/bin/Xorg
UNCONFIGURED_LINK_TARGET=$(which true)
@@ -37,18 +31,6 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
mkdir --mode=755 --parents "$DIR"
fi
done
-
- # implement (simplified) ucf-style configration file handling
-
- # if performing a fresh install, place config files under management if they
- # do *not* already exist
- if [ "$1" = "install" ]; then
- if ! [ -e "$XORGCONFIG" ]; then
- # cheap, fork()-free version of "touch"
- : > "$XORGCONFIG"
- md5sum "$XORGCONFIG" > "$XORGCONFIG_CHECKSUM"
- fi
- fi
fi
case "$1" in
commit 01db5f0be45e8aa0e39221919a9c715500495045
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 9 15:26:26 2009 +0200
xserver-xorg.preinst: drop migration code from /var/lib/xfree86 to /var/lib/x11
diff --git a/debian/changelog b/debian/changelog
index 937e186..a3a82a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,8 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
debconf templates and maintainer scripts handling.
* Don't ship the /usr/X11R6/bin symlink in x11-common. Break gdm <<
2.20.7-5.
+ * xserver-xorg.preinst: drop migration code from /var/lib/xfree86 to
+ /var/lib/x11.
[ Debconf translations ]
* Bengali added
diff --git a/debian/xserver-xorg.preinst.in b/debian/xserver-xorg.preinst.in
index 05dccef..a17d2d0 100644
--- a/debian/xserver-xorg.preinst.in
+++ b/debian/xserver-xorg.preinst.in
@@ -38,49 +38,6 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
fi
done
- # the transition from /var/lib/xfree86 to /var/lib/x11 occurred in
- # 7.0.0-0ubuntu1 and 1:7.0.0
- if [ -n "$2" ] && \
- dpkg --compare-versions "$2" lt "1:7.0.11"; then
- if [ -e "/var/lib/xfree86" ]; then
- if [ -e "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE" ]; then \
- if fgrep -qx "$THIS_PACKAGE" \
- "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE"; then
- # construct temporary roster file with our package name removed, ignoring
- # failure
- fgrep -vx "$THIS_PACKAGE" \
- "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE" > \
- "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE.dpkg-tmp" 2>/dev/null \
- || true
-
- # is there anything left?
- if [ -s "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE.dpkg-tmp" ]; then
- # yes, replace the roster file
- mv "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE.dpkg-tmp" \
- "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE"
- else
- # no; remove both the original and our temporary copy
- rm -f "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE" \
- "/var/lib/xfree86/$XORGCONFIG_ROSTER_BASE.dpkg-tmp"
- fi
- fi
- fi
-
- if [ -e "/var/lib/xfree86/$XORGCONFIG_CHECKSUM_BASE" ]; then
- # migrate the checksum if it doesn't exist
- if [ -e "$XORGCONFIG_CHECKSUM" ]; then
- rm "/var/lib/xfree86/$XORGCONFIG_CHECKSUM_BASE"
- else
- mv "/var/lib/xfree86/$XORGCONFIG_CHECKSUM_BASE" \
- "$CONFIG_AUX_DIR" || \
- error "Could not move the xorg.conf.md5sum for some reason"
- fi
- fi
-
- rmdir /var/lib/xfree86 2>/dev/null || true
- fi
- fi
-
# implement (simplified) ucf-style configration file handling
# if performing a fresh install, place config files under management if they
commit 559a21e88e9c558c801ee470f2be4a18a34cfd8d
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 9 15:21:17 2009 +0200
Don't ship the /usr/X11R6/bin symlink in x11-common.
Break gdm << 2.20.7-5.
diff --git a/debian/changelog b/debian/changelog
index 672689c..937e186 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
templates.
* Drop support for renicing the X server from the wrapper. Remove related
debconf templates and maintainer scripts handling.
+ * Don't ship the /usr/X11R6/bin symlink in x11-common. Break gdm <<
+ 2.20.7-5.
[ Debconf translations ]
* Bengali added
diff --git a/debian/control b/debian/control
index 0f0dc72..c8e4589 100644
--- a/debian/control
+++ b/debian/control
@@ -64,6 +64,7 @@ Conflicts: xfree86-common, xorg-common, xserver-common (<< 7), x-common,
ucbmpeg-play (<< 2.3p-13), netscape-base-4, communicator-smotif-477, epan,
navigator-smotif-477, stella (<< 2.2-1), xfractint (<< 20.3.01-1), xgobi,
xpostitplus, xisp, vide (<= 1.21-3)
+Breaks: gdm (<< 2.20.7-5)
Replaces: xfree86-common, xorg-common, xserver-common (<< 7), x-common
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
diff --git a/debian/x11-common.links b/debian/x11-common.links
index e707811..2cf8af5 100644
--- a/debian/x11-common.links
+++ b/debian/x11-common.links
@@ -1,3 +1,2 @@
usr/bin usr/bin/X11
etc/X11/rgb.txt usr/share/X11/rgb.txt
-usr/bin usr/X11R6/bin
commit 5021ba0d9b348296c1aaea492bc50223e7eb062f
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 2 21:06:21 2009 +0200
Add a small todo list for this package
diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 0000000..973d2cc
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1,4 @@
+* Xwrapper.config should really move away from x11-common, now that we
+ only have one X server to deal with
+* Merge xserver-xorg and xserver-xorg-core? What about the circular dep?
+
commit bd0391d1ed24aaf2defc39b0609e6c2878753230
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 2 20:32:56 2009 +0200
update po files
diff --git a/debian/po/ar.po b/debian/po/ar.po
index 2a1db02..46e8ed2 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: 2009-05-25 15:28+0200\n"
+"POT-Creation-Date: 2009-06-02 20:32+0200\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"
@@ -60,110 +60,81 @@ msgstr ""
"يمكنه تشغيل خادم X. لذا، فإن الحل الأمثل لهذه المعضلة هو السماح فقط لمستخدمي "
"النظام عبر أحد الطرفيات الوهمية."
-#. Type: string
-#. Description
-#: ../x11-common.templates:4001
-msgid "Nice value for the X server:"
-msgstr "قيمة nice لخادم X:"
+#~ msgid "Nice value for the X server:"
+#~ msgstr "قيمة nice لخادم X:"
-#. Type: string
-#. Description
-#: ../x11-common.templates:4001
-msgid ""
-"When using operating system kernels with a particular scheduling strategy, "
-"it has been widely noted that the X server's performance improves when it is "
-"run at a higher process priority than the default; a process's priority is "
-"known as its \"nice\" value. These values range from -20 (extremely high "
-"priority, or \"not nice\" to other processes) to 19 (extremely low "
-"priority). The default nice value for ordinary processes is 0, and this is "
-"also the recommend value for the X server."
-msgstr ""
-"عند استخدام نواة نظام تشغيل ذات استراتيجية جدولة معينة، لوحظ بشكل كبير بأن "
-"كفاءة خادم X تتحسن عند تشغيله بأولوية عملية أعلى من الافتراضية، والتي تعرف "
-"بقيمة \"nice\". وتتراوح هذه القيمة بين -20 (والتي هي الأولوية المرتفعة جداً، "
-"أو التي \"ليست لطيفة\" للعمليات الأخرى) إلى 19 (والتي هي الأولوية المنخفضة "
-"جداً). تكون قيمة nice للعمليات العادية هي 0، وهذه هي القيمة المستحسنة أيضاً "
-"لخادم X."
-
-#. Type: string
-#. Description
-#: ../x11-common.templates:4001
-msgid ""
-"Values outside the range of -10 to 0 are not recommended; too negative, and "
-"the X server will interfere with important system tasks. Too positive, and "
-"the X server will be sluggish and unresponsive."
-msgstr ""
-"القيم التي تقل عن -10 أو تزيد عن 0 ليست مستحسنة؛ فإن كانت أقل من -10 فإن "
-"خادم X سيتعارض مع مهام النظام الضرورية. وإن كانت أكبر من 0 فستبطئ عمل خادم X "
-"وتثبطه."
+#~ msgid ""
+#~ "When using operating system kernels with a particular scheduling "
+#~ "strategy, it has been widely noted that the X server's performance "
+#~ "improves when it is run at a higher process priority than the default; a "
+#~ "process's priority is known as its \"nice\" value. These values range "
+#~ "from -20 (extremely high priority, or \"not nice\" to other processes) to "
+#~ "19 (extremely low priority). The default nice value for ordinary "
+#~ "processes is 0, and this is also the recommend value for the X server."
+#~ msgstr ""
+#~ "عند استخدام نواة نظام تشغيل ذات استراتيجية جدولة معينة، لوحظ بشكل كبير "
+#~ "بأن كفاءة خادم X تتحسن عند تشغيله بأولوية عملية أعلى من الافتراضية، والتي "
+#~ "تعرف بقيمة \"nice\". وتتراوح هذه القيمة بين -20 (والتي هي الأولوية "
+#~ "المرتفعة جداً، أو التي \"ليست لطيفة\" للعمليات الأخرى) إلى 19 (والتي هي "
+#~ "الأولوية المنخفضة جداً). تكون قيمة nice للعمليات العادية هي 0، وهذه هي "
+#~ "القيمة المستحسنة أيضاً لخادم X."
-#. Type: note
-#. Description
-#: ../x11-common.templates:5001
-msgid "Incorrect nice value"
-msgstr "قيمة nice غير صالحة"
+#~ msgid ""
+#~ "Values outside the range of -10 to 0 are not recommended; too negative, "
+#~ "and the X server will interfere with important system tasks. Too "
+#~ "positive, and the X server will be sluggish and unresponsive."
+#~ msgstr ""
+#~ "القيم التي تقل عن -10 أو تزيد عن 0 ليست مستحسنة؛ فإن كانت أقل من -10 فإن "
+#~ "خادم X سيتعارض مع مهام النظام الضرورية. وإن كانت أكبر من 0 فستبطئ عمل "
+#~ "خادم X وتثبطه."
-#. Type: note
-#. Description
-#: ../x11-common.templates:5001
-msgid "Please enter an integer between -20 and 19."
-msgstr "الرجاء إدخال قيمة صحيحة بين -20 و 19"
+#~ msgid "Incorrect nice value"
+#~ msgstr "قيمة nice غير صالحة"
-#. Type: note
-#. Description
-#: ../x11-common.templates:6001
-msgid "Major possible upgrade issues"
-msgstr "قد تكون هناك مشاكل عامة في الترقية"
+#~ msgid "Please enter an integer between -20 and 19."
+#~ msgstr "الرجاء إدخال قيمة صحيحة بين -20 و 19"
-#. Type: note
-#. Description
-#: ../x11-common.templates:6001
-msgid ""
-"Some users have reported that upon upgrade to the current package set, their "
-"xserver package was no longer installed. Because there is no easy way around "
-"this problem, you should be sure to check that the xserver-xorg package is "
-"installed after upgrade. If it is not installed and you require it, it is "
-"recommended that you install the xorg package to make sure you have a fully "
-"functional X setup."
-msgstr ""
-"أبلغنا بعض المستخدمين بأنه عند الترقية إلى مجموعة الحزم الحالية، فإن حزمة "
-"xserver لا يتم تثبيتها. ولإنه ليست هناك طريقة سهلة لحل هذه المعضلة، فعليك "
-"بالتأكد من تثبيت حزمة xserver-xorg بعد الترقية. إن تكن الحزمة مثبتةً وكنت "
-"بحاجة لها، فمن المستحسن أن تقوم بتثبيت حزمة xorg كي تضمن الحصول على إعداد "
-"لخادم X يمكنك العمل به."
+#~ msgid "Major possible upgrade issues"
+#~ msgstr "قد تكون هناك مشاكل عامة في الترقية"
-#. Type: note
-#. Description
-#: ../x11-common.templates:7001
-msgid "Cannot remove /usr/X11R6/bin directory"
-msgstr "لا يمكن إزالة الدليل /usr/X11R6/bin"
+#~ msgid ""
+#~ "Some users have reported that upon upgrade to the current package set, "
+#~ "their xserver package was no longer installed. Because there is no easy "
+#~ "way around this problem, you should be sure to check that the xserver-"
+#~ "xorg package is installed after upgrade. If it is not installed and you "
+#~ "require it, it is recommended that you install the xorg package to make "
+#~ "sure you have a fully functional X setup."
+#~ msgstr ""
+#~ "أبلغنا بعض المستخدمين بأنه عند الترقية إلى مجموعة الحزم الحالية، فإن حزمة "
+#~ "xserver لا يتم تثبيتها. ولإنه ليست هناك طريقة سهلة لحل هذه المعضلة، فعليك "
+#~ "بالتأكد من تثبيت حزمة xserver-xorg بعد الترقية. إن تكن الحزمة مثبتةً وكنت "
+#~ "بحاجة لها، فمن المستحسن أن تقوم بتثبيت حزمة xorg كي تضمن الحصول على إعداد "
+#~ "لخادم X يمكنك العمل به."
-#. Type: note
-#. Description
-#: ../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 "
-"likely because the directory is not yet empty. You must move the files that "
-"are currently in the directory out of the way so that the installation can "
-"complete. If you like, you may move them back after the symlink is in place."
-msgstr ""
-"تتطلب عملية الترقية هذه إزالة الدليل /usr/X11R6/bin و استبداله برابط رمزي. "
-"لقد حاولنا القيام بذلك، ولكن العملية فشلت، ويبدو أن هذا بسبب أن الدليل غير "
-"فارغ. عليك بنقل الملفات الموجودة حالياً في الدليل كي يتمكن برنامج التثبيت من "
-"إتمام هذه العملية. إن أردت، يمكن إعادة الملفات إلى حيث كانت بعد إنشاء الرابط "
-"الرمزي."
+#~ msgid "Cannot remove /usr/X11R6/bin directory"
+#~ msgstr "لا يمكن إزالة الدليل /usr/X11R6/bin"
-#. Type: note
-#. Description
-#: ../x11-common.templates:7001
-msgid ""
-"This package installation will now fail and exit so that you can do this. "
-"Please re-run your upgrade procedure after you have cleaned out the "
-"directory."
-msgstr ""
-"ستفشل عملية تثبيت الحزمة هذه وتتوقف كي تستطيع القيام بهذا. الرجاء إعادة "
-"تشغيل عملية الترقية بعد أن تنتهي من تنظيف الدليل."
+#~ 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 likely because the directory is not yet empty. You must move the "
+#~ "files that are currently in the directory out of the way so that the "
+#~ "installation can complete. If you like, you may move them back after the "
+#~ "symlink is in place."
+#~ msgstr ""
+#~ "تتطلب عملية الترقية هذه إزالة الدليل /usr/X11R6/bin و استبداله برابط "
+#~ "رمزي. لقد حاولنا القيام بذلك، ولكن العملية فشلت، ويبدو أن هذا بسبب أن "
+#~ "الدليل غير فارغ. عليك بنقل الملفات الموجودة حالياً في الدليل كي يتمكن "
+#~ "برنامج التثبيت من إتمام هذه العملية. إن أردت، يمكن إعادة الملفات إلى حيث "
+#~ "كانت بعد إنشاء الرابط الرمزي."
+
+#~ msgid ""
+#~ "This package installation will now fail and exit so that you can do this. "
+#~ "Please re-run your upgrade procedure after you have cleaned out the "
+#~ "directory."
+#~ msgstr ""
+#~ "ستفشل عملية تثبيت الحزمة هذه وتتوقف كي تستطيع القيام بهذا. الرجاء إعادة "
+#~ "تشغيل عملية الترقية بعد أن تنتهي من تنظيف الدليل."
#~ msgid "Video card's bus identifier:"
#~ msgstr "مُعرّف ناقل بطاقة الفيديو:"
diff --git a/debian/po/ast.po b/debian/po/ast.po
index fec2ad4..793f4e1 100644
--- a/debian/po/ast.po
+++ b/debian/po/ast.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xorg_po\n"
"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-25 15:28+0200\n"
+"POT-Creation-Date: 2009-06-02 20:32+0200\n"
"PO-Revision-Date: 2009-01-12 08:33+0100\n"
"Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
"com>\n"
@@ -62,114 +62,87 @@ msgstr ""
"que'l sirvidor X lu anicien namái usuarios que tengan entrao per una de les "
"consoles virtuales."
-#. Type: string
-#. Description
-#: ../x11-common.templates:4001
-msgid "Nice value for the X server:"
-msgstr "Bon valor (nice) pal sirividor X:"
+#~ msgid "Nice value for the X server:"
+#~ msgstr "Bon valor (nice) pal sirividor X:"
-#. Type: string
-#. Description
-#: ../x11-common.templates:4001
-msgid ""
-"When using operating system kernels with a particular scheduling strategy, "
-"it has been widely noted that the X server's performance improves when it is "
-"run at a higher process priority than the default; a process's priority is "
-"known as its \"nice\" value. These values range from -20 (extremely high "
-"priority, or \"not nice\" to other processes) to 19 (extremely low "
-"priority). The default nice value for ordinary processes is 0, and this is "
-"also the recommend value for the X server."
-msgstr ""
-"Cuando s'usen núcleos del sistema operativu configurados con una estratexa "
-"particular de planificación de procesos, ta enantadamente demostrao que'l "
-"rendimientu del sirvidor X meyora si s'executa con una prioridá mayor que la "
-"predeterminada; la prioridá d'un procesu conozse como'l so valor de \"nice"
-"\" (amabilidá). Ésti pue cimblar ente -20 (una prioridá estremadamente alta, "
-"o nada amable (\"not nice\") col restu de procesos) hasta 19 (una prioridá "
-"estremadamente baxa). El valor por defeutu de nice pa los procesos "
-"ordinarios ye 0, y esti valor ye un bon valor recomendáu pal sirvidor de X."
-
-#. Type: string
-#. Description
-#: ../x11-common.templates:4001
-msgid ""
-"Values outside the range of -10 to 0 are not recommended; too negative, and "
-"the X server will interfere with important system tasks. Too positive, and "
-"the X server will be sluggish and unresponsive."
-msgstr ""
-"Nun se recomienden los valores fuera del rangu de -10 a 0: enforma baxu, y "
-"el sirvidor X interferirá con xeres importantes del sistema; enforma altu, y "
-"el sirvidor X parecerá perezosu y alletargáu."
+#~ msgid ""
+#~ "When using operating system kernels with a particular scheduling "
+#~ "strategy, it has been widely noted that the X server's performance "
+#~ "improves when it is run at a higher process priority than the default; a "
+#~ "process's priority is known as its \"nice\" value. These values range "
+#~ "from -20 (extremely high priority, or \"not nice\" to other processes) to "
+#~ "19 (extremely low priority). The default nice value for ordinary "
+#~ "processes is 0, and this is also the recommend value for the X server."
+#~ msgstr ""
+#~ "Cuando s'usen núcleos del sistema operativu configurados con una "
+#~ "estratexa particular de planificación de procesos, ta enantadamente "
+#~ "demostrao que'l rendimientu del sirvidor X meyora si s'executa con una "
+#~ "prioridá mayor que la predeterminada; la prioridá d'un procesu conozse "
+#~ "como'l so valor de \"nice\" (amabilidá). Ésti pue cimblar ente -20 (una "
+#~ "prioridá estremadamente alta, o nada amable (\"not nice\") col restu de "
+#~ "procesos) hasta 19 (una prioridá estremadamente baxa). El valor por "
+#~ "defeutu de nice pa los procesos ordinarios ye 0, y esti valor ye un bon "
+#~ "valor recomendáu pal sirvidor de X."
-#. Type: note
-#. Description
-#: ../x11-common.templates:5001
-msgid "Incorrect nice value"
-msgstr "Valor de nice inválidu."
+#~ msgid ""
+#~ "Values outside the range of -10 to 0 are not recommended; too negative, "
+#~ "and the X server will interfere with important system tasks. Too "
+#~ "positive, and the X server will be sluggish and unresponsive."
+#~ msgstr ""
+#~ "Nun se recomienden los valores fuera del rangu de -10 a 0: enforma baxu, "
+#~ "y el sirvidor X interferirá con xeres importantes del sistema; enforma "
+#~ "altu, y el sirvidor X parecerá perezosu y alletargáu."
-#. Type: note
-#. Description
-#: ../x11-common.templates:5001
-msgid "Please enter an integer between -20 and 19."
-msgstr "Por favor, introduz un enteru ente -20 y 19."
+#~ msgid "Incorrect nice value"
+#~ msgstr "Valor de nice inválidu."
-#. Type: note
-#. Description
-#: ../x11-common.templates:6001
-msgid "Major possible upgrade issues"
-msgstr "Problemes conocíos d'actualización"
+#~ msgid "Please enter an integer between -20 and 19."
+#~ msgstr "Por favor, introduz un enteru ente -20 y 19."
-#. Type: note
-#. Description
-#: ../x11-common.templates:6001
-msgid ""
-"Some users have reported that upon upgrade to the current package set, their "
-"xserver package was no longer installed. Because there is no easy way around "
-"this problem, you should be sure to check that the xserver-xorg package is "
-"installed after upgrade. If it is not installed and you require it, it is "
-"recommended that you install the xorg package to make sure you have a fully "
-"functional X setup."
-msgstr ""
-"Dalgunos usuarios informáronnos de que tres l'actualización a la versión "
-"actual d'esti paquete, el paquete de xserver nun taba instaláu. Nun hai un "
-"mou cenciellu d'iguar esti problema, polo que encamentámos-y que revises "
-"tres de la instalación que'l paquete xserver-xorg tea instaláu. Si nun lo "
-"ta, y lu necesita, recomiéndase qu'instales el paquete xorg p'asegurate de "
-"que tien una configuración de X funcional."
-
-#. Type: note
-#. Description
-#: ../x11-common.templates:7001
-msgid "Cannot remove /usr/X11R6/bin directory"
-msgstr "Nun pudo desaniciase'l direutoriu /usr/X11R6/bin"
+#~ msgid "Major possible upgrade issues"
+#~ msgstr "Problemes conocíos d'actualización"
-#. Type: note
-#. Description
-#: ../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 "
-"likely because the directory is not yet empty. You must move the files that "
-"are currently in the directory out of the way so that the installation can "
-"complete. If you like, you may move them back after the symlink is in place."
-msgstr ""
-"Esta actualización requier que se troque'l direutoriu /usr/X11R6/bin por un "
-"enllaz simbólicu. Esta operación tentó facese, pero falló, dablemente darréu "
-"que'l direutoriu nun taba ermu. Tienes de quitar los ficheros qu'hai nesti "
-"direutoriu pa que la instalación pueda completase. Si lo quieres, puedes "
-"movelos al mesmu sitiu una vegada que se tenga criao l'enllaz simbólicu."
+#~ msgid ""
+#~ "Some users have reported that upon upgrade to the current package set, "
+#~ "their xserver package was no longer installed. Because there is no easy "
+#~ "way around this problem, you should be sure to check that the xserver-"
+#~ "xorg package is installed after upgrade. If it is not installed and you "
+#~ "require it, it is recommended that you install the xorg package to make "
+#~ "sure you have a fully functional X setup."
+#~ msgstr ""
+#~ "Dalgunos usuarios informáronnos de que tres l'actualización a la versión "
+#~ "actual d'esti paquete, el paquete de xserver nun taba instaláu. Nun hai "
+#~ "un mou cenciellu d'iguar esti problema, polo que encamentámos-y que "
+#~ "revises tres de la instalación que'l paquete xserver-xorg tea instaláu. "
+#~ "Si nun lo ta, y lu necesita, recomiéndase qu'instales el paquete xorg "
+#~ "p'asegurate de que tien una configuración de X funcional."
-#. Type: note
-#. Description
-#: ../x11-common.templates:7001
-msgid ""
-"This package installation will now fail and exit so that you can do this. "
-"Please re-run your upgrade procedure after you have cleaned out the "
-"directory."
-msgstr ""
-"La instalación d'esti paquete finará con un fallu agora pa que pueda facelo. "
-"Por favor, execute de nuevu'l so procedimientu d'actualización una vegada "
-"que heba llimpiao'l direutoriu."
+#~ msgid "Cannot remove /usr/X11R6/bin directory"
+#~ msgstr "Nun pudo desaniciase'l direutoriu /usr/X11R6/bin"
+
+#~ 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 likely because the directory is not yet empty. You must move the "
+#~ "files that are currently in the directory out of the way so that the "
+#~ "installation can complete. If you like, you may move them back after the "
+#~ "symlink is in place."
+#~ msgstr ""
+#~ "Esta actualización requier que se troque'l direutoriu /usr/X11R6/bin por "
+#~ "un enllaz simbólicu. Esta operación tentó facese, pero falló, dablemente "
+#~ "darréu que'l direutoriu nun taba ermu. Tienes de quitar los ficheros "
+#~ "qu'hai nesti direutoriu pa que la instalación pueda completase. Si lo "
+#~ "quieres, puedes movelos al mesmu sitiu una vegada que se tenga criao "
+#~ "l'enllaz simbólicu."
+
+#~ msgid ""
+#~ "This package installation will now fail and exit so that you can do this. "
+#~ "Please re-run your upgrade procedure after you have cleaned out the "
+#~ "directory."
+#~ msgstr ""
+#~ "La instalación d'esti paquete finará con un fallu agora pa que pueda "
+#~ "facelo. Por favor, execute de nuevu'l so procedimientu d'actualización "
+#~ "una vegada que heba llimpiao'l direutoriu."
#~ msgid "Video card's bus identifier:"
#~ msgstr "Identificador del bus de la tarxeta de vídeu:"
diff --git a/debian/po/be.po b/debian/po/be.po
index ae1195c..eaea45c 100644
--- a/debian/po/be.po
+++ b/debian/po/be.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xorg_be\n"
"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-25 15:28+0200\n"
+"POT-Creation-Date: 2009-06-02 20:32+0200\n"
"PO-Revision-Date: 2008-06-09 12:18+0300\n"
"Last-Translator: Pavel Piatruk <piatruk.p@gmail.com>\n"
"Language-Team: Belarusian <i18n@mova.org>\n"
@@ -56,110 +56,82 @@ msgstr ""
"стартаваць X-сервер. Найлепшае выйсце - дазволіць запуск X-сервера толькі "
"тым карыстальнікам, што зайшлі ў адну з віртуальных кансоляў."
-#. Type: string
-#. Description
-#: ../x11-common.templates:4001
-msgid "Nice value for the X server:"
-msgstr "Значэнне прыярытэту для X-сервера:"
+#~ msgid "Nice value for the X server:"
+#~ msgstr "Значэнне прыярытэту для X-сервера:"
-#. Type: string
-#. Description
-#: ../x11-common.templates:4001
-msgid ""
-"When using operating system kernels with a particular scheduling strategy, "
-"it has been widely noted that the X server's performance improves when it is "
-"run at a higher process priority than the default; a process's priority is "
-"known as its \"nice\" value. These values range from -20 (extremely high "
-"priority, or \"not nice\" to other processes) to 19 (extremely low "
-"priority). The default nice value for ordinary processes is 0, and this is "
-"also the recommend value for the X server."
-msgstr ""
-"Шмат хто заўважаў, што пры выкарыстанні ядраў з пэўнай стратэгіяй "
-"планіроўшчыка прадукцыйнасць X-сервера павялічваецца пры вызначэнні ўзроўню "
-"яго прыярытэту вышается вышэй за звычайны. Прыярытэт працэсу вядомы як "
-"значэнне \"nice\". Інтэрвал гэтых значэнняў ад -20 (найвышэйшы прыярытэт або "
-"\"not nice\" для іншых працэсаў) да 19 (найніжэйшы прыярытэт). Стандартнае "
-"значэнне для звычайных працэсаў 0, і такое ж раіцца для X-сервера."
-
-#. Type: string
-#. Description
-#: ../x11-common.templates:4001
-msgid ""
-"Values outside the range of -10 to 0 are not recommended; too negative, and "
-"the X server will interfere with important system tasks. Too positive, and "
-"the X server will be sluggish and unresponsive."
-msgstr ""
-"Значэнні па-за дыяпазонам ад -10 да 0 не рэкамендуюцца; пры надта нізкіх X-"
-"сервер будзе замінаць важным сістэмным працэсам, а пры занадта вялікіх "
-"сервер будзе марудна працаваць і дрэнна адукацца."
+#~ msgid ""
+#~ "When using operating system kernels with a particular scheduling "
+#~ "strategy, it has been widely noted that the X server's performance "
+#~ "improves when it is run at a higher process priority than the default; a "
+#~ "process's priority is known as its \"nice\" value. These values range "
+#~ "from -20 (extremely high priority, or \"not nice\" to other processes) to "
+#~ "19 (extremely low priority). The default nice value for ordinary "
+#~ "processes is 0, and this is also the recommend value for the X server."
+#~ msgstr ""
+#~ "Шмат хто заўважаў, што пры выкарыстанні ядраў з пэўнай стратэгіяй "
+#~ "планіроўшчыка прадукцыйнасць X-сервера павялічваецца пры вызначэнні "
+#~ "ўзроўню яго прыярытэту вышается вышэй за звычайны. Прыярытэт працэсу "
+#~ "вядомы як значэнне \"nice\". Інтэрвал гэтых значэнняў ад -20 (найвышэйшы "
+#~ "прыярытэт або \"not nice\" для іншых працэсаў) да 19 (найніжэйшы "
+#~ "прыярытэт). Стандартнае значэнне для звычайных працэсаў 0, і такое ж "
+#~ "раіцца для X-сервера."
-#. Type: note
-#. Description
-#: ../x11-common.templates:5001
-msgid "Incorrect nice value"
-msgstr "Некарэктнае значэчнне прыярытэту."
+#~ msgid ""
+#~ "Values outside the range of -10 to 0 are not recommended; too negative, "
+#~ "and the X server will interfere with important system tasks. Too "
+#~ "positive, and the X server will be sluggish and unresponsive."
+#~ msgstr ""
+#~ "Значэнні па-за дыяпазонам ад -10 да 0 не рэкамендуюцца; пры надта нізкіх "
+#~ "X-сервер будзе замінаць важным сістэмным працэсам, а пры занадта вялікіх "
+#~ "сервер будзе марудна працаваць і дрэнна адукацца."
-#. Type: note
-#. Description
-#: ../x11-common.templates:5001
-msgid "Please enter an integer between -20 and 19."
-msgstr "Калі ласка, увядзіце лічбу паміж -20 і 18."
+#~ msgid "Incorrect nice value"
+#~ msgstr "Некарэктнае значэчнне прыярытэту."
-#. Type: note
-#. Description
-#: ../x11-common.templates:6001
-msgid "Major possible upgrade issues"
-msgstr "Магчымыя праблемы пры абнаўленні"
+#~ msgid "Please enter an integer between -20 and 19."
+#~ msgstr "Калі ласка, увядзіце лічбу паміж -20 і 18."
-#. Type: note
-#. Description
-#: ../x11-common.templates:6001
-msgid ""
-"Some users have reported that upon upgrade to the current package set, their "
-"xserver package was no longer installed. Because there is no easy way around "
-"this problem, you should be sure to check that the xserver-xorg package is "
-"installed after upgrade. If it is not installed and you require it, it is "
-"recommended that you install the xorg package to make sure you have a fully "
-"functional X setup."
-msgstr ""
-"Некаторыя карыстальнікі паведамлялі, што падчас абнаўлення да бягучай версіі "
-"іх пакет xserver стае неўсталяваным. Такую праблему цяжка адсачыць, пасля "
-"абнаўлення праверце, што пакет xserver-xorg усталяваўся. Калі ён "
-"неўсталяваны, але вам патрэбны, раім усталяваць пакет xorg, каб атрымаць "
-"цалкам прыдатны да выкарыстання X-сервер."
+#~ msgid "Major possible upgrade issues"
+#~ msgstr "Магчымыя праблемы пры абнаўленні"
-#. Type: note
-#. Description
-#: ../x11-common.templates:7001
-msgid "Cannot remove /usr/X11R6/bin directory"
-msgstr "Немагчыма выдаліць каталог /usr/X11R6/bin"
+#~ msgid ""
+#~ "Some users have reported that upon upgrade to the current package set, "
+#~ "their xserver package was no longer installed. Because there is no easy "
+#~ "way around this problem, you should be sure to check that the xserver-"
+#~ "xorg package is installed after upgrade. If it is not installed and you "
+#~ "require it, it is recommended that you install the xorg package to make "
+#~ "sure you have a fully functional X setup."
+#~ msgstr ""
+#~ "Некаторыя карыстальнікі паведамлялі, што падчас абнаўлення да бягучай "
+#~ "версіі іх пакет xserver стае неўсталяваным. Такую праблему цяжка "
+#~ "адсачыць, пасля абнаўлення праверце, што пакет xserver-xorg усталяваўся. "
+#~ "Калі ён неўсталяваны, але вам патрэбны, раім усталяваць пакет xorg, каб "
+#~ "атрымаць цалкам прыдатны да выкарыстання X-сервер."
-#. Type: note
-#. Description
-#: ../x11-common.templates:7001
Reply to: