luci-0.10: Merge r6874

diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-olsr/luasrc/controller/olsr.lua
index f4d52c42d4963e9c8d456898b176bd38029664d4..c7c7f014105e9427a45038ac28fe6611b528381e 100644 (file)
--- a/applications/luci-olsr/luasrc/controller/olsr.lua
+++ b/applications/luci-olsr/luasrc/controller/olsr.lua
@@ -10,39 +10,39 @@ function index()
 
        local page  = node("admin", "status", "olsr")
        page.target = template("status-olsr/overview")
-       page.title  = "OLSR"
+       page.title  = i18n("OLSR")
        page.i18n   = "olsr"
        page.subindex = true
 
        local page  = node("admin", "status", "olsr", "neighbors")
        page.target = call("action_neigh")
-       page.title  = i18n("Neighbors")
+       page.title  = i18n("Neighbours")
        page.subindex = true
        page.order  = 5
 
        local page  = node("admin", "status", "olsr", "routes")
        page.target = call("action_routes")
-       page.title  = i18n("Routen")
+       page.title  = i18n("Routes")
        page.order  = 10
 
        local page  = node("admin", "status", "olsr", "topology")
        page.target = call("action_topology")
-       page.title  = i18n("Topologie")
+       page.title  = i18n("Topology")
        page.order  = 20
 
        local page  = node("admin", "status", "olsr", "hna")
        page.target = call("action_hna")
-       page.title  = "HNA"
+       page.title  = i18n("HNA")
        page.order  = 30
 
        local page  = node("admin", "status", "olsr", "mid")
        page.target = call("action_mid")
-       page.title  = "MID"
+       page.title  = i18n("MID")
        page.order  = 50
 
        local page  = node("admin", "status", "olsr", "smartgw")
        page.target = call("action_smartgw")
-       page.title  = "SmartGW"
+       page.title  = i18n("SmartGW")
        page.order  = 60
 
        local page  = node("admin", "status", "olsr", "interfaces")
@@ -64,13 +64,19 @@ function index()
 
        entry(
                {"admin", "services", "olsrd", "hna"},
-               cbi("olsr/olsrdhna"), "HNA Announcements"
+               cbi("olsr/olsrdhna"), i18n("HNA Announcements")
        )
 
        oplg = entry(
                {"admin", "services", "olsrd", "plugins"},
-               cbi("olsr/olsrdplugins"), "Plugins"
+               cbi("olsr/olsrdplugins"), i18n("Plugins")
        )
+
+       odsp = entry(
+               {"admin", "services", "olsrd", "display"},
+               cbi("olsr/olsrddisplay"), i18n("Display")
+               )
+
        oplg.i18n = "olsr"
        oplg.leaf = true
        oplg.subindex = true
@@ -227,6 +233,7 @@ end
 function fetch_txtinfo(otable)
        require("luci.sys")
        local uci = require "luci.model.uci".cursor_state()
+       local resolve = uci:get("luci_olsr", "general", "resolve")
        otable = otable or ""
        local rawdata = luci.sys.httpget("http://127.0.0.1:2006/"..otable)
        local rawdatav6 = luci.sys.httpget("http://[::1]:2006/"..otable)
@@ -260,9 +267,11 @@ function fetch_txtinfo(otable)
                                for k, key in pairs(keys) do
                                        if key == "Remote IP" or key == "Dest. IP" or key == "Gateway IP" or key == "Gateway" then
                                                data[name][di][key] = fields[k]
-                                               hostname = nixio.getnameinfo(fields[k], "inet")
-                                               if hostname then
-                                                       data[name][di]["Hostname"] = hostname
+                                               if resolve == "1" then
+                                                       hostname = nixio.getnameinfo(fields[k], "inet")
+                                                       if hostname then
+                                                               data[name][di]["Hostname"] = hostname
+                                                       end
                                                end
                                                if key == "Remote IP" and defaultgw then
                                                        if defaultgw == fields[k] then
@@ -320,9 +329,11 @@ function fetch_txtinfo(otable)
                                for k, key in pairs(keys) do
                                        if key == "Remote IP" then
                                                data[name][di][key] = "[" .. fields[k] .. "]"
-                                               hostname = nixio.getnameinfo(fields[k], "inet6")
-                                               if hostname then
-                                                       data[name][di]["Hostname"] = hostname
+                                               if resolve == "1" then
+                                                       hostname = nixio.getnameinfo(fields[k], "inet6")
+                                                       if hostname then
+                                                               data[name][di]["Hostname"] = hostname
+                                                       end
                                                end
                                        elseif key == "Local IP" then
                                                data[name][di][key] = fields[k]

diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrddisplay.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrddisplay.lua
new file mode 100644 (file)
index 0000000..48dc965
--- /dev/null
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrddisplay.lua
@@ -0,0 +1,23 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2011 Manuel Munz <freifunk at somakoma de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+m = Map("luci_olsr", translate("OLSR - Display Options"))
+
+s = m:section(TypedSection, "olsr")
+s.anonymous = true
+
+res = s:option(Flag, "resolve", translate("Resolve"),
+        translate("Resolve hostnames on status pages. It is generally safe to allow this, but if you use public IPs and have unstable DNS-Setup then those pages will load really slow. In this case disable it here."))
+res.default = "0"
+res.optional = true
+
+return m

diff --git a/applications/luci-olsr/root/etc/config/luci_olsr b/applications/luci-olsr/root/etc/config/luci_olsr
new file mode 100644 (file)
index 0000000..2dd4ffa
--- /dev/null
+++ b/applications/luci-olsr/root/etc/config/luci_olsr
@@ -0,0 +1,2 @@
+config 'olsr' 'general'
+       option 'resolve' '1'

diff --git a/po/ca/olsr.po b/po/ca/olsr.po
index 1068e43f902bd0330433a86d56e7ede686f4c7eb..9a4b7a84a00e1538544809c412ae0b70630b70f5 100644 (file)
--- a/po/ca/olsr.po
+++ b/po/ca/olsr.po
@@ -38,6 +38,9 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
 msgid "Downlink"
 msgstr ""
 
@@ -86,6 +89,9 @@ msgstr "Configuració general"
 msgid "HNA"
 msgstr ""
 
+msgid "HNA Announcements"
+msgstr ""
+
 msgid "HNA interval"
 msgstr "Interval HNA"
 
@@ -296,6 +302,9 @@ msgstr ""
 msgid "Neighbour IP"
 msgstr "IP del veí"
 
+msgid "Neighbours"
+msgstr ""
+
 msgid "Netmask"
 msgstr "Màscara de xarxa"
 
@@ -311,6 +320,12 @@ msgstr ""
 msgid "Nodes"
 msgstr ""
 
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
 msgid "OLSR - HNA-Announcements"
 msgstr "Anuncis OLSR - HNA"
 
@@ -374,9 +389,21 @@ msgstr ""
 msgid "Prefix"
 msgstr "Prefix"
 
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
 msgid "Routen"
 msgstr ""
 
+msgid "Routes"
+msgstr ""
+
 msgid "Secondary OLSR interfaces"
 msgstr "Interfícies OSLR secundàries"
 
@@ -386,6 +413,9 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid "SmartGW"
+msgstr ""
+
 msgid "SmartGW announcements"
 msgstr ""
 
@@ -446,6 +476,9 @@ msgstr ""
 msgid "Topologie"
 msgstr ""
 
+msgid "Topology"
+msgstr ""
+
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."

diff --git a/po/de/olsr.po b/po/de/olsr.po
index cb1580356adcd32e1f1676ef44a4c6cdda89a6d6..27575d3f0d9a36005a4bd155c4ec244fec5e56e5 100644 (file)
--- a/po/de/olsr.po
+++ b/po/de/olsr.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2011-02-12 00:12+0100\n"
+"PO-Revision-Date: 2011-02-12 14:23+0100\n"
 "Last-Translator: Manuel Munz <freifunk@somakoma.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -36,6 +36,9 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
+msgid "Display"
+msgstr "Anzeige"
+
 msgid "Downlink"
 msgstr ""
 
@@ -92,6 +95,9 @@ msgstr "Allgemeine Einstellungen"
 msgid "HNA"
 msgstr ""
 
+msgid "HNA Announcements"
+msgstr ""
+
 msgid "HNA interval"
 msgstr "HNA-Intervall"
 
@@ -347,6 +353,9 @@ msgstr "Nachbarn"
 msgid "Neighbour IP"
 msgstr "Nachbar-IP"
 
+msgid "Neighbours"
+msgstr "Nachbarn"
+
 msgid "Netmask"
 msgstr "Netzmaske"
 
@@ -362,6 +371,12 @@ msgstr ""
 msgid "Nodes"
 msgstr ""
 
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr "OLSR - Anzeige"
+
 msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - HNA-Ankündigungen"
 
@@ -425,9 +440,25 @@ msgstr ""
 msgid "Prefix"
 msgstr "Prefix"
 
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+"Hostnamen auf den Statusseiten auflösen. Dies ist in der Regel kein Problem, "
+"wenn aber öffentliche IPs benutzt werden und das DNS-Setup nicht stabil ist, "
+"dann werden die OLSR-Statusseiten nur sehr langsam laden. In diesem Fall "
+"sollte man diese Option deaktivieren."
+
 msgid "Routen"
 msgstr ""
 
+msgid "Routes"
+msgstr "Routen"
+
 msgid "Secondary OLSR interfaces"
 msgstr "Sekundäre OLSR Schnittstellen"
 
@@ -440,6 +471,9 @@ 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."
 
+msgid "SmartGW"
+msgstr ""
+
 msgid "SmartGW announcements"
 msgstr "Smart Gateway Ankündigungen"
 
@@ -508,6 +542,9 @@ msgstr ""
 msgid "Topologie"
 msgstr ""
 
+msgid "Topology"
+msgstr "Topologie"
+
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."

diff --git a/po/el/olsr.po b/po/el/olsr.po
index 800907549b7f3a9558049869ea1da475f574d596..1f6da597ccedb142bee1780627d93e6194955219 100644 (file)
--- a/po/el/olsr.po
+++ b/po/el/olsr.po
@@ -37,6 +37,9 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
 msgid "Downlink"
 msgstr ""
 
@@ -85,6 +88,9 @@ msgstr ""
 msgid "HNA"
 msgstr ""
 
+msgid "HNA Announcements"
+msgstr ""
+
 msgid "HNA interval"
 msgstr ""
 
@@ -293,6 +299,9 @@ msgstr ""
 msgid "Neighbour IP"
 msgstr ""
 
+msgid "Neighbours"
+msgstr ""
+
 msgid "Netmask"
 msgstr ""
 
@@ -308,6 +317,12 @@ msgstr ""
 msgid "Nodes"
 msgstr ""
 
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
@@ -371,9 +386,21 @@ msgstr ""
 msgid "Prefix"
 msgstr ""
 
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
 msgid "Routen"
 msgstr ""
 
+msgid "Routes"
+msgstr ""
+
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
@@ -383,6 +410,9 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid "SmartGW"
+msgstr ""
+
 msgid "SmartGW announcements"
 msgstr ""
 
@@ -443,6 +473,9 @@ msgstr ""
 msgid "Topologie"
 msgstr ""
 
+msgid "Topology"
+msgstr ""
+
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."

diff --git a/po/en/olsr.po b/po/en/olsr.po
index 7afd0f099512e2a3fd9ca729fcf926713b24e73c..9d4e9aa1d2cdb443e3d84c2b08ffce67b428287b 100644 (file)
--- a/po/en/olsr.po
+++ b/po/en/olsr.po
@@ -37,6 +37,9 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
 msgid "Downlink"
 msgstr ""
 
@@ -85,6 +88,9 @@ msgstr "General settings"
 msgid "HNA"
 msgstr ""
 
+msgid "HNA Announcements"
+msgstr ""
+
 msgid "HNA interval"
 msgstr "HNA interval"
 
@@ -295,6 +301,9 @@ msgstr ""
 msgid "Neighbour IP"
 msgstr "Neighbour IP"
 
+msgid "Neighbours"
+msgstr ""
+
 msgid "Netmask"
 msgstr "Netmask"
 
@@ -310,6 +319,12 @@ msgstr ""
 msgid "Nodes"
 msgstr ""
 
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
 msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - HNA-Announcements"
 
@@ -373,9 +388,21 @@ msgstr ""
 msgid "Prefix"
 msgstr "Prefix"
 
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
 msgid "Routen"
 msgstr ""
 
+msgid "Routes"
+msgstr ""
+
 msgid "Secondary OLSR interfaces"
 msgstr "Secondary OLSR interfaces"
 
@@ -385,6 +412,9 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid "SmartGW"
+msgstr ""
+
 msgid "SmartGW announcements"
 msgstr ""
 
@@ -445,6 +475,9 @@ msgstr ""
 msgid "Topologie"
 msgstr ""
 
+msgid "Topology"
+msgstr ""
+
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."

diff --git a/po/es/olsr.po b/po/es/olsr.po
index 1c7bf0ea44d95cac20a3da1e1bc0efaafbf772bc..d896edc5fe1c28af0d93416b38606fdda51f0382 100644 (file)
--- a/po/es/olsr.po
+++ b/po/es/olsr.po
@@ -36,6 +36,9 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
 msgid "Downlink"
 msgstr ""
 
@@ -84,6 +87,9 @@ msgstr "Configuración general"
 msgid "HNA"
 msgstr ""
 
+msgid "HNA Announcements"
+msgstr ""
+
 msgid "HNA interval"
 msgstr "Intervalo HNA"
 
@@ -294,6 +300,9 @@ msgstr ""
 msgid "Neighbour IP"
 msgstr "Neighbour IP"
 
+msgid "Neighbours"
+msgstr ""
+
 msgid "Netmask"
 msgstr "Máscara de red"
 
@@ -309,6 +318,12 @@ msgstr ""
 msgid "Nodes"
 msgstr ""
 
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
 msgid "OLSR - HNA-Announcements"
 msgstr "Anuncios HNA de OLSR"
 
@@ -373,9 +388,21 @@ msgstr ""
 msgid "Prefix"
 msgstr "Prefijo"
 
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
 msgid "Routen"
 msgstr ""
 
+msgid "Routes"
+msgstr ""
+
 msgid "Secondary OLSR interfaces"
 msgstr "Interfaces OLSR secundarias"
 
@@ -385,6 +412,9 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid "SmartGW"
+msgstr ""
+
 msgid "SmartGW announcements"
 msgstr ""
 
@@ -445,6 +475,9 @@ msgstr ""
 msgid "Topologie"
 msgstr ""
 
+msgid "Topology"
+msgstr ""
+
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."

diff --git a/po/fr/olsr.po b/po/fr/olsr.po
index 1e7f3fd0102147651b3136b7d40dfcfa3aaf5b74..88d6144529f1e8a0ad84826af5b136fc2075627a 100644 (file)
--- a/po/fr/olsr.po
+++ b/po/fr/olsr.po
@@ -37,6 +37,9 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
 msgid "Downlink"
 msgstr ""
 
@@ -85,6 +88,9 @@ msgstr ""
 msgid "HNA"
 msgstr ""
 
+msgid "HNA Announcements"
+msgstr ""
+
 msgid "HNA interval"
 msgstr ""
 
@@ -293,6 +299,9 @@ msgstr ""
 msgid "Neighbour IP"
 msgstr ""
 
+msgid "Neighbours"
+msgstr ""
+
 msgid "Netmask"
 msgstr ""
 
@@ -308,6 +317,12 @@ msgstr ""
 msgid "Nodes"
 msgstr ""
 
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
@@ -371,9 +386,21 @@ msgstr ""
 msgid "Prefix"
 msgstr ""
 
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
 msgid "Routen"
 msgstr ""
 
+msgid "Routes"
+msgstr ""
+
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
@@ -383,6 +410,9 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid "SmartGW"
+msgstr ""
+
 msgid "SmartGW announcements"
 msgstr ""
 
@@ -443,6 +473,9 @@ msgstr ""
 msgid "Topologie"
 msgstr ""
 
+msgid "Topology"
+msgstr ""
+
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."

diff --git a/po/it/olsr.po b/po/it/olsr.po
index 1e7f3fd0102147651b3136b7d40dfcfa3aaf5b74..88d6144529f1e8a0ad84826af5b136fc2075627a 100644 (file)
--- a/po/it/olsr.po
+++ b/po/it/olsr.po
@@ -37,6 +37,9 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
 msgid "Downlink"
 msgstr ""
 
@@ -85,6 +88,9 @@ msgstr ""
 msgid "HNA"
 msgstr ""
 
+msgid "HNA Announcements"
+msgstr ""
+
 msgid "HNA interval"
 msgstr ""
 
@@ -293,6 +299,9 @@ msgstr ""
 msgid "Neighbour IP"
 msgstr ""
 
+msgid "Neighbours"
+msgstr ""
+
 msgid "Netmask"
 msgstr ""
 
@@ -308,6 +317,12 @@ msgstr ""
 msgid "Nodes"
 msgstr ""
 
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
@@ -371,9 +386,21 @@ msgstr ""
 msgid "Prefix"
 msgstr ""
 
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
 msgid "Routen"
 msgstr ""
 
+msgid "Routes"
+msgstr ""
+
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
@@ -383,6 +410,9 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid "SmartGW"
+msgstr ""
+
 msgid "SmartGW announcements"
 msgstr ""
 
@@ -443,6 +473,9 @@ msgstr ""
 msgid "Topologie"
 msgstr ""
 
+msgid "Topology"
+msgstr ""
+
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."

diff --git a/po/ja/olsr.po b/po/ja/olsr.po
index 1e7f3fd0102147651b3136b7d40dfcfa3aaf5b74..88d6144529f1e8a0ad84826af5b136fc2075627a 100644 (file)
--- a/po/ja/olsr.po
+++ b/po/ja/olsr.po
@@ -37,6 +37,9 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
 msgid "Downlink"
 msgstr ""
 
@@ -85,6 +88,9 @@ msgstr ""
 msgid "HNA"
 msgstr ""
 
+msgid "HNA Announcements"
+msgstr ""
+
 msgid "HNA interval"
 msgstr ""
 
@@ -293,6 +299,9 @@ msgstr ""
 msgid "Neighbour IP"
 msgstr ""
 
+msgid "Neighbours"
+msgstr ""
+
 msgid "Netmask"
 msgstr ""
 
@@ -308,6 +317,12 @@ msgstr ""
 msgid "Nodes"
 msgstr ""
 
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
@@ -371,9 +386,21 @@ msgstr ""
 msgid "Prefix"
 msgstr ""
 
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
 msgid "Routen"
 msgstr ""
 
+msgid "Routes"
+msgstr ""
+
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
@@ -383,6 +410,9 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid "SmartGW"
+msgstr ""
+
 msgid "SmartGW announcements"
 msgstr ""
 
@@ -443,6 +473,9 @@ msgstr ""
 msgid "Topologie"
 msgstr ""
 
+msgid "Topology"
+msgstr ""
+
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."

diff --git a/po/pt/olsr.po b/po/pt/olsr.po
index f730f9b91643ed921b965245410326e74952489d..9d9d5d661c212001e176875ae64b15294bf03626 100644 (file)
--- a/po/pt/olsr.po
+++ b/po/pt/olsr.po
@@ -38,6 +38,9 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
 msgid "Downlink"
 msgstr ""
 
@@ -86,6 +89,9 @@ msgstr "Definições gerais"
 msgid "HNA"
 msgstr ""
 
+msgid "HNA Announcements"
+msgstr ""
+
 msgid "HNA interval"
 msgstr "Intervalo entre HNA"
 
@@ -298,6 +304,9 @@ msgstr ""
 msgid "Neighbour IP"
 msgstr "Endereço IP do Vizinho"
 
+msgid "Neighbours"
+msgstr ""
+
 msgid "Netmask"
 msgstr "Máscara de subrede"
 
@@ -313,6 +322,12 @@ msgstr ""
 msgid "Nodes"
 msgstr ""
 
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
 msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - Anuncios HNA4"
 
@@ -377,9 +392,21 @@ msgstr ""
 msgid "Prefix"
 msgstr "Prefixo"
 
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
 msgid "Routen"
 msgstr ""
 
+msgid "Routes"
+msgstr ""
+
 msgid "Secondary OLSR interfaces"
 msgstr "Interfaces OLSR secundários"
 
@@ -389,6 +416,9 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid "SmartGW"
+msgstr ""
+
 msgid "SmartGW announcements"
 msgstr ""
 
@@ -449,6 +479,9 @@ msgstr ""
 msgid "Topologie"
 msgstr ""
 
+msgid "Topology"
+msgstr ""
+
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."

diff --git a/po/pt_BR/olsr.po b/po/pt_BR/olsr.po
index 644d4a2be31370246299a0f4ac20bd3b90c16637..7fb2396da11f2efb06949209f3e8cfb621fe1159 100644 (file)
--- a/po/pt_BR/olsr.po
+++ b/po/pt_BR/olsr.po
@@ -38,6 +38,9 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
 msgid "Downlink"
 msgstr ""
 
@@ -86,6 +89,9 @@ msgstr "Definições gerais"
 msgid "HNA"
 msgstr ""
 
+msgid "HNA Announcements"
+msgstr ""
+
 msgid "HNA interval"
 msgstr "Intervalo entre HNA"
 
@@ -298,6 +304,9 @@ msgstr ""
 msgid "Neighbour IP"
 msgstr "Endereço IP do Vizinho"
 
+msgid "Neighbours"
+msgstr ""
+
 msgid "Netmask"
 msgstr "Máscara de subrede"
 
@@ -313,6 +322,12 @@ msgstr ""
 msgid "Nodes"
 msgstr ""
 
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
 msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - Anuncios HNA4"
 
@@ -377,9 +392,21 @@ msgstr ""
 msgid "Prefix"
 msgstr "Prefixo"
 
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
 msgid "Routen"
 msgstr ""
 
+msgid "Routes"
+msgstr ""
+
 msgid "Secondary OLSR interfaces"
 msgstr "Interfaces OLSR secundários"
 
@@ -389,6 +416,9 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid "SmartGW"
+msgstr ""
+
 msgid "SmartGW announcements"
 msgstr ""
 
@@ -449,6 +479,9 @@ msgstr ""
 msgid "Topologie"
 msgstr ""
 
+msgid "Topology"
+msgstr ""
+
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."

diff --git a/po/ru/olsr.po b/po/ru/olsr.po
index 1e7f3fd0102147651b3136b7d40dfcfa3aaf5b74..88d6144529f1e8a0ad84826af5b136fc2075627a 100644 (file)
--- a/po/ru/olsr.po
+++ b/po/ru/olsr.po
@@ -37,6 +37,9 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
 msgid "Downlink"
 msgstr ""
 
@@ -85,6 +88,9 @@ msgstr ""
 msgid "HNA"
 msgstr ""
 
+msgid "HNA Announcements"
+msgstr ""
+
 msgid "HNA interval"
 msgstr ""
 
@@ -293,6 +299,9 @@ msgstr ""
 msgid "Neighbour IP"
 msgstr ""
 
+msgid "Neighbours"
+msgstr ""
+
 msgid "Netmask"
 msgstr ""
 
@@ -308,6 +317,12 @@ msgstr ""
 msgid "Nodes"
 msgstr ""
 
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
@@ -371,9 +386,21 @@ msgstr ""
 msgid "Prefix"
 msgstr ""
 
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
 msgid "Routen"
 msgstr ""
 
+msgid "Routes"
+msgstr ""
+
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
@@ -383,6 +410,9 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid "SmartGW"
+msgstr ""
+
 msgid "SmartGW announcements"
 msgstr ""
 
@@ -443,6 +473,9 @@ msgstr ""
 msgid "Topologie"
 msgstr ""
 
+msgid "Topology"
+msgstr ""
+
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."

diff --git a/po/templates/olsr.pot b/po/templates/olsr.pot
index 36698d949ac4932850b7637af48caab8c780e0bb..f8b7ffe94613f98833c83987a21844fc310700fe 100644 (file)
--- a/po/templates/olsr.pot
+++ b/po/templates/olsr.pot
@@ -25,6 +25,9 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
 msgid "Downlink"
 msgstr ""
 
@@ -73,6 +76,9 @@ msgstr ""
 msgid "HNA"
 msgstr ""
 
+msgid "HNA Announcements"
+msgstr ""
+
 msgid "HNA interval"
 msgstr ""
 
@@ -281,6 +287,9 @@ msgstr ""
 msgid "Neighbour IP"
 msgstr ""
 
+msgid "Neighbours"
+msgstr ""
+
 msgid "Netmask"
 msgstr ""
 
@@ -296,6 +305,12 @@ msgstr ""
 msgid "Nodes"
 msgstr ""
 
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
@@ -359,9 +374,21 @@ msgstr ""
 msgid "Prefix"
 msgstr ""
 
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
 msgid "Routen"
 msgstr ""
 
+msgid "Routes"
+msgstr ""
+
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
@@ -371,6 +398,9 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid "SmartGW"
+msgstr ""
+
 msgid "SmartGW announcements"
 msgstr ""
 
@@ -431,6 +461,9 @@ msgstr ""
 msgid "Topologie"
 msgstr ""
 
+msgid "Topology"
+msgstr ""
+
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."

diff --git a/po/vi/olsr.po b/po/vi/olsr.po
index 669c655ebc36e1296e63c22498970ced5845adf5..cec7dba017032a355980275373a9d3d3bf449c19 100644 (file)
--- a/po/vi/olsr.po
+++ b/po/vi/olsr.po
@@ -38,6 +38,9 @@ msgstr ""
 msgid "Device"
 msgstr ""
 
+msgid "Display"
+msgstr ""
+
 msgid "Downlink"
 msgstr ""
 
@@ -86,6 +89,9 @@ msgstr "Cài đặt tổng quát"
 msgid "HNA"
 msgstr ""
 
+msgid "HNA Announcements"
+msgstr ""
+
 msgid "HNA interval"
 msgstr "Khoảng HNA"
 
@@ -297,6 +303,9 @@ msgstr ""
 msgid "Neighbour IP"
 msgstr "Lận cận IP"
 
+msgid "Neighbours"
+msgstr ""
+
 msgid "Netmask"
 msgstr "Netmask"
 
@@ -312,6 +321,12 @@ msgstr ""
 msgid "Nodes"
 msgstr ""
 
+msgid "OLSR"
+msgstr ""
+
+msgid "OLSR - Display Options"
+msgstr ""
+
 msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - HNA - Thông báo"
 
@@ -375,9 +390,21 @@ msgstr ""
 msgid "Prefix"
 msgstr "Tiền tố"
 
+msgid "Resolve"
+msgstr ""
+
+msgid ""
+"Resolve hostnames on status pages. It is generally safe to allow this, but "
+"if you use public IPs and have unstable DNS-Setup then those pages will load "
+"really slow. In this case disable it here."
+msgstr ""
+
 msgid "Routen"
 msgstr ""
 
+msgid "Routes"
+msgstr ""
+
 msgid "Secondary OLSR interfaces"
 msgstr "Giao diện OLSR thứ nhì"
 
@@ -387,6 +414,9 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid "SmartGW"
+msgstr ""
+
 msgid "SmartGW announcements"
 msgstr ""
 
@@ -447,6 +477,9 @@ msgstr ""
 msgid "Topologie"
 msgstr ""
 
+msgid "Topology"
+msgstr ""
+
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."