timezone data: update to 2016a

Apply the timezone definition changes 2015e-2016a

http://mm.icann.org/pipermail/tz-announce/2015-June/000032.html
http://mm.icann.org/pipermail/tz-announce/2015-August/000033.html
http://mm.icann.org/pipermail/tz-announce/2015-October/000034.html
http://mm.icann.org/pipermail/tz-announce/2016-January/000035.html

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua

@@ -26,6 +26,10 @@ s.anonymous = false
 
 s:option(Flag, "enabled", translate("Enable"))
 
+interface = s:option(ListValue, "interface", translate("Event interface"), translate("Network on which the ddns-updater scripts will be started"))
+luci.tools.webadmin.cbi_add_networks(interface)
+interface.default = "wan"
+
 svc = s:option(ListValue, "service_name", translate("Service"))
 svc.rmempty = false
 svc.default = "dyndns.org"

build/mkrevision.sh

@@ -14,7 +14,10 @@ TOPDIR="${0%mkrevision.sh}"
 	elif git log -1 >/dev/null 2>/dev/null; then
 		revision="svn-r$(LC_ALL=C git log -1 | sed -ne 's/.*git-svn-id: .*@\([0-9]\+\) .*/\1/p')"
 		if [ "$revision" = "svn-r" ]; then
-			revision="git-$(LC_ALL=C git log -1 --pretty=%h)"
+			set -- $(git log -1 --format="%ct %h")
+			secs="$(($1 % 86400))"
+			yday="$(date --utc --date="@$1" "+%y.%j")"
+			revision="$(printf 'git-%s.%05d-%s' "$yday" "$secs" "$2")"
 		fi
 	else
 		revision="unknown"

build/mkversion.sh

@@ -1,10 +1,26 @@
 #!/bin/sh
-if [ "${4%%/*}" = "branches" ]; then
-	variant="LuCI ${4##*[-/]} Branch"
-elif [ "${4%%/*}" = "tags" ]; then
-	variant="LuCI ${4##*[-/]} Release"
+
+if svn info >/dev/null 2>/dev/null; then
+	if [ "${4%%/*}" = "branches" ]; then
+		variant="LuCI ${4##*[-/]} Branch"
+	elif [ "${4%%/*}" = "tags" ]; then
+		variant="LuCI ${4##*[-/]} Release"
+	else
+		variant="LuCI Trunk"
+	fi
+elif git status >/dev/null 2>/dev/null; then
+	tag="$(git describe --tags 2>/dev/null)"
+	branch="$(git symbolic-ref --short -q HEAD 2>/dev/null)"
+
+	if [ -n "$tag" ]; then
+		variant="LuCI $tag Release"
+	elif [ "$branch" != "master" ]; then
+		variant="LuCI ${branch##*-} Branch"
+	else
+		variant="LuCI Master"
+	fi
 else
-	variant="LuCI Trunk"
+	variant="LuCI"
 fi
 
 cat <<EOF > $1

build/zoneinfo2lua.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # zoneinfo2lua.pl - Make Lua module from /usr/share/zoneinfo
-# Execute from within /usr/share/zoneinfo
+# Execute from within root of Luci feed, usually feeds/luci
 # $Id$
 
 use strict;
@@ -8,7 +8,7 @@ use strict;
 my %TZ;
 
 my $tzdin  = $ARGV[0] || "/usr/share/zoneinfo";
-my $tzdout = $ARGV[1] || "./libs/sys/luasrc/sys/zoneinfo";
+my $tzdout = $ARGV[1] || "./modules/base/luasrc/sys/zoneinfo";
 
 local $/ = "\012";
 open( ZTAB, "< $tzdin/zone.tab" ) || die "open($tzdin/zone.tab): $!";
@@ -51,16 +51,7 @@ open(O, "> $tzdout/tzdata.lua") || die "open($tzdout/tzdata.lua): $!\n";
 
 print STDERR "Writing time zones to $tzdout/tzdata.lua ... ";
 print O <<HEAD;
---[[
-LuCI - Autogenerated Zoneinfo Module
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-]]--
+-- Licensed to the public under the Apache License 2.0.
 
 module "luci.sys.zoneinfo.tzdata"
 
@@ -81,16 +72,7 @@ open (O, "> $tzdout/tzoffset.lua") || die "open($tzdout/tzoffset.lua): $!\n";
 
 print STDERR "Writing time offsets to $tzdout/tzoffset.lua ... ";
 print O <<HEAD;
---[[
-LuCI - Autogenerated Zoneinfo Module
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-]]--
+-- Licensed to the public under the Apache License 2.0.
 
 module "luci.sys.zoneinfo.tzoffset"
 

contrib/package/luci-addons/Makefile

@@ -7,7 +7,7 @@ PKG_RELEASE:=1
 
 PKG_BUILD_PARALLEL:=0
 
-PKG_VERSION:=$(shell $(LUCI_TOPDIR)/build/mkrevision.sh 2>/dev/null || echo unknown)
+PKG_VERSION:=0.12+$(shell $(LUCI_TOPDIR)/build/mkrevision.sh 2>/dev/null || echo unknown)
 
 PKG_BUILD_DEPENDS:=$(if $(STAGING_DIR_ROOT),lua/host)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

contrib/package/luci/Makefile

@@ -7,7 +7,7 @@ PKG_RELEASE:=1
 
 PKG_BUILD_PARALLEL:=0
 
-PKG_VERSION:=$(shell $(LUCI_TOPDIR)/build/mkrevision.sh 2>/dev/null || echo unknown)
+PKG_VERSION:=0.12+$(shell $(LUCI_TOPDIR)/build/mkrevision.sh 2>/dev/null || echo unknown)
 
 PKG_BUILD_DEPENDS:=$(if $(STAGING_DIR_ROOT),lua/host) iwinfo
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
@@ -48,7 +48,7 @@ define Package/luci-base/install
 	$(PKG_BUILD_DIR)/build/mkversion.sh $(1)/usr/lib/lua/luci/version.lua \
 		"OpenWrt Firmware" \
 		"$(OPENWRTVERSION)" \
-		"trunk" \
+		"luci-0.12" \
 		"$(PKG_VERSION)"
 endef
 
@@ -192,6 +192,7 @@ endef
 $(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA/PPtP))
 $(eval $(call protocol,ipv6,Support for DHCPv6/6in4/6to4/6rd/DS-Lite))
 $(eval $(call protocol,3g,Support for 3G,+PACKAGE_luci-proto-3g:comgt))
+$(eval $(call protocol,hso,Support for HSO,+PACKAGE_luci-proto-hso:comgt +PACKAGE_luci-proto-hso:kmod-usb-net +PACKAGE_luci-proto-hso:kmod-usb-net-hso))
 $(eval $(call protocol,relay,Support for relayd pseudo bridges,+PACKAGE_luci-proto-relay:relayd))
 
 

contrib/uci/Makefile

@@ -7,10 +7,11 @@ UCI_VERSION  = 0.8.0
 #UCI_FILE    = $(UCI_DIR).tar.gz
 #UCI_URL     = $(UCI_SITE)/$(UCI_FILE)
 UCI_GITREV   = aa3ab8012bfbf793d2884c08ea924545a04e9544
-UCI_SITE     = http://nbd.name
-UCI_DIR      = uci.git
+UCI_SITE     = http://git.openwrt.org
+UCI_SRCDIR   = project/uci.git
+UCI_DIR      = uci
 UCI_FILE     = uci-$(UCI_VERSION)$(UCI_APPEND).tar.gz
-UCI_URL      = $(UCI_SITE)/gitweb.cgi?p=uci.git;a=snapshot;h=$(UCI_GITREV)
+UCI_URL      = $(UCI_SITE)/?p=$(UCI_SRCDIR);a=snapshot;h=$(UCI_GITREV);sf=tgz
 UCI_PATCHDIR = patches
 
 all: compile
@@ -22,7 +23,8 @@ $(UCI_FILE):
 
 $(UCI_DIR)/.prepared: $(UCI_FILE)
 	rm -rf $(UCI_DIR)
-	tar xvfz $(UCI_FILE)
+	mkdir $(UCI_DIR)
+	tar xvfz $(UCI_FILE) --strip-components 1 -C $(UCI_DIR)
 	(cd $(UCI_PATCHDIR); ls *.patch | sort > series) || true
 	[ -f "$(UCI_PATCHDIR)/series" ] && while read patch; do \
 		patch -d $(UCI_DIR) -p1 < $(UCI_PATCHDIR)/$$patch; \

modules/base/luasrc/http.lua

@@ -42,8 +42,8 @@ function Request.__init__(self, env, sourcein, sinkerr)
 	self.error = sinkerr
 
 
-	-- File handler
-	self.filehandler = function() end
+	-- File handler nil by default to let .content() work
+	self.filehandler = nil
 
 	-- HTTP-Message table
 	self.message = {

modules/base/luasrc/http/protocol.lua

@@ -658,7 +658,7 @@ function parse_message_body( src, msg, filecb )
 
 			if not ok and err then
 				return nil, err
-			elseif not err then
+			elseif not ok then -- eof
 				return true
 			end
 		end

modules/base/luasrc/sys/zoneinfo/tzdata.lua

@@ -1,13 +1,4 @@
---[[
-LuCI - Autogenerated Zoneinfo Module
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-]]--
+-- Licensed to the public under the Apache License 2.0.
 
 module "luci.sys.zoneinfo.tzdata"
 
@@ -24,14 +15,15 @@ TZ = {
 	{ 'Africa/Blantyre', 'CAT-2' },
 	{ 'Africa/Brazzaville', 'WAT-1' },
 	{ 'Africa/Bujumbura', 'CAT-2' },
-	{ 'Africa/Casablanca', 'WET0' },
+	{ 'Africa/Cairo', 'EET-2' },
+	{ 'Africa/Casablanca', 'WET0WEST,M3.5.0,M10.5.0/3' },
 	{ 'Africa/Ceuta', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Africa/Conakry', 'GMT0' },
 	{ 'Africa/Dakar', 'GMT0' },
 	{ 'Africa/Dar es Salaam', 'EAT-3' },
 	{ 'Africa/Djibouti', 'EAT-3' },
 	{ 'Africa/Douala', 'WAT-1' },
-	{ 'Africa/El Aaiun', 'WET0' },
+	{ 'Africa/El Aaiun', 'WET0WEST,M3.5.0,M10.5.0/3' },
 	{ 'Africa/Freetown', 'GMT0' },
 	{ 'Africa/Gaborone', 'CAT-2' },
 	{ 'Africa/Harare', 'CAT-2' },
@@ -63,7 +55,7 @@ TZ = {
 	{ 'Africa/Tripoli', 'EET-2' },
 	{ 'Africa/Tunis', 'CET-1' },
 	{ 'Africa/Windhoek', 'WAT-1WAST,M9.1.0,M4.1.0' },
-	{ 'America/Adak', 'HAST10HADT,M3.2.0,M11.1.0' },
+	{ 'America/Adak', 'HST10HDT,M3.2.0,M11.1.0' },
 	{ 'America/Anchorage', 'AKST9AKDT,M3.2.0,M11.1.0' },
 	{ 'America/Anguilla', 'AST4' },
 	{ 'America/Antigua', 'AST4' },
@@ -77,12 +69,13 @@ TZ = {
 	{ 'America/Argentina/Rio Gallegos', 'ART3' },
 	{ 'America/Argentina/Salta', 'ART3' },
 	{ 'America/Argentina/San Juan', 'ART3' },
+	{ 'America/Argentina/San Luis', 'ART3' },
 	{ 'America/Argentina/Tucuman', 'ART3' },
 	{ 'America/Argentina/Ushuaia', 'ART3' },
 	{ 'America/Aruba', 'AST4' },
-	{ 'America/Asuncion', 'PYT4PYST,M10.1.0/0,M4.2.0/0' },
+	{ 'America/Asuncion', 'PYT4PYST,M10.1.0/0,M3.4.0/0' },
 	{ 'America/Atikokan', 'EST5' },
-	{ 'America/Bahia', 'BRT3BRST,M10.3.0/0,M2.3.0/0' },
+	{ 'America/Bahia', 'BRT3' },
 	{ 'America/Bahia Banderas', 'CST6CDT,M4.1.0,M10.5.0' },
 	{ 'America/Barbados', 'AST4' },
 	{ 'America/Belem', 'BRT3' },
@@ -93,13 +86,14 @@ TZ = {
 	{ 'America/Boise', 'MST7MDT,M3.2.0,M11.1.0' },
 	{ 'America/Cambridge Bay', 'MST7MDT,M3.2.0,M11.1.0' },
 	{ 'America/Campo Grande', 'AMT4AMST,M10.3.0/0,M2.3.0/0' },
-	{ 'America/Cancun', 'CST6CDT,M4.1.0,M10.5.0' },
+	{ 'America/Cancun', 'EST5' },
 	{ 'America/Caracas', 'VET4:30' },
 	{ 'America/Cayenne', 'GFT3' },
 	{ 'America/Cayman', 'EST5' },
 	{ 'America/Chicago', 'CST6CDT,M3.2.0,M11.1.0' },
 	{ 'America/Chihuahua', 'MST7MDT,M4.1.0,M10.5.0' },
 	{ 'America/Costa Rica', 'CST6' },
+	{ 'America/Creston', 'MST7' },
 	{ 'America/Cuiaba', 'AMT4AMST,M10.3.0/0,M2.3.0/0' },
 	{ 'America/Curacao', 'AST4' },
 	{ 'America/Danmarkshavn', 'GMT0' },
@@ -109,19 +103,21 @@ TZ = {
 	{ 'America/Detroit', 'EST5EDT,M3.2.0,M11.1.0' },
 	{ 'America/Dominica', 'AST4' },
 	{ 'America/Edmonton', 'MST7MDT,M3.2.0,M11.1.0' },
-	{ 'America/Eirunepe', 'AMT4' },
+	{ 'America/Eirunepe', 'ACT5' },
 	{ 'America/El Salvador', 'CST6' },
+	{ 'America/Fort Nelson', 'MST7' },
 	{ 'America/Fortaleza', 'BRT3' },
 	{ 'America/Glace Bay', 'AST4ADT,M3.2.0,M11.1.0' },
+	{ 'America/Godthab', 'WGT3WGST,M3.5.0/-2,M10.5.0/-1' },
 	{ 'America/Goose Bay', 'AST4ADT,M3.2.0,M11.1.0' },
-	{ 'America/Grand Turk', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Grand Turk', 'AST4' },
 	{ 'America/Grenada', 'AST4' },
 	{ 'America/Guadeloupe', 'AST4' },
 	{ 'America/Guatemala', 'CST6' },
 	{ 'America/Guayaquil', 'ECT5' },
 	{ 'America/Guyana', 'GYT4' },
 	{ 'America/Halifax', 'AST4ADT,M3.2.0,M11.1.0' },
-	{ 'America/Havana', 'CST5CDT,M3.2.0/0,M10.5.0/1' },
+	{ 'America/Havana', 'CST5CDT,M3.2.0/0,M11.1.0/1' },
 	{ 'America/Hermosillo', 'MST7' },
 	{ 'America/Indiana/Indianapolis', 'EST5EDT,M3.2.0,M11.1.0' },
 	{ 'America/Indiana/Knox', 'CST6CDT,M3.2.0,M11.1.0' },
@@ -151,13 +147,12 @@ TZ = {
 	{ 'America/Mazatlan', 'MST7MDT,M4.1.0,M10.5.0' },
 	{ 'America/Menominee', 'CST6CDT,M3.2.0,M11.1.0' },
 	{ 'America/Merida', 'CST6CDT,M4.1.0,M10.5.0' },
-	{ 'America/Metlakatla', 'MeST8' },
+	{ 'America/Metlakatla', 'AKST9AKDT,M3.2.0,M11.1.0' },
 	{ 'America/Mexico City', 'CST6CDT,M4.1.0,M10.5.0' },
 	{ 'America/Miquelon', 'PMST3PMDT,M3.2.0,M11.1.0' },
 	{ 'America/Moncton', 'AST4ADT,M3.2.0,M11.1.0' },
 	{ 'America/Monterrey', 'CST6CDT,M4.1.0,M10.5.0' },
-	{ 'America/Montevideo', 'UYT3UYST,M10.1.0,M3.2.0' },
-	{ 'America/Montreal', 'EST5EDT,M3.2.0,M11.1.0' },
+	{ 'America/Montevideo', 'UYT3' },
 	{ 'America/Montserrat', 'AST4' },
 	{ 'America/Nassau', 'EST5EDT,M3.2.0,M11.1.0' },
 	{ 'America/New York', 'EST5EDT,M3.2.0,M11.1.0' },
@@ -173,7 +168,7 @@ TZ = {
 	{ 'America/Paramaribo', 'SRT3' },
 	{ 'America/Phoenix', 'MST7' },
 	{ 'America/Port of Spain', 'AST4' },
-	{ 'America/Port-au-Prince', 'EST5' },
+	{ 'America/Port-au-Prince', 'EST5EDT,M3.2.0,M11.1.0' },
 	{ 'America/Porto Velho', 'AMT4' },
 	{ 'America/Puerto Rico', 'AST4' },
 	{ 'America/Rainy River', 'CST6CDT,M3.2.0,M11.1.0' },
@@ -181,13 +176,12 @@ TZ = {
 	{ 'America/Recife', 'BRT3' },
 	{ 'America/Regina', 'CST6' },
 	{ 'America/Resolute', 'CST6CDT,M3.2.0,M11.1.0' },
-	{ 'America/Rio Branco', 'AMT4' },
-	{ 'America/Santa Isabel', 'PST8PDT,M4.1.0,M10.5.0' },
+	{ 'America/Rio Branco', 'ACT5' },
 	{ 'America/Santarem', 'BRT3' },
+	{ 'America/Santiago', 'CLT3' },
 	{ 'America/Santo Domingo', 'AST4' },
 	{ 'America/Sao Paulo', 'BRT3BRST,M10.3.0/0,M2.3.0/0' },
 	{ 'America/Scoresbysund', 'EGT1EGST,M3.5.0/0,M10.5.0/1' },
-	{ 'America/Shiprock', 'MST7MDT,M3.2.0,M11.1.0' },
 	{ 'America/Sitka', 'AKST9AKDT,M3.2.0,M11.1.0' },
 	{ 'America/St Barthelemy', 'AST4' },
 	{ 'America/St Johns', 'NST3:30NDT,M3.2.0,M11.1.0' },
@@ -207,19 +201,21 @@ TZ = {
 	{ 'America/Winnipeg', 'CST6CDT,M3.2.0,M11.1.0' },
 	{ 'America/Yakutat', 'AKST9AKDT,M3.2.0,M11.1.0' },
 	{ 'America/Yellowknife', 'MST7MDT,M3.2.0,M11.1.0' },
-	{ 'Antarctica/Casey', 'WST-8' },
+	{ 'Antarctica/Casey', 'AWST-8' },
 	{ 'Antarctica/Davis', 'DAVT-7' },
 	{ 'Antarctica/DumontDUrville', 'DDUT-10' },
 	{ 'Antarctica/Macquarie', 'MIST-11' },
 	{ 'Antarctica/Mawson', 'MAWT-5' },
 	{ 'Antarctica/McMurdo', 'NZST-12NZDT,M9.5.0,M4.1.0/3' },
+	{ 'Antarctica/Palmer', 'CLT3' },
 	{ 'Antarctica/Rothera', 'ROTT3' },
-	{ 'Antarctica/South Pole', 'NZST-12NZDT,M9.5.0,M4.1.0/3' },
 	{ 'Antarctica/Syowa', 'SYOT-3' },
+	{ 'Antarctica/Troll', 'UTC0CEST-2,M3.5.0/1,M10.5.0/3' },
 	{ 'Antarctica/Vostok', 'VOST-6' },
 	{ 'Arctic/Longyearbyen', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Asia/Aden', 'AST-3' },
 	{ 'Asia/Almaty', 'ALMT-6' },
+	{ 'Asia/Amman', 'EET-2EEST,M3.5.4/24,M10.5.5/1' },
 	{ 'Asia/Anadyr', 'ANAT-12' },
 	{ 'Asia/Aqtau', 'AQTT-5' },
 	{ 'Asia/Aqtobe', 'AQTT-5' },
@@ -231,67 +227,70 @@ TZ = {
 	{ 'Asia/Beirut', 'EET-2EEST,M3.5.0/0,M10.5.0/0' },
 	{ 'Asia/Bishkek', 'KGT-6' },
 	{ 'Asia/Brunei', 'BNT-8' },
-	{ 'Asia/Choibalsan', 'CHOT-8' },
-	{ 'Asia/Chongqing', 'CST-8' },
+	{ 'Asia/Chita', 'YAKT-9' },
+	{ 'Asia/Choibalsan', 'CHOT-8CHOST,M3.5.6,M9.5.6/0' },
 	{ 'Asia/Colombo', 'IST-5:30' },
-	{ 'Asia/Damascus', 'EET-2EEST,M4.1.5/0,M10.5.5/0' },
+	{ 'Asia/Damascus', 'EET-2EEST,M3.5.5/0,M10.5.5/0' },
 	{ 'Asia/Dhaka', 'BDT-6' },
 	{ 'Asia/Dili', 'TLT-9' },
 	{ 'Asia/Dubai', 'GST-4' },
 	{ 'Asia/Dushanbe', 'TJT-5' },
-	{ 'Asia/Gaza', 'EET-2' },
-	{ 'Asia/Harbin', 'CST-8' },
-	{ 'Asia/Hebron', 'EET-2' },
+	{ 'Asia/Gaza', 'EET-2EEST,M3.5.5/24,M10.3.6/144' },
+	{ 'Asia/Hebron', 'EET-2EEST,M3.5.5/24,M10.3.6/144' },
 	{ 'Asia/Ho Chi Minh', 'ICT-7' },
 	{ 'Asia/Hong Kong', 'HKT-8' },
-	{ 'Asia/Hovd', 'HOVT-7' },
-	{ 'Asia/Irkutsk', 'IRKT-9' },
-	{ 'Asia/Jakarta', 'WIT-7' },
-	{ 'Asia/Jayapura', 'EIT-9' },
+	{ 'Asia/Hovd', 'HOVT-7HOVST,M3.5.6,M9.5.6/0' },
+	{ 'Asia/Irkutsk', 'IRKT-8' },
+	{ 'Asia/Jakarta', 'WIB-7' },
+	{ 'Asia/Jayapura', 'WIT-9' },
+	{ 'Asia/Jerusalem', 'IST-2IDT,M3.4.4/26,M10.5.0' },
 	{ 'Asia/Kabul', 'AFT-4:30' },
 	{ 'Asia/Kamchatka', 'PETT-12' },
 	{ 'Asia/Karachi', 'PKT-5' },
-	{ 'Asia/Kashgar', 'CST-8' },
 	{ 'Asia/Kathmandu', 'NPT-5:45' },
+	{ 'Asia/Khandyga', 'YAKT-9' },
 	{ 'Asia/Kolkata', 'IST-5:30' },
-	{ 'Asia/Krasnoyarsk', 'KRAT-8' },
+	{ 'Asia/Krasnoyarsk', 'KRAT-7' },
 	{ 'Asia/Kuala Lumpur', 'MYT-8' },
 	{ 'Asia/Kuching', 'MYT-8' },
 	{ 'Asia/Kuwait', 'AST-3' },
 	{ 'Asia/Macau', 'CST-8' },
-	{ 'Asia/Magadan', 'MAGT-12' },
-	{ 'Asia/Makassar', 'CIT-8' },
+	{ 'Asia/Magadan', 'MAGT-10' },
+	{ 'Asia/Makassar', 'WITA-8' },
 	{ 'Asia/Manila', 'PHT-8' },
 	{ 'Asia/Muscat', 'GST-4' },
 	{ 'Asia/Nicosia', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
-	{ 'Asia/Novokuznetsk', 'NOVT-7' },
-	{ 'Asia/Novosibirsk', 'NOVT-7' },
-	{ 'Asia/Omsk', 'OMST-7' },
+	{ 'Asia/Novokuznetsk', 'KRAT-7' },
+	{ 'Asia/Novosibirsk', 'NOVT-6' },
+	{ 'Asia/Omsk', 'OMST-6' },
 	{ 'Asia/Oral', 'ORAT-5' },
 	{ 'Asia/Phnom Penh', 'ICT-7' },
-	{ 'Asia/Pontianak', 'WIT-7' },
-	{ 'Asia/Pyongyang', 'KST-9' },
+	{ 'Asia/Pontianak', 'WIB-7' },
+	{ 'Asia/Pyongyang', 'KST-8:30' },
 	{ 'Asia/Qatar', 'AST-3' },
 	{ 'Asia/Qyzylorda', 'QYZT-6' },
 	{ 'Asia/Rangoon', 'MMT-6:30' },
 	{ 'Asia/Riyadh', 'AST-3' },
-	{ 'Asia/Sakhalin', 'SAKT-11' },
+	{ 'Asia/Sakhalin', 'SAKT-10' },
 	{ 'Asia/Samarkand', 'UZT-5' },
 	{ 'Asia/Seoul', 'KST-9' },
 	{ 'Asia/Shanghai', 'CST-8' },
 	{ 'Asia/Singapore', 'SGT-8' },
+	{ 'Asia/Srednekolymsk', 'SRET-11' },
 	{ 'Asia/Taipei', 'CST-8' },
 	{ 'Asia/Tashkent', 'UZT-5' },
 	{ 'Asia/Tbilisi', 'GET-4' },
+	{ 'Asia/Tehran', 'IRST-3:30IRDT,J80/0,J264/0' },
 	{ 'Asia/Thimphu', 'BTT-6' },
 	{ 'Asia/Tokyo', 'JST-9' },
-	{ 'Asia/Ulaanbaatar', 'ULAT-8' },
-	{ 'Asia/Urumqi', 'CST-8' },
+	{ 'Asia/Ulaanbaatar', 'ULAT-8ULAST,M3.5.6,M9.5.6/0' },
+	{ 'Asia/Urumqi', 'XJT-6' },
+	{ 'Asia/Ust-Nera', 'VLAT-10' },
 	{ 'Asia/Vientiane', 'ICT-7' },
-	{ 'Asia/Vladivostok', 'VLAT-11' },
-	{ 'Asia/Yakutsk', 'YAKT-10' },
-	{ 'Asia/Yekaterinburg', 'YEKT-6' },
-	{ 'Asia/Yerevan', 'AMT-4AMST,M3.5.0,M10.5.0/3' },
+	{ 'Asia/Vladivostok', 'VLAT-10' },
+	{ 'Asia/Yakutsk', 'YAKT-9' },
+	{ 'Asia/Yekaterinburg', 'YEKT-5' },
+	{ 'Asia/Yerevan', 'AMT-4' },
 	{ 'Atlantic/Azores', 'AZOT1AZOST,M3.5.0/0,M10.5.0/1' },
 	{ 'Atlantic/Bermuda', 'AST4ADT,M3.2.0,M11.1.0' },
 	{ 'Atlantic/Canary', 'WET0WEST,M3.5.0/1,M10.5.0' },
@@ -301,19 +300,19 @@ TZ = {
 	{ 'Atlantic/Reykjavik', 'GMT0' },
 	{ 'Atlantic/South Georgia', 'GST2' },
 	{ 'Atlantic/St Helena', 'GMT0' },
-	{ 'Atlantic/Stanley', 'FKT4FKST,M9.1.0,M4.3.0' },
-	{ 'Australia/Adelaide', 'CST-9:30CST,M10.1.0,M4.1.0/3' },
-	{ 'Australia/Brisbane', 'EST-10' },
-	{ 'Australia/Broken Hill', 'CST-9:30CST,M10.1.0,M4.1.0/3' },
-	{ 'Australia/Currie', 'EST-10EST,M10.1.0,M4.1.0/3' },
-	{ 'Australia/Darwin', 'CST-9:30' },
-	{ 'Australia/Eucla', 'CWST-8:45' },
-	{ 'Australia/Hobart', 'EST-10EST,M10.1.0,M4.1.0/3' },
-	{ 'Australia/Lindeman', 'EST-10' },
-	{ 'Australia/Lord Howe', 'LHST-10:30LHST-11,M10.1.0,M4.1.0' },
-	{ 'Australia/Melbourne', 'EST-10EST,M10.1.0,M4.1.0/3' },
-	{ 'Australia/Perth', 'WST-8' },
-	{ 'Australia/Sydney', 'EST-10EST,M10.1.0,M4.1.0/3' },
+	{ 'Atlantic/Stanley', 'FKST3' },
+	{ 'Australia/Adelaide', 'ACST-9:30ACDT,M10.1.0,M4.1.0/3' },
+	{ 'Australia/Brisbane', 'AEST-10' },
+	{ 'Australia/Broken Hill', 'ACST-9:30ACDT,M10.1.0,M4.1.0/3' },
+	{ 'Australia/Currie', 'AEST-10AEDT,M10.1.0,M4.1.0/3' },
+	{ 'Australia/Darwin', 'ACST-9:30' },
+	{ 'Australia/Eucla', 'ACWST-8:45' },
+	{ 'Australia/Hobart', 'AEST-10AEDT,M10.1.0,M4.1.0/3' },
+	{ 'Australia/Lindeman', 'AEST-10' },
+	{ 'Australia/Lord Howe', 'LHST-10:30LHDT-11,M10.1.0,M4.1.0' },
+	{ 'Australia/Melbourne', 'AEST-10AEDT,M10.1.0,M4.1.0/3' },
+	{ 'Australia/Perth', 'AWST-8' },
+	{ 'Australia/Sydney', 'AEST-10AEDT,M10.1.0,M4.1.0/3' },
 	{ 'Europe/Amsterdam', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Andorra', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Athens', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
@@ -323,7 +322,8 @@ TZ = {
 	{ 'Europe/Brussels', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Bucharest', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
 	{ 'Europe/Budapest', 'CET-1CEST,M3.5.0,M10.5.0/3' },
-	{ 'Europe/Chisinau', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Europe/Busingen', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Chisinau', 'EET-2EEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Copenhagen', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Dublin', 'GMT0IST,M3.5.0/1,M10.5.0' },
 	{ 'Europe/Gibraltar', 'CET-1CEST,M3.5.0,M10.5.0/3' },
@@ -332,7 +332,7 @@ TZ = {
 	{ 'Europe/Isle of Man', 'GMT0BST,M3.5.0/1,M10.5.0' },
 	{ 'Europe/Istanbul', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
 	{ 'Europe/Jersey', 'GMT0BST,M3.5.0/1,M10.5.0' },
-	{ 'Europe/Kaliningrad', 'FET-3' },
+	{ 'Europe/Kaliningrad', 'EET-2' },
 	{ 'Europe/Kiev', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
 	{ 'Europe/Lisbon', 'WET0WEST,M3.5.0/1,M10.5.0' },
 	{ 'Europe/Ljubljana', 'CET-1CEST,M3.5.0,M10.5.0/3' },
@@ -341,9 +341,9 @@ TZ = {
 	{ 'Europe/Madrid', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Malta', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Mariehamn', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
-	{ 'Europe/Minsk', 'FET-3' },
+	{ 'Europe/Minsk', 'MSK-3' },
 	{ 'Europe/Monaco', 'CET-1CEST,M3.5.0,M10.5.0/3' },
-	{ 'Europe/Moscow', 'MSK-4' },
+	{ 'Europe/Moscow', 'MSK-3' },
 	{ 'Europe/Oslo', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Paris', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Podgorica', 'CET-1CEST,M3.5.0,M10.5.0/3' },
@@ -353,7 +353,7 @@ TZ = {
 	{ 'Europe/Samara', 'SAMT-4' },
 	{ 'Europe/San Marino', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Sarajevo', 'CET-1CEST,M3.5.0,M10.5.0/3' },
-	{ 'Europe/Simferopol', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Europe/Simferopol', 'MSK-3' },
 	{ 'Europe/Skopje', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Sofia', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
 	{ 'Europe/Stockholm', 'CET-1CEST,M3.5.0,M10.5.0/3' },
@@ -364,7 +364,7 @@ TZ = {
 	{ 'Europe/Vatican', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Vienna', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Vilnius', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
-	{ 'Europe/Volgograd', 'VOLT-4' },
+	{ 'Europe/Volgograd', 'MSK-3' },
 	{ 'Europe/Warsaw', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Zagreb', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Zaporozhye', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
@@ -380,14 +380,16 @@ TZ = {
 	{ 'Indian/Mauritius', 'MUT-4' },
 	{ 'Indian/Mayotte', 'EAT-3' },
 	{ 'Indian/Reunion', 'RET-4' },
-	{ 'Pacific/Apia', 'WST-13' },
+	{ 'Pacific/Apia', 'WSST-13WSDT,M9.5.0/3,M4.1.0/4' },
 	{ 'Pacific/Auckland', 'NZST-12NZDT,M9.5.0,M4.1.0/3' },
+	{ 'Pacific/Bougainville', 'BST-11' },
 	{ 'Pacific/Chatham', 'CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45' },
 	{ 'Pacific/Chuuk', 'CHUT-10' },
+	{ 'Pacific/Easter', 'EAST5' },
 	{ 'Pacific/Efate', 'VUT-11' },
 	{ 'Pacific/Enderbury', 'PHOT-13' },
-	{ 'Pacific/Fakaofo', 'TKT10' },
-	{ 'Pacific/Fiji', 'FJT-12' },
+	{ 'Pacific/Fakaofo', 'TKT-13' },
+	{ 'Pacific/Fiji', 'FJT-12FJST,M11.1.0,M1.3.0/3' },
 	{ 'Pacific/Funafuti', 'TVT-12' },
 	{ 'Pacific/Galapagos', 'GALT6' },
 	{ 'Pacific/Gambier', 'GAMT9' },
@@ -403,7 +405,7 @@ TZ = {
 	{ 'Pacific/Midway', 'SST11' },
 	{ 'Pacific/Nauru', 'NRT-12' },
 	{ 'Pacific/Niue', 'NUT11' },
-	{ 'Pacific/Norfolk', 'NFT-11:30' },
+	{ 'Pacific/Norfolk', 'NFT-11' },
 	{ 'Pacific/Noumea', 'NCT-11' },
 	{ 'Pacific/Pago Pago', 'SST11' },
 	{ 'Pacific/Palau', 'PWT-9' },

modules/base/luasrc/sys/zoneinfo/tzoffset.lua

@@ -1,13 +1,4 @@
---[[
-LuCI - Autogenerated Zoneinfo Module
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-]]--
+-- Licensed to the public under the Apache License 2.0.
 
 module "luci.sys.zoneinfo.tzoffset"
 
@@ -17,11 +8,11 @@ OFFSET = {
 	cet   =   3600,	-- CET
 	wat   =   3600,	-- WAT
 	cat   =   7200,	-- CAT
+	eet   =   7200,	-- EET
 	wet   =      0,	-- WET
 	sast  =   7200,	-- SAST
-	eet   =   7200,	-- EET
-	hast  = -36000,	-- HAST
-	hadt  = -32400,	-- HADT
+	hst   = -36000,	-- HST
+	hdt   = -32400,	-- HDT
 	akst  = -32400,	-- AKST
 	akdt  = -28800,	-- AKDT
 	ast   = -14400,	-- AST
@@ -40,6 +31,9 @@ OFFSET = {
 	gft   = -10800,	-- GFT
 	pst   = -28800,	-- PST
 	pdt   = -25200,	-- PDT
+	act   = -18000,	-- ACT
+	wgt   = -10800,	-- WGT
+	wgst  =  -7200,	-- WGST
 	ect   = -18000,	-- ECT
 	gyt   = -14400,	-- GYT
 	bot   = -14400,	-- BOT
@@ -47,14 +41,14 @@ OFFSET = {
 	pmst  = -10800,	-- PMST
 	pmdt  =  -7200,	-- PMDT
 	uyt   = -10800,	-- UYT
-	uyst  =  -7200,	-- UYST
 	fnt   =  -7200,	-- FNT
 	srt   = -10800,	-- SRT
+	clt   = -10800,	-- CLT
 	egt   =  -3600,	-- EGT
 	egst  =      0,	-- EGST
 	nst   = -12600,	-- NST
 	ndt   =  -9000,	-- NDT
-	wst   =  28800,	-- WST
+	awst  =  28800,	-- AWST
 	davt  =  25200,	-- DAVT
 	ddut  =  36000,	-- DDUT
 	mist  =  39600,	-- MIST
@@ -63,6 +57,7 @@ OFFSET = {
 	nzdt  =  46800,	-- NZDT
 	rott  = -10800,	-- ROTT
 	syot  =  10800,	-- SYOT
+	utc   =      0,	-- UTC
 	vost  =  21600,	-- VOST
 	almt  =  21600,	-- ALMT
 	anat  =  43200,	-- ANAT
@@ -73,7 +68,9 @@ OFFSET = {
 	ict   =  25200,	-- ICT
 	kgt   =  21600,	-- KGT
 	bnt   =  28800,	-- BNT
+	yakt  =  32400,	-- YAKT
 	chot  =  28800,	-- CHOT
+	chost =  32400,	-- CHOST
 	ist   =  19800,	-- IST
 	bdt   =  21600,	-- BDT
 	tlt   =  32400,	-- TLT
@@ -81,46 +78,51 @@ OFFSET = {
 	tjt   =  18000,	-- TJT
 	hkt   =  28800,	-- HKT
 	hovt  =  25200,	-- HOVT
-	irkt  =  32400,	-- IRKT
-	wit   =  25200,	-- WIT
-	eit   =  32400,	-- EIT
+	hovst =  28800,	-- HOVST
+	irkt  =  28800,	-- IRKT
+	wib   =  25200,	-- WIB
+	wit   =  32400,	-- WIT
 	aft   =  16200,	-- AFT
 	pett  =  43200,	-- PETT
 	pkt   =  18000,	-- PKT
 	npt   =  20700,	-- NPT
-	krat  =  28800,	-- KRAT
+	krat  =  25200,	-- KRAT
 	myt   =  28800,	-- MYT
-	magt  =  43200,	-- MAGT
-	cit   =  28800,	-- CIT
+	magt  =  36000,	-- MAGT
+	wita  =  28800,	-- WITA
 	pht   =  28800,	-- PHT
-	novt  =  25200,	-- NOVT
-	omst  =  25200,	-- OMST
+	novt  =  21600,	-- NOVT
+	omst  =  21600,	-- OMST
 	orat  =  18000,	-- ORAT
-	kst   =  32400,	-- KST
+	kst   =  30600,	-- KST
 	qyzt  =  21600,	-- QYZT
 	mmt   =  23400,	-- MMT
-	sakt  =  39600,	-- SAKT
+	sakt  =  36000,	-- SAKT
 	uzt   =  18000,	-- UZT
 	sgt   =  28800,	-- SGT
+	sret  =  39600,	-- SRET
 	get   =  14400,	-- GET
+	irst  =  12600,	-- IRST
+	irdt  =  16200,	-- IRDT
 	btt   =  21600,	-- BTT
 	jst   =  32400,	-- JST
 	ulat  =  28800,	-- ULAT
-	vlat  =  39600,	-- VLAT
-	yakt  =  36000,	-- YAKT
-	yekt  =  21600,	-- YEKT
+	ulast =  32400,	-- ULAST
+	xjt   =  21600,	-- XJT
+	vlat  =  36000,	-- VLAT
+	yekt  =  18000,	-- YEKT
 	azot  =  -3600,	-- AZOT
 	azost =      0,	-- AZOST
 	cvt   =  -3600,	-- CVT
-	fkt   = -14400,	-- FKT
 	fkst  = -10800,	-- FKST
-	cwst  =  31500,	-- CWST
+	acst  =  34200,	-- ACST
+	acdt  =  37800,	-- ACDT
+	aest  =  36000,	-- AEST
+	acwst =  31500,	-- ACWST
 	lhst  =  37800,	-- LHST
-	lhst  =  39600,	-- LHST
-	fet   =  10800,	-- FET
-	msk   =  14400,	-- MSK
+	lhdt  =  39600,	-- LHDT
+	msk   =  10800,	-- MSK
 	samt  =  14400,	-- SAMT
-	volt  =  14400,	-- VOLT
 	iot   =  21600,	-- IOT
 	cxt   =  25200,	-- CXT
 	cct   =  23400,	-- CCT
@@ -129,18 +131,22 @@ OFFSET = {
 	mvt   =  18000,	-- MVT
 	mut   =  14400,	-- MUT
 	ret   =  14400,	-- RET
+	wsst  =  46800,	-- WSST
+	wsdt  =  50400,	-- WSDT
+	bst   =  39600,	-- BST
 	chast =  45900,	-- CHAST
 	chadt =  49500,	-- CHADT
 	chut  =  36000,	-- CHUT
+	east  = -18000,	-- EAST
 	vut   =  39600,	-- VUT
 	phot  =  46800,	-- PHOT
-	tkt   = -36000,	-- TKT
+	tkt   =  46800,	-- TKT
 	fjt   =  43200,	-- FJT
+	fjst  =  46800,	-- FJST
 	tvt   =  43200,	-- TVT
 	galt  = -21600,	-- GALT
 	gamt  = -32400,	-- GAMT
 	sbt   =  39600,	-- SBT
-	hst   = -36000,	-- HST
 	lint  =  50400,	-- LINT
 	kost  =  39600,	-- KOST
 	mht   =  43200,	-- MHT
@@ -148,7 +154,7 @@ OFFSET = {
 	sst   = -39600,	-- SST
 	nrt   =  43200,	-- NRT
 	nut   = -39600,	-- NUT
-	nft   =  41400,	-- NFT
+	nft   =  39600,	-- NFT
 	nct   =  39600,	-- NCT
 	pwt   =  32400,	-- PWT
 	pont  =  39600,	-- PONT

modules/base/root/etc/config/ucitrack

@@ -17,6 +17,10 @@ config olsr
 
 config dhcp
 	option init dnsmasq
+	list affects odhcpd
+
+config odhcpd
+	option init odhcpd
 
 config dropbear
 	option init dropbear

po/it/base.po

@@ -855,7 +855,7 @@ msgid ""
 "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr ""
 "Tempo di scadenza di indirizzi localizzati, il minimo è di 2 minuti (<code> "
-"2m </ code>)."
+"2m </code>)."
 
 msgid "External"
 msgstr ""
@@ -2761,10 +2761,10 @@ msgid ""
 "address to use and the <em>Hostname</em> is assigned as symbolic name to the "
 "requesting host."
 msgstr ""
-"Utilizzare il pulsante <em>Aggiungi</ em> per aggiungere una nuova voce di "
-"locazione. L'<em>Indirizzo-MAC</ em> identifica l'host, l'<em>Indirizzo-"
-"IPv4</ em> specifica l'indirizzo fisso da utilizzare e il <em> Nome Host</ "
-"em> è assegnato come nome simbolico alla richiesta dell'host."
+"Utilizzare il pulsante <em>Aggiungi</em> per aggiungere una nuova voce di "
+"locazione. L'<em>Indirizzo-MAC</em> identifica l'host, l'<em>Indirizzo-"
+"IPv4</em> specifica l'indirizzo fisso da utilizzare e il <em> Nome Host</em>"
+" è assegnato come nome simbolico alla richiesta dell'host."
 
 msgid "Used"
 msgstr "Usato"

po/it/freifunk.po

@@ -314,7 +314,7 @@ msgid ""
 msgstr ""
 "Il servizio OLSRd non è configurato per acquisire i dati di posizione della "
 "rete. <br/> Assicurarsi che il plugin nameservice sia configurato "
-"correttamente e che l'opzione <em>latlon_file</ em> è abilitata."
+"correttamente e che l'opzione <em>latlon_file</em> è abilitata."
 
 msgid "The installed firmware is the most recent version."
 msgstr "Il firmware installato è la versione più recente."

po/pl/base.po

@@ -2632,7 +2632,7 @@ msgstr ""
 "To jest lokalny adres końcowy przypisany przez tunnel broker'a, zwykle "
 "kończący się z <code>:2</code>"
 
-# w tłumaczeniu pojawiła się spacja po DHCP</ abbr> co powoduje niepoprawne wyświetlanie się strony z lang PL
+# w tłumaczeniu pojawiła się spacja po DHCP</abbr> co powoduje niepoprawne wyświetlanie się strony z lang PL
 msgid ""
 "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
 "abbr> in the local network"

po/pl/statistics.po

@@ -567,7 +567,7 @@ msgstr ""
 "wykorzystywane do tworzenia diagramów. <br /> <br /> <strong> Ostrzeżenie:. "
 "Ustawianie błędnej wartości może spowodować bardzo wysokie zużycie pamięci w "
 "katalogu tymczasowym. Może to sprawić, że urządzenie nie będzie nadawało "
-"się do użytku! </ Strong>"
+"się do użytku! </strong>"
 
 msgid ""
 "The statistics package is based on <a href=\"http://collectd.org/index.shtml"

po/tr/base.po

@@ -42,7 +42,7 @@ msgid "5 Minute Load:"
 msgstr "5 Dakikalık Yük:"
 
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
-msgstr "<abbr title=\\\"Temel Servis Ayar Tanımlayıcısı\\\"> BSSID </ abbr>"
+msgstr "<abbr title=\\\"Temel Servis Ayar Tanımlayıcısı\\\"> BSSID </abbr>"
 
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "<abbr title=\"Alan Adı Sistemi\">DNS</abbr> port sorgula"

po/zh_CN/freifunk.po

@@ -297,7 +297,7 @@ msgstr "TX"
 msgid ""
 "The <em>libiwinfo</em> package is not installed. You must install this "
 "component for working wireless configuration!"
-msgstr "<em> libiwinfo </ em>包没有安装。进行无线配置您必须安装此组件！"
+msgstr "<em> libiwinfo </em>包没有安装。进行无线配置您必须安装此组件！"
 
 msgid ""
 "The OLSRd service is not configured to capture position data from the "
@@ -305,7 +305,7 @@ msgid ""
 "configured and that the <em>latlon_file</em> option is enabled."
 msgstr ""
 "没有配置OLSRd从网络获取位置数据。<br />请确保正确配置域名服务插件，且<em> "
-"latlon_file </ em>选项被启用。"
+"latlon_file </em>选项被启用。"
 
 msgid "The installed firmware is the most recent version."
 msgstr "所安装固件为最新版本。"

po/zh_TW/firewall.po

@@ -373,13 +373,13 @@ msgstr ""
 "</em>指定特定區域成員可以是被運用的網路."
 
 msgid "To %s at %s on <var>this device</var>"
-msgstr "到％s在上的<var>此設備</ var>的％s的"
+msgstr "到％s在上的<var>此設備</var>的％s的"
 
 msgid "To %s in %s"
 msgstr "到％s在％s"
 
 msgid "To %s on <var>this device</var>"
-msgstr "到％s上的<var>此設備</ var>的"
+msgstr "到％s上的<var>此設備</var>的"
 
 msgid "To %s, %s in %s"
 msgstr "到％s，％s的％s中"

po/zh_TW/uvc_streamer.po

@@ -39,4 +39,4 @@ msgid ""
 "Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
 "href=\"http://%s:%i/\">http://%s:%i/</a>"
 msgstr ""
-"設定你的Linux-UVC相容的網路攝影機.將瀏覽器指向例如<a href=\"http://%s:%i/\">http://％S：％I /</ A> "
+"設定你的Linux-UVC相容的網路攝影機.將瀏覽器指向例如<a href=\"http://%s:%i/\">http://％S：％I /</a> "

protocols/hso/Makefile

@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk

protocols/hso/luasrc/model/cbi/admin_network/proto_hso.lua

@@ -0,0 +1,158 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2015 Stanislas Bertrand <stanislasbertrand@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local map, section, net = ...
+
+local hsoname,hsotype,hsointerface
+local device, apn, service, pincode, username, password
+local ipv6, maxwait, defaultroute, metric, peerdns, dns,
+      keepalive_failure, keepalive_interval, demand
+
+
+device = section:taboption("general", Value, "device", translate("Control interface"))
+device.rmempty = false
+
+local device_suggestions = nixio.fs.glob("/dev/ttyHS*")
+	or nixio.fs.glob("/dev/tts/*")
+
+if device_suggestions then
+	local node
+	for node in device_suggestions do
+		hsoname = string.gsub(node,"/dev/","")
+		hsotype = nixio.fs.readfile("/sys/class/tty/" .. hsoname .. "/hsotype")
+		device:value(node, hsotype .. " (" .. node ..")" )
+		if string.find(hsotype,"Application") ~= nil then
+			device.default = node
+        end
+	end
+end
+
+
+service = section:taboption("general", Value, "service", translate("Service Type"))
+service.default = "umts"
+service:value("umts", "UMTS/GPRS")
+service:value("umts_only", translate("UMTS only"))
+service:value("gprs_only", translate("GPRS only"))
+
+
+apn = section:taboption("general", Value, "apn", translate("APN"))
+
+
+pincode = section:taboption("general", Value, "pincode", translate("PIN"))
+
+
+username = section:taboption("general", Value, "username", translate("PAP/CHAP username"))
+
+
+password = section:taboption("general", Value, "password", translate("PAP/CHAP password"))
+password.password = true
+
+
+if luci.model.network:has_ipv6() then
+
+	ipv6 = section:taboption("advanced", Flag, "ipv6",
+		translate("Enable IPv6 negotiation on the PPP link"))
+
+	ipv6.default = ipv6.disabled
+
+end
+
+
+maxwait = section:taboption("advanced", Value, "maxwait",
+	translate("Modem init timeout"),
+	translate("Maximum amount of seconds to wait for the modem to become ready"))
+
+maxwait.placeholder = "20"
+maxwait.datatype    = "min(1)"
+
+
+defaultroute = section:taboption("advanced", Flag, "defaultroute",
+	translate("Use default gateway"),
+	translate("If unchecked, no default route is configured"))
+
+defaultroute.default = defaultroute.enabled
+
+
+metric = section:taboption("advanced", Value, "metric",
+	translate("Use gateway metric"))
+
+metric.placeholder = "0"
+metric.datatype    = "uinteger"
+metric:depends("defaultroute", defaultroute.enabled)
+
+
+peerdns = section:taboption("advanced", Flag, "peerdns",
+	translate("Use DNS servers advertised by peer"),
+	translate("If unchecked, the advertised DNS server addresses are ignored"))
+
+peerdns.default = peerdns.enabled
+
+
+dns = section:taboption("advanced", DynamicList, "dns",
+	translate("Use custom DNS servers"))
+
+dns:depends("peerdns", "")
+dns.datatype = "ipaddr"
+dns.cast     = "string"
+
+
+keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
+	translate("LCP echo failure threshold"),
+	translate("Presume peer to be dead after given amount of LCP echo failures, use 0 to ignore failures"))
+
+function keepalive_failure.cfgvalue(self, section)
+	local v = m:get(section, "keepalive")
+	if v and #v > 0 then
+		return tonumber(v:match("^(%d+)[ ,]+%d+") or v)
+	end
+end
+
+function keepalive_failure.write() end
+function keepalive_failure.remove() end
+
+keepalive_failure.placeholder = "0"
+keepalive_failure.datatype    = "uinteger"
+
+
+keepalive_interval = section:taboption("advanced", Value, "_keepalive_interval",
+	translate("LCP echo interval"),
+	translate("Send LCP echo requests at the given interval in seconds, only effective in conjunction with failure threshold"))
+
+function keepalive_interval.cfgvalue(self, section)
+	local v = m:get(section, "keepalive")
+	if v and #v > 0 then
+		return tonumber(v:match("^%d+[ ,]+(%d+)"))
+	end
+end
+
+function keepalive_interval.write(self, section, value)
+	local f = tonumber(keepalive_failure:formvalue(section)) or 0
+	local i = tonumber(value) or 5
+	if i < 1 then i = 1 end
+	if f > 0 then
+		m:set(section, "keepalive", "%d %d" %{ f, i })
+	else
+		m:del(section, "keepalive")
+	end
+end
+
+keepalive_interval.remove      = keepalive_interval.write
+keepalive_interval.placeholder = "5"
+keepalive_interval.datatype    = "min(1)"
+
+
+demand = section:taboption("advanced", Value, "demand",
+	translate("Inactivity timeout"),
+	translate("Close inactive connection after the given amount of seconds, use 0 to persist connection"))
+
+demand.placeholder = "0"
+demand.datatype    = "uinteger"

protocols/hso/luasrc/model/network/proto_hso.lua

@@ -0,0 +1,57 @@
+--[[
+LuCI - Network model - HSO protocol extension
+
+Copyright 2015 Stanislas Bertrand <stanislasbertrand@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local netmod = luci.model.network
+
+local proto = netmod:register_protocol("hso")
+
+function proto.ifname(self)
+		return "hso-" .. self.sid
+end
+
+function proto.get_i18n(self)
+	return luci.i18n.translate("HSO")
+end
+
+function proto.opkg_package(self)
+	return "comgt"
+end
+
+function proto.is_installed(self)
+	return nixio.fs.access("/lib/netifd/proto/hso.sh")
+end
+
+function proto.is_floating(self)
+	return false
+end
+
+function proto.is_virtual(self)
+	return false
+end
+
+function proto.get_interfaces(self)
+	return netmod.protocol.get_interfaces(self)
+end
+
+function proto.contains_interface(self, ifc)
+	return netmod.protocol.contains_interface(self, ifc)
+end
+
+netmod:register_pattern_virtual("^hso-%%w")
+