diff --git a/vpn-daemons/openvpn/po/ChangeLog b/vpn-daemons/openvpn/po/ChangeLog
index af43c0140e..96bbaf2c29 100644
--- a/vpn-daemons/openvpn/po/ChangeLog
+++ b/vpn-daemons/openvpn/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-09  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
 2008-08-25  Daniel Nylander <po@danielnylander.se>
 
 	* sv.po: Updated Swedish translation.
diff --git a/vpn-daemons/openvpn/po/eu.po b/vpn-daemons/openvpn/po/eu.po
index 37830b4fac..dc28bcc0fa 100644
--- a/vpn-daemons/openvpn/po/eu.po
+++ b/vpn-daemons/openvpn/po/eu.po
@@ -1,16 +1,16 @@
-# translation of NetworkManager-openvpn.HEAD.po to Basque
+# translation of eu.po to Basque
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager-openvpn.HEAD\n"
+"Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-20 11:40+0100\n"
-"PO-Revision-Date: 2008-02-19 19:52+0100\n"
+"POT-Creation-Date: 2008-09-09 16:27+0200\n"
+"PO-Revision-Date: 2008-09-09 16:43+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
-"Language-Team: Basque <eu@li.org>\n"
+"Language-Team: Basque <itzulpena@euskalgnu.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,367 +49,177 @@ msgstr "_Gogoratu pasahitza saio honetan"
 msgid "_Save password in keyring"
 msgstr "_Gorde pasahitza gako-sortan"
 
-#: ../auth-dialog/main.c:181
+#: ../auth-dialog/main.c:210
 #, c-format
 msgid "You need to authenticate to access the Virtual Private Network '%s'."
 msgstr ""
 "Autentifikatu egin behar zara '%s' VPN-ra (Sare Birtual Pribatua) "
 "sarbidetzeko."
 
-#: ../auth-dialog/main.c:182
+#: ../auth-dialog/main.c:211
 msgid "Authenticate VPN"
 msgstr "Autentifikatu VPN"
 
-#: ../auth-dialog/main.c:195
+#: ../auth-dialog/main.c:232
 msgid "Certificate pass_word:"
 msgstr "_Ziurtagiriaren pasahitza:"
 
-#: ../auth-dialog/main.c:210
+#: ../auth-dialog/main.c:246
 msgid "Certificate password:"
 msgstr "Ziurtagiriaren pasahitza:"
 
-#: ../properties/nm-openvpn.c:150
-msgid "OpenVPN Client"
-msgstr "OpenVPN bezeroa"
+#: ../properties/auth-helpers.c:69
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Aukeratu Ziurtagiri-Emailearen ziurtagiria..."
 
-#: ../properties/nm-openvpn.c:814
-msgid "The following OpenVPN connection will be created:"
-msgstr "Honako OpenVPN konexioa sortuko da:"
+#: ../properties/auth-helpers.c:88
+msgid "Choose your personal certificate..."
+msgstr "Aukeratu ziurtagiri pertsonala..."
 
-#: ../properties/nm-openvpn.c:816
-#, c-format
-msgid "Name:  %s"
-msgstr "Izena: %s"
+#: ../properties/auth-helpers.c:106
+msgid "Choose your private key..."
+msgstr "Aukeratu gako pribatua..."
 
-#: ../properties/nm-openvpn.c:824
-msgid "Connection Type: X.509 Certificates"
-msgstr "Konexio mota: X.509 ziurtagiriak"
+#: ../properties/auth-helpers.c:159
+msgid "Choose an OpenVPN static key..."
+msgstr "Aukeratu OpenVPN gako estatikoa..."
 
-#: ../properties/nm-openvpn.c:827 ../properties/nm-openvpn.c:854
-#: ../properties/nm-openvpn.c:866
-#, c-format
-msgid "CA:  %s"
-msgstr "ZE: %s"
+#: ../properties/auth-helpers.c:183 ../properties/auth-helpers.c:862
+msgid "None"
+msgstr "Bat ere ez"
 
-#: ../properties/nm-openvpn.c:830 ../properties/nm-openvpn.c:869
-#, c-format
-msgid "Cert:  %s"
-msgstr "Ziurt.: %s"
+#: ../properties/auth-helpers.c:518
+msgid "PEM certificates (*.pem, *.crt, *.key)"
+msgstr "PEM ziurtagiriak (*.pem, *.crt, *.key)"
 
-#: ../properties/nm-openvpn.c:833 ../properties/nm-openvpn.c:872
-#, c-format
-msgid "Key:  %s"
-msgstr "Gakoa: %s"
+#: ../properties/auth-helpers.c:578
+msgid "OpenVPN Static Keys (*.key)"
+msgstr "OpenVPN gako estatikoak (*.key)"
 
-#: ../properties/nm-openvpn.c:837
-msgid "Connection Type: Shared Key"
-msgstr "Konexio mota: partekatutako gakoa"
+#: ../properties/auth-helpers.c:689
+msgid "Default"
+msgstr "Lehenetsia"
 
-#: ../properties/nm-openvpn.c:840
-#, c-format
-msgid "Shared Key:  %s"
-msgstr "Partekatutako gakoa: %s"
+#: ../properties/nm-openvpn.c:52
+msgid "OpenVPN"
+msgstr "OpenVPN"
 
-#: ../properties/nm-openvpn.c:843
-#, c-format
-msgid "Local IP:  %s"
-msgstr "IP lokala: %s"
+#: ../properties/nm-openvpn.c:53
+msgid "Compatible with the OpenVPN server."
+msgstr "OpenVPN zerbitzariarekin bateragarria."
 
-#: ../properties/nm-openvpn.c:846
-#, c-format
-msgid "Remote IP:  %s"
-msgstr "Urruneko IPa: %s"
+#: ../properties/nm-openvpn.c:310 ../properties/nm-openvpn-dialog.glade.h:7
+msgid "Certificates (TLS)"
+msgstr "Ziurtagiriak (TLS)"
 
-#: ../properties/nm-openvpn.c:851
-msgid "Connection Type: Password"
-msgstr "Konexio mota: pasahitza"
+#: ../properties/nm-openvpn.c:322
+msgid "Password"
+msgstr "Pasahitza"
 
-#: ../properties/nm-openvpn.c:857 ../properties/nm-openvpn.c:875
-#, c-format
-msgid "Username:  %s"
-msgstr "Erabiltzaile-izena: %s"
+#: ../properties/nm-openvpn.c:336
+msgid "Password with Certificates (TLS)"
+msgstr "Pasahitza ziurtagiriekin (TLS)"
 
-#: ../properties/nm-openvpn.c:863
-msgid "Connection Type: X.509 with Password Authentication"
-msgstr "Konexio mota: X.509 pasahitzaren autentifikazioarekin"
-
-#: ../properties/nm-openvpn.c:881
-#, c-format
-msgid "Remote:  %s"
-msgstr "Urrunekoa: %s"
-
-#: ../properties/nm-openvpn.c:884
-#, c-format
-msgid "Port:  %s"
-msgstr "Ataka: %s"
-
-#: ../properties/nm-openvpn.c:887
-#, c-format
-msgid "Device: %s"
-msgstr "Gailua: %s"
-
-#: ../properties/nm-openvpn.c:887
-msgid "TAP"
-msgstr "TAP"
-
-#: ../properties/nm-openvpn.c:887
-msgid "TUN"
-msgstr "TUN"
-
-#: ../properties/nm-openvpn.c:890
-#, c-format
-msgid "Protocol: %s"
-msgstr "Protokoloa: %s"
-
-#: ../properties/nm-openvpn.c:890
-msgid "TCP"
-msgstr "TCP"
-
-#: ../properties/nm-openvpn.c:890
-msgid "UDP"
-msgstr "UDP"
-
-#: ../properties/nm-openvpn.c:894
-#, c-format
-msgid "Routes:  %s"
-msgstr "Ibilbideak: %s"
-
-#: ../properties/nm-openvpn.c:898
-#, c-format
-msgid "Use LZO Compression: %s"
-msgstr "Erabili LZO konpresioa: %s"
-
-#: ../properties/nm-openvpn.c:898
-msgid "Yes"
-msgstr "Bai"
-
-#: ../properties/nm-openvpn.c:898
-msgid "No"
-msgstr "Ez"
-
-#: ../properties/nm-openvpn.c:902
-#, c-format
-msgid "Cipher:  %s"
-msgstr "Zifratua: %s"
-
-#: ../properties/nm-openvpn.c:907
-#, c-format
-msgid "TLS auth:  %s %s"
-msgstr "TLS autent.:  %s %s"
-
-#: ../properties/nm-openvpn.c:911
-msgid "The connection details can be changed using the \"Edit\" button."
-msgstr "Konexioaren xehetasunak alda daitezke \"Editatu\" botoia erabiliz."
-
-#: ../properties/nm-openvpn.c:1141
-msgid "Cannot import settings"
-msgstr "Ezin dira ezarpenak inportatu"
-
-#: ../properties/nm-openvpn.c:1143
-#, c-format
-msgid "The VPN settings file '%s' does not contain valid data."
-msgstr "VPNren '%s' ezarpen-fitxategiak ez du baliozko daturik."
-
-#: ../properties/nm-openvpn.c:1190
-msgid "Select file to import"
-msgstr "Hautatu fitxategia inportatzeko"
-
-#: ../properties/nm-openvpn.c:1249 ../properties/nm-openvpn.c:1261
-#: ../properties/nm-openvpn.c:1264
-msgid "Select CA to use"
-msgstr "Hautatu ZE (CA) erabiltzeko"
-
-#: ../properties/nm-openvpn.c:1252 ../properties/nm-openvpn.c:1267
-msgid "Select certificate to use"
-msgstr "Hautatu ziurtagiria erabiltzeko"
-
-#: ../properties/nm-openvpn.c:1255 ../properties/nm-openvpn.c:1270
-msgid "Select key to use"
-msgstr "Hautatu gakoa erabiltzeko"
-
-#: ../properties/nm-openvpn.c:1258
-msgid "Select shared key to use"
-msgstr "Hautatu partekatutako gakoa erabiltzeko"
-
-#: ../properties/nm-openvpn.c:1273
-msgid "Select TA to use"
-msgstr "Hautatu TA erabiltzeko"
-
-#. printf ("in impl_export\n");
-#: ../properties/nm-openvpn.c:1515
-msgid "Save as..."
-msgstr "Gorde honela..."
-
-#: ../properties/nm-openvpn.c:1544
-#, c-format
-msgid "A file named \"%s\" already exists."
-msgstr "\"%s\" izeneko fitxategia badago lehendik ere."
-
-#: ../properties/nm-openvpn.c:1547
-msgid "Do you want to replace it with the one you are saving?"
-msgstr "Gordetzen ari zarenarekin ordeztea nahi duzu?"
-
-#: ../properties/nm-openvpn.c:1561
-msgid "Failed to export configuration"
-msgstr "Huts egin du konfigurazioa esportatzean"
-
-#: ../properties/nm-openvpn.c:1563
-#, c-format
-msgid "Failed to save file %s"
-msgstr "Huts egin du %s fitxategia gordetzean"
+#: ../properties/nm-openvpn.c:348
+msgid "Static Key"
+msgstr "Gako estatikoa"
 
 #: ../properties/nm-openvpn-dialog.glade.h:1
-msgid "(Default: 1194)"
-msgstr "(lehenetsia: 1194)"
+msgid " "
+msgstr " "
 
 #: ../properties/nm-openvpn-dialog.glade.h:2
-msgid "65536"
-msgstr "65536"
+msgid "<b>Authentication</b>"
+msgstr "<b>Autentifikazioa</b>"
 
 #: ../properties/nm-openvpn-dialog.glade.h:3
-msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
-msgstr "<i>adibidea: 172.16.0.0/16 10.11.12.0/24</i>"
+msgid "<b>General</b>"
+msgstr "<b>Orokorra</b>"
 
 #: ../properties/nm-openvpn-dialog.glade.h:4
-msgid "Ad_vanced"
-msgstr "_Aurreratua"
+msgid ""
+"<i>If key direction is used, it must be the opposite of that used on the VPN "
+"peer.  For example, if the peer uses '1', this connection must use '0'.  If "
+"you are unsure what value to use, contact your system administrator.</i>"
+msgstr ""
+"<i>Gakoaren helbidea erabiltzen bada, VPN parekoarenaren aurkakoa izan behar du. "
+"Esate baterako, parekoak '1' erabiltzen badu, konexio honek '0' erabili behar du. "
+"Zein balio erabili behar duzun ez badakizu, jar zaitez sistemako administratzailearekin "
+"harremanetan.</i>"
 
 #: ../properties/nm-openvpn-dialog.glade.h:5
-msgid "C_A file:"
-msgstr "_ZE fitxategia:"
+msgid "Ad_vanced..."
+msgstr "_Aurreratua..."
 
 #: ../properties/nm-openvpn-dialog.glade.h:6
-msgid "C_ertificate:"
-msgstr "Z_iurtagiria:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:7
-msgid "Co_nnection type:"
-msgstr "_Konexio mota:"
+msgid "CA Certificate:"
+msgstr "ZE ziurtagiria:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:8
-msgid "Connection na_me:"
-msgstr "Konexioaren _izena:"
+msgid "Cipher:"
+msgstr "Zifratua:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:9
-msgid "Direction:"
-msgstr "Helbidea:"
+msgid "General"
+msgstr "Orokorra"
 
 #: ../properties/nm-openvpn-dialog.glade.h:10
-msgid "Import _Saved Configuration..."
-msgstr "Inportatu _gordetako konfigurazioa:"
+msgid "Key Direction:"
+msgstr "Gakoaren helbidea:"
 
 #: ../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 ""
-"Sare pribatuaren konexioa identifikatzeko erabili den izena, adib. "
-"\"Ikastetxeko VPNa\" edo \"Enpresako sarea\""
+msgid "Key File:"
+msgstr "Gakoaren fitxategia:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:12
-msgid "Network"
-msgstr "Sarea"
+msgid "Local IP Address:"
+msgstr "IP helbide lokala:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:13
-msgid "Only use _VPN connection for these addresses:"
-msgstr "Erabili _VPN konexioa soilik honako helbideetan:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:14
 msgid "OpenVPN Advanced Options"
 msgstr "OpenVPN-ren aukera aurreratuak"
 
+#: ../properties/nm-openvpn-dialog.glade.h:14
+msgid "Private Key:"
+msgstr "Gako pribatua:"
+
 #: ../properties/nm-openvpn-dialog.glade.h:15
-msgid "OpenVPN Configuration"
-msgstr "OpenVPN-ren konfigurazioa"
+msgid "Static Key:"
+msgstr "Gako estatikoa:"
 
 #: ../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 ""
-"Sistemako administratzaileak emandako informazioa azpian idatzi. Hor ez "
-"sartu zure pasahitza, konektatzean galdetuko zaizulako."
+msgid "Type:"
+msgstr "Mota:"
 
 #: ../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 ""
-"Jakin ezazu inportatu duzun fitxategia ez dela OpenVPN-ren konfigurazio-"
-"fitxategi bat. Galdetu sistemako administratzaileari fitxategiari buruz."
+msgid "Use L_ZO data compression"
+msgstr "Erabili _LZO datu-konpresioa"
 
 #: ../properties/nm-openvpn-dialog.glade.h:18
-msgid "Shared _key:"
-msgstr "Partekatutako _gakoa:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:19
-msgid "TLS-Auth"
-msgstr "TLS autent."
-
-#: ../properties/nm-openvpn-dialog.glade.h:20
-msgid "Use L_ZO compression"
-msgstr "Erabili _LZO konpresioa"
-
-#: ../properties/nm-openvpn-dialog.glade.h:21
-msgid "Use TA_P device"
+msgid "Use a TA_P device"
 msgstr "Erabili TA_P gailua"
 
-#: ../properties/nm-openvpn-dialog.glade.h:22
-msgid "Use _TCP connection"
+#: ../properties/nm-openvpn-dialog.glade.h:19
+msgid "Use a _TCP connection"
 msgstr "Erabili _TCP konexioa"
 
+#: ../properties/nm-openvpn-dialog.glade.h:20
+msgid "Use additional TLS authentication"
+msgstr "Erabili TLS autentifikazio gehigarria"
+
+#: ../properties/nm-openvpn-dialog.glade.h:21
+msgid "Use custom gateway p_ort:"
+msgstr "Erabili atebidearen _ataka pertsonalizatua:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:22
+msgid "User Certificate:"
+msgstr "Erabiltzailearen ziurtagiria:"
+
 #: ../properties/nm-openvpn-dialog.glade.h:23
-msgid "Use _TLS auth:"
-msgstr "Erabili _TLS autent.:"
+msgid "User name:"
+msgstr "Erabiltzaile-izena:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:24
-msgid "Use cip_her:"
-msgstr "Erabili _zifratua:"
+msgid "_Gateway:"
+msgstr "_Atebidea:"
 
-#: ../properties/nm-openvpn-dialog.glade.h:25
-msgid ""
-"X.509 Certificates\n"
-"Pre-shared key\n"
-"Password Authentication\n"
-"X.509 with Password Authentication"
-msgstr ""
-"X.509 ziurtagiriak\n"
-"Aurrepartekatutako gakoa\n"
-"Pasahitzaren autentifikazioa\n"
-"X.509 Pasahitzaren autentifikazioarekin"
-
-#: ../properties/nm-openvpn-dialog.glade.h:29
-msgid "_0"
-msgstr "_0"
-
-#: ../properties/nm-openvpn-dialog.glade.h:30
-msgid "_1"
-msgstr "_1"
-
-#: ../properties/nm-openvpn-dialog.glade.h:31
-msgid "_Gateway address:"
-msgstr "_Atebidearen helbidea:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:32
-msgid "_Gateway port:"
-msgstr "_Atebidearen ataka:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:33
-msgid "_Key:"
-msgstr "_Gakoa:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:34
-msgid "_Local IP:"
-msgstr "IP _lokala:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:35
-msgid "_Remote IP:"
-msgstr "_Urruneko IPa:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:36
-msgid "_User name:"
-msgstr "_Erabiltzaile-izena:"
-
-#: ../properties/nm-openvpn-dialog.glade.h:37
-msgid "_none"
-msgstr "_bat ere ez"