ddns: add translations and clean-up POT template

Some strings were hardcoded in English; make them translatable and add
them to the translation template.

diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
index e016751936b16ab0e2d1b411a5b9780686d4ffc1..6a7d53c5dba63dbe0c65d294878910da98fc4ab5 100644 (file)
--- a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
+++ b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
@@ -16,13 +16,16 @@ $Id$
 local is_mini = (luci.dispatcher.context.path[1] == "mini")
 
 
-m = Map("ddns", translate("Dynamic DNS"), translate("Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address."))
+m = Map("ddns", translate("Dynamic DNS"),
+       translate("Dynamic DNS allows that your router can be reached with " ..
+               "a fixed hostname while having a dynamically changing " ..
+               "IP address."))
 
 s = m:section(TypedSection, "service", "")
 s.addremove = true
 s.anonymous = false
 
-s:option(Flag, "enabled", translate("enable"))
+s:option(Flag, "enabled", translate("Enable"))
 
 svc = s:option(ListValue, "service_name", translate("Service"))
 svc.rmempty = true
@@ -63,10 +66,11 @@ if is_mini then
 else
        require("luci.tools.webadmin")
 
-       src = s:option(ListValue, "ip_source", translate("Source of IP-Address"))
+       src = s:option(ListValue, "ip_source",
+               translate("Source of IP address"))
        src:value("network", translate("Network"))
        src:value("interface", translate("Interface"))
-       src:value("web", "URL")
+       src:value("web", translate("URL"))
 
        iface = s:option(ListValue, "ip_network", translate("Network"))
        iface:depends("ip_source", "network")
@@ -80,22 +84,24 @@ else
                iface:value(v)
        end
 
-       web = s:option(Value, "ip_url", "URL")
+       web = s:option(Value, "ip_url", translate("URL"))
        web:depends("ip_source", "web")
        web.rmempty = true
 end
 
-s:option(Value, "check_interval", translate("Check for changed IP every")).default = 10
-unit = s:option(ListValue, "check_unit", translate("Check-Time 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")
+unit:value("minutes", translate("min"))
+unit:value("hours", translate("h"))
 
 s:option(Value, "force_interval", translate("Force update every")).default = 72
-unit = s:option(ListValue, "force_unit", translate("Force-Time unit"))
+unit = s:option(ListValue, "force_unit", translate("Force-time unit"))
 unit.default = "hours"
-unit:value("minutes", "min")
-unit:value("hours", "h")
+unit:value("minutes", translate("min"))
+unit:value("hours", translate("h"))
 
 
 return m

diff --git a/po/templates/ddns.pot b/po/templates/ddns.pot
index 74ffd874016f770ddf0659d8390513a3f4e7a1f5..32921d84e154bb9e95526ecd46a4ef0d5db6ad37 100644 (file)
--- a/po/templates/ddns.pot
+++ b/po/templates/ddns.pot
@@ -1,46 +1,75 @@
-#  ddns.pot
-#  generated from ./applications/luci-ddns/luasrc/i18n/ddns.en.lua
+# Generated from applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua
+#
+#, fuzzy
 msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8"
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-02 13:44+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
-#. Dynamic DNS
-#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:1
 msgid "Dynamic DNS"
 msgstr ""
 
-#. Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.
-#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:2
 msgid ""
 "Dynamic DNS allows that your router can be reached with a fixed hostname "
 "while having a dynamically changing IP-Address."
 msgstr ""
 
-#. Source of IP-Address
-#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:3
-msgid "Source of IP-Address"
+msgid "Enable"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "custom"
+msgstr ""
+
+msgid "Custom update-URL"
+msgstr ""
+
+msgid "Hostname"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Source of IP address"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Interface"
+msgstr ""
+
+msgid "URL"
 msgstr ""
 
-#. Check for changed IP every
-#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:4
 msgid "Check for changed IP every"
 msgstr ""
 
-#. Check-Time unit
-#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:5
-msgid "Check-Time unit"
+msgid "Check-time unit"
 msgstr ""
 
-#. Force update every
-#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:6
-msgid "Force update every"
+# Minutes (not minimum)
+msgid "min"
 msgstr ""
 
-#. Force-Time unit
-#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:7
-msgid "Force-Time unit"
+# Hours
+msgid "h"
+msgstr ""
+
+msgid "Force update every"
 msgstr ""
 
-#. Custom Update-URL
-#: applications/luci-ddns/luasrc/i18n/ddns.en.lua:8
-msgid "Custom Update-URL"
+msgid "Force-time unit"
 msgstr ""