From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 13 Jul 2018 15:02:22 +0000 (+0200)
Subject: openwrt-18.06: merge master
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fb817df836ccfc404b09d4913d9b73528532f134;p=oweals%2Fluci.git

openwrt-18.06: merge master

Due to a huge number of fixes and diverging development histories, I decided
to completely merge the current LuCI master into the 18.06 release branch to
have a common code base for upcoming maintenance releases.

Some LuCI apps have minor style glitches yet but I do not deem them to be
release critical as non-default components need to be opkg-installed anyway
and the package repositories are continuously refreshed, so we do not need
to fix everything for OpenWrt 18.06.0-rc2.

The most important changes introduced by this merge are:

1) New HTTP handling library in C

  The new library should vastly reduce the required RAM for processing
  large POST bodies while implementing some slightly more strict parsing
  logic.

2) Apply/Rollback workflow

  The ubus rpcd based apply/rollback handling will automatically revert
  config changes if access to the device is lost for a certain period
  of time, this is mainly intended for preventing issues with bad
  config settings and the like.

  The feature is not 100% error-proof yet but it successfully prevents a
  large number of issues already. For final, the handling of the firewall
  conntrack cache needs to be fixed yet as adding "lockout" firewall rules
  is not yet catched due to the open HTTP session allowed by netfilter
  conntrack

3) Template markup and theme style modifications

  A large number of changes have been made to the markup in the various
  templates, mainly to allow for responsive styling of tables.

  The only theme currently making full use of that is the non-default
  OpenWrt theme which will break table rows into disjunct boxes on
  very narrow screens.

  The changes have been tested on IE 11, MS Edge, Firefox, Chrome, an
  iPhone 5s, iPhone 6 and iPad Air.

4) Initial LuCI support for displaying virtual dynamic network interfaces

  Some protocol handlers will spawn purely dynamic sub-interfaces which
  are not present in UCI. Such interfaces have been invisible in LuCI so
  far which caused confusion especialy wrt. missing IP addresses etc.

  LuCI will now display such dynamic interfaces on the interface overview.

5) Initial LuCI support for display interface runtime error information

  LuCI will now expose interface error information stored in the ubus
  runtime information by protocol handlers.

  This is mainly useful to get notified of low level problems like
  bad SIM codes are missing APN information.

6) Various XSS and CSRF bypass fixes

  A number of code places performing inadequate markup escaping have been
  fixed and the dispatcher CSRF token enforcement rules have been reworked
  to actually catch all POST security cases.

7) Initial support for running under nginx

  Various bugs have been fixed to allow LuCI to function under nginx using
  a FastCGI wrapper.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

fb817df836ccfc404b09d4913d9b73528532f134
diff --cc applications/luci-app-adblock/po/it/adblock.po
index a9a06ac99,c2db36eff..df338483a
--- a/applications/luci-app-adblock/po/it/adblock.po
+++ b/applications/luci-app-adblock/po/it/adblock.po
@@@ -49,12 -52,12 +49,10 @@@ msgstr "
  msgid "Blocklist Sources"
  msgstr "Fonti lista di Blocco"
  
- msgid ""
- "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
- "domains except those listed in the whitelist file.<br />"
+ msgid "Blocklist not found!"
  msgstr ""
  
 -msgid ""
 -"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
 -"domains except those listed in the whitelist file.<br />"
 +msgid "Categories"
  msgstr ""
  
  msgid ""
diff --cc applications/luci-app-adblock/po/pt-br/adblock.po
index 2ce6d803e,07d0f9a8d..e11143b5e
--- a/applications/luci-app-adblock/po/pt-br/adblock.po
+++ b/applications/luci-app-adblock/po/pt-br/adblock.po
@@@ -52,12 -55,12 +52,10 @@@ msgstr "
  msgid "Blocklist Sources"
  msgstr "Fontes de listas de bloqueio"
  
- msgid ""
- "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
- "domains except those listed in the whitelist file.<br />"
+ msgid "Blocklist not found!"
  msgstr ""
  
 -msgid ""
 -"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
 -"domains except those listed in the whitelist file.<br />"
 +msgid "Categories"
  msgstr ""
  
  msgid ""
diff --cc applications/luci-app-adblock/po/sv/adblock.po
index 3c5eeee94,4a7ca4b73..7dc710e9e
--- a/applications/luci-app-adblock/po/sv/adblock.po
+++ b/applications/luci-app-adblock/po/sv/adblock.po
@@@ -39,12 -42,12 +39,10 @@@ msgstr "
  msgid "Blocklist Sources"
  msgstr "Källor för blockeringslistor"
  
- msgid ""
- "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
- "domains except those listed in the whitelist file.<br />"
+ msgid "Blocklist not found!"
  msgstr ""
  
 -msgid ""
 -"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
 -"domains except those listed in the whitelist file.<br />"
 +msgid "Categories"
  msgstr ""
  
  msgid ""
diff --cc applications/luci-app-adblock/po/templates/adblock.pot
index c26547d4f,a375d0edb..b1bbe60b1
--- a/applications/luci-app-adblock/po/templates/adblock.pot
+++ b/applications/luci-app-adblock/po/templates/adblock.pot
@@@ -39,12 -42,12 +39,10 @@@ msgstr "
  msgid "Blocklist Sources"
  msgstr ""
  
- msgid ""
- "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
- "domains except those listed in the whitelist file.<br />"
+ msgid "Blocklist not found!"
  msgstr ""
  
 -msgid ""
 -"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
 -"domains except those listed in the whitelist file.<br />"
 +msgid "Categories"
  msgstr ""
  
  msgid ""
diff --cc applications/luci-app-adblock/po/zh-cn/adblock.po
index 2169cd180,408d04055..d0a5e5b07
--- a/applications/luci-app-adblock/po/zh-cn/adblock.po
+++ b/applications/luci-app-adblock/po/zh-cn/adblock.po
@@@ -53,12 -57,12 +53,10 @@@ msgstr "备份模式
  msgid "Blocklist Sources"
  msgstr "拦截列表来源"
  
- msgid ""
- "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
- "domains except those listed in the whitelist file.<br />"
+ msgid "Blocklist not found!"
  msgstr ""
  
 -msgid ""
 -"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
 -"domains except those listed in the whitelist file.<br />"
 +msgid "Categories"
  msgstr ""
  
  msgid ""
@@@ -350,12 -365,18 +358,23 @@@ msgid "paused
  msgstr "已暂停"
  
  msgid "running"
- msgstr ""
+ msgstr "运行中"
+ 
+ #~ msgid "Invalid domain specified!"
+ #~ msgstr "无效域名！"
+ 
+ #~ msgid "Available blocklist sources."
+ #~ msgstr "可用的 blocklist 来源。"
+ 
+ #~ msgid ""
+ #~ "List URLs and Shallalist category selections are configurable in the "
+ #~ "'Advanced' section.<br />"
+ #~ msgstr "列表 URL 和 Shallalist 类别选择可在“高级”选项卡中配置。<br />"
  
 -#~ msgid "The file size is too large for online editing in LuCI (&gt; 512 KB)."
 -#~ msgstr "文件大小太大，无法在 LuCI（&gt; 512 KB）中进行在线编辑。"
 +#~ msgid "Available blocklist sources."
 +#~ msgstr "可用的 blocklist 来源。"
 +
 +#~ msgid ""
 +#~ "List URLs and Shallalist category selections are configurable in the "
 +#~ "'Advanced' section.<br />"
 +#~ msgstr "列表 URL 和 Shallalist 类别选择可在“高级”选项卡中配置。<br />"
diff --cc applications/luci-app-adblock/po/zh-tw/adblock.po
index e5a35ad0b,45b19cdc8..e94d85158
--- a/applications/luci-app-adblock/po/zh-tw/adblock.po
+++ b/applications/luci-app-adblock/po/zh-tw/adblock.po
@@@ -53,12 -56,12 +53,10 @@@ msgstr "
  msgid "Blocklist Sources"
  msgstr "攔截列表來源"
  
- msgid ""
- "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
- "domains except those listed in the whitelist file.<br />"
+ msgid "Blocklist not found!"
  msgstr ""
  
 -msgid ""
 -"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
 -"domains except those listed in the whitelist file.<br />"
 +msgid "Categories"
  msgstr ""
  
  msgid ""
diff --cc applications/luci-app-ddns/Makefile
index bd6ddeb1b,729518951..6ac1885ba
--- a/applications/luci-app-ddns/Makefile
+++ b/applications/luci-app-ddns/Makefile
@@@ -16,10 -16,11 +16,11 @@@ PKG_VERSION:=2.4.
  
  # Release == build
  # increase on changes of translation files
 -PKG_RELEASE:=5
 +PKG_RELEASE:=3
  
  PKG_LICENSE:=Apache-2.0
- PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>
+ PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>, \
+ 				Ansuel Smith <ansuelsmth@gmail.com>
  
  # LuCI specific settings
  LUCI_TITLE:=LuCI Support for Dynamic DNS Client (ddns-scripts)
diff --cc applications/luci-app-firewall/po/uk/firewall.po
index 86ff65edf,0ed90d9fc..d127f871a
--- a/applications/luci-app-firewall/po/uk/firewall.po
+++ b/applications/luci-app-firewall/po/uk/firewall.po
@@@ -182,16 -199,16 +199,16 @@@ msgid "General Settings
  msgstr "Загальні настройки"
  
  msgid "Hardware flow offloading"
 -msgstr "Апаратні засоби розвантаження потоку"
 +msgstr ""
  
  msgid "IP"
- msgstr ""
+ msgstr "IP-адреса"
  
  msgid "IP range"
- msgstr ""
+ msgstr "Діапазон IP"
  
  msgid "IPs"
- msgstr ""
+ msgstr "IP-адреси"
  
  msgid "IPv4"
  msgstr "IPv4"
@@@ -338,16 -358,19 +358,22 @@@ msgid "Redirect matched incoming traffi
  msgstr "Переспрямувати відповідний вхідний трафік на заданий внутрішній вузол"
  
  msgid "Refuse forward"
- msgstr ""
+ msgstr "Відхиляти переспрямовування"
  
  msgid "Refuse input"
- msgstr ""
+ msgstr "Відхиляти вхідний"
+ 
+ msgid "Refuse output"
+ msgstr "Відхиляти вихідний"
+ 
+ msgid "Requires hardware NAT support. Implemented at least for mt7621"
+ msgstr "Необхідна апаратна підтримка NAT. Впроваджено принаймні для mt7621"
  
 +msgid "Requires hardware NAT support. Implemented at least for mt7621"
 +msgstr ""
 +
  msgid "Restart Firewall"
- msgstr ""
+ msgstr "Перезавантажити брандмауер"
  
  msgid "Restrict Masquerading to given destination subnets"
  msgstr "Обмежити підміну заданими підмережами призначення"
@@@ -369,19 -392,19 +395,22 @@@ msgstr "
  "порожнім, щоб переписувати тільки IP-адресу."
  
  msgid "Rewrite to source %s"
- msgstr "перезапис на вихідний %s"
+ msgstr "перезапис на джерело %s"
  
  msgid "Rewrite to source %s, %s"
- msgstr "перезапис на вихідний %s, %s"
+ msgstr "перезапис на джерело %s, %s"
+ 
+ msgid "Routing/NAT Offloading"
+ msgstr "Розвантаження маршрутизації/NAT"
  
 +msgid "Routing/NAT Offloading"
 +msgstr ""
 +
  msgid "Rule is disabled"
- msgstr ""
+ msgstr "Правило вимкнено"
  
  msgid "Rule is enabled"
- msgstr ""
+ msgstr "Правило ввімкнено"
  
  msgid "SNAT IP address"
  msgstr "IP-адреса SNAT"
@@@ -390,14 -413,14 +419,20 @@@ msgid "SNAT port
  msgstr "Порт SNAT"
  
  msgid "Saturday"
- msgstr ""
+ msgstr "Субота"
+ 
+ msgid "Software based offloading for routing/NAT"
+ msgstr "Програмне розвантаження для маршрутизації/NAT"
+ 
+ msgid "Software flow offloading"
+ msgstr "Програмне розвантаження потоку"
  
 +msgid "Software based offloading for routing/NAT"
 +msgstr ""
 +
 +msgid "Software flow offloading"
 +msgstr ""
 +
  msgid "Source IP address"
  msgstr "IP-адреса джерела"
  
diff --cc applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
index 75e52aeb2,74542a9ca..7a696445f
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
@@@ -40,20 -41,18 +41,20 @@@ This is free software, licensed under t
          style = "text-align:left;color:#0069d6;font-weight:bold"
        end
  %>
 -    <div class="tr cbi-section-table-row cbi-rowstyle-1" style="<%=style%>">
 -      <div class="td" style="<%=style%>"><%=device%></div>
 -      <div class="td" style="<%=style%>"><%=ssid%></div>
 -      <div class="td" style="<%=style%>"><%=bssid%></div>
 -      <div class="td" style="<%=style%>"><%=encryption%></div>
 -      <div class="td cbi-section-actions">
 -        <input class="cbi-button cbi-button-up" type="button" value="<%:Up%>" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&amp;dir=up'" alt="<%:Move up%>" title="<%:Move up%>"/>
 -        <input class="cbi-button cbi-button-down" type="button" value="<%:Down%>" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&amp;dir=down'" alt="<%:Move down%>" title="<%:Move down%>"/>
 +    <tr class="cbi-section-table-row cbi-rowstyle-1" style="<%=style%>">
 +      <td style="<%=style%>"><%=device%></td>
 +      <td style="<%=style%>"><%=ssid%></td>
 +      <td style="<%=style%>"><%=bssid%></td>
 +      <td style="<%=style%>"><%=encryption%></td>
 +      <td class="cbi-value-field" style="width:80px">
 +        <input class="cbi-button cbi-button-up" type="button" value="" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&amp;dir=up'" alt="<%:Move up%>" title="<%:Move up%>"/>
 +        <input class="cbi-button cbi-button-down" type="button" value="" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>&amp;dir=down'" alt="<%:Move down%>" title="<%:Move down%>"/>
 +      </td>
 +      <td class="cbi-value-field" style="width:150px">
          <input type="button" class="cbi-button cbi-button-edit" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiedit')%>?cfg=<%=section%>'" title="<%:Edit this Uplink%>" value="<%:Edit%>"/>
          <input type="button" class="cbi-button cbi-button-remove" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifidelete')%>?cfg=<%=section%>'" title="<%:Delete this Uplink%>" value="<%:Delete%>"/>
-       </td>
-     </tr>
+       </div>
+     </div>
  <%
      end
    end)
diff --cc modules/luci-base/po/ko/base.po
index b985dc6d7,e598e15a4..1b37b3829
--- a/modules/luci-base/po/ko/base.po
+++ b/modules/luci-base/po/ko/base.po
@@@ -1431,12 -1497,12 +1494,9 @@@ msgstr "IPv6 설정
  msgid "IPv6 ULA-Prefix"
  msgstr ""
  
- msgid "IPv6 WAN Status"
- msgstr "IPv6 WAN 상태"
- 
- msgid "IPv6 address"
+ msgid "IPv6 Upstream"
  msgstr ""
  
 -msgid "IPv6 address"
 -msgstr ""
 -
  msgid "IPv6 assignment hint"
  msgstr ""
  
diff --cc modules/luci-base/po/pl/base.po
index 716191554,9a8e8ce55..064f0bd03
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@@ -1841,9 -1910,12 +1898,12 @@@ msgstr "Średnie obciążenie
  msgid "Loading"
  msgstr "Ładowanie"
  
 -msgid "Local IP address is invalid"
 -msgstr ""
 +msgid "Local IP address to assign"
 +msgstr "Lokalny adres IP do przypisania"
  
+ msgid "Local IP address to assign"
+ msgstr "Lokalny adres IP do przypisania"
+ 
  msgid "Local IPv4 address"
  msgstr "Lokalny adres IPv4"
  
@@@ -2356,9 -2449,12 +2437,12 @@@ msgstr "PID
  msgid "PIN"
  msgstr "PIN"
  
 -msgid "PIN code rejected"
 -msgstr ""
 +msgid "PMK R1 Push"
 +msgstr "PMK R1 Push"
  
+ msgid "PMK R1 Push"
+ msgstr "PMK R1 Push"
+ 
  msgid "PPP"
  msgstr "PPP"
  
@@@ -2804,10 -2894,10 +2885,10 @@@ msgid "Route Allowed IPs
  msgstr ""
  
  msgid "Route type"
 -msgstr "Typ trasy"
 +msgstr ""
  
  msgid "Router Advertisement-Service"
- msgstr ""
+ msgstr "Serwis rozgłoszeniowy routera"
  
  msgid "Router Password"
  msgstr "Hasło routera"
@@@ -3414,10 -3517,12 +3508,11 @@@ msgstr "Strefa czasowa
  
  msgid ""
  "To restore configuration files, you can upload a previously generated backup "
- "archive here."
+ "archive here. To reset the firmware to its initial state, click \"Perform "
+ "reset\" (only possible with squashfs images)."
  msgstr ""
 -"Aby przywrócić pliki konfiguracyjne, możesz przesłać tutaj wcześniej "
 -"utworzoną kopię zapasową. Aby przywrócić ustawienia domyślne wciśnij "
 -"\"Wykonaj reset\" (możliwe tylko w przypadku obrazu squashfs)."
 +"Aby przywrócić pliki konfiguracyjne, możesz tutaj przesłać wcześniej "
 +"utworzoną kopię zapasową."
  
  msgid "Tone"
  msgstr ""
diff --cc modules/luci-base/po/tr/base.po
index 87fa6104e,fe0e0f9f3..05d1b2bbd
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@@ -2688,28 -2772,28 +2769,28 @@@ msgid "
  msgstr ""
  
  msgid "Run a filesystem check before mounting the device"
- msgstr ""
+ msgstr "Cihazı bağlamadan önce bir dosya sistemi kontrolü yapın"
  
  msgid "Run filesystem check"
- msgstr ""
+ msgstr "Dosya sistemi kontrolünü çalıştır"
  
  msgid "SHA256"
 -msgstr "SHA256"
 +msgstr ""
  
  msgid "SNR"
- msgstr ""
+ msgstr "SNR"
  
  msgid "SSH Access"
- msgstr ""
+ msgstr "SSH Erişimi"
  
  msgid "SSH server address"
- msgstr ""
+ msgstr "SSH sunucu adresi"
  
  msgid "SSH server port"
- msgstr ""
+ msgstr "SSH sunucu portu"
  
  msgid "SSH username"
- msgstr ""
+ msgstr "SSH kullanıcı adı"
  
  msgid "SSH-Keys"
  msgstr ""
@@@ -2838,11 -2922,8 +2919,8 @@@ msgid "
  "instructions."
  msgstr ""
  
- msgid "Sort"
- msgstr ""
- 
  msgid "Source"
 -msgstr "Kaynak"
 +msgstr ""
  
  msgid "Specifies the directory the device is attached to"
  msgstr ""
diff --cc modules/luci-base/po/uk/base.po
index b5a43d335,acda5b6ba..a7e290005
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@@ -329,10 -337,10 +337,10 @@@ msgstr "
  "наприклад, для RBL-послуг"
  
  msgid "Allowed IPs"
 -msgstr "Дозволено IP-адреси"
 +msgstr ""
  
  msgid "Always announce default router"
- msgstr ""
+ msgstr "Завжди оголошувати типовим маршрутизатором"
  
  msgid "Annex"
  msgstr ""
@@@ -514,10 -535,10 +535,10 @@@ msgid "Backup file list
  msgstr "Список файлів резервних копій"
  
  msgid "Bad address specified!"
- msgstr "Вказана неправильна адреса!"
+ msgstr "Вказано неправильну адресу!"
  
  msgid "Band"
 -msgstr "Група"
 +msgstr ""
  
  msgid ""
  "Below is the determined list of files to backup. It consists of changed "
@@@ -2050,31 -2186,31 +2183,31 @@@ msgid "NAS ID
  msgstr "Ідентифікатор NAS"
  
  msgid "NAT-T Mode"
- msgstr ""
+ msgstr "Режим NAT-T"
  
  msgid "NAT64 Prefix"
- msgstr ""
+ msgstr "Префікс NAT64"
  
  msgid "NCM"
- msgstr ""
+ msgstr "NCM"
  
  msgid "NDP-Proxy"
- msgstr ""
+ msgstr "NDP-проксі"
  
  msgid "NT Domain"
- msgstr ""
+ msgstr "Домен NT"
  
  msgid "NTP server candidates"
 -msgstr "Кандидати для синхронізації сервера NTP"
 +msgstr "Кандидати для синхронізації NTP-сервера"
  
  msgid "Name"
- msgstr "Ім'я"
+ msgstr "Ім’я"
  
  msgid "Name of the new interface"
- msgstr "Ім'я нового інтерфейсу"
+ msgstr "Ім’я нового інтерфейсу"
  
  msgid "Name of the new network"
- msgstr "Назва (ім'я) нової мережі"
+ msgstr "Назва (ім’я) нової мережі"
  
  msgid "Navigation"
  msgstr "Навігація"
@@@ -2185,14 -2327,14 +2324,17 @@@ msgid "OPKG-Configuration
  msgstr "Конфігурація OPKG"
  
  msgid "Obfuscated Group Password"
- msgstr ""
+ msgstr "Обфусований груповий пароль"
  
  msgid "Obfuscated Password"
- msgstr ""
+ msgstr "Обфусований пароль"
+ 
+ msgid "Obtain IPv6-Address"
+ msgstr "Отримати IPv6-адресу"
  
 +msgid "Obtain IPv6-Address"
 +msgstr ""
 +
  msgid "Off-State Delay"
  msgstr "Затримка Off-State"
  
@@@ -2720,13 -2862,13 +2862,13 @@@ msgid "Replace wireless configuration
  msgstr "Замінити конфігурацію бездротової мережі"
  
  msgid "Request IPv6-address"
- msgstr ""
+ msgstr "Запит IPv6-адреси"
  
  msgid "Request IPv6-prefix of length"
 -msgstr "Запит довжини IPv6-префіксу"
 +msgstr ""
  
  msgid "Required"
- msgstr ""
+ msgstr "Потрібно"
  
  msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3"
  msgstr "Потрібно для деяких провайдерів, наприклад, Charter із DOCSIS 3"
@@@ -2790,16 -2949,16 +2949,16 @@@ msgid "Root directory for files served 
  msgstr "Кореневий каталог для файлів TFTP"
  
  msgid "Root preparation"
- msgstr ""
+ msgstr "Підготовка Root"
  
  msgid "Route Allowed IPs"
- msgstr ""
+ msgstr "Маршрутизація дозволених IP-адрес"
  
  msgid "Route type"
 -msgstr "Тип маршруту"
 +msgstr ""
  
  msgid "Router Advertisement-Service"
- msgstr ""
+ msgstr "Служба оголошень маршрутизатора"
  
  msgid "Router Password"
  msgstr "Пароль маршрутизатора"
@@@ -2879,10 -3035,10 +3035,10 @@@ msgid "Separate Clients
  msgstr "Розділяти клієнтів"
  
  msgid "Server Settings"
 -msgstr "Налаштування сервера"
 +msgstr "Настройки сервера"
  
  msgid "Service Name"
- msgstr "Назва (ім'я) сервісу"
+ msgstr "Назва (ім’я) сервісу"
  
  msgid "Service Type"
  msgstr "Тип сервісу"
@@@ -3675,12 -3901,13 +3901,12 @@@ msgid "
  "When using a PSK, the PMK can be generated locally without inter AP "
  "communications"
  msgstr ""
 -"При використанні PSK, PMK може бути створений локально без взаємодії між AP"
  
  msgid "Width"
- msgstr ""
+ msgstr "Ширина"
  
  msgid "WireGuard VPN"
- msgstr ""
+ msgstr "WireGuard VPN"
  
  msgid "Wireless"
  msgstr "Бездротові мережі"