Merge branch 'master' into weblate-openwrt-luci

1 files changed, 23 insertions, 19 deletions

diff --git a/applications/luci-app-travelmate/po/uk/travelmate.po b/applications/luci-app-travelmate/po/uk/travelmate.po
index e996e69a61..87a2310ab4 100644
--- a/applications/luci-app-travelmate/po/uk/travelmate.po
+++ b/applications/luci-app-travelmate/po/uk/travelmate.po
@@ -16,7 +16,7 @@ msgid "AP on"
 msgstr ""
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:113
-#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:38
+#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:45
 msgid "Action"
 msgstr "Дія"
 
@@ -24,7 +24,7 @@ msgstr "Дія"
 msgid "Add Open Uplinks"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:68
+#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:75
 msgid "Add Uplink"
 msgstr ""
 
@@ -37,7 +37,7 @@ msgid ""
 "Additional trigger delay in seconds before travelmate processing begins."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:21
+#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:25
 msgid "Advanced"
 msgstr "Додатково"
 
@@ -78,7 +78,7 @@ msgstr "BSSID"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:15
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:12
-#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:77
+#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:84
 msgid "Back to overview"
 msgstr ""
 
@@ -139,19 +139,19 @@ msgstr "Метод EAP"
 msgid "Edit"
 msgstr "Редагувати"
 
-#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:25
+#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:29
 msgid "Edit Firewall Configuration"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:24
+#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:28
 msgid "Edit Network Configuration"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:22
+#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:26
 msgid "Edit Travelmate Configuration"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:23
+#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:27
 msgid "Edit Wireless Configuration"
 msgstr ""
 
@@ -178,7 +178,7 @@ msgstr ""
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:54
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:116
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:112
-#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:36
+#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:43
 msgid "Encryption"
 msgstr "Шифрування"
 
@@ -232,6 +232,10 @@ msgstr "Примусово TKIP"
 msgid "Force TKIP and CCMP (AES)"
 msgstr "Примусово TKIP та CCMP (AES)"
 
+#: applications/luci-app-travelmate/root/usr/share/rpcd/acl.d/luci-app-travelmate.json:3
+msgid "Grant UCI access for luci-app-travelmate"
+msgstr ""
+
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
 msgid ""
 "How long should travelmate wait for a successful wlan uplink connection."
@@ -313,7 +317,7 @@ msgstr ""
 msgid "Overall retry timeout in seconds."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:18
+#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:22
 msgid "Overview"
 msgstr "Огляд"
 
@@ -377,7 +381,7 @@ msgstr "Видалити"
 msgid "Remove this Uplink"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:82
+#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:89
 msgid "Repeat scan"
 msgstr ""
 
@@ -439,7 +443,7 @@ msgstr ""
 msgid "Signal Quality Threshold"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:37
+#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:44
 msgid "Signal strength"
 msgstr ""
 
@@ -495,7 +499,7 @@ msgstr ""
 msgid "This step has only to be done once."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:17
+#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:18
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:13
 msgid "Travelmate"
 msgstr ""
@@ -524,11 +528,11 @@ msgstr ""
 msgid "Uplink / Trigger interface"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:35
+#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:42
 msgid "Uplink BSSID"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:34
+#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:41
 msgid "Uplink SSID"
 msgstr ""
 
@@ -536,7 +540,7 @@ msgstr ""
 msgid "View AP QR-Codes"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:20
+#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:24
 msgid "View Logfile"
 msgstr "Переглянути файл звіту"
 
@@ -552,11 +556,11 @@ msgstr ""
 msgid "WPA-Passphrase"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:30
+#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:37
 msgid "Wireless Scan"
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:19
+#: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:23
 msgid "Wireless Stations"
 msgstr ""
 
@@ -564,7 +568,7 @@ msgstr ""
 msgid "add it to the wan zone of the firewall."
 msgstr ""
 
-#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:43
+#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:50
 msgid "hidden"
 msgstr "приховано"