From e1fac77dcaf92da1327214736f1ce36f811b38cb Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 14 May 2009 20:05:25 +0000
Subject: [PATCH] Give continents-cities their own textdomain. Props
 nbachiyski, Denis-de-Bernardy . fixes #9794

git-svn-id: http://svn.automattic.com/wordpress/trunk@11333 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/continents-cities.php | 974 ++++++++++++------------
 wp-includes/functions.php               |  22 +-
 2 files changed, 498 insertions(+), 498 deletions(-)

diff --git a/wp-admin/includes/continents-cities.php b/wp-admin/includes/continents-cities.php
index a2794e324..0ebc4f3fc 100644
--- a/wp-admin/includes/continents-cities.php
+++ b/wp-admin/includes/continents-cities.php
@@ -4,490 +4,490 @@
  * This file is not included anywhere. It exists solely for use by xgettext.
  */
 
-__('Africa');
-__('Abidjan');
-__('Accra');
-__('Addis Ababa');
-__('Algiers');
-__('Asmara');
-__('Asmera');
-__('Bamako');
-__('Bangui');
-__('Banjul');
-__('Bissau');
-__('Blantyre');
-__('Brazzaville');
-__('Bujumbura');
-__('Cairo');
-__('Casablanca');
-__('Ceuta');
-__('Conakry');
-__('Dakar');
-__('Dar es Salaam');
-__('Djibouti');
-__('Douala');
-__('El Aaiun');
-__('Freetown');
-__('Gaborone');
-__('Harare');
-__('Johannesburg');
-__('Kampala');
-__('Khartoum');
-__('Kigali');
-__('Kinshasa');
-__('Lagos');
-__('Libreville');
-__('Lome');
-__('Luanda');
-__('Lubumbashi');
-__('Lusaka');
-__('Malabo');
-__('Maputo');
-__('Maseru');
-__('Mbabane');
-__('Mogadishu');
-__('Monrovia');
-__('Nairobi');
-__('Ndjamena');
-__('Niamey');
-__('Nouakchott');
-__('Ouagadougou');
-__('Porto-Novo');
-__('Sao Tome');
-__('Timbuktu');
-__('Tripoli');
-__('Tunis');
-__('Windhoek');
-__('America');
-__('Adak');
-__('Anchorage');
-__('Anguilla');
-__('Antigua');
-__('Araguaina');
-__('Argentina');
-__('Buenos Aires');
-__('Catamarca');
-__('ComodRivadavia');
-__('Cordoba');
-__('Jujuy');
-__('La Rioja');
-__('Mendoza');
-__('Rio Gallegos');
-__('San Juan');
-__('San Luis');
-__('Tucuman');
-__('Ushuaia');
-__('Aruba');
-__('Asuncion');
-__('Atikokan');
-__('Atka');
-__('Bahia');
-__('Barbados');
-__('Belem');
-__('Belize');
-__('Blanc-Sablon');
-__('Boa Vista');
-__('Bogota');
-__('Boise');
-__('Cambridge Bay');
-__('Campo Grande');
-__('Cancun');
-__('Caracas');
-__('Cayenne');
-__('Cayman');
-__('Chicago');
-__('Chihuahua');
-__('Coral Harbour');
-__('Costa Rica');
-__('Cuiaba');
-__('Curacao');
-__('Danmarkshavn');
-__('Dawson');
-__('Dawson Creek');
-__('Denver');
-__('Detroit');
-__('Dominica');
-__('Edmonton');
-__('Eirunepe');
-__('El Salvador');
-__('Ensenada');
-__('Fort Wayne');
-__('Fortaleza');
-__('Glace Bay');
-__('Godthab');
-__('Goose Bay');
-__('Grand Turk');
-__('Grenada');
-__('Guadeloupe');
-__('Guatemala');
-__('Guayaquil');
-__('Guyana');
-__('Halifax');
-__('Havana');
-__('Hermosillo');
-__('Indiana');
-__('Indianapolis');
-__('Knox');
-__('Marengo');
-__('Petersburg');
-__('Tell City');
-__('Vevay');
-__('Vincennes');
-__('Winamac');
-__('Inuvik');
-__('Iqaluit');
-__('Jamaica');
-__('Juneau');
-__('Kentucky');
-__('Louisville');
-__('Monticello');
-__('Knox IN');
-__('La Paz');
-__('Lima');
-__('Los Angeles');
-__('Maceio');
-__('Managua');
-__('Manaus');
-__('Marigot');
-__('Martinique');
-__('Mazatlan');
-__('Menominee');
-__('Merida');
-__('Mexico City');
-__('Miquelon');
-__('Moncton');
-__('Monterrey');
-__('Montevideo');
-__('Montreal');
-__('Montserrat');
-__('Nassau');
-__('New York');
-__('Nipigon');
-__('Nome');
-__('Noronha');
-__('North Dakota');
-__('Center');
-__('New Salem');
-__('Panama');
-__('Pangnirtung');
-__('Paramaribo');
-__('Phoenix');
-__('Port-au-Prince');
-__('Port of Spain');
-__('Porto Acre');
-__('Porto Velho');
-__('Puerto Rico');
-__('Rainy River');
-__('Rankin Inlet');
-__('Recife');
-__('Regina');
-__('Resolute');
-__('Rio Branco');
-__('Rosario');
-__('Santiago');
-__('Santo Domingo');
-__('Sao Paulo');
-__('Scoresbysund');
-__('Shiprock');
-__('St Barthelemy');
-__('St Johns');
-__('St Kitts');
-__('St Lucia');
-__('St Thomas');
-__('St Vincent');
-__('Swift Current');
-__('Tegucigalpa');
-__('Thule');
-__('Thunder Bay');
-__('Tijuana');
-__('Toronto');
-__('Tortola');
-__('Vancouver');
-__('Virgin');
-__('Whitehorse');
-__('Winnipeg');
-__('Yakutat');
-__('Yellowknife');
-__('Antarctica');
-__('Casey');
-__('Davis');
-__('DumontDUrville');
-__('Mawson');
-__('McMurdo');
-__('Palmer');
-__('Rothera');
-__('South Pole');
-__('Syowa');
-__('Vostok');
-__('Arctic');
-__('Longyearbyen');
-__('Asia');
-__('Aden');
-__('Almaty');
-__('Amman');
-__('Anadyr');
-__('Aqtau');
-__('Aqtobe');
-__('Ashgabat');
-__('Ashkhabad');
-__('Baghdad');
-__('Bahrain');
-__('Baku');
-__('Bangkok');
-__('Beirut');
-__('Bishkek');
-__('Brunei');
-__('Calcutta');
-__('Choibalsan');
-__('Chongqing');
-__('Chungking');
-__('Colombo');
-__('Dacca');
-__('Damascus');
-__('Dhaka');
-__('Dili');
-__('Dubai');
-__('Dushanbe');
-__('Gaza');
-__('Harbin');
-__('Ho Chi Minh');
-__('Hong Kong');
-__('Hovd');
-__('Irkutsk');
-__('Istanbul');
-__('Jakarta');
-__('Jayapura');
-__('Jerusalem');
-__('Kabul');
-__('Kamchatka');
-__('Karachi');
-__('Kashgar');
-__('Katmandu');
-__('Kolkata');
-__('Krasnoyarsk');
-__('Kuala Lumpur');
-__('Kuching');
-__('Kuwait');
-__('Macao');
-__('Macau');
-__('Magadan');
-__('Makassar');
-__('Manila');
-__('Muscat');
-__('Nicosia');
-__('Novosibirsk');
-__('Omsk');
-__('Oral');
-__('Phnom Penh');
-__('Pontianak');
-__('Pyongyang');
-__('Qatar');
-__('Qyzylorda');
-__('Rangoon');
-__('Riyadh');
-__('Saigon');
-__('Sakhalin');
-__('Samarkand');
-__('Seoul');
-__('Shanghai');
-__('Singapore');
-__('Taipei');
-__('Tashkent');
-__('Tbilisi');
-__('Tehran');
-__('Tel Aviv');
-__('Thimbu');
-__('Thimphu');
-__('Tokyo');
-__('Ujung Pandang');
-__('Ulaanbaatar');
-__('Ulan Bator');
-__('Urumqi');
-__('Vientiane');
-__('Vladivostok');
-__('Yakutsk');
-__('Yekaterinburg');
-__('Yerevan');
-__('Atlantic');
-__('Azores');
-__('Bermuda');
-__('Canary');
-__('Cape Verde');
-__('Faeroe');
-__('Faroe');
-__('Jan Mayen');
-__('Madeira');
-__('Reykjavik');
-__('South Georgia');
-__('St Helena');
-__('Stanley');
-__('Australia');
-__('ACT');
-__('Adelaide');
-__('Brisbane');
-__('Broken Hill');
-__('Canberra');
-__('Currie');
-__('Darwin');
-__('Eucla');
-__('Hobart');
-__('LHI');
-__('Lindeman');
-__('Lord Howe');
-__('Melbourne');
-__('North');
-__('NSW');
-__('Perth');
-__('Queensland');
-__('South');
-__('Sydney');
-__('Tasmania');
-__('Victoria');
-__('West');
-__('Yancowinna');
-__('Etc');
-__('GMT');
-__('GMT+0');
-__('GMT+1');
-__('GMT+10');
-__('GMT+11');
-__('GMT+12');
-__('GMT+2');
-__('GMT+3');
-__('GMT+4');
-__('GMT+5');
-__('GMT+6');
-__('GMT+7');
-__('GMT+8');
-__('GMT+9');
-__('GMT-0');
-__('GMT-1');
-__('GMT-10');
-__('GMT-11');
-__('GMT-12');
-__('GMT-13');
-__('GMT-14');
-__('GMT-2');
-__('GMT-3');
-__('GMT-4');
-__('GMT-5');
-__('GMT-6');
-__('GMT-7');
-__('GMT-8');
-__('GMT-9');
-__('GMT0');
-__('Greenwich');
-__('UCT');
-__('Universal');
-__('UTC');
-__('Zulu');
-__('Europe');
-__('Amsterdam');
-__('Andorra');
-__('Athens');
-__('Belfast');
-__('Belgrade');
-__('Berlin');
-__('Bratislava');
-__('Brussels');
-__('Bucharest');
-__('Budapest');
-__('Chisinau');
-__('Copenhagen');
-__('Dublin');
-__('Gibraltar');
-__('Guernsey');
-__('Helsinki');
-__('Isle of Man');
-__('Jersey');
-__('Kaliningrad');
-__('Kiev');
-__('Lisbon');
-__('Ljubljana');
-__('London');
-__('Luxembourg');
-__('Madrid');
-__('Malta');
-__('Mariehamn');
-__('Minsk');
-__('Monaco');
-__('Moscow');
-__('Oslo');
-__('Paris');
-__('Podgorica');
-__('Prague');
-__('Riga');
-__('Rome');
-__('Samara');
-__('San Marino');
-__('Sarajevo');
-__('Simferopol');
-__('Skopje');
-__('Sofia');
-__('Stockholm');
-__('Tallinn');
-__('Tirane');
-__('Tiraspol');
-__('Uzhgorod');
-__('Vaduz');
-__('Vatican');
-__('Vienna');
-__('Vilnius');
-__('Volgograd');
-__('Warsaw');
-__('Zagreb');
-__('Zaporozhye');
-__('Zurich');
-__('Indian');
-__('Antananarivo');
-__('Chagos');
-__('Christmas');
-__('Cocos');
-__('Comoro');
-__('Kerguelen');
-__('Mahe');
-__('Maldives');
-__('Mauritius');
-__('Mayotte');
-__('Reunion');
-__('Pacific');
-__('Apia');
-__('Auckland');
-__('Chatham');
-__('Easter');
-__('Efate');
-__('Enderbury');
-__('Fakaofo');
-__('Fiji');
-__('Funafuti');
-__('Galapagos');
-__('Gambier');
-__('Guadalcanal');
-__('Guam');
-__('Honolulu');
-__('Johnston');
-__('Kiritimati');
-__('Kosrae');
-__('Kwajalein');
-__('Majuro');
-__('Marquesas');
-__('Midway');
-__('Nauru');
-__('Niue');
-__('Norfolk');
-__('Noumea');
-__('Pago Pago');
-__('Palau');
-__('Pitcairn');
-__('Ponape');
-__('Port Moresby');
-__('Rarotonga');
-__('Saipan');
-__('Samoa');
-__('Tahiti');
-__('Tarawa');
-__('Tongatapu');
-__('Truk');
-__('Wake');
-__('Wallis');
-__('Yap');
+__('Africa', 'continents-cities');
+__('Abidjan', 'continents-cities');
+__('Accra', 'continents-cities');
+__('Addis Ababa', 'continents-cities');
+__('Algiers', 'continents-cities');
+__('Asmara', 'continents-cities');
+__('Asmera', 'continents-cities');
+__('Bamako', 'continents-cities');
+__('Bangui', 'continents-cities');
+__('Banjul', 'continents-cities');
+__('Bissau', 'continents-cities');
+__('Blantyre', 'continents-cities');
+__('Brazzaville', 'continents-cities');
+__('Bujumbura', 'continents-cities');
+__('Cairo', 'continents-cities');
+__('Casablanca', 'continents-cities');
+__('Ceuta', 'continents-cities');
+__('Conakry', 'continents-cities');
+__('Dakar', 'continents-cities');
+__('Dar es Salaam', 'continents-cities');
+__('Djibouti', 'continents-cities');
+__('Douala', 'continents-cities');
+__('El Aaiun', 'continents-cities');
+__('Freetown', 'continents-cities');
+__('Gaborone', 'continents-cities');
+__('Harare', 'continents-cities');
+__('Johannesburg', 'continents-cities');
+__('Kampala', 'continents-cities');
+__('Khartoum', 'continents-cities');
+__('Kigali', 'continents-cities');
+__('Kinshasa', 'continents-cities');
+__('Lagos', 'continents-cities');
+__('Libreville', 'continents-cities');
+__('Lome', 'continents-cities');
+__('Luanda', 'continents-cities');
+__('Lubumbashi', 'continents-cities');
+__('Lusaka', 'continents-cities');
+__('Malabo', 'continents-cities');
+__('Maputo', 'continents-cities');
+__('Maseru', 'continents-cities');
+__('Mbabane', 'continents-cities');
+__('Mogadishu', 'continents-cities');
+__('Monrovia', 'continents-cities');
+__('Nairobi', 'continents-cities');
+__('Ndjamena', 'continents-cities');
+__('Niamey', 'continents-cities');
+__('Nouakchott', 'continents-cities');
+__('Ouagadougou', 'continents-cities');
+__('Porto-Novo', 'continents-cities');
+__('Sao Tome', 'continents-cities');
+__('Timbuktu', 'continents-cities');
+__('Tripoli', 'continents-cities');
+__('Tunis', 'continents-cities');
+__('Windhoek', 'continents-cities');
+__('America', 'continents-cities');
+__('Adak', 'continents-cities');
+__('Anchorage', 'continents-cities');
+__('Anguilla', 'continents-cities');
+__('Antigua', 'continents-cities');
+__('Araguaina', 'continents-cities');
+__('Argentina', 'continents-cities');
+__('Buenos Aires', 'continents-cities');
+__('Catamarca', 'continents-cities');
+__('ComodRivadavia', 'continents-cities');
+__('Cordoba', 'continents-cities');
+__('Jujuy', 'continents-cities');
+__('La Rioja', 'continents-cities');
+__('Mendoza', 'continents-cities');
+__('Rio Gallegos', 'continents-cities');
+__('San Juan', 'continents-cities');
+__('San Luis', 'continents-cities');
+__('Tucuman', 'continents-cities');
+__('Ushuaia', 'continents-cities');
+__('Aruba', 'continents-cities');
+__('Asuncion', 'continents-cities');
+__('Atikokan', 'continents-cities');
+__('Atka', 'continents-cities');
+__('Bahia', 'continents-cities');
+__('Barbados', 'continents-cities');
+__('Belem', 'continents-cities');
+__('Belize', 'continents-cities');
+__('Blanc-Sablon', 'continents-cities');
+__('Boa Vista', 'continents-cities');
+__('Bogota', 'continents-cities');
+__('Boise', 'continents-cities');
+__('Cambridge Bay', 'continents-cities');
+__('Campo Grande', 'continents-cities');
+__('Cancun', 'continents-cities');
+__('Caracas', 'continents-cities');
+__('Cayenne', 'continents-cities');
+__('Cayman', 'continents-cities');
+__('Chicago', 'continents-cities');
+__('Chihuahua', 'continents-cities');
+__('Coral Harbour', 'continents-cities');
+__('Costa Rica', 'continents-cities');
+__('Cuiaba', 'continents-cities');
+__('Curacao', 'continents-cities');
+__('Danmarkshavn', 'continents-cities');
+__('Dawson', 'continents-cities');
+__('Dawson Creek', 'continents-cities');
+__('Denver', 'continents-cities');
+__('Detroit', 'continents-cities');
+__('Dominica', 'continents-cities');
+__('Edmonton', 'continents-cities');
+__('Eirunepe', 'continents-cities');
+__('El Salvador', 'continents-cities');
+__('Ensenada', 'continents-cities');
+__('Fort Wayne', 'continents-cities');
+__('Fortaleza', 'continents-cities');
+__('Glace Bay', 'continents-cities');
+__('Godthab', 'continents-cities');
+__('Goose Bay', 'continents-cities');
+__('Grand Turk', 'continents-cities');
+__('Grenada', 'continents-cities');
+__('Guadeloupe', 'continents-cities');
+__('Guatemala', 'continents-cities');
+__('Guayaquil', 'continents-cities');
+__('Guyana', 'continents-cities');
+__('Halifax', 'continents-cities');
+__('Havana', 'continents-cities');
+__('Hermosillo', 'continents-cities');
+__('Indiana', 'continents-cities');
+__('Indianapolis', 'continents-cities');
+__('Knox', 'continents-cities');
+__('Marengo', 'continents-cities');
+__('Petersburg', 'continents-cities');
+__('Tell City', 'continents-cities');
+__('Vevay', 'continents-cities');
+__('Vincennes', 'continents-cities');
+__('Winamac', 'continents-cities');
+__('Inuvik', 'continents-cities');
+__('Iqaluit', 'continents-cities');
+__('Jamaica', 'continents-cities');
+__('Juneau', 'continents-cities');
+__('Kentucky', 'continents-cities');
+__('Louisville', 'continents-cities');
+__('Monticello', 'continents-cities');
+__('Knox IN', 'continents-cities');
+__('La Paz', 'continents-cities');
+__('Lima', 'continents-cities');
+__('Los Angeles', 'continents-cities');
+__('Maceio', 'continents-cities');
+__('Managua', 'continents-cities');
+__('Manaus', 'continents-cities');
+__('Marigot', 'continents-cities');
+__('Martinique', 'continents-cities');
+__('Mazatlan', 'continents-cities');
+__('Menominee', 'continents-cities');
+__('Merida', 'continents-cities');
+__('Mexico City', 'continents-cities');
+__('Miquelon', 'continents-cities');
+__('Moncton', 'continents-cities');
+__('Monterrey', 'continents-cities');
+__('Montevideo', 'continents-cities');
+__('Montreal', 'continents-cities');
+__('Montserrat', 'continents-cities');
+__('Nassau', 'continents-cities');
+__('New York', 'continents-cities');
+__('Nipigon', 'continents-cities');
+__('Nome', 'continents-cities');
+__('Noronha', 'continents-cities');
+__('North Dakota', 'continents-cities');
+__('Center', 'continents-cities');
+__('New Salem', 'continents-cities');
+__('Panama', 'continents-cities');
+__('Pangnirtung', 'continents-cities');
+__('Paramaribo', 'continents-cities');
+__('Phoenix', 'continents-cities');
+__('Port-au-Prince', 'continents-cities');
+__('Port of Spain', 'continents-cities');
+__('Porto Acre', 'continents-cities');
+__('Porto Velho', 'continents-cities');
+__('Puerto Rico', 'continents-cities');
+__('Rainy River', 'continents-cities');
+__('Rankin Inlet', 'continents-cities');
+__('Recife', 'continents-cities');
+__('Regina', 'continents-cities');
+__('Resolute', 'continents-cities');
+__('Rio Branco', 'continents-cities');
+__('Rosario', 'continents-cities');
+__('Santiago', 'continents-cities');
+__('Santo Domingo', 'continents-cities');
+__('Sao Paulo', 'continents-cities');
+__('Scoresbysund', 'continents-cities');
+__('Shiprock', 'continents-cities');
+__('St Barthelemy', 'continents-cities');
+__('St Johns', 'continents-cities');
+__('St Kitts', 'continents-cities');
+__('St Lucia', 'continents-cities');
+__('St Thomas', 'continents-cities');
+__('St Vincent', 'continents-cities');
+__('Swift Current', 'continents-cities');
+__('Tegucigalpa', 'continents-cities');
+__('Thule', 'continents-cities');
+__('Thunder Bay', 'continents-cities');
+__('Tijuana', 'continents-cities');
+__('Toronto', 'continents-cities');
+__('Tortola', 'continents-cities');
+__('Vancouver', 'continents-cities');
+__('Virgin', 'continents-cities');
+__('Whitehorse', 'continents-cities');
+__('Winnipeg', 'continents-cities');
+__('Yakutat', 'continents-cities');
+__('Yellowknife', 'continents-cities');
+__('Antarctica', 'continents-cities');
+__('Casey', 'continents-cities');
+__('Davis', 'continents-cities');
+__('DumontDUrville', 'continents-cities');
+__('Mawson', 'continents-cities');
+__('McMurdo', 'continents-cities');
+__('Palmer', 'continents-cities');
+__('Rothera', 'continents-cities');
+__('South Pole', 'continents-cities');
+__('Syowa', 'continents-cities');
+__('Vostok', 'continents-cities');
+__('Arctic', 'continents-cities');
+__('Longyearbyen', 'continents-cities');
+__('Asia', 'continents-cities');
+__('Aden', 'continents-cities');
+__('Almaty', 'continents-cities');
+__('Amman', 'continents-cities');
+__('Anadyr', 'continents-cities');
+__('Aqtau', 'continents-cities');
+__('Aqtobe', 'continents-cities');
+__('Ashgabat', 'continents-cities');
+__('Ashkhabad', 'continents-cities');
+__('Baghdad', 'continents-cities');
+__('Bahrain', 'continents-cities');
+__('Baku', 'continents-cities');
+__('Bangkok', 'continents-cities');
+__('Beirut', 'continents-cities');
+__('Bishkek', 'continents-cities');
+__('Brunei', 'continents-cities');
+__('Calcutta', 'continents-cities');
+__('Choibalsan', 'continents-cities');
+__('Chongqing', 'continents-cities');
+__('Chungking', 'continents-cities');
+__('Colombo', 'continents-cities');
+__('Dacca', 'continents-cities');
+__('Damascus', 'continents-cities');
+__('Dhaka', 'continents-cities');
+__('Dili', 'continents-cities');
+__('Dubai', 'continents-cities');
+__('Dushanbe', 'continents-cities');
+__('Gaza', 'continents-cities');
+__('Harbin', 'continents-cities');
+__('Ho Chi Minh', 'continents-cities');
+__('Hong Kong', 'continents-cities');
+__('Hovd', 'continents-cities');
+__('Irkutsk', 'continents-cities');
+__('Istanbul', 'continents-cities');
+__('Jakarta', 'continents-cities');
+__('Jayapura', 'continents-cities');
+__('Jerusalem', 'continents-cities');
+__('Kabul', 'continents-cities');
+__('Kamchatka', 'continents-cities');
+__('Karachi', 'continents-cities');
+__('Kashgar', 'continents-cities');
+__('Katmandu', 'continents-cities');
+__('Kolkata', 'continents-cities');
+__('Krasnoyarsk', 'continents-cities');
+__('Kuala Lumpur', 'continents-cities');
+__('Kuching', 'continents-cities');
+__('Kuwait', 'continents-cities');
+__('Macao', 'continents-cities');
+__('Macau', 'continents-cities');
+__('Magadan', 'continents-cities');
+__('Makassar', 'continents-cities');
+__('Manila', 'continents-cities');
+__('Muscat', 'continents-cities');
+__('Nicosia', 'continents-cities');
+__('Novosibirsk', 'continents-cities');
+__('Omsk', 'continents-cities');
+__('Oral', 'continents-cities');
+__('Phnom Penh', 'continents-cities');
+__('Pontianak', 'continents-cities');
+__('Pyongyang', 'continents-cities');
+__('Qatar', 'continents-cities');
+__('Qyzylorda', 'continents-cities');
+__('Rangoon', 'continents-cities');
+__('Riyadh', 'continents-cities');
+__('Saigon', 'continents-cities');
+__('Sakhalin', 'continents-cities');
+__('Samarkand', 'continents-cities');
+__('Seoul', 'continents-cities');
+__('Shanghai', 'continents-cities');
+__('Singapore', 'continents-cities');
+__('Taipei', 'continents-cities');
+__('Tashkent', 'continents-cities');
+__('Tbilisi', 'continents-cities');
+__('Tehran', 'continents-cities');
+__('Tel Aviv', 'continents-cities');
+__('Thimbu', 'continents-cities');
+__('Thimphu', 'continents-cities');
+__('Tokyo', 'continents-cities');
+__('Ujung Pandang', 'continents-cities');
+__('Ulaanbaatar', 'continents-cities');
+__('Ulan Bator', 'continents-cities');
+__('Urumqi', 'continents-cities');
+__('Vientiane', 'continents-cities');
+__('Vladivostok', 'continents-cities');
+__('Yakutsk', 'continents-cities');
+__('Yekaterinburg', 'continents-cities');
+__('Yerevan', 'continents-cities');
+__('Atlantic', 'continents-cities');
+__('Azores', 'continents-cities');
+__('Bermuda', 'continents-cities');
+__('Canary', 'continents-cities');
+__('Cape Verde', 'continents-cities');
+__('Faeroe', 'continents-cities');
+__('Faroe', 'continents-cities');
+__('Jan Mayen', 'continents-cities');
+__('Madeira', 'continents-cities');
+__('Reykjavik', 'continents-cities');
+__('South Georgia', 'continents-cities');
+__('St Helena', 'continents-cities');
+__('Stanley', 'continents-cities');
+__('Australia', 'continents-cities');
+__('ACT', 'continents-cities');
+__('Adelaide', 'continents-cities');
+__('Brisbane', 'continents-cities');
+__('Broken Hill', 'continents-cities');
+__('Canberra', 'continents-cities');
+__('Currie', 'continents-cities');
+__('Darwin', 'continents-cities');
+__('Eucla', 'continents-cities');
+__('Hobart', 'continents-cities');
+__('LHI', 'continents-cities');
+__('Lindeman', 'continents-cities');
+__('Lord Howe', 'continents-cities');
+__('Melbourne', 'continents-cities');
+__('North', 'continents-cities');
+__('NSW', 'continents-cities');
+__('Perth', 'continents-cities');
+__('Queensland', 'continents-cities');
+__('South', 'continents-cities');
+__('Sydney', 'continents-cities');
+__('Tasmania', 'continents-cities');
+__('Victoria', 'continents-cities');
+__('West', 'continents-cities');
+__('Yancowinna', 'continents-cities');
+__('Etc', 'continents-cities');
+__('GMT', 'continents-cities');
+__('GMT+0', 'continents-cities');
+__('GMT+1', 'continents-cities');
+__('GMT+10', 'continents-cities');
+__('GMT+11', 'continents-cities');
+__('GMT+12', 'continents-cities');
+__('GMT+2', 'continents-cities');
+__('GMT+3', 'continents-cities');
+__('GMT+4', 'continents-cities');
+__('GMT+5', 'continents-cities');
+__('GMT+6', 'continents-cities');
+__('GMT+7', 'continents-cities');
+__('GMT+8', 'continents-cities');
+__('GMT+9', 'continents-cities');
+__('GMT-0', 'continents-cities');
+__('GMT-1', 'continents-cities');
+__('GMT-10', 'continents-cities');
+__('GMT-11', 'continents-cities');
+__('GMT-12', 'continents-cities');
+__('GMT-13', 'continents-cities');
+__('GMT-14', 'continents-cities');
+__('GMT-2', 'continents-cities');
+__('GMT-3', 'continents-cities');
+__('GMT-4', 'continents-cities');
+__('GMT-5', 'continents-cities');
+__('GMT-6', 'continents-cities');
+__('GMT-7', 'continents-cities');
+__('GMT-8', 'continents-cities');
+__('GMT-9', 'continents-cities');
+__('GMT0', 'continents-cities');
+__('Greenwich', 'continents-cities');
+__('UCT', 'continents-cities');
+__('Universal', 'continents-cities');
+__('UTC', 'continents-cities');
+__('Zulu', 'continents-cities');
+__('Europe', 'continents-cities');
+__('Amsterdam', 'continents-cities');
+__('Andorra', 'continents-cities');
+__('Athens', 'continents-cities');
+__('Belfast', 'continents-cities');
+__('Belgrade', 'continents-cities');
+__('Berlin', 'continents-cities');
+__('Bratislava', 'continents-cities');
+__('Brussels', 'continents-cities');
+__('Bucharest', 'continents-cities');
+__('Budapest', 'continents-cities');
+__('Chisinau', 'continents-cities');
+__('Copenhagen', 'continents-cities');
+__('Dublin', 'continents-cities');
+__('Gibraltar', 'continents-cities');
+__('Guernsey', 'continents-cities');
+__('Helsinki', 'continents-cities');
+__('Isle of Man', 'continents-cities');
+__('Jersey', 'continents-cities');
+__('Kaliningrad', 'continents-cities');
+__('Kiev', 'continents-cities');
+__('Lisbon', 'continents-cities');
+__('Ljubljana', 'continents-cities');
+__('London', 'continents-cities');
+__('Luxembourg', 'continents-cities');
+__('Madrid', 'continents-cities');
+__('Malta', 'continents-cities');
+__('Mariehamn', 'continents-cities');
+__('Minsk', 'continents-cities');
+__('Monaco', 'continents-cities');
+__('Moscow', 'continents-cities');
+__('Oslo', 'continents-cities');
+__('Paris', 'continents-cities');
+__('Podgorica', 'continents-cities');
+__('Prague', 'continents-cities');
+__('Riga', 'continents-cities');
+__('Rome', 'continents-cities');
+__('Samara', 'continents-cities');
+__('San Marino', 'continents-cities');
+__('Sarajevo', 'continents-cities');
+__('Simferopol', 'continents-cities');
+__('Skopje', 'continents-cities');
+__('Sofia', 'continents-cities');
+__('Stockholm', 'continents-cities');
+__('Tallinn', 'continents-cities');
+__('Tirane', 'continents-cities');
+__('Tiraspol', 'continents-cities');
+__('Uzhgorod', 'continents-cities');
+__('Vaduz', 'continents-cities');
+__('Vatican', 'continents-cities');
+__('Vienna', 'continents-cities');
+__('Vilnius', 'continents-cities');
+__('Volgograd', 'continents-cities');
+__('Warsaw', 'continents-cities');
+__('Zagreb', 'continents-cities');
+__('Zaporozhye', 'continents-cities');
+__('Zurich', 'continents-cities');
+__('Indian', 'continents-cities');
+__('Antananarivo', 'continents-cities');
+__('Chagos', 'continents-cities');
+__('Christmas', 'continents-cities');
+__('Cocos', 'continents-cities');
+__('Comoro', 'continents-cities');
+__('Kerguelen', 'continents-cities');
+__('Mahe', 'continents-cities');
+__('Maldives', 'continents-cities');
+__('Mauritius', 'continents-cities');
+__('Mayotte', 'continents-cities');
+__('Reunion', 'continents-cities');
+__('Pacific', 'continents-cities');
+__('Apia', 'continents-cities');
+__('Auckland', 'continents-cities');
+__('Chatham', 'continents-cities');
+__('Easter', 'continents-cities');
+__('Efate', 'continents-cities');
+__('Enderbury', 'continents-cities');
+__('Fakaofo', 'continents-cities');
+__('Fiji', 'continents-cities');
+__('Funafuti', 'continents-cities');
+__('Galapagos', 'continents-cities');
+__('Gambier', 'continents-cities');
+__('Guadalcanal', 'continents-cities');
+__('Guam', 'continents-cities');
+__('Honolulu', 'continents-cities');
+__('Johnston', 'continents-cities');
+__('Kiritimati', 'continents-cities');
+__('Kosrae', 'continents-cities');
+__('Kwajalein', 'continents-cities');
+__('Majuro', 'continents-cities');
+__('Marquesas', 'continents-cities');
+__('Midway', 'continents-cities');
+__('Nauru', 'continents-cities');
+__('Niue', 'continents-cities');
+__('Norfolk', 'continents-cities');
+__('Noumea', 'continents-cities');
+__('Pago Pago', 'continents-cities');
+__('Palau', 'continents-cities');
+__('Pitcairn', 'continents-cities');
+__('Ponape', 'continents-cities');
+__('Port Moresby', 'continents-cities');
+__('Rarotonga', 'continents-cities');
+__('Saipan', 'continents-cities');
+__('Samoa', 'continents-cities');
+__('Tahiti', 'continents-cities');
+__('Tarawa', 'continents-cities');
+__('Tongatapu', 'continents-cities');
+__('Truk', 'continents-cities');
+__('Wake', 'continents-cities');
+__('Wallis', 'continents-cities');
+__('Yap', 'continents-cities');
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 2316e9606..602a573c4 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -3114,7 +3114,7 @@ function wp_timezone_choice($selectedzone) {
 	if ( ! $mo_loaded ) {
 		$locale = get_locale();
 		$mofile = WP_LANG_DIR . "/continents-cities-$locale.mo";
-		load_textdomain('default', $mofile);
+		load_textdomain('continents-cities', $mofile);
 		$mo_loaded = true;
 	}
 
@@ -3133,12 +3133,12 @@ function wp_timezone_choice($selectedzone) {
 
 	usort($zonen, create_function(
 		'$a, $b', '
-		$a_continent = translate($a["continent"]);
-		$b_continent = translate($b["continent"]);
-		$a_city = translate($a["city"]);
-		$b_city = translate($b["city"]);
-		$a_subcity = translate($a["subcity"]);
-		$b_subcity = translate($b["subcity"]);
+		$a_continent = translate($a["continent"], "continents-cities");
+		$b_continent = translate($b["continent"], "continents-cities");
+		$a_city = translate($a["city"], "continents-cities");
+		$b_city = translate($b["city"], "continents-cities");
+		$a_subcity = translate($a["subcity"], "continents-cities");
+		$b_subcity = translate($b["subcity"], "continents-cities");
 		if ( $a_continent == $b_continent && $a_city == $b_city )
 			return strnatcasecmp($a_subcity, $b_subcity);
 		elseif ( $a_continent == $b_continent )
@@ -3156,7 +3156,7 @@ function wp_timezone_choice($selectedzone) {
 		extract($zone);
 		if ( empty($selectcontinent) && !empty($city) ) {
 			$selectcontinent = $continent;
-			$structure .= '<optgroup label="'. esc_attr( translate( $continent ) ) .'">' . "\n"; // continent
+			$structure .= '<optgroup label="'. esc_attr( translate( $continent, "continents-cities" ) ) .'">' . "\n"; // continent
 		} elseif ( !empty($selectcontinent) && $selectcontinent != $continent ) {
 			$structure .= "</optgroup>\n";
 			$selectcontinent = '';
@@ -3168,10 +3168,10 @@ function wp_timezone_choice($selectedzone) {
 
 		if ( !empty($city) ) {
 			$display = str_replace('_',' ',$city);
-			$display = translate($display);
+			$display = translate($display, "continents-cities");
 			if ( !empty($subcity) ) {
 				$display_subcity = str_replace('_', ' ', $subcity);
-				$display_subcity = translate($display_subcity);
+				$display_subcity = translate($display_subcity, "continents-cities");
 				$city = $city . '/'. $subcity;
 				$display = $display . '/' . $display_subcity;
 			}
@@ -3179,7 +3179,7 @@ function wp_timezone_choice($selectedzone) {
 				$display = strtr($display, '+-', '-+');
 			$structure .= "\t<option ".((($continent.'/'.$city)==$selectedzone)?'selected="selected"':'')." value=\"".($continent.'/'.$city)."\">$pad".$display."</option>\n"; //Timezone
 		} else {
-			$structure .= "<option ".(($continent==$selectedzone)?'selected="selected"':'')." value=\"".$continent."\">" . translate($continent) . "</option>\n"; //Timezone
+			$structure .= "<option ".(($continent==$selectedzone)?'selected="selected"':'')." value=\"".$continent."\">" . translate($continent, "continents-cities") . "</option>\n"; //Timezone
 		}
 	}