[SCM] proftpd-dfsg branch, master, updated. debian/1.3.3a-6-8-g91c168e

Thu Feb 10 09:13:43 UTC 2011

The following commit has been merged in the master branch:
commit 91c168e9584c6d9377308d6a94ff766fa47cf9b2
Author: Francesco P. Lovergine <frankie at debian.org>
Date:   Thu Feb 10 10:11:05 2011 +0100

    Changed ProFTPd in ProFTPD string all around.
    
    This is the official name of the program since a long time.

diff --git a/debian/README.source b/debian/README.source
index 6bb1a02..57b2aaf 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -3,8 +3,8 @@ ProFTPD source for Debian
 
 This source is created by pre-stripping RFC documents generally
 included in upstream tarballs. A good set of functional fixes
-taken from upstream CVS are also included by means of dpatch (see
-/usr/share/doc/dpatch/README.source.gz for details about the
+taken from upstream CVS are also included by means of quilt (see
+/usr/share/doc/quilt/README.gz for details about the
 program). Debian patches are named after the related bug ID on
 bugzilla.proftpd.org, in order to simplify checking of merged changes at
 every new upstream release: by comparing changelog.Debian and upstream
@@ -13,5 +13,5 @@ NEWS files superfluous patches are easily found.
 Note that since 1.3.2, upstream CVS has a proper stable branch which 
 should be followed instead of HEAD for useful fixes.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 01 Sep 2009 22:45:56 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu Feb 10 09:52:47 CET 2011
 
diff --git a/debian/changelog b/debian/changelog
index 78c0676..c7d0aab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,12 @@ proftpd-dfsg (1.3.3d-2) unstable; urgency=low
   * Added Vcs-* fields for the new pkg-proftpd alioth project.
   * Now using pkg-proftpd developers list as Maintainer field and
     added me as an Uploader.
+  * Updated README.source to reflect changes to maintainance.
+  * Changed long description in debian/control* to be more smart and up-to-date.
+  * Changed ProFTPd string occurrences in ProFTPD in all templates, as it is the 
+    official program name since a long time.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 09 Feb 2011 15:02:07 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 10 Feb 2011 10:06:55 +0100
 
 proftpd-dfsg (1.3.3d-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 22be4d2..aad62aa 100644
--- a/debian/control
+++ b/debian/control
@@ -20,10 +20,10 @@ Replaces: proftpd (<< 1.3.2)
 Provides: ftp-server, proftpd, proftpd-abi-1.3.3d
 Suggests: proftpd-doc, openssl, proftpd-mod-mysql, proftpd-mod-pgsql, proftpd-mod-ldap, proftpd-mod-odbc, proftpd-mod-sqlite, openbsd-inetd | inet-superserver
 Description: Versatile, virtual-hosting FTP daemon - binaries
- ProFTPd is a powerful replacement for wu-ftpd. This File Transfer Protocol
- daemon supports hidden directories, virtual hosts, and per-directory
- ".ftpaccess" files. It uses a single main configuration file, with a
- syntax similar to Apache.
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
  .
  Because of the advanced design, anonymous-FTP directories can have
  an arbitrary internal structure (bin, lib, etc, and special files are
@@ -39,10 +39,10 @@ Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libtool
 Suggests: pkg-config
 Description: Versatile, virtual-hosting FTP daemon - development files
- ProFTPd is a powerful replacement for wu-ftpd. This File Transfer Protocol
- daemon supports hidden directories, virtual hosts, and per-directory
- ".ftpaccess" files. It uses a single main configuration file, with a
- syntax similar to Apache.
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
  .
  Because of the advanced design, anonymous-FTP directories can have
  an arbitrary internal structure (bin, lib, etc, and special files are
@@ -58,10 +58,10 @@ Suggests: proftpd-basic
 Section: doc
 Depends: ${misc:Depends}
 Description: Versatile, virtual-hosting FTP daemon - documentation
- ProFTPd is a powerful replacement for wu-ftpd. This File Transfer Protocol
- daemon supports hidden directories, virtual hosts, and per-directory
- ".ftpaccess" files. It uses a single main configuration file, with a
- syntax similar to Apache.
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
  .
  Because of the advanced design, anonymous-FTP directories can have
  an arbitrary internal structure (bin, lib, etc, and special files are
@@ -75,10 +75,10 @@ Package: proftpd-mod-mysql
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Versatile, virtual-hosting FTP daemon - MySQL module
- ProFTPd is a powerful replacement for wu-ftpd. This File Transfer Protocol
- daemon supports hidden directories, virtual hosts, and per-directory
- ".ftpaccess" files. It uses a single main configuration file, with a
- syntax similar to Apache.
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
  .
  Because of the advanced design, anonymous-FTP directories can have
  an arbitrary internal structure (bin, lib, etc, and special files are
@@ -91,10 +91,10 @@ Package: proftpd-mod-pgsql
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Versatile, virtual-hosting FTP daemon - PostgreSQL module
- ProFTPd is a powerful replacement for wu-ftpd. This File Transfer Protocol
- daemon supports hidden directories, virtual hosts, and per-directory
- ".ftpaccess" files. It uses a single main configuration file, with a
- syntax similar to Apache.
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
  .
  Because of the advanced design, anonymous-FTP directories can have
  an arbitrary internal structure (bin, lib, etc, and special files are
@@ -107,10 +107,10 @@ Package: proftpd-mod-ldap
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Versatile, virtual-hosting FTP daemon - LDAP module
- ProFTPd is a powerful replacement for wu-ftpd. This File Transfer Protocol
- daemon supports hidden directories, virtual hosts, and per-directory
- ".ftpaccess" files. It uses a single main configuration file, with a
- syntax similar to Apache.
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
  .
  Because of the advanced design, anonymous-FTP directories can have
  an arbitrary internal structure (bin, lib, etc, and special files are
@@ -123,10 +123,10 @@ Package: proftpd-mod-odbc
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Versatile, virtual-hosting FTP daemon - ODBC module
- ProFTPd is a powerful replacement for wu-ftpd. This File Transfer Protocol
- daemon supports hidden directories, virtual hosts, and per-directory
- ".ftpaccess" files. It uses a single main configuration file, with a
- syntax similar to Apache.
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
  .
  Because of the advanced design, anonymous-FTP directories can have
  an arbitrary internal structure (bin, lib, etc, and special files are
@@ -139,10 +139,10 @@ Package: proftpd-mod-sqlite
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Versatile, virtual-hosting FTP daemon - SQLite3 module
- ProFTPd is a powerful replacement for wu-ftpd. This File Transfer Protocol
- daemon supports hidden directories, virtual hosts, and per-directory
- ".ftpaccess" files. It uses a single main configuration file, with a
- syntax similar to Apache.
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
  .
  Because of the advanced design, anonymous-FTP directories can have
  an arbitrary internal structure (bin, lib, etc, and special files are
diff --git a/debian/control.in b/debian/control.in
index ee68c0c..4e952c4 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -20,10 +20,10 @@ Replaces: proftpd (<< 1.3.2)
 Provides: ftp-server, proftpd, proftpd-abi- at VERSION@
 Suggests: proftpd-doc, openssl, proftpd-mod-mysql, proftpd-mod-pgsql, proftpd-mod-ldap, proftpd-mod-odbc, proftpd-mod-sqlite, openbsd-inetd | inet-superserver
 Description: Versatile, virtual-hosting FTP daemon - binaries
- ProFTPd is a powerful replacement for wu-ftpd. This File Transfer Protocol
- daemon supports hidden directories, virtual hosts, and per-directory
- ".ftpaccess" files. It uses a single main configuration file, with a
- syntax similar to Apache.
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
  .
  Because of the advanced design, anonymous-FTP directories can have
  an arbitrary internal structure (bin, lib, etc, and special files are
@@ -39,10 +39,10 @@ Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libtool
 Suggests: pkg-config
 Description: Versatile, virtual-hosting FTP daemon - development files
- ProFTPd is a powerful replacement for wu-ftpd. This File Transfer Protocol
- daemon supports hidden directories, virtual hosts, and per-directory
- ".ftpaccess" files. It uses a single main configuration file, with a
- syntax similar to Apache.
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
  .
  Because of the advanced design, anonymous-FTP directories can have
  an arbitrary internal structure (bin, lib, etc, and special files are
@@ -58,10 +58,10 @@ Suggests: proftpd-basic
 Section: doc
 Depends: ${misc:Depends}
 Description: Versatile, virtual-hosting FTP daemon - documentation
- ProFTPd is a powerful replacement for wu-ftpd. This File Transfer Protocol
- daemon supports hidden directories, virtual hosts, and per-directory
- ".ftpaccess" files. It uses a single main configuration file, with a
- syntax similar to Apache.
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
  .
  Because of the advanced design, anonymous-FTP directories can have
  an arbitrary internal structure (bin, lib, etc, and special files are
@@ -75,10 +75,10 @@ Package: proftpd-mod-mysql
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Versatile, virtual-hosting FTP daemon - MySQL module
- ProFTPd is a powerful replacement for wu-ftpd. This File Transfer Protocol
- daemon supports hidden directories, virtual hosts, and per-directory
- ".ftpaccess" files. It uses a single main configuration file, with a
- syntax similar to Apache.
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
  .
  Because of the advanced design, anonymous-FTP directories can have
  an arbitrary internal structure (bin, lib, etc, and special files are
@@ -91,10 +91,10 @@ Package: proftpd-mod-pgsql
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Versatile, virtual-hosting FTP daemon - PostgreSQL module
- ProFTPd is a powerful replacement for wu-ftpd. This File Transfer Protocol
- daemon supports hidden directories, virtual hosts, and per-directory
- ".ftpaccess" files. It uses a single main configuration file, with a
- syntax similar to Apache.
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
  .
  Because of the advanced design, anonymous-FTP directories can have
  an arbitrary internal structure (bin, lib, etc, and special files are
@@ -107,10 +107,10 @@ Package: proftpd-mod-ldap
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Versatile, virtual-hosting FTP daemon - LDAP module
- ProFTPd is a powerful replacement for wu-ftpd. This File Transfer Protocol
- daemon supports hidden directories, virtual hosts, and per-directory
- ".ftpaccess" files. It uses a single main configuration file, with a
- syntax similar to Apache.
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
  .
  Because of the advanced design, anonymous-FTP directories can have
  an arbitrary internal structure (bin, lib, etc, and special files are
@@ -123,10 +123,10 @@ Package: proftpd-mod-odbc
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Versatile, virtual-hosting FTP daemon - ODBC module
- ProFTPd is a powerful replacement for wu-ftpd. This File Transfer Protocol
- daemon supports hidden directories, virtual hosts, and per-directory
- ".ftpaccess" files. It uses a single main configuration file, with a
- syntax similar to Apache.
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
  .
  Because of the advanced design, anonymous-FTP directories can have
  an arbitrary internal structure (bin, lib, etc, and special files are
@@ -139,10 +139,10 @@ Package: proftpd-mod-sqlite
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Versatile, virtual-hosting FTP daemon - SQLite3 module
- ProFTPd is a powerful replacement for wu-ftpd. This File Transfer Protocol
- daemon supports hidden directories, virtual hosts, and per-directory
- ".ftpaccess" files. It uses a single main configuration file, with a
- syntax similar to Apache.
+ ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
+ Protocol daemon supports also hidden directories, virtual hosts, and
+ per-directory ".ftpaccess" files. It uses a single main configuration
+ file, with a syntax similar to Apache.
  .
  Because of the advanced design, anonymous-FTP directories can have
  an arbitrary internal structure (bin, lib, etc, and special files are
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 9953d65..c0a29ab 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -19,6 +19,7 @@ msgstr ""
 "PO-Revision-Date: 2008-01-02 22:30+0100\n"
 "Last-Translator: Jan Outrata <outrataj at upcase.inf.upol.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,28 +45,34 @@ msgstr "SpouÅ¡tÄ›t proftpd:"
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
+#, fuzzy
+#| msgid ""
+#| "ProFTPD can be run either as a service from inetd, or as a standalone "
+#| "server. Each choice has its own benefits. With only a few FTP connections "
+#| "per day, it is probably better to run ProFTPD from inetd in order to save "
+#| "resources."
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd mÅ¯Å¾e bÄ›Å¾et buÄ jako sluÅ¾ba z inetd, nebo jako samostatnÃ½ server. ObÄ› "
+"ProFTPD mÅ¯Å¾e bÄ›Å¾et buÄ jako sluÅ¾ba z inetd, nebo jako samostatnÃ½ server. ObÄ› "
 "moÅ¾nosti majÃ svoje vÃ½hody. PÅ™i nÄ›kolika ftp spojenÃch za den je lepÅ¡Ã "
-"spouÅ¡tÄ›t ProFTPd z inetd, aby Å¡etÅ™il zdroje."
+"spouÅ¡tÄ›t ProFTPD z inetd, aby Å¡etÅ™il zdroje."
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
-"Naopak pÅ™i vÄ›tÅ¡Ãm provozu by mÄ›l ProFTPd bÄ›Å¾et jako samostatnÃ¡ sluÅ¾ba, aby "
+"Naopak pÅ™i vÄ›tÅ¡Ãm provozu by mÄ›l ProFTPD bÄ›Å¾et jako samostatnÃ¡ sluÅ¾ba, aby "
 "nemusel pÅ™i kaÅ¾dÃ©m pÅ™ÃchozÃm spojenÃ spouÅ¡tÄ›t novÃ½ proces."
 
-#~ msgid "Warning on syntax changes in ProFTPd configuration."
-#~ msgstr "UpozornÄ›nÃ na zmÄ›ny syntaxe v konfiguraci ProFTPd."
+#~ msgid "Warning on syntax changes in ProFTPD configuration."
+#~ msgstr "UpozornÄ›nÃ na zmÄ›ny syntaxe v konfiguraci ProFTPD."
 
 #~ msgid ""
 #~ "You are upgrading from a pre-1.3.0 version. Probably you will need to "
@@ -81,11 +88,11 @@ msgstr ""
 #~ msgid ""
 #~ "Unfortunately, it is nearly impossible currently to convert your setup "
 #~ "automatically, but for some basic issues. You will have to do  it "
-#~ "yourself. ProFTPd could also be unable to use the resulting  "
+#~ "yourself. ProFTPD could also be unable to use the resulting  "
 #~ "configuration, and it would not restart after upgrading."
 #~ msgstr ""
 #~ "NaneÅ¡tÄ›stÃ je tÃ©mÄ›Å™ nemoÅ¾nÃ© pÅ™evÃ©st vaÅ¡e nastavenÃ, aÅ¾ na nÄ›jakÃ© zÃ¡kladnÃ "
-#~ "vÄ›ci, automaticky. Budete to muset udÄ›lat sami. ProFTPd takÃ© nemusÃ bÃ½t "
+#~ "vÄ›ci, automaticky. Budete to muset udÄ›lat sami. ProFTPD takÃ© nemusÃ bÃ½t "
 #~ "schopnÃ½ pouÅ¾Ãt vÃ½slednou konfiguraci a po aktualizaci by se znovu "
 #~ "nespustil."
 
diff --git a/debian/po/da.po b/debian/po/da.po
index 93b54d5..b568fe7 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -19,6 +19,7 @@ msgstr ""
 "PO-Revision-Date: 2004-10-13 18:53+0200\n"
 "Last-Translator: Morten Brix Pedersen <morten at wtf.dk>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,12 +49,12 @@ msgstr ""
 #: ../proftpd-basic.templates:2002
 #, fuzzy
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd kan kÃ¸re enten som en service fra inetd, eller som en alenestÃ¥ende "
+"ProFTPD kan kÃ¸re enten som en service fra inetd, eller som en alenestÃ¥ende "
 "server. Hvert valg har deres fordele. Hvis du kun har et par ftp "
 "forbindelser om dagen, kan det mÃ¥ske ikke vÃ¦re ressourcerne vÃ¦rd at have "
 "proftpd kÃ¸rende hele tiden."
@@ -62,12 +63,12 @@ msgstr ""
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
 
-#~ msgid "Warning on syntax changes in ProFTPd configuration."
-#~ msgstr "Advarsel om syntaksÃ¦ndringer i ProFTPd opsÃ¦tning."
+#~ msgid "Warning on syntax changes in ProFTPD configuration."
+#~ msgstr "Advarsel om syntaksÃ¦ndringer i ProFTPD opsÃ¦tning."
 
 #, fuzzy
 #~ msgid ""
@@ -85,11 +86,11 @@ msgstr ""
 #~ msgid ""
 #~ "Unfortunately, it is nearly impossible currently to convert your setup "
 #~ "automatically, but for some basic issues. You will have to do  it "
-#~ "yourself. ProFTPd could also be unable to use the resulting  "
+#~ "yourself. ProFTPD could also be unable to use the resulting  "
 #~ "configuration, and it would not restart after upgrading."
 #~ msgstr ""
 #~ "DesvÃ¦rre er det nÃ¦sten umuligt for mig at konvertere hele din opsÃ¦tning "
-#~ "automatisk. Du skal gÃ¸re det selv. ProFTPd kan mÃ¥ske ikke bruge den "
+#~ "automatisk. Du skal gÃ¸re det selv. ProFTPD kan mÃ¥ske ikke bruge den "
 #~ "resulterede opsÃ¦tning, og vil ikke kunne starte efter opgraderingen."
 
 #~ msgid "Run proftpd from inetd or standalone?"
diff --git a/debian/po/de.po b/debian/po/de.po
index cf133b9..a7bcb08 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2007-12-19 19:14+0100\n"
 "Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,29 +39,29 @@ msgstr "Proftpd starten:"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd kann entweder als Dienst Ã¼ber Inetd oder als eigener Server "
+"ProFTPD kann entweder als Dienst Ã¼ber Inetd oder als eigener Server "
 "gestartet werden. Jede der beiden Startarten hat ihre Vorteile. Falls Sie "
 "nur wenige FTP-Verbindungen tÃ¤glich erwarten, dann ist es wahrscheinlich "
-"sinnvoller, ProFTPd mittels Inetd zu starten, um Ressourcen zu schonen."
+"sinnvoller, ProFTPD mittels Inetd zu starten, um Ressourcen zu schonen."
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
-"Andererseits sollte ProFTPd als eigener Server betrieben werden, falls Sie "
+"Andererseits sollte ProFTPD als eigener Server betrieben werden, falls Sie "
 "viel Verkehr erwarten, um das Starten neuer Prozesse fÃ¼r jede eingehende "
 "Verbindung zu vermeiden."
 
-#~ msgid "Warning on syntax changes in ProFTPd configuration."
-#~ msgstr "Warnung: Syntax-VerÃ¤nderungen der ProFTPd-Konfiguration."
+#~ msgid "Warning on syntax changes in ProFTPD configuration."
+#~ msgstr "Warnung: Syntax-VerÃ¤nderungen der ProFTPD-Konfiguration."
 
 #~ msgid ""
 #~ "You are upgrading from a pre-1.3.0 version. Probably you will need to "
@@ -77,12 +78,12 @@ msgstr ""
 #~ msgid ""
 #~ "Unfortunately, it is nearly impossible currently to convert your setup "
 #~ "automatically, but for some basic issues. You will have to do  it "
-#~ "yourself. ProFTPd could also be unable to use the resulting  "
+#~ "yourself. ProFTPD could also be unable to use the resulting  "
 #~ "configuration, and it would not restart after upgrading."
 #~ msgstr ""
 #~ "Leider ist es nahezu unmÃ¶glich, Ihre bisherige Konfiguration automatisch "
 #~ "zu konvertieren, abgesehen von ein paar elementaren Dingen. Sie werden es "
-#~ "selbst tun mÃ¼ssen. AuÃŸerdem kÃ¶nnte es sein, dass ProFTPd nicht in der "
+#~ "selbst tun mÃ¼ssen. AuÃŸerdem kÃ¶nnte es sein, dass ProFTPD nicht in der "
 #~ "Lage wÃ¤re, die aus der Konvertierung resultierende Konfiguration zu "
 #~ "nutzen, so dass es nach dem Upgrade nicht neu starten wÃ¼rde."
 
@@ -99,7 +100,7 @@ msgstr ""
 #~ "sollte von der Hauptkonfigurationsdatei eingebunden werden."
 
 #~ msgid "Run proftpd from inetd or standalone?"
-#~ msgstr "ProFTPd Ã¼ber Inetd oder als Daemon starten?"
+#~ msgstr "ProFTPD Ã¼ber Inetd oder als Daemon starten?"
 
 #~ msgid ""
 #~ "On the other hand, if your ftp site is visited frequently, you should "
diff --git a/debian/po/es.po b/debian/po/es.po
index ab56652..09502e8 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -29,6 +29,7 @@ msgstr ""
 "PO-Revision-Date: 2007-12-12 15:45+0100\n"
 "Last-Translator: Carlos Valdivia YagÃ¼e <valyag at dat.etsit.upm.es>\n"
 "Language-Team: Debian L10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -55,28 +56,28 @@ msgstr "Ejecutar proftpd:"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd puede ejecutarse como un servicio desde inetd o como un servidor "
+"ProFTPD puede ejecutarse como un servicio desde inetd o como un servidor "
 "independiente. Ambas opciones tienen sus ventajas. Si sÃ³lo recibe unas pocas "
-"conexiones FTP diarias, probablemente sea mejor ejecutar ProFTPd desde inetd "
+"conexiones FTP diarias, probablemente sea mejor ejecutar ProFTPD desde inetd "
 "para ahorrar recursos."
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
-"Por otro lado, con mÃ¡s trÃ¡fico, ProFTPd deberÃa ejecutarse como un servidor "
+"Por otro lado, con mÃ¡s trÃ¡fico, ProFTPD deberÃa ejecutarse como un servidor "
 "independiente para evitar crear un proceso nuevo por cada conexiÃ³n entrante."
 
-#~ msgid "Warning on syntax changes in ProFTPd configuration."
-#~ msgstr "Aviso de cambios de sintaxis en la configuraciÃ³n de ProFTPd."
+#~ msgid "Warning on syntax changes in ProFTPD configuration."
+#~ msgstr "Aviso de cambios de sintaxis en la configuraciÃ³n de ProFTPD."
 
 #~ msgid ""
 #~ "You are upgrading from a pre-1.3.0 version. Probably you will need to "
@@ -84,7 +85,7 @@ msgstr ""
 #~ "directives. Please, consult documentation and how-tos available in "
 #~ "proftpd-doc and change /etc/proftpd/proftpd.conf as needed."
 #~ msgstr ""
-#~ "EstÃ¡ actualizando desde una versiÃ³n de ProFTPd anterior a la 1.3.0. Es "
+#~ "EstÃ¡ actualizando desde una versiÃ³n de ProFTPD anterior a la 1.3.0. Es "
 #~ "muy posible que necesite revisar la configuraciÃ³n anterior para adecuarla "
 #~ "a las directivas actuales. Por favor, consulte la documentaciÃ³n "
 #~ "disponible en proftpd-doc y modifique apropiadamente /etc/proftpd.conf."
@@ -92,12 +93,12 @@ msgstr ""
 #~ msgid ""
 #~ "Unfortunately, it is nearly impossible currently to convert your setup "
 #~ "automatically, but for some basic issues. You will have to do  it "
-#~ "yourself. ProFTPd could also be unable to use the resulting  "
+#~ "yourself. ProFTPD could also be unable to use the resulting  "
 #~ "configuration, and it would not restart after upgrading."
 #~ msgstr ""
 #~ "Desgraciadamente, es casi imposible convertir su configuraciÃ³n de forma "
 #~ "automÃ¡tica, salvo algunas cuestiones elementales. TendrÃ¡ que hacerlo por "
-#~ "su cuenta. ProFTPd podrÃa tener problemas para usar la nueva "
+#~ "su cuenta. ProFTPD podrÃa tener problemas para usar la nueva "
 #~ "configuraciÃ³n y no arrancar despuÃ©s de actualizar."
 
 #~ msgid ""
@@ -106,7 +107,7 @@ msgstr ""
 #~ "within the new /etc/proftpd/modules.conf configuration file for future "
 #~ "hacks. That file should be included by the main configuration file."
 #~ msgstr ""
-#~ "Tenga en cuenta que a partir de la versiÃ³n 1.3.0, ProFTPd utiliza mÃ³dulos "
+#~ "Tenga en cuenta que a partir de la versiÃ³n 1.3.0, ProFTPD utiliza mÃ³dulos "
 #~ "dinÃ¡micos y la configuraciÃ³n se ha separado en dos, quedando las "
 #~ "instrucciones de carga de mÃ³dulos en el nuevo fichero de configuraciÃ³n /"
 #~ "etc/proftpd/modules.conf. Ese fichero deberÃa ser incluido por el fichero "
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 123a3e6..9feb0ff 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2007-12-19 10:17+0100\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <Librezale at librezale.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,28 +39,28 @@ msgstr "proftpd exekutatu:"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd inetd bidezko zerbitzu bat edo bakarkako zerbitzari bezala exekutatu "
+"ProFTPD inetd bidezko zerbitzu bat edo bakarkako zerbitzari bezala exekutatu "
 "daiteke, Aukera bakoitzak bere onurak ditu. Eguneko FTP konexio gutxi "
-"badituzu, hobe da ziurrenik ProFTPd inetd biez exekutatzea errekurtso "
+"badituzu, hobe da ziurrenik ProFTPD inetd biez exekutatzea errekurtso "
 "gutxiago erabiltzeko."
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
-"Beste aldetik, trafiko handi bat baduzu, ProFTPd bakarka exekutatu beharko "
+"Beste aldetik, trafiko handi bat baduzu, ProFTPD bakarka exekutatu beharko "
 "zenuke konexio bakoitzean ez prozesu berriak sortu ez daitezen."
 
-#~ msgid "Warning on syntax changes in ProFTPd configuration."
-#~ msgstr "Kontutan izan sintaxi aldaketak egon direla ProFTPd konfigruazioan."
+#~ msgid "Warning on syntax changes in ProFTPD configuration."
+#~ msgstr "Kontutan izan sintaxi aldaketak egon direla ProFTPD konfigruazioan."
 
 #~ msgid ""
 #~ "You are upgrading from a pre-1.3.0 version. Probably you will need to "
@@ -75,12 +76,12 @@ msgstr ""
 #~ msgid ""
 #~ "Unfortunately, it is nearly impossible currently to convert your setup "
 #~ "automatically, but for some basic issues. You will have to do  it "
-#~ "yourself. ProFTPd could also be unable to use the resulting  "
+#~ "yourself. ProFTPD could also be unable to use the resulting  "
 #~ "configuration, and it would not restart after upgrading."
 #~ msgstr ""
 #~ "Tamalez, nahiko zaila da zure konfigurazioa automatikoki eraldatzea, "
 #~ "oinarrizko aldaketa batzuek ezik. Aldaketa hauek zure kabuz egin beharko "
-#~ "dituzu. ProFTPd-ek arazoak izan ditzake konfigurazio berria erabiltzeko "
+#~ "dituzu. ProFTPD-ek arazoak izan ditzake konfigurazio berria erabiltzeko "
 #~ "eta posible da ezin exekutatu izatea bertsio-berritzearen ondoren."
 
 #~ msgid ""
diff --git a/debian/po/fi.po b/debian/po/fi.po
index dc806cd..7fed76e 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -6,6 +6,7 @@ msgstr ""
 "PO-Revision-Date: 2007-12-12 20:06+0200\n"
 "Last-Translator: Esko ArajÃ¤rvi <edu at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,23 +35,23 @@ msgstr "Aja proftpd:"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd voidaan ajaa joko palveluna inetdistÃ¤ tai itsenÃ¤isenÃ¤ palvelimena. "
+"ProFTPD voidaan ajaa joko palveluna inetdistÃ¤ tai itsenÃ¤isenÃ¤ palvelimena. "
 "Molemmilla vaihtoehdoilla on hyvÃ¤t puolensa. Jos FTP-yhteyksiÃ¤ on vain "
-"muutamia pÃ¤ivÃ¤ssÃ¤, on luultavasti parempi ajaa ProFTPd inetdistÃ¤ resurssien "
+"muutamia pÃ¤ivÃ¤ssÃ¤, on luultavasti parempi ajaa ProFTPD inetdistÃ¤ resurssien "
 "sÃ¤Ã¤stÃ¤miseksi."
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
-"Toisaalta suuremmilla liikennemÃ¤Ã¤rillÃ¤ ProFTPd kannattaa ajaa itsenÃ¤isenÃ¤ "
+"Toisaalta suuremmilla liikennemÃ¤Ã¤rillÃ¤ ProFTPD kannattaa ajaa itsenÃ¤isenÃ¤ "
 "palvelimena, koska tÃ¤llÃ¶in vÃ¤ltetÃ¤Ã¤n uuden prosessin luominen kullekin "
 "yhteydelle."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 55da7c8..66ccd42 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2007-12-12 11:55+0530\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,29 +39,29 @@ msgstr "Lancement de proftpdÂ :"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd peut Ãªtre lancÃ© soit en tant que service depuis inetd, soit comme un "
+"ProFTPD peut Ãªtre lancÃ© soit en tant que service depuis inetd, soit comme un "
 "serveur indÃ©pendant. Chaque mÃ©thode a ses avantages. Pour quelques "
-"connexions par jour, il est suggÃ©rÃ© de lancer ProFTPd depuis inetd afin de "
+"connexions par jour, il est suggÃ©rÃ© de lancer ProFTPD depuis inetd afin de "
 "prÃ©server les ressources du systÃ¨me."
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
 "Au contraire, avec un trafic plus important, il est recommandÃ© d'exÃ©cuter "
-"ProFTPd indÃ©pendamment pour Ã©viter de dÃ©marrer un nouveau processus pour "
+"ProFTPD indÃ©pendamment pour Ã©viter de dÃ©marrer un nouveau processus pour "
 "chaque connexion entrante."
 
-#~ msgid "Warning on syntax changes in ProFTPd configuration."
-#~ msgstr "Changement de syntaxe dans la configuration de ProFTPd"
+#~ msgid "Warning on syntax changes in ProFTPD configuration."
+#~ msgstr "Changement de syntaxe dans la configuration de ProFTPD"
 
 #~ msgid ""
 #~ "You are upgrading from a pre-1.3.0 version. Probably you will need to "
@@ -77,12 +78,12 @@ msgstr ""
 #~ msgid ""
 #~ "Unfortunately, it is nearly impossible currently to convert your setup "
 #~ "automatically, but for some basic issues. You will have to do  it "
-#~ "yourself. ProFTPd could also be unable to use the resulting  "
+#~ "yourself. ProFTPD could also be unable to use the resulting  "
 #~ "configuration, and it would not restart after upgrading."
 #~ msgstr ""
 #~ "Malheureusement, il est Ã  peu prÃ¨s impossible de convertir votre "
 #~ "configuration automatiquement, sauf pour des points particuliÃ¨rement "
-#~ "simples. Vous devrez le faire vous-mÃªme. ProFTPd pourrait Ãªtre incapable "
+#~ "simples. Vous devrez le faire vous-mÃªme. ProFTPD pourrait Ãªtre incapable "
 #~ "d'utiliser le fichier de configuration rÃ©sultant et ne redÃ©marrera donc "
 #~ "pas aprÃ¨s la mise Ã  jour."
 
diff --git a/debian/po/gl.po b/debian/po/gl.po
index a1baa78..481e187 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2007-12-12 19:35+0000\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,28 +37,28 @@ msgstr "Executar proftpd:"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd pode executarse coma un servizo de inetd ou coma un servidor "
+"ProFTPD pode executarse coma un servizo de inetd ou coma un servidor "
 "autÃ³nomo. Cada posibilidade ten as sÃºas avantaxes. Con sÃ³ unhas poucas "
-"conexiÃ³ns por FTP diarias, seguramente sexa mellor executar ProFTPd desde "
+"conexiÃ³ns por FTP diarias, seguramente sexa mellor executar ProFTPD desde "
 "inetd para aforrar recursos."
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
-"Por outro lado, con mÃ¡is trÃ¡fico, ProFTPd deberÃa funcionar coma un servidor "
+"Por outro lado, con mÃ¡is trÃ¡fico, ProFTPD deberÃa funcionar coma un servidor "
 "autÃ³nomo para non ter que crear un novo proceso por cada conexiÃ³n entrante."
 
-#~ msgid "Warning on syntax changes in ProFTPd configuration."
-#~ msgstr "Aviso sobre cambios de sintaxe na configuraciÃ³n de ProFTPd."
+#~ msgid "Warning on syntax changes in ProFTPD configuration."
+#~ msgstr "Aviso sobre cambios de sintaxe na configuraciÃ³n de ProFTPD."
 
 #~ msgid ""
 #~ "You are upgrading from a pre-1.3.0 version. Probably you will need to "
@@ -73,12 +74,12 @@ msgstr ""
 #~ msgid ""
 #~ "Unfortunately, it is nearly impossible currently to convert your setup "
 #~ "automatically, but for some basic issues. You will have to do  it "
-#~ "yourself. ProFTPd could also be unable to use the resulting  "
+#~ "yourself. ProFTPD could also be unable to use the resulting  "
 #~ "configuration, and it would not restart after upgrading."
 #~ msgstr ""
 #~ "Lamentablemente, actualmente Ã© case imposible converter a sÃºa "
 #~ "configuraciÃ³n automaticamente, agÃ¡s para algunhas cousas bÃ¡sicas. Ha ter "
-#~ "que o facer vostede mesmo. ProFTPd tamÃ©n poderÃa ser incapaz de empregar "
+#~ "que o facer vostede mesmo. ProFTPD tamÃ©n poderÃa ser incapaz de empregar "
 #~ "a configuraciÃ³n resultante, polo que non habÃa volver iniciarse trala "
 #~ "actualizaciÃ³n."
 
diff --git a/debian/po/id.po b/debian/po/id.po
index 373ced4..facebd4 100644
--- a/debian/po/id.po
+++ b/debian/po/id.po
@@ -12,6 +12,7 @@ msgstr ""
 "Last-Translator: Arief S Fitrianto <arief at gurame.fisika.ui.ac.id>\n"
 "Language-Team: Debian L10N Indonesia <debian-l10n-id at gurame.fisika.ui.ac."
 "id>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,30 +41,30 @@ msgstr "Jalankan proftpd:"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd dapat beroperasi sebagai layanan dari inetd atau sebagai suatu "
+"ProFTPD dapat beroperasi sebagai layanan dari inetd atau sebagai suatu "
 "server mandiri. Setiap pilihan memiliki keuntungan masing-masing. Jika "
-"koneksi FTP sangat sedikit per harinya, lebih baik menjalankan ProFTPd dari "
+"koneksi FTP sangat sedikit per harinya, lebih baik menjalankan ProFTPD dari "
 "inetd untuk menghemat sumber daya komputer/server."
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
-"Namun apabila lalu lintas FTP sangat tinggi, ProFTPd sebaiknya dioperasikan "
+"Namun apabila lalu lintas FTP sangat tinggi, ProFTPD sebaiknya dioperasikan "
 "sebagai suatu server mandiri untuk menghindari pembukaan proses baru setiap "
 "ada sambungan FTP yang masuk."
 
-#~ msgid "Warning on syntax changes in ProFTPd configuration."
+#~ msgid "Warning on syntax changes in ProFTPD configuration."
 #~ msgstr ""
-#~ "Hati-hati terhadap adanya perubahan sintaks pada konfigurasi ProFTPd."
+#~ "Hati-hati terhadap adanya perubahan sintaks pada konfigurasi ProFTPD."
 
 #~ msgid ""
 #~ "You are upgrading from a pre-1.3.0 version. Probably you will need to "
@@ -80,12 +81,12 @@ msgstr ""
 #~ msgid ""
 #~ "Unfortunately, it is nearly impossible currently to convert your setup "
 #~ "automatically, but for some basic issues. You will have to do  it "
-#~ "yourself. ProFTPd could also be unable to use the resulting  "
+#~ "yourself. ProFTPD could also be unable to use the resulting  "
 #~ "configuration, and it would not restart after upgrading."
 #~ msgstr ""
 #~ "Malangnya, saat ini hampir tidak mungkin untuk mengubah konfigurasi lama "
 #~ "secara otomatis selain beberapa konfigurasi dasar. Anda harus "
-#~ "melakukannya sendiri. ProFTPd bisa jadi tidak dapat menggunakan "
+#~ "melakukannya sendiri. ProFTPD bisa jadi tidak dapat menggunakan "
 #~ "konfigurasi yang dihasilkan dan tidak akan beroperasi setelah proses "
 #~ "pembaharuan ini."
 
diff --git a/debian/po/it.po b/debian/po/it.po
index d29b7f9..719ba47 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2008-04-29 14:28+0100\n"
 "Last-Translator: Francesco Paolo Lovergine <frankie at debian.org>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,10 +40,16 @@ msgstr "Esecuzione proftpd:"
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
+#, fuzzy
+#| msgid ""
+#| "ProFTPD can be run either as a service from inetd, or as a standalone "
+#| "server. Each choice has its own benefits. With only a few FTP connections "
+#| "per day, it is probably better to run ProFTPD from inetd in order to save "
+#| "resources."
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
 "Ogni scelta ha i suoi benefici. Se si hanno poche connessioni ftp al giorno, "
@@ -52,9 +59,9 @@ msgstr ""
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
-"D'altro canto, con traffico maggiore, ProFTPd dovrebbe essere eseguito come "
+"D'altro canto, con traffico maggiore, ProFTPD dovrebbe essere eseguito come "
 "servizio autonomo per evitare di lanciare un nuovo processo per ogni "
 "connession in ingresso."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 9d7f812..3f31d82 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -19,6 +19,7 @@ msgstr ""
 "PO-Revision-Date: 2008-01-30 08:03+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,28 +46,28 @@ msgstr "proftpd ã®èµ·å‹•æ–¹æ³•:"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd ã¯ã€inetd çµŒç”±ã®ã‚µãƒ¼ãƒ“ã‚¹ã¨ã—ã¦å®Ÿè¡Œã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã—ã€ ã‚¹ã‚¿ãƒ³ãƒ‰ã‚¢"
+"ProFTPD ã¯ã€inetd çµŒç”±ã®ã‚µãƒ¼ãƒ“ã‚¹ã¨ã—ã¦å®Ÿè¡Œã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã—ã€ ã‚¹ã‚¿ãƒ³ãƒ‰ã‚¢"
 "ãƒãƒ¼ãƒ³ã®ã‚µãƒ¼ãƒã¨ã—ã¦ã‚‚å®Ÿè¡Œã§ãã¾ã™ã€‚ã©ã¡ã‚‰ã«ã‚‚ãã‚Œãžã‚Œåˆ©ç‚¹ãŒã‚ã‚Šã¾ã™ã€‚1æ—¥ã«æ•°"
-"å›žã® ftp ã‚¢ã‚¯ã‚»ã‚¹ã—ã‹ãªã„å ´åˆã¯ã€è³‡æºã‚’ç¯€ç´„ã™ã‚‹ãŸã‚ã« ProFTPd ã‚’ inetd ã‹ã‚‰èµ·"
+"å›žã® ftp ã‚¢ã‚¯ã‚»ã‚¹ã—ã‹ãªã„å ´åˆã¯ã€è³‡æºã‚’ç¯€ç´„ã™ã‚‹ãŸã‚ã« ProFTPD ã‚’ inetd ã‹ã‚‰èµ·"
 "å‹•ã™ã‚‹ã®ãŒè‰¯ã„ã‹ã‚‚çŸ¥ã‚Œã¾ã›ã‚“ã€‚"
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
 "ä¸€æ–¹ã€é »ç¹ãªã‚¢ã‚¯ã‚»ã‚¹ãŒã‚ã‚‹å ´åˆã¯ã€æŽ¥ç¶šã”ã¨ã«æ–°è¦ãƒ—ãƒã‚»ã‚¹ãŒç”Ÿæˆã•ã‚Œã‚‹ã®ã‚’é¿ã‘"
-"ã‚‹ãŸã‚ã€ProFTPd ã‚’ã‚¹ã‚¿ãƒ³ãƒ‰ã‚¢ãƒãƒ³ã‚µãƒ¼ãƒã¨ã—ã¦å‹•ä½œã•ã›ã‚‹ã¹ãã§ã™ã€‚"
+"ã‚‹ãŸã‚ã€ProFTPD ã‚’ã‚¹ã‚¿ãƒ³ãƒ‰ã‚¢ãƒãƒ³ã‚µãƒ¼ãƒã¨ã—ã¦å‹•ä½œã•ã›ã‚‹ã¹ãã§ã™ã€‚"
 
-#~ msgid "Warning on syntax changes in ProFTPd configuration."
-#~ msgstr "ProFTPd è¨å®šã§ã®æ›¸å¼å¤‰æ›´ã«é–¢ã™ã‚‹è¦å‘Š"
+#~ msgid "Warning on syntax changes in ProFTPD configuration."
+#~ msgstr "ProFTPD è¨å®šã§ã®æ›¸å¼å¤‰æ›´ã«é–¢ã™ã‚‹è¦å‘Š"
 
 #~ msgid ""
 #~ "You are upgrading from a pre-1.3.0 version. Probably you will need to "
@@ -82,12 +83,12 @@ msgstr ""
 #~ msgid ""
 #~ "Unfortunately, it is nearly impossible currently to convert your setup "
 #~ "automatically, but for some basic issues. You will have to do  it "
-#~ "yourself. ProFTPd could also be unable to use the resulting  "
+#~ "yourself. ProFTPD could also be unable to use the resulting  "
 #~ "configuration, and it would not restart after upgrading."
 #~ msgstr ""
 #~ "æ®‹å¿µãªã“ã¨ã«ã€ã„ãã¤ã‹ã®åŸºæœ¬çš„ãªè¨å®šä»¥å¤–ã¯è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’è‡ªå‹•çš„ã«å¤‰æ›ã™ã‚‹ã®"
 #~ "ã¯ç¾çŠ¶ã§ã¯ã»ã¨ã‚“ã©ä¸å¯èƒ½ã§ã™ã€‚è‡ªåˆ†ã§å¤‰æ›ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚è‡ªå‹•å¤‰æ›å¾Œã®è¨"
-#~ "å®šã‚’ä½¿ã†ã“ã¨ã¯æã‚‰ãã§ããªã„ã®ã§ã€ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰å¾Œã« ProFTPd ã‚’å†èµ·å‹•ã™ã‚‹"
+#~ "å®šã‚’ä½¿ã†ã“ã¨ã¯æã‚‰ãã§ããªã„ã®ã§ã€ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰å¾Œã« ProFTPD ã‚’å†èµ·å‹•ã™ã‚‹"
 #~ "ã“ã¨ã‚‚ã§ãã¾ã›ã‚“ã€‚"
 
 #~ msgid ""
diff --git a/debian/po/nb.po b/debian/po/nb.po
index 8959f9e..f86382c 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2007-12-15 12:36+0100\n"
 "Last-Translator: BjÃ¸rn Steensrud <bjornst at skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian BokmÃ¥l <i18n-nb at lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,28 +39,28 @@ msgstr "KjÃ¸r proftpd:"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd kan kjÃ¸res enten som en tjeneste fra inetd, eller som en "
+"ProFTPD kan kjÃ¸res enten som en tjeneste fra inetd, eller som en "
 "frittstÃ¥ende tjener. Hvert valg har sine fordeler. Hvis det bare er noen fÃ¥ "
-"FTP-tilkoblinger om dagen, er det antakelig bedre Ã¥ kjÃ¸re ProFTPd fra inetd "
+"FTP-tilkoblinger om dagen, er det antakelig bedre Ã¥ kjÃ¸re ProFTPD fra inetd "
 "for Ã¥ spare ressurser."
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
-"PÃ¥ den annen side, med hÃ¸yere trafikk bÃ¸r ProFTPd kjÃ¸re som en frittstÃ¥ende "
+"PÃ¥ den annen side, med hÃ¸yere trafikk bÃ¸r ProFTPD kjÃ¸re som en frittstÃ¥ende "
 "tjener for Ã¥ unngÃ¥ Ã¥ starte en ny prosess for hver innkommende tilkobling."
 
-#~ msgid "Warning on syntax changes in ProFTPd configuration."
-#~ msgstr "Advarsel om syntaksendringer i ProFTPd-oppsettet."
+#~ msgid "Warning on syntax changes in ProFTPD configuration."
+#~ msgstr "Advarsel om syntaksendringer i ProFTPD-oppsettet."
 
 #~ msgid ""
 #~ "You are upgrading from a pre-1.3.0 version. Probably you will need to "
@@ -75,11 +76,11 @@ msgstr ""
 #~ msgid ""
 #~ "Unfortunately, it is nearly impossible currently to convert your setup "
 #~ "automatically, but for some basic issues. You will have to do  it "
-#~ "yourself. ProFTPd could also be unable to use the resulting  "
+#~ "yourself. ProFTPD could also be unable to use the resulting  "
 #~ "configuration, and it would not restart after upgrading."
 #~ msgstr ""
 #~ "Det er dessverre nesten umulig nÃ¥ Ã¥ konvertere oppsettet automatisk, "
-#~ "unntatt for noen helt grunnleggende saker. Du mÃ¥ gjÃ¸re det selv. ProFTPd "
+#~ "unntatt for noen helt grunnleggende saker. Du mÃ¥ gjÃ¸re det selv. ProFTPD "
 #~ "kunne ogsÃ¥ vÃ¦re ute av stand til Ã¥ bruke et automatisk konvertert oppsett "
 #~ "og ville ikke starte pÃ¥ nytt etter oppgradering."
 
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 9456604..1c0ead9 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -14,6 +14,7 @@ msgstr ""
 "PO-Revision-Date: 2007-12-19 17:43+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,36 +36,36 @@ msgstr "losstaand"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid "Run proftpd:"
-msgstr "ProFTPd uitvoeren:"
+msgstr "ProFTPD uitvoeren:"
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd kan als een losstaande server, of als een dienst via inetd gedraaid "
+"ProFTPD kan als een losstaande server, of als een dienst via inetd gedraaid "
 "worden. Elke keuze heeft z'n eigen voordelen. Als u relatief weinig ftp-"
 "verbindingen per dag binnenkrijgt is het waarschijnlijk aan te raden om "
-"ProFTPd via inetd te draaien daar dit systeembronnen spaart."
+"ProFTPD via inetd te draaien daar dit systeembronnen spaart."
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
-"Als u daarentegen relatief veel verkeer heeft, draait u ProFTPd beter als "
+"Als u daarentegen relatief veel verkeer heeft, draait u ProFTPD beter als "
 "een losstaande server, daar u dan vermijd dat er voor elke binnenkomende "
 "verbinding een proces afgesplitst wordt. "
 
-#~ msgid "Warning on syntax changes in ProFTPd configuration."
+#~ msgid "Warning on syntax changes in ProFTPD configuration."
 #~ msgstr ""
-#~ "Waarschuwing betreffende syntax-veranderingen in de ProFTPd-configuratie."
+#~ "Waarschuwing betreffende syntax-veranderingen in de ProFTPD-configuratie."
 
 #~ msgid ""
 #~ "You are upgrading from a pre-1.3.0 version. Probably you will need to "
@@ -81,14 +82,14 @@ msgstr ""
 #~ msgid ""
 #~ "Unfortunately, it is nearly impossible currently to convert your setup "
 #~ "automatically, but for some basic issues. You will have to do  it "
-#~ "yourself. ProFTPd could also be unable to use the resulting  "
+#~ "yourself. ProFTPD could also be unable to use the resulting  "
 #~ "configuration, and it would not restart after upgrading."
 #~ msgstr ""
 #~ "Het is helaas bijna onmogelijk om uw instelling automatisch om te "
 #~ "schakelen. Dit wordt geprobeerd, maar afgezien van eenvoudige opzetten, "
 #~ "zult u zelf nog aanpassingen moeten uitvoeren. Het is mogelijk dat "
-#~ "ProFTPd de automatisch gegenereerde configuratie niet kan gebruiken, "
-#~ "waardoor de herstart van ProFTPd na de opwaardering zal mislukken."
+#~ "ProFTPD de automatisch gegenereerde configuratie niet kan gebruiken, "
+#~ "waardoor de herstart van ProFTPD na de opwaardering zal mislukken."
 
 #~ msgid ""
 #~ "Note also that starting from 1.3.0 version, dynamic modules are used and "
@@ -104,7 +105,7 @@ msgstr ""
 #~ "hoofdconfiguratiebestand."
 
 #~ msgid "Run proftpd from inetd or standalone?"
-#~ msgstr "ProFTPd losstaand, of vanuit inetd opstarten?"
+#~ msgstr "ProFTPD losstaand, of vanuit inetd opstarten?"
 
 #~ msgid ""
 #~ "On the other hand, if your ftp site is visited frequently, you should "
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 9fa7486..97e9326 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2007-12-15 12:23+0000\n"
 "Last-Translator: Ricardo Silva <ardoric at gmail.com>\n"
 "Language-Team: Native Portuguese <traduz at debianpt.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,12 +37,12 @@ msgstr "Correr o proftpd:"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"O ProFTPd pode ser corrido tanto como um serviço do inetd, bem como um "
+"O ProFTPD pode ser corrido tanto como um serviço do inetd, bem como um "
 "servidor solitário. Cada escolha tem os seus benefícios. Se tem apenas "
 "algumas ligações ftp por dia, é provavelmente melhor correr o proftpd pelo "
 "inetd para poupar recursos."
@@ -50,15 +51,15 @@ msgstr ""
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
-"Por outro lado, com mais trafego, o ProFTPd deve ser iniciado como um "
+"Por outro lado, com mais trafego, o ProFTPD deve ser iniciado como um "
 "servidor solitário para evitar a criação de novos processos para cada "
 "ligação."
 
-#~ msgid "Warning on syntax changes in ProFTPd configuration."
-#~ msgstr "Aviso sobre mudanças de sintaxe na configuração do ProFTPd."
+#~ msgid "Warning on syntax changes in ProFTPD configuration."
+#~ msgstr "Aviso sobre mudanças de sintaxe na configuração do ProFTPD."
 
 #~ msgid ""
 #~ "You are upgrading from a pre-1.3.0 version. Probably you will need to "
@@ -75,12 +76,12 @@ msgstr ""
 #~ msgid ""
 #~ "Unfortunately, it is nearly impossible currently to convert your setup "
 #~ "automatically, but for some basic issues. You will have to do  it "
-#~ "yourself. ProFTPd could also be unable to use the resulting  "
+#~ "yourself. ProFTPD could also be unable to use the resulting  "
 #~ "configuration, and it would not restart after upgrading."
 #~ msgstr ""
 #~ "Infelizmente, é quase impossível actualmente converter a sua configuração "
 #~ "automaticamente, a não ser em alguns pontos básicos. Terá de o fazer por "
-#~ "si próprio. O ProFTPd pode também não ser capaz de usar a configuração "
+#~ "si próprio. O ProFTPD pode também não ser capaz de usar a configuração "
 #~ "resultante, e não se inicializar depois da actualização."
 
 #~ msgid ""
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index dceb77d..6ef634d 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -15,6 +15,7 @@ msgstr ""
 "Last-Translator: Flamarion Jorge <jorge.flamarion at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese at lists.debian."
 "org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,7 +31,6 @@ msgstr "a partir do inetd"
 #. Type: select
 #. Choices
 #: ../proftpd-basic.templates:2001
-#| msgid "inetd, standalone"
 msgid "standalone"
 msgstr "autÃ´nomo"
 
@@ -44,29 +44,29 @@ msgstr "Executar o proftpd:"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"O ProFTPd pode ser executado como um serviÃ§o a partir do inetd ou como um "
+"O ProFTPD pode ser executado como um serviÃ§o a partir do inetd ou como um "
 "servidor autÃ´nomo. Cada escolha tem seus prÃ³prios benefÃcios. Com apenas "
-"algumas conexÃµes FTP por dia, provavelmente Ã© melhor executar o ProFTPd a "
+"algumas conexÃµes FTP por dia, provavelmente Ã© melhor executar o ProFTPD a "
 "partir do inetd para economizar recursos."
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
-"Por outro lado, com um alto trÃ¡fego, o ProFTPd deveria executar como um "
+"Por outro lado, com um alto trÃ¡fego, o ProFTPD deveria executar como um "
 "servidor autÃ´nomo para evitar a criaÃ§Ã£o de um novo processo para cada "
 "conexÃ£o de entrada."
 
-#~ msgid "Warning on syntax changes in ProFTPd configuration."
-#~ msgstr "Aviso sobre a sintaxe de mudanas na configurao do ProFTPd."
+#~ msgid "Warning on syntax changes in ProFTPD configuration."
+#~ msgstr "Aviso sobre a sintaxe de mudanas na configurao do ProFTPD."
 
 #, fuzzy
 #~ msgid ""
@@ -85,12 +85,12 @@ msgstr ""
 #~ msgid ""
 #~ "Unfortunately, it is nearly impossible currently to convert your setup "
 #~ "automatically, but for some basic issues. You will have to do  it "
-#~ "yourself. ProFTPd could also be unable to use the resulting  "
+#~ "yourself. ProFTPD could also be unable to use the resulting  "
 #~ "configuration, and it would not restart after upgrading."
 #~ msgstr ""
 #~ "Infelizmente,  quase impossvel converter sua configurao antiga "
 #~ "automaticamente, salvo alguns detalhes elementares. Voce ter que fazer "
-#~ "isso manualmente. O ProFTPd poder tambm no ser capaz de usar a configurao "
+#~ "isso manualmente. O ProFTPD poder tambm no ser capaz de usar a configurao "
 #~ "resultante e no conseguir reiniciar aps a atualizao."
 
 #~ msgid "Run proftpd from inetd or standalone?"
@@ -119,8 +119,8 @@ msgstr ""
 #~ "para administradores de sistemas paranicos. Somente habilite essa opo se "
 #~ "voce realmente sabe o que isso pode acarretar."
 
-#~ msgid "Using SQL with ProFTPd."
-#~ msgstr "Usando SQL com ProFTPd."
+#~ msgid "Using SQL with ProFTPD."
+#~ msgstr "Usando SQL com ProFTPD."
 
 #~ msgid ""
 #~ "I found some old sql directives in /etc/proftpd.conf.  This release of "
diff --git a/debian/po/ru.po b/debian/po/ru.po
index adeb81d..d35bc20 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -14,12 +14,13 @@ msgstr ""
 "PO-Revision-Date: 2007-12-26 21:56+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: select
 #. Choices
@@ -43,29 +44,29 @@ msgstr "Ð—Ð°Ð¿ÑƒÑÐº proftpd:"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½ Ð»Ð¸Ð±Ð¾ ÐºÐ°Ðº ÑÐµÑ€Ð²Ð¸Ñ Ñ‡ÐµÑ€ÐµÐ· inetd, Ð»Ð¸Ð±Ð¾ ÐºÐ°Ðº "
+"ProFTPD Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½ Ð»Ð¸Ð±Ð¾ ÐºÐ°Ðº ÑÐµÑ€Ð²Ð¸Ñ Ñ‡ÐµÑ€ÐµÐ· inetd, Ð»Ð¸Ð±Ð¾ ÐºÐ°Ðº "
 "ÑÐ°Ð¼Ð¾ÑÑ‚Ð¾ÑÑ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€. ÐšÐ°Ð¶Ð´Ñ‹Ð¹ Ð¸Ð· ÑÐ¿Ð¾ÑÐ¾Ð±Ð¾Ð² Ð¸Ð¼ÐµÐµÑ‚ ÑÐ²Ð¾Ð¸ Ð¿Ñ€ÐµÐ¸Ð¼ÑƒÑ‰ÐµÑÑ‚Ð²Ð°. Ð•ÑÐ»Ð¸ Ðº "
 "ftp-ÑÐµÑ€Ð²ÐµÑ€Ñƒ Ð² Ð´ÐµÐ½ÑŒ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°ÑŽÑ‚ÑÑ Ð»Ð¸ÑˆÑŒ Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ñ‡ÐµÐ»Ð¾Ð²ÐµÐº, Ñ‚Ð¾ Ð»ÑƒÑ‡ÑˆÐµ Ð·Ð°Ð¿ÑƒÑÐºÐ°Ñ‚ÑŒ "
-"ProFTPd Ñ‡ÐµÑ€ÐµÐ· inetd, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑÑÐºÐ¾Ð½Ð¾Ð¼Ð¸Ñ‚ÑŒ Ñ€ÐµÑÑƒÑ€ÑÑ‹."
+"ProFTPD Ñ‡ÐµÑ€ÐµÐ· inetd, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑÑÐºÐ¾Ð½Ð¾Ð¼Ð¸Ñ‚ÑŒ Ñ€ÐµÑÑƒÑ€ÑÑ‹."
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
 "Ð¡ Ð´Ñ€ÑƒÐ³Ð¾Ð¹ ÑÑ‚Ð¾Ñ€Ð¾Ð½Ñ‹, ÐµÑÐ»Ð¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¹ Ð¼Ð½Ð¾Ð³Ð¾, Ñ‚Ð¾ Ð²Ñ‹ Ð½Ð°Ð¾Ð±Ð¾Ñ€Ð¾Ñ‚, Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð·Ð°Ð¿ÑƒÑÐºÐ°Ñ‚ÑŒ "
-"ProFTPd ÐºÐ°Ðº ÑÐ°Ð¼Ð¾ÑÑ‚Ð¾ÑÑ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸Ð·Ð±ÐµÐ¶Ð°Ñ‚ÑŒ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¿Ñ€Ð¾Ñ†ÐµÑÑÐ° "
+"ProFTPD ÐºÐ°Ðº ÑÐ°Ð¼Ð¾ÑÑ‚Ð¾ÑÑ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸Ð·Ð±ÐµÐ¶Ð°Ñ‚ÑŒ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¿Ñ€Ð¾Ñ†ÐµÑÑÐ° "
 "Ð¿Ñ€Ð¸ ÐºÐ°Ð¶Ð´Ð¾Ð¼ Ð²Ñ…Ð¾Ð´ÑÑ‰ÐµÐ¼ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¸."
 
-#~ msgid "Warning on syntax changes in ProFTPd configuration."
-#~ msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ: Ð² ÑÐ¸Ð½Ñ‚Ð°ÐºÑÐ¸ÑÐµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ProFTPd ÐµÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ."
+#~ msgid "Warning on syntax changes in ProFTPD configuration."
+#~ msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ: Ð² ÑÐ¸Ð½Ñ‚Ð°ÐºÑÐ¸ÑÐµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ProFTPD ÐµÑÑ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ."
 
 #~ msgid ""
 #~ "You are upgrading from a pre-1.3.0 version. Probably you will need to "
@@ -81,11 +82,11 @@ msgstr ""
 #~ msgid ""
 #~ "Unfortunately, it is nearly impossible currently to convert your setup "
 #~ "automatically, but for some basic issues. You will have to do  it "
-#~ "yourself. ProFTPd could also be unable to use the resulting  "
+#~ "yourself. ProFTPD could also be unable to use the resulting  "
 #~ "configuration, and it would not restart after upgrading."
 #~ msgstr ""
 #~ "Ðš ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸ÑŽ, Ð¿Ð¾Ð»Ð½Ð°Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ°Ñ ÐºÐ¾Ð½Ð²ÐµÑ€Ñ‚Ð°Ñ†Ð¸Ñ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°, ÐºÑ€Ð¾Ð¼Ðµ "
-#~ "Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… ÑÐ»ÐµÐ¼ÐµÐ½Ñ‚Ð°Ñ€Ð½Ñ‹Ñ… Ð²ÐµÑ‰ÐµÐ¹. Ð’Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ ÑÑ‚Ð¾ ÑÐ°Ð¼Ð¸. ProFTPd Ð½Ðµ "
+#~ "Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… ÑÐ»ÐµÐ¼ÐµÐ½Ñ‚Ð°Ñ€Ð½Ñ‹Ñ… Ð²ÐµÑ‰ÐµÐ¹. Ð’Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ ÑÑ‚Ð¾ ÑÐ°Ð¼Ð¸. ProFTPD Ð½Ðµ "
 #~ "ÑÐ¼Ð¾Ð¶ÐµÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ð²ÑˆÐ¸ÐµÑÑ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¸ Ð½Ðµ ÑÐ¼Ð¾Ð¶ÐµÑ‚ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒÑÑ "
 #~ "Ð¿Ð¾ÑÐ»Ðµ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ."
 
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 977ea77..823e3df 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -6,6 +6,7 @@ msgstr ""
 "PO-Revision-Date: 2007-12-12 13:01+0100\n"
 "Last-Translator: Ivan MasÃ¡r <helix84 at centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,29 +33,29 @@ msgstr "SpÃºÅ¡Å¥aÅ¥ proftpd:"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd je moÅ¾nÃ© spÃºÅ¡Å¥aÅ¥ buÄ ako sluÅ¾bu pomocou inetd alebo ako samostatnÃ½ "
+"ProFTPD je moÅ¾nÃ© spÃºÅ¡Å¥aÅ¥ buÄ ako sluÅ¾bu pomocou inetd alebo ako samostatnÃ½ "
 "server. KaÅ¾dÃ¡ voÄ¾ba mÃ¡ svoje vÃ½hody. Ak mÃ¡te iba niekoÄ¾ko ftp spojenÃ za "
-"deÅˆ, je pre vÃ¡s pravdepodobne lepÅ¡ie spÃºÅ¡Å¥aÅ¥ ProFTPd pomocou inetd aby ste "
+"deÅˆ, je pre vÃ¡s pravdepodobne lepÅ¡ie spÃºÅ¡Å¥aÅ¥ ProFTPD pomocou inetd aby ste "
 "Å¡etrili systÃ©movÃ© zdroje."
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
-"Na druhej strane, pri vyÅ¡Å¡ej premÃ¡vke by mal byÅ¥ ProFTPd spustenÃ½ ako "
+"Na druhej strane, pri vyÅ¡Å¡ej premÃ¡vke by mal byÅ¥ ProFTPD spustenÃ½ ako "
 "samostatnÃ½ server, aby nebolo potrebnÃ© spÃºÅ¡Å¥aÅ¥ novÃ½ proces pre kaÅ¾dÃ© "
 "prichÃ¡dzajÃºce spojenie."
 
-#~ msgid "Warning on syntax changes in ProFTPd configuration."
-#~ msgstr "Upozornenie na zmeny syntaxe konfigurÃ¡cie ProFTPd."
+#~ msgid "Warning on syntax changes in ProFTPD configuration."
+#~ msgstr "Upozornenie na zmeny syntaxe konfigurÃ¡cie ProFTPD."
 
 #~ msgid ""
 #~ "You are upgrading from a pre-1.3.0 version. Probably you will need to "
@@ -70,12 +71,12 @@ msgstr ""
 #~ msgid ""
 #~ "Unfortunately, it is nearly impossible currently to convert your setup "
 #~ "automatically, but for some basic issues. You will have to do  it "
-#~ "yourself. ProFTPd could also be unable to use the resulting  "
+#~ "yourself. ProFTPD could also be unable to use the resulting  "
 #~ "configuration, and it would not restart after upgrading."
 #~ msgstr ""
 #~ "BohuÅ¾iaÄ¾, je takmer nemoÅ¾nÃ© automaticky previesÅ¥ vaÅ¡e nastavenia okrem "
 #~ "niektorÃ½ch zÃ¡kladnÃ½ch vecÃ. Budete to musieÅ¥ urobiÅ¥ sami. Je tieÅ¾ moÅ¾nÃ©, "
-#~ "Å¾e ProFTPd nebude schopnÃ½ pouÅ¾iÅ¥ vÃ½slednÃº konfigurÃ¡ciu a po aktualizÃ¡cii "
+#~ "Å¾e ProFTPD nebude schopnÃ½ pouÅ¾iÅ¥ vÃ½slednÃº konfigurÃ¡ciu a po aktualizÃ¡cii "
 #~ "sa nereÅ¡tartuje."
 
 #~ msgid ""
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 173d2f9..ff33e2d 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2008-06-21 11:53+0200\n"
 "Last-Translator: Martin Bagge <martin.bagge at bthstudent.se>\n"
 "Language-Team: swedish <debian-l10n-swedish at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,23 +39,23 @@ msgstr "KÃ¶r proftd:"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd kan kÃ¶ras som tjÃ¤nst genom inetd eller som ensamstÃ¥ende tjÃ¤nst. De "
+"ProFTPD kan kÃ¶ras som tjÃ¤nst genom inetd eller som ensamstÃ¥ende tjÃ¤nst. De "
 "bÃ¥da alternativen har olika fÃ¶rdelar och nackdelar. Med ett fÃ¥tal FTP-"
-"anslutningar om dagen sÃ¥ Ã¤r det fÃ¶rmodligen ett bÃ¤ttre val att kÃ¶ra ProFTPd "
+"anslutningar om dagen sÃ¥ Ã¤r det fÃ¶rmodligen ett bÃ¤ttre val att kÃ¶ra ProFTPD "
 "genom inetd fÃ¶r att spara resurser."
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
-"Ã… andra sidan sÃ¥ bÃ¶r ProFTPd kÃ¶ras som ensamstÃ¥ende tjÃ¤nst om du rÃ¤knar med "
+"Ã… andra sidan sÃ¥ bÃ¶r ProFTPD kÃ¶ras som ensamstÃ¥ende tjÃ¤nst om du rÃ¤knar med "
 "hÃ¶gtrafik, dÃ¥ slipper du problem med att det skapas en ny process fÃ¶r varje "
 "inkommande anslutning."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 3c09adf..e19a379 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: proftpd-dfsg at packages.debian.org\n"
-"POT-Creation-Date: 2009-09-01 22:31+0200\n"
+"POT-Creation-Date: 2011-02-10 10:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,9 +39,9 @@ msgstr ""
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
 
@@ -48,6 +49,6 @@ msgstr ""
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 8d384d8..b2a7d56 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2008-06-16 23:21+0200\n"
 "Last-Translator: Mert Dirik <mertdirik at gmail.com>\n"
 "Language-Team: Debian L10n Turkish <debian-l10n-turkish at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,23 +39,23 @@ msgstr "'proftpd'yi Ã§alÄ±ÅŸtÄ±r:"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd bir inetd hizmeti ya da kendibaÅŸÄ±na bir sunucu olarak "
+"ProFTPD bir inetd hizmeti ya da kendibaÅŸÄ±na bir sunucu olarak "
 "Ã§alÄ±ÅŸtÄ±rÄ±labilir. Her iki seÃ§eneÄŸin de kendilerine Ã¶zgÃ¼ yararlarÄ± vardÄ±r. "
-"EÄŸer gÃ¼nde birkaÃ§ FTP baÄŸlantÄ±sÄ±ndan fazlasÄ±nÄ± almÄ±yorsanÄ±z, ProFTPd'yi "
+"EÄŸer gÃ¼nde birkaÃ§ FTP baÄŸlantÄ±sÄ±ndan fazlasÄ±nÄ± almÄ±yorsanÄ±z, ProFTPD'yi "
 "inetd'den Ã§alÄ±ÅŸtÄ±rarak sistem kaynaklarÄ±nÄ± koruyabilirsiniz."
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
 "Ã–te yandan yÃ¼ksek bir trafikte, gelen her baÄŸlantÄ±da yeni bir iÅŸlem "
-"oluÅŸturmaktan kaÃ§Ä±nmak iÃ§in ProFTPd kendibaÅŸÄ±na bir sunucu olarak "
+"oluÅŸturmaktan kaÃ§Ä±nmak iÃ§in ProFTPD kendibaÅŸÄ±na bir sunucu olarak "
 "Ã§alÄ±ÅŸtÄ±rÄ±lmalÄ±dÄ±r."
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 6a081b3..b4603b7 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,4 +1,4 @@
-# Vietnamese translation for ProFTPd.
+# Vietnamese translation for ProFTPD.
 # Copyright Â© 2007 Free Software Foundation, Inc.
 # Clytie Siddall <clytie at riverland.net.au>, 2007
 #
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2007-12-22 12:45+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,27 +39,27 @@ msgstr "Cháº¡y proftpd:"
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"ProFTPd can be run either as a service from inetd, or as a standalone "
+"ProFTPD can be run either as a service from inetd, or as a standalone "
 "server. Each choice has its own benefits. With only a few FTP connections "
-"per day, it is probably better to run ProFTPd from inetd in order to save "
+"per day, it is probably better to run ProFTPD from inetd in order to save "
 "resources."
 msgstr ""
-"ProFTPd cÃ³ thá»ƒ cháº¡y hoáº·c nhÆ° dá»‹ch vá»¥ tá»« inetd, hoáº·c nhÆ° trÃ¬nh phá»¥c vá»¥ Ä‘á»™c "
+"ProFTPD cÃ³ thá»ƒ cháº¡y hoáº·c nhÆ° dá»‹ch vá»¥ tá»« inetd, hoáº·c nhÆ° trÃ¬nh phá»¥c vá»¥ Ä‘á»™c "
 "láºp. Má»—i tÃ¹y chá»n cÃ³ lá»£i riÃªng. Chá»‰ cÃ³ vÃ i káº¿t ná»‘i FTP trong má»—i ngÃ y thÃ¬ "
-"ráº¥t cÃ³ thá»ƒ nÃªn cháº¡y ProFTPd tá»« inetd Ä‘á»ƒ tiáº¿t kiá»‡m tÃ i nguyÃªn."
+"ráº¥t cÃ³ thá»ƒ nÃªn cháº¡y ProFTPD tá»« inetd Ä‘á»ƒ tiáº¿t kiá»‡m tÃ i nguyÃªn."
 
 #. Type: select
 #. Description
 #: ../proftpd-basic.templates:2002
 msgid ""
-"On the other hand, with higher traffic, ProFTPd should run as a standalone "
+"On the other hand, with higher traffic, ProFTPD should run as a standalone "
 "server to avoid spawning a new process for each incoming connection."
 msgstr ""
-"Máº·t khÃ¡c, khi cÃ³ nhiá»u káº¿t ná»‘i hÆ¡n, ProFTPd nÃªn cháº¡y nhÆ° trÃ¬nh phá»¥c vá»¥ Ä‘á»™c "
+"Máº·t khÃ¡c, khi cÃ³ nhiá»u káº¿t ná»‘i hÆ¡n, ProFTPD nÃªn cháº¡y nhÆ° trÃ¬nh phá»¥c vá»¥ Ä‘á»™c "
 "láºp, Ä‘á»ƒ trÃ¡nh cáº§n pháº£i táº¡o má»™t tiáº¿n trÃ¬nh má»›i cho má»—i káº¿t ná»‘i gá»i Ä‘áº¿n."
 
-#~ msgid "Warning on syntax changes in ProFTPd configuration."
-#~ msgstr "Cáº£nh bÃ¡o vá» cÃº phÃ¡p bá»‹ thay Ä‘á»•i trong cáº¥u hÃ¬nh ProFTPd."
+#~ msgid "Warning on syntax changes in ProFTPD configuration."
+#~ msgstr "Cáº£nh bÃ¡o vá» cÃº phÃ¡p bá»‹ thay Ä‘á»•i trong cáº¥u hÃ¬nh ProFTPD."
 
 #~ msgid ""
 #~ "You are upgrading from a pre-1.3.0 version. Probably you will need to "
@@ -74,11 +75,11 @@ msgstr ""
 #~ msgid ""
 #~ "Unfortunately, it is nearly impossible currently to convert your setup "
 #~ "automatically, but for some basic issues. You will have to do  it "
-#~ "yourself. ProFTPd could also be unable to use the resulting  "
+#~ "yourself. ProFTPD could also be unable to use the resulting  "
 #~ "configuration, and it would not restart after upgrading."
 #~ msgstr ""
 #~ "Tiáº¿c lÃ  hiá»‡n thá»i gáº§n khÃ´ng thá»ƒ chuyá»ƒn Ä‘á»•i thiáº¿t láºp má»™t cÃ¡ch tá»± Ä‘á»™ng, "
-#~ "trá»« Ä‘á»‘i vá»›i má»™t sá»‘ váº¥n Ä‘á» cÆ¡ báº£n. Váºy báº¡n cáº§n pháº£i tá»± lÃ m. ProFTPd cÅ©ng "
+#~ "trá»« Ä‘á»‘i vá»›i má»™t sá»‘ váº¥n Ä‘á» cÆ¡ báº£n. Váºy báº¡n cáº§n pháº£i tá»± lÃ m. ProFTPD cÅ©ng "
 #~ "cÃ³ láº½ khÃ´ng thá»ƒ sá» dá»¥ng cáº¥u hÃ¬nh káº¿t quáº£, vÃ  khÃ´ng khá»Ÿi cháº¡y Ä‘Æ°á»£c sau khi "
 #~ "nÃ¢ng cáº¥p."
 
diff --git a/debian/proftpd-basic.README.Debian b/debian/proftpd-basic.README.Debian
index 0a644a2..9835574 100644
--- a/debian/proftpd-basic.README.Debian
+++ b/debian/proftpd-basic.README.Debian
@@ -113,5 +113,5 @@ to be considered by both maintainer and upstreams. Also, do not presume soon to
 found a bug, please think twice before reporting on the Debian BTS, thanks.
 
 If you were more inclined you can try to contact on-line the maintainer or the
-ProFTPd team in the #proftpd channel on irc.freenode.net.
+ProFTPD team in the #proftpd channel on irc.freenode.net.
 
diff --git a/debian/proftpd-basic.config b/debian/proftpd-basic.config
index 511472f..c77bfa1 100644
--- a/debian/proftpd-basic.config
+++ b/debian/proftpd-basic.config
@@ -6,7 +6,7 @@
 action=$1
 version=$2
 
-db_title ProFTPd configuration
+db_title ProFTPD configuration
 
 db_input high shared/proftpd/inetd_or_standalone || true
 db_go
diff --git a/debian/proftpd-basic.init b/debian/proftpd-basic.init
index 9c01192..6fc94b8 100644
--- a/debian/proftpd-basic.init
+++ b/debian/proftpd-basic.init
@@ -130,17 +130,17 @@ case "$1" in
 	    start
 	else
 	    if [ "x$INETD" = "xyes" ] ; then
-		echo "ProFTPd is started from inetd/xinetd."
+		echo "ProFTPD is started from inetd/xinetd."
 		inetd_check
 	    else 
-	    	echo "ProFTPd warning: cannot start neither in standalone nor in inetd/xinetd mode. Check your configuration."
+	    	echo "ProFTPD warning: cannot start neither in standalone nor in inetd/xinetd mode. Check your configuration."
 	    fi
 	fi
 	;;
 
     force-start)
 	if [ "x$INETD" = "xyes" ] ; then
-	    echo "Warning: ProFTPd is started from inetd/xinetd (trying to start anyway)."
+	    echo "Warning: ProFTPD is started from inetd/xinetd (trying to start anyway)."
 		inetd_check
 	fi
 	start
@@ -151,17 +151,17 @@ case "$1" in
 	    signal stop 0
 	else
 	    if [ "x$INETD" = "xyes" ] ; then
-		echo "ProFTPd is started from inetd/xinetd."
+		echo "ProFTPD is started from inetd/xinetd."
 		inetd_check
 	    else 
-	    	echo "ProFTPd warning: cannot start neither in standalone nor in inetd/xinetd mode. Check your configuration."
+	    	echo "ProFTPD warning: cannot start neither in standalone nor in inetd/xinetd mode. Check your configuration."
 	    fi
 	fi
 	;;
 
     force-stop)
 	if [ "x$INETD" = "xyes" ] ; then
-	    echo "Warning: ProFTPd is started from inetd/xinetd (trying to kill anyway)."
+	    echo "Warning: ProFTPD is started from inetd/xinetd (trying to kill anyway)."
 		inetd_check
 	fi
 	signal stop 0
@@ -178,17 +178,17 @@ case "$1" in
 	    start
 	else
 	    if [ "x$INETD" = "xyes" ] ; then
-		echo "ProFTPd is started from inetd/xinetd."
+		echo "ProFTPD is started from inetd/xinetd."
 		inetd_check
 	    else 
-	    	echo "ProFTPd warning: cannot start neither in standalone nor in inetd/xinetd mode. Check your configuration."
+	    	echo "ProFTPD warning: cannot start neither in standalone nor in inetd/xinetd mode. Check your configuration."
 	    fi
 	fi
 	;;
 
     status)
 	if [ "x$INETD" = "xyes" ] ; then
-	    echo "ProFTPd is started from inetd/xinetd."
+	    echo "ProFTPD is started from inetd/xinetd."
 		inetd_check
 		exit 0
 	else 
@@ -198,17 +198,17 @@ case "$1" in
 	    	pid="x"
 	    fi
 	    if [ `pidof proftpd|grep "$pid"|wc -l` -ne 0 ] ; then
-	    	echo "ProFTPd is started in standalone mode, currently running."
+	    	echo "ProFTPD is started in standalone mode, currently running."
 			exit 0
 	    else
-	    	echo "ProFTPd is started in standalone mode, currently not running."
+	    	echo "ProFTPD is started in standalone mode, currently not running."
 			exit 3
 	    fi
 	fi
 	;;
 
     check-config)
-        $DAEMON -t >/dev/null && echo "ProFTPd configuration OK" && exit 0
+        $DAEMON -t >/dev/null && echo "ProFTPD configuration OK" && exit 0
         exit 1
         ;;
 
diff --git a/debian/proftpd-basic.templates b/debian/proftpd-basic.templates
index 9ac1e85..4ca3f86 100644
--- a/debian/proftpd-basic.templates
+++ b/debian/proftpd-basic.templates
@@ -12,12 +12,12 @@ Type: select
 __Choices: from inetd, standalone
 Default: standalone
 _Description: Run proftpd:
- ProFTPd can be run either as a service from inetd, or as a standalone
+ ProFTPD can be run either as a service from inetd, or as a standalone
  server. Each choice has its own benefits. With only a few FTP
- connections per day, it is probably better to run ProFTPd from inetd in
+ connections per day, it is probably better to run ProFTPD from inetd in
  order to save resources.
  .
  On the other hand, with higher traffic,
- ProFTPd should run as a standalone server to avoid spawning a new
+ ProFTPD should run as a standalone server to avoid spawning a new
  process for each incoming connection.
 
diff --git a/debian/proftpd-gencert b/debian/proftpd-gencert
index bb03d44..f757b67 100644
--- a/debian/proftpd-gencert
+++ b/debian/proftpd-gencert
@@ -49,7 +49,7 @@ chmod 0600 $KEY
 chmod 0644 $CERT
 cat <<EOF
 
-Use the following information in your ProFTPd configuration:
+Use the following information in your ProFTPD configuration:
 
 TLSRSACertificateFile    $CERT
 TLSRSACertificateKeyFile $KEY

-- 
ProFTPD core package

