* luci/app-olsr: added rewritten german and english translation

13 files changed, 654 insertions, 315 deletions

diff --git a/applications/luci-olsr/luasrc/i18n/olsr.de.lua b/applications/luci-olsr/luasrc/i18n/olsr.de.lua
index 7ec5b4777e..bbf251c4cb 100644
--- a/applications/luci-olsr/luasrc/i18n/olsr.de.lua
+++ b/applications/luci-olsr/luasrc/i18n/olsr.de.lua
@@ -1,64 +1,126 @@
-olsr_routes = 'Routen'
-olsr_topology = 'Topologie'
-olsr_error1 = 'Es konnte keine Verbindung zum OLSR-Daemon hergestellt werden!'
-olsr_links = 'OLSR-Verbindungen'
-olsr_links1 = 'Übersicht über aktuell bestehende OLSR-Verbindungen'
-olsrlinks_lq1 = 'Erfolgsquote gesendeter Pakete'
-olsrlinks_nlq1 = 'Erfolgsquote empfangener Pakete'
-olsrlinks_etx1 = 'Zu erwartende Sendeversuche pro Paket'
-olsr_mid = 'MID'
-olsr_general = 'Allgemeine Einstellungen'
-olsr_general_debuglevel = 'Debugmodus'
-olsr_general_ipversion = 'Internet Protokoll'
-olsr_general_allownoint = 'Start ohne Netzwerk'
-olsr_general_pollrate = 'Abfragerate'
-olsr_general_tcredundancy = 'TC-Redundanz'
-olsr_general_tcredundancy_0 = 'MPR-Selektoren'
-olsr_general_tcredundancy_1 = 'MPR-Selektoren und MPR'
-olsr_general_tcredundancy_2 = 'Alle Nachbarn'
-olsr_general_mprcoverage = 'MPR-Erfassung'
-olsr_general_linkqualitylevel = 'VQ-Level'
-olsr_general_linkqualityaging = 'VQ-Alterung'
-olsr_general_linkqualityalgorithm = 'VQ-Algorithmus'
-olsr_etx_fpm = 'Festkomma'
-olsr_etx_float = 'Gleitkomma'
-olsr_etx_ff = 'Freifunk'
-olsr_general_linkqualitylevel_1 = 'MPR-Auswahl'
-olsr_general_linkqualitylevel_2 = 'MPR-Auswahl und Routing'
-olsr_general_linkqualityfisheye = 'VQ-Fisheye'
-olsr_general_linkqualitywinsize = 'VQ-Fenstergröße'
-olsr_general_linkqualitydijkstralimit = 'VQ-Dijkstralimit'
-olsr_general_usehysteresis = 'Hysterese aktivieren'
-olsr_general_fibmetric = 'FIB-Metrik'
-olsr_general_clearscreen = 'Ansicht zurücksetzen'
-olsr_general_willingness = 'Bereitschaft'
-olsr_interface_ip4broadcast = 'IPv4 Broadcast'
-olsr_interface_hellointerval = 'Hello-Intervall'
-olsr_interface_hellovaliditytime = 'Hello-Gültigkeit'
-olsr_interface_tcinterval = 'TC-Intervall'
-olsr_interface_tcvaliditytime = 'TC-Gültigkeit'
-olsr_interface_midinterval = 'MID-Intervall'
-olsr_interface_midvaliditytime = 'MID-Gültigkeit'
-olsr_interface_hnainterval = 'HNA-Intervall'
-olsr_interface_hnavaliditytime = 'HNA-Gültigkeit'
-olsr_loadplugin = 'Plugins'
-olsr_hna4 = 'IPv4 HNA-Ankündigungen'
-olsr_hna4_desc = 'Hna4-Entries ermöglichen die Ankündigung von lokalen IPv4 Host- und Netz-Routen im Mesh-Netzwerk'
-olsr_hna4_netaddr = 'Netzwerk-Adresse'
-olsr_hna4_netaddr_desc = 'IPv4 Adresse'
-olsr_hna4_prefix = 'Netzmaske'
-olsr_hna4_prefix_desc = 'IPv4 Adresse'
-olsr_hna6 = 'IPv6 HNA-Ankündigungen'
-olsr_hna6_desc = 'Hna6-Entries ermöglichen die Ankündigung von lokalen IPv6 Host- und Netz-Routen im Mesh-Netzwerk'
-olsr_hna6_netaddr = 'Netzwerk-Adresse'
-olsr_hna6_netaddr_desc = 'IPv6 Adresse'
-olsr_hna6_prefix = 'Netzmaske'
-olsr_hna6_prefix_desc = 'IPv6 Adresse'
-olsr_ipcconnect = 'IPC-Einstellungen'
-olsr_ipcconnect_desc = 'IPC-Verbindungen ermöglichen die Fernsteuerung des lokalen OLSR-Prozesses durch externe Programme'
-olsr_ipcconnect_maxconnections = 'maximale Anzahl von Verbindungen'
-olsr_ipcconnect_maxconnections_desc = '0 deaktiviert IPC'
-olsr_ipcconnect_host = 'erlaubte Hostadressen'
-olsr_ipcconnect_host_desc = 'mehrere mit Leerzeichen trennen'
-olsr_ipcconnect_net = 'erlaubte Netzbereiche'
-olsr_ipcconnect_net_desc = 'Adresse Maske; mehrere mit Leerzeichen'
+olsrd = 'OLSR Daemon'
+olsrd_neighbour_ip = 'Nachbar-IP'
+olsrd_local_ip = 'Lokale Interface-IP'
+olsrd_network = 'Angekündigtes Netzwerk'
+olsrd_gateway = 'OLSR-Gateway'
+olsrd_node = 'OLSR-Knoten'
+olsrd_error = 'Es konnte keine Verbindung zum OLSR-Daemon hergestellt werden!'
+olsrd_error_desc = '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.'
+olsrd_hna = 'OLSR - HNA-Ankündigungen'
+olsrd_plugins = 'OLSR - Plugins'
+olsrd_links = 'OLSR-Verbindungen'
+olsrd_links_desc = 'Übersicht über aktuell bestehende OLSR-Verbindungen'
+olsrd_links_etx_desc = 'Zu erwartende Sendeversuche pro Paket'
+olsrd_links_lq_desc = 'Erfolgsquote gesendeter Pakete'
+olsrd_links_nlq_desc = 'Erfolgsquote empfangener Pakete'
+olsrd_routes = 'Bekannte OLSR-Routen'
+olsrd_routes_desc = 'Übersicht über zur Zeit bekannte Routen zu anderen OLSR-Knoten'
+olsrd_topology = 'Aktive OLSR-Knoten'
+olsrd_topology_desc = 'Übersicht über zur Zeit bekannte andere OLSR-Knoten'
+olsrd_topology_lasthop = 'letzter Hop'
+olsrd_hna = 'Aktive HNA-Ankündigungen'
+olsrd_hna_desc = 'Übersicht über zur Zeit aktive OLSR-Netzwerk-Ankündigungen'
+olsrd_mid = 'Aktive MID-Ankündigungen'
+olsrd_mid_desc = 'Übersicht über bekannte Mehrfachschnittstellenmeldungen'
+olsrd_mid_aliases = 'Sekundäre OLSR Schnittstellen'
+olsrd_etx_ff = 'Freifunk'
+olsrd_etx_float = 'Gleitkomma'
+olsrd_etx_fpm = 'Festkomma'
+olsrd_olsrd = 'Allgemeine Einstellungen'
+olsrd_olsrd_allownoint = 'Start ohne Netzwerk'
+olsrd_olsrd_clearscreen = 'Ansicht zurücksetzen'
+olsrd_olsrd_debuglevel = 'Debugmodus'
+olsrd_olsrd_fibmetric = 'FIB-Metrik'
+olsrd_olsrd_ipversion = 'Internet Protokoll'
+olsrd_olsrd_linkqualityaging = 'VQ-Alterung'
+olsrd_olsrd_linkqualityalgorithm = 'VQ-Algorithmus'
+olsrd_olsrd_linkqualitydijkstralimit = 'VQ-Dijkstralimit'
+olsrd_olsrd_linkqualityfisheye = 'VQ-Fisheye'
+olsrd_olsrd_linkqualitylevel = 'VQ-Level'
+olsrd_olsrd_linkqualitylevel_1 = 'MPR-Auswahl'
+olsrd_olsrd_linkqualitylevel_2 = 'MPR-Auswahl und Routing'
+olsrd_olsrd_linkqualitywinsize = 'VQ-Fenstergröße'
+olsrd_olsrd_mprcoverage = 'MPR-Erfassung'
+olsrd_olsrd_pollrate = 'Abfragerate'
+olsrd_olsrd_tcredundancy = 'TC-Redundanz'
+olsrd_olsrd_tcredundancy_0 = 'MPR-Selektoren'
+olsrd_olsrd_tcredundancy_1 = 'MPR-Selektoren und MPR'
+olsrd_olsrd_tcredundancy_2 = 'Alle Nachbarn'
+olsrd_olsrd_usehysteresis = 'Hysterese aktivieren'
+olsrd_olsrd_willingness = 'Bereitschaft'
+olsrd_interface_hellointerval = 'Hello-Intervall'
+olsrd_interface_hellovaliditytime = 'Hello-Gültigkeit'
+olsrd_interface_hnainterval = 'HNA-Intervall'
+olsrd_interface_hnavaliditytime = 'HNA-Gültigkeit'
+olsrd_interface_ip4broadcast = 'IPv4 Broadcast'
+olsrd_interface_midinterval = 'MID-Intervall'
+olsrd_interface_midvaliditytime = 'MID-Gültigkeit'
+olsrd_interface_tcinterval = 'TC-Intervall'
+olsrd_interface_tcvaliditytime = 'TC-Gültigkeit'
+olsrd_ipcconnect = 'IPC-Einstellungen'
+olsrd_ipcconnect_desc = 'IPC-Verbindungen ermöglichen die Fernsteuerung des lokalen OLSR-Prozesses durch externe Programme'
+olsrd_ipcconnect_host = 'Erlaubte Hostadressen'
+olsrd_ipcconnect_host_desc = 'Mehrere mit Leerzeichen trennen'
+olsrd_ipcconnect_maxconnections = 'Maximale Anzahl von Verbindungen'
+olsrd_ipcconnect_maxconnections_desc = '0 deaktiviert IPC'
+olsrd_ipcconnect_net = 'Erlaubte Netzbereiche'
+olsrd_ipcconnect_net_desc = 'Adresse Maske; mehrere mit Leerzeichen'
+olsrd_hna4 = 'IPv4 HNA-Ankündigungen'
+olsrd_hna4_desc = 'Hna4-Entries ermöglichen die Ankündigung von lokalen IPv4 Host- und Netz-Routen im Mesh-Netzwerk'
+olsrd_hna4_netaddr = 'Netzwerk-Adresse'
+olsrd_hna4_netaddr_desc = 'IPv4 Adresse'
+olsrd_hna4_prefix = 'Netzmaske'
+olsrd_hna4_prefix_desc = 'IPv4 Adresse'
+olsrd_hna6 = 'IPv6 HNA-Ankündigungen'
+olsrd_hna6_desc = 'Hna6-Entries ermöglichen die Ankündigung von lokalen IPv6 Host- und Netz-Routen im Mesh-Netzwerk'
+olsrd_hna6_netaddr = 'Netzwerk-Adresse'
+olsrd_hna6_netaddr_desc = 'IPv6 Adresse'
+olsrd_hna6_prefix = 'Netzmaske'
+olsrd_hna6_prefix_desc = 'IPv6 Adresse'
+olsrd_loadplugin = 'Pluginkonfiguration'
+olsrd_loadplugin_ignore = 'Plugin aktivieren'
+olsrd_loadplugin_library = 'Bibliothek'
+olsrd_loadplugin_accept = 'Verbindungsaufbau von Addressen zulassen'
+olsrd_loadplugin_ping = 'Pingtest Adressen'
+olsrd_loadplugin_interval = 'Intervall'
+olsrd_loadplugin_hna = 'HNA Ankündigungen'
+olsrd_loadplugin_hna_desc = 'Format: IP-Adresse Netzmaske / OLSR kündigt dieses Netzwerk an sobald das Gateway erreichbar ist'
+olsrd_loadplugin_addhosts = 'Alternative \"hosts\" Datei'
+olsrd_loadplugin_addhosts_desc = 'Der Inhalt dieser Datei wird mit in die autogenerierte \"hosts\" Datei übernommen'
+olsrd_loadplugin_dnsserver = 'DNS-Server'
+olsrd_loadplugin_hosts = 'Alternative Hostnamen'
+olsrd_loadplugin_hosts_desc = 'Format: Interface-IP Hostname'
+olsrd_loadplugin_hostsfile = 'Pfad zur \"hosts\" Datei'
+olsrd_loadplugin_lat = 'Latitude'
+olsrd_loadplugin_latlonfile = 'Ausgabedatei für Koordinaten'
+olsrd_loadplugin_latlonfile_desc = 'OLSR schreibt alle empfangenen Koordinaten anderer Knoten in diese Datei'
+olsrd_loadplugin_latloninfile = 'Eingabedatei für Koordinaten'
+olsrd_loadplugin_latloninfile_desc = 'OLSR prüft diese Datei periodisch auf neue Koordinaten und propagiert diese'
+olsrd_loadplugin_lon = 'Longitude'
+olsrd_loadplugin_name = 'Hostnamen'
+olsrd_loadplugin_namechangescript = 'Kommando bei Namensänderungen'
+olsrd_loadplugin_namechangescript_desc = 'OLSR ruft dieses Kommando auf sobald sich Einträge in der \"hosts\" Datei ändern'
+olsrd_loadplugin_resolvfile = 'Pfad zur \"resolv\" Datei'
+olsrd_loadplugin_serviceschangescript = 'Kommando bei Serviceänderungen'
+olsrd_loadplugin_serviceschangescript_desc = 'OLSR ruft dieses Kommando auf sobald neue Service-Ankündigungen empfangen werden'
+olsrd_loadplugin_sighuppidfile = 'PID-Datei für SIGHUP Signale'
+olsrd_loadplugin_sighuppidfile_desc = 'OLSR sendet ein HUP Signal an den in der PID Datei angegebenen Prozess sobald sich die \"hosts\" oder \"resolv\" Datei ändert'
+olsrd_loadplugin_suffix = 'Domain-Suffix'
+olsrd_loadplugin_timeout = 'Timeout'
+olsrd_loadplugin_bmfinterface = 'Name für die BMF-Schnittstelle'
+olsrd_loadplugin_bmfinterfaceid = 'IP-Adresse für die BMF-Schnittstelle'
+olsrd_loadplugin_dolocalbroadcast = 'Lokale Broadcasts weiterleiten'
+olsrd_loadplugin_capturepacketsonolsrinterfaces = 'Broadcasts von OLSR-Schnittstellen weiterleiten'
+olsrd_loadplugin_bmfmechanism = 'Verteilungsmechanismus'
+olsrd_loadplugin_broadcastretransmitcount = 'Anzahl der Neuversendungen pro Paket'
+olsrd_loadplugin_fanoutlimit = 'Mindestanzahl der Nachbarn für Broadcastweiterleitung'
+olsrd_loadplugin_nonolsrif = 'Nicht-OLSR-Interfaces'
+olsrd_loadplugin_port = 'Verwendeter Port'
+olsrd_loadplugin_host = 'Verbindungsaufbau von Hosts zulassen'
+olsrd_loadplugin_net = 'Verbindungsaufbau von Subnetzen zulassen'
+olsrd_loadplugin_net_desc = 'Format: IP-Adresse Netzmaske'
+olsrd_loadplugin_redistribute = 'Verwendete Protokolle'
+olsrd_loadplugin_exportroutes = 'Routen nur an Quagga oder auch an Kernel exportieren'
+olsrd_loadplugin_localpref = 'Lokale Routen immer bevorzugen'
+olsrd_loadplugin_distance = 'Distanz für exportierte Routen'
+olsrd_loadplugin_keyfile = 'Schlüsseldatei'
diff --git a/applications/luci-olsr/luasrc/i18n/olsr.de.xml b/applications/luci-olsr/luasrc/i18n/olsr.de.xml
index a5f6622f33..5330c463d7 100644
--- a/applications/luci-olsr/luasrc/i18n/olsr.de.xml
+++ b/applications/luci-olsr/luasrc/i18n/olsr.de.xml
@@ -2,74 +2,182 @@
 
 <i18n:msgs xmlns:i18n="http://luci.freifunk-halle.net/2008/i18n#" xmlns="http://www.w3.org/1999/xhtml">
 
-<i18n:msg xml:id="olsr_routes">Routen</i18n:msg>
-<i18n:msg xml:id="olsr_topology">Topologie</i18n:msg>
-<i18n:msg xml:id="olsr_error1">Es konnte keine Verbindung zum OLSR-Daemon hergestellt werden!</i18n:msg>
-<i18n:msg xml:id="olsr_links">OLSR-Verbindungen</i18n:msg>
-<i18n:msg xml:id="olsr_links1">Übersicht über aktuell bestehende OLSR-Verbindungen</i18n:msg>
-<i18n:msg xml:id="olsrlinks_lq1">Erfolgsquote gesendeter Pakete</i18n:msg>
-<i18n:msg xml:id="olsrlinks_nlq1">Erfolgsquote empfangener Pakete</i18n:msg>
-<i18n:msg xml:id="olsrlinks_etx1">Zu erwartende Sendeversuche pro Paket</i18n:msg>
-<i18n:msg xml:id="olsr_mid">MID</i18n:msg>
-
-<i18n:msg xml:id="olsr_general">Allgemeine Einstellungen</i18n:msg>
-<i18n:msg xml:id="olsr_general_debuglevel">Debugmodus</i18n:msg>
-<i18n:msg xml:id="olsr_general_ipversion">Internet Protokoll</i18n:msg>
-<i18n:msg xml:id="olsr_general_allownoint">Start ohne Netzwerk</i18n:msg>
-<i18n:msg xml:id="olsr_general_pollrate">Abfragerate</i18n:msg>
-<i18n:msg xml:id="olsr_general_tcredundancy">TC-Redundanz</i18n:msg>
-<i18n:msg xml:id="olsr_general_tcredundancy_0">MPR-Selektoren</i18n:msg>
-<i18n:msg xml:id="olsr_general_tcredundancy_1">MPR-Selektoren und MPR</i18n:msg>
-<i18n:msg xml:id="olsr_general_tcredundancy_2">Alle Nachbarn</i18n:msg>
-<i18n:msg xml:id="olsr_general_mprcoverage">MPR-Erfassung</i18n:msg>
-<i18n:msg xml:id="olsr_general_linkqualitylevel">VQ-Level</i18n:msg>
-<i18n:msg xml:id="olsr_general_linkqualityaging">VQ-Alterung</i18n:msg>
-<i18n:msg xml:id="olsr_general_linkqualityalgorithm">VQ-Algorithmus</i18n:msg>
-<i18n:msg xml:id="olsr_etx_fpm">Festkomma</i18n:msg>
-<i18n:msg xml:id="olsr_etx_float">Gleitkomma</i18n:msg>
-<i18n:msg xml:id="olsr_etx_ff">Freifunk</i18n:msg>
-<i18n:msg xml:id="olsr_general_linkqualitylevel_1">MPR-Auswahl</i18n:msg>
-<i18n:msg xml:id="olsr_general_linkqualitylevel_2">MPR-Auswahl und Routing</i18n:msg>
-<i18n:msg xml:id="olsr_general_linkqualityfisheye">VQ-Fisheye</i18n:msg>
-<i18n:msg xml:id="olsr_general_linkqualitywinsize">VQ-Fenstergröße</i18n:msg>
-<i18n:msg xml:id="olsr_general_linkqualitydijkstralimit">VQ-Dijkstralimit</i18n:msg>
-<i18n:msg xml:id="olsr_general_usehysteresis">Hysterese aktivieren</i18n:msg>
-<i18n:msg xml:id="olsr_general_fibmetric">FIB-Metrik</i18n:msg>
-<i18n:msg xml:id="olsr_general_clearscreen">Ansicht zurücksetzen</i18n:msg>
-<i18n:msg xml:id="olsr_general_willingness">Bereitschaft</i18n:msg>
-
-<i18n:msg xml:id="olsr_interface_ip4broadcast">IPv4 Broadcast</i18n:msg>
-<i18n:msg xml:id="olsr_interface_hellointerval">Hello-Intervall</i18n:msg>
-<i18n:msg xml:id="olsr_interface_hellovaliditytime">Hello-Gültigkeit</i18n:msg>
-<i18n:msg xml:id="olsr_interface_tcinterval">TC-Intervall</i18n:msg>
-<i18n:msg xml:id="olsr_interface_tcvaliditytime">TC-Gültigkeit</i18n:msg>
-<i18n:msg xml:id="olsr_interface_midinterval">MID-Intervall</i18n:msg>
-<i18n:msg xml:id="olsr_interface_midvaliditytime">MID-Gültigkeit</i18n:msg>
-<i18n:msg xml:id="olsr_interface_hnainterval">HNA-Intervall</i18n:msg>
-<i18n:msg xml:id="olsr_interface_hnavaliditytime">HNA-Gültigkeit</i18n:msg>
-<i18n:msg xml:id="olsr_loadplugin">Plugins</i18n:msg>
-
-<i18n:msg xml:id="olsr_hna4">IPv4 HNA-Ankündigungen</i18n:msg>
-<i18n:msg xml:id="olsr_hna4_desc">Hna4-Entries ermöglichen die Ankündigung von lokalen IPv4 Host- und Netz-Routen im Mesh-Netzwerk</i18n:msg>
-<i18n:msg xml:id="olsr_hna4_netaddr">Netzwerk-Adresse</i18n:msg>
-<i18n:msg xml:id="olsr_hna4_netaddr_desc">IPv4 Adresse</i18n:msg>
-<i18n:msg xml:id="olsr_hna4_prefix">Netzmaske</i18n:msg>
-<i18n:msg xml:id="olsr_hna4_prefix_desc">IPv4 Adresse</i18n:msg>
-
-<i18n:msg xml:id="olsr_hna6">IPv6 HNA-Ankündigungen</i18n:msg>
-<i18n:msg xml:id="olsr_hna6_desc">Hna6-Entries ermöglichen die Ankündigung von lokalen IPv6 Host- und Netz-Routen im Mesh-Netzwerk</i18n:msg>
-<i18n:msg xml:id="olsr_hna6_netaddr">Netzwerk-Adresse</i18n:msg>
-<i18n:msg xml:id="olsr_hna6_netaddr_desc">IPv6 Adresse</i18n:msg>
-<i18n:msg xml:id="olsr_hna6_prefix">Netzmaske</i18n:msg>
-<i18n:msg xml:id="olsr_hna6_prefix_desc">IPv6 Adresse</i18n:msg>
-
-<i18n:msg xml:id="olsr_ipcconnect">IPC-Einstellungen</i18n:msg>
-<i18n:msg xml:id="olsr_ipcconnect_desc">IPC-Verbindungen ermöglichen die Fernsteuerung des lokalen OLSR-Prozesses durch externe Programme</i18n:msg>
-<i18n:msg xml:id="olsr_ipcconnect_maxconnections">maximale Anzahl von Verbindungen</i18n:msg>
-<i18n:msg xml:id="olsr_ipcconnect_maxconnections_desc">0 deaktiviert IPC</i18n:msg>
-<i18n:msg xml:id="olsr_ipcconnect_host">erlaubte Hostadressen</i18n:msg>
-<i18n:msg xml:id="olsr_ipcconnect_host_desc">mehrere mit Leerzeichen trennen</i18n:msg>
-<i18n:msg xml:id="olsr_ipcconnect_net">erlaubte Netzbereiche</i18n:msg>
-<i18n:msg xml:id="olsr_ipcconnect_net_desc">Adresse Maske; mehrere mit Leerzeichen</i18n:msg>
+<!-- * COMMON * -->
+
+<i18n:msg xml:id="olsrd">OLSR Daemon</i18n:msg>
+<i18n:msg xml:id="olsrd_neighbour_ip">Nachbar-IP</i18n:msg>
+<i18n:msg xml:id="olsrd_local_ip">Lokale Interface-IP</i18n:msg>
+<i18n:msg xml:id="olsrd_network">Angekündigtes Netzwerk</i18n:msg>
+<i18n:msg xml:id="olsrd_gateway">OLSR-Gateway</i18n:msg>
+<i18n:msg xml:id="olsrd_node">OLSR-Knoten</i18n:msg>
+<i18n:msg xml:id="olsrd_error">Es konnte keine Verbindung zum OLSR-Daemon hergestellt werden!</i18n:msg>
+<i18n:msg xml:id="olsrd_error_desc">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.</i18n:msg>
+<i18n:msg xml:id="olsrd_hna">OLSR - HNA-Ankündigungen</i18n:msg>
+<i18n:msg xml:id="olsrd_plugins">OLSR - Plugins</i18n:msg>
+
+<!-- * STATUS * -->
+
+<!-- index -->
+<i18n:msg xml:id="olsrd_links">OLSR-Verbindungen</i18n:msg>
+<i18n:msg xml:id="olsrd_links_desc">Übersicht über aktuell bestehende OLSR-Verbindungen</i18n:msg>
+<i18n:msg xml:id="olsrd_links_etx_desc">Zu erwartende Sendeversuche pro Paket</i18n:msg>
+<i18n:msg xml:id="olsrd_links_lq_desc">Erfolgsquote gesendeter Pakete</i18n:msg>
+<i18n:msg xml:id="olsrd_links_nlq_desc">Erfolgsquote empfangener Pakete</i18n:msg>
+
+<!-- routes -->
+<i18n:msg xml:id="olsrd_routes">Bekannte OLSR-Routen</i18n:msg>
+<i18n:msg xml:id="olsrd_routes_desc">Übersicht über zur Zeit bekannte Routen zu anderen OLSR-Knoten</i18n:msg>
+
+<!-- topology -->
+<i18n:msg xml:id="olsrd_topology">Aktive OLSR-Knoten</i18n:msg>
+<i18n:msg xml:id="olsrd_topology_desc">Übersicht über zur Zeit bekannte andere OLSR-Knoten</i18n:msg>
+<i18n:msg xml:id="olsrd_topology_lasthop">letzter Hop</i18n:msg>
+
+<!-- hna -->
+<i18n:msg xml:id="olsrd_hna">Aktive HNA-Ankündigungen</i18n:msg>
+<i18n:msg xml:id="olsrd_hna_desc">Übersicht über zur Zeit aktive OLSR-Netzwerk-Ankündigungen</i18n:msg>
+
+<!-- mid -->
+<i18n:msg xml:id="olsrd_mid">Aktive MID-Ankündigungen</i18n:msg>
+<i18n:msg xml:id="olsrd_mid_desc">Übersicht über bekannte Mehrfachschnittstellenmeldungen</i18n:msg>
+<i18n:msg xml:id="olsrd_mid_aliases">Sekundäre OLSR Schnittstellen</i18n:msg>
+
+
+<!-- * GENERAL SETUP * -->
+
+<i18n:msg xml:id="olsrd_etx_ff">Freifunk</i18n:msg>
+<i18n:msg xml:id="olsrd_etx_float">Gleitkomma</i18n:msg>
+<i18n:msg xml:id="olsrd_etx_fpm">Festkomma</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd">Allgemeine Einstellungen</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_allownoint">Start ohne Netzwerk</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_clearscreen">Ansicht zurücksetzen</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_debuglevel">Debugmodus</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_fibmetric">FIB-Metrik</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_ipversion">Internet Protokoll</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_linkqualityaging">VQ-Alterung</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_linkqualityalgorithm">VQ-Algorithmus</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_linkqualitydijkstralimit">VQ-Dijkstralimit</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_linkqualityfisheye">VQ-Fisheye</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_linkqualitylevel">VQ-Level</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_linkqualitylevel_1">MPR-Auswahl</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_linkqualitylevel_2">MPR-Auswahl und Routing</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_linkqualitywinsize">VQ-Fenstergröße</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_mprcoverage">MPR-Erfassung</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_pollrate">Abfragerate</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_tcredundancy">TC-Redundanz</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_tcredundancy_0">MPR-Selektoren</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_tcredundancy_1">MPR-Selektoren und MPR</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_tcredundancy_2">Alle Nachbarn</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_usehysteresis">Hysterese aktivieren</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_willingness">Bereitschaft</i18n:msg>
+
+
+<!-- * INTERFACE SETUP * -->
+
+<i18n:msg xml:id="olsrd_interface_hellointerval">Hello-Intervall</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_hellovaliditytime">Hello-Gültigkeit</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_hnainterval">HNA-Intervall</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_hnavaliditytime">HNA-Gültigkeit</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_ip4broadcast">IPv4 Broadcast</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_midinterval">MID-Intervall</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_midvaliditytime">MID-Gültigkeit</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_tcinterval">TC-Intervall</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_tcvaliditytime">TC-Gültigkeit</i18n:msg>
+
+
+<!-- * IPCCONNECT SETUP * -->
+
+<i18n:msg xml:id="olsrd_ipcconnect">IPC-Einstellungen</i18n:msg>
+<i18n:msg xml:id="olsrd_ipcconnect_desc">IPC-Verbindungen ermöglichen die Fernsteuerung des lokalen OLSR-Prozesses durch externe Programme</i18n:msg>
+<i18n:msg xml:id="olsrd_ipcconnect_host">Erlaubte Hostadressen</i18n:msg>
+<i18n:msg xml:id="olsrd_ipcconnect_host_desc">Mehrere mit Leerzeichen trennen</i18n:msg>
+<i18n:msg xml:id="olsrd_ipcconnect_maxconnections">Maximale Anzahl von Verbindungen</i18n:msg>
+<i18n:msg xml:id="olsrd_ipcconnect_maxconnections_desc">0 deaktiviert IPC</i18n:msg>
+<i18n:msg xml:id="olsrd_ipcconnect_net">Erlaubte Netzbereiche</i18n:msg>
+<i18n:msg xml:id="olsrd_ipcconnect_net_desc">Adresse Maske; mehrere mit Leerzeichen</i18n:msg>
+
+
+<!-- * HNA4/HNA6 SETUP * -->
+
+<!-- hna4 -->
+<i18n:msg xml:id="olsrd_hna4">IPv4 HNA-Ankündigungen</i18n:msg>
+<i18n:msg xml:id="olsrd_hna4_desc">Hna4-Entries ermöglichen die Ankündigung von lokalen IPv4 Host- und Netz-Routen im Mesh-Netzwerk</i18n:msg>
+<i18n:msg xml:id="olsrd_hna4_netaddr">Netzwerk-Adresse</i18n:msg>
+<i18n:msg xml:id="olsrd_hna4_netaddr_desc">IPv4 Adresse</i18n:msg>
+<i18n:msg xml:id="olsrd_hna4_prefix">Netzmaske</i18n:msg>
+<i18n:msg xml:id="olsrd_hna4_prefix_desc">IPv4 Adresse</i18n:msg>
+
+<!-- hna6 -->
+<i18n:msg xml:id="olsrd_hna6">IPv6 HNA-Ankündigungen</i18n:msg>
+<i18n:msg xml:id="olsrd_hna6_desc">Hna6-Entries ermöglichen die Ankündigung von lokalen IPv6 Host- und Netz-Routen im Mesh-Netzwerk</i18n:msg>
+<i18n:msg xml:id="olsrd_hna6_netaddr">Netzwerk-Adresse</i18n:msg>
+<i18n:msg xml:id="olsrd_hna6_netaddr_desc">IPv6 Adresse</i18n:msg>
+<i18n:msg xml:id="olsrd_hna6_prefix">Netzmaske</i18n:msg>
+<i18n:msg xml:id="olsrd_hna6_prefix_desc">IPv6 Adresse</i18n:msg>
+
+
+<!-- * PLUGIN SETUP * -->
+
+<i18n:msg xml:id="olsrd_loadplugin">Pluginkonfiguration</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_ignore">Plugin aktivieren</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_library">Bibliothek</i18n:msg>
+
+<!-- txtinfo -->
+<i18n:msg xml:id="olsrd_loadplugin_accept">Verbindungsaufbau von Addressen zulassen</i18n:msg>
+
+<!-- dyngw -->
+<i18n:msg xml:id="olsrd_loadplugin_ping">Pingtest Adressen</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_interval">Intervall</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_hna">HNA Ankündigungen</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_hna_desc">Format: IP-Adresse Netzmaske / OLSR kündigt dieses Netzwerk an sobald das Gateway erreichbar ist</i18n:msg>
+
+<!-- nameservice -->
+<i18n:msg xml:id="olsrd_loadplugin_addhosts" method="text">Alternative "hosts" Datei</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_addhosts_desc" method="text">Der Inhalt dieser Datei wird mit in die autogenerierte "hosts" Datei übernommen</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_dnsserver">DNS-Server</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_hosts">Alternative Hostnamen</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_hosts_desc">Format: Interface-IP Hostname</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_hostsfile" method="text">Pfad zur "hosts" Datei</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_lat">Latitude</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_latlonfile">Ausgabedatei für Koordinaten</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_latlonfile_desc">OLSR schreibt alle empfangenen Koordinaten anderer Knoten in diese Datei</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_latloninfile">Eingabedatei für Koordinaten</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_latloninfile_desc">OLSR prüft diese Datei periodisch auf neue Koordinaten und propagiert diese</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_lon">Longitude</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_name">Hostnamen</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_namechangescript">Kommando bei Namensänderungen</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_namechangescript_desc" method="text">OLSR ruft dieses Kommando auf sobald sich Einträge in der "hosts" Datei ändern</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_resolvfile" method="text">Pfad zur "resolv" Datei</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_serviceschangescript">Kommando bei Serviceänderungen</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_serviceschangescript_desc">OLSR ruft dieses Kommando auf sobald neue Service-Ankündigungen empfangen werden</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_sighuppidfile">PID-Datei für SIGHUP Signale</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_sighuppidfile_desc" method="text">OLSR sendet ein HUP Signal an den in der PID Datei angegebenen Prozess sobald sich die "hosts" oder "resolv" Datei ändert</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_suffix">Domain-Suffix</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_timeout">Timeout</i18n:msg>
+
+<!-- bmf -->
+<i18n:msg xml:id="olsrd_loadplugin_bmfinterface">Name für die BMF-Schnittstelle</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_bmfinterfaceid">IP-Adresse für die BMF-Schnittstelle</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_dolocalbroadcast">Lokale Broadcasts weiterleiten</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_capturepacketsonolsrinterfaces">Broadcasts von OLSR-Schnittstellen weiterleiten</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_bmfmechanism">Verteilungsmechanismus</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_broadcastretransmitcount">Anzahl der Neuversendungen pro Paket</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_fanoutlimit">Mindestanzahl der Nachbarn für Broadcastweiterleitung</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_nonolsrif">Nicht-OLSR-Interfaces</i18n:msg>
+
+<!-- httpinfo -->
+<i18n:msg xml:id="olsrd_loadplugin_port">Verwendeter Port</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_host">Verbindungsaufbau von Hosts zulassen</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_net">Verbindungsaufbau von Subnetzen zulassen</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_net_desc">Format: IP-Adresse Netzmaske</i18n:msg>
+
+<!-- quagga -->
+<i18n:msg xml:id="olsrd_loadplugin_redistribute">Verwendete Protokolle</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_exportroutes">Routen nur an Quagga oder auch an Kernel exportieren</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_localpref">Lokale Routen immer bevorzugen</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_distance">Distanz für exportierte Routen</i18n:msg>
+
+<!-- secure -->
+<i18n:msg xml:id="olsrd_loadplugin_keyfile">Schlüsseldatei</i18n:msg>
 
 </i18n:msgs>
diff --git a/applications/luci-olsr/luasrc/i18n/olsr.en.lua b/applications/luci-olsr/luasrc/i18n/olsr.en.lua
index 997c79f011..71f61d93c8 100644
--- a/applications/luci-olsr/luasrc/i18n/olsr.en.lua
+++ b/applications/luci-olsr/luasrc/i18n/olsr.en.lua
@@ -1,66 +1,126 @@
-olsr_routes = 'Routes'
-olsr_topology = 'Topology'
-olsr_error1 = 'Unable to connect to the OLSR daemon.'
-olsr_error2 = 'To collect status information start the OLSR-Daemon and enable the &quot;txtinfo&quot;-Plugin'
-olsr_links = 'OLSR-Connections'
-olsr_links1 = 'Overview over current OLSR connections'
-olsrlinks_lq1 = 'Success rate of transmitted packets'
-olsrlinks_nlq1 = 'Success rate of received packets'
-olsrlinks_etx1 = 'Expected transmission tries per packet'
-olsr_mid = 'MID'
-olsr_desc = 'OLSR is a flexible routing protocol that supports building mobile ad-hoc networks.'
-olsr_general = 'General settings'
-olsr_general_debuglevel = 'Debugmode'
-olsr_general_ipversion = 'Internet Protocol'
-olsr_general_allownoint = 'Start without network'
-olsr_general_pollrate = 'Pollrate'
-olsr_general_tcredundancy = 'TC-Redundancy'
-olsr_general_tcredundancy_0 = 'MPR-Selectors'
-olsr_general_tcredundancy_1 = 'MPR-Selectors and MPR'
-olsr_general_tcredundancy_2 = 'All Neighbors'
-olsr_general_mprcoverage = 'MPR-Coverage'
-olsr_general_linkqualitylevel = 'LQ-Level'
-olsr_general_linkqualityaging = 'LQ-Aging'
-olsr_general_linkqualityalgorithm = 'LQ-Algorithm'
-olsr_etx_fpm = 'Fixed Point'
-olsr_etx_float = 'Floating Point'
-olsr_etx_ff = 'Freifunk'
-olsr_general_linkqualitylevel_1 = 'MPR-Selection'
-olsr_general_linkqualitylevel_2 = 'MPR-Selection and Routing'
-olsr_general_linkqualityfisheye = 'LQ-Fisheye'
-olsr_general_linkqualitywinsize = 'LQ-Windowsize'
-olsr_general_linkqualitydijkstralimit = 'LQ-Dijkstralimit'
-olsr_general_usehysteresis = 'Use hysteresis'
-olsr_general_fibmetric = 'FIB-Metric'
-olsr_general_clearscreen = 'Clear Screen'
-olsr_general_willingness = 'Willingness'
-olsr_interface_ip4broadcast = 'IPv4 Broadcast'
-olsr_interface_hellointerval = 'Hello-Interval'
-olsr_interface_hellovaliditytime = 'Hello-Validity'
-olsr_interface_tcinterval = 'TC-Interval'
-olsr_interface_tcvaliditytime = 'TC-Validity'
-olsr_interface_midinterval = 'MID-Interval'
-olsr_interface_midvaliditytime = 'MID-Validity'
-olsr_interface_hnainterval = 'HNA-Interval'
-olsr_interface_hnavaliditytime = 'HNA-Validity'
-olsr_loadplugin = 'Plugins'
-olsr_hna4 = 'IPv4 HNA-Announcements'
-olsr_hna4_desc = 'Hna4-entries are used to announce local ipv4 host- and net-routes within the mesh-network'
-olsr_hna4_netaddr = 'Network-Address'
-olsr_hna4_netaddr_desc = 'ipv4 address'
-olsr_hna4_prefix = 'Netmask'
-olsr_hna4_prefix_desc = 'ipv4 address'
-olsr_hna6 = 'IPv6 HNA-Announcements'
-olsr_hna6_desc = 'Hna6-entries are used to announce local ipv6 host- and net-routes within the mesh-network'
-olsr_hna6_netaddr = 'Network-Address'
-olsr_hna6_netaddr_desc = 'ipv6 address'
-olsr_hna6_prefix = 'Netmask'
-olsr_hna6_prefix_desc = 'ipv6 address'
-olsr_ipcconnect = 'IPC-Settings'
-olsr_ipcconnect_desc = 'IPC-connections allow external programs to remote-control the local OLSR process'
-olsr_ipcconnect_maxconnections = 'max. allowed connections'
-olsr_ipcconnect_maxconnections_desc = '0 disables IPC'
-olsr_ipcconnect_host = 'Allowed hosts'
-olsr_ipcconnect_host_desc = 'multiple separated by space'
-olsr_ipcconnect_net = 'Allowed networks'
-olsr_ipcconnect_net_desc = 'address netmask; separated by space'
+olsrd = 'OLSR Daemon'
+olsrd_neighbour_ip = 'Neighbour IP'
+olsrd_local_ip = 'Local interface IP'
+olsrd_network = 'Announced network'
+olsrd_gateway = 'OLSR gateway'
+olsrd_node = 'OLSR node'
+olsrd_error = 'Unable to connect to the OLSR daemon!'
+olsrd_error_desc = 'Make sure that OLSRd is running, the &quot;txtinfo&quot; plugin is loaded, configured on port 2006 and accepts connections from &quot;127.0.0.1&quot;.'
+olsrd_hna = 'OLSR - HNA-Announcements'
+olsrd_plugins = 'OLSR - Plugins'
+olsrd_links = 'OLSR connections'
+olsrd_links_desc = 'Overview of currently established OLSR connections'
+olsrd_links_etx_desc = 'Expected retransmission count'
+olsrd_links_lq_desc = 'Success rate of sent packages'
+olsrd_links_nlq_desc = 'Success rate of received packages'
+olsrd_routes = 'Known OLSR routes'
+olsrd_routes_desc = 'Overview of currently known routes to other OLSR nodes'
+olsrd_topology = 'Active OLSR nodes'
+olsrd_topology_desc = 'Overview of currently known OLSR nodes'
+olsrd_topology_lasthop = 'Last hop'
+olsrd_hna = 'Active host net announcements'
+olsrd_hna_desc = 'Overview of currently active OLSR host net announcements'
+olsrd_mid = 'Active MID announcements'
+olsrd_mid_desc = 'Overview of known multiple interface announcements'
+olsrd_mid_aliases = 'Secondary OLSR interfaces'
+olsrd_etx_ff = 'Freifunk'
+olsrd_etx_float = 'floating point'
+olsrd_etx_fpm = 'fixed point math'
+olsrd_olsrd = 'General settings'
+olsrd_olsrd_allownoint = 'Start without network'
+olsrd_olsrd_clearscreen = 'Clear screen'
+olsrd_olsrd_debuglevel = 'Debugmode'
+olsrd_olsrd_fibmetric = 'FIB metric'
+olsrd_olsrd_ipversion = 'Internet protocol'
+olsrd_olsrd_linkqualityaging = 'LQ aging'
+olsrd_olsrd_linkqualityalgorithm = 'LQ algorithm'
+olsrd_olsrd_linkqualitydijkstralimit = 'LQ Dijkstra limit'
+olsrd_olsrd_linkqualityfisheye = 'LQ fisheye'
+olsrd_olsrd_linkqualitylevel = 'LQ level'
+olsrd_olsrd_linkqualitylevel_1 = 'MPR selection'
+olsrd_olsrd_linkqualitylevel_2 = 'MPR selection and routing'
+olsrd_olsrd_linkqualitywinsize = 'LQ window size'
+olsrd_olsrd_mprcoverage = 'MPR coverage'
+olsrd_olsrd_pollrate = 'Pollrate'
+olsrd_olsrd_tcredundancy = 'TC redundancy'
+olsrd_olsrd_tcredundancy_0 = 'MPR selectors'
+olsrd_olsrd_tcredundancy_1 = 'MPR selectors and MPR'
+olsrd_olsrd_tcredundancy_2 = 'all neighbours'
+olsrd_olsrd_usehysteresis = 'Use hysteresis'
+olsrd_olsrd_willingness = 'Willingness'
+olsrd_interface_hellointerval = 'Hello interval'
+olsrd_interface_hellovaliditytime = 'Hello validity time'
+olsrd_interface_hnainterval = 'HNA interval'
+olsrd_interface_hnavaliditytime = 'HNA validity time'
+olsrd_interface_ip4broadcast = 'IPv4 broadcast'
+olsrd_interface_midinterval = 'MID interval'
+olsrd_interface_midvaliditytime = 'MID validity time'
+olsrd_interface_tcinterval = 'TC interval'
+olsrd_interface_tcvaliditytime = 'TC validity time'
+olsrd_ipcconnect = 'IPC settings'
+olsrd_ipcconnect_desc = 'IPC connections enable you to remote-control the local OLSRd instance using external programs'
+olsrd_ipcconnect_host = 'Allowed host addresses'
+olsrd_ipcconnect_host_desc = 'Multiple separated by spaces'
+olsrd_ipcconnect_maxconnections = 'Maxmimum connection count'
+olsrd_ipcconnect_maxconnections_desc = 'Set to 0 to disable IPC'
+olsrd_ipcconnect_net = 'Allowed subnets'
+olsrd_ipcconnect_net_desc = 'Address Mask; multiple separated by space'
+olsrd_hna4 = 'IPv4 HNA announcements'
+olsrd_hna4_desc = 'Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network'
+olsrd_hna4_netaddr = 'Network address'
+olsrd_hna4_netaddr_desc = 'IPv4 address'
+olsrd_hna4_prefix = 'Netmask'
+olsrd_hna4_prefix_desc = 'IPv4 address'
+olsrd_hna6 = 'IPv6 HNA announcements'
+olsrd_hna6_desc = 'Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network'
+olsrd_hna6_netaddr = 'Network address'
+olsrd_hna6_netaddr_desc = 'IPv6 address'
+olsrd_hna6_prefix = 'Netmask'
+olsrd_hna6_prefix_desc = 'IPv6 address'
+olsrd_loadplugin = 'Plugin configuration'
+olsrd_loadplugin_ignore = 'Enable plugin'
+olsrd_loadplugin_library = 'Library'
+olsrd_loadplugin_accept = 'Allow connections from this hosts'
+olsrd_loadplugin_ping = 'Ping test addresses'
+olsrd_loadplugin_interval = 'Interval'
+olsrd_loadplugin_hna = 'HNA announcements'
+olsrd_loadplugin_hna_desc = 'Format: IP-Address Netmask / OLSR will announce this network once it is reachable'
+olsrd_loadplugin_addhosts = 'Alternative \"hosts\" file'
+olsrd_loadplugin_addhosts_desc = 'The contents of this file will be appended to the autogenerated \"hosts\" file'
+olsrd_loadplugin_dnsserver = 'DNS server'
+olsrd_loadplugin_hosts = 'Alternative hostnames'
+olsrd_loadplugin_hosts_desc = 'Format: Interface-IP Hostname'
+olsrd_loadplugin_hostsfile = 'Path to the \"hosts\" file'
+olsrd_loadplugin_lat = 'Latitude'
+olsrd_loadplugin_latlonfile = 'Output file for coordinates'
+olsrd_loadplugin_latlonfile_desc = 'OLSR will write received coordinates of other nodes to this file'
+olsrd_loadplugin_latloninfile = 'Input file for coordinates'
+olsrd_loadplugin_latloninfile_desc = 'OLSR periodically checks this file for new coordinates and propagates them'
+olsrd_loadplugin_lon = 'Longitude'
+olsrd_loadplugin_name = 'Hostnames'
+olsrd_loadplugin_namechangescript = 'Command for name changes'
+olsrd_loadplugin_namechangescript_desc = 'OLSR executes this command once entries in the \"hosts\" are changed'
+olsrd_loadplugin_resolvfile = 'Path to the \"resolv\" file'
+olsrd_loadplugin_serviceschangescript = 'Command for service changes'
+olsrd_loadplugin_serviceschangescript_desc = 'OLSR excutes this command once new service announcements are received'
+olsrd_loadplugin_sighuppidfile = 'PID file for SIGHUP signals'
+olsrd_loadplugin_sighuppidfile_desc = 'OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed'
+olsrd_loadplugin_suffix = 'Domain suffix'
+olsrd_loadplugin_timeout = 'Timeout'
+olsrd_loadplugin_bmfinterface = 'Name of the BMF interface'
+olsrd_loadplugin_bmfinterfaceid = 'IP address of the BMF interface'
+olsrd_loadplugin_dolocalbroadcast = 'Redirect local broadcasts'
+olsrd_loadplugin_capturepacketsonolsrinterfaces = 'Also redirect broadcasts from OLSR interfaces'
+olsrd_loadplugin_bmfmechanism = 'Propagation mechanism'
+olsrd_loadplugin_broadcastretransmitcount = 'Number of retransmissions per package'
+olsrd_loadplugin_fanoutlimit = 'Minimum number of neighbours for broadcast redirection'
+olsrd_loadplugin_nonolsrif = 'Non-OLSR interfaces'
+olsrd_loadplugin_port = 'Used port'
+olsrd_loadplugin_host = 'Allow connections from hosts'
+olsrd_loadplugin_net = 'Allow connections from subnets'
+olsrd_loadplugin_net_desc = 'Format: IP-AddresseNetmask'
+olsrd_loadplugin_redistribute = 'Used protocols'
+olsrd_loadplugin_exportroutes = 'Only export routes to Quagga or to kernel too'
+olsrd_loadplugin_localpref = 'Always prefer local routes'
+olsrd_loadplugin_distance = 'Distance of exported routes'
+olsrd_loadplugin_keyfile = 'Key file'
diff --git a/applications/luci-olsr/luasrc/i18n/olsr.en.xml b/applications/luci-olsr/luasrc/i18n/olsr.en.xml
index 8d3aacac47..5ae6ac7e70 100644
--- a/applications/luci-olsr/luasrc/i18n/olsr.en.xml
+++ b/applications/luci-olsr/luasrc/i18n/olsr.en.xml
@@ -2,77 +2,182 @@
 
 <i18n:msgs xmlns:i18n="http://luci.freifunk-halle.net/2008/i18n#" xmlns="http://www.w3.org/1999/xhtml">
 
-<i18n:msg xml:id="olsr_routes">Routes</i18n:msg>
-<i18n:msg xml:id="olsr_topology">Topology</i18n:msg>
-<i18n:msg xml:id="olsr_error1">Unable to connect to the OLSR daemon.</i18n:msg>
-<i18n:msg xml:id="olsr_error2">To collect status information start the OLSR-Daemon and enable the "txtinfo"-Plugin</i18n:msg>
-<i18n:msg xml:id="olsr_links">OLSR-Connections</i18n:msg>
-<i18n:msg xml:id="olsr_links1">Overview over current OLSR connections</i18n:msg>
-<i18n:msg xml:id="olsrlinks_lq1">Success rate of transmitted packets</i18n:msg>
-<i18n:msg xml:id="olsrlinks_nlq1">Success rate of received packets</i18n:msg>
-<i18n:msg xml:id="olsrlinks_etx1">Expected transmission tries per packet</i18n:msg>
-<i18n:msg xml:id="olsr_mid">MID</i18n:msg>
-
-<i18n:msg xml:id="olsr_desc">OLSR is a flexible routing protocol that supports building mobile ad-hoc networks.</i18n:msg>
-<i18n:msg xml:id="olsr_general">General settings</i18n:msg>
-<i18n:msg xml:id="olsr_general_debuglevel">Debugmode</i18n:msg>
-<i18n:msg xml:id="olsr_general_ipversion">Internet Protocol</i18n:msg>
-<i18n:msg xml:id="olsr_general_allownoint">Start without network</i18n:msg>
-<i18n:msg xml:id="olsr_general_pollrate">Pollrate</i18n:msg>
-<i18n:msg xml:id="olsr_general_tcredundancy">TC-Redundancy</i18n:msg>
-<i18n:msg xml:id="olsr_general_tcredundancy_0">MPR-Selectors</i18n:msg>
-<i18n:msg xml:id="olsr_general_tcredundancy_1">MPR-Selectors and MPR</i18n:msg>
-<i18n:msg xml:id="olsr_general_tcredundancy_2">All Neighbors</i18n:msg>
-<i18n:msg xml:id="olsr_general_mprcoverage">MPR-Coverage</i18n:msg>
-<i18n:msg xml:id="olsr_general_linkqualitylevel">LQ-Level</i18n:msg>
-<i18n:msg xml:id="olsr_general_linkqualityaging">LQ-Aging</i18n:msg>
-<i18n:msg xml:id="olsr_general_linkqualityalgorithm">LQ-Algorithm</i18n:msg>
-<i18n:msg xml:id="olsr_etx_fpm">Fixed Point</i18n:msg>
-<i18n:msg xml:id="olsr_etx_float">Floating Point</i18n:msg>
-<i18n:msg xml:id="olsr_etx_ff">Freifunk</i18n:msg>
-<i18n:msg xml:id="olsr_general_linkqualitylevel_1">MPR-Selection</i18n:msg>
-<i18n:msg xml:id="olsr_general_linkqualitylevel_2">MPR-Selection and Routing</i18n:msg>
-<i18n:msg xml:id="olsr_general_linkqualityfisheye">LQ-Fisheye</i18n:msg>
-<i18n:msg xml:id="olsr_general_linkqualitywinsize">LQ-Windowsize</i18n:msg>
-<i18n:msg xml:id="olsr_general_linkqualitydijkstralimit">LQ-Dijkstralimit</i18n:msg>
-<i18n:msg xml:id="olsr_general_usehysteresis">Use hysteresis</i18n:msg>
-<i18n:msg xml:id="olsr_general_fibmetric">FIB-Metric</i18n:msg>
-<i18n:msg xml:id="olsr_general_clearscreen">Clear Screen</i18n:msg>
-<i18n:msg xml:id="olsr_general_willingness">Willingness</i18n:msg>
-
-<i18n:msg xml:id="olsr_interface_ip4broadcast">IPv4 Broadcast</i18n:msg>
-<i18n:msg xml:id="olsr_interface_hellointerval">Hello-Interval</i18n:msg>
-<i18n:msg xml:id="olsr_interface_hellovaliditytime">Hello-Validity</i18n:msg>
-<i18n:msg xml:id="olsr_interface_tcinterval">TC-Interval</i18n:msg>
-<i18n:msg xml:id="olsr_interface_tcvaliditytime">TC-Validity</i18n:msg>
-<i18n:msg xml:id="olsr_interface_midinterval">MID-Interval</i18n:msg>
-<i18n:msg xml:id="olsr_interface_midvaliditytime">MID-Validity</i18n:msg>
-<i18n:msg xml:id="olsr_interface_hnainterval">HNA-Interval</i18n:msg>
-<i18n:msg xml:id="olsr_interface_hnavaliditytime">HNA-Validity</i18n:msg>
-<i18n:msg xml:id="olsr_loadplugin">Plugins</i18n:msg>
-
-<i18n:msg xml:id="olsr_hna4">IPv4 HNA-Announcements</i18n:msg>
-<i18n:msg xml:id="olsr_hna4_desc">Hna4-entries are used to announce local ipv4 host- and net-routes within the mesh-network</i18n:msg>
-<i18n:msg xml:id="olsr_hna4_netaddr">Network-Address</i18n:msg>
-<i18n:msg xml:id="olsr_hna4_netaddr_desc">ipv4 address</i18n:msg>
-<i18n:msg xml:id="olsr_hna4_prefix">Netmask</i18n:msg>
-<i18n:msg xml:id="olsr_hna4_prefix_desc">ipv4 address</i18n:msg>
-
-<i18n:msg xml:id="olsr_hna6">IPv6 HNA-Announcements</i18n:msg>
-<i18n:msg xml:id="olsr_hna6_desc">Hna6-entries are used to announce local ipv6 host- and net-routes within the mesh-network</i18n:msg>
-<i18n:msg xml:id="olsr_hna6_netaddr">Network-Address</i18n:msg>
-<i18n:msg xml:id="olsr_hna6_netaddr_desc">ipv6 address</i18n:msg>
-<i18n:msg xml:id="olsr_hna6_prefix">Netmask</i18n:msg>
-<i18n:msg xml:id="olsr_hna6_prefix_desc">ipv6 address</i18n:msg>
-
-<i18n:msg xml:id="olsr_ipcconnect">IPC-Settings</i18n:msg>
-<i18n:msg xml:id="olsr_ipcconnect_desc">IPC-connections allow external programs to remote-control the local OLSR process</i18n:msg>
-<i18n:msg xml:id="olsr_ipcconnect_maxconnections">max. allowed connections</i18n:msg>
-<i18n:msg xml:id="olsr_ipcconnect_maxconnections_desc">0 disables IPC</i18n:msg>
-<i18n:msg xml:id="olsr_ipcconnect_host">Allowed hosts</i18n:msg>
-<i18n:msg xml:id="olsr_ipcconnect_host_desc">multiple separated by space</i18n:msg>
-<i18n:msg xml:id="olsr_ipcconnect_net">Allowed networks</i18n:msg>
-<i18n:msg xml:id="olsr_ipcconnect_net_desc">address netmask; separated by space</i18n:msg>
+<!-- * COMMON * -->
 
+<i18n:msg xml:id="olsrd">OLSR Daemon</i18n:msg>
+<i18n:msg xml:id="olsrd_neighbour_ip">Neighbour IP</i18n:msg>
+<i18n:msg xml:id="olsrd_local_ip">Local interface IP</i18n:msg>
+<i18n:msg xml:id="olsrd_network">Announced network</i18n:msg>
+<i18n:msg xml:id="olsrd_gateway">OLSR gateway</i18n:msg>
+<i18n:msg xml:id="olsrd_node">OLSR node</i18n:msg>
+<i18n:msg xml:id="olsrd_error">Unable to connect to the OLSR daemon!</i18n:msg>
+<i18n:msg xml:id="olsrd_error_desc">Make sure that OLSRd is running, the "txtinfo" plugin is loaded, configured on port 2006 and accepts connections from "127.0.0.1".</i18n:msg>
+<i18n:msg xml:id="olsrd_hna">OLSR - HNA-Announcements</i18n:msg>
+<i18n:msg xml:id="olsrd_plugins">OLSR - Plugins</i18n:msg>
+
+<!-- * STATUS * -->
+
+<!-- index -->
+<i18n:msg xml:id="olsrd_links">OLSR connections</i18n:msg>
+<i18n:msg xml:id="olsrd_links_desc">Overview of currently established OLSR connections</i18n:msg>
+<i18n:msg xml:id="olsrd_links_etx_desc">Expected retransmission count</i18n:msg>
+<i18n:msg xml:id="olsrd_links_lq_desc">Success rate of sent packages</i18n:msg>
+<i18n:msg xml:id="olsrd_links_nlq_desc">Success rate of received packages</i18n:msg>
+
+<!-- routes -->
+<i18n:msg xml:id="olsrd_routes">Known OLSR routes</i18n:msg>
+<i18n:msg xml:id="olsrd_routes_desc">Overview of currently known routes to other OLSR nodes</i18n:msg>
+
+<!-- topology -->
+<i18n:msg xml:id="olsrd_topology">Active OLSR nodes</i18n:msg>
+<i18n:msg xml:id="olsrd_topology_desc">Overview of currently known OLSR nodes</i18n:msg>
+<i18n:msg xml:id="olsrd_topology_lasthop">Last hop</i18n:msg>
+
+<!-- hna -->
+<i18n:msg xml:id="olsrd_hna">Active host net announcements</i18n:msg>
+<i18n:msg xml:id="olsrd_hna_desc">Overview of currently active OLSR host net announcements</i18n:msg>
+
+<!-- mid -->
+<i18n:msg xml:id="olsrd_mid">Active MID announcements</i18n:msg>
+<i18n:msg xml:id="olsrd_mid_desc">Overview of known multiple interface announcements</i18n:msg>
+<i18n:msg xml:id="olsrd_mid_aliases">Secondary OLSR interfaces</i18n:msg>
+
+
+<!-- * GENERAL SETUP * -->
+
+<i18n:msg xml:id="olsrd_etx_ff">Freifunk</i18n:msg>
+<i18n:msg xml:id="olsrd_etx_float">floating point</i18n:msg>
+<i18n:msg xml:id="olsrd_etx_fpm">fixed point math</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd">General settings</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_allownoint">Start without network</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_clearscreen">Clear screen</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_debuglevel">Debugmode</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_fibmetric">FIB metric</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_ipversion">Internet protocol</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_linkqualityaging">LQ aging</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_linkqualityalgorithm">LQ algorithm</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_linkqualitydijkstralimit">LQ Dijkstra limit</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_linkqualityfisheye">LQ fisheye</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_linkqualitylevel">LQ level</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_linkqualitylevel_1">MPR selection</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_linkqualitylevel_2">MPR selection and routing</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_linkqualitywinsize">LQ window size</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_mprcoverage">MPR coverage</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_pollrate">Pollrate</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_tcredundancy">TC redundancy</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_tcredundancy_0">MPR selectors</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_tcredundancy_1">MPR selectors and MPR</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_tcredundancy_2">all neighbours</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_usehysteresis">Use hysteresis</i18n:msg>
+<i18n:msg xml:id="olsrd_olsrd_willingness">Willingness</i18n:msg>
+
+
+<!-- * INTERFACE SETUP * -->
+
+<i18n:msg xml:id="olsrd_interface_hellointerval">Hello interval</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_hellovaliditytime">Hello validity time</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_hnainterval">HNA interval</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_hnavaliditytime">HNA validity time</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_ip4broadcast">IPv4 broadcast</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_midinterval">MID interval</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_midvaliditytime">MID validity time</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_tcinterval">TC interval</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_tcvaliditytime">TC validity time</i18n:msg>
+
+
+<!-- * IPCCONNECT SETUP * -->
+
+<i18n:msg xml:id="olsrd_ipcconnect">IPC settings</i18n:msg>
+<i18n:msg xml:id="olsrd_ipcconnect_desc">IPC connections enable you to remote-control the local OLSRd instance using external programs</i18n:msg>
+<i18n:msg xml:id="olsrd_ipcconnect_host">Allowed host addresses</i18n:msg>
+<i18n:msg xml:id="olsrd_ipcconnect_host_desc">Multiple separated by spaces</i18n:msg>
+<i18n:msg xml:id="olsrd_ipcconnect_maxconnections">Maxmimum connection count</i18n:msg>
+<i18n:msg xml:id="olsrd_ipcconnect_maxconnections_desc">Set to 0 to disable IPC</i18n:msg>
+<i18n:msg xml:id="olsrd_ipcconnect_net">Allowed subnets</i18n:msg>
+<i18n:msg xml:id="olsrd_ipcconnect_net_desc">Address Mask; multiple separated by space</i18n:msg>
+
+
+<!-- * HNA4/HNA6 SETUP * -->
+
+<!-- hna4 -->
+<i18n:msg xml:id="olsrd_hna4">IPv4 HNA announcements</i18n:msg>
+<i18n:msg xml:id="olsrd_hna4_desc">Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network</i18n:msg>
+<i18n:msg xml:id="olsrd_hna4_netaddr">Network address</i18n:msg>
+<i18n:msg xml:id="olsrd_hna4_netaddr_desc">IPv4 address</i18n:msg>
+<i18n:msg xml:id="olsrd_hna4_prefix">Netmask</i18n:msg>
+<i18n:msg xml:id="olsrd_hna4_prefix_desc">IPv4 address</i18n:msg>
+
+<!-- hna6 -->
+<i18n:msg xml:id="olsrd_hna6">IPv6 HNA announcements</i18n:msg>
+<i18n:msg xml:id="olsrd_hna6_desc">Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network</i18n:msg>
+<i18n:msg xml:id="olsrd_hna6_netaddr">Network address</i18n:msg>
+<i18n:msg xml:id="olsrd_hna6_netaddr_desc">IPv6 address</i18n:msg>
+<i18n:msg xml:id="olsrd_hna6_prefix">Netmask</i18n:msg>
+<i18n:msg xml:id="olsrd_hna6_prefix_desc">IPv6 address</i18n:msg>
+
+
+<!-- * PLUGIN SETUP * -->
+
+<i18n:msg xml:id="olsrd_loadplugin">Plugin configuration</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_ignore">Enable plugin</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_library">Library</i18n:msg>
+
+<!-- txtinfo -->
+<i18n:msg xml:id="olsrd_loadplugin_accept">Allow connections from this hosts</i18n:msg>
+
+<!-- dyngw -->
+<i18n:msg xml:id="olsrd_loadplugin_ping">Ping test addresses</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_interval">Interval</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_hna">HNA announcements</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_hna_desc">Format: IP-Address Netmask / OLSR will announce this network once it is reachable</i18n:msg>
+
+<!-- nameservice -->
+<i18n:msg xml:id="olsrd_loadplugin_addhosts" method="text">Alternative "hosts" file</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_addhosts_desc" method="text">The contents of this file will be appended to the autogenerated "hosts" file</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_dnsserver">DNS server</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_hosts">Alternative hostnames</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_hosts_desc">Format: Interface-IP Hostname</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_hostsfile" method="text">Path to the "hosts" file</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_lat">Latitude</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_latlonfile">Output file for coordinates</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_latlonfile_desc">OLSR will write received coordinates of other nodes to this file</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_latloninfile">Input file for coordinates</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_latloninfile_desc">OLSR periodically checks this file for new coordinates and propagates them</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_lon">Longitude</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_name">Hostnames</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_namechangescript">Command for name changes</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_namechangescript_desc" method="text">OLSR executes this command once entries in the "hosts" are changed</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_resolvfile" method="text">Path to the "resolv" file</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_serviceschangescript">Command for service changes</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_serviceschangescript_desc">OLSR excutes this command once new service announcements are received</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_sighuppidfile">PID file for SIGHUP signals</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_sighuppidfile_desc" method="text">OLSR sends a HUP signal to this PID once the "hosts" oder "resolv" file is changed</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_suffix">Domain suffix</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_timeout">Timeout</i18n:msg>
+
+<!-- bmf -->
+<i18n:msg xml:id="olsrd_loadplugin_bmfinterface">Name of the BMF interface</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_bmfinterfaceid">IP address of the BMF interface</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_dolocalbroadcast">Redirect local broadcasts</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_capturepacketsonolsrinterfaces">Also redirect broadcasts from OLSR interfaces</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_bmfmechanism">Propagation mechanism</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_broadcastretransmitcount">Number of retransmissions per package</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_fanoutlimit">Minimum number of neighbours for broadcast redirection</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_nonolsrif">Non-OLSR interfaces</i18n:msg>
+
+<!-- httpinfo -->
+<i18n:msg xml:id="olsrd_loadplugin_port">Used port</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_host">Allow connections from hosts</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_net">Allow connections from subnets</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_net_desc">Format: IP-AddresseNetmask</i18n:msg>
+
+<!-- quagga -->
+<i18n:msg xml:id="olsrd_loadplugin_redistribute">Used protocols</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_exportroutes">Only export routes to Quagga or to kernel too</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_localpref">Always prefer local routes</i18n:msg>
+<i18n:msg xml:id="olsrd_loadplugin_distance">Distance of exported routes</i18n:msg>
+
+<!-- secure -->
+<i18n:msg xml:id="olsrd_loadplugin_keyfile">Key file</i18n:msg>
 
 </i18n:msgs>
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index cbcc3e64c5..addb64539d 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -14,9 +14,9 @@ $Id$
 
 require("luci.tools.webadmin")
 
-m = Map("olsrd", "OLSR")
+m = Map("olsrd", translate("olsrd", "OLSR Daemon"))
 
-s = m:section(TypedSection, "olsrd", translate("olsr_general"))
+s = m:section(TypedSection, "olsrd", translate("olsrd_general"))
 s.dynamic = true
 s.anonymous = true
 
@@ -38,26 +38,26 @@ noint.optional = true
 s:option(Value, "Pollrate").optional = true
 
 tcr = s:option(ListValue, "TcRedundancy")
-tcr:value("0", translate("olsr_general_tcredundancy_0"))
-tcr:value("1", translate("olsr_general_tcredundancy_1"))
-tcr:value("2", translate("olsr_general_tcredundancy_2"))
+tcr:value("0", translate("olsrd_olsrd_tcredundancy_0"))
+tcr:value("1", translate("olsrd_olsrd_tcredundancy_1"))
+tcr:value("2", translate("olsrd_olsrd_tcredundancy_2"))
 tcr.optional = true
 
 s:option(Value, "MprCoverage").optional = true
 
 lql = s:option(ListValue, "LinkQualityLevel")
 lql:value("0", translate("disable"))
-lql:value("1", translate("olsr_general_linkqualitylevel_1"))
-lql:value("2", translate("olsr_general_linkqualitylevel_2"))
+lql:value("1", translate("olsrd_olsrd_linkqualitylevel_1"))
+lql:value("2", translate("olsrd_olsrd_linkqualitylevel_2"))
 lql.optional = true
 
 s:option(Value, "LinkQualityAging").optional = true
 
 lqa = s:option(ListValue, "LinkQualityAlgorithm")
 lqa.optional = true
-lqa:value("etx_fpm", translate("olsr_etx_fpm"))
-lqa:value("etx_float", translate("olsr_etx_float"))
-lqa:value("etx_ff", translate("olsr_etx_ff"))
+lqa:value("etx_fpm", translate("olsrd_etx_fpm"))
+lqa:value("etx_float", translate("olsrd_etx_float"))
+lqa:value("etx_ff", translate("olsrd_etx_ff"))
 lqa.optional = true
 
 lqfish = s:option(Flag, "LinkQualityFishEye")
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
index b784ea1436..a5b6b1289a 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
@@ -12,7 +12,7 @@ You may obtain a copy of the License at
 $Id$
 ]]--
 
-mh = Map("olsrd", "OLSR - HNA Announcements")
+mh = Map("olsrd", translate("olsrd_hna", "OLSR - HNA-Ankündigungen"))
 
 for i, sect in ipairs({ "Hna4", "Hna6" }) do
 	hna = mh:section(TypedSection, sect)
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
index f760c995f2..6a498a5b2b 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
@@ -17,7 +17,7 @@ require("luci.ip")
 
 
 if arg[1] then
-	mp = Map("olsrd", "OLSR - Plugins")
+	mp = Map("olsrd", translate("olsrd_plugins", "OLSR - Plugins"))
 
 	p = mp:section(TypedSection, "LoadPlugin")
 	p:depends("library", arg[1])
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm b/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
index 62731f346e..f401603d28 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:olsr%></h1>
-<p class="error"><%:olsr_error1%></p>
-<p><%:olsr_error2%></p>
-<%+footer%>
\ No newline at end of file
+<h1><%:olsrd%></h1>
+<p class="error"><%:olsrd_error%></p>
+<p><%:olsrd_error_desc%></p>
+<%+footer%>
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
index e15a235f95..cae8a1fd9c 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
@@ -13,12 +13,13 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:olsrhna%></h1>
+<h1><%:olsrd_hna%></h1>
+<p><%:olsrd_hna_desc%></p>
 <br />
 <table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
-<th><%:destination%></th>
-<th><%:gateway%></th>
+<th><%:olsrd_network%></th>
+<th><%:olsrd_gateway%></th>
 </tr>
 <% for k, route in ipairs(routes) do %>
 <tr>
@@ -28,4 +29,4 @@ $Id$
 <% end %>
 </table>
 <br />
-<%+footer%>
\ No newline at end of file
+<%+footer%>
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/index.htm b/applications/luci-olsr/luasrc/view/status-olsr/index.htm
index 037151d1da..291e3a47e2 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/index.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/index.htm
@@ -13,20 +13,20 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:olsr_links%></h1>
-<p><%:olsr_links1%></p>
+<h1><%:olsrd_links%></h1>
+<p><%:olsrd_links_desc%></p>
 <br />
 <table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
-<th><%:destination%></th>
-<th><%:local%></th>
+<th><%:olsrd_neighbour_ip%></th>
+<th><%:olsrd_local_ip%></th>
 <th>LQ</th>
 <th>NLQ</th>
 <th>ETX</th>
 </tr>
-<% for k, link in ipairs(links) do 
+<% for k, link in ipairs(links) do
 	local color = "#bb3333"
-	
+
 	link.Cost = tonumber(link.Cost) or 0
 	if link.Cost == 0 then
 		color = "#bb3333"
@@ -50,8 +50,8 @@ $Id$
 <br />
 <h3><%:legend%>:</h3>
 <ul>
-<li><strong>LQ: </strong><%:olsrlinks_lq1%></li>
-<li><strong>NLQ: </strong><%:olsrlinks_nlq1%></li>
-<li><strong>ETX: </strong><%:olsrlinks_etx1%></li>
+<li><strong>LQ: </strong><%:olsrd_links_lq_desc%></li>
+<li><strong>NLQ: </strong><%:olsrd_links_nlq_desc%></li>
+<li><strong>ETX: </strong><%:olsrd_links_etx_desc%></li>
 </ul>
-<%+footer%>
\ No newline at end of file
+<%+footer%>
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
index 0646bb5f60..f7ad682fd6 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
@@ -13,12 +13,13 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:olsr_mid%></h1>
+<h1><%:olsrd_mid%></h1>
+<p><%:olsrd_mid_desc%></h1>
 <br />
 <table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
-<th><%:node%></th>
-<th><%:aliases%></th>
+<th><%:olsrd_node%></th>
+<th><%:olsrd_mid_aliases%></th>
 </tr>
 <% for k, mid in ipairs(mids) do %>
 <tr>
@@ -28,4 +29,4 @@ $Id$
 <% end %>
 </table>
 <br />
-<%+footer%>
\ No newline at end of file
+<%+footer%>
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm b/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
index 27d9670806..c5cce76145 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
@@ -13,19 +13,20 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:olsr_routes%></h1>
+<h1><%:olsrd_routes%></h1>
+<p><%:olsrd_routes_desc%></p>
 <br />
 <table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
-<th><%:destination%></th>
-<th><%:gateway%></th>
+<th><%:olsrd_network%></th>
+<th><%:olsrd_gateway%></th>
 <th><%:interface%></th>
 <th><%:metric%></th>
 <th>ETX</th>
 </tr>
-<% for k, route in ipairs(routes) do 
+<% for k, route in ipairs(routes) do
 	local color = "#bb3333"
-	
+
 	route.ETX = tonumber(route.ETX)
 	if route.ETX == 0 then
 		color = "#bb3333"
@@ -47,4 +48,4 @@ $Id$
 <% end %>
 </table>
 <br />
-<%+footer%>
\ No newline at end of file
+<%+footer%>
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
index df10b78466..3ce16a4c29 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
@@ -13,17 +13,18 @@ $Id$
 
 -%>
 <%+header%>
-<h1><%:olsr_topology%></h1>
+<h1><%:olsrd_topology%></h1>
+<p><%:olsrd_topology_desc%></p>
 <br />
 <table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
-<th><%:destination%></th>
-<th><%:olsr_lasthop%></th>
+<th><%:olsrd_node%></th>
+<th><%:olsrd_topology_lasthop%></th>
 <th>LQ</th>
 <th>ILQ</th>
 <th>ETX</th>
 </tr>
-<% for k, route in ipairs(routes) do 
+<% for k, route in ipairs(routes) do
 %>
 <tr>
 <td><a href="http://<%=route["Dest. IP"]%>"><%=route["Dest. IP"]%></a></td>
@@ -35,4 +36,4 @@ $Id$
 <% end %>
 </table>
 <br />
-<%+footer%>
\ No newline at end of file
+<%+footer%>