diff --git a/vpn-daemons/openvpn/po/ChangeLog b/vpn-daemons/openvpn/po/ChangeLog
index 54b10992af..38a73dedd6 100644
--- a/vpn-daemons/openvpn/po/ChangeLog
+++ b/vpn-daemons/openvpn/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-19  Stéphane Raimbault  <stephane.raimbault@gmail.com>
+
+	* fr.po: Updated French translation by Robert-André Mauchin.
+
 2007-12-29  Changwoo Ryu  <cwryu@debian.org>
 
 	* ko.po: Updated Korean translation by Namhyung Kim.
diff --git a/vpn-daemons/openvpn/po/fr.po b/vpn-daemons/openvpn/po/fr.po
index 0f49e305e1..915ef1b2a8 100644
--- a/vpn-daemons/openvpn/po/fr.po
+++ b/vpn-daemons/openvpn/po/fr.po
@@ -1,18 +1,19 @@
 # French translation of NetworkManager-OpenVPN.
-# Copyright (C) 2006-2007 The GNOME Foundation.
+# Copyright (C) 2006-2008 The GNOME Foundation.
 # This file is distributed under the same license as the NetworkManager-OpenVPN package
 #
 # Haïkel Guémar <karlthered@gmail.com>, 2006.
 # Jonathan Ernst <jonathan@ernstfamily.ch>, 2007.
-# Stéphane Raimbault <stephane.raimbault@gmail.com>, 2007.
+# Stéphane Raimbault <stephane.raimbault@gmail.com>, 2007-2008.
+# Robert-André Mauchin <zebob.m@pengzone.org>, 2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager-openvpn 0.3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-28 22:56+0100\n"
-"PO-Revision-Date: 2007-02-28 22:59+0100\n"
-"Last-Translator: Jonathan Ernst <jonathan@ernstfamily.ch>\n"
+"POT-Creation-Date: 2008-01-19 16:18+0100\n"
+"PO-Revision-Date: 2008-01-19 16:19+0100\n"
+"Last-Translator: Robert-André Mauchin <zebob.m@pengzone.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,219 +51,211 @@ msgstr "_Conserver le mot de passe pour cette session"
 msgid "_Save password in keyring"
 msgstr "_Enregistrer le mot de passe dans le trousseau de clés"
 
-#: ../auth-dialog/main.c:214
+#: ../auth-dialog/main.c:181
 #, c-format
 msgid "You need to authenticate to access the Virtual Private Network '%s'."
 msgstr "Authentifiez-vous pour accéder au réseau privé virtuel « %s »."
 
-#: ../auth-dialog/main.c:215
+#: ../auth-dialog/main.c:182
 msgid "Authenticate VPN"
-msgstr "Authentifier VPN"
+msgstr "Authentifier le VPN"
 
-#: ../auth-dialog/main.c:227
+#: ../auth-dialog/main.c:195
 msgid "Certificate pass_word:"
 msgstr "_Mot de passe du certificat :"
 
-#: ../auth-dialog/main.c:252
+#: ../auth-dialog/main.c:210
 msgid "Certificate password:"
 msgstr "Mot de passe du certificat :"
 
-#: ../nm-openvpn.desktop.in.h:1
-msgid "Add, Remove, and Edit VPN Connections"
-msgstr "Ajoute, supprime et édite les connexions VPN"
-
-#: ../nm-openvpn.desktop.in.h:2
-msgid "VPN Connection Manager (OpenVPN)"
-msgstr "Gestionnaire de connexions VPN (OpenVPN)"
-
-#: ../properties/nm-openvpn.c:143
+#: ../properties/nm-openvpn.c:150
 msgid "OpenVPN Client"
 msgstr "Client OpenVPN"
 
-#: ../properties/nm-openvpn.c:799
+#: ../properties/nm-openvpn.c:826
 msgid "The following OpenVPN connection will be created:"
 msgstr "La connexion OpenVPN suivante va être créée :"
 
-#: ../properties/nm-openvpn.c:801
+#: ../properties/nm-openvpn.c:828
 #, c-format
 msgid "Name:  %s"
 msgstr "Nom :  %s"
 
-#: ../properties/nm-openvpn.c:809
+#: ../properties/nm-openvpn.c:836
 msgid "Connection Type: X.509 Certificates"
-msgstr "Type de connexion: Certificats X.509"
+msgstr "Type de connexion : certificats X.509"
 
-#: ../properties/nm-openvpn.c:812 ../properties/nm-openvpn.c:839
-#: ../properties/nm-openvpn.c:851
+#: ../properties/nm-openvpn.c:839 ../properties/nm-openvpn.c:866
+#: ../properties/nm-openvpn.c:878
 #, c-format
 msgid "CA:  %s"
 msgstr "AC :  %s"
 
-#: ../properties/nm-openvpn.c:815 ../properties/nm-openvpn.c:854
+#: ../properties/nm-openvpn.c:842 ../properties/nm-openvpn.c:881
 #, c-format
 msgid "Cert:  %s"
 msgstr "Cert :  %s"
 
-#: ../properties/nm-openvpn.c:818 ../properties/nm-openvpn.c:857
+#: ../properties/nm-openvpn.c:845 ../properties/nm-openvpn.c:884
 #, c-format
 msgid "Key:  %s"
 msgstr "Clé :  %s"
 
-#: ../properties/nm-openvpn.c:822
+#: ../properties/nm-openvpn.c:849
 msgid "Connection Type: Shared Key"
 msgstr "Type de connexion : clé partagée"
 
-#: ../properties/nm-openvpn.c:825
+#: ../properties/nm-openvpn.c:852
 #, c-format
 msgid "Shared Key:  %s"
 msgstr "Clé partagée :  %s"
 
-#: ../properties/nm-openvpn.c:828
+#: ../properties/nm-openvpn.c:855
 #, c-format
 msgid "Local IP:  %s"
 msgstr "Adresse IP locale :  %s"
 
-#: ../properties/nm-openvpn.c:831
+#: ../properties/nm-openvpn.c:858
 #, c-format
 msgid "Remote IP:  %s"
 msgstr "Adresse IP distante :  %s"
 
-#: ../properties/nm-openvpn.c:836
+#: ../properties/nm-openvpn.c:863
 msgid "Connection Type: Password"
 msgstr "Type de connexion : mot de passe"
 
-#: ../properties/nm-openvpn.c:842 ../properties/nm-openvpn.c:860
+#: ../properties/nm-openvpn.c:869 ../properties/nm-openvpn.c:887
 #, c-format
 msgid "Username:  %s"
 msgstr "Nom d'_utilisateur :  %s"
 
-#: ../properties/nm-openvpn.c:848
+#: ../properties/nm-openvpn.c:875
 msgid "Connection Type: X.509 with Password Authentication"
 msgstr "Type de connexion : X.509 avec authentification par mot de passe"
 
-#: ../properties/nm-openvpn.c:866
+#: ../properties/nm-openvpn.c:893
 #, c-format
 msgid "Remote:  %s"
 msgstr "Distant :  %s"
 
-#: ../properties/nm-openvpn.c:869
+#: ../properties/nm-openvpn.c:896
 #, c-format
 msgid "Port:  %s"
 msgstr "Port :  %s"
 
-#: ../properties/nm-openvpn.c:872
+#: ../properties/nm-openvpn.c:899
 #, c-format
 msgid "Device: %s"
 msgstr "Périphérique : %s"
 
-#: ../properties/nm-openvpn.c:872
+#: ../properties/nm-openvpn.c:899
 msgid "TAP"
 msgstr "TAP"
 
-#: ../properties/nm-openvpn.c:872
+#: ../properties/nm-openvpn.c:899
 msgid "TUN"
 msgstr "TUN"
 
-#: ../properties/nm-openvpn.c:875
+#: ../properties/nm-openvpn.c:902
 #, c-format
 msgid "Protocol: %s"
 msgstr "Protocole : %s"
 
-#: ../properties/nm-openvpn.c:875
+#: ../properties/nm-openvpn.c:902
 msgid "TCP"
 msgstr "TCP"
 
-#: ../properties/nm-openvpn.c:875
+#: ../properties/nm-openvpn.c:902
 msgid "UDP"
 msgstr "UDP"
 
-#: ../properties/nm-openvpn.c:879
+#: ../properties/nm-openvpn.c:906
 #, c-format
 msgid "Routes:  %s"
 msgstr "Routes :  %s"
 
-#: ../properties/nm-openvpn.c:883
+#: ../properties/nm-openvpn.c:910
 #, c-format
 msgid "Use LZO Compression: %s"
 msgstr "Utiliser la compression LZO : %s"
 
-#: ../properties/nm-openvpn.c:883
+#: ../properties/nm-openvpn.c:910
 msgid "Yes"
 msgstr "Oui"
 
-#: ../properties/nm-openvpn.c:883
+#: ../properties/nm-openvpn.c:910
 msgid "No"
 msgstr "Non"
 
-#: ../properties/nm-openvpn.c:887
+#: ../properties/nm-openvpn.c:914
 #, c-format
 msgid "Cipher:  %s"
 msgstr "Chiffrement :  %s"
 
-#: ../properties/nm-openvpn.c:892
+#: ../properties/nm-openvpn.c:919
 #, c-format
 msgid "TLS auth:  %s %s"
 msgstr "Authentification TLS :  %s %s"
 
-#: ../properties/nm-openvpn.c:896
+#: ../properties/nm-openvpn.c:923
 msgid "The connection details can be changed using the \"Edit\" button."
 msgstr ""
 "Les détails de la connexion peuvent être modifiés avec le bouton « Éditer »."
 
-#: ../properties/nm-openvpn.c:1121
+#: ../properties/nm-openvpn.c:1153
 msgid "Cannot import settings"
 msgstr "Impossible d'importer les paramètres de configuration"
 
-#: ../properties/nm-openvpn.c:1123
+#: ../properties/nm-openvpn.c:1155
 #, c-format
 msgid "The VPN settings file '%s' does not contain valid data."
 msgstr ""
 "Le fichier de configuration VPN « %s » ne contient pas de données valides."
 
-#: ../properties/nm-openvpn.c:1161
+#: ../properties/nm-openvpn.c:1202
 msgid "Select file to import"
 msgstr "Importer un fichier"
 
-#: ../properties/nm-openvpn.c:1220 ../properties/nm-openvpn.c:1232
-#: ../properties/nm-openvpn.c:1235
+#: ../properties/nm-openvpn.c:1261 ../properties/nm-openvpn.c:1273
+#: ../properties/nm-openvpn.c:1276
 msgid "Select CA to use"
 msgstr "Sélectionner l'autorité de certification à utiliser"
 
-#: ../properties/nm-openvpn.c:1223 ../properties/nm-openvpn.c:1238
+#: ../properties/nm-openvpn.c:1264 ../properties/nm-openvpn.c:1279
 msgid "Select certificate to use"
 msgstr "Sélectionner le certificat à utiliser"
 
-#: ../properties/nm-openvpn.c:1226 ../properties/nm-openvpn.c:1241
+#: ../properties/nm-openvpn.c:1267 ../properties/nm-openvpn.c:1282
 msgid "Select key to use"
 msgstr "Sélectionner la clé à utiliser"
 
-#: ../properties/nm-openvpn.c:1229
+#: ../properties/nm-openvpn.c:1270
 msgid "Select shared key to use"
 msgstr "Sélectionner la clé partagée à utiliser"
 
-#: ../properties/nm-openvpn.c:1244
+#: ../properties/nm-openvpn.c:1285
 msgid "Select TA to use"
 msgstr "Sélectionner l'authentification TLS à utiliser"
 
 #. printf ("in impl_export\n");
-#: ../properties/nm-openvpn.c:1438
+#: ../properties/nm-openvpn.c:1527
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: ../properties/nm-openvpn.c:1468
+#: ../properties/nm-openvpn.c:1556
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Un fichier nommé « %s » existe déjà."
 
-#: ../properties/nm-openvpn.c:1471
+#: ../properties/nm-openvpn.c:1559
 msgid "Do you want to replace it with the one you are saving?"
 msgstr "Voulez-vous le remplacer avec celui que vous avez enregistré ?"
 
-#: ../properties/nm-openvpn.c:1485
+#: ../properties/nm-openvpn.c:1573
 msgid "Failed to export configuration"
 msgstr "L'exportation de la configuration a échoué"
 
-#: ../properties/nm-openvpn.c:1487
+#: ../properties/nm-openvpn.c:1575
 #, c-format
 msgid "Failed to save file %s"
 msgstr "L'enregistrement du fichier %s a échoué"
@@ -272,82 +265,66 @@ msgid "(Default: 1194)"
 msgstr "(par défaut : 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>Informations de connexion</b>"
-
-#: ../properties/nm-openvpn-dialog.glade.h:5
-msgid "<b>Connection Name</b>"
-msgstr "<b>Nom de la connexion</b>"
-
-#: ../properties/nm-openvpn-dialog.glade.h:6
-msgid "<b>Required</b>"
-msgstr "<b>Requis</b>"
-
-#: ../properties/nm-openvpn-dialog.glade.h:7
 msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
 msgstr "<i>exemple : 172.16.0.0/16 10.11.12.0/24</i>"
 
+#: ../properties/nm-openvpn-dialog.glade.h:4
+msgid "Ad_vanced"
+msgstr "A_vancé"
+
+#: ../properties/nm-openvpn-dialog.glade.h:5
+msgid "C_A file:"
+msgstr "Fichier _AC :"
+
+#: ../properties/nm-openvpn-dialog.glade.h:6
+msgid "C_ertificate:"
+msgstr "C_ertificat :"
+
+#: ../properties/nm-openvpn-dialog.glade.h:7
+msgid "Co_nnection type:"
+msgstr "Type de co_nnexion :"
+
 #: ../properties/nm-openvpn-dialog.glade.h:8
-msgid "CA  file:"
-msgstr "Fichier AC :"
+msgid "Connection na_me:"
+msgstr "No_m de la connexion :"
 
 #: ../properties/nm-openvpn-dialog.glade.h:9
-msgid "CA file:"
-msgstr "Fichier AC :"
-
-#: ../properties/nm-openvpn-dialog.glade.h:10
-msgid "Certificate:"
-msgstr "Certificat :"
-
-#: ../properties/nm-openvpn-dialog.glade.h:11
-msgid "Connection Name"
-msgstr "Nom de la connexion"
-
-#: ../properties/nm-openvpn-dialog.glade.h:12
-msgid "Connection Type:"
-msgstr "Type de connexion :"
-
-#: ../properties/nm-openvpn-dialog.glade.h:13
 msgid "Direction:"
 msgstr "Direction :"
 
-#: ../properties/nm-openvpn-dialog.glade.h:14
-msgid "Gateway _Port:"
-msgstr "_Port de la passerelle :"
+#: ../properties/nm-openvpn-dialog.glade.h:10
+msgid "Import _Saved Configuration..."
+msgstr "Importer la configuration enregi_strée..."
 
-#: ../properties/nm-openvpn-dialog.glade.h:15
-msgid "Key:"
-msgstr "Clé :"
-
-#: ../properties/nm-openvpn-dialog.glade.h:16
-msgid "Local IP:"
-msgstr "Adresse IP locale :"
-
-#: ../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 ""
-"Nom utilisé pour identifier la connexion au réseau privé, p. ex. « Campus "
-"VPN » ou « Réseau d'entreprise »"
+"Nom utilisé pour identifier la connexion au réseau privé, p. ex. « VPN du "
+"Campus » ou « Réseau de l'entreprise »"
 
-#: ../properties/nm-openvpn-dialog.glade.h:18
-msgid "Optional"
-msgstr "Facultatif"
+#: ../properties/nm-openvpn-dialog.glade.h:12
+msgid "Network"
+msgstr "Réseau"
 
-#: ../properties/nm-openvpn-dialog.glade.h:19
-msgid "Password"
-msgstr "Mot de passe"
+#: ../properties/nm-openvpn-dialog.glade.h:13
+msgid "Only use _VPN connection for these addresses:"
+msgstr "Utiliser _uniquement une connexion VPN pour ces adresses :"
 
-#: ../properties/nm-openvpn-dialog.glade.h:20
+#: ../properties/nm-openvpn-dialog.glade.h:14
+msgid "OpenVPN Advanced Options"
+msgstr "Options avancées OpenVPN"
+
+#: ../properties/nm-openvpn-dialog.glade.h:15
+msgid "OpenVPN Configuration"
+msgstr "Configuration 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."
@@ -356,55 +333,43 @@ msgstr ""
 "administrateur système. N'entrez pas votre mot de passe avant d'y être "
 "invité."
 
-#: ../properties/nm-openvpn-dialog.glade.h:21
+#: ../properties/nm-openvpn-dialog.glade.h:17
 msgid ""
 "Please note that the file you import is not an OpenVPN configuration file. "
-"Ask your adminstrator for the file."
+"Ask your administrator for the file."
 msgstr ""
 "Veuillez noter que le fichier importé n'est pas un fichier de configuration "
-"OpenVPN. Demandez le fichier à votre administrateur."
+"OpenVPN. Demandez ce fichier à votre administrateur."
+
+#: ../properties/nm-openvpn-dialog.glade.h:18
+msgid "Shared _key:"
+msgstr "Clé _partagée :"
+
+#: ../properties/nm-openvpn-dialog.glade.h:19
+msgid "TLS-Auth"
+msgstr "Authentification TLS"
+
+#: ../properties/nm-openvpn-dialog.glade.h:20
+msgid "Use L_ZO compression"
+msgstr "Utiliser la compression L_ZO"
+
+#: ../properties/nm-openvpn-dialog.glade.h:21
+msgid "Use TA_P device"
+msgstr "Utiliser le périphérique TA_P"
 
 #: ../properties/nm-openvpn-dialog.glade.h:22
-msgid "Remote IP:"
-msgstr "Adresse IP distante :"
+msgid "Use _TCP connection"
+msgstr "Utiliser une connexion _TCP"
 
 #: ../properties/nm-openvpn-dialog.glade.h:23
-msgid "Shared Key:"
-msgstr "Clé partagée :"
+msgid "Use _TLS auth:"
+msgstr "Utiliser une authentification _TLS :"
 
 #: ../properties/nm-openvpn-dialog.glade.h:24
-msgid "Shared key"
-msgstr "Clé partagée"
+msgid "Use cip_her:"
+msgstr "Utiliser le chi_ffrement :"
 
 #: ../properties/nm-openvpn-dialog.glade.h:25
-msgid "Use LZO compression"
-msgstr "Utiliser la compression LZO"
-
-#: ../properties/nm-openvpn-dialog.glade.h:26
-msgid "Use TAP device"
-msgstr "Utiliser le périphérique TAP"
-
-#: ../properties/nm-openvpn-dialog.glade.h:27
-msgid "Use TCP connection"
-msgstr "Utiliser une connexion TCP"
-
-#: ../properties/nm-openvpn-dialog.glade.h:28
-msgid "Use TLS auth:"
-msgstr "Utiliser une authentification TLS :"
-
-#: ../properties/nm-openvpn-dialog.glade.h:29
-msgid "Use cipher:"
-msgstr "Utiliser le chiffrement :"
-
-#: ../properties/nm-openvpn-dialog.glade.h:30
-msgid "Username:"
-msgstr "Nom d'utilisateur :"
-
-#: ../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"
@@ -416,61 +381,38 @@ msgstr ""
 "Authentification par mot de passe\n"
 "X.509 avec mot de passe d'authentification"
 
-#: ../properties/nm-openvpn-dialog.glade.h:36
-msgid "X.509/Pass"
-msgstr "X.509/Mot de passe"
+#: ../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 "Adresse de la _passerelle :"
 
-#: ../properties/nm-openvpn-dialog.glade.h:38
-msgid "_Import Saved Configuration..."
-msgstr "_Importer la configuration enregistrée..."
+#: ../properties/nm-openvpn-dialog.glade.h:32
+msgid "_Gateway port:"
+msgstr "Port de la _passerelle :"
 
-#: ../properties/nm-openvpn-dialog.glade.h:39
-msgid "_Only use VPN connection for these addresses"
-msgstr "Utiliser _uniquement une connexion VPN pour ces adresses"
+#: ../properties/nm-openvpn-dialog.glade.h:33
+msgid "_Key:"
+msgstr "_Clé :"
 
-#: ../properties/nm-openvpn-dialog.glade.h:40
-msgid "none"
-msgstr "aucun"
+#: ../properties/nm-openvpn-dialog.glade.h:34
+msgid "_Local IP:"
+msgstr "Adresse IP _locale :"
 
-#: ../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."
-msgstr ""
-"La connexion VPN a échoué car le nom d'utilisateur et le mot de passe n'ont "
-"pas été acceptés ou le mot de passe du certificat est incorrect."
+#: ../properties/nm-openvpn-dialog.glade.h:35
+msgid "_Remote IP:"
+msgstr "Adresse IP _distante :"
 
-#: ../src/nm-openvpn-service.c:129
-msgid "The VPN login failed because the VPN program could not be started."
-msgstr "La connexion VPN a échoué car le client VPN ne peut pas être lancé."
+#: ../properties/nm-openvpn-dialog.glade.h:36
+msgid "_User name:"
+msgstr "Nom d'_utilisateur :"
 
-#: ../src/nm-openvpn-service.c:131
-msgid ""
-"The VPN login failed because the VPN program could not connect to the VPN "
-"server."
-msgstr ""
-"La connexion VPN a échoué car le client VPN ne peut se connecter au serveur "
-"VPN"
-
-#: ../src/nm-openvpn-service.c:133
-msgid ""
-"The VPN login failed because the VPN configuration options were invalid."
-msgstr ""
-"La connexion VPN a échoué car les options de configuration ne sont pas "
-"valides."
-
-#: ../src/nm-openvpn-service.c:135
-msgid ""
-"The VPN login failed because the VPN program received an invalid "
-"configuration from the VPN server."
-msgstr ""
-"La connexion VPN a échoué car le client VPN n'a pas reçu une configuration "
-"valide depuis le serveur VPN."
-
-#: ../src/nm-openvpn-service.c:137
-msgid "VPN connection failed"
-msgstr "La connexion VPN a échoué"
+#: ../properties/nm-openvpn-dialog.glade.h:37
+msgid "_none"
+msgstr "aucu_n"