Consistent place names

1 files changed, 59 insertions, 59 deletions

diff --git a/app/GedcomCode/GedcomCodeTemp.php b/app/GedcomCode/GedcomCodeTemp.php
index 3eb7df1655..9a844d62a6 100644
--- a/app/GedcomCode/GedcomCodeTemp.php
+++ b/app/GedcomCode/GedcomCodeTemp.php
@@ -84,39 +84,39 @@ class GedcomCodeTemp {
 		case 'ALBUQ':
 			return I18N::translate('Albuquerque, New Mexico');
 		case 'ANCHO':
-			return I18N::translate('Anchorage, Alaska');
+			return I18N::translate('Anchorage, Alaska, United States');
 		case 'ARIZO':
-			return I18N::translate('Mesa, Arizona');
+			return I18N::translate('Mesa, Arizona, United States');
 		case 'ASUNC':
 			return I18N::translate('Asuncion, Paraguay');
 		case 'ATLAN':
-			return I18N::translate('Atlanta, Georgia');
+			return I18N::translate('Atlanta, Georgia, United States');
 		case 'BAIRE':
 			return I18N::translate('Buenos Aires, Argentina');
 		case 'BILLI':
-			return I18N::translate('Billings, Montana');
+			return I18N::translate('Billings, Montana, United States');
 		case 'BIRMI':
-			return I18N::translate('Birmingham, Alabama');
+			return I18N::translate('Birmingham, Alabama, United States');
 		case 'BISMA':
-			return I18N::translate('Bismarck, North Dakota');
+			return I18N::translate('Bismarck, North Dakota, United States');
 		case 'BOGOT':
 			return I18N::translate('Bogota, Colombia');
 		case 'BOISE':
-			return I18N::translate('Boise, Idaho');
+			return I18N::translate('Boise, Idaho, United States');
 		case 'BOSTO':
-			return I18N::translate('Boston, Massachusetts');
+			return I18N::translate('Boston, Massachusetts, United States');
 		case 'BOUNT':
-			return I18N::translate('Bountiful, Utah');
+			return I18N::translate('Bountiful, Utah, United States');
 		case 'BRISB':
 			return I18N::translate('Brisbane, Australia');
 		case 'BROUG':
-			return I18N::translate('Baton Rouge, Louisiana');
+			return I18N::translate('Baton Rouge, Louisiana, United States');
 		case 'CAMPI':
 			return I18N::translate('Campinas, Brazil');
 		case 'CARAC':
 			return I18N::translate('Caracas, Venezuela');
 		case 'CHICA':
-			return I18N::translate('Chicago, Illinois');
+			return I18N::translate('Chicago, Illinois, United States');
 		case 'CIUJU':
 			return I18N::translate('Ciudad Juarez, Mexico');
 		case 'COCHA':
@@ -124,19 +124,19 @@ class GedcomCodeTemp {
 		case 'COLJU':
 			return I18N::translate('Colonia Juarez, Mexico');
 		case 'COLSC':
-			return I18N::translate('Columbia, South Carolina');
+			return I18N::translate('Columbia, South Carolina, United States');
 		case 'COLUM':
-			return I18N::translate('Columbus, Ohio');
+			return I18N::translate('Columbus, Ohio, United States');
 		case 'COPEN':
 			return I18N::translate('Copenhagen, Denmark');
 		case 'CRIVE':
-			return I18N::translate('Columbia River, Washington');
+			return I18N::translate('Columbia River, Washington, United States');
 		case 'DALLA':
-			return I18N::translate('Dallas, Texas');
+			return I18N::translate('Dallas, Texas, United States');
 		case 'DENVE':
-			return I18N::translate('Denver, Colorado');
+			return I18N::translate('Denver, Colorado, United States');
 		case 'DETRO':
-			return I18N::translate('Detroit, Michigan');
+			return I18N::translate('Detroit, Michigan, United States');
 		case 'EDMON':
 			return I18N::translate('Edmonton, Alberta, Canada');
 		case 'EHOUS':
@@ -148,7 +148,7 @@ class GedcomCodeTemp {
 		case 'FREIB':
 			return I18N::translate('Freiburg, Germany');
 		case 'FRESN':
-			return I18N::translate('Fresno, California');
+			return I18N::translate('Fresno, California, United States');
 		case 'FUKUO':
 			return I18N::translate('Fukuoka, Japan');
 		case 'GUADA':
@@ -162,9 +162,9 @@ class GedcomCodeTemp {
 		case 'HALIF':
 			return I18N::translate('Halifax, Nova Scotia, Canada');
 		case 'HARTF':
-			return I18N::translate('Hartford, Connecticut');
+			return I18N::translate('Hartford, Connecticut, United States');
 		case 'HAWAI':
-			return I18N::translate('Laie, Hawaii');
+			return I18N::translate('Laie, Hawaii, United States');
 		case 'HELSI':
 			return I18N::translate('Helsinki, Finland');
 		case 'HERMO':
@@ -172,43 +172,43 @@ class GedcomCodeTemp {
 		case 'HKONG':
 			return I18N::translate('Hong Kong');
 		case 'HOUST':
-			return I18N::translate('Houston, Texas');
+			return I18N::translate('Houston, Texas, United States');
 		case 'IFALL':
-			return I18N::translate('Idaho Falls, Idaho');
+			return I18N::translate('Idaho Falls, Idaho, United States');
 		case 'JOHAN':
 			return I18N::translate('Johannesburg, South Africa');
 		case 'JRIVE':
-			return I18N::translate('Jordan River, Utah');
+			return I18N::translate('Jordan River, Utah, United States');
 		case 'KIEV':
 			return I18N::translate('Kiev, Ukraine');
 		case 'KONA':
-			return I18N::translate('Kona, Hawaii');
+			return I18N::translate('Kona, Hawaii, United States');
 		case 'LANGE':
-			return I18N::translate('Los Angeles, California');
+			return I18N::translate('Los Angeles, California, United States');
 		case 'LIMA':
 			return I18N::translate('Lima, Peru');
 		case 'LOGAN':
-			return I18N::translate('Logan, Utah');
+			return I18N::translate('Logan, Utah, United States');
 		case 'LONDO':
 			return I18N::translate('London, England');
 		case 'LOUIS':
-			return I18N::translate('Louisville, Kentucky');
+			return I18N::translate('Louisville, Kentucky, United States');
 		case 'LUBBO':
-			return I18N::translate('Lubbock, Texas');
+			return I18N::translate('Lubbock, Texas, United States');
 		case 'LVEGA':
-			return I18N::translate('Las Vegas, Nevada');
+			return I18N::translate('Las Vegas, Nevada, United States');
 		case 'MADRI':
 			return I18N::translate('Madrid, Spain');
 		case 'MANIL':
 			return I18N::translate('Manila, Philippines');
 		case 'MANTI':
-			return I18N::translate('Manti, Utah');
+			return I18N::translate('Manti, Utah, United States');
 		case 'MEDFO':
-			return I18N::translate('Medford, Oregon');
+			return I18N::translate('Medford, Oregon, United States');
 		case 'MELBO':
 			return I18N::translate('Melbourne, Australia');
 		case 'MEMPH':
-			return I18N::translate('Memphis, Tennessee');
+			return I18N::translate('Memphis, Tennessee, United States');
 		case 'MERID':
 			return I18N::translate('Merida, Mexico');
 		case 'MEXIC':
@@ -218,39 +218,39 @@ class GedcomCodeTemp {
 		case 'MONTE':
 			return I18N::translate('Monterrey, Mexico');
 		case 'MONTI':
-			return I18N::translate('Monticello, Utah');
+			return I18N::translate('Monticello, Utah, United States');
 		case 'MONTR':
 			return I18N::translate('Montreal, Quebec, Canada');
 		case 'MTIMP':
-			return I18N::translate('Mount Timpanogos, Utah');
+			return I18N::translate('Mount Timpanogos, Utah, United States');
 		case 'NASHV':
-			return I18N::translate('Nashville, Tennessee');
+			return I18N::translate('Nashville, Tennessee, United States');
 		case 'NAUV2':
-			return I18N::translate('Nauvoo, Illinois (new)');
+			return I18N::translate('Nauvoo (new), Illinois, United States');
 		case 'NAUVO':
-			return I18N::translate('Nauvoo, Illinois (original)');
+			return I18N::translate('Nauvoo (original), Illinois, United States');
 		case 'NBEAC':
-			return I18N::translate('Newport Beach, California');
+			return I18N::translate('Newport Beach, California, United States');
 		case 'NUKUA':
 			return I18N::translate('Nuku’Alofa, Tonga');
 		case 'NYORK':
-			return I18N::translate('New York, New York');
+			return I18N::translate('New York, New York, United States');
 		case 'NZEAL':
 			return I18N::translate('Hamilton, New Zealand');
 		case 'OAKLA':
-			return I18N::translate('Oakland, California');
+			return I18N::translate('Oakland, California, United States');
 		case 'OAXAC':
 			return I18N::translate('Oaxaca, Mexico');
 		case 'OGDEN':
-			return I18N::translate('Ogden, Utah');
+			return I18N::translate('Ogden, Utah, United States');
 		case 'OKLAH':
-			return I18N::translate('Oklahoma City, Oklahoma');
+			return I18N::translate('Oklahoma City, Oklahoma, United States');
 		case 'ORLAN':
-			return I18N::translate('Orlando, Florida');
+			return I18N::translate('Orlando, Florida, United States');
 		case 'PALEG':
 			return I18N::translate('Porto Alegre, Brazil');
 		case 'PALMY':
-			return I18N::translate('Palmyra, New York');
+			return I18N::translate('Palmyra, New York, United States');
 		case 'PAPEE':
 			return I18N::translate('Papeete, Tahiti');
 		case 'PERTH':
@@ -260,53 +260,53 @@ class GedcomCodeTemp {
 				/* I18N: http://en.wikipedia.org/wiki/President_of_the_Church */
 				I18N::translate('President’s Office');
 		case 'PORTL':
-			return I18N::translate('Portland, Oregon');
+			return I18N::translate('Portland, Oregon, United States');
 		case 'PREST':
 			return I18N::translate('Preston, England');
 		case 'PROVO':
-			return I18N::translate('Provo, Utah');
+			return I18N::translate('Provo, Utah, United States');
 		case 'RALEI':
-			return I18N::translate('Raleigh, North Carolina');
+			return I18N::translate('Raleigh, North Carolina, United States');
 		case 'RECIF':
 			return I18N::translate('Recife, Brazil');
 		case 'REDLA':
-			return I18N::translate('Redlands, California');
+			return I18N::translate('Redlands, California, United States');
 		case 'REGIN':
 			return I18N::translate('Regina, Saskatchewan, Canada');
 		case 'RENO':
-			return I18N::translate('Reno, Nevada');
+			return I18N::translate('Reno, Nevada, United States');
 		case 'SACRA':
-			return I18N::translate('Sacramento, California');
+			return I18N::translate('Sacramento, California, United States');
 		case 'SAMOA':
 			return I18N::translate('Apia, Samoa');
 		case 'SANTI':
 			return I18N::translate('Santiago, Chile');
 		case 'SANTO':
-			return I18N::translate('San Antonio, Texas');
+			return I18N::translate('San Antonio, Texas, United States');
 		case 'SDIEG':
-			return I18N::translate('San Diego, California');
+			return I18N::translate('San Diego, California, United States');
 		case 'SDOMI':
 			return I18N::translate('Santo Domingo, Dominican Republic');
 		case 'SEATT':
-			return I18N::translate('Seattle, Washington');
+			return I18N::translate('Seattle, Washington, United States');
 		case 'SEOUL':
 			return I18N::translate('Seoul, Korea');
 		case 'SGEOR':
-			return I18N::translate('St. George, Utah');
+			return I18N::translate('St. George, Utah, United States');
 		case 'SJOSE':
 			return I18N::translate('San Jose, Costa Rica');
 		case 'SLAKE':
-			return I18N::translate('Salt Lake City, Utah');
+			return I18N::translate('Salt Lake City, Utah, United States');
 		case 'SLOUI':
 			return I18N::translate('St. Louis, Missouri');
 		case 'SNOWF':
-			return I18N::translate('Snowflake, Arizona');
+			return I18N::translate('Snowflake, Arizona, United States');
 		case 'SPAUL':
 			return I18N::translate('Sao Paulo, Brazil');
 		case 'SPMIN':
 			return I18N::translate('St. Paul, Minnesota');
 		case 'SPOKA':
-			return I18N::translate('Spokane, Washington');
+			return I18N::translate('Spokane, Washington, United States');
 		case 'STOCK':
 			return I18N::translate('Stockholm, Sweden');
 		case 'SUVA':
@@ -328,11 +328,11 @@ class GedcomCodeTemp {
 		case 'VERAC':
 			return I18N::translate('Veracruz, Mexico');
 		case 'VERNA':
-			return I18N::translate('Vernal, Utah');
+			return I18N::translate('Vernal, Utah, United States');
 		case 'VILLA':
 			return I18N::translate('Villa Hermosa, Mexico');
 		case 'WASHI':
-			return I18N::translate('Washington, DC');
+			return I18N::translate('Washington, District of Columbia, United States');
 		case 'WINTE':
 			return I18N::translate('Winter Quarters, Nebraska');
 		default: