diff options
59 files changed, 1858 insertions, 957 deletions
@@ -21,6 +21,10 @@ To install all its package definitions, run: You can browse the generated API documentation [directly on Github](http://htmlpreview.github.io/?http://raw.githubusercontent.com/openwrt/luci/master/documentation/api/index.html). +## Development + +Documentation for developing and extending LuCI can be found [in the Wiki](https://github.com/openwrt/luci/wiki) + ## License See [LICENSE](LICENSE) file. diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po new file mode 100644 index 0000000000..9c0ca21f17 --- /dev/null +++ b/applications/luci-app-adblock/po/sv/adblock.po @@ -0,0 +1,114 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8\n" + +msgid "" +"). Note that list URLs and Shallalist category selections are not " +"configurable via Luci." +msgstr "" + +msgid "Adblock" +msgstr "Blockering av annonser" + +msgid "Available blocklist sources (" +msgstr "Tillgängliga källor för blockeringslistor (" + +msgid "Backup directory" +msgstr "Säkerhetskopiera mapp" + +msgid "Backup options" +msgstr "Alternativ för säkerhetskopiering" + +msgid "Blocklist sources" +msgstr "Källor för blockeringslistor" + +msgid "" +"Configuration of the adblock package to block ad/abuse domains by using DNS." +msgstr "" +"Konfiguration av paket adblock för att blockera annons/otillåtna domäner " +"genom att användning DNS." + +msgid "Count" +msgstr "Räkna" + +msgid "Description" +msgstr "Beskrivning" + +msgid "Do not write status info to flash" +msgstr "Skriv inte status info till flash" + +msgid "Enable adblock" +msgstr "Aktivera abblock" + +msgid "Enable blocklist backup" +msgstr "Aktivera säkerhetskopiering av blockeringslistan" + +msgid "Enabled" +msgstr "Aktiverad" + +msgid "Extra options" +msgstr "Extra alternativ" + +msgid "" +"File with whitelisted hosts/domains that are allowed despite being on a " +"blocklist." +msgstr "" + +msgid "Global options" +msgstr "Globala alternativ" + +msgid "IPv4 blackhole ip address" +msgstr "" + +msgid "IPv6 blackhole ip address" +msgstr "" + +msgid "Last update of the blocklists" +msgstr "" + +msgid "List date/state" +msgstr "" + +msgid "Name of the logical lan interface" +msgstr "" + +msgid "" +"Options for further tweaking in case the defaults are not suitable for you." +msgstr "" + +msgid "Percentage of blocked packets (before last update, IPv4/IPv6)" +msgstr "" + +msgid "Port of the adblock uhttpd instance" +msgstr "" + +msgid "Port of the adblock uhttpd instance for https links" +msgstr "" + +msgid "Redirect all DNS queries to the local resolver" +msgstr "Dirigera om alla DNS-förfrågning till den lokala resolvern" + +msgid "" +"Skip writing update status information to the config file. Status fields on " +"this page will not be updated." +msgstr "" + +msgid "Statistics" +msgstr "" + +msgid "Timeout for blocklist fetch (seconds)" +msgstr "" + +msgid "Total count of blocked domains" +msgstr "" + +msgid "" +"When adblock is active, all DNS queries are redirected to the local resolver " +"in this server by default. You can disable that to allow queries to external " +"DNS servers." +msgstr "" + +msgid "Whitelist file" +msgstr "Vitlista fil" + +msgid "see list details" +msgstr "se listans detaljer" diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot index dace4bc707..eeb0d975b9 100644 --- a/applications/luci-app-adblock/po/templates/adblock.pot +++ b/applications/luci-app-adblock/po/templates/adblock.pot @@ -60,6 +60,9 @@ msgstr "" msgid "IPv6 blackhole ip address" msgstr "" +msgid "Last update of the blocklists" +msgstr "" + msgid "List date/state" msgstr "" @@ -70,9 +73,15 @@ msgid "" "Options for further tweaking in case the defaults are not suitable for you." msgstr "" +msgid "Percentage of blocked packets (before last update, IPv4/IPv6)" +msgstr "" + msgid "Port of the adblock uhttpd instance" msgstr "" +msgid "Port of the adblock uhttpd instance for https links" +msgstr "" + msgid "Redirect all DNS queries to the local resolver" msgstr "" @@ -81,6 +90,9 @@ msgid "" "this page will not be updated." msgstr "" +msgid "Statistics" +msgstr "" + msgid "Timeout for blocklist fetch (seconds)" msgstr "" diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po index 54ea01d20b..e57921daa8 100644 --- a/applications/luci-app-adblock/po/zh-cn/adblock.po +++ b/applications/luci-app-adblock/po/zh-cn/adblock.po @@ -71,6 +71,9 @@ msgstr "IPv4禁止列表" msgid "IPv6 blackhole ip address" msgstr "IPv6禁止列表" +msgid "Last update of the blocklists" +msgstr "" + msgid "List date/state" msgstr "列表日期/状态" @@ -81,9 +84,15 @@ msgid "" "Options for further tweaking in case the defaults are not suitable for you." msgstr "在默认设置并不适合你时的额外选项。" +msgid "Percentage of blocked packets (before last update, IPv4/IPv6)" +msgstr "" + msgid "Port of the adblock uhttpd instance" msgstr "Adblock uhttpd端口" +msgid "Port of the adblock uhttpd instance for https links" +msgstr "" + msgid "Redirect all DNS queries to the local resolver" msgstr "将所有DNS查询都重定向到本地解析器" @@ -92,6 +101,9 @@ msgid "" "this page will not be updated." msgstr "" +msgid "Statistics" +msgstr "" + msgid "Timeout for blocklist fetch (seconds)" msgstr "列表查询超时时间（秒）" diff --git a/applications/luci-app-aria2/Makefile b/applications/luci-app-aria2/Makefile index 0179f04f4c..f5b006c357 100644 --- a/applications/luci-app-aria2/Makefile +++ b/applications/luci-app-aria2/Makefile @@ -6,8 +6,32 @@ include $(TOPDIR)/rules.mk +PKG_NAME:=luci-app-aria2 + +# Version == major.minor.patch +# increase "minor" on new functionality and "patch" on patches/optimization +PKG_VERSION:=1.0.1 + +# Release == build +# increase on changes of translation files +PKG_RELEASE:=2 + +PKG_LICENSE:=Apache-2.0 +PKG_MAINTAINER:=Hsing-Wang Liao <kuoruan@gmail.com> + +# LuCI specific settings LUCI_TITLE:=LuCI Support for Aria2 LUCI_DEPENDS:=+aria2 +LUCI_PKGARCH:=all + +define Package/$(PKG_NAME)/config +# shown in make menuconfig <Help> +help + $(LUCI_TITLE) + . + Version: $(PKG_VERSION)-$(PKG_RELEASE) + $(PKG_MAINTAINER) +endef include ../../luci.mk diff --git a/applications/luci-app-aria2/luasrc/model/cbi/aria2.lua b/applications/luci-app-aria2/luasrc/model/cbi/aria2.lua index 780aea33de..3b61f95464 100644 --- a/applications/luci-app-aria2/luasrc/model/cbi/aria2.lua +++ b/applications/luci-app-aria2/luasrc/model/cbi/aria2.lua @@ -44,7 +44,7 @@ end m = Map("aria2", translate("Aria2"), translate("Aria2 is a multi-protocol & multi-source download utility, here you can configure the settings.")) -m:section(SimpleSection).template = "aria2/web_script" +m:section(SimpleSection).template = "aria2/overview_status" s = m:section(TypedSection, "aria2", translate("Aria2 Settings")) s.addremove = false @@ -80,19 +80,32 @@ o.rmempty = false o = s:taboption("general", Value, "rpc_passwd", translate("RPC password")) o:depends("rpc_auth_method", "user_pass") o.password = true -o.rmempty = false +o.rmempty = true o = s:taboption("general", Value, "rpc_secret", translate("RPC Token"), "<br/>" .. cfgbtn) o:depends("rpc_auth_method", "token") -o.rmempty = false +o.rmempty = true o = s:taboption("file", Value, "config_dir", translate("Config file directory")) o.placeholder = "/var/etc/aria2" +o = s:taboption("file", Flag, "enable_log", translate("Enable log"), translate("Log file is in the config file dir.")) +o.enabled = "true" +o.disabled = "false" + +o = s:taboption("file", ListValue, "log_level", translate("Log level")) +o:depends("enable_log", "true") +o:value("debug", translate("Debug")) +o:value("info", translate("Info")) +o:value("notice", translate("Notice")) +o:value("warn", translate("Warn")) +o:value("error", translate("Error")) + o = s:taboption("file", Value, "dir", translate("Default download directory")) o.rmempty = false -s:taboption("file", Value, "disk_cache", translate("Disk cache"), translate("in bytes, You can append K or M.")) +o = s:taboption("file", Value, "disk_cache", translate("Disk cache"), translate("in bytes, You can append K or M.")) +o.rmempty = true o = s:taboption("file", ListValue, "file_allocation", translate("Preallocation"), translate("\"Falloc\" is not available in all cases.")) o:value("none", translate("Off")) @@ -101,6 +114,7 @@ o:value("trunc", translate("Trunc")) o:value("falloc", translate("Falloc")) overall_speed_limit = s:taboption("task", Flag, "overall_speed_limit", translate("Overall speed limit enabled")) +overall_speed_limit.rmempty = true o = s:taboption("task", Value, "max_overall_download_limit", translate("Overall download limit"), translate("in bytes/sec, You can append K or M.")) o:depends("overall_speed_limit", "1") @@ -109,6 +123,7 @@ o = s:taboption("task", Value, "max_overall_upload_limit", translate("Overall up o:depends("overall_speed_limit", "1") task_speed_limit = s:taboption("task", Flag, "task_speed_limit", translate("Per task speed limit enabled")) +task_speed_limit.rmempty = true o = s:taboption("task", Value, "max_download_limit", translate("Per task download limit"), translate("in bytes/sec, You can append K or M.")) o:depends("task_speed_limit", "1") diff --git a/applications/luci-app-aria2/luasrc/view/aria2/web_script.htm b/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm index 933c6af702..b14cca228f 100644 --- a/applications/luci-app-aria2/luasrc/view/aria2/web_script.htm +++ b/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm @@ -1,5 +1,5 @@ <script type="text/javascript">//<![CDATA[ -XHR.poll(5, '<%=url([[admin]], [[services]], [[aria2]], [[status]])%>', null, +XHR.poll(5, '<%=luci.dispatcher.build_url("admin/services/aria2/status")%>', null, function(x, data) { var tb = document.getElementById('aria2_status'); if (data && tb) { diff --git a/applications/luci-app-aria2/po/templates/aria2.po b/applications/luci-app-aria2/po/templates/aria2.pot index 353d48ece9..9cf7099d08 100644 --- a/applications/luci-app-aria2/po/templates/aria2.po +++ b/applications/luci-app-aria2/po/templates/aria2.pot @@ -67,6 +67,30 @@ msgstr "" msgid "Generate Randomly" msgstr "" +msgid "Enable log" +msgstr "" + +msgid "Log file is in the config file dir." +msgstr "" + +msgid "Log level" +msgstr "" + +msgid "Debug" +msgstr "" + +msgid "Info" +msgstr "" + +msgid "Notice" +msgstr "" + +msgid "Warn" +msgstr "" + +msgid "Error" +msgstr "" + msgid "Config file directory" msgstr "" diff --git a/applications/luci-app-aria2/po/zh-cn/aria2.po b/applications/luci-app-aria2/po/zh-cn/aria2.po index 9b7d7bcc24..823699d7bd 100644 --- a/applications/luci-app-aria2/po/zh-cn/aria2.po +++ b/applications/luci-app-aria2/po/zh-cn/aria2.po @@ -2,7 +2,7 @@ msgid "Aria2" msgstr "" msgid "Aria2 is a multi-protocol & multi-source download utility, here you can configure the settings." -msgstr "Aria2 是一个支持多协议多线程的下载器, 你可以在这里对其进行配置." +msgstr "Aria2 是一个支持多协议多线程的下载器, 你可以在这里对其进行配置" msgid "Aria2 Status" msgstr "Aria2 状态" @@ -67,6 +67,30 @@ msgstr "RPC令牌" msgid "Generate Randomly" msgstr "随机生成" +msgid "Enable log" +msgstr "启用日志" + +msgid "Log file is in the config file dir." +msgstr "日志文件在配置文件目录下" + +msgid "Log level" +msgstr "日志记录等级" + +msgid "Debug" +msgstr "调试" + +msgid "Info" +msgstr "信息" + +msgid "Notice" +msgstr "注意" + +msgid "Warn" +msgstr "警告" + +msgid "Error" +msgstr "错误" + msgid "Config file directory" msgstr "配置文件目录" @@ -77,7 +101,7 @@ msgid "Disk cache" msgstr "磁盘缓存" msgid "in bytes, You can append K or M." -msgstr "单位 B, 你可以在数字后跟上 K 或 M." +msgstr "单位 B, 你可以在数字后跟上 K 或 M" msgid "Preallocation" msgstr "磁盘预分配" @@ -95,7 +119,7 @@ msgid "Falloc" msgstr "" msgid "\"Falloc\" is not available in all cases." -msgstr "\"Falloc\" 并不是在所有情况下都可用." +msgstr "\"Falloc\" 并不是在所有情况下都可用" msgid "Overall speed limit enabled" msgstr "启用全局限速" @@ -104,7 +128,7 @@ msgid "Overall download limit" msgstr "全局下载限速" msgid "in bytes/sec, You can append K or M." -msgstr "单位 B/s, 你可以在数字后跟上 K 或 M." +msgstr "单位 B/s, 你可以在数字后跟上 K 或 M" msgid "Overall upload limit" msgstr "全局上传限速" diff --git a/applications/luci-app-ddns/Makefile b/applications/luci-app-ddns/Makefile index c1a22c849e..55ce1cb3e3 100644 --- a/applications/luci-app-ddns/Makefile +++ b/applications/luci-app-ddns/Makefile @@ -10,11 +10,11 @@ PKG_NAME:=luci-app-ddns # Version == major.minor.patch # increase on new functionality (minor) or patches (patch) -PKG_VERSION:=2.4.6 +PKG_VERSION:=2.4.7 # Release == build # increase on changes of translation files -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com> diff --git a/applications/luci-app-ddns/luasrc/controller/ddns.lua b/applications/luci-app-ddns/luasrc/controller/ddns.lua index 1f2e6f2b93..9f5411b06e 100755 --- a/applications/luci-app-ddns/luasrc/controller/ddns.lua +++ b/applications/luci-app-ddns/luasrc/controller/ddns.lua @@ -18,11 +18,11 @@ local UTIL = require "luci.util" local DDNS = require "luci.tools.ddns" -- ddns multiused functions local srv_name = "ddns-scripts" -local srv_ver_min = "2.7.2" -- minimum version of service required +local srv_ver_min = "2.7.5" -- minimum version of service required local srv_ver_cmd = [[/usr/lib/ddns/dynamic_dns_updater.sh --version | awk {'print $2'}]] local app_name = "luci-app-ddns" local app_title = "Dynamic DNS" -local app_version = "2.4.6-1" +local app_version = "2.4.7-1" function index() local nxfs = require "nixio.fs" -- global definitions not available diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua index 1f5ad68c56..21827b7659 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua @@ -116,9 +116,9 @@ if not DDNS.has_forceip then value = value .. "<br />- " .. translate("You should install 'wget' or 'curl' or 'uclient-fetch' package.") end - if not (DDNS.has_bindhost or DDNS.has_hostip) then + if not DDNS.has_bindhost then value = value .. "<br />- " .. - translate("You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package for DNS requests.") + translate("You should install 'bind-host' or 'knot-host' or 'drill' package for DNS requests.") end fi.value = value end diff --git a/applications/luci-app-ddns/luasrc/tools/ddns.lua b/applications/luci-app-ddns/luasrc/tools/ddns.lua index 6b626b9e35..e55c673629 100755 --- a/applications/luci-app-ddns/luasrc/tools/ddns.lua +++ b/applications/luci-app-ddns/luasrc/tools/ddns.lua @@ -31,7 +31,7 @@ has_nslookup = (SYS.call( [[$(which nslookup) localhost 2>&1 | grep -qF "(null)" has_ipv6 = (NXFS.access("/proc/net/ipv6_route") and NXFS.access("/usr/sbin/ip6tables")) has_ssl = (has_wgetssl or has_curlssl or (has_fetch and has_fetchssl)) has_proxy = (has_wgetssl or has_curlpxy or has_fetch or has_bbwget) -has_forceip = ((has_wgetssl or has_curl or has_fetch) and (has_bindhost or has_hostip)) +has_forceip = (has_wgetssl or has_curl or has_fetch) -- only really needed for transfer has_dnsserver = (has_bindhost or has_hostip or has_nslookup) has_bindnet = (has_wgetssl or has_curl) has_cacerts = _check_certs() diff --git a/applications/luci-app-ddns/po/de/ddns.po b/applications/luci-app-ddns/po/de/ddns.po index 517fe36347..39c1fdc831 100644 --- a/applications/luci-app-ddns/po/de/ddns.po +++ b/applications/luci-app-ddns/po/de/ddns.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: luci-app-ddns 2.4.2-1\n" -"POT-Creation-Date: 2016-05-08 19:10+0200\n" -"PO-Revision-Date: 2016-05-08 19:12+0200\n" +"POT-Creation-Date: 2016-09-25 10:43+0200\n" +"PO-Revision-Date: 2016-09-25 10:43+0200\n" "Last-Translator: Christian Schönebeck <christian.schoenebeck@gmail.com>\n" "Language-Team: \n" "Language: de\n" @@ -670,13 +670,6 @@ msgstr "" "Systemprotokoll geschrieben." msgid "" -"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package " -"for DNS requests." -msgstr "" -"Sie sollten das Programmpakete 'bind-host' oder 'knot-host' oder 'drill' " -"oder 'hostip' für DNS Anfragen installieren." - -msgid "" "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' " "package, if you need to specify a DNS server to detect your registered IP." msgstr "" diff --git a/applications/luci-app-ddns/po/templates/ddns.pot b/applications/luci-app-ddns/po/templates/ddns.pot index d134ea1bfb..194bf816a1 100644 --- a/applications/luci-app-ddns/po/templates/ddns.pot +++ b/applications/luci-app-ddns/po/templates/ddns.pot @@ -571,11 +571,6 @@ msgid "" msgstr "" msgid "" -"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' package " -"for DNS requests." -msgstr "" - -msgid "" "You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' " "package, if you need to specify a DNS server to detect your registered IP." msgstr "" diff --git a/applications/luci-app-firewall/po/it/firewall.po b/applications/luci-app-firewall/po/it/firewall.po index 4fef75ec67..064f63d502 100644 --- a/applications/luci-app-firewall/po/it/firewall.po +++ b/applications/luci-app-firewall/po/it/firewall.po @@ -93,7 +93,7 @@ msgid "Do not rewrite" msgstr "" msgid "Drop invalid packets" -msgstr "" +msgstr "Attiva" msgid "Enable" msgstr "" @@ -108,28 +108,28 @@ msgid "Enable logging on this zone" msgstr "" msgid "External IP address" -msgstr "" +msgstr "Indirizzo IP Esterno" msgid "External port" msgstr "Porta Esterna" msgid "External zone" -msgstr "" +msgstr "Zona Esterna" msgid "Extra arguments" -msgstr "" +msgstr "Comandi extra" msgid "Firewall" msgstr "Firewall" msgid "Firewall - Custom Rules" -msgstr "" +msgstr "Firewall - Regole Personalizzate" msgid "Firewall - Port Forwards" -msgstr "" +msgstr "Firewall - Inoltro Porte" msgid "Firewall - Traffic Rules" -msgstr "" +msgstr "Firewall - Regole Traffico" msgid "Firewall - Zone Settings" msgstr "Firewall - Opzioni delle Zone" @@ -138,10 +138,10 @@ msgid "Force connection tracking" msgstr "" msgid "Forward" -msgstr "" +msgstr "Inoltra" msgid "Forward to" -msgstr "" +msgstr "Inoltro a" msgid "Friday" msgstr "" @@ -174,7 +174,7 @@ msgid "IPv6 only" msgstr "Solo IPv6" msgid "Input" -msgstr "" +msgstr "Ingresso" msgid "Inter-Zone Forwarding" msgstr "" @@ -186,7 +186,7 @@ msgid "Internal port" msgstr "Porta interna" msgid "Internal zone" -msgstr "" +msgstr "Zona Interna" msgid "Limit log messages" msgstr "" @@ -195,7 +195,7 @@ msgid "MSS clamping" msgstr "" msgid "Masquerading" -msgstr "" +msgstr "Dettagli" msgid "Match" msgstr "" @@ -232,7 +232,7 @@ msgid "New forward rule" msgstr "" msgid "New input rule" -msgstr "" +msgstr "Nuova regola di inoltro porta" msgid "New port forward" msgstr "" @@ -272,7 +272,8 @@ msgstr "" msgid "" "Port forwarding allows remote computers on the Internet to connect to a " "specific computer or service within the private LAN." -msgstr "" +msgstr "L'inoltro delle porte permette ai computer in remoto su Internet di" +"connettersi a uno specifico computer o servizio presente nella tua LAN privata" msgid "Protocol" msgstr "Protocollo" @@ -379,7 +380,8 @@ msgstr "" msgid "" "The firewall creates zones over your network interfaces to control network " "traffic flow." -msgstr "" +msgstr "Il firewall crea delle zone nelle tue interfacce di rete per controllare" +"il flusso del traffico." msgid "" "The options below control the forwarding policies between this zone (%s) and " diff --git a/applications/luci-app-p2pblock/Makefile b/applications/luci-app-p2pblock/Makefile index 4dbeb5eaa5..137849cd25 100644 --- a/applications/luci-app-p2pblock/Makefile +++ b/applications/luci-app-p2pblock/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI Support for the Freifunk P2P-Block addon -LUCI_DEPENDS:=+luci-app-firewall +freifunk-p2pblock +LUCI_DEPENDS:=+luci-app-firewall +freifunk-p2pblock @BROKEN include ../../luci.mk diff --git a/applications/luci-app-pbx-voicemail/Makefile b/applications/luci-app-pbx-voicemail/Makefile index d31d429f13..eefe0fd249 100644 --- a/applications/luci-app-pbx-voicemail/Makefile +++ b/applications/luci-app-pbx-voicemail/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI PBX Administration Voicemail Support -LUCI_DEPENDS:=+luci-app-pbx +asterisk18 +msmtp +coreutils-base64 +LUCI_DEPENDS:=+luci-app-pbx +asterisk18 +msmtp +coreutils-base64 @BROKEN include ../../luci.mk diff --git a/applications/luci-app-pbx/Makefile b/applications/luci-app-pbx/Makefile index 1379dcf890..772713b444 100644 --- a/applications/luci-app-pbx/Makefile +++ b/applications/luci-app-pbx/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI PBX Administration -LUCI_DEPENDS:= \ +LUCI_DEPENDS:= @BROKEN \ +asterisk18 +asterisk18-app-authenticate +asterisk18-app-disa \ +asterisk18-app-setcallerid +asterisk18-app-system +asterisk18-chan-gtalk \ +asterisk18-codec-a-mu +asterisk18-codec-alaw +asterisk18-func-cut \ diff --git a/applications/luci-app-privoxy/po/de/privoxy.po b/applications/luci-app-privoxy/po/de/privoxy.po index b01f99e31c..9e2a29eb63 100644 --- a/applications/luci-app-privoxy/po/de/privoxy.po +++ b/applications/luci-app-privoxy/po/de/privoxy.po @@ -51,6 +51,9 @@ msgstr "" "Angenommenes serverseitiges Keep-Alive-Timeout (in Sekunden), falls nicht " "vom Server festgelegt." +msgid "Boot delay" +msgstr "" + msgid "CGI user interface" msgstr "Protokolliert die CGI Benutzer Schnittstelle" @@ -79,12 +82,21 @@ msgstr "Protokolliert Weiterleitungen" msgid "Debug regular expression filters" msgstr "Protokolliert Filter für reguläre Ausdrücke" +msgid "Delay (in seconds) during system boot before Privoxy start" +msgstr "" + msgid "Directory does not exist!" msgstr "Verzeichnis existiert nicht!" msgid "Disabled == Transparent Proxy Mode" msgstr "Deaktiviert == Transparent Proxy Betrieb" +msgid "Documentation" +msgstr "" + +msgid "During delay ifup-events are not monitored !" +msgstr "" + msgid "Enable proxy authentication forwarding" msgstr "Aktivieren die Weiterleitung von Proxy-Authentifizierungen" @@ -146,9 +158,6 @@ msgstr "Ungültige Email Adresse" msgid "It is NOT recommended for the casual user." msgstr "Es wird NICHT für den gelegentlichen Anwender empfohlen." -msgid "Local Set-up" -msgstr "Lokale Einstellungen" - msgid "Location of the Privoxy User Manual." msgstr "Ort des Privoxy Benutzer Handbuches" @@ -218,6 +227,9 @@ msgstr "Maximale Größe (in KB) des Puffers für die Inhaltsfilterung." msgid "Miscellaneous" msgstr "Verschiedenes" +msgid "NOT installed" +msgstr "" + msgid "No trailing '/', please." msgstr "Bitte kein '/' am Ende." @@ -242,6 +254,9 @@ msgid "" "Only when using 'external filters', Privoxy has to create temporary files." msgstr "" +msgid "Please install current version !" +msgstr "" + msgid "Please press [Read] button" msgstr "Bitte Protokolldatei einlesen" @@ -286,8 +301,11 @@ msgstr "Protokolliert jeden Verbindungsstatus" msgid "Show header parsing" msgstr "Protokolliert das 'Header parsing'" -msgid "Software update required" -msgstr "Softwareaktualisierung nötig" +msgid "Software package '%s' is not installed." +msgstr "" + +msgid "Software package '%s' is outdated." +msgstr "" msgid "Start" msgstr "Start" @@ -313,6 +331,9 @@ msgstr "Syntax: target_pattern http_parent[:port]" msgid "Syntax: target_pattern socks_proxy[:port] http_parent[:port]" msgstr "Syntax: target_pattern socks_proxy[:port] http_parent[:port]" +msgid "System" +msgstr "" + msgid "" "The actions file(s) to use. Multiple actionsfile lines are permitted, and " "are in fact recommended!" @@ -334,13 +355,6 @@ msgstr "" "gepufferten Inhaltes übergeben wird." msgid "" -"The currently installed 'privoxy' package is not supported by LuCI " -"application." -msgstr "" -"Das aktuell installierte 'privoxy' Paket wird von dieser LuCI Anwendung " -"NICHT unterstützt." - -msgid "" "The directory where all logging takes place (i.e. where the logfile is " "located)." msgstr "Das Verzeichnis in dem die Protokolldatei gespeichert wird." @@ -424,6 +438,9 @@ msgstr "Benutzerdefinierte Anpassungen" msgid "Value is not a number" msgstr "Eingabe ist keine Zahl" +msgid "Value not between 0 and 300" +msgstr "" + msgid "Value not between 0 and 9" msgstr "Wert nicht zwischen 0 und 9" @@ -501,3 +518,16 @@ msgstr "oder höher" msgid "required" msgstr "benötigt" + +#~ msgid "Local Set-up" +#~ msgstr "Lokale Einstellungen" + +#~ msgid "Software update required" +#~ msgstr "Softwareaktualisierung nötig" + +#~ msgid "" +#~ "The currently installed 'privoxy' package is not supported by LuCI " +#~ "application." +#~ msgstr "" +#~ "Das aktuell installierte 'privoxy' Paket wird von dieser LuCI Anwendung " +#~ "NICHT unterstützt." diff --git a/applications/luci-app-privoxy/po/sv/privoxy.po b/applications/luci-app-privoxy/po/sv/privoxy.po index d9c63aa3b0..14e47e190f 100644 --- a/applications/luci-app-privoxy/po/sv/privoxy.po +++ b/applications/luci-app-privoxy/po/sv/privoxy.po @@ -33,6 +33,9 @@ msgid "" "server." msgstr "" +msgid "Boot delay" +msgstr "" + msgid "CGI user interface" msgstr "CGI-användargränssnitt" @@ -57,12 +60,21 @@ msgstr "Felsök omdirigeringar" msgid "Debug regular expression filters" msgstr "" +msgid "Delay (in seconds) during system boot before Privoxy start" +msgstr "" + msgid "Directory does not exist!" msgstr "Mappen finns inte!" msgid "Disabled == Transparent Proxy Mode" msgstr "Inaktiverad == " +msgid "Documentation" +msgstr "" + +msgid "During delay ifup-events are not monitored !" +msgstr "" + msgid "Enable proxy authentication forwarding" msgstr "" @@ -115,9 +127,6 @@ msgstr "Ogiltig e-postadress" msgid "It is NOT recommended for the casual user." msgstr "Det är INTE rekommenderat för den vanliga användaren." -msgid "Local Set-up" -msgstr "Lokal installation" - msgid "Location of the Privoxy User Manual." msgstr "Plats för Privoxy's användarmanual." @@ -182,6 +191,9 @@ msgstr "" msgid "Miscellaneous" msgstr "Diverse" +msgid "NOT installed" +msgstr "" + msgid "No trailing '/', please." msgstr "Vänligen, inget eftersläpande '/'" @@ -201,6 +213,9 @@ msgid "" "Only when using 'external filters', Privoxy has to create temporary files." msgstr "" +msgid "Please install current version !" +msgstr "" + msgid "Please press [Read] button" msgstr "Vänligen tryck på [Läs]-knappen" @@ -237,8 +252,11 @@ msgstr "Visa varje anslutnings status" msgid "Show header parsing" msgstr "" -msgid "Software update required" -msgstr "Uppdatering av mjukvara krävs" +msgid "Software package '%s' is not installed." +msgstr "" + +msgid "Software package '%s' is outdated." +msgstr "" msgid "Start" msgstr "Starta" @@ -264,6 +282,9 @@ msgstr "" msgid "Syntax: target_pattern socks_proxy[:port] http_parent[:port]" msgstr "" +msgid "System" +msgstr "" + msgid "" "The actions file(s) to use. Multiple actionsfile lines are permitted, and " "are in fact recommended!" @@ -279,11 +300,6 @@ msgid "" msgstr "" msgid "" -"The currently installed 'privoxy' package is not supported by LuCI " -"application." -msgstr "" - -msgid "" "The directory where all logging takes place (i.e. where the logfile is " "located)." msgstr "" @@ -348,6 +364,9 @@ msgstr "Anpassningar för användare" msgid "Value is not a number" msgstr "Värdet är inte ett nummer" +msgid "Value not between 0 and 300" +msgstr "" + msgid "Value not between 0 and 9" msgstr "Värdet är inte mellan 0 och 9" @@ -415,3 +434,9 @@ msgstr "eller högre" msgid "required" msgstr "krävs" + +#~ msgid "Local Set-up" +#~ msgstr "Lokal installation" + +#~ msgid "Software update required" +#~ msgstr "Uppdatering av mjukvara krävs" diff --git a/applications/luci-app-privoxy/po/templates/privoxy.pot b/applications/luci-app-privoxy/po/templates/privoxy.pot index 150ee3157f..2e44ea8b7c 100644 --- a/applications/luci-app-privoxy/po/templates/privoxy.pot +++ b/applications/luci-app-privoxy/po/templates/privoxy.pot @@ -31,6 +31,9 @@ msgid "" "server." msgstr "" +msgid "Boot delay" +msgstr "" + msgid "CGI user interface" msgstr "" @@ -55,12 +58,21 @@ msgstr "" msgid "Debug regular expression filters" msgstr "" +msgid "Delay (in seconds) during system boot before Privoxy start" +msgstr "" + msgid "Directory does not exist!" msgstr "" msgid "Disabled == Transparent Proxy Mode" msgstr "" +msgid "Documentation" +msgstr "" + +msgid "During delay ifup-events are not monitored !" +msgstr "" + msgid "Enable proxy authentication forwarding" msgstr "" @@ -111,9 +123,6 @@ msgstr "" msgid "It is NOT recommended for the casual user." msgstr "" -msgid "Local Set-up" -msgstr "" - msgid "Location of the Privoxy User Manual." msgstr "" @@ -178,6 +187,9 @@ msgstr "" msgid "Miscellaneous" msgstr "" +msgid "NOT installed" +msgstr "" + msgid "No trailing '/', please." msgstr "" @@ -196,6 +208,9 @@ msgid "" "Only when using 'external filters', Privoxy has to create temporary files." msgstr "" +msgid "Please install current version !" +msgstr "" + msgid "Please press [Read] button" msgstr "" @@ -232,7 +247,10 @@ msgstr "" msgid "Show header parsing" msgstr "" -msgid "Software update required" +msgid "Software package '%s' is not installed." +msgstr "" + +msgid "Software package '%s' is outdated." msgstr "" msgid "Start" @@ -259,6 +277,9 @@ msgstr "" msgid "Syntax: target_pattern socks_proxy[:port] http_parent[:port]" msgstr "" +msgid "System" +msgstr "" + msgid "" "The actions file(s) to use. Multiple actionsfile lines are permitted, and " "are in fact recommended!" @@ -274,11 +295,6 @@ msgid "" msgstr "" msgid "" -"The currently installed 'privoxy' package is not supported by LuCI " -"application." -msgstr "" - -msgid "" "The directory where all logging takes place (i.e. where the logfile is " "located)." msgstr "" @@ -343,6 +359,9 @@ msgstr "" msgid "Value is not a number" msgstr "" +msgid "Value not between 0 and 300" +msgstr "" + msgid "Value not between 0 and 9" msgstr "" diff --git a/applications/luci-app-privoxy/po/zh-cn/privoxy.po b/applications/luci-app-privoxy/po/zh-cn/privoxy.po index f69a8f9280..75d1a921cf 100644 --- a/applications/luci-app-privoxy/po/zh-cn/privoxy.po +++ b/applications/luci-app-privoxy/po/zh-cn/privoxy.po @@ -1,468 +1,464 @@ -msgid ""
-msgstr ""
-"Project-Id-Version: luci-app-privoxy\n"
-"POT-Creation-Date: 2015-06-10 20:16+0100\n"
-"PO-Revision-Date: 2015-06-10 20:16+0100\n"
-"Last-Translator: maz-1 <ohmygod19993 at gmail dotcom>\n"
-"Language-Team: \n"
-"Language: zh-cn\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-msgid ""
-"A URL to be displayed in the error page that users will see if access to an "
-"untrusted page is denied."
-msgstr ""
-"当用户试图访问不受信任的页面时，错误页面所显示的URL。"
-
-
-msgid ""
-"A URL to documentation about the local Privoxy setup, configuration or "
-"policies."
-msgstr ""
-"指向Privoxy安装、设置和规则说明文档的URL"
-
-
-msgid "A directory where Privoxy can create temporary files."
-msgstr "Privoxy存放临时文件的目录。"
-
-msgid "Access Control"
-msgstr "访问控制"
-
-msgid "Actions that are applied to all sites and maybe overruled later on."
-msgstr ""
-"作用在所有站点上的规则，可能被后面的规则覆盖。"
-
-
-msgid "An alternative directory where the templates are loaded from."
-msgstr "可选的目录，放在里面的模板会被加载。"
-
-msgid "An email address to reach the Privoxy administrator."
-msgstr "用于联系privoxy管理员的邮箱地址。"
-
-msgid ""
-"Assumed server-side keep-alive timeout (in seconds) if not specified by the "
-"server."
-msgstr ""
-"当服务端没有指定超时时间时假定的超时时间（单位秒）。"
-
-msgid "CGI user interface"
-msgstr "CGI用户界面"
-
-msgid "Common Log Format"
-msgstr "通用日志格式"
-
-msgid ""
-"Configure here the routing of HTTP requests through a chain of multiple "
-"proxies. Note that parent proxies can severely decrease your privacy level. "
-"Also specified here are SOCKS proxies."
-msgstr ""
-"在这里设置http请求所经过的多重代理链。"
-"注意父级代理可能严重降低你的隐私安全度。"
-"在这里还可以设置SOCKS代理。"
-
-msgid "Debug GIF de-animation"
-msgstr "GIF动画日志"
-
-msgid "Debug force feature"
-msgstr "force feature日志"
-
-msgid "Debug redirects"
-msgstr "重定向日志"
-
-msgid "Debug regular expression filters"
-msgstr "正则表达式日志"
-
-msgid "Directory does not exist!"
-msgstr "目录不存在！"
-
-msgid "Disabled == Transparent Proxy Mode"
-msgstr "禁用 == 透明代理模式"
-
-msgid "Enable proxy authentication forwarding"
-msgstr "允许转发代理认证"
-
-msgid ""
-"Enable/Disable autostart of Privoxy on system startup and interface events"
-msgstr ""
-"开启/关闭Privoxy在系统启动或者设置界面更改时自动启动。"
-
-msgid "Enable/Disable filtering when Privoxy starts."
-msgstr "Privoxy启动时开启/关闭过滤。"
-
-msgid "Enabled"
-msgstr "已开启"
-
-msgid ""
-"Enabling this option is NOT recommended if there is no parent proxy that "
-"requires authentication!"
-msgstr ""
-"父级代理不需要认证时不推荐开启这个选项！"
-
-msgid "File '%s' not found inside Configuration Directory"
-msgstr "文件 '%s' 没有在设置目录中找到！"
-
-msgid "File not found or empty"
-msgstr "文件不存在或为空"
-
-msgid "Files and Directories"
-msgstr "文件和目录"
-
-msgid "For help use link at the relevant option"
-msgstr ""
-"在相应选项下的连接可获取帮助。"
-
-msgid "Forwarding"
-msgstr "转发"
-
-msgid ""
-"If enabled, Privoxy hides the 'go there anyway' link. The user obviously "
-"should not be able to bypass any blocks."
-msgstr ""
-"如果启用，Privoxy会隐藏'go there anyway'链接。用户显然不应能绕过屏蔽。"
-
-msgid ""
-"If you intend to operate Privoxy for more users than just yourself, it might "
-"be a good idea to let them know how to reach you, what you block and why you "
-"do that, your policies, etc."
-msgstr ""
-"如果除了你还有其他用户通过privoxy连接，让他们知道如何联系你、什么内容被屏蔽了、"
-"你为什么要这么做、你所制定的规范等等是一个好主意。"
-
-msgid "Invalid email address"
-msgstr "邮箱地址无效"
-
-msgid "It is NOT recommended for the casual user."
-msgstr "不推荐新手使用。"
-
-msgid "Local Set-up"
-msgstr "本地设置"
-
-msgid "Location of the Privoxy User Manual."
-msgstr "Privoxy用户手册位置"
-
-msgid "Log File Viewer"
-msgstr "日志查看器"
-
-msgid "Log all data read from the network"
-msgstr "记录所有从网络接收的数据"
-
-msgid "Log all data written to the network"
-msgstr "记录所有发送给网络的数据"
-
-msgid "Log the applying actions"
-msgstr "记录被应用的规则"
-
-msgid ""
-"Log the destination for each request Privoxy let through. See also 'Debug "
-"1024'."
-msgstr ""
-"记录Privoxy所允许的所有请求。另请参考'Debug 1024'。"
-
-msgid ""
-"Log the destination for requests Privoxy didn't let through, and the reason "
-"why."
-msgstr ""
-"记录被Privoxy拒绝的请求目标以及拒绝原因。"
-
-msgid "Logging"
-msgstr "日志"
-
-msgid "Main actions file"
-msgstr "主要规则文件"
-
-msgid "Mandatory Input: No Data given!"
-msgstr "必需选项: 没有设置数据！"
-
-msgid "Mandatory Input: No Directory given!"
-msgstr "必需选项: 没有设置目录！"
-
-msgid "Mandatory Input: No File given!"
-msgstr "必需选项: 没有设置文件！"
-
-msgid "Mandatory Input: No Port given!"
-msgstr "必需选项: 没有设置端口！"
-
-msgid "Mandatory Input: No files given!"
-msgstr "必需选项: 没有设置文件！"
-
-msgid "Mandatory Input: No valid IPv4 address or host given!"
-msgstr ""
-"必需选项: 没有设置有效的IPV4地址或者主机！"
-
-msgid "Mandatory Input: No valid IPv6 address given!"
-msgstr "必需选项: 没有设置有效的IPV6地址！"
-
-msgid "Mandatory Input: No valid Port given!"
-msgstr "必需选项: 没有设置有效的端口！"
-
-msgid "Maximum number of client connections that will be served."
-msgstr "客户端数量上限。"
-
-msgid "Maximum size (in KB) of the buffer for content filtering."
-msgstr "内容过滤的最大缓冲（单位KB）。"
-
-msgid "Miscellaneous"
-msgstr "杂项"
-
-msgid "No trailing '/', please."
-msgstr "路径结尾不要加'/' ."
-
-msgid "Non-fatal errors - *we highly recommended enabling this*"
-msgstr ""
-"非致命性错误 - * 建议开启 *"
-
-msgid ""
-"Number of seconds after which a socket times out if no data is received."
-msgstr ""
-"socket连接未收到数据的超时时间。"
-
-msgid ""
-"Number of seconds after which an open connection will no longer be reused."
-msgstr ""
-"一个开放的连接不再重复使用的超时时间。"
-
-msgid ""
-"Only when using 'external filters', Privoxy has to create temporary files."
-msgstr ""
-"只有使用外置规则时，privoxy才需要创建临时文件。"
-
-msgid "Please press [Read] button"
-msgstr "请点击[读取]按钮"
-
-msgid "Please read Privoxy manual for details!"
-msgstr "请阅读Privoxy手册以了解详情！"
-
-msgid "Please update to the current version!"
-msgstr "请升级到当前版本！"
-
-msgid "Privoxy WEB proxy"
-msgstr "Privoxy 网络代理"
-
-msgid ""
-"Privoxy can (and normally does) use a number of other files for additional "
-"configuration, help and logging. This section of the configuration file "
-"tells Privoxy where to find those other files."
-msgstr ""
-"Privoxy可以使用其他一些文件用于附加设置，帮助和日志。这个区域用来告诉Privoxy从哪里找到这些文件。"
-
-msgid ""
-"Privoxy is a non-caching web proxy with advanced filtering capabilities for "
-"enhancing privacy, modifying web page data and HTTP headers, controlling "
-"access, and removing ads and other obnoxious Internet junk."
-msgstr ""
-"Privoxy是一个无缓存的网络代理，具有高级过滤功能，能够修改网页数据和HTTP头，控制访问，移除广告等。"
-
-msgid "Read / Reread log file"
-msgstr "读取/刷新日志文件"
-
-msgid "Show I/O status"
-msgstr "显示 I/O 状态"
-
-msgid "Show each connection status"
-msgstr "显示每个连接的状态"
-
-msgid "Show header parsing"
-msgstr "Show header parsing"
-
-msgid "Software update required"
-msgstr "需要升级软件"
-
-msgid "Start"
-msgstr "启动"
-
-msgid "Start / Stop"
-msgstr "启动 / 停止"
-
-msgid "Start/Stop Privoxy WEB Proxy"
-msgstr "启动/停止 Privoxy 网络代理"
-
-msgid "Startup banner and warnings."
-msgstr "启动标语和警告。"
-
-msgid "Syntax:"
-msgstr "格式:"
-
-msgid "Syntax: Client header names delimited by spaces."
-msgstr "格式: Client header names delimited by spaces."
-
-msgid "Syntax: target_pattern http_parent[:port]"
-msgstr "格式: target_pattern http_parent[:port]"
-
-msgid "Syntax: target_pattern socks_proxy[:port] http_parent[:port]"
-msgstr "格式: target_pattern socks_proxy[:port] http_parent[:port]"
-
-msgid ""
-"The actions file(s) to use. Multiple actionsfile lines are permitted, and "
-"are in fact recommended!"
-msgstr ""
-"所使用的规则文件。允许并且推荐使用多个规则文件。"
-
-msgid ""
-"The address and TCP port on which Privoxy will listen for client requests."
-msgstr ""
-"Privoxy接收客户端请求时监听的地址和TCP端口。"
-
-msgid ""
-"The compression level that is passed to the zlib library when compressing "
-"buffered content."
-msgstr ""
-"使用zlib压缩缓冲内容时的压缩级别。"
-
-msgid ""
-"The currently installed 'privoxy' package is not supported by LuCI "
-"application."
-msgstr ""
-"目前安装的privoxy版本不被luci支持。"
-
-msgid ""
-"The directory where all logging takes place (i.e. where the logfile is "
-"located)."
-msgstr "所有日志所在的目录。"
-
-msgid "The directory where the other configuration files are located."
-msgstr "其他设置文件所在的目录。"
-
-msgid ""
-"The filter files contain content modification rules that use regular "
-"expressions."
-msgstr ""
-"过滤文件包含了使用正则表达式编写的内容修改规则"
-
-msgid "The hostname shown on the CGI pages."
-msgstr "CGI页面显示的主机名。"
-
-msgid "The log file to use. File name, relative to log directory."
-msgstr ""
-"日志文件名称，与日志路径相对。"
-
-msgid "The order in which client headers are sorted before forwarding them."
-msgstr ""
-"转发数据前，client headers的排序。"
-
-msgid ""
-"The status code Privoxy returns for pages blocked with +handle-as-empty-"
-"document."
-msgstr ""
-"当页面因为handle-as-empty-document规则被阻止时返回的状态码（选上为200 OK，不选上为403 Forbidden）"
-
-msgid ""
-"The trust mechanism is an experimental feature for building white-lists and "
-"should be used with care."
-msgstr ""
-"信任机制是一个实验性的白名单特性，使用时应小心。"
-
-msgid ""
-"The value of this option only matters if the experimental trust mechanism "
-"has been activated."
-msgstr ""
-"只有开启了信任机制时这个选项的值才有效"
-
-msgid ""
-"This option is only there for debugging purposes. It will drastically reduce "
-"performance."
-msgstr ""
-"这个选项仅用于调试，开启后会极大地降低性能。"
-
-msgid ""
-"This option will be removed in future releases as it has been obsoleted by "
-"the more general header taggers."
-msgstr "这个选项在以后的版本中将被移除，因为它被header taggers所取代了。"
-
-msgid ""
-"This tab controls the security-relevant aspects of Privoxy's configuration."
-msgstr ""
-"这个标签用于设置与安全相关的Privoxy选项。"
-
-msgid ""
-"Through which SOCKS proxy (and optionally to which parent HTTP proxy) "
-"specific requests should be routed."
-msgstr ""
-"指定的请求应该通过哪一个SOCKS代理（并且通过哪一个HTTP父代理，可选）"
-
-msgid "To which parent HTTP proxy specific requests should be routed."
-msgstr ""
-"请求应转发至哪一个父级HTTP代理。"
-
-msgid "User customizations"
-msgstr "用户自定义"
-
-msgid "Value is not a number"
-msgstr "输入值不是数字"
-
-msgid "Value not between 0 and 9"
-msgstr "输入值不在0和9之间。"
-
-msgid "Value not between 1 and 4096"
-msgstr "输入值不在1和4096之间"
-
-msgid "Value not greater 0 or empty"
-msgstr "输入值为空或者不是大于零。"
-
-msgid "Value range 1 to 4096, no entry defaults to 4096"
-msgstr "输入值为1到4096，默认为4096"
-
-msgid "Version"
-msgstr "版本"
-
-msgid "Version Information"
-msgstr "版本信息"
-
-msgid "Whether intercepted requests should be treated as valid."
-msgstr "被拦截的请求是否应被当作有效的。"
-
-msgid ""
-"Whether or not Privoxy recognizes special HTTP headers to change toggle "
-"state."
-msgstr ""
-"Privoxy是否识别特殊的HTTP头以切换状态。"
-
-msgid "Whether or not buffered content is compressed before delivery."
-msgstr ""
-"缓冲内容在传递之前是否压缩。"
-
-msgid ""
-"Whether or not outgoing connections that have been kept alive should be "
-"shared between different incoming connections."
-msgstr ""
-"持久出站连接是否应在不同的入站连接之间共享。"
-
-msgid "Whether or not pipelined requests should be served."
-msgstr "是否处理管道化的请求。"
-
-msgid "Whether or not proxy authentication through Privoxy should work."
-msgstr "是否可以通过Privoxy进行代理验证。"
-
-msgid "Whether or not the web-based actions file editor may be used."
-msgstr "是否使用基于网页的规则编辑器。"
-
-msgid "Whether or not the web-based toggle feature may be used."
-msgstr "是否启用基于网页的切换功能。"
-
-msgid "Whether requests to Privoxy's CGI pages can be blocked or redirected."
-msgstr "访问Privoxy CGI页面的请求是否可以被拦截或重定向。"
-
-
-msgid ""
-"Whether the CGI interface should stay compatible with broken HTTP clients."
-msgstr ""
-"CGI界面是否应兼容过时的HTTP客户端。"
-
-msgid "Whether to run only one server thread."
-msgstr "是否只运行一个服务线程。"
-
-msgid "Who can access what."
-msgstr "谁可以访问什么。"
-
-msgid "installed"
-msgstr "已安装"
-
-msgid "or higher"
-msgstr "或更高"
-
-msgid "required"
-msgstr "需要"
+msgid "" +msgstr "" +"Project-Id-Version: luci-app-privoxy\n" +"POT-Creation-Date: 2015-06-10 20:16+0100\n" +"PO-Revision-Date: 2015-06-10 20:16+0100\n" +"Last-Translator: maz-1 <ohmygod19993 at gmail dotcom>\n" +"Language-Team: \n" +"Language: zh-cn\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-SourceCharset: UTF-8\n" + +msgid "" +"A URL to be displayed in the error page that users will see if access to an " +"untrusted page is denied." +msgstr "当用户试图访问不受信任的页面时，错误页面所显示的URL。" + +msgid "" +"A URL to documentation about the local Privoxy setup, configuration or " +"policies." +msgstr "指向Privoxy安装、设置和规则说明文档的URL" + +msgid "A directory where Privoxy can create temporary files." +msgstr "Privoxy存放临时文件的目录。" + +msgid "Access Control" +msgstr "访问控制" + +msgid "Actions that are applied to all sites and maybe overruled later on." +msgstr "作用在所有站点上的规则，可能被后面的规则覆盖。" + +msgid "An alternative directory where the templates are loaded from." +msgstr "可选的目录，放在里面的模板会被加载。" + +msgid "An email address to reach the Privoxy administrator." +msgstr "用于联系privoxy管理员的邮箱地址。" + +msgid "" +"Assumed server-side keep-alive timeout (in seconds) if not specified by the " +"server." +msgstr "当服务端没有指定超时时间时假定的超时时间（单位秒）。" + +msgid "Boot delay" +msgstr "" + +msgid "CGI user interface" +msgstr "CGI用户界面" + +msgid "Common Log Format" +msgstr "通用日志格式" + +msgid "" +"Configure here the routing of HTTP requests through a chain of multiple " +"proxies. Note that parent proxies can severely decrease your privacy level. " +"Also specified here are SOCKS proxies." +msgstr "" +"在这里设置http请求所经过的多重代理链。注意父级代理可能严重降低你的隐私安全" +"度。在这里还可以设置SOCKS代理。" + +msgid "Debug GIF de-animation" +msgstr "GIF动画日志" + +msgid "Debug force feature" +msgstr "force feature日志" + +msgid "Debug redirects" +msgstr "重定向日志" + +msgid "Debug regular expression filters" +msgstr "正则表达式日志" + +msgid "Delay (in seconds) during system boot before Privoxy start" +msgstr "" + +msgid "Directory does not exist!" +msgstr "目录不存在！" + +msgid "Disabled == Transparent Proxy Mode" +msgstr "禁用 == 透明代理模式" + +msgid "Documentation" +msgstr "" + +msgid "During delay ifup-events are not monitored !" +msgstr "" + +msgid "Enable proxy authentication forwarding" +msgstr "允许转发代理认证" + +msgid "" +"Enable/Disable autostart of Privoxy on system startup and interface events" +msgstr "开启/关闭Privoxy在系统启动或者设置界面更改时自动启动。" + +msgid "Enable/Disable filtering when Privoxy starts." +msgstr "Privoxy启动时开启/关闭过滤。" + +msgid "Enabled" +msgstr "已开启" + +msgid "" +"Enabling this option is NOT recommended if there is no parent proxy that " +"requires authentication!" +msgstr "父级代理不需要认证时不推荐开启这个选项！" + +msgid "File '%s' not found inside Configuration Directory" +msgstr "文件 '%s' 没有在设置目录中找到！" + +msgid "File not found or empty" +msgstr "文件不存在或为空" + +msgid "Files and Directories" +msgstr "文件和目录" + +msgid "For help use link at the relevant option" +msgstr "在相应选项下的连接可获取帮助。" + +msgid "Forwarding" +msgstr "转发" + +msgid "" +"If enabled, Privoxy hides the 'go there anyway' link. The user obviously " +"should not be able to bypass any blocks." +msgstr "如果启用，Privoxy会隐藏'go there anyway'链接。用户显然不应能绕过屏蔽。" + +msgid "" +"If you intend to operate Privoxy for more users than just yourself, it might " +"be a good idea to let them know how to reach you, what you block and why you " +"do that, your policies, etc." +msgstr "" +"如果除了你还有其他用户通过privoxy连接，让他们知道如何联系你、什么内容被屏蔽" +"了、你为什么要这么做、你所制定的规范等等是一个好主意。" + +msgid "Invalid email address" +msgstr "邮箱地址无效" + +msgid "It is NOT recommended for the casual user." +msgstr "不推荐新手使用。" + +msgid "Location of the Privoxy User Manual." +msgstr "Privoxy用户手册位置" + +msgid "Log File Viewer" +msgstr "日志查看器" + +msgid "Log all data read from the network" +msgstr "记录所有从网络接收的数据" + +msgid "Log all data written to the network" +msgstr "记录所有发送给网络的数据" + +msgid "Log the applying actions" +msgstr "记录被应用的规则" + +msgid "" +"Log the destination for each request Privoxy let through. See also 'Debug " +"1024'." +msgstr "记录Privoxy所允许的所有请求。另请参考'Debug 1024'。" + +msgid "" +"Log the destination for requests Privoxy didn't let through, and the reason " +"why." +msgstr "记录被Privoxy拒绝的请求目标以及拒绝原因。" + +msgid "Logging" +msgstr "日志" + +msgid "Main actions file" +msgstr "主要规则文件" + +msgid "Mandatory Input: No Data given!" +msgstr "必需选项: 没有设置数据！" + +msgid "Mandatory Input: No Directory given!" +msgstr "必需选项: 没有设置目录！" + +msgid "Mandatory Input: No File given!" +msgstr "必需选项: 没有设置文件！" + +msgid "Mandatory Input: No Port given!" +msgstr "必需选项: 没有设置端口！" + +msgid "Mandatory Input: No files given!" +msgstr "必需选项: 没有设置文件！" + +msgid "Mandatory Input: No valid IPv4 address or host given!" +msgstr "必需选项: 没有设置有效的IPV4地址或者主机！" + +msgid "Mandatory Input: No valid IPv6 address given!" +msgstr "必需选项: 没有设置有效的IPV6地址！" + +msgid "Mandatory Input: No valid Port given!" +msgstr "必需选项: 没有设置有效的端口！" + +msgid "Maximum number of client connections that will be served." +msgstr "客户端数量上限。" + +msgid "Maximum size (in KB) of the buffer for content filtering." +msgstr "内容过滤的最大缓冲（单位KB）。" + +msgid "Miscellaneous" +msgstr "杂项" + +msgid "NOT installed" +msgstr "" + +msgid "No trailing '/', please." +msgstr "路径结尾不要加'/' ." + +msgid "Non-fatal errors - *we highly recommended enabling this*" +msgstr "非致命性错误 - * 建议开启 *" + +msgid "" +"Number of seconds after which a socket times out if no data is received." +msgstr "socket连接未收到数据的超时时间。" + +msgid "" +"Number of seconds after which an open connection will no longer be reused." +msgstr "一个开放的连接不再重复使用的超时时间。" + +msgid "" +"Only when using 'external filters', Privoxy has to create temporary files." +msgstr "只有使用外置规则时，privoxy才需要创建临时文件。" + +msgid "Please install current version !" +msgstr "" + +msgid "Please press [Read] button" +msgstr "请点击[读取]按钮" + +msgid "Please read Privoxy manual for details!" +msgstr "请阅读Privoxy手册以了解详情！" + +msgid "Please update to the current version!" +msgstr "请升级到当前版本！" + +msgid "Privoxy WEB proxy" +msgstr "Privoxy 网络代理" + +msgid "" +"Privoxy can (and normally does) use a number of other files for additional " +"configuration, help and logging. This section of the configuration file " +"tells Privoxy where to find those other files." +msgstr "" +"Privoxy可以使用其他一些文件用于附加设置，帮助和日志。这个区域用来告诉Privoxy" +"从哪里找到这些文件。" + +msgid "" +"Privoxy is a non-caching web proxy with advanced filtering capabilities for " +"enhancing privacy, modifying web page data and HTTP headers, controlling " +"access, and removing ads and other obnoxious Internet junk." +msgstr "" +"Privoxy是一个无缓存的网络代理，具有高级过滤功能，能够修改网页数据和HTTP头，控" +"制访问，移除广告等。" + +msgid "Read / Reread log file" +msgstr "读取/刷新日志文件" + +msgid "Show I/O status" +msgstr "显示 I/O 状态" + +msgid "Show each connection status" +msgstr "显示每个连接的状态" + +msgid "Show header parsing" +msgstr "Show header parsing" + +msgid "Software package '%s' is not installed." +msgstr "" + +msgid "Software package '%s' is outdated." +msgstr "" + +msgid "Start" +msgstr "启动" + +msgid "Start / Stop" +msgstr "启动 / 停止" + +msgid "Start/Stop Privoxy WEB Proxy" +msgstr "启动/停止 Privoxy 网络代理" + +msgid "Startup banner and warnings." +msgstr "启动标语和警告。" + +msgid "Syntax:" +msgstr "格式:" + +msgid "Syntax: Client header names delimited by spaces." +msgstr "格式: Client header names delimited by spaces." + +msgid "Syntax: target_pattern http_parent[:port]" +msgstr "格式: target_pattern http_parent[:port]" + +msgid "Syntax: target_pattern socks_proxy[:port] http_parent[:port]" +msgstr "格式: target_pattern socks_proxy[:port] http_parent[:port]" + +msgid "System" +msgstr "" + +msgid "" +"The actions file(s) to use. Multiple actionsfile lines are permitted, and " +"are in fact recommended!" +msgstr "所使用的规则文件。允许并且推荐使用多个规则文件。" + +msgid "" +"The address and TCP port on which Privoxy will listen for client requests." +msgstr "Privoxy接收客户端请求时监听的地址和TCP端口。" + +msgid "" +"The compression level that is passed to the zlib library when compressing " +"buffered content." +msgstr "使用zlib压缩缓冲内容时的压缩级别。" + +msgid "" +"The directory where all logging takes place (i.e. where the logfile is " +"located)." +msgstr "所有日志所在的目录。" + +msgid "The directory where the other configuration files are located." +msgstr "其他设置文件所在的目录。" + +msgid "" +"The filter files contain content modification rules that use regular " +"expressions." +msgstr "过滤文件包含了使用正则表达式编写的内容修改规则" + +msgid "The hostname shown on the CGI pages." +msgstr "CGI页面显示的主机名。" + +msgid "The log file to use. File name, relative to log directory." +msgstr "日志文件名称，与日志路径相对。" + +msgid "The order in which client headers are sorted before forwarding them." +msgstr "转发数据前，client headers的排序。" + +msgid "" +"The status code Privoxy returns for pages blocked with +handle-as-empty-" +"document." +msgstr "" +"当页面因为handle-as-empty-document规则被阻止时返回的状态码（选上为200 OK，不" +"选上为403 Forbidden）" + +msgid "" +"The trust mechanism is an experimental feature for building white-lists and " +"should be used with care." +msgstr "信任机制是一个实验性的白名单特性，使用时应小心。" + +msgid "" +"The value of this option only matters if the experimental trust mechanism " +"has been activated." +msgstr "只有开启了信任机制时这个选项的值才有效" + +msgid "" +"This option is only there for debugging purposes. It will drastically reduce " +"performance." +msgstr "这个选项仅用于调试，开启后会极大地降低性能。" + +msgid "" +"This option will be removed in future releases as it has been obsoleted by " +"the more general header taggers." +msgstr "这个选项在以后的版本中将被移除，因为它被header taggers所取代了。" + +msgid "" +"This tab controls the security-relevant aspects of Privoxy's configuration." +msgstr "这个标签用于设置与安全相关的Privoxy选项。" + +msgid "" +"Through which SOCKS proxy (and optionally to which parent HTTP proxy) " +"specific requests should be routed." +msgstr "指定的请求应该通过哪一个SOCKS代理（并且通过哪一个HTTP父代理，可选）" + +msgid "To which parent HTTP proxy specific requests should be routed." +msgstr "请求应转发至哪一个父级HTTP代理。" + +msgid "User customizations" +msgstr "用户自定义" + +msgid "Value is not a number" +msgstr "输入值不是数字" + +msgid "Value not between 0 and 300" +msgstr "" + +msgid "Value not between 0 and 9" +msgstr "输入值不在0和9之间。" + +msgid "Value not between 1 and 4096" +msgstr "输入值不在1和4096之间" + +msgid "Value not greater 0 or empty" +msgstr "输入值为空或者不是大于零。" + +msgid "Value range 1 to 4096, no entry defaults to 4096" +msgstr "输入值为1到4096，默认为4096" + +msgid "Version" +msgstr "版本" + +msgid "Version Information" +msgstr "版本信息" + +msgid "Whether intercepted requests should be treated as valid." +msgstr "被拦截的请求是否应被当作有效的。" + +msgid "" +"Whether or not Privoxy recognizes special HTTP headers to change toggle " +"state." +msgstr "Privoxy是否识别特殊的HTTP头以切换状态。" + +msgid "Whether or not buffered content is compressed before delivery." +msgstr "缓冲内容在传递之前是否压缩。" + +msgid "" +"Whether or not outgoing connections that have been kept alive should be " +"shared between different incoming connections." +msgstr "持久出站连接是否应在不同的入站连接之间共享。" + +msgid "Whether or not pipelined requests should be served." +msgstr "是否处理管道化的请求。" + +msgid "Whether or not proxy authentication through Privoxy should work." +msgstr "是否可以通过Privoxy进行代理验证。" + +msgid "Whether or not the web-based actions file editor may be used." +msgstr "是否使用基于网页的规则编辑器。" + +msgid "Whether or not the web-based toggle feature may be used." +msgstr "是否启用基于网页的切换功能。" + +msgid "Whether requests to Privoxy's CGI pages can be blocked or redirected." +msgstr "访问Privoxy CGI页面的请求是否可以被拦截或重定向。" + +msgid "" +"Whether the CGI interface should stay compatible with broken HTTP clients." +msgstr "CGI界面是否应兼容过时的HTTP客户端。" + +msgid "Whether to run only one server thread." +msgstr "是否只运行一个服务线程。" + +msgid "Who can access what." +msgstr "谁可以访问什么。" + +msgid "installed" +msgstr "已安装" + +msgid "or higher" +msgstr "或更高" + +msgid "required" +msgstr "需要" + +#~ msgid "Local Set-up" +#~ msgstr "本地设置" + +#~ msgid "Software update required" +#~ msgstr "需要升级软件" + +#~ msgid "" +#~ "The currently installed 'privoxy' package is not supported by LuCI " +#~ "application." +#~ msgstr "目前安装的privoxy版本不被luci支持。" diff --git a/applications/luci-app-statistics/Makefile b/applications/luci-app-statistics/Makefile index af07cfbd02..6c0121e96a 100644 --- a/applications/luci-app-statistics/Makefile +++ b/applications/luci-app-statistics/Makefile @@ -9,6 +9,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI Statistics Application LUCI_DEPENDS:= \ +collectd +rrdtool1 +collectd-mod-rrdtool +collectd-mod-iwinfo \ + +collectd-mod-cpu +collectd-mod-memory \ +collectd-mod-interface +collectd-mod-load +collectd-mod-network include ../../luci.mk diff --git a/applications/luci-app-statistics/root/etc/config/luci_statistics b/applications/luci-app-statistics/root/etc/config/luci_statistics index de16f29de9..4435d5c61e 100644 --- a/applications/luci-app-statistics/root/etc/config/luci_statistics +++ b/applications/luci-app-statistics/root/etc/config/luci_statistics @@ -53,7 +53,7 @@ config statistics 'collectd_conntrack' option enable '0' config statistics 'collectd_cpu' - option enable '0' + option enable '1' config statistics 'collectd_df' option enable '0' @@ -113,7 +113,7 @@ config statistics 'collectd_load' option enable '1' config statistics 'collectd_memory' - option enable '0' + option enable '1' config statistics 'collectd_netlink' option enable '0' diff --git a/contrib/package/freifunk-p2pblock/Makefile b/contrib/package/freifunk-p2pblock/Makefile index 8eeafbb4f0..df7bd9b635 100644 --- a/contrib/package/freifunk-p2pblock/Makefile +++ b/contrib/package/freifunk-p2pblock/Makefile @@ -20,7 +20,7 @@ define Package/freifunk-p2pblock CATEGORY:=LuCI SUBMENU:=9. Freifunk TITLE:=Freifunk p2pblock Addon - DEPENDS:=+iptables-mod-filter +iptables-mod-ipp2p +l7-protocols +iptables-mod-conntrack-extra + DEPENDS:=+iptables-mod-filter +iptables-mod-ipp2p +l7-protocols +iptables-mod-conntrack-extra @BROKEN endef define Package/freifunk-p2pblock/description diff --git a/modules/luci-base/luasrc/model/network.lua b/modules/luci-base/luasrc/model/network.lua index 1f0c5da73a..2d8336bf33 100644 --- a/modules/luci-base/luasrc/model/network.lua +++ b/modules/luci-base/luasrc/model/network.lua @@ -30,7 +30,7 @@ protocol = utl.class() local _protocols = { } -local _interfaces, _bridge, _switch, _tunnel +local _interfaces, _bridge, _switch, _tunnel, _swtopo local _ubusnetcache, _ubusdevcache, _ubuswificache local _uci @@ -193,7 +193,6 @@ function _iface_ignore(x) return false end - function init(cursor) _uci = cursor or _uci or uci.cursor() @@ -201,6 +200,7 @@ function init(cursor) _bridge = { } _switch = { } _tunnel = { } + _swtopo = { } _ubusnetcache = { } _ubusdevcache = { } @@ -210,7 +210,6 @@ function init(cursor) local n, i for n, i in ipairs(nxo.getifaddrs()) do local name = i.name:match("[^:]+") - local prnt = name:match("^([^%.]+)%.") if _iface_virtual(name) then _tunnel[name] = true @@ -226,11 +225,6 @@ function init(cursor) ip6addrs = { } } - if prnt then - _switch[name] = true - _switch[prnt] = true - end - if i.family == "packet" then _interfaces[name].flags = i.flags _interfaces[name].stats = i.data @@ -266,6 +260,79 @@ function init(cursor) end end + -- read switch topology + local boardinfo = jsc.parse(nfs.readfile("/etc/board.json") or "") + if type(boardinfo) == "table" and type(boardinfo.switch) == "table" then + local switch, layout + for switch, layout in pairs(boardinfo.switch) do + if type(layout) == "table" and type(layout.ports) == "table" then + local _, port + local ports = { } + local nports = { } + local netdevs = { } + + for _, port in ipairs(layout.ports) do + if type(port) == "table" and + type(port.num) == "number" and + (type(port.role) == "string" or + type(port.device) == "string") + then + local spec = { + num = port.num, + role = port.role or "cpu", + index = port.index or port.num + } + + if port.device then + spec.device = port.device + spec.tagged = port.need_tag + netdevs[tostring(port.num)] = port.device + end + + ports[#ports+1] = spec + + if port.role then + nports[port.role] = (nports[port.role] or 0) + 1 + end + end + end + + table.sort(ports, function(a, b) + if a.role ~= b.role then + return (a.role < b.role) + end + + return (a.index < b.index) + end) + + local pnum, role + for _, port in ipairs(ports) do + if port.role ~= role then + role = port.role + pnum = 1 + end + + if role == "cpu" then + port.label = "CPU (%s)" % port.device + elseif nports[role] > 1 then + port.label = "%s %d" %{ role:upper(), pnum } + pnum = pnum + 1 + else + port.label = role:upper() + end + + port.role = nil + port.index = nil + end + + _swtopo[switch] = { + ports = ports, + netdevs = netdevs + } + end + end + end + return _M end @@ -474,41 +541,23 @@ function get_interface(self, i) end end -local function swdev_from_board_json() - local boardinfo = jsc.parse(nfs.readfile("/etc/board.json") or "") - if type(boardinfo) == "table" and type(boardinfo.network) == "table" then - local net, val - for net, val in pairs(boardinfo.network) do - if type(val) == "table" and type(val.ifname) == "string" and - val.create_vlan == true - then - return val.ifname - end - end - end - return nil -end - function get_interfaces(self) local iface local ifaces = { } - local seen = { } local nfs = { } - local baseof = { } -- find normal interfaces _uci:foreach("network", "interface", function(s) for iface in utl.imatch(s.ifname) do if not _iface_ignore(iface) and not _iface_virtual(iface) and not _wifi_iface(iface) then - seen[iface] = true nfs[iface] = interface(iface) end end end) for iface in utl.kspairs(_interfaces) do - if not (seen[iface] or _iface_ignore(iface) or _iface_virtual(iface) or _wifi_iface(iface)) then + if not (nfs[iface] or _iface_ignore(iface) or _iface_virtual(iface) or _wifi_iface(iface)) then nfs[iface] = interface(iface) end end @@ -516,34 +565,32 @@ function get_interfaces(self) -- find vlan interfaces _uci:foreach("network", "switch_vlan", function(s) - if not s.device then + if type(s.ports) ~= "string" or + type(s.device) ~= "string" or + type(_swtopo[s.device]) ~= "table" + then return end - local base = baseof[s.device] - if not base then - if not s.device:match("^eth%d") then - local l - for l in utl.execi("swconfig dev %q help 2>/dev/null" % s.device) do - if not base then - base = l:match("^%w+: (%w+)") - end + local pnum, ptag + for pnum, ptag in s.ports:gmatch("(%d+)([tu]?)") do + local netdev = _swtopo[s.device].netdevs[pnum] + if netdev then + if not nfs[netdev] then + nfs[netdev] = interface(netdev) end - if not base or not base:match("^eth%d") then - base = swdev_from_board_json() or "eth0" + _switch[netdev] = true + + if ptag == "t" then + local vid = tonumber(s.vid or s.vlan) + if vid ~= nil and vid >= 0 and vid <= 4095 then + local iface = "%s.%d" %{ netdev, vid } + if not nfs[iface] then + nfs[iface] = interface(iface) + end + _switch[iface] = true + end end - else - base = s.device - end - baseof[s.device] = base - end - - local vid = tonumber(s.vid or s.vlan) - if vid ~= nil and vid >= 0 and vid <= 4095 then - local iface = "%s.%d" %{ base, vid } - if not seen[iface] then - seen[iface] = true - nfs[iface] = interface(iface) end end end) @@ -685,6 +732,10 @@ function get_wan6dev(self) return stat and interface(stat.l3_device or stat.device) end +function get_switch_topologies(self) + return _swtopo +end + function network(name, proto) if name then @@ -1167,7 +1218,11 @@ function interface.get_type_i18n(self) elseif x == "switch" then return lng.translate("Ethernet Switch") elseif x == "vlan" then - return lng.translate("VLAN Interface") + if _switch[self.ifname] then + return lng.translate("Switch VLAN") + else + return lng.translate("Software VLAN") + end elseif x == "tunnel" then return lng.translate("Tunnel Interface") else diff --git a/modules/luci-base/luasrc/view/sysauth.htm b/modules/luci-base/luasrc/view/sysauth.htm index e207504911..f6b0f5706a 100644 --- a/modules/luci-base/luasrc/view/sysauth.htm +++ b/modules/luci-base/luasrc/view/sysauth.htm @@ -7,14 +7,14 @@ <%+header%> <form method="post" action="<%=pcdata(luci.http.getenv("REQUEST_URI"))%>"> + <%- if fuser then %> + <div class="errorbox"><%:Invalid username and/or password! Please try again.%></div> + <% end -%> + <div class="cbi-map"> <h2 name="content"><%:Authorization Required%></h2> <div class="cbi-map-descr"> <%:Please enter your username and password.%> - <%- if fuser then %> - <div class="error"><%:Invalid username and/or password! Please try again.%></div> - <br /> - <% end -%> </div> <fieldset class="cbi-section"><fieldset class="cbi-section-node"> <div class="cbi-value"> diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index 4d797a1953..1e44147752 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -13,6 +13,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(finestra de %d minuts, interval de %d segons)" @@ -534,9 +537,6 @@ msgstr "Botons" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "CPU" - msgid "CPU usage (%)" msgstr "Ús de CPU (%)" @@ -1054,6 +1054,9 @@ msgstr "" msgid "External system log server port" msgstr "" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1752,6 +1755,9 @@ msgstr "" msgid "MB/s" msgstr "MB/s" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "MHz" @@ -2251,12 +2257,6 @@ msgstr "Política" msgid "Port" msgstr "Port" -msgid "Port %d" -msgstr "Port %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "" - msgid "Port status:" msgstr "Estatus de port" @@ -2538,6 +2538,9 @@ msgstr "" msgid "Run filesystem check" msgstr "" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2677,6 +2680,9 @@ msgstr "" msgid "Software" msgstr "Programari" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "No es pot desar els valors perquè alguns camps estan invàlids!" @@ -2789,6 +2795,13 @@ msgstr "Commutador %q" msgid "Switch %q (%s)" msgstr "Commutador %q (%s)" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "Protocol de commutador" @@ -3263,9 +3276,6 @@ msgstr "VC-Mux" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "Interfície VLAN" - msgid "VLANs on %q" msgstr "VLANs en %q" @@ -3397,6 +3407,9 @@ msgstr "Sense fils aturat" msgid "Write received DNS requests to syslog" msgstr "Escriure les peticions DNS rebudes al syslog" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "Suport XR" @@ -3579,3 +3592,12 @@ msgstr "sí" msgid "« Back" msgstr "« Enrere" + +#~ msgid "CPU" +#~ msgstr "CPU" + +#~ msgid "Port %d" +#~ msgstr "Port %d" + +#~ msgid "VLAN Interface" +#~ msgstr "Interfície VLAN" diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index ea79471af5..b0ab326d00 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -11,6 +11,9 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(%d minutové okno, %d sekundový interval)" @@ -533,9 +536,6 @@ msgstr "Tlačítka" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "CPU" - msgid "CPU usage (%)" msgstr "Vytížení CPU (%)" @@ -1066,6 +1066,9 @@ msgstr "Externí protokolovací server" msgid "External system log server port" msgstr "Port externího protokolovacího serveru" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1774,6 +1777,9 @@ msgstr "" msgid "MB/s" msgstr "MB/s" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "MHz" @@ -2274,12 +2280,6 @@ msgstr "Politika" msgid "Port" msgstr "Port" -msgid "Port %d" -msgstr "Port %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "Port %d je neoznačený ve více VLAN!" - msgid "Port status:" msgstr "Stav portu:" @@ -2576,6 +2576,9 @@ msgstr "Spustit kontrolu souborového systému před připojením zařízení" msgid "Run filesystem check" msgstr "Spustit kontrolu souborového systému" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2717,6 +2720,9 @@ msgstr "Time sloty" msgid "Software" msgstr "Software" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "Některá pole obsahují neplatné hodnoty, nelze uložit!" @@ -2838,6 +2844,13 @@ msgstr "Směrovač číslo %q" msgid "Switch %q (%s)" msgstr "Směrovač číslo %q (%s)" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "Směrovací protokol" @@ -3336,9 +3349,6 @@ msgstr "VC-Mux" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "Rozhraní VLAN" - msgid "VLANs on %q" msgstr "VLANy na %q" @@ -3470,6 +3480,9 @@ msgstr "Bezdrátová síť vypnuta" msgid "Write received DNS requests to syslog" msgstr "Zapisovat přijaté požadavky DNS do systemového logu" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "Podpora XR" @@ -3649,3 +3662,15 @@ msgstr "ano" msgid "« Back" msgstr "« Zpět" + +#~ msgid "CPU" +#~ msgstr "CPU" + +#~ msgid "Port %d" +#~ msgstr "Port %d" + +#~ msgid "Port %d is untagged in multiple VLANs!" +#~ msgstr "Port %d je neoznačený ve více VLAN!" + +#~ msgid "VLAN Interface" +#~ msgstr "Rozhraní VLAN" diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index 48331b9ab0..8d72612134 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -13,6 +13,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(%d Minuten Abschnitt, %d Sekunden Intervall)" @@ -534,9 +537,6 @@ msgstr "Knöpfe" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "Prozessor" - msgid "CPU usage (%)" msgstr "CPU-Nutzung (%)" @@ -1063,6 +1063,9 @@ msgstr "Externer Protokollserver IP" msgid "External system log server port" msgstr "Externer Protokollserver Port" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1778,6 +1781,9 @@ msgstr "" msgid "MB/s" msgstr "MB/s" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "MHz" @@ -2280,12 +2286,6 @@ msgstr "Standardregel" msgid "Port" msgstr "Port" -msgid "Port %d" -msgstr "Port %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "Port %d ist untagged in mehreren VLANs!" - msgid "Port status:" msgstr "Port-Status:" @@ -2584,6 +2584,9 @@ msgstr "Vor dem Einhängen Dateisystemprüfung starten " msgid "Run filesystem check" msgstr "Dateisystemprüfung durchführen" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2725,6 +2728,9 @@ msgstr "Zeitslot" msgid "Software" msgstr "Paketverwaltung" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "Einige Felder sind ungültig, kann das Formular nicht speichern!" @@ -2850,6 +2856,13 @@ msgstr "Switch %q" msgid "Switch %q (%s)" msgstr "Switch %q (%s)" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "Wechsle Protokoll" @@ -3361,9 +3374,6 @@ msgstr "VC-Mux" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "VLAN Schnittstelle" - msgid "VLANs on %q" msgstr "VLANs auf %q" @@ -3495,6 +3505,9 @@ msgstr "WLAN heruntergefahren" msgid "Write received DNS requests to syslog" msgstr "Empfangene DNS-Anfragen in das Systemprotokoll schreiben" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "XR-Unterstützung" @@ -3674,3 +3687,15 @@ msgstr "ja" msgid "« Back" msgstr "« Zurück" + +#~ msgid "CPU" +#~ msgstr "Prozessor" + +#~ msgid "Port %d" +#~ msgstr "Port %d" + +#~ msgid "Port %d is untagged in multiple VLANs!" +#~ msgstr "Port %d ist untagged in mehreren VLANs!" + +#~ msgid "VLAN Interface" +#~ msgstr "VLAN Schnittstelle" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index c5de065e4d..7b716ada36 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -13,6 +13,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.4\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(παράθυρο %d λεπτών, διάστημα %d δευτερολέπτων)" @@ -542,9 +545,6 @@ msgstr "Κουμπιά" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "" - msgid "CPU usage (%)" msgstr "Χρήση CPU (%)" @@ -1079,6 +1079,9 @@ msgstr "Εξωτερικός εξυπηρετητής καταγραφής συ msgid "External system log server port" msgstr "" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1780,6 +1783,9 @@ msgstr "" msgid "MB/s" msgstr "" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "" @@ -2281,12 +2287,6 @@ msgstr "Πολιτική" msgid "Port" msgstr "Θύρα" -msgid "Port %d" -msgstr "Θύρα %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "" - msgid "Port status:" msgstr "" @@ -2570,6 +2570,9 @@ msgstr "Εκτέλεση ελέγχου του συστήματος αρχείω msgid "Run filesystem check" msgstr "Εκτέλεση ελέγχου συστήματος αρχείων" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2709,6 +2712,9 @@ msgstr "" msgid "Software" msgstr "Λογισμικό" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "Κάποια πεδία δεν είναι έγκυρα, δεν μπορούν να αποθηκευτούν οι τιμές!" @@ -2823,6 +2829,13 @@ msgstr "" msgid "Switch %q (%s)" msgstr "" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "" @@ -3288,9 +3301,6 @@ msgstr "" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "Διεπαφή VLAN" - msgid "VLANs on %q" msgstr "" @@ -3420,6 +3430,9 @@ msgstr "Το ασύρματο δίκτυο τερματίστηκε" msgid "Write received DNS requests to syslog" msgstr "Καταγραφή των ληφθέντων DNS αιτήσεων στο syslog" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "Υποστήριξη XR" @@ -3601,3 +3614,9 @@ msgstr "ναι" msgid "« Back" msgstr "« Πίσω" + +#~ msgid "Port %d" +#~ msgstr "Θύρα %d" + +#~ msgid "VLAN Interface" +#~ msgstr "Διεπαφή VLAN" diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index 7550230ec1..82a4e72542 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -13,6 +13,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.4\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(%d minute window, %d second interval)" @@ -531,9 +534,6 @@ msgstr "Buttons" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "CPU" - msgid "CPU usage (%)" msgstr "CPU usage (%)" @@ -1055,6 +1055,9 @@ msgstr "" msgid "External system log server port" msgstr "" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1749,6 +1752,9 @@ msgstr "" msgid "MB/s" msgstr "" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "" @@ -2248,12 +2254,6 @@ msgstr "Policy" msgid "Port" msgstr "Port" -msgid "Port %d" -msgstr "" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "" - msgid "Port status:" msgstr "" @@ -2535,6 +2535,9 @@ msgstr "" msgid "Run filesystem check" msgstr "" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2673,6 +2676,9 @@ msgstr "Slot time" msgid "Software" msgstr "Software" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "" @@ -2785,6 +2791,13 @@ msgstr "" msgid "Switch %q (%s)" msgstr "" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "" @@ -3245,9 +3258,6 @@ msgstr "" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "" - msgid "VLANs on %q" msgstr "" @@ -3379,6 +3389,9 @@ msgstr "" msgid "Write received DNS requests to syslog" msgstr "" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "XR Support" @@ -3557,3 +3570,6 @@ msgstr "" msgid "« Back" msgstr "« Back" + +#~ msgid "CPU" +#~ msgstr "CPU" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index 2cdc29cdea..de9a645324 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -13,6 +13,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(ventana de %d minutos, intervalo de %d segundos)" @@ -538,9 +541,6 @@ msgstr "Botones" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "CPU" - msgid "CPU usage (%)" msgstr "Uso de CPU (%)" @@ -1073,6 +1073,9 @@ msgstr "Servidor externo de registro del sistema" msgid "External system log server port" msgstr "Puerto del servidor externo de registro del sistema" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1788,6 +1791,9 @@ msgstr "" msgid "MB/s" msgstr "MB/s" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "MHz" @@ -2288,12 +2294,6 @@ msgstr "Política" msgid "Port" msgstr "Puerto" -msgid "Port %d" -msgstr "Puerto %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "¡El puerto %d está desmarcado en múltiples VLANs!" - msgid "Port status:" msgstr "Estado del puerto:" @@ -2589,6 +2589,9 @@ msgstr "Comprobar el sistema de ficheros antes de montar el dispositivo" msgid "Run filesystem check" msgstr "Comprobar el sistema de ficheros" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2730,6 +2733,9 @@ msgstr "Tiempo asignado" msgid "Software" msgstr "Instalación de programas" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "Algunos campos no son válidos, ¡no se pueden guardar!" @@ -2855,6 +2861,13 @@ msgstr "Switch %q" msgid "Switch %q (%s)" msgstr "Switch %q (%s)" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "Intercambiar protocolo" @@ -3362,9 +3375,6 @@ msgstr "VC-Mux" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "Interfaz VLAN" - msgid "VLANs on %q" msgstr "VLANs en %q" @@ -3496,6 +3506,9 @@ msgstr "Apagando red inalámbrica" msgid "Write received DNS requests to syslog" msgstr "Escribir las peticiones de DNS recibidas en el registro del sistema" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "Soporte de XR" @@ -3677,3 +3690,15 @@ msgstr "sí" msgid "« Back" msgstr "« Volver" + +#~ msgid "CPU" +#~ msgstr "CPU" + +#~ msgid "Port %d" +#~ msgstr "Puerto %d" + +#~ msgid "Port %d is untagged in multiple VLANs!" +#~ msgstr "¡El puerto %d está desmarcado en múltiples VLANs!" + +#~ msgid "VLAN Interface" +#~ msgstr "Interfaz VLAN" diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index 24608e380a..fcde931c79 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -13,6 +13,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(fenêtre de %d minutes, intervalle de %d secondes)" @@ -543,9 +546,6 @@ msgstr "Boutons" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "CPU" - msgid "CPU usage (%)" msgstr "Utilisation CPU (%)" @@ -1085,6 +1085,9 @@ msgstr "Serveur distant de journaux système" msgid "External system log server port" msgstr "Port du serveur distant de journaux système" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1802,6 +1805,9 @@ msgstr "" msgid "MB/s" msgstr "MB/s" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "MHz" @@ -2301,12 +2307,6 @@ msgstr "Politique" msgid "Port" msgstr "Port" -msgid "Port %d" -msgstr "Port %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "Le port %d n'est pas marqué dans plusieurs VLANs !" - msgid "Port status:" msgstr "Statut du port :" @@ -2603,6 +2603,9 @@ msgstr "" msgid "Run filesystem check" msgstr "Faire une vérification du système de fichiers" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2744,6 +2747,9 @@ msgstr "Tranche de temps" msgid "Software" msgstr "Logiciels" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "Certains champs sont invalides, ne peut sauvegarder les valeurs !" @@ -2867,6 +2873,13 @@ msgstr "Commutateur %q" msgid "Switch %q (%s)" msgstr "Commutateur %q (%s)" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "Protocole du commutateur" @@ -3381,9 +3394,6 @@ msgstr "VC-Mux" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "Interface du VLAN" - msgid "VLANs on %q" msgstr "VLANs sur %q" @@ -3515,6 +3525,9 @@ msgstr "Wi-Fi arrêté" msgid "Write received DNS requests to syslog" msgstr "Écrire les requêtes DNS reçues dans syslog" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "Gestion du mode XR" @@ -3695,3 +3708,15 @@ msgstr "oui" msgid "« Back" msgstr "« Retour" + +#~ msgid "CPU" +#~ msgstr "CPU" + +#~ msgid "Port %d" +#~ msgstr "Port %d" + +#~ msgid "Port %d is untagged in multiple VLANs!" +#~ msgstr "Le port %d n'est pas marqué dans plusieurs VLANs !" + +#~ msgid "VLAN Interface" +#~ msgstr "Interface du VLAN" diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index 5a0c07c66a..3c2d784707 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -11,6 +11,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "" @@ -534,9 +537,6 @@ msgstr "כפתורים" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "מעבד" - msgid "CPU usage (%)" msgstr "שימוש מעבד (%)" @@ -1041,6 +1041,9 @@ msgstr "" msgid "External system log server port" msgstr "" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1725,6 +1728,9 @@ msgstr "" msgid "MB/s" msgstr "" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "" @@ -2216,12 +2222,6 @@ msgstr "" msgid "Port" msgstr "" -msgid "Port %d" -msgstr "" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "" - msgid "Port status:" msgstr "" @@ -2502,6 +2502,9 @@ msgstr "" msgid "Run filesystem check" msgstr "הרץ בדיקת מערכת קבצים" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2641,6 +2644,9 @@ msgstr "" msgid "Software" msgstr "תוכנה" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "חלק מהשדות אינם תקינים, אין אפשרות לשמור את הערכים!" @@ -2759,6 +2765,13 @@ msgstr "" msgid "Switch %q (%s)" msgstr "" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "" @@ -3205,9 +3218,6 @@ msgstr "" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "" - msgid "VLANs on %q" msgstr "" @@ -3337,6 +3347,9 @@ msgstr "" msgid "Write received DNS requests to syslog" msgstr "" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "" @@ -3510,3 +3523,6 @@ msgstr "כן" msgid "« Back" msgstr "<< אחורה" + +#~ msgid "CPU" +#~ msgstr "מעבד" diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index ed64f994e6..d71bd6907a 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -11,6 +11,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(%d perces ablak, %d másodperces intervallum)" @@ -537,9 +540,6 @@ msgstr "Gombok" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "Processzor" - msgid "CPU usage (%)" msgstr "Processzor használat (%)" @@ -1074,6 +1074,9 @@ msgstr "Külső rendszernapló kiszolgáló" msgid "External system log server port" msgstr "Külső rendszernapló kiszolgáló port" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1791,6 +1794,9 @@ msgstr "" msgid "MB/s" msgstr "MB/s" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "MHz" @@ -2291,12 +2297,6 @@ msgstr "Szabály" msgid "Port" msgstr "Port" -msgid "Port %d" -msgstr "Port %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "A %d port egyszerre több VLAN-ban is cimkézetlen!" - msgid "Port status:" msgstr "Port állapot:" @@ -2594,6 +2594,9 @@ msgstr "Fájlrendszer ellenőrzés futtatása az eszköz csatolása előtt" msgid "Run filesystem check" msgstr "Fájlrendszer ellenőrzés futtatása" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2735,6 +2738,9 @@ msgstr "Időrés" msgid "Software" msgstr "Szoftver" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "Néhán mező érvénytelen, az értékek nem menthetők!" @@ -2858,6 +2864,13 @@ msgstr "Kapcsoló %q" msgid "Switch %q (%s)" msgstr "Kapcsoló %q (%s)" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "Protokoll csere" @@ -3369,9 +3382,6 @@ msgstr "VC-Mux" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "VLAN interfész" - msgid "VLANs on %q" msgstr "VLAN-ok %q-n" @@ -3503,6 +3513,9 @@ msgstr "Vezetéknélküli rész leállítása" msgid "Write received DNS requests to syslog" msgstr "A kapott DNS kéréseket írja a rendszernaplóba" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "XR támogatás" @@ -3684,3 +3697,15 @@ msgstr "igen" msgid "« Back" msgstr "« Vissza" + +#~ msgid "CPU" +#~ msgstr "Processzor" + +#~ msgid "Port %d" +#~ msgstr "Port %d" + +#~ msgid "Port %d is untagged in multiple VLANs!" +#~ msgstr "A %d port egyszerre több VLAN-ban is cimkézetlen!" + +#~ msgid "VLAN Interface" +#~ msgstr "VLAN interfész" diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index 21bcf10aec..2bc5ddabf4 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -13,6 +13,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.6.10\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(%d finestra in minuti , %d secondi intervallo)" @@ -543,9 +546,6 @@ msgstr "Pulsanti" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "CPU" - msgid "CPU usage (%)" msgstr "Uso CPU (%)" @@ -1076,6 +1076,9 @@ msgstr "Server Log di Sistema esterno" msgid "External system log server port" msgstr "Porta Server Log di Sistema esterno" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1231,7 +1234,7 @@ msgid "Global Settings" msgstr "" msgid "Global network options" -msgstr "" +msgstr "Opzioni rete globale" msgid "Go to password configuration..." msgstr "Vai alla configurazione della password..." @@ -1477,7 +1480,7 @@ msgid "Inactivity timeout" msgstr "Tempo di Inattività" msgid "Inbound:" -msgstr "in entrata:" +msgstr "In entrata:" msgid "Info" msgstr "Informazioni" @@ -1596,7 +1599,7 @@ msgid "L2TP Server" msgstr "Server L2TP" msgid "LCP echo failure threshold" -msgstr "fallimento soglia echo LCP" +msgstr "Fallimento soglia echo LCP" msgid "LCP echo interval" msgstr "Intervallo echo LCP" @@ -1763,7 +1766,7 @@ msgid "Login" msgstr "Login" msgid "Logout" -msgstr "Logout" +msgstr "Slogga" msgid "Loss of Signal Seconds (LOSS)" msgstr "" @@ -1789,6 +1792,9 @@ msgstr "" msgid "MB/s" msgstr "" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "" @@ -1969,7 +1975,7 @@ msgid "Network boot image" msgstr "" msgid "Network without interfaces." -msgstr "" +msgstr "Rete senza interfaccia" msgid "Next »" msgstr "Prossimo »" @@ -2127,7 +2133,7 @@ msgid "Out" msgstr "" msgid "Outbound:" -msgstr "" +msgstr "In uscita:" msgid "Outdoor Channels" msgstr "" @@ -2139,7 +2145,7 @@ msgid "Override MAC address" msgstr "" msgid "Override MTU" -msgstr "" +msgstr "Sovrascivi MTU" msgid "Override default interface name" msgstr "" @@ -2287,12 +2293,6 @@ msgstr "" msgid "Port" msgstr "Porta" -msgid "Port %d" -msgstr "Porta %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "" - msgid "Port status:" msgstr "" @@ -2577,6 +2577,9 @@ msgstr "" msgid "Run filesystem check" msgstr "" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2715,6 +2718,9 @@ msgstr "Slot time" msgid "Software" msgstr "Software" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "Alcuni campi non sono validi, non è possibile salvare i valori!" @@ -2840,6 +2846,13 @@ msgstr "Switch %q" msgid "Switch %q (%s)" msgstr "Switch %q (%s)" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "Cambia protocollo" @@ -3320,9 +3333,6 @@ msgstr "VC-Mux" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "Interfaccia VLAN" - msgid "VLANs on %q" msgstr "VLANs su %q" @@ -3454,6 +3464,9 @@ msgstr "Wireless spento" msgid "Write received DNS requests to syslog" msgstr "Scrittura delle richiesta DNS ricevute nel syslog" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "Supporto XR" @@ -3637,3 +3650,12 @@ msgstr "Sì" msgid "« Back" msgstr "« Indietro" + +#~ msgid "CPU" +#~ msgstr "CPU" + +#~ msgid "Port %d" +#~ msgstr "Porta %d" + +#~ msgid "VLAN Interface" +#~ msgstr "Interfaccia VLAN" diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index 63cfb28577..740c676a8b 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -13,6 +13,9 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(%d 分幅, %d 秒間隔)" @@ -530,9 +533,6 @@ msgstr "ボタン" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "CPU" - msgid "CPU usage (%)" msgstr "CPU使用率 (%)" @@ -1065,6 +1065,9 @@ msgstr "外部システムログ・サーバー" msgid "External system log server port" msgstr "外部システムログ・サーバーポート" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1767,6 +1770,9 @@ msgstr "" msgid "MB/s" msgstr "MB/s" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "MHz" @@ -2268,12 +2274,6 @@ msgstr "ポリシー" msgid "Port" msgstr "ポート" -msgid "Port %d" -msgstr "ポート %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "" - msgid "Port status:" msgstr "ポート ステータス:" @@ -2572,6 +2572,9 @@ msgstr "デバイスのマウントを行う前にファイルシステムチェ msgid "Run filesystem check" msgstr "ファイルシステムチェックを行う" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2713,6 +2716,9 @@ msgstr "スロット時間" msgid "Software" msgstr "ソフトウェア" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "無効な値が設定されているフィールドがあるため、保存できません。" @@ -2832,6 +2838,13 @@ msgstr "スイッチ %q" msgid "Switch %q (%s)" msgstr "スイッチ %q (%s)" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "プロトコルの切り替え" @@ -3332,9 +3345,6 @@ msgstr "VC-Mux" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "VLANインターフェース" - msgid "VLANs on %q" msgstr "%q上のVLANs" @@ -3467,6 +3477,9 @@ msgstr "無線LAN機能停止" msgid "Write received DNS requests to syslog" msgstr "受信したDNSリクエストをsyslogへ記録します" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "XRサポート" @@ -3647,3 +3660,12 @@ msgstr "はい" msgid "« Back" msgstr "« 戻る" + +#~ msgid "CPU" +#~ msgstr "CPU" + +#~ msgid "Port %d" +#~ msgstr "ポート %d" + +#~ msgid "VLAN Interface" +#~ msgstr "VLANインターフェース" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index 0bb60faf5e..5e348d69fe 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -13,6 +13,9 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Translate Toolkit 1.1.1\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "" @@ -517,9 +520,6 @@ msgstr "Butang" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "" - msgid "CPU usage (%)" msgstr "Penggunaan CPU (%)" @@ -1025,6 +1025,9 @@ msgstr "" msgid "External system log server port" msgstr "" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1720,6 +1723,9 @@ msgstr "" msgid "MB/s" msgstr "" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "" @@ -2220,12 +2226,6 @@ msgstr "Dasar" msgid "Port" msgstr "Port" -msgid "Port %d" -msgstr "" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "" - msgid "Port status:" msgstr "" @@ -2506,6 +2506,9 @@ msgstr "" msgid "Run filesystem check" msgstr "" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2644,6 +2647,9 @@ msgstr "Slot masa" msgid "Software" msgstr "Perisian" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "" @@ -2757,6 +2763,13 @@ msgstr "" msgid "Switch %q (%s)" msgstr "" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "" @@ -3221,9 +3234,6 @@ msgstr "" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "" - msgid "VLANs on %q" msgstr "" @@ -3355,6 +3365,9 @@ msgstr "" msgid "Write received DNS requests to syslog" msgstr "" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "Sokongan XR" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index 033237d0f6..793d381c2e 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -8,6 +8,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(%d minutters vindu, %d sekunds intervall)" @@ -529,9 +532,6 @@ msgstr "Knapper" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "CPU" - msgid "CPU usage (%)" msgstr "CPU forbruk (%)" @@ -1061,6 +1061,9 @@ msgstr "Ekstern systemlogg server" msgid "External system log server port" msgstr "Ekstern systemlogg server port" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1765,6 +1768,9 @@ msgstr "" msgid "MB/s" msgstr "MB/s" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "MHz" @@ -2266,12 +2272,6 @@ msgstr "Policy" msgid "Port" msgstr "Port" -msgid "Port %d" -msgstr "Port %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "Port %d er utagget i flere VLANs!" - msgid "Port status:" msgstr "Port status:" @@ -2567,6 +2567,9 @@ msgstr "Kjør filsystem sjekk før montering av enheten" msgid "Run filesystem check" msgstr "Kjør filsystem sjekk" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2708,6 +2711,9 @@ msgstr "Slot tid" msgid "Software" msgstr "Programvare" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "Noen felt er ugyldige, kan ikke lagre verdier!" @@ -2828,6 +2834,13 @@ msgstr "Svitsj %q" msgid "Switch %q (%s)" msgstr "Svitsj %q (%s)" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "Svitsj protokoll" @@ -3334,9 +3347,6 @@ msgstr "VC-Mux" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "VLAN grensesnitt" - msgid "VLANs on %q" msgstr "VLANs på %q" @@ -3468,6 +3478,9 @@ msgstr "Trådløst er slått av" msgid "Write received DNS requests to syslog" msgstr "Skriv mottatte DNS forespørsler til syslog" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "XR Støtte" @@ -3649,3 +3662,15 @@ msgstr "ja" msgid "« Back" msgstr "« Tilbake" + +#~ msgid "CPU" +#~ msgstr "CPU" + +#~ msgid "Port %d" +#~ msgstr "Port %d" + +#~ msgid "Port %d is untagged in multiple VLANs!" +#~ msgstr "Port %d er utagget i flere VLANs!" + +#~ msgid "VLAN Interface" +#~ msgstr "VLAN grensesnitt" diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index 49ede9c663..4e6152c033 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -14,6 +14,9 @@ msgstr "" "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(okno %d minut, interwał %d sekund)" @@ -548,9 +551,6 @@ msgstr "Przyciski" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "CPU" - msgid "CPU usage (%)" msgstr "Użycie CPU (%)" @@ -1093,6 +1093,9 @@ msgstr "Zewnętrzny serwer dla loga systemowego" msgid "External system log server port" msgstr "Port zewnętrznego serwera dla loga systemowego" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1812,6 +1815,9 @@ msgstr "" msgid "MB/s" msgstr "MB/s" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "MHz" @@ -2314,12 +2320,6 @@ msgstr "Zasada" msgid "Port" msgstr "Port" -msgid "Port %d" -msgstr "Port %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "Port %d jest nietagowany w wielu VLAN`ach!" - msgid "Port status:" msgstr "Status portu:" @@ -2618,6 +2618,9 @@ msgstr "" msgid "Run filesystem check" msgstr "Sprawdź czy system plików nie zawiera błędów" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2760,6 +2763,9 @@ msgstr "Szczelina czasowa" msgid "Software" msgstr "Oprogramowanie" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "Wartości pewnych pól są niewłaściwe, nie mogę ich zachować!" @@ -2883,6 +2889,13 @@ msgstr "Przełącznik %q" msgid "Switch %q (%s)" msgstr "Przełącznik %q (%s)" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "Protokół przełącznika" @@ -3399,9 +3412,6 @@ msgstr "VC-Mux" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "Interfejs VLAN" - msgid "VLANs on %q" msgstr "Sieci VLAN na %q" @@ -3534,6 +3544,9 @@ msgstr "Wyłączanie sieci bezprzewodowej" msgid "Write received DNS requests to syslog" msgstr "Zapisz otrzymane żądania DNS do syslog'a" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "Wsparcie XR" @@ -3716,3 +3729,15 @@ msgstr "tak" msgid "« Back" msgstr "« Wróć" + +#~ msgid "CPU" +#~ msgstr "CPU" + +#~ msgid "Port %d" +#~ msgstr "Port %d" + +#~ msgid "Port %d is untagged in multiple VLANs!" +#~ msgstr "Port %d jest nietagowany w wielu VLAN`ach!" + +#~ msgid "VLAN Interface" +#~ msgstr "Interfejs VLAN" diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index 209a8625c7..fda160503c 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -13,6 +13,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(janela de %d minutos, intervalo de %d segundos)" @@ -544,9 +547,6 @@ msgstr "Botões" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "CPU" - msgid "CPU usage (%)" msgstr "Uso da CPU (%)" @@ -1086,6 +1086,9 @@ msgstr "Servidor externo de registros do sistema (syslog)" msgid "External system log server port" msgstr "Porta do servidor externo de registro do sistema (syslog)" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1813,6 +1816,9 @@ msgstr "" msgid "MB/s" msgstr "MB/s" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "MHz" @@ -2319,12 +2325,6 @@ msgstr "Política" msgid "Port" msgstr "Porta" -msgid "Port %d" -msgstr "Porta %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "Porta %d está sem etiqueta para mútliplas VLANs!" - msgid "Port status:" msgstr "Status da porta" @@ -2623,6 +2623,9 @@ msgstr "" msgid "Run filesystem check" msgstr "Execute a verificação do sistema de arquivos " +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2764,6 +2767,9 @@ msgstr "Intervalo de tempo" msgid "Software" msgstr "Software" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "Alguns campos estão inválidos e os valores não podem ser salvos!" @@ -2888,6 +2894,13 @@ msgstr "Switch %q" msgid "Switch %q (%s)" msgstr "Switch %q (%s)" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "Trocar o protocolo" @@ -3401,9 +3414,6 @@ msgstr "VC-Mux" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "Interface VLAN" - msgid "VLANs on %q" msgstr "VLANs em %q" @@ -3535,6 +3545,9 @@ msgstr "Rede sem fio desligada" msgid "Write received DNS requests to syslog" msgstr "Escreva as requisições DNS para o servidor de registro (syslog)" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "Suporte a XR" @@ -3720,3 +3733,15 @@ msgstr "sim" msgid "« Back" msgstr "« Voltar" + +#~ msgid "CPU" +#~ msgstr "CPU" + +#~ msgid "Port %d" +#~ msgstr "Porta %d" + +#~ msgid "Port %d is untagged in multiple VLANs!" +#~ msgstr "Porta %d está sem etiqueta para mútliplas VLANs!" + +#~ msgid "VLAN Interface" +#~ msgstr "Interface VLAN" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index f20a95dc19..05bdb76ff9 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -13,6 +13,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(janela de %d minutos, intervalo de %d segundos)" @@ -542,9 +545,6 @@ msgstr "Botões" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "CPU" - msgid "CPU usage (%)" msgstr "Uso da CPU (%)" @@ -1079,6 +1079,9 @@ msgstr "Servidor externo de logs de sistema" msgid "External system log server port" msgstr "Porta do Servidor externo de logs de sistema" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1789,6 +1792,9 @@ msgstr "" msgid "MB/s" msgstr "MB/s" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "MHz" @@ -2288,12 +2294,6 @@ msgstr "Política" msgid "Port" msgstr "Porta" -msgid "Port %d" -msgstr "Porta %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "" - msgid "Port status:" msgstr "Estado da porta:" @@ -2587,6 +2587,9 @@ msgstr "" msgid "Run filesystem check" msgstr "Correr uma verificação do sistema de ficheiros" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2726,6 +2729,9 @@ msgstr "" msgid "Software" msgstr "Software" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "Alguns campos são inválidos, não é possível gravar valores!" @@ -2838,6 +2844,13 @@ msgstr "" msgid "Switch %q (%s)" msgstr "" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "" @@ -3327,9 +3340,6 @@ msgstr "" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "Interface VLAN" - msgid "VLANs on %q" msgstr "VLANs em %q" @@ -3461,6 +3471,9 @@ msgstr "Desligar wireless" msgid "Write received DNS requests to syslog" msgstr "Escrever os pedidos de DNS para o syslog" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "Suporte XR" @@ -3645,3 +3658,12 @@ msgstr "sim" msgid "« Back" msgstr "« Voltar" + +#~ msgid "CPU" +#~ msgstr "CPU" + +#~ msgid "Port %d" +#~ msgstr "Porta %d" + +#~ msgid "VLAN Interface" +#~ msgstr "Interface VLAN" diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index b114568179..73f9fb19f2 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -12,6 +12,9 @@ msgstr "" "20)) ? 1 : 2);;\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(%d fereastra minute, %d interval secunde)" @@ -526,9 +529,6 @@ msgstr "Butoane" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "Procesor" - msgid "CPU usage (%)" msgstr "Utilizarea procesorului (%)" @@ -1032,6 +1032,9 @@ msgstr "Server de log-uri extern" msgid "External system log server port" msgstr "Portul serverului de log-uri extern" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1722,6 +1725,9 @@ msgstr "" msgid "MB/s" msgstr "" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "" @@ -2213,12 +2219,6 @@ msgstr "" msgid "Port" msgstr "Port" -msgid "Port %d" -msgstr "Port %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "" - msgid "Port status:" msgstr "Stare port:" @@ -2498,6 +2498,9 @@ msgstr "" msgid "Run filesystem check" msgstr "" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2637,6 +2640,9 @@ msgstr "" msgid "Software" msgstr "Software" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "" @@ -2749,6 +2755,13 @@ msgstr "" msgid "Switch %q (%s)" msgstr "" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "" @@ -3195,9 +3208,6 @@ msgstr "VC-Mux" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "Interfata VLAN" - msgid "VLANs on %q" msgstr "VLANuri pe %q" @@ -3329,6 +3339,9 @@ msgstr "Wireless-ul oprit" msgid "Write received DNS requests to syslog" msgstr "Scrie cererile DNS primite in syslog" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "Suport XR" @@ -3502,3 +3515,12 @@ msgstr "da" msgid "« Back" msgstr "« Inapoi" + +#~ msgid "CPU" +#~ msgstr "Procesor" + +#~ msgid "Port %d" +#~ msgstr "Port %d" + +#~ msgid "VLAN Interface" +#~ msgstr "Interfata VLAN" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index 4ad8bfb1c4..34dde6bb10 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -15,6 +15,9 @@ msgstr "" "X-Generator: Pootle 2.0.6\n" "X-Poedit-SourceCharset: UTF-8\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(%d минутное окно, %d секундный интервал)" @@ -542,9 +545,6 @@ msgstr "Кнопки" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "ЦП" - msgid "CPU usage (%)" msgstr "Загрузка ЦП (%)" @@ -1080,6 +1080,9 @@ msgstr "Сервер системного журнала" msgid "External system log server port" msgstr "Порт сервера системного журнала" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1794,6 +1797,9 @@ msgstr "" msgid "MB/s" msgstr "МБ/с" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "МГц" @@ -2296,12 +2302,6 @@ msgstr "Политика" msgid "Port" msgstr "Порт" -msgid "Port %d" -msgstr "Порт %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "Порт %d нетегирован в нескольких VLANах!" - msgid "Port status:" msgstr "Состояние порта:" @@ -2597,6 +2597,9 @@ msgstr "Проверять файловую систему перед монти msgid "Run filesystem check" msgstr "Проверять файловую систему" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2738,6 +2741,9 @@ msgstr "Время слота" msgid "Software" msgstr "Программное обеспечение" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "Некоторые значения полей недопустимы, невозможно сохранить информацию!" @@ -2860,6 +2866,13 @@ msgstr "Коммутатор %q" msgid "Switch %q (%s)" msgstr "Коммутатор %q (%s)" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "Изменить протокол" @@ -3369,9 +3382,6 @@ msgstr "VC-Mux" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "Интерфейс VLAN" - msgid "VLANs on %q" msgstr "VLANы на %q" @@ -3504,6 +3514,9 @@ msgstr "Выключение беспроводной сети" msgid "Write received DNS requests to syslog" msgstr "Записывать полученные DNS-запросы в системный журнал" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "Поддержка XR" @@ -3687,3 +3700,15 @@ msgstr "да" msgid "« Back" msgstr "« Назад" + +#~ msgid "CPU" +#~ msgstr "ЦП" + +#~ msgid "Port %d" +#~ msgstr "Порт %d" + +#~ msgid "Port %d is untagged in multiple VLANs!" +#~ msgstr "Порт %d нетегирован в нескольких VLANах!" + +#~ msgid "VLAN Interface" +#~ msgstr "Интерфейс VLAN" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index a8466d4c9a..0d87051247 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -8,6 +8,9 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "" @@ -511,9 +514,6 @@ msgstr "" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "" - msgid "CPU usage (%)" msgstr "" @@ -1012,6 +1012,9 @@ msgstr "" msgid "External system log server port" msgstr "" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1696,6 +1699,9 @@ msgstr "" msgid "MB/s" msgstr "" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "" @@ -2187,12 +2193,6 @@ msgstr "" msgid "Port" msgstr "" -msgid "Port %d" -msgstr "" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "" - msgid "Port status:" msgstr "" @@ -2470,6 +2470,9 @@ msgstr "" msgid "Run filesystem check" msgstr "" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2608,6 +2611,9 @@ msgstr "" msgid "Software" msgstr "" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "" @@ -2720,6 +2726,13 @@ msgstr "" msgid "Switch %q (%s)" msgstr "" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "" @@ -3164,9 +3177,6 @@ msgstr "" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "" - msgid "VLANs on %q" msgstr "" @@ -3296,6 +3306,9 @@ msgstr "" msgid "Write received DNS requests to syslog" msgstr "" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "" diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index 84421632d8..73a88b8616 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -11,6 +11,9 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "" @@ -517,9 +520,6 @@ msgstr "" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "" - msgid "CPU usage (%)" msgstr "" @@ -1018,6 +1018,9 @@ msgstr "" msgid "External system log server port" msgstr "" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1702,6 +1705,9 @@ msgstr "" msgid "MB/s" msgstr "" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "" @@ -2193,12 +2199,6 @@ msgstr "" msgid "Port" msgstr "" -msgid "Port %d" -msgstr "" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "" - msgid "Port status:" msgstr "" @@ -2476,6 +2476,9 @@ msgstr "" msgid "Run filesystem check" msgstr "" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2614,6 +2617,9 @@ msgstr "" msgid "Software" msgstr "" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "" @@ -2726,6 +2732,13 @@ msgstr "" msgid "Switch %q (%s)" msgstr "" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "" @@ -3170,9 +3183,6 @@ msgstr "" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "" - msgid "VLANs on %q" msgstr "" @@ -3302,6 +3312,9 @@ msgstr "" msgid "Write received DNS requests to syslog" msgstr "" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "" diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index 35181ee222..df2892b88f 100644 --- a/modules/luci-base/po/templates/base.pot +++ b/modules/luci-base/po/templates/base.pot @@ -1,6 +1,9 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "" @@ -504,9 +507,6 @@ msgstr "" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "" - msgid "CPU usage (%)" msgstr "" @@ -1005,6 +1005,9 @@ msgstr "" msgid "External system log server port" msgstr "" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1689,6 +1692,9 @@ msgstr "" msgid "MB/s" msgstr "" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "" @@ -2180,12 +2186,6 @@ msgstr "" msgid "Port" msgstr "" -msgid "Port %d" -msgstr "" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "" - msgid "Port status:" msgstr "" @@ -2463,6 +2463,9 @@ msgstr "" msgid "Run filesystem check" msgstr "" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2601,6 +2604,9 @@ msgstr "" msgid "Software" msgstr "" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "" @@ -2713,6 +2719,13 @@ msgstr "" msgid "Switch %q (%s)" msgstr "" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "" @@ -3157,9 +3170,6 @@ msgstr "" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "" - msgid "VLANs on %q" msgstr "" @@ -3289,6 +3299,9 @@ msgstr "" msgid "Write received DNS requests to syslog" msgstr "" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index ca993564c1..a5a5338979 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -11,6 +11,9 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(%d dakika gösteriliyor, %d saniye aralıklı)" @@ -524,9 +527,6 @@ msgstr "" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "" - msgid "CPU usage (%)" msgstr "" @@ -1025,6 +1025,9 @@ msgstr "" msgid "External system log server port" msgstr "" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1709,6 +1712,9 @@ msgstr "" msgid "MB/s" msgstr "" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "" @@ -2200,12 +2206,6 @@ msgstr "" msgid "Port" msgstr "" -msgid "Port %d" -msgstr "" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "" - msgid "Port status:" msgstr "" @@ -2483,6 +2483,9 @@ msgstr "" msgid "Run filesystem check" msgstr "" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2621,6 +2624,9 @@ msgstr "" msgid "Software" msgstr "" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "" @@ -2733,6 +2739,13 @@ msgstr "" msgid "Switch %q (%s)" msgstr "" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "" @@ -3177,9 +3190,6 @@ msgstr "" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "" - msgid "VLANs on %q" msgstr "" @@ -3309,6 +3319,9 @@ msgstr "" msgid "Write received DNS requests to syslog" msgstr "" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index 194f67c78e..95c686e282 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -12,6 +12,9 @@ msgstr "" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(%d-хвилинне вікно, %d-секундний інтервал)" @@ -551,9 +554,6 @@ msgstr "Кнопки" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "ЦП" - msgid "CPU usage (%)" msgstr "Завантаження ЦП, %" @@ -1088,6 +1088,9 @@ msgstr "Зовнішній сервер системного журналу" msgid "External system log server port" msgstr "Порт зовнішнього сервера системного журналу" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1803,6 +1806,9 @@ msgstr "" msgid "MB/s" msgstr "MБ/с" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "МГц" @@ -2307,12 +2313,6 @@ msgstr "Політика" msgid "Port" msgstr "Порт" -msgid "Port %d" -msgstr "Порт %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "Порт %d нетегований у кількох VLAN-ах!" - msgid "Port status:" msgstr "Статус порту:" @@ -2610,6 +2610,9 @@ msgstr "Виконати перевірку файлової системи пе msgid "Run filesystem check" msgstr "Виконати перевірку файлової системи" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2751,6 +2754,9 @@ msgstr "Час слота" msgid "Software" msgstr "Програмне забезпечення" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "Деякі поля є неприпустимими, неможливо зберегти значення!" @@ -2875,6 +2881,13 @@ msgstr "Комутатор %q" msgid "Switch %q (%s)" msgstr "Комутатор %q (%s)" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "Протокол комутатора" @@ -3385,9 +3398,6 @@ msgstr "VC-Mux" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "VLAN-інтерфейс" - msgid "VLANs on %q" msgstr "VLAN на %q" @@ -3519,6 +3529,9 @@ msgstr "Бездротова мережа припинила роботу" msgid "Write received DNS requests to syslog" msgstr "Записувати отримані DNS-запити до системного журналу" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "Підтримка XR" @@ -3702,3 +3715,15 @@ msgstr "так" msgid "« Back" msgstr "« Назад" + +#~ msgid "CPU" +#~ msgstr "ЦП" + +#~ msgid "Port %d" +#~ msgstr "Порт %d" + +#~ msgid "Port %d is untagged in multiple VLANs!" +#~ msgstr "Порт %d нетегований у кількох VLAN-ах!" + +#~ msgid "VLAN Interface" +#~ msgstr "VLAN-інтерфейс" diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index dbebe177f2..0e378565ae 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -12,6 +12,9 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 1.1.0\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "" @@ -518,9 +521,6 @@ msgstr "" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "" - msgid "CPU usage (%)" msgstr "CPU usage (%)" @@ -1030,6 +1030,9 @@ msgstr "" msgid "External system log server port" msgstr "" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1724,6 +1727,9 @@ msgstr "" msgid "MB/s" msgstr "" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "" @@ -2223,12 +2229,6 @@ msgstr "Chính sách" msgid "Port" msgstr "Cửa " -msgid "Port %d" -msgstr "" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "" - msgid "Port status:" msgstr "" @@ -2510,6 +2510,9 @@ msgstr "" msgid "Run filesystem check" msgstr "" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2648,6 +2651,9 @@ msgstr "" msgid "Software" msgstr "Phần mềm" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "" @@ -2760,6 +2766,13 @@ msgstr "" msgid "Switch %q (%s)" msgstr "" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "" @@ -3219,9 +3232,6 @@ msgstr "" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "" - msgid "VLANs on %q" msgstr "" @@ -3351,6 +3361,9 @@ msgstr "" msgid "Write received DNS requests to syslog" msgstr "" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "Hỗ trợ XR" diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index 5d5d558af6..dbc4df8091 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.po @@ -13,6 +13,9 @@ msgstr "" "X-Generator: Poedit 1.8.5\n" "Language-Team: \n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(%d分钟信息，%d秒刷新)" @@ -526,9 +529,6 @@ msgstr "按键" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "CA证书.如果留空的话证书将在第一次连接时被保存." -msgid "CPU" -msgstr "CPU" - msgid "CPU usage (%)" msgstr "CPU使用率(%)" @@ -1034,6 +1034,9 @@ msgstr "远程log服务器" msgid "External system log server port" msgstr "远程log服务器端口" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "额外的SSH命令选项" @@ -1722,6 +1725,9 @@ msgstr "" msgid "MB/s" msgstr "MB/s" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "MHz" @@ -2213,12 +2219,6 @@ msgstr "策略" msgid "Port" msgstr "端口" -msgid "Port %d" -msgstr "端口 %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "端口 %d 在多个VLAN中均未关联！" - msgid "Port status:" msgstr "端口状态：" @@ -2507,6 +2507,9 @@ msgstr "挂载设备前运行文件系统检查" msgid "Run filesystem check" msgstr "文件系统检查" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2646,6 +2649,9 @@ msgstr "时隙" msgid "Software" msgstr "软件包" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "一些项目的值无效，无法保存！" @@ -2763,6 +2769,13 @@ msgstr "交换机 %q" msgid "Switch %q (%s)" msgstr "交换机%q (%s)" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "切换协议" @@ -3230,9 +3243,6 @@ msgstr "VC-Mux" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "VLAN接口" - msgid "VLANs on %q" msgstr "%q上的VLAN" @@ -3364,6 +3374,9 @@ msgstr "无线已关闭" msgid "Write received DNS requests to syslog" msgstr "将收到的DNS请求写入系统日志" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "XR支持" @@ -3542,3 +3555,15 @@ msgstr "是" msgid "« Back" msgstr "« 后退" + +#~ msgid "CPU" +#~ msgstr "CPU" + +#~ msgid "Port %d" +#~ msgstr "端口 %d" + +#~ msgid "Port %d is untagged in multiple VLANs!" +#~ 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 4ed557fc6c..d1d17ad916 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -11,6 +11,9 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.6\n" +msgid "%s is untagged in multiple VLANs!" +msgstr "" + msgid "(%d minute window, %d second interval)" msgstr "(%d 分鐘訊息, %d 秒更新)" @@ -523,9 +526,6 @@ msgstr "按鈕" msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" -msgid "CPU" -msgstr "CPU" - msgid "CPU usage (%)" msgstr "CPU 使用率 (%)" @@ -1043,6 +1043,9 @@ msgstr "外部系統日誌伺服器" msgid "External system log server port" msgstr "外部系統日誌伺服器埠號" +msgid "External system log server protocol" +msgstr "" + msgid "Extra SSH command options" msgstr "" @@ -1733,6 +1736,9 @@ msgstr "" msgid "MB/s" msgstr "MB/s" +msgid "MD5" +msgstr "" + msgid "MHz" msgstr "MHz" @@ -2228,12 +2234,6 @@ msgstr "策略" msgid "Port" msgstr "埠" -msgid "Port %d" -msgstr "埠 %d" - -msgid "Port %d is untagged in multiple VLANs!" -msgstr "埠 %d 尚未標記在多個VLANs中!" - msgid "Port status:" msgstr "埠狀態:" @@ -2522,6 +2522,9 @@ msgstr "掛載這個設備前先跑系統檢查" msgid "Run filesystem check" msgstr "執行系統檢查" +msgid "SHA256" +msgstr "" + msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" @@ -2661,6 +2664,9 @@ msgstr "插槽時間" msgid "Software" msgstr "軟體" +msgid "Software VLAN" +msgstr "" + msgid "Some fields are invalid, cannot save values!" msgstr "有些欄位失效, 無法儲存數值!" @@ -2778,6 +2784,13 @@ msgstr "交換器 %q" msgid "Switch %q (%s)" msgstr "交換器 %q (%s)" +msgid "" +"Switch %q has an unknown topology - the VLAN settings might not be accurate." +msgstr "" + +msgid "Switch VLAN" +msgstr "" + msgid "Switch protocol" msgstr "交換器協定" @@ -3257,9 +3270,6 @@ msgstr "虛擬電路多工器VC-Mux" msgid "VDSL" msgstr "" -msgid "VLAN Interface" -msgstr "VLAN介面" - msgid "VLANs on %q" msgstr "VLAN 在 %q" @@ -3391,6 +3401,9 @@ msgstr "無線網路關閉" msgid "Write received DNS requests to syslog" msgstr "寫入已接收的DNS請求到系統日誌中" +msgid "Write system log to file" +msgstr "" + msgid "XR Support" msgstr "支援XR無線陣列" @@ -3568,3 +3581,15 @@ msgstr "是的" msgid "« Back" msgstr "« 倒退" + +#~ msgid "CPU" +#~ msgstr "CPU" + +#~ msgid "Port %d" +#~ msgstr "埠 %d" + +#~ msgid "Port %d is untagged in multiple VLANs!" +#~ msgstr "埠 %d 尚未標記在多個VLANs中!" + +#~ msgid "VLAN Interface" +#~ msgstr "VLAN介面" diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua index fd6dda1c80..cf8cfb5d2d 100644 --- a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua +++ b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua @@ -185,6 +185,10 @@ local function image_checksum(image) return (luci.sys.exec("md5sum %q" % image):match("^([^%s]+)")) end +local function image_sha256_checksum(image) + return (luci.sys.exec("sha256sum %q" % image):match("^([^%s]+)")) +end + local function supports_sysupgrade() return nixio.fs.access("/lib/upgrade/platform.sh") end @@ -268,6 +272,7 @@ function action_sysupgrade() if image_supported(image_tmp) then luci.template.render("admin_system/upgrade", { checksum = image_checksum(image_tmp), + sha256ch = image_sha256_checksum(image_tmp), storage = storage_size(), size = (fs.stat(image_tmp, "size") or 0), keep = (not not http.formvalue("keep")) diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua index ce3c3ef325..902767c903 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua @@ -5,8 +5,13 @@ m = Map("network", translate("Switch"), translate("The network ports on this device can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.")) local fs = require "nixio.fs" +local nw = require "luci.model.network" local switches = { } +nw.init(m.uci) + +local topologies = nw:get_switch_topologies() or {} + m.uci:foreach("network", "switch", function(x) local sid = x['.name'] @@ -19,12 +24,26 @@ m.uci:foreach("network", "switch", local min_vid = 0 local max_vid = 16 local num_vlans = 16 - local cpu_port = tonumber(fs.readfile("/proc/switch/eth0/cpuport") or 5) - local num_ports = cpu_port + 1 local switch_title local enable_vlan4k = false + local topo = topologies[switch_name] + + if not topo then + m.message = translatef("Switch %q has an unknown topology - the VLAN settings might not be accurate.", switch_name) + topo = { + ports = { + { num = 0, label = "Port 1" }, + { num = 1, label = "Port 2" }, + { num = 2, label = "Port 3" }, + { num = 3, label = "Port 4" }, + { num = 4, label = "Port 5" }, + { num = 5, label = "CPU (eth0)", tagged = false } + } + } + end + -- Parse some common switch properties from swconfig help output. local swc = io.popen("swconfig dev %q help 2>/dev/null" % switch_name) if swc then @@ -45,12 +64,7 @@ m.uci:foreach("network", "switch", elseif line:match("cpu @") then switch_title = line:match("^switch%d: %w+%((.-)%)") - num_ports, cpu_port, num_vlans = - line:match("ports: (%d+) %(cpu @ (%d+)%), vlans: (%d+)") - - num_ports = tonumber(num_ports) or 6 - num_vlans = tonumber(num_vlans) or 16 - cpu_port = tonumber(cpu_port) or 5 + num_vlans = tonumber(line:match("vlans: (%d+)")) or 16 min_vid = 1 elseif line:match(": pvid") or line:match(": tag") or line:match(": vid") then @@ -113,14 +127,10 @@ m.uci:foreach("network", "switch", mp:depends("enable_mirror_tx", "1") mp:depends("enable_mirror_rx", "1") - local pt - for pt = 0, num_ports - 1 do - local name - - name = (pt == cpu_port) and translate("CPU") or translatef("Port %d", pt) - - sp:value(pt, name) - mp:value(pt, name) + local _, pt + for _, pt in ipairs(topo.ports) do + sp:value(pt.num, pt.label) + mp:value(pt.num, pt.label) end end @@ -211,9 +221,9 @@ m.uci:foreach("network", "switch", if value == "u" then if not untagged[self.option] then untagged[self.option] = true - elseif min_vid > 0 or tonumber(self.option) ~= cpu_port then -- enable multiple untagged cpu ports due to weird broadcom default setup + else return nil, - translatef("Port %d is untagged in multiple VLANs!", tonumber(self.option) + 1) + translatef("%s is untagged in multiple VLANs!", self.title) end end return value @@ -276,20 +286,16 @@ m.uci:foreach("network", "switch", or m:get(section, "vlan") end - -- Build per-port off/untagged/tagged choice lists. - local pt - for pt = 0, num_ports - 1 do - local title - if pt == cpu_port then - title = translate("CPU") - else - title = translatef("Port %d", pt) - end - - local po = s:option(ListValue, tostring(pt), title) + local _, pt + for _, pt in ipairs(topo.ports) do + local po = s:option(ListValue, tostring(pt.num), pt.label, '<div id="portstatus-%s-%d"></div>' %{ switch_name, pt.num }) po:value("", translate("off")) - po:value("u", translate("untagged")) + + if not pt.tagged then + po:value("u", translate("untagged")) + end + po:value("t", translate("tagged")) po.cfgvalue = portvalue @@ -299,6 +305,7 @@ m.uci:foreach("network", "switch", port_opts[#port_opts+1] = po end + table.sort(port_opts, function(a, b) return a.option < b.option end) switches[#switches+1] = switch_name end ) diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm index 53c35ae59c..96fbffdb02 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm @@ -15,7 +15,10 @@ for (var j = 0; j < ports.length; j++) { - var th = th0.parentNode.parentNode.childNodes[j+1]; + var th = document.getElementById('portstatus-' + switches[i] + '-' + j); + + if (!th) + continue; if (ports[j].link) { diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm index 5ca0398e13..7175248dbb 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm @@ -24,7 +24,9 @@ <fieldset class="cbi-section"> <ul> - <li><%:Checksum%>: <code><%=checksum%></code></li> + <li><%:Checksum%><br /> + <%:MD5%>: <code><%=checksum%></code><br /> + <%:SHA256%>: <code><%=sha256ch%></code></li> <li><%:Size%>: <% local w = require "luci.tools.webadmin" write(w.byte_format(size)) diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css index 1d23748058..1adf17c66d 100644 --- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css +++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css @@ -1614,7 +1614,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { opacity: 0.4; } -.alert-message { +.alert-message, .errorbox { position: relative; padding: 7px 15px; margin-bottom: 18px; |