Merge branch 'ntpfix' into develop

This commit is contained in:
Trevor Paskett - K7FPV 2016-01-12 11:20:42 -07:00
commit 12dd25d3eb
2 changed files with 58 additions and 56 deletions

View File

@ -1,7 +1,7 @@
UTC UTC
Africa/Abidjan GMT0
Africa/Accra GMT0
Africa/Addis Ababa EAT-3
Africa/Addis_Ababa EAT-3
Africa/Algiers CET-1
Africa/Asmara EAT-3
Africa/Bamako GMT0
@ -15,10 +15,10 @@ Africa/Casablanca WET0
Africa/Ceuta CET-1CEST,M3.5.0,M10.5.0/3
Africa/Conakry GMT0
Africa/Dakar GMT0
Africa/Dar es Salaam EAT-3
Africa/Dar_es_Salaam EAT-3
Africa/Djibouti EAT-3
Africa/Douala WAT-1
Africa/El Aaiun WET0
Africa/El_Aaiun WET0
Africa/Freetown GMT0
Africa/Gaborone CAT-2
Africa/Harare CAT-2
@ -45,7 +45,7 @@ Africa/Niamey WAT-1
Africa/Nouakchott GMT0
Africa/Ouagadougou GMT0
Africa/Porto-Novo WAT-1
Africa/Sao Tome GMT0
Africa/Sao_Tome GMT0
Africa/Tripoli EET-2
Africa/Tunis CET-1
Africa/Windhoek WAT-1WAST,M9.1.0,M4.1.0
@ -54,15 +54,15 @@ America/Anchorage AKST9AKDT,M3.2.0,M11.1.0
America/Anguilla AST4
America/Antigua AST4
America/Araguaina BRT3
America/Argentina/Buenos Aires ART3
America/Argentina/Buenos_Aires ART3
America/Argentina/Catamarca ART3
America/Argentina/Cordoba ART3
America/Argentina/Jujuy ART3
America/Argentina/La Rioja ART3
America/Argentina/La_Rioja ART3
America/Argentina/Mendoza ART3
America/Argentina/Rio Gallegos ART3
America/Argentina/Rio_Gallegos ART3
America/Argentina/Salta ART3
America/Argentina/San Juan ART3
America/Argentina/San_Juan ART3
America/Argentina/Tucuman ART3
America/Argentina/Ushuaia ART3
America/Aruba AST4
@ -73,33 +73,33 @@ America/Barbados AST4
America/Belem BRT3
America/Belize CST6
America/Blanc-Sablon AST4
America/Boa Vista AMT4
America/Boa_Vista AMT4
America/Bogota COT5
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/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/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/Costa_Rica CST6
America/Cuiaba AMT4AMST,M10.3.0/0,M2.3.0/0
America/Curacao AST4
America/Danmarkshavn GMT0
America/Dawson PST8PDT,M3.2.0,M11.1.0
America/Dawson Creek MST7
America/Dawson_Creek MST7
America/Denver MST7MDT,M3.2.0,M11.1.0
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/El Salvador CST6
America/El_Salvador CST6
America/Fortaleza BRT3
America/Glace Bay AST4ADT,M3.2.0,M11.1.0
America/Goose Bay AST4ADT,M3.2.0/0:01,M11.1.0/0:01
America/Grand Turk EST5EDT,M3.2.0,M11.1.0
America/Glace_Bay AST4ADT,M3.2.0,M11.1.0
America/Goose_Bay AST4ADT,M3.2.0/0:01,M11.1.0/0:01
America/Grand_Turk EST5EDT,M3.2.0,M11.1.0
America/Grenada AST4
America/Guadeloupe AST4
America/Guatemala CST6
@ -112,7 +112,7 @@ America/Indiana/Indianapolis EST5EDT,M3.2.0,M11.1.0
America/Indiana/Knox CST6CDT,M3.2.0,M11.1.0
America/Indiana/Marengo EST5EDT,M3.2.0,M11.1.0
America/Indiana/Petersburg EST5EDT,M3.2.0,M11.1.0
America/Indiana/Tell City CST6CDT,M3.2.0,M11.1.0
America/Indiana/Tell_City CST6CDT,M3.2.0,M11.1.0
America/Indiana/Vevay EST5EDT,M3.2.0,M11.1.0
America/Indiana/Vincennes EST5EDT,M3.2.0,M11.1.0
America/Indiana/Winamac EST5EDT,M3.2.0,M11.1.0
@ -122,9 +122,9 @@ America/Jamaica EST5
America/Juneau AKST9AKDT,M3.2.0,M11.1.0
America/Kentucky/Louisville EST5EDT,M3.2.0,M11.1.0
America/Kentucky/Monticello EST5EDT,M3.2.0,M11.1.0
America/La Paz BOT4
America/La_Paz BOT4
America/Lima PET5
America/Los Angeles PST8PDT,M3.2.0,M11.1.0
America/Los_Angeles PST8PDT,M3.2.0,M11.1.0
America/Maceio BRT3
America/Managua CST6
America/Manaus AMT4
@ -134,7 +134,7 @@ America/Matamoros CST6CDT,M3.2.0,M11.1.0
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/Mexico City CST6CDT,M4.1.0,M10.5.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
@ -142,42 +142,42 @@ America/Montevideo UYT3UYST,M10.1.0,M3.2.0
America/Montreal EST5EDT,M3.2.0,M11.1.0
America/Montserrat AST4
America/Nassau EST5EDT,M3.2.0,M11.1.0
America/New York EST5EDT,M3.2.0,M11.1.0
America/New_York EST5EDT,M3.2.0,M11.1.0
America/Nipigon EST5EDT,M3.2.0,M11.1.0
America/Nome AKST9AKDT,M3.2.0,M11.1.0
America/Noronha FNT2
America/North Dakota/Center CST6CDT,M3.2.0,M11.1.0
America/North Dakota/New Salem CST6CDT,M3.2.0,M11.1.0
America/North_Dakota/Center CST6CDT,M3.2.0,M11.1.0
America/North_Dakota/New_Salem CST6CDT,M3.2.0,M11.1.0
America/Ojinaga MST7MDT,M3.2.0,M11.1.0
America/Panama EST5
America/Pangnirtung EST5EDT,M3.2.0,M11.1.0
America/Paramaribo SRT3
America/Phoenix MST7
America/Port of Spain AST4
America/Port_of_Spain AST4
America/Port-au-Prince EST5
America/Porto Velho AMT4
America/Puerto Rico AST4
America/Rainy River CST6CDT,M3.2.0,M11.1.0
America/Rankin Inlet CST6CDT,M3.2.0,M11.1.0
America/Porto_Velho AMT4
America/Puerto_Rico AST4
America/Rainy_River CST6CDT,M3.2.0,M11.1.0
America/Rankin_Inlet CST6CDT,M3.2.0,M11.1.0
America/Recife BRT3
America/Regina CST6
America/Rio Branco AMT4
America/Santa Isabel PST8PDT,M4.1.0,M10.5.0
America/Rio_Branco AMT4
America/Santa_Isabel PST8PDT,M4.1.0,M10.5.0
America/Santarem BRT3
America/Santo Domingo AST4
America/Sao Paulo BRT3BRST,M10.3.0/0,M2.3.0/0
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/St Barthelemy AST4
America/St Johns NST3:30NDT,M3.2.0/0:01,M11.1.0/0:01
America/St Kitts AST4
America/St Lucia AST4
America/St Thomas AST4
America/St Vincent AST4
America/Swift Current CST6
America/St_Barthelemy AST4
America/St_Johns NST3:30NDT,M3.2.0/0:01,M11.1.0/0:01
America/St_Kitts AST4
America/St_Lucia AST4
America/St_Thomas AST4
America/St_Vincent AST4
America/Swift_Current CST6
America/Tegucigalpa CST6
America/Thule AST4ADT,M3.2.0,M11.1.0
America/Thunder Bay EST5EDT,M3.2.0,M11.1.0
America/Thunder_Bay EST5EDT,M3.2.0,M11.1.0
America/Tijuana PST8PDT,M3.2.0,M11.1.0
America/Toronto EST5EDT,M3.2.0,M11.1.0
America/Tortola AST4
@ -193,7 +193,7 @@ Antarctica/Macquarie MIST-11
Antarctica/Mawson MAWT-5
Antarctica/McMurdo NZST-12NZDT,M9.5.0,M4.1.0/3
Antarctica/Rothera ROTT3
Antarctica/South Pole NZST-12NZDT,M9.5.0,M4.1.0/3
Antarctica/South_Pole NZST-12NZDT,M9.5.0,M4.1.0/3
Antarctica/Syowa SYOT-3
Antarctica/Vostok VOST-6
Arctic/Longyearbyen CET-1CEST,M3.5.0,M10.5.0/3
@ -220,8 +220,8 @@ Asia/Dubai GST-4
Asia/Dushanbe TJT-5
Asia/Gaza EET-2EEST,M3.5.6/0:01,M9.1.5
Asia/Harbin CST-8
Asia/Ho Chi Minh ICT-7
Asia/Hong Kong HKT-8
Asia/Ho_Chi_Minh ICT-7
Asia/Hong_Kong HKT-8
Asia/Hovd HOVT-7
Asia/Irkutsk IRKT-8IRKST,M3.5.0,M10.5.0/3
Asia/Jakarta WIT-7
@ -233,7 +233,7 @@ Asia/Kashgar CST-8
Asia/Kathmandu NPT-5:45
Asia/Kolkata IST-5:30
Asia/Krasnoyarsk KRAT-7KRAST,M3.5.0,M10.5.0/3
Asia/Kuala Lumpur MYT-8
Asia/Kuala_Lumpur MYT-8
Asia/Kuching MYT-8
Asia/Kuwait AST-3
Asia/Macau CST-8
@ -246,7 +246,7 @@ Asia/Novokuznetsk NOVT-6NOVST,M3.5.0,M10.5.0/3
Asia/Novosibirsk NOVT-6NOVST,M3.5.0,M10.5.0/3
Asia/Omsk OMST-6OMSST,M3.5.0,M10.5.0/3
Asia/Oral ORAT-5
Asia/Phnom Penh ICT-7
Asia/Phnom_Penh ICT-7
Asia/Pontianak WIT-7
Asia/Pyongyang KST-9
Asia/Qatar AST-3
@ -273,22 +273,22 @@ Asia/Yerevan AMT-4AMST,M3.5.0,M10.5.0/3
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
Atlantic/Cape Verde CVT1
Atlantic/Cape_Verde CVT1
Atlantic/Faroe WET0WEST,M3.5.0/1,M10.5.0
Atlantic/Madeira WET0WEST,M3.5.0/1,M10.5.0
Atlantic/Reykjavik GMT0
Atlantic/South Georgia GST2
Atlantic/St Helena 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/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/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
@ -307,7 +307,7 @@ Europe/Dublin GMT0IST,M3.5.0/1,M10.5.0
Europe/Gibraltar CET-1CEST,M3.5.0,M10.5.0/3
Europe/Guernsey GMT0BST,M3.5.0/1,M10.5.0
Europe/Helsinki EET-2EEST,M3.5.0/3,M10.5.0/4
Europe/Isle of Man GMT0BST,M3.5.0/1,M10.5.0
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 EET-2EEST,M3.5.0,M10.5.0/3
@ -329,7 +329,7 @@ Europe/Prague CET-1CEST,M3.5.0,M10.5.0/3
Europe/Riga EET-2EEST,M3.5.0/3,M10.5.0/4
Europe/Rome CET-1CEST,M3.5.0,M10.5.0/3
Europe/Samara SAMT-3SAMST,M3.5.0,M10.5.0/3
Europe/San Marino CET-1CEST,M3.5.0,M10.5.0/3
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/Skopje CET-1CEST,M3.5.0,M10.5.0/3
@ -382,11 +382,11 @@ Pacific/Nauru NRT-12
Pacific/Niue NUT11
Pacific/Norfolk NFT-11:30
Pacific/Noumea NCT-11
Pacific/Pago Pago SST11
Pacific/Pago_Pago SST11
Pacific/Palau PWT-9
Pacific/Pitcairn PST8
Pacific/Ponape PONT-11
Pacific/Port Moresby PGT-10
Pacific/Port_Moresby PGT-10
Pacific/Rarotonga CKT10
Pacific/Saipan ChST-10
Pacific/Tahiti TAHT10

View File

@ -1033,7 +1033,9 @@ print "<tr>
<td><select name=time_zone_name tabindex=10>\n";
foreach my $tz (@$tz_db_names) {
selopt($tz, $tz, $time_zone_name);
$name = $tz;
$name =~ s/\_/ /g;
selopt($name, $tz, $time_zone_name);
}
print "</select></td><td align=left>NTP Server</td><td><input type=text name=ntp_server size=20 value='$ntp_server'></td>";