diff options
Diffstat (limited to 'applications/luci-app-vpnbypass')
10 files changed, 316 insertions, 129 deletions
diff --git a/applications/luci-app-vpnbypass/Makefile b/applications/luci-app-vpnbypass/Makefile index f426acc537..2e26a5158e 100644 --- a/applications/luci-app-vpnbypass/Makefile +++ b/applications/luci-app-vpnbypass/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Stan Grishin (stangri@melmac.net) +# Copyright 2017-2019 Stan Grishin (stangri@melmac.net) # This is free software, licensed under the GNU General Public License v3. include $(TOPDIR)/rules.mk @@ -8,9 +8,9 @@ PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net> LUCI_TITLE:=VPN Bypass Web UI LUCI_DESCRIPTION:=Provides Web UI for VPNBypass service. -LUCI_DEPENDS:=+luci +vpnbypass +LUCI_DEPENDS:=+luci-mod-admin-full +vpnbypass LUCI_PKGARCH:=all -PKG_RELEASE:=4 +PKG_RELEASE:=9 include ../../luci.mk diff --git a/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua index ed6f4f4da4..56221e043f 100644 --- a/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua +++ b/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua @@ -1,7 +1,10 @@ module("luci.controller.vpnbypass", package.seeall) function index() - if not nixio.fs.access("/etc/config/vpnbypass") then - return + if nixio.fs.access("/etc/config/vpnbypass") then + if luci.dispatcher.lookup("admin/vpn") then + entry({"admin", "vpn", "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass")) + else + entry({"admin", "services", "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass")) + end end - entry({"admin", "services", "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass")) end diff --git a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua index 6545154c2c..95971fab1b 100644 --- a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua +++ b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua @@ -1,18 +1,40 @@ -readmeURL = "https://github.com/openwrt/packages/blob/master/net/vpnbypass/files/README.md" +local readmeURL = "https://github.com/openwrt/packages/blob/master/net/vpnbypass/files/README.md" m = Map("vpnbypass", translate("VPN Bypass Settings")) -s = m:section(NamedSection, "config", "vpnbypass") - --- General options -e = s:option(Flag, "enabled", translate("Start VPNBypass service")) -e.rmempty = false -function e.write(self, section, value) - if value ~= "1" then - luci.sys.init.stop("vpnbypass") + +h = m:section(NamedSection, "config", "vpnbypass", translate("Service Status")) +local packageName = "vpnbypass" +local uci = require "luci.model.uci".cursor() +local sys = require "luci.sys" +local http = require "luci.http" +local dispatcher = require "luci.dispatcher" +en = h:option(Button, "__toggle") +if enabledFlag ~= "1" then + en.title = translate("Service is disabled/stopped") + en.inputtitle = translate("Enable/Start") + en.inputstyle = "apply important" +else + en.title = translate("Service is enabled/started") + en.inputtitle = translate("Stop/Disable") + en.inputstyle = "reset important" +end +function en.write() + enabledFlag = enabledFlag == "1" and "0" or "1" + uci:set(packageName, "config", "enabled", enabledFlag) + uci:save(packageName) + uci:commit(packageName) + if enabledFlag == "0" then + sys.init.stop(packageName) + sys.init.disable(packageName) + else + sys.init.enable(packageName) + sys.init.start(packageName) end - return Flag.write(self, section, value) + http.redirect(dispatcher.build_url("admin/services/" .. packageName)) end +s = m:section(NamedSection, "config", "vpnbypass", translate("VPN Bypass Rules")) + -- Local Ports p1 = s:option(DynamicList, "localport", translate("Local Ports to Bypass"), translate("Local ports to trigger VPN Bypass")) p1.datatype = "portrange" @@ -30,7 +52,7 @@ p2.optional = false -- Local Subnets r1 = s:option(DynamicList, "localsubnet", translate("Local IP Addresses to Bypass"), translate("Local IP addresses or subnets with direct internet access (outside of the VPN tunnel)")) r1.datatype = "ip4addr" --- r1.placeholder = luci.ip.new(m.uci:get("network", "lan", "ipaddr"), m.uci:get("network", "lan", "netmask")) +-- r1.placeholder = ip.new(m.uci:get("network", "lan", "ipaddr"), m.uci:get("network", "lan", "netmask")) r1.addremove = false r1.optional = false @@ -49,5 +71,8 @@ di = s4:option(DynamicList, "ipset", translate("Domains to Bypass"), translate("Domains to be accessed directly (outside of the VPN tunnel), see ") .. [[<a href="]] .. readmeURL .. [[#bypass-domains-formatsyntax" target="_blank">]] .. translate("README") .. [[</a> ]] .. translate("for syntax")) +function d.on_after_commit(map) + sys.init.restart("dnsmasq") +end return m, d diff --git a/applications/luci-app-vpnbypass/po/de/vpnbypass.po b/applications/luci-app-vpnbypass/po/de/vpnbypass.po index 635d9987cb..a686c32383 100644 --- a/applications/luci-app-vpnbypass/po/de/vpnbypass.po +++ b/applications/luci-app-vpnbypass/po/de/vpnbypass.po @@ -1,20 +1,24 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8\n" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70 msgid "Domains to Bypass" msgstr "Zu umgehende Domains" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71 msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgstr "" "Domains die direkt erreicht werden sollen (außerhalb des VPN Tunnel), siehe" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14 +msgid "Enable/Start" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53 msgid "Local IP Addresses to Bypass" msgstr "Zu umgehende lokale IP Adressen" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53 msgid "" "Local IP addresses or subnets with direct internet access (outside of the " "VPN tunnel)" @@ -22,23 +26,23 @@ msgstr "" "Lokale IP Adressen, oder Subnetze mit direktem Internet-Zugriff (außerhalb " "des VPN Tunnel)" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39 msgid "Local Ports to Bypass" msgstr "Zu umgehende Lokale Ports" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39 msgid "Local ports to trigger VPN Bypass" msgstr "Lokale Ports um VPN Bypass anzustoßen" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73 msgid "README" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60 msgid "Remote IP Addresses to Bypass" msgstr "Zu umgehende entfernte IP Adressen" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60 msgid "" "Remote IP addresses or subnets which will be accessed directly (outside of " "the VPN tunnel)" @@ -46,26 +50,46 @@ msgstr "" "Entfernte IP Adressen, oder Subnetze mit direktem Internet-Zugriff " "(außerhalb des VPN Tunnel)" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46 msgid "Remote Ports to Bypass" msgstr "Zu umgehende entfernte Ports" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46 msgid "Remote ports to trigger VPN Bypass" msgstr "Enfernte Ports um VPN Bypass anzustßen" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7 -msgid "Start VPNBypass service" -msgstr "Starte VPNBypass service" +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5 +msgid "Service Status" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13 +msgid "Service is disabled/stopped" +msgstr "" -#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +msgid "Service is enabled/started" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18 +msgid "Stop/Disable" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5 +#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7 msgid "VPN Bypass" msgstr "" +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36 +msgid "VPN Bypass Rules" +msgstr "" + #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3 msgid "VPN Bypass Settings" msgstr "VPN Bypass Einstellungen" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73 msgid "for syntax" msgstr "für Syntax" + +#~ msgid "Start VPNBypass service" +#~ msgstr "Starte VPNBypass service" diff --git a/applications/luci-app-vpnbypass/po/es/vpnbypass.po b/applications/luci-app-vpnbypass/po/es/vpnbypass.po index 9fdbcacb5b..ad077f0b7f 100644 --- a/applications/luci-app-vpnbypass/po/es/vpnbypass.po +++ b/applications/luci-app-vpnbypass/po/es/vpnbypass.po @@ -3,30 +3,34 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: \n" +"PO-Revision-Date: 2019-09-17 22:51-0300\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.1\n" -"Last-Translator: \n" +"X-Generator: Poedit 2.2.3\n" +"Last-Translator: Franco Castillo <castillofrancodamin@gmail.com>\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "Language: es\n" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70 msgid "Domains to Bypass" msgstr "Dominios a omitir" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71 msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgstr "" "Dominios a los que se puede acceder directamente (fuera del túnel VPN), " "consulte" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14 +msgid "Enable/Start" +msgstr "Habilitar/Iniciar" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53 msgid "Local IP Addresses to Bypass" msgstr "Direcciones IP locales para omitir" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53 msgid "" "Local IP addresses or subnets with direct internet access (outside of the " "VPN tunnel)" @@ -34,23 +38,23 @@ msgstr "" "Direcciones IP o subredes locales con acceso directo a Internet (fuera del " "túnel VPN)" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39 msgid "Local Ports to Bypass" msgstr "Puertos locales para evitar" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39 msgid "Local ports to trigger VPN Bypass" msgstr "Puertos locales para activar VPN Bypass" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73 msgid "README" msgstr "LÉEME" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60 msgid "Remote IP Addresses to Bypass" msgstr "Direcciones IP remotas para omitir" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60 msgid "" "Remote IP addresses or subnets which will be accessed directly (outside of " "the VPN tunnel)" @@ -58,26 +62,46 @@ msgstr "" "Direcciones IP remotas o subredes a las que se accederá directamente (fuera " "del túnel VPN)" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46 msgid "Remote Ports to Bypass" msgstr "Puertos remotos para omitir" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46 msgid "Remote ports to trigger VPN Bypass" msgstr "Puertos remotos para activar VPN Bypass" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7 -msgid "Start VPNBypass service" -msgstr "Iniciar el servicio VPNBypass" +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5 +msgid "Service Status" +msgstr "Estado del servicio" -#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13 +msgid "Service is disabled/stopped" +msgstr "El servicio está deshabilitado/detenido" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +msgid "Service is enabled/started" +msgstr "El servicio está habilitado/iniciado" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18 +msgid "Stop/Disable" +msgstr "Detener/Deshabilitar" + +#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5 +#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7 msgid "VPN Bypass" msgstr "VPN Bypass" +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36 +msgid "VPN Bypass Rules" +msgstr "Reglas de VPN Bypass" + #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3 msgid "VPN Bypass Settings" msgstr "Configuración de VPN Bypass" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73 msgid "for syntax" msgstr "para la sintaxis" + +#~ msgid "Start VPNBypass service" +#~ msgstr "Iniciar el servicio VPNBypass" diff --git a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po index da254e53bd..ba4cc890a9 100644 --- a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po +++ b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po @@ -12,42 +12,46 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "Language: pt_BR\n" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70 msgid "Domains to Bypass" msgstr "Domínios para evitar a VPN" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71 msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgstr "Domínios para serem acessados diretamente (fora do túnel VPN), veja" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14 +msgid "Enable/Start" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53 msgid "Local IP Addresses to Bypass" msgstr "Endereço IP Local para Contornar" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53 msgid "" "Local IP addresses or subnets with direct internet access (outside of the " "VPN tunnel)" msgstr "" "Endereço IP Local ou subrede com acesso direto à internet (fora do túnel VPN)" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39 msgid "Local Ports to Bypass" msgstr "Portas locais para evitar a VPN" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39 msgid "Local ports to trigger VPN Bypass" msgstr "Portas locais para disparar o VPN Bypass" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73 msgid "README" msgstr "LEIAME" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60 msgid "Remote IP Addresses to Bypass" msgstr "Endereço IP Remoto para Contornar" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60 msgid "" "Remote IP addresses or subnets which will be accessed directly (outside of " "the VPN tunnel)" @@ -55,30 +59,50 @@ msgstr "" "Endereço IP Remoto ou subrede que serão acessados diretamente (fora do túnel " "VPN)" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46 msgid "Remote Ports to Bypass" msgstr "Portas remotas para evitar a VPN" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46 msgid "Remote ports to trigger VPN Bypass" msgstr "Portas remotas para disparar o VPN Bypass" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7 -msgid "Start VPNBypass service" -msgstr "Inicie o serviço VPNBypass" +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5 +msgid "Service Status" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13 +msgid "Service is disabled/stopped" +msgstr "" -#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +msgid "Service is enabled/started" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18 +msgid "Stop/Disable" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5 +#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7 msgid "VPN Bypass" msgstr "VPN Bypass" +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36 +msgid "VPN Bypass Rules" +msgstr "" + #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3 msgid "VPN Bypass Settings" msgstr "Configurações do VPN Bypass" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73 msgid "for syntax" msgstr "para sintaxe" +#~ msgid "Start VPNBypass service" +#~ msgstr "Inicie o serviço VPNBypass" + #~ msgid "Enable VPN Bypass" #~ msgstr "Habilitar o VPN Bypass" diff --git a/applications/luci-app-vpnbypass/po/ru/vpnbypass.po b/applications/luci-app-vpnbypass/po/ru/vpnbypass.po index e924cfe50a..eca6fec324 100644 --- a/applications/luci-app-vpnbypass/po/ru/vpnbypass.po +++ b/applications/luci-app-vpnbypass/po/ru/vpnbypass.po @@ -15,19 +15,23 @@ msgstr "" "Project-Info: Это технический перевод, не дословный. Главное-удобный русский " "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70 msgid "Domains to Bypass" msgstr "Домены, для<br />обхода блокировки" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71 msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgstr "Домены должны быть доступны напрямую (вне VPN-туннеля), см." -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14 +msgid "Enable/Start" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53 msgid "Local IP Addresses to Bypass" msgstr "Локальный IP-адрес<br />обхода VPN" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53 msgid "" "Local IP addresses or subnets with direct internet access (outside of the " "VPN tunnel)" @@ -35,23 +39,23 @@ msgstr "" "Локальные IP-адреса или подсети с прямым доступом в интернет (вне VPN-" "туннеля)." -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39 msgid "Local Ports to Bypass" msgstr "Локальные порты для запуска обхода VPN" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39 msgid "Local ports to trigger VPN Bypass" msgstr "Локальные порты<br />для обхода VPN" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73 msgid "README" msgstr "Описание" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60 msgid "Remote IP Addresses to Bypass" msgstr "Удаленные IP-адреса<br />обхода VPN" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60 msgid "" "Remote IP addresses or subnets which will be accessed directly (outside of " "the VPN tunnel)" @@ -59,27 +63,44 @@ msgstr "" "Удаленные IP-адреса или подсети, которые будут доступны напрямую (вне " "туннеля VPN)." -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46 msgid "Remote Ports to Bypass" msgstr "Удаленные порты<br />для обхода VPN" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46 msgid "Remote ports to trigger VPN Bypass" msgstr "Удаленные порты для запуска обхода VPN" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7 -msgid "Start VPNBypass service" +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5 +msgid "Service Status" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13 +msgid "Service is disabled/stopped" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +msgid "Service is enabled/started" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18 +msgid "Stop/Disable" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5 +#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7 msgid "VPN Bypass" msgstr "Обход VPN" +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36 +msgid "VPN Bypass Rules" +msgstr "" + #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3 msgid "VPN Bypass Settings" msgstr "Настройка обхода VPN" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73 msgid "for syntax" msgstr "для синтаксиса" diff --git a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot index 7a9b05327d..06b01d4053 100644 --- a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot +++ b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot @@ -1,66 +1,87 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70 msgid "Domains to Bypass" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71 msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14 +msgid "Enable/Start" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53 msgid "Local IP Addresses to Bypass" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53 msgid "" "Local IP addresses or subnets with direct internet access (outside of the " "VPN tunnel)" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39 msgid "Local Ports to Bypass" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39 msgid "Local ports to trigger VPN Bypass" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73 msgid "README" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60 msgid "Remote IP Addresses to Bypass" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60 msgid "" "Remote IP addresses or subnets which will be accessed directly (outside of " "the VPN tunnel)" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46 msgid "Remote Ports to Bypass" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46 msgid "Remote ports to trigger VPN Bypass" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7 -msgid "Start VPNBypass service" +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5 +msgid "Service Status" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13 +msgid "Service is disabled/stopped" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +msgid "Service is enabled/started" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18 +msgid "Stop/Disable" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5 +#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7 msgid "VPN Bypass" msgstr "" +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36 +msgid "VPN Bypass Rules" +msgstr "" + #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3 msgid "VPN Bypass Settings" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73 msgid "for syntax" msgstr "" diff --git a/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po b/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po index 3003cf3827..a986ee2416 100644 --- a/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po +++ b/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po @@ -11,69 +11,93 @@ msgstr "" "PO-Revision-Date: 2018-08-07 20:19+0800\n" "X-Generator: Gtranslator 2.91.7\n" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70 msgid "Domains to Bypass" msgstr "要绕过的域" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71 msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgstr "要直接访问的域（不使用 VPN 隧道），请参见" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14 +msgid "Enable/Start" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53 msgid "Local IP Addresses to Bypass" msgstr "要绕过的本地 IP 地址" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53 msgid "" "Local IP addresses or subnets with direct internet access (outside of the " "VPN tunnel)" msgstr "直接访问的本地 IP 地址或子网（不使用 VPN 隧道）" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39 msgid "Local Ports to Bypass" msgstr "要绕过的本地端口" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39 msgid "Local ports to trigger VPN Bypass" msgstr "触发 VPN 绕过的本地端口" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73 msgid "README" msgstr "README" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60 msgid "Remote IP Addresses to Bypass" msgstr "要绕过的远程 IP 地址" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60 msgid "" "Remote IP addresses or subnets which will be accessed directly (outside of " "the VPN tunnel)" msgstr "将直接访问的远程 IP 地址或子网（不使用 VPN 隧道）" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46 msgid "Remote Ports to Bypass" msgstr "要绕过的远程端口" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46 msgid "Remote ports to trigger VPN Bypass" msgstr "触发 VPN 绕过的远程端口" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7 -msgid "Start VPNBypass service" -msgstr "启动 VPNBypass 服务" +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5 +msgid "Service Status" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13 +msgid "Service is disabled/stopped" +msgstr "" -#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +msgid "Service is enabled/started" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18 +msgid "Stop/Disable" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5 +#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7 msgid "VPN Bypass" msgstr "VPN 绕过" +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36 +msgid "VPN Bypass Rules" +msgstr "" + #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3 msgid "VPN Bypass Settings" msgstr "VPN 绕过设置" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73 msgid "for syntax" msgstr "对于语法" +#~ msgid "Start VPNBypass service" +#~ msgstr "启动 VPNBypass 服务" + #~ msgid "Enable/start service" #~ msgstr "启用/启动服务" diff --git a/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po b/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po index 1d43363fca..971d5e4ede 100644 --- a/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po +++ b/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po @@ -11,67 +11,88 @@ msgstr "" "PO-Revision-Date: 2017-10-29 15:30+0800\n" "X-Generator: Gtranslator 2.91.7\n" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70 msgid "Domains to Bypass" msgstr "要繞過的域" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71 msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgstr "要直接訪問的域（不使用 VPN 隧道），請參見" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14 +msgid "Enable/Start" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53 msgid "Local IP Addresses to Bypass" msgstr "要繞過的本地 IP 位址" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53 msgid "" "Local IP addresses or subnets with direct internet access (outside of the " "VPN tunnel)" msgstr "直接訪問的本地 IP 位址或子網（不使用 VPN 隧道）" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39 msgid "Local Ports to Bypass" msgstr "要繞過的本地埠" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39 msgid "Local ports to trigger VPN Bypass" msgstr "觸發 VPN 繞過的本地埠" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73 msgid "README" msgstr "README" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60 msgid "Remote IP Addresses to Bypass" msgstr "要繞過的遠端 IP 位址" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60 msgid "" "Remote IP addresses or subnets which will be accessed directly (outside of " "the VPN tunnel)" msgstr "將直接訪問的遠端 IP 位址或子網（不使用 VPN 隧道）" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46 msgid "Remote Ports to Bypass" msgstr "要繞過的遠端埠" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46 msgid "Remote ports to trigger VPN Bypass" msgstr "觸發 VPN 繞過的遠端埠" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7 -msgid "Start VPNBypass service" +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5 +msgid "Service Status" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13 +msgid "Service is disabled/stopped" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17 +msgid "Service is enabled/started" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18 +msgid "Stop/Disable" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5 +#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7 msgid "VPN Bypass" msgstr "VPN 繞過" +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36 +msgid "VPN Bypass Rules" +msgstr "" + #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3 msgid "VPN Bypass Settings" msgstr "VPN 繞過設定" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73 msgid "for syntax" msgstr "對於語法" |