Merge pull request #793 from remakeelectric/rme-master-tweaks

wifi_add minor usability tweaks

diff --git a/applications/luci-app-aria2/po/templates/aria2.pot b/applications/luci-app-aria2/po/templates/aria2.pot
index 9cf7099..357c0ae 100644 (file)
--- a/applications/luci-app-aria2/po/templates/aria2.pot
+++ b/applications/luci-app-aria2/po/templates/aria2.pot
@@ -1,200 +1,208 @@
-msgid "Aria2"
-msgstr ""
-
-msgid "Aria2 is a multi-protocol & multi-source download utility, here you can configure the settings."
-msgstr ""
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
 
-msgid "Aria2 Status"
+msgid "\"Falloc\" is not available in all cases."
 msgstr ""
 
-msgid "Open YAAW"
+msgid "<abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
 msgstr ""
 
-msgid "Open WebUI-Aria2"
+msgid "<abbr title=\"Local Peer Discovery\">LPD</abbr> enabled"
 msgstr ""
 
-msgid "The Aria2 service is running."
+msgid "Additional Bt tracker enabled"
 msgstr ""
 
-msgid "The Aria2 service is not running."
+msgid "Aria2"
 msgstr ""
 
 msgid "Aria2 Settings"
 msgstr ""
 
-msgid "General settings"
+msgid "Aria2 Status"
 msgstr ""
 
-msgid "Files and Locations"
+msgid ""
+"Aria2 is a multi-protocol &amp; multi-source download utility, here you can "
+"configure the settings."
 msgstr ""
 
-msgid "Enabled"
+msgid "Autosave session interval"
 msgstr ""
 
-msgid "Task Settings"
+msgid "BitTorrent Settings"
 msgstr ""
 
-msgid "BitTorrent Settings"
+msgid "BitTorrent listen port"
 msgstr ""
 
-msgid "Run daemon as user"
+msgid "Collecting data..."
 msgstr ""
 
-msgid "RPC port"
+msgid "Config file directory"
 msgstr ""
 
-msgid "RPC authentication method"
+msgid "Debug"
 msgstr ""
 
-msgid "No Authentication"
+msgid "Default download directory"
 msgstr ""
 
-msgid "Username & Password"
+msgid "Disk cache"
 msgstr ""
 
-msgid "Token"
+msgid "Enable log"
 msgstr ""
 
-msgid "RPC username"
+msgid "Enabled"
 msgstr ""
 
-msgid "RPC password"
+msgid "Error"
 msgstr ""
 
-msgid "RPC Token"
+msgid "Extra Settings"
 msgstr ""
 
-msgid "Generate Randomly"
+msgid "Falloc"
 msgstr ""
 
-msgid "Enable log"
+msgid "Files and Locations"
 msgstr ""
 
-msgid "Log file is in the config file dir."
+msgid "Follow torrent"
 msgstr ""
 
-msgid "Log level"
+msgid "General Settings"
 msgstr ""
 
-msgid "Debug"
+msgid "Generate Randomly"
 msgstr ""
 
 msgid "Info"
 msgstr ""
 
-msgid "Notice"
+msgid "List of additional Bt tracker"
 msgstr ""
 
-msgid "Warn"
+msgid "List of extra settings"
 msgstr ""
 
-msgid "Error"
+msgid "Log file is in the config file dir."
 msgstr ""
 
-msgid "Config file directory"
+msgid "Log level"
 msgstr ""
 
-msgid "Default download directory"
+msgid "Max concurrent downloads"
 msgstr ""
 
-msgid "Disk cache"
+msgid "Max connection per server"
 msgstr ""
 
-msgid "in bytes, You can append K or M."
+msgid "Max number of peers per torrent"
 msgstr ""
 
-msgid "Preallocation"
+msgid "Max number of split"
 msgstr ""
 
-msgid "Off"
+msgid "Min split size"
 msgstr ""
 
-msgid "Prealloc"
+msgid "No Authentication"
 msgstr ""
 
-msgid "Trunc"
+msgid "Notice"
 msgstr ""
 
-msgid "Falloc"
+msgid "Off"
 msgstr ""
 
-msgid "\"Falloc\" is not available in all cases."
+msgid "Open WebUI-Aria2"
 msgstr ""
 
-msgid "Overall speed limit enabled"
+msgid "Open YAAW"
 msgstr ""
 
 msgid "Overall download limit"
 msgstr ""
 
-msgid "in bytes/sec, You can append K or M."
+msgid "Overall speed limit enabled"
 msgstr ""
 
 msgid "Overall upload limit"
 msgstr ""
 
-msgid "Per task speed limit enabled"
+msgid "Per task download limit"
 msgstr ""
 
-msgid "Per task download limit"
+msgid "Per task speed limit enabled"
 msgstr ""
 
 msgid "Per task upload limit"
 msgstr ""
 
-msgid "Max concurrent downloads"
+msgid "Prealloc"
 msgstr ""
 
-msgid "Max connection per server"
+msgid "Preallocation"
 msgstr ""
 
-msgid "Min split size"
+msgid "Prefix of peer ID"
 msgstr ""
 
-msgid "Max number of split"
+msgid "RPC Token"
 msgstr ""
 
-msgid "Autosave session interval"
+msgid "RPC authentication method"
 msgstr ""
 
-msgid "Sec"
+msgid "RPC password"
 msgstr ""
 
-msgid "User agent value"
+msgid "RPC port"
 msgstr ""
 
-msgid "<abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+msgid "RPC username"
 msgstr ""
 
-msgid "<abbr title=\"Local Peer Discovery\">LPD</abbr> enabled"
+msgid "Run daemon as user"
 msgstr ""
 
-msgid "Follow torrent"
+msgid "Sec"
 msgstr ""
 
-msgid "BitTorrent listen port"
+msgid "Task Settings"
 msgstr ""
 
-msgid "Max number of peers per torrent"
+msgid "The Aria2 service is not running."
 msgstr ""
 
-msgid "Additional Bt tracker enabled"
+msgid "The Aria2 service is running."
 msgstr ""
 
-msgid "List of additional Bt tracker"
+msgid "Token"
 msgstr ""
 
-msgid "Prefix of peer ID"
+msgid "Trunc"
 msgstr ""
 
-msgid "Extra Settings"
+msgid "Use WebSocket"
 msgstr ""
 
-msgid "List of extra settings"
+msgid "User agent value"
+msgstr ""
+
+msgid "Username & Password"
 msgstr ""
 
 msgid "View Json-RPC URL"
 msgstr ""
 
-msgid "Use WebSocket"
+msgid "Warn"
+msgstr ""
+
+msgid "in bytes, You can append K or M."
+msgstr ""
+
+msgid "in bytes/sec, You can append K or M."
 msgstr ""

diff --git a/applications/luci-app-ddns/Makefile b/applications/luci-app-ddns/Makefile
index c1a22c8..55ce1cb 100644 (file)
--- a/applications/luci-app-ddns/Makefile
+++ b/applications/luci-app-ddns/Makefile
@@ -10,11 +10,11 @@ PKG_NAME:=luci-app-ddns
 
 # Version == major.minor.patch
 # increase on new functionality (minor) or patches (patch)
-PKG_VERSION:=2.4.6
+PKG_VERSION:=2.4.7
 
 # Release == build
 # increase on changes of translation files
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_LICENSE:=Apache-2.0
 PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>

diff --git a/applications/luci-app-ddns/luasrc/controller/ddns.lua b/applications/luci-app-ddns/luasrc/controller/ddns.lua
index 1f2e6f2..9f5411b 100755 (executable)
--- a/applications/luci-app-ddns/luasrc/controller/ddns.lua
+++ b/applications/luci-app-ddns/luasrc/controller/ddns.lua
@@ -18,11 +18,11 @@ local UTIL = require "luci.util"
 local DDNS = require "luci.tools.ddns"         -- ddns multiused functions
 
 local srv_name    = "ddns-scripts"
-local srv_ver_min = "2.7.2"                    -- minimum version of service required
+local srv_ver_min = "2.7.5"                    -- minimum version of service required
 local srv_ver_cmd = [[/usr/lib/ddns/dynamic_dns_updater.sh --version | awk {'print $2'}]]
 local app_name    = "luci-app-ddns"
 local app_title   = "Dynamic DNS"
-local app_version = "2.4.6-1"
+local app_version = "2.4.7-1"
 
 function index()
        local nxfs      = require "nixio.fs"            -- global definitions not available

diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua
index 1f5ad68..21827b7 100644 (file)
--- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua
+++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua
@@ -116,9 +116,9 @@ if not DDNS.has_forceip then
                value = value .. "<br />- " ..
                        translate("You should install 'wget' or 'curl' or 'uclient-fetch' package.")
        end
-       if not (DDNS.has_bindhost or DDNS.has_hostip) then
+       if not DDNS.has_bindhost then
                value = value .. "<br />- " ..
-                       translate("You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package for DNS requests.")
+                       translate("You should install 'bind-host' or 'knot-host' or 'drill' package for DNS requests.")
        end
        fi.value = value
 end

diff --git a/applications/luci-app-ddns/luasrc/tools/ddns.lua b/applications/luci-app-ddns/luasrc/tools/ddns.lua
index 6b626b9..e55c673 100755 (executable)
--- a/applications/luci-app-ddns/luasrc/tools/ddns.lua
+++ b/applications/luci-app-ddns/luasrc/tools/ddns.lua
@@ -31,7 +31,7 @@ has_nslookup  = (SYS.call( [[$(which nslookup) localhost 2>&1 | grep -qF "(null)"
 has_ipv6       = (NXFS.access("/proc/net/ipv6_route") and NXFS.access("/usr/sbin/ip6tables"))
 has_ssl                = (has_wgetssl or has_curlssl or (has_fetch and has_fetchssl))
 has_proxy      = (has_wgetssl or has_curlpxy or has_fetch or has_bbwget)
-has_forceip    = ((has_wgetssl or has_curl or has_fetch) and (has_bindhost or has_hostip))
+has_forceip    = (has_wgetssl or has_curl or has_fetch) -- only really needed for transfer
 has_dnsserver  = (has_bindhost or has_hostip or has_nslookup)
 has_bindnet    = (has_wgetssl or has_curl)
 has_cacerts    = _check_certs()

diff --git a/applications/luci-app-ddns/po/ca/ddns.po b/applications/luci-app-ddns/po/ca/ddns.po
index 02369b5..69be6ed 100644 (file)
--- a/applications/luci-app-ddns/po/ca/ddns.po
+++ b/applications/luci-app-ddns/po/ca/ddns.po
@@ -588,11 +588,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/cs/ddns.po b/applications/luci-app-ddns/po/cs/ddns.po
index d41f8c6..2366f62 100644 (file)
--- a/applications/luci-app-ddns/po/cs/ddns.po
+++ b/applications/luci-app-ddns/po/cs/ddns.po
@@ -586,11 +586,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/de/ddns.po b/applications/luci-app-ddns/po/de/ddns.po
index 517fe36..39c1fdc 100644 (file)
--- a/applications/luci-app-ddns/po/de/ddns.po
+++ b/applications/luci-app-ddns/po/de/ddns.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: luci-app-ddns 2.4.2-1\n"
-"POT-Creation-Date: 2016-05-08 19:10+0200\n"
-"PO-Revision-Date: 2016-05-08 19:12+0200\n"
+"POT-Creation-Date: 2016-09-25 10:43+0200\n"
+"PO-Revision-Date: 2016-09-25 10:43+0200\n"
 "Last-Translator: Christian Schönebeck <christian.schoenebeck@gmail.com>\n"
 "Language-Team: \n"
 "Language: de\n"
@@ -670,13 +670,6 @@ msgstr ""
 "Systemprotokoll geschrieben."
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-"Sie sollten das Programmpakete 'bind-host' oder 'knot-host' oder 'drill' "
-"oder 'hostip' für DNS Anfragen installieren."
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/el/ddns.po b/applications/luci-app-ddns/po/el/ddns.po
index a9e3266..fce0cb8 100644 (file)
--- a/applications/luci-app-ddns/po/el/ddns.po
+++ b/applications/luci-app-ddns/po/el/ddns.po
@@ -585,11 +585,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/es/ddns.po b/applications/luci-app-ddns/po/es/ddns.po
index d75d2b7..eb5a385 100644 (file)
--- a/applications/luci-app-ddns/po/es/ddns.po
+++ b/applications/luci-app-ddns/po/es/ddns.po
@@ -584,11 +584,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/fr/ddns.po b/applications/luci-app-ddns/po/fr/ddns.po
index 5254489..2004989 100644 (file)
--- a/applications/luci-app-ddns/po/fr/ddns.po
+++ b/applications/luci-app-ddns/po/fr/ddns.po
@@ -584,11 +584,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/he/ddns.po b/applications/luci-app-ddns/po/he/ddns.po
index 55c7b69..f6f2e2b 100644 (file)
--- a/applications/luci-app-ddns/po/he/ddns.po
+++ b/applications/luci-app-ddns/po/he/ddns.po
@@ -585,11 +585,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/hu/ddns.po b/applications/luci-app-ddns/po/hu/ddns.po
index f74365f..1f91fa1 100644 (file)
--- a/applications/luci-app-ddns/po/hu/ddns.po
+++ b/applications/luci-app-ddns/po/hu/ddns.po
@@ -584,11 +584,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/it/ddns.po b/applications/luci-app-ddns/po/it/ddns.po
index 2173c4a..f59d053 100644 (file)
--- a/applications/luci-app-ddns/po/it/ddns.po
+++ b/applications/luci-app-ddns/po/it/ddns.po
@@ -584,11 +584,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/ja/ddns.po b/applications/luci-app-ddns/po/ja/ddns.po
index b69efca..8fe0180 100644 (file)
--- a/applications/luci-app-ddns/po/ja/ddns.po
+++ b/applications/luci-app-ddns/po/ja/ddns.po
@@ -584,11 +584,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/no/ddns.po b/applications/luci-app-ddns/po/no/ddns.po
index be35593..a8efd0f 100644 (file)
--- a/applications/luci-app-ddns/po/no/ddns.po
+++ b/applications/luci-app-ddns/po/no/ddns.po
@@ -583,11 +583,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/pl/ddns.po b/applications/luci-app-ddns/po/pl/ddns.po
index 0f12613..ade7982 100644 (file)
--- a/applications/luci-app-ddns/po/pl/ddns.po
+++ b/applications/luci-app-ddns/po/pl/ddns.po
@@ -585,11 +585,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/pt-br/ddns.po b/applications/luci-app-ddns/po/pt-br/ddns.po
index 218193b..4970846 100644 (file)
--- a/applications/luci-app-ddns/po/pt-br/ddns.po
+++ b/applications/luci-app-ddns/po/pt-br/ddns.po
@@ -646,13 +646,6 @@ msgstr ""
 "escritos no log do sistema."
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-"Você deve instalar o pacote 'bind-host' ou 'knot-host' ou 'drill' ou "
-"'hostip' para requisições DNS."
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""
@@ -807,3 +800,10 @@ msgstr "erro não específico"
 
 msgid "use hostname, FQDN, IPv4- or IPv6-Address"
 msgstr "use hostname, FQDN, endereço IPv4 ou IPv6"
+
+#~ msgid ""
+#~ "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
+#~ "package for DNS requests."
+#~ msgstr ""
+#~ "Você deve instalar o pacote 'bind-host' ou 'knot-host' ou 'drill' ou "
+#~ "'hostip' para requisições DNS."

diff --git a/applications/luci-app-ddns/po/pt/ddns.po b/applications/luci-app-ddns/po/pt/ddns.po
index be20a34..1a00efb 100644 (file)
--- a/applications/luci-app-ddns/po/pt/ddns.po
+++ b/applications/luci-app-ddns/po/pt/ddns.po
@@ -586,11 +586,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/ro/ddns.po b/applications/luci-app-ddns/po/ro/ddns.po
index 7741b7d..93424ad 100644 (file)
--- a/applications/luci-app-ddns/po/ro/ddns.po
+++ b/applications/luci-app-ddns/po/ro/ddns.po
@@ -585,11 +585,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/ru/ddns.po b/applications/luci-app-ddns/po/ru/ddns.po
index 1c4c152..a41d1f4 100644 (file)
--- a/applications/luci-app-ddns/po/ru/ddns.po
+++ b/applications/luci-app-ddns/po/ru/ddns.po
@@ -586,11 +586,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/templates/ddns.pot b/applications/luci-app-ddns/po/templates/ddns.pot
index d134ea1..194bf81 100644 (file)
--- a/applications/luci-app-ddns/po/templates/ddns.pot
+++ b/applications/luci-app-ddns/po/templates/ddns.pot
@@ -571,11 +571,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/tr/ddns.po b/applications/luci-app-ddns/po/tr/ddns.po
index 3138bf0..be3b1e5 100644 (file)
--- a/applications/luci-app-ddns/po/tr/ddns.po
+++ b/applications/luci-app-ddns/po/tr/ddns.po
@@ -582,11 +582,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/uk/ddns.po b/applications/luci-app-ddns/po/uk/ddns.po
index b2ad791..33c077e 100644 (file)
--- a/applications/luci-app-ddns/po/uk/ddns.po
+++ b/applications/luci-app-ddns/po/uk/ddns.po
@@ -587,11 +587,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/vi/ddns.po b/applications/luci-app-ddns/po/vi/ddns.po
index babdbb9..9d9ee07 100644 (file)
--- a/applications/luci-app-ddns/po/vi/ddns.po
+++ b/applications/luci-app-ddns/po/vi/ddns.po
@@ -585,11 +585,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/zh-cn/ddns.po b/applications/luci-app-ddns/po/zh-cn/ddns.po
index a151999..91bb756 100644 (file)
--- a/applications/luci-app-ddns/po/zh-cn/ddns.po
+++ b/applications/luci-app-ddns/po/zh-cn/ddns.po
@@ -595,11 +595,6 @@ msgid ""
 msgstr "把日志写入系统日志.无论是否启用这项,错误信息总是会被写入系统日志"
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-ddns/po/zh-tw/ddns.po b/applications/luci-app-ddns/po/zh-tw/ddns.po
index 5b608f0..ae0aaba 100644 (file)
--- a/applications/luci-app-ddns/po/zh-tw/ddns.po
+++ b/applications/luci-app-ddns/po/zh-tw/ddns.po
@@ -583,11 +583,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package "
-"for DNS requests."
-msgstr ""
-
-msgid ""
 "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
 "package, if you need to specify a DNS server to detect your registered IP."
 msgstr ""

diff --git a/applications/luci-app-rp-pppoe-server/Makefile b/applications/luci-app-rp-pppoe-server/Makefile
new file mode 100644 (file)
index 0000000..6cf4595
--- /dev/null
+++ b/applications/luci-app-rp-pppoe-server/Makefile
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Roaring Penguing PPPoE Server
+LUCI_DEPENDS:=+rp-pppoe-server
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature

diff --git a/applications/luci-app-rp-pppoe-server/luasrc/controller/rp-pppoe-server.lua b/applications/luci-app-rp-pppoe-server/luasrc/controller/rp-pppoe-server.lua
new file mode 100644 (file)
index 0000000..105a80e
--- /dev/null
+++ b/applications/luci-app-rp-pppoe-server/luasrc/controller/rp-pppoe-server.lua
@@ -0,0 +1,13 @@
+-- Copyright 2015 Daniel Dickinson <openwrt@daniel.thecshore.com>
+-- Licensed to the public under the Apache License 2.0.
+
+module("luci.controller.rp-pppoe-server", package.seeall)
+
+function index()
+       if not nixio.fs.access("/etc/config/pppoe") then
+               return
+       end
+
+       entry({"admin", "services", "rp-pppoe-server"}, cbi("rp-pppoe-server"), _("RP PPPoE Server"))
+end
+

diff --git a/applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua b/applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua
new file mode 100644 (file)
index 0000000..ef15ed6
--- /dev/null
+++ b/applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua
@@ -0,0 +1,72 @@
+-- Copyright 2015 Daniel Dickinson <openwrt@daniel.thecshore.com>
+-- Licensed to the public under the Apache License 2.0.
+
+local m, s, o
+
+local nixio = require "nixio"
+
+m = Map("pppoe", translate("Roaring Penguin PPPoE Server"),
+       translate("PPPoE Server Configuration"))
+
+s = m:section(TypedSection, "pppoe_server", translate("Server Configuration"))
+s.addremove = false
+s.anonymous = true
+
+o = s:option(Value, "interface", translate("Interface"), translate("Interface on which to listen."))
+o.template = "cbi/network_ifacelist"
+o.nocreate = true
+
+o = s:option(Value, "ac_name", translate("Access Concentrator Name"))
+o.optional = true
+
+o = s:option(DynamicList, "service_name", translate("Service Name"))
+o.optional = true
+
+o = s:option(Value, "maxsessionsperpeer", translate("Maximum sessions per peer"))
+o.optional = true
+o.datatype = "uinteger"
+
+o = s:option(Value, "localip", translate("IP of listening side"))
+o.datetype = "ipaddr"
+
+o = s:option(Value, "firstremoteip", translate("First remote IP"))
+o.datatype = "ipaddr"
+
+o = s:option(Value, "maxsessions", translate("Maximum sessions"))
+o.datatype = "uinteger"
+o.default = 64
+o.optional = true
+
+o = s:option(Value, "optionsfile", translate("Options file"))
+o.default = "/etc/ppp/pppoe-server-options"
+o.optional = true
+
+o = s:option(Flag, "randomsessions", translate("Random session selection"), translate("Instead of starting at beginning and going to end, randomize session number"))
+o.optional = true
+
+o = s:option(Value, "unit", translate("Unit"), translate("PPP unit number"))
+o.optional = true
+o.datatype = "uinteger"
+o.default = 0
+
+o = s:option(Value, "offset", translate("Offset"), translate("PPP offset"))
+o.optional = true
+o.datatype = "uinteger"
+o.default = 0
+
+o = s:option(Value, "timeout", translate("Timeout"))
+o.optional = true
+o.datatype = "uinteger"
+o.default = 60
+
+o = s:option(Value, "mss", translate("MSS"))
+o.optional = true
+o.datatype = "uinteger"
+o.default = 1468
+
+
+o = s:option(Flag, "sync", translate("Sync"))
+o.optional = true
+o.default = false
+
+return m

diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua
index 6266ff3..fbc3884 100644 (file)
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua
@@ -6,7 +6,7 @@ module("luci.statistics.rrdtool.definitions.df", package.seeall)
 function rrdargs( graph, plugin, plugin_instance, dtype )
 
        return {
-               title = "%H: Disk space usage on %di",
+               title = "%H: Disk space usage on %pi",
                vlabel = "Bytes",
                per_instance  = true,
                number_format = "%5.1lf%sB",

diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua
index 8b04ab8..dd93196 100644 (file)
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua
@@ -32,23 +32,24 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
 
                        options = {
                                current_output  = { color = "00e000", title = "Output current", noarea=true, overlay=true },
-                               current_battery = { color = "0000ff", title = "Battery current", noarea=true, overlay=true },
+                               current_battery = { color = "0000ff", title = "Battery current", noarea=true, overlay=true }
                        }
                }
        }
 
        local percentage = {
-               title = "%H: Battery charge on UPS \"%pi\"",
+               title = "%H: Battery charge/load on UPS \"%pi\"",
                vlabel = "Percent",
                y_min = "0",
                y_max = "100",
                number_format = "%5.1lf%%",
                data = {
                        instances = {
-                               percent = "charge"
+                               percent = { "charge", "load" }
                        },
                        options = {
-                               percent_charge = { color = "00ff00", title = "Charge level"  }
+                               percent_charge = { color = "00ff00", title = "Charge level"  },
+                               percent_load = { color = "ff0000", title = "Load"  }
                        }
                }
        }
@@ -78,10 +79,39 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
                                timeleft = { "battery" }
                        },
                        options = {
-                               timeleft_battery = { color = "0000ff", title = "Time left", transform_rpn = "60,/" }
+                               timeleft_battery = { color = "0000ff", title = "Time left", transform_rpn = "60,/", noarea=true }
                        }
                }
        }
 
-       return { voltages, currents, percentage, temperature, timeleft }
+       local power = {
+               title = "%H: Power on UPS \"%pi\"",
+               vlabel = "Power",
+               number_format = "%5.1lf%%",
+               data = {
+                       instances = {
+                               power = { "ups" }
+                       },
+                       options = {
+                               power_ups = { color = "00ff00", title = "Power level"  }
+                       }
+               }
+       }
+
+       local frequencies = {
+               title = "%H: Frequencies on UPS \"%pi\"",
+               vlabel = "Hz",
+               number_format = "%5.1lfHz",
+               data = {
+                       instances = {
+                               frequency = { "input", "output" }
+                       },
+
+                       options = {
+                               frequency_output  = { color = "00e000", title = "Output frequency", noarea=true, overlay=true },
+                               frequency_input   = { color = "ffb000", title = "Input frequency", noarea=true, overlay=true }
+                       }
+               }
+       }
+       return { voltages, currents, percentage, temperature, timeleft, power, frequencies }
 end

diff --git a/collections/luci-ssl-openssl/Makefile b/collections/luci-ssl-openssl/Makefile
new file mode 100644 (file)
index 0000000..37442a3
--- /dev/null
+++ b/collections/luci-ssl-openssl/Makefile
@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2016 The LuCI Team
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TYPE:=col
+LUCI_BASENAME:=ssl-openssl
+
+LUCI_TITLE:=LuCI with HTTPS support (OpenSSL as SSL backend)
+LUCI_DESCRIPTION:=LuCI with OpenSSL as the SSL backend (libustream-openssl). \
+ Note: px5g still requires libpolarssl
+LUCI_DEPENDS:=+luci +libustream-openssl +px5g
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature

diff --git a/collections/luci-ssl/Makefile b/collections/luci-ssl/Makefile
index 07c9c50..f25e311 100644 (file)
--- a/collections/luci-ssl/Makefile
+++ b/collections/luci-ssl/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+# Copyright (C) 2008-2016 The LuCI Team
 #
 # This is free software, licensed under the Apache License, Version 2.0 .
 #
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 LUCI_TYPE:=col
 LUCI_BASENAME:=ssl
 
-LUCI_TITLE:=Standard OpenWrt set with HTTPS support
+LUCI_TITLE:=LuCI with HTTPS support (PolarSSL as SSL backend)
 LUCI_DEPENDS:=+luci +libustream-polarssl +px5g
 
 include ../../luci.mk

diff --git a/luci.mk b/luci.mk
index eb034d2..84d1512 100644 (file)
--- a/luci.mk
+++ b/luci.mk
@@ -150,8 +150,7 @@ LUCI_LIBRARYDIR = $(LUA_LIBRARYDIR)/luci
 
 define SrcDiet
        $(FIND) $(1) -type f -name '*.lua' | while read src; do \
-               if $(STAGING_DIR)/host/bin/lua $(STAGING_DIR)/host/bin/LuaSrcDiet \
-                       --noopt-binequiv -o "$$$$src.o" "$$$$src"; \
+               if LuaSrcDiet --noopt-binequiv -o "$$$$src.o" "$$$$src"; \
                then mv "$$$$src.o" "$$$$src"; fi; \
        done
 endef

diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile
index f0763cb..972a451 100644 (file)
--- a/modules/luci-base/Makefile
+++ b/modules/luci-base/Makefile
@@ -37,10 +37,9 @@ define Host/Compile
 endef
 
 define Host/Install
-       $(INSTALL_DIR) $(STAGING_DIR)/host/bin
-       $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
-       $(INSTALL_BIN) src/po2lmo $(STAGING_DIR_HOST)/bin/po2lmo
-       $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/LuaSrcDiet.lua $(STAGING_DIR)/host/bin/LuaSrcDiet
+       $(INSTALL_DIR) $(1)/bin
+       $(INSTALL_BIN) src/po2lmo $(1)/bin/po2lmo
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/LuaSrcDiet.lua $(1)/bin/LuaSrcDiet
 endef
 
 $(eval $(call HostBuild))

diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po
index 1e44147..efce3d3 100644 (file)
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -2271,7 +2271,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po
index b0ab326..97ec0d5 100644 (file)
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@@ -2296,7 +2296,7 @@ msgstr ""
 "Po takovém množství LCP echo selhání předpokládám, že peer je mrtvý. "
 "Použijte 0 pro ignorování chyb"
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po
index 8d72612..c008af4 100644 (file)
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -2302,7 +2302,7 @@ msgstr ""
 "Deklariere den Client als tot nach der angegebenen Anzahl von LCP Echo "
 "Fehlschlägen, nutze den Wert 0 um Fehler zu ignorieren"
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po
index 7b716ad..9bd69f3 100644 (file)
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -2301,7 +2301,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 #, fuzzy

diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po
index 82a4e72..55b34f3 100644 (file)
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -2268,7 +2268,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po
index de9a645..55c95ae 100644 (file)
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -2310,7 +2310,7 @@ msgstr ""
 "Asumir que el otro estará muerto tras estos fallos de echo LCP, use 0 para "
 "ignorar fallos"
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po
index fcde931..6dc79eb 100644 (file)
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -2323,7 +2323,7 @@ msgstr ""
 "Suppose que le distant a disparu une fois le nombre donné d'erreurs d'échos "
 "LCP ; utiliser 0 pour ignorer ces erreurs"
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po
index 3c2d784..17db4ce 100644 (file)
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -2236,7 +2236,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po
index d71bd69..bee834e 100644 (file)
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -2313,7 +2313,7 @@ msgstr ""
 "A peer halottnak tekintése a megadott számú LCP echo hibák után. Használjon "
 "0-t a hibák figyelmen kívül hagyásához."
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po
index 2bc5dda..10ff313 100644 (file)
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -2307,7 +2307,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index 740c676..b4c448a 100644 (file)
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -2290,7 +2290,7 @@ msgstr ""
 "設定回数のLCP echo 確認失敗後、ピアノードがダウンしているものと見なします。0"
 "を設定した場合、失敗しても無視します"
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po
index 5e348d6..f249d07 100644 (file)
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -2240,7 +2240,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po
index 793d381..10e70bd 100644 (file)
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -2288,7 +2288,7 @@ msgstr ""
 "Annta at peer er uten forbindelse om angitt LCP ekko feiler, bruk verdi 0 "
 "for å overse feil"
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po
index 4e6152c..78d32c4 100644 (file)
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -2336,7 +2336,7 @@ msgstr ""
 "Zakładaj że klient jest martwy po danej ilości błedów odpowiedzi echa LCP, "
 "wpisz 0 aby zignorować błędy"
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po
index fda1605..1b3157c 100644 (file)
--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@@ -2341,7 +2341,7 @@ msgstr ""
 "Assumir que o parceiro está morto depois de uma data quantidade de falhas de "
 "echo do LCP. Use 0 para ignorar as falhas"
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po
index 05bdb76..1988a69 100644 (file)
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -2308,7 +2308,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po
index 73f9fb1..8916282 100644 (file)
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -2233,7 +2233,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po
index 34dde6b..5e00842 100644 (file)
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -2318,7 +2318,7 @@ msgstr ""
 "Предполагать, что узел недоступен после указанного количества ошибок "
 "получения эхо-пакета LCP, введите 0 для игнорирования ошибок"
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po
index 0d87051..7d78993 100644 (file)
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -2207,7 +2207,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po
index 73a88b8..244902d 100644 (file)
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -2213,7 +2213,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot
index df2892b..3041c6a 100644 (file)
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -2200,7 +2200,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po
index a5a5338..4443096 100644 (file)
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -2220,7 +2220,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po
index 95c686e..5bf6068 100644 (file)
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@ -2329,7 +2329,7 @@ msgstr ""
 "Вважати вузол недоступним після визначеної кількості невдач отримання ехо-"
 "пакета LCP, використовуйте 0, щоб ігнорувати невдачі"
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po
index 0e37856..485fbd9 100644 (file)
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -2243,7 +2243,7 @@ msgid ""
 "ignore failures"
 msgstr ""
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po
index dbc4df8..2852c15 100644 (file)
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -2233,7 +2233,7 @@ msgid ""
 "ignore failures"
 msgstr "在指定数量的LCP响应故障后假定链路已断开，0为忽略故障"
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po
index d1d17ad..8b4db5f 100644 (file)
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -2248,7 +2248,7 @@ msgid ""
 "ignore failures"
 msgstr "假若在給于多次的 LCP 呼叫失敗後終點將死, 使用0忽略失敗"
 
-msgid "Prevent listening on thise interfaces."
+msgid "Prevent listening on these interfaces."
 msgstr ""
 
 msgid "Prevents client-to-client communication"

diff --git a/modules/luci-base/root/etc/config/luci b/modules/luci-base/root/etc/config/luci
index a443742..baa3ac5 100644 (file)
--- a/modules/luci-base/root/etc/config/luci
+++ b/modules/luci-base/root/etc/config/luci
@@ -22,8 +22,3 @@ config internal ccache
        option enable 1
                
 config internal themes
-
-config internal 'diag'
-       option ping 'dev.openwrt.org'
-       option route 'dev.openwrt.org'
-       option dns 'dev.openwrt.org'

diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
index aaf045c..10636a4 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
@@ -251,7 +251,7 @@ o:depends("nonwildcard", true)
 
 o = s:taboption("general", DynamicList, "notinterface",
        translate("Exclude interfaces"),
-       translate("Prevent listening on thise interfaces."))
+       translate("Prevent listening on these interfaces."))
 o.optional = true
 o:depends("nonwildcard", true)
 

diff --git a/modules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full b/modules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full
new file mode 100755 (executable)
index 0000000..372eb15
--- /dev/null
+++ b/modules/luci-mod-admin-full/root/etc/uci-defaults/50_luci-mod-admin-full
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if [ "$(uci -q get luci.diag)" != "internal" ]; then
+       host=""
+
+       if [ -s /etc/os-release ]; then
+               . /etc/os-release
+               host="${HOME_URL:-${BUG_URL:-$LEDE_DEVICE_MANUFACTURER_URL}}"
+               host="${host#*://}"
+               host="${host%%/*}"
+       fi
+
+       uci -q batch <<-EOF >/dev/null
+               set luci.diag=internal
+               set luci.diag.dns='${host:-openwrt.org}'
+               set luci.diag.ping='${host:-openwrt.org}'
+               set luci.diag.route='${host:-openwrt.org}'
+               commit luci
+       EOF
+fi
+
+exit 0