From: Jo-Philipp Wich Date: Mon, 29 Oct 2012 13:09:31 +0000 (+0000) Subject: merge branch changes into trunk X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=431d4e8eff513622eaa1b6e3f0803913c0abb975;p=oweals%2Fluci.git merge branch changes into trunk --- diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua index 0deb72776..42fb4a61d 100644 --- a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua +++ b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua @@ -13,6 +13,8 @@ You may obtain a copy of the License at $Id$ ]]-- +require("luci.tools.webadmin") + local is_mini = (luci.dispatcher.context.path[1] == "mini") @@ -27,6 +29,10 @@ s.anonymous = false s:option(Flag, "enabled", translate("Enable")) +interface = s:option(ListValue, "interface", translate("Event interface"), translate("On which interface up should start the ddns script process.")) +luci.tools.webadmin.cbi_add_networks(interface) +interface.default = "wan" + svc = s:option(ListValue, "service_name", translate("Service")) svc.rmempty = false @@ -81,7 +87,6 @@ if is_mini then s.defaults.ip_source = "network" s.defaults.ip_network = "wan" else - require("luci.tools.webadmin") src = s:option(ListValue, "ip_source", translate("Source of IP address")) diff --git a/applications/luci-transmission/luasrc/model/cbi/transmission.lua b/applications/luci-transmission/luasrc/model/cbi/transmission.lua index e727a0de3..4f9e3c547 100644 --- a/applications/luci-transmission/luasrc/model/cbi/transmission.lua +++ b/applications/luci-transmission/luasrc/model/cbi/transmission.lua @@ -22,7 +22,7 @@ local running = (luci.sys.call("pidof transmission-daemon > /dev/null") == 0) local webinstalled = luci.model.ipkg.installed("transmission-web") local button = "" if running and webinstalled then - button = "      " + button = "      " end m = Map("transmission", "Transmission", translate("Transmission daemon is a simple bittorrent client, here you can configure the settings.") .. button) diff --git a/libs/nixio/src/process.c b/libs/nixio/src/process.c index 45c06a644..5ae9b829e 100644 --- a/libs/nixio/src/process.c +++ b/libs/nixio/src/process.c @@ -65,14 +65,14 @@ int nixio__exec(lua_State *L, int m) { return luaL_error(L, "stack overflow"); } - if (!lua_type(L, -2) != LUA_TSTRING || !lua_isstring(L, -1)) { + if (lua_type(L, -2) != LUA_TSTRING || !lua_isstring(L, -1)) { return luaL_argerror(L, 3, "invalid environment"); } lua_pushfstring(L, "%s=%s", lua_tostring(L, -2), lua_tostring(L, -1)); - lua_insert(L, 4); + lua_insert(L, 5); lua_pop(L, 1); argn++; } @@ -80,8 +80,8 @@ int nixio__exec(lua_State *L, int m) { char **env = lua_newuserdata(L, sizeof(char*) * (argn + 1)); env[argn] = NULL; - for (i = 1; i < argn; i++) { - env[i-1] = (char *)lua_tostring(L, -i); + for (i = 1; i <= argn; i++) { + env[i-1] = (char *)lua_tostring(L, -(i+1)); } execve(path, args, env); diff --git a/po/ca/ddns.po b/po/ca/ddns.po index 6448238e8..4bc17886c 100644 --- a/po/ca/ddns.po +++ b/po/ca/ddns.po @@ -8,6 +8,7 @@ msgstr "" "PO-Revision-Date: 2009-05-26 20:19+0200\n" "Last-Translator: Eduard Duran \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -86,3 +87,9 @@ msgstr "" msgid "network" msgstr "" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/cs/ddns.po b/po/cs/ddns.po index 8705bcbe9..bc524eab7 100644 --- a/po/cs/ddns.po +++ b/po/cs/ddns.po @@ -8,6 +8,7 @@ msgstr "" "PO-Revision-Date: 2010-04-02 13:44+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -80,3 +81,9 @@ msgstr "min" msgid "network" msgstr "" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/de/ddns.po b/po/de/ddns.po index a6a4483c3..3791e47c2 100644 --- a/po/de/ddns.po +++ b/po/de/ddns.po @@ -81,3 +81,9 @@ msgstr "Minuten" msgid "network" msgstr "Netzwerk" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/el/ddns.po b/po/el/ddns.po index bf12b2395..2922747a5 100644 --- a/po/el/ddns.po +++ b/po/el/ddns.po @@ -85,6 +85,12 @@ msgstr "λεπτά" msgid "network" msgstr "δίκτυο" +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" + #, fuzzy #~ msgid "ddns_service_updateurl" #~ msgstr "Προσαρμογή URL ενημέρωσης" diff --git a/po/en/ddns.po b/po/en/ddns.po index 1efc6a849..f451163ad 100644 --- a/po/en/ddns.po +++ b/po/en/ddns.po @@ -7,6 +7,7 @@ msgstr "" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -79,3 +80,9 @@ msgstr "min" msgid "network" msgstr "network" + +msgid "Event interface" +msgstr "Event interface" + +msgid "On which interface up should start the ddns script process." +msgstr "On which interface up should start the ddns script process." diff --git a/po/es/ddns.po b/po/es/ddns.po index c3e95e833..96f065c0f 100644 --- a/po/es/ddns.po +++ b/po/es/ddns.po @@ -81,3 +81,9 @@ msgstr "mín" msgid "network" msgstr "red" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/fr/ddns.po b/po/fr/ddns.po index cc7e4b760..f7db18f9d 100644 --- a/po/fr/ddns.po +++ b/po/fr/ddns.po @@ -7,6 +7,7 @@ msgstr "" "PO-Revision-Date: 2010-04-02 17:15+0100\n" "Last-Translator: Benoît Knecht \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -80,3 +81,9 @@ msgstr "min" msgid "network" msgstr "réseau" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/he/ddns.po b/po/he/ddns.po index 8c23c090e..e9637f091 100644 --- a/po/he/ddns.po +++ b/po/he/ddns.po @@ -85,3 +85,9 @@ msgstr "דק'" msgid "network" msgstr "רשת" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/hu/ddns.po b/po/hu/ddns.po index cb6d71640..ecb5700e8 100644 --- a/po/hu/ddns.po +++ b/po/hu/ddns.po @@ -83,3 +83,9 @@ msgstr "perc" msgid "network" msgstr "hálózat" + +msgid "Event interface" +msgstr "Esemány interfész" + +msgid "On which interface up should start the ddns script process." +msgstr "Melyik interfész indulása váltsa ki a ddns script indítását." diff --git a/po/it/ddns.po b/po/it/ddns.po index ef0113f09..754e91997 100644 --- a/po/it/ddns.po +++ b/po/it/ddns.po @@ -81,3 +81,9 @@ msgstr "min" msgid "network" msgstr "rete" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/ja/ddns.po b/po/ja/ddns.po index 9ddbd5d12..841b4749d 100644 --- a/po/ja/ddns.po +++ b/po/ja/ddns.po @@ -81,3 +81,9 @@ msgstr "分" msgid "network" msgstr "ネットワーク" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/ms/ddns.po b/po/ms/ddns.po index f8a7edfc5..07a89c5ca 100644 --- a/po/ms/ddns.po +++ b/po/ms/ddns.po @@ -8,6 +8,7 @@ msgstr "" "PO-Revision-Date: 2010-04-02 13:44+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -78,3 +79,9 @@ msgstr "" msgid "network" msgstr "" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/no/ddns.po b/po/no/ddns.po index 50b313a19..d3a53b8d8 100644 --- a/po/no/ddns.po +++ b/po/no/ddns.po @@ -70,3 +70,9 @@ msgstr "minutter" msgid "network" msgstr "nettverk" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/pl/ddns.po b/po/pl/ddns.po index 1c978c975..1f099e436 100644 --- a/po/pl/ddns.po +++ b/po/pl/ddns.po @@ -82,3 +82,9 @@ msgstr "min" msgid "network" msgstr "sieć" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/pt/ddns.po b/po/pt/ddns.po index f60069de1..ce1b52c12 100644 --- a/po/pt/ddns.po +++ b/po/pt/ddns.po @@ -6,6 +6,7 @@ msgstr "" "PO-Revision-Date: 2009-05-19 17:04+0200\n" "Last-Translator: Jose Monteiro \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -84,3 +85,9 @@ msgstr "" msgid "network" msgstr "" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/pt_BR/ddns.po b/po/pt_BR/ddns.po index 04fcf1686..1964bbcc6 100644 --- a/po/pt_BR/ddns.po +++ b/po/pt_BR/ddns.po @@ -81,3 +81,9 @@ msgstr "min" msgid "network" msgstr "rede" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/ro/ddns.po b/po/ro/ddns.po index 81c1b0508..6af34ffce 100644 --- a/po/ro/ddns.po +++ b/po/ro/ddns.po @@ -84,3 +84,9 @@ msgstr "minut(e)" msgid "network" msgstr "retea" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/ru/ddns.po b/po/ru/ddns.po index 5aa65d134..d24c37465 100644 --- a/po/ru/ddns.po +++ b/po/ru/ddns.po @@ -83,3 +83,9 @@ msgstr "мин" msgid "network" msgstr "сеть" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/templates/ddns.pot b/po/templates/ddns.pot index d57f23f03..d967c9965 100644 --- a/po/templates/ddns.pot +++ b/po/templates/ddns.pot @@ -65,3 +65,9 @@ msgstr "" msgid "network" msgstr "" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/tr/ddns.po b/po/tr/ddns.po index b115c485c..d649a6992 100644 --- a/po/tr/ddns.po +++ b/po/tr/ddns.po @@ -8,6 +8,7 @@ msgstr "" "PO-Revision-Date: 2010-04-02 13:44+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -79,3 +80,9 @@ msgstr "" msgid "network" msgstr "" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/uk/ddns.po b/po/uk/ddns.po index e63881951..dc1676183 100644 --- a/po/uk/ddns.po +++ b/po/uk/ddns.po @@ -12,8 +12,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.4\n" msgid "Check for changed IP every" @@ -84,3 +84,9 @@ msgstr "хв" msgid "network" msgstr "мережа" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/vi/ddns.po b/po/vi/ddns.po index dc51df769..856faf8a3 100644 --- a/po/vi/ddns.po +++ b/po/vi/ddns.po @@ -8,6 +8,7 @@ msgstr "" "PO-Revision-Date: 2009-08-12 18:06+0200\n" "Last-Translator: Hong Phuc Dang \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -86,3 +87,9 @@ msgstr "" msgid "network" msgstr "" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr "" diff --git a/po/zh_CN/ddns.po b/po/zh_CN/ddns.po index a2e47082a..5b96eeb69 100644 --- a/po/zh_CN/ddns.po +++ b/po/zh_CN/ddns.po @@ -80,3 +80,9 @@ msgstr "分" msgid "network" msgstr "网络" + +msgid "Event interface" +msgstr "" + +msgid "On which interface up should start the ddns script process." +msgstr ""