luci-app-advanced-reboot & luci-app-vpnbypass: fix uci require for master

Signed-off-by: Stan Grishin <stangri@melmac.net>

6 files changed, 20 insertions, 24 deletions

diff --git a/applications/luci-app-vpnbypass/Makefile b/applications/luci-app-vpnbypass/Makefile
index 838840e6b..f426acc53 100644
--- a/applications/luci-app-vpnbypass/Makefile
+++ b/applications/luci-app-vpnbypass/Makefile
@@ -10,7 +10,7 @@ LUCI_TITLE:=VPN Bypass Web UI
 LUCI_DESCRIPTION:=Provides Web UI for VPNBypass service.
 LUCI_DEPENDS:=+luci +vpnbypass
 LUCI_PKGARCH:=all
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 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 9d2f5f425..18fbeaaf4 100644
--- a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
+++ b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
@@ -1,5 +1,7 @@
 readmeURL = "https://github.com/openwrt/packages/blob/master/net/vpnbypass/files/README.md"
 
+uci = require "uci"
+
 m = Map("vpnbypass", translate("VPN Bypass Settings"))
 s = m:section(NamedSection, "config", "vpnbypass")
 
diff --git a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
index 4fa07f999..9f3fa2a67 100644
--- a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
@@ -18,6 +18,9 @@ msgstr "Domínios para evitar a VPN"
 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 ""
 
@@ -49,9 +52,6 @@ msgstr "Portas remotas para evitar a VPN"
 msgid "Remote ports to trigger VPN Bypass"
 msgstr "Portas remotas para disparar o VPN Bypass"
 
-msgid "Start VPNBypass service"
-msgstr ""
-
 msgid "VPN Bypass"
 msgstr "VPN Bypass"
 
diff --git a/applications/luci-app-vpnbypass/po/ru/vpnbypass.po b/applications/luci-app-vpnbypass/po/ru/vpnbypass.po
index 05e21935a..96cbb3fb2 100644
--- a/applications/luci-app-vpnbypass/po/ru/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/ru/vpnbypass.po
@@ -21,6 +21,9 @@ msgstr "Домены, для<br />обхода блокировки"
 msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
 msgstr "Домены должны быть доступны напрямую (вне VPN-туннеля), см."
 
+msgid "Enable/start service"
+msgstr "Включение / Запуск сервиса"
+
 msgid "Local IP Addresses to Bypass"
 msgstr "Локальный IP-адрес<br />обхода VPN"
 
@@ -28,14 +31,14 @@ msgid ""
 "Local IP addresses or subnets with direct internet access (outside of the "
 "VPN tunnel)"
 msgstr ""
-"Локальные IP-адреса или подсети с прямым доступом в Интернет (вне VPN-"
+"Локальные IP-адреса или подсети с прямым доступом в интернет (вне VPN-"
 "туннеля)."
 
 msgid "Local Ports to Bypass"
-msgstr "Локальные порты<br />для обхода VPN"
+msgstr "Локальные порты для запуска обхода VPN"
 
 msgid "Local ports to trigger VPN Bypass"
-msgstr "Локальные порты для запуска обхода VPN."
+msgstr "Локальные порты<br />для обхода VPN"
 
 msgid "README"
 msgstr "Описание"
@@ -54,10 +57,7 @@ msgid "Remote Ports to Bypass"
 msgstr "Удаленные порты<br />для обхода VPN"
 
 msgid "Remote ports to trigger VPN Bypass"
-msgstr "Удаленные порты для запуска обхода VPN."
-
-msgid "Start VPNBypass service"
-msgstr "Запуск сервиса VPNBypass"
+msgstr "Удаленные порты для запуска обхода VPN"
 
 msgid "VPN Bypass"
 msgstr "Обход VPN"
@@ -66,4 +66,4 @@ msgid "VPN Bypass Settings"
 msgstr "Настройка обхода VPN"
 
 msgid "for syntax"
-msgstr "для синтаксиса."
+msgstr "для синтаксиса"
diff --git a/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po b/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po
index 72c55a6c8..a1539171f 100644
--- a/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po
@@ -17,6 +17,9 @@ msgstr "要绕过的域"
 msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
 msgstr "要直接访问的域（不使用 VPN 隧道），请参见"
 
+msgid "Enable/start service"
+msgstr "启用/启动服务"
+
 msgid "Local IP Addresses to Bypass"
 msgstr "要绕过的本地 IP 地址"
 
@@ -48,9 +51,6 @@ msgstr "要绕过的远程端口"
 msgid "Remote ports to trigger VPN Bypass"
 msgstr "触发 VPN 绕过的远程端口"
 
-msgid "Start VPNBypass service"
-msgstr ""
-
 msgid "VPN Bypass"
 msgstr "VPN 绕过"
 
@@ -59,6 +59,3 @@ msgstr "VPN 绕过设置"
 
 msgid "for syntax"
 msgstr "对于语法"
-
-#~ 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 9eb381211..90ba85f7c 100644
--- a/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po
@@ -17,6 +17,9 @@ msgstr "要繞過的域"
 msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
 msgstr "要直接訪問的域（不使用 VPN 隧道），請參見"
 
+msgid "Enable/start service"
+msgstr "啟用/啟動服務"
+
 msgid "Local IP Addresses to Bypass"
 msgstr "要繞過的本地 IP 位址"
 
@@ -48,9 +51,6 @@ msgstr "要繞過的遠端埠"
 msgid "Remote ports to trigger VPN Bypass"
 msgstr "觸發 VPN 繞過的遠端埠"
 
-msgid "Start VPNBypass service"
-msgstr ""
-
 msgid "VPN Bypass"
 msgstr "VPN 繞過"
 
@@ -59,6 +59,3 @@ msgstr "VPN 繞過設定"
 
 msgid "for syntax"
 msgstr "對於語法"
-
-#~ msgid "Enable/start service"
-#~ msgstr "啟用/啟動服務"