Bug#771908: unblock: phamm/0.6.2-1.1

To: Debian Bug Tracking System <submit@bugs.debian.org>
Cc: Eriberto <eriberto@eriberto.pro.br>, Fabio Tranchitella <fabio@tranchitella.eu>
Subject: Bug#771908: unblock: phamm/0.6.2-1.1
From: Jean-Michel Nirgal Vourgère <jmv_deb@nirgal.com>
Date: Wed, 03 Dec 2014 11:54:19 +0000
Message-id: <[🔎] 547EF9EB.3090509@nirgal.com>
Reply-to: Jean-Michel Nirgal Vourgère <jmv_deb@nirgal.com>, 771908@bugs.debian.org

Package: release.debian.org
User: release.debian.org@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_deb@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 root@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 root@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 <team@phamm.org>
 Uploaders: Alessandro De Zorzi <lota@nonlontano.it>, Mirko Grava <ops@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: phamm@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 <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@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: phamm@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.quathamer@gmx.net>\n"
 "Language-Team: German <debian-l10n-german@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: phamm@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 <fcocuadrado@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@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: phamm@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 <dooteo@euskalgnu.org>\n"
 "Language-Team: Euskara <debian-l10n-basque@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: phamm@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 <edu@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@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: phamm@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 <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@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: phamm@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 <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@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: phamm@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 <lota@nonlontano.it>\n"
 "Language-Team: Italia <team@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: phamm@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) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@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: phamm@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 <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian BokmÃ¥l <i18n-nb@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: phamm@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 <cobaco@skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@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: phamm@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_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@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: phamm@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 <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@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: phamm@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 <brother@bsnet.se>\n"
 "Language-Team: swedish <debian-l10n-swedish@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: phamm@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 <LL@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: phamm@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 <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@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: phamm@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 <koster@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

Attachment: signature.asc
Description: OpenPGP digital signature

Reply to:

Follow-Ups:
- Bug#771908: unblock: phamm/0.6.2-1.1
  - From: Jonathan Wiltshire <jmw@debian.org>
- Processed: Re: Bug#771908: unblock: phamm/0.6.2-1.1
  - From: owner@bugs.debian.org (Debian Bug Tracking System)
- Processed: Re: Bug#771908: unblock: phamm/0.6.2-1.1
  - From: owner@bugs.debian.org (Debian Bug Tracking System)
- Processed: Re: Bug#771908: unblock: phamm/0.6.2-1.1
  - From: owner@bugs.debian.org (Debian Bug Tracking System)
- Processed: unblock: phamm/0.6.2-1.2
  - From: owner@bugs.debian.org (Debian Bug Tracking System)
- Bug#771908: marked as done (unblock: phamm/0.6.2-1.2)
  - From: owner@bugs.debian.org (Debian Bug Tracking System)

Prev by Date: Bug#771905: unblock: grub2/2.02~beta2-17
Next by Date: Bug#771909: unblock: yowsup/0.0~git20140314.938cf1-3
Previous by thread: Bug#771905: marked as done (unblock: grub2/2.02~beta2-17)
Next by thread: Bug#771908: unblock: phamm/0.6.2-1.1
Index(es):
- Date
- Thread