Merge lp:~ari-tczew/ubuntu/maverick/ilohamail/lp-596577 into lp:ubuntu/maverick/ilohamail

[Artur Rona]

[Daniel Holbach (dholbach)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2008-11-07 02:46:27 +0000
+++ debian/changelog	2010-06-20 14:46:24 +0000
@@ -1,8 +1,25 @@
-ilohamail (0.8.14-0rc3ubuntu4) jaunty; urgency=low
-
-  * Fakesync from Debian, there is no Ubuntu delta
-
- -- Michael Casadevall <[e-mail]>  Fri, 07 Nov 2008 02:46:27 -0500
+ilohamail (0.8.14-0rc3ubuntu5) maverick; urgency=low
+
+  * Resync on Debian, no remaining changes. Sync is not possible
+    due to wrong versioning in the past. (LP: #596577)
+
+ -- Artur Rona <[e-mail]>  Sun, 20 Jun 2010 16:31:41 +0200
+
+ilohamail (0.8.14-0rc3sid6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Make explicit reference to GPL v2 text in debian/copyright
+  * Bump debhelper compatibility to 7
+  * As a consequence, replace "dh_clean -k" by "dh_prep"
+  * Add ${misc:Depends} to binary package dependencies to properly cope
+    with dependencies triggerred by debhelper
+  * Split Choices in templates
+  * Fix pending l10n issues. Debconf translations:
+    - Spanish (Francisco Javier Cuadrado).  Closes: #510840
+    - Slovak (Ivan Masár).  Closes: #571101
+    - Italian (Vincenzo Campanella).  Closes: #571986
+
+ -- Christian Perrier <[e-mail]>  Thu, 04 Mar 2010 08:45:52 +0100
 
 ilohamail (0.8.14-0rc3sid6) unstable; urgency=low
 

=== modified file 'debian/compat'
--- debian/compat	2008-11-07 02:46:27 +0000
+++ debian/compat	2010-06-20 14:46:24 +0000
@@ -1,1 +1,1 @@
-4
+7

=== modified file 'debian/control'
--- debian/control	2008-11-07 02:46:27 +0000
+++ debian/control	2010-06-20 14:46:24 +0000
@@ -1,16 +1,16 @@
 Source: ilohamail
 Section: web
 Priority: optional
-Maintainer: Ubuntu MOTU Developers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Joerg Jaspert <[e-mail]>
 Uploaders: Radu Spineanu <[e-mail]>
 Build-Depends-Indep: po-debconf
-Build-Depends: debhelper (>> 4.2.0), dpatch
+Build-Depends: debhelper (>= 7), dpatch
 Standards-Version: 3.7.3
 
 Package: ilohamail
 Architecture: all
-Depends: apache | apache-ssl | apache-perl | httpd, php4 | libapache2-mod-php4 | php5 | libapache2-mod-php5, debconf (>= 1.3.8), postfix | mail-transport-agent, wwwconfig-common
+Depends: apache | apache-ssl | apache-perl | httpd, php4 | libapache2-mod-php4 | php5 | libapache2-mod-php5, ${misc:Depends}, postfix | mail-transport-agent, wwwconfig-common
 Recommends: php4-mysql | php5-mysql, mysql-client, gnupg, aspell
 Description: Light weight yet full featured multilingual web-based IMAP/POP3 client
  IlohaMail (pronounced: e-lo-ha-mail) is a light weight yet full featured

=== modified file 'debian/copyright'
--- debian/copyright	2008-11-07 02:46:27 +0000
+++ debian/copyright	2010-06-20 14:46:24 +0000
@@ -22,5 +22,5 @@
    MA 02110-1301, USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 

=== modified file 'debian/po/ca.po'
--- debian/po/ca.po	2008-11-07 02:46:27 +0000
+++ debian/po/ca.po	2010-06-20 14:46:24 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ilohamail_0.8.12-1_templates\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-04-28 10:27+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
 "PO-Revision-Date: 2004-02-28 19:46GMT\n"
 "Last-Translator: Aleix Badia i Bosch <[e-mail]>\n"
 "Language-Team: Debian L10n Catalan <[e-mail]>\n"
@@ -17,9 +17,26 @@
 #. Type: select
 #. Choices
 #: ../templates:1001
-#, fuzzy
-msgid "Apache, Apache-ssl, Apache2, Other"
-msgstr "apache, apache-ssl, apache-perl, un altre"
+msgid "Apache"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -66,6 +83,10 @@
 "webmail a través de la direcció http://your.host/IlohaMail/. Si us interessa "
 "una ubicació diferent (com podria ser /webmail), modifiqueu-ho."
 
+#, fuzzy
+#~ msgid "Apache, Apache-ssl, Apache2, Other"
+#~ msgstr "apache, apache-ssl, apache-perl, un altre"
+
 #~ msgid "What type of Web Server are you running?"
 #~ msgstr "Quin tipus de servidor web esteu utilitzant?"
 

=== modified file 'debian/po/cs.po'
--- debian/po/cs.po	2008-06-03 17:50:16 +0000
+++ debian/po/cs.po	2010-06-20 14:46:24 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ilohamail\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-04-28 10:27+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
 "PO-Revision-Date: 2008-05-08 18:02+0200\n"
 "Last-Translator: Miroslav Kure <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
@@ -18,8 +18,26 @@
 #. Type: select
 #. Choices
 #: ../templates:1001
-msgid "Apache, Apache-ssl, Apache2, Other"
-msgstr "Apache, Apache-ssl, Apache2, Jiný"
+msgid "Apache"
+msgstr "Apache"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr "Apache-ssl"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr "Apache2"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
+msgstr "Jiný"
 
 #. Type: select
 #. Description
@@ -37,10 +55,10 @@
 "IlohaMail properly.   If you do not wish this to happen, please choose the "
 "'Other' option."
 msgstr ""
-"Flyspray podporuje libovolný webový server, pod kterým běží PHP, avšak "
-"tento konfigurační program podporuje pouze Apache. Instalační program se "
-"postará (nebo se alespoň pokusí) o automatické nastavení Apache pro správný "
-"běh IlohaMail. Pokud tomu tak nechcete, zvolte možnost „Jiný“."
+"Flyspray podporuje libovolný webový server, pod kterým běží PHP, avšak tento "
+"konfigurační program podporuje pouze Apache. Instalační program se postará "
+"(nebo se alespoň pokusí) o automatické nastavení Apache pro správný běh "
+"IlohaMail. Pokud tomu tak nechcete, zvolte možnost „Jiný“."
 
 #. Type: string
 #. Description
@@ -57,7 +75,10 @@
 "reachable at http://your.host/IlohaMail/. If you want another location "
 "(like /webmail) enter it here."
 msgstr ""
-"Do konfigurace Apache byl přidán alias /IlohaMail, který ukazuje na "
-"úvodní stránku IlohaMailu. Vaše webová pošta je pak dostupná na adrese "
-"http://vas.pocitac/IlohaMail/. Chcete-li použít jiné umístění (např. "
-"/posta), zadejte je zde."
+"Do konfigurace Apache byl přidán alias /IlohaMail, který ukazuje na úvodní "
+"stránku IlohaMailu. Vaše webová pošta je pak dostupná na adrese http://vas."
+"pocitac/IlohaMail/. Chcete-li použít jiné umístění (např. /posta), zadejte "
+"je zde."
+
+#~ msgid "Apache, Apache-ssl, Apache2, Other"
+#~ msgstr "Apache, Apache-ssl, Apache2, Jiný"

=== modified file 'debian/po/de.po'
--- debian/po/de.po	2008-11-07 02:46:27 +0000
+++ debian/po/de.po	2010-06-20 14:46:24 +0000
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ilohamail\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-04-28 10:27+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
 "PO-Revision-Date: 2007-01-10 20:09+0100\n"
 "Last-Translator: Daniel Knabl <[e-mail]>\n"
 "Language-Team: German <[e-mail]>\n"
@@ -25,8 +25,26 @@
 #. Type: select
 #. Choices
 #: ../templates:1001
-msgid "Apache, Apache-ssl, Apache2, Other"
-msgstr "apache, apache-ssl, apache-perl, anderer"
+msgid "Apache"
+msgstr "apache"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr "apache-ssl"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr "apache-perl"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
+msgstr "anderer"
 
 #. Type: select
 #. Description
@@ -70,6 +88,9 @@
 "über http://ihr.host/IlohaMail/ erreichbar ist. Wenn sie einen anderen Ort "
 "(wie /webmail) wünschen, dann geben Sie das hier ein."
 
+#~ msgid "Apache, Apache-ssl, Apache2, Other"
+#~ msgstr "apache, apache-ssl, apache-perl, anderer"
+
 #~ msgid "What type of Web Server are you running?"
 #~ msgstr "Welchen Typ von Webserver verwenden Sie?"
 

=== modified file 'debian/po/es.po'
--- debian/po/es.po	2008-06-03 17:50:16 +0000
+++ debian/po/es.po	2010-06-20 14:46:24 +0000
@@ -1,70 +1,78 @@
 # ilohamail po-debconf translation to Spanish
-# Copyright (C) 2005 Software in the Public Interest
-# This file is distributed under the same license as the gnarwl package.
+# Copyright (C) 2005, 2007, 2008 Software in the Public Interest
+# This file is distributed under the same license as the ilohamail package.
 #
 # Changes:
-#  - Initial translation
-#         César Gómez Martín <[e-mail]>
-#
-# Revision:
-#      	 Rudy Godoy Guillén <[e-mail].>, 2007
-#
-#   Traductores, si no conoce el formato PO, merece la pena leer la
-#   documentación de gettext, especialmente las secciones dedicadas a este
-#   formato, por ejemplo ejecutando:
-#          info -n '(gettext)PO Files'
-#          info -n '(gettext)Header Entry'
-# Equipo de traducción al español, por favor, lean antes de traducir
+#   - Initial translation
+#       César Gómez Martín <[e-mail]>, 2005
+#
+#   - Updates
+#       Rudy Godoy Guillén <[e-mail]>, 2007
+#       Francisco Javier Cuadrado <[e-mail]>, 2008
+#
+# Traductores, si no conocen el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+#       info -n '(gettext)PO Files'
+#       info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor lean antes de traducir
 # los siguientes documentos:
 #
-#  - El proyecto de traducción de Debian al español
-#    http://www.debian.org/intl/spanish/
-#    especialmente las notas de traducción en
-#    http://www.debian.org/intl/spanish/notas
+#   - El proyecto de traducción de Debian al español
+#     http://www.debian.org/intl/spanish/
+#     especialmente las notas y normas de traducción en
+#     http://www.debian.org/intl/spanish/notas
 #
-#  - La guía de traducción de po's de debconf:
-#    /usr/share/doc/po-debconf/README-trans
-#    o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#   - La guía de traducción de po's de debconf:
+#     /usr/share/doc/po-debconf/README-trans
+#     o http://www.debian.org/intl/l10n/po-debconf/README-trans
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ilohamail 0.8.14-0rc3\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-04-28 10:27+0200\n"
-"PO-Revision-Date: 2007-05-13 13:58-0500\n"
-"Last-Translator: César Gómez Martín <[e-mail]>\n"
-"Language-Team: Debian l10n spanish <[e-mail]>\n"
+"Project-Id-Version: ilohamail 0.8.14-0rc3sid6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
+"PO-Revision-Date: 2008-12-26 12:58+0100\n"
+"Last-Translator: Francisco Javier Cuadrado <[e-mail]>\n"
+"Language-Team: Debian l10n Spanish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-Country: SPAIN\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-#, fuzzy
-#| msgid "apache, apache-ssl, apache-perl, Other"
-msgid "Apache, Apache-ssl, Apache2, Other"
-msgstr "apache, apache-ssl, apache-perl, otro"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache"
+msgstr "Apache"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr "Apache-ssl"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr "Apache2"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
+msgstr "Otro"
 
 #. Type: select
 #. Description
 #: ../templates:1002
 msgid "Webserver type:"
-msgstr ""
+msgstr "Tipo de servidor web:"
 
 #. Type: select
 #. Description
 #: ../templates:1002
-#, fuzzy
-#| msgid ""
-#| "By default IlohaMail supports anything that supports PHP4, but this "
-#| "process only supports Apache. This install process will manage the "
-#| "configuration (or attempt to) of the Apache specific portions necessary "
-#| "to run IlohaMail properly.  If you do not wish this to happen, please "
-#| "chose the Other option."
 msgid ""
 "By default IlohaMail supports any webserver that is PHP4 capable, but this "
 "process only supports Apache. This installation  will manage (or attempt to "
@@ -72,39 +80,34 @@
 "IlohaMail properly.   If you do not wish this to happen, please choose the "
 "'Other' option."
 msgstr ""
-"Por omisión, IlohaMail soporta cualquiera que soporte PHP4, pero este "
-"proceso sólo soporta Apache. Este proceso de instalación gestionará (o "
-"intentará) la configuración de las porciones específicas de Apache para "
-"ejecutar IlohaMail correctamente. Si no quiere que esto ocurra, por favor, "
-"escoja la opción «otro»."
+"De manera predeterminada, IlohaMail es compatible con cualquier servidor web "
+"que pueda usar PHP4, pero este proceso sólo permite usar Apache. Esta "
+"instalación administrará (o lo intentará) la configuración de las porciones "
+"específicas de Apache necesarias para ejecutar IlohaMail adecuadamente. Si "
+"no quiere que esto ocurra, por favor elija la opción «Otro»."
 
 #. Type: string
 #. Description
 #: ../templates:2001
-#, fuzzy
-#| msgid "Apache Alias for IlohaMail."
 msgid "Apache Alias for IlohaMail:"
-msgstr "Alias de Apache para IlohaMail"
+msgstr "Alias de Apache para IlohaMail:"
 
 #. Type: string
 #. Description
 #: ../templates:2001
-#, fuzzy
-#| msgid ""
-#| "I add an alias entry to the apache config pointing to the IlohaMail "
-#| "source. By default this is /IlohaMail, so that the webmail is reachable "
-#| "at http://your.host/IlohaMail/. Maybe another location (like /webmail) is "
-#| "wanted, then change it here."
 msgid ""
 "An alias entry is added to the Apache configuration pointing to the "
 "IlohaMail source. By default this is /IlohaMail, so that the webmail is "
 "reachable at http://your.host/IlohaMail/. If you want another location "
 "(like /webmail) enter it here."
 msgstr ""
-"Se añadirá una entrada de alias a la configuración de apache que apunta a la "
-"dirección de IlohaMail. Por omisión es /IlohaMail, por lo que podrá acceder "
-"al correo web desde http://su.maquina/IlohaMail/. Si quiere otro ubicación "
-"(como /webmail) puede cambiarla aquí."
+"Se añadirá una entrada de alias a la configuración de Apache que apunta a la "
+"dirección de IlohaMail. De manera predeterminada, es /IlohaMail, por lo que "
+"podrá acceder al correo web desde «http://su.maquina/IlohaMail/». Si quiere "
+"otro ubicación (como /webmail) puede introducirla aquí."
+
+#~ msgid "Apache, Apache-ssl, Apache2, Other"
+#~ msgstr "Apache, Apache-ssl, Apache2, Otro"
 
 #~ msgid "What type of Web Server are you running?"
 #~ msgstr "¿Qué clase de servidor web está ejecutando?"

=== modified file 'debian/po/eu.po'
--- debian/po/eu.po	2008-06-03 17:50:16 +0000
+++ debian/po/eu.po	2010-06-20 14:46:24 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ilohamail-eu\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-04-28 10:27+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
 "PO-Revision-Date: 2008-05-06 22:29+0200\n"
 "Last-Translator: Piarres Beobide <[e-mail]>\n"
 "Language-Team: Euskara <[e-mail]>\n"
@@ -19,8 +19,26 @@
 #. Type: select
 #. Choices
 #: ../templates:1001
-msgid "Apache, Apache-ssl, Apache2, Other"
-msgstr "Apache, Apache-ssl, Apache2, Beste bat"
+msgid "Apache"
+msgstr "Apache"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr "Apache-ssl"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr "Apache2"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
+msgstr "Beste bat"
 
 #. Type: select
 #. Description
@@ -63,3 +81,6 @@
 "jatorria lotuz. Lehenespen bezala hau /IlohaMail da, beraz zure webposta "
 "http://zure.ostalaria/IlohaMail / helbidean eskuratu ahal izango da. Beste "
 "kokaleku bat nahigo baduzu (/posta antzerakoa) hemen idatzi ezazu."
+
+#~ msgid "Apache, Apache-ssl, Apache2, Other"
+#~ msgstr "Apache, Apache-ssl, Apache2, Beste bat"

=== modified file 'debian/po/fi.po'
--- debian/po/fi.po	2008-06-03 17:50:16 +0000
+++ debian/po/fi.po	2010-06-20 14:46:24 +0000
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ilohamail\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-04-28 10:27+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
 "PO-Revision-Date: 2008-04-29 22:30+0200\n"
 "Last-Translator: Esko Arajärvi <[e-mail]>\n"
 "Language-Team: Finnish <[e-mail]>\n"
@@ -15,8 +15,26 @@
 #. Type: select
 #. Choices
 #: ../templates:1001
-msgid "Apache, Apache-ssl, Apache2, Other"
-msgstr "Apache, Apache-ssl, Apache2, Muu"
+msgid "Apache"
+msgstr "Apache"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr "Apache-ssl"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr "Apache2"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
+msgstr "Muu"
 
 #. Type: select
 #. Description
@@ -58,3 +76,6 @@
 "Oletuksena tämä on /IlohaMail, jolloin WWW-sähköposti on käytettävissä "
 "osoitteessa http://oma.palvelimesi/IlohaMail/. Jos käyttöön halutaan muu "
 "osoite (kuten /webmail), syötä se tähän."
+
+#~ msgid "Apache, Apache-ssl, Apache2, Other"
+#~ msgstr "Apache, Apache-ssl, Apache2, Muu"

=== modified file 'debian/po/fr.po'
--- debian/po/fr.po	2008-11-07 02:46:27 +0000
+++ debian/po/fr.po	2010-06-20 14:46:24 +0000
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-04-28 10:27+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
 "PO-Revision-Date: 2006-06-06 07:00+0400\n"
 "Last-Translator: Christian Perrier <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\n"
@@ -29,8 +29,26 @@
 #. Type: select
 #. Choices
 #: ../templates:1001
-msgid "Apache, Apache-ssl, Apache2, Other"
-msgstr "Apache, Apache-ssl, Apache2, Autre"
+msgid "Apache"
+msgstr "Apache"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr "Apache-ssl"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr "Apache2"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
+msgstr "Autre"
 
 #. Type: select
 #. Description
@@ -73,3 +91,6 @@
 "d'Apache. Par défaut, il s'agit de /IlohaMail ; ainsi le courrier peut être "
 "consulté via la Toile à http://votre.hôte/IlohaMail/. Si vous préférez un "
 "autre emplaccement, tel que « /webmail », vous pouvez changer ce réglage."
+
+#~ msgid "Apache, Apache-ssl, Apache2, Other"
+#~ msgstr "Apache, Apache-ssl, Apache2, Autre"

=== modified file 'debian/po/gl.po'
--- debian/po/gl.po	2008-06-03 17:50:16 +0000
+++ debian/po/gl.po	2010-06-20 14:46:24 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ilohamail\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-04-28 10:27+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
 "PO-Revision-Date: 2007-03-05 22:09+0100\n"
 "Last-Translator: Jacobo Tarrio <[e-mail]>\n"
 "Language-Team: Galician <[e-mail]>\n"
@@ -17,8 +17,26 @@
 #. Type: select
 #. Choices
 #: ../templates:1001
-msgid "Apache, Apache-ssl, Apache2, Other"
-msgstr "Apache, Apache-ssl, Apache2, Outro"
+msgid "Apache"
+msgstr "Apache"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr "Apache-ssl"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr "Apache2"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
+msgstr "Outro"
 
 #. Type: select
 #. Description
@@ -61,3 +79,6 @@
 "de IlohaMail. Por defecto, este é /IlohaMail, para poder acceder ao webmail "
 "en http://o.servidor/IlohaMail/. Se quere empregar outra ubicación (coma /"
 "webmail), introdúzaa aquí."
+
+#~ msgid "Apache, Apache-ssl, Apache2, Other"
+#~ msgstr "Apache, Apache-ssl, Apache2, Outro"

=== added file 'debian/po/it.po'
--- debian/po/it.po	1970-01-01 00:00:00 +0000
+++ debian/po/it.po	2010-06-20 14:46:24 +0000
@@ -0,0 +1,85 @@
+# ITALIAN TRANSLATION OF ILOHAMAIL'S PO-DEBCONF FILE.
+# COPYRIGHT (C) 2010 THE ILOHAMAIL'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the ilohamail package.
+# Vincenzo Campanella <[e-mail]>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ilohamail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
+"PO-Revision-Date: 2010-02-25 13:15+0100\n"
+"Last-Translator: Vincenzo Campanella <[e-mail]>\n"
+"Language-Team: Italian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache"
+msgstr "Apache"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr "Apache-ssl"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr "Apache2"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
+msgstr "Altro"
+
+#. Type: select
+#. Description
+#: ../templates:1002
+msgid "Webserver type:"
+msgstr "Tipo di server web:"
+
+#. Type: select
+#. Description
+#: ../templates:1002
+msgid ""
+"By default IlohaMail supports any webserver that is PHP4 capable, but this "
+"process only supports Apache. This installation  will manage (or attempt to "
+"manage)  the configuration of the Apache portions specific necessary to run "
+"IlohaMail properly.   If you do not wish this to happen, please choose the "
+"'Other' option."
+msgstr ""
+"IlohaMail supporta, in modo predefinito, qualsiasi server web compatibile "
+"con PHP4, ma questo processo supporta solo Apache. Questa installazione "
+"gestirà (o tenterà di gestire) la configurazione della porzione specifica di "
+"Apache necessaria per eseguire IlohaMail correttamente. Se non lo si "
+"desidera, scegliere l'opzione «Altro»."
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "Apache Alias for IlohaMail:"
+msgstr "Alias di Apache per IlohaMail:"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid ""
+"An alias entry is added to the Apache configuration pointing to the "
+"IlohaMail source. By default this is /IlohaMail, so that the webmail is "
+"reachable at http://your.host/IlohaMail/. If you want another location "
+"(like /webmail) enter it here."
+msgstr ""
+"Alla configurazione di Apache viene aggiunta una voce di alias che punta "
+"all'origine di IlohaMail, in modo predefinito «/Ilohamail», in modo che la "
+"webmail sia raggiungibile tramite http://mio.host/IlohaMail/. Se si desidera "
+"aggiungere un'altra posizione, come per esempio «/webmail», aggiungerla qui."
+
+#~ msgid "Apache, Apache-ssl, Apache2, Other"
+#~ msgstr "Apache, Apache-ssl, Apache2, Altro"

=== modified file 'debian/po/ja.po'
--- debian/po/ja.po	2008-11-07 02:46:27 +0000
+++ debian/po/ja.po	2010-06-20 14:46:24 +0000
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ilohamail 0.8.14-0rc3sid2\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-04-28 10:27+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
 "PO-Revision-Date: 2006-10-19 23:52+0900\n"
 "Last-Translator: Hideki Yamane(Debian-JP) <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
@@ -27,8 +27,26 @@
 #. Type: select
 #. Choices
 #: ../templates:1001
-msgid "Apache, Apache-ssl, Apache2, Other"
-msgstr "Apache, Apache-ssl, Apache2, その他"
+msgid "Apache"
+msgstr "Apache"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr "Apache-ssl"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr "Apache2"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
+msgstr "その他"
 
 #. Type: select
 #. Description
@@ -70,6 +88,9 @@
 "は /IlohaMail ですので、web メールへは http://your.host/IlohaMail/ でアクセス"
 "可能です。(/webmail のような) 他の位置が良い場合は、ここで入力してください。"
 
+#~ msgid "Apache, Apache-ssl, Apache2, Other"
+#~ msgstr "Apache, Apache-ssl, Apache2, その他"
+
 #~ msgid "What type of Web Server are you running?"
 #~ msgstr "どの種類の Web サーバを稼動していますか?"
 

=== modified file 'debian/po/nl.po'
--- debian/po/nl.po	2008-11-07 02:46:27 +0000
+++ debian/po/nl.po	2010-06-20 14:46:24 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ilohamail\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-04-28 10:27+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
 "PO-Revision-Date: 2007-04-30 14:03+0100\n"
 "Last-Translator: Bart Cornelis <[e-mail]>\n"
 "Language-Team: debian-l10n-dutch <[e-mail]>\n"
@@ -19,8 +19,26 @@
 #. Type: select
 #. Choices
 #: ../templates:1001
-msgid "Apache, Apache-ssl, Apache2, Other"
-msgstr "Apache, Apache-ssl, Apache2, Anders"
+msgid "Apache"
+msgstr "Apache"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr "Apache-ssl"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr "Apache2"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
+msgstr "Anders"
 
 #. Type: select
 #. Description
@@ -63,3 +81,6 @@
 "IlohaMail-bron wijst. Standaard is dit /IlohaMail, zodat webmail bereikbaar "
 "is via http://uw.server/IlohaMail. Als u een andere locatie wilt (zoals /"
 "webmail) geef deze dan hier aan."
+
+#~ msgid "Apache, Apache-ssl, Apache2, Other"
+#~ msgstr "Apache, Apache-ssl, Apache2, Anders"

=== modified file 'debian/po/pt.po'
--- debian/po/pt.po	2008-06-03 17:50:16 +0000
+++ debian/po/pt.po	2010-06-20 14:46:24 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ilohamail 0.8.14-0rc3sid5\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-04-28 10:27+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
 "PO-Revision-Date: 2007-08-07 18:29+0100\n"
 "Last-Translator: Américo Monteiro <[e-mail]>\n"
 "Language-Team: Portuguese <[e-mail]>\n"
@@ -19,8 +19,26 @@
 #. Type: select
 #. Choices
 #: ../templates:1001
-msgid "Apache, Apache-ssl, Apache2, Other"
-msgstr "Apache, Apache-ssl, Apache2, Outro"
+msgid "Apache"
+msgstr "Apache"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr "Apache-ssl"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr "Apache2"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
+msgstr "Outro"
 
 #. Type: select
 #. Description
@@ -63,3 +81,6 @@
 "para a fonte do IlohaMail. Por omissão é /IlohaMail, para que o webmail seja "
 "alcançável em http://your.host/IlohaMail/. Se você deseja outra localização "
 "(como /webmail) indique-a aqui."
+
+#~ msgid "Apache, Apache-ssl, Apache2, Other"
+#~ msgstr "Apache, Apache-ssl, Apache2, Outro"

=== modified file 'debian/po/ru.po'
--- debian/po/ru.po	2008-06-03 17:50:16 +0000
+++ debian/po/ru.po	2010-06-20 14:46:24 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ilohamail new\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-04-28 10:27+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
 "PO-Revision-Date: 2008-05-07 21:52+0400\n"
 "Last-Translator: Yuri Kozlov <[e-mail]>\n"
 "Language-Team: Russian <[e-mail]>\n"
@@ -21,8 +21,26 @@
 #. Type: select
 #. Choices
 #: ../templates:1001
-msgid "Apache, Apache-ssl, Apache2, Other"
-msgstr "Apache, Apache-ssl, Apache2, другой"
+msgid "Apache"
+msgstr "Apache"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr "Apache-ssl"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr "Apache2"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
+msgstr "другой"
 
 #. Type: select
 #. Description
@@ -64,3 +82,6 @@
 "IlohaMail. По умолчанию, это /IlohaMail, поэтому веб-почта доступна по "
 "адресу http://ваша.машина/IlohaMail/. Если хотите, можете указать другое "
 "расположение (например, /webmail)."
+
+#~ msgid "Apache, Apache-ssl, Apache2, Other"
+#~ msgstr "Apache, Apache-ssl, Apache2, другой"

=== added file 'debian/po/sk.po'
--- debian/po/sk.po	1970-01-01 00:00:00 +0000
+++ debian/po/sk.po	2010-06-20 14:46:24 +0000
@@ -0,0 +1,85 @@
+# Slovak translation of ilohamail.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the ilohamail package.
+# Ivan Masár <[e-mail]>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ilohamail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Ivan Masár <[e-mail]>\n"
+"Language-Team: Slovak <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache"
+msgstr "Apache"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr "Apache-ssl"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr "Apache2"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
+msgstr "iný"
+
+#. Type: select
+#. Description
+#: ../templates:1002
+msgid "Webserver type:"
+msgstr "Typ webového servera:"
+
+#. Type: select
+#. Description
+#: ../templates:1002
+msgid ""
+"By default IlohaMail supports any webserver that is PHP4 capable, but this "
+"process only supports Apache. This installation  will manage (or attempt to "
+"manage)  the configuration of the Apache portions specific necessary to run "
+"IlohaMail properly.   If you do not wish this to happen, please choose the "
+"'Other' option."
+msgstr ""
+"IlohaMail štandardne podporuje ľubovoľný webový server s podporou PHP4, ale "
+"tento proces podporuje iba Apache. Táto inštalácua bude spravovať (alebo sa "
+"pokúsi spravovať) konfiguráciu časti Apache zodpovedajúcu za správny beh "
+"IlohaMail. Ak si to neželáte, zvoľte prosím voľbu „iný“."
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "Apache Alias for IlohaMail:"
+msgstr "Alias Apache pre IlohaMail:"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid ""
+"An alias entry is added to the Apache configuration pointing to the "
+"IlohaMail source. By default this is /IlohaMail, so that the webmail is "
+"reachable at http://your.host/IlohaMail/. If you want another location "
+"(like /webmail) enter it here."
+msgstr ""
+"Do konfigurácie Apache sa pridá položka  alias ukazujúca na zdroj IlohaMail. "
+"Predvolená hodnota je /IlohaMail, takže webmail nájdete na http://vaša."
+"doména/IlohaMail/. Ak chcete iné umiestnenie (napr. /webmail), zadajte ho "
+"sem."
+
+#~ msgid "Apache, Apache-ssl, Apache2, Other"
+#~ msgstr "Apache, Apache-ssl, Apache2, iný"

=== modified file 'debian/po/sv.po'
--- debian/po/sv.po	2008-11-07 02:46:27 +0000
+++ debian/po/sv.po	2010-06-20 14:46:24 +0000
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ilohamail 0.8.14-0rc3\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-04-28 10:27+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
 "PO-Revision-Date: 2006-06-06 04:21+0100\n"
 "Last-Translator: Daniel Nylander <[e-mail]>\n"
 "Language-Team: Swedish <[e-mail]>\n"
@@ -28,8 +28,26 @@
 #. Type: select
 #. Choices
 #: ../templates:1001
-msgid "Apache, Apache-ssl, Apache2, Other"
-msgstr "Apache, Apache-ssl, Apache2, Annan"
+msgid "Apache"
+msgstr "Apache"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr "Apache-ssl"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr "Apache2"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
+msgstr "Annan"
 
 #. Type: select
 #. Description
@@ -73,6 +91,9 @@
 "kommas åt på http://din.server/IlohaMail/. Om du önskar en annan plats "
 "(såsom /webmail), ändra då det här."
 
+#~ msgid "Apache, Apache-ssl, Apache2, Other"
+#~ msgstr "Apache, Apache-ssl, Apache2, Annan"
+
 #~ msgid "What type of Web Server are you running?"
 #~ msgstr "Vilken typ av webbserver kör du?"
 

=== modified file 'debian/po/templates.pot'
--- debian/po/templates.pot	2008-11-07 02:46:27 +0000
+++ debian/po/templates.pot	2010-06-20 14:46:24 +0000
@@ -1,14 +1,22 @@
-# 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.
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-04-28 10:27+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -19,7 +27,25 @@
 #. Type: select
 #. Choices
 #: ../templates:1001
-msgid "Apache, Apache-ssl, Apache2, Other"
+msgid "Apache"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
 msgstr ""
 
 #. Type: select

=== modified file 'debian/po/vi.po'
--- debian/po/vi.po	2008-11-07 02:46:27 +0000
+++ debian/po/vi.po	2010-06-20 14:46:24 +0000
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ilohamail 0.8.14-0rc3sid2\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2008-04-28 10:27+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-04 09:22+0100\n"
 "PO-Revision-Date: 2006-06-18 16:12+0930\n"
 "Last-Translator: Clytie Siddall <[e-mail]>\n"
 "Language-Team: Vietnamese <[e-mail]>\n"
@@ -18,8 +18,26 @@
 #. Type: select
 #. Choices
 #: ../templates:1001
-msgid "Apache, Apache-ssl, Apache2, Other"
-msgstr "Apache, Apache-ssl, Apache2, Khác"
+msgid "Apache"
+msgstr "Apache"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache-ssl"
+msgstr "Apache-ssl"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache2"
+msgstr "Apache2"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Other"
+msgstr "Khác"
 
 #. Type: select
 #. Description
@@ -63,6 +81,9 @@
 "tại <http://máy.bạn/IlohaMail/>. Nếu bạn thích địa điểm khác hơn (như </"
 "webmail>), hãy nhập nó vào đây."
 
+#~ msgid "Apache, Apache-ssl, Apache2, Other"
+#~ msgstr "Apache, Apache-ssl, Apache2, Khác"
+
 #~ msgid "What type of Web Server are you running?"
 #~ msgstr "Bạn có cháy trình phục vụ Mạng loại nào?"
 

=== modified file 'debian/rules'
--- debian/rules	2008-11-07 02:46:27 +0000
+++ debian/rules	2010-06-20 14:46:24 +0000
@@ -21,7 +21,7 @@
 install-stamp: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	dh_install
 	cp debian/lintian.override ${t}/usr/share/lintian/overrides/ilohamail

=== modified file 'debian/templates'
--- debian/templates	2007-06-11 20:06:40 +0000
+++ debian/templates	2010-06-20 14:46:24 +0000
@@ -1,6 +1,6 @@
 Template: ilohamail/webserver_type
 Type: select
-_Choices: Apache, Apache-ssl, Apache2, Other
+__Choices: Apache, Apache-ssl, Apache2, Other
 #flag:translate:3
 Default: Apache
 _Description: Webserver type: