diff options
Diffstat (limited to 'applications')
5 files changed, 33 insertions, 7 deletions
diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po index 1a867fd4dc..ac470fedd6 100644 --- a/applications/luci-app-adblock/po/ja/adblock.po +++ b/applications/luci-app-adblock/po/ja/adblock.po @@ -101,6 +101,8 @@ msgid "" "For further information <a href=\"%s\" target=\"_blank\">see online " "documentation</a>" msgstr "" +"詳細な情報は<a href=\"%s\" target=\"_blank\">オンライン ドキュメント</a>を確" +"認してください。" msgid "Force Overall Sort" msgstr "全体ソートの強制" @@ -146,7 +148,7 @@ msgstr "" "ん。" msgid "Please edit this file directly in a terminal session." -msgstr "" +msgstr "ターミナル セッションで直接このファイルを編集してください。" msgid "Query" msgstr "検索" @@ -188,6 +190,8 @@ msgstr "Adblock の一時停止" msgid "The file size is too large for online editing in LuCI (> 512 KB)." msgstr "" +"ファイル サイズが大きすぎるため、 LuCI 上でオンライン編集できません（> " +"512 KB）。" msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." diff --git a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua index d3fd150692..ca39c9bf30 100644 --- a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua +++ b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua @@ -3,7 +3,7 @@ module("luci.controller.mwan3", package.seeall) sys = require "luci.sys" ut = require "luci.util" -ip = "/usr/bin/ip -4 " +ip = "ip -4 " function index() if not nixio.fs.access("/etc/config/mwan3") then diff --git a/applications/luci-app-statistics/luasrc/statistics/datatree.lua b/applications/luci-app-statistics/luasrc/statistics/datatree.lua index 806b054cb6..5176a19a22 100644 --- a/applications/luci-app-statistics/luasrc/statistics/datatree.lua +++ b/applications/luci-app-statistics/luasrc/statistics/datatree.lua @@ -13,9 +13,17 @@ local sections = uci:get_all("luci_statistics") Instance = util.class() function Instance.__init__( self, host ) - self._host = host or sections.collectd.Hostname or sys.hostname() - self._libdir = sections.collectd.PluginDir or "/usr/lib/collectd" - self._rrddir = sections.collectd_rrdtool.DataDir or "/tmp/rrd" + self._host = host or sys.hostname() + self._libdir = "/usr/lib/collectd" + self._rrddir = "/tmp/rrd" + + if sections and sections.collectd then + self._host = host or sections.collectd.Hostname or sys.hostname() + self._libdir = sections.collectd.PluginDir or "/usr/lib/collectd" + end + if sections and sections.collectd_rrdtool then + self._rrddir = sections.collectd_rrdtool.DataDir or "/tmp/rrd" + end self._libdir = self._libdir:gsub("/$","") self._rrddir = self._rrddir:gsub("/$","") diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua index 6b07aabaed..236bbb0de5 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua @@ -16,6 +16,11 @@ m = Map("travelmate", translate("Travelmate"), .. "<a href=\"%s\" target=\"_blank\">" .. "see online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/travelmate/files/README.md")) +function m.on_after_commit(self) + luci.sys.call("/etc/init.d/travelmate restart >/dev/null 2>&1") + luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate")) +end + -- Main travelmate options s = m:section(NamedSection, "global", "travelmate") diff --git a/applications/luci-app-travelmate/po/ja/travelmate.po b/applications/luci-app-travelmate/po/ja/travelmate.po index 6667160197..e4a8b8bda2 100644 --- a/applications/luci-app-travelmate/po/ja/travelmate.po +++ b/applications/luci-app-travelmate/po/ja/travelmate.po @@ -14,9 +14,10 @@ msgstr "" msgid "<br /> Network Interface 'trm_wwan' created successfully." msgstr "" +"<br /> ネットワーク インターフェース 'trm_wwan' の作成に成功しました。" msgid "Add Interface" -msgstr "" +msgstr "インターフェースの追加" msgid "" "Additional trigger delay in seconds before travelmate processing begins." @@ -29,6 +30,8 @@ msgid "" "Automatically create a new wireless wan uplink interface 'trm_wwan', " "configure it to use dhcp and" msgstr "" +"新しい無線 WAN インターフェース 'trm_wwan' を自動的に作成し、 DHCP を使用する" +"よう構成して" msgid "" "Configuration of the travelmate package to to enable travel router " @@ -40,7 +43,7 @@ msgid "Connection Limit" msgstr "接続制限" msgid "Create Uplink Interface" -msgstr "" +msgstr "アップリンク インターフェースの作成" msgid "Edit Firewall Configuration" msgstr "ファイアウォール設定の編集" @@ -70,6 +73,8 @@ msgid "" "For further information <a href=\"%s\" target=\"_blank\">see online " "documentation</a>" msgstr "" +"詳細な情報は <a href=\"%s\" target=\"_blank\">オンライン ドキュメント</a>を確" +"認してください。" msgid "How long should travelmate wait for a successful wlan interface reload" msgstr "" @@ -123,6 +128,8 @@ msgid "" "Scan & Add new wireless stations via standard <a href=\"%s\">Wireless " "Setup</a>" msgstr "" +"通常の<a href=\"%s\">無線設定</a>にて、新規の無線ステーションのスキャン及び追" +"加を行います。" msgid "" "Space separated list of interfaces that trigger travelmate processing. To " @@ -197,6 +204,8 @@ msgstr "ログファイルの確認" msgid "" "add it to the wan zone of the firewall. This step has only to be done once." msgstr "" +"ファイアウォールの wan ゾーンに追加します。このステップは、一度だけ実行される" +"必要があります。" msgid "connected" msgstr "接続済み" |