17 files changed, 72 insertions, 63 deletions
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index 82b772891..9bdf3a34c 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -106,7 +106,7 @@ lqage:depends("LinkQualityLevel", "2")
 lqa = s:taboption("lquality", ListValue, "LinkQualityAlgorithm", translate("LQ algorithm"),
 	translate("Link quality algorithm (only for lq level 2).<br />"..
 	"<b>etx_float</b>: floating point ETX with exponential aging<br />"..
-	"<b>etx_fpm</b>  : same as ext_float, but with integer arithmetic<br />"..
+	"<b>etx_fpm</b>  : same as etx_float, but with integer arithmetic<br />"..
 	"<b>etx_ff</b>   : ETX freifunk, an etx variant which use all OLSR traffic (instead of only hellos) for ETX calculation<br />"..
 	"<b>etx_ffeth</b>: incompatible variant of etx_ff that allows ethernet links with ETX 0.1.<br />"..
 	"Defaults to \"etx_ff\""))
diff --git a/po/ca/olsr.po b/po/ca/olsr.po
index a0187aaeb..364624dc5 100644
--- a/po/ca/olsr.po
+++ b/po/ca/olsr.po
@@ -8,10 +8,10 @@ msgstr ""
 "PO-Revision-Date: 2009-05-29 01:03+0200\n"
 "Last-Translator: Eduard Duran <iopahopa@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Generator: Pootle 1.1.0\n"
 
 msgid "Active MID announcements"
@@ -268,7 +268,7 @@ msgstr ""
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
-"ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
 "etx variant which use all OLSR traffic (instead of only hellos) for ETX "
 "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
@@ -523,8 +523,8 @@ msgid "Topology"
 msgstr ""
 
 msgid ""
-"Type of service value for the IP header of control traffic. Default is "
-"\"16\"."
+"Type of service value for the IP header of control traffic. Default is \"16"
+"\"."
 msgstr ""
 
 msgid "Unable to connect to the OLSR daemon!"
diff --git a/po/de/olsr.po b/po/de/olsr.po
index d2489ca97..2169f30ed 100644
--- a/po/de/olsr.po
+++ b/po/de/olsr.po
@@ -6,10 +6,10 @@ msgstr ""
 "PO-Revision-Date: 2011-06-26 01:43+0200\n"
 "Last-Translator: Manuel <freifunk@somakoma.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
@@ -188,8 +188,8 @@ msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
-"IPv4 Quell-IP für ausgehende OLSR-Nachrichten. Der Defaultwert ist "
-"\"0.0.0.0\", dann wird die IP des Interfaces verwendet."
+"IPv4 Quell-IP für ausgehende OLSR-Nachrichten. Der Defaultwert ist \"0.0.0.0"
+"\", dann wird die IP des Interfaces verwendet."
 
 msgid "IPv6"
 msgstr "IPv6"
@@ -312,19 +312,11 @@ msgstr ""
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
-"ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
 "etx variant which use all OLSR traffic (instead of only hellos) for ETX "
 "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
-"Algorithmus zur Bestimmung der Linkqualität, kann nur zusammen mit "
-"Linkquality Level 2 verwendet werden.<br /><b>etx_float</b>: floating point "
-"ETX mit exponentieller Alterung<br /><b>etx_fpm</b> : wie ext_float, rechnet "
-"aber mit integeren Zahlen.<br /><b>etx_ff</b> : ETX freifunk, eine ETX-"
-"Variante die den kompletten OLSR Traffic (statt nur Hellos) zur ETX-"
-"Berechnung verwendet.<br /><b>etx_ffeth</b>: Inkompatible Variante von "
-"etx_ff, die ETX 0.1 für kabelgebundene Links erlaubt.<br />Der Defaultwert "
-"ist \"etx_ff\"."
 
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
@@ -604,8 +596,8 @@ msgid "Topology"
 msgstr "Topologie"
 
 msgid ""
-"Type of service value for the IP header of control traffic. Default is "
-"\"16\"."
+"Type of service value for the IP header of control traffic. Default is \"16"
+"\"."
 msgstr ""
 "TOS-Wert für den IP-Header von OLSR-Nachrichten. Der Defaultwert ist \"16\"."
 
@@ -666,3 +658,20 @@ msgstr ""
 
 msgid "Willingness"
 msgstr "Bereitschaft"
+
+#~ msgid ""
+#~ "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
+#~ "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
+#~ "ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, "
+#~ "an etx variant which use all OLSR traffic (instead of only hellos) for "
+#~ "ETX calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff "
+#~ "that allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
+#~ msgstr ""
+#~ "Algorithmus zur Bestimmung der Linkqualität, kann nur zusammen mit "
+#~ "Linkquality Level 2 verwendet werden.<br /><b>etx_float</b>: floating "
+#~ "point ETX mit exponentieller Alterung<br /><b>etx_fpm</b> : wie "
+#~ "ext_float, rechnet aber mit integeren Zahlen.<br /><b>etx_ff</b> : ETX "
+#~ "freifunk, eine ETX-Variante die den kompletten OLSR Traffic (statt nur "
+#~ "Hellos) zur ETX-Berechnung verwendet.<br /><b>etx_ffeth</b>: Inkompatible "
+#~ "Variante von etx_ff, die ETX 0.1 für kabelgebundene Links erlaubt.<br /"
+#~ ">Der Defaultwert ist \"etx_ff\"."
diff --git a/po/el/olsr.po b/po/el/olsr.po
index fb277b709..51b959969 100644
--- a/po/el/olsr.po
+++ b/po/el/olsr.po
@@ -7,10 +7,10 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
 msgid "Active MID announcements"
@@ -267,7 +267,7 @@ msgstr ""
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
-"ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
 "etx variant which use all OLSR traffic (instead of only hellos) for ETX "
 "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
@@ -520,8 +520,8 @@ msgid "Topology"
 msgstr ""
 
 msgid ""
-"Type of service value for the IP header of control traffic. Default is "
-"\"16\"."
+"Type of service value for the IP header of control traffic. Default is \"16"
+"\"."
 msgstr ""
 
 msgid "Unable to connect to the OLSR daemon!"
diff --git a/po/en/olsr.po b/po/en/olsr.po
index db99e8c1d..77a6ee498 100644
--- a/po/en/olsr.po
+++ b/po/en/olsr.po
@@ -7,10 +7,10 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
 msgid "Active MID announcements"
@@ -267,7 +267,7 @@ msgstr ""
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
-"ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
 "etx variant which use all OLSR traffic (instead of only hellos) for ETX "
 "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
@@ -522,8 +522,8 @@ msgid "Topology"
 msgstr ""
 
 msgid ""
-"Type of service value for the IP header of control traffic. Default is "
-"\"16\"."
+"Type of service value for the IP header of control traffic. Default is \"16"
+"\"."
 msgstr ""
 
 msgid "Unable to connect to the OLSR daemon!"
diff --git a/po/es/olsr.po b/po/es/olsr.po
index 740c1f0fa..0c5e80663 100644
--- a/po/es/olsr.po
+++ b/po/es/olsr.po
@@ -6,10 +6,10 @@ msgstr ""
 "PO-Revision-Date: 2009-07-20 03:42+0200\n"
 "Last-Translator: Guillermo Javier Nardoni <guillermo@geryon.com.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Generator: Pootle 1.1.0\n"
 
 msgid "Active MID announcements"
@@ -266,7 +266,7 @@ msgstr ""
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
-"ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
 "etx variant which use all OLSR traffic (instead of only hellos) for ETX "
 "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
@@ -522,8 +522,8 @@ msgid "Topology"
 msgstr ""
 
 msgid ""
-"Type of service value for the IP header of control traffic. Default is "
-"\"16\"."
+"Type of service value for the IP header of control traffic. Default is \"16"
+"\"."
 msgstr ""
 
 msgid "Unable to connect to the OLSR daemon!"
diff --git a/po/fr/olsr.po b/po/fr/olsr.po
index 073ff0f3f..f3cb3344a 100644
--- a/po/fr/olsr.po
+++ b/po/fr/olsr.po
@@ -7,10 +7,10 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
 msgid "Active MID announcements"
@@ -267,7 +267,7 @@ msgstr ""
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
-"ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
 "etx variant which use all OLSR traffic (instead of only hellos) for ETX "
 "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
@@ -520,8 +520,8 @@ msgid "Topology"
 msgstr ""
 
 msgid ""
-"Type of service value for the IP header of control traffic. Default is "
-"\"16\"."
+"Type of service value for the IP header of control traffic. Default is \"16"
+"\"."
 msgstr ""
 
 msgid "Unable to connect to the OLSR daemon!"
diff --git a/po/he/olsr.po b/po/he/olsr.po
index fc57cffd4..acd0962d5 100644
--- a/po/he/olsr.po
+++ b/po/he/olsr.po
@@ -1,10 +1,10 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -262,7 +262,7 @@ msgstr ""
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
-"ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
 "etx variant which use all OLSR traffic (instead of only hellos) for ETX "
 "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
diff --git a/po/it/olsr.po b/po/it/olsr.po
index 073ff0f3f..f3cb3344a 100644
--- a/po/it/olsr.po
+++ b/po/it/olsr.po
@@ -7,10 +7,10 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
 msgid "Active MID announcements"
@@ -267,7 +267,7 @@ msgstr ""
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
-"ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
 "etx variant which use all OLSR traffic (instead of only hellos) for ETX "
 "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
@@ -520,8 +520,8 @@ msgid "Topology"
 msgstr ""
 
 msgid ""
-"Type of service value for the IP header of control traffic. Default is "
-"\"16\"."
+"Type of service value for the IP header of control traffic. Default is \"16"
+"\"."
 msgstr ""
 
 msgid "Unable to connect to the OLSR daemon!"
diff --git a/po/ms/olsr.po b/po/ms/olsr.po
index 8f5de7bf5..8b4c99dc6 100644
--- a/po/ms/olsr.po
+++ b/po/ms/olsr.po
@@ -1,10 +1,10 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "Active MID announcements"
@@ -261,7 +261,7 @@ msgstr ""
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
-"ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
 "etx variant which use all OLSR traffic (instead of only hellos) for ETX "
 "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
diff --git a/po/no/olsr.po b/po/no/olsr.po
index fc57cffd4..acd0962d5 100644
--- a/po/no/olsr.po
+++ b/po/no/olsr.po
@@ -1,10 +1,10 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -262,7 +262,7 @@ msgstr ""
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
-"ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
 "etx variant which use all OLSR traffic (instead of only hellos) for ETX "
 "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
diff --git a/po/pl/olsr.po b/po/pl/olsr.po
index d227159f7..b6adb1d7b 100644
--- a/po/pl/olsr.po
+++ b/po/pl/olsr.po
@@ -1,10 +1,10 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
@@ -263,7 +263,7 @@ msgstr ""
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
-"ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
 "etx variant which use all OLSR traffic (instead of only hellos) for ETX "
 "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
diff --git a/po/pt/olsr.po b/po/pt/olsr.po
index 1c8a7ab7e..f62bc1460 100644
--- a/po/pt/olsr.po
+++ b/po/pt/olsr.po
@@ -7,10 +7,10 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
 msgid "Active MID announcements"
@@ -269,7 +269,7 @@ msgstr ""
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
-"ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
 "etx variant which use all OLSR traffic (instead of only hellos) for ETX "
 "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
@@ -526,8 +526,8 @@ msgid "Topology"
 msgstr ""
 
 msgid ""
-"Type of service value for the IP header of control traffic. Default is "
-"\"16\"."
+"Type of service value for the IP header of control traffic. Default is \"16"
+"\"."
 msgstr ""
 
 msgid "Unable to connect to the OLSR daemon!"
diff --git a/po/ro/olsr.po b/po/ro/olsr.po
index 407cee5df..c41ef9ca0 100644
--- a/po/ro/olsr.po
+++ b/po/ro/olsr.po
@@ -1,10 +1,10 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
@@ -263,7 +263,7 @@ msgstr ""
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
-"ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
 "etx variant which use all OLSR traffic (instead of only hellos) for ETX "
 "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
diff --git a/po/ru/olsr.po b/po/ru/olsr.po
index 629814281..1144b0dfa 100644
--- a/po/ru/olsr.po
+++ b/po/ru/olsr.po
@@ -6,10 +6,10 @@ msgstr ""
 "PO-Revision-Date: 2011-07-26 17:43+0200\n"
 "Last-Translator: stanislav.fomichev <s@fomichev.me>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.4\n"
@@ -277,7 +277,7 @@ msgstr ""
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
-"ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
 "etx variant which use all OLSR traffic (instead of only hellos) for ETX "
 "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
@@ -534,8 +534,8 @@ msgid "Topology"
 msgstr "Топология"
 
 msgid ""
-"Type of service value for the IP header of control traffic. Default is "
-"\"16\"."
+"Type of service value for the IP header of control traffic. Default is \"16"
+"\"."
 msgstr ""
 
 msgid "Unable to connect to the OLSR daemon!"
diff --git a/po/vi/olsr.po b/po/vi/olsr.po
index 05b1e3dcb..eebe69bc1 100644
--- a/po/vi/olsr.po
+++ b/po/vi/olsr.po
@@ -8,10 +8,10 @@ msgstr ""
 "PO-Revision-Date: 2009-08-16 12:39+0200\n"
 "Last-Translator: Hong Phuc Dang <dhppat@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "X-Generator: Pootle 1.1.0\n"
 
 msgid "Active MID announcements"
@@ -268,7 +268,7 @@ msgstr ""
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
-"ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
 "etx variant which use all OLSR traffic (instead of only hellos) for ETX "
 "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
@@ -524,8 +524,8 @@ msgid "Topology"
 msgstr ""
 
 msgid ""
-"Type of service value for the IP header of control traffic. Default is "
-"\"16\"."
+"Type of service value for the IP header of control traffic. Default is \"16"
+"\"."
 msgstr ""
 
 msgid "Unable to connect to the OLSR daemon!"
diff --git a/po/zh_CN/olsr.po b/po/zh_CN/olsr.po
index 8f5de7bf5..8b4c99dc6 100644
--- a/po/zh_CN/olsr.po
+++ b/po/zh_CN/olsr.po
@@ -1,10 +1,10 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "Active MID announcements"
@@ -261,7 +261,7 @@ msgstr ""
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
-"ext_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
+"etx_float, but with integer arithmetic<br /><b>etx_ff</b> : ETX freifunk, an "
 "etx variant which use all OLSR traffic (instead of only hellos) for ETX "
 "calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""