xorg: Changes to 'ubuntu'
debian/changelog | 11 +++++++++++
debian/control | 2 +-
debian/po/ar.po | 20 ++++++++++++++++----
debian/po/bg.po | 20 ++++++++++++++++----
debian/po/bs.po | 20 ++++++++++++++++----
debian/po/ca.po | 20 ++++++++++++++++----
debian/po/cs.po | 20 ++++++++++++++++----
debian/po/da.po | 20 ++++++++++++++++----
debian/po/de.po | 20 ++++++++++++++++----
debian/po/dz.po | 20 ++++++++++++++++----
debian/po/el.po | 20 ++++++++++++++++----
debian/po/es.po | 20 ++++++++++++++++----
debian/po/eu.po | 20 ++++++++++++++++----
debian/po/fi.po | 20 ++++++++++++++++----
debian/po/fr.po | 20 ++++++++++++++++----
debian/po/gl.po | 20 ++++++++++++++++----
debian/po/he.po | 20 ++++++++++++++++----
debian/po/hr.po | 20 ++++++++++++++++----
debian/po/hu.po | 20 ++++++++++++++++----
debian/po/it.po | 20 ++++++++++++++++----
debian/po/ja.po | 20 ++++++++++++++++----
debian/po/km.po | 20 ++++++++++++++++----
debian/po/ko.po | 20 ++++++++++++++++----
debian/po/lt.po | 20 ++++++++++++++++----
debian/po/ml.po | 20 ++++++++++++++++----
debian/po/mr.po | 20 ++++++++++++++++----
debian/po/nb.po | 20 ++++++++++++++++----
debian/po/ne.po | 20 ++++++++++++++++----
debian/po/nl.po | 20 ++++++++++++++++----
debian/po/nn.po | 20 ++++++++++++++++----
debian/po/pl.po | 20 ++++++++++++++++----
debian/po/pt.po | 20 ++++++++++++++++----
debian/po/pt_BR.po | 20 ++++++++++++++++----
debian/po/ro.po | 20 ++++++++++++++++----
debian/po/ru.po | 20 ++++++++++++++++----
debian/po/sk.po | 20 ++++++++++++++++----
debian/po/sq.po | 20 ++++++++++++++++----
debian/po/sv.po | 20 ++++++++++++++++----
debian/po/ta.po | 20 ++++++++++++++++----
debian/po/templates.pot | 20 ++++++++++++++++----
debian/po/th.po | 20 ++++++++++++++++----
debian/po/tr.po | 20 ++++++++++++++++----
debian/po/vi.po | 20 ++++++++++++++++----
debian/po/wo.po | 20 ++++++++++++++++----
debian/po/zh_CN.po | 20 ++++++++++++++++----
debian/po/zh_TW.po | 20 ++++++++++++++++----
debian/x11-common.preinst.in | 12 +++++++++---
debian/x11-common.templates | 13 +++++++++++++
48 files changed, 738 insertions(+), 180 deletions(-)
New commits:
commit 4f3c77ff2cf3312602d0b3d0197fc0c8679bc50d
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Wed Apr 16 01:07:42 2008 +0300
control: Add xqbiff (<= 0.75-4) to the list of x11-common Conflicts.
and prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index bfb79c6..bb732e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-xorg (1:7.3+10ubuntu10) UNRELEASED; urgency=low
+xorg (1:7.3+10ubuntu10) hardy; urgency=low
[ Michael Vogt ]
* do not fail if /usr/X11R6/bin is not empty but move it
away instead and tell the user about it (LP: #217724)
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Wed, 16 Apr 2008 00:54:56 +0300
+ [ Timo Aaltonen ]
+ * control: Add xqbiff (<= 0.75-4) to the list of x11-common Conflicts.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Wed, 16 Apr 2008 01:04:54 +0300
xorg (1:7.3+10ubuntu9) hardy; urgency=low
diff --git a/debian/control b/debian/control
index a194654..07fbd8b 100644
--- a/debian/control
+++ b/debian/control
@@ -64,7 +64,7 @@ Conflicts: xfree86-common, xorg-common, xserver-common, x-common,
opera (<< 9.10-20060616), hamsoft (<< 0.2.3-1), phototk, tkworld,
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)
+ xpostitplus, xisp, vide (<= 1.21-3), xqbiff (<= 0.75-4)
Replaces: xfree86-common, xorg-common, xserver-common, x-common, xinit (<= 1.0.2-0ubuntu3), xrgb (<= 1:1.0.0-0ubuntu2)
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
commit 8dc44174e6f4673562dc9dae926a1afbb814f5ed
Author: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed Apr 16 01:03:25 2008 +0300
Do not fail if /usr/X11R6/bin is not empty
move it away instead and tell the user about it (LP: #217724)
diff --git a/debian/changelog b/debian/changelog
index c1cc6df..bfb79c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.3+10ubuntu10) UNRELEASED; urgency=low
+
+ [ Michael Vogt ]
+ * do not fail if /usr/X11R6/bin is not empty but move it
+ away instead and tell the user about it (LP: #217724)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Wed, 16 Apr 2008 00:54:56 +0300
+
xorg (1:7.3+10ubuntu9) hardy; urgency=low
* control: Add an epoch to the "x11-common Replaces xrgb" version.
diff --git a/debian/po/ar.po b/debian/po/ar.po
index a3d0e48..81b17cc 100644
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: ar\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\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"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -605,13 +605,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "لا يمكن إزالة الدليل /usr/X11R6/bin"
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -636,6 +640,14 @@ 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 "تريد محاولة التعرف الآلي على عتاد الفيديو؟"
diff --git a/debian/po/bg.po b/debian/po/bg.po
index ac0e4d6..cbaddc9 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -25,8 +25,8 @@
msgid ""
msgstr ""
"Project-Id-Version: xserver-xorg_debian_po_bg\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\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 14:09+0300\n"
"Last-Translator: Damyan Ivanov <dam@modsoftsys.com>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -640,13 +640,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "Директорията „/usr/X11R6/bin“ не може да бъде премахната"
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -671,6 +675,14 @@ 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 "Автоматично откриване на видео-картата?"
diff --git a/debian/po/bs.po b/debian/po/bs.po
index d62e664..bb1a853 100644
--- a/debian/po/bs.po
+++ b/debian/po/bs.po
@@ -14,8 +14,8 @@
msgid ""
msgstr ""
"Project-Id-Version: xorg\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\n"
+"Report-Msgid-Bugs-To: Source: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-15 17:12+0200\n"
"PO-Revision-Date: 2006-11-01 01:17+0100\n"
"Last-Translator: Safir Secerovic <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -624,13 +624,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "Ne mogu ukloniti /usr/X11R6/bin direktorij"
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -657,6 +661,14 @@ msgstr ""
"Molim ponovo pokrenite postupak nadogradnje (upgrade) nakon što očistite "
"direktorij."
+#. 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 "Pokušati automatski pronaći video hardware?"
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 00d6047..b7686b1 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -25,8 +25,8 @@
msgid ""
msgstr ""
"Project-Id-Version: xorg 1:7.1.0-2\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\n"
+"Report-Msgid-Bugs-To: Source: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-15 17:12+0200\n"
"PO-Revision-Date: 2006-10-10 00:29+0200\n"
"Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -644,13 +644,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "No s’ha pogut eliminar el directori «/usr/X11R6/bin»."
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -677,6 +681,14 @@ msgstr ""
"Per favor, torneu a executar el procediment d’actualització una volta hàgeu "
"netejat el directori."
+#. 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 "Voleu provar de detectar el maquinari de vídeo?"
diff --git a/debian/po/cs.po b/debian/po/cs.po
index b95bdd3..951230c 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -25,8 +25,8 @@
msgid ""
msgstr ""
"Project-Id-Version: xorg\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\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-11 17:09+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -623,13 +623,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "Nelze odstranit adresář /usr/X11R6/bin"
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -654,6 +658,14 @@ msgstr ""
"Instalace tohoto balíku nyní skončí s chybou, abyste mohli provést potřebný "
"zásah. Po vyčištění adresáře prosím znovu spusťte aktualizační proceduru."
+#. 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 "Zkusit rozpoznat grafický hardware?"
diff --git a/debian/po/da.po b/debian/po/da.po
index 2c9508f..4d7e0b4 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -38,8 +38,8 @@
msgid ""
msgstr ""
"Project-Id-Version: xfree86_4.3.0-3_da\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\n"
+"Report-Msgid-Bugs-To: Source: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-15 17:12+0200\n"
"PO-Revision-Date: 2006-07-04 13:46+0200\n"
"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
"Language-Team: Danish\n"
@@ -647,13 +647,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "Kan ikke fjerne mappen /usr/X11R6/bin"
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -678,6 +682,14 @@ msgstr ""
"Denne pakkeinstallation vil nu fejle og afslutte, s�u kan g�ette. K� "opgraderingsproceduren igen, n�du har t�appen."
+#. 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 "Fors� finde grafikkort automatisk?"
diff --git a/debian/po/de.po b/debian/po/de.po
index f85a03d..5d3f5d4 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -34,8 +34,8 @@
msgid ""
msgstr ""
"Project-Id-Version: xorg-x11_6.8.2.dfsg.1-2_de\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\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-21 01:07+0200\n"
"Last-Translator: Jens Seidel <jensseidel@users.sf.net>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -653,14 +653,18 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "Kann das Verzeichnis /usr/X11R6/bin nicht entfernen"
# FIXME: Check first sentence
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -688,6 +692,14 @@ msgstr ""
"tun können. Bitte starten Sie die Aktualisierung neu, nachdem Sie das "
"Verzeichnis geleert haben."
+#. 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 "Versuchen, die Grafikkarte automatisch zu erkennen?"
diff --git a/debian/po/dz.po b/debian/po/dz.po
index 68659c6..d8bbde4 100644
--- a/debian/po/dz.po
+++ b/debian/po/dz.po
@@ -14,8 +14,8 @@
msgid ""
msgstr ""
"Project-Id-Version: xorg.pot\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\n"
+"Report-Msgid-Bugs-To: Source: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-15 17:12+0200\n"
"PO-Revision-Date: 2006-09-17 22:58+0530\n"
"Last-Translator: Jurmey Rabgay <jur_gay@yahoo.com>\n"
"Language-Team: dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -622,13 +622,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr " /usr/X11R6/bin སྣོད་ཐོ་འདི་རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -653,6 +657,14 @@ 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 "ཝི་ཌིའོ་སྲ་ཆས་ རང་བཞིན་སྐྱོན་འཛིན་གྱི་དོན་ལུ་དཔའ་བཅམས་ནི་ཨིན་ན་?"
diff --git a/debian/po/el.po b/debian/po/el.po
index 737de4f..7741f6b 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -27,8 +27,8 @@
msgid ""
msgstr ""
"Project-Id-Version: xserver-xorg_po_el\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\n"
+"Report-Msgid-Bugs-To: Source: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-15 17:12+0200\n"
"PO-Revision-Date: 2006-10-25 14:49+0300\n"
"Last-Translator: QUAD-nrg.net <yodesy@quad-nrg.net>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -665,13 +665,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "Δεν μπορώ να αφαιρέσω τον κατάλογο /usr/X11R6/bin"
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -699,6 +703,14 @@ 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 "Να γίνει προσπάθεια αυτόματης ανίχνευσης του υλικού οθόνης;"
diff --git a/debian/po/es.po b/debian/po/es.po
index 4d11141..831846b 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -27,8 +27,8 @@
msgid ""
msgstr ""
"Project-Id-Version: xorg 7.0.24\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\n"
+"Report-Msgid-Bugs-To: Source: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-15 17:12+0200\n"
"PO-Revision-Date: 2006-09-10 01:21+0200\n"
"Last-Translator: David Martinez Moreno <ender@debian.org>\n"
"Language-Team: ES <debian-l10n-spanish@lists.debian.org>\n"
@@ -656,13 +656,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "No se pudo eliminar el directorio /usr/X11R6/bin"
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -689,6 +693,14 @@ msgstr ""
"hacerlo. Por favor, ejecute de nuevo su procedimiento de actualizaci�na "
"vez que haya vaciado el directorio."
+#. 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 "�Intentar autodetectar el hardware de v�o?"
diff --git a/debian/po/eu.po b/debian/po/eu.po
index d38b68d..156af01 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -26,8 +26,8 @@
msgid ""
msgstr ""
"Project-Id-Version: xorg-eu\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\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-07 22:06+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: librezale <librezale@librezale.org>\n"
@@ -637,13 +637,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "Ezin da/usr/X11R6/bin direktorioa ezabatu"
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -669,6 +673,14 @@ msgstr ""
"Pakete instalazioa orain huts egin eta irten egingo da. Mesedez eguneraketa "
"prozedura berriz abiarazi behin direktorio hori hustu duzunean."
+#. 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 "Bideo hardwarea atzematen saiatu?"
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 5d99964..099b6b3 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian Installer xserver-xorg\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\n"
+"Report-Msgid-Bugs-To: Source: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-15 17:12+0200\n"
"PO-Revision-Date: 2006-09-27 11:15+0300\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -613,13 +613,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "Hakemistoa /usr/X11R6/bin ei voi poistaa"
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -644,6 +648,14 @@ msgstr ""
"T�n paketin asennus p�tyy nyt virheeseen, jotta tuo voidaan tehd�"
"K�nist��itys uudestaan, kun hakemisto on siivottu."
+#. 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 "Yritet�k�nnistaa n�t�tteisto automaattisesti?"
diff --git a/debian/po/fr.po b/debian/po/fr.po
index cdbb635..431a38b 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -30,8 +30,8 @@
msgid ""
msgstr ""
"Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\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 09:25+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -661,13 +661,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "Impossible de supprimer le r�rtoire /usr/X11R6/bin"
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -694,6 +698,14 @@ msgstr ""
"cette op�tion. Veuillez relancer la proc�re de mise �our apr�avoir "
"nettoy�e r�rtoire."
+#. 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 "Faut-il essayer de d�cter automatiquement votre carte vid�?"
diff --git a/debian/po/gl.po b/debian/po/gl.po
index e3f8f9c..5c079dd 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -13,8 +13,8 @@
msgid ""
msgstr ""
"Project-Id-Version: xorg\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\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-07 20:16+0200\n"
"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -627,13 +627,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "Non se pode eliminar o directorio /usr/X11R6/bin"
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -659,6 +663,14 @@ msgstr ""
"Agora hase saír da instalación deste paquete para que o poida facer. Repita "
"o procedemento de actualización despois de limpar o directorio."
+#. 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 "¿Tentar autodetectar o hardware de vídeo?"
diff --git a/debian/po/he.po b/debian/po/he.po
index 213da41..90b9e5a 100644
--- a/debian/po/he.po
+++ b/debian/po/he.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: xorg_po_he\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\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-10-19 13:58+0200\n"
"Last-Translator: Lior Kaplan <kaplan@debian.org>\n"
"Language-Team: Hebrew <debian-hebrew-common@lists.alioth.debian.org>\n"
@@ -597,13 +597,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "לא יכול להסיר את הספרייה /usr/X11R6/bin"
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -627,6 +631,14 @@ 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 "האם לנסות לבצע אבחון אוטומטי של חומרת הווידאו?"
diff --git a/debian/po/hr.po b/debian/po/hr.po
index 5cc7ebb..59db3c5 100644
--- a/debian/po/hr.po
+++ b/debian/po/hr.po
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Debian installer HR\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\n"
+"Report-Msgid-Bugs-To: Source: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-15 17:12+0200\n"
"PO-Revision-Date: 2006-10-24 22:15+0200\n"
"Last-Translator: Josip Rodin <joy+ditrans@linux.hr>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -605,13 +605,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "Nemogu�obrisati direktorij /usr/X11R6/bin"
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -638,6 +642,14 @@ msgstr ""
"napraviti. Molim ponovo pokrenite proceduru nadogradnje nakon �to ste "
"o�tili direktorij."
+#. 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 "Poku�ati automatsko prepoznavanje grafi�g sklopovlja?"
diff --git a/debian/po/hu.po b/debian/po/hu.po
index fd522cb..b107908 100644
--- a/debian/po/hu.po
+++ b/debian/po/hu.po
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\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-20 08:17+0100\n"
"Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
"Language-Team: hu\n"
@@ -603,13 +603,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "A /usr/X11R6/bin könyvtár nem törölhető"
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
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 "
@@ -633,6 +637,14 @@ msgstr ""
"E csomag telepítése most leáll, így megteheted ezt. A könyvtár törlése után "
"futtasd újra ezt a frissítést."
+#. 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 "Megpróbáljam felismerni a videó eszközt?"
diff --git a/debian/po/it.po b/debian/po/it.po
index bdfc910..ca95f52 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -29,8 +29,8 @@
msgid ""
msgstr ""
"Project-Id-Version: xorg-x11 6.8.2.dfsg.1-10\n"
-"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
-"POT-Creation-Date: 2008-01-05 19:04-0500\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-25 21:37+0200\n"
"Last-Translator: Stefano Canepa <sc@linux.it>\n"
"Language-Team: debian-l10n-italian <debian-l10n-italian@lists.debian.org>\n"
@@ -647,13 +647,17 @@ msgstr ""
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
msgid "Cannot remove /usr/X11R6/bin directory"
msgstr "Impossibile rimuovere la directory /usr/X11R6/bin"
#. Type: note
#. Description
-#: ../x11-common.templates:7001
+#. Type: note
+#. Description
+#: ../x11-common.templates:7001 ../x11-common.templates:8001
Reply to: