From b4c09beba832fedf4f333f4bb93c5a5d32671328 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 19 Mar 2021 15:21:08 +0000 Subject: [PATCH] I18N: Remove duplicate entries from the list of continents and cities. Follow-up to [37554]. See #52861. Built from https://develop.svn.wordpress.org/trunk@50554 git-svn-id: http://core.svn.wordpress.org/trunk@50167 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/continents-cities.php | 11 +---------- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/wp-admin/includes/continents-cities.php b/wp-admin/includes/continents-cities.php index 7ddfe74cfb..c87f34b2c1 100644 --- a/wp-admin/includes/continents-cities.php +++ b/wp-admin/includes/continents-cities.php @@ -98,18 +98,15 @@ __( 'Blanc-Sablon', 'continents-cities' ); __( 'Boa Vista', 'continents-cities' ); __( 'Bogota', 'continents-cities' ); __( 'Boise', 'continents-cities' ); -__( 'Buenos Aires', 'continents-cities' ); __( 'Cambridge Bay', 'continents-cities' ); __( 'Campo Grande', 'continents-cities' ); __( 'Cancun', 'continents-cities' ); __( 'Caracas', 'continents-cities' ); -__( 'Catamarca', 'continents-cities' ); __( 'Cayenne', 'continents-cities' ); __( 'Cayman', 'continents-cities' ); __( 'Chicago', 'continents-cities' ); __( 'Chihuahua', 'continents-cities' ); __( 'Coral Harbour', 'continents-cities' ); -__( 'Cordoba', 'continents-cities' ); __( 'Costa Rica', 'continents-cities' ); __( 'Creston', 'continents-cities' ); __( 'Cuiaba', 'continents-cities' ); @@ -148,11 +145,9 @@ __( 'Tell City', 'continents-cities' ); __( 'Vevay', 'continents-cities' ); __( 'Vincennes', 'continents-cities' ); __( 'Winamac', 'continents-cities' ); -__( 'Indianapolis', 'continents-cities' ); __( 'Inuvik', 'continents-cities' ); __( 'Iqaluit', 'continents-cities' ); __( 'Jamaica', 'continents-cities' ); -__( 'Jujuy', 'continents-cities' ); __( 'Juneau', 'continents-cities' ); __( 'Kentucky', 'continents-cities' ); __( 'Louisville', 'continents-cities' ); @@ -162,7 +157,6 @@ __( 'Kralendijk', 'continents-cities' ); __( 'La Paz', 'continents-cities' ); __( 'Lima', 'continents-cities' ); __( 'Los Angeles', 'continents-cities' ); -__( 'Louisville', 'continents-cities' ); __( 'Lower Princes', 'continents-cities' ); __( 'Maceio', 'continents-cities' ); __( 'Managua', 'continents-cities' ); @@ -171,7 +165,6 @@ __( 'Marigot', 'continents-cities' ); __( 'Martinique', 'continents-cities' ); __( 'Matamoros', 'continents-cities' ); __( 'Mazatlan', 'continents-cities' ); -__( 'Mendoza', 'continents-cities' ); __( 'Menominee', 'continents-cities' ); __( 'Merida', 'continents-cities' ); __( 'Metlakatla', 'continents-cities' ); @@ -196,8 +189,8 @@ __( 'Panama', 'continents-cities' ); __( 'Pangnirtung', 'continents-cities' ); __( 'Paramaribo', 'continents-cities' ); __( 'Phoenix', 'continents-cities' ); -__( 'Port of Spain', 'continents-cities' ); __( 'Port-au-Prince', 'continents-cities' ); +__( 'Port of Spain', 'continents-cities' ); __( 'Porto Acre', 'continents-cities' ); __( 'Porto Velho', 'continents-cities' ); __( 'Puerto Rico', 'continents-cities' ); @@ -292,7 +285,6 @@ __( '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' ); @@ -465,7 +457,6 @@ __( 'Mariehamn', 'continents-cities' ); __( 'Minsk', 'continents-cities' ); __( 'Monaco', 'continents-cities' ); __( 'Moscow', 'continents-cities' ); -__( 'Nicosia', 'continents-cities' ); __( 'Oslo', 'continents-cities' ); __( 'Paris', 'continents-cities' ); __( 'Podgorica', 'continents-cities' ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 182976db86..8226dceb4f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.8-alpha-50552'; +$wp_version = '5.8-alpha-50554'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.