Merge ~lucaskanashiro/ubuntu/+source/strongswan:runtime-dep-on-charon-systemd into ubuntu/+source/strongswan:ubuntu/devel

[Lucas Kanashiro]

Change the default to charon-systemd instead of strongswan-starter. This will enforce users to use the new systemd unit service file instead of the legacy one in new installations.

Some changes on the DEP-8 tests were made to follow the proposed change.

Here is a PPA with the proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/groovy-strongswan/+packages

autopkgtest is happy with the changes:

autopkgtest [19:12:55]: @@@@@@@@@@@@@@@@@@@@ summary
admin-strongswan-charon PASS
admin-strongswan-starter PASS
admin-strongswan-charon-systemd PASS
daemon PASS
plugins PASS

After an acknowledgement from the team I intend to submit those changes to Debian.

[Christian Ehrhardt  (paelzer)]

Thanks for starting this work Lucas!

---

strongswan-starter depends on strongswan-charon (we have that as delta, and functionally it is the truth) I have already submitted that to Debian but we couldn't agree back then.

So in Ubuntu we had:
strongswan -> strongswan-starter -> strongswan-charon
But in Debian without that change ther only was:
strongswan -> strongswan-starter -(recommends)-> strongswan-charon

Now that we change it to use charon-systemd the change above isn't as important anymore (no more the default) but still is needed. I double checked, but the change while correct isn't needed to be part of your suggestion to send to Debian.

Never the less I still think it is the right change to do, depending on your opinion "commit e0c4c337520734bf06ba60946a7472f496808f1a" might be part of this submission as well once it is going to Debian.

----

In the last test change you end up with:
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
-Tests: admin-strongswan-charon admin-strongswan-starter
+Tests: admin-strongswan-charon admin-strongswan-starter admin-strongswan-charon-systemd
 Depends: strongswan, strongswan-starter, strongswan-pki, strongswan-scepclient
 Restrictions: needs-root isolation-container allow-stderr

I think we would never want strongswan-starter AND strongswan->charon-strongswan installed at the same time. Maybe split this test line in two?

Something like this (guessed):
 Tests: admin-strongswan-charon admin-strongswan-starter
 Depends: strongswan-starter, strongswan-pki, strongswan-scepclient
 Restrictions: needs-root isolation-container allow-stderr

 Tests: admin-strongswan-charon-systemd
 Depends: strongswan, strongswan-pki, strongswan-scepclient
 Restrictions: needs-root isolation-container allow-stderr

---

minor typo in commit message "charon-sysmtemd"

---

The following causes some work for package-rename transition but I'd really love to see "strongswan-starter" become something with "-legacy" in its name. With the proper depends/replaces/breaks that isn't too hard and will help a lot to recognize what is going on.

Furthermore "strongswan-starter" as well as "charon-systemd" could really use some more text added to their description in d/control. Right now starter mentions (nice) that it is for ipsec.conf, it should get added that this is legacy. charon-systemd should get added the info that it is meant to towk with swanctl/swanctl.conf

This would get harder if there are external reverse dependencies, need to check that ...

---

One thing still puzzles me, the description of charon-systemd only mentions client.
Could you double check if swanctl.conf can do server and client? Otherwise the comment by Tobias might have led us to a trap.

You can go down to an install without starter which looks like this:
root@g:~# dpkg -l | grep -e charon -e strongswan
ii charon-systemd 5.8.4-1ubuntu2 amd64 strongSwan IPsec client, systemd support
ii libcharon-extauth-plugins 5.8.4-1ubuntu2 amd64 strongSwan charon library (extended authentication plugins)
ii libstrongswan 5.8.4-1ubuntu2 ...

review: Needs Fixing

[Christian Ehrhardt  (paelzer)]

If there is a way we could end up with a Conflicts between strongswan-starter (or whatever we rename it to) and charon-systemd that would be great - I can't see a reason why both should be installable at the same time (other than to confuse users).
But for that the formerly mentioned "does charon-systemd really cover all use cases client+server that starter did" needs to be checked furst.

7e7f1ee... by Lucas Kanashiro on 2020-06-16

Add dependency on strongswan-starter in admin-strongswan-starter DEP-8 test

be433fa... by Lucas Kanashiro on 2020-06-16

Create DEP-8 test to check charon-systemd admin executable file

6854c1e... by Lucas Kanashiro on 2020-06-16

Rename strongswan-starter to strongswan-starter-legacy

This change will make clear for users that they should move to
charon-systemd. Now strongswan-starter is a transitional package.

ee13685... by Lucas Kanashiro on 2020-06-16

Improve the charon-systemd long description

Mention it works in conjuction with swanctl{,.conf}.

7a27afb... by Lucas Kanashiro on 2020-06-16

Rename all packaging files debian/strongswan-starter{,-legacy}.*

fd798fa... by Lucas Kanashiro on 2020-06-16

d/rules: rename all occurrences strongswan-starter{,-legacy}

23926fd... by Lucas Kanashiro on 2020-06-16

Use strongswan-starter-legacy in all PO files

[Lucas Kanashiro (lucaskanashiro)]

Thanks for the review Christian. I think I addressed most of the points you raised.

The only thing that I am not totally convinced that we should do is to make strongswan-starter-legacy conflicts with charon-systemd. I am thinking on the scenario where an user has an installation with strongswan-starter (which would be -legacy from now on) and they try to update to this new release. I belive strongswan binary package will not upgrade because it runtime depends on charon-systemd and it'd conflict with strongswan-starter(-legacy). In this case we'd be preventing users to upgrade strongswan and keep using the strongswan-starter(-legacy) without any issue. Does this make sense to you?

[Christian Ehrhardt  (paelzer)]

This will be enough discussion without being conflicting.
While I think we could make it work it isn't strictly necessary.
+1 to go on without Conflicts

Re-checking the rest.

[Christian Ehrhardt  (paelzer)]

LGTM to kick off the discussion with Debian on the topic.
There might be some minor things I'd nit pick and polish, but there is no gain doing so and then falling off a totally different way int the discussion.

+1 to open up an PR with Debian to discuss with corsac.
Note: You'll need different versions there

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

FYI here is the salsa MR:

https://salsa.debian.org/debian/strongswan/-/merge_requests/10

[Christian Ehrhardt  (paelzer)]

This was an MP for discussion, not meant to be merged.
Rejecting it to clear our overview.

Unmerged commits

1ee6333... by Lucas Kanashiro on 2020-06-15

Update changelog

23926fd... by Lucas Kanashiro on 2020-06-16

Use strongswan-starter-legacy in all PO files

fd798fa... by Lucas Kanashiro on 2020-06-16

d/rules: rename all occurrences strongswan-starter{,-legacy}

7a27afb... by Lucas Kanashiro on 2020-06-16

Rename all packaging files debian/strongswan-starter{,-legacy}.*

ee13685... by Lucas Kanashiro on 2020-06-16

Improve the charon-systemd long description

Mention it works in conjuction with swanctl{,.conf}.

6854c1e... by Lucas Kanashiro on 2020-06-16

Rename strongswan-starter to strongswan-starter-legacy

This change will make clear for users that they should move to
charon-systemd. Now strongswan-starter is a transitional package.

be433fa... by Lucas Kanashiro on 2020-06-16

Create DEP-8 test to check charon-systemd admin executable file

7e7f1ee... by Lucas Kanashiro on 2020-06-16

Add dependency on strongswan-starter in admin-strongswan-starter DEP-8 test

221e5ca... by Lucas Kanashiro on 2020-06-15

Check for charon-systemd in daemon DEP-8 test

07e449f... by Lucas Kanashiro on 2020-06-15

Depend on charon-systemd in daemon DEP-8 test

The default now is charon-systemd and not strongswan-starter.

diff --git a/debian/changelog b/debian/changelog
index 1315154..0efea56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+strongswan (5.8.4-1ubuntu3) groovy; urgency=medium
+
+  * Enforce the use of the new systemd service unit file instead of the legacy
+    one in new installations.
+    - d/control: make strongswan runtime depend on charon-systemd instead of
+      strongswan-starter.
+    - d/t/control: use charon-systemd in daemon DEP-8 test.
+    - d/t/daemon: check for charon-systemd in daemon DEP-8 test.
+    - d/t/control: add dependency on strongswan-starter in
+      admin-strongswan-starter DEP-8 test.
+    - d/t/{control,admin-strongswan-charon-systemd}: create DEP-8 test to
+      check charon-systemd admin executable file.
+    - d/control: improve the charon-systemd long description.
+    - d/control: rename strongswan-starter to strongswan-starter-legacy. This
+      change will make clear for users that they should move to charon-systemd.
+      Now strongswan-starter is a transitional package.
+      + Rename all packaging files debian/strongswan-starter{,-legacy}.*
+      + d/rules: rename all occurrences strongswan-starter{,-legacy}.
+      + d/po/*: use strongswan-starter-legacy in all PO files.
+
+ -- Lucas Kanashiro <[e-mail]>  Tue, 16 Jun 2020 17:18:46 -0300
+
 strongswan (5.8.4-1ubuntu2) groovy; urgency=medium
 
   * Re-enable eap-{dynamic,peap} libcharon plugins (LP: #1878887)
diff --git a/debian/control b/debian/control
index fbd59a0..703e08e 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Homepage: http://www.strongswan.org
 
 Package: strongswan
 Architecture: all
-Depends: strongswan-charon, strongswan-starter, ${misc:Depends}
+Depends: strongswan-charon, charon-systemd, ${misc:Depends}
 Description: IPsec VPN solution metapackage
  The strongSwan VPN suite uses the native IPsec stack in the standard Linux
  kernel. It supports both the IKEv1 and IKEv2 protocols.
@@ -209,6 +209,21 @@ Description: strongSwan charon library (extra plugins)
   - eap-peap (EAP-PEAP protocol handler, wraps other EAP methods securely)
 
 Package: strongswan-starter
+Architecture: all
+Depends: strongswan-starter-legacy
+Section: oldlibs
+Description: strongSwan daemon starter (transitional package)
+ The strongSwan VPN suite uses the native IPsec stack in the standard
+ Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
+ .
+ The starter and the associated "ipsec" script control the charon daemon from
+ the command line. It parses ipsec.conf and loads the configurations to the
+ daemon.
+ .
+ This is a transitional package. It was renamed to strongswan-starter-legacy,
+ and you should consider moving to charon-systemd.
+
+Package: strongswan-starter-legacy
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: adduser,
@@ -218,6 +233,8 @@ Depends: adduser,
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: openswan
+Replaces: strongswan-starter (<< 5.8.4-1ubuntu3~)
+Breaks: strongswan-starter (<< 5.8.4-1ubuntu3~)
 Description: strongSwan daemon starter and configuration file parser
  The strongSwan VPN suite uses the native IPsec stack in the standard
  Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
@@ -225,6 +242,9 @@ Description: strongSwan daemon starter and configuration file parser
  The starter and the associated "ipsec" script control the charon daemon from
  the command line. It parses ipsec.conf and loads the configurations to the
  daemon.
+ .
+ This is a legacy package, the recommended way to manage the daemon via systemd
+ is using charon-systemd. Consider moving to charon-systemd.
 
 Package: strongswan-libcharon
 Architecture: any
@@ -257,7 +277,7 @@ Depends: iproute2 [linux-any] | iproute [linux-any],
          libstrongswan (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Recommends: strongswan-starter,
+Recommends: strongswan-starter-legacy,
 Provides: ike-server
 Description: strongSwan Internet Key Exchange daemon
  The strongSwan VPN suite uses the native IPsec stack in the standard
@@ -341,4 +361,5 @@ Description: strongSwan IPsec client, systemd support
  The strongSwan VPN suite uses the native IPsec stack in the standard
  Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
  .
- This package contains the charon-systemd files.
+ This package contains the charon-systemd files. It works in conjunction with
+ swanctl command and swanctl.conf file provided by strongswan-swanctl package.
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index d98f2ea..94d150f 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1 +1 @@
-[type: gettext/rfc822deb] strongswan-starter.templates
+[type: gettext/rfc822deb] strongswan-starter-legacy.templates
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 5e81998..8ef2ffb 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -24,13 +24,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid "Restart strongSwan now?"
 msgstr "Restartovat nyní strongSwan?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid ""
 "Restarting strongSwan is recommended, since if there is a security fix, it "
 "will not be applied until the daemon restarts. Most people expect the daemon "
@@ -46,13 +46,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid "Use an X.509 certificate for this host?"
 msgstr "Použít pro tento počítač certifikát X.509?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "An X.509 certificate for this host can be automatically created or imported. "
 "It can be used to authenticate IPsec connections to other hosts and is the "
@@ -71,7 +71,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "Alternatively you can reject this option and later use the command \"dpkg-"
 "reconfigure strongswan\" to come back."
@@ -81,25 +81,25 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "create"
 msgstr "vytvořit"
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "import"
 msgstr "importovat"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid "Methods for using a X.509 certificate to authenticate this host:"
 msgstr "Získání certifikátu X.509 pro autentizaci tohoto počítače:"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "It is possible to create a new X.509 certificate with user-defined settings "
 "or to import an existing public and private key stored in PEM file(s) for "
@@ -111,7 +111,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you choose to create a new X.509 certificate you will first be asked a "
 "number of questions which must be answered before the creation can start. "
@@ -128,7 +128,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you want to import an existing public and private key you will be "
 "prompted for their filenames (which may be identical if both parts are "
@@ -148,13 +148,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid "File name of your PEM format X.509 certificate:"
 msgstr "Jméno souboru s certifikátem X.509 ve formátu PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid ""
 "Please enter the location of the file containing your X.509 certificate in "
 "PEM format."
@@ -163,13 +163,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid "File name of your PEM format X.509 private key:"
 msgstr "Jméno souboru se soukromým klíčem X.509 ve formátu PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid ""
 "Please enter the location of the file containing the private RSA key "
 "matching your X.509 certificate in PEM format. This can be the same file "
@@ -181,13 +181,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid "File name of your PEM format X.509 RootCA:"
 msgstr "Jméno souboru s kořenovou certifikační autoritou X.509 ve formátu PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid ""
 "Optionally you can now enter the location of the file containing the X.509 "
 "Certificate Authority root used to sign your certificate in PEM format. If "
@@ -203,13 +203,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid "Please enter which length the created RSA key should have:"
 msgstr "Zadejte délku vytvářeného RSA klíče:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid ""
 "Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
@@ -222,13 +222,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid "Create a self-signed X.509 certificate?"
 msgstr "Vytvořit certifikát X.509 podepsaný sám sebou?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "Only self-signed X.509 certificates can be created automatically, because "
 "otherwise a Certificate Authority is needed to sign the certificate request. "
@@ -248,7 +248,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "If you do not choose to create a self-signed certificate, only the RSA "
 "private key and the certificate request will be created, and you will have "
@@ -260,13 +260,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid "Country code for the X.509 certificate request:"
 msgstr "Kód státu pro požadavek na certifikát X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "Please enter the two-letter code for the country the server resides in (such "
 "as \"AT\" for Austria)."
@@ -276,7 +276,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "OpenSSL will refuse to generate a certificate unless this is a valid "
 "ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
@@ -288,13 +288,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid "State or province name for the X.509 certificate request:"
 msgstr "Jméno země nebo oblasti pro požadavek na certifikát X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid ""
 "Please enter the full name of the state or province the server resides in "
 "(such as \"Upper Austria\")."
@@ -304,13 +304,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid "Locality name for the X.509 certificate request:"
 msgstr "Jméno lokality pro požadavek na certifikát X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid ""
 "Please enter the locality the server resides in (often a city, such as "
 "\"Vienna\")."
@@ -320,26 +320,26 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid "Organization name for the X.509 certificate request:"
 msgstr "Název organizace pro požadavek na certifikát X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid ""
 "Please enter the organization the server belongs to (such as \"Debian\")."
 msgstr "Zadejte název organizace, které server patří (například „Debian“)."
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid "Organizational unit for the X.509 certificate request:"
 msgstr "Název organizační jednotky pro požadavek na certifikát X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid ""
 "Please enter the organizational unit the server belongs to (such as "
 "\"security group\")."
@@ -349,13 +349,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid "Common Name for the X.509 certificate request:"
 msgstr "Obecné jméno pro požadavek na certifikát X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid ""
 "Please enter the Common Name for this host (such as \"gateway.example.org\")."
 msgstr ""
@@ -363,13 +363,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid "Email address for the X.509 certificate request:"
 msgstr "Emailová adresa pro požadavek na certifikát X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid ""
 "Please enter the email address of the person or organization responsible for "
 "the X.509 certificate."
@@ -379,13 +379,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid "Enable opportunistic encryption?"
 msgstr "Povolit oportunistické šifrování?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "This version of strongSwan supports opportunistic encryption (OE), which "
 "stores IPSec authentication information in DNS records. Until this is widely "
@@ -399,7 +399,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "You should only enable opportunistic encryption if you are sure you want it. "
 "It may break the Internet connection (default route) as the daemon starts."
diff --git a/debian/po/da.po b/debian/po/da.po
index 3c494c4..100a408 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid "Restart strongSwan now?"
 msgstr "Genstart strongSwan nu?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid ""
 "Restarting strongSwan is recommended, since if there is a security fix, it "
 "will not be applied until the daemon restarts. Most people expect the daemon "
@@ -41,13 +41,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid "Use an X.509 certificate for this host?"
 msgstr "Brug et X.509-certifikat for denne vært?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "An X.509 certificate for this host can be automatically created or imported. "
 "It can be used to authenticate IPsec connections to other hosts and is the "
@@ -67,7 +67,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "Alternatively you can reject this option and later use the command \"dpkg-"
 "reconfigure strongswan\" to come back."
@@ -77,26 +77,26 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "create"
 msgstr "opret"
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "import"
 msgstr "importer"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid "Methods for using a X.509 certificate to authenticate this host:"
 msgstr ""
 "Metoder hvormed et X.509-certifikat kan bruges til at godkende denne vært:"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "It is possible to create a new X.509 certificate with user-defined settings "
 "or to import an existing public and private key stored in PEM file(s) for "
@@ -108,7 +108,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you choose to create a new X.509 certificate you will first be asked a "
 "number of questions which must be answered before the creation can start. "
@@ -126,7 +126,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you want to import an existing public and private key you will be "
 "prompted for their filenames (which may be identical if both parts are "
@@ -146,13 +146,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid "File name of your PEM format X.509 certificate:"
 msgstr "Filnavn på dit PEM-formateret X.509-certifikat:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid ""
 "Please enter the location of the file containing your X.509 certificate in "
 "PEM format."
@@ -162,13 +162,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid "File name of your PEM format X.509 private key:"
 msgstr "Filnavn på din private PEM-formateret X.509-nøgle:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid ""
 "Please enter the location of the file containing the private RSA key "
 "matching your X.509 certificate in PEM format. This can be the same file "
@@ -180,13 +180,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid "File name of your PEM format X.509 RootCA:"
 msgstr "Filnavn på dit PEM-formaterede X.509-RootCA:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid ""
 "Optionally you can now enter the location of the file containing the X.509 "
 "Certificate Authority root used to sign your certificate in PEM format. If "
@@ -202,13 +202,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid "Please enter which length the created RSA key should have:"
 msgstr "Indtast venligst hvilken længde den oprettede RSA-nøgle skal have:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid ""
 "Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
@@ -222,13 +222,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid "Create a self-signed X.509 certificate?"
 msgstr "Opret et X.509-certifikat du selv har underskrevet?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "Only self-signed X.509 certificates can be created automatically, because "
 "otherwise a Certificate Authority is needed to sign the certificate request. "
@@ -249,7 +249,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "If you do not choose to create a self-signed certificate, only the RSA "
 "private key and the certificate request will be created, and you will have "
@@ -261,7 +261,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid "Country code for the X.509 certificate request:"
 msgstr "Landekode for X.509-certifikatforespørgslen:"
 
@@ -271,7 +271,7 @@ msgstr "Landekode for X.509-certifikatforespørgslen:"
 # som Midtjylland DK-82 med flere.
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "Please enter the two-letter code for the country the server resides in (such "
 "as \"AT\" for Austria)."
@@ -281,7 +281,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "OpenSSL will refuse to generate a certificate unless this is a valid "
 "ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
@@ -293,13 +293,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid "State or province name for the X.509 certificate request:"
 msgstr "Stat eller provinsnavn for X.509-certifikatforespørgslen:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid ""
 "Please enter the full name of the state or province the server resides in "
 "(such as \"Upper Austria\")."
@@ -309,13 +309,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid "Locality name for the X.509 certificate request:"
 msgstr "Lokalitetsnavn for X.509-certifikatforespørgslen:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid ""
 "Please enter the locality the server resides in (often a city, such as "
 "\"Vienna\")."
@@ -325,13 +325,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid "Organization name for the X.509 certificate request:"
 msgstr "Organisationsnavn for X.509-certifikatforespørglsen:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid ""
 "Please enter the organization the server belongs to (such as \"Debian\")."
 msgstr ""
@@ -339,13 +339,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid "Organizational unit for the X.509 certificate request:"
 msgstr "Organisationsgruppe for X.509-certifikatforespørgslen:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid ""
 "Please enter the organizational unit the server belongs to (such as "
 "\"security group\")."
@@ -355,13 +355,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid "Common Name for the X.509 certificate request:"
 msgstr "Betegnelsen for X.509-certifikatforespørgslen:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid ""
 "Please enter the Common Name for this host (such as \"gateway.example.org\")."
 msgstr ""
@@ -370,13 +370,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid "Email address for the X.509 certificate request:"
 msgstr "E-post-adresse for X.509-certifikatforespørgslen:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid ""
 "Please enter the email address of the person or organization responsible for "
 "the X.509 certificate."
@@ -386,13 +386,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid "Enable opportunistic encryption?"
 msgstr "Aktiver opportunistisk kryptering?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "This version of strongSwan supports opportunistic encryption (OE), which "
 "stores IPSec authentication information in DNS records. Until this is widely "
@@ -406,7 +406,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "You should only enable opportunistic encryption if you are sure you want it. "
 "It may break the Internet connection (default route) as the daemon starts."
diff --git a/debian/po/de.po b/debian/po/de.po
index 54b0090..8231389 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid "Restart strongSwan now?"
 msgstr "StrongSwan jetzt starten?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid ""
 "Restarting strongSwan is recommended, since if there is a security fix, it "
 "will not be applied until the daemon restarts. Most people expect the daemon "
@@ -42,13 +42,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid "Use an X.509 certificate for this host?"
 msgstr "Für diesen Rechner ein X.509-Zertifikat verwenden?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "An X.509 certificate for this host can be automatically created or imported. "
 "It can be used to authenticate IPsec connections to other hosts and is the "
@@ -69,7 +69,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "Alternatively you can reject this option and later use the command \"dpkg-"
 "reconfigure strongswan\" to come back."
@@ -79,19 +79,19 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "create"
 msgstr "erstellen"
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "import"
 msgstr "importieren"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid "Methods for using a X.509 certificate to authenticate this host:"
 msgstr ""
 "Methoden für die Authentifizierung dieses Rechners mittels eines X.509-"
@@ -99,7 +99,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "It is possible to create a new X.509 certificate with user-defined settings "
 "or to import an existing public and private key stored in PEM file(s) for "
@@ -112,7 +112,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you choose to create a new X.509 certificate you will first be asked a "
 "number of questions which must be answered before the creation can start. "
@@ -133,7 +133,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you want to import an existing public and private key you will be "
 "prompted for their filenames (which may be identical if both parts are "
@@ -155,13 +155,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid "File name of your PEM format X.509 certificate:"
 msgstr "Dateiname Ihres X.509-Zertifikats im PEM-Format:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid ""
 "Please enter the location of the file containing your X.509 certificate in "
 "PEM format."
@@ -171,13 +171,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid "File name of your PEM format X.509 private key:"
 msgstr "Dateiname des privaten X.509-Schlüssels im PEM-Format:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid ""
 "Please enter the location of the file containing the private RSA key "
 "matching your X.509 certificate in PEM format. This can be the same file "
@@ -189,13 +189,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid "File name of your PEM format X.509 RootCA:"
 msgstr "Dateinamen Ihrer PEM-Format-X.509-RootCA:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid ""
 "Optionally you can now enter the location of the file containing the X.509 "
 "Certificate Authority root used to sign your certificate in PEM format. If "
@@ -212,14 +212,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid "Please enter which length the created RSA key should have:"
 msgstr ""
 "Bitte geben Sie ein, welche Länge der erstellte RSA-Schlüssels haben soll:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid ""
 "Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
@@ -233,13 +233,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid "Create a self-signed X.509 certificate?"
 msgstr "Selbstsigniertes X.509-Zertifikat erstellen?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "Only self-signed X.509 certificates can be created automatically, because "
 "otherwise a Certificate Authority is needed to sign the certificate request. "
@@ -260,7 +260,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "If you do not choose to create a self-signed certificate, only the RSA "
 "private key and the certificate request will be created, and you will have "
@@ -273,13 +273,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid "Country code for the X.509 certificate request:"
 msgstr "Ländercode für die X.509-Zertifikatsanforderung:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "Please enter the two-letter code for the country the server resides in (such "
 "as \"AT\" for Austria)."
@@ -289,7 +289,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "OpenSSL will refuse to generate a certificate unless this is a valid "
 "ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
@@ -301,13 +301,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid "State or province name for the X.509 certificate request:"
 msgstr "Name des Landes oder der Provinz für diese X.509-Zertifikatsanfrage:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid ""
 "Please enter the full name of the state or province the server resides in "
 "(such as \"Upper Austria\")."
@@ -317,13 +317,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid "Locality name for the X.509 certificate request:"
 msgstr "Ort für die X.509-Zertifikatsanforderung:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid ""
 "Please enter the locality the server resides in (often a city, such as "
 "\"Vienna\")."
@@ -333,13 +333,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid "Organization name for the X.509 certificate request:"
 msgstr "Organisationsname für die X.509-Zertifikatsanforderung:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid ""
 "Please enter the organization the server belongs to (such as \"Debian\")."
 msgstr ""
@@ -348,13 +348,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid "Organizational unit for the X.509 certificate request:"
 msgstr "Organisationseinheit für die X.509-Zertifikatsanforderung:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid ""
 "Please enter the organizational unit the server belongs to (such as "
 "\"security group\")."
@@ -364,13 +364,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid "Common Name for the X.509 certificate request:"
 msgstr "»Common Name« für die X.509-Zertifikatsanforderung:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid ""
 "Please enter the Common Name for this host (such as \"gateway.example.org\")."
 msgstr ""
@@ -379,13 +379,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid "Email address for the X.509 certificate request:"
 msgstr "E-Mail-Adresse für die X.509-Zertifikatsanforderung:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid ""
 "Please enter the email address of the person or organization responsible for "
 "the X.509 certificate."
@@ -395,13 +395,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid "Enable opportunistic encryption?"
 msgstr "Opportunistische Verschlüsselung aktivieren?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "This version of strongSwan supports opportunistic encryption (OE), which "
 "stores IPSec authentication information in DNS records. Until this is widely "
@@ -415,7 +415,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "You should only enable opportunistic encryption if you are sure you want it. "
 "It may break the Internet connection (default route) as the daemon starts."
diff --git a/debian/po/es.po b/debian/po/es.po
index 797e8cf..3eb2283 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -42,13 +42,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid "Restart strongSwan now?"
 msgstr "¿Desea reiniciar strongSwan ahora mismo?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid ""
 "Restarting strongSwan is recommended, since if there is a security fix, it "
 "will not be applied until the daemon restarts. Most people expect the daemon "
@@ -65,13 +65,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid "Use an X.509 certificate for this host?"
 msgstr "¿Desea utilizar un certificado X.509 para esta máquina?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "An X.509 certificate for this host can be automatically created or imported. "
 "It can be used to authenticate IPsec connections to other hosts and is the "
@@ -91,7 +91,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "Alternatively you can reject this option and later use the command \"dpkg-"
 "reconfigure strongswan\" to come back."
@@ -101,26 +101,26 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "create"
 msgstr "crear"
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "import"
 msgstr "importar"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid "Methods for using a X.509 certificate to authenticate this host:"
 msgstr ""
 "Métodos para utilizar un certificado X.509 para autenticar esta máquina:"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "It is possible to create a new X.509 certificate with user-defined settings "
 "or to import an existing public and private key stored in PEM file(s) for "
@@ -132,7 +132,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you choose to create a new X.509 certificate you will first be asked a "
 "number of questions which must be answered before the creation can start. "
@@ -151,7 +151,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you want to import an existing public and private key you will be "
 "prompted for their filenames (which may be identical if both parts are "
@@ -172,13 +172,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid "File name of your PEM format X.509 certificate:"
 msgstr "Nombre del archivo del certificado X.509 en formato PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid ""
 "Please enter the location of the file containing your X.509 certificate in "
 "PEM format."
@@ -188,14 +188,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid "File name of your PEM format X.509 private key:"
 msgstr ""
 "Nombre del archivo de la clave privada del certificado X.509 en formato PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid ""
 "Please enter the location of the file containing the private RSA key "
 "matching your X.509 certificate in PEM format. This can be the same file "
@@ -207,7 +207,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid "File name of your PEM format X.509 RootCA:"
 msgstr ""
 "Nombre del archivo del certificado X.509 de la raíz de la Autoridad de "
@@ -215,7 +215,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid ""
 "Optionally you can now enter the location of the file containing the X.509 "
 "Certificate Authority root used to sign your certificate in PEM format. If "
@@ -232,13 +232,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid "Please enter which length the created RSA key should have:"
 msgstr "Introduzca la longitud que debería tener la clave RSA a crear:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid ""
 "Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
@@ -252,13 +252,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid "Create a self-signed X.509 certificate?"
 msgstr "¿Desea crear un certificado X.509 auto-firmado?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "Only self-signed X.509 certificates can be created automatically, because "
 "otherwise a Certificate Authority is needed to sign the certificate request. "
@@ -279,7 +279,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "If you do not choose to create a self-signed certificate, only the RSA "
 "private key and the certificate request will be created, and you will have "
@@ -291,13 +291,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid "Country code for the X.509 certificate request:"
 msgstr "Código del país para la petición del certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "Please enter the two-letter code for the country the server resides in (such "
 "as \"AT\" for Austria)."
@@ -307,7 +307,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "OpenSSL will refuse to generate a certificate unless this is a valid "
 "ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
@@ -319,13 +319,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid "State or province name for the X.509 certificate request:"
 msgstr "Estado o provincia para la petición del certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid ""
 "Please enter the full name of the state or province the server resides in "
 "(such as \"Upper Austria\")."
@@ -335,13 +335,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid "Locality name for the X.509 certificate request:"
 msgstr "Nombre de la localidad para la petición del certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid ""
 "Please enter the locality the server resides in (often a city, such as "
 "\"Vienna\")."
@@ -351,13 +351,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid "Organization name for the X.509 certificate request:"
 msgstr "Nombre de la organización para la petición del certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid ""
 "Please enter the organization the server belongs to (such as \"Debian\")."
 msgstr ""
@@ -366,13 +366,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid "Organizational unit for the X.509 certificate request:"
 msgstr "Nombre del departamento para la petición del certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid ""
 "Please enter the organizational unit the server belongs to (such as "
 "\"security group\")."
@@ -383,13 +383,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid "Common Name for the X.509 certificate request:"
 msgstr "Nombre Común (CN) para la petición del certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid ""
 "Please enter the Common Name for this host (such as \"gateway.example.org\")."
 msgstr ""
@@ -398,14 +398,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid "Email address for the X.509 certificate request:"
 msgstr ""
 "Dirección de correo electrónico para la petición del certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid ""
 "Please enter the email address of the person or organization responsible for "
 "the X.509 certificate."
@@ -415,13 +415,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid "Enable opportunistic encryption?"
 msgstr "¿Desea activar el cifrado oportunista?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "This version of strongSwan supports opportunistic encryption (OE), which "
 "stores IPSec authentication information in DNS records. Until this is widely "
@@ -436,7 +436,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "You should only enable opportunistic encryption if you are sure you want it. "
 "It may break the Internet connection (default route) as the daemon starts."
diff --git a/debian/po/eu.po b/debian/po/eu.po
index f87c06c..fcf5a06 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid "Restart strongSwan now?"
 msgstr "Berrabiarazi StrongSwan orain?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid ""
 "Restarting strongSwan is recommended, since if there is a security fix, it "
 "will not be applied until the daemon restarts. Most people expect the daemon "
@@ -44,13 +44,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid "Use an X.509 certificate for this host?"
 msgstr "X.509 ziurtagiria erabili ostalari honentzako?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "An X.509 certificate for this host can be automatically created or imported. "
 "It can be used to authenticate IPsec connections to other hosts and is the "
@@ -70,7 +70,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "Alternatively you can reject this option and later use the command \"dpkg-"
 "reconfigure strongswan\" to come back."
@@ -80,25 +80,25 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "create"
 msgstr "sortu"
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "import"
 msgstr "inportatu"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid "Methods for using a X.509 certificate to authenticate this host:"
 msgstr "Metodoa ostalari hau X.509 ziurtagiria erabiliz autentifikatzeko:"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "It is possible to create a new X.509 certificate with user-defined settings "
 "or to import an existing public and private key stored in PEM file(s) for "
@@ -110,7 +110,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you choose to create a new X.509 certificate you will first be asked a "
 "number of questions which must be answered before the creation can start. "
@@ -129,7 +129,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you want to import an existing public and private key you will be "
 "prompted for their filenames (which may be identical if both parts are "
@@ -149,13 +149,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid "File name of your PEM format X.509 certificate:"
 msgstr "Zure PEM formatuko X.509 ziurtagiriaren fitxategi-izena :"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid ""
 "Please enter the location of the file containing your X.509 certificate in "
 "PEM format."
@@ -165,13 +165,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid "File name of your PEM format X.509 private key:"
 msgstr "PEM formatuko X.509 gako pribatuaren fitxategi-izena :"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid ""
 "Please enter the location of the file containing the private RSA key "
 "matching your X.509 certificate in PEM format. This can be the same file "
@@ -183,13 +183,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid "File name of your PEM format X.509 RootCA:"
 msgstr "PEM formatuko X.509 ziurtagiriaren fitxategi-izena:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid ""
 "Optionally you can now enter the location of the file containing the X.509 "
 "Certificate Authority root used to sign your certificate in PEM format. If "
@@ -205,13 +205,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid "Please enter which length the created RSA key should have:"
 msgstr "Sartu sortutako RSA gakoak edukiko duen luzera:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid ""
 "Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
@@ -225,13 +225,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid "Create a self-signed X.509 certificate?"
 msgstr "Sortu auto-sinatutako X.509 ziurtagiria?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "Only self-signed X.509 certificates can be created automatically, because "
 "otherwise a Certificate Authority is needed to sign the certificate request. "
@@ -251,7 +251,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "If you do not choose to create a self-signed certificate, only the RSA "
 "private key and the certificate request will be created, and you will have "
@@ -263,13 +263,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid "Country code for the X.509 certificate request:"
 msgstr "X.509 ziurtagiriaren eskaeraren herrialdearen kodea:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "Please enter the two-letter code for the country the server resides in (such "
 "as \"AT\" for Austria)."
@@ -279,7 +279,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "OpenSSL will refuse to generate a certificate unless this is a valid "
 "ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
@@ -291,13 +291,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid "State or province name for the X.509 certificate request:"
 msgstr "X.509 ziurtagiri eskaeraren estatu edo probintziaren izena:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid ""
 "Please enter the full name of the state or province the server resides in "
 "(such as \"Upper Austria\")."
@@ -307,13 +307,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid "Locality name for the X.509 certificate request:"
 msgstr "X.509 ziurtagiri eskaeraren herriaren izena:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid ""
 "Please enter the locality the server resides in (often a city, such as "
 "\"Vienna\")."
@@ -323,26 +323,26 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid "Organization name for the X.509 certificate request:"
 msgstr "X.509 ziurtagiri eskaeraren erakundearen izena:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid ""
 "Please enter the organization the server belongs to (such as \"Debian\")."
 msgstr "Idatzi zerbitzaria duen erakundea (adibidez, \"Debian\")"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid "Organizational unit for the X.509 certificate request:"
 msgstr "X.509 ziurtagiri eskaeraren saila:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid ""
 "Please enter the organizational unit the server belongs to (such as "
 "\"security group\")."
@@ -350,13 +350,13 @@ msgstr "Idatzi zerbitzaria duen saila (adibidez, \"segurtasunaren taldea\")"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid "Common Name for the X.509 certificate request:"
 msgstr "X.509 ziurtagiri eskaeraren izen arrunta:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid ""
 "Please enter the Common Name for this host (such as \"gateway.example.org\")."
 msgstr ""
@@ -364,13 +364,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid "Email address for the X.509 certificate request:"
 msgstr "X.509 ziurtagiri eskaeraren helbide elektronikoa:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid ""
 "Please enter the email address of the person or organization responsible for "
 "the X.509 certificate."
@@ -380,13 +380,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid "Enable opportunistic encryption?"
 msgstr "Gaitu enkriptazio oportunista?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "This version of strongSwan supports opportunistic encryption (OE), which "
 "stores IPSec authentication information in DNS records. Until this is widely "
@@ -400,7 +400,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "You should only enable opportunistic encryption if you are sure you want it. "
 "It may break the Internet connection (default route) as the daemon starts."
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 3a00984..a2d01e2 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid "Restart strongSwan now?"
 msgstr "Käynnistetäänkö strongSwan uudelleen nyt?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Restarting strongSwan is recommended, because if there is a security fix, "
@@ -45,7 +45,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 #, fuzzy
 #| msgid "Use an existing X.509 certificate for strongSwan?"
 msgid "Use an X.509 certificate for this host?"
@@ -53,7 +53,7 @@ msgstr "Tulisiko strongSwanin käyttää olemassa olevaa X.509-varmennetiedostoa
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "An X.509 certificate for this host can be automatically created or imported. "
 "It can be used to authenticate IPsec connections to other hosts and is the "
@@ -66,7 +66,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "Alternatively you can reject this option and later use the command \"dpkg-"
 "reconfigure strongswan\" to come back."
@@ -74,25 +74,25 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "create"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "import"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid "Methods for using a X.509 certificate to authenticate this host:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "It is possible to create a new X.509 certificate with user-defined settings "
 "or to import an existing public and private key stored in PEM file(s) for "
@@ -101,7 +101,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you choose to create a new X.509 certificate you will first be asked a "
 "number of questions which must be answered before the creation can start. "
@@ -113,7 +113,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you want to import an existing public and private key you will be "
 "prompted for their filenames (which may be identical if both parts are "
@@ -126,7 +126,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 #, fuzzy
 #| msgid "File name of your X.509 certificate in PEM format:"
 msgid "File name of your PEM format X.509 certificate:"
@@ -134,7 +134,7 @@ msgstr "PEM-muodossa olevan X.509-varmennetiedoston nimi:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Please enter the full location of the file containing your X.509 "
@@ -148,7 +148,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 #, fuzzy
 #| msgid "File name of your existing X.509 private key in PEM format:"
 msgid "File name of your PEM format X.509 private key:"
@@ -156,7 +156,7 @@ msgstr "PEM-muotoisen, olemassa olevan, salaisen X.509-avaimen tiedostonimi:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 #, fuzzy
 #| msgid ""
 #| "Please enter the full location of the file containing the private RSA key "
@@ -173,7 +173,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 #, fuzzy
 #| msgid "File name of your X.509 certificate in PEM format:"
 msgid "File name of your PEM format X.509 RootCA:"
@@ -181,7 +181,7 @@ msgstr "PEM-muodossa olevan X.509-varmennetiedoston nimi:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid ""
 "Optionally you can now enter the location of the file containing the X.509 "
 "Certificate Authority root used to sign your certificate in PEM format. If "
@@ -192,13 +192,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid "Please enter which length the created RSA key should have:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid ""
 "Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
@@ -208,7 +208,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 #, fuzzy
 #| msgid "Create a self-signed X.509 certificate?"
 msgid "Create a self-signed X.509 certificate?"
@@ -216,7 +216,7 @@ msgstr "Luodaanko itseallekirjoitettu X.509-varmenne?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "Only self-signed X.509 certificates can be created automatically, because "
 "otherwise a Certificate Authority is needed to sign the certificate request. "
@@ -229,7 +229,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 #, fuzzy
 #| msgid ""
 #| "If you do not accept this option, only the RSA private key will be "
@@ -246,7 +246,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 #, fuzzy
 #| msgid "Country code for the X.509 certificate request:"
 msgid "Country code for the X.509 certificate request:"
@@ -254,7 +254,7 @@ msgstr "X.509-varmennepyynnön maakoodi:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "Please enter the two-letter code for the country the server resides in (such "
 "as \"AT\" for Austria)."
@@ -262,7 +262,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "OpenSSL will refuse to generate a certificate unless this is a valid "
 "ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
@@ -271,7 +271,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 #, fuzzy
 #| msgid "State or province name for the X.509 certificate request:"
 msgid "State or province name for the X.509 certificate request:"
@@ -279,7 +279,7 @@ msgstr "X.509-varmennepyynnön osavaltio, lääni tai maakunta:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 #, fuzzy
 #| msgid ""
 #| "Please enter the full name of the state or province to include in the "
@@ -293,7 +293,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 #, fuzzy
 #| msgid "Locality name for the X.509 certificate request:"
 msgid "Locality name for the X.509 certificate request:"
@@ -301,7 +301,7 @@ msgstr "X.509-varmennepyynnön paikkakunta:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid ""
 "Please enter the locality the server resides in (often a city, such as "
 "\"Vienna\")."
@@ -309,7 +309,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 #, fuzzy
 #| msgid "Organization name for the X.509 certificate request:"
 msgid "Organization name for the X.509 certificate request:"
@@ -317,14 +317,14 @@ msgstr "X.509-varmennepyynnön järjestön nimi:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid ""
 "Please enter the organization the server belongs to (such as \"Debian\")."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 #, fuzzy
 #| msgid "Organizational unit for the X.509 certificate request:"
 msgid "Organizational unit for the X.509 certificate request:"
@@ -332,7 +332,7 @@ msgstr "X.509-varmennepyynnön järjestön yksikkö:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 #, fuzzy
 #| msgid "Organizational unit for the X.509 certificate request:"
 msgid ""
@@ -342,7 +342,7 @@ msgstr "X.509-varmennepyynnön järjestön yksikkö:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 #, fuzzy
 #| msgid "Common name for the X.509 certificate request:"
 msgid "Common Name for the X.509 certificate request:"
@@ -350,14 +350,14 @@ msgstr "X.509-varmennepyynnön yleinen nimi:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid ""
 "Please enter the Common Name for this host (such as \"gateway.example.org\")."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 #, fuzzy
 #| msgid "Email address for the X.509 certificate request:"
 msgid "Email address for the X.509 certificate request:"
@@ -365,7 +365,7 @@ msgstr "X.509-varmennepyynnön sähköpostiosoite:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 #, fuzzy
 #| msgid ""
 #| "Please enter the email address (for the individual or organization "
@@ -378,13 +378,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid "Enable opportunistic encryption?"
 msgstr "Käytetäänkö opportunistista salausta?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "This version of strongSwan supports opportunistic encryption (OE), which "
 "stores IPSec authentication information in DNS records. Until this is widely "
@@ -398,7 +398,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 #, fuzzy
 #| msgid ""
 #| "You should only enable opportunistic encryption if you are sure you want "
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 2596512..ffdafdd 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid "Restart strongSwan now?"
 msgstr "Faut-il redémarrer StrongSwan maintenant ?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid ""
 "Restarting strongSwan is recommended, since if there is a security fix, it "
 "will not be applied until the daemon restarts. Most people expect the daemon "
@@ -44,13 +44,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid "Use an X.509 certificate for this host?"
 msgstr "Faut-il utiliser un certificat X.509 existant avec cet hôte ?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "An X.509 certificate for this host can be automatically created or imported. "
 "It can be used to authenticate IPsec connections to other hosts and is the "
@@ -71,7 +71,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "Alternatively you can reject this option and later use the command \"dpkg-"
 "reconfigure strongswan\" to come back."
@@ -81,19 +81,19 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "create"
 msgstr "Créer"
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "import"
 msgstr "Importer"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid "Methods for using a X.509 certificate to authenticate this host:"
 msgstr ""
 "Méthode de mise en place d'un certificat X.509 pour l'authentification de "
@@ -101,7 +101,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "It is possible to create a new X.509 certificate with user-defined settings "
 "or to import an existing public and private key stored in PEM file(s) for "
@@ -113,7 +113,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you choose to create a new X.509 certificate you will first be asked a "
 "number of questions which must be answered before the creation can start. "
@@ -131,7 +131,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you want to import an existing public and private key you will be "
 "prompted for their filenames (which may be identical if both parts are "
@@ -151,13 +151,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid "File name of your PEM format X.509 certificate:"
 msgstr "Nom du fichier PEM contenant le certificat X.509 :"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid ""
 "Please enter the location of the file containing your X.509 certificate in "
 "PEM format."
@@ -167,13 +167,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid "File name of your PEM format X.509 private key:"
 msgstr "Nom du fichier PEM contenant la clé privée X.509 :"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid ""
 "Please enter the location of the file containing the private RSA key "
 "matching your X.509 certificate in PEM format. This can be the same file "
@@ -185,7 +185,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid "File name of your PEM format X.509 RootCA:"
 msgstr ""
 "Nom du fichier PEM contenant le certificat X.509 de l'autorité de "
@@ -193,7 +193,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid ""
 "Optionally you can now enter the location of the file containing the X.509 "
 "Certificate Authority root used to sign your certificate in PEM format. If "
@@ -210,13 +210,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid "Please enter which length the created RSA key should have:"
 msgstr "Longueur de la clé RSA à créer :"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid ""
 "Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
@@ -231,13 +231,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid "Create a self-signed X.509 certificate?"
 msgstr "Souhaitez-vous créer un certificat X.509 auto-signé ?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "Only self-signed X.509 certificates can be created automatically, because "
 "otherwise a Certificate Authority is needed to sign the certificate request. "
@@ -258,7 +258,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "If you do not choose to create a self-signed certificate, only the RSA "
 "private key and the certificate request will be created, and you will have "
@@ -270,13 +270,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid "Country code for the X.509 certificate request:"
 msgstr "Code du pays pour la demande de certificat X.509 :"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "Please enter the two-letter code for the country the server resides in (such "
 "as \"AT\" for Austria)."
@@ -286,7 +286,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "OpenSSL will refuse to generate a certificate unless this is a valid "
 "ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
@@ -298,13 +298,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid "State or province name for the X.509 certificate request:"
 msgstr "État ou province pour la demande de certificat X.509 :"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid ""
 "Please enter the full name of the state or province the server resides in "
 "(such as \"Upper Austria\")."
@@ -314,13 +314,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid "Locality name for the X.509 certificate request:"
 msgstr "Localité pour la demande de certificat X.509 :"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid ""
 "Please enter the locality the server resides in (often a city, such as "
 "\"Vienna\")."
@@ -330,13 +330,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid "Organization name for the X.509 certificate request:"
 msgstr "Organisme pour la demande de certificat X.509 :"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid ""
 "Please enter the organization the server belongs to (such as \"Debian\")."
 msgstr ""
@@ -344,13 +344,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid "Organizational unit for the X.509 certificate request:"
 msgstr "Unité d'organisation pour la demande de certificat X.509 :"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid ""
 "Please enter the organizational unit the server belongs to (such as "
 "\"security group\")."
@@ -360,13 +360,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid "Common Name for the X.509 certificate request:"
 msgstr "Nom ordinaire pour la demande de certification X.509 :"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid ""
 "Please enter the Common Name for this host (such as \"gateway.example.org\")."
 msgstr ""
@@ -375,13 +375,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid "Email address for the X.509 certificate request:"
 msgstr "Adresse électronique pour la demande de certificat X.509 :"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid ""
 "Please enter the email address of the person or organization responsible for "
 "the X.509 certificate."
@@ -391,13 +391,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid "Enable opportunistic encryption?"
 msgstr "Faut-il activer le chiffrement opportuniste ?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "This version of strongSwan supports opportunistic encryption (OE), which "
 "stores IPSec authentication information in DNS records. Until this is widely "
@@ -411,7 +411,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "You should only enable opportunistic encryption if you are sure you want it. "
 "It may break the Internet connection (default route) as the daemon starts."
diff --git a/debian/po/gl.po b/debian/po/gl.po
index ff10ba2..6e76e3a 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid "Restart strongSwan now?"
 msgstr "Desexa reiniciar strongSwan agora?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Restarting strongSwan is recommended, because if there is a security fix, "
@@ -44,7 +44,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 #, fuzzy
 #| msgid "Use an existing X.509 certificate for strongSwan?"
 msgid "Use an X.509 certificate for this host?"
@@ -52,7 +52,7 @@ msgstr "Desexa empregar un certificado X.509 xa existente para strongSwan?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "An X.509 certificate for this host can be automatically created or imported. "
 "It can be used to authenticate IPsec connections to other hosts and is the "
@@ -65,7 +65,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "Alternatively you can reject this option and later use the command \"dpkg-"
 "reconfigure strongswan\" to come back."
@@ -73,25 +73,25 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "create"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "import"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid "Methods for using a X.509 certificate to authenticate this host:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "It is possible to create a new X.509 certificate with user-defined settings "
 "or to import an existing public and private key stored in PEM file(s) for "
@@ -100,7 +100,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you choose to create a new X.509 certificate you will first be asked a "
 "number of questions which must be answered before the creation can start. "
@@ -112,7 +112,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you want to import an existing public and private key you will be "
 "prompted for their filenames (which may be identical if both parts are "
@@ -125,7 +125,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 #, fuzzy
 #| msgid "File name of your X.509 certificate in PEM format:"
 msgid "File name of your PEM format X.509 certificate:"
@@ -133,7 +133,7 @@ msgstr "Nome do ficheiro do certificado X.509 en formato PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 #, fuzzy
 #| msgid ""
 #| "Please enter the full location of the file containing your X.509 "
@@ -147,7 +147,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 #, fuzzy
 #| msgid "File name of your existing X.509 private key in PEM format:"
 msgid "File name of your PEM format X.509 private key:"
@@ -155,7 +155,7 @@ msgstr "Nome do ficheiro coa chave privada X.509 en formato PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 #, fuzzy
 #| msgid ""
 #| "Please enter the full location of the file containing the private RSA key "
@@ -172,7 +172,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 #, fuzzy
 #| msgid "File name of your X.509 certificate in PEM format:"
 msgid "File name of your PEM format X.509 RootCA:"
@@ -180,7 +180,7 @@ msgstr "Nome do ficheiro do certificado X.509 en formato PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid ""
 "Optionally you can now enter the location of the file containing the X.509 "
 "Certificate Authority root used to sign your certificate in PEM format. If "
@@ -191,13 +191,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid "Please enter which length the created RSA key should have:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid ""
 "Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
@@ -207,7 +207,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 #, fuzzy
 #| msgid "Create a self-signed X.509 certificate?"
 msgid "Create a self-signed X.509 certificate?"
@@ -215,7 +215,7 @@ msgstr "Desexa crear un certificado X.509 autoasinado?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "Only self-signed X.509 certificates can be created automatically, because "
 "otherwise a Certificate Authority is needed to sign the certificate request. "
@@ -228,7 +228,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 #, fuzzy
 #| msgid ""
 #| "If you do not accept this option, only the RSA private key will be "
@@ -244,7 +244,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 #, fuzzy
 #| msgid "Country code for the X.509 certificate request:"
 msgid "Country code for the X.509 certificate request:"
@@ -252,7 +252,7 @@ msgstr "Código de país para o pedido do certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "Please enter the two-letter code for the country the server resides in (such "
 "as \"AT\" for Austria)."
@@ -260,7 +260,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "OpenSSL will refuse to generate a certificate unless this is a valid "
 "ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
@@ -269,7 +269,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 #, fuzzy
 #| msgid "State or province name for the X.509 certificate request:"
 msgid "State or province name for the X.509 certificate request:"
@@ -277,7 +277,7 @@ msgstr "Nome do estado ou provincia para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 #, fuzzy
 #| msgid ""
 #| "Please enter the full name of the state or province to include in the "
@@ -291,7 +291,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 #, fuzzy
 #| msgid "Locality name for the X.509 certificate request:"
 msgid "Locality name for the X.509 certificate request:"
@@ -299,7 +299,7 @@ msgstr "Nome de localidade para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid ""
 "Please enter the locality the server resides in (often a city, such as "
 "\"Vienna\")."
@@ -307,7 +307,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 #, fuzzy
 #| msgid "Organization name for the X.509 certificate request:"
 msgid "Organization name for the X.509 certificate request:"
@@ -315,14 +315,14 @@ msgstr "Nome da organización para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid ""
 "Please enter the organization the server belongs to (such as \"Debian\")."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 #, fuzzy
 #| msgid "Organizational unit for the X.509 certificate request:"
 msgid "Organizational unit for the X.509 certificate request:"
@@ -330,7 +330,7 @@ msgstr "Unidade organizacional para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 #, fuzzy
 #| msgid "Organizational unit for the X.509 certificate request:"
 msgid ""
@@ -340,7 +340,7 @@ msgstr "Unidade organizacional para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 #, fuzzy
 #| msgid "Common name for the X.509 certificate request:"
 msgid "Common Name for the X.509 certificate request:"
@@ -348,14 +348,14 @@ msgstr "Nome común para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid ""
 "Please enter the Common Name for this host (such as \"gateway.example.org\")."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 #, fuzzy
 #| msgid "Email address for the X.509 certificate request:"
 msgid "Email address for the X.509 certificate request:"
@@ -363,7 +363,7 @@ msgstr "Enderezo de correo electrónico para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 #, fuzzy
 #| msgid ""
 #| "Please enter the email address (for the individual or organization "
@@ -377,13 +377,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid "Enable opportunistic encryption?"
 msgstr "Desexa activar a cifraxe oportunista?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "This version of strongSwan supports opportunistic encryption (OE), which "
 "stores IPSec authentication information in DNS records. Until this is widely "
@@ -397,7 +397,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 #, fuzzy
 #| msgid ""
 #| "You should only enable opportunistic encryption if you are sure you want "
diff --git a/debian/po/it.po b/debian/po/it.po
index c11c760..8335b02 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid "Restart strongSwan now?"
 msgstr "Riavviare strongSwan adesso?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid ""
 "Restarting strongSwan is recommended, since if there is a security fix, it "
 "will not be applied until the daemon restarts. Most people expect the daemon "
@@ -43,13 +43,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid "Use an X.509 certificate for this host?"
 msgstr "Utilizzare un certificato X.509 per questo host?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "An X.509 certificate for this host can be automatically created or imported. "
 "It can be used to authenticate IPsec connections to other hosts and is the "
@@ -68,7 +68,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "Alternatively you can reject this option and later use the command \"dpkg-"
 "reconfigure strongswan\" to come back."
@@ -78,26 +78,26 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "create"
 msgstr "creare"
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "import"
 msgstr "importare"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid "Methods for using a X.509 certificate to authenticate this host:"
 msgstr ""
 "Metodi per l'utilizzo di un certificato X.509 per autenticare questo host:"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "It is possible to create a new X.509 certificate with user-defined settings "
 "or to import an existing public and private key stored in PEM file(s) for "
@@ -109,7 +109,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you choose to create a new X.509 certificate you will first be asked a "
 "number of questions which must be answered before the creation can start. "
@@ -128,7 +128,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you want to import an existing public and private key you will be "
 "prompted for their filenames (which may be identical if both parts are "
@@ -149,13 +149,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid "File name of your PEM format X.509 certificate:"
 msgstr "Nome file del proprio certificato X.509 in formato PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid ""
 "Please enter the location of the file containing your X.509 certificate in "
 "PEM format."
@@ -165,13 +165,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid "File name of your PEM format X.509 private key:"
 msgstr "Nome file della propria chiave privata X.509 in formato PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid ""
 "Please enter the location of the file containing the private RSA key "
 "matching your X.509 certificate in PEM format. This can be the same file "
@@ -183,13 +183,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid "File name of your PEM format X.509 RootCA:"
 msgstr "Nome file del proprio RootCA X.509 in formato PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid ""
 "Optionally you can now enter the location of the file containing the X.509 "
 "Certificate Authority root used to sign your certificate in PEM format. If "
@@ -205,13 +205,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid "Please enter which length the created RSA key should have:"
 msgstr "Inserire la lunghezza che la chiave RSA creata dovrà avere:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid ""
 "Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
@@ -225,13 +225,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid "Create a self-signed X.509 certificate?"
 msgstr "Creare un certificato X.509 auto-firmato?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "Only self-signed X.509 certificates can be created automatically, because "
 "otherwise a Certificate Authority is needed to sign the certificate request. "
@@ -252,7 +252,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "If you do not choose to create a self-signed certificate, only the RSA "
 "private key and the certificate request will be created, and you will have "
@@ -264,13 +264,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid "Country code for the X.509 certificate request:"
 msgstr "Codice paese per la richiesta di certificato X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "Please enter the two-letter code for the country the server resides in (such "
 "as \"AT\" for Austria)."
@@ -280,7 +280,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "OpenSSL will refuse to generate a certificate unless this is a valid "
 "ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
@@ -292,14 +292,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid "State or province name for the X.509 certificate request:"
 msgstr ""
 "Nome dello stato o della provincia per la richiesta di certificato X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid ""
 "Please enter the full name of the state or province the server resides in "
 "(such as \"Upper Austria\")."
@@ -309,13 +309,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid "Locality name for the X.509 certificate request:"
 msgstr "Nome della località per la richiesta di certificato X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid ""
 "Please enter the locality the server resides in (often a city, such as "
 "\"Vienna\")."
@@ -325,13 +325,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid "Organization name for the X.509 certificate request:"
 msgstr "Nome dell'organizzazione per la richiesta di certificato X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid ""
 "Please enter the organization the server belongs to (such as \"Debian\")."
 msgstr ""
@@ -340,13 +340,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid "Organizational unit for the X.509 certificate request:"
 msgstr "Unità organizzativa per la richiesta di certificato X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid ""
 "Please enter the organizational unit the server belongs to (such as "
 "\"security group\")."
@@ -356,13 +356,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid "Common Name for the X.509 certificate request:"
 msgstr "Nome comune host per la richiesta di certificato X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid ""
 "Please enter the Common Name for this host (such as \"gateway.example.org\")."
 msgstr ""
@@ -370,13 +370,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid "Email address for the X.509 certificate request:"
 msgstr "Indirizzo e-mail per la richiesta di certificato X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid ""
 "Please enter the email address of the person or organization responsible for "
 "the X.509 certificate."
@@ -386,13 +386,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid "Enable opportunistic encryption?"
 msgstr "Abilitare la cifratura opportunistica?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "This version of strongSwan supports opportunistic encryption (OE), which "
 "stores IPSec authentication information in DNS records. Until this is widely "
@@ -407,7 +407,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "You should only enable opportunistic encryption if you are sure you want it. "
 "It may break the Internet connection (default route) as the daemon starts."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 0220f92..2c1ec0d 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -27,13 +27,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid "Restart strongSwan now?"
 msgstr "strongSwan を今すぐ再起動しますか?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid ""
 "Restarting strongSwan is recommended, since if there is a security fix, it "
 "will not be applied until the daemon restarts. Most people expect the daemon "
@@ -49,13 +49,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid "Use an X.509 certificate for this host?"
 msgstr "このホストに対して X.509 証明書を利用しますか?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "An X.509 certificate for this host can be automatically created or imported. "
 "It can be used to authenticate IPsec connections to other hosts and is the "
@@ -73,7 +73,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "Alternatively you can reject this option and later use the command \"dpkg-"
 "reconfigure strongswan\" to come back."
@@ -83,25 +83,25 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "create"
 msgstr "作成する"
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "import"
 msgstr "インポートする"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid "Methods for using a X.509 certificate to authenticate this host:"
 msgstr "このホストを認証するのに利用する X.509 証明書をどうするか:"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "It is possible to create a new X.509 certificate with user-defined settings "
 "or to import an existing public and private key stored in PEM file(s) for "
@@ -113,7 +113,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you choose to create a new X.509 certificate you will first be asked a "
 "number of questions which must be answered before the creation can start. "
@@ -130,7 +130,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you want to import an existing public and private key you will be "
 "prompted for their filenames (which may be identical if both parts are "
@@ -149,13 +149,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid "File name of your PEM format X.509 certificate:"
 msgstr "PEM 形式の X.509 証明書のファイル名:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid ""
 "Please enter the location of the file containing your X.509 certificate in "
 "PEM format."
@@ -163,13 +163,13 @@ msgstr "PEM 形式の X.509 証明書を含んでいるファイルの場所を�
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid "File name of your PEM format X.509 private key:"
 msgstr "PEM 形式の X.509 秘密鍵のファイル名:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid ""
 "Please enter the location of the file containing the private RSA key "
 "matching your X.509 certificate in PEM format. This can be the same file "
@@ -180,13 +180,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid "File name of your PEM format X.509 RootCA:"
 msgstr "PEM 形式の X.509 ルート CA のファイル名:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid ""
 "Optionally you can now enter the location of the file containing the X.509 "
 "Certificate Authority root used to sign your certificate in PEM format. If "
@@ -202,13 +202,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid "Please enter which length the created RSA key should have:"
 msgstr "作成する RSA 鍵の鍵長を入力してください:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid ""
 "Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
@@ -221,13 +221,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid "Create a self-signed X.509 certificate?"
 msgstr "自己署名 X.509 証明書を生成しますか?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "Only self-signed X.509 certificates can be created automatically, because "
 "otherwise a Certificate Authority is needed to sign the certificate request. "
@@ -246,7 +246,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "If you do not choose to create a self-signed certificate, only the RSA "
 "private key and the certificate request will be created, and you will have "
@@ -257,13 +257,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid "Country code for the X.509 certificate request:"
 msgstr "X.509 証明書要求に記載する国コード:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "Please enter the two-letter code for the country the server resides in (such "
 "as \"AT\" for Austria)."
@@ -273,7 +273,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "OpenSSL will refuse to generate a certificate unless this is a valid "
 "ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
@@ -285,13 +285,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid "State or province name for the X.509 certificate request:"
 msgstr "X.509 証明書要求に記載する都道府県名:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid ""
 "Please enter the full name of the state or province the server resides in "
 "(such as \"Upper Austria\")."
@@ -299,13 +299,13 @@ msgstr "サーバ所在地の都道府県名 (例:「Tokyo」)を入力してく
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid "Locality name for the X.509 certificate request:"
 msgstr "X.509 証明書要求に記載する地域名:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid ""
 "Please enter the locality the server resides in (often a city, such as "
 "\"Vienna\")."
@@ -313,26 +313,26 @@ msgstr "サーバ所在地 (大抵は「Shinjuku」のような市区名)を入�
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid "Organization name for the X.509 certificate request:"
 msgstr "X.509 証明書要求に記載する組織名:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid ""
 "Please enter the organization the server belongs to (such as \"Debian\")."
 msgstr "サーバが所属する組織 (「Debian」など) を入力してください。"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid "Organizational unit for the X.509 certificate request:"
 msgstr "X.509 証明書要求に記載する部署名:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid ""
 "Please enter the organizational unit the server belongs to (such as "
 "\"security group\")."
@@ -340,13 +340,13 @@ msgstr "サーバが所属する部署名 (「security group」など) を入力
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid "Common Name for the X.509 certificate request:"
 msgstr "X.509 証明書要求に記載するコモンネーム:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid ""
 "Please enter the Common Name for this host (such as \"gateway.example.org\")."
 msgstr ""
@@ -355,13 +355,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid "Email address for the X.509 certificate request:"
 msgstr "X.509 証明書要求に記載するメールアドレス:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid ""
 "Please enter the email address of the person or organization responsible for "
 "the X.509 certificate."
@@ -371,13 +371,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid "Enable opportunistic encryption?"
 msgstr "opportunistic encryption を有効にしますか?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "This version of strongSwan supports opportunistic encryption (OE), which "
 "stores IPSec authentication information in DNS records. Until this is widely "
@@ -391,7 +391,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "You should only enable opportunistic encryption if you are sure you want it. "
 "It may break the Internet connection (default route) as the daemon starts."
diff --git a/debian/po/nb.po b/debian/po/nb.po
index b6382be..4c6261a 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid "Restart strongSwan now?"
 msgstr " Start strongSwan på nytt nå"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid ""
 "Restarting strongSwan is recommended, since if there is a security fix, it "
 "will not be applied until the daemon restarts. Most people expect the daemon "
@@ -41,13 +41,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid "Use an X.509 certificate for this host?"
 msgstr "Skal et X.509-sertifikat brukes for denne vertsmaskinen?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "An X.509 certificate for this host can be automatically created or imported. "
 "It can be used to authenticate IPsec connections to other hosts and is the "
@@ -67,7 +67,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "Alternatively you can reject this option and later use the command \"dpkg-"
 "reconfigure strongswan\" to come back."
@@ -77,26 +77,26 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "create"
 msgstr "opprett"
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "import"
 msgstr "importer"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid "Methods for using a X.509 certificate to authenticate this host:"
 msgstr ""
 "Metoder for å bruke et X.509-sertifikat til å autentisere denne verten:"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "It is possible to create a new X.509 certificate with user-defined settings "
 "or to import an existing public and private key stored in PEM file(s) for "
@@ -108,7 +108,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you choose to create a new X.509 certificate you will first be asked a "
 "number of questions which must be answered before the creation can start. "
@@ -126,7 +126,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you want to import an existing public and private key you will be "
 "prompted for their filenames (which may be identical if both parts are "
@@ -146,13 +146,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid "File name of your PEM format X.509 certificate:"
 msgstr "Filnavn for ditt X.509-sertifikat i PEM-format:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid ""
 "Please enter the location of the file containing your X.509 certificate in "
 "PEM format."
@@ -161,13 +161,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid "File name of your PEM format X.509 private key:"
 msgstr "Filnavn for din eksisterende private X.509-nøkkel i PEM-format:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid ""
 "Please enter the location of the file containing the private RSA key "
 "matching your X.509 certificate in PEM format. This can be the same file "
@@ -179,13 +179,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid "File name of your PEM format X.509 RootCA:"
 msgstr "Filnavn for ditt rot-sertifikat i PEM-format:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid ""
 "Optionally you can now enter the location of the file containing the X.509 "
 "Certificate Authority root used to sign your certificate in PEM format. If "
@@ -201,13 +201,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid "Please enter which length the created RSA key should have:"
 msgstr "Skriv inn hvilken lengde det skal være på den genererte RSA-nøkkelen:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid ""
 "Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
@@ -221,13 +221,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid "Create a self-signed X.509 certificate?"
 msgstr "Skal det lages et selvsignert X.509-sertifikat?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "Only self-signed X.509 certificates can be created automatically, because "
 "otherwise a Certificate Authority is needed to sign the certificate request. "
@@ -247,7 +247,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "If you do not choose to create a self-signed certificate, only the RSA "
 "private key and the certificate request will be created, and you will have "
@@ -259,13 +259,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid "Country code for the X.509 certificate request:"
 msgstr "Landskode for X.509-sertifikatsøknaden:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "Please enter the two-letter code for the country the server resides in (such "
 "as \"AT\" for Austria)."
@@ -275,7 +275,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "OpenSSL will refuse to generate a certificate unless this is a valid "
 "ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
@@ -287,13 +287,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid "State or province name for the X.509 certificate request:"
 msgstr "Stat eller provinsnavn for X.509-sertifikatsøknaden:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid ""
 "Please enter the full name of the state or province the server resides in "
 "(such as \"Upper Austria\")."
@@ -303,13 +303,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid "Locality name for the X.509 certificate request:"
 msgstr "Stedsnavn for X.509-sertifikatsøknaden:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid ""
 "Please enter the locality the server resides in (often a city, such as "
 "\"Vienna\")."
@@ -319,26 +319,26 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid "Organization name for the X.509 certificate request:"
 msgstr "Organisasjonsnavn for X.509-sertifikatsøknaden:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid ""
 "Please enter the organization the server belongs to (such as \"Debian\")."
 msgstr "Skriv inn organisasjonen som tjeneren tilhører (slik som «Debian»)"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid "Organizational unit for the X.509 certificate request:"
 msgstr "Organisasjonsenhet for X.509-sertifikatsøknaden:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid ""
 "Please enter the organizational unit the server belongs to (such as "
 "\"security group\")."
@@ -348,13 +348,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid "Common Name for the X.509 certificate request:"
 msgstr "Entydig navn for X.509-sertifikatsøknaden:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid ""
 "Please enter the Common Name for this host (such as \"gateway.example.org\")."
 msgstr ""
@@ -362,13 +362,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid "Email address for the X.509 certificate request:"
 msgstr "E-postadresse for X.509-sertifikatsøknaden:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid ""
 "Please enter the email address of the person or organization responsible for "
 "the X.509 certificate."
@@ -378,13 +378,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid "Enable opportunistic encryption?"
 msgstr "Slå på opportunistisk kryptering?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "This version of strongSwan supports opportunistic encryption (OE), which "
 "stores IPSec authentication information in DNS records. Until this is widely "
@@ -398,7 +398,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "You should only enable opportunistic encryption if you are sure you want it. "
 "It may break the Internet connection (default route) as the daemon starts."
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 4515678..a3484fe 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid "Restart strongSwan now?"
 msgstr "StrongSwan nu herstarten?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid ""
 "Restarting strongSwan is recommended, since if there is a security fix, it "
 "will not be applied until the daemon restarts. Most people expect the daemon "
@@ -45,13 +45,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid "Use an X.509 certificate for this host?"
 msgstr "Moet er een X.509-certificaat voor deze computer gebruikt worden?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "An X.509 certificate for this host can be automatically created or imported. "
 "It can be used to authenticate IPsec connections to other hosts and is the "
@@ -72,7 +72,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "Alternatively you can reject this option and later use the command \"dpkg-"
 "reconfigure strongswan\" to come back."
@@ -82,19 +82,19 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "create"
 msgstr "aanmaken"
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "import"
 msgstr "importeren"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid "Methods for using a X.509 certificate to authenticate this host:"
 msgstr ""
 "Methodes bij het gebruik van een X.509-certificaat voor authenticatie van "
@@ -102,7 +102,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "It is possible to create a new X.509 certificate with user-defined settings "
 "or to import an existing public and private key stored in PEM file(s) for "
@@ -114,7 +114,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you choose to create a new X.509 certificate you will first be asked a "
 "number of questions which must be answered before the creation can start. "
@@ -132,7 +132,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you want to import an existing public and private key you will be "
 "prompted for their filenames (which may be identical if both parts are "
@@ -152,13 +152,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid "File name of your PEM format X.509 certificate:"
 msgstr "Bestandsnaam van uw X.509-certificaat in PEM-indeling:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid ""
 "Please enter the location of the file containing your X.509 certificate in "
 "PEM format."
@@ -168,13 +168,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid "File name of your PEM format X.509 private key:"
 msgstr "Bestandsnaam van uw geheime X.509-sleutel in PEM-indeling:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid ""
 "Please enter the location of the file containing the private RSA key "
 "matching your X.509 certificate in PEM format. This can be the same file "
@@ -186,13 +186,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid "File name of your PEM format X.509 RootCA:"
 msgstr "Bestandsnaam van uw X.509-RootCA in PEM-indeling:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid ""
 "Optionally you can now enter the location of the file containing the X.509 "
 "Certificate Authority root used to sign your certificate in PEM format. If "
@@ -209,13 +209,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid "Please enter which length the created RSA key should have:"
 msgstr "Geef de lengte voor de aan te maken RSA-sleutel:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid ""
 "Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
@@ -229,13 +229,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid "Create a self-signed X.509 certificate?"
 msgstr "Wilt u een door uzelf getekend X.509-certificaat aanmaken?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "Only self-signed X.509 certificates can be created automatically, because "
 "otherwise a Certificate Authority is needed to sign the certificate request. "
@@ -256,7 +256,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "If you do not choose to create a self-signed certificate, only the RSA "
 "private key and the certificate request will be created, and you will have "
@@ -268,13 +268,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid "Country code for the X.509 certificate request:"
 msgstr "Landcode van de X.509-certificaataanvraag:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "Please enter the two-letter code for the country the server resides in (such "
 "as \"AT\" for Austria)."
@@ -284,7 +284,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "OpenSSL will refuse to generate a certificate unless this is a valid "
 "ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
@@ -296,13 +296,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid "State or province name for the X.509 certificate request:"
 msgstr "Staat of provincie voor de X.509-certificaataanvraag:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid ""
 "Please enter the full name of the state or province the server resides in "
 "(such as \"Upper Austria\")."
@@ -312,13 +312,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid "Locality name for the X.509 certificate request:"
 msgstr "Plaatsnaam voor de X.509-certificaataanvraag:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid ""
 "Please enter the locality the server resides in (often a city, such as "
 "\"Vienna\")."
@@ -327,13 +327,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid "Organization name for the X.509 certificate request:"
 msgstr "Naam van de organisatie voor de X.509-certificaataanvraag:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid ""
 "Please enter the organization the server belongs to (such as \"Debian\")."
 msgstr ""
@@ -341,13 +341,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid "Organizational unit for the X.509 certificate request:"
 msgstr "Organisatie-eenheid voor de X.509-certificaataanvraag:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid ""
 "Please enter the organizational unit the server belongs to (such as "
 "\"security group\")."
@@ -357,13 +357,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid "Common Name for the X.509 certificate request:"
 msgstr "Naam (Common Name) voor de X.509-certificaataanvraag:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid ""
 "Please enter the Common Name for this host (such as \"gateway.example.org\")."
 msgstr ""
@@ -372,13 +372,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid "Email address for the X.509 certificate request:"
 msgstr "E-mailadres voor de X.509-certificaataanvraag:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid ""
 "Please enter the email address of the person or organization responsible for "
 "the X.509 certificate."
@@ -388,13 +388,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid "Enable opportunistic encryption?"
 msgstr "Wilt u opportunistische encryptie inschakelen?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "This version of strongSwan supports opportunistic encryption (OE), which "
 "stores IPSec authentication information in DNS records. Until this is widely "
@@ -408,7 +408,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "You should only enable opportunistic encryption if you are sure you want it. "
 "It may break the Internet connection (default route) as the daemon starts."
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 34f158e..b863873 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid "Restart strongSwan now?"
 msgstr "Zrestartować strongSwan?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid ""
 "Restarting strongSwan is recommended, since if there is a security fix, it "
 "will not be applied until the daemon restarts. Most people expect the daemon "
@@ -43,13 +43,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid "Use an X.509 certificate for this host?"
 msgstr "Użyć certyfikatu X.509 dla tego komputera?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "An X.509 certificate for this host can be automatically created or imported. "
 "It can be used to authenticate IPsec connections to other hosts and is the "
@@ -69,7 +69,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "Alternatively you can reject this option and later use the command \"dpkg-"
 "reconfigure strongswan\" to come back."
@@ -79,25 +79,25 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "create"
 msgstr "utwórz"
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "import"
 msgstr "zaimportuj"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid "Methods for using a X.509 certificate to authenticate this host:"
 msgstr "Metody używające certyfikatu X.509 do uwierzytelniania tego komputera:"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "It is possible to create a new X.509 certificate with user-defined settings "
 "or to import an existing public and private key stored in PEM file(s) for "
@@ -109,7 +109,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you choose to create a new X.509 certificate you will first be asked a "
 "number of questions which must be answered before the creation can start. "
@@ -129,7 +129,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you want to import an existing public and private key you will be "
 "prompted for their filenames (which may be identical if both parts are "
@@ -150,13 +150,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid "File name of your PEM format X.509 certificate:"
 msgstr "Nazwa pliku certyfikatu X.509 użytkownika, w formacie PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid ""
 "Please enter the location of the file containing your X.509 certificate in "
 "PEM format."
@@ -166,13 +166,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid "File name of your PEM format X.509 private key:"
 msgstr "Nazwa pliku klucza prywatnego X.509 użytkownika, w formacie PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid ""
 "Please enter the location of the file containing the private RSA key "
 "matching your X.509 certificate in PEM format. This can be the same file "
@@ -184,13 +184,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid "File name of your PEM format X.509 RootCA:"
 msgstr "Nazwa pliku X.509 RootCA użytkownika, w formacie PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid ""
 "Optionally you can now enter the location of the file containing the X.509 "
 "Certificate Authority root used to sign your certificate in PEM format. If "
@@ -206,13 +206,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid "Please enter which length the created RSA key should have:"
 msgstr "Proszę wprowadzić długość tworzonego klucza RSA:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid ""
 "Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
@@ -227,13 +227,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid "Create a self-signed X.509 certificate?"
 msgstr "Utworzyć podpisany przez samego siebie certyfikat X.509?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "Only self-signed X.509 certificates can be created automatically, because "
 "otherwise a Certificate Authority is needed to sign the certificate request. "
@@ -254,7 +254,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "If you do not choose to create a self-signed certificate, only the RSA "
 "private key and the certificate request will be created, and you will have "
@@ -267,13 +267,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid "Country code for the X.509 certificate request:"
 msgstr "Kod kraju do żądania podpisania certyfikatu X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "Please enter the two-letter code for the country the server resides in (such "
 "as \"AT\" for Austria)."
@@ -283,7 +283,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "OpenSSL will refuse to generate a certificate unless this is a valid "
 "ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
@@ -295,13 +295,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid "State or province name for the X.509 certificate request:"
 msgstr "Nazwa regionu lub prowincji do żądania podpisania certyfikatu X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid ""
 "Please enter the full name of the state or province the server resides in "
 "(such as \"Upper Austria\")."
@@ -311,13 +311,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid "Locality name for the X.509 certificate request:"
 msgstr "Nazwa lokalizacji do żądania podpisania certyfikatu X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid ""
 "Please enter the locality the server resides in (often a city, such as "
 "\"Vienna\")."
@@ -327,13 +327,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid "Organization name for the X.509 certificate request:"
 msgstr "Nazwa organizacji do żądania podpisania certyfikatu X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid ""
 "Please enter the organization the server belongs to (such as \"Debian\")."
 msgstr ""
@@ -342,13 +342,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid "Organizational unit for the X.509 certificate request:"
 msgstr "Jednostka organizacyjna do żądania podpisania certyfikatu X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid ""
 "Please enter the organizational unit the server belongs to (such as "
 "\"security group\")."
@@ -358,14 +358,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid "Common Name for the X.509 certificate request:"
 msgstr ""
 "Nazwa domeny (ang. Common Name) do żądania podpisania certyfikatu X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid ""
 "Please enter the Common Name for this host (such as \"gateway.example.org\")."
 msgstr ""
@@ -374,13 +374,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid "Email address for the X.509 certificate request:"
 msgstr "Adres poczty elektronicznej do żądania podpisania certyfikatu X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid ""
 "Please enter the email address of the person or organization responsible for "
 "the X.509 certificate."
@@ -390,13 +390,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid "Enable opportunistic encryption?"
 msgstr "Włączyć szyfrowanie oportunistyczne?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "This version of strongSwan supports opportunistic encryption (OE), which "
 "stores IPSec authentication information in DNS records. Until this is widely "
@@ -411,7 +411,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 #, fuzzy
 #| msgid ""
 #| "You should only enable opportunistic encryption if you are sure you want "
diff --git a/debian/po/pt.po b/debian/po/pt.po
index cb5ac28..bf26c46 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid "Restart strongSwan now?"
 msgstr "Reiniciar agora o strongSwan?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid ""
 "Restarting strongSwan is recommended, since if there is a security fix, it "
 "will not be applied until the daemon restarts. Most people expect the daemon "
@@ -44,13 +44,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid "Use an X.509 certificate for this host?"
 msgstr "Usar um certificado X.509 para esta máquina?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "An X.509 certificate for this host can be automatically created or imported. "
 "It can be used to authenticate IPsec connections to other hosts and is the "
@@ -70,7 +70,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "Alternatively you can reject this option and later use the command \"dpkg-"
 "reconfigure strongswan\" to come back."
@@ -80,25 +80,25 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "create"
 msgstr "criar"
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "import"
 msgstr "importar"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid "Methods for using a X.509 certificate to authenticate this host:"
 msgstr "Métodos de usar um certificado X.509 para autenticar esta máquina:"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "It is possible to create a new X.509 certificate with user-defined settings "
 "or to import an existing public and private key stored in PEM file(s) for "
@@ -110,7 +110,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you choose to create a new X.509 certificate you will first be asked a "
 "number of questions which must be answered before the creation can start. "
@@ -129,7 +129,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you want to import an existing public and private key you will be "
 "prompted for their filenames (which may be identical if both parts are "
@@ -150,13 +150,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid "File name of your PEM format X.509 certificate:"
 msgstr "Nome de ficheiro do seu certificado X.509 em formato PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid ""
 "Please enter the location of the file containing your X.509 certificate in "
 "PEM format."
@@ -166,13 +166,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid "File name of your PEM format X.509 private key:"
 msgstr "Nome do ficheiro da sua chave privada X.509 em formato PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid ""
 "Please enter the location of the file containing the private RSA key "
 "matching your X.509 certificate in PEM format. This can be the same file "
@@ -184,13 +184,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid "File name of your PEM format X.509 RootCA:"
 msgstr "Nome de ficheiro do seu RootCA X.509 em formato PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid ""
 "Optionally you can now enter the location of the file containing the X.509 "
 "Certificate Authority root used to sign your certificate in PEM format. If "
@@ -206,13 +206,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid "Please enter which length the created RSA key should have:"
 msgstr "Por favor indique o comprimento que a chave RSA criada deve ter:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid ""
 "Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
@@ -226,13 +226,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid "Create a self-signed X.509 certificate?"
 msgstr "Criar um certificado X.509 auto-assinado?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "Only self-signed X.509 certificates can be created automatically, because "
 "otherwise a Certificate Authority is needed to sign the certificate request. "
@@ -253,7 +253,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "If you do not choose to create a self-signed certificate, only the RSA "
 "private key and the certificate request will be created, and you will have "
@@ -265,13 +265,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid "Country code for the X.509 certificate request:"
 msgstr "Código de país para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "Please enter the two-letter code for the country the server resides in (such "
 "as \"AT\" for Austria)."
@@ -281,7 +281,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "OpenSSL will refuse to generate a certificate unless this is a valid "
 "ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
@@ -293,13 +293,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid "State or province name for the X.509 certificate request:"
 msgstr "Estado ou nome da província para o pedido do certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid ""
 "Please enter the full name of the state or province the server resides in "
 "(such as \"Upper Austria\")."
@@ -309,13 +309,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid "Locality name for the X.509 certificate request:"
 msgstr "Nome da localidade para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid ""
 "Please enter the locality the server resides in (often a city, such as "
 "\"Vienna\")."
@@ -325,13 +325,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid "Organization name for the X.509 certificate request:"
 msgstr "Nome da organização para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:13001
+#: ../strongswan-starter-legacy.templates:13001
 msgid ""
 "Please enter the organization the server belongs to (such as \"Debian\")."
 msgstr ""
@@ -340,13 +340,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid "Organizational unit for the X.509 certificate request:"
 msgstr "Unidade organizativa para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:14001
+#: ../strongswan-starter-legacy.templates:14001
 msgid ""
 "Please enter the organizational unit the server belongs to (such as "
 "\"security group\")."
@@ -356,13 +356,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid "Common Name for the X.509 certificate request:"
 msgstr "Nome comum para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:15001
+#: ../strongswan-starter-legacy.templates:15001
 msgid ""
 "Please enter the Common Name for this host (such as \"gateway.example.org\")."
 msgstr ""
@@ -371,13 +371,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid "Email address for the X.509 certificate request:"
 msgstr "Endereço de email para o pedido de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:16001
+#: ../strongswan-starter-legacy.templates:16001
 msgid ""
 "Please enter the email address of the person or organization responsible for "
 "the X.509 certificate."
@@ -387,13 +387,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid "Enable opportunistic encryption?"
 msgstr "Activar encriptação oportunista?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "This version of strongSwan supports opportunistic encryption (OE), which "
 "stores IPSec authentication information in DNS records. Until this is widely "
@@ -407,7 +407,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:17001
+#: ../strongswan-starter-legacy.templates:17001
 msgid ""
 "You should only enable opportunistic encryption if you are sure you want it. "
 "It may break the Internet connection (default route) as the daemon starts."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 6eb54b5..983e4b1 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid "Restart strongSwan now?"
 msgstr "Reiniciar o strongSwan agora?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:2001
+#: ../strongswan-starter-legacy.templates:2001
 msgid ""
 "Restarting strongSwan is recommended, since if there is a security fix, it "
 "will not be applied until the daemon restarts. Most people expect the daemon "
@@ -45,13 +45,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid "Use an X.509 certificate for this host?"
 msgstr "Usar um certificado X.509 para este host?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "An X.509 certificate for this host can be automatically created or imported. "
 "It can be used to authenticate IPsec connections to other hosts and is the "
@@ -71,7 +71,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:3001
+#: ../strongswan-starter-legacy.templates:3001
 msgid ""
 "Alternatively you can reject this option and later use the command \"dpkg-"
 "reconfigure strongswan\" to come back."
@@ -81,25 +81,25 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "create"
 msgstr "criar"
 
 #. Type: select
 #. Choices
-#: ../strongswan-starter.templates:4001
+#: ../strongswan-starter-legacy.templates:4001
 msgid "import"
 msgstr "importar"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid "Methods for using a X.509 certificate to authenticate this host:"
 msgstr "Métodos para usar um certificado X.509 para autenticar este host:"
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "It is possible to create a new X.509 certificate with user-defined settings "
 "or to import an existing public and private key stored in PEM file(s) for "
@@ -111,7 +111,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you choose to create a new X.509 certificate you will first be asked a "
 "number of questions which must be answered before the creation can start. "
@@ -130,7 +130,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../strongswan-starter.templates:4002
+#: ../strongswan-starter-legacy.templates:4002
 msgid ""
 "If you want to import an existing public and private key you will be "
 "prompted for their filenames (which may be identical if both parts are "
@@ -152,13 +152,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid "File name of your PEM format X.509 certificate:"
 msgstr "Nome de arquivo do seu certificado X.509 no formato PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:5001
+#: ../strongswan-starter-legacy.templates:5001
 msgid ""
 "Please enter the location of the file containing your X.509 certificate in "
 "PEM format."
@@ -168,13 +168,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid "File name of your PEM format X.509 private key:"
 msgstr "Nome de arquivo da sua chave privada X.509 no formato PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:6001
+#: ../strongswan-starter-legacy.templates:6001
 msgid ""
 "Please enter the location of the file containing the private RSA key "
 "matching your X.509 certificate in PEM format. This can be the same file "
@@ -186,13 +186,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid "File name of your PEM format X.509 RootCA:"
 msgstr "Nome de arquivo da sua RootCA X.509 no formato PEM:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:7001
+#: ../strongswan-starter-legacy.templates:7001
 msgid ""
 "Optionally you can now enter the location of the file containing the X.509 "
 "Certificate Authority root used to sign your certificate in PEM format. If "
@@ -208,13 +208,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid "Please enter which length the created RSA key should have:"
 msgstr "Por favor, informe que tamanho a chave RSA a ser criada deve ter:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:8001
+#: ../strongswan-starter-legacy.templates:8001
 msgid ""
 "Please enter the length of the created RSA key. It should not be less than "
 "1024 bits because this should be considered unsecure and you will probably "
@@ -229,13 +229,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid "Create a self-signed X.509 certificate?"
 msgstr "Criar um certificado X.509 auto-assinado?"
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "Only self-signed X.509 certificates can be created automatically, because "
 "otherwise a Certificate Authority is needed to sign the certificate request. "
@@ -256,7 +256,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../strongswan-starter.templates:9001
+#: ../strongswan-starter-legacy.templates:9001
 msgid ""
 "If you do not choose to create a self-signed certificate, only the RSA "
 "private key and the certificate request will be created, and you will have "
@@ -268,13 +268,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid "Country code for the X.509 certificate request:"
 msgstr "Código de país para a requisição de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "Please enter the two-letter code for the country the server resides in (such "
 "as \"AT\" for Austria)."
@@ -284,7 +284,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:10001
+#: ../strongswan-starter-legacy.templates:10001
 msgid ""
 "OpenSSL will refuse to generate a certificate unless this is a valid "
 "ISO-3166 country code; an empty field is allowed elsewhere in the X.509 "
@@ -296,13 +296,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid "State or province name for the X.509 certificate request:"
 msgstr "Estado ou nome de província para a requisição de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:11001
+#: ../strongswan-starter-legacy.templates:11001
 msgid ""
 "Please enter the full name of the state or province the server resides in "
 "(such as \"Upper Austria\")."
@@ -312,13 +312,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid "Locality name for the X.509 certificate request:"
 msgstr "Nome da localidade para a requisição de certificado X.509:"
 
 #. Type: string
 #. Description
-#: ../strongswan-starter.templates:12001
+#: ../strongswan-starter-legacy.templates:12001
 msgid ""
 "Please enter the locality the server resides in (often a city, such as "
 "\"Vienna\")."
@@ -328,13 +328,13 @@ msgstr ""