- Fix lintian warnings for debconf tamples.

- Fix the lintian overrides to actually work.

1 files changed, 21 insertions, 26 deletions

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index e8d70ce9f..5c99cb7ca 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rmayr@debian.org\n"
-"POT-Creation-Date: 2006-08-24 16:13+0100\n"
+"POT-Creation-Date: 2006-08-25 17:56+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"
@@ -25,15 +25,13 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../strongswan.templates.master:1002
-msgid "At which level do you wish to start strongSwan ?"
+msgid "When to start strongSwan:"
 msgstr ""
 
 #. Type: select
 #. Description
 #: ../strongswan.templates.master:1002
 msgid ""
-"With the current Debian startup levels (nearly everything starting in level "
-"20), it is impossible for strongSwan to always start at the correct time. "
 "There are three possibilities when strongSwan can start: before or after the "
 "NFS services and after the PCMCIA services. The correct answer depends on "
 "your specific setup."
@@ -91,7 +89,7 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan.templates.master:3001
-msgid "Do you want to create a RSA public/private keypair for this host ?"
+msgid "Do you want to create a RSA public/private keypair for this host?"
 msgstr ""
 
 #. Type: boolean
@@ -124,7 +122,7 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../strongswan.templates.master:4002
-msgid "Which type of RSA keypair do you want to create ?"
+msgid "The type of RSA keypair to create:"
 msgstr ""
 
 #. Type: select
@@ -160,9 +158,7 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan.templates.master:5001
-msgid ""
-"Do you have an existing X509 certificate file that you want to use for "
-"strongSwan ?"
+msgid "Do you have an existing X509 certificate file for strongSwan?"
 msgstr ""
 
 #. Type: boolean
@@ -171,36 +167,36 @@ msgstr ""
 msgid ""
 "This installer can automatically extract the needed information from an "
 "existing X509 certificate with a matching RSA private key. Both parts can be "
-"in one file, if it is in PEM format. Do you have such an existing "
+"in one file, if it is in PEM format. If you have such an existing "
 "certificate and key file and want to use it for authenticating IPSec "
-"connections ?"
+"connections, then please answer yes."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:6001
-msgid "Please enter the location of your X509 certificate in PEM format."
+msgid "File name of your X509 certificate in PEM format:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:6001
 msgid ""
-"Please enter the location of the file containing your X509 certificate in "
-"PEM format."
+"Please enter the full location of the file containing your X509  certificate "
+"in PEM format."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:7001
-msgid "Please enter the location of your X509 private key in PEM format."
+msgid "File name of your X509 private key in PEM format:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:7001
 msgid ""
-"Please enter the location of the file containing the private RSA key "
+"Please enter the full location of the file containing the private RSA key "
 "matching your X509 certificate in PEM format. This can be the same file that "
 "contains the X509 certificate."
 msgstr ""
@@ -208,7 +204,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:8001
-msgid "Which length should the created RSA key have ?"
+msgid "The length of the created RSA key (in bits):"
 msgstr ""
 
 #. Type: string
@@ -224,7 +220,7 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../strongswan.templates.master:9001
-msgid "Do you want to create a self-signed X509 certificate ?"
+msgid "Do you want to create a self-signed X509 certificate?"
 msgstr ""
 
 #. Type: boolean
@@ -252,7 +248,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:10001
-msgid "Please enter the country code for the X509 certificate request."
+msgid "Country code for the X509 certificate request:"
 msgstr ""
 
 #. Type: string
@@ -281,8 +277,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:11001
-msgid ""
-"Please enter the state or province name for the X509 certificate request."
+msgid "State or province name for the X509 certificate request:"
 msgstr ""
 
 #. Type: string
@@ -302,7 +297,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:12001
-msgid "Please enter the locality name for the X509 certificate request."
+msgid "Locality name for the X509 certificate request:"
 msgstr ""
 
 #. Type: string
@@ -322,7 +317,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:13001
-msgid "Please enter the organization name for the X509 certificate request."
+msgid "Organization name for the X509 certificate request:"
 msgstr ""
 
 #. Type: string
@@ -342,7 +337,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:14001
-msgid "Please enter the organizational unit for the X509 certificate request."
+msgid "Organizational unit for the X509 certificate request:"
 msgstr ""
 
 #. Type: string
@@ -363,7 +358,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:15001
-msgid "Please enter the common name for the X509 certificate request."
+msgid "Common name for the X509 certificate request:"
 msgstr ""
 
 #. Type: string
@@ -384,7 +379,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../strongswan.templates.master:16001
-msgid "Please enter the email address for the X509 certificate request."
+msgid "Email address for the X509 certificate request:"
 msgstr ""
 
 #. Type: string