Merge pull request #1591 from user7887/luci-ru

i18n-ru: fixed and updated russian translation

diff --git a/applications/luci-app-firewall/po/zh-cn/firewall.po b/applications/luci-app-firewall/po/zh-cn/firewall.po
index d0d8ef5..9e9c64d 100644 (file)
--- a/applications/luci-app-firewall/po/zh-cn/firewall.po
+++ b/applications/luci-app-firewall/po/zh-cn/firewall.po
@@ -30,19 +30,19 @@ msgid "(Unnamed SNAT)"
 msgstr "（未命名 SNAT）"
 
 msgid "<var>%d</var> pkts. per <var>%s</var>"
-msgstr "<var>%d</var> 数据包。每 <var>%s</var>"
+msgstr "<var>%d</var> 数据包/<var>%s</var>"
 
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
-msgstr "<var>%d</var> 数据包。每 <var>%s</var>，突发 <var>%d</var> 数据包。"
+msgstr "<var>%d</var> 数据包/<var>%s</var>，突发 <var>%d</var> 数据包。"
 
 msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> 并限制到 %s"
 
 msgid "Accept forward"
-msgstr ""
+msgstr "接受转发"
 
 msgid "Accept input"
-msgstr ""
+msgstr "接受入站"
 
 msgid "Action"
 msgstr "动作"
@@ -92,22 +92,22 @@ msgid "Destination zone"
 msgstr "目标区域"
 
 msgid "Disable"
-msgstr ""
+msgstr "禁用"
 
 msgid "Discard forward"
-msgstr ""
+msgstr "丢弃转发"
 
 msgid "Discard input"
-msgstr ""
+msgstr "丢弃入站"
 
 msgid "Do not rewrite"
 msgstr "不重写"
 
 msgid "Do not track forward"
-msgstr ""
+msgstr "不跟踪转发"
 
 msgid "Do not track input"
-msgstr ""
+msgstr "不跟踪入站"
 
 msgid "Drop invalid packets"
 msgstr "丢弃无效数据包"
@@ -176,13 +176,13 @@ msgid "General Settings"
 msgstr "基本设置"
 
 msgid "IP"
-msgstr ""
+msgstr "IP"
 
 msgid "IP range"
-msgstr ""
+msgstr "IP 范围"
 
 msgid "IPs"
-msgstr ""
+msgstr "IP"
 
 msgid "IPv4"
 msgstr "IPv4"
@@ -218,10 +218,10 @@ msgid "Limit log messages"
 msgstr "限制日志信息"
 
 msgid "MAC"
-msgstr ""
+msgstr "MAC"
 
 msgid "MACs"
-msgstr ""
+msgstr "MAC"
 
 msgid "MSS clamping"
 msgstr "MSS 钳制"
@@ -318,10 +318,10 @@ msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "重定向匹配的入站流量到指定的内部主机"
 
 msgid "Refuse forward"
-msgstr ""
+msgstr "拒绝转发"
 
 msgid "Refuse input"
-msgstr ""
+msgstr "拒绝入站"
 
 msgid "Restart Firewall"
 msgstr "重启防火墙"
@@ -350,10 +350,10 @@ msgid "Rewrite to source %s, %s"
 msgstr "源地址改写成 %s, %s"
 
 msgid "Rule is disabled"
-msgstr ""
+msgstr "规则已禁用"
 
 msgid "Rule is enabled"
-msgstr ""
+msgstr "规则已启用"
 
 msgid "SNAT IP address"
 msgstr "SNAT IP 地址"
@@ -524,7 +524,7 @@ msgid "any zone"
 msgstr "所有区域"
 
 msgid "day"
-msgstr ""
+msgstr "日"
 
 msgid "don't track"
 msgstr "不跟踪"
@@ -533,31 +533,31 @@ msgid "drop"
 msgstr "丢弃"
 
 msgid "hour"
-msgstr ""
+msgstr "小时"
 
 msgid "minute"
-msgstr ""
+msgstr "分钟"
 
 msgid "not"
 msgstr ""
 
 msgid "port"
-msgstr ""
+msgstr "端口"
 
 msgid "ports"
-msgstr ""
+msgstr "端口"
 
 msgid "reject"
 msgstr "拒绝"
 
 msgid "second"
-msgstr ""
+msgstr "秒"
 
 msgid "traffic"
 msgstr "通信"
 
 msgid "type"
-msgstr ""
+msgstr "类型"
 
 msgid "types"
-msgstr ""
+msgstr "类型"

diff --git a/applications/luci-app-vpnbypass/Makefile b/applications/luci-app-vpnbypass/Makefile
index 0ca74ae..838840e 100644 (file)
--- a/applications/luci-app-vpnbypass/Makefile
+++ b/applications/luci-app-vpnbypass/Makefile
@@ -7,9 +7,10 @@ PKG_LICENSE:=GPL-3.0+
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
 
 LUCI_TITLE:=VPN Bypass Web UI
-LUCI_DEPENDS:=+vpnbypass
+LUCI_DESCRIPTION:=Provides Web UI for VPNBypass service.
+LUCI_DEPENDS:=+luci +vpnbypass
 LUCI_PKGARCH:=all
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 include ../../luci.mk
 

diff --git a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
index bb27b63..9d2f5f4 100644 (file)
--- a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
+++ b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
@@ -4,19 +4,11 @@ m = Map("vpnbypass", translate("VPN Bypass Settings"))
 s = m:section(NamedSection, "config", "vpnbypass")
 
 -- General options
-e = s:option(Flag, "enabled", translate("Enable/start service"))
+e = s:option(Flag, "enabled", translate("Start VPNBypass service"))
 e.rmempty = false
-
-function e.cfgvalue(self, section)
-       return self.map:get(section, "enabled") == "1" and luci.sys.init.enabled("vpnbypass") and self.enabled or self.disabled
-end
-
 function e.write(self, section, value)
-       if value == "1" then
-               luci.sys.call("/etc/init.d/vpnbypass enable >/dev/null")
-               luci.sys.call("/etc/init.d/vpnbypass start >/dev/null")
-       else
-               luci.sys.call("/etc/init.d/vpnbypass stop >/dev/null")
+       if value ~= "1" then
+               luci.sys.init.stop("vpnbypass")
        end
        return Flag.write(self, section, value)
 end

diff --git a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
index fd92b5e..c14c02f 100644 (file)
--- a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
+++ b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
@@ -7,9 +7,6 @@ msgstr ""
 msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
 msgstr ""
 
-msgid "Enable/start service"
-msgstr ""
-
 msgid "Local IP Addresses to Bypass"
 msgstr ""
 
@@ -41,6 +38,9 @@ msgstr ""
 msgid "Remote ports to trigger VPN Bypass"
 msgstr ""
 
+msgid "Start VPNBypass service"
+msgstr ""
+
 msgid "VPN Bypass"
 msgstr ""