diff --git a/i18n/french/root/etc/uci-defaults/luci-i18n-french b/i18n/french/root/etc/uci-defaults/luci-i18n-french
index e424eaf8d6..e4eb0b7288 100755
--- a/i18n/french/root/etc/uci-defaults/luci-i18n-french
+++ b/i18n/french/root/etc/uci-defaults/luci-i18n-french
@@ -1,6 +1,6 @@
 #!/bin/sh
 uci batch <<-EOF
-	set luci.languages.fr='Francais'
+	set luci.languages.fr='Français'
         commit luci
 EOF
 	
diff --git a/po/fr/base.po b/po/fr/base.po
index 2842905701..58e1840d44 100644
--- a/po/fr/base.po
+++ b/po/fr/base.po
@@ -11,20 +11,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#, fuzzy
 msgid "(%s available)"
-msgstr " (%s available)"
+msgstr " (%s disponible)"
 
 msgid "(hidden)"
-msgstr ""
+msgstr "(caché)"
 
-#, fuzzy
 msgid "(no interfaces attached)"
-msgstr "Ignorer l'interface"
+msgstr "(pas d'interface connectée)"
 
-#, fuzzy
 msgid "(optional)"
-msgstr " (optionnel)"
+msgstr "(optionnel)"
 
 #, fuzzy
 msgid "-- custom --"
@@ -47,34 +44,35 @@ msgstr ""
 "adresse/prefixe"
 
 msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
-msgstr "Port DNS"
+msgstr "Port <abbr title=\"Domain Name System\">DNS</abbr>"
 
 msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
-msgstr "Serveur DNS"
+msgstr "Serveur <abbr title=\"Domain Name System\">DNS</abbr>"
 
 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the "
 "order of the resolvfile"
 msgstr ""
-"Les serveurs DNS du fichier de résolution seront interrogés dans l'ordre"
+"Les serveurs <abbr title=\"Domain Name System\">DNS</abbr> du fichier de "
+"résolution seront interrogés dans l'ordre"
 
 msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
-msgstr "Chiffrement"
+msgstr "Crypté"
 
 msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
-msgstr "Adresse IP"
+msgstr "Adresse <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 msgstr "Broadcast <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
-msgstr "Passerelle"
+msgstr "Passerelle <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
-msgstr "Masque réseau"
+msgstr "Masque réseau <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 msgstr "Adresse <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
@@ -82,7 +80,8 @@ msgstr "Adresse <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 msgid ""
 "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
 "(CIDR)"
-msgstr "adresse IPv6 ou réseau"
+msgstr "Adresse <abbr title=\"Internet Protocol Version 6\">IPv6</abbr> ou "
+"réseau (CIDR)"
 
 msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "Passerelle <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
@@ -96,34 +95,38 @@ msgid ""
 "abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua "
 "Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 msgstr ""
-"LuCI est une suite logicielle d'applications Lua software incluant un MVC-"
-"Webframework et une interface web pour équipements embarqués. Luci est sous "
-"license Apache."
+"<abbr title=\"Lua Configuration Interface\">LuCI</abbr> est une suite "
+"logicielle d'applications Lua incluant un <abbr title=\"Model-View-Controller"
+"\">MVC</abbr>-Webframework et une interface web pour équipements embarqués. "
+"<abbr title=\"Lua Configuration Interface\">LuCI</abbr> est sous license "
+"Apache."
 
 msgid ""
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, "
 "and user friendly graphical interface for configuring OpenWrt Kamikaze."
 msgstr ""
-"LuCI est une interface graphique libre, flexible, et user friendly pour "
+"<abbr title=\"Lua Configuration Interface\">LuCI</abbr> est une interface "
+"graphique libre, flexible, et orientée utilisateur pour "
 "configurer OpenWrt Kamikaze."
 
 msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
-msgstr "Adresse MAC"
+msgstr "Adresse <abbr title=\"Media Access Control\">MAC</abbr>"
 
-#, fuzzy
 msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
-msgstr "Serveur HTTP"
+msgstr "Serveur <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>"
 
 msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
-msgstr "Clés SSH"
+msgstr "Clés <abbr title=\"Secure Shell\">SSH</abbr>"
 
 msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
-msgstr "Scan WLAN"
+msgstr "Scan <abbr title=\"Wireless Local Area Network\">WLAN</abbr>"
 
 msgid ""
 "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr>-Leases"
-msgstr "baux maximum"
+msgstr ""
+"Nombre <abbr title=\"maximal\">max.</abbr> d'attributions <abbr title=\""
+"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
 msgid ""
 "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for "