[OpenWrt-Devel] [PATCH] [luci] Improve spelling and grammar

Alex Henrie alexhenrie24 at gmail.com
Mon Aug 4 15:47:26 EDT 2014


Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
 applications/luci-ahcp/luasrc/model/cbi/ahcp.lua   |  2 +-
 .../luasrc/model/cbi/firewall/zone-details.lua     |  2 +-
 .../luasrc/model/cbi/freifunk/meshwizard.lua       |  2 +-
 .../luasrc/model/cbi/watchcat/watchcat.lua         |  8 +--
 applications/luci-wol/luasrc/model/cbi/wol.lua     |  2 +-
 .../luci-wshaper/luasrc/model/cbi/wshaper.lua      |  2 +-
 .../admin-full/luasrc/controller/admin/system.lua  |  2 +-
 .../luasrc/model/cbi/admin_network/dhcp.lua        |  2 +-
 .../luasrc/model/cbi/admin_network/ifaces.lua      |  2 +-
 .../luasrc/model/cbi/admin_network/wifi.lua        |  2 +-
 .../luasrc/model/cbi/admin_network/wifi_add.lua    |  2 +-
 .../luasrc/model/cbi/admin_system/system.lua       |  2 +-
 .../luasrc/view/admin_network/wifi_overview.htm    |  2 +-
 .../luasrc/view/admin_system/flashops.htm          |  2 +-
 .../luasrc/view/admin_system/upgrade.htm           |  2 +-
 modules/admin-mini/luasrc/view/mini/upgrade.htm    |  4 +-
 .../luasrc/controller/failsafe/failsafe.lua        |  2 +-
 modules/failsafe/luasrc/view/failsafe/flashops.htm |  2 +-
 modules/failsafe/luasrc/view/failsafe/upgrade.htm  |  2 +-
 po/ca/ahcp.po                                      |  7 +-
 po/ca/base.po                                      | 44 ++++++------
 po/ca/firewall.po                                  | 22 +++---
 po/ca/meshwizard.po                                |  8 ++-
 po/ca/olsr.po                                      | 38 +++++++++-
 po/ca/watchcat.po                                  | 10 +--
 po/ca/wol.po                                       |  3 +-
 po/ca/wshaper.po                                   |  5 +-
 po/cs/ahcp.po                                      |  3 +-
 po/cs/base.po                                      | 53 ++++++++------
 po/cs/firewall.po                                  |  3 +-
 po/cs/meshwizard.po                                |  4 +-
 po/cs/olsr.po                                      | 33 +++++++++
 po/cs/watchcat.po                                  | 10 +--
 po/cs/wol.po                                       |  3 +-
 po/cs/wshaper.po                                   |  5 +-
 po/de/ahcp.po                                      |  3 +-
 po/de/base.po                                      | 53 ++++++++------
 po/de/firewall.po                                  |  3 +-
 po/de/meshwizard.po                                |  5 +-
 po/de/olsr.po                                      | 67 +++++++++++++----
 po/de/watchcat.po                                  | 10 +--
 po/de/wol.po                                       |  3 +-
 po/de/wshaper.po                                   |  5 +-
 po/el/ahcp.po                                      |  2 +-
 po/el/base.po                                      | 43 +++++------
 po/el/firewall.po                                  |  2 +-
 po/el/meshwizard.po                                |  4 +-
 po/el/olsr.po                                      | 33 +++++++++
 po/el/watchcat.po                                  |  8 +--
 po/el/wol.po                                       |  2 +-
 po/el/wshaper.po                                   |  4 +-
 po/en/ahcp.po                                      |  3 +-
 po/en/base.po                                      | 40 ++++++-----
 po/en/firewall.po                                  |  2 +-
 po/en/meshwizard.po                                |  4 +-
 po/en/olsr.po                                      | 39 +++++++++-
 po/en/watchcat.po                                  | 10 +--
 po/en/wol.po                                       |  3 +-
 po/en/wshaper.po                                   |  4 +-
 po/es/ahcp.po                                      | 11 +--
 po/es/base.po                                      | 55 ++++++++------
 po/es/firewall.po                                  |  3 +-
 po/es/meshwizard.po                                |  5 +-
 po/es/olsr.po                                      | 71 +++++++++++++++---
 po/es/watchcat.po                                  | 10 +--
 po/es/wol.po                                       |  3 +-
 po/es/wshaper.po                                   |  5 +-
 po/fr/ahcp.po                                      |  3 +-
 po/fr/base.po                                      | 53 ++++++++------
 po/fr/firewall.po                                  |  3 +-
 po/fr/meshwizard.po                                |  4 +-
 po/fr/olsr.po                                      | 33 +++++++++
 po/fr/watchcat.po                                  |  8 +--
 po/fr/wol.po                                       |  3 +-
 po/he/ahcp.po                                      |  2 +-
 po/he/base.po                                      | 53 +++++++-------
 po/he/firewall.po                                  |  2 +-
 po/he/meshwizard.po                                |  4 +-
 po/he/olsr.po                                      | 33 +++++++++
 po/he/watchcat.po                                  |  8 +--
 po/he/wol.po                                       |  2 +-
 po/he/wshaper.po                                   |  4 +-
 po/hu/ahcp.po                                      |  3 +-
 po/hu/base.po                                      | 57 ++++++++-------
 po/hu/firewall.po                                  |  3 +-
 po/hu/meshwizard.po                                |  4 +-
 po/hu/olsr.po                                      | 33 +++++++++
 po/hu/watchcat.po                                  |  8 +--
 po/hu/wol.po                                       |  3 +-
 po/hu/wshaper.po                                   |  5 +-
 po/it/ahcp.po                                      |  3 +-
 po/it/base.po                                      | 54 +++++++-------
 po/it/firewall.po                                  |  2 +-
 po/it/meshwizard.po                                |  5 +-
 po/it/olsr.po                                      | 39 ++++++++++
 po/it/watchcat.po                                  | 10 +--
 po/it/wol.po                                       |  3 +-
 po/it/wshaper.po                                   |  5 +-
 po/ja/ahcp.po                                      |  3 +-
 po/ja/base.po                                      | 60 +++++++++-------
 po/ja/firewall.po                                  |  3 +-
 po/ja/meshwizard.po                                |  4 +-
 po/ja/olsr.po                                      | 63 ++++++++++++----
 po/ja/watchcat.po                                  | 26 ++++---
 po/ja/wol.po                                       |  3 +-
 po/ja/wshaper.po                                   |  5 +-
 po/ms/ahcp.po                                      |  2 +-
 po/ms/base.po                                      | 40 ++++++-----
 po/ms/firewall.po                                  |  2 +-
 po/ms/meshwizard.po                                |  4 +-
 po/ms/olsr.po                                      | 33 +++++++++
 po/ms/watchcat.po                                  |  8 +--
 po/ms/wol.po                                       |  2 +-
 po/ms/wshaper.po                                   |  4 +-
 po/no/ahcp.po                                      |  2 +-
 po/no/base.po                                      | 53 ++++++++------
 po/no/firewall.po                                  |  3 +-
 po/no/meshwizard.po                                |  4 +-
 po/no/olsr.po                                      | 33 +++++++++
 po/no/watchcat.po                                  |  8 +--
 po/no/wol.po                                       | 14 ++--
 po/no/wshaper.po                                   |  4 +-
 po/pl/ahcp.po                                      |  3 +-
 po/pl/base.po                                      | 53 ++++++++------
 po/pl/firewall.po                                  |  3 +-
 po/pl/meshwizard.po                                |  5 +-
 po/pl/olsr.po                                      | 43 ++++++++++-
 po/pl/watchcat.po                                  | 10 +--
 po/pl/wol.po                                       |  3 +-
 po/pl/wshaper.po                                   |  5 +-
 po/pt/ahcp.po                                      |  3 +-
 po/pt/base.po                                      | 53 ++++++++------
 po/pt/firewall.po                                  |  2 +-
 po/pt/meshwizard.po                                |  5 +-
 po/pt/olsr.po                                      | 41 ++++++++++-
 po/pt/watchcat.po                                  |  8 +--
 po/pt/wol.po                                       |  3 +-
 po/pt/wshaper.po                                   |  4 +-
 po/pt_BR/ahcp.po                                   |  3 +-
 po/pt_BR/base.po                                   | 58 ++++++++-------
 po/pt_BR/firewall.po                               |  3 +-
 po/pt_BR/meshwizard.po                             | 13 ++--
 po/pt_BR/olsr.po                                   | 83 +++++++++++++++++++---
 po/pt_BR/watchcat.po                               | 10 +--
 po/pt_BR/wol.po                                    |  3 +-
 po/pt_BR/wshaper.po                                |  5 +-
 po/ro/ahcp.po                                      |  3 +-
 po/ro/base.po                                      | 42 +++++------
 po/ro/firewall.po                                  |  2 +-
 po/ro/meshwizard.po                                |  4 +-
 po/ro/olsr.po                                      | 33 +++++++++
 po/ro/watchcat.po                                  |  8 +--
 po/ro/wol.po                                       |  3 +-
 po/ro/wshaper.po                                   |  4 +-
 po/ru/ahcp.po                                      |  3 +-
 po/ru/base.po                                      | 55 ++++++++------
 po/ru/firewall.po                                  |  3 +-
 po/ru/meshwizard.po                                |  9 +--
 po/ru/olsr.po                                      | 66 +++++++++++++----
 po/ru/watchcat.po                                  | 10 +--
 po/ru/wol.po                                       |  3 +-
 po/ru/wshaper.po                                   |  5 +-
 po/sk/ahcp.po                                      |  2 +-
 po/sk/base.po                                      | 38 +++++-----
 po/sk/firewall.po                                  |  2 +-
 po/sk/meshwizard.po                                |  4 +-
 po/sk/olsr.po                                      | 33 +++++++++
 po/sk/watchcat.po                                  |  8 +--
 po/sk/wol.po                                       |  2 +-
 po/sk/wshaper.po                                   |  4 +-
 po/sv/ahcp.po                                      |  2 +-
 po/sv/base.po                                      | 38 +++++-----
 po/sv/firewall.po                                  |  2 +-
 po/sv/meshwizard.po                                |  4 +-
 po/sv/olsr.po                                      | 33 +++++++++
 po/sv/watchcat.po                                  |  8 +--
 po/sv/wol.po                                       |  2 +-
 po/sv/wshaper.po                                   |  4 +-
 po/templates/ahcp.pot                              |  2 +-
 po/templates/base.pot                              | 38 +++++-----
 po/templates/firewall.pot                          |  2 +-
 po/templates/meshwizard.pot                        |  4 +-
 po/templates/olsr.pot                              | 33 +++++++++
 po/templates/watchcat.pot                          |  8 +--
 po/templates/wol.pot                               |  2 +-
 po/templates/wshaper.pot                           |  4 +-
 po/tr/ahcp.po                                      |  3 +-
 po/tr/base.po                                      | 38 +++++-----
 po/tr/firewall.po                                  |  2 +-
 po/tr/meshwizard.po                                |  4 +-
 po/tr/olsr.po                                      | 33 +++++++++
 po/tr/watchcat.po                                  |  8 +--
 po/tr/wol.po                                       |  2 +-
 po/tr/wshaper.po                                   |  4 +-
 po/uk/ahcp.po                                      |  3 +-
 po/uk/base.po                                      | 61 +++++++++-------
 po/uk/firewall.po                                  |  3 +-
 po/uk/meshwizard.po                                |  4 +-
 po/uk/olsr.po                                      | 33 +++++++++
 po/uk/watchcat.po                                  |  9 +--
 po/uk/wol.po                                       |  3 +-
 po/uk/wshaper.po                                   |  5 +-
 po/vi/ahcp.po                                      |  3 +-
 po/vi/base.po                                      | 40 ++++++-----
 po/vi/firewall.po                                  |  2 +-
 po/vi/meshwizard.po                                |  4 +-
 po/vi/olsr.po                                      | 41 ++++++++++-
 po/vi/watchcat.po                                  |  8 +--
 po/vi/wol.po                                       |  2 +-
 po/vi/wshaper.po                                   |  4 +-
 po/zh_CN/ahcp.po                                   |  8 ++-
 po/zh_CN/base.po                                   | 55 ++++++++------
 po/zh_CN/firewall.po                               |  3 +-
 po/zh_CN/meshwizard.po                             |  5 +-
 po/zh_CN/olsr.po                                   | 35 +++++++++
 po/zh_CN/watchcat.po                               | 10 +--
 po/zh_CN/wol.po                                    |  3 +-
 po/zh_CN/wshaper.po                                |  9 ++-
 po/zh_TW/ahcp.po                                   |  2 +-
 po/zh_TW/base.po                                   | 55 ++++++++------
 po/zh_TW/firewall.po                               |  3 +-
 po/zh_TW/meshwizard.po                             |  4 +-
 po/zh_TW/olsr.po                                   | 34 +++++++++
 po/zh_TW/watchcat.po                               | 26 ++++---
 po/zh_TW/wol.po                                    |  3 +-
 po/zh_TW/wshaper.po                                |  9 ++-
 226 files changed, 2196 insertions(+), 988 deletions(-)

diff --git a/applications/luci-ahcp/luasrc/model/cbi/ahcp.lua b/applications/luci-ahcp/luasrc/model/cbi/ahcp.lua
index 18764a1..a48f8b4 100644
--- a/applications/luci-ahcp/luasrc/model/cbi/ahcp.lua
+++ b/applications/luci-ahcp/luasrc/model/cbi/ahcp.lua
@@ -14,7 +14,7 @@ $Id: init.lua 5764 2010-03-08 19:05:34Z jow $
 
 m = Map("ahcpd", translate("AHCP Server"), translate("AHCP is an autoconfiguration protocol " ..
 	"for IPv6 and dual-stack IPv6/IPv4 networks designed to be used in place of router " ..
-	"discovery and DHCP on networks where it is difficult or impossible to configure a " ..
+	"discovery or DHCP on networks where it is difficult or impossible to configure a " ..
 	"server within every link-layer broadcast domain, for example mobile ad-hoc networks."))
 
 
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua b/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
index a3b1a6e..e5bcb34 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
+++ b/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
@@ -50,7 +50,7 @@ s = m:section(NamedSection, zone.sid, "zone",
 		<em>forward</em> option describes the policy for forwarded traffic \
 		between different networks within the zone. \
 		<em>Covered networks</em> specifies which available networks are \
-		member of this zone.", zone:name()))
+		members of this zone.", zone:name()))
 
 s.anonymous = true
 s.addremove = false
diff --git a/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua b/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua
index 8cb0822..68f7a5a 100644
--- a/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua
+++ b/applications/luci-meshwizard/luasrc/model/cbi/freifunk/meshwizard.lua
@@ -22,7 +22,7 @@ n.anonymous = true
 
 function cbi_configure(device)
 	local configure = n:taboption(device, Flag, device .. "_config", translate("Configure this interface"),
-		translate("Note: this will setup this interface for mesh operation, i.e. add to zone 'freifunk' and enable olsr."))
+		translate("Note: this will set up this interface for mesh operation, i.e. add it to zone 'freifunk' and enable olsr."))
 end
 
 function cbi_ip4addr(device)
diff --git a/applications/luci-watchcat/luasrc/model/cbi/watchcat/watchcat.lua b/applications/luci-watchcat/luasrc/model/cbi/watchcat/watchcat.lua
index 9f47bca..bcaf438 100644
--- a/applications/luci-watchcat/luasrc/model/cbi/watchcat/watchcat.lua
+++ b/applications/luci-watchcat/luasrc/model/cbi/watchcat/watchcat.lua
@@ -14,8 +14,8 @@ $Id$
 
 m = Map("system", 
 	translate("Watchcat"), 
-	translate("Watchcat allows to configure a periodic reboot and/or when " ..
-		  "internet connection has been lost for a certain period of time."  
+	translate("Watchcat allows configuring a periodic reboot when the " ..
+		  "Internet connection has been lost for a certain period of time."
 		 ))
 
 s = m:section(TypedSection, "watchcat")
@@ -30,8 +30,8 @@ mode:value("allways", "Periodic reboot")
 
 forcedelay = s:option(Value, "forcedelay",
 		      translate("Forced reboot delay"),
-		      translate("When rebooting the system the watchcat will trigger a soft reboot, " ..
-				"Entering a non zero value here, will trigger a delayed hard reboot " ..
+		      translate("When rebooting the system, the watchcat will trigger a soft reboot. " ..
+				"Entering a non zero value here will trigger a delayed hard reboot " ..
 				"if the soft reboot fails. Enter a number of seconds to enable, " ..
 				"use 0 to disable"))
 forcedelay.datatype = "uinteger"
diff --git a/applications/luci-wol/luasrc/model/cbi/wol.lua b/applications/luci-wol/luasrc/model/cbi/wol.lua
index d683b6e..ece9e49 100644
--- a/applications/luci-wol/luasrc/model/cbi/wol.lua
+++ b/applications/luci-wol/luasrc/model/cbi/wol.lua
@@ -28,7 +28,7 @@ s = m:section(SimpleSection)
 
 if has_ewk and has_wol then
 	bin = s:option(ListValue, "binary", translate("WoL program"),
-		translate("Sometimes only one of both tools work. If one of fails, try the other one"))
+		translate("Sometimes only one of the two tools works. If one fails, try the other one"))
 
 	bin:value("/usr/bin/etherwake", "Etherwake")
 	bin:value("/usr/bin/wol", "WoL")
diff --git a/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua b/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua
index 81225ce..faa64f6 100644
--- a/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua
+++ b/applications/luci-wshaper/luasrc/model/cbi/wshaper.lua
@@ -13,7 +13,7 @@ You may obtain a copy of the License at
 require("luci.tools.webadmin")
 
 m = Map("wshaper", translate("Wondershaper"),
-	translate("Wondershaper uses traffic shaping to ensure low latencies for interactive traffic even when your " ..
+	translate("Wondershaper shapes traffic to ensure low latencies for interactive traffic even when your " ..
 	"internet connection is highly saturated."))
 
 s = m:section(NamedSection, "settings", "wshaper", translate("Wondershaper settings"))
diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 55ad01c..5fa4c3a 100644
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -288,7 +288,7 @@ function action_flashops()
 			local keep = (luci.http.formvalue("keep") == "1") and "" or "-n"
 			luci.template.render("admin_system/applyreboot", {
 				title = luci.i18n.translate("Flashing..."),
-				msg   = luci.i18n.translate("The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."),
+				msg   = luci.i18n.translate("The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."),
 				addr  = (#keep > 0) and "192.168.1.1" or nil
 			})
 			fork_exec("killall dropbear uhttpd; sleep 1; /sbin/sysupgrade %s %q" %{ keep, image_tmp })
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
index 5817908..bd6f403 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
@@ -86,7 +86,7 @@ s:taboption("advanced", Flag, "localise_queries",
 
 s:taboption("general", Value, "local",
 	translate("Local server"),
-	translate("Local domain specification. Names matching this domain are never forwared and resolved from DHCP or hosts files only"))
+	translate("Local domain specification. Names matching this domain are never forwarded and are resolved from DHCP or hosts files only"))
 
 s:taboption("general", Value, "domain",
 	translate("Local domain"),
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index 247ddbf..9be5ff1 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -450,7 +450,7 @@ if has_dnsmasq and net:proto() == "static" then
 		limit.default = "150"
 
 		local ltime = s:taboption("general", Value, "leasetime", translate("Leasetime"),
-			translate("Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."))
+			translate("Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."))
 		ltime.rmempty = true
 		ltime.default = "12h"
 
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
index 4ae2f77..5a5efa9 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -22,7 +22,7 @@ arg[1] = arg[1] or ""
 
 m = Map("wireless", "",
 	translate("The <em>Device Configuration</em> section covers physical settings of the radio " ..
-		"hardware such as channel, transmit power or antenna selection which is shared among all " ..
+		"hardware such as channel, transmit power or antenna selection which are shared among all " ..
 		"defined wireless networks (if the radio hardware is multi-SSID capable). Per network settings " ..
 		"like encryption or operation mode are grouped in the <em>Interface Configuration</em>."))
 
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
index 5b646d9..cb42648 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
@@ -60,7 +60,7 @@ if iw and iw.mbssid_support then
 	function replace.cfgvalue() return "1" end
 else
 	replace = m:field(DummyValue, "replace", translate("Replace wireless configuration"))
-	replace.default = translate("The hardware is not multi-SSID capable and existing " ..
+	replace.default = translate("The hardware is not multi-SSID capable and the existing " ..
 		"configuration will be replaced if you proceed.")
 
 	function replace.formvalue() return "1" end
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
index 3a884c4..5e82289 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -183,7 +183,7 @@ if has_ntpd then
 
 		x = s:option(Button, "_enable")
 		x.title      = translate("Time Synchronization is not configured yet.")
-		x.inputtitle = translate("Setup Time Synchronization")
+		x.inputtitle = translate("Set up Time Synchronization")
 		x.inputstyle = "apply"
 
 	else
diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
index 97d900d..d528876 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -134,7 +134,7 @@ You may obtain a copy of the License at
 	function wifi_shutdown(id, toggle) {
 		var reconnect = (toggle.getAttribute('active') == 'false');
 
-		if (!reconnect && !confirm(String.format('<%:Really shutdown network ?\nYou might lose access to this device if you are connected via this interface.%>')))
+		if (!reconnect && !confirm(String.format('<%:Really shut down network?\nYou might lose access to this device if you are connected via this interface.%>')))
 			return;
 
 		is_reconnecting = true;
diff --git a/modules/admin-full/luasrc/view/admin_system/flashops.htm b/modules/admin-full/luasrc/view/admin_system/flashops.htm
index 0ba22a5..debc796 100644
--- a/modules/admin-full/luasrc/view/admin_system/flashops.htm
+++ b/modules/admin-full/luasrc/view/admin_system/flashops.htm
@@ -85,7 +85,7 @@ $Id$
 				<% end %>
 			</form>
 		<% else %>
-			<div class="cbi-section-descr"><%:Sorry, there is no sysupgrade support present, a new firmware image must be flashed manually. Please refer to the OpenWrt wiki for device specific install instructions.%></div>
+			<div class="cbi-section-descr"><%:Sorry, there is no sysupgrade support present; a new firmware image must be flashed manually. Please refer to the OpenWrt wiki for device specific install instructions.%></div>
 		<% end %>
 	</fieldset>
 
diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index 69fde9a..ce28533 100644
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -24,7 +24,7 @@ $Id$
 
 	<% if storage > 0 and size > storage then %>
 		<br /><br />
-		<div class="error"><%:It appears that you try to
+		<div class="error"><%:It appears that you are trying to
 			flash an image that does not fit into the flash memory, please verify
 			the image file! %></div>
 	<% end %>
diff --git a/modules/admin-mini/luasrc/view/mini/upgrade.htm b/modules/admin-mini/luasrc/view/mini/upgrade.htm
index 1083a16..6ff5d84 100644
--- a/modules/admin-mini/luasrc/view/mini/upgrade.htm
+++ b/modules/admin-mini/luasrc/view/mini/upgrade.htm
@@ -59,7 +59,7 @@ $Id$
 
 		<% if flashsize > 0 and filesize > flashsize then %>
 			<br /><br />
-			<div class="error"><%:It appears that you try to
+			<div class="error"><%:It appears that you are trying to
 				flash an image that does not fit into the flash memory, please verify
 				the image file! %></div>
 		<% end %>
@@ -95,7 +95,7 @@ $Id$
 <% elseif step == 3 then %>
 	<p><%_ The system is flashing now.<br />
 		DO NOT POWER OFF THE DEVICE!<br />
-		Wait a few minutes until you try to reconnect.
+		Wait a few minutes before you try to reconnect.
 		It might be necessary to renew the address of your computer to reach the device
 		again, depending on your settings. %></p>
 		
diff --git a/modules/failsafe/luasrc/controller/failsafe/failsafe.lua b/modules/failsafe/luasrc/controller/failsafe/failsafe.lua
index 1da3438..db4bda6 100644
--- a/modules/failsafe/luasrc/controller/failsafe/failsafe.lua
+++ b/modules/failsafe/luasrc/controller/failsafe/failsafe.lua
@@ -132,7 +132,7 @@ function action_flashops()
 			local keep = (luci.http.formvalue("keep") == "1") and "" or "-n"
 			luci.template.render("failsafe/applyreboot", {
 				title = luci.i18n.translate("Flashing..."),
-				msg   = luci.i18n.translate("The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."),
+				msg   = luci.i18n.translate("The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."),
 				addr  = (#keep > 0) and "192.168.1.1" or nil
 			})
 			fork_exec("killall dropbear uhttpd; sleep 1; /sbin/sysupgrade %s %q" %{ keep, image_tmp })
diff --git a/modules/failsafe/luasrc/view/failsafe/flashops.htm b/modules/failsafe/luasrc/view/failsafe/flashops.htm
index accbba0..5ff23e5 100644
--- a/modules/failsafe/luasrc/view/failsafe/flashops.htm
+++ b/modules/failsafe/luasrc/view/failsafe/flashops.htm
@@ -36,7 +36,7 @@ $Id$
 			<% end %>
 		</form>
 	<% else %>
-		<div class="cbi-section-descr"><%:Sorry, there is no sysupgrade support present, a new firmware image must be flashed manually. Please refer to the OpenWrt wiki for device specific install instructions.%></div>
+		<div class="cbi-section-descr"><%:Sorry, there is no sysupgrade support present; a new firmware image must be flashed manually. Please refer to the OpenWrt wiki for device specific install instructions.%></div>
 	<% end %>
 </fieldset>
 
diff --git a/modules/failsafe/luasrc/view/failsafe/upgrade.htm b/modules/failsafe/luasrc/view/failsafe/upgrade.htm
index 66f6457..7a86000 100644
--- a/modules/failsafe/luasrc/view/failsafe/upgrade.htm
+++ b/modules/failsafe/luasrc/view/failsafe/upgrade.htm
@@ -25,7 +25,7 @@ $Id$
 
 	<% if storage > 0 and size > storage then %>
 		<br /><br />
-		<div class="error"><%:It appears that you try to
+		<div class="error"><%:It appears that you are trying to
 			flash an image that does not fit into the flash memory, please verify
 			the image file! %></div>
 	<% end %>
diff --git a/po/ca/ahcp.po b/po/ca/ahcp.po
index d206716..89108fd 100644
--- a/po/ca/ahcp.po
+++ b/po/ca/ahcp.po
@@ -15,17 +15,18 @@ msgid "AHCP Server"
 msgstr "Servidor AHCP"
 
 # Minor misspelling corrections
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
 "AHCP és un protocol de configuració automàtica per IPv6 i xarxes de pila "
 "dual IPv6/IPv4 dissenyat per fer servir en lloc del descobriment de rutes o "
 "DHCP en xarxes on es difícil o impossible configurar un servidor dins de "
-"tots els dominis de difusió a la capa d'enllaç, per exemple xarxes mòbils "
-"ad-hoc."
+"tots els dominis de difusió a la capa d'enllaç, per exemple xarxes mòbils ad-"
+"hoc."
 
 # apòstrof+acrònims http://ca.wikipedia.org/wiki/Ap%C3%B2strof#Observacions
 msgid "Active AHCP Leases"
diff --git a/po/ca/base.po b/po/ca/base.po
index 285e4cb..29e27cf 100644
--- a/po/ca/base.po
+++ b/po/ca/base.po
@@ -829,7 +829,7 @@ msgid "Expires"
 msgstr "Caduca"
 
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
 msgid "External"
@@ -1248,9 +1248,10 @@ msgstr ""
 msgid "Invalid username and/or password! Please try again."
 msgstr "Usuari i/o contrasenya invàlids! Si us plau prova-ho de nou."
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "Sembla que intentes actualitzar una imatge que no hi cap a la memòria flaix, "
 "si us plau verifica el fitxer d'imatge!"
@@ -1387,8 +1388,8 @@ msgid "Local domain"
 msgstr "Domini local"
 
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
@@ -1941,13 +1942,13 @@ msgid "Really reset all changes?"
 msgstr ""
 
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
 
 msgid "Really switch protocol?"
@@ -2151,10 +2152,11 @@ msgstr "Tipus de servei"
 msgid "Services"
 msgstr "Serveis"
 
-msgid "Setup DHCP Server"
-msgstr ""
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Sincronització de hora"
 
-msgid "Setup Time Synchronization"
+msgid "Setup DHCP Server"
 msgstr ""
 
 msgid "Show current backup file list"
@@ -2200,7 +2202,7 @@ msgid "Sorry, the server encountered an unexpected error."
 msgstr "Tristament, el servidor ha encontrat un error inesperat."
 
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2340,10 +2342,10 @@ msgstr "Acaba"
 
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 
 msgid ""
@@ -2403,9 +2405,10 @@ msgstr "Els següents regles estan actualment actives en aquest sistema."
 msgid "The given network name is not unique"
 msgstr "El nom de xarxa donat no és únic"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 "El maquinari no es capaç de múltiples SSID i la configuració existent es "
 "reemplaçara si procediu."
@@ -2438,9 +2441,10 @@ msgstr ""
 "El sistema està esborrant la partició de configuració i es reiniciarà quan "
 "termini."
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/ca/firewall.po b/po/ca/firewall.po
index af935de..1843a16 100644
--- a/po/ca/firewall.po
+++ b/po/ca/firewall.po
@@ -209,7 +209,8 @@ msgid "Match ICMP type"
 msgstr "Coincideix amb el tipus ICMP"
 
 msgid "Match forwarded traffic to the given destination port or port range."
-msgstr "Coincideix amb trànsit reenviat al port o rang de ports de destí donat."
+msgstr ""
+"Coincideix amb trànsit reenviat al port o rang de ports de destí donat."
 
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
@@ -386,19 +387,20 @@ msgstr ""
 "Aquesta pàgina us permet canviar propietats avançats de l'entrada de regla "
 "de trànsit, com als hosts d'origen i de destí coincidits."
 
+#, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
-"Aquesta secció defineix propietats comuns de %q. Les opcions "
-"<em>entrada</em> i <em>sortida</em> estableixen les polítiques per defecte "
-"per a trànsit entrant i sortint aquesta zona mentre l'opció <em>reenvia</em> "
-"descriu la política de trànsit reenviat entre xarxes distintes dins de la "
-"zona. <em>Xarxes cobertes</em> especifica quines xarxes disponibles són "
-"membres d'aquesta zona."
+"Aquesta secció defineix propietats comuns de %q. Les opcions <em>entrada</"
+"em> i <em>sortida</em> estableixen les polítiques per defecte per a trànsit "
+"entrant i sortint aquesta zona mentre l'opció <em>reenvia</em> descriu la "
+"política de trànsit reenviat entre xarxes distintes dins de la zona. "
+"<em>Xarxes cobertes</em> especifica quines xarxes disponibles són membres "
+"d'aquesta zona."
 
 msgid "To %s at %s on <var>this device</var>"
 msgstr "A %s a %s en <var>aquest dispositiu</var>"
@@ -440,8 +442,8 @@ msgid ""
 "You may specify multiple by selecting \"-- custom --\" and then entering "
 "protocols separated by space."
 msgstr ""
-"Podeu especificar múltiples per seleccionar \"-- personalitzat --\" i llavors "
-"introduir protocols separats per espai."
+"Podeu especificar múltiples per seleccionar \"-- personalitzat --\" i "
+"llavors introduir protocols separats per espai."
 
 msgid "Zone %q"
 msgstr "Zona %q"
diff --git a/po/ca/meshwizard.po b/po/ca/meshwizard.po
index f20f8ab..6d7bf93 100644
--- a/po/ca/meshwizard.po
+++ b/po/ca/meshwizard.po
@@ -67,9 +67,10 @@ msgstr "Adreça IPv6 en malla"
 msgid "Mesh Wizard"
 msgstr "Ajudant de malla"
 
+#, fuzzy
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 "Nota: això configurarà aquesta interfície per a operació en malla, és a dir, "
 "la afegirà a la zona 'freifunk' i habilitarà l'OLSR."
@@ -136,7 +137,8 @@ msgid "Wizard"
 msgstr "Ajudant"
 
 msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr "El vostre dispositiu i els nodes veïns han d'utilitzar el mateix canal."
+msgstr ""
+"El vostre dispositiu i els nodes veïns han d'utilitzar el mateix canal."
 
 msgid "recommended"
 msgstr "recomanat"
diff --git a/po/ca/olsr.po b/po/ca/olsr.po
index f40892e..db4bce1 100644
--- a/po/ca/olsr.po
+++ b/po/ca/olsr.po
@@ -54,6 +54,9 @@ msgstr "Adreça de difusió"
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr "Configuració"
 
@@ -136,6 +139,10 @@ msgstr "Interval HNA"
 msgid "HNA validity time"
 msgstr "Temps de validesa HNA"
 
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "Anuncis HNA"
+
 msgid "Hello"
 msgstr ""
 
@@ -169,6 +176,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -373,6 +385,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr "Llindar NAT"
 
@@ -412,6 +431,10 @@ msgstr "OLSR - Opcions de mostra"
 msgid "OLSR - HNA-Announcements"
 msgstr "Anuncis OLSR - HNA"
 
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "Anuncis OLSR - HNA"
+
 msgid "OLSR - Plugins"
 msgstr "OLSR - Connectors"
 
@@ -499,6 +522,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -648,6 +677,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr "Voluntat"
 
@@ -668,4 +703,5 @@ msgstr ""
 #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
 #~ msgstr ""
 #~ "Assegura't que l'OLSRd està corrent, que el connector \"txtinfo\" està "
-#~ "carregat, configurat al port 2006, i que accepta connexions de \"127.0.0.1\"."
+#~ "carregat, configurat al port 2006, i que accepta connexions de "
+#~ "\"127.0.0.1\"."
diff --git a/po/ca/watchcat.po b/po/ca/watchcat.po
index c110351..36e6405 100644
--- a/po/ca/watchcat.po
+++ b/po/ca/watchcat.po
@@ -51,16 +51,18 @@ msgstr "Període de ping"
 msgid "Watchcat"
 msgstr "Watchcat"
 
+#, fuzzy
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 "El Watchcat permet la configuració d'un reinici periòdic o un reinici quan "
 "la connexió d'Internet ha estat perdut fa un cert període de temps."
 
+#, fuzzy
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
 "Al reiniciar el sistema, el Watchcat causarà un reinici suau. Introduïu un "
diff --git a/po/ca/wol.po b/po/ca/wol.po
index 675d474..42f7cf7 100644
--- a/po/ca/wol.po
+++ b/po/ca/wol.po
@@ -29,8 +29,9 @@ msgstr "Host per a despertar"
 msgid "Network interface to use"
 msgstr "Interfície de xarxa per a utilitzar"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 "A vegades, només una de les dues eines funciona. Si un dels falla, prova la "
 "altra."
diff --git a/po/ca/wshaper.po b/po/ca/wshaper.po
index 75237b8..2560383 100644
--- a/po/ca/wshaper.po
+++ b/po/ca/wshaper.po
@@ -49,9 +49,10 @@ msgstr "Wondershaper"
 msgid "Wondershaper settings"
 msgstr "Ajusts del Wondershaper"
 
+#, fuzzy
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
 "Wondershapter afaiçona el trànsit per assegurar latències baixes per a "
 "trànsit interactiu encara que la vostra connexió de Internet estigui "
diff --git a/po/cs/ahcp.po b/po/cs/ahcp.po
index 7030dcb..0a9e0af 100644
--- a/po/cs/ahcp.po
+++ b/po/cs/ahcp.po
@@ -14,9 +14,10 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "AHCP Server"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/cs/base.po b/po/cs/base.po
index 0179446..709145a 100644
--- a/po/cs/base.po
+++ b/po/cs/base.po
@@ -838,8 +838,9 @@ msgstr "Rozšířit hostitele"
 msgid "Expires"
 msgstr "Vyprší"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "Čas vypršení vypůjčené adresy, minimum jsou 2 minuty (<code>2m</code>)."
 
@@ -1260,9 +1261,10 @@ msgstr "Uvedené VLAN ID je neplatné! Každé ID musí být jedinečné"
 msgid "Invalid username and/or password! Please try again."
 msgstr "Špatné uživatelské jméno a/nebo heslo! Prosím zkuste to znovu."
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "Zdá se, že se pokoušíte zapsat obraz, který se nevejde do flash paměti. "
 "Prosím ověřte soubor s obrazem!"
@@ -1401,9 +1403,10 @@ msgstr "Místní čas"
 msgid "Local domain"
 msgstr "Místní doména"
 
+#, fuzzy
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 "Specifikace místní domény. Jména shodná s touto doménou nikdy nebudou "
 "přesměrována ani rozlušťována pomocí DHCP nebo souborů hosts"
@@ -1969,19 +1972,20 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr "Opravdu resetovat všechny změny?"
 
+#, fuzzy
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
-"Opravdu vypnout rozhraní \"%s\" ?\n"
+"Opravdu vypnout síť ?\n"
 "Můžete ztratit přístup k zařízení, pokud jste připojeni prostřednictvím "
 "tohoto rozhraní."
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
-"Opravdu vypnout síť ?\n"
+"Opravdu vypnout rozhraní \"%s\" ?\n"
 "Můžete ztratit přístup k zařízení, pokud jste připojeni prostřednictvím "
 "tohoto rozhraní."
 
@@ -2188,12 +2192,13 @@ msgstr "Typ služby"
 msgid "Services"
 msgstr "Služby"
 
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Nastavit synchronizaci času"
+
 msgid "Setup DHCP Server"
 msgstr "Nastavit DHCP server"
 
-msgid "Setup Time Synchronization"
-msgstr "Nastavit synchronizaci času"
-
 msgid "Show current backup file list"
 msgstr "Ukázat aktuální seznam záložních souborů"
 
@@ -2236,8 +2241,9 @@ msgstr "Omlouváme se, ale požadovaný objekt nebyl nalezen."
 msgid "Sorry, the server encountered an unexpected error."
 msgstr "Omlouváme se, na serveru došlo k neočekávané vyjímce."
 
+#, fuzzy
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2383,12 +2389,13 @@ msgstr "Cíl"
 msgid "Terminate"
 msgstr "Ukončit"
 
+#, fuzzy
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 "Sekce <em>Nastavení zařízení</em> pokrývá fyzické nastavení radiového "
 "hardwaru jako kanál, vysílací výkon nebo výběr antény, které je sdíleno mezi "
@@ -2456,9 +2463,10 @@ msgstr "Následující pravidla jsou v nyní na tomto systému aktivní."
 msgid "The given network name is not unique"
 msgstr "Zadané jméno sítě není jedinečné"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 "Tento hardware nepodporuje multi-SSID. Pokud budete pokračovat, existující "
 "konfigurace bude nahrazena."
@@ -2496,9 +2504,10 @@ msgstr ""
 "Systém maže konfigurační oddíl, po skončení procesu bude automaticky "
 "restartován."
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/cs/firewall.po b/po/cs/firewall.po
index 967ffe5..beda490 100644
--- a/po/cs/firewall.po
+++ b/po/cs/firewall.po
@@ -383,12 +383,13 @@ msgstr ""
 "Tato stránka vám umožňuje změnit pokročilé vlastnosti pravidla síťového "
 "provozu, například zdrojové a cílové hostitele."
 
+#, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 "Tato sekce definuje běžné možnosti %q. <em>Vstupní</em> a <em>výstupní</em> "
 "možnosti nastavují výchozí politiky pro provoz, vstupující do této zóny a "
diff --git a/po/cs/meshwizard.po b/po/cs/meshwizard.po
index 1ff6aa8..b1253d0 100644
--- a/po/cs/meshwizard.po
+++ b/po/cs/meshwizard.po
@@ -64,8 +64,8 @@ msgid "Mesh Wizard"
 msgstr "Průvodce mesh"
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/cs/olsr.po b/po/cs/olsr.po
index 85f268f..3166907 100644
--- a/po/cs/olsr.po
+++ b/po/cs/olsr.po
@@ -50,6 +50,9 @@ msgstr ""
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr "Konfigurace"
 
@@ -132,6 +135,9 @@ msgstr "HNA interval"
 msgid "HNA validity time"
 msgstr ""
 
+msgid "HNA6 Announcements"
+msgstr ""
+
 msgid "Hello"
 msgstr ""
 
@@ -165,6 +171,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -369,6 +380,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -408,6 +426,9 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
 msgid "OLSR - Plugins"
 msgstr "OLSR - pluginy"
 
@@ -495,6 +516,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr "Zobrazit IPv4"
 
@@ -644,6 +671,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/cs/watchcat.po b/po/cs/watchcat.po
index 6711b84..1bfd435 100644
--- a/po/cs/watchcat.po
+++ b/po/cs/watchcat.po
@@ -52,17 +52,19 @@ msgstr "Interval opakování testu ping"
 msgid "Watchcat"
 msgstr "Watchcat"
 
+#, fuzzy
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 "Nástroj Watchcat umožňuje nastavit periodický interval restartu zařízení a/"
 "nebo provést restart i tehdy, když dojde ke ztrátě připojení k internetu/"
 "danému zařízení po stanovenou dobu"
 
+#, fuzzy
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
 "Pokud je nutno restartovat systém, provede Watchcat \"měkký\" restart "
diff --git a/po/cs/wol.po b/po/cs/wol.po
index d6df781..6ee7f67 100644
--- a/po/cs/wol.po
+++ b/po/cs/wol.po
@@ -27,8 +27,9 @@ msgstr "Adresa zařízení, které má být probuzeno"
 msgid "Network interface to use"
 msgstr "Použité síťové rozhraní"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 "Může se stát, že pro dané cílové zařízení bude fungovat pouze jeden z "
 "programů. Pokud první selže, vyzkoušejte další."
diff --git a/po/cs/wshaper.po b/po/cs/wshaper.po
index 3ebbe00..bca6c4e 100644
--- a/po/cs/wshaper.po
+++ b/po/cs/wshaper.po
@@ -47,9 +47,10 @@ msgstr "Wondershaper"
 msgid "Wondershaper settings"
 msgstr "Nastavení skriptu Wondershaper"
 
+#, fuzzy
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
 "Úkolem skriptu Wondershaper je řízení provozu na daném síťovém rozhraní. "
 "Snaží se zajistit nízké přenosové zpoždění pro \"interaktivní\" síťový "
diff --git a/po/de/ahcp.po b/po/de/ahcp.po
index b67349e..6df34d8 100644
--- a/po/de/ahcp.po
+++ b/po/de/ahcp.po
@@ -14,9 +14,10 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "AHCP Server"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/de/base.po b/po/de/base.po
index afbd2c7..4b33e32 100644
--- a/po/de/base.po
+++ b/po/de/base.po
@@ -837,8 +837,9 @@ msgstr "Hosts vervollständigen"
 msgid "Expires"
 msgstr "Verfällt"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "Gültigkeitsdauer von vergebenen Adressen. Das Minimum sind 2 Minuten "
 "(<code>2m</code>)."
@@ -1264,9 +1265,10 @@ msgid "Invalid username and/or password! Please try again."
 msgstr ""
 "Ungültiger Benutzername oder ungültiges Passwort! Bitte erneut versuchen. "
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "Das verwendete Image scheint zu groß für den internen Flash-Speicher zu "
 "sein. Überprüfen Sie die Imagedatei!"
@@ -1406,9 +1408,10 @@ msgstr "Lokale Zeit"
 msgid "Local domain"
 msgstr "Lokale Domain"
 
+#, fuzzy
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 "Spezifiziert den lokalen Domainnamen. Anfragen für Hostnamen welche auf "
 "diese Domain zutreffen werden nie weitergeleitet und ausschließlich aus DHCP-"
@@ -1979,19 +1982,20 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr "Sollen wirklich alle Änderungen verworfen werden?"
 
+#, fuzzy
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
-"Die Schnitstelle \"%s\" wirklich herunterfahren?\n"
+"Das Netzwerk wirklich herunterfahren?\n"
 "Der Zugriff auf das Gerät könnte verlorengehen wenn Sie über diese "
 "Schnittstelle verbunden sind."
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
-"Das Netzwerk wirklich herunterfahren?\n"
+"Die Schnitstelle \"%s\" wirklich herunterfahren?\n"
 "Der Zugriff auf das Gerät könnte verlorengehen wenn Sie über diese "
 "Schnittstelle verbunden sind."
 
@@ -2199,12 +2203,13 @@ msgstr "Service-Typ"
 msgid "Services"
 msgstr "Dienste"
 
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Zeitsynchronisierung einrichten"
+
 msgid "Setup DHCP Server"
 msgstr "DHCP Server einrichten"
 
-msgid "Setup Time Synchronization"
-msgstr "Zeitsynchronisierung einrichten"
-
 msgid "Show current backup file list"
 msgstr "Zeige aktuelle Liste der gesicherten Dateien"
 
@@ -2248,8 +2253,9 @@ msgid "Sorry, the server encountered an unexpected error."
 msgstr ""
 "Entschuldigung, auf dem Server ist ein unerwarteter Fehler aufgetreten."
 
+#, fuzzy
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2399,12 +2405,13 @@ msgstr "Ziel"
 msgid "Terminate"
 msgstr "Beenden"
 
+#, fuzzy
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 "Die <em>Gerätekonfiguration</em> deckt physikalische Einstellungen der WLAN-"
 "Hardware wie Kanal, Sendestärke oder Antennenauswahl ab. Diese Einstellungen "
@@ -2470,9 +2477,10 @@ msgstr "Die folgenden Regeln sind zur Zeit auf dem System aktiv."
 msgid "The given network name is not unique"
 msgstr "Der angebene Netzwerk-Name ist nicht eindeutig"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 "Die Hardware ist nicht Multi-SSID fähig und die existierende Konfiguration "
 "wird beim Fortfahren ersetzt."
@@ -2514,9 +2522,10 @@ msgstr ""
 "Die Einstellungen werden nun gelöscht! Anschließend wird ein Neustart des "
 "Systems durchgeführt."
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/de/firewall.po b/po/de/firewall.po
index 22f0c88..0e5ddcf 100644
--- a/po/de/firewall.po
+++ b/po/de/firewall.po
@@ -386,12 +386,13 @@ msgstr ""
 "Diese Seite bietet Zugriff auf die erweiterten Eigenschaften der "
 "Verkehrsregel, zum Beispiel die Selektion nach Quell- und Zieladressen."
 
+#, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 "Diese Sektion definiert allgemeine Eigenschaften der %q Zone. Die "
 "<em>Eingang</em> und <em>Ausgang</em> Optionen regeln die Verfahrensweise "
diff --git a/po/de/meshwizard.po b/po/de/meshwizard.po
index 478a472..87802be 100644
--- a/po/de/meshwizard.po
+++ b/po/de/meshwizard.po
@@ -69,9 +69,10 @@ msgstr "Mesh-IPv6-Adresse"
 msgid "Mesh Wizard"
 msgstr "Mesh-Assistent"
 
+#, fuzzy
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 "Hinweis: Dies konfiguriert die Schnittstelle für den Mesh-Betrieb, d.h. sie "
 "wird zur Freifunk-Zone hinzugefügt und OLSR eingerichtet."
diff --git a/po/de/olsr.po b/po/de/olsr.po
index c0da51e..8be91d7 100644
--- a/po/de/olsr.po
+++ b/po/de/olsr.po
@@ -53,6 +53,9 @@ msgstr "Broadcast-Adresse"
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -145,6 +148,10 @@ msgstr "HNA-Intervall"
 msgid "HNA validity time"
 msgstr "HNA-Gültigkeit"
 
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "HNA-Ankündigungen"
+
 msgid "Hello"
 msgstr "Hello"
 
@@ -179,6 +186,14 @@ msgstr ""
 "Rechner in einem OLSR-geroutetem Netzwerk können Konnektivität zu externen "
 "Netzwerken mittels HNA-Nachrichten ankündigen."
 
+#, fuzzy
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+"Rechner in einem OLSR-geroutetem Netzwerk können Konnektivität zu externen "
+"Netzwerken mittels HNA-Nachrichten ankündigen."
+
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
@@ -428,6 +443,18 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+#, fuzzy
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+"Multipliziere die Linkquality (LQ) für Routen mit dem hier angegebenen "
+"Faktor, der zwischen 0.01 und 1 liegen kann. Beispiele:<br />halbiere die LQ "
+"zu 192.168.0.1: 192.168.0.1 0.5<br />reduziere die LQ für alle Nodes die mit "
+"diesem Interface kommunizieren um 20%: default 0.8"
+
 msgid "NAT threshold"
 msgstr "NAT-Schwellenwert"
 
@@ -467,6 +494,10 @@ msgstr "OLSR - Anzeigeoptionen"
 msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - HNA-Ankündigungen"
 
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "OLSR - HNA-Ankündigungen"
+
 msgid "OLSR - Plugins"
 msgstr "OLSR - Plugins"
 
@@ -561,6 +592,16 @@ msgstr ""
 "NIEMALS während der Laufzeit von OLSRD verändern. Der Defaultwert ist "
 "0.0.0.0. Damit wird die IP des ersten Interfaces verwendet."
 
+#, fuzzy
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+"Setzt die Haupt-IP (originator ip) für diesen Router. Diese IP wird sich "
+"NIEMALS während der Laufzeit von OLSRD verändern. Der Defaultwert ist "
+"0.0.0.0. Damit wird die IP des ersten Interfaces verwendet."
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -739,6 +780,17 @@ msgstr ""
 "2000::/3). Der Defaultwert ist \"both\" (sowohl IPv4 als auch IPv6 Uplink "
 "ankündigen sofern verfügbar)."
 
+#, fuzzy
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+"Welche Art von Uplink im Mesh angekündigt wird. Ein Uplink wird automatisch "
+"anhand der lokal angekündigten HNA erkannt (0.0.0.0/0, ::ffff:0:0/96 oder "
+"2000::/3). Der Defaultwert ist \"both\" (sowohl IPv4 als auch IPv6 Uplink "
+"ankündigen sofern verfügbar)."
+
 msgid "Willingness"
 msgstr "Bereitschaft"
 
@@ -758,16 +810,5 @@ msgstr ""
 #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
 #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
 #~ msgstr ""
-#~ "Stellen Sie sicher das OLSRd läuft und das \"txtinfo\" Plugin auf Port 2006 "
-#~ "geladen und \"127.0.0.1\" als Accept-Host gesetzt ist."
-
-#~ msgid ""
-#~ "Multiply routes with the factor given here. Allowed values are between "
-#~ "0.01 and 1. It is only used when LQ-Level is greater than 0. Examples:"
-#~ "<br />reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to "
-#~ "all nodes on this interface by 20%: default 0.8"
-#~ msgstr ""
-#~ "Multipliziere die Linkquality (LQ) für Routen mit dem hier angegebenen "
-#~ "Faktor, der zwischen 0.01 und 1 liegen kann. Beispiele:<br />halbiere die LQ "
-#~ "zu 192.168.0.1: 192.168.0.1 0.5<br />reduziere die LQ für alle Nodes die "
-#~ "mit diesem Interface kommunizieren um 20%: default 0.8"
+#~ "Stellen Sie sicher das OLSRd läuft und das \"txtinfo\" Plugin auf Port "
+#~ "2006 geladen und \"127.0.0.1\" als Accept-Host gesetzt ist."
diff --git a/po/de/watchcat.po b/po/de/watchcat.po
index b82f876..1bbc6d5 100644
--- a/po/de/watchcat.po
+++ b/po/de/watchcat.po
@@ -52,16 +52,18 @@ msgstr "Ping-Zeitdauer"
 msgid "Watchcat"
 msgstr "Watchcat"
 
+#, fuzzy
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 "Watchcat erlaubt die Einstellung eines automatischen Neustarts, wenn die "
 "Internetverbindung eine bestimmte Zeitlang ausgefallen ist."
 
+#, fuzzy
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
 "Bei einem Neustart des Systems wird Watchcat einen Warmstart auslösen, wird "
diff --git a/po/de/wol.po b/po/de/wol.po
index aa396bc..21ebc8f 100644
--- a/po/de/wol.po
+++ b/po/de/wol.po
@@ -28,8 +28,9 @@ msgstr "Anzuschaltender Rechner"
 msgid "Network interface to use"
 msgstr "Verwendete Schnittstelle"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 "Manchmal funktioniert nur eines der beiden Programme. Wenn eines "
 "fehlschlägt, versuchen Sie das Andere."
diff --git a/po/de/wshaper.po b/po/de/wshaper.po
index 4168ec8..39dd617 100644
--- a/po/de/wshaper.po
+++ b/po/de/wshaper.po
@@ -48,9 +48,10 @@ msgstr "Wondershaper"
 msgid "Wondershaper settings"
 msgstr "Wondershaper Einstellungen"
 
+#, fuzzy
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
 "Wondershaper ermöglicht mit Hilfe von Traffic Shaping niedrige Latenzzeiten "
 "für interaktiven Internetverkehr selbst wenn die Internetverbindung extrem "
diff --git a/po/el/ahcp.po b/po/el/ahcp.po
index 682653b..0d7d6bd 100644
--- a/po/el/ahcp.po
+++ b/po/el/ahcp.po
@@ -16,7 +16,7 @@ msgstr "Εξυπηρετητής AHCP"
 
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/el/base.po b/po/el/base.po
index 9ff9b7a..e0ddba9 100644
--- a/po/el/base.po
+++ b/po/el/base.po
@@ -850,8 +850,9 @@ msgstr ""
 msgid "Expires"
 msgstr "Λήγει"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "Ο ελάχιστος χρόνος λήξεως των διευθύνσεων lease είναι 2 λεπτά (<code>2m</"
 "code>)."
@@ -1275,9 +1276,10 @@ msgstr ""
 msgid "Invalid username and/or password! Please try again."
 msgstr "Άκυρο όνομα χρήστη και/ή κωδικός πρόσβασης! Παρακαλώ προσπαθήστε ξανά."
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "Φαίνεται πως προσπαθείτε να φλασάρετε μια εικόνα που δεν χωράει στην μνήμη "
 "flash, παρακαλώ επιβεβαιώστε το αρχείο εικόνας!"
@@ -1414,8 +1416,8 @@ msgid "Local domain"
 msgstr ""
 
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
@@ -1971,13 +1973,13 @@ msgid "Really reset all changes?"
 msgstr "Αρχικοποίηση όλων των αλλαγών;"
 
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
 
 msgid "Really switch protocol?"
@@ -2183,12 +2185,12 @@ msgstr "Είδος Υπηρεσίας"
 msgid "Services"
 msgstr "Υπηρεσίες"
 
+msgid "Set up Time Synchronization"
+msgstr ""
+
 msgid "Setup DHCP Server"
 msgstr "Ρύθμιση Εξυπηρετητή DHCP"
 
-msgid "Setup Time Synchronization"
-msgstr ""
-
 msgid "Show current backup file list"
 msgstr ""
 
@@ -2232,7 +2234,7 @@ msgid "Sorry, the server encountered an unexpected error."
 msgstr ""
 
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2374,10 +2376,10 @@ msgstr "Τερματισμός"
 
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 
 msgid ""
@@ -2436,8 +2438,8 @@ msgid "The given network name is not unique"
 msgstr "Το παρεχόμενο όνομα δικτύου δεν είναι μοναδικό"
 
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 
 msgid ""
@@ -2465,9 +2467,10 @@ msgid ""
 "when finished."
 msgstr ""
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/el/firewall.po b/po/el/firewall.po
index e0f419a..dbd0b9e 100644
--- a/po/el/firewall.po
+++ b/po/el/firewall.po
@@ -369,7 +369,7 @@ msgid ""
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
 msgid "To %s at %s on <var>this device</var>"
diff --git a/po/el/meshwizard.po b/po/el/meshwizard.po
index b531eed..1aeff1e 100644
--- a/po/el/meshwizard.po
+++ b/po/el/meshwizard.po
@@ -66,8 +66,8 @@ msgid "Mesh Wizard"
 msgstr ""
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/el/olsr.po b/po/el/olsr.po
index b5485c1..a3cf0d2 100644
--- a/po/el/olsr.po
+++ b/po/el/olsr.po
@@ -52,6 +52,9 @@ msgstr ""
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr ""
 
@@ -134,6 +137,9 @@ msgstr ""
 msgid "HNA validity time"
 msgstr ""
 
+msgid "HNA6 Announcements"
+msgstr ""
+
 msgid "Hello"
 msgstr ""
 
@@ -167,6 +173,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -371,6 +382,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -410,6 +428,9 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
 msgid "OLSR - Plugins"
 msgstr ""
 
@@ -497,6 +518,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -646,6 +673,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/el/watchcat.po b/po/el/watchcat.po
index ceafe5d..4aa0c6b 100644
--- a/po/el/watchcat.po
+++ b/po/el/watchcat.po
@@ -42,12 +42,12 @@ msgid "Watchcat"
 msgstr ""
 
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
diff --git a/po/el/wol.po b/po/el/wol.po
index 811596c..cb7c3b9 100644
--- a/po/el/wol.po
+++ b/po/el/wol.po
@@ -26,7 +26,7 @@ msgid "Network interface to use"
 msgstr ""
 
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 
 msgid "Specifies the interface the WoL packet is sent on"
diff --git a/po/el/wshaper.po b/po/el/wshaper.po
index 5c73ae1..6d2f092 100644
--- a/po/el/wshaper.po
+++ b/po/el/wshaper.po
@@ -50,6 +50,6 @@ msgid "Wondershaper settings"
 msgstr ""
 
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
diff --git a/po/en/ahcp.po b/po/en/ahcp.po
index d5d5895..4ad2ab2 100644
--- a/po/en/ahcp.po
+++ b/po/en/ahcp.po
@@ -14,9 +14,10 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "AHCP Server"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/en/base.po b/po/en/base.po
index 2f44f8e..f270818 100644
--- a/po/en/base.po
+++ b/po/en/base.po
@@ -828,7 +828,7 @@ msgid "Expires"
 msgstr ""
 
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
 msgid "External"
@@ -1243,9 +1243,10 @@ msgstr ""
 msgid "Invalid username and/or password! Please try again."
 msgstr "Invalid username and/or password! Please try again."
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "It appears that you try to flash an image that does not fit into the flash "
 "memory, please verify the image file!"
@@ -1382,8 +1383,8 @@ msgid "Local domain"
 msgstr ""
 
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
@@ -1936,13 +1937,13 @@ msgid "Really reset all changes?"
 msgstr ""
 
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
 
 msgid "Really switch protocol?"
@@ -2146,10 +2147,10 @@ msgstr ""
 msgid "Services"
 msgstr "Services"
 
-msgid "Setup DHCP Server"
+msgid "Set up Time Synchronization"
 msgstr ""
 
-msgid "Setup Time Synchronization"
+msgid "Setup DHCP Server"
 msgstr ""
 
 msgid "Show current backup file list"
@@ -2195,7 +2196,7 @@ msgid "Sorry, the server encountered an unexpected error."
 msgstr ""
 
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2335,10 +2336,10 @@ msgstr "Terminate"
 
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 
 msgid ""
@@ -2395,8 +2396,8 @@ msgid "The given network name is not unique"
 msgstr ""
 
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 
 msgid ""
@@ -2424,9 +2425,10 @@ msgid ""
 "when finished."
 msgstr ""
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/en/firewall.po b/po/en/firewall.po
index 9f3f262..2684067 100644
--- a/po/en/firewall.po
+++ b/po/en/firewall.po
@@ -396,7 +396,7 @@ msgid ""
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
 msgid "To %s at %s on <var>this device</var>"
diff --git a/po/en/meshwizard.po b/po/en/meshwizard.po
index 180d771..a67c71f 100644
--- a/po/en/meshwizard.po
+++ b/po/en/meshwizard.po
@@ -51,8 +51,8 @@ msgid "Mesh Wizard"
 msgstr ""
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/en/olsr.po b/po/en/olsr.po
index 563fbdd..131005e 100644
--- a/po/en/olsr.po
+++ b/po/en/olsr.po
@@ -52,6 +52,9 @@ msgstr ""
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr ""
 
@@ -134,6 +137,10 @@ msgstr "HNA interval"
 msgid "HNA validity time"
 msgstr "HNA validity time"
 
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "OLSR - HNA-Announcements"
+
 msgid "Hello"
 msgstr ""
 
@@ -167,6 +174,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -371,6 +383,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -410,6 +429,10 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - HNA-Announcements"
 
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "OLSR - HNA-Announcements"
+
 msgid "OLSR - Plugins"
 msgstr "OLSR - Plugins"
 
@@ -497,6 +520,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -646,6 +675,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr "Willingness"
 
@@ -662,5 +697,5 @@ msgstr ""
 #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
 #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
 #~ msgstr ""
-#~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, configured "
-#~ "on port 2006 and accepts connections from \"127.0.0.1\"."
+#~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
+#~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
diff --git a/po/en/watchcat.po b/po/en/watchcat.po
index 18d19be..0f9099c 100644
--- a/po/en/watchcat.po
+++ b/po/en/watchcat.po
@@ -47,16 +47,18 @@ msgstr "Ping period"
 msgid "Watchcat"
 msgstr "Watchcat"
 
+#, fuzzy
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 "Watchcat allows to configure a periodic reboot and/or when internet "
 "connection has been lost for a certain period of time."
 
+#, fuzzy
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
 "When rebooting the system the watchcat will trigger a soft reboot, Entering "
diff --git a/po/en/wol.po b/po/en/wol.po
index 0df5a64..48c7302 100644
--- a/po/en/wol.po
+++ b/po/en/wol.po
@@ -23,8 +23,9 @@ msgstr "Host to wake up"
 msgid "Network interface to use"
 msgstr "Network interface to use"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 "Sometimes only one of both tools work. If one of fails, try the other one"
 
diff --git a/po/en/wshaper.po b/po/en/wshaper.po
index 4eee2b6..d646e76 100644
--- a/po/en/wshaper.po
+++ b/po/en/wshaper.po
@@ -35,6 +35,6 @@ msgid "Wondershaper settings"
 msgstr ""
 
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
diff --git a/po/es/ahcp.po b/po/es/ahcp.po
index 06eb5b1..512606a 100644
--- a/po/es/ahcp.po
+++ b/po/es/ahcp.po
@@ -14,16 +14,17 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "Servidor AHCP"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
-"AHCP es un protocolo de autoconfiguración para redes con IPv6 o duales "
-"IPv6/IPv4 diseñado para ser usado en lugar de router discovery o DHCP en "
-"redes en las que es difícil o imposible configurar un servidor en cada capa "
-"de enlace del dominio de propagación como las redes móviles ad-hoc."
+"AHCP es un protocolo de autoconfiguración para redes con IPv6 o duales IPv6/"
+"IPv4 diseñado para ser usado en lugar de router discovery o DHCP en redes en "
+"las que es difícil o imposible configurar un servidor en cada capa de enlace "
+"del dominio de propagación como las redes móviles ad-hoc."
 
 # "Lease" en el sentido usado en DHCP no tiene una traducción clara en español y se puede usar la misma palabra en que en inglés.
 msgid "Active AHCP Leases"
diff --git a/po/es/base.po b/po/es/base.po
index 84e8902..fb35d64 100644
--- a/po/es/base.po
+++ b/po/es/base.po
@@ -846,8 +846,9 @@ msgstr "Expandir nombre de máquina"
 msgid "Expires"
 msgstr "Expira"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "Tiempo de finalización de direcciones cedidas (mínimo dos minutos: <code>2m</"
 "code>)."
@@ -1276,9 +1277,10 @@ msgid "Invalid username and/or password! Please try again."
 msgstr ""
 "¡Nombre de usuario o contraseña no válidos!. Pruebe de nuevo, por favor."
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "Parece que está intentando grabar una imagen de firmware mayor que la "
 "memoria flash de su equipo. ¡Por favor, verifique el archivo!"
@@ -1416,9 +1418,10 @@ msgstr "Hora local"
 msgid "Local domain"
 msgstr "Dominio local"
 
+#, fuzzy
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 "Especificación de dominio local. Los nombres que coincidan con este dominio "
 "nunca se retransmiten y se resuelven desde DHCP o ficheros de máquina locales"
@@ -1986,6 +1989,14 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr "¿Está seguro de querer reiniciar todos los cambios?"
 
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"¿Está seguro de querer apagar esta red?.\n"
+"Puede perder el acceso a este dispositivo si está conectado por esta red."
+
 msgid ""
 "Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
 "you are connected via this interface."
@@ -1993,13 +2004,6 @@ msgstr ""
 "¿Está seguro de apagar la interfaz \"%s\"?.\n"
 "Puede perder el acceso a este dispositivo si está conectado por interfaz."
 
-msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
-msgstr ""
-"¿Está seguro de querer apagar esta red?.\n"
-"Puede perder el acceso a este dispositivo si está conectado por esta red."
-
 msgid "Really switch protocol?"
 msgstr "¿Está seguro de querer cambiar el protocolo?"
 
@@ -2203,12 +2207,13 @@ msgstr "Tipo de servicio"
 msgid "Services"
 msgstr "Servicios"
 
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Sincronización horaria"
+
 msgid "Setup DHCP Server"
 msgstr "Configuración del servidor DHCP"
 
-msgid "Setup Time Synchronization"
-msgstr "Sincronización horaria"
-
 msgid "Show current backup file list"
 msgstr "Mostrar lista de ficheros a salvar"
 
@@ -2251,8 +2256,9 @@ msgstr "Objeto no encontrado."
 msgid "Sorry, the server encountered an unexpected error."
 msgstr "El servidor encontró un error inesperado."
 
+#, fuzzy
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2403,12 +2409,13 @@ msgstr "Objetivo"
 msgid "Terminate"
 msgstr "Terminar"
 
+#, fuzzy
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 "La sección de <em>Configuración del dispositivo</em> ocupa la configuración "
 "física del hardware de radio como el canal, la potencia de transmisión o la "
@@ -2478,9 +2485,10 @@ msgstr "Rutas activas."
 msgid "The given network name is not unique"
 msgstr "Nombre de red repetido"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 "El hardware no es capaz de multi-SSD y la configuración actual se cambiará "
 "si continúa."
@@ -2519,9 +2527,10 @@ msgstr ""
 "El sistema está borrando la partición de configuración y rearrancará cuando "
 "termine."
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/es/firewall.po b/po/es/firewall.po
index 1e92a7f..452809c 100644
--- a/po/es/firewall.po
+++ b/po/es/firewall.po
@@ -385,12 +385,13 @@ msgstr ""
 "Propiedades avanzadas de la entrada \"reglas de tráfico\", como "
 "coincidencias en puertos de origen y destino."
 
+#, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 "Esta sección define propierdades comunes de %q. Las opciones de <em>entrada</"
 "em> y la <em>salida</em> marcan las políticas por defecto para el tráfico "
diff --git a/po/es/meshwizard.po b/po/es/meshwizard.po
index ff2bc91..9471d42 100644
--- a/po/es/meshwizard.po
+++ b/po/es/meshwizard.po
@@ -65,9 +65,10 @@ msgstr "Dirección IPv6 del mesh"
 msgid "Mesh Wizard"
 msgstr "Asistente del mesh"
 
+#, fuzzy
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 "Nota: esto configurará esta interfaz para uso mesh, es decir: la añadirá a "
 "la zona \"freifunk\" y activará OSLR."
diff --git a/po/es/olsr.po b/po/es/olsr.po
index b165581..0e161bd 100644
--- a/po/es/olsr.po
+++ b/po/es/olsr.po
@@ -52,6 +52,10 @@ msgstr "Dirección de propagación"
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr "Sólo puede ser una dirección IPv4 o IPv6 válidas o \"por defecto\""
 
+#, fuzzy
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr "Sólo puede ser una dirección IPv4 o IPv6 válidas o \"por defecto\""
+
 msgid "Configuration"
 msgstr "Configuración"
 
@@ -144,6 +148,10 @@ msgstr "Intervalo HNA"
 msgid "HNA validity time"
 msgstr "Tiempo de validez de HNA"
 
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "Declaraciones HNA"
+
 msgid "Hello"
 msgstr "Saludo"
 
@@ -178,6 +186,14 @@ msgstr ""
 "Las máquinas de una red OLSR pueden declarar conectividad con redes externas "
 "usando mensajes HNA."
 
+#, fuzzy
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+"Las máquinas de una red OLSR pueden declarar conectividad con redes externas "
+"usando mensajes HNA."
+
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
@@ -414,8 +430,9 @@ msgid ""
 "Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
-"Asegúrese de que OLSRd funciona y de que el plugin \"jsoninfo\" está cargado, "
-"configurado en el puerto 9090 y que acepta conexiones desde 127.0.0.1."
+"Asegúrese de que OLSRd funciona y de que el plugin \"jsoninfo\" está "
+"cargado, configurado en el puerto 9090 y que acepta conexiones desde "
+"127.0.0.1."
 
 msgid "Metric"
 msgstr "Métrica"
@@ -430,9 +447,21 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 "Multiplicar las rutas con el factor dado aquí. Los valores permitidos está "
-"entre 0,01 y 1,0. Se usa sólo cuando el nivel LQ es mayor que 0. "
-"Ejemplos:<br />reducir LQ a 192.168.0.1 por la mitad: 192.168.0.1 0,5<br "
-"/>reducir LQ a todos los nodos de esta interfaz el 20%: default 0,8"
+"entre 0,01 y 1,0. Se usa sólo cuando el nivel LQ es mayor que 0. Ejemplos:"
+"<br />reducir LQ a 192.168.0.1 por la mitad: 192.168.0.1 0,5<br />reducir LQ "
+"a todos los nodos de esta interfaz el 20%: default 0,8"
+
+#, fuzzy
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+"Multiplicar las rutas con el factor dado aquí. Los valores permitidos está "
+"entre 0,01 y 1,0. Se usa sólo cuando el nivel LQ es mayor que 0. Ejemplos:"
+"<br />reducir LQ a 192.168.0.1 por la mitad: 192.168.0.1 0,5<br />reducir LQ "
+"a todos los nodos de esta interfaz el 20%: default 0,8"
 
 msgid "NAT threshold"
 msgstr "Umbral NAT"
@@ -473,6 +502,10 @@ msgstr "OLSR - Mostrar opciones"
 msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - Declaraciones HNA"
 
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "OLSR - Declaraciones HNA"
+
 msgid "OLSR - Plugins"
 msgstr "OLSR - Plugins"
 
@@ -566,6 +599,16 @@ msgstr ""
 "cambiar mientras OLSRd esté activa. Por defecto es \"0.0.0.0\" que provoca "
 "el uso de la IP del primer interfaz."
 
+#, fuzzy
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+"Configura la dirección IP principal (IP originadora) del router. NUNCA debe "
+"cambiar mientras OLSRd esté activa. Por defecto es \"0.0.0.0\" que provoca "
+"el uso de la IP del primer interfaz."
+
 msgid "Show IPv4"
 msgstr "Mostrar IPv4"
 
@@ -742,6 +785,16 @@ msgstr ""
 "buscando una HNA local de 0.0.0.0/0, ::ffff:0:0/96 o 2000::/3. Por defecto "
 "\"both\"."
 
+#, fuzzy
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+"Tipo de enlace exportado a otros nodos del mesh. Un enlace se detecta "
+"buscando una HNA local de 0.0.0.0/0, ::ffff:0:0/96 o 2000::/3. Por defecto "
+"\"both\"."
+
 msgid "Willingness"
 msgstr "Willingness"
 
@@ -771,7 +824,7 @@ msgstr "sí"
 #~ "<br />reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to "
 #~ "all nodes on this interface by 20%: default 0.8"
 #~ msgstr ""
-#~ "Multiplicar rutas por este factor. Valores entre 0,01 y 1. Sólo se usa si el "
-#~ "nivel de CA es mayor que 0. Ejemplos:<br />reducir CE a la mitad a "
-#~ "192.168.0.1: \"192.168.0.1 0.5\"<br />reducir CE a todos los nodos en esta "
-#~ "interfaz el 20%: \"default 0.8\""
+#~ "Multiplicar rutas por este factor. Valores entre 0,01 y 1. Sólo se usa si "
+#~ "el nivel de CA es mayor que 0. Ejemplos:<br />reducir CE a la mitad a "
+#~ "192.168.0.1: \"192.168.0.1 0.5\"<br />reducir CE a todos los nodos en "
+#~ "esta interfaz el 20%: \"default 0.8\""
diff --git a/po/es/watchcat.po b/po/es/watchcat.po
index 54fcead..c1f58fe 100644
--- a/po/es/watchcat.po
+++ b/po/es/watchcat.po
@@ -50,16 +50,18 @@ msgstr "Período de ping"
 msgid "Watchcat"
 msgstr "Watchcat"
 
+#, fuzzy
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 "Watchcat permite configurar un reinicio periódico si la conexión a internet "
 "si pierde durante un cierto tiempo."
 
+#, fuzzy
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
 "Watchcat provocará por defecto un reinicio suave. Poniendo un valor mayor "
diff --git a/po/es/wol.po b/po/es/wol.po
index c2d1b89..f5bcf6b 100644
--- a/po/es/wol.po
+++ b/po/es/wol.po
@@ -27,8 +27,9 @@ msgstr "Máquina a despertar"
 msgid "Network interface to use"
 msgstr "Interfaz de red a utilizar"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 "A veces, sólo se inicia una de las dos herramientas. Si una falla, intente "
 "con la otra"
diff --git a/po/es/wshaper.po b/po/es/wshaper.po
index f586cb4..f562760 100644
--- a/po/es/wshaper.po
+++ b/po/es/wshaper.po
@@ -49,9 +49,10 @@ msgstr "Wondershaper"
 msgid "Wondershaper settings"
 msgstr "Configuración de Wondershaper"
 
+#, fuzzy
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
 "Wondershaper modela el tráfico para asegurar latencias bajas al tráfico "
 "interactivo incluso cuando la conexión a Internet esté muy saturada."
diff --git a/po/fr/ahcp.po b/po/fr/ahcp.po
index 6e3b281..1163518 100644
--- a/po/fr/ahcp.po
+++ b/po/fr/ahcp.po
@@ -14,9 +14,10 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "Serveur AHCP"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/fr/base.po b/po/fr/base.po
index 6fcd2a3..1674918 100644
--- a/po/fr/base.po
+++ b/po/fr/base.po
@@ -859,8 +859,9 @@ msgstr "Étendre le nom d'hôte"
 msgid "Expires"
 msgstr "Expire"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "Délai d'expiration des adresses allouées, le minimum est de 2 minutes "
 "(<code>2m</code>)."
@@ -1287,9 +1288,10 @@ msgstr ""
 msgid "Invalid username and/or password! Please try again."
 msgstr "Nom d'utilisateur et/ou mot de passe invalides ! Réessayez !"
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "Il semble que vous essayez de programmer votre routeur avec une image qui ne "
 "tient pas dans sa mémoire flash, vérifiez s'il vous plait votre fichier-"
@@ -1429,9 +1431,10 @@ msgstr "Heure Locale"
 msgid "Local domain"
 msgstr "Domaine local"
 
+#, fuzzy
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 "Domaine local à préciser. Les noms correspondants à ce domaine ne sont "
 "jamais transmis, mais résolus seulement depuis le serveur DHCP ou le fichier "
@@ -1999,19 +2002,20 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr "Voulez-vous vraiment ré-initialiser toutes les modifications ?"
 
+#, fuzzy
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
-"Voulez-vous vraiment arrêter l'interface %s ?\n"
+"Voulez-vous vraiment arrêter l'interface %s ?\n"
 "Vous pourriez perdre l'accès à l'équipement si vous y êtes connecté par "
 "cette interface."
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
-"Voulez-vous vraiment arrêter l'interface %s ?\n"
+"Voulez-vous vraiment arrêter l'interface %s ?\n"
 "Vous pourriez perdre l'accès à l'équipement si vous y êtes connecté par "
 "cette interface."
 
@@ -2219,12 +2223,13 @@ msgstr "Type du service"
 msgid "Services"
 msgstr "Services"
 
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Configurer la synchronisation de l'heure"
+
 msgid "Setup DHCP Server"
 msgstr "Configurer le serveur DHCP"
 
-msgid "Setup Time Synchronization"
-msgstr "Configurer la synchronisation de l'heure"
-
 msgid "Show current backup file list"
 msgstr "Afficher la liste des fichiers de la sauvegarde actuelle"
 
@@ -2267,8 +2272,9 @@ msgstr "Désolé, l'objet que vous avez demandé n'as pas été trouvé."
 msgid "Sorry, the server encountered an unexpected error."
 msgstr "Désolé, le serveur à rencontré une erreur inattendue."
 
+#, fuzzy
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2416,12 +2422,13 @@ msgstr "Cible"
 msgid "Terminate"
 msgstr "Terminer"
 
+#, fuzzy
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 "La section <em>Configuration de l'équipement</em> couvre les paramètres "
 "physiques du matériel radio comme le canal, la puissance d'émission ou la "
@@ -2490,9 +2497,10 @@ msgstr "Les règles suivantes sont actuellement actives sur ce système."
 msgid "The given network name is not unique"
 msgstr "Le nom de réseau donné n'est pas unique"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 "Le matériel ne sait pas gérer plusieurs SSID et la configuration existante "
 "sera remplacée si vous continuez."
@@ -2533,9 +2541,10 @@ msgstr ""
 "Le système est en train d'effacer la partition de configuration et "
 "redémarrera tout seul une fois cela fini."
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/fr/firewall.po b/po/fr/firewall.po
index befc317..96f3f51 100644
--- a/po/fr/firewall.po
+++ b/po/fr/firewall.po
@@ -410,12 +410,13 @@ msgid ""
 "entry, such as matched source and destination hosts."
 msgstr ""
 
+#, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 "Cette section définit des propriétés communes de %q. Les options <em>entrée</"
 "em> et <em>sortie</em> définissent les politiques par défaut pour le trafic "
diff --git a/po/fr/meshwizard.po b/po/fr/meshwizard.po
index 2c2f312..c9f7b02 100644
--- a/po/fr/meshwizard.po
+++ b/po/fr/meshwizard.po
@@ -68,8 +68,8 @@ msgid "Mesh Wizard"
 msgstr "Assistant de Maillage"
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/fr/olsr.po b/po/fr/olsr.po
index 8e8f9b1..e93a6bd 100644
--- a/po/fr/olsr.po
+++ b/po/fr/olsr.po
@@ -52,6 +52,9 @@ msgstr ""
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr ""
 
@@ -134,6 +137,9 @@ msgstr ""
 msgid "HNA validity time"
 msgstr ""
 
+msgid "HNA6 Announcements"
+msgstr ""
+
 msgid "Hello"
 msgstr ""
 
@@ -167,6 +173,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -371,6 +382,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -410,6 +428,9 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
 msgid "OLSR - Plugins"
 msgstr ""
 
@@ -497,6 +518,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -646,6 +673,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/fr/watchcat.po b/po/fr/watchcat.po
index 9c9ff04..23af469 100644
--- a/po/fr/watchcat.po
+++ b/po/fr/watchcat.po
@@ -42,12 +42,12 @@ msgid "Watchcat"
 msgstr ""
 
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
diff --git a/po/fr/wol.po b/po/fr/wol.po
index a7815a5..0bed86d 100644
--- a/po/fr/wol.po
+++ b/po/fr/wol.po
@@ -27,8 +27,9 @@ msgstr "Hôte à réveiller"
 msgid "Network interface to use"
 msgstr "Interface réseau à utiliser"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 "Parfois seul un des deux outils fonctionne. Si l'un échoue, essayez l'autre"
 
diff --git a/po/he/ahcp.po b/po/he/ahcp.po
index 7ae52f9..1c45cc8 100644
--- a/po/he/ahcp.po
+++ b/po/he/ahcp.po
@@ -18,7 +18,7 @@ msgstr "שרת AHCP"
 #, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/he/base.po b/po/he/base.po
index 2a3ca86..56f81d0 100644
--- a/po/he/base.po
+++ b/po/he/base.po
@@ -814,7 +814,7 @@ msgid "Expires"
 msgstr ""
 
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
 msgid "External"
@@ -1223,8 +1223,8 @@ msgid "Invalid username and/or password! Please try again."
 msgstr "שם משתמש ו/או סיסמה שגויים! אנא נסה שנית."
 
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 
 msgid "Java Script required!"
@@ -1359,8 +1359,8 @@ msgid "Local domain"
 msgstr ""
 
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
@@ -1902,14 +1902,17 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr ""
 
+#, fuzzy
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
+"האם למחוק את הרשת האלחוטית הזו? המחיקה אינה ניתנת לביטול!\n"
+"ייתכן ותאבד גישה לנתב הזה אם אתה מחובר דרך השרת הזו."
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
 
 msgid "Really switch protocol?"
@@ -2111,10 +2114,11 @@ msgstr ""
 msgid "Services"
 msgstr "שירותים"
 
-msgid "Setup DHCP Server"
-msgstr ""
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "סנכרון זמן"
 
-msgid "Setup Time Synchronization"
+msgid "Setup DHCP Server"
 msgstr ""
 
 msgid "Show current backup file list"
@@ -2159,8 +2163,9 @@ msgstr "סליחה, אך האובייקט שביקשת אינו נמצא."
 msgid "Sorry, the server encountered an unexpected error."
 msgstr "סליחה, השרת נתקל בשגיאה לא צפויה."
 
+#, fuzzy
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2305,10 +2310,10 @@ msgstr ""
 
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 
 msgid ""
@@ -2359,9 +2364,10 @@ msgstr "החוקים הבאים מאופשרים כרגע במערכת זו."
 msgid "The given network name is not unique"
 msgstr "השם שניתן לרשת איננו ייחודי"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr "החומרה אינה תומכת בריבוי SSID ולכן ההגדרות הנוכחיות יוחלפו אם תמשיך."
 
 msgid ""
@@ -2391,7 +2397,7 @@ msgstr ""
 
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
@@ -2923,12 +2929,5 @@ msgstr "<< אחורה"
 #~ msgid "Wifi networks in your local environment"
 #~ msgstr "רשתות Wifi בסביבתך"
 
-#~ msgid ""
-#~ "Really delete this wireless network? The deletion cannot be undone!\\nYou "
-#~ "might lose access to this router if you are connected via this network."
-#~ msgstr ""
-#~ "האם למחוק את הרשת האלחוטית הזו? המחיקה אינה ניתנת לביטול!\n"
-#~ "ייתכן ותאבד גישה לנתב הזה אם אתה מחובר דרך השרת הזו."
-
 #~ msgid "static"
 #~ msgstr "סטטי"
diff --git a/po/he/firewall.po b/po/he/firewall.po
index c904905..aec566a 100644
--- a/po/he/firewall.po
+++ b/po/he/firewall.po
@@ -354,7 +354,7 @@ msgid ""
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
 msgid "To %s at %s on <var>this device</var>"
diff --git a/po/he/meshwizard.po b/po/he/meshwizard.po
index f887a89..acf5f10 100644
--- a/po/he/meshwizard.po
+++ b/po/he/meshwizard.po
@@ -61,8 +61,8 @@ msgid "Mesh Wizard"
 msgstr ""
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/he/olsr.po b/po/he/olsr.po
index d6853de..38aa43b 100644
--- a/po/he/olsr.po
+++ b/po/he/olsr.po
@@ -47,6 +47,9 @@ msgstr ""
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr ""
 
@@ -129,6 +132,9 @@ msgstr ""
 msgid "HNA validity time"
 msgstr ""
 
+msgid "HNA6 Announcements"
+msgstr ""
+
 msgid "Hello"
 msgstr ""
 
@@ -162,6 +168,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -366,6 +377,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -405,6 +423,9 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
 msgid "OLSR - Plugins"
 msgstr ""
 
@@ -492,6 +513,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -641,6 +668,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/he/watchcat.po b/po/he/watchcat.po
index ceafe5d..4aa0c6b 100644
--- a/po/he/watchcat.po
+++ b/po/he/watchcat.po
@@ -42,12 +42,12 @@ msgid "Watchcat"
 msgstr ""
 
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
diff --git a/po/he/wol.po b/po/he/wol.po
index 811596c..cb7c3b9 100644
--- a/po/he/wol.po
+++ b/po/he/wol.po
@@ -26,7 +26,7 @@ msgid "Network interface to use"
 msgstr ""
 
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 
 msgid "Specifies the interface the WoL packet is sent on"
diff --git a/po/he/wshaper.po b/po/he/wshaper.po
index 4eee2b6..d646e76 100644
--- a/po/he/wshaper.po
+++ b/po/he/wshaper.po
@@ -35,6 +35,6 @@ msgid "Wondershaper settings"
 msgstr ""
 
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
diff --git a/po/hu/ahcp.po b/po/hu/ahcp.po
index 3826a8d..a0a91be 100644
--- a/po/hu/ahcp.po
+++ b/po/hu/ahcp.po
@@ -14,9 +14,10 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "AHCP kiszolgáló"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/hu/base.po b/po/hu/base.po
index aa09e20..6fb8e18 100644
--- a/po/hu/base.po
+++ b/po/hu/base.po
@@ -849,8 +849,9 @@ msgstr "Gépek kibontása"
 msgid "Expires"
 msgstr "Lejárat"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr "A bérelt címek lejárati ideje, a minimális érték 2 perc."
 
 msgid "External"
@@ -1276,9 +1277,10 @@ msgstr ""
 msgid "Invalid username and/or password! Please try again."
 msgstr "Érvénytelen felhasználói név és/vagy jelszó! Kérem próbálja újra!"
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "Úgy tűnik, hogy a flash-elendő kép-file nem fér el a Flash-memóriába. Kérem "
 "ellenőrizze a kép fájlt!"
@@ -1418,9 +1420,10 @@ msgstr "Helyi idő"
 msgid "Local domain"
 msgstr "Helyi tartomány"
 
+#, fuzzy
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 "Helyi tartomány meghatározása. Az ezzel a tartománnyal egyező nevek soha "
 "nincsenek továbbítva és csak DHCP-n vagy host fájlok által kerülnek "
@@ -1988,6 +1991,15 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr "Biztos, hogy visszavonja az összes módosítást?"
 
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"Biztos, hogy leállítja a hálózatot?!\n"
+" Lehet, hogy elveszti a hozzáférést az eszközhöz, amennyiben ezen a "
+"hálózaton keresztül kapcsolódik."
+
 msgid ""
 "Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
 "you are connected via this interface."
@@ -1996,14 +2008,6 @@ msgstr ""
 " Lehet, hogy elveszti a hozzáférést az eszközhöz, amennyiben ezen az "
 "interfészen keresztül kapcsolódik."
 
-msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
-msgstr ""
-"Biztos, hogy leállítja a hálózatot?!\n"
-" Lehet, hogy elveszti a hozzáférést az eszközhöz, amennyiben ezen a "
-"hálózaton keresztül kapcsolódik."
-
 msgid "Really switch protocol?"
 msgstr "Biztos, hogy cserélni szeretné a protokollt?"
 
@@ -2208,12 +2212,13 @@ msgstr "Szolgáltatás típusa"
 msgid "Services"
 msgstr "Szolgáltatások"
 
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Idő szinkronizálás beállítása"
+
 msgid "Setup DHCP Server"
 msgstr "DHCP kiszolgáló beállítása"
 
-msgid "Setup Time Synchronization"
-msgstr "Idő szinkronizálás beállítása"
-
 msgid "Show current backup file list"
 msgstr "Mentendő fájlok aktuális listájának megjelenítése"
 
@@ -2256,8 +2261,9 @@ msgstr "Sajnálom, a kért objektum nem található."
 msgid "Sorry, the server encountered an unexpected error."
 msgstr "Sajnálom, a szerver váratlan hibát észlelt."
 
+#, fuzzy
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2405,12 +2411,13 @@ msgstr "Cél"
 msgid "Terminate"
 msgstr "Megszakítás"
 
+#, fuzzy
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 "Az <em>Eszköz beállítások</em> szakasz a rádió hardver fizikai beállításait, "
 "úgymint csatorna, adóteljesítmény vagy antenna választás teszi lehetővé, "
@@ -2480,9 +2487,10 @@ msgstr "Jelenleg a következő szabályok aktívak a rendszeren."
 msgid "The given network name is not unique"
 msgstr "A megadott hálózati név már létezik"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 "A hardver nem képes többszörös SSID kezelésre ezért a meglévő beállítások "
 "elvesznek ha folytatja."
@@ -2520,9 +2528,10 @@ msgid ""
 "when finished."
 msgstr "A rendszer most törli a konfigurációs partíciót majd újraindul."
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/hu/firewall.po b/po/hu/firewall.po
index 5468800..1c0ec5e 100644
--- a/po/hu/firewall.po
+++ b/po/hu/firewall.po
@@ -389,12 +389,13 @@ msgstr ""
 "Ez a lap lehetővé teszi a forgalmi szabály bejegyzés speciális "
 "tulajdonságainak módosítását, mint a forrás- és célgépek megfeleltetése."
 
+#, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 "Ez a rész a(z) %q általános beállításait határozza meg. A <em>bejövő</em> és "
 "<em>kimenő</em> beállítások határozzák meg a zónába be- és kilépő forgalom "
diff --git a/po/hu/meshwizard.po b/po/hu/meshwizard.po
index 0c7dcd6..22aecce 100644
--- a/po/hu/meshwizard.po
+++ b/po/hu/meshwizard.po
@@ -64,8 +64,8 @@ msgid "Mesh Wizard"
 msgstr ""
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/hu/olsr.po b/po/hu/olsr.po
index d6853de..38aa43b 100644
--- a/po/hu/olsr.po
+++ b/po/hu/olsr.po
@@ -47,6 +47,9 @@ msgstr ""
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr ""
 
@@ -129,6 +132,9 @@ msgstr ""
 msgid "HNA validity time"
 msgstr ""
 
+msgid "HNA6 Announcements"
+msgstr ""
+
 msgid "Hello"
 msgstr ""
 
@@ -162,6 +168,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -366,6 +377,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -405,6 +423,9 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
 msgid "OLSR - Plugins"
 msgstr ""
 
@@ -492,6 +513,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -641,6 +668,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/hu/watchcat.po b/po/hu/watchcat.po
index f060346..253eb77 100644
--- a/po/hu/watchcat.po
+++ b/po/hu/watchcat.po
@@ -53,12 +53,12 @@ msgid "Watchcat"
 msgstr ""
 
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
diff --git a/po/hu/wol.po b/po/hu/wol.po
index a3b18cc..f47191c 100644
--- a/po/hu/wol.po
+++ b/po/hu/wol.po
@@ -29,8 +29,9 @@ msgstr "Felélesztendő gép"
 msgid "Network interface to use"
 msgstr "Használandó interfész"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 "Néha csak az egyik eszköz működik. Ha valamelyik nem működik, próbálja ki a "
 "másikat."
diff --git a/po/hu/wshaper.po b/po/hu/wshaper.po
index d9d843c..2377fa5 100644
--- a/po/hu/wshaper.po
+++ b/po/hu/wshaper.po
@@ -44,9 +44,10 @@ msgstr "Wondershaper"
 msgid "Wondershaper settings"
 msgstr "Wondershaper beállítások"
 
+#, fuzzy
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
 "A Wondershaper 'traffic shaping'-et használatával biztosítja az interaktív "
 "forgalom alacsony késleletetését még akkor is ha az internet kapcsolat "
diff --git a/po/it/ahcp.po b/po/it/ahcp.po
index 3b673cc..56d9516 100644
--- a/po/it/ahcp.po
+++ b/po/it/ahcp.po
@@ -14,9 +14,10 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "Server AHCP"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/it/base.po b/po/it/base.po
index 7560c07..bab990d 100644
--- a/po/it/base.po
+++ b/po/it/base.po
@@ -850,8 +850,9 @@ msgstr "Espandi gli hosts"
 msgid "Expires"
 msgstr "Scadenze"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "Tempo di scadenza di indirizzi localizzati, il minimo è di 2 minuti (<code> "
 "2m </ code>)."
@@ -1279,9 +1280,10 @@ msgstr "ID VLAN non valido! Solo gli ID unici sono consentiti"
 msgid "Invalid username and/or password! Please try again."
 msgstr "Username o password non validi! Per favore riprova."
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "Sembra tu stia provando a flashare un'immagine più grande delle dimensioni "
 "della memoria flash, per favore controlla il file!"
@@ -1419,9 +1421,10 @@ msgstr "Ora locale"
 msgid "Local domain"
 msgstr "Dominio Locale"
 
+#, fuzzy
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 "Specifiche dominio locale. I nomi di dominio corrispondenti a questi criteri "
 "non sono mai inoltrate e risolti solo da DHCP o file hosts"
@@ -1977,14 +1980,17 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr ""
 
+#, fuzzy
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
+"Vuoi davvero spegnere questa interfaccia \"%s\" ?\\nPotresti perdere "
+"l'accesso a questo router se stai usando questa interfaccia."
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
 
 msgid "Really switch protocol?"
@@ -2188,10 +2194,10 @@ msgstr ""
 msgid "Services"
 msgstr "Servizi"
 
-msgid "Setup DHCP Server"
+msgid "Set up Time Synchronization"
 msgstr ""
 
-msgid "Setup Time Synchronization"
+msgid "Setup DHCP Server"
 msgstr ""
 
 msgid "Show current backup file list"
@@ -2236,8 +2242,9 @@ msgstr "Siamo spiacenti, l'oggetto che hai richiesto non è stato trovato."
 msgid "Sorry, the server encountered an unexpected error."
 msgstr "Spiacente, il server ha rilevato un errore imprevisto."
 
+#, fuzzy
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2387,12 +2394,13 @@ msgstr "Destinazione"
 msgid "Terminate"
 msgstr "Termina"
 
+#, fuzzy
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 "La sezione <em>Configurazione del Dispositivo</em> illustra le impostazioni "
 "fisiche del hardware radio come canale, la potenza di trasmissione o la "
@@ -2458,8 +2466,8 @@ msgid "The given network name is not unique"
 msgstr ""
 
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 
 msgid ""
@@ -2487,9 +2495,10 @@ msgid ""
 "when finished."
 msgstr ""
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
@@ -3166,13 +3175,6 @@ msgstr "« Indietro"
 #~ "\\nPotresti perdere l'accesso a questo router se stai usando questa rete."
 
 #~ msgid ""
-#~ "Really shutdown interface \"%s\" ?\\nYou might lose access to this router "
-#~ "if you are connected via this interface."
-#~ msgstr ""
-#~ "Vuoi davvero spegnere questa interfaccia \"%s\" ?\\nPotresti perdere "
-#~ "l'accesso a questo router se stai usando questa interfaccia."
-
-#~ msgid ""
 #~ "The network ports on your router can be combined to several <abbr title="
 #~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
 #~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
diff --git a/po/it/firewall.po b/po/it/firewall.po
index 2d68426..2f87efc 100644
--- a/po/it/firewall.po
+++ b/po/it/firewall.po
@@ -384,7 +384,7 @@ msgid ""
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
 msgid "To %s at %s on <var>this device</var>"
diff --git a/po/it/meshwizard.po b/po/it/meshwizard.po
index 61186c1..b1b9799 100644
--- a/po/it/meshwizard.po
+++ b/po/it/meshwizard.po
@@ -67,9 +67,10 @@ msgstr "Rete indirizzo IPv6"
 msgid "Mesh Wizard"
 msgstr "Configurazione Rete"
 
+#, fuzzy
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 "Nota: questo permette di configurare questa interfaccia per il funzionamento "
 "in rete, vale a dire aggiungere nella zona 'Freifunk' e consentire OLSR."
diff --git a/po/it/olsr.po b/po/it/olsr.po
index a8f4f41..a88d297 100644
--- a/po/it/olsr.po
+++ b/po/it/olsr.po
@@ -52,6 +52,9 @@ msgstr "Indirizzo di broadcast"
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr "Configurazione"
 
@@ -136,6 +139,10 @@ msgstr "Intervallo HNA"
 msgid "HNA validity time"
 msgstr "Durata di validità HNA"
 
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "Annuncio di HNA"
+
 msgid "Hello"
 msgstr "Ciao"
 
@@ -169,6 +176,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -394,6 +406,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -433,6 +452,10 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "Annuncio di HNA"
+
 msgid "OLSR - Plugins"
 msgstr ""
 
@@ -520,6 +543,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -678,6 +707,16 @@ msgstr ""
 "cercando un HNA del tipo 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. Default "
 "setting is \"both\"."
 
+#, fuzzy
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+"Quale tipo di uplink è mostrato agli altri nodi. Un uplink è individuato "
+"cercando un HNA del tipo 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/it/watchcat.po b/po/it/watchcat.po
index 1c74d63..0acdd18 100644
--- a/po/it/watchcat.po
+++ b/po/it/watchcat.po
@@ -52,16 +52,18 @@ msgstr "Periodo del Ping"
 msgid "Watchcat"
 msgstr "Watchcat"
 
+#, fuzzy
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 "Watchcat ti permette di configurare un riavvio periodico quando la "
 "connessione a internet è stata persa per un certo periodo."
 
+#, fuzzy
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
 "Quando watchcat vuole riavviare il sistema usa un soft reboot, immetendo un "
diff --git a/po/it/wol.po b/po/it/wol.po
index 9c4697c..63ac0d8 100644
--- a/po/it/wol.po
+++ b/po/it/wol.po
@@ -27,8 +27,9 @@ msgstr "Host da \"svegliare\""
 msgid "Network interface to use"
 msgstr "Interfacci di rete da usare"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 "Avvolte solo uno dei due tools funziona. Se uno fallisce, tenta di usare il "
 "secondo"
diff --git a/po/it/wshaper.po b/po/it/wshaper.po
index 719e16a..6a72c7e 100644
--- a/po/it/wshaper.po
+++ b/po/it/wshaper.po
@@ -49,9 +49,10 @@ msgstr "Wondershaper"
 msgid "Wondershaper settings"
 msgstr "Impostazioni Wondershaper"
 
+#, fuzzy
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
 "WonderShaper usa la regolazione del traffico per garantire bassa latenza per "
 "il traffico interattivo anche quando la connessione a Internet è molto "
diff --git a/po/ja/ahcp.po b/po/ja/ahcp.po
index b673619..dd78ccd 100644
--- a/po/ja/ahcp.po
+++ b/po/ja/ahcp.po
@@ -14,9 +14,10 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "AHCPサーバー"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/ja/base.po b/po/ja/base.po
index c0a45c0..0b625ed 100644
--- a/po/ja/base.po
+++ b/po/ja/base.po
@@ -836,8 +836,9 @@ msgstr "拡張ホスト設定"
 msgid "Expires"
 msgstr "期限切れ"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "リースアドレスの有効時間を入力します。最小設定値は2分です。 (<code>2m</"
 "code>)."
@@ -1257,9 +1258,10 @@ msgstr "無効なVLAN IDです! ユニークなIDを入力してください。"
 msgid "Invalid username and/or password! Please try again."
 msgstr "ユーザー名とパスワードが不正です! もう一度入力してください。"
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "更新しようとしたイメージファイルはこのフラッシュメモリに適合しません。もう一"
 "度イメージファイルを確認してください!"
@@ -1400,8 +1402,8 @@ msgid "Local domain"
 msgstr "ローカルドメイン"
 
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
@@ -1966,6 +1968,15 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr "本当に全ての変更をリセットしますか?"
 
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"本当にネットワークを停止しますか?\n"
+"このネットワークを経由して接続している場合、デバイスにアクセスできなくなる場"
+"合があります。"
+
 msgid ""
 "Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
 "you are connected via this interface."
@@ -1974,14 +1985,6 @@ msgstr ""
 "このインターフェースを経由して接続している場合、デバイスにアクセスできなくな"
 "る場合があります。"
 
-msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
-msgstr ""
-"本当にネットワークを停止しますか?\n"
-"このネットワークを経由して接続している場合、デバイスにアクセスできなくなる場"
-"合があります。"
-
 msgid "Really switch protocol?"
 msgstr "本当にプロトコルを切り替えますか?"
 
@@ -2185,12 +2188,13 @@ msgstr "サービスタイプ"
 msgid "Services"
 msgstr "サービス"
 
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "時刻設定"
+
 msgid "Setup DHCP Server"
 msgstr "DHCPサーバーを設定"
 
-msgid "Setup Time Synchronization"
-msgstr ""
-
 msgid "Show current backup file list"
 msgstr "現在のバックアップファイルのリストを表示する"
 
@@ -2233,8 +2237,9 @@ msgstr "申し訳ありません。リクエストされたオブジェクトは
 msgid "Sorry, the server encountered an unexpected error."
 msgstr "申し訳ありません。サーバーに予期せぬエラーが発生しました。"
 
+#, fuzzy
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2378,12 +2383,13 @@ msgstr "ターゲット"
 msgid "Terminate"
 msgstr "停止"
 
+#, fuzzy
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 "<em>デバイス設定</em>セクションでは、チャネル、送信出力、アンテナ設定などの無"
 "線ハードウェアの設定を行います。また、無線ハードウェアがマルチSSID機能をサ"
@@ -2451,9 +2457,10 @@ msgstr "このシステムでは、現在以下のルールが有効になって
 msgid "The given network name is not unique"
 msgstr "設定されたネットワーク名はユニークなものではありません"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 "このハードウェアではマルチESSIDを設定することができないため、続行した場合、設"
 "定は既存の設定と置き換えられます。"
@@ -2483,9 +2490,10 @@ msgid ""
 "when finished."
 msgstr "システムは設定領域を消去中です。完了後、自動的に再起動します。"
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
@@ -3038,7 +3046,9 @@ msgstr "« 戻る"
 #~ msgstr "HE.net ユーザーID"
 
 #~ msgid "This is the 32 byte hex encoded user ID, not the login name"
-#~ msgstr "ログイン名ではなく、32バイト、16進数でエンコードされたユーザーIDを設定してください"
+#~ msgstr ""
+#~ "ログイン名ではなく、32バイト、16進数でエンコードされたユーザーIDを設定して"
+#~ "ください"
 
 #~ msgid "40MHz 2nd channel above"
 #~ msgstr "40MHz 上側第2チャネル"
diff --git a/po/ja/firewall.po b/po/ja/firewall.po
index 68da305..877a6f0 100644
--- a/po/ja/firewall.po
+++ b/po/ja/firewall.po
@@ -423,12 +423,13 @@ msgstr ""
 "このページでは、各トラフィックルールの送信元・宛先ホストの設定などの詳細設定"
 "を行うことができます。"
 
+#, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 "このセクションでは、%sの標準的な動作を設定します。<em>受信</em>及び<em>送信</"
 "em>オプションは、このゾーンに対して入出力するトラフィックに対する標準のポリ"
diff --git a/po/ja/meshwizard.po b/po/ja/meshwizard.po
index 180d771..a67c71f 100644
--- a/po/ja/meshwizard.po
+++ b/po/ja/meshwizard.po
@@ -51,8 +51,8 @@ msgid "Mesh Wizard"
 msgstr ""
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/ja/olsr.po b/po/ja/olsr.po
index 908609e..b3f0109 100644
--- a/po/ja/olsr.po
+++ b/po/ja/olsr.po
@@ -52,6 +52,9 @@ msgstr "ブロードキャストアドレス"
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr "設定"
 
@@ -142,6 +145,10 @@ msgstr "HNA 送信間隔"
 msgid "HNA validity time"
 msgstr "HNA 有効時間"
 
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "HNA 通知"
+
 msgid "Hello"
 msgstr "Hello"
 
@@ -175,6 +182,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -422,6 +434,18 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+#, fuzzy
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+"経路のLQと設定値の乗算を行います。設定可能な値は0.01-1です。この設定はLQ レベ"
+"ルが0以上の場合のみ設定可能です。<br />例:192.168.0.1へのLQを半分にする場合: "
+"192.168.0.1 0.5<br />このインターフェースから全てのノードへ対して20%減らす場"
+"合: default 0.8"
+
 msgid "NAT threshold"
 msgstr "NAT しきい値"
 
@@ -461,6 +485,10 @@ msgstr "OLSR - 表示オプション"
 msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - HNA (Host and Network Association) 通知"
 
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "OLSR - HNA (Host and Network Association) 通知"
+
 msgid "OLSR - Plugins"
 msgstr "OLSR - プラグイン"
 
@@ -555,6 +583,16 @@ msgstr ""
 "して変更しません。標準設定は0.0.0.0であり、プライマリ・インターフェースのIPを"
 "自動的に使用します。"
 
+#, fuzzy
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+"ルーターのメインIP (発信元IP)を設定してください。このIPは、OLSRdの稼働中は決"
+"して変更しません。標準設定は0.0.0.0であり、プライマリ・インターフェースのIPを"
+"自動的に使用します。"
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -728,6 +766,16 @@ msgstr ""
 "ローカルのHNAである0.0.0.0/0、::ffff:0:0/96、2000::/3を探索することで検出しま"
 "す。標準設定は、\"both\"です。"
 
+#, fuzzy
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+"どのアップリンクを他のメッシュノードへ通知するかを設定します。アップリンクは"
+"ローカルのHNAである0.0.0.0/0、::ffff:0:0/96、2000::/3を探索することで検出しま"
+"す。標準設定は、\"both\"です。"
+
 msgid "Willingness"
 msgstr "Willingness"
 
@@ -747,15 +795,6 @@ msgstr ""
 #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
 #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
 #~ msgstr ""
-#~ "OLSRdが稼働中であること、\"txinfo\"プラグインがロードされていること、ポート2006番が設定されていること、\"127.0.0.1\"からの接続が"
-#~ "許可されていることを確認してください。"
-
-#~ msgid ""
-#~ "Multiply routes with the factor given here. Allowed values are between "
-#~ "0.01 and 1. It is only used when LQ-Level is greater than 0. Examples:"
-#~ "<br />reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to "
-#~ "all nodes on this interface by 20%: default 0.8"
-#~ msgstr ""
-#~ "経路のLQと設定値の乗算を行います。設定可能な値は0.01-1です。この設定はLQ レベルが0以上の場合のみ設定可能です。<br "
-#~ "/>例:192.168.0.1へのLQを半分にする場合: 192.168.0.1 0.5<br />このインターフェースから全てのノードへ対して20%"
-#~ "減らす場合: default 0.8"
+#~ "OLSRdが稼働中であること、\"txinfo\"プラグインがロードされていること、ポー"
+#~ "ト2006番が設定されていること、\"127.0.0.1\"からの接続が許可されていること"
+#~ "を確認してください。"
diff --git a/po/ja/watchcat.po b/po/ja/watchcat.po
index db4a23b..1ae0eb4 100644
--- a/po/ja/watchcat.po
+++ b/po/ja/watchcat.po
@@ -21,8 +21,9 @@ msgid ""
 "How often to check internet connection. Default unit is seconds, you can you "
 "use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
 msgstr ""
-"どの程度の間隔でインターネット接続をチェックするか設定します。標準の単位は秒ですが、'm'を接尾に付けると分、'h'を付けると時、'd'を付けると日数に"
-"設定されます。"
+"どの程度の間隔でインターネット接続をチェックするか設定します。標準の単位は秒"
+"ですが、'm'を接尾に付けると分、'h'を付けると時、'd'を付けると日数に設定されま"
+"す。"
 
 msgid ""
 "In periodic mode, it defines the reboot period. In internet mode, it defines "
@@ -30,8 +31,10 @@ msgid ""
 "engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
 "for hours or 'd' for days"
 msgstr ""
-"定期動作モードの場合、再起動する周期を設定します。インターネットモードの場合、インターネット接続が切断状態にある許容する期間を設定します。標準の単位は秒"
-"ですが、'm'を接尾に付けると分、'h'を付けると時、'd'を付けると日数に設定されます。"
+"定期動作モードの場合、再起動する周期を設定します。インターネットモードの場"
+"合、インターネット接続が切断状態にある許容する期間を設定します。標準の単位は"
+"秒ですが、'm'を接尾に付けると分、'h'を付けると時、'd'を付けると日数に設定され"
+"ます。"
 
 msgid "Operating mode"
 msgstr "動作モード"
@@ -48,17 +51,20 @@ msgstr "Ping 間隔"
 msgid "Watchcat"
 msgstr "Watchcat"
 
+#, fuzzy
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 "Watchcatでは、定期的な再起動や、インターネット接続が一定期間切断された際の再"
 "起動を行うような設定が可能です。"
 
+#, fuzzy
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
-"再起動時にwatchcatはソフトウェアリセットを実行しますが、0以外の値を設定した場合、ソフトウェアリセットが失敗した際に設定された秒数後にハードウェ"
-"アリセットを行います。0を設定した場合は無効になります。"
+"再起動時にwatchcatはソフトウェアリセットを実行しますが、0以外の値を設定した場"
+"合、ソフトウェアリセットが失敗した際に設定された秒数後にハードウェアリセット"
+"を行います。0を設定した場合は無効になります。"
diff --git a/po/ja/wol.po b/po/ja/wol.po
index 189112e..c18b831 100644
--- a/po/ja/wol.po
+++ b/po/ja/wol.po
@@ -27,8 +27,9 @@ msgstr "起動するホストを指定"
 msgid "Network interface to use"
 msgstr "使用するネットワークインターフェース"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 "片方のツールのみが動作する場合があるため、片方が失敗する場合は別のツールを試"
 "してみてください。"
diff --git a/po/ja/wshaper.po b/po/ja/wshaper.po
index ca0e076..d58476c 100644
--- a/po/ja/wshaper.po
+++ b/po/ja/wshaper.po
@@ -49,9 +49,10 @@ msgstr "Wondershaper"
 msgid "Wondershaper settings"
 msgstr "Wondershaper 設定"
 
+#, fuzzy
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
 "Wondweshaperは、インターネット接続が飽和状態の場合でも、低いレイテンシ・円滑"
 "な通信を実現するためにトラフィック・シェーピングを行います。"
diff --git a/po/ms/ahcp.po b/po/ms/ahcp.po
index 7217eb8..0b6963b 100644
--- a/po/ms/ahcp.po
+++ b/po/ms/ahcp.po
@@ -12,7 +12,7 @@ msgstr ""
 
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/ms/base.po b/po/ms/base.po
index 54fa71f..30fac6b 100644
--- a/po/ms/base.po
+++ b/po/ms/base.po
@@ -798,7 +798,7 @@ msgid "Expires"
 msgstr ""
 
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
 msgid "External"
@@ -1213,9 +1213,10 @@ msgstr ""
 msgid "Invalid username and/or password! Please try again."
 msgstr "Username dan / atau password tak sah! Sila cuba lagi."
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "Tampak bahawa anda cuba untuk flash fail gambar yang tidak sesuai dengan "
 "memori flash, sila buat pengesahan pada fail gambar!"
@@ -1353,8 +1354,8 @@ msgid "Local domain"
 msgstr ""
 
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
@@ -1907,13 +1908,13 @@ msgid "Really reset all changes?"
 msgstr ""
 
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
 
 msgid "Really switch protocol?"
@@ -2117,10 +2118,10 @@ msgstr ""
 msgid "Services"
 msgstr "Perkhidmatan"
 
-msgid "Setup DHCP Server"
+msgid "Set up Time Synchronization"
 msgstr ""
 
-msgid "Setup Time Synchronization"
+msgid "Setup DHCP Server"
 msgstr ""
 
 msgid "Show current backup file list"
@@ -2166,7 +2167,7 @@ msgid "Sorry, the server encountered an unexpected error."
 msgstr ""
 
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2308,10 +2309,10 @@ msgstr "Menamatkan"
 
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 
 msgid ""
@@ -2369,8 +2370,8 @@ msgid "The given network name is not unique"
 msgstr ""
 
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 
 msgid ""
@@ -2398,9 +2399,10 @@ msgid ""
 "when finished."
 msgstr ""
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/ms/firewall.po b/po/ms/firewall.po
index 3b95c9c..ccbec60 100644
--- a/po/ms/firewall.po
+++ b/po/ms/firewall.po
@@ -353,7 +353,7 @@ msgid ""
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
 msgid "To %s at %s on <var>this device</var>"
diff --git a/po/ms/meshwizard.po b/po/ms/meshwizard.po
index 180d771..a67c71f 100644
--- a/po/ms/meshwizard.po
+++ b/po/ms/meshwizard.po
@@ -51,8 +51,8 @@ msgid "Mesh Wizard"
 msgstr ""
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/ms/olsr.po b/po/ms/olsr.po
index 3245043..c0edce1 100644
--- a/po/ms/olsr.po
+++ b/po/ms/olsr.po
@@ -46,6 +46,9 @@ msgstr ""
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr ""
 
@@ -128,6 +131,9 @@ msgstr ""
 msgid "HNA validity time"
 msgstr ""
 
+msgid "HNA6 Announcements"
+msgstr ""
+
 msgid "Hello"
 msgstr ""
 
@@ -161,6 +167,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -365,6 +376,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -404,6 +422,9 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
 msgid "OLSR - Plugins"
 msgstr ""
 
@@ -491,6 +512,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -640,6 +667,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/ms/watchcat.po b/po/ms/watchcat.po
index 91d83b9..0da283c 100644
--- a/po/ms/watchcat.po
+++ b/po/ms/watchcat.po
@@ -41,12 +41,12 @@ msgid "Watchcat"
 msgstr ""
 
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
diff --git a/po/ms/wol.po b/po/ms/wol.po
index 0991ff5..74380f2 100644
--- a/po/ms/wol.po
+++ b/po/ms/wol.po
@@ -25,7 +25,7 @@ msgid "Network interface to use"
 msgstr ""
 
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 
 msgid "Specifies the interface the WoL packet is sent on"
diff --git a/po/ms/wshaper.po b/po/ms/wshaper.po
index 4eee2b6..d646e76 100644
--- a/po/ms/wshaper.po
+++ b/po/ms/wshaper.po
@@ -35,6 +35,6 @@ msgid "Wondershaper settings"
 msgstr ""
 
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
diff --git a/po/no/ahcp.po b/po/no/ahcp.po
index d5fc7d3..4c3bc03 100644
--- a/po/no/ahcp.po
+++ b/po/no/ahcp.po
@@ -17,7 +17,7 @@ msgstr "AHCP Server"
 #, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/no/base.po b/po/no/base.po
index 9b81346..118c5c9 100644
--- a/po/no/base.po
+++ b/po/no/base.po
@@ -836,8 +836,9 @@ msgstr "Utvid vertsliste"
 msgid "Expires"
 msgstr "Utgår"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr "Utløpstid på leide adresser, minimum er 2 minutter (<code>2m</code>)."
 
 msgid "External"
@@ -1254,9 +1255,10 @@ msgstr "Ugyldig VLAN ID gitt! Bare unike ID'er er tillatt"
 msgid "Invalid username and/or password! Please try again."
 msgstr "Ugyldig brukernavn og/eller passord! Vennligst prøv igjen."
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "Det virker som du prøver å flashe med en firmware som ikke passer inn i "
 "flash-minnet, vennligst kontroller firmware filen!"
@@ -1395,9 +1397,10 @@ msgstr "Lokal tid"
 msgid "Local domain"
 msgstr "Lokalt domene"
 
+#, fuzzy
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 "Lokalt domene spesifikasjon. Navn som passer dette domenet blir aldri "
 "videresendt, de blir kun løst av DHCP eller vertsfiler"
@@ -1962,19 +1965,20 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr "Vil du nullstille alle endringer?"
 
+#, fuzzy
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
-"Slå av dette grensesnittet \"%s\" ?\n"
+"Slå av dette nettverket ?\n"
 "Du kan miste kontakten med ruteren om du er tilkoblet via dette "
 "grensesnittet."
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
-"Slå av dette nettverket ?\n"
+"Slå av dette grensesnittet \"%s\" ?\n"
 "Du kan miste kontakten med ruteren om du er tilkoblet via dette "
 "grensesnittet."
 
@@ -2181,12 +2185,13 @@ msgstr "Tjeneste type"
 msgid "Services"
 msgstr "Tjenester"
 
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Oppsett tidssynkronisering"
+
 msgid "Setup DHCP Server"
 msgstr "Oppsett DHCP server"
 
-msgid "Setup Time Synchronization"
-msgstr "Oppsett tidssynkronisering"
-
 msgid "Show current backup file list"
 msgstr "Vis gjeldende liste med sikkerhetskopifiler"
 
@@ -2229,8 +2234,9 @@ msgstr "Beklager, objektet du spurte om ble ikke funnet."
 msgid "Sorry, the server encountered an unexpected error."
 msgstr "Beklager, det oppstod en uventet feil på serveren."
 
+#, fuzzy
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2375,12 +2381,13 @@ msgstr "Mål"
 msgid "Terminate"
 msgstr "Avslutte"
 
+#, fuzzy
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 "<em>Enhet Konfigurasjon</em> seksjonen omhandler innstillingene av den "
 "trådløse enheten som kanaler, sende stryke eller antenne valg. Disse "
@@ -2450,9 +2457,10 @@ msgstr "Følgende regler er aktiver på systemet."
 msgid "The given network name is not unique"
 msgstr "Det angitte nettverksnavnet er ikke unikt"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 "Maskinvaren er ikke multi-SSID kapabel og den ekisterende konfigurasjonen "
 "vil bli erstattet om du fortsetter."
@@ -2490,9 +2498,10 @@ msgstr ""
 "Systemet sletter konfigurasjonspartisjonen nå, enheten vil bli startet på "
 "nytt når dette er utført."
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/no/firewall.po b/po/no/firewall.po
index f7c5543..e49f3ac 100644
--- a/po/no/firewall.po
+++ b/po/no/firewall.po
@@ -383,12 +383,13 @@ msgstr ""
 "Denne siden lar deg endre de avanserte egenskapene til trafikken regel "
 "oppføringer, som for eksempel matchet kilde og destinasjons vert."
 
+#, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 "Denne seksjonen definerer de vanligste valg for %q. Med <em>Inndata</em> og "
 "<em>Utdata</em> fastsetter man vanlige regler for trafikk gjennom sonen, "
diff --git a/po/no/meshwizard.po b/po/no/meshwizard.po
index 180d771..a67c71f 100644
--- a/po/no/meshwizard.po
+++ b/po/no/meshwizard.po
@@ -51,8 +51,8 @@ msgid "Mesh Wizard"
 msgstr ""
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/no/olsr.po b/po/no/olsr.po
index d6853de..38aa43b 100644
--- a/po/no/olsr.po
+++ b/po/no/olsr.po
@@ -47,6 +47,9 @@ msgstr ""
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr ""
 
@@ -129,6 +132,9 @@ msgstr ""
 msgid "HNA validity time"
 msgstr ""
 
+msgid "HNA6 Announcements"
+msgstr ""
+
 msgid "Hello"
 msgstr ""
 
@@ -162,6 +168,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -366,6 +377,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -405,6 +423,9 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
 msgid "OLSR - Plugins"
 msgstr ""
 
@@ -492,6 +513,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -641,6 +668,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/no/watchcat.po b/po/no/watchcat.po
index ceafe5d..4aa0c6b 100644
--- a/po/no/watchcat.po
+++ b/po/no/watchcat.po
@@ -42,12 +42,12 @@ msgid "Watchcat"
 msgstr ""
 
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
diff --git a/po/no/wol.po b/po/no/wol.po
index bddbdce..2f0a8ad 100644
--- a/po/no/wol.po
+++ b/po/no/wol.po
@@ -9,8 +9,8 @@ msgstr "Send på alle grensesnitt"
 
 msgid "Choose the host to wake up or enter a custom MAC address to use"
 msgstr ""
-"Velg hvilken vert som skal startes opp, eller angi en MAC adresse som "
-"skal brukes"
+"Velg hvilken vert som skal startes opp, eller angi en MAC adresse som skal "
+"brukes"
 
 msgid "Host to wake up"
 msgstr "Vert som skal startes opp"
@@ -18,11 +18,12 @@ msgstr "Vert som skal startes opp"
 msgid "Network interface to use"
 msgstr "Nettverksgrensesnitt"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
-"Noen ganger virker bare ett av disse verktøyene. Hvis ett av de ikke "
-"lykkes med å starte opp verten kan du prøve det andre."
+"Noen ganger virker bare ett av disse verktøyene. Hvis ett av de ikke lykkes "
+"med å starte opp verten kan du prøve det andre."
 
 msgid "Specifies the interface the WoL packet is sent on"
 msgstr "Angir grensesnittet som WoL pakken blir sendt ut på"
@@ -36,7 +37,8 @@ msgstr "Wake on LAN"
 msgid ""
 "Wake on LAN is a mechanism to remotely boot computers in the local network."
 msgstr ""
-"Wake on LAN er en mekanisme for å starte opp datamaskiner i det lokale nettverket."
+"Wake on LAN er en mekanisme for å starte opp datamaskiner i det lokale "
+"nettverket."
 
 msgid "Wake up host"
 msgstr "Start vert"
diff --git a/po/no/wshaper.po b/po/no/wshaper.po
index 4eee2b6..d646e76 100644
--- a/po/no/wshaper.po
+++ b/po/no/wshaper.po
@@ -35,6 +35,6 @@ msgid "Wondershaper settings"
 msgstr ""
 
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
diff --git a/po/pl/ahcp.po b/po/pl/ahcp.po
index 5345c7b..5095224 100644
--- a/po/pl/ahcp.po
+++ b/po/pl/ahcp.po
@@ -15,9 +15,10 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "Serwer AHCP"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/pl/base.po b/po/pl/base.po
index 22be8c0..6e82be1 100644
--- a/po/pl/base.po
+++ b/po/pl/base.po
@@ -865,8 +865,9 @@ msgstr "Rozwiń hosty"
 msgid "Expires"
 msgstr "Wygasa"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "Czas wygasania dzierżawy adresu, minimum to 2 Minuty (<code>2m</code>)."
 
@@ -1298,9 +1299,10 @@ msgstr "Podano niewłaściwy ID VLAN`u! Dozwolone są tylko unikalne ID."
 msgid "Invalid username and/or password! Please try again."
 msgstr "Niewłaściwy login i/lub hasło! Spróbuj ponownie."
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "Wygląda na to, że próbujesz wgrać obraz większy niż twoja pamięć flash, "
 "proszę sprawdź czy to właściwy obraz!"
@@ -1439,9 +1441,10 @@ msgstr "Czas lokalny"
 msgid "Local domain"
 msgstr "Domena lokalna"
 
+#, fuzzy
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 "Specyfikacja domeny lokalnej. Nazwy należące do tej domeny nie są "
 "przekazywane dalej ani rozwijane przez DHCP lub tylko pliki hosts"
@@ -2010,19 +2013,20 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr "Naprawdę usunąć wszelkie zmiany?"
 
+#, fuzzy
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
-"Naprawdę wyłączyć interfejs \"%s\"?\n"
+"Naprawdę wyłączyć tę sieć?\n"
 "Możesz stracić dostęp do tego urządzenia jeśli jesteś połączony przez ten "
 "interfejs!"
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
-"Naprawdę wyłączyć tę sieć?\n"
+"Naprawdę wyłączyć interfejs \"%s\"?\n"
 "Możesz stracić dostęp do tego urządzenia jeśli jesteś połączony przez ten "
 "interfejs!"
 
@@ -2231,12 +2235,13 @@ msgstr "Typ serwisu"
 msgid "Services"
 msgstr "Serwisy"
 
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Ustawienia synchronizacji czasu"
+
 msgid "Setup DHCP Server"
 msgstr "Ustawienia serwera DHCP"
 
-msgid "Setup Time Synchronization"
-msgstr "Ustawienia synchronizacji czasu"
-
 msgid "Show current backup file list"
 msgstr "Pokaż aktualną listę plików do backupu"
 
@@ -2279,8 +2284,9 @@ msgstr "Przepraszamy, ale żądany obiekt nie został znaleziony."
 msgid "Sorry, the server encountered an unexpected error."
 msgstr "Przepraszamy, ale serwer napotkał nieoczekiwany błąd."
 
+#, fuzzy
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2429,12 +2435,13 @@ msgstr "Cel"
 msgid "Terminate"
 msgstr "Zakończ"
 
+#, fuzzy
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 "Sekcja <em>Konfiguracja Urządzenia</em> zawiera sprzętowe ustawienia toru "
 "transmisji radiowej takie jak kanał, moc sygnału, czy wybór anteny, które to "
@@ -2506,9 +2513,10 @@ msgstr "Następujące zasady są obecnie aktywne w tym systemie."
 msgid "The given network name is not unique"
 msgstr "Podana sieć NIE jest unikalna"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 "Sprzęt nie jest urządzeniem typu multi-SSID, więc bieżąca konfiguracja "
 "zostanie nadpisana nową jeśli będziesz kontynuować."
@@ -2547,9 +2555,10 @@ msgid ""
 msgstr ""
 "System usuwa teraz partycję konfiguracji i zrestartuje się po zakończeniu."
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/pl/firewall.po b/po/pl/firewall.po
index bddd85d..18be74d 100644
--- a/po/pl/firewall.po
+++ b/po/pl/firewall.po
@@ -397,12 +397,13 @@ msgstr ""
 "Ta strona pozwala zmienić zaawansowane ustawienia reguły ruchu sieciowego, "
 "takie jak pasujące źródło i hosty docelowe."
 
+#, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 "Ta sekcja definiuje ustawienia ogólne %q. Opcje <em>\"wejście\"</em> i <em>"
 "\"wyjście\"</em> określają domyślną politykę dla ruchu przychodzącego i "
diff --git a/po/pl/meshwizard.po b/po/pl/meshwizard.po
index 0c12bba..79409aa 100644
--- a/po/pl/meshwizard.po
+++ b/po/pl/meshwizard.po
@@ -70,9 +70,10 @@ msgstr "Adres Mech IPv6"
 msgid "Mesh Wizard"
 msgstr "Kreator Mesh"
 
+#, fuzzy
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 "Nota: To są ustawienia interfejsu mesh operacja i.e Dodawanie Strefy "
 "'Freifunk' oraz włączyć olsr"
diff --git a/po/pl/olsr.po b/po/pl/olsr.po
index a8b83ad..64a99f6 100644
--- a/po/pl/olsr.po
+++ b/po/pl/olsr.po
@@ -53,6 +53,9 @@ msgstr "Adres rozgłoszeniowy (broadcast)"
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr "Konfiguracja"
 
@@ -140,6 +143,10 @@ msgstr "Interwał HNA"
 msgid "HNA validity time"
 msgstr "Czas poprawności HNA"
 
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "Ogłoszenia HNA"
+
 msgid "Hello"
 msgstr "Hello"
 
@@ -174,6 +181,14 @@ msgstr ""
 "Hosty w sieci OLSR mogą ogłaszać połączenia z zewnętrznymi sieciami poprzez "
 "wiadomości HNA."
 
+#, fuzzy
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+"Hosty w sieci OLSR mogą ogłaszać połączenia z zewnętrznymi sieciami poprzez "
+"wiadomości HNA."
+
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
@@ -399,6 +414,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr "Próg NAT"
 
@@ -438,6 +460,10 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - ogłoszenia HNA"
 
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "OLSR - ogłoszenia HNA"
+
 msgid "OLSR - Plugins"
 msgstr "OLSR - pluginy"
 
@@ -525,6 +551,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -687,6 +719,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr "Gotowość"
 
@@ -706,5 +744,6 @@ msgstr ""
 #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
 #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
 #~ msgstr ""
-#~ "Upewnij się że OLSRd jest uruchomione, \"txtinfo\" plugin jest załadowany, "
-#~ "skonfigurowany na porcie 2006 i akceptuje połączenia z 127.0.0.1 (localhost)"
+#~ "Upewnij się że OLSRd jest uruchomione, \"txtinfo\" plugin jest "
+#~ "załadowany, skonfigurowany na porcie 2006 i akceptuje połączenia z "
+#~ "127.0.0.1 (localhost)"
diff --git a/po/pl/watchcat.po b/po/pl/watchcat.po
index 6e08de5..ebb67ee 100644
--- a/po/pl/watchcat.po
+++ b/po/pl/watchcat.po
@@ -51,16 +51,18 @@ msgstr "Czas pomiędzy wysyłaniem pingów"
 msgid "Watchcat"
 msgstr "Watchcat"
 
+#, fuzzy
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 "Watchcat pozwala na skonfigurowanie okresowych restartów, jeśli połączenie "
 "internetowe zostanie utracone na określony czas."
 
+#, fuzzy
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
 "Restart routera Watchcat wykonuje za pomocą tzw. \"miękkiego restartu\". "
diff --git a/po/pl/wol.po b/po/pl/wol.po
index e0797b4..c599b9e 100644
--- a/po/pl/wol.po
+++ b/po/pl/wol.po
@@ -28,8 +28,9 @@ msgstr "Host do wybudzenia"
 msgid "Network interface to use"
 msgstr "Użyty interfejs sieciowy"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 "Czasem działa tylko jedno z narzędzi. Jeżeli jedno z nich nie zadziała, "
 "proszę użyć drugiego."
diff --git a/po/pl/wshaper.po b/po/pl/wshaper.po
index ab074a4..a85bf00 100644
--- a/po/pl/wshaper.po
+++ b/po/pl/wshaper.po
@@ -50,9 +50,10 @@ msgstr "Wondershaper"
 msgid "Wondershaper settings"
 msgstr "Ustawienia Wondershaper"
 
+#, fuzzy
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
 "Wondershaper wykorzystuje kształtowanie ruchu aby zapewnić niskie opóźnienia "
 "nawet wtedy, gdy Twoje połączenie internetowe jest wysycone."
diff --git a/po/pt/ahcp.po b/po/pt/ahcp.po
index 3c9d408..f96fc45 100644
--- a/po/pt/ahcp.po
+++ b/po/pt/ahcp.po
@@ -14,9 +14,10 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "Servidor AHCP"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/pt/base.po b/po/pt/base.po
index 1afeb8f..48177c3 100644
--- a/po/pt/base.po
+++ b/po/pt/base.po
@@ -850,8 +850,9 @@ msgstr "Expandir hosts"
 msgid "Expires"
 msgstr "Expira"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "O tempo de caducidade dos endereços concessionados, minimo de 2 minutos "
 "(<code>2m</code>)."
@@ -1276,9 +1277,10 @@ msgstr "O ID de VLAN fornecido é inválido! Só os IDs únicos são permitidos.
 msgid "Invalid username and/or password! Please try again."
 msgstr "Username inválido e/ou a password! Por favor, tente novamente."
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "A imagem que está a tentar carregar aparenta não caber na flash do "
 "equipamento. Por favor verifique o ficheiro de imagem."
@@ -1417,9 +1419,10 @@ msgstr "Hora Local"
 msgid "Local domain"
 msgstr "Domínio local"
 
+#, fuzzy
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 "Especificação de dominio local. Os nomes que correspondam a este dominio "
 "nunca são encaminhados e resolvidos do DHCP ou do ficheiro de hosts"
@@ -1980,6 +1983,14 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr "Deseja mesmo limpar todas as alterações?"
 
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"Deseja mesmo desligar esta rede?\n"
+"Pode perder o acesso ao dispositivo se estiver ligado através desta rede."
+
 msgid ""
 "Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
 "you are connected via this interface."
@@ -1988,13 +1999,6 @@ msgstr ""
 "Pode perder o acesso ao dispositivo se estiver ligado através desta "
 "interface."
 
-msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
-msgstr ""
-"Deseja mesmo desligar esta rede?\n"
-"Pode perder o acesso ao dispositivo se estiver ligado através desta rede."
-
 msgid "Really switch protocol?"
 msgstr "Deseja mesmo trocar o protocolo?"
 
@@ -2197,12 +2201,13 @@ msgstr "Tipo de Serviço"
 msgid "Services"
 msgstr "Serviços"
 
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Configurar Sincronização Horária"
+
 msgid "Setup DHCP Server"
 msgstr "Configurar Servidor DHCP"
 
-msgid "Setup Time Synchronization"
-msgstr "Configurar Sincronização Horária"
-
 msgid "Show current backup file list"
 msgstr "Mostrar lista ficheiros para backup"
 
@@ -2246,7 +2251,7 @@ msgid "Sorry, the server encountered an unexpected error."
 msgstr "Lamento, o servidor encontrou um erro inesperado."
 
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2386,10 +2391,10 @@ msgstr "Terminar"
 
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 
 msgid ""
@@ -2454,9 +2459,10 @@ msgstr "As seguintes regras estão actualmente acivas neste sistema."
 msgid "The given network name is not unique"
 msgstr "O nome dado não é único"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 "O hardware não é comporta multi-SSIDs a configuração será substituída se "
 "prosseguir."
@@ -2495,9 +2501,10 @@ msgstr ""
 "O sistema está agora a limpar a partição de configuração e irá reiniciar-se "
 "quando terminar."
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/pt/firewall.po b/po/pt/firewall.po
index 87e7056..304e365 100644
--- a/po/pt/firewall.po
+++ b/po/pt/firewall.po
@@ -383,7 +383,7 @@ msgid ""
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
 msgid "To %s at %s on <var>this device</var>"
diff --git a/po/pt/meshwizard.po b/po/pt/meshwizard.po
index 843b096..4195769 100644
--- a/po/pt/meshwizard.po
+++ b/po/pt/meshwizard.po
@@ -67,9 +67,10 @@ msgstr ""
 msgid "Mesh Wizard"
 msgstr ""
 
+#, fuzzy
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 "Nota: Isto irá configurar a interface para operação em malha, p. ex. "
 "adicionar à zona 'freifunk' e ativar OLSR."
diff --git a/po/pt/olsr.po b/po/pt/olsr.po
index 97f9f95..4e04248 100644
--- a/po/pt/olsr.po
+++ b/po/pt/olsr.po
@@ -53,6 +53,9 @@ msgstr "Endereço de broadcast"
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr "Configuração"
 
@@ -137,6 +140,10 @@ msgstr "Intervalo entre HNA"
 msgid "HNA validity time"
 msgstr "Validade de HNA"
 
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "OLSR - Anuncios HNA4"
+
 msgid "Hello"
 msgstr ""
 
@@ -170,6 +177,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -380,6 +392,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -419,6 +438,10 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - Anuncios HNA4"
 
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "OLSR - Anuncios HNA4"
+
 msgid "OLSR - Plugins"
 msgstr "OLSR - Plugins"
 
@@ -507,6 +530,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -656,6 +685,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr "Disponibilidade"
 
@@ -675,6 +710,6 @@ msgstr ""
 #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
 #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
 #~ msgstr ""
-#~ "Certifique-se que o processo olsrd está em execução, que o plugin \"txtinfo\" "
-#~ "está carregado e configurado para a porta 2006 e que aceita ligações a "
-#~ "partir de \"127.0.0.1\"."
+#~ "Certifique-se que o processo olsrd está em execução, que o plugin "
+#~ "\"txtinfo\" está carregado e configurado para a porta 2006 e que aceita "
+#~ "ligações a partir de \"127.0.0.1\"."
diff --git a/po/pt/watchcat.po b/po/pt/watchcat.po
index b1d88f8..f939dc9 100644
--- a/po/pt/watchcat.po
+++ b/po/pt/watchcat.po
@@ -45,12 +45,12 @@ msgid "Watchcat"
 msgstr "Watchcat"
 
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
diff --git a/po/pt/wol.po b/po/pt/wol.po
index 76aaf7a..540e543 100644
--- a/po/pt/wol.po
+++ b/po/pt/wol.po
@@ -27,8 +27,9 @@ msgstr "Host a acordar"
 msgid "Network interface to use"
 msgstr "Interface de rede a usar"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr "Às vezes só uma das ferramentas funciona. Se uma falhar, tente a outra"
 
 msgid "Specifies the interface the WoL packet is sent on"
diff --git a/po/pt/wshaper.po b/po/pt/wshaper.po
index b576d66..96a7be8 100644
--- a/po/pt/wshaper.po
+++ b/po/pt/wshaper.po
@@ -50,6 +50,6 @@ msgid "Wondershaper settings"
 msgstr ""
 
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
diff --git a/po/pt_BR/ahcp.po b/po/pt_BR/ahcp.po
index 144ab81..55ec29c 100644
--- a/po/pt_BR/ahcp.po
+++ b/po/pt_BR/ahcp.po
@@ -14,9 +14,10 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "Servidor AHCP"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/pt_BR/base.po b/po/pt_BR/base.po
index 592bce0..0118b53 100644
--- a/po/pt_BR/base.po
+++ b/po/pt_BR/base.po
@@ -755,8 +755,9 @@ msgid ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
-"Dropbear oferece um acesso shell seguro à rede <abbr title=\"Shell Seguro\">"
-"(SSH)</abbr> e um servidor <abbr title=\"Cópia Segura\">SCP</abbr> integrado"
+"Dropbear oferece um acesso shell seguro à rede <abbr title=\"Shell Seguro"
+"\">(SSH)</abbr> e um servidor <abbr title=\"Cópia Segura\">SCP</abbr> "
+"integrado"
 
 msgid "Dual-Stack Lite (RFC6333)"
 msgstr ""
@@ -857,8 +858,9 @@ msgstr "Expandir arquivos de equipamentos conhecidos (hosts)"
 msgid "Expires"
 msgstr "Expira"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "Tempo de expiração dos endereços atribuídos. Mínimo é 2 minutos (<code>2m</"
 "code>)."
@@ -1293,9 +1295,10 @@ msgstr ""
 msgid "Invalid username and/or password! Please try again."
 msgstr "Usuário e/ou senha inválida! Por favor, tente novamente."
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "A imagem que está a tentar carregar aparenta nao caber na flash do "
 "equipamento. Por favor verifique o arquivo da imagem!"
@@ -1438,9 +1441,10 @@ msgstr "Hora Local"
 msgid "Local domain"
 msgstr "Domínio Local"
 
+#, fuzzy
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 "Especificação do domínio local. Nomes que casam com este domínio nunca serão "
 "encaminhados e são resolvidos somente pelo DHCP ou pelo arquivos de "
@@ -2015,19 +2019,20 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr "Realmente limpar todas as mudanças?"
 
+#, fuzzy
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
-"Realmente desligar esta interface\"%s\" ?\n"
+"Realmente desligar esta rede\"%s\" ?\n"
 "Você poderá perder o acesso a este dispositivo se você estiver conectado "
 "através desta interface."
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
-"Realmente desligar esta rede\"%s\" ?\n"
+"Realmente desligar esta interface\"%s\" ?\n"
 "Você poderá perder o acesso a este dispositivo se você estiver conectado "
 "através desta interface."
 
@@ -2235,12 +2240,13 @@ msgstr "Tipo do Serviço"
 msgid "Services"
 msgstr "Serviços"
 
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Configurar a Sincronização do Horário"
+
 msgid "Setup DHCP Server"
 msgstr "Configurar Servidor DHCP"
 
-msgid "Setup Time Synchronization"
-msgstr "Configurar a Sincronização do Horário"
-
 msgid "Show current backup file list"
 msgstr "Mostra a lista atual de arquivos para a cópia de segurança"
 
@@ -2283,8 +2289,9 @@ msgstr "Desculpe o objeto solicitado não foi encontrado"
 msgid "Sorry, the server encountered an unexpected error."
 msgstr "Desculpe, o servidor encontrou um erro inesperado."
 
+#, fuzzy
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2433,12 +2440,13 @@ msgstr "Destino"
 msgid "Terminate"
 msgstr "Terminar"
 
+#, fuzzy
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 "A seção da <em>Configuração do Dispositivo</em> engloba as configurações "
 "físicas do rádio como canal, potência de transmissão ou seleção da antena. "
@@ -2509,9 +2517,10 @@ msgstr "As seguintes regras estão atualmente ativas neste sistema."
 msgid "The given network name is not unique"
 msgstr "O nome de rede informado não é único"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 "Este equipamento não é capaz de utilizar SSID múltiplos e as configurações "
 "existentes serão substituídas se você proceder."
@@ -2551,9 +2560,10 @@ msgstr ""
 "O sistema está apagando agora a partição da configuração e irá reiniciar "
 "quando terminado."
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/pt_BR/firewall.po b/po/pt_BR/firewall.po
index 6e57c69..f32f70e 100644
--- a/po/pt_BR/firewall.po
+++ b/po/pt_BR/firewall.po
@@ -387,12 +387,13 @@ msgstr ""
 "Esta página permite que você mude propriedades avançadas da entrada da regra "
 "de tráfego, como os equipamentos de origem e destino."
 
+#, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 "Esta seção define as propriedades comuns de %q. As opções de <em>entrada</"
 "em> e <em>saída</em> definem as políticas padrão para o tráfego entrando e "
diff --git a/po/pt_BR/meshwizard.po b/po/pt_BR/meshwizard.po
index 35acb40..a2238e5 100644
--- a/po/pt_BR/meshwizard.po
+++ b/po/pt_BR/meshwizard.po
@@ -40,8 +40,8 @@ msgstr "Habilitar DHCP"
 
 msgid "Enable RA"
 msgstr ""
-"Habilitar <abbr title=\\\"Router Advertisement, Anúncio de "
-"Roteador\\\">RA</abbr>"
+"Habilitar <abbr title=\\\"Router Advertisement, Anúncio de Roteador\\\">RA</"
+"abbr>"
 
 msgid "Enabled"
 msgstr "Habilitado"
@@ -70,9 +70,10 @@ msgstr "Endereço IPv6 da rede em malha"
 msgid "Mesh Wizard"
 msgstr "Assistente de Configuração da Rede em Malha"
 
+#, fuzzy
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 "Nota: Isto irá configurar a interface para operação em malha, p. ex. "
 "adicionar à zona 'freifunk' e ativar o OLSR. "
@@ -88,8 +89,8 @@ msgstr ""
 
 msgid "Send router advertisements on this device."
 msgstr ""
-"Envia <abbr title=\\\"Router Advertisement, Anúncio de Roteador\\\">RA</abbr> a "
-"partir deste dispositivo."
+"Envia <abbr title=\\\"Router Advertisement, Anúncio de Roteador\\\">RA</"
+"abbr> a partir deste dispositivo."
 
 msgid "Share your internet connection"
 msgstr "Compartilhar sua conexão com a internet"
diff --git a/po/pt_BR/olsr.po b/po/pt_BR/olsr.po
index cc8a906..1461c1d 100644
--- a/po/pt_BR/olsr.po
+++ b/po/pt_BR/olsr.po
@@ -58,6 +58,12 @@ msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 "Somente pode ser um endereço IPv4 ou IPv6 válidos ou um endereço 'padrão'"
 
+# 20140621: edersg: tradução
+#, fuzzy
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+"Somente pode ser um endereço IPv4 ou IPv6 válidos ou um endereço 'padrão'"
+
 msgid "Configuration"
 msgstr "Configuração"
 
@@ -167,6 +173,12 @@ msgstr ""
 "Validade do <abbr title=\"Host and network association, Associação de "
 "equipamentos e redes\">HNA</abbr>"
 
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr ""
+"Anúncios do <abbr title=\"Host and network association, Associação de "
+"equipamentos e redes\">HNA</abbr>"
+
 msgid "Hello"
 msgstr "Saudação (Hello)"
 
@@ -203,6 +215,14 @@ msgstr ""
 "Equipamentos em uma rede roteada por OLSR podem anunciar conectividade para "
 "redes externas usando mensagens HNA."
 
+#, fuzzy
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+"Equipamentos em uma rede roteada por OLSR podem anunciar conectividade para "
+"redes externas usando mensagens HNA."
+
 # Hysteresis é Histerese que significa "retardo"
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
@@ -472,8 +492,21 @@ msgid ""
 msgstr ""
 "Múltiplas rotas com o fator configurado aqui. Os valores permitidos estão "
 "entre 0.01 e 1.0. Ele somente é utilizado quando o nível-LQ é maior que 0. "
-"Exemplos: <br />reduzir LQ para 192.168.0.1 pela metade: 192.168.0.1 0.5<br "
-"/> reduzir LQ para todos os nós nesta interface em 20%: padrão 0.8"
+"Exemplos: <br />reduzir LQ para 192.168.0.1 pela metade: 192.168.0.1 0.5<br /"
+"> reduzir LQ para todos os nós nesta interface em 20%: padrão 0.8"
+
+# 20140621: edersg: tradução
+#, fuzzy
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+"Múltiplas rotas com o fator configurado aqui. Os valores permitidos estão "
+"entre 0.01 e 1.0. Ele somente é utilizado quando o nível-LQ é maior que 0. "
+"Exemplos: <br />reduzir LQ para 192.168.0.1 pela metade: 192.168.0.1 0.5<br /"
+"> reduzir LQ para todos os nós nesta interface em 20%: padrão 0.8"
 
 msgid "NAT threshold"
 msgstr "Limiar do NAT"
@@ -518,6 +551,12 @@ msgstr ""
 "OLSR - Anúncios <abbr title=\"Host and network association, Associação de "
 "equipamentos e redes\">HNA</abbr>"
 
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+"OLSR - Anúncios <abbr title=\"Host and network association, Associação de "
+"equipamentos e redes\">HNA</abbr>"
+
 msgid "OLSR - Plugins"
 msgstr "OLSR - Plugins"
 
@@ -615,6 +654,16 @@ msgstr ""
 "durante o funcionamento do olsrd. O padrão é 0.0.0.0, que faz com que o "
 "endereço da primeira interface seja usado."
 
+#, fuzzy
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+"Define o IP principal (ip originador) do seu roteador. Este IP nunca muda "
+"durante o funcionamento do olsrd. O padrão é 0.0.0.0, que faz com que o "
+"endereço da primeira interface seja usado."
+
 # 20140621: edersg: tradução
 msgid "Show IPv4"
 msgstr "Exibir IPv4"
@@ -808,6 +857,17 @@ msgstr ""
 "and network association, Associação de equipamentos e redes\">HNA</abbr> "
 "local de 0.0.0.0/0, ::ffff:0:0/96 ou 2000::/3. O padrão é \"ambos\"."
 
+#, fuzzy
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+"Que tipo de enlace superior (uplink) é exportado para outros nós da rede em "
+"malha. Um enlace superior é detectado buscando por uma <abbr title=\"Host "
+"and network association, Associação de equipamentos e redes\">HNA</abbr> "
+"local de 0.0.0.0/0, ::ffff:0:0/96 ou 2000::/3. O padrão é \"ambos\"."
+
 msgid "Willingness"
 msgstr "Disponibilidade"
 
@@ -827,9 +887,9 @@ msgstr "Sim"
 #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
 #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
 #~ msgstr ""
-#~ "Certifique-se que o processo OLSRd está em execução, que o plugin \"txtinfo\" "
-#~ "está carregado e configurado para a porta 2006 e que aceita conexões a "
-#~ "partir de \"127.0.0.1\"."
+#~ "Certifique-se que o processo OLSRd está em execução, que o plugin "
+#~ "\"txtinfo\" está carregado e configurado para a porta 2006 e que aceita "
+#~ "conexões a partir de \"127.0.0.1\"."
 
 #~ msgid ""
 #~ "Multiply routes with the factor given here. Allowed values are between "
@@ -837,9 +897,10 @@ msgstr "Sim"
 #~ "<br />reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to "
 #~ "all nodes on this interface by 20%: default 0.8"
 #~ msgstr ""
-#~ "Multiplica rotas com o fator informado. Os valores válidos são entre 0.01 e "
-#~ "1. Somente é usado quando o nível <abbr title=\"Link Quality, Qualidade do "
-#~ "Enlace\">LQ</abbr> é maior que 0. Exemplos:<br />reduzir o <abbr title=\"Link "
-#~ "Quality, Qualidade do Enlace\">LQ</abbr> para 192.168.0.1 pela metade: "
-#~ "192.168.0.1 0.5<br />reduzir o <abbr title=\"Link Quality, Qualidade do "
-#~ "Enlace\">LQ</abbr> de todos os nós desta interface para 20%: Padrão 0.8"
+#~ "Multiplica rotas com o fator informado. Os valores válidos são entre 0.01 "
+#~ "e 1. Somente é usado quando o nível <abbr title=\"Link Quality, Qualidade "
+#~ "do Enlace\">LQ</abbr> é maior que 0. Exemplos:<br />reduzir o <abbr title="
+#~ "\"Link Quality, Qualidade do Enlace\">LQ</abbr> para 192.168.0.1 pela "
+#~ "metade: 192.168.0.1 0.5<br />reduzir o <abbr title=\"Link Quality, "
+#~ "Qualidade do Enlace\">LQ</abbr> de todos os nós desta interface para 20%: "
+#~ "Padrão 0.8"
diff --git a/po/pt_BR/watchcat.po b/po/pt_BR/watchcat.po
index f946b23..fe97036 100644
--- a/po/pt_BR/watchcat.po
+++ b/po/pt_BR/watchcat.po
@@ -51,16 +51,18 @@ msgstr "Período de ping"
 msgid "Watchcat"
 msgstr "Watchcat"
 
+#, fuzzy
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 "Watchcat permite que se configure um período para reiniciar e/ou quando a "
 "conexão com à Internet foi perdida por um ser período de tempo."
 
+#, fuzzy
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
 "Ao se reiniciar o sistema, watchcat acionará uma reiniciação suave. Ao se "
diff --git a/po/pt_BR/wol.po b/po/pt_BR/wol.po
index eda9dcd..6a21a85 100644
--- a/po/pt_BR/wol.po
+++ b/po/pt_BR/wol.po
@@ -27,8 +27,9 @@ msgstr "Computador para acordar"
 msgid "Network interface to use"
 msgstr "Interfaces de rede para usar"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 "Algumas vezes, somente uma das ferramentas funciona. Se uma delas falhar, "
 "tente a outra"
diff --git a/po/pt_BR/wshaper.po b/po/pt_BR/wshaper.po
index 7e402b6..f973ebb 100644
--- a/po/pt_BR/wshaper.po
+++ b/po/pt_BR/wshaper.po
@@ -49,9 +49,10 @@ msgstr "Wondershaper"
 msgid "Wondershaper settings"
 msgstr "Configuração do Wondershaper"
 
+#, fuzzy
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
 "Wondershaper usa o controle de tráfego para garantir baixa latência para "
 "tráfego interativo mesmo quando sua conexão com a internet está extremamente "
diff --git a/po/ro/ahcp.po b/po/ro/ahcp.po
index 263c060..2882b31 100644
--- a/po/ro/ahcp.po
+++ b/po/ro/ahcp.po
@@ -15,9 +15,10 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "Server AHCP"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/ro/base.po b/po/ro/base.po
index 2a9bd31..36a9b1f 100644
--- a/po/ro/base.po
+++ b/po/ro/base.po
@@ -807,7 +807,7 @@ msgid "Expires"
 msgstr "Expira"
 
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
 msgid "External"
@@ -1218,9 +1218,10 @@ msgstr ""
 msgid "Invalid username and/or password! Please try again."
 msgstr "Utilizator si/sau parola invalide! Incearcati din nou."
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "Se pare ca ai incercat sa rescrii o imagine care nu are loc in memoria "
 "flash, verifica fisierul din nou!"
@@ -1357,8 +1358,8 @@ msgid "Local domain"
 msgstr "Domeniu local"
 
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
@@ -1903,13 +1904,13 @@ msgid "Really reset all changes?"
 msgstr ""
 
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
 
 msgid "Really switch protocol?"
@@ -2111,12 +2112,13 @@ msgstr "Tip de serviciu"
 msgid "Services"
 msgstr "Servicii"
 
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Configurare sincronizare timp"
+
 msgid "Setup DHCP Server"
 msgstr "Seteaza serverul DHCP"
 
-msgid "Setup Time Synchronization"
-msgstr "Configurare sincronizare timp"
-
 msgid "Show current backup file list"
 msgstr ""
 
@@ -2160,7 +2162,7 @@ msgid "Sorry, the server encountered an unexpected error."
 msgstr ""
 
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2300,10 +2302,10 @@ msgstr "Termina"
 
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 
 msgid ""
@@ -2355,8 +2357,8 @@ msgid "The given network name is not unique"
 msgstr ""
 
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 
 msgid ""
@@ -2386,7 +2388,7 @@ msgstr ""
 
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/ro/firewall.po b/po/ro/firewall.po
index 759f77d..391b949 100644
--- a/po/ro/firewall.po
+++ b/po/ro/firewall.po
@@ -358,7 +358,7 @@ msgid ""
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
 msgid "To %s at %s on <var>this device</var>"
diff --git a/po/ro/meshwizard.po b/po/ro/meshwizard.po
index 6ad5136..9f1c466 100644
--- a/po/ro/meshwizard.po
+++ b/po/ro/meshwizard.po
@@ -66,8 +66,8 @@ msgid "Mesh Wizard"
 msgstr ""
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/ro/olsr.po b/po/ro/olsr.po
index a40232f..257fab3 100644
--- a/po/ro/olsr.po
+++ b/po/ro/olsr.po
@@ -51,6 +51,9 @@ msgstr ""
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr "Configuraţie"
 
@@ -133,6 +136,9 @@ msgstr ""
 msgid "HNA validity time"
 msgstr ""
 
+msgid "HNA6 Announcements"
+msgstr ""
+
 msgid "Hello"
 msgstr ""
 
@@ -166,6 +172,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -370,6 +381,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -409,6 +427,9 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
 msgid "OLSR - Plugins"
 msgstr ""
 
@@ -496,6 +517,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr "Arată IPv4"
 
@@ -645,6 +672,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/ro/watchcat.po b/po/ro/watchcat.po
index adb42c4..cda0911 100644
--- a/po/ro/watchcat.po
+++ b/po/ro/watchcat.po
@@ -46,12 +46,12 @@ msgid "Watchcat"
 msgstr ""
 
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
diff --git a/po/ro/wol.po b/po/ro/wol.po
index 26946e3..154a3f9 100644
--- a/po/ro/wol.po
+++ b/po/ro/wol.po
@@ -28,8 +28,9 @@ msgstr "Statie pentru \"trezire\""
 msgid "Network interface to use"
 msgstr "Interfata de retea pentru utilizare"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 "Uneori doar una dintre metode functioneaza. Daca se intampla, incearc-o pe "
 "cealalta"
diff --git a/po/ro/wshaper.po b/po/ro/wshaper.po
index 0806d09..d2569f6 100644
--- a/po/ro/wshaper.po
+++ b/po/ro/wshaper.po
@@ -51,6 +51,6 @@ msgid "Wondershaper settings"
 msgstr ""
 
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
diff --git a/po/ru/ahcp.po b/po/ru/ahcp.po
index c18207b..f08cb70 100644
--- a/po/ru/ahcp.po
+++ b/po/ru/ahcp.po
@@ -18,9 +18,10 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "AHCP-сервер"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/ru/base.po b/po/ru/base.po
index 99c7267..7a073f5 100644
--- a/po/ru/base.po
+++ b/po/ru/base.po
@@ -853,8 +853,9 @@ msgstr "Расширять имена узлов"
 msgid "Expires"
 msgstr "Истекает"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "Время, через которое истекает аренда адреса, минимум 2 минуты (<code>2m</"
 "code>)."
@@ -1282,9 +1283,10 @@ msgstr "Указан неверный VLAN ID! Доступны только у
 msgid "Invalid username and/or password! Please try again."
 msgstr "Неверный логин и/или пароль! Пожалуйста попробуйте снова."
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "Вы пытаетесь обновить прошивку файлом, который не помещается в память "
 "устройства! Пожалуйста, проверьте файл образа."
@@ -1422,9 +1424,10 @@ msgstr "Местное время"
 msgid "Local domain"
 msgstr "Локальный домен"
 
+#, fuzzy
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 "Определение локального домена. Имена в этом домене никогда не запрашиваются "
 "у DNS-сервера, а разрешаются на основе данных DHCP и файлов hosts"
@@ -1993,6 +1996,14 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr "Действительно сбросить все изменения?"
 
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"Действительно выключить сеть?\\nВы можете потерять доступ к этому "
+"устройству, если вы подключены через этот интерфейс."
+
 msgid ""
 "Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
 "you are connected via this interface."
@@ -2000,13 +2011,6 @@ msgstr ""
 "Действительно отключить интерфейс \"%s\" ?\\nВы можете потерять доступ к "
 "этому устройству, если вы подключены через этот интерфейс."
 
-msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
-msgstr ""
-"Действительно выключить сеть?\\nВы можете потерять доступ к этому "
-"устройству, если вы подключены через этот интерфейс."
-
 msgid "Really switch protocol?"
 msgstr "Вы действительно хотите изменить протокол?"
 
@@ -2211,12 +2215,13 @@ msgstr "Тип службы"
 msgid "Services"
 msgstr "Сервисы"
 
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Настроить синхронизацию времени"
+
 msgid "Setup DHCP Server"
 msgstr "Настроить сервер DHCP"
 
-msgid "Setup Time Synchronization"
-msgstr "Настроить синхронизацию времени"
-
 msgid "Show current backup file list"
 msgstr "Показать текущий список файлов резервной копии"
 
@@ -2259,8 +2264,9 @@ msgstr "Извините, запрошенный объект не был най
 msgid "Sorry, the server encountered an unexpected error."
 msgstr "Извините, сервер столкнулся с неожиданной ошибкой."
 
+#, fuzzy
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2407,12 +2413,13 @@ msgstr "Цель"
 msgid "Terminate"
 msgstr "Завершить"
 
+#, fuzzy
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 "Раздел <em>Конфигурация устройства</em> содержит физические настройки "
 "беспроводного оборудования, такие как канал, мощность передатчика или выбор "
@@ -2481,9 +2488,10 @@ msgstr "На данном устройстве активны следующие
 msgid "The given network name is not unique"
 msgstr "Заданное имя сети не является уникальным"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 "Оборудование не поддерживает несколько SSID, и, если вы продолжите, "
 "существующая конфигурация будет заменена."
@@ -2522,9 +2530,10 @@ msgid ""
 msgstr ""
 "Идёт удаление раздела конфигурации с последующей перезагрузкой сиситемы."
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/ru/firewall.po b/po/ru/firewall.po
index 305090a..aa5c5a8 100644
--- a/po/ru/firewall.po
+++ b/po/ru/firewall.po
@@ -411,12 +411,13 @@ msgstr ""
 "На этой странице можно изменить расширенные настройки правил для трафика. В "
 "большинстве случаев нет необходимости изменять эти параметры."
 
+#, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 "Данная секция позволяет изменять общие настройки %q. Опции <em>входящий</em> "
 "и <em>исходящий</em> устанавливают политику по умолчанию для входящего и "
diff --git a/po/ru/meshwizard.po b/po/ru/meshwizard.po
index 584965a..876ac36 100644
--- a/po/ru/meshwizard.po
+++ b/po/ru/meshwizard.po
@@ -73,12 +73,13 @@ msgstr "IPv6-адрес в mesh-сети"
 msgid "Mesh Wizard"
 msgstr "Мастер настройки ячеистой сети"
 
+#, fuzzy
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
-"Примечание: эта опция установит данный интерфейс в режим работы с "
-"mesh-сетями, т.е. добавит его в зону ''freifunk' (\"free wireless radio\") и "
+"Примечание: эта опция установит данный интерфейс в режим работы с mesh-"
+"сетями, т.е. добавит его в зону ''freifunk' (\"free wireless radio\") и "
 "включит протокол OLSR."
 
 msgid "Protect LAN"
diff --git a/po/ru/olsr.po b/po/ru/olsr.po
index 4528625..51267e0 100644
--- a/po/ru/olsr.po
+++ b/po/ru/olsr.po
@@ -56,6 +56,9 @@ msgstr "Широковещательный адрес"
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr "Конфигурация"
 
@@ -147,6 +150,10 @@ msgstr "HNA интервал"
 msgid "HNA validity time"
 msgstr "Время действия HNA"
 
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "Объявления HNA"
+
 msgid "Hello"
 msgstr "Приветственное сообщение"
 
@@ -181,6 +188,14 @@ msgstr ""
 "Хосты в маршрутизируемой сети OLSR могут извещать о подключении к внешним "
 "сетям с помощью сообщений HNA."
 
+#, fuzzy
+msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+"Хосты в маршрутизируемой сети OLSR могут извещать о подключении к внешним "
+"сетям с помощью сообщений HNA."
+
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
@@ -426,6 +441,18 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+#, fuzzy
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+"Умножить маршруты на указанный коэффициент в пределах от 0.01 до 1. Данный "
+"коэффициент используется только в случае, если LQ уровень > 0. Примеры:<br /"
+">уменьшить LQ для 192.168.0.1 на половину: 192.168.0.1 0.5<br />уменьшить LQ "
+"для всех узлов на данном интерфейсе на 20%: default 0.8"
+
 msgid "NAT threshold"
 msgstr "Порог NAT"
 
@@ -465,6 +492,10 @@ msgstr "OLSR - Настройки отображения"
 msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - HNA-объявления"
 
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "OLSR - HNA-объявления"
+
 msgid "OLSR - Plugins"
 msgstr "OLSR - Модули"
 
@@ -560,6 +591,16 @@ msgstr ""
 "будет изменяться во время работы olsrd. По умолчанию 0.0.0.0 (используется "
 "IP-адрес первого сетевого интерфейса)."
 
+#, fuzzy
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+"Устанавливает основной IP-адрес маршрутизатора. Данный адрес НИКОГДА не "
+"будет изменяться во время работы olsrd. По умолчанию 0.0.0.0 (используется "
+"IP-адрес первого сетевого интерфейса)."
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -738,6 +779,16 @@ msgstr ""
 "Определение восходящего канала происходит при наличии в локальном HNA "
 "0.0.0.0/0, ::ffff:0:0/96 или 2000::/3. Значение по умолчанию: \"оба\"."
 
+#, fuzzy
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+"Какой вид восходящего канала экпортируется другим узлам ячеистой сети. "
+"Определение восходящего канала происходит при наличии в локальном HNA "
+"0.0.0.0/0, ::ffff:0:0/96 или 2000::/3. Значение по умолчанию: \"оба\"."
+
 msgid "Willingness"
 msgstr "Готовность"
 
@@ -757,16 +808,5 @@ msgstr ""
 #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
 #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
 #~ msgstr ""
-#~ "Удостоверьтесь, что OLSRd работает, модуль \"txtinfo\" загружен, настроен на "
-#~ "порт 2006 и принимает соединения от \"127.0.0.1\"."
-
-#~ msgid ""
-#~ "Multiply routes with the factor given here. Allowed values are between "
-#~ "0.01 and 1. It is only used when LQ-Level is greater than 0. Examples:"
-#~ "<br />reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to "
-#~ "all nodes on this interface by 20%: default 0.8"
-#~ msgstr ""
-#~ "Умножить маршруты на указанный коэффициент в пределах от 0.01 до 1. Данный "
-#~ "коэффициент используется только в случае, если LQ уровень > 0. Примеры:<br "
-#~ "/>уменьшить LQ для 192.168.0.1 на половину: 192.168.0.1 0.5<br />уменьшить "
-#~ "LQ для всех узлов на данном интерфейсе на 20%: default 0.8"
+#~ "Удостоверьтесь, что OLSRd работает, модуль \"txtinfo\" загружен, настроен "
+#~ "на порт 2006 и принимает соединения от \"127.0.0.1\"."
diff --git a/po/ru/watchcat.po b/po/ru/watchcat.po
index 828f65d..83b95e2 100644
--- a/po/ru/watchcat.po
+++ b/po/ru/watchcat.po
@@ -54,16 +54,18 @@ msgstr "Период опроса"
 msgid "Watchcat"
 msgstr "Watchcat"
 
+#, fuzzy
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 "Watchcat позволяет настроить периодическую перезагрузку устройства и/или "
 "перезагрузку при потере интернет-соединения на определённое время."
 
+#, fuzzy
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
 "При необходимости перезагрузке системы, watchcat вызовет программную "
diff --git a/po/ru/wol.po b/po/ru/wol.po
index 6921997..9a84366 100644
--- a/po/ru/wol.po
+++ b/po/ru/wol.po
@@ -29,8 +29,9 @@ msgstr "Хост, который необходимо разбудить"
 msgid "Network interface to use"
 msgstr "Используемый сетевой интерфейс"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 "Иногда только одна из двух утилит работает. В случае ошибки, попробуйте "
 "использовать другую"
diff --git a/po/ru/wshaper.po b/po/ru/wshaper.po
index ac6b659..1984aac 100644
--- a/po/ru/wshaper.po
+++ b/po/ru/wshaper.po
@@ -51,9 +51,10 @@ msgstr "Wondershaper"
 msgid "Wondershaper settings"
 msgstr "Установки Wondershaper"
 
+#, fuzzy
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
 "Wondershaper использует формирование трафика для обеспечения низких задержек "
 "интерактивного трафика даже в случае высокой загруженности интернет-"
diff --git a/po/sk/ahcp.po b/po/sk/ahcp.po
index 26a13cc..b618490 100644
--- a/po/sk/ahcp.po
+++ b/po/sk/ahcp.po
@@ -13,7 +13,7 @@ msgstr ""
 
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/sk/base.po b/po/sk/base.po
index 61c0985..6a724ed 100644
--- a/po/sk/base.po
+++ b/po/sk/base.po
@@ -785,7 +785,7 @@ msgid "Expires"
 msgstr ""
 
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
 msgid "External"
@@ -1194,8 +1194,8 @@ msgid "Invalid username and/or password! Please try again."
 msgstr ""
 
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 
 msgid "Java Script required!"
@@ -1330,8 +1330,8 @@ msgid "Local domain"
 msgstr ""
 
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
@@ -1874,13 +1874,13 @@ msgid "Really reset all changes?"
 msgstr ""
 
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
 
 msgid "Really switch protocol?"
@@ -2082,10 +2082,10 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-msgid "Setup DHCP Server"
+msgid "Set up Time Synchronization"
 msgstr ""
 
-msgid "Setup Time Synchronization"
+msgid "Setup DHCP Server"
 msgstr ""
 
 msgid "Show current backup file list"
@@ -2131,7 +2131,7 @@ msgid "Sorry, the server encountered an unexpected error."
 msgstr ""
 
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2271,10 +2271,10 @@ msgstr ""
 
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 
 msgid ""
@@ -2326,8 +2326,8 @@ msgid "The given network name is not unique"
 msgstr ""
 
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 
 msgid ""
@@ -2357,7 +2357,7 @@ msgstr ""
 
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/sk/firewall.po b/po/sk/firewall.po
index 5a7936b..32cd193 100644
--- a/po/sk/firewall.po
+++ b/po/sk/firewall.po
@@ -354,7 +354,7 @@ msgid ""
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
 msgid "To %s at %s on <var>this device</var>"
diff --git a/po/sk/meshwizard.po b/po/sk/meshwizard.po
index 146fac4..c86708a 100644
--- a/po/sk/meshwizard.po
+++ b/po/sk/meshwizard.po
@@ -61,8 +61,8 @@ msgid "Mesh Wizard"
 msgstr ""
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/sk/olsr.po b/po/sk/olsr.po
index 1b59fc5..fdd37e3 100644
--- a/po/sk/olsr.po
+++ b/po/sk/olsr.po
@@ -47,6 +47,9 @@ msgstr ""
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr ""
 
@@ -129,6 +132,9 @@ msgstr ""
 msgid "HNA validity time"
 msgstr ""
 
+msgid "HNA6 Announcements"
+msgstr ""
+
 msgid "Hello"
 msgstr ""
 
@@ -162,6 +168,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -366,6 +377,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -405,6 +423,9 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
 msgid "OLSR - Plugins"
 msgstr ""
 
@@ -492,6 +513,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -641,6 +668,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/sk/watchcat.po b/po/sk/watchcat.po
index 9ca2abc..2ff7de9 100644
--- a/po/sk/watchcat.po
+++ b/po/sk/watchcat.po
@@ -42,12 +42,12 @@ msgid "Watchcat"
 msgstr ""
 
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
diff --git a/po/sk/wol.po b/po/sk/wol.po
index 59032ee..eea59eb 100644
--- a/po/sk/wol.po
+++ b/po/sk/wol.po
@@ -21,7 +21,7 @@ msgid "Network interface to use"
 msgstr ""
 
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 
 msgid "Specifies the interface the WoL packet is sent on"
diff --git a/po/sk/wshaper.po b/po/sk/wshaper.po
index c974be4..4e03aa8 100644
--- a/po/sk/wshaper.po
+++ b/po/sk/wshaper.po
@@ -45,6 +45,6 @@ msgid "Wondershaper settings"
 msgstr ""
 
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
diff --git a/po/sv/ahcp.po b/po/sv/ahcp.po
index 3bddfb5..b5f0b7d 100644
--- a/po/sv/ahcp.po
+++ b/po/sv/ahcp.po
@@ -16,7 +16,7 @@ msgstr "AHCP-server"
 
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/sv/base.po b/po/sv/base.po
index 3648068..f7d4ae6 100644
--- a/po/sv/base.po
+++ b/po/sv/base.po
@@ -791,7 +791,7 @@ msgid "Expires"
 msgstr ""
 
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
 msgid "External"
@@ -1200,8 +1200,8 @@ msgid "Invalid username and/or password! Please try again."
 msgstr ""
 
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 
 msgid "Java Script required!"
@@ -1336,8 +1336,8 @@ msgid "Local domain"
 msgstr ""
 
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
@@ -1880,13 +1880,13 @@ msgid "Really reset all changes?"
 msgstr ""
 
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
 
 msgid "Really switch protocol?"
@@ -2088,10 +2088,10 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-msgid "Setup DHCP Server"
+msgid "Set up Time Synchronization"
 msgstr ""
 
-msgid "Setup Time Synchronization"
+msgid "Setup DHCP Server"
 msgstr ""
 
 msgid "Show current backup file list"
@@ -2137,7 +2137,7 @@ msgid "Sorry, the server encountered an unexpected error."
 msgstr ""
 
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2277,10 +2277,10 @@ msgstr ""
 
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 
 msgid ""
@@ -2332,8 +2332,8 @@ msgid "The given network name is not unique"
 msgstr ""
 
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 
 msgid ""
@@ -2363,7 +2363,7 @@ msgstr ""
 
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/sv/firewall.po b/po/sv/firewall.po
index d8dbeb8..f3e7fd9 100644
--- a/po/sv/firewall.po
+++ b/po/sv/firewall.po
@@ -355,7 +355,7 @@ msgid ""
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
 msgid "To %s at %s on <var>this device</var>"
diff --git a/po/sv/meshwizard.po b/po/sv/meshwizard.po
index 7cb5874..b898024 100644
--- a/po/sv/meshwizard.po
+++ b/po/sv/meshwizard.po
@@ -62,8 +62,8 @@ msgid "Mesh Wizard"
 msgstr ""
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/sv/olsr.po b/po/sv/olsr.po
index ce10a2b..9af47a4 100644
--- a/po/sv/olsr.po
+++ b/po/sv/olsr.po
@@ -48,6 +48,9 @@ msgstr ""
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr ""
 
@@ -130,6 +133,9 @@ msgstr ""
 msgid "HNA validity time"
 msgstr ""
 
+msgid "HNA6 Announcements"
+msgstr ""
+
 msgid "Hello"
 msgstr ""
 
@@ -163,6 +169,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -367,6 +378,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -406,6 +424,9 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
 msgid "OLSR - Plugins"
 msgstr ""
 
@@ -493,6 +514,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -642,6 +669,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/sv/watchcat.po b/po/sv/watchcat.po
index fa6e105..dd2365a 100644
--- a/po/sv/watchcat.po
+++ b/po/sv/watchcat.po
@@ -43,12 +43,12 @@ msgid "Watchcat"
 msgstr ""
 
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
diff --git a/po/sv/wol.po b/po/sv/wol.po
index 2f1a02b..44b5995 100644
--- a/po/sv/wol.po
+++ b/po/sv/wol.po
@@ -22,7 +22,7 @@ msgid "Network interface to use"
 msgstr ""
 
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 
 msgid "Specifies the interface the WoL packet is sent on"
diff --git a/po/sv/wshaper.po b/po/sv/wshaper.po
index 1e47e48..b85651a 100644
--- a/po/sv/wshaper.po
+++ b/po/sv/wshaper.po
@@ -46,6 +46,6 @@ msgid "Wondershaper settings"
 msgstr ""
 
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
diff --git a/po/templates/ahcp.pot b/po/templates/ahcp.pot
index f95a8e9..ea6bb42 100644
--- a/po/templates/ahcp.pot
+++ b/po/templates/ahcp.pot
@@ -6,7 +6,7 @@ msgstr ""
 
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/templates/base.pot b/po/templates/base.pot
index 72bb926..f71e6d3 100644
--- a/po/templates/base.pot
+++ b/po/templates/base.pot
@@ -778,7 +778,7 @@ msgid "Expires"
 msgstr ""
 
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
 msgid "External"
@@ -1187,8 +1187,8 @@ msgid "Invalid username and/or password! Please try again."
 msgstr ""
 
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 
 msgid "Java Script required!"
@@ -1323,8 +1323,8 @@ msgid "Local domain"
 msgstr ""
 
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
@@ -1867,13 +1867,13 @@ msgid "Really reset all changes?"
 msgstr ""
 
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
 
 msgid "Really switch protocol?"
@@ -2075,10 +2075,10 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-msgid "Setup DHCP Server"
+msgid "Set up Time Synchronization"
 msgstr ""
 
-msgid "Setup Time Synchronization"
+msgid "Setup DHCP Server"
 msgstr ""
 
 msgid "Show current backup file list"
@@ -2124,7 +2124,7 @@ msgid "Sorry, the server encountered an unexpected error."
 msgstr ""
 
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2264,10 +2264,10 @@ msgstr ""
 
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 
 msgid ""
@@ -2319,8 +2319,8 @@ msgid "The given network name is not unique"
 msgstr ""
 
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 
 msgid ""
@@ -2350,7 +2350,7 @@ msgstr ""
 
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/templates/firewall.pot b/po/templates/firewall.pot
index 03a33d6..402aa69 100644
--- a/po/templates/firewall.pot
+++ b/po/templates/firewall.pot
@@ -347,7 +347,7 @@ msgid ""
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
 msgid "To %s at %s on <var>this device</var>"
diff --git a/po/templates/meshwizard.pot b/po/templates/meshwizard.pot
index 63a6563..9dfdec5 100644
--- a/po/templates/meshwizard.pot
+++ b/po/templates/meshwizard.pot
@@ -54,8 +54,8 @@ msgid "Mesh Wizard"
 msgstr ""
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/templates/olsr.pot b/po/templates/olsr.pot
index 333d085..6bd63c2 100644
--- a/po/templates/olsr.pot
+++ b/po/templates/olsr.pot
@@ -40,6 +40,9 @@ msgstr ""
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr ""
 
@@ -122,6 +125,9 @@ msgstr ""
 msgid "HNA validity time"
 msgstr ""
 
+msgid "HNA6 Announcements"
+msgstr ""
+
 msgid "Hello"
 msgstr ""
 
@@ -155,6 +161,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -359,6 +370,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -398,6 +416,9 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
 msgid "OLSR - Plugins"
 msgstr ""
 
@@ -485,6 +506,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -634,6 +661,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/templates/watchcat.pot b/po/templates/watchcat.pot
index 0005ead..490ec5c 100644
--- a/po/templates/watchcat.pot
+++ b/po/templates/watchcat.pot
@@ -35,12 +35,12 @@ msgid "Watchcat"
 msgstr ""
 
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
diff --git a/po/templates/wol.pot b/po/templates/wol.pot
index 10db87c..1305c53 100644
--- a/po/templates/wol.pot
+++ b/po/templates/wol.pot
@@ -14,7 +14,7 @@ msgid "Network interface to use"
 msgstr ""
 
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 
 msgid "Specifies the interface the WoL packet is sent on"
diff --git a/po/templates/wshaper.pot b/po/templates/wshaper.pot
index f89bd56..42de011 100644
--- a/po/templates/wshaper.pot
+++ b/po/templates/wshaper.pot
@@ -38,6 +38,6 @@ msgid "Wondershaper settings"
 msgstr ""
 
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
diff --git a/po/tr/ahcp.po b/po/tr/ahcp.po
index 105266d..ca33071 100644
--- a/po/tr/ahcp.po
+++ b/po/tr/ahcp.po
@@ -14,9 +14,10 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "AHCP Sunucusu"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/tr/base.po b/po/tr/base.po
index 7ac11fa..fdf65fc 100644
--- a/po/tr/base.po
+++ b/po/tr/base.po
@@ -798,7 +798,7 @@ msgid "Expires"
 msgstr ""
 
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
 msgid "External"
@@ -1207,8 +1207,8 @@ msgid "Invalid username and/or password! Please try again."
 msgstr ""
 
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 
 msgid "Java Script required!"
@@ -1343,8 +1343,8 @@ msgid "Local domain"
 msgstr ""
 
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
@@ -1887,13 +1887,13 @@ msgid "Really reset all changes?"
 msgstr ""
 
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
 
 msgid "Really switch protocol?"
@@ -2095,10 +2095,10 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-msgid "Setup DHCP Server"
+msgid "Set up Time Synchronization"
 msgstr ""
 
-msgid "Setup Time Synchronization"
+msgid "Setup DHCP Server"
 msgstr ""
 
 msgid "Show current backup file list"
@@ -2144,7 +2144,7 @@ msgid "Sorry, the server encountered an unexpected error."
 msgstr ""
 
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2284,10 +2284,10 @@ msgstr ""
 
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 
 msgid ""
@@ -2339,8 +2339,8 @@ msgid "The given network name is not unique"
 msgstr ""
 
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 
 msgid ""
@@ -2370,7 +2370,7 @@ msgstr ""
 
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/tr/firewall.po b/po/tr/firewall.po
index a38166a..60a2190 100644
--- a/po/tr/firewall.po
+++ b/po/tr/firewall.po
@@ -354,7 +354,7 @@ msgid ""
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
 msgid "To %s at %s on <var>this device</var>"
diff --git a/po/tr/meshwizard.po b/po/tr/meshwizard.po
index b0fcb64..92cabd4 100644
--- a/po/tr/meshwizard.po
+++ b/po/tr/meshwizard.po
@@ -61,8 +61,8 @@ msgid "Mesh Wizard"
 msgstr ""
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/tr/olsr.po b/po/tr/olsr.po
index 02cbb9f..1864189 100644
--- a/po/tr/olsr.po
+++ b/po/tr/olsr.po
@@ -47,6 +47,9 @@ msgstr ""
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr ""
 
@@ -129,6 +132,9 @@ msgstr ""
 msgid "HNA validity time"
 msgstr ""
 
+msgid "HNA6 Announcements"
+msgstr ""
+
 msgid "Hello"
 msgstr ""
 
@@ -162,6 +168,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -366,6 +377,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -405,6 +423,9 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
 msgid "OLSR - Plugins"
 msgstr ""
 
@@ -492,6 +513,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -641,6 +668,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/tr/watchcat.po b/po/tr/watchcat.po
index e62a995..633e7fb 100644
--- a/po/tr/watchcat.po
+++ b/po/tr/watchcat.po
@@ -42,12 +42,12 @@ msgid "Watchcat"
 msgstr ""
 
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
diff --git a/po/tr/wol.po b/po/tr/wol.po
index 186ce55..9be6934 100644
--- a/po/tr/wol.po
+++ b/po/tr/wol.po
@@ -26,7 +26,7 @@ msgid "Network interface to use"
 msgstr ""
 
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 
 msgid "Specifies the interface the WoL packet is sent on"
diff --git a/po/tr/wshaper.po b/po/tr/wshaper.po
index 9713be7..7c0acb0 100644
--- a/po/tr/wshaper.po
+++ b/po/tr/wshaper.po
@@ -45,6 +45,6 @@ msgid "Wondershaper settings"
 msgstr ""
 
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
diff --git a/po/uk/ahcp.po b/po/uk/ahcp.po
index ee25e92..7649019 100644
--- a/po/uk/ahcp.po
+++ b/po/uk/ahcp.po
@@ -15,9 +15,10 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "Сервер AHCP"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/uk/base.po b/po/uk/base.po
index 9978e3c..4fd1f60 100644
--- a/po/uk/base.po
+++ b/po/uk/base.po
@@ -862,8 +862,9 @@ msgstr "Розширення вузлів"
 msgid "Expires"
 msgstr "Дійсний ще"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr "Термін оренди адрес, мінімум 2 хвилини (<code>2m</code>)."
 
 msgid "External"
@@ -1288,9 +1289,10 @@ msgstr "Задано невірний VLAN ID! Доступні тільки у
 msgid "Invalid username and/or password! Please try again."
 msgstr "Неприпустиме ім’я користувача та/або пароль! Спробуйте ще раз."
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "Схоже, що ви намагаєтеся залити образ, який не вміщається у флеш-пам'ять! "
 "Перевірте файл образу!"
@@ -1430,9 +1432,10 @@ msgstr "Місцевий час"
 msgid "Local domain"
 msgstr "Локальний домен"
 
+#, fuzzy
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 "Специфікація локальних доменів. Імена, зіставлені цьому домену, ніколи не "
 "спрямовуються і виділяються тільки через DHCP або файли hosts"
@@ -2004,6 +2007,15 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr "Дійсно скинути всі зміни?"
 
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"Дійсно вимкнути мережу?\n"
+"Ви можете втратити доступ до цього пристрою, якщо ви підключені через цю "
+"мережу."
+
 msgid ""
 "Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
 "you are connected via this interface."
@@ -2012,14 +2024,6 @@ msgstr ""
 "Ви можете втратити доступ до цього пристрою, якщо ви підключені через цей "
 "інтерфейс."
 
-msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
-msgstr ""
-"Дійсно вимкнути мережу?\n"
-"Ви можете втратити доступ до цього пристрою, якщо ви підключені через цю "
-"мережу."
-
 msgid "Really switch protocol?"
 msgstr "Дійсно змінити протокол?"
 
@@ -2223,12 +2227,13 @@ msgstr "Тип сервісу"
 msgid "Services"
 msgstr "Сервіси"
 
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "Настройки синхронізації часу"
+
 msgid "Setup DHCP Server"
 msgstr "Настройки DHCP-сервера"
 
-msgid "Setup Time Synchronization"
-msgstr "Настройки синхронізації часу"
-
 msgid "Show current backup file list"
 msgstr "Показати поточний список файлів резервного копіювання"
 
@@ -2271,8 +2276,9 @@ msgstr "На жаль, об'єкт, який ви просили, не знай
 msgid "Sorry, the server encountered an unexpected error."
 msgstr "На жаль, на сервері сталася неочікувана помилка."
 
+#, fuzzy
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2421,12 +2427,13 @@ msgstr "Мета"
 msgid "Terminate"
 msgstr "Завершити"
 
+#, fuzzy
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 "Розділ <em>Конфігурація пристрою</em> охоплює фізичні параметри радіо-"
 "апаратних засобів, такі, як канал, потужність передавача або вибір антени, "
@@ -2494,9 +2501,10 @@ msgstr "У даний час у цій системі активні такі п
 msgid "The given network name is not unique"
 msgstr "Задане мережеве ім'я не є унікальним"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 "Обладнання не підтримує мульти-SSID і, якщо ви продовжите, існуюча "
 "конфігурація буде замінена."
@@ -2536,9 +2544,10 @@ msgstr ""
 "Зараз система видаляє розділ конфігурації і коли закінчить, "
 "перезавантажиться."
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
@@ -3094,8 +3103,8 @@ msgstr "« Назад"
 
 #~ msgid "This is the 32 byte hex encoded user ID, not the login name"
 #~ msgstr ""
-#~ "Це 32-байтний шістнадцятковий закодований ідентифікатор користувача, не ім'я "
-#~ "для входу"
+#~ "Це 32-байтний шістнадцятковий закодований ідентифікатор користувача, не "
+#~ "ім'я для входу"
 
 #~ msgid "40MHz 2nd channel above"
 #~ msgstr "40MHz (2-й канал вище)"
diff --git a/po/uk/firewall.po b/po/uk/firewall.po
index 5782596..3705306 100644
--- a/po/uk/firewall.po
+++ b/po/uk/firewall.po
@@ -386,12 +386,13 @@ msgstr ""
 "На цій сторінці можна змінити додаткові властивості елемента правил трафіка, "
 "таких як відповідні параметри джерела та вузлів призначення."
 
+#, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 "Цей розділ визначає загальні властивості %q. Параметри <em>вхідний</em> і "
 "<em>вихідний</em> задають типову політику для трафіку на вході й виході з "
diff --git a/po/uk/meshwizard.po b/po/uk/meshwizard.po
index b120632..9a317b7 100644
--- a/po/uk/meshwizard.po
+++ b/po/uk/meshwizard.po
@@ -65,8 +65,8 @@ msgid "Mesh Wizard"
 msgstr ""
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/uk/olsr.po b/po/uk/olsr.po
index 8c5c892..d35fe31 100644
--- a/po/uk/olsr.po
+++ b/po/uk/olsr.po
@@ -48,6 +48,9 @@ msgstr ""
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr ""
 
@@ -130,6 +133,9 @@ msgstr ""
 msgid "HNA validity time"
 msgstr ""
 
+msgid "HNA6 Announcements"
+msgstr ""
+
 msgid "Hello"
 msgstr ""
 
@@ -163,6 +169,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -367,6 +378,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -406,6 +424,9 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
 msgid "OLSR - Plugins"
 msgstr ""
 
@@ -493,6 +514,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -642,6 +669,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/uk/watchcat.po b/po/uk/watchcat.po
index 274693d..a7c2dd8 100644
--- a/po/uk/watchcat.po
+++ b/po/uk/watchcat.po
@@ -46,15 +46,16 @@ msgstr "Період пінгів"
 msgid "Watchcat"
 msgstr "Watchcat"
 
+#, fuzzy
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 "Watchcat дозволяє налаштувати періодичні перезавантаження і/або коли "
 "підключення до інтернету було втрачено протягом певного періоду часу."
 
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
diff --git a/po/uk/wol.po b/po/uk/wol.po
index 8e87e43..c09d144 100644
--- a/po/uk/wol.po
+++ b/po/uk/wol.po
@@ -30,8 +30,9 @@ msgstr "Комп'ютер, який необхідно розбудити"
 msgid "Network interface to use"
 msgstr "Використовувати мережевий інтерфейс"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 "Іноді працює тільки одна з цих двох утиліт. Якщо одна з них не працює, "
 "спробуйте іншу."
diff --git a/po/uk/wshaper.po b/po/uk/wshaper.po
index 6b7bb3f..94d20df 100644
--- a/po/uk/wshaper.po
+++ b/po/uk/wshaper.po
@@ -48,9 +48,10 @@ msgstr "Wondershaper"
 msgid "Wondershaper settings"
 msgstr "Налаштування Wondershaper"
 
+#, fuzzy
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
 "Wondershaper використовує формування трафіку для забезпечення низької "
 "затримки інтерактивного трафіку, навіть якщо ваше з'єднання з інтернетом "
diff --git a/po/vi/ahcp.po b/po/vi/ahcp.po
index 96547e8..1041add 100644
--- a/po/vi/ahcp.po
+++ b/po/vi/ahcp.po
@@ -14,9 +14,10 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "AHCP Server"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/vi/base.po b/po/vi/base.po
index dac67ce..e2b3a23 100644
--- a/po/vi/base.po
+++ b/po/vi/base.po
@@ -803,7 +803,7 @@ msgid "Expires"
 msgstr ""
 
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 
 msgid "External"
@@ -1218,9 +1218,10 @@ msgstr ""
 msgid "Invalid username and/or password! Please try again."
 msgstr "Tên và mật mã không đúng. Xin thử lại "
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr ""
 "Dường như bạn cố gắng flash một hình ảnh không phù hợp với bộ nhớ flash, xin "
 "vui lòng xác minh các tập tin hình ảnh!"
@@ -1357,8 +1358,8 @@ msgid "Local domain"
 msgstr ""
 
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr ""
 
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
@@ -1911,13 +1912,13 @@ msgid "Really reset all changes?"
 msgstr ""
 
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
-"you are connected via this interface."
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
 msgstr ""
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
+"you are connected via this interface."
 msgstr ""
 
 msgid "Really switch protocol?"
@@ -2121,10 +2122,10 @@ msgstr ""
 msgid "Services"
 msgstr "Dịch vụ "
 
-msgid "Setup DHCP Server"
+msgid "Set up Time Synchronization"
 msgstr ""
 
-msgid "Setup Time Synchronization"
+msgid "Setup DHCP Server"
 msgstr ""
 
 msgid "Show current backup file list"
@@ -2170,7 +2171,7 @@ msgid "Sorry, the server encountered an unexpected error."
 msgstr ""
 
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2310,10 +2311,10 @@ msgstr "Terminate"
 
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 
 msgid ""
@@ -2369,8 +2370,8 @@ msgid "The given network name is not unique"
 msgstr ""
 
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr ""
 
 msgid ""
@@ -2398,9 +2399,10 @@ msgid ""
 "when finished."
 msgstr ""
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/vi/firewall.po b/po/vi/firewall.po
index 0d39011..645aa88 100644
--- a/po/vi/firewall.po
+++ b/po/vi/firewall.po
@@ -369,7 +369,7 @@ msgid ""
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 
 msgid "To %s at %s on <var>this device</var>"
diff --git a/po/vi/meshwizard.po b/po/vi/meshwizard.po
index 180d771..a67c71f 100644
--- a/po/vi/meshwizard.po
+++ b/po/vi/meshwizard.po
@@ -51,8 +51,8 @@ msgid "Mesh Wizard"
 msgstr ""
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/vi/olsr.po b/po/vi/olsr.po
index b686891..698e528 100644
--- a/po/vi/olsr.po
+++ b/po/vi/olsr.po
@@ -53,6 +53,9 @@ msgstr ""
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr ""
 
@@ -135,6 +138,10 @@ msgstr "Khoảng HNA"
 msgid "HNA validity time"
 msgstr "Thời gian hợp lệ hóa HNA "
 
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "OLSR - HNA - Thông báo"
+
 msgid "Hello"
 msgstr ""
 
@@ -168,6 +175,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -372,6 +384,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -411,6 +430,10 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - HNA - Thông báo"
 
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "OLSR - HNA - Thông báo"
+
 msgid "OLSR - Plugins"
 msgstr "OLSR - Plugins"
 
@@ -498,6 +521,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -647,6 +676,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr "Sẵn sàng"
 
@@ -663,6 +698,6 @@ msgstr ""
 #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
 #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
 #~ msgstr ""
-#~ "Bảo đảm là OLSRd đang vận hành, the &quot;txtinfo&quot; plugin được "
-#~ "tải, định cấu hình trên cổng 2006 và chấp nhận kết nối từ "
-#~ "&quot;127.0.0.1&quot;."
+#~ "Bảo đảm là OLSRd đang vận hành, the &quot;txtinfo&quot; plugin "
+#~ "được tải, định cấu hình trên cổng 2006 và chấp nhận kết nối từ &"
+#~ "quot;127.0.0.1&quot;."
diff --git a/po/vi/watchcat.po b/po/vi/watchcat.po
index e62a995..633e7fb 100644
--- a/po/vi/watchcat.po
+++ b/po/vi/watchcat.po
@@ -42,12 +42,12 @@ msgid "Watchcat"
 msgstr ""
 
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr ""
 
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
diff --git a/po/vi/wol.po b/po/vi/wol.po
index 186ce55..9be6934 100644
--- a/po/vi/wol.po
+++ b/po/vi/wol.po
@@ -26,7 +26,7 @@ msgid "Network interface to use"
 msgstr ""
 
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr ""
 
 msgid "Specifies the interface the WoL packet is sent on"
diff --git a/po/vi/wshaper.po b/po/vi/wshaper.po
index 4eee2b6..d646e76 100644
--- a/po/vi/wshaper.po
+++ b/po/vi/wshaper.po
@@ -35,6 +35,6 @@ msgid "Wondershaper settings"
 msgstr ""
 
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
 msgstr ""
diff --git a/po/zh_CN/ahcp.po b/po/zh_CN/ahcp.po
index c212ada..295bbe7 100644
--- a/po/zh_CN/ahcp.po
+++ b/po/zh_CN/ahcp.po
@@ -14,14 +14,16 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "AHCP 服务器"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
-"AHCP是一个自动配置IPv6和IPv6/IPv4"
-"双栈网络的协议,用于在网络上进行路由探测和地址分配。因为在某些网络上为每个链路层广播域均配置服务器是非常困难的,例如移动ad-hoc网络。"
+"AHCP是一个自动配置IPv6和IPv6/IPv4双栈网络的协议,用于在网络上进行路由探测和地"
+"址分配。因为在某些网络上为每个链路层广播域均配置服务器是非常困难的,例如移动"
+"ad-hoc网络。"
 
 msgid "Active AHCP Leases"
 msgstr "活动的AHCP租约"
diff --git a/po/zh_CN/base.po b/po/zh_CN/base.po
index ef711da..b66e2e9 100644
--- a/po/zh_CN/base.po
+++ b/po/zh_CN/base.po
@@ -802,8 +802,9 @@ msgstr "扩展HOSTS文件中的主机后缀"
 msgid "Expires"
 msgstr "到期时间"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr "地址租期,最小2分钟(<code>2m</code>)。"
 
 msgid "External"
@@ -1211,9 +1212,10 @@ msgstr "无效的VLAN ID! 只允许唯一的ID。"
 msgid "Invalid username and/or password! Please try again."
 msgstr "无效的用户名和/或密码! 请重试。"
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr "将要刷新的固件与本路由器不兼容,请重新验证固件文件。"
 
 msgid "Java Script required!"
@@ -1347,9 +1349,10 @@ msgstr "本地时间"
 msgid "Local domain"
 msgstr "本地域名"
 
+#, fuzzy
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr "本地域名规则。从不转发和处理只源自DHCP或HOSTS文件的本地域名数据"
 
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
@@ -1897,6 +1900,14 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr "确定要放弃所有更改?"
 
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"确定要关闭此网络?\\\n"
+"关闭此网络,可能导致无法再访问路由器!"
+
 msgid ""
 "Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
 "you are connected via this interface."
@@ -1904,13 +1915,6 @@ msgstr ""
 "确定要关闭接口\"%s\" ?\\\n"
 "删除此网络,可能导致无法再访问路由器!"
 
-msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
-msgstr ""
-"确定要关闭此网络?\\\n"
-"关闭此网络,可能导致无法再访问路由器!"
-
 msgid "Really switch protocol?"
 msgstr "确定要切换协议?"
 
@@ -2110,12 +2114,13 @@ msgstr "服务类型"
 msgid "Services"
 msgstr "服务"
 
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "设置时间同步"
+
 msgid "Setup DHCP Server"
 msgstr "配置DHCP服务器"
 
-msgid "Setup Time Synchronization"
-msgstr "设置时间同步"
-
 msgid "Show current backup file list"
 msgstr "显示当前文件备份列表"
 
@@ -2158,8 +2163,9 @@ msgstr "对不起,请求的目标未找到。"
 msgid "Sorry, the server encountered an unexpected error."
 msgstr "对不起,服务器遇到未知错误。"
 
+#, fuzzy
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2302,12 +2308,13 @@ msgstr "对象"
 msgid "Terminate"
 msgstr "关闭"
 
+#, fuzzy
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 "<em>设备配置</em>区域可配置无线的硬件参数,比如信道、发射功率或发射天线(如果"
 "此无线模块硬件支持多SSID,则全部SSID共用此设备配置)。<em>接口配置</em>区域则"
@@ -2367,9 +2374,10 @@ msgstr "系统中的活跃连接。"
 msgid "The given network name is not unique"
 msgstr "给定的网络名重复"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr "本机的硬件不支持多SSID,继续进行将会覆盖现有配置。"
 
 msgid ""
@@ -2401,9 +2409,10 @@ msgid ""
 "when finished."
 msgstr "系统正在删除配置分区,完成后会自动重启。"
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/zh_CN/firewall.po b/po/zh_CN/firewall.po
index dd0397d..03c1b00 100644
--- a/po/zh_CN/firewall.po
+++ b/po/zh_CN/firewall.po
@@ -392,12 +392,13 @@ msgid ""
 "entry, such as matched source and destination hosts."
 msgstr "本页面可以更改通信规则的高级设置,比如:需匹配的源主机和目标主机。"
 
+#, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 "本节定义 %q 的通用属性, <em>入站数据</em> 和 <em>出站数据</em>规则用于设置数"
 "据包“进”和“出”路由器(某个接口)默认的转发原则,<em>转发</em>规则用于特定(一"
diff --git a/po/zh_CN/meshwizard.po b/po/zh_CN/meshwizard.po
index 9dab508..d5d0707 100644
--- a/po/zh_CN/meshwizard.po
+++ b/po/zh_CN/meshwizard.po
@@ -65,9 +65,10 @@ msgstr "Mesh IPv6地址"
 msgid "Mesh Wizard"
 msgstr "Mesh 导引"
 
+#, fuzzy
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr "注意:这将为mesh操作建立一个接口,如:增加到‘freifunk’区域并使能olsr"
 
 msgid "Protect LAN"
diff --git a/po/zh_CN/olsr.po b/po/zh_CN/olsr.po
index 2f3cb8c..37264f5 100644
--- a/po/zh_CN/olsr.po
+++ b/po/zh_CN/olsr.po
@@ -50,6 +50,9 @@ msgstr "广播地址"
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr "配置"
 
@@ -133,6 +136,10 @@ msgstr "HNA间隙"
 msgid "HNA validity time"
 msgstr "HNA有效时长"
 
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "HNA公告"
+
 msgid "Hello"
 msgstr "Hello"
 
@@ -166,6 +173,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -370,6 +382,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -409,6 +428,10 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "HNA公告"
+
 msgid "OLSR - Plugins"
 msgstr ""
 
@@ -496,6 +519,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -645,6 +674,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/zh_CN/watchcat.po b/po/zh_CN/watchcat.po
index 0482e95..991fc48 100644
--- a/po/zh_CN/watchcat.po
+++ b/po/zh_CN/watchcat.po
@@ -49,14 +49,16 @@ msgstr "ping周期"
 msgid "Watchcat"
 msgstr "WatchCat"
 
+#, fuzzy
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr "WatchCat允许设置周期性的重启 和/或者 当网络连接断开达规定时间。"
 
+#, fuzzy
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
 "当重启系统的时候WatchCat将会触发一个软重启,在这里输入一个非0的值,如果软重启"
diff --git a/po/zh_CN/wol.po b/po/zh_CN/wol.po
index c44f088..6d9cc72 100644
--- a/po/zh_CN/wol.po
+++ b/po/zh_CN/wol.po
@@ -25,8 +25,9 @@ msgstr "选择要唤醒的主机"
 msgid "Network interface to use"
 msgstr "选择使用的网络接口"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr "有时只有一个工具生效。如果其中一个失效,请尝试另一个"
 
 msgid "Specifies the interface the WoL packet is sent on"
diff --git a/po/zh_CN/wshaper.po b/po/zh_CN/wshaper.po
index ccfd096..a35ccd0 100644
--- a/po/zh_CN/wshaper.po
+++ b/po/zh_CN/wshaper.po
@@ -49,7 +49,10 @@ msgstr "Wondershaper"
 msgid "Wondershaper settings"
 msgstr "Wondershaper设置"
 
+#, fuzzy
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
-msgstr "Wondershaper通过流量匹配,确保低延时的交互数据包,甚至当你的互联网连接是高度饱和。"
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
+"Wondershaper通过流量匹配,确保低延时的交互数据包,甚至当你的互联网连接是高度饱"
+"和。"
diff --git a/po/zh_TW/ahcp.po b/po/zh_TW/ahcp.po
index 2127fdb..dc7f6c5 100644
--- a/po/zh_TW/ahcp.po
+++ b/po/zh_TW/ahcp.po
@@ -16,7 +16,7 @@ msgstr "AHCP伺服器"
 
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
diff --git a/po/zh_TW/base.po b/po/zh_TW/base.po
index d41bbae..a94be30 100644
--- a/po/zh_TW/base.po
+++ b/po/zh_TW/base.po
@@ -814,8 +814,9 @@ msgstr "延伸主機"
 msgid "Expires"
 msgstr "過期"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr "釋放位址的過期週期,最少兩分鐘 (<code>2m</code>)."
 
 msgid "External"
@@ -1227,9 +1228,10 @@ msgstr "打入的是不正確的VLAN ID!僅有獨一無二的IDs被允許"
 msgid "Invalid username and/or password! Please try again."
 msgstr "不正確的用戶名稱和/或者密碼!請再試一次."
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr "它顯示你正嘗試更新不適用於這個flash記憶體的映像檔,請檢查確認這個映像檔"
 
 msgid "Java Script required!"
@@ -1363,9 +1365,10 @@ msgstr "本地時區"
 msgid "Local domain"
 msgstr "本地網域"
 
+#, fuzzy
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr "本地網域格式. 僅限符合從未從DHCP或hosts檔轉發和解析的網域"
 
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
@@ -1917,6 +1920,14 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr "確定要重置回復原廠?"
 
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"真的要刪除這個網路 ?\n"
+"假如你是透過這個介面連線你可能會無法存取這個設備."
+
 msgid ""
 "Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
 "you are connected via this interface."
@@ -1924,13 +1935,6 @@ msgstr ""
 "真的要關閉這個介面 \"%s\" ?!\n"
 "假如你要透過這個介面連線你可能會無法存取這個設備."
 
-msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
-msgstr ""
-"真的要刪除這個網路 ?\n"
-"假如你是透過這個介面連線你可能會無法存取這個設備."
-
 msgid "Really switch protocol?"
 msgstr "確定要更換協定?"
 
@@ -2130,12 +2134,13 @@ msgstr "服務型態"
 msgid "Services"
 msgstr "各服務"
 
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "安裝校時同步"
+
 msgid "Setup DHCP Server"
 msgstr "安裝DHCP伺服器"
 
-msgid "Setup Time Synchronization"
-msgstr "安裝校時同步"
-
 msgid "Show current backup file list"
 msgstr "顯示現今的備份檔清單"
 
@@ -2178,8 +2183,9 @@ msgstr "抱歉, 你請求的這物件尚無發現."
 msgid "Sorry, the server encountered an unexpected error."
 msgstr "抱歉, 伺服器遭遇非預期的錯誤."
 
+#, fuzzy
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2321,12 +2327,13 @@ msgstr "目標"
 msgid "Terminate"
 msgstr "中斷"
 
+#, fuzzy
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 "這個<em>Device Configuration</em>欄位會覆蓋無線射頻硬體的物理設定值,如通道、"
 "傳送功率或者天線分享道所有定義的無線網路(假如這個無線射頻硬體是多工-SSID能力"
@@ -2391,9 +2398,10 @@ msgstr "以下的規則現正作用在系統中."
 msgid "The given network name is not unique"
 msgstr "輸入的網路名稱非獨一"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr "如果你繼續的話.這硬體並非多SSID工能並且已存的設定將會被覆蓋."
 
 msgid ""
@@ -2425,9 +2433,10 @@ msgid ""
 "when finished."
 msgstr "系統正在刪除設定分割並且當完成時將自行重開."
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/zh_TW/firewall.po b/po/zh_TW/firewall.po
index e30bd2f..6ff2df7 100644
--- a/po/zh_TW/firewall.po
+++ b/po/zh_TW/firewall.po
@@ -360,12 +360,13 @@ msgid ""
 "entry, such as matched source and destination hosts."
 msgstr "這頁面允許改變進階流量規則項目的進階設置, 例如匹配的來源和目標主機."
 
+#, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
 "leaving this zone while the <em>forward</em> option describes the policy for "
 "forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 "本節定義 %q 的通用屬性.在<em>輸入</em>和<em>輸出</em>選項設置交通進出的默認策"
 "略,而在<em>轉發</em>的選項描述在這區域內不同網路的轉發流量.<em>已覆蓋的網路群"
diff --git a/po/zh_TW/meshwizard.po b/po/zh_TW/meshwizard.po
index 1d957b3..a4d29e8 100644
--- a/po/zh_TW/meshwizard.po
+++ b/po/zh_TW/meshwizard.po
@@ -60,8 +60,8 @@ msgid "Mesh Wizard"
 msgstr ""
 
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr ""
 
 msgid "Protect LAN"
diff --git a/po/zh_TW/olsr.po b/po/zh_TW/olsr.po
index cb1220e..797874d 100644
--- a/po/zh_TW/olsr.po
+++ b/po/zh_TW/olsr.po
@@ -50,6 +50,9 @@ msgstr "廣播位址"
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr "設定"
 
@@ -138,6 +141,10 @@ msgstr ""
 msgid "HNA validity time"
 msgstr ""
 
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "啟用Mesh網狀網路ID公告"
+
 msgid "Hello"
 msgstr ""
 
@@ -171,6 +178,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -375,6 +387,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -414,6 +433,9 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+msgid "OLSR - HNA6-Announcements"
+msgstr ""
+
 msgid "OLSR - Plugins"
 msgstr ""
 
@@ -501,6 +523,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -650,6 +678,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/zh_TW/watchcat.po b/po/zh_TW/watchcat.po
index e5ceb3c..b4e52bb 100644
--- a/po/zh_TW/watchcat.po
+++ b/po/zh_TW/watchcat.po
@@ -20,7 +20,9 @@ msgstr "要Ping的主機位址"
 msgid ""
 "How often to check internet connection. Default unit is seconds, you can you "
 "use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
-msgstr "多久檢查一次網際網路連線. 預設單位值是秒, 可以採用單位後綴表示, \"m\"表示分鐘, \"h\"表示小時, \"d\"代表天數"
+msgstr ""
+"多久檢查一次網際網路連線. 預設單位值是秒, 可以採用單位後綴表示, \"m\"表示分"
+"鐘, \"h\"表示小時, \"d\"代表天數"
 
 msgid ""
 "In periodic mode, it defines the reboot period. In internet mode, it defines "
@@ -28,8 +30,9 @@ msgid ""
 "engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
 "for hours or 'd' for days"
 msgstr ""
-"Watchcat的定期模式,它將定義重開週期. 在網際網路模式,它將定義在重開被訂製若無Internet存取時採用較長時間週期  "
-".預設單位為秒數,可以採用單位後綴表示, \"m\"表示分鐘, \"h\"表示小時, \"d\"代表天數"
+"Watchcat的定期模式,它將定義重開週期. 在網際網路模式,它將定義在重開被訂製若無"
+"Internet存取時採用較長時間週期  .預設單位為秒數,可以採用單位後綴表示, \"m\"表"
+"示分鐘, \"h\"表示小時, \"d\"代表天數"
 
 msgid "Operating mode"
 msgstr "操作模式"
@@ -46,13 +49,18 @@ msgstr "Ping週期"
 msgid "Watchcat"
 msgstr "Watchcat"
 
+#, fuzzy
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
-msgstr "Watchcat允許定期重啓並且/或者當網際網路連線斷掉時經過某段時間週期後重啓"
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
+msgstr ""
+"Watchcat允許定期重啓並且/或者當網際網路連線斷掉時經過某段時間週期後重啓"
 
+#, fuzzy
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
-msgstr "重開系統時watchcat將會觸發軟重開, 如果軟重開失敗, 打入0以外的數字,將會觸發硬重開延遲 . 打入秒數來啟用這功能,用0表示功能關閉"
+msgstr ""
+"重開系統時watchcat將會觸發軟重開, 如果軟重開失敗, 打入0以外的數字,將會觸發硬"
+"重開延遲 . 打入秒數來啟用這功能,用0表示功能關閉"
diff --git a/po/zh_TW/wol.po b/po/zh_TW/wol.po
index b0855bc..ee290ec 100644
--- a/po/zh_TW/wol.po
+++ b/po/zh_TW/wol.po
@@ -23,8 +23,9 @@ msgstr "要喚醒主機清單"
 msgid "Network interface to use"
 msgstr "使用的網路介面"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr "某些時候全部工具裡面只有一個發生作用,試試另外一個"
 
 msgid "Specifies the interface the WoL packet is sent on"
diff --git a/po/zh_TW/wshaper.po b/po/zh_TW/wshaper.po
index 167c0b2..1814825 100644
--- a/po/zh_TW/wshaper.po
+++ b/po/zh_TW/wshaper.po
@@ -47,7 +47,10 @@ msgstr "Wondershaper頻寬管理"
 msgid "Wondershaper settings"
 msgstr "Wondershaper設定值"
 
+#, fuzzy
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
-msgstr "既使你的網路連線達到高飽和, Wondershaper採用流量銳化塑形以針對未知的流量保證低延遲"
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
+"既使你的網路連線達到高飽和, Wondershaper採用流量銳化塑形以針對未知的流量保證"
+"低延遲"
-- 
1.9.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


More information about the openwrt-devel mailing list