- Updated translations.

- Import NMU patches.

1 files changed, 22 insertions, 22 deletions

diff --git a/debian/control b/debian/control
index 1c49bbbab..981814645 100644
--- a/debian/control
+++ b/debian/control
@@ -11,36 +11,36 @@ Architecture: all
 Depends: strongswan-ikev1, strongswan-ikev2
 Suggests: network-manager-strongswan
 Description: IPsec VPN solution metapackage
- strongSwan is a IPsec based VPN solution for the Linux kernel. It uses the
- native IPsec stack and runs on any recent 2.6 kernel (no patching required).
- It supports both IKEv1 and the newer IKEv2 protocols.
+ The strongSwan VPN suite is based on the IPsec stack in standard Linux 2.6
+ kernels. It supports both the IKEv1 and IKEv2 protocols.
  .
- strongSwan is one of the two remaining forks of the original FreeS/WAN 
- project and focuses on IKEv2 support, X.509 authentication and complete PKI 
- support. For a focus on Opportunistic Encryption (OE) and interoperability 
+ StrongSwan is one of the two remaining forks of the original FreeS/WAN
+ project and focuses on IKEv2 support, X.509 authentication and complete PKI
+ support. For a focus on Opportunistic Encryption (OE) and interoperability
  with non-standard IPsec features, see Openswan.
  .
- This metapackage has dependencies to the IKEv1 daemon pluto and IKEv2 daemon
- charon. It installs the required packages to run IKEv1 and IKEv2 connections
- using a ipsec.conf/ipsec.secrets based configuration.
+ This metapackage installs the packages required to maintain IKEv1 and IKEv2
+ connections via ipsec.conf or ipsec.secrets.
 
 Package: libstrongswan
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, openssl
+Conflicts: strongswan (< 4.2.12-1)
 Description: strongSwan utility and crypto library
- strongSwan is a IPsec based VPN solution for the Linux kernel. It uses the
+ StrongSwan is an IPsec-based VPN solution for the Linux kernel. It uses the
  native IPsec stack and runs on any recent 2.6 kernel (no patching required).
  It supports both IKEv1 and the newer IKEv2 protocols.
  .
- libstrongswan is the underlying library of charon and other strongSwan
+ This package provides the underlying library of charon and other strongSwan
  components. It is built in a modular way and is extendable through various
  plugins.
 
 Package: strongswan-starter
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan, strongswan-ikev1 | strongswan-ikev2
+Conflicts: strongswan (< 4.2.12-1)
 Description: strongSwan daemon starter and configuration file parser
- strongSwan is a IPsec based VPN solution for the Linux kernel. It uses the
+ StrongSwan is an IPsec-based VPN solution for the Linux kernel. It uses the
  native IPsec stack and runs on any recent 2.6 kernel (no patching required).
  It supports both IKEv1 and the newer IKEv2 protocols.
  .
@@ -55,14 +55,14 @@ Pre-Depends: debconf | debconf-2.0
 Depends: ${shlibs:Depends}, ${misc:Depends}, strongswan-starter, bsdmainutils, debianutils (>=1.7), ipsec-tools, host, iproute
 Suggests: curl
 Provides: ike-server
-Conflicts: freeswan (<< 2.04-12), openswan
+Conflicts: freeswan (<< 2.04-12), openswan, strongswan (< 4.2.12-1)
 Replaces: openswan
-Description: strongSwan IKEv1 keying daemon
- strongSwan is a IPsec based VPN solution for the Linux kernel. It uses the
+Description: strongSwan Internet Key Exchange (v1) daemon
+ StrongSwan is an IPsec-based VPN solution for the Linux kernel. It uses the
  native IPsec stack and runs on any recent 2.6 kernel (no patching required).
  It supports both IKEv1 and the newer IKEv2 protocols.
  .
- Pluto is a IPsec IKEv1 keying daemon. It was inherited from the FreeS/WAN
+ Pluto is an IPsec IKEv1 daemon. It was inherited from the FreeS/WAN
  project, but provides improved X.509 certificate support and other features.
  .
  Pluto can run in parallel with charon, the newer IKEv2 daemon.
@@ -73,13 +73,13 @@ Pre-Depends: debconf | debconf-2.0
 Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan, strongswan-starter | strongswan-nm, bsdmainutils, debianutils (>=1.7), ipsec-tools, host, iproute
 Suggests: curl
 Provides: ike-server
-Conflicts: freeswan (<< 2.04-12), openswan
-Description: strongSwan IKEv2 keying daemon
- strongSwan is a IPsec based VPN solution for the Linux kernel. It uses the
+Conflicts: freeswan (<< 2.04-12), openswan, strongswan (< 4.2.12-1)
+Description: strongSwan Internet Key Exchange (v2) daemon
+ StrongSwan is an IPsec-based VPN solution for the Linux kernel. It uses the
  native IPsec stack and runs on any recent 2.6 kernel (no patching required).
  It supports both IKEv1 and the newer IKEv2 protocols.
  .
- Charon is the IPsec IKEv2 keying daemon of the strongSwan project. It is
+ Charon is an IPsec IKEv2 daemon. It is
  written from scratch using a fully multi-threaded design and a modular
  architecture. Various plugins provide additional functionality.
  .
@@ -90,11 +90,11 @@ Architecture: any
 Depends: ${shlibs:Depends}, strongswan-ikev2
 Recommends: network-manager-strongswan
 Description: strongSwan plugin to interact with NetworkManager
- strongSwan is a IPsec based VPN solution for the Linux kernel. It uses the
+ StrongSwan is an IPsec-based VPN solution for the Linux kernel. It uses the
  native IPsec stack and runs on any recent 2.6 kernel (no patching required).
  It supports both IKEv1 and the newer IKEv2 protocols.
  .
  This plugin provides an interface which allows NetworkManager to configure
- and control the IKEv2 daemon directly through DBUS. It is designed to work
+ and control the IKEv2 daemon directly through D-Bus. It is designed to work
  in conjunction with the network-manager-strongswan package, providing
  a simple graphical frontend to configure IPsec based VPNs.