diff --git a/tdenetworkmanager/CMakeL10n.txt b/tdenetworkmanager/CMakeL10n.txt
index b585ce4..0fb305c 100644
--- a/tdenetworkmanager/CMakeL10n.txt
+++ b/tdenetworkmanager/CMakeL10n.txt
@@ -1,3 +1,6 @@
 ##### create translation templates ##############
 
-tde_l10n_auto_add_subdirectories( )
+tde_l10n_create_template(
+    CATALOG "tdenetworkmanager"
+    DESTINATION "po"
+)
diff --git a/tdenetworkmanager/po/tdenetworkmanager.pot b/tdenetworkmanager/po/tdenetworkmanager.pot
index fd6ad82..1170f59 100644
--- a/tdenetworkmanager/po/tdenetworkmanager.pot
+++ b/tdenetworkmanager/po/tdenetworkmanager.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-12-31 04:25+0100\n"
+"POT-Creation-Date: 2018-12-31 04:41+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,452 +25,573 @@ msgid ""
 "Your emails"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:72
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:72
 msgid "Open System"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wpapsk.ui:30
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:73
+#: src/configwidgets/connection_setting_wireless_security_wpapsk.ui:30
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:73
+#: vpn-plugins/openvpn/src/openvpnprop.ui:171
 #, no-c-format
 msgid "Shared Key"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:86
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:86
 msgid "WEP 40/128-bit ASCII"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:87
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:87
 msgid "WEP 40/128-bit Hexadecimal"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:88
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:88
 msgid "WEP 128-bit passphrase"
 msgstr ""
 
-#: configwidgets/connection_setting_serial.ui:52
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:309
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:578
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:695
+#: src/configwidgets/connection_setting_serial.ui:52
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:309
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:578
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:695
 #, no-c-format
 msgid "None"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:310
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:310
 msgid "Dynamic WEP"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:581
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:581
 msgid "TTLS"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:584
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:584
 msgid "PEAP"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:587
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:743
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:587
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:743
 msgid "TLS"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:590
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:590
 msgid "Leap"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:593
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:737
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:593
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:737
 msgid "MD5"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:596
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:596
 msgid "FAST"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:599
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:599
 msgid "SIM"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:701
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:701
 msgid "MSCHAPv2"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:707
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:707
 msgid "PAP"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:713
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:713
 msgid "CHAP"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:719
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:719
 msgid "MSCHAP"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:725
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:725
 msgid "GTC"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:731
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:731
 msgid "OTP"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:906
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:931
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:906
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:931
 msgid "WPA Personal"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:912
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:932
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:912
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:932
 msgid "WPA Enterprise"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wep.ui:30
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:918
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:930
+#: src/configwidgets/connection_setting_wireless_security_wep.ui:30
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:918
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:930
 #, no-c-format
 msgid "WEP"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:924
-#: configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:933
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:924
+#: src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp:933
 msgid "IEEE 802.1X"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_setting_wireless_widget.cpp:215
+#: src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp:215
 msgid "hidden"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_settings_dialog.cpp:306
-#: configwidgets/tdenetman-connection_settings_dialog.cpp:333
+#: src/configwidgets/tdenetman-connection_settings_dialog.cpp:306
+#: src/configwidgets/tdenetman-connection_settings_dialog.cpp:333
 msgid ""
 "<qt><b>Unable to save network connection!</b><p>Potential causes:<br> * "
 "Insufficient permissions<br> * NetworkManager not running<br> * DBUS "
 "failure</qt>"
 msgstr ""
 
-#: configwidgets/tdenetman-connection_settings_dialog.cpp:306
-#: configwidgets/tdenetman-connection_settings_dialog.cpp:333
-#: tdenetman-connection_editor.cpp:231
+#: src/configwidgets/tdenetman-connection_settings_dialog.cpp:306
+#: src/configwidgets/tdenetman-connection_settings_dialog.cpp:333
+#: src/tdenetman-connection_editor.cpp:231
 msgid "Unable to perform requested operation"
 msgstr ""
 
-#: devicetraycomponent.cpp:94
+#: src/devicetraycomponent.cpp:94
 msgid "Unknown"
 msgstr ""
 
-#: devicetraycomponent.cpp:95
+#: src/devicetraycomponent.cpp:95
 msgid "Down"
 msgstr ""
 
-#: devicetraycomponent.cpp:96
+#: src/devicetraycomponent.cpp:96
 msgid "Unmanaged"
 msgstr ""
 
-#: devicetraycomponent.cpp:97
+#: src/devicetraycomponent.cpp:97
 msgid "Disconnected"
 msgstr ""
 
-#: devicetraycomponent.cpp:98
+#: src/devicetraycomponent.cpp:98
 msgid "Preparing"
 msgstr ""
 
-#: devicetraycomponent.cpp:99
+#: src/devicetraycomponent.cpp:99
 msgid "Configuration"
 msgstr ""
 
-#: devicetraycomponent.cpp:100
+#: src/devicetraycomponent.cpp:100
 msgid "Awaiting authentication"
 msgstr ""
 
-#: devicetraycomponent.cpp:101
+#: src/devicetraycomponent.cpp:101
 msgid "IP configuration"
 msgstr ""
 
-#: devicetraycomponent.cpp:102
+#: src/devicetraycomponent.cpp:102
 msgid "Activated"
 msgstr ""
 
-#: devicetraycomponent.cpp:103
+#: src/devicetraycomponent.cpp:103
 msgid "Failed"
 msgstr ""
 
-#: devicetraycomponent.cpp:144
+#: src/devicetraycomponent.cpp:144
 #, c-format
 msgid "Device: %1"
 msgstr ""
 
-#: devicetraycomponent.cpp:145
+#: src/devicetraycomponent.cpp:145
 #, c-format
 msgid "State: %1"
 msgstr ""
 
-#: main.cpp:40
+#: src/main.cpp:40
 msgid "A NetworkManager front-end for TDE"
 msgstr ""
 
-#: main.cpp:41
+#: src/main.cpp:41
 msgid "Copyright (C) 2012 Trinity Destop Project"
 msgstr ""
 
-#: main.cpp:42
+#: src/main.cpp:42
 msgid "http://www.trinitydesktop.org"
 msgstr ""
 
-#: main.cpp:47
+#: src/main.cpp:47
 msgid "TDENetworkManager"
 msgstr ""
 
-#: main.cpp:51
+#: src/main.cpp:51
 msgid "TDE Rewrite"
 msgstr ""
 
-#: main.cpp:52 main.cpp:53
+#: src/main.cpp:52 src/main.cpp:53
 msgid "Maintainer"
 msgstr ""
 
-#: main.cpp:54 main.cpp:55
+#: src/main.cpp:54 src/main.cpp:55
 msgid "Additional code"
 msgstr ""
 
-#: main.cpp:56
+#: src/main.cpp:56
 msgid "TDEWallet integration"
 msgstr ""
 
-#: tdenetman-cellular_device_tray.cpp:104 tdenetman-wired_device_tray.cpp:114
+#: src/tdenetman-cellular_device_tray.cpp:104
+#: src/tdenetman-wired_device_tray.cpp:114
 msgid "DHCP"
 msgstr ""
 
-#: tdenetman-cellular_device_tray.cpp:104 tdenetman-wired_device_tray.cpp:114
+#: src/tdenetman-cellular_device_tray.cpp:104
+#: src/tdenetman-wired_device_tray.cpp:114
 msgid "Manual IP config"
 msgstr ""
 
-#: tdenetman-connection_editor.cpp:110
+#: src/tdenetman-connection_editor.cpp:110
 msgid "Wireless"
 msgstr ""
 
-#: tdenetman-connection_editor.cpp:111
+#: src/tdenetman-connection_editor.cpp:111
 msgid "Wired"
 msgstr ""
 
-#: configwidgets/connection_setting_vpn.ui:16
-#: tdenetman-connection_editor.cpp:114
+#: src/configwidgets/connection_setting_vpn.ui:16
+#: src/tdenetman-connection_editor.cpp:114
 #, no-c-format
 msgid "VPN"
 msgstr ""
 
-#: tdenetman-connection_editor.cpp:231
+#: src/tdenetman-connection_editor.cpp:231
 msgid ""
 "<qt><b>Unable to delete network connection!</b><p>Potential causes:<br> * "
 "Insufficient permissions<br> * NetworkManager not running<br> * DBUS "
 "failure</qt>"
 msgstr ""
 
-#: tdenetman-pluginmanager.cpp:130
+#: src/tdenetman-pluginmanager.cpp:130
 msgid "successfully loaded plugin '%1'"
 msgstr ""
 
-#: tdenetman-tray.cpp:349
+#: src/tdenetman-tray.cpp:349
 msgid "NetworkManager is not running"
 msgstr ""
 
-#: tdenetman-tray.cpp:363
+#: src/tdenetman-tray.cpp:363
 msgid "&Help"
 msgstr ""
 
-#: tdenetman-tray.cpp:909
+#: src/tdenetman-tray.cpp:909
 msgid "New network device %1 found"
 msgstr ""
 
-#: tdenetman-tray.cpp:917
+#: src/tdenetman-tray.cpp:917
 msgid "Network device %1 removed"
 msgstr ""
 
-#: tdenetman-tray.cpp:927
+#: src/tdenetman-tray.cpp:927
 msgid "NetworkManager is connecting"
 msgstr ""
 
-#: tdenetman-tray.cpp:930
+#: src/tdenetman-tray.cpp:930
 msgid "NetworkManager is now disconnected"
 msgstr ""
 
-#: tdenetman-tray.cpp:933
+#: src/tdenetman-tray.cpp:933
 msgid "NetworkManager is now connected"
 msgstr ""
 
-#: tdenetman-tray.cpp:936
+#: src/tdenetman-tray.cpp:936
 msgid "TDENetworkManager Offline"
 msgstr ""
 
-#: tdenetman-tray.cpp:1054
+#: src/tdenetman-tray.cpp:1054
 msgid "Switch to offline mode"
 msgstr ""
 
-#: tdenetman-tray.cpp:1058
+#: src/tdenetman-tray.cpp:1058
 msgid "Switch to online mode"
 msgstr ""
 
-#: tdenetman-tray.cpp:1062
+#: src/tdenetman-tray.cpp:1062
 msgid "Disable Wireless"
 msgstr ""
 
-#: tdenetman-tray.cpp:1066
+#: src/tdenetman-tray.cpp:1066
 msgid "Enable Wireless"
 msgstr ""
 
-#: tdenetman-tray.cpp:1070
+#: src/tdenetman-tray.cpp:1070
 msgid "Edit Connections"
 msgstr ""
 
-#: tdenetman-tray.cpp:1074
+#: src/tdenetman-tray.cpp:1074
 msgid "Configure Notifications"
 msgstr ""
 
-#: tdenetman-tray.cpp:1079 tdenetman-tray.cpp:1083 vpn_tray_component.cpp:183
+#: src/tdenetman-tray.cpp:1079 src/tdenetman-tray.cpp:1083
+#: src/vpn_tray_component.cpp:183
 msgid "New connection ..."
 msgstr ""
 
-#: tdenetman-tray.cpp:1087
+#: src/tdenetman-tray.cpp:1087
 msgid "Deactivate connection..."
 msgstr ""
 
-#: tdenetman-vpnauthenticationdialog.cpp:54
+#: src/tdenetman-vpnauthenticationdialog.cpp:54
 #, c-format
 msgid "VPN Authentication for %1"
 msgstr ""
 
-#: tdenetman-vpnservice.cpp:64
+#: src/tdenetman-vpnservice.cpp:64
 msgid "Using VPN plugin '%1' for service '%2'"
 msgstr ""
 
-#: tdenetman-wired_device_tray.cpp:89
+#: src/tdenetman-wired_device_tray.cpp:89
 msgid "Cable disconnected"
 msgstr ""
 
-#: tdenetman-wired_device_tray.cpp:126
+#: src/tdenetman-wired_device_tray.cpp:126
 msgid "Create new wired connection"
 msgstr ""
 
-#: tdenetman-wireless_device_tray.cpp:75
+#: src/tdenetman-wireless_device_tray.cpp:75
 #, c-format
 msgid "Network: %1"
 msgstr ""
 
-#: tdenetman-wireless_device_tray.cpp:77
+#: src/tdenetman-wireless_device_tray.cpp:77
 msgid "Signal Strength: %1%"
 msgstr ""
 
-#: tdenetman-wireless_device_tray.cpp:220
+#: src/tdenetman-wireless_device_tray.cpp:220
 msgid "Connect to saved network"
 msgstr ""
 
-#: tdenetman-wireless_device_tray.cpp:252
+#: src/tdenetman-wireless_device_tray.cpp:252
 msgid "Connect to new network"
 msgstr ""
 
-#: tdenetman-wireless_device_tray.cpp:275
+#: src/tdenetman-wireless_device_tray.cpp:275
 msgid "Wireless disabled"
 msgstr ""
 
-#: tdenetman-wireless_device_tray.cpp:281
+#: src/tdenetman-wireless_device_tray.cpp:281
 msgid "Wireless disabled by Killswitch"
 msgstr ""
 
-#: tdenetman-wireless_device_tray.cpp:420
+#: src/tdenetman-wireless_device_tray.cpp:420
 msgid "TDENetworkManager New Wireless Network Found"
 msgstr ""
 
-#: tdenetman-wireless_device_tray.cpp:425
+#: src/tdenetman-wireless_device_tray.cpp:425
 msgid "TDENetworkManager Wireless Network Disappeared"
 msgstr ""
 
-#: tdenetman-wireless_menuitem.cpp:94 tdenetman-wireless_menuitem.cpp:97
+#: src/tdenetman-wireless_menuitem.cpp:94
+#: src/tdenetman-wireless_menuitem.cpp:97
 msgid "WPA"
 msgstr ""
 
-#: tdenetman-wireless_menuitem.cpp:94 tdenetman-wireless_menuitem.cpp:100
+#: src/tdenetman-wireless_menuitem.cpp:94
+#: src/tdenetman-wireless_menuitem.cpp:100
 msgid "RSN"
 msgstr ""
 
-#: vpn_tray_component.cpp:160
+#: src/vpn_tray_component.cpp:160
 msgid "Start VPN connection"
 msgstr ""
 
-#: configwidgets/connection_setting_cdma.ui:16
-#: configwidgets/connection_setting_gsm.ui:16
-#: configwidgets/connection_setting_info.ui:16
-#: configwidgets/connection_setting_wireless_security.ui:16
-#: configwidgets/connection_setting_wireless_security_auth.ui:16
-#: configwidgets/connection_setting_wireless_security_wep.ui:16
-#: configwidgets/connection_setting_wireless_security_wepencryption.ui:16
-#: configwidgets/connection_setting_wireless_security_wpacipher.ui:16
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:134
+msgid "X.509 Certificates"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:135
+msgid "Pre-shared key"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:136
+msgid "Password Authentication"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:137
+msgid "X.509 with Password Authentication"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:139
+msgid "none"
+msgstr ""
+
+#: src/configwidgets/connection_setting_serial.ui:72
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:140
+#, no-c-format
+msgid "0"
+msgstr ""
+
+#: src/configwidgets/connection_setting_serial.ui:77
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:141
+#, no-c-format
+msgid "1"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:402
+msgid "You have to specify a gateway"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:410
+msgid "The port number has to be numeric"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:421
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:496
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:519
+msgid "no CA file provided"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:426
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:501
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:524
+msgid "CA file not valid"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:433
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:531
+msgid "no CERT file provided"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:438
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:536
+msgid "CERT file not valid"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:445
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:543
+msgid "no Key file provided"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:450
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:548
+msgid "Key file not valid"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:461
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:467
+msgid "Please provide a valid shared key"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:474
+msgid "local IP is invalid"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:480
+msgid "remote IP is invalid"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:489
+#: vpn-plugins/openvpn/src/tdenetman-openvpn.cpp:512
+msgid "no username provided"
+msgstr ""
+
+#: vpn-plugins/pptp/src/tdenetman-pptp.cpp:216
+msgid "At least the gateway has to be supplied."
+msgstr ""
+
+#: vpn-plugins/strongswan/src/tdenetman-strongswan.cpp:226
+#: vpn-plugins/vpnc/src/tdenetman-vpnc.cpp:371
+msgid "At least the gateway and group has to be supplied."
+msgstr ""
+
+#: vpn-plugins/vpnc/src/tdenetman-vpnc.cpp:98
+msgid "Cisco UDP (default)"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/tdenetman-vpnc.cpp:99
+msgid "NAT-T"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/tdenetman-vpnc.cpp:100
+msgid "Disabled"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/tdenetman-vpnc.cpp:214
+msgid "That configuration file does not exist!"
+msgstr ""
+
+#: src/configwidgets/connection_setting_cdma.ui:16
+#: src/configwidgets/connection_setting_gsm.ui:16
+#: src/configwidgets/connection_setting_info.ui:16
+#: src/configwidgets/connection_setting_wireless_security.ui:16
+#: src/configwidgets/connection_setting_wireless_security_auth.ui:16
+#: src/configwidgets/connection_setting_wireless_security_wep.ui:16
+#: src/configwidgets/connection_setting_wireless_security_wepencryption.ui:16
+#: src/configwidgets/connection_setting_wireless_security_wpacipher.ui:16
 #, no-c-format
 msgid "Form1"
 msgstr ""
 
-#: configwidgets/connection_setting_cdma.ui:38
-#: configwidgets/connection_setting_gsm.ui:60
+#: src/configwidgets/connection_setting_cdma.ui:38
+#: src/configwidgets/connection_setting_gsm.ui:60
 #, no-c-format
 msgid "Password needed to access the service"
 msgstr ""
 
-#: configwidgets/connection_setting_cdma.ui:46
-#: configwidgets/connection_setting_gsm.ui:49
+#: src/configwidgets/connection_setting_cdma.ui:46
+#: src/configwidgets/connection_setting_gsm.ui:49
 #, no-c-format
 msgid "&Number:"
 msgstr ""
 
-#: configwidgets/connection_setting_cdma.ui:57
-#: configwidgets/connection_setting_gsm.ui:190
+#: src/configwidgets/connection_setting_cdma.ui:57
+#: src/configwidgets/connection_setting_gsm.ui:190
 #, no-c-format
 msgid "Username needed to access the service"
 msgstr ""
 
-#: configwidgets/connection_setting_cdma.ui:65
-#: configwidgets/connection_setting_gsm.ui:115
+#: src/configwidgets/connection_setting_cdma.ui:65
+#: src/configwidgets/connection_setting_gsm.ui:115
 #, no-c-format
 msgid "&Username:"
 msgstr ""
 
-#: configwidgets/connection_setting_cdma.ui:76
+#: src/configwidgets/connection_setting_cdma.ui:76
 #, no-c-format
 msgid "&Password:"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:38
+#: src/configwidgets/connection_setting_gsm.ui:38
 #, no-c-format
 msgid "Network &ID:"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:66
+#: src/configwidgets/connection_setting_gsm.ui:66
 #, no-c-format
 msgid "Any"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:71
+#: src/configwidgets/connection_setting_gsm.ui:71
 #, no-c-format
 msgid "Only 3G"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:76
+#: src/configwidgets/connection_setting_gsm.ui:76
 #, no-c-format
 msgid "Only GPRS/EDGE"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:81
+#: src/configwidgets/connection_setting_gsm.ui:81
 #, no-c-format
 msgid "Prefer 3G"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:86
+#: src/configwidgets/connection_setting_gsm.ui:86
 #, no-c-format
 msgid "Prefer 2G"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:93
+#: src/configwidgets/connection_setting_gsm.ui:93
 #, no-c-format
 msgid "Select the type of cellular data network the connection should use"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:96
+#: src/configwidgets/connection_setting_gsm.ui:96
 #, no-c-format
 msgid ""
 "Any chooses the best available; GSM/GPRS locks the connection to the "
@@ -478,550 +599,867 @@ msgid ""
 "other if necessary"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:104
+#: src/configwidgets/connection_setting_gsm.ui:104
 #, no-c-format
 msgid "Network &Type:"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:126
+#: src/configwidgets/connection_setting_gsm.ui:126
 #, no-c-format
 msgid "Access Point Name"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:129
+#: src/configwidgets/connection_setting_gsm.ui:129
 #, no-c-format
 msgid "The hostname of the machine providing network access"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:137
+#: src/configwidgets/connection_setting_gsm.ui:137
 #, no-c-format
 msgid "&Band:"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:179
+#: src/configwidgets/connection_setting_gsm.ui:179
 #, no-c-format
 msgid "Personal Identification Number"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:182
+#: src/configwidgets/connection_setting_gsm.ui:182
 #, no-c-format
 msgid ""
 "A code used for all GSM-based phones to establish authorisation for access "
 "to certain functions or information"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:203
+#: src/configwidgets/connection_setting_gsm.ui:203
 #, no-c-format
 msgid "The GSM network to connect to"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:211
+#: src/configwidgets/connection_setting_gsm.ui:211
 #, no-c-format
 msgid "&PIN:"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:222
+#: src/configwidgets/connection_setting_gsm.ui:222
 #, no-c-format
 msgid "Pass&word:"
 msgstr ""
 
-#: configwidgets/connection_setting_gsm.ui:233
+#: src/configwidgets/connection_setting_gsm.ui:233
 #, no-c-format
 msgid "&APN:"
 msgstr ""
 
-#: configwidgets/connection_setting_info.ui:27
+#: src/configwidgets/connection_setting_info.ui:27
 #, no-c-format
 msgid "Connection Name:"
 msgstr ""
 
-#: configwidgets/connection_setting_info.ui:57
+#: src/configwidgets/connection_setting_info.ui:57
 #, no-c-format
 msgid "Autoconnect:"
 msgstr ""
 
-#: configwidgets/connection_setting_ipv4.ui:16
-#: configwidgets/connection_setting_wireless_security_wpaversion.ui:16
+#: src/configwidgets/connection_setting_ipv4.ui:16
+#: src/configwidgets/connection_setting_wireless_security_wpaversion.ui:16
 #, no-c-format
 msgid "Form3"
 msgstr ""
 
-#: configwidgets/connection_setting_ipv4.ui:27
+#: src/configwidgets/connection_setting_ipv4.ui:27
 #, no-c-format
 msgid "Use manual IP configuration"
 msgstr ""
 
-#: configwidgets/connection_setting_ipv4.ui:44
+#: src/configwidgets/connection_setting_ipv4.ui:44
 #, no-c-format
 msgid "DNS Addresses:"
 msgstr ""
 
-#: configwidgets/connection_setting_ipv4.ui:52
+#: src/configwidgets/connection_setting_ipv4.ui:52
 #, no-c-format
 msgid "DNS Search:"
 msgstr ""
 
-#: configwidgets/connection_setting_ipv4.ui:60
+#: src/configwidgets/connection_setting_ipv4.ui:60
 #, no-c-format
 msgid "IP Address:"
 msgstr ""
 
-#: configwidgets/connection_setting_ipv4.ui:83
+#: src/configwidgets/connection_setting_ipv4.ui:83
 #, no-c-format
 msgid "Netmask:"
 msgstr ""
 
-#: configwidgets/connection_setting_ipv4.ui:96
+#: src/configwidgets/connection_setting_ipv4.ui:96
+#: vpn-plugins/pptp/src/pptpprop.ui:42
 #, no-c-format
 msgid "Gateway:"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:16
-#: configwidgets/connection_setting_serial.ui:16
-#: configwidgets/connection_setting_wireless_security_eap.ui:16
-#: configwidgets/connection_setting_wireless_security_wpapsk.ui:16
+#: src/configwidgets/connection_setting_ppp.ui:16
+#: src/configwidgets/connection_setting_serial.ui:16
+#: src/configwidgets/connection_setting_wireless_security_eap.ui:16
+#: src/configwidgets/connection_setting_wireless_security_wpapsk.ui:16
 #, no-c-format
 msgid "Form2"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:38
+#: src/configwidgets/connection_setting_ppp.ui:38
 #, no-c-format
 msgid "Require MPPE128"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:76
+#: src/configwidgets/connection_setting_ppp.ui:76
 #, no-c-format
 msgid "LCP Echo Interval"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:99
+#: src/configwidgets/connection_setting_ppp.ui:99
 #, no-c-format
 msgid "LCP Echo Failure"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:122
-#: configwidgets/connection_setting_serial.ui:131
+#: src/configwidgets/connection_setting_ppp.ui:122
+#: src/configwidgets/connection_setting_serial.ui:131
 #, no-c-format
 msgid "Baud rate"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:145
+#: src/configwidgets/connection_setting_ppp.ui:145
 #, no-c-format
 msgid "MTU"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:155
+#: src/configwidgets/connection_setting_ppp.ui:155
+#: vpn-plugins/pptp/src/pptpprop.ui:164
 #, no-c-format
 msgid "Refuse PAP"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:163
+#: src/configwidgets/connection_setting_ppp.ui:163
 #, no-c-format
 msgid "No Authorization"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:171
+#: src/configwidgets/connection_setting_ppp.ui:171
 #, no-c-format
 msgid "No VJ Compression"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:179
+#: src/configwidgets/connection_setting_ppp.ui:179
+#: vpn-plugins/pptp/src/pptpprop.ui:180
 #, no-c-format
 msgid "Refuse MSCHAP"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:200
+#: src/configwidgets/connection_setting_ppp.ui:200
 #, no-c-format
 msgid "MRU"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:210
+#: src/configwidgets/connection_setting_ppp.ui:210
 #, no-c-format
 msgid "Require MPPE"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:218
+#: src/configwidgets/connection_setting_ppp.ui:218
 #, no-c-format
 msgid "Refuse MSCHAPv2"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:226
+#: src/configwidgets/connection_setting_ppp.ui:226
 #, no-c-format
 msgid "No BSD"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:234
+#: src/configwidgets/connection_setting_ppp.ui:234
 #, no-c-format
 msgid "Stateful MPPE"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:242
+#: src/configwidgets/connection_setting_ppp.ui:242
 #, no-c-format
 msgid "CRTSCTS"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:250
+#: src/configwidgets/connection_setting_ppp.ui:250
 #, no-c-format
 msgid "No Deflate"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:258
+#: src/configwidgets/connection_setting_ppp.ui:258
+#: vpn-plugins/pptp/src/pptpprop.ui:172
 #, no-c-format
 msgid "Refuse CHAP"
 msgstr ""
 
-#: configwidgets/connection_setting_ppp.ui:266
+#: src/configwidgets/connection_setting_ppp.ui:266
+#: vpn-plugins/pptp/src/pptpprop.ui:156
 #, no-c-format
 msgid "Refuse EAP"
 msgstr ""
 
-#: configwidgets/connection_setting_serial.ui:43
+#: src/configwidgets/connection_setting_serial.ui:43
 #, no-c-format
 msgid "&Send delay"
 msgstr ""
 
-#: configwidgets/connection_setting_serial.ui:57
+#: src/configwidgets/connection_setting_serial.ui:57
 #, no-c-format
 msgid "Even"
 msgstr ""
 
-#: configwidgets/connection_setting_serial.ui:62
+#: src/configwidgets/connection_setting_serial.ui:62
 #, no-c-format
 msgid "Odd"
 msgstr ""
 
-#: configwidgets/connection_setting_serial.ui:72
-#, no-c-format
-msgid "0"
-msgstr ""
-
-#: configwidgets/connection_setting_serial.ui:77
-#, no-c-format
-msgid "1"
-msgstr ""
-
-#: configwidgets/connection_setting_serial.ui:90
+#: src/configwidgets/connection_setting_serial.ui:90
 #, no-c-format
 msgid "7"
 msgstr ""
 
-#: configwidgets/connection_setting_serial.ui:95
+#: src/configwidgets/connection_setting_serial.ui:95
 #, no-c-format
 msgid "8"
 msgstr ""
 
-#: configwidgets/connection_setting_serial.ui:100
+#: src/configwidgets/connection_setting_serial.ui:100
 #, no-c-format
 msgid "9"
 msgstr ""
 
-#: configwidgets/connection_setting_serial.ui:120
+#: src/configwidgets/connection_setting_serial.ui:120
 #, no-c-format
 msgid "&Stop bits:"
 msgstr ""
 
-#: configwidgets/connection_setting_serial.ui:139
+#: src/configwidgets/connection_setting_serial.ui:139
 #, no-c-format
 msgid "&Parity:"
 msgstr ""
 
-#: configwidgets/connection_setting_serial.ui:150
+#: src/configwidgets/connection_setting_serial.ui:150
 #, no-c-format
 msgid "&Data bits:"
 msgstr ""
 
-#: configwidgets/connection_setting_vpn.ui:32
+#: src/configwidgets/connection_setting_vpn.ui:32
 #, no-c-format
 msgid "Service"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless.ui:16
+#: src/configwidgets/connection_setting_wireless.ui:16
 #, no-c-format
 msgid "Form6"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless.ui:27
+#: src/configwidgets/connection_setting_wireless.ui:27
 #, no-c-format
 msgid "Essid:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless.ui:40
+#: src/configwidgets/connection_setting_wireless.ui:40
 #, no-c-format
 msgid "Expert options"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless.ui:63
+#: src/configwidgets/connection_setting_wireless.ui:63
 #, no-c-format
 msgid "Essid"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless.ui:74
+#: src/configwidgets/connection_setting_wireless.ui:74
 #, no-c-format
 msgid "Quality"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless.ui:85
+#: src/configwidgets/connection_setting_wireless.ui:85
 #, no-c-format
 msgid "Security"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless.ui:96
+#: src/configwidgets/connection_setting_wireless.ui:96
 #, no-c-format
 msgid "APs"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless.ui:137
+#: src/configwidgets/connection_setting_wireless.ui:137
 #, no-c-format
 msgid "Refresh automatically"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security.ui:27
+#: src/configwidgets/connection_setting_wireless_security.ui:27
 #, no-c-format
 msgid "Use Wireless Security"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security.ui:49
+#: src/configwidgets/connection_setting_wireless_security.ui:49
 #, no-c-format
 msgid "Security:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security.ui:76
+#: src/configwidgets/connection_setting_wireless_security.ui:76
 #, no-c-format
 msgid "Expert settings"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_auth.ui:27
+#: src/configwidgets/connection_setting_wireless_security_auth.ui:27
 #, no-c-format
 msgid "Authentication"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_auth.ui:38
-#: configwidgets/connection_setting_wireless_security_eap.ui:41
-#: configwidgets/connection_setting_wireless_security_phase2.ui:41
+#: src/configwidgets/connection_setting_wireless_security_auth.ui:38
+#: src/configwidgets/connection_setting_wireless_security_eap.ui:41
+#: src/configwidgets/connection_setting_wireless_security_phase2.ui:41
 #, no-c-format
 msgid "Method:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_eap.ui:30
+#: src/configwidgets/connection_setting_wireless_security_eap.ui:30
 #, no-c-format
 msgid "EAP"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_eap.ui:49
+#: src/configwidgets/connection_setting_wireless_security_eap.ui:49
 #, no-c-format
 msgid "Identity:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_eap.ui:72
+#: src/configwidgets/connection_setting_wireless_security_eap.ui:72
 #, no-c-format
 msgid "Anonymous Identity:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_eap.ui:80
+#: src/configwidgets/connection_setting_wireless_security_eap.ui:80
 #, no-c-format
 msgid "Password:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_eap.ui:93
+#: src/configwidgets/connection_setting_wireless_security_eap.ui:93
 #, no-c-format
 msgid "Private Secret Key:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_eap.ui:106
+#: src/configwidgets/connection_setting_wireless_security_eap.ui:106
 #, no-c-format
 msgid "Client Certificate:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_eap.ui:124
+#: src/configwidgets/connection_setting_wireless_security_eap.ui:124
 #, no-c-format
 msgid "Private Keyfile:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_eap.ui:132
+#: src/configwidgets/connection_setting_wireless_security_eap.ui:132
 #, no-c-format
 msgid "CA Certificate:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_eap.ui:145
+#: src/configwidgets/connection_setting_wireless_security_eap.ui:145
 #, no-c-format
 msgid "Use System CA Certificates"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_phase2.ui:16
+#: src/configwidgets/connection_setting_wireless_security_phase2.ui:16
 #, no-c-format
 msgid "Form4"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_phase2.ui:30
+#: src/configwidgets/connection_setting_wireless_security_phase2.ui:30
 #, no-c-format
 msgid "Phase 2"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wep.ui:63
+#: src/configwidgets/connection_setting_wireless_security_wep.ui:63
 #, no-c-format
 msgid "Key 2:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wep.ui:71
+#: src/configwidgets/connection_setting_wireless_security_wep.ui:71
 #, no-c-format
 msgid "Key 4:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wep.ui:79
+#: src/configwidgets/connection_setting_wireless_security_wep.ui:79
 #, no-c-format
 msgid "Type:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wep.ui:87
+#: src/configwidgets/connection_setting_wireless_security_wep.ui:87
 #, no-c-format
 msgid "Key 1:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wep.ui:100
+#: src/configwidgets/connection_setting_wireless_security_wep.ui:100
 #, no-c-format
 msgid "Key 3:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wep.ui:131
+#: src/configwidgets/connection_setting_wireless_security_wep.ui:131
 #, no-c-format
 msgid "Authentication:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wepencryption.ui:30
+#: src/configwidgets/connection_setting_wireless_security_wepencryption.ui:30
 #, no-c-format
 msgid "Encryption"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wpacipher.ui:30
+#: src/configwidgets/connection_setting_wireless_security_wpacipher.ui:30
 #, no-c-format
 msgid "Use specific cipher"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wpacipher.ui:47
+#: src/configwidgets/connection_setting_wireless_security_wpacipher.ui:47
 #, no-c-format
 msgid "Group Cipher:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wpacipher.ui:55
+#: src/configwidgets/connection_setting_wireless_security_wpacipher.ui:55
 #, no-c-format
 msgid "Pairwise Cipher:"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wpacipher.ui:63
-#: configwidgets/connection_setting_wireless_security_wpacipher.ui:87
+#: src/configwidgets/connection_setting_wireless_security_wpacipher.ui:63
+#: src/configwidgets/connection_setting_wireless_security_wpacipher.ui:87
 #, no-c-format
 msgid "CCMP"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wpacipher.ui:71
-#: configwidgets/connection_setting_wireless_security_wpacipher.ui:79
+#: src/configwidgets/connection_setting_wireless_security_wpacipher.ui:71
+#: src/configwidgets/connection_setting_wireless_security_wpacipher.ui:79
 #, no-c-format
 msgid "TKIP"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wpacipher.ui:95
+#: src/configwidgets/connection_setting_wireless_security_wpacipher.ui:95
 #, no-c-format
 msgid "WEP 40"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wpacipher.ui:120
+#: src/configwidgets/connection_setting_wireless_security_wpacipher.ui:120
 #, no-c-format
 msgid "WEP 104"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wpaversion.ui:30
+#: src/configwidgets/connection_setting_wireless_security_wpaversion.ui:30
 #, no-c-format
 msgid "Use specific WPA Version"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wpaversion.ui:47
+#: src/configwidgets/connection_setting_wireless_security_wpaversion.ui:47
 #, no-c-format
 msgid "WPA 2/RSN"
 msgstr ""
 
-#: configwidgets/connection_setting_wireless_security_wpaversion.ui:55
+#: src/configwidgets/connection_setting_wireless_security_wpaversion.ui:55
 #, no-c-format
 msgid "WPA 1"
 msgstr ""
 
-#: configwidgets/connection_settings.ui:16
+#: src/configwidgets/connection_settings.ui:16
 #, no-c-format
 msgid "Connections"
 msgstr ""
 
-#: configwidgets/connection_settings.ui:27
+#: src/configwidgets/connection_settings.ui:27
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: configwidgets/connection_settings.ui:40
-#: connection_editor.ui:93
+#: src/configwidgets/connection_settings.ui:40
+#: src/connection_editor.ui:93
 #, no-c-format
 msgid "New Connection"
 msgstr ""
 
-#: configwidgets/connection_settings.ui:72
-#: vpnauthentication.ui:54
+#: src/configwidgets/connection_settings.ui:72
+#: src/vpnauthentication.ui:54
 #, no-c-format
 msgid "Cancel"
 msgstr ""
 
-#: configwidgets/connection_settings.ui:97
+#: src/configwidgets/connection_settings.ui:97
 #, no-c-format
 msgid "Next"
 msgstr ""
 
-#: configwidgets/connection_settings.ui:108
+#: src/configwidgets/connection_settings.ui:108
 #, no-c-format
 msgid "Save"
 msgstr ""
 
-#: configwidgets/connection_settings.ui:116
+#: src/configwidgets/connection_settings.ui:116
 #, no-c-format
 msgid "Connect && Save"
 msgstr ""
 
-#: connection_editor.ui:16
+#: src/connection_editor.ui:16
 #, no-c-format
 msgid "Edit Connections ..."
 msgstr ""
 
-#: connection_editor.ui:25
+#: src/connection_editor.ui:25
 #, no-c-format
 msgid "Connection"
 msgstr ""
 
-#: connection_editor.ui:36
+#: src/connection_editor.ui:36
 #, no-c-format
 msgid "Type"
 msgstr ""
 
-#: connection_editor.ui:68
+#: src/connection_editor.ui:68
 #, no-c-format
 msgid "Close"
 msgstr ""
 
-#: connection_editor.ui:101
+#: src/connection_editor.ui:101
 #, no-c-format
 msgid "Delete Connection"
 msgstr ""
 
-#: connection_editor.ui:109
+#: src/connection_editor.ui:109
 #, no-c-format
 msgid "Edit Connection"
 msgstr ""
 
-#: vpnauthentication.ui:24
+#: src/vpnauthentication.ui:24
 #, no-c-format
 msgid "AuthenticationDialog"
 msgstr ""
 
-#: vpnauthentication.ui:35
+#: src/vpnauthentication.ui:35
 #, no-c-format
 msgid "OK"
 msgstr ""
 
-#: vpnauthentication.ui:46
+#: src/vpnauthentication.ui:46
 #, no-c-format
 msgid "Save passwords permanent"
 msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnauth.ui:16
+#, no-c-format
+msgid "OpenVPNAuthentication"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnauth.ui:30
+#: vpn-plugins/openvpn/src/openvpnprop.ui:213
+#: vpn-plugins/pptp/src/pptpauth.ui:55
+#: vpn-plugins/strongswan/src/strongswanauth.ui:47
+#: vpn-plugins/vpnc/src/vpncauth.ui:30
+#, no-c-format
+msgid "Password"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:31
+#: vpn-plugins/pptp/src/pptpprop.ui:31
+#: vpn-plugins/strongswan/src/strongswanprop.ui:31
+#: vpn-plugins/vpnc/src/vpncprop.ui:34
+#, no-c-format
+msgid "Required Information"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:77
+#, no-c-format
+msgid "X.509"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:103
+#: vpn-plugins/openvpn/src/openvpnprop.ui:234
+#: vpn-plugins/openvpn/src/openvpnprop.ui:284
+#, no-c-format
+msgid "CA file"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:111
+#: vpn-plugins/openvpn/src/openvpnprop.ui:297
+#: vpn-plugins/strongswan/src/strongswanprop.ui:74
+#, no-c-format
+msgid "Certificate"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:119
+#: vpn-plugins/openvpn/src/openvpnprop.ui:305
+#: vpn-plugins/strongswan/src/strongswanprop.ui:88
+#, no-c-format
+msgid "Key"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:145
+#, no-c-format
+msgid "Shared key"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:179
+#, no-c-format
+msgid "Local IP"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:187
+#, no-c-format
+msgid "Remote IP"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:242
+#: vpn-plugins/openvpn/src/openvpnprop.ui:323
+#: vpn-plugins/pptp/src/pptpauth.ui:63
+#: vpn-plugins/strongswan/src/strongswanauth.ui:55
+#: vpn-plugins/strongswan/src/strongswanprop.ui:82
+#, no-c-format
+msgid "Username"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:268
+#, no-c-format
+msgid "X.509 with password authentication"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:336
+#, no-c-format
+msgid "Connection Type"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:349
+#: vpn-plugins/vpnc/src/vpncprop.ui:45
+#, no-c-format
+msgid "Gateway"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:357
+#, no-c-format
+msgid "Port"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:378
+#, no-c-format
+msgid "Use Default"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:391
+#: vpn-plugins/pptp/src/pptpprop.ui:77
+#: vpn-plugins/strongswan/src/strongswanprop.ui:160
+#: vpn-plugins/vpnc/src/vpncprop.ui:149
+#, no-c-format
+msgid "Optional Information"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:410
+#, no-c-format
+msgid ""
+"Only use VPN Connection for these Addresses (eg: 172.16.0.0/16 10.11.12.0/24)"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:418
+#, no-c-format
+msgid "Use TAP device"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:426
+#, no-c-format
+msgid "Use LZO compression"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:434
+#, no-c-format
+msgid "Use TCP connection"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:459
+#, no-c-format
+msgid "Use cipher"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:467
+#, no-c-format
+msgid "Use TLS auth"
+msgstr ""
+
+#: vpn-plugins/openvpn/src/openvpnprop.ui:475
+#, no-c-format
+msgid "Direction:"
+msgstr ""
+
+#: vpn-plugins/pptp/src/pptpauth.ui:16
+#, no-c-format
+msgid "PPTPAuthentication"
+msgstr ""
+
+#: vpn-plugins/pptp/src/pptpauth.ui:47
+#: vpn-plugins/vpnc/src/vpncprop.ui:179
+#, no-c-format
+msgid "Domain"
+msgstr ""
+
+#: vpn-plugins/pptp/src/pptpprop.ui:88
+#, no-c-format
+msgid ""
+"Only use VPN Connection for these Adresses\n"
+"(for example: 172.16.0.0/16 10.11.12.0/24)"
+msgstr ""
+
+#: vpn-plugins/pptp/src/pptpprop.ui:188
+#, no-c-format
+msgid "Refuse MSCHAP v2"
+msgstr ""
+
+#: vpn-plugins/pptp/src/pptpprop.ui:196
+#, no-c-format
+msgid "Require MPPE Encryption"
+msgstr ""
+
+#: vpn-plugins/pptp/src/pptpprop.ui:204
+#, no-c-format
+msgid "Require MPPE 40-bit Encryption"
+msgstr ""
+
+#: vpn-plugins/pptp/src/pptpprop.ui:212
+#, no-c-format
+msgid "Require MPPE 128-bit Encryption"
+msgstr ""
+
+#: vpn-plugins/pptp/src/pptpprop.ui:220
+#, no-c-format
+msgid "Use MPPE Stateful Encryption"
+msgstr ""
+
+#: vpn-plugins/pptp/src/pptpprop.ui:228
+#, no-c-format
+msgid "No Deflation"
+msgstr ""
+
+#: vpn-plugins/strongswan/src/strongswanauth.ui:16
+#, no-c-format
+msgid "StrongswanAuthentication"
+msgstr ""
+
+#: vpn-plugins/strongswan/src/strongswanprop.ui:16
+#, no-c-format
+msgid "StrongswanConfigWidget"
+msgstr ""
+
+#: vpn-plugins/strongswan/src/strongswanprop.ui:42
+#, no-c-format
+msgid "<font size=\"+1\"><b>Gateway</b></font>"
+msgstr ""
+
+#: vpn-plugins/strongswan/src/strongswanprop.ui:50
+#, no-c-format
+msgid "<font size=\"+1\"><b>Authentication</b></font>"
+msgstr ""
+
+#: vpn-plugins/strongswan/src/strongswanprop.ui:58
+#, no-c-format
+msgid "Method"
+msgstr ""
+
+#: vpn-plugins/strongswan/src/strongswanprop.ui:66
+#, no-c-format
+msgid "Address"
+msgstr ""
+
+#: vpn-plugins/strongswan/src/strongswanprop.ui:93
+#, no-c-format
+msgid "PSK"
+msgstr ""
+
+#: vpn-plugins/strongswan/src/strongswanprop.ui:98
+#, no-c-format
+msgid "Agent"
+msgstr ""
+
+#: vpn-plugins/strongswan/src/strongswanprop.ui:171
+#, no-c-format
+msgid "Enforce UDP encapsulation"
+msgstr ""
+
+#: vpn-plugins/strongswan/src/strongswanprop.ui:179
+#, no-c-format
+msgid "Use IP compression"
+msgstr ""
+
+#: vpn-plugins/strongswan/src/strongswanprop.ui:187
+#, no-c-format
+msgid "Request inner IP"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/vpncauth.ui:16
+#, no-c-format
+msgid "VPNCAuthentication"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/vpncauth.ui:38
+#, no-c-format
+msgid "Group Password"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/vpncauth.ui:56
+#, no-c-format
+msgid "Group password is hashed"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/vpncprop.ui:16
+#, no-c-format
+msgid "VPNCConfigWidget"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/vpncprop.ui:61
+#, no-c-format
+msgid "Group Name"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/vpncprop.ui:80
+#, no-c-format
+msgid "User Name"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/vpncprop.ui:96
+#, no-c-format
+msgid "Import settings from Cisco PCF file"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/vpncprop.ui:112
+#, no-c-format
+msgid "PCF File"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/vpncprop.ui:120
+#, no-c-format
+msgid "Import"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/vpncprop.ui:160
+#, no-c-format
+msgid "Use NAT keep alive packets"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/vpncprop.ui:168
+#, no-c-format
+msgid "Use domain for authentication"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/vpncprop.ui:190
+#, no-c-format
+msgid "Interval"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/vpncprop.ui:222
+#, no-c-format
+msgid "NAT traversal"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/vpncprop.ui:235
+#, no-c-format
+msgid "Enable weak single DES encryption"
+msgstr ""
+
+#: vpn-plugins/vpnc/src/vpncprop.ui:243
+#, no-c-format
+msgid ""
+"Only use VPN Connection for these Adresses (for example: 172.16.0.0/16 "
+"10.11.12.0/24)"
+msgstr ""
diff --git a/tdenetworkmanager/src/CMakeL10n.txt b/tdenetworkmanager/src/CMakeL10n.txt
deleted file mode 100644
index 6f6c4e3..0000000
--- a/tdenetworkmanager/src/CMakeL10n.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-##### create translation templates ##############
-
-tde_l10n_create_template(
-    CATALOG "tdenetworkmanager"
-    DESTINATION "../po"
-)