* Prepare german translation cleanup

14 files changed, 60 insertions, 61 deletions

diff --git a/applications/luci-ffwizard-leipzig/luasrc/view/freifunk/wizard.htm b/applications/luci-ffwizard-leipzig/luasrc/view/freifunk/wizard.htm
index ab1c3438f..72cdec4f9 100644
--- a/applications/luci-ffwizard-leipzig/luasrc/view/freifunk/wizard.htm
+++ b/applications/luci-ffwizard-leipzig/luasrc/view/freifunk/wizard.htm
@@ -1,29 +1,29 @@
 <%+header%>
-<h1><%:ffwizard Freifunkassistent%></h1>
-<p><%:ffwizard1 Dieser Assistent konfiguriert den Router für die Benutzung im Freifunknetz%></p>
+<h1><%:ffwizard%></h1>
+<p><%:ffwizard1%></p>
 <br />
 <form method="post" action="<%=controller%>/admin/index/wizard">
 	<div class="cbi-section-node">
 		<div class="cbi-value">
-			<div class="cbi-value-title"><%:ip IP-Adresse%>:&nbsp;
+			<div class="cbi-value-title"><%:ip%>:&nbsp;
 			<input type="text" size="20" name="ip" /></div>
 		</div>
 		<% for i, k in ipairs(ifaces) do %>
 		<div class="cbi-value">
-			<div class="cbi-value-title"><%:wificfg Drahtlosgerät einrichten%>: <%=k%></div>
+			<div class="cbi-value-title"><%:wificfg%>: <%=k%></div>
 			<div class="cbi-value-field"><input type="checkbox" name="wifi.<%=k%>" value="1" checked="checked" /></div>
 		</div>
 		<% end %>
 		<div class="cbi-value">
-			<div class="cbi-value-title"><%:cfgolsr OLSR konfigurieren%></div>
+			<div class="cbi-value-title"><%:cfgolsr%></div>
 			<div class="cbi-value-field"><input type="checkbox" name="olsr" value="1" checked="checked" /></div>
 		</div>
 		<div class="cbi-value">
-			<div class="cbi-value-title"><%:cfgdhcp Drahtlos DHCP konfigurieren%></div>
+			<div class="cbi-value-title"><%:cfgdhcp%></div>
 			<div class="cbi-value-field"><input type="checkbox" name="dhcp" value="1" checked="checked" /></div>
 		</div>
 		<div class="cbi-value">
-			<div class="cbi-value-title"><%:cfginternal Erlaube Zugriff von internem Netzwerk%>:</div>
+			<div class="cbi-value-title"><%:cfginternal%>:</div>
 			<div class="cbi-value-field"><select name="frominternal">
 				<option value=""></option>
 <% for k, v in pairs(luci.model.uci.get_all("network")) do
@@ -34,7 +34,7 @@ end %>
 			</select></div>
 		</div>
 		<div class="cbi-value">
-			<div class="cbi-value-title"><%:cfgexternal Erlaube Zugriff auf externes Netzwerk%>:</div>
+			<div class="cbi-value-title"><%:cfgexternal%>:</div>
 			<div class="cbi-value-field"><select name="toexternal">
 				<option value=""></option>
 <% for k, v in pairs(luci.model.uci.get_all("network")) do
@@ -45,14 +45,14 @@ end %>
 			</select></div>
 		</div>
 		<div class="cbi-value">
-			<div class="cbi-value-title"><%:shareinet Internetzugang ankündigen%></div>
+			<div class="cbi-value-title"><%:shareinet%></div>
 			<div class="cbi-value-field"><input type="checkbox" name="shareinet" value="1" checked="checked" /></div>
 		</div>
 	</div>
 	<br />
 	<div>
-		<input type="submit" value="<%:configure Konfigurieren%>" />
-		<input type="reset" value="<%:reset Zurücksetzen%>" />
+		<input type="submit" value="<%:configure%>" />
+		<input type="reset" value="<%:reset%>" />
 	</div>
 </form> 
 <%+footer%>
\ No newline at end of file
diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/firewall.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/firewall.lua
index b04e0532d..5ed45593b 100644
--- a/applications/luci-fw/luasrc/model/cbi/luci_fw/firewall.lua
+++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/firewall.lua
@@ -11,7 +11,7 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-m = Map("luci_fw", translate("fw_fw", "Firewall"), translate("fw_fw1"))
+m = Map("luci_fw", translate("fw_fw"), translate("fw_fw1"))
 
 s = m:section(TypedSection, "rule", "")
 s.addremove = true
@@ -38,7 +38,7 @@ luci.model.uci.foreach("network", "interface",
 		end
 	end)
 
-proto = s:option(ListValue, "proto", translate("protocol", "Protokoll"))
+proto = s:option(ListValue, "proto", translate("protocol"))
 proto.optional = true
 proto:value("")
 proto:value("tcp", "TCP")
diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/portfw.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/portfw.lua
index 655bcccef..72f3d7e1d 100644
--- a/applications/luci-fw/luasrc/model/cbi/luci_fw/portfw.lua
+++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/portfw.lua
@@ -12,14 +12,14 @@ You may obtain a copy of the License at
 $Id$
 ]]--
 require("luci.sys")
-m = Map("luci_fw", translate("fw_portfw", "Portweiterleitung"), translate("fw_portfw1"))
+m = Map("luci_fw", translate("fw_portfw"), translate("fw_portfw1"))
 
 s = m:section(TypedSection, "portfw", "")
 s.template  = "cbi/tblsection"
 s.addremove = true
 s.anonymous = true
 
-iface = s:option(ListValue, "iface", translate("interface", "Schnittstelle"))
+iface = s:option(ListValue, "iface", translate("interface"))
 iface.default = "wan"
 luci.model.uci.foreach("network", "interface",
 	function (section)
@@ -28,7 +28,7 @@ luci.model.uci.foreach("network", "interface",
 		end
 	end)
 
-proto = s:option(ListValue, "proto", translate("protocol", "Protokoll"))
+proto = s:option(ListValue, "proto", translate("protocol"))
 proto:value("tcp", "TCP")
 proto:value("udp", "UDP")
 proto:value("tcpudp", "TCP + UDP")
diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/routing.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/routing.lua
index 184fc1830..56f1282c1 100644
--- a/applications/luci-fw/luasrc/model/cbi/luci_fw/routing.lua
+++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/routing.lua
@@ -11,7 +11,7 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-m = Map("luci_fw", translate("fw_routing", "Routing"), translate("fw_routing1"))
+m = Map("luci_fw", translate("fw_routing"), translate("fw_routing1"))
 
 s = m:section(TypedSection, "routing", "")
 s.template  = "cbi/tblsection"
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index c5f86d089..b89fb253d 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -33,16 +33,16 @@ noint.disabled = "no"
 s:option(Value, "Pollrate")
 
 tcr = s:option(ListValue, "TcRedundancy")
-tcr:value("0", translate("olsr_general_tcredundancy_0", "MPR-Selektoren"))
-tcr:value("1", translate("olsr_general_tcredundancy_1", "MPR-Selektoren und MPR"))
-tcr:value("2", translate("olsr_general_tcredundancy_2", "Alle Nachbarn"))
+tcr:value("0", translate("olsr_general_tcredundancy_0"))
+tcr:value("1", translate("olsr_general_tcredundancy_1"))
+tcr:value("2", translate("olsr_general_tcredundancy_2"))
 
 s:option(Value, "MprCoverage")
 
 lql = s:option(ListValue, "LinkQualityLevel")
-lql:value("0", translate("disable", "deaktivieren"))
-lql:value("1", translate("olsr_general_linkqualitylevel_1", "MPR-Auswahl"))
-lql:value("2", translate("olsr_general_linkqualitylevel_2", "MPR-Auswahl und Routing"))
+lql:value("0", translate("disable"))
+lql:value("1", translate("olsr_general_linkqualitylevel_1"))
+lql:value("2", translate("olsr_general_linkqualitylevel_2"))
 
 lqfish = s:option(Flag, "LinkQualityFishEye")
 
@@ -55,12 +55,12 @@ hyst.enabled = "yes"
 hyst.disabled = "no"
 
 
-i = m:section(TypedSection, "Interface", translate("interfaces", "Schnittstellen"))
+i = m:section(TypedSection, "Interface", translate("interfaces"))
 i.anonymous = true
 i.addremove = true
 i.dynamic = true
 
-network = i:option(ListValue, "Interface", translate("network", "Netzwerk"))
+network = i:option(ListValue, "Interface", translate("network"))
 network:value("")
 luci.model.uci.foreach("network", "interface",
 	function (section)
@@ -83,7 +83,7 @@ p = m:section(TypedSection, "LoadPlugin")
 p.addremove = true
 p.dynamic = true
 
-lib = p:option(ListValue, "Library", translate("library", "Bibliothek"))
+lib = p:option(ListValue, "Library", translate("library"))
 lib:value("")
 for k, v in pairs(luci.fs.dir("/usr/lib")) do
 	if v:sub(1, 6) == "olsrd_" then
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 c88ddfc33..94440f617 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
@@ -1,6 +1,5 @@
 <%+header%>
-<h1><%:olsr OLSR%></h1>
-<p class="error"><%:olsr_error1 Es konnte keine Verbindung zum OLSR-Daemon hergestellt werden!%></p>
-<p><%:olsr_error2 Um die Statusinformationen abfragen zu können muss der OLSR-Daemon gestartet
-und das Plugin "txtinfo" geladen sein.%></p>
+<h1><%:olsr%></h1>
+<p class="error"><%:olsr_error1%></p>
+<p><%:olsr_error2%></p>
 <%+footer%>
\ No newline at end of file
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
index c13369f42..38430fcf8 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
@@ -1,10 +1,10 @@
 <%+header%>
-<h1><%:olsrhna OLSR-HNA%></h1>
+<h1><%:olsrhna%></h1>
 <br />
 <table cellspacing="0" cellpadding="6">
 <tr>
-<th><%:destination Ziel%></th>
-<th><%:gateway Gateway%></th>
+<th><%:destination%></th>
+<th><%:gateway%></th>
 </tr>
 <% for k, route in ipairs(routes) do %>
 <tr>
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/index.htm b/applications/luci-olsr/luasrc/view/status-olsr/index.htm
index 8a49232ee..dabacd15a 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/index.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/index.htm
@@ -1,11 +1,11 @@
 <%+header%>
-<h1><%:olsr_links OLSR-Verbindungen%></h1>
-<p><%:olsr_links1 Übersicht über aktuell bestehende OLSR-Verbindungen%></p>
+<h1><%:olsr_links%></h1>
+<p><%:olsr_links1%></p>
 <br />
 <table cellspacing="0" cellpadding="6">
 <tr>
-<th><%:destination Ziel%></th>
-<th><%:local Lokal%></th>
+<th><%:destination%></th>
+<th><%:local%></th>
 <th>LQ</th>
 <th>NLQ</th>
 <th>ETX</th>
@@ -34,10 +34,10 @@
 <% end %>
 </table>
 <br />
-<h3><%:legend Legende%>:</h3>
+<h3><%:legend%>:</h3>
 <ul>
-<li><strong>LQ: </strong><%:olsrlinks_lq1 Erfolgsquote gesendeter Pakete%></li>
-<li><strong>NLQ: </strong><%:olsrlinks_nlq1 Erfolgsquote empfangener Pakete%></li>
-<li><strong>ETX: </strong><%:olsrlinks_etx1 Zu erwartende Sendeversuche pro Paket%></li>
+<li><strong>LQ: </strong><%:olsrlinks_lq1%></li>
+<li><strong>NLQ: </strong><%:olsrlinks_nlq1%></li>
+<li><strong>ETX: </strong><%:olsrlinks_etx1%></li>
 </ul>
 <%+footer%>
\ No newline at end of file
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
index fb29e7dfa..63b8c25b2 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
@@ -1,10 +1,10 @@
 <%+header%>
-<h1><%:olsr_mid OLSR-MID%></h1>
+<h1><%:olsr_mid%></h1>
 <br />
 <table cellspacing="0" cellpadding="6">
 <tr>
-<th><%:node Knoten%></th>
-<th><%:aliases Aliasse%></th>
+<th><%:node%></th>
+<th><%:aliases%></th>
 </tr>
 <% for k, mid in ipairs(mids) do %>
 <tr>
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm b/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
index 4840bf655..ae075e8f4 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
@@ -1,12 +1,12 @@
 <%+header%>
-<h1><%:olsr_routes OLSR-Routen%></h1>
+<h1><%:olsr_routes%></h1>
 <br />
 <table cellspacing="0" cellpadding="6">
 <tr>
-<th><%:destination Ziel%></th>
-<th><%:gateway Gateway%></th>
-<th><%:interface Schnittstelle%></th>
-<th><%:metric Metrik%></th>
+<th><%:destination%></th>
+<th><%:gateway%></th>
+<th><%:interface%></th>
+<th><%:metric%></th>
 <th>ETX</th>
 </tr>
 <% for k, route in ipairs(routes) do 
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
index 129319794..6ad9f5c67 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
@@ -1,10 +1,10 @@
 <%+header%>
-<h1><%:olsr_topology OLSR-Topologie%></h1>
+<h1><%:olsr_topology%></h1>
 <br />
 <table cellspacing="0" cellpadding="6">
 <tr>
-<th><%:destination Ziel%></th>
-<th><%:olsr_lasthop Letzter Router%></th>
+<th><%:destination%></th>
+<th><%:olsr_lasthop%></th>
 <th>LQ</th>
 <th>ILQ</th>
 <th>ETX</th>
diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
index 18f26efb6..ea535cea2 100644
--- a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
+++ b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua
@@ -13,10 +13,10 @@ $Id$
 ]]--
 m = Map("qos")
 
-s = m:section(TypedSection, "interface", translate("interfaces", "Schnittstellen"))
+s = m:section(TypedSection, "interface", translate("interfaces"))
 s.addremove = true
 
-s:option(Flag, "enabled", translate("enable", "aktivieren"))
+s:option(Flag, "enabled", translate("enable"))
 
 c = s:option(ListValue, "classgroup")
 c:value("Default", "standard")
@@ -46,7 +46,7 @@ s:option(Value, "layer7", "Layer 7").optional = true
 
 p2p = s:option(ListValue, "ipp2p", "P2P")
 p2p:value("")
-p2p:value("all", translate("all", "alle"))
+p2p:value("all", translate("all"))
 p2p:value("bit", "BitTorrent")
 p2p:value("dc", "DirectConnect")
 p2p:value("edk", "eDonkey")
@@ -54,14 +54,14 @@ p2p:value("gnu", "Gnutella")
 p2p:value("kazaa", "Kazaa")
 p2p.optional = true
 
-p = s:option(ListValue, "proto", translate("protocol", "Protokoll"))
+p = s:option(ListValue, "proto", translate("protocol"))
 p:value("")
 p:value("tcp", "TCP")
 p:value("udp", "UDP")
 p:value("icmp", "ICMP")
 p.optional = true
 
-s:option(Value, "ports", translate("port", "Port")).optional = true
+s:option(Value, "ports", translate("port")).optional = true
 s:option(Value, "portrange").optional = true
 
 return m
\ No newline at end of file
diff --git a/applications/luci-splash/luasrc/view/splash/splash.htm b/applications/luci-splash/luasrc/view/splash/splash.htm
index c2a2f889a..2731d2350 100644
--- a/applications/luci-splash/luasrc/view/splash/splash.htm
+++ b/applications/luci-splash/luasrc/view/splash/splash.htm
@@ -1,6 +1,6 @@
 <% local c = luci.model.uci.get_all("freifunk", "community") %>
 
-<h1><%:welcome Willkommen%>!</h1>
+<h1><%:welcome%>!</h1>
 <p>
 Du bist jetzt mit dem freien Funknetz 
 <a href="<%=c.homepage%>"><%=c.name%></a> verbunden.<br />
@@ -28,6 +28,6 @@ Wenn Du unsere Idee gut findest, kannst Du uns unterstützen:
 </p>
 
 <p>
-Mit einem Klick auf <em><%:accept Annehmen%></em> kannst du für <%=c.leasetime%> Stunden
+Mit einem Klick auf <em><%:accept%></em> kannst du für <%=c.leasetime%> Stunden
 über unser Netz das Internet verwenden. Dann wirst du erneut aufgefordet, diese Bedingungen zu akzeptieren.
 </p>
\ No newline at end of file
diff --git a/applications/luci-splash/luasrc/view/splash_splash/splash.htm b/applications/luci-splash/luasrc/view/splash_splash/splash.htm
index 9c165802f..aa3198663 100644
--- a/applications/luci-splash/luasrc/view/splash_splash/splash.htm
+++ b/applications/luci-splash/luasrc/view/splash_splash/splash.htm
@@ -1,7 +1,7 @@
 <%+header%>
 <%+splash/splash%>
 <form method="get" action="<%=controller%>/splash/splash/activate">
-	<input type="submit" value="<%:decline Ablehnen%>" />
-	<input type="submit" name="accept" value="<%:accept Annehmen%>" />
+	<input type="submit" value="<%:decline%>" />
+	<input type="submit" name="accept" value="<%:accept%>" />
 </form>
 <%+footer%>
\ No newline at end of file