From: Manuel Munz <freifunk@somakoma.de>
Date: Fri, 11 Feb 2011 21:15:33 +0000 (+0000)
Subject: luci-0.10: Merge r6863
X-Git-Tag: 0.10.0~189
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a8c7157392b8af96fb2f67dc90bb5cfa3fe5ecee;p=oweals%2Fluci.git

luci-0.10: Merge r6863
---

diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
index 8fc3244de..f3538a1f1 100644
--- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
+++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
@@ -25,7 +25,7 @@ function index()
 	page.index = false
 
 	local page    = node("freifunk")
-	page.title    = "Freifunk"
+	page.title    = i18n("Freifunk")
 	page.target   = alias("freifunk", "index")
 	page.order    = 5
 	page.setuser  = "nobody"
@@ -35,13 +35,13 @@ function index()
 
 	local page  = node("freifunk", "index")
 	page.target = template("freifunk/index")
-	page.title  = "Übersicht"
+	page.title  = i18n("Overview")
 	page.order  = 10
 	page.indexignore = true
 
 	local page  = node("freifunk", "index", "contact")
 	page.target = template("freifunk/contact")
-	page.title  = "Kontakt"
+	page.title  = i18n("Contact")
 	page.order    = 10
 
 	local page  = node("freifunk", "status")
@@ -56,47 +56,47 @@ function index()
 	entry({"freifunk", "status", "zeroes"}, call("zeroes"), "Testdownload")
 	entry({"freifunk", "status", "public_status_json"}, call("public_status_json")).leaf = true
 
-	assign({"freifunk", "olsr"}, {"admin", "status", "olsr"}, "OLSR", 30)
+	assign({"freifunk", "olsr"}, {"admin", "status", "olsr"}, i18n("OLSR"), 30)
 
 	if nixio.fs.access("/etc/config/luci_statistics") then
 		assign({"freifunk", "graph"}, {"admin", "statistics", "graph"}, i18n("Statistics"), 40)
 	end
 
 	-- backend
-	assign({"mini", "freifunk"}, {"admin", "freifunk"}, "Freifunk", 5)
-	entry({"admin", "freifunk"}, alias("admin", "freifunk", "index"), "Freifunk", 5)
+	assign({"mini", "freifunk"}, {"admin", "freifunk"}, i18n("Freifunk"), 5)
+	entry({"admin", "freifunk"}, alias("admin", "freifunk", "index"), i18n("Freifunk"), 5)
 
 	local page  = node("admin", "freifunk")
 	page.target = template("freifunk/adminindex")
-	page.title  = "Freifunk"
+	page.title  = i18n("Freifunk")
 	page.order  = 5
 
 	local page  = node("admin", "freifunk", "basics")
 	page.target = cbi("freifunk/basics")
-	page.title  = "Grundeinstellungen"
+	page.title  = i18n("Basic Settings")
 	page.order  = 5
 	
 	local page  = node("admin", "freifunk", "basics", "profile")
 	page.target = cbi("freifunk/profile")
-	page.title  = "Profile"
+	page.title  = i18n("Profile")
 	page.order  = 10
 
 	local page  = node("admin", "freifunk", "basics", "profile_expert")
 	page.target = cbi("freifunk/profile_expert")
-	page.title  = "Profile (Expert)"
+	page.title  = i18n("Profile (Expert)")
 	page.order  = 20
 
 	local page  = node("admin", "freifunk", "Index-Page")
 	page.target = cbi("freifunk/user_index")
-	page.title  = "Index-Page"
+	page.title  = i18n("Index Page")
 	page.order  = 50
 
 	local page  = node("admin", "freifunk", "contact")
 	page.target = cbi("freifunk/contact")
-	page.title  = "Kontakt"
+	page.title  = i18n("Contact")
 	page.order  = 15
 
-	entry({"freifunk", "map"}, template("freifunk-map/frame"), i18n("Karte"), 50)
+	entry({"freifunk", "map"}, template("freifunk-map/frame"), i18n("Map"), 50)
 	entry({"freifunk", "map", "content"}, template("freifunk-map/map"), nil, 51)
 end