From fc268c46b21871a08b426a350308285180c743f2 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 31 Oct 2009 22:22:36 +0000
Subject: [PATCH] applications/luci-upnp: fix miniupnpd page

---
 applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua |  8 ++++----
 applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua     | 10 ++++++----
 applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua |  6 ++++--
 po/en/ddns.po                                             |  2 +-
 po/en/upnp.po                                             |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua
index 8edf1433b..886053b1b 100644
--- a/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua
+++ b/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua
@@ -36,14 +36,14 @@ pw.password = true
 s.defaults.ip_source = "network"
 s.defaults.ip_network = "wan"
 
-s:option(Value, "check_interval").default = 10
-unit = s:option(ListValue, "check_unit")
+s:option(Value, "check_interval", translate("Check for changed IP every")).default = 10
+unit = s:option(ListValue, "check_unit", translate("Check-Time unit"))
 unit.default = "minutes"
 unit:value("minutes", "min")
 unit:value("hours", "h")
 
-s:option(Value, "force_interval").default = 72
-unit = s:option(ListValue, "force_unit")
+s:option(Value, "force_interval", translate("Force update every")).default = 72
+unit = s:option(ListValue, "force_unit", translate("Force-Time unit"))
 unit.default = "hours"
 unit:value("minutes", "min")
 unit:value("hours", "h")
diff --git a/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua b/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
index fa0e96553..02fbfd601 100644
--- a/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
+++ b/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
@@ -15,6 +15,8 @@ $Id$
 m = Map("upnpd", translate("Universal Plug & Play"), translate("UPNP allows clients in the local network to automatically configure the router."))
 
 s = m:section(NamedSection, "config", "upnpd", "")
+s.addremove = false
+
 e = s:option(Flag, "enabled", translate("enable"))
 e.rmempty = false
 
@@ -30,9 +32,9 @@ function e.cfgvalue(self, section)
 	return (os.execute("/etc/init.d/miniupnpd enabled") == 0) and "1" or "0"
 end
 
-s:option(Flag, "secure_mode").rmempty = true
-s:option(Flag, "log_output").rmempty = true
-s:option(Value, "download", nil, "kByte/s").rmempty = true
-s:option(Value, "upload", nil, "kByte/s").rmempty = true
+s:option(Flag, "secure_mode", translate("Enable secure mode")).rmempty = true
+s:option(Flag, "log_output", translate("Log output")).rmempty = true
+s:option(Value, "download", translate("Downlink"), "kByte/s").rmempty = true
+s:option(Value, "upload", translate("Uplink"), "kByte/s").rmempty = true
 
 return m
diff --git a/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua b/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua
index 64769aae1..4ca72ef0d 100644
--- a/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua
+++ b/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua
@@ -15,6 +15,8 @@ $Id$
 m = Map("upnpd", translate("Universal Plug & Play"), translate("UPNP allows clients in the local network to automatically configure the router."))
 
 s = m:section(NamedSection, "config", "upnpd", "")
+s.addremove = false
+
 e = s:option(Flag, "enabled", translate("enable"))
 e.rmempty = false
 
@@ -30,7 +32,7 @@ function e.cfgvalue(self, section)
 	return (os.execute("/etc/init.d/miniupnpd enabled") == 0) and "1" or "0"
 end
 
-s:option(Value, "download", nil, "kByte/s").rmempty = true
-s:option(Value, "upload", nil, "kByte/s").rmempty = true
+s:option(Value, "download", translate("Downlink"), "kByte/s").rmempty = true
+s:option(Value, "upload", translate("Uplink"), "kByte/s").rmempty = true
 
 return m
diff --git a/po/en/ddns.po b/po/en/ddns.po
index 8607642bc..b4e7e7b71 100644
--- a/po/en/ddns.po
+++ b/po/en/ddns.po
@@ -53,5 +53,5 @@ msgstr "Force-Time unit"
 
 #. Custom Update-URL
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:8
-msgid "ddns_service_updateurl"
+msgid "Custom Update-URL"
 msgstr "Custom Update-URL"
diff --git a/po/en/upnp.po b/po/en/upnp.po
index 8d1a7744a..f1b438b4e 100644
--- a/po/en/upnp.po
+++ b/po/en/upnp.po
@@ -52,5 +52,5 @@ msgstr "Downlink"
 
 #. Uplink
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
-msgid "upnpd_config_upload"
+msgid "Uplink"
 msgstr "Uplink"
-- 
2.11.0