From: Manuel Munz <freifunk@somakoma.de>
Date: Sat, 29 Jan 2011 01:22:27 +0000 (+0000)
Subject: luci-0.10: Merge 6805
X-Git-Tag: 0.10.0~208
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dfef0f4fa48f659681945db654cd85bc9bdf6dbc;p=oweals%2Fluci.git

luci-0.10: Merge 6805
---

diff --git a/modules/freifunk/luasrc/view/freifunk/adminindex.htm b/modules/freifunk/luasrc/view/freifunk/adminindex.htm
index 8846b5c87..0188f2e6d 100644
--- a/modules/freifunk/luasrc/view/freifunk/adminindex.htm
+++ b/modules/freifunk/luasrc/view/freifunk/adminindex.htm
@@ -17,14 +17,15 @@ local basicsurl = luci.dispatcher.build_url(luci.dispatcher.context.path[1], "fr
 
 <% if not (hostname and latitude and longitude and location) then%>
 <div class="error">
-        <%:Basic settings are incomplete. Please go to <a href='<%=basicsurl%>'><%:Basic settings%></a> and fill out all required fields.%></p>
+        <%:Basic settings are incomplete. Please go to%> <a href='<%=basicsurl%>'<%:Basic settings%></a> <%:and fill out all required fields.%></p>
 </div>
 <%end%>
 <p />
 
 <% if not (contact.nickname and contact.name and contact.mail) then%>
 <div class="error">
-	<%:Contact information is incomplete. Please go to <a href='<%=contacturl%>'><%:Contact%></a> and fill out all required fields.%></p>
+	<%:Contact information is incomplete. Please go to%> <a href='<%=contacturl%>'><%:Contact%></a> <%:and fill out all required fields.%>
+	<p />
 </div>
 <%end%>
 
@@ -32,9 +33,10 @@ local basicsurl = luci.dispatcher.build_url(luci.dispatcher.context.path[1], "fr
 	local device = section[".name"]
 	local url = luci.dispatcher.build_url(luci.dispatcher.context.path[1], "network", "wireless")
 	if section.diversity ~= "0" and section.disabled ~= "1" then
-		print('<div class="error">Diversity is enabled for device <b>' .. device .. '</b>. Go to <a href="' .. url .. '">wireless settings</a> to disable it.</div><p />')
+		print('<div class="error">' .. translate("Diversity is enabled for device") .. ' <b>' .. device .. '</b>. '
+		.. translate("Go to") .. ' <a href="' .. url .. '">' .. translate("wireless settings") .. '</a> ' ..
+		translate(" to disable it.") .. '</div><p />')
 	end
 end) %>
 
-
 <%+footer%>