From ce487aad09a617a66f5e92fa64deacbc3ff76e51 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sun, 27 Oct 2013 00:48:23 +0200 Subject: [PATCH] [ticket/11974] Fix timezone names with underscores PHPBB3-11974 --- phpBB/language/en/common.php | 118 +++++++++++++++++------------------ 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index bfaf986c4d..f26ca59764 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -922,7 +922,7 @@ $lang = array_merge($lang, array( 'Africa/Abidjan' => 'Africa/Abidjan', 'Africa/Accra' => 'Africa/Accra', - 'Africa/Addis_Ababa' => 'Africa/Addis_Ababa', + 'Africa/Addis_Ababa' => 'Africa/Addis Ababa', 'Africa/Algiers' => 'Africa/Algiers', 'Africa/Asmara' => 'Africa/Asmara', 'Africa/Bamako' => 'Africa/Bamako', @@ -937,10 +937,10 @@ $lang = array_merge($lang, array( 'Africa/Ceuta' => 'Africa/Ceuta', 'Africa/Conakry' => 'Africa/Conakry', 'Africa/Dakar' => 'Africa/Dakar', - 'Africa/Dar_es_Salaam' => 'Africa/Dar_es_Salaam', + 'Africa/Dar_es_Salaam' => 'Africa/Dar es Salaam', 'Africa/Djibouti' => 'Africa/Djibouti', 'Africa/Douala' => 'Africa/Douala', - 'Africa/El_Aaiun' => 'Africa/El_Aaiun', + 'Africa/El_Aaiun' => 'Africa/El Aaiun', 'Africa/Freetown' => 'Africa/Freetown', 'Africa/Gaborone' => 'Africa/Gaborone', 'Africa/Harare' => 'Africa/Harare', @@ -968,7 +968,7 @@ $lang = array_merge($lang, array( 'Africa/Nouakchott' => 'Africa/Nouakchott', 'Africa/Ouagadougou' => 'Africa/Ouagadougou', 'Africa/Porto-Novo' => 'Africa/Porto-Novo', - 'Africa/Sao_Tome' => 'Africa/Sao_Tome', + 'Africa/Sao_Tome' => 'Africa/Sao Tome', 'Africa/Tripoli' => 'Africa/Tripoli', 'Africa/Tunis' => 'Africa/Tunis', 'Africa/Windhoek' => 'Africa/Windhoek', @@ -979,16 +979,16 @@ $lang = array_merge($lang, array( 'America/Antigua' => 'America/Antigua', 'America/Araguaina' => 'America/Araguaina', - 'America/Argentina/Buenos_Aires' => 'America/Argentina/Buenos_Aires', + 'America/Argentina/Buenos_Aires' => 'America/Argentina/Buenos Aires', 'America/Argentina/Catamarca' => 'America/Argentina/Catamarca', 'America/Argentina/Cordoba' => 'America/Argentina/Cordoba', 'America/Argentina/Jujuy' => 'America/Argentina/Jujuy', - 'America/Argentina/La_Rioja' => 'America/Argentina/La_Rioja', + 'America/Argentina/La_Rioja' => 'America/Argentina/La Rioja', 'America/Argentina/Mendoza' => 'America/Argentina/Mendoza', - 'America/Argentina/Rio_Gallegos' => 'America/Argentina/Rio_Gallegos', + 'America/Argentina/Rio_Gallegos' => 'America/Argentina/Rio Gallegos', 'America/Argentina/Salta' => 'America/Argentina/Salta', - 'America/Argentina/San_Juan' => 'America/Argentina/San_Juan', - 'America/Argentina/San_Luis' => 'America/Argentina/San_Luis', + 'America/Argentina/San_Juan' => 'America/Argentina/San Juan', + 'America/Argentina/San_Luis' => 'America/Argentina/San Luis', 'America/Argentina/Tucuman' => 'America/Argentina/Tucuman', 'America/Argentina/Ushuaia' => 'America/Argentina/Ushuaia', @@ -996,40 +996,40 @@ $lang = array_merge($lang, array( 'America/Asuncion' => 'America/Asuncion', 'America/Atikokan' => 'America/Atikokan', 'America/Bahia' => 'America/Bahia', - 'America/Bahia_Banderas' => 'America/Bahia_Banderas', + 'America/Bahia_Banderas' => 'America/Bahia Banderas', 'America/Barbados' => 'America/Barbados', 'America/Belem' => 'America/Belem', 'America/Belize' => 'America/Belize', 'America/Blanc-Sablon' => 'America/Blanc-Sablon', - 'America/Boa_Vista' => 'America/Boa_Vista', + 'America/Boa_Vista' => 'America/Boa Vista', 'America/Bogota' => 'America/Bogota', 'America/Boise' => 'America/Boise', - 'America/Cambridge_Bay' => 'America/Cambridge_Bay', - 'America/Campo_Grande' => 'America/Campo_Grande', + 'America/Cambridge_Bay' => 'America/Cambridge Bay', + 'America/Campo_Grande' => 'America/Campo Grande', 'America/Cancun' => 'America/Cancun', 'America/Caracas' => 'America/Caracas', 'America/Cayenne' => 'America/Cayenne', 'America/Cayman' => 'America/Cayman', 'America/Chicago' => 'America/Chicago', 'America/Chihuahua' => 'America/Chihuahua', - 'America/Costa_Rica' => 'America/Costa_Rica', + 'America/Costa_Rica' => 'America/Costa Rica', 'America/Creston' => 'America/Creston', 'America/Cuiaba' => 'America/Cuiaba', 'America/Curacao' => 'America/Curacao', 'America/Danmarkshavn' => 'America/Danmarkshavn', 'America/Dawson' => 'America/Dawson', - 'America/Dawson_Creek' => 'America/Dawson_Creek', + 'America/Dawson_Creek' => 'America/Dawson Creek', 'America/Denver' => 'America/Denver', 'America/Detroit' => 'America/Detroit', 'America/Dominica' => 'America/Dominica', 'America/Edmonton' => 'America/Edmonton', 'America/Eirunepe' => 'America/Eirunepe', - 'America/El_Salvador' => 'America/El_Salvador', + 'America/El_Salvador' => 'America/El Salvador', 'America/Fortaleza' => 'America/Fortaleza', - 'America/Glace_Bay' => 'America/Glace_Bay', + 'America/Glace_Bay' => 'America/Glace Bay', 'America/Godthab' => 'America/Godthab', - 'America/Goose_Bay' => 'America/Goose_Bay', - 'America/Grand_Turk' => 'America/Grand_Turk', + 'America/Goose_Bay' => 'America/Goose Bay', + 'America/Grand_Turk' => 'America/Grand Turk', 'America/Grenada' => 'America/Grenada', 'America/Guadeloupe' => 'America/Guadeloupe', 'America/Guatemala' => 'America/Guatemala', @@ -1042,7 +1042,7 @@ $lang = array_merge($lang, array( 'America/Indiana/Knox' => 'America/Indiana/Knox', 'America/Indiana/Marengo' => 'America/Indiana/Marengo', 'America/Indiana/Petersburg' => 'America/Indiana/Petersburg', - 'America/Indiana/Tell_City' => 'America/Indiana/Tell_City', + 'America/Indiana/Tell_City' => 'America/Indiana/Tell City', 'America/Indiana/Vevay' => 'America/Indiana/Vevay', 'America/Indiana/Vincennes' => 'America/Indiana/Vincennes', 'America/Indiana/Winamac' => 'America/Indiana/Winamac', @@ -1053,10 +1053,10 @@ $lang = array_merge($lang, array( 'America/Kentucky/Louisville' => 'America/Kentucky/Louisville', 'America/Kentucky/Monticello' => 'America/Kentucky/Monticello', 'America/Kralendijk' => 'America/Kralendijk', - 'America/La_Paz' => 'America/La_Paz', + 'America/La_Paz' => 'America/La Paz', 'America/Lima' => 'America/Lima', - 'America/Los_Angeles' => 'America/Los_Angeles', - 'America/Lower_Princes' => 'America/Lower_Princes', + 'America/Los_Angeles' => 'America/Los Angeles', + 'America/Lower_Princes' => 'America/Lower Princes', 'America/Maceio' => 'America/Maceio', 'America/Managua' => 'America/Managua', 'America/Manaus' => 'America/Manaus', @@ -1067,7 +1067,7 @@ $lang = array_merge($lang, array( 'America/Menominee' => 'America/Menominee', 'America/Merida' => 'America/Merida', 'America/Metlakatla' => 'America/Metlakatla', - 'America/Mexico_City' => 'America/Mexico_City', + 'America/Mexico_City' => 'America/Mexico City', 'America/Miquelon' => 'America/Miquelon', 'America/Moncton' => 'America/Moncton', 'America/Monterrey' => 'America/Monterrey', @@ -1075,46 +1075,46 @@ $lang = array_merge($lang, array( 'America/Montreal' => 'America/Montreal', 'America/Montserrat' => 'America/Montserrat', 'America/Nassau' => 'America/Nassau', - 'America/New_York' => 'America/New_York', + 'America/New_York' => 'America/New York', 'America/Nipigon' => 'America/Nipigon', 'America/Nome' => 'America/Nome', 'America/Noronha' => 'America/Noronha', - 'America/North_Dakota/Beulah' => 'America/North_Dakota/Beulah', - 'America/North_Dakota/Center' => 'America/North_Dakota/Center', - 'America/North_Dakota/New_Salem' => 'America/North_Dakota/New_Salem', + 'America/North_Dakota/Beulah' => 'America/North Dakota/Beulah', + 'America/North_Dakota/Center' => 'America/North Dakota/Center', + 'America/North_Dakota/New_Salem' => 'America/North Dakota/New Salem', 'America/Ojinaga' => 'America/Ojinaga', 'America/Panama' => 'America/Panama', 'America/Pangnirtung' => 'America/Pangnirtung', 'America/Paramaribo' => 'America/Paramaribo', 'America/Phoenix' => 'America/Phoenix', 'America/Port-au-Prince' => 'America/Port-au-Prince', - 'America/Port_of_Spain' => 'America/Port_of_Spain', - 'America/Porto_Velho' => 'America/Porto_Velho', - 'America/Puerto_Rico' => 'America/Puerto_Rico', - 'America/Rainy_River' => 'America/Rainy_River', - 'America/Rankin_Inlet' => 'America/Rankin_Inlet', + 'America/Port_of_Spain' => 'America/Port of Spain', + 'America/Porto_Velho' => 'America/Porto Velho', + 'America/Puerto_Rico' => 'America/Puerto Rico', + 'America/Rainy_River' => 'America/Rainy River', + 'America/Rankin_Inlet' => 'America/Rankin Inlet', 'America/Recife' => 'America/Recife', 'America/Regina' => 'America/Regina', 'America/Resolute' => 'America/Resolute', - 'America/Rio_Branco' => 'America/Rio_Branco', - 'America/Santa_Isabel' => 'America/Santa_Isabel', + 'America/Rio_Branco' => 'America/Rio Branco', + 'America/Santa_Isabel' => 'America/Santa Isabel', 'America/Santarem' => 'America/Santarem', 'America/Santiago' => 'America/Santiago', - 'America/Santo_Domingo' => 'America/Santo_Domingo', - 'America/Sao_Paulo' => 'America/Sao_Paulo', + 'America/Santo_Domingo' => 'America/Santo Domingo', + 'America/Sao_Paulo' => 'America/Sao Paulo', 'America/Scoresbysund' => 'America/Scoresbysund', 'America/Shiprock' => 'America/Shiprock', 'America/Sitka' => 'America/Sitka', - 'America/St_Barthelemy' => 'America/St_Barthelemy', - 'America/St_Johns' => 'America/St_Johns', - 'America/St_Kitts' => 'America/St_Kitts', - 'America/St_Lucia' => 'America/St_Lucia', - 'America/St_Thomas' => 'America/St_Thomas', - 'America/St_Vincent' => 'America/St_Vincent', - 'America/Swift_Current' => 'America/Swift_Current', + 'America/St_Barthelemy' => 'America/St. Barthelemy', + 'America/St_Johns' => 'America/St. Johns', + 'America/St_Kitts' => 'America/St. Kitts', + 'America/St_Lucia' => 'America/St. Lucia', + 'America/St_Thomas' => 'America/St. Thomas', + 'America/St_Vincent' => 'America/St. Vincent', + 'America/Swift_Current' => 'America/Swift Current', 'America/Tegucigalpa' => 'America/Tegucigalpa', 'America/Thule' => 'America/Thule', - 'America/Thunder_Bay' => 'America/Thunder_Bay', + 'America/Thunder_Bay' => 'America/Thunder Bay', 'America/Tijuana' => 'America/Tijuana', 'America/Toronto' => 'America/Toronto', 'America/Tortola' => 'America/Tortola', @@ -1132,7 +1132,7 @@ $lang = array_merge($lang, array( 'Antarctica/McMurdo' => 'Antarctica/McMurdo', 'Antarctica/Palmer' => 'Antarctica/Palmer', 'Antarctica/Rothera' => 'Antarctica/Rothera', - 'Antarctica/South_Pole' => 'Antarctica/South_Pole', + 'Antarctica/South_Pole' => 'Antarctica/South Pole', 'Antarctica/Syowa' => 'Antarctica/Syowa', 'Antarctica/Vostok' => 'Antarctica/Vostok', @@ -1163,8 +1163,8 @@ $lang = array_merge($lang, array( 'Asia/Gaza' => 'Asia/Gaza', 'Asia/Harbin' => 'Asia/Harbin', 'Asia/Hebron' => 'Asia/Hebron', - 'Asia/Ho_Chi_Minh' => 'Asia/Ho_Chi_Minh', - 'Asia/Hong_Kong' => 'Asia/Hong_Kong', + 'Asia/Ho_Chi_Minh' => 'Asia/Ho Chi Minh', + 'Asia/Hong_Kong' => 'Asia/Hong Kong', 'Asia/Hovd' => 'Asia/Hovd', 'Asia/Irkutsk' => 'Asia/Irkutsk', 'Asia/Jakarta' => 'Asia/Jakarta', @@ -1178,7 +1178,7 @@ $lang = array_merge($lang, array( 'Asia/Khandyga' => 'Asia/Khandyga', 'Asia/Kolkata' => 'Asia/Kolkata', 'Asia/Krasnoyarsk' => 'Asia/Krasnoyarsk', - 'Asia/Kuala_Lumpur' => 'Asia/Kuala_Lumpur', + 'Asia/Kuala_Lumpur' => 'Asia/Kuala Lumpur', 'Asia/Kuching' => 'Asia/Kuching', 'Asia/Kuwait' => 'Asia/Kuwait', 'Asia/Macau' => 'Asia/Macau', @@ -1191,7 +1191,7 @@ $lang = array_merge($lang, array( 'Asia/Novosibirsk' => 'Asia/Novosibirsk', 'Asia/Omsk' => 'Asia/Omsk', 'Asia/Oral' => 'Asia/Oral', - 'Asia/Phnom_Penh' => 'Asia/Phnom_Penh', + 'Asia/Phnom_Penh' => 'Asia/Phnom Penh', 'Asia/Pontianak' => 'Asia/Pontianak', 'Asia/Pyongyang' => 'Asia/Pyongyang', 'Asia/Qatar' => 'Asia/Qatar', @@ -1221,23 +1221,23 @@ $lang = array_merge($lang, array( 'Atlantic/Azores' => 'Atlantic/Azores', 'Atlantic/Bermuda' => 'Atlantic/Bermuda', 'Atlantic/Canary' => 'Atlantic/Canary', - 'Atlantic/Cape_Verde' => 'Atlantic/Cape_Verde', + 'Atlantic/Cape_Verde' => 'Atlantic/Cape Verde', 'Atlantic/Faroe' => 'Atlantic/Faroe', 'Atlantic/Madeira' => 'Atlantic/Madeira', 'Atlantic/Reykjavik' => 'Atlantic/Reykjavik', - 'Atlantic/South_Georgia' => 'Atlantic/South_Georgia', - 'Atlantic/St_Helena' => 'Atlantic/St_Helena', + 'Atlantic/South_Georgia' => 'Atlantic/South Georgia', + 'Atlantic/St_Helena' => 'Atlantic/St. Helena', 'Atlantic/Stanley' => 'Atlantic/Stanley', 'Australia/Adelaide' => 'Australia/Adelaide', 'Australia/Brisbane' => 'Australia/Brisbane', - 'Australia/Broken_Hill' => 'Australia/Broken_Hill', + 'Australia/Broken_Hill' => 'Australia/Broken Hill', 'Australia/Currie' => 'Australia/Currie', 'Australia/Darwin' => 'Australia/Darwin', 'Australia/Eucla' => 'Australia/Eucla', 'Australia/Hobart' => 'Australia/Hobart', 'Australia/Lindeman' => 'Australia/Lindeman', - 'Australia/Lord_Howe' => 'Australia/Lord_Howe', + 'Australia/Lord_Howe' => 'Australia/Lord Howe', 'Australia/Melbourne' => 'Australia/Melbourne', 'Australia/Perth' => 'Australia/Perth', 'Australia/Sydney' => 'Australia/Sydney', @@ -1258,7 +1258,7 @@ $lang = array_merge($lang, array( 'Europe/Gibraltar' => 'Europe/Gibraltar', 'Europe/Guernsey' => 'Europe/Guernsey', 'Europe/Helsinki' => 'Europe/Helsinki', - 'Europe/Isle_of_Man' => 'Europe/Isle_of_Man', + 'Europe/Isle_of_Man' => 'Europe/Isle of Man', 'Europe/Istanbul' => 'Europe/Istanbul', 'Europe/Jersey' => 'Europe/Jersey', 'Europe/Kaliningrad' => 'Europe/Kaliningrad', @@ -1280,7 +1280,7 @@ $lang = array_merge($lang, array( 'Europe/Riga' => 'Europe/Riga', 'Europe/Rome' => 'Europe/Rome', 'Europe/Samara' => 'Europe/Samara', - 'Europe/San_Marino' => 'Europe/San_Marino', + 'Europe/San_Marino' => 'Europe/San Marino', 'Europe/Sarajevo' => 'Europe/Sarajevo', 'Europe/Simferopol' => 'Europe/Simferopol', 'Europe/Skopje' => 'Europe/Skopje', @@ -1337,11 +1337,11 @@ $lang = array_merge($lang, array( 'Pacific/Niue' => 'Pacific/Niue', 'Pacific/Norfolk' => 'Pacific/Norfolk', 'Pacific/Noumea' => 'Pacific/Noumea', - 'Pacific/Pago_Pago' => 'Pacific/Pago_Pago', + 'Pacific/Pago_Pago' => 'Pacific/Pago Pago', 'Pacific/Palau' => 'Pacific/Palau', 'Pacific/Pitcairn' => 'Pacific/Pitcairn', 'Pacific/Pohnpei' => 'Pacific/Pohnpei', - 'Pacific/Port_Moresby' => 'Pacific/Port_Moresby', + 'Pacific/Port_Moresby' => 'Pacific/Port Moresby', 'Pacific/Rarotonga' => 'Pacific/Rarotonga', 'Pacific/Saipan' => 'Pacific/Saipan', 'Pacific/Tahiti' => 'Pacific/Tahiti',