diff options
Diffstat (limited to 'modules')
28 files changed, 101 insertions, 18 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js index 4be917d098..b819230cf3 100644 --- a/modules/luci-base/htdocs/luci-static/resources/cbi.js +++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js @@ -481,8 +481,9 @@ function cbi_d_check(deps) { istat = (istat && cbi_d_checkvalue(j, deps[i][j])) } } - if (istat) { - return !reverse; + + if (istat ^ reverse) { + return true; } } return def; @@ -648,9 +649,6 @@ function cbi_combobox(id, values, def, man, focus) { var dt = obj.getAttribute('cbi_datatype'); var op = obj.getAttribute('cbi_optional'); - if (dt) - cbi_validate_field(sel, op == 'true', dt); - if (!values[obj.value]) { if (obj.value == "") { var optdef = document.createElement("option"); @@ -685,6 +683,9 @@ function cbi_combobox(id, values, def, man, focus) { obj.style.display = "none"; + if (dt) + cbi_validate_field(sel, op == 'true', dt); + cbi_bind(sel, "change", function() { if (sel.selectedIndex == sel.options.length - 1) { obj.style.display = "inline"; diff --git a/modules/luci-base/luasrc/sys.lua b/modules/luci-base/luasrc/sys.lua index 99f3ee2919..115c54d54a 100644 --- a/modules/luci-base/luasrc/sys.lua +++ b/modules/luci-base/luasrc/sys.lua @@ -348,8 +348,10 @@ end function net.devices() local devs = {} + local seen = {} for k, v in ipairs(nixio.getifaddrs()) do - if v.family == "packet" then + if v.name and not seen[v.name] then + seen[v.name] = true devs[#devs+1] = v.name end end diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index 9f4efdd1f1..0486ec2502 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -2342,6 +2342,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "La contrasenya s'ha canviat amb èxit!" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Ruta als Certificats CA" diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index 9efe3b7d8e..c217b0c394 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -2365,6 +2365,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "Heslo bylo úspěšně změněno!" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Cesta k certifikátu CA" diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index fa26a1d72e..183e495a22 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -2427,6 +2427,9 @@ msgstr "Password des inneren, privaten Schlüssels" msgid "Password successfully changed!" msgstr "Passwort erfolgreich geändert!" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Pfad zum CA-Zertifikat" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index e3969afff0..b385651f34 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -2372,6 +2372,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "Ο κωδικός πρόσβασης άλλαξε επιτυχώς!" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Διαδρομή για Πιστοποιητικό CA" diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index 6537370156..04207336e3 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -2339,6 +2339,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Path to CA-Certificate" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index a3476735b5..626e374b45 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -2379,6 +2379,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "¡Contraseña cambiada!" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Ruta al Certificado CA" diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index 1aab5cb9a4..b0b4b4334c 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -2392,6 +2392,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "Mot de passe changé avec succès !" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Chemin de la CA" diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index d8eae1f84f..2c2c5d27ec 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -2306,6 +2306,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "" diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index dfed45de59..8f5aee4c78 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -2382,6 +2382,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "A jelszó megváltoztatása sikeres!" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "CA tanúsítvány elérési útja" diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index 04331ab75d..ea7578e612 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -2378,6 +2378,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "Password cambiata con successo!" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Percorso al certificato CA" diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index 714b064dcb..7d23abede2 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -3,14 +3,14 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:40+0200\n" -"PO-Revision-Date: 2017-04-03 02:32+0900\n" +"PO-Revision-Date: 2017-07-28 12:17+0900\n" "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.0\n" +"X-Generator: Poedit 2.0.3\n" "Language-Team: \n" msgid "%s is untagged in multiple VLANs!" @@ -44,7 +44,7 @@ msgid "-- match by label --" msgstr "-- ラベルを指定 --" msgid "-- match by uuid --" -msgstr "-- UUIDを指定 --" +msgstr "-- UUID を指定 --" msgid "1 Minute Load:" msgstr "過去1分の負荷:" @@ -157,6 +157,8 @@ msgid "" "<br/>Note: you need to manually restart the cron service if the crontab file " "was empty before editing." msgstr "" +"<br />注意: 編集前の crontab ファイルが空の場合、手動で cron サービスの再起動" +"を行う必要があります。" msgid "A43C + J43 + A43" msgstr "" @@ -283,7 +285,7 @@ msgid "Allocate IP sequentially" msgstr "" msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication" -msgstr "<abbr title=\"Secure Shell\">SSH</abbr> パスワード認証を許可します" +msgstr "<abbr title=\"Secure Shell\">SSH</abbr> パスワード認証を許可します。" msgid "Allow all except listed" msgstr "リスト内の端末からのアクセスを禁止" @@ -299,10 +301,10 @@ msgstr "" "リモートホストがSSH転送されたローカルのポートに接続することを許可します" msgid "Allow root logins with password" -msgstr "パスワードを使用したroot権限でのログインを許可する" +msgstr "パスワードでの root ログインを許可" msgid "Allow the <em>root</em> user to login with password" -msgstr "パスワードを使用した<em>root</em>権限でのログインを許可する" +msgstr "パスワードを使用した <em>root</em> 権限でのログインを許可します。" msgid "" "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services" @@ -515,8 +517,8 @@ msgid "" "defined backup patterns." msgstr "" "以下は、バックアップの際に含まれるファイルのリストです。このリストは、opkgに" -"よって認識されている設定ファイル、重要なベースファイル、ユーザーが設定した正" -"規表現に一致したファイルの一覧です。" +"よって認識されている設定ファイル、重要なベースファイル、ユーザーが設定したパ" +"ターンに一致したファイルの一覧です。" msgid "Bind interface" msgstr "" @@ -858,7 +860,7 @@ msgid "Device is rebooting..." msgstr "デバイスを再起動中です..." msgid "Device unreachable" -msgstr "" +msgstr "デバイスに到達できません" msgid "Diagnostics" msgstr "診断機能" @@ -1217,7 +1219,7 @@ msgid "Force TKIP and CCMP (AES)" msgstr "TKIP 及びCCMP (AES) を使用" msgid "Force link" -msgstr "" +msgstr "強制リンク" msgid "Force use of NAT-T" msgstr "NAT-Tの強制使用" @@ -1467,7 +1469,7 @@ msgid "IPv6 routed prefix" msgstr "" msgid "IPv6 suffix" -msgstr "" +msgstr "IPv6 サフィックス" msgid "IPv6-Address" msgstr "IPv6-アドレス" @@ -2380,6 +2382,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "パスワードを変更しました" +msgid "Password2" +msgstr "パスワード2" + msgid "Path to CA-Certificate" msgstr "CA証明書のパス" @@ -3672,7 +3677,7 @@ msgid "Waiting for command to complete..." msgstr "コマンド実行中です..." msgid "Waiting for device..." -msgstr "デバイスの起動をお待ちください..." +msgstr "デバイスの起動を待っています..." msgid "Warning" msgstr "警告" diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po index 587b4890af..770a49cc5e 100644 --- a/modules/luci-base/po/ko/base.po +++ b/modules/luci-base/po/ko/base.po @@ -2332,6 +2332,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index 97912183f6..c2f62721d1 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -2311,6 +2311,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Path ke CA-Sijil" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index 9e3df81f84..6a6e818681 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -2357,6 +2357,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "Passordet er endret!" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Sti til CA-sertifikat" diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index 98067c8654..e36461615d 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -2401,6 +2401,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "Pomyślnie zmieniono hasło!" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Ścieżka do certyfikatu CA" diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index f2ba57555f..87c32bff92 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -2497,6 +2497,9 @@ msgstr "Senha da Chave Privada interna" msgid "Password successfully changed!" msgstr "A senha foi alterada com sucesso!" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Caminho para o Certificado da AC" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index cb90df5435..bea93f5c38 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -2379,6 +2379,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "Password alterada com sucesso!" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Directorio do Certificado CA" diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index d51f4d05cb..2ee8537ac8 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -2303,6 +2303,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "Parola schimbata cu succes !" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Calea catre certificatul CA" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index d30c643fce..6515772620 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -2387,6 +2387,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "Пароль успешно изменён!" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Путь к центру сертификации" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index f4037ea351..ab876ce326 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -2278,6 +2278,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "" diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index 6af6d610f2..803ac28196 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -2284,6 +2284,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "" diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index d3fc6a7324..1aa1816c20 100644 --- a/modules/luci-base/po/templates/base.pot +++ b/modules/luci-base/po/templates/base.pot @@ -2271,6 +2271,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index afabfa29d4..3c814cd30f 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -2291,6 +2291,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index 7ee06885ff..83e5501963 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -2398,6 +2398,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "Пароль успішно змінено!" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Шлях до центру сертифікції" diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index 239e1c251d..7bd7868cf4 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -2314,6 +2314,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "Đường dẫn tới CA-Certificate" diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index 7521324f1c..7b2792e61f 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -2319,6 +2319,9 @@ msgstr "" msgid "Password successfully changed!" msgstr "密碼已變更成功!" +msgid "Password2" +msgstr "" + msgid "Path to CA-Certificate" msgstr "CA-證書的路徑" |