Merge lp:~logan/ubuntu/raring/util-vserver/debian-merge into lp:ubuntu/raring/util-vserver

[Logan Rosen]

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-17 22:35:32 +0000
+++ debian/changelog	2012-10-27 21:36:20 +0000
@@ -1,3 +1,24 @@
+util-vserver (0.30.216-pre2864-2.1ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - add 50fix_python26.patch to fix detection of python directories
+      in the configure-script.
+    - Build-depend on python-all-dev
+    - Renamed 50fix_python26.dpatch to 50fix_python26.patch and modified it
+      for get it working with quilt
+
+ -- Logan Rosen <[e-mail]>  Sat, 27 Oct 2012 17:25:57 -0400
+
+util-vserver (0.30.216-pre2864-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix pending l10n issues. Debconf translations:
+    - Danish (Joe Hansen).  Closes: #630368
+    - Indonesian (Mahyuddin Susanto).  Closes: #658470
+    - Polish (Michał Kułach).  Closes: #658506
+
+ -- Christian Perrier <[e-mail]>  Sun, 12 Feb 2012 08:11:44 +0100
+
 util-vserver (0.30.216-pre2864-2ubuntu1) maverick; urgency=low
 
   * Merge from debian unstable (LP: #606764), remaining changes:

=== modified file 'debian/po/cs.po'
--- debian/po/cs.po	2006-11-22 21:32:22 +0000
+++ debian/po/cs.po	2012-10-27 21:36:20 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2006-11-20 21:46+0100\n"
 "Last-Translator: Miroslav Kure <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== added file 'debian/po/da.po'
--- debian/po/da.po	1970-01-01 00:00:00 +0000
+++ debian/po/da.po	2012-10-27 21:36:20 +0000
@@ -0,0 +1,57 @@
+# Danish translation util-vserver.
+# Copyright (C) 2011 util-vserver & nedenstående oversætttere.
+# This file is distributed under the same license as the util-vserver package.
+# Joe Hansen <[e-mail]>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-vserver\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2006-10-07 13:59-0600\n"
+"PO-Revision-Date: 2011-06-13 14:44+0200\n"
+"Last-Translator: Joe Hansen <[e-mail]>\n"
+"Language-Team: Danish <[e-mail]> \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../util-vserver.templates:1001
+msgid "Remove local Linux-Vserver guest configurations?"
+msgstr "Fjern lokal Linux-Vservers gæstekonfigurationer?"
+
+#. Type: boolean
+#. Description
+#: ../util-vserver.templates:1001
+msgid ""
+"Choose this option if you want the /etc/vservers directory, containing  your "
+"local Linux-Vserver guest configurations, to be removed. If you wish to "
+"keep  these configurations, do not choose this option."
+msgstr ""
+"Vælg denne indstilling hvis du ønsker, at mappen /etc/vservers (indeholdende "
+"din lokale Linux-Vservers gæstekonfigurationer) skal fjernes. Hvis du ønsker "
+"at beholde disse konfigurationer, skal du ikke vælge denne indstilling."
+
+#. Type: boolean
+#. Description
+#: ../util-vserver.templates:2001
+msgid "Stop running Linux-Vserver guests?"
+msgstr "Stop kørende Linux-Vservers gæster?"
+
+#. Type: boolean
+#. Description
+#: ../util-vserver.templates:2001
+msgid ""
+"Running Vserver guests were detected! If you remove util-vserver without  "
+"stopping these vservers they will continue to run and you will not be able  "
+"to manage them from the host, unless you reinstall util-vserver.  Choose  "
+"this option to stop any running Vserver guests now, otherwise they will  "
+"continue to run."
+msgstr ""
+"Kørende Vserver-gæster blev fundet! Hvis du fjerner util-vserver uden at "
+"stoppe disse vservere, så vil de fortsætte med at køre, og du vil ikke kunne "
+"håndtere dem fra værten; med mindre du geninstallerer util-vserver. Vælg "
+"denne indstilling for at stoppe alle kørende Vserver-gæster nu, ellers vil "
+"de fortsætte med at køre."

=== modified file 'debian/po/de.po'
--- debian/po/de.po	2006-11-22 21:32:22 +0000
+++ debian/po/de.po	2012-10-27 21:36:20 +0000
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2006-11-05 11:07+0100\n"
 "Last-Translator: Helge Kreutzmann <[e-mail]>\n"
 "Language-Team: de <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +51,8 @@
 "continue to run."
 msgstr ""
 "Es wurden laufende Vserver-Gäste erkannt! Falls Sie util-vserver entfernen, "
-"ohne diese Vserver zu beenden, werden diese weiterlaufen und Sie werden nicht "
-"in der Lage sein, sie von diesem Rechner aus zu verwalten, es sei den, Sie "
-"installieren util-vserver erneut. Wählen Sie diese Option, um alle laufenden "
-"Vserver-Gäste jetzt zu beenden, andernfalls werden sie weiterlaufen."
+"ohne diese Vserver zu beenden, werden diese weiterlaufen und Sie werden "
+"nicht in der Lage sein, sie von diesem Rechner aus zu verwalten, es sei den, "
+"Sie installieren util-vserver erneut. Wählen Sie diese Option, um alle "
+"laufenden Vserver-Gäste jetzt zu beenden, andernfalls werden sie "
+"weiterlaufen."

=== modified file 'debian/po/es.po'
--- debian/po/es.po	2006-12-09 12:28:20 +0000
+++ debian/po/es.po	2012-10-27 21:36:20 +0000
@@ -21,8 +21,8 @@
 # Si tiene dudas o consultas sobre esta traducción consulte con el ltimo
 # traductor (campo Last-Translator) y ponga en copia a la lista de
 # traducción de Debian al español (<[e-mail]>)
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: util-vserver 0.30.212-1\n"
@@ -31,6 +31,7 @@
 "PO-Revision-Date: 2007-03-16 14:48+0100\n"
 "Last-Translator: Steve Lord Flaubert <[e-mail]>\n"
 "Language-Team: Debian Spanish <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/eu.po'
--- debian/po/eu.po	2009-11-05 16:00:30 +0000
+++ debian/po/eu.po	2012-10-27 21:36:20 +0000
@@ -11,10 +11,10 @@
 "PO-Revision-Date: 2009-10-29 16:24+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <[e-mail]>\n"
 "Language-Team: Basque <[e-mail]>\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 

=== modified file 'debian/po/fi.po'
--- debian/po/fi.po	2009-11-05 16:00:30 +0000
+++ debian/po/fi.po	2012-10-27 21:36:20 +0000
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2009-11-01 21:00+0200\n"
 "Last-Translator: Esko Arajärvi <[e-mail]>\n"
 "Language-Team: Finnish <[e-mail]>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/fr.po'
--- debian/po/fr.po	2006-11-22 21:32:22 +0000
+++ debian/po/fr.po	2012-10-27 21:36:20 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2006-04-10 12:19+0200\n"
 "Last-Translator: Florentin Duneau <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"

=== added file 'debian/po/id.po'
--- debian/po/id.po	1970-01-01 00:00:00 +0000
+++ debian/po/id.po	2012-10-27 21:36:20 +0000
@@ -0,0 +1,59 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-vserver 0.30.216-pre2864-2\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2006-10-07 13:59-0600\n"
+"PO-Revision-Date: 2012-02-03 17:50+0700\n"
+"Last-Translator: Mahyuddin Susanto <[e-mail]>\n"
+"Language-Team: Debian Indonesia Translators <debian-l10n-indonesian@lists."
+"debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Indonesian\n"
+
+#. Type: boolean
+#. Description
+#: ../util-vserver.templates:1001
+msgid "Remove local Linux-Vserver guest configurations?"
+msgstr "Buang pengaturan lokal guest Linux-Vserver?"
+
+#. Type: boolean
+#. Description
+#: ../util-vserver.templates:1001
+msgid ""
+"Choose this option if you want the /etc/vservers directory, containing  your "
+"local Linux-Vserver guest configurations, to be removed. If you wish to "
+"keep  these configurations, do not choose this option."
+msgstr ""
+"Pilih opsi ini jika anda ingin direktory /etc/vservers, yang mengandung "
+"pengaturan lokal guest Linux-Vserver, akan dibuang. Jika anda ingin "
+"direktori ini tidak dibuang, jangan pilih opsi ini."
+
+#. Type: boolean
+#. Description
+#: ../util-vserver.templates:2001
+msgid "Stop running Linux-Vserver guests?"
+msgstr "Hentikan guests Linux-Vserver yang berjalan?"
+
+#. Type: boolean
+#. Description
+#: ../util-vserver.templates:2001
+msgid ""
+"Running Vserver guests were detected! If you remove util-vserver without  "
+"stopping these vservers they will continue to run and you will not be able  "
+"to manage them from the host, unless you reinstall util-vserver.  Choose  "
+"this option to stop any running Vserver guests now, otherwise they will  "
+"continue to run."
+msgstr ""
+"Terdeteksi guests Vserver yang berjalan! Jika anda membuang util-server "
+"tanpa menghentikan vservers ini maka akan tetap berjalan dan anda tidak akan "
+"bisa mengaturnya dari host, kecuali anda memasang ulang util-server. Pilih "
+"opsi ini untuk menghentikan apapun guests Vserver yang berjalan, jika tidak "
+"mereka akan tetap berjalan."

=== modified file 'debian/po/it.po'
--- debian/po/it.po	2009-11-05 16:00:30 +0000
+++ debian/po/it.po	2012-10-27 21:36:20 +0000
@@ -2,7 +2,7 @@
 # COPYRIGHT (C) 2009 THE UTIL-VSERVER'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the util-vserver package.
 # Luca Monducci <[e-mail]>, 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: util-vserver 0.30.216~r2842\n"
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2009-10-17 15:01+0200\n"
 "Last-Translator: Luca Monducci <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/ja.po'
--- debian/po/ja.po	2009-11-05 16:00:30 +0000
+++ debian/po/ja.po	2012-10-27 21:36:20 +0000
@@ -1,7 +1,7 @@
 # Copyright (C) 2006-2009 Micah Anderson <[e-mail]>
 # This file is distributed under the same license as the util-vserver package.
 # Hideki Yamane (Debian-JP) <[e-mail]>, 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: util-vserver 0.30.216~r2772-6\n"
@@ -10,6 +10,7 @@
 "PO-Revision-Date: 2009-01-06 06:26+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/nl.po'
--- debian/po/nl.po	2006-12-09 12:28:20 +0000
+++ debian/po/nl.po	2012-10-27 21:36:20 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2007-03-07 21:01+0100\n"
 "Last-Translator: Bart Cornelis <[e-mail]>\n"
 "Language-Team: debian-l10n-dutch <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +26,14 @@
 #. Type: boolean
 #. Description
 #: ../util-vserver.templates:1001
-msgid "Choose this option if you want the /etc/vservers directory, containing  your local Linux-Vserver guest configurations, to be removed. If you wish to keep  these configurations, do not choose this option."
-msgstr "Kies deze optie als u wilt dat de map /etc/vservers (die uw lokale Linux-Vserver gastconfiguraties bevat) verwijderd wordt. Als u deze wilt behouden sla deze optie dan af."
+msgid ""
+"Choose this option if you want the /etc/vservers directory, containing  your "
+"local Linux-Vserver guest configurations, to be removed. If you wish to "
+"keep  these configurations, do not choose this option."
+msgstr ""
+"Kies deze optie als u wilt dat de map /etc/vservers (die uw lokale Linux-"
+"Vserver gastconfiguraties bevat) verwijderd wordt. Als u deze wilt behouden "
+"sla deze optie dan af."
 
 #. Type: boolean
 #. Description
@@ -37,6 +44,15 @@
 #. Type: boolean
 #. Description
 #: ../util-vserver.templates:2001
-msgid "Running Vserver guests were detected! If you remove util-vserver without  stopping these vservers they will continue to run and you will not be able  to manage them from the host, unless you reinstall util-vserver.  Choose  this option to stop any running Vserver guests now, otherwise they will  continue to run."
-msgstr "Er zijn draaiende Vserver-gasten gedetecteerd! Als u util-vserver verwijdert zonder deze vservers te stoppen, blijven deze draaien maar bent u niet meer in staat om ze vanaf deze computer te beheren (tenzij u util-vserver herinstalleert). Kies deze optie om draaiende Vserver-gasten nu te stoppen, anders blijven ze dus draaien."
-
+msgid ""
+"Running Vserver guests were detected! If you remove util-vserver without  "
+"stopping these vservers they will continue to run and you will not be able  "
+"to manage them from the host, unless you reinstall util-vserver.  Choose  "
+"this option to stop any running Vserver guests now, otherwise they will  "
+"continue to run."
+msgstr ""
+"Er zijn draaiende Vserver-gasten gedetecteerd! Als u util-vserver verwijdert "
+"zonder deze vservers te stoppen, blijven deze draaien maar bent u niet meer "
+"in staat om ze vanaf deze computer te beheren (tenzij u util-vserver "
+"herinstalleert). Kies deze optie om draaiende Vserver-gasten nu te stoppen, "
+"anders blijven ze dus draaien."

=== added file 'debian/po/pl.po'
--- debian/po/pl.po	1970-01-01 00:00:00 +0000
+++ debian/po/pl.po	2012-10-27 21:36:20 +0000
@@ -0,0 +1,60 @@
+# Translation of util-vserver debconf templates to Polish.
+# Copyright (C) 2006
+# This file is distributed under the same license as the util-vserver package.
+#
+# Michał Kułach <[e-mail]>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2006-10-07 13:59-0600\n"
+"PO-Revision-Date: 2012-02-03 16:39+0100\n"
+"Last-Translator: Michał Kułach <[e-mail]>\n"
+"Language-Team: Polish <[e-mail]>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+#. Type: boolean
+#. Description
+#: ../util-vserver.templates:1001
+msgid "Remove local Linux-Vserver guest configurations?"
+msgstr "Usunąć lokalną konfigurację gościa Linux-Vserver?"
+
+#. Type: boolean
+#. Description
+#: ../util-vserver.templates:1001
+msgid ""
+"Choose this option if you want the /etc/vservers directory, containing  your "
+"local Linux-Vserver guest configurations, to be removed. If you wish to "
+"keep  these configurations, do not choose this option."
+msgstr ""
+"Proszę wybrać tę opcję, aby usunąć katalog /etc/vservers zawierający lokalną "
+"konfigurację gościa Linux-Vserver. Aby zachować konfigurację, proszę wybrać "
+"\"nie\"."
+
+#. Type: boolean
+#. Description
+#: ../util-vserver.templates:2001
+msgid "Stop running Linux-Vserver guests?"
+msgstr "Zatrzymać gości Linux-Vserver?"
+
+#. Type: boolean
+#. Description
+#: ../util-vserver.templates:2001
+msgid ""
+"Running Vserver guests were detected! If you remove util-vserver without  "
+"stopping these vservers they will continue to run and you will not be able  "
+"to manage them from the host, unless you reinstall util-vserver.  Choose  "
+"this option to stop any running Vserver guests now, otherwise they will  "
+"continue to run."
+msgstr ""
+"Wykryto działających gości Vserver! Jeśli util-vserver zostanie usunięte bez "
+"zatrzymania vserverów, będą one nadal działać, a zarządzanie nimi z tego "
+"komputera będzie niemożliwe, aż do czasu ponownej instalacji util-vserver. "
+"Proszę wybrać \"tak\", aby zatrzymać wszystkich uruchomionych gości Vserver, "
+"w przeciwnym razie pozostanÄ… uruchomieni."

=== modified file 'debian/po/pt.po'
--- debian/po/pt.po	2006-12-09 12:28:20 +0000
+++ debian/po/pt.po	2012-10-27 21:36:20 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2007-04-21 11:51+0100\n"
 "Last-Translator: Miguel Figueiredo <[e-mail]>\n"
 "Language-Team: Portuguese <[e-mail]>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,8 +51,8 @@
 "this option to stop any running Vserver guests now, otherwise they will  "
 "continue to run."
 msgstr ""
-"Foram detectados clientes Vserver em execução! Se remover o util-vserver "
-"sem parar estes vservers estes irão continuar a correr e você não poderá "
-"geri-los a partir do 'anfitrião', a menos que reinstale o util-vserver.  "
-"Escolha esta opção para parar agora quaisquer clientes Vserver, caso "
-"contrário irão continuar a correr."
+"Foram detectados clientes Vserver em execução! Se remover o util-vserver sem "
+"parar estes vservers estes irão continuar a correr e você não poderá geri-"
+"los a partir do 'anfitrião', a menos que reinstale o util-vserver.  Escolha "
+"esta opção para parar agora quaisquer clientes Vserver, caso contrário irão "
+"continuar a correr."

=== modified file 'debian/po/ru.po'
--- debian/po/ru.po	2009-11-05 16:00:30 +0000
+++ debian/po/ru.po	2012-10-27 21:36:20 +0000
@@ -11,12 +11,13 @@
 "PO-Revision-Date: 2009-07-11 14:36+0400\n"
 "Last-Translator: Yuri Kozlov <[e-mail]>\n"
 "Language-Team: Russian <[e-mail]>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: boolean
 #. Description

=== modified file 'debian/po/sv.po'
--- debian/po/sv.po	2008-11-28 11:13:39 +0000
+++ debian/po/sv.po	2012-10-27 21:36:20 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2008-10-30 20:24+0100\n"
 "Last-Translator: Martin Bagge <[e-mail]>\n"
 "Language-Team: swedish <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"