diff options
author | Hannu Nyman <hannu.nyman@iki.fi> | 2017-04-06 23:01:48 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-06 23:01:48 +0300 |
commit | 3fc0465cfeda80f6696bcc17dc4cbcfa0f88c906 (patch) | |
tree | 8bffc5c2eeb6bae0bab0b93ef19a546c94809a4e /modules | |
parent | 73d284c880152ea69942519bd7955e6ef06fd604 (diff) | |
parent | 7b55d1b4afed37625417e5707f3b96cb5beb19fa (diff) |
Merge pull request #1071 from TDT-GmbH/add-force-link-option
luci-mod-admin-full: Add force link option in interfaces advanced settings section
Diffstat (limited to 'modules')
28 files changed, 224 insertions, 0 deletions
diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index ee8d19c9d..32763bfec 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -1193,6 +1193,9 @@ msgstr "Força el TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Força el TKIP i el CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2817,6 +2820,11 @@ msgstr "Tipus de servei" msgid "Services" msgstr "Serveis" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Sincronització de hora" diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index 1d3ba8fda..e87805abf 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -1205,6 +1205,9 @@ msgstr "Vynutit TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Vynutit TKIP a CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2857,6 +2860,11 @@ msgstr "Typ služby" msgid "Services" msgstr "Služby" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Nastavit synchronizaci času" diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index 5adc5c0d4..fb5d02e1a 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -1205,6 +1205,9 @@ msgstr "Erzwinge TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Erzwinge TKIP und CCMP (AES)" +msgid "Force link" +msgstr "Erzwinge Verbindung" + msgid "Force use of NAT-T" msgstr "" @@ -2866,6 +2869,13 @@ msgstr "Service-Typ" msgid "Services" msgstr "Dienste" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" +"Schnittstelleneigenschaften werden unabhängig vom Link gesetzt (ist die " +"Option ausgewählt, so werden die Hotplug-Skripte bei Änderung nicht aufgerufen)" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Zeitsynchronisierung einrichten" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index 01bb8521d..3ddf7c674 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -1219,6 +1219,9 @@ msgstr "Επιβολή TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Επιβολή TKIP και CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2850,6 +2853,11 @@ msgstr "Είδος Υπηρεσίας" msgid "Services" msgstr "Υπηρεσίες" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index 149f9379b..57aa012a4 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -1194,6 +1194,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2814,6 +2817,11 @@ msgstr "" msgid "Services" msgstr "Services" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index c1006659b..eb6273364 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -1212,6 +1212,9 @@ msgstr "Forzar TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forzar TKIP y CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2870,6 +2873,11 @@ msgstr "Tipo de servicio" msgid "Services" msgstr "Servicios" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Sincronización horaria" diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index 117de1273..d8e3f4c73 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -1224,6 +1224,9 @@ msgstr "Forcer TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forcer TKIP et CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2884,6 +2887,11 @@ msgstr "Type du service" msgid "Services" msgstr "Services" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Configurer la synchronisation de l'heure" diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index 9d10d50bc..d938fe7ef 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -1179,6 +1179,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2780,6 +2783,11 @@ msgstr "" msgid "Services" msgstr "שירותים" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "סנכרון זמן" diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index df03d5bbe..23996762c 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -1215,6 +1215,9 @@ msgstr "TKIP kényszerítése" msgid "Force TKIP and CCMP (AES)" msgstr "TKIP és CCMP (AES) kényszerítése" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2875,6 +2878,11 @@ msgstr "Szolgáltatás típusa" msgid "Services" msgstr "Szolgáltatások" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Idő szinkronizálás beállítása" diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index 7551b616c..6bb2a83c4 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -1215,6 +1215,9 @@ msgstr "Forza TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forza TKIP e CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2856,6 +2859,11 @@ msgstr "" msgid "Services" msgstr "Servizi" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index 85b22beac..d4a31c654 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -1214,6 +1214,9 @@ msgstr "TKIP を使用" msgid "Force TKIP and CCMP (AES)" msgstr "TKIP 及びCCMP (AES) を使用" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "NAT-Tの強制使用" @@ -2875,6 +2878,11 @@ msgstr "サービスタイプ" msgid "Services" msgstr "サービス" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "時刻同期設定" diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po index 4e0c1bb7c..50b44ff46 100644 --- a/modules/luci-base/po/ko/base.po +++ b/modules/luci-base/po/ko/base.po @@ -1192,6 +1192,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2809,6 +2812,11 @@ msgstr "" msgid "Services" msgstr "서비스" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index 002a4e64d..32e565d70 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -1164,6 +1164,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2785,6 +2788,11 @@ msgstr "" msgid "Services" msgstr "Perkhidmatan" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index 6c4e8e3d0..794c5fd3f 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -1201,6 +1201,9 @@ msgstr "Bruk TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Bruk TKIP og CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2848,6 +2851,11 @@ msgstr "Tjeneste type" msgid "Services" msgstr "Tjenester" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Oppsett tidssynkronisering" diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index 21e8195cd..2b5cfb561 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -1232,6 +1232,9 @@ msgstr "Wymuś TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Wymuś TKIP i CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2898,6 +2901,11 @@ msgstr "Typ serwisu" msgid "Services" msgstr "Serwisy" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Ustawienia synchronizacji czasu" diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index 489c117c2..a6a8b788b 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -1268,6 +1268,9 @@ msgstr "Forçar TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forçar TKIP e CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "Force o uso do NAT-T" @@ -3003,6 +3006,11 @@ msgstr "Tipo do Serviço" msgid "Services" msgstr "Serviços" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "Configurar a Sincronização do Horário" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index c052e478d..9ed6a3892 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -1218,6 +1218,9 @@ msgstr "Forçar TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forçar TKIP e CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2866,6 +2869,11 @@ msgstr "Tipo de Serviço" msgid "Services" msgstr "Serviços" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Configurar Sincronização Horária" diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index 01a55a454..c1c40d42c 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -1171,6 +1171,9 @@ msgstr "Forteaza TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forteaza TKIP si CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2776,6 +2779,11 @@ msgstr "Tip de serviciu" msgid "Services" msgstr "Servicii" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Configurare sincronizare timp" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index b5d2c45b9..4bcaf3ca6 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -1220,6 +1220,9 @@ msgstr "Требовать TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "TKIP или CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2878,6 +2881,11 @@ msgstr "Тип службы" msgid "Services" msgstr "Сервисы" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Настроить синхронизацию времени" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index b6319c2f1..219cf1a5b 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -1151,6 +1151,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2749,6 +2752,11 @@ msgstr "" msgid "Services" msgstr "" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index 269c1d3d2..aeb7c280b 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -1157,6 +1157,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2755,6 +2758,11 @@ msgstr "" msgid "Services" msgstr "" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index 3ad21e159..720b955a2 100644 --- a/modules/luci-base/po/templates/base.pot +++ b/modules/luci-base/po/templates/base.pot @@ -1144,6 +1144,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2742,6 +2745,11 @@ msgstr "" msgid "Services" msgstr "" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index 99a35f095..66080faa5 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -1164,6 +1164,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2762,6 +2765,11 @@ msgstr "" msgid "Services" msgstr "" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index 2295c7907..e892ffbc9 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -1227,6 +1227,9 @@ msgstr "Примусово TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Примусово TKIP та CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2891,6 +2894,11 @@ msgstr "Тип сервісу" msgid "Services" msgstr "Сервіси" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Настройки синхронізації часу" diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index b628ba05b..f42d8bf64 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -1169,6 +1169,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2789,6 +2792,11 @@ msgstr "" msgid "Services" msgstr "Dịch vụ " +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index dfc811d98..e3725c41a 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.po @@ -1171,6 +1171,9 @@ msgstr "强制使用TKIP加密" msgid "Force TKIP and CCMP (AES)" msgstr "TKIP和CCMP(AES)混合加密" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "强制使用NAT-T" @@ -2787,6 +2790,11 @@ msgstr "服务类型" msgid "Services" msgstr "服务" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "设置时间同步" diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index bea080927..3d1934e55 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -1182,6 +1182,9 @@ msgstr "強制TKIP加密" msgid "Force TKIP and CCMP (AES)" msgstr "強制TKIP+CCMP (AES)加密" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2801,6 +2804,11 @@ msgstr "服務型態" msgid "Services" msgstr "各服務" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "安裝校時同步" diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua index 16a104494..031852228 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua @@ -220,6 +220,12 @@ auto.default = (net:proto() == "none") and auto.disabled or auto.enabled delegate = s:taboption("advanced", Flag, "delegate", translate("Use builtin IPv6-management")) delegate.default = delegate.enabled +force_link = s:taboption("advanced", Flag, "force_link", + translate("Force link"), + translate("Set interface properties regardless of the link carrier (If set, carrier sense events do not invoke hotplug handlers).")) + +force_link.default = (net:proto() == "static") and force_link.enabled or force_link.disabled + if not net:is_virtual() then br = s:taboption("physical", Flag, "type", translate("Bridge interfaces"), translate("creates a bridge over specified interface(s)")) |