diff --git a/vpn-daemons/openvpn/po/ChangeLog b/vpn-daemons/openvpn/po/ChangeLog
index 0cc2af79e1..723d982106 100644
--- a/vpn-daemons/openvpn/po/ChangeLog
+++ b/vpn-daemons/openvpn/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-24  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+	
 2007-04-14  Djihed Afifi <djihed@gmail.com> 
 
 	* ar.po: Updated Arabic Translation by Djihed Afifi.
diff --git a/vpn-daemons/openvpn/po/sv.po b/vpn-daemons/openvpn/po/sv.po
index 24344bac52..c5a7ed819e 100644
--- a/vpn-daemons/openvpn/po/sv.po
+++ b/vpn-daemons/openvpn/po/sv.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager-openvpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-27 03:40+0000\n"
-"PO-Revision-Date: 2007-02-28 01:27+0100\n"
+"POT-Creation-Date: 2007-04-03 03:31+0100\n"
+"PO-Revision-Date: 2007-04-24 14:17+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -75,199 +75,199 @@ msgstr "Lägg till, ta bort och redigera VPN-anslutningar"
 msgid "VPN Connection Manager (OpenVPN)"
 msgstr "VPN-anslutningshanterare (OpenVPN)"
 
-#: ../properties/nm-openvpn.c:143
+#: ../properties/nm-openvpn.c:146
 msgid "OpenVPN Client"
 msgstr "OpenVPN-klient"
 
-#: ../properties/nm-openvpn.c:799
+#: ../properties/nm-openvpn.c:803
 msgid "The following OpenVPN connection will be created:"
 msgstr "Följande OpenVPN-anslutning kommer att skapas:"
 
-#: ../properties/nm-openvpn.c:801
+#: ../properties/nm-openvpn.c:805
 #, c-format
 msgid "Name:  %s"
 msgstr "Namn:  %s"
 
-#: ../properties/nm-openvpn.c:809
+#: ../properties/nm-openvpn.c:813
 msgid "Connection Type: X.509 Certificates"
 msgstr "Anslutningstyp: X.509-certifikat"
 
-#: ../properties/nm-openvpn.c:812
-#: ../properties/nm-openvpn.c:839
-#: ../properties/nm-openvpn.c:851
+#: ../properties/nm-openvpn.c:816
+#: ../properties/nm-openvpn.c:843
+#: ../properties/nm-openvpn.c:855
 #, c-format
 msgid "CA:  %s"
 msgstr "CA:  %s"
 
-#: ../properties/nm-openvpn.c:815
-#: ../properties/nm-openvpn.c:854
+#: ../properties/nm-openvpn.c:819
+#: ../properties/nm-openvpn.c:858
 #, c-format
 msgid "Cert:  %s"
 msgstr "Cert:   %s"
 
-#: ../properties/nm-openvpn.c:818
-#: ../properties/nm-openvpn.c:857
+#: ../properties/nm-openvpn.c:822
+#: ../properties/nm-openvpn.c:861
 #, c-format
 msgid "Key:  %s"
 msgstr "Nyckel: %s"
 
-#: ../properties/nm-openvpn.c:822
+#: ../properties/nm-openvpn.c:826
 msgid "Connection Type: Shared Key"
 msgstr "Anslutningstyp: Delad nyckel"
 
-#: ../properties/nm-openvpn.c:825
+#: ../properties/nm-openvpn.c:829
 #, c-format
 msgid "Shared Key:  %s"
 msgstr "Delad nyckel: %s"
 
-#: ../properties/nm-openvpn.c:828
+#: ../properties/nm-openvpn.c:832
 #, c-format
 msgid "Local IP:  %s"
 msgstr "Lokalt IP:  %s"
 
-#: ../properties/nm-openvpn.c:831
+#: ../properties/nm-openvpn.c:835
 #, c-format
 msgid "Remote IP:  %s"
 msgstr "Fjärr-IP:  %s"
 
-#: ../properties/nm-openvpn.c:836
+#: ../properties/nm-openvpn.c:840
 msgid "Connection Type: Password"
 msgstr "Anslutningstyp: Lösenord"
 
-#: ../properties/nm-openvpn.c:842
-#: ../properties/nm-openvpn.c:860
+#: ../properties/nm-openvpn.c:846
+#: ../properties/nm-openvpn.c:864
 #, c-format
 msgid "Username:  %s"
 msgstr "Användarnamn:  %s"
 
-#: ../properties/nm-openvpn.c:848
+#: ../properties/nm-openvpn.c:852
 msgid "Connection Type: X.509 with Password Authentication"
 msgstr "Anslutningstyp: X.509 med lösenordsautentisering"
 
-#: ../properties/nm-openvpn.c:866
+#: ../properties/nm-openvpn.c:870
 #, c-format
 msgid "Remote:  %s"
 msgstr "Fjärr:  %s"
 
-#: ../properties/nm-openvpn.c:869
+#: ../properties/nm-openvpn.c:873
 #, c-format
 msgid "Port:  %s"
 msgstr "Port:  %s"
 
-#: ../properties/nm-openvpn.c:872
+#: ../properties/nm-openvpn.c:876
 #, c-format
 msgid "Device: %s"
 msgstr "Enhet: %s"
 
-#: ../properties/nm-openvpn.c:872
+#: ../properties/nm-openvpn.c:876
 msgid "TAP"
 msgstr "TAP"
 
-#: ../properties/nm-openvpn.c:872
+#: ../properties/nm-openvpn.c:876
 msgid "TUN"
 msgstr "TUN"
 
-#: ../properties/nm-openvpn.c:875
+#: ../properties/nm-openvpn.c:879
 #, c-format
 msgid "Protocol: %s"
 msgstr "Protokoll: %s"
 
-#: ../properties/nm-openvpn.c:875
+#: ../properties/nm-openvpn.c:879
 msgid "TCP"
 msgstr "TCP"
 
-#: ../properties/nm-openvpn.c:875
+#: ../properties/nm-openvpn.c:879
 msgid "UDP"
 msgstr "UDP"
 
-#: ../properties/nm-openvpn.c:879
+#: ../properties/nm-openvpn.c:883
 #, c-format
 msgid "Routes:  %s"
 msgstr "Vägar:  %s"
 
-#: ../properties/nm-openvpn.c:883
+#: ../properties/nm-openvpn.c:887
 #, c-format
 msgid "Use LZO Compression: %s"
 msgstr "Använd LZO-komprimering: %s"
 
-#: ../properties/nm-openvpn.c:883
+#: ../properties/nm-openvpn.c:887
 msgid "Yes"
 msgstr "Ja"
 
-#: ../properties/nm-openvpn.c:883
+#: ../properties/nm-openvpn.c:887
 msgid "No"
 msgstr "Nej"
 
-#: ../properties/nm-openvpn.c:887
+#: ../properties/nm-openvpn.c:891
 #, c-format
 msgid "Cipher:  %s"
 msgstr "Skiffer:  %s"
 
-#: ../properties/nm-openvpn.c:892
+#: ../properties/nm-openvpn.c:896
 #, c-format
 msgid "TLS auth:  %s %s"
 msgstr "TLS-autentisering:  %s %s"
 
-#: ../properties/nm-openvpn.c:896
+#: ../properties/nm-openvpn.c:900
 msgid "The connection details can be changed using the \"Edit\" button."
 msgstr "Anslutningsdetaljerna kan ändras genom att knappen \"Redigera\" används."
 
-#: ../properties/nm-openvpn.c:1121
+#: ../properties/nm-openvpn.c:1124
 msgid "Cannot import settings"
 msgstr "Kan inte importera inställningar"
 
-#: ../properties/nm-openvpn.c:1123
+#: ../properties/nm-openvpn.c:1126
 #, c-format
 msgid "The VPN settings file '%s' does not contain valid data."
 msgstr "VPN-inställningsfilen \"%s\" innehåller inte giltiga data."
 
-#: ../properties/nm-openvpn.c:1161
+#: ../properties/nm-openvpn.c:1173
 msgid "Select file to import"
 msgstr "Välj fil att importera"
 
-#: ../properties/nm-openvpn.c:1220
 #: ../properties/nm-openvpn.c:1232
-#: ../properties/nm-openvpn.c:1235
+#: ../properties/nm-openvpn.c:1244
+#: ../properties/nm-openvpn.c:1247
 msgid "Select CA to use"
 msgstr "Välj CA att använda"
 
-#: ../properties/nm-openvpn.c:1223
-#: ../properties/nm-openvpn.c:1238
+#: ../properties/nm-openvpn.c:1235
+#: ../properties/nm-openvpn.c:1250
 msgid "Select certificate to use"
 msgstr "Välj certifikat att använda"
 
-#: ../properties/nm-openvpn.c:1226
-#: ../properties/nm-openvpn.c:1241
+#: ../properties/nm-openvpn.c:1238
+#: ../properties/nm-openvpn.c:1253
 msgid "Select key to use"
 msgstr "Välj nyckel att använda"
 
-#: ../properties/nm-openvpn.c:1229
+#: ../properties/nm-openvpn.c:1241
 msgid "Select shared key to use"
 msgstr "Välj delad nyckel att använda"
 
-#: ../properties/nm-openvpn.c:1244
+#: ../properties/nm-openvpn.c:1256
 msgid "Select TA to use"
 msgstr "Välj TA att använda"
 
 #. printf ("in impl_export\n");
-#: ../properties/nm-openvpn.c:1438
+#: ../properties/nm-openvpn.c:1450
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: ../properties/nm-openvpn.c:1468
+#: ../properties/nm-openvpn.c:1480
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "En fil med namnet \"%s\" finns redan."
 
-#: ../properties/nm-openvpn.c:1471
+#: ../properties/nm-openvpn.c:1483
 msgid "Do you want to replace it with the one you are saving?"
 msgstr "Vill du ersätta den med den du håller på att spara?"
 
-#: ../properties/nm-openvpn.c:1485
+#: ../properties/nm-openvpn.c:1497
 msgid "Failed to export configuration"
 msgstr "Misslyckades med att exportera konfiguration"
 
-#: ../properties/nm-openvpn.c:1487
+#: ../properties/nm-openvpn.c:1499
 #, c-format
 msgid "Failed to save file %s"
 msgstr "Misslyckades med att spara filen %s"
@@ -277,126 +277,98 @@ msgid "(Default: 1194)"
 msgstr "(Standard: 1194)"
 
 #: ../properties/nm-openvpn-dialog.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "65536"
+msgstr "65536"
 
 #: ../properties/nm-openvpn-dialog.glade.h:3
-msgid "1"
-msgstr "1"
-
-#: ../properties/nm-openvpn-dialog.glade.h:4
-msgid "<b>Connection Information</b>"
-msgstr "<b>Anslutningsinformation</b>"
-
-#: ../properties/nm-openvpn-dialog.glade.h:5
-msgid "<b>Connection Name</b>"
-msgstr "<b>Anslutningsnamn</b>"
-
-#: ../properties/nm-openvpn-dialog.glade.h:6
-msgid "<b>Required</b>"
-msgstr "<b>Nödvändigt</b>"
-
-#: ../properties/nm-openvpn-dialog.glade.h:7
 msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
 msgstr "<i>exempel: 172.16.0.0/16 10.11.12.0/24</i>"
 
+#: ../properties/nm-openvpn-dialog.glade.h:4
+msgid "Ad_vanced"
+msgstr "A_vancerat"
+
+#: ../properties/nm-openvpn-dialog.glade.h:5
+msgid "C_A file:"
+msgstr "C_A-fil:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:6
+msgid "C_ertificate:"
+msgstr "C_ertifikat:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:7
+msgid "Co_nnection type:"
+msgstr "A_nslutningstyp:"
+
 #: ../properties/nm-openvpn-dialog.glade.h:8
-msgid "CA  file:"
-msgstr "CA-fil:"
+msgid "Connection na_me:"
+msgstr "Anslutningsna_mn:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:9
-msgid "CA file:"
-msgstr "CA-fil:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:10
-msgid "Certificate:"
-msgstr "Certifikat:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:11
-msgid "Connection Name"
-msgstr "Anslutningsnamn"
-
-#: ../properties/nm-openvpn-dialog.glade.h:12
-msgid "Connection Type:"
-msgstr "Anslutningstyp:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:13
 msgid "Direction:"
 msgstr "Riktning:"
 
-#: ../properties/nm-openvpn-dialog.glade.h:14
-msgid "Gateway _Port:"
-msgstr "Gateway_port:"
+#: ../properties/nm-openvpn-dialog.glade.h:10
+msgid "Import _Saved Configuration..."
+msgstr "Importera _sparad konfiguration..."
 
-#: ../properties/nm-openvpn-dialog.glade.h:15
-msgid "Key:"
-msgstr "Nyckel:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:16
-msgid "Local IP:"
-msgstr "Lokalt IP:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:17
+#: ../properties/nm-openvpn-dialog.glade.h:11
 msgid "Name used to identify the connection to the private network, e.g. \"Campus VPN\" or \"Corporate Network\""
 msgstr "Namn som används för att identifiera anslutningen till det privata nätverket, exempelvis \"Campus-VPN\" eller \"Företagsnätverket\""
 
-#: ../properties/nm-openvpn-dialog.glade.h:18
-msgid "Optional"
-msgstr "Valfritt"
+#: ../properties/nm-openvpn-dialog.glade.h:12
+msgid "Network"
+msgstr "Nätverk"
 
-#: ../properties/nm-openvpn-dialog.glade.h:19
-msgid "Password"
-msgstr "Lösenord"
+#: ../properties/nm-openvpn-dialog.glade.h:13
+msgid "Only use _VPN connection for these addresses:"
+msgstr "Använd endast _VPN-anslutning för dessa adresser:"
 
-#: ../properties/nm-openvpn-dialog.glade.h:20
+#: ../properties/nm-openvpn-dialog.glade.h:14
+msgid "OpenVPN Advanced Options"
+msgstr "Avancerade alternativ för OpenVPN"
+
+#: ../properties/nm-openvpn-dialog.glade.h:15
+msgid "OpenVPN Configuration"
+msgstr "Konfiguration för OpenVPN"
+
+#: ../properties/nm-openvpn-dialog.glade.h:16
 msgid "Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting."
 msgstr "Ange den information som har tillhandahållits av din systemadministratör nedan. Ange inte lösenordet här eftersom du kommer att efterfrågas det när du ansluter."
 
-#: ../properties/nm-openvpn-dialog.glade.h:21
-msgid "Please note that the file you import is not an OpenVPN configuration file. Ask your adminstrator for the file."
+#: ../properties/nm-openvpn-dialog.glade.h:17
+msgid "Please note that the file you import is not an OpenVPN configuration file. Ask your administrator for the file."
 msgstr "Observera att filen som du importerar inte är en konfigurationsfil för OpenVPN. Fråga din administratör efter filen."
 
+#: ../properties/nm-openvpn-dialog.glade.h:18
+msgid "Shared _key:"
+msgstr "Delad _nyckel:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:19
+msgid "TLS-Auth"
+msgstr "TLS-Auth"
+
+#: ../properties/nm-openvpn-dialog.glade.h:20
+msgid "Use L_ZO compression"
+msgstr "Använd L_ZO-komprimering"
+
+#: ../properties/nm-openvpn-dialog.glade.h:21
+msgid "Use TA_P device"
+msgstr "Använd TA_P-enhet"
+
 #: ../properties/nm-openvpn-dialog.glade.h:22
-msgid "Remote IP:"
-msgstr "Fjärr-IP:"
+msgid "Use _TCP connection"
+msgstr "Använd _TCP-anslutning"
 
 #: ../properties/nm-openvpn-dialog.glade.h:23
-msgid "Shared Key:"
-msgstr "Delad nyckel:"
+msgid "Use _TLS auth:"
+msgstr "Använd _TLS-autentisering:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:24
-msgid "Shared key"
-msgstr "Delad nyckel"
+msgid "Use cip_her:"
+msgstr "Använd s_kiffer:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:25
-msgid "Use LZO compression"
-msgstr "Använd LZO-komprimering"
-
-#: ../properties/nm-openvpn-dialog.glade.h:26
-msgid "Use TAP device"
-msgstr "Använd TAP-enhet"
-
-#: ../properties/nm-openvpn-dialog.glade.h:27
-msgid "Use TCP connection"
-msgstr "Använd TCP-anslutning"
-
-#: ../properties/nm-openvpn-dialog.glade.h:28
-msgid "Use TLS auth:"
-msgstr "Använd TLS-autentisering:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:29
-msgid "Use cipher:"
-msgstr "Använd skiffer:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:30
-msgid "Username:"
-msgstr "Användarnamn:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:31
-msgid "X.509"
-msgstr "X.509"
-
-#: ../properties/nm-openvpn-dialog.glade.h:32
 msgid ""
 "X.509 Certificates\n"
 "Pre-shared key\n"
@@ -408,25 +380,41 @@ msgstr ""
 "Lösenordsautentisering\n"
 "X.509 med lösenordsautentisering"
 
-#: ../properties/nm-openvpn-dialog.glade.h:36
-msgid "X.509/Pass"
-msgstr "X.509/Lösenord"
+#: ../properties/nm-openvpn-dialog.glade.h:29
+msgid "_0"
+msgstr "_0"
 
-#: ../properties/nm-openvpn-dialog.glade.h:37
-msgid "_Gateway Address:"
+#: ../properties/nm-openvpn-dialog.glade.h:30
+msgid "_1"
+msgstr "_1"
+
+#: ../properties/nm-openvpn-dialog.glade.h:31
+msgid "_Gateway address:"
 msgstr "_Gatewayadress:"
 
-#: ../properties/nm-openvpn-dialog.glade.h:38
-msgid "_Import Saved Configuration..."
-msgstr "_Importera sparad konfiguration..."
+#: ../properties/nm-openvpn-dialog.glade.h:32
+msgid "_Gateway port:"
+msgstr "_Gatewayport:"
 
-#: ../properties/nm-openvpn-dialog.glade.h:39
-msgid "_Only use VPN connection for these addresses"
-msgstr "Använd _endast VPN-anslutning för dessa adresser"
+#: ../properties/nm-openvpn-dialog.glade.h:33
+msgid "_Key:"
+msgstr "_Nyckel:"
 
-#: ../properties/nm-openvpn-dialog.glade.h:40
-msgid "none"
-msgstr "ingen"
+#: ../properties/nm-openvpn-dialog.glade.h:34
+msgid "_Local IP:"
+msgstr "_Lokal IP:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:35
+msgid "_Remote IP:"
+msgstr "_Fjärr-IP:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:36
+msgid "_User name:"
+msgstr "An_vändarnamn:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:37
+msgid "_none"
+msgstr "_inget"
 
 #: ../src/nm-openvpn-service.c:127
 msgid "The VPN login failed because the user name and password were not accepted or the certificate password was wrong."
@@ -452,6 +440,30 @@ msgstr "VPN-inloggningen misslyckades eftersom VPN-programmet mottog en ogiltig
 msgid "VPN connection failed"
 msgstr "VPN-anslutningen misslyckades"
 
+#~ msgid "<b>Connection Information</b>"
+#~ msgstr "<b>Anslutningsinformation</b>"
+#~ msgid "<b>Connection Name</b>"
+#~ msgstr "<b>Anslutningsnamn</b>"
+#~ msgid "<b>Required</b>"
+#~ msgstr "<b>Nödvändigt</b>"
+#~ msgid "CA  file:"
+#~ msgstr "CA-fil:"
+#~ msgid "Optional"
+#~ msgstr "Valfritt"
+#~ msgid "Password"
+#~ msgstr "Lösenord"
+#~ msgid "Shared Key:"
+#~ msgstr "Delad nyckel:"
+#~ msgid "Username:"
+#~ msgstr "Användarnamn:"
+#~ msgid "X.509"
+#~ msgstr "X.509"
+#~ msgid "X.509/Pass"
+#~ msgstr "X.509/Lösenord"
+#~ msgid "_Import Saved Configuration..."
+#~ msgstr "_Importera sparad konfiguration..."
+#~ msgid "_Only use VPN connection for these addresses"
+#~ msgstr "Använd _endast VPN-anslutning för dessa adresser"
 #~ msgid ""
 #~ "_Name used to identify the connection to the private network, e.g. "
 #~ "\"Campus VPN\" or \"Corporate Network\""
@@ -510,10 +522,6 @@ msgstr "VPN-anslutningen misslyckades"
 #~ msgstr "Använd LZO-komprimering:"
 #~ msgid "Use LZO Compression"
 #~ msgstr "Använd LZO-komprimering"
-#~ msgid "Import Saved Configuration..."
-#~ msgstr "Importera sparad konfiguration..."
-#~ msgid "Only use VPN connection for these addresses"
-#~ msgstr "Använd endast VPN-anslutning för dessa adresser"
 #~ msgid ""
 #~ "The VPN login failed because the user name and password were not accepted."
 #~ msgstr ""