Bug#771908: marked as done (unblock: phamm/0.6.2-1.2)

[Debian Bug Tracking System]

Your message dated Thu, 4 Dec 2014 23:01:05 +0100
with message-id <20141204220105.gb10...@ugent.be>
and subject line Re: Bug#771908: unblock: phamm/0.6.2-1.2
has caused the Debian Bug report #771908,
regarding unblock: phamm/0.6.2-1.2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
771908: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771908
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

--- Begin Message ---

Package: release.debian.org
User: release.debian....@packages.debian.org
Usertags: unblock
Severity: normal

Please unblock package phamm. That version handles the apache 2.4
transition and adds the Dutch translation.

Apache2.2 was shipping with a folder /etc/apache2/conf.d/ that no longer
exists, making the phamm package uninstallable.

web policy was to have a configuration in /etc/<packagename>/ and a link
in /etc/apache2/conf.d/ toward it.
Now the apache2 conf snippet should be in /etc/apache2/conf-available/
A link in /etc/apache2/conf-enabled/ should be created in postinst by
using apache helpers, and only that. (The idea behind is that if a
system admin remove the links with a2disconf, a package upgrade must
preserve that decision and not create the link in any circonstances.
Links creationg/deletion by admin has priority over links
created/deleted by maint scripts).

My NMU is not absolutely minimal, but it treats the apache
migration problem in the proper way I believe. Here are some details:
- debconf was asking the user whether he's using apache, apache-ssl,
apache-perl, or apache2. Some of these options have been obsolete since
etch. There is now only one choice: apache2. So I removed the questions
from the templates files, remove the apache1 support from postinst, and
even removed the previous entries on upgrades with "debconf
db_unregister". This had a major effect on all the translation files
that were automatically regenerated by build to comment out obsolete
entries. I also removed the code from postinst that handled these
choices, of course.
- I let dh_apache2 handle the configuration. This means the apache2 conf
file needs to match the package name, hence the renaming of
debian/conf/apache.conf into debian/conf/phamm.conf.
I believe the other changes are more easy to understand. Fell free to
ping me if you have any question.

unblock phamm/0.6.2-1.1

-- System Information:
Debian Release: jessie/sid
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru phamm-0.6.2/debian/changelog phamm-0.6.2/debian/changelog
--- phamm-0.6.2/debian/changelog	2014-07-15 08:04:53.000000000 +0200
+++ phamm-0.6.2/debian/changelog	2014-11-14 19:17:21.000000000 +0100
@@ -1,3 +1,17 @@
+phamm (0.6.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add support for apache2.4 (Closes: #669841):
+    -  Move conffile from /etc/phamm/apache.conf to
+       /etc/apache2/conf-available/phamm.conf
+    -  let dh_apache2 handle the conffile
+    -  drop debconf entries reconfigure-webserver and restart-webserver: Only
+       apache2 is supported, and dh_apache2 causes automatic reload.
+    -  Remove obsolete apache1 and apache2.2 conf.d/ links on upgrade.
+  * Added Dutch translation (Closes: #763643). Thanks Frans Spiesschaert.
+
+ -- Jean-Michel Nirgal Vourgère <jmv_...@nirgal.com>  Fri, 14 Nov 2014 16:15:52 +0100
+
 phamm (0.6.2-1) unstable; urgency=low
 
   * New upstream release (Closes: #750518)
diff -Nru phamm-0.6.2/debian/conf/apache.conf phamm-0.6.2/debian/conf/apache.conf
--- phamm-0.6.2/debian/conf/apache.conf	2014-07-15 07:38:41.000000000 +0200
+++ phamm-0.6.2/debian/conf/apache.conf	1970-01-01 01:00:00.000000000 +0100
@@ -1,48 +0,0 @@
-# Define /phamm alias, this is the default
-<IfModule mod_alias.c>
-    Alias /phamm /usr/share/phamm/public
-</IfModule>
-
-# You can also use phpLDAPadmin as a VirtualHost
-# <VirtualHost *:*>
-#     ServerName ldap.example.com
-#     ServerAdmin r...@example.com
-#     DocumentRoot /usr/share/phamm
-#     ErrorLog logs/ldap.example.com-error.log
-#     CustomLog logs/ldap.example.com-access.log common
-# </VirtualHost>
-
-<Directory /usr/share/phamm/public/>
-
-    DirectoryIndex index.php
-    Options +FollowSymLinks
-    AllowOverride None
-
-    Order allow,deny
-    Allow from all
-
-    <IfModule mod_mime.c>
-
-      <IfModule mod_php5.c>
-        AddType application/x-httpd-php .php
-
-        php_flag magic_quotes_gpc Off
-        php_flag track_vars On
-        php_flag register_globals Off
-        php_value include_path .
-      </IfModule>
-
-      <IfModule !mod_php5.c>
-        <IfModule mod_actions.c>
-          <IfModule mod_cgi.c>
-            AddType application/x-httpd-php .php
-
-            Action application/x-httpd-php /cgi-bin/php5
-          </IfModule>
-        </IfModule>
-      </IfModule>
-
-    </IfModule>
-
-</Directory>
-
diff -Nru phamm-0.6.2/debian/conf/phamm.conf phamm-0.6.2/debian/conf/phamm.conf
--- phamm-0.6.2/debian/conf/phamm.conf	1970-01-01 01:00:00.000000000 +0100
+++ phamm-0.6.2/debian/conf/phamm.conf	2014-07-15 07:38:41.000000000 +0200
@@ -0,0 +1,48 @@
+# Define /phamm alias, this is the default
+<IfModule mod_alias.c>
+    Alias /phamm /usr/share/phamm/public
+</IfModule>
+
+# You can also use phpLDAPadmin as a VirtualHost
+# <VirtualHost *:*>
+#     ServerName ldap.example.com
+#     ServerAdmin r...@example.com
+#     DocumentRoot /usr/share/phamm
+#     ErrorLog logs/ldap.example.com-error.log
+#     CustomLog logs/ldap.example.com-access.log common
+# </VirtualHost>
+
+<Directory /usr/share/phamm/public/>
+
+    DirectoryIndex index.php
+    Options +FollowSymLinks
+    AllowOverride None
+
+    Order allow,deny
+    Allow from all
+
+    <IfModule mod_mime.c>
+
+      <IfModule mod_php5.c>
+        AddType application/x-httpd-php .php
+
+        php_flag magic_quotes_gpc Off
+        php_flag track_vars On
+        php_flag register_globals Off
+        php_value include_path .
+      </IfModule>
+
+      <IfModule !mod_php5.c>
+        <IfModule mod_actions.c>
+          <IfModule mod_cgi.c>
+            AddType application/x-httpd-php .php
+
+            Action application/x-httpd-php /cgi-bin/php5
+          </IfModule>
+        </IfModule>
+      </IfModule>
+
+    </IfModule>
+
+</Directory>
+
diff -Nru phamm-0.6.2/debian/control phamm-0.6.2/debian/control
--- phamm-0.6.2/debian/control	2014-07-15 08:05:01.000000000 +0200
+++ phamm-0.6.2/debian/control	2014-11-14 17:04:31.000000000 +0100
@@ -3,15 +3,14 @@
 Priority: extra
 Maintainer: Phamm Team <t...@phamm.org>
 Uploaders: Alessandro De Zorzi <l...@nonlontano.it>, Mirko Grava <o...@klez.it>
-Build-Depends: debhelper (>= 5), po-debconf, perl
+Build-Depends: debhelper (>= 5), po-debconf, perl, dh-apache2 | apache2-dev
 Standards-Version: 3.9.5
 Homepage: http://www.phamm.org
 
 Package: phamm
 Architecture: all
 Depends: php5, php5-ldap, debconf (>= 0.5) | debconf-2.0, ${shlibs:Depends}, ${misc:Depends}
-Recommends: phamm-ldap
-Suggests: apache2
+Recommends: phamm-ldap, ${misc:Recommends}
 Description: PHP front-end to manage virtual services on LDAP - main package
  Phamm is a useful PHP front-end providing role-based administrative
  access to virtual services using an LDAP back-end.
diff -Nru phamm-0.6.2/debian/phamm.apache2 phamm-0.6.2/debian/phamm.apache2
--- phamm-0.6.2/debian/phamm.apache2	1970-01-01 01:00:00.000000000 +0100
+++ phamm-0.6.2/debian/phamm.apache2	2014-11-14 16:31:32.000000000 +0100
@@ -0,0 +1 @@
+conf debian/conf/phamm.conf
diff -Nru phamm-0.6.2/debian/phamm.maintscript phamm-0.6.2/debian/phamm.maintscript
--- phamm-0.6.2/debian/phamm.maintscript	1970-01-01 01:00:00.000000000 +0100
+++ phamm-0.6.2/debian/phamm.maintscript	2014-11-14 17:00:07.000000000 +0100
@@ -0,0 +1 @@
+mv_conffile /etc/phamm/apache.conf /etc/apache2/conf-available/phamm.conf 0.6.2-1.1~
diff -Nru phamm-0.6.2/debian/phamm.postinst phamm-0.6.2/debian/phamm.postinst
--- phamm-0.6.2/debian/phamm.postinst	2010-03-29 15:50:59.000000000 +0200
+++ phamm-0.6.2/debian/phamm.postinst	2014-11-14 19:12:47.000000000 +0100
@@ -13,30 +13,36 @@
 
 if [ "$1" = "configure" ]; then
     
+    if dpkg --compare-versions "$2" le-nl "0.6.2-1.1"; then
+        # remove links for obsolete versions of httpd
+        for webserver in apache apache-perl apache-ssl apache2; do
+          if [ -L /etc/$webserver/conf.d/phamm ]; then
+            rm /etc/$webserver/conf.d/phamm
+          fi
+	done
+
+	# Clean debconf registry of obsolete questions
+	db_unregister phamm/reconfigure-webserver || true
+	db_unregister phamm/restart-webserver || true
+    fi
+    
     if [ ! -f /var/log/phamm.log ]; then
 	touch /var/log/phamm.log
 	chown www-data:adm /var/log/phamm.log
 	chmod 640 /var/log/phamm.log
     fi
 
-	if [ ! -f $CONFFILE ]; then
-		cp /usr/share/phamm/config.inc.example.php $CONFFILE
-		chown -R root:www-data $CONFFILE
-		chmod 0640 $CONFFILE
-		if [ ! -e /usr/share/phamm/config.inc.php ]; then
-		    ln -s $CONFFILE /usr/share/phamm/config.inc.php
-		fi
-	else
-		# Solve a non-link file in 0.5.9-*
-		if [ ! -e /usr/share/phamm/config.inc.php ]; then
-		    ln -s $CONFFILE /usr/share/phamm/config.inc.php
-		fi
-		exit 0
+    if [ ! -f $CONFFILE ]; then
+	cp /usr/share/phamm/config.inc.example.php $CONFFILE
+	chown -R root:www-data $CONFFILE
+	chmod 0640 $CONFFILE
+	if [ ! -e /usr/share/phamm/config.inc.php ]; then
+	    ln -s $CONFFILE /usr/share/phamm/config.inc.php
 	fi
 
 	db_get phamm/ldap-server || true
 	ldapserver="$RET"
-    perl -i -p -e "s/\('LDAP_HOST_NAME','127.0.0.1'\)/\('LDAP_HOST_NAME','$ldapserver'\)/" $CONFFILE 2> /dev/null
+	perl -i -p -e "s/\('LDAP_HOST_NAME','127.0.0.1'\)/\('LDAP_HOST_NAME','$ldapserver'\)/" $CONFFILE 2> /dev/null
 
 
 	db_get phamm/ldap-tls || true
@@ -44,110 +50,38 @@
 	if [ "$tls" = "true" ]; then
 	    perl -i -p -e "s/\('LDAP_HOST_NAME','/\('LDAP_HOST_NAME','ldaps:\/\//" $CONFFILE 2> /dev/null
 	    perl -i -p -e "s/\('LDAP_PORT','389'\)/\('LDAP_PORT','636'\)/" $CONFFILE 2> /dev/null
-
+	
 	fi
 
 	db_get phamm/ldap-basedn || true
 	basedn="$RET"
-    perl -i -p -e "s/\('SUFFIX','dc=example,dc=tld'\)/\('SUFFIX','$basedn'\)/" $CONFFILE 2> /dev/null
+	perl -i -p -e "s/\('SUFFIX','dc=example,dc=tld'\)/\('SUFFIX','$basedn'\)/" $CONFFILE 2> /dev/null
 
 	db_get phamm/ldap-binddn || true
 	binddn="$RET"
 	perl -i -p -e "s/\('BINDDN','cn=admin,dc=example,dc=tld'\)/\('BINDDN','$binddn'\)/" $CONFFILE 2> /dev/null
-	
+
 	perl -i -p -e "s/\('LDAP_BASE','o=hosting,dc=example,dc=tld'\)/\('LDAP_BASE','o=hosting,$basedn'\)/" $CONFFILE 2> /dev/null
-	
+
 	perl -i -p -e "s/\('PHAMM_LOG',0\)/\('PHAMM_LOG',1\)/" $CONFFILE 2> /dev/null
+    else
+    	# Solve a non-link file in 0.5.9-*
+    	if [ ! -e /usr/share/phamm/config.inc.php ]; then
+    	    ln -s $CONFFILE /usr/share/phamm/config.inc.php
+    	fi
+    fi
 
-    # Autoconfiguration for apache*
-    db_get phamm/reconfigure-webserver || true
-    webservers="$RET"
-    restart=""
-    
-    for webserver in $webservers; do
-        webserver=${webserver%,}
-        test -x /usr/sbin/$webserver || continue
-	
-        case "$webserver" in
-            apache|apache-perl|apache-ssl)
-                if [ -x /usr/sbin/modules-config ]; then
-                    if [ -f /usr/lib/apache/1.3/libphp5.so ]; then
-                        if ! grep "^LoadModule php5_module " /etc/$webserver/modules.conf > /dev/null 2>&1; then
-                            modules-config $webserver enable mod_php5
-                        fi
-                    elif [ -f /usr/lib/apache/1.3/libphp4.so ]; then
-                        if ! grep "^LoadModule php4_module " /etc/$webserver/modules.conf > /dev/null 2>&1; then
-                            modules-config $webserver enable mod_php4
-                        fi
-                    else
-                        if [ -f /usr/lib/apache/1.3/mod_actions.so ]; then
-                            if ! grep "^LoadModule action_module " /etc/$webserver/modules.conf > /dev/null 2>&1; then
-                                modules-config $webserver enable mod_actions
-                            fi
-                        fi
-                        if [ -f /usr/lib/apache/1.3/mod_cgi.so ]; then
-                            if ! grep "^LoadModule cgi_module " /etc/$webserver/modules.conf > /dev/null 2>&1; then
-                                modules-config $webserver enable mod_cgi
-                            fi
-                        fi
-                    fi
-                fi
-                if grep "^Include /etc/phamm/apache.conf" /etc/$webserver/httpd.conf > /dev/null 2>&1; then
-                    mv -f /etc/$webserver/httpd.conf /etc/$webserver/httpd.conf.old.phamm
-                    grep -v "^Include /etc/phamm/apache.conf" /etc/$webserver/httpd.conf.old.phamm \
-                        > /etc/$webserver/httpd.conf
-                fi
-                if ! grep "^Include /etc/$webserver/conf.d" /etc/$webserver/httpd.conf > /dev/null 2>&1; then
-                    cp -f /etc/$webserver/httpd.conf /etc/$webserver/httpd.conf.old.phamm
-                    echo "Include /etc/$webserver/conf.d" >> /etc/$webserver/httpd.conf
-                fi
-                if [ -f /etc/$webserver/httpd.conf.old.phamm ] && [ ! -f /etc/$webserver/httpd.conf.old ]; then
-                    mv -f /etc/$webserver/httpd.conf.old.phamm /etc/$webserver/httpd.conf.old
-                fi
-                mkdir -p /etc/$webserver/conf.d
-                ;;
-            apache2)
-                if [ -d /etc/$webserver/mods-enabled ]; then
-                    if [ ! -f /etc/$webserver/mods-enabled/actions.load ] && [ ! -h /etc/$webserver/mods-enabled/actions.load ]; then
-                        ln -s /etc/$webserver/mods-available/actions.load /etc/$webserver/mods-enabled/actions.load
-                    fi
-                    if [ -f /etc/apache2/mods-available/php5.load ]; then
-                        if [ ! -f /etc/$webserver/mods-enabled/php5.load ] && [ ! -h /etc/$webserver/mods-enabled/php5.load ]; then
-                            ln -s /etc/$webserver/mods-available/php5.load /etc/$webserver/mods-enabled/php5.load
-                        fi
-                    elif [ -f /etc/apache2/mods-available/php4.load ]; then
-                        if [ ! -f /etc/$webserver/mods-enabled/php4.load ] && [ ! -h /etc/$webserver/mods-enabled/php4.load ]; then
-                            ln -s /etc/$webserver/mods-available/php4.load /etc/$webserver/mods-enabled/php4.load
-                        fi
-                    else
-                        if [ ! -f /etc/$webserver/mods-enabled/cgi.load ] && [ ! -h /etc/$webserver/mods-enabled/cgi.load ]; then
-                            ln -s /etc/$webserver/mods-available/cgi.load /etc/$webserver/mods-enabled/cgi.load
-                        fi
-                    fi
-                fi
-                ;;
-        esac
-
-        if [ ! -f /etc/$webserver/conf.d/phamm ] && [ ! -h /etc/$webserver/conf.d/phamm ]; then
-            ln -s /etc/phamm/apache.conf /etc/$webserver/conf.d/phamm
-	    restart="$restart $webserver"
-        fi
-    done
-
-    db_get phamm/restart-webserver || true
-	res="$RET"
-	db_stop || true
-    if [ "$res" = "true" ]; then
-        for webserver in $restart; do
-            webserver=${webserver%,}
-            if [ -x /usr/sbin/invoke-rc.d ]; then
-                invoke-rc.d $webserver restart
-            else
-                /etc/init.d/$webserver restart
-            fi
-        done
+
+    # Configuration for apache2
+    if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+      . /usr/share/apache2/apache2-maintscript-helper
+      if ! a2query -qm actions ; then
+          apache2_invoke enmod actions
+      fi
+      if ! a2query -qm cgi ; then
+          apache2_invoke enmod cgi
+      fi
     fi
-    
 fi
 
 #DEBHELPER#
diff -Nru phamm-0.6.2/debian/phamm.postrm phamm-0.6.2/debian/phamm.postrm
--- phamm-0.6.2/debian/phamm.postrm	2008-07-26 12:32:26.000000000 +0200
+++ phamm-0.6.2/debian/phamm.postrm	2014-11-14 17:35:09.000000000 +0100
@@ -5,42 +5,7 @@
 case "$1" in
   remove)
 
-    . /usr/share/debconf/confmodule
-    db_version 2.0 || [ $? -lt 30 ]
-
-    rm -f /usr/share/phamm/config.inc.php
-
-    db_get phamm/reconfigure-webserver
-    webservers="$RET"
-    restart=""
-
-    for webserver in $webservers; do
-        webserver=${webserver%,}
-
-        case "$webserver" in
-            apache|apache-perl|apache-ssl|apache2)
-                rm -f /etc/$webserver/conf.d/phamm
-                test -x /usr/sbin/$webserver || continue
-                restart="$restart $webserver"
-                ;;
-			*)
-				;;
-        esac
-    done
-
-    db_get phamm/restart-webserver
-	res="$RET"
-	db_stop || true
-    if [ "$res" = "true" ]; then
-        for webserver in $restart; do
-            webserver=${webserver%,}
-            if [ -x /usr/sbin/invoke-rc.d ]; then
-                invoke-rc.d $webserver restart
-            else
-                /etc/init.d/$webserver restart
-            fi
-        done
-    fi
+	rm -f /usr/share/phamm/config.inc.php
 	;;
 
   purge)
diff -Nru phamm-0.6.2/debian/phamm.templates phamm-0.6.2/debian/phamm.templates
--- phamm-0.6.2/debian/phamm.templates	2008-07-26 12:32:27.000000000 +0200
+++ phamm-0.6.2/debian/phamm.templates	2014-11-14 16:33:29.000000000 +0100
@@ -30,17 +30,3 @@
  to log in to the LDAP server. If you use form-based authentication
  this will be the default login DN. In this case leaving it empty will
  prevent the creation of a default login DN.
-
-Template: phamm/reconfigure-webserver
-Type: multiselect
-Choices: apache, apache-ssl, apache-perl, apache2
-Default: apache, apache-ssl, apache-perl, apache2
-_Description: Web server to reconfigure automatically:
- Phamm supports any web server that PHP does, but this automatic
- configuration process only supports Apache.
-
-Template: phamm/restart-webserver
-Type: boolean
-Default: true
-_Description: Restart the webserver(s)?
- In order to apply the changes, the webserver(s) must be restarted.
diff -Nru phamm-0.6.2/debian/po/cs.po phamm-0.6.2/debian/po/cs.po
--- phamm-0.6.2/debian/po/cs.po	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/cs.po	2014-11-14 16:58:42.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: phamm\n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: 2008-07-26 17:38+0200\n"
 "Last-Translator: Miroslav Kure <ku...@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-cz...@lists.debian.org>\n"
@@ -71,34 +71,6 @@
 "přihlašovací DN. Jestliže ponecháte prázdné, výchozí přihlašovací DN se "
 "nevytvoří."
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr "Webový server, který se má nastavit automaticky:"
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-"Phamm podporuje stejné webové servery jako PHP, ovšem automatické nastavení "
-"zvládá pouze s Apachem."
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr "Restartovat webový server?"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr "Aby se změny provedly, musí se webový server (servery) restartovat."
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
@@ -134,6 +106,22 @@
 "Zadejte prosím heslo pro uživatele „phamm“, které se použije pro připojení k "
 "LDAP serveru s omezenými oprávněními."
 
+#~ msgid "Web server to reconfigure automatically:"
+#~ msgstr "Webový server, který se má nastavit automaticky:"
+
+#~ msgid ""
+#~ "Phamm supports any web server that PHP does, but this automatic "
+#~ "configuration process only supports Apache."
+#~ msgstr ""
+#~ "Phamm podporuje stejné webové servery jako PHP, ovšem automatické "
+#~ "nastavení zvládá pouze s Apachem."
+
+#~ msgid "Restart the webserver(s)?"
+#~ msgstr "Restartovat webový server?"
+
+#~ msgid "In order to apply the changes, the webserver(s) must be restarted."
+#~ msgstr "Aby se změny provedly, musí se webový server (servery) restartovat."
+
 #~| msgid "Restart the webserver(s)?"
 #~ msgid "Restart the LDAP server?"
 #~ msgstr "Restartovat LDAP server?"
diff -Nru phamm-0.6.2/debian/po/de.po phamm-0.6.2/debian/po/de.po
--- phamm-0.6.2/debian/po/de.po	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/de.po	2014-11-14 16:58:42.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: phamm\n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: 2008-07-28 15:16+0200\n"
 "Last-Translator: Tobias Quathamer <t.quatha...@gmx.net>\n"
 "Language-Team: German <debian-l10n-ger...@lists.debian.org>\n"
@@ -73,36 +73,6 @@
 "Authentisierung benutzen, wird dies der voreingestellte Anmelde-DN. Es wird "
 "kein voreingestellter Anmelde-DN erstellt, wenn Sie dieses Feld leer lassen."
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr "Webserver, der automatisch rekonfiguriert werden soll:"
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-"Phamm unterstützt jeden Webserver, der von PHP unterstützt wird, aber die "
-"automatische Konfiguration kann nur für Apache durchgeführt werden."
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr "Den/die Webserver neu starten?"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr ""
-"Um die Änderungen wirksam werden zu lassen, muss ein Neustart des/der "
-"Webserver(s) durchgeführt werden."
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
@@ -140,6 +110,24 @@
 "Bitte geben Sie das Passwort für »phamm user« ein. Dies ist praktisch, um "
 "eine Anmeldung mit eingeschränkten Rechten durchzuführen."
 
+#~ msgid "Web server to reconfigure automatically:"
+#~ msgstr "Webserver, der automatisch rekonfiguriert werden soll:"
+
+#~ msgid ""
+#~ "Phamm supports any web server that PHP does, but this automatic "
+#~ "configuration process only supports Apache."
+#~ msgstr ""
+#~ "Phamm unterstützt jeden Webserver, der von PHP unterstützt wird, aber die "
+#~ "automatische Konfiguration kann nur für Apache durchgeführt werden."
+
+#~ msgid "Restart the webserver(s)?"
+#~ msgstr "Den/die Webserver neu starten?"
+
+#~ msgid "In order to apply the changes, the webserver(s) must be restarted."
+#~ msgstr ""
+#~ "Um die Änderungen wirksam werden zu lassen, muss ein Neustart des/der "
+#~ "Webserver(s) durchgeführt werden."
+
 #~ msgid "Restart the LDAP server?"
 #~ msgstr "Den LDAP-Server neu starten?"
 
diff -Nru phamm-0.6.2/debian/po/es.po phamm-0.6.2/debian/po/es.po
--- phamm-0.6.2/debian/po/es.po	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/es.po	2014-11-14 16:58:42.000000000 +0100
@@ -31,7 +31,7 @@
 msgstr ""
 "Project-Id-Version: phamm 0.5.15-1\n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: 2010-01-19 16:30+0100\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadr...@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-span...@lists.debian.org>\n"
@@ -94,35 +94,6 @@
 "será la identificación DN predeterminada. En ese caso dejar en blanco este "
 "campo, evitará la creación de una identificación DN predeterminada."
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr "Servidor web a reconfigurar automáticamente:"
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-"Phamm permite usar cualquier servidor web que pueda usar PHP, pero este "
-"proceso de configuración automática sólo se puede realizar sobre Apache."
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr "¿Desea reiniciar el/los servidor/es web?"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr ""
-"Para poder aplicar los cambios, se debe/n reiniciar el/los servidor/es web."
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
@@ -160,6 +131,24 @@
 "Introduzca la contraseña del «usuario phamm», es útil para enlazar con "
 "privilegios limitados."
 
+#~ msgid "Web server to reconfigure automatically:"
+#~ msgstr "Servidor web a reconfigurar automáticamente:"
+
+#~ msgid ""
+#~ "Phamm supports any web server that PHP does, but this automatic "
+#~ "configuration process only supports Apache."
+#~ msgstr ""
+#~ "Phamm permite usar cualquier servidor web que pueda usar PHP, pero este "
+#~ "proceso de configuración automática sólo se puede realizar sobre Apache."
+
+#~ msgid "Restart the webserver(s)?"
+#~ msgstr "¿Desea reiniciar el/los servidor/es web?"
+
+#~ msgid "In order to apply the changes, the webserver(s) must be restarted."
+#~ msgstr ""
+#~ "Para poder aplicar los cambios, se debe/n reiniciar el/los servidor/es "
+#~ "web."
+
 #~ msgid "Restart the LDAP server?"
 #~ msgstr "¿Desea reiniciar el servidor de LDAP?"
 
diff -Nru phamm-0.6.2/debian/po/eu.po phamm-0.6.2/debian/po/eu.po
--- phamm-0.6.2/debian/po/eu.po	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/eu.po	2014-11-14 16:58:42.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: phamm_templates_eu\n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: 2008-11-04 22:09+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <doo...@euskalgnu.org>\n"
 "Language-Team: Euskara <debian-l10n-bas...@lists.debian.org>\n"
@@ -71,34 +71,6 @@
 "hau izango da saio-hasierako DN lehenetsia. Kasu honetan, hau hutsik utziz "
 "gero saio-hasierako DN lehenetsia sortzea saihestuko da."
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr "Automatikoki birkonfiguratzeko web zerbitzaria:"
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-"Phamm-ek PHPek onartzen dituen edozein web zerbitzari onartzen dituen arren, "
-"konfigurazio automatiko honek Apache soilik onartzen du."
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr "Web zerbitzaria(k) berrabiarazi?"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr "Aldaketak aplikatzeko web zerbitzariak berrabiarazi egin behar dira."
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
@@ -134,6 +106,23 @@
 "Sartu \"phamm erabiltzailearen\" pasahitza murriztutako pribilegioekin "
 "esleitzeko."
 
+#~ msgid "Web server to reconfigure automatically:"
+#~ msgstr "Automatikoki birkonfiguratzeko web zerbitzaria:"
+
+#~ msgid ""
+#~ "Phamm supports any web server that PHP does, but this automatic "
+#~ "configuration process only supports Apache."
+#~ msgstr ""
+#~ "Phamm-ek PHPek onartzen dituen edozein web zerbitzari onartzen dituen "
+#~ "arren, konfigurazio automatiko honek Apache soilik onartzen du."
+
+#~ msgid "Restart the webserver(s)?"
+#~ msgstr "Web zerbitzaria(k) berrabiarazi?"
+
+#~ msgid "In order to apply the changes, the webserver(s) must be restarted."
+#~ msgstr ""
+#~ "Aldaketak aplikatzeko web zerbitzariak berrabiarazi egin behar dira."
+
 #~ msgid "Restart the LDAP server?"
 #~ msgstr "LDAP zerbitzaria berrabiarazi?"
 
diff -Nru phamm-0.6.2/debian/po/fi.po phamm-0.6.2/debian/po/fi.po
--- phamm-0.6.2/debian/po/fi.po	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/fi.po	2014-11-14 16:58:42.000000000 +0100
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: phamm\n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: 2008-07-26 22:09+0200\n"
 "Last-Translator: Esko Arajärvi <e...@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finn...@lists.debian.org>\n"
@@ -67,35 +67,6 @@
 "Tässä tapauksessa kentän jättäminen tyhjäksi estää oletuskirjautumis-DN:n "
 "luonnin."
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr "Verkkopalvelimet, joiden asetukset tehdään uudelleen automaattisesti:"
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-"Phamm tukee mitä tahansa verkkopalvelinta, joka tukee PHP:tä, mutta tämä "
-"automaattinen asetusprosessi tukee vain Apachea."
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr "Käynnistetäänkö verkkopalvelimet uudelleen?"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr ""
-"Verkkopalvelimet täytyy käynnistää uudelleen muutosten käyttöönottamiseksi."
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
@@ -131,6 +102,25 @@
 "Anna salasana phamm-tunnukselle, joka on kätevä yhdistämisiin rajoitetuilla "
 "oikeuksilla."
 
+#~ msgid "Web server to reconfigure automatically:"
+#~ msgstr ""
+#~ "Verkkopalvelimet, joiden asetukset tehdään uudelleen automaattisesti:"
+
+#~ msgid ""
+#~ "Phamm supports any web server that PHP does, but this automatic "
+#~ "configuration process only supports Apache."
+#~ msgstr ""
+#~ "Phamm tukee mitä tahansa verkkopalvelinta, joka tukee PHP:tä, mutta tämä "
+#~ "automaattinen asetusprosessi tukee vain Apachea."
+
+#~ msgid "Restart the webserver(s)?"
+#~ msgstr "Käynnistetäänkö verkkopalvelimet uudelleen?"
+
+#~ msgid "In order to apply the changes, the webserver(s) must be restarted."
+#~ msgstr ""
+#~ "Verkkopalvelimet täytyy käynnistää uudelleen muutosten "
+#~ "käyttöönottamiseksi."
+
 #~ msgid "Restart the LDAP server?"
 #~ msgstr "Käynnistetäänkö LDAP-palvelin uudelleen?"
 
diff -Nru phamm-0.6.2/debian/po/fr.po phamm-0.6.2/debian/po/fr.po
--- phamm-0.6.2/debian/po/fr.po	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/fr.po	2014-11-14 16:58:42.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: 2008-07-29 20:08+0200\n"
 "Last-Translator: Christian Perrier <bubu...@debian.org>\n"
 "Language-Team: French <debian-l10n-fre...@lists.debian.org>\n"
@@ -73,36 +73,6 @@
 "défaut. Dans ce cas, le laisser vide permettra d'éviter la création d'un "
 "identifiant de connexion par défaut."
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr "Serveur web à reconfigurer automatiquement :"
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-"Phamm gère tous les serveurs web gérés par PHP, mais seul Apache peut être "
-"configuré automatiquement."
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr "Faut-il redémarrer le(s) serveur(s) web ?"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr ""
-"Afin de prendre en compte les modifications, il est nécessaire de redémarrer "
-"le(s) serveur(s)."
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
@@ -140,6 +110,24 @@
 "Veuillez indiquer le mot de passe à utiliser pour l'« utilisateur phamm », "
 "utile pour des connexions LDAP avec privilèges limités."
 
+#~ msgid "Web server to reconfigure automatically:"
+#~ msgstr "Serveur web à reconfigurer automatiquement :"
+
+#~ msgid ""
+#~ "Phamm supports any web server that PHP does, but this automatic "
+#~ "configuration process only supports Apache."
+#~ msgstr ""
+#~ "Phamm gère tous les serveurs web gérés par PHP, mais seul Apache peut "
+#~ "être configuré automatiquement."
+
+#~ msgid "Restart the webserver(s)?"
+#~ msgstr "Faut-il redémarrer le(s) serveur(s) web ?"
+
+#~ msgid "In order to apply the changes, the webserver(s) must be restarted."
+#~ msgstr ""
+#~ "Afin de prendre en compte les modifications, il est nécessaire de "
+#~ "redémarrer le(s) serveur(s)."
+
 #~| msgid "Restart the webserver(s)?"
 #~ msgid "Restart the LDAP server?"
 #~ msgstr "Faut-il redémarrer le serveur LDAP ?"
diff -Nru phamm-0.6.2/debian/po/gl.po phamm-0.6.2/debian/po/gl.po
--- phamm-0.6.2/debian/po/gl.po	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/gl.po	2014-11-14 16:58:42.000000000 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: phamm\n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: 2008-07-27 19:10+0100\n"
 "Last-Translator: Jacobo Tarrio <jtar...@debian.org>\n"
 "Language-Team: Galician <proxe...@trasno.net>\n"
@@ -69,34 +69,6 @@
 "DN de identificación por defecto. Neste caso, se o deixa baleiro hase "
 "impedir a creación dun DN de identificación por defecto."
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr "Servidor web a reconfigurar automaticamente:"
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-"Phamm soporta os mesmos servidores web que PHP, pero este proceso automático "
-"de configuración só soporta Apache."
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr "¿Reiniciar o(s) servidor(es) web?"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr "Para aplicar os cambios hai que reiniciar o(s) servidor(es) web."
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
@@ -133,6 +105,22 @@
 "Introduza o contrasinal do usuario phamm para se conectar con privilexios "
 "limitados."
 
+#~ msgid "Web server to reconfigure automatically:"
+#~ msgstr "Servidor web a reconfigurar automaticamente:"
+
+#~ msgid ""
+#~ "Phamm supports any web server that PHP does, but this automatic "
+#~ "configuration process only supports Apache."
+#~ msgstr ""
+#~ "Phamm soporta os mesmos servidores web que PHP, pero este proceso "
+#~ "automático de configuración só soporta Apache."
+
+#~ msgid "Restart the webserver(s)?"
+#~ msgstr "¿Reiniciar o(s) servidor(es) web?"
+
+#~ msgid "In order to apply the changes, the webserver(s) must be restarted."
+#~ msgstr "Para aplicar os cambios hai que reiniciar o(s) servidor(es) web."
+
 #~| msgid "Restart the webserver(s)?"
 #~ msgid "Restart the LDAP server?"
 #~ msgstr "¿Reiniciar o servidor LDAP?"
diff -Nru phamm-0.6.2/debian/po/it.po phamm-0.6.2/debian/po/it.po
--- phamm-0.6.2/debian/po/it.po	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/it.po	2014-11-14 16:58:42.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: phamm 0.5.12-1\n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: 2008-07-26 14:50+0200\n"
 "Last-Translator: Alessandro De Zorzi <l...@nonlontano.it>\n"
 "Language-Team: Italia <t...@phamm.org>\n"
@@ -68,35 +68,6 @@
 "Indicare il DN per dell'account di amministrazione che sarà utilizzato per "
 "collegarsi al server LDAP."
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr "Server web che saranno configurati automaticamente:"
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-"Phamm può funzionare con tutti i server web che supportano PHP ma la "
-"configurazione automatica tiene conto solo di Apache."
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr "Riavviare i server web?"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr ""
-"Per rendere effettive le modifiche, il server web deve essere riavviato."
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
@@ -132,6 +103,23 @@
 "Inserire la password per l'utente \"phamm user\" che potrà essere usato per "
 "il bind con privilegi limitati."
 
+#~ msgid "Web server to reconfigure automatically:"
+#~ msgstr "Server web che saranno configurati automaticamente:"
+
+#~ msgid ""
+#~ "Phamm supports any web server that PHP does, but this automatic "
+#~ "configuration process only supports Apache."
+#~ msgstr ""
+#~ "Phamm può funzionare con tutti i server web che supportano PHP ma la "
+#~ "configurazione automatica tiene conto solo di Apache."
+
+#~ msgid "Restart the webserver(s)?"
+#~ msgstr "Riavviare i server web?"
+
+#~ msgid "In order to apply the changes, the webserver(s) must be restarted."
+#~ msgstr ""
+#~ "Per rendere effettive le modifiche, il server web deve essere riavviato."
+
 #~ msgid "Restart the LDAP server?"
 #~ msgstr "Rivviare il server LDAP?"
 
diff -Nru phamm-0.6.2/debian/po/ja.po phamm-0.6.2/debian/po/ja.po
--- phamm-0.6.2/debian/po/ja.po	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/ja.po	2014-11-14 16:58:42.000000000 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: phamm 0.5.15-1\n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: 2009-11-06 06:26+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henr...@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japan...@lists.debian.org>\n"
@@ -68,34 +68,6 @@
 "ベース認証を使う場合は、これがデフォルトのログイン DN になります。空のままに"
 "しておいた場合は、デフォルトのログイン DN の作成を行いません。"
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr "自動的に再設定するウェブサーバ:"
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-"Phamm は PHP が動作するウェブサーバであればサポートしますが、この自動設定は "
-"Apache のみをサポートしています。"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr "ウェブサーバを再起動しますか?"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr "変更を反映するにはウェブサーバを再起動する必要があります。"
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
@@ -131,6 +103,22 @@
 "限定された権限を付与するのに便利な「phamm user」のパスワードを入力してくださ"
 "い。"
 
+#~ msgid "Web server to reconfigure automatically:"
+#~ msgstr "自動的に再設定するウェブサーバ:"
+
+#~ msgid ""
+#~ "Phamm supports any web server that PHP does, but this automatic "
+#~ "configuration process only supports Apache."
+#~ msgstr ""
+#~ "Phamm は PHP が動作するウェブサーバであればサポートしますが、この自動設定"
+#~ "は Apache のみをサポートしています。"
+
+#~ msgid "Restart the webserver(s)?"
+#~ msgstr "ウェブサーバを再起動しますか?"
+
+#~ msgid "In order to apply the changes, the webserver(s) must be restarted."
+#~ msgstr "変更を反映するにはウェブサーバを再起動する必要があります。"
+
 #~ msgid "Restart the LDAP server?"
 #~ msgstr "LDAP サーバを再起動しますか?"
 
diff -Nru phamm-0.6.2/debian/po/nb.po phamm-0.6.2/debian/po/nb.po
--- phamm-0.6.2/debian/po/nb.po	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/nb.po	2014-11-14 16:58:42.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: templates.pot_[E2rD1b]\n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: 2008-01-27 12:27+0100\n"
 "Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n"
@@ -71,35 +71,6 @@
 "login DN. I dette tilfelle kan det ikke lages et standard login DN hvis "
 "denne feltet står tomt."
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr "Nett-tjener som skal få oppsettet oppdatert automatisk:"
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-"Phamm støtter alle nett-tjenere som PHP støtter, men denne automatiske "
-"oppsettsprosessen støtter bare Apache."
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr "Skal nett-tjeneren/tjenerne startes på nyt?"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr ""
-"For at endringene skal få virkning må nett-tjeneren/tjenerne startes på nytt."
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
@@ -138,6 +109,24 @@
 "privileges."
 msgstr "Oppgi passordet som vil bli brukt til å logge inn på LDAP-tjeneren."
 
+#~ msgid "Web server to reconfigure automatically:"
+#~ msgstr "Nett-tjener som skal få oppsettet oppdatert automatisk:"
+
+#~ msgid ""
+#~ "Phamm supports any web server that PHP does, but this automatic "
+#~ "configuration process only supports Apache."
+#~ msgstr ""
+#~ "Phamm støtter alle nett-tjenere som PHP støtter, men denne automatiske "
+#~ "oppsettsprosessen støtter bare Apache."
+
+#~ msgid "Restart the webserver(s)?"
+#~ msgstr "Skal nett-tjeneren/tjenerne startes på nyt?"
+
+#~ msgid "In order to apply the changes, the webserver(s) must be restarted."
+#~ msgstr ""
+#~ "For at endringene skal få virkning må nett-tjeneren/tjenerne startes på "
+#~ "nytt."
+
 #, fuzzy
 #~| msgid "Restart the webserver(s)?"
 #~ msgid "Restart the LDAP server?"
diff -Nru phamm-0.6.2/debian/po/nl.po phamm-0.6.2/debian/po/nl.po
--- phamm-0.6.2/debian/po/nl.po	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/nl.po	2014-11-14 16:58:42.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: phamm\n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: 2008-01-30 18:04+0100\n"
 "Last-Translator: Bart Cornelis <cob...@skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-du...@lists.debian.org>\n"
@@ -71,35 +71,6 @@
 "de standaard aanmeld-DN. Dit veld blanco laten zorgt er dan voor dat er geen "
 "standaard aanmeld-DN aangemaakt wordt."
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr "Automatisch te herconfigureren webserver:"
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-"Phamm ondersteunt elke webserver die PHP aan kan. Dit automatische "
-"configuratieproces daarentegen ondersteunt enkel Apache."
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr "Wilt u de webserver(s) herstarten?"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr ""
-"Om de aanpassingen door te voeren dienen de webservers herstart te worden."
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
@@ -142,6 +113,23 @@
 "Wat is het wachtwoord dat gebruikt zal worden om aan te melden bij de LDAP-"
 "server?"
 
+#~ msgid "Web server to reconfigure automatically:"
+#~ msgstr "Automatisch te herconfigureren webserver:"
+
+#~ msgid ""
+#~ "Phamm supports any web server that PHP does, but this automatic "
+#~ "configuration process only supports Apache."
+#~ msgstr ""
+#~ "Phamm ondersteunt elke webserver die PHP aan kan. Dit automatische "
+#~ "configuratieproces daarentegen ondersteunt enkel Apache."
+
+#~ msgid "Restart the webserver(s)?"
+#~ msgstr "Wilt u de webserver(s) herstarten?"
+
+#~ msgid "In order to apply the changes, the webserver(s) must be restarted."
+#~ msgstr ""
+#~ "Om de aanpassingen door te voeren dienen de webservers herstart te worden."
+
 #, fuzzy
 #~| msgid "Restart the webserver(s)?"
 #~ msgid "Restart the LDAP server?"
diff -Nru phamm-0.6.2/debian/po/pt.po phamm-0.6.2/debian/po/pt.po
--- phamm-0.6.2/debian/po/pt.po	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/pt.po	2014-11-14 16:58:42.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: phamm 0.5.12-2\n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: 2008-07-26 15:02+0100\n"
 "Last-Translator: Américo Monteiro <a_monte...@netcabo.pt>\n"
 "Language-Team: Portuguese <tra...@debianpt.org>\n"
@@ -71,36 +71,6 @@
 "formulários este será o login DN prédefinido. Neste caso, deixando-o vazio, "
 "irá prevenir a criação dum login DN prédefinido."
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr "Servidor Web a reconfigurar automaticamente:"
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-"O Phamm suporta qualquer servidor Web que o PHP suporte, mas este processo "
-"de configuração automático apenas suporta o Apache."
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr "Reiniciar o(s) servidor(es) Web?"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr ""
-"Para se aplicar as alterações, o(s) servidor(es) Web precisam ser "
-"reiniciados."
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
@@ -138,6 +108,24 @@
 "Por favor indique a palavra-chave para o \"utilizador de phamm\", útil para "
 "ligações com privilégios limitados."
 
+#~ msgid "Web server to reconfigure automatically:"
+#~ msgstr "Servidor Web a reconfigurar automaticamente:"
+
+#~ msgid ""
+#~ "Phamm supports any web server that PHP does, but this automatic "
+#~ "configuration process only supports Apache."
+#~ msgstr ""
+#~ "O Phamm suporta qualquer servidor Web que o PHP suporte, mas este "
+#~ "processo de configuração automático apenas suporta o Apache."
+
+#~ msgid "Restart the webserver(s)?"
+#~ msgstr "Reiniciar o(s) servidor(es) Web?"
+
+#~ msgid "In order to apply the changes, the webserver(s) must be restarted."
+#~ msgstr ""
+#~ "Para se aplicar as alterações, o(s) servidor(es) Web precisam ser "
+#~ "reiniciados."
+
 #~| msgid "Restart the webserver(s)?"
 #~ msgid "Restart the LDAP server?"
 #~ msgstr "Reiniciar o servidor LDAP?"
diff -Nru phamm-0.6.2/debian/po/ru.po phamm-0.6.2/debian/po/ru.po
--- phamm-0.6.2/debian/po/ru.po	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/ru.po	2014-11-14 16:58:42.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: 2008-08-27 21:25+0400\n"
 "Last-Translator: Yuri Kozlov <kozlo...@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russ...@lists.debian.org>\n"
@@ -73,34 +73,6 @@
 "на форме, то это будет учётная запись DN для входа по умолчанию. Если "
 "оставить поле пустым, то учётная запись DN по умолчанию создана не будет."
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr "Веб-сервер для автоматической перенастройки:"
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-"Phamm работает на любом веб-сервере, поддерживающем PHP, но автоматическая "
-"настройка возможна только для Apache."
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr "Перезапустить веб-сервер(ы)?"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr "Чтобы активировать изменения, необходимо перезапустить веб-сервер(ы)."
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
@@ -136,6 +108,23 @@
 "Введите пароль для \"пользователя phamm\", который будет использован для "
 "входа на сервер LDAP."
 
+#~ msgid "Web server to reconfigure automatically:"
+#~ msgstr "Веб-сервер для автоматической перенастройки:"
+
+#~ msgid ""
+#~ "Phamm supports any web server that PHP does, but this automatic "
+#~ "configuration process only supports Apache."
+#~ msgstr ""
+#~ "Phamm работает на любом веб-сервере, поддерживающем PHP, но "
+#~ "автоматическая настройка возможна только для Apache."
+
+#~ msgid "Restart the webserver(s)?"
+#~ msgstr "Перезапустить веб-сервер(ы)?"
+
+#~ msgid "In order to apply the changes, the webserver(s) must be restarted."
+#~ msgstr ""
+#~ "Чтобы активировать изменения, необходимо перезапустить веб-сервер(ы)."
+
 #~ msgid "Restart the LDAP server?"
 #~ msgstr "Перезапустить сервер LDAP?"
 
diff -Nru phamm-0.6.2/debian/po/sv.po phamm-0.6.2/debian/po/sv.po
--- phamm-0.6.2/debian/po/sv.po	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/sv.po	2014-11-14 16:58:42.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: phamm_0.5.9-2_templates\n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: 2008-07-27 23:17+0100\n"
 "Last-Translator: Martin Bagge <brot...@bsnet.se>\n"
 "Language-Team: swedish <debian-l10n-swed...@lists.debian.org>\n"
@@ -74,35 +74,6 @@
 "inloggning. I sådana fall bör du lämna fältet tomt för att förhindra "
 "skapandet av ett standard DN för inloggning."
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr "Webbserver att ställa in automatiskt:"
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-"Phamm stödjer alla webbservrar som PHP stödjer men kan bara ställa in Apache "
-"automatiskt."
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr "Starta om webserver/-rar"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr ""
-"För att ändringarna ska träda i kraft måste webbservern/-rarna startas om."
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
@@ -138,6 +109,23 @@
 "Ange lösenordet som \"phamm-användaren\" ska använda för att logga in i LDAP-"
 "servern med begränsade rättigheter."
 
+#~ msgid "Web server to reconfigure automatically:"
+#~ msgstr "Webbserver att ställa in automatiskt:"
+
+#~ msgid ""
+#~ "Phamm supports any web server that PHP does, but this automatic "
+#~ "configuration process only supports Apache."
+#~ msgstr ""
+#~ "Phamm stödjer alla webbservrar som PHP stödjer men kan bara ställa in "
+#~ "Apache automatiskt."
+
+#~ msgid "Restart the webserver(s)?"
+#~ msgstr "Starta om webserver/-rar"
+
+#~ msgid "In order to apply the changes, the webserver(s) must be restarted."
+#~ msgstr ""
+#~ "För att ändringarna ska träda i kraft måste webbservern/-rarna startas om."
+
 #~| msgid "Restart the webserver(s)?"
 #~ msgid "Restart the LDAP server?"
 #~ msgstr "Starta om LDAP-server?"
diff -Nru phamm-0.6.2/debian/po/templates.pot phamm-0.6.2/debian/po/templates.pot
--- phamm-0.6.2/debian/po/templates.pot	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/templates.pot	2014-11-14 16:58:42.000000000 +0100
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: phamm\n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <l...@li.org>\n"
@@ -62,32 +62,6 @@
 "a default login DN."
 msgstr ""
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr ""
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr ""
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
diff -Nru phamm-0.6.2/debian/po/vi.po phamm-0.6.2/debian/po/vi.po
--- phamm-0.6.2/debian/po/vi.po	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/vi.po	2014-11-14 16:58:42.000000000 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: phamm 0.5.12-3.1\n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: 2009-01-28 20:59+1030\n"
 "Last-Translator: Clytie Siddall <cly...@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi...@googlegroups.com>\n"
@@ -71,35 +71,6 @@
 "DN đăng nhập mặc định. Trong trường hợp này, đơn giản bỏ trống trường này sẽ "
 "ngăn cản tạo một DN đăng nhập mặc định."
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr "Trình phục vụ Web cần tự động cấu hình lại:"
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-"Phamm hỗ trợ bất cứ trình phục vụ nào cũng được PHP hỗ trợ. Tuy nhiên, tiến "
-"trình tự động cấu hình này chỉ hỗ trợ Apache."
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr "Khởi chạy lại (các) trình phục vụ Web không?"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr ""
-"Để áp dụng các thay đổi, (các) trình phục vụ Web cần phải được khởi chạy."
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
@@ -135,6 +106,23 @@
 "Hãy nhập mật khẩu cho « phamm user » hữu ích để đóng kết với quyền truy cập "
 "bị hạn chế."
 
+#~ msgid "Web server to reconfigure automatically:"
+#~ msgstr "Trình phục vụ Web cần tự động cấu hình lại:"
+
+#~ msgid ""
+#~ "Phamm supports any web server that PHP does, but this automatic "
+#~ "configuration process only supports Apache."
+#~ msgstr ""
+#~ "Phamm hỗ trợ bất cứ trình phục vụ nào cũng được PHP hỗ trợ. Tuy nhiên, "
+#~ "tiến trình tự động cấu hình này chỉ hỗ trợ Apache."
+
+#~ msgid "Restart the webserver(s)?"
+#~ msgstr "Khởi chạy lại (các) trình phục vụ Web không?"
+
+#~ msgid "In order to apply the changes, the webserver(s) must be restarted."
+#~ msgstr ""
+#~ "Để áp dụng các thay đổi, (các) trình phục vụ Web cần phải được khởi chạy."
+
 #~| msgid "Restart the webserver(s)?"
 #~ msgid "Restart the LDAP server?"
 #~ msgstr "Khởi chạy lại trình phục vụ LDAP ?"
diff -Nru phamm-0.6.2/debian/po/zh_TW.po phamm-0.6.2/debian/po/zh_TW.po
--- phamm-0.6.2/debian/po/zh_TW.po	2010-11-14 10:30:02.000000000 +0100
+++ phamm-0.6.2/debian/po/zh_TW.po	2014-11-14 16:58:42.000000000 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 0.5.12-3\n"
 "Report-Msgid-Bugs-To: ph...@packages.debian.org\n"
-"POT-Creation-Date: 2010-11-14 10:30+0100\n"
+"POT-Creation-Date: 2014-11-14 16:58+0100\n"
 "PO-Revision-Date: 2008-11-03 10:51+0800\n"
 "Last-Translator: Kanru Chen <kos...@debian.org.tw>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -66,34 +66,6 @@
 "請輸入登入 LDAP 伺服器用的辨識名稱 (DN)。如果您使用表單認證的話，這將會是預設"
 "的登入 DN。若留下空白則不會產生預設的登入用 DN。"
 
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid "Web server to reconfigure automatically:"
-msgstr "要自動重新設定的網頁伺服器："
-
-#. Type: multiselect
-#. Description
-#: ../phamm.templates:5001
-msgid ""
-"Phamm supports any web server that PHP does, but this automatic "
-"configuration process only supports Apache."
-msgstr ""
-"Phamm 支持任何 PHP 支持的網頁伺服器，但是這個自動重新設定的步驟只支持 "
-"Apache。"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "Restart the webserver(s)?"
-msgstr "重新啟動網頁伺服器嗎？"
-
-#. Type: boolean
-#. Description
-#: ../phamm.templates:6001
-msgid "In order to apply the changes, the webserver(s) must be restarted."
-msgstr "為了使改變生效，必須重新啟動網頁伺服器。"
-
 #. Type: boolean
 #. Description
 #: ../phamm-ldap.templates:2001
@@ -127,6 +99,22 @@
 "privileges."
 msgstr "請輸入供 \"phamm user\" 用來以受限的權限登入 LDAP 伺服器用的密碼。"
 
+#~ msgid "Web server to reconfigure automatically:"
+#~ msgstr "要自動重新設定的網頁伺服器："
+
+#~ msgid ""
+#~ "Phamm supports any web server that PHP does, but this automatic "
+#~ "configuration process only supports Apache."
+#~ msgstr ""
+#~ "Phamm 支持任何 PHP 支持的網頁伺服器，但是這個自動重新設定的步驟只支持 "
+#~ "Apache。"
+
+#~ msgid "Restart the webserver(s)?"
+#~ msgstr "重新啟動網頁伺服器嗎？"
+
+#~ msgid "In order to apply the changes, the webserver(s) must be restarted."
+#~ msgstr "為了使改變生效，必須重新啟動網頁伺服器。"
+
 #~ msgid "Restart the LDAP server?"
 #~ msgstr "重新啟動 LDAP 伺服器嗎？"
 
diff -Nru phamm-0.6.2/debian/rules phamm-0.6.2/debian/rules
--- phamm-0.6.2/debian/rules	2010-04-13 09:12:22.000000000 +0200
+++ phamm-0.6.2/debian/rules	2014-11-14 16:32:01.000000000 +0100
@@ -67,8 +67,8 @@
 	dh_installlogrotate
 	dh_compress
 	dh_install
+	dh_apache2
 	dh_fixperms
-	dh_install -pphamm debian/conf/apache.conf /etc/phamm/
 	dh_link -pphamm /etc/phamm/plugins /usr/share/phamm/plugins
 	dh_link -pphamm /usr/share/doc/phamm /usr/share/phamm/doc
 	dh_installdebconf

signature.asc
Description: OpenPGP digital signature

--- End Message ---

--- Begin Message ---

Hi,

On Thu, Dec 04, 2014 at 03:22:03PM +0000, Jean-Michel Nirgal Vourgère wrote:
> unblock phamm/0.6.2-1.2

Unblocked.

Cheers,

Ivo

--- End Message ---