summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/luci-base/luasrc/dispatcher.lua11
-rw-r--r--modules/luci-base/po/ca/base.po4
-rw-r--r--modules/luci-base/po/cs/base.po4
-rw-r--r--modules/luci-base/po/de/base.po6
-rw-r--r--modules/luci-base/po/el/base.po4
-rw-r--r--modules/luci-base/po/en/base.po4
-rw-r--r--modules/luci-base/po/es/base.po4
-rw-r--r--modules/luci-base/po/fr/base.po4
-rw-r--r--modules/luci-base/po/he/base.po4
-rw-r--r--modules/luci-base/po/hu/base.po4
-rw-r--r--modules/luci-base/po/it/base.po4
-rw-r--r--modules/luci-base/po/ja/base.po6
-rw-r--r--modules/luci-base/po/ko/base.po4
-rw-r--r--modules/luci-base/po/ms/base.po4
-rw-r--r--modules/luci-base/po/no/base.po4
-rw-r--r--modules/luci-base/po/pl/base.po4
-rw-r--r--modules/luci-base/po/pt-br/base.po6
-rw-r--r--modules/luci-base/po/pt/base.po4
-rw-r--r--modules/luci-base/po/ro/base.po4
-rw-r--r--modules/luci-base/po/ru/base.po72
-rw-r--r--modules/luci-base/po/sk/base.po6
-rw-r--r--modules/luci-base/po/sv/base.po4
-rw-r--r--modules/luci-base/po/templates/base.pot6
-rw-r--r--modules/luci-base/po/tr/base.po4
-rw-r--r--modules/luci-base/po/uk/base.po4
-rw-r--r--modules/luci-base/po/vi/base.po4
-rw-r--r--modules/luci-base/po/zh-cn/base.po41
-rw-r--r--modules/luci-base/po/zh-tw/base.po4
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua4
29 files changed, 127 insertions, 111 deletions
diff --git a/modules/luci-base/luasrc/dispatcher.lua b/modules/luci-base/luasrc/dispatcher.lua
index e4f77f18d8..16b32548e6 100644
--- a/modules/luci-base/luasrc/dispatcher.lua
+++ b/modules/luci-base/luasrc/dispatcher.lua
@@ -191,6 +191,9 @@ local function session_setup(user, pass, allowed_users)
timeout = tonumber(luci.config.sauth.sessiontime)
})
+ local rp = context.requestpath
+ and table.concat(context.requestpath, "/") or ""
+
if type(login) == "table" and
type(login.ubus_rpc_session) == "string"
then
@@ -199,8 +202,14 @@ local function session_setup(user, pass, allowed_users)
values = { token = sys.uniqueid(16) }
})
+ io.stderr:write("luci: accepted login on /%s for %s from %s\n"
+ %{ rp, user, http.getenv("REMOTE_ADDR") or "?" })
+
return session_retrieve(login.ubus_rpc_session)
end
+
+ io.stderr:write("luci: failed login on /%s for %s from %s\n"
+ %{ rp, user, http.getenv("REMOTE_ADDR") or "?" })
end
return nil, nil
@@ -358,7 +367,7 @@ function dispatch(request)
"https://github.com/openwrt/luci/issues"
)
- if track.sysauth then
+ if track.sysauth and not ctx.authsession then
local authen = track.sysauth_authenticator
local _, sid, sdat, default_user, allowed_users
diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po
index b094e598eb..0478f09d78 100644
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -3526,8 +3526,8 @@ msgstr ""
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po
index e298dc6a81..1105986532 100644
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@@ -3566,8 +3566,8 @@ msgstr "Použít směrovací tabulku"
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po
index 69121420a3..d8fdaafc52 100644
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -3703,9 +3703,9 @@ msgstr "Benutze Routing-Tabelle"
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to "
+"the requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
"Die <em>Hinzufügen</em> Schaltfläche fügt einen neuen Lease-Eintrag hinzu. "
diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po
index b0017b34b9..5e7b8d4a6e 100644
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -3522,8 +3522,8 @@ msgstr ""
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po
index e5671e019d..699fe459af 100644
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -3479,8 +3479,8 @@ msgstr ""
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po
index 9756fc50cb..83f63da529 100644
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -3591,8 +3591,8 @@ msgstr "Usar tabla de rutas"
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po
index 0db2253405..6a522d3113 100644
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -3610,8 +3610,8 @@ msgstr "Utiliser la table de routage"
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po
index a8be20eeec..3b6dafa0ff 100644
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -3437,8 +3437,8 @@ msgstr "השתמש בטבלת ניתוב"
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po
index d970f1e63d..976db9cfc5 100644
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -3597,8 +3597,8 @@ msgstr "Útválasztó tábla használata"
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po
index 339e629c4a..e54eb61fa0 100644
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -3554,8 +3554,8 @@ msgstr "Utilizzare tabella di instradamento"
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index be3d191d7b..e3a61a6bd6 100644
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -3591,9 +3591,9 @@ msgstr "ルーティング テーブルの使用"
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to "
+"the requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
"<em>追加</em> ボタンを押して、新しくエントリーを作成してください。<em>MAC-ア"
diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po
index b4a19f7e85..0cc7581b67 100644
--- a/modules/luci-base/po/ko/base.po
+++ b/modules/luci-base/po/ko/base.po
@@ -3484,8 +3484,8 @@ msgstr "Routing table 사용"
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po
index e2681c9e61..a15c70a877 100644
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -3452,8 +3452,8 @@ msgstr ""
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po
index 3cb6675e6c..9bc2bc1fb3 100644
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -3562,8 +3562,8 @@ msgstr "Bruk rutingtabellen"
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po
index fd9da5d73b..7535655240 100644
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -3622,8 +3622,8 @@ msgstr "Użyj tabeli routingu"
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po
index b859ca3b0a..e3ff526fc2 100644
--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@@ -3745,9 +3745,9 @@ msgstr "Use a tabela de roteamento"
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to "
+"the requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
"Use o botão <em>Adicionar</em> para adicionar uma nova entrada de "
diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po
index 997648ab00..a83d724ccc 100644
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -3560,8 +3560,8 @@ msgstr "Usar tabela de roteamento"
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po
index 303e539f43..cda6afbc5e 100644
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -3428,8 +3428,8 @@ msgstr ""
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po
index bb9738edd7..c5a72b1c31 100644
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -3,7 +3,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: LuCI: base\n"
"POT-Creation-Date: 2010-05-09 01:01+0300\n"
-"PO-Revision-Date: 2018-01-14 22:51+0300\n"
+"PO-Revision-Date: 2018-01-20 16:04+0300\n"
"Language-Team: http://cyber-place.ru\n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -155,7 +155,8 @@ msgstr ""
msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
msgstr ""
-"<abbr title=\"максимальное\">Макс.</abbr> кол-во<br />одновременных запросов"
+"<abbr title=\"максимальное\">Макс.</abbr> кол-во<br />одновременных<br /"
+">запросов"
msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
msgstr "<abbr title='Парный: %s / Групповой: %s'>%s - %s</abbr>"
@@ -252,13 +253,14 @@ msgid "Add"
msgstr "Добавить"
msgid "Add local domain suffix to names served from hosts files"
-msgstr "Добавить локальный суффикс домена для имен из hosts файлов"
+msgstr ""
+"Добавить локальный суффикс домена для имен из файла хостов (/etc/hosts)."
msgid "Add new interface..."
msgstr "Добавить новый интерфейс"
msgid "Additional Hosts files"
-msgstr "Дополнительные<br />hosts файлы"
+msgstr "Дополнительный<br />hosts файл"
msgid "Additional servers file"
msgstr "Дополнительные<br />файлы серверов"
@@ -326,7 +328,7 @@ msgstr ""
"сервисов."
msgid "Allowed IPs"
-msgstr "Разрешенные IP адреса"
+msgstr "Разрешенные IP-адреса"
msgid ""
"Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison"
@@ -389,10 +391,10 @@ msgstr ""
"недоступен."
msgid "Announced DNS domains"
-msgstr "Объявленные<br />DNS домены"
+msgstr "Объявить DNS домены"
msgid "Announced DNS servers"
-msgstr "Объявленные<br />DNS сервера"
+msgstr "Объявить DNS сервера"
msgid "Anonymous Identity"
msgstr "Анонимная идентификация"
@@ -654,7 +656,7 @@ msgstr ""
"интерфейс."
msgid "Cipher"
-msgstr "Протокол"
+msgstr "Ключ шифрования"
msgid "Cisco UDP encapsulation"
msgstr "формирование пакетов данных Cisco UDP "
@@ -686,7 +688,7 @@ msgid "Close list..."
msgstr "Закрыть список..."
msgid "Collecting data..."
-msgstr "Сбор информации..."
+msgstr "Сбор данных..."
msgid "Command"
msgstr "Команда"
@@ -701,15 +703,15 @@ msgid ""
"negotiation especially in environments with heavy traffic load."
msgstr ""
"Усложняет атаки на переустановку ключа на стороне клиента, отключая "
-"ретрансляцию фреймов EAPOL-Key, которые используются для установки ключей."
-"<br />Этот способ может вызвать проблемы совместимости и снижение надежности "
-"согласования нового ключа, особенно в средах с высоким трафиком."
+"ретрансляцию фреймов EAPOL-Key, которые используются для установки ключей. "
+"Может вызвать проблемы совместимости и снижение надежности согласования "
+"нового ключа, при наличии большого трафика."
msgid "Configuration"
msgstr "Настройка config файла"
msgid "Configuration applied."
-msgstr "Изменение настроек."
+msgstr "Изменение настроек config файлов."
msgid "Configuration files will be kept."
msgstr "Config файлы будут сохранены."
@@ -1231,7 +1233,7 @@ msgid "Firewall"
msgstr "Межсетевой экран"
msgid "Firewall Mark"
-msgstr "Метка межсетевого эрана"
+msgstr "Метка межсетевого экрана"
msgid "Firewall Settings"
msgstr "Настройки межсетевого экрана"
@@ -1441,7 +1443,7 @@ msgid "IKE DH Group"
msgstr "IKE DH Group"
msgid "IP Addresses"
-msgstr "IP-адреса"
+msgstr "IP-Адреса"
msgid "IP address"
msgstr "IP-адрес"
@@ -1905,13 +1907,14 @@ msgid ""
"Local domain specification. Names matching this domain are never forwarded "
"and are resolved from DHCP or hosts files only"
msgstr ""
-"Спецификация локального домена. Имена соответствующие этому домену, никогда "
-"не пробрасываются и разрешаются только из файлов DHCP или хостов."
+"Согласно требованиям, имена соответствующие этому домену, никогда не "
+"передаются.<br />И разрешаются только из файла DHCP(/etc/config/dhcp) или "
+"файла хостов (/etc/hosts)."
msgid "Local domain suffix appended to DHCP names and hosts file entries"
msgstr ""
-"Суффикс локального домена, который будет добавлен к DHCP-именам и записям из "
-"файлов hosts."
+"Суффикс локального домена, который будет добавлен к DHCP-именам и записи "
+"файла хостов (/etc/hosts)."
msgid "Local server"
msgstr "Локальный сервер"
@@ -2206,7 +2209,7 @@ msgid "Non-wildcard"
msgstr "Не использовать wildcard"
msgid "None"
-msgstr "Нет"
+msgstr "Ничего"
msgid "Normal"
msgstr "Нормально"
@@ -2359,7 +2362,7 @@ msgstr ""
"Необязательно. Udp-порт, используемый для исходящих и входящих пакетов."
msgid "Options"
-msgstr "Режим"
+msgstr "Опции"
msgid "Other:"
msgstr "Другие:"
@@ -2483,10 +2486,10 @@ msgid "Password2"
msgstr "Пароль2"
msgid "Path to CA-Certificate"
-msgstr "Путь к CA-Сертификатам"
+msgstr "Путь к CA-Сертификату"
msgid "Path to Client-Certificate"
-msgstr "Путь к Client-Сертификатам"
+msgstr "Путь к Client-Сертификату"
msgid "Path to Private Key"
msgstr "Путь к Личному Ключу"
@@ -2528,7 +2531,7 @@ msgid "Physical Settings"
msgstr "Настройки канала"
msgid "Ping"
-msgstr "Эхо-запрос"
+msgstr "Пинг-запрос"
msgid "Pkts."
msgstr "Пакетов."
@@ -3102,7 +3105,7 @@ msgid ""
"Specifies the maximum amount of seconds after which hosts are presumed to be "
"dead"
msgstr ""
-"Максимальное количество секунд, после которого узлы считаются отключенными."
+"Максимальное количество секунд, после которого узлы считаются отключёнными."
msgid "Specify a TOS (Type of Service)."
msgstr "Укажите TOS (Тип обслуживания)."
@@ -3402,7 +3405,7 @@ msgid ""
"you choose the generic image format for your platform."
msgstr ""
"Загруженный файл прошивки не поддерживается. Проверьте, что вы загрузили "
-"подходящую прошивку для вашего чипа вашего устройства."
+"подходящую прошивку для чипа вашего устройства."
msgid "There are no active leases."
msgstr "Нет активных арендованных адресов."
@@ -3507,7 +3510,7 @@ msgstr ""
"Страница содержит список всех активных на данный момент сетевых соединений."
msgid "This section contains no values yet"
-msgstr "Эти строки не содержат значений"
+msgstr "Здесь не содержатся необходимые значения"
msgid "Time Synchronization"
msgstr "Синхронизация времени"
@@ -3690,9 +3693,9 @@ msgstr "Использовать таблицу маршрутизации"
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to "
+"the requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
"Нажмите кнопку <em>'Добавить'</em>, чтобы добавить новую запись аренды. "
@@ -3818,7 +3821,8 @@ msgstr "Внимание"
msgid "Warning: There are unsaved changes that will get lost on reboot!"
msgstr ""
-"Внимание: изменения не были сохранены и будут утеряны при перезагрузке!"
+"Внимание: Есть несохраненные изменения, которые будут потеряны при "
+"перезагрузке!"
msgid ""
"When using a PSK, the PMK can be generated locally without inter AP "
@@ -3926,10 +3930,10 @@ msgid "dBm"
msgstr "dBm"
msgid "disable"
-msgstr "выключить"
+msgstr "отключить"
msgid "disabled"
-msgstr "выключено"
+msgstr "отключено"
msgid "expired"
msgstr "истекло"
@@ -3981,7 +3985,7 @@ msgid "minimum 1280, maximum 1480"
msgstr "минимум 1280, максимум 1480"
msgid "minutes"
-msgstr "минуты"
+msgstr "минут(ы)"
msgid "no"
msgstr "нет"
diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po
index 7cff39d533..91033d72f9 100644
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -3398,9 +3398,9 @@ msgstr ""
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to "
+"the requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po
index b3dc98a26a..d2f16153cf 100644
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -3425,8 +3425,8 @@ msgstr ""
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot
index bb0d151e11..3251ed2a0d 100644
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -3391,9 +3391,9 @@ msgstr ""
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to "
+"the requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po
index b099c72f20..81da08f8a6 100644
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -3411,8 +3411,8 @@ msgstr ""
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po
index 658b089bc2..842f6613b6 100644
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@ -3614,8 +3614,8 @@ msgstr "Використовувати таблицю маршрутизації
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po
index 4734b49004..a27cbfb0b8 100644
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -3453,8 +3453,8 @@ msgstr ""
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po
index 6040a238e5..7236ef9259 100644
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -7,7 +7,7 @@ msgid "%.1f dB"
msgstr ""
msgid "%s is untagged in multiple VLANs!"
-msgstr "%s 在多个 VLAN 中均未关联!"
+msgstr "%s 在多个 VLAN 中均未标记!"
msgid "(%d minute window, %d second interval)"
msgstr "(最近 %d 分钟信息,每 %d 秒刷新)"
@@ -281,7 +281,7 @@ msgid "Allow all except listed"
msgstr "仅允许列表外"
msgid "Allow legacy 802.11b rates"
-msgstr ""
+msgstr "允许传统的 802.11b 速率"
msgid "Allow listed only"
msgstr "仅允许列表内"
@@ -648,6 +648,9 @@ msgid ""
"workaround might cause interoperability issues and reduced robustness of key "
"negotiation especially in environments with heavy traffic load."
msgstr ""
+"通过禁用用于安装密钥的 EAPOL-Key 帧的重新传输,来增加客户端密钥重安装攻击的复"
+"杂度。此解决方法可能会导致互操作性问题,并降低密钥协商的可靠性,特别是在流量"
+"负载较重的环境中。"
msgid "Configuration"
msgstr "配置"
@@ -931,7 +934,7 @@ msgid "Download backup"
msgstr "下载备份"
msgid "Downstream SNR offset"
-msgstr ""
+msgstr "下游 SNR 偏移"
msgid "Dropbear Instance"
msgstr "Dropbear 实例"
@@ -1015,7 +1018,7 @@ msgid "Enable WPS pushbutton, requires WPA(2)-PSK"
msgstr "启用 WPS 一键加密按钮,需要 WPA(2)-PSK"
msgid "Enable key reinstallation (KRACK) countermeasures"
-msgstr ""
+msgstr "启用密钥重新安装(KRACK)对策"
msgid "Enable learning and aging"
msgstr "启用智能交换学习"
@@ -1117,7 +1120,7 @@ msgid "FT over the Air"
msgstr ""
msgid "FT protocol"
-msgstr ""
+msgstr "FT 协议"
msgid "File"
msgstr "文件"
@@ -1221,7 +1224,7 @@ msgid "Forward broadcast traffic"
msgstr "转发广播数据包"
msgid "Forward mesh peer traffic"
-msgstr ""
+msgstr "转发 mesh 节点数据包"
msgid "Forwarding mode"
msgstr "转发模式"
@@ -1270,7 +1273,7 @@ msgid "Generate Config"
msgstr "生成配置"
msgid "Generate PMK locally"
-msgstr ""
+msgstr "本地生成 PMK"
msgid "Generate archive"
msgstr "生成备份"
@@ -1916,7 +1919,7 @@ msgid "Memory usage (%)"
msgstr "内存使用率(%)"
msgid "Mesh Id"
-msgstr ""
+msgstr "Mesh ID"
msgid "Metric"
msgstr "跃点数"
@@ -2296,7 +2299,7 @@ msgid "PIN"
msgstr "PIN"
msgid "PMK R1 Push"
-msgstr "PMK R1 Push"
+msgstr "R1 推送 PMK"
msgid "PPP"
msgstr "PPP"
@@ -2502,10 +2505,10 @@ msgid "Quality"
msgstr "质量"
msgid "R0 Key Lifetime"
-msgstr "R0 Key Lifetime"
+msgstr "R0 密钥生存期"
msgid "R1 Key Holder"
-msgstr "R1 Key Holder"
+msgstr "R1 密钥持有者"
msgid "RFC3947 NAT-T mode"
msgstr "RFC3947 NAT-T 模式"
@@ -3043,7 +3046,7 @@ msgid ""
msgstr "交换机 %q 具有未知的拓扑结构,VLAN 设置可能不正确。"
msgid "Switch Port Mask"
-msgstr ""
+msgstr "交换机端口掩码"
msgid "Switch VLAN"
msgstr "交换机 VLAN"
@@ -3492,9 +3495,9 @@ msgstr "使用路由表"
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
-"requesting host. The optional <em>Lease time</em> can be used to set non-"
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to "
+"the requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
"使用“添加”按钮来增加新的租约条目。“IPv4 地址”和“主机名”字段的值将被固定分配"
@@ -3618,7 +3621,7 @@ msgstr "警告:一些未保存的配置将在重启后丢失!"
msgid ""
"When using a PSK, the PMK can be generated locally without inter AP "
"communications"
-msgstr ""
+msgstr "当使用 PSK 时,PMK 可以在没有 AP 间通信的情况下在本地生成"
msgid "Whether to create an IPv6 default route over the tunnel"
msgstr "是否添加一条通向隧道的 IPv6 默认路由"
@@ -3816,7 +3819,7 @@ msgid "stateless + stateful"
msgstr "无状态的 + 有状态的"
msgid "tagged"
-msgstr "已关联"
+msgstr "已标记"
msgid "time units (TUs / 1.024 ms) [1000-65535]"
msgstr "时间单位(TUs / 1.024ms)[1000-65535]"
@@ -3834,7 +3837,7 @@ msgid "unspecified -or- create:"
msgstr "不指定或新建:"
msgid "untagged"
-msgstr "未关联"
+msgstr "未标记"
msgid "yes"
msgstr "是"
@@ -3954,7 +3957,7 @@ msgstr "« 后退"
#~ msgstr "端口 %d"
#~ msgid "Port %d is untagged in multiple VLANs!"
-#~ msgstr "端口 %d 在多个 VLAN 中均未关联!"
+#~ msgstr "端口 %d 在多个 VLAN 中均未标记!"
#~ msgid "VLAN Interface"
#~ msgstr "VLAN 接口"
diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po
index 800224c44b..33894c8ad5 100644
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -3487,8 +3487,8 @@ msgstr "使用路由表"
msgid ""
"Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
-"em> indentifies the host, the <em>IPv4-Address</em> specifies to the fixed "
-"address to use and the <em>Hostname</em> is assigned as symbolic name to the "
+"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"address to use, and the <em>Hostname</em> is assigned as a symbolic name to the "
"requesting host. The optional <em>Lease time</em> can be used to set non-"
"standard host-specific lease time, e.g. 12h, 3d or infinite."
msgstr ""
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
index 3ce0bc466e..2acda0b73b 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
@@ -263,8 +263,8 @@ s = m:section(TypedSection, "host", translate("Static Leases"),
"DHCP clients. They are also required for non-dynamic interface configurations where " ..
"only hosts with a corresponding lease are served.") .. "<br />" ..
translate("Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</em> " ..
- "indentifies the host, the <em>IPv4-Address</em> specifies to the fixed address to " ..
- "use and the <em>Hostname</em> is assigned as symbolic name to the requesting host. " ..
+ "indentifies the host, the <em>IPv4-Address</em> specifies the fixed address to " ..
+ "use, and the <em>Hostname</em> is assigned as a symbolic name to the requesting host. " ..
"The optional <em>Lease time</em> can be used to set non-standard host-specific " ..
"lease time, e.g. 12h, 3d or infinite."))