* luci-0.8: backport ushare updates

diff --git a/applications/luci-ushare/luasrc/i18n/ushare.de.lua b/applications/luci-ushare/luasrc/i18n/ushare.de.lua
new file mode 100644 (file)
index 0000000..f855196
--- /dev/null
+++ b/applications/luci-ushare/luasrc/i18n/ushare.de.lua
@@ -0,0 +1,8 @@
+ushare = 'uShare'
+ushare_desc = 'uShare'
+settings = 'Einstellungen'
+disable_webif = 'Webinterface deaktivieren'
+disable_telnet = 'Telnet-Konsole deaktivieren'
+servername = 'Servername'
+content_directories = 'Freigabeverzeichnisse'
+options = 'Optionen'

diff --git a/applications/luci-ushare/luasrc/i18n/ushare.de.xml b/applications/luci-ushare/luasrc/i18n/ushare.de.xml
new file mode 100644 (file)
index 0000000..c803524
--- /dev/null
+++ b/applications/luci-ushare/luasrc/i18n/ushare.de.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<i18n:msgs xmlns:i18n="http://luci.freifunk-halle.net/2008/i18n#" xmlns="http://www.w3.org/1999/xhtml">
+
+<i18n:msg xml:id="content_directories">Freigabeverzeichnisse</i18n:msg>
+<i18n:msg xml:id="disable_telnet">Telnet-Konsole deaktivieren</i18n:msg>
+<i18n:msg xml:id="disable_webif">Webinterface deaktivieren</i18n:msg>
+<i18n:msg xml:id="options">Optionen</i18n:msg>
+<i18n:msg xml:id="servername">Servername</i18n:msg>
+<i18n:msg xml:id="settings">Einstellungen</i18n:msg>
+<i18n:msg xml:id="ushare">uShare</i18n:msg>
+<i18n:msg xml:id="ushare_desc">uShare</i18n:msg>
+
+</i18n:msgs>

diff --git a/applications/luci-ushare/luasrc/i18n/ushare.en.lua b/applications/luci-ushare/luasrc/i18n/ushare.en.lua
index 2da960ff4053ec57a07d33df4d509b871f00ef68..b0414807b9b18fa3e2f257435033e4812358d0e5 100644 (file)
--- a/applications/luci-ushare/luasrc/i18n/ushare.en.lua
+++ b/applications/luci-ushare/luasrc/i18n/ushare.en.lua
@@ -1,3 +1,8 @@
-settings = 'Settings'
 ushare = 'uShare'
 ushare_desc = 'uShare'
+settings = 'Settings'
+disable_webif = 'Disable webinterface'
+disable_telnet = 'Disable telnet console'
+servername = 'Servername'
+content_directories = 'Content directories'
+options = 'Options'

diff --git a/applications/luci-ushare/luasrc/i18n/ushare.en.xml b/applications/luci-ushare/luasrc/i18n/ushare.en.xml
new file mode 100644 (file)
index 0000000..0275e2f
--- /dev/null
+++ b/applications/luci-ushare/luasrc/i18n/ushare.en.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<i18n:msgs xmlns:i18n="http://luci.freifunk-halle.net/2008/i18n#" xmlns="http://www.w3.org/1999/xhtml">
+
+<i18n:msg xml:id="content_directories">Content directories</i18n:msg>
+<i18n:msg xml:id="disable_telnet">Disable telnet console</i18n:msg>
+<i18n:msg xml:id="disable_webif">Disable webinterface</i18n:msg>
+<i18n:msg xml:id="options">Options</i18n:msg>
+<i18n:msg xml:id="servername">Servername</i18n:msg>
+<i18n:msg xml:id="settings">Settings</i18n:msg>
+<i18n:msg xml:id="ushare">uShare</i18n:msg>
+<i18n:msg xml:id="ushare_desc">uShare</i18n:msg>
+
+</i18n:msgs>

diff --git a/applications/luci-ushare/luasrc/model/cbi/ushare.lua b/applications/luci-ushare/luasrc/model/cbi/ushare.lua
index 254ea233187dcb1c582a92334a8e8f0dc5f8157f..d90d2640f1059d87bae8f920b537faca840c5d41 100644 (file)
--- a/applications/luci-ushare/luasrc/model/cbi/ushare.lua
+++ b/applications/luci-ushare/luasrc/model/cbi/ushare.lua
@@ -14,7 +14,7 @@ $Id$
 ]]--
 
 m = Map("ushare", translate("ushare"),
-       translatef("ushare_desc"))
+       translate("ushare_desc"))
 
 s = m:section(TypedSection, "ushare", translate("settings"))
 s.addremove = false
@@ -33,6 +33,10 @@ end
 
 s:option(Value, "content_directories", translate("content_directories"))
 
+s:option(Flag, "disable_webif", translate("disable_webif"))
+
+s:option(Flag, "disable_telnet", translate("disable_telnet"))
+
 s:option(Value, "options", translate("options"))
 
 return m